diff --git a/.gitattributes b/.gitattributes
index 4ca25977a..6fd1589a1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 *.txz filter=lfs diff=lfs merge=lfs -text
+app/src/main/assets/imagefs.tzst filter=lfs diff=lfs merge=lfs -text
+app/src/main/assets/imagefs.part*.tzst filter=lfs diff=lfs merge=lfs -text
 reference/tooling/jadx.zip filter=lfs diff=lfs merge=lfs -text
 reference/tooling/jadx/lib/jadx-1.5.3-all.jar filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index 9342e3918..c32e0daa6 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -38,6 +38,10 @@ jobs:
             artifactName: apk-pubg
             gradleTask: assemblePubgDebug
             apkPath: app/build/outputs/apk/pubg/debug/pubg.apk
+          - name: Antutu
+            artifactName: apk-antutu
+            gradleTask: assembleAntutuDebug
+            apkPath: app/build/outputs/apk/antutu/debug/antutu.apk
 
     steps:
     - name: Clone repository
@@ -63,22 +67,37 @@ jobs:
         path: |
           app/.cxx
           app/build/intermediates/cxx
-        key: ndk-${{ matrix.flavor.name }}-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
+        key: ndk-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
         restore-keys: |
-          ndk-${{ matrix.flavor.name }}-
           ndk-
 
+    # Cargo target dir + registry sit outside the NDK cache paths; a cold Rust build dominates job time.
+    - name: Cache Rust Steam client
+      uses: actions/cache@v5
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          app/src/main/cpp/wn-steam-client/rust/target
+        key: cargo-${{ hashFiles('app/src/main/cpp/wn-steam-client/rust/Cargo.lock') }}
+        restore-keys: cargo-
+
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'temurin'
 
+    - name: Install Rust Android target
+      run: rustup target add aarch64-linux-android
+
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v6
       with:
         validate-wrappers: true
         cache-cleanup: 'on-success'
+        # PRs restore the Gradle cache read-only; only main pushes write it.
+        cache-read-only: ${{ github.event_name == 'pull_request' }}
 
     - name: Decode keystore and build
       timeout-minutes: 15
@@ -141,6 +160,8 @@ jobs:
         path: artifacts/${{ matrix.flavor.artifactName }}/*.apk
         retention-days: 7
         if-no-files-found: error
+        # APK contents are already compressed; deflating ~560MB again wastes CPU.
+        compression-level: 0
 
   cleanup-caches:
     needs: build
@@ -155,7 +176,8 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        gh cache list --repo "$GITHUB_REPOSITORY" --json id,key,createdAt --limit 100 |
+        # Dedupe only main-scope caches so a newer PR-scoped twin can't get main's copy deleted.
+        gh cache list --repo "$GITHUB_REPOSITORY" --ref refs/heads/main --json id,key,createdAt --limit 100 |
           jq -r '
             group_by(.key | sub("-[a-f0-9]{20,}$"; ""))
             | .[]
diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml
index 068e21d1e..2825147c0 100644
--- a/.github/workflows/pr-release-publish.yml
+++ b/.github/workflows/pr-release-publish.yml
@@ -8,7 +8,8 @@ on:
       - completed
 
 concurrency:
-  group: pr-release-${{ github.event.workflow_run.id }}
+  # Serialize publishes of the same PR branch; per-run-id groups let them race each other.
+  group: pr-release-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: false
 
 jobs:
@@ -84,9 +85,11 @@ jobs:
             echo "standard=WinNative-Debug-Standard-${label}.apk"
             echo "ludashi=WinNative-Debug-Ludashi-${label}.apk"
             echo "pubg=WinNative-Debug-Pubg-${label}.apk"
+            echo "antutu=WinNative-Debug-Antutu-${label}.apk"
             echo "release_standard=WinNative-Debug-Standard-${release_label}.apk"
             echo "release_ludashi=WinNative-Debug-Ludashi-${release_label}.apk"
             echo "release_pubg=WinNative-Debug-Pubg-${release_label}.apk"
+            echo "release_antutu=WinNative-Debug-Antutu-${release_label}.apk"
           } >> "$GITHUB_OUTPUT"
 
       - name: Download PR build artifacts
@@ -95,9 +98,15 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mkdir -p artifacts
-          gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name apk-standard --dir artifacts/standard
-          gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name apk-ludashi --dir artifacts/ludashi
-          gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name apk-pubg --dir artifacts/pubg
+          # Download all flavors in parallel; the sequential form left the runner's network idle per transfer.
+          pids=()
+          for flavor in standard ludashi pubg antutu; do
+            gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name "apk-$flavor" --dir "artifacts/$flavor" &
+            pids+=($!)
+          done
+          for pid in "${pids[@]}"; do
+            wait "$pid"
+          done
 
       - name: Build release notes from PR metadata
         if: ${{ steps.scope.outputs.allowed == 'true' }}
@@ -127,6 +136,7 @@ jobs:
           {
             printf '# PR #%s\n\n' "$PR_NUMBER"
             printf 'Title: %s\n\n' "$safe_title"
+            printf 'Author: @%s\n\n' "$pr_author"
             printf 'Source PR: %s\n' "$pr_url"
             printf 'Source branch: %s\n' "$head_ref"
             printf 'Source commit: `%s`\n' "$HEAD_SHA"
@@ -141,6 +151,7 @@ jobs:
             printf -- '%s\n' "- ${{ steps.apk.outputs.release_standard }}"
             printf -- '%s\n' "- ${{ steps.apk.outputs.release_ludashi }}"
             printf -- '%s\n' "- ${{ steps.apk.outputs.release_pubg }}"
+            printf -- '%s\n' "- ${{ steps.apk.outputs.release_antutu }}"
             printf '\nBuilt from source commit `%s`.\n' "$short_sha"
           } > release-notes.md
 
@@ -158,9 +169,20 @@ jobs:
           discord_marker='<!-- discord-posted -->'
           discord_posted=false
 
-          if gh release view "$tag" --repo "$TARGET_REPO" >/dev/null 2>&1; then
+          # A transient API error must not be read as "release doesn't exist" — that ends in
+          # a create over an existing tag (HTTP 422).
+          if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$tag" 2>&1); then
+            release_exists=true
+          elif printf '%s' "$view_out" | grep -qi 'Not Found'; then
+            release_exists=false
+          else
+            printf '%s\n' "$view_out"
+            exit 1
+          fi
+
+          if [ "$release_exists" = true ]; then
             created=false
-            existing_body=$(gh release view "$tag" --repo "$TARGET_REPO" --json body --jq '.body // ""')
+            existing_body=$(printf '%s' "$view_out" | jq -r '.body // ""')
             if printf '%s' "$existing_body" | grep -Fq "$discord_marker"; then
               discord_posted=true
               if ! grep -Fq "$discord_marker" release-notes.md; then
@@ -174,26 +196,38 @@ jobs:
               --prerelease
           else
             created=true
-            gh release create "$tag" \
+            if ! gh release create "$tag" \
               --repo "$TARGET_REPO" \
               --title "$title" \
               --notes-file release-notes.md \
-              --prerelease
+              --prerelease; then
+              # Another publish run created it between our check and the create — update instead.
+              created=false
+              gh release edit "$tag" \
+                --repo "$TARGET_REPO" \
+                --title "$title" \
+                --notes-file release-notes.md \
+                --prerelease
+            fi
           fi
 
           standard_path="artifacts/standard/${{ steps.apk.outputs.standard }}"
           ludashi_path="artifacts/ludashi/${{ steps.apk.outputs.ludashi }}"
           pubg_path="artifacts/pubg/${{ steps.apk.outputs.pubg }}"
+          antutu_path="artifacts/antutu/${{ steps.apk.outputs.antutu }}"
           release_standard_path="release-assets/${{ steps.apk.outputs.release_standard }}"
           release_ludashi_path="release-assets/${{ steps.apk.outputs.release_ludashi }}"
           release_pubg_path="release-assets/${{ steps.apk.outputs.release_pubg }}"
+          release_antutu_path="release-assets/${{ steps.apk.outputs.release_antutu }}"
           test -f "$standard_path"
           test -f "$ludashi_path"
           test -f "$pubg_path"
+          test -f "$antutu_path"
           mkdir -p release-assets
           cp "$standard_path" "$release_standard_path"
           cp "$ludashi_path" "$release_ludashi_path"
           cp "$pubg_path" "$release_pubg_path"
+          cp "$antutu_path" "$release_antutu_path"
 
           release_json=$(gh api "repos/$TARGET_REPO/releases/tags/$tag")
           existing_apk_assets=$(
@@ -231,6 +265,7 @@ jobs:
           upload_asset "$release_standard_path"
           upload_asset "$release_ludashi_path"
           upload_asset "$release_pubg_path"
+          upload_asset "$release_antutu_path"
 
           release_url=$(gh release view "$tag" --repo "$TARGET_REPO" --json url --jq '.url')
           {
diff --git a/.github/workflows/tag-apk-artifacts.yml b/.github/workflows/tag-apk-artifacts.yml
index d08b727df..ba0955edb 100644
--- a/.github/workflows/tag-apk-artifacts.yml
+++ b/.github/workflows/tag-apk-artifacts.yml
@@ -31,6 +31,10 @@ jobs:
             variant: Pubg
             gradleTask: assemblePubgDebug
             apkPath: app/build/outputs/apk/pubg/debug/pubg.apk
+          - name: Antutu
+            variant: Antutu
+            gradleTask: assembleAntutuDebug
+            apkPath: app/build/outputs/apk/antutu/debug/antutu.apk
 
     steps:
       - name: Clone repository
@@ -56,18 +60,30 @@ jobs:
           path: |
             app/.cxx
             app/build/intermediates/cxx
-          key: tag-ndk-${{ matrix.flavor.name }}-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
+          key: tag-ndk-${{ hashFiles('app/src/main/cpp/**', 'app/build.gradle', 'app/src/main/cpp/CMakeLists.txt') }}
           restore-keys: |
-            tag-ndk-${{ matrix.flavor.name }}-
             tag-ndk-
             ndk-
 
+      - name: Cache Rust Steam client
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            app/src/main/cpp/wn-steam-client/rust/target
+          key: cargo-${{ hashFiles('app/src/main/cpp/wn-steam-client/rust/Cargo.lock') }}
+          restore-keys: cargo-
+
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Install Rust Android target
+        run: rustup target add aarch64-linux-android
+
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v6
         with:
@@ -121,3 +137,4 @@ jobs:
           path: artifacts/apk/*.apk
           retention-days: 30
           if-no-files-found: error
+          compression-level: 0
diff --git a/.gitignore b/.gitignore
index 4a6805100..d3a4ae7a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,16 +17,16 @@ app/src/main/assets/proton-9.0-x86_64.txz
 *.log
 **/*.log
 
-# Kotlin/Gradle artifacts
-.kotlin/
-.tmp/
-.gradle/
-.gradle-user/
-.gradle-user-fresh/
-build/
-app/build/
-app/.cxx/
-app/release/
+# Kotlin/Gradle artifacts
+.kotlin/
+.tmp/
+.gradle/
+.gradle-user/
+.gradle-user-fresh/
+build/
+app/build/
+app/.cxx/
+app/release/
 
 # Python artifacts
 __pycache__/
@@ -47,3 +47,18 @@ app/schemas/
 *.jks
 *.keystore
 signing.properties
+
+# Local-only dev artifacts (never check in)
+.claude/
+References/
+*.hprof
+android_sysvshm/build64/
+
+# local build artifacts (FEX/Proton wcp)
+dist/
+
+/cores/*/
+!/cores/patches/
+
+/armsx2/emucore-src/
+/armsx2/emucore-out/
diff --git a/.gitmodules b/.gitmodules
index e1ec52737..b5cf369f6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "app/src/main/cpp/adrenotools"]
 	path = app/src/main/cpp/adrenotools
 	url = https://github.com/Pipetto-crypto/libadrenotools.git
+[submodule "app/src/main/cpp/vkbasalt"]
+	path = app/src/main/cpp/vkbasalt
+	url = https://github.com/WinNative-Emu/vkBasalt.git
+	branch = Test
diff --git a/EMULATOR_CREDITS.md b/EMULATOR_CREDITS.md
new file mode 100644
index 000000000..5327d1b5b
--- /dev/null
+++ b/EMULATOR_CREDITS.md
@@ -0,0 +1,74 @@
+# Emulator & Library Credits
+
+WinNative's retro-console features are built on open-source emulators and libraries.
+This project is distributed under the **GNU General Public License v3.0** (see [LICENSE](LICENSE)).
+In compliance with the GPL and the other licenses below, the corresponding source code
+for every GPL/copyleft component is available from the upstream projects linked here,
+and their copyright and license notices are preserved.
+
+## PlayStation 2
+
+PS2 games are recognized and imported into the library. PS2 emulation is built on
+**ARMSX2** (a GPL-3.0 fork of PCSX2) and is in active development.
+
+| Component | Role | License | Source |
+| --- | --- | --- | --- |
+| ARMSX2 | PS2 emulation + RetroAchievements | GPL-3.0 | https://github.com/ARMSX2/ARMSX2 |
+| PCSX2 | Upstream project ARMSX2 is derived from | GPL-3.0 | https://github.com/pcsx2/pcsx2 |
+
+## GameCube / Wii
+
+GameCube and Wii games are recognized and imported into the library. GC/Wii emulation is
+built on an embedded build of **Dolphin**, rendered on Vulkan and driven entirely by
+WinNative (Dolphin's own UI is stripped). Local and online multiplayer use Dolphin's own
+native NetPlay engine.
+
+| Component | Role | License | Source |
+| --- | --- | --- | --- |
+| Dolphin | GameCube/Wii emulation + NetPlay | GPL-2.0-or-later | https://github.com/dolphin-emu/dolphin |
+
+## Bundled libretro cores
+
+Each core is shipped as an unmodified `arm64-v8a` build and loaded through LibretroDroid.
+
+| System | Core | License | Source |
+| --- | --- | --- | --- |
+| Game Boy / Color | Gambatte | GPL-2.0 | https://github.com/libretro/gambatte-libretro |
+| Game Boy Advance | mGBA | MPL-2.0 | https://github.com/libretro/mgba |
+| Genesis / Master System / Game Gear | Genesis Plus GX | Genesis Plus GX License (non-commercial) | https://github.com/libretro/Genesis-Plus-GX |
+| NES | FCEUmm | GPL-2.0 | https://github.com/libretro/libretro-fceumm |
+| Nintendo 64 | ParaLLEl N64 | GPL-2.0 | https://github.com/libretro/parallel-n64 |
+| Nintendo 64 | Mupen64Plus-Next | GPL-2.0 | https://github.com/libretro/mupen64plus-libretro-nx |
+| PlayStation | Beetle PSX (mednafen_psx) | GPL-2.0 | https://github.com/libretro/beetle-psx-libretro |
+| SNES | Snes9x | Snes9x License (non-commercial) | https://github.com/libretro/snes9x |
+
+### Also evaluated for PlayStation
+
+| Component | License | Source |
+| --- | --- | --- |
+| SwanStation | GPL-3.0 | https://github.com/libretro/swanstation |
+
+## Frontend, achievements, and supporting libraries
+
+| Component | Role | License | Source |
+| --- | --- | --- | --- |
+| LibretroDroid | libretro frontend the retro backend is built on | GPL-3.0 | https://github.com/Swordfish90/LibretroDroid |
+| LibretroDroid (WinNative fork) | the build WinNative ships, carrying the RetroAchievements, netplay and SGSR changes | GPL-3.0 | https://github.com/WinNative-Emu/LibretroDroid/tree/winnative |
+| Oboe | Audio output | Apache-2.0 | https://github.com/google/oboe |
+| rcheevos | RetroAchievements client library | MIT | https://github.com/RetroAchievements/rcheevos |
+| Snapdragon Game Super Resolution (SGSR) | Upscaling shader | BSD-3-Clause | https://github.com/quic/snapdragon-gsr |
+| Winlator | Windows-on-Android base this project forks | GPL-3.0 | https://github.com/brunodev85/winlator |
+
+## Source availability
+
+WinNative is released under the GPL-3.0. As required by that license and by the GPL-2.0
+cores above, the complete corresponding source for every copyleft component is obtainable
+from the repositories linked in this document, and the bundled license texts are retained
+in the source tree of the repository that builds each component.
+
+The libretro frontend is no longer built from source in this repository. WinNative links
+against `libretrodroid.aar`, published from the `winnative` branch of
+https://github.com/WinNative-Emu/LibretroDroid, which is where its GPL-3.0 source, the
+rcheevos `LICENSE` and `SGSR_LICENSE` texts now live. The exact build WinNative ships is
+pinned by release tag and SHA-256 in `tools/libretrodroid.version`, so the corresponding
+source for any given APK is the commit that tag was built from.
diff --git a/README.md b/README.md
index 9b57a18df..2f15049e8 100644
--- a/README.md
+++ b/README.md
@@ -1,58 +1,98 @@
-<p align="center">
-  <img src="logo.png" alt="WinNative" width="500">
-</p>
-<p align="center">
-    <a href="https://discord.gg/uhTkvGfakU">
-        <img src="https://img.shields.io/discord/1358831699814912141?color=5865F2&label=WinNative&logo=discord&logoColor=white"
-            alt="Discord">
-    </a>
-</p>
-
-## WinNative: A Community Built Windows Emulation App for Android
-
-**WinNative** is an advanced, high-performance Windows (x86_64) emulation environment for Android. It bridges the gap between desktop gaming and mobile by unifying the best technologies from **Winlator Bionic** and **Pluvia**.
-
-Designed for enthusiasts and power users, WinNative delivers the full Winlator experience while making it easy to connect your Steam, Epic, and GOG game libraries.
-
----
-
-### Installation
-
-1. **Download:** Get the latest APK from the [Releases](https://github.com/maxjivi05/WinNative/releases) section.
-2. **Variants:**
-   - `Ludashi`: Best for Xiaomi/RedMagic (Performance Mode trigger).
-   - `Vanilla`: Standard package name for side-loading with other forks.
-3. **Setup:** Launch the app, allow the ImageFS to install, and start adding your games manually or sync your library. 
-
----
-
-### How to Build
-
-**Requirements:** Android Studio, JDK 17, NDK `27.3.13750724`, and CMake.
-
-1. **Clone the repository and update submodules** (Required):
-   ```bash
-   git clone https://github.com/MaxsTechReview/WinNative.git
-   cd WinNative
-   git submodule update --init --recursive
-   ```
-2. **Build via Android Studio:** Open the `WinNative` directory, let Gradle sync, then select **Build > Build APK(s)**.
-3. **Build via CLI:** Run `.\gradlew.bat assembleDebug` (Windows).
-
----
-
-### Contributing
-
-We welcome community contributions! Feel free to open a pull request for bug fixes, driver updates, UI improvements, or anything else you'd like to add.
-
-Please match the existing code style and ensure any AI-assisted code is thoroughly reviewed and tested before submission.
-
----
-
-### Credits & Acknowledgments
-
-- **Original Winlator** by [brunodev85](https://github.com/brunodev85/winlator)
-- **Winlator Bionic** by [Pipetto-crypto](https://github.com/Pipetto-crypto/winlator)
-- **Pluvia** features by the [Pluvia](https://github.com/oxters168/Pluvia) / [GameNative](https://github.com/utkarshdalal/GameNative) community
-- **Mesa/Turnip** contributions by the [Mesa3D](https://www.mesa3d.org/) team
-- **Goldberg Steam Emulator** by [Mr. Goldberg](https://gitlab.com/Mr_Goldberg/goldberg_emulator), maintained by [Detanup01](https://github.com/Detanup01/gbe_fork)
+<p align="center">
+  <img src="logo.png" alt="WinNative" width="500">
+</p>
+<p align="center">
+    <a href="https://discord.gg/uhTkvGfakU">
+        <img src="https://img.shields.io/discord/1358831699814912141?color=5865F2&label=WinNative&logo=discord&logoColor=white"
+            alt="Discord">
+    </a>
+</p>
+
+## WinNative: A Community Built Windows Emulation App for Android
+
+**WinNative** is an advanced, high-performance Windows (x86_64) emulation environment for Android. It bridges the gap between desktop gaming and mobile by unifying the best technologies from **Winlator Bionic** and **Pluvia**.
+
+Designed for enthusiasts and power users, WinNative delivers the full Winlator experience while making it easy to connect your Steam, Epic, and GOG game libraries.
+
+---
+
+### Installation
+
+1. **Download:** Get the latest APK from the [Releases](https://github.com/WinNative-Emu/WinNative/releases) section.
+2. **Variants:**
+   - `Ludashi`: Forces both Max GPU and CPU clocks on some devices. (Performance Mode trigger).
+   - `Vanilla`: Standard package name for side-loading with other forks.
+   -  `Antutu`: Forces Max GPU clocks on most devices. (antutu benchmark spoof)
+   -  `Pubg`: Standard pubg package name which allows some Game Booster advanced Features.
+3. **Setup:** Launch the app, allow the ImageFS to install, and start adding your games manually or sync your library. 
+
+---
+
+### How to Build
+
+**Requirements:** Android Studio, JDK 17, and [Git LFS](https://git-lfs.com). The NDK
+(`27.3.13750724`) and CMake are only needed if you build native cores from source (see below).
+
+1. **Clone with submodules and pull LFS objects** (Required):
+   ```bash
+   git clone --recursive https://github.com/MaxsTechReview/WinNative.git
+   cd WinNative
+   git lfs pull                          # fetches imagefs
+   git submodule update --init --recursive
+   ```
+2. **Build via Android Studio:** Open the `WinNative` directory, let Gradle sync, then select **Build > Build APK(s)**.
+3. **Build via CLI:** Run `./gradlew assembleStandardDebug` (or `.\gradlew.bat` on Windows).
+
+The APK carries no retro console cores. Each core is built from its own fork under the
+[WinNative-Emu](https://github.com/WinNative-Emu) org, and
+[Retro-Consoles](https://github.com/WinNative-Emu/Retro-Consoles) packs every core plus the
+Dolphin and ARMSX2 runtime data into one `retro-consoles.tzst`. The app downloads and
+verifies it on demand from **Settings > Retro > Download console cores**, so a core update
+no longer needs an app release. To change a core, change its fork and re-run the
+Retro-Consoles bundle workflow.
+
+---
+
+### Retro Console Support
+
+WinNative can also run classic console games alongside your PC library. Retro games live in the same Library and launch just like PC games, but run on an embedded libretro backend instead of Wine.
+
+Supported systems (bundled cores):
+
+| System | Core | ROM extensions |
+| --- | --- | --- |
+| NES | FCEUmm | `.nes` `.unf` `.unif` |
+| SNES | Snes9x | `.smc` `.sfc` `.swc` `.fig` |
+| Game Boy / Color | Gambatte | `.gb` `.gbc` |
+| Game Boy Advance | mGBA | `.gba` |
+| Genesis / Mega Drive, Master System, Game Gear | Genesis Plus GX | `.gen` `.md` `.smd` `.sms` `.gg` |
+| Nintendo 64 | Mupen64Plus-Next | `.n64` `.z64` `.v64` |
+| PlayStation | Beetle PSX | `.cue` `.chd` `.pbp` `.m3u` `.iso` |
+| PlayStation 2 | ARMSX2 (PCSX2 fork) | `.iso` `.chd` `.cso` `.bin` |
+
+Cores ship **prebuilt** (committed via Git LFS) and are used by default; they are built from
+source with the opt-in flags above (see `cores/` for the libretro cores and
+`armsx2/build-emucore.sh` / `dolphin/build-emucore.sh` for the PS2 and GameCube/Wii cores).
+PlayStation 2 online play is supported through the emulated DEV9 network adapter (see the
+in-game **Online** tab).
+
+**How to use:** In the Library, tap **Add Custom Game** and select a ROM instead of an `.exe`. WinNative detects the console and adds the game to your Library. Tap **Play** to launch it with on-screen touch controls and physical gamepad support; the in-game menu (Back button or on-screen **MENU**) offers save/load state, reset, and fast-forward. PlayStation and PlayStation 2 BIOS files can be imported from **Settings → Retro**.
+
+### Contributing
+
+We welcome community contributions! Feel free to open a pull request for bug fixes, driver updates, UI improvements, or anything else you'd like to add.
+
+Please match the existing code style and ensure any AI-assisted code is thoroughly reviewed and tested before submission.
+
+---
+
+### Credits & Acknowledgments
+
+- **Original Winlator** by [brunodev85](https://github.com/brunodev85/winlator)
+- **Winlator Bionic** by [Pipetto-crypto](https://github.com/Pipetto-crypto/winlator)
+- **Pluvia** features by the [Pluvia](https://github.com/oxters168/Pluvia) / [GameNative](https://github.com/utkarshdalal/GameNative) community
+- **Mesa/Turnip** contributions by the [Mesa3D](https://www.mesa3d.org/) team
+- **Goldberg Steam Emulator** by [Mr. Goldberg](https://gitlab.com/Mr_Goldberg/goldberg_emulator), maintained by [Detanup01](https://github.com/Detanup01/gbe_fork)
+- **LibretroDroid** by [Filippo Scognamiglio](https://github.com/Swordfish90/LibretroDroid) (GPL-3.0) — the embedded libretro host for retro console support
+- **libretro / RetroArch** and the individual core authors, built from source: [FCEUmm](https://github.com/libretro/libretro-fceumm), [Snes9x](https://github.com/libretro/snes9x), [Gambatte](https://github.com/libretro/gambatte-libretro), [mGBA](https://github.com/libretro/mgba), [Genesis Plus GX](https://github.com/libretro/Genesis-Plus-GX), [Mupen64Plus-Next](https://github.com/libretro/mupen64plus-libretro-nx), [Beetle PSX](https://github.com/libretro/beetle-psx-libretro)
+- **ARMSX2** by the [ARMSX2](https://github.com/ARMSX2/ARMSX2) team (GPL-3.0) — the PlayStation 2 core, a fork of **[PCSX2](https://github.com/pcsx2/pcsx2)** (GPL-3.0), built from source into `libemucore`. PS2 online play uses PCSX2's DEV9 network adapter
diff --git a/android_sysvshm/android_sysvshm.c b/android_sysvshm/android_sysvshm.c
index 4c890c77e..0602dcb2a 100644
--- a/android_sysvshm/android_sysvshm.c
+++ b/android_sysvshm/android_sysvshm.c
@@ -40,7 +40,8 @@ static int find_shmemory_index(int shmid) {
 static void sysvshm_connect() {
     if (sysvshm_server_fd >= 0) return;
     char* path = getenv("ANDROID_SYSVSHM_SERVER");
-    
+    if (path == NULL) return;
+
     int fd = socket(AF_UNIX, SOCK_STREAM, 0);
     if (fd < 0) return;
     
@@ -183,7 +184,7 @@ int shmget(key_t key, size_t size, int flags) {
 void* shmat(int shmid, const void* shmaddr, int shmflg) {
     pthread_mutex_lock(&mutex);
 
-    void* addr;
+    void* addr = (void *)-1;
     int index = find_shmemory_index(shmid);
     if (index != -1) {
         if (shmemories[index].addr == NULL) {
diff --git a/app/build.gradle b/app/build.gradle
index 2144fd93b..14fecd478 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,9 +8,45 @@ plugins {
     alias(libs.plugins.spotless)
 }
 
+/*
+abstract class InstallVulkanValidationLayerTask extends DefaultTask {
+    @Input
+    abstract Property<String> getLayerVersion()
+
+    @OutputFile
+    abstract RegularFileProperty getOutputFile()
+
+    @TaskAction
+    void install() {
+        def version = layerVersion.get()
+        def zipFile = new File(temporaryDir, "android-binaries-${version}.zip")
+        if (!zipFile.exists()) {
+            temporaryDir.mkdirs()
+            def url = new URL("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-${version}/android-binaries-${version}.zip")
+            url.withInputStream { input ->
+                zipFile.withOutputStream { output -> output << input }
+            }
+        }
+
+        def targetFile = outputFile.get().asFile
+        targetFile.parentFile.mkdirs()
+        new java.util.zip.ZipFile(zipFile).withCloseable { zip ->
+            def entry = zip.entries().find {
+                it.name.endsWith("/arm64-v8a/libVkLayer_khronos_validation.so")
+            }
+            if (entry == null) {
+                throw new GradleException("arm64-v8a Vulkan validation layer not found in ${zipFile.name}")
+            }
+            zip.getInputStream(entry).withCloseable { input ->
+                targetFile.withOutputStream { output -> output << input }
+            }
+        }
+    }
+}
+*/
+
 task checkSubmodules {
-    // Resolve the file path during the configuration phase so we don't
-    // pass the Gradle Project object into the execution closure (which breaks the Configuration Cache).
+    // Keep the execution closure configuration-cache friendly.
     def submodulePath = file("src/main/cpp/adrenotools").absolutePath
 
     doFirst {
@@ -23,6 +59,67 @@ task checkSubmodules {
 
 preBuild.dependsOn(checkSubmodules)
 
+abstract class FetchLibretroDroidTask extends DefaultTask {
+    @Input
+    abstract Property<String> getTag()
+
+    @Input
+    abstract Property<String> getSha256()
+
+    @OutputFile
+    abstract RegularFileProperty getOutputFile()
+
+    static String digestOf(File file) {
+        def digest = java.security.MessageDigest.getInstance("SHA-256")
+        file.withInputStream { input ->
+            byte[] buffer = new byte[1 << 16]
+            int read
+            while ((read = input.read(buffer)) >= 0) digest.update(buffer, 0, read)
+        }
+        digest.digest().collect { String.format("%02x", it) }.join()
+    }
+
+    @TaskAction
+    void fetch() {
+        def expected = sha256.get()
+        def target = outputFile.get().asFile
+        if (target.isFile() && digestOf(target) == expected) return
+
+        target.parentFile.mkdirs()
+        def source = "https://github.com/WinNative-Emu/LibretroDroid/releases/download/${tag.get()}/libretrodroid.aar"
+        def staging = new File(target.parentFile, target.name + ".part")
+        new URL(source).withInputStream { input ->
+            staging.withOutputStream { output -> output << input }
+        }
+
+        def actual = digestOf(staging)
+        if (actual != expected) {
+            staging.delete()
+            throw new GradleException("libretrodroid.aar from ${tag.get()} has checksum ${actual}, expected ${expected}")
+        }
+        target.delete()
+        staging.renameTo(target)
+    }
+}
+
+def libretroDroidPin = rootProject.file("tools/libretrodroid.version").readLines()
+        .collect { it.trim() }
+        .findAll { !it.isEmpty() }
+def libretroDroidAar = layout.buildDirectory.file("libretrodroid/libretrodroid.aar")
+
+def fetchLibretroDroid = tasks.register("fetchLibretroDroid", FetchLibretroDroidTask) {
+    tag.set(libretroDroidPin[0])
+    sha256.set(libretroDroidPin[1])
+    outputFile.set(libretroDroidAar)
+}
+
+/*
+def installVulkanValidationLayer = tasks.register("installVulkanValidationLayer", InstallVulkanValidationLayerTask) {
+    layerVersion.set("1.4.341.0")
+    outputFile.set(layout.projectDirectory.file("src/debug/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so"))
+}
+*/
+
 ksp {
     arg("room.schemaLocation", "$projectDir/schemas")
 }
@@ -31,6 +128,9 @@ def appVersionName = providers.gradleProperty("VERSION_NAME")
         .orElse(providers.environmentVariable("VERSION_NAME"))
         .getOrElse("Nightly")
 
+def coldClientVersionFile = rootProject.file("tools/gbe_fork.version")
+def coldClientVersion = coldClientVersionFile.exists() ? coldClientVersionFile.text.trim() : "unknown"
+
 android {
     namespace 'com.winlator.cmod'
     compileSdk 35
@@ -39,13 +139,15 @@ android {
         applicationId "com.winnative.cmod"
         minSdk 26
         targetSdk 28
-        versionCode 21
+        versionCode 2
         versionName appVersionName
 
         externalNativeBuild {
             cmake {
                 cppFlags ''
-                arguments "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384", "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-z,max-page-size=16384"
+                arguments "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384",
+                          "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-z,max-page-size=16384",
+                          "-DANDROID_STL=c++_shared"
             }
         }
 
@@ -53,13 +155,14 @@ android {
             abiFilters 'arm64-v8a'
         }
 
-        resConfigs "en", "da", "de", "es", "fr", "it", "ko", "pl", "pt-rBR", "ro", "uk", "zh-rCN", "zh-rTW"
+        resConfigs "en", "da", "de", "es", "b+es+419", "fi", "fr", "hi", "it", "ja", "ko", "no", "pl", "pt", "pt-rBR", "ro", "ru", "sv", "th", "tr", "uk", "zh-rCN", "zh-rTW"
+
+        buildConfigField("String", "COLD_CLIENT_VERSION", "\"${coldClientVersion}\"")
+        buildConfigField "String", "RESHADE_CATALOG_URL", "\"https://raw.githubusercontent.com/nicholasx417/WinNative-Components/main/Reshade.json\""
+    }
 
-        buildConfigField("boolean", "GOLD", "false")
-        buildConfigField("String", "POSTHOG_API_KEY", "\"\"")
-        buildConfigField("String", "POSTHOG_HOST", "\"\"")
-        buildConfigField("String", "SUPABASE_URL", "\"\"")
-        buildConfigField("String", "SUPABASE_KEY", "\"\"")
+    androidResources {
+        noCompress += ['tzst', 'txz']
     }
 
     compileOptions {
@@ -92,11 +195,14 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            // Use release signing if available, otherwise fall back to default debug signing
+            proguardFiles 'proguard-rules.pro'
+            // Prefer release signing when configured.
             signingConfig signingConfigs.release.storeFile != null ? signingConfigs.release : signingConfigs.debug
         }
         release {
             minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                          'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
     }
@@ -116,6 +222,10 @@ android {
             dimension "branding"
             applicationId "com.tencent.ig"
         }
+        antutu {
+            dimension "branding"
+            applicationId "com.antutu.ABenchMark"
+        }
     }
 
     ndkVersion '27.3.13750724'
@@ -132,15 +242,10 @@ android {
             excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
         }
         jniLibs {
+            // PulseAudio runs libpulseaudio.so directly from nativeLibraryDir and loads
+            // libpulse*/libltdl/libsndfile as its dependencies, so these must be packaged
+            // and extracted to disk (useLegacyPackaging) rather than excluded.
             useLegacyPackaging = true
-            excludes += [
-                    "lib/arm64-v8a/libltdl.so",
-                    "lib/arm64-v8a/libpulseaudio.so",
-                    "lib/arm64-v8a/libpulse.so",
-                    "lib/arm64-v8a/libpulsecommon-13.0.so",
-                    "lib/arm64-v8a/libpulsecore-13.0.so",
-                    "lib/arm64-v8a/libsndfile.so"
-            ]
         }
     }
 
@@ -148,6 +253,7 @@ android {
         compose true
         viewBinding true
         buildConfig true
+        prefab true   // native Steam/runtime components link OpenSSL + curl via NDK Prefab AARs
     }
 
     sourceSets {
@@ -157,13 +263,24 @@ android {
                     'src/main/feature',
                     'src/main/sharedmemory',
                     'src/main/runtime',
-                    'src/main/shared'
+                    'src/main/shared',
+                    // SDL2 and love-android glue, vendored for the 3D engine.
+                    // Their class names are a JNI contract with liblove.so and
+                    // cannot be renamed or repackaged, so they are kept apart
+                    // from WinNative's own sources with their upstream licence
+                    // headers intact. See EMULATOR_CREDITS.md.
+                    'src/main/engine'
             ]
         }
     }
 
     applicationVariants.configureEach { variant ->
         if (variant.buildType.name == "debug") {
+/*
+            tasks.named("pre${variant.name.capitalize()}Build").configure {
+                dependsOn installVulkanValidationLayer
+            }
+*/
             variant.outputs.configureEach { output ->
                 output.outputFileName = "${variant.flavorName}.apk"
             }
@@ -176,8 +293,8 @@ dependencies {
 
     implementation libs.okhttp
     implementation libs.okhttpDnsOverHttps
-    implementation libs.okhttpLoggingInterceptor
     implementation libs.serializationJson
+    implementation 'org.yaml:snakeyaml:2.2'
 
     implementation libs.jwtDecode
     implementation libs.securityCrypto
@@ -197,7 +314,6 @@ dependencies {
     implementation libs.composeMaterialIconsExtended
     implementation libs.activityCompose
     implementation libs.navigationCompose
-    implementation libs.lifecycleRuntimeCompose
     implementation libs.lifecycleViewmodelCompose
     implementation libs.composeUiTextGoogleFonts
     implementation libs.coilCompose
@@ -207,9 +323,7 @@ dependencies {
     implementation libs.zxingCore
     implementation libs.commonsIo
     implementation libs.commonsLang3
-    implementation libs.protobufJava
     implementation("com.github.luben:zstd-jni:${libs.versions.zstdJni.get()}@aar")
-    implementation libs.bouncyCastle
     implementation libs.flexbox
 
     implementation libs.appcompat
@@ -224,13 +338,18 @@ dependencies {
     implementation libs.recyclerview
     implementation libs.coreKtx
 
-    implementation libs.javaSteam
-    implementation libs.javaSteamDepotDownloader
+
+    implementation 'com.android.ndk.thirdparty:openssl:1.1.1q-beta-1'
+    implementation 'com.android.ndk.thirdparty:curl:7.85.0-beta-1'
 
     implementation libs.playServicesGamesV2
-    implementation libs.playServicesAuth
 
     implementation libs.workRuntimeKtx
+
+    implementation files(libretroDroidAar) { builtBy fetchLibretroDroid }
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation project(':armsx2')
+    implementation project(':dolphin')
 }
 
 spotless {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 000000000..309cd5ea7
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,105 @@
+# Project ProGuard / R8 rules. Built APK is `minifyEnabled true`; without
+# these keeps, R8's release build strips classes that the runtime reaches
+# only via reflection — most notably BouncyCastle's java.security.Provider
+# Service registrations (the SPI map BouncyCastleProvider uses to expose
+# KeyStore.BKS, MessageDigest.*, etc.).
+#
+# Crash symptom 2026-05-19 (commit e1cb6c6 onward; not caused by hybrid work):
+#   java.security.NoSuchAlgorithmException: BKS KeyStore not available
+#   at sun.security.jca.GetInstance.getInstance:159
+#   at java.security.Security.getImpl:628
+#   at java.security.KeyStore.getInstance:901
+#   at com.android.org.conscrypt.KeyManagerFactoryImpl.engineInit
+#   at OkHttp Platform.systemDefaultTrustManager (obfuscated e8.j.n)
+#
+# PluviaApp.onCreate calls Security.addProvider(BouncyCastleProvider()),
+# which DOES expose "BKS" — but only if R8 didn't strip the Service
+# classes BC registers reflectively. The rules below keep them.
+# [[project_bks_keystore_crash]]
+
+-keep class org.bouncycastle.** { *; }
+-keep class org.bouncycastle.jce.provider.** { *; }
+-keep class org.bouncycastle.jcajce.provider.** { *; }
+-dontwarn org.bouncycastle.**
+
+# BouncyCastle reads service-loader entries from META-INF/services. R8's
+# default config copies META-INF/services for the kept classes; the
+# explicit `-keep` above ensures the impl classes survive.
+
+# JNI bridge classes — Rust `libwnsteam.so` and the wn-steam-bootstrap C++ lib
+# look these up by string in JNI_OnLoad / via FindClass. R8 renames break
+# the lookup → JNI_OnLoad returns JNI_ERR and the entire native side dies.
+# Crash 2026-05-19: "JNI_ERR returned from JNI_OnLoad in libwnsteam.so"
+# was triggered by R8 renaming WnConnectionObserver and the auth/library/
+# session callback observers the native JNI layer finds by name.
+-keep class com.winlator.cmod.feature.stores.steam.wnsteam.** {
+}
+-keepclassmembers class com.winlator.cmod.feature.stores.steam.wnsteam.** {
+}
+# JNI also calls back into PrefManager / SteamService observers + Steam
+# data classes (UserFileInfo, AppMetadata, etc.). Keep the feature
+# package broadly — the .so depends on the runtime layout, and shaving
+# bytes here is high-risk-low-reward.
+-keep class com.winlator.cmod.feature.stores.steam.** { *; }
+-keepclassmembers class com.winlator.cmod.feature.stores.steam.** { *; }
+
+# Native-method classes: `native` keyword on Kotlin/Java methods is a
+# universal R8 keep signal, but pinning the enclosing class avoids
+# subclass-rename surprises.
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# zstd-jni — the native side does GetFieldID("srcPos", "J") /
+# GetFieldID("dstPos", "J") on ZstdInputStreamNoFinalizer and
+# similar via JNI; R8 renames the Kotlin/Java fields and the lookup
+# crashes the process at sign-in (`libwnsteam.so` decompresses Steam
+# CM messages with zstd). Diagnosed 2026-05-19 from
+# `Abort message: java.lang.NoSuchFieldError: no "J" field "srcPos"
+# in class Lcom/github/luben/zstd/ZstdInputStreamNoFinalizer`.
+-keep class com.github.luben.zstd.** { *; }
+-keepclassmembers class com.github.luben.zstd.** { *; }
+-dontwarn com.github.luben.zstd.**
+
+# Conscrypt / OkHttp use reflection to discover security providers; keep
+# the Provider names they look up by string.
+-keep class java.security.Provider { *; }
+-keep class * extends java.security.Provider { *; }
+-keep class * extends java.security.KeyStoreSpi { *; }
+-keep class * extends java.security.MessageDigestSpi { *; }
+-keep class * extends javax.crypto.CipherSpi { *; }
+-keep class * extends javax.crypto.MacSpi { *; }
+-keep class * extends javax.crypto.KeyAgreementSpi { *; }
+-keep class * extends java.security.KeyFactorySpi { *; }
+-keep class * extends javax.crypto.SecretKeyFactorySpi { *; }
+-keep class * extends javax.crypto.KeyGeneratorSpi { *; }
+-keep class * extends java.security.AlgorithmParametersSpi { *; }
+-keep class * extends java.security.SignatureSpi { *; }
+-keep class com.winlator.cmod.shared.io.NativeContentIO {
+    *;
+}
+
+-keep class com.winlator.cmod.shared.util.OnExtractFileListener {
+    public java.io.File onExtractFile(java.io.File, long);
+}
+
+-keep class com.winlator.cmod.runtime.content.Downloader$DownloadListener {
+    public void onProgress(long, long);
+}
+
+-dontwarn androidx.window.extensions.WindowExtensions
+-dontwarn androidx.window.extensions.WindowExtensionsProvider
+-dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
+-dontwarn androidx.window.extensions.core.util.function.Consumer
+-dontwarn androidx.window.extensions.core.util.function.Function
+-dontwarn androidx.window.extensions.core.util.function.Predicate
+-dontwarn androidx.window.extensions.layout.DisplayFeature
+-dontwarn androidx.window.extensions.layout.FoldingFeature
+-dontwarn androidx.window.extensions.layout.WindowLayoutComponent
+-dontwarn androidx.window.extensions.layout.WindowLayoutInfo
+-dontwarn androidx.window.sidecar.SidecarDeviceState
+-dontwarn androidx.window.sidecar.SidecarDisplayFeature
+-dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
+-dontwarn androidx.window.sidecar.SidecarInterface
+-dontwarn androidx.window.sidecar.SidecarProvider
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
diff --git a/app/src/antutu/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/antutu/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..d372a4fca
--- /dev/null
+++ b/app/src/antutu/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/app/src/antutu/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/antutu/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..d372a4fca
--- /dev/null
+++ b/app/src/antutu/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/app/src/antutu/res/mipmap-hdpi/ic_launcher.png b/app/src/antutu/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..eeda513bc
Binary files /dev/null and b/app/src/antutu/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/antutu/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/antutu/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..fd40adda6
Binary files /dev/null and b/app/src/antutu/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/antutu/res/mipmap-hdpi/ic_launcher_round.png b/app/src/antutu/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..91ecbc7c6
Binary files /dev/null and b/app/src/antutu/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/antutu/res/mipmap-mdpi/ic_launcher.png b/app/src/antutu/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..1d28f9b4e
Binary files /dev/null and b/app/src/antutu/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/antutu/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/antutu/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..28f3b653f
Binary files /dev/null and b/app/src/antutu/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/antutu/res/mipmap-mdpi/ic_launcher_round.png b/app/src/antutu/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..5309989cd
Binary files /dev/null and b/app/src/antutu/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/antutu/res/mipmap-xhdpi/ic_launcher.png b/app/src/antutu/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..c36adff62
Binary files /dev/null and b/app/src/antutu/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/antutu/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/antutu/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..15834a0d4
Binary files /dev/null and b/app/src/antutu/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/antutu/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/antutu/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..514cd6047
Binary files /dev/null and b/app/src/antutu/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/antutu/res/mipmap-xxhdpi/ic_launcher.png b/app/src/antutu/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6d4571181
Binary files /dev/null and b/app/src/antutu/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/antutu/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/antutu/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..d19894c47
Binary files /dev/null and b/app/src/antutu/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/antutu/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/antutu/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..e4642022c
Binary files /dev/null and b/app/src/antutu/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..aec9083dc
Binary files /dev/null and b/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..f059f3ddb
Binary files /dev/null and b/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..9e6038c70
Binary files /dev/null and b/app/src/antutu/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000..f47226353
--- /dev/null
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <meta-data
+            android:name="com.android.graphics.injectLayers.enable"
+            android:value="true" />
+    </application>
+</manifest>
diff --git a/app/src/debug/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so b/app/src/debug/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so
new file mode 100644
index 000000000..60983e850
Binary files /dev/null and b/app/src/debug/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so differ
diff --git a/app/src/ludashi/res/mipmap-hdpi/ic_launcher.png b/app/src/ludashi/res/mipmap-hdpi/ic_launcher.png
index eeda513bc..b9dff1158 100644
Binary files a/app/src/ludashi/res/mipmap-hdpi/ic_launcher.png and b/app/src/ludashi/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/ludashi/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/ludashi/res/mipmap-hdpi/ic_launcher_foreground.png
index fd40adda6..cc7dfe0b2 100644
Binary files a/app/src/ludashi/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/ludashi/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/ludashi/res/mipmap-hdpi/ic_launcher_round.png b/app/src/ludashi/res/mipmap-hdpi/ic_launcher_round.png
index 91ecbc7c6..dfaa43758 100644
Binary files a/app/src/ludashi/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/ludashi/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/ludashi/res/mipmap-mdpi/ic_launcher.png b/app/src/ludashi/res/mipmap-mdpi/ic_launcher.png
index 1d28f9b4e..992f8fbed 100644
Binary files a/app/src/ludashi/res/mipmap-mdpi/ic_launcher.png and b/app/src/ludashi/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/ludashi/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/ludashi/res/mipmap-mdpi/ic_launcher_foreground.png
index 28f3b653f..c2a7fc0fc 100644
Binary files a/app/src/ludashi/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/ludashi/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/ludashi/res/mipmap-mdpi/ic_launcher_round.png b/app/src/ludashi/res/mipmap-mdpi/ic_launcher_round.png
index 5309989cd..d95315bf6 100644
Binary files a/app/src/ludashi/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/ludashi/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/ludashi/res/mipmap-xhdpi/ic_launcher.png b/app/src/ludashi/res/mipmap-xhdpi/ic_launcher.png
index c36adff62..f75bc0375 100644
Binary files a/app/src/ludashi/res/mipmap-xhdpi/ic_launcher.png and b/app/src/ludashi/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_foreground.png
index 15834a0d4..2bcc3709e 100644
Binary files a/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_round.png
index 514cd6047..84f357dd5 100644
Binary files a/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/ludashi/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher.png b/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher.png
index 6d4571181..7ce21a60b 100644
Binary files a/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_foreground.png
index d19894c47..0bf39ea0f 100644
Binary files a/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_round.png
index e4642022c..745f05e2e 100644
Binary files a/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/ludashi/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher.png
index aec9083dc..1dd339ca2 100644
Binary files a/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index f059f3ddb..9a6c604b5 100644
Binary files a/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_round.png
index 9e6038c70..3ca95afb8 100644
Binary files a/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/ludashi/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e2ec759f..7d06e5609 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,10 +7,22 @@
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />
+    <!-- USB host for GameSir GCM vendor rumble (e.g. G8+); optional so non-OTG devices still install -->
+    <uses-feature
+        android:name="android.hardware.usb.host"
+        android:required="false" />
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Bluetooth LE for GameSir GCM rumble (e.g. X5s) -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -19,8 +31,11 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission
         android:name="android.permission.WRITE_SECURE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
@@ -88,7 +103,23 @@
             android:supportsPictureInPicture="true"
             android:screenOrientation="sensorLandscape"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|density|navigation"
-            android:exported="true" />
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:mimeType="application/x-desktop" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.desktop" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name="com.winlator.cmod.runtime.input.ControlsEditorActivity"
@@ -96,6 +127,38 @@
             android:screenOrientation="sensorLandscape"
             android:exported="false" />
 
+        <activity
+            android:name="com.winlator.cmod.feature.retro.RetroActivity"
+            android:theme="@style/AppThemeFullscreen"
+            android:launchMode="singleTask"
+            android:screenOrientation="sensorLandscape"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|density|navigation"
+            android:exported="false" />
+
+        <!-- The 3D engine. Runs in its own process like the Dolphin host does,
+             so a crash in SDL or the Lua engine cannot take WinNative's UI
+             process down with it. -->
+        <activity
+            android:name="com.winlator.cmod.feature.retro.Gen1EngineActivity"
+            android:process=":engine3d"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:launchMode="singleTop"
+            android:screenOrientation="sensorLandscape"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|density|navigation|uiMode"
+            android:exported="false" />
+
+        <activity
+            android:name="com.winlator.cmod.feature.retro.RetroAchievementsActivity"
+            android:theme="@style/AppThemeTranslucent"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|density|navigation"
+            android:exported="false" />
+
+        <activity
+            android:name="com.winlator.cmod.feature.retro.RetroCheatsActivity"
+            android:theme="@style/AppThemeTranslucent"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|density|navigation"
+            android:exported="false" />
+
         <receiver
             android:name="com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver"
             android:exported="true">
@@ -111,6 +174,18 @@
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
+        <service
+            android:name="com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <activity
+            android:name="com.winlator.cmod.feature.stores.steam.chat.ChatImagePickerActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:exported="false" />
+
         <service
             android:name="com.winlator.cmod.feature.stores.epic.service.EpicService"
             android:enabled="true"
@@ -123,6 +198,21 @@
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
+        <!-- Need for keep the container alive when the process is paused,
+             also required to prevent the system from killing a component download/install
+             is in flight. -->
+        <service
+            android:name="com.winlator.cmod.runtime.system.SessionKeepAliveService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="specialUse|dataSync"
+            android:stopWithTask="false">
+
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Required to prevent the container from closing even when the process is paused."/>
+        </service>
+
         <!-- AppCompat per-app language backport storage (pre-Android 13) -->
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
@@ -168,7 +258,19 @@
             android:value="@string/play_games_app_id" />
         <meta-data
             android:name="com.google.android.gms.games.should_auto_sign_in"
-            android:value="true" />
+            android:value="false" />
+
+        <provider
+            android:name="com.google.android.gms.games.provider.PlayGamesInitProvider"
+            tools:node="remove" />
+
+        <receiver
+            android:name="com.winlator.cmod.feature.stores.steam.service.HybridModeReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.winnative.cmod.action.HYBRID_MODE" />
+            </intent-filter>
+        </receiver>
 
     </application>
 </manifest>
diff --git a/app/src/main/app/PluviaApp.kt b/app/src/main/app/PluviaApp.kt
index 9ca57b4e8..7db378cbe 100644
--- a/app/src/main/app/PluviaApp.kt
+++ b/app/src/main/app/PluviaApp.kt
@@ -8,6 +8,7 @@ import com.winlator.cmod.app.update.UpdateChecker
 import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
 import com.winlator.cmod.feature.stores.gog.service.GOGConstants
 import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
 import com.winlator.cmod.feature.stores.steam.utils.PrefManager
 import com.winlator.cmod.runtime.display.XServerDisplayActivity
 import com.winlator.cmod.shared.android.RefreshRateUtils
@@ -17,39 +18,59 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.Security
+import java.io.File
 
 @HiltAndroidApp
 class PluviaApp : Application() {
     private val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
 
+    private fun isPs2Process(): Boolean {
+        val name =
+            if (android.os.Build.VERSION.SDK_INT >= 28) {
+                Application.getProcessName()
+            } else {
+                runCatching {
+                    val pid = android.os.Process.myPid()
+                    val am = getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager
+                    am.runningAppProcesses?.firstOrNull { it.pid == pid }?.processName
+                }.getOrNull()
+            }
+        return name?.endsWith(":ps2") == true || name?.endsWith(":gc") == true
+    }
+
     override fun onCreate() {
         super.onCreate()
         instance = this
 
-        registerRefreshRateLifecycleCallbacks()
+        Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
+            Log.e("PluviaApp", "CRASH in thread ${thread.name}", throwable)
+        }
+
+        com.winlator.cmod.feature.retro.Ps2GameOverlay.install()
+        com.winlator.cmod.feature.retro.DolphinGameOverlay.install()
+        if (isPs2Process()) return
 
-        // Replace Android's limited BouncyCastle provider with the full one
-        // so that JavaSteam can use SHA-1 (and other algorithms) via the "BC" provider.
-        Security.removeProvider("BC")
-        Security.addProvider(BouncyCastleProvider())
+        // Cached probe for devices whose native stack still needs system libjpeg preloaded.
+        preloadSystemLibraries()
+
+        registerRefreshRateLifecycleCallbacks()
 
-        // Register application context so secure Steam prefs can initialize lazily.
         PrefManager.install(this)
         GOGConstants.init(this)
 
-        // Initialize process-wide reactive network state
         com.winlator.cmod.app.service.NetworkMonitor
             .init(this)
         scheduleColdStartWarmups()
-
-        Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
-            Log.e("PluviaApp", "CRASH in thread ${thread.name}", throwable)
-        }
     }
 
     companion object {
+        private const val STARTUP_PROBES_PREFS = "startup_probes"
+        private const val KEY_SYSTEM_JPEG_PRELOAD_STATE = "system_jpeg_preload_state"
+        private const val KEY_SYSTEM_JPEG_PRELOAD_VERSION = "system_jpeg_preload_version"
+        private const val SYSTEM_JPEG_PRELOAD_UNKNOWN = 0
+        private const val SYSTEM_JPEG_PRELOAD_SUCCESS = 1
+        private const val SYSTEM_JPEG_PRELOAD_UNSUPPORTED = 2
+
         lateinit var instance: PluviaApp
             private set
 
@@ -59,6 +80,76 @@ class PluviaApp : Application() {
 
         @JvmField
         val events = EventDispatcher()
+
+        // Visible activity count; mutated only on the main thread.
+        @Volatile
+        private var startedActivityCount = 0
+
+        // Live game windows, including backgrounded sessions.
+        @Volatile
+        private var gameActivityCount = 0
+
+        fun isGameSessionActive(): Boolean = gameActivityCount > 0
+    }
+
+    private fun preloadSystemLibraries() {
+        val prefs = getSharedPreferences(STARTUP_PROBES_PREFS, MODE_PRIVATE)
+        val currentVersion = currentVersionCode()
+        val state =
+            if (prefs.getLong(KEY_SYSTEM_JPEG_PRELOAD_VERSION, -1L) == currentVersion) {
+                prefs.getInt(KEY_SYSTEM_JPEG_PRELOAD_STATE, SYSTEM_JPEG_PRELOAD_UNKNOWN)
+            } else {
+                SYSTEM_JPEG_PRELOAD_UNKNOWN
+            }
+
+        if (state == SYSTEM_JPEG_PRELOAD_UNSUPPORTED) return
+
+        val is64 = android.os.Build.SUPPORTED_64_BIT_ABIS.isNotEmpty()
+        val candidates = if (is64) {
+            listOf("/system/lib64/libjpeg.so", "/system/lib/libjpeg.so")
+        } else {
+            listOf("/system/lib/libjpeg.so", "/system/lib64/libjpeg.so")
+        }
+        for (path in candidates) {
+            if (!File(path).exists()) continue
+            try {
+                System.load(path)
+                prefs.edit()
+                    .putInt(KEY_SYSTEM_JPEG_PRELOAD_STATE, SYSTEM_JPEG_PRELOAD_SUCCESS)
+                    .putLong(KEY_SYSTEM_JPEG_PRELOAD_VERSION, currentVersion)
+                    .apply()
+                Log.i("PluviaApp", "Preloaded $path")
+                return
+            } catch (t: Throwable) {
+                if (isPermanentSystemLibraryPreloadFailure(t)) {
+                    prefs.edit()
+                        .putInt(KEY_SYSTEM_JPEG_PRELOAD_STATE, SYSTEM_JPEG_PRELOAD_UNSUPPORTED)
+                        .putLong(KEY_SYSTEM_JPEG_PRELOAD_VERSION, currentVersion)
+                        .apply()
+                    Log.i("PluviaApp", "Skipping future system libjpeg preload attempts: ${t.message}")
+                    return
+                }
+                Log.w("PluviaApp", "Preload $path failed: ${t.message}")
+            }
+        }
+    }
+
+    private fun isPermanentSystemLibraryPreloadFailure(error: Throwable): Boolean {
+        val message = error.message.orEmpty()
+        return message.contains("not accessible for the namespace", ignoreCase = true) ||
+            message.contains("is not accessible", ignoreCase = true)
+    }
+
+    private fun currentVersionCode(): Long {
+        return runCatching {
+            val info = packageManager.getPackageInfo(packageName, 0)
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+                info.longVersionCode
+            } else {
+                @Suppress("DEPRECATION")
+                info.versionCode.toLong()
+            }
+        }.getOrDefault(0L)
     }
 
     private fun registerRefreshRateLifecycleCallbacks() {
@@ -68,6 +159,9 @@ class PluviaApp : Application() {
                     activity: Activity,
                     savedInstanceState: Bundle?,
                 ) {
+                    if (activity is XServerDisplayActivity) {
+                        gameActivityCount++
+                    }
                     if (shouldManageAppRefreshRate(activity)) {
                         RefreshRateUtils.onActivityCreated(activity)
                     }
@@ -80,7 +174,11 @@ class PluviaApp : Application() {
                     }
                 }
 
-                override fun onActivityStarted(activity: Activity) {}
+                override fun onActivityStarted(activity: Activity) {
+                    if (startedActivityCount++ == 0) {
+                        SteamService.onAppForegrounded()
+                    }
+                }
 
                 override fun onActivityPaused(activity: Activity) {
                     if (currentForegroundActivity === activity) {
@@ -88,7 +186,12 @@ class PluviaApp : Application() {
                     }
                 }
 
-                override fun onActivityStopped(activity: Activity) {}
+                override fun onActivityStopped(activity: Activity) {
+                    startedActivityCount = (startedActivityCount - 1).coerceAtLeast(0)
+                    if (startedActivityCount == 0) {
+                        SteamService.onAppBackgrounded()
+                    }
+                }
 
                 override fun onActivitySaveInstanceState(
                     activity: Activity,
@@ -102,13 +205,20 @@ class PluviaApp : Application() {
                     if (currentForegroundActivity === activity) {
                         currentForegroundActivity = null
                     }
+                    if (activity is XServerDisplayActivity) {
+                        gameActivityCount = (gameActivityCount - 1).coerceAtLeast(0)
+                        // If the last game window ends while backgrounded, let Steam sleep.
+                        if (gameActivityCount == 0 && startedActivityCount == 0) {
+                            SteamService.onAppBackgrounded()
+                        }
+                    }
                 }
             },
         )
     }
 
     private fun shouldManageAppRefreshRate(activity: Activity): Boolean {
-        // Game windows own per-title refresh policy and should not inherit the global app override.
+        // Game windows own per-title refresh policy.
         return activity !is XServerDisplayActivity
     }
 
@@ -118,8 +228,7 @@ class PluviaApp : Application() {
             withContext(Dispatchers.IO) {
                 GOGAuthManager.updateLoginStatus(this@PluviaApp)
 
-                // Pre-warm encrypted preferences off the UI thread so launcher auth checks
-                // are less likely to pay MasterKey/EncryptedSharedPreferences startup cost.
+                // Keep encrypted prefs setup off launcher auth checks.
                 val steamLogsEnabled =
                     runCatching {
                         PrefManager.init(this@PluviaApp)
@@ -137,10 +246,7 @@ class PluviaApp : Application() {
                 runCatching { PluviaDatabase.init(this@PluviaApp) }
                     .onFailure { Log.e("PluviaApp", "Database warmup failed", it) }
 
-                // Initialize the cross-store DownloadCoordinator and auto-resume any
-                // downloads that were running when the app was killed. PAUSED downloads
-                // stay PAUSED; DOWNLOADING ones are demoted to QUEUED and dispatched as
-                // store services start.
+                // Restore interrupted downloads after DB/coordinator startup.
                 runCatching {
                     val db = PluviaDatabase.getInstance(this@PluviaApp)
                     com.winlator.cmod.app.service.download.DownloadCoordinator.init(db)
@@ -148,8 +254,6 @@ class PluviaApp : Application() {
                         .attemptStartupRestoration()
                 }.onFailure { Log.e("PluviaApp", "DownloadCoordinator startup failed", it) }
 
-                com.winlator.cmod.runtime.system.LogManager
-                    .rotateLogsOnAppStart(this@PluviaApp)
                 com.winlator.cmod.runtime.system.LogManager
                     .startAppLogging(this@PluviaApp)
 
diff --git a/app/src/main/app/config/SettingsConfig.kt b/app/src/main/app/config/SettingsConfig.kt
index ed9d2de21..528abe7fd 100644
--- a/app/src/main/app/config/SettingsConfig.kt
+++ b/app/src/main/app/config/SettingsConfig.kt
@@ -5,7 +5,13 @@ import androidx.preference.PreferenceManager
 
 object SettingsConfig {
     @JvmField
-    val DEFAULT_WINE_DEBUG_CHANNELS: String = "warn,err,fixme"
+    val DEFAULT_WINE_DEBUG_CHANNELS: String = "module,loaddll,seh"
+
+    @JvmField
+    val DEFAULT_WINE_DEBUG_CLASSES: String = "err,warn,fixme"
+
+    @JvmField
+    val WINE_DEBUG_CLASSES: List<String> = listOf("err", "warn", "fixme", "trace")
 
     @JvmField
     val DEFAULT_WINLATOR_PATH: String =
diff --git a/app/src/main/app/db/PluviaDatabase.kt b/app/src/main/app/db/PluviaDatabase.kt
index 888a1beb9..cb118149e 100644
--- a/app/src/main/app/db/PluviaDatabase.kt
+++ b/app/src/main/app/db/PluviaDatabase.kt
@@ -2,6 +2,8 @@ package com.winlator.cmod.app.db
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.winlator.cmod.feature.stores.steam.data.AppInfo
 import com.winlator.cmod.feature.stores.steam.data.CachedLicense
 import com.winlator.cmod.feature.stores.steam.data.ChangeNumbers
@@ -43,7 +45,7 @@ const val DATABASE_NAME = "pluvia_database"
         DownloadingAppInfo::class,
         DownloadRecord::class,
     ],
-    version = 4,
+    version = 8,
     exportSchema = false,
 )
 @TypeConverters(
@@ -89,7 +91,8 @@ abstract class PluviaDatabase : RoomDatabase() {
                         context.applicationContext,
                         PluviaDatabase::class.java,
                         DATABASE_NAME,
-                    ).fallbackToDestructiveMigration()
+                    ).addMigrations(MIGRATION_6_7, MIGRATION_7_8)
+                    .fallbackToDestructiveMigration(true)
                     .build()
                     .also { instance = it }
             }
@@ -97,5 +100,19 @@ abstract class PluviaDatabase : RoomDatabase() {
         fun getInstance(context: android.content.Context): PluviaDatabase = init(context)
 
         fun getInstance(): PluviaDatabase = instance ?: throw IllegalStateException("PluviaDatabase not initialized")
+
+        private val MIGRATION_7_8 =
+            object : Migration(7, 8) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE app_info ADD COLUMN install_path TEXT")
+                }
+            }
+
+        private val MIGRATION_6_7 =
+            object : Migration(6, 7) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE gog_games ADD COLUMN hero_image_url TEXT NOT NULL DEFAULT ''")
+                }
+            }
     }
 }
diff --git a/app/src/main/app/db/download/DownloadRecord.kt b/app/src/main/app/db/download/DownloadRecord.kt
index bad13ed34..a9d287280 100644
--- a/app/src/main/app/db/download/DownloadRecord.kt
+++ b/app/src/main/app/db/download/DownloadRecord.kt
@@ -32,6 +32,9 @@ data class DownloadRecord(
     val selectedDlcs: String = "",
     @ColumnInfo("language")
     val language: String = "",
+    /** One of: INSTALL, UPDATE, VERIFY. */
+    @ColumnInfo("task_type")
+    val taskType: String = TASK_INSTALL,
     /** One of: QUEUED, DOWNLOADING, PAUSED, COMPLETE, CANCELLED, FAILED. */
     @ColumnInfo("status")
     val status: String = STATUS_QUEUED,
@@ -51,6 +54,10 @@ data class DownloadRecord(
         const val STORE_EPIC = "EPIC"
         const val STORE_GOG = "GOG"
 
+        const val TASK_INSTALL = "INSTALL"
+        const val TASK_UPDATE = "UPDATE"
+        const val TASK_VERIFY = "VERIFY"
+
         const val STATUS_QUEUED = "QUEUED"
         const val STATUS_DOWNLOADING = "DOWNLOADING"
         const val STATUS_PAUSED = "PAUSED"
diff --git a/app/src/main/app/db/download/DownloadRecordDao.kt b/app/src/main/app/db/download/DownloadRecordDao.kt
index 21d2eb6d4..c0942d848 100644
--- a/app/src/main/app/db/download/DownloadRecordDao.kt
+++ b/app/src/main/app/db/download/DownloadRecordDao.kt
@@ -54,7 +54,11 @@ interface DownloadRecordDao {
     ): Int
 
     @Query(
-        "UPDATE download_records SET bytes_downloaded = :bytesDownloaded, bytes_total = :bytesTotal, updated_at = :now WHERE id = :id",
+        "UPDATE download_records SET " +
+            "bytes_downloaded = CASE " +
+            "WHEN :bytesTotal = bytes_total AND :bytesDownloaded < bytes_downloaded THEN bytes_downloaded " +
+            "ELSE :bytesDownloaded END, " +
+            "bytes_total = :bytesTotal, updated_at = :now WHERE id = :id",
     )
     suspend fun updateProgress(
         id: Long,
diff --git a/app/src/main/app/service/DownloadService.kt b/app/src/main/app/service/DownloadService.kt
index 754f72058..c6c99e8d7 100644
--- a/app/src/main/app/service/DownloadService.kt
+++ b/app/src/main/app/service/DownloadService.kt
@@ -116,13 +116,36 @@ object DownloadService {
         // (PAUSED or QUEUED) for which no store has yet created an in-memory DownloadInfo.
         // Fabricate stub DownloadInfos for those so the Downloads tab shows them and the user
         // can Resume / Cancel them.
-        val knownIds = list.map { it.first }.toSet()
         val coord = com.winlator.cmod.app.service.download.DownloadCoordinator
-        coord.snapshotRecords().forEach { record ->
+        val records = coord.snapshotRecords()
+        val recordsByUiId = records.associateBy { "${it.store}_${it.storeGameId}" }
+        list.forEach { (id, info) ->
+            val record = recordsByUiId[id] ?: return@forEach
+            if (record.bytesTotal > 0L) {
+                info.setDisplayTotalExpectedBytes(record.bytesTotal)
+                if (info.getTotalExpectedBytes() <= 0L) {
+                    info.setTotalExpectedBytes(record.bytesTotal)
+                    info.initializeBytesDownloaded(record.bytesDownloaded)
+                }
+            }
+        }
+
+        val knownIds = list.map { it.first }.toSet()
+        records.forEach { record ->
             val id = "${record.store}_${record.storeGameId}"
             if (id in knownIds) return@forEach
             val phase = mapRecordStatusToPhase(record.status)
             val gameIdInt = record.storeGameId.toIntOrNull() ?: 0
+            // Preserve the original FAILED reason across restarts so the row
+            // doesn't collapse to a generic "Unknown error" on rehydrate.
+            val stubStatusMessage =
+                when (phase) {
+                    com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.PAUSED ->
+                        appContext?.getString(R.string.downloads_queue_paused_resume_hint)
+                    com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.FAILED ->
+                        record.errorMessage?.takeUnless { it.isBlank() }
+                    else -> null
+                }
             val stub =
                 com.winlator.cmod.feature.stores.steam.data.DownloadInfo(
                     jobCount = 1,
@@ -130,14 +153,10 @@ object DownloadService {
                     downloadingAppIds = java.util.concurrent.CopyOnWriteArrayList(),
                 ).apply {
                     setActive(false)
-                    updateStatus(
-                        phase,
-                        appContext?.getString(R.string.downloads_queue_paused_resume_hint).takeIf {
-                            phase == com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.PAUSED
-                        },
-                    )
+                    updateStatus(phase, stubStatusMessage)
                     if (record.bytesTotal > 0L) {
                         setTotalExpectedBytes(record.bytesTotal)
+                        setDisplayTotalExpectedBytes(record.bytesTotal)
                         initializeBytesDownloaded(record.bytesDownloaded)
                     }
                 }
diff --git a/app/src/main/app/service/download/DownloadCoordinator.kt b/app/src/main/app/service/download/DownloadCoordinator.kt
index 5900f694c..992fb27ed 100644
--- a/app/src/main/app/service/download/DownloadCoordinator.kt
+++ b/app/src/main/app/service/download/DownloadCoordinator.kt
@@ -21,46 +21,25 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 /**
- * Single source of truth for downloads across Steam / Epic / GOG.
- *
- * Responsibilities:
- *  * Enforces a single active download shared across all stores.
- *  * Persists every download as a [DownloadRecord] so they survive app restarts.
- *  * Auto-resumes downloads that were active when the app exited; leaves PAUSED ones paused.
- *
- * Flow of a download:
- *  1. The store-specific service receives a download request from the UI.
- *  2. It calls [requestSlot]. The coordinator persists or updates a DownloadRecord and tells
- *     the caller whether to start now ([Decision.Start]) or wait ([Decision.Queue]).
- *  3. When a download finishes, the store calls [notifyFinished]; the coordinator updates the
- *     record and dispatches the next queued download (if any) via the registered [Dispatcher].
- *  4. UI controls (pause / resume / cancel / clear) call into the coordinator, which mutates
- *     the record and asks the dispatcher to perform the side effect (cancel the running job,
- *     delete partial files, etc.).
+ * Coordinates persisted downloads across stores, allowing one active transfer at a time and
+ * dispatching queued work to each store service.
  */
 object DownloadCoordinator {
     private const val MAX_PARALLEL_DOWNLOADS = 1
 
-    /**
-     * A per-store hook the coordinator uses to start, pause, resume, or cancel an actual
-     * download. Stores register their dispatcher at service startup.
-     */
+    /** Per-store hook for actual download side effects. */
     interface Dispatcher {
-        /**
-         * Start a download that the coordinator just dequeued. The store should look up the
-         * pending request matching this record and launch the actual coroutine. Called from
-         * the coordinator's IO scope.
-         */
+        /** Start a download the coordinator just dequeued. */
         fun startQueued(record: DownloadRecord)
 
-        /** Pause an actively running download, persisting partial files. */
+        /** Pause a running download while keeping partial files. */
         fun pauseRunning(record: DownloadRecord)
 
-        /**
-         * Cancel an actively running download and delete partial files. The coordinator has
-         * already marked the record CANCELLED.
-         */
+        /** Cancel a running download and delete partial files. */
         fun cancelRunning(record: DownloadRecord)
+
+        /** True while the store has a live transfer for this record. */
+        fun isTransferActive(record: DownloadRecord): Boolean = true
     }
 
     private val mutex = Mutex()
@@ -79,6 +58,10 @@ object DownloadCoordinator {
     private val recordChanges = MutableSharedFlow<Unit>(extraBufferCapacity = 16)
     val changes = recordChanges.asSharedFlow()
 
+    /** True only while a download is actively transferring. */
+    fun hasActiveDownload(): Boolean =
+        recordsState.value.any { it.status == DownloadRecord.STATUS_DOWNLOADING }
+
     fun init(database: PluviaDatabase) {
         if (dao != null) return
         dao = database.downloadRecordDao()
@@ -86,8 +69,7 @@ object DownloadCoordinator {
 
     fun registerDispatcher(store: String, dispatcher: Dispatcher) {
         dispatchers[store] = dispatcher
-        // A newly-registered dispatcher might have queued records waiting from a previous
-        // process or from a moment ago when it wasn't available yet. Drain the queue.
+        // Pick up queued records that were waiting for this dispatcher.
         if (dao != null) {
             scope.launch { tick() }
         }
@@ -104,12 +86,7 @@ object DownloadCoordinator {
         data class Queue(val record: DownloadRecord) : Decision()
     }
 
-    /**
-     * Persist a download request and decide whether to start it immediately or queue it. The
-     * caller (a store service) should inspect the result; on Start it should launch the actual
-     * download, on Queue it should create a UI entry showing QUEUED status and wait for the
-     * coordinator to dispatch via [Dispatcher.startQueued].
-     */
+    /** Persist a request and decide whether it starts now or waits in the queue. */
     suspend fun requestSlot(
         store: String,
         storeGameId: String,
@@ -118,6 +95,7 @@ object DownloadCoordinator {
         installPath: String = "",
         selectedDlcs: String = "",
         language: String = "",
+        taskType: String = DownloadRecord.TASK_INSTALL,
         bytesTotal: Long = 0L,
     ): Decision {
         val daoRef = dao ?: throw IllegalStateException("DownloadCoordinator not initialised")
@@ -126,11 +104,7 @@ object DownloadCoordinator {
             val now = System.currentTimeMillis()
             val existing = daoRef.findByStoreGame(store, storeGameId)
 
-            // Re-entry guard: tick() promotes a QUEUED record to DOWNLOADING and then
-            // dispatches it to the store, which calls back into requestSlot via the public
-            // download API. The slot was already granted by tick(); without this short
-            // circuit we'd count the record against itself, decide there are no free slots,
-            // and rewrite it back to QUEUED — making Resume hang at "Queued" forever.
+            // tick() may dispatch into code that calls requestSlot again; keep the granted slot.
             if (existing != null && existing.status == DownloadRecord.STATUS_DOWNLOADING) {
                 return@withLock Decision.Start(existing)
             }
@@ -157,6 +131,7 @@ object DownloadCoordinator {
                             installPath = installPath,
                             selectedDlcs = selectedDlcs,
                             language = language,
+                            taskType = taskType,
                             bytesTotal = bytesTotal,
                             status = status,
                             createdAt = now,
@@ -165,14 +140,7 @@ object DownloadCoordinator {
                     val id = daoRef.upsert(newRecord)
                     newRecord.copy(id = id)
                 } else {
-                    // We only reach here for re-enqueue cases (record was COMPLETE/CANCELLED/
-                    // FAILED/PAUSED/QUEUED — anything but DOWNLOADING, which short-circuits
-                    // above). For a re-enqueue the caller is fully respecifying the request,
-                    // so OVERWRITE the row with the new values. Previously we did
-                    // `selectedDlcs.ifEmpty { existing.selectedDlcs }` which was ambiguous —
-                    // an empty list (user wants base game only) was indistinguishable from
-                    // "caller didn't supply", so old DLC selections leaked through to a fresh
-                    // download.
+                    // Re-enqueue replaces request fields so empty DLC selection means base game only.
                     val updated =
                         existing.copy(
                             title = title,
@@ -180,7 +148,9 @@ object DownloadCoordinator {
                             installPath = installPath,
                             selectedDlcs = selectedDlcs,
                             language = language,
+                            taskType = taskType,
                             bytesTotal = if (bytesTotal > 0L) bytesTotal else existing.bytesTotal,
+                            bytesDownloaded = 0L,
                             status = status,
                             errorMessage = null,
                             updatedAt = now,
@@ -194,19 +164,27 @@ object DownloadCoordinator {
         }
     }
 
-    /** Update progress for a running download. Lightweight; runs without locking the queue. */
+    /** Update progress without locking the queue. */
     fun updateProgress(store: String, storeGameId: String, bytesDownloaded: Long, bytesTotal: Long) {
         val daoRef = dao ?: return
         scope.launch {
             val record = daoRef.findByStoreGame(store, storeGameId) ?: return@launch
-            daoRef.updateProgress(record.id, bytesDownloaded, bytesTotal)
+            val safeTotal = bytesTotal.coerceAtLeast(0L)
+            val safeDownloaded = bytesDownloaded.coerceAtLeast(0L).let { next ->
+                if (safeTotal == record.bytesTotal && next < record.bytesDownloaded) {
+                    record.bytesDownloaded
+                } else {
+                    next
+                }
+            }.let { next ->
+                if (safeTotal > 0L) next.coerceAtMost(safeTotal) else next
+            }
+            daoRef.updateProgress(record.id, safeDownloaded, safeTotal)
+            refreshState(daoRef)
         }
     }
 
-    /**
-     * Notify the coordinator that a download has terminated (success / fail / cancel / pause).
-     * The coordinator persists the new status and starts the next queued download.
-     */
+    /** Persist a terminal status and start the next queued download. */
     suspend fun notifyFinished(
         store: String,
         storeGameId: String,
@@ -219,11 +197,11 @@ object DownloadCoordinator {
             daoRef.updateStatus(record.id, finalStatus, error)
             refreshState(daoRef)
         }
-        // Drain the queue outside the lock to avoid re-entrancy with dispatcher callbacks.
+        // Drain after releasing the lock so dispatcher callbacks can re-enter.
         tick()
     }
 
-    /** Pause a running download. Marks PAUSED and asks the dispatcher to cancel its job. */
+    /** Mark a download PAUSED and ask its dispatcher to stop work. */
     suspend fun pause(store: String, storeGameId: String) {
         val daoRef = dao ?: return
         val record = daoRef.findByStoreGame(store, storeGameId) ?: return
@@ -247,7 +225,7 @@ object DownloadCoordinator {
         running.forEach { pause(it.store, it.storeGameId) }
     }
 
-    /** Resume a paused / queued / failed download. */
+    /** Resume a paused, queued, or failed download. */
     suspend fun resume(store: String, storeGameId: String) {
         val daoRef = dao ?: return
         val record = daoRef.findByStoreGame(store, storeGameId) ?: return
@@ -262,17 +240,43 @@ object DownloadCoordinator {
                 }
                 tick()
             }
+            DownloadRecord.STATUS_DOWNLOADING -> {
+                // Requeue records wedged in DOWNLOADING with no live transfer so Retry works.
+                val live = dispatchers[store]?.isTransferActive(record) ?: false
+                if (!live) {
+                    Timber.w("resume: requeuing wedged DOWNLOADING record ${record.store}/${record.storeGameId}")
+                    mutex.withLock {
+                        daoRef.updateStatus(record.id, DownloadRecord.STATUS_QUEUED)
+                        refreshState(daoRef)
+                    }
+                    tick()
+                }
+            }
             else -> Unit
         }
     }
 
+    /** Put a just-dispatched record back in the queue without ticking; a later tick() retries it. */
+    suspend fun requeue(store: String, storeGameId: String) {
+        val daoRef = dao ?: return
+        val record = daoRef.findByStoreGame(store, storeGameId) ?: return
+        if (record.status != DownloadRecord.STATUS_DOWNLOADING) return
+        mutex.withLock {
+            daoRef.updateStatus(record.id, DownloadRecord.STATUS_QUEUED)
+            refreshState(daoRef)
+        }
+    }
+
     suspend fun resumeAll() {
         val daoRef = dao ?: return
-        val toResume = daoRef.findByStatus(DownloadRecord.STATUS_PAUSED)
+        // FAILED downloads keep enough state for Resume All to continue them.
+        val toResume =
+            daoRef.findByStatus(DownloadRecord.STATUS_PAUSED) +
+                daoRef.findByStatus(DownloadRecord.STATUS_FAILED)
         toResume.forEach { resume(it.store, it.storeGameId) }
     }
 
-    /** Cancel a download and delete partial files via the dispatcher. */
+    /** Cancel a download and ask its dispatcher to delete partial files. */
     suspend fun cancel(store: String, storeGameId: String) {
         val daoRef = dao ?: return
         val record = daoRef.findByStoreGame(store, storeGameId) ?: return
@@ -293,14 +297,13 @@ object DownloadCoordinator {
         cancellable.forEach { cancel(it.store, it.storeGameId) }
     }
 
-    /** Remove finished records (COMPLETE / CANCELLED / FAILED) from the table. */
+    /** Remove finished records from the table. */
     suspend fun clear() {
         val daoRef = dao ?: return
         mutex.withLock {
             daoRef.deleteFinished()
             refreshState(daoRef)
         }
-        // Notify the Downloads tab to refresh.
         PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(0, false))
     }
 
@@ -309,10 +312,7 @@ object DownloadCoordinator {
         runBlocking { clear() }
     }
 
-    /**
-     * Drain the queue: while there are free slots and queued records, dispatch the oldest one
-     * to its store-specific dispatcher.
-     */
+    /** Dispatch queued records while slots are available. */
     suspend fun tick() {
         val daoRef = dao ?: return
         val toStart = mutableListOf<DownloadRecord>()
@@ -323,6 +323,8 @@ object DownloadCoordinator {
 
             for (record in queued) {
                 if (activeCount >= MAX_PARALLEL_DOWNLOADS) break
+                // Keep records QUEUED until their store dispatcher is ready.
+                if (dispatchers[record.store] == null) continue
                 val started = record.copy(status = DownloadRecord.STATUS_DOWNLOADING, updatedAt = now)
                 daoRef.update(started)
                 toStart.add(started)
@@ -331,8 +333,7 @@ object DownloadCoordinator {
             refreshState(daoRef)
         }
 
-        // Dispatch outside the lock so dispatchers can synchronously call back into the
-        // coordinator if needed.
+        // Dispatch outside the lock so callbacks can re-enter safely.
         toStart.forEach { record ->
             val dispatcher = dispatchers[record.store]
             if (dispatcher != null) {
@@ -347,38 +348,27 @@ object DownloadCoordinator {
         }
     }
 
-    /**
-     * Called once on app startup. Records that were DOWNLOADING when the process died are
-     * moved back to QUEUED (auto-resume); PAUSED records stay PAUSED until the user resumes
-     * them. Then the queue is drained.
-     *
-     * Idempotent: subsequent calls within the same process are no-ops.
-     */
+    /** Restore interrupted downloads once per process and drain the queue. */
     suspend fun onAppStart() {
         if (startupRestored) return
         startupRestored = true
         val daoRef = dao ?: return
         mutex.withLock {
-            // DOWNLOADING -> QUEUED (auto-resume on next launch).
+            // Auto-resume interrupted active downloads.
             daoRef.replaceStatus(DownloadRecord.STATUS_DOWNLOADING, DownloadRecord.STATUS_QUEUED)
             refreshState(daoRef)
         }
         tick()
     }
 
-    /** Triggers onAppStart from a non-coroutine caller. */
+    /** Trigger startup restoration from a non-coroutine caller. */
     fun attemptStartupRestoration() {
         if (startupRestored) return
         scope.launch { onAppStart() }
     }
 
-    /**
-     * Called by AppTerminationHelper when the app is exiting. Does NOT pause everything — it
-     * leaves DOWNLOADING records in DOWNLOADING state so they auto-resume on next launch, and
-     * leaves PAUSED records PAUSED.
-     */
+    /** Exit hook; statuses are already persisted during each transition. */
     fun onAppExit() {
-        // Nothing to persist here — every status transition was already written to the DAO.
     }
 
     private suspend fun refreshState(daoRef: DownloadRecordDao) {
@@ -392,16 +382,13 @@ object DownloadCoordinator {
         scope.launch { tick() }
     }
 
-    /** Initialize records flow on startup. Safe to call multiple times. */
+    /** Initialize records flow on startup. */
     suspend fun loadInitial() {
         val daoRef = dao ?: return
         refreshState(daoRef)
     }
 
-    /**
-     * Look up the persisted record for a given store+gameId. Useful for resume to recover the
-     * original install path / dlcs / language without going through the in-memory params map.
-     */
+    /** Look up a persisted record by store and game id. */
     suspend fun findRecord(store: String, storeGameId: String): DownloadRecord? {
         val daoRef = dao ?: return null
         return daoRef.findByStoreGame(store, storeGameId)
diff --git a/app/src/main/app/shell/BoxBlurTransformation.kt b/app/src/main/app/shell/BoxBlurTransformation.kt
new file mode 100644
index 000000000..6149d8174
--- /dev/null
+++ b/app/src/main/app/shell/BoxBlurTransformation.kt
@@ -0,0 +1,94 @@
+package com.winlator.cmod.app.shell
+
+import android.graphics.Bitmap
+import coil.size.Size
+import coil.transform.Transformation
+
+/** Bakes a blur into the decoded bitmap (two separable box passes ≈ Gaussian). */
+class BoxBlurTransformation(
+    private val radius: Int,
+) : Transformation {
+    override val cacheKey = "boxBlur:$radius"
+
+    override suspend fun transform(
+        input: Bitmap,
+        size: Size,
+    ): Bitmap {
+        if (radius < 1) return input
+        val w = input.width
+        val h = input.height
+        val a = IntArray(w * h)
+        val b = IntArray(w * h)
+        input.getPixels(a, 0, w, 0, 0, w, h)
+        repeat(2) {
+            horizontalPass(a, b, w, h)
+            verticalPass(b, a, w, h)
+        }
+        val out = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
+        out.setPixels(a, 0, w, 0, 0, w, h)
+        return out
+    }
+
+    private fun horizontalPass(
+        src: IntArray,
+        dst: IntArray,
+        w: Int,
+        h: Int,
+    ) {
+        val div = 2 * radius + 1
+        for (y in 0 until h) {
+            val row = y * w
+            var sa = 0
+            var sr = 0
+            var sg = 0
+            var sb = 0
+            for (i in -radius..radius) {
+                val p = src[row + i.coerceIn(0, w - 1)]
+                sa += p ushr 24
+                sr += (p shr 16) and 0xFF
+                sg += (p shr 8) and 0xFF
+                sb += p and 0xFF
+            }
+            for (x in 0 until w) {
+                dst[row + x] = ((sa / div) shl 24) or ((sr / div) shl 16) or ((sg / div) shl 8) or (sb / div)
+                val add = src[row + (x + radius + 1).coerceAtMost(w - 1)]
+                val sub = src[row + (x - radius).coerceAtLeast(0)]
+                sa += (add ushr 24) - (sub ushr 24)
+                sr += ((add shr 16) and 0xFF) - ((sub shr 16) and 0xFF)
+                sg += ((add shr 8) and 0xFF) - ((sub shr 8) and 0xFF)
+                sb += (add and 0xFF) - (sub and 0xFF)
+            }
+        }
+    }
+
+    private fun verticalPass(
+        src: IntArray,
+        dst: IntArray,
+        w: Int,
+        h: Int,
+    ) {
+        val div = 2 * radius + 1
+        for (x in 0 until w) {
+            var sa = 0
+            var sr = 0
+            var sg = 0
+            var sb = 0
+            for (i in -radius..radius) {
+                val p = src[i.coerceIn(0, h - 1) * w + x]
+                sa += p ushr 24
+                sr += (p shr 16) and 0xFF
+                sg += (p shr 8) and 0xFF
+                sb += p and 0xFF
+            }
+            for (y in 0 until h) {
+                dst[y * w + x] = ((sa / div) shl 24) or ((sr / div) shl 16) or ((sg / div) shl 8) or (sb / div)
+                val add = src[(y + radius + 1).coerceAtMost(h - 1) * w + x]
+                val sub = src[(y - radius).coerceAtLeast(0) * w + x]
+                sa += (add ushr 24) - (sub ushr 24)
+                sr += ((add shr 16) and 0xFF) - ((sub shr 16) and 0xFF)
+                sg += ((add shr 8) and 0xFF) - ((sub shr 8) and 0xFF)
+                sb += (add and 0xFF) - (sub and 0xFF)
+            }
+        }
+    }
+}
diff --git a/app/src/main/app/shell/Eyeglasses2Icon.kt b/app/src/main/app/shell/Eyeglasses2Icon.kt
new file mode 100644
index 000000000..126f92610
--- /dev/null
+++ b/app/src/main/app/shell/Eyeglasses2Icon.kt
@@ -0,0 +1,32 @@
+package com.winlator.cmod.app.shell
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.PathParser
+import androidx.compose.ui.unit.dp
+
+// "eyeglasses_2" glyph (absent from compose material-icons); its 960x960 viewBox is offset -960 in y, so the path sits in a group translated down 960.
+private const val EYEGLASSES_2_PATH =
+    "M218-320q-42 0-75.5-27T100-416L71-550l-44 3-7-80q78-7 133.5-10t99.5-3q65 0 105 6t72 21q14 7 " +
+        "26.5 10t23.5 3q11 0 21.5-3t24.5-9q33-15 76-21.5t114-6.5q46 0 102 3t122 9l-7 79-43-3-30 137q-9 " +
+        "42-42 68.5T743-320h-89q-42 0-74-25.5T538-411l-27-107h-61l-27 107q-11 41-43 66t-73 25h-89Zm-40-112q3 " +
+        "14 14 23t25 9h89q14 0 25-8.5t14-21.5l31-121q-27-5-61-6.5t-62-1.5q-23 0-49.5.5T154-556l24 124Zm437 " +
+        "2q3 13 14 21.5t25 8.5h89q14 0 25-9t14-23l26-125q-20-1-46-1.5t-46-.5q-30 0-66.5 1.5T584-551l31 121Z"
+
+val Eyeglasses2Icon: ImageVector by lazy {
+    ImageVector.Builder(
+        name = "Eyeglasses2",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 960f,
+        viewportHeight = 960f,
+    ).apply {
+        addGroup(translationY = 960f)
+        addPath(
+            pathData = PathParser().parsePathString(EYEGLASSES_2_PATH).toNodes(),
+            fill = SolidColor(Color.Black),
+        )
+        clearGroup()
+    }.build()
+}
diff --git a/app/src/main/app/shell/LibraryGameLaunchScreen.kt b/app/src/main/app/shell/LibraryGameLaunchScreen.kt
new file mode 100644
index 000000000..1fd6cacb1
--- /dev/null
+++ b/app/src/main/app/shell/LibraryGameLaunchScreen.kt
@@ -0,0 +1,1309 @@
+package com.winlator.cmod.app.shell
+
+import android.os.Build
+import android.view.WindowManager
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.MutableTransitionState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.FactCheck
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.CloudSync
+import androidx.compose.material.icons.outlined.SaveAlt
+import androidx.compose.material.icons.outlined.Construction
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.DesktopWindows
+import androidx.compose.material.icons.outlined.EmojiEvents
+import androidx.compose.material.icons.outlined.History
+import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material.icons.outlined.Home
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material.icons.outlined.Schedule
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Storage
+import androidx.compose.material.icons.outlined.Warning
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.DialogWindowProvider
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
+import androidx.core.view.WindowCompat
+import coil.compose.AsyncImage
+import coil.request.CachePolicy
+import coil.request.ImageRequest
+import com.winlator.cmod.R
+import androidx.compose.runtime.CompositionLocalProvider
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+private val LaunchBlack = Color.Black
+private val LaunchCard = Color(0xFF12121B)
+private val LaunchAccent = Color(0xFF1A9FFF)
+private val LaunchAccentGlow = Color(0xFF58A6FF)
+private val LaunchTextPrimary = Color(0xFFF0F4FF)
+private val LaunchTextSecondary = Color(0xFF93A6BC)
+private val LaunchDanger = Color(0xFFFF6B6B)
+
+@Composable
+internal fun LibraryGameLaunchScreen(
+    appName: String,
+    subtitle: String,
+    sourceLabel: String,
+    heroImageUrl: Any?,
+    customHeroImageCacheKey: String?,
+    releaseDateEpochSeconds: Long,
+    totalPlaytimeMillis: Long,
+    playCount: Int,
+    lastPlayedMillis: Long,
+    installSizeText: String?,
+    isCustom: Boolean,
+    isRetro: Boolean = false,
+    showBootToDesktop: Boolean = !isRetro,
+    showSaveTransfer: Boolean = false,
+    hasPinnedShortcut: Boolean,
+    steamMenuEnabled: Boolean = false,
+    areSteamActionsEnabled: Boolean = true,
+    showVerifyFiles: Boolean = true,
+    showCheckForUpdate: Boolean = true,
+    showWorkshop: Boolean = true,
+    playEnabled: Boolean = true,
+    playDisabledLabel: String? = null,
+    /**
+     * An alternative engine this particular game can be played with, offered
+     * right above Play because it changes what Play does. Absent (and the row
+     * not drawn at all) for every game that has no such choice, which is all
+     * but a handful.
+     */
+    altEngineLabel: String? = null,
+    altEngineEnabled: Boolean = false,
+    onAltEngineChange: ((Boolean) -> Unit)? = null,
+    onBack: () -> Unit,
+    onPlay: () -> Unit,
+    onSettings: () -> Unit,
+    onBootToDesktop: () -> Unit,
+    onAchievements: (() -> Unit)? = null,
+    onCheats: (() -> Unit)? = null,
+    cheatsEnabled: Boolean = true,
+    onShortcut: () -> Unit,
+    onCloudSaves: () -> Unit,
+    onSaveTransfer: (() -> Unit)? = null,
+    onUninstall: () -> Unit,
+    onVerifyFiles: () -> Unit = {},
+    onCheckForUpdate: () -> Unit = {},
+    onWorkshop: () -> Unit = {},
+) {
+    val context = LocalContext.current
+    var uninstallMenuOpen by remember { mutableStateOf(false) }
+    val saveTransferVisible = showSaveTransfer && onSaveTransfer != null
+    val bootVisible = showBootToDesktop
+    val actionIconCount =
+        1 +
+            (if (saveTransferVisible) 1 else 0) +
+            1 +
+            (if (bootVisible) 1 else 0) +
+            1 +
+            1
+
+    LaunchScreenCutoutMode()
+
+    Box(Modifier.fillMaxSize()) {
+        val edgePadding = 22.dp
+        val bottomPadding = 20.dp
+        val actionIconSize = 46.dp
+        val actionIconSpacing = 8.dp
+        val actionWidth = actionIconSize * actionIconCount + actionIconSpacing * (actionIconCount - 1).coerceAtLeast(0)
+        val playHeight = 56.dp
+        val contentGap = 18.dp
+        val horizontalNavInsets = WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
+
+        if (heroImageUrl != null) {
+            val heroRequest =
+                remember(heroImageUrl, customHeroImageCacheKey, context) {
+                    ImageRequest
+                        .Builder(context)
+                        .data(heroImageUrl)
+                        .apply {
+                            if (customHeroImageCacheKey != null) {
+                                memoryCacheKey(customHeroImageCacheKey)
+                                diskCacheKey(customHeroImageCacheKey)
+                            }
+                        }.crossfade(150)
+                        .memoryCachePolicy(CachePolicy.ENABLED)
+                        .diskCachePolicy(CachePolicy.ENABLED)
+                        .build()
+                }
+            AsyncImage(
+                model = heroRequest,
+                contentDescription = "$appName artwork",
+                modifier = Modifier.fillMaxSize(),
+                contentScale = ContentScale.Crop,
+                alignment = Alignment.Center,
+            )
+        } else {
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    .background(
+                        Brush.radialGradient(
+                            colors = listOf(LaunchAccent.copy(alpha = 0.34f), LaunchCard, LaunchBlack),
+                            radius = 980f,
+                        ),
+                    ),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    Icons.Outlined.SportsEsports,
+                    contentDescription = null,
+                    tint = LaunchTextPrimary.copy(alpha = 0.18f),
+                    modifier = Modifier.size(132.dp),
+                )
+            }
+        }
+
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(
+                    Brush.horizontalGradient(
+                        colorStops =
+                            arrayOf(
+                                0.0f to LaunchBlack.copy(alpha = 0.9f),
+                                0.36f to LaunchBlack.copy(alpha = 0.58f),
+                                0.72f to LaunchBlack.copy(alpha = 0.18f),
+                                1.0f to LaunchBlack.copy(alpha = 0.62f),
+                            ),
+                    ),
+                ),
+        )
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(
+                    Brush.verticalGradient(
+                        colorStops =
+                            arrayOf(
+                                0.0f to LaunchBlack.copy(alpha = 0.54f),
+                                0.36f to Color.Transparent,
+                                0.72f to LaunchBlack.copy(alpha = 0.32f),
+                                1.0f to LaunchBlack.copy(alpha = 0.94f),
+                            ),
+                    ),
+                ),
+        )
+
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .windowInsetsPadding(horizontalNavInsets)
+                    .padding(start = edgePadding, top = 12.dp, end = edgePadding),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(
+                onClick = onBack,
+                modifier =
+                    Modifier
+                        .size(44.dp)
+                        .clip(CircleShape)
+                        .background(LaunchBlack.copy(alpha = 0.5f))
+                        .border(1.dp, Color.White.copy(alpha = 0.18f), CircleShape),
+            ) {
+                Icon(
+                    Icons.AutoMirrored.Outlined.ArrowBack,
+                    contentDescription = stringResource(R.string.common_ui_back),
+                    tint = LaunchTextPrimary,
+                    modifier = Modifier.size(24.dp),
+                )
+            }
+            Spacer(Modifier.weight(1f))
+            SourceTag(
+                sourceLabel = sourceLabel,
+                menuEnabled = steamMenuEnabled,
+                showVerifyFiles = showVerifyFiles,
+                showCheckForUpdate = showCheckForUpdate,
+                showWorkshop = showWorkshop,
+                showAchievements = onAchievements != null,
+                showCheats = onCheats != null,
+                cheatsEnabled = cheatsEnabled,
+                areSteamActionsEnabled = areSteamActionsEnabled,
+                onVerifyFiles = onVerifyFiles,
+                onCheckForUpdate = onCheckForUpdate,
+                onWorkshop = onWorkshop,
+                onAchievements = { onAchievements?.invoke() },
+                onCheats = { onCheats?.invoke() },
+            )
+        }
+
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .windowInsetsPadding(WindowInsets.navigationBars)
+                    .padding(start = edgePadding, top = 68.dp, end = edgePadding, bottom = bottomPadding),
+            verticalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Column(
+                modifier = Modifier.widthIn(max = 640.dp),
+                verticalArrangement = Arrangement.spacedBy(6.dp),
+            ) {
+                Text(
+                    appName,
+                    style = MaterialTheme.typography.headlineLarge,
+                    color = LaunchTextPrimary,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (subtitle.isNotBlank()) {
+                    Text(
+                        subtitle,
+                        style = MaterialTheme.typography.titleSmall,
+                        color = LaunchTextPrimary.copy(alpha = 0.72f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                if (releaseDateEpochSeconds > 0L) {
+                    val releaseDateText = remember(releaseDateEpochSeconds) { formatReleaseDate(releaseDateEpochSeconds) }
+                    Text(
+                        releaseDateText,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = LaunchTextPrimary.copy(alpha = 0.6f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(contentGap),
+                verticalAlignment = Alignment.Bottom,
+            ) {
+                FlowRow(
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    modifier = Modifier.weight(1f),
+                ) {
+                    if (totalPlaytimeMillis > 0L) {
+                        val playtimeText = remember(totalPlaytimeMillis) { formatLibraryPlaytime(totalPlaytimeMillis) }
+                        GameStatChip(
+                            icon = Icons.Outlined.Schedule,
+                            label = stringResource(R.string.library_games_playtime),
+                            value = playtimeText,
+                        )
+                    }
+                    if (playCount > 0) {
+                        GameStatChip(
+                            icon = Icons.Outlined.SportsEsports,
+                            label = stringResource(R.string.library_games_plays),
+                            value = playCount.toString(),
+                        )
+                    }
+                    if (lastPlayedMillis > 0L) {
+                        val lastPlayedText = remember(lastPlayedMillis) { formatLibraryLastPlayed(lastPlayedMillis) }
+                        GameStatChip(
+                            icon = Icons.Outlined.History,
+                            label = stringResource(R.string.library_games_last_played),
+                            value = lastPlayedText,
+                        )
+                    }
+                    if (installSizeText != null) {
+                        GameStatChip(
+                            icon = Icons.Outlined.Storage,
+                            label = stringResource(R.string.common_ui_size),
+                            value = installSizeText,
+                        )
+                    }
+                }
+
+                Column(
+                    modifier = Modifier.width(actionWidth),
+                    verticalArrangement = Arrangement.spacedBy(12.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    if (altEngineLabel != null && onAltEngineChange != null) {
+                        LaunchAltEngineToggle(
+                            label = altEngineLabel,
+                            checked = altEngineEnabled,
+                            width = actionWidth,
+                            onCheckedChange = onAltEngineChange,
+                        )
+                    }
+
+                    LaunchPlayButton(
+                        height = playHeight,
+                        enabled = playEnabled,
+                        disabledLabel = playDisabledLabel,
+                        onClick = onPlay,
+                    )
+
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(actionIconSpacing),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        LaunchIconActionButton(
+                            icon = Icons.Outlined.Settings,
+                            contentDescription = stringResource(R.string.common_ui_settings),
+                            size = actionIconSize,
+                            onClick = onSettings,
+                        )
+                        if (saveTransferVisible) {
+                            LaunchIconActionButton(
+                                icon = Icons.Outlined.SaveAlt,
+                                contentDescription = stringResource(R.string.retro_save_transfer_title),
+                                size = actionIconSize,
+                                onClick = { onSaveTransfer?.invoke() },
+                            )
+                        }
+                        LaunchIconActionButton(
+                            icon = Icons.Outlined.CloudSync,
+                            contentDescription = stringResource(R.string.cloud_saves_title),
+                            size = actionIconSize,
+                            onClick = onCloudSaves,
+                        )
+                        if (bootVisible) {
+                            LaunchIconActionButton(
+                                icon = Icons.Outlined.DesktopWindows,
+                                contentDescription = stringResource(R.string.hero_boot_to_desktop_title),
+                                size = actionIconSize,
+                                onClick = onBootToDesktop,
+                            )
+                        }
+                        LaunchIconActionButton(
+                            icon = Icons.Outlined.Home,
+                            contentDescription =
+                                stringResource(
+                                    if (hasPinnedShortcut) R.string.common_ui_remove else R.string.common_ui_shortcut,
+                                ),
+                            size = actionIconSize,
+                            onClick = onShortcut,
+                        )
+                        Box {
+                            LaunchIconActionButton(
+                                icon = Icons.Outlined.Delete,
+                                contentDescription =
+                                    stringResource(if (isCustom) R.string.common_ui_remove else R.string.common_ui_uninstall),
+                                size = actionIconSize,
+                                onClick = { uninstallMenuOpen = true },
+                                tint = LaunchDanger,
+                            )
+                            LaunchUninstallMenu(
+                                expanded = uninstallMenuOpen,
+                                appName = appName,
+                                isCustom = isCustom,
+                                onDismissRequest = { uninstallMenuOpen = false },
+                                onConfirm = {
+                                    uninstallMenuOpen = false
+                                    onUninstall()
+                                },
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        if (uninstallMenuOpen) {
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .background(LaunchBlack.copy(alpha = 0.46f))
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = { uninstallMenuOpen = false },
+                        ),
+            )
+        }
+    }
+}
+
+@Composable
+private fun LaunchScreenCutoutMode() {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return
+
+    val view = LocalView.current
+    DisposableEffect(view) {
+        val window = (view.parent as? DialogWindowProvider)?.window
+            ?: return@DisposableEffect onDispose { }
+
+        val originalCutoutMode = window.attributes.layoutInDisplayCutoutMode
+        val originalWidth = window.attributes.width
+        val originalHeight = window.attributes.height
+        val originalNavigationBarColor = window.navigationBarColor
+        val originalNavBarContrastEnforced =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced
+            } else {
+                false
+            }
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.clearFlags(
+            WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION or
+                WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+        )
+        // FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS is required for navigationBarColor; Dialog windows don't set it by default.
+        window.addFlags(
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+                WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
+        )
+        window.setLayout(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.MATCH_PARENT,
+        )
+        window.attributes = window.attributes.apply {
+            layoutInDisplayCutoutMode = launchScreenCutoutMode()
+        }
+        window.navigationBarColor = android.graphics.Color.TRANSPARENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.isNavigationBarContrastEnforced = false
+        }
+
+        onDispose {
+            window.attributes = window.attributes.apply {
+                layoutInDisplayCutoutMode = originalCutoutMode
+            }
+            window.navigationBarColor = originalNavigationBarColor
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced = originalNavBarContrastEnforced
+            }
+            window.clearFlags(
+                WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+                    WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
+            )
+            WindowCompat.setDecorFitsSystemWindows(window, true)
+            window.setLayout(originalWidth, originalHeight)
+        }
+    }
+}
+
+private fun launchScreenCutoutMode(): Int =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+    } else {
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+    }
+
+@Composable
+private fun LaunchUninstallMenu(
+    expanded: Boolean,
+    appName: String,
+    isCustom: Boolean,
+    onDismissRequest: () -> Unit,
+    onConfirm: () -> Unit,
+) {
+    val title = stringResource(if (isCustom) R.string.library_games_remove_game else R.string.library_games_uninstall_game)
+    val confirmLabel = stringResource(if (isCustom) R.string.common_ui_remove else R.string.common_ui_uninstall)
+    val message =
+        stringResource(
+            if (isCustom) R.string.library_games_remove_confirm else R.string.library_games_uninstall_confirm,
+            appName,
+        )
+
+    LaunchDangerConfirmDialog(
+        visible = expanded,
+        title = title,
+        message = message,
+        confirmLabel = confirmLabel,
+        onDismissRequest = onDismissRequest,
+        onConfirm = onConfirm,
+        icon = Icons.Outlined.Delete,
+        cancelColor = LaunchAccent,
+    )
+}
+
+@Composable
+internal fun LaunchDangerConfirmMenu(
+    expanded: Boolean,
+    title: String,
+    message: String,
+    confirmLabel: String,
+    onDismissRequest: () -> Unit,
+    onConfirm: () -> Unit,
+    icon: ImageVector = Icons.Outlined.Delete,
+) {
+    DropdownMenu(
+        expanded = expanded,
+        onDismissRequest = onDismissRequest,
+        offset = DpOffset(x = 0.dp, y = (-56).dp),
+        modifier = Modifier.width(286.dp),
+        shape = RoundedCornerShape(12.dp),
+        containerColor = LaunchCard,
+        border = BorderStroke(1.dp, Color.White.copy(alpha = 0.14f)),
+        tonalElevation = 0.dp,
+        shadowElevation = 14.dp,
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 12.dp, vertical = 10.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp),
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(9.dp),
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    tint = LaunchDanger,
+                    modifier = Modifier.size(18.dp),
+                )
+                Text(
+                    title,
+                    color = LaunchTextPrimary,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+            Text(
+                message,
+                color = LaunchTextSecondary,
+                fontSize = 12.sp,
+                lineHeight = 16.sp,
+            )
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                LaunchMenuTextAction(
+                    label = stringResource(R.string.common_ui_cancel),
+                    textColor = LaunchTextSecondary,
+                    onClick = onDismissRequest,
+                )
+                LaunchMenuTextAction(
+                    label = confirmLabel,
+                    textColor = LaunchDanger,
+                    onClick = onConfirm,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun LaunchDangerConfirmDialog(
+    visible: Boolean,
+    title: String,
+    message: String,
+    confirmLabel: String,
+    onDismissRequest: () -> Unit,
+    onConfirm: () -> Unit,
+    icon: ImageVector = Icons.Outlined.Warning,
+    titleTextAlign: TextAlign = TextAlign.Start,
+    messageTextAlign: TextAlign = TextAlign.Start,
+    accentColor: Color = LaunchDanger,
+    cancelColor: Color = LaunchTextSecondary,
+) {
+    if (!visible) return
+
+    val registry = remember { PaneNavRegistry() }
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+            DialogPaneNav(registry, onDismiss = onDismissRequest)
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .background(LaunchBlack.copy(alpha = 0.46f))
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = onDismissRequest,
+                        ),
+                contentAlignment = Alignment.Center,
+            ) {
+                Surface(
+                    modifier =
+                        Modifier
+                            .width(286.dp)
+                            .clickable(
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null,
+                                onClick = { },
+                            ),
+                    shape = RoundedCornerShape(12.dp),
+                    color = LaunchCard,
+                    border = BorderStroke(1.dp, Color.White.copy(alpha = 0.14f)),
+                    shadowElevation = 14.dp,
+                    tonalElevation = 0.dp,
+                ) {
+                    LaunchDangerConfirmContent(
+                        title = title,
+                        message = message,
+                        confirmLabel = confirmLabel,
+                        onDismissRequest = onDismissRequest,
+                        onConfirm = onConfirm,
+                        icon = icon,
+                        titleTextAlign = titleTextAlign,
+                        messageTextAlign = messageTextAlign,
+                        accentColor = accentColor,
+                        cancelColor = cancelColor,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LaunchDangerConfirmContent(
+    title: String,
+    message: String,
+    confirmLabel: String,
+    onDismissRequest: () -> Unit,
+    onConfirm: () -> Unit,
+    icon: ImageVector,
+    titleTextAlign: TextAlign,
+    messageTextAlign: TextAlign,
+    accentColor: Color,
+    cancelColor: Color,
+) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 12.dp, vertical = 10.dp),
+        verticalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        if (titleTextAlign == TextAlign.Center) {
+            Box(
+                modifier = Modifier.fillMaxWidth(),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    tint = accentColor,
+                    modifier =
+                        Modifier
+                            .align(Alignment.CenterStart)
+                            .size(18.dp),
+                )
+                Text(
+                    title,
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 28.dp),
+                    color = LaunchTextPrimary,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                )
+            }
+        } else {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(9.dp),
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    tint = accentColor,
+                    modifier = Modifier.size(18.dp),
+                )
+                Text(
+                    title,
+                    color = LaunchTextPrimary,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+        Text(
+            message,
+            modifier = Modifier.fillMaxWidth(),
+            color = LaunchTextSecondary,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+            textAlign = messageTextAlign,
+        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            LaunchMenuTextAction(
+                label = stringResource(R.string.common_ui_cancel),
+                textColor = cancelColor,
+                onClick = onDismissRequest,
+                modifier = Modifier.paneNavItem(onActivate = onDismissRequest),
+            )
+            LaunchMenuTextAction(
+                label = confirmLabel,
+                textColor = accentColor,
+                onClick = onConfirm,
+                modifier = Modifier.paneNavItem(onActivate = onConfirm, isEntry = true),
+            )
+        }
+    }
+}
+
+@Composable
+private fun LaunchMenuTextAction(
+    label: String,
+    textColor: Color,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier =
+            modifier
+                .clip(RoundedCornerShape(8.dp))
+                .controllerFocusGlow(cornerRadius = 8.dp)
+                .clickable(onClick = onClick)
+                .padding(horizontal = 10.dp, vertical = 7.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            label,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun SourceTag(
+    sourceLabel: String,
+    menuEnabled: Boolean = false,
+    showVerifyFiles: Boolean = true,
+    showCheckForUpdate: Boolean = true,
+    showWorkshop: Boolean = true,
+    showAchievements: Boolean = false,
+    showCheats: Boolean = false,
+    cheatsEnabled: Boolean = true,
+    areSteamActionsEnabled: Boolean = true,
+    onVerifyFiles: () -> Unit = {},
+    onCheckForUpdate: () -> Unit = {},
+    onWorkshop: () -> Unit = {},
+    onAchievements: () -> Unit = {},
+    onCheats: () -> Unit = {},
+) {
+    var menuOpen by remember { mutableStateOf(false) }
+    var anchorHeightPx by remember { mutableStateOf(0) }
+    val menuInteractive = menuEnabled || showAchievements || showCheats
+    Box {
+        Surface(
+            color = Color.White.copy(alpha = 0.1f),
+            shape = RoundedCornerShape(8.dp),
+            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.14f)),
+            modifier =
+                Modifier
+                    .onSizeChanged { anchorHeightPx = it.height }
+                    .then(if (menuInteractive) Modifier.clickable { menuOpen = true } else Modifier),
+        ) {
+            Row(
+                modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                Box(
+                    Modifier
+                        .size(8.dp)
+                        .clip(CircleShape)
+                        .background(LaunchAccent),
+                )
+                Text(
+                    sourceLabel.uppercase(),
+                    color = LaunchTextPrimary,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (menuInteractive) {
+                    Icon(
+                        Icons.Outlined.ArrowDropDown,
+                        contentDescription = stringResource(R.string.store_game_steam_options),
+                        tint = LaunchTextPrimary,
+                        modifier = Modifier.size(18.dp),
+                    )
+                }
+            }
+        }
+        if (menuInteractive) {
+            val gapPx = with(LocalDensity.current) { 6.dp.roundToPx() }
+            LaunchSourceActionPopup(
+                expanded = menuOpen,
+                onDismissRequest = { menuOpen = false },
+                offset = IntOffset(0, anchorHeightPx + gapPx),
+            ) {
+                if (menuEnabled && showVerifyFiles) {
+                    LaunchSourceMenuItem(
+                        icon = Icons.AutoMirrored.Outlined.FactCheck,
+                        label = stringResource(R.string.store_game_verify_files),
+                        enabled = areSteamActionsEnabled,
+                    ) { menuOpen = false; onVerifyFiles() }
+                }
+                if (menuEnabled && showCheckForUpdate) {
+                    LaunchSourceMenuItem(
+                        icon = Icons.Outlined.Refresh,
+                        label = stringResource(R.string.store_game_check_for_update),
+                        enabled = areSteamActionsEnabled,
+                    ) { menuOpen = false; onCheckForUpdate() }
+                }
+                if (menuEnabled && showWorkshop) {
+                    LaunchSourceMenuItem(
+                        icon = Icons.Outlined.Construction,
+                        label = stringResource(R.string.store_game_workshop),
+                        enabled = areSteamActionsEnabled,
+                    ) { menuOpen = false; onWorkshop() }
+                }
+                if (showAchievements) {
+                    LaunchSourceMenuItem(
+                        icon = Icons.Outlined.EmojiEvents,
+                        label = stringResource(R.string.steam_achievements_title),
+                    ) { menuOpen = false; onAchievements() }
+                }
+                if (showCheats) {
+                    LaunchSourceMenuItem(
+                        icon = Icons.Outlined.Bolt,
+                        label = stringResource(R.string.retro_cheats_title),
+                        enabled = cheatsEnabled,
+                    ) { menuOpen = false; onCheats() }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LaunchSourceActionPopup(
+    expanded: Boolean,
+    onDismissRequest: () -> Unit,
+    offset: IntOffset,
+    content: @Composable () -> Unit,
+) {
+    val transitionState = remember { MutableTransitionState(false) }
+    transitionState.targetState = expanded
+    if (!transitionState.currentState && !transitionState.targetState) return
+
+    Popup(
+        alignment = Alignment.TopEnd,
+        offset = offset,
+        onDismissRequest = onDismissRequest,
+        properties = PopupProperties(focusable = true),
+    ) {
+        AnimatedVisibility(
+            visibleState = transitionState,
+            enter =
+                fadeIn(animationSpec = tween(durationMillis = 90)) +
+                    scaleIn(
+                        animationSpec =
+                            spring(
+                                dampingRatio = 0.78f,
+                                stiffness = Spring.StiffnessMediumLow,
+                            ),
+                        initialScale = 0.88f,
+                        transformOrigin = TransformOrigin(1f, 0f),
+                    ),
+            exit =
+                fadeOut(animationSpec = tween(durationMillis = 80)) +
+                    scaleOut(
+                        animationSpec = tween(durationMillis = 110),
+                        targetScale = 0.92f,
+                        transformOrigin = TransformOrigin(1f, 0f),
+                    ),
+        ) {
+            Surface(
+                color = LaunchBlack.copy(alpha = 0.78f),
+                shape = RoundedCornerShape(12.dp),
+                border = BorderStroke(1.dp, Color.White.copy(alpha = 0.22f)),
+                tonalElevation = 0.dp,
+                shadowElevation = 16.dp,
+            ) {
+                Column { content() }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LaunchSourceMenuItem(
+    icon: ImageVector,
+    label: String,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    val contentColor = if (enabled) Color.White else Color.White.copy(alpha = 0.45f)
+    Row(
+        modifier =
+            Modifier
+                .then(if (enabled) Modifier.clickable(onClick = onClick) else Modifier)
+                .padding(start = 14.dp, end = 14.dp, top = 10.dp, bottom = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        Icon(
+            icon,
+            contentDescription = null,
+            tint = contentColor,
+            modifier = Modifier.size(16.dp),
+        )
+        Text(
+            label,
+            color = contentColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
+@Composable
+private fun GameStatChip(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    modifier: Modifier = Modifier,
+) {
+    Surface(
+        modifier = modifier,
+        color = LaunchBlack.copy(alpha = 0.44f),
+        shape = RoundedCornerShape(12.dp),
+        border = BorderStroke(1.dp, Color.White.copy(alpha = 0.11f)),
+    ) {
+        Row(
+            modifier =
+                Modifier.padding(
+                    horizontal = 10.dp,
+                    vertical = 8.dp,
+                ),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(7.dp),
+        ) {
+            Icon(icon, contentDescription = null, modifier = Modifier.size(16.dp), tint = LaunchAccentGlow)
+            Column(verticalArrangement = Arrangement.spacedBy(1.dp)) {
+                Text(
+                    label.uppercase(),
+                    color = LaunchTextSecondary,
+                    fontSize = 9.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Text(
+                    value,
+                    color = LaunchTextPrimary,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    }
+}
+
+/**
+ * The alternative-engine switch above Play.
+ *
+ * Deliberately the same width as the Play button and immediately above it: it
+ * decides which engine Play will start, so it belongs in the reading path to
+ * that button rather than buried in a settings pane. The state is the game's
+ * own saved setting, so what it shows survives leaving the screen.
+ */
+@Composable
+private fun LaunchAltEngineToggle(
+    label: String,
+    checked: Boolean,
+    width: Dp,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .width(width)
+            .clip(RoundedCornerShape(14.dp))
+            .background(Color.White.copy(alpha = 0.06f))
+            .clickable { onCheckedChange(!checked) }
+            .padding(horizontal = 16.dp, vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Text(
+            text = label,
+            color = Color.White.copy(alpha = 0.92f),
+            fontSize = 14.sp,
+            fontWeight = FontWeight.Medium,
+        )
+        Switch(
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+            colors = outlinedSwitchColors(
+                accentColor = LaunchAccent,
+                textSecondaryColor = Color.White.copy(alpha = 0.55f),
+            ),
+        )
+    }
+}
+
+@Composable
+private fun LaunchPlayButton(
+    height: Dp,
+    enabled: Boolean = true,
+    disabledLabel: String? = null,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (enabled && isPressed) 0.96f else 1f,
+        animationSpec = spring(dampingRatio = 0.5f, stiffness = 600f),
+        label = "launchPlayScale",
+    )
+    val flare by animateFloatAsState(
+        targetValue = if (enabled && isPressed) 1f else 0f,
+        animationSpec = spring(dampingRatio = 0.6f, stiffness = 500f),
+        label = "launchPlayFlare",
+    )
+
+    val playShape = remember { RoundedCornerShape(14.dp) }
+    // Disabled: drop the clickable entirely so focus skips it and a stray controller A-press can't fire onClick.
+    val backgroundBrush =
+        if (enabled) {
+            Brush.horizontalGradient(
+                colors =
+                    listOf(
+                        Color(0xFF00B4D8).copy(alpha = 0.38f),
+                        LaunchAccent.copy(alpha = 0.38f),
+                        Color(0xFF7B2FF7).copy(alpha = 0.38f),
+                    ),
+            )
+        } else {
+            Brush.horizontalGradient(
+                colors =
+                    listOf(
+                        Color(0xFF3A3F4A).copy(alpha = 0.35f),
+                        Color(0xFF2D313A).copy(alpha = 0.35f),
+                        Color(0xFF3A3F4A).copy(alpha = 0.35f),
+                    ),
+            )
+        }
+    val glassSheenBrush =
+        if (enabled) {
+            Brush.verticalGradient(
+                0.00f to Color.White.copy(alpha = 0.28f),
+                0.35f to Color.White.copy(alpha = 0.06f),
+                0.55f to Color.Transparent,
+                1.00f to Color.Black.copy(alpha = 0.12f),
+            )
+        } else {
+            Brush.verticalGradient(
+                0.0f to Color.White.copy(alpha = 0.10f),
+                0.6f to Color.Transparent,
+                1.0f to Color.Black.copy(alpha = 0.08f),
+            )
+        }
+    val glassRimBrush =
+        if (enabled) {
+            Brush.verticalGradient(
+                0.0f to Color.White.copy(alpha = 0.55f + 0.35f * flare),
+                0.5f to Color.White.copy(alpha = 0.08f + 0.18f * flare),
+                1.0f to Color.White.copy(alpha = 0.22f + 0.22f * flare),
+            )
+        } else {
+            Brush.verticalGradient(
+                0.0f to Color.White.copy(alpha = 0.16f),
+                1.0f to Color.White.copy(alpha = 0.04f),
+            )
+        }
+    val foregroundAlpha = if (enabled) 1f else 0.75f
+
+    val baseModifier =
+        Modifier
+            .fillMaxWidth()
+            .height(height)
+            .graphicsLayer {
+                scaleX = scale
+                scaleY = scale
+            }.clip(playShape)
+            .background(backgroundBrush)
+            .background(glassSheenBrush)
+            .border(1.dp, glassRimBrush, playShape)
+    val finalModifier =
+        if (enabled) {
+            baseModifier
+                .controllerFocusGlow(cornerRadius = 14.dp)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                )
+        } else {
+            baseModifier
+        }
+
+    val showStatus = !enabled && !disabledLabel.isNullOrBlank()
+    val icon = if (showStatus) Icons.Outlined.Refresh else Icons.Outlined.PlayArrow
+    val label = if (showStatus) disabledLabel!! else stringResource(R.string.library_games_play)
+
+    Box(
+        modifier = finalModifier,
+        contentAlignment = Alignment.Center,
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center,
+        ) {
+            Icon(
+                icon,
+                contentDescription = null,
+                modifier = Modifier.size(28.dp),
+                tint = Color.White.copy(alpha = foregroundAlpha),
+            )
+            Spacer(Modifier.width(8.dp))
+            Text(
+                label,
+                color = Color.White.copy(alpha = foregroundAlpha),
+                fontSize = 19.sp,
+                fontWeight = FontWeight.Bold,
+                maxLines = 1,
+            )
+        }
+    }
+}
+
+@Composable
+private fun LaunchIconActionButton(
+    icon: ImageVector,
+    contentDescription: String,
+    size: Dp,
+    onClick: () -> Unit,
+    tint: Color = Color.White,
+) {
+    Surface(
+        modifier =
+            Modifier
+                .size(size)
+                .clip(RoundedCornerShape(8.dp))
+                .clickable(onClick = onClick),
+        color = LaunchBlack.copy(alpha = 0.46f),
+        shape = RoundedCornerShape(8.dp),
+        border = BorderStroke(1.dp, tint.copy(alpha = 0.18f)),
+    ) {
+        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            Icon(
+                icon,
+                contentDescription = contentDescription,
+                modifier = Modifier.size(28.dp),
+                tint = tint,
+            )
+        }
+    }
+}
+
+private fun formatReleaseDate(releaseDateEpochSeconds: Long): String =
+    SimpleDateFormat("MMM d, yyyy", Locale.getDefault())
+        .format(Date(releaseDateEpochSeconds * 1000L))
+
+private fun formatLibraryPlaytime(playtimeMillis: Long): String {
+    val totalMinutes = (playtimeMillis / 60000L).coerceAtLeast(1L)
+    val hours = totalMinutes / 60L
+    val minutes = totalMinutes % 60L
+    return when {
+        hours > 0L && minutes > 0L -> "${hours}h ${minutes}m"
+        hours > 0L -> "${hours}h"
+        else -> "${minutes}m"
+    }
+}
+
+private fun formatLibraryLastPlayed(lastPlayedMillis: Long): String =
+    SimpleDateFormat("MMM d", Locale.getDefault()).format(Date(lastPlayedMillis))
diff --git a/app/src/main/app/shell/RetroConsoleRibbon.kt b/app/src/main/app/shell/RetroConsoleRibbon.kt
new file mode 100644
index 000000000..7b2d6c04f
--- /dev/null
+++ b/app/src/main/app/shell/RetroConsoleRibbon.kt
@@ -0,0 +1,72 @@
+package com.winlator.cmod.app.shell
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+internal val retroLibrarySystemIds = mutableStateOf<Map<Int, String>>(emptyMap())
+
+internal fun libraryBadgeLabel(
+    appId: Int,
+    isCustom: Boolean,
+): String? {
+    val systemId = retroLibrarySystemIds.value[appId]
+    if (systemId != null) {
+        return com.winlator.cmod.feature.retro.RetroSystems
+            .fromId(systemId)
+            ?.badgeLabel
+            ?: systemId
+    }
+    return if (isCustom) "PC" else null
+}
+
+@Composable
+internal fun RetroConsoleRibbon(
+    label: String,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier =
+            modifier
+                .fillMaxHeight()
+                .width(14.dp)
+                .background(Color(0xD9090C10)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = Color(0xFFE6EDF3),
+            fontSize = 8.sp,
+            fontWeight = FontWeight.Bold,
+            letterSpacing = 1.2.sp,
+            maxLines = 1,
+            softWrap = false,
+            modifier = Modifier.verticalRibbonText(),
+        )
+    }
+}
+
+private fun Modifier.verticalRibbonText(): Modifier =
+    this.layout { measurable, _ ->
+        val placeable = measurable.measure(androidx.compose.ui.unit.Constraints())
+
+        layout(placeable.height, placeable.width) {
+            placeable.placeWithLayer(
+                x = -(placeable.width - placeable.height) / 2,
+                y = -(placeable.height - placeable.width) / 2,
+            ) {
+                rotationZ = -90f
+            }
+        }
+    }
diff --git a/app/src/main/app/shell/StoreGameDetailScreen.kt b/app/src/main/app/shell/StoreGameDetailScreen.kt
new file mode 100644
index 000000000..7697cf1bc
--- /dev/null
+++ b/app/src/main/app/shell/StoreGameDetailScreen.kt
@@ -0,0 +1,1313 @@
+package com.winlator.cmod.app.shell
+
+import android.os.Build
+import android.view.WindowManager
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.MutableTransitionState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.FactCheck
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.CloudSync
+import androidx.compose.material.icons.outlined.Construction
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.ExpandLess
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.Extension
+import androidx.compose.material.icons.outlined.Folder
+import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Storage
+import androidx.compose.material.icons.outlined.SystemUpdate
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.DialogWindowProvider
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
+import androidx.core.view.WindowCompat
+import coil.compose.AsyncImage
+import coil.request.CachePolicy
+import coil.request.ImageRequest
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavHandlers
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+internal data class StoreDlcItem(
+    val id: Int,
+    val name: String,
+    val downloadSize: Long,
+    val isInstalled: Boolean = false,
+)
+
+private val StoreBlack = Color.Black
+private val StoreCard = Color(0xFF12121B)
+private val StoreAccent = Color(0xFF1A9FFF)
+private val StoreAccentGlow = Color(0xFF58A6FF)
+private val StoreTextPrimary = Color(0xFFF0F4FF)
+private val StoreTextSecondary = Color(0xFF93A6BC)
+private val StoreDanger = Color(0xFFFF6B6B)
+
+@Composable
+internal fun StoreGameDetailScreen(
+    title: String,
+    subtitle: String,
+    sourceLabel: String,
+    heroImageUrl: Any?,
+    isLoading: Boolean,
+    isInstalled: Boolean,
+    installPathDisplay: String,
+    downloadSize: Long,
+    installSize: Long,
+    availableBytes: Long,
+    isInstallEnabled: Boolean,
+    isDownloadActionEnabled: Boolean = isInstallEnabled,
+    customPathLabel: String,
+    showCustomPath: Boolean = true,
+    showCloudSync: Boolean = false,
+    showUninstall: Boolean = true,
+    showUpdateCheck: Boolean = false,
+    isCheckingForUpdate: Boolean = false,
+    isUpdateAvailable: Boolean = false,
+    updateDownloadSize: Long = 0L,
+    updateStatusText: String? = null,
+    isUpdateActionEnabled: Boolean = true,
+    isUpdateCheckCoolingDown: Boolean = false,
+    showWorkshop: Boolean = false,
+    showVerifyFiles: Boolean = false,
+    areSteamActionsEnabled: Boolean = true,
+    dlcs: List<StoreDlcItem> = emptyList(),
+    selectedDlcIds: Set<Int> = emptySet(),
+    isDlcSelectionEnabled: Boolean = true,
+    onBack: () -> Unit,
+    onInstall: () -> Unit = {},
+    onCheckForUpdate: () -> Unit = {},
+    onWorkshop: () -> Unit = {},
+    onVerifyFiles: () -> Unit = {},
+    onDownloadUpdate: () -> Unit = {},
+    onUninstall: () -> Unit = {},
+    onCloudSync: () -> Unit = {},
+    onCustomPath: () -> Unit = {},
+    onToggleDlc: (Int) -> Unit = {},
+    onToggleSelectAllDlcs: () -> Unit = {},
+) {
+    val context = LocalContext.current
+    val density = LocalDensity.current
+    var dlcExpanded by remember { mutableStateOf(false) }
+    var dlcHeaderHeightPx by remember { mutableIntStateOf(0) }
+
+    val mainRegistry = remember { PaneNavRegistry() }
+    val menuRegistry = remember { PaneNavRegistry() }
+    var sourceMenuOpen by remember { mutableStateOf(false) }
+
+    StoreScreenCutoutMode()
+
+    CompositionLocalProvider(LocalPaneNav provides mainRegistry) {
+        DialogPaneNav(
+            paneNavHandlers(
+                onDismiss = { if (sourceMenuOpen) sourceMenuOpen = false else onBack() },
+            ) { if (sourceMenuOpen) menuRegistry else mainRegistry },
+        )
+        Box(Modifier.fillMaxSize()) {
+        val edgePadding = 22.dp
+        val bottomPadding = 8.dp
+        val actionIconSize = 48.dp
+        val actionIconSpacing = 8.dp
+        val actionWidth = actionIconSize * 5 + actionIconSpacing * 4
+        val ctaHeight = 56.dp
+        val contentGap = 18.dp
+        val horizontalNavInsets = WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
+        val hasSelectedInstallableDlc = dlcs.any { !it.isInstalled && it.id in selectedDlcIds }
+        val showDownloadCta = !isInstalled || hasSelectedInstallableDlc
+        val updateCheckAvailable = showUpdateCheck && isInstalled
+        val showUpdateCta = updateCheckAvailable && isUpdateAvailable
+        val verifyFilesAvailable = showVerifyFiles && isInstalled
+        val workshopAvailable = showWorkshop && isInstalled
+        val sourceMenuEnabled = updateCheckAvailable || verifyFilesAvailable || workshopAvailable
+        val showDlcCard = dlcs.isNotEmpty()
+        val showActionColumn =
+            showDownloadCta || showUpdateCta ||
+                (showCloudSync || showUninstall)
+
+        if (heroImageUrl != null) {
+            val heroRequest =
+                remember(heroImageUrl, context) {
+                    ImageRequest
+                        .Builder(context)
+                        .data(heroImageUrl)
+                        .crossfade(150)
+                        .memoryCachePolicy(CachePolicy.ENABLED)
+                        .diskCachePolicy(CachePolicy.ENABLED)
+                        .build()
+                }
+            AsyncImage(
+                model = heroRequest,
+                contentDescription = "$title artwork",
+                modifier = Modifier.fillMaxSize(),
+                contentScale = ContentScale.Crop,
+                alignment = Alignment.Center,
+            )
+        } else {
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    .background(
+                        Brush.radialGradient(
+                            colors = listOf(StoreAccent.copy(alpha = 0.34f), StoreCard, StoreBlack),
+                            radius = 980f,
+                        ),
+                    ),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    Icons.Outlined.SportsEsports,
+                    contentDescription = null,
+                    tint = StoreTextPrimary.copy(alpha = 0.18f),
+                    modifier = Modifier.size(132.dp),
+                )
+            }
+        }
+
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(
+                    Brush.horizontalGradient(
+                        colorStops =
+                            arrayOf(
+                                0.0f to StoreBlack.copy(alpha = 0.9f),
+                                0.36f to StoreBlack.copy(alpha = 0.58f),
+                                0.72f to StoreBlack.copy(alpha = 0.18f),
+                                1.0f to StoreBlack.copy(alpha = 0.62f),
+                            ),
+                    ),
+                ),
+        )
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(
+                    Brush.verticalGradient(
+                        colorStops =
+                            arrayOf(
+                                0.0f to StoreBlack.copy(alpha = 0.54f),
+                                0.36f to Color.Transparent,
+                                0.72f to StoreBlack.copy(alpha = 0.32f),
+                                1.0f to StoreBlack.copy(alpha = 0.94f),
+                            ),
+                    ),
+                ),
+        )
+
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .windowInsetsPadding(horizontalNavInsets)
+                    .padding(start = edgePadding, top = 12.dp, end = edgePadding),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(
+                onClick = onBack,
+                modifier =
+                    Modifier
+                        .size(44.dp)
+                        .clip(CircleShape)
+                        .paneNavItem(cornerRadius = 22.dp, onActivate = onBack, navRow = 0, navCol = 0)
+                        .background(StoreBlack.copy(alpha = 0.5f))
+                        .border(1.dp, Color.White.copy(alpha = 0.18f), CircleShape),
+            ) {
+                Icon(
+                    Icons.AutoMirrored.Outlined.ArrowBack,
+                    contentDescription = stringResource(R.string.common_ui_back),
+                    tint = StoreTextPrimary,
+                    modifier = Modifier.size(24.dp),
+                )
+            }
+            Spacer(Modifier.weight(1f))
+            StoreSourceTag(
+                sourceLabel = sourceLabel,
+                menuEnabled = sourceMenuEnabled,
+                menuOpen = sourceMenuOpen,
+                onMenuOpenChange = { sourceMenuOpen = it },
+                menuRegistry = menuRegistry,
+                showCheckForUpdate = updateCheckAvailable,
+                showVerifyFiles = verifyFilesAvailable,
+                showWorkshop = workshopAvailable,
+                isCheckingForUpdate = isCheckingForUpdate,
+                areSteamActionsEnabled = areSteamActionsEnabled,
+                isUpdateCheckEnabled =
+                    !isLoading &&
+                        !isCheckingForUpdate &&
+                        !isUpdateCheckCoolingDown &&
+                        isUpdateActionEnabled,
+                onVerifyFiles = onVerifyFiles,
+                onCheckForUpdate = onCheckForUpdate,
+                onWorkshop = onWorkshop,
+            )
+        }
+
+        val dlcHeaderReserveHeight =
+            if (showDlcCard && dlcHeaderHeightPx > 0) {
+                with(density) { dlcHeaderHeightPx.toDp() } + 12.dp
+            } else {
+                0.dp
+            }
+
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .windowInsetsPadding(WindowInsets.navigationBars)
+                    .padding(
+                        start = edgePadding,
+                        top = 68.dp,
+                        end = edgePadding,
+                        bottom = bottomPadding + dlcHeaderReserveHeight,
+                    ),
+            verticalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Column(
+                modifier = Modifier.widthIn(max = 640.dp),
+                verticalArrangement = Arrangement.spacedBy(6.dp),
+            ) {
+                Text(
+                    title,
+                    style = MaterialTheme.typography.headlineLarge,
+                    color = StoreTextPrimary,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (subtitle.isNotBlank()) {
+                    Text(
+                        subtitle,
+                        style = MaterialTheme.typography.titleSmall,
+                        color = StoreTextPrimary.copy(alpha = 0.72f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+
+            Column {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(contentGap),
+                    verticalAlignment = Alignment.Bottom,
+                ) {
+                    FlowRow(
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                        modifier = Modifier.weight(1f),
+                    ) {
+                        if (isLoading) {
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.spacedBy(10.dp),
+                            ) {
+                                CircularProgressIndicator(
+                                    modifier = Modifier.size(20.dp),
+                                    color = StoreAccent,
+                                    strokeWidth = 2.dp,
+                                )
+                                Text(
+                                    stringResource(R.string.common_ui_loading),
+                                    color = StoreTextSecondary,
+                                    fontSize = 12.sp,
+                                )
+                            }
+                        } else if (isInstalled) {
+                            StoreStatChip(
+                                icon = Icons.Outlined.Storage,
+                                label = stringResource(R.string.library_games_install_path),
+                                value = installPathDisplay,
+                            )
+                            if (isUpdateAvailable && updateDownloadSize > 0L) {
+                                StoreStatChip(
+                                    icon = Icons.Outlined.SystemUpdate,
+                                    label = stringResource(R.string.store_game_update),
+                                    value = StorageUtils.formatBinarySize(updateDownloadSize),
+                                )
+                            }
+                        } else {
+                            if (downloadSize > 0L) {
+                                StoreStatChip(
+                                    icon = Icons.Outlined.Download,
+                                    label = stringResource(R.string.common_ui_download),
+                                    value = StorageUtils.formatBinarySize(downloadSize),
+                                )
+                            }
+                            if (installSize > 0L) {
+                                StoreStatChip(
+                                    icon = Icons.Outlined.Storage,
+                                    label = stringResource(R.string.common_ui_size),
+                                    value = StorageUtils.formatBinarySize(installSize),
+                                    valueColor = if (!isInstallEnabled) StoreDanger else null,
+                                )
+                            }
+                            if (availableBytes > 0L) {
+                                StoreStatChip(
+                                    icon = Icons.Outlined.Folder,
+                                    label = stringResource(R.string.common_ui_available),
+                                    value = StorageUtils.formatBinarySize(availableBytes),
+                                    valueColor = if (!isInstallEnabled) StoreDanger else null,
+                                )
+                            }
+                            if (showCustomPath) {
+                                StoreActionChip(
+                                    icon = Icons.Outlined.Folder,
+                                    label = customPathLabel,
+                                    onClick = onCustomPath,
+                                )
+                            }
+                        }
+                    }
+
+                    if (showActionColumn) {
+                        Column(
+                            modifier = Modifier.width(actionWidth),
+                            verticalArrangement = Arrangement.spacedBy(12.dp),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                        ) {
+                            if (showUpdateCta) {
+                                StoreCtaButton(
+                                    height = ctaHeight,
+                                    icon = Icons.Outlined.SystemUpdate,
+                                    label = stringResource(R.string.store_game_download_update),
+                                    enabled =
+                                        !isLoading &&
+                                            isUpdateActionEnabled &&
+                                            !isCheckingForUpdate,
+                                    loading = false,
+                                    onClick = onDownloadUpdate,
+                                    isEntry = true,
+                                    navRow = 1,
+                                    navCol = 3,
+                                )
+                            }
+
+                            if (updateCheckAvailable && !updateStatusText.isNullOrBlank()) {
+                                Text(
+                                    updateStatusText,
+                                    color =
+                                        if (updateStatusText == stringResource(R.string.store_game_update_check_failed)) {
+                                            StoreDanger
+                                        } else {
+                                            StoreTextSecondary
+                                        },
+                                    fontSize = 11.sp,
+                                    fontWeight = FontWeight.SemiBold,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            }
+
+                            if (showDownloadCta && !isLoading && !isInstallEnabled && installSize > 0L) {
+                                val deficit = (installSize - availableBytes).coerceAtLeast(0L)
+                                if (deficit > 0L) {
+                                    Text(
+                                        stringResource(
+                                            R.string.library_games_not_enough_space,
+                                            StorageUtils.formatBinarySize(deficit),
+                                        ),
+                                        color = StoreDanger,
+                                        fontSize = 11.sp,
+                                        fontWeight = FontWeight.SemiBold,
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                    )
+                                }
+                            }
+
+                            Row(
+                                horizontalArrangement = Arrangement.spacedBy(actionIconSpacing),
+                                verticalAlignment = Alignment.Top,
+                            ) {
+                                if (showCloudSync && isInstalled) {
+                                    StoreIconActionButton(
+                                        icon = Icons.Outlined.CloudSync,
+                                        contentDescription = stringResource(R.string.cloud_saves_title),
+                                        size = actionIconSize,
+                                        onClick = onCloudSync,
+                                        navRow = 1,
+                                        navCol = 1,
+                                    )
+                                }
+                                if (showUninstall && isInstalled) {
+                                    StoreIconActionButton(
+                                        icon = Icons.Outlined.Delete,
+                                        contentDescription = stringResource(R.string.common_ui_uninstall),
+                                        size = actionIconSize,
+                                        onClick = onUninstall,
+                                        tint = StoreDanger,
+                                        navRow = 1,
+                                        navCol = 2,
+                                    )
+                                }
+                            }
+
+                            if (showDownloadCta) {
+                                StoreCtaButton(
+                                    height = ctaHeight,
+                                    icon = Icons.Outlined.Download,
+                                    label = stringResource(R.string.common_ui_download),
+                                    enabled = !isLoading && isDownloadActionEnabled,
+                                    loading = isLoading,
+                                    onClick = onInstall,
+                                    isEntry = true,
+                                    navRow = 1,
+                                    navCol = 4,
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (showDlcCard) {
+            BoxWithConstraints(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .windowInsetsPadding(WindowInsets.navigationBars)
+                        .padding(
+                            start = edgePadding,
+                            top = 68.dp,
+                            end = edgePadding,
+                            bottom = bottomPadding,
+                        ),
+                contentAlignment = Alignment.BottomStart,
+            ) {
+                val maxListHeight = (maxHeight - 96.dp).coerceAtLeast(120.dp)
+                StoreDlcCard(
+                    dlcs = dlcs,
+                    selectedDlcIds = selectedDlcIds,
+                    selectionEnabled = isDlcSelectionEnabled,
+                    expanded = dlcExpanded,
+                    onToggleExpanded = { dlcExpanded = !dlcExpanded },
+                    onToggleDlc = onToggleDlc,
+                    onToggleSelectAll = onToggleSelectAllDlcs,
+                    maxListHeight = maxListHeight,
+                    onHeaderMeasured = { dlcHeaderHeightPx = it },
+                )
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun StoreDlcCard(
+    dlcs: List<StoreDlcItem>,
+    selectedDlcIds: Set<Int>,
+    selectionEnabled: Boolean,
+    expanded: Boolean,
+    onToggleExpanded: () -> Unit,
+    onToggleDlc: (Int) -> Unit,
+    onToggleSelectAll: () -> Unit,
+    maxListHeight: Dp = 280.dp,
+    onHeaderMeasured: (Int) -> Unit = {},
+) {
+    val selectableDlcs = remember(dlcs) { dlcs.filterNot { it.isInstalled } }
+    val totalSize = remember(selectableDlcs) { selectableDlcs.sumOf { it.downloadSize.coerceAtLeast(0L) } }
+    val selectedCount = selectableDlcs.count { it.id in selectedDlcIds }
+    val installedCount = dlcs.count { it.isInstalled }
+    val selectedSize = remember(dlcs, selectedDlcIds) {
+        dlcs.filter { !it.isInstalled && it.id in selectedDlcIds }.sumOf { it.downloadSize.coerceAtLeast(0L) }
+    }
+    val allSelected = selectableDlcs.isNotEmpty() && selectedCount == selectableDlcs.size
+
+    Surface(
+        modifier = Modifier.fillMaxWidth(),
+        color = StoreBlack,
+        shape = RoundedCornerShape(14.dp),
+        border = BorderStroke(1.dp, Color.White.copy(alpha = 0.18f)),
+    ) {
+        Column(modifier = Modifier.fillMaxWidth()) {
+            Row(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .onSizeChanged { onHeaderMeasured(it.height) }
+                        .paneNavItem(cornerRadius = 12.dp, onActivate = onToggleExpanded, navRow = 2, navCol = 0)
+                        .clickable(onClick = onToggleExpanded)
+                        .padding(horizontal = 12.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                Icon(
+                    Icons.Outlined.Extension,
+                    contentDescription = null,
+                    tint = StoreAccentGlow,
+                    modifier = Modifier.size(16.dp),
+                )
+                Column(
+                    modifier = Modifier.weight(1f),
+                    verticalArrangement = Arrangement.spacedBy(1.dp),
+                ) {
+                    Text(
+                        stringResource(R.string.library_games_dlcs).uppercase(),
+                        color = StoreTextSecondary,
+                        fontSize = 9.sp,
+                        fontWeight = FontWeight.Bold,
+                        letterSpacing = 0.7.sp,
+                    )
+                    Text(
+                        buildDlcSummary(
+                            selectedCount = selectedCount,
+                            totalCount = selectableDlcs.size,
+                            installedCount = installedCount,
+                            selectedSize = selectedSize,
+                            totalSize = totalSize,
+                        ),
+                        color = StoreTextPrimary,
+                        fontSize = 12.sp,
+                        fontWeight = FontWeight.SemiBold,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                Icon(
+                    if (expanded) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore,
+                    contentDescription = null,
+                    tint = StoreTextPrimary,
+                    modifier = Modifier.size(18.dp),
+                )
+            }
+
+            AnimatedVisibility(
+                visible = expanded,
+                enter = expandVertically(),
+                exit = shrinkVertically(),
+            ) {
+                Column {
+                    StoreDlcDivider()
+                    if (selectableDlcs.isNotEmpty()) {
+                        Row(
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .then(
+                                        if (selectionEnabled) {
+                                            Modifier.paneNavItem(cornerRadius = 8.dp, onActivate = onToggleSelectAll, navRow = 3, navCol = 0)
+                                        } else {
+                                            Modifier
+                                        },
+                                    )
+                                    .clickable(enabled = selectionEnabled, onClick = onToggleSelectAll)
+                                    .padding(horizontal = 6.dp, vertical = 0.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Checkbox(
+                                checked = allSelected,
+                                onCheckedChange = { onToggleSelectAll() },
+                                enabled = selectionEnabled,
+                                colors =
+                                    CheckboxDefaults.colors(
+                                        checkedColor = StoreAccent,
+                                        uncheckedColor = StoreTextSecondary,
+                                        checkmarkColor = Color.White,
+                                    ),
+                            )
+                            Text(
+                                stringResource(
+                                    if (allSelected) R.string.common_ui_deselect_all else R.string.common_ui_select_all,
+                                ),
+                                color = StoreTextPrimary,
+                                fontSize = 13.sp,
+                                fontWeight = FontWeight.SemiBold,
+                                modifier = Modifier.weight(1f),
+                            )
+                        }
+                        StoreDlcDivider()
+                    }
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .heightIn(max = maxListHeight)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        dlcs.forEachIndexed { index, dlc ->
+                            if (index > 0) {
+                                StoreDlcDivider()
+                            }
+                            Row(
+                                modifier =
+                                    Modifier
+                                        .fillMaxWidth()
+                                        .then(
+                                            if (dlc.isInstalled || !selectionEnabled) {
+                                                Modifier
+                                            } else {
+                                                Modifier
+                                                    .paneNavItem(cornerRadius = 8.dp, onActivate = { onToggleDlc(dlc.id) }, navRow = 4 + index, navCol = 0)
+                                                    .clickable { onToggleDlc(dlc.id) }
+                                            },
+                                        )
+                                        .padding(horizontal = 6.dp, vertical = 0.dp),
+                                verticalAlignment = Alignment.CenterVertically,
+                            ) {
+                                if (dlc.isInstalled) {
+                                    Checkbox(
+                                        checked = true,
+                                        onCheckedChange = {},
+                                        enabled = false,
+                                        colors =
+                                            CheckboxDefaults.colors(
+                                                checkedColor = Color(0xFF38D77A),
+                                                disabledCheckedColor = Color(0xFF38D77A),
+                                                checkmarkColor = Color.White,
+                                            ),
+                                    )
+                                } else {
+                                    Checkbox(
+                                        checked = dlc.id in selectedDlcIds,
+                                        onCheckedChange = { onToggleDlc(dlc.id) },
+                                        enabled = selectionEnabled,
+                                        colors =
+                                            CheckboxDefaults.colors(
+                                                checkedColor = StoreAccent,
+                                                uncheckedColor = StoreTextSecondary,
+                                                checkmarkColor = Color.White,
+                                            ),
+                                    )
+                                }
+                                Text(
+                                    dlc.name,
+                                    color = StoreTextPrimary,
+                                    fontSize = 13.sp,
+                                    modifier = Modifier.weight(1f),
+                                    maxLines = 2,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                                Text(
+                                    if (dlc.downloadSize > 0L) StorageUtils.formatBinarySize(dlc.downloadSize) else "—",
+                                    color = StoreTextSecondary,
+                                    fontSize = 12.sp,
+                                    fontWeight = FontWeight.SemiBold,
+                                    modifier = Modifier.padding(horizontal = 10.dp),
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun StoreDlcDivider() {
+    HorizontalDivider(
+        color = Color.White.copy(alpha = 0.16f),
+        thickness = 1.dp,
+        modifier = Modifier.padding(horizontal = 12.dp),
+    )
+}
+
+private fun buildDlcSummary(
+    selectedCount: Int,
+    totalCount: Int,
+    installedCount: Int,
+    selectedSize: Long,
+    totalSize: Long,
+): String {
+    val totalSizeStr = if (totalSize > 0L) StorageUtils.formatBinarySize(totalSize) else null
+    val selectedSizeStr = if (selectedSize > 0L) StorageUtils.formatBinarySize(selectedSize) else null
+    val selectionText =
+        when {
+            totalCount == 0 -> null
+            selectedCount == 0 && totalSizeStr != null -> "$totalCount available · $totalSizeStr total"
+            selectedCount == 0 -> "$totalCount available"
+            selectedSizeStr != null && totalSizeStr != null ->
+                "$selectedCount of $totalCount · $selectedSizeStr / $totalSizeStr"
+            else -> "$selectedCount of $totalCount selected"
+        }
+    val installedText = if (installedCount > 0) "$installedCount installed" else null
+    return when {
+        selectionText != null && installedText != null -> "$selectionText · $installedText"
+        selectionText != null -> selectionText
+        installedText != null -> installedText
+        else -> ""
+    }
+}
+
+@Composable
+private fun StoreSourceTag(
+    sourceLabel: String,
+    menuEnabled: Boolean = false,
+    menuOpen: Boolean = false,
+    onMenuOpenChange: (Boolean) -> Unit = {},
+    menuRegistry: PaneNavRegistry? = null,
+    showCheckForUpdate: Boolean = false,
+    showVerifyFiles: Boolean = false,
+    showWorkshop: Boolean = false,
+    isCheckingForUpdate: Boolean = false,
+    areSteamActionsEnabled: Boolean = true,
+    isUpdateCheckEnabled: Boolean = true,
+    onVerifyFiles: () -> Unit = {},
+    onCheckForUpdate: () -> Unit = {},
+    onWorkshop: () -> Unit = {},
+) {
+    var anchorHeightPx by remember { mutableIntStateOf(0) }
+    Box {
+        Surface(
+            color = Color.White.copy(alpha = 0.1f),
+            shape = RoundedCornerShape(8.dp),
+            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.14f)),
+            modifier =
+                Modifier
+                    .onSizeChanged { anchorHeightPx = it.height }
+                    .then(
+                        if (menuEnabled) {
+                            Modifier
+                                .paneNavItem(cornerRadius = 8.dp, onActivate = { onMenuOpenChange(!menuOpen) }, navRow = 0, navCol = 1)
+                                .clickable { onMenuOpenChange(!menuOpen) }
+                        } else {
+                            Modifier
+                        },
+                    ),
+        ) {
+            Row(
+                modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                Box(
+                    Modifier
+                        .size(8.dp)
+                        .clip(CircleShape)
+                        .background(StoreAccent),
+                )
+                Text(
+                    sourceLabel.uppercase(),
+                    color = StoreTextPrimary,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (menuEnabled) {
+                    Icon(
+                        Icons.Outlined.ArrowDropDown,
+                        contentDescription = stringResource(R.string.store_game_steam_options),
+                        tint = StoreTextPrimary,
+                        modifier = Modifier.size(18.dp),
+                    )
+                }
+            }
+        }
+        if (menuEnabled) {
+            val gapPx = with(LocalDensity.current) { 6.dp.roundToPx() }
+            StoreSourceActionPopup(
+                expanded = menuOpen,
+                onDismissRequest = { onMenuOpenChange(false) },
+                offset = IntOffset(0, anchorHeightPx + gapPx),
+            ) {
+                CompositionLocalProvider(LocalPaneNav provides menuRegistry) {
+                    if (showVerifyFiles) {
+                        StoreSourceMenuItem(
+                            icon = Icons.AutoMirrored.Outlined.FactCheck,
+                            label = stringResource(R.string.store_game_verify_files),
+                            enabled = areSteamActionsEnabled && !isCheckingForUpdate,
+                        ) { onMenuOpenChange(false); onVerifyFiles() }
+                    }
+                    if (showCheckForUpdate) {
+                        StoreSourceMenuItem(
+                            icon = Icons.Outlined.Refresh,
+                            label =
+                                if (isCheckingForUpdate) {
+                                    stringResource(R.string.store_game_checking_for_update)
+                                } else {
+                                    stringResource(R.string.store_game_check_for_update)
+                                },
+                            enabled = areSteamActionsEnabled && isUpdateCheckEnabled,
+                        ) { onMenuOpenChange(false); onCheckForUpdate() }
+                    }
+                    if (showWorkshop) {
+                        StoreSourceMenuItem(
+                            icon = Icons.Outlined.Construction,
+                            label = stringResource(R.string.store_game_workshop),
+                            enabled = areSteamActionsEnabled,
+                        ) { onMenuOpenChange(false); onWorkshop() }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun StoreSourceActionPopup(
+    expanded: Boolean,
+    onDismissRequest: () -> Unit,
+    offset: IntOffset,
+    content: @Composable () -> Unit,
+) {
+    val transitionState = remember { MutableTransitionState(false) }
+    transitionState.targetState = expanded
+    if (!transitionState.currentState && !transitionState.targetState) return
+
+    Popup(
+        alignment = Alignment.TopEnd,
+        offset = offset,
+        onDismissRequest = onDismissRequest,
+        properties = PopupProperties(focusable = false),
+    ) {
+        AnimatedVisibility(
+            visibleState = transitionState,
+            enter =
+                fadeIn(animationSpec = tween(durationMillis = 90)) +
+                    scaleIn(
+                        animationSpec =
+                            spring(
+                                dampingRatio = 0.78f,
+                                stiffness = Spring.StiffnessMediumLow,
+                            ),
+                        initialScale = 0.88f,
+                        transformOrigin = TransformOrigin(1f, 0f),
+                    ),
+            exit =
+                fadeOut(animationSpec = tween(durationMillis = 80)) +
+                    scaleOut(
+                        animationSpec = tween(durationMillis = 110),
+                        targetScale = 0.92f,
+                        transformOrigin = TransformOrigin(1f, 0f),
+                    ),
+        ) {
+            Surface(
+                color = StoreBlack.copy(alpha = 0.78f),
+                shape = RoundedCornerShape(12.dp),
+                border = BorderStroke(1.dp, Color.White.copy(alpha = 0.22f)),
+                tonalElevation = 0.dp,
+                shadowElevation = 16.dp,
+            ) {
+                Column { content() }
+            }
+        }
+    }
+}
+
+@Composable
+private fun StoreSourceMenuItem(
+    icon: ImageVector,
+    label: String,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    val contentColor = if (enabled) Color.White else Color.White.copy(alpha = 0.45f)
+    Row(
+        modifier =
+            Modifier
+                .then(
+                    if (enabled) {
+                        Modifier
+                            .paneNavItem(cornerRadius = 8.dp, onActivate = onClick)
+                            .clickable(onClick = onClick)
+                    } else {
+                        Modifier
+                    },
+                )
+                .padding(start = 14.dp, end = 14.dp, top = 10.dp, bottom = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        Icon(
+            icon,
+            contentDescription = null,
+            tint = contentColor,
+            modifier = Modifier.size(16.dp),
+        )
+        Text(
+            label,
+            color = contentColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
+@Composable
+private fun StoreStatChip(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    valueColor: Color? = null,
+) {
+    Surface(
+        color = StoreBlack.copy(alpha = 0.44f),
+        shape = RoundedCornerShape(12.dp),
+        border = BorderStroke(1.dp, Color.White.copy(alpha = 0.11f)),
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(7.dp),
+        ) {
+            Icon(icon, contentDescription = null, modifier = Modifier.size(16.dp), tint = StoreAccentGlow)
+            Column(verticalArrangement = Arrangement.spacedBy(1.dp)) {
+                Text(
+                    label.uppercase(),
+                    color = StoreTextSecondary,
+                    fontSize = 9.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Text(
+                    value,
+                    color = valueColor ?: StoreTextPrimary,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun StoreActionChip(
+    icon: ImageVector,
+    label: String,
+    onClick: () -> Unit,
+) {
+    Surface(
+        color = StoreBlack.copy(alpha = 0.44f),
+        shape = RoundedCornerShape(12.dp),
+        border = BorderStroke(1.dp, StoreAccentGlow.copy(alpha = 0.36f)),
+        modifier =
+            Modifier
+                .paneNavItem(cornerRadius = 12.dp, onActivate = onClick, navRow = 1, navCol = 0)
+                .clickable(onClick = onClick),
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Icon(icon, contentDescription = null, modifier = Modifier.size(18.dp), tint = StoreAccentGlow)
+            Text(
+                label,
+                color = StoreTextPrimary,
+                fontSize = 13.sp,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
+@Composable
+private fun StoreCtaButton(
+    height: Dp,
+    icon: ImageVector,
+    label: String,
+    enabled: Boolean,
+    loading: Boolean,
+    onClick: () -> Unit,
+    isEntry: Boolean = false,
+    navRow: Int? = null,
+    navCol: Int? = null,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed && enabled) 0.96f else 1f,
+        animationSpec = spring(dampingRatio = 0.5f, stiffness = 600f),
+        label = "storeCtaScale",
+    )
+    val flare by animateFloatAsState(
+        targetValue = if (isPressed && enabled) 1f else 0f,
+        animationSpec = spring(dampingRatio = 0.6f, stiffness = 500f),
+        label = "storeCtaFlare",
+    )
+    val shape = remember { RoundedCornerShape(14.dp) }
+    val activeBrush =
+        Brush.horizontalGradient(
+            colors =
+                listOf(
+                    Color(0xFF00B4D8).copy(alpha = 0.38f),
+                    StoreAccent.copy(alpha = 0.38f),
+                    Color(0xFF7B2FF7).copy(alpha = 0.38f),
+                ),
+        )
+    val disabledBrush =
+        Brush.horizontalGradient(
+            colors =
+                listOf(
+                    Color(0xFF3A3A4A).copy(alpha = 0.35f),
+                    Color(0xFF2A2A36).copy(alpha = 0.35f),
+                ),
+        )
+    val glassSheenBrush =
+        if (enabled) {
+            Brush.verticalGradient(
+                0.00f to Color.White.copy(alpha = 0.28f),
+                0.35f to Color.White.copy(alpha = 0.06f),
+                0.55f to Color.Transparent,
+                1.00f to Color.Black.copy(alpha = 0.12f),
+            )
+        } else {
+            Brush.verticalGradient(
+                0.0f to Color.White.copy(alpha = 0.10f),
+                0.6f to Color.Transparent,
+                1.0f to Color.Black.copy(alpha = 0.08f),
+            )
+        }
+    val glassRimBrush =
+        if (enabled) {
+            Brush.verticalGradient(
+                0.0f to Color.White.copy(alpha = 0.55f + 0.35f * flare),
+                0.5f to Color.White.copy(alpha = 0.08f + 0.18f * flare),
+                1.0f to Color.White.copy(alpha = 0.22f + 0.22f * flare),
+            )
+        } else {
+            Brush.verticalGradient(
+                0.0f to Color.White.copy(alpha = 0.16f),
+                1.0f to Color.White.copy(alpha = 0.04f),
+            )
+        }
+    Box(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .height(height)
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }.clip(shape)
+                .paneNavItem(
+                    cornerRadius = 14.dp,
+                    onActivate = { if (enabled && !loading) onClick() },
+                    isEntry = isEntry,
+                    navRow = navRow,
+                    navCol = navCol,
+                )
+                .background(if (enabled) activeBrush else disabledBrush)
+                .background(glassSheenBrush)
+                .border(1.dp, glassRimBrush, shape)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = { if (enabled && !loading) onClick() },
+                ),
+        contentAlignment = Alignment.Center,
+    ) {
+        if (loading) {
+            CircularProgressIndicator(
+                modifier = Modifier.size(26.dp),
+                color = Color.White,
+                strokeWidth = 2.dp,
+            )
+        } else {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    modifier = Modifier.size(28.dp),
+                    tint = Color.White,
+                )
+                Spacer(Modifier.width(8.dp))
+                Text(
+                    label,
+                    color = Color.White,
+                    fontSize = 19.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun StoreIconActionButton(
+    icon: ImageVector,
+    contentDescription: String,
+    size: Dp,
+    onClick: () -> Unit,
+    tint: Color = Color.White,
+    navRow: Int? = null,
+    navCol: Int? = null,
+) {
+    Surface(
+        modifier =
+            Modifier
+                .size(size)
+                .clip(RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, navRow = navRow, navCol = navCol)
+                .clickable(onClick = onClick),
+        color = StoreBlack.copy(alpha = 0.46f),
+        shape = RoundedCornerShape(8.dp),
+        border = BorderStroke(1.dp, tint.copy(alpha = 0.18f)),
+    ) {
+        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            Icon(
+                icon,
+                contentDescription = contentDescription,
+                modifier = Modifier.size(28.dp),
+                tint = tint,
+            )
+        }
+    }
+}
+
+@Composable
+private fun StoreScreenCutoutMode() {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return
+
+    val view = LocalView.current
+    DisposableEffect(view) {
+        val window =
+            (view.parent as? DialogWindowProvider)?.window
+                ?: return@DisposableEffect onDispose { }
+
+        val originalCutoutMode = window.attributes.layoutInDisplayCutoutMode
+        val originalWidth = window.attributes.width
+        val originalHeight = window.attributes.height
+        val originalNavigationBarColor = window.navigationBarColor
+        val originalNavBarContrastEnforced =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced
+            } else {
+                false
+            }
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.clearFlags(
+            WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION or
+                WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+        )
+        // FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS is required for navigationBarColor to take effect.
+        // Compose Dialog windows use Theme.DeviceDefault.Dialog which doesn't set it by default,
+        // so the system would otherwise draw its own opaque navbar over our transparent request.
+        window.addFlags(
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+                WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
+        )
+        window.setLayout(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.MATCH_PARENT,
+        )
+        window.attributes =
+            window.attributes.apply {
+                layoutInDisplayCutoutMode = storeCutoutMode()
+            }
+        window.navigationBarColor = android.graphics.Color.TRANSPARENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.isNavigationBarContrastEnforced = false
+        }
+
+        onDispose {
+            window.attributes =
+                window.attributes.apply {
+                    layoutInDisplayCutoutMode = originalCutoutMode
+                }
+            window.navigationBarColor = originalNavigationBarColor
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced = originalNavBarContrastEnforced
+            }
+            window.clearFlags(
+                WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+                    WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
+            )
+            WindowCompat.setDecorFitsSystemWindows(window, true)
+            window.setLayout(originalWidth, originalHeight)
+        }
+    }
+}
+
+private fun storeCutoutMode(): Int =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+    } else {
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+    }
diff --git a/app/src/main/app/shell/UnifiedActivity.kt b/app/src/main/app/shell/UnifiedActivity.kt
index df889f92d..3151462fe 100644
--- a/app/src/main/app/shell/UnifiedActivity.kt
+++ b/app/src/main/app/shell/UnifiedActivity.kt
@@ -3,7 +3,6 @@ package com.winlator.cmod.app.shell
 import android.app.Activity
 import android.app.PendingIntent
 import android.content.Intent
-import android.content.IntentSender
 import android.content.res.Configuration
 import android.hardware.input.InputManager
 import android.graphics.Bitmap
@@ -18,7 +17,6 @@ import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.AnimatedContent
@@ -53,7 +51,9 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
 import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.*
@@ -78,9 +78,11 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
 import androidx.compose.material.icons.automirrored.outlined.OpenInNew
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.*
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -88,8 +90,10 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.focus.FocusRequester
@@ -106,11 +110,14 @@ import androidx.compose.ui.graphics.TileMode
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
@@ -142,9 +149,12 @@ import com.winlator.cmod.R
 import com.winlator.cmod.app.PluviaApp
 import com.winlator.cmod.app.db.PluviaDatabase
 import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
 import com.winlator.cmod.app.update.UpdateChecker
 import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
 import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
 import com.winlator.cmod.feature.settings.SettingsNavItem
 import com.winlator.cmod.feature.setup.SetupWizardActivity
 import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
@@ -152,6 +162,7 @@ import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
 import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
 import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
 import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
 import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
 import com.winlator.cmod.feature.stores.epic.data.EpicGame
 import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
@@ -162,12 +173,16 @@ import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
 import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
 import com.winlator.cmod.feature.stores.epic.service.EpicManager
 import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
 import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
 import com.winlator.cmod.feature.stores.gog.data.GOGGame
 import com.winlator.cmod.feature.stores.gog.data.LibraryItem
 import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
 import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
 import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
 import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
 import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
 import com.winlator.cmod.feature.stores.steam.data.DepotInfo
@@ -182,6 +197,7 @@ import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
 import com.winlator.cmod.feature.sync.CloudSyncHelper
 import com.winlator.cmod.feature.sync.google.CloudSyncManager
 import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
 import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.container.Shortcut
 import com.winlator.cmod.runtime.display.XServerDisplayActivity
@@ -196,17 +212,34 @@ import com.winlator.cmod.shared.android.RefreshRateUtils
 import com.winlator.cmod.shared.io.StorageUtils
 import com.winlator.cmod.shared.io.FileUtils
 import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 import com.winlator.cmod.shared.ui.FourByTwoGridView
 import com.winlator.cmod.shared.ui.JoystickGridScroll
 import com.winlator.cmod.shared.ui.JoystickListScroll
 import com.winlator.cmod.shared.ui.ListView
-import com.winlator.cmod.shared.ui.outlinedSwitchColors
 import com.winlator.cmod.shared.ui.widget.chasingBorder
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.Lazy
-import `in`.dragonbra.javasteam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -214,26 +247,25 @@ import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
-// Color palette
-private val BgDark = Color(0xFF18181D)
-private val SurfaceDark = Color(0xFF1E252E)
-private val CardDark = Color(0xFF12121B)
-private val CardBorder = Color(0xFF2A2A3A)
-private val Accent = Color(0xFF1A9FFF)
-private val AccentGlow = Color(0xFF58A6FF)
-private val TextPrimary = Color(0xFFF0F4FF)
-private val TextSecondary = Color(0xFF7A8FA8)
-private val DangerRed = Color(0xFFFF6B6B)
-private val StatusOnline = Color(0xFF3FB950)
-private val StatusAway = Color(0xFFF0C040)
+internal val BgDark = Color(0xFF18181D)
+internal val SurfaceDark = Color(0xFF1E252E)
+internal val CardDark = Color(0xFF12121B)
+internal val CardBorder = Color(0xFF2A2A3A)
+internal val Accent = Color(0xFF1A9FFF)
+internal val AccentGlow = Color(0xFF58A6FF)
+internal val TextPrimary = Color(0xFFF0F4FF)
+internal val TextSecondary = Color(0xFF7A8FA8)
+internal val DangerRed = Color(0xFFFF6B6B)
+internal val StatusOnline = Color(0xFF3FB950)
+internal val StatusAway = Color(0xFFF0C040)
 private val StatusOffline = Color(0xFF6E7681)
-private val DownloadCardBlack = Color.Black.copy(alpha = 0.46f)
-private val DownloadCardSelectedBlack = Color.Black.copy(alpha = 0.58f)
-private val DownloadButtonBlack = Color.Black.copy(alpha = 0.38f)
+internal val DownloadCardBlack = Color.Black.copy(alpha = 0.46f)
+internal val DownloadCardSelectedBlack = Color.Black.copy(alpha = 0.58f)
+internal val DownloadButtonBlack = Color.Black.copy(alpha = 0.38f)
 private val DownloadChaseBlue = Color(0xFF2196F3)
 private val DownloadChaseSky = Color(0xFF29B6F6)
 private val DownloadChaseCyan = Color(0xFF00E5FF)
-private val DownloadChaseGradientStops =
+internal val DownloadChaseGradientStops =
     arrayOf(
         0.00f to DownloadChaseBlue,
         0.125f to DownloadChaseSky,
@@ -247,22 +279,22 @@ private val DownloadChaseGradientStops =
     )
 private val TabScreenHorizontalPadding = 16.dp
 private val TabScreenBottomPadding = 8.dp
-private val UnifiedTopBarHorizontalPadding = 8.dp
-private val UnifiedTopBarTopPadding = 4.dp
-private val UnifiedTopBarHeight = 56.dp
-private val TabListContentPadding = PaddingValues(top = 4.dp, bottom = 12.dp)
-private val TabGridContentPadding = PaddingValues(top = 8.dp, bottom = 16.dp)
-private val TabGridTopPadding = 8.dp
-private val TabCarouselTopPadding = 12.dp
-private val TabCarouselBottomPadding = 20.dp
-private val DownloadsHeaderTopPadding = 2.dp
-
-private fun Modifier.tabScreenPadding(
+internal val UnifiedTopBarHorizontalPadding = 12.dp
+internal val UnifiedTopBarTopPadding = 4.dp
+internal val UnifiedTopBarHeight = 56.dp
+internal val TabListContentPadding = PaddingValues(top = 4.dp, bottom = 12.dp)
+internal val TabGridContentPadding = PaddingValues(top = 8.dp, bottom = 16.dp)
+internal val TabGridTopPadding = 8.dp
+internal val TabCarouselTopPadding = 12.dp
+internal val TabCarouselBottomPadding = 20.dp
+internal val DownloadsHeaderTopPadding = 2.dp
+
+internal fun Modifier.tabScreenPadding(
     top: Dp = 0.dp,
     bottom: Dp = TabScreenBottomPadding,
 ): Modifier = padding(start = TabScreenHorizontalPadding, top = top, end = TabScreenHorizontalPadding, bottom = bottom)
 
-private val LIBRARY_NAME_SANITIZE_REGEX = "[^A-Za-z0-9 _-]".toRegex()
+internal val LIBRARY_NAME_SANITIZE_REGEX = "[^A-Za-z0-9 _-]".toRegex()
 
 enum class LibraryLayoutMode {
     GRID_4,
@@ -270,94 +302,141 @@ enum class LibraryLayoutMode {
     LIST,
 }
 
-//test
+internal class DownloadsNavBridge {
+    var controllerActive by mutableStateOf(false)
+    var navSignal by mutableStateOf(0)
+        private set
+    var navDir by mutableStateOf(0)
+        private set
+
+    private fun nav(dir: Int) {
+        navDir = dir
+        navSignal++
+    }
+
+    fun left() = nav(PANE_DIR_LEFT)
+
+    fun right() = nav(PANE_DIR_RIGHT)
+
+    fun up() = nav(PANE_DIR_UP)
+
+    fun down() = nav(PANE_DIR_DOWN)
+
+    fun activate() = nav(PANE_DIR_ACTIVATE)
+
+    fun secondary() = nav(PANE_DIR_SECONDARY)
+}
+
 @AndroidEntryPoint
 class UnifiedActivity :
     FixedFontScaleAppCompatActivity(),
     ActivityResultHost {
     @Inject lateinit var dbProvider: Lazy<PluviaDatabase>
 
-    private val db: PluviaDatabase
+    internal val db: PluviaDatabase
         get() = dbProvider.get()
 
-    private data class PendingNavigation(
+    internal data class PendingNavigation(
         val item: SettingsNavItem = SettingsNavItem.CONTAINERS,
         val profileId: Int = 0,
         val editContainerId: Int = 0,
         val returnToGameOnBack: Boolean = false,
     )
 
-    private data class ControllerConnectionState(
+    internal data class ControllerConnectionState(
         val isConnected: Boolean = ControllerHelper.isControllerConnected(),
         val isPlayStation: Boolean = ControllerHelper.isPlayStationController(),
     )
 
-    // Root navigation controller for hub <-> settings transitions
-    private var rootNavController: NavHostController? = null
+    internal var rootNavController: NavHostController? = null
 
-    // Queued navigation to process once the nav controller is ready
-    private var pendingNavigation: PendingNavigation? = null
+    internal var pendingNavigation: PendingNavigation? = null
 
-    // Guards against rapid Back presses during the settings → hub exit animation.
-    // Without this, two popBackStack() calls inside the 300ms transition can desync
-    // the NavHost state and leave the root composable rendering nothing (black screen).
-    private var isPoppingSettings: Boolean = false
+    // Absorb rapid Back presses during the settings exit animation.
+    internal var isPoppingSettings: Boolean = false
 
-    // Track the currently selected game in the carousel for Game Settings button
-    private var selectedSteamAppId: Int = 0
-    private var selectedSteamAppName: String = ""
-    private var selectedLibrarySource: String = ""
-    private var selectedGogGameId: String = ""
+    internal var selectedSteamAppId: Int = 0
+    internal var selectedSteamAppName: String = ""
+    internal var selectedLibrarySource: String = ""
+    internal var selectedGogGameId: String = ""
 
-    // Full library refresh trigger for installs, shortcuts, and external changes.
     var libraryRefreshSignal by mutableIntStateOf(0)
-    // Lightweight refresh trigger for playtime/order changes when returning from a game.
+
     var libraryPlaytimeRefreshSignal by mutableIntStateOf(0)
     private var hasCompletedInitialResume = false
 
-    // Freezes the library/store card chasing borders while any full-screen
-    // dialog is open, so the ~120 Hz animation cost isn't paid for content
-    // the user can't see or interact with.
-    private val chasingBordersPaused = mutableStateOf(false)
+    // Activity-level so task progress survives game-detail dialog teardown.
+    internal var taskProgressInfo by mutableStateOf<DownloadInfo?>(null)
+    internal var taskProgressGameName by mutableStateOf("")
+    internal var taskProgressCompleteMsg by mutableStateOf("")
+    internal var taskProgressFailedMsg by mutableStateOf("")
+    internal var taskProgressShown by mutableStateOf(false)
+    internal var taskDoneMessage by mutableStateOf<String?>(null)
+    internal var taskDoneFailed by mutableStateOf(false)
+    internal var taskCheckingShown by mutableStateOf(false)
+    internal var taskCheckingGameName by mutableStateOf("")
+
+    internal var taskProgressCompleteAsToast by mutableStateOf(false)
 
-    // Keep the first composition light until secure prefs/auth state and the Room DB
-    // are primed off the UI thread. Rapid relaunches after task removal otherwise
-    // hit cold-start work here and can stall input.
-    private var startupBootstrapReady by mutableStateOf(false)
-    private var startupLibraryLayoutMode by mutableStateOf<LibraryLayoutMode?>(null)
-    private var startupStoreVisible: Map<String, Boolean>? = null
-    private var startupContentFilters: Map<String, Boolean>? = null
+    // Prevent overlapping checks after the checking pop-up is dismissed.
+    internal var updateCheckInProgress = false
 
-    // LibraryCarousel is always composed (kept alive behind an alpha(0f) when
-    // another tab is active). This flag lets GameCapsule skip its animation
-    // while the library is invisible.
-    private val libraryTabActive = mutableStateOf(true)
+    // Avoid paying card border animation cost behind full-screen dialogs.
+    internal val chasingBordersPaused = mutableStateOf(false)
+
+    // Keep first composition light while prefs/auth state and Room warm up.
+    internal var startupBootstrapReady by mutableStateOf(false)
+    internal var startupLibraryLayoutMode by mutableStateOf<LibraryLayoutMode?>(null)
+    internal var startupStoreVisible: Map<String, Boolean>? = null
+    internal var startupContentFilters: Map<String, Boolean>? = null
+
+    // Lets kept-alive library cards skip animation while their tab is hidden.
+    internal val libraryTabActive = mutableStateOf(true)
 
     val rightStickScrollState = kotlinx.coroutines.flow.MutableStateFlow(0f)
     val leftStickScrollState = kotlinx.coroutines.flow.MutableStateFlow(0f)
     val keyEventFlow = kotlinx.coroutines.flow.MutableSharedFlow<android.view.KeyEvent>(extraBufferCapacity = 10)
 
-    // Library grid focus: tracked index and item count, controlled by DPAD
+    val openHeroForFocusedSignal = kotlinx.coroutines.flow.MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+
+    val openSearchSignal = kotlinx.coroutines.flow.MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+
+    val openFriendsSignal = kotlinx.coroutines.flow.MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+
+    val openGlassesSignal = kotlinx.coroutines.flow.MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    internal var l2KeyDown = false
+    internal var r2KeyDown = false
+    internal var l2AxisDown = false
+    internal var r2AxisDown = false
+    internal var glassesComboArmed = true
+
     val libraryFocusIndex = kotlinx.coroutines.flow.MutableStateFlow(0)
     var libraryItemCount: Int = 0
-    private var currentLibraryLayoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4
+    internal var currentLibraryLayoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4
+
+    // Coil model for the focused game's immersive background.
+    val immersiveBackgroundRef = kotlinx.coroutines.flow.MutableStateFlow<Any?>(null)
+
+    private val defaultNavigationBarColor: Int = android.graphics.Color.TRANSPARENT
 
-    // Store grid focus: same pattern for store/steam/epic/gog tabs
     val storeFocusIndex = kotlinx.coroutines.flow.MutableStateFlow(0)
     var storeItemCount: Int = 0
-    private var storeColumns: Int = 4
+    internal var storeColumns: Int = 4
 
-    // Reference to the active store tab's grid state so we can snap focus to visible area
     var storeGridState: androidx.compose.foundation.lazy.grid.LazyGridState? = null
 
-    // Single shared gate for ALL navigation inputs (dpad keys, hat axes, joystick)
-    // so that simultaneous events from the same physical input don't cause double moves.
+    // Shared gate for d-pad, hat, and joystick navigation events.
     private var lastMoveTime = 0L
 
-    // Tracks whether a d-pad direction is currently held so we can distinguish
-    // a fresh press (fires immediately) from a held repeat (throttled at 250ms).
     private var dpadHeld = false
     private var joystickActive = false
+    @Volatile private var retroCloudUploadBusy = false
+
+    internal val settingsNavBridge = SettingsNavBridge()
+    internal val downloadsNavBridge = DownloadsNavBridge()
+    internal val drawerNavBridge = DownloadsNavBridge()
+    internal val friendsDrawerNavBridge = DownloadsNavBridge()
+    private var settingsStickEngaged = 0
 
     companion object {
         private const val MOVE_INTERVAL_MS = 250L
@@ -389,92 +468,11 @@ class UnifiedActivity :
             }
         }
 
-    private val driveAuthLauncher =
-        registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
-            GameSaveBackupManager.onDriveAuthResult(this, result.resultCode)
-        }
-
     override fun launchWallpaperImagePicker() {
         wallpaperImagePickerLauncher.launch("image/*")
     }
 
-    override fun launchDriveAuthRequest(intentSender: IntentSender) {
-        driveAuthLauncher.launch(IntentSenderRequest.Builder(intentSender).build())
-    }
-
-    private fun moveLibraryFocus(
-        left: Boolean,
-        right: Boolean,
-        up: Boolean,
-        down: Boolean,
-    ) {
-        val idx = libraryFocusIndex.value
-        val count = libraryItemCount
-        if (count <= 0) return
-        var newIdx = idx
-        when (currentLibraryLayoutMode) {
-            LibraryLayoutMode.GRID_4 -> {
-                if (left) newIdx = (idx - 1).coerceAtLeast(0)
-                if (right) newIdx = (idx + 1).coerceAtMost(count - 1)
-                if (up) newIdx = (idx - 4).coerceAtLeast(0)
-                if (down) newIdx = (idx + 4).coerceAtMost(count - 1)
-            }
-
-            LibraryLayoutMode.CAROUSEL -> {
-                if (left) newIdx = (idx - 1).coerceAtLeast(0)
-                if (right) newIdx = (idx + 1).coerceAtMost(count - 1)
-            }
-
-            LibraryLayoutMode.LIST -> {
-                if (up) newIdx = (idx - 1).coerceAtLeast(0)
-                if (down) newIdx = (idx + 1).coerceAtMost(count - 1)
-            }
-        }
-        libraryFocusIndex.value = newIdx
-    }
-
-    private fun moveStoreFocus(
-        left: Boolean,
-        right: Boolean,
-        up: Boolean,
-        down: Boolean,
-    ) {
-        val count = storeItemCount
-        if (count <= 0) return
-        val cols = storeColumns
-
-        // If the current focus index is not visible (e.g. user scrolled with right joystick),
-        // snap focus to the top-left of the visible area first.
-        var idx = storeFocusIndex.value
-        val grid = storeGridState
-        if (grid != null) {
-            val visibleItems = grid.layoutInfo.visibleItemsInfo
-            if (visibleItems.isNotEmpty()) {
-                val firstVisible = visibleItems.first().index
-                val lastVisible = visibleItems.last().index
-                if (idx < firstVisible || idx > lastVisible) {
-                    idx = firstVisible
-                    storeFocusIndex.value = idx
-                    return // just snap, don't move further this press
-                }
-            }
-        }
-
-        var newIdx = idx
-        if (left) newIdx = (idx - 1).coerceAtLeast(0)
-        if (right) newIdx = (idx + 1).coerceAtMost(count - 1)
-        if (up) newIdx = (idx - cols).coerceAtLeast(0)
-        if (down) newIdx = (idx + cols).coerceAtMost(count - 1)
-        storeFocusIndex.value = newIdx
-    }
-
-    private fun gogPseudoId(gameId: String): Int {
-        val normalized = gameId.hashCode() and 0x1FFFFFFF
-        return 1_500_000_000 + normalized
-    }
-
-    // Cached reference to avoid fragment tree traversal on every input event.
-    // Invalidated via FragmentLifecycleCallbacks.
+    // Avoid fragment tree traversal on every input event.
     private var cachedInputControlsFragment: InputControlsFragment? = null
     private val inputControlsFragmentTracker =
         object : androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks() {
@@ -494,7 +492,6 @@ class UnifiedActivity :
         }
 
     override fun dispatchKeyEvent(event: android.view.KeyEvent): Boolean {
-        // Forward to InputControlsFragment if it's active (for gamepad binding capture)
         cachedInputControlsFragment?.let { fragment ->
             if (fragment.dispatchKeyEvent(event)) return true
         }
@@ -502,7 +499,39 @@ class UnifiedActivity :
         val keyCode = event.keyCode
         val action = event.action
 
-        // Intercept keys we handle globally to prevent fall-through (e.g. Start button launching a game)
+        if (keyCode == android.view.KeyEvent.KEYCODE_BUTTON_B &&
+            action == android.view.KeyEvent.ACTION_DOWN &&
+            hideImeIfVisible()
+        ) {
+            return true
+        }
+
+        if (keyCode == android.view.KeyEvent.KEYCODE_BUTTON_MODE) {
+            handleGuideButton(action, event.repeatCount)
+            return true
+        }
+
+        if (keyCode == android.view.KeyEvent.KEYCODE_BUTTON_L2 ||
+            keyCode == android.view.KeyEvent.KEYCODE_BUTTON_R2
+        ) {
+            val down = action == android.view.KeyEvent.ACTION_DOWN
+            if (keyCode == android.view.KeyEvent.KEYCODE_BUTTON_L2) l2KeyDown = down else r2KeyDown = down
+            updateGlassesCombo()
+        }
+
+        if (menuNavActive) {
+            return dispatchMenuNavKey(event, keyCode, action)
+        }
+
+        if (drawerOpen) {
+            return dispatchDrawerNavKey(event, keyCode, action)
+        }
+
+        if (rightDrawerOpen) {
+            return dispatchDrawerNavKey(event, keyCode, action, friendsDrawerNavBridge)
+        }
+
+        // Prevent global controller buttons from falling through to launch actions.
         val isHandledGlobally =
             when (keyCode) {
                 android.view.KeyEvent.KEYCODE_BUTTON_START,
@@ -512,13 +541,15 @@ class UnifiedActivity :
                 android.view.KeyEvent.KEYCODE_BUTTON_Y,
                 android.view.KeyEvent.KEYCODE_BUTTON_L1,
                 android.view.KeyEvent.KEYCODE_BUTTON_R1,
+                android.view.KeyEvent.KEYCODE_BUTTON_SELECT,
+                android.view.KeyEvent.KEYCODE_BUTTON_THUMBL,
+                android.view.KeyEvent.KEYCODE_BUTTON_THUMBR,
                 android.view.KeyEvent.KEYCODE_DPAD_CENTER,
                 -> true
 
                 else -> false
             }
 
-        // Intercept DPAD events on all tabs for throttled, grid-aware navigation
         val isDpad =
             keyCode == android.view.KeyEvent.KEYCODE_DPAD_LEFT ||
                 keyCode == android.view.KeyEvent.KEYCODE_DPAD_RIGHT ||
@@ -526,13 +557,11 @@ class UnifiedActivity :
                 keyCode == android.view.KeyEvent.KEYCODE_DPAD_DOWN
         if (isDpad) {
             if (action == android.view.KeyEvent.ACTION_UP) {
-                // Release: allow next press to fire immediately
                 dpadHeld = false
                 return true
             }
             if (action == android.view.KeyEvent.ACTION_DOWN) {
                 val now = android.os.SystemClock.uptimeMillis()
-                // Fresh press fires immediately; held repeat is throttled at 250ms
                 if (!dpadHeld || (now - lastMoveTime >= MOVE_INTERVAL_MS)) {
                     val left = keyCode == android.view.KeyEvent.KEYCODE_DPAD_LEFT
                     val right = keyCode == android.view.KeyEvent.KEYCODE_DPAD_RIGHT
@@ -540,13 +569,32 @@ class UnifiedActivity :
                     val down = keyCode == android.view.KeyEvent.KEYCODE_DPAD_DOWN
                     when (currentTabKey) {
                         "library" -> moveLibraryFocus(left, right, up, down)
+                        "downloads" -> routeDownloadsNav(left, right, up, down)
                         else -> moveStoreFocus(left, right, up, down)
                     }
                     lastMoveTime = now
                     dpadHeld = true
                 }
             }
-            return true // consume both DOWN and UP
+            return true
+        }
+
+        if (currentTabKey == "downloads" && action == android.view.KeyEvent.ACTION_DOWN) {
+            when (keyCode) {
+                android.view.KeyEvent.KEYCODE_BUTTON_A,
+                android.view.KeyEvent.KEYCODE_DPAD_CENTER,
+                -> {
+                    downloadsNavBridge.controllerActive = true
+                    downloadsNavBridge.activate()
+                    return true
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_Y -> {
+                    downloadsNavBridge.controllerActive = true
+                    downloadsNavBridge.secondary()
+                    return true
+                }
+            }
         }
 
         if (action == android.view.KeyEvent.ACTION_DOWN) {
@@ -555,7 +603,6 @@ class UnifiedActivity :
                 return true
             }
         } else if (action == android.view.KeyEvent.ACTION_UP && isHandledGlobally) {
-            // Consume ACTION_UP for handled keys to ensure balanced event stream for super
             return true
         }
 
@@ -571,15 +618,24 @@ class UnifiedActivity :
 
     override fun onResume() {
         super.onResume()
+        settingsStickEngaged = 0
+        joystickActive = false
         chasingBordersPaused.value = false
         if (hasCompletedInitialResume) {
             libraryPlaytimeRefreshSignal++
+            SteamService.ensureHealthySession()
         } else {
             hasCompletedInitialResume = true
         }
 
-        // (Re)start the background update loop (checks hourly + on first tick)
         UpdateChecker.startBackgroundLoop(this)
+        processPendingRetroCloudBackup()
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        settingsStickEngaged = 0
+        joystickActive = false
     }
 
     override fun onDestroy() {
@@ -594,7 +650,6 @@ class UnifiedActivity :
     }
 
     override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean {
-        // Forward to InputControlsFragment if it's active (for gamepad binding capture)
         cachedInputControlsFragment?.let { fragment ->
             if (fragment.dispatchGenericMotionEvent(event)) return true
         }
@@ -602,15 +657,52 @@ class UnifiedActivity :
         if ((event.source and android.view.InputDevice.SOURCE_JOYSTICK) == android.view.InputDevice.SOURCE_JOYSTICK &&
             event.action == android.view.MotionEvent.ACTION_MOVE
         ) {
-            // Handle Right Joystick Y axis for scrolling in stores
+            val lt = kotlin.math.max(
+                event.getAxisValue(android.view.MotionEvent.AXIS_LTRIGGER),
+                event.getAxisValue(android.view.MotionEvent.AXIS_BRAKE),
+            )
+            val rt = kotlin.math.max(
+                event.getAxisValue(android.view.MotionEvent.AXIS_RTRIGGER),
+                event.getAxisValue(android.view.MotionEvent.AXIS_GAS),
+            )
+            l2AxisDown = lt > 0.5f
+            r2AxisDown = rt > 0.5f
+            updateGlassesCombo()
+
+            if (menuNavActive) {
+                val sx = event.getAxisValue(android.view.MotionEvent.AXIS_X)
+                val sy = event.getAxisValue(android.view.MotionEvent.AXIS_Y)
+                val shx = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_X)
+                val shy = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_Y)
+                val code =
+                    when {
+                        sx < -0.5f || shx < -0.5f -> android.view.KeyEvent.KEYCODE_DPAD_LEFT
+                        sx > 0.5f || shx > 0.5f -> android.view.KeyEvent.KEYCODE_DPAD_RIGHT
+                        sy < -0.5f || shy < -0.5f -> android.view.KeyEvent.KEYCODE_DPAD_UP
+                        sy > 0.5f || shy > 0.5f -> android.view.KeyEvent.KEYCODE_DPAD_DOWN
+                        else -> 0
+                    }
+                if (code != 0) {
+                    if (settingsStickEngaged == 0) {
+                        settingsStickEngaged = code
+                        handleSettingsStick(code)
+                    }
+                    return true
+                }
+                if (kotlin.math.abs(sx) < 0.35f && kotlin.math.abs(sy) < 0.35f &&
+                    kotlin.math.abs(shx) < 0.35f && kotlin.math.abs(shy) < 0.35f
+                ) {
+                    settingsStickEngaged = 0
+                }
+                return true
+            }
+
             val rz = event.getAxisValue(android.view.MotionEvent.AXIS_RZ)
             rightStickScrollState.value = rz
 
-            // Handle Left Joystick Y axis for scrolling in stores
             val leftY = event.getAxisValue(android.view.MotionEvent.AXIS_Y)
             leftStickScrollState.value = leftY
 
-            // Handle Left Joystick/D-pad for grid navigation on all tabs
             val x = event.getAxisValue(android.view.MotionEvent.AXIS_X)
             val y = event.getAxisValue(android.view.MotionEvent.AXIS_Y)
             val hatX = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_X)
@@ -638,16 +730,28 @@ class UnifiedActivity :
                     val right = isHatRight || isJoystickRight
                     val up = isHatUp || isJoystickUp
                     val down = isHatDown || isJoystickDown
-                    when (currentTabKey) {
-                        "library" -> moveLibraryFocus(left, right, up, down)
-                        else -> moveStoreFocus(left, right, up, down)
+                    if (menuNavActive || drawerOpen || rightDrawerOpen) {
+                        val dpadCode =
+                            when {
+                                left -> android.view.KeyEvent.KEYCODE_DPAD_LEFT
+                                right -> android.view.KeyEvent.KEYCODE_DPAD_RIGHT
+                                up -> android.view.KeyEvent.KEYCODE_DPAD_UP
+                                down -> android.view.KeyEvent.KEYCODE_DPAD_DOWN
+                                else -> 0
+                            }
+                        if (dpadCode != 0) injectKeyEvent(dpadCode)
+                    } else {
+                        when (currentTabKey) {
+                            "library" -> moveLibraryFocus(left, right, up, down)
+                            "downloads" -> routeDownloadsNav(left, right, up, down)
+                            else -> moveStoreFocus(left, right, up, down)
+                        }
                     }
                     lastMoveTime = now
                     joystickActive = true
                 }
                 return true
             } else if (joystickActive) {
-                // Joystick returned to center — reset so next flick fires immediately
                 joystickActive = false
                 lastMoveTime = 0L
             }
@@ -655,151 +759,232 @@ class UnifiedActivity :
         return super.dispatchGenericMotionEvent(event)
     }
 
-    private var currentTabKey: String = "library"
+    internal var currentTabKey: String = "library"
+
+    @Volatile
+    private var inSettingsRoute: Boolean = false
+
+    @Volatile
+    internal var drawerOpen: Boolean = false
+    internal var rightDrawerOpen: Boolean = false
+    internal val guideHandler = android.os.Handler(android.os.Looper.getMainLooper())
+    internal var guideHoldRunnable: Runnable? = null
+
+    internal val menuNavActive: Boolean
+        get() = inSettingsRoute
 
-    // Callback set by the active store tab so the A-button handler can trigger a click on the focused item
     var storeItemClickCallback: ((Int) -> Unit)? = null
 
-    private fun injectKeyEvent(keyCode: Int) {
-        window.decorView.rootView.dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, keyCode))
-        window.decorView.rootView.dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, keyCode))
-    }
+    private fun dispatchMenuNavKey(
+        event: android.view.KeyEvent,
+        keyCode: Int,
+        action: Int,
+    ): Boolean {
+        when (keyCode) {
+            android.view.KeyEvent.KEYCODE_DPAD_UP,
+            android.view.KeyEvent.KEYCODE_DPAD_DOWN,
+            android.view.KeyEvent.KEYCODE_DPAD_LEFT,
+            android.view.KeyEvent.KEYCODE_DPAD_RIGHT,
+            -> {
+                if (settingsNavBridge.zone == SettingsFocusZone.SIDEBAR) {
+                    if (action == android.view.KeyEvent.ACTION_DOWN) applySettingsSidebarNav(keyCode)
+                    return true
+                }
+                if (action == android.view.KeyEvent.ACTION_DOWN) navigateSettingsContent(keyCode)
+                return true
+            }
 
-    private fun reapplyPreferredRefreshRate() {
-        if (isFinishing || isDestroyed) return
-        RefreshRateUtils.applyPreferredRefreshRate(this)
-    }
+            android.view.KeyEvent.KEYCODE_BUTTON_A,
+            android.view.KeyEvent.KEYCODE_DPAD_CENTER,
+            -> {
+                if (settingsNavBridge.zone == SettingsFocusZone.SIDEBAR) {
+                    if (action == android.view.KeyEvent.ACTION_DOWN) enterSettingsContent()
+                    return true
+                }
+                if (action == android.view.KeyEvent.ACTION_DOWN) settingsNavBridge.contentActivate()
+                return true
+            }
 
-    private fun navigateToSettings(
-        item: SettingsNavItem = SettingsNavItem.CONTAINERS,
-        profileId: Int = 0,
-        editContainerId: Int = 0,
-        returnToGameOnBack: Boolean = false,
-    ) {
-        // Settings is an in-activity navigation target, so entering it does not trigger an
-        // Activity resume. Reassert the preferred display mode at the activity boundary.
-        reapplyPreferredRefreshRate()
-        val route = buildSettingsRoute(item, profileId, editContainerId, returnToGameOnBack)
-        val nav = rootNavController
-        if (nav == null) {
-            pendingNavigation = PendingNavigation(item, profileId, editContainerId, returnToGameOnBack)
-            return
-        }
-        isPoppingSettings = false
-        nav.navigate(route) {
-            launchSingleTop = true
-        }
-    }
+            android.view.KeyEvent.KEYCODE_BUTTON_B -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN) {
+                    onBackPressedDispatcher.onBackPressed()
+                }
+                return true
+            }
 
-    private fun buildSettingsRoute(
-        item: SettingsNavItem = SettingsNavItem.CONTAINERS,
-        profileId: Int = 0,
-        editContainerId: Int = 0,
-        returnToGameOnBack: Boolean = false,
-    ): String =
-        "settings?item=${item.name}&profileId=$profileId&editContainerId=$editContainerId&returnToGameOnBack=$returnToGameOnBack"
+            android.view.KeyEvent.KEYCODE_BUTTON_Y -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN &&
+                    settingsNavBridge.zone == SettingsFocusZone.CONTENT
+                ) {
+                    settingsNavBridge.contentSecondary()
+                }
+                return true
+            }
 
-    private fun extractSettingsNavigation(intent: Intent?): PendingNavigation? {
-        if (intent == null) return null
+            android.view.KeyEvent.KEYCODE_BUTTON_L1 -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN &&
+                    settingsNavBridge.zone == SettingsFocusZone.CONTENT
+                ) {
+                    settingsNavBridge.contentSectionPrev()
+                }
+                return true
+            }
 
-        val editContainerId = intent.getIntExtra("edit_container_id", 0)
-        if (editContainerId > 0) {
-            return PendingNavigation(SettingsNavItem.CONTAINERS, 0, editContainerId)
-        }
+            android.view.KeyEvent.KEYCODE_BUTTON_R1 -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN &&
+                    settingsNavBridge.zone == SettingsFocusZone.CONTENT
+                ) {
+                    settingsNavBridge.contentSectionNext()
+                }
+                return true
+            }
 
-        if (intent.getBooleanExtra("edit_input_controls", false)) {
-            val profileId = intent.getIntExtra("selected_profile_id", 0)
-            val returnToGameOnBack = intent.getBooleanExtra("return_to_game_on_back", false)
-            return PendingNavigation(SettingsNavItem.INPUT_CONTROLS, profileId, 0, returnToGameOnBack)
+            android.view.KeyEvent.KEYCODE_BUTTON_X,
+            android.view.KeyEvent.KEYCODE_BUTTON_START,
+            -> return true
         }
+        return super.dispatchKeyEvent(event)
+    }
 
-        val selectedMenuItemId = intent.getIntExtra("selected_menu_item_id", 0)
-        if (selectedMenuItemId > 0) {
-            val target = SettingsNavItem.fromMenuId(selectedMenuItemId) ?: SettingsNavItem.CONTAINERS
-            return PendingNavigation(target, 0, 0)
-        }
+    private fun dispatchDrawerNavKey(
+        event: android.view.KeyEvent,
+        keyCode: Int,
+        action: Int,
+        bridge: DownloadsNavBridge = drawerNavBridge,
+    ): Boolean {
+        when (keyCode) {
+            android.view.KeyEvent.KEYCODE_DPAD_LEFT,
+            android.view.KeyEvent.KEYCODE_DPAD_RIGHT,
+            android.view.KeyEvent.KEYCODE_DPAD_UP,
+            android.view.KeyEvent.KEYCODE_DPAD_DOWN,
+            -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
+                    bridge.controllerActive = true
+                    when (keyCode) {
+                        android.view.KeyEvent.KEYCODE_DPAD_LEFT -> bridge.left()
+                        android.view.KeyEvent.KEYCODE_DPAD_RIGHT -> bridge.right()
+                        android.view.KeyEvent.KEYCODE_DPAD_UP -> bridge.up()
+                        android.view.KeyEvent.KEYCODE_DPAD_DOWN -> bridge.down()
+                    }
+                }
+                return true
+            }
 
-        return null
-    }
+            android.view.KeyEvent.KEYCODE_BUTTON_A,
+            android.view.KeyEvent.KEYCODE_DPAD_CENTER,
+            -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN) {
+                    bridge.controllerActive = true
+                    bridge.activate()
+                }
+                return true
+            }
 
-    private fun consumeSettingsIntent(intent: Intent?) {
-        intent ?: return
-        intent.removeExtra("edit_container_id")
-        intent.removeExtra("edit_input_controls")
-        intent.removeExtra("selected_profile_id")
-        intent.removeExtra("selected_menu_item_id")
-        intent.removeExtra("return_to_game_on_back")
-    }
+            android.view.KeyEvent.KEYCODE_BUTTON_Y -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN) {
+                    bridge.controllerActive = true
+                    bridge.secondary()
+                }
+                return true
+            }
+
+            android.view.KeyEvent.KEYCODE_BUTTON_B,
+            android.view.KeyEvent.KEYCODE_BUTTON_SELECT,
+            -> {
+                if (action == android.view.KeyEvent.ACTION_DOWN) keyEventFlow.tryEmit(event)
+                return true
+            }
 
-    private fun handleSettingsIntent(intent: Intent?) {
-        val request = extractSettingsNavigation(intent) ?: return
-        consumeSettingsIntent(intent)
-        navigateToSettings(request.item, request.profileId, request.editContainerId, request.returnToGameOnBack)
+            android.view.KeyEvent.KEYCODE_BUTTON_X,
+            android.view.KeyEvent.KEYCODE_BUTTON_START,
+            android.view.KeyEvent.KEYCODE_BUTTON_L1,
+            android.view.KeyEvent.KEYCODE_BUTTON_R1,
+            android.view.KeyEvent.KEYCODE_BUTTON_THUMBL,
+            android.view.KeyEvent.KEYCODE_BUTTON_THUMBR,
+            -> return true
+        }
+        return super.dispatchKeyEvent(event)
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
+        if (maybeForwardFrontendLaunch()) return
         handleSettingsIntent(intent)
     }
 
-    private fun bootstrapStartupState() {
-        startupBootstrapReady = false
-        startupLibraryLayoutMode = null
-        startupStoreVisible = null
-        startupContentFilters = null
-
+    internal fun retryPendingRetroCloudBackup() = processPendingRetroCloudBackup()
+
+    private fun processPendingRetroCloudBackup() {
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(this)
+        val hasLegacy = prefs.getString("retro_pending_backup_id", null) != null
+        val hasDolphin = com.winlator.cmod.feature.retro.DolphinCloudSync.peekPending(this) != null
+        if (!hasLegacy && !hasDolphin) return
+        if (!com.winlator.cmod.feature.sync.google.GameSaveBackupManager.isDriveConnected(this)) return
+        runCatching {
+            com.winlator.cmod.feature.sync.google.PlayGamesBootstrap.ensureInitialized(this)
+            com.google.android.gms.games.PlayGames
+                .getGamesSignInClient(this)
+                .signIn()
+                .addOnCompleteListener { runPendingRetroUploads() }
+        }.onFailure { runPendingRetroUploads() }
+    }
+
+    private fun runPendingRetroUploads() {
+        if (retroCloudUploadBusy) return
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(this)
+        val pendingId = prefs.getString("retro_pending_backup_id", null)
+        val pendingName = prefs.getString("retro_pending_backup_name", null)
+        val dolphinPending = com.winlator.cmod.feature.retro.DolphinCloudSync.peekPending(this)
+        if ((pendingId == null || pendingName == null) && dolphinPending == null) return
+        retroCloudUploadBusy = true
         lifecycleScope.launch(Dispatchers.IO) {
-            val appContext = applicationContext
-            val resolvedLayoutMode =
-                runCatching {
-                    PrefManager.init(appContext)
-                    LibraryLayoutMode.valueOf(PrefManager.libraryLayoutMode)
-                }.getOrElse { error ->
-                    Log.w("UnifiedActivity", "Failed to resolve initial library layout", error)
-                    LibraryLayoutMode.GRID_4
+            try {
+                dolphinPending?.let { p ->
+                    if (uploadRetroCloudBackup(p.cloudId, p.gameName)) {
+                        com.winlator.cmod.feature.retro.DolphinCloudSync.clearPending(this@UnifiedActivity)
+                        if (p.fingerprint.isNotEmpty()) {
+                            prefs.edit().putString("retro_cloud_fp_${p.cloudId}", p.fingerprint).apply()
+                        }
+                    }
                 }
-
-            val resolvedStoreVisible =
-                runCatching {
-                    val saved = PrefManager.libraryStoreVisible.split(",").toSet()
-                    mapOf("steam" to ("steam" in saved), "epic" to ("epic" in saved), "gog" to ("gog" in saved))
-                }.getOrElse { mapOf("steam" to true, "epic" to true, "gog" to true) }
-
-            val resolvedContentFilters =
-                runCatching {
-                    val saved = PrefManager.libraryContentFilters.split(",").toSet()
-                    mapOf(
-                        "games" to ("games" in saved),
-                        "dlc" to ("dlc" in saved),
-                        "applications" to ("applications" in saved),
-                        "tools" to ("tools" in saved),
-                    )
-                }.getOrElse { mapOf("games" to true, "dlc" to false, "applications" to false, "tools" to false) }
-
-            runCatching { dbProvider.get() }
-                .onFailure { Log.w("UnifiedActivity", "Database warmup failed", it) }
-            runCatching { EpicAuthManager.updateLoginStatus(appContext) }
-                .onFailure { Log.w("UnifiedActivity", "Epic auth warmup failed", it) }
-            runCatching { GOGAuthManager.updateLoginStatus(appContext) }
-                .onFailure { Log.w("UnifiedActivity", "GOG auth warmup failed", it) }
-            runCatching { SteamService.initLoginStatus(appContext) }
-                .onFailure { Log.w("UnifiedActivity", "Steam auth warmup failed", it) }
-
-            withContext(Dispatchers.Main.immediate) {
-                startupLibraryLayoutMode = resolvedLayoutMode
-                currentLibraryLayoutMode = resolvedLayoutMode
-                startupStoreVisible = resolvedStoreVisible
-                startupContentFilters = resolvedContentFilters
-                startupBootstrapReady = true
+                if (pendingId != null && pendingName != null &&
+                    uploadRetroCloudBackup(pendingId, pendingName)
+                ) {
+                    prefs.edit().remove("retro_pending_backup_id").remove("retro_pending_backup_name").apply()
+                }
+            } finally {
+                retroCloudUploadBusy = false
             }
         }
     }
 
+    private suspend fun uploadRetroCloudBackup(cloudId: String, gameName: String): Boolean {
+        val result =
+            runCatching {
+                GameSaveBackupManager.backupSaveToGoogle(
+                    this@UnifiedActivity,
+                    GameSaveBackupManager.GameSource.CUSTOM,
+                    cloudId,
+                    gameName,
+                    GameSaveBackupManager.BackupOrigin.AUTO,
+                    com.winlator.cmod.feature.sync.google.GoogleAuthMode.RESUME,
+                    customSaveDir = com.winlator.cmod.feature.retro.RetroSaveStates.gameDir(this, gameName),
+                )
+            }.getOrNull()
+        android.util.Log.i("WnDolphin", "upload id=$cloudId success=${result?.success} msg=${result?.message}")
+        if (result?.success == true) {
+            androidx.preference.PreferenceManager.getDefaultSharedPreferences(this)
+                .edit().putLong("retro_cloud_mark_$cloudId", System.currentTimeMillis()).apply()
+            return true
+        }
+        return false
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         instance = this
         super.onCreate(savedInstanceState)
-        if (!SetupWizardActivity.isSetupComplete(this) || !ImageFs.find(this).isValid) {
+        if (!SetupWizardActivity.isSetupComplete(this) || !ImageFs.find(this).isUpToDate) {
             startActivity(
                 Intent(this, SetupWizardActivity::class.java)
                     .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION),
@@ -810,10 +995,15 @@ class UnifiedActivity :
             return
         }
 
+        if (maybeForwardFrontendLaunch()) return
+
         supportFragmentManager.registerFragmentLifecycleCallbacks(inputControlsFragmentTracker, true)
+        com.winlator.cmod.runtime.display.GlassesManager.init(this)
         bootstrapStartupState()
+        maybeAutoSignInGoogleOnLaunch()
+        processPendingRetroCloudBackup()
 
-        // Surface store-session events (e.g. Epic refresh-token death, cloud restore) as toasts.
+        // Surface store-session events as toasts.
         lifecycleScope.launch {
             com.winlator.cmod.feature.stores.common.StoreSessionBus.events.collect { event ->
                 val label =
@@ -832,26 +1022,34 @@ class UnifiedActivity :
                     }
                     is com.winlator.cmod.feature.stores.common.StoreSessionEvent.SessionRestored -> Unit
                     is com.winlator.cmod.feature.stores.common.StoreSessionEvent.SessionRefreshed -> {
-                        // informational — no UI surface
+                        Unit
                     }
                 }
             }
         }
 
         enableEdgeToEdge(
-            navigationBarStyle = SystemBarStyle.dark(0xFF141B24.toInt()),
+            navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT),
         )
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+            window.isNavigationBarContrastEnforced = false
+        }
         val initialSettingsNavigation = extractSettingsNavigation(intent)
         if (initialSettingsNavigation != null) {
             consumeSettingsIntent(intent)
         }
 
-        // Exclude left edge from system back gesture so the drawer can capture swipes
+        // Exclude the drawer edge from system back gesture where Android allows it.
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-            window.decorView.post {
-                val leftEdgeWidth = (40 * resources.displayMetrics.density).toInt()
-                val exclusionRect = android.graphics.Rect(0, 0, leftEdgeWidth, window.decorView.height)
-                window.decorView.systemGestureExclusionRects = listOf(exclusionRect)
+            val decorView = window.decorView
+            val updateDrawerGestureExclusion = {
+                val leftEdgeWidth = (32 * resources.displayMetrics.density).toInt()
+                val exclusionRect = android.graphics.Rect(0, 0, leftEdgeWidth, decorView.height)
+                decorView.systemGestureExclusionRects = listOf(exclusionRect)
+            }
+            decorView.post(updateDrawerGestureExclusion)
+            decorView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                updateDrawerGestureExclusion()
             }
         }
 
@@ -859,7 +1057,15 @@ class UnifiedActivity :
             val navController = rememberNavController()
             rootNavController = navController
 
-            // Drain any queued navigation or process the launch intent
+            DisposableEffect(navController) {
+                val listener =
+                    androidx.navigation.NavController.OnDestinationChangedListener { _, destination, _ ->
+                        inSettingsRoute = destination.route?.startsWith("settings") == true
+                    }
+                navController.addOnDestinationChangedListener(listener)
+                onDispose { navController.removeOnDestinationChangedListener(listener) }
+            }
+
             LaunchedEffect(Unit) {
                 val pending = pendingNavigation
                 if (pending != null) {
@@ -949,8 +1155,6 @@ class UnifiedActivity :
                     },
                 ) {
                     composable("hub") {
-                        // Once hub is the current destination, the previous settings-pop is
-                        // complete — clear the guard so the next settings session starts fresh.
                         LaunchedEffect(Unit) { isPoppingSettings = false }
                         UnifiedHub()
                     }
@@ -988,9 +1192,6 @@ class UnifiedActivity :
                         val returnToGameOnBack =
                             backStackEntry.arguments?.getBoolean("returnToGameOnBack") ?: false
 
-                        // Idempotent exit: the first Back press returns to the hub, any further
-                        // presses during the 220ms exit animation are absorbed here so NavHost
-                        // state stays consistent (see isPoppingSettings field for full context).
                         val exitSettingsToHubOnce: () -> Unit = {
                             if (!isPoppingSettings) {
                                 isPoppingSettings = true
@@ -1012,6 +1213,7 @@ class UnifiedActivity :
                         }
 
                         SettingsHost(
+                            bridge = settingsNavBridge,
                             startItem = startItem,
                             selectedProfileId = profileId,
                             bordersPaused = chasingBordersPaused.value,
@@ -1019,7 +1221,6 @@ class UnifiedActivity :
                         )
                         BackHandler(enabled = true) { exitSettingsToHubOnce() }
 
-                        // Handle edit_container_id deep link — show dialog on main thread outside composition
                         if (editContainerId > 0) {
                             LaunchedEffect(editContainerId) {
                                 val activity = this@UnifiedActivity
@@ -1039,9403 +1240,130 @@ class UnifiedActivity :
                         }
                     }
                 }
-            }
-        }
-        scheduleDeferredStoreBootstrap()
-    }
-
-    private fun scheduleDeferredStoreBootstrap() {
-        window.decorView.post {
-            if (isFinishing || isDestroyed) return@post
-            lifecycleScope.launch(Dispatchers.IO) {
-                if (EpicService.hasStoredCredentials(this@UnifiedActivity)) {
-                    EpicService.start(this@UnifiedActivity)
-                    // Refresh outside the first-frame path so the UI can render before
-                    // token validation/network work begins.
-                    EpicAuthManager.getStoredCredentials(this@UnifiedActivity)
-                    com.winlator.cmod.feature.stores.epic.service.EpicTokenRefreshWorker
-                        .schedule(this@UnifiedActivity)
-                }
-
-                if (SteamService.hasStoredCredentials(this@UnifiedActivity)) {
-                    SteamService.start(this@UnifiedActivity)
-                }
 
-                if (GOGAuthManager.isLoggedIn(this@UnifiedActivity)) {
-                    GOGService.start(this@UnifiedActivity)
-                }
-
-                SteamService.maybeRepairInstalledMetadataOnStartup(this@UnifiedActivity)
+                TaskProgressHost()
             }
         }
+        scheduleDeferredStoreBootstrap()
     }
 
-    // Tab definitions
-    private data class TabDef(
+    internal data class TabDef(
         val label: String,
         val key: String,
     )
 
-    private fun buildTabs(storeVisible: Map<String, Boolean>): List<TabDef> {
-        val base =
-            mutableListOf(
-                TabDef(getString(R.string.common_ui_library), "library"),
-                TabDef(getString(R.string.common_ui_downloads), "downloads"),
-            )
-        if (storeVisible["steam"] != false) base.add(TabDef("Steam", "steam"))
-        if (storeVisible["epic"] != false) base.add(TabDef("Epic", "epic"))
-        if (storeVisible["gog"] != false) base.add(TabDef("GOG", "gog"))
-        return base
+    internal enum class GameSettingsScreen {
+        Menu,
+        Shortcut,
+        CloudSaves,
+        Uninstall,
     }
 
-    @Composable
-    private fun rememberSteamInstallStateMap(apps: List<SteamApp>): Map<Int, Boolean> {
-        var installStateMap by remember { mutableStateOf<Map<Int, Boolean>>(emptyMap()) }
+    internal data class HomeShortcutUiState(
+        val shortcut: Shortcut? = null,
+        val isPinned: Boolean = false,
+        val loaded: Boolean = false,
+    )
 
-        LaunchedEffect(apps) {
-            installStateMap =
-                withContext(Dispatchers.IO) {
-                    apps.associate { it.id to SteamService.isAppInstalled(it.id) }
-                }
-        }
+    internal data class ArtworkCacheId(
+        val store: String,
+        val gameId: String,
+    )
 
-        return installStateMap
-    }
+    internal data class GameSettingsActionItem(
+        val title: String,
+        val icon: ImageVector,
+        val accentColor: Color = Accent,
+        val onClick: () -> Unit,
+    )
 
-    @Composable
-    private fun <K> rememberInstallPathStateMap(entries: List<Pair<K, String?>>): Map<K, Boolean>
-        where K : Any {
-        var installStateMap by remember { mutableStateOf<Map<K, Boolean>>(emptyMap()) }
+    // Library Game Detail Dialog
 
-        LaunchedEffect(entries) {
-            installStateMap =
-                withContext(Dispatchers.IO) {
-                    entries.associate { (key, path) ->
-                        key to (path?.isNotBlank() == true && java.io.File(path).exists())
-                    }
-                }
-        }
+    internal enum class LibraryDetailScreen { Main, Shortcut, CloudSaves, Uninstall }
 
-        return installStateMap
-    }
+    internal enum class LibraryDetailPopup { CloudSaves }
 
-    // Main scaffold
-    @Composable
-    fun UnifiedHub() {
-        val horizontalNavigationInsets =
-            WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
-        val initialLibraryLayoutMode = startupLibraryLayoutMode
-        val initialStoreVisible = startupStoreVisible ?: mapOf("steam" to true, "epic" to true, "gog" to true)
-        val initialContentFilters = startupContentFilters ?: mapOf("games" to true, "dlc" to false, "applications" to false, "tools" to false)
-        if (!startupBootstrapReady || initialLibraryLayoutMode == null) {
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .background(BgDark)
-                        .windowInsetsPadding(horizontalNavigationInsets),
-                contentAlignment = Alignment.Center,
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(16.dp),
-                ) {
-                    CircularProgressIndicator(color = Accent)
-                    Text(
-                        text = stringResource(R.string.common_ui_app_name),
-                        color = TextPrimary,
-                        style = MaterialTheme.typography.titleMedium,
-                    )
-                }
-            }
-            return
-        }
+    internal enum class HeroLaunchPopup { BootToDesktop, RemoveShortcut }
 
-        val storeVisible = remember { mutableStateMapOf(*initialStoreVisible.entries.map { it.key to it.value }.toTypedArray()) }
-        var showAddCustomGame by remember { mutableStateOf(false) }
-        var showExitDialog by remember { mutableStateOf(false) }
-        var searchQueryTfv by remember { mutableStateOf(TextFieldValue("")) }
-        val searchQuery = searchQueryTfv.text
-        var localLibraryRefreshKey by remember { mutableIntStateOf(0) }
-        var shortcutDataRefreshKey by remember { mutableIntStateOf(0) }
-        var iconRefreshKey by remember { mutableIntStateOf(0) }
-
-        val currentRefreshSignal = this@UnifiedActivity.libraryRefreshSignal
-        val libraryRefreshKey = currentRefreshSignal + localLibraryRefreshKey
-        val shortcutRefreshKey = libraryRefreshKey + shortcutDataRefreshKey
-        val playtimeRefreshKey = this@UnifiedActivity.libraryPlaytimeRefreshSignal
-
-        val contentFilters = remember { mutableStateMapOf(*initialContentFilters.entries.map { it.key to it.value }.toTypedArray()) }
-        var libraryLayoutMode by remember {
-            mutableStateOf(
-                initialLibraryLayoutMode,
-            )
-        }
-        val tabs = remember(storeVisible.toMap()) { buildTabs(storeVisible) }
-        var selectedIdx by rememberSaveable { mutableIntStateOf(0) }
-        var selectedDownloadId by remember { mutableStateOf<String?>(null) }
-        val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
-        val isLoggedIn by SteamService.isLoggedInFlow.collectAsState()
-        val isEpicLoggedIn by EpicAuthManager.isLoggedInFlow.collectAsState()
-        val isGogLoggedIn by GOGAuthManager.isLoggedInFlow.collectAsState()
-        val steamApps by db.steamAppDao().getAllOwnedApps().collectAsState(initial = emptyList())
-        val context = LocalContext.current
-        val persona by SteamService.instance?.localPersona?.collectAsState()
-            ?: remember { mutableStateOf(null) }
-        val scope = rememberCoroutineScope()
-
-        // Collect Epic/GOG apps from DB flows (Room flows auto-update on data changes)
-        val epicApps by db.epicGameDao().getAll().collectAsState(initial = emptyList())
-        val gogApps by db.gogGameDao().getAll().collectAsState(initial = emptyList())
-
-        val controllerState = rememberControllerConnectionState()
-        val isControllerConnected = controllerState.isConnected
-        val isPS = controllerState.isPlayStation
-        val isLibraryTab = tabs.getOrNull(selectedIdx)?.key == "library"
-
-        val libraryRefreshListener =
-            remember {
-                object : EventDispatcher.JavaEventListener {
-                    override fun onEvent(event: Any) {
-                        when (event) {
-                            is AndroidEvent.LibraryInstallStatusChanged -> {
-                                localLibraryRefreshKey++
-                                shortcutDataRefreshKey++
-                                iconRefreshKey++
-                            }
-                            is AndroidEvent.LibraryArtworkChanged -> {
-                                shortcutDataRefreshKey++
-                                iconRefreshKey++
-                            }
-                        }
-                    }
-                }
-            }
-        DisposableEffect(libraryRefreshListener) {
-            PluviaApp.events.onJava(AndroidEvent.LibraryInstallStatusChanged::class, libraryRefreshListener)
-            PluviaApp.events.onJava(AndroidEvent.LibraryArtworkChanged::class, libraryRefreshListener)
-            onDispose {
-                PluviaApp.events.offJava(AndroidEvent.LibraryInstallStatusChanged::class, libraryRefreshListener)
-                PluviaApp.events.offJava(AndroidEvent.LibraryArtworkChanged::class, libraryRefreshListener)
-            }
-        }
+    internal enum class HeroBootChoice { Desktop, Cube32, Cube64, Input32, Input64 }
 
-        LaunchedEffect(isEpicLoggedIn) {
-            if (isEpicLoggedIn) {
-                EpicService.start(context)
-            }
-        }
+    internal data class DownloadCancelRequest(
+        val ids: List<String>,
+        val isCancelAll: Boolean,
+    )
 
-        LaunchedEffect(isGogLoggedIn) {
-            if (isGogLoggedIn) {
-                GOGService.start(context)
-            }
-        }
+    internal fun Shortcut.hasExistingArtwork(extraKey: String): Boolean =
+        (getExtra(extraKey)
+            .takeIf { it.isNotBlank() }
+            ?.let { java.io.File(it).isFile } == true)
 
-        val epicLoginLauncher =
-            rememberLauncherForActivityResult(
-                contract = ActivityResultContracts.StartActivityForResult(),
-            ) { result ->
-                if (result.resultCode == android.app.Activity.RESULT_OK) {
-                    val code = result.data?.getStringExtra(EpicOAuthActivity.EXTRA_AUTH_CODE)
-                    if (code != null) {
-                        scope.launch {
-                            val authResult = EpicAuthManager.authenticateWithCode(context, code)
-                            if (authResult.isSuccess) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    R.string.stores_accounts_logged_in_epic,
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            } else {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    getString(R.string.stores_accounts_epic_login_failed, authResult.exceptionOrNull()?.message),
-                                    android.widget.Toast.LENGTH_LONG,
-                                )
-                            }
-                        }
-                    }
-                }
-            }
+    internal fun buildWineExecCommand(
+        container: com.winlator.cmod.runtime.container.Container?,
+        gameInstallPath: String,
+        relativeExePath: String,
+    ): String {
+        val exeFile = java.io.File(gameInstallPath, relativeExePath.replace("\\", "/"))
+        return buildWineExecCommand(container, gameInstallPath, exeFile)
+    }
 
-        val gogLoginLauncher =
-            rememberLauncherForActivityResult(
-                contract = ActivityResultContracts.StartActivityForResult(),
-            ) { result ->
-                if (result.resultCode == android.app.Activity.RESULT_OK) {
-                    val code = result.data?.getStringExtra(GOGOAuthActivity.EXTRA_AUTH_CODE)
-                    if (!code.isNullOrBlank()) {
-                        scope.launch {
-                            val authResult = GOGAuthManager.authenticateWithCode(context, code)
-                            if (authResult.isSuccess) {
-                                GOGService.start(context)
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    R.string.stores_accounts_logged_in_gog,
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            } else {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    getString(R.string.stores_accounts_gog_login_failed, authResult.exceptionOrNull()?.message),
-                                    android.widget.Toast.LENGTH_LONG,
-                                )
-                            }
-                        }
-                    }
-                }
+    internal fun buildWineExecCommand(
+        container: com.winlator.cmod.runtime.container.Container?,
+        gameInstallPath: String,
+        exeFile: java.io.File,
+    ): String {
+        val windowsPath =
+            container?.let {
+                com.winlator.cmod.runtime.wine.WineUtils
+                    .getDriveCGameWindowsPath(
+                        it,
+                        "CUSTOM",
+                        gameInstallPath,
+                        exeFile.absolutePath,
+                    ) ?: com.winlator.cmod.runtime.wine.WineUtils
+                    .getWindowsPath(it, exeFile.absolutePath)
+            } ?: run {
+                com.winlator.cmod.runtime.wine.WineUtils.getDosPath(exeFile.absolutePath)
             }
+        return "wine \"$windowsPath\""
+    }
 
-        val filteredSteamApps =
-            remember(steamApps, contentFilters.toMap()) {
-                steamApps.filter { app ->
-                    when (app.type) {
-                        com.winlator.cmod.feature.stores.steam.enums.AppType.game -> contentFilters["games"] == true
-                        com.winlator.cmod.feature.stores.steam.enums.AppType.demo -> contentFilters["games"] == true
-                        com.winlator.cmod.feature.stores.steam.enums.AppType.dlc -> contentFilters["dlc"] == true
-                        com.winlator.cmod.feature.stores.steam.enums.AppType.application -> contentFilters["applications"] == true
-                        com.winlator.cmod.feature.stores.steam.enums.AppType.tool -> contentFilters["tools"] == true
-                        com.winlator.cmod.feature.stores.steam.enums.AppType.config -> contentFilters["tools"] == true
-                        else -> contentFilters["games"] == true
-                    }
-                }
-            }
-
-        // Clamp selectedIdx if tabs shrink
-        var globalSettingsApp by remember { mutableStateOf<SteamApp?>(null) }
-        var globalSettingsGogGame by remember { mutableStateOf<GOGGame?>(null) }
-
-        LaunchedEffect(tabs.size) { if (selectedIdx >= tabs.size) selectedIdx = 0 }
-        LaunchedEffect(isLoggedIn, persona) {
-            if (isLoggedIn && persona == null) {
-                SteamService.requestUserPersona()
-            }
-        }
-
-        val activity = LocalContext.current as? UnifiedActivity
-
-        LaunchedEffect(tabs) {
-            activity?.keyEventFlow?.collect { event ->
-                val key = tabs.getOrNull(selectedIdx)?.key ?: "library"
-                when (event.keyCode) {
-                    android.view.KeyEvent.KEYCODE_BUTTON_L1 -> {
-                        selectedIdx = if (selectedIdx > 0) selectedIdx - 1 else tabs.size - 1
-                    }
-
-                    android.view.KeyEvent.KEYCODE_BUTTON_R1 -> {
-                        selectedIdx = (selectedIdx + 1) % tabs.size
-                    }
-
-                    android.view.KeyEvent.KEYCODE_BUTTON_START -> {
-                        navigateToSettings(SettingsNavItem.STORES)
-                    }
-
-                    android.view.KeyEvent.KEYCODE_BUTTON_X -> {
-                        if (key != "downloads") {
-                            if (drawerState.isOpen) drawerState.close() else drawerState.open()
-                        }
-                    }
-
-                    android.view.KeyEvent.KEYCODE_BUTTON_B -> {
-                        // Close menus in order, or show exit confirmation if none are open
-                        if (drawerState.isOpen) {
-                            drawerState.close()
-                        } else if (globalSettingsApp != null) {
-                            globalSettingsApp = null
-                        } else if (globalSettingsGogGame != null) {
-                            globalSettingsGogGame = null
-                        } else if (showAddCustomGame) {
-                            showAddCustomGame = false
-                        } else {
-                            showExitDialog = true
-                        }
-                    }
-
-                    android.view.KeyEvent.KEYCODE_BUTTON_Y -> {
-                        if (key == "library" && (selectedSteamAppId != 0 || selectedGogGameId.isNotEmpty())) {
-                            if (selectedLibrarySource == "GOG") {
-                                globalSettingsGogGame = gogApps.find { it.id == selectedGogGameId }
-                                return@collect
-                            }
-                            val isCustom = selectedSteamAppId < 0
-                            val epicId = if (selectedSteamAppId >= 2000000000) selectedSteamAppId - 2000000000 else 0
-
-                            // Handle Steam, Custom, and Epic semi-unified logic for the settings dialog trigger
-                            globalSettingsApp = (
-                                steamApps.find { it.id == selectedSteamAppId }
-                                    ?: if (isCustom) {
-                                        SteamApp(id = selectedSteamAppId, name = selectedSteamAppName, developer = "Custom")
-                                    } else if (epicId > 0) {
-                                        val epic = epicApps.find { it.id == epicId }
-                                        SteamApp(
-                                            id = selectedSteamAppId,
-                                            name = selectedSteamAppName,
-                                            developer = epic?.developer ?: "Epic Games",
-                                            gameDir = epic?.installPath ?: "",
-                                        )
-                                    } else {
-                                        null
-                                    }
-                            )
-                        }
-                    }
-
-                    android.view.KeyEvent.KEYCODE_BUTTON_A, android.view.KeyEvent.KEYCODE_DPAD_CENTER -> {
-                        if (key == "library" && (selectedSteamAppId != 0 || selectedGogGameId.isNotEmpty())) {
-                            val isCustom = selectedSteamAppId < 0
-                            val epicId = if (selectedSteamAppId >= 2000000000) selectedSteamAppId - 2000000000 else 0
-                            val containerManager = ContainerManager(context)
-                            if (isCustom) {
-                                launchCustomGame(context, containerManager, selectedSteamAppName)
-                            } else if (selectedLibrarySource == "GOG") {
-                                gogApps.find { it.id == selectedGogGameId }?.let {
-                                    launchGogGame(context, containerManager, it)
-                                }
-                            } else if (epicId > 0) {
-                                val epic = epicApps.find { it.id == epicId }
-                                if (epic != null && epic.isInstalled) {
-                                    val dummyApp =
-                                        SteamApp(id = selectedSteamAppId, name = selectedSteamAppName, gameDir = epic.installPath)
-                                    launchSteamGame(context, containerManager, dummyApp)
-                                }
-                            } else {
-                                val steam = steamApps.find { it.id == selectedSteamAppId }
-                                if (steam != null) {
-                                    launchSteamGame(context, containerManager, steam)
-                                }
-                            }
-                        } else if (key != "library" && key != "downloads") {
-                            // Store tabs: trigger click on focused item
-                            storeItemClickCallback?.invoke(storeFocusIndex.value)
-                        }
-                    }
-
-                }
-            }
-        }
-
-        ModalNavigationDrawer(
-            drawerState = drawerState,
-            drawerContent = {
-                DrawerContent(
-                    persona = persona,
-                    context = context,
-                    scope = scope,
-                    storeVisible = storeVisible,
-                    contentFilters = contentFilters,
-                    libraryLayoutMode = libraryLayoutMode,
-                    onLibraryLayoutSelected = {
-                        libraryLayoutMode = it
-                        PrefManager.libraryLayoutMode = it.name
-                    },
-                    onStoreVisibleChanged = { key, value ->
-                        storeVisible[key] = value
-                        PrefManager.libraryStoreVisible = storeVisible.entries.filter { it.value }.joinToString(",") { it.key }
-                    },
-                    onContentFiltersChanged = { key, value ->
-                        contentFilters[key] = value
-                        PrefManager.libraryContentFilters = contentFilters.entries.filter { it.value }.joinToString(",") { it.key }
-                    },
-                    onClose = { scope.launch { drawerState.close() } },
-                )
-            },
-            scrimColor = Color.Black.copy(alpha = 0.5f),
-            gesturesEnabled = true,
-        ) {
-            Box(
-                Modifier
-                    .fillMaxSize()
-                    .background(BgDark)
-                    .windowInsetsPadding(horizontalNavigationInsets),
-            ) {
-                Scaffold(
-                    containerColor = BgDark,
-                    contentWindowInsets = WindowInsets(0, 0, 0, 0),
-                    topBar = {
-                        TopBar(tabs, selectedIdx, {
-                            selectedIdx = it
-                        }, persona, context, scope, isControllerConnected, isPS, isLibraryTab, searchQueryTfv, {
-                            searchQueryTfv =
-                                it
-                        }, onFilterClicked = { scope.launch { drawerState.open() } }) {
-                            if (selectedLibrarySource == "GOG") {
-                                globalSettingsGogGame = gogApps.find { it.id == selectedGogGameId }
-                            } else {
-                                // Try Steam apps first, then fall back to custom or epic pseudo-apps
-                                globalSettingsApp = (
-                                    steamApps.find { it.id == selectedSteamAppId }
-                                        ?: if (selectedSteamAppId < 0) {
-                                            // Build a pseudo SteamApp for the custom game
-                                            SteamApp(
-                                                id = selectedSteamAppId,
-                                                name = selectedSteamAppName,
-                                                developer = "Custom",
-                                            )
-                                        } else if (selectedSteamAppId >= 2000000000) {
-                                            val epicId = selectedSteamAppId - 2000000000
-                                            val epic = epicApps.find { it.id == epicId }
-                                            SteamApp(
-                                                id = selectedSteamAppId,
-                                                name = selectedSteamAppName,
-                                                developer = epic?.developer ?: "Epic Games",
-                                                gameDir = epic?.installPath ?: "",
-                                            )
-                                        } else {
-                                            null
-                                        }
-                                )
-                            }
-                        }
-                    },
-                ) { padding ->
-                    LaunchedEffect(selectedIdx, tabs) {
-                        currentTabKey = tabs.getOrNull(selectedIdx)?.key ?: "library"
-                        // Reset store focus when switching tabs
-                        storeFocusIndex.value = 0
-                        storeItemClickCallback = null
-                    }
-
-                    Box(Modifier.padding(padding).fillMaxSize().background(BgDark)) {
-                        val key = tabs.getOrNull(selectedIdx)?.key ?: "library"
-
-                        LaunchedEffect(key) { libraryTabActive.value = (key == "library") }
-
-                        // Keep Library tab always composed so its state survives tab switches
-                        Box(
-                            Modifier.fillMaxSize().let {
-                                if (key == "library") {
-                                    it
-                                } else {
-                                    it.alpha(0f).pointerInput(Unit) { /* block ghost taps */ }
-                                }
-                            },
-                        ) {
-                            LibraryCarousel(
-                                isLoggedIn = isLoggedIn,
-                                steamApps = filteredSteamApps,
-                                epicApps = epicApps,
-                                gogApps = gogApps,
-                                layoutMode = libraryLayoutMode,
-                                libraryRefreshKey = libraryRefreshKey,
-                                shortcutRefreshKey = shortcutRefreshKey,
-                                playtimeRefreshKey = playtimeRefreshKey,
-                                iconRefreshKey = iconRefreshKey,
-                                searchQuery = searchQuery,
-                                isControllerConnected = isControllerConnected,
-                            )
-                        }
-
-                        if (key != "library") {
-                            AnimatedContent(
-                                targetState = key,
-                                transitionSpec = {
-                                    fadeIn(tween(200)) togetherWith fadeOut(tween(150))
-                                },
-                                label = "tabContent",
-                            ) { animatedKey ->
-                                when (animatedKey) {
-                                    "downloads" -> {
-                                        DownloadsTab(
-                                            selectedDownloadId,
-                                            animationsActive = key == "downloads",
-                                            onSelectDownload = { selectedDownloadId = it },
-                                        )
-                                    }
-
-                                    "steam" -> {
-                                        SteamStoreTab(isLoggedIn, filteredSteamApps, searchQuery, libraryLayoutMode)
-                                    }
-
-                                    "epic" -> {
-                                        EpicStoreTab(isEpicLoggedIn, epicApps, searchQuery, libraryLayoutMode) {
-                                            epicLoginLauncher.launch(Intent(this@UnifiedActivity, EpicOAuthActivity::class.java))
-                                        }
-                                    }
-
-                                    "gog" -> {
-                                        GOGStoreTab(isGogLoggedIn, gogApps, searchQuery, libraryLayoutMode) {
-                                            gogLoginLauncher.launch(Intent(this@UnifiedActivity, GOGOAuthActivity::class.java))
-                                        }
-                                    }
-
-                                    else -> {}
-                                }
-                            }
-                        }
-
-                        val configuration = LocalConfiguration.current
-                        val libraryFabBase = minOf(configuration.screenWidthDp, configuration.screenHeightDp)
-                        val addGameFabSize = (libraryFabBase * 0.125f).dp.coerceIn(56.dp, 64.dp)
-                        val addGameFabMargin = (libraryFabBase * 0.035f).dp.coerceIn(12.dp, 20.dp)
-                        val addGameFabIconSize = (libraryFabBase * 0.055f).dp.coerceIn(24.dp, 28.dp)
-
-                        // Bottom-right Add Custom Game button
-                        if (key == "library") {
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .align(Alignment.BottomEnd)
-                                        .windowInsetsPadding(
-                                            WindowInsets.navigationBars.only(WindowInsetsSides.Bottom),
-                                        )
-                                        .padding(end = addGameFabMargin, bottom = addGameFabMargin)
-                                        .size(addGameFabSize)
-                                        .shadow(10.dp, CircleShape, spotColor = Accent.copy(alpha = 0.4f))
-                                        .clip(CircleShape)
-                                        .background(SurfaceDark.copy(alpha = 0.96f), CircleShape)
-                                        .border(1.5.dp, Accent.copy(alpha = 0.55f), CircleShape)
-                                        .focusProperties { canFocus = false } // No specific button for this, handle via long press or touch
-                                        .clickable { showAddCustomGame = true },
-                                contentAlignment = Alignment.Center,
-                            ) {
-                                Icon(
-                                    Icons.Outlined.Add,
-                                    contentDescription = "Add Custom Game",
-                                    tint = Color.White,
-                                    modifier = Modifier.size(addGameFabIconSize),
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-        } // end ModalNavigationDrawer
-
-        if (globalSettingsApp != null) {
-            GameSettingsDialog(
-                app = globalSettingsApp!!,
-                onDismissRequest = { globalSettingsApp = null },
-            )
-        }
-        if (globalSettingsGogGame != null) {
-            GOGGameSettingsDialog(
-                app = globalSettingsGogGame!!,
-                onDismissRequest = { globalSettingsGogGame = null },
-            )
-        }
-
-        if (showAddCustomGame) {
-            AddCustomGameDialog(onDismiss = {
-                showAddCustomGame = false
-                localLibraryRefreshKey++
-            })
-        }
-
-        // Back button exit confirmation
-        BackHandler(enabled = true) {
-            // Consistent behavior: close overlays first, then show exit confirmation
-            if (drawerState.isOpen) {
-                scope.launch { drawerState.close() }
-            } else if (globalSettingsApp != null) {
-                globalSettingsApp = null
-            } else if (globalSettingsGogGame != null) {
-                globalSettingsGogGame = null
-            } else if (showAddCustomGame) {
-                showAddCustomGame = false
-            } else {
-                showExitDialog = true
-            }
-        }
-
-        if (showExitDialog) {
-            Dialog(
-                onDismissRequest = { showExitDialog = false },
-                properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true),
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .width(320.dp)
-                            .clip(RoundedCornerShape(20.dp))
-                            .background(SurfaceDark)
-                            .border(1.dp, Accent.copy(alpha = 0.3f), RoundedCornerShape(20.dp))
-                            .padding(28.dp),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                        Text(
-                            text = stringResource(R.string.common_ui_exit_app_confirm),
-                            style = MaterialTheme.typography.titleLarge,
-                            color = TextPrimary,
-                            fontWeight = FontWeight.Bold,
-                        )
-                        Spacer(Modifier.height(24.dp))
-                        Row(
-                            horizontalArrangement = Arrangement.spacedBy(16.dp),
-                        ) {
-                            // Cancel button
-                            OutlinedButton(
-                                onClick = { showExitDialog = false },
-                                colors = ButtonDefaults.outlinedButtonColors(contentColor = TextSecondary),
-                                border = androidx.compose.foundation.BorderStroke(1.dp, TextSecondary.copy(alpha = 0.5f)),
-                                shape = RoundedCornerShape(12.dp),
-                                modifier = Modifier.weight(1f),
-                            ) {
-                                Text(stringResource(R.string.common_ui_cancel), fontWeight = FontWeight.Medium)
-                            }
-                            // Exit button
-                            Button(
-                                onClick = {
-                                    AppTerminationHelper.exitApplication(this@UnifiedActivity, "hub_exit_menu")
-                                },
-                                colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFE53935)),
-                                shape = RoundedCornerShape(12.dp),
-                                modifier = Modifier.weight(1f),
-                            ) {
-                                Text(stringResource(R.string.common_ui_exit), color = Color.White, fontWeight = FontWeight.Bold)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Top bar
-    @Composable
-    private fun TopBar(
-        tabs: List<TabDef>,
-        selectedIdx: Int,
-        onSelect: (Int) -> Unit,
-        persona: com.winlator.cmod.feature.stores.steam.data.SteamFriend?,
-        context: android.content.Context,
-        scope: kotlinx.coroutines.CoroutineScope,
-        isControllerConnected: Boolean,
-        isPS: Boolean,
-        isLibraryTab: Boolean,
-        searchQuery: TextFieldValue,
-        onSearchQueryChange: (TextFieldValue) -> Unit,
-        onFilterClicked: () -> Unit,
-        onGameSettingsClicked: () -> Unit,
-    ) {
-        var isSearchExpanded by remember { mutableStateOf(false) }
-        val searchFocusRequester = remember { FocusRequester() }
-        val keyboardController = LocalSoftwareKeyboardController.current
-        val isDownloadsTab = tabs.getOrNull(selectedIdx)?.key == "downloads"
-
-        // Auto-collapse search when switching tabs
-        LaunchedEffect(selectedIdx) {
-            if (isSearchExpanded) {
-                onSearchQueryChange(TextFieldValue(""))
-                isSearchExpanded = false
-            }
-        }
-
-        // Auto-focus the search field when expanded
-        LaunchedEffect(isSearchExpanded) {
-            if (isSearchExpanded) {
-                kotlinx.coroutines.delay(150)
-                searchFocusRequester.requestFocus()
-            } else if (searchQuery.text.isNotEmpty()) {
-                onSearchQueryChange(TextFieldValue(""))
-            }
-        }
-
-        Column(modifier = Modifier.fillMaxWidth()) {
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(
-                            start = UnifiedTopBarHorizontalPadding,
-                            end = UnifiedTopBarHorizontalPadding,
-                            top = UnifiedTopBarTopPadding,
-                        )
-                        .height(UnifiedTopBarHeight),
-            ) {
-                // Center Block: Tabs (absolutely centered, unaffected by left/right content)
-                Row(
-                    modifier = Modifier.align(Alignment.Center),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    if (isControllerConnected) {
-                        ControllerBadge("L1")
-                        Spacer(Modifier.width(8.dp))
-                    }
-                    @Suppress("DEPRECATION")
-                    CompositionLocalProvider(
-                        androidx.compose.material3.LocalRippleConfiguration provides null,
-                    ) {
-                        val tabWidth = 100.dp
-                        val tabSideGutter = 12.dp
-                        val tabBarShape = RoundedCornerShape(18.dp)
-                        val visibleCount = minOf(3, tabs.size)
-                        val tabListState = rememberLazyListState()
-                        val snapFlingBehavior = rememberSnapFlingBehavior(lazyListState = tabListState)
-
-                        LaunchedEffect(selectedIdx) {
-                            val scrollTo = maxOf(0, selectedIdx - 1)
-                            tabListState.animateScrollToItem(scrollTo)
-                        }
-
-                        Box(
-                            modifier =
-                                Modifier
-                                    .width(tabWidth * visibleCount + tabSideGutter * 2)
-                                    .height(44.dp)
-                                    .shadow(8.dp, tabBarShape, spotColor = Color.Black.copy(alpha = 0.5f))
-                                    .clip(tabBarShape)
-                                    .background(CardDark)
-                                    .border(1.dp, CardBorder, tabBarShape),
-                        ) {
-                            LazyRow(
-                                state = tabListState,
-                                flingBehavior = snapFlingBehavior,
-                                modifier =
-                                    Modifier
-                                        .align(Alignment.Center)
-                                        .width(tabWidth * visibleCount)
-                                        .fillMaxHeight()
-                                        .focusProperties { canFocus = !isLibraryTab },
-                                userScrollEnabled = tabs.size > visibleCount,
-                            ) {
-                                itemsIndexed(tabs) { index, tab ->
-                                    val selected = selectedIdx == index
-                                    val interactionSource = remember { MutableInteractionSource() }
-                                    val isPressed by interactionSource.collectIsPressedAsState()
-                                    val tabScale by animateFloatAsState(
-                                        targetValue = if (isPressed) 0.92f else 1f,
-                                        animationSpec = spring(stiffness = Spring.StiffnessHigh),
-                                        label = "tabScale",
-                                    )
-                                    val textColor by animateColorAsState(
-                                        targetValue = if (selected) Accent else TextSecondary,
-                                        animationSpec = tween(280),
-                                        label = "tabTextColor",
-                                    )
-
-                                    Box(
-                                        modifier =
-                                            Modifier
-                                                .width(tabWidth)
-                                                .fillMaxHeight()
-                                                .focusProperties { canFocus = false }
-                                                .graphicsLayer {
-                                                    scaleX = tabScale
-                                                    scaleY = tabScale
-                                                }.clickable(
-                                                    interactionSource = interactionSource,
-                                                    indication = null,
-                                                ) { onSelect(index) },
-                                        contentAlignment = Alignment.Center,
-                                    ) {
-                                        Text(
-                                            text = tab.label.uppercase(),
-                                            style = MaterialTheme.typography.labelLarge,
-                                            fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium,
-                                            fontSize = 13.sp,
-                                            maxLines = 1,
-                                            color = textColor,
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if (isControllerConnected) {
-                        Spacer(Modifier.width(8.dp))
-                        ControllerBadge("R1")
-                    }
-                }
-
-                // Left Block: Settings & Search
-                Row(
-                    modifier = Modifier.align(Alignment.CenterStart).fillMaxHeight(),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    // Settings Button
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(44.dp)
-                                .shadow(6.dp, CircleShape, spotColor = Color.Black.copy(alpha = 0.5f))
-                                .clip(CircleShape)
-                                .background(SurfaceDark)
-                                .focusProperties { canFocus = !isLibraryTab },
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        IconButton(onClick = {
-                            navigateToSettings(SettingsNavItem.STORES)
-                        }, modifier = Modifier.size(44.dp), enabled = true) {
-                            Icon(Icons.Outlined.Settings, contentDescription = "Menu", tint = TextPrimary, modifier = Modifier.size(24.dp))
-                        }
-                    }
-                    if (isControllerConnected) {
-                        Spacer(Modifier.width(8.dp))
-                        ControllerBadge(if (isPS) "\u2261" else "Start")
-                    }
-
-                    // Search Button (disabled on downloads tab)
-                    Spacer(Modifier.width(12.dp))
-
-                    val searchIconRotation by animateFloatAsState(
-                        targetValue = if (isSearchExpanded) 90f else 0f,
-                        animationSpec =
-                            spring(
-                                dampingRatio = Spring.DampingRatioMediumBouncy,
-                                stiffness = Spring.StiffnessLow,
-                            ),
-                        label = "searchIconRotation",
-                    )
-
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(44.dp)
-                                .shadow(6.dp, CircleShape, spotColor = Color.Black.copy(alpha = 0.5f))
-                                .clip(CircleShape)
-                                .background(
-                                    if (isDownloadsTab) {
-                                        SurfaceDark.copy(alpha = 0.4f)
-                                    } else if (isSearchExpanded) {
-                                        Accent.copy(alpha = 0.15f)
-                                    } else {
-                                        SurfaceDark
-                                    },
-                                ).focusProperties { canFocus = !isLibraryTab },
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        IconButton(
-                            onClick = {
-                                if (!isDownloadsTab) {
-                                    if (isSearchExpanded) {
-                                        onSearchQueryChange(TextFieldValue(""))
-                                        isSearchExpanded = false
-                                    } else {
-                                        isSearchExpanded = true
-                                    }
-                                }
-                            },
-                            modifier = Modifier.size(44.dp),
-                            enabled = !isDownloadsTab,
-                        ) {
-                            Icon(
-                                Icons.Outlined.Search,
-                                contentDescription = "Search",
-                                tint =
-                                    if (isDownloadsTab) {
-                                        TextSecondary.copy(alpha = 0.4f)
-                                    } else if (isSearchExpanded) {
-                                        Accent
-                                    } else {
-                                        TextPrimary
-                                    },
-                                modifier =
-                                    Modifier
-                                        .size(24.dp)
-                                        .graphicsLayer { rotationZ = searchIconRotation },
-                            )
-                        }
-                    }
-                }
-
-                // Right Block: Status & Actions
-                Row(
-                    modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(),
-                    horizontalArrangement = Arrangement.End,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    val isStore = tabs.getOrNull(selectedIdx)?.label?.contains("Store", ignoreCase = true) == true
-                    if (isControllerConnected && !isStore) {
-                        ControllerBadge(if (isPS) "\u25B3" else "Y")
-                        Spacer(Modifier.width(8.dp))
-                    }
-
-                    Spacer(Modifier.width(8.dp))
-
-                    // Filter button (opens drawer)
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(44.dp)
-                                .shadow(6.dp, CircleShape, spotColor = Color.Black.copy(alpha = 0.5f))
-                                .clip(CircleShape)
-                                .background(SurfaceDark)
-                                .focusProperties { canFocus = !isLibraryTab }
-                                .clickable { onFilterClicked() },
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Icon(Icons.Outlined.FilterList, contentDescription = "Filter", tint = TextPrimary, modifier = Modifier.size(24.dp))
-                    }
-                    if (isControllerConnected) {
-                        Spacer(Modifier.width(8.dp))
-                        ControllerBadge(if (isPS) "\u25A1" else "X")
-                    }
-                }
-            }
-
-            // Dropdown Search Bar
-            AnimatedVisibility(
-                visible = isSearchExpanded && !isDownloadsTab,
-                enter =
-                    expandVertically(
-                        animationSpec =
-                            spring(
-                                dampingRatio = Spring.DampingRatioNoBouncy,
-                                stiffness = Spring.StiffnessMedium,
-                            ),
-                        expandFrom = Alignment.Top,
-                    ) + fadeIn(animationSpec = tween(200)),
-                exit =
-                    shrinkVertically(
-                        animationSpec =
-                            spring(
-                                dampingRatio = Spring.DampingRatioNoBouncy,
-                                stiffness = Spring.StiffnessMedium,
-                            ),
-                        shrinkTowards = Alignment.Top,
-                    ) + fadeOut(animationSpec = tween(120)),
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 16.dp, vertical = 6.dp),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .widthIn(max = 600.dp)
-                                .fillMaxWidth(0.7f)
-                                .height(44.dp)
-                                .shadow(8.dp, RoundedCornerShape(24.dp), spotColor = Color.Black.copy(alpha = 0.4f))
-                                .clip(RoundedCornerShape(24.dp))
-                                .background(SurfaceDark),
-                        contentAlignment = Alignment.CenterStart,
-                    ) {
-                        Row(
-                            modifier =
-                                Modifier
-                                    .fillMaxSize()
-                                    .padding(horizontal = 16.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Icon(
-                                Icons.Outlined.Search,
-                                contentDescription = null,
-                                tint = Accent,
-                                modifier = Modifier.size(22.dp),
-                            )
-                            Spacer(Modifier.width(12.dp))
-                            BasicTextField(
-                                value = searchQuery,
-                                onValueChange = onSearchQueryChange,
-                                singleLine = true,
-                                textStyle =
-                                    TextStyle(
-                                        color = TextPrimary,
-                                        fontSize = 15.sp,
-                                    ),
-                                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-                                keyboardActions = KeyboardActions(onSearch = { keyboardController?.hide() }),
-                                cursorBrush = Brush.verticalGradient(listOf(Accent, AccentGlow)),
-                                modifier =
-                                    Modifier
-                                        .weight(1f)
-                                        .focusRequester(searchFocusRequester),
-                                decorationBox = { innerTextField ->
-                                    Box(contentAlignment = Alignment.CenterStart) {
-                                        if (searchQuery.text.isEmpty()) {
-                                            Text(
-                                                "Search games...",
-                                                style =
-                                                    TextStyle(
-                                                        color = TextSecondary,
-                                                        fontSize = 15.sp,
-                                                    ),
-                                            )
-                                        }
-                                        innerTextField()
-                                    }
-                                },
-                            )
-                            if (searchQuery.text.isNotEmpty()) {
-                                IconButton(
-                                    onClick = { onSearchQueryChange(TextFieldValue("")) },
-                                    modifier = Modifier.size(32.dp),
-                                ) {
-                                    Icon(
-                                        Icons.Outlined.Close,
-                                        contentDescription = "Clear",
-                                        tint = TextSecondary,
-                                        modifier = Modifier.size(18.dp),
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        } // end Column
-    }
-
-    // PS5-style Library Carousel
-    @Composable
-    fun LibraryCarousel(
-        isLoggedIn: Boolean,
-        steamApps: List<SteamApp>,
-        epicApps: List<EpicGame>,
-        gogApps: List<GOGGame>,
-        layoutMode: LibraryLayoutMode,
-        libraryRefreshKey: Int = 0,
-        shortcutRefreshKey: Int = 0,
-        playtimeRefreshKey: Int = 0,
-        iconRefreshKey: Int = 0,
-        searchQuery: String = "",
-        isControllerConnected: Boolean = false,
-    ) {
-        val context = LocalContext.current
-
-        // Load all shortcuts once and cache for both custom app discovery and GameCapsule icon lookup
-        var cachedShortcuts by remember { mutableStateOf<List<Shortcut>>(emptyList()) }
-        var customApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
-        var localLibraryRefreshKey by remember { mutableIntStateOf(0) }
-        var shortcutsLoaded by remember { mutableStateOf(false) }
-        LaunchedEffect(shortcutRefreshKey, localLibraryRefreshKey) {
-            shortcutsLoaded = false
-
-            val shortcutScanResult =
-                runCatching {
-                    withContext(Dispatchers.IO) {
-                        val cm = ContainerManager(context)
-                        cm.upgradeShortcuts {
-                            localLibraryRefreshKey++
-                        }
-                        val allShortcuts = cm.loadShortcuts()
-                        val apps =
-                            allShortcuts
-                                .mapNotNull { shortcut ->
-                                    if (!LibraryShortcutUtils.isCustomLibraryShortcut(shortcut)) {
-                                        return@mapNotNull null
-                                    }
-
-                                    val displayName =
-                                        shortcut
-                                            .getExtra("custom_name", shortcut.name)
-                                            .ifBlank { shortcut.name }
-                                    
-                                    val uuid = shortcut.getExtra("uuid")
-                                    val customId = if (uuid.isNotEmpty()) {
-                                        // Use UUID hash to ensure ID stability across renames
-                                        -(uuid.hashCode().and(0x7FFFFFFF) + 1)
-                                    } else {
-                                        -(displayName.hashCode().and(0x7FFFFFFF) + 1)
-                                    }
-
-                                    SteamApp(
-                                        id = customId,
-                                        name = displayName,
-                                        developer = "Custom",
-                                        gameDir =
-                                            shortcut.getExtra(
-                                                "game_install_path",
-                                                shortcut.getExtra("custom_game_folder", ""),
-                                            ),
-                                    )
-                                }
-
-                        allShortcuts to apps
-                    }
-                }.getOrNull()
-
-            if (shortcutScanResult != null) {
-                cachedShortcuts = shortcutScanResult.first
-                customApps = shortcutScanResult.second
-            }
-
-            shortcutsLoaded = true
-        }
-
-        // Move expensive filtering (runBlocking DB queries, file I/O) off the main thread.
-        // This set only changes on real library mutations; playtime resorts are handled separately.
-        var mergedInstalledApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
-        var installedApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
-        var stableInstalledApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
-        var gogByPseudoId by remember { mutableStateOf<Map<Int, GOGGame>>(emptyMap()) }
-        var epicByPseudoId by remember { mutableStateOf<Map<Int, EpicGame>>(emptyMap()) }
-        var stableGogByPseudoId by remember { mutableStateOf<Map<Int, GOGGame>>(emptyMap()) }
-        var stableEpicByPseudoId by remember { mutableStateOf<Map<Int, EpicGame>>(emptyMap()) }
-        var customArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var customGridArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var customCarouselArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var customListArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var customIconPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var stableCustomArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var stableCustomGridArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var stableCustomCarouselArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var stableCustomListArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var stableCustomIconPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
-        var libraryLoaded by remember { mutableStateOf(false) }
-        // Track whether a new source snapshot is awaiting recomputation. The token
-        // changes during composition as soon as any input list changes, so we can
-        // suppress transient empty states before the background coroutine starts.
-        val scanInputToken =
-            remember(steamApps, epicApps, gogApps, customApps, libraryRefreshKey) { Any() }
-        var processedScanToken by remember { mutableStateOf<Any?>(null) }
-
-        LaunchedEffect(scanInputToken) {
-            withContext(Dispatchers.IO) {
-                val steamInstalled = steamApps.filter { SteamService.isAppInstalled(it.id) }
-
-                val epicInstalled = epicApps.filter { it.isInstalled }
-
-                val gogInstalled = gogApps.filter { it.isInstalled && java.io.File(it.installPath).exists() }
-
-                val gogMap = gogInstalled.associateBy { gogPseudoId(it.id) }
-                val epicMap = epicInstalled.associateBy { 2000000000 + it.id }
-
-                val playtimePrefs = context.getSharedPreferences("playtime_stats", android.content.Context.MODE_PRIVATE)
-                val allPlaytime = playtimePrefs.all
-                val mappedEpic =
-                    epicInstalled.map { epic ->
-                        SteamApp(
-                            id = 2000000000 + epic.id,
-                            name = epic.title,
-                            developer = epic.developer,
-                            gameDir = epic.installPath,
-                        )
-                    }
-                val mappedGog =
-                    gogInstalled.map { gog ->
-                        SteamApp(
-                            id = gogPseudoId(gog.id),
-                            name = gog.title,
-                            developer = gog.developer,
-                            gameDir = gog.installPath,
-                        )
-                    }
-                val merged = steamInstalled + customApps + mappedEpic + mappedGog
-                val sorted =
-                    merged.sortedByDescending { app ->
-                        val searchKey =
-                            if (app.id >= 2000000000 || app.id < 0) {
-                                app.name
-                            } else {
-                                app.name.replace(LIBRARY_NAME_SANITIZE_REGEX, "")
-                            }
-                        (allPlaytime["${searchKey}_last_played"] as? Long) ?: 0L
-                    }
-
-                withContext(Dispatchers.Main) {
-                    gogByPseudoId = gogMap
-                    epicByPseudoId = epicMap
-                    mergedInstalledApps = merged
-                    installedApps = sorted
-                    if (sorted.isNotEmpty()) {
-                        stableInstalledApps = sorted
-                        stableGogByPseudoId = gogMap
-                        stableEpicByPseudoId = epicMap
-                    }
-                    libraryLoaded = true
-                    processedScanToken = scanInputToken
-                }
-            }
-        }
-
-        LaunchedEffect(installedApps, gogByPseudoId, cachedShortcuts, iconRefreshKey) {
-            val appsSnapshot = installedApps
-            val gogSnapshot = gogByPseudoId
-            val shortcutsSnapshot = cachedShortcuts
-
-            val artworkPaths =
-                withContext(Dispatchers.IO) {
-                    buildMap<Int, String> {
-                        appsSnapshot.forEach { app ->
-                            val gogGame = gogSnapshot[app.id]
-                            val isCustom = app.id < 0
-                            val isEpic = app.id >= 2000000000
-                            val epicId = if (isEpic) app.id - 2000000000 else 0
-                            val shortcut =
-                                if (gogGame != null) {
-                                    shortcutsSnapshot.find {
-                                        it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
-                                    }
-                                } else {
-                                    findShortcutForGame(shortcutsSnapshot, app, isCustom, isEpic, epicId)
-                                }
-                            val customPath =
-                                shortcut
-                                    ?.getExtra("customLibraryIconPath")
-                                    ?.ifBlank { shortcut.getExtra("customCoverArtPath") }
-                            if (!customPath.isNullOrBlank() && java.io.File(customPath).exists()) {
-                                put(app.id, customPath)
-                            }
-                        }
-                    }
-                }
-
-            val gridArtworkPaths =
-                withContext(Dispatchers.IO) {
-                    buildMap<Int, String> {
-                        appsSnapshot.forEach { app ->
-                            val gogGame = gogSnapshot[app.id]
-                            val isCustom = app.id < 0
-                            val isEpic = app.id >= 2000000000
-                            val epicId = if (isEpic) app.id - 2000000000 else 0
-                            val shortcut =
-                                if (gogGame != null) {
-                                    shortcutsSnapshot.find {
-                                        it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
-                                    }
-                                } else {
-                                    findShortcutForGame(shortcutsSnapshot, app, isCustom, isEpic, epicId)
-                                }
-                            val customPath = shortcut?.getExtra(LibraryShortcutArtwork.LibraryArtworkSlot.GRID.extraKey)
-                            if (!customPath.isNullOrBlank() && java.io.File(customPath).exists()) {
-                                put(app.id, customPath)
-                            }
-                        }
-                    }
-                }
-
-            val carouselArtworkPaths =
-                withContext(Dispatchers.IO) {
-                    buildMap<Int, String> {
-                        appsSnapshot.forEach { app ->
-                            val gogGame = gogSnapshot[app.id]
-                            val isCustom = app.id < 0
-                            val isEpic = app.id >= 2000000000
-                            val epicId = if (isEpic) app.id - 2000000000 else 0
-                            val shortcut =
-                                if (gogGame != null) {
-                                    shortcutsSnapshot.find {
-                                        it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
-                                    }
-                                } else {
-                                    findShortcutForGame(shortcutsSnapshot, app, isCustom, isEpic, epicId)
-                                }
-                            val customPath = shortcut?.getExtra(LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL.extraKey)
-                            if (!customPath.isNullOrBlank() && java.io.File(customPath).exists()) {
-                                put(app.id, customPath)
-                            }
-                        }
-                    }
-                }
-
-            val listArtworkPaths =
-                withContext(Dispatchers.IO) {
-                    buildMap<Int, String> {
-                        appsSnapshot.forEach { app ->
-                            val gogGame = gogSnapshot[app.id]
-                            val isCustom = app.id < 0
-                            val isEpic = app.id >= 2000000000
-                            val epicId = if (isEpic) app.id - 2000000000 else 0
-                            val shortcut =
-                                if (gogGame != null) {
-                                    shortcutsSnapshot.find {
-                                        it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
-                                    }
-                                } else {
-                                    findShortcutForGame(shortcutsSnapshot, app, isCustom, isEpic, epicId)
-                                }
-                            val customPath = shortcut?.getExtra(LibraryShortcutArtwork.LibraryArtworkSlot.LIST.extraKey)
-                            if (!customPath.isNullOrBlank() && java.io.File(customPath).exists()) {
-                                put(app.id, customPath)
-                            }
-                        }
-                    }
-                }
-
-            val customIconPaths =
-                withContext(Dispatchers.IO) {
-                    buildMap<Int, String> {
-                        appsSnapshot.forEach { app ->
-                            if (app.id >= 0) return@forEach
-                            val safeName = app.name.replace("/", "_").replace("\\", "_")
-                            val iconFile = java.io.File(context.filesDir, "custom_icons/$safeName.png")
-                            if (iconFile.exists()) {
-                                put(app.id, iconFile.absolutePath)
-                            }
-                        }
-                    }
-                }
-
-            customArtworkPathByAppId = artworkPaths
-            customGridArtworkPathByAppId = gridArtworkPaths
-            customCarouselArtworkPathByAppId = carouselArtworkPaths
-            customListArtworkPathByAppId = listArtworkPaths
-            customIconPathByAppId = customIconPaths
-            if (appsSnapshot.isNotEmpty()) {
-                stableCustomArtworkPathByAppId = artworkPaths
-                stableCustomGridArtworkPathByAppId = gridArtworkPaths
-                stableCustomCarouselArtworkPathByAppId = carouselArtworkPaths
-                stableCustomListArtworkPathByAppId = listArtworkPaths
-                stableCustomIconPathByAppId = customIconPaths
-            }
-        }
-
-        LaunchedEffect(mergedInstalledApps, playtimeRefreshKey) {
-            if (mergedInstalledApps.isEmpty()) {
-                installedApps = emptyList()
-                return@LaunchedEffect
-            }
-
-            val sorted =
-                withContext(Dispatchers.IO) {
-                    val playtimePrefs = context.getSharedPreferences("playtime_stats", android.content.Context.MODE_PRIVATE)
-                    val allPlaytime = playtimePrefs.all
-                    mergedInstalledApps.sortedByDescending { app ->
-                        val searchKey =
-                            if (app.id >= 2000000000 || app.id < 0) {
-                                app.name
-                            } else {
-                                app.name.replace(LIBRARY_NAME_SANITIZE_REGEX, "")
-                            }
-                        (allPlaytime["${searchKey}_last_played"] as? Long) ?: 0L
-                    }
-                }
-
-            installedApps = sorted
-        }
-
-        val awaitingShortcutScan = installedApps.isEmpty() && !shortcutsLoaded
-        val keepPreviousLibraryVisible =
-            installedApps.isEmpty() &&
-                stableInstalledApps.isNotEmpty() &&
-                (processedScanToken !== scanInputToken || awaitingShortcutScan)
-        val visibleInstalledApps = if (keepPreviousLibraryVisible) stableInstalledApps else installedApps
-        val visibleGogByPseudoId = if (keepPreviousLibraryVisible) stableGogByPseudoId else gogByPseudoId
-        val visibleEpicByPseudoId = if (keepPreviousLibraryVisible) stableEpicByPseudoId else epicByPseudoId
-        val visibleCustomArtworkPathByAppId =
-            if (keepPreviousLibraryVisible) stableCustomArtworkPathByAppId else customArtworkPathByAppId
-        val visibleCustomGridArtworkPathByAppId =
-            if (keepPreviousLibraryVisible) stableCustomGridArtworkPathByAppId else customGridArtworkPathByAppId
-        val visibleCustomCarouselArtworkPathByAppId =
-            if (keepPreviousLibraryVisible) stableCustomCarouselArtworkPathByAppId else customCarouselArtworkPathByAppId
-        val visibleCustomListArtworkPathByAppId =
-            if (keepPreviousLibraryVisible) stableCustomListArtworkPathByAppId else customListArtworkPathByAppId
-        val visibleCustomIconPathByAppId =
-            if (keepPreviousLibraryVisible) stableCustomIconPathByAppId else customIconPathByAppId
-
-        val displayedApps =
-            remember(visibleInstalledApps, searchQuery) {
-                if (searchQuery.isBlank()) {
-                    visibleInstalledApps
-                } else {
-                    visibleInstalledApps.filter { it.name.contains(searchQuery, ignoreCase = true) }
-                }
-            }
-
-        // The startup bootstrap screen already masks the first frame. Do not
-        // force an extra minimum spinner duration here or the library visibly
-        // bounces through two loading states on launch.
-        // A logged-in store whose owned-apps list is still empty hasn't finished
-        // its initial library fetch yet — keep the spinner up instead of flashing
-        // "No games installed". This resolves itself once the store populates its
-        // DB (steamApps/epicApps/gogApps become non-empty) or if other sources
-        // (custom apps, other stores) already have installed games.
-        val awaitingStoreSync =
-            installedApps.isEmpty() && (
-                (isLoggedIn && steamApps.isEmpty()) ||
-                    (epicApps.isEmpty() && EpicService.hasStoredCredentials(context)) ||
-                    (gogApps.isEmpty() && GOGAuthManager.isLoggedIn(context))
-            )
-        // Only block the surface while the first library result is unresolved.
-        // After that, keep the current content/empty state visible during
-        // background refreshes so the UI does not flicker back to a spinner.
-        val initialLibraryLoadPending = !libraryLoaded
-        val waitingForFirstEmptyStateResolution =
-            installedApps.isEmpty() && (processedScanToken !== scanInputToken || awaitingStoreSync || awaitingShortcutScan)
-        val showLoading = initialLibraryLoadPending || waitingForFirstEmptyStateResolution
-        if (showLoading) {
-            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                val spinAlpha by animateFloatAsState(
-                    targetValue = 1f,
-                    animationSpec = tween(durationMillis = 600),
-                    label = "loaderFade",
-                )
-                CircularProgressIndicator(
-                    color = Accent,
-                    strokeWidth = 3.dp,
-                    modifier = Modifier.size(48.dp).alpha(spinAlpha),
-                )
-            }
-            return
-        }
-
-        if (visibleInstalledApps.isEmpty()) {
-            val epicLoggedIn by EpicAuthManager.isLoggedInFlow.collectAsState()
-            val gogLoggedIn by GOGAuthManager.isLoggedInFlow.collectAsState()
-            val anyLoggedIn = isLoggedIn || epicLoggedIn || gogLoggedIn
-            val hasAnyCredentials =
-                anyLoggedIn ||
-                    SteamService.hasStoredCredentials(context) ||
-                    EpicService.hasStoredCredentials(context) ||
-                    GOGAuthManager.isLoggedIn(context)
-            if (!anyLoggedIn && !hasAnyCredentials) {
-                LoginRequiredScreen("Library") {
-                    navigateToSettings(SettingsNavItem.STORES)
-                }
-            } else if (anyLoggedIn) {
-                Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                    EmptyStateMessage(stringResource(R.string.library_games_no_games_installed))
-                }
-            }
-            return
-        }
-
-        var selectedAppForSettings by remember { mutableStateOf<SteamApp?>(null) }
-        var selectedGogGameForSettings by remember { mutableStateOf<GOGGame?>(null) }
-        var detailApp by remember { mutableStateOf<SteamApp?>(null) }
-        var detailGogGame by remember { mutableStateOf<GOGGame?>(null) }
-        val gridState = rememberLazyGridState()
-        val carouselState = rememberLazyListState()
-        val activity = LocalContext.current as? UnifiedActivity
-
-        // Pause chasing borders on library cards while any dialog is open.
-        LaunchedEffect(selectedAppForSettings, selectedGogGameForSettings, detailApp) {
-            chasingBordersPaused.value =
-                selectedAppForSettings != null || selectedGogGameForSettings != null || detailApp != null
-        }
-        DisposableEffect(Unit) {
-            onDispose { chasingBordersPaused.value = false }
-        }
-
-        LaunchedEffect(layoutMode) {
-            currentLibraryLayoutMode = layoutMode
-        }
-
-        // Keep activity's item count in sync
-        LaunchedEffect(displayedApps.size) {
-            activity?.libraryItemCount = displayedApps.size
-            val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
-            if (activity != null && displayedApps.isNotEmpty() && activity.libraryFocusIndex.value > lastIndex) {
-                activity.libraryFocusIndex.value = lastIndex
-            }
-        }
-
-        // FocusRequesters for each grid item
-        val focusRequesters =
-            remember(displayedApps.size) {
-                List(displayedApps.size) { FocusRequester() }
-            }
-
-        // Observe focus index changes from the activity and request focus on the target item
-        val focusIndex by (activity?.libraryFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
-        LaunchedEffect(focusIndex, focusRequesters.size, layoutMode) {
-            if (searchQuery.isEmpty() &&
-                layoutMode == LibraryLayoutMode.GRID_4 &&
-                focusRequesters.isNotEmpty() &&
-                focusIndex in focusRequesters.indices
-            ) {
-                gridState.animateScrollToItem(focusIndex)
-                try {
-                    focusRequesters[focusIndex].requestFocus()
-                } catch (_: Exception) {
-                }
-            }
-        }
-
-        // Track selected app for the top-right Game Settings button
-        LaunchedEffect(focusIndex, displayedApps) {
-            val app = displayedApps.getOrNull(focusIndex) ?: displayedApps.firstOrNull()
-            selectedSteamAppId = app?.id ?: 0
-            selectedSteamAppName = app?.name ?: ""
-            val gogGame = app?.let { visibleGogByPseudoId[it.id] }
-            selectedLibrarySource =
-                when {
-                    gogGame != null -> "GOG"
-                    app == null -> ""
-                    app.id >= 2000000000 -> "EPIC"
-                    app.id < 0 -> "CUSTOM"
-                    else -> "STEAM"
-                }
-            selectedGogGameId = gogGame?.id.orEmpty()
-        }
-
-        val openSettingsForApp: (Int, SteamApp) -> Unit = { index, app ->
-            activity?.libraryFocusIndex?.value = index
-            selectedSteamAppId = app.id
-            selectedSteamAppName = app.name
-            val gogGame = visibleGogByPseudoId[app.id]
-            selectedLibrarySource =
-                when {
-                    gogGame != null -> "GOG"
-                    app.id >= 2000000000 -> "EPIC"
-                    app.id < 0 -> "CUSTOM"
-                    else -> "STEAM"
-                }
-            selectedGogGameId = gogGame?.id.orEmpty()
-
-            if (gogGame != null) {
-                selectedGogGameForSettings = gogGame
-            } else {
-                selectedAppForSettings = app
-            }
-        }
-
-        when (layoutMode) {
-            LibraryLayoutMode.GRID_4 -> {
-                FourByTwoGridView(
-                    items = displayedApps,
-                    modifier = Modifier.tabScreenPadding(),
-                    gridState = gridState,
-                    contentPadding = TabGridContentPadding,
-                    clipContent = false,
-                    keyOf = { it.id },
-                ) { app, index, rowHeight ->
-                    GameCapsule(
-                        app = app,
-                        gogGame = visibleGogByPseudoId[app.id],
-                        epicGame = visibleEpicByPseudoId[app.id],
-                        iconRefreshKey = iconRefreshKey,
-                        isFocusedOverride = index == focusIndex,
-                        isControllerActive = isControllerConnected,
-                        customArtworkPath = visibleCustomGridArtworkPathByAppId[app.id] ?: visibleCustomArtworkPathByAppId[app.id],
-                        customIconPath = visibleCustomIconPathByAppId[app.id],
-                        onClick = {
-                            detailGogGame = visibleGogByPseudoId[app.id]
-                            detailApp = app
-                        },
-                        onLongClick = {
-                            openSettingsForApp(index, app)
-                        },
-                        modifier =
-                            Modifier
-                                .height(rowHeight)
-                                .then(
-                                    if (index in focusRequesters.indices) {
-                                        Modifier.focusRequester(focusRequesters[index])
-                                    } else {
-                                        Modifier
-                                    },
-                                ),
-                    )
-                }
-            }
-
-            LibraryLayoutMode.CAROUSEL -> {
-                CarouselView(
-                    items = displayedApps,
-                    modifier = Modifier.tabScreenPadding(top = TabCarouselTopPadding, bottom = TabCarouselBottomPadding),
-                    listState = carouselState,
-                    selectedIndex = focusIndex,
-                    onCenteredIndexChanged = { centeredIndex ->
-                        if (activity != null && activity.libraryFocusIndex.value != centeredIndex) {
-                            activity.libraryFocusIndex.value = centeredIndex
-                        }
-                    },
-                ) { app, index, isSelected, cardWidth, cardHeight ->
-                    GameCapsule(
-                        app = app,
-                        gogGame = visibleGogByPseudoId[app.id],
-                        epicGame = visibleEpicByPseudoId[app.id],
-                        iconRefreshKey = iconRefreshKey,
-                        isFocusedOverride = isSelected,
-                        isControllerActive = isControllerConnected,
-                        customArtworkPath = visibleCustomCarouselArtworkPathByAppId[app.id] ?: visibleCustomArtworkPathByAppId[app.id],
-                        customIconPath = visibleCustomIconPathByAppId[app.id],
-                        onClick = {
-                            detailGogGame = visibleGogByPseudoId[app.id]
-                            detailApp = app
-                        },
-                        onLongClick = { openSettingsForApp(index, app) },
-                        useLibraryCapsule = true,
-                        modifier =
-                            Modifier
-                                .fillMaxSize()
-                                .then(
-                                    if (index in focusRequesters.indices) {
-                                        Modifier.focusRequester(focusRequesters[index])
-                                    } else {
-                                        Modifier
-                                    },
-                                ),
-                    )
-                }
-            }
-
-            LibraryLayoutMode.LIST -> {
-                val listViewState = rememberLazyListState()
-                ListView(
-                    items = displayedApps,
-                    modifier = Modifier.tabScreenPadding(),
-                    listState = listViewState,
-                    contentPadding = TabListContentPadding,
-                    selectedIndex = focusIndex,
-                    onSelectedIndexChanged = { newIdx ->
-                        activity?.libraryFocusIndex?.value = newIdx
-                    },
-                    keyOf = { it.id },
-                ) { app, index, isSelected ->
-                    GameCapsule(
-                        app = app,
-                        gogGame = visibleGogByPseudoId[app.id],
-                        epicGame = visibleEpicByPseudoId[app.id],
-                        iconRefreshKey = iconRefreshKey,
-                        isFocusedOverride = isSelected,
-                        isControllerActive = isControllerConnected,
-                        customArtworkPath = visibleCustomListArtworkPathByAppId[app.id] ?: visibleCustomArtworkPathByAppId[app.id],
-                        customIconPath = visibleCustomIconPathByAppId[app.id],
-                        onClick = {
-                            detailGogGame = visibleGogByPseudoId[app.id]
-                            detailApp = app
-                        },
-                        onLongClick = { openSettingsForApp(index, app) },
-                        listMode = true,
-                        modifier =
-                            Modifier
-                                .then(
-                                    if (index in focusRequesters.indices) {
-                                        Modifier.focusRequester(focusRequesters[index])
-                                    } else {
-                                        Modifier
-                                    },
-                                ),
-                    )
-                }
-                JoystickListScroll(
-                    listState = listViewState,
-                    stickFlow = activity?.rightStickScrollState,
-                    minSpeed = 2.5f,
-                    maxSpeed = 16f,
-                    quadratic = true,
-                )
-            }
-        }
-
-        if (selectedAppForSettings != null) {
-            GameSettingsDialog(
-                app = selectedAppForSettings!!,
-                onDismissRequest = { selectedAppForSettings = null },
-            )
-        }
-        if (selectedGogGameForSettings != null) {
-            GOGGameSettingsDialog(
-                app = selectedGogGameForSettings!!,
-                onDismissRequest = { selectedGogGameForSettings = null },
-            )
-        }
-        if (detailApp != null) {
-            LibraryGameDetailDialog(
-                app = detailApp!!,
-                gogGame = detailGogGame,
-                onDismissRequest = {
-                    detailApp = null
-                    detailGogGame = null
-                },
-            )
-        }
-    }
-
-    private enum class GameSettingsScreen {
-        Menu,
-        Shortcut,
-        Saves,
-        CloudSaves,
-        Uninstall,
-    }
-
-    private data class HomeShortcutUiState(
-        val shortcut: Shortcut? = null,
-        val isPinned: Boolean = false,
-    )
-
-    private data class GameSettingsActionItem(
-        val title: String,
-        val icon: ImageVector,
-        val accentColor: Color = Accent,
-        val onClick: () -> Unit,
-    )
-
-    @Composable
-    private fun GameSettingsDialogFrame(
-        title: String,
-        onDismissRequest: () -> Unit,
-        wide: Boolean = false,
-        content: @Composable ColumnScope.() -> Unit,
-    ) {
-        Dialog(
-            onDismissRequest = onDismissRequest,
-            properties =
-                DialogProperties(
-                    usePlatformDefaultWidth = false,
-                    decorFitsSystemWindows = false,
-                ),
-        ) {
-            BoxWithConstraints(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .windowInsetsPadding(WindowInsets.navigationBars),
-                contentAlignment = Alignment.Center,
-            ) {
-                val widthModifier =
-                    if (wide) {
-                        Modifier.widthIn(min = 320.dp, max = (maxWidth - 32.dp).coerceAtMost(560.dp))
-                    } else {
-                        Modifier.widthIn(min = 200.dp, max = 280.dp)
-                    }
-                val maxContentHeight = (maxHeight - 48.dp).coerceAtLeast(320.dp)
-                Surface(
-                    modifier = widthModifier.heightIn(max = maxContentHeight),
-                    shape = RoundedCornerShape(14.dp),
-                    color = CardDark,
-                    border = BorderStroke(1.dp, CardBorder),
-                    tonalElevation = 8.dp,
-                ) {
-                    Column(
-                        modifier = Modifier.padding(vertical = 6.dp),
-                    ) {
-                        // Title header
-                        Text(
-                            text = title,
-                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                            style = MaterialTheme.typography.titleSmall,
-                            color = TextPrimary,
-                            fontWeight = FontWeight.Bold,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                        HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
-                        Column(
-                            modifier =
-                                Modifier
-                                    .weight(1f, fill = false)
-                                    .verticalScroll(rememberScrollState()),
-                        ) {
-                            content()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun GameSettingsActionGrid(
-        actions: List<GameSettingsActionItem>,
-        modifier: Modifier = Modifier,
-    ) {
-        Column(modifier = modifier) {
-            actions.forEachIndexed { index, action ->
-                if (index > 0) {
-                    HorizontalDivider(
-                        color = CardBorder.copy(alpha = 0.5f),
-                        thickness = 0.5.dp,
-                        modifier = Modifier.padding(horizontal = 16.dp),
-                    )
-                }
-                GameSettingsActionCard(action = action)
-            }
-        }
-    }
-
-    @Composable
-    private fun GameSettingsActionCard(
-        action: GameSettingsActionItem,
-        modifier: Modifier = Modifier,
-    ) {
-        val isDanger = action.accentColor == DangerRed
-        val iconColor = if (isDanger) DangerRed else TextSecondary
-        val textColor = if (isDanger) DangerRed else TextPrimary
-
-        val interactionSource = remember { MutableInteractionSource() }
-        val isPressed by interactionSource.collectIsPressedAsState()
-        val scale by animateFloatAsState(
-            targetValue = if (isPressed) 0.96f else 1f,
-            animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
-            label = "actionCardScale",
-        )
-        Row(
-            modifier =
-                modifier
-                    .fillMaxWidth()
-                    .graphicsLayer {
-                        scaleX = scale
-                        scaleY = scale
-                    }.clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                        onClick = action.onClick,
-                    ).padding(horizontal = 16.dp, vertical = 11.dp),
-            horizontalArrangement = Arrangement.spacedBy(12.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Icon(
-                imageVector = action.icon,
-                contentDescription = null,
-                tint = iconColor,
-                modifier = Modifier.size(18.dp),
-            )
-            Text(
-                text = action.title,
-                style = MaterialTheme.typography.bodyMedium,
-                color = textColor,
-                fontWeight = FontWeight.Medium,
-                maxLines = 1,
-            )
-        }
-    }
-
-    @Composable
-    private fun GameSettingsInfoCard(
-        message: String,
-        accentColor: Color = Accent,
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(6.dp),
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Warning,
-                contentDescription = null,
-                tint = accentColor.copy(alpha = 0.7f),
-                modifier = Modifier.size(18.dp),
-            )
-            Text(
-                text = message,
-                style = MaterialTheme.typography.bodySmall,
-                color = TextSecondary,
-                lineHeight = 18.sp,
-                textAlign = TextAlign.Center,
-            )
-        }
-    }
-
-    /**
-     * Shared uninstall/remove confirmation UI used by GameSettingsDialog,
-     * GOGGameSettingsDialog, and LibraryGameDetailDialog.
-     */
-    @Composable
-    private fun UninstallConfirmation(
-        message: String,
-        confirmLabel: String = stringResource(R.string.common_ui_uninstall),
-        onConfirm: () -> Unit,
-        onCancel: () -> Unit,
-    ) {
-        var isUninstalling by remember { mutableStateOf(false) }
-
-        GameSettingsInfoCard(message = message, accentColor = DangerRed)
-
-        if (isUninstalling) {
-            Box(
-                modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
-                contentAlignment = Alignment.Center,
-            ) {
-                CircularProgressIndicator(color = DangerRed)
-            }
-        } else {
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp, vertical = 8.dp),
-                horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                OutlinedButton(
-                    onClick = {
-                        isUninstalling = true
-                        onConfirm()
-                    },
-                    border = BorderStroke(1.dp, DangerRed.copy(alpha = 0.5f)),
-                    shape = RoundedCornerShape(8.dp),
-                    colors = ButtonDefaults.outlinedButtonColors(contentColor = DangerRed),
-                ) {
-                    Text(
-                        confirmLabel,
-                        style = MaterialTheme.typography.bodySmall,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-                Spacer(Modifier.width(8.dp))
-                TextButton(onClick = onCancel) {
-                    Text(stringResource(R.string.common_ui_cancel), color = TextSecondary, style = MaterialTheme.typography.bodySmall)
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun ShortcutRemovalConfirmation(
-        message: String,
-        onConfirm: () -> Unit,
-        onCancel: () -> Unit,
-    ) {
-        var isRemoving by remember { mutableStateOf(false) }
-
-        GameSettingsInfoCard(message = message, accentColor = DangerRed)
-
-        if (isRemoving) {
-            Box(
-                modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
-                contentAlignment = Alignment.Center,
-            ) {
-                CircularProgressIndicator(color = DangerRed)
-            }
-        } else {
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp, vertical = 8.dp),
-                horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                OutlinedButton(
-                    onClick = {
-                        isRemoving = true
-                        onConfirm()
-                    },
-                    border = BorderStroke(1.dp, DangerRed.copy(alpha = 0.5f)),
-                    shape = RoundedCornerShape(8.dp),
-                    colors = ButtonDefaults.outlinedButtonColors(contentColor = DangerRed),
-                ) {
-                    Text(
-                        stringResource(R.string.common_ui_remove),
-                        style = MaterialTheme.typography.bodySmall,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-                Spacer(Modifier.width(8.dp))
-                TextButton(onClick = onCancel) {
-                    Text(stringResource(R.string.common_ui_cancel), color = TextSecondary, style = MaterialTheme.typography.bodySmall)
-                }
-            }
-        }
-    }
-
-    // Game Settings Dialog
-    @Composable
-    private fun GameSettingsDialog(
-        app: SteamApp,
-        onDismissRequest: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        var currentTab by remember { mutableStateOf(GameSettingsScreen.Menu) }
-        val scope = rememberCoroutineScope()
-        val isCustom = app.id < 0
-        val isEpic = app.id >= 2000000000
-        val epicId = if (isEpic) app.id - 2000000000 else 0
-        var shortcutRefreshKey by remember(app.id, isCustom, isEpic, epicId) { mutableStateOf(0) }
-        var pinnedShortcutOverride by remember(app.id, isCustom, isEpic, epicId) { mutableStateOf<Boolean?>(null) }
-        val epicArtworkUrl by produceState<String?>(initialValue = null, key1 = isEpic, key2 = epicId) {
-            value =
-                if (isEpic) {
-                    val epicGame = db.epicGameDao().getById(epicId)
-                    epicGame?.primaryImageUrl ?: epicGame?.iconUrl
-                } else {
-                    null
-                }
-        }
-        val currentRefreshSignal = this@UnifiedActivity.libraryRefreshSignal
-        val homeShortcutState by produceState(
-            HomeShortcutUiState(),
-            app.id,
-            isCustom,
-            isEpic,
-            epicId,
-            currentRefreshSignal,
-            shortcutRefreshKey,
-        ) {
-            value =
-                withContext(Dispatchers.IO) {
-                    val shortcut = findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
-                    HomeShortcutUiState(
-                        shortcut = shortcut,
-                        isPinned = shortcut?.let { LibraryShortcutUtils.hasPinnedHomeShortcut(context, it) } == true,
-                    )
-                }
-        }
-        val artworkRefreshListener =
-            remember(app.id, isCustom, isEpic, epicId) {
-                object : EventDispatcher.JavaEventListener {
-                    override fun onEvent(event: Any) {
-                        if (event is AndroidEvent.LibraryArtworkChanged) {
-                            shortcutRefreshKey++
-                        }
-                    }
-                }
-            }
-        DisposableEffect(artworkRefreshListener) {
-            PluviaApp.events.onJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
-            onDispose {
-                PluviaApp.events.offJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
-            }
-        }
-        val hasPinnedShortcut = pinnedShortcutOverride ?: homeShortcutState.isPinned
-
-        // Export logic
-        val exportLauncher =
-            rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
-                if (uri != null) {
-                    scope.launch(kotlinx.coroutines.Dispatchers.IO) {
-                        try {
-                            val os = context.contentResolver.openOutputStream(uri) ?: return@launch
-                            val zos = java.util.zip.ZipOutputStream(java.io.BufferedOutputStream(os))
-
-                            val containerManager =
-                                com.winlator.cmod.runtime.container
-                                    .ContainerManager(context)
-                            val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-
-                            val dirsToZip = mutableListOf<java.io.File>()
-
-                            // Goldberg saves: SteamService.getAppDirPath(app.id)/steam_settings/saves
-                            val goldbergSaves = java.io.File(SteamService.getAppDirPath(app.id), "steam_settings/saves")
-                            if (goldbergSaves.exists() && goldbergSaves.isDirectory) {
-                                dirsToZip.add(goldbergSaves)
-                            }
-
-                            // Also prefix documents/saved games/appdata if shortcut exists
-                            if (shortcut != null) {
-                                val prefixDir = java.io.File(shortcut.container.getRootDir(), ".wine/drive_c/users/xuser")
-                                val docs = java.io.File(prefixDir, "Documents")
-                                val savedGames = java.io.File(prefixDir, "Saved Games")
-                                val appData = java.io.File(prefixDir, "AppData")
-                                if (docs.exists()) dirsToZip.add(docs)
-                                if (savedGames.exists()) dirsToZip.add(savedGames)
-                                if (appData.exists()) dirsToZip.add(appData)
-                            }
-
-                            // recursive zip function
-                            fun zipDir(
-                                dir: java.io.File,
-                                baseName: String,
-                            ) {
-                                val children = dir.listFiles() ?: return
-                                for (child in children) {
-                                    val name = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
-                                    if (child.isDirectory) {
-                                        zos.putNextEntry(java.util.zip.ZipEntry("$name/"))
-                                        zos.closeEntry()
-                                        zipDir(child, name)
-                                    } else {
-                                        zos.putNextEntry(java.util.zip.ZipEntry(name))
-                                        val fis = java.io.FileInputStream(child)
-                                        val buf = ByteArray(1024 * 8)
-                                        var len: Int
-                                        while (fis.read(buf).also { len = it } > 0) {
-                                            zos.write(buf, 0, len)
-                                        }
-                                        fis.close()
-                                        zos.closeEntry()
-                                    }
-                                }
-                            }
-
-                            for (dir in dirsToZip) {
-                                // We put them in a folder under the zip by their semantic name
-                                val baseName = dir.name // e.g. "saves", "Documents"
-                                zos.putNextEntry(java.util.zip.ZipEntry("$baseName/"))
-                                zos.closeEntry()
-                                zipDir(dir, baseName)
-                            }
-
-                            zos.close()
-                            withContext(kotlinx.coroutines.Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    R.string.saves_import_export_exported,
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                                onDismissRequest()
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                            withContext(kotlinx.coroutines.Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    getString(R.string.saves_import_export_exported_failed, e.message),
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-
-        // Import logic
-        val importLauncher =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
-                if (uri != null) {
-                    scope.launch(kotlinx.coroutines.Dispatchers.IO) {
-                        try {
-                            val `is` = context.contentResolver.openInputStream(uri) ?: return@launch
-                            val zis = java.util.zip.ZipInputStream(java.io.BufferedInputStream(`is`))
-
-                            val containerManager =
-                                com.winlator.cmod.runtime.container
-                                    .ContainerManager(context)
-                            val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-
-                            val goldbergSavesParent =
-                                java.io.File(
-                                    if (isEpic) app.gameDir else SteamService.getAppDirPath(app.id),
-                                    if (isEpic) "" else "steam_settings",
-                                )
-                            val prefixDir = shortcut?.let { java.io.File(it.container.getRootDir(), ".wine/drive_c/users/xuser") }
-
-                            var ze: java.util.zip.ZipEntry?
-                            while (zis.nextEntry.also { ze = it } != null) {
-                                val entry = ze!!
-                                val name = entry.name
-                                // Determine destination
-                                var destFile: java.io.File? = null
-                                if (name.startsWith("saves/")) {
-                                    destFile = java.io.File(goldbergSavesParent, name)
-                                } else if (prefixDir != null) {
-                                    if (name.startsWith("Documents/") || name.startsWith("Saved Games/") || name.startsWith("AppData/")) {
-                                        destFile = java.io.File(prefixDir, name)
-                                    }
-                                }
-
-                                if (destFile != null) {
-                                    if (entry.isDirectory) {
-                                        destFile.mkdirs()
-                                    } else {
-                                        destFile.parentFile?.mkdirs()
-                                        val fos = java.io.FileOutputStream(destFile)
-                                        val buf = ByteArray(1024 * 8)
-                                        var len: Int
-                                        while (zis.read(buf).also { len = it } > 0) {
-                                            fos.write(buf, 0, len)
-                                        }
-                                        fos.close()
-                                    }
-                                }
-                                zis.closeEntry()
-                            }
-                            zis.close()
-                            withContext(kotlinx.coroutines.Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    R.string.saves_import_export_imported,
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                                onDismissRequest()
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                            withContext(kotlinx.coroutines.Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    getString(R.string.saves_import_export_imported_failed, e.message),
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-
-        GameSettingsDialogFrame(
-            title = app.name,
-            onDismissRequest = onDismissRequest,
-            wide = currentTab == GameSettingsScreen.CloudSaves,
-        ) {
-            when (currentTab) {
-                GameSettingsScreen.Menu -> {
-                    val actions =
-                        listOf(
-                            GameSettingsActionItem(
-                                title = stringResource(R.string.common_ui_settings),
-                                icon = Icons.Outlined.Settings,
-                                onClick = {
-                                    val containerManager = ContainerManager(context)
-                                    val shortcut =
-                                        findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-                                            ?: if (isCustom) {
-                                                null
-                                            } else {
-                                                ShortcutSettingsComposeDialog.createLibraryShortcut(
-                                                    context = context,
-                                                    containerManager = containerManager,
-                                                    source = if (isEpic) "EPIC" else "STEAM",
-                                                    appId = if (isEpic) epicId else app.id,
-                                                    gogId = null,
-                                                    appName = app.name,
-                                                )
-                                            }
-                                    if (shortcut != null) {
-                                        ShortcutSettingsComposeDialog(this@UnifiedActivity, shortcut).show()
-                                    }
-                                    onDismissRequest()
-                                },
-                            ),
-                            GameSettingsActionItem(
-                                title =
-                                    stringResource(
-                                        if (hasPinnedShortcut) {
-                                            R.string.common_ui_remove
-                                        } else {
-                                            R.string.common_ui_shortcut
-                                        },
-                                    ),
-                                icon = Icons.Outlined.Home,
-                                accentColor = if (hasPinnedShortcut) DangerRed else Accent,
-                                onClick = {
-                                    if (hasPinnedShortcut) {
-                                        currentTab = GameSettingsScreen.Shortcut
-                                    } else {
-                                        scope.launch {
-                                            val created =
-                                                withContext(Dispatchers.IO) {
-                                                    addLibraryShortcutToHomeScreen(
-                                                        context,
-                                                        app,
-                                                        isCustom,
-                                                        isEpic,
-                                                        epicId,
-                                                        epicArtworkUrl,
-                                                    )
-                                                }
-                                            if (created) {
-                                                pinnedShortcutOverride = true
-                                                shortcutRefreshKey++
-                                            }
-                                            if (!created) {
-                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                    context,
-                                                    context.getString(
-                                                        R.string.library_games_failed_to_create_shortcut,
-                                                        app.name,
-                                                    ),
-                                                )
-                                            }
-                                        }
-                                    }
-                                },
-                            ),
-                            GameSettingsActionItem(
-                                title = stringResource(R.string.saves_import_export_title),
-                                icon = Icons.Outlined.Save,
-                                onClick = { currentTab = GameSettingsScreen.Saves },
-                            ),
-                            GameSettingsActionItem(
-                                title = stringResource(R.string.cloud_saves_title),
-                                icon = Icons.Outlined.CloudSync,
-                                onClick = { currentTab = GameSettingsScreen.CloudSaves },
-                            ),
-                            GameSettingsActionItem(
-                                title =
-                                    if (isCustom) {
-                                        stringResource(
-                                            R.string.common_ui_remove,
-                                        )
-                                    } else {
-                                        stringResource(R.string.common_ui_uninstall)
-                                    },
-                                icon = Icons.Outlined.Delete,
-                                accentColor = DangerRed,
-                                onClick = { currentTab = GameSettingsScreen.Uninstall },
-                            ),
-                        )
-
-                    GameSettingsActionGrid(actions = actions)
-                }
-
-                GameSettingsScreen.Shortcut -> {
-                    ShortcutRemovalConfirmation(
-                        message = stringResource(R.string.shortcuts_list_remove_game_shortcut_message, app.name),
-                        onConfirm = {
-                            scope.launch {
-                                val removed =
-                                    withContext(Dispatchers.IO) {
-                                        homeShortcutState.shortcut?.let {
-                                            LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
-                                        } == true
-                                    }
-                                pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
-                                shortcutRefreshKey++
-                                currentTab = GameSettingsScreen.Menu
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    if (removed) {
-                                        context.getString(R.string.shortcuts_list_removed)
-                                    } else {
-                                        context.getString(R.string.common_ui_unknown_error)
-                                    },
-                                )
-                            }
-                        },
-                        onCancel = { currentTab = GameSettingsScreen.Menu },
-                    )
-                }
-
-                GameSettingsScreen.Saves -> {
-                    GameSettingsActionGrid(
-                        actions =
-                            listOf(
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_export),
-                                    icon = Icons.Outlined.Upload,
-                                    onClick = {
-                                        exportLauncher.launch(
-                                            "${app.name.replace(" ", "_").replace(":", "")}_Saves.zip",
-                                        )
-                                    },
-                                ),
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_import),
-                                    icon = Icons.Outlined.Download,
-                                    onClick = { importLauncher.launch(arrayOf("application/zip")) },
-                                ),
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_back),
-                                    icon = Icons.AutoMirrored.Outlined.ArrowBack,
-                                    onClick = { currentTab = GameSettingsScreen.Menu },
-                                ),
-                            ),
-                    )
-                }
-
-                GameSettingsScreen.CloudSaves -> {
-                    var isWorking by remember { mutableStateOf(false) }
-                    val shortcut =
-                        remember(app.id, epicId, isCustom, isEpic) {
-                            findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
-                        }
-                    var cloudSyncEnabled by remember(shortcut?.file?.absolutePath) {
-                        mutableStateOf(isShortcutCloudSyncEnabled(shortcut))
-                    }
-                    var offlineModeEnabled by remember(shortcut?.file?.absolutePath) {
-                        mutableStateOf(isShortcutOfflineMode(shortcut))
-                    }
-
-                    val gameSource =
-                        when {
-                            isEpic -> GameSaveBackupManager.GameSource.EPIC
-                            else -> GameSaveBackupManager.GameSource.STEAM
-                        }
-                    val gameIdStr = if (isEpic) epicId.toString() else app.id.toString()
-                    val providerLabel =
-                        when (gameSource) {
-                            GameSaveBackupManager.GameSource.EPIC ->
-                                stringResource(R.string.preloader_platform_epic)
-                            else ->
-                                stringResource(R.string.preloader_platform_steam)
-                        }
-
-                    CloudSavesContent(
-                        isWorking = isWorking,
-                        cloudSyncEnabled = cloudSyncEnabled,
-                        offlineModeEnabled = offlineModeEnabled,
-                        gameSource = gameSource,
-                        gameId = gameIdStr,
-                        gameName = app.name,
-                        shortcut = shortcut,
-                        onCloudSyncToggle = { enabled ->
-                            cloudSyncEnabled = enabled
-                            setShortcutCloudSyncEnabled(shortcut, enabled)
-                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                context,
-                                if (enabled) {
-                                    context.getString(R.string.cloud_sync_enabled_summary)
-                                } else {
-                                    context.getString(R.string.cloud_sync_disabled_summary)
-                                },
-                                android.widget.Toast.LENGTH_SHORT,
-                            )
-                        },
-                        onOfflineModeToggle = { enabled ->
-                            offlineModeEnabled = enabled
-                            setShortcutOfflineMode(shortcut, enabled)
-                        },
-                        onBackup = {
-                            if (!isWorking) {
-                                isWorking = true
-                                scope.launch {
-                                    val result =
-                                        GameSaveBackupManager.backupToGoogle(
-                                            this@UnifiedActivity,
-                                            gameSource,
-                                            gameIdStr,
-                                            app.name,
-                                        )
-                                    isWorking = false
-                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                        context,
-                                        result.message,
-                                        android.widget.Toast.LENGTH_SHORT,
-                                    )
-                                }
-                            }
-                        },
-                        onRestore = {
-                            if (!isWorking) {
-                                isWorking = true
-                                scope.launch {
-                                    val result =
-                                        GameSaveBackupManager.restoreFromGoogle(
-                                            this@UnifiedActivity,
-                                            gameSource,
-                                            gameIdStr,
-                                            app.name,
-                                        )
-                                    isWorking = false
-                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                        context,
-                                        result.message,
-                                        android.widget.Toast.LENGTH_SHORT,
-                                    )
-                                }
-                            }
-                        },
-                        onSyncFromCloud = {
-                            if (!isWorking) {
-                                isWorking = true
-                                scope.launch(Dispatchers.IO) {
-                                    val ok =
-                                        CloudSyncHelper.downloadCloudSaves(
-                                            context,
-                                            gameSource,
-                                            gameIdStr,
-                                        )
-                                    withContext(Dispatchers.Main) {
-                                        isWorking = false
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            if (ok) {
-                                                context.getString(
-                                                    R.string.cloud_saves_sync_from_provider_success,
-                                                    providerLabel,
-                                                )
-                                            } else {
-                                                context.getString(
-                                                    R.string.cloud_saves_sync_from_provider_failed,
-                                                    providerLabel,
-                                                )
-                                            },
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    }
-                                }
-                            }
-                        },
-                        onBack = { currentTab = GameSettingsScreen.Menu },
-                    )
-                }
-
-                GameSettingsScreen.Uninstall -> {
-                    UninstallConfirmation(
-                        message =
-                            if (isCustom) {
-                                getString(R.string.library_games_remove_confirm, app.name)
-                            } else {
-                                getString(R.string.library_games_uninstall_confirm, app.name)
-                            },
-                        confirmLabel =
-                            if (isCustom) {
-                                stringResource(
-                                    R.string.common_ui_remove,
-                                )
-                            } else {
-                                stringResource(R.string.common_ui_uninstall)
-                            },
-                        onConfirm = {
-                            if (isCustom) {
-                                scope.launch(Dispatchers.IO) {
-                                    val cm = ContainerManager(context)
-                                    val sc = findLibraryShortcutForGame(cm, app, isCustom, isEpic, epicId)
-                                    sc?.let { LibraryShortcutUtils.deleteShortcutArtifacts(context, it) }
-                                    PluviaApp.events.emit(AndroidEvent.LibraryInstallStatusChanged(app.id))
-                                    withContext(Dispatchers.Main) {
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            getString(R.string.library_games_game_removed, app.name),
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                        onDismissRequest()
-                                    }
-                                }
-                            } else if (isEpic) {
-                                scope.launch(Dispatchers.IO) {
-                                    val result = EpicService.deleteGame(context, epicId)
-                                    withContext(Dispatchers.Main) {
-                                        if (result.isSuccess) {
-                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                context,
-                                                getString(R.string.library_games_game_uninstalled, app.name),
-                                                android.widget.Toast.LENGTH_SHORT,
-                                            )
-                                        } else {
-                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                context,
-                                                getString(
-                                                    R.string.library_games_failed_to_uninstall_reason,
-                                                    result.exceptionOrNull()?.message
-                                                        ?: getString(R.string.common_ui_unknown_error),
-                                                ),
-                                                android.widget.Toast.LENGTH_LONG,
-                                            )
-                                        }
-                                        onDismissRequest()
-                                    }
-                                }
-                            } else {
-                                SteamService.uninstallApp(app.id) { success ->
-                                    if (success) {
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            getString(R.string.library_games_game_uninstalled, app.name),
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    } else {
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            getString(R.string.library_games_failed_to_uninstall),
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    }
-                                    onDismissRequest()
-                                }
-                            }
-                        },
-                        onCancel = { currentTab = GameSettingsScreen.Menu },
-                    )
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun GOGGameSettingsDialog(
-        app: GOGGame,
-        onDismissRequest: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        var currentTab by remember { mutableStateOf(GameSettingsScreen.Menu) }
-        val scope = rememberCoroutineScope()
-        var shortcutRefreshKey by remember(app.id) { mutableStateOf(0) }
-        var pinnedShortcutOverride by remember(app.id) { mutableStateOf<Boolean?>(null) }
-        val currentRefreshSignal = this@UnifiedActivity.libraryRefreshSignal
-        val homeShortcutState by produceState(
-            HomeShortcutUiState(),
-            app.id,
-            currentRefreshSignal,
-            shortcutRefreshKey,
-        ) {
-            value =
-                withContext(Dispatchers.IO) {
-                    val shortcut =
-                        ContainerManager(context).loadShortcuts().find {
-                            it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
-                        }
-                    HomeShortcutUiState(
-                        shortcut = shortcut,
-                        isPinned = shortcut?.let { LibraryShortcutUtils.hasPinnedHomeShortcut(context, it) } == true,
-                    )
-                }
-        }
-        val hasPinnedShortcut = pinnedShortcutOverride ?: homeShortcutState.isPinned
-
-        GameSettingsDialogFrame(
-            title = app.title,
-            onDismissRequest = onDismissRequest,
-            wide = currentTab == GameSettingsScreen.CloudSaves,
-        ) {
-            when (currentTab) {
-                GameSettingsScreen.Menu -> {
-                    GameSettingsActionGrid(
-                        actions =
-                            listOf(
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_settings),
-                                    icon = Icons.Outlined.Settings,
-                                    onClick = {
-                                        val containerManager = ContainerManager(context)
-                                        val shortcut =
-                                            containerManager.loadShortcuts().find {
-                                                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
-                                            } ?: ShortcutSettingsComposeDialog.createLibraryShortcut(
-                                                context = context,
-                                                containerManager = containerManager,
-                                                source = "GOG",
-                                                appId = gogPseudoId(app.id),
-                                                gogId = app.id,
-                                                appName = app.title,
-                                            )
-                                        if (shortcut != null) {
-                                            ShortcutSettingsComposeDialog(this@UnifiedActivity, shortcut).show()
-                                        }
-                                        onDismissRequest()
-                                    },
-                                ),
-                                GameSettingsActionItem(
-                                    title =
-                                        stringResource(
-                                            if (hasPinnedShortcut) {
-                                                R.string.common_ui_remove
-                                            } else {
-                                                R.string.common_ui_shortcut
-                                            },
-                                        ),
-                                    icon = Icons.Outlined.Home,
-                                    accentColor = if (hasPinnedShortcut) DangerRed else Accent,
-                                    onClick = {
-                                        if (hasPinnedShortcut) {
-                                            currentTab = GameSettingsScreen.Shortcut
-                                        } else {
-                                            scope.launch {
-                                                val artworkUrl = app.imageUrl.ifEmpty { app.iconUrl }
-                                                val created =
-                                                    withContext(Dispatchers.IO) {
-                                                        addGogShortcutToHomeScreen(context, app, artworkUrl)
-                                                    }
-                                                if (created) {
-                                                    pinnedShortcutOverride = true
-                                                    shortcutRefreshKey++
-                                                }
-                                                if (!created) {
-                                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                        context,
-                                                        context.getString(
-                                                            R.string.library_games_failed_to_create_shortcut,
-                                                            app.title,
-                                                        ),
-                                                    )
-                                                }
-                                            }
-                                        }
-                                    },
-                                ),
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.saves_import_export_title),
-                                    icon = Icons.Outlined.Save,
-                                    onClick = { currentTab = GameSettingsScreen.Saves },
-                                ),
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.cloud_saves_title),
-                                    icon = Icons.Outlined.CloudSync,
-                                    onClick = { currentTab = GameSettingsScreen.CloudSaves },
-                                ),
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_uninstall),
-                                    icon = Icons.Outlined.Delete,
-                                    accentColor = DangerRed,
-                                    onClick = { currentTab = GameSettingsScreen.Uninstall },
-                                ),
-                            ),
-                    )
-                }
-
-                GameSettingsScreen.Shortcut -> {
-                    ShortcutRemovalConfirmation(
-                        message = stringResource(R.string.shortcuts_list_remove_game_shortcut_message, app.title),
-                        onConfirm = {
-                            scope.launch {
-                                val removed =
-                                    withContext(Dispatchers.IO) {
-                                        homeShortcutState.shortcut?.let {
-                                            LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
-                                        } == true
-                                    }
-                                pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
-                                shortcutRefreshKey++
-                                currentTab = GameSettingsScreen.Menu
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    if (removed) {
-                                        context.getString(R.string.shortcuts_list_removed)
-                                    } else {
-                                        context.getString(R.string.common_ui_unknown_error)
-                                    },
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        },
-                        onCancel = { currentTab = GameSettingsScreen.Menu },
-                    )
-                }
-
-                GameSettingsScreen.Saves -> {
-                    GameSettingsActionGrid(
-                        actions =
-                            listOf(
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_sync),
-                                    icon = Icons.Outlined.Cloud,
-                                    onClick = {
-                                        scope.launch(Dispatchers.IO) {
-                                            GOGService.syncCloudSaves(context, "GOG_${app.id}", "auto")
-                                        }
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            getString(R.string.google_cloud_sync_started),
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    },
-                                ),
-                                GameSettingsActionItem(
-                                    title = stringResource(R.string.common_ui_back),
-                                    icon = Icons.AutoMirrored.Outlined.ArrowBack,
-                                    onClick = { currentTab = GameSettingsScreen.Menu },
-                                ),
-                            ),
-                    )
-                }
-
-                GameSettingsScreen.CloudSaves -> {
-                    var isWorking by remember { mutableStateOf(false) }
-                    val shortcut =
-                        remember(app.id) {
-                            ContainerManager(context).loadShortcuts().find {
-                                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
-                            }
-                        }
-                    var cloudSyncEnabled by remember(shortcut?.file?.absolutePath) {
-                        mutableStateOf(isShortcutCloudSyncEnabled(shortcut))
-                    }
-                    var offlineModeEnabled by remember(shortcut?.file?.absolutePath) {
-                        mutableStateOf(isShortcutOfflineMode(shortcut))
-                    }
-
-                    val gogProviderLabel = stringResource(R.string.preloader_platform_gog)
-
-                    CloudSavesContent(
-                        isWorking = isWorking,
-                        cloudSyncEnabled = cloudSyncEnabled,
-                        offlineModeEnabled = offlineModeEnabled,
-                        gameSource = GameSaveBackupManager.GameSource.GOG,
-                        gameId = app.id,
-                        gameName = app.title,
-                        shortcut = shortcut,
-                        onCloudSyncToggle = { enabled ->
-                            cloudSyncEnabled = enabled
-                            setShortcutCloudSyncEnabled(shortcut, enabled)
-                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                context,
-                                if (enabled) {
-                                    context.getString(R.string.cloud_sync_enabled_summary)
-                                } else {
-                                    context.getString(R.string.cloud_sync_disabled_summary)
-                                },
-                                android.widget.Toast.LENGTH_SHORT,
-                            )
-                        },
-                        onOfflineModeToggle = { enabled ->
-                            offlineModeEnabled = enabled
-                            setShortcutOfflineMode(shortcut, enabled)
-                        },
-                        onBackup = {
-                            if (!isWorking) {
-                                isWorking = true
-                                scope.launch {
-                                    val result =
-                                        GameSaveBackupManager.backupToGoogle(
-                                            this@UnifiedActivity,
-                                            GameSaveBackupManager.GameSource.GOG,
-                                            app.id,
-                                            app.title,
-                                        )
-                                    isWorking = false
-                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                        context,
-                                        result.message,
-                                        android.widget.Toast.LENGTH_SHORT,
-                                    )
-                                }
-                            }
-                        },
-                        onRestore = {
-                            if (!isWorking) {
-                                isWorking = true
-                                scope.launch {
-                                    val result =
-                                        GameSaveBackupManager.restoreFromGoogle(
-                                            this@UnifiedActivity,
-                                            GameSaveBackupManager.GameSource.GOG,
-                                            app.id,
-                                            app.title,
-                                        )
-                                    isWorking = false
-                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                        context,
-                                        result.message,
-                                        android.widget.Toast.LENGTH_SHORT,
-                                    )
-                                }
-                            }
-                        },
-                        onSyncFromCloud = {
-                            if (!isWorking) {
-                                isWorking = true
-                                scope.launch(Dispatchers.IO) {
-                                    val ok =
-                                        CloudSyncHelper.downloadCloudSaves(
-                                            context,
-                                            GameSaveBackupManager.GameSource.GOG,
-                                            app.id,
-                                        )
-                                    withContext(Dispatchers.Main) {
-                                        isWorking = false
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            if (ok) {
-                                                context.getString(
-                                                    R.string.cloud_saves_sync_from_provider_success,
-                                                    gogProviderLabel,
-                                                )
-                                            } else {
-                                                context.getString(
-                                                    R.string.cloud_saves_sync_from_provider_failed,
-                                                    gogProviderLabel,
-                                                )
-                                            },
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    }
-                                }
-                            }
-                        },
-                        onBack = { currentTab = GameSettingsScreen.Menu },
-                    )
-                }
-
-                GameSettingsScreen.Uninstall -> {
-                    UninstallConfirmation(
-                        message = getString(R.string.library_games_uninstall_confirm, app.title),
-                        onConfirm = {
-                            scope.launch(Dispatchers.IO) {
-                                val result = GOGService.deleteGame(
-                                    context,
-                                    LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG),
-                                )
-                                withContext(Dispatchers.Main) {
-                                    if (result.isSuccess) {
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            getString(R.string.library_games_game_uninstalled, app.title),
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    } else {
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            getString(
-                                                R.string.library_games_failed_to_uninstall_reason,
-                                                result.exceptionOrNull()?.message
-                                                    ?: getString(R.string.common_ui_unknown_error),
-                                            ),
-                                            android.widget.Toast.LENGTH_LONG,
-                                        )
-                                    }
-                                    onDismissRequest()
-                                }
-                            }
-                        },
-                        onCancel = { currentTab = GameSettingsScreen.Menu },
-                    )
-                }
-            }
-        }
-    }
-
-    // Library Game Detail Dialog
-
-    private enum class LibraryDetailScreen { Main, Shortcut, Saves, CloudSaves, Uninstall }
-
-    @Composable
-    private fun LibraryGameDetailDialog(
-        app: SteamApp,
-        gogGame: GOGGame? = null,
-        onDismissRequest: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        val scope = rememberCoroutineScope()
-        var currentScreen by remember { mutableStateOf(LibraryDetailScreen.Main) }
-        var shortcutRefreshKey by remember(app.id, gogGame?.id) { mutableStateOf(0) }
-        var pinnedShortcutOverride by remember(app.id, gogGame?.id) { mutableStateOf<Boolean?>(null) }
-
-        val isCustom = app.id < 0
-        val isEpic = app.id >= 2000000000
-        val isGog = gogGame != null
-        val epicId = if (isEpic) app.id - 2000000000 else 0
-
-        val epicGame by produceState<EpicGame?>(initialValue = null, key1 = epicId) {
-            value = if (isEpic) db.epicGameDao().getById(epicId) else null
-        }
-
-        val epicArtworkUrl by produceState<String?>(initialValue = null, key1 = isEpic, key2 = epicId) {
-            value =
-                if (isEpic) {
-                    val eg = db.epicGameDao().getById(epicId)
-                    eg?.primaryImageUrl ?: eg?.iconUrl
-                } else {
-                    null
-                }
-        }
-        val currentRefreshSignal = this@UnifiedActivity.libraryRefreshSignal
-        val homeShortcutState by produceState(
-            HomeShortcutUiState(),
-            app.id,
-            gogGame?.id,
-            isCustom,
-            isEpic,
-            isGog,
-            epicId,
-            currentRefreshSignal,
-            shortcutRefreshKey,
-        ) {
-            value =
-                withContext(Dispatchers.IO) {
-                    val shortcut =
-                        when {
-                            isGog -> {
-                                ContainerManager(context).loadShortcuts().find {
-                                    it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame!!.id
-                                }
-                            }
-
-                            else -> {
-                                findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
-                            }
-                        }
-                    HomeShortcutUiState(
-                        shortcut = shortcut,
-                        isPinned = shortcut?.let { LibraryShortcutUtils.hasPinnedHomeShortcut(context, it) } == true,
-                    )
-                }
-        }
-        val artworkRefreshListener =
-            remember(app.id, gogGame?.id) {
-                object : EventDispatcher.JavaEventListener {
-                    override fun onEvent(event: Any) {
-                        if (event is AndroidEvent.LibraryArtworkChanged) {
-                            shortcutRefreshKey++
-                        }
-                    }
-                }
-            }
-        DisposableEffect(artworkRefreshListener) {
-            PluviaApp.events.onJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
-            onDispose {
-                PluviaApp.events.offJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
-            }
-        }
-        val hasPinnedShortcut = pinnedShortcutOverride ?: homeShortcutState.isPinned
-
-        // Hero image
-        val customHeroImageFile =
-            homeShortcutState.shortcut
-                ?.getExtra("customLibraryHeroArtPath")
-                ?.takeIf { it.isNotBlank() }
-                ?.let { java.io.File(it) }
-                ?.takeIf { it.exists() }
-        val customHeroImageCacheKey =
-            customHeroImageFile?.let {
-                "library_custom_hero:${it.absolutePath}:${it.lastModified()}"
-            }
-        val heroImageUrl: Any? =
-            customHeroImageFile ?: when {
-                isGog -> {
-                    gogGame!!.imageUrl.ifEmpty { gogGame.iconUrl }
-                }
-
-                isEpic -> {
-                    epicGame?.primaryImageUrl ?: epicGame?.iconUrl
-                }
-
-                isCustom -> {
-                    val customCoverArt =
-                        homeShortcutState.shortcut
-                            ?.getExtra("customCoverArtPath")
-                            ?.takeIf { it.isNotBlank() }
-                            ?.let { java.io.File(it) }
-                            ?.takeIf { it.exists() }
-                    customCoverArt ?: run {
-                        val safeName = app.name.replace("/", "_").replace("\\", "_")
-                        val iconFile = java.io.File(context.filesDir, "custom_icons/$safeName.png")
-                        if (iconFile.exists()) iconFile else null
-                    }
-                }
-
-                else -> {
-                    app.getHeroUrl()
-                }
-            }
-
-        val subtitle =
-            when {
-                isGog -> {
-                    gogGame!!.developer
-                }
-
-                isCustom -> {
-                    stringResource(R.string.library_games_custom_game)
-                }
-
-                isEpic -> {
-                    epicGame?.developer ?: ""
-                }
-
-                else -> {
-                    listOfNotNull(
-                        app.developer.takeIf { it.isNotBlank() },
-                        app.publisher.takeIf { it.isNotBlank() },
-                    ).joinToString(" • ")
-                }
-            }
-
-        // Playtime info
-        val playtimePrefs =
-            remember {
-                context.getSharedPreferences("playtime_stats", android.content.Context.MODE_PRIVATE)
-            }
-        val searchKey =
-            remember(app) {
-                if (app.id >= 2000000000 || app.id < 0) {
-                    app.name
-                } else {
-                    app.name.replace(LIBRARY_NAME_SANITIZE_REGEX, "")
-                }
-            }
-        val lastPlayed = playtimePrefs.getLong("${searchKey}_last_played", 0L)
-        val totalPlaytime = playtimePrefs.getLong("${searchKey}_playtime", 0L)
-        val playCount = playtimePrefs.getInt("${searchKey}_play_count", 0)
-
-        val sourceLabel =
-            when {
-                isGog -> "GOG"
-                isEpic -> "Epic Games"
-                isCustom -> "Custom"
-                else -> "Steam"
-            }
-
-        // Install path
-        val installPath =
-            remember(app, gogGame) {
-                when {
-                    isGog -> {
-                        gogGame!!.installPath
-                    }
-
-                    isEpic -> {
-                        epicGame?.installPath ?: ""
-                    }
-
-                    isCustom -> {
-                        app.gameDir
-                    }
-
-                    else -> {
-                        try {
-                            SteamService.getAppDirPath(app.id)
-                        } catch (_: Exception) {
-                            ""
-                        }
-                    }
-                }
-            }
-
-        // Install size (computed async)
-        val installSizeText by produceState<String?>(initialValue = null, key1 = installPath) {
-            value =
-                if (installPath.isNotBlank()) {
-                    withContext(Dispatchers.IO) {
-                        try {
-                            val bytes = StorageUtils.getFolderSize(installPath)
-                            if (bytes > 0) StorageUtils.formatBinarySize(bytes) else null
-                        } catch (_: Exception) {
-                            null
-                        }
-                    }
-                } else {
-                    null
-                }
-        }
-
-        // Export / Import launchers (reuse GameSettingsDialog pattern)
-
-        val exportLauncher =
-            rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
-                if (uri != null) {
-                    scope.launch(Dispatchers.IO) {
-                        try {
-                            val os = context.contentResolver.openOutputStream(uri) ?: return@launch
-                            val zos = java.util.zip.ZipOutputStream(java.io.BufferedOutputStream(os))
-                            val containerManager = ContainerManager(context)
-                            val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-                            val dirsToZip = mutableListOf<java.io.File>()
-                            val goldbergSaves = java.io.File(SteamService.getAppDirPath(app.id), "steam_settings/saves")
-                            if (goldbergSaves.exists() && goldbergSaves.isDirectory) dirsToZip.add(goldbergSaves)
-                            if (shortcut != null) {
-                                val prefixDir = java.io.File(shortcut.container.getRootDir(), ".wine/drive_c/users/xuser")
-                                listOf("Documents", "Saved Games", "AppData").forEach { name ->
-                                    val dir = java.io.File(prefixDir, name)
-                                    if (dir.exists()) dirsToZip.add(dir)
-                                }
-                            }
-
-                            fun zipDir(
-                                dir: java.io.File,
-                                baseName: String,
-                            ) {
-                                val children = dir.listFiles() ?: return
-                                for (child in children) {
-                                    val name = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
-                                    if (child.isDirectory) {
-                                        zos.putNextEntry(java.util.zip.ZipEntry("$name/"))
-                                        zos.closeEntry()
-                                        zipDir(child, name)
-                                    } else {
-                                        zos.putNextEntry(java.util.zip.ZipEntry(name))
-                                        child.inputStream().use { it.copyTo(zos) }
-                                        zos.closeEntry()
-                                    }
-                                }
-                            }
-                            for (dir in dirsToZip) {
-                                zos.putNextEntry(java.util.zip.ZipEntry("${dir.name}/"))
-                                zos.closeEntry()
-                                zipDir(dir, dir.name)
-                            }
-                            zos.close()
-                            withContext(Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    R.string.saves_import_export_exported,
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                            withContext(Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    getString(R.string.saves_import_export_exported_failed, e.message),
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-
-        val importLauncher =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
-                if (uri != null) {
-                    scope.launch(Dispatchers.IO) {
-                        try {
-                            val inputStream = context.contentResolver.openInputStream(uri) ?: return@launch
-                            val zis = java.util.zip.ZipInputStream(java.io.BufferedInputStream(inputStream))
-                            val containerManager = ContainerManager(context)
-                            val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-                            val goldbergSavesParent =
-                                java.io.File(
-                                    if (isEpic) app.gameDir else SteamService.getAppDirPath(app.id),
-                                    if (isEpic) "" else "steam_settings",
-                                )
-                            val prefixDir = shortcut?.let { java.io.File(it.container.getRootDir(), ".wine/drive_c/users/xuser") }
-                            var ze: java.util.zip.ZipEntry?
-                            while (zis.nextEntry.also { ze = it } != null) {
-                                val entry = ze!!
-                                val name = entry.name
-                                var destFile: java.io.File? = null
-                                if (name.startsWith("saves/")) {
-                                    destFile = java.io.File(goldbergSavesParent, name)
-                                } else if (prefixDir != null &&
-                                    (name.startsWith("Documents/") || name.startsWith("Saved Games/") || name.startsWith("AppData/"))
-                                ) {
-                                    destFile = java.io.File(prefixDir, name)
-                                }
-                                if (destFile != null) {
-                                    if (entry.isDirectory) {
-                                        destFile.mkdirs()
-                                    } else {
-                                        destFile.parentFile?.mkdirs()
-                                        java.io.FileOutputStream(destFile).use { fos -> zis.copyTo(fos) }
-                                    }
-                                }
-                                zis.closeEntry()
-                            }
-                            zis.close()
-                            withContext(Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    R.string.saves_import_export_imported,
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                            withContext(Dispatchers.Main) {
-                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                    context,
-                                    getString(R.string.saves_import_export_imported_failed, e.message),
-                                    android.widget.Toast.LENGTH_SHORT,
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-
-        Dialog(
-            onDismissRequest = onDismissRequest,
-            properties = DialogProperties(usePlatformDefaultWidth = false),
-        ) {
-            Surface(
-                modifier = Modifier.fillMaxWidth(0.864f).fillMaxHeight(0.96f),
-                shape = RoundedCornerShape(20.dp),
-                color = CardDark,
-            ) {
-                Box(Modifier.fillMaxSize()) {
-                    Column(Modifier.fillMaxSize()) {
-                        val showHero = currentScreen == LibraryDetailScreen.Main
-                        val subScreenTitle =
-                            when (currentScreen) {
-                                LibraryDetailScreen.CloudSaves -> stringResource(R.string.cloud_saves_title)
-                                LibraryDetailScreen.Saves -> stringResource(R.string.saves_import_export_title)
-                                LibraryDetailScreen.Shortcut -> stringResource(R.string.common_ui_shortcut)
-                                LibraryDetailScreen.Uninstall ->
-                                    stringResource(
-                                        if (isCustom) R.string.common_ui_remove else R.string.common_ui_uninstall,
-                                    )
-                                else -> ""
-                            }
-                        // Hero image section — only on the main screen. Sub-screens get a compact
-                        // title bar so buttons/content can take the full dialog height.
-                        if (showHero) {
-                            Box(
-                                modifier = Modifier.fillMaxWidth().fillMaxHeight(0.38f),
-                            ) {
-                                if (heroImageUrl != null) {
-                                    AsyncImage(
-                                        model =
-                                            ImageRequest
-                                                .Builder(context)
-                                                .data(heroImageUrl)
-                                                .apply {
-                                                    if (customHeroImageCacheKey != null) {
-                                                        memoryCacheKey(customHeroImageCacheKey)
-                                                        diskCacheKey(customHeroImageCacheKey)
-                                                    }
-                                                }.crossfade(150)
-                                                .memoryCachePolicy(coil.request.CachePolicy.ENABLED)
-                                                .diskCachePolicy(coil.request.CachePolicy.ENABLED)
-                                                .build(),
-                                        contentDescription = "${app.name} artwork",
-                                        modifier = Modifier.fillMaxSize(),
-                                        contentScale = ContentScale.FillWidth,
-                                        alignment = Alignment.TopCenter,
-                                    )
-                                } else {
-                                    Box(
-                                        Modifier.fillMaxSize().background(SurfaceDark),
-                                        contentAlignment = Alignment.Center,
-                                    ) {
-                                        Icon(
-                                            Icons.Outlined.SportsEsports,
-                                            contentDescription = null,
-                                            tint = Accent.copy(alpha = 0.4f),
-                                            modifier = Modifier.size(72.dp),
-                                        )
-                                    }
-                                }
-                                Box(
-                                    modifier =
-                                        Modifier.fillMaxSize().background(
-                                            Brush.verticalGradient(
-                                                colorStops =
-                                                    arrayOf(
-                                                        0.0f to Color.Transparent,
-                                                        0.45f to Color.Transparent,
-                                                        0.72f to CardDark.copy(alpha = 0.72f),
-                                                        1.0f to CardDark,
-                                                    ),
-                                            ),
-                                        ),
-                                )
-                                Column(
-                                    modifier =
-                                        Modifier
-                                            .align(Alignment.BottomStart)
-                                            .padding(start = 24.dp, end = 80.dp, bottom = 36.dp),
-                                ) {
-                                    Text(
-                                        app.name,
-                                        style = MaterialTheme.typography.headlineMedium,
-                                        color = TextPrimary,
-                                        fontWeight = FontWeight.Bold,
-                                    )
-                                    if (subtitle.isNotBlank()) {
-                                        Spacer(Modifier.height(8.dp))
-                                        Text(
-                                            subtitle,
-                                            style = MaterialTheme.typography.bodyMedium,
-                                            color = TextSecondary,
-                                            maxLines = 2,
-                                            overflow = TextOverflow.Ellipsis,
-                                        )
-                                    }
-                                }
-                            }
-                        } else {
-                            Row(
-                                modifier =
-                                    Modifier
-                                        .fillMaxWidth()
-                                        .background(SurfaceDark)
-                                        .padding(horizontal = 8.dp, vertical = 8.dp),
-                                verticalAlignment = Alignment.CenterVertically,
-                            ) {
-                                IconButton(onClick = { currentScreen = LibraryDetailScreen.Main }) {
-                                    Icon(
-                                        Icons.AutoMirrored.Outlined.ArrowBack,
-                                        contentDescription = stringResource(R.string.common_ui_back),
-                                        tint = TextPrimary,
-                                    )
-                                }
-                                Text(
-                                    subScreenTitle,
-                                    style = MaterialTheme.typography.titleMedium,
-                                    color = TextPrimary,
-                                    fontWeight = FontWeight.Bold,
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                    modifier = Modifier.weight(1f).padding(start = 4.dp),
-                                )
-                                Text(
-                                    app.name,
-                                    style = MaterialTheme.typography.bodySmall,
-                                    color = TextSecondary,
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                    modifier = Modifier.padding(end = 16.dp),
-                                )
-                            }
-                            HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
-                        }
-
-                        // Bottom content
-                        when (currentScreen) {
-                            LibraryDetailScreen.Main -> {
-                                Row(
-                                    modifier =
-                                        Modifier
-                                            .fillMaxSize()
-                                            .padding(horizontal = 24.dp, vertical = 10.dp),
-                                    horizontalArrangement = Arrangement.spacedBy(14.dp),
-                                ) {
-                                    // Left: Game details as individual cards
-                                    Column(
-                                        modifier = Modifier.weight(1f).fillMaxHeight(),
-                                        verticalArrangement = Arrangement.spacedBy(6.dp, Alignment.Bottom),
-                                    ) {
-                                        // Source badge row
-                                        Surface(
-                                            color = Accent.copy(alpha = 0.15f),
-                                            shape = RoundedCornerShape(8.dp),
-                                        ) {
-                                            Text(
-                                                sourceLabel,
-                                                modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),
-                                                color = Accent,
-                                                fontSize = 12.sp,
-                                                fontWeight = FontWeight.Bold,
-                                            )
-                                        }
-
-                                        if (installPath.isNotBlank() || installSizeText != null) {
-                                            Row(
-                                                modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
-                                                horizontalArrangement = Arrangement.spacedBy(6.dp),
-                                            ) {
-                                                if (installPath.isNotBlank()) {
-                                                    DetailCard(
-                                                        label = stringResource(R.string.library_games_install_path),
-                                                        value = installPath,
-                                                        modifier = Modifier.weight(1f).fillMaxHeight(),
-                                                    )
-                                                }
-                                                if (installSizeText != null) {
-                                                    DetailCard(
-                                                        stringResource(R.string.common_ui_size),
-                                                        installSizeText!!,
-                                                        modifier = Modifier.fillMaxHeight(),
-                                                    )
-                                                }
-                                            }
-                                        }
-
-                                        // Release date card
-                                        if (app.releaseDate > 0L) {
-                                            val releaseDateText =
-                                                remember(app.releaseDate) {
-                                                    java.text
-                                                        .SimpleDateFormat("MMM d, yyyy", java.util.Locale.getDefault())
-                                                        .format(java.util.Date(app.releaseDate * 1000L))
-                                                }
-                                            DetailCard(stringResource(R.string.common_ui_release_date), releaseDateText)
-                                        }
-                                    }
-
-                                    // Right: Compact action buttons
-                                    Column(
-                                        modifier =
-                                            Modifier
-                                                .widthIn(min = 200.dp, max = 260.dp)
-                                                .fillMaxHeight(),
-                                        verticalArrangement = Arrangement.spacedBy(6.dp, Alignment.Bottom),
-                                    ) {
-                                        // Play button — animated gradient
-                                        PlayButton(onClick = {
-                                            val containerManager = ContainerManager(context)
-                                            if (isCustom) {
-                                                launchCustomGame(context, containerManager, app.name)
-                                            } else if (isGog) {
-                                                launchGogGame(context, containerManager, gogGame!!)
-                                            } else if (isEpic) {
-                                                epicGame?.let { launchEpicGame(context, containerManager, it) }
-                                            } else {
-                                                launchSteamGame(context, containerManager, app)
-                                            }
-                                            onDismissRequest()
-                                        })
-
-                                        // Settings + Shortcut — half width each
-                                        Row(
-                                            modifier = Modifier.fillMaxWidth(),
-                                            horizontalArrangement = Arrangement.spacedBy(6.dp),
-                                        ) {
-                                            CompactActionButton(
-                                                icon = Icons.Outlined.Settings,
-                                                label = stringResource(R.string.common_ui_settings),
-                                                modifier = Modifier.weight(1f),
-                                                onClick = {
-                                                    val containerManager = ContainerManager(context)
-                                                    val shortcut: com.winlator.cmod.runtime.container.Shortcut? =
-                                                        when {
-                                                            isGog -> {
-                                                                containerManager.loadShortcuts().find {
-                                                                    it.getExtra("game_source") == "GOG" &&
-                                                                        it.getExtra("gog_id") == gogGame!!.id
-                                                                } ?: ShortcutSettingsComposeDialog.createLibraryShortcut(
-                                                                    context = context,
-                                                                    containerManager = containerManager,
-                                                                    source = "GOG",
-                                                                    appId = gogPseudoId(gogGame!!.id),
-                                                                    gogId = gogGame.id,
-                                                                    appName = app.name,
-                                                                )
-                                                            }
-
-                                                            isCustom -> {
-                                                                findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-                                                            }
-
-                                                            else -> {
-                                                                findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-                                                                    ?: ShortcutSettingsComposeDialog.createLibraryShortcut(
-                                                                        context = context,
-                                                                        containerManager = containerManager,
-                                                                        source = if (isEpic) "EPIC" else "STEAM",
-                                                                        appId = if (isEpic) epicId else app.id,
-                                                                        gogId = null,
-                                                                        appName = app.name,
-                                                                    )
-                                                            }
-                                                        }
-                                                    if (shortcut != null) {
-                                                        // Layer the settings dialog on top; keep the detail dialog open underneath.
-                                                        ShortcutSettingsComposeDialog(this@UnifiedActivity, shortcut).show()
-                                                    }
-                                                },
-                                            )
-
-                                            CompactActionButton(
-                                                icon = Icons.Outlined.Home,
-                                                label =
-                                                    stringResource(
-                                                        if (hasPinnedShortcut) {
-                                                            R.string.common_ui_remove
-                                                        } else {
-                                                            R.string.common_ui_shortcut
-                                                        },
-                                                    ),
-                                                tint = if (hasPinnedShortcut) DangerRed else TextPrimary,
-                                                bgColor = if (hasPinnedShortcut) DangerRed.copy(alpha = 0.12f) else SurfaceDark,
-                                                modifier = Modifier.weight(1f),
-                                                onClick = {
-                                                    if (hasPinnedShortcut) {
-                                                        currentScreen = LibraryDetailScreen.Shortcut
-                                                    } else {
-                                                        scope.launch {
-                                                            val created =
-                                                                withContext(Dispatchers.IO) {
-                                                                    if (isGog) {
-                                                                        val artworkUrl = gogGame!!.imageUrl.ifEmpty { gogGame.iconUrl }
-                                                                        addGogShortcutToHomeScreen(context, gogGame, artworkUrl)
-                                                                    } else {
-                                                                        addLibraryShortcutToHomeScreen(
-                                                                            context,
-                                                                            app,
-                                                                            isCustom,
-                                                                            isEpic,
-                                                                            epicId,
-                                                                            epicArtworkUrl,
-                                                                        )
-                                                                    }
-                                                                }
-                                                            if (created) {
-                                                                pinnedShortcutOverride = true
-                                                                shortcutRefreshKey++
-                                                            }
-                                                            if (!created) {
-                                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                                    context,
-                                                                    context.getString(
-                                                                        R.string.library_games_failed_to_create_shortcut,
-                                                                        app.name,
-                                                                    ),
-                                                                )
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                            )
-                                        }
-
-                                        Row(
-                                            modifier = Modifier.fillMaxWidth(),
-                                            horizontalArrangement = Arrangement.spacedBy(6.dp),
-                                        ) {
-                                            CompactActionButton(
-                                                icon = Icons.Outlined.Save,
-                                                label = stringResource(R.string.saves_import_export_title),
-                                                modifier = Modifier.weight(1f),
-                                                onClick = { currentScreen = LibraryDetailScreen.Saves },
-                                            )
-
-                                            CompactActionButton(
-                                                icon = Icons.Outlined.CloudSync,
-                                                label = stringResource(R.string.cloud_saves_title),
-                                                modifier = Modifier.weight(1f),
-                                                onClick = { currentScreen = LibraryDetailScreen.CloudSaves },
-                                            )
-                                        }
-
-                                        Row(
-                                            modifier = Modifier.fillMaxWidth(),
-                                            horizontalArrangement = Arrangement.spacedBy(6.dp),
-                                        ) {
-                                            CompactActionButton(
-                                                icon = Icons.Outlined.Delete,
-                                                label =
-                                                    if (isCustom) {
-                                                        stringResource(
-                                                            R.string.common_ui_remove,
-                                                        )
-                                                    } else {
-                                                        stringResource(R.string.common_ui_uninstall)
-                                                    },
-                                                tint = DangerRed,
-                                                bgColor = DangerRed.copy(alpha = 0.12f),
-                                                modifier = Modifier.weight(1f),
-                                                onClick = { currentScreen = LibraryDetailScreen.Uninstall },
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-
-                            LibraryDetailScreen.Shortcut -> {
-                                Column(
-                                    modifier =
-                                        Modifier
-                                            .fillMaxSize()
-                                            .padding(horizontal = 24.dp, vertical = 20.dp),
-                                    verticalArrangement = Arrangement.spacedBy(12.dp),
-                                ) {
-                                    Text(
-                                        stringResource(R.string.common_ui_shortcut),
-                                        style = MaterialTheme.typography.labelMedium,
-                                        color = TextSecondary,
-                                        fontWeight = FontWeight.Bold,
-                                        letterSpacing = 1.1.sp,
-                                    )
-
-                                    Spacer(Modifier.weight(1f))
-
-                                    ShortcutRemovalConfirmation(
-                                        message =
-                                            stringResource(
-                                                R.string.shortcuts_list_remove_game_shortcut_message,
-                                                if (isGog) gogGame!!.title else app.name,
-                                            ),
-                                        onConfirm = {
-                                            scope.launch {
-                                                val removed =
-                                                    withContext(Dispatchers.IO) {
-                                                        homeShortcutState.shortcut?.let {
-                                                            LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
-                                                        } == true
-                                                    }
-                                                pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
-                                                shortcutRefreshKey++
-                                                currentScreen = LibraryDetailScreen.Main
-                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                    context,
-                                                    if (removed) {
-                                                        context.getString(R.string.shortcuts_list_removed)
-                                                    } else {
-                                                        context.getString(R.string.common_ui_unknown_error)
-                                                    },
-                                                )
-                                            }
-                                        },
-                                        onCancel = { currentScreen = LibraryDetailScreen.Main },
-                                    )
-                                }
-                            }
-
-                            LibraryDetailScreen.Saves -> {
-                                Column(
-                                    modifier =
-                                        Modifier
-                                            .fillMaxSize()
-                                            .padding(horizontal = 24.dp, vertical = 20.dp),
-                                    verticalArrangement = Arrangement.spacedBy(12.dp),
-                                ) {
-                                    Text(
-                                        stringResource(R.string.library_games_save_management),
-                                        style = MaterialTheme.typography.labelMedium,
-                                        color = TextSecondary,
-                                        fontWeight = FontWeight.Bold,
-                                        letterSpacing = 1.1.sp,
-                                    )
-
-                                    if (isGog) {
-                                        GameSettingsActionGrid(
-                                            actions =
-                                                listOf(
-                                                    GameSettingsActionItem(
-                                                        title = stringResource(R.string.common_ui_sync),
-                                                        icon = Icons.Outlined.Cloud,
-                                                        onClick = {
-                                                            scope.launch(Dispatchers.IO) {
-                                                                GOGService.syncCloudSaves(context, "GOG_${gogGame!!.id}", "auto")
-                                                            }
-                                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                                context,
-                                                                getString(R.string.google_cloud_sync_started),
-                                                                android.widget.Toast.LENGTH_SHORT,
-                                                            )
-                                                        },
-                                                    ),
-                                                    GameSettingsActionItem(
-                                                        title = stringResource(R.string.common_ui_export),
-                                                        icon = Icons.Outlined.Upload,
-                                                        onClick = {
-                                                            exportLauncher.launch(
-                                                                "${app.name.replace(" ", "_").replace(":", "")}_Saves.zip",
-                                                            )
-                                                        },
-                                                    ),
-                                                    GameSettingsActionItem(
-                                                        title = stringResource(R.string.common_ui_import),
-                                                        icon = Icons.Outlined.Download,
-                                                        onClick = { importLauncher.launch(arrayOf("application/zip")) },
-                                                    ),
-                                                ),
-                                        )
-                                    } else {
-                                        GameSettingsActionGrid(
-                                            actions =
-                                                listOf(
-                                                    GameSettingsActionItem(
-                                                        title = stringResource(R.string.common_ui_export),
-                                                        icon = Icons.Outlined.Upload,
-                                                        onClick = {
-                                                            exportLauncher.launch(
-                                                                "${app.name.replace(" ", "_").replace(":", "")}_Saves.zip",
-                                                            )
-                                                        },
-                                                    ),
-                                                    GameSettingsActionItem(
-                                                        title = stringResource(R.string.common_ui_import),
-                                                        icon = Icons.Outlined.Download,
-                                                        onClick = { importLauncher.launch(arrayOf("application/zip")) },
-                                                    ),
-                                                ),
-                                        )
-                                    }
-
-                                    Spacer(Modifier.weight(1f))
-                                    TextButton(onClick = { currentScreen = LibraryDetailScreen.Main }) {
-                                        Icon(
-                                            Icons.AutoMirrored.Outlined.ArrowBack,
-                                            contentDescription = null,
-                                            tint = TextSecondary,
-                                            modifier = Modifier.size(18.dp),
-                                        )
-                                        Spacer(Modifier.width(6.dp))
-                                        Text(stringResource(R.string.common_ui_back), color = TextSecondary)
-                                    }
-                                }
-                            }
-
-                            LibraryDetailScreen.CloudSaves -> {
-                                Column(
-                                    modifier =
-                                        Modifier
-                                            .fillMaxSize()
-                                            .verticalScroll(rememberScrollState()),
-                                ) {
-                                var isWorking by remember { mutableStateOf(false) }
-
-                                val detailGameSource =
-                                    when {
-                                        isGog -> GameSaveBackupManager.GameSource.GOG
-                                        isEpic -> GameSaveBackupManager.GameSource.EPIC
-                                        else -> GameSaveBackupManager.GameSource.STEAM
-                                    }
-                                val detailGameId =
-                                    when {
-                                        isGog -> gogGame!!.id
-                                        isEpic -> epicId.toString()
-                                        else -> app.id.toString()
-                                    }
-                                val detailShortcut =
-                                    remember(app.id, gogGame?.id, epicId, isGog, isEpic, isCustom) {
-                                        val containerManager = ContainerManager(context)
-                                        when {
-                                            isGog -> {
-                                                containerManager.loadShortcuts().find {
-                                                    it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame!!.id
-                                                }
-                                            }
-
-                                            else -> {
-                                                findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
-                                            }
-                                        }
-                                    }
-                                var cloudSyncEnabled by remember(detailShortcut?.file?.absolutePath) {
-                                    mutableStateOf(isShortcutCloudSyncEnabled(detailShortcut))
-                                }
-                                var offlineModeEnabled by remember(detailShortcut?.file?.absolutePath) {
-                                    mutableStateOf(isShortcutOfflineMode(detailShortcut))
-                                }
-
-                                val detailProviderLabel =
-                                    when (detailGameSource) {
-                                        GameSaveBackupManager.GameSource.GOG ->
-                                            stringResource(R.string.preloader_platform_gog)
-                                        GameSaveBackupManager.GameSource.EPIC ->
-                                            stringResource(R.string.preloader_platform_epic)
-                                        GameSaveBackupManager.GameSource.STEAM ->
-                                            stringResource(R.string.preloader_platform_steam)
-                                    }
-
-                                CloudSavesContent(
-                                    isWorking = isWorking,
-                                    cloudSyncEnabled = cloudSyncEnabled,
-                                    offlineModeEnabled = offlineModeEnabled,
-                                    gameSource = detailGameSource,
-                                    gameId = detailGameId,
-                                    gameName = app.name,
-                                    shortcut = detailShortcut,
-                                    onCloudSyncToggle = { enabled ->
-                                        cloudSyncEnabled = enabled
-                                        setShortcutCloudSyncEnabled(detailShortcut, enabled)
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            if (enabled) {
-                                                context.getString(R.string.cloud_sync_enabled_summary)
-                                            } else {
-                                                context.getString(R.string.cloud_sync_disabled_summary)
-                                            },
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                    },
-                                    onOfflineModeToggle = { enabled ->
-                                        offlineModeEnabled = enabled
-                                        setShortcutOfflineMode(detailShortcut, enabled)
-                                    },
-                                    onBackup = {
-                                        if (!isWorking) {
-                                            isWorking = true
-                                            scope.launch {
-                                                val result =
-                                                    GameSaveBackupManager.backupToGoogle(
-                                                        this@UnifiedActivity,
-                                                        detailGameSource,
-                                                        detailGameId,
-                                                        app.name,
-                                                    )
-                                                isWorking = false
-                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                    context,
-                                                    result.message,
-                                                    android.widget.Toast.LENGTH_SHORT,
-                                                )
-                                            }
-                                        }
-                                    },
-                                    onRestore = {
-                                        if (!isWorking) {
-                                            isWorking = true
-                                            scope.launch {
-                                                val result =
-                                                    GameSaveBackupManager.restoreFromGoogle(
-                                                        this@UnifiedActivity,
-                                                        detailGameSource,
-                                                        detailGameId,
-                                                        app.name,
-                                                    )
-                                                isWorking = false
-                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                    context,
-                                                    result.message,
-                                                    android.widget.Toast.LENGTH_SHORT,
-                                                )
-                                            }
-                                        }
-                                    },
-                                    onSyncFromCloud = {
-                                        if (!isWorking) {
-                                            isWorking = true
-                                            scope.launch(Dispatchers.IO) {
-                                                val ok =
-                                                    CloudSyncHelper.downloadCloudSaves(
-                                                        context,
-                                                        detailGameSource,
-                                                        detailGameId,
-                                                    )
-                                                withContext(Dispatchers.Main) {
-                                                    isWorking = false
-                                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                        context,
-                                                        if (ok) {
-                                                            context.getString(
-                                                                R.string.cloud_saves_sync_from_provider_success,
-                                                                detailProviderLabel,
-                                                            )
-                                                        } else {
-                                                            context.getString(
-                                                                R.string.cloud_saves_sync_from_provider_failed,
-                                                                detailProviderLabel,
-                                                            )
-                                                        },
-                                                        android.widget.Toast.LENGTH_SHORT,
-                                                    )
-                                                }
-                                            }
-                                        }
-                                    },
-                                    onBack = { currentScreen = LibraryDetailScreen.Main },
-                                )
-                                }
-                            }
-
-                            LibraryDetailScreen.Uninstall -> {
-                                Column(
-                                    modifier =
-                                        Modifier
-                                            .fillMaxSize()
-                                            .padding(horizontal = 24.dp, vertical = 20.dp),
-                                    verticalArrangement = Arrangement.spacedBy(12.dp),
-                                ) {
-                                    Text(
-                                        stringResource(
-                                            if (isCustom) R.string.library_games_remove_game else R.string.library_games_uninstall_game,
-                                        ),
-                                        style = MaterialTheme.typography.labelMedium,
-                                        color = TextSecondary,
-                                        fontWeight = FontWeight.Bold,
-                                        letterSpacing = 1.1.sp,
-                                    )
-
-                                    Spacer(Modifier.weight(1f))
-
-                                    UninstallConfirmation(
-                                        message =
-                                            if (isCustom) {
-                                                getString(R.string.library_games_remove_confirm, app.name)
-                                            } else {
-                                                getString(R.string.library_games_uninstall_confirm, app.name)
-                                            },
-                                        confirmLabel =
-                                            stringResource(
-                                                if (isCustom) R.string.common_ui_remove else R.string.common_ui_uninstall,
-                                            ),
-                                        onConfirm = {
-                                            if (isGog) {
-                                                scope.launch(Dispatchers.IO) {
-                                                    val result = GOGService.deleteGame(
-                                                        context,
-                                                        LibraryItem(
-                                                            "GOG_${gogGame!!.id}",
-                                                            gogGame.title,
-                                                            com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG,
-                                                        ),
-                                                    )
-                                                    withContext(Dispatchers.Main) {
-                                                        if (result.isSuccess) {
-                                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                                context,
-                                                                getString(R.string.library_games_game_uninstalled, app.name),
-                                                                android.widget.Toast.LENGTH_SHORT,
-                                                            )
-                                                        } else {
-                                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                                context,
-                                                                getString(
-                                                                    R.string.library_games_failed_to_uninstall_reason,
-                                                                    result.exceptionOrNull()?.message
-                                                                        ?: getString(R.string.common_ui_unknown_error),
-                                                                ),
-                                                                android.widget.Toast.LENGTH_LONG,
-                                                            )
-                                                        }
-                                                        onDismissRequest()
-                                                    }
-                                                }
-                                            } else if (isCustom) {
-                                                scope.launch(Dispatchers.IO) {
-                                                    val cm = ContainerManager(context)
-                                                    val sc = findLibraryShortcutForGame(cm, app, isCustom, isEpic, epicId)
-                                                    sc?.let { LibraryShortcutUtils.deleteShortcutArtifacts(context, it) }
-                                                    java.io
-                                                        .File(
-                                                            context.filesDir,
-                                                            "custom_icons/${app.name.replace("/", "_")}.png",
-                                                        ).delete()
-                                                    PluviaApp.events.emit(AndroidEvent.LibraryInstallStatusChanged(app.id))
-                                                    withContext(Dispatchers.Main) {
-                                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                            context,
-                                                            getString(R.string.library_games_game_removed, app.name),
-                                                            android.widget.Toast.LENGTH_SHORT,
-                                                        )
-                                                        onDismissRequest()
-                                                    }
-                                                }
-                                            } else if (isEpic) {
-                                                scope.launch(Dispatchers.IO) {
-                                                    val result = EpicService.deleteGame(context, epicId)
-                                                    withContext(Dispatchers.Main) {
-                                                        if (result.isSuccess) {
-                                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                                context,
-                                                                getString(R.string.library_games_game_uninstalled, app.name),
-                                                                android.widget.Toast.LENGTH_SHORT,
-                                                            )
-                                                        } else {
-                                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                                context,
-                                                                getString(
-                                                                    R.string.library_games_failed_to_uninstall_reason,
-                                                                    result.exceptionOrNull()?.message ?: "",
-                                                                ),
-                                                                android.widget.Toast.LENGTH_LONG,
-                                                            )
-                                                        }
-                                                        onDismissRequest()
-                                                    }
-                                                }
-                                            } else {
-                                                SteamService.uninstallApp(app.id) { success ->
-                                                    if (success) {
-                                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                            context,
-                                                            getString(R.string.library_games_game_uninstalled, app.name),
-                                                            android.widget.Toast.LENGTH_SHORT,
-                                                        )
-                                                    } else {
-                                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                            context,
-                                                            getString(R.string.library_games_failed_to_uninstall),
-                                                            android.widget.Toast.LENGTH_SHORT,
-                                                        )
-                                                    }
-                                                    onDismissRequest()
-                                                }
-                                            }
-                                        },
-                                        onCancel = { currentScreen = LibraryDetailScreen.Main },
-                                    )
-                                }
-                            }
-                        }
-                    }
-
-                    // Close button overlay
-                    IconButton(
-                        onClick = onDismissRequest,
-                        modifier =
-                            Modifier
-                                .align(Alignment.TopEnd)
-                                .padding(16.dp)
-                                .size(42.dp)
-                                .shadow(8.dp, CircleShape, spotColor = Color.Black.copy(alpha = 0.35f))
-                                .clip(CircleShape)
-                                .background(BgDark.copy(alpha = 0.7f)),
-                    ) {
-                        Icon(Icons.Outlined.Close, contentDescription = "Close", tint = TextPrimary)
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun DetailCard(
-        label: String,
-        value: String,
-        modifier: Modifier = Modifier.fillMaxWidth(),
-        valueColor: Color? = null,
-        onClick: (() -> Unit)? = null,
-    ) {
-        Surface(
-            modifier =
-                modifier
-                    .then(if (onClick != null) Modifier.clip(RoundedCornerShape(10.dp)).clickable(onClick = onClick) else Modifier),
-            color = SurfaceDark,
-            shape = RoundedCornerShape(10.dp),
-            border = BorderStroke(1.dp, if (onClick != null) Accent.copy(alpha = 0.25f) else CardBorder),
-        ) {
-            Column(
-                modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
-                verticalArrangement = Arrangement.spacedBy(1.dp),
-            ) {
-                Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) {
-                    Text(
-                        label.uppercase(),
-                        style = MaterialTheme.typography.labelSmall,
-                        color = TextSecondary,
-                        fontWeight = FontWeight.Bold,
-                        letterSpacing = 0.8.sp,
-                        fontSize = 10.sp,
-                    )
-                    if (onClick != null) {
-                        Icon(
-                            Icons.AutoMirrored.Outlined.OpenInNew,
-                            contentDescription = null,
-                            modifier = Modifier.size(10.dp),
-                            tint = Accent.copy(alpha = 0.6f),
-                        )
-                    }
-                }
-                Text(
-                    value,
-                    style = MaterialTheme.typography.bodySmall,
-                    color = valueColor ?: (if (onClick != null) Accent else TextPrimary),
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-        }
-    }
-
-    @Composable
-    private fun PlayButton(onClick: () -> Unit) {
-        val interactionSource = remember { MutableInteractionSource() }
-        val isPressed by interactionSource.collectIsPressedAsState()
-        val scale by animateFloatAsState(
-            targetValue = if (isPressed) 0.92f else 1f,
-            animationSpec = spring(dampingRatio = 0.5f, stiffness = 600f),
-            label = "playScale",
-        )
-
-        // Idle glow pulse
-        val infiniteTransition = rememberInfiniteTransition(label = "playGlow")
-        val glowPulse by infiniteTransition.animateFloat(
-            initialValue = 0.3f,
-            targetValue = 0.6f,
-            animationSpec =
-                infiniteRepeatable(
-                    animation = tween<Float>(1200, easing = FastOutSlowInEasing),
-                    repeatMode = RepeatMode.Reverse,
-                ),
-            label = "playPulse",
-        )
-
-        val baseGradient =
-            Brush.horizontalGradient(
-                colors =
-                    listOf(
-                        Color(0xFF00B4D8),
-                        Accent,
-                        Color(0xFF7B2FF7),
-                    ),
-            )
-
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(44.dp)
-                    .graphicsLayer {
-                        scaleX = scale
-                        scaleY = scale
-                    }.shadow(
-                        elevation = 12.dp,
-                        shape = RoundedCornerShape(12.dp),
-                        ambientColor = Accent.copy(alpha = glowPulse),
-                        spotColor = Accent.copy(alpha = glowPulse),
-                    ).clip(RoundedCornerShape(12.dp))
-                    .background(baseGradient)
-                    .clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                        onClick = onClick,
-                    ),
-            contentAlignment = Alignment.Center,
-        ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Center,
-            ) {
-                Icon(
-                    Icons.Outlined.PlayArrow,
-                    contentDescription = null,
-                    modifier = Modifier.size(20.dp),
-                    tint = Color.White,
-                )
-                Spacer(Modifier.width(8.dp))
-                Text(
-                    stringResource(R.string.library_games_play),
-                    color = Color.White,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.Bold,
-                    letterSpacing = 0.5.sp,
-                )
-            }
-        }
-    }
-
-    @Composable
-    private fun InstallButton(
-        loading: Boolean = false,
-        onClick: () -> Unit,
-    ) {
-        val interactionSource = remember { MutableInteractionSource() }
-        val isPressed by interactionSource.collectIsPressedAsState()
-        val scale by animateFloatAsState(
-            targetValue = if (isPressed && !loading) 0.92f else 1f,
-            animationSpec = spring(dampingRatio = 0.5f, stiffness = 600f),
-            label = "installScale",
-        )
-        val infiniteTransition = rememberInfiniteTransition(label = "installGlow")
-        val glowPulse by infiniteTransition.animateFloat(
-            initialValue = 0.3f,
-            targetValue = 0.6f,
-            animationSpec =
-                infiniteRepeatable(
-                    animation = tween<Float>(1200, easing = FastOutSlowInEasing),
-                    repeatMode = RepeatMode.Reverse,
-                ),
-            label = "installPulse",
-        )
-        val baseGradient =
-            Brush.horizontalGradient(
-                colors =
-                    listOf(
-                        Color(0xFF00B4D8),
-                        Accent,
-                        Color(0xFF7B2FF7),
-                    ),
-            )
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(44.dp)
-                    .graphicsLayer {
-                        scaleX = scale
-                        scaleY = scale
-                    }.shadow(
-                        elevation = 12.dp,
-                        shape = RoundedCornerShape(12.dp),
-                        ambientColor = Accent.copy(alpha = glowPulse),
-                        spotColor = Accent.copy(alpha = glowPulse),
-                    ).clip(RoundedCornerShape(12.dp))
-                    .background(baseGradient)
-                    .clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                        onClick = { if (!loading) onClick() },
-                    ),
-            contentAlignment = Alignment.Center,
-        ) {
-            if (loading) {
-                CircularProgressIndicator(
-                    modifier = Modifier.size(22.dp),
-                    color = Color.White,
-                    strokeWidth = 2.dp,
-                )
-            } else {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.Center,
-                ) {
-                    Icon(
-                        Icons.Outlined.Download,
-                        contentDescription = null,
-                        modifier = Modifier.size(20.dp),
-                        tint = Color.White,
-                    )
-                    Spacer(Modifier.width(8.dp))
-                    Text(
-                        stringResource(R.string.common_ui_download),
-                        color = Color.White,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.Bold,
-                        letterSpacing = 0.5.sp,
-                    )
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun CompactActionButton(
-        icon: ImageVector,
-        label: String,
-        tint: Color = TextPrimary,
-        bgColor: Color = SurfaceDark,
-        modifier: Modifier = Modifier,
-        height: Dp = 36.dp,
-        fontSize: TextUnit = 13.sp,
-        onClick: () -> Unit,
-    ) {
-        val interactionSource = remember { MutableInteractionSource() }
-        val isPressed by interactionSource.collectIsPressedAsState()
-        val scale by animateFloatAsState(
-            targetValue = if (isPressed) 0.93f else 1f,
-            animationSpec = spring(dampingRatio = 0.6f, stiffness = 800f),
-            label = "btnScale",
-        )
-        val glowAlpha by animateFloatAsState(
-            targetValue = if (isPressed) 0.18f else 0f,
-            animationSpec = tween(durationMillis = 120),
-            label = "btnGlow",
-        )
-        Surface(
-            modifier =
-                modifier
-                    .fillMaxWidth()
-                    .height(height)
-                    .graphicsLayer {
-                        scaleX = scale
-                        scaleY = scale
-                    }.clip(RoundedCornerShape(10.dp))
-                    .clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                        onClick = onClick,
-                    ),
-            color = bgColor,
-            shape = RoundedCornerShape(10.dp),
-            border = BorderStroke(1.dp, tint.copy(alpha = glowAlpha)),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Center,
-            ) {
-                Icon(icon, contentDescription = null, modifier = Modifier.size(16.dp), tint = tint)
-                Spacer(Modifier.width(6.dp))
-                Text(label, color = tint, fontSize = fontSize, fontWeight = FontWeight.SemiBold, maxLines = 1)
-            }
-        }
-    }
-
-    // Single game capsule for carousel / grid / list
-    @Composable
-    @OptIn(ExperimentalFoundationApi::class)
-    private fun GameCapsule(
-        app: SteamApp,
-        gogGame: GOGGame? = null,
-        epicGame: EpicGame? = null,
-        iconRefreshKey: Int = 0,
-        isFocusedOverride: Boolean = false,
-        isControllerActive: Boolean = false,
-        customArtworkPath: String? = null,
-        customIconPath: String? = null,
-        onClick: (() -> Unit)? = null,
-        onLongClick: (() -> Unit)? = null,
-        useLibraryCapsule: Boolean = false,
-        listMode: Boolean = false,
-        modifier: Modifier = Modifier,
-    ) {
-        val context = LocalContext.current
-        val isCustom = app.id < 0
-        val isEpic = app.id >= 2000000000
-        val defaultClick: () -> Unit = {
-            val containerManager =
-                com.winlator.cmod.runtime.container
-                    .ContainerManager(context)
-            if (isCustom) {
-                launchCustomGame(context, containerManager, app.name)
-            } else if (gogGame != null) {
-                launchGogGame(context, containerManager, gogGame)
-            } else if (isEpic) {
-                epicGame?.let { launchEpicGame(context, containerManager, it) }
-            } else {
-                launchSteamGame(context, containerManager, app)
-            }
-        }
-        val clickInteraction = remember { MutableInteractionSource() }
-        val isPressed by clickInteraction.collectIsPressedAsState()
-        val isFocused = isControllerActive && isFocusedOverride
-        val glowAlpha by animateFloatAsState(
-            targetValue = if (isPressed) 0.7f else 0f,
-            animationSpec = if (isPressed) tween(100) else tween(400),
-            label = "capsuleGlow",
-        )
-        val clickModifier =
-            Modifier
-                .then(
-                    if (glowAlpha > 0f) {
-                        Modifier.drawWithContent {
-                            drawContent()
-                            drawRoundRect(
-                                color = AccentGlow,
-                                alpha = glowAlpha * 0.25f,
-                                cornerRadius = CornerRadius(12.dp.toPx()),
-                            )
-                        }
-                    } else {
-                        Modifier
-                    },
-                ).combinedClickable(
-                    interactionSource = clickInteraction,
-                    indication = null,
-                    onClick = onClick ?: defaultClick,
-                    onLongClick = onLongClick,
-                )
-
-        @Composable
-        fun ArtContent(artModifier: Modifier) {
-            val customArtworkFile =
-                customArtworkPath
-                    ?.let { java.io.File(it) }
-
-            if (customArtworkFile != null) {
-                val customArtworkCacheKey =
-                    "library_custom_icon:${customArtworkFile.absolutePath}:${customArtworkFile.lastModified()}"
-                AsyncImage(
-                    model =
-                        ImageRequest
-                            .Builder(context)
-                            .data(customArtworkFile)
-                            .memoryCacheKey(customArtworkCacheKey)
-                            .diskCacheKey(customArtworkCacheKey)
-                            .crossfade(300)
-                            .build(),
-                    contentDescription = app.name,
-                    modifier = artModifier,
-                    contentScale = ContentScale.Crop,
-                )
-            } else if (isCustom) {
-                val iconFile = customIconPath?.let { path -> java.io.File(path) }
-                if (iconFile != null) {
-                    AsyncImage(
-                        model =
-                            ImageRequest
-                                .Builder(context)
-                                .data(iconFile)
-                                .crossfade(300)
-                                .build(),
-                        contentDescription = app.name,
-                        modifier = artModifier,
-                        contentScale = ContentScale.Crop,
-                    )
-                } else {
-                    Box(
-                        modifier = artModifier.background(SurfaceDark),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Icon(
-                            Icons.Outlined.SportsEsports,
-                            contentDescription = app.name,
-                            tint = Accent.copy(alpha = 0.6f),
-                            modifier = Modifier.size(48.dp),
-                        )
-                    }
-                }
-            } else if (gogGame != null) {
-                AsyncImage(
-                    model =
-                        ImageRequest
-                            .Builder(context)
-                            .data(gogGame.imageUrl.ifEmpty { gogGame.iconUrl })
-                            .crossfade(300)
-                            .build(),
-                    contentDescription = app.name,
-                    modifier = artModifier,
-                    contentScale = ContentScale.Crop,
-                )
-            } else if (isEpic) {
-                AsyncImage(
-                    model =
-                        ImageRequest
-                            .Builder(context)
-                            .data(epicGame?.primaryImageUrl ?: epicGame?.iconUrl)
-                            .crossfade(300)
-                            .build(),
-                    contentDescription = app.name,
-                    modifier = artModifier,
-                    contentScale = ContentScale.Crop,
-                )
-            } else {
-                val imageUrl =
-                    when {
-                        listMode -> app.getSmallCapsuleUrl()
-                        useLibraryCapsule -> app.getLibraryCapsuleUrl()
-                        else -> app.getCapsuleUrl()
-                    }
-                AsyncImage(
-                    model =
-                        ImageRequest
-                            .Builder(context)
-                            .data(imageUrl)
-                            .crossfade(300)
-                            .build(),
-                    contentDescription = app.name,
-                    modifier = artModifier,
-                    contentScale = ContentScale.Crop,
-                )
-            }
-        }
-
-        if (listMode) {
-            // Horizontal row card with hero background
-            val heroUrl = if (!isCustom && gogGame == null && !isEpic) app.getHeroUrl() else null
-
-            Box(
-                modifier =
-                    modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(14.dp))
-                        .border(1.dp, if (isControllerActive) CardBorder else Color.Transparent, RoundedCornerShape(14.dp))
-                        .chasingBorder(
-                            isFocused = isFocused,
-                            paused = chasingBordersPaused.value || !libraryTabActive.value,
-                            cornerRadius = 14.dp,
-                        ).background(CardDark, RoundedCornerShape(14.dp))
-                        .focusable()
-                        .then(clickModifier),
-            ) {
-                // Hero background layer (falls back to CardDark if image fails)
-                if (heroUrl != null) {
-                    AsyncImage(
-                        model =
-                            ImageRequest
-                                .Builder(context)
-                                .data(heroUrl)
-                                .crossfade(300)
-                                .build(),
-                        contentDescription = null,
-                        modifier =
-                            Modifier
-                                .matchParentSize()
-                                .graphicsLayer { alpha = 0.25f },
-                        contentScale = ContentScale.Crop,
-                    )
-                }
-
-                // Foreground content
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 14.dp, vertical = 11.dp),
-                    horizontalArrangement = Arrangement.Center,
-                ) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .height(52.dp)
-                                .aspectRatio(462f / 174f)
-                                .clip(RoundedCornerShape(8.dp)),
-                    ) {
-                        ArtContent(Modifier.fillMaxSize())
-                    }
-
-                    Spacer(Modifier.width(14.dp))
-
-                    Text(
-                        text = app.name,
-                        modifier =
-                            Modifier
-                                .weight(1f)
-                                .then(if (isFocused) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
-                        color = TextPrimary,
-                        fontSize = 15.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-        } else {
-            // Vertical card: art on top, title below
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier =
-                    modifier
-                        .fillMaxWidth()
-                        .border(1.dp, CardDark, RoundedCornerShape(12.dp))
-                        .chasingBorder(
-                            isFocused = isFocused,
-                            paused = chasingBordersPaused.value || !libraryTabActive.value,
-                            cornerRadius = 12.dp,
-                        ).background(CardDark, RoundedCornerShape(12.dp))
-                        .focusable()
-                        .then(clickModifier),
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .weight(1f)
-                            .clip(RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)),
-                ) {
-                    ArtContent(Modifier.fillMaxSize())
-                }
-
-                Text(
-                    text = app.name,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 4.dp, vertical = 4.dp)
-                            .then(if (isFocused) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = TextPrimary,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-    }
-
-    // Epic Store Tab
-    @Composable
-    fun EpicStoreTab(
-        isLoggedIn: Boolean,
-        epicApps: List<EpicGame>,
-        searchQuery: String = "",
-        layoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4,
-        onLoginClick: () -> Unit,
-    ) {
-        val context = LocalContext.current
-
-        if (!isLoggedIn) {
-            LoginRequiredScreen("Epic Games", onLoginClick)
-            return
-        }
-
-        val selectedAppId = remember { mutableStateOf<Int?>(null) }
-        val gridState = rememberLazyGridState()
-        val activity = LocalContext.current as? UnifiedActivity
-
-        // Ensure library updates from cloud
-        LaunchedEffect(Unit) {
-            if (epicApps.isEmpty()) {
-                EpicService.triggerLibrarySync(context)
-            }
-        }
-
-        val displayedApps =
-            remember(epicApps, searchQuery) {
-                if (searchQuery.isBlank()) {
-                    epicApps
-                } else {
-                    epicApps.filter { it.title.contains(searchQuery, ignoreCase = true) }
-                }
-            }
-        val installStateById = rememberInstallPathStateMap(displayedApps.map { it.id to it.installPath })
-
-        // Sync store focus infrastructure
-        LaunchedEffect(displayedApps.size) {
-            activity?.storeItemCount = displayedApps.size
-            val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
-            if (activity != null && displayedApps.isNotEmpty() && activity.storeFocusIndex.value > lastIndex) {
-                activity.storeFocusIndex.value = lastIndex
-            }
-        }
-        DisposableEffect(displayedApps) {
-            activity?.storeItemClickCallback = { idx ->
-                displayedApps.getOrNull(idx)?.let { selectedAppId.value = it.id }
-            }
-            activity?.storeGridState = gridState
-            onDispose {
-                activity?.storeItemClickCallback = null
-                activity?.storeGridState = null
-            }
-        }
-
-        if (layoutMode == LibraryLayoutMode.LIST) {
-            val listViewState = rememberLazyListState()
-            JoystickListScroll(listViewState, activity?.rightStickScrollState)
-            ListView(
-                items = displayedApps,
-                modifier = Modifier.tabScreenPadding(),
-                listState = listViewState,
-                contentPadding = TabListContentPadding,
-                keyOf = { it.id },
-            ) { app, _, _ ->
-                EpicStoreCapsule(
-                    app,
-                    isInstalled = installStateById[app.id] == true,
-                    listMode = true,
-                    isControllerActive = ControllerHelper.isControllerConnected(),
-                ) {
-                    selectedAppId.value =
-                        app.id
-                }
-            }
-        } else {
-            val focusIndex by (activity?.storeFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
-            val focusRequesters =
-                remember(displayedApps.size) {
-                    List(displayedApps.size) { FocusRequester() }
-                }
-            LaunchedEffect(focusIndex, focusRequesters.size) {
-                if (searchQuery.isEmpty() && focusRequesters.isNotEmpty() && focusIndex in focusRequesters.indices) {
-                    gridState.animateScrollToItem(focusIndex)
-                    try {
-                        focusRequesters[focusIndex].requestFocus()
-                    } catch (_: Exception) {
-                    }
-                }
-            }
-            JoystickGridScroll(gridState, activity?.rightStickScrollState)
-            FourByTwoGridView(
-                items = displayedApps,
-                modifier = Modifier.tabScreenPadding(top = TabGridTopPadding),
-                gridState = gridState,
-                keyOf = { it.id },
-            ) { app, index, rowHeight ->
-                Box(
-                    Modifier.height(rowHeight).then(
-                        if (index in focusRequesters.indices) {
-                            Modifier.focusRequester(focusRequesters[index])
-                        } else {
-                            Modifier
-                        },
-                    ),
-                ) {
-                    EpicStoreCapsule(
-                        app,
-                        isInstalled = installStateById[app.id] == true,
-                        isFocusedOverride = index == focusIndex,
-                        isControllerActive = ControllerHelper.isControllerConnected(),
-                    ) {
-                        selectedAppId.value =
-                            app.id
-                    }
-                }
-            }
-        }
-
-        val selectedApp = epicApps.find { it.id == selectedAppId.value }
-        if (selectedApp != null) {
-            EpicGameManagerDialog(
-                app = selectedApp,
-                onDismissRequest = { selectedAppId.value = null },
-            )
-        }
-    }
-
-    @Composable
-    fun EpicStoreCapsule(
-        app: com.winlator.cmod.feature.stores.epic.data.EpicGame,
-        isInstalled: Boolean,
-        listMode: Boolean = false,
-        isFocusedOverride: Boolean = false,
-        isControllerActive: Boolean = false,
-        onClick: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        var isFocused by remember { mutableStateOf(false) }
-        val clickInteraction = remember { MutableInteractionSource() }
-        val isPressed by clickInteraction.collectIsPressedAsState()
-        val glowAlpha by animateFloatAsState(
-            targetValue = if (isPressed) 0.7f else 0f,
-            animationSpec = if (isPressed) tween(100) else tween(400),
-            label = "epicCapsuleGlow",
-        )
-        val effectiveFocus = isControllerActive && (isFocusedOverride || isFocused)
-        val imageUrl = app.primaryImageUrl ?: app.iconUrl
-
-        val borderColor = if (isControllerActive) CardBorder else Color.Transparent
-
-        if (listMode) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(14.dp))
-                        .border(1.dp, borderColor, RoundedCornerShape(14.dp))
-                        .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 14.dp)
-                        .background(CardDark, RoundedCornerShape(14.dp))
-                        .onFocusChanged { isFocused = it.isFocused }
-                        .focusable()
-                        .then(
-                            if (glowAlpha > 0f) {
-                                Modifier.drawWithContent {
-                                    drawContent()
-                                    drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(14.dp.toPx()))
-                                }
-                            } else {
-                                Modifier
-                            },
-                        ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick)
-                        .padding(horizontal = 14.dp, vertical = 11.dp),
-                horizontalArrangement = Arrangement.Center,
-            ) {
-                Box(
-                    Modifier
-                        .height(52.dp)
-                        .aspectRatio(462f / 174f)
-                        .clip(RoundedCornerShape(8.dp)),
-                ) {
-                    AsyncImage(
-                        model =
-                            ImageRequest
-                                .Builder(context)
-                                .data(imageUrl)
-                                .crossfade(300)
-                                .build(),
-                        contentDescription = app.title,
-                        modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Crop,
-                    )
-                    if (isInstalled) {
-                        Box(
-                            Modifier
-                                .align(
-                                    Alignment.BottomEnd,
-                                ).padding(4.dp)
-                                .background(SurfaceDark.copy(alpha = 0.7f), RoundedCornerShape(6.dp))
-                                .padding(3.dp),
-                        ) {
-                            Text(
-                                stringResource(R.string.library_games_installed_badge),
-                                color = StatusOnline,
-                                fontSize = 8.sp,
-                                fontWeight = FontWeight.Bold,
-                            )
-                        }
-                    }
-                }
-                Spacer(Modifier.width(14.dp))
-                Text(
-                    app.title,
-                    modifier =
-                        Modifier
-                            .weight(1f)
-                            .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
-                    color = TextPrimary,
-                    fontSize = 15.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-        } else {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .border(1.dp, borderColor, RoundedCornerShape(16.dp))
-                        .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 16.dp)
-                        .background(CardDark, RoundedCornerShape(16.dp))
-                        .onFocusChanged { isFocused = it.isFocused }
-                        .focusable()
-                        .then(
-                            if (glowAlpha > 0f) {
-                                Modifier.drawWithContent {
-                                    drawContent()
-                                    drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(16.dp.toPx()))
-                                }
-                            } else {
-                                Modifier
-                            },
-                        ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick),
-            ) {
-                Box(
-                    Modifier
-                        .fillMaxWidth()
-                        .weight(1f)
-                        .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
-                ) {
-                    AsyncImage(
-                        model =
-                            ImageRequest
-                                .Builder(context)
-                                .data(imageUrl)
-                                .crossfade(300)
-                                .build(),
-                        contentDescription = app.title,
-                        modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Crop,
-                    )
-
-                    if (isInstalled) {
-                        Box(
-                            Modifier
-                                .align(
-                                    Alignment.BottomEnd,
-                                ).padding(8.dp)
-                                .background(SurfaceDark.copy(alpha = 0.7f), RoundedCornerShape(8.dp))
-                                .padding(4.dp),
-                        ) {
-                            Text(
-                                stringResource(R.string.library_games_installed_badge),
-                                color = StatusOnline,
-                                fontSize = 10.sp,
-                                fontWeight = FontWeight.Bold,
-                            )
-                        }
-                    }
-                }
-
-                Text(
-                    app.title,
-                    modifier =
-                        Modifier
-                            .padding(horizontal = 4.dp, vertical = 4.dp)
-                            .fillMaxWidth()
-                            .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = TextPrimary,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-    }
-
-    @Composable
-    private fun StoreInstallDialogShell(
-        title: String,
-        heroImageUrl: String?,
-        subtitle: String,
-        sourceLabel: String = "",
-        onDismissRequest: () -> Unit,
-        infoContent: @Composable ColumnScope.() -> Unit = {},
-        actionsContent: @Composable ColumnScope.() -> Unit,
-    ) {
-        Dialog(
-            onDismissRequest = onDismissRequest,
-            properties =
-                DialogProperties(
-                    usePlatformDefaultWidth = false,
-                    decorFitsSystemWindows = false,
-                ),
-        ) {
-            Surface(
-                modifier =
-                    Modifier
-                        .windowInsetsPadding(WindowInsets.navigationBars)
-                        .fillMaxWidth(0.864f)
-                        .fillMaxHeight(0.92f),
-                shape = RoundedCornerShape(20.dp),
-                color = CardDark,
-            ) {
-                Box(Modifier.fillMaxSize()) {
-                    Column(Modifier.fillMaxSize()) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .fillMaxHeight(0.42f),
-                        ) {
-                            AsyncImage(
-                                model =
-                                    ImageRequest
-                                        .Builder(LocalContext.current)
-                                        .data(heroImageUrl)
-                                        .crossfade(150)
-                                        .memoryCachePolicy(coil.request.CachePolicy.ENABLED)
-                                        .diskCachePolicy(coil.request.CachePolicy.ENABLED)
-                                        .build(),
-                                contentDescription = "$title artwork",
-                                modifier = Modifier.fillMaxSize(),
-                                contentScale = ContentScale.FillWidth,
-                                alignment = Alignment.TopCenter,
-                            )
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .fillMaxSize()
-                                        .background(
-                                            Brush.verticalGradient(
-                                                colorStops =
-                                                    arrayOf(
-                                                        0.0f to Color.Transparent,
-                                                        0.45f to Color.Transparent,
-                                                        0.72f to CardDark.copy(alpha = 0.72f),
-                                                        1.0f to CardDark,
-                                                    ),
-                                            ),
-                                        ),
-                            )
-                            Column(
-                                modifier =
-                                    Modifier
-                                        .align(Alignment.BottomStart)
-                                        .padding(start = 24.dp, end = 80.dp, bottom = 24.dp),
-                            ) {
-                                Text(
-                                    title,
-                                    style = MaterialTheme.typography.headlineMedium,
-                                    color = TextPrimary,
-                                    fontWeight = FontWeight.Bold,
-                                )
-                                if (subtitle.isNotBlank()) {
-                                    Spacer(Modifier.height(8.dp))
-                                    Text(
-                                        subtitle,
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        color = TextSecondary,
-                                        maxLines = 2,
-                                        overflow = TextOverflow.Ellipsis,
-                                    )
-                                }
-                            }
-                        }
-
-                        Row(
-                            modifier =
-                                Modifier
-                                    .fillMaxSize()
-                                    .padding(horizontal = 24.dp, vertical = 14.dp),
-                            horizontalArrangement = Arrangement.spacedBy(14.dp),
-                        ) {
-                            Column(
-                                modifier =
-                                    Modifier
-                                        .weight(1f)
-                                        .fillMaxHeight(),
-                                verticalArrangement = Arrangement.spacedBy(6.dp, Alignment.Bottom),
-                            ) {
-                                if (sourceLabel.isNotBlank()) {
-                                    Surface(
-                                        color = Accent.copy(alpha = 0.15f),
-                                        shape = RoundedCornerShape(8.dp),
-                                    ) {
-                                        Text(
-                                            sourceLabel,
-                                            modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),
-                                            color = Accent,
-                                            fontSize = 12.sp,
-                                            fontWeight = FontWeight.Bold,
-                                        )
-                                    }
-                                }
-                                infoContent()
-                            }
-
-                            Column(
-                                modifier =
-                                    Modifier
-                                        .widthIn(min = 200.dp, max = 260.dp)
-                                        .fillMaxHeight(),
-                                verticalArrangement = Arrangement.spacedBy(6.dp, Alignment.Bottom),
-                            ) {
-                                actionsContent()
-                            }
-                        }
-                    }
-
-                    IconButton(
-                        onClick = onDismissRequest,
-                        modifier =
-                            Modifier
-                                .align(Alignment.TopEnd)
-                                .padding(16.dp)
-                                .size(42.dp)
-                                .shadow(8.dp, CircleShape, spotColor = Color.Black.copy(alpha = 0.35f))
-                                .clip(CircleShape)
-                                .background(BgDark.copy(alpha = 0.7f)),
-                    ) {
-                        Icon(Icons.Outlined.Close, contentDescription = "Close", tint = TextPrimary)
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    fun EpicGameManagerDialog(
-        app: EpicGame,
-        onDismissRequest: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        val installed = app.isInstalled && java.io.File(app.installPath).exists()
-        val scope = rememberCoroutineScope()
-
-        var isLoading by remember { mutableStateOf(!installed) }
-        var manifestSizes by remember { mutableStateOf<EpicManager.ManifestSizes?>(null) }
-        var dlcApps by remember { mutableStateOf<List<EpicGame>>(emptyList()) }
-        val selectedDlcIds = remember { mutableStateListOf<Int>() }
-        var customPath by remember { mutableStateOf<String?>(null) }
-        var showCustomPathWarning by remember { mutableStateOf(false) }
-        var showDlcDialog by remember { mutableStateOf(false) }
-
-        if (showCustomPathWarning) {
-            CustomPathWarningDialog(
-                onDismiss = { showCustomPathWarning = false },
-                onProceed = {
-                    showCustomPathWarning = false
-                    DirectoryPickerDialog.show(
-                        activity = this@UnifiedActivity,
-                        initialPath = customPath ?: EpicConstants.getGameInstallPath(context, app.appName),
-                        title = getString(R.string.settings_content_install_directory),
-                    ) { path -> customPath = path }
-                },
-            )
-        }
-
-        if (showDlcDialog && dlcApps.isNotEmpty()) {
-            GameSettingsDialogFrame(
-                title = stringResource(R.string.library_games_dlcs),
-                onDismissRequest = { showDlcDialog = false },
-            ) {
-                Column(
-                    modifier =
-                        Modifier
-                            .heightIn(max = 300.dp)
-                            .verticalScroll(rememberScrollState()),
-                ) {
-                    dlcApps.forEachIndexed { index, dlc ->
-                        if (index > 0) {
-                            HorizontalDivider(
-                                color = CardBorder.copy(alpha = 0.5f),
-                                thickness = 0.5.dp,
-                                modifier = Modifier.padding(horizontal = 16.dp),
-                            )
-                        }
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .clickable(
-                                        interactionSource = remember { MutableInteractionSource() },
-                                        indication = null,
-                                    ) {
-                                        if (selectedDlcIds.contains(dlc.id)) {
-                                            selectedDlcIds.remove(dlc.id)
-                                        } else {
-                                            selectedDlcIds.add(dlc.id)
-                                        }
-                                    }.padding(horizontal = 16.dp, vertical = 2.dp),
-                        ) {
-                            Checkbox(
-                                checked = selectedDlcIds.contains(dlc.id),
-                                onCheckedChange = { if (it) selectedDlcIds.add(dlc.id) else selectedDlcIds.remove(dlc.id) },
-                                colors =
-                                    CheckboxDefaults.colors(
-                                        checkedColor = Accent,
-                                        uncheckedColor = TextSecondary,
-                                        checkmarkColor = Color.White,
-                                    ),
-                            )
-                            Text(dlc.title, color = TextPrimary, fontSize = 13.sp)
-                        }
-                    }
-                }
-            }
-        }
-
-        LaunchedEffect(app.id, installed) {
-            if (!installed) {
-                withContext(Dispatchers.IO) {
-                    manifestSizes = EpicService.fetchManifestSizes(context, app.id)
-                    dlcApps = EpicService.getDLCForGameSuspend(app.id)
-                    isLoading = false
-                }
-            }
-        }
-
-        val totalInstallSize = manifestSizes?.installSize ?: 0L
-        val totalDownloadSize = manifestSizes?.downloadSize ?: 0L
-        val defaultPathSet =
-            if (PrefManager.useSingleDownloadFolder) {
-                PrefManager.defaultDownloadFolder.isNotEmpty()
-            } else {
-                PrefManager.epicDownloadFolder
-                    .isNotEmpty()
-            }
-        val effectivePath = customPath ?: EpicConstants.getGameInstallPath(context, app.appName)
-        val availableBytes =
-            try {
-                StorageUtils.getAvailableSpace(effectivePath)
-            } catch (e: Exception) {
-                0L
-            }
-        val isInstallEnabled = installed || availableBytes >= totalInstallSize
-        val installPathDisplay = customPath ?: EpicConstants.defaultEpicGamesPath(context)
-
-        StoreInstallDialogShell(
-            title = app.title,
-            heroImageUrl = app.artPortrait.ifEmpty { app.primaryImageUrl },
-            subtitle =
-                listOfNotNull(
-                    app.developer.takeIf { it.isNotBlank() },
-                    app.publisher.takeIf { it.isNotBlank() },
-                ).joinToString(" • "),
-            sourceLabel = "Epic Games",
-            onDismissRequest = onDismissRequest,
-            infoContent = {
-                if (isLoading && !installed) {
-                    Spacer(Modifier.height(18.dp))
-                    CircularProgressIndicator(color = Accent)
-                } else if (installed) {
-                    DetailCard(
-                        label = stringResource(R.string.library_games_install_path),
-                        value = app.installPath,
-                    )
-                    DetailCard(
-                        label = stringResource(R.string.common_ui_status),
-                        value = stringResource(R.string.common_ui_installed),
-                        valueColor = StatusOnline,
-                    )
-                } else {
-                    DetailCard(
-                        label = stringResource(R.string.library_games_install_path),
-                        value = installPathDisplay,
-                    )
-                    DetailCard(
-                        stringResource(R.string.library_games_download_slash_install),
-                        stringResource(
-                            R.string.library_games_download_install_available,
-                            StorageUtils.formatBinarySize(totalDownloadSize),
-                            StorageUtils.formatBinarySize(totalInstallSize),
-                            StorageUtils.formatBinarySize(availableBytes),
-                        ),
-                        valueColor = if (!isInstallEnabled) DangerRed else null,
-                    )
-                }
-            },
-        ) {
-            if (installed) {
-                PlayButton(onClick = {
-                    launchEpicGame(context, ContainerManager(context), app)
-                    onDismissRequest()
-                })
-                if (app.cloudSaveEnabled) {
-                    CompactActionButton(
-                        icon = Icons.Outlined.CloudSync,
-                        label = stringResource(R.string.google_cloud_title),
-                        onClick = {
-                            scope.launch(Dispatchers.IO) {
-                                EpicCloudSavesManager.syncCloudSaves(context, app.id, "auto")
-                            }
-                            onDismissRequest()
-                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                context,
-                                context.getString(R.string.google_cloud_sync_started),
-                                android.widget.Toast.LENGTH_SHORT,
-                            )
-                        },
-                    )
-                }
-                CompactActionButton(
-                    icon = Icons.Outlined.Delete,
-                    label = stringResource(R.string.common_ui_uninstall),
-                    tint = DangerRed,
-                    bgColor = DangerRed.copy(alpha = 0.12f),
-                    onClick = {
-                        scope.launch(Dispatchers.IO) {
-                            val result = EpicService.deleteGame(context, app.id)
-                            withContext(Dispatchers.Main) {
-                                if (!result.isSuccess) {
-                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                        context,
-                                        getString(
-                                            R.string.library_games_failed_to_uninstall_reason,
-                                            result.exceptionOrNull()?.message
-                                                ?: getString(R.string.common_ui_unknown_error),
-                                        ),
-                                        android.widget.Toast.LENGTH_LONG,
-                                    )
-                                }
-                                onDismissRequest()
-                            }
-                        }
-                    },
-                )
-            } else {
-                InstallButton(
-                    loading = isLoading,
-                    onClick = {
-                        val installPath =
-                            if (customPath != null) {
-                                val sanitizedTitle = app.title.replace(Regex("[^a-zA-Z0-9 \\-_]"), "").trim()
-                                java.io.File(customPath!!, sanitizedTitle).absolutePath
-                            } else {
-                                EpicConstants.getGameInstallPath(context, app.title)
-                            }
-                        EpicService.downloadGame(context, app.id, selectedDlcIds.toList(), installPath, "en-US")
-                        onDismissRequest()
-                    },
-                )
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(6.dp),
-                ) {
-                    CompactActionButton(
-                        icon = Icons.Outlined.Folder,
-                        label =
-                            if (customPath !=
-                                null
-                            ) {
-                                stringResource(R.string.common_ui_custom)
-                            } else if (defaultPathSet) {
-                                stringResource(R.string.common_ui_already_set)
-                            } else {
-                                stringResource(R.string.common_ui_custom)
-                            },
-                        modifier = Modifier.weight(1f),
-                        onClick = {
-                            if (customPath == null && defaultPathSet) {
-                                showCustomPathWarning = true
-                            } else {
-                                DirectoryPickerDialog.show(
-                                    activity = this@UnifiedActivity,
-                                    initialPath = customPath ?: EpicConstants.getGameInstallPath(context, app.appName),
-                                    title = getString(R.string.settings_content_install_directory),
-                                ) { path -> customPath = path }
-                            }
-                        },
-                    )
-                    if (dlcApps.isNotEmpty()) {
-                        CompactActionButton(
-                            icon = Icons.Outlined.Extension,
-                            label = stringResource(R.string.library_games_dlcs),
-                            modifier = Modifier.weight(1f),
-                            onClick = { showDlcDialog = true },
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    fun GOGStoreTab(
-        isLoggedIn: Boolean,
-        gogApps: List<GOGGame>,
-        searchQuery: String = "",
-        layoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4,
-        onLoginClick: () -> Unit,
-    ) {
-        if (!isLoggedIn) {
-            LoginRequiredScreen("GOG", onLoginClick)
-            return
-        }
-
-        val selectedGameId = remember { mutableStateOf<String?>(null) }
-        val gridState = rememberLazyGridState()
-        val activity = LocalContext.current as? UnifiedActivity
-
-        val displayedApps =
-            remember(gogApps, searchQuery) {
-                if (searchQuery.isBlank()) {
-                    gogApps
-                } else {
-                    gogApps.filter { it.title.contains(searchQuery, ignoreCase = true) }
-                }
-            }
-        val installStateById = rememberInstallPathStateMap(displayedApps.map { it.id to it.installPath })
-
-        // Sync store focus infrastructure
-        LaunchedEffect(displayedApps.size) {
-            activity?.storeItemCount = displayedApps.size
-            val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
-            if (activity != null && displayedApps.isNotEmpty() && activity.storeFocusIndex.value > lastIndex) {
-                activity.storeFocusIndex.value = lastIndex
-            }
-        }
-        DisposableEffect(displayedApps) {
-            activity?.storeItemClickCallback = { idx ->
-                displayedApps.getOrNull(idx)?.let { selectedGameId.value = it.id }
-            }
-            activity?.storeGridState = gridState
-            onDispose {
-                activity?.storeItemClickCallback = null
-                activity?.storeGridState = null
-            }
-        }
-
-        val isControllerActive = ControllerHelper.isControllerConnected()
-        val gogBorderColor = if (isControllerActive) CardBorder else Color.Transparent
-
-        if (layoutMode == LibraryLayoutMode.LIST) {
-            val listViewState = rememberLazyListState()
-            ListView(
-                items = displayedApps,
-                modifier = Modifier.tabScreenPadding(),
-                listState = listViewState,
-                contentPadding = TabListContentPadding,
-                keyOf = { it.id },
-            ) { app, _, _ ->
-                val isInstalled = installStateById[app.id] == true
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .clip(RoundedCornerShape(14.dp))
-                            .border(1.dp, gogBorderColor, RoundedCornerShape(14.dp))
-                            .background(CardDark, RoundedCornerShape(14.dp))
-                            .clickable { selectedGameId.value = app.id }
-                            .padding(horizontal = 14.dp, vertical = 11.dp),
-                    horizontalArrangement = Arrangement.Center,
-                ) {
-                    Box(
-                        Modifier
-                            .height(52.dp)
-                            .aspectRatio(462f / 174f)
-                            .clip(RoundedCornerShape(8.dp)),
-                    ) {
-                        AsyncImage(
-                            model =
-                                ImageRequest
-                                    .Builder(LocalContext.current)
-                                    .data(app.imageUrl.ifEmpty { app.iconUrl })
-                                    .crossfade(300)
-                                    .build(),
-                            contentDescription = null,
-                            modifier = Modifier.fillMaxSize(),
-                            contentScale = ContentScale.Crop,
-                        )
-                        if (isInstalled) {
-                            Icon(
-                                Icons.Outlined.CheckCircle,
-                                contentDescription = "Installed",
-                                tint = StatusOnline,
-                                modifier = Modifier.align(Alignment.BottomEnd).padding(4.dp).size(18.dp),
-                            )
-                        }
-                    }
-                    Spacer(Modifier.width(14.dp))
-                    Text(
-                        text = app.title,
-                        modifier = Modifier.weight(1f),
-                        color = TextPrimary,
-                        fontSize = 15.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-        } else {
-            val focusIndex by (activity?.storeFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
-            val focusRequesters =
-                remember(displayedApps.size) {
-                    List(displayedApps.size) { FocusRequester() }
-                }
-            LaunchedEffect(focusIndex, focusRequesters.size) {
-                if (searchQuery.isEmpty() && focusRequesters.isNotEmpty() && focusIndex in focusRequesters.indices) {
-                    gridState.animateScrollToItem(focusIndex)
-                    try {
-                        focusRequesters[focusIndex].requestFocus()
-                    } catch (_: Exception) {
-                    }
-                }
-            }
-            FourByTwoGridView(
-                items = displayedApps,
-                modifier = Modifier.tabScreenPadding(top = TabGridTopPadding),
-                gridState = gridState,
-                keyOf = { it.id },
-            ) { app, index, rowHeight ->
-                val isInstalled = installStateById[app.id] == true
-                val isItemFocused = isControllerActive && index == focusIndex
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(rowHeight)
-                            .then(
-                                if (index in focusRequesters.indices) {
-                                    Modifier.focusRequester(focusRequesters[index])
-                                } else {
-                                    Modifier
-                                },
-                            ).border(1.dp, gogBorderColor, RoundedCornerShape(16.dp))
-                            .chasingBorder(isFocused = isItemFocused, paused = chasingBordersPaused.value, cornerRadius = 16.dp)
-                            .background(CardDark, RoundedCornerShape(16.dp))
-                            .clickable { selectedGameId.value = app.id },
-                ) {
-                    Box(
-                        Modifier
-                            .fillMaxWidth()
-                            .weight(1f)
-                            .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
-                    ) {
-                        AsyncImage(
-                            model =
-                                ImageRequest
-                                    .Builder(LocalContext.current)
-                                    .data(app.imageUrl.ifEmpty { app.iconUrl })
-                                    .crossfade(300)
-                                    .build(),
-                            contentDescription = null,
-                            modifier = Modifier.fillMaxSize(),
-                            contentScale = ContentScale.Crop,
-                        )
-                        if (isInstalled) {
-                            Icon(
-                                Icons.Outlined.CheckCircle,
-                                contentDescription = "Installed",
-                                tint = StatusOnline,
-                                modifier = Modifier.align(Alignment.BottomEnd).padding(8.dp).size(24.dp),
-                            )
-                        }
-                    }
-
-                    Text(
-                        text = app.title,
-                        modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 4.dp),
-                        style = MaterialTheme.typography.bodySmall,
-                        color = TextPrimary,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        textAlign = TextAlign.Center,
-                    )
-                }
-            }
-        }
-
-        selectedGameId.value?.let { gameId ->
-            val app = gogApps.firstOrNull { it.id == gameId }
-            if (app != null) {
-                GOGGameManagerDialog(app = app) { selectedGameId.value = null }
-            }
-        }
-    }
-
-    @Composable
-    fun GOGGameManagerDialog(
-        app: GOGGame,
-        onDismissRequest: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        val installed = app.isInstalled && java.io.File(app.installPath).exists()
-        val scope = rememberCoroutineScope()
-        var customPath by remember { mutableStateOf<String?>(null) }
-        var showCustomPathWarning by remember { mutableStateOf(false) }
-
-        if (showCustomPathWarning) {
-            CustomPathWarningDialog(
-                onDismiss = { showCustomPathWarning = false },
-                onProceed = {
-                    showCustomPathWarning = false
-                    DirectoryPickerDialog.show(
-                        activity = this@UnifiedActivity,
-                        initialPath = customPath ?: GOGConstants.defaultGOGGamesPath,
-                        title = getString(R.string.settings_content_install_directory),
-                    ) { path -> customPath = path }
-                },
-            )
-        }
-
-        val defaultPathSet =
-            if (PrefManager.useSingleDownloadFolder) {
-                PrefManager.defaultDownloadFolder.isNotEmpty()
-            } else {
-                PrefManager.gogDownloadFolder
-                    .isNotEmpty()
-            }
-        val installRootPath = customPath ?: GOGConstants.defaultGOGGamesPath
-        val installPathDisplay =
-            if (customPath != null) {
-                java.io.File(customPath!!, GOGConstants.getSanitizedGameFolderName(app.title)).absolutePath
-            } else {
-                GOGConstants.getGameInstallPath(app.title)
-            }
-        val requiredBytes = maxOf(app.installSize, app.downloadSize)
-        val availableBytes =
-            try {
-                StorageUtils.getAvailableSpace(installRootPath)
-            } catch (_: Exception) {
-                0L
-            }
-        val isInstallEnabled = installed || availableBytes >= requiredBytes
-
-        StoreInstallDialogShell(
-            title = app.title,
-            heroImageUrl = app.imageUrl.ifEmpty { app.iconUrl },
-            subtitle =
-                listOfNotNull(
-                    app.developer.takeIf { it.isNotBlank() },
-                    app.publisher.takeIf { it.isNotBlank() },
-                ).joinToString(" • "),
-            sourceLabel = "GOG",
-            onDismissRequest = onDismissRequest,
-            infoContent = {
-                if (installed) {
-                    DetailCard(
-                        label = stringResource(R.string.library_games_install_path),
-                        value = app.installPath,
-                    )
-                    DetailCard(
-                        label = stringResource(R.string.common_ui_status),
-                        value = stringResource(R.string.common_ui_installed),
-                        valueColor = StatusOnline,
-                    )
-                } else {
-                    DetailCard(
-                        label = stringResource(R.string.library_games_install_path),
-                        value = installPathDisplay,
-                    )
-                    DetailCard(
-                        stringResource(R.string.library_games_download_slash_install),
-                        stringResource(
-                            R.string.library_games_download_install_available,
-                            StorageUtils.formatBinarySize(app.downloadSize),
-                            StorageUtils.formatBinarySize(app.installSize),
-                            StorageUtils.formatBinarySize(availableBytes),
-                        ),
-                        valueColor = if (!isInstallEnabled) DangerRed else null,
-                    )
-                }
-            },
-        ) {
-            if (installed) {
-                PlayButton(onClick = {
-                    launchGogGame(context, ContainerManager(context), app)
-                    onDismissRequest()
-                })
-                CompactActionButton(
-                    icon = Icons.Outlined.CloudSync,
-                    label = stringResource(R.string.google_cloud_title),
-                    onClick = {
-                        scope.launch(Dispatchers.IO) {
-                            GOGService.syncCloudSaves(context, "GOG_${app.id}", "auto")
-                        }
-                        onDismissRequest()
-                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                            context,
-                            context.getString(R.string.google_cloud_sync_started),
-                            android.widget.Toast.LENGTH_SHORT,
-                        )
-                    },
-                )
-                CompactActionButton(
-                    icon = Icons.Outlined.Delete,
-                    label = stringResource(R.string.common_ui_uninstall),
-                    tint = DangerRed,
-                    bgColor = DangerRed.copy(alpha = 0.12f),
-                    onClick = {
-                        scope.launch(Dispatchers.IO) {
-                            val result = GOGService.deleteGame(
-                                context,
-                                LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG),
-                            )
-                            withContext(Dispatchers.Main) {
-                                if (!result.isSuccess) {
-                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                        context,
-                                        getString(
-                                            R.string.library_games_failed_to_uninstall_reason,
-                                            result.exceptionOrNull()?.message
-                                                ?: getString(R.string.common_ui_unknown_error),
-                                        ),
-                                        android.widget.Toast.LENGTH_LONG,
-                                    )
-                                }
-                                onDismissRequest()
-                            }
-                        }
-                    },
-                )
-            } else {
-                InstallButton(
-                    onClick = {
-                        GOGService.downloadGame(context, app.id, installPathDisplay, PrefManager.containerLanguage)
-                        onDismissRequest()
-                    },
-                )
-                CompactActionButton(
-                    icon = Icons.Outlined.Folder,
-                    label =
-                        if (customPath !=
-                            null
-                        ) {
-                            stringResource(R.string.common_ui_custom)
-                        } else if (defaultPathSet) {
-                            stringResource(R.string.common_ui_already_set)
-                        } else {
-                            stringResource(R.string.common_ui_custom)
-                        },
-                    onClick = {
-                        if (customPath == null && defaultPathSet) {
-                            showCustomPathWarning = true
-                        } else {
-                            DirectoryPickerDialog.show(
-                                activity = this@UnifiedActivity,
-                                initialPath = customPath ?: GOGConstants.defaultGOGGamesPath,
-                                title = getString(R.string.settings_content_install_directory),
-                            ) { path -> customPath = path }
-                        }
-                    },
-                )
-            }
-        }
-    }
-
-    // Steam Store Tab
-    @Composable
-    fun SteamStoreTab(
-        isLoggedIn: Boolean,
-        steamApps: List<SteamApp>,
-        searchQuery: String = "",
-        layoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4,
-    ) {
-        if (!isLoggedIn && !SteamService.hasStoredCredentials(this)) {
-            LoginRequiredScreen("Steam") {
-                startActivity(Intent(this@UnifiedActivity, SteamLoginActivity::class.java))
-            }
-            return
-        }
-
-        var selectedAppForDialog by remember { mutableStateOf<SteamApp?>(null) }
-        val gridState = rememberLazyGridState()
-        val activity = LocalContext.current as? UnifiedActivity
-
-        val displayedApps =
-            remember(steamApps, searchQuery) {
-                if (searchQuery.isBlank()) {
-                    steamApps
-                } else {
-                    steamApps.filter { it.name.contains(searchQuery, ignoreCase = true) }
-                }
-            }
-        val installStateById = rememberSteamInstallStateMap(displayedApps)
-
-        // Sync store focus infrastructure
-        LaunchedEffect(displayedApps.size) {
-            activity?.storeItemCount = displayedApps.size
-            val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
-            if (activity != null && displayedApps.isNotEmpty() && activity.storeFocusIndex.value > lastIndex) {
-                activity.storeFocusIndex.value = lastIndex
-            }
-        }
-        // Register A-button click callback and grid state for visible-area snapping
-        DisposableEffect(displayedApps) {
-            activity?.storeItemClickCallback = { idx ->
-                displayedApps.getOrNull(idx)?.let { selectedAppForDialog = it }
-            }
-            activity?.storeGridState = gridState
-            onDispose {
-                activity?.storeItemClickCallback = null
-                activity?.storeGridState = null
-            }
-        }
-
-        if (layoutMode == LibraryLayoutMode.LIST) {
-            val listViewState = rememberLazyListState()
-            JoystickListScroll(listViewState, activity?.rightStickScrollState, minSpeed = 2.5f, maxSpeed = 16f, quadratic = true)
-            ListView(
-                items = displayedApps,
-                modifier = Modifier.tabScreenPadding(),
-                listState = listViewState,
-                contentPadding = TabListContentPadding,
-                keyOf = { it.id },
-            ) { app, _, _ ->
-                SteamStoreCapsule(
-                    app,
-                    isInstalled = installStateById[app.id] == true,
-                    listMode = true,
-                    isControllerActive = ControllerHelper.isControllerConnected(),
-                    onClick = {
-                        selectedAppForDialog =
-                            app
-                    },
-                )
-            }
-        } else {
-            val focusIndex by (activity?.storeFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
-            val focusRequesters =
-                remember(displayedApps.size) {
-                    List(displayedApps.size) { FocusRequester() }
-                }
-            LaunchedEffect(focusIndex, focusRequesters.size) {
-                if (searchQuery.isEmpty() && focusRequesters.isNotEmpty() && focusIndex in focusRequesters.indices) {
-                    gridState.animateScrollToItem(focusIndex)
-                    try {
-                        focusRequesters[focusIndex].requestFocus()
-                    } catch (_: Exception) {
-                    }
-                }
-            }
-            // Right joystick: 2x faster at full push with quadratic speed curve
-            JoystickGridScroll(gridState, activity?.rightStickScrollState, minSpeed = 2.5f, maxSpeed = 16f, quadratic = true)
-            // Left joystick: 75% slower scrolling (vertical only, for browsing store)
-            JoystickGridScroll(gridState, activity?.leftStickScrollState, deadZone = 0.15f, minSpeed = 0.3125f, maxSpeed = 2f)
-            FourByTwoGridView(
-                items = displayedApps,
-                modifier = Modifier.tabScreenPadding(top = TabGridTopPadding),
-                gridState = gridState,
-                keyOf = { it.id },
-            ) { app, index, rowHeight ->
-                Box(
-                    Modifier.height(rowHeight).then(
-                        if (index in focusRequesters.indices) {
-                            Modifier.focusRequester(focusRequesters[index])
-                        } else {
-                            Modifier
-                        },
-                    ),
-                ) {
-                    SteamStoreCapsule(
-                        app,
-                        isInstalled = installStateById[app.id] == true,
-                        isFocusedOverride = index == focusIndex,
-                        isControllerActive =
-                            ControllerHelper
-                                .isControllerConnected(),
-                        onClick = {
-                            selectedAppForDialog =
-                                app
-                        },
-                    )
-                }
-            }
-        }
-
-        if (selectedAppForDialog != null) {
-            GameManagerDialog(
-                app = selectedAppForDialog!!,
-                onDismissRequest = { selectedAppForDialog = null },
-            )
-        }
-    }
-
-    @Composable
-    fun SteamStoreCapsule(
-        app: SteamApp,
-        isInstalled: Boolean,
-        listMode: Boolean = false,
-        isFocusedOverride: Boolean = false,
-        isControllerActive: Boolean = false,
-        onClick: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        var isFocused by remember { mutableStateOf(false) }
-        val clickInteraction = remember { MutableInteractionSource() }
-        val isPressed by clickInteraction.collectIsPressedAsState()
-        val glowAlpha by animateFloatAsState(
-            targetValue = if (isPressed) 0.7f else 0f,
-            animationSpec = if (isPressed) tween(100) else tween(400),
-            label = "steamCapsuleGlow",
-        )
-        val effectiveFocus = isControllerActive && (isFocusedOverride || isFocused)
-        val borderColor = if (isControllerActive) CardBorder else Color.Transparent
-
-        if (listMode) {
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(14.dp))
-                        .border(1.dp, borderColor, RoundedCornerShape(14.dp))
-                        .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 14.dp)
-                        .background(CardDark, RoundedCornerShape(14.dp))
-                        .onFocusChanged { isFocused = it.isFocused }
-                        .focusable()
-                        .then(
-                            if (glowAlpha > 0f) {
-                                Modifier.drawWithContent {
-                                    drawContent()
-                                    drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(14.dp.toPx()))
-                                }
-                            } else {
-                                Modifier
-                            },
-                        ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick),
-            ) {
-                // Hero background
-                AsyncImage(
-                    model =
-                        ImageRequest
-                            .Builder(context)
-                            .data(app.getHeroUrl())
-                            .crossfade(300)
-                            .build(),
-                    contentDescription = null,
-                    modifier =
-                        Modifier
-                            .matchParentSize()
-                            .graphicsLayer { alpha = 0.25f },
-                    contentScale = ContentScale.Crop,
-                )
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 14.dp, vertical = 11.dp),
-                    horizontalArrangement = Arrangement.Center,
-                ) {
-                    Box(
-                        Modifier
-                            .height(52.dp)
-                            .aspectRatio(462f / 174f)
-                            .clip(RoundedCornerShape(8.dp)),
-                    ) {
-                        AsyncImage(
-                            model =
-                                ImageRequest
-                                    .Builder(context)
-                                    .data(app.getSmallCapsuleUrl())
-                                    .crossfade(300)
-                                    .build(),
-                            contentDescription = null,
-                            modifier = Modifier.fillMaxSize(),
-                            contentScale = ContentScale.Crop,
-                        )
-                        if (isInstalled) {
-                            Icon(
-                                Icons.Outlined.CheckCircle,
-                                contentDescription = "Installed",
-                                tint = StatusOnline,
-                                modifier = Modifier.align(Alignment.BottomEnd).padding(4.dp).size(18.dp),
-                            )
-                        }
-                    }
-                    Spacer(Modifier.width(14.dp))
-                    Text(
-                        text = app.name,
-                        modifier =
-                            Modifier
-                                .weight(1f)
-                                .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
-                        color = TextPrimary,
-                        fontSize = 15.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-        } else {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .border(1.dp, borderColor, RoundedCornerShape(16.dp))
-                        .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 16.dp)
-                        .background(CardDark, RoundedCornerShape(16.dp))
-                        .onFocusChanged { isFocused = it.isFocused }
-                        .focusable()
-                        .then(
-                            if (glowAlpha > 0f) {
-                                Modifier.drawWithContent {
-                                    drawContent()
-                                    drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(16.dp.toPx()))
-                                }
-                            } else {
-                                Modifier
-                            },
-                        ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick),
-            ) {
-                Box(
-                    Modifier
-                        .fillMaxWidth()
-                        .weight(1f)
-                        .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
-                ) {
-                    val imageUrl = app.getCapsuleUrl()
-
-                    AsyncImage(
-                        model =
-                            ImageRequest
-                                .Builder(context)
-                                .data(imageUrl)
-                                .crossfade(300)
-                                .build(),
-                        contentDescription = null,
-                        modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Crop,
-                    )
-
-                    if (isInstalled) {
-                        Icon(
-                            Icons.Outlined.CheckCircle,
-                            contentDescription = "Installed",
-                            tint = StatusOnline,
-                            modifier = Modifier.align(Alignment.BottomEnd).padding(8.dp).size(24.dp),
-                        )
-                    }
-                }
-
-                Text(
-                    text = app.name,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 4.dp, vertical = 4.dp)
-                            .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = TextPrimary,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-    }
-
-    // Downloads Tab
-    @Composable
-    fun DownloadsTab(
-        selectedId: String?,
-        animationsActive: Boolean = true,
-        onSelectDownload: (String?) -> Unit,
-    ) {
-        val downloads = remember { mutableStateListOf<Pair<String, DownloadInfo>>() }
-        var tick by remember { mutableIntStateOf(0) }
-        val scope = rememberCoroutineScope()
-
-        val syncDownloads =
-            remember(selectedId, onSelectDownload) {
-                {
-                    val currentDownloads = DownloadService.getAllDownloads()
-                    downloads.clear()
-                    downloads.addAll(currentDownloads)
-                    if (selectedId != null && currentDownloads.none { it.first == selectedId }) {
-                        onSelectDownload(null)
-                    }
-                }
-            }
-        val latestSyncDownloads by rememberUpdatedState(syncDownloads)
-
-        val downloadStatusListener =
-            remember {
-                object : EventDispatcher.JavaEventListener {
-                    override fun onEvent(event: Any) {
-                        if (event is AndroidEvent.DownloadStatusChanged) {
-                            scope.launch {
-                                latestSyncDownloads()
-                            }
-                        }
-                    }
-                }
-            }
-
-        DisposableEffect(downloadStatusListener, syncDownloads) {
-            syncDownloads()
-            PluviaApp.events.onJava(AndroidEvent.DownloadStatusChanged::class, downloadStatusListener)
-            onDispose {
-                PluviaApp.events.offJava(AndroidEvent.DownloadStatusChanged::class, downloadStatusListener)
-            }
-        }
-
-        // Re-sync the list whenever the cross-store DownloadCoordinator records change. This
-        // is what makes PAUSED records (loaded from DB after app restart) appear in the tab,
-        // and what removes COMPLETE/CANCELLED/FAILED rows after Clear.
-        LaunchedEffect(syncDownloads) {
-            com.winlator.cmod.app.service.download.DownloadCoordinator.changes.collect {
-                latestSyncDownloads()
-            }
-        }
-
-        downloads.forEach { (_, info) ->
-            LaunchedEffect(info) {
-                info.getStatusFlow().collect {
-                    tick++
-                }
-            }
-        }
-
-        Column(
-            Modifier
-                .fillMaxSize()
-                .windowInsetsPadding(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom))
-                .tabScreenPadding(top = DownloadsHeaderTopPadding),
-        ) {
-            // Read tick to ensure global button state reacts to per-download status changes.
-            @Suppress("UNUSED_EXPRESSION")
-            tick
-
-            Row(
-                modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
-                horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterHorizontally),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                val selectedInfo = downloads.find { it.first == selectedId }?.second
-                val selectedStatus = selectedInfo?.getStatusFlow()?.value
-                val isPaused = selectedStatus == DownloadPhase.PAUSED
-                val isComplete = selectedStatus == DownloadPhase.COMPLETE
-                val isCancelled = selectedStatus == DownloadPhase.CANCELLED
-                val pausableDownloads =
-                    downloads.filter {
-                        val status = it.second.getStatusFlow().value
-                        status != DownloadPhase.COMPLETE && status != DownloadPhase.CANCELLED
-                    }
-                val allPausableDownloadsPaused =
-                    pausableDownloads.isNotEmpty() &&
-                        pausableDownloads.all {
-                            it.second.getStatusFlow().value == DownloadPhase.PAUSED
-                        }
-
-                val pauseResumeLabel =
-                    if (selectedId == null) {
-                        if (allPausableDownloadsPaused) {
-                            stringResource(
-                                R.string.downloads_queue_resume_all,
-                            )
-                        } else {
-                            stringResource(R.string.downloads_queue_pause_all)
-                        }
-                    } else {
-                        if (isPaused) stringResource(R.string.session_drawer_resume) else stringResource(R.string.session_drawer_pause)
-                    }
-
-                val cancelLabel =
-                    if (selectedId == null) {
-                        stringResource(R.string.downloads_queue_cancel_all)
-                    } else {
-                        stringResource(R.string.common_ui_cancel)
-                    }
-
-                // Disable pause/resume for completed or cancelled downloads
-                val pauseResumeEnabled =
-                    if (selectedId != null) {
-                        !isComplete && !isCancelled
-                    } else {
-                        pausableDownloads.isNotEmpty()
-                    }
-
-                val cancelEnabled =
-                    if (selectedId != null) {
-                        !isComplete && !isCancelled
-                    } else {
-                        pausableDownloads.isNotEmpty()
-                    }
-
-                DownloadsQueueButton(
-                    label = pauseResumeLabel,
-                    accentColor = Accent,
-                    onClick = {
-                        if (selectedId == null) {
-                            if (allPausableDownloadsPaused) {
-                                DownloadService.resumeAll()
-                            } else {
-                                DownloadService.pauseAll()
-                            }
-                        } else {
-                            if (isPaused) {
-                                DownloadService.resumeDownload(selectedId)
-                            } else {
-                                DownloadService.pauseDownload(selectedId)
-                            }
-                        }
-                    },
-                    enabled = pauseResumeEnabled,
-                )
-
-                DownloadsQueueButton(
-                    label = cancelLabel,
-                    accentColor = DangerRed,
-                    onClick = {
-                        if (selectedId == null) {
-                            DownloadService.cancelAll()
-                            onSelectDownload(null)
-                        } else {
-                            DownloadService.cancelDownload(selectedId)
-                            onSelectDownload(null)
-                        }
-                    },
-                    enabled = cancelEnabled,
-                )
-
-                // Clear button - clears completed, cancelled, and failed downloads
-                val hasCompletedOrCancelled =
-                    downloads.any {
-                        val s = it.second.getStatusFlow().value
-                        s == DownloadPhase.COMPLETE || s == DownloadPhase.CANCELLED || s == DownloadPhase.FAILED
-                    }
-
-                DownloadsQueueButton(
-                    label = stringResource(R.string.downloads_queue_clear),
-                    accentColor = TextSecondary,
-                    onClick = {
-                        DownloadService.clearCompletedDownloads()
-                    },
-                    enabled = hasCompletedOrCancelled,
-                )
-            }
-
-            val listState = rememberLazyListState()
-            val activity = LocalContext.current as? UnifiedActivity
-            val density = LocalContext.current.resources.displayMetrics.density
-
-            LaunchedEffect(listState) {
-                activity?.rightStickScrollState?.collect { rz ->
-                    if (kotlin.math.abs(rz) > 0.1f) {
-                        // Max scroll speed is 20 rows per second (approx 20 * 100dp / 60fps ~ 32dp per frame)
-                        // Min scroll speed is 0.75 rows per second (approx 0.75 * 100dp / 60fps ~ 1.25dp per frame)
-                        // Use a square curve for more gradual acceleration
-                        val speedFactor = kotlin.math.abs(rz)
-                        val curveFactor = speedFactor * speedFactor
-                        val baseSpeed = 1.25f + (curveFactor * (32f - 1.25f))
-                        val direction = if (rz > 0) 1f else -1f
-
-                        // Using a loop while the stick is held
-                        while (kotlin.math.abs(activity.rightStickScrollState.value) > 0.1f) {
-                            val currentRz = activity.rightStickScrollState.value
-                            val currentSpeedFactor = kotlin.math.abs(currentRz)
-                            val currentCurveFactor = currentSpeedFactor * currentSpeedFactor
-                            val currentBaseSpeed = 1.25f + (currentCurveFactor * (32f - 1.25f))
-                            val currentDirection = if (currentRz > 0) 1f else -1f
-
-                            val pixelsToScroll = currentBaseSpeed * currentDirection * density
-                            listState.dispatchRawDelta(pixelsToScroll)
-                            kotlinx.coroutines.delay(16) // roughly 60fps
-                        }
-                    }
-                }
-            }
-
-            // Sort so the user always sees what's actually running first, then everything
-            // they can resume, then finished items, with cancelled at the very bottom.
-            // The list re-sorts on phase transitions because `tick` (incremented by the
-            // status flow collectors above) is read here, forcing recomposition.
-            @Suppress("UNUSED_EXPRESSION")
-            tick
-            val sortedDownloads =
-                downloads.sortedBy { (_, info) ->
-                    when (info.getStatusFlow().value) {
-                        // In-progress states grouped together at the top.
-                        DownloadPhase.DOWNLOADING,
-                        DownloadPhase.PREPARING,
-                        DownloadPhase.VERIFYING,
-                        DownloadPhase.PATCHING,
-                        DownloadPhase.APPLYING_DATA,
-                        DownloadPhase.FINALIZING,
-                        DownloadPhase.UNPACKING,
-                        DownloadPhase.UNKNOWN,
-                        -> 0
-                        DownloadPhase.PAUSED -> 1
-                        DownloadPhase.QUEUED -> 2
-                        DownloadPhase.COMPLETE -> 3
-                        DownloadPhase.FAILED -> 4
-                        DownloadPhase.CANCELLED -> 5
-                    }
-                }
-
-            if (sortedDownloads.isEmpty()) {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    EmptyStateMessage(stringResource(R.string.downloads_queue_empty))
-                }
-            } else {
-                LazyColumn(state = listState, modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    items(sortedDownloads, key = { it.first }) { (id, info) ->
-                        DownloadItemDeck(
-                            id,
-                            info,
-                            isSelected = selectedId == id,
-                            animationsActive = animationsActive,
-                            onClick = {
-                                if (selectedId == id) onSelectDownload(null) else onSelectDownload(id)
-                            },
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun DownloadsQueueButton(
-        label: String,
-        accentColor: Color,
-        enabled: Boolean,
-        modifier: Modifier = Modifier,
-        onClick: () -> Unit,
-    ) {
-        val contentColor = if (enabled) accentColor else TextSecondary.copy(alpha = 0.48f)
-
-        Button(
-            onClick = onClick,
-            enabled = enabled,
-            modifier = modifier.height(40.dp).widthIn(min = 96.dp),
-            colors =
-                ButtonDefaults.buttonColors(
-                    containerColor = DownloadButtonBlack,
-                    contentColor = contentColor,
-                    disabledContainerColor = DownloadButtonBlack.copy(alpha = 0.18f),
-                    disabledContentColor = TextSecondary.copy(alpha = 0.48f),
-                ),
-            border = BorderStroke(1.dp, contentColor.copy(alpha = if (enabled) 0.55f else 0.24f)),
-            contentPadding = PaddingValues(horizontal = 8.dp),
-            shape = RoundedCornerShape(8.dp),
-        ) {
-            Text(
-                label,
-                color = contentColor,
-                fontSize = 12.sp,
-                fontWeight = FontWeight.SemiBold,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-            )
-        }
-    }
-
-    @Composable
-    private fun AnimatedDownloadProgressFill(
-        modifier: Modifier,
-        widthPx: Float,
-    ) {
-        val infiniteTransition = rememberInfiniteTransition(label = "downloadProgressGradient")
-        val gradientOffset by infiniteTransition.animateFloat(
-            initialValue = -widthPx,
-            targetValue = 0f,
-                animationSpec =
-                    infiniteRepeatable(
-                    animation = tween(durationMillis = 5000, easing = LinearEasing),
-                    repeatMode = RepeatMode.Restart,
-                ),
-            label = "downloadProgressGradientOffset",
-        )
-
-        Box(
-            modifier.background(
-                Brush.horizontalGradient(
-                    colorStops = DownloadChaseGradientStops,
-                    startX = gradientOffset,
-                    endX = gradientOffset + (widthPx * 2f),
-                    tileMode = TileMode.Repeated,
-                ),
-            ),
-        )
-    }
-
-    @Composable
-    private fun DownloadChasingProgressBar(
-        progress: Float,
-        status: DownloadPhase,
-        animationsActive: Boolean,
-        modifier: Modifier = Modifier,
-    ) {
-        val clampedProgress = progress.coerceIn(0f, 1f)
-        val shouldUseActiveGradient =
-            when (status) {
-                DownloadPhase.DOWNLOADING,
-                DownloadPhase.QUEUED,
-                DownloadPhase.PREPARING,
-                DownloadPhase.VERIFYING,
-                DownloadPhase.PATCHING,
-                DownloadPhase.APPLYING_DATA,
-                DownloadPhase.FINALIZING,
-                DownloadPhase.UNPACKING,
-                -> true
-                else -> false
-            }
-        val shouldAnimate = shouldUseActiveGradient && animationsActive
-        val fillColor =
-            when (status) {
-                DownloadPhase.FAILED,
-                DownloadPhase.CANCELLED,
-                -> DangerRed
-                DownloadPhase.COMPLETE -> StatusOnline
-                DownloadPhase.PAUSED -> TextSecondary
-                else -> Accent
-            }
-
-        BoxWithConstraints(
-            modifier =
-                modifier
-                    .clip(CircleShape)
-                    .background(Color.Black.copy(alpha = 0.34f)),
-        ) {
-            val density = LocalDensity.current
-            val widthPx = with(density) { maxWidth.toPx().coerceAtLeast(1f) }
-
-            if (clampedProgress > 0f) {
-                val fillModifier =
-                    Modifier
-                        .fillMaxHeight()
-                        .fillMaxWidth(clampedProgress)
-                        .clip(RectangleShape)
-
-                if (shouldUseActiveGradient) {
-                    if (shouldAnimate) {
-                        AnimatedDownloadProgressFill(fillModifier, widthPx)
-                    } else {
-                        Box(
-                            fillModifier.background(
-                                Brush.horizontalGradient(
-                                    colorStops = DownloadChaseGradientStops,
-                                    endX = widthPx * 2f,
-                                    tileMode = TileMode.Repeated,
-                                ),
-                            ),
-                        )
-                    }
-                } else {
-                    Box(fillModifier.background(fillColor))
-                }
-            }
-        }
-    }
-
-    @Composable
-    fun DownloadItemDeck(
-        id: String,
-        info: DownloadInfo,
-        isSelected: Boolean,
-        animationsActive: Boolean,
-        onClick: () -> Unit,
-    ) {
-        var progress by remember { mutableFloatStateOf(info.getProgress()) }
-        var showDeleteDialog by remember { mutableStateOf(false) }
-
-        DisposableEffect(info) {
-            val listener: (Float) -> Unit = { progress = it }
-            info.addProgressListener(listener)
-            onDispose { info.removeProgressListener(listener) }
-        }
-        val status by info.getStatusFlow().collectAsState()
-        val statusMessage by info.getStatusMessageFlow().collectAsState()
-        var previousStatus by remember { mutableStateOf(status) }
-        var showCompletedProgressBar by remember { mutableStateOf(status != DownloadPhase.COMPLETE) }
-        val isSteam = id.startsWith("STEAM_")
-        val isEpic = id.startsWith("EPIC_")
-        val isGog = id.startsWith("GOG_")
-        val appId =
-            if (isSteam) {
-                id.removePrefix("STEAM_").toIntOrNull() ?: 0
-            } else if (isEpic) {
-                id.removePrefix("EPIC_").toIntOrNull() ?: 0
-            } else {
-                0
-            }
-        val gogId = if (isGog) id.removePrefix("GOG_") else ""
-
-        var steamApp by remember(appId) { mutableStateOf<SteamApp?>(null) }
-        var epicGame by remember(appId) { mutableStateOf<EpicGame?>(null) }
-        var gogGame by remember(gogId) { mutableStateOf<GOGGame?>(null) }
-        val context = LocalContext.current
-        var isFocused by remember { mutableStateOf(false) }
-        val clickInteractionSource = remember { MutableInteractionSource() }
-        val animatedProgress by animateFloatAsState(
-            targetValue = if (status == DownloadPhase.COMPLETE) 1f else progress.coerceIn(0f, 1f),
-            animationSpec = tween(durationMillis = 650, easing = FastOutSlowInEasing),
-            label = "downloadItemProgress",
-        )
-
-        LaunchedEffect(status) {
-            if (status == DownloadPhase.COMPLETE) {
-                if (previousStatus != DownloadPhase.COMPLETE) {
-                    showCompletedProgressBar = true
-                    delay(900)
-                }
-                showCompletedProgressBar = false
-            } else {
-                showCompletedProgressBar = true
-            }
-            previousStatus = status
-        }
-
-        LaunchedEffect(appId, gogId, isSteam, isEpic, isGog) {
-            withContext(Dispatchers.IO) {
-                if (isSteam) {
-                    steamApp = db.steamAppDao().findApp(appId)
-                } else if (isEpic) {
-                    epicGame = EpicService.getEpicGameOf(appId)
-                } else if (isGog) {
-                    gogGame = GOGService.getGOGGameOf(gogId)
-                }
-            }
-        }
-
-        val unknownGameLabel = stringResource(R.string.library_games_unknown_game)
-        val displayName =
-            if (isSteam) {
-                steamApp?.name
-            } else if (isEpic) {
-                epicGame?.title
-            } else if (isGog) {
-                gogGame?.title
-            } else {
-                unknownGameLabel
-            }
-        val displayImage =
-            if (isSteam) {
-                steamApp?.getHeaderImageUrl()
-            } else if (isEpic) {
-                epicGame?.primaryImageUrl ?: epicGame?.iconUrl
-            } else if (isGog) {
-                gogGame?.imageUrl ?: gogGame?.iconUrl
-            } else {
-                null
-            }
-
-        Surface(
-            color = if (isSelected) DownloadCardSelectedBlack else DownloadCardBlack,
-            shape = RoundedCornerShape(12.dp),
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .chasingBorder(
-                        isFocused = isFocused || isSelected,
-                        paused = chasingBordersPaused.value || !animationsActive,
-                        cornerRadius = 12.dp,
-                        borderWidth = 2.dp,
-                        animationDurationMs = 8000,
-                    )
-                    .onFocusChanged { isFocused = it.isFocused }
-                    .focusable()
-                    .clickable(
-                        interactionSource = clickInteractionSource,
-                        indication = null,
-                        onClick = onClick,
-                    ),
-        ) {
-            Row(Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) {
-                AsyncImage(
-                    model =
-                        ImageRequest
-                            .Builder(context)
-                            .data(displayImage)
-                            .crossfade(300)
-                            .build(),
-                    contentDescription = null,
-                    modifier = Modifier.size(120.dp, 68.dp).clip(RoundedCornerShape(4.dp)),
-                    contentScale = ContentScale.Crop,
-                )
-
-                Spacer(Modifier.width(16.dp))
-
-                Column(Modifier.weight(1f)) {
-                    val currentFile by info.getCurrentFileNameFlow().collectAsState()
-                    val (downloadedBytes, totalBytes) = info.getBytesProgress()
-                    val speed = info.getCurrentDownloadSpeed() ?: 0L
-                    val percentage = (animatedProgress * 100).roundToInt()
-                    val showDownloadSpeed =
-                        status == DownloadPhase.DOWNLOADING &&
-                            progress < 1f &&
-                            speed > 0
-
-                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
-                        Text(
-                            displayName ?: unknownGameLabel,
-                            fontWeight = FontWeight.Bold,
-                            color = TextPrimary,
-                            modifier = Modifier.weight(1f),
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-
-                        // Centered Size Info
-                        Text(
-                            text = "${StorageUtils.formatBinarySize(downloadedBytes)} / ${StorageUtils.formatBinarySize(totalBytes)}",
-                            style = MaterialTheme.typography.labelMedium,
-                            color = TextSecondary,
-                            modifier = Modifier.weight(1f),
-                            textAlign = TextAlign.Center,
-                        )
-
-                        Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) {
-                            if (showDownloadSpeed) {
-                                Text(
-                                    text = "${StorageUtils.formatBinarySize(speed)}/s",
-                                    style = MaterialTheme.typography.labelMedium,
-                                    color = Accent,
-                                    fontWeight = FontWeight.Bold,
-                                )
-                            }
-                        }
-                    }
-
-                    val statusText =
-                        when (status) {
-                            DownloadPhase.DOWNLOADING -> {
-                                currentFile?.let {
-                                    stringResource(R.string.downloads_queue_phase_downloading_file, it.take(10))
-                                } ?: stringResource(R.string.downloads_queue_phase_downloading)
-                            }
-
-                            DownloadPhase.PAUSED -> {
-                                stringResource(R.string.downloads_queue_phase_paused)
-                            }
-
-                            DownloadPhase.QUEUED -> {
-                                stringResource(R.string.downloads_queue_phase_queued)
-                            }
-
-                            DownloadPhase.PREPARING -> {
-                                stringResource(R.string.downloads_queue_phase_preparing)
-                            }
-
-                            DownloadPhase.VERIFYING -> {
-                                currentFile?.let {
-                                    stringResource(R.string.downloads_queue_phase_verifying_file, it.take(10))
-                                } ?: stringResource(R.string.downloads_queue_phase_verifying)
-                            }
-
-                            DownloadPhase.PATCHING -> {
-                                stringResource(R.string.downloads_queue_phase_patching)
-                            }
-
-                            DownloadPhase.APPLYING_DATA -> {
-                                stringResource(R.string.downloads_queue_phase_applying_data)
-                            }
-
-                            DownloadPhase.FINALIZING -> {
-                                stringResource(R.string.downloads_queue_phase_finalizing)
-                            }
-
-                            DownloadPhase.UNPACKING -> {
-                                stringResource(R.string.downloads_queue_phase_unpacking)
-                            }
-
-                            DownloadPhase.COMPLETE -> {
-                                stringResource(R.string.downloads_queue_phase_complete)
-                            }
-
-                            DownloadPhase.CANCELLED -> {
-                                stringResource(R.string.downloads_queue_phase_cancelled)
-                            }
-
-                            DownloadPhase.FAILED -> {
-                                stringResource(
-                                    R.string.downloads_queue_phase_failed,
-                                    if (statusMessage != null &&
-                                        statusMessage != "null"
-                                    ) {
-                                        statusMessage!!
-                                    } else {
-                                        stringResource(R.string.common_ui_unknown_error)
-                                    },
-                                )
-                            }
-
-                            else -> {
-                                stringResource(R.string.downloads_queue_phase_unknown)
-                            }
-                        }
-                    val statusColor =
-                        when (status) {
-                            DownloadPhase.COMPLETE -> StatusOnline
-                            DownloadPhase.FAILED,
-                            DownloadPhase.CANCELLED,
-                            -> DangerRed
-                            DownloadPhase.PAUSED,
-                            DownloadPhase.QUEUED,
-                            -> StatusAway
-                            DownloadPhase.DOWNLOADING,
-                            DownloadPhase.PREPARING,
-                            DownloadPhase.VERIFYING,
-                            DownloadPhase.PATCHING,
-                            DownloadPhase.APPLYING_DATA,
-                            DownloadPhase.FINALIZING,
-                            DownloadPhase.UNPACKING,
-                            -> Accent
-                            else -> TextSecondary
-                        }
-
-                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
-                        Text(
-                            stringResource(R.string.downloads_queue_status_label),
-                            style = MaterialTheme.typography.bodySmall,
-                            color = TextSecondary,
-                            maxLines = 1,
-                        )
-                        Spacer(Modifier.width(4.dp))
-                        Text(
-                            statusText,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = statusColor,
-                            modifier = Modifier.weight(1f),
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                    }
-
-                    AnimatedVisibility(
-                        visible = status != DownloadPhase.COMPLETE || showCompletedProgressBar,
-                        exit = fadeOut(tween(180)) + shrinkVertically(tween(180)),
-                    ) {
-                        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) {
-                            DownloadChasingProgressBar(
-                                progress = if (status == DownloadPhase.COMPLETE) 1f else animatedProgress,
-                                status = status,
-                                animationsActive = animationsActive,
-                                modifier = Modifier.weight(1f).height(9.dp).padding(end = 10.dp),
-                            )
-                            Text(
-                                text = "$percentage%",
-                                style = MaterialTheme.typography.labelMedium,
-                                color = if (status == DownloadPhase.COMPLETE) StatusOnline else TextPrimary,
-                                modifier = Modifier.width(40.dp),
-                            )
-                        }
-                    }
-                }
-
-                IconButton(
-                    onClick = { showDeleteDialog = true },
-                    enabled = status != DownloadPhase.COMPLETE && status != DownloadPhase.CANCELLED,
-                ) {
-                    Icon(
-                        Icons.Outlined.Close,
-                        contentDescription = stringResource(R.string.downloads_queue_cancel_download),
-                        tint =
-                            if (status != DownloadPhase.COMPLETE &&
-                                status != DownloadPhase.CANCELLED
-                            ) {
-                                Color(0xFFFF6B6B)
-                            } else {
-                                TextSecondary
-                            },
-                    )
-                }
-                if (ControllerHelper.isControllerConnected()) {
-                    Spacer(Modifier.width(8.dp))
-                    ControllerBadge(if (ControllerHelper.isPlayStationController()) "\u2715" else "A")
-                }
-            }
-        }
-
-        if (showDeleteDialog) {
-            val gameName =
-                if (id.startsWith("STEAM_")) {
-                    steamApp?.name
-                } else if (id.startsWith("EPIC_")) {
-                    epicGame?.title
-                } else if (id.startsWith("GOG_")) {
-                    gogGame?.title
-                } else {
-                    null
-                }
-            AlertDialog(
-                onDismissRequest = { showDeleteDialog = false },
-                containerColor = SurfaceDark,
-                title = { Text(stringResource(R.string.downloads_queue_cancel_download), color = TextPrimary) },
-                text = {
-                    Text(
-                        stringResource(
-                            R.string.downloads_queue_cancel_download_confirm,
-                            gameName ?: stringResource(R.string.downloads_queue_this_game),
-                        ),
-                        color = TextSecondary,
-                    )
-                },
-                confirmButton = {
-                    Button(
-                        onClick = {
-                            showDeleteDialog = false
-                            DownloadService.cancelDownload(id)
-                        },
-                        colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFFF6B6B)),
-                    ) {
-                        Text(stringResource(R.string.downloads_queue_cancel_download), color = Color.White)
-                    }
-                },
-                dismissButton = {
-                    Button(
-                        onClick = { showDeleteDialog = false },
-                        colors = ButtonDefaults.buttonColors(containerColor = CardDark),
-                    ) {
-                        Text(stringResource(R.string.common_ui_cancel), color = TextPrimary)
-                    }
-                },
-            )
-        }
-    }
-
-    // Game Manager Dialog
-    @Composable
-    fun GameManagerDialog(
-        app: SteamApp,
-        onDismissRequest: () -> Unit,
-    ) {
-        val context = LocalContext.current
-        var isLoading by remember { mutableStateOf(true) }
-        var manifestSizes by remember { mutableStateOf(SteamService.ManifestSizes()) }
-        var dlcApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
-        var installed by remember(app.id) { mutableStateOf<Boolean?>(null) }
-        val selectedDlcIds = remember { mutableStateListOf<Int>() }
-        var customPath by remember { mutableStateOf<String?>(null) }
-        var showCustomPathWarning by remember { mutableStateOf(false) }
-        var showDlcDialog by remember { mutableStateOf(false) }
-        val scope = rememberCoroutineScope()
-
-        if (showCustomPathWarning) {
-            CustomPathWarningDialog(
-                onDismiss = { showCustomPathWarning = false },
-                onProceed = {
-                    showCustomPathWarning = false
-                    DirectoryPickerDialog.show(
-                        activity = this@UnifiedActivity,
-                        initialPath = customPath ?: SteamService.defaultAppInstallPath,
-                        title = getString(R.string.settings_content_install_directory),
-                    ) { path -> customPath = path }
-                },
-            )
-        }
-
-        if (showDlcDialog && dlcApps.isNotEmpty()) {
-            GameSettingsDialogFrame(
-                title = stringResource(R.string.library_games_dlcs),
-                onDismissRequest = { showDlcDialog = false },
-            ) {
-                Column(
-                    modifier =
-                        Modifier
-                            .heightIn(max = 300.dp)
-                            .verticalScroll(rememberScrollState()),
-                ) {
-                    dlcApps.forEachIndexed { index, dlc ->
-                        if (index > 0) {
-                            HorizontalDivider(
-                                color = CardBorder.copy(alpha = 0.5f),
-                                thickness = 0.5.dp,
-                                modifier = Modifier.padding(horizontal = 16.dp),
-                            )
-                        }
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .clickable(
-                                        interactionSource = remember { MutableInteractionSource() },
-                                        indication = null,
-                                    ) {
-                                        if (selectedDlcIds.contains(dlc.id)) {
-                                            selectedDlcIds.remove(dlc.id)
-                                        } else {
-                                            selectedDlcIds.add(dlc.id)
-                                        }
-                                    }.padding(horizontal = 16.dp, vertical = 2.dp),
-                        ) {
-                            Checkbox(
-                                checked = selectedDlcIds.contains(dlc.id),
-                                onCheckedChange = { if (it) selectedDlcIds.add(dlc.id) else selectedDlcIds.remove(dlc.id) },
-                                colors =
-                                    CheckboxDefaults.colors(
-                                        checkedColor = Accent,
-                                        uncheckedColor = TextSecondary,
-                                        checkmarkColor = Color.White,
-                                    ),
-                            )
-                            Text(dlc.name, color = TextPrimary, fontSize = 13.sp)
-                        }
-                    }
-                }
-            }
-        }
-
-        val selectedDlcIdsKey = selectedDlcIds.toList().sorted().joinToString(",")
-
-        LaunchedEffect(app.id) {
-            val (downloadableDlcApps, sizes, isInstalled) =
-                withContext(Dispatchers.IO) {
-                    Triple(
-                        db.steamAppDao().findDownloadableDLCApps(app.id) ?: emptyList(),
-                        SteamService.getSelectedManifestSizes(app.id),
-                        SteamService.isAppInstalled(app.id),
-                    )
-                }
-            dlcApps = downloadableDlcApps
-            manifestSizes = sizes
-            installed = isInstalled
-            isLoading = false
-        }
-
-        LaunchedEffect(app.id, selectedDlcIdsKey) {
-            if (isLoading) return@LaunchedEffect
-            manifestSizes =
-                withContext(Dispatchers.IO) {
-                    SteamService.getSelectedManifestSizes(app.id, selectedDlcIds.toList())
-                }
-        }
-
-        val totalInstallSize = manifestSizes.installSize
-        val totalDownloadSize = manifestSizes.downloadSize
-        val defaultPathSet =
-            if (PrefManager.useSingleDownloadFolder) {
-                PrefManager.defaultDownloadFolder.isNotEmpty()
-            } else {
-                PrefManager.steamDownloadFolder
-                    .isNotEmpty()
-            }
-        val effectivePath = customPath ?: SteamService.defaultAppInstallPath
-        val availableBytes =
-            try {
-                StorageUtils.getAvailableSpace(effectivePath)
-            } catch (e: Exception) {
-                0L
-            }
-        val isInstallEnabled = availableBytes >= totalInstallSize
-        val installPathDisplay = customPath ?: SteamService.defaultAppInstallPath
-
-        StoreInstallDialogShell(
-            title = app.name,
-            heroImageUrl = app.getHeroUrl(),
-            subtitle =
-                listOfNotNull(
-                    app.developer.takeIf { it.isNotBlank() },
-                    app.publisher.takeIf { it.isNotBlank() },
-                ).joinToString(" • "),
-            sourceLabel = "Steam",
-            onDismissRequest = onDismissRequest,
-            infoContent = {
-                if (isLoading) {
-                    Spacer(Modifier.height(18.dp))
-                    CircularProgressIndicator(color = Accent)
-                } else {
-                    DetailCard(
-                        label = stringResource(R.string.library_games_install_path),
-                        value = installPathDisplay,
-                    )
-                    DetailCard(
-                        stringResource(R.string.library_games_download_slash_install),
-                        stringResource(
-                            R.string.library_games_download_install_available,
-                            StorageUtils.formatBinarySize(totalDownloadSize),
-                            StorageUtils.formatBinarySize(totalInstallSize),
-                            StorageUtils.formatBinarySize(availableBytes),
-                        ),
-                        valueColor = if (!isInstallEnabled) DangerRed else null,
-                    )
-                }
-            },
-        ) {
-            if (installed == false) {
-                InstallButton(
-                    loading = isLoading,
-                    onClick = {
-                        scope.launch(Dispatchers.IO) {
-                            SteamService.downloadApp(app.id, selectedDlcIds.toList(), false, customPath)
-                            withContext(Dispatchers.Main) { onDismissRequest() }
-                        }
-                    },
-                )
-            }
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(6.dp),
-            ) {
-                CompactActionButton(
-                    icon = Icons.Outlined.Folder,
-                    label =
-                        if (customPath !=
-                            null
-                        ) {
-                            stringResource(R.string.common_ui_custom)
-                        } else if (defaultPathSet) {
-                            stringResource(R.string.common_ui_already_set)
-                        } else {
-                            stringResource(R.string.common_ui_custom)
-                        },
-                    modifier = Modifier.weight(1f),
-                    onClick = {
-                        if (customPath == null && defaultPathSet) {
-                            showCustomPathWarning = true
-                        } else {
-                            DirectoryPickerDialog.show(
-                                activity = this@UnifiedActivity,
-                                initialPath = customPath ?: SteamService.defaultAppInstallPath,
-                                title = getString(R.string.settings_content_install_directory),
-                            ) { path -> customPath = path }
-                        }
-                    },
-                )
-                if (dlcApps.isNotEmpty()) {
-                    CompactActionButton(
-                        icon = Icons.Outlined.Extension,
-                        label = stringResource(R.string.library_games_dlcs),
-                        modifier = Modifier.weight(1f),
-                        onClick = { showDlcDialog = true },
-                    )
-                }
-            }
-        }
-    }
-
-    private fun findLibraryShortcutForGame(
-        containerManager: ContainerManager,
-        app: SteamApp,
-        isCustom: Boolean,
-        isEpic: Boolean,
-        epicId: Int,
-    ): Shortcut? = findShortcutForGame(containerManager.loadShortcuts(), app, isCustom, isEpic, epicId)
-
-    private fun findShortcutForGame(
-        shortcuts: List<Shortcut>,
-        app: SteamApp,
-        isCustom: Boolean,
-        isEpic: Boolean,
-        epicId: Int,
-    ): Shortcut? =
-        when {
-            isEpic -> {
-                shortcuts.find {
-                    it.getExtra("game_source") == "EPIC" && it.getExtra("app_id") == epicId.toString()
-                }
-            }
-
-            else -> {
-                shortcuts.find {
-                    it.getExtra("app_id") == app.id.toString() || it.getExtra("custom_name") == app.name || it.name == app.name
-                }
-            }
-        }
-
-    private fun isShortcutCloudSyncEnabled(shortcut: Shortcut?): Boolean =
-        shortcut == null || shortcut.getExtra("cloud_sync_disabled", "0") != "1"
-
-    private fun setShortcutCloudSyncEnabled(
-        shortcut: Shortcut?,
-        enabled: Boolean,
-    ) {
-        if (shortcut == null) return
-        shortcut.putExtra("cloud_sync_disabled", if (enabled) null else "1")
-        if (enabled) {
-            shortcut.putExtra("cloud_force_download", null)
-        }
-        shortcut.saveData()
-    }
-
-    private fun isShortcutOfflineMode(shortcut: Shortcut?): Boolean =
-        shortcut != null && shortcut.getExtra("offline_mode", "0") == "1"
-
-    private fun setShortcutOfflineMode(
-        shortcut: Shortcut?,
-        enabled: Boolean,
-    ) {
-        if (shortcut == null) return
-        shortcut.putExtra("offline_mode", if (enabled) "1" else null)
-        shortcut.saveData()
-    }
-
-    @Composable
-    private fun CloudSavesContent(
-        isWorking: Boolean,
-        cloudSyncEnabled: Boolean,
-        offlineModeEnabled: Boolean,
-        gameSource: GameSaveBackupManager.GameSource,
-        gameId: String,
-        gameName: String,
-        shortcut: Shortcut?,
-        onCloudSyncToggle: (Boolean) -> Unit,
-        onOfflineModeToggle: (Boolean) -> Unit,
-        onBackup: () -> Unit,
-        onRestore: () -> Unit,
-        onSyncFromCloud: () -> Unit,
-        onBack: () -> Unit,
-    ) {
-        val scope = rememberCoroutineScope()
-        val context = LocalContext.current
-        var historyRefreshKey by remember { mutableStateOf(0) }
-        var historyLoading by remember { mutableStateOf(true) }
-        var historyEntries by remember { mutableStateOf<List<GameSaveBackupManager.BackupHistoryEntry>>(emptyList()) }
-        var entryPendingRestore by remember {
-            mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
-        }
-        var entryPendingRename by remember {
-            mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
-        }
-        var entryPendingDelete by remember {
-            mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
-        }
-
-        LaunchedEffect(gameSource, gameId, historyRefreshKey) {
-            historyLoading = true
-            historyEntries =
-                GameSaveBackupManager.listBackupHistory(
-                    this@UnifiedActivity,
-                    gameSource,
-                    gameId,
-                    gameName,
-                )
-            historyLoading = false
-        }
-
-        // Auto-refresh the history list whenever a backup/restore finishes.
-        var wasWorking by remember { mutableStateOf(false) }
-        LaunchedEffect(isWorking) {
-            if (wasWorking && !isWorking) historyRefreshKey++
-            wasWorking = isWorking
-        }
-
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp, vertical = 20.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            Text(
-                stringResource(R.string.cloud_saves_title),
-                style = MaterialTheme.typography.labelMedium,
-                color = TextSecondary,
-                fontWeight = FontWeight.Bold,
-                letterSpacing = 1.1.sp,
-            )
-
-            TogglePairCard(
-                cloudSyncEnabled = cloudSyncEnabled,
-                offlineModeEnabled = offlineModeEnabled,
-                onCloudSyncToggle = onCloudSyncToggle,
-                onOfflineModeToggle = onOfflineModeToggle,
-            )
-
-            if (isWorking) {
-                LinearProgressIndicator(
-                    modifier = Modifier.fillMaxWidth(),
-                    color = Accent,
-                    trackColor = CardBorder,
-                )
-            }
-
-            val providerLabel =
-                when (gameSource) {
-                    GameSaveBackupManager.GameSource.STEAM -> stringResource(R.string.preloader_platform_steam)
-                    GameSaveBackupManager.GameSource.EPIC -> stringResource(R.string.preloader_platform_epic)
-                    GameSaveBackupManager.GameSource.GOG -> stringResource(R.string.preloader_platform_gog)
-                }
-
-            ActionWithHelper(
-                icon = Icons.Outlined.CloudSync,
-                label = stringResource(R.string.cloud_saves_sync_from_provider, providerLabel),
-                helper = stringResource(R.string.cloud_saves_sync_summary, providerLabel),
-                onClick = { if (!isWorking) onSyncFromCloud() },
-            )
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                ActionWithHelper(
-                    icon = Icons.Outlined.CloudUpload,
-                    label = stringResource(R.string.cloud_saves_backup),
-                    helper = stringResource(R.string.cloud_saves_backup_summary),
-                    modifier = Modifier.weight(1f),
-                    onClick = onBackup,
-                )
-                ActionWithHelper(
-                    icon = Icons.Outlined.CloudDownload,
-                    label = stringResource(R.string.cloud_saves_restore),
-                    helper = stringResource(R.string.cloud_saves_restore_summary),
-                    modifier = Modifier.weight(1f),
-                    onClick = onRestore,
-                )
-            }
-
-            SaveHistorySection(
-                loading = historyLoading,
-                entries = historyEntries,
-                onRefresh = { historyRefreshKey++ },
-                onRestore = { entry -> entryPendingRestore = entry },
-                onRename = { entry -> entryPendingRename = entry },
-                onDelete = { entry -> entryPendingDelete = entry },
-            )
-
-            Spacer(Modifier.height(4.dp))
-            TextButton(onClick = onBack) {
-                Icon(
-                    Icons.AutoMirrored.Outlined.ArrowBack,
-                    contentDescription = null,
-                    tint = TextSecondary,
-                    modifier = Modifier.size(18.dp),
-                )
-                Spacer(Modifier.width(6.dp))
-                Text(stringResource(R.string.common_ui_back), color = TextSecondary)
-            }
-        }
-
-        entryPendingRestore?.let { entry ->
-            val whenLabel =
-                remember(entry.timestampMs) {
-                    android.text.format.DateUtils
-                        .getRelativeTimeSpanString(
-                            entry.timestampMs,
-                            System.currentTimeMillis(),
-                            android.text.format.DateUtils.MINUTE_IN_MILLIS,
-                        ).toString()
-                }
-            AlertDialog(
-                onDismissRequest = { entryPendingRestore = null },
-                title = {
-                    Text(
-                        stringResource(R.string.cloud_saves_history_restore_confirm_title),
-                        color = TextPrimary,
-                    )
-                },
-                text = {
-                    Text(
-                        stringResource(R.string.cloud_saves_history_restore_confirm_body, whenLabel),
-                        color = TextSecondary,
-                    )
-                },
-                confirmButton = {
-                    TextButton(onClick = {
-                        val target = entryPendingRestore ?: return@TextButton
-                        entryPendingRestore = null
-                        scope.launch {
-                            val result =
-                                GameSaveBackupManager.restoreFromHistoryEntry(
-                                    this@UnifiedActivity,
-                                    gameSource,
-                                    gameId,
-                                    target,
-                                )
-                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                context,
-                                if (result.success) {
-                                    context.getString(R.string.cloud_saves_history_restore_success)
-                                } else {
-                                    context.getString(R.string.cloud_saves_history_restore_failed)
-                                },
-                                android.widget.Toast.LENGTH_SHORT,
-                            )
-                            historyRefreshKey++
-                        }
-                    }) { Text(stringResource(R.string.cloud_saves_history_restore), color = Accent) }
-                },
-                dismissButton = {
-                    TextButton(onClick = { entryPendingRestore = null }) {
-                        Text(stringResource(R.string.common_ui_cancel), color = TextSecondary)
-                    }
-                },
-                containerColor = SurfaceDark,
-            )
-        }
-
-        entryPendingRename?.let { entry ->
-            var labelInput by remember(entry.fileId) { mutableStateOf(entry.label.orEmpty()) }
-            AlertDialog(
-                onDismissRequest = { entryPendingRename = null },
-                title = {
-                    Text(
-                        stringResource(R.string.cloud_saves_history_rename_title),
-                        color = TextPrimary,
-                    )
-                },
-                text = {
-                    OutlinedTextField(
-                        value = labelInput,
-                        onValueChange = { v ->
-                            labelInput = v.take(GameSaveBackupManager.MAX_HISTORY_LABEL_LENGTH)
-                        },
-                        singleLine = true,
-                        placeholder = {
-                            Text(
-                                stringResource(R.string.cloud_saves_history_rename_hint),
-                                color = TextSecondary,
-                            )
-                        },
-                        textStyle = MaterialTheme.typography.bodyMedium.copy(color = TextPrimary),
-                        colors =
-                            OutlinedTextFieldDefaults.colors(
-                                focusedBorderColor = Accent,
-                                unfocusedBorderColor = CardBorder,
-                                focusedTextColor = TextPrimary,
-                                unfocusedTextColor = TextPrimary,
-                                cursorColor = Accent,
-                            ),
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-                },
-                confirmButton = {
-                    TextButton(onClick = {
-                        val target = entryPendingRename ?: return@TextButton
-                        val newLabel = labelInput
-                        entryPendingRename = null
-                        scope.launch {
-                            val result =
-                                GameSaveBackupManager.renameBackupHistoryEntry(
-                                    this@UnifiedActivity,
-                                    target,
-                                    newLabel,
-                                )
-                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                context,
-                                if (result.success) {
-                                    context.getString(R.string.cloud_saves_history_rename_success)
-                                } else {
-                                    context.getString(R.string.cloud_saves_history_rename_failed)
-                                },
-                                android.widget.Toast.LENGTH_SHORT,
-                            )
-                            historyRefreshKey++
-                        }
-                    }) {
-                        Text(stringResource(R.string.cloud_saves_history_rename_save), color = Accent)
-                    }
-                },
-                dismissButton = {
-                    Row {
-                        if (!entry.label.isNullOrBlank()) {
-                            TextButton(onClick = {
-                                val target = entryPendingRename ?: return@TextButton
-                                entryPendingRename = null
-                                scope.launch {
-                                    GameSaveBackupManager.renameBackupHistoryEntry(
-                                        this@UnifiedActivity,
-                                        target,
-                                        null,
-                                    )
-                                    historyRefreshKey++
-                                }
-                            }) {
-                                Text(stringResource(R.string.cloud_saves_history_rename_clear), color = TextSecondary)
-                            }
-                        }
-                        TextButton(onClick = { entryPendingRename = null }) {
-                            Text(stringResource(R.string.common_ui_cancel), color = TextSecondary)
-                        }
-                    }
-                },
-                containerColor = SurfaceDark,
-            )
-        }
-
-        entryPendingDelete?.let { entry ->
-            AlertDialog(
-                onDismissRequest = { entryPendingDelete = null },
-                title = {
-                    Text(
-                        stringResource(R.string.cloud_saves_history_delete_confirm_title),
-                        color = TextPrimary,
-                    )
-                },
-                text = {
-                    Text(
-                        stringResource(R.string.cloud_saves_history_delete_confirm_body),
-                        color = TextSecondary,
-                    )
-                },
-                confirmButton = {
-                    TextButton(onClick = {
-                        val target = entryPendingDelete ?: return@TextButton
-                        entryPendingDelete = null
-                        scope.launch {
-                            val result =
-                                GameSaveBackupManager.deleteBackupHistoryEntry(
-                                    this@UnifiedActivity,
-                                    target,
-                                )
-                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                context,
-                                if (result.success) {
-                                    context.getString(R.string.cloud_saves_history_delete_success)
-                                } else {
-                                    context.getString(R.string.cloud_saves_history_delete_failed)
-                                },
-                                android.widget.Toast.LENGTH_SHORT,
-                            )
-                            historyRefreshKey++
-                        }
-                    }) { Text(stringResource(R.string.cloud_saves_history_delete), color = DangerRed) }
-                },
-                dismissButton = {
-                    TextButton(onClick = { entryPendingDelete = null }) {
-                        Text(stringResource(R.string.common_ui_cancel), color = TextSecondary)
-                    }
-                },
-                containerColor = SurfaceDark,
-            )
-        }
-    }
-
-    @Composable
-    private fun SaveHistorySection(
-        loading: Boolean,
-        entries: List<GameSaveBackupManager.BackupHistoryEntry>,
-        onRefresh: () -> Unit,
-        onRestore: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
-        onRename: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
-        onDelete: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth().padding(top = 4.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                stringResource(R.string.cloud_saves_history_title),
-                style = MaterialTheme.typography.labelMedium,
-                color = TextSecondary,
-                fontWeight = FontWeight.Bold,
-                letterSpacing = 1.1.sp,
-                modifier = Modifier.weight(1f),
-            )
-            IconButton(onClick = onRefresh, modifier = Modifier.size(28.dp)) {
-                Icon(
-                    Icons.Outlined.Refresh,
-                    contentDescription = stringResource(R.string.cloud_saves_history_refresh),
-                    tint = TextSecondary,
-                    modifier = Modifier.size(18.dp),
-                )
-            }
-        }
-
-        Surface(
-            shape = RoundedCornerShape(14.dp),
-            color = SurfaceDark,
-            border = BorderStroke(1.dp, CardBorder),
-            modifier = Modifier.fillMaxWidth(),
-        ) {
-            Column(modifier = Modifier.padding(vertical = 6.dp)) {
-                when {
-                    loading -> {
-                        Text(
-                            stringResource(R.string.cloud_saves_history_loading),
-                            color = TextSecondary,
-                            fontSize = 12.sp,
-                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp),
-                        )
-                    }
-
-                    entries.isEmpty() -> {
-                        Text(
-                            stringResource(R.string.cloud_saves_history_empty),
-                            color = TextSecondary,
-                            fontSize = 12.sp,
-                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp),
-                        )
-                    }
-
-                    else -> {
-                        entries.forEachIndexed { index, entry ->
-                            SaveHistoryRow(
-                                entry = entry,
-                                onRestore = { onRestore(entry) },
-                                onRename = { onRename(entry) },
-                                onDelete = { onDelete(entry) },
-                            )
-                            if (index < entries.lastIndex) {
-                                androidx.compose.material3.HorizontalDivider(
-                                    color = CardBorder,
-                                    modifier = Modifier.padding(horizontal = 12.dp),
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun SaveHistoryRow(
-        entry: GameSaveBackupManager.BackupHistoryEntry,
-        onRestore: () -> Unit,
-        onRename: () -> Unit,
-        onDelete: () -> Unit,
-    ) {
-        val whenLabel =
-            remember(entry.timestampMs) {
-                android.text.format.DateUtils
-                    .getRelativeTimeSpanString(
-                        entry.timestampMs,
-                        System.currentTimeMillis(),
-                        android.text.format.DateUtils.MINUTE_IN_MILLIS,
-                    ).toString()
-            }
-        val originLabel =
-            when (entry.origin) {
-                GameSaveBackupManager.BackupOrigin.LOCAL -> stringResource(R.string.cloud_saves_history_origin_local)
-                GameSaveBackupManager.BackupOrigin.CLOUD -> stringResource(R.string.cloud_saves_history_origin_cloud)
-                GameSaveBackupManager.BackupOrigin.MANUAL -> stringResource(R.string.cloud_saves_history_origin_manual)
-                GameSaveBackupManager.BackupOrigin.AUTO -> stringResource(R.string.cloud_saves_history_origin_auto)
-            }
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 12.dp, vertical = 10.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Icon(
-                Icons.Outlined.History,
-                contentDescription = null,
-                tint = TextSecondary,
-                modifier = Modifier.size(18.dp),
-            )
-            Spacer(Modifier.width(10.dp))
-            Column(modifier = Modifier.weight(1f)) {
-                val title = entry.label?.takeIf { it.isNotBlank() } ?: whenLabel
-                Text(
-                    text = title,
-                    color = TextPrimary,
-                    fontSize = 13.sp,
-                    fontWeight = FontWeight.Medium,
-                )
-                Spacer(Modifier.height(2.dp))
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .clip(RoundedCornerShape(999.dp))
-                                .background(CardBorder)
-                                .padding(horizontal = 8.dp, vertical = 2.dp),
-                    ) {
-                        Text(originLabel, color = TextSecondary, fontSize = 10.sp, fontWeight = FontWeight.SemiBold)
-                    }
-                    Spacer(Modifier.width(6.dp))
-                    Text(
-                        text = formatBytes(entry.sizeBytes),
-                        color = TextSecondary,
-                        fontSize = 11.sp,
-                    )
-                    if (!entry.label.isNullOrBlank()) {
-                        Spacer(Modifier.width(6.dp))
-                        Text(
-                            text = "\u2022 $whenLabel",
-                            color = TextSecondary,
-                            fontSize = 11.sp,
-                        )
-                    }
-                }
-            }
-            TextButton(
-                onClick = onRename,
-                contentPadding = PaddingValues(horizontal = 8.dp, vertical = 2.dp),
-            ) {
-                Text(stringResource(R.string.cloud_saves_history_rename), color = TextSecondary, fontSize = 12.sp)
-            }
-            TextButton(
-                onClick = onDelete,
-                contentPadding = PaddingValues(horizontal = 8.dp, vertical = 2.dp),
-            ) {
-                Text(stringResource(R.string.cloud_saves_history_delete), color = DangerRed, fontSize = 12.sp)
-            }
-            TextButton(
-                onClick = onRestore,
-                contentPadding = PaddingValues(horizontal = 8.dp, vertical = 2.dp),
-            ) {
-                Text(stringResource(R.string.cloud_saves_history_restore), color = Accent, fontSize = 12.sp)
-            }
-        }
-    }
-
-    private fun formatBytes(bytes: Long): String =
-        when {
-            bytes <= 0 -> "0 B"
-            bytes < 1024 -> "$bytes B"
-            bytes < 1024 * 1024 -> "%.1f KB".format(bytes / 1024.0)
-            bytes < 1024L * 1024 * 1024 -> "%.1f MB".format(bytes / (1024.0 * 1024.0))
-            else -> "%.2f GB".format(bytes / (1024.0 * 1024.0 * 1024.0))
-        }
-
-    @Composable
-    private fun TogglePairCard(
-        cloudSyncEnabled: Boolean,
-        offlineModeEnabled: Boolean,
-        onCloudSyncToggle: (Boolean) -> Unit,
-        onOfflineModeToggle: (Boolean) -> Unit,
-    ) {
-        BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
-            val stacked = maxWidth < 380.dp
-            val cloudSyncCell: @Composable (Modifier) -> Unit = { mod ->
-                TogglePaneCell(
-                    modifier = mod,
-                    title = stringResource(R.string.cloud_sync_title),
-                    summary =
-                        if (cloudSyncEnabled) {
-                            stringResource(R.string.cloud_sync_enabled_summary)
-                        } else {
-                            stringResource(R.string.cloud_sync_disabled_summary)
-                        },
-                    checked = cloudSyncEnabled && !offlineModeEnabled,
-                    enabled = !offlineModeEnabled,
-                    onCheckedChange = onCloudSyncToggle,
-                )
-            }
-            val offlineCell: @Composable (Modifier) -> Unit = { mod ->
-                TogglePaneCell(
-                    modifier = mod,
-                    title = stringResource(R.string.cloud_saves_offline_mode),
-                    summary = stringResource(R.string.cloud_saves_offline_mode_summary),
-                    checked = offlineModeEnabled,
-                    enabled = true,
-                    onCheckedChange = onOfflineModeToggle,
-                )
-            }
-            if (stacked) {
-                Column(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalArrangement = Arrangement.spacedBy(10.dp),
-                ) {
-                    cloudSyncCell(Modifier.fillMaxWidth())
-                    offlineCell(Modifier.fillMaxWidth())
-                }
-            } else {
-                Row(
-                    modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
-                    horizontalArrangement = Arrangement.spacedBy(10.dp),
-                ) {
-                    cloudSyncCell(Modifier.weight(1f).fillMaxHeight())
-                    offlineCell(Modifier.weight(1f).fillMaxHeight())
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun TogglePaneCell(
-        modifier: Modifier = Modifier,
-        title: String,
-        summary: String,
-        checked: Boolean,
-        enabled: Boolean,
-        onCheckedChange: (Boolean) -> Unit,
-    ) {
-        Column(
-            modifier =
-                modifier
-                    .clip(RoundedCornerShape(14.dp))
-                    .background(SurfaceDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(14.dp))
-                    .padding(horizontal = 12.dp, vertical = 10.dp),
-            verticalArrangement = Arrangement.spacedBy(6.dp),
-        ) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Text(
-                    title,
-                    style = MaterialTheme.typography.titleSmall,
-                    color = if (enabled) TextPrimary else TextSecondary,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.weight(1f),
-                )
-                Switch(
-                    checked = checked,
-                    onCheckedChange = if (enabled) onCheckedChange else { _ -> },
-                    enabled = enabled,
-                    colors =
-                        outlinedSwitchColors(
-                            accentColor = Accent,
-                            textSecondaryColor = TextSecondary,
-                            checkedThumbColor = TextPrimary,
-                        ),
-                )
-            }
-            Text(
-                summary,
-                style = MaterialTheme.typography.bodySmall,
-                color = TextSecondary,
-                lineHeight = 14.sp,
-            )
-        }
-    }
-
-    @Composable
-    private fun ActionWithHelper(
-        icon: ImageVector,
-        label: String,
-        helper: String,
-        modifier: Modifier = Modifier.fillMaxWidth(),
-        onClick: () -> Unit,
-    ) {
-        Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(2.dp)) {
-            CompactActionButton(
-                icon = icon,
-                label = label,
-                modifier = Modifier.fillMaxWidth(),
-                onClick = onClick,
-            )
-            Text(
-                helper,
-                style = MaterialTheme.typography.bodySmall,
-                color = TextSecondary,
-                fontSize = 11.sp,
-                modifier = Modifier.padding(start = 10.dp),
-            )
-        }
-    }
-
-    private fun resolveLibraryShortcutArtworkModel(
-        context: android.content.Context,
-        app: SteamApp,
-        isCustom: Boolean,
-        isEpic: Boolean,
-        epicArtworkUrl: String?,
-    ): Any? =
-        when {
-            isCustom -> {
-                val safeName = app.name.replace("/", "_").replace("\\", "_")
-                val iconFile = java.io.File(context.filesDir, "custom_icons/$safeName.png")
-                if (iconFile.exists()) iconFile else null
-            }
-
-            isEpic -> {
-                epicArtworkUrl?.takeIf { it.isNotBlank() }
-            }
-
-            else -> {
-                app.getCapsuleUrl()
-            }
-        }
-
-    private suspend fun loadArtworkBitmap(
-        context: android.content.Context,
-        artworkModel: Any?,
-    ): Bitmap? {
-        if (artworkModel == null) return null
-        return try {
-            val request =
-                ImageRequest
-                    .Builder(context)
-                    .data(artworkModel)
-                    .allowHardware(false)
-                    .size(192, 192)
-                    .build()
-            val result = context.imageLoader.execute(request)
-            val drawable = result.drawable ?: return null
-            if (drawable is BitmapDrawable) {
-                drawable.bitmap
-            } else {
-                val width = if (drawable.intrinsicWidth > 0) drawable.intrinsicWidth else 192
-                val height = if (drawable.intrinsicHeight > 0) drawable.intrinsicHeight else 192
-                val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-                val canvas = Canvas(bitmap)
-                drawable.setBounds(0, 0, width, height)
-                drawable.draw(canvas)
-                bitmap
-            }
-        } catch (_: Exception) {
-            null
-        }
-    }
-
-    private suspend fun requestPinnedHomeShortcut(
-        context: android.content.Context,
-        shortcut: Shortcut,
-        artworkModel: Any? = null,
-    ): Boolean {
-        if (shortcut.getExtra("uuid").isEmpty()) {
-            shortcut.genUUID()
-        }
-        val shortcutId = shortcut.getExtra("uuid")
-        if (shortcutId.isEmpty()) return false
-        val canonicalShortcutPath = shortcut.file.absolutePath
-        val shortcutPathHash = canonicalShortcutPath.hashCode()
-        val containerIdForLaunch = shortcut.getExtra("container_id").toIntOrNull() ?: shortcut.container.id
-        val pinShortcutId = "shortcut_${shortcut.container.id}_${shortcutId}_${shortcutPathHash.toUInt().toString(16)}"
-
-        val shortcutManager = context.getSystemService(android.content.pm.ShortcutManager::class.java) ?: return false
-        if (!shortcutManager.isRequestPinShortcutSupported) return false
-
-        val launchIntent =
-            Intent(context, XServerDisplayActivity::class.java).apply {
-                val launchData =
-                    Uri
-                        .Builder()
-                        .scheme("winnative")
-                        .authority(BuildConfig.APPLICATION_ID)
-                        .appendPath("shortcut")
-                        .appendQueryParameter("uuid", shortcutId)
-                        .appendQueryParameter("container", containerIdForLaunch.toString())
-                        .appendQueryParameter("hash", shortcutPathHash.toString())
-                        .build()
-                action = Intent.ACTION_VIEW
-                data = launchData
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                putExtra("container_id", containerIdForLaunch)
-                putExtra("shortcut_path", canonicalShortcutPath)
-                putExtra("shortcut_name", shortcut.name)
-                putExtra("shortcut_uuid", shortcutId)
-                putExtra("shortcut_path_hash", shortcutPathHash)
-                putExtra(XServerDisplayActivity.EXTRA_LAUNCHED_FROM_PINNED_SHORTCUT, true)
-            }
-
-        val customIconPath =
-            shortcut
-                .getExtra("customLibraryIconPath")
-                .ifBlank { shortcut.getExtra("customCoverArtPath") }
-        val customArtworkModel =
-            customIconPath
-                .takeIf { it.isNotBlank() }
-                ?.let { java.io.File(it) }
-                ?.takeIf { it.exists() }
-
-        val artworkBitmap = loadArtworkBitmap(context, customArtworkModel) ?: loadArtworkBitmap(context, artworkModel)
-        val shortcutIcon =
-            artworkBitmap?.let {
-                android.graphics.drawable.Icon
-                    .createWithBitmap(it)
-            }
-                ?: shortcut.icon?.let {
-                    android.graphics.drawable.Icon
-                        .createWithBitmap(it)
-                }
-                ?: android.graphics.drawable.Icon
-                    .createWithResource(context, R.drawable.icon_shortcut)
-
-        val pinShortcutInfo =
-            android.content.pm.ShortcutInfo
-                .Builder(context, pinShortcutId)
-                .setShortLabel(shortcut.name)
-                .setLongLabel(shortcut.name)
-                .setIcon(shortcutIcon)
-                .setIntent(launchIntent)
-                .build()
-
-        val callbackIntent =
-            Intent(context, ShortcutBroadcastReceiver::class.java).apply {
-                action = ShortcutBroadcastReceiver.ACTION_PIN_SHORTCUT_RESULT
-                putExtra("shortcut_path", canonicalShortcutPath)
-                putExtra("shortcut_name", shortcut.name)
-            }
-        val callbackFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        val callback =
-            PendingIntent.getBroadcast(
-                context,
-                pinShortcutId.hashCode(),
-                callbackIntent,
-                callbackFlags,
-            )
-
-        val result =
-            ShortcutsFragment.pinOrUpdateShortcut(
-                shortcutManager,
-                pinShortcutInfo,
-                ShortcutsFragment.buildPinnedShortcutIds(containerIdForLaunch, shortcutId, canonicalShortcutPath),
-                callback.intentSender,
-            )
-        if (result == ShortcutsFragment.PinShortcutResult.REUSED_EXISTING) {
-            val toastIcon = artworkBitmap ?: shortcut.icon
-            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                context,
-                R.string.shortcuts_list_readded_existing,
-                toastIcon,
-            )
-        }
-        return result != ShortcutsFragment.PinShortcutResult.FAILED
-    }
-
-    private suspend fun addLibraryShortcutToHomeScreen(
-        context: android.content.Context,
-        app: SteamApp,
-        isCustom: Boolean,
-        isEpic: Boolean,
-        epicId: Int,
-        epicArtworkUrl: String? = null,
-    ): Boolean {
-        val containerManager = ContainerManager(context)
-        val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId) ?: return false
-        val artworkModel = resolveLibraryShortcutArtworkModel(context, app, isCustom, isEpic, epicArtworkUrl)
-        return requestPinnedHomeShortcut(context, shortcut, artworkModel)
-    }
-
-    private suspend fun addGogShortcutToHomeScreen(
-        context: android.content.Context,
-        app: GOGGame,
-        artworkUrl: String?,
-    ): Boolean {
-        val shortcut =
-            ContainerManager(context).loadShortcuts().find {
-                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
-            } ?: return false
-        val artworkModel = artworkUrl?.takeIf { it.isNotBlank() }
-        return requestPinnedHomeShortcut(context, shortcut, artworkModel)
-    }
-
-    // Game launch with drive-aware mapping
-    private fun launchSteamGame(
-        context: android.content.Context,
-        containerManager: ContainerManager,
-        app: SteamApp,
-    ) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val gameInstallPath = SteamService.getAppDirPath(app.id)
-            val gameDir = java.io.File(gameInstallPath)
-            if (!gameDir.exists()) {
-                withContext(Dispatchers.Main) {
-                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                        context,
-                        "Game not installed: ${app.name}",
-                        android.widget.Toast.LENGTH_SHORT,
-                    )
-                }
-                return@launch
-            }
-
-            val shortcut =
-                containerManager.loadShortcuts().find {
-                    it.getExtra("game_source") == "STEAM" && it.getExtra("app_id") == app.id.toString()
-                }
-            val detectedLaunchExecutable = SteamService.getInstalledExe(app.id)
-
-            if (shortcut != null) {
-                if (!SetupWizardActivity.isContainerUsable(context, shortcut.container)) {
-                    withContext(Dispatchers.Main) {
-                        SetupWizardActivity.promptToInstallWineOrCreateContainer(
-                            context,
-                            shortcut.container.wineVersion,
-                        )
-                    }
-                    return@launch
-                }
-                normalizeContainerDrives(shortcut.container)
-                shortcut.putExtra("game_source", "STEAM")
-                shortcut.putExtra("game_install_path", gameInstallPath)
-                val existingLaunchExecutable = shortcut.getExtra("launch_exe_path")
-                if (existingLaunchExecutable.isNullOrBlank() && detectedLaunchExecutable.isNotBlank()) {
-                    shortcut.putExtra("launch_exe_path", detectedLaunchExecutable)
-                }
-                val loaderExec = "wine \"C:\\\\Program Files (x86)\\\\Steam\\\\steamclient_loader_x64.exe\""
-                val lines =
-                    com.winlator.cmod.shared.io.FileUtils
-                        .readLines(shortcut.file)
-                val rewritten = StringBuilder()
-                var execUpdated = false
-                for (line in lines) {
-                    if (line.startsWith("Exec=")) {
-                        rewritten.append("Exec=").append(loaderExec).append("\n")
-                        execUpdated = true
-                    } else {
-                        rewritten.append(line).append("\n")
-                    }
-                }
-                if (!execUpdated) {
-                    rewritten.append("Exec=").append(loaderExec).append("\n")
-                }
-                com.winlator.cmod.shared.io.FileUtils
-                    .writeString(shortcut.file, rewritten.toString())
-                shortcut.saveData()
-                val intent = Intent(context, XServerDisplayActivity::class.java)
-                intent.putExtra("container_id", shortcut.container.id)
-                intent.putExtra("shortcut_path", shortcut.file.path)
-                intent.putExtra("shortcut_name", shortcut.name)
-                withContext(Dispatchers.Main) {
-                    launchGame(context, intent)
-                }
-            } else {
-                val container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
-
-                if (container == null) {
-                    withContext(Dispatchers.Main) {
-                        SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
-                    }
-                    return@launch
-                }
-
-                normalizeContainerDrives(container)
-
-                val execPath = "wine \"C:\\\\Program Files (x86)\\\\Steam\\\\steamclient_loader_x64.exe\""
-
-                // Generate a shortcut dynamically
-                val desktopDir = container.getDesktopDir()
-                if (!desktopDir.exists()) desktopDir.mkdirs()
-                val shortcutFile = java.io.File(desktopDir, "${app.name.replace("/", "_")}.desktop")
-                val content = java.lang.StringBuilder()
-                content.append("[Desktop Entry]\n")
-                content.append("Type=Application\n")
-                content.append("Name=${app.name}\n")
-                content.append("Exec=$execPath\n")
-                content.append("Icon=steam_icon_${app.id}\n")
-                content.append("\n[Extra Data]\n")
-                content.append("game_source=STEAM\n")
-                content.append("app_id=${app.id}\n")
-                content.append("container_id=${container.id}\n")
-                content.append("game_install_path=${gameInstallPath}\n")
-                content.append("launch_exe_path=${detectedLaunchExecutable}\n")
-                content.append("use_container_defaults=1\n")
-
-                com.winlator.cmod.shared.io.FileUtils
-                    .writeString(shortcutFile, content.toString())
-
-                container.saveData()
-
-                val intent = Intent(context, XServerDisplayActivity::class.java)
-                intent.putExtra("container_id", container.id)
-                intent.putExtra("shortcut_path", shortcutFile.path)
-                intent.putExtra("shortcut_name", app.name)
-                withContext(Dispatchers.Main) {
-                    launchGame(context, intent)
-                }
-            }
-        }
-    }
-
-    private fun launchEpicGame(
-        context: android.content.Context,
-        containerManager: ContainerManager,
-        app: EpicGame,
-    ) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val gameInstallPath = app.installPath.takeIf { it.isNotEmpty() } ?: EpicConstants.getGameInstallPath(context, app.appName)
-            val gameDir = java.io.File(gameInstallPath)
-            if (!gameDir.exists()) {
-                withContext(Dispatchers.Main) {
-                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                        context,
-                        "Game not installed: ${app.title}",
-                        android.widget.Toast.LENGTH_SHORT,
-                    )
-                }
-                return@launch
-            }
-
-            // Try to find an existing shortcut first (preserves per-game settings)
-            val existingShortcut =
-                containerManager.loadShortcuts().find {
-                    it.getExtra("game_source") == "EPIC" && it.getExtra("app_id") == app.id.toString()
-                }
-
-            if (existingShortcut != null) {
-                if (!SetupWizardActivity.isContainerUsable(context, existingShortcut.container)) {
-                    withContext(Dispatchers.Main) {
-                        SetupWizardActivity.promptToInstallWineOrCreateContainer(
-                            context,
-                            existingShortcut.container.wineVersion,
-                        )
-                    }
-                    return@launch
-                }
-                // Existing shortcut found: preserve per-game settings and update the mapped install path
-                val shortcut = existingShortcut
-                // Ensure game_install_path is always up-to-date
-                shortcut.putExtra("game_install_path", gameInstallPath)
-                normalizeContainerDrives(shortcut.container)
-
-                // Repair broken Exec line if the executable is missing or still points at a legacy placeholder mapping.
-                val currentPath = shortcut.path
-                if (currentPath == null || currentPath == "D:\\" || currentPath == "D:\\\\" ||
-                    currentPath == "A:\\" || currentPath == "A:\\\\" ||
-                    currentPath.startsWith("A:\\")
-                ) {
-                    val newExecCmd =
-                        buildStoreWineExecCommandForSelectedExe(
-                            shortcut.container,
-                            "EPIC",
-                            gameInstallPath,
-                            shortcut.getExtra("launch_exe_path"),
-                        ) ?: run {
-                            val exePath = EpicService.getInstalledExe(app.id)
-                            if (exePath.isNotEmpty()) {
-                                shortcut.putExtra("launch_exe_path", exePath)
-                                buildStoreWineExecCommand(
-                                    shortcut.container,
-                                    "EPIC",
-                                    gameInstallPath,
-                                    java.io.File(gameInstallPath, exePath.replace("\\", "/")),
-                                )
-                            } else {
-                                val exeFile = findGameExe(gameDir)
-                                if (exeFile != null) {
-                                    shortcut.putExtra("launch_exe_path", exeFile.absolutePath)
-                                    buildStoreWineExecCommand(shortcut.container, "EPIC", gameInstallPath, exeFile)
-                                } else {
-                                    null
-                                }
-                            }
-                        }
-                    if (newExecCmd != null) {
-                        // Rewrite the Exec line in the .desktop file while preserving all other content
-                        val lines =
-                            com.winlator.cmod.shared.io.FileUtils
-                                .readLines(shortcut.file)
-                        val sb = StringBuilder()
-                        for (line in lines) {
-                            if (line.startsWith("Exec=")) {
-                                sb.append("Exec=$newExecCmd\n")
-                            } else {
-                                sb.append(line).append("\n")
-                            }
-                        }
-                        com.winlator.cmod.shared.io.FileUtils
-                            .writeString(shortcut.file, sb.toString())
-                    }
-                }
-
-                shortcut.saveData()
-
-                // Provision the EOS overlay into this container. Best-effort — failures are
-                // non-fatal (games without the EOS SDK ignore it; games with the SDK still run
-                // without the in-game HUD). Tokens must be staged inside the prefix because
-                // the dosdevices map doesn't expose the app cache dir on any drive letter.
-                runCatching {
-                    EpicService.installOverlay(context, shortcut.container)
-                }.onFailure {
-                    Log.w("EPIC", "EOS overlay install failed for ${app.appName}; launching anyway", it)
-                }
-
-                val launchArgsResult =
-                    EpicGameLauncher.buildLaunchParameters(
-                        context = context,
-                        game = app,
-                        container = shortcut.container,
-                    )
-                launchArgsResult.exceptionOrNull()?.let { err ->
-                    // The launch can still proceed (offline-tolerant titles, single-player non-DRM
-                    // games), so we don't abort — but surface the failure prominently so users
-                    // know why a DRM/online title may bounce to its login screen.
-                    Log.e("EPIC", "Failed to build Epic launch parameters for ${app.appName}: ${err.message}", err)
-                    withContext(Dispatchers.Main) {
-                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                            context,
-                            "Could not refresh Epic launch token: ${err.message ?: "unknown error"}",
-                            android.widget.Toast.LENGTH_LONG,
-                        )
-                    }
-                }
-                val args = launchArgsResult.getOrNull()?.joinToString(" ") ?: ""
-
-                val intent = Intent(context, XServerDisplayActivity::class.java)
-                intent.putExtra("container_id", shortcut.container.id)
-                intent.putExtra("shortcut_path", shortcut.file.path)
-                intent.putExtra("shortcut_name", shortcut.name)
-                intent.putExtra("extra_exec_args", args) // Pass fresh tokens
-                withContext(Dispatchers.Main) {
-                    launchGame(context, intent)
-                }
-            } else {
-                // No existing shortcut — create a new one
-                val exePath = EpicService.getInstalledExe(app.id)
-                val container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
-
-                if (container == null) {
-                    withContext(Dispatchers.Main) {
-                        SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
-                    }
-                    return@launch
-                }
-
-                normalizeContainerDrives(container)
-                val execCmd =
-                    if (exePath.isNotEmpty()) {
-                        buildStoreWineExecCommand(
-                            container,
-                            "EPIC",
-                            gameInstallPath,
-                            java.io.File(gameInstallPath, exePath.replace("\\", "/")),
-                        )
-                    } else {
-                        val exeFile = findGameExe(gameDir)
-                        if (exeFile != null) {
-                            buildStoreWineExecCommand(container, "EPIC", gameInstallPath, exeFile)
-                        } else {
-                            "wine \"explorer.exe\""
-                        }
-                    }
-
-                val desktopDir = container.getDesktopDir()
-                if (!desktopDir.exists()) desktopDir.mkdirs()
-                val shortcutFile = java.io.File(desktopDir, "${app.appName}.desktop")
-                val content = java.lang.StringBuilder()
-                content.append("[Desktop Entry]\n")
-                content.append("Type=Application\n")
-                content.append("Name=${app.title}\n")
-                content.append("Exec=$execCmd\n")
-                content.append("Icon=epic_icon_${app.id}\n")
-                content.append("\n[Extra Data]\n")
-                content.append("game_source=EPIC\n")
-                content.append("app_id=${app.id}\n")
-                if (app.catalogId.isNotEmpty()) {
-                    // Persist catalog_id so EpicGameFixHelper / GameFixes can dispatch the
-                    // per-catalog registry/env/folder fixes without a DB round-trip on launch.
-                    content.append("catalog_id=${app.catalogId}\n")
-                }
-                content.append("container_id=${container.id}\n")
-                content.append("game_install_path=${gameInstallPath}\n")
-                if (exePath.isNotEmpty()) {
-                    content.append("launch_exe_path=${exePath}\n")
-                }
-                content.append("use_container_defaults=1\n")
-
-                com.winlator.cmod.shared.io.FileUtils
-                    .writeString(shortcutFile, content.toString())
-
-                container.saveData()
-
-                // Best-effort EOS overlay provisioning — see existing-shortcut branch above.
-                runCatching {
-                    EpicService.installOverlay(context, container)
-                }.onFailure {
-                    Log.w("EPIC", "EOS overlay install failed for ${app.appName}; launching anyway", it)
-                }
-
-                val launchArgsResult =
-                    EpicGameLauncher.buildLaunchParameters(
-                        context = context,
-                        game = app,
-                        container = container,
-                    )
-                launchArgsResult.exceptionOrNull()?.let { err ->
-                    Log.e("EPIC", "Failed to build Epic launch parameters for ${app.appName}: ${err.message}", err)
-                    withContext(Dispatchers.Main) {
-                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                            context,
-                            "Could not refresh Epic launch token: ${err.message ?: "unknown error"}",
-                            android.widget.Toast.LENGTH_LONG,
-                        )
-                    }
-                }
-                val args = launchArgsResult.getOrNull()?.joinToString(" ") ?: ""
-
-                val intent = Intent(context, XServerDisplayActivity::class.java)
-                intent.putExtra("container_id", container.id)
-                intent.putExtra("shortcut_path", shortcutFile.path)
-                intent.putExtra("shortcut_name", app.title)
-                intent.putExtra("extra_exec_args", args) // Pass fresh tokens
-                withContext(Dispatchers.Main) {
-                    launchGame(context, intent)
-                }
-            }
-        }
-    }
-
-    private fun launchGogGame(
-        context: android.content.Context,
-        containerManager: ContainerManager,
-        app: GOGGame,
-    ) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val gameInstallPath = app.installPath.takeIf { it.isNotEmpty() } ?: GOGConstants.getGameInstallPath(app.title)
-            val gameDir = java.io.File(gameInstallPath)
-            if (!gameDir.exists()) {
-                withContext(Dispatchers.Main) {
-                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                        context,
-                        "Game not installed: ${app.title}",
-                        android.widget.Toast.LENGTH_SHORT,
-                    )
-                }
-                return@launch
-            }
-
-            val existingShortcut =
-                containerManager.loadShortcuts().find {
-                    it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
-                }
-
-            val gogAppId = "GOG_${app.id}"
-            GOGService.syncCloudSaves(context, gogAppId)
-
-            if (existingShortcut != null) {
-                val shortcut = existingShortcut
-                if (!SetupWizardActivity.isContainerUsable(context, shortcut.container)) {
-                    withContext(Dispatchers.Main) {
-                        SetupWizardActivity.promptToInstallWineOrCreateContainer(
-                            context,
-                            shortcut.container.wineVersion,
-                        )
-                    }
-                    return@launch
-                }
-                shortcut.putExtra("game_install_path", gameInstallPath)
-                normalizeContainerDrives(shortcut.container)
-
-                // Repair broken Exec line if the executable is missing or still points at a legacy placeholder mapping.
-                val currentPath = shortcut.path
-                if (currentPath == null || currentPath == "D:\\" || currentPath == "D:\\\\" ||
-                    currentPath == "A:\\" || currentPath == "A:\\\\" ||
-                    currentPath.startsWith("A:\\")
-                ) {
-                    val newExecCmd =
-                        buildStoreWineExecCommandForSelectedExe(
-                            shortcut.container,
-                            "GOG",
-                            gameInstallPath,
-                            shortcut.getExtra("launch_exe_path"),
-                        ) ?: run {
-                            val libraryItem =
-                                LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG)
-                            val exePath = GOGService.getInstalledExe(libraryItem)
-                            if (exePath.isNotEmpty()) {
-                                shortcut.putExtra("launch_exe_path", exePath)
-                                buildStoreWineExecCommand(
-                                    shortcut.container,
-                                    "GOG",
-                                    gameInstallPath,
-                                    java.io.File(gameInstallPath, exePath.replace("\\", "/")),
-                                )
-                            } else {
-                                val exeFile = findGameExe(gameDir)
-                                if (exeFile != null) {
-                                    shortcut.putExtra("launch_exe_path", exeFile.absolutePath)
-                                    buildStoreWineExecCommand(shortcut.container, "GOG", gameInstallPath, exeFile)
-                                } else {
-                                    null
-                                }
-                            }
-                        }
-                    if (newExecCmd != null) {
-                        val lines =
-                            com.winlator.cmod.shared.io.FileUtils
-                                .readLines(shortcut.file)
-                        val sb = StringBuilder()
-                        for (line in lines) {
-                            if (line.startsWith("Exec=")) {
-                                sb.append("Exec=$newExecCmd\n")
-                            } else {
-                                sb.append(line).append("\n")
-                            }
-                        }
-                        com.winlator.cmod.shared.io.FileUtils
-                            .writeString(shortcut.file, sb.toString())
-                    }
-                }
-
-                shortcut.saveData()
-
-                val intent = Intent(context, XServerDisplayActivity::class.java)
-                intent.putExtra("container_id", shortcut.container.id)
-                intent.putExtra("shortcut_path", shortcut.file.path)
-                intent.putExtra("shortcut_name", shortcut.name)
-                withContext(Dispatchers.Main) {
-                    launchGame(context, intent)
-                }
-                return@launch
-            }
-
-            val libraryItem = LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG)
-            val exePath = GOGService.getInstalledExe(libraryItem)
-
-            val container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
-
-            if (container == null) {
-                withContext(Dispatchers.Main) {
-                    SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
-                }
-                return@launch
-            }
-
-            normalizeContainerDrives(container)
-            val execCmd =
-                if (exePath.isNotEmpty()) {
-                    buildStoreWineExecCommand(
-                        container,
-                        "GOG",
-                        gameInstallPath,
-                        java.io.File(gameInstallPath, exePath.replace("\\", "/")),
-                    )
-                } else {
-                    val exeFile = findGameExe(gameDir)
-                    if (exeFile != null) {
-                        buildStoreWineExecCommand(container, "GOG", gameInstallPath, exeFile)
-                    } else {
-                        "wine \"explorer.exe\""
-                    }
-                }
-
-            val desktopDir = container.getDesktopDir()
-            if (!desktopDir.exists()) desktopDir.mkdirs()
-            val shortcutFile = java.io.File(desktopDir, "${app.title.replace("/", "_")}.desktop")
-            val content = java.lang.StringBuilder()
-            content.append("[Desktop Entry]\n")
-            content.append("Type=Application\n")
-            content.append("Name=${app.title}\n")
-            content.append("Exec=$execCmd\n")
-            content.append("Icon=gog_icon_${app.id}\n")
-            content.append("\n[Extra Data]\n")
-            content.append("game_source=GOG\n")
-            content.append("gog_id=${app.id}\n")
-                content.append("app_id=${gogPseudoId(app.id)}\n")
-                content.append("container_id=${container.id}\n")
-                content.append("game_install_path=${gameInstallPath}\n")
-                if (exePath.isNotEmpty()) {
-                    content.append("launch_exe_path=${exePath}\n")
-                }
-                content.append("use_container_defaults=1\n")
-
-            com.winlator.cmod.shared.io.FileUtils
-                .writeString(shortcutFile, content.toString())
-            container.saveData()
-
-            val intent = Intent(context, XServerDisplayActivity::class.java)
-            intent.putExtra("container_id", container.id)
-            intent.putExtra("shortcut_path", shortcutFile.path)
-            intent.putExtra("shortcut_name", app.title)
-            withContext(Dispatchers.Main) {
-                launchGame(context, intent)
-            }
-        }
-    }
-
-    private fun normalizeContainerDrives(container: com.winlator.cmod.runtime.container.Container) {
-        container.drives =
-            com.winlator.cmod.runtime.wine.WineUtils.normalizePersistentDrives(
-                this,
-                container.drives ?: com.winlator.cmod.runtime.container.Container.DEFAULT_DRIVES,
-            )
-    }
-
-    private fun buildWineExecCommand(
-        container: com.winlator.cmod.runtime.container.Container?,
-        gameInstallPath: String,
-        relativeExePath: String,
-    ): String {
-        val exeFile = java.io.File(gameInstallPath, relativeExePath.replace("\\", "/"))
-        return buildWineExecCommand(container, gameInstallPath, exeFile)
-    }
-
-    private fun buildWineExecCommand(
-        container: com.winlator.cmod.runtime.container.Container?,
-        gameInstallPath: String,
-        exeFile: java.io.File,
-    ): String {
-        val windowsPath =
-            container?.let {
-                com.winlator.cmod.runtime.wine.WineUtils
-                    .getDriveCGameWindowsPath(
-                        it,
-                        "CUSTOM",
-                        gameInstallPath,
-                        exeFile.absolutePath,
-                    ) ?: com.winlator.cmod.runtime.wine.WineUtils
-                    .getWindowsPath(it, exeFile.absolutePath)
-            } ?: run {
-                com.winlator.cmod.runtime.wine.WineUtils.getDosPath(exeFile.absolutePath)
-            }
-        return "wine \"$windowsPath\""
-    }
-
-    private fun buildStoreWineExecCommand(
-        container: com.winlator.cmod.runtime.container.Container?,
-        source: String,
-        gameInstallPath: String,
-        exeFile: java.io.File,
-    ): String {
-        val windowsPath =
-            container?.let {
-                com.winlator.cmod.runtime.wine.WineUtils.getDriveCGameWindowsPath(
-                    it,
-                    source,
-                    gameInstallPath,
-                    exeFile.absolutePath,
-                )
-            } ?: run {
-                val relativePath =
-                    try {
-                        exeFile.relativeTo(java.io.File(gameInstallPath)).path.replace("/", "\\")
-                    } catch (_: Exception) {
-                        exeFile.name
-                    }
-                val linkName =
-                    com.winlator.cmod.runtime.wine.WineUtils.getDriveCGameLinkName(gameInstallPath)
-                "C:\\WinNative\\Games\\$source\\$linkName\\$relativePath"
-        }
-        return "wine \"$windowsPath\""
-    }
-
-    private fun buildStoreWineExecCommandForSelectedExe(
-        container: com.winlator.cmod.runtime.container.Container?,
-        source: String,
-        gameInstallPath: String,
-        selectedExePath: String?,
-    ): String? {
-        if (selectedExePath.isNullOrBlank()) return null
-
-        val selectedExe = java.io.File(selectedExePath)
-        if (!selectedExe.isFile) return null
-
-        val normalizedBaseDir =
-            java.io
-                .File(gameInstallPath)
-                .absolutePath
-                .removeSuffix("/")
-        val normalizedExePath = selectedExe.absolutePath
-        return if (normalizedExePath == normalizedBaseDir || normalizedExePath.startsWith("$normalizedBaseDir/")) {
-            buildStoreWineExecCommand(container, source, gameInstallPath, selectedExe)
-        } else {
-            val hostPath = normalizedExePath.replace("/", "\\\\").let { if (it.startsWith("\\")) it else "\\$it" }
-            "wine \"Z:${hostPath}\""
-        }
-    }
-
-    // Launch custom game by shortcut name
-    private fun launchCustomGame(
-        context: android.content.Context,
-        containerManager: ContainerManager,
-        gameName: String,
-    ) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val allShortcuts = containerManager.loadShortcuts()
-
-            // Try matching by app_id (for non-official Steam/Epic), custom_name, or filename
-            var shortcut =
-                allShortcuts.find { it.getExtra("app_id") == gameName }
-                    ?: allShortcuts.find { it.getExtra("custom_name") == gameName }
-                    ?: allShortcuts.find { it.name == gameName }
-                    ?: allShortcuts.find { it.name == gameName.replace("/", "_").replace("\\", "_") }
-
-            // If still not found, try matching by looking at the safe filename directly
-            if (shortcut == null) {
-                val safeName = gameName.replace("/", "_").replace("\\", "_")
-                for (container in containerManager.containers) {
-                    val desktopFile = java.io.File(container.getDesktopDir(), "$safeName.desktop")
-                    if (desktopFile.exists()) {
-                        shortcut =
-                            com.winlator.cmod.runtime.container
-                                .Shortcut(container, desktopFile)
-                        break
-                    }
-                }
-            }
-
-            if (shortcut == null) {
-                withContext(Dispatchers.Main) {
-                    com.winlator.cmod.shared.ui.toast.WinToast.show(
-                        context,
-                        "Custom game shortcut not found: $gameName",
-                        android.widget.Toast.LENGTH_SHORT,
-                    )
-                }
-                return@launch
-            }
-
-            // Backfill custom_name if missing (legacy shortcuts)
-            if (shortcut.getExtra("custom_name").isEmpty()) {
-                shortcut.putExtra("custom_name", gameName)
-                shortcut.saveData()
-            }
-
-            // Refresh storage-root mappings; custom game paths launch through the drive_c game symlink.
-            val gameFolder = shortcut.getExtra("custom_game_folder", "")
-            if (gameFolder.isNotEmpty()) {
-                normalizeContainerDrives(shortcut.container)
-                shortcut.container.saveData()
-            }
-            val intent = Intent(context, XServerDisplayActivity::class.java)
-            intent.putExtra("container_id", shortcut.container.id)
-            intent.putExtra("shortcut_path", shortcut.file.path)
-            intent.putExtra("shortcut_name", gameName)
-            withContext(Dispatchers.Main) {
-                launchGame(context, intent)
-            }
-        }
-    }
-
-    private fun launchGame(
-        context: android.content.Context,
-        intent: Intent,
-    ) {
-        DownloadService.clearCompletedDownloads()
-        context.startActivity(intent)
-        // Suppress the default activity transition so the preloader stays seamless
-        if (context is android.app.Activity) {
-            com.winlator.cmod.shared.android.AppUtils
-                .applyOpenActivityTransition(context, 0, 0)
-        }
-    }
-
-    private fun findGameExe(dir: java.io.File): java.io.File? {
-        // BFS: check each directory level fully before going deeper
-        val exclusions =
-            listOf(
-                "unins",
-                "redist",
-                "setup",
-                "dotnet",
-                "vcredist",
-                "dxsetup",
-                "helper",
-                "crash",
-                "ue4prereq",
-                "dxwebsetup",
-                "launcher",
-            )
-
-        var currentDirs = listOf(dir)
-        var depth = 0
-        var fallbackExe: java.io.File? = null
-
-        while (currentDirs.isNotEmpty() && depth <= 4) {
-            val nextDirs = mutableListOf<java.io.File>()
-            val candidates = mutableListOf<java.io.File>()
-
-            for (d in currentDirs) {
-                val children = d.listFiles() ?: continue
-                for (f in children) {
-                    if (f.isDirectory) {
-                        nextDirs.add(f)
-                    } else if (f.extension.equals("exe", ignoreCase = true)) {
-                        val name = f.name.lowercase()
-                        if (exclusions.none { name.contains(it) }) {
-                            candidates.add(f)
-                        }
-                    }
-                }
-            }
-
-            // Prefer 64-bit executable candidates at the current depth
-            val exe64 =
-                candidates.find {
-                    it.name.lowercase().contains("64") ||
-                        it.parentFile
-                            ?.name
-                            ?.lowercase()
-                            ?.contains("64") == true
-                }
-            if (exe64 != null) return exe64
-
-            // Collect the first valid candidate as a fallback
-            if (fallbackExe == null && candidates.isNotEmpty()) {
-                fallbackExe = candidates.first()
-            }
-
-            currentDirs = nextDirs
-            depth++
-        }
-        return fallbackExe
-    }
-
-    @Composable
-    fun EmptyStateMessage(message: String) {
-        Text(message, color = TextSecondary, modifier = Modifier.padding(16.dp))
-    }
-
-    @Composable
-    fun LoginRequiredScreen(
-        storeName: String,
-        onLoginClick: () -> Unit,
-    ) {
-        val message =
-            if (storeName ==
-                "Library"
-            ) {
-                stringResource(R.string.library_games_sign_in_prompt)
-            } else {
-                stringResource(R.string.stores_accounts_sign_in_store_prompt, storeName)
-            }
-        val buttonText =
-            if (storeName ==
-                "Library"
-            ) {
-                stringResource(R.string.stores_accounts_manage)
-            } else {
-                stringResource(R.string.stores_accounts_sign_into_store, storeName)
-            }
-
-        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier.padding(horizontal = 48.dp),
-            ) {
-                Icon(
-                    Icons.Outlined.Person,
-                    contentDescription = null,
-                    tint = TextSecondary.copy(alpha = 0.5f),
-                    modifier = Modifier.size(48.dp),
-                )
-                Spacer(Modifier.height(16.dp))
-                Text(
-                    message,
-                    color = TextSecondary,
-                    style = MaterialTheme.typography.bodyMedium,
-                    textAlign = androidx.compose.ui.text.style.TextAlign.Center,
-                    lineHeight = 20.sp,
-                )
-                Spacer(Modifier.height(20.dp))
-                val interactionSource =
-                    remember {
-                        androidx.compose.foundation.interaction
-                            .MutableInteractionSource()
-                    }
-                val isPressed by interactionSource.collectIsPressedAsState()
-                val btnScale by animateFloatAsState(
-                    targetValue = if (isPressed) 0.95f else 1f,
-                    animationSpec = tween(100),
-                    label = "btnScale",
-                )
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier =
-                        Modifier
-                            .graphicsLayer {
-                                scaleX = btnScale
-                                scaleY = btnScale
-                            }.clickable(
-                                interactionSource = interactionSource,
-                                indication = null,
-                                onClick = onLoginClick,
-                            ).border(1.dp, Accent.copy(alpha = 0.5f), RoundedCornerShape(20.dp))
-                            .padding(horizontal = 20.dp, vertical = 10.dp),
-                ) {
-                    Text(buttonText, color = Accent, fontSize = 13.sp, fontWeight = FontWeight.Medium)
-                }
-            }
-        }
-    }
-
-    // Drawer content: avatar card + filters
-    @Composable
-    private fun DrawerContent(
-        persona: com.winlator.cmod.feature.stores.steam.data.SteamFriend?,
-        context: android.content.Context,
-        scope: kotlinx.coroutines.CoroutineScope,
-        storeVisible: SnapshotStateMap<String, Boolean>,
-        contentFilters: SnapshotStateMap<String, Boolean>,
-        libraryLayoutMode: LibraryLayoutMode,
-        onLibraryLayoutSelected: (LibraryLayoutMode) -> Unit,
-        onStoreVisibleChanged: (String, Boolean) -> Unit,
-        onContentFiltersChanged: (String, Boolean) -> Unit,
-        onClose: () -> Unit,
-    ) {
-        val currentState = persona?.state ?: EPersonaState.Online
-        var statusExpanded by remember { mutableStateOf(false) }
-
-        ModalDrawerSheet(
-            drawerShape = RectangleShape,
-            drawerContainerColor = BgDark,
-            drawerContentColor = TextPrimary,
-            windowInsets = WindowInsets(0, 0, 0, 0),
-            modifier = Modifier.width(324.dp),
-        ) {
-            Column(
-                Modifier
-                    .fillMaxHeight()
-                    .navigationBarsPadding()
-                    .verticalScroll(rememberScrollState())
-                    .padding(20.dp),
-            ) {
-                // ── Avatar Card ──
-                Surface(
-                    shape = RoundedCornerShape(16.dp),
-                    color = SurfaceDark,
-                    border = BorderStroke(1.dp, CardBorder),
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .clickable(
-                                interactionSource = remember { MutableInteractionSource() },
-                                indication = null,
-                            ) { statusExpanded = !statusExpanded },
-                ) {
-                    Column(Modifier.padding(16.dp)) {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
-                            val avatarUrl =
-                                persona?.avatarHash?.getAvatarURL()
-                                    ?: "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/fe/fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb_full.jpg"
-
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .size(48.dp)
-                                        .clip(CircleShape),
-                            ) {
-                                AsyncImage(
-                                    model =
-                                        ImageRequest
-                                            .Builder(context)
-                                            .data(avatarUrl)
-                                            .crossfade(true)
-                                            .build(),
-                                    contentDescription = "Profile",
-                                    modifier = Modifier.fillMaxSize(),
-                                    contentScale = ContentScale.Crop,
-                                )
-                            }
-
-                            Spacer(Modifier.width(12.dp))
-
-                            Column(Modifier.weight(1f)) {
-                                Text(
-                                    text = persona?.name ?: stringResource(R.string.stores_accounts_not_signed_in),
-                                    style = MaterialTheme.typography.titleSmall,
-                                    fontWeight = FontWeight.Bold,
-                                    color = TextPrimary,
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                )
-                                val statusLabel =
-                                    when (currentState) {
-                                        EPersonaState.Online -> stringResource(R.string.stores_accounts_status_online)
-                                        EPersonaState.Away -> stringResource(R.string.stores_accounts_status_away)
-                                        else -> stringResource(R.string.stores_accounts_status_offline)
-                                    }
-                                val statusColor =
-                                    when (currentState) {
-                                        EPersonaState.Online -> StatusOnline
-                                        EPersonaState.Away -> StatusAway
-                                        else -> StatusOffline
-                                    }
-                                Row(verticalAlignment = Alignment.CenterVertically) {
-                                    Box(Modifier.size(8.dp).background(statusColor, CircleShape))
-                                    Spacer(Modifier.width(6.dp))
-                                    Text(statusLabel, style = MaterialTheme.typography.bodySmall, color = TextSecondary)
-                                }
-                            }
-
-                            val chevronRotation by animateFloatAsState(
-                                targetValue = if (statusExpanded) 90f else 0f,
-                                animationSpec = tween(250),
-                                label = "chevronRotation",
-                            )
-                            Icon(
-                                Icons.Outlined.ChevronRight,
-                                contentDescription = "Toggle status",
-                                tint = TextSecondary,
-                                modifier =
-                                    Modifier
-                                        .size(20.dp)
-                                        .graphicsLayer { rotationZ = chevronRotation },
-                            )
-                        }
-
-                        // Expandable status options
-                        AnimatedVisibility(visible = statusExpanded) {
-                            Column(Modifier.padding(top = 12.dp)) {
-                                HorizontalDivider(color = TextSecondary.copy(alpha = 0.2f))
-                                Spacer(Modifier.height(8.dp))
-                                Text(
-                                    stringResource(R.string.stores_accounts_status_header),
-                                    style = MaterialTheme.typography.labelSmall,
-                                    color = TextSecondary,
-                                )
-                                Spacer(Modifier.height(8.dp))
-
-                                listOf(
-                                    Triple(EPersonaState.Online, stringResource(R.string.stores_accounts_status_online), StatusOnline),
-                                    Triple(EPersonaState.Away, stringResource(R.string.stores_accounts_status_away), StatusAway),
-                                    Triple(
-                                        EPersonaState.Invisible,
-                                        stringResource(R.string.stores_accounts_status_invisible),
-                                        StatusOffline,
-                                    ),
-                                ).forEach { (state, label, color) ->
-                                    val isSelected = currentState == state
-                                    val rowBg by animateColorAsState(
-                                        targetValue = if (isSelected) Accent.copy(alpha = 0.12f) else Color.Transparent,
-                                        animationSpec = tween(250),
-                                        label = "statusRowBg",
-                                    )
-                                    val borderAlpha by animateFloatAsState(
-                                        targetValue = if (isSelected) 1f else 0f,
-                                        animationSpec = tween(250),
-                                        label = "statusBorder",
-                                    )
-                                    val checkScale by animateFloatAsState(
-                                        targetValue = if (isSelected) 1f else 0f,
-                                        animationSpec =
-                                            spring(
-                                                dampingRatio = Spring.DampingRatioMediumBouncy,
-                                                stiffness = Spring.StiffnessMedium,
-                                            ),
-                                        label = "checkScale",
-                                    )
-                                    Row(
-                                        modifier =
-                                            Modifier
-                                                .fillMaxWidth()
-                                                .clip(RoundedCornerShape(8.dp))
-                                                .background(rowBg)
-                                                .border(1.dp, Accent.copy(alpha = 0.4f * borderAlpha), RoundedCornerShape(8.dp))
-                                                .clickable(
-                                                    interactionSource = remember { MutableInteractionSource() },
-                                                    indication = null,
-                                                ) {
-                                                    scope.launch {
-                                                        SteamService.setPersonaState(state)
-                                                        statusExpanded = false
-                                                    }
-                                                }.padding(horizontal = 12.dp, vertical = 10.dp),
-                                        verticalAlignment = Alignment.CenterVertically,
-                                        horizontalArrangement = Arrangement.spacedBy(10.dp),
-                                    ) {
-                                        Box(Modifier.size(10.dp).background(color, CircleShape))
-                                        Text(label, color = TextPrimary, style = MaterialTheme.typography.bodyMedium)
-                                        Spacer(Modifier.weight(1f))
-                                        Icon(
-                                            Icons.Outlined.Check,
-                                            contentDescription = null,
-                                            tint = Accent,
-                                            modifier =
-                                                Modifier
-                                                    .size(16.dp)
-                                                    .graphicsLayer {
-                                                        scaleX = checkScale
-                                                        scaleY = checkScale
-                                                        alpha = checkScale
-                                                    },
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Spacer(Modifier.height(20.dp))
-                HorizontalDivider(color = TextSecondary.copy(alpha = 0.15f))
-                Spacer(Modifier.height(20.dp))
-
-                // ── Layouts ──
-                Text(
-                    stringResource(R.string.library_games_layouts_header),
-                    color = TextSecondary,
-                    fontSize = 10.sp,
-                    fontWeight = FontWeight.Bold,
-                    letterSpacing = 1.4.sp,
-                    modifier = Modifier.padding(bottom = 4.dp),
-                )
-                Spacer(Modifier.height(8.dp))
-
-                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    DrawerFilterButton(
-                        label = "4-Grid",
-                        checked = libraryLayoutMode == LibraryLayoutMode.GRID_4,
-                        modifier = Modifier.weight(1f),
-                    ) { if (it) onLibraryLayoutSelected(LibraryLayoutMode.GRID_4) }
-                    DrawerFilterButton(
-                        label = stringResource(R.string.library_games_layout_carousel),
-                        checked = libraryLayoutMode == LibraryLayoutMode.CAROUSEL,
-                        modifier = Modifier.weight(1f),
-                    ) { if (it) onLibraryLayoutSelected(LibraryLayoutMode.CAROUSEL) }
-                    DrawerFilterButton(
-                        label = stringResource(R.string.library_games_layout_list),
-                        checked = libraryLayoutMode == LibraryLayoutMode.LIST,
-                        modifier = Modifier.weight(1f),
-                    ) { if (it) onLibraryLayoutSelected(LibraryLayoutMode.LIST) }
-                }
-
-                Spacer(Modifier.height(16.dp))
-
-                // ── Stores ──
-                Text(
-                    stringResource(R.string.stores_accounts_stores_header),
-                    color = TextSecondary,
-                    fontSize = 10.sp,
-                    fontWeight = FontWeight.Bold,
-                    letterSpacing = 1.4.sp,
-                    modifier = Modifier.padding(bottom = 4.dp),
-                )
-                Spacer(Modifier.height(8.dp))
-
-                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    DrawerFilterButton("Steam", storeVisible["steam"] == true, Modifier.weight(1f)) { onStoreVisibleChanged("steam", it) }
-                    DrawerFilterButton("Epic", storeVisible["epic"] == true, Modifier.weight(1f)) { onStoreVisibleChanged("epic", it) }
-                }
-                Spacer(Modifier.height(8.dp))
-                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    DrawerFilterButton("GOG", storeVisible["gog"] == true, Modifier.weight(1f)) { onStoreVisibleChanged("gog", it) }
-                    Spacer(Modifier.weight(1f))
-                }
-
-                Spacer(Modifier.height(16.dp))
-
-                // ── Content Types ──
-                Text(
-                    stringResource(R.string.settings_content_types_header),
-                    color = TextSecondary,
-                    fontSize = 10.sp,
-                    fontWeight = FontWeight.Bold,
-                    letterSpacing = 1.4.sp,
-                    modifier = Modifier.padding(bottom = 4.dp),
-                )
-                Spacer(Modifier.height(8.dp))
-
-                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    DrawerFilterButton("Games", contentFilters["games"] == true, Modifier.weight(1f)) { onContentFiltersChanged("games", it) }
-                    DrawerFilterButton("DLC", contentFilters["dlc"] == true, Modifier.weight(1f)) { onContentFiltersChanged("dlc", it) }
-                }
-                Spacer(Modifier.height(8.dp))
-                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    DrawerFilterButton("Applications", contentFilters["applications"] == true, Modifier.weight(1f)) { onContentFiltersChanged("applications", it) }
-                    DrawerFilterButton("Tools", contentFilters["tools"] == true, Modifier.weight(1f)) { onContentFiltersChanged("tools", it) }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun DrawerFilterButton(
-        label: String,
-        checked: Boolean,
-        modifier: Modifier = Modifier,
-        onToggle: (Boolean) -> Unit,
-    ) {
-        val interactionSource = remember { MutableInteractionSource() }
-        val isPressed by interactionSource.collectIsPressedAsState()
-
-        val bgColor by animateColorAsState(
-            targetValue = if (checked) Accent.copy(alpha = 0.2f) else CardDark,
-            animationSpec = tween(200),
-            label = "filterBg",
-        )
-        val borderColor by animateColorAsState(
-            targetValue = if (checked) Accent else CardBorder,
-            animationSpec = tween(200),
-            label = "filterBorder",
-        )
-        val textColor by animateColorAsState(
-            targetValue = if (checked) Accent else TextSecondary,
-            animationSpec = tween(200),
-            label = "filterText",
-        )
-        val scale by animateFloatAsState(
-            targetValue = if (isPressed) 0.92f else 1f,
-            animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy, stiffness = Spring.StiffnessHigh),
-            label = "filterScale",
-        )
-
-        Box(
-            modifier =
-                modifier
-                    .graphicsLayer {
-                        scaleX = scale
-                        scaleY = scale
-                    }.clip(RoundedCornerShape(8.dp))
-                    .background(bgColor)
-                    .border(1.dp, borderColor, RoundedCornerShape(8.dp))
-                    .clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                    ) { onToggle(!checked) }
-                    .padding(vertical = 10.dp, horizontal = 10.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text(
-                text = label,
-                style = MaterialTheme.typography.labelMedium,
-                color = textColor,
-                fontWeight = FontWeight.Bold,
-                maxLines = 1,
-            )
-        }
-    }
-
-    // Add Custom Game Dialog
-    @Composable
-    private fun AddCustomGameDialog(onDismiss: () -> Unit) {
-        val context = LocalContext.current
-        val scope = rememberCoroutineScope()
-        var selectedExePath by remember { mutableStateOf<String?>(null) }
-        var gameName by remember { mutableStateOf("") }
-        var gameFolder by remember { mutableStateOf<String?>(null) }
-        var isAdding by remember { mutableStateOf(false) }
-
-        fun selectExecutable(path: String) {
-            if (!path.endsWith(".exe", ignoreCase = true) || !java.io.File(path).isFile) {
-                com.winlator.cmod.shared.ui.toast.WinToast.show(
-                    context,
-                    R.string.common_ui_select_valid_exe_file,
-                    android.widget.Toast.LENGTH_SHORT,
-                )
-                return
-            }
-
-            selectedExePath = path
-            gameFolder = LibraryShortcutUtils.detectCustomGameFolder(path)
-            // Auto-generate a game name from the EXE name (without extension)
-            if (gameName.isBlank()) {
-                gameName =
-                    java.io
-                        .File(path)
-                        .nameWithoutExtension
-                        .replace("_", " ")
-                        .replace("-", " ")
-            }
-        }
-
-        val defaultDensity = LocalDensity.current
-        Dialog(
-            onDismissRequest = onDismiss,
-            properties = DialogProperties(usePlatformDefaultWidth = false),
-        ) {
-            CompositionLocalProvider(
-                LocalDensity provides Density(defaultDensity.density, fontScale = 1f),
-            ) {
-                Surface(
-                    modifier =
-                        Modifier
-                            .widthIn(max = 360.dp)
-                            .fillMaxWidth(0.9f),
-                    shape = RoundedCornerShape(20.dp),
-                    color = Color(0xFF141B24),
-                ) {
-                    Column(Modifier.padding(horizontal = 16.dp, vertical = 14.dp)) {
-                        // Title
-                        Text(
-                            stringResource(R.string.library_games_add_custom_game),
-                            color = TextPrimary,
-                            fontWeight = FontWeight.SemiBold,
-                            fontSize = 15.sp,
-                        )
-
-                        Spacer(Modifier.height(10.dp))
-
-                        // Scrollable content area
-                        Column(
-                            modifier =
-                                Modifier
-                                    .weight(1f, fill = false)
-                                    .verticalScroll(rememberScrollState()),
-                        ) {
-                            // Pick EXE button
-                            Row(
-                                modifier =
-                                    Modifier
-                                        .fillMaxWidth()
-                                        .clip(RoundedCornerShape(12.dp))
-                                        .background(Color.White.copy(alpha = 0.05f))
-                                        .clickable {
-                                            DirectoryPickerDialog.showFile(
-                                                activity = this@UnifiedActivity,
-                                                initialPath = selectedExePath ?: gameFolder,
-                                                title = getString(R.string.common_ui_select_exe),
-                                                allowedExtensions = setOf("exe"),
-                                                dimAmount = 0.5f,
-                                                preserveBackdropBlur = true,
-                                                onSelected = ::selectExecutable,
-                                            )
-                                        }.padding(horizontal = 12.dp, vertical = 10.dp),
-                                verticalAlignment = Alignment.CenterVertically,
-                            ) {
-                                Icon(Icons.Outlined.FolderOpen, contentDescription = null, tint = Accent, modifier = Modifier.size(16.dp))
-                                Spacer(Modifier.width(8.dp))
-                                Text(
-                                    if (selectedExePath == null) "Select Executable (.exe)" else java.io.File(selectedExePath!!).name,
-                                    color = if (selectedExePath == null) TextSecondary else TextPrimary,
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                    fontSize = 12.sp,
-                                )
-                            }
-
-                            if (selectedExePath != null) {
-                                Spacer(Modifier.height(4.dp))
-                                Text(
-                                    selectedExePath!!,
-                                    color = TextSecondary.copy(alpha = 0.6f),
-                                    fontSize = 9.sp,
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                )
-
-                                Spacer(Modifier.height(8.dp))
-
-                                // Game name text field — compact
-                                OutlinedTextField(
-                                    value = gameName,
-                                    onValueChange = { gameName = it },
-                                    label = { Text(stringResource(R.string.library_games_game_name), fontSize = 11.sp) },
-                                    singleLine = true,
-                                    modifier = Modifier.fillMaxWidth(),
-                                    textStyle = MaterialTheme.typography.bodySmall.copy(color = TextPrimary),
-                                    colors =
-                                        OutlinedTextFieldDefaults.colors(
-                                            focusedBorderColor = Accent,
-                                            unfocusedBorderColor = TextSecondary.copy(alpha = 0.3f),
-                                            focusedTextColor = TextPrimary,
-                                            unfocusedTextColor = TextPrimary,
-                                            cursorColor = Accent,
-                                            focusedLabelColor = Accent,
-                                            unfocusedLabelColor = TextSecondary,
-                                        ),
-                                    shape = RoundedCornerShape(10.dp),
-                                )
-
-                                Spacer(Modifier.height(8.dp))
-
-                                // Game folder — single compact row
-                                Row(
-                                    modifier =
-                                        Modifier
-                                            .fillMaxWidth()
-                                            .clip(RoundedCornerShape(10.dp))
-                                            .background(Color.White.copy(alpha = 0.05f))
-                                            .padding(horizontal = 10.dp, vertical = 6.dp),
-                                    verticalAlignment = Alignment.CenterVertically,
-                                ) {
-                                    Icon(
-                                        Icons.Outlined.Folder,
-                                        contentDescription = null,
-                                        tint = StatusOnline.copy(alpha = 0.7f),
-                                        modifier = Modifier.size(14.dp),
-                                    )
-                                    Spacer(Modifier.width(6.dp))
-                                    Column(Modifier.weight(1f)) {
-                                        Text(
-                                            stringResource(R.string.library_games_game_folder_mapped_drive),
-                                            color = TextSecondary,
-                                            fontSize = 9.sp,
-                                        )
-                                        Text(
-                                            gameFolder ?: stringResource(R.string.common_ui_auto_detected),
-                                            color = if (gameFolder != null) TextPrimary else TextSecondary,
-                                            fontSize = 10.sp,
-                                            maxLines = 1,
-                                            overflow = TextOverflow.Ellipsis,
-                                        )
-                                    }
-                                    IconButton(onClick = {
-                                        if (!ensureAllFilesAccessForImports(context)) return@IconButton
-                                        DirectoryPickerDialog.show(
-                                            activity = this@UnifiedActivity,
-                                            initialPath = gameFolder,
-                                            title = getString(R.string.common_ui_select_folder),
-                                            dimAmount = 0.5f,
-                                            preserveBackdropBlur = true,
-                                        ) { path -> gameFolder = path }
-                                    }, modifier = Modifier.size(28.dp)) {
-                                        Icon(
-                                            Icons.Outlined.Edit,
-                                            contentDescription = stringResource(R.string.common_ui_change),
-                                            tint = Accent,
-                                            modifier = Modifier.size(14.dp),
-                                        )
-                                    }
-                                }
-                            }
-                        }
-
-                        Spacer(Modifier.height(12.dp))
-
-                        // Action buttons
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.End,
-                        ) {
-                            OutlinedButton(
-                                onClick = onDismiss,
-                                shape = RoundedCornerShape(10.dp),
-                                border = androidx.compose.foundation.BorderStroke(1.dp, TextSecondary.copy(alpha = 0.3f)),
-                                colors = ButtonDefaults.outlinedButtonColors(contentColor = TextSecondary),
-                                contentPadding = PaddingValues(horizontal = 14.dp, vertical = 0.dp),
-                                modifier = Modifier.height(34.dp).widthIn(min = 72.dp),
-                            ) {
-                                Text(stringResource(R.string.common_ui_cancel), fontSize = 12.sp)
-                            }
-                            Spacer(Modifier.width(8.dp))
-                            val addEnabled = selectedExePath != null && gameName.isNotBlank() && gameFolder != null && !isAdding
-                            OutlinedButton(
-                                onClick = {
-                                    if (selectedExePath == null || gameName.isBlank() || gameFolder == null) {
-                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                            context,
-                                            context.getString(R.string.library_games_select_exe_provide_name),
-                                            android.widget.Toast.LENGTH_SHORT,
-                                        )
-                                        return@OutlinedButton
-                                    }
-                                    isAdding = true
-                                    scope.launch(Dispatchers.IO) {
-                                        addCustomGame(context, gameName.trim(), selectedExePath!!, gameFolder!!)
-                                        withContext(Dispatchers.Main) {
-                                            isAdding = false
-                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
-                                                context,
-                                                "$gameName added!",
-                                                android.widget.Toast.LENGTH_SHORT,
-                                            )
-                                            onDismiss()
-                                        }
-                                    }
-                                },
-                                enabled = addEnabled,
-                                shape = RoundedCornerShape(10.dp),
-                                border =
-                                    androidx.compose.foundation.BorderStroke(
-                                        1.dp,
-                                        if (addEnabled) Accent.copy(alpha = 0.5f) else TextSecondary.copy(alpha = 0.2f),
-                                    ),
-                                colors = ButtonDefaults.outlinedButtonColors(contentColor = Accent),
-                                contentPadding = PaddingValues(horizontal = 14.dp, vertical = 0.dp),
-                                modifier = Modifier.height(34.dp).widthIn(min = 72.dp),
-                            ) {
-                                if (isAdding) {
-                                    CircularProgressIndicator(color = Accent, modifier = Modifier.size(12.dp), strokeWidth = 2.dp)
-                                } else {
-                                    Text(stringResource(R.string.common_ui_add), fontWeight = FontWeight.Medium, fontSize = 12.sp)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun ensureAllFilesAccessForImports(context: android.content.Context): Boolean {
-        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.R || android.os.Environment.isExternalStorageManager()) {
-            return true
-        }
-
-        com.winlator.cmod.shared.ui.toast.WinToast.show(
-            context,
-            "Grant All files access to browse Downloads directly.",
-            android.widget.Toast.LENGTH_LONG,
-        )
-
-        val intent =
-            android.content.Intent(android.provider.Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION).apply {
-                data = android.net.Uri.parse("package:$packageName")
-            }
-        startActivity(intent)
-        return false
-    }
-
-    // Create custom game shortcut + container
-    private fun addCustomGame(
-        context: android.content.Context,
-        name: String,
-        exePath: String,
-        gameFolderPath: String,
-    ) {
-        val containerManager = ContainerManager(context)
-        var container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
-        if (container == null) {
-            SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
-            return
-        }
-
-        val exeFile = java.io.File(exePath)
-        normalizeContainerDrives(container)
-        val execCmd = buildWineExecCommand(container, gameFolderPath, exeFile)
-
-        // Write .desktop shortcut
-        val desktopDir = container.getDesktopDir()
-        if (!desktopDir.exists()) desktopDir.mkdirs()
-        val safeName = name.replace("/", "_").replace("\\", "_")
-        val shortcutFile = java.io.File(desktopDir, "$safeName.desktop")
-        val shortcutUuid = java.util.UUID.randomUUID().toString()
-        val iconOutFile = LibraryShortcutArtwork.buildManagedCustomGameArtworkFile(context, shortcutUuid)
-        val extractedArtworkPath =
-            try {
-                if (PeIconExtractor.extractAndSave(java.io.File(exePath), iconOutFile)) {
-                    iconOutFile.absolutePath
-                } else {
-                    null
-                }
-            } catch (_: Exception) {
-                null
-            }
-        val content = StringBuilder()
-        content.append("[Desktop Entry]\n")
-        content.append("Type=Application\n")
-        content.append("Name=$name\n")
-        content.append("Exec=$execCmd\n")
-        content.append("Icon=custom_game\n")
-        content.append("\n[Extra Data]\n")
-        content.append("game_source=CUSTOM\n")
-        content.append("custom_name=$name\n")
-        content.append("custom_exe=$exePath\n")
-        content.append("custom_game_folder=$gameFolderPath\n")
-        content.append("uuid=$shortcutUuid\n")
-        extractedArtworkPath?.let { content.append("customCoverArtPath=$it\n") }
-        content.append("container_id=${container.id}\n")
-        content.append("use_container_defaults=1\n")
-        com.winlator.cmod.shared.io.FileUtils
-            .writeString(shortcutFile, content.toString())
-        container.saveData()
-    }
-
-    @Composable
-    fun CustomPathWarningDialog(
-        onDismiss: () -> Unit,
-        onProceed: () -> Unit,
-    ) {
-        Dialog(onDismissRequest = onDismiss) {
-            Surface(
-                shape = RoundedCornerShape(16.dp),
-                color = CardDark,
-                modifier = Modifier.padding(16.dp),
-            ) {
-                Column(modifier = Modifier.padding(24.dp)) {
-                    Text(
-                        text = stringResource(R.string.stores_accounts_custom_download_path),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = TextPrimary,
-                        fontWeight = FontWeight.Bold,
-                    )
-                    Spacer(Modifier.height(16.dp))
-                    Text(
-                        text = stringResource(R.string.stores_accounts_custom_download_path_description),
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = TextSecondary,
-                    )
-                    Spacer(Modifier.height(24.dp))
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.Center,
-                    ) {
-                        TextButton(onClick = onDismiss) {
-                            Text(stringResource(R.string.common_ui_close), color = TextSecondary)
-                        }
-                        Spacer(Modifier.width(8.dp))
-                        Button(
-                            onClick = onProceed,
-                            colors = ButtonDefaults.buttonColors(containerColor = Accent),
-                            shape = RoundedCornerShape(8.dp),
-                        ) {
-                            Text(stringResource(R.string.common_ui_proceed))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun rememberControllerConnectionState(): ControllerConnectionState {
-        val context = LocalContext.current
-        val inputManager = remember(context) { context.getSystemService(InputManager::class.java) }
-        var controllerState by remember { mutableStateOf(ControllerConnectionState()) }
-
-        DisposableEffect(inputManager) {
-            fun refreshState() {
-                controllerState =
-                    ControllerConnectionState(
-                        isConnected = ControllerHelper.isControllerConnected(),
-                        isPlayStation = ControllerHelper.isPlayStationController(),
-                    )
-            }
-
-            val listener =
-                object : InputManager.InputDeviceListener {
-                    override fun onInputDeviceAdded(deviceId: Int) = refreshState()
-
-                    override fun onInputDeviceRemoved(deviceId: Int) = refreshState()
-
-                    override fun onInputDeviceChanged(deviceId: Int) = refreshState()
-                }
-
-            refreshState()
-            inputManager?.registerInputDeviceListener(listener, null)
-            onDispose {
-                inputManager?.unregisterInputDeviceListener(listener)
-            }
-        }
-
-        return controllerState
-    }
 }
 
 @Composable
 fun ControllerBadge(
     text: String,
     modifier: Modifier = Modifier,
+    compact: Boolean = false,
 ) {
+    val corner = if (compact) 11.dp else 15.dp
     Box(
         modifier =
             modifier
-                .defaultMinSize(minHeight = 22.dp)
-                .background(Color(0xFF394048), RoundedCornerShape(15.dp))
-                .border(1.dp, Color(0xFF8B949E).copy(alpha = 0.5f), RoundedCornerShape(15.dp))
-                .padding(horizontal = 10.dp, vertical = 3.dp),
+                .defaultMinSize(minHeight = if (compact) 16.dp else 22.dp)
+                .background(Color(0xFF394048), RoundedCornerShape(corner))
+                .border(1.dp, Color(0xFF8B949E).copy(alpha = 0.5f), RoundedCornerShape(corner))
+                .padding(horizontal = if (compact) 5.dp else 10.dp, vertical = if (compact) 1.dp else 3.dp),
         contentAlignment = Alignment.Center,
     ) {
         Text(
             text = text,
             color = Color(0xFFE6EDF3),
-            fontSize = 12.sp,
+            fontSize = if (compact) 9.sp else 12.sp,
             fontWeight = FontWeight.Bold,
-            lineHeight = 15.sp,
+            lineHeight = if (compact) 11.sp else 15.sp,
             style = MaterialTheme.typography.labelSmall,
         )
     }
 }
+
+internal inline fun android.content.Context.runIfOnlineOrToast(action: () -> Unit) {
+    if (com.winlator.cmod.app.service.NetworkMonitor.hasInternet.value) {
+        action()
+    } else {
+        com.winlator.cmod.shared.ui.toast.WinToast.show(
+            this,
+            getString(R.string.downloads_no_internet),
+            android.widget.Toast.LENGTH_SHORT,
+        )
+    }
+}
diff --git a/app/src/main/app/shell/UnifiedActivityDownloads.kt b/app/src/main/app/shell/UnifiedActivityDownloads.kt
new file mode 100644
index 000000000..60e18c020
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityDownloads.kt
@@ -0,0 +1,1839 @@
+package com.winlator.cmod.app.shell
+import com.winlator.cmod.app.shell.UnifiedActivity.DownloadCancelRequest
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Downloads tab + queue/progress UI + game/workshop managers, split out of UnifiedActivity.kt (behavior-identical).
+
+// Downloads Tab
+@Composable
+internal fun UnifiedActivity.DownloadsTab(
+    selectedId: String?,
+    animationsActive: Boolean = true,
+    onSelectDownload: (String?) -> Unit,
+) {
+    val downloads = remember { mutableStateListOf<Pair<String, DownloadInfo>>() }
+    var tick by remember { mutableIntStateOf(0) }
+    val scope = rememberCoroutineScope()
+    var cancelWarningRequest by remember { mutableStateOf<DownloadCancelRequest?>(null) }
+
+    val downloadsActivity = LocalContext.current as? UnifiedActivity
+    val bridge = downloadsActivity?.downloadsNavBridge
+    val navRegistry = remember(bridge) { PaneNavRegistry(initialSignal = bridge?.navSignal ?: -1) }
+    navRegistry.controllerActive = bridge?.controllerActive ?: false
+    LaunchedEffect(navRegistry, bridge?.navSignal) {
+        navRegistry.processNav(bridge?.navSignal ?: 0, bridge?.navDir ?: 0)
+    }
+
+    val syncDownloads =
+        remember(selectedId, onSelectDownload) {
+            {
+                val currentDownloads = DownloadService.getAllDownloads()
+                downloads.clear()
+                downloads.addAll(currentDownloads)
+                if (selectedId != null && currentDownloads.none { it.first == selectedId }) {
+                    onSelectDownload(null)
+                }
+            }
+        }
+    val latestSyncDownloads by rememberUpdatedState(syncDownloads)
+
+    val downloadStatusListener =
+        remember {
+            object : EventDispatcher.JavaEventListener {
+                override fun onEvent(event: Any) {
+                    if (event is AndroidEvent.DownloadStatusChanged) {
+                        scope.launch {
+                            latestSyncDownloads()
+                        }
+                    }
+                }
+            }
+        }
+
+    DisposableEffect(downloadStatusListener, syncDownloads) {
+        syncDownloads()
+        PluviaApp.events.onJava(AndroidEvent.DownloadStatusChanged::class, downloadStatusListener)
+        onDispose {
+            PluviaApp.events.offJava(AndroidEvent.DownloadStatusChanged::class, downloadStatusListener)
+        }
+    }
+
+    // Re-sync the list whenever the cross-store DownloadCoordinator records change. This
+    // is what makes PAUSED records (loaded from DB after app restart) appear in the tab,
+    // and what removes COMPLETE/CANCELLED/FAILED rows after Clear.
+    LaunchedEffect(syncDownloads) {
+        DownloadCoordinator.changes.collect {
+            latestSyncDownloads()
+        }
+    }
+
+    downloads.forEach { (_, info) ->
+        LaunchedEffect(info) {
+            info.getStatusFlow().collect {
+                tick++
+            }
+        }
+        // Also recompose on status-message changes. Active downloads push
+        // a changing message every progress tick, so this is what keeps
+        // the byte count / speed / progress bar refreshing live (the
+        // phase flow dedups to a single DOWNLOADING emission).
+        LaunchedEffect(info) {
+            info.getStatusMessageFlow().collect {
+                tick++
+            }
+        }
+    }
+
+    CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+    Column(
+        Modifier
+            .fillMaxSize()
+            .windowInsetsPadding(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom))
+            .tabScreenPadding(top = DownloadsHeaderTopPadding)
+            .pointerInput(Unit) {
+                awaitPointerEventScope {
+                    while (true) {
+                        val ev = awaitPointerEvent(PointerEventPass.Initial)
+                        if (ev.type == PointerEventType.Press) {
+                            bridge?.controllerActive = false
+                        }
+                    }
+                }
+            },
+    ) {
+        @Suppress("UNUSED_EXPRESSION")
+        tick
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
+            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterHorizontally),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            val selectedInfo = downloads.find { it.first == selectedId }?.second
+            val selectedStatus = selectedInfo?.getStatusFlow()?.value
+            // FAILED is resumable: the dispatcher preserves every breadcrumb
+            // on failure, so one click continues from where it left off.
+            val isResumable =
+                selectedStatus == DownloadPhase.PAUSED || selectedStatus == DownloadPhase.FAILED
+            val isComplete = selectedStatus == DownloadPhase.COMPLETE
+            val isCancelled = selectedStatus == DownloadPhase.CANCELLED
+            val pausableDownloads =
+                downloads.filter {
+                    val status = it.second.getStatusFlow().value
+                    status != DownloadPhase.COMPLETE && status != DownloadPhase.CANCELLED
+                }
+            val allPausableDownloadsPaused =
+                pausableDownloads.isNotEmpty() &&
+                    pausableDownloads.all {
+                        val s = it.second.getStatusFlow().value
+                        s == DownloadPhase.PAUSED || s == DownloadPhase.FAILED
+                    }
+
+            val pauseResumeLabel =
+                if (selectedId == null) {
+                    if (allPausableDownloadsPaused) {
+                        stringResource(
+                            R.string.downloads_queue_resume_all,
+                        )
+                    } else {
+                        stringResource(R.string.downloads_queue_pause_all)
+                    }
+                } else {
+                    when {
+                        selectedStatus == DownloadPhase.FAILED -> stringResource(R.string.session_drawer_retry)
+                        isResumable -> stringResource(R.string.session_drawer_resume)
+                        else -> stringResource(R.string.session_drawer_pause)
+                    }
+                }
+
+            val cancelLabel =
+                if (selectedId == null) {
+                    stringResource(R.string.downloads_queue_cancel_all)
+                } else {
+                    stringResource(R.string.common_ui_cancel)
+                }
+
+            // Disable pause/resume for completed or cancelled downloads
+            val pauseResumeEnabled =
+                if (selectedId != null) {
+                    !isComplete && !isCancelled
+                } else {
+                    pausableDownloads.isNotEmpty()
+                }
+
+            val cancelEnabled =
+                if (selectedId != null) {
+                    !isComplete && !isCancelled
+                } else {
+                    pausableDownloads.isNotEmpty()
+                }
+
+            DownloadsQueueButton(
+                label = pauseResumeLabel,
+                accentColor = Accent,
+                onClick = {
+                    val isResumeAction =
+                        if (selectedId == null) allPausableDownloadsPaused else isResumable
+                    val run = {
+                        when {
+                            selectedId == null && allPausableDownloadsPaused -> DownloadService.resumeAll()
+                            selectedId == null -> DownloadService.pauseAll()
+                            isResumable -> DownloadService.resumeDownload(selectedId)
+                            else -> DownloadService.pauseDownload(selectedId)
+                        }
+                    }
+                    if (isResumeAction) this@DownloadsTab.runIfOnlineOrToast(run) else run()
+                },
+                enabled = pauseResumeEnabled,
+            )
+
+            Box {
+                DownloadsQueueButton(
+                    label = cancelLabel,
+                    accentColor = DangerRed,
+                    onClick = {
+                        if (selectedId == null) {
+                            cancelWarningRequest =
+                                DownloadCancelRequest(
+                                    ids = pausableDownloads.map { it.first },
+                                    isCancelAll = true,
+                                )
+                        } else {
+                            cancelWarningRequest =
+                                DownloadCancelRequest(
+                                    ids = listOf(selectedId),
+                                    isCancelAll = false,
+                                )
+                        }
+                    },
+                    enabled = cancelEnabled,
+                )
+
+                cancelWarningRequest?.let { request ->
+                    DownloadCancelWarningMenu(
+                        expanded = true,
+                        onDismissRequest = { cancelWarningRequest = null },
+                        onConfirm = {
+                            val activeRequest = cancelWarningRequest
+                            cancelWarningRequest = null
+                            val ids = activeRequest?.ids.orEmpty()
+                            if (activeRequest?.isCancelAll == true) {
+                                DownloadService.cancelAll()
+                            } else {
+                                ids.forEach(DownloadService::cancelDownload)
+                            }
+                            onSelectDownload(null)
+                        },
+                        isCancelAll = request.isCancelAll,
+                    )
+                }
+            }
+
+            // Clear button - clears completed, cancelled, and failed downloads
+            val hasCompletedOrCancelled =
+                downloads.any {
+                    val s = it.second.getStatusFlow().value
+                    s == DownloadPhase.COMPLETE || s == DownloadPhase.CANCELLED || s == DownloadPhase.FAILED
+                }
+
+            DownloadsQueueButton(
+                label = stringResource(R.string.downloads_queue_clear),
+                accentColor = Accent,
+                onClick = {
+                    DownloadService.clearCompletedDownloads()
+                },
+                enabled = hasCompletedOrCancelled,
+            )
+        }
+
+        val listState = rememberLazyListState()
+        val activity = LocalContext.current as? UnifiedActivity
+        val density = LocalContext.current.resources.displayMetrics.density
+
+        LaunchedEffect(listState) {
+            activity?.rightStickScrollState?.collect { rz ->
+                if (kotlin.math.abs(rz) > 0.1f) {
+                    // Max scroll speed is 20 rows per second (approx 20 * 100dp / 60fps ~ 32dp per frame)
+                    // Min scroll speed is 0.75 rows per second (approx 0.75 * 100dp / 60fps ~ 1.25dp per frame)
+                    // Use a square curve for more gradual acceleration
+                    val speedFactor = kotlin.math.abs(rz)
+                    val curveFactor = speedFactor * speedFactor
+                    val baseSpeed = 1.25f + (curveFactor * (32f - 1.25f))
+                    val direction = if (rz > 0) 1f else -1f
+
+                    // Using a loop while the stick is held
+                    while (kotlin.math.abs(activity.rightStickScrollState.value) > 0.1f) {
+                        val currentRz = activity.rightStickScrollState.value
+                        val currentSpeedFactor = kotlin.math.abs(currentRz)
+                        val currentCurveFactor = currentSpeedFactor * currentSpeedFactor
+                        val currentBaseSpeed = 1.25f + (currentCurveFactor * (32f - 1.25f))
+                        val currentDirection = if (currentRz > 0) 1f else -1f
+
+                        val pixelsToScroll = currentBaseSpeed * currentDirection * density
+                        listState.dispatchRawDelta(pixelsToScroll)
+                        kotlinx.coroutines.delay(16) // roughly 60fps
+                    }
+                }
+            }
+        }
+
+        // Sort so the user always sees what's actually running first, then everything
+        // they can resume, then finished items, with cancelled at the very bottom.
+        // The list re-sorts on phase transitions because `tick` (incremented by the
+        // status flow collectors above) is read here, forcing recomposition.
+        @Suppress("UNUSED_EXPRESSION")
+        tick
+        val sortedDownloads =
+            downloads.sortedBy { (_, info) ->
+                when (info.getStatusFlow().value) {
+                    // In-progress states grouped together at the top.
+                    DownloadPhase.DOWNLOADING,
+                    DownloadPhase.PREPARING,
+                    DownloadPhase.VERIFYING,
+                    DownloadPhase.PATCHING,
+                    DownloadPhase.APPLYING_DATA,
+                    DownloadPhase.FINALIZING,
+                    DownloadPhase.UNPACKING,
+                    DownloadPhase.UNKNOWN,
+                    -> 0
+                    // FAILED sorts with PAUSED — both are user-resumable;
+                    // don't bury them under finished downloads.
+                    DownloadPhase.PAUSED -> 1
+                    DownloadPhase.FAILED -> 1
+                    DownloadPhase.QUEUED -> 2
+                    DownloadPhase.COMPLETE -> 3
+                    DownloadPhase.CANCELLED -> 5
+                }
+            }
+
+        if (sortedDownloads.isEmpty()) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center,
+            ) {
+                EmptyStateMessage(stringResource(R.string.downloads_queue_empty))
+            }
+        } else {
+            LazyColumn(state = listState, modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                items(sortedDownloads, key = { it.first }) { (id, info) ->
+                    DownloadItemDeck(
+                        id,
+                        info,
+                        isSelected = selectedId == id,
+                        animationsActive = animationsActive,
+                        onClick = {
+                            if (selectedId == id) onSelectDownload(null) else onSelectDownload(id)
+                        },
+                    )
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DownloadsQueueButton(
+    label: String,
+    accentColor: Color,
+    enabled: Boolean,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    val contentColor = if (enabled) accentColor else TextSecondary.copy(alpha = 0.48f)
+
+    Button(
+        onClick = onClick,
+        enabled = enabled,
+        modifier =
+            modifier
+                .height(40.dp)
+                .widthIn(min = 96.dp)
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { if (enabled) onClick() }),
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor = DownloadButtonBlack,
+                contentColor = contentColor,
+                disabledContainerColor = DownloadButtonBlack.copy(alpha = 0.18f),
+                disabledContentColor = TextSecondary.copy(alpha = 0.48f),
+            ),
+        border = BorderStroke(1.dp, contentColor.copy(alpha = if (enabled) 0.55f else 0.24f)),
+        contentPadding = PaddingValues(horizontal = 8.dp),
+        shape = RoundedCornerShape(8.dp),
+    ) {
+        Text(
+            label,
+            color = contentColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.AnimatedDownloadProgressFill(
+    modifier: Modifier,
+    widthPx: Float,
+) {
+    val infiniteTransition = rememberInfiniteTransition(label = "downloadProgressGradient")
+    val gradientOffset by infiniteTransition.animateFloat(
+        initialValue = -widthPx,
+        targetValue = 0f,
+            animationSpec =
+                infiniteRepeatable(
+                animation = tween(durationMillis = 5000, easing = LinearEasing),
+                repeatMode = RepeatMode.Restart,
+            ),
+        label = "downloadProgressGradientOffset",
+    )
+
+    Box(
+        modifier.background(
+            Brush.horizontalGradient(
+                colorStops = DownloadChaseGradientStops,
+                startX = gradientOffset,
+                endX = gradientOffset + (widthPx * 2f),
+                tileMode = TileMode.Repeated,
+            ),
+        ),
+    )
+}
+
+@Composable
+internal fun UnifiedActivity.DownloadChasingProgressBar(
+    progress: Float,
+    status: DownloadPhase,
+    animationsActive: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    val clampedProgress = progress.coerceIn(0f, 1f)
+    val shouldUseActiveGradient =
+        when (status) {
+            DownloadPhase.DOWNLOADING,
+            DownloadPhase.QUEUED,
+            DownloadPhase.PREPARING,
+            DownloadPhase.VERIFYING,
+            DownloadPhase.PATCHING,
+            DownloadPhase.APPLYING_DATA,
+            DownloadPhase.FINALIZING,
+            DownloadPhase.UNPACKING,
+            -> true
+            else -> false
+        }
+    val shouldAnimate = shouldUseActiveGradient && animationsActive
+    val fillColor =
+        when (status) {
+            DownloadPhase.FAILED,
+            DownloadPhase.CANCELLED,
+            -> DangerRed
+            DownloadPhase.COMPLETE -> StatusOnline
+            DownloadPhase.PAUSED -> TextSecondary
+            else -> Accent
+        }
+
+    BoxWithConstraints(
+        modifier =
+            modifier
+                .clip(CircleShape)
+                .background(Color.Black.copy(alpha = 0.34f)),
+    ) {
+        val density = LocalDensity.current
+        val widthPx = with(density) { maxWidth.toPx().coerceAtLeast(1f) }
+
+        if (clampedProgress > 0f) {
+            val fillModifier =
+                Modifier
+                    .fillMaxHeight()
+                    .fillMaxWidth(clampedProgress)
+                    .clip(RectangleShape)
+
+            if (shouldUseActiveGradient) {
+                if (shouldAnimate) {
+                    AnimatedDownloadProgressFill(fillModifier, widthPx)
+                } else {
+                    Box(
+                        fillModifier.background(
+                            Brush.horizontalGradient(
+                                colorStops = DownloadChaseGradientStops,
+                                endX = widthPx * 2f,
+                                tileMode = TileMode.Repeated,
+                            ),
+                        ),
+                    )
+                }
+            } else {
+                Box(fillModifier.background(fillColor))
+            }
+        }
+    }
+}
+
+/**
+ * The live progress body (phase label, bar, percentage, byte counts) for a
+ * game's in-flight download / verify. Observes [info] directly so it
+ * refreshes live. Rendered inside [SteamTaskProgressDialog].
+ */
+@Composable
+internal fun UnifiedActivity.SteamTaskProgressBody(info: DownloadInfo) {
+    var progress by remember(info) { mutableFloatStateOf(info.getProgress()) }
+    DisposableEffect(info) {
+        val listener: (Float) -> Unit = { progress = it }
+        info.addProgressListener(listener)
+        onDispose { info.removeProgressListener(listener) }
+    }
+    val status by info.getStatusFlow().collectAsState()
+    // The status message carries a unique suffix every progress tick;
+    // keying the byte sample on it (and on `progress`) keeps the card
+    // refreshing live — the Downloads-tab row relies on the same.
+    val statusMessage by info.getStatusMessageFlow().collectAsState()
+    val fraction = progress.coerceIn(0f, 1f)
+    val animatedFraction by animateFloatAsState(
+        targetValue = fraction,
+        animationSpec = tween(durationMillis = 400),
+        label = "steamTaskProgress",
+    )
+    val (doneBytes, totalBytes) =
+        remember(progress, statusMessage) { info.getDisplayBytesProgress() }
+
+    val phaseText =
+        when (status) {
+            DownloadPhase.VERIFYING -> stringResource(R.string.downloads_queue_phase_verifying)
+            DownloadPhase.DOWNLOADING -> stringResource(R.string.downloads_queue_phase_downloading)
+            DownloadPhase.PAUSED -> stringResource(R.string.downloads_queue_phase_paused)
+            DownloadPhase.QUEUED -> stringResource(R.string.downloads_queue_phase_queued)
+            DownloadPhase.PREPARING -> stringResource(R.string.downloads_queue_phase_preparing)
+            DownloadPhase.PATCHING -> stringResource(R.string.downloads_queue_phase_patching)
+            DownloadPhase.APPLYING_DATA -> stringResource(R.string.downloads_queue_phase_applying_data)
+            DownloadPhase.UNPACKING -> stringResource(R.string.downloads_queue_phase_unpacking)
+            DownloadPhase.FINALIZING -> stringResource(R.string.downloads_queue_phase_finalizing)
+            DownloadPhase.COMPLETE -> stringResource(R.string.downloads_queue_phase_complete)
+            DownloadPhase.FAILED -> stringResource(R.string.common_ui_failed)
+            DownloadPhase.CANCELLED -> stringResource(R.string.downloads_queue_phase_cancelled)
+            else -> stringResource(R.string.common_ui_working)
+        }
+    val phaseColor =
+        when (status) {
+            DownloadPhase.COMPLETE -> StatusOnline
+            DownloadPhase.FAILED, DownloadPhase.CANCELLED -> DangerRed
+            DownloadPhase.PAUSED, DownloadPhase.QUEUED -> StatusAway
+            else -> Accent
+        }
+
+    Column(verticalArrangement = Arrangement.spacedBy(9.dp)) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(phaseText, color = phaseColor, fontSize = 14.sp, fontWeight = FontWeight.Bold)
+            Text(
+                "${(fraction * 100).toInt()}%",
+                color = TextPrimary,
+                fontSize = 14.sp,
+                fontWeight = FontWeight.Bold,
+            )
+        }
+        DownloadChasingProgressBar(
+            progress = animatedFraction,
+            status = status,
+            animationsActive = true,
+            modifier = Modifier.fillMaxWidth().height(10.dp),
+        )
+        Text(
+            if (totalBytes > 0L) {
+                "${StorageUtils.formatDecimalSize(doneBytes)} / " +
+                    StorageUtils.formatDecimalSize(totalBytes)
+            } else {
+                " "
+            },
+            color = TextSecondary,
+            fontSize = 11.sp,
+        )
+    }
+}
+
+/**
+ * Activity-root host for the Verify Files progress pop-up + completion
+ * notice. Rendered once near the NavHost so it outlives the game-detail
+ * dialogs that start the task — the verify-completion library refresh
+ * tears those down, and a dialog-scoped watcher would miss COMPLETE.
+ *
+ * Reads the `taskProgress*` activity fields; [showTaskProgressPopup]
+ * populates them. The watcher is keyed on [taskProgressInfo] so it
+ * re-attaches if recomposed and (because the status is a StateFlow)
+ * still observes a terminal phase that landed in between.
+ */
+@Composable
+internal fun UnifiedActivity.TaskProgressHost() {
+    val info = taskProgressInfo
+    LaunchedEffect(info) {
+        if (info == null) return@LaunchedEffect
+        info.getStatusFlow().collect { st ->
+            when (st) {
+                DownloadPhase.COMPLETE -> {
+                    // Snapshot first: `taskProgressShown = false` can trigger
+                    // a follow-up task that overwrites these fields before we read.
+                    val msg = taskProgressCompleteMsg
+                    val asToast = taskProgressCompleteAsToast
+                    taskProgressShown = false
+                    taskProgressInfo = null
+                    if (asToast) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            this@TaskProgressHost,
+                            msg,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                    } else {
+                        taskDoneFailed = false
+                        taskDoneMessage = msg
+                    }
+                }
+                DownloadPhase.FAILED -> {
+                    taskProgressShown = false
+                    taskDoneFailed = true
+                    taskDoneMessage = taskProgressFailedMsg
+                    taskProgressInfo = null
+                }
+                DownloadPhase.CANCELLED -> {
+                    taskProgressShown = false
+                    taskProgressInfo = null
+                }
+                else -> Unit
+            }
+        }
+    }
+    if (taskCheckingShown) {
+        TaskCheckingDialog(
+            gameName = taskCheckingGameName,
+            onDismissRequest = { taskCheckingShown = false },
+        )
+    }
+    if (info != null && taskProgressShown) {
+        SteamTaskProgressDialog(
+            info = info,
+            gameName = taskProgressGameName,
+            onDismissRequest = { taskProgressShown = false },
+        )
+    }
+    taskDoneMessage?.let { msg ->
+        TaskCompleteDialog(
+            message = msg,
+            failed = taskDoneFailed,
+            onClose = { taskDoneMessage = null },
+        )
+    }
+}
+
+/**
+ * Indeterminate "Checking for updates" pop-up — same frame as
+ * [SteamTaskProgressDialog] but without a known task to track. Dismissable;
+ * the underlying check keeps running and the host shows the result.
+ */
+@Composable
+internal fun UnifiedActivity.TaskCheckingDialog(
+    gameName: String,
+    onDismissRequest: () -> Unit,
+) {
+    Dialog(onDismissRequest = onDismissRequest) {
+        PopupDialog(
+            title = gameName,
+            message = stringResource(R.string.store_game_checking_updates),
+            icon = Icons.Outlined.Sync,
+            accentColor = Accent,
+            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+            content = {
+                LinearProgressIndicator(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(6.dp)
+                        .clip(RoundedCornerShape(3.dp)),
+                    color = Accent,
+                )
+            },
+            footer = {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.End,
+                ) {
+                    PopupTextAction(
+                        label = stringResource(R.string.common_ui_close),
+                        textColor = Accent,
+                        onClick = onDismissRequest,
+                    )
+                }
+            },
+        )
+    }
+}
+
+/**
+ * Dismissable pop-up showing live progress for a Steam task (verify /
+ * update). Tapping outside closes it — the task keeps running and stays
+ * visible in the Downloads tab. The host watches the task to completion
+ * separately and shows [TaskCompleteDialog] when it finishes.
+ */
+@Composable
+internal fun UnifiedActivity.SteamTaskProgressDialog(
+    info: DownloadInfo,
+    gameName: String,
+    onDismissRequest: () -> Unit,
+) {
+    Dialog(onDismissRequest = onDismissRequest) {
+        PopupDialog(
+            title = gameName,
+            icon = Icons.Outlined.Download,
+            accentColor = Accent,
+            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+            content = {
+                SteamTaskProgressBody(info)
+                Text(
+                    stringResource(R.string.store_game_progress_background_hint),
+                    color = TextSecondary,
+                    fontSize = 11.sp,
+                )
+            },
+            footer = {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.End,
+                ) {
+                    PopupTextAction(
+                        label = stringResource(R.string.common_ui_close),
+                        textColor = Accent,
+                        onClick = onDismissRequest,
+                    )
+                }
+            },
+        )
+    }
+}
+
+/**
+ * Small completion notice ("Verify Files Complete" / " Failed") with a
+ * single Close button. Shown by the host once a watched task finishes.
+ */
+@Composable
+internal fun UnifiedActivity.TaskCompleteDialog(message: String, failed: Boolean, onClose: () -> Unit) {
+    Dialog(onDismissRequest = onClose) {
+        PopupDialog(
+            title = message,
+            icon = if (failed) Icons.Outlined.Warning else Icons.Outlined.CheckCircle,
+            accentColor = if (failed) DangerRed else StatusOnline,
+            confirmButtonColor = Accent,
+            confirmLabel = stringResource(R.string.common_ui_close),
+            onConfirm = onClose,
+            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DownloadCancelWarningMenu(
+    expanded: Boolean,
+    onDismissRequest: () -> Unit,
+    onConfirm: () -> Unit,
+    isCancelAll: Boolean = false,
+) {
+    val titleRes = if (isCancelAll) R.string.downloads_queue_cancel_all_title else R.string.downloads_queue_cancel_download_title
+    val messageRes = if (isCancelAll) R.string.downloads_queue_cancel_all_warning else R.string.downloads_queue_cancel_download_warning
+    val confirmRes = if (isCancelAll) R.string.downloads_queue_cancel_all else R.string.downloads_queue_cancel_download
+    LaunchDangerConfirmDialog(
+        visible = expanded,
+        title = stringResource(titleRes),
+        message = stringResource(messageRes),
+        confirmLabel = stringResource(confirmRes),
+        onDismissRequest = onDismissRequest,
+        onConfirm = onConfirm,
+        icon = Icons.Outlined.Warning,
+        titleTextAlign = TextAlign.Center,
+        messageTextAlign = TextAlign.Center,
+    )
+}
+
+@Composable
+internal fun UnifiedActivity.DownloadItemDeck(
+    id: String,
+    info: DownloadInfo,
+    isSelected: Boolean,
+    animationsActive: Boolean,
+    onClick: () -> Unit,
+) {
+    var progress by remember { mutableFloatStateOf(info.getProgress()) }
+    var showDeleteDialog by remember { mutableStateOf(false) }
+
+    DisposableEffect(info) {
+        val listener: (Float) -> Unit = { progress = it }
+        info.addProgressListener(listener)
+        onDispose { info.removeProgressListener(listener) }
+    }
+    val status by info.getStatusFlow().collectAsState()
+    val statusMessage by info.getStatusMessageFlow().collectAsState()
+    var previousStatus by remember { mutableStateOf(status) }
+    var showCompletedProgressBar by remember { mutableStateOf(status != DownloadPhase.COMPLETE) }
+    val isSteam = id.startsWith("STEAM_")
+    val isEpic = id.startsWith("EPIC_")
+    val isGog = id.startsWith("GOG_")
+    val appId =
+        if (isSteam) {
+            id.removePrefix("STEAM_").toIntOrNull() ?: 0
+        } else if (isEpic) {
+            id.removePrefix("EPIC_").toIntOrNull() ?: 0
+        } else {
+            0
+        }
+    val gogId = if (isGog) id.removePrefix("GOG_") else ""
+
+    var steamApp by remember(appId) { mutableStateOf<SteamApp?>(null) }
+    var epicGame by remember(appId) { mutableStateOf<EpicGame?>(null) }
+    var gogGame by remember(gogId) { mutableStateOf<GOGGame?>(null) }
+    val context = LocalContext.current
+    val clickInteractionSource = remember { MutableInteractionSource() }
+    val animatedProgress by animateFloatAsState(
+        targetValue = if (status == DownloadPhase.COMPLETE) 1f else progress.coerceIn(0f, 1f),
+        animationSpec = tween(durationMillis = 650, easing = FastOutSlowInEasing),
+        label = "downloadItemProgress",
+    )
+
+    LaunchedEffect(status) {
+        if (status == DownloadPhase.COMPLETE) {
+            if (previousStatus != DownloadPhase.COMPLETE) {
+                showCompletedProgressBar = true
+                delay(900)
+            }
+            showCompletedProgressBar = false
+        } else {
+            showCompletedProgressBar = true
+        }
+        previousStatus = status
+    }
+
+    LaunchedEffect(appId, gogId, isSteam, isEpic, isGog) {
+        withContext(Dispatchers.IO) {
+            if (isSteam) {
+                steamApp = db.steamAppDao().findApp(appId)
+            } else if (isEpic) {
+                epicGame = EpicService.getEpicGameOf(appId)
+            } else if (isGog) {
+                gogGame = GOGService.getGOGGameOf(gogId)
+            }
+        }
+    }
+
+    val unknownGameLabel = stringResource(R.string.library_games_unknown_game)
+    val displayName =
+        if (isSteam) {
+            steamApp?.name
+        } else if (isEpic) {
+            epicGame?.title
+        } else if (isGog) {
+            gogGame?.title
+        } else {
+            unknownGameLabel
+        }
+    val displayImage =
+        if (isSteam) {
+            steamApp?.getHeaderImageUrl()
+        } else if (isEpic) {
+            epicGame?.primaryImageUrl ?: epicGame?.iconUrl
+        } else if (isGog) {
+            gogGame?.imageUrl ?: gogGame?.iconUrl
+        } else {
+            null
+        }
+
+    Surface(
+        color = if (isSelected) DownloadCardSelectedBlack else DownloadCardBlack,
+        shape = RoundedCornerShape(12.dp),
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .chasingBorder(
+                    isFocused = isSelected,
+                    paused = chasingBordersPaused.value || !animationsActive,
+                    cornerRadius = 12.dp,
+                    borderWidth = 2.dp,
+                    animationDurationMs = 8000,
+                )
+                .paneNavItem(
+                    cornerRadius = 12.dp,
+                    onActivate = onClick,
+                    onSecondary = {
+                        if (status != DownloadPhase.COMPLETE && status != DownloadPhase.CANCELLED) {
+                            showDeleteDialog = true
+                        }
+                    },
+                )
+                .clickable(
+                    interactionSource = clickInteractionSource,
+                    indication = null,
+                    onClick = onClick,
+                ),
+    ) {
+        Row(Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) {
+            AsyncImage(
+                model =
+                    ImageRequest
+                        .Builder(context)
+                        .data(displayImage)
+                        .crossfade(300)
+                        .build(),
+                contentDescription = null,
+                modifier = Modifier.size(120.dp, 68.dp).clip(RoundedCornerShape(4.dp)),
+                contentScale = ContentScale.Crop,
+            )
+
+            Spacer(Modifier.width(16.dp))
+
+            Column(Modifier.weight(1f)) {
+                val currentFile by info.getCurrentFileNameFlow().collectAsState()
+                val (downloadedBytes, totalBytes) = info.getDisplayBytesProgress()
+                val speed = info.getCurrentDownloadSpeed() ?: 0L
+                val percentage = (animatedProgress * 100).roundToInt()
+                val showDownloadSpeed =
+                    status == DownloadPhase.DOWNLOADING &&
+                        progress < 1f &&
+                        speed > 0
+
+                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+                    Text(
+                        displayName ?: unknownGameLabel,
+                        fontWeight = FontWeight.Bold,
+                        color = TextPrimary,
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+
+                    // Centered Size Info
+                    Text(
+                        text = "${StorageUtils.formatDecimalSize(downloadedBytes)} / ${StorageUtils.formatDecimalSize(totalBytes)}",
+                        style = MaterialTheme.typography.labelMedium,
+                        color = TextSecondary,
+                        modifier = Modifier.weight(1f),
+                        textAlign = TextAlign.Center,
+                    )
+
+                    Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) {
+                        if (showDownloadSpeed) {
+                            Text(
+                                text = StorageUtils.formatBitsPerSecond(speed),
+                                style = MaterialTheme.typography.labelMedium,
+                                color = Accent,
+                                fontWeight = FontWeight.Bold,
+                            )
+                        }
+                    }
+                }
+
+                val statusText =
+                    when (status) {
+                        DownloadPhase.DOWNLOADING -> {
+                            currentFile?.let {
+                                stringResource(R.string.downloads_queue_phase_downloading_file, it.take(10))
+                            } ?: stringResource(R.string.downloads_queue_phase_downloading)
+                        }
+
+                        DownloadPhase.PAUSED -> {
+                            stringResource(R.string.downloads_queue_phase_paused)
+                        }
+
+                        DownloadPhase.QUEUED -> {
+                            stringResource(R.string.downloads_queue_phase_queued)
+                        }
+
+                        DownloadPhase.PREPARING -> {
+                            stringResource(R.string.downloads_queue_phase_preparing)
+                        }
+
+                        DownloadPhase.VERIFYING -> {
+                            currentFile?.let {
+                                stringResource(R.string.downloads_queue_phase_verifying_file, it.take(10))
+                            } ?: stringResource(R.string.downloads_queue_phase_verifying)
+                        }
+
+                        DownloadPhase.PATCHING -> {
+                            stringResource(R.string.downloads_queue_phase_patching)
+                        }
+
+                        DownloadPhase.APPLYING_DATA -> {
+                            stringResource(R.string.downloads_queue_phase_applying_data)
+                        }
+
+                        DownloadPhase.FINALIZING -> {
+                            stringResource(R.string.downloads_queue_phase_finalizing)
+                        }
+
+                        DownloadPhase.UNPACKING -> {
+                            stringResource(R.string.downloads_queue_phase_unpacking)
+                        }
+
+                        DownloadPhase.COMPLETE -> {
+                            stringResource(R.string.downloads_queue_phase_complete)
+                        }
+
+                        DownloadPhase.CANCELLED -> {
+                            stringResource(R.string.downloads_queue_phase_cancelled)
+                        }
+
+                        DownloadPhase.FAILED -> {
+                            stringResource(
+                                R.string.downloads_queue_phase_failed,
+                                if (statusMessage != null &&
+                                    statusMessage != "null"
+                                ) {
+                                    statusMessage!!
+                                } else {
+                                    stringResource(R.string.common_ui_unknown_error)
+                                },
+                            )
+                        }
+
+                        else -> {
+                            stringResource(R.string.downloads_queue_phase_unknown)
+                        }
+                    }
+                val statusColor =
+                    when (status) {
+                        DownloadPhase.COMPLETE -> StatusOnline
+                        DownloadPhase.FAILED,
+                        DownloadPhase.CANCELLED,
+                        -> DangerRed
+                        DownloadPhase.PAUSED,
+                        DownloadPhase.QUEUED,
+                        -> StatusAway
+                        DownloadPhase.DOWNLOADING,
+                        DownloadPhase.PREPARING,
+                        DownloadPhase.VERIFYING,
+                        DownloadPhase.PATCHING,
+                        DownloadPhase.APPLYING_DATA,
+                        DownloadPhase.FINALIZING,
+                        DownloadPhase.UNPACKING,
+                        -> Accent
+                        else -> TextSecondary
+                    }
+
+                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+                    Text(
+                        stringResource(R.string.downloads_queue_status_label),
+                        style = MaterialTheme.typography.bodySmall,
+                        color = TextSecondary,
+                        maxLines = 1,
+                    )
+                    Spacer(Modifier.width(4.dp))
+                    Text(
+                        statusText,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = statusColor,
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+
+                AnimatedVisibility(
+                    visible = status != DownloadPhase.COMPLETE || showCompletedProgressBar,
+                    exit = fadeOut(tween(180)) + shrinkVertically(tween(180)),
+                ) {
+                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) {
+                        DownloadChasingProgressBar(
+                            progress = if (status == DownloadPhase.COMPLETE) 1f else animatedProgress,
+                            status = status,
+                            animationsActive = animationsActive,
+                            modifier = Modifier.weight(1f).height(9.dp).padding(end = 10.dp),
+                        )
+                        Text(
+                            text = "$percentage%",
+                            style = MaterialTheme.typography.labelMedium,
+                            color = if (status == DownloadPhase.COMPLETE) StatusOnline else TextPrimary,
+                            modifier = Modifier.width(40.dp),
+                        )
+                    }
+                }
+            }
+
+            Box(contentAlignment = Alignment.Center) {
+                IconButton(
+                    onClick = { showDeleteDialog = true },
+                    enabled = status != DownloadPhase.COMPLETE && status != DownloadPhase.CANCELLED,
+                ) {
+                    Icon(
+                        Icons.Outlined.Close,
+                        contentDescription = stringResource(R.string.downloads_queue_cancel_download),
+                        tint =
+                            if (status != DownloadPhase.COMPLETE &&
+                                status != DownloadPhase.CANCELLED
+                            ) {
+                                Color(0xFFFF6B6B)
+                            } else {
+                                TextSecondary
+                            },
+                    )
+                }
+                if (showDeleteDialog) {
+                    DownloadCancelWarningMenu(
+                        expanded = true,
+                        onDismissRequest = { showDeleteDialog = false },
+                        onConfirm = {
+                            showDeleteDialog = false
+                            DownloadService.cancelDownload(id)
+                        },
+                    )
+                }
+            }
+            if (ControllerHelper.isControllerConnected()) {
+                Spacer(Modifier.width(8.dp))
+                ControllerBadge(if (ControllerHelper.isPlayStationController()) "\u2715" else "A")
+            }
+        }
+    }
+}
+
+// Game Manager Dialog
+@Composable
+internal fun UnifiedActivity.GameManagerDialog(
+    app: SteamApp,
+    onDismissRequest: () -> Unit,
+) {
+    val context = LocalContext.current
+    var isLoading by remember { mutableStateOf(true) }
+    var selectedManifestSizes by remember { mutableStateOf(SteamService.ManifestSizes()) }
+    var baseInstallSize by remember(app.id) { mutableStateOf(0L) }
+    var dlcApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
+    var dlcSizes by remember { mutableStateOf<Map<Int, SteamService.ManifestSizes>>(emptyMap()) }
+    var installedDlcIds by remember(app.id) { mutableStateOf<Set<Int>>(emptySet()) }
+    var installed by remember(app.id) { mutableStateOf<Boolean?>(null) }
+    val selectedDlcIds = remember { mutableStateListOf<Int>() }
+    var customPath by remember { mutableStateOf<String?>(null) }
+    var showCustomPathWarning by remember { mutableStateOf(false) }
+    var isCheckingForUpdate by remember(app.id) { mutableStateOf(false) }
+    var isUpdateCheckCoolingDown by remember(app.id) { mutableStateOf(false) }
+    var showWorkshopDialog by remember(app.id) { mutableStateOf(false) }
+    var updateInfo by remember(app.id) { mutableStateOf<SteamService.SteamUpdateInfo?>(null) }
+    var updateStatusText by remember(app.id) { mutableStateOf<String?>(null) }
+    val downloadRecords by com.winlator.cmod.app.service.download.DownloadCoordinator.records.collectAsState(
+        initial = com.winlator.cmod.app.service.download.DownloadCoordinator.snapshotRecords(),
+    )
+    val scope = rememberCoroutineScope()
+
+    if (showCustomPathWarning) {
+        CustomPathWarningDialog(
+            onDismiss = { showCustomPathWarning = false },
+            onProceed = {
+                showCustomPathWarning = false
+                DirectoryPickerDialog.show(
+                    activity = this@GameManagerDialog,
+                    initialPath = customPath ?: SteamService.defaultAppInstallPath,
+                    title = getString(R.string.settings_content_install_directory),
+                    extraRoots = driveRoots(includeInternal = true),
+                ) { path -> customPath = path }
+            },
+        )
+    }
+
+    data class SteamInstallLoadData(
+        val dlcApps: List<SteamApp>,
+        val dlcSizes: Map<Int, SteamService.ManifestSizes>,
+        val installedDlcIds: Set<Int>,
+        val baseManifestSizes: SteamService.ManifestSizes,
+        val installed: Boolean,
+    )
+
+    LaunchedEffect(app.id, downloadRecords) {
+        val loadData =
+            withContext(Dispatchers.IO) {
+                val selectableDlcApps = SteamService.getSelectableDlcAppsOf(app.id)
+                val perDlcSizes =
+                    selectableDlcApps.associate { dlc ->
+                        dlc.id to SteamService.getDlcOnlyManifestSizes(app.id, dlc.id)
+                    }
+                val installedDlcIds =
+                    SteamService.getInstalledDlcDepotsOf(app.id)
+                        .orEmpty()
+                        .toSet()
+                SteamInstallLoadData(
+                    dlcApps = selectableDlcApps,
+                    dlcSizes = perDlcSizes,
+                    installedDlcIds = installedDlcIds,
+                    baseManifestSizes = SteamService.getInstallableSelectedManifestSizes(app.id),
+                    installed = SteamService.isAppInstalled(app.id),
+                )
+            }
+        dlcApps = loadData.dlcApps
+        dlcSizes = loadData.dlcSizes
+        installedDlcIds = loadData.installedDlcIds
+        selectedDlcIds.removeAll(loadData.installedDlcIds)
+        selectedManifestSizes = loadData.baseManifestSizes
+        baseInstallSize = loadData.baseManifestSizes.installSize
+        installed = loadData.installed
+        isLoading = false
+    }
+
+    LaunchedEffect(app.id, selectedDlcIds.toList()) {
+        selectedManifestSizes =
+            withContext(Dispatchers.IO) {
+                SteamService.getInstallableSelectedManifestSizes(app.id, selectedDlcIds.toList())
+            }
+    }
+
+    val totalDownloadSize = selectedManifestSizes.downloadSize
+    val totalInstallSize = selectedManifestSizes.installSize
+    val defaultPathSet =
+        if (PrefManager.useSingleDownloadFolder) {
+            PrefManager.defaultDownloadFolder.isNotEmpty()
+        } else {
+            PrefManager.steamDownloadFolder
+                .isNotEmpty()
+        }
+    val effectivePath = customPath ?: SteamService.defaultAppInstallPath
+    val availableBytes =
+        try {
+            StorageUtils.getAvailableSpace(effectivePath)
+        } catch (e: Exception) {
+            0L
+        }
+    // For an already-installed game the base content is on disk, so only require free
+    // space for the newly-selected DLC (already-installed DLC is excluded from selection).
+    val requiredBytes =
+        if (installed == true) (totalInstallSize - baseInstallSize).coerceAtLeast(0L) else totalInstallSize
+    val isInstallEnabled = requiredBytes == 0L || availableBytes >= requiredBytes
+    val installPathDisplay = customPath ?: SteamService.defaultAppInstallPath
+
+    val dlcItems =
+        remember(dlcApps, dlcSizes, installedDlcIds) {
+            dlcApps.map { dlc ->
+                val sizes = dlcSizes[dlc.id]
+                val size =
+                    sizes
+                        ?.downloadSize
+                        ?.takeIf { it > 0L }
+                        ?: sizes?.installSize
+                        ?: 0L
+                StoreDlcItem(
+                    id = dlc.id,
+                    name = dlc.name,
+                    downloadSize = size,
+                    isInstalled = dlc.id in installedDlcIds,
+                )
+            }
+        }
+    val customPathLabel =
+        when {
+            customPath != null -> stringResource(R.string.common_ui_custom)
+            defaultPathSet -> stringResource(R.string.common_ui_already_set)
+            else -> stringResource(R.string.common_ui_custom)
+        }
+    val isReallyInstalled = installed == true
+    val steamDownloadRecord =
+        downloadRecords.firstOrNull {
+            it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_STEAM &&
+                it.storeGameId == app.id.toString() &&
+                it.status in setOf(
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                )
+    }
+    val hasBlockingSteamDownload =
+        downloadRecords.any {
+            it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_STEAM &&
+                it.storeGameId == app.id.toString() &&
+                it.status in setOf(
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_FAILED,
+                )
+        }
+    val updateActionEnabled = steamDownloadRecord == null
+    val installActionEnabled = isInstallEnabled && steamDownloadRecord == null
+    val activeSteamDownloadText = stringResource(R.string.store_game_download_already_active)
+    val noUpdateAvailableText = stringResource(R.string.store_game_no_update_available)
+    val updateAvailableText = stringResource(R.string.store_game_update_available)
+    val updateFailedText = stringResource(R.string.store_game_update_check_failed)
+
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            shape = RectangleShape,
+            color = Color.Black,
+        ) {
+            StoreGameDetailScreen(
+                title = app.name,
+                subtitle =
+                    listOfNotNull(
+                        app.developer.takeIf { it.isNotBlank() },
+                        app.publisher.takeIf {
+                            it.isNotBlank() && !it.equals(app.developer, ignoreCase = true)
+                        },
+                    ).joinToString(" • "),
+                sourceLabel = "Steam",
+                heroImageUrl = StoreArtworkCache.imageModel(context, StoreArtworkCache.steamRef(app, "hero", app.getHeroUrl())),
+                isLoading = isLoading,
+                isInstalled = isReallyInstalled,
+                installPathDisplay = installPathDisplay,
+                downloadSize = totalDownloadSize,
+                installSize = totalInstallSize,
+                availableBytes = availableBytes,
+                isInstallEnabled = isInstallEnabled,
+                isDownloadActionEnabled = installActionEnabled,
+                customPathLabel = customPathLabel,
+                showCustomPath = true,
+                showCloudSync = false,
+                showUninstall = false,
+                showUpdateCheck = true,
+                isCheckingForUpdate = isCheckingForUpdate,
+                isUpdateAvailable = updateInfo?.hasUpdate == true,
+                updateDownloadSize = updateInfo?.downloadSize ?: 0L,
+                updateStatusText = updateStatusText,
+                isUpdateActionEnabled = updateActionEnabled,
+                isUpdateCheckCoolingDown = isUpdateCheckCoolingDown,
+                // Shown for any installed game; titles without UGC simply
+                // open to an empty Workshop window (handled gracefully).
+                showWorkshop = isReallyInstalled,
+                showVerifyFiles = isReallyInstalled,
+                areSteamActionsEnabled = !hasBlockingSteamDownload,
+                dlcs = dlcItems,
+                selectedDlcIds = selectedDlcIds.toSet(),
+                isDlcSelectionEnabled = steamDownloadRecord == null,
+                onBack = onDismissRequest,
+                onInstall = {
+                    if (steamDownloadRecord != null) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeSteamDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        scope.launch(Dispatchers.IO) {
+                            val installableDlcIds = dlcItems
+                                .filter { !it.isInstalled && it.id in selectedDlcIds }
+                                .map { it.id }
+                            SteamService.downloadApp(app.id, installableDlcIds, false, customPath)
+                            withContext(Dispatchers.Main) { onDismissRequest() }
+                        }
+                    }
+                },
+                onCheckForUpdate = { startUpdateCheck(app.id, app.name) },
+                onWorkshop = { showWorkshopDialog = true },
+                onVerifyFiles = {
+                    if (steamDownloadRecord != null) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeSteamDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            val started =
+                                withContext(Dispatchers.IO) {
+                                    SteamService.downloadAppForVerify(app.id)
+                                }
+                            if (started != null) {
+                                // Hand off to the activity-root host so the
+                                // pop-up + completion notice outlive this dialog.
+                                showTaskProgressPopup(
+                                    started,
+                                    app.name,
+                                    getString(R.string.store_game_verify_complete),
+                                    getString(R.string.store_game_verify_failed_notice),
+                                    completeAsToast = true,
+                                )
+                            }
+                        }
+                    }
+                },
+                onDownloadUpdate = {
+                    if (!updateActionEnabled || updateInfo?.hasUpdate != true) return@StoreGameDetailScreen
+                    context.runIfOnlineOrToast {
+                        scope.launch(Dispatchers.IO) {
+                            try {
+                                val latest = SteamService.checkForAppUpdate(app.id)
+                                withContext(Dispatchers.Main) {
+                                    updateInfo = latest
+                                    updateStatusText =
+                                        when {
+                                            latest.hasUpdate -> updateAvailableText
+                                            latest.message != null -> updateFailedText
+                                            else -> null
+                                        }
+                                }
+                                if (!latest.hasUpdate) {
+                                    withContext(Dispatchers.Main) {
+                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                            context,
+                                            noUpdateAvailableText,
+                                            android.widget.Toast.LENGTH_SHORT,
+                                        )
+                                    }
+                                    return@launch
+                                }
+
+                                SteamService.downloadAppForUpdate(app.id, latest.depotIds)
+                                withContext(Dispatchers.Main) { onDismissRequest() }
+                            } catch (e: Exception) {
+                                Log.w("UnifiedActivity", "Steam update download failed to start for appId=${app.id}", e)
+                                withContext(Dispatchers.Main) {
+                                    updateStatusText = updateFailedText
+                                }
+                            }
+                        }
+                    }
+                },
+                onCustomPath = {
+                    if (customPath == null && defaultPathSet) {
+                        showCustomPathWarning = true
+                    } else {
+                        DirectoryPickerDialog.show(
+                            activity = this@GameManagerDialog,
+                            initialPath = customPath ?: SteamService.defaultAppInstallPath,
+                            title = getString(R.string.settings_content_install_directory),
+                            extraRoots = driveRoots(includeInternal = true),
+                        ) { path -> customPath = path }
+                    }
+                },
+                onToggleDlc = { id ->
+                    if (steamDownloadRecord != null) {
+                        return@StoreGameDetailScreen
+                    }
+                    if (dlcItems.any { it.id == id && it.isInstalled }) {
+                        return@StoreGameDetailScreen
+                    }
+                    if (selectedDlcIds.contains(id)) {
+                        selectedDlcIds.remove(id)
+                    } else {
+                        selectedDlcIds.add(id)
+                    }
+                },
+                onToggleSelectAllDlcs = {
+                    if (steamDownloadRecord != null) {
+                        return@StoreGameDetailScreen
+                    }
+                    val selectableDlcItems = dlcItems.filterNot { it.isInstalled }
+                    val all = selectableDlcItems.isNotEmpty() && selectableDlcItems.all { it.id in selectedDlcIds }
+                    if (all) {
+                        selectedDlcIds.removeAll(selectableDlcItems.map { it.id }.toSet())
+                    } else {
+                        selectableDlcItems.forEach { if (it.id !in selectedDlcIds) selectedDlcIds.add(it.id) }
+                    }
+                },
+            )
+        }
+    }
+
+    if (showWorkshopDialog) {
+        WorkshopDialog(
+            appId = app.id,
+            gameTitle = app.name,
+            onDismissRequest = { showWorkshopDialog = false },
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.WorkshopDialog(
+    appId: Int,
+    gameTitle: String,
+    onDismissRequest: () -> Unit,
+) {
+    var loadState by remember(appId) { mutableStateOf(WorkshopLoadState.LOADING) }
+    var errorMessage by remember(appId) { mutableStateOf<String?>(null) }
+    var allItems by remember(appId) { mutableStateOf<List<StoreWorkshopItem>>(emptyList()) }
+    var query by remember(appId) { mutableStateOf("") }
+    // Published-file-ids with an install OR uninstall in flight.
+    val busyIds = remember(appId) { mutableStateListOf<Long>() }
+    var reloadKey by remember(appId) { mutableStateOf(0) }
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(appId, reloadKey) {
+        loadState = WorkshopLoadState.LOADING
+        errorMessage = null
+        // Drop any in-flight spinners — a reload re-fetches the list.
+        busyIds.clear()
+        try {
+            val items =
+                withContext(Dispatchers.IO) {
+                    val json = SteamService.getSubscribedWorkshopItems(appId)
+                    if (json == null) {
+                        null
+                    } else {
+                        val installed =
+                            com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                                .installedItemIds(applicationContext, appId)
+                        parseWorkshopItemsJson(json, installed)
+                    }
+                }
+            if (items == null) {
+                errorMessage =
+                    "Couldn't load your Workshop subscriptions. " +
+                        "Make sure you're signed in to Steam and online."
+                loadState = WorkshopLoadState.ERROR
+            } else {
+                allItems = items
+                loadState = WorkshopLoadState.READY
+            }
+        } catch (e: Exception) {
+            Log.w("UnifiedActivity", "Workshop load failed for appId=$appId", e)
+            errorMessage = e.message
+            loadState = WorkshopLoadState.ERROR
+        }
+    }
+
+    val filtered =
+        remember(allItems, query) {
+            val q = query.trim()
+            if (q.isBlank()) {
+                allItems
+            } else {
+                allItems.filter {
+                    it.title.contains(q, ignoreCase = true) ||
+                        it.author.contains(q, ignoreCase = true)
+                }
+            }
+        }
+
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        StoreWorkshopScreen(
+            gameTitle = gameTitle,
+            loadState = loadState,
+            errorMessage = errorMessage,
+            items = filtered,
+            query = query,
+            // Snapshotted here inside the Dialog content lambda: a mutation of
+            // the SnapshotStateList invalidates this scope, so .toSet() re-runs.
+            busyIds = busyIds.toSet(),
+            onQueryChange = { query = it },
+            onInstall = { id ->
+                val item = allItems.firstOrNull { it.publishedFileId == id }
+                if (item != null && id !in busyIds) {
+                    if (item.manifestId == 0L) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            this@WorkshopDialog,
+                            "This Workshop item has no downloadable content",
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                    } else {
+                        busyIds.add(id)
+                        scope.launch {
+                            val ok =
+                                SteamService.installWorkshopItem(
+                                    appId = appId,
+                                    publishedFileId = item.publishedFileId,
+                                    manifestId = item.manifestId,
+                                    title = item.title,
+                                    fileSizeBytes = item.fileSizeBytes,
+                                    timeUpdated = item.timeUpdated,
+                                    previewUrl = item.previewImageUrl ?: "",
+                                )
+                            if (ok) {
+                                allItems =
+                                    allItems.map {
+                                        if (it.publishedFileId == id) it.copy(isInstalled = true) else it
+                                    }
+                            } else {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    this@WorkshopDialog,
+                                    "Workshop download failed — check your Steam connection",
+                                    android.widget.Toast.LENGTH_LONG,
+                                )
+                            }
+                            busyIds.remove(id)
+                        }
+                    }
+                }
+            },
+            onUninstall = { id ->
+                if (id !in busyIds) {
+                    busyIds.add(id)
+                    scope.launch {
+                        val ok =
+                            withContext(Dispatchers.IO) {
+                                com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                                    .uninstall(applicationContext, appId, id)
+                            }
+                        if (ok) {
+                            allItems =
+                                allItems.map {
+                                    if (it.publishedFileId == id) it.copy(isInstalled = false) else it
+                                }
+                        } else {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                this@WorkshopDialog,
+                                "Couldn't uninstall this Workshop item",
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                        busyIds.remove(id)
+                    }
+                }
+            },
+            onRetry = { reloadKey++ },
+            onClose = onDismissRequest,
+        )
+    }
+}
diff --git a/app/src/main/app/shell/UnifiedActivityDrawer.kt b/app/src/main/app/shell/UnifiedActivityDrawer.kt
new file mode 100644
index 000000000..0fd85a29f
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityDrawer.kt
@@ -0,0 +1,1381 @@
+package com.winlator.cmod.app.shell
+import com.winlator.cmod.app.shell.UnifiedActivity.ControllerConnectionState
+
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.artwork.SteamArtworkScraper
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import kotlinx.coroutines.CoroutineScope
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Navigation drawer + add-custom-game dialog + empty/login states, split out of UnifiedActivity.kt (behavior-identical).
+
+@Composable
+internal fun UnifiedActivity.EmptyStateMessage(message: String) {
+    Text(message, color = TextSecondary, modifier = Modifier.padding(16.dp))
+}
+
+@Composable
+internal fun UnifiedActivity.LoginRequiredScreen(
+    storeName: String,
+    onLoginClick: () -> Unit,
+) {
+    val message =
+        if (storeName ==
+            "Library"
+        ) {
+            stringResource(R.string.library_games_sign_in_prompt)
+        } else {
+            stringResource(R.string.stores_accounts_sign_in_store_prompt, storeName)
+        }
+    val buttonText =
+        if (storeName ==
+            "Library"
+        ) {
+            stringResource(R.string.stores_accounts_manage)
+        } else {
+            stringResource(R.string.stores_accounts_sign_into_store, storeName)
+        }
+
+    Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.padding(horizontal = 48.dp),
+        ) {
+            Icon(
+                Icons.Outlined.Person,
+                contentDescription = null,
+                tint = Accent,
+                modifier = Modifier.size(48.dp),
+            )
+            Spacer(Modifier.height(16.dp))
+            Text(
+                message,
+                color = TextSecondary,
+                style = MaterialTheme.typography.bodyMedium,
+                textAlign = androidx.compose.ui.text.style.TextAlign.Center,
+                lineHeight = 20.sp,
+            )
+            Spacer(Modifier.height(20.dp))
+            val interactionSource =
+                remember {
+                    androidx.compose.foundation.interaction
+                        .MutableInteractionSource()
+                }
+            val isPressed by interactionSource.collectIsPressedAsState()
+            val btnScale by animateFloatAsState(
+                targetValue = if (isPressed) 0.95f else 1f,
+                animationSpec = tween(100),
+                label = "btnScale",
+            )
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier =
+                    Modifier
+                        .graphicsLayer {
+                            scaleX = btnScale
+                            scaleY = btnScale
+                        }.clickable(
+                            interactionSource = interactionSource,
+                            indication = null,
+                            onClick = onLoginClick,
+                        ).border(1.dp, Accent.copy(alpha = 0.5f), RoundedCornerShape(20.dp))
+                        .padding(horizontal = 20.dp, vertical = 10.dp),
+            ) {
+                Text(buttonText, color = Accent, fontSize = 13.sp, fontWeight = FontWeight.Medium)
+            }
+        }
+    }
+}
+
+// Drawer content: avatar card + filters
+@Composable
+internal fun UnifiedActivity.DrawerContent(
+    persona: com.winlator.cmod.feature.stores.steam.data.SteamFriend?,
+    isOpen: Boolean,
+    context: android.content.Context,
+    scope: kotlinx.coroutines.CoroutineScope,
+    storeVisible: SnapshotStateMap<String, Boolean>,
+    contentFilters: SnapshotStateMap<String, Boolean>,
+    libraryLayoutMode: LibraryLayoutMode,
+    immersiveMode: Boolean,
+    immersiveBlur: Boolean,
+    onLibraryLayoutSelected: (LibraryLayoutMode) -> Unit,
+    onStoreVisibleChanged: (String, Boolean) -> Unit,
+    onContentFiltersChanged: (String, Boolean) -> Unit,
+    onImmersiveModeChanged: (Boolean) -> Unit,
+    onImmersiveBlurChanged: (Boolean) -> Unit,
+    onExportAll: () -> Unit,
+    onExitApp: () -> Unit,
+) {
+    val drawerBridge = (context as? UnifiedActivity)?.drawerNavBridge
+    val navRegistry = remember(drawerBridge) { PaneNavRegistry(initialSignal = drawerBridge?.navSignal ?: -1) }
+    navRegistry.controllerActive = drawerBridge?.controllerActive ?: false
+    LaunchedEffect(navRegistry, drawerBridge?.navSignal) {
+        navRegistry.processNav(drawerBridge?.navSignal ?: 0, drawerBridge?.navDir ?: 0)
+    }
+    LaunchedEffect(isOpen) { if (isOpen) navRegistry.reset() }
+
+    ModalDrawerSheet(
+        drawerShape = RectangleShape,
+        drawerContainerColor = Color(0xFF12121B),
+        drawerContentColor = TextPrimary,
+        windowInsets = WindowInsets(0, 0, 0, 0),
+        modifier = Modifier.width(324.dp),
+    ) {
+        CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+        Column(
+            Modifier
+                .fillMaxHeight()
+                .navigationBarsPadding()
+                .verticalScroll(rememberScrollState())
+                .padding(20.dp),
+        ) {
+
+            // ── Layouts ──
+            Text(
+                stringResource(R.string.library_games_layouts_header),
+                color = TextSecondary,
+                fontSize = 10.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 1.4.sp,
+                modifier = Modifier.padding(bottom = 4.dp),
+            )
+            Spacer(Modifier.height(8.dp))
+
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                DrawerFilterButton(
+                    label = "4-Grid",
+                    checked = libraryLayoutMode == LibraryLayoutMode.GRID_4,
+                    modifier = Modifier.weight(1f),
+                ) { if (it) onLibraryLayoutSelected(LibraryLayoutMode.GRID_4) }
+                DrawerFilterButton(
+                    label = stringResource(R.string.library_games_layout_carousel),
+                    checked = libraryLayoutMode == LibraryLayoutMode.CAROUSEL,
+                    modifier = Modifier.weight(1f),
+                    fontSize = 11.sp,
+                ) { if (it) onLibraryLayoutSelected(LibraryLayoutMode.CAROUSEL) }
+                DrawerFilterButton(
+                    label = stringResource(R.string.library_games_layout_list),
+                    checked = libraryLayoutMode == LibraryLayoutMode.LIST,
+                    modifier = Modifier.weight(1f),
+                ) { if (it) onLibraryLayoutSelected(LibraryLayoutMode.LIST) }
+            }
+
+            Spacer(Modifier.height(16.dp))
+
+            // ── View Options ──
+            Text(
+                stringResource(R.string.library_games_view_options_header),
+                color = TextSecondary,
+                fontSize = 10.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 1.4.sp,
+                modifier = Modifier.padding(bottom = 4.dp),
+            )
+            Spacer(Modifier.height(8.dp))
+
+            DrawerSwitchCard(
+                label = stringResource(R.string.library_games_immersive_mode),
+                description = stringResource(R.string.library_games_immersive_mode_description),
+                checked = immersiveMode,
+                onCheckedChange = onImmersiveModeChanged,
+            )
+
+            AnimatedVisibility(visible = immersiveMode) {
+                Column {
+                    Spacer(Modifier.height(8.dp))
+                    DrawerSwitchCard(
+                        label = stringResource(R.string.library_games_immersive_blur),
+                        description = stringResource(R.string.library_games_immersive_blur_description),
+                        checked = immersiveBlur,
+                        onCheckedChange = onImmersiveBlurChanged,
+                    )
+                }
+            }
+
+            Spacer(Modifier.height(12.dp))
+            DrawerActionCard(
+                icon = Icons.Outlined.IosShare,
+                label = stringResource(R.string.shortcuts_export_to_frontend),
+                onClick = onExportAll,
+            )
+
+            Spacer(Modifier.height(16.dp))
+
+            // ── Stores ──
+            Text(
+                stringResource(R.string.stores_accounts_stores_header),
+                color = TextSecondary,
+                fontSize = 10.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 1.4.sp,
+                modifier = Modifier.padding(bottom = 4.dp),
+            )
+            Spacer(Modifier.height(8.dp))
+
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                DrawerFilterButton("Steam", storeVisible["steam"] == true, Modifier.weight(1f)) { onStoreVisibleChanged("steam", it) }
+                DrawerFilterButton("Epic", storeVisible["epic"] == true, Modifier.weight(1f)) { onStoreVisibleChanged("epic", it) }
+            }
+            Spacer(Modifier.height(8.dp))
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                DrawerFilterButton("GOG", storeVisible["gog"] == true, Modifier.weight(1f)) { onStoreVisibleChanged("gog", it) }
+                Spacer(Modifier.weight(1f))
+            }
+
+            Spacer(Modifier.height(16.dp))
+
+            // ── Content Types ──
+            Text(
+                stringResource(R.string.settings_content_types_header),
+                color = TextSecondary,
+                fontSize = 10.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 1.4.sp,
+                modifier = Modifier.padding(bottom = 4.dp),
+            )
+            Spacer(Modifier.height(8.dp))
+
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                DrawerFilterButton("Games", contentFilters["games"] == true, Modifier.weight(1f)) { onContentFiltersChanged("games", it) }
+                DrawerFilterButton("DLC", contentFilters["dlc"] == true, Modifier.weight(1f)) { onContentFiltersChanged("dlc", it) }
+            }
+            Spacer(Modifier.height(8.dp))
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                DrawerFilterButton("Applications", contentFilters["applications"] == true, Modifier.weight(1f)) { onContentFiltersChanged("applications", it) }
+                DrawerFilterButton("Tools", contentFilters["tools"] == true, Modifier.weight(1f)) { onContentFiltersChanged("tools", it) }
+            }
+
+            Spacer(Modifier.height(20.dp))
+            HorizontalDivider(color = TextSecondary.copy(alpha = 0.15f))
+            Spacer(Modifier.height(16.dp))
+
+            DrawerExitAppCard(onClick = onExitApp)
+        }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DrawerExitAppCard(onClick: () -> Unit) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.97f else 1f,
+        animationSpec = tween(100),
+        label = "exitAppCardScale",
+    )
+
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }
+                .clip(RoundedCornerShape(12.dp))
+                .background(DangerRed.copy(alpha = 0.16f))
+                .border(1.dp, DangerRed.copy(alpha = 0.5f), RoundedCornerShape(12.dp))
+                .paneNavItem(cornerRadius = 12.dp, onActivate = onClick)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = 14.dp, vertical = 13.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size(34.dp)
+                    .clip(RoundedCornerShape(8.dp))
+                    .background(DangerRed.copy(alpha = 0.22f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                Icons.AutoMirrored.Outlined.ExitToApp,
+                contentDescription = null,
+                tint = Color(0xFFFFB4B4),
+                modifier = Modifier.size(20.dp),
+            )
+        }
+        Spacer(Modifier.width(12.dp))
+        Text(
+            text = stringResource(R.string.common_ui_exit_app),
+            color = Color(0xFFFFD6D6),
+            style = MaterialTheme.typography.bodyMedium,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DrawerActionCard(
+    icon: androidx.compose.ui.graphics.vector.ImageVector,
+    label: String,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.97f else 1f,
+        animationSpec = tween(100),
+        label = "drawerActionCardScale",
+    )
+
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }
+                .clip(RoundedCornerShape(12.dp))
+                .background(Accent.copy(alpha = 0.14f))
+                .border(1.dp, Accent.copy(alpha = 0.45f), RoundedCornerShape(12.dp))
+                .paneNavItem(cornerRadius = 12.dp, onActivate = onClick)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = 14.dp, vertical = 13.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size(34.dp)
+                    .clip(RoundedCornerShape(8.dp))
+                    .background(Accent.copy(alpha = 0.22f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                icon,
+                contentDescription = null,
+                tint = Accent,
+                modifier = Modifier.size(20.dp),
+            )
+        }
+        Spacer(Modifier.width(12.dp))
+        Text(
+            text = label,
+            color = TextPrimary,
+            style = MaterialTheme.typography.bodyMedium,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DrawerFilterButton(
+    label: String,
+    checked: Boolean,
+    modifier: Modifier = Modifier,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    onToggle: (Boolean) -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+
+    val bgColor by animateColorAsState(
+        targetValue = if (checked) Accent.copy(alpha = 0.2f) else CardDark,
+        animationSpec = tween(200),
+        label = "filterBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (checked) Accent else CardBorder,
+        animationSpec = tween(200),
+        label = "filterBorder",
+    )
+    val textColor by animateColorAsState(
+        targetValue = if (checked) Accent else TextSecondary,
+        animationSpec = tween(200),
+        label = "filterText",
+    )
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.92f else 1f,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy, stiffness = Spring.StiffnessHigh),
+        label = "filterScale",
+    )
+
+    Box(
+        modifier =
+            modifier
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }.clip(RoundedCornerShape(8.dp))
+                .background(bgColor)
+                .border(1.dp, borderColor, RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { onToggle(!checked) })
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                ) { onToggle(!checked) }
+                .padding(vertical = 10.dp, horizontal = 10.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            style = MaterialTheme.typography.labelMedium,
+            fontSize = fontSize,
+            color = textColor,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DrawerSwitchCard(
+    label: String,
+    description: String?,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+
+    val bgColor by animateColorAsState(
+        targetValue = if (checked) Accent.copy(alpha = 0.18f) else CardDark,
+        animationSpec = tween(200),
+        label = "switchCardBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (checked) Accent else CardBorder,
+        animationSpec = tween(200),
+        label = "switchCardBorder",
+    )
+    val labelColor by animateColorAsState(
+        targetValue = if (checked) Accent else TextPrimary,
+        animationSpec = tween(200),
+        label = "switchCardLabel",
+    )
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.97f else 1f,
+        animationSpec = tween(120),
+        label = "switchCardScale",
+    )
+
+    Row(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }.clip(RoundedCornerShape(10.dp))
+                .background(bgColor)
+                .border(1.dp, borderColor, RoundedCornerShape(10.dp))
+                .paneNavItem(cornerRadius = 10.dp, onActivate = { onCheckedChange(!checked) })
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                ) { onCheckedChange(!checked) }
+                .padding(horizontal = 12.dp, vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(Modifier.weight(1f)) {
+            Text(
+                text = label,
+                style = MaterialTheme.typography.bodyMedium,
+                color = labelColor,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+            )
+            if (!description.isNullOrBlank()) {
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    text = description,
+                    style = MaterialTheme.typography.labelSmall,
+                    color = TextSecondary,
+                    maxLines = 2,
+                )
+            }
+        }
+        Spacer(Modifier.width(10.dp))
+        Switch(
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+            modifier = Modifier.focusProperties { canFocus = false },
+            colors =
+                SwitchDefaults.colors(
+                    checkedThumbColor = Color.White,
+                    checkedTrackColor = Accent,
+                    checkedBorderColor = Accent,
+                    uncheckedThumbColor = TextSecondary,
+                    uncheckedTrackColor = CardDark,
+                    uncheckedBorderColor = CardBorder,
+                ),
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.AddCustomGameDialog(onDismiss: () -> Unit) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    var selectedExePath by remember { mutableStateOf<String?>(null) }
+    var gameName by remember { mutableStateOf("") }
+    var gameFolder by remember { mutableStateOf<String?>(null) }
+    var retroSystem by remember { mutableStateOf<com.winlator.cmod.feature.retro.RetroSystem?>(null) }
+    var isAdding by remember { mutableStateOf(false) }
+    var nameEditing by remember { mutableStateOf(false) }
+    val nameFocus = remember { FocusRequester() }
+    val nameKeyboard = LocalSoftwareKeyboardController.current
+    LaunchedEffect(nameEditing) {
+        if (nameEditing) {
+            runCatching { nameFocus.requestFocus() }
+            nameKeyboard?.show()
+        }
+    }
+    val registry = remember { PaneNavRegistry() }
+    val addEnabled =
+        selectedExePath != null && gameName.isNotBlank() && !isAdding &&
+            (retroSystem != null || gameFolder != null)
+    val doAdd: () -> Unit = {
+        isAdding = true
+        val chosenRetro = retroSystem
+        scope.launch(Dispatchers.IO) {
+            val added =
+                if (chosenRetro != null) {
+                    com.winlator.cmod.feature.retro.RetroShortcuts
+                        .create(context, gameName.trim(), selectedExePath!!, chosenRetro)
+                } else {
+                    addCustomGame(context, gameName.trim(), selectedExePath!!, gameFolder!!)
+                    true
+                }
+            withContext(Dispatchers.Main) {
+                isAdding = false
+                if (added) {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        "$gameName added!",
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                    onDismiss()
+                } else {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        "Could not add game",
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                }
+            }
+        }
+    }
+
+    fun selectExecutable(path: String) {
+        val detectedRetro = com.winlator.cmod.feature.retro.RetroSystems.detectForFile(path)
+        val file = java.io.File(path)
+        val launchable = file.extension.lowercase() in DirectoryPickerDialog.ExecutableExtensions
+        if (!file.isFile || (!launchable && detectedRetro == null)) {
+            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                context,
+                R.string.common_ui_select_valid_exe_file,
+                android.widget.Toast.LENGTH_SHORT,
+            )
+            return
+        }
+
+        selectedExePath = path
+        retroSystem = detectedRetro
+        gameFolder =
+            if (detectedRetro != null) {
+                java.io.File(path).parent
+            } else {
+                LibraryShortcutUtils.detectCustomGameFolder(path)
+            }
+        // Auto-generate a game name from the EXE name (without extension)
+        if (gameName.isBlank()) {
+            gameName =
+                java.io
+                    .File(path)
+                    .nameWithoutExtension
+                    .replace("_", " ")
+                    .replace("-", " ")
+        }
+    }
+
+    val defaultDensity = LocalDensity.current
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        CompositionLocalProvider(
+            LocalDensity provides Density(defaultDensity.density, fontScale = 1f),
+            androidx.compose.material3.LocalMinimumInteractiveComponentSize provides androidx.compose.ui.unit.Dp.Unspecified,
+            LocalPaneNav provides registry,
+        ) {
+            DialogPaneNav(registry, onDismiss = onDismiss, onStart = { if (addEnabled) doAdd() })
+            Surface(
+                modifier =
+                    Modifier
+                        .widthIn(max = 360.dp)
+                        .fillMaxWidth(0.9f),
+                shape = RoundedCornerShape(20.dp),
+                color = Color(0xFF141B24),
+            ) {
+                Column(Modifier.padding(horizontal = 16.dp, vertical = 14.dp)) {
+                    // Title
+                    Text(
+                        stringResource(R.string.library_games_add_custom_game),
+                        color = TextPrimary,
+                        fontWeight = FontWeight.SemiBold,
+                        fontSize = 15.sp,
+                    )
+
+                    Spacer(Modifier.height(10.dp))
+
+                    // Scrollable content area
+                    Column(
+                        modifier =
+                            Modifier
+                                .weight(1f, fill = false)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        // Pick EXE button
+                        Row(
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .clip(RoundedCornerShape(12.dp))
+                                    .background(Color.White.copy(alpha = 0.05f))
+                                    .paneNavItem(
+                                        cornerRadius = 12.dp,
+                                        tapToSelect = true,
+                                        isEntry = true,
+                                        onActivate = {
+                                            DirectoryPickerDialog.showFile(
+                                                activity = this@AddCustomGameDialog,
+                                                initialPath =
+                                                    selectedExePath ?: gameFolder
+                                                        ?: android.os.Environment
+                                                            .getExternalStoragePublicDirectory(
+                                                                android.os.Environment.DIRECTORY_DOWNLOADS,
+                                                            ).absolutePath,
+                                                title = getString(R.string.common_ui_select_exe),
+                                                allowedExtensions = DirectoryPickerDialog.ExecutableExtensions +
+                                                    com.winlator.cmod.feature.retro.RetroSystems.allExtensions,
+                                                dimAmount = 0.5f,
+                                                preserveBackdropBlur = true,
+                                                extraRoots = driveRoots(includeInternal = true),
+                                                onSelected = ::selectExecutable,
+                                            )
+                                        },
+                                    ).padding(horizontal = 12.dp, vertical = 10.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Icon(Icons.Outlined.FolderOpen, contentDescription = null, tint = Accent, modifier = Modifier.size(16.dp))
+                            Spacer(Modifier.width(8.dp))
+                            Text(
+                                selectedExePath ?: "Select Executable or Console ROM",
+                                color = if (selectedExePath == null) TextSecondary else TextPrimary,
+                                maxLines = if (selectedExePath == null) 1 else Int.MAX_VALUE,
+                                overflow = if (selectedExePath == null) TextOverflow.Ellipsis else TextOverflow.Visible,
+                                fontSize = if (selectedExePath == null) 12.sp else 10.sp,
+                                modifier = Modifier.weight(1f),
+                            )
+                        }
+
+                        if (selectedExePath != null) {
+
+                            Spacer(Modifier.height(8.dp))
+
+                            // Game name text field — compact
+                            OutlinedTextField(
+                                value = gameName,
+                                onValueChange = { gameName = it },
+                                label = { Text(stringResource(R.string.library_games_game_name), fontSize = 11.sp) },
+                                singleLine = true,
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .paneNavItem(cornerRadius = 10.dp, onActivate = { nameEditing = true })
+                                    .pointerInput(Unit) {
+                                        awaitEachGesture {
+                                            awaitFirstDown(requireUnconsumed = false)
+                                            nameEditing = true
+                                        }
+                                    }
+                                    .focusRequester(nameFocus)
+                                    .focusProperties { canFocus = nameEditing }
+                                    .onFocusChanged { if (!it.isFocused) nameEditing = false }
+                                    .controllerTextFieldEscape(),
+                                textStyle = MaterialTheme.typography.bodySmall.copy(color = TextPrimary),
+                                colors =
+                                    OutlinedTextFieldDefaults.colors(
+                                        focusedBorderColor = Accent,
+                                        unfocusedBorderColor = TextSecondary.copy(alpha = 0.3f),
+                                        focusedTextColor = TextPrimary,
+                                        unfocusedTextColor = TextPrimary,
+                                        cursorColor = Accent,
+                                        focusedLabelColor = Accent,
+                                        unfocusedLabelColor = TextSecondary,
+                                    ),
+                                shape = RoundedCornerShape(10.dp),
+                            )
+
+                            Spacer(Modifier.height(8.dp))
+
+                            if (retroSystem != null) {
+                                val activeRetroSystem = retroSystem
+                                var consoleMenuOpen by remember { mutableStateOf(false) }
+                                Box {
+                                    Row(
+                                        modifier =
+                                            Modifier
+                                                .fillMaxWidth()
+                                                .clip(RoundedCornerShape(10.dp))
+                                                .background(Color.White.copy(alpha = 0.05f))
+                                                .paneNavItem(
+                                                    cornerRadius = 10.dp,
+                                                    tapToSelect = true,
+                                                    onActivate = { consoleMenuOpen = true },
+                                                ).clickable { consoleMenuOpen = true }
+                                                .padding(horizontal = 10.dp, vertical = 8.dp),
+                                        verticalAlignment = Alignment.CenterVertically,
+                                    ) {
+                                        Icon(
+                                            Icons.Outlined.SportsEsports,
+                                            contentDescription = null,
+                                            tint = StatusOnline.copy(alpha = 0.7f),
+                                            modifier = Modifier.size(14.dp),
+                                        )
+                                        Spacer(Modifier.width(6.dp))
+                                        Column(Modifier.weight(1f)) {
+                                            Text("Console", color = TextSecondary, fontSize = 9.sp)
+                                            Text(
+                                                activeRetroSystem?.displayName ?: "",
+                                                color = TextPrimary,
+                                                fontSize = 10.sp,
+                                                maxLines = 1,
+                                                overflow = TextOverflow.Ellipsis,
+                                            )
+                                        }
+                                        Icon(
+                                            Icons.Outlined.Edit,
+                                            contentDescription = stringResource(R.string.common_ui_change),
+                                            tint = Accent,
+                                            modifier = Modifier.size(14.dp),
+                                        )
+                                    }
+                                    DropdownMenu(
+                                        expanded = consoleMenuOpen,
+                                        onDismissRequest = { consoleMenuOpen = false },
+                                        containerColor = Color(0xFF1C232E),
+                                    ) {
+                                        com.winlator.cmod.feature.retro.RetroSystems.ALL.forEach { candidate ->
+                                            DropdownMenuItem(
+                                                text = {
+                                                    Text(
+                                                        candidate.displayName,
+                                                        color =
+                                                            if (candidate.id == activeRetroSystem?.id) Accent else TextPrimary,
+                                                        fontSize = 12.sp,
+                                                    )
+                                                },
+                                                onClick = {
+                                                    retroSystem = candidate
+                                                    consoleMenuOpen = false
+                                                },
+                                            )
+                                        }
+                                    }
+                                }
+                            } else {
+                            // Game folder — single compact row
+                            Row(
+                                modifier =
+                                    Modifier
+                                        .fillMaxWidth()
+                                        .clip(RoundedCornerShape(10.dp))
+                                        .background(Color.White.copy(alpha = 0.05f))
+                                        .padding(horizontal = 10.dp, vertical = 6.dp),
+                                verticalAlignment = Alignment.CenterVertically,
+                            ) {
+                                Icon(
+                                    Icons.Outlined.Folder,
+                                    contentDescription = null,
+                                    tint = StatusOnline.copy(alpha = 0.7f),
+                                    modifier = Modifier.size(14.dp),
+                                )
+                                Spacer(Modifier.width(6.dp))
+                                Column(Modifier.weight(1f)) {
+                                    Text(
+                                        stringResource(R.string.library_games_game_folder_mapped_drive),
+                                        color = TextSecondary,
+                                        fontSize = 9.sp,
+                                    )
+                                    Text(
+                                        gameFolder ?: stringResource(R.string.common_ui_auto_detected),
+                                        color = if (gameFolder != null) TextPrimary else TextSecondary,
+                                        fontSize = 10.sp,
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                    )
+                                }
+                                val openFolderPicker = {
+                                    if (ensureAllFilesAccessForImports(context)) {
+                                        DirectoryPickerDialog.show(
+                                            activity = this@AddCustomGameDialog,
+                                            initialPath = gameFolder,
+                                            title = getString(R.string.common_ui_select_folder),
+                                            dimAmount = 0.5f,
+                                            preserveBackdropBlur = true,
+                                            extraRoots = driveRoots(includeInternal = true),
+                                        ) { path -> gameFolder = path }
+                                    }
+                                }
+                                IconButton(
+                                    onClick = openFolderPicker,
+                                    modifier =
+                                        Modifier.size(28.dp).paneNavItem(
+                                            cornerRadius = 8.dp,
+                                            onActivate = openFolderPicker,
+                                        ),
+                                ) {
+                                    Icon(
+                                        Icons.Outlined.Edit,
+                                        contentDescription = stringResource(R.string.common_ui_change),
+                                        tint = Accent,
+                                        modifier = Modifier.size(14.dp),
+                                    )
+                                }
+                            }
+                            }
+                        }
+                    }
+
+                    Spacer(Modifier.height(12.dp))
+
+                    // Action buttons
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.End,
+                    ) {
+                        OutlinedButton(
+                            onClick = onDismiss,
+                            shape = RoundedCornerShape(10.dp),
+                            border = androidx.compose.foundation.BorderStroke(1.dp, TextSecondary.copy(alpha = 0.3f)),
+                            colors = ButtonDefaults.outlinedButtonColors(contentColor = TextSecondary),
+                            contentPadding = PaddingValues(horizontal = 14.dp, vertical = 0.dp),
+                            modifier =
+                                Modifier.height(34.dp).widthIn(min = 72.dp)
+                                    .paneNavItem(cornerRadius = 10.dp, onActivate = onDismiss),
+                        ) {
+                            Text(stringResource(R.string.common_ui_cancel), fontSize = 12.sp)
+                        }
+                        Spacer(Modifier.width(8.dp))
+                        OutlinedButton(
+                            onClick = doAdd,
+                            enabled = addEnabled,
+                            shape = RoundedCornerShape(10.dp),
+                            border =
+                                androidx.compose.foundation.BorderStroke(
+                                    1.dp,
+                                    if (addEnabled) Accent.copy(alpha = 0.5f) else TextSecondary.copy(alpha = 0.2f),
+                                ),
+                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Accent),
+                            contentPadding = PaddingValues(horizontal = 14.dp, vertical = 0.dp),
+                            modifier =
+                                Modifier.height(34.dp).widthIn(min = 72.dp)
+                                    .paneNavItem(cornerRadius = 10.dp, onActivate = { if (addEnabled) doAdd() }),
+                        ) {
+                            if (isAdding) {
+                                CircularProgressIndicator(color = Accent, modifier = Modifier.size(12.dp), strokeWidth = 2.dp)
+                            } else {
+                                Text(stringResource(R.string.common_ui_add), fontWeight = FontWeight.Medium, fontSize = 12.sp)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+internal fun UnifiedActivity.ensureAllFilesAccessForImports(context: android.content.Context): Boolean {
+    if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.R || android.os.Environment.isExternalStorageManager()) {
+        return true
+    }
+
+    com.winlator.cmod.shared.ui.toast.WinToast.show(
+        context,
+        "Grant All files access to browse Downloads directly.",
+        android.widget.Toast.LENGTH_LONG,
+    )
+
+    val intent =
+        android.content.Intent(android.provider.Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION).apply {
+            data = android.net.Uri.parse("package:$packageName")
+        }
+    startActivity(intent)
+    return false
+}
+
+internal fun UnifiedActivity.driveRoots(includeInternal: Boolean): List<DirectoryPickerDialog.ManagedRoot> {
+    val imagefsRoot =
+        com.winlator.cmod.runtime.display.environment.ImageFs.find(this).getRootDir()
+    val roots =
+        mutableListOf(
+            DirectoryPickerDialog.ManagedRoot("C:", java.io.File(imagefsRoot, "home").absolutePath),
+            DirectoryPickerDialog.ManagedRoot("Z:", imagefsRoot.absolutePath),
+            DirectoryPickerDialog.ManagedRoot(
+                "D:",
+                android.os.Environment
+                    .getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS)
+                    .absolutePath,
+            ),
+        )
+    if (includeInternal) {
+        roots +=
+            DirectoryPickerDialog.ManagedRoot(
+                "Internal",
+                android.os.Environment.getExternalStorageDirectory().absolutePath,
+            )
+    }
+    return roots
+}
+
+internal suspend fun scrapeCustomGameArtwork(
+    context: android.content.Context,
+    gameName: String,
+    shortcutUuid: String,
+    container: Container,
+    shortcutFile: java.io.File
+) {
+    withContext(Dispatchers.Main) {
+        com.winlator.cmod.shared.ui.toast.WinToast.show(context, R.string.library_games_scraping_artwork, android.widget.Toast.LENGTH_LONG)
+    }
+    val shortcut = Shortcut(container, shortcutFile)
+    val artworkInfo = SteamArtworkScraper(context).getGameArtwork(gameName)
+    val dir = java.io.File(context.filesDir, "library_view_artwork")
+    if (!dir.exists()) dir.mkdirs()
+    var saved = false
+    artworkInfo.forEach { (slotSuffix, file) ->
+        val librarySlot =
+            LibraryShortcutArtwork.LibraryArtworkSlot.entries.find { it.fileSuffix == slotSuffix }
+        val bitmap =
+            if (librarySlot != null && file.isFile) {
+                com.winlator.cmod.shared.android.ImageUtils.getBitmapFromUri(context, file.toUri(), 1024)
+            } else {
+                null
+            }
+        if (librarySlot != null && bitmap != null) {
+            val outputFile = java.io.File(dir, "${shortcutUuid}_${librarySlot.fileSuffix}.png")
+            if (com.winlator.cmod.shared.io.FileUtils.saveBitmapToFile(bitmap, outputFile)) {
+                shortcut.putExtra(librarySlot.extraKey, outputFile.absolutePath)
+                saved = true
+            }
+        }
+        file.delete()
+    }
+    if (saved) shortcut.saveData()
+    withContext(Dispatchers.Main) {
+        com.winlator.cmod.shared.ui.toast.WinToast.show(
+            context,
+            if (saved) R.string.common_ui_done else R.string.common_ui_failed,
+            android.widget.Toast.LENGTH_LONG,
+        )
+        if (saved) {
+            com.winlator.cmod.app.PluviaApp.events.emit(com.winlator.cmod.feature.stores.steam.events.AndroidEvent.LibraryArtworkChanged)
+        }
+    }
+}
+
+internal fun UnifiedActivity.addCustomGame(
+    context: android.content.Context,
+    name: String,
+    exePath: String,
+    gameFolderPath: String,
+) {
+    val containerManager = ContainerManager(context)
+    var container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
+    if (container == null) {
+        SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
+        return
+    }
+
+    val exeFile = java.io.File(exePath)
+    normalizeContainerDrives(container)
+    val execCmd = buildWineExecCommand(container, gameFolderPath, exeFile)
+
+    val desktopDir = container.getDesktopDir()
+    if (!desktopDir.exists()) desktopDir.mkdirs()
+    val safeName = name.replace("/", "_").replace("\\", "_")
+    val shortcutFile = java.io.File(desktopDir, "$safeName.desktop")
+    val shortcutUuid = java.util.UUID.randomUUID().toString()
+    val iconOutFile = LibraryShortcutArtwork.buildManagedCustomGameArtworkFile(context, shortcutUuid)
+    val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    val extractedArtworkPath =
+        try {
+            if (PeIconExtractor.extractAndSave(java.io.File(exePath), iconOutFile)) {
+                iconOutFile.absolutePath
+            } else {
+                null
+            }
+        } catch (_: Exception) {
+            null
+        }
+    val content = StringBuilder()
+    content.append("[Desktop Entry]\n")
+    content.append("Type=Application\n")
+    content.append("Name=$name\n")
+    content.append("Exec=$execCmd\n")
+    content.append("Icon=custom_game\n")
+    content.append("\n[Extra Data]\n")
+    content.append("game_source=CUSTOM\n")
+    content.append("custom_name=$name\n")
+    content.append("custom_exe=$exePath\n")
+    content.append("custom_game_folder=$gameFolderPath\n")
+    content.append("uuid=$shortcutUuid\n")
+    extractedArtworkPath?.let { content.append("customCoverArtPath=$it\n") }
+    content.append("container_id=${container.id}\n")
+    content.append("use_container_defaults=1\n")
+    com.winlator.cmod.shared.io.FileUtils
+        .writeString(shortcutFile, content.toString())
+    container.saveData()
+    if (preferences.getBoolean("enable_auto_scraping", false)) {
+        CoroutineScope(Dispatchers.IO).launch {
+            scrapeCustomGameArtwork(context, name, shortcutUuid, container, shortcutFile)
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.CustomPathWarningDialog(
+    onDismiss: () -> Unit,
+    onProceed: () -> Unit,
+) {
+    Dialog(onDismissRequest = onDismiss) {
+        Surface(
+            shape = RoundedCornerShape(16.dp),
+            color = CardDark,
+            modifier = Modifier.padding(16.dp),
+        ) {
+            Column(modifier = Modifier.padding(24.dp)) {
+                Text(
+                    text = stringResource(R.string.stores_accounts_custom_download_path),
+                    style = MaterialTheme.typography.titleLarge,
+                    color = TextPrimary,
+                    fontWeight = FontWeight.Bold,
+                )
+                Spacer(Modifier.height(16.dp))
+                Text(
+                    text = stringResource(R.string.stores_accounts_custom_download_path_description),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = TextSecondary,
+                )
+                Spacer(Modifier.height(24.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.Center,
+                ) {
+                    TextButton(onClick = onDismiss) {
+                        Text(stringResource(R.string.common_ui_close), color = TextSecondary)
+                    }
+                    Spacer(Modifier.width(8.dp))
+                    Button(
+                        onClick = onProceed,
+                        colors = ButtonDefaults.buttonColors(containerColor = Accent),
+                        shape = RoundedCornerShape(8.dp),
+                    ) {
+                        Text(stringResource(R.string.common_ui_proceed))
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.rememberControllerConnectionState(): ControllerConnectionState {
+    val context = LocalContext.current
+    val inputManager = remember(context) { context.getSystemService(InputManager::class.java) }
+    var controllerState by remember { mutableStateOf(ControllerConnectionState()) }
+
+    DisposableEffect(inputManager) {
+        fun refreshState() {
+            controllerState =
+                ControllerConnectionState(
+                    isConnected = ControllerHelper.isControllerConnected(),
+                    isPlayStation = ControllerHelper.isPlayStationController(),
+                )
+        }
+
+        val listener =
+            object : InputManager.InputDeviceListener {
+                override fun onInputDeviceAdded(deviceId: Int) = refreshState()
+
+                override fun onInputDeviceRemoved(deviceId: Int) = refreshState()
+
+                override fun onInputDeviceChanged(deviceId: Int) = refreshState()
+            }
+
+        refreshState()
+        inputManager?.registerInputDeviceListener(listener, null)
+        onDispose {
+            inputManager?.unregisterInputDeviceListener(listener)
+        }
+    }
+
+    return controllerState
+}
diff --git a/app/src/main/app/shell/UnifiedActivityGameDialogs.kt b/app/src/main/app/shell/UnifiedActivityGameDialogs.kt
new file mode 100644
index 000000000..4f8606c4e
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityGameDialogs.kt
@@ -0,0 +1,3168 @@
+package com.winlator.cmod.app.shell
+import com.winlator.cmod.app.shell.UnifiedActivity.GameSettingsActionItem
+import com.winlator.cmod.app.shell.UnifiedActivity.GameSettingsScreen
+import com.winlator.cmod.app.shell.UnifiedActivity.HeroBootChoice
+import com.winlator.cmod.app.shell.UnifiedActivity.HeroLaunchPopup
+import com.winlator.cmod.app.shell.UnifiedActivity.HomeShortcutUiState
+import com.winlator.cmod.app.shell.UnifiedActivity.LibraryDetailPopup
+import com.winlator.cmod.app.shell.UnifiedActivity.LibraryDetailScreen
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Game settings/detail dialogs, split out of UnifiedActivity.kt (behavior-identical).
+
+@Composable
+internal fun UnifiedActivity.LibraryDetailPopupFrame(
+    title: String,
+    onDismissRequest: () -> Unit,
+    wide: Boolean = false,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    val dismissInteractionSource = remember { MutableInteractionSource() }
+    val panelInteractionSource = remember { MutableInteractionSource() }
+    val registry = remember { PaneNavRegistry() }
+
+    CompositionLocalProvider(LocalPaneNav provides registry) {
+    DialogPaneNav(registry, onDismiss = onDismissRequest)
+    Box(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(Color.Black.copy(alpha = 0.58f))
+                .clickable(
+                    interactionSource = dismissInteractionSource,
+                    indication = null,
+                    onClick = onDismissRequest,
+                ),
+    ) {
+        BoxWithConstraints(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .windowInsetsPadding(WindowInsets.navigationBars)
+                    .padding(16.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            val panelMaxWidth = if (wide) 440.dp else 360.dp
+            val panelWidthFraction = if (wide) 0.72f else 0.58f
+            val panelMaxHeight = (maxHeight - 16.dp).coerceAtLeast(240.dp)
+
+            Surface(
+                modifier =
+                    Modifier
+                        .fillMaxWidth(panelWidthFraction)
+                        .widthIn(max = panelMaxWidth)
+                        .heightIn(max = panelMaxHeight)
+                        .clickable(
+                            interactionSource = panelInteractionSource,
+                            indication = null,
+                            onClick = {},
+                        ),
+                shape = RoundedCornerShape(16.dp),
+                color = CardDark,
+                border = BorderStroke(1.dp, CardBorder),
+                tonalElevation = 8.dp,
+                shadowElevation = 12.dp,
+            ) {
+                Column {
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(start = 16.dp, top = 8.dp, end = 8.dp, bottom = 8.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Text(
+                            text = title,
+                            style = MaterialTheme.typography.titleSmall,
+                            fontSize = 13.sp,
+                            color = TextPrimary,
+                            fontWeight = FontWeight.Bold,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier.weight(1f),
+                        )
+                        IconButton(
+                            onClick = onDismissRequest,
+                            modifier =
+                                Modifier
+                                    .size(34.dp)
+                                    .paneNavItem(cornerRadius = 8.dp, onActivate = onDismissRequest),
+                        ) {
+                            Icon(
+                                Icons.Outlined.Close,
+                                contentDescription = stringResource(R.string.common_ui_close),
+                                tint = TextSecondary,
+                                modifier = Modifier.size(20.dp),
+                            )
+                        }
+                    }
+                    HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                    Column(
+                        modifier =
+                            Modifier
+                                .weight(1f, fill = false)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        content()
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GameSettingsDialogFrame(
+    title: String,
+    onDismissRequest: () -> Unit,
+    wide: Boolean = false,
+    contentKey: Any? = null,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    val registry = remember { PaneNavRegistry() }
+    LaunchedEffect(contentKey) { registry.reset() }
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+      CompositionLocalProvider(LocalPaneNav provides registry) {
+        DialogPaneNav(registry, onDismiss = onDismissRequest)
+        BoxWithConstraints(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .windowInsetsPadding(WindowInsets.navigationBars),
+            contentAlignment = Alignment.Center,
+        ) {
+            val widthModifier =
+                if (wide) {
+                    Modifier.widthIn(min = 320.dp, max = (maxWidth - 32.dp).coerceAtMost(560.dp))
+                } else {
+                    Modifier.widthIn(min = 200.dp, max = 280.dp)
+                }
+            val maxContentHeight = (maxHeight - 48.dp).coerceAtLeast(320.dp)
+            Surface(
+                modifier = widthModifier.heightIn(max = maxContentHeight),
+                shape = RoundedCornerShape(14.dp),
+                color = CardDark,
+                border = BorderStroke(1.dp, CardBorder),
+                tonalElevation = 8.dp,
+            ) {
+                Column(
+                    modifier =
+                        Modifier
+                            .padding(vertical = 6.dp),
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Text(
+                            text = title,
+                            modifier = Modifier
+                                .weight(1f)
+                                .padding(start = 16.dp, top = 8.dp, bottom = 8.dp),
+                            style = MaterialTheme.typography.titleSmall,
+                            color = TextPrimary,
+                            fontWeight = FontWeight.Bold,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                        IconButton(
+                            onClick = onDismissRequest,
+                            modifier = Modifier
+                                .padding(end = 4.dp)
+                                .size(34.dp)
+                                .paneNavItem(cornerRadius = 17.dp, onActivate = onDismissRequest, pinTop = true),
+                        ) {
+                            Icon(
+                                Icons.Outlined.Close,
+                                contentDescription = stringResource(R.string.common_ui_close),
+                                tint = TextSecondary,
+                                modifier = Modifier.size(20.dp),
+                            )
+                        }
+                    }
+                    HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                    Column(
+                        modifier =
+                            Modifier
+                                .weight(1f, fill = false)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        content()
+                    }
+                }
+            }
+        }
+      }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GameSettingsActionGrid(
+    actions: List<GameSettingsActionItem>,
+    modifier: Modifier = Modifier,
+) {
+    Column(modifier = modifier) {
+        actions.forEachIndexed { index, action ->
+            if (index > 0) {
+                HorizontalDivider(
+                    color = CardBorder.copy(alpha = 0.5f),
+                    thickness = 0.5.dp,
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                )
+            }
+            GameSettingsActionCard(action = action, isEntry = index == 0)
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GameSettingsActionCard(
+    action: GameSettingsActionItem,
+    modifier: Modifier = Modifier,
+    isEntry: Boolean = false,
+) {
+    val isDanger = action.accentColor == DangerRed
+    val iconColor = if (isDanger) DangerRed else TextSecondary
+    val textColor = if (isDanger) DangerRed else TextPrimary
+
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.96f else 1f,
+        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+        label = "actionCardScale",
+    )
+    Row(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }.paneNavItem(cornerRadius = 0.dp, onActivate = action.onClick, isEntry = isEntry)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = action.onClick,
+                ).padding(horizontal = 16.dp, vertical = 11.dp),
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            imageVector = action.icon,
+            contentDescription = null,
+            tint = iconColor,
+            modifier = Modifier.size(18.dp),
+        )
+        Text(
+            text = action.title,
+            style = MaterialTheme.typography.bodyMedium,
+            color = textColor,
+            fontWeight = FontWeight.Medium,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GameSettingsInfoCard(
+    message: String,
+    accentColor: Color = Accent,
+) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 12.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(6.dp),
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Warning,
+            contentDescription = null,
+            tint = accentColor.copy(alpha = 0.7f),
+            modifier = Modifier.size(18.dp),
+        )
+        Text(
+            text = message,
+            style = MaterialTheme.typography.bodySmall,
+            color = TextSecondary,
+            lineHeight = 18.sp,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+/**
+ * Shared uninstall/remove confirmation UI used by GameSettingsDialog,
+ * GOGGameSettingsDialog, and LibraryGameDetailDialog.
+ */
+@Composable
+internal fun UnifiedActivity.UninstallConfirmation(
+    message: String,
+    confirmLabel: String = stringResource(R.string.common_ui_uninstall),
+    onConfirm: () -> Unit,
+    onCancel: () -> Unit,
+) {
+    var isUninstalling by remember { mutableStateOf(false) }
+
+    GameSettingsInfoCard(message = message, accentColor = DangerRed)
+
+    if (isUninstalling) {
+        Box(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            CircularProgressIndicator(color = DangerRed)
+        }
+    } else {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
+            horizontalArrangement = Arrangement.End,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(
+                onClick = {
+                    isUninstalling = true
+                    onConfirm()
+                },
+                modifier = Modifier.paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { isUninstalling = true; onConfirm() },
+                    isEntry = true,
+                ),
+                border = BorderStroke(1.dp, DangerRed.copy(alpha = 0.5f)),
+                shape = RoundedCornerShape(8.dp),
+                colors = ButtonDefaults.outlinedButtonColors(contentColor = DangerRed),
+            ) {
+                Text(
+                    confirmLabel,
+                    style = MaterialTheme.typography.bodySmall,
+                    fontWeight = FontWeight.Medium,
+                )
+            }
+            Spacer(Modifier.width(8.dp))
+            TextButton(
+                onClick = onCancel,
+                modifier = Modifier.paneNavItem(cornerRadius = 8.dp, onActivate = onCancel),
+            ) {
+                Text(stringResource(R.string.common_ui_cancel), color = TextSecondary, style = MaterialTheme.typography.bodySmall)
+            }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.ShortcutRemovalConfirmation(
+    message: String,
+    onConfirm: () -> Unit,
+    onCancel: () -> Unit,
+) {
+    var isRemoving by remember { mutableStateOf(false) }
+
+    GameSettingsInfoCard(message = message, accentColor = DangerRed)
+
+    if (isRemoving) {
+        Box(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            CircularProgressIndicator(color = DangerRed)
+        }
+    } else {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
+            horizontalArrangement = Arrangement.End,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(
+                onClick = {
+                    isRemoving = true
+                    onConfirm()
+                },
+                modifier = Modifier.paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { isRemoving = true; onConfirm() },
+                    isEntry = true,
+                ),
+                border = BorderStroke(1.dp, DangerRed.copy(alpha = 0.5f)),
+                shape = RoundedCornerShape(8.dp),
+                colors = ButtonDefaults.outlinedButtonColors(contentColor = DangerRed),
+            ) {
+                Text(
+                    stringResource(R.string.common_ui_remove),
+                    style = MaterialTheme.typography.bodySmall,
+                    fontWeight = FontWeight.Medium,
+                )
+            }
+            Spacer(Modifier.width(8.dp))
+            TextButton(
+                onClick = onCancel,
+                modifier = Modifier.paneNavItem(cornerRadius = 8.dp, onActivate = onCancel),
+            ) {
+                Text(stringResource(R.string.common_ui_cancel), color = TextSecondary, style = MaterialTheme.typography.bodySmall)
+            }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.HeroLaunchConfirmFooter(
+    onCancel: () -> Unit,
+    onContinue: () -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        PaneFooterAction(
+            label = stringResource(R.string.common_ui_cancel),
+            textColor = DangerRed,
+            onClick = onCancel,
+        )
+        PaneFooterAction(
+            label = stringResource(R.string.common_ui_continue),
+            textColor = StatusOnline,
+            onClick = onContinue,
+            isEntry = true,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.PaneFooterAction(
+    label: String,
+    textColor: Color,
+    onClick: () -> Unit,
+    isEntry: Boolean = false,
+) {
+    Box(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(8.dp))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    tapToSelect = true,
+                    isEntry = isEntry,
+                ).padding(horizontal = 10.dp, vertical = 7.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.HeroBootDialog(
+    onConfirm: (HeroBootChoice) -> Unit,
+    onDismissRequest: () -> Unit,
+) {
+    var choice by remember { mutableStateOf(HeroBootChoice.Desktop) }
+    val graphicsTest = stringResource(R.string.hero_graphics_tests_title)
+    val inputTest = stringResource(R.string.hero_input_tests_title)
+    val bits32 = stringResource(R.string.hero_graphics_test_32)
+    val bits64 = stringResource(R.string.hero_graphics_test_64)
+    val test32 = "$graphicsTest $bits32"
+    val test64 = "$graphicsTest $bits64"
+    val input32 = "$inputTest $bits32"
+    val input64 = "$inputTest $bits64"
+    val title =
+        when (choice) {
+            HeroBootChoice.Desktop -> stringResource(R.string.hero_boot_to_desktop_title)
+            HeroBootChoice.Cube32 -> test32
+            HeroBootChoice.Cube64 -> test64
+            HeroBootChoice.Input32 -> input32
+            HeroBootChoice.Input64 -> input64
+        }
+    val registry = remember { PaneNavRegistry() }
+    Dialog(onDismissRequest = onDismissRequest) {
+      CompositionLocalProvider(LocalPaneNav provides registry) {
+        DialogPaneNav(registry, onDismiss = onDismissRequest, onStart = { onConfirm(choice) })
+        PopupDialog(
+            title = title,
+            icon = Icons.Outlined.DesktopWindows,
+            accentColor = Accent,
+            modifier = Modifier.widthIn(min = 220.dp, max = 290.dp),
+            content = {
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalArrangement = Arrangement.spacedBy(6.dp),
+                ) {
+                    HeroBootOptionRow(
+                        label = stringResource(R.string.hero_boot_to_desktop_title),
+                        selected = choice == HeroBootChoice.Desktop,
+                        onClick = { choice = HeroBootChoice.Desktop },
+                    )
+                    HeroBootOptionRow(
+                        label = test32,
+                        selected = choice == HeroBootChoice.Cube32,
+                        onClick = { choice = HeroBootChoice.Cube32 },
+                    )
+                    HeroBootOptionRow(
+                        label = test64,
+                        selected = choice == HeroBootChoice.Cube64,
+                        onClick = { choice = HeroBootChoice.Cube64 },
+                    )
+                    HeroBootOptionRow(
+                        label = input32,
+                        selected = choice == HeroBootChoice.Input32,
+                        onClick = { choice = HeroBootChoice.Input32 },
+                    )
+                    HeroBootOptionRow(
+                        label = input64,
+                        selected = choice == HeroBootChoice.Input64,
+                        onClick = { choice = HeroBootChoice.Input64 },
+                    )
+                }
+            },
+            footer = {
+                HeroLaunchConfirmFooter(onCancel = onDismissRequest, onContinue = { onConfirm(choice) })
+            },
+        )
+      }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.HeroBootOptionRow(
+    label: String,
+    selected: Boolean,
+    onClick: () -> Unit,
+) {
+    val glassBlue = Accent
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(8.dp))
+            .background(glassBlue.copy(alpha = if (selected) 0.26f else 0.05f))
+            .border(1.dp, glassBlue.copy(alpha = if (selected) 0.65f else 0.12f), RoundedCornerShape(8.dp))
+            .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, tapToSelect = true)
+            .padding(horizontal = 12.dp, vertical = 8.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = if (selected) Color.White else glassBlue.copy(alpha = 0.5f),
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.HeroRemoveShortcutDialog(
+    gameName: String,
+    onConfirm: () -> Unit,
+    onDismissRequest: () -> Unit,
+) {
+    val registry = remember { PaneNavRegistry() }
+    var isRemoving by remember { mutableStateOf(false) }
+    Dialog(onDismissRequest = onDismissRequest) {
+      CompositionLocalProvider(LocalPaneNav provides registry) {
+        DialogPaneNav(registry, onDismiss = onDismissRequest)
+        PopupDialog(
+            title = stringResource(R.string.common_ui_shortcut),
+            message = stringResource(R.string.shortcuts_list_remove_game_shortcut_message, gameName),
+            icon = Icons.Outlined.Home,
+            accentColor = DangerRed,
+            confirmButtonColor = DangerRed,
+            progressLabel = stringResource(R.string.common_ui_working),
+            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+            footer = {
+                if (isRemoving) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
+                        horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterHorizontally),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        CircularProgressIndicator(color = DangerRed, strokeWidth = 2.dp, modifier = Modifier.size(20.dp))
+                        Text(
+                            stringResource(R.string.common_ui_working),
+                            color = TextPrimary,
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.SemiBold,
+                        )
+                    }
+                } else {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        PaneFooterAction(
+                            label = stringResource(R.string.common_ui_cancel),
+                            textColor = TextSecondary,
+                            onClick = onDismissRequest,
+                        )
+                        PaneFooterAction(
+                            label = stringResource(R.string.common_ui_remove),
+                            textColor = DangerRed,
+                            onClick = {
+                                isRemoving = true
+                                onConfirm()
+                            },
+                            isEntry = true,
+                        )
+                    }
+                }
+            },
+        )
+      }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GameSettingsDialog(
+    app: SteamApp,
+    onDismissRequest: () -> Unit,
+) {
+    val context = LocalContext.current
+    var currentTab by remember { mutableStateOf(GameSettingsScreen.Menu) }
+    val scope = rememberCoroutineScope()
+    val isCustom = app.id < 0
+    val isEpic = app.id >= 2000000000
+    val epicId = if (isEpic) app.id - 2000000000 else 0
+    var shortcutRefreshKey by remember(app.id, isCustom, isEpic, epicId) { mutableStateOf(0) }
+    var pinnedShortcutOverride by remember(app.id, isCustom, isEpic, epicId) { mutableStateOf<Boolean?>(null) }
+    val epicArtworkUrl by produceState<String?>(initialValue = null, key1 = isEpic, key2 = epicId) {
+        value =
+            if (isEpic) {
+                val epicGame = db.epicGameDao().getById(epicId)
+                epicGame?.primaryImageUrl ?: epicGame?.iconUrl
+            } else {
+                null
+            }
+    }
+    val currentRefreshSignal = this@GameSettingsDialog.libraryRefreshSignal
+    val homeShortcutState by produceState(
+        HomeShortcutUiState(),
+        app.id,
+        isCustom,
+        isEpic,
+        epicId,
+        currentRefreshSignal,
+        shortcutRefreshKey,
+    ) {
+        value =
+            withContext(Dispatchers.IO) {
+                val shortcut = findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
+                HomeShortcutUiState(
+                    shortcut = shortcut,
+                    isPinned = shortcut?.let { LibraryShortcutUtils.hasPinnedHomeShortcut(context, it) } == true,
+                    loaded = true,
+                )
+            }
+    }
+    val artworkRefreshListener =
+        remember(app.id, isCustom, isEpic, epicId) {
+            object : EventDispatcher.JavaEventListener {
+                override fun onEvent(event: Any) {
+                    if (event is AndroidEvent.LibraryArtworkChanged) {
+                        shortcutRefreshKey++
+                    }
+                }
+            }
+        }
+    DisposableEffect(artworkRefreshListener) {
+        PluviaApp.events.onJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
+        onDispose {
+            PluviaApp.events.offJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
+        }
+    }
+    val hasPinnedShortcut = pinnedShortcutOverride ?: homeShortcutState.isPinned
+
+    val exportLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
+            if (uri != null) {
+                scope.launch(kotlinx.coroutines.Dispatchers.IO) {
+                    try {
+                        val os = context.contentResolver.openOutputStream(uri) ?: return@launch
+                        val zos = java.util.zip.ZipOutputStream(java.io.BufferedOutputStream(os))
+
+                        val containerManager =
+                            com.winlator.cmod.runtime.container
+                                .ContainerManager(context)
+                        val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+
+                        val dirsToZip = mutableListOf<java.io.File>()
+
+                        val goldbergSaves = java.io.File(SteamService.getAppDirPath(app.id), "steam_settings/saves")
+                        if (goldbergSaves.exists() && goldbergSaves.isDirectory) {
+                            dirsToZip.add(goldbergSaves)
+                        }
+
+                        if (shortcut != null) {
+                            val prefixDir = java.io.File(shortcut.container.getRootDir(), ".wine/drive_c/users/xuser")
+                            val docs = java.io.File(prefixDir, "Documents")
+                            val savedGames = java.io.File(prefixDir, "Saved Games")
+                            val appData = java.io.File(prefixDir, "AppData")
+                            if (docs.exists()) dirsToZip.add(docs)
+                            if (savedGames.exists()) dirsToZip.add(savedGames)
+                            if (appData.exists()) dirsToZip.add(appData)
+                        }
+
+                        fun zipDir(
+                            dir: java.io.File,
+                            baseName: String,
+                        ) {
+                            val children = dir.listFiles() ?: return
+                            for (child in children) {
+                                val name = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
+                                if (child.isDirectory) {
+                                    zos.putNextEntry(java.util.zip.ZipEntry("$name/"))
+                                    zos.closeEntry()
+                                    zipDir(child, name)
+                                } else {
+                                    zos.putNextEntry(java.util.zip.ZipEntry(name))
+                                    val fis = java.io.FileInputStream(child)
+                                    val buf = ByteArray(1024 * 8)
+                                    var len: Int
+                                    while (fis.read(buf).also { len = it } > 0) {
+                                        zos.write(buf, 0, len)
+                                    }
+                                    fis.close()
+                                    zos.closeEntry()
+                                }
+                            }
+                        }
+
+                        for (dir in dirsToZip) {
+                            val baseName = dir.name
+                            zos.putNextEntry(java.util.zip.ZipEntry("$baseName/"))
+                            zos.closeEntry()
+                            zipDir(dir, baseName)
+                        }
+
+                        zos.close()
+                        withContext(kotlinx.coroutines.Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                R.string.saves_import_export_exported,
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                            onDismissRequest()
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        withContext(kotlinx.coroutines.Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                getString(R.string.saves_import_export_exported_failed, e.message),
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+    val importLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            if (uri != null) {
+                scope.launch(kotlinx.coroutines.Dispatchers.IO) {
+                    try {
+                        val `is` = context.contentResolver.openInputStream(uri) ?: return@launch
+                        val zis = java.util.zip.ZipInputStream(java.io.BufferedInputStream(`is`))
+
+                        val containerManager =
+                            com.winlator.cmod.runtime.container
+                                .ContainerManager(context)
+                        val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+
+                        val goldbergSavesParent =
+                            java.io.File(
+                                if (isEpic) app.gameDir else SteamService.getAppDirPath(app.id),
+                                if (isEpic) "" else "steam_settings",
+                            )
+                        val prefixDir = shortcut?.let { java.io.File(it.container.getRootDir(), ".wine/drive_c/users/xuser") }
+
+                        var ze: java.util.zip.ZipEntry?
+                        while (zis.nextEntry.also { ze = it } != null) {
+                            val entry = ze!!
+                            val name = entry.name
+                            var destFile: java.io.File? = null
+                            if (name.startsWith("saves/")) {
+                                destFile = java.io.File(goldbergSavesParent, name)
+                            } else if (prefixDir != null) {
+                                if (name.startsWith("Documents/") || name.startsWith("Saved Games/") || name.startsWith("AppData/")) {
+                                    destFile = java.io.File(prefixDir, name)
+                                }
+                            }
+
+                            if (destFile != null) {
+                                if (entry.isDirectory) {
+                                    destFile.mkdirs()
+                                } else {
+                                    destFile.parentFile?.mkdirs()
+                                    val fos = java.io.FileOutputStream(destFile)
+                                    val buf = ByteArray(1024 * 8)
+                                    var len: Int
+                                    while (zis.read(buf).also { len = it } > 0) {
+                                        fos.write(buf, 0, len)
+                                    }
+                                    fos.close()
+                                }
+                            }
+                            zis.closeEntry()
+                        }
+                        zis.close()
+                        withContext(kotlinx.coroutines.Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                R.string.saves_import_export_imported,
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                            onDismissRequest()
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        withContext(kotlinx.coroutines.Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                getString(R.string.saves_import_export_imported_failed, e.message),
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+    GameSettingsDialogFrame(
+        title = app.name,
+        onDismissRequest = onDismissRequest,
+        wide = currentTab == GameSettingsScreen.CloudSaves,
+        contentKey = currentTab,
+    ) {
+        when (currentTab) {
+            GameSettingsScreen.Menu -> {
+                val actions =
+                    listOf(
+                        GameSettingsActionItem(
+                            title = stringResource(R.string.common_ui_settings),
+                            icon = Icons.Outlined.Settings,
+                            onClick = {
+                                val containerManager = ContainerManager(context)
+                                val shortcut =
+                                    findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                                        ?: if (isCustom) {
+                                            null
+                                        } else {
+                                            ShortcutSettingsComposeDialog.createLibraryShortcut(
+                                                context = context,
+                                                containerManager = containerManager,
+                                                source = if (isEpic) "EPIC" else "STEAM",
+                                                appId = if (isEpic) epicId else app.id,
+                                                gogId = null,
+                                                appName = app.name,
+                                            )
+                                        }
+                                if (shortcut != null) {
+                                    ShortcutSettingsComposeDialog(this@GameSettingsDialog, shortcut).show()
+                                }
+                                onDismissRequest()
+                            },
+                        ),
+                        GameSettingsActionItem(
+                            title = stringResource(R.string.hero_boot_to_desktop_title),
+                            icon = Icons.Outlined.DesktopWindows,
+                            onClick = {
+                                val shortcut =
+                                    findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
+                                if (shortcut != null) {
+                                    context.startActivity(
+                                        Intent(context, XServerDisplayActivity::class.java)
+                                            .putExtra("container_id", shortcut.container.id),
+                                    )
+                                } else {
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(context, R.string.shortcuts_list_not_available)
+                                }
+                                onDismissRequest()
+                            },
+                        ),
+                        GameSettingsActionItem(
+                            title =
+                                stringResource(
+                                    if (hasPinnedShortcut) {
+                                        R.string.common_ui_remove
+                                    } else {
+                                        R.string.common_ui_shortcut
+                                    },
+                                ),
+                            icon = Icons.Outlined.Home,
+                            accentColor = if (hasPinnedShortcut) DangerRed else Accent,
+                            onClick = {
+                                if (hasPinnedShortcut) {
+                                    currentTab = GameSettingsScreen.Shortcut
+                                } else {
+                                    scope.launch {
+                                        val created =
+                                            withContext(Dispatchers.IO) {
+                                                addLibraryShortcutToHomeScreen(
+                                                    context,
+                                                    app,
+                                                    isCustom,
+                                                    isEpic,
+                                                    epicId,
+                                                    epicArtworkUrl,
+                                                )
+                                            }
+                                        if (!created) {
+                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                context,
+                                                context.getString(
+                                                    R.string.library_games_failed_to_create_shortcut,
+                                                    app.name,
+                                                ),
+                                            )
+                                        }
+                                    }
+                                }
+                            },
+                        ),
+                        GameSettingsActionItem(
+                            title = stringResource(R.string.cloud_saves_title),
+                            icon = Icons.Outlined.CloudSync,
+                            onClick = { currentTab = GameSettingsScreen.CloudSaves },
+                        ),
+
+                        GameSettingsActionItem(
+                            title =
+                                if (isCustom) {
+                                    stringResource(
+                                        R.string.common_ui_remove,
+                                    )
+                                } else {
+                                    stringResource(R.string.common_ui_uninstall)
+                                },
+                            icon = Icons.Outlined.Delete,
+                            accentColor = DangerRed,
+                            onClick = { currentTab = GameSettingsScreen.Uninstall },
+                        ),
+                    )
+
+                GameSettingsActionGrid(actions = actions)
+            }
+
+            GameSettingsScreen.Shortcut -> {
+                ShortcutRemovalConfirmation(
+                    message = stringResource(R.string.shortcuts_list_remove_game_shortcut_message, app.name),
+                    onConfirm = {
+                        scope.launch {
+                            val removed =
+                                withContext(Dispatchers.IO) {
+                                    homeShortcutState.shortcut?.let {
+                                        LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
+                                    } == true
+                                }
+                            pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
+                            shortcutRefreshKey++
+                            currentTab = GameSettingsScreen.Menu
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                if (removed) {
+                                    context.getString(R.string.shortcuts_list_removed)
+                                } else {
+                                    context.getString(R.string.common_ui_unknown_error)
+                                },
+                            )
+                        }
+                    },
+                    onCancel = { currentTab = GameSettingsScreen.Menu },
+                )
+            }
+
+            GameSettingsScreen.CloudSaves -> {
+                var isWorking by remember { mutableStateOf(false) }
+                val shortcut =
+                    remember(app.id, epicId, isCustom, isEpic) {
+                        findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
+                    }
+                var cloudSyncEnabled by remember(shortcut?.file?.absolutePath) {
+                    mutableStateOf(isShortcutCloudSyncEnabled(shortcut))
+                }
+                var offlineModeEnabled by remember(shortcut?.file?.absolutePath) {
+                    mutableStateOf(isShortcutOfflineMode(shortcut))
+                }
+
+                val gameSource =
+                    when {
+                        isEpic -> GameSaveBackupManager.GameSource.EPIC
+                        isCustom -> GameSaveBackupManager.GameSource.CUSTOM
+                        else -> GameSaveBackupManager.GameSource.STEAM
+                    }
+                val gameIdStr =
+                    when {
+                        isEpic -> epicId.toString()
+                        isCustom -> shortcut?.let { GameSaveBackupManager.customGameId(it) } ?: app.name
+                        else -> app.id.toString()
+                    }
+                val providerLabel =
+                    when (gameSource) {
+                        GameSaveBackupManager.GameSource.EPIC ->
+                            stringResource(R.string.preloader_platform_epic)
+                        GameSaveBackupManager.GameSource.CUSTOM ->
+                            stringResource(R.string.preloader_platform_custom)
+                        else ->
+                            stringResource(R.string.preloader_platform_steam)
+                    }
+
+                CloudSavesContent(
+                    activity = this@GameSettingsDialog,
+                    isWorking = isWorking,
+                    cloudSyncEnabled = cloudSyncEnabled,
+                    offlineModeEnabled = offlineModeEnabled,
+                    gameSource = gameSource,
+                    gameId = gameIdStr,
+                    gameName = app.name,
+                    shortcut = shortcut,
+                    retroSaveDir = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.retroSaveDir(context, shortcut, gameIdStr),
+                    onCloudSyncToggle = { enabled ->
+                        cloudSyncEnabled = enabled
+                        setShortcutCloudSyncEnabled(shortcut, enabled)
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            if (enabled) {
+                                context.getString(R.string.cloud_sync_enabled_summary)
+                            } else {
+                                context.getString(R.string.cloud_sync_disabled_summary)
+                            },
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                    },
+                    onOfflineModeToggle = { enabled ->
+                        offlineModeEnabled = enabled
+                        setShortcutOfflineMode(shortcut, enabled)
+                    },
+                    onSyncFromCloud = {
+                        if (!isWorking) {
+                            isWorking = true
+                            scope.launch(Dispatchers.IO) {
+                                val ok =
+                                    CloudSyncHelper.downloadCloudSaves(
+                                        context,
+                                        gameSource,
+                                        gameIdStr,
+                                        shortcut,
+                                    )
+                                withContext(Dispatchers.Main) {
+                                    isWorking = false
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        if (ok) {
+                                            context.getString(
+                                                R.string.cloud_saves_sync_from_provider_success,
+                                                providerLabel,
+                                            )
+                                        } else {
+                                            context.getString(
+                                                R.string.cloud_saves_sync_from_provider_failed,
+                                                providerLabel,
+                                            )
+                                        },
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                }
+                            }
+                        }
+                    },
+                    onBack = { currentTab = GameSettingsScreen.Menu },
+                )
+            }
+
+            GameSettingsScreen.Uninstall -> {
+                UninstallConfirmation(
+                    message =
+                        if (isCustom) {
+                            getString(R.string.library_games_remove_confirm, app.name)
+                        } else {
+                            getString(R.string.library_games_uninstall_confirm, app.name)
+                        },
+                    confirmLabel =
+                        if (isCustom) {
+                            stringResource(
+                                R.string.common_ui_remove,
+                            )
+                        } else {
+                            stringResource(R.string.common_ui_uninstall)
+                        },
+                    onConfirm = {
+                        if (isCustom) {
+                            scope.launch(Dispatchers.IO) {
+                                val cm = ContainerManager(context)
+                                val sc = findLibraryShortcutForGame(cm, app, isCustom, isEpic, epicId)
+                                sc?.let { LibraryShortcutUtils.deleteShortcutArtifacts(context, it) }
+                                PluviaApp.events.emit(AndroidEvent.LibraryInstallStatusChanged(app.id))
+                                withContext(Dispatchers.Main) {
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        getString(R.string.library_games_game_removed, app.name),
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                    onDismissRequest()
+                                }
+                            }
+                        } else if (isEpic) {
+                            scope.launch(Dispatchers.IO) {
+                                val result = EpicService.deleteGame(context, epicId)
+                                withContext(Dispatchers.Main) {
+                                    if (result.isSuccess) {
+                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                            context,
+                                            getString(R.string.library_games_game_uninstalled, app.name),
+                                            android.widget.Toast.LENGTH_SHORT,
+                                        )
+                                    } else {
+                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                            context,
+                                            getString(
+                                                R.string.library_games_failed_to_uninstall_reason,
+                                                result.exceptionOrNull()?.message
+                                                    ?: getString(R.string.common_ui_unknown_error),
+                                            ),
+                                            android.widget.Toast.LENGTH_LONG,
+                                        )
+                                    }
+                                    onDismissRequest()
+                                }
+                            }
+                        } else {
+                            SteamService.uninstallApp(app.id) { success ->
+                                if (success) {
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        getString(R.string.library_games_game_uninstalled, app.name),
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                } else {
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        getString(R.string.library_games_failed_to_uninstall),
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                }
+                                onDismissRequest()
+                            }
+                        }
+                    },
+                    onCancel = { currentTab = GameSettingsScreen.Menu },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GOGGameSettingsDialog(
+    app: GOGGame,
+    onDismissRequest: () -> Unit,
+) {
+    val context = LocalContext.current
+    var currentTab by remember { mutableStateOf(GameSettingsScreen.Menu) }
+    val scope = rememberCoroutineScope()
+    var shortcutRefreshKey by remember(app.id) { mutableStateOf(0) }
+    var pinnedShortcutOverride by remember(app.id) { mutableStateOf<Boolean?>(null) }
+    val currentRefreshSignal = this@GOGGameSettingsDialog.libraryRefreshSignal
+    val homeShortcutState by produceState(
+        HomeShortcutUiState(),
+        app.id,
+        currentRefreshSignal,
+        shortcutRefreshKey,
+    ) {
+        value =
+            withContext(Dispatchers.IO) {
+                val shortcut =
+                    ContainerManager(context).loadShortcuts().find {
+                        it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
+                    }
+                HomeShortcutUiState(
+                    shortcut = shortcut,
+                    isPinned = shortcut?.let { LibraryShortcutUtils.hasPinnedHomeShortcut(context, it) } == true,
+                    loaded = true,
+                )
+            }
+    }
+    val hasPinnedShortcut = pinnedShortcutOverride ?: homeShortcutState.isPinned
+
+    GameSettingsDialogFrame(
+        title = app.title,
+        onDismissRequest = onDismissRequest,
+        wide = currentTab == GameSettingsScreen.CloudSaves,
+        contentKey = currentTab,
+    ) {
+        when (currentTab) {
+            GameSettingsScreen.Menu -> {
+                GameSettingsActionGrid(
+                    actions =
+                        listOf(
+                            GameSettingsActionItem(
+                                title = stringResource(R.string.common_ui_settings),
+                                icon = Icons.Outlined.Settings,
+                                onClick = {
+                                    val containerManager = ContainerManager(context)
+                                    val shortcut =
+                                        containerManager.loadShortcuts().find {
+                                            it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
+                                        } ?: ShortcutSettingsComposeDialog.createLibraryShortcut(
+                                            context = context,
+                                            containerManager = containerManager,
+                                            source = "GOG",
+                                            appId = gogPseudoId(app.id),
+                                            gogId = app.id,
+                                            appName = app.title,
+                                        )
+                                    if (shortcut != null) {
+                                        ShortcutSettingsComposeDialog(this@GOGGameSettingsDialog, shortcut).show()
+                                    }
+                                    onDismissRequest()
+                                },
+                            ),
+                            GameSettingsActionItem(
+                                title =
+                                    stringResource(
+                                        if (hasPinnedShortcut) {
+                                            R.string.common_ui_remove
+                                        } else {
+                                            R.string.common_ui_shortcut
+                                        },
+                                    ),
+                                icon = Icons.Outlined.Home,
+                                accentColor = if (hasPinnedShortcut) DangerRed else Accent,
+                                onClick = {
+                                    if (hasPinnedShortcut) {
+                                        currentTab = GameSettingsScreen.Shortcut
+                                    } else {
+                                        scope.launch {
+                                            val artworkUrl = app.imageUrl.ifEmpty { app.iconUrl }
+                                            val created =
+                                                withContext(Dispatchers.IO) {
+                                                    addGogShortcutToHomeScreen(context, app, artworkUrl)
+                                                }
+                                            if (!created) {
+                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                    context,
+                                                    context.getString(
+                                                        R.string.library_games_failed_to_create_shortcut,
+                                                        app.title,
+                                                    ),
+                                                )
+                                            }
+                                        }
+                                    }
+                                },
+                            ),
+                            GameSettingsActionItem(
+                                title = stringResource(R.string.cloud_saves_title),
+                                icon = Icons.Outlined.CloudSync,
+                                onClick = { currentTab = GameSettingsScreen.CloudSaves },
+                            ),
+                            GameSettingsActionItem(
+                                title = stringResource(R.string.common_ui_uninstall),
+                                icon = Icons.Outlined.Delete,
+                                accentColor = DangerRed,
+                                onClick = { currentTab = GameSettingsScreen.Uninstall },
+                            ),
+                        ),
+                )
+            }
+
+            GameSettingsScreen.Shortcut -> {
+                ShortcutRemovalConfirmation(
+                    message = stringResource(R.string.shortcuts_list_remove_game_shortcut_message, app.title),
+                    onConfirm = {
+                        scope.launch {
+                            val removed =
+                                withContext(Dispatchers.IO) {
+                                    homeShortcutState.shortcut?.let {
+                                        LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
+                                    } == true
+                                }
+                            pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
+                            shortcutRefreshKey++
+                            currentTab = GameSettingsScreen.Menu
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                if (removed) {
+                                    context.getString(R.string.shortcuts_list_removed)
+                                } else {
+                                    context.getString(R.string.common_ui_unknown_error)
+                                },
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    },
+                    onCancel = { currentTab = GameSettingsScreen.Menu },
+                )
+            }
+
+            GameSettingsScreen.CloudSaves -> {
+                var isWorking by remember { mutableStateOf(false) }
+                val shortcut =
+                    remember(app.id) {
+                        ContainerManager(context).loadShortcuts().find {
+                            it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
+                        }
+                    }
+                var cloudSyncEnabled by remember(shortcut?.file?.absolutePath) {
+                    mutableStateOf(isShortcutCloudSyncEnabled(shortcut))
+                }
+                var offlineModeEnabled by remember(shortcut?.file?.absolutePath) {
+                    mutableStateOf(isShortcutOfflineMode(shortcut))
+                }
+
+                val gogProviderLabel = stringResource(R.string.preloader_platform_gog)
+
+                CloudSavesContent(
+                    activity = this@GOGGameSettingsDialog,
+                    isWorking = isWorking,
+                    cloudSyncEnabled = cloudSyncEnabled,
+                    offlineModeEnabled = offlineModeEnabled,
+                    gameSource = GameSaveBackupManager.GameSource.GOG,
+                    gameId = app.id,
+                    gameName = app.title,
+                    shortcut = shortcut,
+                    onCloudSyncToggle = { enabled ->
+                        cloudSyncEnabled = enabled
+                        setShortcutCloudSyncEnabled(shortcut, enabled)
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            if (enabled) {
+                                context.getString(R.string.cloud_sync_enabled_summary)
+                            } else {
+                                context.getString(R.string.cloud_sync_disabled_summary)
+                            },
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                    },
+                    onOfflineModeToggle = { enabled ->
+                        offlineModeEnabled = enabled
+                        setShortcutOfflineMode(shortcut, enabled)
+                    },
+                    onSyncFromCloud = {
+                        if (!isWorking) {
+                            isWorking = true
+                            scope.launch(Dispatchers.IO) {
+                                val ok =
+                                    CloudSyncHelper.downloadCloudSaves(
+                                        context,
+                                        GameSaveBackupManager.GameSource.GOG,
+                                        app.id,
+                                        shortcut,
+                                    )
+                                withContext(Dispatchers.Main) {
+                                    isWorking = false
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        if (ok) {
+                                            context.getString(
+                                                R.string.cloud_saves_sync_from_provider_success,
+                                                gogProviderLabel,
+                                            )
+                                        } else {
+                                            context.getString(
+                                                R.string.cloud_saves_sync_from_provider_failed,
+                                                gogProviderLabel,
+                                            )
+                                        },
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                }
+                            }
+                        }
+                    },
+                    onBack = { currentTab = GameSettingsScreen.Menu },
+                )
+            }
+
+            GameSettingsScreen.Uninstall -> {
+                UninstallConfirmation(
+                    message = getString(R.string.library_games_uninstall_confirm, app.title),
+                    onConfirm = {
+                        scope.launch(Dispatchers.IO) {
+                            val result = GOGService.deleteGame(
+                                context,
+                                LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG),
+                            )
+                            withContext(Dispatchers.Main) {
+                                if (result.isSuccess) {
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        getString(R.string.library_games_game_uninstalled, app.title),
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                } else {
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        getString(
+                                            R.string.library_games_failed_to_uninstall_reason,
+                                            result.exceptionOrNull()?.message
+                                                ?: getString(R.string.common_ui_unknown_error),
+                                        ),
+                                        android.widget.Toast.LENGTH_LONG,
+                                    )
+                                }
+                                onDismissRequest()
+                            }
+                        }
+                    },
+                    onCancel = { currentTab = GameSettingsScreen.Menu },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.LibraryGameDetailDialog(
+    app: SteamApp,
+    gogGame: GOGGame? = null,
+    onDismissRequest: () -> Unit,
+) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    var currentScreen by remember { mutableStateOf(LibraryDetailScreen.Main) }
+    var activePopup by remember { mutableStateOf<LibraryDetailPopup?>(null) }
+    var showAchievements by remember(app.id) { mutableStateOf(false) }
+    var shortcutRefreshKey by remember(app.id, gogGame?.id) { mutableStateOf(0) }
+    var pinnedShortcutOverride by remember(app.id, gogGame?.id) { mutableStateOf<Boolean?>(null) }
+    var showWorkshopDialog by remember(app.id) { mutableStateOf(false) }
+
+    val isCustom = app.id < 0
+    val isEpic = app.id >= 2000000000
+    val isGog = gogGame != null
+    val epicId = if (isEpic) app.id - 2000000000 else 0
+
+    val libraryDownloadRecords by com.winlator.cmod.app.service.download.DownloadCoordinator.records.collectAsState(
+        initial = com.winlator.cmod.app.service.download.DownloadCoordinator.snapshotRecords(),
+    )
+    val hasBlockingSteamDownloadForLibrary =
+        !isCustom && !isEpic && !isGog &&
+            libraryDownloadRecords.any {
+                it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_STEAM &&
+                    it.storeGameId == app.id.toString() &&
+                    it.status in setOf(
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_FAILED,
+                    )
+            }
+    val hasBlockingEpicDownloadForLibrary =
+        isEpic &&
+            libraryDownloadRecords.any {
+                it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_EPIC &&
+                    it.storeGameId == epicId.toString() &&
+                    it.status in setOf(
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_FAILED,
+                    )
+            }
+    val hasBlockingGogDownloadForLibrary =
+        isGog &&
+            libraryDownloadRecords.any {
+                it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_GOG &&
+                    it.storeGameId == gogGame?.id &&
+                    it.status in setOf(
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                        com.winlator.cmod.app.db.download.DownloadRecord.STATUS_FAILED,
+                    )
+            }
+
+    val epicGame by produceState<EpicGame?>(initialValue = null, key1 = epicId) {
+        value = if (isEpic) db.epicGameDao().getById(epicId) else null
+    }
+
+    val epicArtworkUrl by produceState<String?>(initialValue = null, key1 = isEpic, key2 = epicId) {
+        value =
+            if (isEpic) {
+                val eg = db.epicGameDao().getById(epicId)
+                eg?.primaryImageUrl ?: eg?.iconUrl
+            } else {
+                null
+            }
+    }
+    val currentRefreshSignal = this@LibraryGameDetailDialog.libraryRefreshSignal
+    val homeShortcutState by produceState(
+        HomeShortcutUiState(),
+        app.id,
+        gogGame?.id,
+        isCustom,
+        isEpic,
+        isGog,
+        epicId,
+        currentRefreshSignal,
+        shortcutRefreshKey,
+    ) {
+        value =
+            withContext(Dispatchers.IO) {
+                val shortcut =
+                    when {
+                        isGog -> {
+                            ContainerManager(context).loadShortcuts().find {
+                                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame!!.id
+                            }
+                        }
+
+                        else -> {
+                            findLibraryShortcutForGame(ContainerManager(context), app, isCustom, isEpic, epicId)
+                        }
+                    }
+                HomeShortcutUiState(
+                    shortcut = shortcut,
+                    isPinned = shortcut?.let { LibraryShortcutUtils.hasPinnedHomeShortcut(context, it) } == true,
+                    loaded = true,
+                )
+            }
+    }
+    val artworkRefreshListener =
+        remember(app.id, gogGame?.id) {
+            object : EventDispatcher.JavaEventListener {
+                override fun onEvent(event: Any) {
+                    if (event is AndroidEvent.LibraryArtworkChanged) {
+                        shortcutRefreshKey++
+                    }
+                }
+            }
+        }
+    DisposableEffect(artworkRefreshListener) {
+        PluviaApp.events.onJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
+        onDispose {
+            PluviaApp.events.offJava(AndroidEvent.LibraryArtworkChanged::class, artworkRefreshListener)
+        }
+    }
+    val hasPinnedShortcut = pinnedShortcutOverride ?: homeShortcutState.isPinned
+    val librarySystemIdHint = if (isCustom) retroLibrarySystemIds.value[app.id] else null
+    val retroCaps =
+        remember(homeShortcutState.shortcut, homeShortcutState.loaded, isCustom, librarySystemIdHint) {
+            when {
+                !isCustom -> com.winlator.cmod.feature.retro.RetroShortcuts.LibraryCapabilities()
+                homeShortcutState.loaded ->
+                    com.winlator.cmod.feature.retro.RetroShortcuts.libraryCapabilities(homeShortcutState.shortcut)
+                else ->
+                    com.winlator.cmod.feature.retro.RetroShortcuts.libraryCapabilitiesForSystemId(librarySystemIdHint)
+            }
+        }
+    val isRetro = retroCaps.isRetro
+    val isExternalRetro = retroCaps.isExternal
+    val retroSystemId = retroCaps.systemId
+    val retroRomPath =
+        retroCaps.romPath
+            ?: homeShortcutState.shortcut
+                ?.getExtra(com.winlator.cmod.feature.retro.RetroShortcuts.KEY_ROM)
+                ?.takeIf { it.isNotEmpty() }
+    LaunchedEffect(retroSystemId, retroRomPath, isExternalRetro) {
+        val sid = retroSystemId
+        val rp = retroRomPath
+        if (sid != null && rp != null && !isExternalRetro) {
+            com.winlator.cmod.feature.retro.RetroAchievementsManager.prefetch(context, sid, rp)
+        }
+    }
+
+    BackHandler(enabled = activePopup != null) {
+        activePopup = null
+    }
+
+    // Hero image
+    val customHeroImageFile =
+        homeShortcutState.shortcut
+            ?.getExtra("customLibraryHeroArtPath")
+            ?.takeIf { it.isNotBlank() }
+            ?.let { java.io.File(it) }
+            ?.takeIf { it.exists() }
+    val customHeroImageCacheKey =
+        customHeroImageFile?.let {
+            "library_custom_hero:${it.absolutePath}:${it.lastModified()}"
+        }
+    val heroImageUrl: Any? =
+        customHeroImageFile ?: when {
+            isGog -> {
+                StoreArtworkCache.imageModel(context, StoreArtworkCache.gogHeroRef(gogGame!!))
+            }
+
+            isEpic -> {
+                epicGame?.let { StoreArtworkCache.imageModel(context, StoreArtworkCache.epicHeroRef(it)) }
+            }
+
+            isCustom -> {
+                val customCoverArt =
+                    homeShortcutState.shortcut
+                        ?.getExtra("customCoverArtPath")
+                        ?.takeIf { it.isNotBlank() }
+                        ?.let { java.io.File(it) }
+                        ?.takeIf { it.exists() }
+                customCoverArt ?: run {
+                    val safeName = app.name.replace("/", "_").replace("\\", "_")
+                    val iconFile = java.io.File(context.filesDir, "custom_icons/$safeName.png")
+                    if (iconFile.exists()) iconFile else null
+                }
+            }
+
+            else -> {
+                val heroUrl = app.getHeroUrl()
+                StoreArtworkCache.imageModel(context, StoreArtworkCache.steamRef(app, "hero", heroUrl))
+            }
+        }
+
+    val subtitle =
+        when {
+            isGog -> {
+                gogGame!!.developer
+            }
+
+            isCustom -> {
+                stringResource(R.string.library_games_custom_game)
+            }
+
+            isEpic -> {
+                epicGame?.developer ?: ""
+            }
+
+            else -> {
+                listOfNotNull(
+                    app.developer.takeIf { it.isNotBlank() },
+                    app.publisher.takeIf { it.isNotBlank() },
+                ).distinctBy { it.trim().lowercase() }.joinToString(" • ")
+            }
+        }
+
+    // Playtime info
+    val playtimePrefs =
+        remember {
+            context.getSharedPreferences("playtime_stats", android.content.Context.MODE_PRIVATE)
+        }
+    val searchKey =
+        remember(app) {
+            if (app.id >= 2000000000 || app.id < 0) {
+                app.name
+            } else {
+                app.name.replace(LIBRARY_NAME_SANITIZE_REGEX, "")
+            }
+        }
+    val lastPlayed = playtimePrefs.getLong("${searchKey}_last_played", 0L)
+    val totalPlaytime = playtimePrefs.getLong("${searchKey}_playtime", 0L)
+    val playCount = playtimePrefs.getInt("${searchKey}_play_count", 0)
+
+    val sourceLabel =
+        when {
+            isGog -> "GOG"
+            isEpic -> "Epic Games"
+            isCustom ->
+                retroCaps.sourceLabel
+                    ?: librarySystemIdHint?.let {
+                        com.winlator.cmod.feature.retro.RetroSystems
+                            .fromId(it)
+                            ?.badgeLabel
+                    }
+                    ?: "Custom"
+            else -> "Steam"
+        }
+
+    // Install path
+    val installPath =
+        remember(app, gogGame) {
+            when {
+                isGog -> {
+                    gogGame!!.installPath
+                }
+
+                isEpic -> {
+                    epicGame?.installPath ?: ""
+                }
+
+                isCustom -> {
+                    app.gameDir
+                }
+
+                else -> {
+                    try {
+                        SteamService.getAppDirPath(app.id)
+                    } catch (_: Exception) {
+                        ""
+                    }
+                }
+            }
+        }
+
+    // Install size (computed async)
+    val installSizeText by produceState<String?>(initialValue = null, key1 = installPath) {
+        value =
+            if (installPath.isNotBlank()) {
+                withContext(Dispatchers.IO) {
+                    try {
+                        val bytes = StorageUtils.getFolderSize(installPath)
+                        if (bytes > 0) StorageUtils.formatBinarySize(bytes) else null
+                    } catch (_: Exception) {
+                        null
+                    }
+                }
+            } else {
+                null
+            }
+    }
+
+    // Export / Import launchers (reuse GameSettingsDialog pattern)
+
+    val exportLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
+            if (uri != null) {
+                scope.launch(Dispatchers.IO) {
+                    try {
+                        val os = context.contentResolver.openOutputStream(uri) ?: return@launch
+                        val zos = java.util.zip.ZipOutputStream(java.io.BufferedOutputStream(os))
+                        val containerManager = ContainerManager(context)
+                        val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                        val dirsToZip = mutableListOf<java.io.File>()
+                        val goldbergSaves = java.io.File(SteamService.getAppDirPath(app.id), "steam_settings/saves")
+                        if (goldbergSaves.exists() && goldbergSaves.isDirectory) dirsToZip.add(goldbergSaves)
+                        if (shortcut != null) {
+                            val prefixDir = java.io.File(shortcut.container.getRootDir(), ".wine/drive_c/users/xuser")
+                            listOf("Documents", "Saved Games", "AppData").forEach { name ->
+                                val dir = java.io.File(prefixDir, name)
+                                if (dir.exists()) dirsToZip.add(dir)
+                            }
+                        }
+
+                        fun zipDir(
+                            dir: java.io.File,
+                            baseName: String,
+                        ) {
+                            val children = dir.listFiles() ?: return
+                            for (child in children) {
+                                val name = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
+                                if (child.isDirectory) {
+                                    zos.putNextEntry(java.util.zip.ZipEntry("$name/"))
+                                    zos.closeEntry()
+                                    zipDir(child, name)
+                                } else {
+                                    zos.putNextEntry(java.util.zip.ZipEntry(name))
+                                    child.inputStream().use { it.copyTo(zos) }
+                                    zos.closeEntry()
+                                }
+                            }
+                        }
+                        for (dir in dirsToZip) {
+                            zos.putNextEntry(java.util.zip.ZipEntry("${dir.name}/"))
+                            zos.closeEntry()
+                            zipDir(dir, dir.name)
+                        }
+                        zos.close()
+                        withContext(Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                R.string.saves_import_export_exported,
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        withContext(Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                getString(R.string.saves_import_export_exported_failed, e.message),
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+    val importLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            if (uri != null) {
+                scope.launch(Dispatchers.IO) {
+                    try {
+                        val inputStream = context.contentResolver.openInputStream(uri) ?: return@launch
+                        val zis = java.util.zip.ZipInputStream(java.io.BufferedInputStream(inputStream))
+                        val containerManager = ContainerManager(context)
+                        val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                        val goldbergSavesParent =
+                            java.io.File(
+                                if (isEpic) app.gameDir else SteamService.getAppDirPath(app.id),
+                                if (isEpic) "" else "steam_settings",
+                            )
+                        val prefixDir = shortcut?.let { java.io.File(it.container.getRootDir(), ".wine/drive_c/users/xuser") }
+                        var ze: java.util.zip.ZipEntry?
+                        while (zis.nextEntry.also { ze = it } != null) {
+                            val entry = ze!!
+                            val name = entry.name
+                            var destFile: java.io.File? = null
+                            if (name.startsWith("saves/")) {
+                                destFile = java.io.File(goldbergSavesParent, name)
+                            } else if (prefixDir != null &&
+                                (name.startsWith("Documents/") || name.startsWith("Saved Games/") || name.startsWith("AppData/"))
+                            ) {
+                                destFile = java.io.File(prefixDir, name)
+                            }
+                            if (destFile != null) {
+                                if (entry.isDirectory) {
+                                    destFile.mkdirs()
+                                } else {
+                                    destFile.parentFile?.mkdirs()
+                                    java.io.FileOutputStream(destFile).use { fos -> zis.copyTo(fos) }
+                                }
+                            }
+                            zis.closeEntry()
+                        }
+                        zis.close()
+                        withContext(Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                R.string.saves_import_export_imported,
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        withContext(Dispatchers.Main) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                getString(R.string.saves_import_export_imported_failed, e.message),
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+    val uninstallGame: () -> Unit = {
+        if (isGog) {
+            scope.launch(Dispatchers.IO) {
+                val result = GOGService.deleteGame(
+                    context,
+                    LibraryItem(
+                        "GOG_${gogGame!!.id}",
+                        gogGame.title,
+                        com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG,
+                    ),
+                )
+                withContext(Dispatchers.Main) {
+                    if (result.isSuccess) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            getString(R.string.library_games_game_uninstalled, app.name),
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                    } else {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            getString(
+                                R.string.library_games_failed_to_uninstall_reason,
+                                result.exceptionOrNull()?.message ?: getString(R.string.common_ui_unknown_error),
+                            ),
+                            android.widget.Toast.LENGTH_LONG,
+                        )
+                    }
+                    onDismissRequest()
+                }
+            }
+        } else if (isCustom) {
+            scope.launch(Dispatchers.IO) {
+                val cm = ContainerManager(context)
+                val sc = findLibraryShortcutForGame(cm, app, isCustom, isEpic, epicId)
+                sc?.let { LibraryShortcutUtils.deleteShortcutArtifacts(context, it) }
+                java.io
+                    .File(
+                        context.filesDir,
+                        "custom_icons/${app.name.replace("/", "_")}.png",
+                    ).delete()
+                PluviaApp.events.emit(AndroidEvent.LibraryInstallStatusChanged(app.id))
+                withContext(Dispatchers.Main) {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        getString(R.string.library_games_game_removed, app.name),
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                    onDismissRequest()
+                }
+            }
+        } else if (isEpic) {
+            scope.launch(Dispatchers.IO) {
+                val result = EpicService.deleteGame(context, epicId)
+                withContext(Dispatchers.Main) {
+                    if (result.isSuccess) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            getString(R.string.library_games_game_uninstalled, app.name),
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                    } else {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            getString(
+                                R.string.library_games_failed_to_uninstall_reason,
+                                result.exceptionOrNull()?.message ?: "",
+                            ),
+                            android.widget.Toast.LENGTH_LONG,
+                        )
+                    }
+                    onDismissRequest()
+                }
+            }
+        } else {
+            SteamService.uninstallApp(app.id) { success ->
+                if (success) {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        getString(R.string.library_games_game_uninstalled, app.name),
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                } else {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        getString(R.string.library_games_failed_to_uninstall),
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                }
+                onDismissRequest()
+            }
+        }
+    }
+
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            shape = RectangleShape,
+            color = Color.Black,
+        ) {
+            Box(Modifier.fillMaxSize()) {
+                Column(Modifier.fillMaxSize()) {
+                    val showHero = currentScreen == LibraryDetailScreen.Main
+                    val subScreenTitle =
+                        when (currentScreen) {
+                            LibraryDetailScreen.Shortcut -> stringResource(R.string.common_ui_shortcut)
+                            LibraryDetailScreen.Uninstall ->
+                                stringResource(
+                                    if (isCustom) R.string.common_ui_remove else R.string.common_ui_uninstall,
+                                )
+                            else -> ""
+                        }
+                    // Sub-screens get a compact title bar. The main launch view owns the full
+                    // screen and draws artwork edge-to-edge in its content branch.
+                    if (!showHero) {
+                        Row(
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .background(SurfaceDark)
+                                    .padding(horizontal = 8.dp, vertical = 8.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            IconButton(onClick = { currentScreen = LibraryDetailScreen.Main }) {
+                                Icon(
+                                    Icons.AutoMirrored.Outlined.ArrowBack,
+                                    contentDescription = stringResource(R.string.common_ui_back),
+                                    tint = TextPrimary,
+                                )
+                            }
+                            Text(
+                                subScreenTitle,
+                                style = MaterialTheme.typography.titleMedium,
+                                color = TextPrimary,
+                                fontWeight = FontWeight.Bold,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.weight(1f).padding(start = 4.dp),
+                            )
+                            Text(
+                                app.name,
+                                style = MaterialTheme.typography.bodySmall,
+                                color = TextSecondary,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.padding(end = 16.dp),
+                            )
+                        }
+                        HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                    }
+
+                    // Bottom content
+                    when (currentScreen) {
+                        LibraryDetailScreen.Main -> {
+                            // Lock Play while VERIFY / UPDATE is rewriting depots in place
+                            // for this game — launching mid-write can corrupt the install.
+                            val activePlayBlockingTask =
+                                if (isCustom) {
+                                    null
+                                } else if (isGog) {
+                                    val gogIdStr = gogGame!!.id
+                                    libraryDownloadRecords.firstOrNull { rec ->
+                                        rec.store == com.winlator.cmod.app.db.download
+                                            .DownloadRecord.STORE_GOG &&
+                                            rec.storeGameId == gogIdStr &&
+                                            rec.status ==
+                                            com.winlator.cmod.app.db.download
+                                                .DownloadRecord.STATUS_DOWNLOADING &&
+                                            (
+                                                rec.taskType ==
+                                                    com.winlator.cmod.app.db.download
+                                                        .DownloadRecord.TASK_VERIFY ||
+                                                    rec.taskType ==
+                                                        com.winlator.cmod.app.db.download
+                                                            .DownloadRecord.TASK_UPDATE
+                                            )
+                                    }?.taskType
+                                } else if (isEpic) {
+                                    val appIdStr = epicId.toString()
+                                    libraryDownloadRecords.firstOrNull { rec ->
+                                        rec.store == com.winlator.cmod.app.db.download
+                                            .DownloadRecord.STORE_EPIC &&
+                                            rec.storeGameId == appIdStr &&
+                                            rec.status ==
+                                            com.winlator.cmod.app.db.download
+                                                .DownloadRecord.STATUS_DOWNLOADING &&
+                                            (
+                                                rec.taskType ==
+                                                    com.winlator.cmod.app.db.download
+                                                        .DownloadRecord.TASK_VERIFY ||
+                                                    rec.taskType ==
+                                                        com.winlator.cmod.app.db.download
+                                                            .DownloadRecord.TASK_UPDATE
+                                            )
+                                    }?.taskType
+                                } else {
+                                    val appIdStr = app.id.toString()
+                                    libraryDownloadRecords.firstOrNull { rec ->
+                                        rec.store == com.winlator.cmod.app.db.download
+                                            .DownloadRecord.STORE_STEAM &&
+                                            rec.storeGameId == appIdStr &&
+                                            rec.status ==
+                                            com.winlator.cmod.app.db.download
+                                                .DownloadRecord.STATUS_DOWNLOADING &&
+                                            (
+                                                rec.taskType ==
+                                                    com.winlator.cmod.app.db.download
+                                                        .DownloadRecord.TASK_VERIFY ||
+                                                    rec.taskType ==
+                                                        com.winlator.cmod.app.db.download
+                                                            .DownloadRecord.TASK_UPDATE
+                                            )
+                                    }?.taskType
+                                }
+                            val playEnabled = activePlayBlockingTask == null
+                            val playDisabledLabel =
+                                when (activePlayBlockingTask) {
+                                    com.winlator.cmod.app.db.download.DownloadRecord.TASK_VERIFY ->
+                                        stringResource(R.string.downloads_queue_phase_verifying)
+                                    com.winlator.cmod.app.db.download.DownloadRecord.TASK_UPDATE ->
+                                        stringResource(R.string.downloads_queue_phase_updating)
+                                    else -> null
+                                }
+                            val launchAppName =
+                                homeShortcutState.shortcut
+                                    ?.getExtra("custom_name", "")
+                                    ?.takeIf { it.isNotBlank() }
+                                    ?: when {
+                                        isEpic -> epicGame?.title?.takeIf { it.isNotBlank() } ?: app.name
+                                        isGog -> gogGame?.title?.takeIf { it.isNotBlank() } ?: app.name
+                                        else -> app.name
+                                    }
+                            val heroToastAnchor = LocalView.current
+                            var heroPopup by remember { mutableStateOf<HeroLaunchPopup?>(null) }
+                            var bootShortcut by remember { mutableStateOf<com.winlator.cmod.runtime.container.Shortcut?>(null) }
+                            val resolveOrCreateShortcut: () -> com.winlator.cmod.runtime.container.Shortcut? = {
+                                val containerManager = ContainerManager(context)
+                                when {
+                                    isGog ->
+                                        containerManager.loadShortcuts().find {
+                                            it.getExtra("game_source") == "GOG" &&
+                                                it.getExtra("gog_id") == gogGame!!.id
+                                        } ?: ShortcutSettingsComposeDialog.createLibraryShortcut(
+                                            context = context,
+                                            containerManager = containerManager,
+                                            source = "GOG",
+                                            appId = gogPseudoId(gogGame!!.id),
+                                            gogId = gogGame.id,
+                                            appName = app.name,
+                                        )
+                                    isCustom -> findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                                    else ->
+                                        findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                                            ?: ShortcutSettingsComposeDialog.createLibraryShortcut(
+                                                context = context,
+                                                containerManager = containerManager,
+                                                source = if (isEpic) "EPIC" else "STEAM",
+                                                appId = if (isEpic) epicId else app.id,
+                                                gogId = null,
+                                                appName = app.name,
+                                            )
+                                }
+                            }
+                            var showSaveTransfer by remember(app.id) { mutableStateOf(false) }
+                            val retroSaveImportLauncher =
+                                rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+                                    if (uri != null) {
+                                        val sourceName =
+                                            context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
+                                                if (it.moveToFirst()) it.getString(0) else null
+                                            } ?: "save"
+                                        val result =
+                                            runCatching {
+                                                val bytes =
+                                                    context.contentResolver.openInputStream(uri)?.use { it.readBytes() }
+                                                        ?: return@runCatching com.winlator.cmod.feature.retro.RetroSaveImport.Result.Invalid("Could not read the file.")
+                                                com.winlator.cmod.feature.retro.RetroSaveImport.import(context, app.name, sourceName, bytes)
+                                            }.getOrElse { com.winlator.cmod.feature.retro.RetroSaveImport.Result.Invalid("Could not read the file.") }
+                                        val message =
+                                            when (result) {
+                                                is com.winlator.cmod.feature.retro.RetroSaveImport.Result.Success ->
+                                                    "Imported save (${result.name}, ${result.bytes / 1024} KB)"
+                                                is com.winlator.cmod.feature.retro.RetroSaveImport.Result.Invalid ->
+                                                    "Import failed: ${result.reason}"
+                                            }
+                                        android.widget.Toast.makeText(context, message, android.widget.Toast.LENGTH_LONG).show()
+                                    }
+                                }
+                            val retroSaveExportLauncher =
+                                rememberLauncherForActivityResult(
+                                    ActivityResultContracts.CreateDocument("application/octet-stream"),
+                                ) { uri ->
+                                    if (uri != null) {
+                                        val ok =
+                                            runCatching {
+                                                val sram =
+                                                    com.winlator.cmod.feature.retro.RetroSaveStates.sramFile(context, app.name)
+                                                if (!sram.isFile) return@runCatching false
+                                                context.contentResolver.openOutputStream(uri)?.use { it.write(sram.readBytes()) }
+                                                true
+                                            }.getOrDefault(false)
+                                        android.widget.Toast.makeText(
+                                            context,
+                                            context.getString(
+                                                if (ok) R.string.retro_save_transfer_export_ok else R.string.retro_save_transfer_export_failed,
+                                            ),
+                                            android.widget.Toast.LENGTH_SHORT,
+                                        ).show()
+                                    }
+                                }
+                            if (showSaveTransfer) {
+                                androidx.compose.material3.AlertDialog(
+                                    onDismissRequest = { showSaveTransfer = false },
+                                    title = { androidx.compose.material3.Text(stringResource(R.string.retro_save_transfer_title)) },
+                                    text = { androidx.compose.material3.Text(stringResource(R.string.retro_save_transfer_message)) },
+                                    confirmButton = {
+                                        androidx.compose.material3.TextButton(onClick = {
+                                            showSaveTransfer = false
+                                            retroSaveImportLauncher.launch(arrayOf("*/*"))
+                                        }) { androidx.compose.material3.Text(stringResource(R.string.retro_save_transfer_import)) }
+                                    },
+                                    dismissButton = {
+                                        androidx.compose.material3.TextButton(onClick = {
+                                            val sram = com.winlator.cmod.feature.retro.RetroSaveStates.sramFile(context, app.name)
+                                            showSaveTransfer = false
+                                            if (!sram.isFile) {
+                                                android.widget.Toast.makeText(
+                                                    context,
+                                                    context.getString(R.string.retro_save_transfer_none),
+                                                    android.widget.Toast.LENGTH_SHORT,
+                                                ).show()
+                                            } else {
+                                                retroSaveExportLauncher.launch("${app.name}.srm")
+                                            }
+                                        }) { androidx.compose.material3.Text(stringResource(R.string.retro_save_transfer_export)) }
+                                    },
+                                )
+                            }
+                            // The 3D engine offers itself only for the few Gen 1
+                            // titles it supports, and only when its files are
+                            // actually in the retro bundle. Compatibility is the
+                            // ROM's SHA-1, so deciding it means hashing a file:
+                            // done once off the composition thread, keyed on the
+                            // shortcut, rather than on every recomposition.
+                            val engine3dShortcut = homeShortcutState.shortcut
+                            val engine3dKey = engine3dShortcut?.file?.absolutePath
+                            var engine3dSupported by remember(engine3dKey) { mutableStateOf(false) }
+                            var engine3dOn by remember(engine3dKey) {
+                                mutableStateOf(
+                                    engine3dShortcut?.let {
+                                        com.winlator.cmod.feature.retro.Gen1EmbedLaunch.isEnabled(it)
+                                    } ?: false,
+                                )
+                            }
+                            LaunchedEffect(engine3dKey) {
+                                engine3dSupported =
+                                    engine3dShortcut != null &&
+                                    withContext(Dispatchers.IO) {
+                                        runCatching {
+                                            com.winlator.cmod.feature.retro.Gen1EmbedLaunch
+                                                .isCompatible(context, engine3dShortcut)
+                                        }.getOrDefault(false)
+                                    }
+                            }
+                            LibraryGameLaunchScreen(
+                                appName = launchAppName,
+                                subtitle = subtitle,
+                                sourceLabel = sourceLabel,
+                                heroImageUrl = heroImageUrl,
+                                customHeroImageCacheKey = customHeroImageCacheKey,
+                                releaseDateEpochSeconds = app.releaseDate,
+                                totalPlaytimeMillis = totalPlaytime,
+                                playCount = playCount,
+                                lastPlayedMillis = lastPlayed,
+                                installSizeText = installSizeText,
+                                isCustom = isCustom,
+                                isRetro = isRetro,
+                                showBootToDesktop = retroCaps.showBootToDesktop,
+                                showSaveTransfer = retroCaps.showSaveTransfer,
+                                hasPinnedShortcut = hasPinnedShortcut,
+                                playEnabled = playEnabled,
+                                playDisabledLabel = playDisabledLabel,
+                                altEngineLabel =
+                                    if (engine3dSupported) stringResource(R.string.retro_gs_engine_3d) else null,
+                                altEngineEnabled = engine3dOn,
+                                onAltEngineChange =
+                                    if (engine3dSupported && engine3dShortcut != null) {
+                                        { on ->
+                                            engine3dOn = on
+                                            // Written straight to the shortcut, so
+                                            // Play uses it immediately and the
+                                            // Graphics pane agrees with it.
+                                            engine3dShortcut.putExtra(
+                                                com.winlator.cmod.feature.retro.Gen1EmbedLaunch.KEY_ENGINE_3D,
+                                                if (on) "1" else "0",
+                                            )
+                                            engine3dShortcut.saveData()
+                                        }
+                                    } else {
+                                        null
+                                    },
+                                onBack = onDismissRequest,
+                                onPlay = {
+                                    val containerManager = ContainerManager(context)
+                                    if (isCustom) {
+                                        launchCustomGame(context, containerManager, app.name)
+                                    } else if (isGog) {
+                                        launchGogGame(context, containerManager, gogGame!!)
+                                    } else if (isEpic) {
+                                        epicGame?.let { launchEpicGame(context, containerManager, it) }
+                                    } else {
+                                        launchSteamGame(context, containerManager, app)
+                                    }
+                                    onDismissRequest()
+                                },
+                                onSettings = {
+                                    val shortcut = resolveOrCreateShortcut()
+                                    if (shortcut != null) {
+                                        ShortcutSettingsComposeDialog(this@LibraryGameDetailDialog, shortcut).show()
+                                    }
+                                },
+                                onBootToDesktop = {
+                                    val shortcut = resolveOrCreateShortcut()
+                                    if (shortcut != null) {
+                                        bootShortcut = shortcut
+                                        heroPopup = HeroLaunchPopup.BootToDesktop
+                                    } else {
+                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                            context,
+                                            R.string.shortcuts_list_not_available,
+                                            heroToastAnchor,
+                                        )
+                                    }
+                                },
+                                onAchievements =
+                                    when {
+                                        isRetro -> {
+                                            val sysId = retroSystemId
+                                            val rom = retroRomPath
+                                            if (sysId != null && rom != null && retroCaps.showAchievements) {
+                                                {
+                                                    context.startActivity(
+                                                        android.content.Intent(
+                                                            context,
+                                                            com.winlator.cmod.feature.retro.RetroAchievementsActivity::class.java,
+                                                        ).apply {
+                                                            putExtra(
+                                                                com.winlator.cmod.feature.retro.RetroAchievementsActivity.EXTRA_SYSTEM_ID,
+                                                                sysId,
+                                                            )
+                                                            putExtra(
+                                                                com.winlator.cmod.feature.retro.RetroAchievementsActivity.EXTRA_ROM_PATH,
+                                                                rom,
+                                                            )
+                                                            putExtra(
+                                                                com.winlator.cmod.feature.retro.RetroAchievementsActivity.EXTRA_GAME_NAME,
+                                                                app.name,
+                                                            )
+                                                            putExtra(
+                                                                com.winlator.cmod.feature.retro.RetroAchievementsActivity.EXTRA_IN_SESSION,
+                                                                false,
+                                                            )
+                                                        },
+                                                    )
+                                                }
+                                            } else {
+                                                null
+                                            }
+                                        }
+                                        !isCustom && !isEpic && !isGog -> {
+                                            { showAchievements = true }
+                                        }
+                                        else -> null
+                                    },
+                                onShortcut = {
+                                    if (hasPinnedShortcut) {
+                                        heroPopup = HeroLaunchPopup.RemoveShortcut
+                                    } else {
+                                        scope.launch {
+                                            val created =
+                                                withContext(Dispatchers.IO) {
+                                                    if (isGog) {
+                                                        val artworkUrl = gogGame!!.imageUrl.ifEmpty { gogGame.iconUrl }
+                                                        addGogShortcutToHomeScreen(context, gogGame, artworkUrl)
+                                                    } else {
+                                                        addLibraryShortcutToHomeScreen(
+                                                            context,
+                                                            app,
+                                                            isCustom,
+                                                            isEpic,
+                                                            epicId,
+                                                            epicArtworkUrl,
+                                                        )
+                                                    }
+                                                }
+                                            if (!created) {
+                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                    context,
+                                                    context.getString(
+                                                        R.string.library_games_failed_to_create_shortcut,
+                                                        app.name,
+                                                    ),
+                                                )
+                                            }
+                                        }
+                                    }
+                                },
+                                onCloudSaves = { activePopup = LibraryDetailPopup.CloudSaves },
+                                onSaveTransfer =
+                                    if (retroCaps.showSaveTransfer) {
+                                        { showSaveTransfer = true }
+                                    } else {
+                                        null
+                                    },
+                                onCheats =
+                                    if (retroCaps.showCheats && retroSystemId != null) {
+                                        {
+                                            context.startActivity(
+                                                android.content.Intent(
+                                                    context,
+                                                    com.winlator.cmod.feature.retro.RetroCheatsActivity::class.java,
+                                                ).apply {
+                                                    putExtra(
+                                                        com.winlator.cmod.feature.retro.RetroCheatsActivity.EXTRA_SYSTEM_ID,
+                                                        retroSystemId,
+                                                    )
+                                                    putExtra(
+                                                        com.winlator.cmod.feature.retro.RetroCheatsActivity.EXTRA_GAME_NAME,
+                                                        app.name,
+                                                    )
+                                                },
+                                            )
+                                        }
+                                    } else {
+                                        null
+                                    },
+                                cheatsEnabled =
+                                    !(
+                                        com.winlator.cmod.feature.retro.RetroAchievementsManager.isEnabled(context) &&
+                                            com.winlator.cmod.feature.retro.RetroAchievementsManager.isLoggedIn(context) &&
+                                            com.winlator.cmod.feature.retro.RetroAchievementsManager.isHardcorePreferred(context)
+                                    ),
+                                onUninstall = uninstallGame,
+                                steamMenuEnabled = !isCustom &&
+                                    (!isEpic || epicGame?.isInstalled == true) &&
+                                    (!isGog || gogGame?.isInstalled == true),
+                                showVerifyFiles = !isCustom &&
+                                    (!isEpic || epicGame?.isInstalled == true) &&
+                                    (!isGog || gogGame?.isInstalled == true),
+                                showCheckForUpdate = !isCustom &&
+                                    (!isEpic || epicGame?.isInstalled == true) &&
+                                    (!isGog || gogGame?.isInstalled == true),
+                                showWorkshop = !isCustom && !isEpic && !isGog,
+                                areSteamActionsEnabled =
+                                    when {
+                                        isEpic -> !hasBlockingEpicDownloadForLibrary
+                                        isGog -> !hasBlockingGogDownloadForLibrary
+                                        else -> !hasBlockingSteamDownloadForLibrary
+                                    },
+                                onVerifyFiles = {
+                                    context.runIfOnlineOrToast {
+                                        scope.launch {
+                                            val started =
+                                                withContext(Dispatchers.IO) {
+                                                    when {
+                                                        isEpic -> EpicService.verifyGameFiles(context, epicId)
+                                                        isGog -> GOGService.verifyGameFiles(context, gogGame!!.id)
+                                                        else -> SteamService.downloadAppForVerify(app.id)
+                                                    }
+                                                }
+                                            if (started != null) {
+                                                showTaskProgressPopup(
+                                                    started,
+                                                    if (isGog) gogGame!!.title else app.name,
+                                                    getString(R.string.store_game_verify_complete),
+                                                    getString(R.string.store_game_verify_failed_notice),
+                                                    completeAsToast = true,
+                                                )
+                                            }
+                                            if (started == null) {
+                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                    context,
+                                                    getString(R.string.store_game_download_already_active),
+                                                    android.widget.Toast.LENGTH_SHORT,
+                                                )
+                                            }
+                                        }
+                                    }
+                                },
+                                onCheckForUpdate = {
+                                    when {
+                                        isEpic -> startEpicUpdateCheck(epicId, app.name)
+                                        isGog -> startGogUpdateCheck(gogGame!!.id, gogGame.title)
+                                        else -> startUpdateCheck(app.id, app.name)
+                                    }
+                                },
+                                onWorkshop = { if (!isEpic && !isGog && !isCustom) showWorkshopDialog = true },
+                            )
+
+                            when (heroPopup) {
+                                HeroLaunchPopup.BootToDesktop ->
+                                    HeroBootDialog(
+                                        onConfirm = { choice ->
+                                            heroPopup = null
+                                            bootShortcut?.let { sc ->
+                                                val intent =
+                                                    Intent(context, XServerDisplayActivity::class.java)
+                                                        .putExtra("container_id", sc.container.id)
+                                                when (choice) {
+                                                    HeroBootChoice.Desktop -> {}
+                                                    HeroBootChoice.Cube32 ->
+                                                        intent
+                                                            .putExtra("shortcut_path", sc.file.absolutePath)
+                                                            .putExtra("boot_exe", "C:\\ProgramData\\Microsoft\\Windows\\Graphics-Test-32bit.exe")
+                                                    HeroBootChoice.Cube64 ->
+                                                        intent
+                                                            .putExtra("shortcut_path", sc.file.absolutePath)
+                                                            .putExtra("boot_exe", "C:\\ProgramData\\Microsoft\\Windows\\Graphics-Test-64bit.exe")
+                                                    HeroBootChoice.Input32 ->
+                                                        intent
+                                                            .putExtra("shortcut_path", sc.file.absolutePath)
+                                                            .putExtra("boot_exe", "C:\\ProgramData\\Microsoft\\Windows\\InputControl32.exe")
+                                                    HeroBootChoice.Input64 ->
+                                                        intent
+                                                            .putExtra("shortcut_path", sc.file.absolutePath)
+                                                            .putExtra("boot_exe", "C:\\ProgramData\\Microsoft\\Windows\\InputControl64.exe")
+                                                }
+                                                context.startActivity(intent)
+                                                onDismissRequest()
+                                            }
+                                        },
+                                        onDismissRequest = { heroPopup = null },
+                                    )
+                                HeroLaunchPopup.RemoveShortcut ->
+                                    HeroRemoveShortcutDialog(
+                                        gameName = if (isGog) gogGame!!.title else app.name,
+                                        onConfirm = {
+                                            scope.launch {
+                                                val removed =
+                                                    withContext(Dispatchers.IO) {
+                                                        homeShortcutState.shortcut?.let {
+                                                            LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
+                                                        } == true
+                                                    }
+                                                pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
+                                                shortcutRefreshKey++
+                                                heroPopup = null
+                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                    context,
+                                                    if (removed) {
+                                                        context.getString(R.string.shortcuts_list_removed)
+                                                    } else {
+                                                        context.getString(R.string.common_ui_unknown_error)
+                                                    },
+                                                )
+                                            }
+                                        },
+                                        onDismissRequest = { heroPopup = null },
+                                    )
+                                null -> {}
+                            }
+                        }
+
+                        LibraryDetailScreen.Shortcut -> {
+                            Column(
+                                modifier =
+                                    Modifier
+                                        .fillMaxSize()
+                                        .padding(horizontal = 24.dp, vertical = 20.dp),
+                                verticalArrangement = Arrangement.spacedBy(12.dp),
+                            ) {
+                                Text(
+                                    stringResource(R.string.common_ui_shortcut),
+                                    style = MaterialTheme.typography.labelMedium,
+                                    color = TextSecondary,
+                                    fontWeight = FontWeight.Bold,
+                                    letterSpacing = 1.1.sp,
+                                )
+
+                                Spacer(Modifier.weight(1f))
+
+                                ShortcutRemovalConfirmation(
+                                    message =
+                                        stringResource(
+                                            R.string.shortcuts_list_remove_game_shortcut_message,
+                                            if (isGog) gogGame!!.title else app.name,
+                                        ),
+                                    onConfirm = {
+                                        scope.launch {
+                                            val removed =
+                                                withContext(Dispatchers.IO) {
+                                                    homeShortcutState.shortcut?.let {
+                                                        LibraryShortcutUtils.disablePinnedHomeShortcut(context, it)
+                                                    } == true
+                                                }
+                                            pinnedShortcutOverride = if (removed) false else hasPinnedShortcut
+                                            shortcutRefreshKey++
+                                            currentScreen = LibraryDetailScreen.Main
+                                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                context,
+                                                if (removed) {
+                                                    context.getString(R.string.shortcuts_list_removed)
+                                                } else {
+                                                    context.getString(R.string.common_ui_unknown_error)
+                                                },
+                                            )
+                                        }
+                                    },
+                                    onCancel = { currentScreen = LibraryDetailScreen.Main },
+                                )
+                            }
+                        }
+
+                        LibraryDetailScreen.CloudSaves -> {
+                            Column(
+                                modifier =
+                                    Modifier
+                                        .fillMaxSize()
+                                        .verticalScroll(rememberScrollState())
+                                        .navigationBarsPadding(),
+                            ) {
+                            var isWorking by remember { mutableStateOf(false) }
+
+                            val detailGameSource =
+                                when {
+                                    isGog -> GameSaveBackupManager.GameSource.GOG
+                                    isEpic -> GameSaveBackupManager.GameSource.EPIC
+                                    else -> GameSaveBackupManager.GameSource.STEAM
+                                }
+                            val detailGameId =
+                                when {
+                                    isGog -> gogGame!!.id
+                                    isEpic -> epicId.toString()
+                                    else -> app.id.toString()
+                                }
+                            val detailShortcut =
+                                remember(app.id, gogGame?.id, epicId, isGog, isEpic, isCustom) {
+                                    val containerManager = ContainerManager(context)
+                                    when {
+                                        isGog -> {
+                                            containerManager.loadShortcuts().find {
+                                                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame!!.id
+                                            }
+                                        }
+
+                                        else -> {
+                                            findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                                        }
+                                    }
+                                }
+                            var cloudSyncEnabled by remember(detailShortcut?.file?.absolutePath) {
+                                mutableStateOf(isShortcutCloudSyncEnabled(detailShortcut))
+                            }
+                            var offlineModeEnabled by remember(detailShortcut?.file?.absolutePath) {
+                                mutableStateOf(isShortcutOfflineMode(detailShortcut))
+                            }
+
+                            val detailProviderLabel =
+                                when (detailGameSource) {
+                                    GameSaveBackupManager.GameSource.GOG ->
+                                        stringResource(R.string.preloader_platform_gog)
+                                    GameSaveBackupManager.GameSource.EPIC ->
+                                        stringResource(R.string.preloader_platform_epic)
+                                    GameSaveBackupManager.GameSource.CUSTOM ->
+                                        stringResource(R.string.preloader_platform_custom)
+                                    GameSaveBackupManager.GameSource.STEAM ->
+                                        stringResource(R.string.preloader_platform_steam)
+                                }
+
+                            CloudSavesContent(
+                                activity = this@LibraryGameDetailDialog,
+                                isWorking = isWorking,
+                                cloudSyncEnabled = cloudSyncEnabled,
+                                offlineModeEnabled = offlineModeEnabled,
+                                gameSource = detailGameSource,
+                                gameId = detailGameId,
+                                gameName = app.name,
+                                shortcut = detailShortcut,
+                                retroSaveDir = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.retroSaveDir(context, detailShortcut, detailGameId),
+                                onCloudSyncToggle = { enabled ->
+                                    cloudSyncEnabled = enabled
+                                    setShortcutCloudSyncEnabled(detailShortcut, enabled)
+                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                        context,
+                                        if (enabled) {
+                                            context.getString(R.string.cloud_sync_enabled_summary)
+                                        } else {
+                                            context.getString(R.string.cloud_sync_disabled_summary)
+                                        },
+                                        android.widget.Toast.LENGTH_SHORT,
+                                    )
+                                },
+                                onOfflineModeToggle = { enabled ->
+                                    offlineModeEnabled = enabled
+                                    setShortcutOfflineMode(detailShortcut, enabled)
+                                },
+                                onSyncFromCloud = {
+                                    if (!isWorking) {
+                                        isWorking = true
+                                        scope.launch(Dispatchers.IO) {
+                                            val ok =
+                                                CloudSyncHelper.downloadCloudSaves(
+                                                    context,
+                                                    detailGameSource,
+                                                    detailGameId,
+                                                    detailShortcut,
+                                                )
+                                            withContext(Dispatchers.Main) {
+                                                isWorking = false
+                                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                    context,
+                                                    if (ok) {
+                                                        context.getString(
+                                                            R.string.cloud_saves_sync_from_provider_success,
+                                                            detailProviderLabel,
+                                                        )
+                                                    } else {
+                                                        context.getString(
+                                                            R.string.cloud_saves_sync_from_provider_failed,
+                                                            detailProviderLabel,
+                                                        )
+                                                    },
+                                                    android.widget.Toast.LENGTH_SHORT,
+                                                )
+                                            }
+                                        }
+                                    }
+                                },
+                                showBottomBack = false,
+                                onBack = { currentScreen = LibraryDetailScreen.Main },
+                            )
+                            }
+                        }
+
+                        LibraryDetailScreen.Uninstall -> {
+                            Column(
+                                modifier =
+                                    Modifier
+                                        .fillMaxSize()
+                                        .padding(horizontal = 24.dp, vertical = 20.dp),
+                                verticalArrangement = Arrangement.spacedBy(12.dp),
+                            ) {
+                                Text(
+                                    stringResource(
+                                        if (isCustom) R.string.library_games_remove_game else R.string.library_games_uninstall_game,
+                                    ),
+                                    style = MaterialTheme.typography.labelMedium,
+                                    color = TextSecondary,
+                                    fontWeight = FontWeight.Bold,
+                                    letterSpacing = 1.1.sp,
+                                )
+
+                                Spacer(Modifier.weight(1f))
+
+                                UninstallConfirmation(
+                                    message =
+                                        if (isCustom) {
+                                            getString(R.string.library_games_remove_confirm, app.name)
+                                        } else {
+                                            getString(R.string.library_games_uninstall_confirm, app.name)
+                                        },
+                                    confirmLabel =
+                                        stringResource(
+                                            if (isCustom) R.string.common_ui_remove else R.string.common_ui_uninstall,
+                                        ),
+                                    onConfirm = uninstallGame,
+                                    onCancel = { currentScreen = LibraryDetailScreen.Main },
+                                )
+                            }
+                        }
+                    }
+                }
+
+                if (showAchievements) {
+                    Dialog(
+                        onDismissRequest = { showAchievements = false },
+                        properties = DialogProperties(
+                            usePlatformDefaultWidth = false,
+                            dismissOnClickOutside = false,
+                            decorFitsSystemWindows = false,
+                        ),
+                    ) {
+                        com.winlator.cmod.feature.stores.steam.achievements.SteamAchievementsScreen(
+                            appId = app.id,
+                            appName = app.name,
+                            onClose = { showAchievements = false },
+                        )
+                    }
+                }
+
+                activePopup?.let { popup ->
+                    LibraryDetailPopupFrame(
+                        title =
+                            when (popup) {
+                                LibraryDetailPopup.CloudSaves ->
+                                    stringResource(
+                                        R.string.cloud_saves_title_for_provider,
+                                        when {
+                                            isGog -> stringResource(R.string.preloader_platform_gog)
+                                            isEpic -> stringResource(R.string.preloader_platform_epic)
+                                            isCustom -> stringResource(R.string.preloader_platform_custom)
+                                            else -> stringResource(R.string.preloader_platform_steam)
+                                        },
+                                        app.name,
+                                    )
+                            },
+                        wide = popup == LibraryDetailPopup.CloudSaves,
+                        onDismissRequest = { activePopup = null },
+                    ) {
+                        when (popup) {
+                            LibraryDetailPopup.CloudSaves -> {
+                                var isWorking by remember { mutableStateOf(false) }
+
+                                val detailGameSource =
+                                    when {
+                                        isGog -> GameSaveBackupManager.GameSource.GOG
+                                        isEpic -> GameSaveBackupManager.GameSource.EPIC
+                                        isCustom -> GameSaveBackupManager.GameSource.CUSTOM
+                                        else -> GameSaveBackupManager.GameSource.STEAM
+                                    }
+                                val detailShortcut =
+                                    remember(app.id, gogGame?.id, epicId, isGog, isEpic, isCustom) {
+                                        val containerManager = ContainerManager(context)
+                                        when {
+                                            isGog -> {
+                                                containerManager.loadShortcuts().find {
+                                                    it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame!!.id
+                                                }
+                                            }
+
+                                            else -> {
+                                                findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId)
+                                            }
+                                        }
+                                    }
+                                val detailGameId =
+                                    when {
+                                        isGog -> gogGame!!.id
+                                        isEpic -> epicId.toString()
+                                        isCustom ->
+                                            detailShortcut?.let { GameSaveBackupManager.customGameId(it) }
+                                                ?: app.name
+                                        else -> app.id.toString()
+                                    }
+                                var cloudSyncEnabled by remember(detailShortcut?.file?.absolutePath) {
+                                    mutableStateOf(isShortcutCloudSyncEnabled(detailShortcut))
+                                }
+                                var offlineModeEnabled by remember(detailShortcut?.file?.absolutePath) {
+                                    mutableStateOf(isShortcutOfflineMode(detailShortcut))
+                                }
+
+                                val detailProviderLabel =
+                                    when (detailGameSource) {
+                                        GameSaveBackupManager.GameSource.GOG ->
+                                            stringResource(R.string.preloader_platform_gog)
+                                        GameSaveBackupManager.GameSource.EPIC ->
+                                            stringResource(R.string.preloader_platform_epic)
+                                        GameSaveBackupManager.GameSource.CUSTOM ->
+                                            stringResource(R.string.preloader_platform_custom)
+                                        GameSaveBackupManager.GameSource.STEAM ->
+                                            stringResource(R.string.preloader_platform_steam)
+                                    }
+
+                                CloudSavesContent(
+                                    activity = this@LibraryGameDetailDialog,
+                                    isWorking = isWorking,
+                                    cloudSyncEnabled = cloudSyncEnabled,
+                                    offlineModeEnabled = offlineModeEnabled,
+                                    gameSource = detailGameSource,
+                                    gameId = detailGameId,
+                                    gameName = app.name,
+                                    shortcut = detailShortcut,
+                                    retroSaveDir = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.retroSaveDir(context, detailShortcut, detailGameId),
+                                    onCloudSyncToggle = { enabled ->
+                                        cloudSyncEnabled = enabled
+                                        setShortcutCloudSyncEnabled(detailShortcut, enabled)
+                                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                            context,
+                                            if (enabled) {
+                                                context.getString(R.string.cloud_sync_enabled_summary)
+                                            } else {
+                                                context.getString(R.string.cloud_sync_disabled_summary)
+                                            },
+                                            android.widget.Toast.LENGTH_SHORT,
+                                        )
+                                    },
+                                    onOfflineModeToggle = { enabled ->
+                                        offlineModeEnabled = enabled
+                                        setShortcutOfflineMode(detailShortcut, enabled)
+                                    },
+                                onSyncFromCloud = {
+                                    if (!isWorking) {
+                                        isWorking = true
+                                            scope.launch(Dispatchers.IO) {
+                                                val ok =
+                                                    CloudSyncHelper.downloadCloudSaves(
+                                                        context,
+                                                        detailGameSource,
+                                                        detailGameId,
+                                                        detailShortcut,
+                                                    )
+                                                withContext(Dispatchers.Main) {
+                                                    isWorking = false
+                                                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                                        context,
+                                                        if (ok) {
+                                                            context.getString(
+                                                                R.string.cloud_saves_sync_from_provider_success,
+                                                                detailProviderLabel,
+                                                            )
+                                                        } else {
+                                                            context.getString(
+                                                                R.string.cloud_saves_sync_from_provider_failed,
+                                                                detailProviderLabel,
+                                                            )
+                                                        },
+                                                        android.widget.Toast.LENGTH_SHORT,
+                                                    )
+                                                }
+                                            }
+                                        }
+                                    },
+                                    showTitle = false,
+                                    showBottomBack = false,
+                                    onBack = { activePopup = null },
+                                )
+                            }
+                        }
+                    }
+                }
+
+                if (
+                    currentScreen != LibraryDetailScreen.Main &&
+                    currentScreen != LibraryDetailScreen.CloudSaves
+                ) {
+                    // Close button overlay
+                    IconButton(
+                        onClick = onDismissRequest,
+                        modifier =
+                            Modifier
+                                .align(Alignment.TopEnd)
+                                .padding(16.dp)
+                                .size(42.dp)
+                                .shadow(8.dp, CircleShape, spotColor = Color.Black.copy(alpha = 0.35f))
+                                .clip(CircleShape)
+                                .background(BgDark.copy(alpha = 0.7f)),
+                    ) {
+                        Icon(Icons.Outlined.Close, contentDescription = "Close", tint = TextPrimary)
+                    }
+                }
+            }
+
+            if (showWorkshopDialog) {
+                WorkshopDialog(
+                    appId = app.id,
+                    gameTitle = app.name,
+                    onDismissRequest = { showWorkshopDialog = false },
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/app/shell/UnifiedActivityHub.kt b/app/src/main/app/shell/UnifiedActivityHub.kt
new file mode 100644
index 000000000..6f3744af4
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityHub.kt
@@ -0,0 +1,2644 @@
+package com.winlator.cmod.app.shell
+import com.winlator.cmod.app.shell.UnifiedActivity.TabDef
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Main hub scaffold + top bar + glasses sheet + library carousel, split out of UnifiedActivity.kt (behavior-identical).
+
+@Composable
+internal fun UnifiedActivity.UnifiedHub() {
+    val horizontalNavigationInsets =
+        WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
+    val initialLibraryLayoutMode = startupLibraryLayoutMode
+    val initialStoreVisible = startupStoreVisible ?: mapOf("steam" to true, "epic" to true, "gog" to true)
+    val initialContentFilters = startupContentFilters ?: mapOf("games" to true, "dlc" to false, "applications" to false, "tools" to false)
+    if (!startupBootstrapReady || initialLibraryLayoutMode == null) {
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .windowInsetsPadding(horizontalNavigationInsets),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(16.dp),
+            ) {
+                CircularProgressIndicator(color = Accent)
+                Text(
+                    text = stringResource(R.string.common_ui_app_name),
+                    color = TextPrimary,
+                    style = MaterialTheme.typography.titleMedium,
+                )
+            }
+        }
+        return
+    }
+
+    val storeVisible = remember { mutableStateMapOf(*initialStoreVisible.entries.map { it.key to it.value }.toTypedArray()) }
+    var showAddCustomGame by remember { mutableStateOf(false) }
+    var showExitDialog by remember { mutableStateOf(false) }
+    var searchQueryTfv by remember { mutableStateOf(TextFieldValue("")) }
+    val searchQuery = searchQueryTfv.text
+    var localLibraryRefreshKey by remember { mutableIntStateOf(0) }
+    var shortcutDataRefreshKey by remember { mutableIntStateOf(0) }
+    var iconRefreshKey by remember { mutableIntStateOf(0) }
+
+    val currentRefreshSignal = this@UnifiedHub.libraryRefreshSignal
+    val libraryRefreshKey = currentRefreshSignal + localLibraryRefreshKey
+    val shortcutRefreshKey = libraryRefreshKey + shortcutDataRefreshKey
+    val playtimeRefreshKey = this@UnifiedHub.libraryPlaytimeRefreshSignal
+
+    val contentFilters = remember { mutableStateMapOf(*initialContentFilters.entries.map { it.key to it.value }.toTypedArray()) }
+    var libraryLayoutMode by remember {
+        mutableStateOf(
+            runCatching { LibraryLayoutMode.valueOf(PrefManager.libraryLayoutMode) }
+                .getOrElse { initialLibraryLayoutMode },
+        )
+    }
+    var immersiveMode by remember { mutableStateOf(PrefManager.libraryImmersiveMode) }
+    var immersiveBlur by remember { mutableStateOf(PrefManager.libraryImmersiveBlur) }
+    val tabs = remember(storeVisible.toMap()) { buildTabs(storeVisible) }
+    var selectedIdx by rememberSaveable { mutableIntStateOf(0) }
+    var selectedDownloadId by remember { mutableStateOf<String?>(null) }
+    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
+    LaunchedEffect(drawerState.isOpen) {
+        drawerOpen = drawerState.isOpen
+        if (!drawerState.isOpen) drawerNavBridge.controllerActive = false
+    }
+    val isLoggedIn by SteamService.isLoggedInFlow.collectAsState()
+    val chatServiceEnabled by SteamService.chatServiceEnabledFlow.collectAsState()
+    val isEpicLoggedIn by EpicAuthManager.isLoggedInFlow.collectAsState()
+    val isGogLoggedIn by GOGAuthManager.isLoggedInFlow.collectAsState()
+    val steamApps by db.steamAppDao().getAllOwnedApps().collectAsState(initial = emptyList())
+    val context = LocalContext.current
+    val persona by SteamService.instance?.localPersona?.collectAsState()
+        ?: remember { mutableStateOf(null) }
+    val scope = rememberCoroutineScope()
+    val rightDrawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
+    val friends by SteamService.instance?.friendsList?.collectAsState()
+        ?: remember { mutableStateOf(emptyList<com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry>()) }
+    var chatFriend by remember { mutableStateOf<com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry?>(null) }
+    val friendsDrawerOpen = rightDrawerState.isOpen
+    LaunchedEffect(rightDrawerState.isOpen) {
+        rightDrawerOpen = rightDrawerState.isOpen
+        if (!rightDrawerState.isOpen) friendsDrawerNavBridge.controllerActive = false
+    }
+    LaunchedEffect(Unit) {
+        (context as? UnifiedActivity)?.openFriendsSignal?.collect {
+            if (rightDrawerState.isOpen) rightDrawerState.close() else rightDrawerState.open()
+        }
+    }
+    var installedFriendGameIds by remember { mutableStateOf<Set<Int>>(emptySet()) }
+    LaunchedEffect(friends) {
+        val ids = friends.map { it.gameAppId }.filter { it > 0 }.distinct()
+        installedFriendGameIds =
+            withContext(Dispatchers.IO) { ids.filter { SteamService.isAppInstalled(it) }.toSet() }
+    }
+    LaunchedEffect(isLoggedIn, chatServiceEnabled) {
+        if (isLoggedIn && chatServiceEnabled) {
+            while (true) {
+                runCatching { SteamService.instance?.refreshFriends() }
+                kotlinx.coroutines.delay(30_000L)
+            }
+        }
+    }
+    LaunchedEffect(isLoggedIn, friendsDrawerOpen, chatServiceEnabled) {
+        if (isLoggedIn && friendsDrawerOpen && chatServiceEnabled) {
+            while (true) {
+                runCatching { SteamService.instance?.syncFriendsPresence() }
+                kotlinx.coroutines.delay(5_000L)
+            }
+        }
+    }
+    LaunchedEffect(isLoggedIn, chatServiceEnabled) {
+        if (isLoggedIn && chatServiceEnabled) {
+            runCatching { com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService.start(context) }
+        }
+    }
+
+    val epicApps by db.epicGameDao().getAll().collectAsState(initial = emptyList())
+    val gogApps by db.gogGameDao().getAll().collectAsState(initial = emptyList())
+
+    val controllerState = rememberControllerConnectionState()
+    val isControllerConnected = controllerState.isConnected
+    val isPS = controllerState.isPlayStation
+    val isLibraryTab = tabs.getOrNull(selectedIdx)?.key == "library"
+
+    val libraryRefreshListener =
+        remember {
+            object : EventDispatcher.JavaEventListener {
+                override fun onEvent(event: Any) {
+                    when (event) {
+                        is AndroidEvent.LibraryInstallStatusChanged -> {
+                            localLibraryRefreshKey++
+                            shortcutDataRefreshKey++
+                            iconRefreshKey++
+                        }
+                        is AndroidEvent.LibraryArtworkChanged -> {
+                            shortcutDataRefreshKey++
+                            iconRefreshKey++
+                        }
+                    }
+                }
+            }
+        }
+    DisposableEffect(libraryRefreshListener) {
+        PluviaApp.events.onJava(AndroidEvent.LibraryInstallStatusChanged::class, libraryRefreshListener)
+        PluviaApp.events.onJava(AndroidEvent.LibraryArtworkChanged::class, libraryRefreshListener)
+        onDispose {
+            PluviaApp.events.offJava(AndroidEvent.LibraryInstallStatusChanged::class, libraryRefreshListener)
+            PluviaApp.events.offJava(AndroidEvent.LibraryArtworkChanged::class, libraryRefreshListener)
+        }
+    }
+
+    LaunchedEffect(isEpicLoggedIn) {
+        if (isEpicLoggedIn) {
+            EpicService.start(context)
+        }
+    }
+
+    LaunchedEffect(isGogLoggedIn) {
+        if (isGogLoggedIn) {
+            GOGService.start(context)
+        }
+    }
+
+    val epicLoginLauncher =
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.StartActivityForResult(),
+        ) { result ->
+            if (result.resultCode == android.app.Activity.RESULT_OK) {
+                val code = result.data?.getStringExtra(EpicOAuthActivity.EXTRA_AUTH_CODE)
+                if (code != null) {
+                    scope.launch {
+                        val authResult = EpicAuthManager.authenticateWithCode(context, code)
+                        if (authResult.isSuccess) {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                R.string.stores_accounts_logged_in_epic,
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        } else {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                getString(R.string.stores_accounts_epic_login_failed, authResult.exceptionOrNull()?.message),
+                                android.widget.Toast.LENGTH_LONG,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+    val gogLoginLauncher =
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.StartActivityForResult(),
+        ) { result ->
+            if (result.resultCode == android.app.Activity.RESULT_OK) {
+                val code = result.data?.getStringExtra(GOGOAuthActivity.EXTRA_AUTH_CODE)
+                if (!code.isNullOrBlank()) {
+                    scope.launch {
+                        val authResult = GOGAuthManager.authenticateWithCode(context, code)
+                        if (authResult.isSuccess) {
+                            GOGService.start(context)
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                R.string.stores_accounts_logged_in_gog,
+                                android.widget.Toast.LENGTH_SHORT,
+                            )
+                        } else {
+                            com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                context,
+                                getString(R.string.stores_accounts_gog_login_failed, authResult.exceptionOrNull()?.message),
+                                android.widget.Toast.LENGTH_LONG,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+    val filteredSteamApps =
+        remember(steamApps, contentFilters.toMap()) {
+            steamApps.filter { app ->
+                when (app.type) {
+                    com.winlator.cmod.feature.stores.steam.enums.AppType.game -> contentFilters["games"] == true
+                    com.winlator.cmod.feature.stores.steam.enums.AppType.demo -> contentFilters["games"] == true
+                    com.winlator.cmod.feature.stores.steam.enums.AppType.dlc -> contentFilters["dlc"] == true
+                    com.winlator.cmod.feature.stores.steam.enums.AppType.application -> contentFilters["applications"] == true
+                    com.winlator.cmod.feature.stores.steam.enums.AppType.tool -> contentFilters["tools"] == true
+                    com.winlator.cmod.feature.stores.steam.enums.AppType.config -> contentFilters["tools"] == true
+                    else -> contentFilters["games"] == true
+                }
+            }
+        }
+
+    var globalSettingsApp by remember { mutableStateOf<SteamApp?>(null) }
+    var globalSettingsGogGame by remember { mutableStateOf<GOGGame?>(null) }
+
+    LaunchedEffect(tabs.size) { if (selectedIdx >= tabs.size) selectedIdx = 0 }
+    LaunchedEffect(isLoggedIn, persona) {
+        if (isLoggedIn && persona == null) {
+            SteamService.requestUserPersona()
+        }
+    }
+
+    val activity = LocalContext.current as? UnifiedActivity
+
+    LaunchedEffect(tabs) {
+        activity?.keyEventFlow?.collect { event ->
+            val key = tabs.getOrNull(selectedIdx)?.key ?: "library"
+            when (event.keyCode) {
+                android.view.KeyEvent.KEYCODE_BUTTON_L1 -> {
+                    selectedIdx = if (selectedIdx > 0) selectedIdx - 1 else tabs.size - 1
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_R1 -> {
+                    selectedIdx = (selectedIdx + 1) % tabs.size
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_START -> {
+                    navigateToSettings(SettingsNavItem.STORES)
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_SELECT -> {
+                    if (key != "downloads") {
+                        if (drawerState.isOpen) drawerState.close() else drawerState.open()
+                    }
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_X -> {
+                    if (key == "library" && (selectedSteamAppId != 0 || selectedGogGameId.isNotEmpty())) {
+                        activity?.openHeroForFocusedSignal?.tryEmit(Unit)
+                    }
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_THUMBL -> {
+                    if (key == "library") {
+                        activity?.openSearchSignal?.tryEmit(Unit)
+                    }
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_THUMBR -> {
+                    if (key == "library") {
+                        showAddCustomGame = true
+                    }
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_B -> {
+                    if (chatFriend != null) {
+                        chatFriend = null
+                    } else if (rightDrawerState.isOpen) {
+                        rightDrawerState.close()
+                    } else if (drawerState.isOpen) {
+                        drawerState.close()
+                    } else if (globalSettingsApp != null) {
+                        globalSettingsApp = null
+                    } else if (globalSettingsGogGame != null) {
+                        globalSettingsGogGame = null
+                    } else if (showAddCustomGame) {
+                        showAddCustomGame = false
+                    } else {
+                        showExitDialog = true
+                    }
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_Y -> {
+                    if (key == "library" && (selectedSteamAppId != 0 || selectedGogGameId.isNotEmpty())) {
+                        if (selectedLibrarySource == "GOG") {
+                            globalSettingsGogGame = gogApps.find { it.id == selectedGogGameId }
+                            return@collect
+                        }
+                        val isCustom = selectedSteamAppId < 0
+                        val epicId = if (selectedSteamAppId >= 2000000000) selectedSteamAppId - 2000000000 else 0
+
+                        globalSettingsApp = (
+                            steamApps.find { it.id == selectedSteamAppId }
+                                ?: if (isCustom) {
+                                    SteamApp(id = selectedSteamAppId, name = selectedSteamAppName, developer = "Custom")
+                                } else if (epicId > 0) {
+                                    val epic = epicApps.find { it.id == epicId }
+                                    SteamApp(
+                                        id = selectedSteamAppId,
+                                        name = selectedSteamAppName,
+                                        developer = epic?.developer ?: "Epic Games",
+                                        gameDir = epic?.installPath ?: "",
+                                    )
+                                } else {
+                                    null
+                                }
+                        )
+                    }
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_A, android.view.KeyEvent.KEYCODE_DPAD_CENTER -> {
+                    if (key == "library" && (selectedSteamAppId != 0 || selectedGogGameId.isNotEmpty())) {
+                        val isCustom = selectedSteamAppId < 0
+                        val epicId = if (selectedSteamAppId >= 2000000000) selectedSteamAppId - 2000000000 else 0
+                        val containerManager = ContainerManager(context)
+                        if (isCustom) {
+                            launchCustomGame(context, containerManager, selectedSteamAppName)
+                        } else if (selectedLibrarySource == "GOG") {
+                            gogApps.find { it.id == selectedGogGameId }?.let {
+                                launchGogGame(context, containerManager, it)
+                            }
+                        } else if (epicId > 0) {
+                            val epic = epicApps.find { it.id == epicId }
+                            if (epic != null && epic.isInstalled) {
+                                val dummyApp =
+                                    SteamApp(id = selectedSteamAppId, name = selectedSteamAppName, gameDir = epic.installPath)
+                                launchSteamGame(context, containerManager, dummyApp)
+                            }
+                        } else {
+                            val steam = steamApps.find { it.id == selectedSteamAppId }
+                            if (steam != null) {
+                                launchSteamGame(context, containerManager, steam)
+                            }
+                        }
+                    } else if (key != "library" && key != "downloads") {
+                        storeItemClickCallback?.invoke(storeFocusIndex.value)
+                    }
+                }
+
+            }
+        }
+    }
+
+    androidx.compose.runtime.CompositionLocalProvider(
+        androidx.compose.ui.platform.LocalLayoutDirection provides androidx.compose.ui.unit.LayoutDirection.Rtl,
+    ) {
+    ModalNavigationDrawer(
+        drawerState = rightDrawerState,
+        drawerContent = {
+            androidx.compose.runtime.CompositionLocalProvider(
+                androidx.compose.ui.platform.LocalLayoutDirection provides androidx.compose.ui.unit.LayoutDirection.Ltr,
+            ) {
+                com.winlator.cmod.feature.stores.steam.friends.FriendsDrawerContent(
+                    isOpen = rightDrawerState.isOpen,
+                    self = persona ?: com.winlator.cmod.feature.stores.steam.data.SteamFriend(),
+                    friends = friends,
+                    installedGameIds = installedFriendGameIds,
+                    chatEnabled = chatServiceEnabled,
+                    onSetState = { st -> scope.launch { SteamService.setPersonaState(st) } },
+                    onOpenChat = { f -> chatFriend = f; scope.launch { rightDrawerState.close() } },
+                    onJoinGame = { f ->
+                        scope.launch { rightDrawerState.close() }
+                        scope.launch {
+                            val app = withContext(Dispatchers.IO) { SteamService.getAppInfoOf(f.gameAppId) }
+                            val installed = withContext(Dispatchers.IO) { SteamService.getInstalledApp(f.gameAppId) }
+                            val label = f.gameName.ifBlank { context.getString(R.string.steam_join_the_game) }
+                            if (app != null && installed != null) {
+                                android.widget.Toast.makeText(
+                                    context, context.getString(R.string.steam_join_joining, f.name, label), android.widget.Toast.LENGTH_SHORT,
+                                ).show()
+                                launchSteamGame(context, ContainerManager(context), app, f.connectString)
+                            } else {
+                                android.widget.Toast.makeText(
+                                    context,
+                                    if (app != null) context.getString(R.string.steam_join_install, label, f.name)
+                                    else context.getString(R.string.steam_join_not_owned, label),
+                                    android.widget.Toast.LENGTH_LONG,
+                                ).show()
+                            }
+                        }
+                    },
+                    onPlayGame = { f ->
+                        scope.launch { rightDrawerState.close() }
+                        scope.launch {
+                            val app = withContext(Dispatchers.IO) { SteamService.getAppInfoOf(f.gameAppId) }
+                            if (app != null) {
+                                launchSteamGame(context, ContainerManager(context), app, null)
+                            }
+                        }
+                    },
+                )
+            }
+        },
+        scrimColor = Color.Black.copy(alpha = 0.5f),
+        gesturesEnabled = rightDrawerState.isOpen,
+    ) {
+    androidx.compose.runtime.CompositionLocalProvider(
+        androidx.compose.ui.platform.LocalLayoutDirection provides androidx.compose.ui.unit.LayoutDirection.Ltr,
+    ) {
+    ModalNavigationDrawer(
+        drawerState = drawerState,
+        drawerContent = {
+            DrawerContent(
+                persona = persona,
+                isOpen = drawerState.isOpen,
+                context = context,
+                scope = scope,
+                storeVisible = storeVisible,
+                contentFilters = contentFilters,
+                libraryLayoutMode = libraryLayoutMode,
+                immersiveMode = immersiveMode,
+                immersiveBlur = immersiveBlur,
+                onLibraryLayoutSelected = {
+                    libraryLayoutMode = it
+                    PrefManager.libraryLayoutMode = it.name
+                },
+                onStoreVisibleChanged = { key, value ->
+                    storeVisible[key] = value
+                    PrefManager.libraryStoreVisible = storeVisible.entries.filter { it.value }.joinToString(",") { it.key }
+                },
+                onContentFiltersChanged = { key, value ->
+                    contentFilters[key] = value
+                    PrefManager.libraryContentFilters = contentFilters.entries.filter { it.value }.joinToString(",") { it.key }
+                },
+                onImmersiveModeChanged = {
+                    immersiveMode = it
+                    PrefManager.libraryImmersiveMode = it
+                },
+                onImmersiveBlurChanged = {
+                    immersiveBlur = it
+                    PrefManager.libraryImmersiveBlur = it
+                },
+                onExportAll = {
+                    scope.launch {
+                        val count =
+                            withContext(Dispatchers.IO) {
+                                com.winlator.cmod.feature.shortcuts.FrontendExporter.exportAll(context)
+                            }
+                        val dir = com.winlator.cmod.feature.shortcuts.FrontendExporter.resolveExportDir(context)
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            if (count > 0) {
+                                context.getString(R.string.shortcuts_export_all_done, count, dir?.path ?: "")
+                            } else {
+                                context.getString(R.string.shortcuts_export_all_none)
+                            },
+                        )
+                    }
+                },
+                onExitApp = {
+                    AppTerminationHelper.exitApplication(this@UnifiedHub, "hub_drawer_exit")
+                },
+            )
+        },
+        scrimColor = Color.Black.copy(alpha = 0.5f),
+        gesturesEnabled = drawerState.isOpen,
+    ) {
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(BgDark)
+                .windowInsetsPadding(horizontalNavigationInsets),
+        ) {
+            val currentTabKeyForImmersive = tabs.getOrNull(selectedIdx)?.key ?: "library"
+            val immersiveActive = immersiveMode && currentTabKeyForImmersive == "library"
+            DisposableEffect(immersiveActive) {
+                applyImmersiveSystemBars(immersiveActive)
+                onDispose { applyImmersiveSystemBars(false) }
+            }
+            if (immersiveMode && currentTabKeyForImmersive == "library") {
+                val immersiveModel by immersiveBackgroundRef.collectAsState()
+                val immersiveRequest =
+                    remember(immersiveModel, immersiveBlur, context) {
+                        val builder = ImageRequest.Builder(context).data(immersiveModel)
+                        (immersiveModel as? java.io.File)?.takeIf { it.isFile }?.let { file ->
+                            // Custom uploads can be overwritten in place.
+                            val key = "library_immersive_bg:${file.absolutePath}:${file.lastModified()}"
+                            builder.memoryCacheKey(if (immersiveBlur) "$key:blur" else key).diskCacheKey(key)
+                        }
+                        if (immersiveBlur) {
+                            // Blur baked into the bitmap at decode (quarter-res + radius 2 ≈ 8px on screen), so drawing costs the same as a plain image.
+                            val dm = context.resources.displayMetrics
+                            builder
+                                .size(dm.widthPixels / 4, dm.heightPixels / 4)
+                                .scale(coil.size.Scale.FILL)
+                                .transformations(BoxBlurTransformation(radius = 2))
+                        }
+                        builder.crossfade(400).build()
+                    }
+                AnimatedVisibility(
+                    visible = immersiveModel != null,
+                    enter = fadeIn(tween(400)),
+                    exit = fadeOut(tween(400)),
+                    modifier = Modifier.matchParentSize(),
+                ) {
+                    Box(Modifier.matchParentSize()) {
+                        AsyncImage(
+                            model = immersiveRequest,
+                            contentDescription = null,
+                            modifier = Modifier.matchParentSize(),
+                            contentScale = ContentScale.Crop,
+                        )
+                        Box(
+                            Modifier
+                                .matchParentSize()
+                                .background(BgDark.copy(alpha = 0.5f)),
+                        )
+                    }
+                }
+            }
+            val scaffoldContainer = if (immersiveMode && currentTabKeyForImmersive == "library") Color.Transparent else BgDark
+            val openFileManager: () -> Unit = {
+                val internalPath = android.os.Environment.getExternalStorageDirectory().absolutePath
+                val managedRoots = driveRoots(includeInternal = true)
+                val containerManager = com.winlator.cmod.runtime.container.ContainerManager(context)
+                val containers =
+                    containerManager.getContainers().map {
+                        DirectoryPickerDialog.ManagedContainer(it.id, it.getName())
+                    }
+                DirectoryPickerDialog.showManager(
+                    activity = this@UnifiedHub,
+                    initialPath = internalPath,
+                    managedRoots = managedRoots,
+                    containers = containers,
+                    onRunFile = { exePath, containerId ->
+                        val container = containerManager.getContainerById(containerId)
+                        if (container != null) {
+                            val winePath =
+                                com.winlator.cmod.runtime.wine.WineUtils
+                                    .hostPathToMappedWinePath(container, exePath)
+                            startActivity(
+                                android.content.Intent(
+                                    this@UnifiedHub,
+                                    com.winlator.cmod.runtime.display.XServerDisplayActivity::class.java,
+                                ).apply {
+                                    putExtra("container_id", container.id)
+                                    putExtra("boot_exe", winePath)
+                                    addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+                                },
+                            )
+                        }
+                    },
+                    onCreateShortcut = { exePath ->
+                        val exeFile = java.io.File(exePath)
+                        addCustomGame(
+                            context,
+                            exeFile.nameWithoutExtension,
+                            exePath,
+                            exeFile.parent ?: exePath,
+                        )
+                        localLibraryRefreshKey++
+                    },
+                )
+            }
+            Scaffold(
+                containerColor = scaffoldContainer,
+                contentWindowInsets = WindowInsets(0, 0, 0, 0),
+                topBar = {
+                    TopBar(tabs, selectedIdx, {
+                        selectedIdx = it
+                    }, persona, context, scope, isControllerConnected, isPS, isLibraryTab, searchQueryTfv, {
+                        searchQueryTfv =
+                            it
+                    }, onFilterClicked = { scope.launch { drawerState.open() } }, onFriendsClicked = { scope.launch { rightDrawerState.open() } }) {
+                        if (selectedLibrarySource == "GOG") {
+                            globalSettingsGogGame = gogApps.find { it.id == selectedGogGameId }
+                        } else {
+                            globalSettingsApp = (
+                                steamApps.find { it.id == selectedSteamAppId }
+                                    ?: if (selectedSteamAppId < 0) {
+                                        SteamApp(
+                                            id = selectedSteamAppId,
+                                            name = selectedSteamAppName,
+                                            developer = "Custom",
+                                        )
+                                    } else if (selectedSteamAppId >= 2000000000) {
+                                        val epicId = selectedSteamAppId - 2000000000
+                                        val epic = epicApps.find { it.id == epicId }
+                                        SteamApp(
+                                            id = selectedSteamAppId,
+                                            name = selectedSteamAppName,
+                                            developer = epic?.developer ?: "Epic Games",
+                                            gameDir = epic?.installPath ?: "",
+                                        )
+                                    } else {
+                                        null
+                                    }
+                            )
+                        }
+                    }
+                },
+            ) { padding ->
+                LaunchedEffect(selectedIdx, tabs) {
+                    currentTabKey = tabs.getOrNull(selectedIdx)?.key ?: "library"
+                    storeFocusIndex.value = 0
+                    downloadsNavBridge.controllerActive = false
+                }
+
+                val key = tabs.getOrNull(selectedIdx)?.key ?: "library"
+                val innerBoxBg = if (immersiveMode && key == "library") Color.Transparent else BgDark
+
+                Box(Modifier.padding(padding).fillMaxSize().background(innerBoxBg)) {
+
+                    LaunchedEffect(key) { libraryTabActive.value = (key == "library") }
+
+                    // Keep Library composed so its state survives tab switches.
+                    Box(
+                        Modifier.fillMaxSize().let {
+                            if (key == "library") {
+                                it
+                            } else {
+                                it.alpha(0f).pointerInput(Unit) { /* block ghost taps */ }
+                            }
+                        },
+                    ) {
+                        LibraryCarousel(
+                            isLoggedIn = isLoggedIn,
+                            steamApps = filteredSteamApps,
+                            epicApps = epicApps,
+                            gogApps = gogApps,
+                            layoutMode = libraryLayoutMode,
+                            libraryRefreshKey = libraryRefreshKey,
+                            shortcutRefreshKey = shortcutRefreshKey,
+                            playtimeRefreshKey = playtimeRefreshKey,
+                            iconRefreshKey = iconRefreshKey,
+                            searchQuery = searchQuery,
+                            isControllerConnected = isControllerConnected,
+                        )
+                    }
+
+                    if (key != "library") {
+                        AnimatedContent(
+                            targetState = key,
+                            transitionSpec = {
+                                fadeIn(tween(200)) togetherWith fadeOut(tween(150))
+                            },
+                            label = "tabContent",
+                        ) { animatedKey ->
+                            when (animatedKey) {
+                                "downloads" -> {
+                                    DownloadsTab(
+                                        selectedDownloadId,
+                                        animationsActive = key == "downloads",
+                                        onSelectDownload = { selectedDownloadId = it },
+                                    )
+                                }
+
+                                "steam" -> {
+                                    SteamStoreTab(isLoggedIn, filteredSteamApps, searchQuery, LibraryLayoutMode.GRID_4)
+                                }
+
+                                "epic" -> {
+                                    EpicStoreTab(isEpicLoggedIn, epicApps, searchQuery, LibraryLayoutMode.GRID_4) {
+                                        epicLoginLauncher.launch(Intent(this@UnifiedHub, EpicOAuthActivity::class.java))
+                                    }
+                                }
+
+                                "gog" -> {
+                                    GOGStoreTab(isGogLoggedIn, gogApps, searchQuery, LibraryLayoutMode.GRID_4) {
+                                        gogLoginLauncher.launch(Intent(this@UnifiedHub, GOGOAuthActivity::class.java))
+                                    }
+                                }
+
+                                else -> {}
+                            }
+                        }
+                    }
+
+                    val configuration = LocalConfiguration.current
+                    val libraryFabBase = minOf(configuration.screenWidthDp, configuration.screenHeightDp)
+                    val addGameFabSize = (libraryFabBase * 0.125f).dp.coerceIn(56.dp, 64.dp)
+                    val addGameFabMargin = (libraryFabBase * 0.035f).dp.coerceIn(12.dp, 20.dp)
+                    val addGameFabIconSize = (libraryFabBase * 0.055f).dp.coerceIn(24.dp, 28.dp)
+                    val fabNavInsets = WindowInsets.navigationBars.asPaddingValues()
+                    val fabEndInset =
+                        (20.dp - fabNavInsets.calculateRightPadding(androidx.compose.ui.unit.LayoutDirection.Ltr))
+                            .coerceAtLeast(4.dp)
+                    val fabStartInset =
+                        (20.dp - fabNavInsets.calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection.Ltr))
+                            .coerceAtLeast(4.dp)
+
+                    if (drawerState.isClosed) {
+                        DrawerSwipeHotZone(
+                            modifier = Modifier.align(Alignment.CenterStart),
+                            onOpenDrawer = { scope.launch { drawerState.open() } },
+                        )
+                    }
+                    if (rightDrawerState.isClosed) {
+                        DrawerSwipeHotZone(
+                            modifier = Modifier.align(Alignment.CenterEnd).padding(end = 22.dp),
+                            isRightSide = true,
+                            onOpenDrawer = { scope.launch { rightDrawerState.open() } },
+                        )
+                    }
+
+                    // Composed after the hot zones so the FAB stays on top for hit-testing.
+                    if (key == "library") {
+                        Column(
+                            modifier =
+                                Modifier
+                                    .align(Alignment.BottomEnd)
+                                    .windowInsetsPadding(
+                                        WindowInsets.navigationBars.only(WindowInsetsSides.Bottom),
+                                    )
+                                    .padding(end = fabEndInset, bottom = addGameFabMargin),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                        ) {
+                            if (isControllerConnected) {
+                                ControllerBadge("R3")
+                                Spacer(Modifier.height(8.dp))
+                            }
+                            Box(
+                                modifier =
+                                    Modifier
+                                        .size(addGameFabSize)
+                                    .drawBehind {
+                                        drawCircle(
+                                            brush =
+                                                Brush.radialGradient(
+                                                    colors = listOf(Accent.copy(alpha = 0.22f), Color.Transparent),
+                                                    center = center,
+                                                    radius = size.minDimension * 0.64f,
+                                                ),
+                                            radius = size.minDimension * 0.64f,
+                                        )
+                                    }
+                                    .clip(CircleShape)
+                                    .background(Color.Transparent, CircleShape)
+                                    .border(1.5.dp, Accent.copy(alpha = 0.55f), CircleShape)
+                                    .focusProperties { canFocus = false } // No specific button for this, handle via long press or touch
+                                    .clickable(
+                                        interactionSource = null,
+                                        indication = androidx.compose.material3.ripple(color = Accent),
+                                    ) { showAddCustomGame = true },
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            Icon(
+                                Icons.Outlined.Add,
+                                contentDescription = "Add Custom Game",
+                                tint = Accent,
+                                modifier = Modifier.size(addGameFabIconSize),
+                            )
+                            }
+                        }
+                    }
+
+                    if (key == "library" || key == "downloads") {
+                        Box(
+                            modifier =
+                                Modifier
+                                    .align(Alignment.BottomStart)
+                                    .windowInsetsPadding(
+                                        WindowInsets.navigationBars.only(WindowInsetsSides.Bottom),
+                                    )
+                                    .padding(start = fabStartInset, bottom = addGameFabMargin)
+                                    .size(addGameFabSize)
+                                    .drawBehind {
+                                        drawCircle(
+                                            brush =
+                                                Brush.radialGradient(
+                                                    colors = listOf(Accent.copy(alpha = 0.22f), Color.Transparent),
+                                                    center = center,
+                                                    radius = size.minDimension * 0.64f,
+                                                ),
+                                            radius = size.minDimension * 0.64f,
+                                        )
+                                    }
+                                    .clip(CircleShape)
+                                    .background(Color.Transparent, CircleShape)
+                                    .border(1.5.dp, Accent.copy(alpha = 0.55f), CircleShape)
+                                    .focusProperties { canFocus = false }
+                                    .clickable(
+                                        interactionSource = null,
+                                        indication = androidx.compose.material3.ripple(color = Accent),
+                                    ) { openFileManager() },
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            Icon(
+                                Icons.Outlined.FolderOpen,
+                                contentDescription = "Files",
+                                tint = Accent,
+                                modifier = Modifier.size(addGameFabIconSize),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    } // end ModalNavigationDrawer
+    } // end inner LTR
+    } // end right friends ModalNavigationDrawer
+    } // end RTL provider
+
+    if (globalSettingsApp != null) {
+        GameSettingsDialog(
+            app = globalSettingsApp!!,
+            onDismissRequest = { globalSettingsApp = null },
+        )
+    }
+    if (globalSettingsGogGame != null) {
+        GOGGameSettingsDialog(
+            app = globalSettingsGogGame!!,
+            onDismissRequest = { globalSettingsGogGame = null },
+        )
+    }
+
+    if (showAddCustomGame) {
+        AddCustomGameDialog(onDismiss = {
+            showAddCustomGame = false
+            localLibraryRefreshKey++
+        })
+    }
+
+    chatFriend?.let { cf ->
+        com.winlator.cmod.feature.stores.steam.friends.SteamChatScreen(
+            friend = friends.firstOrNull { it.steamId == cf.steamId } ?: cf,
+            onClose = { chatFriend = null },
+        )
+    }
+
+    BackHandler(enabled = true) {
+        if (chatFriend != null) {
+            chatFriend = null
+        } else if (rightDrawerState.isOpen) {
+            scope.launch { rightDrawerState.close() }
+        } else if (drawerState.isOpen) {
+            scope.launch { drawerState.close() }
+        } else if (globalSettingsApp != null) {
+            globalSettingsApp = null
+        } else if (globalSettingsGogGame != null) {
+            globalSettingsGogGame = null
+        } else if (showAddCustomGame) {
+            showAddCustomGame = false
+        } else {
+            showExitDialog = true
+        }
+    }
+
+    if (showExitDialog) {
+        Dialog(
+            onDismissRequest = { showExitDialog = false },
+            properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true),
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .width(320.dp)
+                        .clip(RoundedCornerShape(20.dp))
+                        .background(SurfaceDark)
+                        .border(1.dp, Accent.copy(alpha = 0.3f), RoundedCornerShape(20.dp))
+                        .padding(28.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                    Text(
+                        text = stringResource(R.string.common_ui_exit_app_confirm),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = TextPrimary,
+                        fontWeight = FontWeight.Bold,
+                    )
+                    Spacer(Modifier.height(24.dp))
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(16.dp),
+                    ) {
+                        OutlinedButton(
+                            onClick = { showExitDialog = false },
+                            colors = ButtonDefaults.outlinedButtonColors(contentColor = TextSecondary),
+                            border = androidx.compose.foundation.BorderStroke(1.dp, TextSecondary.copy(alpha = 0.5f)),
+                            shape = RoundedCornerShape(12.dp),
+                            modifier = Modifier.weight(1f),
+                        ) {
+                            Text(stringResource(R.string.common_ui_cancel), fontWeight = FontWeight.Medium)
+                        }
+                        Button(
+                            onClick = {
+                                AppTerminationHelper.exitApplication(this@UnifiedHub, "hub_exit_menu")
+                            },
+                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFE53935)),
+                            shape = RoundedCornerShape(12.dp),
+                            modifier = Modifier.weight(1f),
+                        ) {
+                            Text(stringResource(R.string.common_ui_exit), color = Color.White, fontWeight = FontWeight.Bold)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.DrawerSwipeHotZone(
+    modifier: Modifier = Modifier,
+    isRightSide: Boolean = false,
+    onOpenDrawer: () -> Unit,
+) {
+    val density = LocalDensity.current
+    val openThresholdPx = with(density) { 36.dp.toPx() }
+
+    Box(
+        modifier =
+            modifier
+                .fillMaxHeight()
+                .width(if (isRightSide) 30.dp else 40.dp)
+                .pointerInput(openThresholdPx, isRightSide) {
+                    var accumulatedDrag = 0f
+                    var opened = false
+
+                    detectHorizontalDragGestures(
+                        onDragStart = {
+                            accumulatedDrag = 0f
+                            opened = false
+                        },
+                        onHorizontalDrag = { change, dragAmount ->
+                            val delta = if (isRightSide) -dragAmount else dragAmount
+                            if (delta <= 0f || opened) return@detectHorizontalDragGestures
+
+                            accumulatedDrag += delta
+                            change.consume()
+
+                            if (accumulatedDrag >= openThresholdPx) {
+                                opened = true
+                                onOpenDrawer()
+                            }
+                        },
+                    )
+                },
+    )
+}
+
+@Composable
+internal fun UnifiedActivity.GlassesSettingsSheet(onDismiss: () -> Unit) {
+    val gm = com.winlator.cmod.runtime.display.GlassesManager
+    val settings by gm.settings.collectAsState()
+    val brightnessMax = gm.brightnessMax()
+    val volumeMax = gm.volumeMax()
+    val brightness = if (settings.brightness < 0) brightnessMax else settings.brightness
+    val volume = if (settings.volume < 0) volumeMax else settings.volume
+    val registry = remember { PaneNavRegistry() }
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+        DialogPaneNav(registry, onDismiss = onDismiss)
+        androidx.compose.material3.Surface(
+            shape = RoundedCornerShape(24.dp),
+            color = SurfaceDark,
+            modifier = Modifier.fillMaxWidth(0.82f),
+        ) {
+            Column(
+                modifier = Modifier
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 22.dp, vertical = 18.dp),
+                verticalArrangement = Arrangement.spacedBy(14.dp),
+            ) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Icon(Eyeglasses2Icon, contentDescription = null, tint = Accent, modifier = Modifier.size(22.dp))
+                    Spacer(Modifier.width(10.dp))
+                    Text(gm.modelName(), color = TextPrimary, fontSize = 17.sp, fontWeight = FontWeight.SemiBold)
+                }
+                Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) {
+                    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(14.dp)) {
+                        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                            GlassesLabel(stringResource(R.string.glasses_panel_refresh))
+                            Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                                listOf(60, 90, 120).forEach { hz ->
+                                    val selected = settings.refreshHz == hz
+                                    Box(
+                                        modifier = Modifier
+                                            .weight(1f)
+                                            .clip(RoundedCornerShape(11.dp))
+                                            .background(if (selected) Accent else TextSecondary.copy(alpha = 0.12f))
+                                            .paneNavItem(cornerRadius = 11.dp, onActivate = { gm.setRefreshHz(hz) }, isEntry = hz == 60)
+                                            .clickable { gm.setRefreshHz(hz) }
+                                            .padding(vertical = 10.dp),
+                                        contentAlignment = Alignment.Center,
+                                    ) {
+                                        Text("$hz", color = if (selected) SurfaceDark else TextPrimary,
+                                            fontSize = 14.sp, fontWeight = FontWeight.SemiBold)
+                                    }
+                                }
+                            }
+                        }
+                        Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+                            GlassesToggleTile(stringResource(R.string.glasses_panel_sunblock),
+                                settings.sunblock, Modifier.weight(1f)) { gm.setSunblock(it) }
+                            GlassesToggleTile(stringResource(R.string.session_drawer_output_3d),
+                                settings.threeD, Modifier.weight(1f)) { gm.set3D(it) }
+                        }
+                    }
+                    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(14.dp)) {
+                        GlassesPercentSlider(stringResource(R.string.session_drawer_output_brightness),
+                            brightness, brightnessMax) { gm.setBrightness(it) }
+                        GlassesPercentSlider(stringResource(R.string.session_drawer_output_volume),
+                            volume, volumeMax) { gm.setVolume(it) }
+                    }
+                }
+            }
+        }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GlassesLabel(text: String) {
+    Text(text, color = TextSecondary, fontSize = 13.sp, fontWeight = FontWeight.Medium)
+}
+
+@Composable
+internal fun UnifiedActivity.GlassesPercentSlider(label: String, level: Int, max: Int, onChange: (Int) -> Unit) {
+    val pct = if (max > 0) Math.round(level * 100f / max) else 0
+    Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
+        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            GlassesLabel(label)
+            Text("$pct%", color = Accent, fontSize = 13.sp, fontWeight = FontWeight.SemiBold)
+        }
+        androidx.compose.material3.Slider(
+            value = level.toFloat(),
+            onValueChange = { onChange(it.roundToInt()) },
+            valueRange = 0f..max.toFloat(),
+            steps = (max - 1).coerceAtLeast(0),
+            modifier = Modifier.paneNavItem(
+                cornerRadius = 8.dp,
+                onAdjust = { dir -> onChange((level + dir).coerceIn(0, max)) },
+            ),
+            colors = androidx.compose.material3.SliderDefaults.colors(
+                thumbColor = Accent,
+                activeTrackColor = Accent,
+                inactiveTrackColor = TextSecondary.copy(alpha = 0.2f),
+            ),
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GlassesToggleTile(label: String, checked: Boolean, modifier: Modifier = Modifier, onChange: (Boolean) -> Unit) {
+    Column(
+        modifier = modifier
+            .clip(RoundedCornerShape(13.dp))
+            .background(if (checked) Accent.copy(alpha = 0.16f) else TextSecondary.copy(alpha = 0.08f))
+            .paneNavItem(cornerRadius = 13.dp, onActivate = { onChange(!checked) })
+            .clickable { onChange(!checked) }
+            .padding(vertical = 8.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(2.dp),
+    ) {
+        Text(label, color = TextPrimary, fontSize = 13.sp, fontWeight = FontWeight.Medium)
+        androidx.compose.material3.Switch(
+            checked = checked,
+            onCheckedChange = onChange,
+            colors = androidx.compose.material3.SwitchDefaults.colors(
+                checkedThumbColor = Color.White,
+                checkedTrackColor = Accent,
+            ),
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.TopBar(
+    tabs: List<TabDef>,
+    selectedIdx: Int,
+    onSelect: (Int) -> Unit,
+    persona: com.winlator.cmod.feature.stores.steam.data.SteamFriend?,
+    context: android.content.Context,
+    scope: kotlinx.coroutines.CoroutineScope,
+    isControllerConnected: Boolean,
+    isPS: Boolean,
+    isLibraryTab: Boolean,
+    searchQuery: TextFieldValue,
+    onSearchQueryChange: (TextFieldValue) -> Unit,
+    onFilterClicked: () -> Unit,
+    onFriendsClicked: () -> Unit = {},
+    onGameSettingsClicked: () -> Unit,
+) {
+    var isSearchExpanded by remember { mutableStateOf(false) }
+    val searchFocusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val isDownloadsTab = tabs.getOrNull(selectedIdx)?.key == "downloads"
+    val glassesConnected by com.winlator.cmod.runtime.display.GlassesManager.connected.collectAsState()
+    var showGlassesPanel by remember { mutableStateOf(false) }
+
+    LaunchedEffect(selectedIdx) {
+        if (isSearchExpanded) {
+            onSearchQueryChange(TextFieldValue(""))
+            isSearchExpanded = false
+        }
+    }
+
+    // Auto-focus the search field when expanded
+    LaunchedEffect(isSearchExpanded) {
+        if (isSearchExpanded) {
+            kotlinx.coroutines.delay(150)
+            searchFocusRequester.requestFocus()
+        } else if (searchQuery.text.isNotEmpty()) {
+            onSearchQueryChange(TextFieldValue(""))
+        }
+    }
+
+    val controllerSearchActivity = LocalContext.current as? UnifiedActivity
+    LaunchedEffect(Unit) {
+        controllerSearchActivity?.openSearchSignal?.collect {
+            if (!isDownloadsTab) {
+                if (isSearchExpanded) {
+                    onSearchQueryChange(TextFieldValue(""))
+                    isSearchExpanded = false
+                } else {
+                    isSearchExpanded = true
+                }
+            }
+        }
+    }
+    LaunchedEffect(Unit) {
+        controllerSearchActivity?.openGlassesSignal?.collect {
+            if (glassesConnected) showGlassesPanel = true
+        }
+    }
+
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(
+                        start = UnifiedTopBarHorizontalPadding,
+                        end = UnifiedTopBarHorizontalPadding,
+                        top = UnifiedTopBarTopPadding,
+                    )
+                    .height(UnifiedTopBarHeight),
+        ) {
+            // Center Block: Tabs (absolutely centered, unaffected by left/right content)
+            Row(
+                modifier = Modifier.align(Alignment.Center).zIndex(1f),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                @Suppress("DEPRECATION")
+                CompositionLocalProvider(
+                    androidx.compose.material3.LocalRippleConfiguration provides null,
+                ) {
+                    val tabWidth = 100.dp
+                    val tabSideGutter = 12.dp
+                    val tabBarShape = RoundedCornerShape(18.dp)
+                    val visibleCount = minOf(3, tabs.size)
+                    val tabListState = rememberLazyListState()
+                    val snapFlingBehavior = rememberSnapFlingBehavior(lazyListState = tabListState)
+
+                    LaunchedEffect(selectedIdx) {
+                        val scrollTo = maxOf(0, selectedIdx - 1)
+                        tabListState.animateScrollToItem(scrollTo)
+                    }
+
+                    Box(
+                        modifier =
+                            Modifier
+                                .width(tabWidth * visibleCount + tabSideGutter * 2)
+                                .height(44.dp)
+                                .shadow(8.dp, tabBarShape, spotColor = Color.Black.copy(alpha = 0.5f))
+                                .clip(tabBarShape)
+                                .background(CardDark)
+                                .border(1.dp, CardBorder, tabBarShape),
+                    ) {
+                        LazyRow(
+                            state = tabListState,
+                            flingBehavior = snapFlingBehavior,
+                            modifier =
+                                Modifier
+                                    .align(Alignment.Center)
+                                    .width(tabWidth * visibleCount)
+                                    .fillMaxHeight()
+                                    .focusProperties { canFocus = !isLibraryTab },
+                            userScrollEnabled = tabs.size > visibleCount,
+                        ) {
+                            itemsIndexed(tabs) { index, tab ->
+                                val selected = selectedIdx == index
+                                val interactionSource = remember { MutableInteractionSource() }
+                                val isPressed by interactionSource.collectIsPressedAsState()
+                                val tabScale by animateFloatAsState(
+                                    targetValue = if (isPressed) 0.92f else 1f,
+                                    animationSpec = spring(stiffness = Spring.StiffnessHigh),
+                                    label = "tabScale",
+                                )
+                                val textColor by animateColorAsState(
+                                    targetValue = if (selected) Accent else TextSecondary,
+                                    animationSpec = tween(280),
+                                    label = "tabTextColor",
+                                )
+
+                                Box(
+                                    modifier =
+                                        Modifier
+                                            .width(tabWidth)
+                                            .fillMaxHeight()
+                                            .focusProperties { canFocus = false }
+                                            .graphicsLayer {
+                                                scaleX = tabScale
+                                                scaleY = tabScale
+                                            }.clickable(
+                                                interactionSource = interactionSource,
+                                                indication = null,
+                                            ) { onSelect(index) },
+                                    contentAlignment = Alignment.Center,
+                                ) {
+                                    Text(
+                                        text = tab.label.uppercase(),
+                                        style = MaterialTheme.typography.labelLarge,
+                                        fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium,
+                                        fontSize = 13.sp,
+                                        maxLines = 1,
+                                        color = textColor,
+                                    )
+                                }
+                            }
+                        }
+                        if (isControllerConnected) {
+                            ControllerBadge(
+                                "L1",
+                                Modifier.align(Alignment.CenterStart).padding(start = 4.dp),
+                                compact = true,
+                            )
+                            ControllerBadge(
+                                "R1",
+                                Modifier.align(Alignment.CenterEnd).padding(end = 4.dp),
+                                compact = true,
+                            )
+                        }
+                    }
+                }
+            }
+
+            Row(
+                modifier = Modifier.align(Alignment.CenterStart).fillMaxHeight(),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Box(
+                    modifier =
+                        Modifier
+                            .size(44.dp)
+                            .clip(CircleShape)
+                            .background(Color.Transparent)
+                            .border(1.dp, Accent.copy(alpha = 0.5f), CircleShape)
+                            .focusProperties { canFocus = !isLibraryTab },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    @Suppress("DEPRECATION")
+                    CompositionLocalProvider(
+                        androidx.compose.material3.LocalRippleConfiguration provides
+                            androidx.compose.material3.RippleConfiguration(color = Accent),
+                    ) {
+                        IconButton(onClick = {
+                            navigateToSettings(SettingsNavItem.STORES)
+                        }, modifier = Modifier.size(44.dp), enabled = true) {
+                            Icon(Icons.Outlined.Settings, contentDescription = "Menu", tint = Accent, modifier = Modifier.size(24.dp))
+                        }
+                    }
+                }
+                if (isControllerConnected) {
+                    Spacer(Modifier.width(4.dp))
+                    ControllerBadge(if (isPS) "\u2261" else "Start")
+                }
+
+                Spacer(Modifier.width(6.dp))
+
+                val searchIconRotation by animateFloatAsState(
+                    targetValue = if (isSearchExpanded) 90f else 0f,
+                    animationSpec =
+                        spring(
+                            dampingRatio = Spring.DampingRatioMediumBouncy,
+                            stiffness = Spring.StiffnessLow,
+                        ),
+                    label = "searchIconRotation",
+                )
+
+                Box(
+                    modifier =
+                        Modifier
+                            .size(44.dp)
+                            .clip(CircleShape)
+                            .background(
+                                if (isSearchExpanded) {
+                                    Accent.copy(alpha = 0.15f)
+                                } else {
+                                    Color.Transparent
+                                },
+                            ).border(
+                                1.dp,
+                                Accent.copy(alpha = if (isDownloadsTab) 0.25f else 0.5f),
+                                CircleShape,
+                            ).focusProperties { canFocus = !isLibraryTab },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    @Suppress("DEPRECATION")
+                    CompositionLocalProvider(
+                        androidx.compose.material3.LocalRippleConfiguration provides
+                            androidx.compose.material3.RippleConfiguration(color = Accent),
+                    ) {
+                        IconButton(
+                            onClick = {
+                                if (!isDownloadsTab) {
+                                    if (isSearchExpanded) {
+                                        onSearchQueryChange(TextFieldValue(""))
+                                        isSearchExpanded = false
+                                    } else {
+                                        isSearchExpanded = true
+                                    }
+                                }
+                            },
+                            modifier = Modifier.size(44.dp),
+                            enabled = !isDownloadsTab,
+                        ) {
+                            Icon(
+                                Icons.Outlined.Search,
+                                contentDescription = "Search",
+                                tint =
+                                    if (isDownloadsTab) {
+                                        TextSecondary.copy(alpha = 0.4f)
+                                    } else {
+                                        Accent
+                                    },
+                                modifier =
+                                    Modifier
+                                        .size(24.dp)
+                                        .graphicsLayer { rotationZ = searchIconRotation },
+                            )
+                        }
+                    }
+                }
+                if (isControllerConnected) {
+                    Spacer(Modifier.width(4.dp))
+                    ControllerBadge("L3")
+                }
+            }
+
+            val topBarView = androidx.compose.ui.platform.LocalView.current
+            val topBarDensity = androidx.compose.ui.platform.LocalDensity.current
+            val topBarOrientation = androidx.compose.ui.platform.LocalConfiguration.current.orientation
+            val navRightInset = remember(topBarOrientation, topBarView) {
+                val px = androidx.core.view.ViewCompat.getRootWindowInsets(topBarView)
+                    ?.getInsets(androidx.core.view.WindowInsetsCompat.Type.navigationBars())?.right ?: 0
+                with(topBarDensity) { px.toDp() }
+            }
+            Row(
+                modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight().zIndex(2f),
+                horizontalArrangement = Arrangement.End,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Spacer(Modifier.width(8.dp))
+
+                if (glassesConnected) {
+                    Box(
+                        modifier =
+                            Modifier
+                                .size(44.dp)
+                                .clip(CircleShape)
+                                .background(Color.Transparent)
+                                .border(1.dp, Accent.copy(alpha = 0.5f), CircleShape)
+                                .clickable { showGlassesPanel = true },
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(Eyeglasses2Icon, contentDescription = "Glasses", tint = Accent, modifier = Modifier.size(24.dp))
+                    }
+                    Spacer(Modifier.width(12.dp))
+                }
+
+                Box(
+                    modifier =
+                        Modifier
+                            .size(44.dp)
+                            .clip(CircleShape)
+                            .background(Color.Transparent)
+                            .border(1.dp, Accent.copy(alpha = 0.5f), CircleShape)
+                            .focusProperties { canFocus = !isLibraryTab }
+                            .clickable(
+                                interactionSource = null,
+                                indication = androidx.compose.material3.ripple(color = Accent),
+                            ) { onFilterClicked() },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(Icons.Outlined.FilterList, contentDescription = "Filter", tint = Accent, modifier = Modifier.size(24.dp))
+                }
+                if (isControllerConnected) {
+                    Spacer(Modifier.width(4.dp))
+                    ControllerBadge("Select")
+                }
+
+                Spacer(Modifier.width(6.dp))
+
+                Box(
+                    modifier =
+                        Modifier
+                            .size(44.dp)
+                            .clip(CircleShape)
+                            .background(Color.Transparent)
+                            .border(1.dp, Accent.copy(alpha = 0.5f), CircleShape)
+                            .clickable { onFriendsClicked() },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(Icons.Outlined.People, contentDescription = "Friends", tint = Accent, modifier = Modifier.size(24.dp))
+                }
+                if (isControllerConnected && navRightInset <= 0.dp) {
+                    Spacer(Modifier.width(8.dp))
+                    Box(
+                        modifier =
+                            Modifier
+                                .background(Color(0xFF394048), RoundedCornerShape(15.dp))
+                                .border(1.dp, Color(0xFF8B949E).copy(alpha = 0.5f), RoundedCornerShape(15.dp))
+                                .padding(horizontal = 7.dp, vertical = 3.dp),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            Icons.Outlined.SportsEsports,
+                            contentDescription = "Guide",
+                            tint = Color(0xFFE6EDF3),
+                            modifier = Modifier.size(16.dp),
+                        )
+                    }
+                }
+            }
+
+            if (isControllerConnected && navRightInset > 0.dp) {
+                Box(
+                    modifier =
+                        Modifier
+                            .align(Alignment.CenterEnd)
+                            .offset(x = 38.dp)
+                            .zIndex(2f)
+                            .background(Color(0xFF394048), RoundedCornerShape(15.dp))
+                            .border(1.dp, Color(0xFF8B949E).copy(alpha = 0.5f), RoundedCornerShape(15.dp))
+                            .padding(horizontal = 7.dp, vertical = 3.dp),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(
+                        Icons.Outlined.SportsEsports,
+                        contentDescription = "Guide",
+                        tint = Color(0xFFE6EDF3),
+                        modifier = Modifier.size(16.dp),
+                    )
+                }
+            }
+        }
+
+        if (showGlassesPanel) GlassesSettingsSheet(onDismiss = { showGlassesPanel = false })
+
+        AnimatedVisibility(
+            visible = isSearchExpanded && !isDownloadsTab,
+            enter =
+                expandVertically(
+                    animationSpec =
+                        spring(
+                            dampingRatio = Spring.DampingRatioNoBouncy,
+                            stiffness = Spring.StiffnessMedium,
+                        ),
+                    expandFrom = Alignment.Top,
+                ) + fadeIn(animationSpec = tween(200)),
+            exit =
+                shrinkVertically(
+                    animationSpec =
+                        spring(
+                            dampingRatio = Spring.DampingRatioNoBouncy,
+                            stiffness = Spring.StiffnessMedium,
+                        ),
+                    shrinkTowards = Alignment.Top,
+                ) + fadeOut(animationSpec = tween(120)),
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 6.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                Box(
+                    modifier =
+                        Modifier
+                            .widthIn(max = 600.dp)
+                            .fillMaxWidth(0.7f)
+                            .height(44.dp)
+                            .shadow(8.dp, RoundedCornerShape(24.dp), spotColor = Color.Black.copy(alpha = 0.4f))
+                            .clip(RoundedCornerShape(24.dp))
+                            .background(SurfaceDark),
+                    contentAlignment = Alignment.CenterStart,
+                ) {
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxSize()
+                                .padding(horizontal = 16.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Icon(
+                            Icons.Outlined.Search,
+                            contentDescription = null,
+                            tint = Accent,
+                            modifier = Modifier.size(22.dp),
+                        )
+                        Spacer(Modifier.width(12.dp))
+                        BasicTextField(
+                            value = searchQuery,
+                            onValueChange = onSearchQueryChange,
+                            singleLine = true,
+                            textStyle =
+                                TextStyle(
+                                    color = TextPrimary,
+                                    fontSize = 15.sp,
+                                ),
+                            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+                            keyboardActions = KeyboardActions(onSearch = { keyboardController?.hide() }),
+                            cursorBrush = Brush.verticalGradient(listOf(Accent, AccentGlow)),
+                            modifier =
+                                Modifier
+                                    .weight(1f)
+                                    .focusRequester(searchFocusRequester),
+                            decorationBox = { innerTextField ->
+                                Box(contentAlignment = Alignment.CenterStart) {
+                                    if (searchQuery.text.isEmpty()) {
+                                        Text(
+                                            "Search games",
+                                            style =
+                                                TextStyle(
+                                                    color = TextSecondary,
+                                                    fontSize = 15.sp,
+                                                ),
+                                        )
+                                    }
+                                    innerTextField()
+                                }
+                            },
+                        )
+                        if (searchQuery.text.isNotEmpty()) {
+                            IconButton(
+                                onClick = { onSearchQueryChange(TextFieldValue("")) },
+                                modifier = Modifier.size(32.dp),
+                            ) {
+                                Icon(
+                                    Icons.Outlined.Close,
+                                    contentDescription = "Clear",
+                                    tint = TextSecondary,
+                                    modifier = Modifier.size(18.dp),
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } // end Column
+}
+
+@Composable
+internal fun UnifiedActivity.LibraryCarousel(
+    isLoggedIn: Boolean,
+    steamApps: List<SteamApp>,
+    epicApps: List<EpicGame>,
+    gogApps: List<GOGGame>,
+    layoutMode: LibraryLayoutMode,
+    libraryRefreshKey: Int = 0,
+    shortcutRefreshKey: Int = 0,
+    playtimeRefreshKey: Int = 0,
+    iconRefreshKey: Int = 0,
+    searchQuery: String = "",
+    isControllerConnected: Boolean = false,
+) {
+    val context = LocalContext.current
+
+    var cachedShortcuts by remember { mutableStateOf<List<Shortcut>>(emptyList()) }
+    var customApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
+    var localLibraryRefreshKey by remember { mutableIntStateOf(0) }
+    var shortcutsLoaded by remember { mutableStateOf(false) }
+    var pullRefreshing by remember { mutableStateOf(false) }
+    LaunchedEffect(shortcutRefreshKey, localLibraryRefreshKey, com.winlator.cmod.feature.retro.RetroBoxart.artVersion.value) {
+        shortcutsLoaded = false
+
+        // Pull-to-refresh only: rescan disk so a manually moved game is picked up without faking a re-download.
+        // Skipped on the initial pass because the scan walks every known app.
+        if (pullRefreshing) {
+            runCatching {
+                withContext(Dispatchers.IO) { SteamService.repairInstalledMetadataFromDisk() }
+            }.onFailure { Log.w("UnifiedActivity", "Pull-to-refresh install repair failed", it) }
+        }
+
+        val shortcutScanResult =
+            runCatching {
+                withContext(Dispatchers.IO) {
+                    runCatching { com.winlator.cmod.feature.retro.RetroRomScanner.scanConfiguredFolder(context) }
+                    val cm = ContainerManager(context)
+                    cm.upgradeShortcuts {
+                        localLibraryRefreshKey++
+                    }
+                    val allShortcuts = cm.loadShortcuts()
+                    val badges = HashMap<Int, String>()
+                    val apps =
+                        allShortcuts
+                            .mapNotNull { shortcut ->
+                                if (!LibraryShortcutUtils.isCustomLibraryShortcut(shortcut)) {
+                                    return@mapNotNull null
+                                }
+
+                                val displayName =
+                                    shortcut
+                                        .getExtra("custom_name", shortcut.name)
+                                        .ifBlank { shortcut.name }
+
+                                val uuid = shortcut.getExtra("uuid")
+                                val customId = if (uuid.isNotEmpty()) {
+                                    -(uuid.hashCode().and(0x7FFFFFFF) + 1)
+                                } else {
+                                    -(displayName.hashCode().and(0x7FFFFFFF) + 1)
+                                }
+
+                                com.winlator.cmod.feature.retro.RetroSystems
+                                    .fromId(
+                                        shortcut.getExtra(
+                                            com.winlator.cmod.feature.retro.RetroShortcuts.KEY_SYSTEM,
+                                        ),
+                                    )?.let { badges[customId] = it.id }
+
+                                SteamApp(
+                                    id = customId,
+                                    name = displayName,
+                                    developer = "Custom",
+                                    gameDir =
+                                        shortcut.getExtra(
+                                            "game_install_path",
+                                            shortcut.getExtra("custom_game_folder", ""),
+                                        ),
+                                )
+                            }
+
+                    Triple(allShortcuts, apps, badges)
+                }
+            }.getOrNull()
+
+        if (shortcutScanResult != null) {
+            cachedShortcuts = shortcutScanResult.first
+            customApps = shortcutScanResult.second
+            retroLibrarySystemIds.value = shortcutScanResult.third
+        }
+
+        shortcutsLoaded = true
+    }
+
+    // Move library filtering and file checks off the main thread.
+    var mergedInstalledApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
+    var installedApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
+    var stableInstalledApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
+    var gogByPseudoId by remember { mutableStateOf<Map<Int, GOGGame>>(emptyMap()) }
+    var epicByPseudoId by remember { mutableStateOf<Map<Int, EpicGame>>(emptyMap()) }
+    var stableGogByPseudoId by remember { mutableStateOf<Map<Int, GOGGame>>(emptyMap()) }
+    var stableEpicByPseudoId by remember { mutableStateOf<Map<Int, EpicGame>>(emptyMap()) }
+    var customListArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var customHeroArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var customCarouselArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var customArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var customIconArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var customIconPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var stableCustomArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var stableCustomIconArtworkPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var stableCustomIconPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var stableCustomHeroPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var stableCustomCarouselPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var stableCustomListPathByAppId by remember { mutableStateOf<Map<Int, String>>(emptyMap()) }
+    var artworkCacheRefreshKey by remember { mutableIntStateOf(0) }
+    var libraryLoaded by remember { mutableStateOf(false) }
+    // Suppress transient empty states before background recomputation starts.
+    val scanInputToken =
+        remember(steamApps, epicApps, gogApps, customApps, libraryRefreshKey, localLibraryRefreshKey) { Any() }
+    var processedScanToken by remember { mutableStateOf<Any?>(null) }
+
+    LaunchedEffect(scanInputToken) {
+        withContext(Dispatchers.IO) {
+            val steamInstalled = steamApps.filter { SteamService.isAppInstalled(it.id) }
+
+            val epicInstalled = epicApps.filter { it.isInstalled }
+
+            // Match Epic's DB-backed install filter during verify/update.
+            val gogInstalled = gogApps.filter { it.isInstalled }
+
+            val gogMap = gogInstalled.associateBy { gogPseudoId(it.id) }
+            val epicMap = epicInstalled.associateBy { 2000000000 + it.id }
+
+            val playtimePrefs = context.getSharedPreferences("playtime_stats", android.content.Context.MODE_PRIVATE)
+            val allPlaytime = playtimePrefs.all
+            val mappedEpic =
+                epicInstalled.map { epic ->
+                    SteamApp(
+                        id = 2000000000 + epic.id,
+                        name = epic.title,
+                        developer = epic.developer,
+                        gameDir = epic.installPath,
+                    )
+                }
+            val mappedGog =
+                gogInstalled.map { gog ->
+                    SteamApp(
+                        id = gogPseudoId(gog.id),
+                        name = gog.title,
+                        developer = gog.developer,
+                        gameDir = gog.installPath,
+                    )
+                }
+            val merged = steamInstalled + customApps + mappedEpic + mappedGog
+            val sorted =
+                merged.sortedByDescending { app ->
+                    val searchKey =
+                        if (app.id >= 2000000000 || app.id < 0) {
+                            app.name
+                        } else {
+                            app.name.replace(LIBRARY_NAME_SANITIZE_REGEX, "")
+                        }
+                    (allPlaytime["${searchKey}_last_played"] as? Long) ?: 0L
+                }
+
+            withContext(Dispatchers.Main) {
+                gogByPseudoId = gogMap
+                epicByPseudoId = epicMap
+                mergedInstalledApps = merged
+                installedApps = sorted
+                if (sorted.isNotEmpty()) {
+                    stableInstalledApps = sorted
+                    stableGogByPseudoId = gogMap
+                    stableEpicByPseudoId = epicMap
+                }
+                libraryLoaded = true
+                processedScanToken = scanInputToken
+                pullRefreshing = false
+            }
+        }
+    }
+
+    LaunchedEffect(installedApps, gogByPseudoId, cachedShortcuts, iconRefreshKey) {
+        val appsSnapshot = installedApps
+        val gogSnapshot = gogByPseudoId
+        val shortcutsSnapshot = cachedShortcuts
+
+        val artworkPaths =
+            withContext(Dispatchers.IO) {
+                buildMap<Int, String> {
+                    appsSnapshot.forEach { app ->
+                        val gogGame = gogSnapshot[app.id]
+                        val isCustom = app.id < 0
+                        val isEpic = app.id >= 2000000000
+                        val epicId = if (isEpic) app.id - 2000000000 else 0
+                        val shortcut =
+                            if (gogGame != null) {
+                                shortcutsSnapshot.find {
+                                    it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
+                                }
+                            } else {
+                                findShortcutForGame(shortcutsSnapshot, app, isCustom, isEpic, epicId)
+                            }
+                        val customPath =
+                            shortcut
+                                ?.getExtra("customLibraryIconPath")
+                                ?.ifBlank { shortcut.getExtra("customCoverArtPath") }
+                        if (!customPath.isNullOrBlank() && java.io.File(customPath).exists()) {
+                            put(app.id, customPath)
+                        }
+                    }
+                }
+            }
+
+        val iconArtworkPaths =
+            withContext(Dispatchers.IO) {
+                buildMap<Int, String> {
+                    appsSnapshot.forEach { app ->
+                        val gogGame = gogSnapshot[app.id]
+                        val isCustom = app.id < 0
+                        val isEpic = app.id >= 2000000000
+                        val epicId = if (isEpic) app.id - 2000000000 else 0
+                        val shortcut =
+                            if (gogGame != null) {
+                                shortcutsSnapshot.find {
+                                    it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
+                                }
+                            } else {
+                                findShortcutForGame(shortcutsSnapshot, app, isCustom, isEpic, epicId)
+                            }
+                        val customPath = shortcut?.let(LibraryShortcutArtwork::findIconArtworkPath)
+                        if (customPath != null) {
+                            put(app.id, customPath)
+                        }
+                    }
+                }
+            }
+
+        val customHeroPath =
+            withContext(Dispatchers.IO) {
+                buildMap<Int, String> {
+                    appsSnapshot.forEach { app ->
+                        if (app.id >= 0) return@forEach
+                        val shortcut = findShortcutForGame(shortcutsSnapshot, app, true, false, 0) ?: return@forEach
+                        val heroPath = shortcut.getExtra("customLibraryHeroArtPath")
+                        if (heroPath.isNullOrBlank() || !java.io.File(heroPath).isFile)
+                            return@forEach
+                        put(app.id, heroPath)
+                    }
+                }
+            }
+
+        val customCarouselPath =
+            withContext(Dispatchers.IO) {
+                buildMap<Int, String> {
+                    appsSnapshot.forEach { app ->
+                        if (app.id >= 0) return@forEach
+                        val shortcut = findShortcutForGame(shortcutsSnapshot, app, true, false, 0) ?: return@forEach
+                        val carouselPath = shortcut.getExtra("customLibraryCarouselArtPath")
+                        if (carouselPath.isNullOrBlank() || !java.io.File(carouselPath).isFile)
+                            return@forEach
+                        put(app.id, carouselPath)
+                    }
+                }
+            }
+
+        val customListPath =
+            withContext(Dispatchers.IO) {
+                buildMap<Int, String> {
+                    appsSnapshot.forEach { app ->
+                        if (app.id >= 0) return@forEach
+                        val shortcut = findShortcutForGame(shortcutsSnapshot, app, true, false, 0) ?: return@forEach
+                        val listPath = shortcut.getExtra("customLibraryListArtPath")
+                        if (listPath.isNullOrBlank() || !java.io.File(listPath).isFile)
+                            return@forEach
+                        put(app.id, listPath)
+                    }
+                }
+            }
+
+        val customIconPaths =
+            withContext(Dispatchers.IO) {
+                buildMap<Int, String> {
+                    appsSnapshot.forEach { app ->
+                        if (app.id >= 0) return@forEach
+                        val safeName = app.name.replace("/", "_").replace("\\", "_")
+                        val iconFile = java.io.File(context.filesDir, "custom_icons/$safeName.png")
+                        if (iconFile.exists()) {
+                            put(app.id, iconFile.absolutePath)
+                        }
+                    }
+                }
+            }
+
+        customArtworkPathByAppId = artworkPaths
+        customIconArtworkPathByAppId = iconArtworkPaths
+        customIconPathByAppId = customIconPaths
+        customHeroArtworkPathByAppId = customHeroPath
+        customCarouselArtworkPathByAppId = customCarouselPath
+        customListArtworkPathByAppId = customListPath
+        if (appsSnapshot.isNotEmpty()) {
+            stableCustomArtworkPathByAppId = artworkPaths
+            stableCustomIconArtworkPathByAppId = iconArtworkPaths
+            stableCustomIconPathByAppId = customIconPaths
+            stableCustomHeroPathByAppId = customHeroPath
+            stableCustomCarouselPathByAppId = customCarouselPath
+            stableCustomListPathByAppId = customListPath
+        }
+    }
+
+    LaunchedEffect(mergedInstalledApps, playtimeRefreshKey) {
+        if (mergedInstalledApps.isEmpty()) {
+            installedApps = emptyList()
+            return@LaunchedEffect
+        }
+
+        val sorted =
+            withContext(Dispatchers.IO) {
+                val playtimePrefs = context.getSharedPreferences("playtime_stats", android.content.Context.MODE_PRIVATE)
+                val allPlaytime = playtimePrefs.all
+                mergedInstalledApps.sortedByDescending { app ->
+                    val searchKey =
+                        if (app.id >= 2000000000 || app.id < 0) {
+                            app.name
+                        } else {
+                            app.name.replace(LIBRARY_NAME_SANITIZE_REGEX, "")
+                        }
+                    (allPlaytime["${searchKey}_last_played"] as? Long) ?: 0L
+                }
+            }
+
+        installedApps = sorted
+    }
+
+    val awaitingShortcutScan = installedApps.isEmpty() && !shortcutsLoaded
+    val keepPreviousLibraryVisible =
+        installedApps.isEmpty() &&
+            stableInstalledApps.isNotEmpty() &&
+            (processedScanToken !== scanInputToken || awaitingShortcutScan)
+    val visibleInstalledApps = if (keepPreviousLibraryVisible) stableInstalledApps else installedApps
+    val visibleGogByPseudoId = if (keepPreviousLibraryVisible) stableGogByPseudoId else gogByPseudoId
+    val visibleEpicByPseudoId = if (keepPreviousLibraryVisible) stableEpicByPseudoId else epicByPseudoId
+    val visibleCustomArtworkPathByAppId =
+        if (keepPreviousLibraryVisible) stableCustomArtworkPathByAppId else customArtworkPathByAppId
+    val visibleCustomIconArtworkPathByAppId =
+        if (keepPreviousLibraryVisible) stableCustomIconArtworkPathByAppId else customIconArtworkPathByAppId
+    val visibleCustomIconPathByAppId =
+        if (keepPreviousLibraryVisible) stableCustomIconPathByAppId else customIconPathByAppId
+    val visibleCustomListPathByAppId =
+        if (keepPreviousLibraryVisible) stableCustomListPathByAppId else customListArtworkPathByAppId
+    val visibleCustomHeroPathByAppId =
+        if (keepPreviousLibraryVisible) stableCustomHeroPathByAppId else customHeroArtworkPathByAppId
+    val visibleCustomCarouselPathByAppId =
+        if (keepPreviousLibraryVisible) stableCustomCarouselPathByAppId else customCarouselArtworkPathByAppId
+
+    val displayedApps =
+        remember(visibleInstalledApps, searchQuery) {
+            if (searchQuery.isBlank()) {
+                visibleInstalledApps
+            } else {
+                visibleInstalledApps.filter { it.name.contains(searchQuery, ignoreCase = true) }
+            }
+        }
+
+    LaunchedEffect(
+        visibleInstalledApps,
+        visibleGogByPseudoId,
+        visibleEpicByPseudoId,
+        visibleCustomArtworkPathByAppId,
+        visibleCustomIconArtworkPathByAppId,
+        cachedShortcuts,
+    ) {
+        var deletedCustomOverrides = false
+        val refs =
+            visibleInstalledApps.flatMap { app ->
+                val gogGame = visibleGogByPseudoId[app.id]
+                val epicGame = visibleEpicByPseudoId[app.id]
+                val overriddenSlots =
+                    customArtworkOverrideSlots(
+                        app = app,
+                        gogGame = gogGame,
+                        epicGame = epicGame,
+                        hasDefaultCustomArt = visibleCustomArtworkPathByAppId[app.id] != null,
+                        hasIconCustomArt = visibleCustomIconArtworkPathByAppId[app.id] != null,
+                        hasHeroCustomArt =
+                            findLibraryArtworkShortcut(cachedShortcuts, app, gogGame, epicGame)
+                                ?.hasExistingArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD.extraKey) == true,
+                    )
+
+                if (overriddenSlots.isNotEmpty()) {
+                    val cacheId = artworkCacheId(app, gogGame, epicGame)
+                    if (cacheId != null) {
+                        val deleted =
+                            withContext(Dispatchers.IO) {
+                                StoreArtworkCache.deleteSlots(context, cacheId.store, cacheId.gameId, overriddenSlots)
+                            }
+                        deletedCustomOverrides = deletedCustomOverrides || deleted
+                    }
+                }
+
+                StoreArtworkCache
+                    .libraryRefs(
+                        app = app,
+                        gogGame = gogGame,
+                        epicGame = epicGame,
+                    ).filterNot { it.slot in overriddenSlots }
+            }
+        val cachedAny =
+            withContext(Dispatchers.IO) {
+                StoreArtworkCache.cacheAll(context, refs)
+            }
+        if (cachedAny || deletedCustomOverrides) artworkCacheRefreshKey++
+    }
+
+    // The startup bootstrap screen already masks the first frame. Do not
+    // force an extra minimum spinner duration here or the library visibly
+    // bounces through two loading states on launch.
+    // A logged-in store whose owned-apps list is still empty hasn't finished
+    // its initial library fetch yet — keep the spinner up instead of flashing
+    // "No games installed". This resolves itself once the store populates its
+    // DB (steamApps/epicApps/gogApps become non-empty) or if other sources
+    // (custom apps, other stores) already have installed games.
+    val awaitingStoreSync =
+        installedApps.isEmpty() && (
+            (isLoggedIn && steamApps.isEmpty()) ||
+                (epicApps.isEmpty() && EpicService.hasStoredCredentials(context)) ||
+                (gogApps.isEmpty() && GOGAuthManager.isLoggedIn(context))
+        )
+    // Only block the surface while the first library result is unresolved.
+    // After that, keep the current content/empty state visible during
+    // background refreshes so the UI does not flicker back to a spinner.
+    val initialLibraryLoadPending = !libraryLoaded
+    val waitingForFirstEmptyStateResolution =
+        installedApps.isEmpty() && (processedScanToken !== scanInputToken || awaitingStoreSync || awaitingShortcutScan)
+    val showLoading = initialLibraryLoadPending || waitingForFirstEmptyStateResolution
+    if (showLoading) {
+        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            val spinAlpha by animateFloatAsState(
+                targetValue = 1f,
+                animationSpec = tween(durationMillis = 600),
+                label = "loaderFade",
+            )
+            CircularProgressIndicator(
+                color = Accent,
+                strokeWidth = 3.dp,
+                modifier = Modifier.size(48.dp).alpha(spinAlpha),
+            )
+        }
+        return
+    }
+
+    if (visibleInstalledApps.isEmpty()) {
+        val epicLoggedIn by EpicAuthManager.isLoggedInFlow.collectAsState()
+        val gogLoggedIn by GOGAuthManager.isLoggedInFlow.collectAsState()
+        val anyLoggedIn = isLoggedIn || epicLoggedIn || gogLoggedIn
+        val hasAnyCredentials =
+            anyLoggedIn ||
+                SteamService.hasStoredCredentials(context) ||
+                EpicService.hasStoredCredentials(context) ||
+                GOGAuthManager.isLoggedIn(context)
+        if (!anyLoggedIn && !hasAnyCredentials) {
+            LoginRequiredScreen("Library") {
+                navigateToSettings(SettingsNavItem.STORES)
+            }
+        } else if (anyLoggedIn) {
+            PullToRefreshBox(
+                isRefreshing = pullRefreshing,
+                onRefresh = {
+                    pullRefreshing = true
+                    localLibraryRefreshKey++
+                },
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                Box(
+                    Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    EmptyStateMessage(stringResource(R.string.library_games_no_games_installed))
+                }
+            }
+        }
+        return
+    }
+
+    var selectedAppForSettings by remember { mutableStateOf<SteamApp?>(null) }
+    var selectedGogGameForSettings by remember { mutableStateOf<GOGGame?>(null) }
+    var detailApp by remember { mutableStateOf<SteamApp?>(null) }
+    var detailGogGame by remember { mutableStateOf<GOGGame?>(null) }
+    val gridState = rememberLazyGridState()
+    val carouselState = rememberLazyListState()
+    val activity = LocalContext.current as? UnifiedActivity
+
+    // Pause chasing borders on library cards while any dialog is open.
+    LaunchedEffect(selectedAppForSettings, selectedGogGameForSettings, detailApp) {
+        chasingBordersPaused.value =
+            selectedAppForSettings != null || selectedGogGameForSettings != null || detailApp != null
+    }
+    DisposableEffect(Unit) {
+        onDispose { chasingBordersPaused.value = false }
+    }
+
+    LaunchedEffect(layoutMode) {
+        currentLibraryLayoutMode = layoutMode
+    }
+
+    // Keep activity's item count in sync
+    LaunchedEffect(displayedApps.size) {
+        activity?.libraryItemCount = displayedApps.size
+        val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
+        if (activity != null && displayedApps.isNotEmpty() && activity.libraryFocusIndex.value > lastIndex) {
+            activity.libraryFocusIndex.value = lastIndex
+        }
+    }
+
+    // FocusRequesters for each grid item
+    val focusRequesters =
+        remember(displayedApps.size) {
+            List(displayedApps.size) { FocusRequester() }
+        }
+
+    // Observe focus index changes from the activity and request focus on the target item
+    val focusIndex by (activity?.libraryFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
+    LaunchedEffect(focusIndex, focusRequesters.size, layoutMode) {
+        if (searchQuery.isEmpty() &&
+            layoutMode == LibraryLayoutMode.GRID_4 &&
+            focusRequesters.isNotEmpty() &&
+            focusIndex in focusRequesters.indices
+        ) {
+            gridState.animateScrollToItem(focusIndex)
+            try {
+                focusRequesters[focusIndex].requestFocus()
+            } catch (_: Exception) {
+            }
+        }
+    }
+
+    // Track selected app for the top-right Game Settings button
+    LaunchedEffect(focusIndex, displayedApps) {
+        val app = displayedApps.getOrNull(focusIndex) ?: displayedApps.firstOrNull()
+        selectedSteamAppId = app?.id ?: 0
+        selectedSteamAppName = app?.name ?: ""
+        val gogGame = app?.let { visibleGogByPseudoId[it.id] }
+        selectedLibrarySource =
+            when {
+                gogGame != null -> "GOG"
+                app == null -> ""
+                app.id >= 2000000000 -> "EPIC"
+                app.id < 0 -> "CUSTOM"
+                else -> "STEAM"
+            }
+        selectedGogGameId = gogGame?.id.orEmpty()
+    }
+
+    val heroApps = rememberUpdatedState(displayedApps)
+    val heroFocus = rememberUpdatedState(focusIndex)
+    val heroGogMap = rememberUpdatedState(visibleGogByPseudoId)
+    LaunchedEffect(Unit) {
+        activity?.openHeroForFocusedSignal?.collect {
+            val list = heroApps.value
+            val app = list.getOrNull(heroFocus.value) ?: list.firstOrNull()
+            if (app != null) {
+                detailGogGame = heroGogMap.value[app.id]
+                detailApp = app
+            }
+        }
+    }
+
+    // Publish the focused game's hero art (custom card > store hero > grid capsule) for the immersive background; shortcuts load once per refresh signal, not per focus move.
+    var immersiveShortcuts by remember { mutableStateOf<List<Shortcut>?>(null) }
+    LaunchedEffect(shortcutRefreshKey, libraryRefreshKey, artworkCacheRefreshKey) {
+        immersiveShortcuts =
+            withContext(Dispatchers.IO) { ContainerManager(context).loadShortcuts() }
+    }
+
+    LaunchedEffect(focusIndex, displayedApps, immersiveShortcuts) {
+        val shortcuts = immersiveShortcuts ?: return@LaunchedEffect
+        val app = displayedApps.getOrNull(focusIndex) ?: displayedApps.firstOrNull()
+        if (app == null) {
+            activity?.immersiveBackgroundRef?.value = null
+            return@LaunchedEffect
+        }
+        // Debounce so scrubbing the grid doesn't decode every intermediate hero.
+        delay(200)
+        val gogGame = visibleGogByPseudoId[app.id]
+        val epicGame = visibleEpicByPseudoId[app.id]
+        val isCustom = app.id < 0
+        val isEpic = app.id >= 2000000000
+        val epicId = if (isEpic) app.id - 2000000000 else 0
+
+        val shortcut =
+            when {
+                gogGame != null ->
+                    shortcuts.find {
+                        it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
+                    }
+                else -> findShortcutForGame(shortcuts, app, isCustom, isEpic, epicId)
+            }
+        val customHeroFile =
+            withContext(Dispatchers.IO) {
+                shortcut
+                    ?.getExtra(LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD.extraKey)
+                    ?.takeIf { it.isNotBlank() }
+                    ?.let { java.io.File(it) }
+                    ?.takeIf { it.isFile }
+            }
+
+        activity?.immersiveBackgroundRef?.value =
+            customHeroFile
+                ?: run {
+                    val ref =
+                        StoreArtworkCache.heroRef(app, gogGame, epicGame)
+                            ?: StoreArtworkCache.primaryRef(
+                                app,
+                                gogGame,
+                                epicGame,
+                                useLibraryCapsule = false,
+                                listMode = false,
+                            )
+                    StoreArtworkCache.imageModel(context, ref)
+                }
+    }
+
+    val openSettingsForApp: (Int, SteamApp) -> Unit = { index, app ->
+        activity?.libraryFocusIndex?.value = index
+        selectedSteamAppId = app.id
+        selectedSteamAppName = app.name
+        val gogGame = visibleGogByPseudoId[app.id]
+        selectedLibrarySource =
+            when {
+                gogGame != null -> "GOG"
+                app.id >= 2000000000 -> "EPIC"
+                app.id < 0 -> "CUSTOM"
+                else -> "STEAM"
+            }
+        selectedGogGameId = gogGame?.id.orEmpty()
+
+        if (gogGame != null) {
+            selectedGogGameForSettings = gogGame
+        } else {
+            selectedAppForSettings = app
+        }
+    }
+
+    PullToRefreshBox(
+        isRefreshing = pullRefreshing,
+        onRefresh = {
+            pullRefreshing = true
+            localLibraryRefreshKey++
+        },
+        modifier = Modifier.fillMaxSize(),
+    ) {
+        when (layoutMode) {
+            LibraryLayoutMode.GRID_4 -> {
+                FourByTwoGridView(
+                    items = displayedApps,
+                    modifier = Modifier.tabScreenPadding(),
+                    gridState = gridState,
+                    contentPadding = TabGridContentPadding,
+                    clipContent = false,
+                    keyOf = { it.id },
+                ) { app, index, rowHeight ->
+                    GameCapsule(
+                        app = app,
+                        gogGame = visibleGogByPseudoId[app.id],
+                        epicGame = visibleEpicByPseudoId[app.id],
+                        iconRefreshKey = iconRefreshKey,
+                        artworkCacheRefreshKey = artworkCacheRefreshKey,
+                        isFocusedOverride = index == focusIndex,
+                        isControllerActive = isControllerConnected,
+                        customArtworkPath = visibleCustomIconArtworkPathByAppId[app.id] ?: visibleCustomArtworkPathByAppId[app.id],
+                        customIconPath = visibleCustomIconPathByAppId[app.id],
+                        customListPath = visibleCustomListPathByAppId[app.id],
+                        customHeroPath = visibleCustomHeroPathByAppId[app.id],
+                        onClick = {
+                            // Keeps the immersive background on the opened game after backing out.
+                            activity?.libraryFocusIndex?.value = index
+                            detailGogGame = visibleGogByPseudoId[app.id]
+                            detailApp = app
+                        },
+                        onLongClick = {
+                            openSettingsForApp(index, app)
+                        },
+                        modifier =
+                            Modifier
+                                .height(rowHeight)
+                                .then(
+                                    if (index in focusRequesters.indices) {
+                                        Modifier.focusRequester(focusRequesters[index])
+                                    } else {
+                                        Modifier
+                                    },
+                                ),
+                    )
+                }
+            }
+
+            LibraryLayoutMode.CAROUSEL -> {
+                // Host the horizontal carousel in a same-height vertical scroll so a downward finger pull reaches the shared PullToRefreshBox.
+                BoxWithConstraints(Modifier.fillMaxSize()) {
+                    val carouselViewportHeight = maxHeight
+                    Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState())) {
+                        Box(Modifier.fillMaxWidth().height(carouselViewportHeight)) {
+                            CarouselView(
+                                items = displayedApps,
+                                modifier = Modifier.tabScreenPadding(top = TabCarouselTopPadding, bottom = TabCarouselBottomPadding),
+                                listState = carouselState,
+                                selectedIndex = focusIndex,
+                                onCenteredIndexChanged = { centeredIndex ->
+                                    if (activity != null && activity.libraryFocusIndex.value != centeredIndex) {
+                                        activity.libraryFocusIndex.value = centeredIndex
+                                    }
+                                },
+                            ) { app, index, isSelected, cardWidth, cardHeight ->
+                                GameCapsule(
+                                    app = app,
+                                    gogGame = visibleGogByPseudoId[app.id],
+                                    epicGame = visibleEpicByPseudoId[app.id],
+                                    iconRefreshKey = iconRefreshKey,
+                                    artworkCacheRefreshKey = artworkCacheRefreshKey,
+                                    isFocusedOverride = isSelected,
+                                    isControllerActive = isControllerConnected,
+                                    customArtworkPath = visibleCustomIconArtworkPathByAppId[app.id] ?: visibleCustomArtworkPathByAppId[app.id],
+                                    customIconPath = visibleCustomIconPathByAppId[app.id],
+                                    customListPath = visibleCustomListPathByAppId[app.id],
+                                    customCarouselPath = visibleCustomCarouselPathByAppId[app.id],
+                                    customHeroPath = visibleCustomHeroPathByAppId[app.id],
+                                    onClick = {
+                                        detailGogGame = visibleGogByPseudoId[app.id]
+                                        detailApp = app
+                                    },
+                                    onLongClick = { openSettingsForApp(index, app) },
+                                    useLibraryCapsule = true,
+                                    modifier =
+                                        Modifier
+                                            .fillMaxSize()
+                                            .then(
+                                                if (index in focusRequesters.indices) {
+                                                    Modifier.focusRequester(focusRequesters[index])
+                                                } else {
+                                                    Modifier
+                                                },
+                                            ),
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            LibraryLayoutMode.LIST -> {
+                val listViewState = rememberLazyListState()
+                ListView(
+                    items = displayedApps,
+                    modifier = Modifier.tabScreenPadding(),
+                    listState = listViewState,
+                    contentPadding = TabListContentPadding,
+                    selectedIndex = focusIndex,
+                    onSelectedIndexChanged = { newIdx ->
+                        activity?.libraryFocusIndex?.value = newIdx
+                    },
+                    keyOf = { it.id },
+                ) { app, index, isSelected ->
+                    GameCapsule(
+                        app = app,
+                        gogGame = visibleGogByPseudoId[app.id],
+                        epicGame = visibleEpicByPseudoId[app.id],
+                        iconRefreshKey = iconRefreshKey,
+                        artworkCacheRefreshKey = artworkCacheRefreshKey,
+                        isFocusedOverride = isSelected,
+                        isControllerActive = isControllerConnected,
+                        customArtworkPath = visibleCustomIconArtworkPathByAppId[app.id] ?: visibleCustomArtworkPathByAppId[app.id],
+                        customIconPath = visibleCustomIconPathByAppId[app.id],
+                        customListPath = visibleCustomListPathByAppId[app.id],
+                        customHeroPath = visibleCustomHeroPathByAppId[app.id],
+                        onClick = {
+                            // Keeps the immersive background on the opened game after backing out.
+                            activity?.libraryFocusIndex?.value = index
+                            detailGogGame = visibleGogByPseudoId[app.id]
+                            detailApp = app
+                        },
+                        onLongClick = { openSettingsForApp(index, app) },
+                        listMode = true,
+                        modifier =
+                            Modifier
+                                .then(
+                                    if (index in focusRequesters.indices) {
+                                        Modifier.focusRequester(focusRequesters[index])
+                                    } else {
+                                        Modifier
+                                    },
+                                ),
+                    )
+                }
+                JoystickListScroll(
+                    listState = listViewState,
+                    stickFlow = activity?.rightStickScrollState,
+                    minSpeed = 2.5f,
+                    maxSpeed = 16f,
+                    quadratic = true,
+                )
+            }
+        }
+    }
+
+    if (selectedAppForSettings != null) {
+        GameSettingsDialog(
+            app = selectedAppForSettings!!,
+            onDismissRequest = { selectedAppForSettings = null },
+        )
+    }
+    if (selectedGogGameForSettings != null) {
+        GOGGameSettingsDialog(
+            app = selectedGogGameForSettings!!,
+            onDismissRequest = { selectedGogGameForSettings = null },
+        )
+    }
+    if (detailApp != null) {
+        LibraryGameDetailDialog(
+            app = detailApp!!,
+            gogGame = detailGogGame,
+            onDismissRequest = {
+                detailApp = null
+                detailGogGame = null
+            },
+        )
+    }
+}
diff --git a/app/src/main/app/shell/UnifiedActivityInput.kt b/app/src/main/app/shell/UnifiedActivityInput.kt
new file mode 100644
index 000000000..9b08d45ab
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityInput.kt
@@ -0,0 +1,449 @@
+package com.winlator.cmod.app.shell
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Gamepad/key nav dispatch + glasses combo + immersive bars, split out of UnifiedActivity.kt (behavior-identical).
+
+internal fun UnifiedActivity.updateGlassesCombo() {
+    val l2 = l2KeyDown || l2AxisDown
+    val r2 = r2KeyDown || r2AxisDown
+    if (l2 && r2) {
+        if (glassesComboArmed) {
+            glassesComboArmed = false
+            if (com.winlator.cmod.runtime.display.GlassesManager.isConnected()) {
+                openGlassesSignal.tryEmit(Unit)
+            }
+        }
+    } else {
+        glassesComboArmed = true
+    }
+}
+
+internal fun UnifiedActivity.applyImmersiveSystemBars(enabled: Boolean) {
+    window.navigationBarColor = android.graphics.Color.TRANSPARENT
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+        window.isNavigationBarContrastEnforced = false
+    }
+}
+
+internal fun UnifiedActivity.moveLibraryFocus(
+    left: Boolean,
+    right: Boolean,
+    up: Boolean,
+    down: Boolean,
+) {
+    val idx = libraryFocusIndex.value
+    val count = libraryItemCount
+    if (count <= 0) return
+    var newIdx = idx
+    when (currentLibraryLayoutMode) {
+        LibraryLayoutMode.GRID_4 -> {
+            if (left) newIdx = (idx - 1).coerceAtLeast(0)
+            if (right) newIdx = (idx + 1).coerceAtMost(count - 1)
+            if (up) newIdx = (idx - 4).coerceAtLeast(0)
+            if (down) newIdx = (idx + 4).coerceAtMost(count - 1)
+        }
+
+        LibraryLayoutMode.CAROUSEL -> {
+            if (left) newIdx = (idx - 1).coerceAtLeast(0)
+            if (right) newIdx = (idx + 1).coerceAtMost(count - 1)
+        }
+
+        LibraryLayoutMode.LIST -> {
+            if (up) newIdx = (idx - 1).coerceAtLeast(0)
+            if (down) newIdx = (idx + 1).coerceAtMost(count - 1)
+        }
+    }
+    libraryFocusIndex.value = newIdx
+}
+
+internal fun UnifiedActivity.moveStoreFocus(
+    left: Boolean,
+    right: Boolean,
+    up: Boolean,
+    down: Boolean,
+) {
+    val count = storeItemCount
+    if (count <= 0) return
+    val cols = storeColumns
+
+    // Snap to visible content before applying another store-grid move.
+    var idx = storeFocusIndex.value
+    val grid = storeGridState
+    if (grid != null) {
+        val visibleItems = grid.layoutInfo.visibleItemsInfo
+        if (visibleItems.isNotEmpty()) {
+            val firstVisible = visibleItems.first().index
+            val lastVisible = visibleItems.last().index
+            if (idx < firstVisible || idx > lastVisible) {
+                idx = firstVisible
+                storeFocusIndex.value = idx
+                return
+            }
+        }
+    }
+
+    var newIdx = idx
+    if (left) newIdx = (idx - 1).coerceAtLeast(0)
+    if (right) newIdx = (idx + 1).coerceAtMost(count - 1)
+    if (up) newIdx = (idx - cols).coerceAtLeast(0)
+    if (down) newIdx = (idx + cols).coerceAtMost(count - 1)
+    storeFocusIndex.value = newIdx
+}
+
+internal fun UnifiedActivity.routeDownloadsNav(
+    left: Boolean,
+    right: Boolean,
+    up: Boolean,
+    down: Boolean,
+) {
+    downloadsNavBridge.controllerActive = true
+    when {
+        left -> downloadsNavBridge.left()
+        right -> downloadsNavBridge.right()
+        up -> downloadsNavBridge.up()
+        down -> downloadsNavBridge.down()
+    }
+}
+
+internal fun UnifiedActivity.gogPseudoId(gameId: String): Int {
+    val normalized = gameId.hashCode() and 0x1FFFFFFF
+    return 1_500_000_000 + normalized
+}
+
+internal fun UnifiedActivity.injectKeyEvent(keyCode: Int) {
+    window.decorView.rootView.dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, keyCode))
+    window.decorView.rootView.dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, keyCode))
+}
+
+internal fun UnifiedActivity.hideImeIfVisible(): Boolean {
+    val decor = window.decorView
+    val insets = androidx.core.view.ViewCompat.getRootWindowInsets(decor) ?: return false
+    if (!insets.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime())) return false
+    val target = currentFocus ?: decor
+    androidx.core.view.WindowInsetsControllerCompat(window, target)
+        .hide(androidx.core.view.WindowInsetsCompat.Type.ime())
+    return true
+}
+
+internal fun UnifiedActivity.applySettingsSidebarNav(keyCode: Int) {
+    when (keyCode) {
+        android.view.KeyEvent.KEYCODE_DPAD_UP -> moveSettingsItem(-1)
+        android.view.KeyEvent.KEYCODE_DPAD_DOWN -> moveSettingsItem(1)
+        android.view.KeyEvent.KEYCODE_DPAD_RIGHT -> enterSettingsContent()
+    }
+}
+
+internal fun UnifiedActivity.moveSettingsItem(delta: Int) {
+    val items = SettingsNavItem.entries
+    val index = items.indexOf(settingsNavBridge.selectedItem)
+    val next = index + delta
+    if (next in items.indices) settingsNavBridge.onSelectItem?.invoke(items[next])
+}
+
+internal fun UnifiedActivity.enterSettingsContent() {
+    settingsNavBridge.zone = SettingsFocusZone.CONTENT
+    settingsNavBridge.contentControllerActive = true
+}
+
+internal fun UnifiedActivity.navigateSettingsContent(code: Int) {
+    settingsNavBridge.contentControllerActive = true
+    when (code) {
+        android.view.KeyEvent.KEYCODE_DPAD_LEFT -> settingsNavBridge.contentNavLeft()
+        android.view.KeyEvent.KEYCODE_DPAD_RIGHT -> settingsNavBridge.contentNavRight()
+        android.view.KeyEvent.KEYCODE_DPAD_UP -> settingsNavBridge.contentNavUp()
+        android.view.KeyEvent.KEYCODE_DPAD_DOWN -> settingsNavBridge.contentNavDown()
+    }
+}
+
+internal fun UnifiedActivity.findVisibleFragmentContainer(view: android.view.View): android.view.View? {
+    if (view is androidx.fragment.app.FragmentContainerView && view.isShown && view.childCount > 0) {
+        return view
+    }
+    if (view is android.view.ViewGroup) {
+        for (i in 0 until view.childCount) {
+            findVisibleFragmentContainer(view.getChildAt(i))?.let { return it }
+        }
+    }
+    return null
+}
+
+internal fun UnifiedActivity.handleSettingsStick(code: Int) {
+    if (settingsNavBridge.zone == SettingsFocusZone.SIDEBAR) {
+        applySettingsSidebarNav(code)
+        return
+    }
+    navigateSettingsContent(code)
+}
+
+internal fun UnifiedActivity.handleGuideButton(action: Int, repeatCount: Int) {
+    when (action) {
+        android.view.KeyEvent.ACTION_DOWN -> {
+            if (repeatCount != 0) return
+            guideHoldRunnable?.let { guideHandler.removeCallbacks(it) }
+            guideHoldRunnable = null
+            if (rightDrawerOpen) {
+                val r = Runnable { openFriendsSignal.tryEmit(Unit) }
+                guideHoldRunnable = r
+                guideHandler.postDelayed(r, 400L)
+            } else if (!menuNavActive && !drawerOpen) {
+                openFriendsSignal.tryEmit(Unit)
+            }
+        }
+
+        android.view.KeyEvent.ACTION_UP -> {
+            guideHoldRunnable?.let { guideHandler.removeCallbacks(it) }
+            guideHoldRunnable = null
+        }
+    }
+}
+
+internal fun UnifiedActivity.reapplyPreferredRefreshRate() {
+    if (isFinishing || isDestroyed) return
+    RefreshRateUtils.applyPreferredRefreshRate(this)
+}
diff --git a/app/src/main/app/shell/UnifiedActivityLaunch.kt b/app/src/main/app/shell/UnifiedActivityLaunch.kt
new file mode 100644
index 000000000..eb211455f
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityLaunch.kt
@@ -0,0 +1,1036 @@
+package com.winlator.cmod.app.shell
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Game launching (Steam/Epic/GOG/custom) + wine command builders, split out of UnifiedActivity.kt (behavior-identical).
+
+// Game launch with drive-aware mapping
+internal fun UnifiedActivity.launchSteamGame(
+    context: android.content.Context,
+    containerManager: ContainerManager,
+    app: SteamApp,
+    joinConnect: String? = null,
+) {
+    lifecycleScope.launch(Dispatchers.IO) {
+        val gameInstallPath = SteamService.getAppDirPath(app.id)
+        val gameDir = java.io.File(gameInstallPath)
+        if (!gameDir.exists()) {
+            withContext(Dispatchers.Main) {
+                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                    context,
+                    "Game not installed: ${app.name}",
+                    android.widget.Toast.LENGTH_SHORT,
+                )
+            }
+            return@launch
+        }
+
+        val shortcut =
+            containerManager.loadShortcuts().find {
+                it.getExtra("game_source") == "STEAM" && it.getExtra("app_id") == app.id.toString()
+            }
+        val detectedLaunchExecutable = SteamService.getInstalledExe(app.id)
+
+        if (shortcut != null) {
+            if (!SetupWizardActivity.isContainerUsable(context, shortcut.container)) {
+                withContext(Dispatchers.Main) {
+                    SetupWizardActivity.promptToInstallWineOrCreateContainer(
+                        context,
+                        shortcut.container.wineVersion,
+                    )
+                }
+                return@launch
+            }
+            normalizeContainerDrives(shortcut.container)
+            shortcut.putExtra("game_source", "STEAM")
+            shortcut.putExtra("game_install_path", gameInstallPath)
+            val existingLaunchExecutable = shortcut.getExtra("launch_exe_path")
+            if (existingLaunchExecutable.isNullOrBlank() && detectedLaunchExecutable.isNotBlank()) {
+                shortcut.putExtra("launch_exe_path", detectedLaunchExecutable)
+            }
+            val loaderExec = "wine \"C:\\\\Program Files (x86)\\\\Steam\\\\steamclient_loader_x64.exe\""
+            val lines =
+                com.winlator.cmod.shared.io.FileUtils
+                    .readLines(shortcut.file)
+            val rewritten = StringBuilder()
+            var execUpdated = false
+            for (line in lines) {
+                if (line.startsWith("Exec=")) {
+                    rewritten.append("Exec=").append(loaderExec).append("\n")
+                    execUpdated = true
+                } else {
+                    rewritten.append(line).append("\n")
+                }
+            }
+            if (!execUpdated) {
+                rewritten.append("Exec=").append(loaderExec).append("\n")
+            }
+            com.winlator.cmod.shared.io.FileUtils
+                .writeString(shortcut.file, rewritten.toString())
+            shortcut.saveData()
+            val intent = Intent(context, XServerDisplayActivity::class.java)
+            intent.putExtra("container_id", shortcut.container.id)
+            intent.putExtra("shortcut_path", shortcut.file.path)
+            intent.putExtra("shortcut_name", shortcut.name)
+            if (!joinConnect.isNullOrBlank()) intent.putExtra("steam_join_connect", joinConnect)
+            withContext(Dispatchers.Main) {
+                launchGame(context, intent)
+            }
+        } else {
+            val container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
+
+            if (container == null) {
+                withContext(Dispatchers.Main) {
+                    SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
+                }
+                return@launch
+            }
+
+            normalizeContainerDrives(container)
+
+            val execPath = "wine \"C:\\\\Program Files (x86)\\\\Steam\\\\steamclient_loader_x64.exe\""
+
+            // Generate a shortcut dynamically
+            val desktopDir = container.getDesktopDir()
+            if (!desktopDir.exists()) desktopDir.mkdirs()
+            val shortcutFile = java.io.File(desktopDir, "${app.name.replace("/", "_")}.desktop")
+            val content = java.lang.StringBuilder()
+            content.append("[Desktop Entry]\n")
+            content.append("Type=Application\n")
+            content.append("Name=${app.name}\n")
+            content.append("Exec=$execPath\n")
+            content.append("Icon=steam_icon_${app.id}\n")
+            content.append("\n[Extra Data]\n")
+            content.append("game_source=STEAM\n")
+            content.append("app_id=${app.id}\n")
+            content.append("container_id=${container.id}\n")
+            content.append("game_install_path=${gameInstallPath}\n")
+            content.append("launch_exe_path=${detectedLaunchExecutable}\n")
+            content.append("use_container_defaults=1\n")
+
+            com.winlator.cmod.shared.io.FileUtils
+                .writeString(shortcutFile, content.toString())
+
+            container.saveData()
+
+            val intent = Intent(context, XServerDisplayActivity::class.java)
+            intent.putExtra("container_id", container.id)
+            intent.putExtra("shortcut_path", shortcutFile.path)
+            intent.putExtra("shortcut_name", app.name)
+            if (!joinConnect.isNullOrBlank()) intent.putExtra("steam_join_connect", joinConnect)
+            withContext(Dispatchers.Main) {
+                launchGame(context, intent)
+            }
+        }
+    }
+}
+
+internal fun UnifiedActivity.launchEpicGame(
+    context: android.content.Context,
+    containerManager: ContainerManager,
+    app: EpicGame,
+) {
+    lifecycleScope.launch(Dispatchers.IO) {
+        val gameInstallPath = app.installPath.takeIf { it.isNotEmpty() } ?: EpicConstants.getGameInstallPath(context, app.appName)
+        val gameDir = java.io.File(gameInstallPath)
+        if (!gameDir.exists()) {
+            withContext(Dispatchers.Main) {
+                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                    context,
+                    "Game not installed: ${app.title}",
+                    android.widget.Toast.LENGTH_SHORT,
+                )
+            }
+            return@launch
+        }
+
+        // Try to find an existing shortcut first (preserves per-game settings)
+        val existingShortcut =
+            containerManager.loadShortcuts().find {
+                it.getExtra("game_source") == "EPIC" && it.getExtra("app_id") == app.id.toString()
+            }
+
+        if (existingShortcut != null) {
+            val launchContainer =
+                resolveShortcutLaunchContainer(containerManager, existingShortcut)
+                    ?: existingShortcut.container
+            if (!SetupWizardActivity.isContainerUsable(context, launchContainer)) {
+                withContext(Dispatchers.Main) {
+                    SetupWizardActivity.promptToInstallWineOrCreateContainer(
+                        context,
+                        launchContainer.wineVersion,
+                    )
+                }
+                return@launch
+            }
+            // Existing shortcut found: preserve per-game settings and update the mapped install path
+            val shortcut = existingShortcut
+            val epicDisplayName =
+                app.title.takeIf { it.isNotBlank() }
+                    ?: shortcut.name.takeIf { it.isNotBlank() }
+                    ?: app.appName
+            // Ensure game_install_path is always up-to-date
+            shortcut.putExtra("game_install_path", gameInstallPath)
+            shortcut.putExtra("container_id", launchContainer.id.toString())
+            repairShortcutDisplayNameIfNeeded(shortcut, epicDisplayName, app.appName, app.id.toString())
+            normalizeContainerDrives(launchContainer)
+
+            // Repair broken Exec line if the executable is missing or still points at a legacy placeholder mapping.
+            val currentPath = shortcut.path
+            if (currentPath == null || currentPath == "D:\\" || currentPath == "D:\\\\" ||
+                currentPath == "A:\\" || currentPath == "A:\\\\" ||
+                currentPath.startsWith("A:\\")
+            ) {
+                val newExecCmd =
+                    buildStoreWineExecCommandForSelectedExe(
+                        launchContainer,
+                        "EPIC",
+                        gameInstallPath,
+                        shortcut.getExtra("launch_exe_path"),
+                    ) ?: run {
+                        val exePath = EpicService.getInstalledExe(app.id)
+                        if (exePath.isNotEmpty()) {
+                            shortcut.putExtra("launch_exe_path", exePath)
+                            buildStoreWineExecCommand(
+                                launchContainer,
+                                "EPIC",
+                                gameInstallPath,
+                                java.io.File(gameInstallPath, exePath.replace("\\", "/")),
+                            )
+                        } else {
+                            val exeFile = findGameExe(gameDir)
+                            if (exeFile != null) {
+                                shortcut.putExtra("launch_exe_path", exeFile.absolutePath)
+                                buildStoreWineExecCommand(launchContainer, "EPIC", gameInstallPath, exeFile)
+                            } else {
+                                null
+                            }
+                        }
+                    }
+                if (newExecCmd != null) {
+                    // Rewrite the Exec line in the .desktop file while preserving all other content
+                    val lines =
+                        com.winlator.cmod.shared.io.FileUtils
+                            .readLines(shortcut.file)
+                    val sb = StringBuilder()
+                    for (line in lines) {
+                        if (line.startsWith("Exec=")) {
+                            sb.append("Exec=$newExecCmd\n")
+                        } else {
+                            sb.append(line).append("\n")
+                        }
+                    }
+                    com.winlator.cmod.shared.io.FileUtils
+                        .writeString(shortcut.file, sb.toString())
+                }
+            }
+
+            shortcut.saveData()
+            val launchShortcutFile = ensureShortcutFileInContainer(shortcut, launchContainer)
+
+            // Provision the EOS overlay into this container. Best-effort — failures are
+            // non-fatal (games without the EOS SDK ignore it; games with the SDK still run
+            // without the in-game HUD). Tokens must be staged inside the prefix because
+            // the dosdevices map doesn't expose the app cache dir on any drive letter.
+            runCatching {
+                EpicService.installOverlay(context, launchContainer)
+            }.onFailure {
+                Log.w("EPIC", "EOS overlay install failed for ${app.appName}; launching anyway", it)
+            }
+
+            val launchArgsResult =
+                EpicGameLauncher.buildLaunchParameters(
+                    context = context,
+                    game = app,
+                    container = launchContainer,
+                )
+            launchArgsResult.exceptionOrNull()?.let { err ->
+                // The launch can still proceed (offline-tolerant titles, single-player non-DRM
+                // games), so we don't abort — but surface the failure prominently so users
+                // know why a DRM/online title may bounce to its login screen.
+                Log.e("EPIC", "Failed to build Epic launch parameters for ${app.appName}: ${err.message}", err)
+                withContext(Dispatchers.Main) {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        "Could not refresh Epic launch token: ${err.message ?: "unknown error"}",
+                        android.widget.Toast.LENGTH_LONG,
+                    )
+                }
+            }
+            val args = launchArgsResult.getOrNull()?.joinToString(" ") ?: ""
+
+            val intent = Intent(context, XServerDisplayActivity::class.java)
+            intent.putExtra("container_id", launchContainer.id)
+            intent.putExtra("shortcut_path", launchShortcutFile.path)
+            intent.putExtra("shortcut_name", epicDisplayName)
+            intent.putExtra("extra_exec_args", args) // Pass fresh tokens
+            withContext(Dispatchers.Main) {
+                launchGame(context, intent)
+            }
+        } else {
+            // No existing shortcut — create a new one
+            val exePath = EpicService.getInstalledExe(app.id)
+            val container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
+
+            if (container == null) {
+                withContext(Dispatchers.Main) {
+                    SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
+                }
+                return@launch
+            }
+
+            normalizeContainerDrives(container)
+            val execCmd =
+                if (exePath.isNotEmpty()) {
+                    buildStoreWineExecCommand(
+                        container,
+                        "EPIC",
+                        gameInstallPath,
+                        java.io.File(gameInstallPath, exePath.replace("\\", "/")),
+                    )
+                } else {
+                    val exeFile = findGameExe(gameDir)
+                    if (exeFile != null) {
+                        buildStoreWineExecCommand(container, "EPIC", gameInstallPath, exeFile)
+                    } else {
+                        "wine \"explorer.exe\""
+                    }
+                }
+
+            val desktopDir = container.getDesktopDir()
+            if (!desktopDir.exists()) desktopDir.mkdirs()
+            val shortcutFile = java.io.File(desktopDir, "${app.appName}.desktop")
+            val content = java.lang.StringBuilder()
+            content.append("[Desktop Entry]\n")
+            content.append("Type=Application\n")
+            content.append("Name=${app.title}\n")
+            content.append("Exec=$execCmd\n")
+            content.append("Icon=epic_icon_${app.id}\n")
+            content.append("\n[Extra Data]\n")
+            content.append("game_source=EPIC\n")
+            content.append("app_id=${app.id}\n")
+            if (app.catalogId.isNotEmpty()) {
+                // Persist catalog_id so EpicGameFixHelper / GameFixes can dispatch the
+                // per-catalog registry/env/folder fixes without a DB round-trip on launch.
+                content.append("catalog_id=${app.catalogId}\n")
+            }
+            content.append("container_id=${container.id}\n")
+            content.append("game_install_path=${gameInstallPath}\n")
+            if (exePath.isNotEmpty()) {
+                content.append("launch_exe_path=${exePath}\n")
+            }
+            content.append("use_container_defaults=1\n")
+
+            com.winlator.cmod.shared.io.FileUtils
+                .writeString(shortcutFile, content.toString())
+
+            container.saveData()
+
+            // Best-effort EOS overlay provisioning — see existing-shortcut branch above.
+            runCatching {
+                EpicService.installOverlay(context, container)
+            }.onFailure {
+                Log.w("EPIC", "EOS overlay install failed for ${app.appName}; launching anyway", it)
+            }
+
+            val launchArgsResult =
+                EpicGameLauncher.buildLaunchParameters(
+                    context = context,
+                    game = app,
+                    container = container,
+                )
+            launchArgsResult.exceptionOrNull()?.let { err ->
+                Log.e("EPIC", "Failed to build Epic launch parameters for ${app.appName}: ${err.message}", err)
+                withContext(Dispatchers.Main) {
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        "Could not refresh Epic launch token: ${err.message ?: "unknown error"}",
+                        android.widget.Toast.LENGTH_LONG,
+                    )
+                }
+            }
+            val args = launchArgsResult.getOrNull()?.joinToString(" ") ?: ""
+
+            val intent = Intent(context, XServerDisplayActivity::class.java)
+            intent.putExtra("container_id", container.id)
+            intent.putExtra("shortcut_path", shortcutFile.path)
+            intent.putExtra("shortcut_name", app.title)
+            intent.putExtra("extra_exec_args", args) // Pass fresh tokens
+            withContext(Dispatchers.Main) {
+                launchGame(context, intent)
+            }
+        }
+    }
+}
+
+internal fun UnifiedActivity.launchGogGame(
+    context: android.content.Context,
+    containerManager: ContainerManager,
+    app: GOGGame,
+) {
+    lifecycleScope.launch(Dispatchers.IO) {
+        val gameInstallPath = app.installPath.takeIf { it.isNotEmpty() } ?: GOGConstants.getGameInstallPath(app.title)
+        val gameDir = java.io.File(gameInstallPath)
+        if (!gameDir.exists()) {
+            withContext(Dispatchers.Main) {
+                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                    context,
+                    "Game not installed: ${app.title}",
+                    android.widget.Toast.LENGTH_SHORT,
+                )
+            }
+            return@launch
+        }
+
+        val existingShortcut =
+            containerManager.loadShortcuts().find {
+                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
+            }
+
+        val gogAppId = "GOG_${app.id}"
+        GOGService.syncCloudSaves(context, gogAppId)
+
+        if (existingShortcut != null) {
+            val shortcut = existingShortcut
+            if (!SetupWizardActivity.isContainerUsable(context, shortcut.container)) {
+                withContext(Dispatchers.Main) {
+                    SetupWizardActivity.promptToInstallWineOrCreateContainer(
+                        context,
+                        shortcut.container.wineVersion,
+                    )
+                }
+                return@launch
+            }
+            shortcut.putExtra("game_install_path", gameInstallPath)
+            normalizeContainerDrives(shortcut.container)
+
+            // Repair broken Exec line if the executable is missing or still points at a legacy placeholder mapping.
+            val currentPath = shortcut.path
+            if (currentPath == null || currentPath == "D:\\" || currentPath == "D:\\\\" ||
+                currentPath == "A:\\" || currentPath == "A:\\\\" ||
+                currentPath.startsWith("A:\\")
+            ) {
+                val newExecCmd =
+                    buildStoreWineExecCommandForSelectedExe(
+                        shortcut.container,
+                        "GOG",
+                        gameInstallPath,
+                        shortcut.getExtra("launch_exe_path"),
+                    ) ?: run {
+                        val libraryItem =
+                            LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG)
+                        val exePath = GOGService.getInstalledExe(libraryItem)
+                        if (exePath.isNotEmpty()) {
+                            shortcut.putExtra("launch_exe_path", exePath)
+                            buildStoreWineExecCommand(
+                                shortcut.container,
+                                "GOG",
+                                gameInstallPath,
+                                java.io.File(gameInstallPath, exePath.replace("\\", "/")),
+                            )
+                        } else {
+                            val exeFile = findGameExe(gameDir)
+                            if (exeFile != null) {
+                                shortcut.putExtra("launch_exe_path", exeFile.absolutePath)
+                                buildStoreWineExecCommand(shortcut.container, "GOG", gameInstallPath, exeFile)
+                            } else {
+                                null
+                            }
+                        }
+                    }
+                if (newExecCmd != null) {
+                    val lines =
+                        com.winlator.cmod.shared.io.FileUtils
+                            .readLines(shortcut.file)
+                    val sb = StringBuilder()
+                    for (line in lines) {
+                        if (line.startsWith("Exec=")) {
+                            sb.append("Exec=$newExecCmd\n")
+                        } else {
+                            sb.append(line).append("\n")
+                        }
+                    }
+                    com.winlator.cmod.shared.io.FileUtils
+                        .writeString(shortcut.file, sb.toString())
+                }
+            }
+
+            shortcut.saveData()
+
+            val intent = Intent(context, XServerDisplayActivity::class.java)
+            intent.putExtra("container_id", shortcut.container.id)
+            intent.putExtra("shortcut_path", shortcut.file.path)
+            intent.putExtra("shortcut_name", shortcut.name)
+            withContext(Dispatchers.Main) {
+                launchGame(context, intent)
+            }
+            return@launch
+        }
+
+        val libraryItem = LibraryItem("GOG_${app.id}", app.title, com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG)
+        val exePath = GOGService.getInstalledExe(libraryItem)
+
+        val container = SetupWizardActivity.getPreferredGameContainer(context, containerManager)
+
+        if (container == null) {
+            withContext(Dispatchers.Main) {
+                SetupWizardActivity.promptToInstallWineOrCreateContainer(context)
+            }
+            return@launch
+        }
+
+        normalizeContainerDrives(container)
+        val execCmd =
+            if (exePath.isNotEmpty()) {
+                buildStoreWineExecCommand(
+                    container,
+                    "GOG",
+                    gameInstallPath,
+                    java.io.File(gameInstallPath, exePath.replace("\\", "/")),
+                )
+            } else {
+                val exeFile = findGameExe(gameDir)
+                if (exeFile != null) {
+                    buildStoreWineExecCommand(container, "GOG", gameInstallPath, exeFile)
+                } else {
+                    "wine \"explorer.exe\""
+                }
+            }
+
+        val desktopDir = container.getDesktopDir()
+        if (!desktopDir.exists()) desktopDir.mkdirs()
+        val shortcutFile = java.io.File(desktopDir, "${app.title.replace("/", "_")}.desktop")
+        val content = java.lang.StringBuilder()
+        content.append("[Desktop Entry]\n")
+        content.append("Type=Application\n")
+        content.append("Name=${app.title}\n")
+        content.append("Exec=$execCmd\n")
+        content.append("Icon=gog_icon_${app.id}\n")
+        content.append("\n[Extra Data]\n")
+        content.append("game_source=GOG\n")
+        content.append("gog_id=${app.id}\n")
+            content.append("app_id=${gogPseudoId(app.id)}\n")
+            content.append("container_id=${container.id}\n")
+            content.append("game_install_path=${gameInstallPath}\n")
+            if (exePath.isNotEmpty()) {
+                content.append("launch_exe_path=${exePath}\n")
+            }
+            content.append("use_container_defaults=1\n")
+
+        com.winlator.cmod.shared.io.FileUtils
+            .writeString(shortcutFile, content.toString())
+        container.saveData()
+
+        val intent = Intent(context, XServerDisplayActivity::class.java)
+        intent.putExtra("container_id", container.id)
+        intent.putExtra("shortcut_path", shortcutFile.path)
+        intent.putExtra("shortcut_name", app.title)
+        withContext(Dispatchers.Main) {
+            launchGame(context, intent)
+        }
+    }
+}
+
+internal fun UnifiedActivity.normalizeContainerDrives(container: com.winlator.cmod.runtime.container.Container) {
+    container.drives =
+        com.winlator.cmod.runtime.wine.WineUtils.normalizePersistentDrives(
+            this,
+            container.drives ?: com.winlator.cmod.runtime.container.Container.DEFAULT_DRIVES,
+            false,
+        )
+}
+
+internal fun UnifiedActivity.resolveShortcutLaunchContainer(
+    containerManager: ContainerManager,
+    shortcut: Shortcut,
+): com.winlator.cmod.runtime.container.Container? {
+    val overrideContainerId = shortcut.getExtra("container_id").toIntOrNull()?.takeIf { it > 0 }
+    return overrideContainerId
+        ?.let { containerManager.getContainerById(it) }
+        ?: shortcut.container
+}
+
+internal fun UnifiedActivity.ensureShortcutFileInContainer(
+    shortcut: Shortcut,
+    targetContainer: com.winlator.cmod.runtime.container.Container,
+): java.io.File {
+    val targetDesktopDir = targetContainer.getDesktopDir()
+    val alreadyInTarget =
+        runCatching {
+            shortcut.file.parentFile?.canonicalFile == targetDesktopDir.canonicalFile
+        }.getOrDefault(false)
+
+    if (alreadyInTarget) return shortcut.file
+
+    if (!targetDesktopDir.exists()) targetDesktopDir.mkdirs()
+    shortcut.putExtra("container_id", targetContainer.id.toString())
+    shortcut.saveData()
+
+    val targetFile = java.io.File(targetDesktopDir, shortcut.file.name)
+    runCatching {
+        com.winlator.cmod.shared.io.FileUtils.copy(shortcut.file, targetFile)
+        val lnkFileName = shortcut.file.name.substringBeforeLast(".desktop") + ".lnk"
+        val oldLnkFile = java.io.File(shortcut.file.parentFile, lnkFileName)
+        if (oldLnkFile.exists()) {
+            com.winlator.cmod.shared.io.FileUtils.copy(oldLnkFile, java.io.File(targetDesktopDir, lnkFileName))
+            oldLnkFile.delete()
+        }
+        shortcut.file.delete()
+    }.onFailure {
+        Log.w("EPIC", "Failed to move Epic shortcut ${shortcut.file.name} to container ${targetContainer.id}; launching original file", it)
+        return shortcut.file
+    }
+
+    return targetFile
+}
+
+internal fun UnifiedActivity.buildStoreWineExecCommand(
+    container: com.winlator.cmod.runtime.container.Container?,
+    source: String,
+    gameInstallPath: String,
+    exeFile: java.io.File,
+): String {
+    val windowsPath =
+        container?.let {
+            com.winlator.cmod.runtime.wine.WineUtils.getDriveCGameWindowsPath(
+                it,
+                source,
+                gameInstallPath,
+                exeFile.absolutePath,
+            )
+        } ?: run {
+            val relativePath =
+                try {
+                    exeFile.relativeTo(java.io.File(gameInstallPath)).path.replace("/", "\\")
+                } catch (_: Exception) {
+                    exeFile.name
+                }
+            val linkName =
+                com.winlator.cmod.runtime.wine.WineUtils.getDriveCGameLinkName(gameInstallPath)
+            "C:\\WinNative\\Games\\$source\\$linkName\\$relativePath"
+    }
+    return "wine \"$windowsPath\""
+}
+
+internal fun UnifiedActivity.buildStoreWineExecCommandForSelectedExe(
+    container: com.winlator.cmod.runtime.container.Container?,
+    source: String,
+    gameInstallPath: String,
+    selectedExePath: String?,
+): String? {
+    if (selectedExePath.isNullOrBlank()) return null
+
+    val selectedExe = java.io.File(selectedExePath)
+    if (!selectedExe.isFile) return null
+
+    val normalizedBaseDir =
+        java.io
+            .File(gameInstallPath)
+            .absolutePath
+            .removeSuffix("/")
+    val normalizedExePath = selectedExe.absolutePath
+    return if (normalizedExePath == normalizedBaseDir || normalizedExePath.startsWith("$normalizedBaseDir/")) {
+        buildStoreWineExecCommand(container, source, gameInstallPath, selectedExe)
+    } else {
+        val hostPath = normalizedExePath.replace("/", "\\\\").let { if (it.startsWith("\\")) it else "\\$it" }
+        "wine \"Z:${hostPath}\""
+    }
+}
+
+// Launch custom game by shortcut name
+internal fun UnifiedActivity.launchCustomGame(
+    context: android.content.Context,
+    containerManager: ContainerManager,
+    gameName: String,
+) {
+    lifecycleScope.launch(Dispatchers.IO) {
+        val allShortcuts = containerManager.loadShortcuts()
+
+        // Try matching by app_id (for non-official Steam/Epic), custom_name, or filename
+        var shortcut =
+            allShortcuts.find { it.getExtra("app_id") == gameName }
+                ?: allShortcuts.find { it.getExtra("custom_name") == gameName }
+                ?: allShortcuts.find { it.name == gameName }
+                ?: allShortcuts.find { it.name == gameName.replace("/", "_").replace("\\", "_") }
+
+        // If still not found, try matching by looking at the safe filename directly
+        if (shortcut == null) {
+            val safeName = gameName.replace("/", "_").replace("\\", "_")
+            for (container in containerManager.containers) {
+                val desktopFile = java.io.File(container.getDesktopDir(), "$safeName.desktop")
+                if (desktopFile.exists()) {
+                    shortcut =
+                        com.winlator.cmod.runtime.container
+                            .Shortcut(container, desktopFile)
+                    break
+                }
+            }
+        }
+
+        if (shortcut == null) {
+            withContext(Dispatchers.Main) {
+                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                    context,
+                    "Custom game shortcut not found: $gameName",
+                    android.widget.Toast.LENGTH_SHORT,
+                )
+            }
+            return@launch
+        }
+
+        if (com.winlator.cmod.feature.retro.RetroShortcuts.isRetroShortcut(shortcut)) {
+            // Asks RetroShortcuts which launcher this shortcut needs rather
+            // than reasoning about it here. Listing the embedded paths in two
+            // places is what sent 3D-enabled games to the libretro core: this
+            // caller knew about PS2 and Dolphin but not about the 3D engine.
+            if (com.winlator.cmod.feature.retro.RetroShortcuts.usesEmbeddedLauncher(context, shortcut)) {
+                withContext(Dispatchers.Main) {
+                    com.winlator.cmod.feature.retro.RetroShortcuts.launch(context, shortcut)
+                }
+                return@launch
+            }
+            val retroIntent = com.winlator.cmod.feature.retro.RetroShortcuts.launchIntent(context, shortcut)
+            withContext(Dispatchers.Main) { launchGame(context, retroIntent) }
+            return@launch
+        }
+
+        // Backfill custom_name if missing (legacy shortcuts)
+        if (shortcut.getExtra("custom_name").isEmpty()) {
+            shortcut.putExtra("custom_name", gameName)
+            shortcut.saveData()
+        }
+
+        // Refresh storage-root mappings; custom game paths launch through the drive_c game symlink.
+        val gameFolder = shortcut.getExtra("custom_game_folder", "")
+        if (gameFolder.isNotEmpty()) {
+            normalizeContainerDrives(shortcut.container)
+            shortcut.container.saveData()
+        }
+        val intent = Intent(context, XServerDisplayActivity::class.java)
+        intent.putExtra("container_id", shortcut.container.id)
+        intent.putExtra("shortcut_path", shortcut.file.path)
+        intent.putExtra("shortcut_name", gameName)
+        withContext(Dispatchers.Main) {
+            launchGame(context, intent)
+        }
+    }
+}
+
+internal fun UnifiedActivity.launchGame(
+    context: android.content.Context,
+    intent: Intent,
+) {
+    DownloadService.clearCompletedDownloads()
+    context.startActivity(intent)
+    // Suppress the default activity transition so the preloader stays seamless
+    if (context is android.app.Activity) {
+        com.winlator.cmod.shared.android.AppUtils
+            .applyOpenActivityTransition(context, 0, 0)
+    }
+}
+
+internal fun UnifiedActivity.findGameExe(dir: java.io.File): java.io.File? {
+    // BFS: check each directory level fully before going deeper
+    val exclusions =
+        listOf(
+            "unins",
+            "redist",
+            "setup",
+            "dotnet",
+            "vcredist",
+            "dxsetup",
+            "helper",
+            "crash",
+            "ue4prereq",
+            "dxwebsetup",
+            "launcher",
+        )
+
+    var currentDirs = listOf(dir)
+    var depth = 0
+    var fallbackExe: java.io.File? = null
+
+    while (currentDirs.isNotEmpty() && depth <= 4) {
+        val nextDirs = mutableListOf<java.io.File>()
+        val candidates = mutableListOf<java.io.File>()
+
+        for (d in currentDirs) {
+            val children = d.listFiles() ?: continue
+            for (f in children) {
+                if (f.isDirectory) {
+                    nextDirs.add(f)
+                } else if (f.extension.equals("exe", ignoreCase = true)) {
+                    val name = f.name.lowercase()
+                    if (exclusions.none { name.contains(it) }) {
+                        candidates.add(f)
+                    }
+                }
+            }
+        }
+
+        // Prefer 64-bit executable candidates at the current depth
+        val exe64 =
+            candidates.find {
+                it.name.lowercase().contains("64") ||
+                    it.parentFile
+                        ?.name
+                        ?.lowercase()
+                        ?.contains("64") == true
+            }
+        if (exe64 != null) return exe64
+
+        // Collect the first valid candidate as a fallback
+        if (fallbackExe == null && candidates.isNotEmpty()) {
+            fallbackExe = candidates.first()
+        }
+
+        currentDirs = nextDirs
+        depth++
+    }
+    return fallbackExe
+}
diff --git a/app/src/main/app/shell/UnifiedActivityShortcuts.kt b/app/src/main/app/shell/UnifiedActivityShortcuts.kt
new file mode 100644
index 000000000..26efbd45e
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityShortcuts.kt
@@ -0,0 +1,642 @@
+package com.winlator.cmod.app.shell
+import com.winlator.cmod.app.shell.UnifiedActivity.ArtworkCacheId
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Shortcut lookup + artwork resolution + home-screen pinning, split out of UnifiedActivity.kt (behavior-identical).
+
+internal fun UnifiedActivity.findLibraryShortcutForGame(
+    containerManager: ContainerManager,
+    app: SteamApp,
+    isCustom: Boolean,
+    isEpic: Boolean,
+    epicId: Int,
+): Shortcut? = findShortcutForGame(containerManager.loadShortcuts(), app, isCustom, isEpic, epicId)
+
+
+internal fun UnifiedActivity.findShortcutForGame(
+    shortcuts: List<Shortcut>,
+    app: SteamApp,
+    isCustom: Boolean,
+    isEpic: Boolean,
+    epicId: Int,
+): Shortcut? =
+    when {
+        isEpic -> {
+            shortcuts.find {
+                it.getExtra("game_source") == "EPIC" && it.getExtra("app_id") == epicId.toString()
+            }
+        }
+
+        else -> {
+            shortcuts.find {
+                it.getExtra("app_id") == app.id.toString() || it.getExtra("custom_name") == app.name || it.name == app.name
+            }
+        }
+    }
+
+
+internal fun UnifiedActivity.findLibraryArtworkShortcut(
+    shortcuts: List<Shortcut>,
+    app: SteamApp,
+    gogGame: GOGGame?,
+    epicGame: EpicGame?,
+): Shortcut? =
+    when {
+        gogGame != null -> {
+            shortcuts.find {
+                it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == gogGame.id
+            }
+        }
+
+        epicGame != null -> {
+            shortcuts.find {
+                it.getExtra("game_source") == "EPIC" && it.getExtra("app_id") == epicGame.id.toString()
+            }
+        }
+
+        else -> {
+            findShortcutForGame(
+                shortcuts = shortcuts,
+                app = app,
+                isCustom = app.id < 0,
+                isEpic = app.id >= 2000000000,
+                epicId = if (app.id >= 2000000000) app.id - 2000000000 else 0,
+            )
+        }
+    }
+
+
+internal fun UnifiedActivity.artworkCacheId(
+    app: SteamApp,
+    gogGame: GOGGame?,
+    epicGame: EpicGame?,
+): ArtworkCacheId? =
+    when {
+        gogGame != null -> ArtworkCacheId("gog", gogGame.id)
+        epicGame != null -> ArtworkCacheId("epic", epicGame.id.toString())
+        app.id >= 0 -> ArtworkCacheId("steam", app.id.toString())
+        else -> null
+    }
+
+
+internal fun UnifiedActivity.customArtworkOverrideSlots(
+    app: SteamApp,
+    gogGame: GOGGame?,
+    epicGame: EpicGame?,
+    hasDefaultCustomArt: Boolean,
+    hasIconCustomArt: Boolean,
+    hasHeroCustomArt: Boolean,
+): Set<String> {
+    val overridesPrimary = hasDefaultCustomArt || hasIconCustomArt
+    if (!overridesPrimary && !hasHeroCustomArt) return emptySet()
+
+    return when {
+        gogGame != null -> {
+            buildSet {
+                if (overridesPrimary) {
+                    add("cover")
+                    add("icon")
+                }
+                if (hasHeroCustomArt) add("hero")
+            }
+        }
+
+        epicGame != null -> {
+            buildSet {
+                if (overridesPrimary) {
+                    add("cover")
+                    add("square")
+                    add("logo")
+                }
+                if (hasHeroCustomArt) add("hero")
+            }
+        }
+
+        app.id >= 0 -> {
+            buildSet {
+                if (overridesPrimary) {
+                    add("capsule")
+                    add("library_capsule")
+                    add("small_capsule")
+                }
+                if (hasHeroCustomArt) add("hero")
+            }
+        }
+
+        else -> emptySet()
+    }
+}
+
+internal fun UnifiedActivity.isShortcutCloudSyncEnabled(shortcut: Shortcut?): Boolean =
+    shortcut == null || shortcut.getExtra("cloud_sync_disabled", "0") != "1"
+
+
+internal fun UnifiedActivity.setShortcutCloudSyncEnabled(
+    shortcut: Shortcut?,
+    enabled: Boolean,
+) {
+    if (shortcut == null) return
+    shortcut.putExtra("cloud_sync_disabled", if (enabled) null else "1")
+    if (enabled) {
+        shortcut.putExtra("cloud_force_download", null)
+    }
+    shortcut.saveData()
+}
+
+internal fun UnifiedActivity.isShortcutOfflineMode(shortcut: Shortcut?): Boolean =
+    shortcut != null && shortcut.getExtra("offline_mode", "0") == "1"
+
+
+internal fun UnifiedActivity.setShortcutOfflineMode(
+    shortcut: Shortcut?,
+    enabled: Boolean,
+) {
+    if (shortcut == null) return
+    shortcut.putExtra("offline_mode", if (enabled) "1" else null)
+    shortcut.saveData()
+}
+
+internal fun UnifiedActivity.repairShortcutDisplayNameIfNeeded(
+    shortcut: Shortcut,
+    displayName: String,
+    vararg technicalNames: String,
+) {
+    if (displayName.isBlank() || !shortcut.file.isFile) return
+
+    runCatching {
+        val technicalNameSet = (technicalNames.toList() + shortcut.file.nameWithoutExtension)
+            .filter { it.isNotBlank() }
+            .toSet()
+        val lines = com.winlator.cmod.shared.io.FileUtils.readLines(shortcut.file)
+        val sb = StringBuilder()
+        var changed = false
+        var sawName = false
+
+        for (line in lines) {
+            if (line.startsWith("Name=")) {
+                sawName = true
+                val currentName = line.removePrefix("Name=").trim()
+                if (currentName.isBlank() || currentName in technicalNameSet) {
+                    sb.append("Name=").append(displayName).append('\n')
+                    changed = true
+                } else {
+                    sb.append(line).append('\n')
+                }
+            } else {
+                sb.append(line).append('\n')
+            }
+        }
+
+        if (!sawName) {
+            val desktopHeader = "[Desktop Entry]\n"
+            val insertIndex =
+                if (sb.startsWith(desktopHeader)) {
+                    desktopHeader.length
+                } else {
+                    0
+                }
+            sb.insert(insertIndex, "Name=$displayName\n")
+            changed = true
+        }
+
+        if (changed) {
+            com.winlator.cmod.shared.io.FileUtils.writeString(shortcut.file, sb.toString())
+        }
+    }.onFailure {
+        Log.w("SHORTCUTS", "Failed to repair shortcut display name for ${shortcut.file.name}", it)
+    }
+}
+
+internal fun UnifiedActivity.resolveLibraryShortcutArtworkModel(
+    context: android.content.Context,
+    app: SteamApp,
+    isCustom: Boolean,
+    isEpic: Boolean,
+    epicArtworkUrl: String?,
+): Any? =
+    when {
+        isCustom -> {
+            val safeName = app.name.replace("/", "_").replace("\\", "_")
+            val iconFile = java.io.File(context.filesDir, "custom_icons/$safeName.png")
+            if (iconFile.exists()) iconFile else null
+        }
+
+        isEpic -> {
+            epicArtworkUrl?.takeIf { it.isNotBlank() }
+        }
+
+        else -> {
+            app.getCapsuleUrl()
+        }
+    }
+
+
+internal suspend fun UnifiedActivity.loadArtworkBitmap(
+    context: android.content.Context,
+    artworkModel: Any?,
+): Bitmap? {
+    if (artworkModel == null) return null
+    return try {
+        val request =
+            ImageRequest
+                .Builder(context)
+                .data(artworkModel)
+                .allowHardware(false)
+                .size(192, 192)
+                .build()
+        val result = context.imageLoader.execute(request)
+        val drawable = result.drawable ?: return null
+        if (drawable is BitmapDrawable) {
+            drawable.bitmap
+        } else {
+            val width = if (drawable.intrinsicWidth > 0) drawable.intrinsicWidth else 192
+            val height = if (drawable.intrinsicHeight > 0) drawable.intrinsicHeight else 192
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, width, height)
+            drawable.draw(canvas)
+            bitmap
+        }
+    } catch (_: Exception) {
+        null
+    }
+}
+
+internal suspend fun UnifiedActivity.requestPinnedHomeShortcut(
+    context: android.content.Context,
+    shortcut: Shortcut,
+    artworkModel: Any? = null,
+): Boolean {
+    if (shortcut.getExtra("uuid").isEmpty()) {
+        shortcut.genUUID()
+    }
+    val shortcutId = shortcut.getExtra("uuid")
+    if (shortcutId.isEmpty()) return false
+    val canonicalShortcutPath = shortcut.file.absolutePath
+    val shortcutPathHash = canonicalShortcutPath.hashCode()
+    val containerIdForLaunch = shortcut.getExtra("container_id").toIntOrNull() ?: shortcut.container.id
+    val pinShortcutId = "shortcut_${shortcut.container.id}_${shortcutId}_${shortcutPathHash.toUInt().toString(16)}"
+
+    val shortcutManager = context.getSystemService(android.content.pm.ShortcutManager::class.java) ?: return false
+    if (!shortcutManager.isRequestPinShortcutSupported) return false
+
+    val launchIntent =
+        Intent(context, XServerDisplayActivity::class.java).apply {
+            val launchData =
+                Uri
+                    .Builder()
+                    .scheme("winnative")
+                    .authority(BuildConfig.APPLICATION_ID)
+                    .appendPath("shortcut")
+                    .appendQueryParameter("uuid", shortcutId)
+                    .appendQueryParameter("container", containerIdForLaunch.toString())
+                    .appendQueryParameter("hash", shortcutPathHash.toString())
+                    .build()
+            action = Intent.ACTION_VIEW
+            data = launchData
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            putExtra("container_id", containerIdForLaunch)
+            putExtra("shortcut_path", canonicalShortcutPath)
+            putExtra("shortcut_name", shortcut.name)
+            putExtra("shortcut_uuid", shortcutId)
+            putExtra("shortcut_path_hash", shortcutPathHash)
+            putExtra(XServerDisplayActivity.EXTRA_LAUNCHED_FROM_PINNED_SHORTCUT, true)
+        }
+
+    val customIconPath =
+        shortcut
+            .getExtra("customLibraryIconPath")
+            .ifBlank { shortcut.getExtra("customCoverArtPath") }
+    val customArtworkModel =
+        customIconPath
+            .takeIf { it.isNotBlank() }
+            ?.let { java.io.File(it) }
+            ?.takeIf { it.exists() }
+
+    val artworkBitmap = loadArtworkBitmap(context, customArtworkModel) ?: loadArtworkBitmap(context, artworkModel)
+    val shortcutIcon =
+        artworkBitmap?.let {
+            android.graphics.drawable.Icon
+                .createWithBitmap(it)
+        }
+            ?: shortcut.icon?.let {
+                android.graphics.drawable.Icon
+                    .createWithBitmap(it)
+            }
+            ?: android.graphics.drawable.Icon
+                .createWithResource(context, R.drawable.icon_shortcut)
+
+    val pinShortcutInfo =
+        android.content.pm.ShortcutInfo
+            .Builder(context, pinShortcutId)
+            .setShortLabel(shortcut.name)
+            .setLongLabel(shortcut.name)
+            .setIcon(shortcutIcon)
+            .setIntent(launchIntent)
+            .build()
+
+    val callbackIntent =
+        Intent(context, ShortcutBroadcastReceiver::class.java).apply {
+            action = ShortcutBroadcastReceiver.ACTION_PIN_SHORTCUT_RESULT
+            putExtra("shortcut_path", canonicalShortcutPath)
+            putExtra("shortcut_name", shortcut.name)
+        }
+    val callbackFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    val callback =
+        PendingIntent.getBroadcast(
+            context,
+            pinShortcutId.hashCode(),
+            callbackIntent,
+            callbackFlags,
+        )
+
+    val result =
+        ShortcutsFragment.pinOrUpdateShortcut(
+            shortcutManager,
+            pinShortcutInfo,
+            ShortcutsFragment.buildPinnedShortcutIds(containerIdForLaunch, shortcutId, canonicalShortcutPath),
+            callback.intentSender,
+        )
+    if (result == ShortcutsFragment.PinShortcutResult.REUSED_EXISTING) {
+        val toastIcon = artworkBitmap ?: shortcut.icon
+        com.winlator.cmod.shared.ui.toast.WinToast.show(
+            context,
+            R.string.shortcuts_list_readded_existing,
+            toastIcon,
+        )
+    }
+    return result != ShortcutsFragment.PinShortcutResult.FAILED
+}
+
+internal suspend fun UnifiedActivity.addLibraryShortcutToHomeScreen(
+    context: android.content.Context,
+    app: SteamApp,
+    isCustom: Boolean,
+    isEpic: Boolean,
+    epicId: Int,
+    epicArtworkUrl: String? = null,
+): Boolean {
+    val containerManager = ContainerManager(context)
+    val shortcut = findLibraryShortcutForGame(containerManager, app, isCustom, isEpic, epicId) ?: return false
+    val artworkModel = resolveLibraryShortcutArtworkModel(context, app, isCustom, isEpic, epicArtworkUrl)
+    return requestPinnedHomeShortcut(context, shortcut, artworkModel)
+}
+
+internal suspend fun UnifiedActivity.addGogShortcutToHomeScreen(
+    context: android.content.Context,
+    app: GOGGame,
+    artworkUrl: String?,
+): Boolean {
+    val shortcut =
+        ContainerManager(context).loadShortcuts().find {
+            it.getExtra("game_source") == "GOG" && it.getExtra("gog_id") == app.id
+        } ?: return false
+    val artworkModel = artworkUrl?.takeIf { it.isNotBlank() }
+    return requestPinnedHomeShortcut(context, shortcut, artworkModel)
+}
diff --git a/app/src/main/app/shell/UnifiedActivityStartup.kt b/app/src/main/app/shell/UnifiedActivityStartup.kt
new file mode 100644
index 000000000..887ef156d
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityStartup.kt
@@ -0,0 +1,572 @@
+package com.winlator.cmod.app.shell
+import com.winlator.cmod.app.shell.UnifiedActivity.PendingNavigation
+import com.winlator.cmod.app.shell.UnifiedActivity.TabDef
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Settings-intent routing + desktop launch + startup bootstrap + tab building, split out of UnifiedActivity.kt (behavior-identical).
+
+internal fun UnifiedActivity.navigateToSettings(
+    item: SettingsNavItem = SettingsNavItem.CONTAINERS,
+    profileId: Int = 0,
+    editContainerId: Int = 0,
+    returnToGameOnBack: Boolean = false,
+) {
+    // In-activity settings navigation does not trigger Activity resume.
+    reapplyPreferredRefreshRate()
+    val route = buildSettingsRoute(item, profileId, editContainerId, returnToGameOnBack)
+    val nav = rootNavController
+    if (nav == null) {
+        pendingNavigation = PendingNavigation(item, profileId, editContainerId, returnToGameOnBack)
+        return
+    }
+    isPoppingSettings = false
+    nav.navigate(route) {
+        launchSingleTop = true
+    }
+}
+
+internal fun UnifiedActivity.buildSettingsRoute(
+    item: SettingsNavItem = SettingsNavItem.CONTAINERS,
+    profileId: Int = 0,
+    editContainerId: Int = 0,
+    returnToGameOnBack: Boolean = false,
+): String =
+    "settings?item=${item.name}&profileId=$profileId&editContainerId=$editContainerId&returnToGameOnBack=$returnToGameOnBack"
+
+
+internal fun UnifiedActivity.extractSettingsNavigation(intent: Intent?): PendingNavigation? {
+    if (intent == null) return null
+
+    val editContainerId = intent.getIntExtra("edit_container_id", 0)
+    if (editContainerId > 0) {
+        return PendingNavigation(SettingsNavItem.CONTAINERS, 0, editContainerId)
+    }
+
+    if (intent.getBooleanExtra("edit_input_controls", false)) {
+        val profileId = intent.getIntExtra("selected_profile_id", 0)
+        val returnToGameOnBack = intent.getBooleanExtra("return_to_game_on_back", false)
+        return PendingNavigation(SettingsNavItem.INPUT_CONTROLS, profileId, 0, returnToGameOnBack)
+    }
+
+    val selectedMenuItemId = intent.getIntExtra("selected_menu_item_id", 0)
+    if (selectedMenuItemId > 0) {
+        val target = SettingsNavItem.fromMenuId(selectedMenuItemId) ?: SettingsNavItem.CONTAINERS
+        return PendingNavigation(target, 0, 0)
+    }
+
+    return null
+}
+
+internal fun UnifiedActivity.consumeSettingsIntent(intent: Intent?) {
+    intent ?: return
+    intent.removeExtra("edit_container_id")
+    intent.removeExtra("edit_input_controls")
+    intent.removeExtra("selected_profile_id")
+    intent.removeExtra("selected_menu_item_id")
+    intent.removeExtra("return_to_game_on_back")
+}
+
+internal fun UnifiedActivity.handleSettingsIntent(intent: Intent?) {
+    val request = extractSettingsNavigation(intent) ?: return
+    consumeSettingsIntent(intent)
+    navigateToSettings(request.item, request.profileId, request.editContainerId, request.returnToGameOnBack)
+}
+
+internal fun UnifiedActivity.maybeForwardFrontendLaunch(): Boolean {
+    val source = intent ?: return false
+    val path = resolveIncomingDesktopPath(source) ?: return false
+    startActivity(
+        Intent(this, XServerDisplayActivity::class.java).apply {
+            action = Intent.ACTION_VIEW
+            putExtra("shortcut_path", path)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        },
+    )
+    finish()
+    return true
+}
+
+internal fun UnifiedActivity.resolveIncomingDesktopPath(source: Intent): String? {
+    materializeDesktop(source.data)?.let { return it }
+    source.clipData?.let { clip ->
+        for (i in 0 until clip.itemCount) {
+            materializeDesktop(clip.getItemAt(i).uri)?.let { return it }
+            materializeDesktop(clip.getItemAt(i).text?.toString())?.let { return it }
+        }
+    }
+    val extras = source.extras ?: return null
+    for (key in extras.keySet()) {
+        materializeDesktop(extras.get(key))?.let { return it }
+    }
+    return null
+}
+
+internal fun UnifiedActivity.materializeDesktop(value: Any?): String? =
+    when (value) {
+        is android.net.Uri -> materializeDesktopUri(value)
+        is String ->
+            if (value.startsWith("content://") || value.startsWith("file://")) {
+                materializeDesktopUri(android.net.Uri.parse(value))
+            } else {
+                java.io.File(value).takeIf { it.isFile && looksLikeDesktopFile(it) }?.absolutePath
+            }
+        else -> null
+    }
+
+
+internal fun UnifiedActivity.materializeDesktopUri(uri: android.net.Uri): String? {
+    when (uri.scheme?.lowercase()) {
+        "file" -> {
+            val file = uri.path?.let { java.io.File(it) }
+            if (file != null && file.isFile && looksLikeDesktopFile(file)) return file.absolutePath
+        }
+        "content" -> {
+            val resolved = com.winlator.cmod.shared.io.FileUtils.getFilePathFromUri(this, uri)
+            if (!resolved.isNullOrEmpty()) {
+                val file = java.io.File(resolved)
+                if (file.isFile && looksLikeDesktopFile(file)) return file.absolutePath
+            }
+            return copyUriToCacheDesktop(uri)
+        }
+    }
+    return null
+}
+
+internal fun UnifiedActivity.copyUriToCacheDesktop(uri: android.net.Uri): String? =
+    runCatching {
+        val out = java.io.File(cacheDir, "frontend_launch.desktop")
+        val copied =
+            contentResolver.openInputStream(uri)?.use { input ->
+                out.outputStream().use { output -> input.copyTo(output) }
+                true
+            } ?: false
+        if (copied && out.isFile && looksLikeDesktopFile(out)) out.absolutePath else null
+    }.getOrNull()
+
+
+internal fun UnifiedActivity.looksLikeDesktopFile(file: java.io.File): Boolean {
+    if (!file.isFile || file.length() > 1_000_000L) return false
+    return runCatching {
+        val text = file.readText()
+        text.contains("[Desktop Entry]") || text.contains("container_id")
+    }.getOrDefault(false)
+}
+
+internal fun UnifiedActivity.bootstrapStartupState() {
+    startupBootstrapReady = false
+    startupLibraryLayoutMode = null
+    startupStoreVisible = null
+    startupContentFilters = null
+
+    lifecycleScope.launch(Dispatchers.IO) {
+        val appContext = applicationContext
+        val resolvedLayoutMode =
+            runCatching {
+                PrefManager.init(appContext)
+                LibraryLayoutMode.valueOf(PrefManager.libraryLayoutMode)
+            }.getOrElse { error ->
+                Log.w("UnifiedActivity", "Failed to resolve initial library layout", error)
+                LibraryLayoutMode.GRID_4
+            }
+
+        val resolvedStoreVisible =
+            runCatching {
+                val saved = PrefManager.libraryStoreVisible.split(",").toSet()
+                mapOf("steam" to ("steam" in saved), "epic" to ("epic" in saved), "gog" to ("gog" in saved))
+            }.getOrElse { mapOf("steam" to true, "epic" to true, "gog" to true) }
+
+        val resolvedContentFilters =
+            runCatching {
+                val saved = PrefManager.libraryContentFilters.split(",").toSet()
+                mapOf(
+                    "games" to ("games" in saved),
+                    "dlc" to ("dlc" in saved),
+                    "applications" to ("applications" in saved),
+                    "tools" to ("tools" in saved),
+                )
+            }.getOrElse { mapOf("games" to true, "dlc" to false, "applications" to false, "tools" to false) }
+
+        runCatching { dbProvider.get() }
+            .onFailure { Log.w("UnifiedActivity", "Database warmup failed", it) }
+        runCatching { EpicAuthManager.updateLoginStatus(appContext) }
+            .onFailure { Log.w("UnifiedActivity", "Epic auth warmup failed", it) }
+        runCatching { GOGAuthManager.updateLoginStatus(appContext) }
+            .onFailure { Log.w("UnifiedActivity", "GOG auth warmup failed", it) }
+        runCatching { SteamService.initLoginStatus(appContext) }
+            .onFailure { Log.w("UnifiedActivity", "Steam auth warmup failed", it) }
+
+        withContext(Dispatchers.Main.immediate) {
+            startupLibraryLayoutMode = resolvedLayoutMode
+            currentLibraryLayoutMode = resolvedLayoutMode
+            startupStoreVisible = resolvedStoreVisible
+            startupContentFilters = resolvedContentFilters
+            startupBootstrapReady = true
+        }
+    }
+}
+
+/** When the "Sign in to Google on launch" toggle is on, attempt a silent Play Games sign-in once per launch. */
+internal fun UnifiedActivity.maybeAutoSignInGoogleOnLaunch() {
+    if (!com.winlator.cmod.feature.sync.google.CloudSyncManager.isAutoSignInOnLaunchEnabled(this)) return
+    runCatching {
+        com.winlator.cmod.feature.sync.google.PlayGamesBootstrap.ensureInitialized(this)
+        com.google.android.gms.games.PlayGames
+            .getGamesSignInClient(this)
+            .signIn()
+            .addOnCompleteListener { task ->
+                val authed = task.isSuccessful && task.result?.isAuthenticated == true
+                if (authed) {
+                    com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+                        .setDriveConnected(applicationContext, true)
+                    retryPendingRetroCloudBackup()
+                }
+            }
+    }.onFailure {
+        timber.log.Timber.tag("UnifiedActivity").w(it, "Auto Google sign-in on launch failed")
+    }
+}
+
+internal fun UnifiedActivity.scheduleDeferredStoreBootstrap() {
+    window.decorView.post {
+        if (isFinishing || isDestroyed) return@post
+        lifecycleScope.launch(Dispatchers.IO) {
+            if (EpicService.hasStoredCredentials(this@scheduleDeferredStoreBootstrap)) {
+                EpicService.start(this@scheduleDeferredStoreBootstrap)
+                // Keep token validation off the first-frame path.
+                EpicAuthManager.getStoredCredentials(this@scheduleDeferredStoreBootstrap)
+                com.winlator.cmod.feature.stores.epic.service.EpicTokenRefreshWorker
+                    .schedule(this@scheduleDeferredStoreBootstrap)
+            }
+
+            if (SteamService.hasStoredCredentials(this@scheduleDeferredStoreBootstrap)) {
+                SteamService.start(this@scheduleDeferredStoreBootstrap)
+            }
+
+            if (GOGAuthManager.isLoggedIn(this@scheduleDeferredStoreBootstrap)) {
+                GOGService.start(this@scheduleDeferredStoreBootstrap)
+            }
+
+            SteamService.maybeRepairInstalledMetadataOnStartup(this@scheduleDeferredStoreBootstrap)
+        }
+    }
+}
+
+internal fun UnifiedActivity.buildTabs(storeVisible: Map<String, Boolean>): List<TabDef> {
+    val base =
+        mutableListOf(
+            TabDef(getString(R.string.common_ui_library), "library"),
+            TabDef(getString(R.string.common_ui_downloads), "downloads"),
+        )
+    if (storeVisible["steam"] != false) base.add(TabDef("Steam", "steam"))
+    if (storeVisible["epic"] != false) base.add(TabDef("Epic", "epic"))
+    if (storeVisible["gog"] != false) base.add(TabDef("GOG", "gog"))
+    return base
+}
+
+@Composable
+internal fun UnifiedActivity.rememberSteamInstallStateMap(apps: List<SteamApp>): Map<Int, Boolean> {
+    var installStateMap by remember { mutableStateOf<Map<Int, Boolean>>(emptyMap()) }
+
+    LaunchedEffect(apps) {
+        installStateMap =
+            withContext(Dispatchers.IO) {
+                apps.associate { it.id to SteamService.isAppInstalled(it.id) }
+            }
+    }
+
+    return installStateMap
+}
+
+@Composable
+internal fun <K> UnifiedActivity.rememberInstallPathStateMap(entries: List<Pair<K, String?>>): Map<K, Boolean>
+    where K : Any {
+    var installStateMap by remember { mutableStateOf<Map<K, Boolean>>(emptyMap()) }
+
+    LaunchedEffect(entries) {
+        installStateMap =
+            withContext(Dispatchers.IO) {
+                entries.associate { (key, path) ->
+                    key to (path?.isNotBlank() == true && java.io.File(path).exists())
+                }
+            }
+    }
+
+    return installStateMap
+}
+
+@Composable
+internal fun UnifiedActivity.rememberEpicInstallStateMap(
+    context: android.content.Context,
+    apps: List<EpicGame>,
+): Map<Int, Boolean> {
+    var installStateMap by remember { mutableStateOf<Map<Int, Boolean>>(emptyMap()) }
+
+    LaunchedEffect(apps) {
+        installStateMap =
+            withContext(Dispatchers.IO) {
+                apps.associate { it.id to EpicService.isGameInstalled(context, it.id) }
+            }
+    }
+
+    return installStateMap
+}
+
+@Composable
+internal fun UnifiedActivity.rememberGogInstallStateMap(apps: List<GOGGame>): Map<String, Boolean> {
+    var installStateMap by remember { mutableStateOf<Map<String, Boolean>>(emptyMap()) }
+
+    LaunchedEffect(apps) {
+        installStateMap =
+            withContext(Dispatchers.IO) {
+                apps.associate { it.id to GOGService.isGameInstalled(it.id) }
+            }
+    }
+
+    return installStateMap
+}
diff --git a/app/src/main/app/shell/UnifiedActivityStores.kt b/app/src/main/app/shell/UnifiedActivityStores.kt
new file mode 100644
index 000000000..f466d40da
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityStores.kt
@@ -0,0 +1,2225 @@
+package com.winlator.cmod.app.shell
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Epic/GOG/Steam store tabs, capsules and manager dialogs, split out of UnifiedActivity.kt (behavior-identical).
+
+@Composable
+internal fun UnifiedActivity.CompactActionButton(
+    icon: ImageVector,
+    label: String,
+    tint: Color = TextPrimary,
+    bgColor: Color = SurfaceDark,
+    modifier: Modifier = Modifier,
+    height: Dp = 36.dp,
+    fontSize: TextUnit = 13.sp,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.93f else 1f,
+        animationSpec = spring(dampingRatio = 0.6f, stiffness = 800f),
+        label = "btnScale",
+    )
+    val glowAlpha by animateFloatAsState(
+        targetValue = if (isPressed) 0.18f else 0f,
+        animationSpec = tween(durationMillis = 120),
+        label = "btnGlow",
+    )
+    Surface(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .height(height)
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }.clip(RoundedCornerShape(10.dp))
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                ),
+        color = bgColor,
+        shape = RoundedCornerShape(10.dp),
+        border = BorderStroke(1.dp, tint.copy(alpha = glowAlpha)),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center,
+        ) {
+            Icon(icon, contentDescription = null, modifier = Modifier.size(16.dp), tint = tint)
+            Spacer(Modifier.width(6.dp))
+            Text(
+                label,
+                color = tint,
+                fontSize = fontSize,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
+// Single game capsule for carousel / grid / list
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+internal fun UnifiedActivity.GameCapsule(
+    app: SteamApp,
+    gogGame: GOGGame? = null,
+    epicGame: EpicGame? = null,
+    iconRefreshKey: Int = 0,
+    artworkCacheRefreshKey: Int = 0,
+    isFocusedOverride: Boolean = false,
+    isControllerActive: Boolean = false,
+    customArtworkPath: String? = null,
+    customIconPath: String? = null,
+    customListPath: String? = null,
+    customCarouselPath: String? = null,
+    customHeroPath: String? = null,
+    onClick: (() -> Unit)? = null,
+    onLongClick: (() -> Unit)? = null,
+    useLibraryCapsule: Boolean = false,
+    listMode: Boolean = false,
+    modifier: Modifier = Modifier,
+) {
+    val context = LocalContext.current
+    val isCustom = app.id < 0
+    val isEpic = app.id >= 2000000000
+    val defaultClick: () -> Unit = {
+        val containerManager =
+            com.winlator.cmod.runtime.container
+                .ContainerManager(context)
+        if (isCustom) {
+            launchCustomGame(context, containerManager, app.name)
+        } else if (gogGame != null) {
+            launchGogGame(context, containerManager, gogGame)
+        } else if (isEpic) {
+            epicGame?.let { launchEpicGame(context, containerManager, it) }
+        } else {
+            launchSteamGame(context, containerManager, app)
+        }
+    }
+    // Each view has its own shape, so prefer the slot scraped for it.
+    val artworkToBeUsed =
+        when {
+            listMode -> customListPath ?: customArtworkPath
+            useLibraryCapsule -> customCarouselPath ?: customArtworkPath
+            else -> customArtworkPath
+        }
+    val clickInteraction = remember { MutableInteractionSource() }
+    val isPressed by clickInteraction.collectIsPressedAsState()
+    val isFocused = isControllerActive && isFocusedOverride
+    val glowAlpha by animateFloatAsState(
+        targetValue = if (isPressed) 0.7f else 0f,
+        animationSpec = if (isPressed) tween(100) else tween(400),
+        label = "capsuleGlow",
+    )
+    val clickModifier =
+        Modifier
+            .then(
+                if (glowAlpha > 0f) {
+                    Modifier.drawWithContent {
+                        drawContent()
+                        drawRoundRect(
+                            color = AccentGlow,
+                            alpha = glowAlpha * 0.25f,
+                            cornerRadius = CornerRadius(12.dp.toPx()),
+                        )
+                    }
+                } else {
+                    Modifier
+                },
+            ).combinedClickable(
+                interactionSource = clickInteraction,
+                indication = null,
+                onClick = onClick ?: defaultClick,
+                onLongClick = onLongClick,
+            )
+
+    @Composable
+    fun ArtContent(artModifier: Modifier) {
+        val customArtworkFile =
+            artworkToBeUsed
+                ?.let { java.io.File(it) }
+
+        if (customArtworkFile != null) {
+            val customArtworkCacheKey =
+                "library_custom_icon:${customArtworkFile.absolutePath}:${customArtworkFile.lastModified()}"
+            AsyncImage(
+                model =
+                    ImageRequest
+                        .Builder(context)
+                        .data(customArtworkFile)
+                        .memoryCacheKey(customArtworkCacheKey)
+                        .diskCacheKey(customArtworkCacheKey)
+                        .crossfade(300)
+                        .build(),
+                contentDescription = app.name,
+                modifier = artModifier,
+                contentScale = ContentScale.Crop,
+            )
+        } else if (isCustom) {
+            val iconFile = customIconPath?.let { path -> java.io.File(path) }
+            if (iconFile != null) {
+                AsyncImage(
+                    model =
+                        ImageRequest
+                            .Builder(context)
+                            .data(iconFile)
+                            .crossfade(300)
+                            .build(),
+                    contentDescription = app.name,
+                    modifier = artModifier,
+                    contentScale = ContentScale.Crop,
+                )
+            } else {
+                Box(
+                    modifier = artModifier.background(SurfaceDark),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(
+                        Icons.Outlined.SportsEsports,
+                        contentDescription = app.name,
+                        tint = Accent.copy(alpha = 0.6f),
+                        modifier = Modifier.size(48.dp),
+                    )
+                }
+            }
+        } else {
+            val imageModel =
+                remember(app.id, gogGame, epicGame, useLibraryCapsule, listMode, artworkCacheRefreshKey) {
+                    StoreArtworkCache.imageModel(
+                        context,
+                        StoreArtworkCache.primaryRef(app, gogGame, epicGame, useLibraryCapsule, listMode),
+                    )
+                }
+            AsyncImage(
+                model =
+                    ImageRequest
+                        .Builder(context)
+                        .data(imageModel)
+                        .crossfade(300)
+                        .build(),
+                contentDescription = app.name,
+                modifier = artModifier,
+                contentScale = ContentScale.Crop,
+            )
+        }
+    }
+
+    if (listMode) {
+        // Horizontal row card with hero background
+        val heroRef = if (!isCustom && gogGame == null && !isEpic) StoreArtworkCache.heroRef(app, null, null) else null
+        val heroModel =
+            remember(app.id, heroRef, artworkCacheRefreshKey) {
+                StoreArtworkCache.imageModel(context, heroRef)
+            }
+
+        Box(
+            modifier =
+                modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(14.dp))
+                    .then(
+                        if (isControllerActive && !isFocused) {
+                            Modifier.border(1.dp, CardBorder, RoundedCornerShape(14.dp))
+                        } else {
+                            Modifier
+                        },
+                    ).chasingBorder(
+                        isFocused = isFocused,
+                        paused = chasingBordersPaused.value || !libraryTabActive.value,
+                        cornerRadius = 14.dp,
+                    ).background(CardDark, RoundedCornerShape(14.dp))
+                    .focusable()
+                    .then(clickModifier),
+        ) {
+            // Hero background layer (falls back to CardDark if image fails)
+            if (heroRef != null) {
+                AsyncImage(
+                    model =
+                        ImageRequest
+                            .Builder(context)
+                            .data(heroModel)
+                            .crossfade(300)
+                            .build(),
+                    contentDescription = null,
+                    modifier =
+                        Modifier
+                            .matchParentSize()
+                            .graphicsLayer { alpha = 0.25f },
+                    contentScale = ContentScale.Crop,
+                )
+            } else {
+                customHeroPath?.let {
+                    val heroFile = java.io.File(customHeroPath)
+                    if (heroFile.isFile) {
+                        AsyncImage(
+                            model =
+                                ImageRequest
+                                    .Builder(context)
+                                    .data(heroFile)
+                                    .crossfade(300)
+                                    .build(),
+                            contentDescription = null,
+                            modifier =
+                                Modifier
+                                    .matchParentSize()
+                                    .graphicsLayer { alpha = 0.25f },
+                            contentScale = ContentScale.Crop,
+                        )
+                    }
+                }
+            }
+
+            // Foreground content
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 14.dp, vertical = 11.dp),
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Box(
+                    modifier =
+                        Modifier
+                            .height(52.dp)
+                            .aspectRatio(462f / 174f)
+                            .clip(RoundedCornerShape(8.dp)),
+                ) {
+                    ArtContent(Modifier.fillMaxSize())
+                    libraryBadgeLabel(app.id, isCustom)?.let { badge ->
+                        RetroConsoleRibbon(badge, Modifier.align(Alignment.CenterStart))
+                    }
+                }
+
+                Spacer(Modifier.width(14.dp))
+
+                Text(
+                    text = app.name,
+                    modifier =
+                        Modifier
+                            .weight(1f)
+                            .then(if (isFocused) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
+                    color = TextPrimary,
+                    fontSize = 15.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    } else {
+        // Vertical card: art on top, title below
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier =
+                modifier
+                    .fillMaxWidth()
+                    .then(
+                        if (isFocused) {
+                            Modifier
+                        } else {
+                            Modifier.border(1.dp, CardDark, RoundedCornerShape(12.dp))
+                        },
+                    ).chasingBorder(
+                        isFocused = isFocused,
+                        paused = chasingBordersPaused.value || !libraryTabActive.value,
+                        cornerRadius = 12.dp,
+                    ).background(CardDark, RoundedCornerShape(12.dp))
+                    .focusable()
+                    .then(clickModifier),
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .weight(1f)
+                        .clip(RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)),
+            ) {
+                ArtContent(Modifier.fillMaxSize())
+                libraryBadgeLabel(app.id, isCustom)?.let { badge ->
+                    RetroConsoleRibbon(badge, Modifier.align(Alignment.CenterStart))
+                }
+            }
+
+            Text(
+                text = app.name,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 4.dp, vertical = 4.dp)
+                        .then(if (isFocused) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
+                style = MaterialTheme.typography.bodySmall,
+                color = TextPrimary,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
+
+// Epic Store Tab
+@Composable
+internal fun UnifiedActivity.EpicStoreTab(
+    isLoggedIn: Boolean,
+    epicApps: List<EpicGame>,
+    searchQuery: String = "",
+    layoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4,
+    onLoginClick: () -> Unit,
+) {
+    val context = LocalContext.current
+
+    if (!isLoggedIn) {
+        LoginRequiredScreen("Epic Games", onLoginClick)
+        return
+    }
+
+    val selectedAppId = remember { mutableStateOf<Int?>(null) }
+    val gridState = rememberLazyGridState()
+    val activity = LocalContext.current as? UnifiedActivity
+
+    // Ensure library updates from cloud
+    LaunchedEffect(Unit) {
+        if (epicApps.isEmpty()) {
+            EpicService.triggerLibrarySync(context)
+        }
+    }
+
+    val displayedApps =
+        remember(epicApps, searchQuery) {
+            if (searchQuery.isBlank()) {
+                epicApps
+            } else {
+                epicApps.filter { it.title.contains(searchQuery, ignoreCase = true) }
+            }
+        }
+    val installStateById = rememberEpicInstallStateMap(context, displayedApps)
+
+    // Sync store focus infrastructure
+    LaunchedEffect(displayedApps.size) {
+        activity?.storeItemCount = displayedApps.size
+        val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
+        if (activity != null && displayedApps.isNotEmpty() && activity.storeFocusIndex.value > lastIndex) {
+            activity.storeFocusIndex.value = lastIndex
+        }
+    }
+    DisposableEffect(displayedApps) {
+        val clickCallback: (Int) -> Unit = { idx ->
+            displayedApps.getOrNull(idx)?.let { selectedAppId.value = it.id }
+        }
+        activity?.storeItemClickCallback = clickCallback
+        activity?.storeGridState = gridState
+        onDispose {
+            if (activity?.storeItemClickCallback === clickCallback) {
+                activity?.storeItemClickCallback = null
+                activity?.storeGridState = null
+            }
+        }
+    }
+
+    if (layoutMode == LibraryLayoutMode.LIST) {
+        val listViewState = rememberLazyListState()
+        JoystickListScroll(listViewState, activity?.rightStickScrollState)
+        ListView(
+            items = displayedApps,
+            modifier = Modifier.tabScreenPadding(),
+            listState = listViewState,
+            contentPadding = TabListContentPadding,
+            keyOf = { it.id },
+        ) { app, _, _ ->
+            EpicStoreCapsule(
+                app,
+                isInstalled = installStateById[app.id] == true,
+                listMode = true,
+                isControllerActive = ControllerHelper.isControllerConnected(),
+            ) {
+                selectedAppId.value =
+                    app.id
+            }
+        }
+    } else {
+        val focusIndex by (activity?.storeFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
+        val focusRequesters =
+            remember(displayedApps.size) {
+                List(displayedApps.size) { FocusRequester() }
+            }
+        LaunchedEffect(focusIndex, focusRequesters.size) {
+            if (searchQuery.isEmpty() && focusRequesters.isNotEmpty() && focusIndex in focusRequesters.indices) {
+                gridState.animateScrollToItem(focusIndex)
+                try {
+                    focusRequesters[focusIndex].requestFocus()
+                } catch (_: Exception) {
+                }
+            }
+        }
+        JoystickGridScroll(gridState, activity?.rightStickScrollState)
+        FourByTwoGridView(
+            items = displayedApps,
+            modifier = Modifier.tabScreenPadding(top = TabGridTopPadding),
+            gridState = gridState,
+            keyOf = { it.id },
+        ) { app, index, rowHeight ->
+            Box(
+                Modifier.height(rowHeight).then(
+                    if (index in focusRequesters.indices) {
+                        Modifier.focusRequester(focusRequesters[index])
+                    } else {
+                        Modifier
+                    },
+                ),
+            ) {
+                EpicStoreCapsule(
+                    app,
+                    isInstalled = installStateById[app.id] == true,
+                    isFocusedOverride = index == focusIndex,
+                    isControllerActive = ControllerHelper.isControllerConnected(),
+                ) {
+                    selectedAppId.value =
+                        app.id
+                }
+            }
+        }
+    }
+
+    val selectedApp = epicApps.find { it.id == selectedAppId.value }
+    if (selectedApp != null) {
+        EpicGameManagerDialog(
+            app = selectedApp,
+            onDismissRequest = { selectedAppId.value = null },
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.StoreInstalledBadge(
+    modifier: Modifier = Modifier,
+    compact: Boolean = false,
+    attachedCorner: Boolean = false,
+) {
+    val shape =
+        if (attachedCorner) {
+            RoundedCornerShape(topStart = 8.dp)
+        } else {
+            RoundedCornerShape(4.dp)
+        }
+    Box(
+        modifier =
+            modifier
+                .background(StatusOnline, shape)
+                .border(1.dp, Color.White.copy(alpha = 0.34f), shape)
+                .padding(
+                    start = if (compact) 6.dp else 9.dp,
+                    end = if (compact) 6.dp else 9.dp,
+                    top = if (compact) 2.dp else 4.dp,
+                    bottom = if (compact) 1.dp else 2.dp,
+                ),
+    ) {
+        Text(
+            stringResource(R.string.library_games_installed_badge),
+            color = Color(0xFF06140A),
+            fontSize = if (compact) 9.sp else 11.sp,
+            fontWeight = FontWeight.Black,
+            letterSpacing = 0.6.sp,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.EpicStoreCapsule(
+    app: com.winlator.cmod.feature.stores.epic.data.EpicGame,
+    isInstalled: Boolean,
+    listMode: Boolean = false,
+    isFocusedOverride: Boolean = false,
+    isControllerActive: Boolean = false,
+    onClick: () -> Unit,
+) {
+    val context = LocalContext.current
+    var isFocused by remember { mutableStateOf(false) }
+    val clickInteraction = remember { MutableInteractionSource() }
+    val isPressed by clickInteraction.collectIsPressedAsState()
+    val glowAlpha by animateFloatAsState(
+        targetValue = if (isPressed) 0.7f else 0f,
+        animationSpec = if (isPressed) tween(100) else tween(400),
+        label = "epicCapsuleGlow",
+    )
+    val effectiveFocus = isControllerActive && (isFocusedOverride || isFocused)
+    val imageUrl = app.primaryImageUrl ?: app.iconUrl
+
+    val borderColor = if (isControllerActive) CardBorder else Color.Transparent
+
+    if (listMode) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(14.dp))
+                    .border(1.dp, borderColor, RoundedCornerShape(14.dp))
+                    .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 14.dp)
+                    .background(CardDark, RoundedCornerShape(14.dp))
+                    .onFocusChanged { isFocused = it.isFocused }
+                    .focusable()
+                    .then(
+                        if (glowAlpha > 0f) {
+                            Modifier.drawWithContent {
+                                drawContent()
+                                drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(14.dp.toPx()))
+                            }
+                        } else {
+                            Modifier
+                        },
+                    ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick)
+                    .padding(horizontal = 14.dp, vertical = 11.dp),
+            horizontalArrangement = Arrangement.Center,
+        ) {
+            Box(
+                Modifier
+                    .height(52.dp)
+                    .aspectRatio(462f / 174f)
+                    .clip(RoundedCornerShape(8.dp)),
+            ) {
+                AsyncImage(
+                    model =
+                        ImageRequest
+                            .Builder(context)
+                            .data(imageUrl)
+                            .crossfade(300)
+                            .build(),
+                    contentDescription = app.title,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Crop,
+                )
+                if (isInstalled) {
+                    StoreInstalledBadge(
+                        modifier = Modifier.align(Alignment.BottomEnd).padding(4.dp),
+                        compact = true,
+                    )
+                }
+            }
+            Spacer(Modifier.width(14.dp))
+            Text(
+                app.title,
+                modifier =
+                    Modifier
+                        .weight(1f)
+                        .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
+                color = TextPrimary,
+                fontSize = 15.sp,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    } else {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .border(1.dp, borderColor, RoundedCornerShape(16.dp))
+                    .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 16.dp)
+                    .background(CardDark, RoundedCornerShape(16.dp))
+                    .onFocusChanged { isFocused = it.isFocused }
+                    .focusable()
+                    .then(
+                        if (glowAlpha > 0f) {
+                            Modifier.drawWithContent {
+                                drawContent()
+                                drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(16.dp.toPx()))
+                            }
+                        } else {
+                            Modifier
+                        },
+                    ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick),
+        ) {
+            Box(
+                Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+                    .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
+            ) {
+                AsyncImage(
+                    model =
+                        ImageRequest
+                            .Builder(context)
+                            .data(imageUrl)
+                            .crossfade(300)
+                            .build(),
+                    contentDescription = app.title,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Crop,
+                )
+
+                if (isInstalled) {
+                    StoreInstalledBadge(
+                        modifier = Modifier.align(Alignment.BottomEnd),
+                        attachedCorner = true,
+                    )
+                }
+            }
+
+            Text(
+                app.title,
+                modifier =
+                    Modifier
+                        .padding(horizontal = 4.dp, vertical = 4.dp)
+                        .fillMaxWidth()
+                        .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
+                style = MaterialTheme.typography.bodySmall,
+                color = TextPrimary,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.EpicGameManagerDialog(
+    app: EpicGame,
+    onDismissRequest: () -> Unit,
+) {
+    val context = LocalContext.current
+    val installed = EpicService.isGameInstalled(context, app.id)
+    val scope = rememberCoroutineScope()
+
+    var isLoading by remember { mutableStateOf(!installed) }
+    var manifestSizes by remember { mutableStateOf<EpicManager.ManifestSizes?>(null) }
+    var dlcApps by remember { mutableStateOf<List<EpicGame>>(emptyList()) }
+    val selectedDlcIds = remember { mutableStateListOf<Int>() }
+    var customPath by remember { mutableStateOf<String?>(null) }
+    var showCustomPathWarning by remember { mutableStateOf(false) }
+    var isCheckingForUpdate by remember(app.id) { mutableStateOf(false) }
+    var updateInfo by remember(app.id) { mutableStateOf<EpicUpdateInfo?>(null) }
+    var updateStatusText by remember(app.id) { mutableStateOf<String?>(null) }
+    val epicDownloadRecords by com.winlator.cmod.app.service.download.DownloadCoordinator.records.collectAsState(
+        initial = com.winlator.cmod.app.service.download.DownloadCoordinator.snapshotRecords(),
+    )
+    val hasBlockingEpicDownload =
+        epicDownloadRecords.any {
+            it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_EPIC &&
+                it.storeGameId == app.id.toString() &&
+                it.status in setOf(
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_FAILED,
+                )
+        }
+    val updateActionEnabled = !hasBlockingEpicDownload
+    val activeEpicDownloadText = stringResource(R.string.store_game_download_already_active)
+    val noUpdateAvailableText = stringResource(R.string.store_game_no_update_available)
+    val updateAvailableText = stringResource(R.string.store_game_update_available)
+    val updateFailedText = stringResource(R.string.store_game_update_check_failed)
+
+    if (showCustomPathWarning) {
+        CustomPathWarningDialog(
+            onDismiss = { showCustomPathWarning = false },
+            onProceed = {
+                showCustomPathWarning = false
+                DirectoryPickerDialog.show(
+                    activity = this@EpicGameManagerDialog,
+                    initialPath = customPath ?: EpicConstants.getGameInstallPath(context, app.appName),
+                    title = getString(R.string.settings_content_install_directory),
+                    extraRoots = driveRoots(includeInternal = true),
+                ) { path -> customPath = path }
+            },
+        )
+    }
+
+    LaunchedEffect(app.id, installed) {
+        if (!installed) {
+            val (sizes, sizedDlcs) =
+                withContext(Dispatchers.IO) {
+                    val baseSizes = EpicService.fetchManifestSizes(context, app.id)
+                    val dlcs = EpicService.getDLCForGameSuspend(app.id)
+                    val dlcsWithSizes =
+                        dlcs
+                            .map { dlc ->
+                                async {
+                                    if (dlc.downloadSize > 0L || dlc.installSize > 0L) {
+                                        dlc
+                                    } else {
+                                        val dlcSizes = EpicService.fetchManifestSizes(context, dlc.id)
+                                        dlc.copy(
+                                            downloadSize = dlcSizes.downloadSize,
+                                            installSize = dlcSizes.installSize,
+                                        )
+                                    }
+                                }
+                            }.awaitAll()
+                    baseSizes to dlcsWithSizes
+                }
+            manifestSizes = sizes
+            dlcApps = sizedDlcs
+            isLoading = false
+        } else {
+            dlcApps =
+                withContext(Dispatchers.IO) {
+                    EpicService
+                        .getDLCForGameSuspend(app.id)
+                        .map { dlc ->
+                            async {
+                                if (dlc.downloadSize > 0L || dlc.installSize > 0L) {
+                                    dlc
+                                } else {
+                                    val dlcSizes = EpicService.fetchManifestSizes(context, dlc.id)
+                                    dlc.copy(
+                                        downloadSize = dlcSizes.downloadSize,
+                                        installSize = dlcSizes.installSize,
+                                    )
+                                }
+                            }
+                        }.awaitAll()
+                }
+        }
+    }
+
+    val baseDownloadSize = manifestSizes?.downloadSize ?: 0L
+    val baseInstallSize = manifestSizes?.installSize ?: 0L
+    val selectedDlcDownloadBytes =
+        dlcApps.filter { it.id in selectedDlcIds }.sumOf { it.downloadSize.coerceAtLeast(0L) }
+    val selectedDlcInstallBytes =
+        dlcApps.filter { it.id in selectedDlcIds }.sumOf { it.installSize.coerceAtLeast(0L) }
+    val totalDownloadSize = baseDownloadSize + selectedDlcDownloadBytes
+    val totalInstallSize = baseInstallSize + selectedDlcInstallBytes
+    val defaultPathSet =
+        if (PrefManager.useSingleDownloadFolder) {
+            PrefManager.defaultDownloadFolder.isNotEmpty()
+        } else {
+            PrefManager.epicDownloadFolder
+                .isNotEmpty()
+        }
+    val effectivePath = customPath ?: EpicConstants.getGameInstallPath(context, app.appName)
+    val availableBytes =
+        try {
+            StorageUtils.getAvailableSpace(effectivePath)
+        } catch (e: Exception) {
+            0L
+        }
+    // Installed game: base content is on disk, so only gate on the newly-selected DLC bytes.
+    val requiredBytes = if (installed) selectedDlcInstallBytes else totalInstallSize
+    val isInstallEnabled = requiredBytes == 0L || availableBytes >= requiredBytes
+    val installActionEnabled = isInstallEnabled && !hasBlockingEpicDownload
+    val installPathDisplay = if (installed) app.installPath else (customPath ?: EpicConstants.defaultEpicGamesPath(context))
+
+    val dlcItems =
+        remember(dlcApps) {
+            dlcApps.map { dlc ->
+                val size =
+                    dlc.downloadSize.takeIf { it > 0L }
+                        ?: dlc.installSize
+                StoreDlcItem(id = dlc.id, name = dlc.title, downloadSize = size, isInstalled = dlc.isInstalled)
+            }
+        }
+    val customPathLabel =
+        when {
+            customPath != null -> stringResource(R.string.common_ui_custom)
+            defaultPathSet -> stringResource(R.string.common_ui_already_set)
+            else -> stringResource(R.string.common_ui_custom)
+        }
+
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            shape = RectangleShape,
+            color = Color.Black,
+        ) {
+            StoreGameDetailScreen(
+                title = app.title,
+                subtitle =
+                    listOfNotNull(
+                        app.developer.takeIf { it.isNotBlank() },
+                        app.publisher.takeIf {
+                            it.isNotBlank() && !it.equals(app.developer, ignoreCase = true)
+                        },
+                    ).joinToString(" • "),
+                sourceLabel = "Epic Games",
+                heroImageUrl = StoreArtworkCache.imageModel(context, StoreArtworkCache.epicHeroRef(app)),
+                isLoading = isLoading,
+                isInstalled = installed,
+                installPathDisplay = installPathDisplay,
+                downloadSize = totalDownloadSize,
+                installSize = totalInstallSize,
+                availableBytes = availableBytes,
+                isInstallEnabled = isInstallEnabled,
+                isDownloadActionEnabled = installActionEnabled,
+                customPathLabel = customPathLabel,
+                showCustomPath = true,
+                showCloudSync = false,
+                showUninstall = false,
+                showUpdateCheck = installed,
+                isCheckingForUpdate = isCheckingForUpdate,
+                isUpdateAvailable = updateInfo?.hasUpdate == true,
+                updateDownloadSize = updateInfo?.downloadSize ?: 0L,
+                updateStatusText = updateStatusText,
+                isUpdateActionEnabled = updateActionEnabled,
+                showVerifyFiles = installed,
+                areSteamActionsEnabled = !hasBlockingEpicDownload,
+                dlcs = dlcItems,
+                selectedDlcIds = selectedDlcIds.toSet(),
+                onBack = onDismissRequest,
+                onInstall = {
+                    if (hasBlockingEpicDownload) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeEpicDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    val installPath =
+                        if (customPath != null) {
+                            val sanitizedTitle = app.title.replace(Regex("[^a-zA-Z0-9 \\-_]"), "").trim()
+                            java.io.File(customPath!!, sanitizedTitle).absolutePath
+                        } else {
+                            EpicConstants.getGameInstallPath(context, app.title)
+                        }
+                    context.runIfOnlineOrToast {
+                        EpicService.downloadGame(context, app.id, selectedDlcIds.toList(), installPath, "en-US")
+                        onDismissRequest()
+                    }
+                },
+                onCloudSync = {
+                    scope.launch(Dispatchers.IO) {
+                        EpicCloudSavesManager.syncCloudSaves(context, app.id, "auto")
+                    }
+                    onDismissRequest()
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        context.getString(R.string.google_cloud_sync_started),
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                },
+                onVerifyFiles = {
+                    if (hasBlockingEpicDownload) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeEpicDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            val started =
+                                withContext(Dispatchers.IO) {
+                                    EpicService.verifyGameFiles(context, app.id)
+                                }
+                            if (started != null) {
+                                showTaskProgressPopup(
+                                    started,
+                                    app.title,
+                                    getString(R.string.store_game_verify_complete),
+                                    getString(R.string.store_game_verify_failed_notice),
+                                    completeAsToast = true,
+                                )
+                            } else {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    activeEpicDownloadText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    }
+                },
+                onCheckForUpdate = {
+                    if (hasBlockingEpicDownload) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeEpicDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            isCheckingForUpdate = true
+                            updateStatusText = null
+                            val latest =
+                                withContext(Dispatchers.IO) {
+                                    EpicService.checkForGameUpdate(context, app.id)
+                                }
+                            updateInfo = latest
+                            updateStatusText =
+                                when {
+                                    latest.hasUpdate -> updateAvailableText
+                                    latest.message != null -> updateFailedText
+                                    else -> null
+                                }
+                            isCheckingForUpdate = false
+                            if (!latest.hasUpdate && latest.message == null) {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    noUpdateAvailableText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    }
+                },
+                onDownloadUpdate = {
+                    if (!updateActionEnabled || updateInfo?.hasUpdate != true) return@StoreGameDetailScreen
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            val latest =
+                                withContext(Dispatchers.IO) {
+                                    EpicService.checkForGameUpdate(context, app.id)
+                                }
+                            updateInfo = latest
+                            updateStatusText =
+                                when {
+                                    latest.hasUpdate -> updateAvailableText
+                                    latest.message != null -> updateFailedText
+                                    else -> null
+                                }
+                            if (!latest.hasUpdate) {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    noUpdateAvailableText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                                return@launch
+                            }
+                            val started =
+                                withContext(Dispatchers.IO) {
+                                    EpicService.updateGameFiles(context, app.id)
+                                }
+                            if (started != null) {
+                                onDismissRequest()
+                            } else {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    activeEpicDownloadText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    }
+                },
+                onUninstall = {
+                    scope.launch(Dispatchers.IO) {
+                        val result = EpicService.deleteGame(context, app.id)
+                        withContext(Dispatchers.Main) {
+                            if (!result.isSuccess) {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    getString(
+                                        R.string.library_games_failed_to_uninstall_reason,
+                                        result.exceptionOrNull()?.message
+                                            ?: getString(R.string.common_ui_unknown_error),
+                                    ),
+                                    android.widget.Toast.LENGTH_LONG,
+                                )
+                            }
+                            onDismissRequest()
+                        }
+                    }
+                },
+                onCustomPath = {
+                    if (customPath == null && defaultPathSet) {
+                        showCustomPathWarning = true
+                    } else {
+                        DirectoryPickerDialog.show(
+                            activity = this@EpicGameManagerDialog,
+                            initialPath = customPath ?: EpicConstants.getGameInstallPath(context, app.appName),
+                            title = getString(R.string.settings_content_install_directory),
+                            extraRoots = driveRoots(includeInternal = true),
+                        ) { path -> customPath = path }
+                    }
+                },
+                onToggleDlc = { id ->
+                    if (selectedDlcIds.contains(id)) {
+                        selectedDlcIds.remove(id)
+                    } else {
+                        selectedDlcIds.add(id)
+                    }
+                },
+                onToggleSelectAllDlcs = {
+                    val all = dlcItems.isNotEmpty() && dlcItems.all { it.id in selectedDlcIds }
+                    if (all) {
+                        selectedDlcIds.clear()
+                    } else {
+                        dlcItems.forEach { if (it.id !in selectedDlcIds) selectedDlcIds.add(it.id) }
+                    }
+                },
+            )
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GOGStoreTab(
+    isLoggedIn: Boolean,
+    gogApps: List<GOGGame>,
+    searchQuery: String = "",
+    layoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4,
+    onLoginClick: () -> Unit,
+) {
+    if (!isLoggedIn) {
+        LoginRequiredScreen("GOG", onLoginClick)
+        return
+    }
+
+    val selectedGameId = remember { mutableStateOf<String?>(null) }
+    val gridState = rememberLazyGridState()
+    val activity = LocalContext.current as? UnifiedActivity
+
+    val displayedApps =
+        remember(gogApps, searchQuery) {
+            if (searchQuery.isBlank()) {
+                gogApps
+            } else {
+                gogApps.filter { it.title.contains(searchQuery, ignoreCase = true) }
+            }
+        }
+    val installStateById = rememberGogInstallStateMap(displayedApps)
+
+    // Sync store focus infrastructure
+    LaunchedEffect(displayedApps.size) {
+        activity?.storeItemCount = displayedApps.size
+        val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
+        if (activity != null && displayedApps.isNotEmpty() && activity.storeFocusIndex.value > lastIndex) {
+            activity.storeFocusIndex.value = lastIndex
+        }
+    }
+    DisposableEffect(displayedApps) {
+        val clickCallback: (Int) -> Unit = { idx ->
+            displayedApps.getOrNull(idx)?.let { selectedGameId.value = it.id }
+        }
+        activity?.storeItemClickCallback = clickCallback
+        activity?.storeGridState = gridState
+        onDispose {
+            if (activity?.storeItemClickCallback === clickCallback) {
+                activity?.storeItemClickCallback = null
+                activity?.storeGridState = null
+            }
+        }
+    }
+
+    val isControllerActive = ControllerHelper.isControllerConnected()
+    val gogBorderColor = if (isControllerActive) CardBorder else Color.Transparent
+
+    if (layoutMode == LibraryLayoutMode.LIST) {
+        val listViewState = rememberLazyListState()
+        ListView(
+            items = displayedApps,
+            modifier = Modifier.tabScreenPadding(),
+            listState = listViewState,
+            contentPadding = TabListContentPadding,
+            keyOf = { it.id },
+        ) { app, _, _ ->
+            val isInstalled = installStateById[app.id] == true
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(14.dp))
+                        .border(1.dp, gogBorderColor, RoundedCornerShape(14.dp))
+                        .background(CardDark, RoundedCornerShape(14.dp))
+                        .clickable { selectedGameId.value = app.id }
+                        .padding(horizontal = 14.dp, vertical = 11.dp),
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Box(
+                    Modifier
+                        .height(52.dp)
+                        .aspectRatio(462f / 174f)
+                        .clip(RoundedCornerShape(8.dp)),
+                ) {
+                    AsyncImage(
+                        model =
+                            ImageRequest
+                                .Builder(LocalContext.current)
+                                .data(app.imageUrl.ifEmpty { app.iconUrl })
+                                .crossfade(300)
+                                .build(),
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize(),
+                        contentScale = ContentScale.Crop,
+                    )
+                    if (isInstalled) {
+                        StoreInstalledBadge(
+                            modifier = Modifier.align(Alignment.BottomEnd).padding(4.dp),
+                            compact = true,
+                        )
+                    }
+                }
+                Spacer(Modifier.width(14.dp))
+                Text(
+                    text = app.title,
+                    modifier = Modifier.weight(1f),
+                    color = TextPrimary,
+                    fontSize = 15.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    } else {
+        val focusIndex by (activity?.storeFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
+        val focusRequesters =
+            remember(displayedApps.size) {
+                List(displayedApps.size) { FocusRequester() }
+            }
+        LaunchedEffect(focusIndex, focusRequesters.size) {
+            if (searchQuery.isEmpty() && focusRequesters.isNotEmpty() && focusIndex in focusRequesters.indices) {
+                gridState.animateScrollToItem(focusIndex)
+                try {
+                    focusRequesters[focusIndex].requestFocus()
+                } catch (_: Exception) {
+                }
+            }
+        }
+        FourByTwoGridView(
+            items = displayedApps,
+            modifier = Modifier.tabScreenPadding(top = TabGridTopPadding),
+            gridState = gridState,
+            keyOf = { it.id },
+        ) { app, index, rowHeight ->
+            val isInstalled = installStateById[app.id] == true
+            val isItemFocused = isControllerActive && index == focusIndex
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .height(rowHeight)
+                        .then(
+                            if (index in focusRequesters.indices) {
+                                Modifier.focusRequester(focusRequesters[index])
+                            } else {
+                                Modifier
+                            },
+                        ).border(1.dp, gogBorderColor, RoundedCornerShape(16.dp))
+                        .chasingBorder(isFocused = isItemFocused, paused = chasingBordersPaused.value, cornerRadius = 16.dp)
+                        .background(CardDark, RoundedCornerShape(16.dp))
+                        .clickable { selectedGameId.value = app.id },
+            ) {
+                Box(
+                    Modifier
+                        .fillMaxWidth()
+                        .weight(1f)
+                        .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
+                ) {
+                    AsyncImage(
+                        model =
+                            ImageRequest
+                                .Builder(LocalContext.current)
+                                .data(app.imageUrl.ifEmpty { app.iconUrl })
+                                .crossfade(300)
+                                .build(),
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize(),
+                        contentScale = ContentScale.Crop,
+                    )
+                    if (isInstalled) {
+                        StoreInstalledBadge(
+                            modifier = Modifier.align(Alignment.BottomEnd),
+                            attachedCorner = true,
+                        )
+                    }
+                }
+
+                Text(
+                    text = app.title,
+                    modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 4.dp),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = TextPrimary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                )
+            }
+        }
+    }
+
+    selectedGameId.value?.let { gameId ->
+        val app = gogApps.firstOrNull { it.id == gameId }
+        if (app != null) {
+            GOGGameManagerDialog(app = app) { selectedGameId.value = null }
+        }
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.GOGGameManagerDialog(
+    app: GOGGame,
+    onDismissRequest: () -> Unit,
+) {
+    val context = LocalContext.current
+    val installed = GOGService.isGameInstalled(app.id)
+    val scope = rememberCoroutineScope()
+    var isLoading by remember(app.id) { mutableStateOf(true) }
+    var selectedManifestSizes by remember(app.id) { mutableStateOf(GOGManifestSizes()) }
+    var dlcSizes by remember(app.id) { mutableStateOf<Map<Int, GOGManifestSizes>>(emptyMap()) }
+    var customPath by remember { mutableStateOf<String?>(null) }
+    var showCustomPathWarning by remember { mutableStateOf(false) }
+    var dlcApps by remember(app.id) { mutableStateOf<List<GOGDlcInfo>>(emptyList()) }
+    val selectedDlcIds = remember(app.id) { mutableStateListOf<Int>() }
+    var isCheckingForGogUpdate by remember(app.id) { mutableStateOf(false) }
+    var gogUpdateInfo by remember(app.id) { mutableStateOf<GOGUpdateInfo?>(null) }
+    var gogUpdateStatusText by remember(app.id) { mutableStateOf<String?>(null) }
+    val gogDownloadRecords by com.winlator.cmod.app.service.download.DownloadCoordinator.records.collectAsState(
+        initial = com.winlator.cmod.app.service.download.DownloadCoordinator.snapshotRecords(),
+    )
+    val hasBlockingGogDownload =
+        gogDownloadRecords.any {
+            it.store == com.winlator.cmod.app.db.download.DownloadRecord.STORE_GOG &&
+                it.storeGameId == app.id &&
+                it.status in setOf(
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_QUEUED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_DOWNLOADING,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_PAUSED,
+                    com.winlator.cmod.app.db.download.DownloadRecord.STATUS_FAILED,
+                )
+        }
+    val gogUpdateActionEnabled = !hasBlockingGogDownload
+    val activeGogDownloadText = stringResource(R.string.store_game_download_already_active)
+    val gogNoUpdateAvailableText = stringResource(R.string.store_game_no_update_available)
+    val gogUpdateAvailableText = stringResource(R.string.store_game_update_available)
+    val gogUpdateFailedText = stringResource(R.string.store_game_update_check_failed)
+
+    if (showCustomPathWarning) {
+        CustomPathWarningDialog(
+            onDismiss = { showCustomPathWarning = false },
+            onProceed = {
+                showCustomPathWarning = false
+                DirectoryPickerDialog.show(
+                    activity = this@GOGGameManagerDialog,
+                    initialPath = customPath ?: GOGConstants.defaultGOGGamesPath,
+                    title = getString(R.string.settings_content_install_directory),
+                    extraRoots = driveRoots(includeInternal = true),
+                ) { path -> customPath = path }
+            },
+        )
+    }
+
+    data class GogInstallLoadData(
+        val dlcs: List<GOGDlcInfo>,
+        val dlcSizes: Map<Int, GOGManifestSizes>,
+        val baseManifestSizes: GOGManifestSizes,
+    )
+
+    LaunchedEffect(app.id, PrefManager.containerLanguage) {
+        isLoading = true
+        val loadData =
+            withContext(Dispatchers.IO) {
+                val dlcs = GOGService.getDLCForGameSuspend(app.id, PrefManager.containerLanguage)
+                val perDlcSizes =
+                    dlcs.mapNotNull { dlc ->
+                        val id = dlc.id.toIntOrNull() ?: return@mapNotNull null
+                        id to
+                            GOGManifestSizes(
+                                installSize = dlc.installSize,
+                                downloadSize = dlc.downloadSize,
+                            )
+                    }.toMap()
+                GogInstallLoadData(
+                    dlcs = dlcs,
+                    dlcSizes = perDlcSizes,
+                    baseManifestSizes =
+                        GOGService.getInstallableSelectedManifestSizes(
+                            app.id,
+                            PrefManager.containerLanguage,
+                        ),
+                )
+            }
+        dlcApps = loadData.dlcs
+        dlcSizes = loadData.dlcSizes
+        selectedManifestSizes = loadData.baseManifestSizes
+        selectedDlcIds.clear()
+        loadData.dlcs
+            .filterNot { it.isInstalled }
+            .mapNotNull { it.id.toIntOrNull() }
+            .forEach { selectedDlcIds.add(it) }
+        isLoading = false
+    }
+
+    LaunchedEffect(app.id, PrefManager.containerLanguage, selectedDlcIds.toList()) {
+        selectedManifestSizes =
+            withContext(Dispatchers.IO) {
+                GOGService.getInstallableSelectedManifestSizes(
+                    app.id,
+                    PrefManager.containerLanguage,
+                    selectedDlcIds.toList(),
+                )
+            }
+    }
+
+    val defaultPathSet =
+        if (PrefManager.useSingleDownloadFolder) {
+            PrefManager.defaultDownloadFolder.isNotEmpty()
+        } else {
+            PrefManager.gogDownloadFolder
+                .isNotEmpty()
+        }
+    val installRootPath = customPath ?: GOGConstants.defaultGOGGamesPath
+    val installPathDisplay =
+        if (installed) {
+            app.installPath
+        } else if (customPath != null) {
+            java.io.File(customPath!!, GOGConstants.getSanitizedGameFolderName(app.title)).absolutePath
+        } else {
+            GOGConstants.getGameInstallPath(app.title)
+        }
+    val dlcItems =
+        remember(dlcApps, dlcSizes) {
+            dlcApps.mapNotNull { dlc ->
+                val id = dlc.id.toIntOrNull() ?: return@mapNotNull null
+                val manifestSize = dlcSizes[id]
+                val size =
+                    manifestSize
+                        ?.downloadSize
+                        ?.takeIf { it > 0L }
+                        ?: manifestSize?.installSize?.takeIf { it > 0L }
+                        ?: dlc.downloadSize.takeIf { it > 0L }
+                        ?: dlc.installSize
+                StoreDlcItem(id = id, name = dlc.title, downloadSize = size, isInstalled = dlc.isInstalled)
+            }
+        }
+    val selectedDlcDownloadSize =
+        remember(dlcItems, selectedDlcIds.toList()) {
+            dlcItems
+                .filter { !it.isInstalled && it.id in selectedDlcIds }
+                .sumOf { it.downloadSize.coerceAtLeast(0L) }
+        }
+    val selectedDlcInstallSize =
+        remember(dlcSizes, dlcItems, selectedDlcIds.toList()) {
+            dlcItems
+                .filter { !it.isInstalled && it.id in selectedDlcIds }
+                .sumOf { dlcSizes[it.id]?.installSize?.takeIf { size -> size > 0L } ?: it.downloadSize.coerceAtLeast(0L) }
+        }
+    val totalDownloadSize =
+        if (installed) {
+            selectedDlcDownloadSize
+        } else {
+            selectedManifestSizes.downloadSize.takeIf { it > 0L }
+                ?: app.downloadSize + selectedDlcDownloadSize
+        }
+    val totalInstallSize =
+        if (installed) {
+            selectedDlcInstallSize
+        } else {
+            selectedManifestSizes.installSize.takeIf { it > 0L }
+                ?: app.installSize.takeIf { it > 0L }
+                ?: totalDownloadSize
+        }
+    val requiredBytes =
+        if (installed) {
+            selectedDlcInstallSize.takeIf { it > 0L } ?: selectedDlcDownloadSize
+        } else {
+            totalInstallSize.takeIf { it > 0L } ?: totalDownloadSize
+        }
+    val availableBytes =
+        try {
+            StorageUtils.getAvailableSpace(installRootPath)
+        } catch (_: Exception) {
+            0L
+        }
+    val isInstallEnabled = requiredBytes == 0L || availableBytes >= requiredBytes
+    val installActionEnabled = isInstallEnabled && !hasBlockingGogDownload
+    val customPathLabel =
+        when {
+            customPath != null -> stringResource(R.string.common_ui_custom)
+            defaultPathSet -> stringResource(R.string.common_ui_already_set)
+            else -> stringResource(R.string.common_ui_custom)
+        }
+
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            shape = RectangleShape,
+            color = Color.Black,
+        ) {
+            StoreGameDetailScreen(
+                title = app.title,
+                subtitle =
+                    listOfNotNull(
+                        app.developer.takeIf { it.isNotBlank() },
+                        app.publisher.takeIf {
+                            it.isNotBlank() && !it.equals(app.developer, ignoreCase = true)
+                        },
+                    ).joinToString(" • "),
+                sourceLabel = "GOG",
+                heroImageUrl = StoreArtworkCache.imageModel(context, StoreArtworkCache.gogHeroRef(app)),
+                isLoading = isLoading,
+                isInstalled = installed,
+                installPathDisplay = installPathDisplay,
+                downloadSize = totalDownloadSize,
+                installSize = totalInstallSize,
+                availableBytes = availableBytes,
+                isInstallEnabled = isInstallEnabled,
+                isDownloadActionEnabled = installActionEnabled,
+                customPathLabel = customPathLabel,
+                showCustomPath = true,
+                showCloudSync = false,
+                showUninstall = false,
+                showUpdateCheck = installed,
+                isCheckingForUpdate = isCheckingForGogUpdate,
+                isUpdateAvailable = gogUpdateInfo?.hasUpdate == true,
+                updateDownloadSize = gogUpdateInfo?.downloadSize ?: 0L,
+                updateStatusText = gogUpdateStatusText,
+                isUpdateActionEnabled = gogUpdateActionEnabled,
+                showVerifyFiles = installed,
+                areSteamActionsEnabled = !hasBlockingGogDownload,
+                dlcs = dlcItems,
+                selectedDlcIds = selectedDlcIds.toSet(),
+                isDlcSelectionEnabled = installActionEnabled,
+                onBack = onDismissRequest,
+                onInstall = {
+                    if (hasBlockingGogDownload) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            getString(R.string.store_game_download_already_active),
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        GOGService.downloadGame(
+                            context,
+                            app.id,
+                            installPathDisplay,
+                            PrefManager.containerLanguage,
+                            selectedDlcIds.toList(),
+                        )
+                        onDismissRequest()
+                    }
+                },
+                onCloudSync = {
+                    scope.launch(Dispatchers.IO) {
+                        GOGService.syncCloudSaves(context, "GOG_${app.id}", "auto")
+                    }
+                    onDismissRequest()
+                    com.winlator.cmod.shared.ui.toast.WinToast.show(
+                        context,
+                        context.getString(R.string.google_cloud_sync_started),
+                        android.widget.Toast.LENGTH_SHORT,
+                    )
+                },
+                onVerifyFiles = {
+                    if (hasBlockingGogDownload) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeGogDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            val started =
+                                withContext(Dispatchers.IO) {
+                                    GOGService.verifyGameFiles(context, app.id)
+                                }
+                            if (started != null) {
+                                showTaskProgressPopup(
+                                    started,
+                                    app.title,
+                                    getString(R.string.store_game_verify_complete),
+                                    getString(R.string.store_game_verify_failed_notice),
+                                    completeAsToast = true,
+                                )
+                            } else {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    activeGogDownloadText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    }
+                },
+                onCheckForUpdate = {
+                    if (hasBlockingGogDownload) {
+                        com.winlator.cmod.shared.ui.toast.WinToast.show(
+                            context,
+                            activeGogDownloadText,
+                            android.widget.Toast.LENGTH_SHORT,
+                        )
+                        return@StoreGameDetailScreen
+                    }
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            isCheckingForGogUpdate = true
+                            gogUpdateStatusText = null
+                            val latest =
+                                withContext(Dispatchers.IO) {
+                                    GOGService.checkForGameUpdate(context, app.id)
+                                }
+                            gogUpdateInfo = latest
+                            gogUpdateStatusText =
+                                when {
+                                    latest.hasUpdate -> gogUpdateAvailableText
+                                    latest.message != null -> gogUpdateFailedText
+                                    else -> null
+                                }
+                            isCheckingForGogUpdate = false
+                            if (!latest.hasUpdate && latest.message == null) {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    gogNoUpdateAvailableText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    }
+                },
+                onDownloadUpdate = {
+                    if (!gogUpdateActionEnabled || gogUpdateInfo?.hasUpdate != true) return@StoreGameDetailScreen
+                    context.runIfOnlineOrToast {
+                        scope.launch {
+                            val started =
+                                withContext(Dispatchers.IO) {
+                                    GOGService.updateGameFiles(context, app.id)
+                                }
+                            if (started != null) {
+                                onDismissRequest()
+                            } else {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    activeGogDownloadText,
+                                    android.widget.Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    }
+                },
+                onUninstall = {
+                    scope.launch(Dispatchers.IO) {
+                        val result =
+                            GOGService.deleteGame(
+                                context,
+                                LibraryItem(
+                                    "GOG_${app.id}",
+                                    app.title,
+                                    com.winlator.cmod.feature.stores.steam.enums.GameSource.GOG,
+                                ),
+                            )
+                        withContext(Dispatchers.Main) {
+                            if (!result.isSuccess) {
+                                com.winlator.cmod.shared.ui.toast.WinToast.show(
+                                    context,
+                                    getString(
+                                        R.string.library_games_failed_to_uninstall_reason,
+                                        result.exceptionOrNull()?.message
+                                            ?: getString(R.string.common_ui_unknown_error),
+                                    ),
+                                    android.widget.Toast.LENGTH_LONG,
+                                )
+                            }
+                            onDismissRequest()
+                        }
+                    }
+                },
+                onCustomPath = {
+                    if (customPath == null && defaultPathSet) {
+                        showCustomPathWarning = true
+                    } else {
+                        DirectoryPickerDialog.show(
+                            activity = this@GOGGameManagerDialog,
+                            initialPath = customPath ?: GOGConstants.defaultGOGGamesPath,
+                            title = getString(R.string.settings_content_install_directory),
+                            extraRoots = driveRoots(includeInternal = true),
+                        ) { path -> customPath = path }
+                    }
+                },
+                onToggleDlc = { id ->
+                    if (dlcItems.any { it.id == id && it.isInstalled }) {
+                        return@StoreGameDetailScreen
+                    }
+                    if (selectedDlcIds.contains(id)) {
+                        selectedDlcIds.remove(id)
+                    } else {
+                        selectedDlcIds.add(id)
+                    }
+                },
+                onToggleSelectAllDlcs = {
+                    val selectableDlcItems = dlcItems.filterNot { it.isInstalled }
+                    val all = selectableDlcItems.isNotEmpty() && selectableDlcItems.all { it.id in selectedDlcIds }
+                    if (all) {
+                        selectedDlcIds.removeAll(selectableDlcItems.map { it.id }.toSet())
+                    } else {
+                        selectableDlcItems.forEach { if (it.id !in selectedDlcIds) selectedDlcIds.add(it.id) }
+                    }
+                },
+            )
+        }
+    }
+}
+
+// Steam Store Tab
+@Composable
+internal fun UnifiedActivity.SteamStoreTab(
+    isLoggedIn: Boolean,
+    steamApps: List<SteamApp>,
+    searchQuery: String = "",
+    layoutMode: LibraryLayoutMode = LibraryLayoutMode.GRID_4,
+) {
+    if (!isLoggedIn && !SteamService.hasStoredCredentials(this)) {
+        LoginRequiredScreen("Steam") {
+            startActivity(Intent(this@SteamStoreTab, SteamLoginActivity::class.java))
+        }
+        return
+    }
+
+    var selectedAppForDialog by remember { mutableStateOf<SteamApp?>(null) }
+    val gridState = rememberLazyGridState()
+    val activity = LocalContext.current as? UnifiedActivity
+
+    val displayedApps =
+        remember(steamApps, searchQuery) {
+            if (searchQuery.isBlank()) {
+                steamApps
+            } else {
+                steamApps.filter { it.name.contains(searchQuery, ignoreCase = true) }
+            }
+        }
+    val installStateById = rememberSteamInstallStateMap(displayedApps)
+
+    // Sync store focus infrastructure
+    LaunchedEffect(displayedApps.size) {
+        activity?.storeItemCount = displayedApps.size
+        val lastIndex = (displayedApps.size - 1).coerceAtLeast(0)
+        if (activity != null && displayedApps.isNotEmpty() && activity.storeFocusIndex.value > lastIndex) {
+            activity.storeFocusIndex.value = lastIndex
+        }
+    }
+    // Register A-button click callback and grid state for visible-area snapping
+    DisposableEffect(displayedApps) {
+        val clickCallback: (Int) -> Unit = { idx ->
+            displayedApps.getOrNull(idx)?.let { selectedAppForDialog = it }
+        }
+        activity?.storeItemClickCallback = clickCallback
+        activity?.storeGridState = gridState
+        onDispose {
+            if (activity?.storeItemClickCallback === clickCallback) {
+                activity?.storeItemClickCallback = null
+                activity?.storeGridState = null
+            }
+        }
+    }
+
+    if (layoutMode == LibraryLayoutMode.LIST) {
+        val listViewState = rememberLazyListState()
+        JoystickListScroll(listViewState, activity?.rightStickScrollState, minSpeed = 2.5f, maxSpeed = 16f, quadratic = true)
+        ListView(
+            items = displayedApps,
+            modifier = Modifier.tabScreenPadding(),
+            listState = listViewState,
+            contentPadding = TabListContentPadding,
+            keyOf = { it.id },
+        ) { app, _, _ ->
+            SteamStoreCapsule(
+                app,
+                isInstalled = installStateById[app.id] == true,
+                listMode = true,
+                isControllerActive = ControllerHelper.isControllerConnected(),
+                onClick = {
+                    selectedAppForDialog =
+                        app
+                },
+            )
+        }
+    } else {
+        val focusIndex by (activity?.storeFocusIndex ?: kotlinx.coroutines.flow.MutableStateFlow(0)).collectAsState()
+        val focusRequesters =
+            remember(displayedApps.size) {
+                List(displayedApps.size) { FocusRequester() }
+            }
+        LaunchedEffect(focusIndex, focusRequesters.size) {
+            if (searchQuery.isEmpty() && focusRequesters.isNotEmpty() && focusIndex in focusRequesters.indices) {
+                gridState.animateScrollToItem(focusIndex)
+                try {
+                    focusRequesters[focusIndex].requestFocus()
+                } catch (_: Exception) {
+                }
+            }
+        }
+        // Right joystick: 2x faster at full push with quadratic speed curve
+        JoystickGridScroll(gridState, activity?.rightStickScrollState, minSpeed = 2.5f, maxSpeed = 16f, quadratic = true)
+        // Left joystick: 75% slower scrolling (vertical only, for browsing store)
+        JoystickGridScroll(gridState, activity?.leftStickScrollState, deadZone = 0.15f, minSpeed = 0.3125f, maxSpeed = 2f)
+        FourByTwoGridView(
+            items = displayedApps,
+            modifier = Modifier.tabScreenPadding(top = TabGridTopPadding),
+            gridState = gridState,
+            keyOf = { it.id },
+        ) { app, index, rowHeight ->
+            Box(
+                Modifier.height(rowHeight).then(
+                    if (index in focusRequesters.indices) {
+                        Modifier.focusRequester(focusRequesters[index])
+                    } else {
+                        Modifier
+                    },
+                ),
+            ) {
+                SteamStoreCapsule(
+                    app,
+                    isInstalled = installStateById[app.id] == true,
+                    isFocusedOverride = index == focusIndex,
+                    isControllerActive =
+                        ControllerHelper
+                            .isControllerConnected(),
+                    onClick = {
+                        selectedAppForDialog =
+                            app
+                    },
+                )
+            }
+        }
+    }
+
+    if (selectedAppForDialog != null) {
+        GameManagerDialog(
+            app = selectedAppForDialog!!,
+            onDismissRequest = { selectedAppForDialog = null },
+        )
+    }
+}
+
+@Composable
+internal fun UnifiedActivity.SteamStoreCapsule(
+    app: SteamApp,
+    isInstalled: Boolean,
+    listMode: Boolean = false,
+    isFocusedOverride: Boolean = false,
+    isControllerActive: Boolean = false,
+    onClick: () -> Unit,
+) {
+    val context = LocalContext.current
+    var isFocused by remember { mutableStateOf(false) }
+    val clickInteraction = remember { MutableInteractionSource() }
+    val isPressed by clickInteraction.collectIsPressedAsState()
+    val glowAlpha by animateFloatAsState(
+        targetValue = if (isPressed) 0.7f else 0f,
+        animationSpec = if (isPressed) tween(100) else tween(400),
+        label = "steamCapsuleGlow",
+    )
+    val effectiveFocus = isControllerActive && (isFocusedOverride || isFocused)
+    val borderColor = if (isControllerActive) CardBorder else Color.Transparent
+
+    if (listMode) {
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(14.dp))
+                    .border(1.dp, borderColor, RoundedCornerShape(14.dp))
+                    .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 14.dp)
+                    .background(CardDark, RoundedCornerShape(14.dp))
+                    .onFocusChanged { isFocused = it.isFocused }
+                    .focusable()
+                    .then(
+                        if (glowAlpha > 0f) {
+                            Modifier.drawWithContent {
+                                drawContent()
+                                drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(14.dp.toPx()))
+                            }
+                        } else {
+                            Modifier
+                        },
+                    ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick),
+        ) {
+            // Hero background
+            AsyncImage(
+                model =
+                    ImageRequest
+                        .Builder(context)
+                        .data(app.getHeroUrl())
+                        .crossfade(300)
+                        .build(),
+                contentDescription = null,
+                modifier =
+                    Modifier
+                        .matchParentSize()
+                        .graphicsLayer { alpha = 0.25f },
+                contentScale = ContentScale.Crop,
+            )
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 14.dp, vertical = 11.dp),
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Box(
+                    Modifier
+                        .height(52.dp)
+                        .aspectRatio(462f / 174f)
+                        .clip(RoundedCornerShape(8.dp)),
+                ) {
+                    AsyncImage(
+                        model =
+                            ImageRequest
+                                .Builder(context)
+                                .data(app.getSmallCapsuleUrl())
+                                .crossfade(300)
+                                .build(),
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize(),
+                        contentScale = ContentScale.Crop,
+                    )
+                    if (isInstalled) {
+                        StoreInstalledBadge(
+                            modifier = Modifier.align(Alignment.BottomEnd).padding(4.dp),
+                            compact = true,
+                        )
+                    }
+                }
+                Spacer(Modifier.width(14.dp))
+                Text(
+                    text = app.name,
+                    modifier =
+                        Modifier
+                            .weight(1f)
+                            .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
+                    color = TextPrimary,
+                    fontSize = 15.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    } else {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .border(1.dp, borderColor, RoundedCornerShape(16.dp))
+                    .chasingBorder(isFocused = effectiveFocus, paused = chasingBordersPaused.value, cornerRadius = 16.dp)
+                    .background(CardDark, RoundedCornerShape(16.dp))
+                    .onFocusChanged { isFocused = it.isFocused }
+                    .focusable()
+                    .then(
+                        if (glowAlpha > 0f) {
+                            Modifier.drawWithContent {
+                                drawContent()
+                                drawRoundRect(color = AccentGlow, alpha = glowAlpha * 0.25f, cornerRadius = CornerRadius(16.dp.toPx()))
+                            }
+                        } else {
+                            Modifier
+                        },
+                    ).clickable(interactionSource = clickInteraction, indication = null, onClick = onClick),
+        ) {
+            Box(
+                Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+                    .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
+            ) {
+                val imageUrl = app.getCapsuleUrl()
+
+                AsyncImage(
+                    model =
+                        ImageRequest
+                            .Builder(context)
+                            .data(imageUrl)
+                            .crossfade(300)
+                            .build(),
+                    contentDescription = null,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Crop,
+                )
+
+                if (isInstalled) {
+                    StoreInstalledBadge(
+                        modifier = Modifier.align(Alignment.BottomEnd),
+                        attachedCorner = true,
+                    )
+                }
+            }
+
+            Text(
+                text = app.name,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 4.dp, vertical = 4.dp)
+                        .then(if (effectiveFocus) Modifier.basicMarquee(iterations = Int.MAX_VALUE) else Modifier),
+                style = MaterialTheme.typography.bodySmall,
+                color = TextPrimary,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
diff --git a/app/src/main/app/shell/UnifiedActivityUpdateChecks.kt b/app/src/main/app/shell/UnifiedActivityUpdateChecks.kt
new file mode 100644
index 000000000..e40519c0d
--- /dev/null
+++ b/app/src/main/app/shell/UnifiedActivityUpdateChecks.kt
@@ -0,0 +1,431 @@
+package com.winlator.cmod.app.shell
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.input.InputManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.*
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.zIndex
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusTarget
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.settings.InputControlsFragment
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsHost
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.feature.settings.SettingsNavItem
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.feature.shortcuts.ShortcutBroadcastReceiver
+import com.winlator.cmod.feature.shortcuts.ShortcutSettingsComposeDialog
+import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
+import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.stores.epic.service.EpicConstants
+import com.winlator.cmod.feature.stores.epic.service.EpicDownloadManager
+import com.winlator.cmod.feature.stores.epic.service.EpicGameLauncher
+import com.winlator.cmod.feature.stores.epic.service.EpicManager
+import com.winlator.cmod.feature.stores.epic.service.EpicService
+import com.winlator.cmod.feature.stores.epic.service.EpicUpdateInfo
+import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.gog.data.LibraryItem
+import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
+import com.winlator.cmod.feature.stores.gog.service.GOGConstants
+import com.winlator.cmod.feature.stores.gog.service.GOGManifestSizes
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.gog.service.GOGUpdateInfo
+import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
+import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.getAvatarURL
+import com.winlator.cmod.feature.sync.CloudSyncHelper
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.ui.CloudSavesContent
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.input.ControllerHelper
+import com.winlator.cmod.runtime.wine.PeIconExtractor
+import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.android.RefreshRateUtils
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.ui.CarouselView
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import androidx.compose.foundation.focusGroup
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.FourByTwoGridView
+import com.winlator.cmod.shared.ui.JoystickGridScroll
+import com.winlator.cmod.shared.ui.JoystickListScroll
+import com.winlator.cmod.shared.ui.ListView
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+// Task-progress popup + store update-check helpers, split out of UnifiedActivity.kt (behavior-identical).
+
+internal fun UnifiedActivity.showTaskProgressPopup(
+    info: DownloadInfo,
+    gameName: String,
+    completeMsg: String,
+    failedMsg: String,
+    completeAsToast: Boolean = false,
+) {
+    taskCheckingShown = false
+    taskProgressInfo = info
+    taskProgressGameName = gameName
+    taskProgressCompleteMsg = completeMsg
+    taskProgressFailedMsg = failedMsg
+    taskProgressCompleteAsToast = completeAsToast
+    taskProgressShown = true
+    taskDoneMessage = null
+}
+
+// Runs a Steam update check behind the checking pop-up.
+internal fun UnifiedActivity.startUpdateCheck(appId: Int, gameName: String) {
+    if (updateCheckInProgress) return
+    if (!com.winlator.cmod.app.service.NetworkMonitor.hasInternet.value) {
+        com.winlator.cmod.shared.ui.toast.WinToast.show(
+            this,
+            getString(R.string.downloads_no_internet),
+            android.widget.Toast.LENGTH_SHORT,
+        )
+        return
+    }
+    updateCheckInProgress = true
+    taskCheckingGameName = gameName
+    taskCheckingShown = true
+    taskDoneMessage = null
+    lifecycleScope.launch {
+        val result =
+            runCatching {
+                withContext(Dispatchers.IO) { SteamService.checkForAppUpdate(appId) }
+            }.getOrNull()
+        try {
+        when {
+            result == null || result.message != null -> {
+                taskCheckingShown = false
+                taskDoneFailed = true
+                taskDoneMessage = getString(R.string.store_game_update_check_failed_notice)
+            }
+            result.hasUpdate -> {
+                val started =
+                    withContext(Dispatchers.IO) {
+                        SteamService.downloadAppForUpdate(appId, result.depotIds)
+                    }
+                if (started != null) {
+                    showTaskProgressPopup(
+                        started,
+                        gameName,
+                        getString(R.string.store_game_update_complete),
+                        getString(R.string.store_game_update_failed_notice),
+                    )
+                } else {
+                    // A download is already running — downloadApp showed its toast.
+                    taskCheckingShown = false
+                }
+            }
+            else -> {
+                taskCheckingShown = false
+                taskDoneFailed = false
+                taskDoneMessage = getString(R.string.store_game_no_updates_notice)
+            }
+        }
+        } finally {
+            updateCheckInProgress = false
+        }
+    }
+}
+
+internal fun UnifiedActivity.startGogUpdateCheck(gameId: String, gameName: String) {
+    if (updateCheckInProgress) return
+    if (!com.winlator.cmod.app.service.NetworkMonitor.hasInternet.value) {
+        com.winlator.cmod.shared.ui.toast.WinToast.show(
+            this,
+            getString(R.string.downloads_no_internet),
+            android.widget.Toast.LENGTH_SHORT,
+        )
+        return
+    }
+    updateCheckInProgress = true
+    taskCheckingGameName = gameName
+    taskCheckingShown = true
+    taskDoneMessage = null
+    lifecycleScope.launch {
+        val result =
+            runCatching {
+                withContext(Dispatchers.IO) { GOGService.checkForGameUpdate(this@startGogUpdateCheck, gameId) }
+            }.getOrNull()
+        try {
+            when {
+                result == null || result.message != null -> {
+                    taskCheckingShown = false
+                    taskDoneFailed = true
+                    taskDoneMessage = getString(R.string.store_game_update_check_failed_notice)
+                }
+                result.hasUpdate -> {
+                    val started =
+                        withContext(Dispatchers.IO) {
+                            GOGService.updateGameFiles(this@startGogUpdateCheck, gameId)
+                        }
+                    if (started != null) {
+                        showTaskProgressPopup(
+                            started,
+                            gameName,
+                            getString(R.string.store_game_update_complete),
+                            getString(R.string.store_game_update_failed_notice),
+                        )
+                    } else {
+                        taskCheckingShown = false
+                    }
+                }
+                else -> {
+                    taskCheckingShown = false
+                    taskDoneFailed = false
+                    taskDoneMessage = getString(R.string.store_game_no_updates_notice)
+                }
+            }
+        } finally {
+            updateCheckInProgress = false
+        }
+    }
+}
+
+internal fun UnifiedActivity.startEpicUpdateCheck(appId: Int, gameName: String) {
+    if (updateCheckInProgress) return
+    if (!com.winlator.cmod.app.service.NetworkMonitor.hasInternet.value) {
+        com.winlator.cmod.shared.ui.toast.WinToast.show(
+            this,
+            getString(R.string.downloads_no_internet),
+            android.widget.Toast.LENGTH_SHORT,
+        )
+        return
+    }
+    updateCheckInProgress = true
+    taskCheckingGameName = gameName
+    taskCheckingShown = true
+    taskDoneMessage = null
+    lifecycleScope.launch {
+        val result =
+            runCatching {
+                withContext(Dispatchers.IO) { EpicService.checkForGameUpdate(this@startEpicUpdateCheck, appId) }
+            }.getOrNull()
+        try {
+            when {
+                result == null || result.message != null -> {
+                    taskCheckingShown = false
+                    taskDoneFailed = true
+                    taskDoneMessage = getString(R.string.store_game_update_check_failed_notice)
+                }
+                result.hasUpdate -> {
+                    val started =
+                        withContext(Dispatchers.IO) {
+                            EpicService.updateGameFiles(this@startEpicUpdateCheck, appId)
+                        }
+                    if (started != null) {
+                        showTaskProgressPopup(
+                            started,
+                            gameName,
+                            getString(R.string.store_game_update_complete),
+                            getString(R.string.store_game_update_failed_notice),
+                        )
+                    } else {
+                        taskCheckingShown = false
+                    }
+                }
+                else -> {
+                    taskCheckingShown = false
+                    taskDoneFailed = false
+                    taskDoneMessage = getString(R.string.store_game_no_updates_notice)
+                }
+            }
+        } finally {
+            updateCheckInProgress = false
+        }
+    }
+}
diff --git a/app/src/main/app/shell/WorkshopScreen.kt b/app/src/main/app/shell/WorkshopScreen.kt
new file mode 100644
index 000000000..ea52ccc5a
--- /dev/null
+++ b/app/src/main/app/shell/WorkshopScreen.kt
@@ -0,0 +1,646 @@
+package com.winlator.cmod.app.shell
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.Construction
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.Inventory2
+import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.outlined.SearchOff
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import coil.request.CachePolicy
+import coil.request.ImageRequest
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.io.StorageUtils
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import org.json.JSONArray
+
+/** A single Steam Workshop / UGC item surfaced in the Workshop browser. */
+internal data class StoreWorkshopItem(
+    val publishedFileId: Long,
+    val title: String,
+    val author: String,
+    val previewImageUrl: String?,
+    val fileSizeBytes: Long,
+    val manifestId: Long = 0L,
+    val timeUpdated: Long = 0L,
+    val isInstalled: Boolean = false,
+)
+
+/** Loading lifecycle for the Workshop browser. */
+internal enum class WorkshopLoadState { LOADING, READY, ERROR }
+
+// Palette — mirrors the per-game Settings dialog so the window feels native.
+private val WsBg = Color(0xFF12121B)
+private val WsBorder = Color(0xFF2A2A3A)
+private val WsInputBg = Color(0xFF171722)
+private val WsAccent = Color(0xFF1A9FFF)
+private val WsAccentGlow = Color(0xFF58A6FF)
+private val WsTextPrimary = Color(0xFFF0F4FF)
+private val WsTextSecondary = Color(0xFF93A6BC)
+private val WsTextDim = Color(0xFF6E7681)
+private val WsInstalledTitle = Color(0xFFB7F8CE)
+private val WsDanger = Color(0xFFFF6B6B)
+private val WsScrim = Color(0xFF000000)
+
+/**
+ * The Steam Workshop browser — a Settings-shaped modal window with a search
+ * field in the header and a scrollable list of subscribed Workshop items the
+ * user can install into the game's `steam_settings/mods` directory.
+ *
+ * Stateless: all data and callbacks are hoisted to the [WorkshopDialog] wrapper.
+ */
+@Composable
+internal fun StoreWorkshopScreen(
+    gameTitle: String,
+    loadState: WorkshopLoadState,
+    errorMessage: String?,
+    items: List<StoreWorkshopItem>,
+    query: String,
+    busyIds: Set<Long>,
+    onQueryChange: (String) -> Unit,
+    onInstall: (Long) -> Unit,
+    onUninstall: (Long) -> Unit,
+    onRetry: () -> Unit,
+    onClose: () -> Unit,
+) {
+    val registry = remember { PaneNavRegistry() }
+    CompositionLocalProvider(LocalPaneNav provides registry) {
+    DialogPaneNav(registry, onDismiss = onClose)
+    BoxWithConstraints(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                // Dim the game-detail screen behind so the modal reads as foreground.
+                .background(WsScrim.copy(alpha = 0.6f))
+                .windowInsetsPadding(WindowInsets.navigationBars),
+        contentAlignment = Alignment.Center,
+    ) {
+        val dialogWidth = (maxWidth - 32.dp).coerceAtMost(560.dp)
+        val dialogHeight = (maxHeight - 48.dp).coerceIn(360.dp, 640.dp)
+        Surface(
+            modifier =
+                Modifier
+                    .widthIn(min = 320.dp, max = dialogWidth)
+                    .fillMaxWidth()
+                    .height(dialogHeight),
+            shape = RoundedCornerShape(14.dp),
+            color = WsBg,
+            border = BorderStroke(1.dp, WsBorder),
+            tonalElevation = 8.dp,
+        ) {
+            Column(Modifier.fillMaxSize()) {
+                WorkshopHeader(
+                    gameTitle = gameTitle,
+                    itemCount = if (loadState == WorkshopLoadState.READY) items.size else null,
+                    onClose = onClose,
+                )
+                HorizontalDivider(color = WsBorder, thickness = 0.5.dp)
+                WorkshopSearchBar(
+                    query = query,
+                    enabled = loadState == WorkshopLoadState.READY,
+                    onQueryChange = onQueryChange,
+                )
+                HorizontalDivider(color = WsBorder, thickness = 0.5.dp)
+                Box(Modifier.fillMaxWidth().weight(1f)) {
+                    when (loadState) {
+                        WorkshopLoadState.LOADING ->
+                            WorkshopStatus(
+                                icon = null,
+                                title = stringResource(R.string.workshop_loading_items),
+                                subtitle = stringResource(R.string.workshop_loading_subtitle),
+                            )
+                        WorkshopLoadState.ERROR ->
+                            WorkshopStatus(
+                                icon = Icons.Outlined.Refresh,
+                                title = stringResource(R.string.workshop_error_title),
+                                subtitle = errorMessage ?: stringResource(R.string.workshop_error_subtitle),
+                                actionLabel = stringResource(R.string.session_drawer_retry),
+                                onAction = onRetry,
+                            )
+                        WorkshopLoadState.READY ->
+                            if (items.isEmpty()) {
+                                WorkshopStatus(
+                                    icon = if (query.isBlank()) Icons.Outlined.Inventory2 else Icons.Outlined.SearchOff,
+                                    title =
+                                        if (query.isBlank()) {
+                                            stringResource(R.string.workshop_empty_title)
+                                        } else {
+                                            stringResource(R.string.workshop_search_empty_title, query)
+                                        },
+                                    subtitle =
+                                        if (query.isBlank()) {
+                                            stringResource(R.string.workshop_empty_subtitle)
+                                        } else {
+                                            stringResource(R.string.workshop_search_empty_subtitle)
+                                        },
+                                )
+                            } else {
+                                WorkshopList(
+                                    items = items,
+                                    busyIds = busyIds,
+                                    onInstall = onInstall,
+                                    onUninstall = onUninstall,
+                                )
+                            }
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun WorkshopHeader(
+    gameTitle: String,
+    itemCount: Int?,
+    onClose: () -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = 10.dp, bottom = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        Box(
+            Modifier
+                .size(34.dp)
+                .clip(RoundedCornerShape(9.dp))
+                .background(WsAccent.copy(alpha = 0.16f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                Icons.Outlined.Construction,
+                contentDescription = null,
+                tint = WsAccentGlow,
+                modifier = Modifier.size(19.dp),
+            )
+        }
+        Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(1.dp)) {
+            Text(
+                stringResource(R.string.workshop_title),
+                color = WsTextSecondary,
+                fontSize = 9.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 0.9.sp,
+            )
+            Text(
+                gameTitle,
+                style = MaterialTheme.typography.titleSmall,
+                color = WsTextPrimary,
+                fontWeight = FontWeight.Bold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        if (itemCount != null) {
+            Surface(
+                modifier =
+                    Modifier.semantics {
+                        contentDescription = "$itemCount Workshop items"
+                    },
+                color = WsAccent.copy(alpha = 0.14f),
+                shape = RoundedCornerShape(7.dp),
+            ) {
+                Text(
+                    itemCount.toString(),
+                    color = WsAccentGlow,
+                    fontSize = 11.sp,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(horizontal = 9.dp, vertical = 3.dp),
+                )
+            }
+        }
+        IconButton(onClick = onClose, modifier = Modifier.size(36.dp).paneNavItem(onActivate = onClose)) {
+            Icon(
+                Icons.Outlined.Close,
+                contentDescription = stringResource(R.string.common_ui_close),
+                tint = WsTextSecondary,
+                modifier = Modifier.size(20.dp),
+            )
+        }
+    }
+}
+
+@Composable
+private fun WorkshopSearchBar(
+    query: String,
+    enabled: Boolean,
+    onQueryChange: (String) -> Unit,
+) {
+    val keyboard = LocalSoftwareKeyboardController.current
+    val fieldFocus = remember { FocusRequester() }
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 12.dp, vertical = 8.dp)
+                .paneNavItem(cornerRadius = 9.dp, onActivate = { runCatching { fieldFocus.requestFocus() } })
+                .clip(RoundedCornerShape(9.dp))
+                .background(WsInputBg)
+                .border(1.dp, WsBorder, RoundedCornerShape(9.dp))
+                .padding(horizontal = 11.dp, vertical = 9.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(9.dp),
+    ) {
+        Icon(
+            Icons.Outlined.Search,
+            contentDescription = null,
+            tint = if (enabled) WsAccent else WsTextDim,
+            modifier = Modifier.size(18.dp),
+        )
+        Box(Modifier.weight(1f), contentAlignment = Alignment.CenterStart) {
+            if (query.isEmpty()) {
+                Text(
+                    stringResource(R.string.workshop_search_items),
+                    color = WsTextDim,
+                    fontSize = 13.sp,
+                )
+            }
+            BasicTextField(
+                value = query,
+                onValueChange = onQueryChange,
+                enabled = enabled,
+                singleLine = true,
+                textStyle = TextStyle(color = WsTextPrimary, fontSize = 13.sp),
+                cursorBrush = Brush.verticalGradient(listOf(WsAccent, WsAccentGlow)),
+                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+                keyboardActions = KeyboardActions(onSearch = { keyboard?.hide() }),
+                modifier = Modifier.fillMaxWidth().focusRequester(fieldFocus),
+            )
+        }
+        if (query.isNotEmpty()) {
+            Box(
+                modifier =
+                    Modifier
+                        .size(34.dp)
+                        .clip(CircleShape)
+                        .clickable { onQueryChange("") },
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    Icons.Outlined.Close,
+                    contentDescription = stringResource(R.string.workshop_clear_search),
+                    tint = WsTextSecondary,
+                    modifier = Modifier.size(18.dp),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun WorkshopList(
+    items: List<StoreWorkshopItem>,
+    busyIds: Set<Long>,
+    onInstall: (Long) -> Unit,
+    onUninstall: (Long) -> Unit,
+) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = 4.dp),
+    ) {
+        items.forEach { item ->
+            WorkshopItemRow(
+                item = item,
+                busy = item.publishedFileId in busyIds,
+                onInstall = { onInstall(item.publishedFileId) },
+                onUninstall = { onUninstall(item.publishedFileId) },
+            )
+            HorizontalDivider(
+                color = Color.White.copy(alpha = 0.06f),
+                thickness = 1.dp,
+                modifier = Modifier.padding(horizontal = 14.dp),
+            )
+        }
+    }
+}
+
+@Composable
+private fun WorkshopItemRow(
+    item: StoreWorkshopItem,
+    busy: Boolean,
+    onInstall: () -> Unit,
+    onUninstall: () -> Unit,
+) {
+    val context = LocalContext.current
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 9.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(11.dp),
+    ) {
+        Box(
+            Modifier
+                .size(width = 66.dp, height = 42.dp)
+                .clip(RoundedCornerShape(7.dp))
+                .background(WsInputBg)
+                .border(1.dp, WsBorder, RoundedCornerShape(7.dp)),
+            contentAlignment = Alignment.Center,
+        ) {
+            if (!item.previewImageUrl.isNullOrBlank()) {
+                val request =
+                    ImageRequest
+                        .Builder(context)
+                        .data(item.previewImageUrl)
+                        .crossfade(120)
+                        .memoryCachePolicy(CachePolicy.ENABLED)
+                        .diskCachePolicy(CachePolicy.ENABLED)
+                        .build()
+                AsyncImage(
+                    model = request,
+                    contentDescription = null,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Crop,
+                )
+            } else {
+                Icon(
+                    Icons.Outlined.Construction,
+                    contentDescription = null,
+                    tint = WsTextDim,
+                    modifier = Modifier.size(20.dp),
+                )
+            }
+        }
+        Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) {
+            Text(
+                item.title,
+                color = if (item.isInstalled) WsInstalledTitle else WsTextPrimary,
+                fontSize = 13.sp,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+            val itemFallback = stringResource(R.string.workshop_item_fallback)
+            Text(
+                buildString {
+                    if (item.author.isNotBlank()) append(item.author)
+                    if (item.fileSizeBytes > 0L) {
+                        if (isNotEmpty()) append("  ·  ")
+                        append(StorageUtils.formatBinarySize(item.fileSizeBytes))
+                    }
+                    if (isEmpty()) append(itemFallback)
+                },
+                color = WsTextSecondary,
+                fontSize = 11.sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        WorkshopRowAction(
+            isInstalled = item.isInstalled,
+            busy = busy,
+            onInstall = onInstall,
+            onUninstall = onUninstall,
+        )
+    }
+}
+
+@Composable
+private fun WorkshopRowAction(
+    isInstalled: Boolean,
+    busy: Boolean,
+    onInstall: () -> Unit,
+    onUninstall: () -> Unit,
+) {
+    when {
+        busy ->
+            CircularProgressIndicator(
+                modifier = Modifier.size(20.dp),
+                color = WsAccentGlow,
+                strokeWidth = 2.dp,
+            )
+        isInstalled ->
+            WorkshopActionPill(
+                icon = Icons.Outlined.Delete,
+                label = stringResource(R.string.common_ui_uninstall),
+                tint = WsDanger,
+                onClick = onUninstall,
+            )
+        else ->
+            WorkshopActionPill(
+                icon = Icons.Outlined.Download,
+                label = stringResource(R.string.common_ui_install),
+                tint = WsAccentGlow,
+                onClick = onInstall,
+            )
+    }
+}
+
+/** Compact pill action used for a Workshop row's Install / Uninstall button. */
+@Composable
+private fun WorkshopActionPill(
+    icon: ImageVector,
+    label: String,
+    tint: Color,
+    onClick: () -> Unit,
+) {
+    // Outer Box keeps the touch target >= 44dp tall while the pill stays compact.
+    Box(
+        modifier =
+            Modifier
+                .heightIn(min = 44.dp)
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, tapToSelect = true)
+                .clip(RoundedCornerShape(8.dp))
+                .clickable(onClick = onClick),
+        contentAlignment = Alignment.Center,
+    ) {
+        Surface(
+            color = tint.copy(alpha = 0.16f),
+            shape = RoundedCornerShape(8.dp),
+            border = BorderStroke(1.dp, tint.copy(alpha = 0.4f)),
+        ) {
+            Row(
+                modifier = Modifier.padding(horizontal = 11.dp, vertical = 7.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(5.dp),
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    tint = tint,
+                    modifier = Modifier.size(15.dp),
+                )
+                Text(
+                    label,
+                    color = tint,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Bold,
+                )
+            }
+        }
+    }
+}
+
+/**
+ * Parse the JSON array returned by `WnSteamSession.getSubscribedWorkshopItems`
+ * (objects keyed publishedFileId / title / previewUrl / fileSizeBytes / ) into
+ * the browser's [StoreWorkshopItem] model. [installedIds] marks which items
+ * already have content staged on disk. Returns an empty list on malformed JSON.
+ */
+internal fun parseWorkshopItemsJson(
+    json: String,
+    installedIds: Set<Long> = emptySet(),
+): List<StoreWorkshopItem> {
+    val arr =
+        try {
+            JSONArray(json.trim())
+        } catch (e: Exception) {
+            return emptyList()
+        }
+    val out = ArrayList<StoreWorkshopItem>(arr.length())
+    for (i in 0 until arr.length()) {
+        val o = arr.optJSONObject(i) ?: continue
+        val id = o.optLong("publishedFileId", 0L)
+        if (id == 0L) continue
+        out.add(
+            StoreWorkshopItem(
+                publishedFileId = id,
+                title = o.optString("title").ifBlank { id.toString() },
+                author = "",
+                previewImageUrl = o.optString("previewUrl").takeIf { it.isNotBlank() },
+                fileSizeBytes = o.optLong("fileSizeBytes", 0L),
+                manifestId = o.optLong("hcontentFile", 0L),
+                timeUpdated = o.optLong("timeUpdated", 0L),
+                isInstalled = id in installedIds,
+            ),
+        )
+    }
+    return out
+}
+
+@Composable
+private fun WorkshopStatus(
+    icon: ImageVector?,
+    title: String,
+    subtitle: String,
+    actionLabel: String? = null,
+    onAction: (() -> Unit)? = null,
+) {
+    Column(
+        modifier = Modifier.fillMaxSize().padding(32.dp),
+        verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        if (icon != null) {
+            Icon(
+                icon,
+                contentDescription = null,
+                tint = WsTextDim,
+                modifier = Modifier.size(44.dp),
+            )
+        } else {
+            CircularProgressIndicator(
+                modifier = Modifier.size(34.dp),
+                color = WsAccent,
+                strokeWidth = 3.dp,
+            )
+        }
+        Text(
+            title,
+            color = WsTextPrimary,
+            fontSize = 14.sp,
+            fontWeight = FontWeight.Bold,
+            textAlign = androidx.compose.ui.text.style.TextAlign.Center,
+        )
+        Text(
+            subtitle,
+            color = WsTextSecondary,
+            fontSize = 12.sp,
+            textAlign = androidx.compose.ui.text.style.TextAlign.Center,
+        )
+        if (actionLabel != null && onAction != null) {
+            Spacer(Modifier.height(2.dp))
+            Surface(
+                modifier = Modifier.paneNavItem(onActivate = onAction, tapToSelect = true).clip(RoundedCornerShape(8.dp)).clickable(onClick = onAction),
+                color = WsAccent.copy(alpha = 0.16f),
+                shape = RoundedCornerShape(8.dp),
+                border = BorderStroke(1.dp, WsAccentGlow.copy(alpha = 0.4f)),
+            ) {
+                Row(
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 9.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
+                ) {
+                    Icon(
+                        Icons.Outlined.Refresh,
+                        contentDescription = null,
+                        tint = WsAccentGlow,
+                        modifier = Modifier.size(16.dp),
+                    )
+                    Text(
+                        actionLabel,
+                        color = WsAccentGlow,
+                        fontSize = 13.sp,
+                        fontWeight = FontWeight.Bold,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/app/update/UpdateChecker.kt b/app/src/main/app/update/UpdateChecker.kt
index f2246a77b..f5423af44 100644
--- a/app/src/main/app/update/UpdateChecker.kt
+++ b/app/src/main/app/update/UpdateChecker.kt
@@ -39,21 +39,17 @@ object UpdateChecker {
     private const val PREF_INSTALL_TIMESTAMP = "app_install_timestamp"
     private const val PREF_LAST_UPDATE_CHECK = "last_update_check_time"
 
-    private const val CHECK_INTERVAL_MS = 60 * 60 * 1000L // 1 hour
-    private const val MANUAL_CHECK_COOLDOWN_MS = 30 * 1000L // 30 seconds
-    private const val POST_GAME_CHECK_DELAY_MS = 10 * 1000L // 10 seconds
+    private const val CHECK_INTERVAL_MS = 60 * 60 * 1000L
+    private const val MANUAL_CHECK_COOLDOWN_MS = 30 * 1000L
+    private const val POST_GAME_CHECK_DELAY_MS = 10 * 1000L
 
-    /** Tracks the last manual check time for 30s cooldown. */
     private val lastManualCheckTime = AtomicLong(0L)
 
-    /** Prevents overlapping background checks. */
     private val isChecking = AtomicBoolean(false)
 
-    /** Background handler for periodic checks. */
     private var backgroundHandler: Handler? = null
     private var backgroundRunnable: Runnable? = null
 
-    /** Post-game exit handler. */
     private var postGameHandler: Handler? = null
     private var postGameRunnable: Runnable? = null
 
@@ -67,20 +63,12 @@ object UpdateChecker {
 
     private val mainHandler = Handler(Looper.getMainLooper())
 
-    // ── Public API ────────────────────────────────────────────────────
-
-    /**
-     * Returns true if the user has the "Check for Updates" toggle enabled.
-     */
     fun isEnabled(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         return prefs.getBoolean(PREF_CHECK_FOR_UPDATES, false)
     }
 
-    /**
-     * Records the app install/update timestamp from PackageManager.
-     * Should be called once during Application.onCreate().
-     */
+    // Record the app install/update timestamp from PackageManager.
     fun refreshInstallTimestamp(context: Context) {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         try {
@@ -94,19 +82,13 @@ object UpdateChecker {
         }
     }
 
-    /**
-     * Returns true if enough time has passed since the last check.
-     */
     fun isDueForCheck(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         val lastCheck = prefs.getLong(PREF_LAST_UPDATE_CHECK, 0L)
         return System.currentTimeMillis() - lastCheck >= CHECK_INTERVAL_MS
     }
 
-    /**
-     * Starts the hourly background loop when auto-update is enabled.
-     * Call from the main Activity's onResume/onCreate.
-     */
+    // Start the hourly background loop when auto-update is enabled.
     fun startBackgroundLoop(context: Context) {
         stopBackgroundLoop()
         if (!isEnabled(context)) return
@@ -123,24 +105,16 @@ object UpdateChecker {
                     }
                 }
             }
-        // First tick after 5 seconds (give the app time to finish initialising)
         backgroundHandler?.postDelayed(backgroundRunnable!!, 5_000L)
     }
 
-    /**
-     * Stops the hourly background loop.  Call from onDestroy or when the
-     * toggle is turned off.
-     */
     fun stopBackgroundLoop() {
         backgroundRunnable?.let { backgroundHandler?.removeCallbacks(it) }
         backgroundHandler = null
         backgroundRunnable = null
     }
 
-    /**
-     * Perform an automatic update check. Skipped if not due or already running.
-     * @param force If true, bypasses the interval timer (first app open).
-     */
+    // Perform an automatic update check.
     fun checkForUpdate(
         context: Context,
         force: Boolean = false,
@@ -151,10 +125,7 @@ object UpdateChecker {
         launchCheck(context)
     }
 
-    /**
-     * Manual "Check" button — respects a 30-second cooldown.
-     * @return `true` if the check was started, `false` if still in cooldown.
-     */
+    // Manual check; returns false while in cooldown.
     fun checkForUpdateManual(context: Context): Boolean {
         val now = System.currentTimeMillis()
         val last = lastManualCheckTime.get()
@@ -164,21 +135,13 @@ object UpdateChecker {
         return true
     }
 
-    /**
-     * Returns the remaining cooldown in seconds for the manual check button.
-     * Returns 0 if the button is ready.
-     */
     fun manualCheckCooldownSeconds(): Int {
         val elapsed = System.currentTimeMillis() - lastManualCheckTime.get()
         val remaining = MANUAL_CHECK_COOLDOWN_MS - elapsed
         return if (remaining > 0) ((remaining + 999) / 1000).toInt() else 0
     }
 
-    /**
-     * Schedule a deferred update check after a game exits.
-     * If another game is launched before the delay, cancel the pending check
-     * via [cancelPostGameCheck].
-     */
+    // Schedule a deferred update check after a game exits.
     fun schedulePostGameCheck(context: Context) {
         cancelPostGameCheck()
         if (!isEnabled(context)) return
@@ -194,18 +157,12 @@ object UpdateChecker {
         postGameHandler?.postDelayed(postGameRunnable!!, POST_GAME_CHECK_DELAY_MS)
     }
 
-    /**
-     * Cancel the pending post-game check (e.g. user launched another game).
-     */
     fun cancelPostGameCheck() {
         postGameRunnable?.let { postGameHandler?.removeCallbacks(it) }
         postGameHandler = null
         postGameRunnable = null
     }
 
-    /**
-     * Resets the last-check timer so the next periodic tick runs immediately.
-     */
     fun resetCheckTimer(context: Context) {
         PreferenceManager
             .getDefaultSharedPreferences(context)
@@ -214,8 +171,6 @@ object UpdateChecker {
             .apply()
     }
 
-    // ── Internal ──────────────────────────────────────────────────────
-
     private fun isAutoCheckAllowed(): Boolean {
         val activity = PluviaApp.currentForegroundActivity ?: return false
         return activity !is XServerDisplayActivity
@@ -233,7 +188,6 @@ object UpdateChecker {
                         showUpdateDialog(context, result)
                     }
                 }
-                // Record that we checked
                 PreferenceManager
                     .getDefaultSharedPreferences(context)
                     .edit()
@@ -255,15 +209,8 @@ object UpdateChecker {
         val releaseNotes: String?,
     )
 
-    /**
-     * Fetches the Downloads page HTML, parses the "Last Updated:" line,
-     * and compares it against the app's install timestamp.
-     *
-     * This is the fastest approach — a single lightweight GET of the HTML
-     * page rather than HEAD requests through the download.php redirector.
-     */
+    // Fetch the downloads page and compare its "Last Updated" date.
     private fun fetchUpdateInfo(context: Context): UpdateInfo? {
-        // 1.  Fetch the HTML page
         val pageRequest =
             Request
                 .Builder()
@@ -280,7 +227,6 @@ object UpdateChecker {
                 pageResponse.body?.string() ?: return null
             }
 
-        // 2.  Parse "Last Updated: March 29, 2026, 5:46 am EDT"
         val pattern =
             Pattern.compile(
                 """Last\s+Updated:\s*(.+?)(?:\r?\n|<)""",
@@ -299,24 +245,22 @@ object UpdateChecker {
                 return null
             }
 
-        // 3.  Compare with install timestamp
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         val installTimestamp = prefs.getLong(PREF_INSTALL_TIMESTAMP, System.currentTimeMillis())
 
         if (serverDate.time <= installTimestamp) {
-            return null // No update available
+            return null
         }
 
-        // 4.  Build download URL based on package name
         val apkType =
             when (context.packageName) {
                 "com.ludashi.benchmark" -> "ludashi"
                 "com.tencent.ig" -> null
+                "com.antutu.ABenchMark" -> null
                 else -> "standard"
             } ?: return null
         val downloadUrl = "${DOWNLOADS_PAGE_URL}download.php?type=$apkType"
 
-        // 5.  Fetch optional release notes
         val releaseNotes = fetchReleaseNotes()
 
         val dateFormat = SimpleDateFormat("MMM dd, yyyy 'at' hh:mm a", Locale.US)
@@ -331,9 +275,6 @@ object UpdateChecker {
         )
     }
 
-    /**
-     * Parses date strings like "March 29, 2026, 5:46 am EDT".
-     */
     private fun parseLastUpdatedDate(dateStr: String): Date? {
         val formats =
             arrayOf(
@@ -394,7 +335,6 @@ object UpdateChecker {
                 setPadding(padding, padding, padding, padding)
             }
 
-        // Released date
         val releasedLabel =
             TextView(context).apply {
                 text = "Released: ${info.serverModifiedFormatted}"
@@ -403,7 +343,6 @@ object UpdateChecker {
             }
         container.addView(releasedLabel)
 
-        // Release notes
         if (!info.releaseNotes.isNullOrBlank()) {
             val divider =
                 android.view.View(context).apply {
diff --git a/app/src/main/assets/ddrawrapper/dd7to9.tzst b/app/src/main/assets/ddrawrapper/dd7to9.tzst
index bc10eef27..e5dd2f764 100644
Binary files a/app/src/main/assets/ddrawrapper/dd7to9.tzst and b/app/src/main/assets/ddrawrapper/dd7to9.tzst differ
diff --git a/app/src/main/assets/ddrawrapper/ddraw-11.8.tzst b/app/src/main/assets/ddrawrapper/ddraw-11.8.tzst
new file mode 100644
index 000000000..a74776acf
Binary files /dev/null and b/app/src/main/assets/ddrawrapper/ddraw-11.8.tzst differ
diff --git a/app/src/main/assets/ddrawrapper/ddraw-4.21.tzst b/app/src/main/assets/ddrawrapper/ddraw-4.21.tzst
new file mode 100644
index 000000000..dc8b5fa57
Binary files /dev/null and b/app/src/main/assets/ddrawrapper/ddraw-4.21.tzst differ
diff --git a/app/src/main/assets/dnas/dnas_bypass.json b/app/src/main/assets/dnas/dnas_bypass.json
new file mode 100644
index 000000000..fb7610484
--- /dev/null
+++ b/app/src/main/assets/dnas/dnas_bypass.json
@@ -0,0 +1,514 @@
+{
+ "SCES-51706": {
+  "title": "Amplitude",
+  "cheats": [
+   {
+    "name": "DNAS Patch",
+    "codes": [
+     "D04E7BFA 00000001",
+     "2025BE18 14400013"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLUS-21165": {
+  "title": "Arc the Lad: End of Darkness",
+  "cheats": [
+   {
+    "name": "DNAS Bypass by Harry62",
+    "codes": [
+     "2011AF84 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLES-53729": {
+  "title": "Battlefield 2: Modern Combat",
+  "cheats": [
+   {
+    "name": "DNAS Bypass Code",
+    "codes": [
+     "2021A268 00000000"
+    ],
+    "crc": "185D22A9",
+    "auto": true
+   },
+   {
+    "name": "DNAS Bypass Code",
+    "codes": [
+     "2021A078 00000000"
+    ],
+    "crc": "89CDE501",
+    "auto": true
+   }
+  ]
+ },
+ "SLES-53730": {
+  "title": "Battlefield 2: Modern Combat",
+  "cheats": [
+   {
+    "name": "DNAS Bypass Code",
+    "codes": [
+     "2021A268 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLPM-66206": {
+  "title": "Battlefield 2: Modern Combat",
+  "cheats": [
+   {
+    "name": "DNAS Bypass Code",
+    "codes": [
+     "2021A078 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLUS-21026": {
+  "title": "Battlefield 2: Modern Combat",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "2021A240 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLES-52782": {
+  "title": "Call of Duty: Finest Hour",
+  "cheats": [
+   {
+    "name": "DNAS Bypass Code",
+    "codes": [
+     "D02942F0 0000F0B6",
+     "202942F0 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-50781": {
+  "title": "Destruction Derby Arenas",
+  "cheats": [
+   {
+    "name": "[MODE 3] DNAS Patch",
+    "codes": [
+     "D1D8139C 24020006",
+     "01D81390 00000000",
+     "D1D8139C 24020006",
+     "01D8139C 00000005"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-53033": {
+  "title": "Formula One 05",
+  "cheats": [
+   {
+    "name": "DNAS bypass",
+    "codes": [
+     "D039FBA4 24020006",
+     "0039FB98 00000000",
+     "D039FBA4 24020006",
+     "0039FBA4 00000005"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLES-53667": {
+  "title": "Gauntlet: Seven Sorrows",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "203842E0 03E00008",
+     "203842E4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "PAPX-90523": {
+  "title": "Gran Turismo 4 Online (Beta)",
+  "cheats": [
+   {
+    "name": "DNAS Bypass Code",
+    "codes": [
+     "D188D734 24020006",
+     "0188D728 00000000",
+     "D188D734 24020006",
+     "0188D734 00000005"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-51977": {
+  "title": "Hardware: Online Arena",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "D1D424A8 00000007",
+     "01D424A8 00000005",
+     "D1D424A8 00000006",
+     "01D424A8 00000005"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLES-53585": {
+  "title": "Marvel Nemesis: Rise of the Imperfects",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "2020249C 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SLUS-21281": {
+  "title": "Marvel Nemesis: Rise of the Imperfects",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "2020249C 00000000",
+     "20509B9C 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-51677": {
+  "title": "MyStreet",
+  "cheats": [
+   {
+    "name": "DNAS Patch",
+    "codes": [
+     "D19A40B4 24020006",
+     "019A40A8 00000000",
+     "D19A40B4 24020006",
+     "019A40B4 00000005"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-52456": {
+  "title": "Ratchet & Clank 3",
+  "cheats": [
+   {
+    "name": "DNAS Patch",
+    "codes": [
+     "D04D55E4 24020006",
+     "004D55D8 00000000",
+     "D04D55E4 24020006",
+     "004D55E4 00000005"
+    ],
+    "auto": true
+   },
+   {
+    "name": "DNAS Patch",
+    "codes": [
+     "D178CAF4 24020006",
+     "0178CAE8 00000000",
+     "D178CAF4 24020006",
+     "0178CAF4 00000005"
+    ],
+    "auto": false
+   }
+  ]
+ },
+ "SCUS-97474": {
+  "title": "SOCOM 3: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass (Base version of the game)",
+    "codes": [
+     "202859A0 03E00008",
+     "202859A4 00000000"
+    ],
+    "auto": true
+   },
+   {
+    "name": "DNAS Bypass (Patch 2.3)",
+    "codes": [
+     "2028AE10 03E00008",
+     "2028AE14 00000000"
+    ],
+    "auto": false
+   }
+  ]
+ },
+ "SCUS-97489": {
+  "title": "SOCOM 3: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "202461E0 03E00008",
+     "202461E4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCUS-97545": {
+  "title": "SOCOM: U.S. Navy SEALs Combined Assault",
+  "cheats": [
+   {
+    "name": "DNAS Bypass (Works for both 1.0 and 1.4 version of the game)",
+    "codes": [
+     "2029A2DC 24020001",
+     "2029BD90 03E00008",
+     "2029BD94 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-52306": {
+  "title": "SOCOM II: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "202D61B0 03E00008",
+     "202D61B4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCKA-20020": {
+  "title": "SOCOM II: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "202D7818 24020001"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCPS-15065": {
+  "title": "SOCOM II: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "202DD648 24020001"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCUS-97275": {
+  "title": "SOCOM II: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass r0001",
+    "codes": [
+     "202CC670 03E00008",
+     "202CC674 00000000"
+    ],
+    "auto": true
+   },
+   {
+    "name": "DNAS Bypass r0004",
+    "codes": [
+     "203953C0 03E00008",
+     "203953C4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCUS-97366": {
+  "title": "SOCOM II: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass(Harry62)",
+    "codes": [
+     "203953C0 03E00008",
+     "203953C4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "TCES-51904": {
+  "title": "SOCOM II: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "2040F1C0 03E00008",
+     "2040F1C4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCKA-24008": {
+  "title": "SOCOM: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "20379C48 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCKA-90010": {
+  "title": "SOCOM: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "20379548 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCPS-15044": {
+  "title": "SOCOM: U.S. Navy SEALs",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "203814C8 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-52033": {
+  "title": "Syphon Filter: The Omega Strain",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "20382390 03E00008",
+     "20382394 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCKA-20032": {
+  "title": "Syphon Filter: The Omega Strain",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "20384D30 03E00008",
+     "20384D34 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCUS-97264": {
+  "title": "Syphon Filter: The Omega Strain",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "2044B7A0 03E00008",
+     "2044B7A4 00000000"
+    ],
+    "auto": true
+   },
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "20343940 03E00008",
+     "20343944 00000000"
+    ],
+    "auto": false
+   }
+  ]
+ },
+ "SCUS-97397": {
+  "title": "Syphon Filter: The Omega Strain",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "203563C0 03E00008",
+     "203563C4 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "TCES-52033": {
+  "title": "Syphon Filter: The Omega Strain",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "2037B960 03E00008",
+     "2037B964 00000000"
+    ],
+    "auto": true
+   }
+  ]
+ },
+ "SCES-52389": {
+  "title": "WRC 4",
+  "cheats": [
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "D05B4C88 00000000",
+     "205B4C88 00000001"
+    ],
+    "crc": "CDE7C999",
+    "auto": true
+   },
+   {
+    "name": "DNAS Bypass",
+    "codes": [
+     "D05B4E88 00000000",
+     "205B4E88 00000001"
+    ],
+    "crc": "AFD06CBA",
+    "auto": true
+   }
+  ]
+ },
+ "TCES-53247": {
+  "title": "WRC: Rally Evolved",
+  "cheats": [
+   {
+    "name": "DNAS Patch",
+    "codes": [
+     "D19606AC 24020006",
+     "019606A0 00000000",
+     "D19606AC 24020006",
+     "019606AC 00000005"
+    ],
+    "auto": true
+   }
+  ]
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/experimental-drm.tzst b/app/src/main/assets/experimental-drm.tzst
index 5bfb87168..b1f2f3b00 100644
Binary files a/app/src/main/assets/experimental-drm.tzst and b/app/src/main/assets/experimental-drm.tzst differ
diff --git a/app/src/main/assets/extras.tzst b/app/src/main/assets/extras.tzst
index 097329359..4e5f4ad42 100644
Binary files a/app/src/main/assets/extras.tzst and b/app/src/main/assets/extras.tzst differ
diff --git a/app/src/main/assets/ffmpeg8.tzst b/app/src/main/assets/ffmpeg8.tzst
new file mode 100644
index 000000000..06f4f9dec
Binary files /dev/null and b/app/src/main/assets/ffmpeg8.tzst differ
diff --git a/app/src/main/assets/gestures/profiles/gesture-1.gcp b/app/src/main/assets/gestures/profiles/gesture-1.gcp
new file mode 100644
index 000000000..b6dd81bc3
--- /dev/null
+++ b/app/src/main/assets/gestures/profiles/gesture-1.gcp
@@ -0,0 +1 @@
+{"id":1,"name":"Default","config":{}}
\ No newline at end of file
diff --git a/app/src/main/assets/graphics_driver/extra_libs.tzst b/app/src/main/assets/graphics_driver/extra_libs.tzst
index 3f43e1914..35e365a8a 100644
Binary files a/app/src/main/assets/graphics_driver/extra_libs.tzst and b/app/src/main/assets/graphics_driver/extra_libs.tzst differ
diff --git a/app/src/main/assets/graphics_driver/wrapper-gamenative.tzst b/app/src/main/assets/graphics_driver/wrapper-gamenative.tzst
new file mode 100644
index 000000000..1604fef9d
Binary files /dev/null and b/app/src/main/assets/graphics_driver/wrapper-gamenative.tzst differ
diff --git a/app/src/main/assets/graphics_driver/wrapper-leegao.tzst b/app/src/main/assets/graphics_driver/wrapper-leegao.tzst
new file mode 100644
index 000000000..5147bea47
Binary files /dev/null and b/app/src/main/assets/graphics_driver/wrapper-leegao.tzst differ
diff --git a/app/src/main/assets/graphics_driver/wrapper.tzst b/app/src/main/assets/graphics_driver/wrapper.tzst
index 6a5bd8254..528bc9b1f 100644
Binary files a/app/src/main/assets/graphics_driver/wrapper.tzst and b/app/src/main/assets/graphics_driver/wrapper.tzst differ
diff --git a/app/src/main/assets/imagefs.txz b/app/src/main/assets/imagefs.txz
deleted file mode 100644
index df8c59a3e..000000000
--- a/app/src/main/assets/imagefs.txz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f96d362b7e148e86ab0d2c290978bf39b38e5c7ffc8ae4adf1d2a65c62bbb780
-size 183231056
diff --git a/app/src/main/assets/imagefs.tzst b/app/src/main/assets/imagefs.tzst
new file mode 100644
index 000000000..34ce6700f
--- /dev/null
+++ b/app/src/main/assets/imagefs.tzst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0902e324b60a5c234aa29fcf457f6475a38ef8f61ac2be2118daaef4f236499a
+size 199788876
diff --git a/app/src/main/assets/inputcontrols/profiles/controls-4.icp b/app/src/main/assets/inputcontrols/profiles/controls-4.icp
deleted file mode 100644
index 1aa0a0fca..000000000
--- a/app/src/main/assets/inputcontrols/profiles/controls-4.icp
+++ /dev/null
@@ -1 +0,0 @@
-{"id":4,"name":"Playstation Controller","cursorSpeed":1,"elements":[{"type":"BUTTON","shape":"ROUND_RECT","customColor":-12435134,"bindings":["GAMEPAD_BUTTON_L2","NONE","NONE","NONE"],"scale":1.25,"x":0.12871287763118744,"y":0.10775047540664673,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-12435134,"bindings":["GAMEPAD_BUTTON_R2","NONE","NONE","NONE"],"scale":1.25,"x":0.8704261779785156,"y":0.10775047540664673,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_L1","NONE","NONE","NONE"],"scale":1.1,"x":0.12871287763118744,"y":0.239130437374115,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_R1","NONE","NONE","NONE"],"scale":1.1,"x":0.8704261779785156,"y":0.239130437374115,"toggleSwitch":false,"text":"","iconId":0},{"type":"D_PAD","shape":"CIRCLE","customColor":-13948632,"bindings":["GAMEPAD_DPAD_UP","GAMEPAD_DPAD_RIGHT","GAMEPAD_DPAD_DOWN","GAMEPAD_DPAD_LEFT"],"scale":0.92,"x":0.2970297038555145,"y":0.7816635370254517,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_LEFT_THUMB_UP","GAMEPAD_LEFT_THUMB_RIGHT","GAMEPAD_LEFT_THUMB_DOWN","GAMEPAD_LEFT_THUMB_LEFT"],"scale":1.08,"x":0.12742143869400024,"y":0.6153119206428528,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_RIGHT_THUMB_UP","GAMEPAD_RIGHT_THUMB_RIGHT","GAMEPAD_RIGHT_THUMB_DOWN","GAMEPAD_RIGHT_THUMB_LEFT"],"scale":1.08,"x":0.8721480965614319,"y":0.6153119206428528,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-65281,"bindings":["GAMEPAD_BUTTON_X","NONE","NONE","NONE"],"scale":1,"x":0.6534653306007385,"y":0.6739130616188049,"toggleSwitch":false,"text":"□","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-16711936,"bindings":["GAMEPAD_BUTTON_Y","NONE","NONE","NONE"],"scale":1,"x":0.7029703259468079,"y":0.5652173757553101,"toggleSwitch":false,"text":"△","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-16776961,"bindings":["GAMEPAD_BUTTON_A","NONE","NONE","NONE"],"scale":1,"x":0.7029703259468079,"y":0.7816635370254517,"toggleSwitch":false,"text":"×","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-65536,"bindings":["GAMEPAD_BUTTON_B","NONE","NONE","NONE"],"scale":1,"x":0.7524752616882324,"y":0.6739130616188049,"toggleSwitch":false,"text":"o","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_SELECT","NONE","NONE","NONE"],"scale":0.9,"x":0.44468361139297485,"y":0.95652174949646,"toggleSwitch":false,"text":"","iconId":16},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_START","NONE","NONE","NONE"],"scale":0.9,"x":0.5445544719696045,"y":0.95652174949646,"toggleSwitch":false,"text":"","iconId":15},{"type":"BUTTON","shape":"CIRCLE","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_L3","NONE","NONE","NONE"],"scale":0.78,"x":0.16745588183403015,"y":0.8468809127807617,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_R3","NONE","NONE","NONE"],"scale":0.78,"x":0.7920792102813721,"y":0.8468809127807617,"toggleSwitch":false,"text":"","iconId":0}]}
\ No newline at end of file
diff --git a/app/src/main/assets/inputcontrols/profiles/controls-5.icp b/app/src/main/assets/inputcontrols/profiles/controls-5.icp
deleted file mode 100644
index 9c3a3b095..000000000
--- a/app/src/main/assets/inputcontrols/profiles/controls-5.icp
+++ /dev/null
@@ -1 +0,0 @@
-{"id":5,"name":"Xbox Controller","cursorSpeed":1,"elements":[{"type":"BUTTON","shape":"ROUND_RECT","customColor":-12435134,"bindings":["GAMEPAD_BUTTON_L2","NONE","NONE","NONE"],"scale":1.25,"x":0.12871287763118744,"y":0.10869564861059189,"toggleSwitch":false,"text":"LT","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-12435134,"bindings":["GAMEPAD_BUTTON_R2","NONE","NONE","NONE"],"scale":1.25,"x":0.8811880946159363,"y":0.10869564861059189,"toggleSwitch":false,"text":"RT","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_L1","NONE","NONE","NONE"],"scale":1.05,"x":0.12871287763118744,"y":0.239130437374115,"toggleSwitch":false,"text":"LB","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_R1","NONE","NONE","NONE"],"scale":1.15,"x":0.8811880946159363,"y":0.239130437374115,"toggleSwitch":false,"text":"RB","iconId":0},{"type":"D_PAD","shape":"CIRCLE","customColor":-13948632,"bindings":["GAMEPAD_DPAD_UP","GAMEPAD_DPAD_RIGHT","GAMEPAD_DPAD_DOWN","GAMEPAD_DPAD_LEFT"],"scale":0.92,"x":0.3164012134075165,"y":0.7816635370254517,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_LEFT_THUMB_UP","GAMEPAD_LEFT_THUMB_RIGHT","GAMEPAD_LEFT_THUMB_DOWN","GAMEPAD_LEFT_THUMB_LEFT"],"scale":1.08,"x":0.12742143869400024,"y":0.6153119206428528,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_RIGHT_THUMB_UP","GAMEPAD_RIGHT_THUMB_RIGHT","GAMEPAD_RIGHT_THUMB_DOWN","GAMEPAD_RIGHT_THUMB_LEFT"],"scale":1.08,"x":0.8721480965614319,"y":0.6153119206428528,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-16776961,"bindings":["GAMEPAD_BUTTON_X","NONE","NONE","NONE"],"scale":1,"x":0.6530348658561707,"y":0.6739130616188049,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-256,"bindings":["GAMEPAD_BUTTON_Y","NONE","NONE","NONE"],"scale":1,"x":0.7029703259468079,"y":0.5642722249031067,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-16711936,"bindings":["GAMEPAD_BUTTON_A","NONE","NONE","NONE"],"scale":1,"x":0.7029703259468079,"y":0.7816635370254517,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-65536,"bindings":["GAMEPAD_BUTTON_B","NONE","NONE","NONE"],"scale":1,"x":0.7524752616882324,"y":0.6739130616188049,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_SELECT","NONE","NONE","NONE"],"scale":0.9,"x":0.4451140761375427,"y":0.95652174949646,"toggleSwitch":false,"text":"","iconId":16},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_START","NONE","NONE","NONE"],"scale":0.9,"x":0.5445544719696045,"y":0.95652174949646,"toggleSwitch":false,"text":"","iconId":15},{"type":"BUTTON","shape":"CIRCLE","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_L3","NONE","NONE","NONE"],"scale":0.78,"x":0.16788634657859802,"y":0.8468809127807617,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-8355712,"bindings":["GAMEPAD_BUTTON_R3","NONE","NONE","NONE"],"scale":0.78,"x":0.8015497326850891,"y":0.8468809127807617,"toggleSwitch":false,"text":"","iconId":0}]}
\ No newline at end of file
diff --git a/app/src/main/assets/inputcontrols/profiles/controls-6.icp b/app/src/main/assets/inputcontrols/profiles/controls-6.icp
index 1da124f3f..ccadad6e1 100644
--- a/app/src/main/assets/inputcontrols/profiles/controls-6.icp
+++ b/app/src/main/assets/inputcontrols/profiles/controls-6.icp
@@ -1 +1 @@
-{"id":6,"name":"FPS","cursorSpeed":1.0000001,"elements":[{"type":"D_PAD","shape":"CIRCLE","bindings":["KEY_W","KEY_D","KEY_S","KEY_A"],"scale":1,"x":0.10000000149011612,"y":0.7333333492279053,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["MOUSE_LEFT_BUTTON","NONE","NONE","NONE"],"scale":1,"x":0.8195833563804626,"y":0.7333333492279053,"toggleSwitch":false,"text":"","iconId":0,"mouseMoveMode":true},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_R","NONE","NONE","NONE"],"scale":1,"x":0.8795833587646484,"y":0.6000000238418579,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_SPACE","NONE","NONE","NONE"],"scale":1,"x":0.8795833587646484,"y":0.8666666746139526,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_E","NONE","NONE","NONE"],"scale":1,"x":0.9395833611488342,"y":0.7333333492279053,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["MOUSE_RIGHT_BUTTON","NONE","NONE","NONE"],"scale":1,"x":0.1899999976158142,"y":0.5333333611488342,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["KEY_ENTER","NONE","NONE","NONE"],"scale":0.85,"x":0.5400000214576721,"y":0.9111111164093018,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["KEY_ESC","NONE","NONE","NONE"],"scale":0.85,"x":0.46000000834465027,"y":0.9111111164093018,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_SHIFT_L","NONE","NONE","NONE"],"scale":0.85,"x":0.75,"y":0.8888888955116272,"toggleSwitch":true,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_CTRL_L","NONE","NONE","NONE"],"scale":0.85,"x":0.25,"y":0.8888888955116272,"toggleSwitch":true,"text":"","iconId":0},{"type":"RADIAL_MENU","shape":"CIRCLE","bindings":["KEY_F","KEY_G","KEY_C","KEY_T","KEY_V"],"scale":1,"x":0.9100000262260437,"y":0.3333333432674408,"toggleSwitch":false,"text":"","iconId":0},{"type":"RANGE_BUTTON","shape":"CIRCLE","bindings":["NONE","NONE","NONE","NONE"],"scale":1,"x":0.10958333313465118,"y":0.08888889104127884,"toggleSwitch":false,"text":"","iconId":0,"range":"FROM_0_TO_9"},{"type":"RANGE_BUTTON","shape":"CIRCLE","bindings":["NONE","NONE","NONE","NONE"],"scale":1,"x":0.8895833492279053,"y":0.08888889104127884,"toggleSwitch":false,"text":"","iconId":0,"range":"FROM_F1_TO_F12"},{"type":"RADIAL_MENU","shape":"CIRCLE","bindings":["KEY_I","KEY_Z","KEY_X","KEY_M","KEY_Q"],"scale":1,"x":0.09000000357627869,"y":0.3333333432674408,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_TAB","NONE","NONE","NONE"],"scale":0.85,"x":0.3199999928474426,"y":0.8888888955116272,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_ALT_L","NONE","NONE","NONE"],"scale":0.85,"x":0.6800000071525574,"y":0.8888888955116272,"toggleSwitch":true,"text":"","iconId":0}]}
\ No newline at end of file
+{"id":6,"name":"FPS","cursorSpeed":1.0000001,"elements":[{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["MOUSE_LEFT_BUTTON","NONE","NONE","NONE"],"scale":1,"x":0.8191993236541748,"y":0.7325142025947571,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_R","NONE","NONE","NONE"],"scale":1,"x":0.8794662356376648,"y":0.5992438793182373,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_SPACE","NONE","NONE","NONE"],"scale":1,"x":0.8794662356376648,"y":0.8657845258712769,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_E","NONE","NONE","NONE"],"scale":1,"x":0.9388721585273743,"y":0.7325142025947571,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["MOUSE_RIGHT_BUTTON","NONE","NONE","NONE"],"scale":1,"x":0.23762376606464386,"y":0.5207939743995667,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["KEY_ENTER","NONE","NONE","NONE"],"scale":0.85,"x":0.5393887162208557,"y":0.9092627763748169,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["KEY_ESC","NONE","NONE","NONE"],"scale":0.85,"x":0.45975032448768616,"y":0.9092627763748169,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_SHIFT_L","NONE","NONE","NONE"],"scale":0.85,"x":0.7494618892669678,"y":0.8875236511230469,"toggleSwitch":true,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_CTRL_L","NONE","NONE","NONE"],"scale":0.85,"x":0.24924665689468384,"y":0.8875236511230469,"toggleSwitch":true,"text":"","iconId":0},{"type":"RADIAL_MENU","shape":"CIRCLE","customColor":-1,"bindings":["KEY_F","KEY_G","KEY_C","KEY_T","KEY_V"],"scale":1,"x":0.9095996618270874,"y":0.3317580223083496,"toggleSwitch":false,"text":"","iconId":0},{"type":"RANGE_BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["NONE","NONE","NONE","NONE"],"scale":1,"x":0.10891088843345642,"y":0.08790170401334763,"toggleSwitch":false,"text":"","iconId":0,"range":"FROM_0_TO_9"},{"type":"RANGE_BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["NONE","NONE","NONE","NONE"],"scale":1,"x":0.8893672227859497,"y":0.08790170401334763,"toggleSwitch":false,"text":"","iconId":0,"range":"FROM_F1_TO_F12"},{"type":"RADIAL_MENU","shape":"CIRCLE","customColor":-1,"bindings":["KEY_I","KEY_Z","KEY_X","KEY_M","KEY_Q"],"scale":1,"x":0.08953938633203506,"y":0.3317580223083496,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_TAB","NONE","NONE","NONE"],"scale":0.85,"x":0.31941455602645874,"y":0.8875236511230469,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["KEY_ALT_L","NONE","NONE","NONE"],"scale":0.85,"x":0.6797245144844055,"y":0.8875236511230469,"toggleSwitch":true,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","customColor":-1,"bindings":["KEY_W","KEY_D","KEY_S","KEY_A"],"scale":1,"x":0.14851485192775726,"y":0.695652186870575,"toggleSwitch":false,"text":"","iconId":0},{"type":"D_PAD","shape":"CIRCLE","customColor":-1,"bindings":["KEY_UP","KEY_RIGHT","KEY_DOWN","KEY_LEFT"],"scale":0.6,"x":0.2871287167072296,"y":0.15217390656471252,"toggleSwitch":false,"text":"","iconId":0}]}
diff --git a/app/src/main/assets/inputcontrols/profiles/controls-7.icp b/app/src/main/assets/inputcontrols/profiles/controls-7.icp
new file mode 100644
index 000000000..f7e7c1251
--- /dev/null
+++ b/app/src/main/assets/inputcontrols/profiles/controls-7.icp
@@ -0,0 +1 @@
+{"id":7,"name":"GameHub","cursorSpeed":1,"elements":[{"type":"BUTTON","shape":"ROUND_RECT","bindings":["GAMEPAD_BUTTON_L2","NONE","NONE","NONE"],"scale":1.3,"x":0.087,"y":0.115,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["GAMEPAD_BUTTON_R2","NONE","NONE","NONE"],"scale":1.3,"x":0.913,"y":0.115,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["GAMEPAD_BUTTON_L1","NONE","NONE","NONE"],"scale":1.3,"x":0.087,"y":0.28,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["GAMEPAD_BUTTON_R1","NONE","NONE","NONE"],"scale":1.3,"x":0.913,"y":0.28,"toggleSwitch":false,"text":"","iconId":0},{"type":"D_PAD","shape":"CIRCLE","bindings":["GAMEPAD_DPAD_UP","GAMEPAD_DPAD_RIGHT","GAMEPAD_DPAD_DOWN","GAMEPAD_DPAD_LEFT"],"scale":1.07,"x":0.335,"y":0.7,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","bindings":["GAMEPAD_LEFT_THUMB_UP","GAMEPAD_LEFT_THUMB_RIGHT","GAMEPAD_LEFT_THUMB_DOWN","GAMEPAD_LEFT_THUMB_LEFT"],"scale":1.17,"x":0.16,"y":0.7,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","bindings":["GAMEPAD_RIGHT_THUMB_UP","GAMEPAD_RIGHT_THUMB_RIGHT","GAMEPAD_RIGHT_THUMB_DOWN","GAMEPAD_RIGHT_THUMB_LEFT"],"scale":1.17,"x":0.72,"y":0.7,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["GAMEPAD_BUTTON_X","NONE","NONE","NONE"],"scale":1.0,"x":0.835,"y":0.72,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["GAMEPAD_BUTTON_Y","NONE","NONE","NONE"],"scale":1.0,"x":0.89,"y":0.6,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["GAMEPAD_BUTTON_A","NONE","NONE","NONE"],"scale":1.0,"x":0.89,"y":0.84,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["GAMEPAD_BUTTON_B","NONE","NONE","NONE"],"scale":1.0,"x":0.945,"y":0.72,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["GAMEPAD_BUTTON_SELECT","NONE","NONE","NONE"],"scale":0.75,"x":0.46,"y":0.94,"toggleSwitch":false,"text":"","iconId":16},{"type":"BUTTON","shape":"ROUND_RECT","bindings":["GAMEPAD_BUTTON_START","NONE","NONE","NONE"],"scale":0.75,"x":0.54,"y":0.94,"toggleSwitch":false,"text":"","iconId":15},{"type":"BUTTON","shape":"CIRCLE","bindings":["GAMEPAD_BUTTON_L3","NONE","NONE","NONE"],"scale":0.7,"x":0.055,"y":0.42,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","bindings":["GAMEPAD_BUTTON_R3","NONE","NONE","NONE"],"scale":0.7,"x":0.945,"y":0.42,"toggleSwitch":false,"text":"","iconId":0}]}
\ No newline at end of file
diff --git a/app/src/main/assets/inputcontrols/profiles/controls-8.icp b/app/src/main/assets/inputcontrols/profiles/controls-8.icp
new file mode 100644
index 000000000..5ff39be3d
--- /dev/null
+++ b/app/src/main/assets/inputcontrols/profiles/controls-8.icp
@@ -0,0 +1 @@
+{"id":8,"name":"No R-Stick","cursorSpeed":1,"elements":[{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_L2","NONE","NONE","NONE"],"scale":1.25,"x":0.12745098769664764,"y":0.10638298094272614,"toggleSwitch":false,"text":"LT","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_R2","NONE","NONE","NONE"],"scale":1.25,"x":0.8823529481887817,"y":0.10638298094272614,"toggleSwitch":false,"text":"RT","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_L1","NONE","NONE","NONE"],"scale":1.05,"x":0.12745098769664764,"y":0.23404255509376526,"toggleSwitch":false,"text":"LB","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_R1","NONE","NONE","NONE"],"scale":1.15,"x":0.8823529481887817,"y":0.23404255509376526,"toggleSwitch":false,"text":"RB","iconId":0},{"type":"D_PAD","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_DPAD_UP","GAMEPAD_DPAD_RIGHT","GAMEPAD_DPAD_DOWN","GAMEPAD_DPAD_LEFT"],"scale":0.92,"x":0.3235294222831726,"y":0.7872340679168701,"toggleSwitch":false,"text":"","iconId":0},{"type":"STICK","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_LEFT_THUMB_UP","GAMEPAD_LEFT_THUMB_RIGHT","GAMEPAD_LEFT_THUMB_DOWN","GAMEPAD_LEFT_THUMB_LEFT"],"scale":1.08,"x":0.10856935381889343,"y":0.6296296119689941,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_BUTTON_X","NONE","NONE","NONE"],"scale":1,"x":0.7549019455909729,"y":0.7659574747085571,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_BUTTON_Y","NONE","NONE","NONE"],"scale":1,"x":0.813725471496582,"y":0.6382978558540344,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_BUTTON_A","NONE","NONE","NONE"],"scale":1,"x":0.813725471496582,"y":0.8936170339584351,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_BUTTON_B","NONE","NONE","NONE"],"scale":1,"x":0.8725489974021912,"y":0.7659574747085571,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_SELECT","NONE","NONE","NONE"],"scale":0.9,"x":0.4444444477558136,"y":0.9550827145576477,"toggleSwitch":false,"text":"","iconId":16},{"type":"BUTTON","shape":"ROUND_RECT","customColor":-1,"bindings":["GAMEPAD_BUTTON_START","NONE","NONE","NONE"],"scale":0.9,"x":0.5439360737800598,"y":0.9550827145576477,"toggleSwitch":false,"text":"","iconId":15},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_BUTTON_L3","NONE","NONE","NONE"],"scale":0.78,"x":0.19607843458652496,"y":0.8510638475418091,"toggleSwitch":false,"text":"","iconId":0},{"type":"BUTTON","shape":"CIRCLE","customColor":-1,"bindings":["GAMEPAD_BUTTON_R3","NONE","NONE","NONE"],"scale":0.78,"x":0.9215686321258545,"y":0.531126856803894,"toggleSwitch":false,"text":"","iconId":0}]}
\ No newline at end of file
diff --git a/app/src/main/assets/metadata/box64_env_vars.json b/app/src/main/assets/metadata/box64_env_vars.json
index 396966352..5c2b47826 100644
--- a/app/src/main/assets/metadata/box64_env_vars.json
+++ b/app/src/main/assets/metadata/box64_env_vars.json
@@ -18,6 +18,7 @@
     {"name" : "BOX64_DYNAREC_PAUSE", "values" : ["0", "1", "2", "3"], "toggleSwitch" : false, "defaultValue" : "0"},
     {"name" : "BOX64_DYNAREC_NOARCH", "values" : ["0", "1", "2"], "defaultValue" : "0"},
     {"name" : "BOX64_DYNAREC_VOLATILE_METADATA", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
+    {"name" : "BOX64_DYNACACHE", "values" : ["0", "1", "2"], "defaultValue" : "0"},
     {"name" : "BOX64_AVX", "values" : ["0", "1", "2"], "defaultValue" : "0"},
     {"name" : "BOX64_AES", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
     {"name" : "BOX64_PCLMULQDQ", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
diff --git a/app/src/main/assets/metadata/debug_channels.json b/app/src/main/assets/metadata/debug_channels.json
index 91f46fec5..7227e3579 100644
--- a/app/src/main/assets/metadata/debug_channels.json
+++ b/app/src/main/assets/metadata/debug_channels.json
@@ -1 +1,521 @@
-["acledit","aclui","actctx","activeds","actxprxy","adpcm","adsldp","advapi","advpack","alsa","amsi","animate","appbar","apphelp","appwizcpl","appx","asmshader","aspi","atl","atlthunk","atmlib","atom","authz","avicap","avifile","avrt","bcrypt","bidi","bitblt","bitmap","bluetooth","bluetoothapis","browseui","button","bytecodewriter","cabinet","capi","capture","cards","cdosys","class","clipboard","clipping","clusapi","combase","combo","comboex","comm","commctrl","commdlg","compstui","comsvcs","concrt","connect","console","context","coreaudio","cred","credentials","credui","crypt","cryptasn","cryptdlg","cryptext","cryptnet","crypto","cryptui","ctapi32","cursor","d2d","d3d","d3d10","d3d10core","d3d11","d3d12","d3d8","d3d9","d3d_decl","d3d_shader","d3dcompiler","d3drm","d3dx","d3dxof","d3dxof_parsing","data","datetime","davclnt","dbgeng","dbghelp","dbghelp_coff","dbghelp_dwarf","dbghelp_macho","dbghelp_msc","dbghelp_stabs","dc","dciman","dcomp","ddeml","ddraw","ddrawex","debug_buffer","debugstr","devenum","dhcpcsvc","dhtmled","dialog","diasymreader","difxapi","dinput","display","dll","dmband","dmcompos","dmfile","dmime","dmloader","dmobj","dmscript","dmstyle","dmsynth","dmusic","dmusic32","dnsapi","dosmem","dpa","dplay","dpnet","dpnhpast","dpnhupnp","dpvoice","dragdrop","driver","dsa","dsdmo","dsound","dsound3d","dsquery","dssenh","dsuiext","dswave","dwmapi","dwrite","dx8vb","dxcore","dxdiag","dxgi","dxtrans","dxva2","edit","enhmetafile","enumeration","environ","err","event","eventlog","evr","exception","exec","explorerframe","faultrep","file","fixme","fixup","fltlib","fltmgr","font","fontcache","fontsub","fusion","fwpuclnt","g711","gamebar","gameux","gamingtcui","gdi","gdiplus","geolocator","gl_compat","global","globalmem","glu","graphics","gsm","handle","header","heap","hid","hlink","hnetcfg","hook","hostname","hotkey","htmlhelp","http","hvsi","iccvid","icm","icon","ieframe","image","imagehlp","imagelist","imm","inetcomm","inetcpl","inetmib1","infosoft","inkobj","input","inseng","int","int21","int31","ipaddress","iphlpapi","ir50_32","itss","joycpl","jscript","jsproxy","kerberos","kernelbase","keyboard","ksecdd","lanman","listbox","listview","loaddll","loadperf","local","locale","localspl","localui","macdrv","manipulation","mapi","mci","mciavi","mcicda","mcimidi","mciqtz","mciwave","mdi","media","mediacontrol","menu","menubuilder","message","metafile","mfplat","mgmtapi","midi","mlang","mmaux","mmc","mmdevapi","mmio","mmsys","mmtime","model","module","monthcal","mountmgr","mp3dmod","mpeg3","mpr","mprapi","msacm","msado15","msasn1","msauddecmft","mscms","msctf","msctfmonitor","msdasql","msdmo","msdrm","msftedit","msg","mshtml","msi","msidb","msident","msimg32","msimtf","msisip","msisys","msmpeg2vdec","msnet","msopc","mspatcha","msrle32","msscript","mssign","mstask","msttsengine","msvcirt","msvcm","msvcp","msvcrt","msvidc32","msvideo","mswsock","msxml","nativefont","ncrypt","nddeapi","ndis","netapi32","netbios","netcfgx","netio","netprofm","ninput","nls","nonclient","nsi","nstc","ntdll","ntdsapi","ntlm","ntoskrnl","ntprint","objsel","odbc","ole","oleacc","oledb","oledlg","olemalloc","olepicture","opencl","opengl","oss","packager","pager","palette","path","pdh","perception","pidgen","pidl","plugplay","powermgnt","powrprof","print","printui","prntvpt","process","profile","progress","propsheet","propsys","psdrv","pstores","pulse","qmgr","quartz","query","qwave","ras","rasdlg","rawinput","rebar","recyclebin","reg","region","relay","resource","richedit","richedit_lists","rpc","rstrtmgr","rtutils","sapi","schannel","schedsvc","scrobj","scroll","scrrun","scsiport","secur32","security","seh","selector","sensapi","service","setupapi","sfc","shcore","shdocvw","shell","shlctrl","slc","smbios","snmpapi","snoop","sound","speech","spoolss","sspicli","static","statusbar","sti","storage","stress","string","sxs","sync","syslevel","syslink","system","systray","t2embed","tab","tape","tapi","task","taskdialog","taskschd","tbs","tdh","tdi","text","theme_scroll","thread","threadpool","thunk","toolbar","toolhelp","tooltips","trackbar","traffic","treeview","twain","twinapi","ui","uianimation","uiautomation","uiribbon","unloaddll","unwind","updown","updspapi","url","urlmon","usb","usbd","user","uxtheme","variant","vbscript","vcomp","vcruntime","vdmdbg","ver","virtdisk","volume","vulkan","vxd","warn","wavemap","waylanddrv","wbemdisp","wbemprox","webservices","wer","wevtapi","wgl","wia","wimgapi","win","winebrowser","wincodecs","winemapi","wineusb","wing","winhttp","wininet","winmm","winprint","winscard","winsock","winspool","winsta","winstation","winstring","wintab","wintab32","wintrust","wintypes","winusb","wlanapi","wldap32","wldp","wmadec","wmi","wmiutils","wmp","wmvcore","wnet","wofutil","wow","wpc","wpcap","wsdapi","wshom","wsnmp32","wtsapi","wuapi","x11drv","xaudio2","xdnd","xim","xinput","xmllite","xolehlp","xrandr","xrender","xvidmode","dmo"]
+[
+  "acledit",
+  "aclui",
+  "actctx",
+  "activeds",
+  "actxprxy",
+  "adpcm",
+  "adsldp",
+  "advapi",
+  "advpack",
+  "alsa",
+  "amsi",
+  "animate",
+  "appbar",
+  "apphelp",
+  "appwizcpl",
+  "appx",
+  "asmshader",
+  "aspi",
+  "atl",
+  "atlthunk",
+  "atmlib",
+  "atom",
+  "authz",
+  "avicap",
+  "avifile",
+  "avrt",
+  "bcrypt",
+  "bidi",
+  "bitblt",
+  "bitmap",
+  "bluetooth",
+  "bluetoothapis",
+  "browseui",
+  "button",
+  "bytecodewriter",
+  "cabinet",
+  "capi",
+  "capture",
+  "cards",
+  "cdosys",
+  "class",
+  "clipboard",
+  "clipping",
+  "clusapi",
+  "combase",
+  "combo",
+  "comboex",
+  "comm",
+  "commctrl",
+  "commdlg",
+  "compstui",
+  "comsvcs",
+  "concrt",
+  "connect",
+  "console",
+  "context",
+  "coreaudio",
+  "cred",
+  "credentials",
+  "credui",
+  "crypt",
+  "cryptasn",
+  "cryptdlg",
+  "cryptext",
+  "cryptnet",
+  "crypto",
+  "cryptui",
+  "ctapi32",
+  "cursor",
+  "d2d",
+  "d3d",
+  "d3d10",
+  "d3d10core",
+  "d3d11",
+  "d3d12",
+  "d3d8",
+  "d3d9",
+  "d3d_decl",
+  "d3d_shader",
+  "d3dcompiler",
+  "d3drm",
+  "d3dx",
+  "d3dxof",
+  "d3dxof_parsing",
+  "data",
+  "datetime",
+  "davclnt",
+  "dbgeng",
+  "dbghelp",
+  "dbghelp_coff",
+  "dbghelp_dwarf",
+  "dbghelp_macho",
+  "dbghelp_msc",
+  "dbghelp_stabs",
+  "dc",
+  "dciman",
+  "dcomp",
+  "ddeml",
+  "ddraw",
+  "ddrawex",
+  "debug_buffer",
+  "debugstr",
+  "devenum",
+  "dhcpcsvc",
+  "dhtmled",
+  "dialog",
+  "diasymreader",
+  "difxapi",
+  "dinput",
+  "display",
+  "dll",
+  "dmband",
+  "dmcompos",
+  "dmfile",
+  "dmime",
+  "dmloader",
+  "dmobj",
+  "dmscript",
+  "dmstyle",
+  "dmsynth",
+  "dmusic",
+  "dmusic32",
+  "dnsapi",
+  "dosmem",
+  "dpa",
+  "dplay",
+  "dpnet",
+  "dpnhpast",
+  "dpnhupnp",
+  "dpvoice",
+  "dragdrop",
+  "driver",
+  "dsa",
+  "dsdmo",
+  "dsound",
+  "dsound3d",
+  "dsquery",
+  "dssenh",
+  "dsuiext",
+  "dswave",
+  "dwmapi",
+  "dwrite",
+  "dx8vb",
+  "dxcore",
+  "dxdiag",
+  "dxgi",
+  "dxtrans",
+  "dxva2",
+  "edit",
+  "enhmetafile",
+  "enumeration",
+  "environ",
+  "event",
+  "eventlog",
+  "evr",
+  "exception",
+  "exec",
+  "explorerframe",
+  "faultrep",
+  "file",
+  "fixup",
+  "fltlib",
+  "fltmgr",
+  "font",
+  "fontcache",
+  "fontsub",
+  "fusion",
+  "fwpuclnt",
+  "g711",
+  "gamebar",
+  "gameux",
+  "gamingtcui",
+  "gdi",
+  "gdiplus",
+  "geolocator",
+  "gl_compat",
+  "global",
+  "globalmem",
+  "glu",
+  "graphics",
+  "gsm",
+  "handle",
+  "header",
+  "heap",
+  "hid",
+  "hlink",
+  "hnetcfg",
+  "hook",
+  "hostname",
+  "hotkey",
+  "htmlhelp",
+  "http",
+  "hvsi",
+  "iccvid",
+  "icm",
+  "icon",
+  "ieframe",
+  "image",
+  "imagehlp",
+  "imagelist",
+  "imm",
+  "inetcomm",
+  "inetcpl",
+  "inetmib1",
+  "infosoft",
+  "inkobj",
+  "input",
+  "inseng",
+  "int",
+  "int21",
+  "int31",
+  "ipaddress",
+  "iphlpapi",
+  "ir50_32",
+  "itss",
+  "joycpl",
+  "jscript",
+  "jsproxy",
+  "kerberos",
+  "kernelbase",
+  "keyboard",
+  "ksecdd",
+  "lanman",
+  "listbox",
+  "listview",
+  "loaddll",
+  "loadperf",
+  "local",
+  "locale",
+  "localspl",
+  "localui",
+  "macdrv",
+  "manipulation",
+  "mapi",
+  "mci",
+  "mciavi",
+  "mcicda",
+  "mcimidi",
+  "mciqtz",
+  "mciwave",
+  "mdi",
+  "media",
+  "mediacontrol",
+  "menu",
+  "menubuilder",
+  "message",
+  "metafile",
+  "mfplat",
+  "mgmtapi",
+  "midi",
+  "mlang",
+  "mmaux",
+  "mmc",
+  "mmdevapi",
+  "mmio",
+  "mmsys",
+  "mmtime",
+  "model",
+  "module",
+  "monthcal",
+  "mountmgr",
+  "mp3dmod",
+  "mpeg3",
+  "mpr",
+  "mprapi",
+  "msacm",
+  "msado15",
+  "msasn1",
+  "msauddecmft",
+  "mscms",
+  "msctf",
+  "msctfmonitor",
+  "msdasql",
+  "msdmo",
+  "msdrm",
+  "msftedit",
+  "msg",
+  "mshtml",
+  "msi",
+  "msidb",
+  "msident",
+  "msimg32",
+  "msimtf",
+  "msisip",
+  "msisys",
+  "msmpeg2vdec",
+  "msnet",
+  "msopc",
+  "mspatcha",
+  "msrle32",
+  "msscript",
+  "mssign",
+  "mstask",
+  "msttsengine",
+  "msvcirt",
+  "msvcm",
+  "msvcp",
+  "msvcrt",
+  "msvidc32",
+  "msvideo",
+  "mswsock",
+  "msxml",
+  "nativefont",
+  "ncrypt",
+  "nddeapi",
+  "ndis",
+  "netapi32",
+  "netbios",
+  "netcfgx",
+  "netio",
+  "netprofm",
+  "ninput",
+  "nls",
+  "nonclient",
+  "nsi",
+  "nstc",
+  "ntdll",
+  "ntdsapi",
+  "ntlm",
+  "ntoskrnl",
+  "ntprint",
+  "objsel",
+  "odbc",
+  "ole",
+  "oleacc",
+  "oledb",
+  "oledlg",
+  "olemalloc",
+  "olepicture",
+  "opencl",
+  "opengl",
+  "oss",
+  "packager",
+  "pager",
+  "palette",
+  "path",
+  "pdh",
+  "perception",
+  "pidgen",
+  "pidl",
+  "plugplay",
+  "powermgnt",
+  "powrprof",
+  "print",
+  "printui",
+  "prntvpt",
+  "process",
+  "profile",
+  "progress",
+  "propsheet",
+  "propsys",
+  "psdrv",
+  "pstores",
+  "pulse",
+  "qmgr",
+  "quartz",
+  "query",
+  "qwave",
+  "ras",
+  "rasdlg",
+  "rawinput",
+  "rebar",
+  "recyclebin",
+  "reg",
+  "region",
+  "relay",
+  "resource",
+  "richedit",
+  "richedit_lists",
+  "rpc",
+  "rstrtmgr",
+  "rtutils",
+  "sapi",
+  "schannel",
+  "schedsvc",
+  "scrobj",
+  "scroll",
+  "scrrun",
+  "scsiport",
+  "secur32",
+  "security",
+  "seh",
+  "selector",
+  "sensapi",
+  "service",
+  "setupapi",
+  "sfc",
+  "shcore",
+  "shdocvw",
+  "shell",
+  "shlctrl",
+  "slc",
+  "smbios",
+  "snmpapi",
+  "snoop",
+  "sound",
+  "speech",
+  "spoolss",
+  "sspicli",
+  "static",
+  "statusbar",
+  "sti",
+  "storage",
+  "stress",
+  "string",
+  "sxs",
+  "sync",
+  "syslevel",
+  "syslink",
+  "system",
+  "systray",
+  "t2embed",
+  "tab",
+  "tape",
+  "tapi",
+  "task",
+  "taskdialog",
+  "taskschd",
+  "tbs",
+  "tdh",
+  "tdi",
+  "text",
+  "theme_scroll",
+  "thread",
+  "threadpool",
+  "thunk",
+  "toolbar",
+  "toolhelp",
+  "tooltips",
+  "trackbar",
+  "traffic",
+  "treeview",
+  "twain",
+  "twinapi",
+  "ui",
+  "uianimation",
+  "uiautomation",
+  "uiribbon",
+  "unloaddll",
+  "unwind",
+  "updown",
+  "updspapi",
+  "url",
+  "urlmon",
+  "usb",
+  "usbd",
+  "user",
+  "uxtheme",
+  "variant",
+  "vbscript",
+  "vcomp",
+  "vcruntime",
+  "vdmdbg",
+  "ver",
+  "virtdisk",
+  "virtual",
+  "volume",
+  "vulkan",
+  "vxd",
+  "wavemap",
+  "waylanddrv",
+  "wbemdisp",
+  "wbemprox",
+  "webservices",
+  "wer",
+  "wevtapi",
+  "wgl",
+  "wia",
+  "wimgapi",
+  "win",
+  "winebrowser",
+  "wincodecs",
+  "winemapi",
+  "wineusb",
+  "wing",
+  "winhttp",
+  "wininet",
+  "winmm",
+  "winprint",
+  "winscard",
+  "winsock",
+  "winspool",
+  "winsta",
+  "winstation",
+  "winstring",
+  "wintab",
+  "wintab32",
+  "wintrust",
+  "wintypes",
+  "winusb",
+  "wlanapi",
+  "wldap32",
+  "wldp",
+  "wmadec",
+  "wmi",
+  "wmiutils",
+  "wmp",
+  "wmvcore",
+  "wnet",
+  "wofutil",
+  "wow",
+  "wpc",
+  "wpcap",
+  "wsdapi",
+  "wshom",
+  "wsnmp32",
+  "wtsapi",
+  "wuapi",
+  "x11drv",
+  "xaudio2",
+  "xdnd",
+  "xim",
+  "xinput",
+  "xmllite",
+  "xolehlp",
+  "xrandr",
+  "xrender",
+  "xvidmode",
+  "dmo"
+]
\ No newline at end of file
diff --git a/app/src/main/assets/metadata/gpu_cards.json b/app/src/main/assets/metadata/gpu_cards.json
index ad7a56f02..a1ebafc3e 100644
--- a/app/src/main/assets/metadata/gpu_cards.json
+++ b/app/src/main/assets/metadata/gpu_cards.json
@@ -1 +1,1447 @@
-[{"name":"NVIDIA RIVA 128","deviceID":24,"vendorID":4318},{"name":"NVIDIA RIVA TNT","deviceID":32,"vendorID":4318},{"name":"NVIDIA RIVA TNT2\/TNT2 Pro","deviceID":40,"vendorID":4318},{"name":"NVIDIA GeForce 256","deviceID":256,"vendorID":4318},{"name":"NVIDIA GeForce2 GTS\/GeForce2 Pro","deviceID":336,"vendorID":4318},{"name":"NVIDIA GeForce2 MX\/MX 400","deviceID":272,"vendorID":4318},{"name":"NVIDIA GeForce3","deviceID":512,"vendorID":4318},{"name":"NVIDIA GeForce4 MX 460","deviceID":368,"vendorID":4318},{"name":"NVIDIA GeForce4 Ti 4200","deviceID":595,"vendorID":4318},{"name":"NVIDIA GeForce FX 5200","deviceID":800,"vendorID":4318},{"name":"NVIDIA GeForce FX 5600","deviceID":786,"vendorID":4318},{"name":"NVIDIA GeForce FX 5800","deviceID":770,"vendorID":4318},{"name":"NVIDIA GeForce 6200","deviceID":335,"vendorID":4318},{"name":"NVIDIA GeForce 6600 GT","deviceID":320,"vendorID":4318},{"name":"NVIDIA GeForce 6800","deviceID":65,"vendorID":4318},{"name":"NVIDIA GeForce Go 7300","deviceID":2026952880896,"vendorID":4318},{"name":"NVIDIA GeForce Go 7400","deviceID":472,"vendorID":4318},{"name":"NVIDIA GeForce 7600 GT","deviceID":913,"vendorID":4318},{"name":"NVIDIA GeForce 7800 GT","deviceID":146,"vendorID":4318},{"name":"NVIDIA GeForce 8200","deviceID":9113598691403,"vendorID":4318},{"name":"NVIDIA GeForce 8300 GS","deviceID":1059,"vendorID":4318},{"name":"NVIDIA GeForce 8400 GS","deviceID":1028,"vendorID":4318},{"name":"NVIDIA GeForce 8500 GT","deviceID":1057,"vendorID":4318},{"name":"NVIDIA GeForce 8600 GT","deviceID":1026,"vendorID":4318},{"name":"NVIDIA GeForce 8600M GT","deviceID":1031,"vendorID":4318},{"name":"NVIDIA GeForce 8800 GTS","deviceID":403,"vendorID":4318},{"name":"NVIDIA GeForce 8800 GTX","deviceID":401,"vendorID":4318},{"name":"NVIDIA GeForce 9200","deviceID":2157,"vendorID":4318},{"name":"NVIDIA GeForce 9300","deviceID":2156,"vendorID":4318},{"name":"NVIDIA GeForce 9400M","deviceID":2147,"vendorID":4318},{"name":"NVIDIA GeForce 9400 GT","deviceID":1068,"vendorID":4318},{"name":"NVIDIA GeForce 9500 GT","deviceID":1600,"vendorID":4318},{"name":"NVIDIA GeForce 9600 GT","deviceID":1570,"vendorID":4318},{"name":"NVIDIA GeForce 9700M GT","deviceID":1610,"vendorID":4318},{"name":"NVIDIA GeForce 9800 GT","deviceID":1556,"vendorID":4318},{"name":"NVIDIA GeForce 210","deviceID":2595,"vendorID":4318},{"name":"NVIDIA GeForce GT 220","deviceID":2592,"vendorID":4318},{"name":"NVIDIA GeForce GT 240","deviceID":3235,"vendorID":4318},{"name":"NVIDIA GeForce GTS 250","deviceID":1557,"vendorID":4318},{"name":"NVIDIA GeForce GTX 260","deviceID":1506,"vendorID":4318},{"name":"NVIDIA GeForce GTX 275","deviceID":1510,"vendorID":4318},{"name":"NVIDIA GeForce GTX 280","deviceID":1505,"vendorID":4318},{"name":"NVIDIA GeForce 315M","deviceID":2682,"vendorID":4318},{"name":"NVIDIA GeForce 320M","deviceID":2211,"vendorID":4318},{"name":"NVIDIA GeForce GT 320M","deviceID":2605,"vendorID":4318},{"name":"NVIDIA GeForce GT 325M","deviceID":2613,"vendorID":4318},{"name":"NVIDIA GeForce GT 330","deviceID":3232,"vendorID":4318},{"name":"NVIDIA GeForce GTS 350M","deviceID":3248,"vendorID":4318},{"name":"NVIDIA GeForce 410M","deviceID":4181,"vendorID":4318},{"name":"NVIDIA GeForce GT 420","deviceID":3554,"vendorID":4318},{"name":"NVIDIA GeForce GT 425M","deviceID":3568,"vendorID":4318},{"name":"NVIDIA GeForce GT 430","deviceID":3553,"vendorID":4318},{"name":"NVIDIA GeForce GT 440","deviceID":3552,"vendorID":4318},{"name":"NVIDIA GeForce GTS 450","deviceID":3524,"vendorID":4318},{"name":"NVIDIA GeForce GTX 460","deviceID":3618,"vendorID":4318},{"name":"NVIDIA GeForce GTX 460M","deviceID":3537,"vendorID":4318},{"name":"NVIDIA GeForce GTX 465","deviceID":1732,"vendorID":4318},{"name":"NVIDIA GeForce GTX 470","deviceID":1741,"vendorID":4318},{"name":"NVIDIA GeForce GTX 480","deviceID":1728,"vendorID":4318},{"name":"NVIDIA GeForce GT 520","deviceID":4160,"vendorID":4318},{"name":"NVIDIA GeForce GT 525M","deviceID":3564,"vendorID":4318},{"name":"NVIDIA GeForce GT 540M","deviceID":3572,"vendorID":4318},{"name":"NVIDIA GeForce GTX 550 Ti","deviceID":4676,"vendorID":4318},{"name":"NVIDIA GeForce GT 555M","deviceID":1208,"vendorID":4318},{"name":"NVIDIA GeForce GTX 560 Ti","deviceID":4608,"vendorID":4318},{"name":"NVIDIA GeForce GTX 560M","deviceID":4689,"vendorID":4318},{"name":"NVIDIA GeForce GTX 560","deviceID":4609,"vendorID":4318},{"name":"NVIDIA GeForce GTX 570","deviceID":4225,"vendorID":4318},{"name":"NVIDIA GeForce GTX 580","deviceID":4224,"vendorID":4318},{"name":"NVIDIA GeForce GT 610","deviceID":4170,"vendorID":4318},{"name":"NVIDIA GeForce GT 630","deviceID":3840,"vendorID":4318},{"name":"NVIDIA GeForce GT 630M","deviceID":3561,"vendorID":4318},{"name":"NVIDIA GeForce GT 640","deviceID":4033,"vendorID":4318},{"name":"NVIDIA GeForce GT 640M","deviceID":4050,"vendorID":4318},{"name":"NVIDIA GeForce GT 650M","deviceID":4049,"vendorID":4318},{"name":"NVIDIA GeForce GTX 650","deviceID":4038,"vendorID":4318},{"name":"NVIDIA GeForce GTX 650 Ti","deviceID":4550,"vendorID":4318},{"name":"NVIDIA GeForce GTX 660","deviceID":4544,"vendorID":4318},{"name":"NVIDIA GeForce GTX 660M","deviceID":4052,"vendorID":4318},{"name":"NVIDIA GeForce GTX 660 Ti","deviceID":4483,"vendorID":4318},{"name":"NVIDIA GeForce GTX 670","deviceID":4489,"vendorID":4318},{"name":"NVIDIA GeForce GTX 670MX","deviceID":4513,"vendorID":4318},{"name":"NVIDIA GeForce GTX 675MX","deviceID":4519,"vendorID":4318},{"name":"NVIDIA GeForce GTX 675MX","deviceID":4514,"vendorID":4318},{"name":"NVIDIA GeForce GTX 680","deviceID":4480,"vendorID":4318},{"name":"NVIDIA GeForce GTX 690","deviceID":4488,"vendorID":4318},{"name":"NVIDIA GeForce GT 720","deviceID":4747,"vendorID":4318},{"name":"NVIDIA GeForce GT 730","deviceID":4743,"vendorID":4318},{"name":"NVIDIA GeForce GT 730M","deviceID":4065,"vendorID":4318},{"name":"NVIDIA GeForce GT 740M","deviceID":4754,"vendorID":4318},{"name":"NVIDIA GeForce GT 750M","deviceID":4073,"vendorID":4318},{"name":"NVIDIA GeForce GT 755M","deviceID":4045,"vendorID":4318},{"name":"NVIDIA GeForce GTX 750","deviceID":4993,"vendorID":4318},{"name":"NVIDIA GeForce GTX 750 Ti","deviceID":4992,"vendorID":4318},{"name":"NVIDIA GeForce GTX 760","deviceID":4487,"vendorID":4318},{"name":"NVIDIA GeForce GTX 760 Ti","deviceID":4499,"vendorID":4318},{"name":"NVIDIA GeForce GTX 765M","deviceID":4578,"vendorID":4318},{"name":"NVIDIA GeForce GTX 770M","deviceID":4576,"vendorID":4318},{"name":"NVIDIA GeForce GTX 770","deviceID":4484,"vendorID":4318},{"name":"NVIDIA GeForce GTX 775M","deviceID":4509,"vendorID":4318},{"name":"NVIDIA GeForce GTX 780","deviceID":4100,"vendorID":4318},{"name":"NVIDIA GeForce GTX 780M","deviceID":4510,"vendorID":4318},{"name":"NVIDIA GeForce GTX 780 Ti","deviceID":4106,"vendorID":4318},{"name":"NVIDIA GeForce GTX TITAN","deviceID":4101,"vendorID":4318},{"name":"NVIDIA GeForce GTX TITAN Black","deviceID":4108,"vendorID":4318},{"name":"NVIDIA GeForce GTX TITAN X","deviceID":6082,"vendorID":4318},{"name":"NVIDIA GeForce GTX TITAN Z","deviceID":4097,"vendorID":4318},{"name":"NVIDIA GeForce 820M","deviceID":4077,"vendorID":4318},{"name":"NVIDIA GeForce 830M","deviceID":4928,"vendorID":4318},{"name":"NVIDIA GeForce 840M","deviceID":4929,"vendorID":4318},{"name":"NVIDIA GeForce 845M","deviceID":4932,"vendorID":4318},{"name":"NVIDIA GeForce GTX 850M","deviceID":5009,"vendorID":4318},{"name":"NVIDIA GeForce GTX 860M","deviceID":21521759211930,"vendorID":4318},{"name":"NVIDIA GeForce GTX 870M","deviceID":4505,"vendorID":4318},{"name":"NVIDIA GeForce GTX 880M","deviceID":4504,"vendorID":4318},{"name":"NVIDIA GeForce 940M","deviceID":4935,"vendorID":4318},{"name":"NVIDIA GeForce GTX 950","deviceID":5122,"vendorID":4318},{"name":"NVIDIA GeForce GTX 950M","deviceID":5018,"vendorID":4318},{"name":"NVIDIA GeForce GTX 960","deviceID":5121,"vendorID":4318},{"name":"NVIDIA GeForce GTX 960M","deviceID":5019,"vendorID":4318},{"name":"NVIDIA GeForce GTX 970","deviceID":5058,"vendorID":4318},{"name":"NVIDIA GeForce GTX 970M","deviceID":5080,"vendorID":4318},{"name":"NVIDIA GeForce GTX 980","deviceID":5056,"vendorID":4318},{"name":"NVIDIA GeForce GTX 980 Ti","deviceID":6088,"vendorID":4318},{"name":"NVIDIA GeForce GT 1030","deviceID":7425,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1050","deviceID":7297,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1050 Ti","deviceID":7298,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1060 3GB","deviceID":7170,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1060","deviceID":7171,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1060M","deviceID":7200,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1070","deviceID":7041,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1080","deviceID":7040,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1080M","deviceID":7136,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1080 Ti","deviceID":6918,"vendorID":4318},{"name":"NVIDIA TITAN X (Pascal)","deviceID":6912,"vendorID":4318},{"name":"NVIDIA TITAN V","deviceID":7553,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1650 SUPER","deviceID":8583,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1660 SUPER","deviceID":8644,"vendorID":4318},{"name":"NVIDIA GeForce GTX 1660 Ti","deviceID":8578,"vendorID":4318},{"name":"NVIDIA GeForce RTX 2060","deviceID":7944,"vendorID":4318},{"name":"NVIDIA GeForce RTX 2070","deviceID":7943,"vendorID":4318},{"name":"NVIDIA GeForce RTX 2080","deviceID":7815,"vendorID":4318},{"name":"NVIDIA GeForce RTX 2080 Ti","deviceID":7687,"vendorID":4318},{"name":"NVIDIA GeForce RTX 3070","deviceID":9373,"vendorID":4318},{"name":"NVIDIA Tesla T4","deviceID":7864,"vendorID":4318},{"name":"NVIDIA Ampere A10","deviceID":8758,"vendorID":4318},{"name":"ATI Rage Fury","deviceID":21062,"vendorID":4098},{"name":"ATI RADEON 7200 SERIES","deviceID":20804,"vendorID":4098},{"name":"ATI RADEON 8500 SERIES","deviceID":20812,"vendorID":4098},{"name":"ATI Radeon 9500","deviceID":16708,"vendorID":4098},{"name":"ATI RADEON XPRESS 200M Series","deviceID":22869,"vendorID":4098},{"name":"ATI Radeon X700 SE","deviceID":24140,"vendorID":4098},{"name":"ATI Radeon X1600 Series","deviceID":29122,"vendorID":4098},{"name":"ATI Mobility Radeon HD 2350","deviceID":38087,"vendorID":4098},{"name":"ATI Mobility Radeon HD 2600","deviceID":38273,"vendorID":4098},{"name":"ATI Radeon HD 2900 XT","deviceID":37888,"vendorID":4098},{"name":"ATI Radeon HD 3200 Graphics","deviceID":38432,"vendorID":4098},{"name":"ATI Radeon HD 3850 AGP","deviceID":38165,"vendorID":4098},{"name":"ATI Mobility Radeon HD 4200","deviceID":38674,"vendorID":4098},{"name":"ATI Radeon HD 4350","deviceID":38223,"vendorID":4098},{"name":"ATI Radeon HD 4600 Series","deviceID":38037,"vendorID":4098},{"name":"ATI Radeon HD 4700 Series","deviceID":37966,"vendorID":4098},{"name":"ATI Radeon HD 4800 Series","deviceID":37964,"vendorID":4098},{"name":"ATI Radeon HD 5400 Series","deviceID":26873,"vendorID":4098},{"name":"ATI Radeon HD 5600 Series","deviceID":26840,"vendorID":4098},{"name":"ATI Radeon HD 5700 Series","deviceID":26814,"vendorID":4098},{"name":"ATI Radeon HD 5800 Series","deviceID":26776,"vendorID":4098},{"name":"ATI Radeon HD 5900 Series","deviceID":26780,"vendorID":4098},{"name":"AMD Radeon HD 6300 series Graphics","deviceID":38915,"vendorID":4098},{"name":"AMD Radeon HD 6400 Series","deviceID":26480,"vendorID":4098},{"name":"AMD Radeon HD 6410D","deviceID":38468,"vendorID":4098},{"name":"AMD Radeon HD 6480G","deviceID":38472,"vendorID":4098},{"name":"AMD Radeon HD 6490M","deviceID":26464,"vendorID":4098},{"name":"AMD Radeon HD 6550D","deviceID":38464,"vendorID":4098},{"name":"AMD Radeon HD 6600 Series","deviceID":26456,"vendorID":4098},{"name":"AMD Radeon HD 6600M Series","deviceID":26433,"vendorID":4098},{"name":"AMD Radeon HD 6700 Series","deviceID":26810,"vendorID":4098},{"name":"AMD Radeon HD 6800 Series","deviceID":26425,"vendorID":4098},{"name":"AMD Radeon HD 6900 Series","deviceID":26393,"vendorID":4098},{"name":"AMD Radeon HD 7660D","deviceID":39169,"vendorID":4098},{"name":"AMD Radeon HD 7700 Series","deviceID":26685,"vendorID":4098},{"name":"AMD Radeon HD 7800 Series","deviceID":26649,"vendorID":4098},{"name":"AMD Radeon HD 7870 Series","deviceID":26648,"vendorID":4098},{"name":"AMD Radeon HD 7900 Series","deviceID":26522,"vendorID":4098},{"name":"AMD Radeon HD 8600M Series","deviceID":26208,"vendorID":4098},{"name":"AMD Radeon HD 8670","deviceID":26128,"vendorID":4098},{"name":"AMD Radeon HD 8770","deviceID":26204,"vendorID":4098},{"name":"AMD Radeon HD 8400 \/ R3 Series","deviceID":38960,"vendorID":4098},{"name":"AMD Radeon(TM) R7 Graphics","deviceID":4879,"vendorID":4098},{"name":"AMD Radeon R9 285","deviceID":26937,"vendorID":4098},{"name":"AMD Radeon R9 290","deviceID":26545,"vendorID":4098},{"name":"AMD Radeon R9 290X","deviceID":26544,"vendorID":4098},{"name":"AMD Radeon (TM) R9 Fury Series","deviceID":29440,"vendorID":4098},{"name":"AMD Radeon R9 M370X","deviceID":26657,"vendorID":4098},{"name":"AMD Radeon R9 M380","deviceID":26183,"vendorID":4098},{"name":"AMD Radeon R9 M395X","deviceID":26912,"vendorID":4098},{"name":"Radeon(TM) RX 460 Graphics","deviceID":26607,"vendorID":4098},{"name":"Radeon (TM) RX 480 Graphics","deviceID":26591,"vendorID":4098},{"name":"Radeon RX Vega","deviceID":26751,"vendorID":4098},{"name":"Radeon Pro Vega 20","deviceID":27055,"vendorID":4098},{"name":"AMD Radeon(TM) Vega 10 Mobile Graphics","deviceID":5597,"vendorID":4098},{"name":"Radeon RX Vega 20","deviceID":26287,"vendorID":4098},{"name":"Radeon RX 5700 \/ 5700 XT","deviceID":29471,"vendorID":4098},{"name":"Radeon RX 5500M","deviceID":29504,"vendorID":4098},{"name":"Radeon RX 6800\/6800 XT \/ 6900 XT","deviceID":29631,"vendorID":4098},{"name":"Radeon Pro V620","deviceID":29601,"vendorID":4098},{"name":"Radeon Pro V620 VF","deviceID":29614,"vendorID":4098},{"name":"AMD VANGOGH","deviceID":5695,"vendorID":4098},{"name":"AMD Radeon(TM) Graphics","deviceID":5710,"vendorID":4098},{"name":"Intel(R) 82830M Graphics Controller","deviceID":13687,"vendorID":32902},{"name":"Intel(R) 82852\/82855 GM\/GME Graphics Controller","deviceID":13698,"vendorID":32902},{"name":"Intel(R) 845G","deviceID":9570,"vendorID":32902},{"name":"Intel(R) 82865G Graphics Controller","deviceID":9586,"vendorID":32902},{"name":"Intel(R) 82915G\/GV\/910GL Express Chipset Family","deviceID":9602,"vendorID":32902},{"name":"Intel(R) E7221G","deviceID":9610,"vendorID":32902},{"name":"Mobile Intel(R) 915GM\/GMS","deviceID":9618,"vendorID":32902},{"name":"Intel(R) 945G","deviceID":10098,"vendorID":32902},{"name":"Mobile Intel(R) 945GM Express Chipset Family","deviceID":10146,"vendorID":32902},{"name":"Intel(R) 945GME","deviceID":10158,"vendorID":32902},{"name":"Intel(R) Q35","deviceID":10674,"vendorID":32902},{"name":"Intel(R) G33","deviceID":10690,"vendorID":32902},{"name":"Intel(R) Q33","deviceID":10706,"vendorID":32902},{"name":"Intel(R) IGD","deviceID":40961,"vendorID":32902},{"name":"Intel(R) IGD","deviceID":40977,"vendorID":32902},{"name":"Intel(R) 965Q","deviceID":10642,"vendorID":32902},{"name":"Intel(R) 965G","deviceID":10626,"vendorID":32902},{"name":"Intel(R) 946GZ","deviceID":10610,"vendorID":32902},{"name":"Mobile Intel(R) 965 Express Chipset Family","deviceID":10754,"vendorID":32902},{"name":"Intel(R) 965GME","deviceID":10770,"vendorID":32902},{"name":"Mobile Intel(R) GM45 Express Chipset Family","deviceID":10818,"vendorID":32902},{"name":"Intel(R) Integrated Graphics Device","deviceID":11778,"vendorID":32902},{"name":"Intel(R) G45\/G43","deviceID":11810,"vendorID":32902},{"name":"Intel(R) Q45\/Q43","deviceID":11794,"vendorID":32902},{"name":"Intel(R) G41","deviceID":11826,"vendorID":32902},{"name":"Intel(R) B43","deviceID":11922,"vendorID":32902},{"name":"Intel(R) HD Graphics","deviceID":66,"vendorID":32902},{"name":"Intel(R) HD Graphics","deviceID":70,"vendorID":32902},{"name":"Intel(R) HD Graphics 3000","deviceID":290,"vendorID":32902},{"name":"Intel(R) HD Graphics 3000","deviceID":294,"vendorID":32902},{"name":"Intel(R) HD Graphics Family","deviceID":266,"vendorID":32902},{"name":"Intel(R) HD Graphics 4000","deviceID":354,"vendorID":32902},{"name":"Intel(R) HD Graphics 4000","deviceID":358,"vendorID":32902},{"name":"Intel(R) HD Graphics Family","deviceID":346,"vendorID":32902},{"name":"Intel(R) HD Graphics 4600","deviceID":1042,"vendorID":32902},{"name":"Intel(R) HD Graphics 4600","deviceID":1046,"vendorID":32902},{"name":"Intel(R) HD Graphics 5000","deviceID":2598,"vendorID":32902},{"name":"Intel(R) HD Graphics 5000","deviceID":1058,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 5100","deviceID":2594,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 5100","deviceID":2602,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 5100","deviceID":2603,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 5100","deviceID":2606,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 5200","deviceID":3362,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 5200","deviceID":3366,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 5200","deviceID":3370,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 5200","deviceID":3371,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 5200","deviceID":3374,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 5200","deviceID":3106,"vendorID":32902},{"name":"Intel(R) HD Graphics 5300","deviceID":5662,"vendorID":32902},{"name":"Intel(R) HD Graphics 5500","deviceID":5654,"vendorID":32902},{"name":"Intel(R) HD Graphics 5600","deviceID":5650,"vendorID":32902},{"name":"Intel(R) HD Graphics 6000","deviceID":5670,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 6100","deviceID":5675,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 6200","deviceID":5666,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics P6300","deviceID":5674,"vendorID":32902},{"name":"Intel(R) HD Graphics 510","deviceID":6402,"vendorID":32902},{"name":"Intel(R) HD Graphics 510","deviceID":6406,"vendorID":32902},{"name":"Intel(R) HD Graphics 510","deviceID":6411,"vendorID":32902},{"name":"Intel(R) HD Graphics 515","deviceID":6430,"vendorID":32902},{"name":"Intel(R) HD Graphics 520","deviceID":6422,"vendorID":32902},{"name":"Intel(R) HD Graphics 520","deviceID":6433,"vendorID":32902},{"name":"Intel(R) HD Graphics 530","deviceID":6418,"vendorID":32902},{"name":"Intel(R) HD Graphics 530","deviceID":6427,"vendorID":32902},{"name":"Intel(R) HD Graphics P530","deviceID":6429,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 540","deviceID":6438,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 550","deviceID":6439,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics 555","deviceID":6443,"vendorID":32902},{"name":"Intel(R) Iris(TM) Graphics P555","deviceID":6445,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 580","deviceID":6450,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics 580","deviceID":6459,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics P580","deviceID":6458,"vendorID":32902},{"name":"Intel(R) Iris(TM) Pro Graphics P580","deviceID":6461,"vendorID":32902},{"name":"Intel(R) UHD Graphics 617","deviceID":34752,"vendorID":32902},{"name":"Intel(R) UHD Graphics 620","deviceID":16032,"vendorID":32902},{"name":"Intel(R) HD Graphics 615","deviceID":22814,"vendorID":32902},{"name":"Intel(R) HD Graphics 620","deviceID":22806,"vendorID":32902},{"name":"Intel(R) HD Graphics 630","deviceID":22802,"vendorID":32902},{"name":"Intel(R) HD Graphics 630","deviceID":22811,"vendorID":32902},{"name":"Intel(R) UHD Graphics 630","deviceID":16027,"vendorID":32902},{"name":"Intel(R) UHD Graphics 630","deviceID":16017,"vendorID":32902}]
\ No newline at end of file
+[
+  {
+    "name": "NVIDIA RIVA 128",
+    "deviceID": 24,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA RIVA TNT",
+    "deviceID": 32,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA RIVA TNT2/TNT2 Pro",
+    "deviceID": 40,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 256",
+    "deviceID": 256,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce2 GTS/GeForce2 Pro",
+    "deviceID": 336,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce2 MX/MX 400",
+    "deviceID": 272,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce3",
+    "deviceID": 512,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce4 MX 460",
+    "deviceID": 368,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce4 Ti 4200",
+    "deviceID": 595,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce FX 5200",
+    "deviceID": 800,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce FX 5600",
+    "deviceID": 786,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce FX 5800",
+    "deviceID": 770,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 6200",
+    "deviceID": 335,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 6600 GT",
+    "deviceID": 320,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 6800",
+    "deviceID": 65,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce Go 7300",
+    "deviceID": 2026952880896,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce Go 7400",
+    "deviceID": 472,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 7600 GT",
+    "deviceID": 913,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 7800 GT",
+    "deviceID": 146,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8200",
+    "deviceID": 9113598691403,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8300 GS",
+    "deviceID": 1059,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8400 GS",
+    "deviceID": 1028,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8500 GT",
+    "deviceID": 1057,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8600 GT",
+    "deviceID": 1026,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8600M GT",
+    "deviceID": 1031,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8800 GTS",
+    "deviceID": 403,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 8800 GTX",
+    "deviceID": 401,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9200",
+    "deviceID": 2157,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9300",
+    "deviceID": 2156,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9400M",
+    "deviceID": 2147,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9400 GT",
+    "deviceID": 1068,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9500 GT",
+    "deviceID": 1600,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9600 GT",
+    "deviceID": 1570,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9700M GT",
+    "deviceID": 1610,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 9800 GT",
+    "deviceID": 1556,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 210",
+    "deviceID": 2595,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 220",
+    "deviceID": 2592,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 240",
+    "deviceID": 3235,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTS 250",
+    "deviceID": 1557,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 260",
+    "deviceID": 1506,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 275",
+    "deviceID": 1510,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 280",
+    "deviceID": 1505,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 315M",
+    "deviceID": 2682,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 320M",
+    "deviceID": 2211,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 320M",
+    "deviceID": 2605,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 325M",
+    "deviceID": 2613,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 330",
+    "deviceID": 3232,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTS 350M",
+    "deviceID": 3248,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 410M",
+    "deviceID": 4181,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 420",
+    "deviceID": 3554,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 425M",
+    "deviceID": 3568,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 430",
+    "deviceID": 3553,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 440",
+    "deviceID": 3552,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTS 450",
+    "deviceID": 3524,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 460",
+    "deviceID": 3618,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 460M",
+    "deviceID": 3537,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 465",
+    "deviceID": 1732,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 470",
+    "deviceID": 1741,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 480",
+    "deviceID": 1728,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 520",
+    "deviceID": 4160,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 525M",
+    "deviceID": 3564,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 540M",
+    "deviceID": 3572,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 550 Ti",
+    "deviceID": 4676,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 555M",
+    "deviceID": 1208,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 560 Ti",
+    "deviceID": 4608,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 560M",
+    "deviceID": 4689,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 560",
+    "deviceID": 4609,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 570",
+    "deviceID": 4225,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 580",
+    "deviceID": 4224,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 610",
+    "deviceID": 4170,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 630",
+    "deviceID": 3840,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 630M",
+    "deviceID": 3561,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 640",
+    "deviceID": 4033,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 640M",
+    "deviceID": 4050,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 650M",
+    "deviceID": 4049,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 650",
+    "deviceID": 4038,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 650 Ti",
+    "deviceID": 4550,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 660",
+    "deviceID": 4544,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 660M",
+    "deviceID": 4052,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 660 Ti",
+    "deviceID": 4483,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 670",
+    "deviceID": 4489,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 670MX",
+    "deviceID": 4513,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 675MX",
+    "deviceID": 4519,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 675MX",
+    "deviceID": 4514,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 680",
+    "deviceID": 4480,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 690",
+    "deviceID": 4488,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 720",
+    "deviceID": 4747,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 730",
+    "deviceID": 4743,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 730M",
+    "deviceID": 4065,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 740M",
+    "deviceID": 4754,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 750M",
+    "deviceID": 4073,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 755M",
+    "deviceID": 4045,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 750",
+    "deviceID": 4993,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 750 Ti",
+    "deviceID": 4992,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 760",
+    "deviceID": 4487,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 760 Ti",
+    "deviceID": 4499,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 765M",
+    "deviceID": 4578,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 770M",
+    "deviceID": 4576,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 770",
+    "deviceID": 4484,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 775M",
+    "deviceID": 4509,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 780",
+    "deviceID": 4100,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 780M",
+    "deviceID": 4510,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 780 Ti",
+    "deviceID": 4106,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX TITAN",
+    "deviceID": 4101,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX TITAN Black",
+    "deviceID": 4108,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX TITAN X",
+    "deviceID": 6082,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX TITAN Z",
+    "deviceID": 4097,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 820M",
+    "deviceID": 4077,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 830M",
+    "deviceID": 4928,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 840M",
+    "deviceID": 4929,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 845M",
+    "deviceID": 4932,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 850M",
+    "deviceID": 5009,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 860M",
+    "deviceID": 21521759211930,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 870M",
+    "deviceID": 4505,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 880M",
+    "deviceID": 4504,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce 940M",
+    "deviceID": 4935,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 950",
+    "deviceID": 5122,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 950M",
+    "deviceID": 5018,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 960",
+    "deviceID": 5121,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 960M",
+    "deviceID": 5019,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 970",
+    "deviceID": 5058,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 970M",
+    "deviceID": 5080,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 980",
+    "deviceID": 5056,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 980 Ti",
+    "deviceID": 6088,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GT 1030",
+    "deviceID": 7425,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1050",
+    "deviceID": 7297,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1050 Ti",
+    "deviceID": 7298,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1060 3GB",
+    "deviceID": 7170,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1060",
+    "deviceID": 7171,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1060M",
+    "deviceID": 7200,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1070",
+    "deviceID": 7041,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1080",
+    "deviceID": 7040,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1080M",
+    "deviceID": 7136,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1080 Ti",
+    "deviceID": 6918,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA TITAN X (Pascal)",
+    "deviceID": 6912,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA TITAN V",
+    "deviceID": 7553,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1650 SUPER",
+    "deviceID": 8583,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1660 SUPER",
+    "deviceID": 8644,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce GTX 1660 Ti",
+    "deviceID": 8578,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce RTX 2060",
+    "deviceID": 7944,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce RTX 2070",
+    "deviceID": 7943,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce RTX 2080",
+    "deviceID": 7815,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce RTX 2080 Ti",
+    "deviceID": 7687,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA GeForce RTX 3070",
+    "deviceID": 9373,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA Tesla T4",
+    "deviceID": 7864,
+    "vendorID": 4318
+  },
+  {
+    "name": "NVIDIA Ampere A10",
+    "deviceID": 8758,
+    "vendorID": 4318
+  },
+  {
+    "name": "ATI Rage Fury",
+    "deviceID": 21062,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI RADEON 7200 SERIES",
+    "deviceID": 20804,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI RADEON 8500 SERIES",
+    "deviceID": 20812,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon 9500",
+    "deviceID": 16708,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI RADEON XPRESS 200M Series",
+    "deviceID": 22869,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon X700 SE",
+    "deviceID": 24140,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon X1600 Series",
+    "deviceID": 29122,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Mobility Radeon HD 2350",
+    "deviceID": 38087,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Mobility Radeon HD 2600",
+    "deviceID": 38273,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 2900 XT",
+    "deviceID": 37888,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 3200 Graphics",
+    "deviceID": 38432,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 3850 AGP",
+    "deviceID": 38165,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Mobility Radeon HD 4200",
+    "deviceID": 38674,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 4350",
+    "deviceID": 38223,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 4600 Series",
+    "deviceID": 38037,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 4700 Series",
+    "deviceID": 37966,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 4800 Series",
+    "deviceID": 37964,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 5400 Series",
+    "deviceID": 26873,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 5600 Series",
+    "deviceID": 26840,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 5700 Series",
+    "deviceID": 26814,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 5800 Series",
+    "deviceID": 26776,
+    "vendorID": 4098
+  },
+  {
+    "name": "ATI Radeon HD 5900 Series",
+    "deviceID": 26780,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6300 series Graphics",
+    "deviceID": 38915,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6400 Series",
+    "deviceID": 26480,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6410D",
+    "deviceID": 38468,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6480G",
+    "deviceID": 38472,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6490M",
+    "deviceID": 26464,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6550D",
+    "deviceID": 38464,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6600 Series",
+    "deviceID": 26456,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6600M Series",
+    "deviceID": 26433,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6700 Series",
+    "deviceID": 26810,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6800 Series",
+    "deviceID": 26425,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 6900 Series",
+    "deviceID": 26393,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 7660D",
+    "deviceID": 39169,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 7700 Series",
+    "deviceID": 26685,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 7800 Series",
+    "deviceID": 26649,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 7870 Series",
+    "deviceID": 26648,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 7900 Series",
+    "deviceID": 26522,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 8600M Series",
+    "deviceID": 26208,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 8670",
+    "deviceID": 26128,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 8770",
+    "deviceID": 26204,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon HD 8400 / R3 Series",
+    "deviceID": 38960,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon(TM) R7 Graphics",
+    "deviceID": 4879,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon R9 285",
+    "deviceID": 26937,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon R9 290",
+    "deviceID": 26545,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon R9 290X",
+    "deviceID": 26544,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon (TM) R9 Fury Series",
+    "deviceID": 29440,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon R9 M370X",
+    "deviceID": 26657,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon R9 M380",
+    "deviceID": 26183,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon R9 M395X",
+    "deviceID": 26912,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon(TM) RX 460 Graphics",
+    "deviceID": 26607,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon (TM) RX 480 Graphics",
+    "deviceID": 26591,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon RX Vega",
+    "deviceID": 26751,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon Pro Vega 20",
+    "deviceID": 27055,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon(TM) Vega 10 Mobile Graphics",
+    "deviceID": 5597,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon RX Vega 20",
+    "deviceID": 26287,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon RX 5700 / 5700 XT",
+    "deviceID": 29471,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon RX 5500M",
+    "deviceID": 29504,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon RX 6800/6800 XT / 6900 XT",
+    "deviceID": 29631,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon Pro V620",
+    "deviceID": 29601,
+    "vendorID": 4098
+  },
+  {
+    "name": "Radeon Pro V620 VF",
+    "deviceID": 29614,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD VANGOGH",
+    "deviceID": 5695,
+    "vendorID": 4098
+  },
+  {
+    "name": "AMD Radeon(TM) Graphics",
+    "deviceID": 5710,
+    "vendorID": 4098
+  },
+  {
+    "name": "Intel(R) 82830M Graphics Controller",
+    "deviceID": 13687,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 82852/82855 GM/GME Graphics Controller",
+    "deviceID": 13698,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 845G",
+    "deviceID": 9570,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 82865G Graphics Controller",
+    "deviceID": 9586,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 82915G/GV/910GL Express Chipset Family",
+    "deviceID": 9602,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) E7221G",
+    "deviceID": 9610,
+    "vendorID": 32902
+  },
+  {
+    "name": "Mobile Intel(R) 915GM/GMS",
+    "deviceID": 9618,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 945G",
+    "deviceID": 10098,
+    "vendorID": 32902
+  },
+  {
+    "name": "Mobile Intel(R) 945GM Express Chipset Family",
+    "deviceID": 10146,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 945GME",
+    "deviceID": 10158,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Q35",
+    "deviceID": 10674,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) G33",
+    "deviceID": 10690,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Q33",
+    "deviceID": 10706,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) IGD",
+    "deviceID": 40961,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) IGD",
+    "deviceID": 40977,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 965Q",
+    "deviceID": 10642,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 965G",
+    "deviceID": 10626,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 946GZ",
+    "deviceID": 10610,
+    "vendorID": 32902
+  },
+  {
+    "name": "Mobile Intel(R) 965 Express Chipset Family",
+    "deviceID": 10754,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) 965GME",
+    "deviceID": 10770,
+    "vendorID": 32902
+  },
+  {
+    "name": "Mobile Intel(R) GM45 Express Chipset Family",
+    "deviceID": 10818,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Integrated Graphics Device",
+    "deviceID": 11778,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) G45/G43",
+    "deviceID": 11810,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Q45/Q43",
+    "deviceID": 11794,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) G41",
+    "deviceID": 11826,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) B43",
+    "deviceID": 11922,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics",
+    "deviceID": 66,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics",
+    "deviceID": 70,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 3000",
+    "deviceID": 290,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 3000",
+    "deviceID": 294,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics Family",
+    "deviceID": 266,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 4000",
+    "deviceID": 354,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 4000",
+    "deviceID": 358,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics Family",
+    "deviceID": 346,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 4600",
+    "deviceID": 1042,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 4600",
+    "deviceID": 1046,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 5000",
+    "deviceID": 2598,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 5000",
+    "deviceID": 1058,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 5100",
+    "deviceID": 2594,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 5100",
+    "deviceID": 2602,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 5100",
+    "deviceID": 2603,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 5100",
+    "deviceID": 2606,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 5200",
+    "deviceID": 3362,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 5200",
+    "deviceID": 3366,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 5200",
+    "deviceID": 3370,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 5200",
+    "deviceID": 3371,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 5200",
+    "deviceID": 3374,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 5200",
+    "deviceID": 3106,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 5300",
+    "deviceID": 5662,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 5500",
+    "deviceID": 5654,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 5600",
+    "deviceID": 5650,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 6000",
+    "deviceID": 5670,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 6100",
+    "deviceID": 5675,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 6200",
+    "deviceID": 5666,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics P6300",
+    "deviceID": 5674,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 510",
+    "deviceID": 6402,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 510",
+    "deviceID": 6406,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 510",
+    "deviceID": 6411,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 515",
+    "deviceID": 6430,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 520",
+    "deviceID": 6422,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 520",
+    "deviceID": 6433,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 530",
+    "deviceID": 6418,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 530",
+    "deviceID": 6427,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics P530",
+    "deviceID": 6429,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 540",
+    "deviceID": 6438,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 550",
+    "deviceID": 6439,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics 555",
+    "deviceID": 6443,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Graphics P555",
+    "deviceID": 6445,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 580",
+    "deviceID": 6450,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics 580",
+    "deviceID": 6459,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics P580",
+    "deviceID": 6458,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) Iris(TM) Pro Graphics P580",
+    "deviceID": 6461,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) UHD Graphics 617",
+    "deviceID": 34752,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) UHD Graphics 620",
+    "deviceID": 16032,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 615",
+    "deviceID": 22814,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 620",
+    "deviceID": 22806,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 630",
+    "deviceID": 22802,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) HD Graphics 630",
+    "deviceID": 22811,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) UHD Graphics 630",
+    "deviceID": 16027,
+    "vendorID": 32902
+  },
+  {
+    "name": "Intel(R) UHD Graphics 630",
+    "deviceID": 16017,
+    "vendorID": 32902
+  }
+]
diff --git a/app/src/main/assets/metadata/startmenu.json b/app/src/main/assets/metadata/startmenu.json
index 8b0c988a5..5d670ce76 100644
--- a/app/src/main/assets/metadata/startmenu.json
+++ b/app/src/main/assets/metadata/startmenu.json
@@ -12,6 +12,26 @@
         {
             "name" : "Wordpad",
             "path" : "C:/windows/system32/write.exe"
+        },
+        {
+            "name" : "Graphics Test (32-bit)",
+            "path" : "C:/ProgramData/Microsoft/Windows/Graphics-Test-32bit.exe"
+        },
+        {
+            "name" : "Graphics Test (64-bit)",
+            "path" : "C:/ProgramData/Microsoft/Windows/Graphics-Test-64bit.exe"
+        },
+        {
+            "name" : "Input Test (32-bit)",
+            "path" : "C:/ProgramData/Microsoft/Windows/InputControl32.exe"
+        },
+        {
+            "name" : "Input Test (64-bit)",
+            "path" : "C:/ProgramData/Microsoft/Windows/InputControl64.exe"
+        },
+        {
+            "name" : "Ajay Prefix Pro v1.8 Downloader",
+            "path" : "Z:/home/.Ajay_Prefix/Ajay_Prefix_Pro_v1.8_Downloader.exe"
         }
         ]
     },
@@ -54,4 +74,4 @@
             }
         ]
     }
-]
+                ]
diff --git a/app/src/main/assets/pulseaudio-bin/libltdl.so b/app/src/main/assets/pulseaudio-bin/libltdl.so
deleted file mode 100644
index 48b910a2a..000000000
Binary files a/app/src/main/assets/pulseaudio-bin/libltdl.so and /dev/null differ
diff --git a/app/src/main/assets/pulseaudio-bin/libpulse.so b/app/src/main/assets/pulseaudio-bin/libpulse.so
deleted file mode 100644
index bc8b723e0..000000000
Binary files a/app/src/main/assets/pulseaudio-bin/libpulse.so and /dev/null differ
diff --git a/app/src/main/assets/pulseaudio-bin/libpulseaudio.so b/app/src/main/assets/pulseaudio-bin/libpulseaudio.so
deleted file mode 100644
index 59a044255..000000000
Binary files a/app/src/main/assets/pulseaudio-bin/libpulseaudio.so and /dev/null differ
diff --git a/app/src/main/assets/pulseaudio-bin/libpulsecommon-13.0.so b/app/src/main/assets/pulseaudio-bin/libpulsecommon-13.0.so
deleted file mode 100644
index ce2e949f5..000000000
Binary files a/app/src/main/assets/pulseaudio-bin/libpulsecommon-13.0.so and /dev/null differ
diff --git a/app/src/main/assets/pulseaudio-bin/libpulsecore-13.0.so b/app/src/main/assets/pulseaudio-bin/libpulsecore-13.0.so
deleted file mode 100644
index 031ff579f..000000000
Binary files a/app/src/main/assets/pulseaudio-bin/libpulsecore-13.0.so and /dev/null differ
diff --git a/app/src/main/assets/pulseaudio-bin/libsndfile.so b/app/src/main/assets/pulseaudio-bin/libsndfile.so
deleted file mode 100644
index dcf49b7fa..000000000
Binary files a/app/src/main/assets/pulseaudio-bin/libsndfile.so and /dev/null differ
diff --git a/app/src/main/assets/pulseaudio.tzst b/app/src/main/assets/pulseaudio.tzst
index 076a47a3e..7cdea4405 100644
Binary files a/app/src/main/assets/pulseaudio.tzst and b/app/src/main/assets/pulseaudio.tzst differ
diff --git a/app/src/main/assets/retro/GLideN64.custom.ini b/app/src/main/assets/retro/GLideN64.custom.ini
new file mode 100644
index 000000000..842d2d54b
--- /dev/null
+++ b/app/src/main/assets/retro/GLideN64.custom.ini
@@ -0,0 +1,360 @@
+; Custom game settings
+[General]
+version=13
+
+[TWINE]
+Good_Name=007 - The World Is Not Enough (E)(U)
+frameBufferEmulation\N64DepthCompare=1
+
+[40%20WINKS]
+Good_Name=40 Winks (E) (M3) (Prototype)
+graphics2D\enableNativeResTexrects=1
+
+[BAKU-BOMBERMAN]
+Good_Name=Baku Bomberman (J) [!]
+generalEmulation\enableLegacyBlending=0
+
+[BIOFREAKS]
+Good_Name=Bio F.R.E.A.K.S. (E)(U)
+frameBufferEmulation\copyToRDRAM=1
+
+[BIOHAZARD%20II]
+Good_Name=Biohazard 2 (J)
+frameBufferEmulation\copyFromRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[BOMBERMAN64E]
+Good_Name=Bomberman 64 (E) [!]
+generalEmulation\enableLegacyBlending=0
+
+[BOMBERMAN64U]
+Good_Name=Bomberman 64 (U) [!]
+generalEmulation\enableLegacyBlending=0
+
+[362D06B6]
+Good_Name=Densha de Go! 64 (J)
+generalEmulation\enableLegacyBlending=0
+
+[68D128AE]
+Good_Name=Densha de Go! 64 (J) (Localization Patch v1.01)
+generalEmulation\enableLegacyBlending=0
+
+[52150A67]
+Good_Name=Bokujou Monogatari 2 (J)
+frameBufferEmulation\N64DepthCompare=1
+
+[67000C2B]
+Good_Name=Eikou no Saint Andrews (J)
+frameBufferEmulation\forceDepthBufferClear=1
+
+[CAL%20SPEED]
+Good_Name=California Speed (U)
+frameBufferEmulation\bufferSwapMode=1
+
+[CASTLEVANIA2]
+Good_Name=Castlevania - Legacy Of Darkness (E)(U)
+frameBufferEmulation\copyToRDRAM=1
+
+[DMPJ]
+Good_Name=Mario Artist Paint Studio (J) (64DD)
+frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyFromRDRAM=1
+frameBufferEmulation\nativeResFactor=1
+generalEmulation\rdramImageDitheringMode=0
+
+[DMTJ]
+Good_Name=Mario Artist Talent Studio (J) (64DD)
+frameBufferEmulation\copyAuxToRDRAM=1
+
+[DINO%20PLANET]
+Good_Name=Dinosaur Planet (Dec 2000 Beta)
+frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyAuxToRDRAM=1
+
+[DONKEY%20KONG%2064]
+Good_Name=Donkey Kong 64 (E)(J)(U)
+frameBufferEmulation\copyDepthToRDRAM=0
+frameBufferEmulation\N64DepthCompare=0
+
+[DR.MARIO%2064]
+Good_Name=Dr. Mario 64 (U)
+frameBufferEmulation\fbInfoDisabled=0
+frameBufferEmulation\copyFromRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+
+[EXTREME_G]
+Good_Name=Extreme-G (E)
+frameBufferEmulation\N64DepthCompare=1
+
+[EXTREME-G]
+Good_Name=Extreme-G (J)
+frameBufferEmulation\N64DepthCompare=1
+
+[EXTREMEG]
+Good_Name=Extreme-G (U)
+frameBufferEmulation\N64DepthCompare=1
+
+[EXTREME%20G%202]
+Good_Name=Extreme-G XG2 (E) (U)
+frameBufferEmulation\N64DepthCompare=1
+
+[208E05CD]
+Good_Name=Extreme-G XG2 (J)
+frameBufferEmulation\N64DepthCompare=1
+
+[F1%20POLE%20POSITION%2064]
+Good_Name=F-1 Pole Position 64 (E)(U)
+frameBufferEmulation\copyToRDRAM=1
+
+[FLAPPYBIRD64]
+Good_Name=FlappyBird64
+frameBufferEmulation\fbInfoDisabled=0
+frameBufferEmulation\copyFromRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+
+[GOEMON2%20DERODERO]
+Good_Name=Ganbare Goemon - Dero Dero Douchuu Obake Tenkomori (J)
+graphics2D\enableNativeResTexrects=1
+
+[GOEMONS%20GREAT%20ADV]
+Good_Name=Goemons Great Adventure (U)
+graphics2D\enableNativeResTexrects=1
+
+[HARVESTMOON64]
+Good_Name=Harvest Moon 64 (U)
+frameBufferEmulation\N64DepthCompare=1
+
+[5CFA0A2E]
+Good_Name=Heiwa Pachinko World 64 (J)
+frameBufferEmulation\copyToRDRAM=1
+
+[HEXEN]
+Good_Name=Hexen (E)(F)(G)(J)(U)
+frameBufferEmulation\copyToRDRAM=1
+
+[HUMAN%20GRAND%20PRIX]
+Good_Name=Human Grand Prix - New Generation (J)
+frameBufferEmulation\copyToRDRAM=1
+
+[I%20S%20S%2064]
+Good_Name=International Superstar Soccer 64 (E) (U)
+frameBufferEmulation\N64DepthCompare=1
+
+[JET%20FORCE%20GEMINI]
+Good_Name=Jet Force Gemini (E)(U)
+frameBufferEmulation\fbInfoDisabled=0
+frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+
+[J%20F%20G%20DISPLAY]
+Good_Name=Jet Force Gemini Kiosk Demo (U)
+frameBufferEmulation\fbInfoDisabled=0
+frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+
+[J%20WORLD%20SOCCER3]
+Good_Name=Jikkyou World Soccer 3 (J)
+frameBufferEmulation\N64DepthCompare=1
+
+[301E07CC]
+Good_Name=Mahjong Master (J)
+frameBufferEmulation\N64DepthCompare=1
+
+[DMGJ]
+Good_Name=Mario Artist Polygon Studio (J)
+frameBufferEmulation\copyAuxToRDRAM=1
+
+[KEN%20GRIFFEY%20SLUGFEST]
+Good_Name=Ken Griffey Jr.'s Slugfest
+frameBufferEmulation\fbInfoDisabled=0
+
+[KIRBY64]
+Good_Name=Kirby 64 - The Crystal Shards (E)(J)(U)
+graphics2D\enableNativeResTexrects=1
+
+[MARIOGOLF64]
+Good_Name=Mario Golf (E)(J)(U)
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[MARIOKART64]
+Good_Name=Mario Kart 64 (E)(J)(U)
+graphics2D\enableNativeResTexrects=1
+graphics2D\enableTexCoordBounds=1
+frameBufferEmulation\copyToRDRAM=2
+
+[MARIO%20STORY]
+Good_Name=Mario Story (J)
+frameBufferEmulation\copyToRDRAM=1
+
+[MEGA%20MAN%2064]
+Good_Name=Mega Man 64 (U)
+graphics2D\correctTexrectCoords=2
+
+[MEGAMAN%2064]
+Good_Name=Mega Man 64 (Proto)
+graphics2D\correctTexrectCoords=2
+
+[MLB%20FEATURING%20K%20G%20JR]
+Good_Name=Major League Baseball Featuring Ken Griffey Jr.
+frameBufferEmulation\fbInfoDisabled=0
+
+[MYSTICAL%20NINJA2%20SG]
+Good_Name=Mystical Ninja 2 Starring Goemon (E)
+graphics2D\enableNativeResTexrects=1
+
+[NASCAR%202000]
+Good_Name=NASCAR 2000 (U)
+frameBufferEmulation\copyToRDRAM=1
+
+[NASCAR%2099]
+Good_Name=NASCAR 99 (U)
+frameBufferEmulation\copyToRDRAM=1
+
+[NUD-DMPJ-JPN_convert]
+Good_Name=Mario Paint Studio (cart hack)
+frameBufferEmulation\copyFromRDRAM=1
+
+[NUD-DMTJ-JPN_convert]
+Good_Name=Mario Artist Talent Studio (cart hack)
+frameBufferEmulation\copyAuxToRDRAM=1
+
+[OGREBATTLE64]
+Good_Name=Ogre Battle 64 - Person of Lordly Caliber (U)
+graphics2D\enableTexCoordBounds=1
+
+[OLYMPIC%20HOCKEY]
+Good_Name=Olympic Hockey Nagano '98 (E)(J)(U)
+frameBufferEmulation\bufferSwapMode=1
+
+[PAPER%20MARIO]
+Good_Name=Paper Mario (E)(U)
+frameBufferEmulation\copyToRDRAM=1
+graphics2D\enableTexCoordBounds=1
+
+[PENNY%20RACERS]
+Good_Name=Penny Racers (E)(U)
+frameBufferEmulation\copyToRDRAM=0
+
+[PERFECT%20STRIKER]
+Good_Name=Jikkyou J.League Perfect Striker (J)
+frameBufferEmulation\N64DepthCompare=1
+
+[POKEMON%20SNAP]
+Good_Name=Pokemon Snap (U)
+generalEmulation\rdramImageDitheringMode=1
+frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\fbInfoDisabled=0
+
+[POKEMON%20STADIUM]
+Good_Name=Pokemon Stadium (U)
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[POKEMON%20STADIUM%202]
+Good_Name=Pokemon Stadium 2 (E)(F)(G)(I)(J)(S)(U)
+frameBufferEmulation\copyToRDRAM=0
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[POKEMON%20STADIUM%20G%26S]
+Good_Name=Pokemon Stadium Kin Gin (J)
+frameBufferEmulation\copyToRDRAM=0
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[PUZZLE%20LEAGUE%20N64]
+Good_Name=Pokemon Puzzle League (E)(F)(G)(U)
+texture\enableHalosRemoval=1
+
+[RAT%20ATTACK]
+Good_Name=Rat Attack
+frameBufferEmulation\fbInfoDisabled=0
+
+[RESIDENT%20EVIL%20II]
+Good_Name=Resident Evil 2 (E)(U)
+frameBufferEmulation\copyFromRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[ROCKMAN%20DASH]
+Good_Name=Rockman Dash - Hagane no Boukenshin (J)
+graphics2D\correctTexrectCoords=2
+
+[RUSH%202]
+Good_Name=Rush 2 - Extreme Racing USA (E)(U)
+frameBufferEmulation\bufferSwapMode=1
+graphics2D\correctTexrectCoords=2
+
+[SAN%20FRANCISCO%20RUSH]
+Good_Name=San Francisco Rush Extreme Racing (U)
+frameBufferEmulation\bufferSwapMode=1
+graphics2D\enableNativeResTexrects=2
+
+[S.F.RUSH]
+Good_Name=San Francisco Rush Extreme Racing (E)
+frameBufferEmulation\bufferSwapMode=1
+graphics2D\enableNativeResTexrects=2
+
+[S.F.%20RUSH]
+Good_Name=San Francisco Rush Extreme Racing (U)
+frameBufferEmulation\bufferSwapMode=1
+graphics2D\enableNativeResTexrects=2
+
+[SHADOWMAN]
+Good_Name=Shadow Man (B)(E)(F)(G)(U)
+frameBufferEmulation\copyDepthToRDRAM=0
+
+[SPACE%20INVADERS]
+Good_Name=Space Invaders (U)
+frameBufferEmulation\copyToRDRAM=0
+
+[SILICON%20VALLEY]
+Good_Name=Space Station Silicon Valley (U)
+frameBufferEmulation\copyToRDRAM=1
+
+[STAR%20TWINS]
+Good_Name=Star Twins (J)
+frameBufferEmulation\fbInfoDisabled=0
+frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
+
+[TEST]
+Good_Name=Mario Artist Paint Studio (J) (1999-02-11 Prototype) (64DD)
+frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyFromRDRAM=1
+generalEmulation\rdramImageDitheringMode=0
+
+[TETRISPHERE]
+Good_Name=Tetrisphere (E)(U)
+graphics2D\correctTexrectCoords=2
+
+[TIGGER%27S%20HONEY%20HUNT]
+Good_Name=Tiggers Honey Hunt (E)(U)
+frameBufferEmulation\N64DepthCompare=1
+
+[TONIC%20TROUBLE]
+Good_Name=Tonic Trouble (E)(U)
+frameBufferEmulation\copyToRDRAM=1
+
+[TG%20RALLY%202]
+Good_Name=TG Rally 2 (E)
+frameBufferEmulation\copyToRDRAM=1
+
+[TOP%20GEAR%20RALLY%202]
+Good_Name=Top Gear Rally 2 (E)(J)(U)
+frameBufferEmulation\copyToRDRAM=1
+
+[TUROK_DINOSAUR_HUNTE]
+Good_Name=Turok - Dinosaur Hunter (E)(G)(U)(J)
+frameBufferEmulation\copyDepthToRDRAM=1
+
+[WAVE%20RACE%2064]
+Good_Name=Wave Race 64 (E)(U)(J)
+frameBufferEmulation\copyToRDRAM=1
+
+[W.G.%203DHOCKEY]
+Good_Name=Wayne Gretzky's 3D Hockey (E)(U)
+frameBufferEmulation\bufferSwapMode=1
+
+[WGHOCKEY]
+Good_Name=Wayne Gretzky's 3D Hockey (J)
+frameBufferEmulation\bufferSwapMode=1
diff --git a/app/src/main/assets/wincomponents/wincomponents.json b/app/src/main/assets/wincomponents/wincomponents.json
index 4f75ed90b..0ac7ede0f 100644
--- a/app/src/main/assets/wincomponents/wincomponents.json
+++ b/app/src/main/assets/wincomponents/wincomponents.json
@@ -4,6 +4,7 @@
     "directmusic" : ["dmband", "dmcompos", "dmime", "dmloader", "dmscript", "dmstyle", "dmsynth", "dmusic", "dmusic32", "dswave"],
     "directshow" : ["amstream", "qasf", "qcap", "qdvd", "qedit", "quartz"],
     "directplay" : ["dplaysvr.exe", "dplayx", "dpmodemx", "dpnet", "dpnhpast", "dpnhupnp", "dpnsvr.exe", "dpwsockx"],
-    "xaudio" : ["x3daudio1_0", "x3daudio1_1", "x3daudio1_2", "x3daudio1_3", "x3daudio1_4", "x3daudio1_5", "x3daudio1_6", "x3daudio1_7", "xactengine2_0", "xactengine2_1", "xactengine2_2", "xactengine2_3", "xactengine2_4", "xactengine2_5", "xactengine2_6", "xactengine2_7", "xactengine2_8", "xactengine2_9", "xactengine2_10", "xactengine3_0", "xactengine3_1", "xactengine3_2", "xactengine3_3", "xactengine3_4", "xactengine3_5", "xactengine3_6", "xactengine3_7", "xapofx1_0", "xapofx1_1", "xapofx1_2", "xapofx1_3", "xapofx1_4", "xapofx1_5", "xaudio2_0", "xaudio2_1", "xaudio2_2", "xaudio2_3", "xaudio2_4", "xaudio2_5", "xaudio2_6", "xaudio2_7"],
+    "xaudio" : ["x3daudio1_0", "x3daudio1_1", "x3daudio1_2", "x3daudio1_3", "x3daudio1_4", "x3daudio1_5", "x3daudio1_6", "x3daudio1_7", "xactengine2_0", "xactengine2_1", "xactengine2_2", "xactengine2_3", "xactengine2_4", "xactengine2_5", "xactengine2_6", "xactengine2_7", "xactengine2_8", "xactengine2_9", "xactengine2_10", "xactengine3_0", "xactengine3_1", "xactengine3_2", "xactengine3_3", "xactengine3_4", "xactengine3_5", "xactengine3_6", "xactengine3_7", "xapofx1_0", "xapofx1_1", "xapofx1_2", "xapofx1_3", "xapofx1_4", "xapofx1_5", "xaudio2_0", "xaudio2_1", "xaudio2_2", "xaudio2_3", "xaudio2_4", "xaudio2_5", "xaudio2_6", "xaudio2_7", "xaudio2_8", "xaudio2_9"],
+    "dinput8" : ["dinput8"],
     "vcrun2010" : ["msvcp100", "msvcr100", "vcomp100", "atl100"]
 }
diff --git a/app/src/main/assets/wincomponents/xaudio.tzst b/app/src/main/assets/wincomponents/xaudio.tzst
index 7da1a4d4e..59c8348c2 100644
Binary files a/app/src/main/assets/wincomponents/xaudio.tzst and b/app/src/main/assets/wincomponents/xaudio.tzst differ
diff --git a/app/src/main/assets/winnative/Graphics-Test-32bit.exe b/app/src/main/assets/winnative/Graphics-Test-32bit.exe
new file mode 100644
index 000000000..d708895b3
Binary files /dev/null and b/app/src/main/assets/winnative/Graphics-Test-32bit.exe differ
diff --git a/app/src/main/assets/winnative/Graphics-Test-64bit.exe b/app/src/main/assets/winnative/Graphics-Test-64bit.exe
new file mode 100644
index 000000000..e513db7f1
Binary files /dev/null and b/app/src/main/assets/winnative/Graphics-Test-64bit.exe differ
diff --git a/app/src/main/assets/winnative/InputControl32.exe b/app/src/main/assets/winnative/InputControl32.exe
new file mode 100644
index 000000000..25521c653
Binary files /dev/null and b/app/src/main/assets/winnative/InputControl32.exe differ
diff --git a/app/src/main/assets/winnative/InputControl64.exe b/app/src/main/assets/winnative/InputControl64.exe
new file mode 100644
index 000000000..eef4571fb
Binary files /dev/null and b/app/src/main/assets/winnative/InputControl64.exe differ
diff --git a/app/src/main/assets/winnative/refactorsize.exe b/app/src/main/assets/winnative/refactorsize.exe
new file mode 100755
index 000000000..b61403caa
Binary files /dev/null and b/app/src/main/assets/winnative/refactorsize.exe differ
diff --git a/app/src/main/assets/wnsteam/bionic/service_current_versions.vdf b/app/src/main/assets/wnsteam/bionic/service_current_versions.vdf
new file mode 100644
index 000000000..109067070
--- /dev/null
+++ b/app/src/main/assets/wnsteam/bionic/service_current_versions.vdf
@@ -0,0 +1,36 @@
+"SteamService"
+{
+	"version"		"10520955"
+	"SteamService.dll"
+	{
+		"version"		"10520955"
+	}
+	"SteamService.exe"
+	{
+		"version"		"10520955"
+	}
+	"drivers.exe"
+	{
+		"version"		"10001752"
+	}
+	"secure_desktop_capture.exe"
+	{
+		"version"		"10520955"
+	}
+	"steamxboxutil.exe"
+	{
+		"version"		"10255379"
+	}
+	"steamxboxutil64.exe"
+	{
+		"version"		"10520955"
+	}
+}
+"kvsign2"
+{
+	"SteamService"		"cc28bcee25917d6bc6f34460809b19f8f401a0266d3acd745dd37923d2979d44fe8f47303e2f256919ddc2c63d3f4e0e5681366c8ef308953e4b62d29f46b903"
+}
+"kvsignatures"
+{
+	"SteamService"		"a0d76255f1bd483024cf068048dc59856f0a0ca3aa41f82091caa02ae6d71d33e0e1a8fa8f096f2a19394f9139e5c3bd85fdfd1fe0e9591390603db8c86d35818284e708a0bf415a319fa8b4bae46b27957cc7e7b2dbc13505d435bc8e2c6af98f1c63b085f77d142e39649f19d14dd2609788c301c6c270fafa0b0d2cdd6e94"
+}
diff --git a/app/src/main/assets/wnsteam/bionic/service_minimum_versions.vdf b/app/src/main/assets/wnsteam/bionic/service_minimum_versions.vdf
new file mode 100644
index 000000000..8df37f03a
--- /dev/null
+++ b/app/src/main/assets/wnsteam/bionic/service_minimum_versions.vdf
@@ -0,0 +1,28 @@
+"SteamService"
+{
+	"version"		"6005235"
+	"drivers.exe"
+	{
+		"version"		"6005235"
+	}
+	"secure_desktop_capture.exe"
+	{
+		"version"		"5788668"
+	}
+	"SteamService.dll"
+	{
+		"version"		"6002767"
+	}
+	"SteamService.exe"
+	{
+		"version"		"6002767"
+	}
+}
+"kvsign2"
+{
+	"SteamService"		"843dcc2751cf6678cba9cd575d76295275a4ba4dd78c6162d5c2570d59df496ef1c716c458ae8788acc2e18d56db6c61a5e32b01a73f45e584d399f1e7354b00"
+}
+"kvsignatures"
+{
+	"SteamService"		"5c221556cd87c9dc8687ae253e48e5d98b7526596cf74be8e3b9513fe11d7d8278fdefd57a4f9be4c0530c64af92c41e7da09af2f1845c7ac2c84595125007fba34d66861d3ad725e1527ad8a21d8ffd31fc351b30d2cdabf44993d7d5b9619dabf43dfb81f61d206fe70345e6359f3b2fceed7ea17fc821feda624dc7bef83d"
+}
diff --git a/app/src/main/assets/wnsteam/bionic/steam.exe b/app/src/main/assets/wnsteam/bionic/steam.exe
new file mode 100755
index 000000000..1b6d8a125
Binary files /dev/null and b/app/src/main/assets/wnsteam/bionic/steam.exe differ
diff --git a/app/src/main/assets/wnsteam/bionic/steamservice.dll b/app/src/main/assets/wnsteam/bionic/steamservice.dll
new file mode 100644
index 000000000..54d3bfc13
Binary files /dev/null and b/app/src/main/assets/wnsteam/bionic/steamservice.dll differ
diff --git a/app/src/main/assets/wnsteam/bionic/steamservice.exe b/app/src/main/assets/wnsteam/bionic/steamservice.exe
new file mode 100644
index 000000000..493dda4e6
Binary files /dev/null and b/app/src/main/assets/wnsteam/bionic/steamservice.exe differ
diff --git a/app/src/main/assets/wnsteam/bionic/valve-steam-x86_64.tzst b/app/src/main/assets/wnsteam/bionic/valve-steam-x86_64.tzst
new file mode 100644
index 000000000..2b8f10b71
Binary files /dev/null and b/app/src/main/assets/wnsteam/bionic/valve-steam-x86_64.tzst differ
diff --git a/app/src/main/assets/wnsteam/bionic/wn-steam-helper.exe b/app/src/main/assets/wnsteam/bionic/wn-steam-helper.exe
new file mode 100644
index 000000000..3104beb40
Binary files /dev/null and b/app/src/main/assets/wnsteam/bionic/wn-steam-helper.exe differ
diff --git a/app/src/main/assets/wnsteam/lsteamclient-arm64ec.tzst b/app/src/main/assets/wnsteam/lsteamclient-arm64ec.tzst
new file mode 100644
index 000000000..d7d32bad4
Binary files /dev/null and b/app/src/main/assets/wnsteam/lsteamclient-arm64ec.tzst differ
diff --git a/app/src/main/assets/wnsteam/lsteamclient-x86_64.tzst b/app/src/main/assets/wnsteam/lsteamclient-x86_64.tzst
new file mode 100644
index 000000000..e4f14ceaf
Binary files /dev/null and b/app/src/main/assets/wnsteam/lsteamclient-x86_64.tzst differ
diff --git a/app/src/main/assets/wnsteam/steam-androidarm64.tzst b/app/src/main/assets/wnsteam/steam-androidarm64.tzst
new file mode 100644
index 000000000..8244f1d95
Binary files /dev/null and b/app/src/main/assets/wnsteam/steam-androidarm64.tzst differ
diff --git a/app/src/main/assets/wnsteam/steampipe/original_steam_api64.dll b/app/src/main/assets/wnsteam/steampipe/original_steam_api64.dll
new file mode 100644
index 000000000..299a81e9f
Binary files /dev/null and b/app/src/main/assets/wnsteam/steampipe/original_steam_api64.dll differ
diff --git a/app/src/main/assets/wnsteam/steampipe/steam_api.dll b/app/src/main/assets/wnsteam/steampipe/steam_api.dll
new file mode 100644
index 000000000..20d12414c
Binary files /dev/null and b/app/src/main/assets/wnsteam/steampipe/steam_api.dll differ
diff --git a/app/src/main/assets/wnsteam/steampipe/steam_api64.dll b/app/src/main/assets/wnsteam/steampipe/steam_api64.dll
new file mode 100644
index 000000000..6444cfe7d
Binary files /dev/null and b/app/src/main/assets/wnsteam/steampipe/steam_api64.dll differ
diff --git a/app/src/main/assets/xvfb-arm64/Xvfb b/app/src/main/assets/xvfb-arm64/Xvfb
new file mode 100755
index 000000000..94ab78421
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/Xvfb differ
diff --git a/app/src/main/assets/xvfb-arm64/dbus/dbus-daemon b/app/src/main/assets/xvfb-arm64/dbus/dbus-daemon
new file mode 100755
index 000000000..5805a8176
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/dbus/dbus-daemon differ
diff --git a/app/src/main/assets/xvfb-arm64/dbus/dbus-uuidgen b/app/src/main/assets/xvfb-arm64/dbus/dbus-uuidgen
new file mode 100755
index 000000000..c4847f382
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/dbus/dbus-uuidgen differ
diff --git a/app/src/main/assets/xvfb-arm64/dbus/session.conf b/app/src/main/assets/xvfb-arm64/dbus/session.conf
new file mode 100644
index 000000000..0003b0550
--- /dev/null
+++ b/app/src/main/assets/xvfb-arm64/dbus/session.conf
@@ -0,0 +1,30 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <type>session</type>
+  <keep_umask/>
+  <listen>unix:tmpdir=/tmp</listen>
+  <auth>EXTERNAL</auth>
+
+  <policy context="default">
+    <allow send_destination="*" eavesdrop="true"/>
+    <allow eavesdrop="true"/>
+    <allow own="*"/>
+  </policy>
+
+  <limit name="max_incoming_bytes">1000000000</limit>
+  <limit name="max_incoming_unix_fds">250000000</limit>
+  <limit name="max_outgoing_bytes">1000000000</limit>
+  <limit name="max_outgoing_unix_fds">250000000</limit>
+  <limit name="max_message_size">1000000000</limit>
+  <limit name="service_start_timeout">120000</limit>
+  <limit name="auth_timeout">240000</limit>
+  <limit name="pending_fd_timeout">150000</limit>
+  <limit name="max_completed_connections">100000</limit>
+  <limit name="max_incomplete_connections">10000</limit>
+  <limit name="max_connections_per_user">100000</limit>
+  <limit name="max_pending_service_starts">10000</limit>
+  <limit name="max_names_per_connection">50000</limit>
+  <limit name="max_match_rules_per_connection">50000</limit>
+  <limit name="max_replies_per_connection">50000</limit>
+</busconfig>
diff --git a/app/src/main/assets/xvfb-arm64/libXfont2.so.2.0.0 b/app/src/main/assets/xvfb-arm64/libXfont2.so.2.0.0
new file mode 100644
index 000000000..536ed81c6
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libXfont2.so.2.0.0 differ
diff --git a/app/src/main/assets/xvfb-arm64/libapparmor.so.1.6.3 b/app/src/main/assets/xvfb-arm64/libapparmor.so.1.6.3
new file mode 100644
index 000000000..f04031587
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libapparmor.so.1.6.3 differ
diff --git a/app/src/main/assets/xvfb-arm64/libfontenc.so.1.0.0 b/app/src/main/assets/xvfb-arm64/libfontenc.so.1.0.0
new file mode 100644
index 000000000..7ac3bb3b0
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libfontenc.so.1.0.0 differ
diff --git a/app/src/main/assets/xvfb-arm64/libpixman-1.so.0.40.0 b/app/src/main/assets/xvfb-arm64/libpixman-1.so.0.40.0
new file mode 100644
index 000000000..c363c57e4
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libpixman-1.so.0.40.0 differ
diff --git a/app/src/main/assets/xvfb-arm64/libunwind.so.8.0.1 b/app/src/main/assets/xvfb-arm64/libunwind.so.8.0.1
new file mode 100644
index 000000000..165af1fe9
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libunwind.so.8.0.1 differ
diff --git a/app/src/main/assets/xvfb-arm64/libwinnative-setxid-noop.so b/app/src/main/assets/xvfb-arm64/libwinnative-setxid-noop.so
new file mode 100755
index 000000000..fb2c13c4f
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libwinnative-setxid-noop.so differ
diff --git a/app/src/main/assets/xvfb-arm64/libwinnative-steamwebhelper-preload.so b/app/src/main/assets/xvfb-arm64/libwinnative-steamwebhelper-preload.so
new file mode 100755
index 000000000..c33499171
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libwinnative-steamwebhelper-preload.so differ
diff --git a/app/src/main/assets/xvfb-arm64/libxkbfile.so.1.0.2 b/app/src/main/assets/xvfb-arm64/libxkbfile.so.1.0.2
new file mode 100644
index 000000000..89c126aa6
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/libxkbfile.so.1.0.2 differ
diff --git a/app/src/main/assets/xvfb-arm64/winnative-driverquery-noop b/app/src/main/assets/xvfb-arm64/winnative-driverquery-noop
new file mode 100755
index 000000000..ea9d89839
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/winnative-driverquery-noop differ
diff --git a/app/src/main/assets/xvfb-arm64/winnative-steamwebhelper-wrapper b/app/src/main/assets/xvfb-arm64/winnative-steamwebhelper-wrapper
new file mode 100644
index 000000000..d239635f7
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/winnative-steamwebhelper-wrapper differ
diff --git a/app/src/main/assets/xvfb-arm64/xkbcomp b/app/src/main/assets/xvfb-arm64/xkbcomp
new file mode 100755
index 000000000..5049cf360
Binary files /dev/null and b/app/src/main/assets/xvfb-arm64/xkbcomp differ
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 9d5f75846..43c8e2abb 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -2,55 +2,177 @@ cmake_minimum_required(VERSION 3.22.1)
 
 project(Winlator)
 
+include(FetchContent)
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-unused-function -Wimplicit-function-declaration")
 
+# Zstandard is used by winlator/native_content_io.cpp. Keep this dependency in
+# the parent build instead of relying on the Steam client subproject to create it.
+FetchContent_Declare(
+    zstd
+    GIT_REPOSITORY https://github.com/facebook/zstd.git
+    GIT_TAG        v1.5.6
+    GIT_SHALLOW    TRUE
+    SOURCE_SUBDIR  build/cmake
+)
+set(ZSTD_BUILD_STATIC    ON  CACHE BOOL "" FORCE)
+set(ZSTD_BUILD_SHARED    OFF CACHE BOOL "" FORCE)
+set(ZSTD_BUILD_PROGRAMS  OFF CACHE BOOL "" FORCE)
+set(ZSTD_BUILD_TESTS     OFF CACHE BOOL "" FORCE)
+set(ZSTD_LEGACY_SUPPORT  OFF CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(zstd)
+
+# liblzma (xz): fast XZ decoder for .txz/.xz layer extraction.
+FetchContent_Declare(
+    xz
+    GIT_REPOSITORY https://github.com/tukaani-project/xz.git
+    GIT_TAG        v5.4.6
+    GIT_SHALLOW    TRUE
+)
+FetchContent_GetProperties(xz)
+if(NOT xz_POPULATED)
+    FetchContent_Populate(xz)
+    set(_winlator_saved_bsl "${BUILD_SHARED_LIBS}")
+    set(BUILD_SHARED_LIBS OFF)
+    add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL)
+    set(BUILD_SHARED_LIBS "${_winlator_saved_bsl}")
+endif()
+
 add_subdirectory(patchelf)
 add_subdirectory(adrenotools)
+add_subdirectory(wn-steam-client)
+add_subdirectory(wn-steam-bootstrap)
+add_subdirectory(wn-libsteamclient)
+
+find_package(curl REQUIRED CONFIG)
+
+# ----------------------------------------------------------------------------
+# SPIR-V shader compilation
+# Each .glsl is compiled by glslc (shipped with the NDK) into a .spv binary,
+# then converted to a C uint32_t array via bin2c.cmake. Headers are emitted
+# under ${CMAKE_CURRENT_BINARY_DIR}/shaders/*.spv.h and included from vk_renderer.c.
+# ----------------------------------------------------------------------------
+
+# Locate glslc shipped with the NDK. ANDROID_NDK is provided by the Android Gradle plugin.
+if(NOT DEFINED ANDROID_NDK)
+    message(FATAL_ERROR "ANDROID_NDK not defined; this project must be built via the Android Gradle plugin")
+endif()
+
+if(CMAKE_HOST_WIN32)
+    set(GLSLC_HOST_TAG "windows-x86_64")
+    set(GLSLC_EXE_NAME "glslc.exe")
+elseif(CMAKE_HOST_APPLE)
+    set(GLSLC_HOST_TAG "darwin-x86_64")
+    set(GLSLC_EXE_NAME "glslc")
+else()
+    set(GLSLC_HOST_TAG "linux-x86_64")
+    set(GLSLC_EXE_NAME "glslc")
+endif()
+
+set(GLSLC "${ANDROID_NDK}/shader-tools/${GLSLC_HOST_TAG}/${GLSLC_EXE_NAME}")
+if(NOT EXISTS "${GLSLC}")
+    message(FATAL_ERROR "glslc not found at ${GLSLC}; check NDK installation")
+endif()
+
+set(SHADER_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/winlator/vk/shaders")
+set(SHADER_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/shaders")
+file(MAKE_DIRECTORY "${SHADER_OUT_DIR}")
+
+set(BIN2C_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/winlator/vk/bin2c.cmake")
+
+# (input filename without extension, var name, stage)
+set(SHADER_LIST
+    "window:vert:window_vert"
+    "window:frag:window_frag"
+    "cursor:frag:cursor_frag"
+    "quad:vert:quad_vert"
+    "blit:frag:blit_frag"
+    "effect_crt:frag:effect_crt_frag"
+    "effect_vivid:frag:effect_vivid_frag"
+    "effect_hdr:frag:effect_hdr_frag"
+    "effect_natural:frag:effect_natural_frag"
+    "effect_toon:frag:effect_toon_frag"
+    "effect_ntsc:frag:effect_ntsc_frag"
+    "effect_ntsc2:frag:effect_ntsc2_frag"
+    "effect_coloradj:frag:effect_coloradj_frag"
+    "effect_colorgrade:frag:effect_colorgrade_frag"
+    "effect_sharpen:frag:effect_sharpen_frag"
+    "effect_scanlines:frag:effect_scanlines_frag"
+    "effect_colorblind:frag:effect_colorblind_frag"
+    "effect_pixelate:frag:effect_pixelate_frag"
+    "sgsr1:frag:sgsr1_frag"
+)
+
+set(SHADER_HEADERS "")
+foreach(entry ${SHADER_LIST})
+    string(REPLACE ":" ";" parts ${entry})
+    list(GET parts 0 base)
+    list(GET parts 1 stage)
+    list(GET parts 2 var)
+    set(input "${SHADER_SRC_DIR}/${base}.${stage}")
+    set(spv   "${SHADER_OUT_DIR}/${var}.spv")
+    set(hdr   "${SHADER_OUT_DIR}/${var}.spv.h")
+
+    add_custom_command(
+        OUTPUT  "${hdr}"
+        COMMAND "${GLSLC}" --target-env=vulkan1.1 -O "${input}" -o "${spv}"
+        COMMAND "${CMAKE_COMMAND}"
+            -DINPUT_FILE=${spv}
+            -DOUTPUT_FILE=${hdr}
+            -DVAR_NAME=${var}
+            -P "${BIN2C_SCRIPT}"
+        DEPENDS "${input}" "${BIN2C_SCRIPT}"
+        COMMENT "Compiling shader ${base}.${stage} -> ${var}.spv.h"
+        VERBATIM
+    )
+    list(APPEND SHADER_HEADERS "${hdr}")
+endforeach()
+
+add_custom_target(winlator_shaders DEPENDS ${SHADER_HEADERS})
+
+# ----------------------------------------------------------------------------
+# Winlator native library (X-server, AHB, Vulkan compositor, helpers)
+# ----------------------------------------------------------------------------
 
-# Add Winlator shared library
 add_library(winlator SHARED
         winlator/drawable.c
+        winlator/native_content_io.cpp
         winlator/gpu_image.c
         winlator/surface_compositor.c
+        winlator/ring_fence.c
+        winlator/sync_fence.c
         winlator/sysvshared_memory.c
         winlator/xconnector_epoll.c
-        winlator/alsa_client.c
         winlator/process_lifecycle.c
         winlator/vulkan.c
-        xz/native_xz_stream.c
-        xz/xz_embedded/xz_crc32.c
-        xz/xz_embedded/xz_crc64.c
-        xz/xz_embedded/xz_dec_bcj.c
-        xz/xz_embedded/xz_dec_lzma2.c
-        xz/xz_embedded/xz_dec_stream.c
+        winlator/vk/vk_dispatch.c
+        winlator/vk/vk_image.c
+        winlator/vk/vk_renderer.c
 )
 
+add_dependencies(winlator winlator_shaders)
+
 target_compile_options(winlator PRIVATE -Wall -Wextra)
 target_compile_definitions(winlator PRIVATE
-        XZ_USE_CRC64
-        XZ_DEC_CONCATENATED
-        XZ_DEC_X86
-        XZ_DEC_ARM
-        XZ_DEC_ARMTHUMB
-        XZ_DEC_ARM64
-        XZ_DEC_RISCV
-        XZ_DEC_POWERPC
-        XZ_DEC_IA64
-        XZ_DEC_SPARC
+        VK_USE_PLATFORM_ANDROID_KHR
 )
 target_include_directories(winlator PRIVATE
-        xz/xz_embedded
+        ${xz_SOURCE_DIR}/src/liblzma/api
+        winlator/vk
+        ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+target_compile_features(winlator PRIVATE cxx_std_17)
+
 target_link_libraries(winlator
         log
         android
         jnigraphics
-        aaudio
-        EGL
-        GLESv2
-        GLESv3
+        vulkan
         adrenotools
+        libzstd_static
+        liblzma
+        curl::curl
 )
 
 # Fake evdev input shim used by the pb_controller_fix controller path.
@@ -59,10 +181,3 @@ add_library(fakeinput SHARED
 )
 target_compile_options(fakeinput PRIVATE -Wall -Wextra -fvisibility=hidden)
 target_link_libraries(fakeinput log dl)
-
-# Evshim - controller support shim (loaded via LD_PRELOAD, uses dlopen for SDL2)
-add_library(evshim SHARED
-        winlator/evshim.c
-)
-target_compile_options(evshim PRIVATE -Wall -Wextra -fvisibility=hidden)
-target_link_libraries(evshim log dl)
diff --git a/app/src/main/cpp/steamwebhelper-preload/steamwebhelper_preload.c b/app/src/main/cpp/steamwebhelper-preload/steamwebhelper_preload.c
new file mode 100644
index 000000000..11c1729f7
--- /dev/null
+++ b/app/src/main/cpp/steamwebhelper-preload/steamwebhelper_preload.c
@@ -0,0 +1,684 @@
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ptrace.h>
+#include <sys/syscall.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <ucontext.h>
+#include <unistd.h>
+
+#ifndef SYS_landlock_create_ruleset
+#define SYS_landlock_create_ruleset 444
+#endif
+
+#if defined(__aarch64__)
+static long raw_syscall6(long number, long a1, long a2, long a3, long a4,
+                         long a5, long a6) {
+    register long x0 __asm__("x0") = a1;
+    register long x1 __asm__("x1") = a2;
+    register long x2 __asm__("x2") = a3;
+    register long x3 __asm__("x3") = a4;
+    register long x4 __asm__("x4") = a5;
+    register long x5 __asm__("x5") = a6;
+    register long x8 __asm__("x8") = number;
+    __asm__ volatile("svc #0"
+                     : "+r"(x0)
+                     : "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5), "r"(x8)
+                     : "memory", "cc");
+    return x0;
+}
+
+static long syscall_result(long rc) {
+    if (rc < 0 && rc >= -4095) {
+        errno = (int)-rc;
+        return -1;
+    }
+    return rc;
+}
+#else
+#error "steamwebhelper preload raw syscall shim is only implemented for aarch64"
+#endif
+
+struct cached_link {
+    char path[PATH_MAX];
+    char target[PATH_MAX];
+};
+
+static struct cached_link g_links[64];
+static int g_link_count;
+static char g_log_path[PATH_MAX];
+
+static int is_steam_singleton_path(const char *path);
+static void log_msg(const char *fmt, ...);
+
+static int sidecar_path(const char *path, char *out, size_t out_size) {
+    if (!is_steam_singleton_path(path)) {
+        return -1;
+    }
+    if (snprintf(out, out_size, "%s.winnative-readlink-target", path) >= (int)out_size) {
+        return -1;
+    }
+    return 0;
+}
+
+static void write_sidecar_link(const char *path, const char *target) {
+    char sidecar[PATH_MAX];
+    size_t len;
+    int fd;
+
+    if (target == NULL || sidecar_path(path, sidecar, sizeof(sidecar)) < 0) {
+        return;
+    }
+
+    fd = open(sidecar, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+    if (fd < 0) {
+        return;
+    }
+
+    len = strlen(target);
+    if (write(fd, target, len) != (ssize_t)len) {
+        log_msg("winnative steamwebhelper preload: sidecar write failed path=%s errno=%d",
+                sidecar, errno);
+    }
+    close(fd);
+}
+
+static const char *read_sidecar_link(const char *path) {
+    static char target[PATH_MAX];
+    char sidecar[PATH_MAX];
+    ssize_t len;
+    int fd;
+
+    if (sidecar_path(path, sidecar, sizeof(sidecar)) < 0) {
+        return NULL;
+    }
+
+    fd = open(sidecar, O_RDONLY);
+    if (fd < 0) {
+        return NULL;
+    }
+    len = read(fd, target, sizeof(target) - 1);
+    close(fd);
+    if (len <= 0) {
+        return NULL;
+    }
+    target[len] = '\0';
+    return target;
+}
+
+static int sidecar_link_exists(const char *path, char *target, size_t target_size) {
+    char sidecar[PATH_MAX];
+    ssize_t len;
+    int fd;
+
+    if (target == NULL || target_size == 0 ||
+        sidecar_path(path, sidecar, sizeof(sidecar)) < 0) {
+        return 0;
+    }
+
+    fd = open(sidecar, O_RDONLY);
+    if (fd < 0) {
+        return 0;
+    }
+    len = read(fd, target, target_size - 1);
+    close(fd);
+    if (len <= 0) {
+        return 0;
+    }
+    target[len] = '\0';
+    return 1;
+}
+
+static void init_log_path(void) {
+    const char *override = getenv("WINNATIVE_STEAMWEBHELPER_LOG");
+    const char *home = getenv("HOME");
+
+    if (g_log_path[0] != '\0') {
+        return;
+    }
+    if (override != NULL && override[0] != '\0') {
+        if (snprintf(g_log_path, sizeof(g_log_path), "%s", override) >=
+            (int)sizeof(g_log_path)) {
+            g_log_path[0] = '\0';
+        }
+        return;
+    }
+    if (home != NULL && home[0] != '\0') {
+        if (snprintf(g_log_path, sizeof(g_log_path),
+                     "%s/.steam/steam/logs/steamwebhelper.log", home) >=
+            (int)sizeof(g_log_path)) {
+            g_log_path[0] = '\0';
+        }
+        return;
+    }
+    if (snprintf(g_log_path, sizeof(g_log_path),
+                 "/tmp/winnative-steamwebhelper.log") >= (int)sizeof(g_log_path)) {
+        g_log_path[0] = '\0';
+    }
+}
+
+static void log_msg(const char *fmt, ...) {
+    init_log_path();
+    if (g_log_path[0] == '\0') {
+        return;
+    }
+
+    int fd = open(g_log_path, O_WRONLY | O_CREAT | O_APPEND, 0600);
+    if (fd < 0) {
+        return;
+    }
+
+    char line[PATH_MAX * 2];
+    va_list ap;
+    va_start(ap, fmt);
+    int len = vsnprintf(line, sizeof(line), fmt, ap);
+    va_end(ap);
+    if (len > 0) {
+        if (len > (int)sizeof(line) - 2) {
+            len = (int)sizeof(line) - 2;
+        }
+        line[len++] = '\n';
+        ssize_t ignored = write(fd, line, (size_t)len);
+        (void)ignored;
+    }
+    close(fd);
+}
+
+static int is_steam_singleton_path(const char *path) {
+    if (path == NULL) {
+        return 0;
+    }
+    return strstr(path, "/tmp/.com.valvesoftware.Steam.") != NULL ||
+           strstr(path, "SingletonCookie") != NULL ||
+           strstr(path, "SingletonSocket") != NULL ||
+           strstr(path, "SingletonLock") != NULL;
+}
+
+static void cache_link(const char *path, const char *target) {
+    if (!is_steam_singleton_path(path) || target == NULL) {
+        return;
+    }
+    write_sidecar_link(path, target);
+
+    for (int i = 0; i < g_link_count; i++) {
+        if (strcmp(g_links[i].path, path) == 0) {
+            snprintf(g_links[i].target, sizeof(g_links[i].target), "%s", target);
+            return;
+        }
+    }
+
+    if (g_link_count >= (int)(sizeof(g_links) / sizeof(g_links[0]))) {
+        memmove(&g_links[0], &g_links[1], sizeof(g_links[0]) * (g_link_count - 1));
+        g_link_count--;
+    }
+
+    snprintf(g_links[g_link_count].path, sizeof(g_links[g_link_count].path), "%s", path);
+    snprintf(g_links[g_link_count].target, sizeof(g_links[g_link_count].target), "%s", target);
+    g_link_count++;
+}
+
+static const char *lookup_link(const char *path) {
+    if (!is_steam_singleton_path(path)) {
+        return NULL;
+    }
+    for (int i = g_link_count - 1; i >= 0; i--) {
+        if (strcmp(g_links[i].path, path) == 0) {
+            return g_links[i].target;
+        }
+    }
+    return read_sidecar_link(path);
+}
+
+static ssize_t copy_target(const char *path, const char *target, char *buf, size_t bufsiz) {
+    size_t len = strlen(target);
+    size_t out = len;
+    if (out > bufsiz) {
+        out = bufsiz;
+    }
+    if (out > 0) {
+        memcpy(buf, target, out);
+    }
+    log_msg("winnative steamwebhelper preload: readlink shim path=%s target=%s", path, target);
+    return (ssize_t)out;
+}
+
+static void fill_symlink_stat(struct stat *st, const char *target) {
+    memset(st, 0, sizeof(*st));
+    st->st_mode = S_IFLNK | 0777;
+    st->st_nlink = 1;
+    st->st_uid = getuid();
+    st->st_gid = getgid();
+    st->st_size = (off_t)strlen(target);
+    st->st_blksize = 4096;
+}
+
+static int fake_lstat_if_sidecar(const char *path, struct stat *st) {
+    char target[PATH_MAX];
+
+    if (st == NULL || !sidecar_link_exists(path, target, sizeof(target))) {
+        return -1;
+    }
+    fill_symlink_stat(st, target);
+    log_msg("winnative steamwebhelper preload: lstat shim path=%s target=%s",
+            path, target);
+    errno = 0;
+    return 0;
+}
+
+int symlink(const char *target, const char *linkpath) {
+    int rc = (int)syscall_result(raw_syscall6(SYS_symlinkat, (long)target, AT_FDCWD,
+                                              (long)linkpath, 0, 0, 0));
+    if (rc == 0) {
+        cache_link(linkpath, target);
+    } else if (errno == ENOSYS && is_steam_singleton_path(linkpath)) {
+        cache_link(linkpath, target);
+        log_msg("winnative steamwebhelper preload: symlink ENOSYS shim link=%s target=%s",
+                linkpath, target);
+        errno = 0;
+        return 0;
+    }
+    return rc;
+}
+
+int symlinkat(const char *target, int newdirfd, const char *linkpath) {
+    int rc = (int)syscall_result(raw_syscall6(SYS_symlinkat, (long)target, newdirfd,
+                                              (long)linkpath, 0, 0, 0));
+    if (rc == 0) {
+        cache_link(linkpath, target);
+    } else if (errno == ENOSYS && is_steam_singleton_path(linkpath)) {
+        cache_link(linkpath, target);
+        log_msg("winnative steamwebhelper preload: symlinkat ENOSYS shim link=%s target=%s",
+                linkpath, target);
+        errno = 0;
+        return 0;
+    }
+    return rc;
+}
+
+ssize_t readlink(const char *path, char *buf, size_t bufsiz) {
+    ssize_t rc = (ssize_t)syscall_result(raw_syscall6(SYS_readlinkat, AT_FDCWD,
+                                                      (long)path, (long)buf,
+                                                      (long)bufsiz, 0, 0));
+    if (rc >= 0 || errno != ENOSYS) {
+        return rc;
+    }
+
+    const char *target = lookup_link(path);
+    if (target == NULL) {
+        return rc;
+    }
+    errno = 0;
+    return copy_target(path, target, buf, bufsiz);
+}
+
+ssize_t readlinkat(int dirfd, const char *path, char *buf, size_t bufsiz) {
+    ssize_t rc = (ssize_t)syscall_result(raw_syscall6(SYS_readlinkat, dirfd,
+                                                      (long)path, (long)buf,
+                                                      (long)bufsiz, 0, 0));
+    if (rc >= 0 || errno != ENOSYS) {
+        return rc;
+    }
+
+    const char *target = lookup_link(path);
+    if (target == NULL) {
+        return rc;
+    }
+    errno = 0;
+    return copy_target(path, target, buf, bufsiz);
+}
+
+ssize_t __readlink_chk(const char *path, char *buf, size_t bufsiz,
+                       size_t bufsize) {
+    if (bufsiz > bufsize) {
+        errno = ERANGE;
+        return -1;
+    }
+    return readlink(path, buf, bufsiz);
+}
+
+ssize_t __readlinkat_chk(int dirfd, const char *path, char *buf, size_t bufsiz,
+                         size_t bufsize) {
+    if (bufsiz > bufsize) {
+        errno = ERANGE;
+        return -1;
+    }
+    return readlinkat(dirfd, path, buf, bufsiz);
+}
+
+int lstat(const char *path, struct stat *st) {
+    int rc = (int)syscall_result(raw_syscall6(SYS_newfstatat, AT_FDCWD,
+                                              (long)path, (long)st,
+                                              AT_SYMLINK_NOFOLLOW, 0, 0));
+    if (rc == 0 || errno != ENOENT) {
+        return rc;
+    }
+    return fake_lstat_if_sidecar(path, st);
+}
+
+int __lxstat(int ver, const char *path, struct stat *st) {
+    (void)ver;
+    return lstat(path, st);
+}
+
+int __lxstat64(int ver, const char *path, struct stat *st) {
+    (void)ver;
+    return lstat(path, st);
+}
+
+int access(const char *path, int mode) {
+    int rc = (int)syscall_result(raw_syscall6(SYS_faccessat, AT_FDCWD,
+                                              (long)path, mode, 0, 0, 0));
+    if (rc == 0 || errno != ENOENT) {
+        return rc;
+    }
+    if ((mode & X_OK) == 0 && sidecar_link_exists(path, (char[PATH_MAX]){0}, PATH_MAX)) {
+        log_msg("winnative steamwebhelper preload: access shim path=%s mode=%d",
+                path, mode);
+        errno = 0;
+        return 0;
+    }
+    return rc;
+}
+
+int faccessat(int dirfd, const char *path, int mode, int flags) {
+    int rc = (int)syscall_result(raw_syscall6(SYS_faccessat, dirfd, (long)path,
+                                              mode, flags, 0, 0));
+    if (rc == 0 || errno != ENOENT || dirfd != AT_FDCWD) {
+        return rc;
+    }
+    if ((mode & X_OK) == 0 && sidecar_link_exists(path, (char[PATH_MAX]){0}, PATH_MAX)) {
+        log_msg("winnative steamwebhelper preload: faccessat shim path=%s mode=%d",
+                path, mode);
+        errno = 0;
+        return 0;
+    }
+    return rc;
+}
+
+int unlink(const char *path) {
+    char sidecar[PATH_MAX];
+    int had_sidecar = 0;
+    int rc = (int)syscall_result(raw_syscall6(SYS_unlinkat, AT_FDCWD,
+                                              (long)path, 0, 0, 0, 0));
+    int saved_errno = errno;
+
+    if (sidecar_path(path, sidecar, sizeof(sidecar)) == 0) {
+        had_sidecar = (raw_syscall6(SYS_unlinkat, AT_FDCWD, (long)sidecar,
+                                    0, 0, 0, 0) == 0);
+    }
+    if (rc == 0) {
+        return 0;
+    }
+    errno = saved_errno;
+    if (errno == ENOENT && had_sidecar) {
+        log_msg("winnative steamwebhelper preload: unlink sidecar-only path=%s",
+                path);
+        errno = 0;
+        return 0;
+    }
+    return rc;
+}
+
+static size_t append_literal(char *buf, size_t pos, size_t size, const char *text) {
+    while (text != NULL && *text != '\0' && pos + 1 < size) {
+        buf[pos++] = *text++;
+    }
+    return pos;
+}
+
+static size_t append_long(char *buf, size_t pos, size_t size, long value) {
+    char tmp[32];
+    size_t count = 0;
+    unsigned long n;
+
+    if (value < 0) {
+        if (pos + 1 < size) {
+            buf[pos++] = '-';
+        }
+        n = (unsigned long)(-value);
+    } else {
+        n = (unsigned long)value;
+    }
+    do {
+        tmp[count++] = (char)('0' + (n % 10));
+        n /= 10;
+    } while (n != 0 && count < sizeof(tmp));
+    while (count > 0 && pos + 1 < size) {
+        buf[pos++] = tmp[--count];
+    }
+    return pos;
+}
+
+static size_t append_hex_ulong(char *buf, size_t pos, size_t size,
+                               unsigned long value) {
+    static const char digits[] = "0123456789abcdef";
+    int shift;
+
+    pos = append_literal(buf, pos, size, "0x");
+    for (shift = (int)(sizeof(value) * 8) - 4; shift > 0; shift -= 4) {
+        if (((value >> shift) & 0xf) != 0) {
+            break;
+        }
+    }
+    for (; shift >= 0 && pos + 1 < size; shift -= 4) {
+        buf[pos++] = digits[(value >> shift) & 0xf];
+    }
+    return pos;
+}
+
+static void raw_log_signal(const char *kind, int value) {
+    char line[256];
+    size_t pos = 0;
+    int fd;
+
+    if (g_log_path[0] == '\0') {
+        return;
+    }
+    pos = append_literal(line, pos, sizeof(line),
+                         "winnative steamwebhelper preload: ");
+    pos = append_literal(line, pos, sizeof(line), kind);
+    pos = append_literal(line, pos, sizeof(line), " pid=");
+    pos = append_long(line, pos, sizeof(line),
+                      raw_syscall6(SYS_getpid, 0, 0, 0, 0, 0, 0));
+    pos = append_literal(line, pos, sizeof(line), " tid=");
+    pos = append_long(line, pos, sizeof(line),
+                      raw_syscall6(SYS_gettid, 0, 0, 0, 0, 0, 0));
+    pos = append_literal(line, pos, sizeof(line), " value=");
+    pos = append_long(line, pos, sizeof(line), value);
+    if (pos + 1 < sizeof(line)) {
+        line[pos++] = '\n';
+    }
+
+    fd = (int)raw_syscall6(SYS_openat, AT_FDCWD, (long)g_log_path,
+                           O_WRONLY | O_CREAT | O_APPEND, 0600, 0, 0);
+    if (fd >= 0) {
+        raw_syscall6(SYS_write, fd, (long)line, (long)pos, 0, 0, 0);
+        raw_syscall6(SYS_close, fd, 0, 0, 0, 0, 0);
+    }
+}
+
+static void raw_log_signal_context(const char *kind, int sig, void *context) {
+    char line[512];
+    size_t pos = 0;
+    int fd;
+    unsigned long pc = 0;
+    unsigned long lr = 0;
+    unsigned long sp = 0;
+
+#if defined(__aarch64__)
+    if (context != NULL) {
+        ucontext_t *uc = (ucontext_t *)context;
+        pc = (unsigned long)uc->uc_mcontext.pc;
+        lr = (unsigned long)uc->uc_mcontext.regs[30];
+        sp = (unsigned long)uc->uc_mcontext.sp;
+    }
+#endif
+
+    if (g_log_path[0] == '\0') {
+        return;
+    }
+    pos = append_literal(line, pos, sizeof(line),
+                         "winnative steamwebhelper preload: ");
+    pos = append_literal(line, pos, sizeof(line), kind);
+    pos = append_literal(line, pos, sizeof(line), " pid=");
+    pos = append_long(line, pos, sizeof(line),
+                      raw_syscall6(SYS_getpid, 0, 0, 0, 0, 0, 0));
+    pos = append_literal(line, pos, sizeof(line), " tid=");
+    pos = append_long(line, pos, sizeof(line),
+                      raw_syscall6(SYS_gettid, 0, 0, 0, 0, 0, 0));
+    pos = append_literal(line, pos, sizeof(line), " signal=");
+    pos = append_long(line, pos, sizeof(line), sig);
+    pos = append_literal(line, pos, sizeof(line), " pc=");
+    pos = append_hex_ulong(line, pos, sizeof(line), pc);
+    pos = append_literal(line, pos, sizeof(line), " lr=");
+    pos = append_hex_ulong(line, pos, sizeof(line), lr);
+    pos = append_literal(line, pos, sizeof(line), " sp=");
+    pos = append_hex_ulong(line, pos, sizeof(line), sp);
+    if (pos + 1 < sizeof(line)) {
+        line[pos++] = '\n';
+    }
+
+    fd = (int)raw_syscall6(SYS_openat, AT_FDCWD, (long)g_log_path,
+                           O_WRONLY | O_CREAT | O_APPEND, 0600, 0, 0);
+    if (fd >= 0) {
+        raw_syscall6(SYS_write, fd, (long)line, (long)pos, 0, 0, 0);
+        raw_syscall6(SYS_close, fd, 0, 0, 0, 0, 0);
+    }
+}
+
+static int should_block_crashpad_ptrace(long request) {
+    const char *visible = getenv("WINNATIVE_STEAM_VISIBLE_UI");
+
+    if (visible == NULL || strcmp(visible, "1") != 0) {
+        return 0;
+    }
+
+    return request == PTRACE_ATTACH || request == PTRACE_SEIZE;
+}
+
+long ptrace(enum __ptrace_request request, ...) {
+    va_list ap;
+    long pid;
+    long addr;
+    long data;
+
+    va_start(ap, request);
+    pid = va_arg(ap, long);
+    addr = va_arg(ap, long);
+    data = va_arg(ap, long);
+    va_end(ap);
+
+    if (should_block_crashpad_ptrace((long)request)) {
+        log_msg("winnative steamwebhelper preload: ptrace attach shim request=%ld pid=%ld EPERM",
+                (long)request, pid);
+        errno = EPERM;
+        return -1;
+    }
+
+    return syscall_result(raw_syscall6(SYS_ptrace, (long)request, pid, addr, data, 0, 0));
+}
+
+static void crash_signal_handler(int sig, siginfo_t *info, void *context) {
+    (void)info;
+    raw_log_signal_context("caught fatal signal", sig, context);
+    raw_syscall6(SYS_rt_sigaction, sig, 0, 0, 8, 0, 0);
+    raw_syscall6(SYS_tgkill, raw_syscall6(SYS_getpid, 0, 0, 0, 0, 0, 0),
+                 raw_syscall6(SYS_gettid, 0, 0, 0, 0, 0, 0), sig, 0, 0, 0);
+    raw_syscall6(SYS_exit_group, 128 + sig, 0, 0, 0, 0, 0);
+}
+
+__attribute__((constructor)) static void install_crash_logging(void) {
+    struct sigaction sa;
+
+    init_log_path();
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_sigaction = crash_signal_handler;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = SA_SIGINFO | SA_RESETHAND;
+    sigaction(SIGABRT, &sa, NULL);
+    sigaction(SIGSEGV, &sa, NULL);
+    sigaction(SIGBUS, &sa, NULL);
+    sigaction(SIGILL, &sa, NULL);
+    sigaction(SIGTRAP, &sa, NULL);
+    sigaction(SIGSYS, &sa, NULL);
+}
+
+void abort(void) {
+    raw_log_signal("abort called", SIGABRT);
+    raw_syscall6(SYS_tgkill, raw_syscall6(SYS_getpid, 0, 0, 0, 0, 0, 0),
+                 raw_syscall6(SYS_gettid, 0, 0, 0, 0, 0, 0), SIGABRT, 0, 0, 0);
+    raw_syscall6(SYS_exit_group, 134, 0, 0, 0, 0, 0);
+    __builtin_unreachable();
+}
+
+long syscall(long number, ...) {
+    va_list ap;
+    long a1;
+    long a2;
+    long a3;
+    long a4;
+    long a5;
+    long a6;
+    long rc;
+
+    va_start(ap, number);
+    a1 = va_arg(ap, long);
+    a2 = va_arg(ap, long);
+    a3 = va_arg(ap, long);
+    a4 = va_arg(ap, long);
+    a5 = va_arg(ap, long);
+    a6 = va_arg(ap, long);
+    va_end(ap);
+
+    if (number == SYS_landlock_create_ruleset) {
+        log_msg("winnative steamwebhelper preload: landlock_create_ruleset shim flags=%ld ENOSYS->EOPNOTSUPP",
+                a3);
+        errno = EOPNOTSUPP;
+        return -1;
+    }
+
+    if (number == SYS_ptrace && should_block_crashpad_ptrace(a1)) {
+        log_msg("winnative steamwebhelper preload: syscall ptrace attach shim request=%ld pid=%ld EPERM",
+                a1, a2);
+        errno = EPERM;
+        return -1;
+    }
+
+    rc = syscall_result(raw_syscall6(number, a1, a2, a3, a4, a5, a6));
+    if (rc >= 0 || errno != ENOSYS) {
+        return rc;
+    }
+
+    if (number == SYS_symlinkat && is_steam_singleton_path((const char *)a3)) {
+        cache_link((const char *)a3, (const char *)a1);
+        log_msg("winnative steamwebhelper preload: syscall symlinkat ENOSYS shim link=%s target=%s",
+                (const char *)a3, (const char *)a1);
+        errno = 0;
+        return 0;
+    }
+
+    if (number == SYS_readlinkat) {
+        const char *target = lookup_link((const char *)a2);
+        if (target != NULL) {
+            errno = 0;
+            return copy_target((const char *)a2, target, (char *)a3, (size_t)a4);
+        }
+    }
+
+    if (number == SYS_unlinkat && is_steam_singleton_path((const char *)a2)) {
+        char sidecar[PATH_MAX];
+        if (sidecar_path((const char *)a2, sidecar, sizeof(sidecar)) == 0) {
+            raw_syscall6(SYS_unlinkat, a1, (long)sidecar, a3, 0, 0, 0);
+        }
+    }
+
+    return rc;
+}
diff --git a/app/src/main/cpp/virglrenderer/CMakeLists.txt b/app/src/main/cpp/virglrenderer/CMakeLists.txt
deleted file mode 100644
index 6c160759c..000000000
--- a/app/src/main/cpp/virglrenderer/CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-cmake_minimum_required(VERSION 3.22.1)
-
-project(VirGLRenderer)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-unused-function -Wimplicit-function-declaration")
-
-include_directories(src
-                    src/gallium/include
-                    src/gallium/auxiliary
-                    src/gallium/auxiliary/util
-                    server)
-
-add_library(virglrenderer SHARED
-            src/iov.c
-            src/vrend_blitter.c
-            src/vrend_decode.c
-            src/vrend_formats.c
-            src/vrend_object.c
-            src/vrend_renderer.c
-            src/vrend_shader.c
-            server/virgl_server.c
-            server/virgl_server_shm.c
-            server/virgl_server_renderer.c
-            src/gallium/auxiliary/util/u_format.c
-            src/gallium/auxiliary/util/u_format_table.c
-            src/gallium/auxiliary/util/u_texture.c
-            src/gallium/auxiliary/util/u_hash_table.c
-            src/gallium/auxiliary/util/u_debug.c
-            src/gallium/auxiliary/util/u_cpu_detect.c
-            src/gallium/auxiliary/util/u_bitmask.c
-            src/gallium/auxiliary/util/u_surface.c
-            src/gallium/auxiliary/util/u_math.c
-            src/gallium/auxiliary/util/u_debug_describe.c
-            src/gallium/auxiliary/cso_cache/cso_cache.c
-            src/gallium/auxiliary/cso_cache/cso_hash.c
-            src/gallium/auxiliary/tgsi/tgsi_dump.c
-            src/gallium/auxiliary/tgsi/tgsi_ureg.c
-            src/gallium/auxiliary/tgsi/tgsi_build.c
-            src/gallium/auxiliary/tgsi/tgsi_scan.c
-            src/gallium/auxiliary/tgsi/tgsi_info.c
-            src/gallium/auxiliary/tgsi/tgsi_parse.c
-            src/gallium/auxiliary/tgsi/tgsi_text.c
-            src/gallium/auxiliary/tgsi/tgsi_strings.c
-            src/gallium/auxiliary/tgsi/tgsi_sanity.c
-            src/gallium/auxiliary/tgsi/tgsi_iterate.c
-            src/gallium/auxiliary/tgsi/tgsi_util.c
-            src/gallium/auxiliary/tgsi/tgsi_transform.c
-            src/gallium/auxiliary/os/os_misc.c)
-
-target_link_libraries(virglrenderer
-                      log
-                      android
-                      EGL
-                      GLESv2
-                      GLESv3)
\ No newline at end of file
diff --git a/app/src/main/cpp/virglrenderer/server/virgl_server.c b/app/src/main/cpp/virglrenderer/server/virgl_server.c
deleted file mode 100644
index 40526a4af..000000000
--- a/app/src/main/cpp/virglrenderer/server/virgl_server.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2015 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-#include <fcntl.h>
-#include <getopt.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-#include "util/u_memory.h"
-#include "virgl_server.h"
-#include "virgl_server_protocol.h"
-
-struct jni_info jni_info;
-
-static struct virgl_client *virgl_server_handle_new_connection(int fd) {
-  struct virgl_client *client = calloc(1, sizeof(struct virgl_client));
-  client->fd = fd;
-  client->initialized = false;
-  return client;
-}
-
-static void virgl_server_kill_connection(struct virgl_client *client) {
-  (*jni_info.env)
-      ->CallVoidMethod(jni_info.env, jni_info.obj, jni_info.kill_connection,
-                       client->fd);
-}
-
-static void virgl_server_destroy_client(struct virgl_client **client) {
-  virgl_server_destroy_renderer(*client);
-
-  free(*client);
-  *client = NULL;
-}
-
-static void virgl_server_handle_request(struct virgl_client *client) {
-  int ret;
-  uint32_t header[2];
-
-  ret = virgl_block_read(client->fd, &header, sizeof(header));
-  if (ret < 0 || (size_t)ret < sizeof(header)) {
-    virgl_server_kill_connection(client);
-    return;
-  }
-
-  if (!client->initialized) {
-    if (header[1] != VCMD_CREATE_RENDERER) {
-      virgl_server_kill_connection(client);
-      return;
-    }
-
-    ret = virgl_server_create_renderer(client, header[0]);
-    client->initialized = true;
-  }
-
-  vrend_renderer_check_fences(client);
-
-  switch (header[1]) {
-  case VCMD_GET_CAPS:
-    ret = virgl_server_send_caps(client, header[0]);
-    break;
-  case VCMD_RESOURCE_CREATE:
-    ret = virgl_server_resource_create(client, header[0]);
-    break;
-  case VCMD_RESOURCE_DESTROY:
-    ret = virgl_server_resource_destroy(client, header[0]);
-    break;
-  case VCMD_TRANSFER_GET:
-    ret = virgl_server_transfer_get(client, header[0]);
-    break;
-  case VCMD_TRANSFER_PUT:
-    ret = virgl_server_transfer_put(client, header[0]);
-    break;
-  case VCMD_SUBMIT_CMD:
-    ret = virgl_server_submit_cmd(client, header[0]);
-    break;
-  case VCMD_RESOURCE_BUSY_WAIT:
-    ret = virgl_server_resource_busy_wait(client, header[0]);
-    break;
-  case VCMD_FLUSH_FRONTBUFFER:
-    ret = virgl_server_flush_frontbuffer(client, header[0]);
-    break;
-  }
-
-  if (ret < 0)
-    virgl_server_kill_connection(client);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_winlator_xenvironment_components_VirGLRendererComponent_handleNewConnection(
-    JNIEnv *env, jobject obj, jint fd) {
-  jni_info.env = env;
-  jni_info.obj = obj;
-
-  jclass cls = (*env)->GetObjectClass(env, obj);
-  jni_info.kill_connection =
-      (*env)->GetMethodID(env, cls, "killConnection", "(I)V");
-  jni_info.get_shared_egl_context =
-      (*env)->GetMethodID(env, cls, "getSharedEGLContext", "()J");
-  jni_info.flush_frontbuffer =
-      (*env)->GetMethodID(env, cls, "flushFrontbuffer", "(II)V");
-
-  return (jlong)virgl_server_handle_new_connection(fd);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_xenvironment_components_VirGLRendererComponent_handleRequest(
-    JNIEnv *env, jobject obj, jlong clientPtr) {
-  jni_info.env = env;
-  jni_info.obj = obj;
-  virgl_server_handle_request((struct virgl_client *)clientPtr);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_xenvironment_components_VirGLRendererComponent_destroyClient(
-    JNIEnv *env, jobject obj, jlong clientPtr) {
-  struct virgl_client *client = (struct virgl_client *)clientPtr;
-  virgl_server_destroy_client(&client);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_xenvironment_components_VirGLRendererComponent_destroyRenderer(
-    JNIEnv *env, jobject obj, jlong clientPtr) {
-  virgl_server_destroy_renderer((struct virgl_client *)clientPtr);
-}
\ No newline at end of file
diff --git a/app/src/main/cpp/virglrenderer/server/virgl_server.h b/app/src/main/cpp/virglrenderer/server/virgl_server.h
deleted file mode 100644
index bba324287..000000000
--- a/app/src/main/cpp/virglrenderer/server/virgl_server.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2015 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#ifndef VIRGL_SERVER_H
-#define VIRGL_SERVER_H
-
-#include <android/log.h>
-#include <errno.h>
-#include <jni.h>
-#include <stdio.h>
-
-#include "vrend_renderer.h"
-
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-
-#define printf(...)                                                            \
-  __android_log_print(ANDROID_LOG_DEBUG, "System.out", __VA_ARGS__);
-
-struct jni_info {
-  jobject obj;
-  JNIEnv *env;
-  jmethodID kill_connection;
-  jmethodID get_shared_egl_context;
-  jmethodID flush_frontbuffer;
-};
-
-struct virgl_server_renderer {
-  struct util_hash_table *iovec_hash;
-  GLuint framebuffer;
-  int handle;
-  int ctx_id;
-  int fence_id;
-  int last_fence_id;
-
-  EGLDisplay egl_display;
-  EGLConfig egl_conf;
-  EGLContext egl_ctx;
-};
-
-struct virgl_client {
-  int fd;
-  struct virgl_server_renderer *renderer;
-  struct vrend_state *vrend_state;
-  struct util_hash_table *res_hash;
-  struct vrend_decode_ctx *dec_ctx[VREND_MAX_CTX];
-  struct vrend_blitter_ctx *vrend_blit_ctx;
-  bool initialized;
-};
-
-extern struct jni_info jni_info;
-
-int virgl_server_create_renderer(struct virgl_client *client, uint32_t length);
-int virgl_server_send_caps(struct virgl_client *client, uint32_t length);
-int virgl_server_resource_create(struct virgl_client *client, uint32_t length);
-int virgl_server_resource_destroy(struct virgl_client *client, uint32_t length);
-int virgl_server_transfer_get(struct virgl_client *client, uint32_t length);
-int virgl_server_transfer_put(struct virgl_client *client, uint32_t length);
-int virgl_server_submit_cmd(struct virgl_client *client, uint32_t length);
-int virgl_server_resource_busy_wait(struct virgl_client *client,
-                                    uint32_t length);
-int virgl_server_flush_frontbuffer(struct virgl_client *client,
-                                   uint32_t length);
-
-int virgl_block_read(int fd, void *buf, int size);
-
-int virgl_server_renderer_create_fence(struct virgl_client *client);
-
-void virgl_server_destroy_renderer(struct virgl_client *client);
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/server/virgl_server_protocol.h b/app/src/main/cpp/virglrenderer/server/virgl_server_protocol.h
deleted file mode 100644
index a0c3f3a7d..000000000
--- a/app/src/main/cpp/virglrenderer/server/virgl_server_protocol.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2014, 2015 Red Hat.
- *
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 (including the next
- * paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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.
- */
-#ifndef VIRGL_SERVER_PROTOCOL_H
-#define VIRGL_SERVER_PROTOCOL_H
-
-#define VCMD_CREATE_RENDERER 1
-#define VCMD_GET_CAPS 2
-#define VCMD_RESOURCE_CREATE 3
-#define VCMD_RESOURCE_DESTROY 4
-#define VCMD_TRANSFER_GET 5
-#define VCMD_TRANSFER_PUT 6
-#define VCMD_SUBMIT_CMD 7
-#define VCMD_RESOURCE_BUSY_WAIT 8
-#define VCMD_FLUSH_FRONTBUFFER 9
-
-#define VCMD_BUSY_WAIT_FLAG_WAIT 1
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/server/virgl_server_renderer.c b/app/src/main/cpp/virglrenderer/server/virgl_server_renderer.c
deleted file mode 100644
index b07381cd9..000000000
--- a/app/src/main/cpp/virglrenderer/server/virgl_server_renderer.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2015 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "virgl_hw.h"
-
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <vrend_renderer.h>
-
-#include "virgl_server.h"
-#include "virgl_server_protocol.h"
-#include "virgl_server_shm.h"
-
-#include "util/u_debug.h"
-#include "util/u_hash_table.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-
-#include <jni.h>
-
-static void virgl_server_write_fence(struct virgl_client *client,
-                                     uint32_t fence_id) {
-  client->renderer->last_fence_id = fence_id;
-}
-
-static virgl_gl_context
-virgl_server_egl_create_context(struct virgl_client *client) {
-  struct virgl_server_renderer *renderer = client->renderer;
-  EGLContext egl_ctx;
-  EGLint ctx_att[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
-
-  egl_ctx = eglCreateContext(renderer->egl_display, renderer->egl_conf,
-                             renderer->egl_ctx, ctx_att);
-
-  return (virgl_gl_context)egl_ctx;
-}
-
-static void virgl_server_egl_destroy_context(struct virgl_client *client,
-                                             virgl_gl_context ctx) {
-  eglDestroyContext(client->renderer->egl_display, (EGLContext)ctx);
-}
-
-static int virgl_server_egl_make_current(struct virgl_client *client,
-                                         virgl_gl_context ctx) {
-  return eglMakeCurrent(client->renderer->egl_display, EGL_NO_SURFACE,
-                        EGL_NO_SURFACE, (EGLContext)ctx);
-}
-
-struct vrend_if_cbs virgl_server_cbs = {
-    .write_fence = virgl_server_write_fence,
-    .create_gl_context = virgl_server_egl_create_context,
-    .destroy_gl_context = virgl_server_egl_destroy_context,
-    .make_current = virgl_server_egl_make_current,
-};
-
-static bool virgl_server_egl_init(struct virgl_server_renderer *renderer) {
-  static EGLint conf_att[] = {
-      EGL_SURFACE_TYPE,
-      EGL_PBUFFER_BIT,
-      EGL_RENDERABLE_TYPE,
-      EGL_OPENGL_ES_BIT,
-      EGL_RED_SIZE,
-      8,
-      EGL_GREEN_SIZE,
-      8,
-      EGL_BLUE_SIZE,
-      8,
-      EGL_ALPHA_SIZE,
-      0,
-      EGL_NONE,
-  };
-  static const EGLint ctx_att[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
-
-  EGLBoolean success;
-  EGLint major, minor, num_configs;
-
-  renderer->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-
-  if (!renderer->egl_display)
-    return false;
-
-  success = eglInitialize(renderer->egl_display, &major, &minor);
-  if (!success)
-    return false;
-
-  success = eglBindAPI(EGL_OPENGL_ES_API);
-  if (!success)
-    return false;
-
-  success = eglChooseConfig(renderer->egl_display, conf_att,
-                            &renderer->egl_conf, 1, &num_configs);
-
-  if (!success || num_configs != 1)
-    return false;
-
-  jlong shared_egl_ctx_ptr =
-      (*jni_info.env)
-          ->CallLongMethod(jni_info.env, jni_info.obj,
-                           jni_info.get_shared_egl_context);
-  EGLContext shared_egl_ctx = (EGLContext)shared_egl_ctx_ptr;
-
-  renderer->egl_ctx = eglCreateContext(
-      renderer->egl_display, renderer->egl_conf,
-      shared_egl_ctx ? shared_egl_ctx : EGL_NO_CONTEXT, ctx_att);
-
-  eglMakeCurrent(renderer->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
-                 renderer->egl_ctx);
-  if (!renderer->egl_ctx)
-    return false;
-
-  return true;
-}
-
-static unsigned hash_func(void *key) {
-  intptr_t ip = pointer_to_intptr(key);
-  return (unsigned)(ip & 0xffffffff);
-}
-
-static int compare_iovecs(void *key1, void *key2) {
-  if (key1 < key2) {
-    return -1;
-  } else if (key1 > key2) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-static void free_iovec(void *value) {
-  struct iovec *iovec = value;
-  if (iovec->iov_base)
-    munmap(iovec->iov_base, iovec->iov_len);
-  free(iovec);
-}
-
-static int virgl_block_write(int fd, void *buf, int size) {
-  char *ptr = buf;
-  int left;
-  int ret;
-  left = size;
-
-  do {
-    ret = write(fd, ptr, left);
-    if (ret < 0)
-      return -errno;
-
-    left -= ret;
-    ptr += ret;
-  } while (left);
-
-  return size;
-}
-
-int virgl_block_read(int fd, void *buf, int size) {
-  char *ptr = buf;
-  int left;
-  int ret;
-
-  left = size;
-  do {
-    ret = read(fd, ptr, left);
-    if (ret <= 0)
-      return ret == -1 ? -errno : 0;
-
-    left -= ret;
-    ptr += ret;
-  } while (left);
-
-  return size;
-}
-
-static int virgl_server_send_fd(int sock_fd, int fd) {
-  struct iovec iovec;
-  char buf[CMSG_SPACE(sizeof(int))], c;
-  struct msghdr msgh = {0};
-  memset(buf, 0, sizeof(buf));
-
-  iovec.iov_base = &c;
-  iovec.iov_len = sizeof(char);
-
-  msgh.msg_name = NULL;
-  msgh.msg_namelen = 0;
-  msgh.msg_iov = &iovec;
-  msgh.msg_iovlen = 1;
-  msgh.msg_control = buf;
-  msgh.msg_controllen = sizeof(buf);
-  msgh.msg_flags = 0;
-
-  struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msgh);
-  cmsg->cmsg_level = SOL_SOCKET;
-  cmsg->cmsg_type = SCM_RIGHTS;
-  cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-
-  *((int *)CMSG_DATA(cmsg)) = fd;
-
-  int size = sendmsg(sock_fd, &msgh, 0);
-  if (size < 0)
-    return -EINVAL;
-
-  return 0;
-}
-
-int virgl_server_create_renderer(struct virgl_client *client, uint32_t length) {
-  int ret;
-
-  struct virgl_server_renderer *renderer =
-      calloc(1, sizeof(struct virgl_server_renderer));
-  renderer->iovec_hash =
-      util_hash_table_create(hash_func, compare_iovecs, free_iovec);
-  renderer->ctx_id = 1;
-
-  client->renderer = renderer;
-
-  virgl_server_egl_init(renderer);
-
-  ret = vrend_renderer_init(client, &virgl_server_cbs);
-  if (ret)
-    return -1;
-
-  ret = vrend_renderer_context_create(client, renderer->ctx_id);
-  return ret;
-}
-
-void virgl_server_destroy_renderer(struct virgl_client *client) {
-  if (!client->initialized)
-    return;
-
-  if (client->renderer->framebuffer)
-    glDeleteFramebuffers(1, &client->renderer->framebuffer);
-
-  vrend_renderer_context_destroy(client, client->renderer->ctx_id);
-  vrend_renderer_fini(client);
-  util_hash_table_destroy(client->renderer->iovec_hash);
-  client->renderer->iovec_hash = NULL;
-
-  free(client->renderer);
-  client->renderer = NULL;
-  client->initialized = false;
-}
-
-int virgl_server_send_caps(struct virgl_client *client,
-                           UNUSED uint32_t length) {
-  uint32_t send_buf[2];
-  void *caps_buf;
-  int ret;
-  uint32_t max_ver, max_size;
-
-  vrend_renderer_get_cap_set(2, &max_ver, &max_size);
-
-  if (max_size == 0)
-    return -1;
-
-  caps_buf = malloc(max_size);
-  if (!caps_buf)
-    return -1;
-
-  vrend_renderer_fill_caps(client, 2, 1, caps_buf);
-
-  send_buf[0] = max_size + 1;
-  send_buf[1] = 2;
-  ret = virgl_block_write(client->fd, send_buf, 8);
-  if (ret < 0)
-    goto end;
-
-  virgl_block_write(client->fd, caps_buf, max_size);
-
-end:
-  free(caps_buf);
-  return 0;
-}
-
-int virgl_server_resource_create(struct virgl_client *client,
-                                 UNUSED uint32_t length) {
-  uint32_t recv_buf[11];
-  struct vrend_renderer_resource_create_args args;
-  struct iovec *iovec;
-  int ret, fd;
-
-  ret = virgl_block_read(client->fd, &recv_buf, sizeof(recv_buf));
-  if (ret != sizeof(recv_buf))
-    return -1;
-
-  args.handle = recv_buf[0];
-  args.target = recv_buf[1];
-  args.format = recv_buf[2];
-  args.bind = recv_buf[3];
-  args.width = recv_buf[4];
-  args.height = recv_buf[5];
-  args.depth = recv_buf[6];
-  args.array_size = recv_buf[7];
-  args.last_level = recv_buf[8];
-  args.nr_samples = recv_buf[9];
-  args.flags = 0;
-
-  if (util_hash_table_get(client->renderer->iovec_hash,
-                          intptr_to_pointer(args.handle)))
-    return -EEXIST;
-
-  ret = vrend_renderer_resource_create(client, &args, NULL, 0);
-  if (ret)
-    return ret;
-
-  vrend_renderer_attach_res_ctx(client, client->renderer->ctx_id, args.handle);
-
-  iovec = CALLOC_STRUCT(iovec);
-  if (!iovec)
-    return -ENOMEM;
-
-  iovec->iov_len = recv_buf[10];
-
-  if (iovec->iov_len == 0) {
-    iovec->iov_base = NULL;
-    goto out;
-  }
-
-  fd = virgl_server_new_shm(args.handle, iovec->iov_len);
-  if (fd < 0) {
-    FREE(iovec);
-    return fd;
-  }
-
-  iovec->iov_base =
-      mmap(NULL, iovec->iov_len, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
-
-  if (iovec->iov_base == MAP_FAILED) {
-    close(fd);
-    FREE(iovec);
-    return -ENOMEM;
-  }
-
-  ret = virgl_server_send_fd(client->fd, fd);
-  if (ret < 0) {
-    close(fd);
-    munmap(iovec->iov_base, iovec->iov_len);
-    return ret;
-  }
-
-  close(fd);
-
-out:
-  vrend_renderer_resource_attach_iov(client, args.handle, iovec, 1);
-  util_hash_table_set(client->renderer->iovec_hash,
-                      intptr_to_pointer(args.handle), iovec);
-  return 0;
-}
-
-int virgl_server_resource_destroy(struct virgl_client *client,
-                                  UNUSED uint32_t length) {
-  uint32_t recv_buf[1];
-  int ret;
-  uint32_t handle;
-
-  ret = virgl_block_read(client->fd, &recv_buf, sizeof(recv_buf));
-  if (ret != sizeof(recv_buf))
-    return -1;
-
-  handle = recv_buf[0];
-  vrend_renderer_attach_res_ctx(client, client->renderer->ctx_id, handle);
-
-  vrend_renderer_resource_detach_iov(client, handle, NULL, NULL);
-  util_hash_table_remove(client->renderer->iovec_hash,
-                         intptr_to_pointer(handle));
-
-  vrend_renderer_resource_unref(client, handle);
-  return 0;
-}
-
-int virgl_server_transfer_get(struct virgl_client *client,
-                              UNUSED uint32_t length) {
-  uint32_t recv_buf[10];
-  int ret;
-  struct pipe_box box;
-  struct iovec *iovec;
-  struct vrend_transfer_info transfer_info;
-
-  ret = virgl_block_read(client->fd, &recv_buf, sizeof(recv_buf));
-  if (ret != sizeof(recv_buf))
-    return ret;
-
-  box.x = recv_buf[2];
-  box.y = recv_buf[3];
-  box.z = recv_buf[4];
-  box.width = recv_buf[5];
-  box.height = recv_buf[6];
-  box.depth = recv_buf[7];
-
-  transfer_info.handle = recv_buf[0];
-  transfer_info.ctx_id = client->renderer->ctx_id;
-  transfer_info.level = recv_buf[1];
-  transfer_info.stride = 0;
-  transfer_info.layer_stride = 0;
-  transfer_info.box = &box;
-  transfer_info.offset = recv_buf[9];
-  transfer_info.iovec = NULL;
-  transfer_info.iovec_cnt = 0;
-  transfer_info.context0 = true;
-  transfer_info.synchronized = false;
-
-  iovec = util_hash_table_get(client->renderer->iovec_hash,
-                              intptr_to_pointer(transfer_info.handle));
-  if (!iovec)
-    return -ESRCH;
-
-  if (transfer_info.offset >= iovec->iov_len)
-    return -EFAULT;
-
-  ret = vrend_renderer_transfer_iov(client, &transfer_info,
-                                    VIRGL_TRANSFER_FROM_HOST);
-
-  if (ret)
-    return ret;
-
-  return 0;
-}
-
-int virgl_server_transfer_put(struct virgl_client *client,
-                              UNUSED uint32_t length) {
-  uint32_t recv_buf[10];
-  int ret;
-  struct pipe_box box;
-  struct iovec *iovec;
-  struct vrend_transfer_info transfer_info;
-
-  ret = virgl_block_read(client->fd, &recv_buf, sizeof(recv_buf));
-  if (ret != sizeof(recv_buf))
-    return ret;
-
-  box.x = recv_buf[2];
-  box.y = recv_buf[3];
-  box.z = recv_buf[4];
-  box.width = recv_buf[5];
-  box.height = recv_buf[6];
-  box.depth = recv_buf[7];
-
-  transfer_info.handle = recv_buf[0];
-  transfer_info.ctx_id = client->renderer->ctx_id;
-  transfer_info.level = recv_buf[1];
-  transfer_info.stride = 0;
-  transfer_info.layer_stride = 0;
-  transfer_info.box = &box;
-  transfer_info.offset = recv_buf[9];
-  transfer_info.iovec = NULL;
-  transfer_info.iovec_cnt = 0;
-  transfer_info.context0 = true;
-  transfer_info.synchronized = false;
-
-  iovec = util_hash_table_get(client->renderer->iovec_hash,
-                              intptr_to_pointer(transfer_info.handle));
-  if (!iovec)
-    return -ESRCH;
-
-  vrend_renderer_transfer_iov(client, &transfer_info, VIRGL_TRANSFER_TO_HOST);
-
-  if (ret)
-    return ret;
-
-  return 0;
-}
-
-int virgl_server_submit_cmd(struct virgl_client *client, uint32_t length) {
-  uint32_t *cbuf;
-  int cbuf_len, ret;
-
-  cbuf_len = length * 4;
-  cbuf = malloc(cbuf_len);
-  if (!cbuf)
-    return -1;
-
-  ret = virgl_block_read(client->fd, cbuf, cbuf_len);
-  if (ret != cbuf_len) {
-    free(cbuf);
-    return -1;
-  }
-
-  vrend_decode_block(client, client->renderer->ctx_id, cbuf, length);
-
-  free(cbuf);
-  virgl_server_renderer_create_fence(client);
-  return 0;
-}
-
-int virgl_server_resource_busy_wait(struct virgl_client *client,
-                                    UNUSED uint32_t length) {
-  uint32_t recv_buf[2];
-  uint32_t send_buf[3];
-  int ret;
-  int flags;
-  bool busy = false;
-
-  ret = virgl_block_read(client->fd, &recv_buf, sizeof(recv_buf));
-  if (ret != sizeof(recv_buf))
-    return -1;
-
-  flags = recv_buf[1];
-
-  do {
-    busy = client->renderer->last_fence_id != client->renderer->fence_id;
-    if (!busy || !(flags & VCMD_BUSY_WAIT_FLAG_WAIT))
-      break;
-
-    vrend_renderer_check_fences(client);
-  } while (1);
-
-  send_buf[0] = 1;
-  send_buf[1] = VCMD_RESOURCE_BUSY_WAIT;
-  send_buf[2] = busy ? 1 : 0;
-
-  ret = virgl_block_write(client->fd, send_buf, sizeof(send_buf));
-  if (ret < 0)
-    return ret;
-
-  return 0;
-}
-
-int virgl_server_flush_frontbuffer(struct virgl_client *client,
-                                   UNUSED uint32_t length) {
-  uint32_t recv_buf[2];
-  uint32_t handle, drawable;
-  int ret;
-
-  ret = virgl_block_read(client->fd, &recv_buf, sizeof(recv_buf));
-  if (ret != sizeof(recv_buf))
-    return -1;
-
-  handle = recv_buf[0];
-  drawable = recv_buf[1];
-
-  if (handle != client->renderer->handle) {
-    struct vrend_context *ctx =
-        vrend_lookup_renderer_ctx(client, client->renderer->ctx_id);
-    struct vrend_resource *res = vrend_renderer_ctx_res_lookup(ctx, handle);
-
-    if (client->renderer->framebuffer)
-      glDeleteFramebuffers(1, &client->renderer->framebuffer);
-
-    GLuint framebuffer;
-    glGenFramebuffers(1, &framebuffer);
-    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
-
-    vrend_fb_bind_texture(res, 0, 0, 0);
-
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-    client->renderer->framebuffer = framebuffer;
-    client->renderer->handle = handle;
-  }
-
-  (*jni_info.env)
-      ->CallVoidMethod(jni_info.env, jni_info.obj, jni_info.flush_frontbuffer,
-                       drawable, client->renderer->framebuffer);
-  return 0;
-}
-
-int virgl_server_renderer_create_fence(struct virgl_client *client) {
-  vrend_renderer_create_fence(client, ++client->renderer->fence_id, 0);
-  return 0;
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_winlator_xenvironment_components_VirGLRendererComponent_getCurrentEGLContextPtr(
-    JNIEnv *env, jobject obj) {
-  EGLContext egl_ctx = eglGetCurrentContext();
-  return egl_ctx != EGL_NO_CONTEXT ? (jlong)egl_ctx : 0;
-}
\ No newline at end of file
diff --git a/app/src/main/cpp/virglrenderer/server/virgl_server_shm.c b/app/src/main/cpp/virglrenderer/server/virgl_server_shm.c
deleted file mode 100644
index 404ab522d..000000000
--- a/app/src/main/cpp/virglrenderer/server/virgl_server_shm.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2018 Chromium.
- *
- * 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.
- *
- **************************************************************************/
-
-#include "virgl_server_shm.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <sys/syscall.h>
-#include <unistd.h>
-
-static int memfd_create(const char *name, unsigned int flags) {
-#ifdef __NR_memfd_create
-  return syscall(__NR_memfd_create, name, flags);
-#else
-  return -1;
-#endif
-}
-
-int virgl_server_new_shm(uint32_t handle, size_t size) {
-  int fd, ret;
-  int length = snprintf(NULL, 0, "virgl-res-%u", handle);
-  char *str = malloc(length + 1);
-  snprintf(str, length + 1, "virgl-res-%u", handle);
-
-  fd = memfd_create(str, MFD_ALLOW_SEALING);
-  free(str);
-  if (fd < 0)
-    return -errno;
-
-  ret = ftruncate(fd, size);
-  if (ret < 0) {
-    close(fd);
-    return -errno;
-  }
-
-  return fd;
-}
diff --git a/app/src/main/cpp/virglrenderer/server/virgl_server_shm.h b/app/src/main/cpp/virglrenderer/server/virgl_server_shm.h
deleted file mode 100644
index 6929e8829..000000000
--- a/app/src/main/cpp/virglrenderer/server/virgl_server_shm.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef VIRGL_SERVER_SHM_H
-#define VIRGL_SERVER_SHM_H
-
-#ifndef F_LINUX_SPECIFIC_BASE
-#define F_LINUX_SPECIFIC_BASE 1024
-#endif
-
-#ifndef F_ADD_SEALS
-#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
-#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
-
-#define F_SEAL_SEAL 0x0001   /* prevent further seals from being set */
-#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
-#define F_SEAL_GROW 0x0004   /* prevent file from growing */
-#define F_SEAL_WRITE 0x0008  /* prevent writes */
-#endif
-
-#ifndef MFD_CLOEXEC
-#define MFD_CLOEXEC 0x0001U
-#endif
-
-#ifndef MFD_ALLOW_SEALING
-#define MFD_ALLOW_SEALING 0x0002U
-#endif
-
-#ifndef MFD_HUGETLB
-#define MFD_HUGETLB 0x0004U
-#endif
-
-#ifndef MFD_HUGE_SHIFT
-#define MFD_HUGE_SHIFT 26
-#endif
-
-#include <stdint.h>
-#include <string.h>
-
-int virgl_server_new_shm(uint32_t handle, size_t size);
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_cache.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_cache.c
deleted file mode 100644
index 404ac3adc..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_cache.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/* Authors:  Zack Rusin <zackr@vmware.com>
- */
-
-#include "util/u_debug.h"
-
-#include "util/u_memory.h"
-
-#include "cso_cache.h"
-#include "cso_hash.h"
-
-struct cso_cache {
-  struct cso_hash *hashes[CSO_CACHE_MAX];
-  int max_size;
-
-  cso_sanitize_callback sanitize_cb;
-  void *sanitize_data;
-};
-
-#if 1
-static unsigned hash_key(const void *key, unsigned key_size) {
-  unsigned *ikey = (unsigned *)key;
-  unsigned hash = 0, i;
-
-  assert(key_size % 4 == 0);
-
-  /* I'm sure this can be improved on:
-   */
-  for (i = 0; i < key_size / 4; i++)
-    hash ^= ikey[i];
-
-  return hash;
-}
-#else
-static unsigned hash_key(const unsigned char *p, int n) {
-  unsigned h = 0;
-  unsigned g;
-
-  while (n--) {
-    h = (h << 4) + *p++;
-    if ((g = (h & 0xf0000000)) != 0)
-      h ^= g >> 23;
-    h &= ~g;
-  }
-  return h;
-}
-#endif
-
-unsigned cso_construct_key(void *item, int item_size) {
-  return hash_key((item), item_size);
-}
-
-static inline struct cso_hash *_cso_hash_for_type(struct cso_cache *sc,
-                                                  enum cso_cache_type type) {
-  struct cso_hash *hash;
-  hash = sc->hashes[type];
-  return hash;
-}
-
-static void delete_blend_state(void *state, UNUSED void *data) {
-  struct cso_blend *cso = (struct cso_blend *)state;
-  if (cso->delete_state)
-    cso->delete_state(cso->context, cso->data);
-  FREE(state);
-}
-
-static void delete_depth_stencil_state(void *state, UNUSED void *data) {
-  struct cso_depth_stencil_alpha *cso = (struct cso_depth_stencil_alpha *)state;
-  if (cso->delete_state)
-    cso->delete_state(cso->context, cso->data);
-  FREE(state);
-}
-
-static void delete_sampler_state(void *state, UNUSED void *data) {
-  struct cso_sampler *cso = (struct cso_sampler *)state;
-  if (cso->delete_state)
-    cso->delete_state(cso->context, cso->data);
-  FREE(state);
-}
-
-static void delete_rasterizer_state(void *state, UNUSED void *data) {
-  struct cso_rasterizer *cso = (struct cso_rasterizer *)state;
-  if (cso->delete_state)
-    cso->delete_state(cso->context, cso->data);
-  FREE(state);
-}
-
-static void delete_velements(void *state, UNUSED void *data) {
-  struct cso_velements *cso = (struct cso_velements *)state;
-  if (cso->delete_state)
-    cso->delete_state(cso->context, cso->data);
-  FREE(state);
-}
-
-static inline void delete_cso(void *state, enum cso_cache_type type) {
-  switch (type) {
-  case CSO_BLEND:
-    delete_blend_state(state, 0);
-    break;
-  case CSO_SAMPLER:
-    delete_sampler_state(state, 0);
-    break;
-  case CSO_DEPTH_STENCIL_ALPHA:
-    delete_depth_stencil_state(state, 0);
-    break;
-  case CSO_RASTERIZER:
-    delete_rasterizer_state(state, 0);
-    break;
-  case CSO_VELEMENTS:
-    delete_velements(state, 0);
-    break;
-  default:
-    assert(0);
-    FREE(state);
-  }
-}
-
-static inline void sanitize_hash(struct cso_cache *sc, struct cso_hash *hash,
-                                 enum cso_cache_type type, int max_size) {
-  if (sc->sanitize_cb)
-    sc->sanitize_cb(hash, type, max_size, sc->sanitize_data);
-}
-
-static inline void sanitize_cb(struct cso_hash *hash, enum cso_cache_type type,
-                               int max_size, UNUSED void *user_data) {
-  /* if we're approach the maximum size, remove fourth of the entries
-   * otherwise every subsequent call will go through the same */
-  int hash_size = cso_hash_size(hash);
-  int max_entries = (max_size > hash_size) ? max_size : hash_size;
-  int to_remove = (max_size < max_entries) * max_entries / 4;
-  if (hash_size > max_size)
-    to_remove += hash_size - max_size;
-  while (to_remove) {
-    /*remove elements until we're good */
-    /*fixme: currently we pick the nodes to remove at random*/
-    struct cso_hash_iter iter = cso_hash_first_node(hash);
-    void *cso = cso_hash_take(hash, cso_hash_iter_key(iter));
-    delete_cso(cso, type);
-    --to_remove;
-  }
-}
-
-struct cso_hash_iter cso_insert_state(struct cso_cache *sc, unsigned hash_key,
-                                      enum cso_cache_type type, void *state) {
-  struct cso_hash *hash = _cso_hash_for_type(sc, type);
-  sanitize_hash(sc, hash, type, sc->max_size);
-
-  return cso_hash_insert(hash, hash_key, state);
-}
-
-struct cso_hash_iter cso_find_state(struct cso_cache *sc, unsigned hash_key,
-                                    enum cso_cache_type type) {
-  struct cso_hash *hash = _cso_hash_for_type(sc, type);
-
-  return cso_hash_find(hash, hash_key);
-}
-
-void *cso_hash_find_data_from_template(struct cso_hash *hash, unsigned hash_key,
-                                       void *templ, int size) {
-  struct cso_hash_iter iter = cso_hash_find(hash, hash_key);
-  while (!cso_hash_iter_is_null(iter)) {
-    void *iter_data = cso_hash_iter_data(iter);
-    if (!memcmp(iter_data, templ, size)) {
-      /* We found a match
-       */
-      return iter_data;
-    }
-    iter = cso_hash_iter_next(iter);
-  }
-  return NULL;
-}
-
-struct cso_hash_iter cso_find_state_template(struct cso_cache *sc,
-                                             unsigned hash_key,
-                                             enum cso_cache_type type,
-                                             void *templ, unsigned size) {
-  struct cso_hash_iter iter = cso_find_state(sc, hash_key, type);
-  while (!cso_hash_iter_is_null(iter)) {
-    void *iter_data = cso_hash_iter_data(iter);
-    if (!memcmp(iter_data, templ, size))
-      return iter;
-    iter = cso_hash_iter_next(iter);
-  }
-  return iter;
-}
-
-void *cso_take_state(struct cso_cache *sc, unsigned hash_key,
-                     enum cso_cache_type type) {
-  struct cso_hash *hash = _cso_hash_for_type(sc, type);
-  return cso_hash_take(hash, hash_key);
-}
-
-struct cso_cache *cso_cache_create(void) {
-  struct cso_cache *sc = MALLOC_STRUCT(cso_cache);
-  int i;
-  if (sc == NULL)
-    return NULL;
-
-  sc->max_size = 4096;
-  for (i = 0; i < CSO_CACHE_MAX; i++)
-    sc->hashes[i] = cso_hash_create();
-
-  sc->sanitize_cb = sanitize_cb;
-  sc->sanitize_data = 0;
-
-  return sc;
-}
-
-void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
-                        cso_state_callback func, void *user_data) {
-  struct cso_hash *hash = _cso_hash_for_type(sc, type);
-  struct cso_hash_iter iter;
-
-  iter = cso_hash_first_node(hash);
-  while (!cso_hash_iter_is_null(iter)) {
-    void *state = cso_hash_iter_data(iter);
-    iter = cso_hash_iter_next(iter);
-    if (state) {
-      func(state, user_data);
-    }
-  }
-}
-
-void cso_cache_delete(struct cso_cache *sc) {
-  int i;
-  assert(sc);
-
-  if (!sc)
-    return;
-
-  /* delete driver data */
-  cso_for_each_state(sc, CSO_BLEND, delete_blend_state, 0);
-  cso_for_each_state(sc, CSO_DEPTH_STENCIL_ALPHA, delete_depth_stencil_state,
-                     0);
-  cso_for_each_state(sc, CSO_RASTERIZER, delete_rasterizer_state, 0);
-  cso_for_each_state(sc, CSO_SAMPLER, delete_sampler_state, 0);
-  cso_for_each_state(sc, CSO_VELEMENTS, delete_velements, 0);
-
-  for (i = 0; i < CSO_CACHE_MAX; i++)
-    cso_hash_delete(sc->hashes[i]);
-
-  FREE(sc);
-}
-
-void cso_set_maximum_cache_size(struct cso_cache *sc, int number) {
-  int i;
-
-  sc->max_size = number;
-
-  for (i = 0; i < CSO_CACHE_MAX; i++)
-    sanitize_hash(sc, sc->hashes[i], i, sc->max_size);
-}
-
-int cso_maximum_cache_size(const struct cso_cache *sc) { return sc->max_size; }
-
-void cso_cache_set_sanitize_callback(struct cso_cache *sc,
-                                     cso_sanitize_callback cb,
-                                     void *user_data) {
-  sc->sanitize_cb = cb;
-  sc->sanitize_data = user_data;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_cache.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_cache.h
deleted file mode 100644
index 515e2334e..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_cache.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Constant State Object (CSO) cache.
- *
- * The basic idea is that the states are created via the
- * create_state/bind_state/delete_state semantics. The driver is expected to
- * perform as much of the Gallium state translation to whatever its internal
- * representation is during the create call. Gallium then has a caching
- * mechanism where it stores the created states. When the pipeline needs an
- * actual state change, a bind call is issued. In the bind call the driver
- * gets its already translated representation.
- *
- * Those semantics mean that the driver doesn't do the repeated translations
- * of states on every frame, but only once, when a new state is actually
- * created.
- *
- * Even on hardware that doesn't do any kind of state cache, it makes the
- * driver look a lot neater, plus it avoids all the redundant state
- * translations on every frame.
- *
- * Currently our constant state objects are:
- * - alpha test
- * - blend
- * - depth stencil
- * - fragment shader
- * - rasterizer (old setup)
- * - sampler
- * - vertex shader
- * - vertex elements
- *
- * Things that are not constant state objects include:
- * - blend_color
- * - clip_state
- * - clear_color_state
- * - constant_buffer
- * - feedback_state
- * - framebuffer_state
- * - polygon_stipple
- * - scissor_state
- * - texture_state
- * - viewport_state
- *
- * @author Zack Rusin <zackr@vmware.com>
- */
-
-#ifndef CSO_CACHE_H
-#define CSO_CACHE_H
-
-#include "pipe/p_context.h"
-#include "pipe/p_state.h"
-
-/* cso_hash.h is necessary for cso_hash_iter, as MSVC requires structures
- * returned by value to be fully defined */
-#include "cso_hash.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum cso_cache_type {
-  CSO_RASTERIZER,
-  CSO_BLEND,
-  CSO_DEPTH_STENCIL_ALPHA,
-  CSO_SAMPLER,
-  CSO_VELEMENTS,
-  CSO_CACHE_MAX,
-};
-
-typedef void (*cso_state_callback)(void *ctx, void *obj);
-
-typedef void (*cso_sanitize_callback)(struct cso_hash *hash,
-                                      enum cso_cache_type type, int max_size,
-                                      void *user_data);
-
-struct cso_cache;
-
-struct cso_blend {
-  struct pipe_blend_state state;
-  void *data;
-  cso_state_callback delete_state;
-  struct pipe_context *context;
-};
-
-struct cso_depth_stencil_alpha {
-  struct pipe_depth_stencil_alpha_state state;
-  void *data;
-  cso_state_callback delete_state;
-  struct pipe_context *context;
-};
-
-struct cso_rasterizer {
-  struct pipe_rasterizer_state state;
-  void *data;
-  cso_state_callback delete_state;
-  struct pipe_context *context;
-};
-
-struct cso_sampler {
-  struct pipe_sampler_state state;
-  void *data;
-  cso_state_callback delete_state;
-  struct pipe_context *context;
-};
-
-struct cso_velems_state {
-  unsigned count;
-  struct pipe_vertex_element velems[PIPE_MAX_ATTRIBS];
-};
-
-struct cso_velements {
-  struct cso_velems_state state;
-  void *data;
-  cso_state_callback delete_state;
-  struct pipe_context *context;
-};
-
-unsigned cso_construct_key(void *item, int item_size);
-
-struct cso_cache *cso_cache_create(void);
-void cso_cache_delete(struct cso_cache *sc);
-
-void cso_cache_set_sanitize_callback(struct cso_cache *sc,
-                                     cso_sanitize_callback cb, void *user_data);
-
-struct cso_hash_iter cso_insert_state(struct cso_cache *sc, unsigned hash_key,
-                                      enum cso_cache_type type, void *state);
-struct cso_hash_iter cso_find_state(struct cso_cache *sc, unsigned hash_key,
-                                    enum cso_cache_type type);
-struct cso_hash_iter cso_find_state_template(struct cso_cache *sc,
-                                             unsigned hash_key,
-                                             enum cso_cache_type type,
-                                             void *templ, unsigned size);
-void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
-                        cso_state_callback func, void *user_data);
-void *cso_take_state(struct cso_cache *sc, unsigned hash_key,
-                     enum cso_cache_type type);
-
-void cso_set_maximum_cache_size(struct cso_cache *sc, int number);
-int cso_maximum_cache_size(const struct cso_cache *sc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_hash.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_hash.c
deleted file mode 100644
index c792c81b0..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_hash.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * Authors:
- *   Zack Rusin <zackr@vmware.com>
- */
-
-#include "util/u_debug.h"
-#include "util/u_memory.h"
-
-#include "cso_hash.h"
-
-#define MAX(a, b) ((a > b) ? (a) : (b))
-
-static const int MinNumBits = 4;
-
-static const unsigned char prime_deltas[] = {
-    0, 0,  1, 3,  1, 5,  3, 3, 1, 9,  7,  5, 3, 9, 25, 3,
-    1, 21, 3, 21, 7, 15, 9, 5, 3, 29, 15, 0, 0, 0, 0,  0};
-
-static int primeForNumBits(int numBits) {
-  return (1 << numBits) + prime_deltas[numBits];
-}
-
-/*
-    Returns the smallest integer n such that
-    primeForNumBits(n) >= hint.
-*/
-static int countBits(int hint) {
-  int numBits = 0;
-  int bits = hint;
-
-  while (bits > 1) {
-    bits >>= 1;
-    numBits++;
-  }
-
-  if (numBits >= (int)sizeof(prime_deltas)) {
-    numBits = sizeof(prime_deltas) - 1;
-  } else if (primeForNumBits(numBits) < hint) {
-    ++numBits;
-  }
-  return numBits;
-}
-
-struct cso_node {
-  struct cso_node *next;
-  unsigned key;
-  void *value;
-};
-
-struct cso_hash_data {
-  struct cso_node *fakeNext;
-  struct cso_node **buckets;
-  int size;
-  int nodeSize;
-  short userNumBits;
-  short numBits;
-  int numBuckets;
-};
-
-struct cso_hash {
-  union {
-    struct cso_hash_data *d;
-    struct cso_node *e;
-  } data;
-};
-
-static void *cso_data_allocate_node(struct cso_hash_data *hash) {
-  return MALLOC(hash->nodeSize);
-}
-
-static void cso_free_node(struct cso_node *node) { FREE(node); }
-
-static struct cso_node *cso_hash_create_node(struct cso_hash *hash,
-                                             unsigned akey, void *avalue,
-                                             struct cso_node **anextNode) {
-  struct cso_node *node = cso_data_allocate_node(hash->data.d);
-
-  if (!node)
-    return NULL;
-
-  node->key = akey;
-  node->value = avalue;
-
-  node->next = (struct cso_node *)(*anextNode);
-  *anextNode = node;
-  ++hash->data.d->size;
-  return node;
-}
-
-static void cso_data_rehash(struct cso_hash_data *hash, int hint) {
-  if (hint < 0) {
-    hint = countBits(-hint);
-    if (hint < MinNumBits)
-      hint = MinNumBits;
-    hash->userNumBits = (short)hint;
-    while (primeForNumBits(hint) < (hash->size >> 1))
-      ++hint;
-  } else if (hint < MinNumBits) {
-    hint = MinNumBits;
-  }
-
-  if (hash->numBits != hint) {
-    struct cso_node *e = (struct cso_node *)(hash);
-    struct cso_node **oldBuckets = hash->buckets;
-    int oldNumBuckets = hash->numBuckets;
-    int i = 0;
-
-    hash->numBits = (short)hint;
-    hash->numBuckets = primeForNumBits(hint);
-    hash->buckets = MALLOC(sizeof(struct cso_node *) * hash->numBuckets);
-    for (i = 0; i < hash->numBuckets; ++i)
-      hash->buckets[i] = e;
-
-    for (i = 0; i < oldNumBuckets; ++i) {
-      struct cso_node *firstNode = oldBuckets[i];
-      while (firstNode != e) {
-        unsigned h = firstNode->key;
-        struct cso_node *lastNode = firstNode;
-        struct cso_node *afterLastNode;
-        struct cso_node **beforeFirstNode;
-
-        while (lastNode->next != e && lastNode->next->key == h)
-          lastNode = lastNode->next;
-
-        afterLastNode = lastNode->next;
-        beforeFirstNode = &hash->buckets[h % hash->numBuckets];
-        while (*beforeFirstNode != e)
-          beforeFirstNode = &(*beforeFirstNode)->next;
-        lastNode->next = *beforeFirstNode;
-        *beforeFirstNode = firstNode;
-        firstNode = afterLastNode;
-      }
-    }
-    FREE(oldBuckets);
-  }
-}
-
-static void cso_data_might_grow(struct cso_hash_data *hash) {
-  if (hash->size >= hash->numBuckets)
-    cso_data_rehash(hash, hash->numBits + 1);
-}
-
-static void cso_data_has_shrunk(struct cso_hash_data *hash) {
-  if (hash->size <= (hash->numBuckets >> 3) &&
-      hash->numBits > hash->userNumBits) {
-    int max = MAX(hash->numBits - 2, hash->userNumBits);
-    cso_data_rehash(hash, max);
-  }
-}
-
-static struct cso_node *cso_data_first_node(struct cso_hash_data *hash) {
-  struct cso_node *e = (struct cso_node *)(hash);
-  struct cso_node **bucket = hash->buckets;
-  int n = hash->numBuckets;
-  while (n--) {
-    if (*bucket != e)
-      return *bucket;
-    ++bucket;
-  }
-  return e;
-}
-
-static struct cso_node **cso_hash_find_node(struct cso_hash *hash,
-                                            unsigned akey) {
-  struct cso_node **node;
-
-  if (hash->data.d->numBuckets) {
-    node =
-        (struct cso_node **)(&hash->data.d
-                                  ->buckets[akey % hash->data.d->numBuckets]);
-    assert(*node == hash->data.e || (*node)->next);
-    while (*node != hash->data.e && (*node)->key != akey)
-      node = &(*node)->next;
-  } else {
-    node =
-        (struct cso_node **)((const struct cso_node *const *)(&hash->data.e));
-  }
-  return node;
-}
-
-struct cso_hash_iter cso_hash_insert(struct cso_hash *hash, unsigned key,
-                                     void *data) {
-  cso_data_might_grow(hash->data.d);
-
-  {
-    struct cso_node **nextNode = cso_hash_find_node(hash, key);
-    struct cso_node *node = cso_hash_create_node(hash, key, data, nextNode);
-    if (!node) {
-      struct cso_hash_iter null_iter = {hash, 0};
-      return null_iter;
-    }
-
-    {
-      struct cso_hash_iter iter = {hash, node};
-      return iter;
-    }
-  }
-}
-
-struct cso_hash *cso_hash_create(void) {
-  struct cso_hash *hash = MALLOC_STRUCT(cso_hash);
-  if (!hash)
-    return NULL;
-
-  hash->data.d = MALLOC_STRUCT(cso_hash_data);
-  if (!hash->data.d) {
-    FREE(hash);
-    return NULL;
-  }
-
-  hash->data.d->fakeNext = 0;
-  hash->data.d->buckets = 0;
-  hash->data.d->size = 0;
-  hash->data.d->nodeSize = sizeof(struct cso_node);
-  hash->data.d->userNumBits = (short)MinNumBits;
-  hash->data.d->numBits = 0;
-  hash->data.d->numBuckets = 0;
-
-  return hash;
-}
-
-void cso_hash_delete(struct cso_hash *hash) {
-  struct cso_node *e_for_x = (struct cso_node *)(hash->data.d);
-  struct cso_node **bucket = (struct cso_node **)(hash->data.d->buckets);
-  int n = hash->data.d->numBuckets;
-  while (n--) {
-    struct cso_node *cur = *bucket++;
-    while (cur != e_for_x) {
-      struct cso_node *next = cur->next;
-      cso_free_node(cur);
-      cur = next;
-    }
-  }
-  FREE(hash->data.d->buckets);
-  FREE(hash->data.d);
-  FREE(hash);
-}
-
-struct cso_hash_iter cso_hash_find(struct cso_hash *hash, unsigned key) {
-  struct cso_node **nextNode = cso_hash_find_node(hash, key);
-  struct cso_hash_iter iter = {hash, *nextNode};
-  return iter;
-}
-
-unsigned cso_hash_iter_key(struct cso_hash_iter iter) {
-  if (!iter.node || iter.hash->data.e == iter.node)
-    return 0;
-  return iter.node->key;
-}
-
-void *cso_hash_iter_data(struct cso_hash_iter iter) {
-  if (!iter.node || iter.hash->data.e == iter.node)
-    return 0;
-  return iter.node->value;
-}
-
-static struct cso_node *cso_hash_data_next(struct cso_node *node) {
-  union {
-    struct cso_node *next;
-    struct cso_node *e;
-    struct cso_hash_data *d;
-  } a;
-  int start;
-  struct cso_node **bucket;
-  int n;
-
-  a.next = node->next;
-  if (!a.next) {
-    debug_printf("iterating beyond the last element\n");
-    return 0;
-  }
-  if (a.next->next)
-    return a.next;
-
-  start = (node->key % a.d->numBuckets) + 1;
-  bucket = a.d->buckets + start;
-  n = a.d->numBuckets - start;
-  while (n--) {
-    if (*bucket != a.e)
-      return *bucket;
-    ++bucket;
-  }
-  return a.e;
-}
-
-static struct cso_node *cso_hash_data_prev(struct cso_node *node) {
-  union {
-    struct cso_node *e;
-    struct cso_hash_data *d;
-  } a;
-  int start;
-  struct cso_node *sentinel;
-  struct cso_node **bucket;
-
-  a.e = node;
-  while (a.e->next)
-    a.e = a.e->next;
-
-  if (node == a.e)
-    start = a.d->numBuckets - 1;
-  else
-    start = node->key % a.d->numBuckets;
-
-  sentinel = node;
-  bucket = a.d->buckets + start;
-  while (start >= 0) {
-    if (*bucket != sentinel) {
-      struct cso_node *prev = *bucket;
-      while (prev->next != sentinel)
-        prev = prev->next;
-      return prev;
-    }
-
-    sentinel = a.e;
-    --bucket;
-    --start;
-  }
-  debug_printf("iterating backward beyond first element\n");
-  return a.e;
-}
-
-struct cso_hash_iter cso_hash_iter_next(struct cso_hash_iter iter) {
-  struct cso_hash_iter next = {iter.hash, cso_hash_data_next(iter.node)};
-  return next;
-}
-
-int cso_hash_iter_is_null(struct cso_hash_iter iter) {
-  if (!iter.node || iter.node == iter.hash->data.e)
-    return 1;
-  return 0;
-}
-
-void *cso_hash_take(struct cso_hash *hash, unsigned akey) {
-  struct cso_node **node = cso_hash_find_node(hash, akey);
-  if (*node != hash->data.e) {
-    void *t = (*node)->value;
-    struct cso_node *next = (*node)->next;
-    cso_free_node(*node);
-    *node = next;
-    --hash->data.d->size;
-    cso_data_has_shrunk(hash->data.d);
-    return t;
-  }
-  return 0;
-}
-
-struct cso_hash_iter cso_hash_iter_prev(struct cso_hash_iter iter) {
-  struct cso_hash_iter prev = {iter.hash, cso_hash_data_prev(iter.node)};
-  return prev;
-}
-
-struct cso_hash_iter cso_hash_first_node(struct cso_hash *hash) {
-  struct cso_hash_iter iter = {hash, cso_data_first_node(hash->data.d)};
-  return iter;
-}
-
-int cso_hash_size(struct cso_hash *hash) { return hash->data.d->size; }
-
-struct cso_hash_iter cso_hash_erase(struct cso_hash *hash,
-                                    struct cso_hash_iter iter) {
-  struct cso_hash_iter ret = iter;
-  struct cso_node *node = iter.node;
-  struct cso_node **node_ptr;
-
-  if (node == hash->data.e)
-    return iter;
-
-  ret = cso_hash_iter_next(ret);
-  node_ptr =
-      (struct cso_node *
-           *)(&hash->data.d->buckets[node->key % hash->data.d->numBuckets]);
-  while (*node_ptr != node)
-    node_ptr = &(*node_ptr)->next;
-  *node_ptr = node->next;
-  cso_free_node(node);
-  --hash->data.d->size;
-  return ret;
-}
-
-boolean cso_hash_contains(struct cso_hash *hash, unsigned key) {
-  struct cso_node **node = cso_hash_find_node(hash, key);
-  return (*node != hash->data.e);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_hash.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_hash.h
deleted file mode 100644
index 35324875c..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/cso_cache/cso_hash.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Hash table implementation.
- *
- * This file provides a hash implementation that is capable of dealing
- * with collisions. It stores colliding entries in linked list. All
- * functions operating on the hash return an iterator. The iterator
- * itself points to the collision list. If there wasn't any collision
- * the list will have just one entry, otherwise client code should
- * iterate over the entries to find the exact entry among ones that
- * had the same key (e.g. memcmp could be used on the data to check
- * that)
- *
- * @author Zack Rusin <zackr@vmware.com>
- */
-
-#ifndef CSO_HASH_H
-#define CSO_HASH_H
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct cso_hash;
-struct cso_node;
-
-struct cso_hash_iter {
-  struct cso_hash *hash;
-  struct cso_node *node;
-};
-
-struct cso_hash *cso_hash_create(void);
-void cso_hash_delete(struct cso_hash *hash);
-
-int cso_hash_size(struct cso_hash *hash);
-
-/**
- * Adds a data with the given key to the hash. If entry with the given
- * key is already in the hash, this current entry is instered before it
- * in the collision list.
- * Function returns iterator pointing to the inserted item in the hash.
- */
-struct cso_hash_iter cso_hash_insert(struct cso_hash *hash, unsigned key,
-                                     void *data);
-/**
- * Removes the item pointed to by the current iterator from the hash.
- * Note that the data itself is not erased and if it was a malloc'ed pointer
- * it will have to be freed after calling this function by the callee.
- * Function returns iterator pointing to the item after the removed one in
- * the hash.
- */
-struct cso_hash_iter cso_hash_erase(struct cso_hash *hash,
-                                    struct cso_hash_iter iter);
-
-void *cso_hash_take(struct cso_hash *hash, unsigned key);
-
-struct cso_hash_iter cso_hash_first_node(struct cso_hash *hash);
-
-/**
- * Return an iterator pointing to the first entry in the collision list.
- */
-struct cso_hash_iter cso_hash_find(struct cso_hash *hash, unsigned key);
-
-/**
- * Returns true if a value with the given key exists in the hash
- */
-boolean cso_hash_contains(struct cso_hash *hash, unsigned key);
-
-int cso_hash_iter_is_null(struct cso_hash_iter iter);
-unsigned cso_hash_iter_key(struct cso_hash_iter iter);
-void *cso_hash_iter_data(struct cso_hash_iter iter);
-
-struct cso_hash_iter cso_hash_iter_next(struct cso_hash_iter iter);
-struct cso_hash_iter cso_hash_iter_prev(struct cso_hash_iter iter);
-
-/**
- * Convenience routine to iterate over the collision list while doing a memory
- * comparison to see which entry in the list is a direct copy of our template
- * and returns that entry.
- */
-void *cso_hash_find_data_from_template(struct cso_hash *hash, unsigned hash_key,
-                                       void *templ, int size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory.h
deleted file mode 100644
index b846b9721..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Vmware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * OS memory management abstractions
- */
-
-#ifndef _OS_MEMORY_H_
-#define _OS_MEMORY_H_
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_config.h"
-
-#if defined(PIPE_SUBSYSTEM_EMBEDDED)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *os_malloc(size_t size);
-
-void *os_calloc(size_t count, size_t size);
-
-void os_free(void *ptr);
-
-void *os_realloc(void *ptr, size_t old_size, size_t new_size);
-
-void *os_malloc_aligned(size_t size, size_t alignment);
-
-void os_free_aligned(void *ptr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#elif defined(PIPE_OS_WINDOWS) && defined(DEBUG) &&                            \
-    !defined(DEBUG_MEMORY_IMPLEMENTATION)
-
-#include "os_memory_debug.h"
-
-#else
-
-#include "os_memory_stdc.h"
-
-#endif
-
-#endif /* _OS_MEMORY_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_aligned.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_aligned.h
deleted file mode 100644
index 6ae610301..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_aligned.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008-2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * Memory alignment wrappers.
- */
-
-#ifndef _OS_MEMORY_H_
-#error "Must not be included directly. Include os_memory.h instead"
-#endif
-
-#include "pipe/p_compiler.h"
-
-/**
- * Return memory on given byte alignment
- */
-static inline void *os_malloc_aligned(size_t size, size_t alignment) {
-  char *ptr, *buf;
-
-  ptr = (char *)os_malloc(size + alignment + sizeof(void *));
-  if (!ptr)
-    return NULL;
-
-  buf = (char *)(((uintptr_t)ptr + sizeof(void *) + alignment - 1) &
-                 ~((uintptr_t)(alignment - 1)));
-  *(char **)(buf - sizeof(void *)) = ptr;
-
-  return buf;
-}
-
-/**
- * Free memory returned by align_malloc().
- */
-static inline void os_free_aligned(void *ptr) {
-  if (ptr) {
-    void **cubbyHole = (void **)((char *)ptr - sizeof(void *));
-    void *realAddr = *cubbyHole;
-    os_free(realAddr);
-  }
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_debug.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_debug.h
deleted file mode 100644
index b4b00d11d..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_debug.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008-2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * Debugging wrappers for OS memory management abstractions.
- */
-
-#ifndef _OS_MEMORY_H_
-#error "Must not be included directly. Include os_memory.h instead"
-#endif
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *debug_malloc(const char *file, unsigned line, const char *function,
-                   size_t size);
-
-void *debug_calloc(const char *file, unsigned line, const char *function,
-                   size_t count, size_t size);
-
-void debug_free(const char *file, unsigned line, const char *function,
-                void *ptr);
-
-void *debug_realloc(const char *file, unsigned line, const char *function,
-                    void *old_ptr, size_t old_size, size_t new_size);
-
-void debug_memory_tag(void *ptr, unsigned tag);
-
-void debug_memory_check_block(void *ptr);
-
-void debug_memory_check(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifndef DEBUG_MEMORY_IMPLEMENTATION
-
-#define os_malloc(_size) debug_malloc(__FILE__, __LINE__, __FUNCTION__, _size)
-#define os_calloc(_count, _size)                                               \
-  debug_calloc(__FILE__, __LINE__, __FUNCTION__, _count, _size)
-#define os_free(_ptr) debug_free(__FILE__, __LINE__, __FUNCTION__, _ptr)
-#define os_realloc(_ptr, _old_size, _new_size)                                 \
-  debug_realloc(__FILE__, __LINE__, __FUNCTION__, _ptr, _old_size, _new_size)
-
-/* TODO: wrap os_malloc_aligned() and os_free_aligned() too */
-#include "os_memory_aligned.h"
-
-#endif /* !DEBUG_MEMORY_IMPLEMENTATION */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_stdc.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_stdc.h
deleted file mode 100644
index 6a24f791a..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_memory_stdc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008-2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * OS memory management abstractions for the standard C library.
- */
-
-#ifndef _OS_MEMORY_H_
-#error "Must not be included directly. Include os_memory.h instead"
-#endif
-
-#include <stdlib.h>
-
-#include "pipe/p_compiler.h"
-
-#define os_malloc(_size) malloc(_size)
-#define os_calloc(_count, _size) calloc(_count, _size)
-#define os_free(_ptr) free(_ptr)
-
-#define os_realloc(_old_ptr, _old_size, _new_size)                             \
-  realloc(_old_ptr, _new_size + 0 * (_old_size))
-
-#if defined(HAVE_POSIX_MEMALIGN)
-
-static inline void *os_malloc_aligned(size_t size, size_t alignment) {
-  void *ptr;
-  alignment = (alignment + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
-  if (posix_memalign(&ptr, alignment, size) != 0)
-    return NULL;
-  return ptr;
-}
-
-#define os_free_aligned(_ptr) free(_ptr)
-
-#elif defined(PIPE_OS_WINDOWS)
-
-#include <malloc.h>
-
-#define os_malloc_aligned(_size, _align) _aligned_malloc(_size, _align)
-#define os_free_aligned(_ptr) _aligned_free(_ptr)
-
-#else
-
-#include "os_memory_aligned.h"
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_misc.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_misc.c
deleted file mode 100644
index 42f6887bd..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_misc.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008-2010 Vmware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "os_misc.h"
-
-#include <stdarg.h>
-
-#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#endif
-#include <stdio.h>
-#include <windows.h>
-
-#else
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#endif
-
-void os_log_message(const char *message) {
-  /* If the GALLIUM_LOG_FILE environment variable is set to a valid filename,
-   * write all messages to that file.
-   */
-  static FILE *fout = NULL;
-
-  if (!fout) {
-    /* one-time init */
-    const char *filename = os_get_option("GALLIUM_LOG_FILE");
-    if (filename)
-      fout = fopen(filename, "w");
-    if (!fout)
-      fout = stderr;
-  }
-
-#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-  OutputDebugStringA(message);
-  if (GetConsoleWindow() && !IsDebuggerPresent()) {
-    fflush(stdout);
-    fputs(message, fout);
-    fflush(fout);
-  } else if (fout != stderr) {
-    fputs(message, fout);
-    fflush(fout);
-  }
-#else /* !PIPE_SUBSYSTEM_WINDOWS */
-  fflush(stdout);
-  fputs(message, fout);
-  fflush(fout);
-#endif
-}
-
-const char *os_get_option(const char *name) { return getenv(name); }
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_misc.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_misc.h
deleted file mode 100644
index 86787c4e2..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_misc.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Vmware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * Miscellaneous OS services.
- */
-
-#ifndef _OS_MISC_H_
-#define _OS_MISC_H_
-
-#include "pipe/p_compiler.h"
-
-#if defined(PIPE_OS_UNIX)
-#include <signal.h> /* for kill() */
-#include <unistd.h> /* getpid() */
-#endif
-
-#ifdef __GNUC__
-#define UNUSED __attribute__((unused))
-#ifdef NDEBUG
-#define MAYBE_UNUSED __attribute__((unused))
-#else
-#define MAYBE_UNUSED
-#endif
-#else
-#define UNUSED
-#define MAYBE_UNUSED
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Trap into the debugger.
- */
-#if (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)) &&                   \
-    defined(PIPE_CC_GCC)
-#define os_break() __asm("int3")
-#elif defined(PIPE_CC_MSVC)
-#define os_break() __debugbreak()
-#elif defined(PIPE_OS_UNIX)
-#define os_break() kill(getpid(), SIGTRAP)
-#else
-#define os_break() abort()
-#endif
-
-/*
- * Abort the program.
- */
-#if defined(DEBUG)
-#define os_abort() os_break()
-#else
-#define os_abort() abort()
-#endif
-
-/*
- * Output a message. Message should preferably end in a newline.
- */
-void os_log_message(const char *message);
-
-/*
- * Get an option. Should return NULL if specified option is not set.
- */
-const char *os_get_option(const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _OS_MISC_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_mman.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_mman.h
deleted file mode 100644
index eee7202e6..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_mman.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2011 LunarG, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * OS independent memory mapping (with large file support).
- *
- * @author Chia-I Wu <olvaffe@gmail.com>
- */
-
-#ifndef _OS_MMAN_H_
-#define _OS_MMAN_H_
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_config.h"
-
-#if defined(PIPE_OS_UNIX)
-#ifndef _FILE_OFFSET_BITS
-#error _FILE_OFFSET_BITS must be defined to 64
-#endif
-#include <sys/mman.h>
-#else
-#error Unsupported OS
-#endif
-
-#if defined(PIPE_OS_ANDROID)
-#include <errno.h> /* for EINVAL */
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(PIPE_OS_ANDROID)
-
-extern void *__mmap2(void *, size_t, int, int, int, size_t);
-
-static inline void *os_mmap(void *addr, size_t length, int prot, int flags,
-                            int fd, loff_t offset) {
-  /* offset must be aligned to 4096 (not necessarily the page size) */
-  if (unlikely(offset & 4095)) {
-    errno = EINVAL;
-    return MAP_FAILED;
-  }
-
-  return __mmap2(addr, length, prot, flags, fd, (size_t)(offset >> 12));
-}
-
-#else
-/* assume large file support exists */
-#define os_mmap(addr, length, prot, flags, fd, offset)                         \
-  mmap(addr, length, prot, flags, fd, offset)
-#endif
-
-#define os_munmap(addr, length) munmap(addr, length)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _OS_MMAN_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_thread.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_thread.h
deleted file mode 100644
index 3f4f80668..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/os/os_thread.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/**************************************************************************
- *
- * Copyright 1999-2006 Brian Paul
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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.
- *
- **************************************************************************/
-
-/**
- * @file
- *
- * Thread, mutex, condition variable, barrier, semaphore and
- * thread-specific data functions.
- */
-
-#ifndef OS_THREAD_H_
-#define OS_THREAD_H_
-
-#include "pipe/p_compiler.h"
-#include "util/u_debug.h" /* for assert */
-
-#include "c11/threads.h"
-#include <signal.h>
-
-/* pipe_thread
- */
-typedef thrd_t pipe_thread;
-
-#define PIPE_THREAD_ROUTINE(name, param) int name(void *param)
-
-static inline pipe_thread pipe_thread_create(PIPE_THREAD_ROUTINE((*routine), ),
-                                             void *param) {
-  pipe_thread thread;
-  sigset_t saved_set, new_set;
-  int ret;
-
-  sigfillset(&new_set);
-  pthread_sigmask(SIG_SETMASK, &new_set, &saved_set);
-  ret = thrd_create(&thread, routine, param);
-  pthread_sigmask(SIG_SETMASK, &saved_set, NULL);
-
-  if (ret)
-    return 0;
-
-  return thread;
-}
-
-static inline int pipe_thread_wait(pipe_thread thread) {
-  return thrd_join(thread, NULL);
-}
-
-static inline int pipe_thread_destroy(pipe_thread thread) {
-  return thrd_detach(thread);
-}
-
-/* pipe_mutex
- */
-typedef mtx_t pipe_mutex;
-
-#define pipe_static_mutex(mutex) static pipe_mutex mutex = _MTX_INITIALIZER_NP
-
-#define pipe_mutex_init(mutex) (void)mtx_init(&(mutex), mtx_plain)
-
-#define pipe_mutex_destroy(mutex) mtx_destroy(&(mutex))
-
-#define pipe_mutex_lock(mutex) (void)mtx_lock(&(mutex))
-
-#define pipe_mutex_unlock(mutex) (void)mtx_unlock(&(mutex))
-
-/* pipe_condvar
- */
-typedef cnd_t pipe_condvar;
-
-#define pipe_condvar_init(cond) cnd_init(&(cond))
-
-#define pipe_condvar_destroy(cond) cnd_destroy(&(cond))
-
-#define pipe_condvar_wait(cond, mutex) cnd_wait(&(cond), &(mutex))
-
-#define pipe_condvar_signal(cond) cnd_signal(&(cond))
-
-#define pipe_condvar_broadcast(cond) cnd_broadcast(&(cond))
-
-/*
- * pipe_barrier
- */
-
-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) ||                         \
-     defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) &&                     \
-    !defined(PIPE_OS_ANDROID)
-
-typedef pthread_barrier_t pipe_barrier;
-
-static inline void pipe_barrier_init(pipe_barrier *barrier, unsigned count) {
-  pthread_barrier_init(barrier, NULL, count);
-}
-
-static inline void pipe_barrier_destroy(pipe_barrier *barrier) {
-  pthread_barrier_destroy(barrier);
-}
-
-static inline void pipe_barrier_wait(pipe_barrier *barrier) {
-  pthread_barrier_wait(barrier);
-}
-
-#else /* If the OS doesn't have its own, implement barriers using a mutex and  \
-         a condvar */
-
-typedef struct {
-  unsigned count;
-  unsigned waiters;
-  uint64_t sequence;
-  pipe_mutex mutex;
-  pipe_condvar condvar;
-} pipe_barrier;
-
-static inline void pipe_barrier_init(pipe_barrier *barrier, unsigned count) {
-  barrier->count = count;
-  barrier->waiters = 0;
-  barrier->sequence = 0;
-  pipe_mutex_init(barrier->mutex);
-  pipe_condvar_init(barrier->condvar);
-}
-
-static inline void pipe_barrier_destroy(pipe_barrier *barrier) {
-  assert(barrier->waiters == 0);
-  pipe_mutex_destroy(barrier->mutex);
-  pipe_condvar_destroy(barrier->condvar);
-}
-
-static inline void pipe_barrier_wait(pipe_barrier *barrier) {
-  pipe_mutex_lock(barrier->mutex);
-
-  assert(barrier->waiters < barrier->count);
-  barrier->waiters++;
-
-  if (barrier->waiters < barrier->count) {
-    uint64_t sequence = barrier->sequence;
-
-    do {
-      pipe_condvar_wait(barrier->condvar, barrier->mutex);
-    } while (sequence == barrier->sequence);
-  } else {
-    barrier->waiters = 0;
-    barrier->sequence++;
-    pipe_condvar_broadcast(barrier->condvar);
-  }
-
-  pipe_mutex_unlock(barrier->mutex);
-}
-
-#endif
-
-/*
- * Semaphores
- */
-
-typedef struct {
-  pipe_mutex mutex;
-  pipe_condvar cond;
-  int counter;
-} pipe_semaphore;
-
-static inline void pipe_semaphore_init(pipe_semaphore *sema, int init_val) {
-  pipe_mutex_init(sema->mutex);
-  pipe_condvar_init(sema->cond);
-  sema->counter = init_val;
-}
-
-static inline void pipe_semaphore_destroy(pipe_semaphore *sema) {
-  pipe_mutex_destroy(sema->mutex);
-  pipe_condvar_destroy(sema->cond);
-}
-
-/** Signal/increment semaphore counter */
-static inline void pipe_semaphore_signal(pipe_semaphore *sema) {
-  pipe_mutex_lock(sema->mutex);
-  sema->counter++;
-  pipe_condvar_signal(sema->cond);
-  pipe_mutex_unlock(sema->mutex);
-}
-
-/** Wait for semaphore counter to be greater than zero */
-static inline void pipe_semaphore_wait(pipe_semaphore *sema) {
-  pipe_mutex_lock(sema->mutex);
-  while (sema->counter <= 0) {
-    pipe_condvar_wait(sema->cond, sema->mutex);
-  }
-  sema->counter--;
-  pipe_mutex_unlock(sema->mutex);
-}
-
-/*
- * Thread-specific data.
- */
-
-typedef struct {
-  tss_t key;
-  int initMagic;
-} pipe_tsd;
-
-#define PIPE_TSD_INIT_MAGIC 0xff8adc98
-
-static inline void pipe_tsd_init(pipe_tsd *tsd) {
-  if (tss_create(&tsd->key, NULL /*free*/) != 0) {
-    exit(-1);
-  }
-  tsd->initMagic = PIPE_TSD_INIT_MAGIC;
-}
-
-static inline void *pipe_tsd_get(pipe_tsd *tsd) {
-  if (tsd->initMagic != (int)PIPE_TSD_INIT_MAGIC) {
-    pipe_tsd_init(tsd);
-  }
-  return tss_get(tsd->key);
-}
-
-static inline void pipe_tsd_set(pipe_tsd *tsd, void *value) {
-  if (tsd->initMagic != (int)PIPE_TSD_INIT_MAGIC) {
-    pipe_tsd_init(tsd);
-  }
-  if (tss_set(tsd->key, value) != 0) {
-    exit(-1);
-  }
-}
-
-#endif /* OS_THREAD_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_build.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_build.c
deleted file mode 100644
index 8bca2f763..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ /dev/null
@@ -1,1138 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_build.h"
-#include "pipe/p_format.h"
-#include "pipe/p_shader_tokens.h"
-#include "tgsi_parse.h"
-#include "util/u_debug.h"
-
-/*
- * header
- */
-
-struct tgsi_header tgsi_build_header(void) {
-  struct tgsi_header header;
-
-  header.HeaderSize = 1;
-  header.BodySize = 0;
-
-  return header;
-}
-
-static void header_headersize_grow(struct tgsi_header *header) {
-  assert(header->HeaderSize < 0xFF);
-  assert(header->BodySize == 0);
-
-  header->HeaderSize++;
-}
-
-static void header_bodysize_grow(struct tgsi_header *header) {
-  assert(header->BodySize < 0xFFFFFF);
-
-  header->BodySize++;
-}
-
-struct tgsi_processor tgsi_build_processor(unsigned type,
-                                           struct tgsi_header *header) {
-  struct tgsi_processor processor;
-
-  processor.Processor = type;
-  processor.Padding = 0;
-
-  header_headersize_grow(header);
-
-  return processor;
-}
-
-/*
- * declaration
- */
-
-static void declaration_grow(struct tgsi_declaration *declaration,
-                             struct tgsi_header *header) {
-  assert(declaration->NrTokens < 0xFF);
-
-  declaration->NrTokens++;
-
-  header_bodysize_grow(header);
-}
-
-static struct tgsi_declaration tgsi_default_declaration(void) {
-  struct tgsi_declaration declaration;
-
-  declaration.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  declaration.NrTokens = 1;
-  declaration.File = TGSI_FILE_NULL;
-  declaration.UsageMask = TGSI_WRITEMASK_XYZW;
-  declaration.Interpolate = 0;
-  declaration.Dimension = 0;
-  declaration.Semantic = 0;
-  declaration.Invariant = 0;
-  declaration.Local = 0;
-  declaration.Array = 0;
-  declaration.Atomic = 0;
-  declaration.MemType = TGSI_MEMORY_TYPE_GLOBAL;
-  declaration.Padding = 0;
-
-  return declaration;
-}
-
-static struct tgsi_declaration
-tgsi_build_declaration(unsigned file, unsigned usage_mask, unsigned interpolate,
-                       unsigned dimension, unsigned semantic,
-                       unsigned invariant, unsigned local, unsigned array,
-                       unsigned atomic, unsigned memtype,
-                       struct tgsi_header *header) {
-  struct tgsi_declaration declaration;
-
-  assert(file < TGSI_FILE_COUNT);
-  assert(interpolate < TGSI_INTERPOLATE_COUNT);
-
-  declaration = tgsi_default_declaration();
-  declaration.File = file;
-  declaration.UsageMask = usage_mask;
-  declaration.Interpolate = interpolate;
-  declaration.Dimension = dimension;
-  declaration.Semantic = semantic;
-  declaration.Invariant = invariant;
-  declaration.Local = local;
-  declaration.Array = array;
-  declaration.Atomic = atomic;
-  declaration.MemType = memtype;
-  header_bodysize_grow(header);
-
-  return declaration;
-}
-
-static struct tgsi_declaration_range tgsi_default_declaration_range(void) {
-  struct tgsi_declaration_range dr;
-
-  dr.First = 0;
-  dr.Last = 0;
-
-  return dr;
-}
-
-static struct tgsi_declaration_range
-tgsi_build_declaration_range(unsigned first, unsigned last,
-                             struct tgsi_declaration *declaration,
-                             struct tgsi_header *header) {
-  struct tgsi_declaration_range declaration_range;
-
-  assert(last >= first);
-  assert(last <= 0xFFFF);
-
-  declaration_range.First = first;
-  declaration_range.Last = last;
-
-  declaration_grow(declaration, header);
-
-  return declaration_range;
-}
-
-static struct tgsi_declaration_dimension
-tgsi_build_declaration_dimension(unsigned index_2d,
-                                 struct tgsi_declaration *declaration,
-                                 struct tgsi_header *header) {
-  struct tgsi_declaration_dimension dd;
-
-  assert(index_2d <= 0xFFFF);
-
-  dd.Index2D = index_2d;
-  dd.Padding = 0;
-
-  declaration_grow(declaration, header);
-
-  return dd;
-}
-
-static struct tgsi_declaration_interp tgsi_default_declaration_interp(void) {
-  struct tgsi_declaration_interp di;
-
-  di.Interpolate = TGSI_INTERPOLATE_CONSTANT;
-  di.Location = TGSI_INTERPOLATE_LOC_CENTER;
-  di.CylindricalWrap = 0;
-  di.Padding = 0;
-
-  return di;
-}
-
-static struct tgsi_declaration_interp tgsi_build_declaration_interp(
-    unsigned interpolate, unsigned interpolate_location,
-    unsigned cylindrical_wrap, struct tgsi_declaration *declaration,
-    struct tgsi_header *header) {
-  struct tgsi_declaration_interp di;
-
-  di.Interpolate = interpolate;
-  di.Location = interpolate_location;
-  di.CylindricalWrap = cylindrical_wrap;
-  di.Padding = 0;
-
-  declaration_grow(declaration, header);
-
-  return di;
-}
-
-static struct tgsi_declaration_semantic
-tgsi_default_declaration_semantic(void) {
-  struct tgsi_declaration_semantic ds;
-
-  ds.Name = TGSI_SEMANTIC_POSITION;
-  ds.Index = 0;
-  ds.StreamX = 0;
-  ds.StreamY = 0;
-  ds.StreamZ = 0;
-  ds.StreamW = 0;
-
-  return ds;
-}
-
-static struct tgsi_declaration_semantic tgsi_build_declaration_semantic(
-    unsigned semantic_name, unsigned semantic_index, unsigned streamx,
-    unsigned streamy, unsigned streamz, unsigned streamw,
-    struct tgsi_declaration *declaration, struct tgsi_header *header) {
-  struct tgsi_declaration_semantic ds;
-
-  assert(semantic_name <= TGSI_SEMANTIC_COUNT);
-  assert(semantic_index <= 0xFFFF);
-
-  ds.Name = semantic_name;
-  ds.Index = semantic_index;
-  ds.StreamX = streamx;
-  ds.StreamY = streamy;
-  ds.StreamZ = streamz;
-  ds.StreamW = streamw;
-
-  declaration_grow(declaration, header);
-
-  return ds;
-}
-
-static struct tgsi_declaration_image tgsi_default_declaration_image(void) {
-  struct tgsi_declaration_image di;
-
-  di.Resource = TGSI_TEXTURE_BUFFER;
-  di.Raw = 0;
-  di.Writable = 0;
-  di.Format = 0;
-  di.Padding = 0;
-
-  return di;
-}
-
-static struct tgsi_declaration_image tgsi_build_declaration_image(
-    unsigned texture, unsigned format, unsigned raw, unsigned writable,
-    struct tgsi_declaration *declaration, struct tgsi_header *header) {
-  struct tgsi_declaration_image di;
-
-  di = tgsi_default_declaration_image();
-  di.Resource = texture;
-  di.Format = format;
-  di.Raw = raw;
-  di.Writable = writable;
-
-  declaration_grow(declaration, header);
-
-  return di;
-}
-
-static struct tgsi_declaration_sampler_view
-tgsi_default_declaration_sampler_view(void) {
-  struct tgsi_declaration_sampler_view dsv;
-
-  dsv.Resource = TGSI_TEXTURE_BUFFER;
-  dsv.ReturnTypeX = TGSI_RETURN_TYPE_UNORM;
-  dsv.ReturnTypeY = TGSI_RETURN_TYPE_UNORM;
-  dsv.ReturnTypeZ = TGSI_RETURN_TYPE_UNORM;
-  dsv.ReturnTypeW = TGSI_RETURN_TYPE_UNORM;
-
-  return dsv;
-}
-
-static struct tgsi_declaration_sampler_view tgsi_build_declaration_sampler_view(
-    unsigned texture, unsigned return_type_x, unsigned return_type_y,
-    unsigned return_type_z, unsigned return_type_w,
-    struct tgsi_declaration *declaration, struct tgsi_header *header) {
-  struct tgsi_declaration_sampler_view dsv;
-
-  dsv = tgsi_default_declaration_sampler_view();
-  dsv.Resource = texture;
-  dsv.ReturnTypeX = return_type_x;
-  dsv.ReturnTypeY = return_type_y;
-  dsv.ReturnTypeZ = return_type_z;
-  dsv.ReturnTypeW = return_type_w;
-
-  declaration_grow(declaration, header);
-
-  return dsv;
-}
-
-static struct tgsi_declaration_array tgsi_default_declaration_array(void) {
-  struct tgsi_declaration_array a;
-
-  a.ArrayID = 0;
-  a.Padding = 0;
-
-  return a;
-}
-
-static struct tgsi_declaration_array
-tgsi_build_declaration_array(unsigned arrayid,
-                             struct tgsi_declaration *declaration,
-                             struct tgsi_header *header) {
-  struct tgsi_declaration_array da;
-
-  da = tgsi_default_declaration_array();
-  da.ArrayID = arrayid;
-
-  declaration_grow(declaration, header);
-
-  return da;
-}
-
-struct tgsi_full_declaration tgsi_default_full_declaration(void) {
-  struct tgsi_full_declaration full_declaration;
-
-  full_declaration.Declaration = tgsi_default_declaration();
-  full_declaration.Range = tgsi_default_declaration_range();
-  full_declaration.Semantic = tgsi_default_declaration_semantic();
-  full_declaration.Interp = tgsi_default_declaration_interp();
-  full_declaration.Image = tgsi_default_declaration_image();
-  full_declaration.SamplerView = tgsi_default_declaration_sampler_view();
-  full_declaration.Array = tgsi_default_declaration_array();
-
-  return full_declaration;
-}
-
-unsigned
-tgsi_build_full_declaration(const struct tgsi_full_declaration *full_decl,
-                            struct tgsi_token *tokens,
-                            struct tgsi_header *header, unsigned maxsize) {
-  unsigned size = 0;
-  struct tgsi_declaration *declaration;
-  struct tgsi_declaration_range *dr;
-
-  if (maxsize <= size)
-    return 0;
-  declaration = (struct tgsi_declaration *)&tokens[size];
-  size++;
-
-  *declaration = tgsi_build_declaration(
-      full_decl->Declaration.File, full_decl->Declaration.UsageMask,
-      full_decl->Declaration.Interpolate, full_decl->Declaration.Dimension,
-      full_decl->Declaration.Semantic, full_decl->Declaration.Invariant,
-      full_decl->Declaration.Local, full_decl->Declaration.Array,
-      full_decl->Declaration.Atomic, full_decl->Declaration.MemType, header);
-
-  if (maxsize <= size)
-    return 0;
-  dr = (struct tgsi_declaration_range *)&tokens[size];
-  size++;
-
-  *dr = tgsi_build_declaration_range(
-      full_decl->Range.First, full_decl->Range.Last, declaration, header);
-
-  if (full_decl->Declaration.Dimension) {
-    struct tgsi_declaration_dimension *dd;
-
-    if (maxsize <= size) {
-      return 0;
-    }
-    dd = (struct tgsi_declaration_dimension *)&tokens[size];
-    size++;
-
-    *dd = tgsi_build_declaration_dimension(full_decl->Dim.Index2D, declaration,
-                                           header);
-  }
-
-  if (full_decl->Declaration.Interpolate) {
-    struct tgsi_declaration_interp *di;
-
-    if (maxsize <= size) {
-      return 0;
-    }
-    di = (struct tgsi_declaration_interp *)&tokens[size];
-    size++;
-
-    *di = tgsi_build_declaration_interp(
-        full_decl->Interp.Interpolate, full_decl->Interp.Location,
-        full_decl->Interp.CylindricalWrap, declaration, header);
-  }
-
-  if (full_decl->Declaration.Semantic) {
-    struct tgsi_declaration_semantic *ds;
-
-    if (maxsize <= size)
-      return 0;
-    ds = (struct tgsi_declaration_semantic *)&tokens[size];
-    size++;
-
-    *ds = tgsi_build_declaration_semantic(
-        full_decl->Semantic.Name, full_decl->Semantic.Index,
-        full_decl->Semantic.StreamX, full_decl->Semantic.StreamY,
-        full_decl->Semantic.StreamZ, full_decl->Semantic.StreamW, declaration,
-        header);
-  }
-
-  if (full_decl->Declaration.File == TGSI_FILE_IMAGE) {
-    struct tgsi_declaration_image *di;
-
-    if (maxsize <= size) {
-      return 0;
-    }
-    di = (struct tgsi_declaration_image *)&tokens[size];
-    size++;
-
-    *di = tgsi_build_declaration_image(
-        full_decl->Image.Resource, full_decl->Image.Format,
-        full_decl->Image.Raw, full_decl->Image.Writable, declaration, header);
-  }
-
-  if (full_decl->Declaration.File == TGSI_FILE_SAMPLER_VIEW) {
-    struct tgsi_declaration_sampler_view *dsv;
-
-    if (maxsize <= size) {
-      return 0;
-    }
-    dsv = (struct tgsi_declaration_sampler_view *)&tokens[size];
-    size++;
-
-    *dsv = tgsi_build_declaration_sampler_view(
-        full_decl->SamplerView.Resource, full_decl->SamplerView.ReturnTypeX,
-        full_decl->SamplerView.ReturnTypeY, full_decl->SamplerView.ReturnTypeZ,
-        full_decl->SamplerView.ReturnTypeW, declaration, header);
-  }
-
-  if (full_decl->Declaration.Array) {
-    struct tgsi_declaration_array *da;
-
-    if (maxsize <= size) {
-      return 0;
-    }
-    da = (struct tgsi_declaration_array *)&tokens[size];
-    size++;
-    *da = tgsi_build_declaration_array(full_decl->Array.ArrayID, declaration,
-                                       header);
-  }
-  return size;
-}
-
-/*
- * immediate
- */
-
-static struct tgsi_immediate tgsi_default_immediate(void) {
-  struct tgsi_immediate immediate;
-
-  immediate.Type = TGSI_TOKEN_TYPE_IMMEDIATE;
-  immediate.NrTokens = 1;
-  immediate.DataType = TGSI_IMM_FLOAT32;
-  immediate.Padding = 0;
-
-  return immediate;
-}
-
-static struct tgsi_immediate tgsi_build_immediate(struct tgsi_header *header,
-                                                  unsigned type) {
-  struct tgsi_immediate immediate;
-
-  immediate = tgsi_default_immediate();
-  immediate.DataType = type;
-
-  header_bodysize_grow(header);
-
-  return immediate;
-}
-
-struct tgsi_full_immediate tgsi_default_full_immediate(void) {
-  struct tgsi_full_immediate fullimm;
-
-  fullimm.Immediate = tgsi_default_immediate();
-  fullimm.u[0].Float = 0.0f;
-  fullimm.u[1].Float = 0.0f;
-  fullimm.u[2].Float = 0.0f;
-  fullimm.u[3].Float = 0.0f;
-
-  return fullimm;
-}
-
-static void immediate_grow(struct tgsi_immediate *immediate,
-                           struct tgsi_header *header) {
-  assert(immediate->NrTokens < 0xFF);
-
-  immediate->NrTokens++;
-
-  header_bodysize_grow(header);
-}
-
-unsigned tgsi_build_full_immediate(const struct tgsi_full_immediate *full_imm,
-                                   struct tgsi_token *tokens,
-                                   struct tgsi_header *header,
-                                   unsigned maxsize) {
-  unsigned size = 0;
-  int i;
-  struct tgsi_immediate *immediate;
-
-  if (maxsize <= size)
-    return 0;
-  immediate = (struct tgsi_immediate *)&tokens[size];
-  size++;
-
-  *immediate = tgsi_build_immediate(header, full_imm->Immediate.DataType);
-
-  assert(full_imm->Immediate.NrTokens <= 4 + 1);
-
-  for (i = 0; i < full_imm->Immediate.NrTokens - 1; i++) {
-    union tgsi_immediate_data *data;
-
-    if (maxsize <= size)
-      return 0;
-
-    data = (union tgsi_immediate_data *)&tokens[size];
-    *data = full_imm->u[i];
-
-    immediate_grow(immediate, header);
-    size++;
-  }
-
-  return size;
-}
-
-/*
- * instruction
- */
-
-struct tgsi_instruction tgsi_default_instruction(void) {
-  struct tgsi_instruction instruction;
-
-  instruction.Type = TGSI_TOKEN_TYPE_INSTRUCTION;
-  instruction.NrTokens = 0;
-  instruction.Opcode = TGSI_OPCODE_MOV;
-  instruction.Saturate = 0;
-  instruction.NumDstRegs = 1;
-  instruction.NumSrcRegs = 1;
-  instruction.Label = 0;
-  instruction.Texture = 0;
-  instruction.Memory = 0;
-  instruction.Precise = 0;
-
-  return instruction;
-}
-
-static struct tgsi_instruction
-tgsi_build_instruction(unsigned opcode, unsigned saturate, unsigned precise,
-                       unsigned num_dst_regs, unsigned num_src_regs,
-                       struct tgsi_header *header) {
-  struct tgsi_instruction instruction;
-
-  assert(opcode <= TGSI_OPCODE_LAST);
-  assert(saturate <= 1);
-  assert(num_dst_regs <= 3);
-  assert(num_src_regs <= 15);
-
-  instruction = tgsi_default_instruction();
-  instruction.Opcode = opcode;
-  instruction.Saturate = saturate;
-  instruction.Precise = precise;
-  instruction.NumDstRegs = num_dst_regs;
-  instruction.NumSrcRegs = num_src_regs;
-
-  header_bodysize_grow(header);
-
-  return instruction;
-}
-
-static void instruction_grow(struct tgsi_instruction *instruction,
-                             struct tgsi_header *header) {
-  assert(instruction->NrTokens < 0xFF);
-
-  instruction->NrTokens++;
-
-  header_bodysize_grow(header);
-}
-
-static struct tgsi_instruction_label tgsi_default_instruction_label(void) {
-  struct tgsi_instruction_label instruction_label;
-
-  instruction_label.Label = 0;
-  instruction_label.Padding = 0;
-
-  return instruction_label;
-}
-
-static struct tgsi_instruction_label
-tgsi_build_instruction_label(unsigned label,
-                             struct tgsi_instruction *instruction,
-                             struct tgsi_header *header) {
-  struct tgsi_instruction_label instruction_label;
-
-  instruction_label.Label = label;
-  instruction_label.Padding = 0;
-  instruction->Label = 1;
-
-  instruction_grow(instruction, header);
-
-  return instruction_label;
-}
-
-static struct tgsi_instruction_texture tgsi_default_instruction_texture(void) {
-  struct tgsi_instruction_texture instruction_texture;
-
-  instruction_texture.Texture = TGSI_TEXTURE_UNKNOWN;
-  instruction_texture.NumOffsets = 0;
-  instruction_texture.Padding = 0;
-
-  return instruction_texture;
-}
-
-static struct tgsi_instruction_texture
-tgsi_build_instruction_texture(unsigned texture, unsigned num_offsets,
-                               struct tgsi_instruction *instruction,
-                               struct tgsi_header *header) {
-  struct tgsi_instruction_texture instruction_texture;
-
-  instruction_texture.Texture = texture;
-  instruction_texture.NumOffsets = num_offsets;
-  instruction_texture.Padding = 0;
-  instruction->Texture = 1;
-
-  instruction_grow(instruction, header);
-
-  return instruction_texture;
-}
-
-static struct tgsi_instruction_memory tgsi_default_instruction_memory(void) {
-  struct tgsi_instruction_memory instruction_memory;
-
-  instruction_memory.Qualifier = 0;
-  instruction_memory.Texture = 0;
-  instruction_memory.Format = 0;
-  instruction_memory.Padding = 0;
-
-  return instruction_memory;
-}
-
-static struct tgsi_instruction_memory tgsi_build_instruction_memory(
-    unsigned qualifier, unsigned texture, unsigned format,
-    struct tgsi_instruction *instruction, struct tgsi_header *header) {
-  struct tgsi_instruction_memory instruction_memory;
-
-  instruction_memory.Qualifier = qualifier;
-  instruction_memory.Texture = texture;
-  instruction_memory.Format = format;
-  instruction_memory.Padding = 0;
-  instruction->Memory = 1;
-
-  instruction_grow(instruction, header);
-
-  return instruction_memory;
-}
-
-static struct tgsi_texture_offset tgsi_default_texture_offset(void) {
-  struct tgsi_texture_offset texture_offset;
-
-  texture_offset.Index = 0;
-  texture_offset.File = 0;
-  texture_offset.SwizzleX = 0;
-  texture_offset.SwizzleY = 0;
-  texture_offset.SwizzleZ = 0;
-  texture_offset.Padding = 0;
-
-  return texture_offset;
-}
-
-static struct tgsi_texture_offset
-tgsi_build_texture_offset(int index, int file, int swizzle_x, int swizzle_y,
-                          int swizzle_z, struct tgsi_instruction *instruction,
-                          struct tgsi_header *header) {
-  struct tgsi_texture_offset texture_offset;
-
-  texture_offset.Index = index;
-  texture_offset.File = file;
-  texture_offset.SwizzleX = swizzle_x;
-  texture_offset.SwizzleY = swizzle_y;
-  texture_offset.SwizzleZ = swizzle_z;
-  texture_offset.Padding = 0;
-
-  instruction_grow(instruction, header);
-
-  return texture_offset;
-}
-
-static struct tgsi_src_register tgsi_default_src_register(void) {
-  struct tgsi_src_register src_register;
-
-  src_register.File = TGSI_FILE_NULL;
-  src_register.SwizzleX = TGSI_SWIZZLE_X;
-  src_register.SwizzleY = TGSI_SWIZZLE_Y;
-  src_register.SwizzleZ = TGSI_SWIZZLE_Z;
-  src_register.SwizzleW = TGSI_SWIZZLE_W;
-  src_register.Negate = 0;
-  src_register.Absolute = 0;
-  src_register.Indirect = 0;
-  src_register.Dimension = 0;
-  src_register.Index = 0;
-
-  return src_register;
-}
-
-static struct tgsi_src_register tgsi_build_src_register(
-    unsigned file, unsigned swizzle_x, unsigned swizzle_y, unsigned swizzle_z,
-    unsigned swizzle_w, unsigned negate, unsigned absolute, unsigned indirect,
-    unsigned dimension, int index, struct tgsi_instruction *instruction,
-    struct tgsi_header *header) {
-  struct tgsi_src_register src_register;
-
-  assert(file < TGSI_FILE_COUNT);
-  assert(swizzle_x <= TGSI_SWIZZLE_W);
-  assert(swizzle_y <= TGSI_SWIZZLE_W);
-  assert(swizzle_z <= TGSI_SWIZZLE_W);
-  assert(swizzle_w <= TGSI_SWIZZLE_W);
-  assert(negate <= 1);
-  assert(index >= -0x8000 && index <= 0x7FFF);
-
-  src_register.File = file;
-  src_register.SwizzleX = swizzle_x;
-  src_register.SwizzleY = swizzle_y;
-  src_register.SwizzleZ = swizzle_z;
-  src_register.SwizzleW = swizzle_w;
-  src_register.Negate = negate;
-  src_register.Absolute = absolute;
-  src_register.Indirect = indirect;
-  src_register.Dimension = dimension;
-  src_register.Index = index;
-
-  instruction_grow(instruction, header);
-
-  return src_register;
-}
-
-static struct tgsi_ind_register tgsi_default_ind_register(void) {
-  struct tgsi_ind_register ind_register;
-
-  ind_register.File = TGSI_FILE_NULL;
-  ind_register.Index = 0;
-  ind_register.Swizzle = TGSI_SWIZZLE_X;
-  ind_register.ArrayID = 0;
-
-  return ind_register;
-}
-
-static struct tgsi_ind_register
-tgsi_build_ind_register(unsigned file, unsigned swizzle, int index,
-                        unsigned arrayid, struct tgsi_instruction *instruction,
-                        struct tgsi_header *header) {
-  struct tgsi_ind_register ind_register;
-
-  assert(file < TGSI_FILE_COUNT);
-  assert(swizzle <= TGSI_SWIZZLE_W);
-  assert(index >= -0x8000 && index <= 0x7FFF);
-
-  ind_register.File = file;
-  ind_register.Swizzle = swizzle;
-  ind_register.Index = index;
-  ind_register.ArrayID = arrayid;
-
-  instruction_grow(instruction, header);
-
-  return ind_register;
-}
-
-static struct tgsi_dimension tgsi_default_dimension(void) {
-  struct tgsi_dimension dimension;
-
-  dimension.Indirect = 0;
-  dimension.Dimension = 0;
-  dimension.Padding = 0;
-  dimension.Index = 0;
-
-  return dimension;
-}
-
-static struct tgsi_full_src_register tgsi_default_full_src_register(void) {
-  struct tgsi_full_src_register full_src_register;
-
-  full_src_register.Register = tgsi_default_src_register();
-  full_src_register.Indirect = tgsi_default_ind_register();
-  full_src_register.Dimension = tgsi_default_dimension();
-  full_src_register.DimIndirect = tgsi_default_ind_register();
-
-  return full_src_register;
-}
-
-static struct tgsi_dimension
-tgsi_build_dimension(unsigned indirect, unsigned index,
-                     struct tgsi_instruction *instruction,
-                     struct tgsi_header *header) {
-  struct tgsi_dimension dimension;
-
-  dimension.Indirect = indirect;
-  dimension.Dimension = 0;
-  dimension.Padding = 0;
-  dimension.Index = index;
-
-  instruction_grow(instruction, header);
-
-  return dimension;
-}
-
-static struct tgsi_dst_register tgsi_default_dst_register(void) {
-  struct tgsi_dst_register dst_register;
-
-  dst_register.File = TGSI_FILE_NULL;
-  dst_register.WriteMask = TGSI_WRITEMASK_XYZW;
-  dst_register.Indirect = 0;
-  dst_register.Dimension = 0;
-  dst_register.Index = 0;
-  dst_register.Padding = 0;
-
-  return dst_register;
-}
-
-static struct tgsi_dst_register
-tgsi_build_dst_register(unsigned file, unsigned mask, unsigned indirect,
-                        unsigned dimension, int index,
-                        struct tgsi_instruction *instruction,
-                        struct tgsi_header *header) {
-  struct tgsi_dst_register dst_register;
-
-  assert(file < TGSI_FILE_COUNT);
-  assert(mask <= TGSI_WRITEMASK_XYZW);
-  assert(index >= -32768 && index <= 32767);
-
-  dst_register.File = file;
-  dst_register.WriteMask = mask;
-  dst_register.Indirect = indirect;
-  dst_register.Dimension = dimension;
-  dst_register.Index = index;
-  dst_register.Padding = 0;
-
-  instruction_grow(instruction, header);
-
-  return dst_register;
-}
-
-static struct tgsi_full_dst_register tgsi_default_full_dst_register(void) {
-  struct tgsi_full_dst_register full_dst_register;
-
-  full_dst_register.Register = tgsi_default_dst_register();
-  full_dst_register.Indirect = tgsi_default_ind_register();
-  full_dst_register.Dimension = tgsi_default_dimension();
-  full_dst_register.DimIndirect = tgsi_default_ind_register();
-
-  return full_dst_register;
-}
-
-struct tgsi_full_instruction tgsi_default_full_instruction(void) {
-  struct tgsi_full_instruction full_instruction;
-  unsigned i;
-
-  full_instruction.Instruction = tgsi_default_instruction();
-  full_instruction.Label = tgsi_default_instruction_label();
-  full_instruction.Texture = tgsi_default_instruction_texture();
-  full_instruction.Memory = tgsi_default_instruction_memory();
-  for (i = 0; i < TGSI_FULL_MAX_TEX_OFFSETS; i++) {
-    full_instruction.TexOffsets[i] = tgsi_default_texture_offset();
-  }
-  for (i = 0; i < TGSI_FULL_MAX_DST_REGISTERS; i++) {
-    full_instruction.Dst[i] = tgsi_default_full_dst_register();
-  }
-  for (i = 0; i < TGSI_FULL_MAX_SRC_REGISTERS; i++) {
-    full_instruction.Src[i] = tgsi_default_full_src_register();
-  }
-
-  return full_instruction;
-}
-
-unsigned
-tgsi_build_full_instruction(const struct tgsi_full_instruction *full_inst,
-                            struct tgsi_token *tokens,
-                            struct tgsi_header *header, unsigned maxsize) {
-  unsigned size = 0;
-  unsigned i;
-  struct tgsi_instruction *instruction;
-
-  if (maxsize <= size)
-    return 0;
-  instruction = (struct tgsi_instruction *)&tokens[size];
-  size++;
-
-  *instruction = tgsi_build_instruction(
-      full_inst->Instruction.Opcode, full_inst->Instruction.Saturate,
-      full_inst->Instruction.Precise, full_inst->Instruction.NumDstRegs,
-      full_inst->Instruction.NumSrcRegs, header);
-
-  if (full_inst->Instruction.Label) {
-    struct tgsi_instruction_label *instruction_label;
-
-    if (maxsize <= size)
-      return 0;
-    instruction_label = (struct tgsi_instruction_label *)&tokens[size];
-    size++;
-
-    *instruction_label = tgsi_build_instruction_label(full_inst->Label.Label,
-                                                      instruction, header);
-  }
-
-  if (full_inst->Instruction.Texture) {
-    struct tgsi_instruction_texture *instruction_texture;
-
-    if (maxsize <= size)
-      return 0;
-    instruction_texture = (struct tgsi_instruction_texture *)&tokens[size];
-    size++;
-
-    *instruction_texture = tgsi_build_instruction_texture(
-        full_inst->Texture.Texture, full_inst->Texture.NumOffsets, instruction,
-        header);
-
-    for (i = 0; i < full_inst->Texture.NumOffsets; i++) {
-      struct tgsi_texture_offset *texture_offset;
-
-      if (maxsize <= size)
-        return 0;
-      texture_offset = (struct tgsi_texture_offset *)&tokens[size];
-      size++;
-      *texture_offset = tgsi_build_texture_offset(
-          full_inst->TexOffsets[i].Index, full_inst->TexOffsets[i].File,
-          full_inst->TexOffsets[i].SwizzleX, full_inst->TexOffsets[i].SwizzleY,
-          full_inst->TexOffsets[i].SwizzleZ, instruction, header);
-    }
-  }
-
-  if (full_inst->Instruction.Memory) {
-    struct tgsi_instruction_memory *instruction_memory;
-
-    if (maxsize <= size)
-      return 0;
-    instruction_memory = (struct tgsi_instruction_memory *)&tokens[size];
-    size++;
-
-    *instruction_memory = tgsi_build_instruction_memory(
-        full_inst->Memory.Qualifier, full_inst->Memory.Texture,
-        full_inst->Memory.Format, instruction, header);
-  }
-
-  for (i = 0; i < full_inst->Instruction.NumDstRegs; i++) {
-    const struct tgsi_full_dst_register *reg = &full_inst->Dst[i];
-    struct tgsi_dst_register *dst_register;
-
-    if (maxsize <= size)
-      return 0;
-    dst_register = (struct tgsi_dst_register *)&tokens[size];
-    size++;
-
-    *dst_register = tgsi_build_dst_register(
-        reg->Register.File, reg->Register.WriteMask, reg->Register.Indirect,
-        reg->Register.Dimension, reg->Register.Index, instruction, header);
-
-    if (reg->Register.Indirect) {
-      struct tgsi_ind_register *ind;
-
-      if (maxsize <= size)
-        return 0;
-      ind = (struct tgsi_ind_register *)&tokens[size];
-      size++;
-
-      *ind = tgsi_build_ind_register(reg->Indirect.File, reg->Indirect.Swizzle,
-                                     reg->Indirect.Index, reg->Indirect.ArrayID,
-                                     instruction, header);
-    }
-
-    if (reg->Register.Dimension) {
-      struct tgsi_dimension *dim;
-
-      assert(!reg->Dimension.Dimension);
-
-      if (maxsize <= size)
-        return 0;
-      dim = (struct tgsi_dimension *)&tokens[size];
-      size++;
-
-      *dim = tgsi_build_dimension(reg->Dimension.Indirect, reg->Dimension.Index,
-                                  instruction, header);
-
-      if (reg->Dimension.Indirect) {
-        struct tgsi_ind_register *ind;
-
-        if (maxsize <= size)
-          return 0;
-        ind = (struct tgsi_ind_register *)&tokens[size];
-        size++;
-
-        *ind = tgsi_build_ind_register(
-            reg->DimIndirect.File, reg->DimIndirect.Swizzle,
-            reg->DimIndirect.Index, reg->DimIndirect.ArrayID, instruction,
-            header);
-      }
-    }
-  }
-
-  for (i = 0; i < full_inst->Instruction.NumSrcRegs; i++) {
-    const struct tgsi_full_src_register *reg = &full_inst->Src[i];
-    struct tgsi_src_register *src_register;
-
-    if (maxsize <= size)
-      return 0;
-    src_register = (struct tgsi_src_register *)&tokens[size];
-    size++;
-
-    *src_register = tgsi_build_src_register(
-        reg->Register.File, reg->Register.SwizzleX, reg->Register.SwizzleY,
-        reg->Register.SwizzleZ, reg->Register.SwizzleW, reg->Register.Negate,
-        reg->Register.Absolute, reg->Register.Indirect, reg->Register.Dimension,
-        reg->Register.Index, instruction, header);
-
-    if (reg->Register.Indirect) {
-      struct tgsi_ind_register *ind;
-
-      if (maxsize <= size)
-        return 0;
-      ind = (struct tgsi_ind_register *)&tokens[size];
-      size++;
-
-      *ind = tgsi_build_ind_register(reg->Indirect.File, reg->Indirect.Swizzle,
-                                     reg->Indirect.Index, reg->Indirect.ArrayID,
-                                     instruction, header);
-    }
-
-    if (reg->Register.Dimension) {
-      struct tgsi_dimension *dim;
-
-      assert(!reg->Dimension.Dimension);
-
-      if (maxsize <= size)
-        return 0;
-      dim = (struct tgsi_dimension *)&tokens[size];
-      size++;
-
-      *dim = tgsi_build_dimension(reg->Dimension.Indirect, reg->Dimension.Index,
-                                  instruction, header);
-
-      if (reg->Dimension.Indirect) {
-        struct tgsi_ind_register *ind;
-
-        if (maxsize <= size)
-          return 0;
-        ind = (struct tgsi_ind_register *)&tokens[size];
-        size++;
-
-        *ind = tgsi_build_ind_register(
-            reg->DimIndirect.File, reg->DimIndirect.Swizzle,
-            reg->DimIndirect.Index, reg->DimIndirect.ArrayID, instruction,
-            header);
-      }
-    }
-  }
-
-  return size;
-}
-
-static struct tgsi_property tgsi_default_property(void) {
-  struct tgsi_property property;
-
-  property.Type = TGSI_TOKEN_TYPE_PROPERTY;
-  property.NrTokens = 1;
-  property.PropertyName = TGSI_PROPERTY_GS_INPUT_PRIM;
-  property.Padding = 0;
-
-  return property;
-}
-
-static struct tgsi_property tgsi_build_property(unsigned property_name,
-                                                struct tgsi_header *header) {
-  struct tgsi_property property;
-
-  property = tgsi_default_property();
-  property.PropertyName = property_name;
-
-  header_bodysize_grow(header);
-
-  return property;
-}
-
-struct tgsi_full_property tgsi_default_full_property(void) {
-  struct tgsi_full_property full_property;
-
-  full_property.Property = tgsi_default_property();
-  memset(full_property.u, 0, sizeof(struct tgsi_property_data) * 8);
-
-  return full_property;
-}
-
-static void property_grow(struct tgsi_property *property,
-                          struct tgsi_header *header) {
-  assert(property->NrTokens < 0xFF);
-
-  property->NrTokens++;
-
-  header_bodysize_grow(header);
-}
-
-static struct tgsi_property_data
-tgsi_build_property_data(unsigned value, struct tgsi_property *property,
-                         struct tgsi_header *header) {
-  struct tgsi_property_data property_data;
-
-  property_data.Data = value;
-
-  property_grow(property, header);
-
-  return property_data;
-}
-
-unsigned tgsi_build_full_property(const struct tgsi_full_property *full_prop,
-                                  struct tgsi_token *tokens,
-                                  struct tgsi_header *header,
-                                  unsigned maxsize) {
-  unsigned size = 0;
-  int i;
-  struct tgsi_property *property;
-
-  if (maxsize <= size)
-    return 0;
-  property = (struct tgsi_property *)&tokens[size];
-  size++;
-
-  *property = tgsi_build_property(full_prop->Property.PropertyName, header);
-
-  assert(full_prop->Property.NrTokens <= 8 + 1);
-
-  for (i = 0; i < full_prop->Property.NrTokens - 1; i++) {
-    struct tgsi_property_data *data;
-
-    if (maxsize <= size)
-      return 0;
-    data = (struct tgsi_property_data *)&tokens[size];
-    size++;
-
-    *data = tgsi_build_property_data(full_prop->u[i].Data, property, header);
-  }
-
-  return size;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_build.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_build.h
deleted file mode 100644
index d5da64915..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_build.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_BUILD_H
-#define TGSI_BUILD_H
-
-struct tgsi_token;
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-/*
- * header
- */
-
-struct tgsi_header tgsi_build_header(void);
-
-struct tgsi_processor tgsi_build_processor(unsigned processor,
-                                           struct tgsi_header *header);
-
-/*
- * declaration
- */
-
-struct tgsi_full_declaration tgsi_default_full_declaration(void);
-
-unsigned
-tgsi_build_full_declaration(const struct tgsi_full_declaration *full_decl,
-                            struct tgsi_token *tokens,
-                            struct tgsi_header *header, unsigned maxsize);
-
-/*
- * immediate
- */
-
-struct tgsi_full_immediate tgsi_default_full_immediate(void);
-
-unsigned tgsi_build_full_immediate(const struct tgsi_full_immediate *full_imm,
-                                   struct tgsi_token *tokens,
-                                   struct tgsi_header *header,
-                                   unsigned maxsize);
-
-/*
- * properties
- */
-
-struct tgsi_full_property tgsi_default_full_property(void);
-
-unsigned tgsi_build_full_property(const struct tgsi_full_property *full_prop,
-                                  struct tgsi_token *tokens,
-                                  struct tgsi_header *header, unsigned maxsize);
-
-/*
- * instruction
- */
-
-struct tgsi_instruction tgsi_default_instruction(void);
-
-struct tgsi_full_instruction tgsi_default_full_instruction(void);
-
-unsigned
-tgsi_build_full_instruction(const struct tgsi_full_instruction *full_inst,
-                            struct tgsi_token *tokens,
-                            struct tgsi_header *header, unsigned maxsize);
-
-struct tgsi_instruction_predicate tgsi_default_instruction_predicate(void);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_BUILD_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_dump.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_dump.c
deleted file mode 100644
index e62fc64af..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_dump.h"
-#include "tgsi_info.h"
-#include "tgsi_iterate.h"
-#include "tgsi_strings.h"
-#include "util/u_debug.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-#include "util/u_string.h"
-
-/** Number of spaces to indent for IF/LOOP/etc */
-static const int indent_spaces = 3;
-
-struct dump_ctx {
-  struct tgsi_iterate_context iter;
-
-  boolean dump_float_as_hex;
-
-  uint instno;
-  uint immno;
-  int indent;
-
-  uint indentation;
-  FILE *file;
-
-  void (*dump_printf)(struct dump_ctx *ctx, const char *format, ...);
-};
-
-static void dump_ctx_printf(struct dump_ctx *ctx, const char *format, ...) {
-  va_list ap;
-  (void)ctx;
-  va_start(ap, format);
-  if (ctx->file)
-    vfprintf(ctx->file, format, ap);
-  else
-    _debug_vprintf(format, ap);
-  va_end(ap);
-}
-
-static void dump_enum(struct dump_ctx *ctx, uint e, const char **enums,
-                      uint enum_count) {
-  if (e >= enum_count)
-    ctx->dump_printf(ctx, "%u", e);
-  else
-    ctx->dump_printf(ctx, "%s", enums[e]);
-}
-
-#define EOL() ctx->dump_printf(ctx, "\n")
-#define TXT(S) ctx->dump_printf(ctx, "%s", S)
-#define CHR(C) ctx->dump_printf(ctx, "%c", C)
-#define UIX(I) ctx->dump_printf(ctx, "0x%x", I)
-#define UID(I) ctx->dump_printf(ctx, "%u", I)
-#define INSTID(I) ctx->dump_printf(ctx, "% 3u", I)
-#define SID(I) ctx->dump_printf(ctx, "%d", I)
-#define FLT(F) ctx->dump_printf(ctx, "%10.4f", F)
-#define DBL(D) ctx->dump_printf(ctx, "%10.8f", D)
-#define HFLT(F) ctx->dump_printf(ctx, "0x%08x", fui((F)))
-#define ENM(E, ENUMS) dump_enum(ctx, E, ENUMS, sizeof(ENUMS) / sizeof(*ENUMS))
-
-const char *tgsi_swizzle_names[4] = {"x", "y", "z", "w"};
-
-static void _dump_register_src(struct dump_ctx *ctx,
-                               const struct tgsi_full_src_register *src) {
-  TXT(tgsi_file_name(src->Register.File));
-  if (src->Register.Dimension) {
-    if (src->Dimension.Indirect) {
-      CHR('[');
-      TXT(tgsi_file_name(src->DimIndirect.File));
-      CHR('[');
-      SID(src->DimIndirect.Index);
-      TXT("].");
-      ENM(src->DimIndirect.Swizzle, tgsi_swizzle_names);
-      if (src->Dimension.Index != 0) {
-        if (src->Dimension.Index > 0)
-          CHR('+');
-        SID(src->Dimension.Index);
-      }
-      CHR(']');
-      if (src->DimIndirect.ArrayID) {
-        CHR('(');
-        SID(src->DimIndirect.ArrayID);
-        CHR(')');
-      }
-    } else {
-      CHR('[');
-      SID(src->Dimension.Index);
-      CHR(']');
-    }
-  }
-  if (src->Register.Indirect) {
-    CHR('[');
-    TXT(tgsi_file_name(src->Indirect.File));
-    CHR('[');
-    SID(src->Indirect.Index);
-    TXT("].");
-    ENM(src->Indirect.Swizzle, tgsi_swizzle_names);
-    if (src->Register.Index != 0) {
-      if (src->Register.Index > 0)
-        CHR('+');
-      SID(src->Register.Index);
-    }
-    CHR(']');
-    if (src->Indirect.ArrayID) {
-      CHR('(');
-      SID(src->Indirect.ArrayID);
-      CHR(')');
-    }
-  } else {
-    CHR('[');
-    SID(src->Register.Index);
-    CHR(']');
-  }
-}
-
-static void _dump_register_dst(struct dump_ctx *ctx,
-                               const struct tgsi_full_dst_register *dst) {
-  TXT(tgsi_file_name(dst->Register.File));
-  if (dst->Register.Dimension) {
-    if (dst->Dimension.Indirect) {
-      CHR('[');
-      TXT(tgsi_file_name(dst->DimIndirect.File));
-      CHR('[');
-      SID(dst->DimIndirect.Index);
-      TXT("].");
-      ENM(dst->DimIndirect.Swizzle, tgsi_swizzle_names);
-      if (dst->Dimension.Index != 0) {
-        if (dst->Dimension.Index > 0)
-          CHR('+');
-        SID(dst->Dimension.Index);
-      }
-      CHR(']');
-      if (dst->DimIndirect.ArrayID) {
-        CHR('(');
-        SID(dst->DimIndirect.ArrayID);
-        CHR(')');
-      }
-    } else {
-      CHR('[');
-      SID(dst->Dimension.Index);
-      CHR(']');
-    }
-  }
-  if (dst->Register.Indirect) {
-    CHR('[');
-    TXT(tgsi_file_name(dst->Indirect.File));
-    CHR('[');
-    SID(dst->Indirect.Index);
-    TXT("].");
-    ENM(dst->Indirect.Swizzle, tgsi_swizzle_names);
-    if (dst->Register.Index != 0) {
-      if (dst->Register.Index > 0)
-        CHR('+');
-      SID(dst->Register.Index);
-    }
-    CHR(']');
-    if (dst->Indirect.ArrayID) {
-      CHR('(');
-      SID(dst->Indirect.ArrayID);
-      CHR(')');
-    }
-  } else {
-    CHR('[');
-    SID(dst->Register.Index);
-    CHR(']');
-  }
-}
-static void _dump_writemask(struct dump_ctx *ctx, uint writemask) {
-  if (writemask != TGSI_WRITEMASK_XYZW) {
-    CHR('.');
-    if (writemask & TGSI_WRITEMASK_X)
-      CHR('x');
-    if (writemask & TGSI_WRITEMASK_Y)
-      CHR('y');
-    if (writemask & TGSI_WRITEMASK_Z)
-      CHR('z');
-    if (writemask & TGSI_WRITEMASK_W)
-      CHR('w');
-  }
-}
-
-static void dump_imm_data(struct tgsi_iterate_context *iter,
-                          union tgsi_immediate_data *data, unsigned num_tokens,
-                          unsigned data_type) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  unsigned i;
-
-  TXT(" {");
-
-  assert(num_tokens <= 4);
-  for (i = 0; i < num_tokens; i++) {
-    switch (data_type) {
-    case TGSI_IMM_FLOAT64: {
-      union di d;
-      d.ui = data[i].Uint | (uint64_t)data[i + 1].Uint << 32;
-      DBL(d.d);
-      i++;
-      break;
-    }
-    case TGSI_IMM_FLOAT32:
-      if (ctx->dump_float_as_hex)
-        HFLT(data[i].Float);
-      else
-        FLT(data[i].Float);
-      break;
-    case TGSI_IMM_UINT32:
-      UID(data[i].Uint);
-      break;
-    case TGSI_IMM_INT32:
-      SID(data[i].Int);
-      break;
-    default:
-      assert(0);
-    }
-
-    if (i < num_tokens - 1)
-      TXT(", ");
-  }
-  TXT("}");
-}
-
-static boolean iter_declaration(struct tgsi_iterate_context *iter,
-                                struct tgsi_full_declaration *decl) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  boolean patch = decl->Semantic.Name == TGSI_SEMANTIC_PATCH ||
-                  decl->Semantic.Name == TGSI_SEMANTIC_TESSINNER ||
-                  decl->Semantic.Name == TGSI_SEMANTIC_TESSOUTER ||
-                  decl->Semantic.Name == TGSI_SEMANTIC_PRIMID;
-
-  TXT("DCL ");
-
-  TXT(tgsi_file_name(decl->Declaration.File));
-
-  /* all geometry shader inputs and non-patch tessellation shader inputs are
-   * two dimensional
-   */
-  if (decl->Declaration.File == TGSI_FILE_INPUT &&
-      (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
-       (!patch && (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-                   iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL)))) {
-    TXT("[]");
-  }
-
-  /* all non-patch tess ctrl shader outputs are two dimensional */
-  if (decl->Declaration.File == TGSI_FILE_OUTPUT && !patch &&
-      iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL) {
-    TXT("[]");
-  }
-
-  if (decl->Declaration.Dimension) {
-    CHR('[');
-    SID(decl->Dim.Index2D);
-    CHR(']');
-  }
-
-  CHR('[');
-  SID(decl->Range.First);
-  if (decl->Range.First != decl->Range.Last) {
-    TXT("..");
-    SID(decl->Range.Last);
-  }
-  CHR(']');
-
-  _dump_writemask(ctx, decl->Declaration.UsageMask);
-
-  if (decl->Declaration.Array) {
-    TXT(", ARRAY(");
-    SID(decl->Array.ArrayID);
-    CHR(')');
-  }
-
-  if (decl->Declaration.Local)
-    TXT(", LOCAL");
-
-  if (decl->Declaration.Semantic) {
-    TXT(", ");
-    ENM(decl->Semantic.Name, tgsi_semantic_names);
-    if (decl->Semantic.Index != 0 ||
-        decl->Semantic.Name == TGSI_SEMANTIC_TEXCOORD ||
-        decl->Semantic.Name == TGSI_SEMANTIC_GENERIC) {
-      CHR('[');
-      UID(decl->Semantic.Index);
-      CHR(']');
-    }
-  }
-
-  if (decl->Declaration.File == TGSI_FILE_IMAGE) {
-    TXT(", ");
-    ENM(decl->Image.Resource, tgsi_texture_names);
-    TXT(", ");
-    TXT(util_format_name(decl->Image.Format));
-    if (decl->Image.Writable)
-      TXT(", WR");
-    if (decl->Image.Raw)
-      TXT(", RAW");
-  }
-
-  if (decl->Declaration.File == TGSI_FILE_BUFFER) {
-    if (decl->Declaration.Atomic)
-      TXT(", ATOMIC");
-  }
-
-  if (decl->Declaration.File == TGSI_FILE_MEMORY) {
-    switch (decl->Declaration.MemType) {
-    /* Note: ,GLOBAL is optional / the default */
-    case TGSI_MEMORY_TYPE_GLOBAL:
-      TXT(", GLOBAL");
-      break;
-    case TGSI_MEMORY_TYPE_SHARED:
-      TXT(", SHARED");
-      break;
-    case TGSI_MEMORY_TYPE_PRIVATE:
-      TXT(", PRIVATE");
-      break;
-    case TGSI_MEMORY_TYPE_INPUT:
-      TXT(", INPUT");
-      break;
-    }
-  }
-
-  if (decl->Declaration.File == TGSI_FILE_SAMPLER_VIEW) {
-    TXT(", ");
-    ENM(decl->SamplerView.Resource, tgsi_texture_names);
-    TXT(", ");
-    if ((decl->SamplerView.ReturnTypeX == decl->SamplerView.ReturnTypeY) &&
-        (decl->SamplerView.ReturnTypeX == decl->SamplerView.ReturnTypeZ) &&
-        (decl->SamplerView.ReturnTypeX == decl->SamplerView.ReturnTypeW)) {
-      ENM(decl->SamplerView.ReturnTypeX, tgsi_return_type_names);
-    } else {
-      ENM(decl->SamplerView.ReturnTypeX, tgsi_return_type_names);
-      TXT(", ");
-      ENM(decl->SamplerView.ReturnTypeY, tgsi_return_type_names);
-      TXT(", ");
-      ENM(decl->SamplerView.ReturnTypeZ, tgsi_return_type_names);
-      TXT(", ");
-      ENM(decl->SamplerView.ReturnTypeW, tgsi_return_type_names);
-    }
-  }
-
-  if (decl->Declaration.Interpolate) {
-    if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT &&
-        decl->Declaration.File == TGSI_FILE_INPUT) {
-      TXT(", ");
-      ENM(decl->Interp.Interpolate, tgsi_interpolate_names);
-    }
-
-    if (decl->Interp.Location != TGSI_INTERPOLATE_LOC_CENTER) {
-      TXT(", ");
-      ENM(decl->Interp.Location, tgsi_interpolate_locations);
-    }
-
-    if (decl->Interp.CylindricalWrap) {
-      TXT(", CYLWRAP_");
-      if (decl->Interp.CylindricalWrap & TGSI_CYLINDRICAL_WRAP_X) {
-        CHR('X');
-      }
-      if (decl->Interp.CylindricalWrap & TGSI_CYLINDRICAL_WRAP_Y) {
-        CHR('Y');
-      }
-      if (decl->Interp.CylindricalWrap & TGSI_CYLINDRICAL_WRAP_Z) {
-        CHR('Z');
-      }
-      if (decl->Interp.CylindricalWrap & TGSI_CYLINDRICAL_WRAP_W) {
-        CHR('W');
-      }
-    }
-  }
-
-  if (decl->Declaration.Invariant) {
-    TXT(", INVARIANT");
-  }
-
-  EOL();
-
-  return TRUE;
-}
-
-void tgsi_dump_declaration(const struct tgsi_full_declaration *decl) {
-  struct dump_ctx ctx;
-
-  ctx.dump_printf = dump_ctx_printf;
-
-  iter_declaration(&ctx.iter, (struct tgsi_full_declaration *)decl);
-}
-
-static boolean iter_property(struct tgsi_iterate_context *iter,
-                             struct tgsi_full_property *prop) {
-  int i;
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-
-  TXT("PROPERTY ");
-  ENM(prop->Property.PropertyName, tgsi_property_names);
-
-  if (prop->Property.NrTokens > 1)
-    TXT(" ");
-
-  for (i = 0; i < prop->Property.NrTokens - 1; ++i) {
-    switch (prop->Property.PropertyName) {
-    case TGSI_PROPERTY_GS_INPUT_PRIM:
-    case TGSI_PROPERTY_GS_OUTPUT_PRIM:
-      ENM(prop->u[i].Data, tgsi_primitive_names);
-      break;
-    case TGSI_PROPERTY_FS_COORD_ORIGIN:
-      ENM(prop->u[i].Data, tgsi_fs_coord_origin_names);
-      break;
-    case TGSI_PROPERTY_FS_COORD_PIXEL_CENTER:
-      ENM(prop->u[i].Data, tgsi_fs_coord_pixel_center_names);
-      break;
-    default:
-      SID(prop->u[i].Data);
-      break;
-    }
-    if (i < prop->Property.NrTokens - 2)
-      TXT(", ");
-  }
-  EOL();
-
-  return TRUE;
-}
-
-void tgsi_dump_property(const struct tgsi_full_property *prop) {
-  struct dump_ctx ctx;
-
-  ctx.dump_printf = dump_ctx_printf;
-
-  iter_property(&ctx.iter, (struct tgsi_full_property *)prop);
-}
-
-static boolean iter_immediate(struct tgsi_iterate_context *iter,
-                              struct tgsi_full_immediate *imm) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-
-  TXT("IMM[");
-  SID(ctx->immno++);
-  TXT("] ");
-  ENM(imm->Immediate.DataType, tgsi_immediate_type_names);
-
-  dump_imm_data(iter, imm->u, imm->Immediate.NrTokens - 1,
-                imm->Immediate.DataType);
-
-  EOL();
-
-  return TRUE;
-}
-
-void tgsi_dump_immediate(const struct tgsi_full_immediate *imm) {
-  struct dump_ctx ctx;
-
-  ctx.dump_printf = dump_ctx_printf;
-
-  iter_immediate(&ctx.iter, (struct tgsi_full_immediate *)imm);
-}
-
-static boolean iter_instruction(struct tgsi_iterate_context *iter,
-                                struct tgsi_full_instruction *inst) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  uint instno = ctx->instno++;
-  const struct tgsi_opcode_info *info =
-      tgsi_get_opcode_info(inst->Instruction.Opcode);
-  uint i;
-  boolean first_reg = TRUE;
-
-  INSTID(instno);
-  TXT(": ");
-
-  ctx->indent -= info->pre_dedent;
-  for (i = 0; (int)i < ctx->indent; ++i)
-    TXT("  ");
-  ctx->indent += info->post_indent;
-
-  TXT(info->mnemonic);
-
-  if (inst->Instruction.Saturate) {
-    TXT("_SAT");
-  }
-
-  for (i = 0; i < inst->Instruction.NumDstRegs; i++) {
-    const struct tgsi_full_dst_register *dst = &inst->Dst[i];
-
-    if (!first_reg)
-      CHR(',');
-    CHR(' ');
-
-    _dump_register_dst(ctx, dst);
-    _dump_writemask(ctx, dst->Register.WriteMask);
-
-    first_reg = FALSE;
-  }
-
-  for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
-    const struct tgsi_full_src_register *src = &inst->Src[i];
-
-    if (!first_reg)
-      CHR(',');
-    CHR(' ');
-
-    if (src->Register.Negate)
-      CHR('-');
-    if (src->Register.Absolute)
-      CHR('|');
-
-    _dump_register_src(ctx, src);
-
-    if (src->Register.SwizzleX != TGSI_SWIZZLE_X ||
-        src->Register.SwizzleY != TGSI_SWIZZLE_Y ||
-        src->Register.SwizzleZ != TGSI_SWIZZLE_Z ||
-        src->Register.SwizzleW != TGSI_SWIZZLE_W) {
-      CHR('.');
-      ENM(src->Register.SwizzleX, tgsi_swizzle_names);
-      ENM(src->Register.SwizzleY, tgsi_swizzle_names);
-      ENM(src->Register.SwizzleZ, tgsi_swizzle_names);
-      ENM(src->Register.SwizzleW, tgsi_swizzle_names);
-    }
-
-    if (src->Register.Absolute)
-      CHR('|');
-
-    first_reg = FALSE;
-  }
-
-  if (inst->Instruction.Texture) {
-    if (!(inst->Instruction.Opcode >= TGSI_OPCODE_SAMPLE &&
-          inst->Instruction.Opcode <= TGSI_OPCODE_GATHER4)) {
-      TXT(", ");
-      ENM(inst->Texture.Texture, tgsi_texture_names);
-    }
-    for (i = 0; i < inst->Texture.NumOffsets; i++) {
-      TXT(", ");
-      TXT(tgsi_file_name(inst->TexOffsets[i].File));
-      CHR('[');
-      SID(inst->TexOffsets[i].Index);
-      CHR(']');
-      CHR('.');
-      ENM(inst->TexOffsets[i].SwizzleX, tgsi_swizzle_names);
-      ENM(inst->TexOffsets[i].SwizzleY, tgsi_swizzle_names);
-      ENM(inst->TexOffsets[i].SwizzleZ, tgsi_swizzle_names);
-    }
-  }
-
-  if (inst->Instruction.Memory) {
-    uint32_t qualifier = inst->Memory.Qualifier;
-    while (qualifier) {
-      int bit = ffs(qualifier) - 1;
-      qualifier &= ~(1U << bit);
-      TXT(", ");
-      ENM(bit, tgsi_memory_names);
-    }
-    if (inst->Memory.Texture) {
-      TXT(", ");
-      ENM(inst->Memory.Texture, tgsi_texture_names);
-    }
-    if (inst->Memory.Format) {
-      TXT(", ");
-      TXT(util_format_name(inst->Memory.Format));
-    }
-  }
-
-  if (inst->Instruction.Label) {
-    switch (inst->Instruction.Opcode) {
-    case TGSI_OPCODE_IF:
-    case TGSI_OPCODE_UIF:
-    case TGSI_OPCODE_ELSE:
-    case TGSI_OPCODE_BGNLOOP:
-    case TGSI_OPCODE_ENDLOOP:
-    case TGSI_OPCODE_CAL:
-    case TGSI_OPCODE_BGNSUB:
-      TXT(" :");
-      UID(inst->Label.Label);
-      break;
-    }
-  }
-
-  /* update indentation */
-  if (inst->Instruction.Opcode == TGSI_OPCODE_IF ||
-      inst->Instruction.Opcode == TGSI_OPCODE_UIF ||
-      inst->Instruction.Opcode == TGSI_OPCODE_ELSE ||
-      inst->Instruction.Opcode == TGSI_OPCODE_BGNLOOP) {
-    ctx->indentation += indent_spaces;
-  }
-
-  EOL();
-
-  return TRUE;
-}
-
-void tgsi_dump_instruction(const struct tgsi_full_instruction *inst,
-                           uint instno) {
-  struct dump_ctx ctx;
-
-  ctx.instno = instno;
-  ctx.immno = instno;
-  ctx.indent = 0;
-  ctx.dump_printf = dump_ctx_printf;
-  ctx.indentation = 0;
-  ctx.file = NULL;
-
-  iter_instruction(&ctx.iter, (struct tgsi_full_instruction *)inst);
-}
-
-static boolean prolog(struct tgsi_iterate_context *iter) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  ENM(iter->processor.Processor, tgsi_processor_type_names);
-  EOL();
-  return TRUE;
-}
-
-void tgsi_dump_to_file(const struct tgsi_token *tokens, uint flags,
-                       FILE *file) {
-  struct dump_ctx ctx;
-
-  ctx.iter.prolog = prolog;
-  ctx.iter.iterate_instruction = iter_instruction;
-  ctx.iter.iterate_declaration = iter_declaration;
-  ctx.iter.iterate_immediate = iter_immediate;
-  ctx.iter.iterate_property = iter_property;
-  ctx.iter.epilog = NULL;
-
-  ctx.instno = 0;
-  ctx.immno = 0;
-  ctx.indent = 0;
-  ctx.dump_printf = dump_ctx_printf;
-  ctx.indentation = 0;
-  ctx.file = file;
-
-  if (flags & TGSI_DUMP_FLOAT_AS_HEX)
-    ctx.dump_float_as_hex = TRUE;
-  else
-    ctx.dump_float_as_hex = FALSE;
-
-  tgsi_iterate_shader(tokens, &ctx.iter);
-}
-
-void tgsi_dump(const struct tgsi_token *tokens, uint flags) {
-  tgsi_dump_to_file(tokens, flags, NULL);
-}
-
-struct str_dump_ctx {
-  struct dump_ctx base;
-  char *str;
-  char *ptr;
-  int left;
-  bool nospace;
-};
-
-static void str_dump_ctx_printf(struct dump_ctx *ctx, const char *format, ...) {
-  struct str_dump_ctx *sctx = (struct str_dump_ctx *)ctx;
-
-  if (sctx->left > 1) {
-    int written;
-    va_list ap;
-    va_start(ap, format);
-    written = util_vsnprintf(sctx->ptr, sctx->left, format, ap);
-    va_end(ap);
-
-    /* Some complicated logic needed to handle the return value of
-     * vsnprintf:
-     */
-    if (written > 0) {
-      written = MIN2(sctx->left, written);
-      sctx->ptr += written;
-      sctx->left -= written;
-    }
-  } else
-    sctx->nospace = true;
-}
-
-bool tgsi_dump_str(const struct tgsi_token *tokens, uint flags, char *str,
-                   size_t size) {
-  struct str_dump_ctx ctx;
-
-  ctx.base.iter.prolog = prolog;
-  ctx.base.iter.iterate_instruction = iter_instruction;
-  ctx.base.iter.iterate_declaration = iter_declaration;
-  ctx.base.iter.iterate_immediate = iter_immediate;
-  ctx.base.iter.iterate_property = iter_property;
-  ctx.base.iter.epilog = NULL;
-
-  ctx.base.instno = 0;
-  ctx.base.immno = 0;
-  ctx.base.indent = 0;
-  ctx.base.dump_printf = &str_dump_ctx_printf;
-  ctx.base.indentation = 0;
-  ctx.base.file = NULL;
-
-  ctx.str = str;
-  ctx.str[0] = 0;
-  ctx.ptr = str;
-  ctx.left = (int)size;
-  ctx.nospace = false;
-
-  if (flags & TGSI_DUMP_FLOAT_AS_HEX)
-    ctx.base.dump_float_as_hex = TRUE;
-  else
-    ctx.base.dump_float_as_hex = FALSE;
-
-  tgsi_iterate_shader(tokens, &ctx.base.iter);
-
-  return !ctx.nospace;
-}
-
-void tgsi_dump_instruction_str(const struct tgsi_full_instruction *inst,
-                               uint instno, char *str, size_t size) {
-  struct str_dump_ctx ctx;
-
-  ctx.base.instno = instno;
-  ctx.base.immno = instno;
-  ctx.base.indent = 0;
-  ctx.base.dump_printf = &str_dump_ctx_printf;
-  ctx.base.indentation = 0;
-  ctx.base.file = NULL;
-
-  ctx.str = str;
-  ctx.str[0] = 0;
-  ctx.ptr = str;
-  ctx.left = (int)size;
-  ctx.nospace = false;
-
-  iter_instruction(&ctx.base.iter, (struct tgsi_full_instruction *)inst);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_dump.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_dump.h
deleted file mode 100644
index 9e8d57b0c..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_dump.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_DUMP_H
-#define TGSI_DUMP_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_shader_tokens.h"
-
-#include <stdio.h>
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-#define TGSI_DUMP_FLOAT_AS_HEX (1 << 0)
-
-bool tgsi_dump_str(const struct tgsi_token *tokens, uint flags, char *str,
-                   size_t size);
-
-void tgsi_dump_to_file(const struct tgsi_token *tokens, uint flags, FILE *file);
-
-void tgsi_dump(const struct tgsi_token *tokens, uint flags);
-
-struct tgsi_full_immediate;
-struct tgsi_full_instruction;
-struct tgsi_full_declaration;
-struct tgsi_full_property;
-
-void tgsi_dump_immediate(const struct tgsi_full_immediate *imm);
-
-void tgsi_dump_instruction_str(const struct tgsi_full_instruction *inst,
-                               uint instno, char *str, size_t size);
-
-void tgsi_dump_instruction(const struct tgsi_full_instruction *inst,
-                           uint instno);
-
-void tgsi_dump_declaration(const struct tgsi_full_declaration *decl);
-
-void tgsi_dump_property(const struct tgsi_full_property *prop);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_DUMP_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_info.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_info.c
deleted file mode 100644
index 700ed27aa..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_info.h"
-#include "util/u_debug.h"
-#include "util/u_memory.h"
-
-#define NONE TGSI_OUTPUT_NONE
-#define COMP TGSI_OUTPUT_COMPONENTWISE
-#define REPL TGSI_OUTPUT_REPLICATE
-#define CHAN TGSI_OUTPUT_CHAN_DEPENDENT
-#define OTHR TGSI_OUTPUT_OTHER
-
-static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] = {
-    {1, 1, 0, 0, 0, 0, COMP, "ARL", TGSI_OPCODE_ARL},
-    {1, 1, 0, 0, 0, 0, COMP, "MOV", TGSI_OPCODE_MOV},
-    {1, 1, 0, 0, 0, 0, CHAN, "LIT", TGSI_OPCODE_LIT},
-    {1, 1, 0, 0, 0, 0, REPL, "RCP", TGSI_OPCODE_RCP},
-    {1, 1, 0, 0, 0, 0, REPL, "RSQ", TGSI_OPCODE_RSQ},
-    {1, 1, 0, 0, 0, 0, CHAN, "EXP", TGSI_OPCODE_EXP},
-    {1, 1, 0, 0, 0, 0, CHAN, "LOG", TGSI_OPCODE_LOG},
-    {1, 2, 0, 0, 0, 0, COMP, "MUL", TGSI_OPCODE_MUL},
-    {1, 2, 0, 0, 0, 0, COMP, "ADD", TGSI_OPCODE_ADD},
-    {1, 2, 0, 0, 0, 0, REPL, "DP3", TGSI_OPCODE_DP3},
-    {1, 2, 0, 0, 0, 0, REPL, "DP4", TGSI_OPCODE_DP4},
-    {1, 2, 0, 0, 0, 0, CHAN, "DST", TGSI_OPCODE_DST},
-    {1, 2, 0, 0, 0, 0, COMP, "MIN", TGSI_OPCODE_MIN},
-    {1, 2, 0, 0, 0, 0, COMP, "MAX", TGSI_OPCODE_MAX},
-    {1, 2, 0, 0, 0, 0, COMP, "SLT", TGSI_OPCODE_SLT},
-    {1, 2, 0, 0, 0, 0, COMP, "SGE", TGSI_OPCODE_SGE},
-    {1, 3, 0, 0, 0, 0, COMP, "MAD", TGSI_OPCODE_MAD},
-    {1, 2, 0, 0, 0, 0, COMP, "SUB", TGSI_OPCODE_SUB},
-    {1, 3, 0, 0, 0, 0, COMP, "LRP", TGSI_OPCODE_LRP},
-    {1, 3, 0, 0, 0, 0, COMP, "FMA", TGSI_OPCODE_FMA},
-    {1, 1, 0, 0, 0, 0, REPL, "SQRT", TGSI_OPCODE_SQRT},
-    {1, 3, 0, 0, 0, 0, REPL, "", 21}, /* removed */
-    {0, 0, 0, 0, 0, 0, NONE, "", 22}, /* removed */
-    {0, 0, 0, 0, 0, 0, NONE, "", 23}, /* removed */
-    {1, 1, 0, 0, 0, 0, COMP, "FRC", TGSI_OPCODE_FRC},
-    {1, 3, 0, 0, 0, 0, COMP, "", 25}, /* removed */
-    {1, 1, 0, 0, 0, 0, COMP, "FLR", TGSI_OPCODE_FLR},
-    {1, 1, 0, 0, 0, 0, COMP, "ROUND", TGSI_OPCODE_ROUND},
-    {1, 1, 0, 0, 0, 0, REPL, "EX2", TGSI_OPCODE_EX2},
-    {1, 1, 0, 0, 0, 0, REPL, "LG2", TGSI_OPCODE_LG2},
-    {1, 2, 0, 0, 0, 0, REPL, "POW", TGSI_OPCODE_POW},
-    {1, 2, 0, 0, 0, 0, COMP, "XPD", TGSI_OPCODE_XPD},
-    {0, 0, 0, 0, 0, 0, NONE, "", 32}, /* removed */
-    {1, 1, 0, 0, 0, 0, COMP, "ABS", TGSI_OPCODE_ABS},
-    {0, 0, 0, 0, 0, 0, NONE, "", 34}, /* removed */
-    {1, 2, 0, 0, 0, 0, REPL, "DPH", TGSI_OPCODE_DPH},
-    {1, 1, 0, 0, 0, 0, REPL, "COS", TGSI_OPCODE_COS},
-    {1, 1, 0, 0, 0, 0, COMP, "DDX", TGSI_OPCODE_DDX},
-    {1, 1, 0, 0, 0, 0, COMP, "DDY", TGSI_OPCODE_DDY},
-    {0, 0, 0, 0, 0, 0, NONE, "KILL", TGSI_OPCODE_KILL},
-    {1, 1, 0, 0, 0, 0, COMP, "PK2H", TGSI_OPCODE_PK2H},
-    {1, 1, 0, 0, 0, 0, COMP, "PK2US", TGSI_OPCODE_PK2US},
-    {1, 1, 0, 0, 0, 0, COMP, "PK4B", TGSI_OPCODE_PK4B},
-    {1, 1, 0, 0, 0, 0, COMP, "PK4UB", TGSI_OPCODE_PK4UB},
-    {0, 1, 0, 0, 0, 1, NONE, "", 44}, /* removed */
-    {1, 2, 0, 0, 0, 0, COMP, "SEQ", TGSI_OPCODE_SEQ},
-    {0, 1, 0, 0, 0, 1, NONE, "", 46}, /* removed */
-    {1, 2, 0, 0, 0, 0, COMP, "SGT", TGSI_OPCODE_SGT},
-    {1, 1, 0, 0, 0, 0, REPL, "SIN", TGSI_OPCODE_SIN},
-    {1, 2, 0, 0, 0, 0, COMP, "SLE", TGSI_OPCODE_SLE},
-    {1, 2, 0, 0, 0, 0, COMP, "SNE", TGSI_OPCODE_SNE},
-    {0, 1, 0, 0, 0, 1, NONE, "", 51}, /* removed */
-    {1, 2, 1, 0, 0, 0, OTHR, "TEX", TGSI_OPCODE_TEX},
-    {1, 4, 1, 0, 0, 0, OTHR, "TXD", TGSI_OPCODE_TXD},
-    {1, 2, 1, 0, 0, 0, OTHR, "TXP", TGSI_OPCODE_TXP},
-    {1, 1, 0, 0, 0, 0, COMP, "UP2H", TGSI_OPCODE_UP2H},
-    {1, 1, 0, 0, 0, 0, COMP, "UP2US", TGSI_OPCODE_UP2US},
-    {1, 1, 0, 0, 0, 0, COMP, "UP4B", TGSI_OPCODE_UP4B},
-    {1, 1, 0, 0, 0, 0, COMP, "UP4UB", TGSI_OPCODE_UP4UB},
-    {0, 1, 0, 0, 0, 1, NONE, "", 59}, /* removed */
-    {0, 1, 0, 0, 0, 1, NONE, "", 60}, /* removed */
-    {1, 1, 0, 0, 0, 0, COMP, "ARR", TGSI_OPCODE_ARR},
-    {0, 1, 0, 0, 0, 1, NONE, "", 62}, /* removed */
-    {0, 0, 0, 1, 0, 0, NONE, "CAL", TGSI_OPCODE_CAL},
-    {0, 0, 0, 0, 0, 0, NONE, "RET", TGSI_OPCODE_RET},
-    {1, 1, 0, 0, 0, 0, COMP, "SSG", TGSI_OPCODE_SSG},
-    {1, 3, 0, 0, 0, 0, COMP, "CMP", TGSI_OPCODE_CMP},
-    {1, 1, 0, 0, 0, 0, CHAN, "SCS", TGSI_OPCODE_SCS},
-    {1, 2, 1, 0, 0, 0, OTHR, "TXB", TGSI_OPCODE_TXB},
-    {1, 1, 0, 0, 0, 0, OTHR, "FBFETCH", TGSI_OPCODE_FBFETCH},
-    {1, 2, 0, 0, 0, 0, COMP, "DIV", TGSI_OPCODE_DIV},
-    {1, 2, 0, 0, 0, 0, REPL, "DP2", TGSI_OPCODE_DP2},
-    {1, 2, 1, 0, 0, 0, OTHR, "TXL", TGSI_OPCODE_TXL},
-    {0, 0, 0, 0, 0, 0, NONE, "BRK", TGSI_OPCODE_BRK},
-    {0, 1, 0, 1, 0, 1, NONE, "IF", TGSI_OPCODE_IF},
-    {0, 1, 0, 1, 0, 1, NONE, "UIF", TGSI_OPCODE_UIF},
-    {0, 1, 0, 0, 0, 1, NONE, "", 76}, /* removed */
-    {0, 0, 0, 1, 1, 1, NONE, "ELSE", TGSI_OPCODE_ELSE},
-    {0, 0, 0, 0, 1, 0, NONE, "ENDIF", TGSI_OPCODE_ENDIF},
-    {1, 1, 0, 0, 0, 0, COMP, "DDX_FINE", TGSI_OPCODE_DDX_FINE},
-    {1, 1, 0, 0, 0, 0, COMP, "DDY_FINE", TGSI_OPCODE_DDY_FINE},
-    {0, 0, 0, 0, 0, 0, NONE, "", 81}, /* removed */
-    {0, 0, 0, 0, 0, 0, NONE, "", 82}, /* removed */
-    {1, 1, 0, 0, 0, 0, COMP, "CEIL", TGSI_OPCODE_CEIL},
-    {1, 1, 0, 0, 0, 0, COMP, "I2F", TGSI_OPCODE_I2F},
-    {1, 1, 0, 0, 0, 0, COMP, "NOT", TGSI_OPCODE_NOT},
-    {1, 1, 0, 0, 0, 0, COMP, "TRUNC", TGSI_OPCODE_TRUNC},
-    {1, 2, 0, 0, 0, 0, COMP, "SHL", TGSI_OPCODE_SHL},
-    {0, 0, 0, 0, 0, 0, NONE, "", 88}, /* removed */
-    {1, 2, 0, 0, 0, 0, COMP, "AND", TGSI_OPCODE_AND},
-    {1, 2, 0, 0, 0, 0, COMP, "OR", TGSI_OPCODE_OR},
-    {1, 2, 0, 0, 0, 0, COMP, "MOD", TGSI_OPCODE_MOD},
-    {1, 2, 0, 0, 0, 0, COMP, "XOR", TGSI_OPCODE_XOR},
-    {0, 0, 0, 0, 0, 0, COMP, "", 93}, /* removed */
-    {1, 2, 1, 0, 0, 0, OTHR, "TXF", TGSI_OPCODE_TXF},
-    {1, 2, 1, 0, 0, 0, OTHR, "TXQ", TGSI_OPCODE_TXQ},
-    {0, 0, 0, 0, 0, 0, NONE, "CONT", TGSI_OPCODE_CONT},
-    {0, 1, 0, 0, 0, 0, NONE, "EMIT", TGSI_OPCODE_EMIT},
-    {0, 1, 0, 0, 0, 0, NONE, "ENDPRIM", TGSI_OPCODE_ENDPRIM},
-    {0, 0, 0, 1, 0, 1, NONE, "BGNLOOP", TGSI_OPCODE_BGNLOOP},
-    {0, 0, 0, 0, 0, 1, NONE, "BGNSUB", TGSI_OPCODE_BGNSUB},
-    {0, 0, 0, 1, 1, 0, NONE, "ENDLOOP", TGSI_OPCODE_ENDLOOP},
-    {0, 0, 0, 0, 1, 0, NONE, "ENDSUB", TGSI_OPCODE_ENDSUB},
-    {0, 0, 0, 0, 0, 0, OTHR, "", 103}, /* removed */
-    {1, 1, 1, 0, 0, 0, OTHR, "TXQS", TGSI_OPCODE_TXQS},
-    {1, 1, 0, 0, 0, 0, OTHR, "RESQ", TGSI_OPCODE_RESQ},
-    {0, 0, 0, 0, 0, 0, NONE, "", 106}, /* removed */
-    {0, 0, 0, 0, 0, 0, NONE, "NOP", TGSI_OPCODE_NOP},
-    {1, 2, 0, 0, 0, 0, COMP, "FSEQ", TGSI_OPCODE_FSEQ},
-    {1, 2, 0, 0, 0, 0, COMP, "FSGE", TGSI_OPCODE_FSGE},
-    {1, 2, 0, 0, 0, 0, COMP, "FSLT", TGSI_OPCODE_FSLT},
-    {1, 2, 0, 0, 0, 0, COMP, "FSNE", TGSI_OPCODE_FSNE},
-    {0, 1, 0, 0, 0, 0, OTHR, "MEMBAR", TGSI_OPCODE_MEMBAR},
-    {0, 1, 0, 0, 0, 0, NONE, "", 113}, /* removed */
-    {0, 1, 0, 0, 0, 0, NONE, "", 114}, /* removed */
-    {0, 1, 0, 0, 0, 0, NONE, "", 115}, /* removed */
-    {0, 1, 0, 0, 0, 0, NONE, "KILL_IF", TGSI_OPCODE_KILL_IF},
-    {0, 0, 0, 0, 0, 0, NONE, "END", TGSI_OPCODE_END},
-    {1, 3, 0, 0, 0, 0, COMP, "DFMA", TGSI_OPCODE_DFMA},
-    {1, 1, 0, 0, 0, 0, COMP, "F2I", TGSI_OPCODE_F2I},
-    {1, 2, 0, 0, 0, 0, COMP, "IDIV", TGSI_OPCODE_IDIV},
-    {1, 2, 0, 0, 0, 0, COMP, "IMAX", TGSI_OPCODE_IMAX},
-    {1, 2, 0, 0, 0, 0, COMP, "IMIN", TGSI_OPCODE_IMIN},
-    {1, 1, 0, 0, 0, 0, COMP, "INEG", TGSI_OPCODE_INEG},
-    {1, 2, 0, 0, 0, 0, COMP, "ISGE", TGSI_OPCODE_ISGE},
-    {1, 2, 0, 0, 0, 0, COMP, "ISHR", TGSI_OPCODE_ISHR},
-    {1, 2, 0, 0, 0, 0, COMP, "ISLT", TGSI_OPCODE_ISLT},
-    {1, 1, 0, 0, 0, 0, COMP, "F2U", TGSI_OPCODE_F2U},
-    {1, 1, 0, 0, 0, 0, COMP, "U2F", TGSI_OPCODE_U2F},
-    {1, 2, 0, 0, 0, 0, COMP, "UADD", TGSI_OPCODE_UADD},
-    {1, 2, 0, 0, 0, 0, COMP, "UDIV", TGSI_OPCODE_UDIV},
-    {1, 3, 0, 0, 0, 0, COMP, "UMAD", TGSI_OPCODE_UMAD},
-    {1, 2, 0, 0, 0, 0, COMP, "UMAX", TGSI_OPCODE_UMAX},
-    {1, 2, 0, 0, 0, 0, COMP, "UMIN", TGSI_OPCODE_UMIN},
-    {1, 2, 0, 0, 0, 0, COMP, "UMOD", TGSI_OPCODE_UMOD},
-    {1, 2, 0, 0, 0, 0, COMP, "UMUL", TGSI_OPCODE_UMUL},
-    {1, 2, 0, 0, 0, 0, COMP, "USEQ", TGSI_OPCODE_USEQ},
-    {1, 2, 0, 0, 0, 0, COMP, "USGE", TGSI_OPCODE_USGE},
-    {1, 2, 0, 0, 0, 0, COMP, "USHR", TGSI_OPCODE_USHR},
-    {1, 2, 0, 0, 0, 0, COMP, "USLT", TGSI_OPCODE_USLT},
-    {1, 2, 0, 0, 0, 0, COMP, "USNE", TGSI_OPCODE_USNE},
-    {0, 1, 0, 0, 0, 0, NONE, "SWITCH", TGSI_OPCODE_SWITCH},
-    {0, 1, 0, 0, 0, 0, NONE, "CASE", TGSI_OPCODE_CASE},
-    {0, 0, 0, 0, 0, 0, NONE, "DEFAULT", TGSI_OPCODE_DEFAULT},
-    {0, 0, 0, 0, 0, 0, NONE, "ENDSWITCH", TGSI_OPCODE_ENDSWITCH},
-
-    {1, 3, 0, 0, 0, 0, OTHR, "SAMPLE", TGSI_OPCODE_SAMPLE},
-    {1, 2, 0, 0, 0, 0, OTHR, "SAMPLE_I", TGSI_OPCODE_SAMPLE_I},
-    {1, 3, 0, 0, 0, 0, OTHR, "SAMPLE_I_MS", TGSI_OPCODE_SAMPLE_I_MS},
-    {1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_B", TGSI_OPCODE_SAMPLE_B},
-    {1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_C", TGSI_OPCODE_SAMPLE_C},
-    {1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_C_LZ", TGSI_OPCODE_SAMPLE_C_LZ},
-    {1, 5, 0, 0, 0, 0, OTHR, "SAMPLE_D", TGSI_OPCODE_SAMPLE_D},
-    {1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_L", TGSI_OPCODE_SAMPLE_L},
-    {1, 3, 0, 0, 0, 0, OTHR, "GATHER4", TGSI_OPCODE_GATHER4},
-    {1, 2, 0, 0, 0, 0, OTHR, "SVIEWINFO", TGSI_OPCODE_SVIEWINFO},
-    {1, 2, 0, 0, 0, 0, OTHR, "SAMPLE_POS", TGSI_OPCODE_SAMPLE_POS},
-    {1, 2, 0, 0, 0, 0, OTHR, "SAMPLE_INFO", TGSI_OPCODE_SAMPLE_INFO},
-    {1, 1, 0, 0, 0, 0, COMP, "UARL", TGSI_OPCODE_UARL},
-    {1, 3, 0, 0, 0, 0, COMP, "UCMP", TGSI_OPCODE_UCMP},
-    {1, 1, 0, 0, 0, 0, COMP, "IABS", TGSI_OPCODE_IABS},
-    {1, 1, 0, 0, 0, 0, COMP, "ISSG", TGSI_OPCODE_ISSG},
-    {1, 2, 0, 0, 0, 0, OTHR, "LOAD", TGSI_OPCODE_LOAD},
-    {1, 2, 0, 0, 0, 0, OTHR, "STORE", TGSI_OPCODE_STORE},
-    {1, 0, 0, 0, 0, 0, OTHR, "", 163},
-    {1, 0, 0, 0, 0, 0, OTHR, "", 164},
-    {1, 0, 0, 0, 0, 0, OTHR, "", 165},
-    {0, 0, 0, 0, 0, 0, OTHR, "BARRIER", TGSI_OPCODE_BARRIER},
-
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMUADD", TGSI_OPCODE_ATOMUADD},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMXCHG", TGSI_OPCODE_ATOMXCHG},
-    {1, 4, 0, 0, 0, 0, OTHR, "ATOMCAS", TGSI_OPCODE_ATOMCAS},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMAND", TGSI_OPCODE_ATOMAND},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMOR", TGSI_OPCODE_ATOMOR},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMXOR", TGSI_OPCODE_ATOMXOR},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMUMIN", TGSI_OPCODE_ATOMUMIN},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMUMAX", TGSI_OPCODE_ATOMUMAX},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMIMIN", TGSI_OPCODE_ATOMIMIN},
-    {1, 3, 0, 0, 0, 0, OTHR, "ATOMIMAX", TGSI_OPCODE_ATOMIMAX},
-    {1, 3, 1, 0, 0, 0, OTHR, "TEX2", TGSI_OPCODE_TEX2},
-    {1, 3, 1, 0, 0, 0, OTHR, "TXB2", TGSI_OPCODE_TXB2},
-    {1, 3, 1, 0, 0, 0, OTHR, "TXL2", TGSI_OPCODE_TXL2},
-    {1, 2, 0, 0, 0, 0, COMP, "IMUL_HI", TGSI_OPCODE_IMUL_HI},
-    {1, 2, 0, 0, 0, 0, COMP, "UMUL_HI", TGSI_OPCODE_UMUL_HI},
-    {1, 3, 1, 0, 0, 0, OTHR, "TG4", TGSI_OPCODE_TG4},
-    {1, 2, 1, 0, 0, 0, OTHR, "LODQ", TGSI_OPCODE_LODQ},
-    {1, 3, 0, 0, 0, 0, COMP, "IBFE", TGSI_OPCODE_IBFE},
-    {1, 3, 0, 0, 0, 0, COMP, "UBFE", TGSI_OPCODE_UBFE},
-    {1, 4, 0, 0, 0, 0, COMP, "BFI", TGSI_OPCODE_BFI},
-    {1, 1, 0, 0, 0, 0, COMP, "BREV", TGSI_OPCODE_BREV},
-    {1, 1, 0, 0, 0, 0, COMP, "POPC", TGSI_OPCODE_POPC},
-    {1, 1, 0, 0, 0, 0, COMP, "LSB", TGSI_OPCODE_LSB},
-    {1, 1, 0, 0, 0, 0, COMP, "IMSB", TGSI_OPCODE_IMSB},
-    {1, 1, 0, 0, 0, 0, COMP, "UMSB", TGSI_OPCODE_UMSB},
-    {1, 1, 0, 0, 0, 0, OTHR, "INTERP_CENTROID", TGSI_OPCODE_INTERP_CENTROID},
-    {1, 2, 0, 0, 0, 0, OTHR, "INTERP_SAMPLE", TGSI_OPCODE_INTERP_SAMPLE},
-    {1, 2, 0, 0, 0, 0, OTHR, "INTERP_OFFSET", TGSI_OPCODE_INTERP_OFFSET},
-    {1, 1, 0, 0, 0, 0, COMP, "F2D", TGSI_OPCODE_F2D},
-    {1, 1, 0, 0, 0, 0, COMP, "D2F", TGSI_OPCODE_D2F},
-    {1, 1, 0, 0, 0, 0, COMP, "DABS", TGSI_OPCODE_DABS},
-    {1, 1, 0, 0, 0, 0, COMP, "DNEG", TGSI_OPCODE_DNEG},
-    {1, 2, 0, 0, 0, 0, COMP, "DADD", TGSI_OPCODE_DADD},
-    {1, 2, 0, 0, 0, 0, COMP, "DMUL", TGSI_OPCODE_DMUL},
-    {1, 2, 0, 0, 0, 0, COMP, "DMAX", TGSI_OPCODE_DMAX},
-    {1, 2, 0, 0, 0, 0, COMP, "DMIN", TGSI_OPCODE_DMIN},
-    {1, 2, 0, 0, 0, 0, COMP, "DSLT", TGSI_OPCODE_DSLT},
-    {1, 2, 0, 0, 0, 0, COMP, "DSGE", TGSI_OPCODE_DSGE},
-    {1, 2, 0, 0, 0, 0, COMP, "DSEQ", TGSI_OPCODE_DSEQ},
-    {1, 2, 0, 0, 0, 0, COMP, "DSNE", TGSI_OPCODE_DSNE},
-    {1, 1, 0, 0, 0, 0, COMP, "DRCP", TGSI_OPCODE_DRCP},
-    {1, 1, 0, 0, 0, 0, COMP, "DSQRT", TGSI_OPCODE_DSQRT},
-    {1, 3, 0, 0, 0, 0, COMP, "DMAD", TGSI_OPCODE_DMAD},
-    {1, 1, 0, 0, 0, 0, COMP, "DFRAC", TGSI_OPCODE_DFRAC},
-    {1, 2, 0, 0, 0, 0, COMP, "DLDEXP", TGSI_OPCODE_DLDEXP},
-    {2, 1, 0, 0, 0, 0, COMP, "DFRACEXP", TGSI_OPCODE_DFRACEXP},
-    {1, 1, 0, 0, 0, 0, COMP, "D2I", TGSI_OPCODE_D2I},
-    {1, 1, 0, 0, 0, 0, COMP, "I2D", TGSI_OPCODE_I2D},
-    {1, 1, 0, 0, 0, 0, COMP, "D2U", TGSI_OPCODE_D2U},
-    {1, 1, 0, 0, 0, 0, COMP, "U2D", TGSI_OPCODE_U2D},
-    {1, 1, 0, 0, 0, 0, COMP, "DRSQ", TGSI_OPCODE_DRSQ},
-    {1, 1, 0, 0, 0, 0, COMP, "DTRUNC", TGSI_OPCODE_DTRUNC},
-    {1, 1, 0, 0, 0, 0, COMP, "DCEIL", TGSI_OPCODE_DCEIL},
-    {1, 1, 0, 0, 0, 0, COMP, "DFLR", TGSI_OPCODE_DFLR},
-    {1, 1, 0, 0, 0, 0, COMP, "DROUND", TGSI_OPCODE_DROUND},
-    {1, 1, 0, 0, 0, 0, COMP, "DSSG", TGSI_OPCODE_DSSG},
-    {1, 2, 0, 0, 0, 0, COMP, "DDIV", TGSI_OPCODE_DDIV},
-    {1, 0, 0, 0, 0, 0, OTHR, "CLOCK", TGSI_OPCODE_CLOCK},
-
-    {1, 1, 0, 0, 0, 0, COMP, "I64ABS", TGSI_OPCODE_I64ABS},
-    {1, 1, 0, 0, 0, 0, COMP, "I64NEG", TGSI_OPCODE_I64NEG},
-    {1, 1, 0, 0, 0, 0, COMP, "I64SSG", TGSI_OPCODE_I64SSG},
-    {1, 2, 0, 0, 0, 0, COMP, "I64SLT", TGSI_OPCODE_I64SLT},
-    {1, 2, 0, 0, 0, 0, COMP, "I64SGE", TGSI_OPCODE_I64SGE},
-    {1, 2, 0, 0, 0, 0, COMP, "I64MIN", TGSI_OPCODE_I64MIN},
-    {1, 2, 0, 0, 0, 0, COMP, "I64MAX", TGSI_OPCODE_I64MAX},
-    {1, 2, 0, 0, 0, 0, COMP, "I64SHR", TGSI_OPCODE_I64SHR},
-    {1, 2, 0, 0, 0, 0, COMP, "I64DIV", TGSI_OPCODE_I64DIV},
-    {1, 2, 0, 0, 0, 0, COMP, "I64MOD", TGSI_OPCODE_I64MOD},
-    {1, 1, 0, 0, 0, 0, COMP, "F2I64", TGSI_OPCODE_F2I64},
-    {1, 1, 0, 0, 0, 0, COMP, "U2I64", TGSI_OPCODE_U2I64},
-    {1, 1, 0, 0, 0, 0, COMP, "I2I64", TGSI_OPCODE_I2I64},
-    {1, 1, 0, 0, 0, 0, COMP, "D2I64", TGSI_OPCODE_D2I64},
-    {1, 1, 0, 0, 0, 0, COMP, "I642F", TGSI_OPCODE_I642F},
-    {1, 1, 0, 0, 0, 0, COMP, "I642D", TGSI_OPCODE_I642D},
-
-    {1, 2, 0, 0, 0, 0, COMP, "U64ADD", TGSI_OPCODE_U64ADD},
-    {1, 2, 0, 0, 0, 0, COMP, "U64MUL", TGSI_OPCODE_U64MUL},
-    {1, 2, 0, 0, 0, 0, COMP, "U64SEQ", TGSI_OPCODE_U64SEQ},
-    {1, 2, 0, 0, 0, 0, COMP, "U64SNE", TGSI_OPCODE_U64SNE},
-    {1, 2, 0, 0, 0, 0, COMP, "U64SLT", TGSI_OPCODE_U64SLT},
-    {1, 2, 0, 0, 0, 0, COMP, "U64SGE", TGSI_OPCODE_U64SGE},
-    {1, 2, 0, 0, 0, 0, COMP, "U64MIN", TGSI_OPCODE_U64MIN},
-    {1, 2, 0, 0, 0, 0, COMP, "U64MAX", TGSI_OPCODE_U64MAX},
-    {1, 2, 0, 0, 0, 0, COMP, "U64SHL", TGSI_OPCODE_U64SHL},
-    {1, 2, 0, 0, 0, 0, COMP, "U64SHR", TGSI_OPCODE_U64SHR},
-    {1, 2, 0, 0, 0, 0, COMP, "U64DIV", TGSI_OPCODE_U64DIV},
-    {1, 2, 0, 0, 0, 0, COMP, "U64MOD", TGSI_OPCODE_U64MOD},
-    {1, 1, 0, 0, 0, 0, COMP, "F2U64", TGSI_OPCODE_F2U64},
-    {1, 1, 0, 0, 0, 0, COMP, "D2U64", TGSI_OPCODE_D2U64},
-    {1, 1, 0, 0, 0, 0, COMP, "U642F", TGSI_OPCODE_U642F},
-    {1, 1, 0, 0, 0, 0, COMP, "U642D", TGSI_OPCODE_U642D}};
-
-const struct tgsi_opcode_info *tgsi_get_opcode_info(uint opcode) {
-  static boolean firsttime = 1;
-
-  if (firsttime) {
-    unsigned i;
-    firsttime = 0;
-    for (i = 0; i < Elements(opcode_info); i++)
-      assert(opcode_info[i].opcode == i);
-  }
-
-  if (opcode < TGSI_OPCODE_LAST)
-    return &opcode_info[opcode];
-
-  assert(0);
-  return NULL;
-}
-
-const char *tgsi_get_opcode_name(uint opcode) {
-  const struct tgsi_opcode_info *info = tgsi_get_opcode_info(opcode);
-  return info->mnemonic;
-}
-
-const char *tgsi_get_processor_name(uint processor) {
-  switch (processor) {
-  case TGSI_PROCESSOR_VERTEX:
-    return "vertex shader";
-  case TGSI_PROCESSOR_FRAGMENT:
-    return "fragment shader";
-  case TGSI_PROCESSOR_GEOMETRY:
-    return "geometry shader";
-  case TGSI_PROCESSOR_TESS_CTRL:
-    return "tessellation control shader";
-  case TGSI_PROCESSOR_TESS_EVAL:
-    return "tessellation evaluation shader";
-  default:
-    return "unknown shader type!";
-  }
-}
-
-/**
- * Infer the type (of the dst) of the opcode.
- *
- * MOV and UCMP is special so return VOID
- */
-static inline enum tgsi_opcode_type tgsi_opcode_infer_type(uint opcode) {
-  switch (opcode) {
-  case TGSI_OPCODE_MOV:
-  case TGSI_OPCODE_UCMP:
-    return TGSI_TYPE_UNTYPED;
-  case TGSI_OPCODE_NOT:
-  case TGSI_OPCODE_SHL:
-  case TGSI_OPCODE_AND:
-  case TGSI_OPCODE_OR:
-  case TGSI_OPCODE_XOR:
-  case TGSI_OPCODE_TXQ:
-  case TGSI_OPCODE_TXQS:
-  case TGSI_OPCODE_F2U:
-  case TGSI_OPCODE_UDIV:
-  case TGSI_OPCODE_UMAD:
-  case TGSI_OPCODE_UMAX:
-  case TGSI_OPCODE_UMIN:
-  case TGSI_OPCODE_UMOD:
-  case TGSI_OPCODE_UMUL:
-  case TGSI_OPCODE_USEQ:
-  case TGSI_OPCODE_USGE:
-  case TGSI_OPCODE_USHR:
-  case TGSI_OPCODE_USLT:
-  case TGSI_OPCODE_USNE:
-  case TGSI_OPCODE_SVIEWINFO:
-  case TGSI_OPCODE_UMUL_HI:
-  case TGSI_OPCODE_UBFE:
-  case TGSI_OPCODE_BFI:
-  case TGSI_OPCODE_BREV:
-  case TGSI_OPCODE_D2U:
-  case TGSI_OPCODE_CLOCK:
-    return TGSI_TYPE_UNSIGNED;
-  case TGSI_OPCODE_ARL:
-  case TGSI_OPCODE_ARR:
-  case TGSI_OPCODE_MOD:
-  case TGSI_OPCODE_F2I:
-  case TGSI_OPCODE_FSEQ:
-  case TGSI_OPCODE_FSGE:
-  case TGSI_OPCODE_FSLT:
-  case TGSI_OPCODE_FSNE:
-  case TGSI_OPCODE_IDIV:
-  case TGSI_OPCODE_IMAX:
-  case TGSI_OPCODE_IMIN:
-  case TGSI_OPCODE_INEG:
-  case TGSI_OPCODE_ISGE:
-  case TGSI_OPCODE_ISHR:
-  case TGSI_OPCODE_ISLT:
-  case TGSI_OPCODE_UADD:
-  case TGSI_OPCODE_UARL:
-  case TGSI_OPCODE_IABS:
-  case TGSI_OPCODE_ISSG:
-  case TGSI_OPCODE_IMUL_HI:
-  case TGSI_OPCODE_IBFE:
-  case TGSI_OPCODE_IMSB:
-  case TGSI_OPCODE_DSEQ:
-  case TGSI_OPCODE_DSGE:
-  case TGSI_OPCODE_DSLT:
-  case TGSI_OPCODE_DSNE:
-  case TGSI_OPCODE_D2I:
-  case TGSI_OPCODE_LSB:
-  case TGSI_OPCODE_POPC:
-  case TGSI_OPCODE_UMSB:
-  case TGSI_OPCODE_U64SEQ:
-  case TGSI_OPCODE_U64SNE:
-  case TGSI_OPCODE_U64SLT:
-  case TGSI_OPCODE_U64SGE:
-  case TGSI_OPCODE_I64SLT:
-  case TGSI_OPCODE_I64SGE:
-    return TGSI_TYPE_SIGNED;
-  case TGSI_OPCODE_DADD:
-  case TGSI_OPCODE_DABS:
-  case TGSI_OPCODE_DFMA:
-  case TGSI_OPCODE_DNEG:
-  case TGSI_OPCODE_DMUL:
-  case TGSI_OPCODE_DMAX:
-  case TGSI_OPCODE_DMIN:
-  case TGSI_OPCODE_DRCP:
-  case TGSI_OPCODE_DSQRT:
-  case TGSI_OPCODE_DMAD:
-  case TGSI_OPCODE_DLDEXP:
-  case TGSI_OPCODE_DFRACEXP:
-  case TGSI_OPCODE_DFRAC:
-  case TGSI_OPCODE_DRSQ:
-  case TGSI_OPCODE_DTRUNC:
-  case TGSI_OPCODE_DCEIL:
-  case TGSI_OPCODE_DFLR:
-  case TGSI_OPCODE_DROUND:
-  case TGSI_OPCODE_DSSG:
-  case TGSI_OPCODE_DDIV:
-  case TGSI_OPCODE_F2D:
-  case TGSI_OPCODE_I2D:
-  case TGSI_OPCODE_U2D:
-  case TGSI_OPCODE_U642D:
-  case TGSI_OPCODE_I642D:
-    return TGSI_TYPE_DOUBLE;
-  case TGSI_OPCODE_U64MAX:
-  case TGSI_OPCODE_U64MIN:
-  case TGSI_OPCODE_U64ADD:
-  case TGSI_OPCODE_U64MUL:
-  case TGSI_OPCODE_U64DIV:
-  case TGSI_OPCODE_U64MOD:
-  case TGSI_OPCODE_U64SHL:
-  case TGSI_OPCODE_U64SHR:
-  case TGSI_OPCODE_F2U64:
-  case TGSI_OPCODE_D2U64:
-    return TGSI_TYPE_UNSIGNED64;
-  case TGSI_OPCODE_I64MAX:
-  case TGSI_OPCODE_I64MIN:
-  case TGSI_OPCODE_I64ABS:
-  case TGSI_OPCODE_I64SSG:
-  case TGSI_OPCODE_I64NEG:
-  case TGSI_OPCODE_I64SHR:
-  case TGSI_OPCODE_I64DIV:
-  case TGSI_OPCODE_I64MOD:
-  case TGSI_OPCODE_F2I64:
-  case TGSI_OPCODE_U2I64:
-  case TGSI_OPCODE_I2I64:
-  case TGSI_OPCODE_D2I64:
-    return TGSI_TYPE_SIGNED64;
-  default:
-    return TGSI_TYPE_FLOAT;
-  }
-}
-
-/*
- * infer the source type of a TGSI opcode.
- */
-enum tgsi_opcode_type tgsi_opcode_infer_src_type(uint opcode) {
-  switch (opcode) {
-  case TGSI_OPCODE_UIF:
-  case TGSI_OPCODE_TXF:
-  case TGSI_OPCODE_U2F:
-  case TGSI_OPCODE_U2D:
-  case TGSI_OPCODE_UADD:
-  case TGSI_OPCODE_SWITCH:
-  case TGSI_OPCODE_CASE:
-  case TGSI_OPCODE_SAMPLE_I:
-  case TGSI_OPCODE_SAMPLE_I_MS:
-  case TGSI_OPCODE_UMUL_HI:
-  case TGSI_OPCODE_UMSB:
-  case TGSI_OPCODE_U2I64:
-  case TGSI_OPCODE_MEMBAR:
-    return TGSI_TYPE_UNSIGNED;
-  case TGSI_OPCODE_IMUL_HI:
-  case TGSI_OPCODE_I2F:
-  case TGSI_OPCODE_I2D:
-  case TGSI_OPCODE_I2I64:
-    return TGSI_TYPE_SIGNED;
-  case TGSI_OPCODE_ARL:
-  case TGSI_OPCODE_ARR:
-  case TGSI_OPCODE_F2D:
-  case TGSI_OPCODE_F2I:
-  case TGSI_OPCODE_F2U:
-  case TGSI_OPCODE_FSEQ:
-  case TGSI_OPCODE_FSGE:
-  case TGSI_OPCODE_FSLT:
-  case TGSI_OPCODE_FSNE:
-  case TGSI_OPCODE_UCMP:
-  case TGSI_OPCODE_F2U64:
-  case TGSI_OPCODE_F2I64:
-    return TGSI_TYPE_FLOAT;
-  case TGSI_OPCODE_D2F:
-  case TGSI_OPCODE_D2U:
-  case TGSI_OPCODE_D2I:
-  case TGSI_OPCODE_DSEQ:
-  case TGSI_OPCODE_DSGE:
-  case TGSI_OPCODE_DSLT:
-  case TGSI_OPCODE_DSNE:
-  case TGSI_OPCODE_D2U64:
-  case TGSI_OPCODE_D2I64:
-    return TGSI_TYPE_DOUBLE;
-  case TGSI_OPCODE_U64SEQ:
-  case TGSI_OPCODE_U64SNE:
-  case TGSI_OPCODE_U64SLT:
-  case TGSI_OPCODE_U64SGE:
-  case TGSI_OPCODE_U642F:
-  case TGSI_OPCODE_U642D:
-    return TGSI_TYPE_UNSIGNED64;
-  case TGSI_OPCODE_I64SLT:
-  case TGSI_OPCODE_I64SGE:
-  case TGSI_OPCODE_I642F:
-  case TGSI_OPCODE_I642D:
-    return TGSI_TYPE_SIGNED64;
-  default:
-    return tgsi_opcode_infer_type(opcode);
-  }
-}
-
-/*
- * infer the destination type of a TGSI opcode.
- */
-enum tgsi_opcode_type tgsi_opcode_infer_dst_type(uint opcode) {
-  return tgsi_opcode_infer_type(opcode);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_info.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_info.h
deleted file mode 100644
index 0a141100c..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_info.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_INFO_H
-#define TGSI_INFO_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_shader_tokens.h"
-#include "util/u_format.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-/* This enum describes how an opcode calculates its result. */
-enum tgsi_output_mode {
-  /** The opcode produces no result. */
-  TGSI_OUTPUT_NONE = 0,
-
-  /** When this opcode writes to a channel of the destination register,
-   *  it takes as arguments values from the same channel of the source
-   *  register(s).
-   *
-   *  Example: TGSI_OPCODE_ADD
-   */
-  TGSI_OUTPUT_COMPONENTWISE = 1,
-
-  /** This opcode writes the same value to all enabled channels of the
-   * destination register.
-   *
-   *  Example: TGSI_OPCODE_RSQ
-   */
-  TGSI_OUTPUT_REPLICATE = 2,
-
-  /** The operation performed by this opcode is dependent on which channel
-   *  of the destination register is being written.
-   *
-   *  Example: TGSI_OPCODE_LOG
-   */
-  TGSI_OUTPUT_CHAN_DEPENDENT = 3,
-
-  /**
-   * Example: TGSI_OPCODE_TEX
-   */
-  TGSI_OUTPUT_OTHER = 4
-};
-
-struct tgsi_opcode_info {
-  unsigned num_dst : 3;
-  unsigned num_src : 3;
-  unsigned is_tex : 1;
-  unsigned is_branch : 1;
-  int pre_dedent : 2;
-  int post_indent : 2;
-  enum tgsi_output_mode output_mode : 3;
-  const char *mnemonic;
-  uint opcode;
-};
-
-const struct tgsi_opcode_info *tgsi_get_opcode_info(uint opcode);
-
-const char *tgsi_get_opcode_name(uint opcode);
-
-const char *tgsi_get_processor_name(uint processor);
-
-enum tgsi_opcode_type {
-  TGSI_TYPE_UNTYPED, /* for MOV */
-  TGSI_TYPE_VOID,
-  TGSI_TYPE_UNSIGNED,
-  TGSI_TYPE_SIGNED,
-  TGSI_TYPE_FLOAT,
-  TGSI_TYPE_DOUBLE,
-  TGSI_TYPE_UNSIGNED64,
-  TGSI_TYPE_SIGNED64
-};
-
-enum tgsi_opcode_type tgsi_opcode_infer_src_type(uint opcode);
-
-enum tgsi_opcode_type tgsi_opcode_infer_dst_type(uint opcode);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_INFO_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_iterate.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_iterate.c
deleted file mode 100644
index f1315ae95..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_iterate.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_iterate.h"
-#include "util/u_debug.h"
-
-boolean tgsi_iterate_shader(const struct tgsi_token *tokens,
-                            struct tgsi_iterate_context *ctx) {
-  struct tgsi_parse_context parse;
-
-  if (tgsi_parse_init(&parse, tokens) != TGSI_PARSE_OK)
-    return FALSE;
-
-  ctx->processor = parse.FullHeader.Processor;
-
-  if (ctx->prolog)
-    if (!ctx->prolog(ctx))
-      goto fail;
-
-  while (!tgsi_parse_end_of_tokens(&parse)) {
-    tgsi_parse_token(&parse);
-
-    switch (parse.FullToken.Token.Type) {
-    case TGSI_TOKEN_TYPE_INSTRUCTION:
-      if (ctx->iterate_instruction)
-        if (!ctx->iterate_instruction(ctx, &parse.FullToken.FullInstruction))
-          goto fail;
-      break;
-
-    case TGSI_TOKEN_TYPE_DECLARATION:
-      if (ctx->iterate_declaration)
-        if (!ctx->iterate_declaration(ctx, &parse.FullToken.FullDeclaration))
-          goto fail;
-      break;
-
-    case TGSI_TOKEN_TYPE_IMMEDIATE:
-      if (ctx->iterate_immediate)
-        if (!ctx->iterate_immediate(ctx, &parse.FullToken.FullImmediate))
-          goto fail;
-      break;
-
-    case TGSI_TOKEN_TYPE_PROPERTY:
-      if (ctx->iterate_property)
-        if (!ctx->iterate_property(ctx, &parse.FullToken.FullProperty))
-          goto fail;
-      break;
-
-    default:
-      assert(0);
-    }
-  }
-
-  if (ctx->epilog)
-    if (!ctx->epilog(ctx))
-      goto fail;
-
-  tgsi_parse_free(&parse);
-  return TRUE;
-
-fail:
-  tgsi_parse_free(&parse);
-  return FALSE;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_iterate.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_iterate.h
deleted file mode 100644
index 8eacb5318..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_iterate.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_ITERATE_H
-#define TGSI_ITERATE_H
-
-#include "pipe/p_shader_tokens.h"
-#include "tgsi/tgsi_parse.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-struct tgsi_iterate_context {
-  boolean (*prolog)(struct tgsi_iterate_context *ctx);
-
-  boolean (*iterate_instruction)(struct tgsi_iterate_context *ctx,
-                                 struct tgsi_full_instruction *inst);
-
-  boolean (*iterate_declaration)(struct tgsi_iterate_context *ctx,
-                                 struct tgsi_full_declaration *decl);
-
-  boolean (*iterate_immediate)(struct tgsi_iterate_context *ctx,
-                               struct tgsi_full_immediate *imm);
-
-  boolean (*iterate_property)(struct tgsi_iterate_context *ctx,
-                              struct tgsi_full_property *prop);
-
-  boolean (*epilog)(struct tgsi_iterate_context *ctx);
-
-  struct tgsi_processor processor;
-};
-
-boolean tgsi_iterate_shader(const struct tgsi_token *tokens,
-                            struct tgsi_iterate_context *ctx);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_ITERATE_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
deleted file mode 100644
index b46eb1302..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-#ifndef OP12_TEX
-#define OP12_TEX(a) OP12(a)
-#endif
-
-#ifndef OP14_TEX
-#define OP14_TEX(a) OP14(a)
-#endif
-
-#ifndef OP12_SAMPLE
-#define OP12_SAMPLE(a) OP12(a)
-#endif
-
-#ifndef OP13_SAMPLE
-#define OP13_SAMPLE(a) OP13(a)
-#endif
-
-#ifndef OP14_SAMPLE
-#define OP14_SAMPLE(a) OP14(a)
-#endif
-
-#ifndef OP15_SAMPLE
-#define OP15_SAMPLE(a) OP15(a)
-#endif
-
-#ifndef OP00_LBL
-#define OP00_LBL(a) OP00(a)
-#endif
-
-#ifndef OP01_LBL
-#define OP01_LBL(a) OP01(a)
-#endif
-
-OP11(ARL)
-OP11(MOV)
-OP11(LIT)
-OP11(RCP)
-OP11(RSQ)
-OP11(EXP)
-OP11(LOG)
-OP12(MUL)
-OP12(ADD)
-OP12(DP3)
-OP12(DP4)
-OP12(DST)
-OP12(MIN)
-OP12(MAX)
-OP12(SLT)
-OP12(SGE)
-OP13(MAD)
-OP12(SUB)
-OP13(LRP)
-OP11(SQRT)
-OP11(FRC)
-OP11(FLR)
-OP11(ROUND)
-OP11(EX2)
-OP11(LG2)
-OP12(POW)
-OP12(XPD)
-OP11(ABS)
-OP12(DPH)
-OP11(COS)
-OP11(DDX)
-OP11(DDY)
-OP00(KILL)
-OP11(PK2H)
-OP11(PK2US)
-OP11(PK4B)
-OP11(PK4UB)
-OP12(SEQ)
-OP12(SGT)
-OP11(SIN)
-OP12(SLE)
-OP12(SNE)
-OP12_TEX(TEX)
-OP14_TEX(TXD)
-OP12_TEX(TXP)
-OP11(UP2H)
-OP11(UP2US)
-OP11(UP4B)
-OP11(UP4UB)
-OP11(ARR)
-OP00_LBL(CAL)
-OP00(RET)
-OP11(SSG)
-OP13(CMP)
-OP11(SCS)
-OP12_TEX(TXB)
-OP12(DIV)
-OP12(DP2)
-OP12_TEX(TXL)
-OP00(BRK)
-OP01_LBL(IF)
-OP01_LBL(UIF)
-OP00_LBL(ELSE)
-OP00(ENDIF)
-OP11(CEIL)
-OP11(I2F)
-OP11(NOT)
-OP11(TRUNC)
-OP12(SHL)
-OP12(AND)
-OP12(OR)
-OP12(MOD)
-OP12(XOR)
-OP12_TEX(TXF)
-OP12_TEX(TXQ)
-OP00(CONT)
-OP01(EMIT)
-OP01(ENDPRIM)
-OP00_LBL(BGNLOOP)
-OP00(BGNSUB)
-OP00_LBL(ENDLOOP)
-OP00(ENDSUB)
-OP00(NOP)
-OP01(KILL_IF)
-OP00(END)
-OP11(F2I)
-OP12(FSEQ)
-OP12(FSGE)
-OP12(FSLT)
-OP12(FSNE)
-OP12(IDIV)
-OP12(IMAX)
-OP12(IMIN)
-OP11(INEG)
-OP12(ISGE)
-OP12(ISHR)
-OP12(ISLT)
-OP11(F2U)
-OP11(U2F)
-OP12(UADD)
-OP12(UDIV)
-OP13(UMAD)
-OP12(UMAX)
-OP12(UMIN)
-OP12(UMOD)
-OP12(UMUL)
-OP12(USEQ)
-OP12(USGE)
-OP12(USHR)
-OP12(USLT)
-OP12(USNE)
-OP01(SWITCH)
-OP01(CASE)
-OP00(DEFAULT)
-OP00(ENDSWITCH)
-
-OP13_SAMPLE(SAMPLE)
-OP12_SAMPLE(SAMPLE_I)
-OP13_SAMPLE(SAMPLE_I_MS)
-OP14_SAMPLE(SAMPLE_B)
-OP14_SAMPLE(SAMPLE_C)
-OP14_SAMPLE(SAMPLE_C_LZ)
-OP15_SAMPLE(SAMPLE_D)
-OP14_SAMPLE(SAMPLE_L)
-OP13_SAMPLE(GATHER4)
-OP12(SVIEWINFO)
-OP13(SAMPLE_POS)
-OP12(SAMPLE_INFO)
-OP11(UARL)
-
-OP13(UCMP)
-
-OP12(IMUL_HI)
-OP12(UMUL_HI)
-
-#undef OP00
-#undef OP01
-#undef OP10
-#undef OP11
-#undef OP12
-#undef OP13
-
-#ifdef OP14
-#undef OP14
-#endif
-
-#ifdef OP15
-#undef OP15
-#endif
-
-#undef OP00_LBL
-#undef OP01_LBL
-
-#undef OP12_TEX
-#undef OP14_TEX
-
-#undef OP12_SAMPLE
-#undef OP13_SAMPLE
-#undef OP14_SAMPLE
-#undef OP15_SAMPLE
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_parse.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_parse.c
deleted file mode 100644
index 3ecd9d89f..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_parse.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_parse.h"
-#include "pipe/p_shader_tokens.h"
-#include "util/u_debug.h"
-#include "util/u_memory.h"
-
-unsigned tgsi_parse_init(struct tgsi_parse_context *ctx,
-                         const struct tgsi_token *tokens) {
-  ctx->FullHeader.Header = *(struct tgsi_header *)&tokens[0];
-  if (ctx->FullHeader.Header.HeaderSize >= 2) {
-    ctx->FullHeader.Processor = *(struct tgsi_processor *)&tokens[1];
-  } else {
-    return TGSI_PARSE_ERROR;
-  }
-
-  ctx->Tokens = tokens;
-  ctx->Position = ctx->FullHeader.Header.HeaderSize;
-
-  return TGSI_PARSE_OK;
-}
-
-void tgsi_parse_free(UNUSED struct tgsi_parse_context *ctx) {}
-
-boolean tgsi_parse_end_of_tokens(struct tgsi_parse_context *ctx) {
-  /* All values involved are unsigned, but the sum will be promoted to
-   * a signed value (at least on 64 bit). To capture a possible overflow
-   * make it a signed comparison.
-   */
-  return (int)ctx->Position >=
-         ctx->FullHeader.Header.HeaderSize + ctx->FullHeader.Header.BodySize;
-}
-
-/**
- * This function is used to avoid and work-around type punning/aliasing
- * warnings.  The warnings seem harmless on x86 but on PPC they cause
- * real failures.
- */
-static inline void copy_token(void *dst, const void *src) {
-  memcpy(dst, src, 4);
-}
-
-/**
- * Get next 4-byte token, return it at address specified by 'token'
- */
-static void next_token(struct tgsi_parse_context *ctx, void *token) {
-  assert(!tgsi_parse_end_of_tokens(ctx));
-  copy_token(token, &ctx->Tokens[ctx->Position]);
-  ctx->Position++;
-}
-
-void tgsi_parse_token(struct tgsi_parse_context *ctx) {
-  struct tgsi_token token;
-  unsigned i;
-
-  next_token(ctx, &token);
-
-  switch (token.Type) {
-  case TGSI_TOKEN_TYPE_DECLARATION: {
-    struct tgsi_full_declaration *decl = &ctx->FullToken.FullDeclaration;
-
-    memset(decl, 0, sizeof *decl);
-    copy_token(&decl->Declaration, &token);
-
-    next_token(ctx, &decl->Range);
-
-    if (decl->Declaration.Dimension) {
-      next_token(ctx, &decl->Dim);
-    }
-
-    if (decl->Declaration.Interpolate) {
-      next_token(ctx, &decl->Interp);
-    }
-
-    if (decl->Declaration.Semantic) {
-      next_token(ctx, &decl->Semantic);
-    }
-
-    if (decl->Declaration.File == TGSI_FILE_IMAGE) {
-      next_token(ctx, &decl->Image);
-    }
-
-    if (decl->Declaration.File == TGSI_FILE_SAMPLER_VIEW) {
-      next_token(ctx, &decl->SamplerView);
-    }
-
-    if (decl->Declaration.Array) {
-      next_token(ctx, &decl->Array);
-    }
-
-    break;
-  }
-
-  case TGSI_TOKEN_TYPE_IMMEDIATE: {
-    struct tgsi_full_immediate *imm = &ctx->FullToken.FullImmediate;
-    uint imm_count;
-
-    memset(imm, 0, sizeof *imm);
-    copy_token(&imm->Immediate, &token);
-
-    imm_count = imm->Immediate.NrTokens - 1;
-
-    switch (imm->Immediate.DataType) {
-    case TGSI_IMM_FLOAT32:
-      for (i = 0; i < imm_count; i++) {
-        next_token(ctx, &imm->u[i].Float);
-      }
-      break;
-
-    case TGSI_IMM_UINT32:
-    case TGSI_IMM_FLOAT64:
-      for (i = 0; i < imm_count; i++) {
-        next_token(ctx, &imm->u[i].Uint);
-      }
-      break;
-
-    case TGSI_IMM_INT32:
-      for (i = 0; i < imm_count; i++) {
-        next_token(ctx, &imm->u[i].Int);
-      }
-      break;
-
-    default:
-      assert(0);
-    }
-
-    break;
-  }
-
-  case TGSI_TOKEN_TYPE_INSTRUCTION: {
-    struct tgsi_full_instruction *inst = &ctx->FullToken.FullInstruction;
-
-    memset(inst, 0, sizeof *inst);
-    copy_token(&inst->Instruction, &token);
-
-    if (inst->Instruction.Label) {
-      next_token(ctx, &inst->Label);
-    }
-
-    if (inst->Instruction.Texture) {
-      next_token(ctx, &inst->Texture);
-      for (i = 0; i < inst->Texture.NumOffsets; i++) {
-        next_token(ctx, &inst->TexOffsets[i]);
-      }
-    }
-
-    if (inst->Instruction.Memory) {
-      next_token(ctx, &inst->Memory);
-    }
-
-    assert(inst->Instruction.NumDstRegs <= TGSI_FULL_MAX_DST_REGISTERS);
-
-    for (i = 0; i < inst->Instruction.NumDstRegs; i++) {
-
-      next_token(ctx, &inst->Dst[i].Register);
-
-      if (inst->Dst[i].Register.Indirect)
-        next_token(ctx, &inst->Dst[i].Indirect);
-
-      if (inst->Dst[i].Register.Dimension) {
-        next_token(ctx, &inst->Dst[i].Dimension);
-
-        /*
-         * No support for multi-dimensional addressing.
-         */
-        assert(!inst->Dst[i].Dimension.Dimension);
-
-        if (inst->Dst[i].Dimension.Indirect)
-          next_token(ctx, &inst->Dst[i].DimIndirect);
-      }
-    }
-
-    assert(inst->Instruction.NumSrcRegs <= TGSI_FULL_MAX_SRC_REGISTERS);
-
-    for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
-
-      next_token(ctx, &inst->Src[i].Register);
-
-      if (inst->Src[i].Register.Indirect)
-        next_token(ctx, &inst->Src[i].Indirect);
-
-      if (inst->Src[i].Register.Dimension) {
-        next_token(ctx, &inst->Src[i].Dimension);
-
-        /*
-         * No support for multi-dimensional addressing.
-         */
-        assert(!inst->Src[i].Dimension.Dimension);
-
-        if (inst->Src[i].Dimension.Indirect)
-          next_token(ctx, &inst->Src[i].DimIndirect);
-      }
-    }
-
-    break;
-  }
-
-  case TGSI_TOKEN_TYPE_PROPERTY: {
-    struct tgsi_full_property *prop = &ctx->FullToken.FullProperty;
-    uint prop_count;
-
-    memset(prop, 0, sizeof *prop);
-    copy_token(&prop->Property, &token);
-
-    prop_count = prop->Property.NrTokens - 1;
-    for (i = 0; i < prop_count; i++) {
-      next_token(ctx, &prop->u[i]);
-    }
-
-    break;
-  }
-
-  default:
-    assert(0);
-  }
-}
-
-/**
- * Make a new copy of a token array.
- */
-struct tgsi_token *tgsi_dup_tokens(const struct tgsi_token *tokens) {
-  unsigned n = tgsi_num_tokens(tokens);
-  unsigned bytes = n * sizeof(struct tgsi_token);
-  struct tgsi_token *new_tokens = (struct tgsi_token *)MALLOC(bytes);
-  if (new_tokens)
-    memcpy(new_tokens, tokens, bytes);
-  return new_tokens;
-}
-
-/**
- * Allocate memory for num_tokens tokens.
- */
-struct tgsi_token *tgsi_alloc_tokens(unsigned num_tokens) {
-  unsigned bytes = num_tokens * sizeof(struct tgsi_token);
-  return (struct tgsi_token *)MALLOC(bytes);
-}
-
-void tgsi_dump_tokens(const struct tgsi_token *tokens) {
-  const unsigned *dwords = (const unsigned *)tokens;
-  int nr = tgsi_num_tokens(tokens);
-  int i;
-
-  assert(sizeof(*tokens) == sizeof(unsigned));
-
-  debug_printf("const unsigned tokens[%d] = {\n", nr);
-  for (i = 0; i < nr; i++)
-    debug_printf("0x%08x,\n", dwords[i]);
-  debug_printf("};\n");
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_parse.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_parse.h
deleted file mode 100644
index 8c86993ed..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_parse.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_PARSE_H
-#define TGSI_PARSE_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_shader_tokens.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-struct tgsi_full_header {
-  struct tgsi_header Header;
-  struct tgsi_processor Processor;
-};
-
-struct tgsi_full_dst_register {
-  struct tgsi_dst_register Register;
-  struct tgsi_ind_register Indirect;
-  struct tgsi_dimension Dimension;
-  struct tgsi_ind_register DimIndirect;
-};
-
-struct tgsi_full_src_register {
-  struct tgsi_src_register Register;
-  struct tgsi_ind_register Indirect;
-  struct tgsi_dimension Dimension;
-  struct tgsi_ind_register DimIndirect;
-};
-
-struct tgsi_full_declaration {
-  struct tgsi_declaration Declaration;
-  struct tgsi_declaration_range Range;
-  struct tgsi_declaration_dimension Dim;
-  struct tgsi_declaration_interp Interp;
-  struct tgsi_declaration_semantic Semantic;
-  struct tgsi_declaration_image Image;
-  struct tgsi_declaration_sampler_view SamplerView;
-  struct tgsi_declaration_array Array;
-};
-
-struct tgsi_full_immediate {
-  struct tgsi_immediate Immediate;
-  union tgsi_immediate_data u[4];
-};
-
-struct tgsi_full_property {
-  struct tgsi_property Property;
-  struct tgsi_property_data u[8];
-};
-
-#define TGSI_FULL_MAX_DST_REGISTERS 2
-#define TGSI_FULL_MAX_SRC_REGISTERS 5 /* SAMPLE_D has 5 */
-#define TGSI_FULL_MAX_TEX_OFFSETS 4
-
-struct tgsi_full_instruction {
-  struct tgsi_instruction Instruction;
-  struct tgsi_instruction_label Label;
-  struct tgsi_instruction_texture Texture;
-  struct tgsi_instruction_memory Memory;
-  struct tgsi_full_dst_register Dst[TGSI_FULL_MAX_DST_REGISTERS];
-  struct tgsi_full_src_register Src[TGSI_FULL_MAX_SRC_REGISTERS];
-  struct tgsi_texture_offset TexOffsets[TGSI_FULL_MAX_TEX_OFFSETS];
-};
-
-union tgsi_full_token {
-  struct tgsi_token Token;
-  struct tgsi_full_declaration FullDeclaration;
-  struct tgsi_full_immediate FullImmediate;
-  struct tgsi_full_instruction FullInstruction;
-  struct tgsi_full_property FullProperty;
-};
-
-struct tgsi_parse_context {
-  const struct tgsi_token *Tokens;
-  unsigned Position;
-  struct tgsi_full_header FullHeader;
-  union tgsi_full_token FullToken;
-};
-
-#define TGSI_PARSE_OK 0
-#define TGSI_PARSE_ERROR 1
-
-unsigned tgsi_parse_init(struct tgsi_parse_context *ctx,
-                         const struct tgsi_token *tokens);
-
-void tgsi_parse_free(struct tgsi_parse_context *ctx);
-
-boolean tgsi_parse_end_of_tokens(struct tgsi_parse_context *ctx);
-
-void tgsi_parse_token(struct tgsi_parse_context *ctx);
-
-static inline unsigned tgsi_num_tokens(const struct tgsi_token *tokens) {
-  struct tgsi_header header;
-  memcpy(&header, tokens, sizeof(header));
-  return header.HeaderSize + header.BodySize;
-}
-
-void tgsi_dump_tokens(const struct tgsi_token *tokens);
-
-struct tgsi_token *tgsi_dup_tokens(const struct tgsi_token *tokens);
-
-struct tgsi_token *tgsi_alloc_tokens(unsigned num_tokens);
-
-void tgsi_free_tokens(const struct tgsi_token *tokens);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_PARSE_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_sanity.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_sanity.c
deleted file mode 100644
index bc1ead938..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_sanity.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_sanity.h"
-#include "cso_cache/cso_hash.h"
-#include "tgsi_info.h"
-#include "tgsi_iterate.h"
-#include "util/u_debug.h"
-#include "util/u_memory.h"
-#include "util/u_prim.h"
-
-DEBUG_GET_ONCE_BOOL_OPTION(print_sanity, "TGSI_PRINT_SANITY", FALSE)
-
-typedef struct {
-  uint file : 28;
-  /* max 2 dimensions */
-  uint dimensions : 4;
-  uint indices[2];
-} scan_register;
-
-struct sanity_check_ctx {
-  struct tgsi_iterate_context iter;
-  struct cso_hash *regs_decl;
-  struct cso_hash *regs_used;
-  struct cso_hash *regs_ind_used;
-
-  uint num_imms;
-  uint num_instructions;
-  uint index_of_END;
-
-  uint errors;
-  uint warnings;
-  uint implied_array_size;
-
-  boolean print;
-};
-
-static inline unsigned scan_register_key(const scan_register *reg) {
-  unsigned key = reg->file;
-  key |= (reg->indices[0] << 4);
-  key |= (reg->indices[1] << 18);
-
-  return key;
-}
-
-static void fill_scan_register1d(scan_register *reg, uint file, uint index) {
-  reg->file = file;
-  reg->dimensions = 1;
-  reg->indices[0] = index;
-  reg->indices[1] = 0;
-}
-
-static void fill_scan_register2d(scan_register *reg, uint file, uint index1,
-                                 uint index2) {
-  reg->file = file;
-  reg->dimensions = 2;
-  reg->indices[0] = index1;
-  reg->indices[1] = index2;
-}
-
-static void scan_register_dst(scan_register *reg,
-                              struct tgsi_full_dst_register *dst) {
-  if (dst->Register.Dimension) {
-    /*FIXME: right now we don't support indirect
-     * multidimensional addressing */
-    fill_scan_register2d(reg, dst->Register.File, dst->Register.Index,
-                         dst->Dimension.Index);
-  } else {
-    fill_scan_register1d(reg, dst->Register.File, dst->Register.Index);
-  }
-}
-
-static void scan_register_src(scan_register *reg,
-                              struct tgsi_full_src_register *src) {
-  if (src->Register.Dimension) {
-    /*FIXME: right now we don't support indirect
-     * multidimensional addressing */
-    fill_scan_register2d(reg, src->Register.File, src->Register.Index,
-                         src->Dimension.Index);
-  } else {
-    fill_scan_register1d(reg, src->Register.File, src->Register.Index);
-  }
-}
-
-static scan_register *
-create_scan_register_src(struct tgsi_full_src_register *src) {
-  scan_register *reg = MALLOC(sizeof(scan_register));
-  scan_register_src(reg, src);
-
-  return reg;
-}
-
-static scan_register *
-create_scan_register_dst(struct tgsi_full_dst_register *dst) {
-  scan_register *reg = MALLOC(sizeof(scan_register));
-  scan_register_dst(reg, dst);
-
-  return reg;
-}
-
-static void report_error(struct sanity_check_ctx *ctx, const char *format,
-                         ...) {
-  va_list args;
-
-  if (!ctx->print)
-    return;
-
-  debug_printf("Error  : ");
-  va_start(args, format);
-  _debug_vprintf(format, args);
-  va_end(args);
-  debug_printf("\n");
-  ctx->errors++;
-}
-
-static void report_warning(struct sanity_check_ctx *ctx, const char *format,
-                           ...) {
-  va_list args;
-
-  if (!ctx->print)
-    return;
-
-  debug_printf("Warning: ");
-  va_start(args, format);
-  _debug_vprintf(format, args);
-  va_end(args);
-  debug_printf("\n");
-  ctx->warnings++;
-}
-
-static boolean check_file_name(struct sanity_check_ctx *ctx, uint file) {
-  if (file <= TGSI_FILE_NULL || file >= TGSI_FILE_COUNT) {
-    report_error(ctx, "(%u): Invalid register file name", file);
-    return FALSE;
-  }
-  return TRUE;
-}
-
-static boolean is_register_declared(struct sanity_check_ctx *ctx,
-                                    const scan_register *reg) {
-  void *data =
-      cso_hash_find_data_from_template(ctx->regs_decl, scan_register_key(reg),
-                                       (void *)reg, sizeof(scan_register));
-  return data ? TRUE : FALSE;
-}
-
-static boolean is_any_register_declared(struct sanity_check_ctx *ctx,
-                                        uint file) {
-  struct cso_hash_iter iter = cso_hash_first_node(ctx->regs_decl);
-
-  while (!cso_hash_iter_is_null(iter)) {
-    scan_register *reg = (scan_register *)cso_hash_iter_data(iter);
-    if (reg->file == file)
-      return TRUE;
-    iter = cso_hash_iter_next(iter);
-  }
-
-  return FALSE;
-}
-
-static boolean is_register_used(struct sanity_check_ctx *ctx,
-                                scan_register *reg) {
-  void *data = cso_hash_find_data_from_template(
-      ctx->regs_used, scan_register_key(reg), reg, sizeof(scan_register));
-  return data ? TRUE : FALSE;
-}
-
-static boolean is_ind_register_used(struct sanity_check_ctx *ctx,
-                                    scan_register *reg) {
-  return cso_hash_contains(ctx->regs_ind_used, reg->file);
-}
-
-static const char *file_names[TGSI_FILE_COUNT] = {
-    "NULL", "CONST", "IN",   "OUT", "TEMP", "SAMP",
-    "ADDR", "IMM",   "PRED", "SV",  "RES"};
-
-static boolean check_register_usage(struct sanity_check_ctx *ctx,
-                                    scan_register *reg, const char *name,
-                                    boolean indirect_access) {
-  if (!check_file_name(ctx, reg->file)) {
-    FREE(reg);
-    return FALSE;
-  }
-
-  if (indirect_access) {
-    /* Note that 'index' is an offset relative to the value of the
-     * address register.  No range checking done here.*/
-    reg->indices[0] = 0;
-    reg->indices[1] = 0;
-    if (!is_any_register_declared(ctx, reg->file))
-      report_error(ctx, "%s: Undeclared %s register", file_names[reg->file],
-                   name);
-    if (!is_ind_register_used(ctx, reg))
-      cso_hash_insert(ctx->regs_ind_used, reg->file, reg);
-    else
-      FREE(reg);
-  } else {
-    if (!is_register_declared(ctx, reg)) {
-      if (reg->dimensions == 2) {
-        report_error(ctx, "%s[%d][%d]: Undeclared %s register",
-                     file_names[reg->file], reg->indices[0], reg->indices[1],
-                     name);
-      } else {
-        report_error(ctx, "%s[%d]: Undeclared %s register",
-                     file_names[reg->file], reg->indices[0], name);
-      }
-    }
-    if (!is_register_used(ctx, reg))
-      cso_hash_insert(ctx->regs_used, scan_register_key(reg), reg);
-    else
-      FREE(reg);
-  }
-  return TRUE;
-}
-
-static boolean iter_instruction(struct tgsi_iterate_context *iter,
-                                struct tgsi_full_instruction *inst) {
-  struct sanity_check_ctx *ctx = (struct sanity_check_ctx *)iter;
-  const struct tgsi_opcode_info *info;
-  uint i;
-
-  if (inst->Instruction.Opcode == TGSI_OPCODE_END) {
-    if (ctx->index_of_END != ~0u) {
-      report_error(ctx, "Too many END instructions");
-    }
-    ctx->index_of_END = ctx->num_instructions;
-  }
-
-  info = tgsi_get_opcode_info(inst->Instruction.Opcode);
-  if (info == NULL) {
-    report_error(ctx, "(%u): Invalid instruction opcode",
-                 inst->Instruction.Opcode);
-    return TRUE;
-  }
-
-  if (info->num_dst != inst->Instruction.NumDstRegs) {
-    report_error(ctx,
-                 "%s: Invalid number of destination operands, should be %u",
-                 info->mnemonic, info->num_dst);
-  }
-  if (info->num_src != inst->Instruction.NumSrcRegs) {
-    report_error(ctx, "%s: Invalid number of source operands, should be %u",
-                 info->mnemonic, info->num_src);
-  }
-
-  /* Check destination and source registers' validity.
-   * Mark the registers as used.
-   */
-  for (i = 0; i < inst->Instruction.NumDstRegs; i++) {
-    scan_register *reg = create_scan_register_dst(&inst->Dst[i]);
-    check_register_usage(ctx, reg, "destination", FALSE);
-    if (!inst->Dst[i].Register.WriteMask) {
-      report_error(ctx, "Destination register has empty writemask");
-    }
-  }
-  for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
-    scan_register *reg = create_scan_register_src(&inst->Src[i]);
-    check_register_usage(ctx, reg, "source",
-                         (boolean)inst->Src[i].Register.Indirect);
-    if (inst->Src[i].Register.Indirect) {
-      scan_register *ind_reg = MALLOC(sizeof(scan_register));
-
-      fill_scan_register1d(ind_reg, inst->Src[i].Indirect.File,
-                           inst->Src[i].Indirect.Index);
-      check_register_usage(ctx, ind_reg, "indirect", FALSE);
-    }
-  }
-
-  ctx->num_instructions++;
-
-  return TRUE;
-}
-
-static void check_and_declare(struct sanity_check_ctx *ctx,
-                              scan_register *reg) {
-  if (is_register_declared(ctx, reg))
-    report_error(ctx, "%s[%u]: The same register declared more than once",
-                 file_names[reg->file], reg->indices[0]);
-  cso_hash_insert(ctx->regs_decl, scan_register_key(reg), reg);
-}
-
-static boolean iter_declaration(struct tgsi_iterate_context *iter,
-                                struct tgsi_full_declaration *decl) {
-  struct sanity_check_ctx *ctx = (struct sanity_check_ctx *)iter;
-  uint file;
-  uint i;
-
-  /* No declarations allowed after the first instruction.
-   */
-  if (ctx->num_instructions > 0)
-    report_error(ctx, "Instruction expected but declaration found");
-
-  /* Check registers' validity.
-   * Mark the registers as declared.
-   */
-  file = decl->Declaration.File;
-  if (!check_file_name(ctx, file))
-    return TRUE;
-  for (i = decl->Range.First; i <= decl->Range.Last; i++) {
-    /* declared TGSI_FILE_INPUT's for geometry processor
-     * have an implied second dimension */
-    if (file == TGSI_FILE_INPUT &&
-        ctx->iter.processor.Processor == TGSI_PROCESSOR_GEOMETRY) {
-      uint vert;
-      for (vert = 0; vert < ctx->implied_array_size; ++vert) {
-        scan_register *reg = MALLOC(sizeof(scan_register));
-        fill_scan_register2d(reg, file, i, vert);
-        check_and_declare(ctx, reg);
-      }
-    } else {
-      scan_register *reg = MALLOC(sizeof(scan_register));
-      if (decl->Declaration.Dimension) {
-        fill_scan_register2d(reg, file, i, decl->Dim.Index2D);
-      } else {
-        fill_scan_register1d(reg, file, i);
-      }
-      check_and_declare(ctx, reg);
-    }
-  }
-
-  return TRUE;
-}
-
-static boolean iter_immediate(struct tgsi_iterate_context *iter,
-                              struct tgsi_full_immediate *imm) {
-  struct sanity_check_ctx *ctx = (struct sanity_check_ctx *)iter;
-  scan_register *reg;
-
-  /* No immediates allowed after the first instruction.
-   */
-  if (ctx->num_instructions > 0)
-    report_error(ctx, "Instruction expected but immediate found");
-
-  /* Mark the register as declared.
-   */
-  reg = MALLOC(sizeof(scan_register));
-  fill_scan_register1d(reg, TGSI_FILE_IMMEDIATE, ctx->num_imms);
-  cso_hash_insert(ctx->regs_decl, scan_register_key(reg), reg);
-  ctx->num_imms++;
-
-  /* Check data type validity.
-   */
-  if (imm->Immediate.DataType != TGSI_IMM_FLOAT32 &&
-      imm->Immediate.DataType != TGSI_IMM_UINT32 &&
-      imm->Immediate.DataType != TGSI_IMM_INT32 &&
-      imm->Immediate.DataType != TGSI_IMM_FLOAT64) {
-    report_error(ctx, "(%u): Invalid immediate data type",
-                 imm->Immediate.DataType);
-    return TRUE;
-  }
-
-  return TRUE;
-}
-
-static boolean iter_property(struct tgsi_iterate_context *iter,
-                             struct tgsi_full_property *prop) {
-  struct sanity_check_ctx *ctx = (struct sanity_check_ctx *)iter;
-
-  if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY &&
-      prop->Property.PropertyName == TGSI_PROPERTY_GS_INPUT_PRIM) {
-    ctx->implied_array_size = u_vertices_per_prim(prop->u[0].Data);
-  }
-  return TRUE;
-}
-
-static boolean epilog(struct tgsi_iterate_context *iter) {
-  struct sanity_check_ctx *ctx = (struct sanity_check_ctx *)iter;
-
-  /* There must be an END instruction somewhere.
-   */
-  if (ctx->index_of_END == ~0u) {
-    report_error(ctx, "Missing END instruction");
-  }
-
-  /* Check if all declared registers were used.
-   */
-  {
-    struct cso_hash_iter iter = cso_hash_first_node(ctx->regs_decl);
-
-    while (!cso_hash_iter_is_null(iter)) {
-      scan_register *reg = (scan_register *)cso_hash_iter_data(iter);
-      if (!is_register_used(ctx, reg) && !is_ind_register_used(ctx, reg)) {
-        report_warning(ctx, "%s[%u]: Register never used",
-                       file_names[reg->file], reg->indices[0]);
-      }
-      iter = cso_hash_iter_next(iter);
-    }
-  }
-
-  /* Print totals, if any.
-   */
-  if (ctx->errors || ctx->warnings)
-    debug_printf("%u errors, %u warnings\n", ctx->errors, ctx->warnings);
-
-  return TRUE;
-}
-
-static void regs_hash_destroy(struct cso_hash *hash) {
-  struct cso_hash_iter iter = cso_hash_first_node(hash);
-  while (!cso_hash_iter_is_null(iter)) {
-    scan_register *reg = (scan_register *)cso_hash_iter_data(iter);
-    iter = cso_hash_erase(hash, iter);
-    assert(reg->file < TGSI_FILE_COUNT);
-    FREE(reg);
-  }
-  cso_hash_delete(hash);
-}
-
-boolean tgsi_sanity_check(const struct tgsi_token *tokens) {
-  struct sanity_check_ctx ctx;
-  boolean retval;
-
-  ctx.iter.prolog = NULL;
-  ctx.iter.iterate_instruction = iter_instruction;
-  ctx.iter.iterate_declaration = iter_declaration;
-  ctx.iter.iterate_immediate = iter_immediate;
-  ctx.iter.iterate_property = iter_property;
-  ctx.iter.epilog = epilog;
-
-  ctx.regs_decl = cso_hash_create();
-  ctx.regs_used = cso_hash_create();
-  ctx.regs_ind_used = cso_hash_create();
-
-  ctx.num_imms = 0;
-  ctx.num_instructions = 0;
-  ctx.index_of_END = ~0;
-
-  ctx.errors = 0;
-  ctx.warnings = 0;
-  ctx.implied_array_size = 0;
-  ctx.print = debug_get_option_print_sanity();
-
-  retval = tgsi_iterate_shader(tokens, &ctx.iter);
-  regs_hash_destroy(ctx.regs_decl);
-  regs_hash_destroy(ctx.regs_used);
-  regs_hash_destroy(ctx.regs_ind_used);
-  if (retval == FALSE)
-    return FALSE;
-
-  return ctx.errors == 0;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_sanity.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_sanity.h
deleted file mode 100644
index 325c7d0b1..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_sanity.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_SANITY_H
-#define TGSI_SANITY_H
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-#include "pipe/p_compiler.h"
-
-struct tgsi_token;
-
-/* Check the given token stream for errors and common mistakes.
- * Diagnostic messages are printed out to the debug output, and is
- * controlled by the debug option TGSI_PRINT_SANITY (default false).
- * Returns TRUE if there are no errors, even though there could be some
- * warnings.
- */
-boolean tgsi_sanity_check(const struct tgsi_token *tokens);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_SANITY_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_scan.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_scan.c
deleted file mode 100644
index c012de90c..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- * Copyright 2008 VMware, Inc.  All rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * TGSI program scan utility.
- * Used to determine which registers and instructions are used by a shader.
- *
- * Authors:  Brian Paul
- */
-
-#include "tgsi/tgsi_scan.h"
-#include "tgsi/tgsi_parse.h"
-#include "tgsi/tgsi_util.h"
-#include "util/u_debug.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-#include "util/u_prim.h"
-
-/**
- * Scan the given TGSI shader to collect information such as number of
- * registers used, special instructions used, etc.
- * \return info  the result of the scan
- */
-void tgsi_scan_shader(const struct tgsi_token *tokens,
-                      struct tgsi_shader_info *info) {
-  uint procType, i;
-  struct tgsi_parse_context parse;
-  unsigned current_depth = 0;
-
-  memset(info, 0, sizeof(*info));
-  for (i = 0; i < TGSI_FILE_COUNT; i++)
-    info->file_max[i] = -1;
-  for (i = 0; i < Elements(info->const_file_max); i++)
-    info->const_file_max[i] = -1;
-  info->properties[TGSI_PROPERTY_GS_INVOCATIONS] = 1;
-
-  /**
-   ** Setup to begin parsing input shader
-   **/
-  if (tgsi_parse_init(&parse, tokens) != TGSI_PARSE_OK) {
-    debug_printf("tgsi_parse_init() failed in tgsi_scan_shader()!\n");
-    return;
-  }
-  procType = parse.FullHeader.Processor.Processor;
-  assert(procType == TGSI_PROCESSOR_FRAGMENT ||
-         procType == TGSI_PROCESSOR_VERTEX ||
-         procType == TGSI_PROCESSOR_GEOMETRY ||
-         procType == TGSI_PROCESSOR_TESS_CTRL ||
-         procType == TGSI_PROCESSOR_TESS_EVAL ||
-         procType == TGSI_PROCESSOR_COMPUTE);
-  info->processor = procType;
-
-  /**
-   ** Loop over incoming program tokens/instructions
-   */
-  while (!tgsi_parse_end_of_tokens(&parse)) {
-
-    info->num_tokens++;
-
-    tgsi_parse_token(&parse);
-
-    switch (parse.FullToken.Token.Type) {
-    case TGSI_TOKEN_TYPE_INSTRUCTION: {
-      const struct tgsi_full_instruction *fullinst =
-          &parse.FullToken.FullInstruction;
-      uint i;
-
-      assert(fullinst->Instruction.Opcode < TGSI_OPCODE_LAST);
-      info->opcode_count[fullinst->Instruction.Opcode]++;
-
-      switch (fullinst->Instruction.Opcode) {
-      case TGSI_OPCODE_IF:
-      case TGSI_OPCODE_UIF:
-      case TGSI_OPCODE_BGNLOOP:
-        current_depth++;
-        info->max_depth = MAX2(info->max_depth, current_depth);
-        break;
-      case TGSI_OPCODE_ENDIF:
-      case TGSI_OPCODE_ENDLOOP:
-        current_depth--;
-        break;
-      default:
-        break;
-      }
-
-      if (fullinst->Instruction.Opcode == TGSI_OPCODE_INTERP_CENTROID ||
-          fullinst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
-          fullinst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE) {
-        const struct tgsi_full_src_register *src0 = &fullinst->Src[0];
-        unsigned input;
-
-        if (src0->Register.Indirect && src0->Indirect.ArrayID)
-          input = info->input_array_first[src0->Indirect.ArrayID];
-        else
-          input = src0->Register.Index;
-
-        /* For the INTERP opcodes, the interpolation is always
-         * PERSPECTIVE unless LINEAR is specified.
-         */
-        switch (info->input_interpolate[input]) {
-        case TGSI_INTERPOLATE_COLOR:
-        case TGSI_INTERPOLATE_CONSTANT:
-        case TGSI_INTERPOLATE_PERSPECTIVE:
-          switch (fullinst->Instruction.Opcode) {
-          case TGSI_OPCODE_INTERP_CENTROID:
-            info->uses_persp_opcode_interp_centroid = true;
-            break;
-          case TGSI_OPCODE_INTERP_OFFSET:
-            info->uses_persp_opcode_interp_offset = true;
-            break;
-          case TGSI_OPCODE_INTERP_SAMPLE:
-            info->uses_persp_opcode_interp_sample = true;
-            break;
-          }
-          break;
-
-        case TGSI_INTERPOLATE_LINEAR:
-          switch (fullinst->Instruction.Opcode) {
-          case TGSI_OPCODE_INTERP_CENTROID:
-            info->uses_linear_opcode_interp_centroid = true;
-            break;
-          case TGSI_OPCODE_INTERP_OFFSET:
-            info->uses_linear_opcode_interp_offset = true;
-            break;
-          case TGSI_OPCODE_INTERP_SAMPLE:
-            info->uses_linear_opcode_interp_sample = true;
-            break;
-          }
-          break;
-        }
-      }
-
-      if (fullinst->Instruction.Opcode >= TGSI_OPCODE_F2D &&
-          fullinst->Instruction.Opcode <= TGSI_OPCODE_DSSG)
-        info->uses_doubles = true;
-
-      for (i = 0; i < fullinst->Instruction.NumSrcRegs; i++) {
-        const struct tgsi_full_src_register *src = &fullinst->Src[i];
-        int ind = src->Register.Index;
-
-        /* Mark which inputs are effectively used */
-        if (src->Register.File == TGSI_FILE_INPUT) {
-          unsigned usage_mask;
-          usage_mask = tgsi_util_get_inst_usage_mask(fullinst, i);
-          if (src->Register.Indirect) {
-            for (ind = 0; ind < info->num_inputs; ++ind) {
-              info->input_usage_mask[ind] |= usage_mask;
-            }
-          } else {
-            assert(ind >= 0);
-            assert(ind < PIPE_MAX_SHADER_INPUTS);
-            info->input_usage_mask[ind] |= usage_mask;
-          }
-
-          if (procType == TGSI_PROCESSOR_FRAGMENT && info->reads_position &&
-              src->Register.Index == 0 &&
-              (src->Register.SwizzleX == TGSI_SWIZZLE_Z ||
-               src->Register.SwizzleY == TGSI_SWIZZLE_Z ||
-               src->Register.SwizzleZ == TGSI_SWIZZLE_Z ||
-               src->Register.SwizzleW == TGSI_SWIZZLE_Z)) {
-            info->reads_z = TRUE;
-          }
-        }
-
-        /* check for indirect register reads */
-        if (src->Register.Indirect) {
-          info->indirect_files |= (1 << src->Register.File);
-          info->indirect_files_read |= (1 << src->Register.File);
-        }
-
-        if (src->Register.Dimension && src->Dimension.Indirect) {
-          info->dimension_indirect_files |= (1 << src->Register.File);
-        }
-        /* MSAA samplers */
-        if (src->Register.File == TGSI_FILE_SAMPLER) {
-          assert(fullinst->Instruction.Texture);
-          assert((unsigned)src->Register.Index <
-                 Elements(info->is_msaa_sampler));
-
-          if (fullinst->Instruction.Texture &&
-              (fullinst->Texture.Texture == TGSI_TEXTURE_2D_MSAA ||
-               fullinst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY_MSAA)) {
-            info->is_msaa_sampler[src->Register.Index] = TRUE;
-          }
-        }
-      }
-
-      /* check for indirect register writes */
-      for (i = 0; i < fullinst->Instruction.NumDstRegs; i++) {
-        const struct tgsi_full_dst_register *dst = &fullinst->Dst[i];
-        if (dst->Register.Indirect) {
-          info->indirect_files |= (1 << dst->Register.File);
-          info->indirect_files_written |= (1 << dst->Register.File);
-        }
-        if (dst->Register.Dimension && dst->Dimension.Indirect)
-          info->dimension_indirect_files |= (1 << dst->Register.File);
-      }
-
-      info->num_instructions++;
-    } break;
-
-    case TGSI_TOKEN_TYPE_DECLARATION: {
-      const struct tgsi_full_declaration *fulldecl =
-          &parse.FullToken.FullDeclaration;
-      const uint file = fulldecl->Declaration.File;
-      uint reg;
-
-      if (fulldecl->Declaration.Array) {
-        unsigned array_id = fulldecl->Array.ArrayID;
-
-        switch (file) {
-        case TGSI_FILE_INPUT:
-          assert(array_id < ARRAY_SIZE(info->input_array_first));
-          info->input_array_first[array_id] = fulldecl->Range.First;
-          info->input_array_last[array_id] = fulldecl->Range.Last;
-          break;
-        case TGSI_FILE_OUTPUT:
-          assert(array_id < ARRAY_SIZE(info->output_array_first));
-          info->output_array_first[array_id] = fulldecl->Range.First;
-          info->output_array_last[array_id] = fulldecl->Range.Last;
-          break;
-        }
-        info->array_max[file] = MAX2(info->array_max[file], array_id);
-      }
-
-      for (reg = fulldecl->Range.First; reg <= fulldecl->Range.Last; reg++) {
-        unsigned semName = fulldecl->Semantic.Name;
-        unsigned semIndex =
-            fulldecl->Semantic.Index + (reg - fulldecl->Range.First);
-
-        /* only first 32 regs will appear in this bitfield */
-        info->file_mask[file] |= (1 << reg);
-        info->file_count[file]++;
-        info->file_max[file] = MAX2(info->file_max[file], (int)reg);
-
-        if (file == TGSI_FILE_CONSTANT) {
-          int buffer = 0;
-
-          if (fulldecl->Declaration.Dimension)
-            buffer = fulldecl->Dim.Index2D;
-
-          info->const_file_max[buffer] =
-              MAX2(info->const_file_max[buffer], (int)reg);
-        } else if (file == TGSI_FILE_INPUT) {
-          info->input_semantic_name[reg] = (ubyte)semName;
-          info->input_semantic_index[reg] = (ubyte)semIndex;
-          info->input_interpolate[reg] = (ubyte)fulldecl->Interp.Interpolate;
-          info->input_interpolate_loc[reg] = (ubyte)fulldecl->Interp.Location;
-          info->input_cylindrical_wrap[reg] =
-              (ubyte)fulldecl->Interp.CylindricalWrap;
-          info->num_inputs++;
-
-          /* Only interpolated varyings. Don't include POSITION.
-           * Don't include integer varyings, because they are not
-           * interpolated.
-           */
-          if (semName == TGSI_SEMANTIC_GENERIC ||
-              semName == TGSI_SEMANTIC_TEXCOORD ||
-              semName == TGSI_SEMANTIC_COLOR ||
-              semName == TGSI_SEMANTIC_BCOLOR || semName == TGSI_SEMANTIC_FOG ||
-              semName == TGSI_SEMANTIC_CLIPDIST ||
-              semName == TGSI_SEMANTIC_CULLDIST) {
-            switch (fulldecl->Interp.Interpolate) {
-            case TGSI_INTERPOLATE_COLOR:
-            case TGSI_INTERPOLATE_PERSPECTIVE:
-              switch (fulldecl->Interp.Location) {
-              case TGSI_INTERPOLATE_LOC_CENTER:
-                info->uses_persp_center = true;
-                break;
-              case TGSI_INTERPOLATE_LOC_CENTROID:
-                info->uses_persp_centroid = true;
-                break;
-              case TGSI_INTERPOLATE_LOC_SAMPLE:
-                info->uses_persp_sample = true;
-                break;
-              }
-              break;
-            case TGSI_INTERPOLATE_LINEAR:
-              switch (fulldecl->Interp.Location) {
-              case TGSI_INTERPOLATE_LOC_CENTER:
-                info->uses_linear_center = true;
-                break;
-              case TGSI_INTERPOLATE_LOC_CENTROID:
-                info->uses_linear_centroid = true;
-                break;
-              case TGSI_INTERPOLATE_LOC_SAMPLE:
-                info->uses_linear_sample = true;
-                break;
-              }
-              break;
-              /* TGSI_INTERPOLATE_CONSTANT doesn't do any interpolation. */
-            }
-          }
-
-          if (semName == TGSI_SEMANTIC_PRIMID)
-            info->uses_primid = TRUE;
-          else if (procType == TGSI_PROCESSOR_FRAGMENT) {
-            if (semName == TGSI_SEMANTIC_POSITION)
-              info->reads_position = TRUE;
-            else if (semName == TGSI_SEMANTIC_FACE)
-              info->uses_frontface = TRUE;
-          }
-        } else if (file == TGSI_FILE_SYSTEM_VALUE) {
-          unsigned index = fulldecl->Range.First;
-
-          info->system_value_semantic_name[index] = semName;
-          info->num_system_values = MAX2(info->num_system_values, index + 1);
-
-          if (semName == TGSI_SEMANTIC_INSTANCEID) {
-            info->uses_instanceid = TRUE;
-          } else if (semName == TGSI_SEMANTIC_VERTEXID) {
-            info->uses_vertexid = TRUE;
-          } else if (semName == TGSI_SEMANTIC_VERTEXID_NOBASE) {
-            info->uses_vertexid_nobase = TRUE;
-          } else if (semName == TGSI_SEMANTIC_BASEVERTEX) {
-            info->uses_basevertex = TRUE;
-          } else if (semName == TGSI_SEMANTIC_PRIMID) {
-            info->uses_primid = TRUE;
-          } else if (semName == TGSI_SEMANTIC_INVOCATIONID) {
-            info->uses_invocationid = TRUE;
-          }
-        } else if (file == TGSI_FILE_OUTPUT) {
-          info->output_semantic_name[reg] = (ubyte)semName;
-          info->output_semantic_index[reg] = (ubyte)semIndex;
-          info->num_outputs++;
-
-          if (semName == TGSI_SEMANTIC_COLOR)
-            info->colors_written |= 1 << semIndex;
-
-          if (procType == TGSI_PROCESSOR_VERTEX ||
-              procType == TGSI_PROCESSOR_GEOMETRY ||
-              procType == TGSI_PROCESSOR_TESS_CTRL ||
-              procType == TGSI_PROCESSOR_TESS_EVAL) {
-            if (semName == TGSI_SEMANTIC_VIEWPORT_INDEX) {
-              info->writes_viewport_index = TRUE;
-            } else if (semName == TGSI_SEMANTIC_LAYER) {
-              info->writes_layer = TRUE;
-            } else if (semName == TGSI_SEMANTIC_PSIZE) {
-              info->writes_psize = TRUE;
-            } else if (semName == TGSI_SEMANTIC_CLIPVERTEX) {
-              info->writes_clipvertex = TRUE;
-            }
-          }
-
-          if (procType == TGSI_PROCESSOR_FRAGMENT) {
-            if (semName == TGSI_SEMANTIC_POSITION) {
-              info->writes_z = TRUE;
-            } else if (semName == TGSI_SEMANTIC_STENCIL) {
-              info->writes_stencil = TRUE;
-            }
-          }
-
-          if (procType == TGSI_PROCESSOR_VERTEX) {
-            if (semName == TGSI_SEMANTIC_EDGEFLAG) {
-              info->writes_edgeflag = TRUE;
-            }
-          }
-        } else if (file == TGSI_FILE_SAMPLER) {
-          info->samplers_declared |= 1 << reg;
-        }
-      }
-    } break;
-
-    case TGSI_TOKEN_TYPE_IMMEDIATE: {
-      uint reg = info->immediate_count++;
-      uint file = TGSI_FILE_IMMEDIATE;
-
-      info->file_mask[file] |= (1 << reg);
-      info->file_count[file]++;
-      info->file_max[file] = MAX2(info->file_max[file], (int)reg);
-    } break;
-
-    case TGSI_TOKEN_TYPE_PROPERTY: {
-      const struct tgsi_full_property *fullprop = &parse.FullToken.FullProperty;
-      unsigned name = fullprop->Property.PropertyName;
-      unsigned value = fullprop->u[0].Data;
-
-      assert(name < Elements(info->properties));
-      info->properties[name] = value;
-
-      switch (name) {
-      case TGSI_PROPERTY_NUM_CLIPDIST_ENABLED:
-        info->num_written_clipdistance = value;
-        info->clipdist_writemask |= (1 << value) - 1;
-        break;
-      case TGSI_PROPERTY_NUM_CULLDIST_ENABLED:
-        info->num_written_culldistance = value;
-        info->culldist_writemask |= (1 << value) - 1;
-        break;
-      }
-    } break;
-
-    default:
-      assert(0);
-    }
-  }
-
-  info->uses_kill = (info->opcode_count[TGSI_OPCODE_KILL_IF] ||
-                     info->opcode_count[TGSI_OPCODE_KILL]);
-
-  /* The dimensions of the IN decleration in geometry shader have
-   * to be deduced from the type of the input primitive.
-   */
-  if (procType == TGSI_PROCESSOR_GEOMETRY) {
-    unsigned input_primitive = info->properties[TGSI_PROPERTY_GS_INPUT_PRIM];
-    int num_verts = u_vertices_per_prim(input_primitive);
-    int j;
-    info->file_count[TGSI_FILE_INPUT] = num_verts;
-    info->file_max[TGSI_FILE_INPUT] =
-        MAX2(info->file_max[TGSI_FILE_INPUT], num_verts - 1);
-    for (j = 0; j < num_verts; ++j) {
-      info->file_mask[TGSI_FILE_INPUT] |= (1 << j);
-    }
-  }
-
-  tgsi_parse_free(&parse);
-}
-
-/**
- * Check if the given shader is a "passthrough" shader consisting of only
- * MOV instructions of the form:  MOV OUT[n], IN[n]
- *
- */
-boolean tgsi_is_passthrough_shader(const struct tgsi_token *tokens) {
-  struct tgsi_parse_context parse;
-
-  /**
-   ** Setup to begin parsing input shader
-   **/
-  if (tgsi_parse_init(&parse, tokens) != TGSI_PARSE_OK) {
-    debug_printf("tgsi_parse_init() failed in tgsi_is_passthrough_shader()!\n");
-    return FALSE;
-  }
-
-  /**
-   ** Loop over incoming program tokens/instructions
-   */
-  while (!tgsi_parse_end_of_tokens(&parse)) {
-
-    tgsi_parse_token(&parse);
-
-    switch (parse.FullToken.Token.Type) {
-    case TGSI_TOKEN_TYPE_INSTRUCTION: {
-      struct tgsi_full_instruction *fullinst = &parse.FullToken.FullInstruction;
-      const struct tgsi_full_src_register *src = &fullinst->Src[0];
-      const struct tgsi_full_dst_register *dst = &fullinst->Dst[0];
-
-      /* Do a whole bunch of checks for a simple move */
-      if (fullinst->Instruction.Opcode != TGSI_OPCODE_MOV ||
-          (src->Register.File != TGSI_FILE_INPUT &&
-           src->Register.File != TGSI_FILE_SYSTEM_VALUE) ||
-          dst->Register.File != TGSI_FILE_OUTPUT ||
-          src->Register.Index != dst->Register.Index ||
-
-          src->Register.Negate || src->Register.Absolute ||
-
-          src->Register.SwizzleX != TGSI_SWIZZLE_X ||
-          src->Register.SwizzleY != TGSI_SWIZZLE_Y ||
-          src->Register.SwizzleZ != TGSI_SWIZZLE_Z ||
-          src->Register.SwizzleW != TGSI_SWIZZLE_W ||
-
-          dst->Register.WriteMask != TGSI_WRITEMASK_XYZW) {
-        tgsi_parse_free(&parse);
-        return FALSE;
-      }
-    } break;
-
-    case TGSI_TOKEN_TYPE_DECLARATION:
-      /* fall-through */
-    case TGSI_TOKEN_TYPE_IMMEDIATE:
-      /* fall-through */
-    case TGSI_TOKEN_TYPE_PROPERTY:
-      /* fall-through */
-    default:; /* no-op */
-    }
-  }
-
-  tgsi_parse_free(&parse);
-
-  /* if we get here, it's a pass-through shader */
-  return TRUE;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_scan.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_scan.h
deleted file mode 100644
index d8c98c57f..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_SCAN_H
-#define TGSI_SCAN_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Shader summary info
- */
-struct tgsi_shader_info {
-  uint num_tokens;
-
-  ubyte num_inputs;
-  ubyte num_outputs;
-  ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; /**< TGSI_SEMANTIC_x */
-  ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
-  ubyte input_interpolate[PIPE_MAX_SHADER_INPUTS];
-  ubyte input_interpolate_loc[PIPE_MAX_SHADER_INPUTS];
-  ubyte input_usage_mask[PIPE_MAX_SHADER_INPUTS];
-  ubyte input_cylindrical_wrap[PIPE_MAX_SHADER_INPUTS];
-  ubyte output_semantic_name[PIPE_MAX_SHADER_OUTPUTS]; /**< TGSI_SEMANTIC_x */
-  ubyte output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
-
-  ubyte num_system_values;
-  ubyte system_value_semantic_name[PIPE_MAX_SHADER_INPUTS];
-
-  ubyte processor;
-
-  uint file_mask[TGSI_FILE_COUNT];  /**< bitmask of declared registers */
-  uint file_count[TGSI_FILE_COUNT]; /**< number of declared registers */
-  int file_max[TGSI_FILE_COUNT];    /**< highest index of declared registers */
-  int const_file_max[PIPE_MAX_CONSTANT_BUFFERS];
-  unsigned samplers_declared; /**< bitmask of declared samplers */
-
-  ubyte input_array_first[PIPE_MAX_SHADER_INPUTS];
-  ubyte input_array_last[PIPE_MAX_SHADER_INPUTS];
-  ubyte output_array_first[PIPE_MAX_SHADER_OUTPUTS];
-  ubyte output_array_last[PIPE_MAX_SHADER_OUTPUTS];
-  unsigned
-      array_max[TGSI_FILE_COUNT]; /**< highest index array per register file */
-
-  uint immediate_count; /**< number of immediates declared */
-  uint num_instructions;
-
-  uint opcode_count[TGSI_OPCODE_LAST]; /**< opcode histogram */
-
-  ubyte colors_written;
-  boolean reads_position;  /**< does fragment shader read position? */
-  boolean reads_z;         /**< does fragment shader read depth? */
-  boolean writes_z;        /**< does fragment shader write Z value? */
-  boolean writes_stencil;  /**< does fragment shader write stencil value? */
-  boolean writes_edgeflag; /**< vertex shader outputs edgeflag */
-  boolean uses_kill;       /**< KILL or KILL_IF instruction used? */
-  boolean uses_persp_center;
-  boolean uses_persp_centroid;
-  boolean uses_persp_sample;
-  boolean uses_linear_center;
-  boolean uses_linear_centroid;
-  boolean uses_linear_sample;
-  boolean uses_persp_opcode_interp_centroid;
-  boolean uses_persp_opcode_interp_offset;
-  boolean uses_persp_opcode_interp_sample;
-  boolean uses_linear_opcode_interp_centroid;
-  boolean uses_linear_opcode_interp_offset;
-  boolean uses_linear_opcode_interp_sample;
-  boolean uses_instanceid;
-  boolean uses_vertexid;
-  boolean uses_vertexid_nobase;
-  boolean uses_basevertex;
-  boolean uses_primid;
-  boolean uses_frontface;
-  boolean uses_invocationid;
-  boolean writes_psize;
-  boolean writes_clipvertex;
-  boolean writes_viewport_index;
-  boolean writes_layer;
-  boolean is_msaa_sampler[PIPE_MAX_SAMPLERS];
-  boolean uses_doubles; /**< uses any of the double instructions */
-  unsigned clipdist_writemask;
-  unsigned culldist_writemask;
-  unsigned num_written_culldistance;
-  unsigned num_written_clipdistance;
-  /**
-   * Bitmask indicating which register files are accessed with
-   * indirect addressing.  The bits are (1 << TGSI_FILE_x), etc.
-   */
-  unsigned indirect_files;
-  /**
-   * Bitmask indicating which register files are read / written with
-   * indirect addressing.  The bits are (1 << TGSI_FILE_x).
-   */
-  unsigned indirect_files_read;
-  unsigned indirect_files_written;
-
-  unsigned dimension_indirect_files;
-
-  unsigned properties[TGSI_PROPERTY_COUNT]; /* index with TGSI_PROPERTY_ */
-
-  /**
-   * Max nesting limit of loops/if's
-   */
-  unsigned max_depth;
-};
-
-extern void tgsi_scan_shader(const struct tgsi_token *tokens,
-                             struct tgsi_shader_info *info);
-
-extern boolean tgsi_is_passthrough_shader(const struct tgsi_token *tokens);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif /* TGSI_SCAN_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_strings.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_strings.c
deleted file mode 100644
index 2aec87b49..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * Copyright 2012 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_strings.h"
-#include "pipe/p_compiler.h"
-#include "util/u_memory.h"
-
-const char *tgsi_processor_type_names[6] = {"FRAG",      "VERT",      "GEOM",
-                                            "TESS_CTRL", "TESS_EVAL", "COMP"};
-
-static const char *tgsi_file_names[] = {
-    "NULL", "CONST", "IN",    "OUT",   "TEMP",   "SAMP",   "ADDR",     "IMM",
-    "PRED", "SV",    "IMAGE", "SVIEW", "BUFFER", "MEMORY", "HWATOMIC",
-};
-
-const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] = {
-    "POSITION",        "COLOR",          "BCOLOR",     "FOG",
-    "PSIZE",           "GENERIC",        "NORMAL",     "FACE",
-    "EDGEFLAG",        "PRIM_ID",        "INSTANCEID", "VERTEXID",
-    "STENCIL",         "CLIPDIST",       "CLIPVERTEX", "GRID_SIZE",
-    "BLOCK_ID",        "BLOCK_SIZE",     "THREAD_ID",  "TEXCOORD",
-    "PCOORD",          "VIEWPORT_INDEX", "LAYER",      "CULLDIST",
-    "SAMPLEID",        "SAMPLEPOS",      "SAMPLEMASK", "INVOCATIONID",
-    "VERTEXID_NOBASE", "BASEVERTEX",     "PATCH",      "TESSCOORD",
-    "TESSOUTER",       "TESSINNER",      "VERTICESIN", "HELPER_INVOCATION",
-};
-
-const char *tgsi_texture_names[TGSI_TEXTURE_COUNT] = {
-    "BUFFER",
-    "1D",
-    "2D",
-    "3D",
-    "CUBE",
-    "RECT",
-    "SHADOW1D",
-    "SHADOW2D",
-    "SHADOWRECT",
-    "1D_ARRAY",
-    "2D_ARRAY",
-    "SHADOW1D_ARRAY",
-    "SHADOW2D_ARRAY",
-    "SHADOWCUBE",
-    "2D_MSAA",
-    "2D_ARRAY_MSAA",
-    "CUBEARRAY",
-    "SHADOWCUBEARRAY",
-    "UNKNOWN",
-};
-
-const char *tgsi_property_names[TGSI_PROPERTY_COUNT] = {
-    "GS_INPUT_PRIMITIVE",
-    "GS_OUTPUT_PRIMITIVE",
-    "GS_MAX_OUTPUT_VERTICES",
-    "FS_COORD_ORIGIN",
-    "FS_COORD_PIXEL_CENTER",
-    "FS_COLOR0_WRITES_ALL_CBUFS",
-    "FS_DEPTH_LAYOUT",
-    "VS_PROHIBIT_UCPS",
-    "GS_INVOCATIONS",
-    "VS_WINDOW_SPACE_POSITION",
-    "TCS_VERTICES_OUT",
-    "TES_PRIM_MODE",
-    "TES_SPACING",
-    "TES_VERTEX_ORDER_CW",
-    "TES_POINT_MODE",
-    "NUM_CLIPDIST_ENABLED",
-    "NUM_CULLDIST_ENABLED",
-    "FS_EARLY_DEPTH_STENCIL",
-    "FS_POST_DEPTH_COVERAGE",
-    "NEXT_SHADER",
-    "CS_FIXED_BLOCK_WIDTH",
-    "CS_FIXED_BLOCK_HEIGHT",
-    "CS_FIXED_BLOCK_DEPTH",
-    "MUL_ZERO_WINS",
-};
-
-const char *tgsi_return_type_names[TGSI_RETURN_TYPE_COUNT] = {
-    "UNORM", "SNORM", "SINT", "UINT", "FLOAT"};
-
-const char *tgsi_interpolate_names[TGSI_INTERPOLATE_COUNT] = {
-    "CONSTANT", "LINEAR", "PERSPECTIVE", "COLOR"};
-
-const char *tgsi_interpolate_locations[TGSI_INTERPOLATE_LOC_COUNT] = {
-    "CENTER",
-    "CENTROID",
-    "SAMPLE",
-};
-
-const char *tgsi_invariant_name = "INVARIANT";
-
-const char *tgsi_primitive_names[PIPE_PRIM_MAX] = {
-    "POINTS",
-    "LINES",
-    "LINE_LOOP",
-    "LINE_STRIP",
-    "TRIANGLES",
-    "TRIANGLE_STRIP",
-    "TRIANGLE_FAN",
-    "QUADS",
-    "QUAD_STRIP",
-    "POLYGON",
-    "LINES_ADJACENCY",
-    "LINE_STRIP_ADJACENCY",
-    "TRIANGLES_ADJACENCY",
-    "TRIANGLE_STRIP_ADJACENCY",
-    "PATCHES",
-};
-
-const char *tgsi_fs_coord_origin_names[2] = {"UPPER_LEFT", "LOWER_LEFT"};
-
-const char *tgsi_fs_coord_pixel_center_names[2] = {"HALF_INTEGER", "INTEGER"};
-
-const char *tgsi_immediate_type_names[4] = {"FLT32", "UINT32", "INT32",
-                                            "FLT64"};
-
-const char *tgsi_memory_names[3] = {
-    "COHERENT",
-    "RESTRICT",
-    "VOLATILE",
-};
-
-static inline void tgsi_strings_check(void) {
-  STATIC_ASSERT(Elements(tgsi_semantic_names) == TGSI_SEMANTIC_COUNT);
-  STATIC_ASSERT(Elements(tgsi_texture_names) == TGSI_TEXTURE_COUNT);
-  STATIC_ASSERT(Elements(tgsi_property_names) == TGSI_PROPERTY_COUNT);
-  STATIC_ASSERT(Elements(tgsi_primitive_names) == PIPE_PRIM_MAX);
-  STATIC_ASSERT(Elements(tgsi_interpolate_names) == TGSI_INTERPOLATE_COUNT);
-  STATIC_ASSERT(Elements(tgsi_return_type_names) == TGSI_RETURN_TYPE_COUNT);
-  (void)tgsi_processor_type_names;
-  (void)tgsi_return_type_names;
-  (void)tgsi_immediate_type_names;
-  (void)tgsi_fs_coord_origin_names;
-  (void)tgsi_fs_coord_pixel_center_names;
-}
-
-const char *tgsi_file_name(unsigned file) {
-  STATIC_ASSERT(Elements(tgsi_file_names) == TGSI_FILE_COUNT);
-  if (file < Elements(tgsi_file_names))
-    return tgsi_file_names[file];
-  else
-    return "invalid file";
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_strings.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_strings.h
deleted file mode 100644
index 5e1442884..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_strings.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * Copyright 2012 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_STRINGS_H
-#define TGSI_STRINGS_H
-
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-extern const char *tgsi_processor_type_names[6];
-
-extern const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT];
-
-extern const char *tgsi_texture_names[TGSI_TEXTURE_COUNT];
-
-extern const char *tgsi_property_names[TGSI_PROPERTY_COUNT];
-
-extern const char *tgsi_return_type_names[TGSI_RETURN_TYPE_COUNT];
-
-extern const char *tgsi_interpolate_names[TGSI_INTERPOLATE_COUNT];
-
-extern const char *tgsi_interpolate_locations[TGSI_INTERPOLATE_LOC_COUNT];
-
-extern const char *tgsi_invariant_name;
-
-extern const char *tgsi_primitive_names[PIPE_PRIM_MAX];
-
-extern const char *tgsi_fs_coord_origin_names[2];
-
-extern const char *tgsi_fs_coord_pixel_center_names[2];
-
-extern const char *tgsi_immediate_type_names[4];
-
-extern const char *tgsi_memory_names[3];
-
-const char *tgsi_file_name(unsigned file);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_STRINGS_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_text.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_text.c
deleted file mode 100644
index 42fee715a..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_text.c
+++ /dev/null
@@ -1,1767 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_text.h"
-#include "pipe/p_defines.h"
-#include "tgsi_build.h"
-#include "tgsi_dump.h"
-#include "tgsi_info.h"
-#include "tgsi_parse.h"
-#include "tgsi_sanity.h"
-#include "tgsi_strings.h"
-#include "tgsi_util.h"
-#include "util/u_debug.h"
-#include "util/u_inlines.h"
-#include "util/u_memory.h"
-#include "util/u_prim.h"
-
-static boolean is_alpha_underscore(const char *cur) {
-  return (*cur >= 'a' && *cur <= 'z') || (*cur >= 'A' && *cur <= 'Z') ||
-         *cur == '_';
-}
-
-static boolean is_digit(const char *cur) { return *cur >= '0' && *cur <= '9'; }
-
-static boolean is_digit_alpha_underscore(const char *cur) {
-  return is_digit(cur) || is_alpha_underscore(cur);
-}
-
-static char uprcase(char c) {
-  if (c >= 'a' && c <= 'z')
-    return c + 'A' - 'a';
-  return c;
-}
-
-/*
- * Ignore case of str1 and assume str1 is already uppercase.
- * Return TRUE iff str1 and str2 are equal.
- */
-static int streq_nocase_uprcase(const char *str1, const char *str2) {
-  while (*str1 && *str2) {
-    if (*str1 != uprcase(*str2))
-      return FALSE;
-    str1++;
-    str2++;
-  }
-  return *str1 == 0 && *str2 == 0;
-}
-
-/* Return TRUE if both strings match.
- * The second string is terminated by zero.
- * The pointer to the first string is moved at end of the read word
- * on success.
- */
-static boolean str_match_no_case(const char **pcur, const char *str) {
-  const char *cur = *pcur;
-
-  while (*str != '\0' && *str == uprcase(*cur)) {
-    str++;
-    cur++;
-  }
-  if (*str == '\0') {
-    *pcur = cur;
-    return TRUE;
-  }
-  return FALSE;
-}
-
-/* Return TRUE if both strings match.
- * The first string is be terminated by a non-digit non-letter non-underscore
- * character, the second string is terminated by zero.
- * The pointer to the first string is moved at end of the read word
- * on success.
- */
-static boolean str_match_nocase_whole(const char **pcur, const char *str) {
-  const char *cur = *pcur;
-
-  if (str_match_no_case(&cur, str) && !is_digit_alpha_underscore(cur)) {
-    *pcur = cur;
-    return TRUE;
-  }
-  return FALSE;
-}
-
-/* Return the array index that matches starting at *pcur, where the string at
- * *pcur is terminated by a non-digit non-letter non-underscore.
- * Returns -1 if no match is found.
- *
- * On success, the pointer to the first string is moved to the end of the read
- * word.
- */
-static int str_match_name_from_array(const char **pcur,
-                                     const char *const *array,
-                                     unsigned array_size) {
-  for (unsigned j = 0; j < array_size; ++j) {
-    if (str_match_nocase_whole(pcur, array[j]))
-      return j;
-  }
-  return -1;
-}
-
-/* Return the format corresponding to the name at *pcur.
- * Returns -1 if there is no format name.
- *
- * On success, the pointer to the string is moved to the end of the read format
- * name.
- */
-static int str_match_format(const char **pcur) {
-  for (unsigned i = 0; i < PIPE_FORMAT_COUNT; i++) {
-    const struct util_format_description *desc = util_format_description(i);
-    if (desc && str_match_nocase_whole(pcur, desc->name)) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-/* Eat until eol
- */
-static void eat_until_eol(const char **pcur) {
-  while (**pcur != '\0' && **pcur != '\n')
-    (*pcur)++;
-}
-
-/* Eat zero or more whitespaces.
- */
-static void eat_opt_white(const char **pcur) {
-  while (**pcur == ' ' || **pcur == '\t' || **pcur == '\n')
-    (*pcur)++;
-}
-
-/* Eat one or more whitespaces.
- * Return TRUE if at least one whitespace eaten.
- */
-static boolean eat_white(const char **pcur) {
-  const char *cur = *pcur;
-
-  eat_opt_white(pcur);
-  return *pcur > cur;
-}
-
-/* Parse unsigned integer.
- * No checks for overflow.
- */
-static boolean parse_uint(const char **pcur, uint *val) {
-  const char *cur = *pcur;
-
-  if (is_digit(cur)) {
-    *val = *cur++ - '0';
-    while (is_digit(cur))
-      *val = *val * 10 + *cur++ - '0';
-    *pcur = cur;
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static boolean parse_int(const char **pcur, int *val) {
-  const char *cur = *pcur;
-  int sign = (*cur == '-' ? -1 : 1);
-
-  if (*cur == '+' || *cur == '-')
-    cur++;
-
-  if (parse_uint(&cur, (uint *)val)) {
-    *val *= sign;
-    *pcur = cur;
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-static boolean parse_identifier(const char **pcur, char *ret, size_t len) {
-  const char *cur = *pcur;
-  size_t i = 0;
-  if (is_alpha_underscore(cur)) {
-    ret[i++] = *cur++;
-    while (is_alpha_underscore(cur) || is_digit(cur)) {
-      if (i == len - 1)
-        return FALSE;
-      ret[i++] = *cur++;
-    }
-    ret[i++] = '\0';
-    *pcur = cur;
-    return TRUE;
-  }
-  return FALSE;
-}
-
-/* Parse floating point.
- */
-static boolean parse_float(const char **pcur, float *val) {
-  const char *cur = *pcur;
-  boolean integral_part = FALSE;
-  boolean fractional_part = FALSE;
-
-  if (*cur == '0' && *(cur + 1) == 'x') {
-    union fi fi;
-    fi.ui = strtoul(cur, NULL, 16);
-    *val = fi.f;
-    cur += 10;
-    goto out;
-  }
-
-  *val = (float)atof(cur);
-  if (*cur == '-' || *cur == '+')
-    cur++;
-  if (is_digit(cur)) {
-    cur++;
-    integral_part = TRUE;
-    while (is_digit(cur))
-      cur++;
-  }
-  if (*cur == '.') {
-    cur++;
-    if (is_digit(cur)) {
-      cur++;
-      fractional_part = TRUE;
-      while (is_digit(cur))
-        cur++;
-    }
-  }
-  if (!integral_part && !fractional_part)
-    return FALSE;
-  if (uprcase(*cur) == 'E') {
-    cur++;
-    if (*cur == '-' || *cur == '+')
-      cur++;
-    if (is_digit(cur)) {
-      cur++;
-      while (is_digit(cur))
-        cur++;
-    } else
-      return FALSE;
-  }
-
-out:
-  *pcur = cur;
-  return TRUE;
-}
-
-static boolean parse_double(const char **pcur, uint32_t *val0, uint32_t *val1) {
-  const char *cur = *pcur;
-  union {
-    double dval;
-    uint32_t uval[2];
-  } v;
-
-  if (*cur == '0' && *(cur + 1) == 'x') {
-    *val0 = strtoul(cur, NULL, 16);
-    cur += 11;
-    *val1 = strtoul(cur, NULL, 16);
-    cur += 11;
-    *pcur = cur;
-    return TRUE;
-  }
-  v.dval = strtod(cur, (char **)pcur);
-  if (*pcur == cur)
-    return FALSE;
-
-  *val0 = v.uval[0];
-  *val1 = v.uval[1];
-
-  return TRUE;
-}
-
-struct translate_ctx {
-  const char *text;
-  const char *cur;
-  struct tgsi_token *tokens;
-  struct tgsi_token *tokens_cur;
-  struct tgsi_token *tokens_end;
-  struct tgsi_header *header;
-  unsigned processor : 4;
-  unsigned implied_array_size : 6;
-  unsigned num_immediates;
-};
-
-static void report_error(struct translate_ctx *ctx, const char *format, ...) {
-  va_list args;
-  int line = 1;
-  int column = 1;
-  const char *itr = ctx->text;
-
-  debug_printf("\nTGSI asm error: ");
-
-  va_start(args, format);
-  _debug_vprintf(format, args);
-  va_end(args);
-
-  while (itr != ctx->cur) {
-    if (*itr == '\n') {
-      column = 1;
-      ++line;
-    }
-    ++column;
-    ++itr;
-  }
-
-  debug_printf(" [%d : %d] \n", line, column);
-}
-
-/* Parse shader header.
- * Return TRUE for one of the following headers.
- *    FRAG
- *    GEOM
- *    VERT
- */
-static boolean parse_header(struct translate_ctx *ctx) {
-  uint processor;
-
-  if (str_match_nocase_whole(&ctx->cur, "FRAG"))
-    processor = TGSI_PROCESSOR_FRAGMENT;
-  else if (str_match_nocase_whole(&ctx->cur, "VERT"))
-    processor = TGSI_PROCESSOR_VERTEX;
-  else if (str_match_nocase_whole(&ctx->cur, "GEOM"))
-    processor = TGSI_PROCESSOR_GEOMETRY;
-  else if (str_match_nocase_whole(&ctx->cur, "TESS_CTRL"))
-    processor = TGSI_PROCESSOR_TESS_CTRL;
-  else if (str_match_nocase_whole(&ctx->cur, "TESS_EVAL"))
-    processor = TGSI_PROCESSOR_TESS_EVAL;
-  else if (str_match_nocase_whole(&ctx->cur, "COMP"))
-    processor = TGSI_PROCESSOR_COMPUTE;
-  else {
-    report_error(ctx, "Unknown header");
-    return FALSE;
-  }
-
-  if (ctx->tokens_cur >= ctx->tokens_end)
-    return FALSE;
-  ctx->header = (struct tgsi_header *)ctx->tokens_cur++;
-  *ctx->header = tgsi_build_header();
-
-  if (ctx->tokens_cur >= ctx->tokens_end)
-    return FALSE;
-  *(struct tgsi_processor *)ctx->tokens_cur++ =
-      tgsi_build_processor(processor, ctx->header);
-  ctx->processor = processor;
-
-  return TRUE;
-}
-
-static boolean parse_label(struct translate_ctx *ctx, uint *val) {
-  const char *cur = ctx->cur;
-
-  if (parse_uint(&cur, val)) {
-    eat_opt_white(&cur);
-    if (*cur == ':') {
-      cur++;
-      ctx->cur = cur;
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static boolean parse_file(const char **pcur, uint *file) {
-  uint i;
-
-  for (i = 0; i < TGSI_FILE_COUNT; i++) {
-    const char *cur = *pcur;
-
-    if (str_match_nocase_whole(&cur, tgsi_file_name(i))) {
-      *pcur = cur;
-      *file = i;
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static boolean parse_opt_writemask(struct translate_ctx *ctx, uint *writemask) {
-  const char *cur;
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (*cur == '.') {
-    cur++;
-    *writemask = TGSI_WRITEMASK_NONE;
-    eat_opt_white(&cur);
-    if (uprcase(*cur) == 'X') {
-      cur++;
-      *writemask |= TGSI_WRITEMASK_X;
-    }
-    if (uprcase(*cur) == 'Y') {
-      cur++;
-      *writemask |= TGSI_WRITEMASK_Y;
-    }
-    if (uprcase(*cur) == 'Z') {
-      cur++;
-      *writemask |= TGSI_WRITEMASK_Z;
-    }
-    if (uprcase(*cur) == 'W') {
-      cur++;
-      *writemask |= TGSI_WRITEMASK_W;
-    }
-
-    if (*writemask == TGSI_WRITEMASK_NONE) {
-      report_error(ctx, "Writemask expected");
-      return FALSE;
-    }
-
-    ctx->cur = cur;
-  } else {
-    *writemask = TGSI_WRITEMASK_XYZW;
-  }
-  return TRUE;
-}
-
-/* <register_file_bracket> ::= <file> `['
- */
-static boolean parse_register_file_bracket(struct translate_ctx *ctx,
-                                           uint *file) {
-  if (!parse_file(&ctx->cur, file)) {
-    report_error(ctx, "Unknown register file");
-    return FALSE;
-  }
-  eat_opt_white(&ctx->cur);
-  if (*ctx->cur != '[') {
-    report_error(ctx, "Expected `['");
-    return FALSE;
-  }
-  ctx->cur++;
-  return TRUE;
-}
-
-/* <register_file_bracket_index> ::= <register_file_bracket> <uint>
- */
-static boolean parse_register_file_bracket_index(struct translate_ctx *ctx,
-                                                 uint *file, int *index) {
-  uint uindex;
-
-  if (!parse_register_file_bracket(ctx, file))
-    return FALSE;
-  eat_opt_white(&ctx->cur);
-  if (!parse_uint(&ctx->cur, &uindex)) {
-    report_error(ctx, "Expected literal unsigned integer");
-    return FALSE;
-  }
-  *index = (int)uindex;
-  return TRUE;
-}
-
-/* Parse simple 1d register operand.
- *    <register_dst> ::= <register_file_bracket_index> `]'
- */
-static boolean parse_register_1d(struct translate_ctx *ctx, uint *file,
-                                 int *index) {
-  if (!parse_register_file_bracket_index(ctx, file, index))
-    return FALSE;
-  eat_opt_white(&ctx->cur);
-  if (*ctx->cur != ']') {
-    report_error(ctx, "Expected `]'");
-    return FALSE;
-  }
-  ctx->cur++;
-  return TRUE;
-}
-
-struct parsed_bracket {
-  int index;
-
-  uint ind_file;
-  int ind_index;
-  uint ind_comp;
-  uint ind_array;
-};
-
-static boolean parse_register_bracket(struct translate_ctx *ctx,
-                                      struct parsed_bracket *brackets) {
-  const char *cur;
-  uint uindex;
-
-  memset(brackets, 0, sizeof(struct parsed_bracket));
-
-  eat_opt_white(&ctx->cur);
-
-  cur = ctx->cur;
-  if (parse_file(&cur, &brackets->ind_file)) {
-    if (!parse_register_1d(ctx, &brackets->ind_file, &brackets->ind_index))
-      return FALSE;
-    eat_opt_white(&ctx->cur);
-
-    if (*ctx->cur == '.') {
-      ctx->cur++;
-      eat_opt_white(&ctx->cur);
-
-      switch (uprcase(*ctx->cur)) {
-      case 'X':
-        brackets->ind_comp = TGSI_SWIZZLE_X;
-        break;
-      case 'Y':
-        brackets->ind_comp = TGSI_SWIZZLE_Y;
-        break;
-      case 'Z':
-        brackets->ind_comp = TGSI_SWIZZLE_Z;
-        break;
-      case 'W':
-        brackets->ind_comp = TGSI_SWIZZLE_W;
-        break;
-      default:
-        report_error(ctx, "Expected indirect register swizzle component `x', "
-                          "`y', `z' or `w'");
-        return FALSE;
-      }
-      ctx->cur++;
-      eat_opt_white(&ctx->cur);
-    }
-
-    if (*ctx->cur == '+' || *ctx->cur == '-')
-      parse_int(&ctx->cur, &brackets->index);
-    else
-      brackets->index = 0;
-  } else {
-    if (!parse_uint(&ctx->cur, &uindex)) {
-      report_error(ctx, "Expected literal unsigned integer");
-      return FALSE;
-    }
-    brackets->index = (int)uindex;
-    brackets->ind_file = TGSI_FILE_NULL;
-    brackets->ind_index = 0;
-  }
-  eat_opt_white(&ctx->cur);
-  if (*ctx->cur != ']') {
-    report_error(ctx, "Expected `]'");
-    return FALSE;
-  }
-  ctx->cur++;
-  if (*ctx->cur == '(') {
-    ctx->cur++;
-    eat_opt_white(&ctx->cur);
-    if (!parse_uint(&ctx->cur, &brackets->ind_array)) {
-      report_error(ctx, "Expected literal unsigned integer");
-      return FALSE;
-    }
-    eat_opt_white(&ctx->cur);
-    if (*ctx->cur != ')') {
-      report_error(ctx, "Expected `)'");
-      return FALSE;
-    }
-    ctx->cur++;
-  }
-  return TRUE;
-}
-
-static boolean parse_opt_register_src_bracket(struct translate_ctx *ctx,
-                                              struct parsed_bracket *brackets,
-                                              int *parsed_brackets) {
-  const char *cur = ctx->cur;
-
-  *parsed_brackets = 0;
-
-  eat_opt_white(&cur);
-  if (cur[0] == '[') {
-    ++cur;
-    ctx->cur = cur;
-
-    if (!parse_register_bracket(ctx, brackets))
-      return FALSE;
-
-    *parsed_brackets = 1;
-  }
-
-  return TRUE;
-}
-
-/* Parse source register operand.
- *    <register_src> ::= <register_file_bracket_index> `]' |
- *                       <register_file_bracket> <register_dst> [`.' (`x' | `y'
- * | `z' | `w')] `]' | <register_file_bracket> <register_dst> [`.' (`x' | `y' |
- * `z' | `w')] `+' <uint> `]' | <register_file_bracket> <register_dst> [`.' (`x'
- * | `y' | `z' | `w')] `-' <uint> `]'
- */
-static boolean parse_register_src(struct translate_ctx *ctx, uint *file,
-                                  struct parsed_bracket *brackets) {
-  brackets->ind_comp = TGSI_SWIZZLE_X;
-  if (!parse_register_file_bracket(ctx, file))
-    return FALSE;
-  if (!parse_register_bracket(ctx, brackets))
-    return FALSE;
-
-  return TRUE;
-}
-
-struct parsed_dcl_bracket {
-  uint first;
-  uint last;
-};
-
-static boolean parse_register_dcl_bracket(struct translate_ctx *ctx,
-                                          struct parsed_dcl_bracket *bracket) {
-  uint uindex;
-  memset(bracket, 0, sizeof(struct parsed_dcl_bracket));
-
-  eat_opt_white(&ctx->cur);
-
-  if (!parse_uint(&ctx->cur, &uindex)) {
-    /* it can be an empty bracket [] which means its range
-     * is from 0 to some implied size */
-    if (ctx->cur[0] == ']' && ctx->implied_array_size != 0) {
-      bracket->first = 0;
-      bracket->last = ctx->implied_array_size - 1;
-      goto cleanup;
-    }
-    report_error(ctx, "Expected literal unsigned integer");
-    return FALSE;
-  }
-  bracket->first = uindex;
-
-  eat_opt_white(&ctx->cur);
-
-  if (ctx->cur[0] == '.' && ctx->cur[1] == '.') {
-    uint uindex;
-
-    ctx->cur += 2;
-    eat_opt_white(&ctx->cur);
-    if (!parse_uint(&ctx->cur, &uindex)) {
-      report_error(ctx, "Expected literal integer");
-      return FALSE;
-    }
-    bracket->last = (int)uindex;
-    eat_opt_white(&ctx->cur);
-  } else {
-    bracket->last = bracket->first;
-  }
-
-cleanup:
-  if (*ctx->cur != ']') {
-    report_error(ctx, "Expected `]' or `..'");
-    return FALSE;
-  }
-  ctx->cur++;
-  return TRUE;
-}
-
-/* Parse register declaration.
- *    <register_dcl> ::= <register_file_bracket_index> `]' |
- *                       <register_file_bracket_index> `..' <index> `]'
- */
-static boolean parse_register_dcl(struct translate_ctx *ctx, uint *file,
-                                  struct parsed_dcl_bracket *brackets,
-                                  int *num_brackets) {
-  const char *cur;
-
-  *num_brackets = 0;
-
-  if (!parse_register_file_bracket(ctx, file))
-    return FALSE;
-  if (!parse_register_dcl_bracket(ctx, &brackets[0]))
-    return FALSE;
-
-  *num_brackets = 1;
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-
-  if (cur[0] == '[') {
-    bool is_in = *file == TGSI_FILE_INPUT;
-    bool is_out = *file == TGSI_FILE_OUTPUT;
-
-    ++cur;
-    ctx->cur = cur;
-    if (!parse_register_dcl_bracket(ctx, &brackets[1]))
-      return FALSE;
-    /* for geometry shader we don't really care about
-     * the first brackets it's always the size of the
-     * input primitive. so we want to declare just
-     * the index relevant to the semantics which is in
-     * the second bracket */
-
-    /* tessellation has similar constraints to geometry shader */
-    if ((ctx->processor == TGSI_PROCESSOR_GEOMETRY && is_in) ||
-        (ctx->processor == TGSI_PROCESSOR_TESS_EVAL && is_in) ||
-        (ctx->processor == TGSI_PROCESSOR_TESS_CTRL && (is_in || is_out))) {
-      brackets[0] = brackets[1];
-      *num_brackets = 1;
-    } else {
-      *num_brackets = 2;
-    }
-  }
-
-  return TRUE;
-}
-
-/* Parse destination register operand.*/
-static boolean parse_register_dst(struct translate_ctx *ctx, uint *file,
-                                  struct parsed_bracket *brackets) {
-  brackets->ind_comp = TGSI_SWIZZLE_X;
-  if (!parse_register_file_bracket(ctx, file))
-    return FALSE;
-  if (!parse_register_bracket(ctx, brackets))
-    return FALSE;
-
-  return TRUE;
-}
-
-static boolean parse_dst_operand(struct translate_ctx *ctx,
-                                 struct tgsi_full_dst_register *dst) {
-  uint file;
-  uint writemask;
-  const char *cur;
-  struct parsed_bracket bracket[2];
-  int parsed_opt_brackets;
-
-  if (!parse_register_dst(ctx, &file, &bracket[0]))
-    return FALSE;
-  if (!parse_opt_register_src_bracket(ctx, &bracket[1], &parsed_opt_brackets))
-    return FALSE;
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-
-  if (!parse_opt_writemask(ctx, &writemask))
-    return FALSE;
-
-  dst->Register.File = file;
-  if (parsed_opt_brackets) {
-    dst->Register.Dimension = 1;
-    dst->Dimension.Indirect = 0;
-    dst->Dimension.Dimension = 0;
-    dst->Dimension.Index = bracket[0].index;
-
-    if (bracket[0].ind_file != TGSI_FILE_NULL) {
-      dst->Dimension.Indirect = 1;
-      dst->DimIndirect.File = bracket[0].ind_file;
-      dst->DimIndirect.Index = bracket[0].ind_index;
-      dst->DimIndirect.Swizzle = bracket[0].ind_comp;
-      dst->DimIndirect.ArrayID = bracket[0].ind_array;
-    }
-    bracket[0] = bracket[1];
-  }
-  dst->Register.Index = bracket[0].index;
-  dst->Register.WriteMask = writemask;
-  if (bracket[0].ind_file != TGSI_FILE_NULL) {
-    dst->Register.Indirect = 1;
-    dst->Indirect.File = bracket[0].ind_file;
-    dst->Indirect.Index = bracket[0].ind_index;
-    dst->Indirect.Swizzle = bracket[0].ind_comp;
-    dst->Indirect.ArrayID = bracket[0].ind_array;
-  }
-  return TRUE;
-}
-
-static boolean parse_optional_swizzle(struct translate_ctx *ctx, uint *swizzle,
-                                      boolean *parsed_swizzle, int components) {
-  const char *cur = ctx->cur;
-
-  *parsed_swizzle = FALSE;
-
-  eat_opt_white(&cur);
-  if (*cur == '.') {
-    int i;
-
-    cur++;
-    eat_opt_white(&cur);
-    for (i = 0; i < components; i++) {
-      if (uprcase(*cur) == 'X')
-        swizzle[i] = TGSI_SWIZZLE_X;
-      else if (uprcase(*cur) == 'Y')
-        swizzle[i] = TGSI_SWIZZLE_Y;
-      else if (uprcase(*cur) == 'Z')
-        swizzle[i] = TGSI_SWIZZLE_Z;
-      else if (uprcase(*cur) == 'W')
-        swizzle[i] = TGSI_SWIZZLE_W;
-      else {
-        report_error(
-            ctx, "Expected register swizzle component `x', `y', `z' or `w'");
-        return FALSE;
-      }
-      cur++;
-    }
-    *parsed_swizzle = TRUE;
-    ctx->cur = cur;
-  }
-  return TRUE;
-}
-
-static boolean parse_src_operand(struct translate_ctx *ctx,
-                                 struct tgsi_full_src_register *src) {
-  uint file;
-  uint swizzle[4];
-  boolean parsed_swizzle;
-  struct parsed_bracket bracket[2];
-  int parsed_opt_brackets;
-
-  if (*ctx->cur == '-') {
-    ctx->cur++;
-    eat_opt_white(&ctx->cur);
-    src->Register.Negate = 1;
-  }
-
-  if (*ctx->cur == '|') {
-    ctx->cur++;
-    eat_opt_white(&ctx->cur);
-    src->Register.Absolute = 1;
-  }
-
-  if (!parse_register_src(ctx, &file, &bracket[0]))
-    return FALSE;
-  if (!parse_opt_register_src_bracket(ctx, &bracket[1], &parsed_opt_brackets))
-    return FALSE;
-
-  src->Register.File = file;
-  if (parsed_opt_brackets) {
-    src->Register.Dimension = 1;
-    src->Dimension.Indirect = 0;
-    src->Dimension.Dimension = 0;
-    src->Dimension.Index = bracket[0].index;
-    if (bracket[0].ind_file != TGSI_FILE_NULL) {
-      src->Dimension.Indirect = 1;
-      src->DimIndirect.File = bracket[0].ind_file;
-      src->DimIndirect.Index = bracket[0].ind_index;
-      src->DimIndirect.Swizzle = bracket[0].ind_comp;
-      src->DimIndirect.ArrayID = bracket[0].ind_array;
-    }
-    bracket[0] = bracket[1];
-  }
-  src->Register.Index = bracket[0].index;
-  if (bracket[0].ind_file != TGSI_FILE_NULL) {
-    src->Register.Indirect = 1;
-    src->Indirect.File = bracket[0].ind_file;
-    src->Indirect.Index = bracket[0].ind_index;
-    src->Indirect.Swizzle = bracket[0].ind_comp;
-    src->Indirect.ArrayID = bracket[0].ind_array;
-  }
-
-  /* Parse optional swizzle.
-   */
-  if (parse_optional_swizzle(ctx, swizzle, &parsed_swizzle, 4)) {
-    if (parsed_swizzle) {
-      src->Register.SwizzleX = swizzle[0];
-      src->Register.SwizzleY = swizzle[1];
-      src->Register.SwizzleZ = swizzle[2];
-      src->Register.SwizzleW = swizzle[3];
-    }
-  }
-
-  if (src->Register.Absolute) {
-    eat_opt_white(&ctx->cur);
-    if (*ctx->cur != '|') {
-      report_error(ctx, "Expected `|'");
-      return FALSE;
-    }
-    ctx->cur++;
-  }
-
-  return TRUE;
-}
-
-static boolean parse_texoffset_operand(struct translate_ctx *ctx,
-                                       struct tgsi_texture_offset *src) {
-  uint file;
-  uint swizzle[3];
-  boolean parsed_swizzle;
-  struct parsed_bracket bracket;
-
-  if (!parse_register_src(ctx, &file, &bracket))
-    return FALSE;
-
-  src->File = file;
-  src->Index = bracket.index;
-
-  /* Parse optional swizzle.
-   */
-  if (parse_optional_swizzle(ctx, swizzle, &parsed_swizzle, 3)) {
-    if (parsed_swizzle) {
-      src->SwizzleX = swizzle[0];
-      src->SwizzleY = swizzle[1];
-      src->SwizzleZ = swizzle[2];
-    }
-  }
-
-  return TRUE;
-}
-
-static boolean match_inst(const char **pcur, unsigned *saturate,
-                          unsigned *precise,
-                          const struct tgsi_opcode_info *info) {
-  const char *cur = *pcur;
-
-  /* simple case: the whole string matches the instruction name */
-  if (str_match_nocase_whole(&cur, info->mnemonic)) {
-    *pcur = cur;
-    *saturate = 0;
-    *precise = 0;
-    return TRUE;
-  }
-
-  if (str_match_no_case(&cur, info->mnemonic)) {
-    /* the instruction has a suffix, figure it out */
-    if (str_match_no_case(&cur, "_SAT")) {
-      *pcur = cur;
-      *saturate = 1;
-    }
-
-    if (str_match_no_case(&cur, "_PRECISE")) {
-      *pcur = cur;
-      *precise = 1;
-    }
-
-    if (!is_digit_alpha_underscore(cur))
-      return TRUE;
-  }
-
-  return FALSE;
-}
-
-static boolean parse_instruction(struct translate_ctx *ctx, boolean has_label) {
-  int i;
-  uint saturate = 0;
-  uint precise = 0;
-  const struct tgsi_opcode_info *info;
-  struct tgsi_full_instruction inst;
-  const char *cur;
-  uint advance;
-
-  inst = tgsi_default_full_instruction();
-
-  /* Parse instruction name.
-   */
-  eat_opt_white(&ctx->cur);
-  for (i = 0; i < TGSI_OPCODE_LAST; i++) {
-    cur = ctx->cur;
-
-    info = tgsi_get_opcode_info(i);
-    if (match_inst(&cur, &saturate, &precise, info)) {
-      if (info->num_dst + info->num_src + info->is_tex == 0) {
-        ctx->cur = cur;
-        break;
-      } else if (*cur == '\0' || eat_white(&cur)) {
-        ctx->cur = cur;
-        break;
-      }
-    }
-  }
-  if (i == TGSI_OPCODE_LAST) {
-    if (has_label)
-      report_error(ctx, "Unknown opcode");
-    else
-      report_error(ctx, "Expected `DCL', `IMM' or a label");
-    return FALSE;
-  }
-
-  inst.Instruction.Opcode = i;
-  inst.Instruction.Saturate = saturate;
-  inst.Instruction.Precise = precise;
-  inst.Instruction.NumDstRegs = info->num_dst;
-  inst.Instruction.NumSrcRegs = info->num_src;
-
-  if (i >= TGSI_OPCODE_SAMPLE && i <= TGSI_OPCODE_GATHER4) {
-    /*
-     * These are not considered tex opcodes here (no additional
-     * target argument) however we're required to set the Texture
-     * bit so we can set the number of tex offsets.
-     */
-    inst.Instruction.Texture = 1;
-    inst.Texture.Texture = TGSI_TEXTURE_UNKNOWN;
-  }
-
-  if ((i >= TGSI_OPCODE_LOAD && i <= TGSI_OPCODE_ATOMIMAX) ||
-      i == TGSI_OPCODE_RESQ) {
-    inst.Instruction.Memory = 1;
-    inst.Memory.Qualifier = 0;
-  }
-
-  /* Parse instruction operands.
-   */
-  for (i = 0; i < info->num_dst + info->num_src + info->is_tex; i++) {
-    if (i > 0) {
-      eat_opt_white(&ctx->cur);
-      if (*ctx->cur != ',') {
-        report_error(ctx, "Expected `,'");
-        return FALSE;
-      }
-      ctx->cur++;
-      eat_opt_white(&ctx->cur);
-    }
-
-    if (i < info->num_dst) {
-      if (!parse_dst_operand(ctx, &inst.Dst[i]))
-        return FALSE;
-    } else if (i < info->num_dst + info->num_src) {
-      if (!parse_src_operand(ctx, &inst.Src[i - info->num_dst]))
-        return FALSE;
-    } else {
-      uint j;
-
-      for (j = 0; j < TGSI_TEXTURE_COUNT; j++) {
-        if (str_match_nocase_whole(&ctx->cur, tgsi_texture_names[j])) {
-          inst.Instruction.Texture = 1;
-          inst.Texture.Texture = j;
-          break;
-        }
-      }
-      if (j == TGSI_TEXTURE_COUNT) {
-        report_error(ctx, "Expected texture target");
-        return FALSE;
-      }
-    }
-  }
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  for (i = 0;
-       inst.Instruction.Texture && *cur == ',' && i < TGSI_FULL_MAX_TEX_OFFSETS;
-       i++) {
-    cur++;
-    eat_opt_white(&cur);
-    ctx->cur = cur;
-    if (!parse_texoffset_operand(ctx, &inst.TexOffsets[i]))
-      return FALSE;
-    cur = ctx->cur;
-    eat_opt_white(&cur);
-  }
-  inst.Texture.NumOffsets = i;
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-
-  for (; inst.Instruction.Memory && *cur == ',';
-       ctx->cur = cur, eat_opt_white(&cur)) {
-    int j;
-
-    cur++;
-    eat_opt_white(&cur);
-
-    j = str_match_name_from_array(&cur, tgsi_memory_names,
-                                  ARRAY_SIZE(tgsi_memory_names));
-    if (j >= 0) {
-      inst.Memory.Qualifier |= 1U << j;
-      continue;
-    }
-
-    j = str_match_name_from_array(&cur, tgsi_texture_names,
-                                  ARRAY_SIZE(tgsi_texture_names));
-    if (j >= 0) {
-      inst.Memory.Texture = j;
-      continue;
-    }
-
-    j = str_match_format(&cur);
-    if (j >= 0) {
-      inst.Memory.Format = j;
-      continue;
-    }
-
-    ctx->cur = cur;
-    report_error(ctx, "Expected memory qualifier, texture target, or format\n");
-    return FALSE;
-  }
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (info->is_branch && *cur == ':') {
-    uint target;
-
-    cur++;
-    eat_opt_white(&cur);
-    if (!parse_uint(&cur, &target)) {
-      report_error(ctx, "Expected a label");
-      return FALSE;
-    }
-    inst.Instruction.Label = 1;
-    inst.Label.Label = target;
-    ctx->cur = cur;
-  }
-
-  advance =
-      tgsi_build_full_instruction(&inst, ctx->tokens_cur, ctx->header,
-                                  (uint)(ctx->tokens_end - ctx->tokens_cur));
-  if (advance == 0)
-    return FALSE;
-  ctx->tokens_cur += advance;
-
-  return TRUE;
-}
-
-/* parses a 4-touple of the form {x, y, z, w}
- * where x, y, z, w are numbers */
-static boolean parse_immediate_data(struct translate_ctx *ctx, unsigned type,
-                                    union tgsi_immediate_data *values) {
-  unsigned i;
-  int ret;
-
-  eat_opt_white(&ctx->cur);
-  if (*ctx->cur != '{') {
-    report_error(ctx, "Expected `{'");
-    return FALSE;
-  }
-  ctx->cur++;
-  for (i = 0; i < 4; i++) {
-    eat_opt_white(&ctx->cur);
-    if (i > 0) {
-      if (*ctx->cur != ',') {
-        report_error(ctx, "Expected `,'");
-        return FALSE;
-      }
-      ctx->cur++;
-      eat_opt_white(&ctx->cur);
-    }
-
-    switch (type) {
-    case TGSI_IMM_FLOAT64:
-      ret = parse_double(&ctx->cur, &values[i].Uint, &values[i + 1].Uint);
-      i++;
-      break;
-    case TGSI_IMM_FLOAT32:
-      ret = parse_float(&ctx->cur, &values[i].Float);
-      break;
-    case TGSI_IMM_UINT32:
-      ret = parse_uint(&ctx->cur, &values[i].Uint);
-      break;
-    case TGSI_IMM_INT32:
-      ret = parse_int(&ctx->cur, &values[i].Int);
-      break;
-    default:
-      assert(0);
-      ret = FALSE;
-      break;
-    }
-
-    if (!ret) {
-      report_error(ctx, "Expected immediate constant");
-      return FALSE;
-    }
-  }
-  eat_opt_white(&ctx->cur);
-  if (*ctx->cur != '}') {
-    report_error(ctx, "Expected `}'");
-    return FALSE;
-  }
-  ctx->cur++;
-
-  return TRUE;
-}
-
-static boolean parse_declaration(struct translate_ctx *ctx) {
-  struct tgsi_full_declaration decl;
-  uint file;
-  struct parsed_dcl_bracket brackets[2];
-  int num_brackets;
-  uint writemask;
-  const char *cur, *cur2;
-  uint advance;
-  boolean is_vs_input;
-
-  if (!eat_white(&ctx->cur)) {
-    report_error(ctx, "Syntax error");
-    return FALSE;
-  }
-  if (!parse_register_dcl(ctx, &file, brackets, &num_brackets))
-    return FALSE;
-  if (!parse_opt_writemask(ctx, &writemask))
-    return FALSE;
-
-  decl = tgsi_default_full_declaration();
-  decl.Declaration.File = file;
-  decl.Declaration.UsageMask = writemask;
-
-  if (num_brackets == 1) {
-    decl.Range.First = brackets[0].first;
-    decl.Range.Last = brackets[0].last;
-  } else {
-    decl.Range.First = brackets[1].first;
-    decl.Range.Last = brackets[1].last;
-
-    decl.Declaration.Dimension = 1;
-    decl.Dim.Index2D = brackets[0].first;
-  }
-
-  is_vs_input =
-      (file == TGSI_FILE_INPUT && ctx->processor == TGSI_PROCESSOR_VERTEX);
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (*cur == ',') {
-    cur2 = cur;
-    cur2++;
-    eat_opt_white(&cur2);
-    if (str_match_nocase_whole(&cur2, "ARRAY")) {
-      int arrayid;
-      if (*cur2 != '(') {
-        report_error(ctx, "Expected `('");
-        return FALSE;
-      }
-      cur2++;
-      eat_opt_white(&cur2);
-      if (!parse_int(&cur2, &arrayid)) {
-        report_error(ctx, "Expected `,'");
-        return FALSE;
-      }
-      eat_opt_white(&cur2);
-      if (*cur2 != ')') {
-        report_error(ctx, "Expected `)'");
-        return FALSE;
-      }
-      cur2++;
-      decl.Declaration.Array = 1;
-      decl.Array.ArrayID = arrayid;
-      ctx->cur = cur = cur2;
-    }
-  }
-
-  if (*cur == ',' && !is_vs_input) {
-    uint i, j;
-
-    cur++;
-    eat_opt_white(&cur);
-    if (file == TGSI_FILE_IMAGE) {
-      for (i = 0; i < TGSI_TEXTURE_COUNT; i++) {
-        if (str_match_nocase_whole(&cur, tgsi_texture_names[i])) {
-          decl.Image.Resource = i;
-          break;
-        }
-      }
-      if (i == TGSI_TEXTURE_COUNT) {
-        report_error(ctx, "Expected texture target");
-        return FALSE;
-      }
-
-      cur2 = cur;
-      eat_opt_white(&cur2);
-      while (*cur2 == ',') {
-        cur2++;
-        eat_opt_white(&cur2);
-        if (str_match_nocase_whole(&cur2, "RAW")) {
-          decl.Image.Raw = 1;
-
-        } else if (str_match_nocase_whole(&cur2, "WR")) {
-          decl.Image.Writable = 1;
-
-        } else {
-          int format = str_match_format(&cur2);
-          if (format < 0)
-            break;
-
-          decl.Image.Format = format;
-        }
-        cur = cur2;
-        eat_opt_white(&cur2);
-      }
-
-      ctx->cur = cur;
-
-    } else if (file == TGSI_FILE_SAMPLER_VIEW) {
-      for (i = 0; i < TGSI_TEXTURE_COUNT; i++) {
-        if (str_match_nocase_whole(&cur, tgsi_texture_names[i])) {
-          decl.SamplerView.Resource = i;
-          break;
-        }
-      }
-      if (i == TGSI_TEXTURE_COUNT) {
-        report_error(ctx, "Expected texture target");
-        return FALSE;
-      }
-      eat_opt_white(&cur);
-      if (*cur != ',') {
-        report_error(ctx, "Expected `,'");
-        return FALSE;
-      }
-      ++cur;
-      eat_opt_white(&cur);
-      for (j = 0; j < 4; ++j) {
-        for (i = 0; i < TGSI_RETURN_TYPE_COUNT; ++i) {
-          if (str_match_nocase_whole(&cur, tgsi_return_type_names[i])) {
-            switch (j) {
-            case 0:
-              decl.SamplerView.ReturnTypeX = i;
-              break;
-            case 1:
-              decl.SamplerView.ReturnTypeY = i;
-              break;
-            case 2:
-              decl.SamplerView.ReturnTypeZ = i;
-              break;
-            case 3:
-              decl.SamplerView.ReturnTypeW = i;
-              break;
-            default:
-              assert(0);
-            }
-            break;
-          }
-        }
-        if (i == TGSI_RETURN_TYPE_COUNT) {
-          if (j == 0 || j > 2) {
-            report_error(ctx, "Expected type name");
-            return FALSE;
-          }
-          break;
-        } else {
-          cur2 = cur;
-          eat_opt_white(&cur2);
-          if (*cur2 == ',') {
-            cur2++;
-            eat_opt_white(&cur2);
-            cur = cur2;
-            continue;
-          } else
-            break;
-        }
-      }
-      if (j < 4) {
-        decl.SamplerView.ReturnTypeY = decl.SamplerView.ReturnTypeZ =
-            decl.SamplerView.ReturnTypeW = decl.SamplerView.ReturnTypeX;
-      }
-      ctx->cur = cur;
-    } else if (file == TGSI_FILE_BUFFER) {
-      if (str_match_nocase_whole(&cur, "ATOMIC")) {
-        decl.Declaration.Atomic = 1;
-        ctx->cur = cur;
-      }
-    } else if (file == TGSI_FILE_MEMORY) {
-      if (str_match_nocase_whole(&cur, "GLOBAL")) {
-        /* Note this is a no-op global is the default */
-        decl.Declaration.MemType = TGSI_MEMORY_TYPE_GLOBAL;
-        ctx->cur = cur;
-      } else if (str_match_nocase_whole(&cur, "SHARED")) {
-        decl.Declaration.MemType = TGSI_MEMORY_TYPE_SHARED;
-        ctx->cur = cur;
-      } else if (str_match_nocase_whole(&cur, "PRIVATE")) {
-        decl.Declaration.MemType = TGSI_MEMORY_TYPE_PRIVATE;
-        ctx->cur = cur;
-      } else if (str_match_nocase_whole(&cur, "INPUT")) {
-        decl.Declaration.MemType = TGSI_MEMORY_TYPE_INPUT;
-        ctx->cur = cur;
-      }
-    } else {
-      if (str_match_nocase_whole(&cur, "LOCAL")) {
-        decl.Declaration.Local = 1;
-        ctx->cur = cur;
-      }
-
-      cur = ctx->cur;
-      eat_opt_white(&cur);
-      if (*cur == ',') {
-        cur++;
-        eat_opt_white(&cur);
-
-        for (i = 0; i < TGSI_SEMANTIC_COUNT; i++) {
-          if (str_match_nocase_whole(&cur, tgsi_semantic_names[i])) {
-            uint index;
-
-            cur2 = cur;
-            eat_opt_white(&cur2);
-            if (*cur2 == '[') {
-              cur2++;
-              eat_opt_white(&cur2);
-              if (!parse_uint(&cur2, &index)) {
-                report_error(ctx, "Expected literal integer");
-                return FALSE;
-              }
-              eat_opt_white(&cur2);
-              if (*cur2 != ']') {
-                report_error(ctx, "Expected `]'");
-                return FALSE;
-              }
-              cur2++;
-
-              decl.Semantic.Index = index;
-
-              cur = cur2;
-            }
-
-            decl.Declaration.Semantic = 1;
-            decl.Semantic.Name = i;
-
-            ctx->cur = cur;
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (*cur == ',' && file == TGSI_FILE_OUTPUT &&
-      ctx->processor == PIPE_SHADER_GEOMETRY) {
-    cur++;
-    eat_opt_white(&cur);
-    if (str_match_nocase_whole(&cur, "STREAM")) {
-      uint stream[4];
-
-      eat_opt_white(&cur);
-      if (*cur != '(') {
-        report_error(ctx, "Expected '('");
-        return FALSE;
-      }
-      cur++;
-
-      for (int i = 0; i < 4; ++i) {
-        eat_opt_white(&cur);
-        if (!parse_uint(&cur, &stream[i])) {
-          report_error(ctx, "Expected literal integer");
-          return FALSE;
-        }
-
-        eat_opt_white(&cur);
-        if (i < 3) {
-          if (*cur != ',') {
-            report_error(ctx, "Expected ','");
-            return FALSE;
-          }
-          cur++;
-        }
-      }
-
-      if (*cur != ')') {
-        report_error(ctx, "Expected ')'");
-        return FALSE;
-      }
-      cur++;
-
-      decl.Semantic.StreamX = stream[0];
-      decl.Semantic.StreamY = stream[1];
-      decl.Semantic.StreamZ = stream[2];
-      decl.Semantic.StreamW = stream[3];
-
-      ctx->cur = cur;
-    }
-  }
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (*cur == ',' && !is_vs_input) {
-    uint i;
-
-    cur++;
-    eat_opt_white(&cur);
-    for (i = 0; i < TGSI_INTERPOLATE_COUNT; i++) {
-      if (str_match_nocase_whole(&cur, tgsi_interpolate_names[i])) {
-        decl.Declaration.Interpolate = 1;
-        decl.Interp.Interpolate = i;
-
-        ctx->cur = cur;
-        break;
-      }
-    }
-  }
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (*cur == ',' && !is_vs_input) {
-    uint i;
-
-    cur++;
-    eat_opt_white(&cur);
-    for (i = 0; i < TGSI_INTERPOLATE_LOC_COUNT; i++) {
-      if (str_match_nocase_whole(&cur, tgsi_interpolate_locations[i])) {
-        decl.Interp.Location = i;
-
-        ctx->cur = cur;
-        break;
-      }
-    }
-  }
-
-  cur = ctx->cur;
-  eat_opt_white(&cur);
-  if (*cur == ',' && !is_vs_input) {
-    cur++;
-    eat_opt_white(&cur);
-    if (str_match_nocase_whole(&cur, tgsi_invariant_name)) {
-      decl.Declaration.Invariant = 1;
-      ctx->cur = cur;
-    } else {
-      report_error(ctx,
-                   "Expected semantic, interpolate attribute, or invariant "
-                   "\"%.10s...\" ",
-                   cur);
-      return FALSE;
-    }
-  }
-
-  advance =
-      tgsi_build_full_declaration(&decl, ctx->tokens_cur, ctx->header,
-                                  (uint)(ctx->tokens_end - ctx->tokens_cur));
-
-  if (advance == 0)
-    return FALSE;
-  ctx->tokens_cur += advance;
-
-  return TRUE;
-}
-
-static boolean parse_immediate(struct translate_ctx *ctx) {
-  struct tgsi_full_immediate imm;
-  uint advance;
-  uint type;
-
-  if (*ctx->cur == '[') {
-    uint uindex;
-
-    ++ctx->cur;
-
-    eat_opt_white(&ctx->cur);
-    if (!parse_uint(&ctx->cur, &uindex)) {
-      report_error(ctx, "Expected literal unsigned integer");
-      return FALSE;
-    }
-
-    if (uindex != ctx->num_immediates) {
-      report_error(ctx, "Immediates must be sorted");
-      return FALSE;
-    }
-
-    eat_opt_white(&ctx->cur);
-    if (*ctx->cur != ']') {
-      report_error(ctx, "Expected `]'");
-      return FALSE;
-    }
-
-    ctx->cur++;
-  }
-
-  if (!eat_white(&ctx->cur)) {
-    report_error(ctx, "Syntax error");
-    return FALSE;
-  }
-  for (type = 0; type < Elements(tgsi_immediate_type_names); ++type) {
-    if (str_match_nocase_whole(&ctx->cur, tgsi_immediate_type_names[type]))
-      break;
-  }
-  if (type == Elements(tgsi_immediate_type_names)) {
-    report_error(ctx, "Expected immediate type");
-    return FALSE;
-  }
-
-  imm = tgsi_default_full_immediate();
-  imm.Immediate.NrTokens += 4;
-  imm.Immediate.DataType = type;
-  parse_immediate_data(ctx, type, imm.u);
-
-  advance =
-      tgsi_build_full_immediate(&imm, ctx->tokens_cur, ctx->header,
-                                (uint)(ctx->tokens_end - ctx->tokens_cur));
-  if (advance == 0)
-    return FALSE;
-  ctx->tokens_cur += advance;
-
-  ctx->num_immediates++;
-
-  return TRUE;
-}
-
-static boolean parse_primitive(const char **pcur, uint *primitive) {
-  uint i;
-
-  for (i = 0; i < PIPE_PRIM_MAX; i++) {
-    const char *cur = *pcur;
-
-    if (str_match_nocase_whole(&cur, tgsi_primitive_names[i])) {
-      *primitive = i;
-      *pcur = cur;
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static boolean parse_fs_coord_origin(const char **pcur, uint *fs_coord_origin) {
-  uint i;
-
-  for (i = 0; i < Elements(tgsi_fs_coord_origin_names); i++) {
-    const char *cur = *pcur;
-
-    if (str_match_nocase_whole(&cur, tgsi_fs_coord_origin_names[i])) {
-      *fs_coord_origin = i;
-      *pcur = cur;
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static boolean parse_fs_coord_pixel_center(const char **pcur,
-                                           uint *fs_coord_pixel_center) {
-  uint i;
-
-  for (i = 0; i < Elements(tgsi_fs_coord_pixel_center_names); i++) {
-    const char *cur = *pcur;
-
-    if (str_match_nocase_whole(&cur, tgsi_fs_coord_pixel_center_names[i])) {
-      *fs_coord_pixel_center = i;
-      *pcur = cur;
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static boolean parse_property_next_shader(const char **pcur,
-                                          uint *next_shader) {
-  uint i;
-
-  for (i = 0; i < ARRAY_SIZE(tgsi_processor_type_names); i++) {
-    const char *cur = *pcur;
-
-    if (str_match_nocase_whole(&cur, tgsi_processor_type_names[i])) {
-      *next_shader = i;
-      *pcur = cur;
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static boolean parse_property(struct translate_ctx *ctx) {
-  struct tgsi_full_property prop;
-  uint property_name;
-  uint values[8];
-  uint advance;
-  char id[64];
-
-  if (!eat_white(&ctx->cur)) {
-    report_error(ctx, "Syntax error");
-    return FALSE;
-  }
-  if (!parse_identifier(&ctx->cur, id, sizeof(id))) {
-    report_error(ctx, "Syntax error");
-    return FALSE;
-  }
-  for (property_name = 0; property_name < TGSI_PROPERTY_COUNT;
-       ++property_name) {
-    if (streq_nocase_uprcase(tgsi_property_names[property_name], id)) {
-      break;
-    }
-  }
-  if (property_name >= TGSI_PROPERTY_COUNT) {
-    eat_until_eol(&ctx->cur);
-    report_error(ctx, "\nError: Unknown property : '%s'\n", id);
-    return TRUE;
-  }
-
-  eat_opt_white(&ctx->cur);
-  switch (property_name) {
-  case TGSI_PROPERTY_GS_INPUT_PRIM:
-  case TGSI_PROPERTY_GS_OUTPUT_PRIM:
-    if (!parse_primitive(&ctx->cur, &values[0])) {
-      report_error(ctx, "Unknown primitive name as property!");
-      return FALSE;
-    }
-    if (property_name == TGSI_PROPERTY_GS_INPUT_PRIM &&
-        ctx->processor == TGSI_PROCESSOR_GEOMETRY) {
-      ctx->implied_array_size = u_vertices_per_prim(values[0]);
-    }
-    break;
-  case TGSI_PROPERTY_FS_COORD_ORIGIN:
-    if (!parse_fs_coord_origin(&ctx->cur, &values[0])) {
-      report_error(ctx, "Unknown coord origin as property: must be UPPER_LEFT "
-                        "or LOWER_LEFT!");
-      return FALSE;
-    }
-    break;
-  case TGSI_PROPERTY_FS_COORD_PIXEL_CENTER:
-    if (!parse_fs_coord_pixel_center(&ctx->cur, &values[0])) {
-      report_error(ctx, "Unknown coord pixel center as property: must be "
-                        "HALF_INTEGER or INTEGER!");
-      return FALSE;
-    }
-    break;
-  case TGSI_PROPERTY_NEXT_SHADER:
-    if (!parse_property_next_shader(&ctx->cur, &values[0])) {
-      report_error(ctx, "Unknown next shader property value.");
-      return FALSE;
-    }
-    break;
-  case TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS:
-  default:
-    if (!parse_uint(&ctx->cur, &values[0])) {
-      report_error(ctx, "Expected unsigned integer as property!");
-      return FALSE;
-    }
-  }
-
-  prop = tgsi_default_full_property();
-  prop.Property.PropertyName = property_name;
-  prop.Property.NrTokens += 1;
-  prop.u[0].Data = values[0];
-
-  advance = tgsi_build_full_property(&prop, ctx->tokens_cur, ctx->header,
-                                     (uint)(ctx->tokens_end - ctx->tokens_cur));
-  if (advance == 0)
-    return FALSE;
-  ctx->tokens_cur += advance;
-
-  return TRUE;
-}
-
-static boolean translate(struct translate_ctx *ctx) {
-  eat_opt_white(&ctx->cur);
-  if (!parse_header(ctx))
-    return FALSE;
-
-  if (ctx->processor == TGSI_PROCESSOR_TESS_CTRL ||
-      ctx->processor == TGSI_PROCESSOR_TESS_EVAL)
-    ctx->implied_array_size = 32;
-
-  while (*ctx->cur != '\0') {
-    uint label_val = 0;
-    if (!eat_white(&ctx->cur)) {
-      report_error(ctx, "Syntax error");
-      return FALSE;
-    }
-
-    if (*ctx->cur == '\0')
-      break;
-    if (parse_label(ctx, &label_val)) {
-      if (!parse_instruction(ctx, TRUE))
-        return FALSE;
-    } else if (str_match_nocase_whole(&ctx->cur, "DCL")) {
-      if (!parse_declaration(ctx))
-        return FALSE;
-    } else if (str_match_nocase_whole(&ctx->cur, "IMM")) {
-      if (!parse_immediate(ctx))
-        return FALSE;
-    } else if (str_match_nocase_whole(&ctx->cur, "PROPERTY")) {
-      if (!parse_property(ctx))
-        return FALSE;
-    } else if (!parse_instruction(ctx, FALSE)) {
-      return FALSE;
-    }
-  }
-
-  return TRUE;
-}
-
-boolean tgsi_text_translate(const char *text, struct tgsi_token *tokens,
-                            uint num_tokens) {
-  struct translate_ctx ctx = {0};
-
-  ctx.text = text;
-  ctx.cur = text;
-  ctx.tokens = tokens;
-  ctx.tokens_cur = tokens;
-  ctx.tokens_end = tokens + num_tokens;
-
-  if (!translate(&ctx))
-    return FALSE;
-
-  return tgsi_sanity_check(tokens);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_text.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_text.h
deleted file mode 100644
index dadcd2613..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_text.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_TEXT_H
-#define TGSI_TEXT_H
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-#include "pipe/p_compiler.h"
-
-struct tgsi_token;
-
-boolean tgsi_text_translate(const char *text, struct tgsi_token *tokens,
-                            uint num_tokens);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_TEXT_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_transform.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_transform.c
deleted file mode 100644
index 80d6d8179..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_transform.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * TGSI program transformation utility.
- *
- * Authors:  Brian Paul
- */
-
-#include "util/u_debug.h"
-
-#include "tgsi_transform.h"
-
-static void emit_instruction(struct tgsi_transform_context *ctx,
-                             const struct tgsi_full_instruction *inst) {
-  uint ti = ctx->ti;
-
-  ti += tgsi_build_full_instruction(inst, ctx->tokens_out + ti, ctx->header,
-                                    ctx->max_tokens_out - ti);
-  ctx->ti = ti;
-}
-
-static void emit_declaration(struct tgsi_transform_context *ctx,
-                             const struct tgsi_full_declaration *decl) {
-  uint ti = ctx->ti;
-
-  ti += tgsi_build_full_declaration(decl, ctx->tokens_out + ti, ctx->header,
-                                    ctx->max_tokens_out - ti);
-  ctx->ti = ti;
-}
-
-static void emit_immediate(struct tgsi_transform_context *ctx,
-                           const struct tgsi_full_immediate *imm) {
-  uint ti = ctx->ti;
-
-  ti += tgsi_build_full_immediate(imm, ctx->tokens_out + ti, ctx->header,
-                                  ctx->max_tokens_out - ti);
-  ctx->ti = ti;
-}
-
-static void emit_property(struct tgsi_transform_context *ctx,
-                          const struct tgsi_full_property *prop) {
-  uint ti = ctx->ti;
-
-  ti += tgsi_build_full_property(prop, ctx->tokens_out + ti, ctx->header,
-                                 ctx->max_tokens_out - ti);
-  ctx->ti = ti;
-}
-
-/**
- * Apply user-defined transformations to the input shader to produce
- * the output shader.
- * For example, a register search-and-replace operation could be applied
- * by defining a transform_instruction() callback that examined and changed
- * the instruction src/dest regs.
- *
- * \return number of tokens emitted
- */
-int tgsi_transform_shader(const struct tgsi_token *tokens_in,
-                          struct tgsi_token *tokens_out, uint max_tokens_out,
-                          struct tgsi_transform_context *ctx) {
-  uint procType;
-
-  /* input shader */
-  struct tgsi_parse_context parse;
-
-  /* output shader */
-  struct tgsi_processor *processor;
-
-  /**
-   ** callback context init
-   **/
-  ctx->emit_instruction = emit_instruction;
-  ctx->emit_declaration = emit_declaration;
-  ctx->emit_immediate = emit_immediate;
-  ctx->emit_property = emit_property;
-  ctx->tokens_out = tokens_out;
-  ctx->max_tokens_out = max_tokens_out;
-
-  /**
-   ** Setup to begin parsing input shader
-   **/
-  if (tgsi_parse_init(&parse, tokens_in) != TGSI_PARSE_OK) {
-    debug_printf("tgsi_parse_init() failed in tgsi_transform_shader()!\n");
-    return -1;
-  }
-  procType = parse.FullHeader.Processor.Processor;
-  assert(procType == TGSI_PROCESSOR_FRAGMENT ||
-         procType == TGSI_PROCESSOR_VERTEX ||
-         procType == TGSI_PROCESSOR_GEOMETRY);
-
-  /**
-   **  Setup output shader
-   **/
-  ctx->header = (struct tgsi_header *)tokens_out;
-  *ctx->header = tgsi_build_header();
-
-  processor = (struct tgsi_processor *)(tokens_out + 1);
-  *processor = tgsi_build_processor(procType, ctx->header);
-
-  ctx->ti = 2;
-
-  /**
-   ** Loop over incoming program tokens/instructions
-   */
-  while (!tgsi_parse_end_of_tokens(&parse)) {
-
-    tgsi_parse_token(&parse);
-
-    switch (parse.FullToken.Token.Type) {
-    case TGSI_TOKEN_TYPE_INSTRUCTION: {
-      struct tgsi_full_instruction *fullinst = &parse.FullToken.FullInstruction;
-
-      if (ctx->transform_instruction)
-        ctx->transform_instruction(ctx, fullinst);
-      else
-        ctx->emit_instruction(ctx, fullinst);
-    } break;
-
-    case TGSI_TOKEN_TYPE_DECLARATION: {
-      struct tgsi_full_declaration *fulldecl = &parse.FullToken.FullDeclaration;
-
-      if (ctx->transform_declaration)
-        ctx->transform_declaration(ctx, fulldecl);
-      else
-        ctx->emit_declaration(ctx, fulldecl);
-    } break;
-
-    case TGSI_TOKEN_TYPE_IMMEDIATE: {
-      struct tgsi_full_immediate *fullimm = &parse.FullToken.FullImmediate;
-
-      if (ctx->transform_immediate)
-        ctx->transform_immediate(ctx, fullimm);
-      else
-        ctx->emit_immediate(ctx, fullimm);
-    } break;
-    case TGSI_TOKEN_TYPE_PROPERTY: {
-      struct tgsi_full_property *fullprop = &parse.FullToken.FullProperty;
-
-      if (ctx->transform_property)
-        ctx->transform_property(ctx, fullprop);
-      else
-        ctx->emit_property(ctx, fullprop);
-    } break;
-
-    default:
-      assert(0);
-    }
-  }
-
-  if (ctx->epilog) {
-    ctx->epilog(ctx);
-  }
-
-  tgsi_parse_free(&parse);
-
-  return ctx->ti;
-}
-
-#include "tgsi_text.h"
-
-extern int tgsi_transform_foo(struct tgsi_token *tokens_out,
-                              uint max_tokens_out);
-
-/* This function exists only so that tgsi_text_translate() doesn't get
- * magic-ed out of the libtgsi.a archive by the build system.  Don't
- * remove unless you know this has been fixed - check on mingw/scons
- * builds as well.
- */
-int tgsi_transform_foo(struct tgsi_token *tokens_out, uint max_tokens_out) {
-  const char *text = "FRAG\n"
-                     "DCL IN[0], COLOR, CONSTANT\n"
-                     "DCL OUT[0], COLOR\n"
-                     "  0: MOV OUT[0], IN[0]\n"
-                     "  1: END";
-
-  return tgsi_text_translate(text, tokens_out, max_tokens_out);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_transform.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_transform.h
deleted file mode 100644
index 0d68c04bd..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_transform.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_TRANSFORM_H
-#define TGSI_TRANSFORM_H
-
-#include "pipe/p_shader_tokens.h"
-#include "tgsi/tgsi_build.h"
-#include "tgsi/tgsi_parse.h"
-
-/**
- * Subclass this to add caller-specific data
- */
-struct tgsi_transform_context {
-  /**** PUBLIC ***/
-
-  /**
-   * User-defined callbacks invoked per instruction.
-   */
-  void (*transform_instruction)(struct tgsi_transform_context *ctx,
-                                struct tgsi_full_instruction *inst);
-
-  void (*transform_declaration)(struct tgsi_transform_context *ctx,
-                                struct tgsi_full_declaration *decl);
-
-  void (*transform_immediate)(struct tgsi_transform_context *ctx,
-                              struct tgsi_full_immediate *imm);
-  void (*transform_property)(struct tgsi_transform_context *ctx,
-                             struct tgsi_full_property *prop);
-
-  /**
-   * Called at end of input program to allow caller to append extra
-   * instructions.  Return number of tokens emitted.
-   */
-  void (*epilog)(struct tgsi_transform_context *ctx);
-
-  /*** PRIVATE ***/
-
-  /**
-   * These are setup by tgsi_transform_shader() and cannot be overridden.
-   * Meant to be called from in the above user callback functions.
-   */
-  void (*emit_instruction)(struct tgsi_transform_context *ctx,
-                           const struct tgsi_full_instruction *inst);
-  void (*emit_declaration)(struct tgsi_transform_context *ctx,
-                           const struct tgsi_full_declaration *decl);
-  void (*emit_immediate)(struct tgsi_transform_context *ctx,
-                         const struct tgsi_full_immediate *imm);
-  void (*emit_property)(struct tgsi_transform_context *ctx,
-                        const struct tgsi_full_property *prop);
-
-  struct tgsi_header *header;
-  uint max_tokens_out;
-  struct tgsi_token *tokens_out;
-  uint ti;
-};
-
-extern int tgsi_transform_shader(const struct tgsi_token *tokens_in,
-                                 struct tgsi_token *tokens_out,
-                                 uint max_tokens_out,
-                                 struct tgsi_transform_context *ctx);
-
-#endif /* TGSI_TRANSFORM_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_ureg.c
deleted file mode 100644
index 4451d659d..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ /dev/null
@@ -1,1458 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009-2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE, INC AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi/tgsi_ureg.h"
-#include "pipe/p_context.h"
-#include "pipe/p_state.h"
-#include "tgsi/tgsi_build.h"
-#include "tgsi/tgsi_dump.h"
-#include "tgsi/tgsi_info.h"
-#include "tgsi/tgsi_sanity.h"
-#include "util/u_bitmask.h"
-#include "util/u_debug.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-
-union tgsi_any_token {
-  struct tgsi_header header;
-  struct tgsi_processor processor;
-  struct tgsi_token token;
-  struct tgsi_property prop;
-  struct tgsi_property_data prop_data;
-  struct tgsi_declaration decl;
-  struct tgsi_declaration_range decl_range;
-  struct tgsi_declaration_dimension decl_dim;
-  struct tgsi_declaration_interp decl_interp;
-  struct tgsi_declaration_semantic decl_semantic;
-  struct tgsi_declaration_sampler_view decl_sampler_view;
-  struct tgsi_declaration_array array;
-  struct tgsi_immediate imm;
-  union tgsi_immediate_data imm_data;
-  struct tgsi_instruction insn;
-  struct tgsi_instruction_label insn_label;
-  struct tgsi_instruction_texture insn_texture;
-  struct tgsi_texture_offset insn_texture_offset;
-  struct tgsi_src_register src;
-  struct tgsi_ind_register ind;
-  struct tgsi_dimension dim;
-  struct tgsi_dst_register dst;
-  unsigned value;
-};
-
-struct ureg_tokens {
-  union tgsi_any_token *tokens;
-  unsigned size;
-  unsigned order;
-  unsigned count;
-};
-
-#define UREG_MAX_INPUT PIPE_MAX_ATTRIBS
-#define UREG_MAX_SYSTEM_VALUE PIPE_MAX_ATTRIBS
-#define UREG_MAX_OUTPUT PIPE_MAX_SHADER_OUTPUTS
-#define UREG_MAX_CONSTANT_RANGE 32
-#define UREG_MAX_HW_ATOMIC_RANGE 32
-#define UREG_MAX_IMMEDIATE 4096
-#define UREG_MAX_ADDR 3
-#define UREG_MAX_PRED 1
-#define UREG_MAX_ARRAY_TEMPS 256
-
-struct const_decl {
-  struct {
-    unsigned first;
-    unsigned last;
-  } constant_range[UREG_MAX_CONSTANT_RANGE];
-  unsigned nr_constant_ranges;
-};
-
-struct hw_atomic_decl {
-  struct {
-    unsigned first;
-    unsigned last;
-    unsigned array_id;
-  } hw_atomic_range[UREG_MAX_HW_ATOMIC_RANGE];
-  unsigned nr_hw_atomic_ranges;
-};
-
-#define DOMAIN_DECL 0
-#define DOMAIN_INSN 1
-
-struct ureg_program {
-  unsigned processor;
-  struct pipe_context *pipe;
-
-  struct {
-    unsigned semantic_name;
-    unsigned semantic_index;
-    unsigned interp;
-    unsigned char cylindrical_wrap;
-    unsigned interp_location;
-  } fs_input[UREG_MAX_INPUT];
-  unsigned nr_fs_inputs;
-
-  unsigned vs_inputs[UREG_MAX_INPUT / 32];
-
-  struct {
-    unsigned index;
-    unsigned semantic_name;
-    unsigned semantic_index;
-  } gs_input[UREG_MAX_INPUT];
-  unsigned nr_gs_inputs;
-
-  struct {
-    unsigned index;
-    unsigned semantic_name;
-    unsigned semantic_index;
-  } system_value[UREG_MAX_SYSTEM_VALUE];
-  unsigned nr_system_values;
-
-  struct {
-    unsigned semantic_name;
-    unsigned semantic_index;
-    unsigned usage_mask; /* = TGSI_WRITEMASK_* */
-  } output[UREG_MAX_OUTPUT];
-  unsigned nr_outputs;
-
-  struct {
-    union {
-      float f[4];
-      unsigned u[4];
-      int i[4];
-    } value;
-    unsigned nr;
-    unsigned type;
-  } immediate[UREG_MAX_IMMEDIATE];
-  unsigned nr_immediates;
-
-  struct ureg_src sampler[PIPE_MAX_SAMPLERS];
-  unsigned nr_samplers;
-
-  struct {
-    unsigned index;
-    unsigned target;
-    unsigned return_type_x;
-    unsigned return_type_y;
-    unsigned return_type_z;
-    unsigned return_type_w;
-  } sampler_view[PIPE_MAX_SHADER_SAMPLER_VIEWS];
-  unsigned nr_sampler_views;
-
-  struct util_bitmask *free_temps;
-  struct util_bitmask *local_temps;
-  struct util_bitmask *decl_temps;
-  unsigned nr_temps;
-
-  unsigned array_temps[UREG_MAX_ARRAY_TEMPS];
-  unsigned nr_array_temps;
-
-  struct const_decl const_decls;
-  struct const_decl const_decls2D[PIPE_MAX_CONSTANT_BUFFERS];
-
-  struct hw_atomic_decl hw_atomic_decls[PIPE_MAX_HW_ATOMIC_BUFFERS];
-
-  unsigned properties[TGSI_PROPERTY_COUNT];
-
-  unsigned nr_addrs;
-  unsigned nr_preds;
-  unsigned nr_instructions;
-
-  struct ureg_tokens domain[2];
-};
-
-static union tgsi_any_token error_tokens[32];
-
-static void tokens_error(struct ureg_tokens *tokens) {
-  if (tokens->tokens && tokens->tokens != error_tokens)
-    FREE(tokens->tokens);
-
-  tokens->tokens = error_tokens;
-  tokens->size = ARRAY_SIZE(error_tokens);
-  tokens->count = 0;
-}
-
-static void tokens_expand(struct ureg_tokens *tokens, unsigned count) {
-  unsigned old_size = tokens->size * sizeof(unsigned);
-
-  if (tokens->tokens == error_tokens) {
-    return;
-  }
-
-  while (tokens->count + count > tokens->size) {
-    tokens->size = (1 << ++tokens->order);
-  }
-
-  tokens->tokens =
-      REALLOC(tokens->tokens, old_size, tokens->size * sizeof(unsigned));
-  if (tokens->tokens == NULL) {
-    tokens_error(tokens);
-  }
-}
-
-static void set_bad(struct ureg_program *ureg) {
-  tokens_error(&ureg->domain[0]);
-}
-
-static union tgsi_any_token *get_tokens(struct ureg_program *ureg,
-                                        unsigned domain, unsigned count) {
-  struct ureg_tokens *tokens = &ureg->domain[domain];
-  union tgsi_any_token *result;
-
-  if (tokens->count + count > tokens->size)
-    tokens_expand(tokens, count);
-
-  result = &tokens->tokens[tokens->count];
-  tokens->count += count;
-  return result;
-}
-
-static union tgsi_any_token *retrieve_token(struct ureg_program *ureg,
-                                            unsigned domain, unsigned nr) {
-  if (ureg->domain[domain].tokens == error_tokens)
-    return &error_tokens[0];
-
-  return &ureg->domain[domain].tokens[nr];
-}
-
-static inline struct ureg_dst ureg_dst_register(unsigned file, unsigned index) {
-  struct ureg_dst dst;
-
-  dst.File = file;
-  dst.WriteMask = TGSI_WRITEMASK_XYZW;
-  dst.Indirect = 0;
-  dst.IndirectFile = TGSI_FILE_NULL;
-  dst.IndirectIndex = 0;
-  dst.IndirectSwizzle = 0;
-  dst.Saturate = 0;
-  dst.PredNegate = 0;
-  dst.PredSwizzleX = TGSI_SWIZZLE_X;
-  dst.PredSwizzleY = TGSI_SWIZZLE_Y;
-  dst.PredSwizzleZ = TGSI_SWIZZLE_Z;
-  dst.PredSwizzleW = TGSI_SWIZZLE_W;
-  dst.Index = index;
-  dst.ArrayID = 0;
-
-  return dst;
-}
-
-void ureg_property(struct ureg_program *ureg, unsigned name, unsigned value) {
-  assert(name < ARRAY_SIZE(ureg->properties));
-  ureg->properties[name] = value;
-}
-
-struct ureg_src ureg_DECL_fs_input_cyl_centroid(
-    struct ureg_program *ureg, unsigned semantic_name, unsigned semantic_index,
-    unsigned interp_mode, unsigned cylindrical_wrap, unsigned interp_location) {
-  unsigned i;
-
-  for (i = 0; i < ureg->nr_fs_inputs; i++) {
-    if (ureg->fs_input[i].semantic_name == semantic_name &&
-        ureg->fs_input[i].semantic_index == semantic_index) {
-      goto out;
-    }
-  }
-
-  if (ureg->nr_fs_inputs < UREG_MAX_INPUT) {
-    ureg->fs_input[i].semantic_name = semantic_name;
-    ureg->fs_input[i].semantic_index = semantic_index;
-    ureg->fs_input[i].interp = interp_mode;
-    ureg->fs_input[i].cylindrical_wrap = cylindrical_wrap;
-    ureg->fs_input[i].interp_location = interp_location;
-    ureg->nr_fs_inputs++;
-  } else {
-    set_bad(ureg);
-  }
-
-out:
-  return ureg_src_register(TGSI_FILE_INPUT, i);
-}
-
-struct ureg_src ureg_DECL_vs_input(struct ureg_program *ureg, unsigned index) {
-  assert(ureg->processor == TGSI_PROCESSOR_VERTEX);
-
-  ureg->vs_inputs[index / 32] |= 1 << (index % 32);
-  return ureg_src_register(TGSI_FILE_INPUT, index);
-}
-
-struct ureg_src ureg_DECL_gs_input(struct ureg_program *ureg, unsigned index,
-                                   unsigned semantic_name,
-                                   unsigned semantic_index) {
-  if (ureg->nr_gs_inputs < UREG_MAX_INPUT) {
-    ureg->gs_input[ureg->nr_gs_inputs].index = index;
-    ureg->gs_input[ureg->nr_gs_inputs].semantic_name = semantic_name;
-    ureg->gs_input[ureg->nr_gs_inputs].semantic_index = semantic_index;
-    ureg->nr_gs_inputs++;
-  } else {
-    set_bad(ureg);
-  }
-
-  /* XXX: Add suport for true 2D input registers. */
-  return ureg_src_register(TGSI_FILE_INPUT, index);
-}
-
-struct ureg_src ureg_DECL_system_value(struct ureg_program *ureg,
-                                       unsigned index, unsigned semantic_name,
-                                       unsigned semantic_index) {
-  if (ureg->nr_system_values < UREG_MAX_SYSTEM_VALUE) {
-    ureg->system_value[ureg->nr_system_values].index = index;
-    ureg->system_value[ureg->nr_system_values].semantic_name = semantic_name;
-    ureg->system_value[ureg->nr_system_values].semantic_index = semantic_index;
-    ureg->nr_system_values++;
-  } else {
-    set_bad(ureg);
-  }
-
-  return ureg_src_register(TGSI_FILE_SYSTEM_VALUE, index);
-}
-
-struct ureg_dst ureg_DECL_output_masked(struct ureg_program *ureg,
-                                        unsigned name, unsigned index,
-                                        unsigned usage_mask) {
-  unsigned i;
-
-  assert(usage_mask != 0);
-
-  for (i = 0; i < ureg->nr_outputs; i++) {
-    if (ureg->output[i].semantic_name == name &&
-        ureg->output[i].semantic_index == index) {
-      ureg->output[i].usage_mask |= usage_mask;
-      goto out;
-    }
-  }
-
-  if (ureg->nr_outputs < UREG_MAX_OUTPUT) {
-    ureg->output[i].semantic_name = name;
-    ureg->output[i].semantic_index = index;
-    ureg->output[i].usage_mask = usage_mask;
-    ureg->nr_outputs++;
-  } else {
-    set_bad(ureg);
-  }
-
-out:
-  return ureg_dst_register(TGSI_FILE_OUTPUT, i);
-}
-
-struct ureg_dst ureg_DECL_output(struct ureg_program *ureg, unsigned name,
-                                 unsigned index) {
-  return ureg_DECL_output_masked(ureg, name, index, TGSI_WRITEMASK_XYZW);
-}
-
-/* Returns a new constant register.  Keep track of which have been
- * referred to so that we can emit decls later.
- *
- * Constant operands declared with this function must be addressed
- * with a two-dimensional index.
- *
- * There is nothing in this code to bind this constant to any tracked
- * value or manage any constant_buffer contents -- that's the
- * resposibility of the calling code.
- */
-void ureg_DECL_constant2D(struct ureg_program *ureg, unsigned first,
-                          unsigned last, unsigned index2D) {
-  struct const_decl *decl = &ureg->const_decls2D[index2D];
-
-  assert(index2D < PIPE_MAX_CONSTANT_BUFFERS);
-
-  if (decl->nr_constant_ranges < UREG_MAX_CONSTANT_RANGE) {
-    uint i = decl->nr_constant_ranges++;
-
-    decl->constant_range[i].first = first;
-    decl->constant_range[i].last = last;
-  }
-}
-
-/* A one-dimensional, depricated version of ureg_DECL_constant2D().
- *
- * Constant operands declared with this function must be addressed
- * with a one-dimensional index.
- */
-struct ureg_src ureg_DECL_constant(struct ureg_program *ureg, unsigned index) {
-  struct const_decl *decl = &ureg->const_decls;
-  unsigned minconst = index, maxconst = index;
-  unsigned i;
-
-  /* Inside existing range?
-   */
-  for (i = 0; i < decl->nr_constant_ranges; i++) {
-    if (decl->constant_range[i].first <= index &&
-        decl->constant_range[i].last >= index) {
-      goto out;
-    }
-  }
-
-  /* Extend existing range?
-   */
-  for (i = 0; i < decl->nr_constant_ranges; i++) {
-    if (decl->constant_range[i].last == index - 1) {
-      decl->constant_range[i].last = index;
-      goto out;
-    }
-
-    if (decl->constant_range[i].first == index + 1) {
-      decl->constant_range[i].first = index;
-      goto out;
-    }
-
-    minconst = MIN2(minconst, decl->constant_range[i].first);
-    maxconst = MAX2(maxconst, decl->constant_range[i].last);
-  }
-
-  /* Create new range?
-   */
-  if (decl->nr_constant_ranges < UREG_MAX_CONSTANT_RANGE) {
-    i = decl->nr_constant_ranges++;
-    decl->constant_range[i].first = index;
-    decl->constant_range[i].last = index;
-    goto out;
-  }
-
-  /* Collapse all ranges down to one:
-   */
-  i = 0;
-  decl->constant_range[0].first = minconst;
-  decl->constant_range[0].last = maxconst;
-  decl->nr_constant_ranges = 1;
-
-out:
-  assert(i < decl->nr_constant_ranges);
-  assert(decl->constant_range[i].first <= index);
-  assert(decl->constant_range[i].last >= index);
-  return ureg_src_register(TGSI_FILE_CONSTANT, index);
-}
-
-/* Returns a new hw atomic register.  Keep track of which have been
- * referred to so that we can emit decls later.
- */
-void ureg_DECL_hw_atomic(struct ureg_program *ureg, unsigned first,
-                         unsigned last, unsigned buffer_id, unsigned array_id) {
-  struct hw_atomic_decl *decl = &ureg->hw_atomic_decls[buffer_id];
-
-  if (decl->nr_hw_atomic_ranges < UREG_MAX_HW_ATOMIC_RANGE) {
-    uint i = decl->nr_hw_atomic_ranges++;
-
-    decl->hw_atomic_range[i].first = first;
-    decl->hw_atomic_range[i].last = last;
-    decl->hw_atomic_range[i].array_id = array_id;
-  } else {
-    set_bad(ureg);
-  }
-}
-
-static struct ureg_dst alloc_temporary(struct ureg_program *ureg,
-                                       boolean local) {
-  unsigned i;
-
-  /* Look for a released temporary.
-   */
-  for (i = util_bitmask_get_first_index(ureg->free_temps);
-       i != UTIL_BITMASK_INVALID_INDEX;
-       i = util_bitmask_get_next_index(ureg->free_temps, i + 1)) {
-    if (util_bitmask_get(ureg->local_temps, i) == local)
-      break;
-  }
-
-  /* Or allocate a new one.
-   */
-  if (i == UTIL_BITMASK_INVALID_INDEX) {
-    i = ureg->nr_temps++;
-
-    if (local)
-      util_bitmask_set(ureg->local_temps, i);
-
-    /* Start a new declaration when the local flag changes */
-    if (!i || util_bitmask_get(ureg->local_temps, i - 1) != local)
-      util_bitmask_set(ureg->decl_temps, i);
-  }
-
-  util_bitmask_clear(ureg->free_temps, i);
-
-  return ureg_dst_register(TGSI_FILE_TEMPORARY, i);
-}
-
-struct ureg_dst ureg_DECL_temporary(struct ureg_program *ureg) {
-  return alloc_temporary(ureg, FALSE);
-}
-
-struct ureg_dst ureg_DECL_local_temporary(struct ureg_program *ureg) {
-  return alloc_temporary(ureg, TRUE);
-}
-
-struct ureg_dst ureg_DECL_array_temporary(struct ureg_program *ureg,
-                                          unsigned size, boolean local) {
-  unsigned i = ureg->nr_temps;
-  struct ureg_dst dst = ureg_dst_register(TGSI_FILE_TEMPORARY, i);
-
-  if (local)
-    util_bitmask_set(ureg->local_temps, i);
-
-  /* Always start a new declaration at the start */
-  util_bitmask_set(ureg->decl_temps, i);
-
-  ureg->nr_temps += size;
-
-  /* and also at the end of the array */
-  util_bitmask_set(ureg->decl_temps, ureg->nr_temps);
-
-  if (ureg->nr_array_temps < UREG_MAX_ARRAY_TEMPS) {
-    ureg->array_temps[ureg->nr_array_temps++] = i;
-    dst.ArrayID = ureg->nr_array_temps;
-  }
-
-  return dst;
-}
-
-void ureg_release_temporary(struct ureg_program *ureg, struct ureg_dst tmp) {
-  if (tmp.File == TGSI_FILE_TEMPORARY)
-    util_bitmask_set(ureg->free_temps, tmp.Index);
-}
-
-/* Allocate a new address register.
- */
-struct ureg_dst ureg_DECL_address(struct ureg_program *ureg) {
-  if (ureg->nr_addrs < UREG_MAX_ADDR)
-    return ureg_dst_register(TGSI_FILE_ADDRESS, ureg->nr_addrs++);
-
-  assert(0);
-  return ureg_dst_register(TGSI_FILE_ADDRESS, 0);
-}
-
-/* Allocate a new predicate register.
- */
-struct ureg_dst ureg_DECL_predicate(struct ureg_program *ureg) {
-  if (ureg->nr_preds < UREG_MAX_PRED) {
-    return ureg_dst_register(TGSI_FILE_PREDICATE, ureg->nr_preds++);
-  }
-
-  assert(0);
-  return ureg_dst_register(TGSI_FILE_PREDICATE, 0);
-}
-
-/* Allocate a new sampler.
- */
-struct ureg_src ureg_DECL_sampler(struct ureg_program *ureg, int nr) {
-  unsigned i;
-
-  for (i = 0; i < ureg->nr_samplers; i++)
-    if (ureg->sampler[i].Index == nr)
-      return ureg->sampler[i];
-
-  if (i < PIPE_MAX_SAMPLERS) {
-    ureg->sampler[i] = ureg_src_register(TGSI_FILE_SAMPLER, nr);
-    ureg->nr_samplers++;
-    return ureg->sampler[i];
-  }
-
-  assert(0);
-  return ureg->sampler[0];
-}
-
-/*
- * Allocate a new shader sampler view.
- */
-struct ureg_src ureg_DECL_sampler_view(struct ureg_program *ureg,
-                                       unsigned index, unsigned target,
-                                       unsigned return_type_x,
-                                       unsigned return_type_y,
-                                       unsigned return_type_z,
-                                       unsigned return_type_w) {
-  struct ureg_src reg = ureg_src_register(TGSI_FILE_SAMPLER_VIEW, index);
-  uint i;
-
-  for (i = 0; i < ureg->nr_sampler_views; i++) {
-    if (ureg->sampler_view[i].index == index) {
-      return reg;
-    }
-  }
-
-  if (i < PIPE_MAX_SHADER_SAMPLER_VIEWS) {
-    ureg->sampler_view[i].index = index;
-    ureg->sampler_view[i].target = target;
-    ureg->sampler_view[i].return_type_x = return_type_x;
-    ureg->sampler_view[i].return_type_y = return_type_y;
-    ureg->sampler_view[i].return_type_z = return_type_z;
-    ureg->sampler_view[i].return_type_w = return_type_w;
-    ureg->nr_sampler_views++;
-    return reg;
-  }
-
-  assert(0);
-  return reg;
-}
-
-static int match_or_expand_immediate(const unsigned *v, unsigned nr,
-                                     unsigned *v2, unsigned *pnr2,
-                                     unsigned *swizzle) {
-  unsigned nr2 = *pnr2;
-  unsigned i, j;
-
-  *swizzle = 0;
-
-  for (i = 0; i < nr; i++) {
-    boolean found = FALSE;
-
-    for (j = 0; j < nr2 && !found; j++) {
-      if (v[i] == v2[j]) {
-        *swizzle |= j << (i * 2);
-        found = TRUE;
-      }
-    }
-
-    if (!found) {
-      if (nr2 >= 4) {
-        return FALSE;
-      }
-
-      v2[nr2] = v[i];
-      *swizzle |= nr2 << (i * 2);
-      nr2++;
-    }
-  }
-
-  /* Actually expand immediate only when fully succeeded.
-   */
-  *pnr2 = nr2;
-  return TRUE;
-}
-
-static struct ureg_src decl_immediate(struct ureg_program *ureg,
-                                      const unsigned *v, unsigned nr,
-                                      unsigned type) {
-  unsigned i, j;
-  unsigned swizzle = 0;
-
-  /* Could do a first pass where we examine all existing immediates
-   * without expanding.
-   */
-
-  for (i = 0; i < ureg->nr_immediates; i++) {
-    if (ureg->immediate[i].type != type) {
-      continue;
-    }
-    if (match_or_expand_immediate(v, nr, ureg->immediate[i].value.u,
-                                  &ureg->immediate[i].nr, &swizzle)) {
-      goto out;
-    }
-  }
-
-  if (ureg->nr_immediates < UREG_MAX_IMMEDIATE) {
-    i = ureg->nr_immediates++;
-    ureg->immediate[i].type = type;
-    if (match_or_expand_immediate(v, nr, ureg->immediate[i].value.u,
-                                  &ureg->immediate[i].nr, &swizzle)) {
-      goto out;
-    }
-  }
-
-  set_bad(ureg);
-
-out:
-  /* Make sure that all referenced elements are from this immediate.
-   * Has the effect of making size-one immediates into scalars.
-   */
-  for (j = nr; j < 4; j++) {
-    swizzle |= (swizzle & 0x3) << (j * 2);
-  }
-
-  return ureg_swizzle(ureg_src_register(TGSI_FILE_IMMEDIATE, i),
-                      (swizzle >> 0) & 0x3, (swizzle >> 2) & 0x3,
-                      (swizzle >> 4) & 0x3, (swizzle >> 6) & 0x3);
-}
-
-struct ureg_src ureg_DECL_immediate(struct ureg_program *ureg, const float *v,
-                                    unsigned nr) {
-  union {
-    float f[4];
-    unsigned u[4];
-  } fu;
-  unsigned int i;
-
-  for (i = 0; i < nr; i++) {
-    fu.f[i] = v[i];
-  }
-
-  return decl_immediate(ureg, fu.u, nr, TGSI_IMM_FLOAT32);
-}
-
-struct ureg_src ureg_DECL_immediate_uint(struct ureg_program *ureg,
-                                         const unsigned *v, unsigned nr) {
-  return decl_immediate(ureg, v, nr, TGSI_IMM_UINT32);
-}
-
-struct ureg_src ureg_DECL_immediate_block_uint(struct ureg_program *ureg,
-                                               const unsigned *v, unsigned nr) {
-  uint index;
-  uint i;
-
-  if (ureg->nr_immediates + (nr + 3) / 4 > UREG_MAX_IMMEDIATE) {
-    set_bad(ureg);
-    return ureg_src_register(TGSI_FILE_IMMEDIATE, 0);
-  }
-
-  index = ureg->nr_immediates;
-  ureg->nr_immediates += (nr + 3) / 4;
-
-  for (i = index; i < ureg->nr_immediates; i++) {
-    ureg->immediate[i].type = TGSI_IMM_UINT32;
-    ureg->immediate[i].nr = nr > 4 ? 4 : nr;
-    memcpy(ureg->immediate[i].value.u, &v[(i - index) * 4],
-           ureg->immediate[i].nr * sizeof(uint));
-    nr -= 4;
-  }
-
-  return ureg_src_register(TGSI_FILE_IMMEDIATE, index);
-}
-
-struct ureg_src ureg_DECL_immediate_int(struct ureg_program *ureg, const int *v,
-                                        unsigned nr) {
-  return decl_immediate(ureg, (const unsigned *)v, nr, TGSI_IMM_INT32);
-}
-
-void ureg_emit_src(struct ureg_program *ureg, struct ureg_src src) {
-  unsigned size = 1 + (src.Indirect ? 1 : 0) +
-                  (src.Dimension ? (src.DimIndirect ? 2 : 1) : 0);
-
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_INSN, size);
-  unsigned n = 0;
-
-  assert(src.File != TGSI_FILE_NULL);
-  assert(src.File < TGSI_FILE_COUNT);
-
-  out[n].value = 0;
-  out[n].src.File = src.File;
-  out[n].src.SwizzleX = src.SwizzleX;
-  out[n].src.SwizzleY = src.SwizzleY;
-  out[n].src.SwizzleZ = src.SwizzleZ;
-  out[n].src.SwizzleW = src.SwizzleW;
-  out[n].src.Index = src.Index;
-  out[n].src.Negate = src.Negate;
-  out[0].src.Absolute = src.Absolute;
-  n++;
-
-  if (src.Indirect) {
-    out[0].src.Indirect = 1;
-    out[n].value = 0;
-    out[n].ind.File = src.IndirectFile;
-    out[n].ind.Swizzle = src.IndirectSwizzle;
-    out[n].ind.Index = src.IndirectIndex;
-    out[n].ind.ArrayID = src.ArrayID;
-    n++;
-  }
-
-  if (src.Dimension) {
-    out[0].src.Dimension = 1;
-    out[n].dim.Dimension = 0;
-    out[n].dim.Padding = 0;
-    if (src.DimIndirect) {
-      out[n].dim.Indirect = 1;
-      out[n].dim.Index = src.DimensionIndex;
-      n++;
-      out[n].value = 0;
-      out[n].ind.File = src.DimIndFile;
-      out[n].ind.Swizzle = src.DimIndSwizzle;
-      out[n].ind.Index = src.DimIndIndex;
-      out[n].ind.ArrayID = src.ArrayID;
-    } else {
-      out[n].dim.Indirect = 0;
-      out[n].dim.Index = src.DimensionIndex;
-    }
-    n++;
-  }
-
-  assert(n == size);
-}
-
-void ureg_emit_dst(struct ureg_program *ureg, struct ureg_dst dst) {
-  unsigned size = (1 + (dst.Indirect ? 1 : 0));
-
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_INSN, size);
-  unsigned n = 0;
-
-  assert(dst.File != TGSI_FILE_NULL);
-  assert(dst.File != TGSI_FILE_CONSTANT);
-  assert(dst.File != TGSI_FILE_INPUT);
-  assert(dst.File != TGSI_FILE_SAMPLER);
-  assert(dst.File != TGSI_FILE_SAMPLER_VIEW);
-  assert(dst.File != TGSI_FILE_IMMEDIATE);
-  assert(dst.File < TGSI_FILE_COUNT);
-
-  out[n].value = 0;
-  out[n].dst.File = dst.File;
-  out[n].dst.WriteMask = dst.WriteMask;
-  out[n].dst.Indirect = dst.Indirect;
-  out[n].dst.Index = dst.Index;
-  n++;
-
-  if (dst.Indirect) {
-    out[n].value = 0;
-    out[n].ind.File = dst.IndirectFile;
-    out[n].ind.Swizzle = dst.IndirectSwizzle;
-    out[n].ind.Index = dst.IndirectIndex;
-    out[n].ind.ArrayID = dst.ArrayID;
-    n++;
-  }
-
-  assert(n == size);
-}
-
-static void validate(unsigned opcode, unsigned nr_dst, unsigned nr_src) {
-#ifdef DEBUG
-  const struct tgsi_opcode_info *info = tgsi_get_opcode_info(opcode);
-  assert(info);
-  if (info) {
-    assert(nr_dst == info->num_dst);
-    assert(nr_src == info->num_src);
-  }
-#else
-  (void)opcode;
-  (void)nr_dst;
-  (void)nr_src;
-#endif
-}
-
-struct ureg_emit_insn_result ureg_emit_insn(struct ureg_program *ureg,
-                                            unsigned opcode, boolean saturate,
-                                            unsigned precise, unsigned num_dst,
-                                            unsigned num_src) {
-  union tgsi_any_token *out;
-  uint count = 1;
-  struct ureg_emit_insn_result result;
-
-  validate(opcode, num_dst, num_src);
-
-  out = get_tokens(ureg, DOMAIN_INSN, count);
-  out[0].insn = tgsi_default_instruction();
-  out[0].insn.Opcode = opcode;
-  out[0].insn.Saturate = saturate;
-  out[0].insn.Precise = precise;
-  out[0].insn.NumDstRegs = num_dst;
-  out[0].insn.NumSrcRegs = num_src;
-
-  result.insn_token = ureg->domain[DOMAIN_INSN].count - count;
-  result.extended_token = result.insn_token;
-
-  ureg->nr_instructions++;
-
-  return result;
-}
-
-void ureg_emit_label(struct ureg_program *ureg, unsigned extended_token,
-                     unsigned *label_token) {
-  union tgsi_any_token *out, *insn;
-
-  if (!label_token)
-    return;
-
-  out = get_tokens(ureg, DOMAIN_INSN, 1);
-  out[0].value = 0;
-
-  insn = retrieve_token(ureg, DOMAIN_INSN, extended_token);
-  insn->insn.Label = 1;
-
-  *label_token = ureg->domain[DOMAIN_INSN].count - 1;
-}
-
-/* Will return a number which can be used in a label to point to the
- * next instruction to be emitted.
- */
-unsigned ureg_get_instruction_number(struct ureg_program *ureg) {
-  return ureg->nr_instructions;
-}
-
-/* Patch a given label (expressed as a token number) to point to a
- * given instruction (expressed as an instruction number).
- */
-void ureg_fixup_label(struct ureg_program *ureg, unsigned label_token,
-                      unsigned instruction_number) {
-  union tgsi_any_token *out = retrieve_token(ureg, DOMAIN_INSN, label_token);
-
-  out->insn_label.Label = instruction_number;
-}
-
-void ureg_emit_texture(struct ureg_program *ureg, unsigned extended_token,
-                       unsigned target, unsigned num_offsets) {
-  union tgsi_any_token *out, *insn;
-
-  out = get_tokens(ureg, DOMAIN_INSN, 1);
-  insn = retrieve_token(ureg, DOMAIN_INSN, extended_token);
-
-  insn->insn.Texture = 1;
-
-  out[0].value = 0;
-  out[0].insn_texture.Texture = target;
-  out[0].insn_texture.NumOffsets = num_offsets;
-}
-
-void ureg_emit_texture_offset(struct ureg_program *ureg,
-                              const struct tgsi_texture_offset *offset) {
-  union tgsi_any_token *out;
-
-  out = get_tokens(ureg, DOMAIN_INSN, 1);
-
-  out[0].value = 0;
-  out[0].insn_texture_offset = *offset;
-}
-
-void ureg_fixup_insn_size(struct ureg_program *ureg, unsigned insn) {
-  union tgsi_any_token *out = retrieve_token(ureg, DOMAIN_INSN, insn);
-
-  assert(out->insn.Type == TGSI_TOKEN_TYPE_INSTRUCTION);
-  out->insn.NrTokens = ureg->domain[DOMAIN_INSN].count - insn - 1;
-}
-
-void ureg_insn(struct ureg_program *ureg, unsigned opcode,
-               const struct ureg_dst *dst, unsigned nr_dst,
-               const struct ureg_src *src, unsigned nr_src, unsigned precise) {
-  struct ureg_emit_insn_result insn;
-  unsigned i;
-  boolean saturate;
-
-  if (nr_dst && ureg_dst_is_empty(dst[0])) {
-    return;
-  }
-
-  saturate = nr_dst ? dst[0].Saturate : FALSE;
-
-  insn = ureg_emit_insn(ureg, opcode, saturate, precise, nr_dst, nr_src);
-
-  for (i = 0; i < nr_dst; i++)
-    ureg_emit_dst(ureg, dst[i]);
-
-  for (i = 0; i < nr_src; i++)
-    ureg_emit_src(ureg, src[i]);
-
-  ureg_fixup_insn_size(ureg, insn.insn_token);
-}
-
-void ureg_tex_insn(struct ureg_program *ureg, unsigned opcode,
-                   const struct ureg_dst *dst, unsigned nr_dst, unsigned target,
-                   const struct tgsi_texture_offset *texoffsets,
-                   unsigned nr_offset, const struct ureg_src *src,
-                   unsigned nr_src) {
-  struct ureg_emit_insn_result insn;
-  unsigned i;
-  boolean saturate;
-
-  if (nr_dst && ureg_dst_is_empty(dst[0])) {
-    return;
-  }
-
-  saturate = nr_dst ? dst[0].Saturate : FALSE;
-
-  insn = ureg_emit_insn(ureg, opcode, saturate, 0, nr_dst, nr_src);
-
-  ureg_emit_texture(ureg, insn.extended_token, target, nr_offset);
-
-  for (i = 0; i < nr_offset; i++)
-    ureg_emit_texture_offset(ureg, &texoffsets[i]);
-
-  for (i = 0; i < nr_dst; i++)
-    ureg_emit_dst(ureg, dst[i]);
-
-  for (i = 0; i < nr_src; i++)
-    ureg_emit_src(ureg, src[i]);
-
-  ureg_fixup_insn_size(ureg, insn.insn_token);
-}
-
-void ureg_label_insn(struct ureg_program *ureg, unsigned opcode,
-                     const struct ureg_src *src, unsigned nr_src,
-                     unsigned *label_token) {
-  struct ureg_emit_insn_result insn;
-  unsigned i;
-
-  insn = ureg_emit_insn(ureg, opcode, FALSE, 0, 0, nr_src);
-
-  ureg_emit_label(ureg, insn.extended_token, label_token);
-
-  for (i = 0; i < nr_src; i++)
-    ureg_emit_src(ureg, src[i]);
-
-  ureg_fixup_insn_size(ureg, insn.insn_token);
-}
-
-static void emit_decl_semantic(struct ureg_program *ureg, unsigned file,
-                               unsigned index, unsigned semantic_name,
-                               unsigned semantic_index, unsigned usage_mask) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 3);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 3;
-  out[0].decl.File = file;
-  out[0].decl.UsageMask = usage_mask;
-  out[0].decl.Semantic = 1;
-
-  out[1].value = 0;
-  out[1].decl_range.First = index;
-  out[1].decl_range.Last = index;
-
-  out[2].value = 0;
-  out[2].decl_semantic.Name = semantic_name;
-  out[2].decl_semantic.Index = semantic_index;
-}
-
-static void emit_decl_fs(struct ureg_program *ureg, unsigned file,
-                         unsigned index, unsigned semantic_name,
-                         unsigned semantic_index, unsigned interpolate,
-                         unsigned cylindrical_wrap,
-                         unsigned interpolate_location) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 4);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 4;
-  out[0].decl.File = file;
-  out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW; /* FIXME! */
-  out[0].decl.Interpolate = 1;
-  out[0].decl.Semantic = 1;
-
-  out[1].value = 0;
-  out[1].decl_range.First = index;
-  out[1].decl_range.Last = index;
-
-  out[2].value = 0;
-  out[2].decl_interp.Interpolate = interpolate;
-  out[2].decl_interp.CylindricalWrap = cylindrical_wrap;
-  out[2].decl_interp.Location = interpolate_location;
-
-  out[3].value = 0;
-  out[3].decl_semantic.Name = semantic_name;
-  out[3].decl_semantic.Index = semantic_index;
-}
-
-static void emit_decl_temps(struct ureg_program *ureg, unsigned first,
-                            unsigned last, boolean local, unsigned arrayid) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, arrayid ? 3 : 2);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 2;
-  out[0].decl.File = TGSI_FILE_TEMPORARY;
-  out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
-  out[0].decl.Local = local;
-
-  out[1].value = 0;
-  out[1].decl_range.First = first;
-  out[1].decl_range.Last = last;
-
-  if (arrayid) {
-    out[0].decl.Array = 1;
-    out[2].value = 0;
-    out[2].array.ArrayID = arrayid;
-  }
-}
-
-static void emit_decl_range(struct ureg_program *ureg, unsigned file,
-                            unsigned first, unsigned count) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 2);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 2;
-  out[0].decl.File = file;
-  out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
-  out[0].decl.Semantic = 0;
-
-  out[1].value = 0;
-  out[1].decl_range.First = first;
-  out[1].decl_range.Last = first + count - 1;
-}
-
-static void emit_decl_range2D(struct ureg_program *ureg, unsigned file,
-                              unsigned first, unsigned last, unsigned index2D) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 3);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 3;
-  out[0].decl.File = file;
-  out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
-  out[0].decl.Dimension = 1;
-
-  out[1].value = 0;
-  out[1].decl_range.First = first;
-  out[1].decl_range.Last = last;
-
-  out[2].value = 0;
-  out[2].decl_dim.Index2D = index2D;
-}
-
-static void emit_decl_sampler_view(struct ureg_program *ureg, unsigned index,
-                                   unsigned target, unsigned return_type_x,
-                                   unsigned return_type_y,
-                                   unsigned return_type_z,
-                                   unsigned return_type_w) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 3);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 3;
-  out[0].decl.File = TGSI_FILE_SAMPLER_VIEW;
-  out[0].decl.UsageMask = 0xf;
-
-  out[1].value = 0;
-  out[1].decl_range.First = index;
-  out[1].decl_range.Last = index;
-
-  out[2].value = 0;
-  out[2].decl_sampler_view.Resource = target;
-  out[2].decl_sampler_view.ReturnTypeX = return_type_x;
-  out[2].decl_sampler_view.ReturnTypeY = return_type_y;
-  out[2].decl_sampler_view.ReturnTypeZ = return_type_z;
-  out[2].decl_sampler_view.ReturnTypeW = return_type_w;
-}
-
-static void emit_immediate(struct ureg_program *ureg, const unsigned *v,
-                           unsigned type) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 5);
-
-  out[0].value = 0;
-  out[0].imm.Type = TGSI_TOKEN_TYPE_IMMEDIATE;
-  out[0].imm.NrTokens = 5;
-  out[0].imm.DataType = type;
-  out[0].imm.Padding = 0;
-
-  out[1].imm_data.Uint = v[0];
-  out[2].imm_data.Uint = v[1];
-  out[3].imm_data.Uint = v[2];
-  out[4].imm_data.Uint = v[3];
-}
-
-static void emit_property(struct ureg_program *ureg, unsigned name,
-                          unsigned data) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 2);
-
-  out[0].value = 0;
-  out[0].prop.Type = TGSI_TOKEN_TYPE_PROPERTY;
-  out[0].prop.NrTokens = 2;
-  out[0].prop.PropertyName = name;
-
-  out[1].prop_data.Data = data;
-}
-
-static void emit_decl_atomic_2d(struct ureg_program *ureg, unsigned first,
-                                unsigned last, unsigned index2D,
-                                unsigned array_id) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, array_id ? 4 : 3);
-
-  out[0].value = 0;
-  out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
-  out[0].decl.NrTokens = 3;
-  out[0].decl.File = TGSI_FILE_HW_ATOMIC;
-  out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
-  out[0].decl.Dimension = 1;
-  out[0].decl.Array = array_id != 0;
-
-  out[1].value = 0;
-  out[1].decl_range.First = first;
-  out[1].decl_range.Last = last;
-
-  out[2].value = 0;
-  out[2].decl_dim.Index2D = index2D;
-
-  if (array_id) {
-    out[3].value = 0;
-    out[3].array.ArrayID = array_id;
-  }
-}
-
-static void emit_decls(struct ureg_program *ureg) {
-  unsigned i;
-
-  for (i = 0; i < ARRAY_SIZE(ureg->properties); i++)
-    if (ureg->properties[i] != ~0u)
-      emit_property(ureg, i, ureg->properties[i]);
-
-  if (ureg->processor == TGSI_PROCESSOR_VERTEX) {
-    for (i = 0; i < UREG_MAX_INPUT; i++) {
-      if (ureg->vs_inputs[i / 32] & (1 << (i % 32))) {
-        emit_decl_range(ureg, TGSI_FILE_INPUT, i, 1);
-      }
-    }
-  } else if (ureg->processor == TGSI_PROCESSOR_FRAGMENT) {
-    for (i = 0; i < ureg->nr_fs_inputs; i++) {
-      emit_decl_fs(ureg, TGSI_FILE_INPUT, i, ureg->fs_input[i].semantic_name,
-                   ureg->fs_input[i].semantic_index, ureg->fs_input[i].interp,
-                   ureg->fs_input[i].cylindrical_wrap,
-                   ureg->fs_input[i].interp_location);
-    }
-  } else {
-    for (i = 0; i < ureg->nr_gs_inputs; i++) {
-      emit_decl_semantic(ureg, TGSI_FILE_INPUT, ureg->gs_input[i].index,
-                         ureg->gs_input[i].semantic_name,
-                         ureg->gs_input[i].semantic_index, TGSI_WRITEMASK_XYZW);
-    }
-  }
-
-  for (i = 0; i < ureg->nr_system_values; i++) {
-    emit_decl_semantic(
-        ureg, TGSI_FILE_SYSTEM_VALUE, ureg->system_value[i].index,
-        ureg->system_value[i].semantic_name,
-        ureg->system_value[i].semantic_index, TGSI_WRITEMASK_XYZW);
-  }
-
-  for (i = 0; i < ureg->nr_outputs; i++) {
-    emit_decl_semantic(ureg, TGSI_FILE_OUTPUT, i, ureg->output[i].semantic_name,
-                       ureg->output[i].semantic_index,
-                       ureg->output[i].usage_mask);
-  }
-
-  for (i = 0; i < ureg->nr_samplers; i++) {
-    emit_decl_range(ureg, TGSI_FILE_SAMPLER, ureg->sampler[i].Index, 1);
-  }
-
-  for (i = 0; i < ureg->nr_sampler_views; i++) {
-    emit_decl_sampler_view(ureg, ureg->sampler_view[i].index,
-                           ureg->sampler_view[i].target,
-                           ureg->sampler_view[i].return_type_x,
-                           ureg->sampler_view[i].return_type_y,
-                           ureg->sampler_view[i].return_type_z,
-                           ureg->sampler_view[i].return_type_w);
-  }
-
-  if (ureg->const_decls.nr_constant_ranges) {
-    for (i = 0; i < ureg->const_decls.nr_constant_ranges; i++) {
-      emit_decl_range(ureg, TGSI_FILE_CONSTANT,
-                      ureg->const_decls.constant_range[i].first,
-                      ureg->const_decls.constant_range[i].last -
-                          ureg->const_decls.constant_range[i].first + 1);
-    }
-  }
-
-  for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
-    struct const_decl *decl = &ureg->const_decls2D[i];
-
-    if (decl->nr_constant_ranges) {
-      uint j;
-
-      for (j = 0; j < decl->nr_constant_ranges; j++) {
-        emit_decl_range2D(ureg, TGSI_FILE_CONSTANT,
-                          decl->constant_range[j].first,
-                          decl->constant_range[j].last, i);
-      }
-    }
-  }
-
-  for (i = 0; i < PIPE_MAX_HW_ATOMIC_BUFFERS; i++) {
-    struct hw_atomic_decl *decl = &ureg->hw_atomic_decls[i];
-
-    if (decl->nr_hw_atomic_ranges) {
-      uint j;
-
-      for (j = 0; j < decl->nr_hw_atomic_ranges; j++) {
-        emit_decl_atomic_2d(ureg, decl->hw_atomic_range[j].first,
-                            decl->hw_atomic_range[j].last, i,
-                            decl->hw_atomic_range[j].array_id);
-      }
-    }
-  }
-
-  if (ureg->nr_temps) {
-    unsigned array = 0;
-    for (i = 0; i < ureg->nr_temps;) {
-      boolean local = util_bitmask_get(ureg->local_temps, i);
-      unsigned first = i;
-      i = util_bitmask_get_next_index(ureg->decl_temps, i + 1);
-      if (i == UTIL_BITMASK_INVALID_INDEX)
-        i = ureg->nr_temps;
-
-      if (array < ureg->nr_array_temps && ureg->array_temps[array] == first)
-        emit_decl_temps(ureg, first, i - 1, local, ++array);
-      else
-        emit_decl_temps(ureg, first, i - 1, local, 0);
-    }
-  }
-
-  if (ureg->nr_addrs) {
-    emit_decl_range(ureg, TGSI_FILE_ADDRESS, 0, ureg->nr_addrs);
-  }
-
-  if (ureg->nr_preds) {
-    emit_decl_range(ureg, TGSI_FILE_PREDICATE, 0, ureg->nr_preds);
-  }
-
-  for (i = 0; i < ureg->nr_immediates; i++) {
-    emit_immediate(ureg, ureg->immediate[i].value.u, ureg->immediate[i].type);
-  }
-}
-
-/* Append the instruction tokens onto the declarations to build a
- * contiguous stream suitable to send to the driver.
- */
-static void copy_instructions(struct ureg_program *ureg) {
-  unsigned nr_tokens = ureg->domain[DOMAIN_INSN].count;
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, nr_tokens);
-
-  memcpy(out, ureg->domain[DOMAIN_INSN].tokens, nr_tokens * sizeof out[0]);
-}
-
-static void fixup_header_size(struct ureg_program *ureg) {
-  union tgsi_any_token *out = retrieve_token(ureg, DOMAIN_DECL, 0);
-
-  out->header.BodySize = ureg->domain[DOMAIN_DECL].count - 2;
-}
-
-static void emit_header(struct ureg_program *ureg) {
-  union tgsi_any_token *out = get_tokens(ureg, DOMAIN_DECL, 2);
-
-  out[0].header.HeaderSize = 2;
-  out[0].header.BodySize = 0;
-
-  out[1].processor.Processor = ureg->processor;
-  out[1].processor.Padding = 0;
-}
-
-const struct tgsi_token *ureg_finalize(struct ureg_program *ureg) {
-  const struct tgsi_token *tokens;
-
-  emit_header(ureg);
-  emit_decls(ureg);
-  copy_instructions(ureg);
-  fixup_header_size(ureg);
-
-  if (ureg->domain[0].tokens == error_tokens ||
-      ureg->domain[1].tokens == error_tokens) {
-    debug_printf("%s: error in generated shader\n", __FUNCTION__);
-    assert(0);
-    return NULL;
-  }
-
-  tokens = &ureg->domain[DOMAIN_DECL].tokens[0].token;
-
-  if (0) {
-    debug_printf("%s: emitted shader %d tokens:\n", __FUNCTION__,
-                 ureg->domain[DOMAIN_DECL].count);
-    tgsi_dump(tokens, 0);
-  }
-
-#if DEBUG
-  if (tokens && !tgsi_sanity_check(tokens)) {
-    debug_printf("tgsi_ureg.c, sanity check failed on generated tokens:\n");
-    tgsi_dump(tokens, 0);
-    assert(0);
-  }
-#endif
-
-  return tokens;
-}
-
-void *ureg_create_shader(struct ureg_program *ureg, struct pipe_context *pipe,
-                         const struct pipe_stream_output_info *so) {
-  struct pipe_shader_state state;
-
-  state.tokens = ureg_finalize(ureg);
-  if (!state.tokens)
-    return NULL;
-
-  if (so)
-    state.stream_output = *so;
-  else
-    memset(&state.stream_output, 0, sizeof(state.stream_output));
-
-  if (ureg->processor == TGSI_PROCESSOR_VERTEX)
-    return pipe->create_vs_state(pipe, &state);
-  else
-    return pipe->create_fs_state(pipe, &state);
-}
-
-const struct tgsi_token *ureg_get_tokens(struct ureg_program *ureg,
-                                         unsigned *nr_tokens) {
-  const struct tgsi_token *tokens;
-
-  ureg_finalize(ureg);
-
-  tokens = &ureg->domain[DOMAIN_DECL].tokens[0].token;
-
-  if (nr_tokens)
-    *nr_tokens = ureg->domain[DOMAIN_DECL].size;
-
-  ureg->domain[DOMAIN_DECL].tokens = 0;
-  ureg->domain[DOMAIN_DECL].size = 0;
-  ureg->domain[DOMAIN_DECL].order = 0;
-  ureg->domain[DOMAIN_DECL].count = 0;
-
-  return tokens;
-}
-
-void ureg_free_tokens(const struct tgsi_token *tokens) {
-  FREE((struct tgsi_token *)tokens);
-}
-
-struct ureg_program *ureg_create(unsigned processor) {
-  unsigned i;
-  struct ureg_program *ureg = CALLOC_STRUCT(ureg_program);
-  if (ureg == NULL)
-    goto no_ureg;
-
-  ureg->processor = processor;
-
-  for (i = 0; i < ARRAY_SIZE(ureg->properties); i++)
-    ureg->properties[i] = ~0;
-
-  ureg->free_temps = util_bitmask_create();
-  if (ureg->free_temps == NULL)
-    goto no_free_temps;
-
-  ureg->local_temps = util_bitmask_create();
-  if (ureg->local_temps == NULL)
-    goto no_local_temps;
-
-  ureg->decl_temps = util_bitmask_create();
-  if (ureg->decl_temps == NULL)
-    goto no_decl_temps;
-
-  return ureg;
-
-no_decl_temps:
-  util_bitmask_destroy(ureg->local_temps);
-no_local_temps:
-  util_bitmask_destroy(ureg->free_temps);
-no_free_temps:
-  FREE(ureg);
-no_ureg:
-  return NULL;
-}
-
-unsigned ureg_get_nr_outputs(const struct ureg_program *ureg) {
-  if (!ureg)
-    return 0;
-  return ureg->nr_outputs;
-}
-
-void ureg_destroy(struct ureg_program *ureg) {
-  unsigned i;
-
-  for (i = 0; i < ARRAY_SIZE(ureg->domain); i++) {
-    if (ureg->domain[i].tokens && ureg->domain[i].tokens != error_tokens)
-      FREE(ureg->domain[i].tokens);
-  }
-
-  util_bitmask_destroy(ureg->free_temps);
-  util_bitmask_destroy(ureg->local_temps);
-  util_bitmask_destroy(ureg->decl_temps);
-
-  FREE(ureg);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_ureg.h
deleted file mode 100644
index f6c287c0c..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ /dev/null
@@ -1,888 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE, INC AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_UREG_H
-#define TGSI_UREG_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_shader_tokens.h"
-#include "util/u_debug.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ureg_program;
-struct pipe_stream_output_info;
-
-/* Almost a tgsi_src_register, but we need to pull in the Absolute
- * flag from the _ext token.  Indirect flag always implies ADDR[0].
- */
-struct ureg_src {
-  unsigned File : 4;            /* TGSI_FILE_ */
-  unsigned SwizzleX : 2;        /* TGSI_SWIZZLE_ */
-  unsigned SwizzleY : 2;        /* TGSI_SWIZZLE_ */
-  unsigned SwizzleZ : 2;        /* TGSI_SWIZZLE_ */
-  unsigned SwizzleW : 2;        /* TGSI_SWIZZLE_ */
-  unsigned Indirect : 1;        /* BOOL */
-  unsigned DimIndirect : 1;     /* BOOL */
-  unsigned Dimension : 1;       /* BOOL */
-  unsigned Absolute : 1;        /* BOOL */
-  unsigned Negate : 1;          /* BOOL */
-  unsigned IndirectFile : 4;    /* TGSI_FILE_ */
-  unsigned IndirectSwizzle : 2; /* TGSI_SWIZZLE_ */
-  unsigned DimIndFile : 4;      /* TGSI_FILE_ */
-  unsigned DimIndSwizzle : 2;   /* TGSI_SWIZZLE_ */
-  int Index : 16;               /* SINT */
-  int IndirectIndex : 16;       /* SINT */
-  int DimensionIndex : 16;      /* SINT */
-  int DimIndIndex : 16;         /* SINT */
-  unsigned ArrayID : 10;        /* UINT */
-};
-
-/* Very similar to a tgsi_dst_register, removing unsupported fields
- * and adding a Saturate flag.  It's easier to push saturate into the
- * destination register than to try and create a _SAT variant of each
- * instruction function.
- */
-struct ureg_dst {
-  unsigned File : 4;      /* TGSI_FILE_ */
-  unsigned WriteMask : 4; /* TGSI_WRITEMASK_ */
-  unsigned Indirect : 1;  /* BOOL */
-  unsigned Saturate : 1;  /* BOOL */
-  unsigned Predicate : 1;
-  unsigned PredNegate : 1;   /* BOOL */
-  unsigned PredSwizzleX : 2; /* TGSI_SWIZZLE_ */
-  unsigned PredSwizzleY : 2; /* TGSI_SWIZZLE_ */
-  unsigned PredSwizzleZ : 2; /* TGSI_SWIZZLE_ */
-  unsigned PredSwizzleW : 2; /* TGSI_SWIZZLE_ */
-  int Index : 16;            /* SINT */
-  int IndirectIndex : 16;    /* SINT */
-  unsigned IndirectFile : 4; /* TGSI_FILE_ */
-  int IndirectSwizzle : 2;   /* TGSI_SWIZZLE_ */
-  unsigned ArrayID : 10;     /* UINT */
-};
-
-struct pipe_context;
-
-struct ureg_program *ureg_create(unsigned processor);
-
-const struct tgsi_token *ureg_finalize(struct ureg_program *);
-
-/* Create and return a shader:
- */
-void *ureg_create_shader(struct ureg_program *, struct pipe_context *pipe,
-                         const struct pipe_stream_output_info *so);
-
-/* Alternately, return the built token stream and hand ownership of
- * that memory to the caller:
- */
-const struct tgsi_token *ureg_get_tokens(struct ureg_program *ureg,
-                                         unsigned *nr_tokens);
-
-/*
- * Returns the number of currently declared outputs.
- */
-unsigned ureg_get_nr_outputs(const struct ureg_program *ureg);
-
-/* Free the tokens created by ureg_get_tokens() */
-void ureg_free_tokens(const struct tgsi_token *tokens);
-
-void ureg_destroy(struct ureg_program *);
-
-/***********************************************************************
- * Convenience routine:
- */
-static inline void *ureg_create_shader_with_so_and_destroy(
-    struct ureg_program *p, struct pipe_context *pipe,
-    const struct pipe_stream_output_info *so) {
-  void *result = ureg_create_shader(p, pipe, so);
-  ureg_destroy(p);
-  return result;
-}
-
-static inline void *ureg_create_shader_and_destroy(struct ureg_program *p,
-                                                   struct pipe_context *pipe) {
-  return ureg_create_shader_with_so_and_destroy(p, pipe, NULL);
-}
-
-/***********************************************************************
- * Build shader properties:
- */
-
-void ureg_property(struct ureg_program *ureg, unsigned name, unsigned value);
-
-/***********************************************************************
- * Build shader declarations:
- */
-
-struct ureg_src ureg_DECL_fs_input_cyl_centroid(
-    struct ureg_program *, unsigned semantic_name, unsigned semantic_index,
-    unsigned interp_mode, unsigned cylindrical_wrap, unsigned interp_location);
-
-static inline struct ureg_src
-ureg_DECL_fs_input_cyl(struct ureg_program *ureg, unsigned semantic_name,
-                       unsigned semantic_index, unsigned interp_mode,
-                       unsigned cylindrical_wrap) {
-  return ureg_DECL_fs_input_cyl_centroid(ureg, semantic_name, semantic_index,
-                                         interp_mode, cylindrical_wrap, 0);
-}
-
-static inline struct ureg_src ureg_DECL_fs_input(struct ureg_program *ureg,
-                                                 unsigned semantic_name,
-                                                 unsigned semantic_index,
-                                                 unsigned interp_mode) {
-  return ureg_DECL_fs_input_cyl_centroid(ureg, semantic_name, semantic_index,
-                                         interp_mode, 0, 0);
-}
-
-struct ureg_src ureg_DECL_vs_input(struct ureg_program *, unsigned index);
-
-struct ureg_src ureg_DECL_gs_input(struct ureg_program *, unsigned index,
-                                   unsigned semantic_name,
-                                   unsigned semantic_index);
-
-struct ureg_src ureg_DECL_system_value(struct ureg_program *, unsigned index,
-                                       unsigned semantic_name,
-                                       unsigned semantic_index);
-
-struct ureg_dst ureg_DECL_output_masked(struct ureg_program *,
-                                        unsigned semantic_name,
-                                        unsigned semantic_index,
-                                        unsigned usage_mask);
-
-struct ureg_dst ureg_DECL_output(struct ureg_program *, unsigned semantic_name,
-                                 unsigned semantic_index);
-
-struct ureg_src ureg_DECL_immediate(struct ureg_program *, const float *v,
-                                    unsigned nr);
-
-struct ureg_src ureg_DECL_immediate_uint(struct ureg_program *,
-                                         const unsigned *v, unsigned nr);
-
-struct ureg_src ureg_DECL_immediate_block_uint(struct ureg_program *,
-                                               const unsigned *v, unsigned nr);
-
-struct ureg_src ureg_DECL_immediate_int(struct ureg_program *, const int *v,
-                                        unsigned nr);
-
-void ureg_DECL_constant2D(struct ureg_program *ureg, unsigned first,
-                          unsigned last, unsigned index2D);
-
-struct ureg_src ureg_DECL_constant(struct ureg_program *, unsigned index);
-
-void ureg_DECL_hw_atomic(struct ureg_program *ureg, unsigned first,
-                         unsigned last, unsigned buffer_id, unsigned array_id);
-
-struct ureg_dst ureg_DECL_temporary(struct ureg_program *);
-
-/**
- * Emit a temporary with the LOCAL declaration flag set.  For use when
- * the register value is not required to be preserved across
- * subroutine boundaries.
- */
-struct ureg_dst ureg_DECL_local_temporary(struct ureg_program *);
-
-/**
- * Declare "size" continuous temporary registers.
- */
-struct ureg_dst ureg_DECL_array_temporary(struct ureg_program *, unsigned size,
-                                          boolean local);
-
-void ureg_release_temporary(struct ureg_program *ureg, struct ureg_dst tmp);
-
-struct ureg_dst ureg_DECL_address(struct ureg_program *);
-
-struct ureg_dst ureg_DECL_predicate(struct ureg_program *);
-
-/* Supply an index to the sampler declaration as this is the hook to
- * the external pipe_sampler state.  Users of this function probably
- * don't want just any sampler, but a specific one which they've set
- * up state for in the context.
- */
-struct ureg_src ureg_DECL_sampler(struct ureg_program *, int index);
-
-struct ureg_src ureg_DECL_sampler_view(struct ureg_program *, unsigned index,
-                                       unsigned target, unsigned return_type_x,
-                                       unsigned return_type_y,
-                                       unsigned return_type_z,
-                                       unsigned return_type_w);
-
-static inline struct ureg_src ureg_imm4f(struct ureg_program *ureg, float a,
-                                         float b, float c, float d) {
-  float v[4];
-  v[0] = a;
-  v[1] = b;
-  v[2] = c;
-  v[3] = d;
-  return ureg_DECL_immediate(ureg, v, 4);
-}
-
-static inline struct ureg_src ureg_imm3f(struct ureg_program *ureg, float a,
-                                         float b, float c) {
-  float v[3];
-  v[0] = a;
-  v[1] = b;
-  v[2] = c;
-  return ureg_DECL_immediate(ureg, v, 3);
-}
-
-static inline struct ureg_src ureg_imm2f(struct ureg_program *ureg, float a,
-                                         float b) {
-  float v[2];
-  v[0] = a;
-  v[1] = b;
-  return ureg_DECL_immediate(ureg, v, 2);
-}
-
-static inline struct ureg_src ureg_imm1f(struct ureg_program *ureg, float a) {
-  float v[1];
-  v[0] = a;
-  return ureg_DECL_immediate(ureg, v, 1);
-}
-
-static inline struct ureg_src ureg_imm4u(struct ureg_program *ureg, unsigned a,
-                                         unsigned b, unsigned c, unsigned d) {
-  unsigned v[4];
-  v[0] = a;
-  v[1] = b;
-  v[2] = c;
-  v[3] = d;
-  return ureg_DECL_immediate_uint(ureg, v, 4);
-}
-
-static inline struct ureg_src ureg_imm3u(struct ureg_program *ureg, unsigned a,
-                                         unsigned b, unsigned c) {
-  unsigned v[3];
-  v[0] = a;
-  v[1] = b;
-  v[2] = c;
-  return ureg_DECL_immediate_uint(ureg, v, 3);
-}
-
-static inline struct ureg_src ureg_imm2u(struct ureg_program *ureg, unsigned a,
-                                         unsigned b) {
-  unsigned v[2];
-  v[0] = a;
-  v[1] = b;
-  return ureg_DECL_immediate_uint(ureg, v, 2);
-}
-
-static inline struct ureg_src ureg_imm1u(struct ureg_program *ureg,
-                                         unsigned a) {
-  return ureg_DECL_immediate_uint(ureg, &a, 1);
-}
-
-static inline struct ureg_src ureg_imm4i(struct ureg_program *ureg, int a,
-                                         int b, int c, int d) {
-  int v[4];
-  v[0] = a;
-  v[1] = b;
-  v[2] = c;
-  v[3] = d;
-  return ureg_DECL_immediate_int(ureg, v, 4);
-}
-
-static inline struct ureg_src ureg_imm3i(struct ureg_program *ureg, int a,
-                                         int b, int c) {
-  int v[3];
-  v[0] = a;
-  v[1] = b;
-  v[2] = c;
-  return ureg_DECL_immediate_int(ureg, v, 3);
-}
-
-static inline struct ureg_src ureg_imm2i(struct ureg_program *ureg, int a,
-                                         int b) {
-  int v[2];
-  v[0] = a;
-  v[1] = b;
-  return ureg_DECL_immediate_int(ureg, v, 2);
-}
-
-static inline struct ureg_src ureg_imm1i(struct ureg_program *ureg, int a) {
-  return ureg_DECL_immediate_int(ureg, &a, 1);
-}
-
-/* Where the destination register has a valid file, but an empty
- * writemask.
- */
-static inline boolean ureg_dst_is_empty(struct ureg_dst dst) {
-  return dst.File != TGSI_FILE_NULL && dst.WriteMask == 0;
-}
-
-/***********************************************************************
- * Functions for patching up labels
- */
-
-/* Will return a number which can be used in a label to point to the
- * next instruction to be emitted.
- */
-unsigned ureg_get_instruction_number(struct ureg_program *ureg);
-
-/* Patch a given label (expressed as a token number) to point to a
- * given instruction (expressed as an instruction number).
- *
- * Labels are obtained from instruction emitters, eg ureg_CAL().
- * Instruction numbers are obtained from ureg_get_instruction_number(),
- * above.
- */
-void ureg_fixup_label(struct ureg_program *ureg, unsigned label_token,
-                      unsigned instruction_number);
-
-/* Generic instruction emitter.  Use if you need to pass the opcode as
- * a parameter, rather than using the emit_OP() variants below.
- */
-void ureg_insn(struct ureg_program *ureg, unsigned opcode,
-               const struct ureg_dst *dst, unsigned nr_dst,
-               const struct ureg_src *src, unsigned nr_src, unsigned precise);
-
-void ureg_tex_insn(struct ureg_program *ureg, unsigned opcode,
-                   const struct ureg_dst *dst, unsigned nr_dst, unsigned target,
-                   const struct tgsi_texture_offset *texoffsets,
-                   unsigned nr_offset, const struct ureg_src *src,
-                   unsigned nr_src);
-
-void ureg_label_insn(struct ureg_program *ureg, unsigned opcode,
-                     const struct ureg_src *src, unsigned nr_src,
-                     unsigned *label);
-
-/***********************************************************************
- * Internal instruction helpers, don't call these directly:
- */
-
-struct ureg_emit_insn_result {
-  unsigned insn_token;     /*< Used to fixup insn size. */
-  unsigned extended_token; /*< Used to set the Extended bit, usually the same as
-                              insn_token. */
-};
-
-struct ureg_emit_insn_result ureg_emit_insn(struct ureg_program *ureg,
-                                            unsigned opcode, boolean saturate,
-                                            unsigned precise, unsigned num_dst,
-                                            unsigned num_src);
-
-void ureg_emit_label(struct ureg_program *ureg, unsigned insn_token,
-                     unsigned *label_token);
-
-void ureg_emit_texture(struct ureg_program *ureg, unsigned insn_token,
-                       unsigned target, unsigned num_offsets);
-
-void ureg_emit_texture_offset(struct ureg_program *ureg,
-                              const struct tgsi_texture_offset *offset);
-
-void ureg_emit_dst(struct ureg_program *ureg, struct ureg_dst dst);
-
-void ureg_emit_src(struct ureg_program *ureg, struct ureg_src src);
-
-void ureg_fixup_insn_size(struct ureg_program *ureg, unsigned insn);
-
-#define OP00(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg) {                    \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    insn = ureg_emit_insn(ureg, opcode, FALSE, 0, 0, 0);                       \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP01(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg,                      \
-                               struct ureg_src src) {                          \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    insn = ureg_emit_insn(ureg, opcode, FALSE, 0, 0, 1);                       \
-    ureg_emit_src(ureg, src);                                                  \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP00_LBL(op)                                                           \
-  static inline void ureg_##op(struct ureg_program *ureg,                      \
-                               unsigned *label_token) {                        \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    insn = ureg_emit_insn(ureg, opcode, FALSE, 0, 0, 0);                       \
-    ureg_emit_label(ureg, insn.extended_token, label_token);                   \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP01_LBL(op)                                                           \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_src src, \
-                               unsigned *label_token) {                        \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    insn = ureg_emit_insn(ureg, opcode, FALSE, 0, 0, 1);                       \
-    ureg_emit_label(ureg, insn.extended_token, label_token);                   \
-    ureg_emit_src(ureg, src);                                                  \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP10(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg,                      \
-                               struct ureg_dst dst) {                          \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 0);                \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP11(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src) {                          \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 1);                \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src);                                                  \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP12(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1) {   \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 2);                \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP12_TEX(op)                                                           \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               unsigned target, struct ureg_src src0,          \
-                               struct ureg_src src1) {                         \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 2);                \
-    ureg_emit_texture(ureg, insn.extended_token, target, 0);                   \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP12_SAMPLE(op)                                                        \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1) {   \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    unsigned target = TGSI_TEXTURE_UNKNOWN;                                    \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 2);                \
-    ureg_emit_texture(ureg, insn.extended_token, target, 0);                   \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP13(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1,     \
-                               struct ureg_src src2) {                         \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 3);                \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP13_SAMPLE(op)                                                        \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1,     \
-                               struct ureg_src src2) {                         \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    unsigned target = TGSI_TEXTURE_UNKNOWN;                                    \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 3);                \
-    ureg_emit_texture(ureg, insn.extended_token, target, 0);                   \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP14_TEX(op)                                                           \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               unsigned target, struct ureg_src src0,          \
-                               struct ureg_src src1, struct ureg_src src2,     \
-                               struct ureg_src src3) {                         \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 4);                \
-    ureg_emit_texture(ureg, insn.extended_token, target, 0);                   \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_emit_src(ureg, src3);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP14_SAMPLE(op)                                                        \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1,     \
-                               struct ureg_src src2, struct ureg_src src3) {   \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    unsigned target = TGSI_TEXTURE_UNKNOWN;                                    \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 4);                \
-    ureg_emit_texture(ureg, insn.extended_token, target, 0);                   \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_emit_src(ureg, src3);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP14(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1,     \
-                               struct ureg_src src2, struct ureg_src src3) {   \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 4);                \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_emit_src(ureg, src3);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP15(op)                                                               \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1,     \
-                               struct ureg_src src2, struct ureg_src src3,     \
-                               struct ureg_src src4) {                         \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 5);                \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_emit_src(ureg, src3);                                                 \
-    ureg_emit_src(ureg, src4);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-#define OP15_SAMPLE(op)                                                        \
-  static inline void ureg_##op(struct ureg_program *ureg, struct ureg_dst dst, \
-                               struct ureg_src src0, struct ureg_src src1,     \
-                               struct ureg_src src2, struct ureg_src src3,     \
-                               struct ureg_src src4) {                         \
-    unsigned opcode = TGSI_OPCODE_##op;                                        \
-    unsigned target = TGSI_TEXTURE_UNKNOWN;                                    \
-    struct ureg_emit_insn_result insn;                                         \
-    if (ureg_dst_is_empty(dst))                                                \
-      return;                                                                  \
-    insn = ureg_emit_insn(ureg, opcode, dst.Saturate, 0, 1, 5);                \
-    ureg_emit_texture(ureg, insn.extended_token, target, 0);                   \
-    ureg_emit_dst(ureg, dst);                                                  \
-    ureg_emit_src(ureg, src0);                                                 \
-    ureg_emit_src(ureg, src1);                                                 \
-    ureg_emit_src(ureg, src2);                                                 \
-    ureg_emit_src(ureg, src3);                                                 \
-    ureg_emit_src(ureg, src4);                                                 \
-    ureg_fixup_insn_size(ureg, insn.insn_token);                               \
-  }
-
-/* Use a template include to generate a correctly-typed ureg_OP()
- * function for each TGSI opcode:
- */
-#include "tgsi_opcode_tmp.h"
-
-/***********************************************************************
- * Inline helpers for manipulating register structs:
- */
-static inline struct ureg_src ureg_negate(struct ureg_src reg) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.Negate ^= 1;
-  return reg;
-}
-
-static inline struct ureg_src ureg_abs(struct ureg_src reg) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.Absolute = 1;
-  reg.Negate = 0;
-  return reg;
-}
-
-static inline struct ureg_src ureg_swizzle(struct ureg_src reg, int x, int y,
-                                           int z, int w) {
-  unsigned swz = ((reg.SwizzleX << 0) | (reg.SwizzleY << 2) |
-                  (reg.SwizzleZ << 4) | (reg.SwizzleW << 6));
-
-  assert(reg.File != TGSI_FILE_NULL);
-  assert(x < 4);
-  assert(y < 4);
-  assert(z < 4);
-  assert(w < 4);
-
-  reg.SwizzleX = (swz >> (x * 2)) & 0x3;
-  reg.SwizzleY = (swz >> (y * 2)) & 0x3;
-  reg.SwizzleZ = (swz >> (z * 2)) & 0x3;
-  reg.SwizzleW = (swz >> (w * 2)) & 0x3;
-  return reg;
-}
-
-static inline struct ureg_src ureg_scalar(struct ureg_src reg, int x) {
-  return ureg_swizzle(reg, x, x, x, x);
-}
-
-static inline struct ureg_dst ureg_writemask(struct ureg_dst reg,
-                                             unsigned writemask) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.WriteMask &= writemask;
-  return reg;
-}
-
-static inline struct ureg_dst ureg_saturate(struct ureg_dst reg) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.Saturate = 1;
-  return reg;
-}
-
-static inline struct ureg_dst
-ureg_predicate(struct ureg_dst reg, boolean negate, unsigned swizzle_x,
-               unsigned swizzle_y, unsigned swizzle_z, unsigned swizzle_w) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.Predicate = 1;
-  reg.PredNegate = negate;
-  reg.PredSwizzleX = swizzle_x;
-  reg.PredSwizzleY = swizzle_y;
-  reg.PredSwizzleZ = swizzle_z;
-  reg.PredSwizzleW = swizzle_w;
-  return reg;
-}
-
-static inline struct ureg_dst ureg_dst_indirect(struct ureg_dst reg,
-                                                struct ureg_src addr) {
-  assert(reg.File != TGSI_FILE_NULL);
-  assert(addr.File == TGSI_FILE_ADDRESS || addr.File == TGSI_FILE_TEMPORARY);
-  reg.Indirect = 1;
-  reg.IndirectFile = addr.File;
-  reg.IndirectIndex = addr.Index;
-  reg.IndirectSwizzle = addr.SwizzleX;
-  return reg;
-}
-
-static inline struct ureg_src ureg_src_indirect(struct ureg_src reg,
-                                                struct ureg_src addr) {
-  assert(reg.File != TGSI_FILE_NULL);
-  assert(addr.File == TGSI_FILE_ADDRESS || addr.File == TGSI_FILE_TEMPORARY);
-  reg.Indirect = 1;
-  reg.IndirectFile = addr.File;
-  reg.IndirectIndex = addr.Index;
-  reg.IndirectSwizzle = addr.SwizzleX;
-  return reg;
-}
-
-static inline struct ureg_src ureg_src_dimension(struct ureg_src reg,
-                                                 int index) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.Dimension = 1;
-  reg.DimIndirect = 0;
-  reg.DimensionIndex = index;
-  return reg;
-}
-
-static inline struct ureg_src ureg_src_dimension_indirect(struct ureg_src reg,
-                                                          struct ureg_src addr,
-                                                          int index) {
-  assert(reg.File != TGSI_FILE_NULL);
-  reg.Dimension = 1;
-  reg.DimIndirect = 1;
-  reg.DimensionIndex = index;
-  reg.DimIndFile = addr.File;
-  reg.DimIndIndex = addr.Index;
-  reg.DimIndSwizzle = addr.SwizzleX;
-  return reg;
-}
-
-static inline struct ureg_dst ureg_dst_array_offset(struct ureg_dst reg,
-                                                    int offset) {
-  assert(reg.File == TGSI_FILE_TEMPORARY);
-  reg.Index += offset;
-  return reg;
-}
-
-static inline struct ureg_dst ureg_dst(struct ureg_src src) {
-  struct ureg_dst dst;
-
-  assert(!src.Indirect || (src.IndirectFile == TGSI_FILE_ADDRESS ||
-                           src.IndirectFile == TGSI_FILE_TEMPORARY));
-
-  dst.File = src.File;
-  dst.WriteMask = TGSI_WRITEMASK_XYZW;
-  dst.IndirectFile = src.IndirectFile;
-  dst.Indirect = src.Indirect;
-  dst.IndirectIndex = src.IndirectIndex;
-  dst.IndirectSwizzle = src.IndirectSwizzle;
-  dst.Saturate = 0;
-  dst.Index = src.Index;
-  dst.ArrayID = src.ArrayID;
-
-  return dst;
-}
-
-static inline struct ureg_src ureg_src_register(unsigned file, unsigned index) {
-  struct ureg_src src;
-
-  src.File = file;
-  src.SwizzleX = TGSI_SWIZZLE_X;
-  src.SwizzleY = TGSI_SWIZZLE_Y;
-  src.SwizzleZ = TGSI_SWIZZLE_Z;
-  src.SwizzleW = TGSI_SWIZZLE_W;
-  src.Indirect = 0;
-  src.IndirectFile = TGSI_FILE_NULL;
-  src.IndirectIndex = 0;
-  src.IndirectSwizzle = 0;
-  src.Absolute = 0;
-  src.Index = index;
-  src.Negate = 0;
-  src.Dimension = 0;
-  src.DimensionIndex = 0;
-  src.DimIndirect = 0;
-  src.DimIndFile = TGSI_FILE_NULL;
-  src.DimIndIndex = 0;
-  src.DimIndSwizzle = 0;
-  src.ArrayID = 0;
-
-  return src;
-}
-
-static inline struct ureg_src ureg_src(struct ureg_dst dst) {
-  struct ureg_src src;
-
-  src.File = dst.File;
-  src.SwizzleX = TGSI_SWIZZLE_X;
-  src.SwizzleY = TGSI_SWIZZLE_Y;
-  src.SwizzleZ = TGSI_SWIZZLE_Z;
-  src.SwizzleW = TGSI_SWIZZLE_W;
-  src.Indirect = dst.Indirect;
-  src.IndirectFile = dst.IndirectFile;
-  src.IndirectIndex = dst.IndirectIndex;
-  src.IndirectSwizzle = dst.IndirectSwizzle;
-  src.Absolute = 0;
-  src.Index = dst.Index;
-  src.Negate = 0;
-  src.Dimension = 0;
-  src.DimensionIndex = 0;
-  src.DimIndirect = 0;
-  src.DimIndFile = TGSI_FILE_NULL;
-  src.DimIndIndex = 0;
-  src.DimIndSwizzle = 0;
-  src.ArrayID = dst.ArrayID;
-
-  return src;
-}
-
-static inline struct ureg_dst ureg_dst_undef(void) {
-  struct ureg_dst dst;
-
-  dst.File = TGSI_FILE_NULL;
-  dst.WriteMask = 0;
-  dst.Indirect = 0;
-  dst.IndirectFile = TGSI_FILE_NULL;
-  dst.IndirectIndex = 0;
-  dst.IndirectSwizzle = 0;
-  dst.Saturate = 0;
-  dst.Index = 0;
-  dst.ArrayID = 0;
-
-  return dst;
-}
-
-static inline struct ureg_src ureg_src_undef(void) {
-  struct ureg_src src;
-
-  src.File = TGSI_FILE_NULL;
-  src.SwizzleX = 0;
-  src.SwizzleY = 0;
-  src.SwizzleZ = 0;
-  src.SwizzleW = 0;
-  src.Indirect = 0;
-  src.IndirectFile = TGSI_FILE_NULL;
-  src.IndirectIndex = 0;
-  src.IndirectSwizzle = 0;
-  src.Absolute = 0;
-  src.Index = 0;
-  src.Negate = 0;
-  src.Dimension = 0;
-  src.DimensionIndex = 0;
-  src.DimIndirect = 0;
-  src.DimIndFile = TGSI_FILE_NULL;
-  src.DimIndIndex = 0;
-  src.DimIndSwizzle = 0;
-  src.ArrayID = 0;
-
-  return src;
-}
-
-static inline boolean ureg_src_is_undef(struct ureg_src src) {
-  return src.File == TGSI_FILE_NULL;
-}
-
-static inline boolean ureg_dst_is_undef(struct ureg_dst dst) {
-  return dst.File == TGSI_FILE_NULL;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_util.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_util.c
deleted file mode 100644
index 5fa0afded..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_util.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "tgsi_util.h"
-#include "pipe/p_shader_tokens.h"
-#include "tgsi_parse.h"
-#include "util/u_debug.h"
-
-union pointer_hack {
-  void *pointer;
-  uint64_t uint64;
-};
-
-void *tgsi_align_128bit(void *unaligned) {
-  union pointer_hack ph;
-
-  ph.uint64 = 0;
-  ph.pointer = unaligned;
-  ph.uint64 = (ph.uint64 + 15) & ~15;
-  return ph.pointer;
-}
-
-unsigned tgsi_util_get_src_register_swizzle(const struct tgsi_src_register *reg,
-                                            unsigned component) {
-  switch (component) {
-  case 0:
-    return reg->SwizzleX;
-  case 1:
-    return reg->SwizzleY;
-  case 2:
-    return reg->SwizzleZ;
-  case 3:
-    return reg->SwizzleW;
-  default:
-    assert(0);
-  }
-  return 0;
-}
-
-unsigned tgsi_util_get_full_src_register_swizzle(
-    const struct tgsi_full_src_register *reg, unsigned component) {
-  return tgsi_util_get_src_register_swizzle(&reg->Register, component);
-}
-
-void tgsi_util_set_src_register_swizzle(struct tgsi_src_register *reg,
-                                        unsigned swizzle, unsigned component) {
-  switch (component) {
-  case 0:
-    reg->SwizzleX = swizzle;
-    break;
-  case 1:
-    reg->SwizzleY = swizzle;
-    break;
-  case 2:
-    reg->SwizzleZ = swizzle;
-    break;
-  case 3:
-    reg->SwizzleW = swizzle;
-    break;
-  default:
-    assert(0);
-  }
-}
-
-unsigned tgsi_util_get_full_src_register_sign_mode(
-    const struct tgsi_full_src_register *reg, UNUSED unsigned component) {
-  unsigned sign_mode;
-
-  if (reg->Register.Absolute) {
-    /* Consider only the post-abs negation. */
-
-    if (reg->Register.Negate) {
-      sign_mode = TGSI_UTIL_SIGN_SET;
-    } else {
-      sign_mode = TGSI_UTIL_SIGN_CLEAR;
-    }
-  } else {
-    if (reg->Register.Negate) {
-      sign_mode = TGSI_UTIL_SIGN_TOGGLE;
-    } else {
-      sign_mode = TGSI_UTIL_SIGN_KEEP;
-    }
-  }
-
-  return sign_mode;
-}
-
-void tgsi_util_set_full_src_register_sign_mode(
-    struct tgsi_full_src_register *reg, unsigned sign_mode) {
-  switch (sign_mode) {
-  case TGSI_UTIL_SIGN_CLEAR:
-    reg->Register.Negate = 0;
-    reg->Register.Absolute = 1;
-    break;
-
-  case TGSI_UTIL_SIGN_SET:
-    reg->Register.Absolute = 1;
-    reg->Register.Negate = 1;
-    break;
-
-  case TGSI_UTIL_SIGN_TOGGLE:
-    reg->Register.Negate = 1;
-    reg->Register.Absolute = 0;
-    break;
-
-  case TGSI_UTIL_SIGN_KEEP:
-    reg->Register.Negate = 0;
-    reg->Register.Absolute = 0;
-    break;
-
-  default:
-    assert(0);
-  }
-}
-
-/**
- * Determine which channels of the specificed src register are effectively
- * used by this instruction.
- */
-unsigned tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst,
-                                       unsigned src_idx) {
-  const struct tgsi_full_src_register *src = &inst->Src[src_idx];
-  unsigned write_mask = inst->Dst[0].Register.WriteMask;
-  unsigned read_mask;
-  unsigned usage_mask;
-  unsigned chan;
-
-  switch (inst->Instruction.Opcode) {
-  case TGSI_OPCODE_MOV:
-  case TGSI_OPCODE_ARL:
-  case TGSI_OPCODE_ARR:
-  case TGSI_OPCODE_RCP:
-  case TGSI_OPCODE_MUL:
-  case TGSI_OPCODE_DIV:
-  case TGSI_OPCODE_ADD:
-  case TGSI_OPCODE_MIN:
-  case TGSI_OPCODE_MAX:
-  case TGSI_OPCODE_SLT:
-  case TGSI_OPCODE_SGE:
-  case TGSI_OPCODE_MAD:
-  case TGSI_OPCODE_SUB:
-  case TGSI_OPCODE_LRP:
-  case TGSI_OPCODE_FRC:
-  case TGSI_OPCODE_CEIL:
-  case TGSI_OPCODE_FLR:
-  case TGSI_OPCODE_ROUND:
-  case TGSI_OPCODE_POW:
-  case TGSI_OPCODE_ABS:
-  case TGSI_OPCODE_COS:
-  case TGSI_OPCODE_SIN:
-  case TGSI_OPCODE_DDX:
-  case TGSI_OPCODE_DDY:
-  case TGSI_OPCODE_SEQ:
-  case TGSI_OPCODE_SGT:
-  case TGSI_OPCODE_SLE:
-  case TGSI_OPCODE_SNE:
-  case TGSI_OPCODE_SSG:
-  case TGSI_OPCODE_CMP:
-  case TGSI_OPCODE_TRUNC:
-  case TGSI_OPCODE_NOT:
-  case TGSI_OPCODE_AND:
-  case TGSI_OPCODE_OR:
-  case TGSI_OPCODE_XOR:
-  case TGSI_OPCODE_FSEQ:
-  case TGSI_OPCODE_FSGE:
-  case TGSI_OPCODE_FSLT:
-  case TGSI_OPCODE_FSNE:
-  case TGSI_OPCODE_F2I:
-  case TGSI_OPCODE_IDIV:
-  case TGSI_OPCODE_IMAX:
-  case TGSI_OPCODE_IMIN:
-  case TGSI_OPCODE_INEG:
-  case TGSI_OPCODE_ISGE:
-  case TGSI_OPCODE_ISHR:
-  case TGSI_OPCODE_ISLT:
-  case TGSI_OPCODE_F2U:
-  case TGSI_OPCODE_U2F:
-  case TGSI_OPCODE_UADD:
-  case TGSI_OPCODE_UDIV:
-  case TGSI_OPCODE_UMAD:
-  case TGSI_OPCODE_UMAX:
-  case TGSI_OPCODE_UMIN:
-  case TGSI_OPCODE_UMOD:
-  case TGSI_OPCODE_UMUL:
-  case TGSI_OPCODE_USEQ:
-  case TGSI_OPCODE_USGE:
-  case TGSI_OPCODE_USHR:
-  case TGSI_OPCODE_USLT:
-  case TGSI_OPCODE_USNE:
-  case TGSI_OPCODE_IMUL_HI:
-  case TGSI_OPCODE_UMUL_HI:
-  case TGSI_OPCODE_DDX_FINE:
-  case TGSI_OPCODE_DDY_FINE:
-    /* Channel-wise operations */
-    read_mask = write_mask;
-    break;
-
-  case TGSI_OPCODE_EX2:
-  case TGSI_OPCODE_LG2:
-    read_mask = TGSI_WRITEMASK_X;
-    break;
-
-  case TGSI_OPCODE_SCS:
-    read_mask = write_mask & TGSI_WRITEMASK_XY ? TGSI_WRITEMASK_X : 0;
-    break;
-
-  case TGSI_OPCODE_EXP:
-  case TGSI_OPCODE_LOG:
-    read_mask = write_mask & TGSI_WRITEMASK_XYZ ? TGSI_WRITEMASK_X : 0;
-    break;
-
-  case TGSI_OPCODE_DP2:
-    read_mask = TGSI_WRITEMASK_XY;
-    break;
-
-  case TGSI_OPCODE_DP3:
-    read_mask = TGSI_WRITEMASK_XYZ;
-    break;
-
-  case TGSI_OPCODE_DP4:
-    read_mask = TGSI_WRITEMASK_XYZW;
-    break;
-
-  case TGSI_OPCODE_DPH:
-    read_mask = src_idx == 0 ? TGSI_WRITEMASK_XYZ : TGSI_WRITEMASK_XYZW;
-    break;
-
-  case TGSI_OPCODE_TEX:
-  case TGSI_OPCODE_TXD:
-  case TGSI_OPCODE_TXB:
-  case TGSI_OPCODE_TXL:
-  case TGSI_OPCODE_TXP:
-    if (src_idx == 0) {
-      /* Note that the SHADOW variants use the Z component too */
-      switch (inst->Texture.Texture) {
-      case TGSI_TEXTURE_1D:
-        read_mask = TGSI_WRITEMASK_X;
-        break;
-      case TGSI_TEXTURE_SHADOW1D:
-        read_mask = TGSI_WRITEMASK_XZ;
-        break;
-      case TGSI_TEXTURE_1D_ARRAY:
-      case TGSI_TEXTURE_2D:
-      case TGSI_TEXTURE_RECT:
-        read_mask = TGSI_WRITEMASK_XY;
-        break;
-      case TGSI_TEXTURE_SHADOW1D_ARRAY:
-      case TGSI_TEXTURE_SHADOW2D:
-      case TGSI_TEXTURE_SHADOWRECT:
-      case TGSI_TEXTURE_2D_ARRAY:
-      case TGSI_TEXTURE_3D:
-      case TGSI_TEXTURE_CUBE:
-      case TGSI_TEXTURE_2D_MSAA:
-        read_mask = TGSI_WRITEMASK_XYZ;
-        break;
-      case TGSI_TEXTURE_SHADOW2D_ARRAY:
-      case TGSI_TEXTURE_CUBE_ARRAY:
-      case TGSI_TEXTURE_SHADOWCUBE:
-      case TGSI_TEXTURE_2D_ARRAY_MSAA:
-      case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-        read_mask = TGSI_WRITEMASK_XYZW;
-        break;
-      default:
-        assert(0);
-        read_mask = 0;
-      }
-
-      if (inst->Instruction.Opcode != TGSI_OPCODE_TEX) {
-        read_mask |= TGSI_WRITEMASK_W;
-      }
-    } else {
-      /* A safe approximation */
-      read_mask = TGSI_WRITEMASK_XYZW;
-    }
-    break;
-
-  default:
-    /* Assume all channels are read */
-    read_mask = TGSI_WRITEMASK_XYZW;
-    break;
-  }
-
-  usage_mask = 0;
-  for (chan = 0; chan < 4; ++chan) {
-    if (read_mask & (1 << chan)) {
-      usage_mask |= 1 << tgsi_util_get_full_src_register_swizzle(src, chan);
-    }
-  }
-
-  return usage_mask;
-}
-
-/**
- * Convert a tgsi_ind_register into a tgsi_src_register
- */
-struct tgsi_src_register
-tgsi_util_get_src_from_ind(const struct tgsi_ind_register *reg) {
-  struct tgsi_src_register src = {0};
-
-  src.File = reg->File;
-  src.Index = reg->Index;
-  src.SwizzleX = reg->Swizzle;
-  src.SwizzleY = reg->Swizzle;
-  src.SwizzleZ = reg->Swizzle;
-  src.SwizzleW = reg->Swizzle;
-
-  return src;
-}
-
-/**
- * Return the dimension of the texture coordinates (layer included for array
- * textures), as well as the location of the shadow reference value or the
- * sample index.
- */
-int tgsi_util_get_texture_coord_dim(int tgsi_tex, int *shadow_or_sample) {
-  int dim;
-
-  /*
-   * Depending on the texture target, (src0.xyzw, src1.x) is interpreted
-   * differently:
-   *
-   *   (s, X, X, X, X),               for BUFFER
-   *   (s, X, X, X, X),               for 1D
-   *   (s, t, X, X, X),               for 2D, RECT
-   *   (s, t, r, X, X),               for 3D, CUBE
-   *
-   *   (s, layer, X, X, X),           for 1D_ARRAY
-   *   (s, t, layer, X, X),           for 2D_ARRAY
-   *   (s, t, r, layer, X),           for CUBE_ARRAY
-   *
-   *   (s, X, shadow, X, X),          for SHADOW1D
-   *   (s, t, shadow, X, X),          for SHADOW2D, SHADOWRECT
-   *   (s, t, r, shadow, X),          for SHADOWCUBE
-   *
-   *   (s, layer, shadow, X, X),      for SHADOW1D_ARRAY
-   *   (s, t, layer, shadow, X),      for SHADOW2D_ARRAY
-   *   (s, t, r, layer, shadow),      for SHADOWCUBE_ARRAY
-   *
-   *   (s, t, sample, X, X),          for 2D_MSAA
-   *   (s, t, layer, sample, X),      for 2D_ARRAY_MSAA
-   */
-  switch (tgsi_tex) {
-  case TGSI_TEXTURE_BUFFER:
-  case TGSI_TEXTURE_1D:
-  case TGSI_TEXTURE_SHADOW1D:
-    dim = 1;
-    break;
-  case TGSI_TEXTURE_2D:
-  case TGSI_TEXTURE_RECT:
-  case TGSI_TEXTURE_1D_ARRAY:
-  case TGSI_TEXTURE_SHADOW2D:
-  case TGSI_TEXTURE_SHADOWRECT:
-  case TGSI_TEXTURE_SHADOW1D_ARRAY:
-  case TGSI_TEXTURE_2D_MSAA:
-    dim = 2;
-    break;
-  case TGSI_TEXTURE_3D:
-  case TGSI_TEXTURE_CUBE:
-  case TGSI_TEXTURE_2D_ARRAY:
-  case TGSI_TEXTURE_SHADOWCUBE:
-  case TGSI_TEXTURE_SHADOW2D_ARRAY:
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    dim = 3;
-    break;
-  case TGSI_TEXTURE_CUBE_ARRAY:
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-    dim = 4;
-    break;
-  default:
-    assert(!"unknown texture target");
-    dim = 0;
-    break;
-  }
-
-  if (shadow_or_sample) {
-    switch (tgsi_tex) {
-    case TGSI_TEXTURE_SHADOW1D:
-      /* there is a gap */
-      *shadow_or_sample = 2;
-      break;
-    case TGSI_TEXTURE_SHADOW2D:
-    case TGSI_TEXTURE_SHADOWRECT:
-    case TGSI_TEXTURE_SHADOWCUBE:
-    case TGSI_TEXTURE_SHADOW1D_ARRAY:
-    case TGSI_TEXTURE_SHADOW2D_ARRAY:
-    case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-      *shadow_or_sample = dim;
-      break;
-    case TGSI_TEXTURE_2D_MSAA:
-    case TGSI_TEXTURE_2D_ARRAY_MSAA:
-      *shadow_or_sample = 3;
-      break;
-    default:
-      /* no shadow nor sample */
-      *shadow_or_sample = -1;
-      break;
-    }
-  }
-
-  return dim;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_util.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_util.h
deleted file mode 100644
index e8d41f27d..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/tgsi/tgsi_util.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef TGSI_UTIL_H
-#define TGSI_UTIL_H
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-struct tgsi_src_register;
-struct tgsi_full_src_register;
-struct tgsi_full_instruction;
-
-void *tgsi_align_128bit(void *unaligned);
-
-unsigned tgsi_util_get_src_register_swizzle(const struct tgsi_src_register *reg,
-                                            unsigned component);
-
-unsigned tgsi_util_get_full_src_register_swizzle(
-    const struct tgsi_full_src_register *reg, unsigned component);
-
-void tgsi_util_set_src_register_swizzle(struct tgsi_src_register *reg,
-                                        unsigned swizzle, unsigned component);
-
-#define TGSI_UTIL_SIGN_CLEAR 0  /* Force positive */
-#define TGSI_UTIL_SIGN_SET 1    /* Force negative */
-#define TGSI_UTIL_SIGN_TOGGLE 2 /* Negate */
-#define TGSI_UTIL_SIGN_KEEP 3   /* No change */
-
-unsigned tgsi_util_get_full_src_register_sign_mode(
-    const struct tgsi_full_src_register *reg, unsigned component);
-
-void tgsi_util_set_full_src_register_sign_mode(
-    struct tgsi_full_src_register *reg, unsigned sign_mode);
-
-unsigned tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst,
-                                       unsigned src_idx);
-
-struct tgsi_src_register
-tgsi_util_get_src_from_ind(const struct tgsi_ind_register *reg);
-
-int tgsi_util_get_texture_coord_dim(int tgsi_tex, int *shadow_or_sample);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif /* TGSI_UTIL_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/rgtc.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/rgtc.c
deleted file mode 100644
index ec378dcf6..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/rgtc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 Red Hat Inc.
- *
- * block compression parts are:
- * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.
- *
- * 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 (including the next
- * paragraph) 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.
- *
- * Author:
- *    Dave Airlie
- */
-
-#include "macros.h"
-#include <inttypes.h>
-
-#include "rgtc.h"
-
-#define RGTC_DEBUG 0
-
-#define TAG(x) util_format_unsigned_##x
-
-#define TYPE unsigned char
-#define T_MIN 0
-#define T_MAX 0xff
-
-#include "texcompress_rgtc_tmp.h"
-
-#undef TAG
-#undef TYPE
-#undef T_MIN
-#undef T_MAX
-
-#define TAG(x) util_format_signed_##x
-#define TYPE signed char
-#define T_MIN (signed char)-128
-#define T_MAX (signed char)127
-
-#include "texcompress_rgtc_tmp.h"
-
-#undef TAG
-#undef TYPE
-#undef T_MIN
-#undef T_MAX
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/rgtc.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/rgtc.h
deleted file mode 100644
index ac06ff241..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/rgtc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright © 2014 Red Hat
- *
- * 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 (including the next
- * paragraph) 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.
- *
- */
-
-#ifndef _RGTC_H
-#define _RGTC_H
-
-void util_format_unsigned_fetch_texel_rgtc(unsigned srcRowStride,
-                                           const unsigned char *pixdata,
-                                           unsigned i, unsigned j,
-                                           unsigned char *value,
-                                           unsigned comps);
-
-void util_format_signed_fetch_texel_rgtc(unsigned srcRowStride,
-                                         const signed char *pixdata, unsigned i,
-                                         unsigned j, signed char *value,
-                                         unsigned comps);
-
-void util_format_unsigned_encode_rgtc_ubyte(unsigned char *blkaddr,
-                                            unsigned char srccolors[4][4],
-                                            int numxpixels, int numypixels);
-
-void util_format_signed_encode_rgtc_ubyte(signed char *blkaddr,
-                                          signed char srccolors[4][4],
-                                          int numxpixels, int numypixels);
-#endif /* _RGTC_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_atomic.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_atomic.h
deleted file mode 100644
index b3c07efd2..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_atomic.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/**
- * Many similar implementations exist. See for example libwsbm
- * or the linux kernel include/atomic.h
- *
- * No copyright claimed on this file.
- *
- */
-
-#ifndef U_ATOMIC_H
-#define U_ATOMIC_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_defines.h"
-
-/* Favor OS-provided implementations.
- *
- * Where no OS-provided implementation is available, fall back to
- * locally coded assembly, compiler intrinsic or ultimately a
- * mutex-based implementation.
- */
-#if defined(PIPE_OS_SOLARIS)
-#define PIPE_ATOMIC_OS_SOLARIS
-#elif defined(PIPE_CC_MSVC)
-#define PIPE_ATOMIC_MSVC_INTRINSIC
-#elif (defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86))
-#define PIPE_ATOMIC_ASM_MSVC_X86
-#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86))
-#define PIPE_ATOMIC_ASM_GCC_X86
-#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86_64))
-#define PIPE_ATOMIC_ASM_GCC_X86_64
-#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)
-#define PIPE_ATOMIC_GCC_INTRINSIC
-#else
-#error "Unsupported platform"
-#endif
-
-#if defined(PIPE_ATOMIC_ASM_GCC_X86_64)
-#define PIPE_ATOMIC "GCC x86_64 assembly"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-
-static inline boolean p_atomic_dec_zero(int32_t *v) {
-  unsigned char c;
-
-  __asm__ __volatile__("lock; decl %0; sete %1" : "+m"(*v), "=qm"(c)::"memory");
-
-  return c != 0;
-}
-
-static inline void p_atomic_inc(int32_t *v) {
-  __asm__ __volatile__("lock; incl %0" : "+m"(*v));
-}
-
-static inline void p_atomic_dec(int32_t *v) {
-  __asm__ __volatile__("lock; decl %0" : "+m"(*v));
-}
-
-static inline int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) {
-  return __sync_val_compare_and_swap(v, old, _new);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PIPE_ATOMIC_ASM_GCC_X86_64 */
-
-#if defined(PIPE_ATOMIC_ASM_GCC_X86)
-
-#define PIPE_ATOMIC "GCC x86 assembly"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-
-static inline boolean p_atomic_dec_zero(int32_t *v) {
-  unsigned char c;
-
-  __asm__ __volatile__("lock; decl %0; sete %1" : "+m"(*v), "=qm"(c)::"memory");
-
-  return c != 0;
-}
-
-static inline void p_atomic_inc(int32_t *v) {
-  __asm__ __volatile__("lock; incl %0" : "+m"(*v));
-}
-
-static inline void p_atomic_dec(int32_t *v) {
-  __asm__ __volatile__("lock; decl %0" : "+m"(*v));
-}
-
-static inline int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) {
-  return __sync_val_compare_and_swap(v, old, _new);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* Implementation using GCC-provided synchronization intrinsics
- */
-#if defined(PIPE_ATOMIC_GCC_INTRINSIC)
-
-#define PIPE_ATOMIC "GCC Sync Intrinsics"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-
-static inline boolean p_atomic_dec_zero(int32_t *v) {
-  return (__sync_sub_and_fetch(v, 1) == 0);
-}
-
-static inline void p_atomic_inc(int32_t *v) {
-  (void)__sync_add_and_fetch(v, 1);
-}
-
-static inline void p_atomic_dec(int32_t *v) {
-  (void)__sync_sub_and_fetch(v, 1);
-}
-
-static inline int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) {
-  return __sync_val_compare_and_swap(v, old, _new);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* Unlocked version for single threaded environments, such as some
- * windows kernel modules.
- */
-#if defined(PIPE_ATOMIC_OS_UNLOCKED)
-
-#define PIPE_ATOMIC "Unlocked"
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-#define p_atomic_dec_zero(_v) ((boolean)--(*(_v)))
-#define p_atomic_inc(_v) ((void)(*(_v))++)
-#define p_atomic_dec(_v) ((void)(*(_v))--)
-#define p_atomic_cmpxchg(_v, old, _new) (*(_v) == old ? *(_v) = (_new) : *(_v))
-
-#endif
-
-/* Locally coded assembly for MSVC on x86:
- */
-#if defined(PIPE_ATOMIC_ASM_MSVC_X86)
-
-#define PIPE_ATOMIC "MSVC x86 assembly"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-
-static inline boolean p_atomic_dec_zero(int32_t *v) {
-  unsigned char c;
-
-  __asm {
-      mov       eax, [v]
-      lock dec  dword ptr [eax]
-      sete      byte ptr [c]
-  }
-
-  return c != 0;
-}
-
-static inline void p_atomic_inc(int32_t *v) {
-  __asm {
-      mov       eax, [v]
-      lock inc  dword ptr [eax]
-  }
-}
-
-static inline void p_atomic_dec(int32_t *v) {
-  __asm {
-      mov       eax, [v]
-      lock dec  dword ptr [eax]
-  }
-}
-
-static inline int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) {
-  int32_t orig;
-
-  __asm {
-      mov ecx, [v]
-      mov eax, [old]
-      mov edx, [_new]
-      lock cmpxchg [ecx], edx
-      mov [orig], eax
-  }
-
-  return orig;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#if defined(PIPE_ATOMIC_MSVC_INTRINSIC)
-
-#define PIPE_ATOMIC "MSVC Intrinsics"
-
-#include <intrin.h>
-
-#pragma intrinsic(_InterlockedIncrement)
-#pragma intrinsic(_InterlockedDecrement)
-#pragma intrinsic(_InterlockedCompareExchange)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-
-static inline boolean p_atomic_dec_zero(int32_t *v) {
-  return _InterlockedDecrement((long *)v) == 0;
-}
-
-static inline void p_atomic_inc(int32_t *v) {
-  _InterlockedIncrement((long *)v);
-}
-
-static inline void p_atomic_dec(int32_t *v) {
-  _InterlockedDecrement((long *)v);
-}
-
-static inline int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) {
-  return _InterlockedCompareExchange((long *)v, _new, old);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#if defined(PIPE_ATOMIC_OS_SOLARIS)
-
-#define PIPE_ATOMIC "Solaris OS atomic functions"
-
-#include <atomic.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define p_atomic_set(_v, _i) (*(_v) = (_i))
-#define p_atomic_read(_v) (*(_v))
-
-static inline boolean p_atomic_dec_zero(int32_t *v) {
-  uint32_t n = atomic_dec_32_nv((uint32_t *)v);
-
-  return n != 0;
-}
-
-#define p_atomic_inc(_v) atomic_inc_32((uint32_t *)_v)
-#define p_atomic_dec(_v) atomic_dec_32((uint32_t *)_v)
-
-#define p_atomic_cmpxchg(_v, _old, _new)                                       \
-  atomic_cas_32((uint32_t *)_v, (uint32_t)_old, (uint32_t)_new)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#ifndef PIPE_ATOMIC
-#error "No pipe_atomic implementation selected"
-#endif
-
-#endif /* U_ATOMIC_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_bitmask.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_bitmask.c
deleted file mode 100644
index d145b2ffa..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_bitmask.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Generic bitmask implementation.
- *
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-
-#include "pipe/p_compiler.h"
-#include "util/u_debug.h"
-
-#include "util/u_bitmask.h"
-#include "util/u_memory.h"
-
-typedef uint32_t util_bitmask_word;
-
-#define UTIL_BITMASK_INITIAL_WORDS 16
-#define UTIL_BITMASK_BITS_PER_BYTE 8
-#define UTIL_BITMASK_BITS_PER_WORD                                             \
-  (sizeof(util_bitmask_word) * UTIL_BITMASK_BITS_PER_BYTE)
-
-struct util_bitmask {
-  util_bitmask_word *words;
-
-  /** Number of bits we can currently hold */
-  unsigned size;
-
-  /** Number of consecutive bits set at the start of the bitmask */
-  unsigned filled;
-};
-
-struct util_bitmask *util_bitmask_create(void) {
-  struct util_bitmask *bm;
-
-  bm = MALLOC_STRUCT(util_bitmask);
-  if (!bm)
-    return NULL;
-
-  bm->words = (util_bitmask_word *)CALLOC(UTIL_BITMASK_INITIAL_WORDS,
-                                          sizeof(util_bitmask_word));
-  if (!bm->words) {
-    FREE(bm);
-    return NULL;
-  }
-
-  bm->size = UTIL_BITMASK_INITIAL_WORDS * UTIL_BITMASK_BITS_PER_WORD;
-  bm->filled = 0;
-
-  return bm;
-}
-
-/**
- * Resize the bitmask if necessary
- */
-static inline boolean util_bitmask_resize(struct util_bitmask *bm,
-                                          unsigned minimum_index) {
-  unsigned minimum_size = minimum_index + 1;
-  unsigned new_size;
-  util_bitmask_word *new_words;
-
-  /* Check integer overflow */
-  if (!minimum_size)
-    return FALSE;
-
-  if (bm->size >= minimum_size)
-    return TRUE;
-
-  assert(bm->size % UTIL_BITMASK_BITS_PER_WORD == 0);
-  new_size = bm->size;
-  while (new_size < minimum_size) {
-    new_size *= 2;
-    /* Check integer overflow */
-    if (new_size < bm->size)
-      return FALSE;
-  }
-  assert(new_size);
-  assert(new_size % UTIL_BITMASK_BITS_PER_WORD == 0);
-
-  new_words = (util_bitmask_word *)REALLOC(
-      (void *)bm->words, bm->size / UTIL_BITMASK_BITS_PER_BYTE,
-      new_size / UTIL_BITMASK_BITS_PER_BYTE);
-  if (!new_words)
-    return FALSE;
-
-  memset(new_words + bm->size / UTIL_BITMASK_BITS_PER_WORD, 0,
-         (new_size - bm->size) / UTIL_BITMASK_BITS_PER_BYTE);
-
-  bm->size = new_size;
-  bm->words = new_words;
-
-  return TRUE;
-}
-
-/**
- * Lazily update the filled.
- */
-static inline void util_bitmask_filled_set(struct util_bitmask *bm,
-                                           unsigned index) {
-  assert(bm->filled <= bm->size);
-  assert(index < bm->size);
-
-  if (index == bm->filled) {
-    ++bm->filled;
-    assert(bm->filled <= bm->size);
-  }
-}
-
-static inline void util_bitmask_filled_unset(struct util_bitmask *bm,
-                                             unsigned index) {
-  assert(bm->filled <= bm->size);
-  assert(index < bm->size);
-
-  if (index < bm->filled)
-    bm->filled = index;
-}
-
-unsigned util_bitmask_add(struct util_bitmask *bm) {
-  unsigned word;
-  unsigned bit;
-  util_bitmask_word mask;
-
-  assert(bm);
-
-  /* linear search for an empty index */
-  word = bm->filled / UTIL_BITMASK_BITS_PER_WORD;
-  bit = bm->filled % UTIL_BITMASK_BITS_PER_WORD;
-  mask = 1 << bit;
-  while (word < bm->size / UTIL_BITMASK_BITS_PER_WORD) {
-    while (bit < UTIL_BITMASK_BITS_PER_WORD) {
-      if (!(bm->words[word] & mask))
-        goto found;
-      ++bm->filled;
-      ++bit;
-      mask <<= 1;
-    }
-    ++word;
-    bit = 0;
-    mask = 1;
-  }
-found:
-
-  /* grow the bitmask if necessary */
-  if (!util_bitmask_resize(bm, bm->filled))
-    return UTIL_BITMASK_INVALID_INDEX;
-
-  assert(!(bm->words[word] & mask));
-  bm->words[word] |= mask;
-
-  return bm->filled++;
-}
-
-unsigned util_bitmask_set(struct util_bitmask *bm, unsigned index) {
-  unsigned word;
-  unsigned bit;
-  util_bitmask_word mask;
-
-  assert(bm);
-
-  /* grow the bitmask if necessary */
-  if (!util_bitmask_resize(bm, index))
-    return UTIL_BITMASK_INVALID_INDEX;
-
-  word = index / UTIL_BITMASK_BITS_PER_WORD;
-  bit = index % UTIL_BITMASK_BITS_PER_WORD;
-  mask = 1 << bit;
-
-  bm->words[word] |= mask;
-
-  util_bitmask_filled_set(bm, index);
-
-  return index;
-}
-
-void util_bitmask_clear(struct util_bitmask *bm, unsigned index) {
-  unsigned word;
-  unsigned bit;
-  util_bitmask_word mask;
-
-  assert(bm);
-
-  if (index >= bm->size)
-    return;
-
-  word = index / UTIL_BITMASK_BITS_PER_WORD;
-  bit = index % UTIL_BITMASK_BITS_PER_WORD;
-  mask = 1 << bit;
-
-  bm->words[word] &= ~mask;
-
-  util_bitmask_filled_unset(bm, index);
-}
-
-boolean util_bitmask_get(struct util_bitmask *bm, unsigned index) {
-  unsigned word = index / UTIL_BITMASK_BITS_PER_WORD;
-  unsigned bit = index % UTIL_BITMASK_BITS_PER_WORD;
-  util_bitmask_word mask = 1 << bit;
-
-  assert(bm);
-
-  if (index < bm->filled) {
-    assert(bm->words[word] & mask);
-    return TRUE;
-  }
-
-  if (index >= bm->size)
-    return FALSE;
-
-  if (bm->words[word] & mask) {
-    util_bitmask_filled_set(bm, index);
-    return TRUE;
-  } else
-    return FALSE;
-}
-
-unsigned util_bitmask_get_next_index(struct util_bitmask *bm, unsigned index) {
-  unsigned word = index / UTIL_BITMASK_BITS_PER_WORD;
-  unsigned bit = index % UTIL_BITMASK_BITS_PER_WORD;
-  util_bitmask_word mask = 1 << bit;
-
-  if (index < bm->filled) {
-    assert(bm->words[word] & mask);
-    return index;
-  }
-
-  if (index >= bm->size) {
-    return UTIL_BITMASK_INVALID_INDEX;
-  }
-
-  /* Do a linear search */
-  while (word < bm->size / UTIL_BITMASK_BITS_PER_WORD) {
-    while (bit < UTIL_BITMASK_BITS_PER_WORD) {
-      if (bm->words[word] & mask) {
-        if (index == bm->filled) {
-          ++bm->filled;
-          assert(bm->filled <= bm->size);
-        }
-        return index;
-      }
-      ++index;
-      ++bit;
-      mask <<= 1;
-    }
-    ++word;
-    bit = 0;
-    mask = 1;
-  }
-
-  return UTIL_BITMASK_INVALID_INDEX;
-}
-
-unsigned util_bitmask_get_first_index(struct util_bitmask *bm) {
-  return util_bitmask_get_next_index(bm, 0);
-}
-
-void util_bitmask_destroy(struct util_bitmask *bm) {
-  assert(bm);
-
-  FREE(bm->words);
-  FREE(bm);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_bitmask.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_bitmask.h
deleted file mode 100644
index 84f988c15..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_bitmask.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Generic bitmask.
- *
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-
-#ifndef U_HANDLE_BITMASK_H_
-#define U_HANDLE_BITMASK_H_
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UTIL_BITMASK_INVALID_INDEX (~0U)
-
-/**
- * Abstract data type to represent arbitrary set of bits.
- */
-struct util_bitmask;
-
-struct util_bitmask *util_bitmask_create(void);
-
-/**
- * Search a cleared bit and set it.
- *
- * It searches for the first cleared bit.
- *
- * Returns the bit index on success, or UTIL_BITMASK_INVALID_INDEX on out of
- * memory growing the bitmask.
- */
-unsigned util_bitmask_add(struct util_bitmask *bm);
-
-/**
- * Set a bit.
- *
- * Returns the input index on success, or UTIL_BITMASK_INVALID_INDEX on out of
- * memory growing the bitmask.
- */
-unsigned util_bitmask_set(struct util_bitmask *bm, unsigned index);
-
-void util_bitmask_clear(struct util_bitmask *bm, unsigned index);
-
-boolean util_bitmask_get(struct util_bitmask *bm, unsigned index);
-
-void util_bitmask_destroy(struct util_bitmask *bm);
-
-/**
- * Search for the first set bit.
- *
- * Returns UTIL_BITMASK_INVALID_INDEX if a set bit cannot be found.
- */
-unsigned util_bitmask_get_first_index(struct util_bitmask *bm);
-
-/**
- * Search for the first set bit, starting from the giving index.
- *
- * Returns UTIL_BITMASK_INVALID_INDEX if a set bit cannot be found.
- */
-unsigned util_bitmask_get_next_index(struct util_bitmask *bm, unsigned index);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_HANDLE_BITMASK_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_box.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_box.h
deleted file mode 100644
index f3970b4b2..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_box.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef UTIL_BOX_INLINES_H
-#define UTIL_BOX_INLINES_H
-
-#include "pipe/p_state.h"
-
-static inline void u_box_1d(unsigned x, unsigned w, struct pipe_box *box) {
-  box->x = x;
-  box->y = 0;
-  box->z = 0;
-  box->width = w;
-  box->height = 1;
-  box->depth = 1;
-}
-
-static inline void u_box_2d(unsigned x, unsigned y, unsigned w, unsigned h,
-                            struct pipe_box *box) {
-  box->x = x;
-  box->y = y;
-  box->z = 0;
-  box->width = w;
-  box->height = h;
-  box->depth = 1;
-}
-
-static inline void u_box_origin_2d(unsigned w, unsigned h,
-                                   struct pipe_box *box) {
-  box->x = 0;
-  box->y = 0;
-  box->z = 0;
-  box->width = w;
-  box->height = h;
-  box->depth = 1;
-}
-
-static inline void u_box_2d_zslice(unsigned x, unsigned y, unsigned z,
-                                   unsigned w, unsigned h,
-                                   struct pipe_box *box) {
-  box->x = x;
-  box->y = y;
-  box->z = z;
-  box->width = w;
-  box->height = h;
-  box->depth = 1;
-}
-
-static inline void u_box_3d(unsigned x, unsigned y, unsigned z, unsigned w,
-                            unsigned h, unsigned d, struct pipe_box *box) {
-  box->x = x;
-  box->y = y;
-  box->z = z;
-  box->width = w;
-  box->height = h;
-  box->depth = d;
-}
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_cpu_detect.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_cpu_detect.c
deleted file mode 100644
index 848edea75..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_cpu_detect.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 Dennis Smit
- * All Rights Reserved.
- *
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 (including the next
- * paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
- * AUTHORS, COPYRIGHT HOLDERS, AND/OR THEIR SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * CPU feature detection.
- *
- * @author Dennis Smit
- * @author Based on the work of Eric Anholt <anholt@FreeBSD.org>
- */
-
-#include "pipe/p_config.h"
-
-#include "u_cpu_detect.h"
-#include "u_debug.h"
-
-#if defined(PIPE_ARCH_PPC)
-#if defined(PIPE_OS_APPLE)
-#include <sys/sysctl.h>
-#else
-#include <setjmp.h>
-#include <signal.h>
-#endif
-#endif
-
-#if defined(PIPE_OS_NETBSD) || defined(PIPE_OS_OPENBSD)
-#include <machine/cpu.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#endif
-
-#if defined(PIPE_OS_FREEBSD)
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#endif
-
-#if defined(PIPE_OS_LINUX)
-#include <signal.h>
-#endif
-
-#ifdef PIPE_OS_UNIX
-#include <unistd.h>
-#endif
-
-#if defined(PIPE_OS_WINDOWS)
-#include <windows.h>
-#if defined(PIPE_CC_MSVC)
-#include <intrin.h>
-#endif
-#endif
-
-#ifdef DEBUG
-DEBUG_GET_ONCE_BOOL_OPTION(dump_cpu, "GALLIUM_DUMP_CPU", FALSE)
-#endif
-
-struct util_cpu_caps util_cpu_caps;
-
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
-static int has_cpuid(void);
-#endif
-
-#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE)
-static jmp_buf __lv_powerpc_jmpbuf;
-static volatile sig_atomic_t __lv_powerpc_canjump = 0;
-
-static void sigill_handler(int sig) {
-  if (!__lv_powerpc_canjump) {
-    signal(sig, SIG_DFL);
-    raise(sig);
-  }
-
-  __lv_powerpc_canjump = 0;
-  longjmp(__lv_powerpc_jmpbuf, 1);
-}
-#endif
-
-#if defined(PIPE_ARCH_PPC)
-static void check_os_altivec_support(void) {
-#if defined(PIPE_OS_APPLE)
-  int sels[2] = {CTL_HW, HW_VECTORUNIT};
-  int has_vu = 0;
-  int len = sizeof(has_vu);
-  int err;
-
-  err = sysctl(sels, 2, &has_vu, &len, NULL, 0);
-
-  if (err == 0) {
-    if (has_vu != 0) {
-      util_cpu_caps.has_altivec = 1;
-    }
-  }
-#else  /* !PIPE_OS_APPLE */
-  /* not on Apple/Darwin, do it the brute-force way */
-  /* this is borrowed from the libmpeg2 library */
-  signal(SIGILL, sigill_handler);
-  if (setjmp(__lv_powerpc_jmpbuf)) {
-    signal(SIGILL, SIG_DFL);
-  } else {
-    __lv_powerpc_canjump = 1;
-
-    __asm __volatile("mtspr 256, %0\n\t"
-                     "vand %%v0, %%v0, %%v0"
-                     :
-                     : "r"(-1));
-
-    signal(SIGILL, SIG_DFL);
-    util_cpu_caps.has_altivec = 1;
-  }
-#endif /* !PIPE_OS_APPLE */
-}
-#endif /* PIPE_ARCH_PPC */
-
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
-static int has_cpuid(void) {
-#if defined(PIPE_ARCH_X86)
-#if defined(PIPE_OS_GCC)
-  int a, c;
-
-  __asm __volatile("pushf\n"
-                   "popl %0\n"
-                   "movl %0, %1\n"
-                   "xorl $0x200000, %0\n"
-                   "push %0\n"
-                   "popf\n"
-                   "pushf\n"
-                   "popl %0\n"
-                   : "=a"(a), "=c"(c)
-                   :
-                   : "cc");
-
-  return a != c;
-#else
-  /* FIXME */
-  return 1;
-#endif
-#elif defined(PIPE_ARCH_X86_64)
-  return 1;
-#else
-  return 0;
-#endif
-}
-
-/**
- * @sa cpuid.h included in gcc-4.3 onwards.
- * @sa http://msdn.microsoft.com/en-us/library/hskdteyh.aspx
- */
-static inline void cpuid(uint32_t ax, uint32_t *p) {
-#if (defined(PIPE_CC_GCC) || defined(PIPE_CC_SUNPRO)) && defined(PIPE_ARCH_X86)
-  __asm __volatile("xchgl %%ebx, %1\n\t"
-                   "cpuid\n\t"
-                   "xchgl %%ebx, %1"
-                   : "=a"(p[0]), "=S"(p[1]), "=c"(p[2]), "=d"(p[3])
-                   : "0"(ax));
-#elif (defined(PIPE_CC_GCC) || defined(PIPE_CC_SUNPRO)) &&                     \
-    defined(PIPE_ARCH_X86_64)
-  __asm __volatile("cpuid\n\t"
-                   : "=a"(p[0]), "=b"(p[1]), "=c"(p[2]), "=d"(p[3])
-                   : "0"(ax));
-#elif defined(PIPE_CC_MSVC)
-  __cpuid(p, ax);
-#else
-  p[0] = 0;
-  p[1] = 0;
-  p[2] = 0;
-  p[3] = 0;
-#endif
-}
-
-/**
- * @sa cpuid.h included in gcc-4.4 onwards.
- * @sa http://msdn.microsoft.com/en-us/library/hskdteyh%28v=vs.90%29.aspx
- */
-static inline void cpuid_count(uint32_t ax, uint32_t cx, uint32_t *p) {
-#if (defined(PIPE_CC_GCC) || defined(PIPE_CC_SUNPRO)) && defined(PIPE_ARCH_X86)
-  __asm __volatile("xchgl %%ebx, %1\n\t"
-                   "cpuid\n\t"
-                   "xchgl %%ebx, %1"
-                   : "=a"(p[0]), "=S"(p[1]), "=c"(p[2]), "=d"(p[3])
-                   : "0"(ax), "2"(cx));
-#elif (defined(PIPE_CC_GCC) || defined(PIPE_CC_SUNPRO)) &&                     \
-    defined(PIPE_ARCH_X86_64)
-  __asm __volatile("cpuid\n\t"
-                   : "=a"(p[0]), "=b"(p[1]), "=c"(p[2]), "=d"(p[3])
-                   : "0"(ax), "2"(cx));
-#elif defined(PIPE_CC_MSVC)
-  __cpuidex(p, ax, cx);
-#else
-  p[0] = 0;
-  p[1] = 0;
-  p[2] = 0;
-  p[3] = 0;
-#endif
-}
-
-static inline uint64_t xgetbv(void) {
-#if defined(PIPE_CC_GCC)
-  uint32_t eax, edx;
-
-  __asm __volatile(
-      ".byte 0x0f, 0x01, 0xd0" // xgetbv isn't supported on gcc < 4.4
-      : "=a"(eax), "=d"(edx)
-      : "c"(0));
-
-  return ((uint64_t)edx << 32) | eax;
-#elif defined(PIPE_CC_MSVC) && defined(_MSC_FULL_VER) &&                       \
-    defined(_XCR_XFEATURE_ENABLED_MASK)
-  return _xgetbv(_XCR_XFEATURE_ENABLED_MASK);
-#else
-  return 0;
-#endif
-}
-
-#if defined(PIPE_ARCH_X86)
-static inline boolean sse2_has_daz(void) {
-  struct {
-    uint32_t pad1[7];
-    uint32_t mxcsr_mask;
-    uint32_t pad2[128 - 8];
-  } PIPE_ALIGN_VAR(16) fxarea;
-
-  fxarea.mxcsr_mask = 0;
-#if (defined(PIPE_CC_GCC) || defined(PIPE_CC_SUNPRO))
-  __asm __volatile("fxsave %0" : "+m"(fxarea));
-#elif (defined(PIPE_CC_MSVC) && _MSC_VER >= 1700) || defined(PIPE_CC_ICL)
-  /* 1700 = Visual Studio 2012 */
-  _fxsave(&fxarea);
-#else
-  fxarea.mxcsr_mask = 0;
-#endif
-  return !!(fxarea.mxcsr_mask & (1 << 6));
-}
-#endif
-
-#endif /* X86 or X86_64 */
-
-void util_cpu_detect(void) {
-  static boolean util_cpu_detect_initialized = FALSE;
-
-  if (util_cpu_detect_initialized)
-    return;
-
-  memset(&util_cpu_caps, 0, sizeof util_cpu_caps);
-
-  /* Count the number of CPUs in system */
-#if defined(PIPE_OS_WINDOWS)
-  {
-    SYSTEM_INFO system_info;
-    GetSystemInfo(&system_info);
-    util_cpu_caps.nr_cpus = system_info.dwNumberOfProcessors;
-  }
-#elif defined(PIPE_OS_UNIX) && defined(_SC_NPROCESSORS_ONLN)
-  util_cpu_caps.nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-  if (util_cpu_caps.nr_cpus == -1)
-    util_cpu_caps.nr_cpus = 1;
-#elif defined(PIPE_OS_BSD)
-  {
-    int mib[2], ncpu;
-    int len;
-
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-
-    len = sizeof(ncpu);
-    sysctl(mib, 2, &ncpu, &len, NULL, 0);
-    util_cpu_caps.nr_cpus = ncpu;
-  }
-#else
-  util_cpu_caps.nr_cpus = 1;
-#endif
-
-  /* Make the fallback cacheline size nonzero so that it can be
-   * safely passed to align().
-   */
-  util_cpu_caps.cacheline = sizeof(void *);
-
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
-  if (has_cpuid()) {
-    uint32_t regs[4];
-    uint32_t regs2[4];
-
-    util_cpu_caps.cacheline = 32;
-
-    /* Get max cpuid level */
-    cpuid(0x00000000, regs);
-
-    if (regs[0] >= 0x00000001) {
-      unsigned int cacheline;
-
-      cpuid(0x00000001, regs2);
-
-      util_cpu_caps.x86_cpu_type = (regs2[0] >> 8) & 0xf;
-      if (util_cpu_caps.x86_cpu_type == 0xf)
-        util_cpu_caps.x86_cpu_type =
-            8 + ((regs2[0] >> 20) & 255); /* use extended family (P4, IA64) */
-
-      /* general feature flags */
-      util_cpu_caps.has_tsc = (regs2[3] >> 4) & 1;   /* 0x0000010 */
-      util_cpu_caps.has_mmx = (regs2[3] >> 23) & 1;  /* 0x0800000 */
-      util_cpu_caps.has_sse = (regs2[3] >> 25) & 1;  /* 0x2000000 */
-      util_cpu_caps.has_sse2 = (regs2[3] >> 26) & 1; /* 0x4000000 */
-      util_cpu_caps.has_sse3 = (regs2[2] >> 0) & 1;  /* 0x0000001 */
-      util_cpu_caps.has_ssse3 = (regs2[2] >> 9) & 1; /* 0x0000020 */
-      util_cpu_caps.has_sse4_1 = (regs2[2] >> 19) & 1;
-      util_cpu_caps.has_sse4_2 = (regs2[2] >> 20) & 1;
-      util_cpu_caps.has_popcnt = (regs2[2] >> 23) & 1;
-      util_cpu_caps.has_avx = ((regs2[2] >> 28) & 1) && // AVX
-                              ((regs2[2] >> 27) & 1) && // OSXSAVE
-                              ((xgetbv() & 6) == 6);    // XMM & YMM
-      util_cpu_caps.has_f16c = (regs2[2] >> 29) & 1;
-      util_cpu_caps.has_mmx2 =
-          util_cpu_caps.has_sse; /* SSE cpus supports mmxext too */
-#if defined(PIPE_ARCH_X86_64)
-      util_cpu_caps.has_daz = 1;
-#else
-      util_cpu_caps.has_daz =
-          util_cpu_caps.has_sse3 || (util_cpu_caps.has_sse2 && sse2_has_daz());
-#endif
-
-      cacheline = ((regs2[1] >> 8) & 0xFF) * 8;
-      if (cacheline > 0)
-        util_cpu_caps.cacheline = cacheline;
-    }
-    if (util_cpu_caps.has_avx && regs[0] >= 0x00000007) {
-      uint32_t regs7[4];
-      cpuid_count(0x00000007, 0x00000000, regs7);
-      util_cpu_caps.has_avx2 = (regs7[1] >> 5) & 1;
-    }
-
-    if (regs[1] == 0x756e6547 && regs[2] == 0x6c65746e &&
-        regs[3] == 0x49656e69) {
-      /* GenuineIntel */
-      util_cpu_caps.has_intel = 1;
-    }
-
-    cpuid(0x80000000, regs);
-
-    if (regs[0] >= 0x80000001) {
-
-      cpuid(0x80000001, regs2);
-
-      util_cpu_caps.has_mmx |= (regs2[3] >> 23) & 1;
-      util_cpu_caps.has_mmx2 |= (regs2[3] >> 22) & 1;
-      util_cpu_caps.has_3dnow = (regs2[3] >> 31) & 1;
-      util_cpu_caps.has_3dnow_ext = (regs2[3] >> 30) & 1;
-
-      util_cpu_caps.has_xop = util_cpu_caps.has_avx && ((regs2[2] >> 11) & 1);
-    }
-
-    if (regs[0] >= 0x80000006) {
-      cpuid(0x80000006, regs2);
-      util_cpu_caps.cacheline = regs2[2] & 0xFF;
-    }
-
-    if (!util_cpu_caps.has_sse) {
-      util_cpu_caps.has_sse2 = 0;
-      util_cpu_caps.has_sse3 = 0;
-      util_cpu_caps.has_ssse3 = 0;
-      util_cpu_caps.has_sse4_1 = 0;
-    }
-  }
-#endif /* PIPE_ARCH_X86 || PIPE_ARCH_X86_64 */
-
-#if defined(PIPE_ARCH_PPC)
-  check_os_altivec_support();
-#endif /* PIPE_ARCH_PPC */
-
-#ifdef DEBUG
-  if (debug_get_option_dump_cpu()) {
-    debug_printf("util_cpu_caps.nr_cpus = %u\n", util_cpu_caps.nr_cpus);
-
-    debug_printf("util_cpu_caps.x86_cpu_type = %u\n",
-                 util_cpu_caps.x86_cpu_type);
-    debug_printf("util_cpu_caps.cacheline = %u\n", util_cpu_caps.cacheline);
-
-    debug_printf("util_cpu_caps.has_tsc = %u\n", util_cpu_caps.has_tsc);
-    debug_printf("util_cpu_caps.has_mmx = %u\n", util_cpu_caps.has_mmx);
-    debug_printf("util_cpu_caps.has_mmx2 = %u\n", util_cpu_caps.has_mmx2);
-    debug_printf("util_cpu_caps.has_sse = %u\n", util_cpu_caps.has_sse);
-    debug_printf("util_cpu_caps.has_sse2 = %u\n", util_cpu_caps.has_sse2);
-    debug_printf("util_cpu_caps.has_sse3 = %u\n", util_cpu_caps.has_sse3);
-    debug_printf("util_cpu_caps.has_ssse3 = %u\n", util_cpu_caps.has_ssse3);
-    debug_printf("util_cpu_caps.has_sse4_1 = %u\n", util_cpu_caps.has_sse4_1);
-    debug_printf("util_cpu_caps.has_sse4_2 = %u\n", util_cpu_caps.has_sse4_2);
-    debug_printf("util_cpu_caps.has_avx = %u\n", util_cpu_caps.has_avx);
-    debug_printf("util_cpu_caps.has_avx2 = %u\n", util_cpu_caps.has_avx2);
-    debug_printf("util_cpu_caps.has_f16c = %u\n", util_cpu_caps.has_f16c);
-    debug_printf("util_cpu_caps.has_popcnt = %u\n", util_cpu_caps.has_popcnt);
-    debug_printf("util_cpu_caps.has_3dnow = %u\n", util_cpu_caps.has_3dnow);
-    debug_printf("util_cpu_caps.has_3dnow_ext = %u\n",
-                 util_cpu_caps.has_3dnow_ext);
-    debug_printf("util_cpu_caps.has_xop = %u\n", util_cpu_caps.has_xop);
-    debug_printf("util_cpu_caps.has_altivec = %u\n", util_cpu_caps.has_altivec);
-    debug_printf("util_cpu_caps.has_daz = %u\n", util_cpu_caps.has_daz);
-  }
-#endif
-
-  util_cpu_detect_initialized = TRUE;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_cpu_detect.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_cpu_detect.h
deleted file mode 100644
index 2554c8ebd..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_cpu_detect.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 Dennis Smit
- * All Rights Reserved.
- *
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 (including the next
- * paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
- * AUTHORS, COPYRIGHT HOLDERS, AND/OR THEIR SUPPLIERS 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.
- *
- ***************************************************************************/
-
-/**
- * @file
- * CPU feature detection.
- *
- * @author Dennis Smit
- * @author Based on the work of Eric Anholt <anholt@FreeBSD.org>
- */
-
-#ifndef _UTIL_CPU_DETECT_H
-#define _UTIL_CPU_DETECT_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct util_cpu_caps {
-  int nr_cpus;
-
-  /* Feature flags */
-  int x86_cpu_type;
-  unsigned cacheline;
-
-  unsigned has_intel : 1;
-  unsigned has_tsc : 1;
-  unsigned has_mmx : 1;
-  unsigned has_mmx2 : 1;
-  unsigned has_sse : 1;
-  unsigned has_sse2 : 1;
-  unsigned has_sse3 : 1;
-  unsigned has_ssse3 : 1;
-  unsigned has_sse4_1 : 1;
-  unsigned has_sse4_2 : 1;
-  unsigned has_popcnt : 1;
-  unsigned has_avx : 1;
-  unsigned has_avx2 : 1;
-  unsigned has_f16c : 1;
-  unsigned has_3dnow : 1;
-  unsigned has_3dnow_ext : 1;
-  unsigned has_xop : 1;
-  unsigned has_altivec : 1;
-  unsigned has_daz : 1;
-};
-
-extern struct util_cpu_caps util_cpu_caps;
-
-void util_cpu_detect(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UTIL_CPU_DETECT_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug.c
deleted file mode 100644
index 72eb7bc6b..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * Copyright (c) 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "pipe/p_config.h"
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
-#include "pipe/p_state.h"
-#include "util/u_debug.h"
-#include "util/u_format.h"
-#include "util/u_inlines.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-#include "util/u_prim.h"
-#include "util/u_string.h"
-#include "util/u_surface.h"
-
-#include <ctype.h>  /* isalnum */
-#include <limits.h> /* CHAR_BIT */
-#include <stdio.h>
-
-#ifdef _WIN32
-#include <stdlib.h>
-#include <windows.h>
-#endif
-
-void _debug_vprintf(const char *format, va_list ap) {
-  static char buf[4096] = {'\0'};
-#if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED)
-  /* We buffer until we find a newline. */
-  size_t len = strlen(buf);
-  int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);
-  if (ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) {
-    os_log_message(buf);
-    buf[0] = '\0';
-  }
-#else
-  util_vsnprintf(buf, sizeof(buf), format, ap);
-  os_log_message(buf);
-#endif
-}
-
-void debug_disable_error_message_boxes(void) {
-#ifdef _WIN32
-  /* When Windows' error message boxes are disabled for this process (as is
-   * typically the case when running tests in an automated fashion) we disable
-   * CRT message boxes too.
-   */
-  UINT uMode = SetErrorMode(0);
-  SetErrorMode(uMode);
-  if (uMode & SEM_FAILCRITICALERRORS) {
-    /* Disable assertion failure message box.
-     * http://msdn.microsoft.com/en-us/library/sas1dkb2.aspx
-     */
-    _set_error_mode(_OUT_TO_STDERR);
-#ifdef _MSC_VER
-    /* Disable abort message box.
-     * http://msdn.microsoft.com/en-us/library/e631wekh.aspx
-     */
-    _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
-#endif
-  }
-#endif /* _WIN32 */
-}
-
-#ifdef DEBUG
-void debug_print_blob(const char *name, const void *blob, unsigned size) {
-  const unsigned *ublob = (const unsigned *)blob;
-  unsigned i;
-
-  debug_printf("%s (%d dwords%s)\n", name, size / 4,
-               size % 4 ? "... plus a few bytes" : "");
-
-  for (i = 0; i < size / 4; i++) {
-    debug_printf("%d:\t%08x\n", i, ublob[i]);
-  }
-}
-#endif
-
-static boolean debug_get_option_should_print(void) {
-  static boolean first = TRUE;
-  static boolean value = FALSE;
-
-  if (!first)
-    return value;
-
-  /* Oh hey this will call into this function,
-   * but its cool since we set first to false
-   */
-  first = FALSE;
-  value = debug_get_bool_option("GALLIUM_PRINT_OPTIONS", FALSE);
-  /* XXX should we print this option? Currently it wont */
-  return value;
-}
-
-const char *debug_get_option(const char *name, const char *dfault) {
-  const char *result;
-
-  result = os_get_option(name);
-  if (!result)
-    result = dfault;
-
-  if (debug_get_option_should_print())
-    debug_printf("%s: %s = %s\n", __FUNCTION__, name,
-                 result ? result : "(null)");
-
-  return result;
-}
-
-boolean debug_get_bool_option(const char *name, boolean dfault) {
-  const char *str = os_get_option(name);
-  boolean result;
-
-  if (str == NULL)
-    result = dfault;
-  else if (!util_strcmp(str, "n"))
-    result = FALSE;
-  else if (!util_strcmp(str, "no"))
-    result = FALSE;
-  else if (!util_strcmp(str, "0"))
-    result = FALSE;
-  else if (!util_strcmp(str, "f"))
-    result = FALSE;
-  else if (!util_strcmp(str, "F"))
-    result = FALSE;
-  else if (!util_strcmp(str, "false"))
-    result = FALSE;
-  else if (!util_strcmp(str, "FALSE"))
-    result = FALSE;
-  else
-    result = TRUE;
-
-  if (debug_get_option_should_print())
-    debug_printf("%s: %s = %s\n", __FUNCTION__, name,
-                 result ? "TRUE" : "FALSE");
-
-  return result;
-}
-
-long debug_get_num_option(const char *name, long dfault) {
-  long result;
-  const char *str;
-
-  str = os_get_option(name);
-  if (!str)
-    result = dfault;
-  else {
-    long sign;
-    char c;
-    c = *str++;
-    if (c == '-') {
-      sign = -1;
-      c = *str++;
-    } else {
-      sign = 1;
-    }
-    result = 0;
-    while ('0' <= c && c <= '9') {
-      result = result * 10 + (c - '0');
-      c = *str++;
-    }
-    result *= sign;
-  }
-
-  if (debug_get_option_should_print())
-    debug_printf("%s: %s = %li\n", __FUNCTION__, name, result);
-
-  return result;
-}
-
-static boolean str_has_option(const char *str, const char *name) {
-  /* Empty string. */
-  if (!*str) {
-    return FALSE;
-  }
-
-  /* OPTION=all */
-  if (!util_strcmp(str, "all")) {
-    return TRUE;
-  }
-
-  /* Find 'name' in 'str' surrounded by non-alphanumeric characters. */
-  {
-    const char *start = str;
-    unsigned name_len = strlen(name);
-
-    /* 'start' is the beginning of the currently-parsed word,
-     * we increment 'str' each iteration.
-     * if we find either the end of string or a non-alphanumeric character,
-     * we compare 'start' up to 'str-1' with 'name'. */
-
-    while (1) {
-      if (!*str || !(isalnum(*str) || *str == '_')) {
-        if (str - start == name_len && !memcmp(start, name, name_len)) {
-          return TRUE;
-        }
-
-        if (!*str) {
-          return FALSE;
-        }
-
-        start = str + 1;
-      }
-
-      str++;
-    }
-  }
-
-  return FALSE;
-}
-
-unsigned long debug_get_flags_option(const char *name,
-                                     const struct debug_named_value *flags,
-                                     unsigned long dfault) {
-  unsigned long result;
-  const char *str;
-  const struct debug_named_value *orig = flags;
-  unsigned namealign = 0;
-
-  str = os_get_option(name);
-  if (!str)
-    result = dfault;
-  else if (!util_strcmp(str, "help")) {
-    result = dfault;
-    _debug_printf("%s: help for %s:\n", __FUNCTION__, name);
-    for (; flags->name; ++flags)
-      namealign = MAX2(namealign, strlen(flags->name));
-    for (flags = orig; flags->name; ++flags)
-      _debug_printf("| %*s [0x%0*lx]%s%s\n", namealign, flags->name,
-                    (int)sizeof(unsigned long) * CHAR_BIT / 4, flags->value,
-                    flags->desc ? " " : "", flags->desc ? flags->desc : "");
-  } else {
-    result = 0;
-    while (flags->name) {
-      if (str_has_option(str, flags->name))
-        result |= flags->value;
-      ++flags;
-    }
-  }
-
-  if (debug_get_option_should_print()) {
-    if (str) {
-      debug_printf("%s: %s = 0x%lx (%s)\n", __FUNCTION__, name, result, str);
-    } else {
-      debug_printf("%s: %s = 0x%lx\n", __FUNCTION__, name, result);
-    }
-  }
-
-  return result;
-}
-
-void _debug_assert_fail(const char *expr, const char *file, unsigned line,
-                        const char *function) {
-  _debug_printf("%s:%u:%s: Assertion `%s' failed.\n", file, line, function,
-                expr);
-  os_abort();
-}
-
-const char *debug_dump_enum(const struct debug_named_value *names,
-                            unsigned long value) {
-  static char rest[64];
-
-  while (names->name) {
-    if (names->value == value)
-      return names->name;
-    ++names;
-  }
-
-  util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-  return rest;
-}
-
-const char *debug_dump_enum_noprefix(const struct debug_named_value *names,
-                                     const char *prefix, unsigned long value) {
-  static char rest[64];
-
-  while (names->name) {
-    if (names->value == value) {
-      const char *name = names->name;
-      while (*name == *prefix) {
-        name++;
-        prefix++;
-      }
-      return name;
-    }
-    ++names;
-  }
-
-  util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-  return rest;
-}
-
-const char *debug_dump_flags(const struct debug_named_value *names,
-                             unsigned long value) {
-  static char output[4096];
-  static char rest[256];
-  int first = 1;
-
-  output[0] = '\0';
-
-  while (names->name) {
-    if ((names->value & value) == names->value) {
-      if (!first)
-        util_strncat(output, "|", sizeof(output) - strlen(output) - 1);
-      else
-        first = 0;
-      util_strncat(output, names->name, sizeof(output) - strlen(output) - 1);
-      output[sizeof(output) - 1] = '\0';
-      value &= ~names->value;
-    }
-    ++names;
-  }
-
-  if (value) {
-    if (!first)
-      util_strncat(output, "|", sizeof(output) - strlen(output) - 1);
-    else
-      first = 0;
-
-    util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-    util_strncat(output, rest, sizeof(output) - strlen(output) - 1);
-    output[sizeof(output) - 1] = '\0';
-  }
-
-  if (first)
-    return "0";
-
-  return output;
-}
-
-#ifdef DEBUG
-void debug_print_format(const char *msg, unsigned fmt) {
-  debug_printf("%s: %s\n", msg, util_format_name(fmt));
-}
-#endif
-
-static const struct debug_named_value pipe_prim_names[] = {
-#ifdef DEBUG
-    DEBUG_NAMED_VALUE(PIPE_PRIM_POINTS),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_LINES),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_LOOP),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_FAN),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_QUADS),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_QUAD_STRIP),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_POLYGON),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_LINES_ADJACENCY),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP_ADJACENCY),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES_ADJACENCY),
-    DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY),
-#endif
-    DEBUG_NAMED_VALUE_END};
-
-const char *u_prim_name(unsigned prim) {
-  return debug_dump_enum(pipe_prim_names, prim);
-}
-
-#ifdef DEBUG
-int fl_indent = 0;
-const char *fl_function[1024];
-
-int debug_funclog_enter(const char *f, UNUSED const int line,
-                        UNUSED const char *file) {
-  int i;
-
-  for (i = 0; i < fl_indent; i++)
-    debug_printf("  ");
-  debug_printf("%s\n", f);
-
-  assert(fl_indent < 1023);
-  fl_function[fl_indent++] = f;
-
-  return 0;
-}
-
-void debug_funclog_exit(const char *f, UNUSED const int line,
-                        UNUSED const char *file) {
-  --fl_indent;
-  assert(fl_indent >= 0);
-  assert(fl_function[fl_indent] == f);
-}
-
-void debug_funclog_enter_exit(const char *f, UNUSED const int line,
-                              UNUSED const char *file) {
-  int i;
-  for (i = 0; i < fl_indent; i++)
-    debug_printf("  ");
-  debug_printf("%s\n", f);
-}
-#endif
-
-#ifdef DEBUG
-/**
- * Print PIPE_TRANSFER_x flags with a message.
- */
-void debug_print_transfer_flags(const char *msg, unsigned usage) {
-#define FLAG(x) {x, #x}
-  static const struct {
-    unsigned bit;
-    const char *name;
-  } flags[] = {FLAG(PIPE_TRANSFER_READ),
-               FLAG(PIPE_TRANSFER_WRITE),
-               FLAG(PIPE_TRANSFER_MAP_DIRECTLY),
-               FLAG(PIPE_TRANSFER_DISCARD_RANGE),
-               FLAG(PIPE_TRANSFER_DONTBLOCK),
-               FLAG(PIPE_TRANSFER_UNSYNCHRONIZED),
-               FLAG(PIPE_TRANSFER_FLUSH_EXPLICIT),
-               FLAG(PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE)};
-  unsigned i;
-
-  debug_printf("%s ", msg);
-
-  for (i = 0; i < ARRAY_SIZE(flags); i++) {
-    if (usage & flags[i].bit) {
-      debug_printf("%s", flags[i].name);
-      usage &= ~flags[i].bit;
-      if (usage) {
-        debug_printf(" | ");
-      }
-    }
-  }
-
-  debug_printf("\n");
-#undef FLAG
-}
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug.h
deleted file mode 100644
index 520a8c028..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Cross-platform debugging helpers.
- *
- * For now it just has assert and printf replacements, but it might be extended
- * with stack trace reports and more advanced logging in the near future.
- *
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-
-#ifndef U_DEBUG_H_
-#define U_DEBUG_H_
-
-#include "os/os_misc.h"
-
-#include "pipe/p_format.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__)
-#define _util_printf_format(fmt, list)                                         \
-  __attribute__((format(printf, fmt, list)))
-#else
-#define _util_printf_format(fmt, list)
-#endif
-
-void _debug_vprintf(const char *format, va_list ap);
-
-static inline void _debug_printf(const char *format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  _debug_vprintf(format, ap);
-  va_end(ap);
-}
-
-/**
- * Print debug messages.
- *
- * The actual channel used to output debug message is platform specific. To
- * avoid misformating or truncation, follow these rules of thumb:
- * - output whole lines
- * - avoid outputing large strings (512 bytes is the current maximum length
- * that is guaranteed to be printed in all platforms)
- */
-#if !defined(PIPE_OS_HAIKU)
-static inline void debug_printf(const char *format, ...)
-    _util_printf_format(1, 2);
-
-static inline void debug_printf(const char *format, ...) {
-#ifdef DEBUG
-  va_list ap;
-  va_start(ap, format);
-  _debug_vprintf(format, ap);
-  va_end(ap);
-#else
-  (void)format; /* silence warning */
-#endif
-}
-#else /* is Haiku */
-/* Haiku provides debug_printf in libroot with OS.h */
-#include <OS.h>
-#endif
-
-/*
- * ... isn't portable so we need to pass arguments in parentheses.
- *
- * usage:
- *    debug_printf_once(("answer: %i\n", 42));
- */
-#define debug_printf_once(args)                                                \
-  do {                                                                         \
-    static boolean once = TRUE;                                                \
-    if (once) {                                                                \
-      once = FALSE;                                                            \
-      debug_printf args;                                                       \
-    }                                                                          \
-  } while (0)
-
-#ifdef DEBUG
-#define debug_vprintf(_format, _ap) _debug_vprintf(_format, _ap)
-#else
-#define debug_vprintf(_format, _ap) ((void)0)
-#endif
-
-#ifdef DEBUG
-/**
- * Dump a blob in hex to the same place that debug_printf sends its
- * messages.
- */
-void debug_print_blob(const char *name, const void *blob, unsigned size);
-
-/* Print a message along with a prettified format string
- */
-void debug_print_format(const char *msg, unsigned fmt);
-#else
-#define debug_print_blob(_name, _blob, _size) ((void)0)
-#define debug_print_format(_msg, _fmt) ((void)0)
-#endif
-
-/**
- * Disable interactive error message boxes.
- *
- * Should be called as soon as possible for effectiveness.
- */
-void debug_disable_error_message_boxes(void);
-
-/**
- * Hard-coded breakpoint.
- */
-#ifdef DEBUG
-#define debug_break() os_break()
-#else /* !DEBUG */
-#define debug_break() ((void)0)
-#endif /* !DEBUG */
-
-#ifdef _MSC_VER
-__declspec(noreturn)
-#endif
-void _debug_assert_fail(const char *expr, 
-                        const char *file, 
-                        unsigned line, 
-                        const char *function)
-#if defined(__GNUC__) && !defined(DEBUG)
-   __attribute__((noreturn))
-#endif
-;
-
-/**
- * Assert macro
- *
- * Do not expect that the assert call terminates -- errors must be handled
- * regardless of assert behavior.
- *
- * For non debug builds the assert macro will expand to a no-op, so do not
- * call functions with side effects in the assert expression.
- */
-#ifdef DEBUG
-#define debug_assert(expr)                                                     \
-  ((expr) ? (void)0                                                            \
-          : _debug_assert_fail(#expr, __FILE__, __LINE__, __FUNCTION__))
-#else
-#define debug_assert(expr) (void)(0 && (expr))
-#endif
-
-/** Override standard assert macro */
-#ifdef assert
-#undef assert
-#endif
-#define assert(expr) debug_assert(expr)
-
-/**
- * Output the current function name.
- */
-#ifdef DEBUG
-#define debug_checkpoint() _debug_printf("%s\n", __FUNCTION__)
-#else
-#define debug_checkpoint() ((void)0)
-#endif
-
-/**
- * Output the full source code position.
- */
-#ifdef DEBUG
-#define debug_checkpoint_full()                                                \
-  _debug_printf("%s:%u:%s\n", __FILE__, __LINE__, __FUNCTION__)
-#else
-#define debug_checkpoint_full() ((void)0)
-#endif
-
-/**
- * Output a warning message. Muted on release version.
- */
-#ifdef DEBUG
-#define debug_warning(__msg)                                                   \
-  _debug_printf("%s:%u:%s: warning: %s\n", __FILE__, __LINE__, __FUNCTION__,   \
-                __msg)
-#else
-#define debug_warning(__msg) ((void)0)
-#endif
-
-/**
- * Emit a warning message, but only once.
- */
-#ifdef DEBUG
-#define debug_warn_once(__msg)                                                 \
-  do {                                                                         \
-    static bool warned = FALSE;                                                \
-    if (!warned) {                                                             \
-      _debug_printf("%s:%u:%s: one time warning: %s\n", __FILE__, __LINE__,    \
-                    __FUNCTION__, __msg);                                      \
-      warned = TRUE;                                                           \
-    }                                                                          \
-  } while (0)
-#else
-#define debug_warn_once(__msg) ((void)0)
-#endif
-
-/**
- * Output an error message. Not muted on release version.
- */
-#ifdef DEBUG
-#define debug_error(__msg)                                                     \
-  _debug_printf("%s:%u:%s: error: %s\n", __FILE__, __LINE__, __FUNCTION__,     \
-                __msg)
-#else
-#define debug_error(__msg) _debug_printf("error: %s\n", __msg)
-#endif
-
-/**
- * Used by debug_dump_enum and debug_dump_flags to describe symbols.
- */
-struct debug_named_value {
-  const char *name;
-  unsigned long value;
-  const char *desc;
-};
-
-/**
- * Some C pre-processor magic to simplify creating named values.
- *
- * Example:
- * @code
- * static const debug_named_value my_names[] = {
- *    DEBUG_NAMED_VALUE(MY_ENUM_VALUE_X),
- *    DEBUG_NAMED_VALUE(MY_ENUM_VALUE_Y),
- *    DEBUG_NAMED_VALUE(MY_ENUM_VALUE_Z),
- *    DEBUG_NAMED_VALUE_END
- * };
- *
- *    ...
- *    debug_printf("%s = %s\n",
- *                 name,
- *                 debug_dump_enum(my_names, my_value));
- *    ...
- * @endcode
- */
-#define DEBUG_NAMED_VALUE(__symbol) {#__symbol, (unsigned long)__symbol, NULL}
-#define DEBUG_NAMED_VALUE_WITH_DESCRIPTION(__symbol, __desc)                   \
-  {#__symbol, (unsigned long)__symbol, __desc}
-#define DEBUG_NAMED_VALUE_END {NULL, 0, NULL}
-
-/**
- * Convert a enum value to a string.
- */
-const char *debug_dump_enum(const struct debug_named_value *names,
-                            unsigned long value);
-
-const char *debug_dump_enum_noprefix(const struct debug_named_value *names,
-                                     const char *prefix, unsigned long value);
-
-/**
- * Convert binary flags value to a string.
- */
-const char *debug_dump_flags(const struct debug_named_value *names,
-                             unsigned long value);
-
-/**
- * Function enter exit loggers
- */
-#ifdef DEBUG
-int debug_funclog_enter(const char *f, const int line, const char *file);
-void debug_funclog_exit(const char *f, const int line, const char *file);
-void debug_funclog_enter_exit(const char *f, const int line, const char *file);
-
-#define DEBUG_FUNCLOG_ENTER()                                                  \
-  int __debug_decleration_work_around =                                        \
-      debug_funclog_enter(__FUNCTION__, __LINE__, __FILE__)
-#define DEBUG_FUNCLOG_EXIT()                                                   \
-  do {                                                                         \
-    (void)__debug_decleration_work_around;                                     \
-    debug_funclog_exit(__FUNCTION__, __LINE__, __FILE__);                      \
-    return;                                                                    \
-  } while (0)
-#define DEBUG_FUNCLOG_EXIT_RET(ret)                                            \
-  do {                                                                         \
-    (void)__debug_decleration_work_around;                                     \
-    debug_funclog_exit(__FUNCTION__, __LINE__, __FILE__);                      \
-    return ret;                                                                \
-  } while (0)
-#define DEBUG_FUNCLOG_ENTER_EXIT()                                             \
-  debug_funclog_enter_exit(__FUNCTION__, __LINE__, __FILE__)
-
-#else
-#define DEBUG_FUNCLOG_ENTER() int __debug_decleration_work_around
-#define DEBUG_FUNCLOG_EXIT()                                                   \
-  do {                                                                         \
-    (void)__debug_decleration_work_around;                                     \
-    return;                                                                    \
-  } while (0)
-#define DEBUG_FUNCLOG_EXIT_RET(ret)                                            \
-  do {                                                                         \
-    (void)__debug_decleration_work_around;                                     \
-    return ret;                                                                \
-  } while (0)
-#define DEBUG_FUNCLOG_ENTER_EXIT()
-#endif
-
-/**
- * Get option.
- *
- * It is an alias for getenv on Linux.
- *
- * On Windows it reads C:\gallium.cfg, which is a text file with CR+LF line
- * endings with one option per line as
- *
- *   NAME=value
- *
- * This file must be terminated with an extra empty line.
- */
-const char *debug_get_option(const char *name, const char *dfault);
-
-boolean debug_get_bool_option(const char *name, boolean dfault);
-
-long debug_get_num_option(const char *name, long dfault);
-
-unsigned long debug_get_flags_option(const char *name,
-                                     const struct debug_named_value *flags,
-                                     unsigned long dfault);
-
-#define DEBUG_GET_ONCE_BOOL_OPTION(sufix, name, dfault)                        \
-  static boolean debug_get_option_##sufix(void) {                              \
-    static boolean first = TRUE;                                               \
-    static boolean value;                                                      \
-    if (first) {                                                               \
-      first = FALSE;                                                           \
-      value = debug_get_bool_option(name, dfault);                             \
-    }                                                                          \
-    return value;                                                              \
-  }
-
-#define DEBUG_GET_ONCE_NUM_OPTION(sufix, name, dfault)                         \
-  static long debug_get_option_##sufix(void) {                                 \
-    static boolean first = TRUE;                                               \
-    static long value;                                                         \
-    if (first) {                                                               \
-      first = FALSE;                                                           \
-      value = debug_get_num_option(name, dfault);                              \
-    }                                                                          \
-    return value;                                                              \
-  }
-
-#define DEBUG_GET_ONCE_FLAGS_OPTION(sufix, name, flags, dfault)                \
-  static unsigned long debug_get_option_##sufix(void) {                        \
-    static boolean first = TRUE;                                               \
-    static unsigned long value;                                                \
-    if (first) {                                                               \
-      first = FALSE;                                                           \
-      value = debug_get_flags_option(name, flags, dfault);                     \
-    }                                                                          \
-    return value;                                                              \
-  }
-
-unsigned long debug_memory_begin(void);
-
-void debug_memory_end(unsigned long beginning);
-
-#ifdef DEBUG
-struct pipe_context;
-struct pipe_surface;
-struct pipe_transfer;
-struct pipe_resource;
-
-void debug_dump_image(const char *prefix, enum pipe_format format, unsigned cpp,
-                      unsigned width, unsigned height, unsigned stride,
-                      const void *data);
-void debug_dump_surface(struct pipe_context *pipe, const char *prefix,
-                        struct pipe_surface *surface);
-void debug_dump_texture(struct pipe_context *pipe, const char *prefix,
-                        struct pipe_resource *texture);
-#else
-#define debug_dump_image(prefix, format, cpp, width, height, stride, data)     \
-  ((void)0)
-#define debug_dump_surface(pipe, prefix, surface) ((void)0)
-#endif
-
-void debug_print_transfer_flags(const char *msg, unsigned usage);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_DEBUG_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_describe.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_describe.c
deleted file mode 100644
index 89bb980ef..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_describe.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Luca Barbieri
- *
- * 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 (including the
- * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "util/u_debug_describe.h"
-#include "pipe/p_state.h"
-#include "util/u_format.h"
-#include "util/u_string.h"
-
-void debug_describe_reference(char *buf,
-                              UNUSED const struct pipe_reference *ptr) {
-  strcpy(buf, "pipe_object");
-}
-
-void debug_describe_resource(char *buf, const struct pipe_resource *ptr) {
-  switch (ptr->target) {
-  case PIPE_BUFFER:
-    util_sprintf(buf, "pipe_buffer<%u>",
-                 (unsigned)util_format_get_stride(ptr->format, ptr->width0));
-    break;
-  case PIPE_TEXTURE_1D:
-    util_sprintf(buf, "pipe_texture1d<%u,%s,%u>", ptr->width0,
-                 util_format_short_name(ptr->format), ptr->last_level);
-    break;
-  case PIPE_TEXTURE_2D:
-    util_sprintf(buf, "pipe_texture2d<%u,%u,%s,%u>", ptr->width0, ptr->height0,
-                 util_format_short_name(ptr->format), ptr->last_level);
-    break;
-  case PIPE_TEXTURE_RECT:
-    util_sprintf(buf, "pipe_texture_rect<%u,%u,%s>", ptr->width0, ptr->height0,
-                 util_format_short_name(ptr->format));
-    break;
-  case PIPE_TEXTURE_CUBE:
-    util_sprintf(buf, "pipe_texture_cube<%u,%u,%s,%u>", ptr->width0,
-                 ptr->height0, util_format_short_name(ptr->format),
-                 ptr->last_level);
-    break;
-  case PIPE_TEXTURE_3D:
-    util_sprintf(buf, "pipe_texture3d<%u,%u,%u,%s,%u>", ptr->width0,
-                 ptr->height0, ptr->depth0, util_format_short_name(ptr->format),
-                 ptr->last_level);
-    break;
-  default:
-    util_sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
-    break;
-  }
-}
-
-void debug_describe_surface(char *buf, const struct pipe_surface *ptr) {
-  char res[128];
-  debug_describe_resource(res, ptr->texture);
-  util_sprintf(buf, "pipe_surface<%s,%u,%u,%u>", res, ptr->u.tex.level,
-               ptr->u.tex.first_layer, ptr->u.tex.last_layer);
-}
-
-void debug_describe_sampler_view(char *buf,
-                                 const struct pipe_sampler_view *ptr) {
-  char res[128];
-  debug_describe_resource(res, ptr->texture);
-  util_sprintf(buf, "pipe_sampler_view<%s,%s>", res,
-               util_format_short_name(ptr->format));
-}
-
-void debug_describe_so_target(char *buf,
-                              const struct pipe_stream_output_target *ptr) {
-  char res[128];
-  debug_describe_resource(res, ptr->buffer);
-  util_sprintf(buf, "pipe_stream_output_target<%s,%u,%u>", res,
-               ptr->buffer_offset, ptr->buffer_size);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_describe.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_describe.h
deleted file mode 100644
index 2c020e4dd..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_describe.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Luca Barbieri
- *
- * 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 (including the
- * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_DEBUG_DESCRIBE_H_
-#define U_DEBUG_DESCRIBE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct pipe_reference;
-struct pipe_resource;
-struct pipe_surface;
-struct pipe_sampler_view;
-
-/* a 256-byte buffer is necessary and sufficient */
-void debug_describe_reference(char *buf, const struct pipe_reference *ptr);
-void debug_describe_resource(char *buf, const struct pipe_resource *ptr);
-void debug_describe_surface(char *buf, const struct pipe_surface *ptr);
-void debug_describe_sampler_view(char *buf,
-                                 const struct pipe_sampler_view *ptr);
-void debug_describe_so_target(char *buf,
-                              const struct pipe_stream_output_target *ptr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_DEBUG_DESCRIBE_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_refcnt.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_refcnt.h
deleted file mode 100644
index 079d0fe41..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_debug_refcnt.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Luca Barbieri
- *
- * 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 (including the
- * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_DEBUG_REFCNT_H_
-#define U_DEBUG_REFCNT_H_
-
-#include "pipe/p_config.h"
-#include "pipe/p_state.h"
-
-#include "util/u_debug.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*debug_reference_descriptor)(char *,
-                                           const struct pipe_reference *);
-
-static inline void debug_reference(UNUSED const struct pipe_reference *p,
-                                   UNUSED debug_reference_descriptor get_desc,
-                                   UNUSED int change) {}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_DEBUG_REFCNT_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_double_list.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_double_list.h
deleted file mode 100644
index b3da0909d..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_double_list.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2006 VMware, Inc., Bismarck, ND. USA.
- * All Rights Reserved.
- *
- * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- **************************************************************************/
-
-/**
- * \file
- * List macros heavily inspired by the Linux kernel
- * list handling. No list looping yet.
- *
- * Is not threadsafe, so common operations need to
- * be protected using an external mutex.
- */
-
-#ifndef _U_DOUBLE_LIST_H_
-#define _U_DOUBLE_LIST_H_
-
-#include "pipe/p_compiler.h"
-#include <stddef.h>
-
-struct list_head {
-  struct list_head *prev;
-  struct list_head *next;
-};
-
-static inline void list_inithead(struct list_head *item) {
-  item->prev = item;
-  item->next = item;
-}
-
-static inline void list_add(struct list_head *item, struct list_head *list) {
-  item->prev = list;
-  item->next = list->next;
-  list->next->prev = item;
-  list->next = item;
-}
-
-static inline void list_addtail(struct list_head *item,
-                                struct list_head *list) {
-  item->next = list;
-  item->prev = list->prev;
-  list->prev->next = item;
-  list->prev = item;
-}
-
-static inline void list_replace(struct list_head *from, struct list_head *to) {
-  to->prev = from->prev;
-  to->next = from->next;
-  from->next->prev = to;
-  from->prev->next = to;
-}
-
-static inline void list_del(struct list_head *item) {
-  item->prev->next = item->next;
-  item->next->prev = item->prev;
-  item->prev = item->next = NULL;
-}
-
-static inline void list_delinit(struct list_head *item) {
-  item->prev->next = item->next;
-  item->next->prev = item->prev;
-  item->next = item;
-  item->prev = item;
-}
-
-#define LIST_INITHEAD(__item) list_inithead(__item)
-#define LIST_ADD(__item, __list) list_add(__item, __list)
-#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list)
-#define LIST_REPLACE(__from, __to) list_replace(__from, __to)
-#define LIST_DEL(__item) list_del(__item)
-#define LIST_DELINIT(__item) list_delinit(__item)
-
-#define LIST_ENTRY(__type, __item, __field)                                    \
-  ((__type *)(((char *)(__item)) - offsetof(__type, __field)))
-
-#define LIST_IS_EMPTY(__list) ((__list)->next == (__list))
-
-/**
- * Cast from a pointer to a member of a struct back to the containing struct.
- *
- * 'sample' MUST be initialized, or else the result is undefined!
- */
-#ifndef container_of
-#define container_of(ptr, sample, member)                                      \
-  (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample)))
-#endif
-
-#define LIST_FOR_EACH_ENTRY(pos, head, member)                                 \
-  for (pos = NULL, pos = container_of((head)->next, pos, member);              \
-       &pos->member != (head);                                                 \
-       pos = container_of(pos->member.next, pos, member))
-
-#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member)                   \
-  for (pos = NULL, pos = container_of((head)->next, pos, member),              \
-      storage = container_of(pos->member.next, pos, member);                   \
-       &pos->member != (head); pos = storage,                                  \
-      storage = container_of(storage->member.next, storage, member))
-
-#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member)               \
-  for (pos = NULL, pos = container_of((head)->prev, pos, member),              \
-      storage = container_of(pos->member.prev, pos, member);                   \
-       &pos->member != (head); pos = storage,                                  \
-      storage = container_of(storage->member.prev, storage, member))
-
-#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member)                     \
-  for (pos = NULL, pos = container_of((start), pos, member);                   \
-       &pos->member != (head);                                                 \
-       pos = container_of(pos->member.next, pos, member))
-
-#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member)                 \
-  for (pos = NULL, pos = container_of((start), pos, member);                   \
-       &pos->member != (head);                                                 \
-       pos = container_of(pos->member.prev, pos, member))
-
-#endif /*_U_DOUBLE_LIST_H_*/
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_dual_blend.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_dual_blend.h
deleted file mode 100644
index 64506d3d9..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_dual_blend.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef U_DUAL_BLEND_H
-#define U_DUAL_BLEND_H
-
-#include "pipe/p_state.h"
-
-static inline boolean util_blend_factor_is_dual_src(int factor) {
-  return (factor == PIPE_BLENDFACTOR_SRC1_COLOR) ||
-         (factor == PIPE_BLENDFACTOR_SRC1_ALPHA) ||
-         (factor == PIPE_BLENDFACTOR_INV_SRC1_COLOR) ||
-         (factor == PIPE_BLENDFACTOR_INV_SRC1_ALPHA);
-}
-
-static inline boolean
-util_blend_state_is_dual(const struct pipe_blend_state *blend, int index) {
-  if (util_blend_factor_is_dual_src(blend->rt[index].rgb_src_factor) ||
-      util_blend_factor_is_dual_src(blend->rt[index].alpha_src_factor) ||
-      util_blend_factor_is_dual_src(blend->rt[index].rgb_dst_factor) ||
-      util_blend_factor_is_dual_src(blend->rt[index].alpha_dst_factor))
-    return true;
-  return false;
-}
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.c
deleted file mode 100644
index 85f2a1200..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Pixel format accessor functions.
- *
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-
-#include "u_format.h"
-#include "u_format_s3tc.h"
-#include "u_math.h"
-#include "u_memory.h"
-#include "u_surface.h"
-
-#include "pipe/p_defines.h"
-
-boolean util_format_s3tc_enabled = FALSE;
-
-boolean util_format_is_float(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  int i;
-
-  assert(desc);
-  if (!desc) {
-    return FALSE;
-  }
-
-  i = util_format_get_first_non_void_channel(format);
-  if (i == -1) {
-    return FALSE;
-  }
-
-  return desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT ? TRUE : FALSE;
-}
-
-/** Test if the format contains RGB, but not alpha */
-boolean util_format_has_alpha(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  return (desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB ||
-          desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) &&
-         desc->swizzle[3] != UTIL_FORMAT_SWIZZLE_1;
-}
-
-boolean util_format_is_luminance(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  if ((desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB ||
-       desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) &&
-      desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[1] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[2] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_1) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
-boolean util_format_is_alpha(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  if ((desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB ||
-       desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) &&
-      desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_0 &&
-      desc->swizzle[1] == UTIL_FORMAT_SWIZZLE_0 &&
-      desc->swizzle[2] == UTIL_FORMAT_SWIZZLE_0 &&
-      desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_X) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
-boolean util_format_is_pure_integer(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  int i;
-
-  /* Find the first non-void channel. */
-  i = util_format_get_first_non_void_channel(format);
-  if (i == -1)
-    return FALSE;
-
-  return desc->channel[i].pure_integer ? TRUE : FALSE;
-}
-
-boolean util_format_is_pure_sint(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  int i;
-
-  i = util_format_get_first_non_void_channel(format);
-  if (i == -1)
-    return FALSE;
-
-  return (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED &&
-          desc->channel[i].pure_integer)
-             ? TRUE
-             : FALSE;
-}
-
-boolean util_format_is_pure_uint(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  int i;
-
-  i = util_format_get_first_non_void_channel(format);
-  if (i == -1)
-    return FALSE;
-
-  return (desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED &&
-          desc->channel[i].pure_integer)
-             ? TRUE
-             : FALSE;
-}
-
-/**
- * Returns true if all non-void channels are normalized signed.
- */
-boolean util_format_is_snorm(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  int i;
-
-  if (desc->is_mixed)
-    return FALSE;
-
-  i = util_format_get_first_non_void_channel(format);
-  if (i == -1)
-    return FALSE;
-
-  return desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED &&
-         !desc->channel[i].pure_integer && desc->channel[i].normalized;
-}
-
-boolean util_format_is_luminance_alpha(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  if ((desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB ||
-       desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) &&
-      desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[1] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[2] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_Y) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
-boolean util_format_is_intensity(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  if ((desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB ||
-       desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) &&
-      desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[1] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[2] == UTIL_FORMAT_SWIZZLE_X &&
-      desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_X) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
-boolean util_format_is_subsampled_422(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  return desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED &&
-         desc->block.width == 2 && desc->block.height == 1 &&
-         desc->block.bits == 32;
-}
-
-boolean util_format_is_supported(enum pipe_format format, unsigned bind) {
-  if (util_format_is_s3tc(format) && !util_format_s3tc_enabled) {
-    return FALSE;
-  }
-
-#ifndef TEXTURE_FLOAT_ENABLED
-  if ((bind & PIPE_BIND_RENDER_TARGET) &&
-      format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
-      format != PIPE_FORMAT_R11G11B10_FLOAT && util_format_is_float(format)) {
-    return FALSE;
-  }
-#endif
-
-  return TRUE;
-}
-
-/**
- * Calculates the MRD for the depth format. MRD is used in depth bias
- * for UNORM and unbound depth buffers. When the depth buffer is floating
- * point, the depth bias calculation does not use the MRD. However, the
- * default MRD will be 1.0 / ((1 << 24) - 1).
- */
-double util_get_depth_format_mrd(const struct util_format_description *desc) {
-  /*
-   * Depth buffer formats without a depth component OR scenarios
-   * without a bound depth buffer default to D24.
-   */
-  double mrd = 1.0 / ((1 << 24) - 1);
-  unsigned depth_channel;
-
-  assert(desc);
-
-  /*
-   * Some depth formats do not store the depth component in the first
-   * channel, detect the format and adjust the depth channel. Get the
-   * swizzled depth component channel.
-   */
-  depth_channel = desc->swizzle[0];
-
-  if (desc->channel[depth_channel].type == UTIL_FORMAT_TYPE_UNSIGNED &&
-      desc->channel[depth_channel].normalized) {
-    int depth_bits;
-
-    depth_bits = desc->channel[depth_channel].size;
-    mrd = 1.0 / ((1ULL << depth_bits) - 1);
-  }
-
-  return mrd;
-}
-
-boolean
-util_is_format_compatible(const struct util_format_description *src_desc,
-                          const struct util_format_description *dst_desc) {
-  unsigned chan;
-
-  if (src_desc->format == dst_desc->format) {
-    return TRUE;
-  }
-
-  if (src_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN ||
-      dst_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) {
-    return FALSE;
-  }
-
-  if (src_desc->block.bits != dst_desc->block.bits ||
-      src_desc->nr_channels != dst_desc->nr_channels ||
-      src_desc->colorspace != dst_desc->colorspace) {
-    return FALSE;
-  }
-
-  for (chan = 0; chan < 4; ++chan) {
-    if (src_desc->channel[chan].size != dst_desc->channel[chan].size) {
-      return FALSE;
-    }
-  }
-
-  for (chan = 0; chan < 4; ++chan) {
-    enum util_format_swizzle swizzle = dst_desc->swizzle[chan];
-
-    if (swizzle < 4) {
-      if (src_desc->swizzle[chan] != swizzle) {
-        return FALSE;
-      }
-      if ((src_desc->channel[swizzle].type !=
-           dst_desc->channel[swizzle].type) ||
-          (src_desc->channel[swizzle].normalized !=
-           dst_desc->channel[swizzle].normalized)) {
-        return FALSE;
-      }
-    }
-  }
-
-  return TRUE;
-}
-
-boolean
-util_format_fits_8unorm(const struct util_format_description *format_desc) {
-  unsigned chan;
-
-  /*
-   * After linearized sRGB values require more than 8bits.
-   */
-
-  if (format_desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) {
-    return FALSE;
-  }
-
-  switch (format_desc->layout) {
-
-  case UTIL_FORMAT_LAYOUT_S3TC:
-    /*
-     * These are straight forward.
-     */
-    return TRUE;
-  case UTIL_FORMAT_LAYOUT_RGTC:
-    if (format_desc->format == PIPE_FORMAT_RGTC1_SNORM ||
-        format_desc->format == PIPE_FORMAT_RGTC2_SNORM ||
-        format_desc->format == PIPE_FORMAT_LATC1_SNORM ||
-        format_desc->format == PIPE_FORMAT_LATC2_SNORM)
-      return FALSE;
-    return TRUE;
-  case UTIL_FORMAT_LAYOUT_BPTC:
-    if (format_desc->format == PIPE_FORMAT_BPTC_RGBA_UNORM)
-      return TRUE;
-    return FALSE;
-
-  case UTIL_FORMAT_LAYOUT_PLAIN:
-    /*
-     * For these we can find a generic rule.
-     */
-
-    for (chan = 0; chan < format_desc->nr_channels; ++chan) {
-      switch (format_desc->channel[chan].type) {
-      case UTIL_FORMAT_TYPE_VOID:
-        break;
-      case UTIL_FORMAT_TYPE_UNSIGNED:
-        if (!format_desc->channel[chan].normalized ||
-            format_desc->channel[chan].size > 8) {
-          return FALSE;
-        }
-        break;
-      default:
-        return FALSE;
-      }
-    }
-    return TRUE;
-
-  default:
-    /*
-     * Handle all others on a case by case basis.
-     */
-
-    switch (format_desc->format) {
-    case PIPE_FORMAT_R1_UNORM:
-    case PIPE_FORMAT_UYVY:
-    case PIPE_FORMAT_YUYV:
-    case PIPE_FORMAT_R8G8_B8G8_UNORM:
-    case PIPE_FORMAT_G8R8_G8B8_UNORM:
-      return TRUE;
-
-    default:
-      return FALSE;
-    }
-  }
-}
-
-void util_format_compose_swizzles(const unsigned char swz1[4],
-                                  const unsigned char swz2[4],
-                                  unsigned char dst[4]) {
-  unsigned i;
-
-  for (i = 0; i < 4; i++) {
-    dst[i] = swz2[i] <= UTIL_FORMAT_SWIZZLE_W ? swz1[swz2[i]] : swz2[i];
-  }
-}
-
-void util_format_apply_color_swizzle(union pipe_color_union *dst,
-                                     const union pipe_color_union *src,
-                                     const unsigned char swz[4],
-                                     const boolean is_integer) {
-  unsigned c;
-
-  if (is_integer) {
-    for (c = 0; c < 4; ++c) {
-      switch (swz[c]) {
-      case PIPE_SWIZZLE_RED:
-        dst->ui[c] = src->ui[0];
-        break;
-      case PIPE_SWIZZLE_GREEN:
-        dst->ui[c] = src->ui[1];
-        break;
-      case PIPE_SWIZZLE_BLUE:
-        dst->ui[c] = src->ui[2];
-        break;
-      case PIPE_SWIZZLE_ALPHA:
-        dst->ui[c] = src->ui[3];
-        break;
-      default:
-        dst->ui[c] = (swz[c] == PIPE_SWIZZLE_ONE) ? 1 : 0;
-        break;
-      }
-    }
-  } else {
-    for (c = 0; c < 4; ++c) {
-      switch (swz[c]) {
-      case PIPE_SWIZZLE_RED:
-        dst->f[c] = src->f[0];
-        break;
-      case PIPE_SWIZZLE_GREEN:
-        dst->f[c] = src->f[1];
-        break;
-      case PIPE_SWIZZLE_BLUE:
-        dst->f[c] = src->f[2];
-        break;
-      case PIPE_SWIZZLE_ALPHA:
-        dst->f[c] = src->f[3];
-        break;
-      default:
-        dst->f[c] = (swz[c] == PIPE_SWIZZLE_ONE) ? 1.0f : 0.0f;
-        break;
-      }
-    }
-  }
-}
-
-void util_format_swizzle_4f(float *dst, const float *src,
-                            const unsigned char swz[4]) {
-  unsigned i;
-
-  for (i = 0; i < 4; i++) {
-    if (swz[i] <= UTIL_FORMAT_SWIZZLE_W)
-      dst[i] = src[swz[i]];
-    else if (swz[i] == UTIL_FORMAT_SWIZZLE_0)
-      dst[i] = 0;
-    else if (swz[i] == UTIL_FORMAT_SWIZZLE_1)
-      dst[i] = 1;
-  }
-}
-
-void util_format_unswizzle_4f(float *dst, const float *src,
-                              const unsigned char swz[4]) {
-  unsigned i;
-
-  for (i = 0; i < 4; i++) {
-    switch (swz[i]) {
-    case UTIL_FORMAT_SWIZZLE_X:
-      dst[0] = src[i];
-      break;
-    case UTIL_FORMAT_SWIZZLE_Y:
-      dst[1] = src[i];
-      break;
-    case UTIL_FORMAT_SWIZZLE_Z:
-      dst[2] = src[i];
-      break;
-    case UTIL_FORMAT_SWIZZLE_W:
-      dst[3] = src[i];
-      break;
-    }
-  }
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.csv b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.csv
deleted file mode 100644
index a9e0f84e0..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.csv
+++ /dev/null
@@ -1,401 +0,0 @@
-###########################################################################
-# 
-# Copyright 2009-2010 VMware, Inc.
-# All Rights Reserved.
-# 
-# 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, sub license, 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 (including the
-# next paragraph) 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 NON-INFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS 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.
-# 
-###########################################################################
-
-# This CSV file has the input data for u_format.h's struct
-# util_format_description.
-#
-# Each format entry contains:
-# - name, per enum pipe_format
-# - layout, per enum util_format_layout, in shortened lower caps
-# - pixel block's width
-# - pixel block's height
-# - channel encoding (only meaningful for plain layout), containing for each
-#   channel the following information:
-#   - type, one of
-#     - 'x': void
-#     - 'u': unsigned
-#     - 's': signed
-#     - 'h': fixed
-#     - 'f': FLOAT
-#   - optionally followed by 'n' if it is normalized
-#   - optionally followed by 'p' if it is pure
-#   - number of bits
-# - channel swizzle 
-# - color space: rgb, yub, sz
-# - (optional) channel encoding for big-endian targets
-# - (optional) channel swizzle for big-endian targets
-#
-# See also:
-# - http://msdn.microsoft.com/en-us/library/bb172558.aspx (D3D9)
-# - http://msdn.microsoft.com/en-us/library/bb205073.aspx#mapping_texture_formats (D3D9 -> D3D10)
-# - http://msdn.microsoft.com/en-us/library/bb173059.aspx (D3D10)
-#
-# Note that GL doesn't really specify the layout of internal formats. See
-# OpenGL 2.1 specification, Table 3.16, on the "Correspondence of sized
-# internal formats to base in- ternal formats, and desired component
-# resolutions for each sized internal format."
-
-# None
-# Described as regular uint_8 bytes, i.e. PIPE_FORMAT_R8_USCALED
-PIPE_FORMAT_NONE                  , plain, 1, 1, u8  ,     ,     ,     , x001, rgb
-
-# Typical rendertarget formats
-PIPE_FORMAT_B8G8R8A8_UNORM        , plain, 1, 1, un8 , un8 , un8 , un8 , zyxw, rgb
-PIPE_FORMAT_B8G8R8X8_UNORM        , plain, 1, 1, un8 , un8 , un8 , x8  , zyx1, rgb
-PIPE_FORMAT_A8R8G8B8_UNORM        , plain, 1, 1, un8 , un8 , un8 , un8 , yzwx, rgb
-PIPE_FORMAT_X8R8G8B8_UNORM        , plain, 1, 1, x8  , un8 , un8 , un8 , yzw1, rgb
-PIPE_FORMAT_A8B8G8R8_UNORM        , plain, 1, 1, un8 , un8 , un8 , un8 , wzyx, rgb
-PIPE_FORMAT_X8B8G8R8_UNORM        , plain, 1, 1, x8  , un8 , un8 , un8 , wzy1, rgb
-# PIPE_FORMAT_R8G8B8A8_UNORM is below
-PIPE_FORMAT_R8G8B8X8_UNORM        , plain, 1, 1, un8 , un8 , un8 , x8  , xyz1, rgb
-PIPE_FORMAT_B5G5R5X1_UNORM        , plain, 1, 1, un5 , un5 , un5 , x1  , zyx1, rgb, x1  , un5 , un5 , un5 , yzw1
-PIPE_FORMAT_B5G5R5A1_UNORM        , plain, 1, 1, un5 , un5 , un5 , un1 , zyxw, rgb, un1 , un5 , un5 , un5 , yzwx
-PIPE_FORMAT_B4G4R4A4_UNORM        , plain, 1, 1, un4 , un4 , un4 , un4 , zyxw, rgb, un4 , un4 , un4 , un4 , yzwx
-PIPE_FORMAT_B4G4R4X4_UNORM        , plain, 1, 1, un4 , un4 , un4 , x4  , zyx1, rgb, x4  , un4 , un4 , un4 , yzw1
-PIPE_FORMAT_A4B4G4R4_UNORM        , plain, 1, 1, un4 , un4 , un4 , un4 , wzyx, rgb, un4 , un4 , un4 , un4 , xyzw
-PIPE_FORMAT_B5G6R5_UNORM          , plain, 1, 1, un5 , un6 , un5 ,     , zyx1, rgb, un5 , un6 , un5 ,     , xyz1
-PIPE_FORMAT_R10G10B10A2_UNORM     , plain, 1, 1, un10, un10, un10, un2 , xyzw, rgb, un2 , un10, un10, un10, wzyx
-PIPE_FORMAT_R10G10B10X2_UNORM     , plain, 1, 1, un10, un10, un10, x2,   xyz1, rgb, x2  , un10, un10, un10, wzy1
-PIPE_FORMAT_B10G10R10A2_UNORM     , plain, 1, 1, un10, un10, un10, un2 , zyxw, rgb, un2 , un10, un10, un10, yzwx
-PIPE_FORMAT_B2G3R3_UNORM          , plain, 1, 1, un2 , un3 , un3 ,     , zyx1, rgb, un3 , un3 , un2 ,     , xyz1
-
-# Luminance/Intensity/Alpha formats
-PIPE_FORMAT_L8_UNORM              , plain, 1, 1, un8 ,     ,     ,     , xxx1, rgb
-PIPE_FORMAT_A8_UNORM              , plain, 1, 1, un8 ,     ,     ,     , 000x, rgb
-PIPE_FORMAT_I8_UNORM              , plain, 1, 1, un8 ,     ,     ,     , xxxx, rgb
-PIPE_FORMAT_L4A4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , xxxy, rgb, un4 , un4 ,     ,     , yyyx
-PIPE_FORMAT_L8A8_UNORM            , plain, 1, 1, un8 , un8 ,     ,     , xxxy, rgb
-PIPE_FORMAT_L16_UNORM             , plain, 1, 1, un16,     ,     ,     , xxx1, rgb
-PIPE_FORMAT_A16_UNORM             , plain, 1, 1, un16,     ,     ,     , 000x, rgb
-PIPE_FORMAT_I16_UNORM             , plain, 1, 1, un16,     ,     ,     , xxxx, rgb
-PIPE_FORMAT_L16A16_UNORM          , plain, 1, 1, un16, un16,     ,     , xxxy, rgb
-PIPE_FORMAT_A8_SNORM              , plain, 1, 1, sn8 ,     ,     ,     , 000x, rgb
-PIPE_FORMAT_L8_SNORM              , plain, 1, 1, sn8 ,     ,     ,     , xxx1, rgb
-PIPE_FORMAT_L8A8_SNORM            , plain, 1, 1, sn8 , sn8 ,     ,     , xxxy, rgb
-PIPE_FORMAT_I8_SNORM              , plain, 1, 1, sn8 ,     ,     ,     , xxxx, rgb
-PIPE_FORMAT_A16_SNORM             , plain, 1, 1, sn16,     ,     ,     , 000x, rgb
-PIPE_FORMAT_L16_SNORM             , plain, 1, 1, sn16,     ,     ,     , xxx1, rgb
-PIPE_FORMAT_L16A16_SNORM          , plain, 1, 1, sn16, sn16,     ,     , xxxy, rgb
-PIPE_FORMAT_I16_SNORM             , plain, 1, 1, sn16,     ,     ,     , xxxx, rgb
-PIPE_FORMAT_A16_FLOAT             , plain, 1, 1, f16 ,     ,     ,     , 000x, rgb
-PIPE_FORMAT_L16_FLOAT             , plain, 1, 1, f16 ,     ,     ,     , xxx1, rgb
-PIPE_FORMAT_L16A16_FLOAT          , plain, 1, 1, f16 , f16 ,     ,     , xxxy, rgb
-PIPE_FORMAT_I16_FLOAT             , plain, 1, 1, f16 ,     ,     ,     , xxxx, rgb
-PIPE_FORMAT_A32_FLOAT             , plain, 1, 1, f32 ,     ,     ,     , 000x, rgb
-PIPE_FORMAT_L32_FLOAT             , plain, 1, 1, f32 ,     ,     ,     , xxx1, rgb
-PIPE_FORMAT_L32A32_FLOAT          , plain, 1, 1, f32 , f32 ,     ,     , xxxy, rgb
-PIPE_FORMAT_I32_FLOAT             , plain, 1, 1, f32 ,     ,     ,     , xxxx, rgb
-
-# SRGB formats
-PIPE_FORMAT_L8_SRGB               , plain, 1, 1, un8 ,     ,     ,     , xxx1, srgb 
-PIPE_FORMAT_R8_SRGB               , plain, 1, 1, un8 ,     ,     ,     , x001, srgb
-PIPE_FORMAT_L8A8_SRGB             , plain, 1, 1, un8 , un8 ,     ,     , xxxy, srgb 
-PIPE_FORMAT_R8G8B8_SRGB           , plain, 1, 1, un8 , un8 , un8 ,     , xyz1, srgb 
-PIPE_FORMAT_R8G8B8A8_SRGB         , plain, 1, 1, un8 , un8 , un8 , un8 , xyzw, srgb 
-PIPE_FORMAT_A8B8G8R8_SRGB         , plain, 1, 1, un8 , un8 , un8 , un8 , wzyx, srgb
-PIPE_FORMAT_X8B8G8R8_SRGB         , plain, 1, 1, x8  , un8 , un8 , un8 , wzy1, srgb
-PIPE_FORMAT_B8G8R8A8_SRGB         , plain, 1, 1, un8 , un8 , un8 , un8 , zyxw, srgb
-PIPE_FORMAT_B8G8R8X8_SRGB         , plain, 1, 1, un8 , un8 , un8 , x8  , zyx1, srgb
-PIPE_FORMAT_A8R8G8B8_SRGB         , plain, 1, 1, un8 , un8 , un8 , un8 , yzwx, srgb
-PIPE_FORMAT_X8R8G8B8_SRGB         , plain, 1, 1, x8  , un8 , un8 , un8 , yzw1, srgb
-
-# Mixed-sign formats (typically used for bump map textures)
-PIPE_FORMAT_R8SG8SB8UX8U_NORM     , plain, 1, 1, sn8 , sn8 , un8 , x8  , xyz1, rgb
-PIPE_FORMAT_R10SG10SB10SA2U_NORM  , plain, 1, 1, sn10, sn10, sn10, un2 , xyzw, rgb, un2 , sn10, sn10, sn10, wzyx
-PIPE_FORMAT_R5SG5SB6U_NORM        , plain, 1, 1, sn5 , sn5 , un6 ,     , xyz1, rgb, un6 , sn5 , sn5 ,     , zyx1
-
-# Depth-stencil formats
-PIPE_FORMAT_S8_UINT                 , plain, 1, 1, up8 ,     ,     ,     , _x__, zs
-PIPE_FORMAT_Z16_UNORM               , plain, 1, 1, un16,     ,     ,     , x___, zs
-PIPE_FORMAT_Z32_UNORM               , plain, 1, 1, un32,     ,     ,     , x___, zs
-PIPE_FORMAT_Z32_FLOAT               , plain, 1, 1, f32 ,     ,     ,     , x___, zs
-PIPE_FORMAT_Z24_UNORM_S8_UINT       , plain, 1, 1, un24, up8 ,     ,     , xy__, zs,    up8 , un24,     ,     , yx__
-PIPE_FORMAT_S8_UINT_Z24_UNORM       , plain, 1, 1, up8 , un24,     ,     , yx__, zs,    un24, up8 ,     ,     , xy__
-PIPE_FORMAT_X24S8_UINT              , plain, 1, 1, x24 , up8 ,     ,     , _y__, zs,    up8 , x24 ,     ,     , _x__
-PIPE_FORMAT_S8X24_UINT              , plain, 1, 1, up8 , x24 ,     ,     , _x__, zs,    x24 , up8 ,     ,     , _y__
-PIPE_FORMAT_Z24X8_UNORM             , plain, 1, 1, un24, x8  ,     ,     , x___, zs,    x8  , un24,     ,     , y___
-PIPE_FORMAT_X8Z24_UNORM             , plain, 1, 1, x8  , un24,     ,     , y___, zs,    un24, x8  ,     ,     , x___
-PIPE_FORMAT_Z32_FLOAT_S8X24_UINT    , plain, 1, 1, f32 , up8 ,  x24,     , xy__, zs,    f32 , x24 ,  up8,     , xz__
-PIPE_FORMAT_X32_S8X24_UINT          , plain, 1, 1, x32 , up8 ,  x24,     , _y__, zs,    x32 , x24 ,  up8,     , _z__
-
-# YUV formats
-# http://www.fourcc.org/yuv.php#UYVY
-PIPE_FORMAT_UYVY                 , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, yuv
-# http://www.fourcc.org/yuv.php#YUYV (a.k.a http://www.fourcc.org/yuv.php#YUY2)
-PIPE_FORMAT_YUYV                 , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, yuv
-# same subsampling but with rgb channels
-PIPE_FORMAT_R8G8_B8G8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
-PIPE_FORMAT_G8R8_G8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
-PIPE_FORMAT_G8R8_B8R8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , yxz1, rgb
-PIPE_FORMAT_R8G8_R8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , yxz1, rgb
-
-# some special formats not fitting anywhere else
-PIPE_FORMAT_R11G11B10_FLOAT       , other,      1,  1, x32 ,     ,     ,     , xyz1, rgb
-PIPE_FORMAT_R9G9B9E5_FLOAT        , other,      1,  1, x32 ,     ,     ,     , xyz1, rgb
-PIPE_FORMAT_R1_UNORM              , other,      8,  1, x8  ,     ,     ,     , x001, rgb
-# A.k.a. D3DFMT_CxV8U8
-PIPE_FORMAT_R8G8Bx_SNORM          , other,      1,  1, sn8 , sn8 ,     ,     , xyz1, rgb
-
-# Compressed formats
-# - http://en.wikipedia.org/wiki/S3_Texture_Compression
-# - http://www.opengl.org/registry/specs/EXT/texture_compression_s3tc.txt
-# - http://www.opengl.org/registry/specs/ARB/texture_compression_rgtc.txt
-# - http://www.opengl.org/registry/specs/EXT/texture_compression_latc.txt
-# - http://www.opengl.org/registry/specs/ARB/texture_compression_bptc.txt
-# - http://www.khronos.org/registry/gles/extensions/OES/OES_compressed_ETC1_RGB8_texture.txt
-# - http://msdn.microsoft.com/en-us/library/bb694531.aspx
-PIPE_FORMAT_DXT1_RGB              , s3tc, 4, 4, x64 ,     ,     ,     , xyz1, rgb
-PIPE_FORMAT_DXT1_RGBA             , s3tc, 4, 4, x64 ,     ,     ,     , xyzw, rgb
-PIPE_FORMAT_DXT3_RGBA             , s3tc, 4, 4, x128,     ,     ,     , xyzw, rgb
-PIPE_FORMAT_DXT5_RGBA             , s3tc, 4, 4, x128,     ,     ,     , xyzw, rgb
-PIPE_FORMAT_DXT1_SRGB             , s3tc, 4, 4, x64 ,     ,     ,     , xyz1, srgb
-PIPE_FORMAT_DXT1_SRGBA            , s3tc, 4, 4, x64 ,     ,     ,     , xyzw, srgb
-PIPE_FORMAT_DXT3_SRGBA            , s3tc, 4, 4, x128,     ,     ,     , xyzw, srgb
-PIPE_FORMAT_DXT5_SRGBA            , s3tc, 4, 4, x128,     ,     ,     , xyzw, srgb
-
-PIPE_FORMAT_RGTC1_UNORM           , rgtc, 4, 4, x64,      ,     ,     , x001, rgb
-PIPE_FORMAT_RGTC1_SNORM           , rgtc, 4, 4, x64,      ,     ,     , x001, rgb
-PIPE_FORMAT_RGTC2_UNORM           , rgtc, 4, 4, x128,     ,     ,     , xy01, rgb
-PIPE_FORMAT_RGTC2_SNORM           , rgtc, 4, 4, x128,     ,     ,     , xy01, rgb
-
-PIPE_FORMAT_LATC1_UNORM           , rgtc, 4, 4, x64,      ,     ,     , xxx1, rgb
-PIPE_FORMAT_LATC1_SNORM           , rgtc, 4, 4, x64,      ,     ,     , xxx1, rgb
-PIPE_FORMAT_LATC2_UNORM           , rgtc, 4, 4, x128,     ,     ,     , xxxy, rgb
-PIPE_FORMAT_LATC2_SNORM           , rgtc, 4, 4, x128,     ,     ,     , xxxy, rgb
-
-PIPE_FORMAT_ETC1_RGB8             ,  etc, 4, 4, x64,      ,     ,     , xyz1, rgb
-
-PIPE_FORMAT_BPTC_RGBA_UNORM       , bptc, 4, 4, x128,     ,     ,     , xyzw, rgb
-PIPE_FORMAT_BPTC_SRGBA            , bptc, 4, 4, x128,     ,     ,     , xyzw, srgb
-PIPE_FORMAT_BPTC_RGB_FLOAT        , bptc, 4, 4, x128,     ,     ,     , xyz1, rgb
-PIPE_FORMAT_BPTC_RGB_UFLOAT       , bptc, 4, 4, x128,     ,     ,     , xyz1, rgb
-
-# Straightforward D3D10-like formats (also used for 
-# vertex buffer element description)
-# 
-# See also:
-# - src/gallium/auxiliary/translate/translate_generic.c
-# - src/mesa/state_tracker/st_draw.c
-PIPE_FORMAT_R64_FLOAT             , plain, 1, 1, f64 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R64G64_FLOAT          , plain, 1, 1, f64 , f64 ,     ,     , xy01, rgb
-PIPE_FORMAT_R64G64B64_FLOAT       , plain, 1, 1, f64 , f64 , f64 ,     , xyz1, rgb
-PIPE_FORMAT_R64G64B64A64_FLOAT    , plain, 1, 1, f64 , f64 , f64 , f64 , xyzw, rgb
-PIPE_FORMAT_R32_FLOAT             , plain, 1, 1, f32 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R32G32_FLOAT          , plain, 1, 1, f32 , f32 ,     ,     , xy01, rgb
-PIPE_FORMAT_R32G32B32_FLOAT       , plain, 1, 1, f32 , f32 , f32 ,     , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_FLOAT    , plain, 1, 1, f32 , f32 , f32 , f32 , xyzw, rgb
-PIPE_FORMAT_R32_UNORM             , plain, 1, 1, un32,     ,     ,     , x001, rgb
-PIPE_FORMAT_R32G32_UNORM          , plain, 1, 1, un32, un32,     ,     , xy01, rgb
-PIPE_FORMAT_R32G32B32_UNORM       , plain, 1, 1, un32, un32, un32,     , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_UNORM    , plain, 1, 1, un32, un32, un32, un32, xyzw, rgb
-PIPE_FORMAT_R32_USCALED           , plain, 1, 1, u32 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R32G32_USCALED        , plain, 1, 1, u32 , u32 ,     ,     , xy01, rgb
-PIPE_FORMAT_R32G32B32_USCALED     , plain, 1, 1, u32 , u32 , u32 ,     , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_USCALED  , plain, 1, 1, u32 , u32 , u32 , u32 , xyzw, rgb
-PIPE_FORMAT_R32_SNORM             , plain, 1, 1, sn32,     ,     ,     , x001, rgb
-PIPE_FORMAT_R32G32_SNORM          , plain, 1, 1, sn32, sn32,     ,     , xy01, rgb
-PIPE_FORMAT_R32G32B32_SNORM       , plain, 1, 1, sn32, sn32, sn32,     , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_SNORM    , plain, 1, 1, sn32, sn32, sn32, sn32, xyzw, rgb
-PIPE_FORMAT_R32_SSCALED           , plain, 1, 1, s32 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R32G32_SSCALED        , plain, 1, 1, s32 , s32 ,     ,     , xy01, rgb
-PIPE_FORMAT_R32G32B32_SSCALED     , plain, 1, 1, s32 , s32 , s32 ,     , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_SSCALED  , plain, 1, 1, s32 , s32 , s32 , s32 , xyzw, rgb
-PIPE_FORMAT_R16_FLOAT             , plain, 1, 1, f16 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R16G16_FLOAT          , plain, 1, 1, f16 , f16 ,     ,     , xy01, rgb
-PIPE_FORMAT_R16G16B16_FLOAT       , plain, 1, 1, f16 , f16 , f16 ,     , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_FLOAT    , plain, 1, 1, f16 , f16 , f16 , f16 , xyzw, rgb
-PIPE_FORMAT_R16_UNORM             , plain, 1, 1, un16,     ,     ,     , x001, rgb
-PIPE_FORMAT_R16G16_UNORM          , plain, 1, 1, un16, un16,     ,     , xy01, rgb
-PIPE_FORMAT_R16G16B16_UNORM       , plain, 1, 1, un16, un16, un16,     , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_UNORM    , plain, 1, 1, un16, un16, un16, un16, xyzw, rgb
-PIPE_FORMAT_R16_USCALED           , plain, 1, 1, u16 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R16G16_USCALED        , plain, 1, 1, u16 , u16 ,     ,     , xy01, rgb
-PIPE_FORMAT_R16G16B16_USCALED     , plain, 1, 1, u16 , u16 , u16 ,     , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_USCALED  , plain, 1, 1, u16 , u16 , u16 , u16 , xyzw, rgb
-PIPE_FORMAT_R16_SNORM             , plain, 1, 1, sn16,     ,     ,     , x001, rgb
-PIPE_FORMAT_R16G16_SNORM          , plain, 1, 1, sn16, sn16,     ,     , xy01, rgb
-PIPE_FORMAT_R16G16B16_SNORM       , plain, 1, 1, sn16, sn16, sn16,     , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_SNORM    , plain, 1, 1, sn16, sn16, sn16, sn16, xyzw, rgb
-PIPE_FORMAT_R16_SSCALED           , plain, 1, 1, s16 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R16G16_SSCALED        , plain, 1, 1, s16 , s16 ,     ,     , xy01, rgb
-PIPE_FORMAT_R16G16B16_SSCALED     , plain, 1, 1, s16 , s16 , s16 ,     , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_SSCALED  , plain, 1, 1, s16 , s16 , s16 , s16 , xyzw, rgb
-PIPE_FORMAT_R8_UNORM              , plain, 1, 1, un8 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R8G8_UNORM            , plain, 1, 1, un8 , un8 ,     ,     , xy01, rgb
-PIPE_FORMAT_R8G8B8_UNORM          , plain, 1, 1, un8 , un8 , un8 ,     , xyz1, rgb
-PIPE_FORMAT_R8G8B8A8_UNORM        , plain, 1, 1, un8 , un8 , un8 , un8 , xyzw, rgb
-PIPE_FORMAT_R8_USCALED            , plain, 1, 1, u8  ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R8G8_USCALED          , plain, 1, 1, u8  , u8  ,     ,     , xy01, rgb
-PIPE_FORMAT_R8G8B8_USCALED        , plain, 1, 1, u8  , u8  , u8  ,     , xyz1, rgb
-PIPE_FORMAT_R8G8B8A8_USCALED      , plain, 1, 1, u8  , u8  , u8  , u8  , xyzw, rgb
-PIPE_FORMAT_R8_SNORM              , plain, 1, 1, sn8 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R8G8_SNORM            , plain, 1, 1, sn8 , sn8 ,     ,     , xy01, rgb
-PIPE_FORMAT_R8G8B8_SNORM          , plain, 1, 1, sn8 , sn8 , sn8 ,     , xyz1, rgb
-PIPE_FORMAT_R8G8B8A8_SNORM        , plain, 1, 1, sn8 , sn8 , sn8 , sn8 , xyzw, rgb
-PIPE_FORMAT_R8_SSCALED            , plain, 1, 1, s8  ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R8G8_SSCALED          , plain, 1, 1, s8  , s8  ,     ,     , xy01, rgb
-PIPE_FORMAT_R8G8B8_SSCALED        , plain, 1, 1, s8  , s8  , s8  ,     , xyz1, rgb
-PIPE_FORMAT_R8G8B8A8_SSCALED      , plain, 1, 1, s8  , s8  , s8  , s8  , xyzw, rgb
-
-# GL-specific vertex buffer element formats
-# A.k.a. GL_FIXED
-PIPE_FORMAT_R32_FIXED             , plain, 1, 1, h32 ,     ,     ,     , x001, rgb
-PIPE_FORMAT_R32G32_FIXED          , plain, 1, 1, h32 , h32 ,     ,     , xy01, rgb
-PIPE_FORMAT_R32G32B32_FIXED       , plain, 1, 1, h32 , h32 , h32 ,     , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_FIXED    , plain, 1, 1, h32 , h32 , h32 , h32 , xyzw, rgb
-
-# D3D9-specific vertex buffer element formats
-# See also:
-# - http://msdn.microsoft.com/en-us/library/bb172533.aspx
-# A.k.a. D3DDECLTYPE_UDEC3
-PIPE_FORMAT_R10G10B10X2_USCALED   , plain, 1, 1, u10 , u10 , u10  , x2 , xyz1, rgb, x2  , u10 , u10 , u10 , wzy1
-# A.k.a. D3DDECLTYPE_DEC3N
-PIPE_FORMAT_R10G10B10X2_SNORM     , plain, 1, 1, sn10, sn10, sn10 , x2 , xyz1, rgb, x2  , sn10, sn10, sn10, wzy1
-
-PIPE_FORMAT_YV12                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, yuv
-PIPE_FORMAT_YV16                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, yuv
-PIPE_FORMAT_IYUV                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, yuv
-PIPE_FORMAT_NV12                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, yuv
-PIPE_FORMAT_NV21                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, yuv
-
-# Usually used to implement IA44 and AI44 formats in video decoding
-PIPE_FORMAT_A4R4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , y00x, rgb, un4, un4 ,     ,     , x00y
-PIPE_FORMAT_R4A4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , x00y, rgb, un4, un4 ,     ,     , y00x
-PIPE_FORMAT_R8A8_UNORM            , plain, 1, 1, un8 , un8 ,     ,     , x00y, rgb
-PIPE_FORMAT_A8R8_UNORM            , plain, 1, 1, un8 , un8 ,     ,     , y00x, rgb
-
-# ARB_vertex_type_10_10_10_2_REV
-PIPE_FORMAT_R10G10B10A2_USCALED     , plain, 1, 1, u10 , u10 , u10 , u2  , xyzw, rgb, u2  , u10 , u10 , u10 , wzyx
-PIPE_FORMAT_R10G10B10A2_SSCALED     , plain, 1, 1, s10 , s10 , s10 , s2  , xyzw, rgb, s2  , s10 , s10 , s10 , wzyx
-PIPE_FORMAT_R10G10B10A2_SNORM       , plain, 1, 1, sn10, sn10, sn10, sn2 , xyzw, rgb, sn2 , sn10, sn10, sn10, wzyx
-PIPE_FORMAT_B10G10R10A2_USCALED     , plain, 1, 1, u10 , u10 , u10 , u2  , zyxw, rgb, u2  , u10 , u10 , u10 , yzwx
-PIPE_FORMAT_B10G10R10A2_SSCALED     , plain, 1, 1, s10 , s10 , s10 , s2  , zyxw, rgb, s2  , s10 , s10 , s10 , yzwx
-PIPE_FORMAT_B10G10R10A2_SNORM       , plain, 1, 1, sn10, sn10, sn10, sn2 , zyxw, rgb, sn2 , sn10, sn10, sn10, yzwx
-
-PIPE_FORMAT_R8_UINT                 , plain, 1, 1, up8, , , , x001, rgb
-PIPE_FORMAT_R8G8_UINT               , plain, 1, 1, up8, up8, , , xy01, rgb
-PIPE_FORMAT_R8G8B8_UINT             , plain, 1, 1, up8, up8, up8, , xyz1, rgb
-PIPE_FORMAT_R8G8B8A8_UINT           , plain, 1, 1, up8, up8, up8, up8, xyzw, rgb
-
-PIPE_FORMAT_R8_SINT                 , plain, 1, 1, sp8, , , , x001, rgb
-PIPE_FORMAT_R8G8_SINT               , plain, 1, 1, sp8, sp8, , , xy01, rgb
-PIPE_FORMAT_R8G8B8_SINT             , plain, 1, 1, sp8, sp8, sp8, , xyz1, rgb
-PIPE_FORMAT_R8G8B8A8_SINT           , plain, 1, 1, sp8, sp8, sp8, sp8, xyzw, rgb
-
-PIPE_FORMAT_R16_UINT                , plain, 1, 1, up16, , , , x001, rgb
-PIPE_FORMAT_R16G16_UINT             , plain, 1, 1, up16, up16, , , xy01, rgb
-PIPE_FORMAT_R16G16B16_UINT          , plain, 1, 1, up16, up16, up16, , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_UINT       , plain, 1, 1, up16, up16, up16, up16, xyzw, rgb
-
-PIPE_FORMAT_R16_SINT                , plain, 1, 1, sp16, , , , x001, rgb
-PIPE_FORMAT_R16G16_SINT             , plain, 1, 1, sp16, sp16, , , xy01, rgb
-PIPE_FORMAT_R16G16B16_SINT          , plain, 1, 1, sp16, sp16, sp16, , xyz1, rgb
-PIPE_FORMAT_R16G16B16A16_SINT       , plain, 1, 1, sp16, sp16, sp16, sp16, xyzw, rgb
-
-PIPE_FORMAT_R32_UINT                , plain, 1, 1, up32, , , , x001, rgb
-PIPE_FORMAT_R32G32_UINT             , plain, 1, 1, up32, up32, , , xy01, rgb
-PIPE_FORMAT_R32G32B32_UINT          , plain, 1, 1, up32, up32, up32, , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_UINT       , plain, 1, 1, up32, up32, up32, up32, xyzw, rgb
-
-PIPE_FORMAT_R32_SINT                , plain, 1, 1, sp32, , , , x001, rgb
-PIPE_FORMAT_R32G32_SINT             , plain, 1, 1, sp32, sp32, , , xy01, rgb
-PIPE_FORMAT_R32G32B32_SINT          , plain, 1, 1, sp32, sp32, sp32, , xyz1, rgb
-PIPE_FORMAT_R32G32B32A32_SINT       , plain, 1, 1, sp32, sp32, sp32, sp32, xyzw, rgb
-
-PIPE_FORMAT_A8_UINT                 , plain, 1, 1, up8, , , , 000x, rgb
-PIPE_FORMAT_I8_UINT                 , plain, 1, 1, up8, , , , xxxx, rgb
-PIPE_FORMAT_L8_UINT                 , plain, 1, 1, up8, , , , xxx1, rgb
-PIPE_FORMAT_L8A8_UINT               , plain, 1, 1, up8, up8, , , xxxy, rgb
-
-PIPE_FORMAT_A8_SINT                 , plain, 1, 1, sp8, , , , 000x, rgb
-PIPE_FORMAT_I8_SINT                 , plain, 1, 1, sp8, , , , xxxx, rgb
-PIPE_FORMAT_L8_SINT                 , plain, 1, 1, sp8, , , , xxx1, rgb
-PIPE_FORMAT_L8A8_SINT               , plain, 1, 1, sp8, sp8, , , xxxy, rgb
-
-PIPE_FORMAT_A16_UINT                , plain, 1, 1, up16, , , , 000x, rgb
-PIPE_FORMAT_I16_UINT                , plain, 1, 1, up16, , , , xxxx, rgb
-PIPE_FORMAT_L16_UINT                , plain, 1, 1, up16, , , , xxx1, rgb
-PIPE_FORMAT_L16A16_UINT             , plain, 1, 1, up16, up16, , , xxxy, rgb
-
-PIPE_FORMAT_A16_SINT                , plain, 1, 1, sp16, , , , 000x, rgb
-PIPE_FORMAT_I16_SINT                , plain, 1, 1, sp16, , , , xxxx, rgb
-PIPE_FORMAT_L16_SINT                , plain, 1, 1, sp16, , , , xxx1, rgb
-PIPE_FORMAT_L16A16_SINT             , plain, 1, 1, sp16, sp16, , , xxxy, rgb
-
-PIPE_FORMAT_A32_UINT                , plain, 1, 1, up32, , , , 000x, rgb
-PIPE_FORMAT_I32_UINT                , plain, 1, 1, up32, , , , xxxx, rgb
-PIPE_FORMAT_L32_UINT                , plain, 1, 1, up32, , , , xxx1, rgb
-PIPE_FORMAT_L32A32_UINT             , plain, 1, 1, up32, up32, , , xxxy, rgb
-
-PIPE_FORMAT_A32_SINT                , plain, 1, 1, sp32, , , , 000x, rgb
-PIPE_FORMAT_I32_SINT                , plain, 1, 1, sp32, , , , xxxx, rgb
-PIPE_FORMAT_L32_SINT                , plain, 1, 1, sp32, , , , xxx1, rgb
-PIPE_FORMAT_L32A32_SINT             , plain, 1, 1, sp32, sp32, , , xxxy, rgb
-
-PIPE_FORMAT_B10G10R10A2_UINT        , plain, 1, 1, up10, up10, up10, up2, zyxw, rgb, up2 , up10, up10, up10, yzwx
-
-PIPE_FORMAT_R8G8B8X8_SNORM          , plain, 1, 1, sn8,  sn8,  sn8,  x8,  xyz1, rgb
-PIPE_FORMAT_R8G8B8X8_SRGB           , plain, 1, 1, un8,  un8,  un8,  x8,  xyz1, srgb
-PIPE_FORMAT_R8G8B8X8_UINT           , plain, 1, 1, up8,  up8,  up8,  x8,  xyz1, rgb
-PIPE_FORMAT_R8G8B8X8_SINT           , plain, 1, 1, sp8,  sp8,  sp8,  x8,  xyz1, rgb
-PIPE_FORMAT_B10G10R10X2_UNORM       , plain, 1, 1, un10, un10, un10, x2,  zyx1, rgb, x2  , un10, un10, un10, yzw1
-PIPE_FORMAT_R16G16B16X16_UNORM      , plain, 1, 1, un16, un16, un16, x16, xyz1, rgb
-PIPE_FORMAT_R16G16B16X16_SNORM      , plain, 1, 1, sn16, sn16, sn16, x16, xyz1, rgb
-PIPE_FORMAT_R16G16B16X16_FLOAT      , plain, 1, 1, f16,  f16,  f16,  x16, xyz1, rgb
-PIPE_FORMAT_R16G16B16X16_UINT       , plain, 1, 1, up16, up16, up16, x16, xyz1, rgb
-PIPE_FORMAT_R16G16B16X16_SINT       , plain, 1, 1, sp16, sp16, sp16, x16, xyz1, rgb
-PIPE_FORMAT_R32G32B32X32_FLOAT      , plain, 1, 1, f32,  f32,  f32,  x32, xyz1, rgb
-PIPE_FORMAT_R32G32B32X32_UINT       , plain, 1, 1, up32, up32, up32, x32, xyz1, rgb
-PIPE_FORMAT_R32G32B32X32_SINT       , plain, 1, 1, sp32, sp32, sp32, x32, xyz1, rgb
-
-PIPE_FORMAT_R8A8_SNORM              , plain, 1, 1, sn8  ,  sn8 ,     ,     , x00y, rgb
-PIPE_FORMAT_R16A16_UNORM            , plain, 1, 1, un16 , un16 ,     ,     , x00y, rgb
-PIPE_FORMAT_R16A16_SNORM            , plain, 1, 1, sn16 , sn16 ,     ,     , x00y, rgb
-PIPE_FORMAT_R16A16_FLOAT            , plain, 1, 1, f16  , f16  ,     ,     , x00y, rgb
-PIPE_FORMAT_R32A32_FLOAT            , plain, 1, 1, f32  , f32  ,     ,     , x00y, rgb
-PIPE_FORMAT_R8A8_UINT               , plain, 1, 1, up8  , up8  ,     ,     , x00y, rgb
-PIPE_FORMAT_R8A8_SINT               , plain, 1, 1, sp8  , sp8  ,     ,     , x00y, rgb
-PIPE_FORMAT_R16A16_UINT             , plain, 1, 1, up16 , up16 ,     ,     , x00y, rgb
-PIPE_FORMAT_R16A16_SINT             , plain, 1, 1, sp16 , sp16 ,     ,     , x00y, rgb
-PIPE_FORMAT_R32A32_UINT             , plain, 1, 1, up32 , up32 ,     ,     , x00y, rgb
-PIPE_FORMAT_R32A32_SINT             , plain, 1, 1, sp32 , sp32 ,     ,     , x00y, rgb
-PIPE_FORMAT_R10G10B10A2_UINT        , plain, 1, 1, up10 , up10 , up10, up2 , xyzw, rgb, up2 , up10, up10, up10, wzyx
-
-PIPE_FORMAT_B5G6R5_SRGB             , plain, 1, 1, un5 , un6 , un5 ,     , zyx1, srgb, un5 , un6 , un5 ,     , xyz1
-
-PIPE_FORMAT_A8L8_UNORM            , plain, 1, 1, un8 , un8 , , , yyyx, rgb
-PIPE_FORMAT_A8L8_SNORM            , plain, 1, 1, sn8 , sn8 , , , yyyx, rgb
-PIPE_FORMAT_A8L8_SRGB             , plain, 1, 1, un8 , un8 , , , yyyx, srgb
-PIPE_FORMAT_A16L16_UNORM          , plain, 1, 1, un16, un16, , , yyyx, rgb
-
-PIPE_FORMAT_G8R8_UNORM            , plain, 1, 1, un8 , un8 , , , yx01, rgb
-PIPE_FORMAT_G8R8_SNORM            , plain, 1, 1, sn8 , sn8 , , , yx01, rgb
-PIPE_FORMAT_G16R16_UNORM          , plain, 1, 1, un16, un16, , , yx01, rgb
-PIPE_FORMAT_G16R16_SNORM          , plain, 1, 1, sn16, sn16, , , yx01, rgb
-
-PIPE_FORMAT_A8B8G8R8_SNORM        , plain, 1, 1, sn8 , sn8 , sn8 , sn8 , wzyx, rgb
-PIPE_FORMAT_X8B8G8R8_SNORM        , plain, 1, 1, x8,   sn8,  sn8,  sn8,  wzy1, rgb
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.h
deleted file mode 100644
index 2eab8a1d4..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format.h
+++ /dev/null
@@ -1,916 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009-2010 Vmware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_FORMAT_H
-#define U_FORMAT_H
-
-#include "pipe/p_defines.h"
-#include "pipe/p_format.h"
-#include "util/u_debug.h"
-
-union pipe_color_union;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Describe how to pack/unpack pixels into/from the prescribed format.
- *
- * XXX: This could be renamed to something like util_format_pack, or broke down
- * in flags inside util_format_block that said exactly what we want.
- */
-enum util_format_layout {
-  /**
-   * Formats with util_format_block::width == util_format_block::height == 1
-   * that can be described as an ordinary data structure.
-   */
-  UTIL_FORMAT_LAYOUT_PLAIN = 0,
-
-  /**
-   * Formats with sub-sampled channels.
-   *
-   * This is for formats like YVYU where there is less than one sample per
-   * pixel.
-   */
-  UTIL_FORMAT_LAYOUT_SUBSAMPLED = 3,
-
-  /**
-   * S3 Texture Compression formats.
-   */
-  UTIL_FORMAT_LAYOUT_S3TC = 4,
-
-  /**
-   * Red-Green Texture Compression formats.
-   */
-  UTIL_FORMAT_LAYOUT_RGTC = 5,
-
-  /**
-   * Ericsson Texture Compression
-   */
-  UTIL_FORMAT_LAYOUT_ETC = 6,
-
-  /**
-   * BC6/7 Texture Compression
-   */
-  UTIL_FORMAT_LAYOUT_BPTC = 7,
-
-  /**
-   * Everything else that doesn't fit in any of the above layouts.
-   */
-  UTIL_FORMAT_LAYOUT_OTHER = 8
-};
-
-struct util_format_block {
-  /** Block width in pixels */
-  unsigned width;
-
-  /** Block height in pixels */
-  unsigned height;
-
-  /** Block size in bits */
-  unsigned bits;
-};
-
-enum util_format_type {
-  UTIL_FORMAT_TYPE_VOID = 0,
-  UTIL_FORMAT_TYPE_UNSIGNED = 1,
-  UTIL_FORMAT_TYPE_SIGNED = 2,
-  UTIL_FORMAT_TYPE_FIXED = 3,
-  UTIL_FORMAT_TYPE_FLOAT = 4
-};
-
-enum util_format_swizzle {
-  UTIL_FORMAT_SWIZZLE_X = 0,
-  UTIL_FORMAT_SWIZZLE_Y = 1,
-  UTIL_FORMAT_SWIZZLE_Z = 2,
-  UTIL_FORMAT_SWIZZLE_W = 3,
-  UTIL_FORMAT_SWIZZLE_0 = 4,
-  UTIL_FORMAT_SWIZZLE_1 = 5,
-  UTIL_FORMAT_SWIZZLE_NONE = 6,
-  UTIL_FORMAT_SWIZZLE_MAX = 7 /**< Number of enums counter (must be last) */
-};
-
-enum util_format_colorspace {
-  UTIL_FORMAT_COLORSPACE_RGB = 0,
-  UTIL_FORMAT_COLORSPACE_SRGB = 1,
-  UTIL_FORMAT_COLORSPACE_YUV = 2,
-  UTIL_FORMAT_COLORSPACE_ZS = 3
-};
-
-struct util_format_channel_description {
-  unsigned type : 5; /**< UTIL_FORMAT_TYPE_x */
-  unsigned normalized : 1;
-  unsigned pure_integer : 1;
-  unsigned size : 9;   /**< bits per channel */
-  unsigned shift : 16; /** number of bits from lsb */
-};
-
-struct util_format_description {
-  enum pipe_format format;
-
-  const char *name;
-
-  /**
-   * Short name, striped of the prefix, lower case.
-   */
-  const char *short_name;
-
-  /**
-   * Pixel block dimensions.
-   */
-  struct util_format_block block;
-
-  enum util_format_layout layout;
-
-  /**
-   * The number of channels.
-   */
-  unsigned nr_channels : 3;
-
-  /**
-   * Whether all channels have the same number of (whole) bytes and type.
-   */
-  unsigned is_array : 1;
-
-  /**
-   * Whether the pixel format can be described as a bitfield structure.
-   *
-   * In particular:
-   * - pixel depth must be 8, 16, or 32 bits;
-   * - all channels must be unsigned, signed, or void
-   */
-  unsigned is_bitmask : 1;
-
-  /**
-   * Whether channels have mixed types (ignoring UTIL_FORMAT_TYPE_VOID).
-   */
-  unsigned is_mixed : 1;
-
-  /**
-   * Input channel description, in the order XYZW.
-   *
-   * Only valid for UTIL_FORMAT_LAYOUT_PLAIN formats.
-   *
-   * If each channel is accessed as an individual N-byte value, X is always
-   * at the lowest address in memory, Y is always next, and so on.  For all
-   * currently-defined formats, the N-byte value has native endianness.
-   *
-   * If instead a group of channels is accessed as a single N-byte value,
-   * the order of the channels within that value depends on endianness.
-   * For big-endian targets, X is the most significant subvalue,
-   * otherwise it is the least significant one.
-   *
-   * For example, if X is 8 bits and Y is 24 bits, the memory order is:
-   *
-   *                 0  1  2  3
-   *  little-endian: X  Yl Ym Yu    (l = lower, m = middle, u = upper)
-   *  big-endian:    X  Yu Ym Yl
-   *
-   * If X is 5 bits, Y is 5 bits, Z is 5 bits and W is 1 bit, the layout is:
-   *
-   *                        0        1
-   *                 msb  lsb msb  lsb
-   *  little-endian: YYYXXXXX WZZZZZYY
-   *  big-endian:    XXXXXYYY YYZZZZZW
-   */
-  struct util_format_channel_description channel[4];
-
-  /**
-   * Output channel swizzle.
-   *
-   * The order is either:
-   * - RGBA
-   * - YUV(A)
-   * - ZS
-   * depending on the colorspace.
-   */
-  unsigned char swizzle[4];
-
-  /**
-   * Colorspace transformation.
-   */
-  enum util_format_colorspace colorspace;
-};
-
-extern const struct util_format_description util_format_description_table[];
-
-const struct util_format_description *
-util_format_description(enum pipe_format format);
-
-/*
- * Format query functions.
- */
-
-static inline const char *util_format_name(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return "PIPE_FORMAT_???";
-  }
-
-  return desc->name;
-}
-
-static inline const char *util_format_short_name(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return "???";
-  }
-
-  return desc->short_name;
-}
-
-/**
- * Whether this format is plain, see UTIL_FORMAT_LAYOUT_PLAIN for more info.
- */
-static inline boolean util_format_is_plain(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  if (!format) {
-    return FALSE;
-  }
-
-  return desc->layout == UTIL_FORMAT_LAYOUT_PLAIN ? TRUE : FALSE;
-}
-
-static inline boolean util_format_is_compressed(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return FALSE;
-  }
-
-  switch (desc->layout) {
-  case UTIL_FORMAT_LAYOUT_S3TC:
-  case UTIL_FORMAT_LAYOUT_RGTC:
-  case UTIL_FORMAT_LAYOUT_ETC:
-  case UTIL_FORMAT_LAYOUT_BPTC:
-    /* XXX add other formats in the future */
-    return TRUE;
-  default:
-    return FALSE;
-  }
-}
-
-static inline boolean util_format_is_s3tc(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return FALSE;
-  }
-
-  return desc->layout == UTIL_FORMAT_LAYOUT_S3TC ? TRUE : FALSE;
-}
-
-static inline boolean util_format_is_srgb(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  return desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB;
-}
-
-static inline boolean
-util_format_has_depth(const struct util_format_description *desc) {
-  return desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS &&
-         desc->swizzle[0] != UTIL_FORMAT_SWIZZLE_NONE;
-}
-
-static inline boolean
-util_format_has_stencil(const struct util_format_description *desc) {
-  return desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS &&
-         desc->swizzle[1] != UTIL_FORMAT_SWIZZLE_NONE;
-}
-
-static inline boolean util_format_is_depth_or_stencil(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return FALSE;
-  }
-
-  return util_format_has_depth(desc) || util_format_has_stencil(desc);
-}
-
-static inline boolean
-util_format_is_depth_and_stencil(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return FALSE;
-  }
-
-  return util_format_has_depth(desc) && util_format_has_stencil(desc);
-}
-
-/**
- * Calculates the depth format type based upon the incoming format description.
- */
-static inline unsigned
-util_get_depth_format_type(const struct util_format_description *desc) {
-  unsigned depth_channel = desc->swizzle[0];
-  if (desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS &&
-      depth_channel != UTIL_FORMAT_SWIZZLE_NONE) {
-    return desc->channel[depth_channel].type;
-  } else {
-    return UTIL_FORMAT_TYPE_VOID;
-  }
-}
-
-/**
- * Calculates the MRD for the depth format. MRD is used in depth bias
- * for UNORM and unbound depth buffers. When the depth buffer is floating
- * point, the depth bias calculation does not use the MRD. However, the
- * default MRD will be 1.0 / ((1 << 24) - 1).
- */
-double util_get_depth_format_mrd(const struct util_format_description *desc);
-
-/**
- * Return whether this is an RGBA, Z, S, or combined ZS format.
- * Useful for initializing pipe_blit_info::mask.
- */
-static inline unsigned util_format_get_mask(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  if (!desc)
-    return 0;
-
-  if (util_format_has_depth(desc)) {
-    if (util_format_has_stencil(desc)) {
-      return PIPE_MASK_ZS;
-    } else {
-      return PIPE_MASK_Z;
-    }
-  } else {
-    if (util_format_has_stencil(desc)) {
-      return PIPE_MASK_S;
-    } else {
-      return PIPE_MASK_RGBA;
-    }
-  }
-}
-
-/**
- * Give the RGBA colormask of the channels that can be represented in this
- * format.
- *
- * That is, the channels whose values are preserved.
- */
-static inline unsigned
-util_format_colormask(const struct util_format_description *desc) {
-  unsigned colormask;
-  unsigned chan;
-
-  switch (desc->colorspace) {
-  case UTIL_FORMAT_COLORSPACE_RGB:
-  case UTIL_FORMAT_COLORSPACE_SRGB:
-  case UTIL_FORMAT_COLORSPACE_YUV:
-    colormask = 0;
-    for (chan = 0; chan < 4; ++chan) {
-      if (desc->swizzle[chan] < 4) {
-        colormask |= (1 << chan);
-      }
-    }
-    return colormask;
-  case UTIL_FORMAT_COLORSPACE_ZS:
-    return 0;
-  default:
-    assert(0);
-    return 0;
-  }
-}
-
-/**
- * Checks if color mask covers every channel for the specified format
- *
- * @param desc       a format description to check colormask with
- * @param colormask  a bit mask for channels, matches format of PIPE_MASK_RGBA
- */
-static inline boolean
-util_format_colormask_full(const struct util_format_description *desc,
-                           unsigned colormask) {
-  return (~colormask & util_format_colormask(desc)) == 0;
-}
-
-boolean util_format_is_float(enum pipe_format format);
-
-boolean util_format_has_alpha(enum pipe_format format);
-
-boolean util_format_is_luminance(enum pipe_format format);
-
-boolean util_format_is_alpha(enum pipe_format format);
-
-boolean util_format_is_luminance_alpha(enum pipe_format format);
-
-boolean util_format_is_intensity(enum pipe_format format);
-
-boolean util_format_is_subsampled_422(enum pipe_format format);
-
-boolean util_format_is_pure_integer(enum pipe_format format);
-
-boolean util_format_is_pure_sint(enum pipe_format format);
-
-boolean util_format_is_pure_uint(enum pipe_format format);
-
-boolean util_format_is_snorm(enum pipe_format format);
-
-/**
- * Check if the src format can be blitted to the destination format with
- * a simple memcpy.  For example, blitting from RGBA to RGBx is OK, but not
- * the reverse.
- */
-boolean
-util_is_format_compatible(const struct util_format_description *src_desc,
-                          const struct util_format_description *dst_desc);
-
-/**
- * Whether the format is supported by Gallium for the given bindings.
- * This covers S3TC textures and floating-point render targets.
- */
-boolean util_format_is_supported(enum pipe_format format, unsigned bind);
-
-/**
- * Whether this format is a rgab8 variant.
- *
- * That is, any format that matches the
- *
- *   PIPE_FORMAT_?8?8?8?8_UNORM
- */
-static inline boolean
-util_format_is_rgba8_variant(const struct util_format_description *desc) {
-  unsigned chan;
-
-  if (desc->block.width != 1 || desc->block.height != 1 ||
-      desc->block.bits != 32)
-    return FALSE;
-
-  for (chan = 0; chan < 4; ++chan) {
-    if (desc->channel[chan].type != UTIL_FORMAT_TYPE_UNSIGNED &&
-        desc->channel[chan].type != UTIL_FORMAT_TYPE_VOID)
-      return FALSE;
-    if (desc->channel[chan].type == UTIL_FORMAT_TYPE_UNSIGNED &&
-        !desc->channel[chan].normalized)
-      return FALSE;
-    if (desc->channel[chan].size != 8)
-      return FALSE;
-  }
-
-  return TRUE;
-}
-
-/**
- * Return total bits needed for the pixel format per block.
- */
-static inline uint util_format_get_blocksizebits(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return 0;
-  }
-
-  return desc->block.bits;
-}
-
-/**
- * Return bytes per block (not pixel) for the given format.
- */
-static inline uint util_format_get_blocksize(enum pipe_format format) {
-  uint bits = util_format_get_blocksizebits(format);
-  uint bytes = bits / 8;
-
-  assert(bits % 8 == 0);
-  assert(bytes > 0);
-  if (bytes == 0) {
-    bytes = 1;
-  }
-
-  return bytes;
-}
-
-static inline uint util_format_get_blockwidth(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return 1;
-  }
-
-  return desc->block.width;
-}
-
-static inline uint util_format_get_blockheight(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-
-  assert(desc);
-  if (!desc) {
-    return 1;
-  }
-
-  return desc->block.height;
-}
-
-static inline unsigned util_format_get_nblocksx(enum pipe_format format,
-                                                unsigned x) {
-  unsigned blockwidth = util_format_get_blockwidth(format);
-  return (x + blockwidth - 1) / blockwidth;
-}
-
-static inline unsigned util_format_get_nblocksy(enum pipe_format format,
-                                                unsigned y) {
-  unsigned blockheight = util_format_get_blockheight(format);
-  return (y + blockheight - 1) / blockheight;
-}
-
-static inline unsigned util_format_get_nblocks(enum pipe_format format,
-                                               unsigned width,
-                                               unsigned height) {
-  return util_format_get_nblocksx(format, width) *
-         util_format_get_nblocksy(format, height);
-}
-
-static inline size_t util_format_get_stride(enum pipe_format format,
-                                            unsigned width) {
-  return util_format_get_nblocksx(format, width) *
-         util_format_get_blocksize(format);
-}
-
-static inline size_t util_format_get_2d_size(enum pipe_format format,
-                                             size_t stride, unsigned height) {
-  return util_format_get_nblocksy(format, height) * stride;
-}
-
-static inline uint
-util_format_get_component_bits(enum pipe_format format,
-                               enum util_format_colorspace colorspace,
-                               uint component) {
-  const struct util_format_description *desc = util_format_description(format);
-  enum util_format_colorspace desc_colorspace;
-
-  assert(format);
-  if (!format) {
-    return 0;
-  }
-
-  assert(component < 4);
-
-  /* Treat RGB and SRGB as equivalent. */
-  if (colorspace == UTIL_FORMAT_COLORSPACE_SRGB) {
-    colorspace = UTIL_FORMAT_COLORSPACE_RGB;
-  }
-  if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) {
-    desc_colorspace = UTIL_FORMAT_COLORSPACE_RGB;
-  } else {
-    desc_colorspace = desc->colorspace;
-  }
-
-  if (desc_colorspace != colorspace) {
-    return 0;
-  }
-
-  switch (desc->swizzle[component]) {
-  case UTIL_FORMAT_SWIZZLE_X:
-    return desc->channel[0].size;
-  case UTIL_FORMAT_SWIZZLE_Y:
-    return desc->channel[1].size;
-  case UTIL_FORMAT_SWIZZLE_Z:
-    return desc->channel[2].size;
-  case UTIL_FORMAT_SWIZZLE_W:
-    return desc->channel[3].size;
-  default:
-    return 0;
-  }
-}
-
-/**
- * Given a linear RGB colorspace format, return the corresponding SRGB
- * format, or PIPE_FORMAT_NONE if none.
- */
-static inline enum pipe_format util_format_srgb(enum pipe_format format) {
-  if (util_format_is_srgb(format))
-    return format;
-
-  switch (format) {
-  case PIPE_FORMAT_L8_UNORM:
-    return PIPE_FORMAT_L8_SRGB;
-  case PIPE_FORMAT_L8A8_UNORM:
-    return PIPE_FORMAT_L8A8_SRGB;
-  case PIPE_FORMAT_R8G8B8_UNORM:
-    return PIPE_FORMAT_R8G8B8_SRGB;
-  case PIPE_FORMAT_A8B8G8R8_UNORM:
-    return PIPE_FORMAT_A8B8G8R8_SRGB;
-  case PIPE_FORMAT_X8B8G8R8_UNORM:
-    return PIPE_FORMAT_X8B8G8R8_SRGB;
-  case PIPE_FORMAT_B8G8R8A8_UNORM:
-    return PIPE_FORMAT_B8G8R8A8_SRGB;
-  case PIPE_FORMAT_B8G8R8X8_UNORM:
-    return PIPE_FORMAT_B8G8R8X8_SRGB;
-  case PIPE_FORMAT_A8R8G8B8_UNORM:
-    return PIPE_FORMAT_A8R8G8B8_SRGB;
-  case PIPE_FORMAT_X8R8G8B8_UNORM:
-    return PIPE_FORMAT_X8R8G8B8_SRGB;
-  case PIPE_FORMAT_R8G8B8A8_UNORM:
-    return PIPE_FORMAT_R8G8B8A8_SRGB;
-  case PIPE_FORMAT_R8G8B8X8_UNORM:
-    return PIPE_FORMAT_R8G8B8X8_SRGB;
-  case PIPE_FORMAT_DXT1_RGB:
-    return PIPE_FORMAT_DXT1_SRGB;
-  case PIPE_FORMAT_DXT1_RGBA:
-    return PIPE_FORMAT_DXT1_SRGBA;
-  case PIPE_FORMAT_DXT3_RGBA:
-    return PIPE_FORMAT_DXT3_SRGBA;
-  case PIPE_FORMAT_DXT5_RGBA:
-    return PIPE_FORMAT_DXT5_SRGBA;
-  case PIPE_FORMAT_B5G6R5_UNORM:
-    return PIPE_FORMAT_B5G6R5_SRGB;
-  case PIPE_FORMAT_BPTC_RGBA_UNORM:
-    return PIPE_FORMAT_BPTC_SRGBA;
-  default:
-    return PIPE_FORMAT_NONE;
-  }
-}
-
-/**
- * Given an sRGB format, return the corresponding linear colorspace format.
- * For non sRGB formats, return the format unchanged.
- */
-static inline enum pipe_format util_format_linear(enum pipe_format format) {
-  switch (format) {
-  case PIPE_FORMAT_L8_SRGB:
-    return PIPE_FORMAT_L8_UNORM;
-  case PIPE_FORMAT_L8A8_SRGB:
-    return PIPE_FORMAT_L8A8_UNORM;
-  case PIPE_FORMAT_R8G8B8_SRGB:
-    return PIPE_FORMAT_R8G8B8_UNORM;
-  case PIPE_FORMAT_A8B8G8R8_SRGB:
-    return PIPE_FORMAT_A8B8G8R8_UNORM;
-  case PIPE_FORMAT_X8B8G8R8_SRGB:
-    return PIPE_FORMAT_X8B8G8R8_UNORM;
-  case PIPE_FORMAT_B8G8R8A8_SRGB:
-    return PIPE_FORMAT_B8G8R8A8_UNORM;
-  case PIPE_FORMAT_B8G8R8X8_SRGB:
-    return PIPE_FORMAT_B8G8R8X8_UNORM;
-  case PIPE_FORMAT_A8R8G8B8_SRGB:
-    return PIPE_FORMAT_A8R8G8B8_UNORM;
-  case PIPE_FORMAT_X8R8G8B8_SRGB:
-    return PIPE_FORMAT_X8R8G8B8_UNORM;
-  case PIPE_FORMAT_R8G8B8A8_SRGB:
-    return PIPE_FORMAT_R8G8B8A8_UNORM;
-  case PIPE_FORMAT_R8G8B8X8_SRGB:
-    return PIPE_FORMAT_R8G8B8X8_UNORM;
-  case PIPE_FORMAT_DXT1_SRGB:
-    return PIPE_FORMAT_DXT1_RGB;
-  case PIPE_FORMAT_DXT1_SRGBA:
-    return PIPE_FORMAT_DXT1_RGBA;
-  case PIPE_FORMAT_DXT3_SRGBA:
-    return PIPE_FORMAT_DXT3_RGBA;
-  case PIPE_FORMAT_DXT5_SRGBA:
-    return PIPE_FORMAT_DXT5_RGBA;
-  case PIPE_FORMAT_B5G6R5_SRGB:
-    return PIPE_FORMAT_B5G6R5_UNORM;
-  case PIPE_FORMAT_BPTC_SRGBA:
-    return PIPE_FORMAT_BPTC_RGBA_UNORM;
-  default:
-    return format;
-  }
-}
-
-/**
- * Given a depth-stencil format, return the corresponding stencil-only format.
- * For stencil-only formats, return the format unchanged.
- */
-static inline enum pipe_format
-util_format_stencil_only(enum pipe_format format) {
-  switch (format) {
-  /* mask out the depth component */
-  case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-    return PIPE_FORMAT_X24S8_UINT;
-  case PIPE_FORMAT_S8_UINT_Z24_UNORM:
-    return PIPE_FORMAT_S8X24_UINT;
-  case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
-    return PIPE_FORMAT_X32_S8X24_UINT;
-
-  /* stencil only formats */
-  case PIPE_FORMAT_X24S8_UINT:
-  case PIPE_FORMAT_S8X24_UINT:
-  case PIPE_FORMAT_X32_S8X24_UINT:
-  case PIPE_FORMAT_S8_UINT:
-    return format;
-
-  default:
-    assert(0);
-    return PIPE_FORMAT_NONE;
-  }
-}
-
-/**
- * Converts PIPE_FORMAT_*I* to PIPE_FORMAT_*R*.
- * This is identity for non-intensity formats.
- */
-static inline enum pipe_format
-util_format_intensity_to_red(enum pipe_format format) {
-  switch (format) {
-  case PIPE_FORMAT_I8_UNORM:
-    return PIPE_FORMAT_R8_UNORM;
-  case PIPE_FORMAT_I8_SNORM:
-    return PIPE_FORMAT_R8_SNORM;
-  case PIPE_FORMAT_I16_UNORM:
-    return PIPE_FORMAT_R16_UNORM;
-  case PIPE_FORMAT_I16_SNORM:
-    return PIPE_FORMAT_R16_SNORM;
-  case PIPE_FORMAT_I16_FLOAT:
-    return PIPE_FORMAT_R16_FLOAT;
-  case PIPE_FORMAT_I32_FLOAT:
-    return PIPE_FORMAT_R32_FLOAT;
-  case PIPE_FORMAT_I8_UINT:
-    return PIPE_FORMAT_R8_UINT;
-  case PIPE_FORMAT_I8_SINT:
-    return PIPE_FORMAT_R8_SINT;
-  case PIPE_FORMAT_I16_UINT:
-    return PIPE_FORMAT_R16_UINT;
-  case PIPE_FORMAT_I16_SINT:
-    return PIPE_FORMAT_R16_SINT;
-  case PIPE_FORMAT_I32_UINT:
-    return PIPE_FORMAT_R32_UINT;
-  case PIPE_FORMAT_I32_SINT:
-    return PIPE_FORMAT_R32_SINT;
-  default:
-    assert(!util_format_is_intensity(format));
-    return format;
-  }
-}
-
-/**
- * Converts PIPE_FORMAT_*L* to PIPE_FORMAT_*R*.
- * This is identity for non-luminance formats.
- */
-static inline enum pipe_format
-util_format_luminance_to_red(enum pipe_format format) {
-  switch (format) {
-  case PIPE_FORMAT_L8_UNORM:
-    return PIPE_FORMAT_R8_UNORM;
-  case PIPE_FORMAT_L8_SNORM:
-    return PIPE_FORMAT_R8_SNORM;
-  case PIPE_FORMAT_L16_UNORM:
-    return PIPE_FORMAT_R16_UNORM;
-  case PIPE_FORMAT_L16_SNORM:
-    return PIPE_FORMAT_R16_SNORM;
-  case PIPE_FORMAT_L16_FLOAT:
-    return PIPE_FORMAT_R16_FLOAT;
-  case PIPE_FORMAT_L32_FLOAT:
-    return PIPE_FORMAT_R32_FLOAT;
-  case PIPE_FORMAT_L8_UINT:
-    return PIPE_FORMAT_R8_UINT;
-  case PIPE_FORMAT_L8_SINT:
-    return PIPE_FORMAT_R8_SINT;
-  case PIPE_FORMAT_L16_UINT:
-    return PIPE_FORMAT_R16_UINT;
-  case PIPE_FORMAT_L16_SINT:
-    return PIPE_FORMAT_R16_SINT;
-  case PIPE_FORMAT_L32_UINT:
-    return PIPE_FORMAT_R32_UINT;
-  case PIPE_FORMAT_L32_SINT:
-    return PIPE_FORMAT_R32_SINT;
-
-  case PIPE_FORMAT_LATC1_UNORM:
-    return PIPE_FORMAT_RGTC1_UNORM;
-  case PIPE_FORMAT_LATC1_SNORM:
-    return PIPE_FORMAT_RGTC1_SNORM;
-
-  case PIPE_FORMAT_L4A4_UNORM:
-    return PIPE_FORMAT_R4A4_UNORM;
-
-  case PIPE_FORMAT_L8A8_UNORM:
-    return PIPE_FORMAT_R8A8_UNORM;
-  case PIPE_FORMAT_L8A8_SNORM:
-    return PIPE_FORMAT_R8A8_SNORM;
-  case PIPE_FORMAT_L16A16_UNORM:
-    return PIPE_FORMAT_R16A16_UNORM;
-  case PIPE_FORMAT_L16A16_SNORM:
-    return PIPE_FORMAT_R16A16_SNORM;
-  case PIPE_FORMAT_L16A16_FLOAT:
-    return PIPE_FORMAT_R16A16_FLOAT;
-  case PIPE_FORMAT_L32A32_FLOAT:
-    return PIPE_FORMAT_R32A32_FLOAT;
-  case PIPE_FORMAT_L8A8_UINT:
-    return PIPE_FORMAT_R8A8_UINT;
-  case PIPE_FORMAT_L8A8_SINT:
-    return PIPE_FORMAT_R8A8_SINT;
-  case PIPE_FORMAT_L16A16_UINT:
-    return PIPE_FORMAT_R16A16_UINT;
-  case PIPE_FORMAT_L16A16_SINT:
-    return PIPE_FORMAT_R16A16_SINT;
-  case PIPE_FORMAT_L32A32_UINT:
-    return PIPE_FORMAT_R32A32_UINT;
-  case PIPE_FORMAT_L32A32_SINT:
-    return PIPE_FORMAT_R32A32_SINT;
-
-  /* We don't have compressed red-alpha variants for these. */
-  case PIPE_FORMAT_LATC2_UNORM:
-  case PIPE_FORMAT_LATC2_SNORM:
-    return PIPE_FORMAT_NONE;
-
-  default:
-    assert(!util_format_is_luminance(format) &&
-           !util_format_is_luminance_alpha(format));
-    return format;
-  }
-}
-
-/**
- * Return the number of components stored.
- * Formats with block size != 1x1 will always have 1 component (the block).
- */
-static inline unsigned util_format_get_nr_components(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  return desc->nr_channels;
-}
-
-/**
- * Return the index of the first non-void channel
- * -1 if no non-void channels
- */
-static inline int
-util_format_get_first_non_void_channel(enum pipe_format format) {
-  const struct util_format_description *desc = util_format_description(format);
-  int i;
-
-  for (i = 0; i < 4; i++)
-    if (desc->channel[i].type != UTIL_FORMAT_TYPE_VOID)
-      break;
-
-  if (i == 4)
-    return -1;
-
-  return i;
-}
-
-/*
- * Generic format conversion;
- */
-
-boolean
-util_format_fits_8unorm(const struct util_format_description *format_desc);
-
-/*
- * Swizzle operations.
- */
-
-/* Compose two sets of swizzles.
- * If V is a 4D vector and the function parameters represent functions that
- * swizzle vector components, this holds:
- *     swz2(swz1(V)) = dst(V)
- */
-void util_format_compose_swizzles(const unsigned char swz1[4],
-                                  const unsigned char swz2[4],
-                                  unsigned char dst[4]);
-
-/* Apply the swizzle provided in \param swz (which is one of PIPE_SWIZZLE_x)
- * to \param src and store the result in \param dst.
- * \param is_integer determines the value written for PIPE_SWIZZLE_ONE.
- */
-void util_format_apply_color_swizzle(union pipe_color_union *dst,
-                                     const union pipe_color_union *src,
-                                     const unsigned char swz[4],
-                                     const boolean is_integer);
-
-void util_format_swizzle_4f(float *dst, const float *src,
-                            const unsigned char swz[4]);
-
-void util_format_unswizzle_4f(float *dst, const float *src,
-                              const unsigned char swz[4]);
-
-#ifdef __cplusplus
-} // extern "C" {
-#endif
-
-#endif /* ! U_FORMAT_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_parse.py b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_parse.py
deleted file mode 100644
index 401265017..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_parse.py
+++ /dev/null
@@ -1,373 +0,0 @@
-
-'''
-/**************************************************************************
- *
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-'''
-
-
-from __future__ import division
-
-
-VOID, UNSIGNED, SIGNED, FIXED, FLOAT = range(5)
-
-SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W, SWIZZLE_0, SWIZZLE_1, SWIZZLE_NONE, = range(7)
-
-PLAIN = 'plain'
-
-RGB = 'rgb'
-SRGB = 'srgb'
-YUV = 'yuv'
-ZS = 'zs'
-
-
-def is_pot(x):
-   return (x & (x - 1)) == 0
-
-
-VERY_LARGE = 99999999999999999999999
-
-
-class Channel:
-    '''Describe the channel of a color channel.'''
-    
-    def __init__(self, type, norm, pure, size, name = ''):
-        self.type = type
-        self.norm = norm
-        self.pure = pure
-        self.size = size
-        self.sign = type in (SIGNED, FIXED, FLOAT)
-        self.name = name
-
-    def __str__(self):
-        s = str(self.type)
-        if self.norm:
-            s += 'n'
-        if self.pure:
-            s += 'p'
-        s += str(self.size)
-        return s
-
-    def __eq__(self, other):
-        if other is None:
-            return False
-
-        return self.type == other.type and self.norm == other.norm and self.pure == other.pure and self.size == other.size
-
-    def __ne__(self, other):
-        return not self == other
-
-    def max(self):
-        '''Maximum representable number.'''
-        if self.type == FLOAT:
-            return VERY_LARGE
-        if self.type == FIXED:
-            return (1 << (self.size // 2)) - 1
-        if self.norm:
-            return 1
-        if self.type == UNSIGNED:
-            return (1 << self.size) - 1
-        if self.type == SIGNED:
-            return (1 << (self.size - 1)) - 1
-        assert False
-    
-    def min(self):
-        '''Minimum representable number.'''
-        if self.type == FLOAT:
-            return -VERY_LARGE
-        if self.type == FIXED:
-            return -(1 << (self.size // 2))
-        if self.type == UNSIGNED:
-            return 0
-        if self.norm:
-            return -1
-        if self.type == SIGNED:
-            return -(1 << (self.size - 1))
-        assert False
-
-
-class Format:
-    '''Describe a pixel format.'''
-
-    def __init__(self, name, layout, block_width, block_height, le_channels, le_swizzles, be_channels, be_swizzles, colorspace):
-        self.name = name
-        self.layout = layout
-        self.block_width = block_width
-        self.block_height = block_height
-        self.le_channels = le_channels
-        self.le_swizzles = le_swizzles
-        self.be_channels = be_channels
-        self.be_swizzles = be_swizzles
-        self.name = name
-        self.colorspace = colorspace
-
-    def __str__(self):
-        return self.name
-
-    def short_name(self):
-        '''Make up a short norm for a format, suitable to be used as suffix in
-        function names.'''
-
-        name = self.name
-        if name.startswith('PIPE_FORMAT_'):
-            name = name[len('PIPE_FORMAT_'):]
-        name = name.lower()
-        return name
-
-    def block_size(self):
-        size = 0
-        for channel in self.le_channels:
-            size += channel.size
-        return size
-
-    def nr_channels(self):
-        nr_channels = 0
-        for channel in self.le_channels:
-            if channel.size:
-                nr_channels += 1
-        return nr_channels
-
-    def array_element(self):
-        if self.layout != PLAIN:
-            return None
-        ref_channel = self.le_channels[0]
-        if ref_channel.type == VOID:
-           ref_channel = self.le_channels[1]
-        for channel in self.le_channels:
-            if channel.size and (channel.size != ref_channel.size or channel.size % 8):
-                return None
-            if channel.type != VOID:
-                if channel.type != ref_channel.type:
-                    return None
-                if channel.norm != ref_channel.norm:
-                    return None
-                if channel.pure != ref_channel.pure:
-                    return None
-        return ref_channel
-
-    def is_array(self):
-        return self.array_element() != None
-
-    def is_mixed(self):
-        if self.layout != PLAIN:
-            return False
-        ref_channel = self.le_channels[0]
-        if ref_channel.type == VOID:
-           ref_channel = self.le_channels[1]
-        for channel in self.le_channels[1:]:
-            if channel.type != VOID:
-                if channel.type != ref_channel.type:
-                    return True
-                if channel.norm != ref_channel.norm:
-                    return True
-                if channel.pure != ref_channel.pure:
-                    return True
-        return False
-
-    def is_pot(self):
-        return is_pot(self.block_size())
-
-    def is_int(self):
-        if self.layout != PLAIN:
-            return False
-        for channel in self.le_channels:
-            if channel.type not in (VOID, UNSIGNED, SIGNED):
-                return False
-        return True
-
-    def is_float(self):
-        if self.layout != PLAIN:
-            return False
-        for channel in self.le_channels:
-            if channel.type not in (VOID, FLOAT):
-                return False
-        return True
-
-    def is_bitmask(self):
-        if self.layout != PLAIN:
-            return False
-        if self.block_size() not in (8, 16, 32):
-            return False
-        for channel in self.le_channels:
-            if channel.type not in (VOID, UNSIGNED, SIGNED):
-                return False
-        return True
-
-    def is_pure_color(self):
-        if self.layout != PLAIN or self.colorspace == ZS:
-            return False
-        pures = [channel.pure
-                 for channel in self.le_channels
-                 if channel.type != VOID]
-        for x in pures:
-           assert x == pures[0]
-        return pures[0]
-
-    def channel_type(self):
-        types = [channel.type
-                 for channel in self.le_channels
-                 if channel.type != VOID]
-        for x in types:
-           assert x == types[0]
-        return types[0]
-
-    def is_pure_signed(self):
-        return self.is_pure_color() and self.channel_type() == SIGNED
-
-    def is_pure_unsigned(self):
-        return self.is_pure_color() and self.channel_type() == UNSIGNED
-
-    def has_channel(self, id):
-        return self.le_swizzles[id] != SWIZZLE_NONE
-
-    def has_depth(self):
-        return self.colorspace == ZS and self.has_channel(0)
-
-    def has_stencil(self):
-        return self.colorspace == ZS and self.has_channel(1)
-
-    def stride(self):
-        return self.block_size()/8
-
-
-_type_parse_map = {
-    '':  VOID,
-    'x': VOID,
-    'u': UNSIGNED,
-    's': SIGNED,
-    'h': FIXED,
-    'f': FLOAT,
-}
-
-_swizzle_parse_map = {
-    'x': SWIZZLE_X,
-    'y': SWIZZLE_Y,
-    'z': SWIZZLE_Z,
-    'w': SWIZZLE_W,
-    '0': SWIZZLE_0,
-    '1': SWIZZLE_1,
-    '_': SWIZZLE_NONE,
-}
-
-def _parse_channels(fields, layout, colorspace, swizzles):
-    if layout == PLAIN:
-        names = ['']*4
-        if colorspace in (RGB, SRGB):
-            for i in range(4):
-                swizzle = swizzles[i]
-                if swizzle < 4:
-                    names[swizzle] += 'rgba'[i]
-        elif colorspace == ZS:
-            for i in range(4):
-                swizzle = swizzles[i]
-                if swizzle < 4:
-                    names[swizzle] += 'zs'[i]
-        else:
-            assert False
-        for i in range(4):
-            if names[i] == '':
-                names[i] = 'x'
-    else:
-        names = ['x', 'y', 'z', 'w']
-
-    channels = []
-    for i in range(0, 4):
-        field = fields[i]
-        if field:
-            type = _type_parse_map[field[0]]
-            if field[1] == 'n':
-                norm = True
-                pure = False
-                size = int(field[2:])
-            elif field[1] == 'p':
-                pure = True
-                norm = False
-                size = int(field[2:])
-            else:
-                norm = False
-                pure = False
-                size = int(field[1:])
-        else:
-            type = VOID
-            norm = False
-            pure = False
-            size = 0
-        channel = Channel(type, norm, pure, size, names[i])
-        channels.append(channel)
-
-    return channels
-
-def parse(filename):
-    '''Parse the format description in CSV format in terms of the
-    Channel and Format classes above.'''
-
-    stream = open(filename)
-    formats = []
-    for line in stream:
-        try:
-            comment = line.index('#')
-        except ValueError:
-            pass
-        else:
-            line = line[:comment]
-        line = line.strip()
-        if not line:
-            continue
-
-        fields = [field.strip() for field in line.split(',')]
-        if len (fields) == 10:
-           fields += fields[4:9]
-        assert len (fields) == 15
-        
-        name = fields[0]
-        layout = fields[1]
-        block_width, block_height = map(int, fields[2:4])
-        colorspace = fields[9]
-
-        le_swizzles = [_swizzle_parse_map[swizzle] for swizzle in fields[8]]
-        le_channels = _parse_channels(fields[4:8], layout, colorspace, le_swizzles)
-
-        be_swizzles = [_swizzle_parse_map[swizzle] for swizzle in fields[14]]
-        be_channels = _parse_channels(fields[10:14], layout, colorspace, be_swizzles)
-
-        le_shift = 0
-        for channel in le_channels:
-            channel.shift = le_shift
-            le_shift += channel.size
-
-        be_shift = 0
-        for channel in be_channels[3::-1]:
-            channel.shift = be_shift
-            be_shift += channel.size
-
-        assert le_shift == be_shift
-        for i in range(4):
-            assert (le_swizzles[i] != SWIZZLE_NONE) == (be_swizzles[i] != SWIZZLE_NONE)
-
-        format = Format(name, layout, block_width, block_height, le_channels, le_swizzles, be_channels, be_swizzles, colorspace)
-        formats.append(format)
-    return formats
-
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_s3tc.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_s3tc.h
deleted file mode 100644
index fc0c0de81..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_s3tc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- **************************************************************************/
-
-#ifndef U_FORMAT_S3TC_H_
-#define U_FORMAT_S3TC_H_
-
-#include "pipe/p_compiler.h"
-
-enum util_format_dxtn {
-  UTIL_FORMAT_DXT1_RGB = 0x83F0,
-  UTIL_FORMAT_DXT1_RGBA = 0x83F1,
-  UTIL_FORMAT_DXT3_RGBA = 0x83F2,
-  UTIL_FORMAT_DXT5_RGBA = 0x83F3
-};
-
-extern boolean util_format_s3tc_enabled;
-
-void util_format_s3tc_init(void);
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_table.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_table.c
deleted file mode 100644
index a186e01f1..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_table.c
+++ /dev/null
@@ -1,9785 +0,0 @@
-/* This file is autogenerated by u_format_table.py from u_format.csv. Do not
- * edit directly. */
-
-/**************************************************************************
- *
- * Copyright 2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "pipe/p_compiler.h"
-#include "u_format.h"
-#include "u_half.h"
-#include "u_math.h"
-
-const struct util_format_description util_format_none_description = {
-    PIPE_FORMAT_NONE,
-    "PIPE_FORMAT_NONE",
-    "none",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b8g8r8a8_unorm_description = {
-    PIPE_FORMAT_B8G8R8A8_UNORM,
-    "PIPE_FORMAT_B8G8R8A8_UNORM",
-    "b8g8r8a8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b8g8r8x8_unorm_description = {
-    PIPE_FORMAT_B8G8R8X8_UNORM,
-    "PIPE_FORMAT_B8G8R8X8_UNORM",
-    "b8g8r8x8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = r */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}      /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = r */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}     /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8r8g8b8_unorm_description = {
-    PIPE_FORMAT_A8R8G8B8_UNORM,
-    "PIPE_FORMAT_A8R8G8B8_UNORM",
-    "a8r8g8b8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = b */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_x8r8g8b8_unorm_description = {
-    PIPE_FORMAT_X8R8G8B8_UNORM,
-    "PIPE_FORMAT_X8R8G8B8_UNORM",
-    "x8r8g8b8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},    /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},     /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = b */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8b8g8r8_unorm_description = {
-    PIPE_FORMAT_A8B8G8R8_UNORM,
-    "PIPE_FORMAT_A8B8G8R8_UNORM",
-    "a8b8g8r8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = r */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_x8b8g8r8_unorm_description = {
-    PIPE_FORMAT_X8B8G8R8_UNORM,
-    "PIPE_FORMAT_X8B8G8R8_UNORM",
-    "x8b8g8r8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},    /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = r */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},     /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8x8_unorm_description = {
-    PIPE_FORMAT_R8G8B8X8_UNORM,
-    "PIPE_FORMAT_R8G8B8X8_UNORM",
-    "r8g8b8x8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}      /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}     /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b5g5r5x1_unorm_description = {
-    PIPE_FORMAT_B5G5R5X1_UNORM,
-    "PIPE_FORMAT_B5G5R5X1_UNORM",
-    "b5g5r5x1_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 1, 15},    /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 10}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 5},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0},  /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 5},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 10}, /* z = r */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 1, 15}     /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b5g5r5a1_unorm_description = {
-    PIPE_FORMAT_B5G5R5A1_UNORM,
-    "PIPE_FORMAT_B5G5R5A1_UNORM",
-    "b5g5r5a1_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 1, 15}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 10}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 5},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0},  /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 5},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 10}, /* z = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 1, 15}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b4g4r4a4_unorm_description = {
-    PIPE_FORMAT_B4G4R4A4_UNORM,
-    "PIPE_FORMAT_B4G4R4A4_UNORM",
-    "b4g4r4a4_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 12}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 8},  /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 8}, /* z = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 12} /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b4g4r4x4_unorm_description = {
-    PIPE_FORMAT_B4G4R4X4_UNORM,
-    "PIPE_FORMAT_B4G4R4X4_UNORM",
-    "b4g4r4x4_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 4, 12},   /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 8}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}  /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 8}, /* z = r */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 4, 12}    /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_W, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a4b4g4r4_unorm_description = {
-    PIPE_FORMAT_A4B4G4R4_UNORM,
-    "PIPE_FORMAT_A4B4G4R4_UNORM",
-    "a4b4g4r4_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 12}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4},  /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 8}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 12} /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b5g6r5_unorm_description = {
-    PIPE_FORMAT_B5G6R5_UNORM,
-    "PIPE_FORMAT_B5G6R5_UNORM",
-    "b5g6r5_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 11}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 6, 5},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0},  /* x = b */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 6, 5},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 11}, /* z = r */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r10g10b10a2_unorm_description =
-    {
-        PIPE_FORMAT_R10G10B10A2_UNORM,
-        "PIPE_FORMAT_R10G10B10A2_UNORM",
-        "r10g10b10a2_unorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r10g10b10x2_unorm_description =
-    {
-        PIPE_FORMAT_R10G10B10X2_UNORM,
-        "PIPE_FORMAT_R10G10B10X2_UNORM",
-        "r10g10b10x2_unorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30},     /* x = x */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30}      /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b10g10r10a2_unorm_description =
-    {
-        PIPE_FORMAT_B10G10R10A2_UNORM,
-        "PIPE_FORMAT_B10G10R10A2_UNORM",
-        "b10g10r10a2_unorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* y = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0}   /* w = b */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0},  /* x = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* z = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_W, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Z, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_X, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b2g3r3_unorm_description = {
-    PIPE_FORMAT_B2G3R3_UNORM,
-    "PIPE_FORMAT_B2G3R3_UNORM",
-    "b2g3r3_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 3, 5}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 3, 2}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 0}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 0}, /* x = b */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 3, 2}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 3, 5}, /* z = r */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8_unorm_description = {
-    PIPE_FORMAT_L8_UNORM,
-    "PIPE_FORMAT_L8_UNORM",
-    "l8_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8_unorm_description = {
-    PIPE_FORMAT_A8_UNORM,
-    "PIPE_FORMAT_A8_UNORM",
-    "a8_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i8_unorm_description = {
-    PIPE_FORMAT_I8_UNORM,
-    "PIPE_FORMAT_I8_UNORM",
-    "i8_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l4a4_unorm_description = {
-    PIPE_FORMAT_L4A4_UNORM,
-    "PIPE_FORMAT_L4A4_UNORM",
-    "l4a4_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8a8_unorm_description = {
-    PIPE_FORMAT_L8A8_UNORM,
-    "PIPE_FORMAT_L8A8_UNORM",
-    "l8a8_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16_unorm_description = {
-    PIPE_FORMAT_L16_UNORM,
-    "PIPE_FORMAT_L16_UNORM",
-    "l16_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a16_unorm_description = {
-    PIPE_FORMAT_A16_UNORM,
-    "PIPE_FORMAT_A16_UNORM",
-    "a16_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i16_unorm_description = {
-    PIPE_FORMAT_I16_UNORM,
-    "PIPE_FORMAT_I16_UNORM",
-    "i16_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16a16_unorm_description = {
-    PIPE_FORMAT_L16A16_UNORM,
-    "PIPE_FORMAT_L16A16_UNORM",
-    "l16a16_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8_snorm_description = {
-    PIPE_FORMAT_A8_SNORM,
-    "PIPE_FORMAT_A8_SNORM",
-    "a8_snorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8_snorm_description = {
-    PIPE_FORMAT_L8_SNORM,
-    "PIPE_FORMAT_L8_SNORM",
-    "l8_snorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8a8_snorm_description = {
-    PIPE_FORMAT_L8A8_SNORM,
-    "PIPE_FORMAT_L8A8_SNORM",
-    "l8a8_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i8_snorm_description = {
-    PIPE_FORMAT_I8_SNORM,
-    "PIPE_FORMAT_I8_SNORM",
-    "i8_snorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a16_snorm_description = {
-    PIPE_FORMAT_A16_SNORM,
-    "PIPE_FORMAT_A16_SNORM",
-    "a16_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16_snorm_description = {
-    PIPE_FORMAT_L16_SNORM,
-    "PIPE_FORMAT_L16_SNORM",
-    "l16_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16a16_snorm_description = {
-    PIPE_FORMAT_L16A16_SNORM,
-    "PIPE_FORMAT_L16A16_SNORM",
-    "l16a16_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i16_snorm_description = {
-    PIPE_FORMAT_I16_SNORM,
-    "PIPE_FORMAT_I16_SNORM",
-    "i16_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a16_float_description = {
-    PIPE_FORMAT_A16_FLOAT,
-    "PIPE_FORMAT_A16_FLOAT",
-    "a16_float",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16_float_description = {
-    PIPE_FORMAT_L16_FLOAT,
-    "PIPE_FORMAT_L16_FLOAT",
-    "l16_float",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16a16_float_description = {
-    PIPE_FORMAT_L16A16_FLOAT,
-    "PIPE_FORMAT_L16A16_FLOAT",
-    "l16a16_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i16_float_description = {
-    PIPE_FORMAT_I16_FLOAT,
-    "PIPE_FORMAT_I16_FLOAT",
-    "i16_float",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a32_float_description = {
-    PIPE_FORMAT_A32_FLOAT,
-    "PIPE_FORMAT_A32_FLOAT",
-    "a32_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l32_float_description = {
-    PIPE_FORMAT_L32_FLOAT,
-    "PIPE_FORMAT_L32_FLOAT",
-    "l32_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l32a32_float_description = {
-    PIPE_FORMAT_L32A32_FLOAT,
-    "PIPE_FORMAT_L32A32_FLOAT",
-    "l32a32_float",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i32_float_description = {
-    PIPE_FORMAT_I32_FLOAT,
-    "PIPE_FORMAT_I32_FLOAT",
-    "i32_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8_srgb_description = {
-    PIPE_FORMAT_L8_SRGB,
-    "PIPE_FORMAT_L8_SRGB",
-    "l8_srgb",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_X, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_r8_srgb_description = {
-    PIPE_FORMAT_R8_SRGB,
-    "PIPE_FORMAT_R8_SRGB",
-    "r8_srgb",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_0, /* sg */
-        UTIL_FORMAT_SWIZZLE_0, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_l8a8_srgb_description = {
-    PIPE_FORMAT_L8A8_SRGB,
-    "PIPE_FORMAT_L8A8_SRGB",
-    "l8a8_srgb",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_X, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_X, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_r8g8b8_srgb_description = {
-    PIPE_FORMAT_R8G8B8_SRGB,
-    "PIPE_FORMAT_R8G8B8_SRGB",
-    "r8g8b8_srgb",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_srgb_description = {
-    PIPE_FORMAT_R8G8B8A8_SRGB,
-    "PIPE_FORMAT_R8G8B8A8_SRGB",
-    "r8g8b8a8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_a8b8g8r8_srgb_description = {
-    PIPE_FORMAT_A8B8G8R8_SRGB,
-    "PIPE_FORMAT_A8B8G8R8_SRGB",
-    "a8b8g8r8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = r */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_Y, /* sb */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_Y, /* sb */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_x8b8g8r8_srgb_description = {
-    PIPE_FORMAT_X8B8G8R8_SRGB,
-    "PIPE_FORMAT_X8B8G8R8_SRGB",
-    "x8b8g8r8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},    /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = r */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},     /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_Y, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_Y, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_b8g8r8a8_srgb_description = {
-    PIPE_FORMAT_B8G8R8A8_SRGB,
-    "PIPE_FORMAT_B8G8R8A8_SRGB",
-    "b8g8r8a8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_b8g8r8x8_srgb_description = {
-    PIPE_FORMAT_B8G8R8X8_SRGB,
-    "PIPE_FORMAT_B8G8R8X8_SRGB",
-    "b8g8r8x8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = r */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}      /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = r */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}     /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_a8r8g8b8_srgb_description = {
-    PIPE_FORMAT_A8R8G8B8_SRGB,
-    "PIPE_FORMAT_A8R8G8B8_SRGB",
-    "a8r8g8b8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = a */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = b */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_W, /* sb */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_W, /* sb */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_x8r8g8b8_srgb_description = {
-    PIPE_FORMAT_X8R8G8B8_SRGB,
-    "PIPE_FORMAT_X8R8G8B8_SRGB",
-    "x8r8g8b8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},    /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = b */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},     /* x = x */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = b */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_W, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* sr */
-        UTIL_FORMAT_SWIZZLE_Z, /* sg */
-        UTIL_FORMAT_SWIZZLE_W, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_r8sg8sb8ux8u_norm_description =
-    {
-        PIPE_FORMAT_R8SG8SB8UX8U_NORM,
-        "PIPE_FORMAT_R8SG8SB8UX8U_NORM",
-        "r8sg8sb8ux8u_norm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        TRUE,  /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16},  /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}     /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0},    /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},    /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}     /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r10sg10sb10sa2u_norm_description = {
-        PIPE_FORMAT_R10SG10SB10SA2U_NORM,
-        "PIPE_FORMAT_R10SG10SB10SA2U_NORM",
-        "r10sg10sb10sa2u_norm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        TRUE,  /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 30}, /* x = a */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20},  /* y = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10},  /* z = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0}    /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 2, 30} /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r5sg5sb6u_norm_description = {
-    PIPE_FORMAT_R5SG5SB6U_NORM,
-    "PIPE_FORMAT_R5SG5SB6U_NORM",
-    "r5sg5sb6u_norm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    TRUE,  /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 6, 10}, /* x = b */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 5, 5},    /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 5, 0},    /* z = r */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 5, 0},    /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 5, 5},    /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 6, 10}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_s8_uint_description = {
-    PIPE_FORMAT_S8_UINT,
-    "PIPE_FORMAT_S8_UINT",
-    "s8_uint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = s */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_X,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_z16_unorm_description = {
-    PIPE_FORMAT_Z16_UNORM,
-    "PIPE_FORMAT_Z16_UNORM",
-    "z16_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0}, /* x = z */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_z32_unorm_description = {
-    PIPE_FORMAT_Z32_UNORM,
-    "PIPE_FORMAT_Z32_UNORM",
-    "z32_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0}, /* x = z */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_z32_float_description = {
-    PIPE_FORMAT_Z32_FLOAT,
-    "PIPE_FORMAT_Z32_FLOAT",
-    "z32_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0}, /* x = z */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_z24_unorm_s8_uint_description =
-    {
-        PIPE_FORMAT_Z24_UNORM_S8_UINT,
-        "PIPE_FORMAT_Z24_UNORM_S8_UINT",
-        "z24_unorm_s8_uint",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        2,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        TRUE,  /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}, /* x = s */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 0}, /* y = z */
-         {0, 0, 0, 0, 0},
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 0}, /* x = z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}, /* y = s */
-         {0, 0, 0, 0, 0},
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y,    /* z */
-            UTIL_FORMAT_SWIZZLE_X,    /* s */
-            UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-            UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X,    /* z */
-            UTIL_FORMAT_SWIZZLE_Y,    /* s */
-            UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-            UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_s8_uint_z24_unorm_description =
-    {
-        PIPE_FORMAT_S8_UINT_Z24_UNORM,
-        "PIPE_FORMAT_S8_UINT_Z24_UNORM",
-        "s8_uint_z24_unorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        2,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        TRUE,  /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 8}, /* x = z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0},  /* y = s */
-         {0, 0, 0, 0, 0},
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0},  /* x = s */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 8}, /* y = z */
-         {0, 0, 0, 0, 0},
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X,    /* z */
-            UTIL_FORMAT_SWIZZLE_Y,    /* s */
-            UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-            UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Y,    /* z */
-            UTIL_FORMAT_SWIZZLE_X,    /* s */
-            UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-            UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_x24s8_uint_description = {
-    PIPE_FORMAT_X24S8_UINT,
-    "PIPE_FORMAT_X24S8_UINT",
-    "x24s8_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}, /* x = s */
-     {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 0},    /* y = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 0},    /* x = x */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}, /* y = s */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_X,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_Y,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_s8x24_uint_description = {
-    PIPE_FORMAT_S8X24_UINT,
-    "PIPE_FORMAT_S8X24_UINT",
-    "s8x24_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 8},   /* x = x */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* y = s */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = s */
-     {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 8},   /* y = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_Y,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_X,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_z24x8_unorm_description = {
-    PIPE_FORMAT_Z24X8_UNORM,
-    "PIPE_FORMAT_Z24X8_UNORM",
-    "z24x8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},    /* x = x */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 0}, /* y = z */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 0}, /* x = z */
-     {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},    /* y = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_x8z24_unorm_description = {
-    PIPE_FORMAT_X8Z24_UNORM,
-    "PIPE_FORMAT_X8Z24_UNORM",
-    "x8z24_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 8}, /* x = z */
-     {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},     /* y = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},     /* x = x */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 24, 8}, /* y = z */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y,    /* z */
-        UTIL_FORMAT_SWIZZLE_NONE, /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description
-    util_format_z32_float_s8x24_uint_description = {
-        PIPE_FORMAT_Z32_FLOAT_S8X24_UINT,
-        "PIPE_FORMAT_Z32_FLOAT_S8X24_UINT",
-        "z32_float_s8x24_uint",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        3,     /* nr_channels */
-        FALSE, /* is_array */
-        FALSE, /* is_bitmask */
-        TRUE,  /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* x = z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 8},   /* y = x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* z = s */
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},   /* x = z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 32}, /* y = s */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 40},   /* z = x */
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X,    /* z */
-            UTIL_FORMAT_SWIZZLE_Z,    /* s */
-            UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-            UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X,    /* z */
-            UTIL_FORMAT_SWIZZLE_Y,    /* s */
-            UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-            UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_x32_s8x24_uint_description = {
-    PIPE_FORMAT_X32_S8X24_UINT,
-    "PIPE_FORMAT_X32_S8X24_UINT",
-    "x32_s8x24_uint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 32},  /* x = x */
-     {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 8},   /* y = x */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* z = s */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0},    /* x = x */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 32}, /* y = s */
-     {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 24, 40},   /* z = x */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_Z,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_NONE, /* z */
-        UTIL_FORMAT_SWIZZLE_Y,    /* s */
-        UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-        UTIL_FORMAT_SWIZZLE_NONE  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_ZS,
-};
-
-const struct util_format_description util_format_uyvy_description = {
-    PIPE_FORMAT_UYVY,
-    "PIPE_FORMAT_UYVY",
-    "uyvy",
-    {2, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_SUBSAMPLED,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_1  /* ignored */
-    },
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_yuyv_description = {
-    PIPE_FORMAT_YUYV,
-    "PIPE_FORMAT_YUYV",
-    "yuyv",
-    {2, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_SUBSAMPLED,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_1  /* ignored */
-    },
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_r8g8_b8g8_unorm_description = {
-    PIPE_FORMAT_R8G8_B8G8_UNORM,
-    "PIPE_FORMAT_R8G8_B8G8_UNORM",
-    "r8g8_b8g8_unorm",
-    {2, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_SUBSAMPLED,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_g8r8_g8b8_unorm_description = {
-    PIPE_FORMAT_G8R8_G8B8_UNORM,
-    "PIPE_FORMAT_G8R8_G8B8_UNORM",
-    "g8r8_g8b8_unorm",
-    {2, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_SUBSAMPLED,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_g8r8_b8r8_unorm_description = {
-    PIPE_FORMAT_G8R8_B8R8_UNORM,
-    "PIPE_FORMAT_G8R8_B8R8_UNORM",
-    "g8r8_b8r8_unorm",
-    {2, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_SUBSAMPLED,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_r8b8_unorm_description = {
-    PIPE_FORMAT_R8G8_R8B8_UNORM,
-    "PIPE_FORMAT_R8G8_R8B8_UNORM",
-    "r8g8_r8b8_unorm",
-    {2, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_SUBSAMPLED,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r11g11b10_float_description = {
-    PIPE_FORMAT_R11G11B10_FLOAT,
-    "PIPE_FORMAT_R11G11B10_FLOAT",
-    "r11g11b10_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r9g9b9e5_float_description = {
-    PIPE_FORMAT_R9G9B9E5_FLOAT,
-    "PIPE_FORMAT_R9G9B9E5_FLOAT",
-    "r9g9b9e5_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r1_unorm_description = {
-    PIPE_FORMAT_R1_UNORM,
-    "PIPE_FORMAT_R1_UNORM",
-    "r1_unorm",
-    {8, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    1,                                            /* nr_channels */
-    FALSE,                                        /* is_array */
-    FALSE,                                        /* is_bitmask */
-    FALSE,                                        /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8bx_snorm_description = {
-    PIPE_FORMAT_R8G8Bx_SNORM,
-    "PIPE_FORMAT_R8G8Bx_SNORM",
-    "r8g8bx_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* x = x */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* y = y */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = x */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* y = y */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_dxt1_rgb_description = {
-    PIPE_FORMAT_DXT1_RGB,
-    "PIPE_FORMAT_DXT1_RGB",
-    "dxt1_rgb",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_dxt1_rgba_description = {
-    PIPE_FORMAT_DXT1_RGBA,
-    "PIPE_FORMAT_DXT1_RGBA",
-    "dxt1_rgba",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_dxt3_rgba_description = {
-    PIPE_FORMAT_DXT3_RGBA,
-    "PIPE_FORMAT_DXT3_RGBA",
-    "dxt3_rgba",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_dxt5_rgba_description = {
-    PIPE_FORMAT_DXT5_RGBA,
-    "PIPE_FORMAT_DXT5_RGBA",
-    "dxt5_rgba",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_dxt1_srgb_description = {
-    PIPE_FORMAT_DXT1_SRGB,
-    "PIPE_FORMAT_DXT1_SRGB",
-    "dxt1_srgb",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_dxt1_srgba_description = {
-    PIPE_FORMAT_DXT1_SRGBA,
-    "PIPE_FORMAT_DXT1_SRGBA",
-    "dxt1_srgba",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_dxt3_srgba_description = {
-    PIPE_FORMAT_DXT3_SRGBA,
-    "PIPE_FORMAT_DXT3_SRGBA",
-    "dxt3_srgba",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_dxt5_srgba_description = {
-    PIPE_FORMAT_DXT5_SRGBA,
-    "PIPE_FORMAT_DXT5_SRGBA",
-    "dxt5_srgba",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_S3TC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_rgtc1_unorm_description = {
-    PIPE_FORMAT_RGTC1_UNORM,
-    "PIPE_FORMAT_RGTC1_UNORM",
-    "rgtc1_unorm",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_rgtc1_snorm_description = {
-    PIPE_FORMAT_RGTC1_SNORM,
-    "PIPE_FORMAT_RGTC1_SNORM",
-    "rgtc1_snorm",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_rgtc2_unorm_description = {
-    PIPE_FORMAT_RGTC2_UNORM,
-    "PIPE_FORMAT_RGTC2_UNORM",
-    "rgtc2_unorm",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_rgtc2_snorm_description = {
-    PIPE_FORMAT_RGTC2_SNORM,
-    "PIPE_FORMAT_RGTC2_SNORM",
-    "rgtc2_snorm",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_latc1_unorm_description = {
-    PIPE_FORMAT_LATC1_UNORM,
-    "PIPE_FORMAT_LATC1_UNORM",
-    "latc1_unorm",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_latc1_snorm_description = {
-    PIPE_FORMAT_LATC1_SNORM,
-    "PIPE_FORMAT_LATC1_SNORM",
-    "latc1_snorm",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_latc2_unorm_description = {
-    PIPE_FORMAT_LATC2_UNORM,
-    "PIPE_FORMAT_LATC2_UNORM",
-    "latc2_unorm",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_latc2_snorm_description = {
-    PIPE_FORMAT_LATC2_SNORM,
-    "PIPE_FORMAT_LATC2_SNORM",
-    "latc2_snorm",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_RGTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_etc1_rgb8_description = {
-    PIPE_FORMAT_ETC1_RGB8,
-    "PIPE_FORMAT_ETC1_RGB8",
-    "etc1_rgb8",
-    {4, 4, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_ETC,
-    1,                                             /* nr_channels */
-    FALSE,                                         /* is_array */
-    FALSE,                                         /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 64, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_bptc_rgba_unorm_description = {
-    PIPE_FORMAT_BPTC_RGBA_UNORM,
-    "PIPE_FORMAT_BPTC_RGBA_UNORM",
-    "bptc_rgba_unorm",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_BPTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_bptc_srgba_description = {
-    PIPE_FORMAT_BPTC_SRGBA,
-    "PIPE_FORMAT_BPTC_SRGBA",
-    "bptc_srgba",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_BPTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_bptc_rgb_float_description = {
-    PIPE_FORMAT_BPTC_RGB_FLOAT,
-    "PIPE_FORMAT_BPTC_RGB_FLOAT",
-    "bptc_rgb_float",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_BPTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_bptc_rgb_ufloat_description = {
-    PIPE_FORMAT_BPTC_RGB_UFLOAT,
-    "PIPE_FORMAT_BPTC_RGB_UFLOAT",
-    "bptc_rgb_ufloat",
-    {4, 4, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_BPTC,
-    1,                                              /* nr_channels */
-    FALSE,                                          /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 128, 0}, /* x = x */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r64_float_description = {
-    PIPE_FORMAT_R64_FLOAT,
-    "PIPE_FORMAT_R64_FLOAT",
-    "r64_float",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r64g64_float_description = {
-    PIPE_FORMAT_R64G64_FLOAT,
-    "PIPE_FORMAT_R64G64_FLOAT",
-    "r64g64_float",
-    {1, 1, 128}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 64}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r64g64b64_float_description = {
-    PIPE_FORMAT_R64G64B64_FLOAT,
-    "PIPE_FORMAT_R64G64B64_FLOAT",
-    "r64g64b64_float",
-    {1, 1, 192}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 128}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 64},  /* y = g */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0},   /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0},   /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 64},  /* y = g */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 128}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r64g64b64a64_float_description = {
-        PIPE_FORMAT_R64G64B64A64_FLOAT,
-        "PIPE_FORMAT_R64G64B64A64_FLOAT",
-        "r64g64b64a64_float",
-        {1, 1, 256}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 192}, /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 128}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 64},  /* z = b */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0}    /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 0},   /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 64},  /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 128}, /* z = b */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 64, 192}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_float_description = {
-    PIPE_FORMAT_R32_FLOAT,
-    "PIPE_FORMAT_R32_FLOAT",
-    "r32_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_float_description = {
-    PIPE_FORMAT_R32G32_FLOAT,
-    "PIPE_FORMAT_R32G32_FLOAT",
-    "r32g32_float",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_float_description = {
-    PIPE_FORMAT_R32G32B32_FLOAT,
-    "PIPE_FORMAT_R32G32B32_FLOAT",
-    "r32g32b32_float",
-    {1, 1, 96}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 64}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32a32_float_description = {
-        PIPE_FORMAT_R32G32B32A32_FLOAT,
-        "PIPE_FORMAT_R32G32B32A32_FLOAT",
-        "r32g32b32a32_float",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_unorm_description = {
-    PIPE_FORMAT_R32_UNORM,
-    "PIPE_FORMAT_R32_UNORM",
-    "r32_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_unorm_description = {
-    PIPE_FORMAT_R32G32_UNORM,
-    "PIPE_FORMAT_R32G32_UNORM",
-    "r32g32_unorm",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_unorm_description = {
-    PIPE_FORMAT_R32G32B32_UNORM,
-    "PIPE_FORMAT_R32G32B32_UNORM",
-    "r32g32b32_unorm",
-    {1, 1, 96}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 64}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32a32_unorm_description = {
-        PIPE_FORMAT_R32G32B32A32_UNORM,
-        "PIPE_FORMAT_R32G32B32A32_UNORM",
-        "r32g32b32a32_unorm",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_uscaled_description = {
-    PIPE_FORMAT_R32_USCALED,
-    "PIPE_FORMAT_R32_USCALED",
-    "r32_uscaled",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                 /* nr_channels */
-    TRUE,                                              /* is_array */
-    TRUE,                                              /* is_bitmask */
-    FALSE,                                             /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_uscaled_description = {
-    PIPE_FORMAT_R32G32_USCALED,
-    "PIPE_FORMAT_R32G32_USCALED",
-    "r32g32_uscaled",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_uscaled_description =
-    {
-        PIPE_FORMAT_R32G32B32_USCALED,
-        "PIPE_FORMAT_R32G32B32_USCALED",
-        "r32g32b32_uscaled",
-        {1, 1, 96}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        3,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 64}, /* x = r */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0},  /* z = b */
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0},  /* x = r */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 64}, /* z = b */
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32a32_uscaled_description = {
-        PIPE_FORMAT_R32G32B32A32_USCALED,
-        "PIPE_FORMAT_R32G32B32A32_USCALED",
-        "r32g32b32a32_uscaled",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_snorm_description = {
-    PIPE_FORMAT_R32_SNORM,
-    "PIPE_FORMAT_R32_SNORM",
-    "r32_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_snorm_description = {
-    PIPE_FORMAT_R32G32_SNORM,
-    "PIPE_FORMAT_R32G32_SNORM",
-    "r32g32_snorm",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_snorm_description = {
-    PIPE_FORMAT_R32G32B32_SNORM,
-    "PIPE_FORMAT_R32G32B32_SNORM",
-    "r32g32b32_snorm",
-    {1, 1, 96}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 64}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32a32_snorm_description = {
-        PIPE_FORMAT_R32G32B32A32_SNORM,
-        "PIPE_FORMAT_R32G32B32A32_SNORM",
-        "r32g32b32a32_snorm",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_sscaled_description = {
-    PIPE_FORMAT_R32_SSCALED,
-    "PIPE_FORMAT_R32_SSCALED",
-    "r32_sscaled",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_sscaled_description = {
-    PIPE_FORMAT_R32G32_SSCALED,
-    "PIPE_FORMAT_R32G32_SSCALED",
-    "r32g32_sscaled",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_sscaled_description =
-    {
-        PIPE_FORMAT_R32G32B32_SSCALED,
-        "PIPE_FORMAT_R32G32B32_SSCALED",
-        "r32g32b32_sscaled",
-        {1, 1, 96}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        3,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 64}, /* x = r */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0},  /* z = b */
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0},  /* x = r */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 64}, /* z = b */
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32a32_sscaled_description = {
-        PIPE_FORMAT_R32G32B32A32_SSCALED,
-        "PIPE_FORMAT_R32G32B32A32_SSCALED",
-        "r32g32b32a32_sscaled",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_float_description = {
-    PIPE_FORMAT_R16_FLOAT,
-    "PIPE_FORMAT_R16_FLOAT",
-    "r16_float",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_float_description = {
-    PIPE_FORMAT_R16G16_FLOAT,
-    "PIPE_FORMAT_R16G16_FLOAT",
-    "r16g16_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_float_description = {
-    PIPE_FORMAT_R16G16B16_FLOAT,
-    "PIPE_FORMAT_R16G16B16_FLOAT",
-    "r16g16b16_float",
-    {1, 1, 48}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 32}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16a16_float_description = {
-        PIPE_FORMAT_R16G16B16A16_FLOAT,
-        "PIPE_FORMAT_R16G16B16A16_FLOAT",
-        "r16g16b16a16_float",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_unorm_description = {
-    PIPE_FORMAT_R16_UNORM,
-    "PIPE_FORMAT_R16_UNORM",
-    "r16_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_unorm_description = {
-    PIPE_FORMAT_R16G16_UNORM,
-    "PIPE_FORMAT_R16G16_UNORM",
-    "r16g16_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_unorm_description = {
-    PIPE_FORMAT_R16G16B16_UNORM,
-    "PIPE_FORMAT_R16G16B16_UNORM",
-    "r16g16b16_unorm",
-    {1, 1, 48}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 32}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16a16_unorm_description = {
-        PIPE_FORMAT_R16G16B16A16_UNORM,
-        "PIPE_FORMAT_R16G16B16A16_UNORM",
-        "r16g16b16a16_unorm",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_uscaled_description = {
-    PIPE_FORMAT_R16_USCALED,
-    "PIPE_FORMAT_R16_USCALED",
-    "r16_uscaled",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                 /* nr_channels */
-    TRUE,                                              /* is_array */
-    TRUE,                                              /* is_bitmask */
-    FALSE,                                             /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_uscaled_description = {
-    PIPE_FORMAT_R16G16_USCALED,
-    "PIPE_FORMAT_R16G16_USCALED",
-    "r16g16_uscaled",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_uscaled_description =
-    {
-        PIPE_FORMAT_R16G16B16_USCALED,
-        "PIPE_FORMAT_R16G16B16_USCALED",
-        "r16g16b16_uscaled",
-        {1, 1, 48}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        3,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 32}, /* x = r */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0},  /* z = b */
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0},  /* x = r */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 32}, /* z = b */
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16a16_uscaled_description = {
-        PIPE_FORMAT_R16G16B16A16_USCALED,
-        "PIPE_FORMAT_R16G16B16A16_USCALED",
-        "r16g16b16a16_uscaled",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_snorm_description = {
-    PIPE_FORMAT_R16_SNORM,
-    "PIPE_FORMAT_R16_SNORM",
-    "r16_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_snorm_description = {
-    PIPE_FORMAT_R16G16_SNORM,
-    "PIPE_FORMAT_R16G16_SNORM",
-    "r16g16_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_snorm_description = {
-    PIPE_FORMAT_R16G16B16_SNORM,
-    "PIPE_FORMAT_R16G16B16_SNORM",
-    "r16g16b16_snorm",
-    {1, 1, 48}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 32}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16a16_snorm_description = {
-        PIPE_FORMAT_R16G16B16A16_SNORM,
-        "PIPE_FORMAT_R16G16B16A16_SNORM",
-        "r16g16b16a16_snorm",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_sscaled_description = {
-    PIPE_FORMAT_R16_SSCALED,
-    "PIPE_FORMAT_R16_SSCALED",
-    "r16_sscaled",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_sscaled_description = {
-    PIPE_FORMAT_R16G16_SSCALED,
-    "PIPE_FORMAT_R16G16_SSCALED",
-    "r16g16_sscaled",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_sscaled_description =
-    {
-        PIPE_FORMAT_R16G16B16_SSCALED,
-        "PIPE_FORMAT_R16G16B16_SSCALED",
-        "r16g16b16_sscaled",
-        {1, 1, 48}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        3,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 32}, /* x = r */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0},  /* z = b */
-         {0, 0, 0, 0, 0}},
-#else
-        {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0},  /* x = r */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 32}, /* z = b */
-         {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16a16_sscaled_description = {
-        PIPE_FORMAT_R16G16B16A16_SSCALED,
-        "PIPE_FORMAT_R16G16B16A16_SSCALED",
-        "r16g16b16a16_sscaled",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8_unorm_description = {
-    PIPE_FORMAT_R8_UNORM,
-    "PIPE_FORMAT_R8_UNORM",
-    "r8_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_unorm_description = {
-    PIPE_FORMAT_R8G8_UNORM,
-    "PIPE_FORMAT_R8G8_UNORM",
-    "r8g8_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8_unorm_description = {
-    PIPE_FORMAT_R8G8B8_UNORM,
-    "PIPE_FORMAT_R8G8B8_UNORM",
-    "r8g8b8_unorm",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_unorm_description = {
-    PIPE_FORMAT_R8G8B8A8_UNORM,
-    "PIPE_FORMAT_R8G8B8A8_UNORM",
-    "r8g8b8a8_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8_uscaled_description = {
-    PIPE_FORMAT_R8_USCALED,
-    "PIPE_FORMAT_R8_USCALED",
-    "r8_uscaled",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_uscaled_description = {
-    PIPE_FORMAT_R8G8_USCALED,
-    "PIPE_FORMAT_R8G8_USCALED",
-    "r8g8_uscaled",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 8}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8_uscaled_description = {
-    PIPE_FORMAT_R8G8B8_USCALED,
-    "PIPE_FORMAT_R8G8B8_USCALED",
-    "r8g8b8_uscaled",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_uscaled_description =
-    {
-        PIPE_FORMAT_R8G8B8A8_USCALED,
-        "PIPE_FORMAT_R8G8B8A8_USCALED",
-        "r8g8b8a8_uscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 24}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 8},  /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 8},  /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 8, 24}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8_snorm_description = {
-    PIPE_FORMAT_R8_SNORM,
-    "PIPE_FORMAT_R8_SNORM",
-    "r8_snorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_snorm_description = {
-    PIPE_FORMAT_R8G8_SNORM,
-    "PIPE_FORMAT_R8G8_SNORM",
-    "r8g8_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8_snorm_description = {
-    PIPE_FORMAT_R8G8B8_SNORM,
-    "PIPE_FORMAT_R8G8B8_SNORM",
-    "r8g8b8_snorm",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_snorm_description = {
-    PIPE_FORMAT_R8G8B8A8_SNORM,
-    "PIPE_FORMAT_R8G8B8A8_SNORM",
-    "r8g8b8a8_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8_sscaled_description = {
-    PIPE_FORMAT_R8_SSCALED,
-    "PIPE_FORMAT_R8_SSCALED",
-    "r8_sscaled",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_sscaled_description = {
-    PIPE_FORMAT_R8G8_SSCALED,
-    "PIPE_FORMAT_R8G8_SSCALED",
-    "r8g8_sscaled",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 8}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8_sscaled_description = {
-    PIPE_FORMAT_R8G8B8_SSCALED,
-    "PIPE_FORMAT_R8G8B8_SSCALED",
-    "r8g8b8_sscaled",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_sscaled_description =
-    {
-        PIPE_FORMAT_R8G8B8A8_SSCALED,
-        "PIPE_FORMAT_R8G8B8A8_SSCALED",
-        "r8g8b8a8_sscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 24}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 8},  /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 8},  /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 8, 24}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_fixed_description = {
-    PIPE_FORMAT_R32_FIXED,
-    "PIPE_FORMAT_R32_FIXED",
-    "r32_fixed",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    FALSE,                                          /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_fixed_description = {
-    PIPE_FORMAT_R32G32_FIXED,
-    "PIPE_FORMAT_R32G32_FIXED",
-    "r32g32_fixed",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_fixed_description = {
-    PIPE_FORMAT_R32G32B32_FIXED,
-    "PIPE_FORMAT_R32G32B32_FIXED",
-    "r32g32b32_fixed",
-    {1, 1, 96}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 64}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32a32_fixed_description = {
-        PIPE_FORMAT_R32G32B32A32_FIXED,
-        "PIPE_FORMAT_R32G32B32A32_FIXED",
-        "r32g32b32a32_fixed",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_FIXED, FALSE, FALSE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r10g10b10x2_uscaled_description = {
-        PIPE_FORMAT_R10G10B10X2_USCALED,
-        "PIPE_FORMAT_R10G10B10X2_USCALED",
-        "r10g10b10x2_uscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30},      /* x = x */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30}       /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r10g10b10x2_snorm_description =
-    {
-        PIPE_FORMAT_R10G10B10X2_SNORM,
-        "PIPE_FORMAT_R10G10B10X2_SNORM",
-        "r10g10b10x2_snorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30},   /* x = x */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30}    /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_yv12_description = {
-    PIPE_FORMAT_YV12,
-    "PIPE_FORMAT_YV12",
-    "yv12",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}, /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}   /* w = w */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},  /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}  /* w = w */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_yv16_description = {
-    PIPE_FORMAT_YV16,
-    "PIPE_FORMAT_YV16",
-    "yv16",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}, /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}   /* w = w */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},  /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}  /* w = w */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_iyuv_description = {
-    PIPE_FORMAT_IYUV,
-    "PIPE_FORMAT_IYUV",
-    "iyuv",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}, /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}   /* w = w */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},  /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}  /* w = w */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_nv12_description = {
-    PIPE_FORMAT_NV12,
-    "PIPE_FORMAT_NV12",
-    "nv12",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}, /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}   /* w = w */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},  /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}  /* w = w */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_nv21_description = {
-    PIPE_FORMAT_NV21,
-    "PIPE_FORMAT_NV21",
-    "nv21",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_OTHER,
-    4,     /* nr_channels */
-    FALSE, /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}, /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}   /* w = w */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},  /* x = x */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 8},  /* y = y */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 16}, /* z = z */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}  /* w = w */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* y */
-        UTIL_FORMAT_SWIZZLE_Y, /* u */
-        UTIL_FORMAT_SWIZZLE_Z, /* v */
-        UTIL_FORMAT_SWIZZLE_W  /* ignored */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_YUV,
-};
-
-const struct util_format_description util_format_a4r4_unorm_description = {
-    PIPE_FORMAT_A4R4_UNORM,
-    "PIPE_FORMAT_A4R4_UNORM",
-    "a4r4_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r4a4_unorm_description = {
-    PIPE_FORMAT_R4A4_UNORM,
-    "PIPE_FORMAT_R4A4_UNORM",
-    "r4a4_unorm",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 4, 4}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8a8_unorm_description = {
-    PIPE_FORMAT_R8A8_UNORM,
-    "PIPE_FORMAT_R8A8_UNORM",
-    "r8a8_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8r8_unorm_description = {
-    PIPE_FORMAT_A8R8_UNORM,
-    "PIPE_FORMAT_A8R8_UNORM",
-    "a8r8_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r10g10b10a2_uscaled_description = {
-        PIPE_FORMAT_R10G10B10A2_USCALED,
-        "PIPE_FORMAT_R10G10B10A2_USCALED",
-        "r10g10b10a2_uscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r10g10b10a2_sscaled_description = {
-        PIPE_FORMAT_R10G10B10A2_SSCALED,
-        "PIPE_FORMAT_R10G10B10A2_SSCALED",
-        "r10g10b10a2_sscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r10g10b10a2_snorm_description =
-    {
-        PIPE_FORMAT_R10G10B10A2_SNORM,
-        "PIPE_FORMAT_R10G10B10A2_SNORM",
-        "r10g10b10a2_snorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_b10g10r10a2_uscaled_description = {
-        PIPE_FORMAT_B10G10R10A2_USCALED,
-        "PIPE_FORMAT_B10G10R10A2_USCALED",
-        "b10g10r10a2_uscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 20}, /* y = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 0}   /* w = b */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 0},  /* x = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 10, 20}, /* z = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_W, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Z, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_X, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_b10g10r10a2_sscaled_description = {
-        PIPE_FORMAT_B10G10R10A2_SSCALED,
-        "PIPE_FORMAT_B10G10R10A2_SSCALED",
-        "b10g10r10a2_sscaled",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 20}, /* y = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 0}   /* w = b */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 0},  /* x = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 10, 20}, /* z = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_W, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Z, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_X, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b10g10r10a2_snorm_description =
-    {
-        PIPE_FORMAT_B10G10R10A2_SNORM,
-        "PIPE_FORMAT_B10G10R10A2_SNORM",
-        "b10g10r10a2_snorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* y = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0}   /* w = b */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 0},  /* x = b */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 10, 20}, /* z = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_W, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Z, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_X, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8_uint_description = {
-    PIPE_FORMAT_R8_UINT,
-    "PIPE_FORMAT_R8_UINT",
-    "r8_uint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_uint_description = {
-    PIPE_FORMAT_R8G8_UINT,
-    "PIPE_FORMAT_R8G8_UINT",
-    "r8g8_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8_uint_description = {
-    PIPE_FORMAT_R8G8B8_UINT,
-    "PIPE_FORMAT_R8G8B8_UINT",
-    "r8g8b8_uint",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_uint_description = {
-    PIPE_FORMAT_R8G8B8A8_UINT,
-    "PIPE_FORMAT_R8G8B8A8_UINT",
-    "r8g8b8a8_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8_sint_description = {
-    PIPE_FORMAT_R8_SINT,
-    "PIPE_FORMAT_R8_SINT",
-    "r8_sint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8_sint_description = {
-    PIPE_FORMAT_R8G8_SINT,
-    "PIPE_FORMAT_R8G8_SINT",
-    "r8g8_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8_sint_description = {
-    PIPE_FORMAT_R8G8B8_SINT,
-    "PIPE_FORMAT_R8G8B8_SINT",
-    "r8g8b8_sint",
-    {1, 1, 24}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 16}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8a8_sint_description = {
-    PIPE_FORMAT_R8G8B8A8_SINT,
-    "PIPE_FORMAT_R8G8B8A8_SINT",
-    "r8g8b8a8_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}   /* w = a */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 24}  /* w = a */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_W  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_uint_description = {
-    PIPE_FORMAT_R16_UINT,
-    "PIPE_FORMAT_R16_UINT",
-    "r16_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_uint_description = {
-    PIPE_FORMAT_R16G16_UINT,
-    "PIPE_FORMAT_R16G16_UINT",
-    "r16g16_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_uint_description = {
-    PIPE_FORMAT_R16G16B16_UINT,
-    "PIPE_FORMAT_R16G16B16_UINT",
-    "r16g16b16_uint",
-    {1, 1, 48}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 32}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16a16_uint_description =
-    {
-        PIPE_FORMAT_R16G16B16A16_UINT,
-        "PIPE_FORMAT_R16G16B16A16_UINT",
-        "r16g16b16a16_uint",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16_sint_description = {
-    PIPE_FORMAT_R16_SINT,
-    "PIPE_FORMAT_R16_SINT",
-    "r16_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16_sint_description = {
-    PIPE_FORMAT_R16G16_SINT,
-    "PIPE_FORMAT_R16G16_SINT",
-    "r16g16_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16_sint_description = {
-    PIPE_FORMAT_R16G16B16_SINT,
-    "PIPE_FORMAT_R16G16B16_SINT",
-    "r16g16b16_sint",
-    {1, 1, 48}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 32}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16a16_sint_description =
-    {
-        PIPE_FORMAT_R16G16B16A16_SINT,
-        "PIPE_FORMAT_R16G16B16A16_SINT",
-        "r16g16b16a16_sint",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 48}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_uint_description = {
-    PIPE_FORMAT_R32_UINT,
-    "PIPE_FORMAT_R32_UINT",
-    "r32_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_uint_description = {
-    PIPE_FORMAT_R32G32_UINT,
-    "PIPE_FORMAT_R32G32_UINT",
-    "r32g32_uint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_uint_description = {
-    PIPE_FORMAT_R32G32B32_UINT,
-    "PIPE_FORMAT_R32G32B32_UINT",
-    "r32g32b32_uint",
-    {1, 1, 96}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 64}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32a32_uint_description =
-    {
-        PIPE_FORMAT_R32G32B32A32_UINT,
-        "PIPE_FORMAT_R32G32B32A32_UINT",
-        "r32g32b32a32_uint",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32_sint_description = {
-    PIPE_FORMAT_R32_SINT,
-    "PIPE_FORMAT_R32_SINT",
-    "r32_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0}, /* x = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32_sint_description = {
-    PIPE_FORMAT_R32G32_SINT,
-    "PIPE_FORMAT_R32G32_SINT",
-    "r32g32_sint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32_sint_description = {
-    PIPE_FORMAT_R32G32B32_SINT,
-    "PIPE_FORMAT_R32G32B32_SINT",
-    "r32g32b32_sint",
-    {1, 1, 96}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 64}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 64}, /* z = b */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32a32_sint_description =
-    {
-        PIPE_FORMAT_R32G32B32A32_SINT,
-        "PIPE_FORMAT_R32G32B32A32_SINT",
-        "r32g32b32a32_sint",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0}   /* w = a */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 96}  /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8_uint_description = {
-    PIPE_FORMAT_A8_UINT,
-    "PIPE_FORMAT_A8_UINT",
-    "a8_uint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i8_uint_description = {
-    PIPE_FORMAT_I8_UINT,
-    "PIPE_FORMAT_I8_UINT",
-    "i8_uint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8_uint_description = {
-    PIPE_FORMAT_L8_UINT,
-    "PIPE_FORMAT_L8_UINT",
-    "l8_uint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                               /* nr_channels */
-    TRUE,                                            /* is_array */
-    TRUE,                                            /* is_bitmask */
-    FALSE,                                           /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8a8_uint_description = {
-    PIPE_FORMAT_L8A8_UINT,
-    "PIPE_FORMAT_L8A8_UINT",
-    "l8a8_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8_sint_description = {
-    PIPE_FORMAT_A8_SINT,
-    "PIPE_FORMAT_A8_SINT",
-    "a8_sint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i8_sint_description = {
-    PIPE_FORMAT_I8_SINT,
-    "PIPE_FORMAT_I8_SINT",
-    "i8_sint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8_sint_description = {
-    PIPE_FORMAT_L8_SINT,
-    "PIPE_FORMAT_L8_SINT",
-    "l8_sint",
-    {1, 1, 8}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                             /* nr_channels */
-    TRUE,                                          /* is_array */
-    TRUE,                                          /* is_bitmask */
-    FALSE,                                         /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l8a8_sint_description = {
-    PIPE_FORMAT_L8A8_SINT,
-    "PIPE_FORMAT_L8A8_SINT",
-    "l8a8_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a16_uint_description = {
-    PIPE_FORMAT_A16_UINT,
-    "PIPE_FORMAT_A16_UINT",
-    "a16_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i16_uint_description = {
-    PIPE_FORMAT_I16_UINT,
-    "PIPE_FORMAT_I16_UINT",
-    "i16_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16_uint_description = {
-    PIPE_FORMAT_L16_UINT,
-    "PIPE_FORMAT_L16_UINT",
-    "l16_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16a16_uint_description = {
-    PIPE_FORMAT_L16A16_UINT,
-    "PIPE_FORMAT_L16A16_UINT",
-    "l16a16_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a16_sint_description = {
-    PIPE_FORMAT_A16_SINT,
-    "PIPE_FORMAT_A16_SINT",
-    "a16_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i16_sint_description = {
-    PIPE_FORMAT_I16_SINT,
-    "PIPE_FORMAT_I16_SINT",
-    "i16_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16_sint_description = {
-    PIPE_FORMAT_L16_SINT,
-    "PIPE_FORMAT_L16_SINT",
-    "l16_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l16a16_sint_description = {
-    PIPE_FORMAT_L16A16_SINT,
-    "PIPE_FORMAT_L16A16_SINT",
-    "l16a16_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a32_uint_description = {
-    PIPE_FORMAT_A32_UINT,
-    "PIPE_FORMAT_A32_UINT",
-    "a32_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i32_uint_description = {
-    PIPE_FORMAT_I32_UINT,
-    "PIPE_FORMAT_I32_UINT",
-    "i32_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l32_uint_description = {
-    PIPE_FORMAT_L32_UINT,
-    "PIPE_FORMAT_L32_UINT",
-    "l32_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                                /* nr_channels */
-    TRUE,                                             /* is_array */
-    TRUE,                                             /* is_bitmask */
-    FALSE,                                            /* is_mixed */
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l32a32_uint_description = {
-    PIPE_FORMAT_L32A32_UINT,
-    "PIPE_FORMAT_L32A32_UINT",
-    "l32a32_uint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a32_sint_description = {
-    PIPE_FORMAT_A32_SINT,
-    "PIPE_FORMAT_A32_SINT",
-    "a32_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0}, /* x = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_0, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_i32_sint_description = {
-    PIPE_FORMAT_I32_SINT,
-    "PIPE_FORMAT_I32_SINT",
-    "i32_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0}, /* x = rgba */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l32_sint_description = {
-    PIPE_FORMAT_L32_SINT,
-    "PIPE_FORMAT_L32_SINT",
-    "l32_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    1,                                              /* nr_channels */
-    TRUE,                                           /* is_array */
-    TRUE,                                           /* is_bitmask */
-    FALSE,                                          /* is_mixed */
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0}, /* x = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_l32a32_sint_description = {
-    PIPE_FORMAT_L32A32_SINT,
-    "PIPE_FORMAT_L32A32_SINT",
-    "l32a32_sint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* x = rgb */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_X, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b10g10r10a2_uint_description =
-    {
-        PIPE_FORMAT_B10G10R10A2_UINT,
-        "PIPE_FORMAT_B10G10R10A2_UINT",
-        "b10g10r10a2_uint",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 20}, /* y = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 0}   /* w = b */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 0},  /* x = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 20}, /* z = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_W, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Z, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_X, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8x8_snorm_description = {
-    PIPE_FORMAT_R8G8B8X8_SNORM,
-    "PIPE_FORMAT_R8G8B8X8_SNORM",
-    "r8g8b8x8_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}    /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}   /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8x8_srgb_description = {
-    PIPE_FORMAT_R8G8B8X8_SRGB,
-    "PIPE_FORMAT_R8G8B8X8_SRGB",
-    "r8g8b8x8_srgb",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}      /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}     /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_r8g8b8x8_uint_description = {
-    PIPE_FORMAT_R8G8B8X8_UINT,
-    "PIPE_FORMAT_R8G8B8X8_UINT",
-    "r8g8b8x8_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}      /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}     /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8g8b8x8_sint_description = {
-    PIPE_FORMAT_R8G8B8X8_SINT,
-    "PIPE_FORMAT_R8G8B8X8_SINT",
-    "r8g8b8x8_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 24}, /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 16}, /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8},  /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0}    /* w = x */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0},  /* x = r */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8},  /* y = g */
-        {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 16}, /* z = b */
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24}   /* w = x */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Z, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b10g10r10x2_unorm_description =
-    {
-        PIPE_FORMAT_B10G10R10X2_UNORM,
-        "PIPE_FORMAT_B10G10R10X2_UNORM",
-        "b10g10r10x2_unorm",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30},     /* x = x */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* y = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0}   /* w = b */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 0},  /* x = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 10, 20}, /* z = r */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 2, 30}      /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_Y, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_W, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_Z, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_X, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16x16_unorm_description = {
-        PIPE_FORMAT_R16G16B16X16_UNORM,
-        "PIPE_FORMAT_R16G16B16X16_UNORM",
-        "r16g16b16x16_unorm",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 0}      /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 48}     /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16x16_snorm_description = {
-        PIPE_FORMAT_R16G16B16X16_SNORM,
-        "PIPE_FORMAT_R16G16B16X16_SNORM",
-        "r16g16b16x16_snorm",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 0}    /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 48}   /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r16g16b16x16_float_description = {
-        PIPE_FORMAT_R16G16B16X16_FLOAT,
-        "PIPE_FORMAT_R16G16B16X16_FLOAT",
-        "r16g16b16x16_float",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 0}    /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 48}   /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16x16_uint_description =
-    {
-        PIPE_FORMAT_R16G16B16X16_UINT,
-        "PIPE_FORMAT_R16G16B16X16_UINT",
-        "r16g16b16x16_uint",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 0}      /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 48}     /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16g16b16x16_sint_description =
-    {
-        PIPE_FORMAT_R16G16B16X16_SINT,
-        "PIPE_FORMAT_R16G16B16X16_SINT",
-        "r16g16b16x16_sint",
-        {1, 1, 64}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 48}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 0}    /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 16, 48}   /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description
-    util_format_r32g32b32x32_float_description = {
-        PIPE_FORMAT_R32G32B32X32_FLOAT,
-        "PIPE_FORMAT_R32G32B32X32_FLOAT",
-        "r32g32b32x32_float",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}    /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 96}   /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32x32_uint_description =
-    {
-        PIPE_FORMAT_R32G32B32X32_UINT,
-        "PIPE_FORMAT_R32G32B32X32_UINT",
-        "r32g32b32x32_uint",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}      /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 96}     /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32g32b32x32_sint_description =
-    {
-        PIPE_FORMAT_R32G32B32X32_SINT,
-        "PIPE_FORMAT_R32G32B32X32_SINT",
-        "r32g32b32x32_sint",
-        {1, 1, 128}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        TRUE,  /* is_array */
-        FALSE, /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 96}, /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 64}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 0}    /* w = x */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = g */
-            {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 64}, /* z = b */
-            {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 32, 96}   /* w = x */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_1  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8a8_snorm_description = {
-    PIPE_FORMAT_R8A8_SNORM,
-    "PIPE_FORMAT_R8A8_SNORM",
-    "r8a8_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16a16_unorm_description = {
-    PIPE_FORMAT_R16A16_UNORM,
-    "PIPE_FORMAT_R16A16_UNORM",
-    "r16a16_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16a16_snorm_description = {
-    PIPE_FORMAT_R16A16_SNORM,
-    "PIPE_FORMAT_R16A16_SNORM",
-    "r16a16_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16a16_float_description = {
-    PIPE_FORMAT_R16A16_FLOAT,
-    "PIPE_FORMAT_R16A16_FLOAT",
-    "r16a16_float",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32a32_float_description = {
-    PIPE_FORMAT_R32A32_FLOAT,
-    "PIPE_FORMAT_R32A32_FLOAT",
-    "r32a32_float",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_FLOAT, FALSE, FALSE, 32, 32}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8a8_uint_description = {
-    PIPE_FORMAT_R8A8_UINT,
-    "PIPE_FORMAT_R8A8_UINT",
-    "r8a8_uint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r8a8_sint_description = {
-    PIPE_FORMAT_R8A8_SINT,
-    "PIPE_FORMAT_R8A8_SINT",
-    "r8a8_sint",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 0}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 8, 8}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16a16_uint_description = {
-    PIPE_FORMAT_R16A16_UINT,
-    "PIPE_FORMAT_R16A16_UINT",
-    "r16a16_uint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r16a16_sint_description = {
-    PIPE_FORMAT_R16A16_SINT,
-    "PIPE_FORMAT_R16A16_SINT",
-    "r16a16_sint",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 16, 16}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32a32_uint_description = {
-    PIPE_FORMAT_R32A32_UINT,
-    "PIPE_FORMAT_R32A32_UINT",
-    "r32a32_uint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 32, 32}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r32a32_sint_description = {
-    PIPE_FORMAT_R32A32_SINT,
-    "PIPE_FORMAT_R32A32_SINT",
-    "r32a32_sint",
-    {1, 1, 64}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    FALSE, /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 0},  /* x = r */
-     {UTIL_FORMAT_TYPE_SIGNED, FALSE, TRUE, 32, 32}, /* y = a */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* r */
-        UTIL_FORMAT_SWIZZLE_0, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_Y  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_r10g10b10a2_uint_description =
-    {
-        PIPE_FORMAT_R10G10B10A2_UINT,
-        "PIPE_FORMAT_R10G10B10A2_UINT",
-        "r10g10b10a2_uint",
-        {1, 1, 32}, /* block */
-        UTIL_FORMAT_LAYOUT_PLAIN,
-        4,     /* nr_channels */
-        FALSE, /* is_array */
-        TRUE,  /* is_bitmask */
-        FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 2, 30},  /* x = a */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 20}, /* y = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 10}, /* z = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 0}   /* w = r */
-        },
-#else
-        {
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 0},  /* x = r */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 10}, /* y = g */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 10, 20}, /* z = b */
-            {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, TRUE, 2, 30}   /* w = a */
-        },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-        {
-            UTIL_FORMAT_SWIZZLE_W, /* r */
-            UTIL_FORMAT_SWIZZLE_Z, /* g */
-            UTIL_FORMAT_SWIZZLE_Y, /* b */
-            UTIL_FORMAT_SWIZZLE_X  /* a */
-        },
-#else
-        {
-            UTIL_FORMAT_SWIZZLE_X, /* r */
-            UTIL_FORMAT_SWIZZLE_Y, /* g */
-            UTIL_FORMAT_SWIZZLE_Z, /* b */
-            UTIL_FORMAT_SWIZZLE_W  /* a */
-        },
-#endif
-        UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_b5g6r5_srgb_description = {
-    PIPE_FORMAT_B5G6R5_SRGB,
-    "PIPE_FORMAT_B5G6R5_SRGB",
-    "b5g6r5_srgb",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    3,     /* nr_channels */
-    FALSE, /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 11}, /* x = r */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 6, 5},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0},  /* z = b */
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 0},  /* x = b */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 6, 5},  /* y = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 5, 11}, /* z = r */
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_X, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Z, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Z, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_X, /* sb */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_a8l8_unorm_description = {
-    PIPE_FORMAT_A8L8_UNORM,
-    "PIPE_FORMAT_A8L8_UNORM",
-    "a8l8_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8l8_snorm_description = {
-    PIPE_FORMAT_A8L8_SNORM,
-    "PIPE_FORMAT_A8L8_SNORM",
-    "a8l8_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* x = a */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = a */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8l8_srgb_description = {
-    PIPE_FORMAT_A8L8_SRGB,
-    "PIPE_FORMAT_A8L8_SRGB",
-    "a8l8_srgb",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Y, /* sb */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* sr */
-        UTIL_FORMAT_SWIZZLE_Y, /* sg */
-        UTIL_FORMAT_SWIZZLE_Y, /* sb */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_SRGB,
-};
-
-const struct util_format_description util_format_a16l16_unorm_description = {
-    PIPE_FORMAT_A16L16_UNORM,
-    "PIPE_FORMAT_A16L16_UNORM",
-    "a16l16_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = a */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = rgb */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_Y, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_g8r8_unorm_description = {
-    PIPE_FORMAT_G8R8_UNORM,
-    "PIPE_FORMAT_G8R8_UNORM",
-    "g8r8_unorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* x = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 0}, /* x = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 8, 8}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_g8r8_snorm_description = {
-    PIPE_FORMAT_G8R8_SNORM,
-    "PIPE_FORMAT_G8R8_SNORM",
-    "g8r8_snorm",
-    {1, 1, 16}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* x = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}, /* x = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_g16r16_unorm_description = {
-    PIPE_FORMAT_G16R16_UNORM,
-    "PIPE_FORMAT_G16R16_UNORM",
-    "g16r16_unorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* x = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 0},  /* x = g */
-     {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, FALSE, 16, 16}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_g16r16_snorm_description = {
-    PIPE_FORMAT_G16R16_SNORM,
-    "PIPE_FORMAT_G16R16_SNORM",
-    "g16r16_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    2,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* x = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#else
-    {{UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 0},  /* x = g */
-     {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 16, 16}, /* y = r */
-     {0, 0, 0, 0, 0},
-     {0, 0, 0, 0, 0}},
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_Y, /* r */
-        UTIL_FORMAT_SWIZZLE_X, /* g */
-        UTIL_FORMAT_SWIZZLE_0, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_a8b8g8r8_snorm_description = {
-    PIPE_FORMAT_A8B8G8R8_SNORM,
-    "PIPE_FORMAT_A8B8G8R8_SNORM",
-    "a8b8g8r8_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24}, /* x = a */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* y = b */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}   /* w = r */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0},  /* x = a */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* y = b */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24}  /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_X  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description util_format_x8b8g8r8_snorm_description = {
-    PIPE_FORMAT_X8B8G8R8_SNORM,
-    "PIPE_FORMAT_X8B8G8R8_SNORM",
-    "x8b8g8r8_snorm",
-    {1, 1, 32}, /* block */
-    UTIL_FORMAT_LAYOUT_PLAIN,
-    4,     /* nr_channels */
-    TRUE,  /* is_array */
-    TRUE,  /* is_bitmask */
-    FALSE, /* is_mixed */
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 24},  /* x = x */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* y = b */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* z = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 0}   /* w = r */
-    },
-#else
-    {
-        {UTIL_FORMAT_TYPE_VOID, FALSE, FALSE, 8, 0},   /* x = x */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 8},  /* y = b */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 16}, /* z = g */
-        {UTIL_FORMAT_TYPE_SIGNED, TRUE, FALSE, 8, 24}  /* w = r */
-    },
-#endif
-#ifdef PIPE_ARCH_BIG_ENDIAN
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#else
-    {
-        UTIL_FORMAT_SWIZZLE_W, /* r */
-        UTIL_FORMAT_SWIZZLE_Z, /* g */
-        UTIL_FORMAT_SWIZZLE_Y, /* b */
-        UTIL_FORMAT_SWIZZLE_1  /* a */
-    },
-#endif
-    UTIL_FORMAT_COLORSPACE_RGB,
-};
-
-const struct util_format_description *
-util_format_description(enum pipe_format format) {
-  if (format >= PIPE_FORMAT_COUNT) {
-    return NULL;
-  }
-
-  switch (format) {
-  case PIPE_FORMAT_NONE:
-    return &util_format_none_description;
-  case PIPE_FORMAT_B8G8R8A8_UNORM:
-    return &util_format_b8g8r8a8_unorm_description;
-  case PIPE_FORMAT_B8G8R8X8_UNORM:
-    return &util_format_b8g8r8x8_unorm_description;
-  case PIPE_FORMAT_A8R8G8B8_UNORM:
-    return &util_format_a8r8g8b8_unorm_description;
-  case PIPE_FORMAT_X8R8G8B8_UNORM:
-    return &util_format_x8r8g8b8_unorm_description;
-  case PIPE_FORMAT_A8B8G8R8_UNORM:
-    return &util_format_a8b8g8r8_unorm_description;
-  case PIPE_FORMAT_X8B8G8R8_UNORM:
-    return &util_format_x8b8g8r8_unorm_description;
-  case PIPE_FORMAT_R8G8B8X8_UNORM:
-    return &util_format_r8g8b8x8_unorm_description;
-  case PIPE_FORMAT_B5G5R5X1_UNORM:
-    return &util_format_b5g5r5x1_unorm_description;
-  case PIPE_FORMAT_B5G5R5A1_UNORM:
-    return &util_format_b5g5r5a1_unorm_description;
-  case PIPE_FORMAT_B4G4R4A4_UNORM:
-    return &util_format_b4g4r4a4_unorm_description;
-  case PIPE_FORMAT_B4G4R4X4_UNORM:
-    return &util_format_b4g4r4x4_unorm_description;
-  case PIPE_FORMAT_A4B4G4R4_UNORM:
-    return &util_format_a4b4g4r4_unorm_description;
-  case PIPE_FORMAT_B5G6R5_UNORM:
-    return &util_format_b5g6r5_unorm_description;
-  case PIPE_FORMAT_R10G10B10A2_UNORM:
-    return &util_format_r10g10b10a2_unorm_description;
-  case PIPE_FORMAT_R10G10B10X2_UNORM:
-    return &util_format_r10g10b10x2_unorm_description;
-  case PIPE_FORMAT_B10G10R10A2_UNORM:
-    return &util_format_b10g10r10a2_unorm_description;
-  case PIPE_FORMAT_B2G3R3_UNORM:
-    return &util_format_b2g3r3_unorm_description;
-  case PIPE_FORMAT_L8_UNORM:
-    return &util_format_l8_unorm_description;
-  case PIPE_FORMAT_A8_UNORM:
-    return &util_format_a8_unorm_description;
-  case PIPE_FORMAT_I8_UNORM:
-    return &util_format_i8_unorm_description;
-  case PIPE_FORMAT_L4A4_UNORM:
-    return &util_format_l4a4_unorm_description;
-  case PIPE_FORMAT_L8A8_UNORM:
-    return &util_format_l8a8_unorm_description;
-  case PIPE_FORMAT_L16_UNORM:
-    return &util_format_l16_unorm_description;
-  case PIPE_FORMAT_A16_UNORM:
-    return &util_format_a16_unorm_description;
-  case PIPE_FORMAT_I16_UNORM:
-    return &util_format_i16_unorm_description;
-  case PIPE_FORMAT_L16A16_UNORM:
-    return &util_format_l16a16_unorm_description;
-  case PIPE_FORMAT_A8_SNORM:
-    return &util_format_a8_snorm_description;
-  case PIPE_FORMAT_L8_SNORM:
-    return &util_format_l8_snorm_description;
-  case PIPE_FORMAT_L8A8_SNORM:
-    return &util_format_l8a8_snorm_description;
-  case PIPE_FORMAT_I8_SNORM:
-    return &util_format_i8_snorm_description;
-  case PIPE_FORMAT_A16_SNORM:
-    return &util_format_a16_snorm_description;
-  case PIPE_FORMAT_L16_SNORM:
-    return &util_format_l16_snorm_description;
-  case PIPE_FORMAT_L16A16_SNORM:
-    return &util_format_l16a16_snorm_description;
-  case PIPE_FORMAT_I16_SNORM:
-    return &util_format_i16_snorm_description;
-  case PIPE_FORMAT_A16_FLOAT:
-    return &util_format_a16_float_description;
-  case PIPE_FORMAT_L16_FLOAT:
-    return &util_format_l16_float_description;
-  case PIPE_FORMAT_L16A16_FLOAT:
-    return &util_format_l16a16_float_description;
-  case PIPE_FORMAT_I16_FLOAT:
-    return &util_format_i16_float_description;
-  case PIPE_FORMAT_A32_FLOAT:
-    return &util_format_a32_float_description;
-  case PIPE_FORMAT_L32_FLOAT:
-    return &util_format_l32_float_description;
-  case PIPE_FORMAT_L32A32_FLOAT:
-    return &util_format_l32a32_float_description;
-  case PIPE_FORMAT_I32_FLOAT:
-    return &util_format_i32_float_description;
-  case PIPE_FORMAT_L8_SRGB:
-    return &util_format_l8_srgb_description;
-  case PIPE_FORMAT_R8_SRGB:
-    return &util_format_r8_srgb_description;
-  case PIPE_FORMAT_L8A8_SRGB:
-    return &util_format_l8a8_srgb_description;
-  case PIPE_FORMAT_R8G8B8_SRGB:
-    return &util_format_r8g8b8_srgb_description;
-  case PIPE_FORMAT_R8G8B8A8_SRGB:
-    return &util_format_r8g8b8a8_srgb_description;
-  case PIPE_FORMAT_A8B8G8R8_SRGB:
-    return &util_format_a8b8g8r8_srgb_description;
-  case PIPE_FORMAT_X8B8G8R8_SRGB:
-    return &util_format_x8b8g8r8_srgb_description;
-  case PIPE_FORMAT_B8G8R8A8_SRGB:
-    return &util_format_b8g8r8a8_srgb_description;
-  case PIPE_FORMAT_B8G8R8X8_SRGB:
-    return &util_format_b8g8r8x8_srgb_description;
-  case PIPE_FORMAT_A8R8G8B8_SRGB:
-    return &util_format_a8r8g8b8_srgb_description;
-  case PIPE_FORMAT_X8R8G8B8_SRGB:
-    return &util_format_x8r8g8b8_srgb_description;
-  case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
-    return &util_format_r8sg8sb8ux8u_norm_description;
-  case PIPE_FORMAT_R10SG10SB10SA2U_NORM:
-    return &util_format_r10sg10sb10sa2u_norm_description;
-  case PIPE_FORMAT_R5SG5SB6U_NORM:
-    return &util_format_r5sg5sb6u_norm_description;
-  case PIPE_FORMAT_S8_UINT:
-    return &util_format_s8_uint_description;
-  case PIPE_FORMAT_Z16_UNORM:
-    return &util_format_z16_unorm_description;
-  case PIPE_FORMAT_Z32_UNORM:
-    return &util_format_z32_unorm_description;
-  case PIPE_FORMAT_Z32_FLOAT:
-    return &util_format_z32_float_description;
-  case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-    return &util_format_z24_unorm_s8_uint_description;
-  case PIPE_FORMAT_S8_UINT_Z24_UNORM:
-    return &util_format_s8_uint_z24_unorm_description;
-  case PIPE_FORMAT_X24S8_UINT:
-    return &util_format_x24s8_uint_description;
-  case PIPE_FORMAT_S8X24_UINT:
-    return &util_format_s8x24_uint_description;
-  case PIPE_FORMAT_Z24X8_UNORM:
-    return &util_format_z24x8_unorm_description;
-  case PIPE_FORMAT_X8Z24_UNORM:
-    return &util_format_x8z24_unorm_description;
-  case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
-    return &util_format_z32_float_s8x24_uint_description;
-  case PIPE_FORMAT_X32_S8X24_UINT:
-    return &util_format_x32_s8x24_uint_description;
-  case PIPE_FORMAT_UYVY:
-    return &util_format_uyvy_description;
-  case PIPE_FORMAT_YUYV:
-    return &util_format_yuyv_description;
-  case PIPE_FORMAT_R8G8_B8G8_UNORM:
-    return &util_format_r8g8_b8g8_unorm_description;
-  case PIPE_FORMAT_G8R8_G8B8_UNORM:
-    return &util_format_g8r8_g8b8_unorm_description;
-  case PIPE_FORMAT_G8R8_B8R8_UNORM:
-    return &util_format_g8r8_b8r8_unorm_description;
-  case PIPE_FORMAT_R8G8_R8B8_UNORM:
-    return &util_format_r8g8_r8b8_unorm_description;
-  case PIPE_FORMAT_R11G11B10_FLOAT:
-    return &util_format_r11g11b10_float_description;
-  case PIPE_FORMAT_R9G9B9E5_FLOAT:
-    return &util_format_r9g9b9e5_float_description;
-  case PIPE_FORMAT_R1_UNORM:
-    return &util_format_r1_unorm_description;
-  case PIPE_FORMAT_R8G8Bx_SNORM:
-    return &util_format_r8g8bx_snorm_description;
-  case PIPE_FORMAT_DXT1_RGB:
-    return &util_format_dxt1_rgb_description;
-  case PIPE_FORMAT_DXT1_RGBA:
-    return &util_format_dxt1_rgba_description;
-  case PIPE_FORMAT_DXT3_RGBA:
-    return &util_format_dxt3_rgba_description;
-  case PIPE_FORMAT_DXT5_RGBA:
-    return &util_format_dxt5_rgba_description;
-  case PIPE_FORMAT_DXT1_SRGB:
-    return &util_format_dxt1_srgb_description;
-  case PIPE_FORMAT_DXT1_SRGBA:
-    return &util_format_dxt1_srgba_description;
-  case PIPE_FORMAT_DXT3_SRGBA:
-    return &util_format_dxt3_srgba_description;
-  case PIPE_FORMAT_DXT5_SRGBA:
-    return &util_format_dxt5_srgba_description;
-  case PIPE_FORMAT_RGTC1_UNORM:
-    return &util_format_rgtc1_unorm_description;
-  case PIPE_FORMAT_RGTC1_SNORM:
-    return &util_format_rgtc1_snorm_description;
-  case PIPE_FORMAT_RGTC2_UNORM:
-    return &util_format_rgtc2_unorm_description;
-  case PIPE_FORMAT_RGTC2_SNORM:
-    return &util_format_rgtc2_snorm_description;
-  case PIPE_FORMAT_LATC1_UNORM:
-    return &util_format_latc1_unorm_description;
-  case PIPE_FORMAT_LATC1_SNORM:
-    return &util_format_latc1_snorm_description;
-  case PIPE_FORMAT_LATC2_UNORM:
-    return &util_format_latc2_unorm_description;
-  case PIPE_FORMAT_LATC2_SNORM:
-    return &util_format_latc2_snorm_description;
-  case PIPE_FORMAT_ETC1_RGB8:
-    return &util_format_etc1_rgb8_description;
-  case PIPE_FORMAT_BPTC_RGBA_UNORM:
-    return &util_format_bptc_rgba_unorm_description;
-  case PIPE_FORMAT_BPTC_SRGBA:
-    return &util_format_bptc_srgba_description;
-  case PIPE_FORMAT_BPTC_RGB_FLOAT:
-    return &util_format_bptc_rgb_float_description;
-  case PIPE_FORMAT_BPTC_RGB_UFLOAT:
-    return &util_format_bptc_rgb_ufloat_description;
-  case PIPE_FORMAT_R64_FLOAT:
-    return &util_format_r64_float_description;
-  case PIPE_FORMAT_R64G64_FLOAT:
-    return &util_format_r64g64_float_description;
-  case PIPE_FORMAT_R64G64B64_FLOAT:
-    return &util_format_r64g64b64_float_description;
-  case PIPE_FORMAT_R64G64B64A64_FLOAT:
-    return &util_format_r64g64b64a64_float_description;
-  case PIPE_FORMAT_R32_FLOAT:
-    return &util_format_r32_float_description;
-  case PIPE_FORMAT_R32G32_FLOAT:
-    return &util_format_r32g32_float_description;
-  case PIPE_FORMAT_R32G32B32_FLOAT:
-    return &util_format_r32g32b32_float_description;
-  case PIPE_FORMAT_R32G32B32A32_FLOAT:
-    return &util_format_r32g32b32a32_float_description;
-  case PIPE_FORMAT_R32_UNORM:
-    return &util_format_r32_unorm_description;
-  case PIPE_FORMAT_R32G32_UNORM:
-    return &util_format_r32g32_unorm_description;
-  case PIPE_FORMAT_R32G32B32_UNORM:
-    return &util_format_r32g32b32_unorm_description;
-  case PIPE_FORMAT_R32G32B32A32_UNORM:
-    return &util_format_r32g32b32a32_unorm_description;
-  case PIPE_FORMAT_R32_USCALED:
-    return &util_format_r32_uscaled_description;
-  case PIPE_FORMAT_R32G32_USCALED:
-    return &util_format_r32g32_uscaled_description;
-  case PIPE_FORMAT_R32G32B32_USCALED:
-    return &util_format_r32g32b32_uscaled_description;
-  case PIPE_FORMAT_R32G32B32A32_USCALED:
-    return &util_format_r32g32b32a32_uscaled_description;
-  case PIPE_FORMAT_R32_SNORM:
-    return &util_format_r32_snorm_description;
-  case PIPE_FORMAT_R32G32_SNORM:
-    return &util_format_r32g32_snorm_description;
-  case PIPE_FORMAT_R32G32B32_SNORM:
-    return &util_format_r32g32b32_snorm_description;
-  case PIPE_FORMAT_R32G32B32A32_SNORM:
-    return &util_format_r32g32b32a32_snorm_description;
-  case PIPE_FORMAT_R32_SSCALED:
-    return &util_format_r32_sscaled_description;
-  case PIPE_FORMAT_R32G32_SSCALED:
-    return &util_format_r32g32_sscaled_description;
-  case PIPE_FORMAT_R32G32B32_SSCALED:
-    return &util_format_r32g32b32_sscaled_description;
-  case PIPE_FORMAT_R32G32B32A32_SSCALED:
-    return &util_format_r32g32b32a32_sscaled_description;
-  case PIPE_FORMAT_R16_FLOAT:
-    return &util_format_r16_float_description;
-  case PIPE_FORMAT_R16G16_FLOAT:
-    return &util_format_r16g16_float_description;
-  case PIPE_FORMAT_R16G16B16_FLOAT:
-    return &util_format_r16g16b16_float_description;
-  case PIPE_FORMAT_R16G16B16A16_FLOAT:
-    return &util_format_r16g16b16a16_float_description;
-  case PIPE_FORMAT_R16_UNORM:
-    return &util_format_r16_unorm_description;
-  case PIPE_FORMAT_R16G16_UNORM:
-    return &util_format_r16g16_unorm_description;
-  case PIPE_FORMAT_R16G16B16_UNORM:
-    return &util_format_r16g16b16_unorm_description;
-  case PIPE_FORMAT_R16G16B16A16_UNORM:
-    return &util_format_r16g16b16a16_unorm_description;
-  case PIPE_FORMAT_R16_USCALED:
-    return &util_format_r16_uscaled_description;
-  case PIPE_FORMAT_R16G16_USCALED:
-    return &util_format_r16g16_uscaled_description;
-  case PIPE_FORMAT_R16G16B16_USCALED:
-    return &util_format_r16g16b16_uscaled_description;
-  case PIPE_FORMAT_R16G16B16A16_USCALED:
-    return &util_format_r16g16b16a16_uscaled_description;
-  case PIPE_FORMAT_R16_SNORM:
-    return &util_format_r16_snorm_description;
-  case PIPE_FORMAT_R16G16_SNORM:
-    return &util_format_r16g16_snorm_description;
-  case PIPE_FORMAT_R16G16B16_SNORM:
-    return &util_format_r16g16b16_snorm_description;
-  case PIPE_FORMAT_R16G16B16A16_SNORM:
-    return &util_format_r16g16b16a16_snorm_description;
-  case PIPE_FORMAT_R16_SSCALED:
-    return &util_format_r16_sscaled_description;
-  case PIPE_FORMAT_R16G16_SSCALED:
-    return &util_format_r16g16_sscaled_description;
-  case PIPE_FORMAT_R16G16B16_SSCALED:
-    return &util_format_r16g16b16_sscaled_description;
-  case PIPE_FORMAT_R16G16B16A16_SSCALED:
-    return &util_format_r16g16b16a16_sscaled_description;
-  case PIPE_FORMAT_R8_UNORM:
-    return &util_format_r8_unorm_description;
-  case PIPE_FORMAT_R8G8_UNORM:
-    return &util_format_r8g8_unorm_description;
-  case PIPE_FORMAT_R8G8B8_UNORM:
-    return &util_format_r8g8b8_unorm_description;
-  case PIPE_FORMAT_R8G8B8A8_UNORM:
-    return &util_format_r8g8b8a8_unorm_description;
-  case PIPE_FORMAT_R8_USCALED:
-    return &util_format_r8_uscaled_description;
-  case PIPE_FORMAT_R8G8_USCALED:
-    return &util_format_r8g8_uscaled_description;
-  case PIPE_FORMAT_R8G8B8_USCALED:
-    return &util_format_r8g8b8_uscaled_description;
-  case PIPE_FORMAT_R8G8B8A8_USCALED:
-    return &util_format_r8g8b8a8_uscaled_description;
-  case PIPE_FORMAT_R8_SNORM:
-    return &util_format_r8_snorm_description;
-  case PIPE_FORMAT_R8G8_SNORM:
-    return &util_format_r8g8_snorm_description;
-  case PIPE_FORMAT_R8G8B8_SNORM:
-    return &util_format_r8g8b8_snorm_description;
-  case PIPE_FORMAT_R8G8B8A8_SNORM:
-    return &util_format_r8g8b8a8_snorm_description;
-  case PIPE_FORMAT_R8_SSCALED:
-    return &util_format_r8_sscaled_description;
-  case PIPE_FORMAT_R8G8_SSCALED:
-    return &util_format_r8g8_sscaled_description;
-  case PIPE_FORMAT_R8G8B8_SSCALED:
-    return &util_format_r8g8b8_sscaled_description;
-  case PIPE_FORMAT_R8G8B8A8_SSCALED:
-    return &util_format_r8g8b8a8_sscaled_description;
-  case PIPE_FORMAT_R32_FIXED:
-    return &util_format_r32_fixed_description;
-  case PIPE_FORMAT_R32G32_FIXED:
-    return &util_format_r32g32_fixed_description;
-  case PIPE_FORMAT_R32G32B32_FIXED:
-    return &util_format_r32g32b32_fixed_description;
-  case PIPE_FORMAT_R32G32B32A32_FIXED:
-    return &util_format_r32g32b32a32_fixed_description;
-  case PIPE_FORMAT_R10G10B10X2_USCALED:
-    return &util_format_r10g10b10x2_uscaled_description;
-  case PIPE_FORMAT_R10G10B10X2_SNORM:
-    return &util_format_r10g10b10x2_snorm_description;
-  case PIPE_FORMAT_YV12:
-    return &util_format_yv12_description;
-  case PIPE_FORMAT_YV16:
-    return &util_format_yv16_description;
-  case PIPE_FORMAT_IYUV:
-    return &util_format_iyuv_description;
-  case PIPE_FORMAT_NV12:
-    return &util_format_nv12_description;
-  case PIPE_FORMAT_NV21:
-    return &util_format_nv21_description;
-  case PIPE_FORMAT_A4R4_UNORM:
-    return &util_format_a4r4_unorm_description;
-  case PIPE_FORMAT_R4A4_UNORM:
-    return &util_format_r4a4_unorm_description;
-  case PIPE_FORMAT_R8A8_UNORM:
-    return &util_format_r8a8_unorm_description;
-  case PIPE_FORMAT_A8R8_UNORM:
-    return &util_format_a8r8_unorm_description;
-  case PIPE_FORMAT_R10G10B10A2_USCALED:
-    return &util_format_r10g10b10a2_uscaled_description;
-  case PIPE_FORMAT_R10G10B10A2_SSCALED:
-    return &util_format_r10g10b10a2_sscaled_description;
-  case PIPE_FORMAT_R10G10B10A2_SNORM:
-    return &util_format_r10g10b10a2_snorm_description;
-  case PIPE_FORMAT_B10G10R10A2_USCALED:
-    return &util_format_b10g10r10a2_uscaled_description;
-  case PIPE_FORMAT_B10G10R10A2_SSCALED:
-    return &util_format_b10g10r10a2_sscaled_description;
-  case PIPE_FORMAT_B10G10R10A2_SNORM:
-    return &util_format_b10g10r10a2_snorm_description;
-  case PIPE_FORMAT_R8_UINT:
-    return &util_format_r8_uint_description;
-  case PIPE_FORMAT_R8G8_UINT:
-    return &util_format_r8g8_uint_description;
-  case PIPE_FORMAT_R8G8B8_UINT:
-    return &util_format_r8g8b8_uint_description;
-  case PIPE_FORMAT_R8G8B8A8_UINT:
-    return &util_format_r8g8b8a8_uint_description;
-  case PIPE_FORMAT_R8_SINT:
-    return &util_format_r8_sint_description;
-  case PIPE_FORMAT_R8G8_SINT:
-    return &util_format_r8g8_sint_description;
-  case PIPE_FORMAT_R8G8B8_SINT:
-    return &util_format_r8g8b8_sint_description;
-  case PIPE_FORMAT_R8G8B8A8_SINT:
-    return &util_format_r8g8b8a8_sint_description;
-  case PIPE_FORMAT_R16_UINT:
-    return &util_format_r16_uint_description;
-  case PIPE_FORMAT_R16G16_UINT:
-    return &util_format_r16g16_uint_description;
-  case PIPE_FORMAT_R16G16B16_UINT:
-    return &util_format_r16g16b16_uint_description;
-  case PIPE_FORMAT_R16G16B16A16_UINT:
-    return &util_format_r16g16b16a16_uint_description;
-  case PIPE_FORMAT_R16_SINT:
-    return &util_format_r16_sint_description;
-  case PIPE_FORMAT_R16G16_SINT:
-    return &util_format_r16g16_sint_description;
-  case PIPE_FORMAT_R16G16B16_SINT:
-    return &util_format_r16g16b16_sint_description;
-  case PIPE_FORMAT_R16G16B16A16_SINT:
-    return &util_format_r16g16b16a16_sint_description;
-  case PIPE_FORMAT_R32_UINT:
-    return &util_format_r32_uint_description;
-  case PIPE_FORMAT_R32G32_UINT:
-    return &util_format_r32g32_uint_description;
-  case PIPE_FORMAT_R32G32B32_UINT:
-    return &util_format_r32g32b32_uint_description;
-  case PIPE_FORMAT_R32G32B32A32_UINT:
-    return &util_format_r32g32b32a32_uint_description;
-  case PIPE_FORMAT_R32_SINT:
-    return &util_format_r32_sint_description;
-  case PIPE_FORMAT_R32G32_SINT:
-    return &util_format_r32g32_sint_description;
-  case PIPE_FORMAT_R32G32B32_SINT:
-    return &util_format_r32g32b32_sint_description;
-  case PIPE_FORMAT_R32G32B32A32_SINT:
-    return &util_format_r32g32b32a32_sint_description;
-  case PIPE_FORMAT_A8_UINT:
-    return &util_format_a8_uint_description;
-  case PIPE_FORMAT_I8_UINT:
-    return &util_format_i8_uint_description;
-  case PIPE_FORMAT_L8_UINT:
-    return &util_format_l8_uint_description;
-  case PIPE_FORMAT_L8A8_UINT:
-    return &util_format_l8a8_uint_description;
-  case PIPE_FORMAT_A8_SINT:
-    return &util_format_a8_sint_description;
-  case PIPE_FORMAT_I8_SINT:
-    return &util_format_i8_sint_description;
-  case PIPE_FORMAT_L8_SINT:
-    return &util_format_l8_sint_description;
-  case PIPE_FORMAT_L8A8_SINT:
-    return &util_format_l8a8_sint_description;
-  case PIPE_FORMAT_A16_UINT:
-    return &util_format_a16_uint_description;
-  case PIPE_FORMAT_I16_UINT:
-    return &util_format_i16_uint_description;
-  case PIPE_FORMAT_L16_UINT:
-    return &util_format_l16_uint_description;
-  case PIPE_FORMAT_L16A16_UINT:
-    return &util_format_l16a16_uint_description;
-  case PIPE_FORMAT_A16_SINT:
-    return &util_format_a16_sint_description;
-  case PIPE_FORMAT_I16_SINT:
-    return &util_format_i16_sint_description;
-  case PIPE_FORMAT_L16_SINT:
-    return &util_format_l16_sint_description;
-  case PIPE_FORMAT_L16A16_SINT:
-    return &util_format_l16a16_sint_description;
-  case PIPE_FORMAT_A32_UINT:
-    return &util_format_a32_uint_description;
-  case PIPE_FORMAT_I32_UINT:
-    return &util_format_i32_uint_description;
-  case PIPE_FORMAT_L32_UINT:
-    return &util_format_l32_uint_description;
-  case PIPE_FORMAT_L32A32_UINT:
-    return &util_format_l32a32_uint_description;
-  case PIPE_FORMAT_A32_SINT:
-    return &util_format_a32_sint_description;
-  case PIPE_FORMAT_I32_SINT:
-    return &util_format_i32_sint_description;
-  case PIPE_FORMAT_L32_SINT:
-    return &util_format_l32_sint_description;
-  case PIPE_FORMAT_L32A32_SINT:
-    return &util_format_l32a32_sint_description;
-  case PIPE_FORMAT_B10G10R10A2_UINT:
-    return &util_format_b10g10r10a2_uint_description;
-  case PIPE_FORMAT_R8G8B8X8_SNORM:
-    return &util_format_r8g8b8x8_snorm_description;
-  case PIPE_FORMAT_R8G8B8X8_SRGB:
-    return &util_format_r8g8b8x8_srgb_description;
-  case PIPE_FORMAT_R8G8B8X8_UINT:
-    return &util_format_r8g8b8x8_uint_description;
-  case PIPE_FORMAT_R8G8B8X8_SINT:
-    return &util_format_r8g8b8x8_sint_description;
-  case PIPE_FORMAT_B10G10R10X2_UNORM:
-    return &util_format_b10g10r10x2_unorm_description;
-  case PIPE_FORMAT_R16G16B16X16_UNORM:
-    return &util_format_r16g16b16x16_unorm_description;
-  case PIPE_FORMAT_R16G16B16X16_SNORM:
-    return &util_format_r16g16b16x16_snorm_description;
-  case PIPE_FORMAT_R16G16B16X16_FLOAT:
-    return &util_format_r16g16b16x16_float_description;
-  case PIPE_FORMAT_R16G16B16X16_UINT:
-    return &util_format_r16g16b16x16_uint_description;
-  case PIPE_FORMAT_R16G16B16X16_SINT:
-    return &util_format_r16g16b16x16_sint_description;
-  case PIPE_FORMAT_R32G32B32X32_FLOAT:
-    return &util_format_r32g32b32x32_float_description;
-  case PIPE_FORMAT_R32G32B32X32_UINT:
-    return &util_format_r32g32b32x32_uint_description;
-  case PIPE_FORMAT_R32G32B32X32_SINT:
-    return &util_format_r32g32b32x32_sint_description;
-  case PIPE_FORMAT_R8A8_SNORM:
-    return &util_format_r8a8_snorm_description;
-  case PIPE_FORMAT_R16A16_UNORM:
-    return &util_format_r16a16_unorm_description;
-  case PIPE_FORMAT_R16A16_SNORM:
-    return &util_format_r16a16_snorm_description;
-  case PIPE_FORMAT_R16A16_FLOAT:
-    return &util_format_r16a16_float_description;
-  case PIPE_FORMAT_R32A32_FLOAT:
-    return &util_format_r32a32_float_description;
-  case PIPE_FORMAT_R8A8_UINT:
-    return &util_format_r8a8_uint_description;
-  case PIPE_FORMAT_R8A8_SINT:
-    return &util_format_r8a8_sint_description;
-  case PIPE_FORMAT_R16A16_UINT:
-    return &util_format_r16a16_uint_description;
-  case PIPE_FORMAT_R16A16_SINT:
-    return &util_format_r16a16_sint_description;
-  case PIPE_FORMAT_R32A32_UINT:
-    return &util_format_r32a32_uint_description;
-  case PIPE_FORMAT_R32A32_SINT:
-    return &util_format_r32a32_sint_description;
-  case PIPE_FORMAT_R10G10B10A2_UINT:
-    return &util_format_r10g10b10a2_uint_description;
-  case PIPE_FORMAT_B5G6R5_SRGB:
-    return &util_format_b5g6r5_srgb_description;
-  case PIPE_FORMAT_A8L8_UNORM:
-    return &util_format_a8l8_unorm_description;
-  case PIPE_FORMAT_A8L8_SNORM:
-    return &util_format_a8l8_snorm_description;
-  case PIPE_FORMAT_A8L8_SRGB:
-    return &util_format_a8l8_srgb_description;
-  case PIPE_FORMAT_A16L16_UNORM:
-    return &util_format_a16l16_unorm_description;
-  case PIPE_FORMAT_G8R8_UNORM:
-    return &util_format_g8r8_unorm_description;
-  case PIPE_FORMAT_G8R8_SNORM:
-    return &util_format_g8r8_snorm_description;
-  case PIPE_FORMAT_G16R16_UNORM:
-    return &util_format_g16r16_unorm_description;
-  case PIPE_FORMAT_G16R16_SNORM:
-    return &util_format_g16r16_snorm_description;
-  case PIPE_FORMAT_A8B8G8R8_SNORM:
-    return &util_format_a8b8g8r8_snorm_description;
-  case PIPE_FORMAT_X8B8G8R8_SNORM:
-    return &util_format_x8b8g8r8_snorm_description;
-  default:
-    return NULL;
-  }
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_table.py b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_table.py
deleted file mode 100644
index 5564b72e2..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_format_table.py
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-CopyRight = '''
-/**************************************************************************
- *
- * Copyright 2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-'''
-
-
-import sys
-
-from u_format_parse import *
-
-
-def layout_map(layout):
-    return 'UTIL_FORMAT_LAYOUT_' + str(layout).upper()
-
-
-def colorspace_map(colorspace):
-    return 'UTIL_FORMAT_COLORSPACE_' + str(colorspace).upper()
-
-
-colorspace_channels_map = {
-    'rgb': ['r', 'g', 'b', 'a'],
-    'srgb': ['sr', 'sg', 'sb', 'a'],
-    'zs': ['z', 's'],
-    'yuv': ['y', 'u', 'v'],
-}
-
-
-type_map = {
-    VOID:     "UTIL_FORMAT_TYPE_VOID",
-    UNSIGNED: "UTIL_FORMAT_TYPE_UNSIGNED",
-    SIGNED:   "UTIL_FORMAT_TYPE_SIGNED",
-    FIXED:    "UTIL_FORMAT_TYPE_FIXED",
-    FLOAT:    "UTIL_FORMAT_TYPE_FLOAT",
-}
-
-
-def bool_map(value):
-    if value:
-        return "TRUE"
-    else:
-        return "FALSE"
-
-
-swizzle_map = {
-    SWIZZLE_X:    "UTIL_FORMAT_SWIZZLE_X",
-    SWIZZLE_Y:    "UTIL_FORMAT_SWIZZLE_Y",
-    SWIZZLE_Z:    "UTIL_FORMAT_SWIZZLE_Z",
-    SWIZZLE_W:    "UTIL_FORMAT_SWIZZLE_W",
-    SWIZZLE_0:    "UTIL_FORMAT_SWIZZLE_0",
-    SWIZZLE_1:    "UTIL_FORMAT_SWIZZLE_1",
-    SWIZZLE_NONE: "UTIL_FORMAT_SWIZZLE_NONE",
-}
-
-
-def write_format_table(formats):
-    print('/* This file is autogenerated by u_format_table.py from u_format.csv. Do not edit directly. */')
-    print()
-    # This will print the copyright message on the top of this file
-    print(CopyRight.strip())
-    print()
-    print('#include "pipe/p_compiler.h"')
-    print('#include "u_format.h"')
-    print('#include "u_half.h"')
-    print('#include "u_math.h"')
-    print()
-
-    def do_channel_array(channels, swizzles):
-        print("   {")
-        for i in range(4):
-            channel = channels[i]
-            if i < 3:
-                sep = ","
-            else:
-                sep = ""
-            if channel.size:
-                print("      {%s, %s, %s, %u, %u}%s\t/* %s = %s */" % (type_map[channel.type], bool_map(channel.norm), bool_map(channel.pure), channel.size, channel.shift, sep, "xyzw"[i], channel.name))
-            else:
-                print("      {0, 0, 0, 0, 0}%s" % (sep,))
-        print("   },")
-
-    def do_swizzle_array(channels, swizzles):
-        print("   {")
-        for i in range(4):
-            swizzle = swizzles[i]
-            if i < 3:
-                sep = ","
-            else:
-                sep = ""
-            try:
-                comment = colorspace_channels_map[format.colorspace][i]
-            except (KeyError, IndexError):
-                comment = 'ignored'
-            print("      %s%s\t/* %s */" % (swizzle_map[swizzle], sep, comment))
-        print("   },")
-
-    def print_channels(format, func):
-        if format.nr_channels() <= 1:
-            func(format.le_channels, format.le_swizzles)
-        else:
-            print('#ifdef PIPE_ARCH_BIG_ENDIAN')
-            func(format.be_channels, format.be_swizzles)
-            print('#else')
-            func(format.le_channels, format.le_swizzles)
-            print('#endif')
-
-    for format in formats:
-        print('const struct util_format_description')
-        print('util_format_%s_description = {' % (format.short_name(),))
-        print("   %s," % (format.name,))
-        print("   \"%s\"," % (format.name,))
-        print("   \"%s\"," % (format.short_name(),))
-        print("   {%u, %u, %u},\t/* block */" % (format.block_width, format.block_height, format.block_size()))
-        print("   %s," % (layout_map(format.layout),))
-        print("   %u,\t/* nr_channels */" % (format.nr_channels(),))
-        print("   %s,\t/* is_array */" % (bool_map(format.is_array()),))
-        print("   %s,\t/* is_bitmask */" % (bool_map(format.is_bitmask()),))
-        print("   %s,\t/* is_mixed */" % (bool_map(format.is_mixed()),))
-        print_channels(format, do_channel_array)
-        print_channels(format, do_swizzle_array)
-        print("   %s," % (colorspace_map(format.colorspace),))
-        print("};")
-        print()
-        
-    print("const struct util_format_description *")
-    print("util_format_description(enum pipe_format format)")
-    print("{")
-    print("   if (format >= PIPE_FORMAT_COUNT) {")
-    print("      return NULL;")
-    print("   }")
-    print()
-    print("   switch (format) {")
-    for format in formats:
-        print("   case %s:" % format.name)
-        print("      return &util_format_%s_description;" % (format.short_name(),))
-    print("   default:")
-    print("      return NULL;")
-    print("   }")
-    print("}")
-    print()
-
-
-def main():
-
-    formats = []
-    for arg in sys.argv[1:]:
-        formats.extend(parse(arg))
-    write_format_table(formats)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_half.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_half.h
deleted file mode 100644
index d478a6835..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_half.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 Luca Barbieri
- *
- * 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 (including the
- * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_HALF_H
-#define U_HALF_H
-
-#include "pipe/p_compiler.h"
-#include "util/u_math.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * References for float <-> half conversions
- *
- *  http://fgiesen.wordpress.com/2012/03/28/half-to-float-done-quic/
- *  https://gist.github.com/2156668
- *  https://gist.github.com/2144712
- */
-
-static inline uint16_t util_float_to_half(float f) {
-  uint32_t sign_mask = 0x80000000;
-  uint32_t round_mask = ~0xfff;
-  uint32_t f32inf = 0xff << 23;
-  uint32_t f16inf = 0x1f << 23;
-  uint32_t sign;
-  union fi magic;
-  union fi f32;
-  uint16_t f16;
-
-  magic.ui = 0xf << 23;
-
-  f32.f = f;
-
-  /* Sign */
-  sign = f32.ui & sign_mask;
-  f32.ui ^= sign;
-
-  if (f32.ui == f32inf) {
-    /* Inf */
-    f16 = 0x7c00;
-  } else if (f32.ui > f32inf) {
-    /* NaN */
-    f16 = 0x7e00;
-  } else {
-    /* Number */
-    f32.ui &= round_mask;
-    f32.f *= magic.f;
-    f32.ui -= round_mask;
-
-    /*
-     * Clamp to max finite value if overflowed.
-     * OpenGL has completely undefined rounding behavior for float to
-     * half-float conversions, and this matches what is mandated for float
-     * to fp11/fp10, which recommend round-to-nearest-finite too.
-     * (d3d10 is deeply unhappy about flushing such values to infinity, and
-     * while it also mandates round-to-zero it doesn't care nearly as much
-     * about that.)
-     */
-    if (f32.ui > f16inf)
-      f32.ui = f16inf - 1;
-
-    f16 = f32.ui >> 13;
-  }
-
-  /* Sign */
-  f16 |= sign >> 16;
-
-  return f16;
-}
-
-static inline float util_half_to_float(uint16_t f16) {
-  union fi infnan;
-  union fi magic;
-  union fi f32;
-
-  infnan.ui = 0x8f << 23;
-  infnan.f = 65536.0f;
-  magic.ui = 0xef << 23;
-
-  /* Exponent / Mantissa */
-  f32.ui = (f16 & 0x7fff) << 13;
-
-  /* Adjust */
-  f32.f *= magic.f;
-
-  /* Inf / NaN */
-  if (f32.f >= infnan.f)
-    f32.ui |= 0xff << 23;
-
-  /* Sign */
-  f32.ui |= (f16 & 0x8000) << 16;
-
-  return f32.f;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_HALF_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_hash_table.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_hash_table.c
deleted file mode 100644
index 5d5800fd4..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_hash_table.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * General purpose hash table implementation.
- *
- * Just uses the cso_hash for now, but it might be better switch to a linear
- * probing hash table implementation at some point -- as it is said they have
- * better lookup and cache performance and it appears to be possible to write
- * a lock-free implementation of such hash tables .
- *
- * @author José Fonseca <jfonseca@vmware.com>
- */
-
-#include "pipe/p_compiler.h"
-#include "util/u_debug.h"
-
-#include "cso_cache/cso_hash.h"
-
-#include "util/u_hash_table.h"
-#include "util/u_memory.h"
-
-struct util_hash_table {
-  struct cso_hash *cso;
-
-  /** Hash function */
-  unsigned (*hash)(void *key);
-
-  /** Compare two keys */
-  int (*compare)(void *key1, void *key2);
-
-  /** free value */
-  void (*destroy)(void *value);
-};
-
-struct util_hash_table_item {
-  void *key;
-  void *value;
-};
-
-static inline struct util_hash_table_item *
-util_hash_table_item(struct cso_hash_iter iter) {
-  return (struct util_hash_table_item *)cso_hash_iter_data(iter);
-}
-
-struct util_hash_table *util_hash_table_create(unsigned (*hash)(void *key),
-                                               int (*compare)(void *key1,
-                                                              void *key2),
-                                               void (*destroy)(void *value)) {
-  struct util_hash_table *ht;
-
-  ht = MALLOC_STRUCT(util_hash_table);
-  if (!ht)
-    return NULL;
-
-  ht->cso = cso_hash_create();
-  if (!ht->cso) {
-    FREE(ht);
-    return NULL;
-  }
-
-  ht->hash = hash;
-  ht->compare = compare;
-  ht->destroy = destroy;
-
-  return ht;
-}
-
-static inline struct cso_hash_iter
-util_hash_table_find_iter(struct util_hash_table *ht, void *key,
-                          unsigned key_hash) {
-  struct cso_hash_iter iter;
-  struct util_hash_table_item *item;
-
-  iter = cso_hash_find(ht->cso, key_hash);
-  while (!cso_hash_iter_is_null(iter)) {
-    item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
-    if (!ht->compare(item->key, key))
-      break;
-    iter = cso_hash_iter_next(iter);
-  }
-
-  return iter;
-}
-
-static inline struct util_hash_table_item *
-util_hash_table_find_item(struct util_hash_table *ht, void *key,
-                          unsigned key_hash) {
-  struct cso_hash_iter iter;
-  struct util_hash_table_item *item;
-
-  iter = cso_hash_find(ht->cso, key_hash);
-  while (!cso_hash_iter_is_null(iter)) {
-    item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
-    if (!ht->compare(item->key, key))
-      return item;
-    iter = cso_hash_iter_next(iter);
-  }
-
-  return NULL;
-}
-
-enum pipe_error util_hash_table_set(struct util_hash_table *ht, void *key,
-                                    void *value) {
-  unsigned key_hash;
-  struct util_hash_table_item *item;
-  struct cso_hash_iter iter;
-
-  assert(ht);
-  if (!ht)
-    return PIPE_ERROR_BAD_INPUT;
-
-  key_hash = ht->hash(key);
-
-  item = util_hash_table_find_item(ht, key, key_hash);
-  if (item) {
-    ht->destroy(item->value);
-    item->value = value;
-    return PIPE_OK;
-  }
-
-  item = MALLOC_STRUCT(util_hash_table_item);
-  if (!item)
-    return PIPE_ERROR_OUT_OF_MEMORY;
-
-  item->key = key;
-  item->value = value;
-
-  iter = cso_hash_insert(ht->cso, key_hash, item);
-  if (cso_hash_iter_is_null(iter)) {
-    FREE(item);
-    return PIPE_ERROR_OUT_OF_MEMORY;
-  }
-
-  return PIPE_OK;
-}
-
-void *util_hash_table_get(struct util_hash_table *ht, void *key) {
-  unsigned key_hash;
-  struct util_hash_table_item *item;
-
-  assert(ht);
-  if (!ht)
-    return NULL;
-
-  key_hash = ht->hash(key);
-
-  item = util_hash_table_find_item(ht, key, key_hash);
-  if (!item)
-    return NULL;
-
-  return item->value;
-}
-
-void util_hash_table_remove(struct util_hash_table *ht, void *key) {
-  unsigned key_hash;
-  struct cso_hash_iter iter;
-  struct util_hash_table_item *item;
-
-  assert(ht);
-  if (!ht)
-    return;
-
-  key_hash = ht->hash(key);
-
-  iter = util_hash_table_find_iter(ht, key, key_hash);
-  if (cso_hash_iter_is_null(iter))
-    return;
-
-  item = util_hash_table_item(iter);
-  assert(item);
-  ht->destroy(item->value);
-  FREE(item);
-
-  cso_hash_erase(ht->cso, iter);
-}
-
-void util_hash_table_clear(struct util_hash_table *ht) {
-  struct cso_hash_iter iter;
-  struct util_hash_table_item *item;
-
-  assert(ht);
-  if (!ht)
-    return;
-
-  iter = cso_hash_first_node(ht->cso);
-  while (!cso_hash_iter_is_null(iter)) {
-    item = (struct util_hash_table_item *)cso_hash_take(
-        ht->cso, cso_hash_iter_key(iter));
-    ht->destroy(item->value);
-    FREE(item);
-    iter = cso_hash_first_node(ht->cso);
-  }
-}
-
-enum pipe_error util_hash_table_foreach(struct util_hash_table *ht,
-                                        enum pipe_error (*callback)(void *key,
-                                                                    void *value,
-                                                                    void *data),
-                                        void *data) {
-  struct cso_hash_iter iter;
-  struct util_hash_table_item *item;
-  enum pipe_error result;
-
-  assert(ht);
-  if (!ht)
-    return PIPE_ERROR_BAD_INPUT;
-
-  iter = cso_hash_first_node(ht->cso);
-  while (!cso_hash_iter_is_null(iter)) {
-    item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
-    result = callback(item->key, item->value, data);
-    if (result != PIPE_OK)
-      return result;
-    iter = cso_hash_iter_next(iter);
-  }
-
-  return PIPE_OK;
-}
-
-void util_hash_table_destroy(struct util_hash_table *ht) {
-  struct cso_hash_iter iter;
-  struct util_hash_table_item *item;
-
-  assert(ht);
-  if (!ht)
-    return;
-
-  iter = cso_hash_first_node(ht->cso);
-  while (!cso_hash_iter_is_null(iter)) {
-    item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
-    ht->destroy(item->value);
-    FREE(item);
-    iter = cso_hash_iter_next(iter);
-  }
-
-  cso_hash_delete(ht->cso);
-
-  FREE(ht);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_hash_table.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_hash_table.h
deleted file mode 100644
index 68fc27ef2..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_hash_table.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * General purpose hash table.
- *
- * @author José Fonseca <jfonseca@vmware.com>
- */
-
-#ifndef U_HASH_TABLE_H_
-#define U_HASH_TABLE_H_
-
-#include "pipe/p_defines.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Generic purpose hash table.
- */
-struct util_hash_table;
-
-/**
- * Create an hash table.
- *
- * @param hash hash function
- * @param compare should return 0 for two equal keys.
- */
-struct util_hash_table *util_hash_table_create(unsigned (*hash)(void *key),
-                                               int (*compare)(void *key1,
-                                                              void *key2),
-                                               void (*destroy)(void *value));
-
-enum pipe_error util_hash_table_set(struct util_hash_table *ht, void *key,
-                                    void *value);
-
-void *util_hash_table_get(struct util_hash_table *ht, void *key);
-
-void util_hash_table_remove(struct util_hash_table *ht, void *key);
-
-void util_hash_table_clear(struct util_hash_table *ht);
-
-enum pipe_error util_hash_table_foreach(struct util_hash_table *ht,
-                                        enum pipe_error (*callback)(void *key,
-                                                                    void *value,
-                                                                    void *data),
-                                        void *data);
-
-void util_hash_table_destroy(struct util_hash_table *ht);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_HASH_TABLE_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_inlines.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_inlines.h
deleted file mode 100644
index 69c1691b7..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_inlines.h
+++ /dev/null
@@ -1,560 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_INLINES_H
-#define U_INLINES_H
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-#include "util/u_atomic.h"
-#include "util/u_box.h"
-#include "util/u_debug.h"
-#include "util/u_debug_describe.h"
-#include "util/u_debug_refcnt.h"
-#include "util/u_math.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Reference counting helper functions.
- */
-
-static inline void pipe_reference_init(struct pipe_reference *reference,
-                                       unsigned count) {
-  p_atomic_set(&reference->count, count);
-}
-
-static inline boolean pipe_is_referenced(struct pipe_reference *reference) {
-  return p_atomic_read(&reference->count) != 0;
-}
-
-/**
- * Update reference counting.
- * The old thing pointed to, if any, will be unreferenced.
- * Both 'ptr' and 'reference' may be NULL.
- * \return TRUE if the object's refcount hits zero and should be destroyed.
- */
-static inline boolean
-pipe_reference_described(struct pipe_reference *ptr,
-                         struct pipe_reference *reference,
-                         debug_reference_descriptor get_desc) {
-  boolean destroy = FALSE;
-
-  if (ptr != reference) {
-    /* bump the reference.count first */
-    if (reference) {
-      assert(pipe_is_referenced(reference));
-      p_atomic_inc(&reference->count);
-      debug_reference(reference, get_desc, 1);
-    }
-
-    if (ptr) {
-      assert(pipe_is_referenced(ptr));
-      if (p_atomic_dec_zero(&ptr->count)) {
-        destroy = TRUE;
-      }
-      debug_reference(ptr, get_desc, -1);
-    }
-  }
-
-  return destroy;
-}
-
-static inline boolean pipe_reference(struct pipe_reference *ptr,
-                                     struct pipe_reference *reference) {
-  return pipe_reference_described(
-      ptr, reference, (debug_reference_descriptor)debug_describe_reference);
-}
-
-static inline void pipe_surface_reference(struct pipe_surface **ptr,
-                                          struct pipe_surface *surf) {
-  struct pipe_surface *old_surf = *ptr;
-
-  if (pipe_reference_described(
-          &(*ptr)->reference, &surf->reference,
-          (debug_reference_descriptor)debug_describe_surface))
-    old_surf->context->surface_destroy(old_surf->context, old_surf);
-  *ptr = surf;
-}
-
-/**
- * Similar to pipe_surface_reference() but always set the pointer to NULL
- * and pass in an explicit context.  The explicit context avoids the problem
- * of using a deleted context's surface_destroy() method when freeing a surface
- * that's shared by multiple contexts.
- */
-static inline void pipe_surface_release(struct pipe_context *pipe,
-                                        struct pipe_surface **ptr) {
-  if (pipe_reference_described(
-          &(*ptr)->reference, NULL,
-          (debug_reference_descriptor)debug_describe_surface))
-    pipe->surface_destroy(pipe, *ptr);
-  *ptr = NULL;
-}
-
-static inline void pipe_resource_reference(struct pipe_resource **ptr,
-                                           struct pipe_resource *tex) {
-  struct pipe_resource *old_tex = *ptr;
-
-  if (pipe_reference_described(
-          &(*ptr)->reference, &tex->reference,
-          (debug_reference_descriptor)debug_describe_resource))
-    old_tex->screen->resource_destroy(old_tex->screen, old_tex);
-  *ptr = tex;
-}
-
-static inline void pipe_sampler_view_reference(struct pipe_sampler_view **ptr,
-                                               struct pipe_sampler_view *view) {
-  struct pipe_sampler_view *old_view = *ptr;
-
-  if (pipe_reference_described(
-          &(*ptr)->reference, &view->reference,
-          (debug_reference_descriptor)debug_describe_sampler_view))
-    old_view->context->sampler_view_destroy(old_view->context, old_view);
-  *ptr = view;
-}
-
-/**
- * Similar to pipe_sampler_view_reference() but always set the pointer to
- * NULL and pass in an explicit context.  Passing an explicit context is a
- * work-around for fixing a dangling context pointer problem when textures
- * are shared by multiple contexts.  XXX fix this someday.
- */
-static inline void pipe_sampler_view_release(struct pipe_context *ctx,
-                                             struct pipe_sampler_view **ptr) {
-  struct pipe_sampler_view *old_view = *ptr;
-  if (*ptr && (*ptr)->context != ctx) {
-    debug_printf_once(("context mis-match in pipe_sampler_view_release()\n"));
-  }
-  if (pipe_reference_described(
-          &(*ptr)->reference, NULL,
-          (debug_reference_descriptor)debug_describe_sampler_view)) {
-    ctx->sampler_view_destroy(ctx, old_view);
-  }
-  *ptr = NULL;
-}
-
-static inline void
-pipe_so_target_reference(struct pipe_stream_output_target **ptr,
-                         struct pipe_stream_output_target *target) {
-  struct pipe_stream_output_target *old = *ptr;
-
-  if (pipe_reference_described(
-          &(*ptr)->reference, &target->reference,
-          (debug_reference_descriptor)debug_describe_so_target))
-    old->context->stream_output_target_destroy(old->context, old);
-  *ptr = target;
-}
-
-static inline void pipe_surface_reset(struct pipe_context *ctx,
-                                      struct pipe_surface *ps,
-                                      struct pipe_resource *pt, unsigned level,
-                                      unsigned layer) {
-  pipe_resource_reference(&ps->texture, pt);
-  ps->format = pt->format;
-  ps->width = u_minify(pt->width0, level);
-  ps->height = u_minify(pt->height0, level);
-  ps->u.tex.level = level;
-  ps->u.tex.first_layer = ps->u.tex.last_layer = layer;
-  ps->context = ctx;
-}
-
-static inline void pipe_surface_init(struct pipe_context *ctx,
-                                     struct pipe_surface *ps,
-                                     struct pipe_resource *pt, unsigned level,
-                                     unsigned layer) {
-  ps->texture = 0;
-  pipe_reference_init(&ps->reference, 1);
-  pipe_surface_reset(ctx, ps, pt, level, layer);
-}
-
-/* Return true if the surfaces are equal. */
-static inline boolean pipe_surface_equal(struct pipe_surface *s1,
-                                         struct pipe_surface *s2) {
-  return s1->texture == s2->texture && s1->format == s2->format &&
-         (s1->texture->target != PIPE_BUFFER ||
-          (s1->u.buf.first_element == s2->u.buf.first_element &&
-           s1->u.buf.last_element == s2->u.buf.last_element)) &&
-         (s1->texture->target == PIPE_BUFFER ||
-          (s1->u.tex.level == s2->u.tex.level &&
-           s1->u.tex.first_layer == s2->u.tex.first_layer &&
-           s1->u.tex.last_layer == s2->u.tex.last_layer));
-}
-
-/*
- * Convenience wrappers for screen buffer functions.
- */
-
-/**
- * Create a new resource.
- * \param bind  bitmask of PIPE_BIND_x flags
- * \param usage  bitmask of PIPE_USAGE_x flags
- */
-static inline struct pipe_resource *
-pipe_buffer_create(struct pipe_screen *screen, unsigned bind, unsigned usage,
-                   unsigned size) {
-  struct pipe_resource buffer;
-  memset(&buffer, 0, sizeof buffer);
-  buffer.target = PIPE_BUFFER;
-  buffer.format = PIPE_FORMAT_R8_UNORM; /* want TYPELESS or similar */
-  buffer.bind = bind;
-  buffer.usage = usage;
-  buffer.flags = 0;
-  buffer.width0 = size;
-  buffer.height0 = 1;
-  buffer.depth0 = 1;
-  buffer.array_size = 1;
-  return screen->resource_create(screen, &buffer);
-}
-
-/**
- * Map a range of a resource.
- * \param offset  start of region, in bytes
- * \param length  size of region, in bytes
- * \param access  bitmask of PIPE_TRANSFER_x flags
- * \param transfer  returns a transfer object
- */
-static inline void *pipe_buffer_map_range(struct pipe_context *pipe,
-                                          struct pipe_resource *buffer,
-                                          unsigned offset, unsigned length,
-                                          unsigned access,
-                                          struct pipe_transfer **transfer) {
-  struct pipe_box box;
-  void *map;
-
-  assert(offset < buffer->width0);
-  assert(offset + length <= buffer->width0);
-  assert(length);
-
-  u_box_1d(offset, length, &box);
-
-  map = pipe->transfer_map(pipe, buffer, 0, access, &box, transfer);
-  if (map == NULL) {
-    return NULL;
-  }
-
-  return map;
-}
-
-/**
- * Map whole resource.
- * \param access  bitmask of PIPE_TRANSFER_x flags
- * \param transfer  returns a transfer object
- */
-static inline void *pipe_buffer_map(struct pipe_context *pipe,
-                                    struct pipe_resource *buffer,
-                                    unsigned access,
-                                    struct pipe_transfer **transfer) {
-  return pipe_buffer_map_range(pipe, buffer, 0, buffer->width0, access,
-                               transfer);
-}
-
-static inline void pipe_buffer_unmap(struct pipe_context *pipe,
-                                     struct pipe_transfer *transfer) {
-  pipe->transfer_unmap(pipe, transfer);
-}
-
-static inline void
-pipe_buffer_flush_mapped_range(struct pipe_context *pipe,
-                               struct pipe_transfer *transfer, unsigned offset,
-                               unsigned length) {
-  struct pipe_box box;
-  int transfer_offset;
-
-  assert(length);
-  assert(transfer->box.x <= (int)offset);
-  assert((int)(offset + length) <= transfer->box.x + transfer->box.width);
-
-  /* Match old screen->buffer_flush_mapped_range() behaviour, where
-   * offset parameter is relative to the start of the buffer, not the
-   * mapped range.
-   */
-  transfer_offset = offset - transfer->box.x;
-
-  u_box_1d(transfer_offset, length, &box);
-
-  pipe->transfer_flush_region(pipe, transfer, &box);
-}
-
-static inline void pipe_buffer_write(struct pipe_context *pipe,
-                                     struct pipe_resource *buf, unsigned offset,
-                                     unsigned size, const void *data) {
-  struct pipe_box box;
-  unsigned access = PIPE_TRANSFER_WRITE;
-
-  if (offset == 0 && size == buf->width0) {
-    access |= PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE;
-  } else {
-    access |= PIPE_TRANSFER_DISCARD_RANGE;
-  }
-
-  u_box_1d(offset, size, &box);
-
-  pipe->transfer_inline_write(pipe, buf, 0, access, &box, data, size, 0);
-}
-
-/**
- * Special case for writing non-overlapping ranges.
- *
- * We can avoid GPU/CPU synchronization when writing range that has never
- * been written before.
- */
-static inline void pipe_buffer_write_nooverlap(struct pipe_context *pipe,
-                                               struct pipe_resource *buf,
-                                               unsigned offset, unsigned size,
-                                               const void *data) {
-  struct pipe_box box;
-
-  u_box_1d(offset, size, &box);
-
-  pipe->transfer_inline_write(
-      pipe, buf, 0, (PIPE_TRANSFER_WRITE | PIPE_TRANSFER_UNSYNCHRONIZED), &box,
-      data, 0, 0);
-}
-
-/**
- * Create a new resource and immediately put data into it
- * \param bind  bitmask of PIPE_BIND_x flags
- * \param usage  bitmask of PIPE_USAGE_x flags
- */
-static inline struct pipe_resource *
-pipe_buffer_create_with_data(struct pipe_context *pipe, unsigned bind,
-                             unsigned usage, unsigned size, const void *ptr) {
-  struct pipe_resource *res =
-      pipe_buffer_create(pipe->screen, bind, usage, size);
-  pipe_buffer_write_nooverlap(pipe, res, 0, size, ptr);
-  return res;
-}
-
-static inline void pipe_buffer_read(struct pipe_context *pipe,
-                                    struct pipe_resource *buf, unsigned offset,
-                                    unsigned size, void *data) {
-  struct pipe_transfer *src_transfer;
-  ubyte *map;
-
-  map = (ubyte *)pipe_buffer_map_range(pipe, buf, offset, size,
-                                       PIPE_TRANSFER_READ, &src_transfer);
-  if (!map)
-    return;
-
-  memcpy(data, map, size);
-  pipe_buffer_unmap(pipe, src_transfer);
-}
-
-/**
- * Map a resource for reading/writing.
- * \param access  bitmask of PIPE_TRANSFER_x flags
- */
-static inline void *pipe_transfer_map(struct pipe_context *context,
-                                      struct pipe_resource *resource,
-                                      unsigned level, unsigned layer,
-                                      unsigned access, unsigned x, unsigned y,
-                                      unsigned w, unsigned h,
-                                      struct pipe_transfer **transfer) {
-  struct pipe_box box;
-  u_box_2d_zslice(x, y, layer, w, h, &box);
-  return context->transfer_map(context, resource, level, access, &box,
-                               transfer);
-}
-
-/**
- * Map a 3D (texture) resource for reading/writing.
- * \param access  bitmask of PIPE_TRANSFER_x flags
- */
-static inline void *pipe_transfer_map_3d(struct pipe_context *context,
-                                         struct pipe_resource *resource,
-                                         unsigned level, unsigned access,
-                                         unsigned x, unsigned y, unsigned z,
-                                         unsigned w, unsigned h, unsigned d,
-                                         struct pipe_transfer **transfer) {
-  struct pipe_box box;
-  u_box_3d(x, y, z, w, h, d, &box);
-  return context->transfer_map(context, resource, level, access, &box,
-                               transfer);
-}
-
-static inline void pipe_transfer_unmap(struct pipe_context *context,
-                                       struct pipe_transfer *transfer) {
-  context->transfer_unmap(context, transfer);
-}
-
-static inline void pipe_set_constant_buffer(struct pipe_context *pipe,
-                                            uint shader, uint index,
-                                            struct pipe_resource *buf) {
-  if (buf) {
-    struct pipe_constant_buffer cb;
-    cb.buffer = buf;
-    cb.buffer_offset = 0;
-    cb.buffer_size = buf->width0;
-    cb.user_buffer = NULL;
-    pipe->set_constant_buffer(pipe, shader, index, &cb);
-  } else {
-    pipe->set_constant_buffer(pipe, shader, index, NULL);
-  }
-}
-
-/**
- * Get the polygon offset enable/disable flag for the given polygon fill mode.
- * \param fill_mode  one of PIPE_POLYGON_MODE_POINT/LINE/FILL
- */
-static inline boolean util_get_offset(const struct pipe_rasterizer_state *templ,
-                                      unsigned fill_mode) {
-  switch (fill_mode) {
-  case PIPE_POLYGON_MODE_POINT:
-    return templ->offset_point;
-  case PIPE_POLYGON_MODE_LINE:
-    return templ->offset_line;
-  case PIPE_POLYGON_MODE_FILL:
-    return templ->offset_tri;
-  default:
-    assert(0);
-    return FALSE;
-  }
-}
-
-static inline float
-util_get_min_point_size(const struct pipe_rasterizer_state *state) {
-  /* The point size should be clamped to this value at the rasterizer stage.
-   */
-  return !state->point_quad_rasterization && !state->point_smooth &&
-                 !state->multisample
-             ? 1.0f
-             : 0.0f;
-}
-
-static inline void util_query_clear_result(union pipe_query_result *result,
-                                           unsigned type) {
-  switch (type) {
-  case PIPE_QUERY_OCCLUSION_PREDICATE:
-  case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
-  case PIPE_QUERY_GPU_FINISHED:
-    result->b = FALSE;
-    break;
-  case PIPE_QUERY_OCCLUSION_COUNTER:
-  case PIPE_QUERY_TIMESTAMP:
-  case PIPE_QUERY_TIME_ELAPSED:
-  case PIPE_QUERY_PRIMITIVES_GENERATED:
-  case PIPE_QUERY_PRIMITIVES_EMITTED:
-    result->u64 = 0;
-    break;
-  case PIPE_QUERY_SO_STATISTICS:
-    memset(&result->so_statistics, 0, sizeof(result->so_statistics));
-    break;
-  case PIPE_QUERY_TIMESTAMP_DISJOINT:
-    memset(&result->timestamp_disjoint, 0, sizeof(result->timestamp_disjoint));
-    break;
-  case PIPE_QUERY_PIPELINE_STATISTICS:
-    memset(&result->pipeline_statistics, 0,
-           sizeof(result->pipeline_statistics));
-    break;
-  default:
-    memset(result, 0, sizeof(*result));
-  }
-}
-
-/** Convert PIPE_TEXTURE_x to TGSI_TEXTURE_x */
-static inline unsigned
-util_pipe_tex_to_tgsi_tex(enum pipe_texture_target pipe_tex_target,
-                          unsigned nr_samples) {
-  switch (pipe_tex_target) {
-  case PIPE_TEXTURE_1D:
-    assert(nr_samples <= 1);
-    return TGSI_TEXTURE_1D;
-
-  case PIPE_TEXTURE_2D:
-    return nr_samples > 1 ? TGSI_TEXTURE_2D_MSAA : TGSI_TEXTURE_2D;
-
-  case PIPE_TEXTURE_RECT:
-    assert(nr_samples <= 1);
-    return TGSI_TEXTURE_RECT;
-
-  case PIPE_TEXTURE_3D:
-    assert(nr_samples <= 1);
-    return TGSI_TEXTURE_3D;
-
-  case PIPE_TEXTURE_CUBE:
-    assert(nr_samples <= 1);
-    return TGSI_TEXTURE_CUBE;
-
-  case PIPE_TEXTURE_1D_ARRAY:
-    assert(nr_samples <= 1);
-    return TGSI_TEXTURE_1D_ARRAY;
-
-  case PIPE_TEXTURE_2D_ARRAY:
-    return nr_samples > 1 ? TGSI_TEXTURE_2D_ARRAY_MSAA : TGSI_TEXTURE_2D_ARRAY;
-
-  case PIPE_TEXTURE_CUBE_ARRAY:
-    return TGSI_TEXTURE_CUBE_ARRAY;
-
-  default:
-    assert(0 && "unexpected texture target");
-    return TGSI_TEXTURE_UNKNOWN;
-  }
-}
-
-static inline void
-util_copy_constant_buffer(struct pipe_constant_buffer *dst,
-                          const struct pipe_constant_buffer *src) {
-  if (src) {
-    pipe_resource_reference(&dst->buffer, src->buffer);
-    dst->buffer_offset = src->buffer_offset;
-    dst->buffer_size = src->buffer_size;
-    dst->user_buffer = src->user_buffer;
-  } else {
-    pipe_resource_reference(&dst->buffer, NULL);
-    dst->buffer_offset = 0;
-    dst->buffer_size = 0;
-    dst->user_buffer = NULL;
-  }
-}
-
-static inline unsigned util_max_layer(const struct pipe_resource *r,
-                                      unsigned level) {
-  switch (r->target) {
-  case PIPE_TEXTURE_CUBE:
-    return 6 - 1;
-  case PIPE_TEXTURE_3D:
-    return u_minify(r->depth0, level) - 1;
-  case PIPE_TEXTURE_1D_ARRAY:
-  case PIPE_TEXTURE_2D_ARRAY:
-  case PIPE_TEXTURE_CUBE_ARRAY:
-    return r->array_size - 1;
-  default:
-    return 0;
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_INLINES_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_math.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_math.c
deleted file mode 100644
index 860bc322f..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_math.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "util/u_math.h"
-#include "pipe/p_config.h"
-#include "util/u_cpu_detect.h"
-
-#if defined(PIPE_ARCH_SSE)
-#include <xmmintrin.h>
-/* This is defined in pmmintrin.h, but it can only be included when -msse3 is
- * used, so just define it here to avoid further. */
-#define _MM_DENORMALS_ZERO_MASK 0x0040
-#endif
-
-#if 0
-/** 2^x, for x in [-1.0, 1.0) */
-float pow2_table[POW2_TABLE_SIZE];
-
-
-static void
-init_pow2_table(void)
-{
-   int i;
-   for (i = 0; i < POW2_TABLE_SIZE; i++)
-      pow2_table[i] = (float) pow(2.0, (i - POW2_TABLE_OFFSET) / POW2_TABLE_SCALE);
-}
-
-
-/** log2(x), for x in [1.0, 2.0) */
-float log2_table[LOG2_TABLE_SIZE];
-
-
-static void 
-init_log2_table(void)
-{
-   unsigned i;
-   for (i = 0; i < LOG2_TABLE_SIZE; i++)
-      log2_table[i] = (float) log2(1.0 + i * (1.0 / LOG2_TABLE_SCALE));
-}
-#endif
-
-/**
- * One time init for math utilities.
- */
-void util_init_math(void) {
-  static boolean initialized = FALSE;
-  if (!initialized) {
-    //      init_pow2_table();
-    /*      init_log2_table();*/
-    initialized = TRUE;
-  }
-}
-
-/**
- * Fetches the contents of the fpstate (mxcsr on x86) register.
- *
- * On platforms without support for it just returns 0.
- */
-unsigned util_fpstate_get(void) {
-  unsigned mxcsr = 0;
-
-#if defined(PIPE_ARCH_SSE)
-  if (util_cpu_caps.has_sse) {
-    mxcsr = _mm_getcsr();
-  }
-#endif
-
-  return mxcsr;
-}
-
-/**
- * Make sure that the fp treats the denormalized floating
- * point numbers as zero.
- *
- * This is the behavior required by D3D10. OpenGL doesn't care.
- */
-unsigned util_fpstate_set_denorms_to_zero(unsigned current_mxcsr) {
-#if defined(PIPE_ARCH_SSE)
-  if (util_cpu_caps.has_sse) {
-    /* Enable flush to zero mode */
-    current_mxcsr |= _MM_FLUSH_ZERO_MASK;
-    if (util_cpu_caps.has_daz) {
-      /* Enable denormals are zero mode */
-      current_mxcsr |= _MM_DENORMALS_ZERO_MASK;
-    }
-    util_fpstate_set(current_mxcsr);
-  }
-#endif
-  return current_mxcsr;
-}
-
-/**
- * Set the state of the fpstate (mxcsr on x86) register.
- *
- * On platforms without support for it's a noop.
- */
-void util_fpstate_set(unsigned mxcsr) {
-#if defined(PIPE_ARCH_SSE)
-  if (util_cpu_caps.has_sse) {
-    _mm_setcsr(mxcsr);
-  }
-#endif
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_math.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_math.h
deleted file mode 100644
index df08e9071..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_math.h
+++ /dev/null
@@ -1,768 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * Math utilities and approximations for common math functions.
- * Reduced precision is usually acceptable in shaders...
- *
- * "fast" is used in the names of functions which are low-precision,
- * or at least lower-precision than the normal C lib functions.
- */
-
-#ifndef U_MATH_H
-#define U_MATH_H
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <float.h>
-#include <math.h>
-#include <stdarg.h>
-
-#ifdef PIPE_OS_UNIX
-#include <strings.h> /* for ffs */
-#endif
-
-#ifndef M_SQRT2
-#define M_SQRT2 1.41421356237309504880
-#endif
-
-#if defined(_MSC_VER)
-
-#if _MSC_VER < 1400 && !defined(__cplusplus)
-
-static inline float cosf(float f) { return (float)cos((double)f); }
-
-static inline float sinf(float f) { return (float)sin((double)f); }
-
-static inline float ceilf(float f) { return (float)ceil((double)f); }
-
-static inline float floorf(float f) { return (float)floor((double)f); }
-
-static inline float powf(float f, float g) {
-  return (float)pow((double)f, (double)g);
-}
-
-static inline float sqrtf(float f) { return (float)sqrt((double)f); }
-
-static inline float fabsf(float f) { return (float)fabs((double)f); }
-
-static inline float logf(float f) { return (float)log((double)f); }
-
-#else
-/* Work-around an extra semi-colon in VS 2005 logf definition */
-#ifdef logf
-#undef logf
-#define logf(x) ((float)log((double)(x)))
-#endif /* logf */
-
-#if _MSC_VER < 1800
-#define isfinite(x) _finite((double)(x))
-#define isnan(x) _isnan((double)(x))
-#endif /* _MSC_VER < 1800 */
-#endif /* _MSC_VER < 1400 && !defined(__cplusplus) */
-
-#if _MSC_VER < 1800
-static inline double log2(double x) {
-  const double invln2 = 1.442695041;
-  return log(x) * invln2;
-}
-
-static inline double round(double x) {
-  return x >= 0.0 ? floor(x + 0.5) : ceil(x - 0.5);
-}
-
-static inline float roundf(float x) {
-  return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f);
-}
-#endif
-
-#ifndef INFINITY
-#define INFINITY (DBL_MAX + DBL_MAX)
-#endif
-
-#ifndef NAN
-#define NAN (INFINITY - INFINITY)
-#endif
-
-#endif /* _MSC_VER */
-
-#if __STDC_VERSION__ < 199901L && (!defined(__cplusplus) || defined(_MSC_VER))
-static inline long int lrint(double d) {
-  long int rounded = (long int)(d + 0.5);
-
-  if (d - floor(d) == 0.5) {
-    if (rounded % 2 != 0)
-      rounded += (d > 0) ? -1 : 1;
-  }
-
-  return rounded;
-}
-
-static inline long int lrintf(float f) {
-  long int rounded = (long int)(f + 0.5f);
-
-  if (f - floorf(f) == 0.5f) {
-    if (rounded % 2 != 0)
-      rounded += (f > 0) ? -1 : 1;
-  }
-
-  return rounded;
-}
-
-static inline long long int llrint(double d) {
-  long long int rounded = (long long int)(d + 0.5);
-
-  if (d - floor(d) == 0.5) {
-    if (rounded % 2 != 0)
-      rounded += (d > 0) ? -1 : 1;
-  }
-
-  return rounded;
-}
-
-static inline long long int llrintf(float f) {
-  long long int rounded = (long long int)(f + 0.5f);
-
-  if (f - floorf(f) == 0.5f) {
-    if (rounded % 2 != 0)
-      rounded += (f > 0) ? -1 : 1;
-  }
-
-  return rounded;
-}
-#endif /* C99 */
-
-#define POW2_TABLE_SIZE_LOG2 9
-#define POW2_TABLE_SIZE (1 << POW2_TABLE_SIZE_LOG2)
-#define POW2_TABLE_OFFSET (POW2_TABLE_SIZE / 2)
-#define POW2_TABLE_SCALE ((float)(POW2_TABLE_SIZE / 2))
-extern float pow2_table[POW2_TABLE_SIZE];
-
-/**
- * Initialize math module.  This should be called before using any
- * other functions in this module.
- */
-extern void util_init_math(void);
-
-union fi {
-  float f;
-  int32_t i;
-  uint32_t ui;
-};
-
-union di {
-  double d;
-  int64_t i;
-  uint64_t ui;
-};
-
-/**
- * Extract the IEEE float32 exponent.
- */
-static inline signed util_get_float32_exponent(float x) {
-  union fi f;
-
-  f.f = x;
-
-  return ((f.ui >> 23) & 0xff) - 127;
-}
-
-/**
- * Fast version of 2^x
- * Identity: exp2(a + b) = exp2(a) * exp2(b)
- * Let ipart = int(x)
- * Let fpart = x - ipart;
- * So, exp2(x) = exp2(ipart) * exp2(fpart)
- * Compute exp2(ipart) with i << ipart
- * Compute exp2(fpart) with lookup table.
- */
-static inline float util_fast_exp2(float x) {
-  int32_t ipart;
-  float fpart, mpart;
-  union fi epart;
-
-  if (x > 129.00000f)
-    return 3.402823466e+38f;
-
-  if (x < -126.99999f)
-    return 0.0f;
-
-  ipart = (int32_t)x;
-  fpart = x - (float)ipart;
-
-  /* same as
-   *   epart.f = (float) (1 << ipart)
-   * but faster and without integer overflow for ipart > 31
-   */
-  epart.i = (ipart + 127) << 23;
-
-  mpart = pow2_table[POW2_TABLE_OFFSET + (int)(fpart * POW2_TABLE_SCALE)];
-
-  return epart.f * mpart;
-}
-
-/**
- * Fast approximation to exp(x).
- */
-static inline float util_fast_exp(float x) {
-  const float k = 1.44269f; /* = log2(e) */
-  return util_fast_exp2(k * x);
-}
-
-#if 0
-
-#define LOG2_TABLE_SIZE_LOG2 16
-#define LOG2_TABLE_SCALE (1 << LOG2_TABLE_SIZE_LOG2)
-#define LOG2_TABLE_SIZE (LOG2_TABLE_SCALE + 1)
-extern float log2_table[LOG2_TABLE_SIZE];
-
-
-/**
- * Fast approximation to log2(x).
- */
-static inline float
-util_fast_log2(float x)
-{
-   union fi num;
-   float epart, mpart;
-   num.f = x;
-   epart = (float)(((num.i & 0x7f800000) >> 23) - 127);
-   /* mpart = log2_table[mantissa*LOG2_TABLE_SCALE + 0.5] */
-   mpart = log2_table[((num.i & 0x007fffff) + (1 << (22 - LOG2_TABLE_SIZE_LOG2))) >> (23 - LOG2_TABLE_SIZE_LOG2)];
-   return epart + mpart;
-}
-
-
-/**
- * Fast approximation to x^y.
- */
-static inline float
-util_fast_pow(float x, float y)
-{
-   return util_fast_exp2(util_fast_log2(x) * y);
-}
-#endif
-/* Note that this counts zero as a power of two.
- */
-static inline boolean util_is_power_of_two(unsigned v) {
-  return (v & (v - 1)) == 0;
-}
-
-/**
- * Floor(x), returned as int.
- */
-static inline int util_ifloor(float f) {
-  int ai, bi;
-  double af, bf;
-  union fi u;
-  af = (3 << 22) + 0.5 + (double)f;
-  bf = (3 << 22) + 0.5 - (double)f;
-  u.f = (float)af;
-  ai = u.i;
-  u.f = (float)bf;
-  bi = u.i;
-  return (ai - bi) >> 1;
-}
-
-/**
- * Round float to nearest int.
- */
-static inline int util_iround(float f) {
-#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)
-  int r;
-  __asm__("fistpl %0" : "=m"(r) : "t"(f) : "st");
-  return r;
-#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
-  int r;
-  _asm {
-      fld f
-      fistp r
-  }
-  return r;
-#else
-  if (f >= 0.0f)
-    return (int)(f + 0.5f);
-  else
-    return (int)(f - 0.5f);
-#endif
-}
-
-/**
- * Approximate floating point comparison
- */
-static inline boolean util_is_approx(float a, float b, float tol) {
-  return fabs(b - a) <= tol;
-}
-
-/**
- * util_is_X_inf_or_nan = test if x is NaN or +/- Inf
- * util_is_X_nan        = test if x is NaN
- * util_X_inf_sign      = return +1 for +Inf, -1 for -Inf, or 0 for not Inf
- *
- * NaN can be checked with x != x, however this fails with the fast math flag
- **/
-
-/**
- * Single-float
- */
-static inline boolean util_is_inf_or_nan(float x) {
-  union fi tmp;
-  tmp.f = x;
-  return (tmp.ui & 0x7f800000) == 0x7f800000;
-}
-
-static inline boolean util_is_nan(float x) {
-  union fi tmp;
-  tmp.f = x;
-  return (tmp.ui & 0x7fffffff) > 0x7f800000;
-}
-
-static inline int util_inf_sign(float x) {
-  union fi tmp;
-  tmp.f = x;
-  if ((tmp.ui & 0x7fffffff) != 0x7f800000) {
-    return 0;
-  }
-
-  return (x < 0) ? -1 : 1;
-}
-
-/**
- * Double-float
- */
-static inline boolean util_is_double_inf_or_nan(double x) {
-  union di tmp;
-  tmp.d = x;
-  return (tmp.ui & 0x7ff0000000000000ULL) == 0x7ff0000000000000ULL;
-}
-
-static inline boolean util_is_double_nan(double x) {
-  union di tmp;
-  tmp.d = x;
-  return (tmp.ui & 0x7fffffffffffffffULL) > 0x7ff0000000000000ULL;
-}
-
-static inline int util_double_inf_sign(double x) {
-  union di tmp;
-  tmp.d = x;
-  if ((tmp.ui & 0x7fffffffffffffffULL) != 0x7ff0000000000000ULL) {
-    return 0;
-  }
-
-  return (x < 0) ? -1 : 1;
-}
-
-/**
- * Half-float
- */
-static inline boolean util_is_half_inf_or_nan(int16_t x) {
-  return (x & 0x7c00) == 0x7c00;
-}
-
-static inline boolean util_is_half_nan(int16_t x) {
-  return (x & 0x7fff) > 0x7c00;
-}
-
-static inline int util_half_inf_sign(int16_t x) {
-  if ((x & 0x7fff) != 0x7c00) {
-    return 0;
-  }
-
-  return (x < 0) ? -1 : 1;
-}
-
-/**
- * Find first bit set in word.  Least significant bit is 1.
- * Return 0 if no bits set.
- */
-#ifndef FFS_DEFINED
-#define FFS_DEFINED 1
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300 && (_M_IX86 || _M_AMD64 || _M_IA64)
-unsigned char _BitScanForward(unsigned long *Index, unsigned long Mask);
-#pragma intrinsic(_BitScanForward)
-static inline unsigned long ffs(unsigned long u) {
-  unsigned long i;
-  if (_BitScanForward(&i, u))
-    return i + 1;
-  else
-    return 0;
-}
-#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
-static inline unsigned ffs(unsigned u) {
-  unsigned i;
-
-  if (u == 0) {
-    return 0;
-  }
-
-  __asm bsf eax, [u] __asm inc eax __asm mov[i],
-      eax
-
-      return i;
-}
-#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
-#define ffs __builtin_ffs
-#endif
-
-#endif /* FFS_DEFINED */
-
-/**
- * Find last bit set in a word.  The least significant bit is 1.
- * Return 0 if no bits are set.
- */
-static inline unsigned util_last_bit(unsigned u) {
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304)
-  return u == 0 ? 0 : 32 - __builtin_clz(u);
-#else
-  unsigned r = 0;
-  while (u) {
-    r++;
-    u >>= 1;
-  }
-  return r;
-#endif
-}
-
-/**
- * Find last bit in a word that does not match the sign bit. The least
- * significant bit is 1.
- * Return 0 if no bits are set.
- */
-static inline unsigned util_last_bit_signed(int i) {
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407)
-  return 31 - __builtin_clrsb(i);
-#else
-  if (i >= 0)
-    return util_last_bit(i);
-  else
-    return util_last_bit(~(unsigned)i);
-#endif
-}
-
-/* Destructively loop over all of the bits in a mask as in:
- *
- * while (mymask) {
- *   int i = u_bit_scan(&mymask);
- *   ... process element i
- * }
- *
- */
-static inline int u_bit_scan(unsigned *mask) {
-  int i = ffs(*mask) - 1;
-  *mask &= ~(1 << i);
-  return i;
-}
-
-/* For looping over a bitmask when you want to loop over consecutive bits
- * manually, for example:
- *
- * while (mask) {
- *    int start, count, i;
- *
- *    u_bit_scan_consecutive_range(&mask, &start, &count);
- *
- *    for (i = 0; i < count; i++)
- *       ... process element (start+i)
- * }
- */
-static inline void u_bit_scan_consecutive_range(unsigned *mask, int *start,
-                                                int *count) {
-  if (*mask == 0xffffffff) {
-    *start = 0;
-    *count = 32;
-    *mask = 0;
-    return;
-  }
-  *start = ffs(*mask) - 1;
-  *count = ffs(~(*mask >> *start)) - 1;
-  *mask &= ~(((1u << *count) - 1) << *start);
-}
-
-/**
- * Return float bits.
- */
-static inline unsigned fui(float f) {
-  union fi fi;
-  fi.f = f;
-  return fi.ui;
-}
-
-/**
- * Convert ubyte to float in [0, 1].
- * XXX a 256-entry lookup table would be slightly faster.
- */
-static inline float ubyte_to_float(ubyte ub) {
-  return (float)ub * (1.0f / 255.0f);
-}
-
-/**
- * Convert float in [0,1] to ubyte in [0,255] with clamping.
- */
-static inline ubyte float_to_ubyte(float f) {
-  union fi tmp;
-
-  tmp.f = f;
-  if (tmp.i < 0) {
-    return (ubyte)0;
-  } else if (tmp.i >= 0x3f800000 /* 1.0f */) {
-    return (ubyte)255;
-  } else {
-    tmp.f = tmp.f * (255.0f / 256.0f) + 32768.0f;
-    return (ubyte)tmp.i;
-  }
-}
-
-static inline float byte_to_float_tex(int8_t b) {
-  return (b == -128) ? -1.0F : b * 1.0F / 127.0F;
-}
-
-static inline int8_t float_to_byte_tex(float f) { return (int8_t)(127.0F * f); }
-
-/**
- * Calc log base 2
- */
-static inline unsigned util_logbase2(unsigned n) {
-#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 304)
-  return ((sizeof(unsigned) * 8 - 1) - __builtin_clz(n | 1));
-#else
-  unsigned pos = 0;
-  if (n >= 1 << 16) {
-    n >>= 16;
-    pos += 16;
-  }
-  if (n >= 1 << 8) {
-    n >>= 8;
-    pos += 8;
-  }
-  if (n >= 1 << 4) {
-    n >>= 4;
-    pos += 4;
-  }
-  if (n >= 1 << 2) {
-    n >>= 2;
-    pos += 2;
-  }
-  if (n >= 1 << 1) {
-    pos += 1;
-  }
-  return pos;
-#endif
-}
-
-/**
- * Returns the smallest power of two >= x
- */
-static inline unsigned util_next_power_of_two(unsigned x) {
-#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 304)
-  if (x <= 1)
-    return 1;
-
-  return (1 << ((sizeof(unsigned) * 8) - __builtin_clz(x - 1)));
-#else
-  unsigned val = x;
-
-  if (x <= 1)
-    return 1;
-
-  if (util_is_power_of_two(x))
-    return x;
-
-  val--;
-  val = (val >> 1) | val;
-  val = (val >> 2) | val;
-  val = (val >> 4) | val;
-  val = (val >> 8) | val;
-  val = (val >> 16) | val;
-  val++;
-  return val;
-#endif
-}
-
-/**
- * Return number of bits set in n.
- */
-static inline unsigned util_bitcount(unsigned n) {
-#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 304)
-  return __builtin_popcount(n);
-#else
-  /* K&R classic bitcount.
-   *
-   * For each iteration, clear the LSB from the bitfield.
-   * Requires only one iteration per set bit, instead of
-   * one iteration per bit less than highest set bit.
-   */
-  unsigned bits = 0;
-  for (bits; n; bits++) {
-    n &= n - 1;
-  }
-  return bits;
-#endif
-}
-
-/**
- * Reverse bits in n
- * Algorithm taken from:
- * http://stackoverflow.com/questions/9144800/c-reverse-bits-in-unsigned-integer
- */
-static inline unsigned util_bitreverse(unsigned n) {
-  n = ((n >> 1) & 0x55555555u) | ((n & 0x55555555u) << 1);
-  n = ((n >> 2) & 0x33333333u) | ((n & 0x33333333u) << 2);
-  n = ((n >> 4) & 0x0f0f0f0fu) | ((n & 0x0f0f0f0fu) << 4);
-  n = ((n >> 8) & 0x00ff00ffu) | ((n & 0x00ff00ffu) << 8);
-  n = ((n >> 16) & 0xffffu) | ((n & 0xffffu) << 16);
-  return n;
-}
-
-/**
- * Convert from little endian to CPU byte order.
- */
-
-#ifdef PIPE_ARCH_BIG_ENDIAN
-#define util_le64_to_cpu(x) util_bswap64(x)
-#define util_le32_to_cpu(x) util_bswap32(x)
-#define util_le16_to_cpu(x) util_bswap16(x)
-#else
-#define util_le64_to_cpu(x) (x)
-#define util_le32_to_cpu(x) (x)
-#define util_le16_to_cpu(x) (x)
-#endif
-
-#define util_cpu_to_le64(x) util_le64_to_cpu(x)
-#define util_cpu_to_le32(x) util_le32_to_cpu(x)
-#define util_cpu_to_le16(x) util_le16_to_cpu(x)
-
-/**
- * Reverse byte order of a 32 bit word.
- */
-static inline uint32_t util_bswap32(uint32_t n) {
-/* We need the gcc version checks for non-autoconf build system */
-#if defined(HAVE___BUILTIN_BSWAP32) ||                                         \
-    (defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 403))
-  return __builtin_bswap32(n);
-#else
-  return (n >> 24) | ((n >> 8) & 0x0000ff00) | ((n << 8) & 0x00ff0000) |
-         (n << 24);
-#endif
-}
-
-/**
- * Reverse byte order of a 64bit word.
- */
-static inline uint64_t util_bswap64(uint64_t n) {
-#if defined(HAVE___BUILTIN_BSWAP64)
-  return __builtin_bswap64(n);
-#else
-  return ((uint64_t)util_bswap32(n) << 32) | util_bswap32((n >> 32));
-#endif
-}
-
-/**
- * Reverse byte order of a 16 bit word.
- */
-static inline uint16_t util_bswap16(uint16_t n) { return (n >> 8) | (n << 8); }
-
-/**
- * Clamp X to [MIN, MAX].
- * This is a macro to allow float, int, uint, etc. types.
- */
-#define CLAMP(X, MIN, MAX) ((X) < (MIN) ? (MIN) : ((X) > (MAX) ? (MAX) : (X)))
-
-#define MIN2(A, B) ((A) < (B) ? (A) : (B))
-#define MAX2(A, B) ((A) > (B) ? (A) : (B))
-
-#define MIN3(A, B, C) ((A) < (B) ? MIN2(A, C) : MIN2(B, C))
-#define MAX3(A, B, C) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))
-
-#define MIN4(A, B, C, D) ((A) < (B) ? MIN3(A, C, D) : MIN3(B, C, D))
-#define MAX4(A, B, C, D) ((A) > (B) ? MAX3(A, C, D) : MAX3(B, C, D))
-
-/**
- * Align a value, only works pot alignemnts.
- */
-static inline int align(int value, int alignment) {
-  return (value + alignment - 1) & ~(alignment - 1);
-}
-
-/**
- * Works like align but on npot alignments.
- */
-static inline size_t util_align_npot(size_t value, size_t alignment) {
-  if (value % alignment)
-    return value + (alignment - (value % alignment));
-  return value;
-}
-
-static inline unsigned u_minify(unsigned value, unsigned levels) {
-  return MAX2(1, value >> levels);
-}
-
-#ifndef COPY_4V
-#define COPY_4V(DST, SRC)                                                      \
-  do {                                                                         \
-    (DST)[0] = (SRC)[0];                                                       \
-    (DST)[1] = (SRC)[1];                                                       \
-    (DST)[2] = (SRC)[2];                                                       \
-    (DST)[3] = (SRC)[3];                                                       \
-  } while (0)
-#endif
-
-#ifndef COPY_4FV
-#define COPY_4FV(DST, SRC) COPY_4V(DST, SRC)
-#endif
-
-#ifndef ASSIGN_4V
-#define ASSIGN_4V(DST, V0, V1, V2, V3)                                         \
-  do {                                                                         \
-    (DST)[0] = (V0);                                                           \
-    (DST)[1] = (V1);                                                           \
-    (DST)[2] = (V2);                                                           \
-    (DST)[3] = (V3);                                                           \
-  } while (0)
-#endif
-
-static inline uint32_t util_unsigned_fixed(float value, unsigned frac_bits) {
-  return value < 0 ? 0 : (uint32_t)(value * (1 << frac_bits));
-}
-
-static inline int32_t util_signed_fixed(float value, unsigned frac_bits) {
-  return (int32_t)(value * (1 << frac_bits));
-}
-
-unsigned util_fpstate_get(void);
-unsigned util_fpstate_set_denorms_to_zero(unsigned current_fpstate);
-void util_fpstate_set(unsigned fpstate);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_MATH_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_memory.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_memory.h
deleted file mode 100644
index 528e43d0d..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_memory.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/*
- * Memory functions
- */
-
-#ifndef U_MEMORY_H
-#define U_MEMORY_H
-
-#include "os/os_memory.h"
-#include "util/u_debug.h"
-#include "util/u_pointer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MALLOC(_size) os_malloc(_size)
-
-#define CALLOC(_count, _size) os_calloc(_count, _size)
-
-#define FREE(_ptr) os_free(_ptr)
-
-#define REALLOC(_ptr, _old_size, _size) os_realloc(_ptr, _old_size, _size)
-
-#define MALLOC_STRUCT(T) (struct T *)MALLOC(sizeof(struct T))
-
-#define CALLOC_STRUCT(T) (struct T *)CALLOC(1, sizeof(struct T))
-
-#define CALLOC_VARIANT_LENGTH_STRUCT(T, more_size)                             \
-  ((struct T *)CALLOC(1, sizeof(struct T) + more_size))
-
-#define align_malloc(_size, _alignment) os_malloc_aligned(_size, _alignment)
-#define align_free(_ptr) os_free_aligned(_ptr)
-
-/**
- * Duplicate a block of memory.
- */
-static inline void *mem_dup(const void *src, uint size) {
-  void *dup = MALLOC(size);
-  if (dup)
-    memcpy(dup, src, size);
-  return dup;
-}
-
-/**
- * Number of elements in an array.
- */
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
-#ifndef Elements
-#define Elements(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
-/**
- * Offset of a field in a struct, in bytes.
- */
-#define Offset(TYPE, MEMBER) ((uintptr_t)&(((TYPE *)NULL)->MEMBER))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_MEMORY_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_pack_color.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_pack_color.h
deleted file mode 100644
index fb6d8e472..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_pack_color.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Functions to produce packed colors/Z from floats.
- */
-
-#ifndef U_PACK_COLOR_H
-#define U_PACK_COLOR_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
-#include "util/u_debug.h"
-#include "util/u_format.h"
-#include "util/u_math.h"
-
-/**
- * Helper union for packing pixel values.
- * Will often contain values in formats which are too complex to be described
- * in simple terms, hence might just effectively contain a number of bytes.
- * Must be big enough to hold data for all formats (currently 256 bits).
- */
-union util_color {
-  ubyte ub;
-  ushort us;
-  uint ui[4];
-  ushort h[4]; /* half float */
-  float f[4];
-  double d[4];
-};
-
-/**
- * Pack 4 ubytes into a 4-byte word
- */
-static inline unsigned pack_ub4(ubyte b0, ubyte b1, ubyte b2, ubyte b3) {
-  return ((((unsigned int)b0) << 0) | (((unsigned int)b1) << 8) |
-          (((unsigned int)b2) << 16) | (((unsigned int)b3) << 24));
-}
-
-/**
- * Pack/convert 4 floats into one 4-byte word.
- */
-static inline unsigned pack_ui32_float4(float a, float b, float c, float d) {
-  return pack_ub4(float_to_ubyte(a), float_to_ubyte(b), float_to_ubyte(c),
-                  float_to_ubyte(d));
-}
-
-#endif /* U_PACK_COLOR_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_pointer.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_pointer.h
deleted file mode 100644
index 5a57b513a..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_pointer.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_POINTER_H
-#define U_POINTER_H
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static inline intptr_t pointer_to_intptr(const void *p) {
-  union {
-    const void *p;
-    intptr_t i;
-  } pi;
-  pi.p = p;
-  return pi.i;
-}
-
-static inline void *intptr_to_pointer(intptr_t i) {
-  union {
-    void *p;
-    intptr_t i;
-  } pi;
-  pi.i = i;
-  return pi.p;
-}
-
-static inline uintptr_t pointer_to_uintptr(const void *ptr) {
-  union {
-    const void *p;
-    uintptr_t u;
-  } pu;
-  pu.p = ptr;
-  return pu.u;
-}
-
-static inline void *uintptr_to_pointer(uintptr_t u) {
-  union {
-    void *p;
-    uintptr_t u;
-  } pu;
-  pu.u = u;
-  return pu.p;
-}
-
-/**
- * Return a pointer aligned to next multiple of N bytes.
- */
-static inline void *align_pointer(const void *unaligned, uintptr_t alignment) {
-  uintptr_t aligned =
-      (pointer_to_uintptr(unaligned) + alignment - 1) & ~(alignment - 1);
-  return uintptr_to_pointer(aligned);
-}
-
-/**
- * Return a pointer aligned to next multiple of 16 bytes.
- */
-static inline void *align16(void *unaligned) {
-  return align_pointer(unaligned, 16);
-}
-
-typedef void (*func_pointer)(void);
-
-static inline func_pointer pointer_to_func(void *p) {
-  union {
-    void *p;
-    func_pointer f;
-  } pf;
-  pf.p = p;
-  return pf.f;
-}
-
-static inline void *func_to_pointer(func_pointer f) {
-  union {
-    void *p;
-    func_pointer f;
-  } pf;
-  pf.f = f;
-  return pf.p;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_POINTER_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_prim.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_prim.h
deleted file mode 100644
index 07134573e..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_prim.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_PRIM_H
-#define U_PRIM_H
-
-#include "pipe/p_defines.h"
-#include "util/u_debug.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct u_prim_vertex_count {
-  unsigned min;
-  unsigned incr;
-};
-
-/**
- * Decompose a primitive that is a loop, a strip, or a fan.  Return the
- * original primitive if it is already decomposed.
- */
-static inline unsigned u_decomposed_prim(unsigned prim) {
-  switch (prim) {
-  case PIPE_PRIM_LINE_LOOP:
-  case PIPE_PRIM_LINE_STRIP:
-    return PIPE_PRIM_LINES;
-  case PIPE_PRIM_TRIANGLE_STRIP:
-  case PIPE_PRIM_TRIANGLE_FAN:
-    return PIPE_PRIM_TRIANGLES;
-  case PIPE_PRIM_QUAD_STRIP:
-    return PIPE_PRIM_QUADS;
-  case PIPE_PRIM_LINE_STRIP_ADJACENCY:
-    return PIPE_PRIM_LINES_ADJACENCY;
-  case PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY:
-    return PIPE_PRIM_TRIANGLES_ADJACENCY;
-  default:
-    return prim;
-  }
-}
-
-/**
- * Reduce a primitive to one of PIPE_PRIM_POINTS, PIPE_PRIM_LINES, and
- * PIPE_PRIM_TRIANGLES.
- */
-static inline unsigned u_reduced_prim(unsigned prim) {
-  switch (prim) {
-  case PIPE_PRIM_POINTS:
-    return PIPE_PRIM_POINTS;
-  case PIPE_PRIM_LINES:
-  case PIPE_PRIM_LINE_LOOP:
-  case PIPE_PRIM_LINE_STRIP:
-  case PIPE_PRIM_LINES_ADJACENCY:
-  case PIPE_PRIM_LINE_STRIP_ADJACENCY:
-    return PIPE_PRIM_LINES;
-  default:
-    return PIPE_PRIM_TRIANGLES;
-  }
-}
-
-/**
- * Re-assemble a primitive to remove its adjacency.
- */
-static inline unsigned u_assembled_prim(unsigned prim) {
-  switch (prim) {
-  case PIPE_PRIM_LINES_ADJACENCY:
-  case PIPE_PRIM_LINE_STRIP_ADJACENCY:
-    return PIPE_PRIM_LINES;
-  case PIPE_PRIM_TRIANGLES_ADJACENCY:
-  case PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY:
-    return PIPE_PRIM_TRIANGLES;
-  default:
-    return prim;
-  }
-}
-
-/**
- * Return the vertex count information for a primitive.
- *
- * Note that if this function is called directly or indirectly anywhere in a
- * source file, it will increase the size of the binary slightly more than
- * expected because of the use of a table.
- */
-static inline const struct u_prim_vertex_count *
-u_prim_vertex_count(unsigned prim) {
-  static const struct u_prim_vertex_count prim_table[PIPE_PRIM_MAX] = {
-      {1, 1}, /* PIPE_PRIM_POINTS */
-      {2, 2}, /* PIPE_PRIM_LINES */
-      {2, 1}, /* PIPE_PRIM_LINE_LOOP */
-      {2, 1}, /* PIPE_PRIM_LINE_STRIP */
-      {3, 3}, /* PIPE_PRIM_TRIANGLES */
-      {3, 1}, /* PIPE_PRIM_TRIANGLE_STRIP */
-      {3, 1}, /* PIPE_PRIM_TRIANGLE_FAN */
-      {4, 4}, /* PIPE_PRIM_QUADS */
-      {4, 2}, /* PIPE_PRIM_QUAD_STRIP */
-      {3, 1}, /* PIPE_PRIM_POLYGON */
-      {4, 4}, /* PIPE_PRIM_LINES_ADJACENCY */
-      {4, 1}, /* PIPE_PRIM_LINE_STRIP_ADJACENCY */
-      {6, 6}, /* PIPE_PRIM_TRIANGLES_ADJACENCY */
-      {6, 2}, /* PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY */
-  };
-
-  return (likely(prim < PIPE_PRIM_MAX)) ? &prim_table[prim] : NULL;
-}
-
-static inline boolean u_validate_pipe_prim(unsigned pipe_prim, unsigned nr) {
-  const struct u_prim_vertex_count *count = u_prim_vertex_count(pipe_prim);
-
-  return (count && nr >= count->min);
-}
-
-static inline boolean u_trim_pipe_prim(unsigned pipe_prim, unsigned *nr) {
-  const struct u_prim_vertex_count *count = u_prim_vertex_count(pipe_prim);
-
-  if (count && *nr >= count->min) {
-    if (count->incr > 1)
-      *nr -= (*nr % count->incr);
-    return TRUE;
-  } else {
-    *nr = 0;
-    return FALSE;
-  }
-}
-
-static inline unsigned u_vertices_per_prim(int primitive) {
-  switch (primitive) {
-  case PIPE_PRIM_POINTS:
-    return 1;
-  case PIPE_PRIM_LINES:
-  case PIPE_PRIM_LINE_LOOP:
-  case PIPE_PRIM_LINE_STRIP:
-    return 2;
-  case PIPE_PRIM_TRIANGLES:
-  case PIPE_PRIM_TRIANGLE_STRIP:
-  case PIPE_PRIM_TRIANGLE_FAN:
-    return 3;
-  case PIPE_PRIM_LINES_ADJACENCY:
-  case PIPE_PRIM_LINE_STRIP_ADJACENCY:
-    return 4;
-  case PIPE_PRIM_TRIANGLES_ADJACENCY:
-  case PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY:
-    return 6;
-
-  /* following primitives should never be used
-   * with geometry shaders abd their size is
-   * undefined */
-  case PIPE_PRIM_POLYGON:
-  case PIPE_PRIM_QUADS:
-  case PIPE_PRIM_QUAD_STRIP:
-  default:
-    debug_printf("Unrecognized geometry shader primitive");
-    return 3;
-  }
-}
-
-/**
- * Returns the number of decomposed primitives for the given
- * vertex count.
- * Parts of the pipline are invoked once for each triangle in
- * triangle strip, triangle fans and triangles and once
- * for each line in line strip, line loop, lines. Also
- * statistics depend on knowing the exact number of decomposed
- * primitives for a set of vertices.
- */
-static inline unsigned u_decomposed_prims_for_vertices(int primitive,
-                                                       int vertices) {
-  switch (primitive) {
-  case PIPE_PRIM_POINTS:
-    return vertices;
-  case PIPE_PRIM_LINES:
-    return vertices / 2;
-  case PIPE_PRIM_LINE_LOOP:
-    return (vertices >= 2) ? vertices : 0;
-  case PIPE_PRIM_LINE_STRIP:
-    return (vertices >= 2) ? vertices - 1 : 0;
-  case PIPE_PRIM_TRIANGLES:
-    return vertices / 3;
-  case PIPE_PRIM_TRIANGLE_STRIP:
-    return (vertices >= 3) ? vertices - 2 : 0;
-  case PIPE_PRIM_TRIANGLE_FAN:
-    return (vertices >= 3) ? vertices - 2 : 0;
-  case PIPE_PRIM_LINES_ADJACENCY:
-    return vertices / 4;
-  case PIPE_PRIM_LINE_STRIP_ADJACENCY:
-    return (vertices >= 4) ? vertices - 3 : 0;
-  case PIPE_PRIM_TRIANGLES_ADJACENCY:
-    return vertices / 6;
-  case PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY:
-    return (vertices >= 6) ? 1 + (vertices - 6) / 2 : 0;
-  case PIPE_PRIM_QUADS:
-    return vertices / 4;
-  case PIPE_PRIM_QUAD_STRIP:
-    return (vertices >= 4) ? (vertices - 2) / 2 : 0;
-  /* Polygons can't be decomposed
-   * because the number of their vertices isn't known so
-   * for them and whatever else we don't recognize just
-   * return 1 if the number of vertices is greater than
-   * or equal to 3 and zero otherwise */
-  case PIPE_PRIM_POLYGON:
-  default:
-    debug_printf("Invalid decomposition primitive!\n");
-    return (vertices >= 3) ? 1 : 0;
-  }
-}
-
-/**
- * Returns the number of reduced/tessellated primitives for the given vertex
- * count.  Each quad is treated as two triangles.  Polygons are treated as
- * triangle fans.
- */
-static inline unsigned u_reduced_prims_for_vertices(int primitive,
-                                                    int vertices) {
-  switch (primitive) {
-  case PIPE_PRIM_QUADS:
-  case PIPE_PRIM_QUAD_STRIP:
-    return u_decomposed_prims_for_vertices(primitive, vertices) * 2;
-  case PIPE_PRIM_POLYGON:
-    primitive = PIPE_PRIM_TRIANGLE_FAN;
-    /* fall through */
-  default:
-    return u_decomposed_prims_for_vertices(primitive, vertices);
-  }
-}
-
-const char *u_prim_name(unsigned pipe_prim);
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_rect.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_rect.h
deleted file mode 100644
index a7411e92e..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_rect.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_RECT_H
-#define U_RECT_H
-
-#include "pipe/p_compiler.h"
-#include "util/u_math.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct u_rect {
-  int x0, x1;
-  int y0, y1;
-};
-
-/* Do two rectangles intersect?
- */
-static inline boolean u_rect_test_intersection(const struct u_rect *a,
-                                               const struct u_rect *b) {
-  return (!(a->x1 < b->x0 || b->x1 < a->x0 || a->y1 < b->y0 || b->y1 < a->y0));
-}
-
-/* Find the intersection of two rectangles known to intersect.
- */
-static inline void u_rect_find_intersection(const struct u_rect *a,
-                                            struct u_rect *b) {
-  /* Caller should verify intersection exists before calling.
-   */
-  if (b->x0 < a->x0)
-    b->x0 = a->x0;
-  if (b->x1 > a->x1)
-    b->x1 = a->x1;
-  if (b->y0 < a->y0)
-    b->y0 = a->y0;
-  if (b->y1 > a->y1)
-    b->y1 = a->y1;
-}
-
-static inline int u_rect_area(const struct u_rect *r) {
-  return (r->x1 - r->x0) * (r->y1 - r->y0);
-}
-
-static inline void u_rect_possible_intersection(const struct u_rect *a,
-                                                struct u_rect *b) {
-  if (u_rect_test_intersection(a, b)) {
-    u_rect_find_intersection(a, b);
-  } else {
-    b->x0 = b->x1 = b->y0 = b->y1 = 0;
-  }
-}
-
-/* Set @d to a rectangle that covers both @a and @b.
- */
-static inline void u_rect_union(struct u_rect *d, const struct u_rect *a,
-                                const struct u_rect *b) {
-  d->x0 = MIN2(a->x0, b->x0);
-  d->y0 = MIN2(a->y0, b->y0);
-  d->x1 = MAX2(a->x1, b->x1);
-  d->y1 = MAX2(a->y1, b->y1);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_RECT_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_string.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_string.h
deleted file mode 100644
index 97e0ddeef..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_string.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Platform independent functions for string manipulation.
- *
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-
-#ifndef U_STRING_H_
-#define U_STRING_H_
-
-#if !defined(_MSC_VER) && !defined(XF86_LIBC_H)
-#include <stdio.h>
-#endif
-#include <stdarg.h>
-#include <stddef.h>
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _GNU_SOURCE
-
-#define util_strchrnul strchrnul
-
-#else
-
-static inline char *util_strchrnul(const char *s, char c) {
-  for (; *s && *s != c; ++s)
-    ;
-
-  return (char *)s;
-}
-
-#endif
-
-#ifdef _MSC_VER
-
-int util_vsnprintf(char *, size_t, const char *, va_list);
-int util_snprintf(char *str, size_t size, const char *format, ...);
-
-static inline void util_vsprintf(char *str, const char *format, va_list ap) {
-  util_vsnprintf(str, (size_t)-1, format, ap);
-}
-
-static inline void util_sprintf(char *str, const char *format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  util_vsnprintf(str, (size_t)-1, format, ap);
-  va_end(ap);
-}
-
-static inline char *util_strchr(const char *s, char c) {
-  char *p = util_strchrnul(s, c);
-
-  return *p ? p : NULL;
-}
-
-static inline char *util_strncat(char *dst, const char *src, size_t n) {
-  char *p = dst + strlen(dst);
-  const char *q = src;
-  size_t i;
-
-  for (i = 0; i < n && *q != '\0'; ++i)
-    *p++ = *q++;
-  *p = '\0';
-
-  return dst;
-}
-
-static inline int util_strcmp(const char *s1, const char *s2) {
-  unsigned char u1, u2;
-
-  while (1) {
-    u1 = (unsigned char)*s1++;
-    u2 = (unsigned char)*s2++;
-    if (u1 != u2)
-      return u1 - u2;
-    if (u1 == '\0')
-      return 0;
-  }
-  return 0;
-}
-
-static inline int util_strncmp(const char *s1, const char *s2, size_t n) {
-  unsigned char u1, u2;
-
-  while (n-- > 0) {
-    u1 = (unsigned char)*s1++;
-    u2 = (unsigned char)*s2++;
-    if (u1 != u2)
-      return u1 - u2;
-    if (u1 == '\0')
-      return 0;
-  }
-  return 0;
-}
-
-static inline char *util_strstr(const char *haystack, const char *needle) {
-  const char *p = haystack;
-  size_t len = strlen(needle);
-
-  for (; (p = util_strchr(p, *needle)) != 0; p++) {
-    if (util_strncmp(p, needle, len) == 0) {
-      return (char *)p;
-    }
-  }
-  return NULL;
-}
-
-static inline void *util_memmove(void *dest, const void *src, size_t n) {
-  char *p = (char *)dest;
-  const char *q = (const char *)src;
-  if (dest < src) {
-    while (n--)
-      *p++ = *q++;
-  } else {
-    p += n;
-    q += n;
-    while (n--)
-      *--p = *--q;
-  }
-  return dest;
-}
-
-#else
-
-#define util_vsnprintf vsnprintf
-#define util_snprintf snprintf
-#define util_vsprintf vsprintf
-#define util_sprintf sprintf
-#define util_strchr strchr
-#define util_strcmp strcmp
-#define util_strncmp strncmp
-#define util_strncat strncat
-#define util_strstr strstr
-#define util_memmove memmove
-
-#endif
-
-/**
- * Printable string buffer
- */
-struct util_strbuf {
-  char *str;
-  char *ptr;
-  size_t left;
-};
-
-static inline void util_strbuf_init(struct util_strbuf *sbuf, char *str,
-                                    size_t size) {
-  sbuf->str = str;
-  sbuf->str[0] = 0;
-  sbuf->ptr = sbuf->str;
-  sbuf->left = size;
-}
-
-static inline void util_strbuf_printf(struct util_strbuf *sbuf,
-                                      const char *format, ...) {
-  if (sbuf->left > 1) {
-    size_t written;
-    va_list ap;
-    va_start(ap, format);
-    written = util_vsnprintf(sbuf->ptr, sbuf->left, format, ap);
-    va_end(ap);
-    sbuf->ptr += written;
-    sbuf->left -= written;
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_STRING_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_surface.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_surface.c
deleted file mode 100644
index f3a1c9092..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_surface.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 VMware, Inc.  All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Surface utility functions.
- *
- * @author Brian Paul
- */
-
-#include "pipe/p_defines.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_state.h"
-
-#include "util/u_format.h"
-#include "util/u_inlines.h"
-#include "util/u_pack_color.h"
-#include "util/u_rect.h"
-#include "util/u_surface.h"
-
-/**
- * Initialize a pipe_surface object.  'view' is considered to have
- * uninitialized contents.
- */
-void u_surface_default_template(struct pipe_surface *surf,
-                                const struct pipe_resource *texture) {
-  memset(surf, 0, sizeof(*surf));
-
-  surf->format = texture->format;
-}
-
-/**
- * Copy 2D rect from one place to another.
- * Position and sizes are in pixels.
- * src_stride may be negative to do vertical flip of pixels from source.
- */
-void util_copy_rect(ubyte *dst, enum pipe_format format, unsigned dst_stride,
-                    unsigned dst_x, unsigned dst_y, unsigned width,
-                    unsigned height, const ubyte *src, int src_stride,
-                    unsigned src_x, unsigned src_y) {
-  unsigned i;
-  int src_stride_pos = src_stride < 0 ? -src_stride : src_stride;
-  int blocksize = util_format_get_blocksize(format);
-  int blockwidth = util_format_get_blockwidth(format);
-  int blockheight = util_format_get_blockheight(format);
-
-  assert(blocksize > 0);
-  assert(blockwidth > 0);
-  assert(blockheight > 0);
-
-  dst_x /= blockwidth;
-  dst_y /= blockheight;
-  width = (width + blockwidth - 1) / blockwidth;
-  height = (height + blockheight - 1) / blockheight;
-  src_x /= blockwidth;
-  src_y /= blockheight;
-
-  dst += dst_x * blocksize;
-  src += src_x * blocksize;
-  dst += dst_y * dst_stride;
-  src += src_y * src_stride_pos;
-  width *= blocksize;
-
-  if (width == dst_stride && (int)width == src_stride)
-    memcpy(dst, src, height * width);
-  else {
-    for (i = 0; i < height; i++) {
-      memcpy(dst, src, width);
-      dst += dst_stride;
-      src += src_stride;
-    }
-  }
-}
-
-/**
- * Copy 3D box from one place to another.
- * Position and sizes are in pixels.
- */
-void util_copy_box(ubyte *dst, enum pipe_format format, unsigned dst_stride,
-                   unsigned dst_slice_stride, unsigned dst_x, unsigned dst_y,
-                   unsigned dst_z, unsigned width, unsigned height,
-                   unsigned depth, const ubyte *src, int src_stride,
-                   unsigned src_slice_stride, unsigned src_x, unsigned src_y,
-                   unsigned src_z) {
-  unsigned z;
-  dst += dst_z * dst_slice_stride;
-  src += src_z * src_slice_stride;
-  for (z = 0; z < depth; ++z) {
-    util_copy_rect(dst, format, dst_stride, dst_x, dst_y, width, height, src,
-                   src_stride, src_x, src_y);
-
-    dst += dst_slice_stride;
-    src += src_slice_stride;
-  }
-}
-
-void util_fill_rect(ubyte *dst, enum pipe_format format, unsigned dst_stride,
-                    unsigned dst_x, unsigned dst_y, unsigned width,
-                    unsigned height, union util_color *uc) {
-  const struct util_format_description *desc = util_format_description(format);
-  unsigned i, j;
-  unsigned width_size;
-  int blocksize = desc->block.bits / 8;
-  int blockwidth = desc->block.width;
-  int blockheight = desc->block.height;
-
-  assert(blocksize > 0);
-  assert(blockwidth > 0);
-  assert(blockheight > 0);
-
-  dst_x /= blockwidth;
-  dst_y /= blockheight;
-  width = (width + blockwidth - 1) / blockwidth;
-  height = (height + blockheight - 1) / blockheight;
-
-  dst += dst_x * blocksize;
-  dst += dst_y * dst_stride;
-  width_size = width * blocksize;
-
-  switch (blocksize) {
-  case 1:
-    if (dst_stride == width_size)
-      memset(dst, uc->ub, height * width_size);
-    else {
-      for (i = 0; i < height; i++) {
-        memset(dst, uc->ub, width_size);
-        dst += dst_stride;
-      }
-    }
-    break;
-  case 2:
-    for (i = 0; i < height; i++) {
-      uint16_t *row = (uint16_t *)dst;
-      for (j = 0; j < width; j++)
-        *row++ = uc->us;
-      dst += dst_stride;
-    }
-    break;
-  case 4:
-    for (i = 0; i < height; i++) {
-      uint32_t *row = (uint32_t *)dst;
-      for (j = 0; j < width; j++)
-        *row++ = uc->ui[0];
-      dst += dst_stride;
-    }
-    break;
-  default:
-    for (i = 0; i < height; i++) {
-      ubyte *row = dst;
-      for (j = 0; j < width; j++) {
-        memcpy(row, uc, blocksize);
-        row += blocksize;
-      }
-      dst += dst_stride;
-    }
-    break;
-  }
-}
-
-void util_fill_box(ubyte *dst, enum pipe_format format, unsigned stride,
-                   unsigned layer_stride, unsigned x, unsigned y, unsigned z,
-                   unsigned width, unsigned height, unsigned depth,
-                   union util_color *uc) {
-  unsigned layer;
-  dst += z * layer_stride;
-  for (layer = z; layer < depth; layer++) {
-    util_fill_rect(dst, format, stride, x, y, width, height, uc);
-    dst += layer_stride;
-  }
-}
-
-/**
- * Fallback function for pipe->resource_copy_region().
- * Note: (X,Y)=(0,0) is always the upper-left corner.
- */
-void util_resource_copy_region(struct pipe_context *pipe,
-                               struct pipe_resource *dst, unsigned dst_level,
-                               unsigned dst_x, unsigned dst_y, unsigned dst_z,
-                               struct pipe_resource *src, unsigned src_level,
-                               const struct pipe_box *src_box) {
-  struct pipe_transfer *src_trans, *dst_trans;
-  uint8_t *dst_map;
-  const uint8_t *src_map;
-  MAYBE_UNUSED enum pipe_format src_format;
-  enum pipe_format dst_format;
-  struct pipe_box dst_box;
-
-  assert(src && dst);
-  if (!src || !dst)
-    return;
-
-  assert((src->target == PIPE_BUFFER && dst->target == PIPE_BUFFER) ||
-         (src->target != PIPE_BUFFER && dst->target != PIPE_BUFFER));
-
-  src_format = src->format;
-  dst_format = dst->format;
-
-  assert(util_format_get_blocksize(dst_format) ==
-         util_format_get_blocksize(src_format));
-  assert(util_format_get_blockwidth(dst_format) ==
-         util_format_get_blockwidth(src_format));
-  assert(util_format_get_blockheight(dst_format) ==
-         util_format_get_blockheight(src_format));
-
-  src_map = pipe->transfer_map(pipe, src, src_level, PIPE_TRANSFER_READ,
-                               src_box, &src_trans);
-  assert(src_map);
-  if (!src_map) {
-    goto no_src_map;
-  }
-
-  dst_box.x = dst_x;
-  dst_box.y = dst_y;
-  dst_box.z = dst_z;
-  dst_box.width = src_box->width;
-  dst_box.height = src_box->height;
-  dst_box.depth = src_box->depth;
-
-  dst_map = pipe->transfer_map(
-      pipe, dst, dst_level, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
-      &dst_box, &dst_trans);
-  assert(dst_map);
-  if (!dst_map) {
-    goto no_dst_map;
-  }
-
-  if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
-    assert(src_box->height == 1);
-    assert(src_box->depth == 1);
-    memcpy(dst_map, src_map, src_box->width);
-  } else {
-    util_copy_box(dst_map, dst_format, dst_trans->stride,
-                  dst_trans->layer_stride, 0, 0, 0, src_box->width,
-                  src_box->height, src_box->depth, src_map, src_trans->stride,
-                  src_trans->layer_stride, 0, 0, 0);
-  }
-
-  pipe->transfer_unmap(pipe, dst_trans);
-no_dst_map:
-  pipe->transfer_unmap(pipe, src_trans);
-no_src_map:;
-}
-
-#define UBYTE_TO_USHORT(B) ((B) | ((B) << 8))
-
-/* Return if the box is totally inside the resource.
- */
-static boolean is_box_inside_resource(const struct pipe_resource *res,
-                                      const struct pipe_box *box,
-                                      unsigned level) {
-  unsigned width = 1, height = 1, depth = 1;
-
-  switch (res->target) {
-  case PIPE_BUFFER:
-    width = res->width0;
-    height = 1;
-    depth = 1;
-    break;
-  case PIPE_TEXTURE_1D:
-    width = u_minify(res->width0, level);
-    height = 1;
-    depth = 1;
-    break;
-  case PIPE_TEXTURE_2D:
-  case PIPE_TEXTURE_RECT:
-    width = u_minify(res->width0, level);
-    height = u_minify(res->height0, level);
-    depth = 1;
-    break;
-  case PIPE_TEXTURE_3D:
-    width = u_minify(res->width0, level);
-    height = u_minify(res->height0, level);
-    depth = u_minify(res->depth0, level);
-    break;
-  case PIPE_TEXTURE_CUBE:
-    width = u_minify(res->width0, level);
-    height = u_minify(res->height0, level);
-    depth = 6;
-    break;
-  case PIPE_TEXTURE_1D_ARRAY:
-    width = u_minify(res->width0, level);
-    height = 1;
-    depth = res->array_size;
-    break;
-  case PIPE_TEXTURE_2D_ARRAY:
-    width = u_minify(res->width0, level);
-    height = u_minify(res->height0, level);
-    depth = res->array_size;
-    break;
-  case PIPE_TEXTURE_CUBE_ARRAY:
-    width = u_minify(res->width0, level);
-    height = u_minify(res->height0, level);
-    depth = res->array_size;
-    assert(res->array_size % 6 == 0);
-    break;
-  case PIPE_MAX_TEXTURE_TYPES:;
-  }
-
-  return box->x >= 0 && box->x + box->width <= (int)width && box->y >= 0 &&
-         box->y + box->height <= (int)height && box->z >= 0 &&
-         box->z + box->depth <= (int)depth;
-}
-
-static unsigned get_sample_count(const struct pipe_resource *res) {
-  return res->nr_samples ? res->nr_samples : 1;
-}
-
-/**
- * Try to do a blit using resource_copy_region. The function calls
- * resource_copy_region if the blit description is compatible with it.
- *
- * It returns TRUE if the blit was done using resource_copy_region.
- *
- * It returns FALSE otherwise and the caller must fall back to a more generic
- * codepath for the blit operation. (e.g. by using u_blitter)
- */
-boolean util_try_blit_via_copy_region(struct pipe_context *ctx,
-                                      const struct pipe_blit_info *blit) {
-  unsigned mask = util_format_get_mask(blit->dst.format);
-
-  /* No format conversions. */
-  if (blit->src.resource->format != blit->src.format ||
-      blit->dst.resource->format != blit->dst.format ||
-      !util_is_format_compatible(
-          util_format_description(blit->src.resource->format),
-          util_format_description(blit->dst.resource->format))) {
-    return FALSE;
-  }
-
-  /* No masks, no filtering, no scissor. */
-  if ((blit->mask & mask) != mask || blit->filter != PIPE_TEX_FILTER_NEAREST ||
-      blit->scissor_enable) {
-    return FALSE;
-  }
-
-  /* No flipping. */
-  if (blit->src.box.width < 0 || blit->src.box.height < 0 ||
-      blit->src.box.depth < 0) {
-    return FALSE;
-  }
-
-  /* No scaling. */
-  if (blit->src.box.width != blit->dst.box.width ||
-      blit->src.box.height != blit->dst.box.height ||
-      blit->src.box.depth != blit->dst.box.depth) {
-    return FALSE;
-  }
-
-  /* No out-of-bounds access. */
-  if (!is_box_inside_resource(blit->src.resource, &blit->src.box,
-                              blit->src.level) ||
-      !is_box_inside_resource(blit->dst.resource, &blit->dst.box,
-                              blit->dst.level)) {
-    return FALSE;
-  }
-
-  /* Sample counts must match. */
-  if (get_sample_count(blit->src.resource) !=
-      get_sample_count(blit->dst.resource)) {
-    return FALSE;
-  }
-
-  ctx->resource_copy_region(ctx, blit->dst.resource, blit->dst.level,
-                            blit->dst.box.x, blit->dst.box.y, blit->dst.box.z,
-                            blit->src.resource, blit->src.level,
-                            &blit->src.box);
-  return TRUE;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_surface.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_surface.h
deleted file mode 100644
index 462cb8b0b..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_surface.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 VMware, Inc.  All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_SURFACE_H
-#define U_SURFACE_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_state.h"
-
-#include "util/u_pack_color.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void u_surface_default_template(struct pipe_surface *view,
-                                       const struct pipe_resource *texture);
-
-extern void util_copy_rect(ubyte *dst, enum pipe_format format,
-                           unsigned dst_stride, unsigned dst_x, unsigned dst_y,
-                           unsigned width, unsigned height, const ubyte *src,
-                           int src_stride, unsigned src_x, unsigned src_y);
-
-extern void util_copy_box(ubyte *dst, enum pipe_format format,
-                          unsigned dst_stride, unsigned dst_slice_stride,
-                          unsigned dst_x, unsigned dst_y, unsigned dst_z,
-                          unsigned width, unsigned height, unsigned depth,
-                          const ubyte *src, int src_stride,
-                          unsigned src_slice_stride, unsigned src_x,
-                          unsigned src_y, unsigned src_z);
-
-extern void util_fill_rect(ubyte *dst, enum pipe_format format,
-                           unsigned dst_stride, unsigned dst_x, unsigned dst_y,
-                           unsigned width, unsigned height,
-                           union util_color *uc);
-
-extern void util_fill_box(ubyte *dst, enum pipe_format format, unsigned stride,
-                          unsigned layer_stride, unsigned x, unsigned y,
-                          unsigned z, unsigned width, unsigned height,
-                          unsigned depth, union util_color *uc);
-
-extern void
-util_resource_copy_region(struct pipe_context *pipe, struct pipe_resource *dst,
-                          unsigned dst_level, unsigned dst_x, unsigned dst_y,
-                          unsigned dst_z, struct pipe_resource *src,
-                          unsigned src_level, const struct pipe_box *src_box);
-
-extern void util_clear_render_target(struct pipe_context *pipe,
-                                     struct pipe_surface *dst,
-                                     const union pipe_color_union *color,
-                                     unsigned dstx, unsigned dsty,
-                                     unsigned width, unsigned height);
-
-extern void util_clear_depth_stencil(struct pipe_context *pipe,
-                                     struct pipe_surface *dst,
-                                     unsigned clear_flags, double depth,
-                                     unsigned stencil, unsigned dstx,
-                                     unsigned dsty, unsigned width,
-                                     unsigned height);
-
-extern boolean util_try_blit_via_copy_region(struct pipe_context *ctx,
-                                             const struct pipe_blit_info *blit);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* U_SURFACE_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_texture.c b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_texture.c
deleted file mode 100644
index 995a01f2f..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_texture.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- * Copyright 2008 VMware, Inc.  All rights reserved.
- * Copyright 2009 Marek Olšák <maraeo@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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Texture mapping utility functions.
- *
- * @author Brian Paul
- *         Marek Olšák
- */
-
-#include "pipe/p_defines.h"
-
-#include "util/u_debug.h"
-#include "util/u_texture.h"
-
-void util_map_texcoords2d_onto_cubemap(unsigned face, const float *in_st,
-                                       unsigned in_stride, float *out_str,
-                                       unsigned out_stride,
-                                       boolean allow_scale) {
-  int i;
-  float rx, ry, rz;
-
-  /* loop over quad verts */
-  for (i = 0; i < 4; i++) {
-    /* Compute sc = +/-scale and tc = +/-scale.
-     * Not +/-1 to avoid cube face selection ambiguity near the edges,
-     * though that can still sometimes happen with this scale factor...
-     *
-     * XXX: Yep, there is no safe scale factor that will prevent sampling
-     * the neighbouring face when stretching out.  A more reliable solution
-     * would be to clamp (sc, tc) against +/- 1.0-1.0/mipsize, in the shader.
-     *
-     * Also, this is not necessary when minifying, or 1:1 blits.
-     */
-    const float scale = allow_scale ? 0.9999f : 1.0f;
-    const float sc = (2 * in_st[0] - 1) * scale;
-    const float tc = (2 * in_st[1] - 1) * scale;
-
-    switch (face) {
-    case PIPE_TEX_FACE_POS_X:
-      rx = 1;
-      ry = -tc;
-      rz = -sc;
-      break;
-    case PIPE_TEX_FACE_NEG_X:
-      rx = -1;
-      ry = -tc;
-      rz = sc;
-      break;
-    case PIPE_TEX_FACE_POS_Y:
-      rx = sc;
-      ry = 1;
-      rz = tc;
-      break;
-    case PIPE_TEX_FACE_NEG_Y:
-      rx = sc;
-      ry = -1;
-      rz = -tc;
-      break;
-    case PIPE_TEX_FACE_POS_Z:
-      rx = sc;
-      ry = -tc;
-      rz = 1;
-      break;
-    case PIPE_TEX_FACE_NEG_Z:
-      rx = -sc;
-      ry = -tc;
-      rz = -1;
-      break;
-    default:
-      rx = ry = rz = 0;
-      assert(0);
-    }
-
-    out_str[0] = rx; /*s*/
-    out_str[1] = ry; /*t*/
-    out_str[2] = rz; /*r*/
-
-    in_st += in_stride;
-    out_str += out_stride;
-  }
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_texture.h b/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_texture.h
deleted file mode 100644
index db7a25a5c..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/auxiliary/util/u_texture.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 Marek Olšák <maraeo@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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef U_TEXTURE_H
-#define U_TEXTURE_H
-
-#include "pipe/p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Convert 2D texture coordinates of 4 vertices into cubemap coordinates
- * in the given face.
- * Coordinates must be in the range [0,1].
- *
- * \param face          Cubemap face.
- * \param in_st         4 pairs of 2D texture coordinates to convert.
- * \param in_stride     Stride of in_st in floats.
- * \param out_str       STR cubemap texture coordinates to compute.
- * \param out_stride    Stride of out_str in floats.
- */
-void util_map_texcoords2d_onto_cubemap(unsigned face, const float *in_st,
-                                       unsigned in_stride, float *out_str,
-                                       unsigned out_stride,
-                                       boolean allow_scale);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads.h b/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads.h
deleted file mode 100644
index c9030ef4e..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * C11 <threads.h> emulation library
- *
- * (C) Copyright yohhoy 2012.
- * Distributed under the Boost Software License, Version 1.0.
- *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (the "Software") to use, reproduce, display, distribute,
- * execute, and transmit the Software, and to prepare [[derivative work]]s of
- * the Software, and to permit third-parties to whom the Software is furnished
- * to do so, all subject to the following:
- *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
- *
- * 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#ifndef EMULATED_THREADS_H_INCLUDED_
-#define EMULATED_THREADS_H_INCLUDED_
-
-#include <time.h>
-
-#ifndef TIME_UTC
-#define TIME_UTC 1
-#endif
-
-#include "c99_compat.h" /* for `inline` */
-
-/*---------------------------- types ----------------------------*/
-typedef void (*tss_dtor_t)(void *);
-typedef int (*thrd_start_t)(void *);
-
-struct xtime {
-  time_t sec;
-  long nsec;
-};
-typedef struct xtime xtime;
-
-/*-------------------- enumeration constants --------------------*/
-enum { mtx_plain = 0, mtx_try = 1, mtx_timed = 2, mtx_recursive = 4 };
-
-enum {
-  thrd_success = 0, // succeeded
-  thrd_timeout,     // timeout
-  thrd_error,       // failed
-  thrd_busy,        // resource busy
-  thrd_nomem        // out of memory
-};
-
-/*-------------------------- functions --------------------------*/
-
-#include "threads_posix.h"
-
-#endif /* EMULATED_THREADS_H_INCLUDED_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads_posix.h b/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads_posix.h
deleted file mode 100644
index ebea7c567..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads_posix.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * C11 <threads.h> emulation library
- *
- * (C) Copyright yohhoy 2012.
- * Distributed under the Boost Software License, Version 1.0.
- *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (the "Software") to use, reproduce, display, distribute,
- * execute, and transmit the Software, and to prepare [[derivative work]]s of
- * the Software, and to permit third-parties to whom the Software is furnished
- * to do so, all subject to the following:
- *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
- *
- * 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#include <stdlib.h>
-#ifndef assert
-#include <assert.h>
-#endif
-#include <errno.h>
-#include <limits.h>
-#include <sched.h>
-#include <stdint.h> /* for intptr_t */
-#include <unistd.h>
-
-/*
-Configuration macro:
-
-  EMULATED_THREADS_USE_NATIVE_TIMEDLOCK
-    Use pthread_mutex_timedlock() for `mtx_timedlock()'
-    Otherwise use mtx_trylock() + *busy loop* emulation.
-*/
-#if !defined(__CYGWIN__) && !defined(__APPLE__) && !defined(__NetBSD__)
-#define EMULATED_THREADS_USE_NATIVE_TIMEDLOCK
-#endif
-
-#include <pthread.h>
-
-/*---------------------------- macros ----------------------------*/
-#define ONCE_FLAG_INIT PTHREAD_ONCE_INIT
-#ifdef INIT_ONCE_STATIC_INIT
-#define TSS_DTOR_ITERATIONS PTHREAD_DESTRUCTOR_ITERATIONS
-#else
-#define TSS_DTOR_ITERATIONS 1 // assume TSS dtor MAY be called at least once.
-#endif
-
-// FIXME: temporary non-standard hack to ease transition
-#define _MTX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
-
-/*---------------------------- types ----------------------------*/
-typedef pthread_cond_t cnd_t;
-typedef pthread_t thrd_t;
-typedef pthread_key_t tss_t;
-typedef pthread_mutex_t mtx_t;
-typedef pthread_once_t once_flag;
-
-/*
-Implementation limits:
-  - Conditionally emulation for "mutex with timeout"
-    (see EMULATED_THREADS_USE_NATIVE_TIMEDLOCK macro)
-*/
-struct impl_thrd_param {
-  thrd_start_t func;
-  void *arg;
-};
-
-static inline void *impl_thrd_routine(void *p) {
-  struct impl_thrd_param pack = *((struct impl_thrd_param *)p);
-  free(p);
-  return (void *)(intptr_t)pack.func(pack.arg);
-}
-
-/*--------------- 7.25.2 Initialization functions ---------------*/
-// 7.25.2.1
-static inline void call_once(once_flag *flag, void (*func)(void)) {
-  pthread_once(flag, func);
-}
-
-/*------------- 7.25.3 Condition variable functions -------------*/
-// 7.25.3.1
-static inline int cnd_broadcast(cnd_t *cond) {
-  assert(cond != NULL);
-  return (pthread_cond_broadcast(cond) == 0) ? thrd_success : thrd_error;
-}
-
-// 7.25.3.2
-static inline void cnd_destroy(cnd_t *cond) {
-  assert(cond);
-  pthread_cond_destroy(cond);
-}
-
-// 7.25.3.3
-static inline int cnd_init(cnd_t *cond) {
-  assert(cond != NULL);
-  return (pthread_cond_init(cond, NULL) == 0) ? thrd_success : thrd_error;
-}
-
-// 7.25.3.4
-static inline int cnd_signal(cnd_t *cond) {
-  assert(cond != NULL);
-  return (pthread_cond_signal(cond) == 0) ? thrd_success : thrd_error;
-}
-
-// 7.25.3.5
-static inline int cnd_timedwait(cnd_t *cond, mtx_t *mtx, const xtime *xt) {
-  struct timespec abs_time;
-  int rt;
-
-  assert(mtx != NULL);
-  assert(cond != NULL);
-  assert(xt != NULL);
-
-  abs_time.tv_sec = xt->sec;
-  abs_time.tv_nsec = xt->nsec;
-
-  rt = pthread_cond_timedwait(cond, mtx, &abs_time);
-  if (rt == ETIMEDOUT)
-    return thrd_busy;
-  return (rt == 0) ? thrd_success : thrd_error;
-}
-
-// 7.25.3.6
-static inline int cnd_wait(cnd_t *cond, mtx_t *mtx) {
-  assert(mtx != NULL);
-  assert(cond != NULL);
-  return (pthread_cond_wait(cond, mtx) == 0) ? thrd_success : thrd_error;
-}
-
-/*-------------------- 7.25.4 Mutex functions --------------------*/
-// 7.25.4.1
-static inline void mtx_destroy(mtx_t *mtx) {
-  assert(mtx != NULL);
-  pthread_mutex_destroy(mtx);
-}
-
-// 7.25.4.2
-static inline int mtx_init(mtx_t *mtx, int type) {
-  pthread_mutexattr_t attr;
-  assert(mtx != NULL);
-  if (type != mtx_plain && type != mtx_timed && type != mtx_try &&
-      type != (mtx_plain | mtx_recursive) &&
-      type != (mtx_timed | mtx_recursive) && type != (mtx_try | mtx_recursive))
-    return thrd_error;
-  pthread_mutexattr_init(&attr);
-  if ((type & mtx_recursive) != 0)
-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-  pthread_mutex_init(mtx, &attr);
-  pthread_mutexattr_destroy(&attr);
-  return thrd_success;
-}
-
-// 7.25.4.3
-static inline int mtx_lock(mtx_t *mtx) {
-  assert(mtx != NULL);
-  return (pthread_mutex_lock(mtx) == 0) ? thrd_success : thrd_error;
-}
-
-static inline int mtx_trylock(mtx_t *mtx);
-
-static inline void thrd_yield(void);
-
-// 7.25.4.4
-static inline int mtx_timedlock(mtx_t *mtx, const xtime *xt) {
-  assert(mtx != NULL);
-  assert(xt != NULL);
-
-  {
-#ifdef EMULATED_THREADS_USE_NATIVE_TIMEDLOCK
-    struct timespec ts;
-    int rt;
-    ts.tv_sec = xt->sec;
-    ts.tv_nsec = xt->nsec;
-    rt = pthread_mutex_timedlock(mtx, &ts);
-    if (rt == 0)
-      return thrd_success;
-    return (rt == ETIMEDOUT) ? thrd_busy : thrd_error;
-#else
-    time_t expire = time(NULL);
-    expire += xt->sec;
-    while (mtx_trylock(mtx) != thrd_success) {
-      time_t now = time(NULL);
-      if (expire < now)
-        return thrd_busy;
-      // busy loop!
-      thrd_yield();
-    }
-    return thrd_success;
-#endif
-  }
-}
-
-// 7.25.4.5
-static inline int mtx_trylock(mtx_t *mtx) {
-  assert(mtx != NULL);
-  return (pthread_mutex_trylock(mtx) == 0) ? thrd_success : thrd_busy;
-}
-
-// 7.25.4.6
-static inline int mtx_unlock(mtx_t *mtx) {
-  assert(mtx != NULL);
-  return (pthread_mutex_unlock(mtx) == 0) ? thrd_success : thrd_error;
-}
-
-/*------------------- 7.25.5 Thread functions -------------------*/
-// 7.25.5.1
-static inline int thrd_create(thrd_t *thr, thrd_start_t func, void *arg) {
-  struct impl_thrd_param *pack;
-  assert(thr != NULL);
-  pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
-  if (!pack)
-    return thrd_nomem;
-  pack->func = func;
-  pack->arg = arg;
-  if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-    free(pack);
-    return thrd_error;
-  }
-  return thrd_success;
-}
-
-// 7.25.5.2
-static inline thrd_t thrd_current(void) { return pthread_self(); }
-
-// 7.25.5.3
-static inline int thrd_detach(thrd_t thr) {
-  return (pthread_detach(thr) == 0) ? thrd_success : thrd_error;
-}
-
-// 7.25.5.4
-static inline int thrd_equal(thrd_t thr0, thrd_t thr1) {
-  return pthread_equal(thr0, thr1);
-}
-
-// 7.25.5.5
-static inline void thrd_exit(int res) { pthread_exit((void *)(intptr_t)res); }
-
-// 7.25.5.6
-static inline int thrd_join(thrd_t thr, int *res) {
-  void *code;
-  if (pthread_join(thr, &code) != 0)
-    return thrd_error;
-  if (res)
-    *res = (int)(intptr_t)code;
-  return thrd_success;
-}
-
-// 7.25.5.7
-static inline void thrd_sleep(const xtime *xt) {
-  struct timespec req;
-  assert(xt);
-  req.tv_sec = xt->sec;
-  req.tv_nsec = xt->nsec;
-  nanosleep(&req, NULL);
-}
-
-// 7.25.5.8
-static inline void thrd_yield(void) { sched_yield(); }
-
-/*----------- 7.25.6 Thread-specific storage functions -----------*/
-// 7.25.6.1
-static inline int tss_create(tss_t *key, tss_dtor_t dtor) {
-  assert(key != NULL);
-  return (pthread_key_create(key, dtor) == 0) ? thrd_success : thrd_error;
-}
-
-// 7.25.6.2
-static inline void tss_delete(tss_t key) { pthread_key_delete(key); }
-
-// 7.25.6.3
-static inline void *tss_get(tss_t key) { return pthread_getspecific(key); }
-
-// 7.25.6.4
-static inline int tss_set(tss_t key, void *val) {
-  return (pthread_setspecific(key, val) == 0) ? thrd_success : thrd_error;
-}
-
-/*-------------------- 7.25.7 Time functions --------------------*/
-// 7.25.6.1
-static inline int xtime_get(xtime *xt, int base) {
-  if (!xt)
-    return 0;
-  if (base == TIME_UTC) {
-    xt->sec = time(NULL);
-    xt->nsec = 0;
-    return base;
-  }
-  return 0;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads_win32.h b/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads_win32.h
deleted file mode 100644
index aae6b39bc..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/c11/threads_win32.h
+++ /dev/null
@@ -1,586 +0,0 @@
-/*
- * C11 <threads.h> emulation library
- *
- * (C) Copyright yohhoy 2012.
- * Distributed under the Boost Software License, Version 1.0.
- *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (the "Software") to use, reproduce, display, distribute,
- * execute, and transmit the Software, and to prepare [[derivative work]]s of
- * the Software, and to permit third-parties to whom the Software is furnished
- * to do so, all subject to the following:
- *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
- *
- * 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#ifndef assert
-#include <assert.h>
-#endif
-#include <errno.h>
-#include <limits.h>
-#include <process.h> // MSVCRT
-#include <stdlib.h>
-
-/*
-Configuration macro:
-
-  EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-    Use native WindowsAPI one-time initialization function.
-    (requires WinVista or later)
-    Otherwise emulate by mtx_trylock() + *busy loop* for WinXP.
-
-  EMULATED_THREADS_USE_NATIVE_CV
-    Use native WindowsAPI condition variable object.
-    (requires WinVista or later)
-    Otherwise use emulated implementation for WinXP.
-
-  EMULATED_THREADS_TSS_DTOR_SLOTNUM
-    Max registerable TSS dtor number.
-*/
-
-// XXX: Retain XP compatability
-#if 0
-#if _WIN32_WINNT >= 0x0600
-// Prefer native WindowsAPI on newer environment.
-#if !defined(__MINGW32__)
-#define EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-#endif
-#define EMULATED_THREADS_USE_NATIVE_CV
-#endif
-#endif
-#define EMULATED_THREADS_TSS_DTOR_SLOTNUM 64 // see TLS_MINIMUM_AVAILABLE
-
-#include <windows.h>
-
-// check configuration
-#if defined(EMULATED_THREADS_USE_NATIVE_CALL_ONCE) && (_WIN32_WINNT < 0x0600)
-#error EMULATED_THREADS_USE_NATIVE_CALL_ONCE requires _WIN32_WINNT>=0x0600
-#endif
-
-#if defined(EMULATED_THREADS_USE_NATIVE_CV) && (_WIN32_WINNT < 0x0600)
-#error EMULATED_THREADS_USE_NATIVE_CV requires _WIN32_WINNT>=0x0600
-#endif
-
-/*---------------------------- macros ----------------------------*/
-#ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-#define ONCE_FLAG_INIT INIT_ONCE_STATIC_INIT
-#else
-#define ONCE_FLAG_INIT {0}
-#endif
-#define TSS_DTOR_ITERATIONS 1
-
-// FIXME: temporary non-standard hack to ease transition
-#define _MTX_INITIALIZER_NP {(PCRITICAL_SECTION_DEBUG) - 1, -1, 0, 0, 0, 0}
-
-/*---------------------------- types ----------------------------*/
-typedef struct cnd_t {
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  CONDITION_VARIABLE condvar;
-#else
-  int blocked;
-  int gone;
-  int to_unblock;
-  HANDLE sem_queue;
-  HANDLE sem_gate;
-  CRITICAL_SECTION monitor;
-#endif
-} cnd_t;
-
-typedef HANDLE thrd_t;
-
-typedef DWORD tss_t;
-
-typedef CRITICAL_SECTION mtx_t;
-
-#ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-typedef INIT_ONCE once_flag;
-#else
-typedef struct once_flag_t {
-  volatile LONG status;
-} once_flag;
-#endif
-
-static inline void *tss_get(tss_t key);
-static inline void thrd_yield(void);
-static inline int mtx_trylock(mtx_t *mtx);
-static inline int mtx_lock(mtx_t *mtx);
-static inline int mtx_unlock(mtx_t *mtx);
-
-/*
-Implementation limits:
-  - Conditionally emulation for "Initialization functions"
-    (see EMULATED_THREADS_USE_NATIVE_CALL_ONCE macro)
-  - Emulated `mtx_timelock()' with mtx_trylock() + *busy loop*
-*/
-static void impl_tss_dtor_invoke(void); // forward decl.
-
-struct impl_thrd_param {
-  thrd_start_t func;
-  void *arg;
-};
-
-static unsigned __stdcall impl_thrd_routine(void *p) {
-  struct impl_thrd_param pack;
-  int code;
-  memcpy(&pack, p, sizeof(struct impl_thrd_param));
-  free(p);
-  code = pack.func(pack.arg);
-  impl_tss_dtor_invoke();
-  return (unsigned)code;
-}
-
-static DWORD impl_xtime2msec(const xtime *xt) {
-  return (DWORD)((xt->sec * 1000U) + (xt->nsec / 1000000L));
-}
-
-#ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-struct impl_call_once_param {
-  void (*func)(void);
-};
-static BOOL CALLBACK impl_call_once_callback(PINIT_ONCE InitOnce,
-                                             PVOID Parameter, PVOID *Context) {
-  struct impl_call_once_param *param = (struct impl_call_once_param *)Parameter;
-  (param->func)();
-  ((void)InitOnce);
-  ((void)Context); // suppress warning
-  return TRUE;
-}
-#endif // ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-
-#ifndef EMULATED_THREADS_USE_NATIVE_CV
-/*
-Note:
-  The implementation of condition variable is ported from Boost.Interprocess
-  See http://www.boost.org/boost/interprocess/sync/windows/condition.hpp
-*/
-static void impl_cond_do_signal(cnd_t *cond, int broadcast) {
-  int nsignal = 0;
-
-  EnterCriticalSection(&cond->monitor);
-  if (cond->to_unblock != 0) {
-    if (cond->blocked == 0) {
-      LeaveCriticalSection(&cond->monitor);
-      return;
-    }
-    if (broadcast) {
-      cond->to_unblock += nsignal = cond->blocked;
-      cond->blocked = 0;
-    } else {
-      nsignal = 1;
-      cond->to_unblock++;
-      cond->blocked--;
-    }
-  } else if (cond->blocked > cond->gone) {
-    WaitForSingleObject(cond->sem_gate, INFINITE);
-    if (cond->gone != 0) {
-      cond->blocked -= cond->gone;
-      cond->gone = 0;
-    }
-    if (broadcast) {
-      nsignal = cond->to_unblock = cond->blocked;
-      cond->blocked = 0;
-    } else {
-      nsignal = cond->to_unblock = 1;
-      cond->blocked--;
-    }
-  }
-  LeaveCriticalSection(&cond->monitor);
-
-  if (0 < nsignal)
-    ReleaseSemaphore(cond->sem_queue, nsignal, NULL);
-}
-
-static int impl_cond_do_wait(cnd_t *cond, mtx_t *mtx, const xtime *xt) {
-  int nleft = 0;
-  int ngone = 0;
-  int timeout = 0;
-  DWORD w;
-
-  WaitForSingleObject(cond->sem_gate, INFINITE);
-  cond->blocked++;
-  ReleaseSemaphore(cond->sem_gate, 1, NULL);
-
-  mtx_unlock(mtx);
-
-  w = WaitForSingleObject(cond->sem_queue, xt ? impl_xtime2msec(xt) : INFINITE);
-  timeout = (w == WAIT_TIMEOUT);
-
-  EnterCriticalSection(&cond->monitor);
-  if ((nleft = cond->to_unblock) != 0) {
-    if (timeout) {
-      if (cond->blocked != 0) {
-        cond->blocked--;
-      } else {
-        cond->gone++;
-      }
-    }
-    if (--cond->to_unblock == 0) {
-      if (cond->blocked != 0) {
-        ReleaseSemaphore(cond->sem_gate, 1, NULL);
-        nleft = 0;
-      } else if ((ngone = cond->gone) != 0) {
-        cond->gone = 0;
-      }
-    }
-  } else if (++cond->gone == INT_MAX / 2) {
-    WaitForSingleObject(cond->sem_gate, INFINITE);
-    cond->blocked -= cond->gone;
-    ReleaseSemaphore(cond->sem_gate, 1, NULL);
-    cond->gone = 0;
-  }
-  LeaveCriticalSection(&cond->monitor);
-
-  if (nleft == 1) {
-    while (ngone--)
-      WaitForSingleObject(cond->sem_queue, INFINITE);
-    ReleaseSemaphore(cond->sem_gate, 1, NULL);
-  }
-
-  mtx_lock(mtx);
-  return timeout ? thrd_busy : thrd_success;
-}
-#endif // ifndef EMULATED_THREADS_USE_NATIVE_CV
-
-static struct impl_tss_dtor_entry {
-  tss_t key;
-  tss_dtor_t dtor;
-} impl_tss_dtor_tbl[EMULATED_THREADS_TSS_DTOR_SLOTNUM];
-
-static int impl_tss_dtor_register(tss_t key, tss_dtor_t dtor) {
-  int i;
-  for (i = 0; i < EMULATED_THREADS_TSS_DTOR_SLOTNUM; i++) {
-    if (!impl_tss_dtor_tbl[i].dtor)
-      break;
-  }
-  if (i == EMULATED_THREADS_TSS_DTOR_SLOTNUM)
-    return 1;
-  impl_tss_dtor_tbl[i].key = key;
-  impl_tss_dtor_tbl[i].dtor = dtor;
-  return 0;
-}
-
-static void impl_tss_dtor_invoke() {
-  int i;
-  for (i = 0; i < EMULATED_THREADS_TSS_DTOR_SLOTNUM; i++) {
-    if (impl_tss_dtor_tbl[i].dtor) {
-      void *val = tss_get(impl_tss_dtor_tbl[i].key);
-      if (val)
-        (impl_tss_dtor_tbl[i].dtor)(val);
-    }
-  }
-}
-
-/*--------------- 7.25.2 Initialization functions ---------------*/
-// 7.25.2.1
-static inline void call_once(once_flag *flag, void (*func)(void)) {
-  assert(flag && func);
-#ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE
-  {
-    struct impl_call_once_param param;
-    param.func = func;
-    InitOnceExecuteOnce(flag, impl_call_once_callback, (PVOID)&param, NULL);
-  }
-#else
-  if (InterlockedCompareExchange(&flag->status, 1, 0) == 0) {
-    (func)();
-    InterlockedExchange(&flag->status, 2);
-  } else {
-    while (flag->status == 1) {
-      // busy loop!
-      thrd_yield();
-    }
-  }
-#endif
-}
-
-/*------------- 7.25.3 Condition variable functions -------------*/
-// 7.25.3.1
-static inline int cnd_broadcast(cnd_t *cond) {
-  if (!cond)
-    return thrd_error;
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  WakeAllConditionVariable(&cond->condvar);
-#else
-  impl_cond_do_signal(cond, 1);
-#endif
-  return thrd_success;
-}
-
-// 7.25.3.2
-static inline void cnd_destroy(cnd_t *cond) {
-  assert(cond);
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  // do nothing
-#else
-  CloseHandle(cond->sem_queue);
-  CloseHandle(cond->sem_gate);
-  DeleteCriticalSection(&cond->monitor);
-#endif
-}
-
-// 7.25.3.3
-static inline int cnd_init(cnd_t *cond) {
-  if (!cond)
-    return thrd_error;
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  InitializeConditionVariable(&cond->condvar);
-#else
-  cond->blocked = 0;
-  cond->gone = 0;
-  cond->to_unblock = 0;
-  cond->sem_queue = CreateSemaphore(NULL, 0, LONG_MAX, NULL);
-  cond->sem_gate = CreateSemaphore(NULL, 1, 1, NULL);
-  InitializeCriticalSection(&cond->monitor);
-#endif
-  return thrd_success;
-}
-
-// 7.25.3.4
-static inline int cnd_signal(cnd_t *cond) {
-  if (!cond)
-    return thrd_error;
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  WakeConditionVariable(&cond->condvar);
-#else
-  impl_cond_do_signal(cond, 0);
-#endif
-  return thrd_success;
-}
-
-// 7.25.3.5
-static inline int cnd_timedwait(cnd_t *cond, mtx_t *mtx, const xtime *xt) {
-  if (!cond || !mtx || !xt)
-    return thrd_error;
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  if (SleepConditionVariableCS(&cond->condvar, mtx, impl_xtime2msec(xt)))
-    return thrd_success;
-  return (GetLastError() == ERROR_TIMEOUT) ? thrd_busy : thrd_error;
-#else
-  return impl_cond_do_wait(cond, mtx, xt);
-#endif
-}
-
-// 7.25.3.6
-static inline int cnd_wait(cnd_t *cond, mtx_t *mtx) {
-  if (!cond || !mtx)
-    return thrd_error;
-#ifdef EMULATED_THREADS_USE_NATIVE_CV
-  SleepConditionVariableCS(&cond->condvar, mtx, INFINITE);
-#else
-  impl_cond_do_wait(cond, mtx, NULL);
-#endif
-  return thrd_success;
-}
-
-/*-------------------- 7.25.4 Mutex functions --------------------*/
-// 7.25.4.1
-static inline void mtx_destroy(mtx_t *mtx) {
-  assert(mtx);
-  DeleteCriticalSection(mtx);
-}
-
-// 7.25.4.2
-static inline int mtx_init(mtx_t *mtx, int type) {
-  if (!mtx)
-    return thrd_error;
-  if (type != mtx_plain && type != mtx_timed && type != mtx_try &&
-      type != (mtx_plain | mtx_recursive) &&
-      type != (mtx_timed | mtx_recursive) && type != (mtx_try | mtx_recursive))
-    return thrd_error;
-  InitializeCriticalSection(mtx);
-  return thrd_success;
-}
-
-// 7.25.4.3
-static inline int mtx_lock(mtx_t *mtx) {
-  if (!mtx)
-    return thrd_error;
-  EnterCriticalSection(mtx);
-  return thrd_success;
-}
-
-// 7.25.4.4
-static inline int mtx_timedlock(mtx_t *mtx, const xtime *xt) {
-  time_t expire, now;
-  if (!mtx || !xt)
-    return thrd_error;
-  expire = time(NULL);
-  expire += xt->sec;
-  while (mtx_trylock(mtx) != thrd_success) {
-    now = time(NULL);
-    if (expire < now)
-      return thrd_busy;
-    // busy loop!
-    thrd_yield();
-  }
-  return thrd_success;
-}
-
-// 7.25.4.5
-static inline int mtx_trylock(mtx_t *mtx) {
-  if (!mtx)
-    return thrd_error;
-  return TryEnterCriticalSection(mtx) ? thrd_success : thrd_busy;
-}
-
-// 7.25.4.6
-static inline int mtx_unlock(mtx_t *mtx) {
-  if (!mtx)
-    return thrd_error;
-  LeaveCriticalSection(mtx);
-  return thrd_success;
-}
-
-/*------------------- 7.25.5 Thread functions -------------------*/
-// 7.25.5.1
-static inline int thrd_create(thrd_t *thr, thrd_start_t func, void *arg) {
-  struct impl_thrd_param *pack;
-  uintptr_t handle;
-  if (!thr)
-    return thrd_error;
-  pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
-  if (!pack)
-    return thrd_nomem;
-  pack->func = func;
-  pack->arg = arg;
-  handle = _beginthreadex(NULL, 0, impl_thrd_routine, pack, 0, NULL);
-  if (handle == 0) {
-    if (errno == EAGAIN || errno == EACCES)
-      return thrd_nomem;
-    return thrd_error;
-  }
-  *thr = (thrd_t)handle;
-  return thrd_success;
-}
-
-#if 0
-// 7.25.5.2
-static inline thrd_t
-thrd_current(void)
-{
-    HANDLE hCurrentThread;
-    BOOL bRet;
-
-    /* GetCurrentThread() returns a pseudo-handle, which is useless.  We need
-     * to call DuplicateHandle to get a real handle.  However the handle value
-     * will not match the one returned by thread_create.
-     *
-     * Other potential solutions would be:
-     * - define thrd_t as a thread Ids, but this would mean we'd need to OpenThread for many operations
-     * - use malloc'ed memory for thrd_t. This would imply using TLS for current thread.
-     *
-     * Neither is particularly nice.
-     *
-     * Life would be much easier if C11 threads had different abstractions for
-     * threads and thread IDs, just like C++11 threads does...
-     */
-
-    bRet = DuplicateHandle(GetCurrentProcess(), // source process (pseudo) handle
-                           GetCurrentThread(), // source (pseudo) handle
-                           GetCurrentProcess(), // target process
-                           &hCurrentThread, // target handle
-                           0,
-                           FALSE,
-                           DUPLICATE_SAME_ACCESS);
-    assert(bRet);
-    if (!bRet) {
-	hCurrentThread = GetCurrentThread();
-    }
-    return hCurrentThread;
-}
-#endif
-
-// 7.25.5.3
-static inline int thrd_detach(thrd_t thr) {
-  CloseHandle(thr);
-  return thrd_success;
-}
-
-// 7.25.5.4
-static inline int thrd_equal(thrd_t thr0, thrd_t thr1) {
-  return GetThreadId(thr0) == GetThreadId(thr1);
-}
-
-// 7.25.5.5
-static inline void thrd_exit(int res) {
-  impl_tss_dtor_invoke();
-  _endthreadex((unsigned)res);
-}
-
-// 7.25.5.6
-static inline int thrd_join(thrd_t thr, int *res) {
-  DWORD w, code;
-  w = WaitForSingleObject(thr, INFINITE);
-  if (w != WAIT_OBJECT_0)
-    return thrd_error;
-  if (res) {
-    if (!GetExitCodeThread(thr, &code)) {
-      CloseHandle(thr);
-      return thrd_error;
-    }
-    *res = (int)code;
-  }
-  CloseHandle(thr);
-  return thrd_success;
-}
-
-// 7.25.5.7
-static inline void thrd_sleep(const xtime *xt) {
-  assert(xt);
-  Sleep(impl_xtime2msec(xt));
-}
-
-// 7.25.5.8
-static inline void thrd_yield(void) { SwitchToThread(); }
-
-/*----------- 7.25.6 Thread-specific storage functions -----------*/
-// 7.25.6.1
-static inline int tss_create(tss_t *key, tss_dtor_t dtor) {
-  if (!key)
-    return thrd_error;
-  *key = TlsAlloc();
-  if (dtor) {
-    if (impl_tss_dtor_register(*key, dtor)) {
-      TlsFree(*key);
-      return thrd_error;
-    }
-  }
-  return (*key != 0xFFFFFFFF) ? thrd_success : thrd_error;
-}
-
-// 7.25.6.2
-static inline void tss_delete(tss_t key) { TlsFree(key); }
-
-// 7.25.6.3
-static inline void *tss_get(tss_t key) { return TlsGetValue(key); }
-
-// 7.25.6.4
-static inline int tss_set(tss_t key, void *val) {
-  return TlsSetValue(key, val) ? thrd_success : thrd_error;
-}
-
-/*-------------------- 7.25.7 Time functions --------------------*/
-// 7.25.6.1
-static inline int xtime_get(xtime *xt, int base) {
-  if (!xt)
-    return 0;
-  if (base == TIME_UTC) {
-    xt->sec = time(NULL);
-    xt->nsec = 0;
-    return base;
-  }
-  return 0;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/c99_compat.h b/app/src/main/cpp/virglrenderer/src/gallium/include/c99_compat.h
deleted file mode 100644
index 05afdf7d4..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/c99_compat.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2013 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#include "no_extern_c.h"
-
-#ifndef _C99_COMPAT_H_
-#define _C99_COMPAT_H_
-
-/*
- * MSVC hacks.
- */
-#if defined(_MSC_VER)
-
-#if _MSC_VER < 1500
-#error "Microsoft Visual Studio 2008 or higher required"
-#endif
-
-/*
- * Visual Studio 2012 will complain if we define the `inline` keyword, but
- * actually it only supports the keyword on C++.
- *
- * To avoid this the _ALLOW_KEYWORD_MACROS must be set.
- */
-#if (_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS)
-#define _ALLOW_KEYWORD_MACROS
-#endif
-
-/*
- * XXX: MSVC has a `__restrict` keyword, but it also has a
- * `__declspec(restrict)` modifier, so it is impossible to define a
- * `restrict` macro without interfering with the latter.  Furthermore the
- * MSVC standard library uses __declspec(restrict) under the _CRTRESTRICT
- * macro.  For now resolve this issue by redefining _CRTRESTRICT, but going
- * forward we should probably should stop using restrict, especially
- * considering that our code does not obbey strict aliasing rules any way.
- */
-#include <crtdefs.h>
-#undef _CRTRESTRICT
-#define _CRTRESTRICT
-#endif
-
-/*
- * C99 inline keyword
- */
-#ifndef inline
-#ifdef __cplusplus
-/* C++ supports inline keyword */
-#elif defined(__GNUC__)
-#define inline __inline__
-#elif defined(_MSC_VER)
-#define inline __inline
-#elif defined(__ICL)
-#define inline __inline
-#elif defined(__INTEL_COMPILER)
-/* Intel compiler supports inline keyword */
-#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
-#define inline __inline
-#elif (__STDC_VERSION__ >= 199901L)
-/* C99 supports inline keyword */
-#else
-#define inline
-#endif
-#endif
-
-/*
- * C99 restrict keyword
- *
- * See also:
- * -
- * http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
- */
-#ifndef restrict
-#if (__STDC_VERSION__ >= 199901L)
-/* C99 */
-#elif defined(__GNUC__)
-#define restrict __restrict__
-#elif defined(_MSC_VER)
-#define restrict __restrict
-#else
-#define restrict /* */
-#endif
-#endif
-
-/*
- * C99 __func__ macro
- */
-#ifndef __func__
-#if (__STDC_VERSION__ >= 199901L)
-/* C99 */
-#elif defined(__GNUC__)
-#define __func__ __FUNCTION__
-#elif defined(_MSC_VER)
-#define __func__ __FUNCTION__
-#else
-#define __func__ "<unknown>"
-#endif
-#endif
-
-/* Simple test case for debugging */
-#if 0
-static inline const char *
-test_c99_compat_h(const void * restrict a,
-                  const void * restrict b)
-{
-   return __func__;
-}
-#endif
-
-#endif /* _C99_COMPAT_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/no_extern_c.h b/app/src/main/cpp/virglrenderer/src/gallium/include/no_extern_c.h
deleted file mode 100644
index 8d83ce40b..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/no_extern_c.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2014 VMware, Inc.
- * All Rights Reserved.
- *
- * 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.
- *
- **************************************************************************/
-
-/*
- * Including system's headers inside `extern "C" { ... }` is not safe, as system
- * headers may have C++ code in them, and C++ code inside extern "C"
- * leads to syntatically incorrect code.
- *
- * This is because putting code inside extern "C" won't make __cplusplus define
- * go away, that is, the system header being included thinks is free to use C++
- * as it sees fits.
- *
- * Including non-system headers inside extern "C"  is not safe either, because
- * non-system headers end up including system headers, hence fall in the above
- * case too.
- *
- * Conclusion, includes inside extern "C" is simply not portable.
- *
- *
- * This header helps surface these issues.
- */
-
-#ifdef __cplusplus
-template <class T> class _IncludeInsideExternCNotPortable;
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_compiler.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_compiler.h
deleted file mode 100644
index e8791ed7a..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_compiler.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef P_COMPILER_H
-#define P_COMPILER_H
-
-#include "p_config.h"
-
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(_WIN32) && !defined(__WIN32__)
-#define __WIN32__
-#endif
-
-#if defined(_MSC_VER)
-
-/* Avoid 'expression is always true' warning */
-#pragma warning(disable : 4296)
-
-#endif /* _MSC_VER */
-
-/*
- * Alternative stdint.h and stdbool.h headers are supplied in include/c99 for
- * systems that lack it.
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(__HAIKU__) && !defined(__USE_MISC)
-#if !defined(PIPE_OS_ANDROID)
-typedef unsigned int uint;
-#endif
-typedef unsigned short ushort;
-#endif
-typedef unsigned char ubyte;
-
-typedef unsigned char boolean;
-#ifndef TRUE
-#define TRUE true
-#endif
-#ifndef FALSE
-#define FALSE false
-#endif
-
-#ifndef va_copy
-#ifdef __va_copy
-#define va_copy(dest, src) __va_copy((dest), (src))
-#else
-#define va_copy(dest, src) (dest) = (src)
-#endif
-#endif
-
-/* Function visibility */
-#ifndef PUBLIC
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define PUBLIC __attribute__((visibility("default")))
-#elif defined(_MSC_VER)
-#define PUBLIC __declspec(dllexport)
-#else
-#define PUBLIC
-#endif
-#endif
-
-/* XXX: Use standard `__func__` instead */
-#ifndef __FUNCTION__
-#define __FUNCTION__ __func__
-#endif
-
-/* This should match linux gcc cdecl semantics everywhere, so that we
- * just codegen one calling convention on all platforms.
- */
-#ifdef _MSC_VER
-#define PIPE_CDECL __cdecl
-#else
-#define PIPE_CDECL
-#endif
-
-#if defined(__GNUC__)
-#define PIPE_DEPRECATED __attribute__((__deprecated__))
-#else
-#define PIPE_DEPRECATED
-#endif
-
-/* Macros for data alignment. */
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) ||     \
-    defined(__SUNPRO_CC)
-
-/* See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Type-Attributes.html */
-#define PIPE_ALIGN_TYPE(_alignment, _type)                                     \
-  _type __attribute__((aligned(_alignment)))
-
-/* See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Variable-Attributes.html */
-#define PIPE_ALIGN_VAR(_alignment) __attribute__((aligned(_alignment)))
-
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)) &&                 \
-    !defined(PIPE_ARCH_X86_64)
-#define PIPE_ALIGN_STACK __attribute__((force_align_arg_pointer))
-#else
-#define PIPE_ALIGN_STACK
-#endif
-
-#elif defined(_MSC_VER)
-
-/* See http://msdn.microsoft.com/en-us/library/83ythb65.aspx */
-#define PIPE_ALIGN_TYPE(_alignment, _type) __declspec(align(_alignment)) _type
-#define PIPE_ALIGN_VAR(_alignment) __declspec(align(_alignment))
-
-#define PIPE_ALIGN_STACK
-
-#elif defined(SWIG)
-
-#define PIPE_ALIGN_TYPE(_alignment, _type) _type
-#define PIPE_ALIGN_VAR(_alignment)
-
-#define PIPE_ALIGN_STACK
-
-#else
-
-#error "Unsupported compiler"
-
-#endif
-
-#if defined(__GNUC__)
-
-#define PIPE_READ_WRITE_BARRIER() __asm__("" ::: "memory")
-
-#elif defined(_MSC_VER)
-
-void _ReadWriteBarrier(void);
-#pragma intrinsic(_ReadWriteBarrier)
-#define PIPE_READ_WRITE_BARRIER() _ReadWriteBarrier()
-
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-
-#define PIPE_READ_WRITE_BARRIER() __machine_rw_barrier()
-
-#else
-
-#warning "Unsupported compiler"
-#define PIPE_READ_WRITE_BARRIER() /* */
-
-#endif
-
-/* You should use these macros to mark if blocks where the if condition
- * is either likely to be true, or unlikely to be true.
- *
- * This will inform human readers of this fact, and will also inform
- * the compiler, who will in turn inform the CPU.
- *
- * CPUs often start executing code inside the if or the else blocks
- * without knowing whether the condition is true or not, and will have
- * to throw the work away if they find out later they executed the
- * wrong part of the if.
- *
- * If these macros are used, the CPU is more likely to correctly predict
- * the right path, and will avoid speculatively executing the wrong branch,
- * thus not throwing away work, resulting in better performance.
- *
- * In light of this, it is also a good idea to mark as "likely" a path
- * which is not necessarily always more likely, but that will benefit much
- * more from performance improvements since it is already much faster than
- * the other path, or viceversa with "unlikely".
- *
- * Example usage:
- * if(unlikely(do_we_need_a_software_fallback()))
- *    do_software_fallback();
- * else
- *    render_with_gpu();
- *
- * The macros follow the Linux kernel convention, and more examples can
- * be found there.
- *
- * Note that profile guided optimization can offer better results, but
- * needs an appropriate coverage suite and does not inform human readers.
- */
-#ifndef likely
-#if defined(__GNUC__)
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#else
-#define likely(x) (x)
-#define unlikely(x) (x)
-#endif
-#endif
-
-/**
- * Static (compile-time) assertion.
- * Basically, use COND to dimension an array.  If COND is false/zero the
- * array size will be -1 and we'll get a compilation error.
- */
-#define STATIC_ASSERT(COND)                                                    \
-  do {                                                                         \
-    (void)sizeof(char[1 - 2 * !(COND)]);                                       \
-  } while (0)
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* P_COMPILER_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_config.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_config.h
deleted file mode 100644
index e3f37e2fd..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_config.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Gallium configuration defines.
- *
- * This header file sets several defines based on the compiler, processor
- * architecture, and operating system being used. These defines should be used
- * throughout the code to facilitate porting to new platforms. It is likely that
- * this file is auto-generated by an autoconf-like tool at some point, as some
- * things cannot be determined by pre-defined environment alone.
- *
- * See also:
- * - http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
- * - echo | gcc -dM -E - | sort
- * - http://msdn.microsoft.com/en-us/library/b0084kay.aspx
- *
- * @author José Fonseca <jfonseca@vmware.com>
- */
-
-#ifndef P_CONFIG_H_
-#define P_CONFIG_H_
-
-#include <limits.h>
-/*
- * Compiler
- */
-
-#if defined(__GNUC__)
-#define PIPE_CC_GCC
-#define PIPE_CC_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#endif
-
-/*
- * Meaning of _MSC_VER value:
- * - 1800: Visual Studio 2013
- * - 1700: Visual Studio 2012
- * - 1600: Visual Studio 2010
- * - 1500: Visual Studio 2008
- * - 1400: Visual C++ 2005
- * - 1310: Visual C++ .NET 2003
- * - 1300: Visual C++ .NET 2002
- *
- * __MSC__ seems to be an old macro -- it is not pre-defined on recent MSVC
- * versions.
- */
-#if defined(_MSC_VER) || defined(__MSC__)
-#define PIPE_CC_MSVC
-#endif
-
-#if defined(__ICL)
-#define PIPE_CC_ICL
-#endif
-
-#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#define PIPE_CC_SUNPRO
-#endif
-
-/*
- * Processor architecture
- */
-
-#if defined(__i386__) /* gcc */ || defined(_M_IX86) /* msvc */ ||              \
-    defined(_X86_) || defined(__386__) || defined(i386) ||                     \
-    defined(__i386) /* Sun cc */
-#define PIPE_ARCH_X86
-#endif
-
-#if defined(__x86_64__) /* gcc */ || defined(_M_X64) /* msvc */ ||             \
-    defined(_M_AMD64) /* msvc */ || defined(__x86_64) /* Sun cc */
-#define PIPE_ARCH_X86_64
-#endif
-
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
-#if defined(PIPE_CC_GCC) && !defined(__SSE2__)
-/* #warning SSE2 support requires -msse -msse2 compiler options */
-#else
-#define PIPE_ARCH_SSE
-#endif
-#if defined(PIPE_CC_GCC) && !defined(__SSSE3__)
-/* #warning SSE3 support requires -msse3 compiler options */
-#else
-#define PIPE_ARCH_SSSE3
-#endif
-#endif
-
-#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__)
-#define PIPE_ARCH_PPC
-#if defined(__ppc64__) || defined(__PPC64__)
-#define PIPE_ARCH_PPC_64
-#endif
-#endif
-
-#if defined(__s390x__)
-#define PIPE_ARCH_S390
-#endif
-
-#if defined(__arm__)
-#define PIPE_ARCH_ARM
-#endif
-
-#if defined(__aarch64__)
-#define PIPE_ARCH_AARCH64
-#endif
-
-/*
- * Endian detection.
- */
-
-#ifdef __GLIBC__
-#include <endian.h>
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define PIPE_ARCH_LITTLE_ENDIAN
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define PIPE_ARCH_BIG_ENDIAN
-#endif
-
-#elif defined(__APPLE__)
-#include <machine/endian.h>
-
-#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
-#define PIPE_ARCH_LITTLE_ENDIAN
-#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
-#define PIPE_ARCH_BIG_ENDIAN
-#endif
-
-#elif defined(__sun)
-#include <sys/isa_defs.h>
-
-#if defined(_LITTLE_ENDIAN)
-#define PIPE_ARCH_LITTLE_ENDIAN
-#elif defined(_BIG_ENDIAN)
-#define PIPE_ARCH_BIG_ENDIAN
-#endif
-
-#else
-
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) ||                     \
-    defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
-#define PIPE_ARCH_LITTLE_ENDIAN
-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) ||                   \
-    defined(PIPE_ARCH_S390)
-#define PIPE_ARCH_BIG_ENDIAN
-#endif
-
-#endif
-
-#if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN)
-#error Unknown Endianness
-#endif
-
-/*
- * Auto-detect the operating system family.
- *
- * See subsystem below for a more fine-grained distinction.
- */
-
-#if defined(__linux__)
-#define PIPE_OS_LINUX
-#define PIPE_OS_UNIX
-#endif
-
-/*
- * Android defines __linux__ so PIPE_OS_LINUX and PIPE_OS_UNIX will also be
- * defined.
- */
-#if defined(ANDROID)
-#define PIPE_OS_ANDROID
-#endif
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#define PIPE_OS_FREEBSD
-#define PIPE_OS_BSD
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(__OpenBSD__)
-#define PIPE_OS_OPENBSD
-#define PIPE_OS_BSD
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(__NetBSD__)
-#define PIPE_OS_NETBSD
-#define PIPE_OS_BSD
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(__GNU__)
-#define PIPE_OS_HURD
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(__sun)
-#define PIPE_OS_SOLARIS
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(__APPLE__)
-#define PIPE_OS_APPLE
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(_WIN32) || defined(WIN32)
-#define PIPE_OS_WINDOWS
-#endif
-
-#if defined(__HAIKU__)
-#define PIPE_OS_HAIKU
-#define PIPE_OS_UNIX
-#endif
-
-#if defined(__CYGWIN__)
-#define PIPE_OS_CYGWIN
-#define PIPE_OS_UNIX
-#endif
-
-/*
- * Try to auto-detect the subsystem.
- *
- * NOTE: There is no way to auto-detect most of these.
- */
-
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
-#define PIPE_SUBSYSTEM_DRI
-#endif /* PIPE_OS_LINUX || PIPE_OS_BSD || PIPE_OS_SOLARIS */
-
-#if defined(PIPE_OS_WINDOWS)
-#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-/* Windows User-space Library */
-#else
-#define PIPE_SUBSYSTEM_WINDOWS_USER
-#endif
-#endif /* PIPE_OS_WINDOWS */
-
-#endif /* P_CONFIG_H_ */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_context.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_context.h
deleted file mode 100644
index 982219f7a..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_context.h
+++ /dev/null
@@ -1,509 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef PIPE_CONTEXT_H
-#define PIPE_CONTEXT_H
-
-#include "p_compiler.h"
-#include "p_defines.h"
-#include "p_format.h"
-#include "p_video_enums.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct pipe_blend_color;
-struct pipe_blend_state;
-struct pipe_blit_info;
-struct pipe_box;
-struct pipe_clip_state;
-struct pipe_constant_buffer;
-struct pipe_depth_stencil_alpha_state;
-struct pipe_draw_info;
-struct pipe_fence_handle;
-struct pipe_framebuffer_state;
-struct pipe_index_buffer;
-struct pipe_query;
-struct pipe_poly_stipple;
-struct pipe_rasterizer_state;
-struct pipe_resolve_info;
-struct pipe_resource;
-struct pipe_sampler_state;
-struct pipe_sampler_view;
-struct pipe_scissor_state;
-struct pipe_shader_state;
-struct pipe_stencil_ref;
-struct pipe_stream_output_target;
-struct pipe_surface;
-struct pipe_transfer;
-struct pipe_vertex_buffer;
-struct pipe_vertex_element;
-struct pipe_video_buffer;
-struct pipe_video_codec;
-struct pipe_viewport_state;
-struct pipe_compute_state;
-union pipe_color_union;
-union pipe_query_result;
-
-/**
- * Gallium rendering context.  Basically:
- *  - state setting functions
- *  - VBO drawing functions
- *  - surface functions
- */
-struct pipe_context {
-  struct pipe_screen *screen;
-
-  void *priv; /**< context private data (for DRI for example) */
-  void *draw; /**< private, for draw module (temporary?) */
-
-  void (*destroy)(struct pipe_context *);
-
-  /**
-   * VBO drawing
-   */
-  /*@{*/
-  void (*draw_vbo)(struct pipe_context *pipe,
-                   const struct pipe_draw_info *info);
-  /*@}*/
-
-  /**
-   * Predicate subsequent rendering on occlusion query result
-   * \param query  the query predicate, or NULL if no predicate
-   * \param condition whether to skip on FALSE or TRUE query results
-   * \param mode  one of PIPE_RENDER_COND_x
-   */
-  void (*render_condition)(struct pipe_context *pipe, struct pipe_query *query,
-                           boolean condition, uint mode);
-
-  /**
-   * Query objects
-   */
-  /*@{*/
-  struct pipe_query *(*create_query)(struct pipe_context *pipe,
-                                     unsigned query_type);
-
-  void (*destroy_query)(struct pipe_context *pipe, struct pipe_query *q);
-
-  void (*begin_query)(struct pipe_context *pipe, struct pipe_query *q);
-  void (*end_query)(struct pipe_context *pipe, struct pipe_query *q);
-
-  /**
-   * Get results of a query.
-   * \param wait  if true, this query will block until the result is ready
-   * \return TRUE if results are ready, FALSE otherwise
-   */
-  boolean (*get_query_result)(struct pipe_context *pipe, struct pipe_query *q,
-                              boolean wait, union pipe_query_result *result);
-  /*@}*/
-
-  /**
-   * State functions (create/bind/destroy state objects)
-   */
-  /*@{*/
-  void *(*create_blend_state)(struct pipe_context *,
-                              const struct pipe_blend_state *);
-  void (*bind_blend_state)(struct pipe_context *, void *);
-  void (*delete_blend_state)(struct pipe_context *, void *);
-
-  void *(*create_sampler_state)(struct pipe_context *,
-                                const struct pipe_sampler_state *);
-  void (*bind_sampler_states)(struct pipe_context *, unsigned shader,
-                              unsigned start_slot, unsigned num_samplers,
-                              void **samplers);
-  void (*delete_sampler_state)(struct pipe_context *, void *);
-
-  void *(*create_rasterizer_state)(struct pipe_context *,
-                                   const struct pipe_rasterizer_state *);
-  void (*bind_rasterizer_state)(struct pipe_context *, void *);
-  void (*delete_rasterizer_state)(struct pipe_context *, void *);
-
-  void *(*create_depth_stencil_alpha_state)(
-      struct pipe_context *, const struct pipe_depth_stencil_alpha_state *);
-  void (*bind_depth_stencil_alpha_state)(struct pipe_context *, void *);
-  void (*delete_depth_stencil_alpha_state)(struct pipe_context *, void *);
-
-  void *(*create_fs_state)(struct pipe_context *,
-                           const struct pipe_shader_state *);
-  void (*bind_fs_state)(struct pipe_context *, void *);
-  void (*delete_fs_state)(struct pipe_context *, void *);
-
-  void *(*create_vs_state)(struct pipe_context *,
-                           const struct pipe_shader_state *);
-  void (*bind_vs_state)(struct pipe_context *, void *);
-  void (*delete_vs_state)(struct pipe_context *, void *);
-
-  void *(*create_gs_state)(struct pipe_context *,
-                           const struct pipe_shader_state *);
-  void (*bind_gs_state)(struct pipe_context *, void *);
-  void (*delete_gs_state)(struct pipe_context *, void *);
-
-  void *(*create_vertex_elements_state)(struct pipe_context *,
-                                        unsigned num_elements,
-                                        const struct pipe_vertex_element *);
-  void (*bind_vertex_elements_state)(struct pipe_context *, void *);
-  void (*delete_vertex_elements_state)(struct pipe_context *, void *);
-
-  /*@}*/
-
-  /**
-   * Parameter-like state (or properties)
-   */
-  /*@{*/
-  void (*set_blend_color)(struct pipe_context *,
-                          const struct pipe_blend_color *);
-
-  void (*set_stencil_ref)(struct pipe_context *,
-                          const struct pipe_stencil_ref *);
-
-  void (*set_sample_mask)(struct pipe_context *, unsigned sample_mask);
-
-  void (*set_clip_state)(struct pipe_context *, const struct pipe_clip_state *);
-
-  void (*set_constant_buffer)(struct pipe_context *, uint shader, uint index,
-                              struct pipe_constant_buffer *buf);
-
-  void (*set_framebuffer_state)(struct pipe_context *,
-                                const struct pipe_framebuffer_state *);
-
-  void (*set_polygon_stipple)(struct pipe_context *,
-                              const struct pipe_poly_stipple *);
-
-  void (*set_scissor_states)(struct pipe_context *, unsigned start_slot,
-                             unsigned num_scissors,
-                             const struct pipe_scissor_state *);
-
-  void (*set_viewport_states)(struct pipe_context *, unsigned start_slot,
-                              unsigned num_viewports,
-                              const struct pipe_viewport_state *);
-
-  void (*set_sampler_views)(struct pipe_context *, unsigned shader,
-                            unsigned start_slot, unsigned num_views,
-                            struct pipe_sampler_view **);
-
-  /**
-   * Bind an array of shader resources that will be used by the
-   * graphics pipeline.  Any resources that were previously bound to
-   * the specified range will be unbound after this call.
-   *
-   * \param start      first resource to bind.
-   * \param count      number of consecutive resources to bind.
-   * \param resources  array of pointers to the resources to bind, it
-   *                   should contain at least \a count elements
-   *                   unless it's NULL, in which case no new
-   *                   resources will be bound.
-   */
-  void (*set_shader_resources)(struct pipe_context *, unsigned start,
-                               unsigned count, struct pipe_surface **resources);
-
-  void (*set_vertex_buffers)(struct pipe_context *, unsigned start_slot,
-                             unsigned num_buffers,
-                             const struct pipe_vertex_buffer *);
-
-  void (*set_index_buffer)(struct pipe_context *pipe,
-                           const struct pipe_index_buffer *);
-
-  /*@}*/
-
-  /**
-   * Stream output functions.
-   */
-  /*@{*/
-
-  struct pipe_stream_output_target *(*create_stream_output_target)(
-      struct pipe_context *, struct pipe_resource *, unsigned buffer_offset,
-      unsigned buffer_size);
-
-  void (*stream_output_target_destroy)(struct pipe_context *,
-                                       struct pipe_stream_output_target *);
-
-  void (*set_stream_output_targets)(struct pipe_context *, unsigned num_targets,
-                                    struct pipe_stream_output_target **targets,
-                                    unsigned append_bitmask);
-
-  /*@}*/
-
-  /**
-   * Resource functions for blit-like functionality
-   *
-   * If a driver supports multisampling, blit must implement color resolve.
-   */
-  /*@{*/
-
-  /**
-   * Copy a block of pixels from one resource to another.
-   * The resource must be of the same format.
-   * Resources with nr_samples > 1 are not allowed.
-   */
-  void (*resource_copy_region)(struct pipe_context *pipe,
-                               struct pipe_resource *dst, unsigned dst_level,
-                               unsigned dstx, unsigned dsty, unsigned dstz,
-                               struct pipe_resource *src, unsigned src_level,
-                               const struct pipe_box *src_box);
-
-  /* Optimal hardware path for blitting pixels.
-   * Scaling, format conversion, up- and downsampling (resolve) are allowed.
-   */
-  void (*blit)(struct pipe_context *pipe, const struct pipe_blit_info *info);
-
-  /*@}*/
-
-  /**
-   * Clear the specified set of currently bound buffers to specified values.
-   * The entire buffers are cleared (no scissor, no colormask, etc).
-   *
-   * \param buffers  bitfield of PIPE_CLEAR_* values.
-   * \param color  pointer to a union of fiu array for each of r, g, b, a.
-   * \param depth  depth clear value in [0,1].
-   * \param stencil  stencil clear value
-   */
-  void (*clear)(struct pipe_context *pipe, unsigned buffers,
-                const union pipe_color_union *color, double depth,
-                unsigned stencil);
-
-  /**
-   * Clear a color rendertarget surface.
-   * \param color  pointer to an union of fiu array for each of r, g, b, a.
-   */
-  void (*clear_render_target)(struct pipe_context *pipe,
-                              struct pipe_surface *dst,
-                              const union pipe_color_union *color,
-                              unsigned dstx, unsigned dsty, unsigned width,
-                              unsigned height);
-
-  /**
-   * Clear a depth-stencil surface.
-   * \param clear_flags  bitfield of PIPE_CLEAR_DEPTH/STENCIL values.
-   * \param depth  depth clear value in [0,1].
-   * \param stencil  stencil clear value
-   */
-  void (*clear_depth_stencil)(struct pipe_context *pipe,
-                              struct pipe_surface *dst, unsigned clear_flags,
-                              double depth, unsigned stencil, unsigned dstx,
-                              unsigned dsty, unsigned width, unsigned height);
-
-  /** Flush draw commands
-   *
-   * \param flags  bitfield of enum pipe_flush_flags values.
-   */
-  void (*flush)(struct pipe_context *pipe, struct pipe_fence_handle **fence,
-                unsigned flags);
-
-  /**
-   * Create a view on a texture to be used by a shader stage.
-   */
-  struct pipe_sampler_view *(*create_sampler_view)(
-      struct pipe_context *ctx, struct pipe_resource *texture,
-      const struct pipe_sampler_view *templat);
-
-  void (*sampler_view_destroy)(struct pipe_context *ctx,
-                               struct pipe_sampler_view *view);
-
-  /**
-   * Get a surface which is a "view" into a resource, used by
-   * render target / depth stencil stages.
-   */
-  struct pipe_surface *(*create_surface)(struct pipe_context *ctx,
-                                         struct pipe_resource *resource,
-                                         const struct pipe_surface *templat);
-
-  void (*surface_destroy)(struct pipe_context *ctx, struct pipe_surface *);
-
-  /**
-   * Map a resource.
-   *
-   * Transfers are (by default) context-private and allow uploads to be
-   * interleaved with rendering.
-   *
-   * out_transfer will contain the transfer object that must be passed
-   * to all the other transfer functions. It also contains useful
-   * information (like texture strides).
-   */
-  void *(*transfer_map)(struct pipe_context *, struct pipe_resource *resource,
-                        unsigned level,
-                        unsigned usage, /* a combination of PIPE_TRANSFER_x */
-                        const struct pipe_box *,
-                        struct pipe_transfer **out_transfer);
-
-  /* If transfer was created with WRITE|FLUSH_EXPLICIT, only the
-   * regions specified with this call are guaranteed to be written to
-   * the resource.
-   */
-  void (*transfer_flush_region)(struct pipe_context *,
-                                struct pipe_transfer *transfer,
-                                const struct pipe_box *);
-
-  void (*transfer_unmap)(struct pipe_context *, struct pipe_transfer *transfer);
-
-  /* One-shot transfer operation with data supplied in a user
-   * pointer.  XXX: strides??
-   */
-  void (*transfer_inline_write)(
-      struct pipe_context *, struct pipe_resource *, unsigned level,
-      unsigned usage, /* a combination of PIPE_TRANSFER_x */
-      const struct pipe_box *, const void *data, unsigned stride,
-      unsigned layer_stride);
-
-  /**
-   * Flush any pending framebuffer writes and invalidate texture caches.
-   */
-  void (*texture_barrier)(struct pipe_context *);
-
-  /**
-   * Flush caches according to flags.
-   */
-  void (*memory_barrier)(struct pipe_context *, unsigned flags);
-
-  /**
-   * Creates a video codec for a specific video format/profile
-   */
-  struct pipe_video_codec *(*create_video_codec)(
-      struct pipe_context *context, const struct pipe_video_codec *templat);
-
-  /**
-   * Creates a video buffer as decoding target
-   */
-  struct pipe_video_buffer *(*create_video_buffer)(
-      struct pipe_context *context, const struct pipe_video_buffer *templat);
-
-  /**
-   * Compute kernel execution
-   */
-  /*@{*/
-  /**
-   * Define the compute program and parameters to be used by
-   * pipe_context::launch_grid.
-   */
-  void *(*create_compute_state)(struct pipe_context *context,
-                                const struct pipe_compute_state *);
-  void (*bind_compute_state)(struct pipe_context *, void *);
-  void (*delete_compute_state)(struct pipe_context *, void *);
-
-  /**
-   * Bind an array of shader resources that will be used by the
-   * compute program.  Any resources that were previously bound to
-   * the specified range will be unbound after this call.
-   *
-   * \param start      first resource to bind.
-   * \param count      number of consecutive resources to bind.
-   * \param resources  array of pointers to the resources to bind, it
-   *                   should contain at least \a count elements
-   *                   unless it's NULL, in which case no new
-   *                   resources will be bound.
-   */
-  void (*set_compute_resources)(struct pipe_context *, unsigned start,
-                                unsigned count,
-                                struct pipe_surface **resources);
-
-  /**
-   * Bind an array of buffers to be mapped into the address space of
-   * the GLOBAL resource.  Any buffers that were previously bound
-   * between [first, first + count - 1] are unbound after this call.
-   *
-   * \param first      first buffer to map.
-   * \param count      number of consecutive buffers to map.
-   * \param resources  array of pointers to the buffers to map, it
-   *                   should contain at least \a count elements
-   *                   unless it's NULL, in which case no new
-   *                   resources will be bound.
-   * \param handles    array of pointers to the memory locations that
-   *                   will be updated with the address each buffer
-   *                   will be mapped to.  The base memory address of
-   *                   each of the buffers will be added to the value
-   *                   pointed to by its corresponding handle to form
-   *                   the final address argument.  It should contain
-   *                   at least \a count elements, unless \a
-   *                   resources is NULL in which case \a handles
-   *                   should be NULL as well.
-   *
-   * Note that the driver isn't required to make any guarantees about
-   * the contents of the \a handles array being valid anytime except
-   * during the subsequent calls to pipe_context::launch_grid.  This
-   * means that the only sensible location handles[i] may point to is
-   * somewhere within the INPUT buffer itself.  This is so to
-   * accommodate implementations that lack virtual memory but
-   * nevertheless migrate buffers on the fly, leading to resource
-   * base addresses that change on each kernel invocation or are
-   * unknown to the pipe driver.
-   */
-  void (*set_global_binding)(struct pipe_context *context, unsigned first,
-                             unsigned count, struct pipe_resource **resources,
-                             uint32_t **handles);
-
-  /**
-   * Launch the compute kernel starting from instruction \a pc of the
-   * currently bound compute program.
-   *
-   * \a grid_layout and \a block_layout are arrays of size \a
-   * PIPE_COMPUTE_CAP_GRID_DIMENSION that determine the layout of the
-   * grid (in block units) and working block (in thread units) to be
-   * used, respectively.
-   *
-   * \a pc For drivers that use PIPE_SHADER_IR_LLVM as their prefered IR,
-   * this value will be the index of the kernel in the opencl.kernels
-   * metadata list.
-   *
-   * \a input will be used to initialize the INPUT resource, and it
-   * should point to a buffer of at least
-   * pipe_compute_state::req_input_mem bytes.
-   */
-  void (*launch_grid)(struct pipe_context *context, const uint *block_layout,
-                      const uint *grid_layout, uint32_t pc, const void *input);
-  /*@}*/
-
-  /**
-   * Get sample position for an individual sample point.
-   *
-   * \param sample_count - total number of samples
-   * \param sample_index - sample to get the position values for
-   * \param out_value - return value of 2 floats for x and y position for
-   *                    requested sample.
-   */
-  void (*get_sample_position)(struct pipe_context *context,
-                              unsigned sample_count, unsigned sample_index,
-                              float *out_value);
-
-  /**
-   * Flush the resource cache, so that the resource can be used
-   * by an external client. Possible usage:
-   * - flushing a resource before presenting it on the screen
-   * - flushing a resource if some other process or device wants to use it
-   * This shouldn't be used to flush caches if the resource is only managed
-   * by a single pipe_screen and is not shared with another process.
-   * (i.e. you shouldn't use it to flush caches explicitly if you want to e.g.
-   * use the resource for texturing)
-   */
-  void (*flush_resource)(struct pipe_context *ctx,
-                         struct pipe_resource *resource);
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PIPE_CONTEXT_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_defines.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_defines.h
deleted file mode 100644
index fce3aa4a4..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_defines.h
+++ /dev/null
@@ -1,785 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef PIPE_DEFINES_H
-#define PIPE_DEFINES_H
-
-#include "p_compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Gallium error codes.
- *
- * - A zero value always means success.
- * - A negative value always means failure.
- * - The meaning of a positive value is function dependent.
- */
-enum pipe_error {
-  PIPE_OK = 0,
-  PIPE_ERROR = -1, /**< Generic error */
-  PIPE_ERROR_BAD_INPUT = -2,
-  PIPE_ERROR_OUT_OF_MEMORY = -3,
-  PIPE_ERROR_RETRY = -4
-  /* TODO */
-};
-
-#define PIPE_BLENDFACTOR_ONE 0x1
-#define PIPE_BLENDFACTOR_SRC_COLOR 0x2
-#define PIPE_BLENDFACTOR_SRC_ALPHA 0x3
-#define PIPE_BLENDFACTOR_DST_ALPHA 0x4
-#define PIPE_BLENDFACTOR_DST_COLOR 0x5
-#define PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE 0x6
-#define PIPE_BLENDFACTOR_CONST_COLOR 0x7
-#define PIPE_BLENDFACTOR_CONST_ALPHA 0x8
-#define PIPE_BLENDFACTOR_SRC1_COLOR 0x9
-#define PIPE_BLENDFACTOR_SRC1_ALPHA 0x0A
-#define PIPE_BLENDFACTOR_ZERO 0x11
-#define PIPE_BLENDFACTOR_INV_SRC_COLOR 0x12
-#define PIPE_BLENDFACTOR_INV_SRC_ALPHA 0x13
-#define PIPE_BLENDFACTOR_INV_DST_ALPHA 0x14
-#define PIPE_BLENDFACTOR_INV_DST_COLOR 0x15
-#define PIPE_BLENDFACTOR_INV_CONST_COLOR 0x17
-#define PIPE_BLENDFACTOR_INV_CONST_ALPHA 0x18
-#define PIPE_BLENDFACTOR_INV_SRC1_COLOR 0x19
-#define PIPE_BLENDFACTOR_INV_SRC1_ALPHA 0x1A
-
-#define PIPE_BLEND_ADD 0
-#define PIPE_BLEND_SUBTRACT 1
-#define PIPE_BLEND_REVERSE_SUBTRACT 2
-#define PIPE_BLEND_MIN 3
-#define PIPE_BLEND_MAX 4
-
-enum pipe_logicop {
-  PIPE_LOGICOP_CLEAR,
-  PIPE_LOGICOP_NOR,
-  PIPE_LOGICOP_AND_INVERTED,
-  PIPE_LOGICOP_COPY_INVERTED,
-  PIPE_LOGICOP_AND_REVERSE,
-  PIPE_LOGICOP_INVERT,
-  PIPE_LOGICOP_XOR,
-  PIPE_LOGICOP_NAND,
-  PIPE_LOGICOP_AND,
-  PIPE_LOGICOP_EQUIV,
-  PIPE_LOGICOP_NOOP,
-  PIPE_LOGICOP_OR_INVERTED,
-  PIPE_LOGICOP_COPY,
-  PIPE_LOGICOP_OR_REVERSE,
-  PIPE_LOGICOP_OR,
-  PIPE_LOGICOP_SET,
-};
-
-#define PIPE_MASK_R 0x1
-#define PIPE_MASK_G 0x2
-#define PIPE_MASK_B 0x4
-#define PIPE_MASK_A 0x8
-#define PIPE_MASK_RGBA 0xf
-#define PIPE_MASK_Z 0x10
-#define PIPE_MASK_S 0x20
-#define PIPE_MASK_ZS 0x30
-#define PIPE_MASK_RGBAZS (PIPE_MASK_RGBA | PIPE_MASK_ZS)
-
-/**
- * Inequality functions.  Used for depth test, stencil compare, alpha
- * test, shadow compare, etc.
- */
-#define PIPE_FUNC_NEVER 0
-#define PIPE_FUNC_LESS 1
-#define PIPE_FUNC_EQUAL 2
-#define PIPE_FUNC_LEQUAL 3
-#define PIPE_FUNC_GREATER 4
-#define PIPE_FUNC_NOTEQUAL 5
-#define PIPE_FUNC_GEQUAL 6
-#define PIPE_FUNC_ALWAYS 7
-
-/** Polygon fill mode */
-#define PIPE_POLYGON_MODE_FILL 0
-#define PIPE_POLYGON_MODE_LINE 1
-#define PIPE_POLYGON_MODE_POINT 2
-
-/** Polygon face specification, eg for culling */
-#define PIPE_FACE_NONE 0
-#define PIPE_FACE_FRONT 1
-#define PIPE_FACE_BACK 2
-#define PIPE_FACE_FRONT_AND_BACK (PIPE_FACE_FRONT | PIPE_FACE_BACK)
-
-/** Stencil ops */
-#define PIPE_STENCIL_OP_KEEP 0
-#define PIPE_STENCIL_OP_ZERO 1
-#define PIPE_STENCIL_OP_REPLACE 2
-#define PIPE_STENCIL_OP_INCR 3
-#define PIPE_STENCIL_OP_DECR 4
-#define PIPE_STENCIL_OP_INCR_WRAP 5
-#define PIPE_STENCIL_OP_DECR_WRAP 6
-#define PIPE_STENCIL_OP_INVERT 7
-
-/** Texture types.
- * See the documentation for info on PIPE_TEXTURE_RECT vs PIPE_TEXTURE_2D */
-enum pipe_texture_target {
-  PIPE_BUFFER = 0,
-  PIPE_TEXTURE_1D = 1,
-  PIPE_TEXTURE_2D = 2,
-  PIPE_TEXTURE_3D = 3,
-  PIPE_TEXTURE_CUBE = 4,
-  PIPE_TEXTURE_RECT = 5,
-  PIPE_TEXTURE_1D_ARRAY = 6,
-  PIPE_TEXTURE_2D_ARRAY = 7,
-  PIPE_TEXTURE_CUBE_ARRAY = 8,
-  PIPE_MAX_TEXTURE_TYPES
-};
-
-#define PIPE_TEX_FACE_POS_X 0
-#define PIPE_TEX_FACE_NEG_X 1
-#define PIPE_TEX_FACE_POS_Y 2
-#define PIPE_TEX_FACE_NEG_Y 3
-#define PIPE_TEX_FACE_POS_Z 4
-#define PIPE_TEX_FACE_NEG_Z 5
-#define PIPE_TEX_FACE_MAX 6
-
-#define PIPE_TEX_WRAP_REPEAT 0
-#define PIPE_TEX_WRAP_CLAMP 1
-#define PIPE_TEX_WRAP_CLAMP_TO_EDGE 2
-#define PIPE_TEX_WRAP_CLAMP_TO_BORDER 3
-#define PIPE_TEX_WRAP_MIRROR_REPEAT 4
-#define PIPE_TEX_WRAP_MIRROR_CLAMP 5
-#define PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE 6
-#define PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER 7
-
-/* Between mipmaps, ie mipfilter
- */
-#define PIPE_TEX_MIPFILTER_NEAREST 0
-#define PIPE_TEX_MIPFILTER_LINEAR 1
-#define PIPE_TEX_MIPFILTER_NONE 2
-
-/* Within a mipmap, ie min/mag filter
- */
-#define PIPE_TEX_FILTER_NEAREST 0
-#define PIPE_TEX_FILTER_LINEAR 1
-
-#define PIPE_TEX_COMPARE_NONE 0
-#define PIPE_TEX_COMPARE_R_TO_TEXTURE 1
-
-/**
- * Clear buffer bits
- */
-#define PIPE_CLEAR_DEPTH (1 << 0)
-#define PIPE_CLEAR_STENCIL (1 << 1)
-#define PIPE_CLEAR_COLOR0 (1 << 2)
-#define PIPE_CLEAR_COLOR1 (1 << 3)
-#define PIPE_CLEAR_COLOR2 (1 << 4)
-#define PIPE_CLEAR_COLOR3 (1 << 5)
-#define PIPE_CLEAR_COLOR4 (1 << 6)
-#define PIPE_CLEAR_COLOR5 (1 << 7)
-#define PIPE_CLEAR_COLOR6 (1 << 8)
-#define PIPE_CLEAR_COLOR7 (1 << 9)
-/** Combined flags */
-/** All color buffers currently bound */
-#define PIPE_CLEAR_COLOR                                                       \
-  (PIPE_CLEAR_COLOR0 | PIPE_CLEAR_COLOR1 | PIPE_CLEAR_COLOR2 |                 \
-   PIPE_CLEAR_COLOR3 | PIPE_CLEAR_COLOR4 | PIPE_CLEAR_COLOR5 |                 \
-   PIPE_CLEAR_COLOR6 | PIPE_CLEAR_COLOR7)
-#define PIPE_CLEAR_DEPTHSTENCIL (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL)
-
-/**
- * Transfer object usage flags
- */
-enum pipe_transfer_usage {
-  /**
-   * Resource contents read back (or accessed directly) at transfer
-   * create time.
-   */
-  PIPE_TRANSFER_READ = (1 << 0),
-
-  /**
-   * Resource contents will be written back at transfer_unmap
-   * time (or modified as a result of being accessed directly).
-   */
-  PIPE_TRANSFER_WRITE = (1 << 1),
-
-  /**
-   * Read/modify/write
-   */
-  PIPE_TRANSFER_READ_WRITE = PIPE_TRANSFER_READ | PIPE_TRANSFER_WRITE,
-
-  /**
-   * The transfer should map the texture storage directly. The driver may
-   * return NULL if that isn't possible, and the state tracker needs to cope
-   * with that and use an alternative path without this flag.
-   *
-   * E.g. the state tracker could have a simpler path which maps textures and
-   * does read/modify/write cycles on them directly, and a more complicated
-   * path which uses minimal read and write transfers.
-   */
-  PIPE_TRANSFER_MAP_DIRECTLY = (1 << 2),
-
-  /**
-   * Discards the memory within the mapped region.
-   *
-   * It should not be used with PIPE_TRANSFER_READ.
-   *
-   * See also:
-   * - OpenGL's ARB_map_buffer_range extension, MAP_INVALIDATE_RANGE_BIT flag.
-   */
-  PIPE_TRANSFER_DISCARD_RANGE = (1 << 8),
-
-  /**
-   * Fail if the resource cannot be mapped immediately.
-   *
-   * See also:
-   * - Direct3D's D3DLOCK_DONOTWAIT flag.
-   * - Mesa3D's MESA_MAP_NOWAIT_BIT flag.
-   * - WDDM's D3DDDICB_LOCKFLAGS.DonotWait flag.
-   */
-  PIPE_TRANSFER_DONTBLOCK = (1 << 9),
-
-  /**
-   * Do not attempt to synchronize pending operations on the resource when
-   * mapping.
-   *
-   * It should not be used with PIPE_TRANSFER_READ.
-   *
-   * See also:
-   * - OpenGL's ARB_map_buffer_range extension, MAP_UNSYNCHRONIZED_BIT flag.
-   * - Direct3D's D3DLOCK_NOOVERWRITE flag.
-   * - WDDM's D3DDDICB_LOCKFLAGS.IgnoreSync flag.
-   */
-  PIPE_TRANSFER_UNSYNCHRONIZED = (1 << 10),
-
-  /**
-   * Written ranges will be notified later with
-   * pipe_context::transfer_flush_region.
-   *
-   * It should not be used with PIPE_TRANSFER_READ.
-   *
-   * See also:
-   * - pipe_context::transfer_flush_region
-   * - OpenGL's ARB_map_buffer_range extension, MAP_FLUSH_EXPLICIT_BIT flag.
-   */
-  PIPE_TRANSFER_FLUSH_EXPLICIT = (1 << 11),
-
-  /**
-   * Discards all memory backing the resource.
-   *
-   * It should not be used with PIPE_TRANSFER_READ.
-   *
-   * This is equivalent to:
-   * - OpenGL's ARB_map_buffer_range extension, MAP_INVALIDATE_BUFFER_BIT
-   * - BufferData(NULL) on a GL buffer
-   * - Direct3D's D3DLOCK_DISCARD flag.
-   * - WDDM's D3DDDICB_LOCKFLAGS.Discard flag.
-   * - D3D10 DDI's D3D10_DDI_MAP_WRITE_DISCARD flag
-   * - D3D10's D3D10_MAP_WRITE_DISCARD flag.
-   */
-  PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE = (1 << 12),
-
-  /**
-   * Allows the resource to be used for rendering while mapped.
-   *
-   * PIPE_RESOURCE_FLAG_MAP_PERSISTENT must be set when creating
-   * the resource.
-   *
-   * If COHERENT is not set, memory_barrier(PIPE_BARRIER_MAPPED_BUFFER)
-   * must be called to ensure the device can see what the CPU has written.
-   */
-  PIPE_TRANSFER_PERSISTENT = (1 << 13),
-
-  /**
-   * If PERSISTENT is set, this ensures any writes done by the device are
-   * immediately visible to the CPU and vice versa.
-   *
-   * PIPE_RESOURCE_FLAG_MAP_COHERENT must be set when creating
-   * the resource.
-   */
-  PIPE_TRANSFER_COHERENT = (1 << 14)
-};
-
-/**
- * Flags for the flush function.
- */
-enum pipe_flush_flags { PIPE_FLUSH_END_OF_FRAME = (1 << 0) };
-
-/**
- * Flags for pipe_context::memory_barrier.
- */
-#define PIPE_BARRIER_MAPPED_BUFFER (1 << 0)
-#define PIPE_BARRIER_SHADER_BUFFER (1 << 1)
-#define PIPE_BARRIER_QUERY_BUFFER (1 << 2)
-#define PIPE_BARRIER_VERTEX_BUFFER (1 << 3)
-#define PIPE_BARRIER_INDEX_BUFFER (1 << 4)
-#define PIPE_BARRIER_CONSTANT_BUFFER (1 << 5)
-#define PIPE_BARRIER_INDIRECT_BUFFER (1 << 6)
-#define PIPE_BARRIER_TEXTURE (1 << 7)
-#define PIPE_BARRIER_IMAGE (1 << 8)
-#define PIPE_BARRIER_FRAMEBUFFER (1 << 9)
-#define PIPE_BARRIER_STREAMOUT_BUFFER (1 << 10)
-#define PIPE_BARRIER_GLOBAL_BUFFER (1 << 11)
-#define PIPE_BARRIER_ALL ((1 << 12) - 1)
-
-/**
- * Flags for pipe_context::texture_barrier.
- */
-#define PIPE_TEXTURE_BARRIER_SAMPLER (1 << 0)
-#define PIPE_TEXTURE_BARRIER_FRAMEBUFFER (1 << 1)
-
-/*
- * Resource binding flags -- state tracker must specify in advance all
- * the ways a resource might be used.
- */
-#define PIPE_BIND_DEPTH_STENCIL (1 << 0)     /* create_surface */
-#define PIPE_BIND_RENDER_TARGET (1 << 1)     /* create_surface */
-#define PIPE_BIND_BLENDABLE (1 << 2)         /* create_surface */
-#define PIPE_BIND_SAMPLER_VIEW (1 << 3)      /* create_sampler_view */
-#define PIPE_BIND_VERTEX_BUFFER (1 << 4)     /* set_vertex_buffers */
-#define PIPE_BIND_INDEX_BUFFER (1 << 5)      /* draw_elements */
-#define PIPE_BIND_CONSTANT_BUFFER (1 << 6)   /* set_constant_buffer */
-#define PIPE_BIND_DISPLAY_TARGET (1 << 8)    /* flush_front_buffer */
-#define PIPE_BIND_TRANSFER_WRITE (1 << 9)    /* transfer_map */
-#define PIPE_BIND_TRANSFER_READ (1 << 10)    /* transfer_map */
-#define PIPE_BIND_STREAM_OUTPUT (1 << 11)    /* set_stream_output_buffers */
-#define PIPE_BIND_CURSOR (1 << 16)           /* mouse cursor */
-#define PIPE_BIND_CUSTOM (1 << 17)           /* state-tracker/winsys usages */
-#define PIPE_BIND_GLOBAL (1 << 18)           /* set_global_binding */
-#define PIPE_BIND_SHADER_RESOURCE (1 << 19)  /* set_shader_resources */
-#define PIPE_BIND_COMPUTE_RESOURCE (1 << 20) /* set_compute_resources */
-#define PIPE_BIND_COMMAND_ARGS_BUFFER (1 << 21) /* pipe_draw_info.indirect */
-#define PIPE_BIND_QUERY_BUFFER (1 << 22)        /* get_query_result_resource */
-
-/* The first two flags above were previously part of the amorphous
- * TEXTURE_USAGE, most of which are now descriptions of the ways a
- * particular texture can be bound to the gallium pipeline.  The two flags
- * below do not fit within that and probably need to be migrated to some
- * other place.
- *
- * It seems like scanout is used by the Xorg state tracker to ask for
- * a texture suitable for actual scanout (hence the name), which
- * implies extra layout constraints on some hardware.  It may also
- * have some special meaning regarding mouse cursor images.
- *
- * The shared flag is quite underspecified, but certainly isn't a
- * binding flag - it seems more like a message to the winsys to create
- * a shareable allocation.
- *
- * The third flag has been added to be able to force textures to be created
- * in linear mode (no tiling).
- */
-#define PIPE_BIND_SCANOUT (1 << 14) /*  */
-#define PIPE_BIND_SHARED (1 << 15)  /* get_texture_handle ??? */
-#define PIPE_BIND_LINEAR (1 << 21)
-
-/* Flags for the driver about resource behaviour:
- */
-#define PIPE_RESOURCE_FLAG_MAP_PERSISTENT (1 << 0)
-#define PIPE_RESOURCE_FLAG_MAP_COHERENT (1 << 1)
-#define PIPE_RESOURCE_FLAG_DRV_PRIV (1 << 16) /* driver/winsys private */
-#define PIPE_RESOURCE_FLAG_ST_PRIV (1 << 24)  /* state-tracker/winsys private  \
-                                               */
-
-/* Hint about the expected lifecycle of a resource.
- * Sorted according to GPU vs CPU access.
- */
-#define PIPE_USAGE_DEFAULT 0   /* fast GPU access */
-#define PIPE_USAGE_IMMUTABLE 1 /* fast GPU access, immutable */
-#define PIPE_USAGE_DYNAMIC 2   /* uploaded data is used multiple times */
-#define PIPE_USAGE_STREAM 3    /* uploaded data is used once */
-#define PIPE_USAGE_STAGING 4   /* fast CPU access */
-
-/**
- * Shaders
- */
-#define PIPE_SHADER_VERTEX 0
-#define PIPE_SHADER_FRAGMENT 1
-#define PIPE_SHADER_GEOMETRY 2
-#define PIPE_SHADER_TESS_CTRL 3
-#define PIPE_SHADER_TESS_EVAL 4
-#define PIPE_SHADER_COMPUTE 5
-#define PIPE_SHADER_TYPES 6
-
-/**
- * Primitive types:
- */
-#define PIPE_PRIM_POINTS 0
-#define PIPE_PRIM_LINES 1
-#define PIPE_PRIM_LINE_LOOP 2
-#define PIPE_PRIM_LINE_STRIP 3
-#define PIPE_PRIM_TRIANGLES 4
-#define PIPE_PRIM_TRIANGLE_STRIP 5
-#define PIPE_PRIM_TRIANGLE_FAN 6
-#define PIPE_PRIM_QUADS 7
-#define PIPE_PRIM_QUAD_STRIP 8
-#define PIPE_PRIM_POLYGON 9
-#define PIPE_PRIM_LINES_ADJACENCY 10
-#define PIPE_PRIM_LINE_STRIP_ADJACENCY 11
-#define PIPE_PRIM_TRIANGLES_ADJACENCY 12
-#define PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY 13
-#define PIPE_PRIM_PATCHES 14
-#define PIPE_PRIM_MAX 15
-
-/**
- * Tessellator spacing types
- */
-#define PIPE_TESS_SPACING_FRACTIONAL_ODD 0
-#define PIPE_TESS_SPACING_FRACTIONAL_EVEN 1
-#define PIPE_TESS_SPACING_EQUAL 2
-
-/**
- * Query object types
- */
-#define PIPE_QUERY_OCCLUSION_COUNTER 0
-#define PIPE_QUERY_OCCLUSION_PREDICATE 1
-#define PIPE_QUERY_TIMESTAMP 2
-#define PIPE_QUERY_TIMESTAMP_DISJOINT 3
-#define PIPE_QUERY_TIME_ELAPSED 4
-#define PIPE_QUERY_PRIMITIVES_GENERATED 5
-#define PIPE_QUERY_PRIMITIVES_EMITTED 6
-#define PIPE_QUERY_SO_STATISTICS 7
-#define PIPE_QUERY_SO_OVERFLOW_PREDICATE 8
-#define PIPE_QUERY_GPU_FINISHED 9
-#define PIPE_QUERY_PIPELINE_STATISTICS 10
-#define PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE 11
-#define PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE 12
-#define PIPE_QUERY_TYPES 13
-
-/* start of driver queries,
- * see pipe_screen::get_driver_query_info */
-#define PIPE_QUERY_DRIVER_SPECIFIC 256
-
-/**
- * Conditional rendering modes
- */
-#define PIPE_RENDER_COND_WAIT 0
-#define PIPE_RENDER_COND_NO_WAIT 1
-#define PIPE_RENDER_COND_BY_REGION_WAIT 2
-#define PIPE_RENDER_COND_BY_REGION_NO_WAIT 3
-
-/**
- * Point sprite coord modes
- */
-#define PIPE_SPRITE_COORD_UPPER_LEFT 0
-#define PIPE_SPRITE_COORD_LOWER_LEFT 1
-
-/**
- * Texture swizzles
- */
-#define PIPE_SWIZZLE_RED 0
-#define PIPE_SWIZZLE_GREEN 1
-#define PIPE_SWIZZLE_BLUE 2
-#define PIPE_SWIZZLE_ALPHA 3
-#define PIPE_SWIZZLE_ZERO 4
-#define PIPE_SWIZZLE_ONE 5
-
-#define PIPE_TIMEOUT_INFINITE 0xffffffffffffffffull
-
-/**
- * pipe_image_view access flags.
- */
-#define PIPE_IMAGE_ACCESS_READ (1 << 0)
-#define PIPE_IMAGE_ACCESS_WRITE (1 << 1)
-#define PIPE_IMAGE_ACCESS_READ_WRITE                                           \
-  (PIPE_IMAGE_ACCESS_READ | PIPE_IMAGE_ACCESS_WRITE)
-
-/**
- * Implementation capabilities/limits which are queried through
- * pipe_screen::get_param()
- */
-enum pipe_cap {
-  PIPE_CAP_NPOT_TEXTURES = 1,
-  PIPE_CAP_TWO_SIDED_STENCIL = 2,
-  PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS = 4,
-  PIPE_CAP_ANISOTROPIC_FILTER = 5,
-  PIPE_CAP_POINT_SPRITE = 6,
-  PIPE_CAP_MAX_RENDER_TARGETS = 7,
-  PIPE_CAP_OCCLUSION_QUERY = 8,
-  PIPE_CAP_QUERY_TIME_ELAPSED = 9,
-  PIPE_CAP_TEXTURE_SHADOW_MAP = 10,
-  PIPE_CAP_TEXTURE_SWIZZLE = 11,
-  PIPE_CAP_MAX_TEXTURE_2D_LEVELS = 12,
-  PIPE_CAP_MAX_TEXTURE_3D_LEVELS = 13,
-  PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS = 14,
-  PIPE_CAP_TEXTURE_MIRROR_CLAMP = 25,
-  PIPE_CAP_BLEND_EQUATION_SEPARATE = 28,
-  PIPE_CAP_SM3 = 29, /*< Shader Model, supported */
-  PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS = 30,
-  PIPE_CAP_PRIMITIVE_RESTART = 31,
-  /** blend enables and write masks per rendertarget */
-  PIPE_CAP_INDEP_BLEND_ENABLE = 33,
-  /** different blend funcs per rendertarget */
-  PIPE_CAP_INDEP_BLEND_FUNC = 34,
-  PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS = 36,
-  PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT = 37,
-  PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT = 38,
-  PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER = 39,
-  PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER = 40,
-  PIPE_CAP_DEPTH_CLIP_DISABLE = 41,
-  PIPE_CAP_SHADER_STENCIL_EXPORT = 42,
-  PIPE_CAP_TGSI_INSTANCEID = 43,
-  PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR = 44,
-  PIPE_CAP_FRAGMENT_COLOR_CLAMPED = 45,
-  PIPE_CAP_MIXED_COLORBUFFER_FORMATS = 46,
-  PIPE_CAP_SEAMLESS_CUBE_MAP = 47,
-  PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE = 48,
-  PIPE_CAP_MIN_TEXEL_OFFSET = 50,
-  PIPE_CAP_MAX_TEXEL_OFFSET = 51,
-  PIPE_CAP_CONDITIONAL_RENDER = 52,
-  PIPE_CAP_TEXTURE_BARRIER = 53,
-  PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS = 55,
-  PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS = 56,
-  PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME = 57,
-  PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS = 59, /* temporary */
-  PIPE_CAP_VERTEX_COLOR_UNCLAMPED = 60,
-  PIPE_CAP_VERTEX_COLOR_CLAMPED = 61,
-  PIPE_CAP_GLSL_FEATURE_LEVEL = 62,
-  PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 63,
-  PIPE_CAP_USER_VERTEX_BUFFERS = 64,
-  PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY = 65,
-  PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY = 66,
-  PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY = 67,
-  PIPE_CAP_COMPUTE = 68,
-  PIPE_CAP_USER_INDEX_BUFFERS = 69,
-  PIPE_CAP_USER_CONSTANT_BUFFERS = 70,
-  PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT = 71,
-  PIPE_CAP_START_INSTANCE = 72,
-  PIPE_CAP_QUERY_TIMESTAMP = 73,
-  PIPE_CAP_TEXTURE_MULTISAMPLE = 74,
-  PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT = 75,
-  PIPE_CAP_CUBE_MAP_ARRAY = 76,
-  PIPE_CAP_TEXTURE_BUFFER_OBJECTS = 77,
-  PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT = 78,
-  PIPE_CAP_TGSI_TEXCOORD = 79,
-  PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER = 80,
-  PIPE_CAP_QUERY_PIPELINE_STATISTICS = 81,
-  PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK = 82,
-  PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE = 83,
-  PIPE_CAP_MAX_VIEWPORTS = 84,
-  PIPE_CAP_ENDIANNESS = 85,
-  PIPE_CAP_MIXED_FRAMEBUFFER_SIZES = 86,
-  PIPE_CAP_TGSI_VS_LAYER_VIEWPORT = 87,
-  PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES = 88,
-  PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 89,
-  PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS = 90,
-  PIPE_CAP_TEXTURE_GATHER_SM5 = 91,
-  PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT = 92,
-  PIPE_CAP_FAKE_SW_MSAA = 93,
-  PIPE_CAP_TEXTURE_QUERY_LOD = 94,
-  PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET = 95,
-  PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET = 96,
-  PIPE_CAP_SAMPLE_SHADING = 97,
-  PIPE_CAP_TEXTURE_GATHER_OFFSETS = 98,
-  PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION = 99,
-  PIPE_CAP_MAX_VERTEX_STREAMS = 100,
-  PIPE_CAP_DRAW_INDIRECT = 101,
-  PIPE_CAP_TGSI_FS_FINE_DERIVATIVE = 102,
-  PIPE_CAP_VENDOR_ID = 103,
-  PIPE_CAP_DEVICE_ID = 104,
-  PIPE_CAP_ACCELERATED = 105,
-  PIPE_CAP_VIDEO_MEMORY = 106,
-  PIPE_CAP_UMA = 107,
-  PIPE_CAP_CONDITIONAL_RENDER_INVERTED = 108,
-  PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE = 109,
-  PIPE_CAP_SAMPLER_VIEW_TARGET = 110,
-  PIPE_CAP_CLIP_HALFZ = 111,
-  PIPE_CAP_VERTEXID_NOBASE = 112,
-  PIPE_CAP_POLYGON_OFFSET_CLAMP = 113,
-};
-
-#define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)
-#define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_R600 (1 << 1)
-
-enum pipe_endian {
-  PIPE_ENDIAN_LITTLE = 0,
-  PIPE_ENDIAN_BIG = 1,
-#if defined(PIPE_ARCH_LITTLE_ENDIAN)
-  PIPE_ENDIAN_NATIVE = PIPE_ENDIAN_LITTLE
-#elif defined(PIPE_ARCH_BIG_ENDIAN)
-  PIPE_ENDIAN_NATIVE = PIPE_ENDIAN_BIG
-#endif
-};
-
-/**
- * Implementation limits which are queried through
- * pipe_screen::get_paramf()
- */
-enum pipe_capf {
-  PIPE_CAPF_MAX_LINE_WIDTH,
-  PIPE_CAPF_MAX_LINE_WIDTH_AA,
-  PIPE_CAPF_MAX_POINT_WIDTH,
-  PIPE_CAPF_MAX_POINT_WIDTH_AA,
-  PIPE_CAPF_MAX_TEXTURE_ANISOTROPY,
-  PIPE_CAPF_MAX_TEXTURE_LOD_BIAS,
-  PIPE_CAPF_GUARD_BAND_LEFT,
-  PIPE_CAPF_GUARD_BAND_TOP,
-  PIPE_CAPF_GUARD_BAND_RIGHT,
-  PIPE_CAPF_GUARD_BAND_BOTTOM
-};
-
-/* Shader caps not specific to any single stage */
-enum pipe_shader_cap {
-  PIPE_SHADER_CAP_MAX_INSTRUCTIONS, /* if 0, it means the stage is unsupported
-                                     */
-  PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS,
-  PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS,
-  PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS,
-  PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH,
-  PIPE_SHADER_CAP_MAX_INPUTS,
-  PIPE_SHADER_CAP_MAX_OUTPUTS,
-  PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE,
-  PIPE_SHADER_CAP_MAX_CONST_BUFFERS,
-  PIPE_SHADER_CAP_MAX_TEMPS,
-  PIPE_SHADER_CAP_MAX_PREDS,
-  /* boolean caps */
-  PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED,
-  PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR,
-  PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR,
-  PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR,
-  PIPE_SHADER_CAP_INDIRECT_CONST_ADDR,
-  PIPE_SHADER_CAP_SUBROUTINES, /* BGNSUB, ENDSUB, CAL, RET */
-  PIPE_SHADER_CAP_INTEGERS,
-  PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS,
-  PIPE_SHADER_CAP_PREFERRED_IR,
-  PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED,
-  PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS,
-  PIPE_SHADER_CAP_DOUBLES
-};
-
-/**
- * Shader intermediate representation.
- */
-enum pipe_shader_ir {
-  PIPE_SHADER_IR_TGSI,
-  PIPE_SHADER_IR_LLVM,
-  PIPE_SHADER_IR_NATIVE
-};
-
-/**
- * Compute-specific implementation capability.  They can be queried
- * using pipe_screen::get_compute_param.
- */
-enum pipe_compute_cap {
-  PIPE_COMPUTE_CAP_IR_TARGET,
-  PIPE_COMPUTE_CAP_GRID_DIMENSION,
-  PIPE_COMPUTE_CAP_MAX_GRID_SIZE,
-  PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE,
-  PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK,
-  PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE,
-  PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE,
-  PIPE_COMPUTE_CAP_MAX_PRIVATE_SIZE,
-  PIPE_COMPUTE_CAP_MAX_INPUT_SIZE,
-  PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE,
-  PIPE_COMPUTE_CAP_MAX_CLOCK_FREQUENCY,
-  PIPE_COMPUTE_CAP_MAX_COMPUTE_UNITS,
-  PIPE_COMPUTE_CAP_IMAGES_SUPPORTED
-};
-
-/**
- * Composite query types
- */
-
-/**
- * Query result for PIPE_QUERY_SO_STATISTICS.
- */
-struct pipe_query_data_so_statistics {
-  uint64_t num_primitives_written;
-  uint64_t primitives_storage_needed;
-};
-
-/**
- * Query result for PIPE_QUERY_TIMESTAMP_DISJOINT.
- */
-struct pipe_query_data_timestamp_disjoint {
-  uint64_t frequency;
-  boolean disjoint;
-};
-
-/**
- * Query result for PIPE_QUERY_PIPELINE_STATISTICS.
- */
-struct pipe_query_data_pipeline_statistics {
-  uint64_t ia_vertices;    /**< Num vertices read by the vertex fetcher. */
-  uint64_t ia_primitives;  /**< Num primitives read by the vertex fetcher. */
-  uint64_t vs_invocations; /**< Num vertex shader invocations. */
-  uint64_t gs_invocations; /**< Num geometry shader invocations. */
-  uint64_t gs_primitives;  /**< Num primitives output by a geometry shader. */
-  uint64_t c_invocations;  /**< Num primitives sent to the rasterizer. */
-  uint64_t c_primitives;   /**< Num primitives that were rendered. */
-  uint64_t ps_invocations; /**< Num pixel shader invocations. */
-  uint64_t hs_invocations; /**< Num hull shader invocations. */
-  uint64_t ds_invocations; /**< Num domain shader invocations. */
-  uint64_t cs_invocations; /**< Num compute shader invocations. */
-};
-
-/**
- * Query result (returned by pipe_context::get_query_result).
- */
-union pipe_query_result {
-  /* PIPE_QUERY_OCCLUSION_PREDICATE */
-  /* PIPE_QUERY_SO_OVERFLOW_PREDICATE */
-  /* PIPE_QUERY_GPU_FINISHED */
-  boolean b;
-
-  /* PIPE_QUERY_OCCLUSION_COUNTER */
-  /* PIPE_QUERY_TIMESTAMP */
-  /* PIPE_QUERY_TIME_ELAPSED */
-  /* PIPE_QUERY_PRIMITIVES_GENERATED */
-  /* PIPE_QUERY_PRIMITIVES_EMITTED */
-  uint64_t u64;
-
-  /* PIPE_QUERY_SO_STATISTICS */
-  struct pipe_query_data_so_statistics so_statistics;
-
-  /* PIPE_QUERY_TIMESTAMP_DISJOINT */
-  struct pipe_query_data_timestamp_disjoint timestamp_disjoint;
-
-  /* PIPE_QUERY_PIPELINE_STATISTICS */
-  struct pipe_query_data_pipeline_statistics pipeline_statistics;
-};
-
-enum pipe_query_value_type {
-  PIPE_QUERY_TYPE_I32,
-  PIPE_QUERY_TYPE_U32,
-  PIPE_QUERY_TYPE_I64,
-  PIPE_QUERY_TYPE_U64,
-};
-
-union pipe_color_union {
-  float f[4];
-  int i[4];
-  unsigned int ui[4];
-};
-
-struct pipe_driver_query_info {
-  const char *name;
-  unsigned query_type;     /* PIPE_QUERY_DRIVER_SPECIFIC + i */
-  uint64_t max_value;      /* max value that can be returned */
-  boolean uses_byte_units; /* whether the result is in bytes */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_format.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_format.h
deleted file mode 100644
index 196a6f4c5..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_format.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * Copyright (c) 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef PIPE_FORMAT_H
-#define PIPE_FORMAT_H
-
-#include "p_config.h"
-#include "virgl_hw.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define pipe_format virgl_formats
-/**
- * Formats for textures, surfaces and vertex data
- */
-#define PIPE_FORMAT_NONE VIRGL_FORMAT_NONE
-#define PIPE_FORMAT_B8G8R8A8_UNORM VIRGL_FORMAT_B8G8R8A8_UNORM
-#define PIPE_FORMAT_B8G8R8X8_UNORM VIRGL_FORMAT_B8G8R8X8_UNORM
-#define PIPE_FORMAT_A8R8G8B8_UNORM VIRGL_FORMAT_A8R8G8B8_UNORM
-#define PIPE_FORMAT_X8R8G8B8_UNORM VIRGL_FORMAT_X8R8G8B8_UNORM
-#define PIPE_FORMAT_B5G5R5A1_UNORM VIRGL_FORMAT_B5G5R5A1_UNORM
-#define PIPE_FORMAT_B4G4R4A4_UNORM VIRGL_FORMAT_B4G4R4A4_UNORM
-#define PIPE_FORMAT_B5G6R5_UNORM VIRGL_FORMAT_B5G6R5_UNORM
-#define PIPE_FORMAT_R10G10B10A2_UNORM VIRGL_FORMAT_R10G10B10A2_UNORM
-#define PIPE_FORMAT_L8_UNORM VIRGL_FORMAT_L8_UNORM /**< ubyte luminance */
-#define PIPE_FORMAT_A8_UNORM VIRGL_FORMAT_A8_UNORM /**< ubyte alpha */
-#define PIPE_FORMAT_I8_UNORM VIRGL_FORMAT_I8_UNORM /**< ubyte intensity */
-#define PIPE_FORMAT_L8A8_UNORM                                                 \
-  VIRGL_FORMAT_L8A8_UNORM /**< ubyte alpha, luminance */
-#define PIPE_FORMAT_L16_UNORM VIRGL_FORMAT_L16_UNORM /**< ushort luminance */
-#define PIPE_FORMAT_UYVY VIRGL_FORMAT_UYVY
-#define PIPE_FORMAT_YUYV VIRGL_FORMAT_YUYV
-#define PIPE_FORMAT_Z16_UNORM VIRGL_FORMAT_Z16_UNORM
-#define PIPE_FORMAT_Z32_UNORM VIRGL_FORMAT_Z32_UNORM
-#define PIPE_FORMAT_Z32_FLOAT VIRGL_FORMAT_Z32_FLOAT
-#define PIPE_FORMAT_Z24_UNORM_S8_UINT VIRGL_FORMAT_Z24_UNORM_S8_UINT
-#define PIPE_FORMAT_S8_UINT_Z24_UNORM VIRGL_FORMAT_S8_UINT_Z24_UNORM
-#define PIPE_FORMAT_Z24X8_UNORM VIRGL_FORMAT_Z24X8_UNORM
-#define PIPE_FORMAT_X8Z24_UNORM VIRGL_FORMAT_X8Z24_UNORM
-#define PIPE_FORMAT_S8_UINT VIRGL_FORMAT_S8_UINT /**< ubyte stencil */
-#define PIPE_FORMAT_R64_FLOAT VIRGL_FORMAT_R64_FLOAT
-#define PIPE_FORMAT_R64G64_FLOAT VIRGL_FORMAT_R64G64_FLOAT
-#define PIPE_FORMAT_R64G64B64_FLOAT VIRGL_FORMAT_R64G64B64_FLOAT
-#define PIPE_FORMAT_R64G64B64A64_FLOAT VIRGL_FORMAT_R64G64B64A64_FLOAT
-#define PIPE_FORMAT_R32_FLOAT VIRGL_FORMAT_R32_FLOAT
-#define PIPE_FORMAT_R32G32_FLOAT VIRGL_FORMAT_R32G32_FLOAT
-#define PIPE_FORMAT_R32G32B32_FLOAT VIRGL_FORMAT_R32G32B32_FLOAT
-#define PIPE_FORMAT_R32G32B32A32_FLOAT VIRGL_FORMAT_R32G32B32A32_FLOAT
-#define PIPE_FORMAT_R32_UNORM VIRGL_FORMAT_R32_UNORM
-#define PIPE_FORMAT_R32G32_UNORM VIRGL_FORMAT_R32G32_UNORM
-#define PIPE_FORMAT_R32G32B32_UNORM VIRGL_FORMAT_R32G32B32_UNORM
-#define PIPE_FORMAT_R32G32B32A32_UNORM VIRGL_FORMAT_R32G32B32A32_UNORM
-#define PIPE_FORMAT_R32_USCALED VIRGL_FORMAT_R32_USCALED
-#define PIPE_FORMAT_R32G32_USCALED VIRGL_FORMAT_R32G32_USCALED
-#define PIPE_FORMAT_R32G32B32_USCALED VIRGL_FORMAT_R32G32B32_USCALED
-#define PIPE_FORMAT_R32G32B32A32_USCALED VIRGL_FORMAT_R32G32B32A32_USCALED
-#define PIPE_FORMAT_R32_SNORM VIRGL_FORMAT_R32_SNORM
-#define PIPE_FORMAT_R32G32_SNORM VIRGL_FORMAT_R32G32_SNORM
-#define PIPE_FORMAT_R32G32B32_SNORM VIRGL_FORMAT_R32G32B32_SNORM
-#define PIPE_FORMAT_R32G32B32A32_SNORM VIRGL_FORMAT_R32G32B32A32_SNORM
-#define PIPE_FORMAT_R32_SSCALED VIRGL_FORMAT_R32_SSCALED
-#define PIPE_FORMAT_R32G32_SSCALED VIRGL_FORMAT_R32G32_SSCALED
-#define PIPE_FORMAT_R32G32B32_SSCALED VIRGL_FORMAT_R32G32B32_SSCALED
-#define PIPE_FORMAT_R32G32B32A32_SSCALED VIRGL_FORMAT_R32G32B32A32_SSCALED
-#define PIPE_FORMAT_R16_UNORM VIRGL_FORMAT_R16_UNORM
-#define PIPE_FORMAT_R16G16_UNORM VIRGL_FORMAT_R16G16_UNORM
-#define PIPE_FORMAT_R16G16B16_UNORM VIRGL_FORMAT_R16G16B16_UNORM
-#define PIPE_FORMAT_R16G16B16A16_UNORM VIRGL_FORMAT_R16G16B16A16_UNORM
-#define PIPE_FORMAT_R16_USCALED VIRGL_FORMAT_R16_USCALED
-#define PIPE_FORMAT_R16G16_USCALED VIRGL_FORMAT_R16G16_USCALED
-#define PIPE_FORMAT_R16G16B16_USCALED VIRGL_FORMAT_R16G16B16_USCALED
-#define PIPE_FORMAT_R16G16B16A16_USCALED VIRGL_FORMAT_R16G16B16A16_USCALED
-#define PIPE_FORMAT_R16_SNORM VIRGL_FORMAT_R16_SNORM
-#define PIPE_FORMAT_R16G16_SNORM VIRGL_FORMAT_R16G16_SNORM
-#define PIPE_FORMAT_R16G16B16_SNORM VIRGL_FORMAT_R16G16B16_SNORM
-#define PIPE_FORMAT_R16G16B16A16_SNORM VIRGL_FORMAT_R16G16B16A16_SNORM
-#define PIPE_FORMAT_R16_SSCALED VIRGL_FORMAT_R16_SSCALED
-#define PIPE_FORMAT_R16G16_SSCALED VIRGL_FORMAT_R16G16_SSCALED
-#define PIPE_FORMAT_R16G16B16_SSCALED VIRGL_FORMAT_R16G16B16_SSCALED
-#define PIPE_FORMAT_R16G16B16A16_SSCALED VIRGL_FORMAT_R16G16B16A16_SSCALED
-#define PIPE_FORMAT_R8_UNORM VIRGL_FORMAT_R8_UNORM
-#define PIPE_FORMAT_R8G8_UNORM VIRGL_FORMAT_R8G8_UNORM
-#define PIPE_FORMAT_R8G8B8_UNORM VIRGL_FORMAT_R8G8B8_UNORM
-#define PIPE_FORMAT_R8G8B8A8_UNORM VIRGL_FORMAT_R8G8B8A8_UNORM
-#define PIPE_FORMAT_X8B8G8R8_UNORM VIRGL_FORMAT_X8B8G8R8_UNORM
-#define PIPE_FORMAT_R8_USCALED VIRGL_FORMAT_R8_USCALED
-#define PIPE_FORMAT_R8G8_USCALED VIRGL_FORMAT_R8G8_USCALED
-#define PIPE_FORMAT_R8G8B8_USCALED VIRGL_FORMAT_R8G8B8_USCALED
-#define PIPE_FORMAT_R8G8B8A8_USCALED VIRGL_FORMAT_R8G8B8A8_USCALED
-#define PIPE_FORMAT_R8_SNORM VIRGL_FORMAT_R8_SNORM
-#define PIPE_FORMAT_R8G8_SNORM VIRGL_FORMAT_R8G8_SNORM
-#define PIPE_FORMAT_R8G8B8_SNORM VIRGL_FORMAT_R8G8B8_SNORM
-#define PIPE_FORMAT_R8G8B8A8_SNORM VIRGL_FORMAT_R8G8B8A8_SNORM
-#define PIPE_FORMAT_R8_SSCALED VIRGL_FORMAT_R8_SSCALED
-#define PIPE_FORMAT_R8G8_SSCALED VIRGL_FORMAT_R8G8_SSCALED
-#define PIPE_FORMAT_R8G8B8_SSCALED VIRGL_FORMAT_R8G8B8_SSCALED
-#define PIPE_FORMAT_R8G8B8A8_SSCALED VIRGL_FORMAT_R8G8B8A8_SSCALED
-#define PIPE_FORMAT_R32_FIXED VIRGL_FORMAT_R32_FIXED
-#define PIPE_FORMAT_R32G32_FIXED VIRGL_FORMAT_R32G32_FIXED
-#define PIPE_FORMAT_R32G32B32_FIXED VIRGL_FORMAT_R32G32B32_FIXED
-#define PIPE_FORMAT_R32G32B32A32_FIXED VIRGL_FORMAT_R32G32B32A32_FIXED
-#define PIPE_FORMAT_R16_FLOAT VIRGL_FORMAT_R16_FLOAT
-#define PIPE_FORMAT_R16G16_FLOAT VIRGL_FORMAT_R16G16_FLOAT
-#define PIPE_FORMAT_R16G16B16_FLOAT VIRGL_FORMAT_R16G16B16_FLOAT
-#define PIPE_FORMAT_R16G16B16A16_FLOAT VIRGL_FORMAT_R16G16B16A16_FLOAT
-
-/* sRGB formats */
-#define PIPE_FORMAT_L8_SRGB VIRGL_FORMAT_L8_SRGB
-#define PIPE_FORMAT_L8A8_SRGB VIRGL_FORMAT_L8A8_SRGB
-#define PIPE_FORMAT_R8G8B8_SRGB VIRGL_FORMAT_R8G8B8_SRGB
-#define PIPE_FORMAT_A8B8G8R8_SRGB VIRGL_FORMAT_A8B8G8R8_SRGB
-#define PIPE_FORMAT_X8B8G8R8_SRGB VIRGL_FORMAT_X8B8G8R8_SRGB
-#define PIPE_FORMAT_B8G8R8A8_SRGB VIRGL_FORMAT_B8G8R8A8_SRGB
-#define PIPE_FORMAT_B8G8R8X8_SRGB VIRGL_FORMAT_B8G8R8X8_SRGB
-#define PIPE_FORMAT_A8R8G8B8_SRGB VIRGL_FORMAT_A8R8G8B8_SRGB
-#define PIPE_FORMAT_X8R8G8B8_SRGB VIRGL_FORMAT_X8R8G8B8_SRGB
-#define PIPE_FORMAT_R8G8B8A8_SRGB VIRGL_FORMAT_R8G8B8A8_SRGB
-
-/* compressed formats */
-#define PIPE_FORMAT_DXT1_RGB VIRGL_FORMAT_DXT1_RGB
-#define PIPE_FORMAT_DXT1_RGBA VIRGL_FORMAT_DXT1_RGBA
-#define PIPE_FORMAT_DXT3_RGBA VIRGL_FORMAT_DXT3_RGBA
-#define PIPE_FORMAT_DXT5_RGBA VIRGL_FORMAT_DXT5_RGBA
-
-/* sRGB, compressed */
-#define PIPE_FORMAT_DXT1_SRGB VIRGL_FORMAT_DXT1_SRGB
-#define PIPE_FORMAT_DXT1_SRGBA VIRGL_FORMAT_DXT1_SRGBA
-#define PIPE_FORMAT_DXT3_SRGBA VIRGL_FORMAT_DXT3_SRGBA
-#define PIPE_FORMAT_DXT5_SRGBA VIRGL_FORMAT_DXT5_SRGBA
-
-/* rgtc compressed */
-#define PIPE_FORMAT_RGTC1_UNORM VIRGL_FORMAT_RGTC1_UNORM
-#define PIPE_FORMAT_RGTC1_SNORM VIRGL_FORMAT_RGTC1_SNORM
-#define PIPE_FORMAT_RGTC2_UNORM VIRGL_FORMAT_RGTC2_UNORM
-#define PIPE_FORMAT_RGTC2_SNORM VIRGL_FORMAT_RGTC2_SNORM
-
-#define PIPE_FORMAT_R8G8_B8G8_UNORM VIRGL_FORMAT_R8G8_B8G8_UNORM
-#define PIPE_FORMAT_G8R8_G8B8_UNORM VIRGL_FORMAT_G8R8_G8B8_UNORM
-
-/* mixed formats */
-#define PIPE_FORMAT_R8SG8SB8UX8U_NORM VIRGL_FORMAT_R8SG8SB8UX8U_NORM
-#define PIPE_FORMAT_R5SG5SB6U_NORM VIRGL_FORMAT_R5SG5SB6U_NORM
-
-/* TODO: re-order these */
-#define PIPE_FORMAT_A8B8G8R8_UNORM VIRGL_FORMAT_A8B8G8R8_UNORM
-#define PIPE_FORMAT_B5G5R5X1_UNORM VIRGL_FORMAT_B5G5R5X1_UNORM
-#define PIPE_FORMAT_R10G10B10A2_USCALED VIRGL_FORMAT_R10G10B10A2_USCALED
-#define PIPE_FORMAT_R11G11B10_FLOAT VIRGL_FORMAT_R11G11B10_FLOAT
-#define PIPE_FORMAT_R9G9B9E5_FLOAT VIRGL_FORMAT_R9G9B9E5_FLOAT
-#define PIPE_FORMAT_Z32_FLOAT_S8X24_UINT VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT
-#define PIPE_FORMAT_R1_UNORM VIRGL_FORMAT_R1_UNORM
-#define PIPE_FORMAT_R10G10B10X2_USCALED VIRGL_FORMAT_R10G10B10X2_USCALED
-#define PIPE_FORMAT_R10G10B10X2_SNORM VIRGL_FORMAT_R10G10B10X2_SNORM
-#define PIPE_FORMAT_L4A4_UNORM VIRGL_FORMAT_L4A4_UNORM
-#define PIPE_FORMAT_B10G10R10A2_UNORM VIRGL_FORMAT_B10G10R10A2_UNORM
-#define PIPE_FORMAT_R10SG10SB10SA2U_NORM VIRGL_FORMAT_R10SG10SB10SA2U_NORM
-#define PIPE_FORMAT_R8G8Bx_SNORM VIRGL_FORMAT_R8G8Bx_SNORM
-#define PIPE_FORMAT_R8G8B8X8_UNORM VIRGL_FORMAT_R8G8B8X8_UNORM
-#define PIPE_FORMAT_B4G4R4X4_UNORM VIRGL_FORMAT_B4G4R4X4_UNORM
-
-/* some stencil samplers formats */
-#define PIPE_FORMAT_X24S8_UINT VIRGL_FORMAT_X24S8_UINT
-#define PIPE_FORMAT_S8X24_UINT VIRGL_FORMAT_S8X24_UINT
-#define PIPE_FORMAT_X32_S8X24_UINT VIRGL_FORMAT_X32_S8X24_UINT
-
-#define PIPE_FORMAT_B2G3R3_UNORM VIRGL_FORMAT_B2G3R3_UNORM
-#define PIPE_FORMAT_L16A16_UNORM VIRGL_FORMAT_L16A16_UNORM
-#define PIPE_FORMAT_A16_UNORM VIRGL_FORMAT_A16_UNORM
-#define PIPE_FORMAT_I16_UNORM VIRGL_FORMAT_I16_UNORM
-
-#define PIPE_FORMAT_LATC1_UNORM VIRGL_FORMAT_LATC1_UNORM
-#define PIPE_FORMAT_LATC1_SNORM VIRGL_FORMAT_LATC1_SNORM
-#define PIPE_FORMAT_LATC2_UNORM VIRGL_FORMAT_LATC2_UNORM
-#define PIPE_FORMAT_LATC2_SNORM VIRGL_FORMAT_LATC2_SNORM
-
-#define PIPE_FORMAT_A8_SNORM VIRGL_FORMAT_A8_SNORM
-#define PIPE_FORMAT_L8_SNORM VIRGL_FORMAT_L8_SNORM
-#define PIPE_FORMAT_L8A8_SNORM VIRGL_FORMAT_L8A8_SNORM
-#define PIPE_FORMAT_I8_SNORM VIRGL_FORMAT_I8_SNORM
-#define PIPE_FORMAT_A16_SNORM VIRGL_FORMAT_A16_SNORM
-#define PIPE_FORMAT_L16_SNORM VIRGL_FORMAT_L16_SNORM
-#define PIPE_FORMAT_L16A16_SNORM VIRGL_FORMAT_L16A16_SNORM
-#define PIPE_FORMAT_I16_SNORM VIRGL_FORMAT_I16_SNORM
-
-#define PIPE_FORMAT_A16_FLOAT VIRGL_FORMAT_A16_FLOAT
-#define PIPE_FORMAT_L16_FLOAT VIRGL_FORMAT_L16_FLOAT
-#define PIPE_FORMAT_L16A16_FLOAT VIRGL_FORMAT_L16A16_FLOAT
-#define PIPE_FORMAT_I16_FLOAT VIRGL_FORMAT_I16_FLOAT
-#define PIPE_FORMAT_A32_FLOAT VIRGL_FORMAT_A32_FLOAT
-#define PIPE_FORMAT_L32_FLOAT VIRGL_FORMAT_L32_FLOAT
-#define PIPE_FORMAT_L32A32_FLOAT VIRGL_FORMAT_L32A32_FLOAT
-#define PIPE_FORMAT_I32_FLOAT VIRGL_FORMAT_I32_FLOAT
-
-#define PIPE_FORMAT_YV12 VIRGL_FORMAT_YV12
-#define PIPE_FORMAT_YV16 VIRGL_FORMAT_YV16
-#define PIPE_FORMAT_IYUV VIRGL_FORMAT_IYUV /**< aka I420 */
-#define PIPE_FORMAT_NV12 VIRGL_FORMAT_NV12
-#define PIPE_FORMAT_NV21 VIRGL_FORMAT_NV21
-
-#define PIPE_FORMAT_A4R4_UNORM VIRGL_FORMAT_A4R4_UNORM
-#define PIPE_FORMAT_R4A4_UNORM VIRGL_FORMAT_R4A4_UNORM
-#define PIPE_FORMAT_R8A8_UNORM VIRGL_FORMAT_R8A8_UNORM
-#define PIPE_FORMAT_A8R8_UNORM VIRGL_FORMAT_A8R8_UNORM
-
-#define PIPE_FORMAT_R10G10B10A2_SSCALED VIRGL_FORMAT_R10G10B10A2_SSCALED
-#define PIPE_FORMAT_R10G10B10A2_SNORM VIRGL_FORMAT_R10G10B10A2_SNORM
-
-#define PIPE_FORMAT_B10G10R10A2_USCALED VIRGL_FORMAT_B10G10R10A2_USCALED
-#define PIPE_FORMAT_B10G10R10A2_SSCALED VIRGL_FORMAT_B10G10R10A2_SSCALED
-#define PIPE_FORMAT_B10G10R10A2_SNORM VIRGL_FORMAT_B10G10R10A2_SNORM
-
-#define PIPE_FORMAT_R8_UINT VIRGL_FORMAT_R8_UINT
-#define PIPE_FORMAT_R8G8_UINT VIRGL_FORMAT_R8G8_UINT
-#define PIPE_FORMAT_R8G8B8_UINT VIRGL_FORMAT_R8G8B8_UINT
-#define PIPE_FORMAT_R8G8B8A8_UINT VIRGL_FORMAT_R8G8B8A8_UINT
-
-#define PIPE_FORMAT_R8_SINT VIRGL_FORMAT_R8_SINT
-#define PIPE_FORMAT_R8G8_SINT VIRGL_FORMAT_R8G8_SINT
-#define PIPE_FORMAT_R8G8B8_SINT VIRGL_FORMAT_R8G8B8_SINT
-#define PIPE_FORMAT_R8G8B8A8_SINT VIRGL_FORMAT_R8G8B8A8_SINT
-
-#define PIPE_FORMAT_R16_UINT VIRGL_FORMAT_R16_UINT
-#define PIPE_FORMAT_R16G16_UINT VIRGL_FORMAT_R16G16_UINT
-#define PIPE_FORMAT_R16G16B16_UINT VIRGL_FORMAT_R16G16B16_UINT
-#define PIPE_FORMAT_R16G16B16A16_UINT VIRGL_FORMAT_R16G16B16A16_UINT
-
-#define PIPE_FORMAT_R16_SINT VIRGL_FORMAT_R16_SINT
-#define PIPE_FORMAT_R16G16_SINT VIRGL_FORMAT_R16G16_SINT
-#define PIPE_FORMAT_R16G16B16_SINT VIRGL_FORMAT_R16G16B16_SINT
-#define PIPE_FORMAT_R16G16B16A16_SINT VIRGL_FORMAT_R16G16B16A16_SINT
-
-#define PIPE_FORMAT_R32_UINT VIRGL_FORMAT_R32_UINT
-#define PIPE_FORMAT_R32G32_UINT VIRGL_FORMAT_R32G32_UINT
-#define PIPE_FORMAT_R32G32B32_UINT VIRGL_FORMAT_R32G32B32_UINT
-#define PIPE_FORMAT_R32G32B32A32_UINT VIRGL_FORMAT_R32G32B32A32_UINT
-
-#define PIPE_FORMAT_R32_SINT VIRGL_FORMAT_R32_SINT
-#define PIPE_FORMAT_R32G32_SINT VIRGL_FORMAT_R32G32_SINT
-#define PIPE_FORMAT_R32G32B32_SINT VIRGL_FORMAT_R32G32B32_SINT
-#define PIPE_FORMAT_R32G32B32A32_SINT VIRGL_FORMAT_R32G32B32A32_SINT
-
-#define PIPE_FORMAT_A8_UINT VIRGL_FORMAT_A8_UINT
-#define PIPE_FORMAT_I8_UINT VIRGL_FORMAT_I8_UINT
-#define PIPE_FORMAT_L8_UINT VIRGL_FORMAT_L8_UINT
-#define PIPE_FORMAT_L8A8_UINT VIRGL_FORMAT_L8A8_UINT
-
-#define PIPE_FORMAT_A8_SINT VIRGL_FORMAT_A8_SINT
-#define PIPE_FORMAT_I8_SINT VIRGL_FORMAT_I8_SINT
-#define PIPE_FORMAT_L8_SINT VIRGL_FORMAT_L8_SINT
-#define PIPE_FORMAT_L8A8_SINT VIRGL_FORMAT_L8A8_SINT
-
-#define PIPE_FORMAT_A16_UINT VIRGL_FORMAT_A16_UINT
-#define PIPE_FORMAT_I16_UINT VIRGL_FORMAT_I16_UINT
-#define PIPE_FORMAT_L16_UINT VIRGL_FORMAT_L16_UINT
-#define PIPE_FORMAT_L16A16_UINT VIRGL_FORMAT_L16A16_UINT
-
-#define PIPE_FORMAT_A16_SINT VIRGL_FORMAT_A16_SINT
-#define PIPE_FORMAT_I16_SINT VIRGL_FORMAT_I16_SINT
-#define PIPE_FORMAT_L16_SINT VIRGL_FORMAT_L16_SINT
-#define PIPE_FORMAT_L16A16_SINT VIRGL_FORMAT_L16A16_SINT
-
-#define PIPE_FORMAT_A32_UINT VIRGL_FORMAT_A32_UINT
-#define PIPE_FORMAT_I32_UINT VIRGL_FORMAT_I32_UINT
-#define PIPE_FORMAT_L32_UINT VIRGL_FORMAT_L32_UINT
-#define PIPE_FORMAT_L32A32_UINT VIRGL_FORMAT_L32A32_UINT
-
-#define PIPE_FORMAT_A32_SINT VIRGL_FORMAT_A32_SINT
-#define PIPE_FORMAT_I32_SINT VIRGL_FORMAT_I32_SINT
-#define PIPE_FORMAT_L32_SINT VIRGL_FORMAT_L32_SINT
-#define PIPE_FORMAT_L32A32_SINT VIRGL_FORMAT_L32A32_SINT
-
-#define PIPE_FORMAT_B10G10R10A2_UINT VIRGL_FORMAT_B10G10R10A2_UINT
-
-#define PIPE_FORMAT_ETC1_RGB8 VIRGL_FORMAT_ETC1_RGB8
-
-#define PIPE_FORMAT_R8G8_R8B8_UNORM VIRGL_FORMAT_R8G8_R8B8_UNORM
-#define PIPE_FORMAT_G8R8_B8R8_UNORM VIRGL_FORMAT_G8R8_B8R8_UNORM
-
-#define PIPE_FORMAT_R8G8B8X8_SNORM VIRGL_FORMAT_R8G8B8X8_SNORM
-#define PIPE_FORMAT_R8G8B8X8_SRGB VIRGL_FORMAT_R8G8B8X8_SRGB
-#define PIPE_FORMAT_R8G8B8X8_UINT VIRGL_FORMAT_R8G8B8X8_UINT
-#define PIPE_FORMAT_R8G8B8X8_SINT VIRGL_FORMAT_R8G8B8X8_SINT
-#define PIPE_FORMAT_B10G10R10X2_UNORM VIRGL_FORMAT_B10G10R10X2_UNORM
-#define PIPE_FORMAT_R16G16B16X16_UNORM VIRGL_FORMAT_R16G16B16X16_UNORM
-#define PIPE_FORMAT_R16G16B16X16_SNORM VIRGL_FORMAT_R16G16B16X16_SNORM
-#define PIPE_FORMAT_R16G16B16X16_FLOAT VIRGL_FORMAT_R16G16B16X16_FLOAT
-#define PIPE_FORMAT_R16G16B16X16_UINT VIRGL_FORMAT_R16G16B16X16_UINT
-#define PIPE_FORMAT_R16G16B16X16_SINT VIRGL_FORMAT_R16G16B16X16_SINT
-#define PIPE_FORMAT_R32G32B32X32_FLOAT VIRGL_FORMAT_R32G32B32X32_FLOAT
-#define PIPE_FORMAT_R32G32B32X32_UINT VIRGL_FORMAT_R32G32B32X32_UINT
-#define PIPE_FORMAT_R32G32B32X32_SINT VIRGL_FORMAT_R32G32B32X32_SINT
-
-#define PIPE_FORMAT_R8A8_SNORM VIRGL_FORMAT_R8A8_SNORM
-#define PIPE_FORMAT_R16A16_UNORM VIRGL_FORMAT_R16A16_UNORM
-#define PIPE_FORMAT_R16A16_SNORM VIRGL_FORMAT_R16A16_SNORM
-#define PIPE_FORMAT_R16A16_FLOAT VIRGL_FORMAT_R16A16_FLOAT
-#define PIPE_FORMAT_R32A32_FLOAT VIRGL_FORMAT_R32A32_FLOAT
-#define PIPE_FORMAT_R8A8_UINT VIRGL_FORMAT_R8A8_UINT
-#define PIPE_FORMAT_R8A8_SINT VIRGL_FORMAT_R8A8_SINT
-#define PIPE_FORMAT_R16A16_UINT VIRGL_FORMAT_R16A16_UINT
-#define PIPE_FORMAT_R16A16_SINT VIRGL_FORMAT_R16A16_SINT
-#define PIPE_FORMAT_R32A32_UINT VIRGL_FORMAT_R32A32_UINT
-#define PIPE_FORMAT_R32A32_SINT VIRGL_FORMAT_R32A32_SINT
-#define PIPE_FORMAT_R10G10B10A2_UINT VIRGL_FORMAT_R10G10B10A2_UINT
-
-#define PIPE_FORMAT_B5G6R5_SRGB VIRGL_FORMAT_B5G6R5_SRGB
-
-#define PIPE_FORMAT_BPTC_RGBA_UNORM VIRGL_FORMAT_BPTC_RGBA_UNORM
-#define PIPE_FORMAT_BPTC_SRGBA VIRGL_FORMAT_BPTC_SRGBA
-#define PIPE_FORMAT_BPTC_RGB_FLOAT VIRGL_FORMAT_BPTC_RGB_FLOAT
-#define PIPE_FORMAT_BPTC_RGB_UFLOAT VIRGL_FORMAT_BPTC_RGB_UFLOAT
-
-#define PIPE_FORMAT_A8L8_UNORM VIRGL_FORMAT_A8L8_UNORM
-#define PIPE_FORMAT_A8L8_SNORM VIRGL_FORMAT_A8L8_SNORM
-#define PIPE_FORMAT_A8L8_SRGB VIRGL_FORMAT_A8L8_SRGB
-#define PIPE_FORMAT_A16L16_UNORM VIRGL_FORMAT_A16L16_UNORM
-
-#define PIPE_FORMAT_G8R8_UNORM VIRGL_FORMAT_G8R8_UNORM
-#define PIPE_FORMAT_G8R8_SNORM VIRGL_FORMAT_G8R8_SNORM
-#define PIPE_FORMAT_G16R16_UNORM VIRGL_FORMAT_G16R16_UNORM
-#define PIPE_FORMAT_G16R16_SNORM VIRGL_FORMAT_G16R16_SNORM
-
-#define PIPE_FORMAT_A8B8G8R8_SNORM VIRGL_FORMAT_A8B8G8R8_SNORM
-#define PIPE_FORMAT_X8B8G8R8_SNORM VIRGL_FORMAT_X8B8G8R8_SNORM
-
-#define PIPE_FORMAT_ETC2_RGB8 VIRGL_FORMAT_ETC2_RGB8
-#define PIPE_FORMAT_ETC2_SRGB8 VIRGL_FORMAT_ETC2_SRGB8
-#define PIPE_FORMAT_ETC2_RGB8A1 VIRGL_FORMAT_ETC2_RGB8A1
-#define PIPE_FORMAT_ETC2_SRGB8A1 VIRGL_FORMAT_ETC2_SRGB8A1
-#define PIPE_FORMAT_ETC2_RGBA8 VIRGL_FORMAT_ETC2_RGBA8
-#define PIPE_FORMAT_ETC2_SRGBA8 VIRGL_FORMAT_ETC2_SRGBA8
-#define PIPE_FORMAT_ETC2_R11_UNORM VIRGL_FORMAT_ETC2_R11_UNORM
-#define PIPE_FORMAT_ETC2_R11_SNORM VIRGL_FORMAT_ETC2_R11_SNORM
-#define PIPE_FORMAT_ETC2_RG11_UNORM VIRGL_FORMAT_ETC2_RG11_UNORM
-#define PIPE_FORMAT_ETC2_RG11_SNORM VIRGL_FORMAT_ETC2_RG11_SNORM
-
-#define PIPE_FORMAT_ASTC_4x4 VIRGL_FORMAT_ASTC_4x4
-#define PIPE_FORMAT_ASTC_5x4 VIRGL_FORMAT_ASTC_5x4
-#define PIPE_FORMAT_ASTC_5x5 VIRGL_FORMAT_ASTC_5x5
-#define PIPE_FORMAT_ASTC_6x5 VIRGL_FORMAT_ASTC_6x5
-#define PIPE_FORMAT_ASTC_6x6 VIRGL_FORMAT_ASTC_6x6
-#define PIPE_FORMAT_ASTC_8x5 VIRGL_FORMAT_ASTC_8x5
-#define PIPE_FORMAT_ASTC_8x6 VIRGL_FORMAT_ASTC_8x6
-#define PIPE_FORMAT_ASTC_8x8 VIRGL_FORMAT_ASTC_8x8
-#define PIPE_FORMAT_ASTC_10x5 VIRGL_FORMAT_ASTC_10x5
-#define PIPE_FORMAT_ASTC_10x6 VIRGL_FORMAT_ASTC_10x6
-#define PIPE_FORMAT_ASTC_10x8 VIRGL_FORMAT_ASTC_10x8
-#define PIPE_FORMAT_ASTC_10x10 VIRGL_FORMAT_ASTC_10x10
-#define PIPE_FORMAT_ASTC_12x10 VIRGL_FORMAT_ASTC_12x10
-#define PIPE_FORMAT_ASTC_12x12 VIRGL_FORMAT_ASTC_12x12
-
-#define PIPE_FORMAT_ASTC_4x4_SRGB VIRGL_FORMAT_ASTC_4x4_SRGB
-#define PIPE_FORMAT_ASTC_5x4_SRGB VIRGL_FORMAT_ASTC_5x4_SRGB
-#define PIPE_FORMAT_ASTC_5x5_SRGB VIRGL_FORMAT_ASTC_5x5_SRGB
-#define PIPE_FORMAT_ASTC_6x5_SRGB VIRGL_FORMAT_ASTC_6x5_SRGB
-#define PIPE_FORMAT_ASTC_6x6_SRGB VIRGL_FORMAT_ASTC_6x6_SRGB
-#define PIPE_FORMAT_ASTC_8x5_SRGB VIRGL_FORMAT_ASTC_8x5_SRGB
-#define PIPE_FORMAT_ASTC_8x6_SRGB VIRGL_FORMAT_ASTC_8x6_SRGB
-#define PIPE_FORMAT_ASTC_8x8_SRGB VIRGL_FORMAT_ASTC_8x8_SRGB
-#define PIPE_FORMAT_ASTC_10x5_SRGB VIRGL_FORMAT_ASTC_10x5_SRGB
-#define PIPE_FORMAT_ASTC_10x6_SRGB VIRGL_FORMAT_ASTC_10x6_SRGB
-#define PIPE_FORMAT_ASTC_10x8_SRGB VIRGL_FORMAT_ASTC_10x8_SRGB
-#define PIPE_FORMAT_ASTC_10x10_SRGB VIRGL_FORMAT_ASTC_10x10_SRGB
-#define PIPE_FORMAT_ASTC_12x10_SRGB VIRGL_FORMAT_ASTC_12x10_SRGB
-#define PIPE_FORMAT_ASTC_12x12_SRGB VIRGL_FORMAT_ASTC_12x12_SRGB
-
-#define PIPE_FORMAT_P016 VIRGL_FORMAT_P016
-
-#define PIPE_FORMAT_R10G10B10X2_UNORM VIRGL_FORMAT_R10G10B10X2_UNORM
-#define PIPE_FORMAT_A1B5G5R5_UNORM VIRGL_FORMAT_A1B5G5R5_UNORM
-#define PIPE_FORMAT_X1B5G5R5_UNORM VIRGL_FORMAT_X1B5G5R5_UNORM
-#define PIPE_FORMAT_A4B4G4R4_UNORM VIRGL_FORMAT_A4B4G4R4_UNORM
-
-#define PIPE_FORMAT_R8_SRGB VIRGL_FORMAT_R8_SRGB
-
-#define PIPE_FORMAT_COUNT VIRGL_FORMAT_MAX
-
-#if defined(PIPE_ARCH_LITTLE_ENDIAN)
-#define PIPE_FORMAT_RGBA8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM
-#define PIPE_FORMAT_RGBX8888_UNORM PIPE_FORMAT_R8G8B8X8_UNORM
-#define PIPE_FORMAT_BGRA8888_UNORM PIPE_FORMAT_B8G8R8A8_UNORM
-#define PIPE_FORMAT_BGRX8888_UNORM PIPE_FORMAT_B8G8R8X8_UNORM
-#define PIPE_FORMAT_ARGB8888_UNORM PIPE_FORMAT_A8R8G8B8_UNORM
-#define PIPE_FORMAT_XRGB8888_UNORM PIPE_FORMAT_X8R8G8B8_UNORM
-#define PIPE_FORMAT_ABGR8888_UNORM PIPE_FORMAT_A8B8G8R8_UNORM
-#define PIPE_FORMAT_XBGR8888_UNORM PIPE_FORMAT_X8B8G8R8_UNORM
-#define PIPE_FORMAT_RGBA8888_SNORM PIPE_FORMAT_R8G8B8A8_SNORM
-#define PIPE_FORMAT_RGBX8888_SNORM PIPE_FORMAT_R8G8B8X8_SNORM
-#define PIPE_FORMAT_ABGR8888_SNORM PIPE_FORMAT_A8B8G8R8_SNORM
-#define PIPE_FORMAT_XBGR8888_SNORM PIPE_FORMAT_X8B8G8R8_SNORM
-#define PIPE_FORMAT_RGBA8888_SRGB PIPE_FORMAT_R8G8B8A8_SRGB
-#define PIPE_FORMAT_RGBX8888_SRGB PIPE_FORMAT_R8G8B8X8_SRGB
-#define PIPE_FORMAT_BGRA8888_SRGB PIPE_FORMAT_B8G8R8A8_SRGB
-#define PIPE_FORMAT_BGRX8888_SRGB PIPE_FORMAT_B8G8R8X8_SRGB
-#define PIPE_FORMAT_ARGB8888_SRGB PIPE_FORMAT_A8R8G8B8_SRGB
-#define PIPE_FORMAT_XRGB8888_SRGB PIPE_FORMAT_X8R8G8B8_SRGB
-#define PIPE_FORMAT_ABGR8888_SRGB PIPE_FORMAT_A8B8G8R8_SRGB
-#define PIPE_FORMAT_XBGR8888_SRGB PIPE_FORMAT_X8B8G8R8_SRGB
-#define PIPE_FORMAT_LA88_UNORM PIPE_FORMAT_L8A8_UNORM
-#define PIPE_FORMAT_AL88_UNORM PIPE_FORMAT_A8L8_UNORM
-#define PIPE_FORMAT_LA88_SNORM PIPE_FORMAT_L8A8_SNORM
-#define PIPE_FORMAT_AL88_SNORM PIPE_FORMAT_A8L8_SNORM
-#define PIPE_FORMAT_LA88_SRGB PIPE_FORMAT_L8A8_SRGB
-#define PIPE_FORMAT_AL88_SRGB PIPE_FORMAT_A8L8_SRGB
-#define PIPE_FORMAT_LA1616_UNORM PIPE_FORMAT_L16A16_UNORM
-#define PIPE_FORMAT_AL1616_UNORM PIPE_FORMAT_A16L16_UNORM
-#define PIPE_FORMAT_RG88_UNORM PIPE_FORMAT_R8G8_UNORM
-#define PIPE_FORMAT_GR88_UNORM PIPE_FORMAT_G8R8_UNORM
-#define PIPE_FORMAT_RG88_SNORM PIPE_FORMAT_R8G8_SNORM
-#define PIPE_FORMAT_GR88_SNORM PIPE_FORMAT_G8R8_SNORM
-#define PIPE_FORMAT_RG1616_UNORM PIPE_FORMAT_R16G16_UNORM
-#define PIPE_FORMAT_GR1616_UNORM PIPE_FORMAT_G16R16_UNORM
-#define PIPE_FORMAT_RG1616_SNORM PIPE_FORMAT_R16G16_SNORM
-#define PIPE_FORMAT_GR1616_SNORM PIPE_FORMAT_G16R16_SNORM
-#elif defined(PIPE_ARCH_BIG_ENDIAN)
-#define PIPE_FORMAT_ABGR8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM
-#define PIPE_FORMAT_XBGR8888_UNORM PIPE_FORMAT_R8G8B8X8_UNORM
-#define PIPE_FORMAT_ARGB8888_UNORM PIPE_FORMAT_B8G8R8A8_UNORM
-#define PIPE_FORMAT_XRGB8888_UNORM PIPE_FORMAT_B8G8R8X8_UNORM
-#define PIPE_FORMAT_BGRA8888_UNORM PIPE_FORMAT_A8R8G8B8_UNORM
-#define PIPE_FORMAT_BGRX8888_UNORM PIPE_FORMAT_X8R8G8B8_UNORM
-#define PIPE_FORMAT_RGBA8888_UNORM PIPE_FORMAT_A8B8G8R8_UNORM
-#define PIPE_FORMAT_RGBX8888_UNORM PIPE_FORMAT_X8B8G8R8_UNORM
-#define PIPE_FORMAT_ABGR8888_SNORM PIPE_FORMAT_R8G8B8A8_SNORM
-#define PIPE_FORMAT_XBGR8888_SNORM PIPE_FORMAT_R8G8B8X8_SNORM
-#define PIPE_FORMAT_RGBA8888_SNORM PIPE_FORMAT_A8B8G8R8_SNORM
-#define PIPE_FORMAT_RGBX8888_SNORM PIPE_FORMAT_X8B8G8R8_SNORM
-#define PIPE_FORMAT_ABGR8888_SRGB PIPE_FORMAT_R8G8B8A8_SRGB
-#define PIPE_FORMAT_XBGR8888_SRGB PIPE_FORMAT_R8G8B8X8_SRGB
-#define PIPE_FORMAT_ARGB8888_SRGB PIPE_FORMAT_B8G8R8A8_SRGB
-#define PIPE_FORMAT_XRGB8888_SRGB PIPE_FORMAT_B8G8R8X8_SRGB
-#define PIPE_FORMAT_BGRA8888_SRGB PIPE_FORMAT_A8R8G8B8_SRGB
-#define PIPE_FORMAT_BGRX8888_SRGB PIPE_FORMAT_X8R8G8B8_SRGB
-#define PIPE_FORMAT_RGBA8888_SRGB PIPE_FORMAT_A8B8G8R8_SRGB
-#define PIPE_FORMAT_RGBX8888_SRGB PIPE_FORMAT_X8B8G8R8_SRGB
-#define PIPE_FORMAT_LA88_UNORM PIPE_FORMAT_A8L8_UNORM
-#define PIPE_FORMAT_AL88_UNORM PIPE_FORMAT_L8A8_UNORM
-#define PIPE_FORMAT_LA88_SNORM PIPE_FORMAT_A8L8_SNORM
-#define PIPE_FORMAT_AL88_SNORM PIPE_FORMAT_L8A8_SNORM
-#define PIPE_FORMAT_LA88_SRGB PIPE_FORMAT_A8L8_SRGB
-#define PIPE_FORMAT_AL88_SRGB PIPE_FORMAT_L8A8_SRGB
-#define PIPE_FORMAT_LA1616_UNORM PIPE_FORMAT_A16L16_UNORM
-#define PIPE_FORMAT_AL1616_UNORM PIPE_FORMAT_L16A16_UNORM
-#define PIPE_FORMAT_RG88_UNORM PIPE_FORMAT_G8R8_UNORM
-#define PIPE_FORMAT_GR88_UNORM PIPE_FORMAT_R8G8_UNORM
-#define PIPE_FORMAT_RG88_SNORM PIPE_FORMAT_G8R8_SNORM
-#define PIPE_FORMAT_GR88_SNORM PIPE_FORMAT_R8G8_SNORM
-#define PIPE_FORMAT_RG1616_UNORM PIPE_FORMAT_G16R16_UNORM
-#define PIPE_FORMAT_GR1616_UNORM PIPE_FORMAT_R16G16_UNORM
-#define PIPE_FORMAT_RG1616_SNORM PIPE_FORMAT_G16R16_SNORM
-#define PIPE_FORMAT_GR1616_SNORM PIPE_FORMAT_R16G16_SNORM
-#endif
-
-enum pipe_video_chroma_format {
-  PIPE_VIDEO_CHROMA_FORMAT_400,
-  PIPE_VIDEO_CHROMA_FORMAT_420,
-  PIPE_VIDEO_CHROMA_FORMAT_422,
-  PIPE_VIDEO_CHROMA_FORMAT_444,
-  PIPE_VIDEO_CHROMA_FORMAT_NONE
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_screen.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_screen.h
deleted file mode 100644
index 4cc64f025..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_screen.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- *
- * Screen, Adapter or GPU
- *
- * These are driver functions/facilities that are context independent.
- */
-
-#ifndef P_SCREEN_H
-#define P_SCREEN_H
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_format.h"
-#include "pipe/p_video_enums.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Opaque types */
-struct winsys_handle;
-struct pipe_fence_handle;
-struct pipe_resource;
-struct pipe_surface;
-struct pipe_transfer;
-struct pipe_box;
-
-/**
- * Gallium screen/adapter context.  Basically everything
- * hardware-specific that doesn't actually require a rendering
- * context.
- */
-struct pipe_screen {
-  void (*destroy)(struct pipe_screen *);
-
-  const char *(*get_name)(struct pipe_screen *);
-
-  const char *(*get_vendor)(struct pipe_screen *);
-
-  /**
-   * Query an integer-valued capability/parameter/limit
-   * \param param  one of PIPE_CAP_x
-   */
-  int (*get_param)(struct pipe_screen *, enum pipe_cap param);
-
-  /**
-   * Query a float-valued capability/parameter/limit
-   * \param param  one of PIPE_CAP_x
-   */
-  float (*get_paramf)(struct pipe_screen *, enum pipe_capf param);
-
-  /**
-   * Query a per-shader-stage integer-valued capability/parameter/limit
-   * \param param  one of PIPE_CAP_x
-   */
-  int (*get_shader_param)(struct pipe_screen *, unsigned shader,
-                          enum pipe_shader_cap param);
-
-  /**
-   * Query an integer-valued capability/parameter/limit for a codec/profile
-   * \param param  one of PIPE_VIDEO_CAP_x
-   */
-  int (*get_video_param)(struct pipe_screen *, enum pipe_video_profile profile,
-                         enum pipe_video_entrypoint entrypoint,
-                         enum pipe_video_cap param);
-
-  /**
-   * Query a compute-specific capability/parameter/limit.
-   * \param param  one of PIPE_COMPUTE_CAP_x
-   * \param ret    pointer to a preallocated buffer that will be
-   *               initialized to the parameter value, or NULL.
-   * \return       size in bytes of the parameter value that would be
-   *               returned.
-   */
-  int (*get_compute_param)(struct pipe_screen *, enum pipe_compute_cap param,
-                           void *ret);
-
-  /**
-   * Query a timestamp in nanoseconds. The returned value should match
-   * PIPE_QUERY_TIMESTAMP. This function returns immediately and doesn't
-   * wait for rendering to complete (which cannot be achieved with queries).
-   */
-  uint64_t (*get_timestamp)(struct pipe_screen *);
-
-  struct pipe_context *(*context_create)(struct pipe_screen *, void *priv);
-
-  /**
-   * Check if the given pipe_format is supported as a texture or
-   * drawing surface.
-   * \param bindings  bitmask of PIPE_BIND_*
-   */
-  boolean (*is_format_supported)(struct pipe_screen *, enum pipe_format format,
-                                 enum pipe_texture_target target,
-                                 unsigned sample_count, unsigned bindings);
-
-  /**
-   * Check if the given pipe_format is supported as output for this
-   * codec/profile.
-   * \param profile  profile to check, may also be PIPE_VIDEO_PROFILE_UNKNOWN
-   */
-  boolean (*is_video_format_supported)(struct pipe_screen *,
-                                       enum pipe_format format,
-                                       enum pipe_video_profile profile,
-                                       enum pipe_video_entrypoint entrypoint);
-
-  /**
-   * Check if we can actually create the given resource (test the dimension,
-   * overall size, etc).  Used to implement proxy textures.
-   * \return TRUE if size is OK, FALSE if too large.
-   */
-  boolean (*can_create_resource)(struct pipe_screen *screen,
-                                 const struct pipe_resource *templat);
-
-  /**
-   * Create a new texture object, using the given template info.
-   */
-  struct pipe_resource *(*resource_create)(struct pipe_screen *,
-                                           const struct pipe_resource *templat);
-
-  /**
-   * Create a texture from a winsys_handle. The handle is often created in
-   * another process by first creating a pipe texture and then calling
-   * resource_get_handle.
-   */
-  struct pipe_resource *(*resource_from_handle)(
-      struct pipe_screen *, const struct pipe_resource *templat,
-      struct winsys_handle *handle);
-
-  /**
-   * Get a winsys_handle from a texture. Some platforms/winsys requires
-   * that the texture is created with a special usage flag like
-   * DISPLAYTARGET or PRIMARY.
-   */
-  boolean (*resource_get_handle)(struct pipe_screen *,
-                                 struct pipe_resource *tex,
-                                 struct winsys_handle *handle);
-
-  void (*resource_destroy)(struct pipe_screen *, struct pipe_resource *pt);
-
-  /**
-   * Do any special operations to ensure frontbuffer contents are
-   * displayed, eg copy fake frontbuffer.
-   * \param winsys_drawable_handle  an opaque handle that the calling context
-   *                                gets out-of-band
-   * \param subbox an optional sub region to flush
-   */
-  void (*flush_frontbuffer)(struct pipe_screen *screen,
-                            struct pipe_resource *resource, unsigned level,
-                            unsigned layer, void *winsys_drawable_handle,
-                            struct pipe_box *subbox);
-
-  /** Set ptr = fence, with reference counting */
-  void (*fence_reference)(struct pipe_screen *screen,
-                          struct pipe_fence_handle **ptr,
-                          struct pipe_fence_handle *fence);
-
-  /**
-   * Checks whether the fence has been signalled.
-   */
-  boolean (*fence_signalled)(struct pipe_screen *screen,
-                             struct pipe_fence_handle *fence);
-
-  /**
-   * Wait for the fence to finish.
-   * \param timeout  in nanoseconds (may be PIPE_TIMEOUT_INFINITE).
-   */
-  boolean (*fence_finish)(struct pipe_screen *screen,
-                          struct pipe_fence_handle *fence, uint64_t timeout);
-
-  /**
-   * Returns a driver-specific query.
-   *
-   * If \p info is NULL, the number of available queries is returned.
-   * Otherwise, the driver query at the specified \p index is returned
-   * in \p info. The function returns non-zero on success.
-   */
-  int (*get_driver_query_info)(struct pipe_screen *screen, unsigned index,
-                               struct pipe_driver_query_info *info);
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* P_SCREEN_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_shader_tokens.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_shader_tokens.h
deleted file mode 100644
index f2c0a2915..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_shader_tokens.h
+++ /dev/null
@@ -1,780 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * Copyright 2009-2010 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef P_SHADER_TOKENS_H
-#define P_SHADER_TOKENS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct tgsi_header {
-  unsigned HeaderSize : 8;
-  unsigned BodySize : 24;
-};
-
-#define TGSI_PROCESSOR_FRAGMENT 0
-#define TGSI_PROCESSOR_VERTEX 1
-#define TGSI_PROCESSOR_GEOMETRY 2
-#define TGSI_PROCESSOR_TESS_CTRL 3
-#define TGSI_PROCESSOR_TESS_EVAL 4
-#define TGSI_PROCESSOR_COMPUTE 5
-
-struct tgsi_processor {
-  unsigned Processor : 4; /* TGSI_PROCESSOR_ */
-  unsigned Padding : 28;
-};
-
-#define TGSI_TOKEN_TYPE_DECLARATION 0
-#define TGSI_TOKEN_TYPE_IMMEDIATE 1
-#define TGSI_TOKEN_TYPE_INSTRUCTION 2
-#define TGSI_TOKEN_TYPE_PROPERTY 3
-
-struct tgsi_token {
-  unsigned Type : 4;     /**< TGSI_TOKEN_TYPE_x */
-  unsigned NrTokens : 8; /**< UINT */
-  unsigned Padding : 20;
-};
-
-enum tgsi_file_type {
-  TGSI_FILE_NULL = 0,
-  TGSI_FILE_CONSTANT = 1,
-  TGSI_FILE_INPUT = 2,
-  TGSI_FILE_OUTPUT = 3,
-  TGSI_FILE_TEMPORARY = 4,
-  TGSI_FILE_SAMPLER = 5,
-  TGSI_FILE_ADDRESS = 6,
-  TGSI_FILE_IMMEDIATE = 7,
-  TGSI_FILE_PREDICATE = 8,
-  TGSI_FILE_SYSTEM_VALUE = 9,
-  TGSI_FILE_IMAGE = 10,
-  TGSI_FILE_SAMPLER_VIEW = 11,
-  TGSI_FILE_BUFFER,
-  TGSI_FILE_MEMORY,
-  TGSI_FILE_HW_ATOMIC,
-  TGSI_FILE_COUNT /**< how many TGSI_FILE_ types */
-};
-
-#define TGSI_WRITEMASK_NONE 0x00
-#define TGSI_WRITEMASK_X 0x01
-#define TGSI_WRITEMASK_Y 0x02
-#define TGSI_WRITEMASK_XY 0x03
-#define TGSI_WRITEMASK_Z 0x04
-#define TGSI_WRITEMASK_XZ 0x05
-#define TGSI_WRITEMASK_YZ 0x06
-#define TGSI_WRITEMASK_XYZ 0x07
-#define TGSI_WRITEMASK_W 0x08
-#define TGSI_WRITEMASK_XW 0x09
-#define TGSI_WRITEMASK_YW 0x0A
-#define TGSI_WRITEMASK_XYW 0x0B
-#define TGSI_WRITEMASK_ZW 0x0C
-#define TGSI_WRITEMASK_XZW 0x0D
-#define TGSI_WRITEMASK_YZW 0x0E
-#define TGSI_WRITEMASK_XYZW 0x0F
-
-#define TGSI_INTERPOLATE_CONSTANT 0
-#define TGSI_INTERPOLATE_LINEAR 1
-#define TGSI_INTERPOLATE_PERSPECTIVE 2
-#define TGSI_INTERPOLATE_COLOR 3 /* special color case for smooth/flat */
-#define TGSI_INTERPOLATE_COUNT 4
-
-#define TGSI_INTERPOLATE_LOC_CENTER 0
-#define TGSI_INTERPOLATE_LOC_CENTROID 1
-#define TGSI_INTERPOLATE_LOC_SAMPLE 2
-#define TGSI_INTERPOLATE_LOC_COUNT 3
-
-#define TGSI_CYLINDRICAL_WRAP_X (1 << 0)
-#define TGSI_CYLINDRICAL_WRAP_Y (1 << 1)
-#define TGSI_CYLINDRICAL_WRAP_Z (1 << 2)
-#define TGSI_CYLINDRICAL_WRAP_W (1 << 3)
-
-enum tgsi_memory_type {
-  TGSI_MEMORY_TYPE_GLOBAL,  /* OpenCL global              */
-  TGSI_MEMORY_TYPE_SHARED,  /* OpenCL local / GLSL shared */
-  TGSI_MEMORY_TYPE_PRIVATE, /* OpenCL private             */
-  TGSI_MEMORY_TYPE_INPUT,   /* OpenCL kernel input params */
-  TGSI_MEMORY_TYPE_COUNT,
-};
-
-struct tgsi_declaration {
-  unsigned Type : 4;        /**< TGSI_TOKEN_TYPE_DECLARATION */
-  unsigned NrTokens : 8;    /**< UINT */
-  unsigned File : 4;        /**< one of TGSI_FILE_x */
-  unsigned UsageMask : 4;   /**< bitmask of TGSI_WRITEMASK_x flags */
-  unsigned Dimension : 1;   /**< any extra dimension info? */
-  unsigned Semantic : 1;    /**< BOOL, any semantic info? */
-  unsigned Interpolate : 1; /**< any interpolation info? */
-  unsigned Invariant : 1;   /**< invariant optimization? */
-  unsigned Local : 1;       /**< optimize as subroutine local variable? */
-  unsigned Array : 1;       /**< extra array info? */
-  unsigned Atomic : 1;      /**< atomic only? for TGSI_FILE_BUFFER */
-  unsigned MemType : 2;     /**< TGSI_MEMORY_TYPE_x for TGSI_FILE_MEMORY */
-  unsigned Padding : 3;
-};
-
-struct tgsi_declaration_range {
-  unsigned First : 16; /**< UINT */
-  unsigned Last : 16;  /**< UINT */
-};
-
-struct tgsi_declaration_dimension {
-  unsigned Index2D : 16; /**< UINT */
-  unsigned Padding : 16;
-};
-
-struct tgsi_declaration_interp {
-  unsigned Interpolate : 4;     /**< one of TGSI_INTERPOLATE_x */
-  unsigned Location : 2;        /**< one of TGSI_INTERPOLATE_LOC_x */
-  unsigned CylindricalWrap : 4; /**< TGSI_CYLINDRICAL_WRAP_x flags */
-  unsigned Padding : 22;
-};
-
-#define TGSI_SEMANTIC_POSITION 0
-#define TGSI_SEMANTIC_COLOR 1
-#define TGSI_SEMANTIC_BCOLOR 2 /**< back-face color */
-#define TGSI_SEMANTIC_FOG 3
-#define TGSI_SEMANTIC_PSIZE 4
-#define TGSI_SEMANTIC_GENERIC 5
-#define TGSI_SEMANTIC_NORMAL 6
-#define TGSI_SEMANTIC_FACE 7
-#define TGSI_SEMANTIC_EDGEFLAG 8
-#define TGSI_SEMANTIC_PRIMID 9
-#define TGSI_SEMANTIC_INSTANCEID 10 /**< doesn't include start_instance */
-#define TGSI_SEMANTIC_VERTEXID 11
-#define TGSI_SEMANTIC_STENCIL 12
-#define TGSI_SEMANTIC_CLIPDIST 13
-#define TGSI_SEMANTIC_CLIPVERTEX 14
-#define TGSI_SEMANTIC_GRID_SIZE 15  /**< grid size in blocks */
-#define TGSI_SEMANTIC_BLOCK_ID 16   /**< id of the current block */
-#define TGSI_SEMANTIC_BLOCK_SIZE 17 /**< block size in threads */
-#define TGSI_SEMANTIC_THREAD_ID                                                \
-  18 /**< block-relative id of the current thread */
-#define TGSI_SEMANTIC_TEXCOORD 19       /**< texture or sprite coordinates */
-#define TGSI_SEMANTIC_PCOORD 20         /**< point sprite coordinate */
-#define TGSI_SEMANTIC_VIEWPORT_INDEX 21 /**< viewport index */
-#define TGSI_SEMANTIC_LAYER 22          /**< layer (rendertarget index) */
-#define TGSI_SEMANTIC_CULLDIST 23
-#define TGSI_SEMANTIC_SAMPLEID 24
-#define TGSI_SEMANTIC_SAMPLEPOS 25
-#define TGSI_SEMANTIC_SAMPLEMASK 26
-#define TGSI_SEMANTIC_INVOCATIONID 27
-#define TGSI_SEMANTIC_VERTEXID_NOBASE 28
-#define TGSI_SEMANTIC_BASEVERTEX 29
-#define TGSI_SEMANTIC_PATCH 30      /**< generic per-patch semantic */
-#define TGSI_SEMANTIC_TESSCOORD 31  /**< coordinate being processed by tess */
-#define TGSI_SEMANTIC_TESSOUTER 32  /**< outer tessellation levels */
-#define TGSI_SEMANTIC_TESSINNER 33  /**< inner tessellation levels */
-#define TGSI_SEMANTIC_VERTICESIN 34 /**< number of input vertices */
-#define TGSI_SEMANTIC_HELPER_INVOCATION 35 /**< current invocation is helper   \
-                                            */
-#define TGSI_SEMANTIC_COUNT 36             /**< number of semantic values */
-
-struct tgsi_declaration_semantic {
-  unsigned Name : 8;    /**< one of TGSI_SEMANTIC_x */
-  unsigned Index : 16;  /**< UINT */
-  unsigned StreamX : 2; /**< vertex stream (for GS output) */
-  unsigned StreamY : 2;
-  unsigned StreamZ : 2;
-  unsigned StreamW : 2;
-};
-
-struct tgsi_declaration_image {
-  unsigned Resource : 8; /**< one of TGSI_TEXTURE_ */
-  unsigned Raw : 1;
-  unsigned Writable : 1;
-  unsigned Format : 10; /**< one of PIPE_FORMAT_ */
-  unsigned Padding : 12;
-};
-
-enum tgsi_return_type {
-  TGSI_RETURN_TYPE_UNORM = 0,
-  TGSI_RETURN_TYPE_SNORM,
-  TGSI_RETURN_TYPE_SINT,
-  TGSI_RETURN_TYPE_UINT,
-  TGSI_RETURN_TYPE_FLOAT,
-  TGSI_RETURN_TYPE_COUNT
-};
-
-struct tgsi_declaration_sampler_view {
-  unsigned Resource : 8;    /**< one of TGSI_TEXTURE_ */
-  unsigned ReturnTypeX : 6; /**< one of enum tgsi_return_type */
-  unsigned ReturnTypeY : 6; /**< one of enum tgsi_return_type */
-  unsigned ReturnTypeZ : 6; /**< one of enum tgsi_return_type */
-  unsigned ReturnTypeW : 6; /**< one of enum tgsi_return_type */
-};
-
-struct tgsi_declaration_array {
-  unsigned ArrayID : 10;
-  unsigned Padding : 22;
-};
-
-/*
- * Special resources that don't need to be declared.  They map to the
- * GLOBAL/LOCAL/PRIVATE/INPUT compute memory spaces.
- */
-#define TGSI_RESOURCE_GLOBAL 0x7fff
-#define TGSI_RESOURCE_LOCAL 0x7ffe
-#define TGSI_RESOURCE_PRIVATE 0x7ffd
-#define TGSI_RESOURCE_INPUT 0x7ffc
-
-#define TGSI_IMM_FLOAT32 0
-#define TGSI_IMM_UINT32 1
-#define TGSI_IMM_INT32 2
-#define TGSI_IMM_FLOAT64 3
-
-struct tgsi_immediate {
-  unsigned Type : 4;      /**< TGSI_TOKEN_TYPE_IMMEDIATE */
-  unsigned NrTokens : 14; /**< UINT */
-  unsigned DataType : 4;  /**< one of TGSI_IMM_x */
-  unsigned Padding : 10;
-};
-
-union tgsi_immediate_data {
-  float Float;
-  unsigned Uint;
-  int Int;
-};
-
-#define TGSI_PROPERTY_GS_INPUT_PRIM 0
-#define TGSI_PROPERTY_GS_OUTPUT_PRIM 1
-#define TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES 2
-#define TGSI_PROPERTY_FS_COORD_ORIGIN 3
-#define TGSI_PROPERTY_FS_COORD_PIXEL_CENTER 4
-#define TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS 5
-#define TGSI_PROPERTY_FS_DEPTH_LAYOUT 6
-#define TGSI_PROPERTY_VS_PROHIBIT_UCPS 7
-#define TGSI_PROPERTY_GS_INVOCATIONS 8
-#define TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION 9
-#define TGSI_PROPERTY_TCS_VERTICES_OUT 10
-#define TGSI_PROPERTY_TES_PRIM_MODE 11
-#define TGSI_PROPERTY_TES_SPACING 12
-#define TGSI_PROPERTY_TES_VERTEX_ORDER_CW 13
-#define TGSI_PROPERTY_TES_POINT_MODE 14
-#define TGSI_PROPERTY_NUM_CLIPDIST_ENABLED 15
-#define TGSI_PROPERTY_NUM_CULLDIST_ENABLED 16
-#define TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL 17
-#define TGSI_PROPERTY_FS_POST_DEPTH_COVERAGE 18
-#define TGSI_PROPERTY_NEXT_SHADER 19
-#define TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH 20
-#define TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT 21
-#define TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH 22
-#define TGSI_PROPERTY_MUL_ZERO_WINS 23
-#define TGSI_PROPERTY_COUNT 24
-
-struct tgsi_property {
-  unsigned Type : 4;         /**< TGSI_TOKEN_TYPE_PROPERTY */
-  unsigned NrTokens : 8;     /**< UINT */
-  unsigned PropertyName : 8; /**< one of TGSI_PROPERTY */
-  unsigned Padding : 12;
-};
-
-#define TGSI_FS_COORD_ORIGIN_UPPER_LEFT 0
-#define TGSI_FS_COORD_ORIGIN_LOWER_LEFT 1
-
-#define TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER 0
-#define TGSI_FS_COORD_PIXEL_CENTER_INTEGER 1
-
-#define TGSI_FS_DEPTH_LAYOUT_NONE 0
-#define TGSI_FS_DEPTH_LAYOUT_ANY 1
-#define TGSI_FS_DEPTH_LAYOUT_GREATER 2
-#define TGSI_FS_DEPTH_LAYOUT_LESS 3
-#define TGSI_FS_DEPTH_LAYOUT_UNCHANGED 4
-
-struct tgsi_property_data {
-  unsigned Data;
-};
-
-/* TGSI opcodes.
- *
- * For more information on semantics of opcodes and
- * which APIs are known to use which opcodes, see
- * gallium/docs/source/tgsi.rst
- */
-/* VIRGLRENDERER specific - DON'T SYNC WITH MESA
- * OR REMOVE OPCODES - FILL in and REWRITE tgsi_info
- * accordingly.
- */
-#define TGSI_OPCODE_ARL 0
-#define TGSI_OPCODE_MOV 1
-#define TGSI_OPCODE_LIT 2
-#define TGSI_OPCODE_RCP 3
-#define TGSI_OPCODE_RSQ 4
-#define TGSI_OPCODE_EXP 5
-#define TGSI_OPCODE_LOG 6
-#define TGSI_OPCODE_MUL 7
-#define TGSI_OPCODE_ADD 8
-#define TGSI_OPCODE_DP3 9
-#define TGSI_OPCODE_DP4 10
-#define TGSI_OPCODE_DST 11
-#define TGSI_OPCODE_MIN 12
-#define TGSI_OPCODE_MAX 13
-#define TGSI_OPCODE_SLT 14
-#define TGSI_OPCODE_SGE 15
-#define TGSI_OPCODE_MAD 16
-#define TGSI_OPCODE_SUB 17
-#define TGSI_OPCODE_LRP 18
-#define TGSI_OPCODE_FMA 19
-#define TGSI_OPCODE_SQRT 20
-/* gap */
-#define TGSI_OPCODE_FRC 24
-/* gap */
-#define TGSI_OPCODE_FLR 26
-#define TGSI_OPCODE_ROUND 27
-#define TGSI_OPCODE_EX2 28
-#define TGSI_OPCODE_LG2 29
-#define TGSI_OPCODE_POW 30
-#define TGSI_OPCODE_XPD 31
-/* gap */
-#define TGSI_OPCODE_ABS 33
-/* gap */
-#define TGSI_OPCODE_DPH 35
-#define TGSI_OPCODE_COS 36
-#define TGSI_OPCODE_DDX 37
-#define TGSI_OPCODE_DDY 38
-#define TGSI_OPCODE_KILL 39 /* unconditional */
-#define TGSI_OPCODE_PK2H 40
-#define TGSI_OPCODE_PK2US 41
-#define TGSI_OPCODE_PK4B 42
-#define TGSI_OPCODE_PK4UB 43
-/* gap */
-#define TGSI_OPCODE_SEQ 45
-/* gap */
-#define TGSI_OPCODE_SGT 47
-#define TGSI_OPCODE_SIN 48
-#define TGSI_OPCODE_SLE 49
-#define TGSI_OPCODE_SNE 50
-/* gap */
-#define TGSI_OPCODE_TEX 52
-#define TGSI_OPCODE_TXD 53
-#define TGSI_OPCODE_TXP 54
-#define TGSI_OPCODE_UP2H 55
-#define TGSI_OPCODE_UP2US 56
-#define TGSI_OPCODE_UP4B 57
-#define TGSI_OPCODE_UP4UB 58
-/* gap */
-#define TGSI_OPCODE_ARR 61
-/* gap */
-#define TGSI_OPCODE_CAL 63
-#define TGSI_OPCODE_RET 64
-#define TGSI_OPCODE_SSG 65 /* SGN */
-#define TGSI_OPCODE_CMP 66
-#define TGSI_OPCODE_SCS 67
-#define TGSI_OPCODE_TXB 68
-#define TGSI_OPCODE_FBFETCH 69
-#define TGSI_OPCODE_DIV 70
-#define TGSI_OPCODE_DP2 71
-#define TGSI_OPCODE_TXL 72
-#define TGSI_OPCODE_BRK 73
-#define TGSI_OPCODE_IF 74
-#define TGSI_OPCODE_UIF 75
-#define TGSI_OPCODE_ELSE 77
-#define TGSI_OPCODE_ENDIF 78
-
-#define TGSI_OPCODE_DDX_FINE 79
-#define TGSI_OPCODE_DDY_FINE 80
-/* gap */
-#define TGSI_OPCODE_CEIL 83
-#define TGSI_OPCODE_I2F 84
-#define TGSI_OPCODE_NOT 85
-#define TGSI_OPCODE_TRUNC 86
-#define TGSI_OPCODE_SHL 87
-/* gap */
-#define TGSI_OPCODE_AND 89
-#define TGSI_OPCODE_OR 90
-#define TGSI_OPCODE_MOD 91
-#define TGSI_OPCODE_XOR 92
-/* gap */
-#define TGSI_OPCODE_TXF 94
-#define TGSI_OPCODE_TXQ 95
-#define TGSI_OPCODE_CONT 96
-#define TGSI_OPCODE_EMIT 97
-#define TGSI_OPCODE_ENDPRIM 98
-#define TGSI_OPCODE_BGNLOOP 99
-#define TGSI_OPCODE_BGNSUB 100
-#define TGSI_OPCODE_ENDLOOP 101
-#define TGSI_OPCODE_ENDSUB 102
-/* gap */
-#define TGSI_OPCODE_TXQS 104
-#define TGSI_OPCODE_RESQ 105
-/* gap */
-#define TGSI_OPCODE_NOP 107
-
-#define TGSI_OPCODE_FSEQ 108
-#define TGSI_OPCODE_FSGE 109
-#define TGSI_OPCODE_FSLT 110
-#define TGSI_OPCODE_FSNE 111
-
-#define TGSI_OPCODE_MEMBAR 112
-/* gap */
-#define TGSI_OPCODE_KILL_IF 116 /* conditional kill */
-#define TGSI_OPCODE_END 117     /* aka HALT */
-#define TGSI_OPCODE_DFMA 118
-#define TGSI_OPCODE_F2I 119
-#define TGSI_OPCODE_IDIV 120
-#define TGSI_OPCODE_IMAX 121
-#define TGSI_OPCODE_IMIN 122
-#define TGSI_OPCODE_INEG 123
-#define TGSI_OPCODE_ISGE 124
-#define TGSI_OPCODE_ISHR 125
-#define TGSI_OPCODE_ISLT 126
-#define TGSI_OPCODE_F2U 127
-#define TGSI_OPCODE_U2F 128
-#define TGSI_OPCODE_UADD 129
-#define TGSI_OPCODE_UDIV 130
-#define TGSI_OPCODE_UMAD 131
-#define TGSI_OPCODE_UMAX 132
-#define TGSI_OPCODE_UMIN 133
-#define TGSI_OPCODE_UMOD 134
-#define TGSI_OPCODE_UMUL 135
-#define TGSI_OPCODE_USEQ 136
-#define TGSI_OPCODE_USGE 137
-#define TGSI_OPCODE_USHR 138
-#define TGSI_OPCODE_USLT 139
-#define TGSI_OPCODE_USNE 140
-#define TGSI_OPCODE_SWITCH 141
-#define TGSI_OPCODE_CASE 142
-#define TGSI_OPCODE_DEFAULT 143
-#define TGSI_OPCODE_ENDSWITCH 144
-
-/* resource related opcodes */
-#define TGSI_OPCODE_SAMPLE 145
-#define TGSI_OPCODE_SAMPLE_I 146
-#define TGSI_OPCODE_SAMPLE_I_MS 147
-#define TGSI_OPCODE_SAMPLE_B 148
-#define TGSI_OPCODE_SAMPLE_C 149
-#define TGSI_OPCODE_SAMPLE_C_LZ 150
-#define TGSI_OPCODE_SAMPLE_D 151
-#define TGSI_OPCODE_SAMPLE_L 152
-#define TGSI_OPCODE_GATHER4 153
-#define TGSI_OPCODE_SVIEWINFO 154
-#define TGSI_OPCODE_SAMPLE_POS 155
-#define TGSI_OPCODE_SAMPLE_INFO 156
-
-#define TGSI_OPCODE_UARL 157
-#define TGSI_OPCODE_UCMP 158
-#define TGSI_OPCODE_IABS 159
-#define TGSI_OPCODE_ISSG 160
-
-#define TGSI_OPCODE_LOAD 161
-#define TGSI_OPCODE_STORE 162
-
-/* gap */
-#define TGSI_OPCODE_BARRIER 166
-
-#define TGSI_OPCODE_ATOMUADD 167
-#define TGSI_OPCODE_ATOMXCHG 168
-#define TGSI_OPCODE_ATOMCAS 169
-#define TGSI_OPCODE_ATOMAND 170
-#define TGSI_OPCODE_ATOMOR 171
-#define TGSI_OPCODE_ATOMXOR 172
-#define TGSI_OPCODE_ATOMUMIN 173
-#define TGSI_OPCODE_ATOMUMAX 174
-#define TGSI_OPCODE_ATOMIMIN 175
-#define TGSI_OPCODE_ATOMIMAX 176
-
-/* to be used for shadow cube map compares */
-#define TGSI_OPCODE_TEX2 177
-#define TGSI_OPCODE_TXB2 178
-#define TGSI_OPCODE_TXL2 179
-
-#define TGSI_OPCODE_IMUL_HI 180
-#define TGSI_OPCODE_UMUL_HI 181
-
-#define TGSI_OPCODE_TG4 182
-
-#define TGSI_OPCODE_LODQ 183
-
-#define TGSI_OPCODE_IBFE 184
-#define TGSI_OPCODE_UBFE 185
-#define TGSI_OPCODE_BFI 186
-#define TGSI_OPCODE_BREV 187
-#define TGSI_OPCODE_POPC 188
-#define TGSI_OPCODE_LSB 189
-#define TGSI_OPCODE_IMSB 190
-#define TGSI_OPCODE_UMSB 191
-
-#define TGSI_OPCODE_INTERP_CENTROID 192
-#define TGSI_OPCODE_INTERP_SAMPLE 193
-#define TGSI_OPCODE_INTERP_OFFSET 194
-
-/* sm5 marked opcodes are supported in D3D11 optionally - also DMOV, DMOVC */
-#define TGSI_OPCODE_F2D 195 /* SM5 */
-#define TGSI_OPCODE_D2F 196
-#define TGSI_OPCODE_DABS 197
-#define TGSI_OPCODE_DNEG 198  /* SM5 */
-#define TGSI_OPCODE_DADD 199  /* SM5 */
-#define TGSI_OPCODE_DMUL 200  /* SM5 */
-#define TGSI_OPCODE_DMAX 201  /* SM5 */
-#define TGSI_OPCODE_DMIN 202  /* SM5 */
-#define TGSI_OPCODE_DSLT 203  /* SM5 */
-#define TGSI_OPCODE_DSGE 204  /* SM5 */
-#define TGSI_OPCODE_DSEQ 205  /* SM5 */
-#define TGSI_OPCODE_DSNE 206  /* SM5 */
-#define TGSI_OPCODE_DRCP 207  /* eg, cayman */
-#define TGSI_OPCODE_DSQRT 208 /* eg, cayman also has DRSQ */
-#define TGSI_OPCODE_DMAD 209
-#define TGSI_OPCODE_DFRAC 210    /* eg, cayman */
-#define TGSI_OPCODE_DLDEXP 211   /* eg, cayman */
-#define TGSI_OPCODE_DFRACEXP 212 /* eg, cayman */
-#define TGSI_OPCODE_D2I 213
-#define TGSI_OPCODE_I2D 214
-#define TGSI_OPCODE_D2U 215
-#define TGSI_OPCODE_U2D 216
-#define TGSI_OPCODE_DRSQ 217   /* eg, cayman also has DRSQ */
-#define TGSI_OPCODE_DTRUNC 218 /* nvc0 */
-#define TGSI_OPCODE_DCEIL 219  /* nvc0 */
-#define TGSI_OPCODE_DFLR 220   /* nvc0 */
-#define TGSI_OPCODE_DROUND 221 /* nvc0 */
-#define TGSI_OPCODE_DSSG 222
-#define TGSI_OPCODE_DDIV 223
-#define TGSI_OPCODE_CLOCK 224
-
-/* opcodes for ARB_gpu_shader_int64 */
-#define TGSI_OPCODE_I64ABS 225
-#define TGSI_OPCODE_I64NEG 226
-#define TGSI_OPCODE_I64SSG 227
-#define TGSI_OPCODE_I64SLT 228
-#define TGSI_OPCODE_I64SGE 229
-#define TGSI_OPCODE_I64MIN 230
-#define TGSI_OPCODE_I64MAX 231
-#define TGSI_OPCODE_I64SHR 232
-#define TGSI_OPCODE_I64DIV 233
-#define TGSI_OPCODE_I64MOD 234
-#define TGSI_OPCODE_F2I64 235
-#define TGSI_OPCODE_U2I64 236
-#define TGSI_OPCODE_I2I64 237
-#define TGSI_OPCODE_D2I64 238
-#define TGSI_OPCODE_I642F 239
-#define TGSI_OPCODE_I642D 240
-
-#define TGSI_OPCODE_U64ADD 241
-#define TGSI_OPCODE_U64MUL 242
-#define TGSI_OPCODE_U64SEQ 243
-#define TGSI_OPCODE_U64SNE 244
-#define TGSI_OPCODE_U64SLT 245
-#define TGSI_OPCODE_U64SGE 246
-#define TGSI_OPCODE_U64MIN 247
-#define TGSI_OPCODE_U64MAX 248
-#define TGSI_OPCODE_U64SHL 249
-#define TGSI_OPCODE_U64SHR 250
-#define TGSI_OPCODE_U64DIV 251
-#define TGSI_OPCODE_U64MOD 252
-#define TGSI_OPCODE_F2U64 253
-#define TGSI_OPCODE_D2U64 254
-#define TGSI_OPCODE_U642F 255
-#define TGSI_OPCODE_U642D 256
-
-#define TGSI_OPCODE_LAST 257
-
-/**
- * Opcode is the operation code to execute. A given operation defines the
- * semantics how the source registers (if any) are interpreted and what is
- * written to the destination registers (if any) as a result of execution.
- *
- * NumDstRegs and NumSrcRegs is the number of destination and source registers,
- * respectively. For a given operation code, those numbers are fixed and are
- * present here only for convenience.
- *
- * Saturate controls how are final results in destination registers modified.
- */
-
-/*
- * VIRGLRENDERER specific -
- * we no long keep this in sync with mesa, we had to increase the NrTokens
- * as mesa can remove old opcodes, but the renderer cannot.
- */
-struct tgsi_instruction {
-  unsigned Type : 4;       /* TGSI_TOKEN_TYPE_INSTRUCTION */
-  unsigned NrTokens : 9;   /* UINT */
-  unsigned Opcode : 8;     /* TGSI_OPCODE_ */
-  unsigned Saturate : 1;   /* BOOL */
-  unsigned NumDstRegs : 2; /* UINT */
-  unsigned NumSrcRegs : 4; /* UINT */
-  unsigned Label : 1;
-  unsigned Texture : 1;
-  unsigned Memory : 1;
-  unsigned Precise : 1;
-};
-
-/*
- * If tgsi_instruction::Label is TRUE, tgsi_instruction_label follows.
- *
- * If tgsi_instruction::Texture is TRUE, tgsi_instruction_texture follows.
- *   if texture instruction has a number of offsets,
- *   then tgsi_instruction::Texture::NumOffset of tgsi_texture_offset follow.
- *
- * Then, tgsi_instruction::NumDstRegs of tgsi_dst_register follow.
- *
- * Then, tgsi_instruction::NumSrcRegs of tgsi_src_register follow.
- *
- * tgsi_instruction::NrTokens contains the total number of words that make the
- * instruction, including the instruction word.
- */
-
-#define TGSI_SWIZZLE_X 0
-#define TGSI_SWIZZLE_Y 1
-#define TGSI_SWIZZLE_Z 2
-#define TGSI_SWIZZLE_W 3
-
-struct tgsi_instruction_label {
-  unsigned Label : 24; /* UINT */
-  unsigned Padding : 8;
-};
-
-#define TGSI_TEXTURE_BUFFER 0
-#define TGSI_TEXTURE_1D 1
-#define TGSI_TEXTURE_2D 2
-#define TGSI_TEXTURE_3D 3
-#define TGSI_TEXTURE_CUBE 4
-#define TGSI_TEXTURE_RECT 5
-#define TGSI_TEXTURE_SHADOW1D 6
-#define TGSI_TEXTURE_SHADOW2D 7
-#define TGSI_TEXTURE_SHADOWRECT 8
-#define TGSI_TEXTURE_1D_ARRAY 9
-#define TGSI_TEXTURE_2D_ARRAY 10
-#define TGSI_TEXTURE_SHADOW1D_ARRAY 11
-#define TGSI_TEXTURE_SHADOW2D_ARRAY 12
-#define TGSI_TEXTURE_SHADOWCUBE 13
-#define TGSI_TEXTURE_2D_MSAA 14
-#define TGSI_TEXTURE_2D_ARRAY_MSAA 15
-#define TGSI_TEXTURE_CUBE_ARRAY 16
-#define TGSI_TEXTURE_SHADOWCUBE_ARRAY 17
-#define TGSI_TEXTURE_UNKNOWN 18
-#define TGSI_TEXTURE_COUNT 19
-
-struct tgsi_instruction_texture {
-  unsigned Texture : 8; /* TGSI_TEXTURE_ */
-  unsigned NumOffsets : 4;
-  unsigned Padding : 20;
-};
-
-/* for texture offsets in GLSL and DirectX.
- * Generally these always come from TGSI_FILE_IMMEDIATE,
- * however DX11 appears to have the capability to do
- * non-constant texture offsets.
- */
-struct tgsi_texture_offset {
-  int Index : 16;
-  unsigned File : 4;     /**< one of TGSI_FILE_x */
-  unsigned SwizzleX : 2; /* TGSI_SWIZZLE_x */
-  unsigned SwizzleY : 2; /* TGSI_SWIZZLE_x */
-  unsigned SwizzleZ : 2; /* TGSI_SWIZZLE_x */
-  unsigned Padding : 6;
-};
-
-/**
- * File specifies the register array to access.
- *
- * Index specifies the element number of a register in the register file.
- *
- * If Indirect is TRUE, Index should be offset by the X component of the
- * indirect register that follows. The register can be now fetched into local
- * storage for further processing.
- *
- * If Negate is TRUE, all components of the fetched register are negated.
- *
- * The fetched register components are swizzled according to SwizzleX, SwizzleY,
- * SwizzleZ and SwizzleW.
- *
- */
-
-struct tgsi_src_register {
-  unsigned File : 4;      /* TGSI_FILE_ */
-  unsigned Indirect : 1;  /* BOOL */
-  unsigned Dimension : 1; /* BOOL */
-  int Index : 16;         /* SINT */
-  unsigned SwizzleX : 2;  /* TGSI_SWIZZLE_ */
-  unsigned SwizzleY : 2;  /* TGSI_SWIZZLE_ */
-  unsigned SwizzleZ : 2;  /* TGSI_SWIZZLE_ */
-  unsigned SwizzleW : 2;  /* TGSI_SWIZZLE_ */
-  unsigned Absolute : 1;  /* BOOL */
-  unsigned Negate : 1;    /* BOOL */
-};
-
-/**
- * If tgsi_src_register::Indirect is TRUE, tgsi_ind_register follows.
- *
- * File, Index and Swizzle are handled the same as in tgsi_src_register.
- *
- * If ArrayID is zero the whole register file might be indirectly addressed,
- * if not only the Declaration with this ArrayID is accessed by this operand.
- *
- */
-
-struct tgsi_ind_register {
-  unsigned File : 4;     /* TGSI_FILE_ */
-  int Index : 16;        /* SINT */
-  unsigned Swizzle : 2;  /* TGSI_SWIZZLE_ */
-  unsigned ArrayID : 10; /* UINT */
-};
-
-/**
- * If tgsi_src_register::Dimension is TRUE, tgsi_dimension follows.
- */
-
-struct tgsi_dimension {
-  unsigned Indirect : 1;  /* BOOL */
-  unsigned Dimension : 1; /* BOOL */
-  unsigned Padding : 14;
-  int Index : 16; /* SINT */
-};
-
-struct tgsi_dst_register {
-  unsigned File : 4;      /* TGSI_FILE_ */
-  unsigned WriteMask : 4; /* TGSI_WRITEMASK_ */
-  unsigned Indirect : 1;  /* BOOL */
-  unsigned Dimension : 1; /* BOOL */
-  int Index : 16;         /* SINT */
-  unsigned Padding : 6;
-};
-
-#define TGSI_MEMORY_COHERENT (1 << 0)
-#define TGSI_MEMORY_RESTRICT (1 << 1)
-#define TGSI_MEMORY_VOLATILE (1 << 2)
-
-/**
- * Specifies the type of memory access to do for the LOAD/STORE instruction.
- */
-struct tgsi_instruction_memory {
-  unsigned Qualifier : 3; /* TGSI_MEMORY_ */
-  unsigned Texture : 8;   /* only for images: TGSI_TEXTURE_ */
-  unsigned Format : 10;   /* only for images: PIPE_FORMAT_ */
-  unsigned Padding : 11;
-};
-
-#define TGSI_MEMBAR_SHADER_BUFFER (1 << 0)
-#define TGSI_MEMBAR_ATOMIC_BUFFER (1 << 1)
-#define TGSI_MEMBAR_SHADER_IMAGE (1 << 2)
-#define TGSI_MEMBAR_SHARED (1 << 3)
-#define TGSI_MEMBAR_THREAD_GROUP (1 << 4)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* P_SHADER_TOKENS_H */
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_state.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_state.h
deleted file mode 100644
index c945c045b..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_state.h
+++ /dev/null
@@ -1,598 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007 VMware, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- *
- * Abstract graphics pipe state objects.
- *
- * Basic notes:
- *   1. Want compact representations, so we use bitfields.
- *   2. Put bitfields before other (GLfloat) fields.
- */
-
-#ifndef PIPE_STATE_H
-#define PIPE_STATE_H
-
-#include "p_compiler.h"
-#include "p_defines.h"
-#include "p_format.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Implementation limits
- */
-#define PIPE_MAX_ATTRIBS 32
-#define PIPE_MAX_CLIP_PLANES 8
-#define PIPE_MAX_COLOR_BUFS 8
-#define PIPE_MAX_CONSTANT_BUFFERS 32
-#define PIPE_MAX_SAMPLERS 16
-#define PIPE_MAX_SHADER_INPUTS 80  /* 32 GENERIC + 32 PATCH + 16 others */
-#define PIPE_MAX_SHADER_OUTPUTS 80 /* 32 GENERIC + 32 PATCH + 16 others */
-#define PIPE_MAX_SHADER_SAMPLER_VIEWS 32
-#define PIPE_MAX_SHADER_BUFFERS 32
-#define PIPE_MAX_SHADER_IMAGES 32
-#define PIPE_MAX_TEXTURE_LEVELS 16
-#define PIPE_MAX_SO_BUFFERS 4
-#define PIPE_MAX_SO_OUTPUTS 64
-#define PIPE_MAX_VIEWPORTS 16
-#define PIPE_MAX_CLIP_OR_CULL_DISTANCE_COUNT 8
-#define PIPE_MAX_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT 2
-#define PIPE_MAX_HW_ATOMIC_BUFFERS 32
-
-struct pipe_reference {
-  int32_t count; /* atomic */
-};
-
-/**
- * Primitive (point/line/tri) rasterization info
- */
-struct pipe_rasterizer_state {
-  unsigned flatshade : 1;
-  unsigned light_twoside : 1;
-  unsigned clamp_vertex_color : 1;
-  unsigned clamp_fragment_color : 1;
-  unsigned front_ccw : 1;
-  unsigned cull_face : 2;  /**< PIPE_FACE_x */
-  unsigned fill_front : 2; /**< PIPE_POLYGON_MODE_x */
-  unsigned fill_back : 2;  /**< PIPE_POLYGON_MODE_x */
-  unsigned offset_point : 1;
-  unsigned offset_line : 1;
-  unsigned offset_tri : 1;
-  unsigned scissor : 1;
-  unsigned poly_smooth : 1;
-  unsigned poly_stipple_enable : 1;
-  unsigned point_smooth : 1;
-  unsigned sprite_coord_mode : 1; /**< PIPE_SPRITE_COORD_ */
-  unsigned
-      point_quad_rasterization : 1; /** points rasterized as quads or points */
-  unsigned point_tri_clip : 1; /** large points clipped as tris or points */
-  unsigned point_size_per_vertex : 1; /**< size computed in vertex shader */
-  unsigned multisample : 1;           /* XXX maybe more ms state in future */
-  unsigned force_persample_interp : 1;
-  unsigned line_smooth : 1;
-  unsigned line_stipple_enable : 1;
-  unsigned line_last_pixel : 1;
-
-  /**
-   * Use the first vertex of a primitive as the provoking vertex for
-   * flat shading.
-   */
-  unsigned flatshade_first : 1;
-
-  unsigned half_pixel_center : 1;
-  unsigned bottom_edge_rule : 1;
-
-  /**
-   * When true, rasterization is disabled and no pixels are written.
-   * This only makes sense with the Stream Out functionality.
-   */
-  unsigned rasterizer_discard : 1;
-
-  /**
-   * When false, depth clipping is disabled and the depth value will be
-   * clamped later at the per-pixel level before depth testing.
-   * This depends on PIPE_CAP_DEPTH_CLIP_DISABLE.
-   */
-  unsigned depth_clip : 1;
-
-  /**
-   * When true clip space in the z axis goes from [0..1] (D3D).  When false
-   * [-1, 1] (GL).
-   *
-   * NOTE: D3D will always use depth clamping.
-   */
-  unsigned clip_halfz : 1;
-
-  /**
-   * Enable bits for clipping half-spaces.
-   * This applies to both user clip planes and shader clip distances.
-   * Note that if the bound shader exports any clip distances, these
-   * replace all user clip planes, and clip half-spaces enabled here
-   * but not written by the shader count as disabled.
-   */
-  unsigned clip_plane_enable : PIPE_MAX_CLIP_PLANES;
-
-  unsigned line_stipple_factor : 8; /**< [1..256] actually */
-  unsigned line_stipple_pattern : 16;
-
-  uint32_t sprite_coord_enable; /* referring to 32 TEXCOORD/GENERIC inputs */
-
-  float line_width;
-  float point_size; /**< used when no per-vertex size */
-  float offset_units;
-  float offset_scale;
-  float offset_clamp;
-};
-
-struct pipe_poly_stipple {
-  unsigned stipple[32];
-};
-
-struct pipe_viewport_state {
-  float scale[3];
-  float translate[3];
-};
-
-struct pipe_scissor_state {
-  unsigned minx : 16;
-  unsigned miny : 16;
-  unsigned maxx : 16;
-  unsigned maxy : 16;
-};
-
-struct pipe_clip_state {
-  float ucp[PIPE_MAX_CLIP_PLANES][4];
-};
-
-/**
- * Stream output for vertex transform feedback.
- */
-struct pipe_stream_output_info {
-  unsigned num_outputs;
-  /** stride for an entire vertex for each buffer in dwords */
-  unsigned stride[PIPE_MAX_SO_BUFFERS];
-
-  /**
-   * Array of stream outputs, in the order they are to be written in.
-   * Selected components are tightly packed into the output buffer.
-   */
-  struct {
-    unsigned register_index : 8;  /**< 0 to PIPE_MAX_SHADER_OUTPUTS */
-    unsigned start_component : 2; /** 0 to 3 */
-    unsigned num_components : 3;  /** 1 to 4 */
-    unsigned output_buffer : 3;   /**< 0 to PIPE_MAX_SO_BUFFERS */
-    unsigned dst_offset : 16;     /**< offset into the buffer in dwords */
-    unsigned stream : 2;
-    unsigned need_temp : 1;
-  } output[PIPE_MAX_SO_OUTPUTS];
-};
-
-struct pipe_shader_state {
-  const struct tgsi_token *tokens;
-  struct pipe_stream_output_info stream_output;
-};
-
-struct pipe_depth_state {
-  unsigned enabled : 1;   /**< depth test enabled? */
-  unsigned writemask : 1; /**< allow depth buffer writes? */
-  unsigned func : 3;      /**< depth test func (PIPE_FUNC_x) */
-};
-
-struct pipe_stencil_state {
-  unsigned enabled : 1;  /**< stencil[0]: stencil enabled, stencil[1]: two-side
-                            enabled */
-  unsigned func : 3;     /**< PIPE_FUNC_x */
-  unsigned fail_op : 3;  /**< PIPE_STENCIL_OP_x */
-  unsigned zpass_op : 3; /**< PIPE_STENCIL_OP_x */
-  unsigned zfail_op : 3; /**< PIPE_STENCIL_OP_x */
-  unsigned valuemask : 8;
-  unsigned writemask : 8;
-};
-
-struct pipe_alpha_state {
-  unsigned enabled : 1;
-  unsigned func : 3; /**< PIPE_FUNC_x */
-  float ref_value;   /**< reference value */
-};
-
-struct pipe_depth_stencil_alpha_state {
-  struct pipe_depth_state depth;
-  struct pipe_stencil_state stencil[2]; /**< [0] = front, [1] = back */
-  struct pipe_alpha_state alpha;
-};
-
-struct pipe_rt_blend_state {
-  unsigned blend_enable : 1;
-
-  unsigned rgb_func : 3;       /**< PIPE_BLEND_x */
-  unsigned rgb_src_factor : 5; /**< PIPE_BLENDFACTOR_x */
-  unsigned rgb_dst_factor : 5; /**< PIPE_BLENDFACTOR_x */
-
-  unsigned alpha_func : 3;       /**< PIPE_BLEND_x */
-  unsigned alpha_src_factor : 5; /**< PIPE_BLENDFACTOR_x */
-  unsigned alpha_dst_factor : 5; /**< PIPE_BLENDFACTOR_x */
-
-  unsigned colormask : 4; /**< bitmask of PIPE_MASK_R/G/B/A */
-};
-
-struct pipe_blend_state {
-  unsigned independent_blend_enable : 1;
-  unsigned logicop_enable : 1;
-  unsigned logicop_func : 4; /**< PIPE_LOGICOP_x */
-  unsigned dither : 1;
-  unsigned alpha_to_coverage : 1;
-  unsigned alpha_to_one : 1;
-  struct pipe_rt_blend_state rt[PIPE_MAX_COLOR_BUFS];
-};
-
-struct pipe_blend_color {
-  float color[4];
-};
-
-struct pipe_stencil_ref {
-  ubyte ref_value[2];
-};
-
-struct pipe_framebuffer_state {
-  unsigned width, height;
-
-  /** multiple color buffers for multiple render targets */
-  unsigned nr_cbufs;
-  struct pipe_surface *cbufs[PIPE_MAX_COLOR_BUFS];
-
-  struct pipe_surface *zsbuf; /**< Z/stencil buffer */
-};
-
-/**
- * Texture sampler state.
- */
-struct pipe_sampler_state {
-  unsigned wrap_s : 3;            /**< PIPE_TEX_WRAP_x */
-  unsigned wrap_t : 3;            /**< PIPE_TEX_WRAP_x */
-  unsigned wrap_r : 3;            /**< PIPE_TEX_WRAP_x */
-  unsigned min_img_filter : 2;    /**< PIPE_TEX_FILTER_x */
-  unsigned min_mip_filter : 2;    /**< PIPE_TEX_MIPFILTER_x */
-  unsigned mag_img_filter : 2;    /**< PIPE_TEX_FILTER_x */
-  unsigned compare_mode : 1;      /**< PIPE_TEX_COMPARE_x */
-  unsigned compare_func : 3;      /**< PIPE_FUNC_x */
-  unsigned normalized_coords : 1; /**< Are coords normalized to [0,1]? */
-  unsigned max_anisotropy : 6;
-  unsigned seamless_cube_map : 1;
-  float lod_bias;         /**< LOD/lambda bias */
-  float min_lod, max_lod; /**< LOD clamp range, after bias */
-  union pipe_color_union border_color;
-};
-
-/**
- * A view into a texture that can be bound to a color render target /
- * depth stencil attachment point.
- */
-struct pipe_surface {
-  struct pipe_reference reference;
-  struct pipe_resource *texture; /**< resource into which this is a view  */
-  struct pipe_context *context;  /**< context this surface belongs to */
-  enum pipe_format format;
-
-  /* XXX width/height should be removed */
-  unsigned width;  /**< logical width in pixels */
-  unsigned height; /**< logical height in pixels */
-
-  unsigned writable : 1; /**< writable shader resource */
-
-  union {
-    struct {
-      unsigned level;
-      unsigned first_layer : 16;
-      unsigned last_layer : 16;
-    } tex;
-    struct {
-      unsigned first_element;
-      unsigned last_element;
-    } buf;
-  } u;
-};
-
-/**
- * A view into a texture that can be bound to a shader stage.
- */
-struct pipe_sampler_view {
-  struct pipe_reference reference;
-  enum pipe_format format;       /**< typed PIPE_FORMAT_x */
-  struct pipe_resource *texture; /**< texture into which this is a view  */
-  struct pipe_context *context;  /**< context this view belongs to */
-  union {
-    struct {
-      unsigned first_layer : 16; /**< first layer to use for array textures */
-      unsigned last_layer : 16;  /**< last layer to use for array textures */
-      unsigned first_level : 8;  /**< first mipmap level to use */
-      unsigned last_level : 8;   /**< last mipmap level to use */
-    } tex;
-    struct {
-      unsigned first_element;
-      unsigned last_element;
-    } buf;
-  } u;
-  unsigned swizzle_r : 3; /**< PIPE_SWIZZLE_x for red component */
-  unsigned swizzle_g : 3; /**< PIPE_SWIZZLE_x for green component */
-  unsigned swizzle_b : 3; /**< PIPE_SWIZZLE_x for blue component */
-  unsigned swizzle_a : 3; /**< PIPE_SWIZZLE_x for alpha component */
-};
-
-/**
- * Subregion of 1D/2D/3D image resource.
- */
-struct pipe_box {
-  int x;
-  int y;
-  int z;
-  int width;
-  int height;
-  int depth;
-};
-
-/**
- * A memory object/resource such as a vertex buffer or texture.
- */
-struct pipe_resource {
-  struct pipe_reference reference;
-  struct pipe_screen *screen;      /**< screen that this texture belongs to */
-  enum pipe_texture_target target; /**< PIPE_TEXTURE_x */
-  enum pipe_format format;         /**< PIPE_FORMAT_x */
-
-  unsigned width0;
-  unsigned height0;
-  unsigned depth0;
-  unsigned array_size;
-
-  unsigned last_level : 8; /**< Index of last mipmap level present/defined */
-  unsigned nr_samples : 8; /**< for multisampled surfaces, nr of samples */
-  unsigned usage : 8;      /**< PIPE_USAGE_x (not a bitmask) */
-
-  unsigned bind;  /**< bitmask of PIPE_BIND_x */
-  unsigned flags; /**< bitmask of PIPE_RESOURCE_FLAG_x */
-};
-
-/**
- * Transfer object.  For data transfer to/from a resource.
- */
-struct pipe_transfer {
-  struct pipe_resource *resource; /**< resource to transfer to/from  */
-  unsigned level;                 /**< texture mipmap level */
-  enum pipe_transfer_usage usage;
-  struct pipe_box box;   /**< region of the resource to access */
-  unsigned stride;       /**< row stride in bytes */
-  unsigned layer_stride; /**< image/layer stride in bytes */
-};
-
-/**
- * A vertex buffer.  Typically, all the vertex data/attributes for
- * drawing something will be in one buffer.  But it's also possible, for
- * example, to put colors in one buffer and texcoords in another.
- */
-struct pipe_vertex_buffer {
-  unsigned stride;        /**< stride to same attrib in next vertex, in bytes */
-  unsigned buffer_offset; /**< offset to start of data in buffer, in bytes */
-  struct pipe_resource *buffer; /**< the actual buffer */
-  const void *user_buffer; /**< pointer to a user buffer if buffer == NULL */
-};
-
-/**
- * A constant buffer.  A subrange of an existing buffer can be set
- * as a constant buffer.
- */
-struct pipe_constant_buffer {
-  struct pipe_resource *buffer; /**< the actual buffer */
-  unsigned buffer_offset;  /**< offset to start of data in buffer, in bytes */
-  unsigned buffer_size;    /**< how much data can be read in shader */
-  const void *user_buffer; /**< pointer to a user buffer if buffer == NULL */
-};
-
-/**
- * A stream output target. The structure specifies the range vertices can
- * be written to.
- *
- * In addition to that, the structure should internally maintain the offset
- * into the buffer, which should be incremented everytime something is written
- * (appended) to it. The internal offset is buffer_offset + how many bytes
- * have been written. The internal offset can be stored on the device
- * and the CPU actually doesn't have to query it.
- *
- * Note that the buffer_size variable is actually specifying the available
- * space in the buffer, not the size of the attached buffer.
- * In other words in majority of cases buffer_size would simply be
- * 'buffer->width0 - buffer_offset', so buffer_size refers to the size
- * of the buffer left, after accounting for buffer offset, for stream output
- * to write to.
- *
- * Use PIPE_QUERY_SO_STATISTICS to know how many primitives have
- * actually been written.
- */
-struct pipe_stream_output_target {
-  struct pipe_reference reference;
-  struct pipe_resource *buffer; /**< the output buffer */
-  struct pipe_context *context; /**< context this SO target belongs to */
-
-  unsigned buffer_offset; /**< offset where data should be written, in bytes */
-  unsigned buffer_size;   /**< how much data is allowed to be written */
-};
-
-/**
- * Information to describe a vertex attribute (position, color, etc)
- */
-struct pipe_vertex_element {
-  /** Offset of this attribute, in bytes, from the start of the vertex */
-  unsigned src_offset;
-
-  /** Instance data rate divisor. 0 means this is per-vertex data,
-   *  n means per-instance data used for n consecutive instances (n > 0).
-   */
-  unsigned instance_divisor;
-
-  /** Which vertex_buffer (as given to pipe->set_vertex_buffer()) does
-   * this attribute live in?
-   */
-  unsigned vertex_buffer_index;
-
-  enum pipe_format src_format;
-};
-
-/**
- * An index buffer.  When an index buffer is bound, all indices to vertices
- * will be looked up in the buffer.
- */
-struct pipe_index_buffer {
-  unsigned index_size; /**< size of an index, in bytes */
-  unsigned offset;     /**< offset to start of data in buffer, in bytes */
-  struct pipe_resource *buffer; /**< the actual buffer */
-  const void *user_buffer; /**< pointer to a user buffer if buffer == NULL */
-};
-
-struct pipe_draw_indirect_info {
-  unsigned offset;                     /**< must be 4 byte aligned */
-  unsigned stride;                     /**< must be 4 byte aligned */
-  unsigned draw_count;                 /**< number of indirect draws */
-  unsigned indirect_draw_count_offset; /**< must be 4 byte aligned */
-
-  /* Indirect draw parameters resource is laid out as follows:
-   *
-   * if using indexed drawing:
-   *  struct {
-   *     uint32_t count;
-   *     uint32_t instance_count;
-   *     uint32_t start;
-   *     int32_t index_bias;
-   *     uint32_t start_instance;
-   *  };
-   * otherwise:
-   *  struct {
-   *     uint32_t count;
-   *     uint32_t instance_count;
-   *     uint32_t start;
-   *     uint32_t start_instance;
-   *  };
-   */
-  struct pipe_resource *buffer;
-
-  /* Indirect draw count resource: If not NULL, contains a 32-bit value which
-   * is to be used as the real draw_count.
-   */
-  struct pipe_resource *indirect_draw_count;
-};
-
-/**
- * Information to describe a draw_vbo call.
- */
-struct pipe_draw_info {
-  boolean indexed;          /**< use index buffer */
-  ubyte vertices_per_patch; /**< the number of vertices per patch */
-
-  unsigned mode;  /**< the mode of the primitive */
-  unsigned start; /**< the index of the first vertex */
-  unsigned count; /**< number of vertices */
-
-  unsigned start_instance; /**< first instance id */
-  unsigned instance_count; /**< number of instances */
-
-  unsigned drawid; /**< id of this draw in a multidraw */
-  /**
-   * For indexed drawing, these fields apply after index lookup.
-   */
-  int index_bias;     /**< a bias to be added to each index */
-  unsigned min_index; /**< the min index */
-  unsigned max_index; /**< the max index */
-
-  /**
-   * Primitive restart enable/index (only applies to indexed drawing)
-   */
-  boolean primitive_restart;
-  unsigned restart_index;
-
-  struct pipe_draw_indirect_info indirect;
-  /**
-   * Stream output target. If not NULL, it's used to provide the 'count'
-   * parameter based on the number vertices captured by the stream output
-   * stage. (or generally, based on the number of bytes captured)
-   *
-   * Only 'mode', 'start_instance', and 'instance_count' are taken into
-   * account, all the other variables from pipe_draw_info are ignored.
-   *
-   * 'start' is implicitly 0 and 'count' is set as discussed above.
-   * The draw command is non-indexed.
-   *
-   * Note that this only provides the count. The vertex buffers must
-   * be set via set_vertex_buffers manually.
-   */
-  struct pipe_stream_output_target *count_from_stream_output;
-};
-
-/**
- * Information to describe a blit call.
- */
-struct pipe_blit_info {
-  struct {
-    struct pipe_resource *resource;
-    unsigned level;
-    struct pipe_box box; /**< negative width, height only legal for src */
-    /* For pipe_surface-like format casting: */
-    enum pipe_format format; /**< must be supported for sampling (src)
-                             or rendering (dst), ZS is always supported */
-  } dst, src;
-
-  unsigned mask;   /**< bitmask of PIPE_MASK_R/G/B/A/Z/S */
-  unsigned filter; /**< PIPE_TEX_FILTER_* */
-
-  boolean scissor_enable;
-  struct pipe_scissor_state scissor;
-
-  boolean render_condition_enable; /**< whether the blit should honor the
-                                      current render condition */
-  boolean alpha_blend; /* dst.rgb = src.rgb * src.a + dst.rgb * (1 - src.a) */
-};
-
-/**
- * Structure used as a header for serialized LLVM programs.
- */
-struct pipe_llvm_program_header {
-  uint32_t num_bytes; /**< Number of bytes in the LLVM bytecode program. */
-};
-
-struct pipe_compute_state {
-  const void *prog;         /**< Compute program to be executed. */
-  unsigned req_local_mem;   /**< Required size of the LOCAL resource. */
-  unsigned req_private_mem; /**< Required size of the PRIVATE resource. */
-  unsigned req_input_mem;   /**< Required size of the INPUT resource. */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_video_enums.h b/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_video_enums.h
deleted file mode 100644
index bd6c0547f..000000000
--- a/app/src/main/cpp/virglrenderer/src/gallium/include/pipe/p_video_enums.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009 Younes Manton.
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-#ifndef PIPE_VIDEO_ENUMS_H
-#define PIPE_VIDEO_ENUMS_H
-
-enum pipe_video_format {
-  PIPE_VIDEO_FORMAT_UNKNOWN = 0,
-  PIPE_VIDEO_FORMAT_MPEG12,   /**< MPEG1, MPEG2 */
-  PIPE_VIDEO_FORMAT_MPEG4,    /**< DIVX, XVID */
-  PIPE_VIDEO_FORMAT_VC1,      /**< WMV */
-  PIPE_VIDEO_FORMAT_MPEG4_AVC /**< H.264 */
-};
-
-enum pipe_video_profile {
-  PIPE_VIDEO_PROFILE_UNKNOWN,
-  PIPE_VIDEO_PROFILE_MPEG1,
-  PIPE_VIDEO_PROFILE_MPEG2_SIMPLE,
-  PIPE_VIDEO_PROFILE_MPEG2_MAIN,
-  PIPE_VIDEO_PROFILE_MPEG4_SIMPLE,
-  PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE,
-  PIPE_VIDEO_PROFILE_VC1_SIMPLE,
-  PIPE_VIDEO_PROFILE_VC1_MAIN,
-  PIPE_VIDEO_PROFILE_VC1_ADVANCED,
-  PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE,
-  PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN,
-  PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH
-};
-
-/* Video caps, can be different for each codec/profile */
-enum pipe_video_cap {
-  PIPE_VIDEO_CAP_SUPPORTED = 0,
-  PIPE_VIDEO_CAP_NPOT_TEXTURES = 1,
-  PIPE_VIDEO_CAP_MAX_WIDTH = 2,
-  PIPE_VIDEO_CAP_MAX_HEIGHT = 3,
-  PIPE_VIDEO_CAP_PREFERED_FORMAT = 4,
-  PIPE_VIDEO_CAP_PREFERS_INTERLACED = 5,
-  PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6,
-  PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7,
-  PIPE_VIDEO_CAP_MAX_LEVEL = 8
-};
-
-enum pipe_video_entrypoint {
-  PIPE_VIDEO_ENTRYPOINT_UNKNOWN,
-  PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
-  PIPE_VIDEO_ENTRYPOINT_IDCT,
-  PIPE_VIDEO_ENTRYPOINT_MC,
-  PIPE_VIDEO_ENTRYPOINT_ENCODE
-};
-
-#endif /* PIPE_VIDEO_ENUMS_H */
diff --git a/app/src/main/cpp/virglrenderer/src/iov.c b/app/src/main/cpp/virglrenderer/src/iov.c
deleted file mode 100644
index ed7c69806..000000000
--- a/app/src/main/cpp/virglrenderer/src/iov.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * this code is taken from Michael - the qemu code is GPLv2 so I don't want
- * to reuse it.
- * I've adapted it to handle offsets and callback
- */
-
-//
-// iovec.c
-//
-// Scatter/gather utility routines
-//
-// Copyright (C) 2002 Michael Ringgaard. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the project nor the names of its contributors
-//    may be used to endorse or promote products derived from this software
-//    without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "vrend_iov.h"
-#include <assert.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-size_t vrend_get_iovec_size(const struct iovec *iov, int iovlen) {
-  size_t size = 0;
-
-  while (iovlen > 0) {
-    size += iov->iov_len;
-    iov++;
-    iovlen--;
-  }
-
-  return size;
-}
-
-size_t vrend_read_from_iovec(const struct iovec *iov, int iovlen, size_t offset,
-                             char *buf, size_t count) {
-  size_t read = 0;
-  size_t len;
-
-  while (count > 0 && iovlen > 0) {
-    if (iov->iov_len > offset) {
-      len = iov->iov_len - offset;
-
-      if (count < len)
-        len = count;
-
-      memcpy(buf, (char *)iov->iov_base + offset, len);
-      read += len;
-
-      buf += len;
-      count -= len;
-      offset = 0;
-    } else {
-      offset -= iov->iov_len;
-    }
-
-    iov++;
-    iovlen--;
-  }
-  assert(offset == 0);
-  return read;
-}
-
-size_t vrend_write_to_iovec(const struct iovec *iov, int iovlen, size_t offset,
-                            const char *buf, size_t count) {
-  size_t written = 0;
-  size_t len;
-
-  while (count > 0 && iovlen > 0) {
-    if (iov->iov_len > offset) {
-      len = iov->iov_len - offset;
-
-      if (count < len)
-        len = count;
-
-      memcpy((char *)iov->iov_base + offset, buf, len);
-      written += len;
-
-      offset = 0;
-      buf += len;
-      count -= len;
-    } else {
-      offset -= iov->iov_len;
-    }
-    iov++;
-    iovlen--;
-  }
-  assert(offset == 0);
-  return written;
-}
-
-size_t vrend_read_from_iovec_cb(const struct iovec *iov, int iovlen,
-                                size_t offset, size_t count, iov_cb iocb,
-                                void *cookie) {
-  size_t read = 0;
-  size_t len;
-
-  while (count > 0 && iovlen > 0) {
-    if (iov->iov_len > offset) {
-      len = iov->iov_len - offset;
-
-      if (count < len)
-        len = count;
-
-      (*iocb)(cookie, read, (char *)iov->iov_base + offset, len);
-      read += len;
-
-      count -= len;
-      offset = 0;
-    } else {
-      offset -= iov->iov_len;
-    }
-    iov++;
-    iovlen--;
-  }
-  assert(offset == 0);
-  return read;
-}
-
-/**
- * Copy data from one iovec to another iovec.
- *
- * TODO: Implement iovec copy without copy to intermediate buffer.
- *
- * \param src_iov    The source iov.
- * \param src_iovlen The number of memory regions in the source iov.
- * \param src_offset The byte offset in the source iov to start reading from.
- * \param dst_iov    The destination iov.
- * \param dst_iovlen The number of memory regions in the destination iov.
- * \param dst_offset The byte offset in the destination iov to start writing to.
- * \param count      The number of bytes to copy
- * \param buf        If not NULL, a pointer to a buffer of at least count size
- *                   to use a temporary storage for the copy operation.
- * \return           -1 on failure, 0 on success
- */
-int vrend_copy_iovec(const struct iovec *src_iov, int src_iovlen,
-                     size_t src_offset, const struct iovec *dst_iov,
-                     int dst_iovlen, size_t dst_offset, size_t count,
-                     char *buf) {
-  int ret = 0;
-  bool needs_free;
-  size_t nread;
-  size_t nwritten;
-
-  if (src_iov == NULL || dst_iov == NULL)
-    return -1;
-
-  if (src_iov == dst_iov && src_offset == dst_offset)
-    return 0;
-
-  if (!buf) {
-    buf = malloc(count);
-    needs_free = true;
-  } else {
-    needs_free = false;
-  }
-
-  if (!buf)
-    return -1;
-
-  nread = vrend_read_from_iovec(src_iov, src_iovlen, src_offset, buf, count);
-  if (nread != count) {
-    ret = -1;
-    goto out;
-  }
-
-  nwritten = vrend_write_to_iovec(dst_iov, dst_iovlen, dst_offset, buf, count);
-  if (nwritten != count) {
-    ret = -1;
-    goto out;
-  }
-
-out:
-  if (needs_free)
-    free(buf);
-
-  return ret;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/virgl_hw.h b/app/src/main/cpp/virglrenderer/src/virgl_hw.h
deleted file mode 100644
index 666e23b6e..000000000
--- a/app/src/main/cpp/virglrenderer/src/virgl_hw.h
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Copyright 2014, 2015 Red Hat.
- *
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 (including the next
- * paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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.
- */
-#ifndef VIRGL_HW_H
-#define VIRGL_HW_H
-
-#include <stdint.h>
-
-/* formats known by the HW device - based on gallium subset */
-enum virgl_formats {
-  VIRGL_FORMAT_NONE = 0,
-  VIRGL_FORMAT_B8G8R8A8_UNORM = 1,
-  VIRGL_FORMAT_B8G8R8X8_UNORM = 2,
-  VIRGL_FORMAT_A8R8G8B8_UNORM = 3,
-  VIRGL_FORMAT_X8R8G8B8_UNORM = 4,
-  VIRGL_FORMAT_B5G5R5A1_UNORM = 5,
-  VIRGL_FORMAT_B4G4R4A4_UNORM = 6,
-  VIRGL_FORMAT_B5G6R5_UNORM = 7,
-  VIRGL_FORMAT_R10G10B10A2_UNORM = 8,
-  VIRGL_FORMAT_L8_UNORM = 9,  /**< ubyte luminance */
-  VIRGL_FORMAT_A8_UNORM = 10, /**< ubyte alpha */
-  VIRGL_FORMAT_I8_UNORM = 11,
-  VIRGL_FORMAT_L8A8_UNORM = 12, /**< ubyte alpha, luminance */
-  VIRGL_FORMAT_L16_UNORM = 13,  /**< ushort luminance */
-  VIRGL_FORMAT_UYVY = 14,
-  VIRGL_FORMAT_YUYV = 15,
-  VIRGL_FORMAT_Z16_UNORM = 16,
-  VIRGL_FORMAT_Z32_UNORM = 17,
-  VIRGL_FORMAT_Z32_FLOAT = 18,
-  VIRGL_FORMAT_Z24_UNORM_S8_UINT = 19,
-  VIRGL_FORMAT_S8_UINT_Z24_UNORM = 20,
-  VIRGL_FORMAT_Z24X8_UNORM = 21,
-  VIRGL_FORMAT_X8Z24_UNORM = 22,
-  VIRGL_FORMAT_S8_UINT = 23, /**< ubyte stencil */
-  VIRGL_FORMAT_R64_FLOAT = 24,
-  VIRGL_FORMAT_R64G64_FLOAT = 25,
-  VIRGL_FORMAT_R64G64B64_FLOAT = 26,
-  VIRGL_FORMAT_R64G64B64A64_FLOAT = 27,
-  VIRGL_FORMAT_R32_FLOAT = 28,
-  VIRGL_FORMAT_R32G32_FLOAT = 29,
-  VIRGL_FORMAT_R32G32B32_FLOAT = 30,
-  VIRGL_FORMAT_R32G32B32A32_FLOAT = 31,
-
-  VIRGL_FORMAT_R32_UNORM = 32,
-  VIRGL_FORMAT_R32G32_UNORM = 33,
-  VIRGL_FORMAT_R32G32B32_UNORM = 34,
-  VIRGL_FORMAT_R32G32B32A32_UNORM = 35,
-  VIRGL_FORMAT_R32_USCALED = 36,
-  VIRGL_FORMAT_R32G32_USCALED = 37,
-  VIRGL_FORMAT_R32G32B32_USCALED = 38,
-  VIRGL_FORMAT_R32G32B32A32_USCALED = 39,
-  VIRGL_FORMAT_R32_SNORM = 40,
-  VIRGL_FORMAT_R32G32_SNORM = 41,
-  VIRGL_FORMAT_R32G32B32_SNORM = 42,
-  VIRGL_FORMAT_R32G32B32A32_SNORM = 43,
-  VIRGL_FORMAT_R32_SSCALED = 44,
-  VIRGL_FORMAT_R32G32_SSCALED = 45,
-  VIRGL_FORMAT_R32G32B32_SSCALED = 46,
-  VIRGL_FORMAT_R32G32B32A32_SSCALED = 47,
-
-  VIRGL_FORMAT_R16_UNORM = 48,
-  VIRGL_FORMAT_R16G16_UNORM = 49,
-  VIRGL_FORMAT_R16G16B16_UNORM = 50,
-  VIRGL_FORMAT_R16G16B16A16_UNORM = 51,
-
-  VIRGL_FORMAT_R16_USCALED = 52,
-  VIRGL_FORMAT_R16G16_USCALED = 53,
-  VIRGL_FORMAT_R16G16B16_USCALED = 54,
-  VIRGL_FORMAT_R16G16B16A16_USCALED = 55,
-
-  VIRGL_FORMAT_R16_SNORM = 56,
-  VIRGL_FORMAT_R16G16_SNORM = 57,
-  VIRGL_FORMAT_R16G16B16_SNORM = 58,
-  VIRGL_FORMAT_R16G16B16A16_SNORM = 59,
-
-  VIRGL_FORMAT_R16_SSCALED = 60,
-  VIRGL_FORMAT_R16G16_SSCALED = 61,
-  VIRGL_FORMAT_R16G16B16_SSCALED = 62,
-  VIRGL_FORMAT_R16G16B16A16_SSCALED = 63,
-
-  VIRGL_FORMAT_R8_UNORM = 64,
-  VIRGL_FORMAT_R8G8_UNORM = 65,
-  VIRGL_FORMAT_R8G8B8_UNORM = 66,
-  VIRGL_FORMAT_R8G8B8A8_UNORM = 67,
-  VIRGL_FORMAT_X8B8G8R8_UNORM = 68,
-
-  VIRGL_FORMAT_R8_USCALED = 69,
-  VIRGL_FORMAT_R8G8_USCALED = 70,
-  VIRGL_FORMAT_R8G8B8_USCALED = 71,
-  VIRGL_FORMAT_R8G8B8A8_USCALED = 72,
-
-  VIRGL_FORMAT_R8_SNORM = 74,
-  VIRGL_FORMAT_R8G8_SNORM = 75,
-  VIRGL_FORMAT_R8G8B8_SNORM = 76,
-  VIRGL_FORMAT_R8G8B8A8_SNORM = 77,
-
-  VIRGL_FORMAT_R8_SSCALED = 82,
-  VIRGL_FORMAT_R8G8_SSCALED = 83,
-  VIRGL_FORMAT_R8G8B8_SSCALED = 84,
-  VIRGL_FORMAT_R8G8B8A8_SSCALED = 85,
-
-  VIRGL_FORMAT_R32_FIXED = 87,
-  VIRGL_FORMAT_R32G32_FIXED = 88,
-  VIRGL_FORMAT_R32G32B32_FIXED = 89,
-  VIRGL_FORMAT_R32G32B32A32_FIXED = 90,
-
-  VIRGL_FORMAT_R16_FLOAT = 91,
-  VIRGL_FORMAT_R16G16_FLOAT = 92,
-  VIRGL_FORMAT_R16G16B16_FLOAT = 93,
-  VIRGL_FORMAT_R16G16B16A16_FLOAT = 94,
-
-  VIRGL_FORMAT_L8_SRGB = 95,
-  VIRGL_FORMAT_L8A8_SRGB = 96,
-  VIRGL_FORMAT_R8G8B8_SRGB = 97,
-  VIRGL_FORMAT_A8B8G8R8_SRGB = 98,
-  VIRGL_FORMAT_X8B8G8R8_SRGB = 99,
-  VIRGL_FORMAT_B8G8R8A8_SRGB = 100,
-  VIRGL_FORMAT_B8G8R8X8_SRGB = 101,
-  VIRGL_FORMAT_A8R8G8B8_SRGB = 102,
-  VIRGL_FORMAT_X8R8G8B8_SRGB = 103,
-  VIRGL_FORMAT_R8G8B8A8_SRGB = 104,
-
-  /* compressed formats */
-  VIRGL_FORMAT_DXT1_RGB = 105,
-  VIRGL_FORMAT_DXT1_RGBA = 106,
-  VIRGL_FORMAT_DXT3_RGBA = 107,
-  VIRGL_FORMAT_DXT5_RGBA = 108,
-
-  /* sRGB, compressed */
-  VIRGL_FORMAT_DXT1_SRGB = 109,
-  VIRGL_FORMAT_DXT1_SRGBA = 110,
-  VIRGL_FORMAT_DXT3_SRGBA = 111,
-  VIRGL_FORMAT_DXT5_SRGBA = 112,
-
-  /* rgtc compressed */
-  VIRGL_FORMAT_RGTC1_UNORM = 113,
-  VIRGL_FORMAT_RGTC1_SNORM = 114,
-  VIRGL_FORMAT_RGTC2_UNORM = 115,
-  VIRGL_FORMAT_RGTC2_SNORM = 116,
-
-  VIRGL_FORMAT_R8G8_B8G8_UNORM = 117,
-  VIRGL_FORMAT_G8R8_G8B8_UNORM = 118,
-
-  VIRGL_FORMAT_R8SG8SB8UX8U_NORM = 119,
-  VIRGL_FORMAT_R5SG5SB6U_NORM = 120,
-
-  VIRGL_FORMAT_A8B8G8R8_UNORM = 121,
-  VIRGL_FORMAT_B5G5R5X1_UNORM = 122,
-  VIRGL_FORMAT_R10G10B10A2_USCALED = 123,
-  VIRGL_FORMAT_R11G11B10_FLOAT = 124,
-  VIRGL_FORMAT_R9G9B9E5_FLOAT = 125,
-  VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT = 126,
-  VIRGL_FORMAT_R1_UNORM = 127,
-  VIRGL_FORMAT_R10G10B10X2_USCALED = 128,
-  VIRGL_FORMAT_R10G10B10X2_SNORM = 129,
-
-  VIRGL_FORMAT_L4A4_UNORM = 130,
-  VIRGL_FORMAT_B10G10R10A2_UNORM = 131,
-  VIRGL_FORMAT_R10SG10SB10SA2U_NORM = 132,
-  VIRGL_FORMAT_R8G8Bx_SNORM = 133,
-  VIRGL_FORMAT_R8G8B8X8_UNORM = 134,
-  VIRGL_FORMAT_B4G4R4X4_UNORM = 135,
-  VIRGL_FORMAT_X24S8_UINT = 136,
-  VIRGL_FORMAT_S8X24_UINT = 137,
-  VIRGL_FORMAT_X32_S8X24_UINT = 138,
-  VIRGL_FORMAT_B2G3R3_UNORM = 139,
-
-  VIRGL_FORMAT_L16A16_UNORM = 140,
-  VIRGL_FORMAT_A16_UNORM = 141,
-  VIRGL_FORMAT_I16_UNORM = 142,
-
-  VIRGL_FORMAT_LATC1_UNORM = 143,
-  VIRGL_FORMAT_LATC1_SNORM = 144,
-  VIRGL_FORMAT_LATC2_UNORM = 145,
-  VIRGL_FORMAT_LATC2_SNORM = 146,
-
-  VIRGL_FORMAT_A8_SNORM = 147,
-  VIRGL_FORMAT_L8_SNORM = 148,
-  VIRGL_FORMAT_L8A8_SNORM = 149,
-  VIRGL_FORMAT_I8_SNORM = 150,
-  VIRGL_FORMAT_A16_SNORM = 151,
-  VIRGL_FORMAT_L16_SNORM = 152,
-  VIRGL_FORMAT_L16A16_SNORM = 153,
-  VIRGL_FORMAT_I16_SNORM = 154,
-
-  VIRGL_FORMAT_A16_FLOAT = 155,
-  VIRGL_FORMAT_L16_FLOAT = 156,
-  VIRGL_FORMAT_L16A16_FLOAT = 157,
-  VIRGL_FORMAT_I16_FLOAT = 158,
-  VIRGL_FORMAT_A32_FLOAT = 159,
-  VIRGL_FORMAT_L32_FLOAT = 160,
-  VIRGL_FORMAT_L32A32_FLOAT = 161,
-  VIRGL_FORMAT_I32_FLOAT = 162,
-
-  VIRGL_FORMAT_YV12 = 163,
-  VIRGL_FORMAT_YV16 = 164,
-  VIRGL_FORMAT_IYUV = 165, /**< aka I420 */
-  VIRGL_FORMAT_NV12 = 166,
-  VIRGL_FORMAT_NV21 = 167,
-
-  VIRGL_FORMAT_A4R4_UNORM = 168,
-  VIRGL_FORMAT_R4A4_UNORM = 169,
-  VIRGL_FORMAT_R8A8_UNORM = 170,
-  VIRGL_FORMAT_A8R8_UNORM = 171,
-
-  VIRGL_FORMAT_R10G10B10A2_SSCALED = 172,
-  VIRGL_FORMAT_R10G10B10A2_SNORM = 173,
-  VIRGL_FORMAT_B10G10R10A2_USCALED = 174,
-  VIRGL_FORMAT_B10G10R10A2_SSCALED = 175,
-  VIRGL_FORMAT_B10G10R10A2_SNORM = 176,
-
-  VIRGL_FORMAT_R8_UINT = 177,
-  VIRGL_FORMAT_R8G8_UINT = 178,
-  VIRGL_FORMAT_R8G8B8_UINT = 179,
-  VIRGL_FORMAT_R8G8B8A8_UINT = 180,
-
-  VIRGL_FORMAT_R8_SINT = 181,
-  VIRGL_FORMAT_R8G8_SINT = 182,
-  VIRGL_FORMAT_R8G8B8_SINT = 183,
-  VIRGL_FORMAT_R8G8B8A8_SINT = 184,
-
-  VIRGL_FORMAT_R16_UINT = 185,
-  VIRGL_FORMAT_R16G16_UINT = 186,
-  VIRGL_FORMAT_R16G16B16_UINT = 187,
-  VIRGL_FORMAT_R16G16B16A16_UINT = 188,
-
-  VIRGL_FORMAT_R16_SINT = 189,
-  VIRGL_FORMAT_R16G16_SINT = 190,
-  VIRGL_FORMAT_R16G16B16_SINT = 191,
-  VIRGL_FORMAT_R16G16B16A16_SINT = 192,
-  VIRGL_FORMAT_R32_UINT = 193,
-  VIRGL_FORMAT_R32G32_UINT = 194,
-  VIRGL_FORMAT_R32G32B32_UINT = 195,
-  VIRGL_FORMAT_R32G32B32A32_UINT = 196,
-
-  VIRGL_FORMAT_R32_SINT = 197,
-  VIRGL_FORMAT_R32G32_SINT = 198,
-  VIRGL_FORMAT_R32G32B32_SINT = 199,
-  VIRGL_FORMAT_R32G32B32A32_SINT = 200,
-
-  VIRGL_FORMAT_A8_UINT = 201,
-  VIRGL_FORMAT_I8_UINT = 202,
-  VIRGL_FORMAT_L8_UINT = 203,
-  VIRGL_FORMAT_L8A8_UINT = 204,
-
-  VIRGL_FORMAT_A8_SINT = 205,
-  VIRGL_FORMAT_I8_SINT = 206,
-  VIRGL_FORMAT_L8_SINT = 207,
-  VIRGL_FORMAT_L8A8_SINT = 208,
-
-  VIRGL_FORMAT_A16_UINT = 209,
-  VIRGL_FORMAT_I16_UINT = 210,
-  VIRGL_FORMAT_L16_UINT = 211,
-  VIRGL_FORMAT_L16A16_UINT = 212,
-
-  VIRGL_FORMAT_A16_SINT = 213,
-  VIRGL_FORMAT_I16_SINT = 214,
-  VIRGL_FORMAT_L16_SINT = 215,
-  VIRGL_FORMAT_L16A16_SINT = 216,
-
-  VIRGL_FORMAT_A32_UINT = 217,
-  VIRGL_FORMAT_I32_UINT = 218,
-  VIRGL_FORMAT_L32_UINT = 219,
-  VIRGL_FORMAT_L32A32_UINT = 220,
-
-  VIRGL_FORMAT_A32_SINT = 221,
-  VIRGL_FORMAT_I32_SINT = 222,
-  VIRGL_FORMAT_L32_SINT = 223,
-  VIRGL_FORMAT_L32A32_SINT = 224,
-
-  VIRGL_FORMAT_B10G10R10A2_UINT = 225,
-  VIRGL_FORMAT_ETC1_RGB8 = 226,
-  VIRGL_FORMAT_R8G8_R8B8_UNORM = 227,
-  VIRGL_FORMAT_G8R8_B8R8_UNORM = 228,
-  VIRGL_FORMAT_R8G8B8X8_SNORM = 229,
-
-  VIRGL_FORMAT_R8G8B8X8_SRGB = 230,
-
-  VIRGL_FORMAT_R8G8B8X8_UINT = 231,
-  VIRGL_FORMAT_R8G8B8X8_SINT = 232,
-  VIRGL_FORMAT_B10G10R10X2_UNORM = 233,
-  VIRGL_FORMAT_R16G16B16X16_UNORM = 234,
-  VIRGL_FORMAT_R16G16B16X16_SNORM = 235,
-  VIRGL_FORMAT_R16G16B16X16_FLOAT = 236,
-  VIRGL_FORMAT_R16G16B16X16_UINT = 237,
-  VIRGL_FORMAT_R16G16B16X16_SINT = 238,
-  VIRGL_FORMAT_R32G32B32X32_FLOAT = 239,
-  VIRGL_FORMAT_R32G32B32X32_UINT = 240,
-  VIRGL_FORMAT_R32G32B32X32_SINT = 241,
-  VIRGL_FORMAT_R8A8_SNORM = 242,
-  VIRGL_FORMAT_R16A16_UNORM = 243,
-  VIRGL_FORMAT_R16A16_SNORM = 244,
-  VIRGL_FORMAT_R16A16_FLOAT = 245,
-  VIRGL_FORMAT_R32A32_FLOAT = 246,
-  VIRGL_FORMAT_R8A8_UINT = 247,
-  VIRGL_FORMAT_R8A8_SINT = 248,
-  VIRGL_FORMAT_R16A16_UINT = 249,
-  VIRGL_FORMAT_R16A16_SINT = 250,
-  VIRGL_FORMAT_R32A32_UINT = 251,
-  VIRGL_FORMAT_R32A32_SINT = 252,
-
-  VIRGL_FORMAT_R10G10B10A2_UINT = 253,
-  VIRGL_FORMAT_B5G6R5_SRGB = 254,
-
-  VIRGL_FORMAT_BPTC_RGBA_UNORM = 255,
-  VIRGL_FORMAT_BPTC_SRGBA = 256,
-  VIRGL_FORMAT_BPTC_RGB_FLOAT = 257,
-  VIRGL_FORMAT_BPTC_RGB_UFLOAT = 258,
-
-  VIRGL_FORMAT_A16L16_UNORM = 262,
-
-  VIRGL_FORMAT_G8R8_UNORM = 263,
-  VIRGL_FORMAT_G8R8_SNORM = 264,
-  VIRGL_FORMAT_G16R16_UNORM = 265,
-  VIRGL_FORMAT_G16R16_SNORM = 266,
-  VIRGL_FORMAT_A8B8G8R8_SNORM = 267,
-
-  VIRGL_FORMAT_A8L8_UNORM = 259,
-  VIRGL_FORMAT_A8L8_SNORM = 260,
-  VIRGL_FORMAT_A8L8_SRGB = 261,
-
-  VIRGL_FORMAT_X8B8G8R8_SNORM = 268,
-
-  VIRGL_FORMAT_R10G10B10X2_UNORM = 308,
-  VIRGL_FORMAT_A4B4G4R4_UNORM = 311,
-
-  VIRGL_FORMAT_R8_SRGB = 312,
-  VIRGL_FORMAT_MAX /* = PIPE_FORMAT_COUNT */,
-
-  /* Below formats must not be used in the guest. */
-  VIRGL_FORMAT_B8G8R8X8_UNORM_EMULATED,
-  VIRGL_FORMAT_B8G8R8A8_UNORM_EMULATED,
-  VIRGL_FORMAT_MAX_EXTENDED
-};
-
-/* These are used by the capability_bits field in virgl_caps_v2. */
-#define VIRGL_CAP_NONE 0
-#define VIRGL_CAP_TGSI_INVARIANT (1 << 0)
-#define VIRGL_CAP_TEXTURE_VIEW (1 << 1)
-#define VIRGL_CAP_SET_MIN_SAMPLES (1 << 2)
-#define VIRGL_CAP_COPY_IMAGE (1 << 3)
-#define VIRGL_CAP_TGSI_PRECISE (1 << 4)
-#define VIRGL_CAP_TXQS (1 << 5)
-#define VIRGL_CAP_MEMORY_BARRIER (1 << 6)
-#define VIRGL_CAP_COMPUTE_SHADER (1 << 7)
-#define VIRGL_CAP_FB_NO_ATTACH (1 << 8)
-#define VIRGL_CAP_ROBUST_BUFFER_ACCESS (1 << 9)
-#define VIRGL_CAP_TGSI_FBFETCH (1 << 10)
-#define VIRGL_CAP_SHADER_CLOCK (1 << 11)
-#define VIRGL_CAP_TEXTURE_BARRIER (1 << 12)
-#define VIRGL_CAP_TGSI_COMPONENTS (1 << 13)
-#define VIRGL_CAP_GUEST_MAY_INIT_LOG (1 << 14)
-#define VIRGL_CAP_SRGB_WRITE_CONTROL (1 << 15)
-#define VIRGL_CAP_QBO (1 << 16)
-#define VIRGL_CAP_TRANSFER (1 << 17)
-#define VIRGL_CAP_FBO_MIXED_COLOR_FORMATS (1 << 18)
-#define VIRGL_CAP_FAKE_FP64 (1 << 19)
-#define VIRGL_CAP_BIND_COMMAND_ARGS (1 << 20)
-#define VIRGL_CAP_MULTI_DRAW_INDIRECT (1 << 21)
-#define VIRGL_CAP_INDIRECT_PARAMS (1 << 22)
-#define VIRGL_CAP_TRANSFORM_FEEDBACK3 (1 << 23)
-#define VIRGL_CAP_3D_ASTC (1 << 24)
-#define VIRGL_CAP_INDIRECT_INPUT_ADDR (1 << 25)
-#define VIRGL_CAP_COPY_TRANSFER (1 << 26)
-#define VIRGL_CAP_CLIP_HALFZ (1 << 27)
-#define VIRGL_CAP_APP_TWEAK_SUPPORT (1 << 28)
-#define VIRGL_CAP_BGRA_SRGB_IS_EMULATED (1 << 29)
-
-/* virgl bind flags - these are compatible with mesa 10.5 gallium.
- * but are fixed, no other should be passed to virgl either.
- */
-#define VIRGL_BIND_DEPTH_STENCIL (1 << 0)
-#define VIRGL_BIND_RENDER_TARGET (1 << 1)
-#define VIRGL_BIND_SAMPLER_VIEW (1 << 3)
-#define VIRGL_BIND_VERTEX_BUFFER (1 << 4)
-#define VIRGL_BIND_INDEX_BUFFER (1 << 5)
-#define VIRGL_BIND_CONSTANT_BUFFER (1 << 6)
-#define VIRGL_BIND_DISPLAY_TARGET (1 << 7)
-#define VIRGL_BIND_COMMAND_ARGS (1 << 8)
-#define VIRGL_BIND_STREAM_OUTPUT (1 << 11)
-#define VIRGL_BIND_SHADER_BUFFER (1 << 14)
-#define VIRGL_BIND_QUERY_BUFFER (1 << 15)
-#define VIRGL_BIND_CURSOR (1 << 16)
-#define VIRGL_BIND_CUSTOM (1 << 17)
-#define VIRGL_BIND_SCANOUT (1 << 18)
-/* Used for buffers that are backed by guest storage and
- * are only read by the host.
- */
-#define VIRGL_BIND_STAGING (1 << 19)
-#define VIRGL_BIND_SHARED (1 << 20)
-
-#define VIRGL_BIND_PREFER_EMULATED_BGRA (1 << 21)
-
-#define VIRGL_BIND_LINEAR (1 << 22)
-
-struct virgl_caps_bool_set1 {
-  unsigned indep_blend_enable : 1;
-  unsigned indep_blend_func : 1;
-  unsigned cube_map_array : 1;
-  unsigned shader_stencil_export : 1;
-  unsigned conditional_render : 1;
-  unsigned start_instance : 1;
-  unsigned primitive_restart : 1;
-  unsigned blend_eq_sep : 1;
-  unsigned instanceid : 1;
-  unsigned vertex_element_instance_divisor : 1;
-  unsigned seamless_cube_map : 1;
-  unsigned occlusion_query : 1;
-  unsigned timer_query : 1;
-  unsigned streamout_pause_resume : 1;
-  unsigned texture_multisample : 1;
-  unsigned fragment_coord_conventions : 1;
-  unsigned depth_clip_disable : 1;
-  unsigned seamless_cube_map_per_texture : 1;
-  unsigned ubo : 1;
-  unsigned color_clamping : 1; /* not in GL 3.1 core profile */
-  unsigned poly_stipple : 1;   /* not in GL 3.1 core profile */
-  unsigned mirror_clamp : 1;
-  unsigned texture_query_lod : 1;
-  unsigned has_fp64 : 1;
-  unsigned has_tessellation_shaders : 1;
-  unsigned has_indirect_draw : 1;
-  unsigned has_sample_shading : 1;
-  unsigned has_cull : 1;
-  unsigned conditional_render_inverted : 1;
-  unsigned derivative_control : 1;
-  unsigned polygon_offset_clamp : 1;
-  unsigned transform_feedback_overflow_query : 1;
-  /* DO NOT ADD ANYMORE MEMBERS - need to add another 32-bit to v2 caps */
-};
-
-/* endless expansion capabilites - current gallium has 252 formats */
-struct virgl_supported_format_mask {
-  uint32_t bitmask[16];
-};
-/* capabilities set 2 - version 1 - 32-bit and float values */
-struct virgl_caps_v1 {
-  uint32_t max_version;
-  struct virgl_supported_format_mask sampler;
-  struct virgl_supported_format_mask render;
-  struct virgl_supported_format_mask depthstencil;
-  struct virgl_supported_format_mask vertexbuffer;
-  struct virgl_caps_bool_set1 bset;
-  uint32_t glsl_level;
-  uint32_t max_texture_array_layers;
-  uint32_t max_streamout_buffers;
-  uint32_t max_dual_source_render_targets;
-  uint32_t max_render_targets;
-  uint32_t max_samples;
-  uint32_t prim_mask;
-  uint32_t max_tbo_size;
-  uint32_t max_uniform_blocks;
-  uint32_t max_viewports;
-  uint32_t max_texture_gather_components;
-};
-
-/*
- * This struct should be growable when used in capset 2,
- * so we shouldn't have to add a v3 ever.
- */
-struct virgl_caps_v2 {
-  struct virgl_caps_v1 v1;
-  float min_aliased_point_size;
-  float max_aliased_point_size;
-  float min_smooth_point_size;
-  float max_smooth_point_size;
-  float min_aliased_line_width;
-  float max_aliased_line_width;
-  float min_smooth_line_width;
-  float max_smooth_line_width;
-  float max_texture_lod_bias;
-  uint32_t max_geom_output_vertices;
-  uint32_t max_geom_total_output_components;
-  uint32_t max_vertex_outputs;
-  uint32_t max_vertex_attribs;
-  uint32_t max_shader_patch_varyings;
-  int32_t min_texel_offset;
-  int32_t max_texel_offset;
-  int32_t min_texture_gather_offset;
-  int32_t max_texture_gather_offset;
-  uint32_t texture_buffer_offset_alignment;
-  uint32_t uniform_buffer_offset_alignment;
-  uint32_t shader_buffer_offset_alignment;
-  uint32_t capability_bits;
-  uint32_t sample_locations[8];
-  uint32_t max_vertex_attrib_stride;
-  uint32_t max_shader_buffer_frag_compute;
-  uint32_t max_shader_buffer_other_stages;
-  uint32_t max_shader_image_frag_compute;
-  uint32_t max_shader_image_other_stages;
-  uint32_t max_image_samples;
-  uint32_t max_compute_work_group_invocations;
-  uint32_t max_compute_shared_memory_size;
-  uint32_t max_compute_grid_size[3];
-  uint32_t max_compute_block_size[3];
-  uint32_t max_texture_2d_size;
-  uint32_t max_texture_3d_size;
-  uint32_t max_texture_cube_size;
-  uint32_t max_combined_shader_buffers;
-  uint32_t max_atomic_counters[6];
-  uint32_t max_atomic_counter_buffers[6];
-  uint32_t max_combined_atomic_counters;
-  uint32_t max_combined_atomic_counter_buffers;
-  uint32_t host_feature_check_version;
-  struct virgl_supported_format_mask supported_readback_formats;
-  struct virgl_supported_format_mask scanout;
-};
-
-union virgl_caps {
-  uint32_t max_version;
-  struct virgl_caps_v1 v1;
-  struct virgl_caps_v2 v2;
-};
-
-#define VIRGL_RESOURCE_Y_0_TOP (1 << 0)
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/virgl_protocol.h b/app/src/main/cpp/virglrenderer/src/virgl_protocol.h
deleted file mode 100644
index 8df35d491..000000000
--- a/app/src/main/cpp/virglrenderer/src/virgl_protocol.h
+++ /dev/null
@@ -1,606 +0,0 @@
-/*
- * Copyright 2014, 2015 Red Hat.
- *
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 (including the next
- * paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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.
- */
-#ifndef VIRGL_PROTOCOL_H
-#define VIRGL_PROTOCOL_H
-
-#include <stdint.h>
-
-#define VIRGL_QUERY_STATE_NEW 0
-#define VIRGL_QUERY_STATE_DONE 1
-#define VIRGL_QUERY_STATE_WAIT_HOST 2
-
-#include <stdint.h>
-
-struct virgl_host_query_state {
-  uint32_t query_state;
-  uint32_t result_size;
-  uint64_t result;
-};
-
-enum virgl_object_type {
-  VIRGL_OBJECT_NULL,
-  VIRGL_OBJECT_BLEND,
-  VIRGL_OBJECT_RASTERIZER,
-  VIRGL_OBJECT_DSA,
-  VIRGL_OBJECT_SHADER,
-  VIRGL_OBJECT_VERTEX_ELEMENTS,
-  VIRGL_OBJECT_SAMPLER_VIEW,
-  VIRGL_OBJECT_SAMPLER_STATE,
-  VIRGL_OBJECT_SURFACE,
-  VIRGL_OBJECT_QUERY,
-  VIRGL_OBJECT_STREAMOUT_TARGET,
-  VIRGL_MAX_OBJECTS,
-};
-
-/* context cmds to be encoded in the command stream */
-enum virgl_context_cmd {
-  VIRGL_CCMD_NOP = 0,
-  VIRGL_CCMD_CREATE_OBJECT = 1,
-  VIRGL_CCMD_BIND_OBJECT,
-  VIRGL_CCMD_DESTROY_OBJECT,
-  VIRGL_CCMD_SET_VIEWPORT_STATE,
-  VIRGL_CCMD_SET_FRAMEBUFFER_STATE,
-  VIRGL_CCMD_SET_VERTEX_BUFFERS,
-  VIRGL_CCMD_CLEAR,
-  VIRGL_CCMD_DRAW_VBO,
-  VIRGL_CCMD_RESOURCE_INLINE_WRITE,
-  VIRGL_CCMD_SET_SAMPLER_VIEWS,
-  VIRGL_CCMD_SET_INDEX_BUFFER,
-  VIRGL_CCMD_SET_CONSTANT_BUFFER,
-  VIRGL_CCMD_SET_STENCIL_REF,
-  VIRGL_CCMD_SET_BLEND_COLOR,
-  VIRGL_CCMD_SET_SCISSOR_STATE,
-  VIRGL_CCMD_BLIT,
-  VIRGL_CCMD_RESOURCE_COPY_REGION,
-  VIRGL_CCMD_BIND_SAMPLER_STATES,
-  VIRGL_CCMD_BEGIN_QUERY,
-  VIRGL_CCMD_END_QUERY,
-  VIRGL_CCMD_GET_QUERY_RESULT,
-  VIRGL_CCMD_SET_POLYGON_STIPPLE,
-  VIRGL_CCMD_SET_CLIP_STATE,
-  VIRGL_CCMD_SET_SAMPLE_MASK,
-  VIRGL_CCMD_SET_STREAMOUT_TARGETS,
-  VIRGL_CCMD_SET_RENDER_CONDITION,
-  VIRGL_CCMD_SET_UNIFORM_BUFFER,
-
-  VIRGL_CCMD_SET_SUB_CTX,
-  VIRGL_CCMD_CREATE_SUB_CTX,
-  VIRGL_CCMD_DESTROY_SUB_CTX,
-  VIRGL_CCMD_BIND_SHADER,
-  VIRGL_CCMD_SET_TESS_STATE,
-  VIRGL_CCMD_SET_MIN_SAMPLES,
-  VIRGL_CCMD_SET_SHADER_BUFFERS,
-  VIRGL_CCMD_SET_SHADER_IMAGES,
-  VIRGL_CCMD_MEMORY_BARRIER,
-  VIRGL_CCMD_LAUNCH_GRID,
-  VIRGL_CCMD_SET_FRAMEBUFFER_STATE_NO_ATTACH,
-  VIRGL_CCMD_TEXTURE_BARRIER,
-  VIRGL_CCMD_SET_ATOMIC_BUFFERS,
-  VIRGL_CCMD_SET_DEBUG_FLAGS,
-  VIRGL_CCMD_GET_QUERY_RESULT_QBO,
-  VIRGL_CCMD_TRANSFER3D,
-  VIRGL_CCMD_END_TRANSFERS,
-  VIRGL_CCMD_COPY_TRANSFER3D,
-  VIRGL_CCMD_SET_TWEAKS,
-  VIRGL_MAX_COMMANDS
-};
-
-/*
- 8-bit cmd headers
- 8-bit object type
- 16-bit length
-*/
-
-#define VIRGL_CMD0(cmd, obj, len) ((cmd) | ((obj) << 8) | ((len) << 16))
-
-/* hw specification */
-#define VIRGL_MAX_COLOR_BUFS 8
-#define VIRGL_MAX_CLIP_PLANES 8
-
-#define VIRGL_OBJ_CREATE_HEADER 0
-#define VIRGL_OBJ_CREATE_HANDLE 1
-
-#define VIRGL_OBJ_BIND_HEADER 0
-#define VIRGL_OBJ_BIND_HANDLE 1
-
-#define VIRGL_OBJ_DESTROY_HANDLE 1
-
-/* some of these defines are a specification - not used in the code */
-/* bit offsets for blend state object */
-#define VIRGL_OBJ_BLEND_SIZE (VIRGL_MAX_COLOR_BUFS + 3)
-#define VIRGL_OBJ_BLEND_HANDLE 1
-#define VIRGL_OBJ_BLEND_S0 2
-#define VIRGL_OBJ_BLEND_S0_INDEPENDENT_BLEND_ENABLE(x) ((x) & 0x1 << 0)
-#define VIRGL_OBJ_BLEND_S0_LOGICOP_ENABLE(x) (((x) & 0x1) << 1)
-#define VIRGL_OBJ_BLEND_S0_DITHER(x) (((x) & 0x1) << 2)
-#define VIRGL_OBJ_BLEND_S0_ALPHA_TO_COVERAGE(x) (((x) & 0x1) << 3)
-#define VIRGL_OBJ_BLEND_S0_ALPHA_TO_ONE(x) (((x) & 0x1) << 4)
-#define VIRGL_OBJ_BLEND_S1 3
-#define VIRGL_OBJ_BLEND_S1_LOGICOP_FUNC(x) (((x) & 0xf) << 0)
-/* repeated once per number of cbufs */
-
-#define VIRGL_OBJ_BLEND_S2(cbuf) (4 + (cbuf))
-#define VIRGL_OBJ_BLEND_S2_RT_BLEND_ENABLE(x) (((x) & 0x1) << 0)
-#define VIRGL_OBJ_BLEND_S2_RT_RGB_FUNC(x) (((x) & 0x7) << 1)
-#define VIRGL_OBJ_BLEND_S2_RT_RGB_SRC_FACTOR(x) (((x) & 0x1f) << 4)
-#define VIRGL_OBJ_BLEND_S2_RT_RGB_DST_FACTOR(x) (((x) & 0x1f) << 9)
-#define VIRGL_OBJ_BLEND_S2_RT_ALPHA_FUNC(x) (((x) & 0x7) << 14)
-#define VIRGL_OBJ_BLEND_S2_RT_ALPHA_SRC_FACTOR(x) (((x) & 0x1f) << 17)
-#define VIRGL_OBJ_BLEND_S2_RT_ALPHA_DST_FACTOR(x) (((x) & 0x1f) << 22)
-#define VIRGL_OBJ_BLEND_S2_RT_COLORMASK(x) (((x) & 0xf) << 27)
-
-/* bit offsets for DSA state */
-#define VIRGL_OBJ_DSA_SIZE 5
-#define VIRGL_OBJ_DSA_HANDLE 1
-#define VIRGL_OBJ_DSA_S0 2
-#define VIRGL_OBJ_DSA_S0_DEPTH_ENABLE(x) (((x) & 0x1) << 0)
-#define VIRGL_OBJ_DSA_S0_DEPTH_WRITEMASK(x) (((x) & 0x1) << 1)
-#define VIRGL_OBJ_DSA_S0_DEPTH_FUNC(x) (((x) & 0x7) << 2)
-#define VIRGL_OBJ_DSA_S0_ALPHA_ENABLED(x) (((x) & 0x1) << 8)
-#define VIRGL_OBJ_DSA_S0_ALPHA_FUNC(x) (((x) & 0x7) << 9)
-#define VIRGL_OBJ_DSA_S1 3
-#define VIRGL_OBJ_DSA_S2 4
-#define VIRGL_OBJ_DSA_S1_STENCIL_ENABLED(x) (((x) & 0x1) << 0)
-#define VIRGL_OBJ_DSA_S1_STENCIL_FUNC(x) (((x) & 0x7) << 1)
-#define VIRGL_OBJ_DSA_S1_STENCIL_FAIL_OP(x) (((x) & 0x7) << 4)
-#define VIRGL_OBJ_DSA_S1_STENCIL_ZPASS_OP(x) (((x) & 0x7) << 7)
-#define VIRGL_OBJ_DSA_S1_STENCIL_ZFAIL_OP(x) (((x) & 0x7) << 10)
-#define VIRGL_OBJ_DSA_S1_STENCIL_VALUEMASK(x) (((x) & 0xff) << 13)
-#define VIRGL_OBJ_DSA_S1_STENCIL_WRITEMASK(x) (((x) & 0xff) << 21)
-#define VIRGL_OBJ_DSA_ALPHA_REF 5
-
-/* offsets for rasterizer state */
-#define VIRGL_OBJ_RS_SIZE 9
-#define VIRGL_OBJ_RS_HANDLE 1
-#define VIRGL_OBJ_RS_S0 2
-#define VIRGL_OBJ_RS_S0_FLATSHADE(x) (((x) & 0x1) << 0)
-#define VIRGL_OBJ_RS_S0_DEPTH_CLIP(x) (((x) & 0x1) << 1)
-#define VIRGL_OBJ_RS_S0_CLIP_HALFZ(x) (((x) & 0x1) << 2)
-#define VIRGL_OBJ_RS_S0_RASTERIZER_DISCARD(x) (((x) & 0x1) << 3)
-#define VIRGL_OBJ_RS_S0_FLATSHADE_FIRST(x) (((x) & 0x1) << 4)
-#define VIRGL_OBJ_RS_S0_LIGHT_TWOSIZE(x) (((x) & 0x1) << 5)
-#define VIRGL_OBJ_RS_S0_SPRITE_COORD_MODE(x) (((x) & 0x1) << 6)
-#define VIRGL_OBJ_RS_S0_POINT_QUAD_RASTERIZATION(x) (((x) & 0x1) << 7)
-#define VIRGL_OBJ_RS_S0_CULL_FACE(x) (((x) & 0x3) << 8)
-#define VIRGL_OBJ_RS_S0_FILL_FRONT(x) (((x) & 0x3) << 10)
-#define VIRGL_OBJ_RS_S0_FILL_BACK(x) (((x) & 0x3) << 12)
-#define VIRGL_OBJ_RS_S0_SCISSOR(x) (((x) & 0x1) << 14)
-#define VIRGL_OBJ_RS_S0_FRONT_CCW(x) (((x) & 0x1) << 15)
-#define VIRGL_OBJ_RS_S0_CLAMP_VERTEX_COLOR(x) (((x) & 0x1) << 16)
-#define VIRGL_OBJ_RS_S0_CLAMP_FRAGMENT_COLOR(x) (((x) & 0x1) << 17)
-#define VIRGL_OBJ_RS_S0_OFFSET_LINE(x) (((x) & 0x1) << 18)
-#define VIRGL_OBJ_RS_S0_OFFSET_POINT(x) (((x) & 0x1) << 19)
-#define VIRGL_OBJ_RS_S0_OFFSET_TRI(x) (((x) & 0x1) << 20)
-#define VIRGL_OBJ_RS_S0_POLY_SMOOTH(x) (((x) & 0x1) << 21)
-#define VIRGL_OBJ_RS_S0_POLY_STIPPLE_ENABLE(x) (((x) & 0x1) << 22)
-#define VIRGL_OBJ_RS_S0_POINT_SMOOTH(x) (((x) & 0x1) << 23)
-#define VIRGL_OBJ_RS_S0_POINT_SIZE_PER_VERTEX(x) (((x) & 0x1) << 24)
-#define VIRGL_OBJ_RS_S0_MULTISAMPLE(x) (((x) & 0x1) << 25)
-#define VIRGL_OBJ_RS_S0_LINE_SMOOTH(x) (((x) & 0x1) << 26)
-#define VIRGL_OBJ_RS_S0_LINE_STIPPLE_ENABLE(x) (((x) & 0x1) << 27)
-#define VIRGL_OBJ_RS_S0_LINE_LAST_PIXEL(x) (((x) & 0x1) << 28)
-#define VIRGL_OBJ_RS_S0_HALF_PIXEL_CENTER(x) (((x) & 0x1) << 29)
-#define VIRGL_OBJ_RS_S0_BOTTOM_EDGE_RULE(x) (((x) & 0x1) << 30)
-#define VIRGL_OBJ_RS_S0_FORCE_PERSAMPLE_INTERP(x) (((x) & 0x1) << 31)
-
-#define VIRGL_OBJ_RS_POINT_SIZE 3
-#define VIRGL_OBJ_RS_SPRITE_COORD_ENABLE 4
-#define VIRGL_OBJ_RS_S3 5
-
-#define VIRGL_OBJ_RS_S3_LINE_STIPPLE_PATTERN(x) (((x) & 0xffff) << 0)
-#define VIRGL_OBJ_RS_S3_LINE_STIPPLE_FACTOR(x) (((x) & 0xff) << 16)
-#define VIRGL_OBJ_RS_S3_CLIP_PLANE_ENABLE(x) (((x) & 0xff) << 24)
-#define VIRGL_OBJ_RS_LINE_WIDTH 6
-#define VIRGL_OBJ_RS_OFFSET_UNITS 7
-#define VIRGL_OBJ_RS_OFFSET_SCALE 8
-#define VIRGL_OBJ_RS_OFFSET_CLAMP 9
-
-#define VIRGL_OBJ_CLEAR_SIZE 8
-#define VIRGL_OBJ_CLEAR_BUFFERS 1
-#define VIRGL_OBJ_CLEAR_COLOR_0 2 /* color is 4 * u32/f32/i32 */
-#define VIRGL_OBJ_CLEAR_COLOR_1 3
-#define VIRGL_OBJ_CLEAR_COLOR_2 4
-#define VIRGL_OBJ_CLEAR_COLOR_3 5
-#define VIRGL_OBJ_CLEAR_DEPTH_0 6 /* depth is a double precision float */
-#define VIRGL_OBJ_CLEAR_DEPTH_1 7
-#define VIRGL_OBJ_CLEAR_STENCIL 8
-
-/* shader object */
-#define VIRGL_OBJ_SHADER_HDR_SIZE(nso) (5 + ((nso) ? (2 * nso) + 4 : 0))
-#define VIRGL_OBJ_SHADER_HANDLE 1
-#define VIRGL_OBJ_SHADER_TYPE 2
-#define VIRGL_OBJ_SHADER_OFFSET 3
-#define VIRGL_OBJ_SHADER_OFFSET_VAL(x) (((x) & 0x7fffffff) << 0)
-/* start contains full length in VAL - also implies continuations */
-/* continuation contains offset in VAL */
-#define VIRGL_OBJ_SHADER_OFFSET_CONT (0x1u << 31)
-#define VIRGL_OBJ_SHADER_NUM_TOKENS 4
-#define VIRGL_OBJ_SHADER_SO_NUM_OUTPUTS 5
-#define VIRGL_OBJ_SHADER_SO_STRIDE(x) (6 + (x))
-#define VIRGL_OBJ_SHADER_SO_OUTPUT0(x) (10 + (x * 2))
-#define VIRGL_OBJ_SHADER_SO_OUTPUT_REGISTER_INDEX(x) (((x) & 0xff) << 0)
-#define VIRGL_OBJ_SHADER_SO_OUTPUT_START_COMPONENT(x) (((x) & 0x3) << 8)
-#define VIRGL_OBJ_SHADER_SO_OUTPUT_NUM_COMPONENTS(x) (((x) & 0x7) << 10)
-#define VIRGL_OBJ_SHADER_SO_OUTPUT_BUFFER(x) (((x) & 0x7) << 13)
-#define VIRGL_OBJ_SHADER_SO_OUTPUT_DST_OFFSET(x) (((x) & 0xffff) << 16)
-#define VIRGL_OBJ_SHADER_SO_OUTPUT0_SO(x) (11 + (x * 2))
-#define VIRGL_OBJ_SHADER_SO_OUTPUT_STREAM(x) (((x) & 0x03) << 0)
-
-/* viewport state */
-#define VIRGL_SET_VIEWPORT_STATE_SIZE(num_viewports) ((6 * num_viewports) + 1)
-#define VIRGL_SET_VIEWPORT_START_SLOT 1
-#define VIRGL_SET_VIEWPORT_STATE_SCALE_0(x) (2 + (x * 6))
-#define VIRGL_SET_VIEWPORT_STATE_SCALE_1(x) (3 + (x * 6))
-#define VIRGL_SET_VIEWPORT_STATE_SCALE_2(x) (4 + (x * 6))
-#define VIRGL_SET_VIEWPORT_STATE_TRANSLATE_0(x) (5 + (x * 6))
-#define VIRGL_SET_VIEWPORT_STATE_TRANSLATE_1(x) (6 + (x * 6))
-#define VIRGL_SET_VIEWPORT_STATE_TRANSLATE_2(x) (7 + (x * 6))
-
-/* framebuffer state */
-#define VIRGL_SET_FRAMEBUFFER_STATE_SIZE(nr_cbufs) (nr_cbufs + 2)
-#define VIRGL_SET_FRAMEBUFFER_STATE_NR_CBUFS 1
-#define VIRGL_SET_FRAMEBUFFER_STATE_NR_ZSURF_HANDLE 2
-#define VIRGL_SET_FRAMEBUFFER_STATE_CBUF_HANDLE(x) ((x) + 3)
-
-/* vertex elements object */
-#define VIRGL_OBJ_VERTEX_ELEMENTS_SIZE(num_elements) (((num_elements) * 4) + 1)
-#define VIRGL_OBJ_VERTEX_ELEMENTS_HANDLE 1
-#define VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_OFFSET(x)                             \
-  (((x) * 4) + 2) /* repeated per VE */
-#define VIRGL_OBJ_VERTEX_ELEMENTS_V0_INSTANCE_DIVISOR(x) (((x) * 4) + 3)
-#define VIRGL_OBJ_VERTEX_ELEMENTS_V0_VERTEX_BUFFER_INDEX(x) (((x) * 4) + 4)
-#define VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_FORMAT(x) (((x) * 4) + 5)
-
-/* vertex buffers */
-#define VIRGL_SET_VERTEX_BUFFERS_SIZE(num_buffers) ((num_buffers) * 3)
-#define VIRGL_SET_VERTEX_BUFFER_STRIDE(x) (((x) * 3) + 1)
-#define VIRGL_SET_VERTEX_BUFFER_OFFSET(x) (((x) * 3) + 2)
-#define VIRGL_SET_VERTEX_BUFFER_HANDLE(x) (((x) * 3) + 3)
-
-/* index buffer */
-#define VIRGL_SET_INDEX_BUFFER_SIZE(ib) (((ib) ? 2 : 0) + 1)
-#define VIRGL_SET_INDEX_BUFFER_HANDLE 1
-#define VIRGL_SET_INDEX_BUFFER_INDEX_SIZE 2 /* only if sending an IB handle */
-#define VIRGL_SET_INDEX_BUFFER_OFFSET 3     /* only if sending an IB handle */
-
-/* constant buffer */
-#define VIRGL_SET_CONSTANT_BUFFER_SHADER_TYPE 1
-#define VIRGL_SET_CONSTANT_BUFFER_INDEX 2
-#define VIRGL_SET_CONSTANT_BUFFER_DATA_START 3
-
-#define VIRGL_SET_UNIFORM_BUFFER_SIZE 5
-#define VIRGL_SET_UNIFORM_BUFFER_SHADER_TYPE 1
-#define VIRGL_SET_UNIFORM_BUFFER_INDEX 2
-#define VIRGL_SET_UNIFORM_BUFFER_OFFSET 3
-#define VIRGL_SET_UNIFORM_BUFFER_LENGTH 4
-#define VIRGL_SET_UNIFORM_BUFFER_RES_HANDLE 5
-
-/* draw VBO */
-#define VIRGL_DRAW_VBO_SIZE 12
-#define VIRGL_DRAW_VBO_SIZE_TESS 14
-#define VIRGL_DRAW_VBO_SIZE_INDIRECT 20
-#define VIRGL_DRAW_VBO_START 1
-#define VIRGL_DRAW_VBO_COUNT 2
-#define VIRGL_DRAW_VBO_MODE 3
-#define VIRGL_DRAW_VBO_INDEXED 4
-#define VIRGL_DRAW_VBO_INSTANCE_COUNT 5
-#define VIRGL_DRAW_VBO_INDEX_BIAS 6
-#define VIRGL_DRAW_VBO_START_INSTANCE 7
-#define VIRGL_DRAW_VBO_PRIMITIVE_RESTART 8
-#define VIRGL_DRAW_VBO_RESTART_INDEX 9
-#define VIRGL_DRAW_VBO_MIN_INDEX 10
-#define VIRGL_DRAW_VBO_MAX_INDEX 11
-#define VIRGL_DRAW_VBO_COUNT_FROM_SO 12
-/* tess packet */
-#define VIRGL_DRAW_VBO_VERTICES_PER_PATCH 13
-#define VIRGL_DRAW_VBO_DRAWID 14
-/* indirect packet */
-#define VIRGL_DRAW_VBO_INDIRECT_HANDLE 15
-#define VIRGL_DRAW_VBO_INDIRECT_OFFSET 16
-#define VIRGL_DRAW_VBO_INDIRECT_STRIDE 17
-#define VIRGL_DRAW_VBO_INDIRECT_DRAW_COUNT 18
-#define VIRGL_DRAW_VBO_INDIRECT_DRAW_COUNT_OFFSET 19
-#define VIRGL_DRAW_VBO_INDIRECT_DRAW_COUNT_HANDLE 20
-
-/* create surface */
-#define VIRGL_OBJ_SURFACE_SIZE 5
-#define VIRGL_OBJ_SURFACE_HANDLE 1
-#define VIRGL_OBJ_SURFACE_RES_HANDLE 2
-#define VIRGL_OBJ_SURFACE_FORMAT 3
-#define VIRGL_OBJ_SURFACE_BUFFER_FIRST_ELEMENT 4
-#define VIRGL_OBJ_SURFACE_BUFFER_LAST_ELEMENT 5
-#define VIRGL_OBJ_SURFACE_TEXTURE_LEVEL 4
-#define VIRGL_OBJ_SURFACE_TEXTURE_LAYERS 5
-
-/* create streamout target */
-#define VIRGL_OBJ_STREAMOUT_SIZE 4
-#define VIRGL_OBJ_STREAMOUT_HANDLE 1
-#define VIRGL_OBJ_STREAMOUT_RES_HANDLE 2
-#define VIRGL_OBJ_STREAMOUT_BUFFER_OFFSET 3
-#define VIRGL_OBJ_STREAMOUT_BUFFER_SIZE 4
-
-/* sampler state */
-#define VIRGL_OBJ_SAMPLER_STATE_SIZE 9
-#define VIRGL_OBJ_SAMPLER_STATE_HANDLE 1
-#define VIRGL_OBJ_SAMPLER_STATE_S0 2
-#define VIRGL_OBJ_SAMPLE_STATE_S0_WRAP_S(x) (((x) & 0x7) << 0)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_WRAP_T(x) (((x) & 0x7) << 3)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_WRAP_R(x) (((x) & 0x7) << 6)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_MIN_IMG_FILTER(x) (((x) & 0x3) << 9)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_MIN_MIP_FILTER(x) (((x) & 0x3) << 11)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_MAG_IMG_FILTER(x) (((x) & 0x3) << 13)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_COMPARE_MODE(x) (((x) & 0x1) << 15)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_COMPARE_FUNC(x) (((x) & 0x7) << 16)
-#define VIRGL_OBJ_SAMPLE_STATE_S0_SEAMLESS_CUBE_MAP(x) (((x) & 0x1) << 19)
-
-#define VIRGL_OBJ_SAMPLER_STATE_LOD_BIAS 3
-#define VIRGL_OBJ_SAMPLER_STATE_MIN_LOD 4
-#define VIRGL_OBJ_SAMPLER_STATE_MAX_LOD 5
-#define VIRGL_OBJ_SAMPLER_STATE_BORDER_COLOR(x) ((x) + 6) /* 6 - 9 */
-
-/* sampler view */
-#define VIRGL_OBJ_SAMPLER_VIEW_SIZE 6
-#define VIRGL_OBJ_SAMPLER_VIEW_HANDLE 1
-#define VIRGL_OBJ_SAMPLER_VIEW_RES_HANDLE 2
-#define VIRGL_OBJ_SAMPLER_VIEW_FORMAT 3
-#define VIRGL_OBJ_SAMPLER_VIEW_BUFFER_FIRST_ELEMENT 4
-#define VIRGL_OBJ_SAMPLER_VIEW_BUFFER_LAST_ELEMENT 5
-#define VIRGL_OBJ_SAMPLER_VIEW_TEXTURE_LAYER 4
-#define VIRGL_OBJ_SAMPLER_VIEW_TEXTURE_LEVEL 5
-#define VIRGL_OBJ_SAMPLER_VIEW_SWIZZLE 6
-#define VIRGL_OBJ_SAMPLER_VIEW_SWIZZLE_R(x) (((x) & 0x7) << 0)
-#define VIRGL_OBJ_SAMPLER_VIEW_SWIZZLE_G(x) (((x) & 0x7) << 3)
-#define VIRGL_OBJ_SAMPLER_VIEW_SWIZZLE_B(x) (((x) & 0x7) << 6)
-#define VIRGL_OBJ_SAMPLER_VIEW_SWIZZLE_A(x) (((x) & 0x7) << 9)
-
-/* set sampler views */
-#define VIRGL_SET_SAMPLER_VIEWS_SIZE(num_views) ((num_views) + 2)
-#define VIRGL_SET_SAMPLER_VIEWS_SHADER_TYPE 1
-#define VIRGL_SET_SAMPLER_VIEWS_START_SLOT 2
-#define VIRGL_SET_SAMPLER_VIEWS_V0_HANDLE 3
-
-/* bind sampler states */
-#define VIRGL_BIND_SAMPLER_STATES(num_states) ((num_states) + 2)
-#define VIRGL_BIND_SAMPLER_STATES_SHADER_TYPE 1
-#define VIRGL_BIND_SAMPLER_STATES_START_SLOT 2
-#define VIRGL_BIND_SAMPLER_STATES_S0_HANDLE 3
-
-/* set stencil reference */
-#define VIRGL_SET_STENCIL_REF_SIZE 1
-#define VIRGL_SET_STENCIL_REF 1
-#define VIRGL_STENCIL_REF_VAL(f, s) ((f & 0xff) | (((s & 0xff) << 8)))
-
-/* set blend color */
-#define VIRGL_SET_BLEND_COLOR_SIZE 4
-#define VIRGL_SET_BLEND_COLOR(x) ((x) + 1)
-
-/* set scissor state */
-#define VIRGL_SET_SCISSOR_STATE_SIZE(x) (1 + 2 * x)
-#define VIRGL_SET_SCISSOR_START_SLOT 1
-#define VIRGL_SET_SCISSOR_MINX_MINY(x) (2 + (x * 2))
-#define VIRGL_SET_SCISSOR_MAXX_MAXY(x) (3 + (x * 2))
-
-/* resource copy region */
-#define VIRGL_CMD_RESOURCE_COPY_REGION_SIZE 13
-#define VIRGL_CMD_RCR_DST_RES_HANDLE 1
-#define VIRGL_CMD_RCR_DST_LEVEL 2
-#define VIRGL_CMD_RCR_DST_X 3
-#define VIRGL_CMD_RCR_DST_Y 4
-#define VIRGL_CMD_RCR_DST_Z 5
-#define VIRGL_CMD_RCR_SRC_RES_HANDLE 6
-#define VIRGL_CMD_RCR_SRC_LEVEL 7
-#define VIRGL_CMD_RCR_SRC_X 8
-#define VIRGL_CMD_RCR_SRC_Y 9
-#define VIRGL_CMD_RCR_SRC_Z 10
-#define VIRGL_CMD_RCR_SRC_W 11
-#define VIRGL_CMD_RCR_SRC_H 12
-#define VIRGL_CMD_RCR_SRC_D 13
-
-/* blit */
-#define VIRGL_CMD_BLIT_SIZE 21
-#define VIRGL_CMD_BLIT_S0 1
-#define VIRGL_CMD_BLIT_S0_MASK(x) (((x) & 0xff) << 0)
-#define VIRGL_CMD_BLIT_S0_FILTER(x) (((x) & 0x3) << 8)
-#define VIRGL_CMD_BLIT_S0_SCISSOR_ENABLE(x) (((x) & 0x1) << 10)
-#define VIRGL_CMD_BLIT_S0_RENDER_CONDITION_ENABLE(x) (((x) & 0x1) << 11)
-#define VIRGL_CMD_BLIT_S0_ALPHA_BLEND(x) (((x) & 0x1) << 12)
-#define VIRGL_CMD_BLIT_SCISSOR_MINX_MINY 2
-#define VIRGL_CMD_BLIT_SCISSOR_MAXX_MAXY 3
-#define VIRGL_CMD_BLIT_DST_RES_HANDLE 4
-#define VIRGL_CMD_BLIT_DST_LEVEL 5
-#define VIRGL_CMD_BLIT_DST_FORMAT 6
-#define VIRGL_CMD_BLIT_DST_X 7
-#define VIRGL_CMD_BLIT_DST_Y 8
-#define VIRGL_CMD_BLIT_DST_Z 9
-#define VIRGL_CMD_BLIT_DST_W 10
-#define VIRGL_CMD_BLIT_DST_H 11
-#define VIRGL_CMD_BLIT_DST_D 12
-#define VIRGL_CMD_BLIT_SRC_RES_HANDLE 13
-#define VIRGL_CMD_BLIT_SRC_LEVEL 14
-#define VIRGL_CMD_BLIT_SRC_FORMAT 15
-#define VIRGL_CMD_BLIT_SRC_X 16
-#define VIRGL_CMD_BLIT_SRC_Y 17
-#define VIRGL_CMD_BLIT_SRC_Z 18
-#define VIRGL_CMD_BLIT_SRC_W 19
-#define VIRGL_CMD_BLIT_SRC_H 20
-#define VIRGL_CMD_BLIT_SRC_D 21
-
-/* query object */
-#define VIRGL_OBJ_QUERY_SIZE 4
-#define VIRGL_OBJ_QUERY_HANDLE 1
-#define VIRGL_OBJ_QUERY_TYPE_INDEX 2
-#define VIRGL_OBJ_QUERY_TYPE(x) (x & 0xffff)
-#define VIRGL_OBJ_QUERY_INDEX(x) ((x & 0xffff) << 16)
-#define VIRGL_OBJ_QUERY_OFFSET 3
-#define VIRGL_OBJ_QUERY_RES_HANDLE 4
-
-#define VIRGL_QUERY_BEGIN_HANDLE 1
-
-#define VIRGL_QUERY_END_HANDLE 1
-
-#define VIRGL_QUERY_RESULT_HANDLE 1
-#define VIRGL_QUERY_RESULT_WAIT 2
-
-/* render condition */
-#define VIRGL_RENDER_CONDITION_SIZE 3
-#define VIRGL_RENDER_CONDITION_HANDLE 1
-#define VIRGL_RENDER_CONDITION_CONDITION 2
-#define VIRGL_RENDER_CONDITION_MODE 3
-
-/* resource inline write */
-#define VIRGL_RESOURCE_IW_RES_HANDLE 1
-#define VIRGL_RESOURCE_IW_LEVEL 2
-#define VIRGL_RESOURCE_IW_USAGE 3
-#define VIRGL_RESOURCE_IW_STRIDE 4
-#define VIRGL_RESOURCE_IW_LAYER_STRIDE 5
-#define VIRGL_RESOURCE_IW_X 6
-#define VIRGL_RESOURCE_IW_Y 7
-#define VIRGL_RESOURCE_IW_Z 8
-#define VIRGL_RESOURCE_IW_W 9
-#define VIRGL_RESOURCE_IW_H 10
-#define VIRGL_RESOURCE_IW_D 11
-#define VIRGL_RESOURCE_IW_DATA_START 12
-
-/* set streamout targets */
-#define VIRGL_SET_STREAMOUT_TARGETS_APPEND_BITMASK 1
-#define VIRGL_SET_STREAMOUT_TARGETS_H0 2
-
-/* set sample mask */
-#define VIRGL_SET_SAMPLE_MASK_SIZE 1
-#define VIRGL_SET_SAMPLE_MASK_MASK 1
-
-/* set clip state */
-#define VIRGL_SET_CLIP_STATE_SIZE 32
-#define VIRGL_SET_CLIP_STATE_C0 1
-
-/* polygon stipple */
-#define VIRGL_POLYGON_STIPPLE_SIZE 32
-#define VIRGL_POLYGON_STIPPLE_P0 1
-
-#define VIRGL_BIND_SHADER_SIZE 2
-#define VIRGL_BIND_SHADER_HANDLE 1
-#define VIRGL_BIND_SHADER_TYPE 2
-
-/* tess state */
-#define VIRGL_TESS_STATE_SIZE 6
-
-/* set min samples */
-#define VIRGL_SET_MIN_SAMPLES_SIZE 1
-#define VIRGL_SET_MIN_SAMPLES_MASK 1
-
-/* set shader buffers */
-#define VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE 3
-#define VIRGL_SET_SHADER_BUFFER_SIZE(x)                                        \
-  (VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE * (x)) + 2
-#define VIRGL_SET_SHADER_BUFFER_SHADER_TYPE 1
-#define VIRGL_SET_SHADER_BUFFER_START_SLOT 2
-#define VIRGL_SET_SHADER_BUFFER_OFFSET(x)                                      \
-  ((x) * VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE + 3)
-#define VIRGL_SET_SHADER_BUFFER_LENGTH(x)                                      \
-  ((x) * VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE + 4)
-#define VIRGL_SET_SHADER_BUFFER_RES_HANDLE(x)                                  \
-  ((x) * VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE + 5)
-
-/* set shader images */
-#define VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE 5
-#define VIRGL_SET_SHADER_IMAGE_SIZE(x)                                         \
-  (VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE * (x)) + 2
-#define VIRGL_SET_SHADER_IMAGE_SHADER_TYPE 1
-#define VIRGL_SET_SHADER_IMAGE_START_SLOT 2
-#define VIRGL_SET_SHADER_IMAGE_FORMAT(x)                                       \
-  ((x) * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 3)
-#define VIRGL_SET_SHADER_IMAGE_ACCESS(x)                                       \
-  ((x) * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 4)
-#define VIRGL_SET_SHADER_IMAGE_LAYER_OFFSET(x)                                 \
-  ((x) * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 5)
-#define VIRGL_SET_SHADER_IMAGE_LEVEL_SIZE(x)                                   \
-  ((x) * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 6)
-#define VIRGL_SET_SHADER_IMAGE_RES_HANDLE(x)                                   \
-  ((x) * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 7)
-
-/* memory barrier */
-#define VIRGL_MEMORY_BARRIER_SIZE 1
-#define VIRGL_MEMORY_BARRIER_FLAGS 1
-
-/* launch grid */
-#define VIRGL_LAUNCH_GRID_SIZE 8
-#define VIRGL_LAUNCH_BLOCK_X 1
-#define VIRGL_LAUNCH_BLOCK_Y 2
-#define VIRGL_LAUNCH_BLOCK_Z 3
-#define VIRGL_LAUNCH_GRID_X 4
-#define VIRGL_LAUNCH_GRID_Y 5
-#define VIRGL_LAUNCH_GRID_Z 6
-#define VIRGL_LAUNCH_INDIRECT_HANDLE 7
-#define VIRGL_LAUNCH_INDIRECT_OFFSET 8
-
-/* framebuffer state no attachment */
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_SIZE 2
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_WIDTH_HEIGHT 1
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_WIDTH(x) (x & 0xffff)
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_HEIGHT(x) ((x >> 16) & 0xffff)
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_LAYERS_SAMPLES 2
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_LAYERS(x) (x & 0xffff)
-#define VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_SAMPLES(x) ((x >> 16) & 0xff)
-
-/* texture barrier */
-#define VIRGL_TEXTURE_BARRIER_SIZE 1
-#define VIRGL_TEXTURE_BARRIER_FLAGS 1
-
-/* hw atomics */
-#define VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE 3
-#define VIRGL_SET_ATOMIC_BUFFER_SIZE(x)                                        \
-  (VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE * (x)) + 1
-#define VIRGL_SET_ATOMIC_BUFFER_START_SLOT 1
-#define VIRGL_SET_ATOMIC_BUFFER_OFFSET(x)                                      \
-  ((x) * VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE + 2)
-#define VIRGL_SET_ATOMIC_BUFFER_LENGTH(x)                                      \
-  ((x) * VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE + 3)
-#define VIRGL_SET_ATOMIC_BUFFER_RES_HANDLE(x)                                  \
-  ((x) * VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE + 4)
-
-/* query buffer object */
-#define VIRGL_QUERY_RESULT_QBO_SIZE 6
-#define VIRGL_QUERY_RESULT_QBO_HANDLE 1
-#define VIRGL_QUERY_RESULT_QBO_QBO_HANDLE 2
-#define VIRGL_QUERY_RESULT_QBO_WAIT 3
-#define VIRGL_QUERY_RESULT_QBO_RESULT_TYPE 4
-#define VIRGL_QUERY_RESULT_QBO_OFFSET 5
-#define VIRGL_QUERY_RESULT_QBO_INDEX 6
-
-#define VIRGL_TRANSFER_TO_HOST 1
-#define VIRGL_TRANSFER_FROM_HOST 2
-
-/* Transfer */
-#define VIRGL_TRANSFER3D_SIZE 13
-/* The first 11 dwords are the same as VIRGL_RESOURCE_IW_*  */
-#define VIRGL_TRANSFER3D_DATA_OFFSET 12
-#define VIRGL_TRANSFER3D_DIRECTION 13
-
-/* Copy transfer */
-#define VIRGL_COPY_TRANSFER3D_SIZE 14
-/* The first 11 dwords are the same as VIRGL_RESOURCE_IW_*  */
-#define VIRGL_COPY_TRANSFER3D_SRC_RES_HANDLE 12
-#define VIRGL_COPY_TRANSFER3D_SRC_RES_OFFSET 13
-#define VIRGL_COPY_TRANSFER3D_SYNCHRONIZED 14
-
-#endif
\ No newline at end of file
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_blitter.c b/app/src/main/cpp/virglrenderer/src/vrend_blitter.c
deleted file mode 100644
index d4b4ea94e..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_blitter.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-/* gallium blitter implementation in GL */
-/* for when we can't use glBlitFramebuffer */
-#include "pipe/p_shader_tokens.h"
-#include <stdio.h>
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_state.h"
-#include "util/u_dual_blend.h"
-#include "util/u_inlines.h"
-#include "util/u_memory.h"
-
-#include "tgsi/tgsi_parse.h"
-#include "util/u_double_list.h"
-#include "util/u_format.h"
-#include "util/u_texture.h"
-
-#include "vrend_object.h"
-#include "vrend_shader.h"
-
-#include "vrend_renderer.h"
-
-#include "vrend_blitter.h"
-
-#define DEST_SWIZZLE_SNIPPET_SIZE 64
-
-struct vrend_blitter_ctx {
-  virgl_gl_context gl_context;
-  bool initialised;
-
-  GLuint vaoid;
-
-  GLuint vs;
-  GLuint fs_texfetch_col[PIPE_MAX_TEXTURE_TYPES];
-  GLuint fs_texfetch_depth[PIPE_MAX_TEXTURE_TYPES];
-  GLuint fs_texfetch_depth_msaa[PIPE_MAX_TEXTURE_TYPES];
-  GLuint fs_texfetch_col_swizzle;
-  GLuint fb_id;
-
-  unsigned dst_width;
-  unsigned dst_height;
-
-  GLuint vbo_id;
-  GLfloat vertices[4][2][4]; /**< {pos, color} or {pos, texcoord} */
-};
-
-struct vrend_blitter_point {
-  int x;
-  int y;
-};
-
-struct vrend_blitter_delta {
-  int dx;
-  int dy;
-};
-
-static bool build_and_check(GLuint id, const char *buf) {
-  GLint param;
-  glShaderSource(id, 1, (const char **)&buf, NULL);
-  glCompileShader(id);
-
-  glGetShaderiv(id, GL_COMPILE_STATUS, &param);
-  if (param == GL_FALSE)
-    return false;
-  return true;
-}
-
-static bool blit_build_vs_passthrough(struct vrend_blitter_ctx *blit_ctx) {
-  blit_ctx->vs = glCreateShader(GL_VERTEX_SHADER);
-
-  if (!build_and_check(blit_ctx->vs, VS_PASSTHROUGH_GLES)) {
-    glDeleteShader(blit_ctx->vs);
-    blit_ctx->vs = 0;
-    return false;
-  }
-  return true;
-}
-
-static void
-create_dest_swizzle_snippet(const uint8_t swizzle[4],
-                            char snippet[DEST_SWIZZLE_SNIPPET_SIZE]) {
-  static const uint8_t invalid_swizzle = 0xff;
-  ssize_t si = 0;
-  uint8_t inverse[4] = {invalid_swizzle, invalid_swizzle, invalid_swizzle,
-                        invalid_swizzle};
-
-  for (int i = 0; i < 4; ++i) {
-    if (swizzle[i] > 3)
-      continue;
-    if (inverse[swizzle[i]] == invalid_swizzle)
-      inverse[swizzle[i]] = i;
-  }
-
-  for (int i = 0; i < 4; ++i) {
-    int res = -1;
-    if (inverse[i] > 3) {
-      /* Use 0.0f for unused color values, 1.0f for an unused alpha value */
-      res = snprintf(&snippet[si], DEST_SWIZZLE_SNIPPET_SIZE - si,
-                     i < 3 ? "0.0f, " : "1.0f");
-    } else {
-      res = snprintf(&snippet[si], DEST_SWIZZLE_SNIPPET_SIZE - si, "texel.%c%s",
-                     "rgba"[inverse[i]], i < 3 ? ", " : "");
-    }
-    si += res > 0 ? res : 0;
-  }
-}
-
-static const char *vec4_type_for_tgsi_ret(enum tgsi_return_type tgsi_ret) {
-  switch (tgsi_ret) {
-  case TGSI_RETURN_TYPE_SINT:
-    return "ivec4";
-  case TGSI_RETURN_TYPE_UINT:
-    return "uvec4";
-  default:
-    return "vec4";
-  }
-}
-
-static enum tgsi_return_type tgsi_ret_for_format(enum virgl_formats format) {
-  if (util_format_is_pure_uint(format))
-    return TGSI_RETURN_TYPE_UINT;
-  else if (util_format_is_pure_sint(format))
-    return TGSI_RETURN_TYPE_SINT;
-
-  return TGSI_RETURN_TYPE_UNORM;
-}
-
-static GLuint blit_build_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
-                                      int tgsi_tex_target,
-                                      enum tgsi_return_type tgsi_ret,
-                                      const uint8_t swizzle[4]) {
-  GLuint fs_id;
-  char shader_buf[4096];
-  const char *twm;
-  const char *ext_str = "";
-  char dest_swizzle_snippet[DEST_SWIZZLE_SNIPPET_SIZE] = "texel";
-  switch (tgsi_tex_target) {
-  case TGSI_TEXTURE_1D:
-  case TGSI_TEXTURE_BUFFER:
-    twm = ".x";
-    break;
-  case TGSI_TEXTURE_1D_ARRAY:
-  case TGSI_TEXTURE_2D:
-  case TGSI_TEXTURE_RECT:
-  case TGSI_TEXTURE_2D_MSAA:
-  default:
-    twm = ".xy";
-    break;
-  case TGSI_TEXTURE_SHADOW1D:
-  case TGSI_TEXTURE_SHADOW2D:
-  case TGSI_TEXTURE_SHADOW1D_ARRAY:
-  case TGSI_TEXTURE_SHADOWRECT:
-  case TGSI_TEXTURE_3D:
-  case TGSI_TEXTURE_CUBE:
-  case TGSI_TEXTURE_2D_ARRAY:
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    twm = ".xyz";
-    break;
-  case TGSI_TEXTURE_SHADOWCUBE:
-  case TGSI_TEXTURE_SHADOW2D_ARRAY:
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-  case TGSI_TEXTURE_CUBE_ARRAY:
-    twm = "";
-    break;
-  }
-
-  if (tgsi_tex_target == TGSI_TEXTURE_CUBE_ARRAY ||
-      tgsi_tex_target == TGSI_TEXTURE_SHADOWCUBE_ARRAY)
-    ext_str = "#extension GL_ARB_texture_cube_map_array : require\n";
-
-  if (swizzle)
-    create_dest_swizzle_snippet(swizzle, dest_swizzle_snippet);
-
-  snprintf(shader_buf, 4096,
-           tgsi_tex_target == TGSI_TEXTURE_1D ? FS_TEXFETCH_COL_GLES_1D
-                                              : FS_TEXFETCH_COL_GLES,
-           ext_str, vec4_type_for_tgsi_ret(tgsi_ret),
-           vrend_shader_samplerreturnconv(tgsi_ret),
-           vrend_shader_samplertypeconv(tgsi_tex_target), twm,
-           dest_swizzle_snippet);
-
-  fs_id = glCreateShader(GL_FRAGMENT_SHADER);
-
-  if (!build_and_check(fs_id, shader_buf)) {
-    glDeleteShader(fs_id);
-    return 0;
-  }
-
-  return fs_id;
-}
-
-static GLuint blit_build_frag_tex_col_msaa(struct vrend_blitter_ctx *blit_ctx,
-                                           int tgsi_tex_target,
-                                           enum tgsi_return_type tgsi_ret,
-                                           const uint8_t swizzle[4],
-                                           int nr_samples) {
-  GLuint fs_id;
-  char shader_buf[4096];
-  const char *twm;
-  const char *ivec;
-  char dest_swizzle_snippet[DEST_SWIZZLE_SNIPPET_SIZE] = "texel";
-  const char *ext_str = "";
-
-  bool is_array = false;
-  switch (tgsi_tex_target) {
-  case TGSI_TEXTURE_2D_MSAA:
-    twm = ".xy";
-    ivec = "ivec2";
-    break;
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    twm = ".xyz";
-    ivec = "ivec3";
-    is_array = true;
-    break;
-  default:
-    return 0;
-  }
-
-  if (swizzle)
-    create_dest_swizzle_snippet(swizzle, dest_swizzle_snippet);
-
-  snprintf(shader_buf, 4096,
-           is_array ? FS_TEXFETCH_COL_MSAA_ARRAY_GLES
-                    : FS_TEXFETCH_COL_MSAA_GLES,
-           ext_str, vec4_type_for_tgsi_ret(tgsi_ret),
-           vrend_shader_samplerreturnconv(tgsi_ret),
-           vrend_shader_samplertypeconv(tgsi_tex_target), nr_samples, ivec, twm,
-           dest_swizzle_snippet);
-
-  fs_id = glCreateShader(GL_FRAGMENT_SHADER);
-
-  if (!build_and_check(fs_id, shader_buf)) {
-    glDeleteShader(fs_id);
-    return 0;
-  }
-
-  return fs_id;
-}
-
-static GLuint blit_build_frag_tex_writedepth(struct vrend_blitter_ctx *blit_ctx,
-                                             int tgsi_tex_target) {
-  GLuint fs_id;
-  char shader_buf[4096];
-  const char *twm;
-
-  switch (tgsi_tex_target) {
-  case TGSI_TEXTURE_1D:
-    twm = ".xy";
-    break;
-    /* fallthrough */
-  case TGSI_TEXTURE_BUFFER:
-    twm = ".x";
-    break;
-  case TGSI_TEXTURE_1D_ARRAY:
-  case TGSI_TEXTURE_2D:
-  case TGSI_TEXTURE_RECT:
-  case TGSI_TEXTURE_2D_MSAA:
-  default:
-    twm = ".xy";
-    break;
-  case TGSI_TEXTURE_SHADOW1D:
-  case TGSI_TEXTURE_SHADOW2D:
-  case TGSI_TEXTURE_SHADOW1D_ARRAY:
-  case TGSI_TEXTURE_SHADOWRECT:
-  case TGSI_TEXTURE_3D:
-  case TGSI_TEXTURE_CUBE:
-  case TGSI_TEXTURE_2D_ARRAY:
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    twm = ".xyz";
-    break;
-  case TGSI_TEXTURE_SHADOWCUBE:
-  case TGSI_TEXTURE_SHADOW2D_ARRAY:
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-  case TGSI_TEXTURE_CUBE_ARRAY:
-    twm = "";
-    break;
-  }
-
-  snprintf(shader_buf, 4096, FS_TEXFETCH_DS_GLES,
-           vrend_shader_samplertypeconv(tgsi_tex_target), twm);
-
-  fs_id = glCreateShader(GL_FRAGMENT_SHADER);
-
-  if (!build_and_check(fs_id, shader_buf)) {
-    glDeleteShader(fs_id);
-    return 0;
-  }
-
-  return fs_id;
-}
-
-static GLuint
-blit_build_frag_blit_msaa_depth(struct vrend_blitter_ctx *blit_ctx,
-                                int tgsi_tex_target) {
-  GLuint fs_id;
-  char shader_buf[4096];
-  const char *twm;
-  const char *ivec;
-
-  bool is_array = false;
-  switch (tgsi_tex_target) {
-  case TGSI_TEXTURE_2D_MSAA:
-    twm = ".xy";
-    ivec = "ivec2";
-    break;
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    twm = ".xyz";
-    ivec = "ivec3";
-    is_array = true;
-    break;
-  default:
-    return 0;
-  }
-
-  snprintf(shader_buf, 4096,
-           is_array ? FS_TEXFETCH_DS_MSAA_ARRAY_GLES : FS_TEXFETCH_DS_MSAA_GLES,
-           vrend_shader_samplertypeconv(tgsi_tex_target), ivec, twm);
-
-  fs_id = glCreateShader(GL_FRAGMENT_SHADER);
-
-  if (!build_and_check(fs_id, shader_buf)) {
-    glDeleteShader(fs_id);
-    return 0;
-  }
-
-  return fs_id;
-}
-
-static GLuint blit_get_frag_tex_writedepth(struct vrend_blitter_ctx *blit_ctx,
-                                           int pipe_tex_target,
-                                           unsigned nr_samples) {
-  assert(pipe_tex_target < PIPE_MAX_TEXTURE_TYPES);
-
-  if (nr_samples > 0) {
-    GLuint *shader = &blit_ctx->fs_texfetch_depth_msaa[pipe_tex_target];
-
-    if (!*shader) {
-      unsigned tgsi_tex =
-          util_pipe_tex_to_tgsi_tex(pipe_tex_target, nr_samples);
-
-      *shader = blit_build_frag_blit_msaa_depth(blit_ctx, tgsi_tex);
-    }
-    return *shader;
-
-  } else {
-    GLuint *shader = &blit_ctx->fs_texfetch_depth[pipe_tex_target];
-
-    if (!*shader) {
-      unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex_target, 0);
-
-      *shader = blit_build_frag_tex_writedepth(blit_ctx, tgsi_tex);
-    }
-    return *shader;
-  }
-}
-
-static GLuint blit_get_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
-                                    int pipe_tex_target, unsigned nr_samples,
-                                    const struct vrend_format_table *src_entry,
-                                    const struct vrend_format_table *dst_entry,
-                                    bool skip_dest_swizzle) {
-  assert(pipe_tex_target < PIPE_MAX_TEXTURE_TYPES);
-
-  bool needs_swizzle =
-      !skip_dest_swizzle && (dst_entry->flags & VIRGL_TEXTURE_NEED_SWIZZLE);
-
-  if (needs_swizzle || nr_samples > 1) {
-    const uint8_t *swizzle = needs_swizzle ? dst_entry->swizzle : NULL;
-    GLuint *shader = &blit_ctx->fs_texfetch_col_swizzle;
-    if (shader) {
-      glDeleteShader(*shader);
-    }
-
-    unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex_target, nr_samples);
-    enum tgsi_return_type tgsi_ret = tgsi_ret_for_format(src_entry->format);
-
-    if (nr_samples > 0) {
-      // Integer textures are resolved using just one sample
-      int msaa_samples = tgsi_ret == TGSI_RETURN_TYPE_UNORM ? nr_samples : 1;
-      *shader = blit_build_frag_tex_col_msaa(blit_ctx, tgsi_tex, tgsi_ret,
-                                             swizzle, msaa_samples);
-    } else {
-      *shader = blit_build_frag_tex_col(blit_ctx, tgsi_tex, tgsi_ret, swizzle);
-    }
-
-    return *shader;
-  } else {
-    GLuint *shader = &blit_ctx->fs_texfetch_col[pipe_tex_target];
-
-    if (!*shader) {
-      unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex_target, 0);
-      enum tgsi_return_type tgsi_ret = tgsi_ret_for_format(src_entry->format);
-
-      *shader = blit_build_frag_tex_col(blit_ctx, tgsi_tex, tgsi_ret, NULL);
-    }
-    return *shader;
-  }
-}
-
-static void vrend_renderer_init_blit_ctx(struct virgl_client *client,
-                                         struct vrend_blitter_ctx *blit_ctx) {
-  int i;
-  if (blit_ctx->initialised) {
-    vrend_clicbs->make_current(client, blit_ctx->gl_context);
-    return;
-  }
-
-  blit_ctx->initialised = true;
-
-  blit_ctx->gl_context = vrend_clicbs->create_gl_context(client);
-
-  vrend_clicbs->make_current(client, blit_ctx->gl_context);
-  glGenVertexArrays(1, &blit_ctx->vaoid);
-  glGenFramebuffers(1, &blit_ctx->fb_id);
-
-  glGenBuffers(1, &blit_ctx->vbo_id);
-  blit_build_vs_passthrough(blit_ctx);
-
-  for (i = 0; i < 4; i++)
-    blit_ctx->vertices[i][0][3] = 1; /*v.w*/
-  glBindVertexArray(blit_ctx->vaoid);
-  glBindBuffer(GL_ARRAY_BUFFER, blit_ctx->vbo_id);
-}
-
-static inline GLenum convert_mag_filter(unsigned int filter) {
-  if (filter == PIPE_TEX_FILTER_NEAREST)
-    return GL_NEAREST;
-  return GL_LINEAR;
-}
-
-static void blitter_set_dst_dim(struct vrend_blitter_ctx *blit_ctx,
-                                unsigned width, unsigned height) {
-  blit_ctx->dst_width = width;
-  blit_ctx->dst_height = height;
-}
-
-static void blitter_set_rectangle(struct vrend_blitter_ctx *blit_ctx, int x1,
-                                  int y1, int x2, int y2, float depth) {
-  int i;
-
-  /* set vertex positions */
-  blit_ctx->vertices[0][0][0] =
-      (float)x1 / blit_ctx->dst_width * 2.0f - 1.0f; /*v0.x*/
-  blit_ctx->vertices[0][0][1] =
-      (float)y1 / blit_ctx->dst_height * 2.0f - 1.0f; /*v0.y*/
-
-  blit_ctx->vertices[1][0][0] =
-      (float)x2 / blit_ctx->dst_width * 2.0f - 1.0f; /*v1.x*/
-  blit_ctx->vertices[1][0][1] =
-      (float)y1 / blit_ctx->dst_height * 2.0f - 1.0f; /*v1.y*/
-
-  blit_ctx->vertices[2][0][0] =
-      (float)x2 / blit_ctx->dst_width * 2.0f - 1.0f; /*v2.x*/
-  blit_ctx->vertices[2][0][1] =
-      (float)y2 / blit_ctx->dst_height * 2.0f - 1.0f; /*v2.y*/
-
-  blit_ctx->vertices[3][0][0] =
-      (float)x1 / blit_ctx->dst_width * 2.0f - 1.0f; /*v3.x*/
-  blit_ctx->vertices[3][0][1] =
-      (float)y2 / blit_ctx->dst_height * 2.0f - 1.0f; /*v3.y*/
-
-  for (i = 0; i < 4; i++)
-    blit_ctx->vertices[i][0][2] = depth; /*z*/
-
-  glViewport(0, 0, blit_ctx->dst_width, blit_ctx->dst_height);
-}
-
-static void get_texcoords(struct vrend_blitter_ctx *blit_ctx,
-                          struct vrend_resource *src_res, int src_level, int x1,
-                          int y1, int x2, int y2, float out[4]) {
-  bool normalized = src_res->base.nr_samples < 1;
-
-  if (normalized) {
-    out[0] = x1 / (float)u_minify(src_res->base.width0, src_level);
-    out[1] = y1 / (float)u_minify(src_res->base.height0, src_level);
-    out[2] = x2 / (float)u_minify(src_res->base.width0, src_level);
-    out[3] = y2 / (float)u_minify(src_res->base.height0, src_level);
-  } else {
-    out[0] = (float)x1;
-    out[1] = (float)y1;
-    out[2] = (float)x2;
-    out[3] = (float)y2;
-  }
-}
-static void set_texcoords_in_vertices(const float coord[4], float *out,
-                                      unsigned stride) {
-  out[0] = coord[0]; /*t0.s*/
-  out[1] = coord[1]; /*t0.t*/
-  out += stride;
-  out[0] = coord[2]; /*t1.s*/
-  out[1] = coord[1]; /*t1.t*/
-  out += stride;
-  out[0] = coord[2]; /*t2.s*/
-  out[1] = coord[3]; /*t2.t*/
-  out += stride;
-  out[0] = coord[0]; /*t3.s*/
-  out[1] = coord[3]; /*t3.t*/
-}
-
-static void blitter_set_texcoords(struct vrend_blitter_ctx *blit_ctx,
-                                  struct vrend_resource *src_res, int level,
-                                  float layer, unsigned sample, int x1, int y1,
-                                  int x2, int y2) {
-  float coord[4];
-  float face_coord[4][2];
-  int i;
-  get_texcoords(blit_ctx, src_res, level, x1, y1, x2, y2, coord);
-
-  if (src_res->base.target == PIPE_TEXTURE_CUBE ||
-      src_res->base.target == PIPE_TEXTURE_CUBE_ARRAY) {
-    set_texcoords_in_vertices(coord, &face_coord[0][0], 2);
-    util_map_texcoords2d_onto_cubemap((unsigned)layer % 6,
-                                      /* pointer, stride in floats */
-                                      &face_coord[0][0], 2,
-                                      &blit_ctx->vertices[0][1][0], 8, FALSE);
-  } else {
-    set_texcoords_in_vertices(coord, &blit_ctx->vertices[0][1][0], 8);
-  }
-
-  switch (src_res->base.target) {
-  case PIPE_TEXTURE_3D: {
-    float r = layer / (float)u_minify(src_res->base.depth0, level);
-    for (i = 0; i < 4; i++)
-      blit_ctx->vertices[i][1][2] = r; /*r*/
-  } break;
-
-  case PIPE_TEXTURE_1D_ARRAY:
-    for (i = 0; i < 4; i++)
-      blit_ctx->vertices[i][1][1] = (float)layer; /*t*/
-    break;
-
-  case PIPE_TEXTURE_2D_ARRAY:
-    for (i = 0; i < 4; i++) {
-      blit_ctx->vertices[i][1][2] = (float)layer;  /*r*/
-      blit_ctx->vertices[i][1][3] = (float)sample; /*q*/
-    }
-    break;
-  case PIPE_TEXTURE_CUBE_ARRAY:
-    for (i = 0; i < 4; i++)
-      blit_ctx->vertices[i][1][3] = (float)((unsigned)layer / 6); /*w*/
-    break;
-  case PIPE_TEXTURE_2D:
-    for (i = 0; i < 4; i++) {
-      blit_ctx->vertices[i][1][3] = (float)sample; /*r*/
-    }
-    break;
-  default:;
-  }
-}
-
-static void set_dsa_write_depth_keep_stencil(void) {
-  glDisable(GL_STENCIL_TEST);
-  glEnable(GL_DEPTH_TEST);
-  glDepthFunc(GL_ALWAYS);
-  glDepthMask(GL_TRUE);
-}
-
-static inline GLenum to_gl_swizzle(int swizzle) {
-  switch (swizzle) {
-  case PIPE_SWIZZLE_RED:
-    return GL_RED;
-  case PIPE_SWIZZLE_GREEN:
-    return GL_GREEN;
-  case PIPE_SWIZZLE_BLUE:
-    return GL_BLUE;
-  case PIPE_SWIZZLE_ALPHA:
-    return GL_ALPHA;
-  case PIPE_SWIZZLE_ZERO:
-    return GL_ZERO;
-  case PIPE_SWIZZLE_ONE:
-    return GL_ONE;
-  default:
-    return 0;
-  }
-}
-
-/* Calculate the delta required to keep 'v' within [0, max] */
-static int calc_delta_for_bound(int v, int max) {
-  int delta = 0;
-
-  if (v < 0)
-    delta = -v;
-  else if (v > max)
-    delta = -(v - max);
-
-  return delta;
-}
-
-/* Calculate the deltas for the source blit region points in order to bound
- * them within the source resource extents */
-static void calc_src_deltas_for_bounds(struct vrend_resource *src_res,
-                                       const struct pipe_blit_info *info,
-                                       struct vrend_blitter_delta *src0_delta,
-                                       struct vrend_blitter_delta *src1_delta) {
-  int max_x = u_minify(src_res->base.width0, info->src.level) - 1;
-  int max_y = u_minify(src_res->base.height0, info->src.level) - 1;
-
-  /* Whether the bounds for the coordinates of a point are inclusive or
-   * exclusive depends on the direction of the blit read. Adjust the max
-   * bounds accordingly, with an adjustment of 0 for inclusive, and 1 for
-   * exclusive. */
-  int src0_x_excl = info->src.box.width < 0;
-  int src0_y_excl = info->src.box.height < 0;
-
-  src0_delta->dx = calc_delta_for_bound(info->src.box.x, max_x + src0_x_excl);
-  src0_delta->dy = calc_delta_for_bound(info->src.box.y, max_y + src0_y_excl);
-
-  src1_delta->dx = calc_delta_for_bound(info->src.box.x + info->src.box.width,
-                                        max_x + !src0_x_excl);
-  src1_delta->dy = calc_delta_for_bound(info->src.box.y + info->src.box.height,
-                                        max_y + !src0_y_excl);
-}
-
-/* Calculate dst delta values to adjust the dst points for any changes in the
- * src points */
-static void
-calc_dst_deltas_from_src(const struct pipe_blit_info *info,
-                         const struct vrend_blitter_delta *src0_delta,
-                         const struct vrend_blitter_delta *src1_delta,
-                         struct vrend_blitter_delta *dst0_delta,
-                         struct vrend_blitter_delta *dst1_delta) {
-  float scale_x = (float)info->dst.box.width / (float)info->src.box.width;
-  float scale_y = (float)info->dst.box.height / (float)info->src.box.height;
-
-  dst0_delta->dx = src0_delta->dx * scale_x;
-  dst0_delta->dy = src0_delta->dy * scale_y;
-
-  dst1_delta->dx = src1_delta->dx * scale_x;
-  dst1_delta->dy = src1_delta->dy * scale_y;
-}
-
-/* implement blitting using OpenGL. */
-void vrend_renderer_blit_gl(
-    struct virgl_client *client, struct vrend_resource *src_res,
-    struct vrend_resource *dst_res, GLenum blit_views[2],
-    const struct pipe_blit_info *info, bool has_texture_srgb_decode,
-    bool has_srgb_write_control, bool skip_dest_swizzle) {
-  struct vrend_blitter_ctx *blit_ctx;
-
-  if (!client->vrend_blit_ctx)
-    client->vrend_blit_ctx = CALLOC_STRUCT(vrend_blitter_ctx);
-
-  blit_ctx = client->vrend_blit_ctx;
-
-  GLuint buffers;
-  GLuint prog_id;
-  GLuint fs_id;
-  GLint lret;
-  GLenum filter;
-  GLuint pos_loc, tc_loc;
-  GLuint samp_loc;
-  bool has_depth, has_stencil;
-  bool blit_stencil, blit_depth;
-  int dst_z;
-  struct vrend_blitter_delta src0_delta, src1_delta, dst0_delta, dst1_delta;
-  struct vrend_blitter_point src0, src1, dst0, dst1;
-  const struct util_format_description *src_desc =
-      util_format_description(src_res->base.format);
-  const struct util_format_description *dst_desc =
-      util_format_description(dst_res->base.format);
-  const struct vrend_format_table *src_entry =
-      vrend_get_format_table_entry(info->src.format);
-  const struct vrend_format_table *dst_entry =
-      vrend_get_format_table_entry(info->dst.format);
-
-  has_depth =
-      util_format_has_depth(src_desc) && util_format_has_depth(dst_desc);
-  has_stencil =
-      util_format_has_stencil(src_desc) && util_format_has_stencil(dst_desc);
-
-  blit_depth = has_depth && (info->mask & PIPE_MASK_Z);
-  blit_stencil = has_stencil && (info->mask & PIPE_MASK_S) & 0;
-
-  filter = convert_mag_filter(info->filter);
-  vrend_renderer_init_blit_ctx(client, blit_ctx);
-
-  blitter_set_dst_dim(blit_ctx, u_minify(dst_res->base.width0, info->dst.level),
-                      u_minify(dst_res->base.height0, info->dst.level));
-
-  /* Calculate src and dst points taking deltas into account */
-  calc_src_deltas_for_bounds(src_res, info, &src0_delta, &src1_delta);
-  calc_dst_deltas_from_src(info, &src0_delta, &src1_delta, &dst0_delta,
-                           &dst1_delta);
-
-  src0.x = info->src.box.x + src0_delta.dx;
-  src0.y = info->src.box.y + src0_delta.dy;
-  src1.x = info->src.box.x + info->src.box.width + src1_delta.dx;
-  src1.y = info->src.box.y + info->src.box.height + src1_delta.dy;
-
-  dst0.x = info->dst.box.x + dst0_delta.dx;
-  dst0.y = info->dst.box.y + dst0_delta.dy;
-  dst1.x = info->dst.box.x + info->dst.box.width + dst1_delta.dx;
-  dst1.y = info->dst.box.y + info->dst.box.height + dst1_delta.dy;
-
-  blitter_set_rectangle(blit_ctx, dst0.x, dst0.y, dst1.x, dst1.y, 0);
-
-  prog_id = glCreateProgram();
-  glAttachShader(prog_id, blit_ctx->vs);
-
-  if (blit_depth || blit_stencil) {
-    fs_id = blit_get_frag_tex_writedepth(blit_ctx, src_res->base.target,
-                                         src_res->base.nr_samples);
-  } else {
-    fs_id = blit_get_frag_tex_col(blit_ctx, src_res->base.target,
-                                  src_res->base.nr_samples, src_entry,
-                                  dst_entry, skip_dest_swizzle);
-  }
-  glAttachShader(prog_id, fs_id);
-
-  glLinkProgram(prog_id);
-  glGetProgramiv(prog_id, GL_LINK_STATUS, &lret);
-  if (lret == GL_FALSE) {
-    glDeleteProgram(prog_id);
-    return;
-  }
-
-  glUseProgram(prog_id);
-
-  glBindFramebuffer(GL_FRAMEBUFFER, blit_ctx->fb_id);
-  vrend_fb_bind_texture_id(dst_res, blit_views[1], 0, info->dst.level,
-                           info->dst.box.z);
-
-  buffers = GL_COLOR_ATTACHMENT0;
-  glDrawBuffers(1, &buffers);
-
-  glBindTexture(src_res->target, blit_views[0]);
-
-  if (src_entry->flags & VIRGL_TEXTURE_NEED_SWIZZLE) {
-    glTexParameteri(src_res->target, GL_TEXTURE_SWIZZLE_R,
-                    to_gl_swizzle(src_entry->swizzle[0]));
-    glTexParameteri(src_res->target, GL_TEXTURE_SWIZZLE_G,
-                    to_gl_swizzle(src_entry->swizzle[1]));
-    glTexParameteri(src_res->target, GL_TEXTURE_SWIZZLE_B,
-                    to_gl_swizzle(src_entry->swizzle[2]));
-    glTexParameteri(src_res->target, GL_TEXTURE_SWIZZLE_A,
-                    to_gl_swizzle(src_entry->swizzle[3]));
-  }
-
-  /* Just make sure that no stale state disabled decoding */
-  if (has_texture_srgb_decode && util_format_is_srgb(info->src.format) &&
-      src_res->base.nr_samples < 1)
-    glTexParameteri(src_res->target, GL_TEXTURE_SRGB_DECODE_EXT, GL_DECODE_EXT);
-
-  if (src_res->base.nr_samples < 1) {
-    glTexParameteri(src_res->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(src_res->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(src_res->target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-  }
-
-  glTexParameteri(src_res->target, GL_TEXTURE_BASE_LEVEL, info->src.level);
-  glTexParameteri(src_res->target, GL_TEXTURE_MAX_LEVEL, info->src.level);
-
-  if (src_res->base.nr_samples < 1) {
-    glTexParameterf(src_res->target, GL_TEXTURE_MAG_FILTER, filter);
-    glTexParameterf(src_res->target, GL_TEXTURE_MIN_FILTER, filter);
-  }
-  pos_loc = glGetAttribLocation(prog_id, "arg0");
-  tc_loc = glGetAttribLocation(prog_id, "arg1");
-  samp_loc = glGetUniformLocation(prog_id, "samp");
-
-  glUniform1i(samp_loc, 0);
-
-  glVertexAttribPointer(pos_loc, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(float),
-                        (void *)0);
-  glVertexAttribPointer(tc_loc, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(float),
-                        (void *)(4 * sizeof(float)));
-
-  glEnableVertexAttribArray(pos_loc);
-  glEnableVertexAttribArray(tc_loc);
-
-  set_dsa_write_depth_keep_stencil();
-
-  if (info->scissor_enable) {
-    glScissor(info->scissor.minx, info->scissor.miny,
-              info->scissor.maxx - info->scissor.minx,
-              info->scissor.maxy - info->scissor.miny);
-    glEnable(GL_SCISSOR_TEST);
-  } else
-    glDisable(GL_SCISSOR_TEST);
-
-  for (dst_z = 0; dst_z < info->dst.box.depth; dst_z++) {
-    float dst2src_scale = info->src.box.depth / (float)info->dst.box.depth;
-    float dst_offset = ((info->src.box.depth - 1) -
-                        (info->dst.box.depth - 1) * dst2src_scale) *
-                       0.5;
-    float src_z = (dst_z + dst_offset) * dst2src_scale;
-    uint32_t layer =
-        (dst_res->target == GL_TEXTURE_CUBE_MAP) ? info->dst.box.z : dst_z;
-
-    glBindFramebuffer(GL_FRAMEBUFFER, blit_ctx->fb_id);
-    vrend_fb_bind_texture_id(dst_res, blit_views[1], 0, info->dst.level, layer);
-
-    buffers = GL_COLOR_ATTACHMENT0;
-    glDrawBuffers(1, &buffers);
-    blitter_set_texcoords(blit_ctx, src_res, info->src.level,
-                          info->src.box.z + src_z, 0, src0.x, src0.y, src1.x,
-                          src1.y);
-
-    glBufferData(GL_ARRAY_BUFFER, sizeof(blit_ctx->vertices),
-                 blit_ctx->vertices, GL_STATIC_DRAW);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-  }
-
-  glUseProgram(0);
-  glDeleteProgram(prog_id);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                         GL_TEXTURE_2D, 0, 0);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0,
-                         0);
-  glBindTexture(src_res->target, 0);
-}
-
-void vrend_blitter_fini(struct virgl_client *client) {
-  if (!client->vrend_blit_ctx)
-    return;
-
-  client->vrend_blit_ctx->initialised = false;
-  vrend_clicbs->destroy_gl_context(client, client->vrend_blit_ctx->gl_context);
-  memset(client->vrend_blit_ctx, 0, sizeof(client->vrend_blit_ctx));
-  client->vrend_blit_ctx = NULL;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_blitter.h b/app/src/main/cpp/virglrenderer/src/vrend_blitter.h
deleted file mode 100644
index bac296096..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_blitter.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-#ifndef VREND_BLITTER_H
-#define VREND_BLITTER_H
-
-/* shaders for blitting */
-
-#define HEADER_GLES                                                            \
-  "// Blitter\n"                                                               \
-  "#version 310 es\n"                                                          \
-  "precision mediump float;\n"
-
-#define HEADER_GLES_MS_ARRAY                                                   \
-  "// Blitter\n"                                                               \
-  "#version 310 es\n"                                                          \
-  "#extension GL_OES_texture_storage_multisample_2d_array: require\n"          \
-  "precision mediump float;\n"
-
-#define VS_PASSTHROUGH_BODY                                                    \
-  "in vec4 arg0;\n"                                                            \
-  "in vec4 arg1;\n"                                                            \
-  "out vec4 tc;\n"                                                             \
-  "void main() {\n"                                                            \
-  "   gl_Position = arg0;\n"                                                   \
-  "   tc = arg1;\n"                                                            \
-  "}\n"
-
-#define VS_PASSTHROUGH_GLES HEADER_GLES VS_PASSTHROUGH_BODY
-
-#define FS_TEXFETCH_COL_BODY                                                   \
-  "%s"                                                                         \
-  "#define cvec4 %s\n"                                                         \
-  "uniform mediump %csampler%s samp;\n"                                        \
-  "in vec4 tc;\n"                                                              \
-  "out cvec4 FragColor;\n"                                                     \
-  "void main() {\n"                                                            \
-  "   cvec4 texel = texture(samp, tc%s);\n"                                    \
-  "   FragColor = cvec4(%s);\n"                                                \
-  "}\n"
-
-#define FS_TEXFETCH_COL_GLES_1D_BODY                                           \
-  "%s"                                                                         \
-  "#define cvec4 %s\n"                                                         \
-  "uniform mediump %csampler%s samp;\n"                                        \
-  "in vec4 tc;\n"                                                              \
-  "out cvec4 FragColor;\n"                                                     \
-  "void main() {\n"                                                            \
-  "   cvec4 texel = texture(samp, vec2(tc%s, 0.5));\n"                         \
-  "   FragColor = cvec4(%s);\n"                                                \
-  "}\n"
-
-#define FS_TEXFETCH_COL_GLES HEADER_GLES FS_TEXFETCH_COL_BODY
-#define FS_TEXFETCH_COL_GLES_1D HEADER_GLES FS_TEXFETCH_COL_GLES_1D_BODY
-
-#define FS_TEXFETCH_COL_MSAA_BODY                                              \
-  "%s"                                                                         \
-  "#define cvec4 %s\n"                                                         \
-  "uniform mediump %csampler%s samp;\n"                                        \
-  "in vec4 tc;\n"                                                              \
-  "out cvec4 FragColor;\n"                                                     \
-  "void main() {\n"                                                            \
-  "   const int num_samples = %d;\n"                                           \
-  "   cvec4 texel = cvec4(0);\n"                                               \
-  "   for (int i = 0; i < num_samples; ++i) \n"                                \
-  "      texel += texelFetch(samp, %s(tc%s), i);\n"                            \
-  "   texel = texel / cvec4(num_samples);\n"                                   \
-  "   FragColor = cvec4(%s);\n"                                                \
-  "}\n"
-
-#define FS_TEXFETCH_COL_MSAA_GLES HEADER_GLES FS_TEXFETCH_COL_MSAA_BODY
-#define FS_TEXFETCH_COL_MSAA_ARRAY_GLES                                        \
-  HEADER_GLES_MS_ARRAY FS_TEXFETCH_COL_MSAA_BODY
-
-#define FS_TEXFETCH_DS_BODY                                                    \
-  "uniform mediump sampler%s samp;\n"                                          \
-  "in vec4 tc;\n"                                                              \
-  "void main() {\n"                                                            \
-  "   gl_FragDepth = float(texture(samp, tc%s).x);\n"                          \
-  "}\n"
-
-#define FS_TEXFETCH_DS_GLES HEADER_GLES FS_TEXFETCH_DS_BODY
-
-#define FS_TEXFETCH_DS_MSAA_BODY_GLES                                          \
-  "uniform mediump sampler%s samp;\n"                                          \
-  "in vec4 tc;\n"                                                              \
-  "void main() {\n"                                                            \
-  "   gl_FragDepth = float(texelFetch(samp, %s(tc%s), int(tc.z)).x);\n"        \
-  "}\n"
-
-#define FS_TEXFETCH_DS_MSAA_GLES HEADER_GLES FS_TEXFETCH_DS_MSAA_BODY_GLES
-#define FS_TEXFETCH_DS_MSAA_ARRAY_GLES                                         \
-  HEADER_GLES_MS_ARRAY FS_TEXFETCH_DS_MSAA_BODY_GLES
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_decode.c b/app/src/main/cpp/virglrenderer/src/vrend_decode.c
deleted file mode 100644
index e9ca86235..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_decode.c
+++ /dev/null
@@ -1,1580 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-#include <errno.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "pipe/p_defines.h"
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-#include "tgsi/tgsi_text.h"
-#include "util/u_memory.h"
-#include "vrend_object.h"
-#include "vrend_renderer.h"
-
-struct vrend_decoder_state {
-  uint32_t *buf;
-  uint32_t buf_total;
-  uint32_t buf_offset;
-};
-
-struct vrend_decode_ctx {
-  struct vrend_decoder_state ids, *ds;
-  struct vrend_context *grctx;
-};
-
-static inline uint32_t get_buf_entry(struct vrend_decode_ctx *ctx,
-                                     uint32_t offset) {
-  return ctx->ds->buf[ctx->ds->buf_offset + offset];
-}
-
-static inline void *get_buf_ptr(struct vrend_decode_ctx *ctx, uint32_t offset) {
-  return &ctx->ds->buf[ctx->ds->buf_offset + offset];
-}
-
-static int vrend_decode_create_shader(struct vrend_decode_ctx *ctx,
-                                      uint32_t handle, uint16_t length) {
-  struct pipe_stream_output_info so_info;
-  uint i;
-  int ret;
-  uint32_t shader_offset, req_local_mem = 0;
-  unsigned num_tokens, num_so_outputs, offlen;
-  uint8_t *shd_text;
-  uint32_t type;
-
-  if (length < VIRGL_OBJ_SHADER_HDR_SIZE(0))
-    return EINVAL;
-
-  type = get_buf_entry(ctx, VIRGL_OBJ_SHADER_TYPE);
-  num_tokens = get_buf_entry(ctx, VIRGL_OBJ_SHADER_NUM_TOKENS);
-  offlen = get_buf_entry(ctx, VIRGL_OBJ_SHADER_OFFSET);
-
-  if (type == PIPE_SHADER_COMPUTE) {
-    req_local_mem = get_buf_entry(ctx, VIRGL_OBJ_SHADER_SO_NUM_OUTPUTS);
-    num_so_outputs = 0;
-  } else {
-    num_so_outputs = get_buf_entry(ctx, VIRGL_OBJ_SHADER_SO_NUM_OUTPUTS);
-    if (length < VIRGL_OBJ_SHADER_HDR_SIZE(num_so_outputs))
-      return EINVAL;
-
-    if (num_so_outputs > PIPE_MAX_SO_OUTPUTS)
-      return EINVAL;
-  }
-
-  shader_offset = 6;
-  if (num_so_outputs) {
-    so_info.num_outputs = num_so_outputs;
-    if (so_info.num_outputs) {
-      for (i = 0; i < 4; i++)
-        so_info.stride[i] = get_buf_entry(ctx, VIRGL_OBJ_SHADER_SO_STRIDE(i));
-      for (i = 0; i < so_info.num_outputs; i++) {
-        uint32_t tmp = get_buf_entry(ctx, VIRGL_OBJ_SHADER_SO_OUTPUT0(i));
-
-        so_info.output[i].register_index = tmp & 0xff;
-        so_info.output[i].start_component = (tmp >> 8) & 0x3;
-        so_info.output[i].num_components = (tmp >> 10) & 0x7;
-        so_info.output[i].output_buffer = (tmp >> 13) & 0x7;
-        so_info.output[i].dst_offset = (tmp >> 16) & 0xffff;
-        tmp = get_buf_entry(ctx, VIRGL_OBJ_SHADER_SO_OUTPUT0_SO(i));
-        so_info.output[i].stream = (tmp & 0x3);
-        so_info.output[i].need_temp = so_info.output[i].num_components < 4;
-      }
-
-      for (i = 0; i < so_info.num_outputs - 1; i++) {
-        for (unsigned j = i + 1; j < so_info.num_outputs; j++) {
-          so_info.output[j].need_temp |= (so_info.output[i].register_index ==
-                                          so_info.output[j].register_index);
-        }
-      }
-    }
-    shader_offset += 4 + (2 * num_so_outputs);
-  } else
-    memset(&so_info, 0, sizeof(so_info));
-
-  shd_text = get_buf_ptr(ctx, shader_offset);
-  ret = vrend_create_shader(ctx->grctx, handle, &so_info, req_local_mem,
-                            (const char *)shd_text, offlen, num_tokens, type,
-                            length - shader_offset + 1);
-
-  return ret;
-}
-
-static int
-vrend_decode_create_stream_output_target(struct vrend_decode_ctx *ctx,
-                                         uint32_t handle, uint16_t length) {
-  uint32_t res_handle, buffer_size, buffer_offset;
-
-  if (length != VIRGL_OBJ_STREAMOUT_SIZE)
-    return EINVAL;
-
-  res_handle = get_buf_entry(ctx, VIRGL_OBJ_STREAMOUT_RES_HANDLE);
-  buffer_offset = get_buf_entry(ctx, VIRGL_OBJ_STREAMOUT_BUFFER_OFFSET);
-  buffer_size = get_buf_entry(ctx, VIRGL_OBJ_STREAMOUT_BUFFER_SIZE);
-
-  return vrend_create_so_target(ctx->grctx, handle, res_handle, buffer_offset,
-                                buffer_size);
-}
-
-static int vrend_decode_set_framebuffer_state(struct vrend_decode_ctx *ctx,
-                                              int length) {
-  if (length < 2)
-    return EINVAL;
-
-  int32_t nr_cbufs = get_buf_entry(ctx, VIRGL_SET_FRAMEBUFFER_STATE_NR_CBUFS);
-  uint32_t zsurf_handle =
-      get_buf_entry(ctx, VIRGL_SET_FRAMEBUFFER_STATE_NR_ZSURF_HANDLE);
-  uint32_t surf_handle[8];
-  int i;
-
-  if (length != (2 + nr_cbufs))
-    return EINVAL;
-
-  if (nr_cbufs > 8)
-    return EINVAL;
-
-  for (i = 0; i < nr_cbufs; i++)
-    surf_handle[i] =
-        get_buf_entry(ctx, VIRGL_SET_FRAMEBUFFER_STATE_CBUF_HANDLE(i));
-  vrend_set_framebuffer_state(ctx->grctx, nr_cbufs, surf_handle, zsurf_handle);
-  return 0;
-}
-
-static int
-vrend_decode_set_framebuffer_state_no_attach(struct vrend_decode_ctx *ctx,
-                                             int length) {
-  uint32_t width, height;
-  uint32_t layers, samples;
-  uint32_t tmp;
-
-  if (length != VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_SIZE)
-    return EINVAL;
-
-  tmp = get_buf_entry(ctx, VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_WIDTH_HEIGHT);
-  width = VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_WIDTH(tmp);
-  height = VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_HEIGHT(tmp);
-
-  tmp =
-      get_buf_entry(ctx, VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_LAYERS_SAMPLES);
-  layers = VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_LAYERS(tmp);
-  samples = VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_SAMPLES(tmp);
-
-  vrend_set_framebuffer_state_no_attach(ctx->grctx, width, height, layers,
-                                        samples);
-  return 0;
-}
-
-static int vrend_decode_clear(struct vrend_decode_ctx *ctx, int length) {
-  union pipe_color_union color;
-  double depth;
-  unsigned stencil, buffers;
-  int i;
-
-  if (length != VIRGL_OBJ_CLEAR_SIZE)
-    return EINVAL;
-  buffers = get_buf_entry(ctx, VIRGL_OBJ_CLEAR_BUFFERS);
-  for (i = 0; i < 4; i++)
-    color.ui[i] = get_buf_entry(ctx, VIRGL_OBJ_CLEAR_COLOR_0 + i);
-  double *depth_ptr =
-      (double *)(uint64_t *)get_buf_ptr(ctx, VIRGL_OBJ_CLEAR_DEPTH_0);
-  memcpy(&depth, depth_ptr, sizeof(double));
-  stencil = get_buf_entry(ctx, VIRGL_OBJ_CLEAR_STENCIL);
-
-  vrend_clear(ctx->grctx, buffers, &color, depth, stencil);
-  return 0;
-}
-
-static float uif(unsigned int ui) {
-  union {
-    float f;
-    unsigned int ui;
-  } myuif;
-  myuif.ui = ui;
-  return myuif.f;
-}
-
-static int vrend_decode_set_viewport_state(struct vrend_decode_ctx *ctx,
-                                           int length) {
-  struct pipe_viewport_state vps[PIPE_MAX_VIEWPORTS];
-  uint i, v;
-  uint32_t num_viewports, start_slot;
-  if (length < 1)
-    return EINVAL;
-
-  if ((length - 1) % 6)
-    return EINVAL;
-
-  num_viewports = (length - 1) / 6;
-  start_slot = get_buf_entry(ctx, VIRGL_SET_VIEWPORT_START_SLOT);
-
-  if (num_viewports > PIPE_MAX_VIEWPORTS ||
-      start_slot > (PIPE_MAX_VIEWPORTS - num_viewports))
-    return EINVAL;
-
-  for (v = 0; v < num_viewports; v++) {
-    for (i = 0; i < 3; i++)
-      vps[v].scale[i] =
-          uif(get_buf_entry(ctx, VIRGL_SET_VIEWPORT_STATE_SCALE_0(v) + i));
-    for (i = 0; i < 3; i++)
-      vps[v].translate[i] =
-          uif(get_buf_entry(ctx, VIRGL_SET_VIEWPORT_STATE_TRANSLATE_0(v) + i));
-  }
-
-  vrend_set_viewport_states(ctx->grctx, start_slot, num_viewports, vps);
-  return 0;
-}
-
-static int vrend_decode_set_index_buffer(struct vrend_decode_ctx *ctx,
-                                         int length) {
-  if (length != 1 && length != 3)
-    return EINVAL;
-  vrend_set_index_buffer(
-      ctx->grctx, get_buf_entry(ctx, VIRGL_SET_INDEX_BUFFER_HANDLE),
-      (length == 3) ? get_buf_entry(ctx, VIRGL_SET_INDEX_BUFFER_INDEX_SIZE) : 0,
-      (length == 3) ? get_buf_entry(ctx, VIRGL_SET_INDEX_BUFFER_OFFSET) : 0);
-  return 0;
-}
-
-static int vrend_decode_set_constant_buffer(struct vrend_decode_ctx *ctx,
-                                            uint16_t length) {
-  uint32_t shader;
-  uint32_t index;
-  int nc = (length - 2);
-
-  if (length < 2)
-    return EINVAL;
-
-  shader = get_buf_entry(ctx, VIRGL_SET_CONSTANT_BUFFER_SHADER_TYPE);
-  index = get_buf_entry(ctx, VIRGL_SET_CONSTANT_BUFFER_INDEX);
-
-  if (shader >= PIPE_SHADER_TYPES)
-    return EINVAL;
-
-  vrend_set_constants(ctx->grctx, shader, index, nc,
-                      get_buf_ptr(ctx, VIRGL_SET_CONSTANT_BUFFER_DATA_START));
-  return 0;
-}
-
-static int vrend_decode_set_uniform_buffer(struct vrend_decode_ctx *ctx,
-                                           int length) {
-  if (length != VIRGL_SET_UNIFORM_BUFFER_SIZE)
-    return EINVAL;
-
-  uint32_t shader = get_buf_entry(ctx, VIRGL_SET_UNIFORM_BUFFER_SHADER_TYPE);
-  uint32_t index = get_buf_entry(ctx, VIRGL_SET_UNIFORM_BUFFER_INDEX);
-  uint32_t offset = get_buf_entry(ctx, VIRGL_SET_UNIFORM_BUFFER_OFFSET);
-  uint32_t blength = get_buf_entry(ctx, VIRGL_SET_UNIFORM_BUFFER_LENGTH);
-  uint32_t handle = get_buf_entry(ctx, VIRGL_SET_UNIFORM_BUFFER_RES_HANDLE);
-
-  if (shader >= PIPE_SHADER_TYPES)
-    return EINVAL;
-
-  if (index >= PIPE_MAX_CONSTANT_BUFFERS)
-    return EINVAL;
-
-  vrend_set_uniform_buffer(ctx->grctx, shader, index, offset, blength, handle);
-  return 0;
-}
-
-static int vrend_decode_set_vertex_buffers(struct vrend_decode_ctx *ctx,
-                                           uint16_t length) {
-  int num_vbo;
-  int i;
-
-  /* must be a multiple of 3 */
-  if (length && (length % 3))
-    return EINVAL;
-
-  num_vbo = (length / 3);
-  if (num_vbo > PIPE_MAX_ATTRIBS)
-    return EINVAL;
-
-  for (i = 0; i < num_vbo; i++) {
-    vrend_set_single_vbo(ctx->grctx, i,
-                         get_buf_entry(ctx, VIRGL_SET_VERTEX_BUFFER_STRIDE(i)),
-                         get_buf_entry(ctx, VIRGL_SET_VERTEX_BUFFER_OFFSET(i)),
-                         get_buf_entry(ctx, VIRGL_SET_VERTEX_BUFFER_HANDLE(i)));
-  }
-  vrend_set_num_vbo(ctx->grctx, num_vbo);
-  return 0;
-}
-
-static int vrend_decode_set_sampler_views(struct vrend_decode_ctx *ctx,
-                                          uint16_t length) {
-  uint32_t num_samps;
-  uint32_t i;
-  uint32_t shader_type;
-  uint32_t start_slot;
-
-  if (length < 2)
-    return EINVAL;
-  num_samps = length - 2;
-  shader_type = get_buf_entry(ctx, VIRGL_SET_SAMPLER_VIEWS_SHADER_TYPE);
-  start_slot = get_buf_entry(ctx, VIRGL_SET_SAMPLER_VIEWS_START_SLOT);
-
-  if (shader_type >= PIPE_SHADER_TYPES)
-    return EINVAL;
-
-  if (num_samps > PIPE_MAX_SHADER_SAMPLER_VIEWS ||
-      start_slot > (PIPE_MAX_SHADER_SAMPLER_VIEWS - num_samps))
-    return EINVAL;
-
-  for (i = 0; i < num_samps; i++) {
-    uint32_t handle = get_buf_entry(ctx, VIRGL_SET_SAMPLER_VIEWS_V0_HANDLE + i);
-    vrend_set_single_sampler_view(ctx->grctx, shader_type, i + start_slot,
-                                  handle);
-  }
-  vrend_set_num_sampler_views(ctx->grctx, shader_type, start_slot, num_samps);
-  return 0;
-}
-
-static void vrend_decode_transfer_common(struct vrend_decode_ctx *ctx,
-                                         struct vrend_transfer_info *info) {
-  info->handle = get_buf_entry(ctx, VIRGL_RESOURCE_IW_RES_HANDLE);
-  info->level = get_buf_entry(ctx, VIRGL_RESOURCE_IW_LEVEL);
-  info->stride = get_buf_entry(ctx, VIRGL_RESOURCE_IW_STRIDE);
-  info->layer_stride = get_buf_entry(ctx, VIRGL_RESOURCE_IW_LAYER_STRIDE);
-  info->box->x = get_buf_entry(ctx, VIRGL_RESOURCE_IW_X);
-  info->box->y = get_buf_entry(ctx, VIRGL_RESOURCE_IW_Y);
-  info->box->z = get_buf_entry(ctx, VIRGL_RESOURCE_IW_Z);
-  info->box->width = get_buf_entry(ctx, VIRGL_RESOURCE_IW_W);
-  info->box->height = get_buf_entry(ctx, VIRGL_RESOURCE_IW_H);
-  info->box->depth = get_buf_entry(ctx, VIRGL_RESOURCE_IW_D);
-}
-
-static int vrend_decode_resource_inline_write(struct vrend_decode_ctx *ctx,
-                                              uint16_t length) {
-  struct pipe_box box;
-  struct vrend_transfer_info info;
-  uint32_t data_len;
-  struct iovec dataiovec;
-  void *data;
-
-  if (length < 12)
-    return EINVAL;
-
-  if (length + ctx->ds->buf_offset > ctx->ds->buf_total)
-    return EINVAL;
-
-  memset(&info, 0, sizeof(info));
-  info.box = &box;
-  vrend_decode_transfer_common(ctx, &info);
-  data_len = (length - 11) * 4;
-  data = get_buf_ptr(ctx, VIRGL_RESOURCE_IW_DATA_START);
-
-  info.ctx_id = 0;
-  info.offset = 0;
-
-  dataiovec.iov_base = data;
-  dataiovec.iov_len = data_len;
-
-  info.iovec = &dataiovec;
-  info.iovec_cnt = 1;
-  return vrend_transfer_inline_write(ctx->grctx, &info);
-}
-
-static int vrend_decode_draw_vbo(struct vrend_decode_ctx *ctx, int length) {
-  struct pipe_draw_info info;
-  uint32_t cso;
-  uint32_t handle = 0, indirect_draw_count_handle = 0;
-  if (length != VIRGL_DRAW_VBO_SIZE && length != VIRGL_DRAW_VBO_SIZE_TESS &&
-      length != VIRGL_DRAW_VBO_SIZE_INDIRECT)
-    return EINVAL;
-  memset(&info, 0, sizeof(struct pipe_draw_info));
-
-  info.start = get_buf_entry(ctx, VIRGL_DRAW_VBO_START);
-  info.count = get_buf_entry(ctx, VIRGL_DRAW_VBO_COUNT);
-  info.mode = get_buf_entry(ctx, VIRGL_DRAW_VBO_MODE);
-  info.indexed = get_buf_entry(ctx, VIRGL_DRAW_VBO_INDEXED);
-  info.instance_count = get_buf_entry(ctx, VIRGL_DRAW_VBO_INSTANCE_COUNT);
-  info.index_bias = get_buf_entry(ctx, VIRGL_DRAW_VBO_INDEX_BIAS);
-  info.start_instance = get_buf_entry(ctx, VIRGL_DRAW_VBO_START_INSTANCE);
-  info.primitive_restart = get_buf_entry(ctx, VIRGL_DRAW_VBO_PRIMITIVE_RESTART);
-  info.restart_index = get_buf_entry(ctx, VIRGL_DRAW_VBO_RESTART_INDEX);
-  info.min_index = get_buf_entry(ctx, VIRGL_DRAW_VBO_MIN_INDEX);
-  info.max_index = get_buf_entry(ctx, VIRGL_DRAW_VBO_MAX_INDEX);
-
-  if (length >= VIRGL_DRAW_VBO_SIZE_TESS) {
-    info.vertices_per_patch =
-        get_buf_entry(ctx, VIRGL_DRAW_VBO_VERTICES_PER_PATCH);
-    info.drawid = get_buf_entry(ctx, VIRGL_DRAW_VBO_DRAWID);
-  }
-
-  if (length == VIRGL_DRAW_VBO_SIZE_INDIRECT) {
-    handle = get_buf_entry(ctx, VIRGL_DRAW_VBO_INDIRECT_HANDLE);
-    info.indirect.offset = get_buf_entry(ctx, VIRGL_DRAW_VBO_INDIRECT_OFFSET);
-    info.indirect.stride = get_buf_entry(ctx, VIRGL_DRAW_VBO_INDIRECT_STRIDE);
-    info.indirect.draw_count =
-        get_buf_entry(ctx, VIRGL_DRAW_VBO_INDIRECT_DRAW_COUNT);
-    info.indirect.indirect_draw_count_offset =
-        get_buf_entry(ctx, VIRGL_DRAW_VBO_INDIRECT_DRAW_COUNT_OFFSET);
-    indirect_draw_count_handle =
-        get_buf_entry(ctx, VIRGL_DRAW_VBO_INDIRECT_DRAW_COUNT_HANDLE);
-  }
-
-  cso = get_buf_entry(ctx, VIRGL_DRAW_VBO_COUNT_FROM_SO);
-
-  return vrend_draw_vbo(ctx->grctx, &info, cso, handle,
-                        indirect_draw_count_handle);
-}
-
-static int vrend_decode_create_blend(struct vrend_decode_ctx *ctx,
-                                     uint32_t handle, uint16_t length) {
-  struct pipe_blend_state *blend_state;
-  uint32_t tmp;
-  int i;
-
-  if (length != VIRGL_OBJ_BLEND_SIZE) {
-    return EINVAL;
-  }
-
-  blend_state = CALLOC_STRUCT(pipe_blend_state);
-  if (!blend_state)
-    return ENOMEM;
-
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_BLEND_S0);
-  blend_state->independent_blend_enable = (tmp & 1);
-  blend_state->logicop_enable = (tmp >> 1) & 0x1;
-  blend_state->dither = (tmp >> 2) & 0x1;
-  blend_state->alpha_to_coverage = (tmp >> 3) & 0x1;
-  blend_state->alpha_to_one = (tmp >> 4) & 0x1;
-
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_BLEND_S1);
-  blend_state->logicop_func = tmp & 0xf;
-
-  for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
-    tmp = get_buf_entry(ctx, VIRGL_OBJ_BLEND_S2(i));
-    blend_state->rt[i].blend_enable = tmp & 0x1;
-    blend_state->rt[i].rgb_func = (tmp >> 1) & 0x7;
-    blend_state->rt[i].rgb_src_factor = (tmp >> 4) & 0x1f;
-    blend_state->rt[i].rgb_dst_factor = (tmp >> 9) & 0x1f;
-    blend_state->rt[i].alpha_func = (tmp >> 14) & 0x7;
-    blend_state->rt[i].alpha_src_factor = (tmp >> 17) & 0x1f;
-    blend_state->rt[i].alpha_dst_factor = (tmp >> 22) & 0x1f;
-    blend_state->rt[i].colormask = (tmp >> 27) & 0xf;
-  }
-
-  tmp = vrend_renderer_object_insert(ctx->grctx, blend_state,
-                                     sizeof(struct pipe_blend_state), handle,
-                                     VIRGL_OBJECT_BLEND);
-  if (tmp == 0) {
-    FREE(blend_state);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static int vrend_decode_create_dsa(struct vrend_decode_ctx *ctx,
-                                   uint32_t handle, uint16_t length) {
-  int i;
-  struct pipe_depth_stencil_alpha_state *dsa_state;
-  uint32_t tmp;
-
-  if (length != VIRGL_OBJ_DSA_SIZE)
-    return EINVAL;
-
-  dsa_state = CALLOC_STRUCT(pipe_depth_stencil_alpha_state);
-  if (!dsa_state)
-    return ENOMEM;
-
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_DSA_S0);
-  dsa_state->depth.enabled = tmp & 0x1;
-  dsa_state->depth.writemask = (tmp >> 1) & 0x1;
-  dsa_state->depth.func = (tmp >> 2) & 0x7;
-
-  dsa_state->alpha.enabled = (tmp >> 8) & 0x1;
-  dsa_state->alpha.func = (tmp >> 9) & 0x7;
-
-  for (i = 0; i < 2; i++) {
-    tmp = get_buf_entry(ctx, VIRGL_OBJ_DSA_S1 + i);
-    dsa_state->stencil[i].enabled = tmp & 0x1;
-    dsa_state->stencil[i].func = (tmp >> 1) & 0x7;
-    dsa_state->stencil[i].fail_op = (tmp >> 4) & 0x7;
-    dsa_state->stencil[i].zpass_op = (tmp >> 7) & 0x7;
-    dsa_state->stencil[i].zfail_op = (tmp >> 10) & 0x7;
-    dsa_state->stencil[i].valuemask = (tmp >> 13) & 0xff;
-    dsa_state->stencil[i].writemask = (tmp >> 21) & 0xff;
-  }
-
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_DSA_ALPHA_REF);
-  dsa_state->alpha.ref_value = uif(tmp);
-
-  tmp = vrend_renderer_object_insert(
-      ctx->grctx, dsa_state, sizeof(struct pipe_depth_stencil_alpha_state),
-      handle, VIRGL_OBJECT_DSA);
-  if (tmp == 0) {
-    FREE(dsa_state);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static int vrend_decode_create_rasterizer(struct vrend_decode_ctx *ctx,
-                                          uint32_t handle, uint16_t length) {
-  struct pipe_rasterizer_state *rs_state;
-  uint32_t tmp;
-
-  if (length != VIRGL_OBJ_RS_SIZE)
-    return EINVAL;
-
-  rs_state = CALLOC_STRUCT(pipe_rasterizer_state);
-  if (!rs_state)
-    return ENOMEM;
-
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_RS_S0);
-#define ebit(name, bit) rs_state->name = (tmp >> bit) & 0x1
-#define emask(name, bit, mask) rs_state->name = (tmp >> bit) & mask
-
-  ebit(flatshade, 0);
-  ebit(depth_clip, 1);
-  ebit(clip_halfz, 2);
-  ebit(rasterizer_discard, 3);
-  ebit(flatshade_first, 4);
-  ebit(light_twoside, 5);
-  ebit(sprite_coord_mode, 6);
-  ebit(point_quad_rasterization, 7);
-  emask(cull_face, 8, 0x3);
-  emask(fill_front, 10, 0x3);
-  emask(fill_back, 12, 0x3);
-  ebit(scissor, 14);
-  ebit(front_ccw, 15);
-  ebit(clamp_vertex_color, 16);
-  ebit(clamp_fragment_color, 17);
-  ebit(offset_line, 18);
-  ebit(offset_point, 19);
-  ebit(offset_tri, 20);
-  ebit(poly_smooth, 21);
-  ebit(poly_stipple_enable, 22);
-  ebit(point_smooth, 23);
-  ebit(point_size_per_vertex, 24);
-  ebit(multisample, 25);
-  ebit(line_smooth, 26);
-  ebit(line_stipple_enable, 27);
-  ebit(line_last_pixel, 28);
-  ebit(half_pixel_center, 29);
-  ebit(bottom_edge_rule, 30);
-  ebit(force_persample_interp, 31);
-  rs_state->point_size = uif(get_buf_entry(ctx, VIRGL_OBJ_RS_POINT_SIZE));
-  rs_state->sprite_coord_enable =
-      get_buf_entry(ctx, VIRGL_OBJ_RS_SPRITE_COORD_ENABLE);
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_RS_S3);
-  emask(line_stipple_pattern, 0, 0xffff);
-  emask(line_stipple_factor, 16, 0xff);
-  emask(clip_plane_enable, 24, 0xff);
-
-  rs_state->line_width = uif(get_buf_entry(ctx, VIRGL_OBJ_RS_LINE_WIDTH));
-  rs_state->offset_units = uif(get_buf_entry(ctx, VIRGL_OBJ_RS_OFFSET_UNITS));
-  rs_state->offset_scale = uif(get_buf_entry(ctx, VIRGL_OBJ_RS_OFFSET_SCALE));
-  rs_state->offset_clamp = uif(get_buf_entry(ctx, VIRGL_OBJ_RS_OFFSET_CLAMP));
-
-  tmp = vrend_renderer_object_insert(ctx->grctx, rs_state,
-                                     sizeof(struct pipe_rasterizer_state),
-                                     handle, VIRGL_OBJECT_RASTERIZER);
-  if (tmp == 0) {
-    FREE(rs_state);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static int vrend_decode_create_surface(struct vrend_decode_ctx *ctx,
-                                       uint32_t handle, uint16_t length) {
-  uint32_t res_handle, format, val0, val1;
-  int ret;
-
-  if (length != VIRGL_OBJ_SURFACE_SIZE)
-    return EINVAL;
-
-  res_handle = get_buf_entry(ctx, VIRGL_OBJ_SURFACE_RES_HANDLE);
-  format = get_buf_entry(ctx, VIRGL_OBJ_SURFACE_FORMAT);
-  /* decide later if these are texture or buffer */
-  val0 = get_buf_entry(ctx, VIRGL_OBJ_SURFACE_BUFFER_FIRST_ELEMENT);
-  val1 = get_buf_entry(ctx, VIRGL_OBJ_SURFACE_BUFFER_LAST_ELEMENT);
-  ret =
-      vrend_create_surface(ctx->grctx, handle, res_handle, format, val0, val1);
-  return ret;
-}
-
-static int vrend_decode_create_sampler_view(struct vrend_decode_ctx *ctx,
-                                            uint32_t handle, uint16_t length) {
-  uint32_t res_handle, format, val0, val1, swizzle_packed;
-
-  if (length != VIRGL_OBJ_SAMPLER_VIEW_SIZE)
-    return EINVAL;
-
-  res_handle = get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_VIEW_RES_HANDLE);
-  format = get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_VIEW_FORMAT);
-  val0 = get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_VIEW_BUFFER_FIRST_ELEMENT);
-  val1 = get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_VIEW_BUFFER_LAST_ELEMENT);
-  swizzle_packed = get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_VIEW_SWIZZLE);
-  return vrend_create_sampler_view(ctx->grctx, handle, res_handle, format, val0,
-                                   val1, swizzle_packed);
-}
-
-static int vrend_decode_create_sampler_state(struct vrend_decode_ctx *ctx,
-                                             uint32_t handle, uint16_t length) {
-  struct pipe_sampler_state state;
-  int i;
-  uint32_t tmp;
-
-  if (length != VIRGL_OBJ_SAMPLER_STATE_SIZE)
-    return EINVAL;
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_STATE_S0);
-  state.wrap_s = tmp & 0x7;
-  state.wrap_t = (tmp >> 3) & 0x7;
-  state.wrap_r = (tmp >> 6) & 0x7;
-  state.min_img_filter = (tmp >> 9) & 0x3;
-  state.min_mip_filter = (tmp >> 11) & 0x3;
-  state.mag_img_filter = (tmp >> 13) & 0x3;
-  state.compare_mode = (tmp >> 15) & 0x1;
-  state.compare_func = (tmp >> 16) & 0x7;
-  state.seamless_cube_map = (tmp >> 19) & 0x1;
-
-  state.lod_bias = uif(get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_STATE_LOD_BIAS));
-  state.min_lod = uif(get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_STATE_MIN_LOD));
-  state.max_lod = uif(get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_STATE_MAX_LOD));
-
-  for (i = 0; i < 4; i++)
-    state.border_color.ui[i] =
-        get_buf_entry(ctx, VIRGL_OBJ_SAMPLER_STATE_BORDER_COLOR(i));
-
-  if (state.min_mip_filter != PIPE_TEX_MIPFILTER_NONE &&
-      state.min_mip_filter != PIPE_TEX_MIPFILTER_LINEAR &&
-      state.min_mip_filter != PIPE_TEX_MIPFILTER_NEAREST)
-    return EINVAL;
-
-  return vrend_create_sampler_state(ctx->grctx, handle, &state);
-}
-
-static int vrend_decode_create_ve(struct vrend_decode_ctx *ctx, uint32_t handle,
-                                  uint16_t length) {
-  struct pipe_vertex_element *ve = NULL;
-  int num_elements;
-  int i;
-  int ret;
-
-  if (length < 1)
-    return EINVAL;
-
-  if ((length - 1) % 4)
-    return EINVAL;
-
-  num_elements = (length - 1) / 4;
-
-  if (num_elements) {
-    ve = calloc(num_elements, sizeof(struct pipe_vertex_element));
-
-    if (!ve)
-      return ENOMEM;
-
-    for (i = 0; i < num_elements; i++) {
-      ve[i].src_offset =
-          get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_OFFSET(i));
-      ve[i].instance_divisor =
-          get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_INSTANCE_DIVISOR(i));
-      ve[i].vertex_buffer_index = get_buf_entry(
-          ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_VERTEX_BUFFER_INDEX(i));
-
-      if (ve[i].vertex_buffer_index >= PIPE_MAX_ATTRIBS) {
-        FREE(ve);
-        return EINVAL;
-      }
-
-      ve[i].src_format =
-          get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_FORMAT(i));
-    }
-  }
-
-  ret =
-      vrend_create_vertex_elements_state(ctx->grctx, handle, num_elements, ve);
-
-  FREE(ve);
-  return ret;
-}
-
-static int vrend_decode_create_query(struct vrend_decode_ctx *ctx,
-                                     uint32_t handle, uint16_t length) {
-  uint32_t query_type;
-  uint32_t query_index;
-  uint32_t res_handle;
-  uint32_t offset;
-  uint32_t tmp;
-
-  if (length != VIRGL_OBJ_QUERY_SIZE)
-    return EINVAL;
-
-  tmp = get_buf_entry(ctx, VIRGL_OBJ_QUERY_TYPE_INDEX);
-  query_type = VIRGL_OBJ_QUERY_TYPE(tmp);
-  query_index = (tmp >> 16) & 0xffff;
-
-  offset = get_buf_entry(ctx, VIRGL_OBJ_QUERY_OFFSET);
-  res_handle = get_buf_entry(ctx, VIRGL_OBJ_QUERY_RES_HANDLE);
-
-  return vrend_create_query(ctx->grctx, handle, query_type, query_index,
-                            res_handle, offset);
-}
-
-static int vrend_decode_create_object(struct vrend_decode_ctx *ctx,
-                                      int length) {
-  if (length < 1)
-    return EINVAL;
-
-  uint32_t header = get_buf_entry(ctx, VIRGL_OBJ_CREATE_HEADER);
-  uint32_t handle = get_buf_entry(ctx, VIRGL_OBJ_CREATE_HANDLE);
-  uint8_t obj_type = (header >> 8) & 0xff;
-  int ret = 0;
-
-  if (handle == 0)
-    return EINVAL;
-
-  switch (obj_type) {
-  case VIRGL_OBJECT_BLEND:
-    ret = vrend_decode_create_blend(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_DSA:
-    ret = vrend_decode_create_dsa(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_RASTERIZER:
-    ret = vrend_decode_create_rasterizer(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_SHADER:
-    ret = vrend_decode_create_shader(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_VERTEX_ELEMENTS:
-    ret = vrend_decode_create_ve(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_SURFACE:
-    ret = vrend_decode_create_surface(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_SAMPLER_VIEW:
-    ret = vrend_decode_create_sampler_view(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_SAMPLER_STATE:
-    ret = vrend_decode_create_sampler_state(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_QUERY:
-    ret = vrend_decode_create_query(ctx, handle, length);
-    break;
-  case VIRGL_OBJECT_STREAMOUT_TARGET:
-    ret = vrend_decode_create_stream_output_target(ctx, handle, length);
-    break;
-  default:
-    return EINVAL;
-  }
-
-  return ret;
-}
-
-static int vrend_decode_bind_object(struct vrend_decode_ctx *ctx,
-                                    uint16_t length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t header = get_buf_entry(ctx, VIRGL_OBJ_BIND_HEADER);
-  uint32_t handle = get_buf_entry(ctx, VIRGL_OBJ_BIND_HANDLE);
-  uint8_t obj_type = (header >> 8) & 0xff;
-
-  switch (obj_type) {
-  case VIRGL_OBJECT_BLEND:
-    vrend_object_bind_blend(ctx->grctx, handle);
-    break;
-  case VIRGL_OBJECT_DSA:
-    vrend_object_bind_dsa(ctx->grctx, handle);
-    break;
-  case VIRGL_OBJECT_RASTERIZER:
-    vrend_object_bind_rasterizer(ctx->grctx, handle);
-    break;
-  case VIRGL_OBJECT_VERTEX_ELEMENTS:
-    vrend_bind_vertex_elements_state(ctx->grctx, handle);
-    break;
-  default:
-    return EINVAL;
-  }
-
-  return 0;
-}
-
-static int vrend_decode_destroy_object(struct vrend_decode_ctx *ctx,
-                                       int length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t handle = get_buf_entry(ctx, VIRGL_OBJ_DESTROY_HANDLE);
-
-  vrend_renderer_object_destroy(ctx->grctx, handle);
-  return 0;
-}
-
-static int vrend_decode_set_stencil_ref(struct vrend_decode_ctx *ctx,
-                                        int length) {
-  if (length != VIRGL_SET_STENCIL_REF_SIZE)
-    return EINVAL;
-
-  struct pipe_stencil_ref ref;
-  uint32_t val = get_buf_entry(ctx, VIRGL_SET_STENCIL_REF);
-
-  ref.ref_value[0] = val & 0xff;
-  ref.ref_value[1] = (val >> 8) & 0xff;
-  vrend_set_stencil_ref(ctx->grctx, &ref);
-  return 0;
-}
-
-static int vrend_decode_set_blend_color(struct vrend_decode_ctx *ctx,
-                                        int length) {
-  struct pipe_blend_color color;
-  int i;
-
-  if (length != VIRGL_SET_BLEND_COLOR_SIZE)
-    return EINVAL;
-
-  for (i = 0; i < 4; i++)
-    color.color[i] = uif(get_buf_entry(ctx, VIRGL_SET_BLEND_COLOR(i)));
-
-  vrend_set_blend_color(ctx->grctx, &color);
-  return 0;
-}
-
-static int vrend_decode_set_scissor_state(struct vrend_decode_ctx *ctx,
-                                          int length) {
-  struct pipe_scissor_state ss[PIPE_MAX_VIEWPORTS];
-  uint32_t temp;
-  int32_t num_scissor;
-  uint32_t start_slot;
-  int s;
-  if (length < 1)
-    return EINVAL;
-
-  if ((length - 1) % 2)
-    return EINVAL;
-
-  num_scissor = (length - 1) / 2;
-  if (num_scissor > PIPE_MAX_VIEWPORTS)
-    return EINVAL;
-
-  start_slot = get_buf_entry(ctx, VIRGL_SET_SCISSOR_START_SLOT);
-
-  for (s = 0; s < num_scissor; s++) {
-    temp = get_buf_entry(ctx, VIRGL_SET_SCISSOR_MINX_MINY(s));
-    ss[s].minx = temp & 0xffff;
-    ss[s].miny = (temp >> 16) & 0xffff;
-
-    temp = get_buf_entry(ctx, VIRGL_SET_SCISSOR_MAXX_MAXY(s));
-    ss[s].maxx = temp & 0xffff;
-    ss[s].maxy = (temp >> 16) & 0xffff;
-  }
-
-  vrend_set_scissor_state(ctx->grctx, start_slot, num_scissor, ss);
-  return 0;
-}
-
-static int vrend_decode_set_polygon_stipple(struct vrend_decode_ctx *ctx,
-                                            int length) {
-  struct pipe_poly_stipple ps;
-  int i;
-
-  if (length != VIRGL_POLYGON_STIPPLE_SIZE)
-    return EINVAL;
-
-  for (i = 0; i < 32; i++)
-    ps.stipple[i] = get_buf_entry(ctx, VIRGL_POLYGON_STIPPLE_P0 + i);
-
-  vrend_set_polygon_stipple(ctx->grctx, &ps);
-  return 0;
-}
-
-static int vrend_decode_set_clip_state(struct vrend_decode_ctx *ctx,
-                                       int length) {
-  struct pipe_clip_state clip;
-  int i, j;
-
-  if (length != VIRGL_SET_CLIP_STATE_SIZE)
-    return EINVAL;
-
-  for (i = 0; i < 8; i++)
-    for (j = 0; j < 4; j++)
-      clip.ucp[i][j] =
-          uif(get_buf_entry(ctx, VIRGL_SET_CLIP_STATE_C0 + (i * 4) + j));
-  vrend_set_clip_state(ctx->grctx, &clip);
-  return 0;
-}
-
-static int vrend_decode_set_sample_mask(struct vrend_decode_ctx *ctx,
-                                        int length) {
-  unsigned mask;
-
-  if (length != VIRGL_SET_SAMPLE_MASK_SIZE)
-    return EINVAL;
-  mask = get_buf_entry(ctx, VIRGL_SET_SAMPLE_MASK_MASK);
-  vrend_set_sample_mask(ctx->grctx, mask);
-  return 0;
-}
-
-static int vrend_decode_set_min_samples(struct vrend_decode_ctx *ctx,
-                                        int length) {
-  unsigned min_samples;
-
-  if (length != VIRGL_SET_MIN_SAMPLES_SIZE)
-    return EINVAL;
-  min_samples = get_buf_entry(ctx, VIRGL_SET_MIN_SAMPLES_MASK);
-  vrend_set_min_samples(ctx->grctx, min_samples);
-  return 0;
-}
-
-static int vrend_decode_resource_copy_region(struct vrend_decode_ctx *ctx,
-                                             int length) {
-  struct pipe_box box;
-  uint32_t dst_handle, src_handle;
-  uint32_t dst_level, dstx, dsty, dstz;
-  uint32_t src_level;
-
-  if (length != VIRGL_CMD_RESOURCE_COPY_REGION_SIZE)
-    return EINVAL;
-
-  dst_handle = get_buf_entry(ctx, VIRGL_CMD_RCR_DST_RES_HANDLE);
-  dst_level = get_buf_entry(ctx, VIRGL_CMD_RCR_DST_LEVEL);
-  dstx = get_buf_entry(ctx, VIRGL_CMD_RCR_DST_X);
-  dsty = get_buf_entry(ctx, VIRGL_CMD_RCR_DST_Y);
-  dstz = get_buf_entry(ctx, VIRGL_CMD_RCR_DST_Z);
-  src_handle = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_RES_HANDLE);
-  src_level = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_LEVEL);
-  box.x = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_X);
-  box.y = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_Y);
-  box.z = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_Z);
-  box.width = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_W);
-  box.height = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_H);
-  box.depth = get_buf_entry(ctx, VIRGL_CMD_RCR_SRC_D);
-
-  vrend_renderer_resource_copy_region(ctx->grctx, dst_handle, dst_level, dstx,
-                                      dsty, dstz, src_handle, src_level, &box);
-  return 0;
-}
-
-static int vrend_decode_blit(struct vrend_decode_ctx *ctx, int length) {
-  struct pipe_blit_info info;
-  uint32_t dst_handle, src_handle, temp;
-
-  if (length != VIRGL_CMD_BLIT_SIZE)
-    return EINVAL;
-  temp = get_buf_entry(ctx, VIRGL_CMD_BLIT_S0);
-  info.mask = temp & 0xff;
-  info.filter = (temp >> 8) & 0x3;
-  info.scissor_enable = (temp >> 10) & 0x1;
-  info.render_condition_enable = (temp >> 11) & 0x1;
-  info.alpha_blend = (temp >> 12) & 0x1;
-  temp = get_buf_entry(ctx, VIRGL_CMD_BLIT_SCISSOR_MINX_MINY);
-  info.scissor.minx = temp & 0xffff;
-  info.scissor.miny = (temp >> 16) & 0xffff;
-  temp = get_buf_entry(ctx, VIRGL_CMD_BLIT_SCISSOR_MAXX_MAXY);
-  info.scissor.maxx = temp & 0xffff;
-  info.scissor.maxy = (temp >> 16) & 0xffff;
-  dst_handle = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_RES_HANDLE);
-  info.dst.level = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_LEVEL);
-  info.dst.format = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_FORMAT);
-  info.dst.box.x = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_X);
-  info.dst.box.y = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_Y);
-  info.dst.box.z = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_Z);
-  info.dst.box.width = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_W);
-  info.dst.box.height = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_H);
-  info.dst.box.depth = get_buf_entry(ctx, VIRGL_CMD_BLIT_DST_D);
-
-  src_handle = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_RES_HANDLE);
-  info.src.level = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_LEVEL);
-  info.src.format = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_FORMAT);
-  info.src.box.x = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_X);
-  info.src.box.y = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_Y);
-  info.src.box.z = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_Z);
-  info.src.box.width = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_W);
-  info.src.box.height = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_H);
-  info.src.box.depth = get_buf_entry(ctx, VIRGL_CMD_BLIT_SRC_D);
-
-  vrend_renderer_blit(ctx->grctx, dst_handle, src_handle, &info);
-  return 0;
-}
-
-static int vrend_decode_bind_sampler_states(struct vrend_decode_ctx *ctx,
-                                            int length) {
-  if (length < 2)
-    return EINVAL;
-
-  uint32_t shader_type =
-      get_buf_entry(ctx, VIRGL_BIND_SAMPLER_STATES_SHADER_TYPE);
-  uint32_t start_slot =
-      get_buf_entry(ctx, VIRGL_BIND_SAMPLER_STATES_START_SLOT);
-  uint32_t num_states = length - 2;
-
-  if (shader_type >= PIPE_SHADER_TYPES)
-    return EINVAL;
-
-  vrend_bind_sampler_states(
-      ctx->grctx, shader_type, start_slot, num_states,
-      get_buf_ptr(ctx, VIRGL_BIND_SAMPLER_STATES_S0_HANDLE));
-  return 0;
-}
-
-static int vrend_decode_begin_query(struct vrend_decode_ctx *ctx, int length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t handle = get_buf_entry(ctx, VIRGL_QUERY_BEGIN_HANDLE);
-
-  return vrend_begin_query(ctx->grctx, handle);
-}
-
-static int vrend_decode_end_query(struct vrend_decode_ctx *ctx, int length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t handle = get_buf_entry(ctx, VIRGL_QUERY_END_HANDLE);
-
-  return vrend_end_query(ctx->grctx, handle);
-}
-
-static int vrend_decode_get_query_result(struct vrend_decode_ctx *ctx,
-                                         int length) {
-  if (length != 2)
-    return EINVAL;
-
-  uint32_t handle = get_buf_entry(ctx, VIRGL_QUERY_RESULT_HANDLE);
-  uint32_t wait = get_buf_entry(ctx, VIRGL_QUERY_RESULT_WAIT);
-
-  vrend_get_query_result(ctx->grctx, handle, wait);
-  return 0;
-}
-
-static int vrend_decode_set_sub_ctx(struct vrend_decode_ctx *ctx, int length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t ctx_sub_id = get_buf_entry(ctx, 1);
-
-  vrend_renderer_set_sub_ctx(ctx->grctx, ctx_sub_id);
-  return 0;
-}
-
-static int vrend_decode_create_sub_ctx(struct vrend_decode_ctx *ctx,
-                                       int length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t ctx_sub_id = get_buf_entry(ctx, 1);
-
-  vrend_renderer_create_sub_ctx(ctx->grctx, ctx_sub_id);
-  return 0;
-}
-
-static int vrend_decode_destroy_sub_ctx(struct vrend_decode_ctx *ctx,
-                                        int length) {
-  if (length != 1)
-    return EINVAL;
-
-  uint32_t ctx_sub_id = get_buf_entry(ctx, 1);
-
-  vrend_renderer_destroy_sub_ctx(ctx->grctx, ctx_sub_id);
-  return 0;
-}
-
-static int vrend_decode_bind_shader(struct vrend_decode_ctx *ctx, int length) {
-  uint32_t handle, type;
-  if (length != VIRGL_BIND_SHADER_SIZE)
-    return EINVAL;
-
-  handle = get_buf_entry(ctx, VIRGL_BIND_SHADER_HANDLE);
-  type = get_buf_entry(ctx, VIRGL_BIND_SHADER_TYPE);
-
-  vrend_bind_shader(ctx->grctx, handle, type);
-  return 0;
-}
-
-static int vrend_decode_set_tess_state(struct vrend_decode_ctx *ctx,
-                                       int length) {
-  float tess_factors[6];
-  int i;
-
-  if (length != VIRGL_TESS_STATE_SIZE)
-    return EINVAL;
-
-  for (i = 0; i < 6; i++) {
-    tess_factors[i] = uif(get_buf_entry(ctx, i + 1));
-  }
-  vrend_set_tess_state(ctx->grctx, tess_factors);
-  return 0;
-}
-
-static int vrend_decode_set_shader_buffers(struct vrend_decode_ctx *ctx,
-                                           uint16_t length) {
-  uint32_t num_ssbo;
-  uint32_t shader_type, start_slot;
-
-  if (length < 2)
-    return EINVAL;
-
-  num_ssbo = (length - 2) / VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE;
-  shader_type = get_buf_entry(ctx, VIRGL_SET_SHADER_BUFFER_SHADER_TYPE);
-  start_slot = get_buf_entry(ctx, VIRGL_SET_SHADER_BUFFER_START_SLOT);
-  if (shader_type >= PIPE_SHADER_TYPES)
-    return EINVAL;
-
-  if (num_ssbo < 1)
-    return 0;
-
-  if (start_slot > PIPE_MAX_SHADER_BUFFERS ||
-      start_slot > PIPE_MAX_SHADER_BUFFERS - num_ssbo)
-    return EINVAL;
-
-  for (uint32_t i = 0; i < num_ssbo; i++) {
-    uint32_t offset = get_buf_entry(ctx, VIRGL_SET_SHADER_BUFFER_OFFSET(i));
-    uint32_t buf_len = get_buf_entry(ctx, VIRGL_SET_SHADER_BUFFER_LENGTH(i));
-    uint32_t handle = get_buf_entry(ctx, VIRGL_SET_SHADER_BUFFER_RES_HANDLE(i));
-    vrend_set_single_ssbo(ctx->grctx, shader_type, start_slot + i, offset,
-                          buf_len, handle);
-  }
-  return 0;
-}
-
-static int vrend_decode_set_atomic_buffers(struct vrend_decode_ctx *ctx,
-                                           uint16_t length) {
-  uint32_t num_abo;
-  uint32_t start_slot;
-
-  if (length < 2)
-    return EINVAL;
-
-  num_abo = (length - 1) / VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE;
-  start_slot = get_buf_entry(ctx, VIRGL_SET_ATOMIC_BUFFER_START_SLOT);
-  if (num_abo < 1)
-    return 0;
-
-  if (start_slot > PIPE_MAX_HW_ATOMIC_BUFFERS ||
-      start_slot > PIPE_MAX_HW_ATOMIC_BUFFERS - num_abo)
-    return EINVAL;
-
-  for (uint32_t i = 0; i < num_abo; i++) {
-    uint32_t offset =
-        get_buf_entry(ctx, i * VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE + 2);
-    uint32_t buf_len =
-        get_buf_entry(ctx, i * VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE + 3);
-    uint32_t handle =
-        get_buf_entry(ctx, i * VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE + 4);
-    vrend_set_single_abo(ctx->grctx, start_slot + i, offset, buf_len, handle);
-  }
-
-  return 0;
-}
-
-static int vrend_decode_set_shader_images(struct vrend_decode_ctx *ctx,
-                                          uint16_t length) {
-  uint32_t num_images;
-  uint32_t shader_type, start_slot;
-  if (length < 2)
-    return EINVAL;
-
-  num_images = (length - 2) / VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE;
-  shader_type = get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_SHADER_TYPE);
-  start_slot = get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_START_SLOT);
-  if (shader_type >= PIPE_SHADER_TYPES)
-    return EINVAL;
-
-  if (num_images < 1) {
-    return 0;
-  }
-  if (start_slot > PIPE_MAX_SHADER_IMAGES ||
-      start_slot > PIPE_MAX_SHADER_IMAGES - num_images)
-    return EINVAL;
-
-  for (uint32_t i = 0; i < num_images; i++) {
-    uint32_t format = get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_FORMAT(i));
-    uint32_t access = get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_ACCESS(i));
-    uint32_t layer_offset =
-        get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_LAYER_OFFSET(i));
-    uint32_t level_size =
-        get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_LEVEL_SIZE(i));
-    uint32_t handle = get_buf_entry(ctx, VIRGL_SET_SHADER_IMAGE_RES_HANDLE(i));
-    vrend_set_single_image_view(ctx->grctx, shader_type, start_slot + i, format,
-                                access, layer_offset, level_size, handle);
-  }
-  return 0;
-}
-
-static int vrend_decode_memory_barrier(struct vrend_decode_ctx *ctx,
-                                       uint16_t length) {
-  if (length != VIRGL_MEMORY_BARRIER_SIZE)
-    return EINVAL;
-
-  unsigned flags = get_buf_entry(ctx, VIRGL_MEMORY_BARRIER_FLAGS);
-  vrend_memory_barrier(ctx->grctx, flags);
-  return 0;
-}
-
-static int vrend_decode_launch_grid(struct vrend_decode_ctx *ctx,
-                                    uint16_t length) {
-  uint32_t block[3], grid[3];
-  uint32_t indirect_handle, indirect_offset;
-  if (length != VIRGL_LAUNCH_GRID_SIZE)
-    return EINVAL;
-
-  block[0] = get_buf_entry(ctx, VIRGL_LAUNCH_BLOCK_X);
-  block[1] = get_buf_entry(ctx, VIRGL_LAUNCH_BLOCK_Y);
-  block[2] = get_buf_entry(ctx, VIRGL_LAUNCH_BLOCK_Z);
-  grid[0] = get_buf_entry(ctx, VIRGL_LAUNCH_GRID_X);
-  grid[1] = get_buf_entry(ctx, VIRGL_LAUNCH_GRID_Y);
-  grid[2] = get_buf_entry(ctx, VIRGL_LAUNCH_GRID_Z);
-  indirect_handle = get_buf_entry(ctx, VIRGL_LAUNCH_INDIRECT_HANDLE);
-  indirect_offset = get_buf_entry(ctx, VIRGL_LAUNCH_INDIRECT_OFFSET);
-  vrend_launch_grid(ctx->grctx, block, grid, indirect_handle, indirect_offset);
-  return 0;
-}
-
-static int vrend_decode_set_streamout_targets(struct vrend_decode_ctx *ctx,
-                                              uint16_t length) {
-  uint32_t handles[16];
-  uint32_t num_handles = length - 1;
-  uint32_t append_bitmask;
-  uint i;
-
-  if (length < 1)
-    return EINVAL;
-  if (num_handles > ARRAY_SIZE(handles))
-    return EINVAL;
-
-  append_bitmask =
-      get_buf_entry(ctx, VIRGL_SET_STREAMOUT_TARGETS_APPEND_BITMASK);
-  for (i = 0; i < num_handles; i++)
-    handles[i] = get_buf_entry(ctx, VIRGL_SET_STREAMOUT_TARGETS_H0 + i);
-  vrend_set_streamout_targets(ctx->grctx, append_bitmask, num_handles, handles);
-  return 0;
-}
-
-static int vrend_decode_transfer3d(struct virgl_client *client,
-                                   struct vrend_decode_ctx *ctx, int length,
-                                   uint32_t ctx_id) {
-  struct pipe_box box;
-  struct vrend_transfer_info info;
-
-  if (length < VIRGL_TRANSFER3D_SIZE)
-    return EINVAL;
-
-  memset(&info, 0, sizeof(info));
-  info.box = &box;
-  info.ctx_id = ctx_id;
-  vrend_decode_transfer_common(ctx, &info);
-  info.offset = get_buf_entry(ctx, VIRGL_TRANSFER3D_DATA_OFFSET);
-  int transfer_mode = get_buf_entry(ctx, VIRGL_TRANSFER3D_DIRECTION);
-  info.context0 = false;
-
-  if (transfer_mode != VIRGL_TRANSFER_TO_HOST &&
-      transfer_mode != VIRGL_TRANSFER_FROM_HOST)
-    return EINVAL;
-
-  return vrend_renderer_transfer_iov(client, &info, transfer_mode);
-}
-
-static int vrend_decode_copy_transfer3d(struct vrend_decode_ctx *ctx,
-                                        int length) {
-  struct pipe_box box;
-  struct vrend_transfer_info info;
-  uint32_t src_handle;
-
-  if (length != VIRGL_COPY_TRANSFER3D_SIZE)
-    return EINVAL;
-
-  memset(&info, 0, sizeof(info));
-  info.box = &box;
-  vrend_decode_transfer_common(ctx, &info);
-  info.offset = get_buf_entry(ctx, VIRGL_COPY_TRANSFER3D_SRC_RES_OFFSET);
-  info.synchronized =
-      (get_buf_entry(ctx, VIRGL_COPY_TRANSFER3D_SYNCHRONIZED) != 0);
-
-  src_handle = get_buf_entry(ctx, VIRGL_COPY_TRANSFER3D_SRC_RES_HANDLE);
-
-  return vrend_renderer_copy_transfer3d(ctx->grctx, &info, src_handle);
-}
-
-void vrend_renderer_context_create_internal(struct virgl_client *client,
-                                            uint32_t handle) {
-  struct vrend_decode_ctx *dctx;
-
-  if (handle >= VREND_MAX_CTX)
-    return;
-
-  dctx = client->dec_ctx[handle];
-  if (dctx)
-    return;
-
-  dctx = malloc(sizeof(struct vrend_decode_ctx));
-  if (!dctx)
-    return;
-
-  dctx->grctx = vrend_create_context(client, handle);
-  if (!dctx->grctx) {
-    free(dctx);
-    return;
-  }
-
-  dctx->ds = &dctx->ids;
-  client->dec_ctx[handle] = dctx;
-}
-
-int vrend_renderer_context_create(struct virgl_client *client,
-                                  uint32_t handle) {
-  if (handle >= VREND_MAX_CTX)
-    return EINVAL;
-
-  /* context 0 is always available with no guarantees */
-  if (handle == 0)
-    return EINVAL;
-
-  vrend_renderer_context_create_internal(client, handle);
-  return 0;
-}
-
-void vrend_renderer_context_destroy(struct virgl_client *client,
-                                    uint32_t handle) {
-  struct vrend_decode_ctx *ctx;
-  bool ret;
-
-  if (handle >= VREND_MAX_CTX)
-    return;
-
-  /* never destroy context 0 here, it will be destroyed in
-   * vrend_decode_reset()*/
-  if (handle == 0) {
-    return;
-  }
-
-  ctx = client->dec_ctx[handle];
-  if (!ctx)
-    return;
-
-  client->dec_ctx[handle] = NULL;
-  ret = vrend_destroy_context(ctx->grctx);
-  free(ctx);
-  /* switch to ctx 0 */
-  if (ret && handle != 0)
-    vrend_hw_switch_context(client->dec_ctx[0]->grctx, true);
-}
-
-struct vrend_context *vrend_lookup_renderer_ctx(struct virgl_client *client,
-                                                uint32_t ctx_id) {
-  if (ctx_id >= VREND_MAX_CTX)
-    return NULL;
-
-  if (!client->dec_ctx[ctx_id])
-    return NULL;
-
-  return client->dec_ctx[ctx_id]->grctx;
-}
-
-int vrend_decode_block(struct virgl_client *client, uint32_t ctx_id,
-                       uint32_t *block, int ndw) {
-  struct vrend_decode_ctx *gdctx;
-  bool bret;
-  int ret;
-  if (ctx_id >= VREND_MAX_CTX)
-    return EINVAL;
-
-  if (client->dec_ctx[ctx_id] == NULL)
-    return EINVAL;
-
-  gdctx = client->dec_ctx[ctx_id];
-
-  bret = vrend_hw_switch_context(gdctx->grctx, true);
-  if (bret == false)
-    return EINVAL;
-
-  gdctx->ds->buf = block;
-  gdctx->ds->buf_total = ndw;
-  gdctx->ds->buf_offset = 0;
-
-  while (gdctx->ds->buf_offset < gdctx->ds->buf_total) {
-    uint32_t header = gdctx->ds->buf[gdctx->ds->buf_offset];
-    uint32_t len = header >> 16;
-
-    ret = 0;
-    /* check if the guest is doing something bad */
-    if (gdctx->ds->buf_offset + len + 1 > gdctx->ds->buf_total)
-      break;
-
-    switch (header & 0xff) {
-    case VIRGL_CCMD_CREATE_OBJECT:
-      ret = vrend_decode_create_object(gdctx, len);
-      break;
-    case VIRGL_CCMD_BIND_OBJECT:
-      ret = vrend_decode_bind_object(gdctx, len);
-      break;
-    case VIRGL_CCMD_DESTROY_OBJECT:
-      ret = vrend_decode_destroy_object(gdctx, len);
-      break;
-    case VIRGL_CCMD_CLEAR:
-      ret = vrend_decode_clear(gdctx, len);
-      break;
-    case VIRGL_CCMD_DRAW_VBO:
-      ret = vrend_decode_draw_vbo(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_FRAMEBUFFER_STATE:
-      ret = vrend_decode_set_framebuffer_state(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_VERTEX_BUFFERS:
-      ret = vrend_decode_set_vertex_buffers(gdctx, len);
-      break;
-    case VIRGL_CCMD_RESOURCE_INLINE_WRITE:
-      ret = vrend_decode_resource_inline_write(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_VIEWPORT_STATE:
-      ret = vrend_decode_set_viewport_state(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_SAMPLER_VIEWS:
-      ret = vrend_decode_set_sampler_views(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_INDEX_BUFFER:
-      ret = vrend_decode_set_index_buffer(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_CONSTANT_BUFFER:
-      ret = vrend_decode_set_constant_buffer(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_STENCIL_REF:
-      ret = vrend_decode_set_stencil_ref(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_BLEND_COLOR:
-      ret = vrend_decode_set_blend_color(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_SCISSOR_STATE:
-      ret = vrend_decode_set_scissor_state(gdctx, len);
-      break;
-    case VIRGL_CCMD_BLIT:
-      ret = vrend_decode_blit(gdctx, len);
-      break;
-    case VIRGL_CCMD_RESOURCE_COPY_REGION:
-      ret = vrend_decode_resource_copy_region(gdctx, len);
-      break;
-    case VIRGL_CCMD_BIND_SAMPLER_STATES:
-      ret = vrend_decode_bind_sampler_states(gdctx, len);
-      break;
-    case VIRGL_CCMD_BEGIN_QUERY:
-      ret = vrend_decode_begin_query(gdctx, len);
-      break;
-    case VIRGL_CCMD_END_QUERY:
-      ret = vrend_decode_end_query(gdctx, len);
-      break;
-    case VIRGL_CCMD_GET_QUERY_RESULT:
-      ret = vrend_decode_get_query_result(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_POLYGON_STIPPLE:
-      ret = vrend_decode_set_polygon_stipple(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_CLIP_STATE:
-      ret = vrend_decode_set_clip_state(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_SAMPLE_MASK:
-      ret = vrend_decode_set_sample_mask(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_MIN_SAMPLES:
-      ret = vrend_decode_set_min_samples(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_STREAMOUT_TARGETS:
-      ret = vrend_decode_set_streamout_targets(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_UNIFORM_BUFFER:
-      ret = vrend_decode_set_uniform_buffer(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_SUB_CTX:
-      ret = vrend_decode_set_sub_ctx(gdctx, len);
-      break;
-    case VIRGL_CCMD_CREATE_SUB_CTX:
-      ret = vrend_decode_create_sub_ctx(gdctx, len);
-      break;
-    case VIRGL_CCMD_DESTROY_SUB_CTX:
-      ret = vrend_decode_destroy_sub_ctx(gdctx, len);
-      break;
-    case VIRGL_CCMD_BIND_SHADER:
-      ret = vrend_decode_bind_shader(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_TESS_STATE:
-      ret = vrend_decode_set_tess_state(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_SHADER_BUFFERS:
-      ret = vrend_decode_set_shader_buffers(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_SHADER_IMAGES:
-      ret = vrend_decode_set_shader_images(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_ATOMIC_BUFFERS:
-      ret = vrend_decode_set_atomic_buffers(gdctx, len);
-      break;
-    case VIRGL_CCMD_MEMORY_BARRIER:
-      ret = vrend_decode_memory_barrier(gdctx, len);
-      break;
-    case VIRGL_CCMD_LAUNCH_GRID:
-      ret = vrend_decode_launch_grid(gdctx, len);
-      break;
-    case VIRGL_CCMD_SET_FRAMEBUFFER_STATE_NO_ATTACH:
-      ret = vrend_decode_set_framebuffer_state_no_attach(gdctx, len);
-      break;
-    case VIRGL_CCMD_TRANSFER3D:
-      ret = vrend_decode_transfer3d(client, gdctx, len, ctx_id);
-      break;
-    case VIRGL_CCMD_COPY_TRANSFER3D:
-      ret = vrend_decode_copy_transfer3d(gdctx, len);
-      break;
-    case VIRGL_CCMD_END_TRANSFERS:
-      ret = 0;
-      break;
-    case VIRGL_CCMD_SET_TWEAKS:
-    case VIRGL_CCMD_SET_DEBUG_FLAGS:
-      break;
-    default:
-      ret = EINVAL;
-    }
-
-    if (ret == EINVAL || ret == ENOMEM)
-      goto out;
-    gdctx->ds->buf_offset += (len) + 1;
-  }
-  return 0;
-out:
-  return ret;
-}
-
-void vrend_decode_reset(struct virgl_client *client, bool ctx_0_only) {
-  int i;
-
-  vrend_hw_switch_context(client->dec_ctx[0]->grctx, true);
-
-  if (ctx_0_only == false) {
-    for (i = 1; i < VREND_MAX_CTX; i++) {
-      if (!client->dec_ctx[i])
-        continue;
-
-      if (!client->dec_ctx[i]->grctx)
-        continue;
-
-      vrend_destroy_context(client->dec_ctx[i]->grctx);
-      free(client->dec_ctx[i]);
-      client->dec_ctx[i] = NULL;
-    }
-  } else {
-    vrend_destroy_context(client->dec_ctx[0]->grctx);
-    free(client->dec_ctx[0]);
-    client->dec_ctx[0] = NULL;
-  }
-}
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_formats.c b/app/src/main/cpp/virglrenderer/src/vrend_formats.c
deleted file mode 100644
index 0107c8e9a..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_formats.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-#include "util/u_format.h"
-#include "util/u_memory.h"
-#include "vrend_renderer.h"
-#include "vrend_util.h"
-
-#define SWIZZLE_INVALID 0xff
-#define NO_SWIZZLE                                                             \
-  {SWIZZLE_INVALID, SWIZZLE_INVALID, SWIZZLE_INVALID, SWIZZLE_INVALID}
-#define RRR1_SWIZZLE                                                           \
-  {PIPE_SWIZZLE_RED, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_RED, PIPE_SWIZZLE_ONE}
-#define RGB1_SWIZZLE                                                           \
-  {PIPE_SWIZZLE_RED, PIPE_SWIZZLE_GREEN, PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_ONE}
-#define ZZZR_SWIZZLE                                                           \
-  {PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_RED}
-
-static struct vrend_format_table base_rgba_formats[] = {
-    {VIRGL_FORMAT_R8G8B8X8_UNORM, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R8G8B8A8_UNORM, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_B8G8R8X8_UNORM, GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_B8G8R8A8_UNORM, GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
-     NO_SWIZZLE},
-
-    {VIRGL_FORMAT_A4B4G4R4_UNORM, GL_RGBA4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_B5G6R5_UNORM, GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R16G16B16X16_UNORM, GL_RGBA16UI, GL_RGBA, GL_UNSIGNED_SHORT,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R16G16B16A16_UNORM, GL_RGBA16UI, GL_RGBA, GL_UNSIGNED_SHORT,
-     NO_SWIZZLE},
-};
-
-static struct vrend_format_table base_depth_formats[] = {
-    {VIRGL_FORMAT_Z16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT,
-     GL_UNSIGNED_SHORT, NO_SWIZZLE},
-    {VIRGL_FORMAT_Z32_UNORM, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT,
-     GL_UNSIGNED_INT, NO_SWIZZLE},
-    {VIRGL_FORMAT_S8_UINT_Z24_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL,
-     GL_UNSIGNED_INT_24_8, NO_SWIZZLE},
-    {VIRGL_FORMAT_Z24X8_UNORM, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT,
-     GL_UNSIGNED_INT, NO_SWIZZLE},
-    {VIRGL_FORMAT_Z32_FLOAT, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT,
-     GL_FLOAT, NO_SWIZZLE},
-    {VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL,
-     GL_FLOAT_32_UNSIGNED_INT_24_8_REV, NO_SWIZZLE},
-    {VIRGL_FORMAT_X24S8_UINT, GL_STENCIL_INDEX8, GL_STENCIL_INDEX,
-     GL_UNSIGNED_BYTE, NO_SWIZZLE},
-};
-
-static struct vrend_format_table base_la_formats[] = {
-    {VIRGL_FORMAT_A8_UNORM, GL_R8, GL_RED, GL_UNSIGNED_BYTE, ZZZR_SWIZZLE},
-    {VIRGL_FORMAT_L8_UNORM, GL_R8, GL_RED, GL_UNSIGNED_BYTE, RRR1_SWIZZLE},
-    {VIRGL_FORMAT_A16_UNORM, GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT,
-     ZZZR_SWIZZLE},
-    {VIRGL_FORMAT_L16_UNORM, GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT,
-     RRR1_SWIZZLE},
-};
-
-static struct vrend_format_table rg_base_formats[] = {
-    {VIRGL_FORMAT_R8_UNORM, GL_R8, GL_RED, GL_UNSIGNED_BYTE, NO_SWIZZLE},
-    {VIRGL_FORMAT_R8G8_UNORM, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, NO_SWIZZLE},
-    {VIRGL_FORMAT_R16_UNORM, GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R16G16_UNORM, GL_R16_EXT, GL_RG, GL_UNSIGNED_SHORT,
-     NO_SWIZZLE},
-};
-
-static struct vrend_format_table integer_base_formats[] = {
-    {VIRGL_FORMAT_R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE,
-     NO_SWIZZLE},
-
-    {VIRGL_FORMAT_R16G16B16A16_UINT, GL_RGBA16UI, GL_RGBA_INTEGER,
-     GL_UNSIGNED_SHORT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R16G16B16A16_SINT, GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT,
-     NO_SWIZZLE},
-
-    {VIRGL_FORMAT_R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA_INTEGER,
-     GL_UNSIGNED_INT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R32G32B32A32_SINT, GL_RGBA32I, GL_RGBA_INTEGER, GL_INT,
-     NO_SWIZZLE},
-};
-
-static struct vrend_format_table integer_3comp_formats[] = {
-    {VIRGL_FORMAT_R8G8B8X8_UINT, GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R8G8B8X8_SINT, GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R16G16B16X16_UINT, GL_RGBA16UI, GL_RGBA_INTEGER,
-     GL_UNSIGNED_SHORT, RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R16G16B16X16_SINT, GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R32G32B32_UINT, GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R32G32B32_SINT, GL_RGB32I, GL_RGB_INTEGER, GL_INT,
-     NO_SWIZZLE},
-};
-
-static struct vrend_format_table float_base_formats[] = {
-    {VIRGL_FORMAT_R16G16B16A16_FLOAT, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R32G32B32A32_FLOAT, GL_RGBA32F, GL_RGBA, GL_FLOAT,
-     NO_SWIZZLE},
-};
-
-static struct vrend_format_table float_la_formats[] = {
-    {VIRGL_FORMAT_L16_FLOAT, GL_R16F, GL_RED, GL_HALF_FLOAT, RRR1_SWIZZLE},
-    {VIRGL_FORMAT_L32_FLOAT, GL_R32F, GL_RED, GL_FLOAT, RRR1_SWIZZLE},
-};
-
-static struct vrend_format_table integer_rg_formats[] = {
-    {VIRGL_FORMAT_R8_UINT, GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R8G8_UINT, GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R8_SINT, GL_R8I, GL_RED_INTEGER, GL_BYTE, NO_SWIZZLE},
-    {VIRGL_FORMAT_R8G8_SINT, GL_RG8I, GL_RG_INTEGER, GL_BYTE, NO_SWIZZLE},
-
-    {VIRGL_FORMAT_R16_UINT, GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R16G16_UINT, GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R16_SINT, GL_R16I, GL_RED_INTEGER, GL_SHORT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R16G16_SINT, GL_RG16I, GL_RG_INTEGER, GL_SHORT, NO_SWIZZLE},
-
-    {VIRGL_FORMAT_R32_UINT, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R32G32_UINT, GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT,
-     NO_SWIZZLE},
-    {VIRGL_FORMAT_R32_SINT, GL_R32I, GL_RED_INTEGER, GL_INT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R32G32_SINT, GL_RG32I, GL_RG_INTEGER, GL_INT, NO_SWIZZLE},
-};
-
-static struct vrend_format_table float_rg_formats[] = {
-    {VIRGL_FORMAT_R16_FLOAT, GL_R16F, GL_RED, GL_HALF_FLOAT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R16G16_FLOAT, GL_RG16F, GL_RG, GL_HALF_FLOAT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R32_FLOAT, GL_R32F, GL_RED, GL_FLOAT, NO_SWIZZLE},
-    {VIRGL_FORMAT_R32G32_FLOAT, GL_RG32F, GL_RG, GL_FLOAT, NO_SWIZZLE},
-};
-
-static struct vrend_format_table float_3comp_formats[] = {
-    {VIRGL_FORMAT_R16G16B16X16_FLOAT, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R32G32B32_FLOAT, GL_RGB32F, GL_RGB, GL_FLOAT, NO_SWIZZLE},
-};
-
-static struct vrend_format_table integer_la_formats[] = {
-    {VIRGL_FORMAT_L8_UINT, GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE,
-     RRR1_SWIZZLE},
-    {VIRGL_FORMAT_L8_SINT, GL_R8I, GL_RED_INTEGER, GL_BYTE, RRR1_SWIZZLE},
-
-    {VIRGL_FORMAT_L16_UINT, GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT,
-     RRR1_SWIZZLE},
-
-    {VIRGL_FORMAT_L16_SINT, GL_R16I, GL_RED_INTEGER, GL_SHORT, RRR1_SWIZZLE},
-
-    {VIRGL_FORMAT_L32_UINT, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT,
-     RRR1_SWIZZLE},
-
-    {VIRGL_FORMAT_L32_SINT, GL_R32I, GL_RED_INTEGER, GL_INT, RRR1_SWIZZLE},
-};
-
-static struct vrend_format_table snorm_formats[] = {
-    {VIRGL_FORMAT_R8_SNORM, GL_R8_SNORM, GL_RED, GL_BYTE, NO_SWIZZLE},
-    {VIRGL_FORMAT_R8G8_SNORM, GL_RG8_SNORM, GL_RG, GL_BYTE, NO_SWIZZLE},
-
-    {VIRGL_FORMAT_R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA, GL_BYTE, NO_SWIZZLE},
-    {VIRGL_FORMAT_R8G8B8X8_SNORM, GL_RGBA8_SNORM, GL_RGBA, GL_BYTE,
-     RGB1_SWIZZLE},
-};
-
-static struct vrend_format_table snorm_la_formats[] = {
-    {VIRGL_FORMAT_A8_SNORM, GL_R8_SNORM, GL_ALPHA, GL_BYTE, ZZZR_SWIZZLE},
-    {VIRGL_FORMAT_L8_SNORM, GL_R8_SNORM, GL_RED, GL_BYTE, RRR1_SWIZZLE},
-};
-
-static struct vrend_format_table srgb_formats[] = {
-    {VIRGL_FORMAT_R8G8B8X8_SRGB, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE,
-     RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R8G8B8A8_SRGB, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE,
-     NO_SWIZZLE},
-
-    {VIRGL_FORMAT_L8_SRGB, GL_RED, GL_RED, GL_UNSIGNED_BYTE, RRR1_SWIZZLE},
-    {VIRGL_FORMAT_R8_SRGB, GL_RED, GL_RED, GL_UNSIGNED_BYTE, NO_SWIZZLE},
-};
-
-static struct vrend_format_table bit10_formats[] = {
-    {VIRGL_FORMAT_B10G10R10X2_UNORM, GL_RGB10_A2, GL_RGBA,
-     GL_UNSIGNED_INT_2_10_10_10_REV, RGB1_SWIZZLE},
-    {VIRGL_FORMAT_B10G10R10A2_UNORM, GL_RGB10_A2, GL_RGBA,
-     GL_UNSIGNED_INT_2_10_10_10_REV, NO_SWIZZLE},
-    {VIRGL_FORMAT_R10G10B10X2_UNORM, GL_RGB10_A2, GL_RGBA,
-     GL_UNSIGNED_INT_2_10_10_10_REV, RGB1_SWIZZLE},
-    {VIRGL_FORMAT_R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGBA,
-     GL_UNSIGNED_INT_2_10_10_10_REV, NO_SWIZZLE},
-    {VIRGL_FORMAT_R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGBA_INTEGER,
-     GL_UNSIGNED_INT_2_10_10_10_REV, NO_SWIZZLE},
-};
-
-static struct vrend_format_table packed_float_formats[] = {
-    {VIRGL_FORMAT_R11G11B10_FLOAT, GL_R11F_G11F_B10F, GL_RGB,
-     GL_UNSIGNED_INT_10F_11F_11F_REV, NO_SWIZZLE},
-};
-
-static struct vrend_format_table exponent_float_formats[] = {
-    {VIRGL_FORMAT_R9G9B9E5_FLOAT, GL_RGB9_E5, GL_RGB,
-     GL_UNSIGNED_INT_5_9_9_9_REV, NO_SWIZZLE},
-};
-
-static bool color_format_can_readback(struct vrend_format_table *virgl_format,
-                                      int gles_ver) {
-  GLint imp = 0;
-
-  if (virgl_format->format == VIRGL_FORMAT_R8G8B8A8_UNORM)
-    return true;
-
-  if (gles_ver >= 30 &&
-      (virgl_format->format == VIRGL_FORMAT_R32G32B32A32_SINT ||
-       virgl_format->format == VIRGL_FORMAT_R32G32B32A32_UINT))
-    return true;
-
-  if ((virgl_format->format == VIRGL_FORMAT_R32G32B32A32_FLOAT) &&
-      (gles_ver >= 32 || vrend_has_gl_extension("GL_EXT_color_buffer_float")))
-    return true;
-
-  /* Hotfix for the CI, on GLES these formats are defined like
-   * VIRGL_FORMAT_R10G10B10.2_UNORM, and seems to be incorrect for direct
-   * readback but the blit workaround seems to work, so disable the
-   * direct readback for these two formats. */
-  if (virgl_format->format == VIRGL_FORMAT_B10G10R10A2_UNORM ||
-      virgl_format->format == VIRGL_FORMAT_B10G10R10X2_UNORM)
-    return false;
-
-  /* Check implementation specific readback formats */
-  glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &imp);
-  if (imp == (GLint)virgl_format->gltype) {
-    glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &imp);
-    if (imp == (GLint)virgl_format->glformat)
-      return true;
-  }
-  return false;
-}
-
-static void vrend_add_formats(struct vrend_format_table *table,
-                              int num_entries) {
-  int i;
-  const int gles_ver = vrend_gl_version();
-
-  for (i = 0; i < num_entries; i++) {
-    GLenum status;
-    bool is_depth = false;
-    uint32_t flags = 0;
-    uint32_t binding = 0;
-    GLuint buffers;
-    GLuint tex_id, fb_id;
-
-    glGenTextures(1, &tex_id);
-    glGenFramebuffers(1, &fb_id);
-
-    glBindTexture(GL_TEXTURE_2D, tex_id);
-    glBindFramebuffer(GL_FRAMEBUFFER, fb_id);
-
-    glTexImage2D(GL_TEXTURE_2D, 0, table[i].internalformat, 32, 32, 0,
-                 table[i].glformat, table[i].gltype, NULL);
-    status = glGetError();
-    if (status != GL_NO_ERROR) {
-      glDeleteTextures(1, &tex_id);
-      glDeleteFramebuffers(1, &fb_id);
-      continue;
-    }
-
-    if (table[i].format < VIRGL_FORMAT_MAX &&
-        util_format_is_depth_or_stencil(table[i].format)) {
-      GLenum attachment;
-
-      if (table[i].format == VIRGL_FORMAT_Z24X8_UNORM ||
-          table[i].format == VIRGL_FORMAT_Z32_UNORM ||
-          table[i].format == VIRGL_FORMAT_Z16_UNORM ||
-          table[i].format == VIRGL_FORMAT_Z32_FLOAT)
-        attachment = GL_DEPTH_ATTACHMENT;
-      else
-        attachment = GL_DEPTH_STENCIL_ATTACHMENT;
-      glFramebufferTexture2D(GL_FRAMEBUFFER, attachment, GL_TEXTURE_2D, tex_id,
-                             0);
-
-      is_depth = true;
-
-      buffers = GL_NONE;
-      glDrawBuffers(1, &buffers);
-    } else {
-      glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                             GL_TEXTURE_2D, tex_id, 0);
-
-      buffers = GL_COLOR_ATTACHMENT0;
-      glDrawBuffers(1, &buffers);
-    }
-
-    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    binding = VIRGL_BIND_SAMPLER_VIEW;
-    if (status == GL_FRAMEBUFFER_COMPLETE) {
-      binding |= is_depth ? VIRGL_BIND_DEPTH_STENCIL : VIRGL_BIND_RENDER_TARGET;
-
-      if (color_format_can_readback(&table[i], gles_ver))
-        flags |= VIRGL_TEXTURE_CAN_READBACK;
-    }
-
-    glDeleteTextures(1, &tex_id);
-    glDeleteFramebuffers(1, &fb_id);
-
-    if (table[i].swizzle[0] != SWIZZLE_INVALID)
-      vrend_insert_format_swizzle(table[i].format, &table[i], binding,
-                                  table[i].swizzle, flags);
-    else
-      vrend_insert_format(&table[i], binding, flags);
-  }
-}
-
-#define add_formats(x) vrend_add_formats((x), ARRAY_SIZE((x)))
-
-void vrend_build_format_list(void) {
-  add_formats(base_rgba_formats);
-  add_formats(base_depth_formats);
-  add_formats(base_la_formats);
-
-  /* float support */
-  add_formats(float_base_formats);
-  add_formats(float_la_formats);
-  add_formats(float_3comp_formats);
-
-  /* texture integer support ? */
-  add_formats(integer_base_formats);
-  add_formats(integer_la_formats);
-  add_formats(integer_3comp_formats);
-
-  /* RG support? */
-  add_formats(rg_base_formats);
-  /* integer + rg */
-  add_formats(integer_rg_formats);
-  /* float + rg */
-  add_formats(float_rg_formats);
-
-  /* snorm */
-  add_formats(snorm_formats);
-  add_formats(snorm_la_formats);
-
-  add_formats(srgb_formats);
-
-  add_formats(bit10_formats);
-
-  add_formats(packed_float_formats);
-  add_formats(exponent_float_formats);
-}
-
-/* glTexStorage may not support all that is supported by glTexImage,
- * so add a flag to indicate when it can be used.
- */
-void vrend_check_texture_storage(struct vrend_format_table *table) {
-  int i;
-  GLuint tex_id;
-  for (i = 0; i < VIRGL_FORMAT_MAX_EXTENDED; i++) {
-
-    if (table[i].internalformat != 0 &&
-        !(table[i].flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE)) {
-      glGenTextures(1, &tex_id);
-      glBindTexture(GL_TEXTURE_2D, tex_id);
-      glTexStorage2D(GL_TEXTURE_2D, 1, table[i].internalformat, 32, 32);
-      if (glGetError() == GL_NO_ERROR)
-        table[i].flags |= VIRGL_TEXTURE_CAN_TEXTURE_STORAGE;
-      glDeleteTextures(1, &tex_id);
-    }
-  }
-}
-
-bool vrend_check_framebuffer_mixed_color_attachements() {
-  GLuint tex_id[2];
-  GLuint fb_id;
-  bool retval = false;
-
-  glGenTextures(2, tex_id);
-  glGenFramebuffers(1, &fb_id);
-
-  glBindTexture(GL_TEXTURE_2D, tex_id[0]);
-  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-               NULL);
-
-  glBindFramebuffer(GL_FRAMEBUFFER, fb_id);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-                         tex_id[0], 0);
-
-  glBindTexture(GL_TEXTURE_2D, tex_id[1]);
-  glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, 32, 32, 0, GL_RED, GL_UNSIGNED_BYTE,
-               NULL);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D,
-                         tex_id[1], 0);
-
-  retval = glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE;
-
-  glDeleteFramebuffers(1, &fb_id);
-  glDeleteTextures(2, tex_id);
-
-  return retval;
-}
-
-unsigned vrend_renderer_query_multisample_caps(unsigned max_samples,
-                                               struct virgl_caps_v2 *caps) {
-  GLuint tex;
-  GLuint fbo;
-  GLenum status;
-
-  uint max_samples_confirmed = 1;
-  uint test_num_samples[4] = {2, 4, 8, 16};
-  int out_buf_offsets[4] = {0, 1, 2, 4};
-  int lowest_working_ms_count_idx = -1;
-
-  assert(glGetError() == GL_NO_ERROR && "Stale error state detected, please "
-                                        "check for failures in initialization");
-
-  glGenFramebuffers(1, &fbo);
-  memset(caps->sample_locations, 0, 8 * sizeof(uint32_t));
-
-  for (int i = 3; i >= 0; i--) {
-    if (test_num_samples[i] > max_samples)
-      continue;
-    glGenTextures(1, &tex);
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, tex);
-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, test_num_samples[i],
-                              GL_RGBA32F, 64, 64, GL_TRUE);
-    status = glGetError();
-    if (status == GL_NO_ERROR) {
-      glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-      glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                             GL_TEXTURE_2D_MULTISAMPLE, tex, 0);
-      status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-      if (status == GL_FRAMEBUFFER_COMPLETE) {
-        if (max_samples_confirmed < test_num_samples[i])
-          max_samples_confirmed = test_num_samples[i];
-
-        for (uint k = 0; k < test_num_samples[i]; ++k) {
-          float msp[2];
-          uint32_t compressed;
-          glGetMultisamplefv(GL_SAMPLE_POSITION, k, msp);
-          compressed = ((unsigned)(floor(msp[0] * 16.0f)) & 0xf) << 4;
-          compressed |= ((unsigned)(floor(msp[1] * 16.0f)) & 0xf);
-          caps->sample_locations[out_buf_offsets[i] + (k >> 2)] |=
-              compressed << (8 * (k & 3));
-        }
-        lowest_working_ms_count_idx = i;
-      } else {
-        /* If a framebuffer doesn't support low sample counts,
-         * use the sample position from the last working larger count. */
-        if (lowest_working_ms_count_idx > 0) {
-          for (uint k = 0; k < test_num_samples[i]; ++k) {
-            caps->sample_locations[out_buf_offsets[i] + (k >> 2)] =
-                caps->sample_locations
-                    [out_buf_offsets[lowest_working_ms_count_idx] + (k >> 2)];
-          }
-        }
-      }
-      glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    }
-    glDeleteTextures(1, &tex);
-  }
-  glDeleteFramebuffers(1, &fbo);
-  return max_samples_confirmed;
-}
-
-/* returns: 1 = compatible, -1 = not compatible, 0 = undecided */
-static int
-format_uncompressed_compressed_copy_compatible(enum virgl_formats src,
-                                               enum virgl_formats dst) {
-  switch (src) {
-  case VIRGL_FORMAT_R32G32B32A32_UINT:
-  case VIRGL_FORMAT_R32G32B32A32_SINT:
-  case VIRGL_FORMAT_R32G32B32A32_FLOAT:
-  case VIRGL_FORMAT_R32G32B32A32_SNORM:
-  case VIRGL_FORMAT_R32G32B32A32_UNORM:
-    switch (dst) {
-    case VIRGL_FORMAT_DXT3_RGBA:
-    case VIRGL_FORMAT_DXT3_SRGBA:
-    case VIRGL_FORMAT_DXT5_RGBA:
-    case VIRGL_FORMAT_DXT5_SRGBA:
-    case VIRGL_FORMAT_RGTC2_UNORM:
-    case VIRGL_FORMAT_RGTC2_SNORM:
-    case VIRGL_FORMAT_BPTC_RGBA_UNORM:
-    case VIRGL_FORMAT_BPTC_SRGBA:
-    case VIRGL_FORMAT_BPTC_RGB_FLOAT:
-    case VIRGL_FORMAT_BPTC_RGB_UFLOAT:
-      return 1;
-    default:
-      return -1;
-    }
-  case VIRGL_FORMAT_R16G16B16A16_UINT:
-  case VIRGL_FORMAT_R16G16B16A16_SINT:
-  case VIRGL_FORMAT_R16G16B16A16_FLOAT:
-  case VIRGL_FORMAT_R16G16B16A16_SNORM:
-  case VIRGL_FORMAT_R16G16B16A16_UNORM:
-  case VIRGL_FORMAT_R32G32_UINT:
-  case VIRGL_FORMAT_R32G32_SINT:
-  case VIRGL_FORMAT_R32G32_FLOAT:
-  case VIRGL_FORMAT_R32G32_UNORM:
-  case VIRGL_FORMAT_R32G32_SNORM:
-    switch (dst) {
-    case VIRGL_FORMAT_DXT1_RGBA:
-    case VIRGL_FORMAT_DXT1_SRGBA:
-    case VIRGL_FORMAT_DXT1_RGB:
-    case VIRGL_FORMAT_DXT1_SRGB:
-    case VIRGL_FORMAT_RGTC1_UNORM:
-    case VIRGL_FORMAT_RGTC1_SNORM:
-      return 1;
-    default:
-      return -1;
-    }
-  default:
-    return 0;
-  }
-}
-
-static boolean
-format_compressed_compressed_copy_compatible(enum virgl_formats src,
-                                             enum virgl_formats dst) {
-  if ((src == VIRGL_FORMAT_RGTC1_UNORM && dst == VIRGL_FORMAT_RGTC1_SNORM) ||
-      (src == VIRGL_FORMAT_RGTC2_UNORM && dst == VIRGL_FORMAT_RGTC2_SNORM) ||
-      (src == VIRGL_FORMAT_BPTC_RGBA_UNORM && dst == VIRGL_FORMAT_BPTC_SRGBA) ||
-      (src == VIRGL_FORMAT_BPTC_RGB_FLOAT &&
-       dst == VIRGL_FORMAT_BPTC_RGB_UFLOAT))
-    return true;
-  return false;
-}
-
-boolean format_is_copy_compatible(enum virgl_formats src,
-                                  enum virgl_formats dst,
-                                  boolean allow_compressed) {
-  int r;
-
-  if (src == dst)
-    return true;
-
-  if (util_format_is_plain(src) && util_format_is_plain(dst)) {
-    const struct util_format_description *src_desc =
-        util_format_description(src);
-    const struct util_format_description *dst_desc =
-        util_format_description(dst);
-    return util_is_format_compatible(src_desc, dst_desc);
-  }
-
-  if (!allow_compressed)
-    return false;
-
-  /* compressed-uncompressed */
-  r = format_uncompressed_compressed_copy_compatible(src, dst);
-  if (r)
-    return r > 0;
-
-  r = format_uncompressed_compressed_copy_compatible(dst, src);
-  if (r)
-    return r > 0;
-
-  return format_compressed_compressed_copy_compatible(dst, src);
-}
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_iov.h b/app/src/main/cpp/virglrenderer/src/vrend_iov.h
deleted file mode 100644
index 542d71cea..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_iov.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-#ifndef VREND_IOV_H
-#define VREND_IOV_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <sys/uio.h>
-
-struct vrend_transfer_info {
-  uint32_t handle;
-  uint32_t ctx_id;
-  int level;
-  uint32_t stride;
-  uint32_t layer_stride;
-  unsigned int iovec_cnt;
-  struct iovec *iovec;
-  uint64_t offset;
-  bool context0;
-  struct pipe_box *box;
-  bool synchronized;
-};
-
-typedef void (*iov_cb)(void *cookie, unsigned int doff, void *src, int len);
-
-size_t vrend_get_iovec_size(const struct iovec *iov, int iovlen);
-size_t vrend_read_from_iovec(const struct iovec *iov, int iov_cnt,
-                             size_t offset, char *buf, size_t bytes);
-size_t vrend_write_to_iovec(const struct iovec *iov, int iov_cnt, size_t offset,
-                            const char *buf, size_t bytes);
-
-size_t vrend_read_from_iovec_cb(const struct iovec *iov, int iov_cnt,
-                                size_t offset, size_t bytes, iov_cb iocb,
-                                void *cookie);
-
-int vrend_copy_iovec(const struct iovec *src_iov, int src_iovlen,
-                     size_t src_offset, const struct iovec *dst_iov,
-                     int dst_iovlen, size_t dst_offset, size_t count,
-                     char *buf);
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_object.c b/app/src/main/cpp/virglrenderer/src/vrend_object.c
deleted file mode 100644
index 3d424d8f7..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_object.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#include "util/u_hash_table.h"
-#include "util/u_memory.h"
-#include "util/u_pointer.h"
-
-#include "vrend_object.h"
-
-struct vrend_object_types {
-  void (*unref)(void *);
-} obj_types[VIRGL_MAX_OBJECTS];
-
-static void (*resource_unref)(void *);
-
-void vrend_object_set_destroy_callback(int type, void (*cb)(void *)) {
-  obj_types[type].unref = cb;
-}
-
-void vrend_resource_set_destroy_callback(void (*cb)(void *)) {
-  resource_unref = cb;
-}
-
-static unsigned hash_func(void *key) {
-  intptr_t ip = pointer_to_intptr(key);
-  return (unsigned)(ip & 0xffffffff);
-}
-
-static int compare(void *key1, void *key2) {
-  if (key1 < key2)
-    return -1;
-  if (key1 > key2)
-    return 1;
-  else
-    return 0;
-}
-
-struct vrend_object {
-  enum virgl_object_type type;
-  uint32_t handle;
-  void *data;
-  bool free_data;
-};
-
-static void free_object(void *value) {
-  struct vrend_object *obj = value;
-
-  if (obj->free_data) {
-    if (obj_types[obj->type].unref)
-      obj_types[obj->type].unref(obj->data);
-    else {
-      /* for objects with no callback just free them */
-      free(obj->data);
-    }
-  }
-  free(obj);
-}
-
-struct util_hash_table *vrend_object_init_ctx_table(void) {
-  struct util_hash_table *ctx_hash;
-  ctx_hash = util_hash_table_create(hash_func, compare, free_object);
-  return ctx_hash;
-}
-
-void vrend_object_fini_ctx_table(struct util_hash_table *ctx_hash) {
-  if (!ctx_hash)
-    return;
-
-  util_hash_table_destroy(ctx_hash);
-}
-
-static void free_res(void *value) {
-  struct vrend_object *obj = value;
-  (*resource_unref)(obj->data);
-  free(obj);
-}
-
-void vrend_object_init_resource_table(struct virgl_client *client) {
-  if (!client->res_hash)
-    client->res_hash = util_hash_table_create(hash_func, compare, free_res);
-}
-
-void vrend_object_fini_resource_table(struct virgl_client *client) {
-  if (client->res_hash)
-    util_hash_table_destroy(client->res_hash);
-
-  client->res_hash = NULL;
-}
-
-uint32_t vrend_object_insert_nofree(struct util_hash_table *handle_hash,
-                                    void *data, UNUSED uint32_t length,
-                                    uint32_t handle,
-                                    enum virgl_object_type type,
-                                    bool free_data) {
-  struct vrend_object *obj = CALLOC_STRUCT(vrend_object);
-
-  if (!obj)
-    return 0;
-  obj->handle = handle;
-  obj->data = data;
-  obj->type = type;
-  obj->free_data = free_data;
-  util_hash_table_set(handle_hash, intptr_to_pointer(obj->handle), obj);
-  return obj->handle;
-}
-
-uint32_t vrend_object_insert(struct util_hash_table *handle_hash, void *data,
-                             uint32_t length, uint32_t handle,
-                             enum virgl_object_type type) {
-  return vrend_object_insert_nofree(handle_hash, data, length, handle, type,
-                                    true);
-}
-
-void vrend_object_remove(struct util_hash_table *handle_hash, uint32_t handle,
-                         UNUSED enum virgl_object_type type) {
-  util_hash_table_remove(handle_hash, intptr_to_pointer(handle));
-}
-
-void *vrend_object_lookup(struct util_hash_table *handle_hash, uint32_t handle,
-                          enum virgl_object_type type) {
-  struct vrend_object *obj;
-
-  obj = util_hash_table_get(handle_hash, intptr_to_pointer(handle));
-  if (!obj) {
-    return NULL;
-  }
-
-  if (obj->type != type)
-    return NULL;
-  return obj->data;
-}
-
-int vrend_resource_insert(struct virgl_client *client, void *data,
-                          uint32_t handle) {
-  struct vrend_object *obj;
-
-  if (!handle)
-    return 0;
-
-  obj = CALLOC_STRUCT(vrend_object);
-  if (!obj)
-    return 0;
-
-  obj->handle = handle;
-  obj->data = data;
-  util_hash_table_set(client->res_hash, intptr_to_pointer(obj->handle), obj);
-  return obj->handle;
-}
-
-void vrend_resource_remove(struct virgl_client *client, uint32_t handle) {
-  util_hash_table_remove(client->res_hash, intptr_to_pointer(handle));
-}
-
-void *vrend_resource_lookup(struct virgl_client *client, uint32_t handle,
-                            UNUSED uint32_t ctx_id) {
-  struct vrend_object *obj;
-  obj = util_hash_table_get(client->res_hash, intptr_to_pointer(handle));
-  if (!obj)
-    return NULL;
-  return obj->data;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_object.h b/app/src/main/cpp/virglrenderer/src/vrend_object.h
deleted file mode 100644
index 7dacf76a8..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_object.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#ifndef VREND_OBJECT_H
-#define VREND_OBJECT_H
-
-#include "virgl_protocol.h"
-#include "virgl_server.h"
-
-void vrend_object_init_resource_table(struct virgl_client *client);
-void vrend_object_fini_resource_table(struct virgl_client *client);
-
-struct util_hash_table *vrend_object_init_ctx_table(void);
-void vrend_object_fini_ctx_table(struct util_hash_table *ctx_hash);
-
-void vrend_object_remove(struct util_hash_table *handle_hash, uint32_t handle,
-                         enum virgl_object_type obj);
-void *vrend_object_lookup(struct util_hash_table *handle_hash, uint32_t handle,
-                          enum virgl_object_type obj);
-uint32_t vrend_object_insert(struct util_hash_table *handle_hash, void *data,
-                             uint32_t length, uint32_t handle,
-                             enum virgl_object_type type);
-uint32_t vrend_object_insert_nofree(struct util_hash_table *handle_hash,
-                                    void *data, uint32_t length,
-                                    uint32_t handle,
-                                    enum virgl_object_type type,
-                                    bool free_data);
-/* resources are global */
-int vrend_resource_insert(struct virgl_client *client, void *data,
-                          uint32_t handle);
-
-void vrend_resource_remove(struct virgl_client *client, uint32_t handle);
-void *vrend_resource_lookup(struct virgl_client *client, uint32_t handle,
-                            uint32_t ctx_id);
-
-void vrend_object_set_destroy_callback(int type, void (*cb)(void *));
-void vrend_resource_set_destroy_callback(void (*cb)(void *));
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_renderer.c b/app/src/main/cpp/virglrenderer/src/vrend_renderer.c
deleted file mode 100644
index bd6b1deba..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_renderer.c
+++ /dev/null
@@ -1,7474 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#include "pipe/p_shader_tokens.h"
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_state.h"
-#include "util/u_dual_blend.h"
-#include "util/u_inlines.h"
-#include "util/u_memory.h"
-
-#include "tgsi/tgsi_parse.h"
-#include "util/u_format.h"
-
-#include "vrend_object.h"
-#include "vrend_shader.h"
-
-#include "vrend_renderer.h"
-
-#include "vrend_util.h"
-
-#include "virgl_hw.h"
-
-#include "tgsi/tgsi_text.h"
-
-#include <sys/eventfd.h>
-
-static const uint32_t fake_occlusion_query_samples_passed_default = 1024;
-
-struct vrend_if_cbs *vrend_clicbs;
-
-struct vrend_fence {
-  uint32_t fence_id;
-  uint32_t ctx_id;
-  GLsync syncobj;
-  struct list_head fences;
-};
-
-struct vrend_query {
-  struct list_head waiting_queries;
-
-  GLuint id;
-  GLuint type;
-  GLuint index;
-  GLuint gltype;
-  int ctx_id;
-  struct vrend_resource *res;
-  bool fake_samples_passed;
-};
-
-enum features_id {
-  feat_arb_or_gles_ext_texture_buffer,
-  feat_atomic_counters,
-  feat_barrier,
-  feat_clip_control,
-  feat_compute_shader,
-  feat_copy_image,
-  feat_cube_map_array,
-  feat_draw_instance,
-  feat_fb_no_attach,
-  feat_framebuffer_fetch,
-  feat_geometry_shader,
-  feat_gles31_compatibility,
-  feat_gles31_vertex_attrib_binding,
-  feat_gpu_shader5,
-  feat_images,
-  feat_indep_blend,
-  feat_indep_blend_func,
-  feat_indirect_draw,
-  feat_multisample,
-  feat_occlusion_query_boolean,
-  feat_robust_buffer_access,
-  feat_sample_mask,
-  feat_sample_shading,
-  feat_samplers,
-  feat_separate_shader_objects,
-  feat_ssbo,
-  feat_ssbo_barrier,
-  feat_srgb_write_control,
-  feat_stencil_texturing,
-  feat_storage_multisample,
-  feat_tessellation,
-  feat_texture_array,
-  feat_texture_buffer_range,
-  feat_texture_gather,
-  feat_texture_multisample,
-  feat_texture_srgb_decode,
-  feat_texture_storage,
-  feat_transform_feedback,
-  feat_transform_feedback2,
-  feat_ubo,
-  feat_last,
-};
-
-#define FEAT_MAX_EXTS 4
-#define UNAVAIL INT_MAX
-
-#define FEAT(NAME, GLVER, GLESVER, ...)                                        \
-  [feat_##NAME] = {GLVER, GLESVER, {__VA_ARGS__}, #NAME}
-
-static const struct {
-  int gl_ver;
-  int gles_ver;
-  const char *gl_ext[FEAT_MAX_EXTS];
-  const char *log_name;
-} feature_list[] = {
-    FEAT(arb_or_gles_ext_texture_buffer, 31, UNAVAIL,
-         "GL_ARB_texture_buffer_object", "GL_EXT_texture_buffer", NULL),
-    FEAT(atomic_counters, 42, 31, "GL_ARB_shader_atomic_counters"),
-    FEAT(barrier, 42, 31, NULL),
-    FEAT(clip_control, 45, UNAVAIL, "GL_ARB_clip_control",
-         "GL_EXT_clip_control"),
-    FEAT(compute_shader, 43, 31, "GL_ARB_compute_shader"),
-    FEAT(copy_image, 43, 32, "GL_ARB_copy_image", "GL_EXT_copy_image",
-         "GL_OES_copy_image"),
-    FEAT(cube_map_array, 40, 32, "GL_ARB_texture_cube_map_array",
-         "GL_EXT_texture_cube_map_array", "GL_OES_texture_cube_map_array"),
-    FEAT(draw_instance, 31, 30, "GL_ARB_draw_instanced"),
-    FEAT(fb_no_attach, 43, 31, "GL_ARB_framebuffer_no_attachments"),
-    FEAT(framebuffer_fetch, UNAVAIL, UNAVAIL,
-         "GL_EXT_shader_framebuffer_fetch"),
-    FEAT(geometry_shader, 32, 32, "GL_EXT_geometry_shader",
-         "GL_OES_geometry_shader"),
-    FEAT(gles31_compatibility, 45, 31, "ARB_ES3_1_compatibility"),
-    FEAT(gles31_vertex_attrib_binding, 43, 31, "GL_ARB_vertex_attrib_binding"),
-    FEAT(gpu_shader5, 40, 32, "GL_ARB_gpu_shader5", "GL_EXT_gpu_shader5",
-         "GL_OES_gpu_shader5"),
-    FEAT(images, 42, 31, "GL_ARB_shader_image_load_store"),
-    FEAT(indep_blend, 30, 32, "GL_EXT_draw_buffers2",
-         "GL_OES_draw_buffers_indexed"),
-    FEAT(indep_blend_func, 40, 32, "GL_ARB_draw_buffers_blend",
-         "GL_OES_draw_buffers_indexed"),
-    FEAT(indirect_draw, 40, 31, "GL_ARB_draw_indirect"),
-    FEAT(multisample, 32, 30, "GL_ARB_texture_multisample"),
-    FEAT(occlusion_query_boolean, 33, 30, "GL_EXT_occlusion_query_boolean",
-         "GL_ARB_occlusion_query2"),
-    FEAT(robust_buffer_access, 43, UNAVAIL,
-         "GL_ARB_robust_buffer_access_behavior",
-         "GL_KHR_robust_buffer_access_behavior"),
-    FEAT(sample_mask, 32, 31, "GL_ARB_texture_multisample"),
-    FEAT(sample_shading, 40, 32, "GL_ARB_sample_shading",
-         "GL_OES_sample_shading"),
-    FEAT(samplers, 33, 30, "GL_ARB_sampler_objects"),
-    FEAT(separate_shader_objects, 41, 31, "GL_ARB_seperate_shader_objects"),
-    FEAT(ssbo, 43, 31, "GL_ARB_shader_storage_buffer_object"),
-    FEAT(ssbo_barrier, 43, 31, NULL),
-    FEAT(srgb_write_control, 30, UNAVAIL, "GL_EXT_sRGB_write_control"),
-    FEAT(stencil_texturing, 43, 31, "GL_ARB_stencil_texturing"),
-    FEAT(storage_multisample, 43, 31, "GL_ARB_texture_storage_multisample"),
-    FEAT(tessellation, 40, 32, "GL_ARB_tessellation_shader",
-         "GL_OES_tessellation_shader", "GL_EXT_tessellation_shader"),
-    FEAT(texture_array, 30, 30, "GL_EXT_texture_array"),
-    FEAT(texture_buffer_range, 43, 32, "GL_ARB_texture_buffer_range"),
-    FEAT(texture_gather, 40, 31, "GL_ARB_texture_gather"),
-    FEAT(texture_multisample, 32, 30, "GL_ARB_texture_multisample"),
-    FEAT(texture_srgb_decode, UNAVAIL, UNAVAIL, "GL_EXT_texture_sRGB_decode"),
-    FEAT(texture_storage, 42, 30, "GL_ARB_texture_storage"),
-    FEAT(transform_feedback, 30, 30, "GL_EXT_transform_feedback"),
-    FEAT(transform_feedback2, 40, 30, "GL_ARB_transform_feedback2"),
-    FEAT(ubo, 31, 30, "GL_ARB_uniform_buffer_object"),
-};
-
-static bool features[feat_last];
-static bool features_initialized = false;
-
-static inline bool has_feature(enum features_id feature_id) {
-  return features[feature_id];
-}
-
-static inline void set_feature(enum features_id feature_id) {
-  features[feature_id] = true;
-}
-
-struct vrend_linked_shader_program {
-  struct list_head head;
-  struct list_head sl[PIPE_SHADER_TYPES];
-  GLuint id;
-
-  bool dual_src_linked;
-  struct vrend_shader *ss[PIPE_SHADER_TYPES];
-
-  uint32_t ubo_used_mask[PIPE_SHADER_TYPES];
-  uint32_t samplers_used_mask[PIPE_SHADER_TYPES];
-
-  GLuint *shadow_samp_mask_locs[PIPE_SHADER_TYPES];
-  GLuint *shadow_samp_add_locs[PIPE_SHADER_TYPES];
-
-  GLint const_location[PIPE_SHADER_TYPES];
-
-  GLuint *attrib_locs;
-  uint32_t shadow_samp_mask[PIPE_SHADER_TYPES];
-
-  GLuint vs_ws_adjust_loc;
-  float viewport_neg_val;
-
-  GLint fs_stipple_loc;
-
-  GLuint clip_locs[8];
-
-  uint32_t images_used_mask[PIPE_SHADER_TYPES];
-  GLint *img_locs[PIPE_SHADER_TYPES];
-
-  GLuint *ssbo_locs[PIPE_SHADER_TYPES];
-
-  struct vrend_sub_context *ref_context;
-};
-
-struct vrend_shader {
-  struct vrend_shader *next_variant;
-  struct vrend_shader_selector *sel;
-
-  struct vrend_strarray glsl_strings;
-  GLuint id;
-  GLuint compiled_fs_id;
-  struct vrend_shader_key key;
-  struct list_head programs;
-};
-
-struct vrend_shader_selector {
-  struct pipe_reference reference;
-
-  unsigned num_shaders;
-  unsigned type;
-  struct vrend_shader_info sinfo;
-
-  struct vrend_shader *current;
-  struct tgsi_token *tokens;
-
-  uint32_t req_local_mem;
-  char *tmp_buf;
-  uint32_t buf_len;
-  uint32_t buf_offset;
-};
-
-struct vrend_texture {
-  struct vrend_resource base;
-  struct pipe_sampler_state state;
-  GLenum cur_swizzle_r;
-  GLenum cur_swizzle_g;
-  GLenum cur_swizzle_b;
-  GLenum cur_swizzle_a;
-  GLuint cur_srgb_decode;
-  GLuint cur_base, cur_max;
-};
-
-struct vrend_surface {
-  struct pipe_reference reference;
-  GLuint id;
-  GLuint res_handle;
-  GLuint format;
-  GLuint val0, val1;
-  struct vrend_resource *texture;
-};
-
-struct vrend_sampler_state {
-  struct pipe_sampler_state base;
-  GLuint ids[2];
-};
-
-struct vrend_so_target {
-  struct pipe_reference reference;
-  GLuint res_handle;
-  unsigned buffer_offset;
-  unsigned buffer_size;
-  struct vrend_resource *buffer;
-  struct vrend_sub_context *sub_ctx;
-};
-
-struct vrend_sampler_view {
-  struct pipe_reference reference;
-  GLuint id;
-  enum virgl_formats format;
-  GLenum target;
-  GLuint val0, val1;
-  GLuint gl_swizzle_r;
-  GLuint gl_swizzle_g;
-  GLuint gl_swizzle_b;
-  GLuint gl_swizzle_a;
-  GLuint srgb_decode;
-  struct vrend_resource *texture;
-};
-
-struct vrend_image_view {
-  GLuint id;
-  GLenum access;
-  GLenum format;
-  union {
-    struct {
-      unsigned first_layer : 16; /**< first layer to use for array textures */
-      unsigned last_layer : 16;  /**< last layer to use for array textures */
-      unsigned level : 8;        /**< mipmap level to use */
-    } tex;
-    struct {
-      unsigned offset; /**< offset in bytes */
-      unsigned size;   /**< size of the accessible sub-range in bytes */
-    } buf;
-  } u;
-  struct vrend_resource *texture;
-};
-
-struct vrend_ssbo {
-  struct vrend_resource *res;
-  unsigned buffer_size;
-  unsigned buffer_offset;
-};
-
-struct vrend_abo {
-  struct vrend_resource *res;
-  unsigned buffer_size;
-  unsigned buffer_offset;
-};
-
-struct vrend_vertex_element {
-  struct pipe_vertex_element base;
-  GLenum type;
-  GLboolean norm;
-  GLuint nr_chan;
-};
-
-struct vrend_vertex_element_array {
-  unsigned count;
-  struct vrend_vertex_element elements[PIPE_MAX_ATTRIBS];
-  GLuint id;
-};
-
-struct vrend_constants {
-  unsigned int *consts;
-  uint32_t num_consts;
-  uint32_t num_allocated_consts;
-};
-
-struct vrend_shader_view {
-  int num_views;
-  struct vrend_sampler_view *views[PIPE_MAX_SHADER_SAMPLER_VIEWS];
-  uint32_t res_id[PIPE_MAX_SHADER_SAMPLER_VIEWS];
-  uint32_t old_ids[PIPE_MAX_SHADER_SAMPLER_VIEWS];
-};
-
-struct vrend_viewport {
-  GLint cur_x, cur_y;
-  GLsizei width, height;
-  GLfloat near_val, far_val;
-};
-
-/* create a streamout object to support pause/resume */
-struct vrend_streamout_object {
-  GLuint id;
-  uint32_t num_targets;
-  uint32_t handles[16];
-  struct list_head head;
-  int xfb_state;
-  struct vrend_so_target *so_targets[16];
-};
-
-#define XFB_STATE_OFF 0
-#define XFB_STATE_STARTED_NEED_BEGIN 1
-#define XFB_STATE_STARTED 2
-#define XFB_STATE_PAUSED 3
-
-struct vrend_sub_context {
-  struct list_head head;
-
-  virgl_gl_context gl_context;
-
-  int sub_ctx_id;
-
-  GLuint vaoid;
-  uint32_t enabled_attribs_bitmask;
-
-  struct list_head programs;
-  struct util_hash_table *object_hash;
-
-  struct vrend_vertex_element_array *ve;
-  int num_vbos;
-  int old_num_vbos; /* for cleaning up */
-  struct pipe_vertex_buffer vbo[PIPE_MAX_ATTRIBS];
-  uint32_t vbo_res_ids[PIPE_MAX_ATTRIBS];
-
-  struct pipe_index_buffer ib;
-  uint32_t index_buffer_res_id;
-
-  bool vbo_dirty;
-  bool shader_dirty;
-  bool cs_shader_dirty;
-  bool stencil_state_dirty;
-  bool image_state_dirty;
-  bool blend_state_dirty;
-
-  uint32_t long_shader_in_progress_handle[PIPE_SHADER_TYPES];
-  struct vrend_shader_selector *shaders[PIPE_SHADER_TYPES];
-  struct vrend_linked_shader_program *prog;
-
-  int prog_ids[PIPE_SHADER_TYPES];
-  struct vrend_shader_view views[PIPE_SHADER_TYPES];
-
-  struct vrend_constants consts[PIPE_SHADER_TYPES];
-  bool const_dirty[PIPE_SHADER_TYPES];
-  struct vrend_sampler_state
-      *sampler_state[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
-
-  struct pipe_constant_buffer cbs[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT_BUFFERS];
-  uint32_t const_bufs_used_mask[PIPE_SHADER_TYPES];
-  uint32_t const_bufs_dirty[PIPE_SHADER_TYPES];
-
-  int num_sampler_states[PIPE_SHADER_TYPES];
-
-  uint32_t sampler_views_dirty[PIPE_SHADER_TYPES];
-
-  uint32_t fb_id;
-  int nr_cbufs, old_nr_cbufs;
-  struct vrend_surface *zsurf;
-  struct vrend_surface *surf[PIPE_MAX_COLOR_BUFS];
-
-  struct vrend_viewport vps[PIPE_MAX_VIEWPORTS];
-  /* viewport is negative */
-  uint32_t scissor_state_dirty;
-  uint32_t viewport_state_dirty;
-  uint32_t viewport_state_initialized;
-
-  uint32_t fb_height;
-
-  struct pipe_scissor_state ss[PIPE_MAX_VIEWPORTS];
-
-  struct pipe_blend_state blend_state;
-  struct pipe_depth_stencil_alpha_state dsa_state;
-  struct pipe_rasterizer_state rs_state;
-
-  uint8_t stencil_refs[2];
-  bool viewport_is_negative;
-  /* this is set if the contents of the FBO look upside down when viewed
-     with 0,0 as the bottom corner */
-  bool inverted_fbo_content;
-
-  GLuint blit_fb_ids[2];
-
-  struct pipe_depth_stencil_alpha_state *dsa;
-
-  struct pipe_clip_state ucp_state;
-
-  bool depth_test_enabled;
-  bool stencil_test_enabled;
-  bool framebuffer_srgb_enabled;
-
-  GLuint program_id;
-  int last_shader_idx;
-
-  GLint draw_indirect_buffer;
-
-  GLint draw_indirect_params_buffer;
-
-  struct pipe_rasterizer_state hw_rs_state;
-  struct pipe_blend_state hw_blend_state;
-
-  struct list_head streamout_list;
-  struct vrend_streamout_object *current_so;
-
-  struct pipe_blend_color blend_color;
-
-  uint32_t cond_render_q_id;
-  GLenum cond_render_gl_mode;
-
-  struct vrend_image_view image_views[PIPE_SHADER_TYPES]
-                                     [PIPE_MAX_SHADER_IMAGES];
-  uint32_t images_used_mask[PIPE_SHADER_TYPES];
-
-  struct vrend_ssbo ssbo[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_BUFFERS];
-  uint32_t ssbo_used_mask[PIPE_SHADER_TYPES];
-
-  struct vrend_abo abo[PIPE_MAX_HW_ATOMIC_BUFFERS];
-  uint32_t abo_used_mask;
-  uint8_t swizzle_output_rgb_to_bgr;
-};
-
-struct vrend_context {
-  struct list_head sub_ctxs;
-
-  struct vrend_sub_context *sub;
-  struct vrend_sub_context *sub0;
-
-  int ctx_id;
-  /* has this ctx gotten an error? */
-  bool in_error;
-  bool ctx_switch_pending;
-  bool pstip_inited;
-
-  GLuint pstipple_tex_id;
-
-  /* resource bounds to this context */
-  struct util_hash_table *res_hash;
-
-  struct list_head active_nontimer_query_list;
-  struct list_head ctx_entry;
-
-  struct vrend_shader_cfg shader_cfg;
-  struct virgl_client *client;
-};
-
-static void vrend_update_viewport_state(struct vrend_context *ctx);
-static void vrend_update_scissor_state(struct vrend_context *ctx);
-static void vrend_destroy_query_object(void *obj_ptr);
-static void vrend_finish_context_switch(struct vrend_context *ctx);
-static void vrend_patch_blend_state(struct vrend_context *ctx);
-static void vrend_update_frontface_state(struct vrend_context *ctx);
-static void vrend_destroy_resource_object(void *obj_ptr);
-static void vrend_renderer_detach_res_ctx(struct vrend_context *ctx,
-                                          int res_handle);
-static void vrend_destroy_program(struct vrend_linked_shader_program *ent);
-static void vrend_apply_sampler_state(struct vrend_context *ctx,
-                                      struct vrend_resource *res,
-                                      uint32_t shader_type, int id,
-                                      int sampler_id,
-                                      struct vrend_sampler_view *tview);
-static GLenum tgsitargettogltarget(const enum pipe_texture_target target,
-                                   int nr_samples);
-
-void vrend_update_stencil_state(struct vrend_context *ctx);
-
-static struct vrend_format_table tex_conv_table[VIRGL_FORMAT_MAX_EXTENDED];
-static bool tex_conv_table_initialized = false;
-
-static inline bool vrend_format_can_sample(enum virgl_formats format) {
-  return tex_conv_table[format].bindings & VIRGL_BIND_SAMPLER_VIEW;
-}
-
-static inline bool vrend_format_can_readback(enum virgl_formats format) {
-  return tex_conv_table[format].flags & VIRGL_TEXTURE_CAN_READBACK;
-}
-
-static inline bool vrend_format_can_render(enum virgl_formats format) {
-  return tex_conv_table[format].bindings & VIRGL_BIND_RENDER_TARGET;
-}
-
-static inline bool vrend_format_is_ds(enum virgl_formats format) {
-  return tex_conv_table[format].bindings & VIRGL_BIND_DEPTH_STENCIL;
-}
-
-static bool vrend_blit_needs_swizzle(enum virgl_formats src,
-                                     enum virgl_formats dst) {
-  for (int i = 0; i < 4; ++i) {
-    if (tex_conv_table[src].swizzle[i] != tex_conv_table[dst].swizzle[i])
-      return true;
-  }
-  return false;
-}
-
-static inline GLenum translate_gles_emulation_texture_target(GLenum target) {
-  switch (target) {
-  case GL_TEXTURE_1D:
-  case GL_TEXTURE_RECTANGLE:
-    return GL_TEXTURE_2D;
-  case GL_TEXTURE_1D_ARRAY:
-    return GL_TEXTURE_2D_ARRAY;
-  default:
-    return target;
-  }
-}
-
-static inline const char *pipe_shader_to_prefix(int shader_type) {
-  switch (shader_type) {
-  case PIPE_SHADER_VERTEX:
-    return "vs";
-  case PIPE_SHADER_FRAGMENT:
-    return "fs";
-  case PIPE_SHADER_GEOMETRY:
-    return "gs";
-  case PIPE_SHADER_TESS_CTRL:
-    return "tc";
-  case PIPE_SHADER_TESS_EVAL:
-    return "te";
-  case PIPE_SHADER_COMPUTE:
-    return "cs";
-  default:
-    return NULL;
-  };
-}
-
-static void init_features(int gles_ver) {
-  for (enum features_id id = 0; id < feat_last; id++) {
-    if (gles_ver >= feature_list[id].gles_ver) {
-      set_feature(id);
-    } else {
-      for (uint32_t i = 0; i < FEAT_MAX_EXTS; i++) {
-        if (!feature_list[id].gl_ext[i])
-          break;
-        if (vrend_has_gl_extension(feature_list[id].gl_ext[i])) {
-          set_feature(id);
-          break;
-        }
-      }
-    }
-  }
-}
-
-static void vrend_destroy_surface(struct vrend_surface *surf) {
-  if (surf->id != surf->texture->id)
-    glDeleteTextures(1, &surf->id);
-  vrend_resource_reference(&surf->texture, NULL);
-  free(surf);
-}
-
-static inline void vrend_surface_reference(struct vrend_surface **ptr,
-                                           struct vrend_surface *surf) {
-  struct vrend_surface *old_surf = *ptr;
-
-  if (pipe_reference(&(*ptr)->reference, &surf->reference))
-    vrend_destroy_surface(old_surf);
-  *ptr = surf;
-}
-
-static void vrend_destroy_sampler_view(struct vrend_sampler_view *samp) {
-  if (samp->texture->id != samp->id)
-    glDeleteTextures(1, &samp->id);
-  vrend_resource_reference(&samp->texture, NULL);
-  free(samp);
-}
-
-static inline void
-vrend_sampler_view_reference(struct vrend_sampler_view **ptr,
-                             struct vrend_sampler_view *view) {
-  struct vrend_sampler_view *old_view = *ptr;
-
-  if (pipe_reference(&(*ptr)->reference, &view->reference))
-    vrend_destroy_sampler_view(old_view);
-  *ptr = view;
-}
-
-static void vrend_destroy_so_target(struct vrend_so_target *target) {
-  vrend_resource_reference(&target->buffer, NULL);
-  free(target);
-}
-
-static inline void vrend_so_target_reference(struct vrend_so_target **ptr,
-                                             struct vrend_so_target *target) {
-  struct vrend_so_target *old_target = *ptr;
-
-  if (pipe_reference(&(*ptr)->reference, &target->reference))
-    vrend_destroy_so_target(old_target);
-  *ptr = target;
-}
-
-static void vrend_shader_destroy(struct vrend_shader *shader) {
-  struct vrend_linked_shader_program *ent, *tmp;
-
-  LIST_FOR_EACH_ENTRY_SAFE(ent, tmp, &shader->programs, sl[shader->sel->type]) {
-    vrend_destroy_program(ent);
-  }
-
-  glDeleteShader(shader->id);
-  strarray_free(&shader->glsl_strings, true);
-  free(shader);
-}
-
-static void vrend_destroy_shader_selector(struct vrend_shader_selector *sel) {
-  struct vrend_shader *p = sel->current, *c;
-  unsigned i;
-  while (p) {
-    c = p->next_variant;
-    vrend_shader_destroy(p);
-    p = c;
-  }
-  if (sel->sinfo.so_names)
-    for (i = 0; i < sel->sinfo.so_info.num_outputs; i++)
-      free(sel->sinfo.so_names[i]);
-  free(sel->tmp_buf);
-  free(sel->sinfo.so_names);
-  free(sel->sinfo.interpinfo);
-  free(sel->sinfo.sampler_arrays);
-  free(sel->sinfo.image_arrays);
-  free(sel->tokens);
-  free(sel);
-}
-
-static bool vrend_compile_shader(struct vrend_context *ctx,
-                                 struct vrend_shader *shader) {
-  GLint param;
-  const char *shader_parts[SHADER_MAX_STRINGS];
-
-  for (int i = 0; i < shader->glsl_strings.num_strings; i++)
-    shader_parts[i] = shader->glsl_strings.strings[i].buf;
-  glShaderSource(shader->id, shader->glsl_strings.num_strings, shader_parts,
-                 NULL);
-  glCompileShader(shader->id);
-  glGetShaderiv(shader->id, GL_COMPILE_STATUS, &param);
-  if (param == GL_FALSE)
-    return false;
-  return true;
-}
-
-static inline void
-vrend_shader_state_reference(struct vrend_shader_selector **ptr,
-                             struct vrend_shader_selector *shader) {
-  struct vrend_shader_selector *old_shader = *ptr;
-
-  if (pipe_reference(&(*ptr)->reference, &shader->reference))
-    vrend_destroy_shader_selector(old_shader);
-  *ptr = shader;
-}
-
-void vrend_insert_format(struct vrend_format_table *entry, uint32_t bindings,
-                         uint32_t flags) {
-  tex_conv_table[entry->format] = *entry;
-  tex_conv_table[entry->format].bindings = bindings;
-  tex_conv_table[entry->format].flags = flags;
-}
-
-void vrend_insert_format_swizzle(int override_format,
-                                 struct vrend_format_table *entry,
-                                 uint32_t bindings, uint8_t swizzle[4],
-                                 uint32_t flags) {
-  int i;
-  tex_conv_table[override_format] = *entry;
-  tex_conv_table[override_format].bindings = bindings;
-  tex_conv_table[override_format].flags = flags | VIRGL_TEXTURE_NEED_SWIZZLE;
-  for (i = 0; i < 4; i++)
-    tex_conv_table[override_format].swizzle[i] = swizzle[i];
-}
-
-const struct vrend_format_table *
-vrend_get_format_table_entry(enum virgl_formats format) {
-  return &tex_conv_table[format];
-}
-
-static void vrend_use_program(struct vrend_context *ctx, GLuint program_id) {
-  if (ctx->sub->program_id != program_id) {
-    glUseProgram(program_id);
-    ctx->sub->program_id = program_id;
-  }
-}
-
-static void vrend_init_pstipple_texture(struct vrend_context *ctx) {
-  glGenTextures(1, &ctx->pstipple_tex_id);
-  glBindTexture(GL_TEXTURE_2D, ctx->pstipple_tex_id);
-  glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, 32, 32, 0, GL_RED, GL_UNSIGNED_BYTE,
-               NULL);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-  ctx->pstip_inited = true;
-}
-
-static void vrend_depth_test_enable(struct vrend_context *ctx,
-                                    bool depth_test_enable) {
-  if (ctx->sub->depth_test_enabled != depth_test_enable) {
-    ctx->sub->depth_test_enabled = depth_test_enable;
-    if (depth_test_enable)
-      glEnable(GL_DEPTH_TEST);
-    else
-      glDisable(GL_DEPTH_TEST);
-  }
-}
-
-static void vrend_stencil_test_enable(struct vrend_context *ctx,
-                                      bool stencil_test_enable) {
-  if (ctx->sub->stencil_test_enabled != stencil_test_enable) {
-    ctx->sub->stencil_test_enabled = stencil_test_enable;
-    if (stencil_test_enable)
-      glEnable(GL_STENCIL_TEST);
-    else
-      glDisable(GL_STENCIL_TEST);
-  }
-}
-
-static int bind_sampler_locs(struct vrend_linked_shader_program *sprog, int id,
-                             int next_sampler_id) {
-  if (sprog->ss[id]->sel->sinfo.samplers_used_mask) {
-    uint32_t mask = sprog->ss[id]->sel->sinfo.samplers_used_mask;
-    int nsamp = util_bitcount(sprog->ss[id]->sel->sinfo.samplers_used_mask);
-    int index;
-    sprog->shadow_samp_mask[id] = sprog->ss[id]->sel->sinfo.shadow_samp_mask;
-    if (sprog->ss[id]->sel->sinfo.shadow_samp_mask) {
-      sprog->shadow_samp_mask_locs[id] = calloc(nsamp, sizeof(uint32_t));
-      sprog->shadow_samp_add_locs[id] = calloc(nsamp, sizeof(uint32_t));
-    } else {
-      sprog->shadow_samp_mask_locs[id] = sprog->shadow_samp_add_locs[id] = NULL;
-    }
-    const char *prefix = pipe_shader_to_prefix(id);
-    index = 0;
-    while (mask) {
-      uint32_t i = u_bit_scan(&mask);
-      char name[64];
-      if (sprog->ss[id]->sel->sinfo.num_sampler_arrays) {
-        int arr_idx =
-            vrend_shader_lookup_sampler_array(&sprog->ss[id]->sel->sinfo, i);
-        snprintf(name, 32, "%ssamp%d[%d]", prefix, arr_idx, i - arr_idx);
-      } else
-        snprintf(name, 32, "%ssamp%d", prefix, i);
-
-      glUniform1i(glGetUniformLocation(sprog->id, name), next_sampler_id++);
-
-      if (sprog->ss[id]->sel->sinfo.shadow_samp_mask & (1 << i)) {
-        snprintf(name, 32, "%sshadmask%d", prefix, i);
-        sprog->shadow_samp_mask_locs[id][index] =
-            glGetUniformLocation(sprog->id, name);
-        snprintf(name, 32, "%sshadadd%d", prefix, i);
-        sprog->shadow_samp_add_locs[id][index] =
-            glGetUniformLocation(sprog->id, name);
-      }
-      index++;
-    }
-  } else {
-    sprog->shadow_samp_mask_locs[id] = NULL;
-    sprog->shadow_samp_add_locs[id] = NULL;
-    sprog->shadow_samp_mask[id] = 0;
-  }
-  sprog->samplers_used_mask[id] = sprog->ss[id]->sel->sinfo.samplers_used_mask;
-
-  return next_sampler_id;
-}
-
-static void bind_const_locs(struct vrend_linked_shader_program *sprog, int id) {
-  if (sprog->ss[id]->sel->sinfo.num_consts) {
-    char name[32];
-    snprintf(name, 32, "%sconst0", pipe_shader_to_prefix(id));
-    sprog->const_location[id] = glGetUniformLocation(sprog->id, name);
-  } else
-    sprog->const_location[id] = -1;
-}
-
-static int bind_ubo_locs(struct vrend_linked_shader_program *sprog, int id,
-                         int next_ubo_id) {
-  if (!has_feature(feat_ubo))
-    return next_ubo_id;
-  if (sprog->ss[id]->sel->sinfo.ubo_used_mask) {
-    const char *prefix = pipe_shader_to_prefix(id);
-
-    unsigned mask = sprog->ss[id]->sel->sinfo.ubo_used_mask;
-    while (mask) {
-      uint32_t ubo_idx = u_bit_scan(&mask);
-      char name[32];
-      if (sprog->ss[id]->sel->sinfo.ubo_indirect)
-        snprintf(name, 32, "%subo[%d]", prefix, ubo_idx - 1);
-      else
-        snprintf(name, 32, "%subo%d", prefix, ubo_idx);
-
-      GLuint loc = glGetUniformBlockIndex(sprog->id, name);
-      glUniformBlockBinding(sprog->id, loc, next_ubo_id++);
-    }
-  }
-
-  sprog->ubo_used_mask[id] = sprog->ss[id]->sel->sinfo.ubo_used_mask;
-
-  return next_ubo_id;
-}
-
-static void bind_ssbo_locs(struct vrend_linked_shader_program *sprog, int id) {
-  int i;
-  char name[32];
-  if (!has_feature(feat_ssbo))
-    return;
-  if (sprog->ss[id]->sel->sinfo.ssbo_used_mask) {
-    const char *prefix = pipe_shader_to_prefix(id);
-    uint32_t mask = sprog->ss[id]->sel->sinfo.ssbo_used_mask;
-    sprog->ssbo_locs[id] = calloc(util_last_bit(mask), sizeof(uint32_t));
-
-    while (mask) {
-      i = u_bit_scan(&mask);
-      snprintf(name, 32, "%sssbo%d", prefix, i);
-      sprog->ssbo_locs[id][i] =
-          glGetProgramResourceIndex(sprog->id, GL_SHADER_STORAGE_BLOCK, name);
-    }
-  } else
-    sprog->ssbo_locs[id] = NULL;
-}
-
-static void bind_image_locs(struct vrend_linked_shader_program *sprog, int id) {
-  int i;
-  char name[32];
-  const char *prefix = pipe_shader_to_prefix(id);
-
-  uint32_t mask = sprog->ss[id]->sel->sinfo.images_used_mask;
-  if (!mask && !sprog->ss[id]->sel->sinfo.num_image_arrays)
-    return;
-
-  if (!has_feature(feat_images))
-    return;
-
-  int nsamp = util_last_bit(mask);
-  if (nsamp) {
-    sprog->img_locs[id] = calloc(nsamp, sizeof(GLint));
-    if (!sprog->img_locs[id])
-      return;
-  } else
-    sprog->img_locs[id] = NULL;
-
-  if (sprog->ss[id]->sel->sinfo.num_image_arrays) {
-    for (i = 0; i < sprog->ss[id]->sel->sinfo.num_image_arrays; i++) {
-      struct vrend_array *img_array =
-          &sprog->ss[id]->sel->sinfo.image_arrays[i];
-      for (int j = 0; j < img_array->array_size; j++) {
-        snprintf(name, 32, "%simg%d[%d]", prefix, img_array->first, j);
-        sprog->img_locs[id][img_array->first + j] =
-            glGetUniformLocation(sprog->id, name);
-      }
-    }
-  } else if (mask) {
-    for (i = 0; i < nsamp; i++) {
-      if (mask & (1 << i)) {
-        snprintf(name, 32, "%simg%d", prefix, i);
-        sprog->img_locs[id][i] = glGetUniformLocation(sprog->id, name);
-      } else {
-        sprog->img_locs[id][i] = -1;
-      }
-    }
-  }
-  sprog->images_used_mask[id] = mask;
-}
-
-static struct vrend_linked_shader_program *
-add_cs_shader_program(struct vrend_context *ctx, struct vrend_shader *cs) {
-  struct vrend_linked_shader_program *sprog =
-      CALLOC_STRUCT(vrend_linked_shader_program);
-  GLuint prog_id;
-  GLint lret;
-  prog_id = glCreateProgram();
-  glAttachShader(prog_id, cs->id);
-  glLinkProgram(prog_id);
-
-  glGetProgramiv(prog_id, GL_LINK_STATUS, &lret);
-  if (lret == GL_FALSE) {
-    glDeleteProgram(prog_id);
-    free(sprog);
-    return NULL;
-  }
-  sprog->ss[PIPE_SHADER_COMPUTE] = cs;
-
-  list_add(&sprog->sl[PIPE_SHADER_COMPUTE], &cs->programs);
-  sprog->id = prog_id;
-  list_addtail(&sprog->head, &ctx->sub->programs);
-
-  vrend_use_program(ctx, prog_id);
-
-  bind_sampler_locs(sprog, PIPE_SHADER_COMPUTE, 0);
-  bind_ubo_locs(sprog, PIPE_SHADER_COMPUTE, 0);
-  bind_ssbo_locs(sprog, PIPE_SHADER_COMPUTE);
-  bind_const_locs(sprog, PIPE_SHADER_COMPUTE);
-  bind_image_locs(sprog, PIPE_SHADER_COMPUTE);
-  return sprog;
-}
-
-static struct vrend_linked_shader_program *
-add_shader_program(struct vrend_context *ctx, struct vrend_shader *vs,
-                   struct vrend_shader *fs, struct vrend_shader *gs,
-                   struct vrend_shader *tcs, struct vrend_shader *tes) {
-  struct vrend_linked_shader_program *sprog =
-      CALLOC_STRUCT(vrend_linked_shader_program);
-  char name[64];
-  int i;
-  GLuint prog_id;
-  GLint lret;
-  int id;
-  int last_shader;
-  bool do_patch = false;
-  if (!sprog)
-    return NULL;
-
-  /* need to rewrite VS code to add interpolation params */
-  if (gs && gs->compiled_fs_id != fs->id)
-    do_patch = true;
-  if (!gs && tes && tes->compiled_fs_id != fs->id)
-    do_patch = true;
-  if (!gs && !tes && vs->compiled_fs_id != fs->id)
-    do_patch = true;
-
-  if (do_patch) {
-    bool ret;
-
-    if (gs)
-      vrend_patch_vertex_shader_interpolants(
-          ctx, &ctx->shader_cfg, &gs->glsl_strings, &gs->sel->sinfo,
-          &fs->sel->sinfo, "gso", fs->key.flatshade);
-    else if (tes)
-      vrend_patch_vertex_shader_interpolants(
-          ctx, &ctx->shader_cfg, &tes->glsl_strings, &tes->sel->sinfo,
-          &fs->sel->sinfo, "teo", fs->key.flatshade);
-    else
-      vrend_patch_vertex_shader_interpolants(
-          ctx, &ctx->shader_cfg, &vs->glsl_strings, &vs->sel->sinfo,
-          &fs->sel->sinfo, "vso", fs->key.flatshade);
-    ret = vrend_compile_shader(ctx, gs ? gs : (tes ? tes : vs));
-    if (ret == false) {
-      glDeleteShader(gs ? gs->id : (tes ? tes->id : vs->id));
-      free(sprog);
-      return NULL;
-    }
-    if (gs)
-      gs->compiled_fs_id = fs->id;
-    else if (tes)
-      tes->compiled_fs_id = fs->id;
-    else
-      vs->compiled_fs_id = fs->id;
-  }
-
-  prog_id = glCreateProgram();
-  glAttachShader(prog_id, vs->id);
-  if (tcs && tcs->id > 0)
-    glAttachShader(prog_id, tcs->id);
-  if (tes && tes->id > 0)
-    glAttachShader(prog_id, tes->id);
-
-  glAttachShader(prog_id, fs->id);
-
-  sprog->dual_src_linked = false;
-
-  if (has_feature(feat_gles31_vertex_attrib_binding)) {
-    uint32_t mask = vs->sel->sinfo.attrib_input_mask;
-    while (mask) {
-      i = u_bit_scan(&mask);
-      snprintf(name, 32, "in_%d", i);
-      glBindAttribLocation(prog_id, i, name);
-    }
-  }
-
-  glLinkProgram(prog_id);
-
-  glGetProgramiv(prog_id, GL_LINK_STATUS, &lret);
-  if (lret == GL_FALSE) {
-    glDeleteProgram(prog_id);
-    free(sprog);
-    return NULL;
-  }
-
-  sprog->ss[PIPE_SHADER_VERTEX] = vs;
-  sprog->ss[PIPE_SHADER_FRAGMENT] = fs;
-  sprog->ss[PIPE_SHADER_GEOMETRY] = gs;
-  sprog->ss[PIPE_SHADER_TESS_CTRL] = tcs;
-  sprog->ss[PIPE_SHADER_TESS_EVAL] = tes;
-
-  list_add(&sprog->sl[PIPE_SHADER_VERTEX], &vs->programs);
-  list_add(&sprog->sl[PIPE_SHADER_FRAGMENT], &fs->programs);
-  if (gs)
-    list_add(&sprog->sl[PIPE_SHADER_GEOMETRY], &gs->programs);
-  if (tcs)
-    list_add(&sprog->sl[PIPE_SHADER_TESS_CTRL], &tcs->programs);
-  if (tes)
-    list_add(&sprog->sl[PIPE_SHADER_TESS_EVAL], &tes->programs);
-
-  last_shader = tes ? PIPE_SHADER_TESS_EVAL
-                    : (gs ? PIPE_SHADER_GEOMETRY : PIPE_SHADER_FRAGMENT);
-  sprog->id = prog_id;
-
-  list_addtail(&sprog->head, &ctx->sub->programs);
-
-  if (fs->key.pstipple_tex)
-    sprog->fs_stipple_loc = glGetUniformLocation(prog_id, "pstipple_sampler");
-  else
-    sprog->fs_stipple_loc = -1;
-  sprog->vs_ws_adjust_loc = glGetUniformLocation(prog_id, "winsys_adjust_y");
-
-  vrend_use_program(ctx, prog_id);
-
-  int next_ubo_id = 0, next_sampler_id = 0;
-  for (id = PIPE_SHADER_VERTEX; id <= last_shader; id++) {
-    if (!sprog->ss[id])
-      continue;
-
-    next_sampler_id = bind_sampler_locs(sprog, id, next_sampler_id);
-    bind_const_locs(sprog, id);
-    next_ubo_id = bind_ubo_locs(sprog, id, next_ubo_id);
-    bind_image_locs(sprog, id);
-    bind_ssbo_locs(sprog, id);
-  }
-
-  if (!has_feature(feat_gles31_vertex_attrib_binding)) {
-    if (vs->sel->sinfo.num_inputs) {
-      sprog->attrib_locs = calloc(vs->sel->sinfo.num_inputs, sizeof(uint32_t));
-      if (sprog->attrib_locs) {
-        for (i = 0; i < vs->sel->sinfo.num_inputs; i++) {
-          snprintf(name, 32, "in_%d", i);
-          sprog->attrib_locs[i] = glGetAttribLocation(prog_id, name);
-        }
-      }
-    } else
-      sprog->attrib_locs = NULL;
-  }
-
-  if (vs->sel->sinfo.num_ucp) {
-    for (i = 0; i < vs->sel->sinfo.num_ucp; i++) {
-      snprintf(name, 32, "clipp[%d]", i);
-      sprog->clip_locs[i] = glGetUniformLocation(prog_id, name);
-    }
-  }
-  return sprog;
-}
-
-static struct vrend_linked_shader_program *
-lookup_cs_shader_program(struct vrend_context *ctx, GLuint cs_id) {
-  struct vrend_linked_shader_program *ent;
-  LIST_FOR_EACH_ENTRY(ent, &ctx->sub->programs, head) {
-    if (!ent->ss[PIPE_SHADER_COMPUTE])
-      continue;
-    if (ent->ss[PIPE_SHADER_COMPUTE]->id == cs_id)
-      return ent;
-  }
-  return NULL;
-}
-
-static struct vrend_linked_shader_program *
-lookup_shader_program(struct vrend_context *ctx, GLuint vs_id, GLuint fs_id,
-                      GLuint gs_id, GLuint tcs_id, GLuint tes_id,
-                      bool dual_src) {
-  struct vrend_linked_shader_program *ent;
-  LIST_FOR_EACH_ENTRY(ent, &ctx->sub->programs, head) {
-    if (ent->dual_src_linked != dual_src)
-      continue;
-    if (ent->ss[PIPE_SHADER_COMPUTE])
-      continue;
-    if (ent->ss[PIPE_SHADER_VERTEX]->id != vs_id)
-      continue;
-    if (ent->ss[PIPE_SHADER_FRAGMENT]->id != fs_id)
-      continue;
-    if (ent->ss[PIPE_SHADER_GEOMETRY] &&
-        ent->ss[PIPE_SHADER_GEOMETRY]->id != gs_id)
-      continue;
-    if (ent->ss[PIPE_SHADER_TESS_CTRL] &&
-        ent->ss[PIPE_SHADER_TESS_CTRL]->id != tcs_id)
-      continue;
-    if (ent->ss[PIPE_SHADER_TESS_EVAL] &&
-        ent->ss[PIPE_SHADER_TESS_EVAL]->id != tes_id)
-      continue;
-    return ent;
-  }
-  return NULL;
-}
-
-static void vrend_destroy_program(struct vrend_linked_shader_program *ent) {
-  int i;
-  if (ent->ref_context && ent->ref_context->prog == ent)
-    ent->ref_context->prog = NULL;
-
-  glDeleteProgram(ent->id);
-  list_del(&ent->head);
-
-  for (i = PIPE_SHADER_VERTEX; i <= PIPE_SHADER_COMPUTE; i++) {
-    if (ent->ss[i])
-      list_del(&ent->sl[i]);
-    free(ent->shadow_samp_mask_locs[i]);
-    free(ent->shadow_samp_add_locs[i]);
-    free(ent->ssbo_locs[i]);
-    free(ent->img_locs[i]);
-  }
-  free(ent->attrib_locs);
-  free(ent);
-}
-
-static void vrend_free_programs(struct vrend_sub_context *sub) {
-  struct vrend_linked_shader_program *ent, *tmp;
-
-  if (LIST_IS_EMPTY(&sub->programs))
-    return;
-
-  LIST_FOR_EACH_ENTRY_SAFE(ent, tmp, &sub->programs, head) {
-    vrend_destroy_program(ent);
-  }
-}
-
-static void vrend_destroy_streamout_object(struct vrend_streamout_object *obj) {
-  unsigned i;
-  list_del(&obj->head);
-  for (i = 0; i < obj->num_targets; i++)
-    vrend_so_target_reference(&obj->so_targets[i], NULL);
-  if (has_feature(feat_transform_feedback2))
-    glDeleteTransformFeedbacks(1, &obj->id);
-  FREE(obj);
-}
-
-int vrend_create_surface(struct vrend_context *ctx, uint32_t handle,
-                         uint32_t res_handle, uint32_t format, uint32_t val0,
-                         uint32_t val1) {
-  struct vrend_surface *surf;
-  struct vrend_resource *res;
-  uint32_t ret_handle;
-
-  if (format >= PIPE_FORMAT_COUNT) {
-    return EINVAL;
-  }
-
-  res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-  if (!res)
-    return EINVAL;
-
-  surf = CALLOC_STRUCT(vrend_surface);
-  if (!surf)
-    return ENOMEM;
-
-  surf->res_handle = res_handle;
-  surf->format = format;
-
-  surf->val0 = val0;
-  surf->val1 = val1;
-  surf->id = res->id;
-
-  pipe_reference_init(&surf->reference, 1);
-
-  vrend_resource_reference(&surf->texture, res);
-
-  ret_handle = vrend_renderer_object_insert(ctx, surf, sizeof(*surf), handle,
-                                            VIRGL_OBJECT_SURFACE);
-  if (ret_handle == 0) {
-    FREE(surf);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static void vrend_destroy_surface_object(void *obj_ptr) {
-  struct vrend_surface *surface = obj_ptr;
-
-  vrend_surface_reference(&surface, NULL);
-}
-
-static void vrend_destroy_sampler_view_object(void *obj_ptr) {
-  struct vrend_sampler_view *samp = obj_ptr;
-
-  vrend_sampler_view_reference(&samp, NULL);
-}
-
-static void vrend_destroy_so_target_object(void *obj_ptr) {
-  struct vrend_so_target *target = obj_ptr;
-  struct vrend_sub_context *sub_ctx = target->sub_ctx;
-  struct vrend_streamout_object *obj, *tmp;
-  bool found;
-  unsigned i;
-
-  LIST_FOR_EACH_ENTRY_SAFE(obj, tmp, &sub_ctx->streamout_list, head) {
-    found = false;
-    for (i = 0; i < obj->num_targets; i++) {
-      if (obj->so_targets[i] == target) {
-        found = true;
-        break;
-      }
-    }
-    if (found) {
-      if (obj == sub_ctx->current_so)
-        sub_ctx->current_so = NULL;
-      if (obj->xfb_state == XFB_STATE_PAUSED) {
-        if (has_feature(feat_transform_feedback2))
-          glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, obj->id);
-        glEndTransformFeedback();
-        if (sub_ctx->current_so && has_feature(feat_transform_feedback2))
-          glBindTransformFeedback(GL_TRANSFORM_FEEDBACK,
-                                  sub_ctx->current_so->id);
-      }
-      vrend_destroy_streamout_object(obj);
-    }
-  }
-
-  vrend_so_target_reference(&target, NULL);
-}
-
-static void vrend_destroy_vertex_elements_object(void *obj_ptr) {
-  struct vrend_vertex_element_array *v = obj_ptr;
-
-  if (has_feature(feat_gles31_vertex_attrib_binding)) {
-    glDeleteVertexArrays(1, &v->id);
-  }
-  FREE(v);
-}
-
-static void vrend_destroy_sampler_state_object(void *obj_ptr) {
-  struct vrend_sampler_state *state = obj_ptr;
-
-  if (has_feature(feat_samplers))
-    glDeleteSamplers(2, state->ids);
-  FREE(state);
-}
-
-static GLuint convert_wrap(int wrap) {
-  switch (wrap) {
-  case PIPE_TEX_WRAP_REPEAT:
-    return GL_REPEAT;
-  case PIPE_TEX_WRAP_CLAMP:;
-  case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
-    return GL_CLAMP_TO_EDGE;
-  case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
-    return GL_CLAMP_TO_BORDER;
-
-  case PIPE_TEX_WRAP_MIRROR_REPEAT:
-    return GL_MIRRORED_REPEAT;
-  case PIPE_TEX_WRAP_MIRROR_CLAMP:
-  case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
-  case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
-    return GL_MIRROR_CLAMP_TO_EDGE_EXT;
-  default:
-    assert(0);
-    return -1;
-  }
-}
-
-static inline GLenum convert_mag_filter(unsigned int filter) {
-  if (filter == PIPE_TEX_FILTER_NEAREST)
-    return GL_NEAREST;
-  return GL_LINEAR;
-}
-
-static inline GLenum convert_min_filter(unsigned int filter,
-                                        unsigned int mip_filter) {
-  if (mip_filter == PIPE_TEX_MIPFILTER_NONE)
-    return convert_mag_filter(filter);
-  else if (mip_filter == PIPE_TEX_MIPFILTER_LINEAR) {
-    if (filter == PIPE_TEX_FILTER_NEAREST)
-      return GL_NEAREST_MIPMAP_LINEAR;
-    else
-      return GL_LINEAR_MIPMAP_LINEAR;
-  } else if (mip_filter == PIPE_TEX_MIPFILTER_NEAREST) {
-    if (filter == PIPE_TEX_FILTER_NEAREST)
-      return GL_NEAREST_MIPMAP_NEAREST;
-    else
-      return GL_LINEAR_MIPMAP_NEAREST;
-  }
-  assert(0);
-  return 0;
-}
-
-int vrend_create_sampler_state(struct vrend_context *ctx, uint32_t handle,
-                               struct pipe_sampler_state *templ) {
-  struct vrend_sampler_state *state = CALLOC_STRUCT(vrend_sampler_state);
-  int ret_handle;
-
-  if (!state)
-    return ENOMEM;
-
-  state->base = *templ;
-
-  if (has_feature(feat_samplers)) {
-    glGenSamplers(2, state->ids);
-
-    for (int i = 0; i < 2; ++i) {
-      glSamplerParameteri(state->ids[i], GL_TEXTURE_WRAP_S,
-                          convert_wrap(templ->wrap_s));
-      glSamplerParameteri(state->ids[i], GL_TEXTURE_WRAP_T,
-                          convert_wrap(templ->wrap_t));
-      glSamplerParameteri(state->ids[i], GL_TEXTURE_WRAP_R,
-                          convert_wrap(templ->wrap_r));
-      glSamplerParameterf(
-          state->ids[i], GL_TEXTURE_MIN_FILTER,
-          convert_min_filter(templ->min_img_filter, templ->min_mip_filter));
-      glSamplerParameterf(state->ids[i], GL_TEXTURE_MAG_FILTER,
-                          convert_mag_filter(templ->mag_img_filter));
-      glSamplerParameterf(state->ids[i], GL_TEXTURE_MIN_LOD, templ->min_lod);
-      glSamplerParameterf(state->ids[i], GL_TEXTURE_MAX_LOD, templ->max_lod);
-      glSamplerParameteri(state->ids[i], GL_TEXTURE_COMPARE_FUNC,
-                          GL_NEVER + templ->compare_func);
-      glSamplerParameterIuiv(state->ids[i], GL_TEXTURE_BORDER_COLOR,
-                             templ->border_color.ui);
-      glSamplerParameteri(state->ids[i], GL_TEXTURE_SRGB_DECODE_EXT,
-                          i == 0 ? GL_SKIP_DECODE_EXT : GL_DECODE_EXT);
-    }
-  }
-  ret_handle = vrend_renderer_object_insert(ctx, state,
-                                            sizeof(struct vrend_sampler_state),
-                                            handle, VIRGL_OBJECT_SAMPLER_STATE);
-  if (!ret_handle) {
-    if (has_feature(feat_samplers))
-      glDeleteSamplers(2, state->ids);
-    FREE(state);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static inline GLenum to_gl_swizzle(int swizzle) {
-  switch (swizzle) {
-  case PIPE_SWIZZLE_RED:
-    return GL_RED;
-  case PIPE_SWIZZLE_GREEN:
-    return GL_GREEN;
-  case PIPE_SWIZZLE_BLUE:
-    return GL_BLUE;
-  case PIPE_SWIZZLE_ALPHA:
-    return GL_ALPHA;
-  case PIPE_SWIZZLE_ZERO:
-    return GL_ZERO;
-  case PIPE_SWIZZLE_ONE:
-    return GL_ONE;
-  default:
-    assert(0);
-    return 0;
-  }
-}
-
-int vrend_create_sampler_view(struct vrend_context *ctx, uint32_t handle,
-                              uint32_t res_handle, uint32_t format,
-                              uint32_t val0, uint32_t val1,
-                              uint32_t swizzle_packed) {
-  struct vrend_sampler_view *view;
-  struct vrend_resource *res;
-  int ret_handle;
-  uint8_t swizzle[4];
-
-  res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-  if (!res)
-    return EINVAL;
-
-  view = CALLOC_STRUCT(vrend_sampler_view);
-  if (!view)
-    return ENOMEM;
-
-  pipe_reference_init(&view->reference, 1);
-  view->format = format & 0xffffff;
-
-  if (!view->format || view->format >= VIRGL_FORMAT_MAX) {
-    FREE(view);
-    return EINVAL;
-  }
-
-  uint32_t pipe_target = (format >> 24) & 0xff;
-  if (pipe_target >= PIPE_MAX_TEXTURE_TYPES) {
-    FREE(view);
-    return EINVAL;
-  }
-
-  view->target = tgsitargettogltarget(pipe_target, res->base.nr_samples);
-  view->target = translate_gles_emulation_texture_target(view->target);
-
-  view->val0 = val0;
-  view->val1 = val1;
-
-  swizzle[0] = swizzle_packed & 0x7;
-  swizzle[1] = (swizzle_packed >> 3) & 0x7;
-  swizzle[2] = (swizzle_packed >> 6) & 0x7;
-  swizzle[3] = (swizzle_packed >> 9) & 0x7;
-
-  vrend_resource_reference(&view->texture, res);
-
-  view->id = view->texture->id;
-  if (view->target == PIPE_BUFFER)
-    view->target = view->texture->target;
-
-  view->srgb_decode = GL_DECODE_EXT;
-  if (view->format != view->texture->base.format) {
-    if (util_format_is_srgb(view->texture->base.format) &&
-        !util_format_is_srgb(view->format))
-      view->srgb_decode = GL_SKIP_DECODE_EXT;
-  }
-
-  if (!(util_format_has_alpha(view->format) ||
-        util_format_is_depth_or_stencil(view->format))) {
-    if (swizzle[0] == PIPE_SWIZZLE_ALPHA)
-      swizzle[0] = PIPE_SWIZZLE_ONE;
-    if (swizzle[1] == PIPE_SWIZZLE_ALPHA)
-      swizzle[1] = PIPE_SWIZZLE_ONE;
-    if (swizzle[2] == PIPE_SWIZZLE_ALPHA)
-      swizzle[2] = PIPE_SWIZZLE_ONE;
-    if (swizzle[3] == PIPE_SWIZZLE_ALPHA)
-      swizzle[3] = PIPE_SWIZZLE_ONE;
-  }
-
-  if (tex_conv_table[view->format].flags & VIRGL_TEXTURE_NEED_SWIZZLE) {
-    if (swizzle[0] <= PIPE_SWIZZLE_ALPHA)
-      swizzle[0] = tex_conv_table[view->format].swizzle[swizzle[0]];
-    if (swizzle[1] <= PIPE_SWIZZLE_ALPHA)
-      swizzle[1] = tex_conv_table[view->format].swizzle[swizzle[1]];
-    if (swizzle[2] <= PIPE_SWIZZLE_ALPHA)
-      swizzle[2] = tex_conv_table[view->format].swizzle[swizzle[2]];
-    if (swizzle[3] <= PIPE_SWIZZLE_ALPHA)
-      swizzle[3] = tex_conv_table[view->format].swizzle[swizzle[3]];
-  }
-
-  view->gl_swizzle_r = to_gl_swizzle(swizzle[0]);
-  view->gl_swizzle_g = to_gl_swizzle(swizzle[1]);
-  view->gl_swizzle_b = to_gl_swizzle(swizzle[2]);
-  view->gl_swizzle_a = to_gl_swizzle(swizzle[3]);
-
-  ret_handle = vrend_renderer_object_insert(ctx, view, sizeof(*view), handle,
-                                            VIRGL_OBJECT_SAMPLER_VIEW);
-  if (ret_handle == 0) {
-    FREE(view);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-void vrend_fb_bind_texture_id(struct vrend_resource *res, int id, int idx,
-                              uint32_t level, uint32_t layer) {
-  const struct util_format_description *desc =
-      util_format_description(res->base.format);
-  GLenum attachment = GL_COLOR_ATTACHMENT0 + idx;
-
-  if (vrend_format_is_ds(res->base.format)) {
-    if (util_format_has_stencil(desc)) {
-      if (util_format_has_depth(desc))
-        attachment = GL_DEPTH_STENCIL_ATTACHMENT;
-      else
-        attachment = GL_STENCIL_ATTACHMENT;
-    } else
-      attachment = GL_DEPTH_ATTACHMENT;
-  }
-
-  switch (res->target) {
-  case GL_TEXTURE_1D_ARRAY:
-  case GL_TEXTURE_2D_ARRAY:
-  case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-  case GL_TEXTURE_CUBE_MAP_ARRAY:
-    if (layer == 0xffffffff)
-      glFramebufferTexture(GL_FRAMEBUFFER, attachment, id, level);
-    else
-      glFramebufferTextureLayer(GL_FRAMEBUFFER, attachment, id, level, layer);
-    break;
-  case GL_TEXTURE_3D:
-    if (layer == 0xffffffff)
-      glFramebufferTexture(GL_FRAMEBUFFER, attachment, id, level);
-    break;
-  case GL_TEXTURE_CUBE_MAP:
-    if (layer == 0xffffffff)
-      glFramebufferTexture(GL_FRAMEBUFFER, attachment, id, level);
-    else
-      glFramebufferTexture2D(GL_FRAMEBUFFER, attachment,
-                             GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer, id, level);
-    break;
-  case GL_TEXTURE_1D:
-  case GL_TEXTURE_2D:
-  default:
-    glFramebufferTexture2D(GL_FRAMEBUFFER, attachment, res->target, id, level);
-    break;
-  }
-
-  if (attachment == GL_DEPTH_ATTACHMENT) {
-    switch (res->target) {
-    case GL_TEXTURE_1D:
-    case GL_TEXTURE_2D:
-    default:
-      glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                             GL_TEXTURE_2D, 0, 0);
-      break;
-    }
-  }
-}
-
-void vrend_fb_bind_texture(struct vrend_resource *res, int idx, uint32_t level,
-                           uint32_t layer) {
-  vrend_fb_bind_texture_id(res, res->id, idx, level, layer);
-}
-
-static void vrend_hw_set_zsurf_texture(struct vrend_context *ctx) {
-  struct vrend_surface *surf = ctx->sub->zsurf;
-
-  if (!surf) {
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                           GL_TEXTURE_2D, 0, 0);
-  } else {
-    uint32_t first_layer = surf->val1 & 0xffff;
-    uint32_t last_layer = (surf->val1 >> 16) & 0xffff;
-
-    if (!surf->texture)
-      return;
-
-    vrend_fb_bind_texture_id(surf->texture, surf->id, 0, surf->val0,
-                             first_layer != last_layer ? 0xffffffff
-                                                       : first_layer);
-  }
-}
-
-static void vrend_hw_set_color_surface(struct vrend_context *ctx, int index) {
-  struct vrend_surface *surf = ctx->sub->surf[index];
-
-  if (!surf) {
-    GLenum attachment = GL_COLOR_ATTACHMENT0 + index;
-
-    glFramebufferTexture2D(GL_FRAMEBUFFER, attachment, GL_TEXTURE_2D, 0, 0);
-  } else {
-    uint32_t first_layer = ctx->sub->surf[index]->val1 & 0xffff;
-    uint32_t last_layer = (ctx->sub->surf[index]->val1 >> 16) & 0xffff;
-
-    vrend_fb_bind_texture_id(surf->texture, surf->id, index, surf->val0,
-                             first_layer != last_layer ? 0xffffffff
-                                                       : first_layer);
-  }
-}
-
-static void vrend_hw_emit_framebuffer_state(struct vrend_context *ctx) {
-  static const GLenum buffers[8] = {
-      GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2,
-      GL_COLOR_ATTACHMENT3, GL_COLOR_ATTACHMENT4, GL_COLOR_ATTACHMENT5,
-      GL_COLOR_ATTACHMENT6, GL_COLOR_ATTACHMENT7,
-  };
-
-  if (ctx->sub->nr_cbufs == 0) {
-    glReadBuffer(GL_NONE);
-    if (has_feature(feat_srgb_write_control)) {
-      glDisable(GL_FRAMEBUFFER_SRGB_EXT);
-      ctx->sub->framebuffer_srgb_enabled = false;
-    }
-  } else if (has_feature(feat_srgb_write_control)) {
-    struct vrend_surface *surf = NULL;
-    bool use_srgb = false;
-    int i;
-    for (i = 0; i < ctx->sub->nr_cbufs; i++) {
-      if (ctx->sub->surf[i]) {
-        surf = ctx->sub->surf[i];
-        if (util_format_is_srgb(surf->format)) {
-          use_srgb = true;
-        }
-      }
-    }
-    if (use_srgb) {
-      glEnable(GL_FRAMEBUFFER_SRGB_EXT);
-    } else {
-      glDisable(GL_FRAMEBUFFER_SRGB_EXT);
-    }
-    ctx->sub->framebuffer_srgb_enabled = use_srgb;
-  }
-
-  glDrawBuffers(ctx->sub->nr_cbufs, buffers);
-}
-
-void vrend_set_framebuffer_state(struct vrend_context *ctx, uint32_t nr_cbufs,
-                                 uint32_t surf_handle[PIPE_MAX_COLOR_BUFS],
-                                 uint32_t zsurf_handle) {
-  struct vrend_surface *surf, *zsurf;
-  int i;
-  int old_num;
-  GLint new_height = -1;
-  bool new_ibf = false;
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->fb_id);
-
-  if (zsurf_handle) {
-    zsurf = vrend_object_lookup(ctx->sub->object_hash, zsurf_handle,
-                                VIRGL_OBJECT_SURFACE);
-    if (!zsurf)
-      return;
-  } else
-    zsurf = NULL;
-
-  if (ctx->sub->zsurf != zsurf) {
-    vrend_surface_reference(&ctx->sub->zsurf, zsurf);
-    vrend_hw_set_zsurf_texture(ctx);
-  }
-
-  old_num = ctx->sub->nr_cbufs;
-  ctx->sub->nr_cbufs = nr_cbufs;
-  ctx->sub->old_nr_cbufs = old_num;
-
-  for (i = 0; i < (int)nr_cbufs; i++) {
-    if (surf_handle[i] != 0) {
-      surf = vrend_object_lookup(ctx->sub->object_hash, surf_handle[i],
-                                 VIRGL_OBJECT_SURFACE);
-      if (!surf)
-        return;
-    } else
-      surf = NULL;
-
-    if (ctx->sub->surf[i] != surf) {
-      vrend_surface_reference(&ctx->sub->surf[i], surf);
-      vrend_hw_set_color_surface(ctx, i);
-    }
-  }
-
-  if (old_num > ctx->sub->nr_cbufs) {
-    for (i = ctx->sub->nr_cbufs; i < old_num; i++) {
-      vrend_surface_reference(&ctx->sub->surf[i], NULL);
-      vrend_hw_set_color_surface(ctx, i);
-    }
-  }
-
-  /* find a buffer to set fb_height from */
-  if (ctx->sub->nr_cbufs == 0 && !ctx->sub->zsurf) {
-    new_height = 0;
-    new_ibf = false;
-  } else if (ctx->sub->nr_cbufs == 0) {
-    new_height =
-        u_minify(ctx->sub->zsurf->texture->base.height0, ctx->sub->zsurf->val0);
-    new_ibf = ctx->sub->zsurf->texture->y_0_top ? true : false;
-  } else {
-    surf = NULL;
-    for (i = 0; i < ctx->sub->nr_cbufs; i++) {
-      if (ctx->sub->surf[i]) {
-        surf = ctx->sub->surf[i];
-        break;
-      }
-    }
-    if (surf == NULL)
-      return;
-    new_height = u_minify(surf->texture->base.height0, surf->val0);
-    new_ibf = surf->texture->y_0_top ? true : false;
-  }
-
-  if (new_height != -1) {
-    if (ctx->sub->fb_height != (uint32_t)new_height ||
-        ctx->sub->inverted_fbo_content != new_ibf) {
-      ctx->sub->fb_height = new_height;
-      ctx->sub->inverted_fbo_content = new_ibf;
-      ctx->sub->viewport_state_dirty = (1 << 0);
-    }
-  }
-
-  vrend_hw_emit_framebuffer_state(ctx);
-
-  ctx->sub->shader_dirty = true;
-  ctx->sub->blend_state_dirty = true;
-}
-
-void vrend_set_framebuffer_state_no_attach(UNUSED struct vrend_context *ctx,
-                                           uint32_t width, uint32_t height,
-                                           uint32_t layers, uint32_t samples) {
-  if (has_feature(feat_fb_no_attach)) {
-    glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_WIDTH,
-                            width);
-    glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_HEIGHT,
-                            height);
-    glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_LAYERS,
-                            layers);
-    glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_SAMPLES,
-                            samples);
-  }
-}
-
-/*
- * if the viewport Y scale factor is > 0 then we are rendering to
- * an FBO already so don't need to invert rendering?
- */
-void vrend_set_viewport_states(struct vrend_context *ctx, uint32_t start_slot,
-                               uint32_t num_viewports,
-                               const struct pipe_viewport_state *state) {
-  /* convert back to glViewport */
-  GLint x, y;
-  GLsizei width, height;
-  GLfloat near_val, far_val;
-  bool viewport_is_negative = (state[0].scale[1] < 0) ? true : false;
-  uint i, idx;
-
-  if (num_viewports > PIPE_MAX_VIEWPORTS ||
-      start_slot > (PIPE_MAX_VIEWPORTS - num_viewports))
-    return;
-
-  for (i = 0; i < num_viewports; i++) {
-    GLfloat abs_s1 = fabsf(state[i].scale[1]);
-
-    idx = start_slot + i;
-    width = state[i].scale[0] * 2.0f;
-    height = abs_s1 * 2.0f;
-    x = state[i].translate[0] - state[i].scale[0];
-    y = state[i].translate[1] - state[i].scale[1];
-
-    if (!ctx->sub->rs_state.clip_halfz) {
-      near_val = state[i].translate[2] - state[i].scale[2];
-      far_val = near_val + (state[i].scale[2] * 2.0);
-    } else {
-      near_val = state[i].translate[2];
-      far_val = state[i].scale[2] + state[i].translate[2];
-    }
-
-    if (ctx->sub->vps[idx].cur_x != x || ctx->sub->vps[idx].cur_y != y ||
-        ctx->sub->vps[idx].width != width ||
-        ctx->sub->vps[idx].height != height ||
-        ctx->sub->vps[idx].near_val != near_val ||
-        ctx->sub->vps[idx].far_val != far_val ||
-        (!(ctx->sub->viewport_state_initialized &= (1 << idx)))) {
-      ctx->sub->vps[idx].cur_x = x;
-      ctx->sub->vps[idx].cur_y = y;
-      ctx->sub->vps[idx].width = width;
-      ctx->sub->vps[idx].height = height;
-      ctx->sub->vps[idx].near_val = near_val;
-      ctx->sub->vps[idx].far_val = far_val;
-      ctx->sub->viewport_state_dirty |= (1 << idx);
-    }
-
-    if (idx == 0) {
-      if (ctx->sub->viewport_is_negative != viewport_is_negative)
-        ctx->sub->viewport_is_negative = viewport_is_negative;
-    }
-  }
-}
-
-int vrend_create_vertex_elements_state(
-    struct vrend_context *ctx, uint32_t handle, unsigned num_elements,
-    const struct pipe_vertex_element *elements) {
-  struct vrend_vertex_element_array *v;
-  const struct util_format_description *desc;
-  GLenum type;
-  uint i;
-  uint32_t ret_handle;
-
-  if (num_elements > PIPE_MAX_ATTRIBS)
-    return EINVAL;
-
-  v = CALLOC_STRUCT(vrend_vertex_element_array);
-  if (!v)
-    return ENOMEM;
-
-  v->count = num_elements;
-  for (i = 0; i < num_elements; i++) {
-    memcpy(&v->elements[i].base, &elements[i],
-           sizeof(struct pipe_vertex_element));
-
-    desc = util_format_description(elements[i].src_format);
-    if (!desc) {
-      FREE(v);
-      return EINVAL;
-    }
-
-    type = GL_FALSE;
-    if (desc->channel[0].type == UTIL_FORMAT_TYPE_FLOAT) {
-      if (desc->channel[0].size == 32)
-        type = GL_FLOAT;
-      else if (desc->channel[0].size == 64)
-        type = GL_FLOAT;
-      else if (desc->channel[0].size == 16)
-        type = GL_HALF_FLOAT;
-    } else if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED &&
-               desc->channel[0].size == 8)
-      type = GL_UNSIGNED_BYTE;
-    else if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED &&
-             desc->channel[0].size == 8)
-      type = GL_BYTE;
-    else if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED &&
-             desc->channel[0].size == 16)
-      type = GL_UNSIGNED_SHORT;
-    else if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED &&
-             desc->channel[0].size == 16)
-      type = GL_SHORT;
-    else if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED &&
-             desc->channel[0].size == 32)
-      type = GL_UNSIGNED_INT;
-    else if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED &&
-             desc->channel[0].size == 32)
-      type = GL_INT;
-    else if (elements[i].src_format == PIPE_FORMAT_R10G10B10A2_SSCALED ||
-             elements[i].src_format == PIPE_FORMAT_R10G10B10A2_SNORM ||
-             elements[i].src_format == PIPE_FORMAT_B10G10R10A2_SNORM)
-      type = GL_INT_2_10_10_10_REV;
-    else if (elements[i].src_format == PIPE_FORMAT_R10G10B10A2_USCALED ||
-             elements[i].src_format == PIPE_FORMAT_R10G10B10A2_UNORM ||
-             elements[i].src_format == PIPE_FORMAT_B10G10R10A2_UNORM)
-      type = GL_UNSIGNED_INT_2_10_10_10_REV;
-    else if (elements[i].src_format == PIPE_FORMAT_R11G11B10_FLOAT)
-      type = GL_UNSIGNED_INT_10F_11F_11F_REV;
-
-    if (type == GL_FALSE) {
-      FREE(v);
-      return EINVAL;
-    }
-
-    v->elements[i].type = type;
-    if (desc->channel[0].normalized)
-      v->elements[i].norm = GL_TRUE;
-
-    if (desc->nr_channels == 4 && desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_Z)
-      v->elements[i].nr_chan = 4;
-    else if (elements[i].src_format == PIPE_FORMAT_R11G11B10_FLOAT)
-      v->elements[i].nr_chan = 3;
-    else
-      v->elements[i].nr_chan = desc->nr_channels;
-  }
-
-  if (has_feature(feat_gles31_vertex_attrib_binding)) {
-    glGenVertexArrays(1, &v->id);
-    glBindVertexArray(v->id);
-    for (i = 0; i < num_elements; i++) {
-      struct vrend_vertex_element *ve = &v->elements[i];
-
-      if (util_format_is_pure_integer(ve->base.src_format))
-        glVertexAttribIFormat(i, ve->nr_chan, ve->type, ve->base.src_offset);
-      else
-        glVertexAttribFormat(i, ve->nr_chan, ve->type, ve->norm,
-                             ve->base.src_offset);
-      glVertexAttribBinding(i, ve->base.vertex_buffer_index);
-      glVertexBindingDivisor(i, ve->base.instance_divisor);
-      glEnableVertexAttribArray(i);
-    }
-  }
-  ret_handle =
-      vrend_renderer_object_insert(ctx, v, sizeof(struct vrend_vertex_element),
-                                   handle, VIRGL_OBJECT_VERTEX_ELEMENTS);
-  if (!ret_handle) {
-    FREE(v);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-void vrend_bind_vertex_elements_state(struct vrend_context *ctx,
-                                      uint32_t handle) {
-  struct vrend_vertex_element_array *v;
-
-  if (!handle) {
-    ctx->sub->ve = NULL;
-    return;
-  }
-  v = vrend_object_lookup(ctx->sub->object_hash, handle,
-                          VIRGL_OBJECT_VERTEX_ELEMENTS);
-  if (!v)
-    return;
-
-  if (ctx->sub->ve != v)
-    ctx->sub->vbo_dirty = true;
-  ctx->sub->ve = v;
-}
-
-void vrend_set_constants(struct vrend_context *ctx, uint32_t shader,
-                         UNUSED uint32_t index, uint32_t num_constant,
-                         float *data) {
-  struct vrend_constants *consts;
-
-  consts = &ctx->sub->consts[shader];
-  ctx->sub->const_dirty[shader] = true;
-
-  /* avoid reallocations by only growing the buffer */
-  if (consts->num_allocated_consts < num_constant) {
-    free(consts->consts);
-    consts->consts = malloc(num_constant * sizeof(float));
-    if (!consts->consts)
-      return;
-    consts->num_allocated_consts = num_constant;
-  }
-
-  memcpy(consts->consts, data, num_constant * sizeof(unsigned int));
-  consts->num_consts = num_constant;
-}
-
-void vrend_set_uniform_buffer(struct vrend_context *ctx, uint32_t shader,
-                              uint32_t index, uint32_t offset, uint32_t length,
-                              uint32_t res_handle) {
-  struct vrend_resource *res;
-
-  if (!has_feature(feat_ubo))
-    return;
-
-  if (res_handle) {
-    res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-
-    if (!res)
-      return;
-    ctx->sub->cbs[shader][index].buffer = (struct pipe_resource *)res;
-    ctx->sub->cbs[shader][index].buffer_offset = offset;
-    ctx->sub->cbs[shader][index].buffer_size = length;
-
-    ctx->sub->const_bufs_used_mask[shader] |= (1u << index);
-  } else {
-    ctx->sub->cbs[shader][index].buffer = NULL;
-    ctx->sub->cbs[shader][index].buffer_offset = 0;
-    ctx->sub->cbs[shader][index].buffer_size = 0;
-    ctx->sub->const_bufs_used_mask[shader] &= ~(1u << index);
-  }
-  ctx->sub->const_bufs_dirty[shader] |= (1u << index);
-}
-
-void vrend_set_index_buffer(struct vrend_context *ctx, uint32_t res_handle,
-                            uint32_t index_size, uint32_t offset) {
-  struct vrend_resource *res;
-
-  ctx->sub->ib.index_size = index_size;
-  ctx->sub->ib.offset = offset;
-  if (res_handle) {
-    if (ctx->sub->index_buffer_res_id != res_handle) {
-      res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-      if (!res) {
-        vrend_resource_reference((struct vrend_resource **)&ctx->sub->ib.buffer,
-                                 NULL);
-        ctx->sub->index_buffer_res_id = 0;
-        return;
-      }
-      vrend_resource_reference((struct vrend_resource **)&ctx->sub->ib.buffer,
-                               res);
-      ctx->sub->index_buffer_res_id = res_handle;
-    }
-  } else {
-    vrend_resource_reference((struct vrend_resource **)&ctx->sub->ib.buffer,
-                             NULL);
-    ctx->sub->index_buffer_res_id = 0;
-  }
-}
-
-void vrend_set_single_vbo(struct vrend_context *ctx, uint32_t index,
-                          uint32_t stride, uint32_t buffer_offset,
-                          uint32_t res_handle) {
-  struct vrend_resource *res;
-
-  if (ctx->sub->vbo[index].stride != stride ||
-      ctx->sub->vbo[index].buffer_offset != buffer_offset ||
-      ctx->sub->vbo_res_ids[index] != res_handle)
-    ctx->sub->vbo_dirty = true;
-
-  ctx->sub->vbo[index].stride = stride;
-  ctx->sub->vbo[index].buffer_offset = buffer_offset;
-
-  if (res_handle == 0) {
-    vrend_resource_reference(
-        (struct vrend_resource **)&ctx->sub->vbo[index].buffer, NULL);
-    ctx->sub->vbo_res_ids[index] = 0;
-  } else if (ctx->sub->vbo_res_ids[index] != res_handle) {
-    res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-    if (!res) {
-      ctx->sub->vbo_res_ids[index] = 0;
-      return;
-    }
-    vrend_resource_reference(
-        (struct vrend_resource **)&ctx->sub->vbo[index].buffer, res);
-    ctx->sub->vbo_res_ids[index] = res_handle;
-  }
-}
-
-void vrend_set_num_vbo(struct vrend_context *ctx, int num_vbo) {
-  int old_num = ctx->sub->num_vbos;
-  int i;
-
-  ctx->sub->num_vbos = num_vbo;
-  ctx->sub->old_num_vbos = old_num;
-
-  if (old_num != num_vbo)
-    ctx->sub->vbo_dirty = true;
-
-  for (i = num_vbo; i < old_num; i++) {
-    vrend_resource_reference((struct vrend_resource **)&ctx->sub->vbo[i].buffer,
-                             NULL);
-    ctx->sub->vbo_res_ids[i] = 0;
-  }
-}
-
-void vrend_set_single_sampler_view(struct vrend_context *ctx,
-                                   uint32_t shader_type, uint32_t index,
-                                   uint32_t handle) {
-  struct vrend_sampler_view *view = NULL;
-  struct vrend_texture *tex;
-
-  if (handle) {
-    view = vrend_object_lookup(ctx->sub->object_hash, handle,
-                               VIRGL_OBJECT_SAMPLER_VIEW);
-    if (!view) {
-      ctx->sub->views[shader_type].views[index] = NULL;
-      return;
-    }
-    if (ctx->sub->views[shader_type].views[index] == view) {
-      return;
-    }
-    /* we should have a reference to this texture taken at create time */
-    tex = (struct vrend_texture *)view->texture;
-    if (!tex) {
-      return;
-    }
-
-    ctx->sub->sampler_views_dirty[shader_type] |= 1u << index;
-
-    if (!has_bit(view->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
-      if (view->texture->id == view->id) {
-        glBindTexture(view->target, view->id);
-
-        if (util_format_is_depth_or_stencil(view->format)) {
-          if (has_feature(feat_stencil_texturing)) {
-            const struct util_format_description *desc =
-                util_format_description(view->format);
-            if (!util_format_has_depth(desc)) {
-              glTexParameteri(view->texture->target,
-                              GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
-            } else {
-              glTexParameteri(view->texture->target,
-                              GL_DEPTH_STENCIL_TEXTURE_MODE,
-                              GL_DEPTH_COMPONENT);
-            }
-          }
-        }
-
-        GLuint base_level = view->val1 & 0xff;
-        GLuint max_level = (view->val1 >> 8) & 0xff;
-
-        if (tex->cur_base != base_level) {
-          glTexParameteri(view->texture->target, GL_TEXTURE_BASE_LEVEL,
-                          base_level);
-          tex->cur_base = base_level;
-        }
-        if (tex->cur_max != max_level) {
-          glTexParameteri(view->texture->target, GL_TEXTURE_MAX_LEVEL,
-                          max_level);
-          tex->cur_max = max_level;
-        }
-        if (tex->cur_swizzle_r != view->gl_swizzle_r) {
-          glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_R,
-                          view->gl_swizzle_r);
-          tex->cur_swizzle_r = view->gl_swizzle_r;
-        }
-        if (tex->cur_swizzle_g != view->gl_swizzle_g) {
-          glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_G,
-                          view->gl_swizzle_g);
-          tex->cur_swizzle_g = view->gl_swizzle_g;
-        }
-        if (tex->cur_swizzle_b != view->gl_swizzle_b) {
-          glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_B,
-                          view->gl_swizzle_b);
-          tex->cur_swizzle_b = view->gl_swizzle_b;
-        }
-        if (tex->cur_swizzle_a != view->gl_swizzle_a) {
-          glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_A,
-                          view->gl_swizzle_a);
-          tex->cur_swizzle_a = view->gl_swizzle_a;
-        }
-        if (tex->cur_srgb_decode != view->srgb_decode &&
-            util_format_is_srgb(tex->base.base.format)) {
-          if (has_feature(feat_samplers))
-            ctx->sub->sampler_views_dirty[shader_type] |= (1u << index);
-          else if (has_feature(feat_texture_srgb_decode)) {
-            glTexParameteri(view->texture->target, GL_TEXTURE_SRGB_DECODE_EXT,
-                            view->srgb_decode);
-            tex->cur_srgb_decode = view->srgb_decode;
-          }
-        }
-      }
-    } else {
-      GLenum internalformat;
-
-      if (!view->texture->tbo_tex_id)
-        glGenTextures(1, &view->texture->tbo_tex_id);
-
-      glBindTexture(GL_TEXTURE_BUFFER, view->texture->tbo_tex_id);
-      internalformat = tex_conv_table[view->format].internalformat;
-      if (has_feature(feat_texture_buffer_range)) {
-        unsigned offset = view->val0;
-        unsigned size = view->val1 - view->val0 + 1;
-        int blsize = util_format_get_blocksize(view->format);
-
-        offset *= blsize;
-        size *= blsize;
-        glTexBufferRange(GL_TEXTURE_BUFFER, internalformat, view->texture->id,
-                         offset, size);
-      } else
-        glTexBuffer(GL_TEXTURE_BUFFER, internalformat, view->texture->id);
-    }
-  }
-
-  vrend_sampler_view_reference(&ctx->sub->views[shader_type].views[index],
-                               view);
-}
-
-void vrend_set_num_sampler_views(struct vrend_context *ctx,
-                                 uint32_t shader_type, uint32_t start_slot,
-                                 uint32_t num_sampler_views) {
-  int last_slot = start_slot + num_sampler_views;
-  int i;
-
-  for (i = last_slot; i < ctx->sub->views[shader_type].num_views; i++)
-    vrend_sampler_view_reference(&ctx->sub->views[shader_type].views[i], NULL);
-
-  ctx->sub->views[shader_type].num_views = last_slot;
-}
-
-void vrend_set_single_image_view(struct vrend_context *ctx,
-                                 uint32_t shader_type, uint32_t index,
-                                 uint32_t format, uint32_t access,
-                                 uint32_t layer_offset, uint32_t level_size,
-                                 uint32_t handle) {
-  struct vrend_image_view *iview = &ctx->sub->image_views[shader_type][index];
-  struct vrend_resource *res;
-
-  if (handle) {
-    if (!has_feature(feat_images))
-      return;
-
-    res = vrend_renderer_ctx_res_lookup(ctx, handle);
-    if (!res)
-      return;
-    iview->texture = res;
-    iview->format = tex_conv_table[format].internalformat;
-    iview->access = access;
-    iview->u.buf.offset = layer_offset;
-    iview->u.buf.size = level_size;
-    ctx->sub->images_used_mask[shader_type] |= (1u << index);
-  } else {
-    iview->texture = NULL;
-    iview->format = 0;
-    ctx->sub->images_used_mask[shader_type] &= ~(1u << index);
-  }
-}
-
-void vrend_set_single_ssbo(struct vrend_context *ctx, uint32_t shader_type,
-                           uint32_t index, uint32_t offset, uint32_t length,
-                           uint32_t handle) {
-  struct vrend_ssbo *ssbo = &ctx->sub->ssbo[shader_type][index];
-  struct vrend_resource *res;
-
-  if (!has_feature(feat_ssbo))
-    return;
-
-  if (handle) {
-    res = vrend_renderer_ctx_res_lookup(ctx, handle);
-    if (!res)
-      return;
-    ssbo->res = res;
-    ssbo->buffer_offset = offset;
-    ssbo->buffer_size = length;
-    ctx->sub->ssbo_used_mask[shader_type] |= (1u << index);
-  } else {
-    ssbo->res = 0;
-    ssbo->buffer_offset = 0;
-    ssbo->buffer_size = 0;
-    ctx->sub->ssbo_used_mask[shader_type] &= ~(1u << index);
-  }
-}
-
-void vrend_set_single_abo(struct vrend_context *ctx, uint32_t index,
-                          uint32_t offset, uint32_t length, uint32_t handle) {
-  struct vrend_abo *abo = &ctx->sub->abo[index];
-  struct vrend_resource *res;
-
-  if (!has_feature(feat_atomic_counters))
-    return;
-
-  if (handle) {
-    res = vrend_renderer_ctx_res_lookup(ctx, handle);
-    if (!res)
-      return;
-    abo->res = res;
-    abo->buffer_offset = offset;
-    abo->buffer_size = length;
-    ctx->sub->abo_used_mask |= (1u << index);
-  } else {
-    abo->res = 0;
-    abo->buffer_offset = 0;
-    abo->buffer_size = 0;
-    ctx->sub->abo_used_mask &= ~(1u << index);
-  }
-}
-
-void vrend_memory_barrier(UNUSED struct vrend_context *ctx, unsigned flags) {
-  GLbitfield gl_barrier = 0;
-
-  if (!has_feature(feat_barrier))
-    return;
-
-  if ((flags & PIPE_BARRIER_ALL) == PIPE_BARRIER_ALL)
-    gl_barrier = GL_ALL_BARRIER_BITS;
-  else {
-    if (flags & PIPE_BARRIER_VERTEX_BUFFER)
-      gl_barrier |= GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_INDEX_BUFFER)
-      gl_barrier |= GL_ELEMENT_ARRAY_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_CONSTANT_BUFFER)
-      gl_barrier |= GL_UNIFORM_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_TEXTURE)
-      gl_barrier |= GL_TEXTURE_FETCH_BARRIER_BIT | GL_PIXEL_BUFFER_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_IMAGE)
-      gl_barrier |= GL_SHADER_IMAGE_ACCESS_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_INDIRECT_BUFFER)
-      gl_barrier |= GL_COMMAND_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_FRAMEBUFFER)
-      gl_barrier |= GL_FRAMEBUFFER_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_STREAMOUT_BUFFER)
-      gl_barrier |= GL_TRANSFORM_FEEDBACK_BARRIER_BIT;
-    if (flags & PIPE_BARRIER_SHADER_BUFFER) {
-      gl_barrier |= GL_ATOMIC_COUNTER_BARRIER_BIT;
-      if (has_feature(feat_ssbo_barrier))
-        gl_barrier |= GL_SHADER_STORAGE_BARRIER_BIT;
-    }
-  }
-  glMemoryBarrier(gl_barrier);
-}
-
-static void vrend_destroy_shader_object(void *obj_ptr) {
-  struct vrend_shader_selector *state = obj_ptr;
-
-  vrend_shader_state_reference(&state, NULL);
-}
-
-static inline bool can_emulate_logicop(enum pipe_logicop op) {
-  if (has_feature(feat_framebuffer_fetch))
-    return true;
-
-  /* These ops don't need to read back from the framebuffer */
-  switch (op) {
-  case PIPE_LOGICOP_CLEAR:
-  case PIPE_LOGICOP_COPY:
-  case PIPE_LOGICOP_SET:
-  case PIPE_LOGICOP_COPY_INVERTED:
-    return true;
-  default:
-    return false;
-  }
-}
-
-static inline void vrend_fill_shader_key(struct vrend_context *ctx,
-                                         struct vrend_shader_selector *sel,
-                                         struct vrend_shader_key *key) {
-  unsigned type = sel->type;
-
-  int i;
-  bool add_alpha_test = true;
-  key->cbufs_are_a8_bitmask = 0;
-  for (i = 0; i < ctx->sub->nr_cbufs; i++) {
-    if (!ctx->sub->surf[i])
-      continue;
-    if (util_format_is_pure_integer(ctx->sub->surf[i]->format))
-      add_alpha_test = false;
-    key->surface_component_bits[i] = util_format_get_component_bits(
-        ctx->sub->surf[i]->format, UTIL_FORMAT_COLORSPACE_RGB, 0);
-  }
-  if (add_alpha_test) {
-    key->add_alpha_test = ctx->sub->dsa_state.alpha.enabled;
-    key->alpha_test = ctx->sub->dsa_state.alpha.func;
-    key->alpha_ref_val = ctx->sub->dsa_state.alpha.ref_value;
-  }
-
-  key->pstipple_tex = ctx->sub->rs_state.poly_stipple_enable;
-  key->color_two_side = ctx->sub->rs_state.light_twoside;
-
-  key->clip_plane_enable = ctx->sub->rs_state.clip_plane_enable;
-  key->flatshade = ctx->sub->rs_state.flatshade ? true : false;
-
-  if (type == PIPE_SHADER_FRAGMENT &&
-      can_emulate_logicop(ctx->sub->blend_state.logicop_func)) {
-    key->fs_logicop_enabled = ctx->sub->blend_state.logicop_enable;
-    key->fs_logicop_func = ctx->sub->blend_state.logicop_func;
-    key->fs_logicop_emulate_coherent = true;
-  }
-
-  key->coord_replace = ctx->sub->rs_state.point_quad_rasterization
-                           ? ctx->sub->rs_state.sprite_coord_enable
-                           : 0;
-
-  if (type == PIPE_SHADER_FRAGMENT)
-    key->fs_swizzle_output_rgb_to_bgr = ctx->sub->swizzle_output_rgb_to_bgr;
-
-  if (ctx->sub->shaders[PIPE_SHADER_GEOMETRY])
-    key->gs_present = true;
-  if (ctx->sub->shaders[PIPE_SHADER_TESS_CTRL])
-    key->tcs_present = true;
-  if (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL])
-    key->tes_present = true;
-
-  int prev_type = -1;
-
-  /* Gallium sends and binds the shaders in the reverse order, so if an
-   * old shader is still bound we should ignore the "previous" (as in
-   * execution order) shader when the key is evaluated, unless the currently
-   * bound shader selector is actually refers to the current shader. */
-  if (ctx->sub->shaders[type] == sel) {
-    switch (type) {
-    case PIPE_SHADER_GEOMETRY:
-      if (key->tcs_present || key->tes_present)
-        prev_type = PIPE_SHADER_TESS_EVAL;
-      else
-        prev_type = PIPE_SHADER_VERTEX;
-      break;
-    case PIPE_SHADER_FRAGMENT:
-      if (key->gs_present)
-        prev_type = PIPE_SHADER_GEOMETRY;
-      else if (key->tcs_present || key->tes_present)
-        prev_type = PIPE_SHADER_TESS_EVAL;
-      else
-        prev_type = PIPE_SHADER_VERTEX;
-      break;
-    case PIPE_SHADER_TESS_EVAL:
-      if (key->tcs_present)
-        prev_type = PIPE_SHADER_TESS_CTRL;
-      else
-        prev_type = PIPE_SHADER_VERTEX;
-      break;
-    case PIPE_SHADER_TESS_CTRL:
-      prev_type = PIPE_SHADER_VERTEX;
-      break;
-    default:
-      break;
-    }
-  }
-
-  if (prev_type != -1 && ctx->sub->shaders[prev_type]) {
-    key->prev_stage_pervertex_out =
-        ctx->sub->shaders[prev_type]->sinfo.has_pervertex_out;
-    key->prev_stage_num_clip_out =
-        ctx->sub->shaders[prev_type]->sinfo.num_clip_out;
-    key->prev_stage_num_cull_out =
-        ctx->sub->shaders[prev_type]->sinfo.num_cull_out;
-    key->num_indirect_generic_inputs =
-        ctx->sub->shaders[prev_type]->sinfo.num_indirect_generic_outputs;
-    key->num_indirect_patch_inputs =
-        ctx->sub->shaders[prev_type]->sinfo.num_indirect_patch_outputs;
-    key->num_prev_generic_and_patch_outputs =
-        ctx->sub->shaders[prev_type]->sinfo.num_generic_and_patch_outputs;
-    key->guest_sent_io_arrays =
-        ctx->sub->shaders[prev_type]->sinfo.guest_sent_io_arrays;
-
-    memcpy(key->prev_stage_generic_and_patch_outputs_layout,
-           ctx->sub->shaders[prev_type]->sinfo.generic_outputs_layout,
-           64 * sizeof(struct vrend_layout_info));
-  }
-
-  int next_type = -1;
-  switch (type) {
-  case PIPE_SHADER_VERTEX:
-    if (key->tcs_present)
-      next_type = PIPE_SHADER_TESS_CTRL;
-    else if (key->gs_present)
-      next_type = PIPE_SHADER_GEOMETRY;
-    else if (key->tes_present)
-      next_type = PIPE_SHADER_TESS_CTRL;
-    else
-      next_type = PIPE_SHADER_FRAGMENT;
-    break;
-  case PIPE_SHADER_TESS_CTRL:
-    next_type = PIPE_SHADER_TESS_EVAL;
-    break;
-  case PIPE_SHADER_GEOMETRY:
-    next_type = PIPE_SHADER_FRAGMENT;
-    break;
-  case PIPE_SHADER_TESS_EVAL:
-    if (key->gs_present)
-      next_type = PIPE_SHADER_GEOMETRY;
-    else
-      next_type = PIPE_SHADER_FRAGMENT;
-  }
-
-  if (next_type != -1 && ctx->sub->shaders[next_type]) {
-    key->num_indirect_generic_outputs =
-        ctx->sub->shaders[next_type]->sinfo.num_indirect_generic_inputs;
-    key->num_indirect_patch_outputs =
-        ctx->sub->shaders[next_type]->sinfo.num_indirect_patch_inputs;
-    key->generic_outputs_expected_mask =
-        ctx->sub->shaders[next_type]->sinfo.generic_inputs_emitted_mask;
-  }
-}
-
-static inline int conv_shader_type(int type) {
-  switch (type) {
-  case PIPE_SHADER_VERTEX:
-    return GL_VERTEX_SHADER;
-  case PIPE_SHADER_FRAGMENT:
-    return GL_FRAGMENT_SHADER;
-  case PIPE_SHADER_GEOMETRY:
-    return GL_GEOMETRY_SHADER;
-  case PIPE_SHADER_TESS_CTRL:
-    return GL_TESS_CONTROL_SHADER;
-  case PIPE_SHADER_TESS_EVAL:
-    return GL_TESS_EVALUATION_SHADER;
-  case PIPE_SHADER_COMPUTE:
-    return GL_COMPUTE_SHADER;
-  default:
-    return 0;
-  }
-}
-
-static int vrend_shader_create(struct vrend_context *ctx,
-                               struct vrend_shader *shader,
-                               struct vrend_shader_key key) {
-
-  shader->id = glCreateShader(conv_shader_type(shader->sel->type));
-  shader->compiled_fs_id = 0;
-
-  if (shader->sel->tokens) {
-    bool ret = vrend_convert_shader(ctx, &ctx->shader_cfg, shader->sel->tokens,
-                                    shader->sel->req_local_mem, &key,
-                                    &shader->sel->sinfo, &shader->glsl_strings);
-    if (!ret) {
-      glDeleteShader(shader->id);
-      return -1;
-    }
-  }
-
-  shader->key = key;
-  bool ret;
-
-  ret = vrend_compile_shader(ctx, shader);
-  if (!ret) {
-    glDeleteShader(shader->id);
-    strarray_free(&shader->glsl_strings, true);
-    return -1;
-  }
-  return 0;
-}
-
-static int vrend_shader_select(struct vrend_context *ctx,
-                               struct vrend_shader_selector *sel, bool *dirty) {
-  struct vrend_shader_key key;
-  struct vrend_shader *shader = NULL;
-  int r;
-
-  memset(&key, 0, sizeof(key));
-  vrend_fill_shader_key(ctx, sel, &key);
-
-  if (sel->current && !memcmp(&sel->current->key, &key, sizeof(key)))
-    return 0;
-
-  if (sel->num_shaders > 1) {
-    struct vrend_shader *p = sel->current;
-    struct vrend_shader *c = p->next_variant;
-    while (c && memcmp(&c->key, &key, sizeof(key)) != 0) {
-      p = c;
-      c = c->next_variant;
-    }
-    if (c) {
-      p->next_variant = c->next_variant;
-      shader = c;
-    }
-  }
-
-  if (!shader) {
-    shader = CALLOC_STRUCT(vrend_shader);
-    shader->sel = sel;
-    list_inithead(&shader->programs);
-    strarray_alloc(&shader->glsl_strings, SHADER_MAX_STRINGS);
-
-    r = vrend_shader_create(ctx, shader, key);
-    if (r) {
-      sel->current = NULL;
-      FREE(shader);
-      return r;
-    }
-    sel->num_shaders++;
-  }
-  if (dirty)
-    *dirty = true;
-
-  shader->next_variant = sel->current;
-  sel->current = shader;
-  return 0;
-}
-
-static void *
-vrend_create_shader_state(UNUSED struct vrend_context *ctx,
-                          const struct pipe_stream_output_info *so_info,
-                          uint32_t req_local_mem, unsigned pipe_shader_type) {
-  struct vrend_shader_selector *sel = CALLOC_STRUCT(vrend_shader_selector);
-
-  if (!sel)
-    return NULL;
-
-  sel->req_local_mem = req_local_mem;
-  sel->type = pipe_shader_type;
-  sel->sinfo.so_info = *so_info;
-  pipe_reference_init(&sel->reference, 1);
-
-  return sel;
-}
-
-static int vrend_finish_shader(struct vrend_context *ctx,
-                               struct vrend_shader_selector *sel,
-                               const struct tgsi_token *tokens) {
-  int r;
-
-  sel->tokens = tgsi_dup_tokens(tokens);
-
-  r = vrend_shader_select(ctx, sel, NULL);
-  if (r) {
-    return EINVAL;
-  }
-  return 0;
-}
-
-int vrend_create_shader(struct vrend_context *ctx, uint32_t handle,
-                        const struct pipe_stream_output_info *so_info,
-                        uint32_t req_local_mem, const char *shd_text,
-                        uint32_t offlen, uint32_t num_tokens, uint32_t type,
-                        uint32_t pkt_length) {
-  struct vrend_shader_selector *sel = NULL;
-  int ret_handle;
-  bool new_shader = true, long_shader = false;
-  bool finished = false;
-  int ret;
-
-  if (type > PIPE_SHADER_COMPUTE)
-    return EINVAL;
-
-  if (type == PIPE_SHADER_GEOMETRY && !has_feature(feat_geometry_shader))
-    return EINVAL;
-
-  if ((type == PIPE_SHADER_TESS_CTRL || type == PIPE_SHADER_TESS_EVAL) &&
-      !has_feature(feat_tessellation))
-    return EINVAL;
-
-  if (type == PIPE_SHADER_COMPUTE && !has_feature(feat_compute_shader))
-    return EINVAL;
-
-  if (offlen & VIRGL_OBJ_SHADER_OFFSET_CONT)
-    new_shader = false;
-  else if (((offlen + 3) / 4) > pkt_length)
-    long_shader = true;
-
-  /* if we have an in progress one - don't allow a new shader
-     of that type or a different handle. */
-  if (ctx->sub->long_shader_in_progress_handle[type]) {
-    if (new_shader == true)
-      return EINVAL;
-    if (handle != ctx->sub->long_shader_in_progress_handle[type])
-      return EINVAL;
-  }
-
-  if (new_shader) {
-    sel = vrend_create_shader_state(ctx, so_info, req_local_mem, type);
-    if (sel == NULL)
-      return ENOMEM;
-
-    if (long_shader) {
-      sel->buf_len = ((offlen + 3) / 4) * 4; /* round up buffer size */
-      sel->tmp_buf = malloc(sel->buf_len);
-      if (!sel->tmp_buf) {
-        ret = ENOMEM;
-        goto error;
-      }
-      memcpy(sel->tmp_buf, shd_text, pkt_length * 4);
-      sel->buf_offset = pkt_length * 4;
-      ctx->sub->long_shader_in_progress_handle[type] = handle;
-    } else
-      finished = true;
-  } else {
-    sel =
-        vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_SHADER);
-    if (!sel) {
-      ret = EINVAL;
-      goto error;
-    }
-
-    offlen &= ~VIRGL_OBJ_SHADER_OFFSET_CONT;
-    if (offlen != sel->buf_offset) {
-      ret = EINVAL;
-      goto error;
-    }
-
-    /*make sure no overflow */
-    if (pkt_length * 4 < pkt_length ||
-        pkt_length * 4 + sel->buf_offset < pkt_length * 4 ||
-        pkt_length * 4 + sel->buf_offset < sel->buf_offset) {
-      ret = EINVAL;
-      goto error;
-    }
-
-    if ((pkt_length * 4 + sel->buf_offset) > sel->buf_len) {
-      ret = EINVAL;
-      goto error;
-    }
-
-    memcpy(sel->tmp_buf + sel->buf_offset, shd_text, pkt_length * 4);
-
-    sel->buf_offset += pkt_length * 4;
-    if (sel->buf_offset >= sel->buf_len) {
-      finished = true;
-      shd_text = sel->tmp_buf;
-    }
-  }
-
-  if (finished) {
-    struct tgsi_token *tokens;
-
-    /* check for null termination */
-    uint32_t last_chunk_offset =
-        sel->buf_offset ? sel->buf_offset : pkt_length * 4;
-    if (last_chunk_offset < 4 ||
-        !memchr(shd_text + last_chunk_offset - 4, '\0', 4)) {
-      ret = EINVAL;
-      goto error;
-    }
-
-    tokens = calloc(num_tokens + 10, sizeof(struct tgsi_token));
-    if (!tokens) {
-      ret = ENOMEM;
-      goto error;
-    }
-
-    if (!tgsi_text_translate((const char *)shd_text, tokens, num_tokens + 10)) {
-      free(tokens);
-      ret = EINVAL;
-      goto error;
-    }
-
-    if (vrend_finish_shader(ctx, sel, tokens)) {
-      free(tokens);
-      ret = EINVAL;
-      goto error;
-    } else {
-      free(sel->tmp_buf);
-      sel->tmp_buf = NULL;
-    }
-    free(tokens);
-    ctx->sub->long_shader_in_progress_handle[type] = 0;
-  }
-
-  if (new_shader) {
-    ret_handle = vrend_renderer_object_insert(ctx, sel, sizeof(*sel), handle,
-                                              VIRGL_OBJECT_SHADER);
-    if (ret_handle == 0) {
-      ret = ENOMEM;
-      goto error;
-    }
-  }
-
-  return 0;
-
-error:
-  if (new_shader)
-    vrend_destroy_shader_selector(sel);
-  else
-    vrend_renderer_object_destroy(ctx, handle);
-
-  return ret;
-}
-
-void vrend_bind_shader(struct vrend_context *ctx, uint32_t handle,
-                       uint32_t type) {
-  struct vrend_shader_selector *sel;
-
-  if (type > PIPE_SHADER_COMPUTE)
-    return;
-
-  if (handle == 0) {
-    if (type == PIPE_SHADER_COMPUTE)
-      ctx->sub->cs_shader_dirty = true;
-    else
-      ctx->sub->shader_dirty = true;
-    vrend_shader_state_reference(&ctx->sub->shaders[type], NULL);
-    return;
-  }
-
-  sel = vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_SHADER);
-  if (!sel)
-    return;
-
-  if (sel->type != type)
-    return;
-
-  if (ctx->sub->shaders[sel->type] != sel) {
-    if (type == PIPE_SHADER_COMPUTE)
-      ctx->sub->cs_shader_dirty = true;
-    else
-      ctx->sub->shader_dirty = true;
-    ctx->sub->prog_ids[sel->type] = 0;
-  }
-
-  vrend_shader_state_reference(&ctx->sub->shaders[sel->type], sel);
-}
-
-void vrend_clear(struct vrend_context *ctx, unsigned buffers,
-                 const union pipe_color_union *color, double depth,
-                 unsigned stencil) {
-  GLbitfield bits = 0;
-
-  if (ctx->in_error)
-    return;
-
-  if (ctx->ctx_switch_pending)
-    vrend_finish_context_switch(ctx);
-
-  vrend_update_frontface_state(ctx);
-  if (ctx->sub->stencil_state_dirty)
-    vrend_update_stencil_state(ctx);
-  if (ctx->sub->scissor_state_dirty)
-    vrend_update_scissor_state(ctx);
-  if (ctx->sub->viewport_state_dirty)
-    vrend_update_viewport_state(ctx);
-
-  vrend_use_program(ctx, 0);
-
-  glDisable(GL_SCISSOR_TEST);
-
-  if (buffers & PIPE_CLEAR_COLOR) {
-    glClearColor(color->f[0], color->f[1], color->f[2], color->f[3]);
-
-    /* This function implements Gallium's full clear callback (st->pipe->clear)
-       on the host. This callback requires no color component be masked. We must
-       unmask all components before calling glClear* and restore the previous
-       colormask afterwards, as Gallium expects. */
-    if (ctx->sub->hw_blend_state.independent_blend_enable &&
-        has_feature(feat_indep_blend)) {
-      int i;
-      for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
-        glColorMaski(i, GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-    } else
-      glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-  }
-
-  if (buffers & PIPE_CLEAR_DEPTH) {
-    /* gallium clears don't respect depth mask */
-    glDepthMask(GL_TRUE);
-    glClearDepthf(depth);
-  }
-
-  if (buffers & PIPE_CLEAR_STENCIL) {
-    glStencilMask(~0u);
-    glClearStencil(stencil);
-  }
-
-  if (ctx->sub->hw_rs_state.rasterizer_discard)
-    glDisable(GL_RASTERIZER_DISCARD);
-
-  if (buffers & PIPE_CLEAR_COLOR) {
-    uint32_t mask = 0;
-    int i;
-    for (i = 0; i < ctx->sub->nr_cbufs; i++) {
-      if (ctx->sub->surf[i])
-        mask |= (1 << i);
-    }
-    if (mask != (buffers >> 2)) {
-      mask = buffers >> 2;
-      while (mask) {
-        i = u_bit_scan(&mask);
-        if (i < PIPE_MAX_COLOR_BUFS && ctx->sub->surf[i] &&
-            util_format_is_pure_uint(ctx->sub->surf[i] &&
-                                     ctx->sub->surf[i]->format))
-          glClearBufferuiv(GL_COLOR, i, (GLuint *)color);
-        else if (i < PIPE_MAX_COLOR_BUFS && ctx->sub->surf[i] &&
-                 util_format_is_pure_sint(ctx->sub->surf[i] &&
-                                          ctx->sub->surf[i]->format))
-          glClearBufferiv(GL_COLOR, i, (GLint *)color);
-        else
-          glClearBufferfv(GL_COLOR, i, (GLfloat *)color);
-      }
-    } else
-      bits |= GL_COLOR_BUFFER_BIT;
-  }
-  if (buffers & PIPE_CLEAR_DEPTH)
-    bits |= GL_DEPTH_BUFFER_BIT;
-  if (buffers & PIPE_CLEAR_STENCIL)
-    bits |= GL_STENCIL_BUFFER_BIT;
-
-  if (bits)
-    glClear(bits);
-
-  /* Is it really necessary to restore the old states? The only reason we
-   * get here is because the guest cleared all those states but gallium
-   * didn't forward them before calling the clear command
-   */
-  if (ctx->sub->hw_rs_state.rasterizer_discard)
-    glEnable(GL_RASTERIZER_DISCARD);
-
-  if (buffers & PIPE_CLEAR_DEPTH) {
-    if (!ctx->sub->dsa_state.depth.writemask)
-      glDepthMask(GL_FALSE);
-  }
-
-  /* Restore previous stencil buffer write masks for both front and back faces
-   */
-  if (buffers & PIPE_CLEAR_STENCIL) {
-    glStencilMaskSeparate(GL_FRONT, ctx->sub->dsa_state.stencil[0].writemask);
-    glStencilMaskSeparate(GL_BACK, ctx->sub->dsa_state.stencil[1].writemask);
-  }
-
-  /* Restore previous colormask */
-  if (buffers & PIPE_CLEAR_COLOR) {
-    glColorMask(
-        ctx->sub->hw_blend_state.rt[0].colormask & PIPE_MASK_R ? GL_TRUE
-                                                               : GL_FALSE,
-        ctx->sub->hw_blend_state.rt[0].colormask & PIPE_MASK_G ? GL_TRUE
-                                                               : GL_FALSE,
-        ctx->sub->hw_blend_state.rt[0].colormask & PIPE_MASK_B ? GL_TRUE
-                                                               : GL_FALSE,
-        ctx->sub->hw_blend_state.rt[0].colormask & PIPE_MASK_A ? GL_TRUE
-                                                               : GL_FALSE);
-  }
-  if (ctx->sub->hw_rs_state.scissor)
-    glEnable(GL_SCISSOR_TEST);
-  else
-    glDisable(GL_SCISSOR_TEST);
-}
-
-static void vrend_update_scissor_state(struct vrend_context *ctx) {
-  struct pipe_scissor_state *ss;
-  GLint y;
-  GLuint idx;
-  unsigned mask = ctx->sub->scissor_state_dirty;
-
-  while (mask) {
-    idx = u_bit_scan(&mask);
-    if (idx >= PIPE_MAX_VIEWPORTS)
-      break;
-    ss = &ctx->sub->ss[idx];
-    y = ss->miny;
-
-    glScissor(ss->minx, y, ss->maxx - ss->minx, ss->maxy - ss->miny);
-  }
-  ctx->sub->scissor_state_dirty = 0;
-}
-
-static void vrend_update_viewport_state(struct vrend_context *ctx) {
-  GLint cy;
-  unsigned mask = ctx->sub->viewport_state_dirty;
-  int idx;
-  while (mask) {
-    idx = u_bit_scan(&mask);
-
-    if (ctx->sub->viewport_is_negative)
-      cy = ctx->sub->vps[idx].cur_y - ctx->sub->vps[idx].height;
-    else
-      cy = ctx->sub->vps[idx].cur_y;
-
-    glViewport(ctx->sub->vps[idx].cur_x, cy, ctx->sub->vps[idx].width,
-               ctx->sub->vps[idx].height);
-    glDepthRangef(ctx->sub->vps[idx].near_val, ctx->sub->vps[idx].far_val);
-  }
-
-  ctx->sub->viewport_state_dirty = 0;
-}
-
-static GLenum get_gs_xfb_mode(GLenum mode) {
-  switch (mode) {
-  case GL_POINTS:
-    return GL_POINTS;
-  case GL_LINE_STRIP:
-    return GL_LINES;
-  case GL_TRIANGLE_STRIP:
-    return GL_TRIANGLES;
-  default:
-    return GL_POINTS;
-  }
-}
-
-static GLenum get_tess_xfb_mode(int mode, bool is_point_mode) {
-  if (is_point_mode)
-    return GL_POINTS;
-  switch (mode) {
-  case GL_QUADS:
-  case GL_TRIANGLES:
-    return GL_TRIANGLES;
-  case GL_LINES:
-    return GL_LINES;
-  default:
-    return GL_POINTS;
-  }
-}
-
-static GLenum get_xfb_mode(GLenum mode) {
-  switch (mode) {
-  case GL_POINTS:
-    return GL_POINTS;
-  case GL_TRIANGLES:
-  case GL_TRIANGLE_STRIP:
-  case GL_TRIANGLE_FAN:
-  case GL_QUADS:
-  case GL_QUAD_STRIP:
-  case GL_POLYGON:
-    return GL_TRIANGLES;
-  case GL_LINES:
-  case GL_LINE_LOOP:
-  case GL_LINE_STRIP:
-    return GL_LINES;
-  default:
-    return GL_POINTS;
-  }
-}
-
-static void
-vrend_draw_bind_vertex_legacy(struct vrend_context *ctx,
-                              struct vrend_vertex_element_array *va) {
-  uint32_t enable_bitmask;
-  uint32_t disable_bitmask;
-  int i;
-
-  enable_bitmask = 0;
-  disable_bitmask = ~((1ull << va->count) - 1);
-  for (i = 0; i < (int)va->count; i++) {
-    struct vrend_vertex_element *ve = &va->elements[i];
-    int vbo_index = ve->base.vertex_buffer_index;
-    struct vrend_resource *res;
-    GLint loc;
-
-    if (i >= ctx->sub->prog->ss[PIPE_SHADER_VERTEX]->sel->sinfo.num_inputs)
-      break;
-    res = (struct vrend_resource *)ctx->sub->vbo[vbo_index].buffer;
-
-    if (!res)
-      continue;
-
-    if (ctx->client->vrend_state->use_explicit_locations ||
-        has_feature(feat_gles31_vertex_attrib_binding)) {
-      loc = i;
-    } else {
-      if (ctx->sub->prog->attrib_locs) {
-        loc = ctx->sub->prog->attrib_locs[i];
-      } else
-        loc = -1;
-
-      if (loc == -1) {
-        if (i == 0)
-          return;
-        continue;
-      }
-    }
-
-    if (ve->type == GL_FALSE)
-      return;
-
-    glBindBuffer(GL_ARRAY_BUFFER, res->id);
-
-    if (ctx->sub->vbo[vbo_index].stride == 0) {
-      void *data;
-      /* for 0 stride we are kinda screwed */
-      data = glMapBufferRange(GL_ARRAY_BUFFER,
-                              ctx->sub->vbo[vbo_index].buffer_offset,
-                              ve->nr_chan * sizeof(GLfloat), GL_MAP_READ_BIT);
-
-      switch (ve->nr_chan) {
-      case 1:
-        glVertexAttrib1fv(loc, data);
-        break;
-      case 2:
-        glVertexAttrib2fv(loc, data);
-        break;
-      case 3:
-        glVertexAttrib3fv(loc, data);
-        break;
-      case 4:
-      default:
-        glVertexAttrib4fv(loc, data);
-        break;
-      }
-      glUnmapBuffer(GL_ARRAY_BUFFER);
-      disable_bitmask |= (1 << loc);
-    } else {
-      enable_bitmask |= (1 << loc);
-      if (util_format_is_pure_integer(ve->base.src_format)) {
-        glVertexAttribIPointer(
-            loc, ve->nr_chan, ve->type, ctx->sub->vbo[vbo_index].stride,
-            (void *)(unsigned long)(ve->base.src_offset +
-                                    ctx->sub->vbo[vbo_index].buffer_offset));
-      } else {
-        glVertexAttribPointer(
-            loc, ve->nr_chan, ve->type, ve->norm,
-            ctx->sub->vbo[vbo_index].stride,
-            (void *)(unsigned long)(ve->base.src_offset +
-                                    ctx->sub->vbo[vbo_index].buffer_offset));
-      }
-      glVertexAttribDivisor(loc, ve->base.instance_divisor);
-    }
-  }
-  if (ctx->sub->enabled_attribs_bitmask != enable_bitmask) {
-    uint32_t mask = ctx->sub->enabled_attribs_bitmask & disable_bitmask;
-
-    while (mask) {
-      i = u_bit_scan(&mask);
-      glDisableVertexAttribArray(i);
-    }
-    ctx->sub->enabled_attribs_bitmask &= ~disable_bitmask;
-
-    mask = ctx->sub->enabled_attribs_bitmask ^ enable_bitmask;
-    while (mask) {
-      i = u_bit_scan(&mask);
-      glEnableVertexAttribArray(i);
-    }
-
-    ctx->sub->enabled_attribs_bitmask = enable_bitmask;
-  }
-}
-
-static void
-vrend_draw_bind_vertex_binding(struct vrend_context *ctx,
-                               struct vrend_vertex_element_array *va) {
-  int i;
-
-  glBindVertexArray(va->id);
-
-  if (ctx->sub->vbo_dirty) {
-    GLsizei count = 0;
-    GLuint buffers[PIPE_MAX_ATTRIBS];
-    GLintptr offsets[PIPE_MAX_ATTRIBS];
-    GLsizei strides[PIPE_MAX_ATTRIBS];
-
-    for (i = 0; i < ctx->sub->num_vbos; i++) {
-      struct vrend_resource *res =
-          (struct vrend_resource *)ctx->sub->vbo[i].buffer;
-      if (!res) {
-        buffers[count] = 0;
-        offsets[count] = 0;
-        strides[count++] = 0;
-      } else {
-        buffers[count] = res->id;
-        offsets[count] = ctx->sub->vbo[i].buffer_offset,
-        strides[count++] = ctx->sub->vbo[i].stride;
-      }
-    }
-    for (i = ctx->sub->num_vbos; i < ctx->sub->old_num_vbos; i++) {
-      buffers[count] = 0;
-      offsets[count] = 0;
-      strides[count++] = 0;
-    }
-
-    for (i = 0; i < count; ++i)
-      glBindVertexBuffer(i, buffers[i], offsets[i], strides[i]);
-
-    ctx->sub->vbo_dirty = false;
-  }
-}
-
-static int vrend_draw_bind_samplers_shader(struct vrend_context *ctx,
-                                           int shader_type,
-                                           int next_sampler_id) {
-  int index = 0;
-
-  uint32_t dirty = ctx->sub->sampler_views_dirty[shader_type];
-
-  uint32_t mask = ctx->sub->prog->samplers_used_mask[shader_type];
-  while (mask) {
-    int i = u_bit_scan(&mask);
-
-    struct vrend_sampler_view *tview = ctx->sub->views[shader_type].views[i];
-    if (dirty & (1 << i) && tview) {
-      if (ctx->sub->prog->shadow_samp_mask[shader_type] & (1 << i)) {
-        glUniform4f(
-            ctx->sub->prog->shadow_samp_mask_locs[shader_type][index],
-            (tview->gl_swizzle_r == GL_ZERO || tview->gl_swizzle_r == GL_ONE)
-                ? 0.0
-                : 1.0,
-            (tview->gl_swizzle_g == GL_ZERO || tview->gl_swizzle_g == GL_ONE)
-                ? 0.0
-                : 1.0,
-            (tview->gl_swizzle_b == GL_ZERO || tview->gl_swizzle_b == GL_ONE)
-                ? 0.0
-                : 1.0,
-            (tview->gl_swizzle_a == GL_ZERO || tview->gl_swizzle_a == GL_ONE)
-                ? 0.0
-                : 1.0);
-        glUniform4f(ctx->sub->prog->shadow_samp_add_locs[shader_type][index],
-                    tview->gl_swizzle_r == GL_ONE ? 1.0 : 0.0,
-                    tview->gl_swizzle_g == GL_ONE ? 1.0 : 0.0,
-                    tview->gl_swizzle_b == GL_ONE ? 1.0 : 0.0,
-                    tview->gl_swizzle_a == GL_ONE ? 1.0 : 0.0);
-      }
-
-      if (tview->texture) {
-        GLuint id;
-        struct vrend_resource *texture = tview->texture;
-        GLenum target = tview->target;
-
-        if (has_bit(tview->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
-          id = texture->tbo_tex_id;
-          target = GL_TEXTURE_BUFFER;
-        } else
-          id = tview->id;
-
-        glActiveTexture(GL_TEXTURE0 + next_sampler_id);
-        glBindTexture(target, id);
-
-        if (ctx->sub->views[shader_type].old_ids[i] != id ||
-            ctx->sub->sampler_views_dirty[shader_type] & (1 << i)) {
-          vrend_apply_sampler_state(ctx, texture, shader_type, i,
-                                    next_sampler_id, tview);
-          ctx->sub->views[shader_type].old_ids[i] = id;
-        }
-        dirty &= ~(1 << i);
-      }
-    }
-    next_sampler_id++;
-    index++;
-  }
-  ctx->sub->sampler_views_dirty[shader_type] = dirty;
-
-  return next_sampler_id;
-}
-
-static int vrend_draw_bind_ubo_shader(struct vrend_context *ctx,
-                                      int shader_type, int next_ubo_id) {
-  uint32_t mask, dirty, update;
-  struct pipe_constant_buffer *cb;
-  struct vrend_resource *res;
-
-  if (!has_feature(feat_ubo))
-    return next_ubo_id;
-
-  mask = ctx->sub->prog->ubo_used_mask[shader_type];
-  dirty = ctx->sub->const_bufs_dirty[shader_type];
-  update = dirty & ctx->sub->const_bufs_used_mask[shader_type];
-
-  if (!update)
-    return next_ubo_id + util_bitcount(mask);
-
-  while (mask) {
-    /* The const_bufs_used_mask stores the gallium uniform buffer indices */
-    int i = u_bit_scan(&mask);
-
-    if (update & (1 << i)) {
-      /* The cbs array is indexed using the gallium uniform buffer index */
-      cb = &ctx->sub->cbs[shader_type][i];
-      res = (struct vrend_resource *)cb->buffer;
-
-      glBindBufferRange(GL_UNIFORM_BUFFER, next_ubo_id, res->id,
-                        cb->buffer_offset, cb->buffer_size);
-      dirty &= ~(1 << i);
-    }
-    next_ubo_id++;
-  }
-  ctx->sub->const_bufs_dirty[shader_type] = dirty;
-
-  return next_ubo_id;
-}
-
-static void vrend_draw_bind_const_shader(struct vrend_context *ctx,
-                                         int shader_type, bool new_program) {
-  if (ctx->sub->consts[shader_type].consts && ctx->sub->shaders[shader_type] &&
-      (ctx->sub->prog->const_location[shader_type] != -1) &&
-      (ctx->sub->const_dirty[shader_type] || new_program)) {
-    glUniform4uiv(ctx->sub->prog->const_location[shader_type],
-                  ctx->sub->shaders[shader_type]->sinfo.num_consts,
-                  ctx->sub->consts[shader_type].consts);
-    ctx->sub->const_dirty[shader_type] = false;
-  }
-}
-
-static void vrend_draw_bind_ssbo_shader(struct vrend_context *ctx,
-                                        int shader_type) {
-  uint32_t mask;
-  struct vrend_ssbo *ssbo;
-  struct vrend_resource *res;
-  int i;
-
-  if (!has_feature(feat_ssbo))
-    return;
-
-  if (!ctx->sub->prog->ssbo_locs[shader_type])
-    return;
-
-  if (!ctx->sub->ssbo_used_mask[shader_type])
-    return;
-
-  mask = ctx->sub->ssbo_used_mask[shader_type];
-  while (mask) {
-    i = u_bit_scan(&mask);
-
-    ssbo = &ctx->sub->ssbo[shader_type][i];
-    res = (struct vrend_resource *)ssbo->res;
-    glBindBufferRange(GL_SHADER_STORAGE_BUFFER, i, res->id, ssbo->buffer_offset,
-                      ssbo->buffer_size);
-  }
-}
-
-static void vrend_draw_bind_abo_shader(struct vrend_context *ctx) {
-  uint32_t mask;
-  struct vrend_abo *abo;
-  struct vrend_resource *res;
-  int i;
-
-  if (!has_feature(feat_atomic_counters))
-    return;
-
-  mask = ctx->sub->abo_used_mask;
-  while (mask) {
-    i = u_bit_scan(&mask);
-
-    abo = &ctx->sub->abo[i];
-    res = (struct vrend_resource *)abo->res;
-    glBindBufferRange(GL_ATOMIC_COUNTER_BUFFER, i, res->id, abo->buffer_offset,
-                      abo->buffer_size);
-  }
-}
-
-static void vrend_draw_bind_images_shader(struct vrend_context *ctx,
-                                          int shader_type) {
-  GLenum access;
-  GLboolean layered;
-  struct vrend_image_view *iview;
-  uint32_t mask, tex_id, level, first_layer;
-
-  if (!ctx->sub->images_used_mask[shader_type])
-    return;
-
-  if (!ctx->sub->prog->img_locs[shader_type])
-    return;
-
-  if (!has_feature(feat_images))
-    return;
-
-  mask = ctx->sub->images_used_mask[shader_type];
-  while (mask) {
-    unsigned i = u_bit_scan(&mask);
-
-    if (!(ctx->sub->prog->images_used_mask[shader_type] & (1 << i)))
-      continue;
-    iview = &ctx->sub->image_views[shader_type][i];
-    tex_id = iview->texture->id;
-    if (has_bit(iview->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
-      if (!iview->texture->tbo_tex_id)
-        glGenTextures(1, &iview->texture->tbo_tex_id);
-
-      /* glTexBuffer doesn't accept GL_RGBA8_SNORM, find an appropriate
-       * replacement. */
-      uint32_t format =
-          (iview->format == GL_RGBA8_SNORM) ? GL_RGBA8UI : iview->format;
-
-      glBindBuffer(GL_TEXTURE_BUFFER, iview->texture->id);
-      glBindTexture(GL_TEXTURE_BUFFER, iview->texture->tbo_tex_id);
-
-      if (has_feature(feat_arb_or_gles_ext_texture_buffer))
-        glTexBuffer(GL_TEXTURE_BUFFER, format, iview->texture->id);
-
-      tex_id = iview->texture->tbo_tex_id;
-      level = first_layer = 0;
-      layered = GL_TRUE;
-    } else {
-      level = iview->u.tex.level;
-      first_layer = iview->u.tex.first_layer;
-      layered = !((iview->texture->base.array_size > 1 ||
-                   iview->texture->base.depth0 > 1) &&
-                  (iview->u.tex.first_layer == iview->u.tex.last_layer));
-    }
-
-    switch (iview->access) {
-    case PIPE_IMAGE_ACCESS_READ:
-      access = GL_READ_ONLY;
-      break;
-    case PIPE_IMAGE_ACCESS_WRITE:
-      access = GL_WRITE_ONLY;
-      break;
-    case PIPE_IMAGE_ACCESS_READ_WRITE:
-      access = GL_READ_WRITE;
-      break;
-    default:
-      return;
-    }
-
-    glBindImageTexture(i, tex_id, level, layered, first_layer, access,
-                       iview->format);
-  }
-}
-
-static void vrend_draw_bind_objects(struct vrend_context *ctx,
-                                    bool new_program) {
-  int next_ubo_id = 0, next_sampler_id = 0;
-  for (int shader_type = PIPE_SHADER_VERTEX;
-       shader_type <= ctx->sub->last_shader_idx; shader_type++) {
-    next_ubo_id = vrend_draw_bind_ubo_shader(ctx, shader_type, next_ubo_id);
-    vrend_draw_bind_const_shader(ctx, shader_type, new_program);
-    next_sampler_id =
-        vrend_draw_bind_samplers_shader(ctx, shader_type, next_sampler_id);
-    vrend_draw_bind_images_shader(ctx, shader_type);
-    vrend_draw_bind_ssbo_shader(ctx, shader_type);
-  }
-
-  vrend_draw_bind_abo_shader(ctx);
-
-  if (ctx->sub->prog->fs_stipple_loc != -1) {
-    glActiveTexture(GL_TEXTURE0 + next_sampler_id);
-    glBindTexture(GL_TEXTURE_2D, ctx->pstipple_tex_id);
-    glUniform1i(ctx->sub->prog->fs_stipple_loc, next_sampler_id);
-  }
-}
-
-static void vrend_inject_tcs(struct vrend_context *ctx,
-                             int vertices_per_patch) {
-  struct pipe_stream_output_info so_info;
-
-  memset(&so_info, 0, sizeof(so_info));
-  struct vrend_shader_selector *sel =
-      vrend_create_shader_state(ctx, &so_info, false, PIPE_SHADER_TESS_CTRL);
-  struct vrend_shader *shader;
-  shader = CALLOC_STRUCT(vrend_shader);
-  vrend_fill_shader_key(ctx, sel, &shader->key);
-
-  shader->sel = sel;
-  list_inithead(&shader->programs);
-  strarray_alloc(&shader->glsl_strings, SHADER_MAX_STRINGS);
-
-  vrend_shader_create_passthrough_tcs(
-      ctx, &ctx->shader_cfg, ctx->sub->shaders[PIPE_SHADER_VERTEX]->tokens,
-      &shader->key, ctx->client->vrend_state->tess_factors, &sel->sinfo,
-      &shader->glsl_strings, vertices_per_patch);
-  // Need to add inject the selected shader to the shader selector and then the
-  // code below can continue
-  sel->tokens = NULL;
-  sel->current = shader;
-  ctx->sub->shaders[PIPE_SHADER_TESS_CTRL] = sel;
-  ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->num_shaders = 1;
-
-  shader->id = glCreateShader(conv_shader_type(shader->sel->type));
-  vrend_compile_shader(ctx, shader);
-}
-
-int vrend_draw_vbo(struct vrend_context *ctx, const struct pipe_draw_info *info,
-                   uint32_t cso, uint32_t indirect_handle,
-                   uint32_t indirect_draw_count_handle) {
-  int i;
-  bool new_program = false;
-  struct vrend_resource *indirect_res = NULL;
-
-  if (ctx->in_error)
-    return 0;
-
-  if (info->instance_count && !has_feature(feat_draw_instance))
-    return EINVAL;
-
-  if (info->start_instance || info->indirect.draw_count > 1)
-    return EINVAL;
-
-  if (indirect_handle) {
-    if (!has_feature(feat_indirect_draw))
-      return EINVAL;
-
-    indirect_res = vrend_renderer_ctx_res_lookup(ctx, indirect_handle);
-    if (!indirect_res)
-      return 0;
-  }
-
-  if (indirect_draw_count_handle)
-    return EINVAL;
-
-  if (ctx->ctx_switch_pending)
-    vrend_finish_context_switch(ctx);
-
-  vrend_update_frontface_state(ctx);
-  if (ctx->sub->stencil_state_dirty)
-    vrend_update_stencil_state(ctx);
-  if (ctx->sub->scissor_state_dirty)
-    vrend_update_scissor_state(ctx);
-
-  if (ctx->sub->viewport_state_dirty)
-    vrend_update_viewport_state(ctx);
-
-  if (ctx->sub->blend_state_dirty)
-    vrend_patch_blend_state(ctx);
-
-  if (ctx->sub->shader_dirty || ctx->sub->swizzle_output_rgb_to_bgr) {
-    struct vrend_linked_shader_program *prog;
-    bool fs_dirty, vs_dirty, gs_dirty, tcs_dirty, tes_dirty;
-    bool dual_src = util_blend_state_is_dual(&ctx->sub->blend_state, 0);
-    bool same_prog;
-
-    ctx->sub->shader_dirty = false;
-
-    if (!ctx->sub->shaders[PIPE_SHADER_VERTEX] ||
-        !ctx->sub->shaders[PIPE_SHADER_FRAGMENT])
-      return 0;
-
-    vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_VERTEX], &vs_dirty);
-
-    if (ctx->sub->shaders[PIPE_SHADER_TESS_CTRL] &&
-        ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->tokens)
-      vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_TESS_CTRL],
-                          &tcs_dirty);
-    else if (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]) {
-      vrend_inject_tcs(ctx, info->vertices_per_patch);
-
-      vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_VERTEX],
-                          &vs_dirty);
-    }
-
-    if (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL])
-      vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_TESS_EVAL],
-                          &tes_dirty);
-    if (ctx->sub->shaders[PIPE_SHADER_GEOMETRY])
-      vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_GEOMETRY],
-                          &gs_dirty);
-    vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_FRAGMENT],
-                        &fs_dirty);
-
-    if (!ctx->sub->shaders[PIPE_SHADER_VERTEX]->current ||
-        !ctx->sub->shaders[PIPE_SHADER_FRAGMENT]->current ||
-        (ctx->sub->shaders[PIPE_SHADER_GEOMETRY] &&
-         !ctx->sub->shaders[PIPE_SHADER_GEOMETRY]->current) ||
-        (ctx->sub->shaders[PIPE_SHADER_TESS_CTRL] &&
-         !ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->current) ||
-        (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL] &&
-         !ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->current)) {
-      return 0;
-    }
-    same_prog = true;
-    if (ctx->sub->shaders[PIPE_SHADER_VERTEX]->current->id !=
-        (GLuint)ctx->sub->prog_ids[PIPE_SHADER_VERTEX])
-      same_prog = false;
-    if (ctx->sub->shaders[PIPE_SHADER_FRAGMENT]->current->id !=
-        (GLuint)ctx->sub->prog_ids[PIPE_SHADER_FRAGMENT])
-      same_prog = false;
-    if (ctx->sub->shaders[PIPE_SHADER_GEOMETRY] &&
-        ctx->sub->shaders[PIPE_SHADER_GEOMETRY]->current->id !=
-            (GLuint)ctx->sub->prog_ids[PIPE_SHADER_GEOMETRY])
-      same_prog = false;
-    if (ctx->sub->prog && ctx->sub->prog->dual_src_linked != dual_src)
-      same_prog = false;
-    if (ctx->sub->shaders[PIPE_SHADER_TESS_CTRL] &&
-        ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->current->id !=
-            (GLuint)ctx->sub->prog_ids[PIPE_SHADER_TESS_CTRL])
-      same_prog = false;
-    if (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL] &&
-        ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->current->id !=
-            (GLuint)ctx->sub->prog_ids[PIPE_SHADER_TESS_EVAL])
-      same_prog = false;
-
-    if (!same_prog) {
-      prog = lookup_shader_program(
-          ctx, ctx->sub->shaders[PIPE_SHADER_VERTEX]->current->id,
-          ctx->sub->shaders[PIPE_SHADER_FRAGMENT]->current->id,
-          ctx->sub->shaders[PIPE_SHADER_GEOMETRY]
-              ? ctx->sub->shaders[PIPE_SHADER_GEOMETRY]->current->id
-              : 0,
-          ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]
-              ? ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->current->id
-              : 0,
-          ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]
-              ? ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->current->id
-              : 0,
-          dual_src);
-      if (!prog) {
-        prog = add_shader_program(
-            ctx, ctx->sub->shaders[PIPE_SHADER_VERTEX]->current,
-            ctx->sub->shaders[PIPE_SHADER_FRAGMENT]->current,
-            ctx->sub->shaders[PIPE_SHADER_GEOMETRY]
-                ? ctx->sub->shaders[PIPE_SHADER_GEOMETRY]->current
-                : NULL,
-            ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]
-                ? ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->current
-                : NULL,
-            ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]
-                ? ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->current
-                : NULL);
-        if (!prog)
-          return 0;
-      }
-
-      ctx->sub->last_shader_idx = ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]
-                                      ? PIPE_SHADER_TESS_EVAL
-                                      : (ctx->sub->shaders[PIPE_SHADER_GEOMETRY]
-                                             ? PIPE_SHADER_GEOMETRY
-                                             : PIPE_SHADER_FRAGMENT);
-    } else
-      prog = ctx->sub->prog;
-    if (ctx->sub->prog != prog) {
-      new_program = true;
-      ctx->sub->prog_ids[PIPE_SHADER_VERTEX] =
-          ctx->sub->shaders[PIPE_SHADER_VERTEX]->current->id;
-      ctx->sub->prog_ids[PIPE_SHADER_FRAGMENT] =
-          ctx->sub->shaders[PIPE_SHADER_FRAGMENT]->current->id;
-      if (ctx->sub->shaders[PIPE_SHADER_GEOMETRY])
-        ctx->sub->prog_ids[PIPE_SHADER_GEOMETRY] =
-            ctx->sub->shaders[PIPE_SHADER_GEOMETRY]->current->id;
-      if (ctx->sub->shaders[PIPE_SHADER_TESS_CTRL])
-        ctx->sub->prog_ids[PIPE_SHADER_TESS_CTRL] =
-            ctx->sub->shaders[PIPE_SHADER_TESS_CTRL]->current->id;
-      if (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL])
-        ctx->sub->prog_ids[PIPE_SHADER_TESS_EVAL] =
-            ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->current->id;
-      ctx->sub->prog_ids[PIPE_SHADER_COMPUTE] = -1;
-      ctx->sub->prog = prog;
-
-      /* mark all constbufs and sampler views as dirty */
-      for (int stage = PIPE_SHADER_VERTEX; stage <= PIPE_SHADER_FRAGMENT;
-           stage++) {
-        ctx->sub->const_bufs_dirty[stage] = ~0;
-        ctx->sub->sampler_views_dirty[stage] = ~0;
-      }
-
-      prog->ref_context = ctx->sub;
-    }
-  }
-  if (!ctx->sub->prog)
-    return 0;
-
-  vrend_use_program(ctx, ctx->sub->prog->id);
-
-  vrend_draw_bind_objects(ctx, new_program);
-
-  if (!ctx->sub->ve)
-    return 0;
-  float viewport_neg_val = ctx->sub->viewport_is_negative ? -1.0 : 1.0;
-  if (ctx->sub->prog->viewport_neg_val != viewport_neg_val) {
-    glUniform1f(ctx->sub->prog->vs_ws_adjust_loc, viewport_neg_val);
-    ctx->sub->prog->viewport_neg_val = viewport_neg_val;
-  }
-
-  if (ctx->sub->rs_state.clip_plane_enable) {
-    for (i = 0; i < 8; i++) {
-      glUniform4fv(ctx->sub->prog->clip_locs[i], 1,
-                   (const GLfloat *)&ctx->sub->ucp_state.ucp[i]);
-    }
-  }
-
-  if (has_feature(feat_gles31_vertex_attrib_binding))
-    vrend_draw_bind_vertex_binding(ctx, ctx->sub->ve);
-  else
-    vrend_draw_bind_vertex_legacy(ctx, ctx->sub->ve);
-
-  for (i = 0; i < ctx->sub->prog->ss[PIPE_SHADER_VERTEX]->sel->sinfo.num_inputs;
-       i++) {
-    struct vrend_vertex_element_array *va = ctx->sub->ve;
-    struct vrend_vertex_element *ve = &va->elements[i];
-    int vbo_index = ve->base.vertex_buffer_index;
-    if (!ctx->sub->vbo[vbo_index].buffer)
-      return 0;
-  }
-
-  if (info->indexed) {
-    struct vrend_resource *res = (struct vrend_resource *)ctx->sub->ib.buffer;
-    if (!res)
-      return 0;
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, res->id);
-  } else
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-
-  if (ctx->sub->current_so) {
-    if (ctx->sub->current_so->xfb_state == XFB_STATE_STARTED_NEED_BEGIN) {
-      if (ctx->sub->shaders[PIPE_SHADER_GEOMETRY])
-        glBeginTransformFeedback(get_gs_xfb_mode(
-            ctx->sub->shaders[PIPE_SHADER_GEOMETRY]->sinfo.gs_out_prim));
-      else if (ctx->sub->shaders[PIPE_SHADER_TESS_EVAL])
-        glBeginTransformFeedback(get_tess_xfb_mode(
-            ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->sinfo.tes_prim,
-            ctx->sub->shaders[PIPE_SHADER_TESS_EVAL]->sinfo.tes_point_mode));
-      else
-        glBeginTransformFeedback(get_xfb_mode(info->mode));
-      ctx->sub->current_so->xfb_state = XFB_STATE_STARTED;
-    } else if (ctx->sub->current_so->xfb_state == XFB_STATE_PAUSED) {
-      glResumeTransformFeedback();
-      ctx->sub->current_so->xfb_state = XFB_STATE_STARTED;
-    }
-  }
-
-  if (info->primitive_restart) {
-    glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
-  }
-
-  if (has_feature(feat_indirect_draw)) {
-    GLint buf = indirect_res ? indirect_res->id : 0;
-    if (ctx->sub->draw_indirect_buffer != buf) {
-      glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buf);
-      ctx->sub->draw_indirect_buffer = buf;
-    }
-  }
-
-  if (info->vertices_per_patch && has_feature(feat_tessellation))
-    glPatchParameteri(GL_PATCH_VERTICES, info->vertices_per_patch);
-
-  /* set the vertex state up now on a delay */
-  if (!info->indexed) {
-    GLenum mode = info->mode;
-    int count = cso ? cso : info->count;
-    int start = cso ? 0 : info->start;
-
-    if (indirect_handle) {
-      glDrawArraysIndirect(
-          mode, (GLvoid const *)(unsigned long)info->indirect.offset);
-    } else if (info->instance_count <= 1)
-      glDrawArrays(mode, start, count);
-    else
-      glDrawArraysInstanced(mode, start, count, info->instance_count);
-  } else {
-    GLenum elsz;
-    GLenum mode = info->mode;
-    switch (ctx->sub->ib.index_size) {
-    case 1:
-      elsz = GL_UNSIGNED_BYTE;
-      break;
-    case 2:
-      elsz = GL_UNSIGNED_SHORT;
-      break;
-    case 4:
-    default:
-      elsz = GL_UNSIGNED_INT;
-      break;
-    }
-
-    if (indirect_handle) {
-      glDrawElementsIndirect(
-          mode, elsz, (GLvoid const *)(unsigned long)info->indirect.offset);
-    } else if (info->index_bias) {
-      if (info->instance_count > 1)
-        glDrawElementsInstancedBaseVertex(
-            mode, info->count, elsz, (void *)(unsigned long)ctx->sub->ib.offset,
-            info->instance_count, info->index_bias);
-      else if (info->min_index != 0 || info->max_index != (unsigned)-1)
-        glDrawRangeElementsBaseVertex(
-            mode, info->min_index, info->max_index, info->count, elsz,
-            (void *)(unsigned long)ctx->sub->ib.offset, info->index_bias);
-      else
-        glDrawElementsBaseVertex(mode, info->count, elsz,
-                                 (void *)(unsigned long)ctx->sub->ib.offset,
-                                 info->index_bias);
-    } else if (info->instance_count > 1) {
-      glDrawElementsInstanced(mode, info->count, elsz,
-                              (void *)(unsigned long)ctx->sub->ib.offset,
-                              info->instance_count);
-    } else if (info->min_index != 0 || info->max_index != (unsigned)-1)
-      glDrawRangeElements(mode, info->min_index, info->max_index, info->count,
-                          elsz, (void *)(unsigned long)ctx->sub->ib.offset);
-    else
-      glDrawElements(mode, info->count, elsz,
-                     (void *)(unsigned long)ctx->sub->ib.offset);
-  }
-
-  if (info->primitive_restart) {
-    glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
-  }
-
-  if (ctx->sub->current_so && has_feature(feat_transform_feedback2)) {
-    if (ctx->sub->current_so->xfb_state == XFB_STATE_STARTED) {
-      glPauseTransformFeedback();
-      ctx->sub->current_so->xfb_state = XFB_STATE_PAUSED;
-    }
-  }
-  return 0;
-}
-
-void vrend_launch_grid(struct vrend_context *ctx, UNUSED uint32_t *block,
-                       uint32_t *grid, uint32_t indirect_handle,
-                       uint32_t indirect_offset) {
-  bool new_program = false;
-  struct vrend_resource *indirect_res = NULL;
-
-  if (!has_feature(feat_compute_shader))
-    return;
-
-  if (ctx->sub->cs_shader_dirty) {
-    struct vrend_linked_shader_program *prog;
-    bool cs_dirty;
-
-    ctx->sub->cs_shader_dirty = false;
-
-    if (!ctx->sub->shaders[PIPE_SHADER_COMPUTE])
-      return;
-
-    vrend_shader_select(ctx, ctx->sub->shaders[PIPE_SHADER_COMPUTE], &cs_dirty);
-    if (!ctx->sub->shaders[PIPE_SHADER_COMPUTE]->current)
-      return;
-    if (ctx->sub->shaders[PIPE_SHADER_COMPUTE]->current->id !=
-        (GLuint)ctx->sub->prog_ids[PIPE_SHADER_COMPUTE]) {
-      prog = lookup_cs_shader_program(
-          ctx, ctx->sub->shaders[PIPE_SHADER_COMPUTE]->current->id);
-      if (!prog) {
-        prog = add_cs_shader_program(
-            ctx, ctx->sub->shaders[PIPE_SHADER_COMPUTE]->current);
-        if (!prog)
-          return;
-      }
-    } else
-      prog = ctx->sub->prog;
-
-    if (ctx->sub->prog != prog) {
-      new_program = true;
-      ctx->sub->prog_ids[PIPE_SHADER_VERTEX] = -1;
-      ctx->sub->prog_ids[PIPE_SHADER_COMPUTE] =
-          ctx->sub->shaders[PIPE_SHADER_COMPUTE]->current->id;
-      ctx->sub->prog = prog;
-      prog->ref_context = ctx->sub;
-    }
-    ctx->sub->shader_dirty = true;
-  }
-  vrend_use_program(ctx, ctx->sub->prog->id);
-
-  vrend_draw_bind_ubo_shader(ctx, PIPE_SHADER_COMPUTE, 0);
-  vrend_draw_bind_const_shader(ctx, PIPE_SHADER_COMPUTE, new_program);
-  vrend_draw_bind_samplers_shader(ctx, PIPE_SHADER_COMPUTE, 0);
-  vrend_draw_bind_images_shader(ctx, PIPE_SHADER_COMPUTE);
-  vrend_draw_bind_ssbo_shader(ctx, PIPE_SHADER_COMPUTE);
-  vrend_draw_bind_abo_shader(ctx);
-
-  if (indirect_handle) {
-    indirect_res = vrend_renderer_ctx_res_lookup(ctx, indirect_handle);
-    if (!indirect_res)
-      return;
-  }
-
-  if (indirect_res)
-    glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, indirect_res->id);
-  else
-    glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0);
-
-  if (indirect_res) {
-    glDispatchComputeIndirect(indirect_offset);
-  } else {
-    glDispatchCompute(grid[0], grid[1], grid[2]);
-  }
-}
-
-static GLenum translate_blend_func(uint32_t pipe_blend) {
-  switch (pipe_blend) {
-  case PIPE_BLEND_ADD:
-    return GL_FUNC_ADD;
-  case PIPE_BLEND_SUBTRACT:
-    return GL_FUNC_SUBTRACT;
-  case PIPE_BLEND_REVERSE_SUBTRACT:
-    return GL_FUNC_REVERSE_SUBTRACT;
-  case PIPE_BLEND_MIN:
-    return GL_MIN;
-  case PIPE_BLEND_MAX:
-    return GL_MAX;
-  default:
-    assert("invalid blend token()" == NULL);
-    return 0;
-  }
-}
-
-static GLenum translate_blend_factor(uint32_t pipe_factor) {
-  switch (pipe_factor) {
-  case PIPE_BLENDFACTOR_ONE:
-    return GL_ONE;
-  case PIPE_BLENDFACTOR_SRC_COLOR:
-    return GL_SRC_COLOR;
-  case PIPE_BLENDFACTOR_SRC_ALPHA:
-    return GL_SRC_ALPHA;
-
-  case PIPE_BLENDFACTOR_DST_COLOR:
-    return GL_DST_COLOR;
-  case PIPE_BLENDFACTOR_DST_ALPHA:
-    return GL_DST_ALPHA;
-
-  case PIPE_BLENDFACTOR_CONST_COLOR:
-    return GL_CONSTANT_COLOR;
-  case PIPE_BLENDFACTOR_CONST_ALPHA:
-    return GL_CONSTANT_ALPHA;
-
-  case PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE:
-    return GL_SRC_ALPHA_SATURATE;
-  case PIPE_BLENDFACTOR_ZERO:
-    return GL_ZERO;
-
-  case PIPE_BLENDFACTOR_INV_SRC_COLOR:
-    return GL_ONE_MINUS_SRC_COLOR;
-  case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
-    return GL_ONE_MINUS_SRC_ALPHA;
-
-  case PIPE_BLENDFACTOR_INV_DST_COLOR:
-    return GL_ONE_MINUS_DST_COLOR;
-  case PIPE_BLENDFACTOR_INV_DST_ALPHA:
-    return GL_ONE_MINUS_DST_ALPHA;
-
-  case PIPE_BLENDFACTOR_INV_CONST_COLOR:
-    return GL_ONE_MINUS_CONSTANT_COLOR;
-  case PIPE_BLENDFACTOR_INV_CONST_ALPHA:
-    return GL_ONE_MINUS_CONSTANT_ALPHA;
-
-  default:
-    assert("invalid blend token()" == NULL);
-    return 0;
-  }
-}
-
-static GLenum translate_stencil_op(GLuint op) {
-  switch (op) {
-#define CASE(x)                                                                \
-  case PIPE_STENCIL_OP_##x:                                                    \
-    return GL_##x
-    CASE(KEEP);
-    CASE(ZERO);
-    CASE(REPLACE);
-    CASE(INCR);
-    CASE(DECR);
-    CASE(INCR_WRAP);
-    CASE(DECR_WRAP);
-    CASE(INVERT);
-  default:
-    assert("invalid stencilop token()" == NULL);
-    return 0;
-  }
-#undef CASE
-}
-
-static inline bool is_dst_blend(int blend_factor) {
-  return (blend_factor == PIPE_BLENDFACTOR_DST_ALPHA ||
-          blend_factor == PIPE_BLENDFACTOR_INV_DST_ALPHA);
-}
-
-static inline int conv_dst_blend(int blend_factor) {
-  if (blend_factor == PIPE_BLENDFACTOR_DST_ALPHA)
-    return PIPE_BLENDFACTOR_ONE;
-  if (blend_factor == PIPE_BLENDFACTOR_INV_DST_ALPHA)
-    return PIPE_BLENDFACTOR_ZERO;
-  return blend_factor;
-}
-
-static void vrend_hw_emit_blend(struct vrend_context *ctx,
-                                struct pipe_blend_state *state) {
-  if (state->logicop_enable != ctx->sub->hw_blend_state.logicop_enable) {
-    ctx->sub->hw_blend_state.logicop_enable = state->logicop_enable;
-    if (can_emulate_logicop(state->logicop_func))
-      ctx->sub->shader_dirty = true;
-  }
-
-  if (state->independent_blend_enable && has_feature(feat_indep_blend) &&
-      has_feature(feat_indep_blend_func)) {
-    /* ARB_draw_buffers_blend is required for this */
-    int i;
-
-    for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
-      if (state->rt[i].blend_enable) {
-        glBlendFuncSeparatei(
-            i, translate_blend_factor(state->rt[i].rgb_src_factor),
-            translate_blend_factor(state->rt[i].rgb_dst_factor),
-            translate_blend_factor(state->rt[i].alpha_src_factor),
-            translate_blend_factor(state->rt[i].alpha_dst_factor));
-        glBlendEquationSeparatei(i, translate_blend_func(state->rt[i].rgb_func),
-                                 translate_blend_func(state->rt[i].alpha_func));
-        glEnablei(GL_BLEND, i);
-      } else {
-        glDisablei(GL_BLEND, i);
-      }
-
-      if (state->rt[i].colormask != ctx->sub->hw_blend_state.rt[i].colormask) {
-        ctx->sub->hw_blend_state.rt[i].colormask = state->rt[i].colormask;
-        glColorMaski(i,
-                     state->rt[i].colormask & PIPE_MASK_R ? GL_TRUE : GL_FALSE,
-                     state->rt[i].colormask & PIPE_MASK_G ? GL_TRUE : GL_FALSE,
-                     state->rt[i].colormask & PIPE_MASK_B ? GL_TRUE : GL_FALSE,
-                     state->rt[i].colormask & PIPE_MASK_A ? GL_TRUE : GL_FALSE);
-      }
-    }
-  } else {
-    if (state->rt[0].blend_enable) {
-      glBlendFuncSeparate(
-          translate_blend_factor(state->rt[0].rgb_src_factor),
-          translate_blend_factor(state->rt[0].rgb_dst_factor),
-          translate_blend_factor(state->rt[0].alpha_src_factor),
-          translate_blend_factor(state->rt[0].alpha_dst_factor));
-      glBlendEquationSeparate(translate_blend_func(state->rt[0].rgb_func),
-                              translate_blend_func(state->rt[0].alpha_func));
-      glEnable(GL_BLEND);
-    } else {
-      glDisable(GL_BLEND);
-    }
-
-    if (state->rt[0].colormask != ctx->sub->hw_blend_state.rt[0].colormask) {
-      int i;
-      for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
-        ctx->sub->hw_blend_state.rt[i].colormask = state->rt[i].colormask;
-      glColorMask(state->rt[0].colormask & PIPE_MASK_R ? GL_TRUE : GL_FALSE,
-                  state->rt[0].colormask & PIPE_MASK_G ? GL_TRUE : GL_FALSE,
-                  state->rt[0].colormask & PIPE_MASK_B ? GL_TRUE : GL_FALSE,
-                  state->rt[0].colormask & PIPE_MASK_A ? GL_TRUE : GL_FALSE);
-    }
-  }
-  ctx->sub->hw_blend_state.independent_blend_enable =
-      state->independent_blend_enable;
-
-  if (has_feature(feat_multisample)) {
-    if (state->alpha_to_coverage)
-      glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE);
-    else
-      glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE);
-  }
-
-  if (state->dither)
-    glEnable(GL_DITHER);
-  else
-    glDisable(GL_DITHER);
-}
-
-/* there are a few reasons we might need to patch the blend state.
-   a) patching blend factors for dst with no alpha
-   b) patching colormask/blendcolor/blendfactors for A8/A16 format
-   emulation using GL_R8/GL_R16.
-*/
-static void vrend_patch_blend_state(struct vrend_context *ctx) {
-  struct pipe_blend_state new_state = ctx->sub->blend_state;
-  struct pipe_blend_state *state = &ctx->sub->blend_state;
-  bool swizzle_blend_color = false;
-  struct pipe_blend_color blend_color = ctx->sub->blend_color;
-  int i;
-
-  if (ctx->sub->nr_cbufs == 0) {
-    ctx->sub->blend_state_dirty = false;
-    return;
-  }
-
-  for (i = 0; i < (state->independent_blend_enable ? PIPE_MAX_COLOR_BUFS : 1);
-       i++) {
-    if (i < ctx->sub->nr_cbufs && ctx->sub->surf[i]) {
-      if (!util_format_has_alpha(ctx->sub->surf[i]->format)) {
-        if (!(is_dst_blend(state->rt[i].rgb_src_factor) ||
-              is_dst_blend(state->rt[i].rgb_dst_factor) ||
-              is_dst_blend(state->rt[i].alpha_src_factor) ||
-              is_dst_blend(state->rt[i].alpha_dst_factor)))
-          continue;
-        new_state.rt[i].rgb_src_factor =
-            conv_dst_blend(state->rt[i].rgb_src_factor);
-        new_state.rt[i].rgb_dst_factor =
-            conv_dst_blend(state->rt[i].rgb_dst_factor);
-        new_state.rt[i].alpha_src_factor =
-            conv_dst_blend(state->rt[i].alpha_src_factor);
-        new_state.rt[i].alpha_dst_factor =
-            conv_dst_blend(state->rt[i].alpha_dst_factor);
-      }
-    }
-  }
-
-  vrend_hw_emit_blend(ctx, &new_state);
-
-  if (swizzle_blend_color) {
-    blend_color.color[0] = blend_color.color[3];
-    blend_color.color[1] = 0.0f;
-    blend_color.color[2] = 0.0f;
-    blend_color.color[3] = 0.0f;
-  }
-
-  glBlendColor(blend_color.color[0], blend_color.color[1], blend_color.color[2],
-               blend_color.color[3]);
-
-  ctx->sub->blend_state_dirty = false;
-}
-
-void vrend_object_bind_blend(struct vrend_context *ctx, uint32_t handle) {
-  struct pipe_blend_state *state;
-
-  if (handle == 0) {
-    memset(&ctx->sub->blend_state, 0, sizeof(ctx->sub->blend_state));
-    glDisable(GL_BLEND);
-    return;
-  }
-  state =
-      vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_BLEND);
-  if (!state)
-    return;
-
-  ctx->sub->shader_dirty = true;
-  ctx->sub->blend_state = *state;
-
-  ctx->sub->blend_state_dirty = true;
-}
-
-static void vrend_hw_emit_dsa(struct vrend_context *ctx) {
-  struct pipe_depth_stencil_alpha_state *state = &ctx->sub->dsa_state;
-
-  if (state->depth.enabled) {
-    vrend_depth_test_enable(ctx, true);
-    glDepthFunc(GL_NEVER + state->depth.func);
-    if (state->depth.writemask)
-      glDepthMask(GL_TRUE);
-    else
-      glDepthMask(GL_FALSE);
-  } else
-    vrend_depth_test_enable(ctx, false);
-}
-void vrend_object_bind_dsa(struct vrend_context *ctx, uint32_t handle) {
-  struct pipe_depth_stencil_alpha_state *state;
-
-  if (handle == 0) {
-    memset(&ctx->sub->dsa_state, 0, sizeof(ctx->sub->dsa_state));
-    ctx->sub->dsa = NULL;
-    ctx->sub->stencil_state_dirty = true;
-    ctx->sub->shader_dirty = true;
-    vrend_hw_emit_dsa(ctx);
-    return;
-  }
-
-  state = vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_DSA);
-  if (!state)
-    return;
-
-  if (ctx->sub->dsa != state) {
-    ctx->sub->stencil_state_dirty = true;
-    ctx->sub->shader_dirty = true;
-  }
-  ctx->sub->dsa_state = *state;
-  ctx->sub->dsa = state;
-
-  vrend_hw_emit_dsa(ctx);
-}
-
-static void vrend_update_frontface_state(struct vrend_context *ctx) {
-  struct pipe_rasterizer_state *state = &ctx->sub->rs_state;
-  int front_ccw = state->front_ccw;
-
-  front_ccw ^= (ctx->sub->inverted_fbo_content ? 0 : 1);
-  if (front_ccw)
-    glFrontFace(GL_CCW);
-  else
-    glFrontFace(GL_CW);
-}
-
-void vrend_update_stencil_state(struct vrend_context *ctx) {
-  struct pipe_depth_stencil_alpha_state *state = ctx->sub->dsa;
-  int i;
-  if (!state)
-    return;
-
-  if (!state->stencil[1].enabled) {
-    if (state->stencil[0].enabled) {
-      vrend_stencil_test_enable(ctx, true);
-
-      glStencilOp(translate_stencil_op(state->stencil[0].fail_op),
-                  translate_stencil_op(state->stencil[0].zfail_op),
-                  translate_stencil_op(state->stencil[0].zpass_op));
-
-      glStencilFunc(GL_NEVER + state->stencil[0].func,
-                    ctx->sub->stencil_refs[0], state->stencil[0].valuemask);
-      glStencilMask(state->stencil[0].writemask);
-    } else
-      vrend_stencil_test_enable(ctx, false);
-  } else {
-    vrend_stencil_test_enable(ctx, true);
-
-    for (i = 0; i < 2; i++) {
-      GLenum face = (i == 1) ? GL_BACK : GL_FRONT;
-      glStencilOpSeparate(face, translate_stencil_op(state->stencil[i].fail_op),
-                          translate_stencil_op(state->stencil[i].zfail_op),
-                          translate_stencil_op(state->stencil[i].zpass_op));
-
-      glStencilFuncSeparate(face, GL_NEVER + state->stencil[i].func,
-                            ctx->sub->stencil_refs[i],
-                            state->stencil[i].valuemask);
-      glStencilMaskSeparate(face, state->stencil[i].writemask);
-    }
-  }
-  ctx->sub->stencil_state_dirty = false;
-}
-
-static void vrend_hw_emit_rs(struct vrend_context *ctx) {
-  struct pipe_rasterizer_state *state = &ctx->sub->rs_state;
-  int i;
-
-  /* line_width < 0 is invalid, the guest sometimes forgot to set it. */
-  glLineWidth(state->line_width <= 0 ? 1.0f : state->line_width);
-
-  if (state->rasterizer_discard != ctx->sub->hw_rs_state.rasterizer_discard) {
-    ctx->sub->hw_rs_state.rasterizer_discard = state->rasterizer_discard;
-    if (state->rasterizer_discard)
-      glEnable(GL_RASTERIZER_DISCARD);
-    else
-      glDisable(GL_RASTERIZER_DISCARD);
-  }
-
-  if (state->offset_tri) {
-    glEnable(GL_POLYGON_OFFSET_FILL);
-  } else {
-    glDisable(GL_POLYGON_OFFSET_FILL);
-  }
-
-  if (state->flatshade != ctx->sub->hw_rs_state.flatshade) {
-    ctx->sub->hw_rs_state.flatshade = state->flatshade;
-  }
-
-  if (state->flatshade_first != ctx->sub->hw_rs_state.flatshade_first) {
-    ctx->sub->hw_rs_state.flatshade_first = state->flatshade_first;
-  }
-
-  glPolygonOffset(state->offset_scale, state->offset_units);
-
-  if (state->poly_stipple_enable && !ctx->pstip_inited) {
-    vrend_init_pstipple_texture(ctx);
-  }
-
-  if (state->cull_face != PIPE_FACE_NONE) {
-    switch (state->cull_face) {
-    case PIPE_FACE_FRONT:
-      glCullFace(GL_FRONT);
-      break;
-    case PIPE_FACE_BACK:
-      glCullFace(GL_BACK);
-      break;
-    case PIPE_FACE_FRONT_AND_BACK:
-      glCullFace(GL_FRONT_AND_BACK);
-      break;
-    }
-    glEnable(GL_CULL_FACE);
-  } else
-    glDisable(GL_CULL_FACE);
-
-  if (has_feature(feat_multisample)) {
-    if (has_feature(feat_sample_mask)) {
-      if (state->multisample)
-        glEnable(GL_SAMPLE_MASK);
-      else
-        glDisable(GL_SAMPLE_MASK);
-    }
-
-    if (has_feature(feat_sample_shading)) {
-      if (state->force_persample_interp)
-        glEnable(GL_SAMPLE_SHADING);
-      else
-        glDisable(GL_SAMPLE_SHADING);
-    }
-  }
-
-  if (state->scissor)
-    glEnable(GL_SCISSOR_TEST);
-  else
-    glDisable(GL_SCISSOR_TEST);
-  ctx->sub->hw_rs_state.scissor = state->scissor;
-}
-
-void vrend_object_bind_rasterizer(struct vrend_context *ctx, uint32_t handle) {
-  struct pipe_rasterizer_state *state;
-
-  if (handle == 0) {
-    memset(&ctx->sub->rs_state, 0, sizeof(ctx->sub->rs_state));
-    return;
-  }
-
-  state = vrend_object_lookup(ctx->sub->object_hash, handle,
-                              VIRGL_OBJECT_RASTERIZER);
-
-  if (!state)
-    return;
-
-  ctx->sub->rs_state = *state;
-  ctx->sub->shader_dirty = true;
-  vrend_hw_emit_rs(ctx);
-}
-
-void vrend_bind_sampler_states(struct vrend_context *ctx, uint32_t shader_type,
-                               uint32_t start_slot, uint32_t num_states,
-                               uint32_t *handles) {
-  uint32_t i;
-  struct vrend_sampler_state *state;
-
-  if (shader_type >= PIPE_SHADER_TYPES)
-    return;
-
-  if (num_states > PIPE_MAX_SAMPLERS ||
-      start_slot > (PIPE_MAX_SAMPLERS - num_states))
-    return;
-
-  ctx->sub->num_sampler_states[shader_type] = num_states;
-
-  uint32_t dirty = 0;
-  for (i = 0; i < num_states; i++) {
-    if (handles[i] == 0)
-      state = NULL;
-    else
-      state = vrend_object_lookup(ctx->sub->object_hash, handles[i],
-                                  VIRGL_OBJECT_SAMPLER_STATE);
-
-    ctx->sub->sampler_state[shader_type][i + start_slot] = state;
-    dirty |= 1 << (start_slot + i);
-  }
-  ctx->sub->sampler_views_dirty[shader_type] |= dirty;
-}
-
-static bool
-get_swizzled_border_color(enum virgl_formats fmt,
-                          union pipe_color_union *in_border_color,
-                          union pipe_color_union *out_border_color) {
-  const struct vrend_format_table *fmt_entry =
-      vrend_get_format_table_entry(fmt);
-  if ((fmt_entry->flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE) &&
-      (fmt_entry->bindings & VIRGL_BIND_PREFER_EMULATED_BGRA)) {
-    for (int i = 0; i < 4; ++i) {
-      int swz = fmt_entry->swizzle[i];
-      switch (swz) {
-      case PIPE_SWIZZLE_ZERO:
-        out_border_color->ui[i] = 0;
-        break;
-      case PIPE_SWIZZLE_ONE:
-        out_border_color->ui[i] = 1;
-        break;
-      default:
-        out_border_color->ui[i] = in_border_color->ui[swz];
-      }
-    }
-    return true;
-  }
-  return false;
-}
-
-static void vrend_apply_sampler_state(struct vrend_context *ctx,
-                                      struct vrend_resource *res,
-                                      uint32_t shader_type, int id,
-                                      int sampler_id,
-                                      struct vrend_sampler_view *tview) {
-  struct vrend_texture *tex = (struct vrend_texture *)res;
-  struct vrend_sampler_state *vstate = ctx->sub->sampler_state[shader_type][id];
-  struct pipe_sampler_state *state = &vstate->base;
-  bool set_all = false;
-  GLenum target = tex->base.target;
-
-  if (!state)
-    return;
-  if (res->base.nr_samples > 0) {
-    tex->state = *state;
-    return;
-  }
-
-  if (has_bit(tex->base.storage_bits, VREND_STORAGE_GL_BUFFER)) {
-    tex->state = *state;
-    return;
-  }
-
-  if (has_feature(feat_samplers)) {
-    int sampler = vstate->ids[tview->srgb_decode == GL_SKIP_DECODE_EXT ? 0 : 1];
-    union pipe_color_union border_color;
-    if (get_swizzled_border_color(tview->format, &state->border_color,
-                                  &border_color))
-      glSamplerParameterIuiv(sampler, GL_TEXTURE_BORDER_COLOR, border_color.ui);
-
-    glBindSampler(sampler_id, sampler);
-    return;
-  }
-
-  if (tex->state.max_lod == -1)
-    set_all = true;
-
-  if (tex->state.wrap_s != state->wrap_s || set_all)
-    glTexParameteri(target, GL_TEXTURE_WRAP_S, convert_wrap(state->wrap_s));
-  if (tex->state.wrap_t != state->wrap_t || set_all)
-    glTexParameteri(target, GL_TEXTURE_WRAP_T, convert_wrap(state->wrap_t));
-  if (tex->state.wrap_r != state->wrap_r || set_all)
-    glTexParameteri(target, GL_TEXTURE_WRAP_R, convert_wrap(state->wrap_r));
-  if (tex->state.min_img_filter != state->min_img_filter ||
-      tex->state.min_mip_filter != state->min_mip_filter || set_all)
-    glTexParameterf(
-        target, GL_TEXTURE_MIN_FILTER,
-        convert_min_filter(state->min_img_filter, state->min_mip_filter));
-  if (tex->state.mag_img_filter != state->mag_img_filter || set_all)
-    glTexParameterf(target, GL_TEXTURE_MAG_FILTER,
-                    convert_mag_filter(state->mag_img_filter));
-  if (res->target != GL_TEXTURE_RECTANGLE) {
-    if (tex->state.min_lod != state->min_lod || set_all)
-      glTexParameterf(target, GL_TEXTURE_MIN_LOD, state->min_lod);
-    if (tex->state.max_lod != state->max_lod || set_all)
-      glTexParameterf(target, GL_TEXTURE_MAX_LOD, state->max_lod);
-  }
-
-  if (tex->state.compare_func != state->compare_func || set_all)
-    glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC,
-                    GL_NEVER + state->compare_func);
-
-  if (memcmp(&tex->state.border_color, &state->border_color, 16) || set_all) {
-    union pipe_color_union border_color;
-    if (get_swizzled_border_color(tview->format, &state->border_color,
-                                  &border_color))
-      glTexParameterIuiv(target, GL_TEXTURE_BORDER_COLOR, border_color.ui);
-    else
-      glTexParameterIuiv(target, GL_TEXTURE_BORDER_COLOR,
-                         state->border_color.ui);
-  }
-  tex->state = *state;
-}
-
-static GLenum tgsitargettogltarget(const enum pipe_texture_target target,
-                                   int nr_samples) {
-  switch (target) {
-  case PIPE_TEXTURE_1D:
-    return GL_TEXTURE_1D;
-  case PIPE_TEXTURE_2D:
-    return (nr_samples > 0) ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D;
-  case PIPE_TEXTURE_3D:
-    return GL_TEXTURE_3D;
-  case PIPE_TEXTURE_RECT:
-    return GL_TEXTURE_RECTANGLE;
-  case PIPE_TEXTURE_CUBE:
-    return GL_TEXTURE_CUBE_MAP;
-
-  case PIPE_TEXTURE_1D_ARRAY:
-    return GL_TEXTURE_1D_ARRAY;
-  case PIPE_TEXTURE_2D_ARRAY:
-    return (nr_samples > 0) ? GL_TEXTURE_2D_MULTISAMPLE_ARRAY
-                            : GL_TEXTURE_2D_ARRAY;
-  case PIPE_TEXTURE_CUBE_ARRAY:
-    return GL_TEXTURE_CUBE_MAP_ARRAY;
-  case PIPE_BUFFER:
-  default:
-    return PIPE_BUFFER;
-  }
-  return PIPE_BUFFER;
-}
-
-static ssize_t write_full(int fd, const void *ptr, size_t count) {
-  const char *buf = ptr;
-  ssize_t ret = 0;
-  ssize_t total = 0;
-
-  while (count) {
-    ret = write(fd, buf, count);
-    if (ret < 0) {
-      if (errno == EINTR)
-        continue;
-      break;
-    }
-    count -= ret;
-    buf += ret;
-    total += ret;
-  }
-  return total;
-}
-
-int vrend_renderer_init(struct virgl_client *client, struct vrend_if_cbs *cbs) {
-  int gles_ver;
-
-  client->vrend_state = CALLOC_STRUCT(vrend_state);
-
-  vrend_object_init_resource_table(client);
-
-  if (!vrend_clicbs)
-    vrend_clicbs = cbs;
-
-  /* Give some defaults to be able to run the tests */
-  client->vrend_state->max_texture_2d_size =
-      client->vrend_state->max_texture_3d_size =
-          client->vrend_state->max_texture_cube_size = 16384;
-
-  gles_ver = vrend_gl_version();
-
-  if (!features_initialized) {
-    features_initialized = true;
-    init_features(gles_ver);
-  }
-
-  glGetIntegerv(GL_MAX_DRAW_BUFFERS,
-                (GLint *)&client->vrend_state->max_draw_buffers);
-
-  vrend_resource_set_destroy_callback(vrend_destroy_resource_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_QUERY,
-                                    vrend_destroy_query_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_SURFACE,
-                                    vrend_destroy_surface_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_SHADER,
-                                    vrend_destroy_shader_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_SAMPLER_VIEW,
-                                    vrend_destroy_sampler_view_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_STREAMOUT_TARGET,
-                                    vrend_destroy_so_target_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_SAMPLER_STATE,
-                                    vrend_destroy_sampler_state_object);
-  vrend_object_set_destroy_callback(VIRGL_OBJECT_VERTEX_ELEMENTS,
-                                    vrend_destroy_vertex_elements_object);
-
-  if (!tex_conv_table_initialized) {
-    tex_conv_table_initialized = true;
-    vrend_build_format_list();
-    vrend_check_texture_storage(tex_conv_table);
-  }
-
-  list_inithead(&client->vrend_state->fence_list);
-  list_inithead(&client->vrend_state->fence_wait_list);
-  list_inithead(&client->vrend_state->waiting_query_list);
-  list_inithead(&client->vrend_state->active_ctx_list);
-  /* create 0 context */
-  vrend_renderer_context_create_internal(client, 0);
-
-  return 0;
-}
-
-void vrend_renderer_fini(struct virgl_client *client) {
-  if (!client->vrend_state)
-    return;
-
-  typedef void (*destroy_callback)(void *);
-  vrend_resource_set_destroy_callback(
-      (destroy_callback)vrend_renderer_resource_destroy);
-
-  vrend_blitter_fini(client);
-  vrend_decode_reset(client, false);
-  vrend_object_fini_resource_table(client);
-  vrend_decode_reset(client, true);
-
-  client->vrend_state->current_ctx = NULL;
-  client->vrend_state->current_hw_ctx = NULL;
-}
-
-static void vrend_destroy_sub_context(struct virgl_client *client,
-                                      struct vrend_sub_context *sub) {
-  int i, j;
-  struct vrend_streamout_object *obj, *tmp;
-
-  if (sub->fb_id)
-    glDeleteFramebuffers(1, &sub->fb_id);
-
-  if (sub->blit_fb_ids[0])
-    glDeleteFramebuffers(2, sub->blit_fb_ids);
-
-  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-
-  if (!has_feature(feat_gles31_vertex_attrib_binding)) {
-    while (sub->enabled_attribs_bitmask) {
-      i = u_bit_scan(&sub->enabled_attribs_bitmask);
-
-      glDisableVertexAttribArray(i);
-    }
-    glDeleteVertexArrays(1, &sub->vaoid);
-  }
-
-  glBindVertexArray(0);
-
-  if (sub->current_so)
-    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
-
-  LIST_FOR_EACH_ENTRY_SAFE(obj, tmp, &sub->streamout_list, head) {
-    vrend_destroy_streamout_object(obj);
-  }
-
-  vrend_shader_state_reference(&sub->shaders[PIPE_SHADER_VERTEX], NULL);
-  vrend_shader_state_reference(&sub->shaders[PIPE_SHADER_FRAGMENT], NULL);
-  vrend_shader_state_reference(&sub->shaders[PIPE_SHADER_GEOMETRY], NULL);
-  vrend_shader_state_reference(&sub->shaders[PIPE_SHADER_TESS_CTRL], NULL);
-  vrend_shader_state_reference(&sub->shaders[PIPE_SHADER_TESS_EVAL], NULL);
-  vrend_shader_state_reference(&sub->shaders[PIPE_SHADER_COMPUTE], NULL);
-
-  if (sub->prog)
-    sub->prog->ref_context = NULL;
-
-  vrend_free_programs(sub);
-  for (i = 0; i < PIPE_SHADER_TYPES; i++) {
-    free(sub->consts[i].consts);
-    sub->consts[i].consts = NULL;
-
-    for (j = 0; j < PIPE_MAX_SHADER_SAMPLER_VIEWS; j++) {
-      vrend_sampler_view_reference(&sub->views[i].views[j], NULL);
-    }
-  }
-
-  if (sub->zsurf)
-    vrend_surface_reference(&sub->zsurf, NULL);
-
-  for (i = 0; i < sub->nr_cbufs; i++) {
-    if (!sub->surf[i])
-      continue;
-    vrend_surface_reference(&sub->surf[i], NULL);
-  }
-
-  vrend_resource_reference((struct vrend_resource **)&sub->ib.buffer, NULL);
-
-  vrend_object_fini_ctx_table(sub->object_hash);
-  vrend_clicbs->destroy_gl_context(client, sub->gl_context);
-
-  list_del(&sub->head);
-  FREE(sub);
-}
-
-bool vrend_destroy_context(struct vrend_context *ctx) {
-  bool switch_0 = (ctx == ctx->client->vrend_state->current_ctx);
-  struct vrend_context *cur = ctx->client->vrend_state->current_ctx;
-  struct vrend_sub_context *sub, *tmp;
-  if (switch_0) {
-    ctx->client->vrend_state->current_ctx = NULL;
-    ctx->client->vrend_state->current_hw_ctx = NULL;
-  }
-
-  if (ctx->pstip_inited)
-    glDeleteTextures(1, &ctx->pstipple_tex_id);
-  ctx->pstip_inited = false;
-
-  /* reset references on framebuffers */
-  vrend_set_framebuffer_state(ctx, 0, NULL, 0);
-
-  vrend_set_num_sampler_views(ctx, PIPE_SHADER_VERTEX, 0, 0);
-  vrend_set_num_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 0);
-  vrend_set_num_sampler_views(ctx, PIPE_SHADER_GEOMETRY, 0, 0);
-  vrend_set_num_sampler_views(ctx, PIPE_SHADER_TESS_CTRL, 0, 0);
-  vrend_set_num_sampler_views(ctx, PIPE_SHADER_TESS_EVAL, 0, 0);
-  vrend_set_num_sampler_views(ctx, PIPE_SHADER_COMPUTE, 0, 0);
-
-  vrend_set_streamout_targets(ctx, 0, 0, NULL);
-  vrend_set_num_vbo(ctx, 0);
-
-  vrend_set_index_buffer(ctx, 0, 0, 0);
-
-  vrend_renderer_force_ctx_0(ctx->client);
-  LIST_FOR_EACH_ENTRY_SAFE(sub, tmp, &ctx->sub_ctxs, head)
-  vrend_destroy_sub_context(ctx->client, sub);
-
-  vrend_object_fini_ctx_table(ctx->res_hash);
-
-  list_del(&ctx->ctx_entry);
-
-  FREE(ctx);
-
-  if (!switch_0 && cur)
-    vrend_hw_switch_context(cur, true);
-
-  return switch_0;
-}
-
-struct vrend_context *vrend_create_context(struct virgl_client *client,
-                                           int id) {
-  struct vrend_context *grctx = CALLOC_STRUCT(vrend_context);
-
-  if (!grctx)
-    return NULL;
-
-  grctx->ctx_id = id;
-  grctx->client = client;
-
-  list_inithead(&grctx->sub_ctxs);
-  list_inithead(&grctx->active_nontimer_query_list);
-
-  grctx->res_hash = vrend_object_init_ctx_table();
-
-  grctx->shader_cfg.use_explicit_locations =
-      client->vrend_state->use_explicit_locations;
-  grctx->shader_cfg.max_draw_buffers = client->vrend_state->max_draw_buffers;
-  grctx->shader_cfg.has_es31_compat = has_feature(feat_gles31_compatibility);
-
-  vrend_renderer_create_sub_ctx(grctx, 0);
-  vrend_renderer_set_sub_ctx(grctx, 0);
-
-  vrend_get_glsl_version(&grctx->shader_cfg.glsl_version);
-
-  list_addtail(&grctx->ctx_entry, &client->vrend_state->active_ctx_list);
-
-  return grctx;
-}
-
-int vrend_renderer_resource_attach_iov(struct virgl_client *client,
-                                       int res_handle, struct iovec *iov,
-                                       int num_iovs) {
-  struct vrend_resource *res;
-
-  res = vrend_resource_lookup(client, res_handle, 0);
-  if (!res)
-    return EINVAL;
-
-  if (res->iov)
-    return 0;
-
-  /* work out size and max resource size */
-  res->iov = iov;
-  res->num_iovs = num_iovs;
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
-    vrend_write_to_iovec(res->iov, res->num_iovs, 0, res->ptr,
-                         res->base.width0);
-  }
-
-  return 0;
-}
-
-void vrend_renderer_resource_detach_iov(struct virgl_client *client,
-                                        int res_handle, struct iovec **iov_p,
-                                        int *num_iovs_p) {
-  struct vrend_resource *res;
-  res = vrend_resource_lookup(client, res_handle, 0);
-  if (!res) {
-    return;
-  }
-  if (iov_p)
-    *iov_p = res->iov;
-  if (num_iovs_p)
-    *num_iovs_p = res->num_iovs;
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
-    vrend_read_from_iovec(res->iov, res->num_iovs, 0, res->ptr,
-                          res->base.width0);
-  }
-
-  res->iov = NULL;
-  res->num_iovs = 0;
-}
-
-static int
-check_resource_valid(struct virgl_client *client,
-                     struct vrend_renderer_resource_create_args *args) {
-  /* do not accept handle 0 */
-  if (args->handle == 0)
-    return -1;
-
-  /* limit the target */
-  if (args->target >= PIPE_MAX_TEXTURE_TYPES)
-    return -1;
-
-  if (args->format >= VIRGL_FORMAT_MAX)
-    return -1;
-
-  bool format_can_texture_storage =
-      has_feature(feat_texture_storage) &&
-      (tex_conv_table[args->format].flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE);
-
-  /* only texture 2d and 2d array can have multiple samples */
-  if (args->nr_samples > 0) {
-    if (!has_feature(feat_texture_multisample))
-      return -1;
-
-    if (args->target != PIPE_TEXTURE_2D &&
-        args->target != PIPE_TEXTURE_2D_ARRAY)
-      return -1;
-
-    /* multisample can't have miplevels */
-    if (args->last_level > 0)
-      return -1;
-  }
-
-  if (args->last_level > 0) {
-    /* buffer and rect textures can't have mipmaps */
-    if (args->target == PIPE_BUFFER)
-      return -1;
-
-    if (args->target == PIPE_TEXTURE_RECT)
-      return -1;
-
-    if (args->last_level > (floor(log2(MAX2(args->width, args->height))) + 1))
-      return -1;
-  }
-
-  if (args->flags != 0 && args->flags != VIRGL_RESOURCE_Y_0_TOP)
-    return -1;
-
-  if (args->flags & VIRGL_RESOURCE_Y_0_TOP) {
-    if (args->target != PIPE_TEXTURE_2D && args->target != PIPE_TEXTURE_RECT)
-      return -1;
-  }
-
-  /* array size for array textures only */
-  if (args->target == PIPE_TEXTURE_CUBE) {
-    if (args->array_size != 6)
-      return -1;
-  } else if (args->target == PIPE_TEXTURE_CUBE_ARRAY) {
-    if (!has_feature(feat_cube_map_array))
-      return -1;
-
-    if (args->array_size % 6)
-      return -1;
-  } else if (args->array_size > 1) {
-    if (args->target != PIPE_TEXTURE_2D_ARRAY &&
-        args->target != PIPE_TEXTURE_1D_ARRAY)
-      return -1;
-
-    if (!has_feature(feat_texture_array))
-      return -1;
-  }
-
-  if (format_can_texture_storage && !args->width)
-    return -1;
-
-  if (args->bind == 0 || args->bind == VIRGL_BIND_CUSTOM ||
-      args->bind == VIRGL_BIND_STAGING ||
-      args->bind == VIRGL_BIND_INDEX_BUFFER ||
-      args->bind == VIRGL_BIND_STREAM_OUTPUT ||
-      args->bind == VIRGL_BIND_VERTEX_BUFFER ||
-      args->bind == VIRGL_BIND_CONSTANT_BUFFER ||
-      args->bind == VIRGL_BIND_QUERY_BUFFER ||
-      args->bind == VIRGL_BIND_COMMAND_ARGS ||
-      args->bind == VIRGL_BIND_SHADER_BUFFER) {
-    if (args->target != PIPE_BUFFER)
-      return -1;
-
-    if (args->height != 1 || args->depth != 1)
-      return -1;
-
-    if (args->bind == VIRGL_BIND_QUERY_BUFFER)
-      return -1;
-
-    if (args->bind == VIRGL_BIND_COMMAND_ARGS &&
-        !has_feature(feat_indirect_draw))
-      return -1;
-  } else {
-    if (!((args->bind & VIRGL_BIND_SAMPLER_VIEW) ||
-          (args->bind & VIRGL_BIND_DEPTH_STENCIL) ||
-          (args->bind & VIRGL_BIND_RENDER_TARGET) ||
-          (args->bind & VIRGL_BIND_CURSOR) ||
-          (args->bind & VIRGL_BIND_SHARED) || (args->bind & VIRGL_BIND_LINEAR)))
-      return -1;
-
-    if (args->target == PIPE_TEXTURE_2D || args->target == PIPE_TEXTURE_RECT ||
-        args->target == PIPE_TEXTURE_CUBE ||
-        args->target == PIPE_TEXTURE_2D_ARRAY ||
-        args->target == PIPE_TEXTURE_CUBE_ARRAY) {
-      if (args->depth != 1)
-        return -1;
-
-      if (format_can_texture_storage && !args->height)
-        return -1;
-    }
-    if (args->target == PIPE_TEXTURE_1D ||
-        args->target == PIPE_TEXTURE_1D_ARRAY) {
-      if (args->height != 1 || args->depth != 1)
-        return -1;
-
-      if (args->width > client->vrend_state->max_texture_2d_size)
-        return -1;
-    }
-
-    if (args->target == PIPE_TEXTURE_2D || args->target == PIPE_TEXTURE_RECT ||
-        args->target == PIPE_TEXTURE_2D_ARRAY) {
-      if (args->width > client->vrend_state->max_texture_2d_size ||
-          args->height > client->vrend_state->max_texture_2d_size)
-        return -1;
-    }
-
-    if (args->target == PIPE_TEXTURE_3D) {
-      if (format_can_texture_storage && (!args->height || !args->depth))
-        return -1;
-
-      if (args->width > client->vrend_state->max_texture_3d_size ||
-          args->height > client->vrend_state->max_texture_3d_size ||
-          args->depth > client->vrend_state->max_texture_3d_size)
-        return -1;
-    }
-    if (args->target == PIPE_TEXTURE_2D_ARRAY ||
-        args->target == PIPE_TEXTURE_CUBE_ARRAY ||
-        args->target == PIPE_TEXTURE_1D_ARRAY) {
-      if (format_can_texture_storage && !args->array_size)
-        return -1;
-    }
-    if (args->target == PIPE_TEXTURE_CUBE ||
-        args->target == PIPE_TEXTURE_CUBE_ARRAY) {
-      if (args->width != args->height)
-        return -1;
-
-      if (args->width > client->vrend_state->max_texture_cube_size)
-        return -1;
-    }
-  }
-  return 0;
-}
-
-static void vrend_create_buffer(struct vrend_resource *gr, uint32_t width) {
-  gr->storage_bits |= VREND_STORAGE_GL_BUFFER;
-
-  glGenBuffers(1, &gr->id);
-  glBindBuffer(gr->target, gr->id);
-  glBufferData(gr->target, width, NULL, GL_STREAM_DRAW);
-  glBindBuffer(gr->target, 0);
-}
-
-static inline void vrend_renderer_resource_copy_args(
-    struct vrend_renderer_resource_create_args *args,
-    struct vrend_resource *gr) {
-  assert(gr);
-  assert(args);
-
-  gr->handle = args->handle;
-  gr->base.bind = args->bind;
-  gr->base.width0 = args->width;
-  gr->base.height0 = args->height;
-  gr->base.depth0 = args->depth;
-  gr->base.format = args->format;
-  gr->base.target = args->target;
-  gr->base.last_level = args->last_level;
-  gr->base.nr_samples = args->nr_samples;
-  gr->base.array_size = args->array_size;
-}
-
-static int vrend_renderer_resource_allocate_texture(struct vrend_resource *gr) {
-  uint level;
-  GLenum internalformat, glformat, gltype;
-  enum virgl_formats format = gr->base.format;
-  struct vrend_texture *gt = (struct vrend_texture *)gr;
-  struct pipe_resource *pr = &gr->base;
-
-  if (pr->width0 == 0)
-    return EINVAL;
-
-  bool format_can_texture_storage =
-      has_feature(feat_texture_storage) &&
-      (tex_conv_table[format].flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE);
-
-  /* On GLES there is no support for glTexImage*DMultisample and
-   * BGRA surfaces are also unlikely to support glTexStorage2DMultisample
-   * so we try to emulate here
-   */
-  if (pr->nr_samples > 0 && !format_can_texture_storage)
-    gr->base.bind |= VIRGL_BIND_PREFER_EMULATED_BGRA;
-
-  format_can_texture_storage =
-      has_feature(feat_texture_storage) &&
-      (tex_conv_table[format].flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE);
-
-  if (format_can_texture_storage)
-    gr->storage_bits |= VREND_STORAGE_GL_IMMUTABLE;
-
-  gr->target = tgsitargettogltarget(pr->target, pr->nr_samples);
-  gr->target = translate_gles_emulation_texture_target(gr->target);
-  gr->storage_bits |= VREND_STORAGE_GL_TEXTURE;
-
-  glGenTextures(1, &gr->id);
-  glBindTexture(gr->target, gr->id);
-
-  internalformat = tex_conv_table[format].internalformat;
-  glformat = tex_conv_table[format].glformat;
-  gltype = tex_conv_table[format].gltype;
-
-  if (internalformat == 0) {
-    glBindTexture(gr->target, 0);
-    FREE(gt);
-    return EINVAL;
-  }
-
-  if (pr->nr_samples > 0) {
-    if (format_can_texture_storage) {
-      if (gr->target == GL_TEXTURE_2D_MULTISAMPLE) {
-        glTexStorage2DMultisample(gr->target, pr->nr_samples, internalformat,
-                                  pr->width0, pr->height0, GL_TRUE);
-      } else {
-        glTexStorage3DMultisample(gr->target, pr->nr_samples, internalformat,
-                                  pr->width0, pr->height0, pr->array_size,
-                                  GL_TRUE);
-      }
-    }
-  } else if (gr->target == GL_TEXTURE_CUBE_MAP) {
-    int i;
-    if (format_can_texture_storage)
-      glTexStorage2D(GL_TEXTURE_CUBE_MAP, pr->last_level + 1, internalformat,
-                     pr->width0, pr->height0);
-    else {
-      for (i = 0; i < 6; i++) {
-        GLenum ctarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + i;
-        for (level = 0; level <= pr->last_level; level++) {
-          unsigned mwidth = u_minify(pr->width0, level);
-          unsigned mheight = u_minify(pr->height0, level);
-
-          glTexImage2D(ctarget, level, internalformat, mwidth, mheight, 0,
-                       glformat, gltype, NULL);
-        }
-      }
-    }
-  } else if (gr->target == GL_TEXTURE_3D || gr->target == GL_TEXTURE_2D_ARRAY ||
-             gr->target == GL_TEXTURE_CUBE_MAP_ARRAY) {
-    if (format_can_texture_storage) {
-      unsigned depth_param = (gr->target == GL_TEXTURE_2D_ARRAY ||
-                              gr->target == GL_TEXTURE_CUBE_MAP_ARRAY)
-                                 ? pr->array_size
-                                 : pr->depth0;
-      glTexStorage3D(gr->target, pr->last_level + 1, internalformat, pr->width0,
-                     pr->height0, depth_param);
-    } else {
-      for (level = 0; level <= pr->last_level; level++) {
-        unsigned depth_param = (gr->target == GL_TEXTURE_2D_ARRAY ||
-                                gr->target == GL_TEXTURE_CUBE_MAP_ARRAY)
-                                   ? pr->array_size
-                                   : u_minify(pr->depth0, level);
-        unsigned mwidth = u_minify(pr->width0, level);
-        unsigned mheight = u_minify(pr->height0, level);
-        glTexImage3D(gr->target, level, internalformat, mwidth, mheight,
-                     depth_param, 0, glformat, gltype, NULL);
-      }
-    }
-  } else {
-    if (format_can_texture_storage)
-      glTexStorage2D(gr->target, pr->last_level + 1, internalformat, pr->width0,
-                     gr->target == GL_TEXTURE_1D_ARRAY ? pr->array_size
-                                                       : pr->height0);
-    else {
-      for (level = 0; level <= pr->last_level; level++) {
-        unsigned mwidth = u_minify(pr->width0, level);
-        unsigned mheight = u_minify(pr->height0, level);
-        glTexImage2D(gr->target, level, internalformat, mwidth,
-                     gr->target == GL_TEXTURE_1D_ARRAY ? pr->array_size
-                                                       : mheight,
-                     0, glformat, gltype, NULL);
-      }
-    }
-  }
-
-  if (!format_can_texture_storage) {
-    glTexParameteri(gr->target, GL_TEXTURE_BASE_LEVEL, 0);
-    glTexParameteri(gr->target, GL_TEXTURE_MAX_LEVEL, pr->last_level);
-  }
-
-  glBindTexture(gr->target, 0);
-
-  gt->state.max_lod = -1;
-  gt->cur_swizzle_r = gt->cur_swizzle_g = gt->cur_swizzle_b =
-      gt->cur_swizzle_a = -1;
-  gt->cur_base = -1;
-  gt->cur_max = 10000;
-  return 0;
-}
-
-int vrend_renderer_resource_create(
-    struct virgl_client *client,
-    struct vrend_renderer_resource_create_args *args, struct iovec *iov,
-    uint32_t num_iovs) {
-  struct vrend_resource *gr;
-  int ret;
-
-  ret = check_resource_valid(client, args);
-  if (ret)
-    return EINVAL;
-
-  gr = (struct vrend_resource *)CALLOC_STRUCT(vrend_texture);
-  if (!gr)
-    return ENOMEM;
-
-  vrend_renderer_resource_copy_args(args, gr);
-  gr->iov = iov;
-  gr->num_iovs = num_iovs;
-  gr->storage_bits = VREND_STORAGE_GUEST_MEMORY;
-
-  if (args->flags & VIRGL_RESOURCE_Y_0_TOP)
-    gr->y_0_top = true;
-
-  pipe_reference_init(&gr->base.reference, 1);
-
-  if (args->target == PIPE_BUFFER) {
-    if (args->bind == VIRGL_BIND_CUSTOM) {
-      /* use iovec directly when attached */
-      gr->storage_bits |= VREND_STORAGE_HOST_SYSTEM_MEMORY;
-      gr->ptr = malloc(args->width);
-      if (!gr->ptr) {
-        FREE(gr);
-        return ENOMEM;
-      }
-    } else if (args->bind == VIRGL_BIND_STAGING) {
-      /* staging buffers only use guest memory -- nothing to do. */
-    } else if (args->bind == VIRGL_BIND_INDEX_BUFFER) {
-      gr->target = GL_ELEMENT_ARRAY_BUFFER;
-      vrend_create_buffer(gr, args->width);
-    } else if (args->bind == VIRGL_BIND_STREAM_OUTPUT) {
-      gr->target = GL_TRANSFORM_FEEDBACK_BUFFER;
-      vrend_create_buffer(gr, args->width);
-    } else if (args->bind == VIRGL_BIND_VERTEX_BUFFER) {
-      gr->target = GL_ARRAY_BUFFER;
-      vrend_create_buffer(gr, args->width);
-    } else if (args->bind == VIRGL_BIND_CONSTANT_BUFFER) {
-      gr->target = GL_UNIFORM_BUFFER;
-      vrend_create_buffer(gr, args->width);
-    } else if (args->bind == VIRGL_BIND_COMMAND_ARGS) {
-      gr->target = GL_DRAW_INDIRECT_BUFFER;
-      vrend_create_buffer(gr, args->width);
-    } else if (args->bind == 0 || args->bind == VIRGL_BIND_SHADER_BUFFER) {
-      gr->target = GL_ARRAY_BUFFER;
-      vrend_create_buffer(gr, args->width);
-    } else if (args->bind & VIRGL_BIND_SAMPLER_VIEW) {
-      /*
-       * On Desktop we use GL_ARB_texture_buffer_object on GLES we use
-       * GL_EXT_texture_buffer (it is in the ANDRIOD extension pack).
-       */
-#if GL_TEXTURE_BUFFER != GL_TEXTURE_BUFFER_EXT
-#error "GL_TEXTURE_BUFFER enums differ, they shouldn't."
-#endif
-
-      /* need to check GL version here */
-      if (has_feature(feat_arb_or_gles_ext_texture_buffer)) {
-        gr->target = GL_TEXTURE_BUFFER;
-      } else {
-        gr->target = GL_PIXEL_PACK_BUFFER;
-      }
-      vrend_create_buffer(gr, args->width);
-    } else {
-      FREE(gr);
-      return EINVAL;
-    }
-  } else {
-    int r = vrend_renderer_resource_allocate_texture(gr);
-    if (r) {
-      FREE(gr);
-      return r;
-    }
-  }
-
-  ret = vrend_resource_insert(client, gr, args->handle);
-  if (ret == 0) {
-    vrend_renderer_resource_destroy(gr);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-void vrend_renderer_resource_destroy(struct vrend_resource *res) {
-  if (res->readback_fb_id)
-    glDeleteFramebuffers(1, &res->readback_fb_id);
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_GL_TEXTURE)) {
-    glDeleteTextures(1, &res->id);
-  } else if (has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER)) {
-    glDeleteBuffers(1, &res->id);
-    if (res->tbo_tex_id)
-      glDeleteTextures(1, &res->tbo_tex_id);
-  } else if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
-    free(res->ptr);
-  }
-
-  free(res);
-}
-
-static void vrend_destroy_resource_object(void *obj_ptr) {
-  struct vrend_resource *res = obj_ptr;
-
-  if (pipe_reference(&res->base.reference, NULL))
-    vrend_renderer_resource_destroy(res);
-}
-
-void vrend_renderer_resource_unref(struct virgl_client *client,
-                                   uint32_t res_handle) {
-  struct vrend_resource *res;
-  struct vrend_context *ctx;
-
-  res = vrend_resource_lookup(client, res_handle, 0);
-  if (!res)
-    return;
-
-  /* find in all contexts and detach also */
-
-  /* remove from any contexts */
-  LIST_FOR_EACH_ENTRY(ctx, &client->vrend_state->active_ctx_list, ctx_entry) {
-    vrend_renderer_detach_res_ctx(ctx, res->handle);
-  }
-
-  vrend_resource_remove(client, res->handle);
-}
-
-struct virgl_sub_upload_data {
-  GLenum target;
-  struct pipe_box *box;
-};
-
-static void iov_buffer_upload(void *cookie, uint32_t doff, void *src, int len) {
-  struct virgl_sub_upload_data *d = cookie;
-  glBufferSubData(d->target, d->box->x + doff, len, src);
-}
-
-static void vrend_scale_depth(void *ptr, int size, float scale_val) {
-  GLuint *ival = ptr;
-  const GLfloat myscale = 1.0f / 0xffffff;
-  int i;
-  for (i = 0; i < size / 4; i++) {
-    GLuint value = ival[i];
-    GLfloat d = ((float)(value >> 8) * myscale) * scale_val;
-    d = CLAMP(d, 0.0F, 1.0F);
-    ival[i] = (int)(d / myscale) << 8;
-  }
-}
-
-static void read_transfer_data(struct iovec *iov, unsigned int num_iovs,
-                               char *data, enum virgl_formats format,
-                               uint64_t offset, uint32_t src_stride,
-                               uint32_t src_layer_stride, struct pipe_box *box,
-                               bool invert) {
-  int blsize = util_format_get_blocksize(format);
-  uint32_t size = vrend_get_iovec_size(iov, num_iovs);
-  uint32_t send_size =
-      util_format_get_nblocks(format, box->width, box->height) * blsize *
-      box->depth;
-  uint32_t bwx = util_format_get_nblocksx(format, box->width) * blsize;
-  int32_t bh = util_format_get_nblocksy(format, box->height);
-  int d, h;
-
-  if ((send_size == size || bh == 1) && !invert && box->depth == 1)
-    vrend_read_from_iovec(iov, num_iovs, offset, data, send_size);
-  else {
-    if (invert) {
-      for (d = 0; d < box->depth; d++) {
-        uint32_t myoffset = offset + d * src_layer_stride;
-        for (h = bh - 1; h >= 0; h--) {
-          void *ptr = data + (h * bwx) + d * (bh * bwx);
-          vrend_read_from_iovec(iov, num_iovs, myoffset, ptr, bwx);
-          myoffset += src_stride;
-        }
-      }
-    } else {
-      for (d = 0; d < box->depth; d++) {
-        uint32_t myoffset = offset + d * src_layer_stride;
-        for (h = 0; h < bh; h++) {
-          void *ptr = data + (h * bwx) + d * (bh * bwx);
-          vrend_read_from_iovec(iov, num_iovs, myoffset, ptr, bwx);
-          myoffset += src_stride;
-        }
-      }
-    }
-  }
-}
-
-static void write_transfer_data(struct pipe_resource *res, struct iovec *iov,
-                                unsigned num_iovs, char *data,
-                                uint32_t dst_stride, struct pipe_box *box,
-                                uint32_t level, uint64_t offset, bool invert) {
-  int blsize = util_format_get_blocksize(res->format);
-  uint32_t size = vrend_get_iovec_size(iov, num_iovs);
-  uint32_t send_size =
-      util_format_get_nblocks(res->format, box->width, box->height) * blsize *
-      box->depth;
-  uint32_t bwx = util_format_get_nblocksx(res->format, box->width) * blsize;
-  int32_t bh = util_format_get_nblocksy(res->format, box->height);
-  int d, h;
-  uint32_t stride =
-      dst_stride ? dst_stride
-                 : util_format_get_nblocksx(res->format,
-                                            u_minify(res->width0, level)) *
-                       blsize;
-
-  if ((send_size == size || bh == 1) && !invert && box->depth == 1) {
-    vrend_write_to_iovec(iov, num_iovs, offset, data, send_size);
-  } else if (invert) {
-    for (d = 0; d < box->depth; d++) {
-      uint32_t myoffset = offset + d * stride * u_minify(res->height0, level);
-      for (h = bh - 1; h >= 0; h--) {
-        void *ptr = data + (h * bwx) + d * (bh * bwx);
-        vrend_write_to_iovec(iov, num_iovs, myoffset, ptr, bwx);
-        myoffset += stride;
-      }
-    }
-  } else {
-    for (d = 0; d < box->depth; d++) {
-      uint32_t myoffset = offset + d * stride * u_minify(res->height0, level);
-      for (h = 0; h < bh; h++) {
-        void *ptr = data + (h * bwx) + d * (bh * bwx);
-        vrend_write_to_iovec(iov, num_iovs, myoffset, ptr, bwx);
-        myoffset += stride;
-      }
-    }
-  }
-}
-
-static bool check_transfer_bounds(struct vrend_resource *res,
-                                  const struct vrend_transfer_info *info) {
-  int lwidth, lheight;
-
-  /* check mipmap level is in bounds */
-  if (info->level > res->base.last_level)
-    return false;
-  if (info->box->x < 0 || info->box->y < 0)
-    return false;
-  /* these will catch bad y/z/w/d with 1D textures etc */
-  lwidth = u_minify(res->base.width0, info->level);
-  if (info->box->width > lwidth || info->box->width < 0)
-    return false;
-  if (info->box->x > lwidth)
-    return false;
-  if (info->box->width + info->box->x > lwidth)
-    return false;
-
-  lheight = u_minify(res->base.height0, info->level);
-  if (info->box->height > lheight || info->box->height < 0)
-    return false;
-  if (info->box->y > lheight)
-    return false;
-  if (info->box->height + info->box->y > lheight)
-    return false;
-
-  if (res->base.target == PIPE_TEXTURE_3D) {
-    int ldepth = u_minify(res->base.depth0, info->level);
-    if (info->box->depth > ldepth || info->box->depth < 0)
-      return false;
-    if (info->box->z > ldepth)
-      return false;
-    if (info->box->z + info->box->depth > ldepth)
-      return false;
-  } else {
-    if (info->box->depth > (int)res->base.array_size)
-      return false;
-    if (info->box->z > (int)res->base.array_size)
-      return false;
-    if (info->box->z + info->box->depth > (int)res->base.array_size)
-      return false;
-  }
-
-  return true;
-}
-
-/* Calculate the size of the memory needed to hold all the data of a
- * transfer for particular stride values.
- */
-static uint64_t vrend_transfer_size(struct vrend_resource *vres,
-                                    const struct vrend_transfer_info *info,
-                                    uint32_t stride, uint32_t layer_stride) {
-  struct pipe_resource *pres = &vres->base;
-  struct pipe_box *box = info->box;
-  uint64_t size;
-  /* For purposes of size calculation, assume that invalid dimension values
-   * correspond to 1.
-   */
-  int w = box->width > 0 ? box->width : 1;
-  int h = box->height > 0 ? box->height : 1;
-  int d = box->depth > 0 ? box->depth : 1;
-  int nblocksx = util_format_get_nblocksx(pres->format, w);
-  int nblocksy = util_format_get_nblocksy(pres->format, h);
-
-  /* Calculate the box size, not including the last layer. The last layer
-   * is the only one which may be incomplete, and is the only layer for
-   * non 3d/2d-array formats.
-   */
-  size = (d - 1) * layer_stride;
-  /* Calculate the size of the last (or only) layer, not including the last
-   * block row. The last block row is the only one which may be incomplete and
-   * is the only block row for non 2d/1d-array formats.
-   */
-  size += (nblocksy - 1) * stride;
-  /* Calculate the size of the the last (or only) block row. */
-  size += nblocksx * util_format_get_blocksize(pres->format);
-
-  return size;
-}
-
-static bool check_iov_bounds(struct vrend_resource *res,
-                             const struct vrend_transfer_info *info,
-                             struct iovec *iov, int num_iovs) {
-  GLuint transfer_size;
-  GLuint iovsize = vrend_get_iovec_size(iov, num_iovs);
-  GLuint valid_stride, valid_layer_stride;
-
-  /* If the transfer specifies a stride, verify that it's at least as large as
-   * the minimum required for the transfer. If no stride is specified use the
-   * image stride for the specified level.
-   */
-  if (info->stride) {
-    GLuint min_stride =
-        util_format_get_stride(res->base.format, info->box->width);
-    if (info->stride < min_stride)
-      return false;
-    valid_stride = info->stride;
-  } else {
-    valid_stride = util_format_get_stride(
-        res->base.format, u_minify(res->base.width0, info->level));
-  }
-
-  /* If the transfer specifies a layer_stride, verify that it's at least as
-   * large as the minimum required for the transfer. If no layer_stride is
-   * specified use the image layer_stride for the specified level.
-   */
-  if (info->layer_stride) {
-    GLuint min_layer_stride = util_format_get_2d_size(
-        res->base.format, valid_stride, info->box->height);
-    if (info->layer_stride < min_layer_stride)
-      return false;
-    valid_layer_stride = info->layer_stride;
-  } else {
-    valid_layer_stride =
-        util_format_get_2d_size(res->base.format, valid_stride,
-                                u_minify(res->base.height0, info->level));
-  }
-
-  /* Calculate the size required for the transferred data, based on the
-   * calculated or provided strides, and ensure that the iov, starting at the
-   * specified offset, is able to hold at least that size.
-   */
-  transfer_size =
-      vrend_transfer_size(res, info, valid_stride, valid_layer_stride);
-  if (iovsize < info->offset)
-    return false;
-  if (iovsize < transfer_size)
-    return false;
-  if (iovsize < info->offset + transfer_size)
-    return false;
-
-  return true;
-}
-
-static int vrend_renderer_transfer_write_iov(
-    struct vrend_context *ctx, struct vrend_resource *res, struct iovec *iov,
-    int num_iovs, const struct vrend_transfer_info *info) {
-  void *data;
-
-  if (is_only_bit(res->storage_bits, VREND_STORAGE_GUEST_MEMORY) ||
-      (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY) &&
-       res->iov)) {
-    return vrend_copy_iovec(iov, num_iovs, info->offset, res->iov,
-                            res->num_iovs, info->box->x, info->box->width,
-                            res->ptr);
-  }
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
-    assert(!res->iov);
-    vrend_read_from_iovec(iov, num_iovs, info->offset, res->ptr + info->box->x,
-                          info->box->width);
-    return 0;
-  }
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER)) {
-    GLuint map_flags = GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_WRITE_BIT;
-    struct virgl_sub_upload_data d;
-    d.box = info->box;
-    d.target = res->target;
-
-    if (!info->synchronized)
-      map_flags |= GL_MAP_UNSYNCHRONIZED_BIT;
-
-    glBindBuffer(res->target, res->id);
-    data = glMapBufferRange(res->target, info->box->x, info->box->width,
-                            map_flags);
-    if (data == NULL) {
-      vrend_read_from_iovec_cb(iov, num_iovs, info->offset, info->box->width,
-                               &iov_buffer_upload, &d);
-    } else {
-      vrend_read_from_iovec(iov, num_iovs, info->offset, data,
-                            info->box->width);
-      glUnmapBuffer(res->target);
-    }
-    glBindBuffer(res->target, 0);
-  } else {
-    GLenum glformat;
-    GLenum gltype;
-    int need_temp = 0;
-    int elsize = util_format_get_blocksize(res->base.format);
-    int x = 0, y = 0;
-    bool compressed;
-    bool invert = false;
-    float depth_scale;
-    GLuint send_size = 0;
-    uint32_t stride = info->stride;
-    uint32_t layer_stride = info->layer_stride;
-
-    if (ctx)
-      vrend_use_program(ctx, 0);
-    else
-      glUseProgram(0);
-
-    if (!stride)
-      stride = util_format_get_nblocksx(
-                   res->base.format, u_minify(res->base.width0, info->level)) *
-               elsize;
-
-    if (!layer_stride)
-      layer_stride = util_format_get_2d_size(
-          res->base.format, stride, u_minify(res->base.height0, info->level));
-
-    compressed = util_format_is_compressed(res->base.format);
-    if (num_iovs > 1 || compressed) {
-      need_temp = true;
-    }
-
-    if ((res->y_0_top || (res->base.format == VIRGL_FORMAT_Z24X8_UNORM))) {
-      need_temp = true;
-      if (res->y_0_top)
-        invert = true;
-    }
-
-    send_size = util_format_get_nblocks(res->base.format, info->box->width,
-                                        info->box->height) *
-                elsize;
-    if (res->target == GL_TEXTURE_3D || res->target == GL_TEXTURE_2D_ARRAY ||
-        res->target == GL_TEXTURE_CUBE_MAP_ARRAY)
-      send_size *= info->box->depth;
-
-    if (need_temp) {
-      data = malloc(send_size);
-      if (!data)
-        return ENOMEM;
-      read_transfer_data(iov, num_iovs, data, res->base.format, info->offset,
-                         stride, layer_stride, info->box, invert);
-    } else {
-      if (send_size > iov[0].iov_len - info->offset)
-        return EINVAL;
-      data = (char *)iov[0].iov_base + info->offset;
-    }
-
-    if (!need_temp) {
-      assert(stride);
-      glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / elsize);
-      glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, layer_stride / stride);
-    } else
-      glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-
-    switch (elsize) {
-    case 1:
-    case 3:
-      glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-      break;
-    case 2:
-    case 6:
-      glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
-      break;
-    case 4:
-    default:
-      glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-      break;
-    case 8:
-      glPixelStorei(GL_UNPACK_ALIGNMENT, 8);
-      break;
-    }
-
-    glformat = tex_conv_table[res->base.format].glformat;
-    gltype = tex_conv_table[res->base.format].gltype;
-
-    uint32_t comp_size;
-    glBindTexture(res->target, res->id);
-
-    if (compressed) {
-      glformat = tex_conv_table[res->base.format].internalformat;
-      comp_size = util_format_get_nblocks(res->base.format, info->box->width,
-                                          info->box->height) *
-                  util_format_get_blocksize(res->base.format);
-    }
-
-    if (glformat == 0) {
-      glformat = GL_BGRA_EXT;
-      gltype = GL_UNSIGNED_BYTE;
-    }
-
-    x = info->box->x;
-    y = invert ? (int)res->base.height0 - info->box->y - info->box->height
-               : info->box->y;
-
-    /* mipmaps are usually passed in one iov, and we need to keep the offset
-     * into the data in case we want to read back the data of a surface
-     * that can not be rendered. Since we can not assume that the whole texture
-     * is filled, we evaluate the offset for origin (0,0,0). Since it is also
-     * possible that a resource is reused and resized update the offset every
-     * time.
-     */
-    if (info->level < VR_MAX_TEXTURE_2D_LEVELS) {
-      int64_t level_height = u_minify(res->base.height0, info->level);
-      res->mipmap_offsets[info->level] =
-          info->offset -
-          ((info->box->z * level_height + y) * stride + x * elsize);
-    }
-
-    if (res->base.format == VIRGL_FORMAT_Z24X8_UNORM) {
-      /* we get values from the guest as 24-bit scaled integers
-         but we give them to the host GL and it interprets them
-         as 32-bit scaled integers, so we need to scale them here */
-      depth_scale = 256.0;
-      vrend_scale_depth(data, send_size, depth_scale);
-    }
-    if (res->target == GL_TEXTURE_CUBE_MAP) {
-      GLenum ctarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + info->box->z;
-      if (compressed) {
-        glCompressedTexSubImage2D(ctarget, info->level, x, y, info->box->width,
-                                  info->box->height, glformat, comp_size, data);
-      } else {
-        glTexSubImage2D(ctarget, info->level, x, y, info->box->width,
-                        info->box->height, glformat, gltype, data);
-      }
-    } else if (res->target == GL_TEXTURE_3D ||
-               res->target == GL_TEXTURE_2D_ARRAY ||
-               res->target == GL_TEXTURE_CUBE_MAP_ARRAY) {
-      if (compressed) {
-        glCompressedTexSubImage3D(res->target, info->level, x, y, info->box->z,
-                                  info->box->width, info->box->height,
-                                  info->box->depth, glformat, comp_size, data);
-      } else {
-        glTexSubImage3D(res->target, info->level, x, y, info->box->z,
-                        info->box->width, info->box->height, info->box->depth,
-                        glformat, gltype, data);
-      }
-    } else {
-      if (compressed) {
-        glCompressedTexSubImage2D(
-            res->target, info->level, x,
-            res->target == GL_TEXTURE_1D_ARRAY ? info->box->z : y,
-            info->box->width, info->box->height, glformat, comp_size, data);
-      } else {
-        glTexSubImage2D(res->target, info->level, x,
-                        res->target == GL_TEXTURE_1D_ARRAY ? info->box->z : y,
-                        info->box->width,
-                        res->target == GL_TEXTURE_1D_ARRAY ? info->box->depth
-                                                           : info->box->height,
-                        glformat, gltype, data);
-      }
-    }
-
-    glBindTexture(res->target, 0);
-
-    if (stride && !need_temp) {
-      glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-      glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
-    }
-
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-
-    if (need_temp)
-      free(data);
-  }
-  return 0;
-}
-
-static uint32_t vrend_get_texture_depth(struct vrend_resource *res,
-                                        uint32_t level) {
-  uint32_t depth = 1;
-  if (res->target == GL_TEXTURE_3D)
-    depth = u_minify(res->base.depth0, level);
-  else if (res->target == GL_TEXTURE_1D_ARRAY ||
-           res->target == GL_TEXTURE_2D_ARRAY ||
-           res->target == GL_TEXTURE_CUBE_MAP ||
-           res->target == GL_TEXTURE_CUBE_MAP_ARRAY)
-    depth = res->base.array_size;
-
-  return depth;
-}
-
-static void do_readpixels(GLint x, GLint y, GLsizei width, GLsizei height,
-                          GLenum format, GLenum type, GLsizei bufSize,
-                          void *data) {
-  glReadPixels(x, y, width, height, format, type, data);
-}
-
-static int
-vrend_transfer_send_readpixels(struct vrend_resource *res, struct iovec *iov,
-                               int num_iovs,
-                               const struct vrend_transfer_info *info) {
-  char *myptr = (char *)iov[0].iov_base + info->offset;
-  int need_temp = 0;
-  GLuint fb_id;
-  char *data;
-  bool actually_invert, separate_invert = false;
-  GLenum format, type;
-  GLint y1;
-  uint32_t send_size = 0;
-  uint32_t h = u_minify(res->base.height0, info->level);
-  int elsize = util_format_get_blocksize(res->base.format);
-  float depth_scale;
-  int row_stride = info->stride / elsize;
-  GLint old_fbo;
-
-  glUseProgram(0);
-
-  enum virgl_formats fmt = res->base.format;
-  format = tex_conv_table[fmt].glformat;
-  type = tex_conv_table[fmt].gltype;
-  /* if we are asked to invert and reading from a front then don't */
-
-  actually_invert = res->y_0_top;
-
-  if (actually_invert)
-    separate_invert = true;
-
-  if (num_iovs > 1 || separate_invert)
-    need_temp = 1;
-
-  if (need_temp) {
-    send_size = util_format_get_nblocks(res->base.format, info->box->width,
-                                        info->box->height) *
-                info->box->depth * util_format_get_blocksize(res->base.format);
-    data = malloc(send_size);
-    if (!data)
-      return ENOMEM;
-  } else {
-    send_size = iov[0].iov_len - info->offset;
-    data = myptr;
-    if (!row_stride)
-      row_stride = util_format_get_nblocksx(
-          res->base.format, u_minify(res->base.width0, info->level));
-  }
-
-  glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &old_fbo);
-
-  if (res->readback_fb_id == 0 || (int)res->readback_fb_level != info->level ||
-      (int)res->readback_fb_z != info->box->z) {
-
-    if (res->readback_fb_id)
-      glDeleteFramebuffers(1, &res->readback_fb_id);
-
-    glGenFramebuffers(1, &fb_id);
-    glBindFramebuffer(GL_FRAMEBUFFER, fb_id);
-
-    vrend_fb_bind_texture(res, 0, info->level, info->box->z);
-
-    res->readback_fb_id = fb_id;
-    res->readback_fb_level = info->level;
-    res->readback_fb_z = info->box->z;
-  } else
-    glBindFramebuffer(GL_FRAMEBUFFER, res->readback_fb_id);
-  if (actually_invert)
-    y1 = h - info->box->y - info->box->height;
-  else
-    y1 = info->box->y;
-
-  if (!vrend_format_is_ds(res->base.format))
-    glReadBuffer(GL_COLOR_ATTACHMENT0);
-  if (!need_temp && row_stride)
-    glPixelStorei(GL_PACK_ROW_LENGTH, row_stride);
-
-  switch (elsize) {
-  case 1:
-    glPixelStorei(GL_PACK_ALIGNMENT, 1);
-    break;
-  case 2:
-    glPixelStorei(GL_PACK_ALIGNMENT, 2);
-    break;
-  case 4:
-  default:
-    glPixelStorei(GL_PACK_ALIGNMENT, 4);
-    break;
-  case 8:
-    glPixelStorei(GL_PACK_ALIGNMENT, 8);
-    break;
-  }
-
-  if (res->base.format == VIRGL_FORMAT_Z24X8_UNORM) {
-    /* we get values from the guest as 24-bit scaled integers
-       but we give them to the host GL and it interprets them
-       as 32-bit scaled integers, so we need to scale them here */
-    depth_scale = 1.0 / 256.0;
-  }
-
-  do_readpixels(info->box->x, y1, info->box->width, info->box->height, format,
-                type, send_size, data);
-
-  if (res->base.format == VIRGL_FORMAT_Z24X8_UNORM) {
-    vrend_scale_depth(data, send_size, depth_scale);
-  }
-
-  if (!need_temp && row_stride)
-    glPixelStorei(GL_PACK_ROW_LENGTH, 0);
-
-  glPixelStorei(GL_PACK_ALIGNMENT, 4);
-  if (need_temp) {
-    write_transfer_data(&res->base, iov, num_iovs, data, info->stride,
-                        info->box, info->level, info->offset, separate_invert);
-    free(data);
-  }
-
-  glBindFramebuffer(GL_FRAMEBUFFER, old_fbo);
-
-  return 0;
-}
-
-static int
-vrend_transfer_send_readonly(struct vrend_resource *res, struct iovec *iov,
-                             int num_iovs,
-                             UNUSED const struct vrend_transfer_info *info) {
-  bool same_iov = true;
-  uint i;
-
-  if (res->num_iovs == (uint32_t)num_iovs) {
-    for (i = 0; i < res->num_iovs; i++) {
-      if (res->iov[i].iov_len != iov[i].iov_len ||
-          res->iov[i].iov_base != iov[i].iov_base) {
-        same_iov = false;
-      }
-    }
-  } else {
-    same_iov = false;
-  }
-
-  /*
-   * When we detect that we are reading back to the same iovs that are
-   * attached to the resource and we know that the resource can not
-   * be rendered to (as this function is only called then), we do not
-   * need to do anything more.
-   */
-  if (same_iov) {
-    return 0;
-  }
-
-  return -1;
-}
-
-static int
-vrend_renderer_transfer_send_iov(struct vrend_resource *res, struct iovec *iov,
-                                 int num_iovs,
-                                 const struct vrend_transfer_info *info) {
-  if (is_only_bit(res->storage_bits, VREND_STORAGE_GUEST_MEMORY) ||
-      (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY) &&
-       res->iov)) {
-    return vrend_copy_iovec(res->iov, res->num_iovs, info->box->x, iov,
-                            num_iovs, info->offset, info->box->width, res->ptr);
-  }
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
-    assert(!res->iov);
-    vrend_write_to_iovec(iov, num_iovs, info->offset, res->ptr + info->box->x,
-                         info->box->width);
-    return 0;
-  }
-
-  if (has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER)) {
-    uint32_t send_size =
-        info->box->width * util_format_get_blocksize(res->base.format);
-    void *data;
-
-    glBindBuffer(res->target, res->id);
-    data = glMapBufferRange(res->target, info->box->x, info->box->width,
-                            GL_MAP_READ_BIT);
-    if (data)
-      vrend_write_to_iovec(iov, num_iovs, info->offset, data, send_size);
-    glUnmapBuffer(res->target);
-    glBindBuffer(res->target, 0);
-  } else {
-    int ret = -1;
-    bool can_readpixels = true;
-
-    can_readpixels = vrend_format_can_render(res->base.format) ||
-                     vrend_format_is_ds(res->base.format);
-
-    if (can_readpixels)
-      ret = vrend_transfer_send_readpixels(res, iov, num_iovs, info);
-
-    /* Can hit this on a non-error path as well. */
-    if (ret)
-      ret = vrend_transfer_send_readonly(res, iov, num_iovs, info);
-
-    return ret;
-  }
-  return 0;
-}
-
-int vrend_renderer_transfer_iov(struct virgl_client *client,
-                                const struct vrend_transfer_info *info,
-                                int transfer_mode) {
-  struct vrend_resource *res;
-  struct vrend_context *ctx;
-  struct iovec *iov;
-  int num_iovs;
-
-  if (!info->box)
-    return EINVAL;
-
-  ctx = vrend_lookup_renderer_ctx(client, info->ctx_id);
-  if (!ctx)
-    return EINVAL;
-
-  if (info->ctx_id == 0)
-    res = vrend_resource_lookup(client, info->handle, 0);
-  else
-    res = vrend_renderer_ctx_res_lookup(ctx, info->handle);
-
-  if (!res)
-    return EINVAL;
-
-  iov = info->iovec;
-  num_iovs = info->iovec_cnt;
-
-  if (res->iov && (!iov || num_iovs == 0)) {
-    iov = res->iov;
-    num_iovs = res->num_iovs;
-  }
-
-  if (!iov)
-    return EINVAL;
-
-  if (!check_transfer_bounds(res, info))
-    return EINVAL;
-
-  if (!check_iov_bounds(res, info, iov, num_iovs))
-    return EINVAL;
-
-  if (info->context0) {
-    vrend_renderer_force_ctx_0(client);
-    ctx = NULL;
-  }
-
-  switch (transfer_mode) {
-  case VIRGL_TRANSFER_TO_HOST:
-    return vrend_renderer_transfer_write_iov(ctx, res, iov, num_iovs, info);
-  case VIRGL_TRANSFER_FROM_HOST:
-    return vrend_renderer_transfer_send_iov(res, iov, num_iovs, info);
-
-  default:
-    assert(0);
-  }
-  return 0;
-}
-
-int vrend_transfer_inline_write(struct vrend_context *ctx,
-                                struct vrend_transfer_info *info) {
-  struct vrend_resource *res;
-
-  res = vrend_renderer_ctx_res_lookup(ctx, info->handle);
-  if (!res)
-    return EINVAL;
-
-  if (!check_transfer_bounds(res, info))
-    return EINVAL;
-
-  if (!check_iov_bounds(res, info, info->iovec, info->iovec_cnt))
-    return EINVAL;
-
-  return vrend_renderer_transfer_write_iov(ctx, res, info->iovec,
-                                           info->iovec_cnt, info);
-}
-
-int vrend_renderer_copy_transfer3d(struct vrend_context *ctx,
-                                   struct vrend_transfer_info *info,
-                                   uint32_t src_handle) {
-  struct vrend_resource *src_res, *dst_res;
-
-  src_res = vrend_renderer_ctx_res_lookup(ctx, src_handle);
-  dst_res = vrend_renderer_ctx_res_lookup(ctx, info->handle);
-
-  if (!src_res)
-    return EINVAL;
-
-  if (!dst_res)
-    return EINVAL;
-
-  if (!src_res->iov)
-    return EINVAL;
-
-  if (!check_transfer_bounds(dst_res, info))
-    return EINVAL;
-
-  if (!check_iov_bounds(dst_res, info, src_res->iov, src_res->num_iovs))
-    return EINVAL;
-
-  return vrend_renderer_transfer_write_iov(ctx, dst_res, src_res->iov,
-                                           src_res->num_iovs, info);
-}
-
-void vrend_set_stencil_ref(struct vrend_context *ctx,
-                           struct pipe_stencil_ref *ref) {
-  if (ctx->sub->stencil_refs[0] != ref->ref_value[0] ||
-      ctx->sub->stencil_refs[1] != ref->ref_value[1]) {
-    ctx->sub->stencil_refs[0] = ref->ref_value[0];
-    ctx->sub->stencil_refs[1] = ref->ref_value[1];
-    ctx->sub->stencil_state_dirty = true;
-  }
-}
-
-void vrend_set_blend_color(struct vrend_context *ctx,
-                           struct pipe_blend_color *color) {
-  ctx->sub->blend_color = *color;
-  glBlendColor(color->color[0], color->color[1], color->color[2],
-               color->color[3]);
-}
-
-void vrend_set_scissor_state(struct vrend_context *ctx, uint32_t start_slot,
-                             uint32_t num_scissor,
-                             struct pipe_scissor_state *ss) {
-  uint i, idx;
-
-  if (start_slot > PIPE_MAX_VIEWPORTS ||
-      num_scissor > (PIPE_MAX_VIEWPORTS - start_slot))
-    return;
-
-  for (i = 0; i < num_scissor; i++) {
-    idx = start_slot + i;
-    ctx->sub->ss[idx] = ss[i];
-    ctx->sub->scissor_state_dirty |= (1 << idx);
-  }
-}
-
-void vrend_set_polygon_stipple(struct vrend_context *ctx,
-                               struct pipe_poly_stipple *ps) {
-  static const unsigned bit31 = 1u << 31;
-  GLubyte *stip = calloc(1, 1024);
-  int i, j;
-
-  if (!ctx->pstip_inited)
-    vrend_init_pstipple_texture(ctx);
-
-  if (!stip)
-    return;
-
-  for (i = 0; i < 32; i++) {
-    for (j = 0; j < 32; j++) {
-      if (ps->stipple[i] & (bit31 >> j))
-        stip[i * 32 + j] = 0;
-      else
-        stip[i * 32 + j] = 255;
-    }
-  }
-
-  glBindTexture(GL_TEXTURE_2D, ctx->pstipple_tex_id);
-  glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 32, 32, GL_RED, GL_UNSIGNED_BYTE,
-                  stip);
-  glBindTexture(GL_TEXTURE_2D, 0);
-
-  free(stip);
-}
-
-void vrend_set_clip_state(struct vrend_context *ctx,
-                          struct pipe_clip_state *ucp) {
-  ctx->sub->ucp_state = *ucp;
-}
-
-void vrend_set_sample_mask(UNUSED struct vrend_context *ctx,
-                           unsigned sample_mask) {
-  if (has_feature(feat_sample_mask))
-    glSampleMaski(0, sample_mask);
-}
-
-void vrend_set_min_samples(struct vrend_context *ctx, unsigned min_samples) {
-  float min_sample_shading = (float)min_samples;
-  if (ctx->sub->nr_cbufs > 0 && ctx->sub->surf[0]) {
-    assert(ctx->sub->surf[0]->texture);
-    min_sample_shading /= MAX2(1, ctx->sub->surf[0]->texture->base.nr_samples);
-  }
-
-  if (has_feature(feat_sample_shading))
-    glMinSampleShading(min_sample_shading);
-}
-
-void vrend_set_tess_state(UNUSED struct vrend_context *ctx,
-                          const float tess_factors[6]) {
-  if (has_feature(feat_tessellation))
-    memcpy(ctx->client->vrend_state->tess_factors, tess_factors,
-           6 * sizeof(float));
-}
-
-static void
-vrend_hw_emit_streamout_targets(UNUSED struct vrend_context *ctx,
-                                struct vrend_streamout_object *so_obj) {
-  uint i;
-
-  for (i = 0; i < so_obj->num_targets; i++) {
-    if (!so_obj->so_targets[i])
-      glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, i, 0);
-    else if (so_obj->so_targets[i]->buffer_offset ||
-             so_obj->so_targets[i]->buffer_size <
-                 so_obj->so_targets[i]->buffer->base.width0)
-      glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i,
-                        so_obj->so_targets[i]->buffer->id,
-                        so_obj->so_targets[i]->buffer_offset,
-                        so_obj->so_targets[i]->buffer_size);
-    else
-      glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, i,
-                       so_obj->so_targets[i]->buffer->id);
-  }
-}
-
-void vrend_set_streamout_targets(struct vrend_context *ctx,
-                                 UNUSED uint32_t append_bitmask,
-                                 uint32_t num_targets, uint32_t *handles) {
-  struct vrend_so_target *target;
-  uint i;
-
-  if (!has_feature(feat_transform_feedback))
-    return;
-
-  if (num_targets) {
-    bool found = false;
-    struct vrend_streamout_object *obj;
-    LIST_FOR_EACH_ENTRY(obj, &ctx->sub->streamout_list, head) {
-      if (obj->num_targets == num_targets) {
-        if (!memcmp(handles, obj->handles, num_targets * 4)) {
-          found = true;
-          break;
-        }
-      }
-    }
-    if (found) {
-      ctx->sub->current_so = obj;
-      glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, obj->id);
-      return;
-    }
-
-    obj = CALLOC_STRUCT(vrend_streamout_object);
-    if (has_feature(feat_transform_feedback2)) {
-      glGenTransformFeedbacks(1, &obj->id);
-      glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, obj->id);
-    }
-    obj->num_targets = num_targets;
-    for (i = 0; i < num_targets; i++) {
-      obj->handles[i] = handles[i];
-      if (handles[i] == 0)
-        continue;
-      target = vrend_object_lookup(ctx->sub->object_hash, handles[i],
-                                   VIRGL_OBJECT_STREAMOUT_TARGET);
-      if (!target) {
-        free(obj);
-        return;
-      }
-      vrend_so_target_reference(&obj->so_targets[i], target);
-    }
-    vrend_hw_emit_streamout_targets(ctx, obj);
-    list_addtail(&obj->head, &ctx->sub->streamout_list);
-    ctx->sub->current_so = obj;
-    obj->xfb_state = XFB_STATE_STARTED_NEED_BEGIN;
-  } else {
-    if (has_feature(feat_transform_feedback2))
-      glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
-    ctx->sub->current_so = NULL;
-  }
-}
-
-static void vrend_resource_buffer_copy(UNUSED struct vrend_context *ctx,
-                                       struct vrend_resource *src_res,
-                                       struct vrend_resource *dst_res,
-                                       uint32_t dstx, uint32_t srcx,
-                                       uint32_t width) {
-  glBindBuffer(GL_COPY_READ_BUFFER, src_res->id);
-  glBindBuffer(GL_COPY_WRITE_BUFFER, dst_res->id);
-
-  glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, srcx, dstx,
-                      width);
-  glBindBuffer(GL_COPY_READ_BUFFER, 0);
-  glBindBuffer(GL_COPY_WRITE_BUFFER, 0);
-}
-
-static void vrend_resource_copy_fallback(struct vrend_resource *src_res,
-                                         struct vrend_resource *dst_res,
-                                         uint32_t dst_level, uint32_t dstx,
-                                         uint32_t dsty, uint32_t dstz,
-                                         uint32_t src_level,
-                                         const struct pipe_box *src_box) {
-  char *tptr;
-  uint32_t total_size, src_stride, dst_stride, src_layer_stride;
-  GLenum glformat, gltype;
-  int elsize = util_format_get_blocksize(dst_res->base.format);
-  int compressed = util_format_is_compressed(dst_res->base.format);
-  int cube_slice = 1;
-  uint32_t slice_size, slice_offset;
-  int i;
-  struct pipe_box box;
-
-  if (src_res->target == GL_TEXTURE_CUBE_MAP)
-    cube_slice = 6;
-
-  if (src_res->base.format != dst_res->base.format)
-    return;
-
-  box = *src_box;
-  box.depth = vrend_get_texture_depth(src_res, src_level);
-  dst_stride =
-      util_format_get_stride(dst_res->base.format, dst_res->base.width0);
-
-  /* this is ugly need to do a full GetTexImage */
-  slice_size =
-      util_format_get_nblocks(src_res->base.format,
-                              u_minify(src_res->base.width0, src_level),
-                              u_minify(src_res->base.height0, src_level)) *
-      util_format_get_blocksize(src_res->base.format);
-  total_size = slice_size * vrend_get_texture_depth(src_res, src_level);
-
-  tptr = malloc(total_size);
-  if (!tptr)
-    return;
-
-  glformat = tex_conv_table[src_res->base.format].glformat;
-  gltype = tex_conv_table[src_res->base.format].gltype;
-
-  if (compressed)
-    glformat = tex_conv_table[src_res->base.format].internalformat;
-
-  /* If we are on gles we need to rely on the textures backing
-   * iovec to have the data we need, otherwise we can use glGetTexture
-   */
-  uint64_t src_offset = 0;
-  uint64_t dst_offset = 0;
-  if (src_level < VR_MAX_TEXTURE_2D_LEVELS) {
-    src_offset = src_res->mipmap_offsets[src_level];
-    dst_offset = dst_res->mipmap_offsets[src_level];
-  }
-
-  src_stride =
-      util_format_get_nblocksx(src_res->base.format,
-                               u_minify(src_res->base.width0, src_level)) *
-      elsize;
-  src_layer_stride =
-      util_format_get_2d_size(src_res->base.format, src_stride,
-                              u_minify(src_res->base.height0, src_level));
-  read_transfer_data(src_res->iov, src_res->num_iovs, tptr,
-                     src_res->base.format, src_offset, src_stride,
-                     src_layer_stride, &box, false);
-  /* When on GLES sync the iov that backs the dst resource because
-   * we might need it in a chain copy A->B, B->C */
-  write_transfer_data(&dst_res->base, dst_res->iov, dst_res->num_iovs, tptr,
-                      dst_stride, &box, src_level, dst_offset, false);
-  /* we get values from the guest as 24-bit scaled integers
-     but we give them to the host GL and it interprets them
-     as 32-bit scaled integers, so we need to scale them here */
-  if (dst_res->base.format == VIRGL_FORMAT_Z24X8_UNORM) {
-    float depth_scale = 256.0;
-    vrend_scale_depth(tptr, total_size, depth_scale);
-  }
-
-  glPixelStorei(GL_PACK_ALIGNMENT, 4);
-  switch (elsize) {
-  case 1:
-  case 3:
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    break;
-  case 2:
-  case 6:
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
-    break;
-  case 4:
-  default:
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-    break;
-  case 8:
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 8);
-    break;
-  }
-
-  glBindTexture(dst_res->target, dst_res->id);
-  slice_offset = src_box->z * slice_size;
-  cube_slice = (src_res->target == GL_TEXTURE_CUBE_MAP)
-                   ? src_box->z + src_box->depth
-                   : cube_slice;
-  i = (src_res->target == GL_TEXTURE_CUBE_MAP) ? src_box->z : 0;
-  for (; i < cube_slice; i++) {
-    GLenum ctarget = dst_res->target == GL_TEXTURE_CUBE_MAP
-                         ? (GLenum)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i)
-                         : dst_res->target;
-    if (compressed) {
-      glCompressedTexSubImage2D(ctarget, dst_level, dstx, dsty, src_box->width,
-                                src_box->height, glformat, slice_size,
-                                tptr + slice_offset);
-    } else {
-      if (ctarget == GL_TEXTURE_3D || ctarget == GL_TEXTURE_2D_ARRAY ||
-          ctarget == GL_TEXTURE_CUBE_MAP_ARRAY) {
-        glTexSubImage3D(ctarget, dst_level, dstx, dsty, dstz, src_box->width,
-                        src_box->height, src_box->depth, glformat, gltype,
-                        tptr + slice_offset);
-      } else {
-        glTexSubImage2D(ctarget, dst_level, dstx, dsty, src_box->width,
-                        src_box->height, glformat, gltype, tptr + slice_offset);
-      }
-    }
-    slice_offset += slice_size;
-  }
-
-  glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-  free(tptr);
-  glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-static inline void vrend_copy_sub_image(struct vrend_resource *src_res,
-                                        struct vrend_resource *dst_res,
-                                        uint32_t src_level,
-                                        const struct pipe_box *src_box,
-                                        uint32_t dst_level, uint32_t dstx,
-                                        uint32_t dsty, uint32_t dstz) {
-
-  GLenum src_target =
-      tgsitargettogltarget(src_res->base.target, src_res->base.nr_samples);
-  GLenum dst_target =
-      tgsitargettogltarget(dst_res->base.target, dst_res->base.nr_samples);
-
-  src_target = translate_gles_emulation_texture_target(src_target);
-  dst_target = translate_gles_emulation_texture_target(dst_target);
-
-  glCopyImageSubData(src_res->id, src_target, src_level, src_box->x, src_box->y,
-                     src_box->z, dst_res->id, dst_target, dst_level, dstx, dsty,
-                     dstz, src_box->width, src_box->height, src_box->depth);
-}
-
-void vrend_renderer_resource_copy_region(
-    struct vrend_context *ctx, uint32_t dst_handle, uint32_t dst_level,
-    uint32_t dstx, uint32_t dsty, uint32_t dstz, uint32_t src_handle,
-    uint32_t src_level, const struct pipe_box *src_box) {
-  struct vrend_resource *src_res, *dst_res;
-  GLbitfield glmask = 0;
-  GLint sy1, sy2, dy1, dy2;
-
-  if (ctx->in_error)
-    return;
-
-  src_res = vrend_renderer_ctx_res_lookup(ctx, src_handle);
-  dst_res = vrend_renderer_ctx_res_lookup(ctx, dst_handle);
-
-  if (!src_res)
-    return;
-  if (!dst_res)
-    return;
-
-  if (src_res->base.target == PIPE_BUFFER &&
-      dst_res->base.target == PIPE_BUFFER) {
-    /* do a buffer copy */
-    vrend_resource_buffer_copy(ctx, src_res, dst_res, dstx, src_box->x,
-                               src_box->width);
-    return;
-  }
-
-  if (has_feature(feat_copy_image) &&
-      format_is_copy_compatible(src_res->base.format, dst_res->base.format,
-                                true) &&
-      src_res->base.nr_samples == dst_res->base.nr_samples) {
-    vrend_copy_sub_image(src_res, dst_res, src_level, src_box, dst_level, dstx,
-                         dsty, dstz);
-    return;
-  }
-
-  if (!vrend_format_can_render(src_res->base.format) ||
-      !vrend_format_can_render(dst_res->base.format)) {
-    vrend_resource_copy_fallback(src_res, dst_res, dst_level, dstx, dsty, dstz,
-                                 src_level, src_box);
-    return;
-  }
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-
-  /* clean out fb ids */
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                         GL_TEXTURE_2D, 0, 0);
-  vrend_fb_bind_texture(src_res, 0, src_level, src_box->z);
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                         GL_TEXTURE_2D, 0, 0);
-  vrend_fb_bind_texture(dst_res, 0, dst_level, dstz);
-  glBindFramebuffer(GL_DRAW_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-
-  glBindFramebuffer(GL_READ_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-
-  glmask = GL_COLOR_BUFFER_BIT;
-  glDisable(GL_SCISSOR_TEST);
-
-  if (!src_res->y_0_top) {
-    sy1 = src_box->y;
-    sy2 = src_box->y + src_box->height;
-  } else {
-    sy1 = src_res->base.height0 - src_box->y - src_box->height;
-    sy2 = src_res->base.height0 - src_box->y;
-  }
-
-  if (!dst_res->y_0_top) {
-    dy1 = dsty;
-    dy2 = dsty + src_box->height;
-  } else {
-    dy1 = dst_res->base.height0 - dsty - src_box->height;
-    dy2 = dst_res->base.height0 - dsty;
-  }
-
-  glBlitFramebuffer(src_box->x, sy1, src_box->x + src_box->width, sy2, dstx,
-                    dy1, dstx + src_box->width, dy2, glmask, GL_NEAREST);
-
-  glBindFramebuffer(GL_READ_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0,
-                         0);
-  glBindFramebuffer(GL_READ_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0,
-                         0);
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->fb_id);
-
-  if (ctx->sub->rs_state.scissor)
-    glEnable(GL_SCISSOR_TEST);
-}
-
-static void vrend_renderer_blit_int(struct vrend_context *ctx,
-                                    struct vrend_resource *src_res,
-                                    struct vrend_resource *dst_res,
-                                    const struct pipe_blit_info *info) {
-  GLbitfield glmask = 0;
-  int src_y1, src_y2, dst_y1, dst_y2;
-  GLenum filter;
-  int n_layers = 1, i;
-  bool use_gl = false;
-  bool make_intermediate_copy = false;
-  bool skip_dest_swizzle = false;
-  GLuint intermediate_fbo = 0;
-  struct vrend_resource *intermediate_copy = 0;
-
-  GLuint blitter_views[2] = {src_res->id, dst_res->id};
-
-  filter = convert_mag_filter(info->filter);
-
-  /* if we can't make FBO's use the fallback path */
-  if (!vrend_format_can_render(src_res->base.format) &&
-      !vrend_format_is_ds(src_res->base.format))
-    use_gl = true;
-  if (!vrend_format_can_render(dst_res->base.format) &&
-      !vrend_format_is_ds(dst_res->base.format))
-    use_gl = true;
-
-  /* different depth formats */
-  if (vrend_format_is_ds(src_res->base.format) &&
-      vrend_format_is_ds(dst_res->base.format)) {
-    if (src_res->base.format != dst_res->base.format) {
-      if (!(src_res->base.format == PIPE_FORMAT_S8_UINT_Z24_UNORM &&
-            (dst_res->base.format == PIPE_FORMAT_Z24X8_UNORM))) {
-        use_gl = true;
-      }
-    }
-  }
-  /* glBlitFramebuffer - can support depth stencil with NEAREST
-     which we use for mipmaps */
-  if ((info->mask & (PIPE_MASK_Z | PIPE_MASK_S)) &&
-      info->filter == PIPE_TEX_FILTER_LINEAR)
-    use_gl = true;
-
-  /* for scaled MS blits we either need extensions or hand roll */
-  if (info->mask & PIPE_MASK_RGBA && src_res->base.nr_samples > 0 &&
-      src_res->base.nr_samples != dst_res->base.nr_samples &&
-      (info->src.box.width != info->dst.box.width ||
-       info->src.box.height != info->dst.box.height)) {
-    use_gl = true;
-  }
-
-  if (!dst_res->y_0_top) {
-    dst_y1 = info->dst.box.y + info->dst.box.height;
-    dst_y2 = info->dst.box.y;
-  } else {
-    dst_y1 = dst_res->base.height0 - info->dst.box.y - info->dst.box.height;
-    dst_y2 = dst_res->base.height0 - info->dst.box.y;
-  }
-
-  if (!src_res->y_0_top) {
-    src_y1 = info->src.box.y + info->src.box.height;
-    src_y2 = info->src.box.y;
-  } else {
-    src_y1 = src_res->base.height0 - info->src.box.y - info->src.box.height;
-    src_y2 = src_res->base.height0 - info->src.box.y;
-  }
-
-  /* GLES generally doesn't support blitting to a multi-sample FB, and also not
-   * from a multi-sample FB where the regions are not exatly the same or the
-   * source and target format are different. For
-   * downsampling DS blits to zero samples we solve this by doing two blits */
-  if (((dst_res->base.nr_samples > 0) ||
-       ((info->mask & PIPE_MASK_RGBA) && (src_res->base.nr_samples > 0) &&
-        (info->src.box.x != info->dst.box.x ||
-         info->src.box.width != info->dst.box.width || dst_y1 != src_y1 ||
-         dst_y2 != src_y2 || info->src.format != info->dst.format))))
-    use_gl = true;
-
-  /* for 3D mipmapped blits - hand roll time */
-  if (info->src.box.depth != info->dst.box.depth)
-    use_gl = true;
-
-  if (vrend_blit_needs_swizzle(info->dst.format, info->src.format)) {
-    use_gl = true;
-
-    if (dst_res->base.bind & VIRGL_BIND_PREFER_EMULATED_BGRA)
-      skip_dest_swizzle = true;
-  }
-
-  if (use_gl) {
-    vrend_renderer_blit_gl(ctx->client, src_res, dst_res, blitter_views, info,
-                           has_feature(feat_texture_srgb_decode),
-                           has_feature(feat_srgb_write_control),
-                           skip_dest_swizzle);
-    vrend_clicbs->make_current(ctx->client, ctx->sub->gl_context);
-    goto cleanup;
-  }
-
-  if (info->mask & PIPE_MASK_Z)
-    glmask |= GL_DEPTH_BUFFER_BIT;
-  if (info->mask & PIPE_MASK_S)
-    glmask |= GL_STENCIL_BUFFER_BIT;
-  if (info->mask & PIPE_MASK_RGBA)
-    glmask |= GL_COLOR_BUFFER_BIT;
-
-  if (info->scissor_enable) {
-    glScissor(info->scissor.minx, info->scissor.miny,
-              info->scissor.maxx - info->scissor.minx,
-              info->scissor.maxy - info->scissor.miny);
-    ctx->sub->scissor_state_dirty = (1 << 0);
-    glEnable(GL_SCISSOR_TEST);
-  } else
-    glDisable(GL_SCISSOR_TEST);
-
-  /* An GLES GL_INVALID_OPERATION is generated if one wants to blit from a
-   * multi-sample fbo to a non multi-sample fbo and the source and destination
-   * rectangles are not defined with the same (X0, Y0) and (X1, Y1) bounds.
-   *
-   * Since stencil data can only be written in a fragment shader when
-   * ARB_shader_stencil_export is available, the workaround using GL as given
-   * above is usually not available. Instead, to work around the blit
-   * limitations on GLES first copy the full frame to a non-multisample
-   * surface and then copy the according area to the final target surface.
-   */
-  if ((info->mask & PIPE_MASK_ZS) &&
-      ((src_res->base.nr_samples > 0) &&
-       (src_res->base.nr_samples != dst_res->base.nr_samples)) &&
-      ((info->src.box.x != info->dst.box.x) || (src_y1 != dst_y1) ||
-       (info->src.box.width != info->dst.box.width) || (src_y2 != dst_y2))) {
-
-    make_intermediate_copy = true;
-
-    /* Create a texture that is the same like the src_res texture, but
-     * without multi-sample */
-    struct vrend_renderer_resource_create_args args;
-    memset(&args, 0, sizeof(struct vrend_renderer_resource_create_args));
-    args.width = src_res->base.width0;
-    args.height = src_res->base.height0;
-    args.depth = src_res->base.depth0;
-    args.format = info->src.format;
-    args.target = src_res->base.target;
-    args.last_level = src_res->base.last_level;
-    args.array_size = src_res->base.array_size;
-    intermediate_copy = (struct vrend_resource *)CALLOC_STRUCT(vrend_texture);
-    vrend_renderer_resource_copy_args(&args, intermediate_copy);
-    MAYBE_UNUSED int r =
-        vrend_renderer_resource_allocate_texture(intermediate_copy);
-    assert(!r);
-
-    glGenFramebuffers(1, &intermediate_fbo);
-  } else {
-    /* If no intermediate copy is needed make the variables point to the
-     * original source to simplify the code below.
-     */
-    intermediate_fbo = ctx->sub->blit_fb_ids[0];
-    intermediate_copy = src_res;
-  }
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-  if (info->mask & PIPE_MASK_RGBA)
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                           GL_TEXTURE_2D, 0, 0);
-  else
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-                           0, 0);
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-  if (info->mask & PIPE_MASK_RGBA)
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                           GL_TEXTURE_2D, 0, 0);
-  else if (info->mask & (PIPE_MASK_Z | PIPE_MASK_S))
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-                           0, 0);
-  if (info->src.box.depth == info->dst.box.depth)
-    n_layers = info->dst.box.depth;
-  for (i = 0; i < n_layers; i++) {
-    glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-    vrend_fb_bind_texture_id(src_res, blitter_views[0], 0, info->src.level,
-                             info->src.box.z + i);
-
-    if (make_intermediate_copy) {
-      int level_width = u_minify(src_res->base.width0, info->src.level);
-      int level_height = u_minify(src_res->base.width0, info->src.level);
-      glBindFramebuffer(GL_FRAMEBUFFER, intermediate_fbo);
-      glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                             GL_TEXTURE_2D, 0, 0);
-      vrend_fb_bind_texture(intermediate_copy, 0, info->src.level,
-                            info->src.box.z + i);
-
-      glBindFramebuffer(GL_DRAW_FRAMEBUFFER, intermediate_fbo);
-      glBindFramebuffer(GL_READ_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-      glBlitFramebuffer(0, 0, level_width, level_height, 0, 0, level_width,
-                        level_height, glmask, filter);
-    }
-
-    glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-    vrend_fb_bind_texture_id(dst_res, blitter_views[1], 0, info->dst.level,
-                             info->dst.box.z + i);
-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-
-    glBindFramebuffer(GL_READ_FRAMEBUFFER, intermediate_fbo);
-
-    glBlitFramebuffer(
-        info->src.box.x, src_y1, info->src.box.x + info->src.box.width, src_y2,
-        info->dst.box.x, dst_y1, info->dst.box.x + info->dst.box.width, dst_y2,
-        glmask, filter);
-  }
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[1]);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0,
-                         0);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                         GL_TEXTURE_2D, 0, 0);
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->blit_fb_ids[0]);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0,
-                         0);
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                         GL_TEXTURE_2D, 0, 0);
-
-  glBindFramebuffer(GL_FRAMEBUFFER, ctx->sub->fb_id);
-
-  if (make_intermediate_copy) {
-    vrend_renderer_resource_destroy(intermediate_copy);
-    glDeleteFramebuffers(1, &intermediate_fbo);
-  }
-
-  if (ctx->sub->rs_state.scissor)
-    glEnable(GL_SCISSOR_TEST);
-  else
-    glDisable(GL_SCISSOR_TEST);
-
-cleanup:
-  if (blitter_views[0] != src_res->id)
-    glDeleteTextures(1, &blitter_views[0]);
-
-  if (blitter_views[1] != dst_res->id)
-    glDeleteTextures(1, &blitter_views[1]);
-}
-
-void vrend_renderer_blit(struct vrend_context *ctx, uint32_t dst_handle,
-                         uint32_t src_handle,
-                         const struct pipe_blit_info *info) {
-  struct vrend_resource *src_res, *dst_res;
-  src_res = vrend_renderer_ctx_res_lookup(ctx, src_handle);
-  dst_res = vrend_renderer_ctx_res_lookup(ctx, dst_handle);
-
-  if (!src_res)
-    return;
-  if (!dst_res)
-    return;
-
-  if (ctx->in_error)
-    return;
-
-  if (!info->src.format || info->src.format >= VIRGL_FORMAT_MAX)
-    return;
-
-  if (!info->dst.format || info->dst.format >= VIRGL_FORMAT_MAX)
-    return;
-
-  /* The Gallium blit function can be called for a general blit that may
-   * scale, convert the data, and apply some rander states, or it is called via
-   * glCopyImageSubData. If the src or the dst image are equal, or the two
-   * images formats are the same, then Galliums such calles are redirected
-   * to resource_copy_region, in this case and if no render states etx need
-   * to be applied, forward the call to glCopyImageSubData, otherwise do a
-   * normal blit. */
-  if (has_feature(feat_copy_image) &&
-      (!info->render_condition_enable || !ctx->sub->cond_render_gl_mode) &&
-      format_is_copy_compatible(info->src.format, info->dst.format, false) &&
-      !info->scissor_enable && (info->filter == PIPE_TEX_FILTER_NEAREST) &&
-      !info->alpha_blend && (info->mask == PIPE_MASK_RGBA) &&
-      src_res->base.nr_samples == dst_res->base.nr_samples &&
-      info->src.box.width == info->dst.box.width &&
-      info->src.box.height == info->dst.box.height &&
-      info->src.box.depth == info->dst.box.depth) {
-    vrend_copy_sub_image(src_res, dst_res, info->src.level, &info->src.box,
-                         info->dst.level, info->dst.box.x, info->dst.box.y,
-                         info->dst.box.z);
-  } else {
-    vrend_renderer_blit_int(ctx, src_res, dst_res, info);
-  }
-}
-
-int vrend_renderer_create_fence(struct virgl_client *client,
-                                int client_fence_id, uint32_t ctx_id) {
-  struct vrend_fence *fence;
-
-  fence = malloc(sizeof(struct vrend_fence));
-  if (!fence)
-    return ENOMEM;
-
-  fence->ctx_id = ctx_id;
-  fence->fence_id = client_fence_id;
-  fence->syncobj = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-  glFlush();
-
-  if (fence->syncobj == NULL)
-    goto fail;
-
-  list_addtail(&fence->fences, &client->vrend_state->fence_list);
-  return 0;
-
-fail:
-  free(fence);
-  return ENOMEM;
-}
-
-static void free_fence_locked(struct vrend_fence *fence) {
-  list_del(&fence->fences);
-  glDeleteSync(fence->syncobj);
-  free(fence);
-}
-
-static void vrend_renderer_check_queries(struct virgl_client *client);
-
-void vrend_renderer_check_fences(struct virgl_client *client) {
-  struct vrend_fence *fence, *stor;
-  uint32_t latest_id = 0;
-  GLenum glret;
-
-  vrend_renderer_force_ctx_0(client);
-
-  LIST_FOR_EACH_ENTRY_SAFE(fence, stor, &client->vrend_state->fence_list,
-                           fences) {
-    glret = glClientWaitSync(fence->syncobj, 0, 0);
-    if (glret == GL_ALREADY_SIGNALED) {
-      latest_id = fence->fence_id;
-      free_fence_locked(fence);
-    }
-    /* don't bother checking any subsequent ones */
-    else if (glret == GL_TIMEOUT_EXPIRED) {
-      break;
-    }
-  }
-
-  if (latest_id == 0)
-    return;
-
-  vrend_renderer_check_queries(client);
-
-  vrend_clicbs->write_fence(client, latest_id);
-}
-
-static bool vrend_get_one_query_result(GLuint query_id, uint64_t *result) {
-  GLuint ready;
-  GLuint passed;
-  GLuint64 pass64;
-
-  glGetQueryObjectuiv(query_id, GL_QUERY_RESULT_AVAILABLE, &ready);
-
-  if (!ready)
-    return false;
-
-  glGetQueryObjectuiv(query_id, GL_QUERY_RESULT, &passed);
-  *result = passed;
-  return true;
-}
-
-static bool vrend_check_query(struct vrend_query *query) {
-  struct virgl_host_query_state state;
-  bool ret;
-
-  state.result_size = 4;
-  ret = vrend_get_one_query_result(query->id, &state.result);
-  if (ret == false)
-    return false;
-
-  /* We got a boolean, but the client wanted the actual number of samples
-   * blow the number up so that the client doesn't think it was just one pixel
-   * and discards an object that might be bigger */
-  if (query->fake_samples_passed)
-    state.result *= fake_occlusion_query_samples_passed_default;
-
-  state.query_state = VIRGL_QUERY_STATE_DONE;
-
-  if (query->res->iov) {
-    vrend_write_to_iovec(query->res->iov, query->res->num_iovs, 0,
-                         (const void *)&state, sizeof(state));
-  } else {
-    *((struct virgl_host_query_state *)query->res->ptr) = state;
-  }
-
-  return true;
-}
-
-static void vrend_renderer_check_queries(struct virgl_client *client) {
-  struct vrend_query *query, *stor;
-
-  LIST_FOR_EACH_ENTRY_SAFE(
-      query, stor, &client->vrend_state->waiting_query_list, waiting_queries) {
-    vrend_hw_switch_context(vrend_lookup_renderer_ctx(client, query->ctx_id),
-                            true);
-    if (vrend_check_query(query))
-      list_delinit(&query->waiting_queries);
-  }
-}
-
-bool vrend_hw_switch_context(struct vrend_context *ctx, bool now) {
-  if (!ctx)
-    return false;
-
-  if (ctx == ctx->client->vrend_state->current_ctx &&
-      ctx->ctx_switch_pending == false)
-    return true;
-
-  if (ctx->ctx_id != 0 && ctx->in_error)
-    return false;
-
-  ctx->ctx_switch_pending = true;
-  if (now)
-    vrend_finish_context_switch(ctx);
-
-  ctx->client->vrend_state->current_ctx = ctx;
-  return true;
-}
-
-static void vrend_finish_context_switch(struct vrend_context *ctx) {
-  if (ctx->ctx_switch_pending == false)
-    return;
-  ctx->ctx_switch_pending = false;
-
-  if (ctx->client->vrend_state->current_hw_ctx == ctx)
-    return;
-
-  ctx->client->vrend_state->current_hw_ctx = ctx;
-
-  vrend_clicbs->make_current(ctx->client, ctx->sub->gl_context);
-}
-
-void vrend_renderer_object_destroy(struct vrend_context *ctx, uint32_t handle) {
-  vrend_object_remove(ctx->sub->object_hash, handle, 0);
-}
-
-uint32_t vrend_renderer_object_insert(struct vrend_context *ctx, void *data,
-                                      uint32_t size, uint32_t handle,
-                                      enum virgl_object_type type) {
-  return vrend_object_insert(ctx->sub->object_hash, data, size, handle, type);
-}
-
-int vrend_create_query(struct vrend_context *ctx, uint32_t handle,
-                       uint32_t query_type, uint32_t query_index,
-                       uint32_t res_handle, UNUSED uint32_t offset) {
-  struct vrend_query *q;
-  struct vrend_resource *res;
-  uint32_t ret_handle;
-  bool fake_samples_passed = false;
-  res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-  if (!res || !has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY))
-    return EINVAL;
-
-  /* If we don't have ARB_occlusion_query, at least try to fake
-   * GL_SAMPLES_PASSED by using GL_ANY_SAMPLES_PASSED (i.e.
-   * EXT_occlusion_query_boolean) */
-  if (query_type == PIPE_QUERY_OCCLUSION_COUNTER) {
-    query_type = PIPE_QUERY_OCCLUSION_PREDICATE;
-    fake_samples_passed = true;
-  }
-
-  if (query_type == PIPE_QUERY_OCCLUSION_PREDICATE &&
-      !has_feature(feat_occlusion_query_boolean))
-    return EINVAL;
-
-  q = CALLOC_STRUCT(vrend_query);
-  if (!q)
-    return ENOMEM;
-
-  list_inithead(&q->waiting_queries);
-  q->type = query_type;
-  q->index = query_index;
-  q->ctx_id = ctx->ctx_id;
-  q->fake_samples_passed = fake_samples_passed;
-
-  vrend_resource_reference(&q->res, res);
-
-  switch (q->type) {
-  case PIPE_QUERY_OCCLUSION_COUNTER:
-    return EINVAL;
-  case PIPE_QUERY_OCCLUSION_PREDICATE:
-    if (has_feature(feat_occlusion_query_boolean)) {
-      q->gltype = GL_ANY_SAMPLES_PASSED;
-      break;
-    } else
-      return EINVAL;
-  case PIPE_QUERY_TIMESTAMP:
-    return EINVAL;
-  case PIPE_QUERY_TIME_ELAPSED:
-    return EINVAL;
-  case PIPE_QUERY_PRIMITIVES_GENERATED:
-    q->gltype = GL_PRIMITIVES_GENERATED;
-    break;
-  case PIPE_QUERY_PRIMITIVES_EMITTED:
-    q->gltype = GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN;
-    break;
-  case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
-    q->gltype = GL_ANY_SAMPLES_PASSED_CONSERVATIVE;
-    break;
-  case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
-    return EINVAL;
-  case PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE:
-    return EINVAL;
-  }
-
-  glGenQueries(1, &q->id);
-
-  ret_handle = vrend_renderer_object_insert(ctx, q, sizeof(struct vrend_query),
-                                            handle, VIRGL_OBJECT_QUERY);
-  if (!ret_handle) {
-    FREE(q);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static void vrend_destroy_query(struct vrend_query *query) {
-  vrend_resource_reference(&query->res, NULL);
-  list_del(&query->waiting_queries);
-  glDeleteQueries(1, &query->id);
-  free(query);
-}
-
-static void vrend_destroy_query_object(void *obj_ptr) {
-  struct vrend_query *query = obj_ptr;
-  vrend_destroy_query(query);
-}
-
-int vrend_begin_query(struct vrend_context *ctx, uint32_t handle) {
-  struct vrend_query *q;
-
-  q = vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_QUERY);
-  if (!q)
-    return EINVAL;
-
-  if (q->index > 0)
-    return EINVAL;
-
-  list_delinit(&q->waiting_queries);
-
-  glBeginQuery(q->gltype, q->id);
-  return 0;
-}
-
-int vrend_end_query(struct vrend_context *ctx, uint32_t handle) {
-  struct vrend_query *q;
-  q = vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_QUERY);
-  if (!q)
-    return EINVAL;
-
-  if (q->index > 0)
-    return EINVAL;
-
-  glEndQuery(q->gltype);
-  return 0;
-}
-
-void vrend_get_query_result(struct vrend_context *ctx, uint32_t handle,
-                            UNUSED uint32_t wait) {
-  struct vrend_query *q;
-  bool ret;
-
-  q = vrend_object_lookup(ctx->sub->object_hash, handle, VIRGL_OBJECT_QUERY);
-  if (!q)
-    return;
-
-  ret = vrend_check_query(q);
-  if (ret) {
-    list_delinit(&q->waiting_queries);
-  } else if (LIST_IS_EMPTY(&q->waiting_queries)) {
-    list_addtail(&q->waiting_queries,
-                 &ctx->client->vrend_state->waiting_query_list);
-  }
-}
-
-int vrend_create_so_target(struct vrend_context *ctx, uint32_t handle,
-                           uint32_t res_handle, uint32_t buffer_offset,
-                           uint32_t buffer_size) {
-  struct vrend_so_target *target;
-  struct vrend_resource *res;
-  int ret_handle;
-  res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
-  if (!res)
-    return EINVAL;
-
-  target = CALLOC_STRUCT(vrend_so_target);
-  if (!target)
-    return ENOMEM;
-
-  pipe_reference_init(&target->reference, 1);
-  target->res_handle = res_handle;
-  target->buffer_offset = buffer_offset;
-  target->buffer_size = buffer_size;
-  target->sub_ctx = ctx->sub;
-  vrend_resource_reference(&target->buffer, res);
-
-  ret_handle = vrend_renderer_object_insert(
-      ctx, target, sizeof(*target), handle, VIRGL_OBJECT_STREAMOUT_TARGET);
-  if (ret_handle == 0) {
-    FREE(target);
-    return ENOMEM;
-  }
-  return 0;
-}
-
-static void vrend_fill_caps_glsl_version(int gles_ver, union virgl_caps *caps) {
-  if (gles_ver > 0) {
-    caps->v1.glsl_level = 120;
-
-    if (gles_ver >= 31)
-      caps->v1.glsl_level = 310;
-    else if (gles_ver >= 30)
-      caps->v1.glsl_level = 130;
-  }
-
-  if (caps->v1.glsl_level < 400) {
-    if (has_feature(feat_tessellation) && has_feature(feat_geometry_shader) &&
-        has_feature(feat_gpu_shader5)) {
-      /* This is probably a lie, but Gallium enables
-       * OES_geometry_shader and ARB_gpu_shader5
-       * based on this value, apart from that it doesn't
-       * seem to be a crucial value */
-      caps->v1.glsl_level = 400;
-
-      /* Let's lie a bit more */
-      if (has_feature(feat_separate_shader_objects)) {
-        caps->v1.glsl_level = 410;
-
-        /* Compute shaders require GLSL 4.30 unless the shader explicitely
-         * specifies GL_ARB_compute_shader as required. However, on OpenGL ES
-         * they are already supported with version 3.10, so if we already
-         * advertise a feature level of 410, just lie a bit more to make
-         * compute shaders available to GL programs that don't specify the
-         * extension within the shaders. */
-        if (has_feature(feat_compute_shader))
-          caps->v1.glsl_level = 430;
-      }
-    }
-  }
-}
-
-static void set_format_bit(struct virgl_supported_format_mask *mask,
-                           enum virgl_formats fmt) {
-  assert(fmt < VIRGL_FORMAT_MAX);
-  unsigned val = (unsigned)fmt;
-  unsigned idx = val / 32;
-  unsigned bit = val % 32;
-  assert(idx < ARRAY_SIZE(mask->bitmask));
-  mask->bitmask[idx] |= 1u << bit;
-}
-
-/*
- * Does all of the common caps setting,
- * if it dedects a early out returns true.
- */
-static void vrend_renderer_fill_caps_v1(struct virgl_client *client,
-                                        int gles_ver, union virgl_caps *caps) {
-  int i;
-  GLint max;
-
-  /*
-   * We can't fully support this feature on GLES,
-   * but it is needed for OpenGL 2.1 so lie.
-   */
-  caps->v1.bset.occlusion_query = 1;
-
-  /* Set supported prims here as we now know what shaders we support. */
-  caps->v1.prim_mask = (1 << PIPE_PRIM_POINTS) | (1 << PIPE_PRIM_LINES) |
-                       (1 << PIPE_PRIM_LINE_STRIP) |
-                       (1 << PIPE_PRIM_LINE_LOOP) | (1 << PIPE_PRIM_TRIANGLES) |
-                       (1 << PIPE_PRIM_TRIANGLE_STRIP) |
-                       (1 << PIPE_PRIM_TRIANGLE_FAN);
-
-  if (caps->v1.glsl_level >= 150) {
-    caps->v1.prim_mask |= (1 << PIPE_PRIM_LINES_ADJACENCY) |
-                          (1 << PIPE_PRIM_LINE_STRIP_ADJACENCY) |
-                          (1 << PIPE_PRIM_TRIANGLES_ADJACENCY) |
-                          (1 << PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY);
-  }
-  if (caps->v1.glsl_level >= 400 || has_feature(feat_tessellation))
-    caps->v1.prim_mask |= (1 << PIPE_PRIM_PATCHES);
-
-  if (vrend_has_gl_extension("GL_ARB_vertex_type_10f_11f_11f_rev"))
-    set_format_bit(&caps->v1.vertexbuffer, VIRGL_FORMAT_R11G11B10_FLOAT);
-
-  if (has_feature(feat_indep_blend))
-    caps->v1.bset.indep_blend_enable = 1;
-
-  if (has_feature(feat_draw_instance))
-    caps->v1.bset.instanceid = 1;
-
-  if (has_feature(feat_ubo)) {
-    glGetIntegerv(GL_MAX_VERTEX_UNIFORM_BLOCKS, &max);
-    caps->v1.max_uniform_blocks = max + 1;
-  }
-
-  if (vrend_has_gl_extension("GL_ARB_fragment_coord_conventions"))
-    caps->v1.bset.fragment_coord_conventions = 1;
-
-  if (vrend_has_gl_extension("GL_ARB_seamless_cube_map") || gles_ver >= 30)
-    caps->v1.bset.seamless_cube_map = 1;
-
-  if (vrend_has_gl_extension("GL_AMD_seamless_cube_map_per_texture"))
-    caps->v1.bset.seamless_cube_map_per_texture = 1;
-
-  if (has_feature(feat_texture_multisample))
-    caps->v1.bset.texture_multisample = 1;
-
-  if (has_feature(feat_tessellation))
-    caps->v1.bset.has_tessellation_shaders = 1;
-
-  if (has_feature(feat_sample_shading))
-    caps->v1.bset.has_sample_shading = 1;
-
-  if (has_feature(feat_indirect_draw))
-    caps->v1.bset.has_indirect_draw = 1;
-
-  if (has_feature(feat_indep_blend_func))
-    caps->v1.bset.indep_blend_func = 1;
-
-  if (has_feature(feat_cube_map_array))
-    caps->v1.bset.cube_map_array = 1;
-
-  if (vrend_has_gl_extension("GL_ARB_gpu_shader_fp64") &&
-      vrend_has_gl_extension("GL_ARB_gpu_shader5"))
-    caps->v1.bset.has_fp64 = 1;
-
-  if (vrend_has_gl_extension("GL_ARB_shader_stencil_export"))
-    caps->v1.bset.shader_stencil_export = 1;
-
-  if (vrend_has_gl_extension("GL_ARB_cull_distance"))
-    caps->v1.bset.has_cull = 1;
-
-  if (vrend_has_gl_extension("GL_ARB_derivative_control"))
-    caps->v1.bset.derivative_control = 1;
-
-  if (vrend_has_gl_extension("GL_EXT_texture_mirror_clamp") ||
-      vrend_has_gl_extension("GL_ARB_texture_mirror_clamp_to_edge"))
-    caps->v1.bset.mirror_clamp = true;
-
-  if (has_feature(feat_texture_array)) {
-    glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &max);
-    caps->v1.max_texture_array_layers = max;
-  }
-
-  /* we need tf3 so we can do gallium skip buffers */
-  if (has_feature(feat_transform_feedback)) {
-    if (has_feature(feat_transform_feedback2))
-      caps->v1.bset.streamout_pause_resume = 1;
-
-    if (gles_ver > 0) {
-      glGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, &max);
-      /* As with the earlier version of transform feedback this min 4. */
-      if (max >= 4) {
-        caps->v1.max_streamout_buffers = 4;
-      }
-    } else
-      caps->v1.max_streamout_buffers = 4;
-  }
-
-  if (has_feature(feat_arb_or_gles_ext_texture_buffer)) {
-    glGetIntegerv(GL_MAX_TEXTURE_BUFFER_SIZE, &max);
-    caps->v1.max_tbo_size = max;
-  }
-
-  if (has_feature(feat_texture_gather))
-    caps->v1.max_texture_gather_components = 4;
-
-  caps->v1.max_viewports = 1;
-
-  /* Common limits for all backends. */
-  caps->v1.max_render_targets = client->vrend_state->max_draw_buffers;
-
-  glGetIntegerv(GL_MAX_SAMPLES, &max);
-  caps->v1.max_samples = max;
-
-  /* All of the formats are common. */
-  for (i = 0; i < VIRGL_FORMAT_MAX; i++) {
-    if (tex_conv_table[i].internalformat != 0) {
-      enum virgl_formats fmt = (enum virgl_formats)i;
-      if (vrend_format_can_sample(fmt)) {
-        set_format_bit(&caps->v1.sampler, fmt);
-        if (vrend_format_can_render(fmt))
-          set_format_bit(&caps->v1.render, fmt);
-      }
-    }
-  }
-}
-
-static void vrend_renderer_fill_caps_v2(struct virgl_client *client,
-                                        int gles_ver, union virgl_caps *caps) {
-  GLint max;
-  GLfloat range[2];
-
-  /* Count this up when you add a feature flag that is used to set a CAP in
-   * the guest that was set unconditionally before. Then check that flag and
-   * this value to avoid regressions when a guest with a new mesa version is
-   * run on an old virgl host. Use it also to indicate non-cap fixes on the
-   * host that help enable features in the guest. */
-  caps->v2.host_feature_check_version = 3;
-
-  glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, range);
-  caps->v2.min_aliased_point_size = range[0];
-  caps->v2.max_aliased_point_size = range[1];
-
-  glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, range);
-  caps->v2.min_aliased_line_width = range[0];
-  caps->v2.max_aliased_line_width = range[1];
-
-  glGetFloatv(GL_MAX_TEXTURE_LOD_BIAS, &caps->v2.max_texture_lod_bias);
-  glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, (GLint *)&caps->v2.max_vertex_attribs);
-
-  if (gles_ver >= 30)
-    glGetIntegerv(GL_MAX_VERTEX_OUTPUT_COMPONENTS, &max);
-  else
-    max = 64; // minimum required value
-
-  caps->v2.max_vertex_outputs = max / 4;
-
-  glGetIntegerv(GL_MIN_PROGRAM_TEXEL_OFFSET, &caps->v2.min_texel_offset);
-  glGetIntegerv(GL_MAX_PROGRAM_TEXEL_OFFSET, &caps->v2.max_texel_offset);
-
-  glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT,
-                (GLint *)&caps->v2.uniform_buffer_offset_alignment);
-
-  glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&caps->v2.max_texture_2d_size);
-  glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, (GLint *)&caps->v2.max_texture_3d_size);
-  glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE,
-                (GLint *)&caps->v2.max_texture_cube_size);
-  client->vrend_state->max_texture_2d_size = caps->v2.max_texture_2d_size;
-  client->vrend_state->max_texture_3d_size = caps->v2.max_texture_3d_size;
-  client->vrend_state->max_texture_cube_size = caps->v2.max_texture_cube_size;
-
-  if (has_feature(feat_geometry_shader)) {
-    glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES,
-                  (GLint *)&caps->v2.max_geom_output_vertices);
-    glGetIntegerv(GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS,
-                  (GLint *)&caps->v2.max_geom_total_output_components);
-  }
-
-  if (has_feature(feat_tessellation)) {
-    glGetIntegerv(GL_MAX_TESS_PATCH_COMPONENTS, &max);
-    caps->v2.max_shader_patch_varyings = max / 4;
-  } else
-    caps->v2.max_shader_patch_varyings = 0;
-
-  if (has_feature(feat_texture_gather)) {
-    glGetIntegerv(GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET,
-                  &caps->v2.min_texture_gather_offset);
-    glGetIntegerv(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET,
-                  &caps->v2.max_texture_gather_offset);
-  }
-
-  if (has_feature(feat_texture_buffer_range)) {
-    glGetIntegerv(GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT,
-                  (GLint *)&caps->v2.texture_buffer_offset_alignment);
-  }
-
-  if (has_feature(feat_ssbo)) {
-    glGetIntegerv(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT,
-                  (GLint *)&caps->v2.shader_buffer_offset_alignment);
-
-    glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &max);
-    if (max > PIPE_MAX_SHADER_BUFFERS)
-      max = PIPE_MAX_SHADER_BUFFERS;
-    caps->v2.max_shader_buffer_other_stages = max;
-    glGetIntegerv(GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, &max);
-    if (max > PIPE_MAX_SHADER_BUFFERS)
-      max = PIPE_MAX_SHADER_BUFFERS;
-    caps->v2.max_shader_buffer_frag_compute = max;
-    glGetIntegerv(GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS,
-                  (GLint *)&caps->v2.max_combined_shader_buffers);
-  }
-
-  if (has_feature(feat_images)) {
-    glGetIntegerv(GL_MAX_VERTEX_IMAGE_UNIFORMS, &max);
-    if (max > PIPE_MAX_SHADER_IMAGES)
-      max = PIPE_MAX_SHADER_IMAGES;
-    caps->v2.max_shader_image_other_stages = max;
-    glGetIntegerv(GL_MAX_FRAGMENT_IMAGE_UNIFORMS, &max);
-    if (max > PIPE_MAX_SHADER_IMAGES)
-      max = PIPE_MAX_SHADER_IMAGES;
-    caps->v2.max_shader_image_frag_compute = max;
-  }
-
-  if (has_feature(feat_storage_multisample))
-    caps->v1.max_samples =
-        vrend_renderer_query_multisample_caps(caps->v1.max_samples, &caps->v2);
-
-  caps->v2.capability_bits |=
-      VIRGL_CAP_TGSI_INVARIANT | VIRGL_CAP_SET_MIN_SAMPLES |
-      VIRGL_CAP_TGSI_PRECISE | VIRGL_CAP_APP_TWEAK_SUPPORT;
-
-  /* If attribute isn't supported, assume 2048 which is the minimum allowed
-     by the specification. */
-  if (gles_ver >= 31)
-    glGetIntegerv(GL_MAX_VERTEX_ATTRIB_STRIDE,
-                  (GLint *)&caps->v2.max_vertex_attrib_stride);
-  else
-    caps->v2.max_vertex_attrib_stride = 2048;
-
-  if (has_feature(feat_compute_shader)) {
-    glGetIntegerv(GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS,
-                  (GLint *)&caps->v2.max_compute_work_group_invocations);
-    glGetIntegerv(GL_MAX_COMPUTE_SHARED_MEMORY_SIZE,
-                  (GLint *)&caps->v2.max_compute_shared_memory_size);
-    glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0,
-                    (GLint *)&caps->v2.max_compute_grid_size[0]);
-    glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1,
-                    (GLint *)&caps->v2.max_compute_grid_size[1]);
-    glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 2,
-                    (GLint *)&caps->v2.max_compute_grid_size[2]);
-    glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_SIZE, 0,
-                    (GLint *)&caps->v2.max_compute_block_size[0]);
-    glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_SIZE, 1,
-                    (GLint *)&caps->v2.max_compute_block_size[1]);
-    glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_SIZE, 2,
-                    (GLint *)&caps->v2.max_compute_block_size[2]);
-
-    caps->v2.capability_bits |= VIRGL_CAP_COMPUTE_SHADER;
-  }
-
-  if (has_feature(feat_atomic_counters)) {
-    glGetIntegerv(GL_MAX_VERTEX_ATOMIC_COUNTERS,
-                  (GLint *)(caps->v2.max_atomic_counters + PIPE_SHADER_VERTEX));
-    glGetIntegerv(
-        GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS,
-        (GLint *)(caps->v2.max_atomic_counter_buffers + PIPE_SHADER_VERTEX));
-    glGetIntegerv(
-        GL_MAX_FRAGMENT_ATOMIC_COUNTERS,
-        (GLint *)(caps->v2.max_atomic_counters + PIPE_SHADER_FRAGMENT));
-    glGetIntegerv(
-        GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS,
-        (GLint *)(caps->v2.max_atomic_counter_buffers + PIPE_SHADER_FRAGMENT));
-
-    if (has_feature(feat_geometry_shader)) {
-      glGetIntegerv(
-          GL_MAX_GEOMETRY_ATOMIC_COUNTERS,
-          (GLint *)(caps->v2.max_atomic_counters + PIPE_SHADER_GEOMETRY));
-      glGetIntegerv(GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS,
-                    (GLint *)(caps->v2.max_atomic_counter_buffers +
-                              PIPE_SHADER_GEOMETRY));
-    }
-
-    if (has_feature(feat_tessellation)) {
-      glGetIntegerv(
-          GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS,
-          (GLint *)(caps->v2.max_atomic_counters + PIPE_SHADER_TESS_CTRL));
-      glGetIntegerv(GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS,
-                    (GLint *)(caps->v2.max_atomic_counter_buffers +
-                              PIPE_SHADER_TESS_CTRL));
-      glGetIntegerv(
-          GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS,
-          (GLint *)(caps->v2.max_atomic_counters + PIPE_SHADER_TESS_EVAL));
-      glGetIntegerv(GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS,
-                    (GLint *)(caps->v2.max_atomic_counter_buffers +
-                              PIPE_SHADER_TESS_EVAL));
-    }
-
-    if (has_feature(feat_compute_shader)) {
-      glGetIntegerv(
-          GL_MAX_COMPUTE_ATOMIC_COUNTERS,
-          (GLint *)(caps->v2.max_atomic_counters + PIPE_SHADER_COMPUTE));
-      glGetIntegerv(
-          GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS,
-          (GLint *)(caps->v2.max_atomic_counter_buffers + PIPE_SHADER_COMPUTE));
-    }
-
-    glGetIntegerv(GL_MAX_COMBINED_ATOMIC_COUNTERS,
-                  (GLint *)&caps->v2.max_combined_atomic_counters);
-    glGetIntegerv(GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS,
-                  (GLint *)&caps->v2.max_combined_atomic_counter_buffers);
-  }
-
-  if (has_feature(feat_fb_no_attach))
-    caps->v2.capability_bits |= VIRGL_CAP_FB_NO_ATTACH;
-
-  if (has_feature(feat_barrier))
-    caps->v2.capability_bits |= VIRGL_CAP_MEMORY_BARRIER;
-
-  if (has_feature(feat_copy_image))
-    caps->v2.capability_bits |= VIRGL_CAP_COPY_IMAGE;
-
-  if (has_feature(feat_robust_buffer_access))
-    caps->v2.capability_bits |= VIRGL_CAP_ROBUST_BUFFER_ACCESS;
-
-  if (has_feature(feat_framebuffer_fetch))
-    caps->v2.capability_bits |= VIRGL_CAP_TGSI_FBFETCH;
-
-  if (has_feature(feat_srgb_write_control))
-    caps->v2.capability_bits |= VIRGL_CAP_SRGB_WRITE_CONTROL;
-
-  /* always enable, only indicates that the CMD is supported */
-  caps->v2.capability_bits |= VIRGL_CAP_GUEST_MAY_INIT_LOG;
-
-  caps->v2.capability_bits |= VIRGL_CAP_TRANSFER;
-
-  if (vrend_check_framebuffer_mixed_color_attachements())
-    caps->v2.capability_bits |= VIRGL_CAP_FBO_MIXED_COLOR_FORMATS;
-
-  /* We want to expose ARB_gpu_shader_fp64 when running on top of ES */
-  caps->v2.capability_bits |= VIRGL_CAP_FAKE_FP64;
-  caps->v2.capability_bits |= VIRGL_CAP_BGRA_SRGB_IS_EMULATED;
-
-  if (has_feature(feat_indirect_draw))
-    caps->v2.capability_bits |= VIRGL_CAP_BIND_COMMAND_ARGS;
-
-  for (int i = 0; i < VIRGL_FORMAT_MAX; i++) {
-    enum virgl_formats fmt = (enum virgl_formats)i;
-    if (tex_conv_table[i].internalformat != 0) {
-      if (vrend_format_can_readback(fmt))
-        set_format_bit(&caps->v2.supported_readback_formats, fmt);
-    }
-
-    set_format_bit(&caps->v2.scanout, fmt);
-  }
-
-  if (has_feature(feat_clip_control))
-    caps->v2.capability_bits |= VIRGL_CAP_CLIP_HALFZ;
-
-  if (vrend_has_gl_extension("GL_KHR_texture_compression_astc_sliced_3d"))
-    caps->v2.capability_bits |= VIRGL_CAP_3D_ASTC;
-
-  caps->v2.capability_bits |= VIRGL_CAP_INDIRECT_INPUT_ADDR;
-
-  caps->v2.capability_bits |= VIRGL_CAP_COPY_TRANSFER;
-}
-
-void vrend_renderer_fill_caps(struct virgl_client *client, uint32_t set,
-                              UNUSED uint32_t version, union virgl_caps *caps) {
-  int gles_ver;
-  GLenum err;
-  bool fill_capset2 = false;
-
-  if (!caps)
-    return;
-
-  if (set > 2) {
-    caps->max_version = 0;
-    return;
-  }
-
-  if (set == 1) {
-    memset(caps, 0, sizeof(struct virgl_caps_v1));
-    caps->max_version = 1;
-  } else if (set == 2) {
-    memset(caps, 0, sizeof(*caps));
-    caps->max_version = 2;
-    fill_capset2 = true;
-  }
-
-  gles_ver = vrend_gl_version();
-
-  vrend_fill_caps_glsl_version(gles_ver, caps);
-
-  vrend_renderer_fill_caps_v1(client, gles_ver, caps);
-
-  if (!fill_capset2)
-    return;
-
-  vrend_renderer_fill_caps_v2(client, gles_ver, caps);
-}
-
-void vrend_renderer_force_ctx_0(struct virgl_client *client) {
-  struct vrend_context *ctx0 = vrend_lookup_renderer_ctx(client, 0);
-  client->vrend_state->current_ctx = NULL;
-  client->vrend_state->current_hw_ctx = NULL;
-  vrend_hw_switch_context(ctx0, true);
-}
-
-void vrend_renderer_attach_res_ctx(struct virgl_client *client, int ctx_id,
-                                   int resource_id) {
-  struct vrend_context *ctx = vrend_lookup_renderer_ctx(client, ctx_id);
-  struct vrend_resource *res;
-
-  if (!ctx)
-    return;
-
-  res = vrend_resource_lookup(client, resource_id, 0);
-  if (!res)
-    return;
-
-  vrend_object_insert_nofree(ctx->res_hash, res, sizeof(*res), resource_id, 1,
-                             false);
-}
-
-static void vrend_renderer_detach_res_ctx(struct vrend_context *ctx,
-                                          int res_handle) {
-  struct vrend_resource *res;
-  res = vrend_object_lookup(ctx->res_hash, res_handle, 1);
-  if (!res)
-    return;
-
-  vrend_object_remove(ctx->res_hash, res_handle, 1);
-}
-
-struct vrend_resource *vrend_renderer_ctx_res_lookup(struct vrend_context *ctx,
-                                                     int res_handle) {
-  struct vrend_resource *res =
-      vrend_object_lookup(ctx->res_hash, res_handle, 1);
-
-  return res;
-}
-
-void vrend_renderer_get_cap_set(uint32_t cap_set, uint32_t *max_ver,
-                                uint32_t *max_size) {
-  switch (cap_set) {
-  case VREND_CAP_SET:
-    *max_ver = 1;
-    *max_size = sizeof(struct virgl_caps_v1);
-    break;
-  case VREND_CAP_SET2:
-    /* we should never need to increase this - it should be possible to just
-     * grow virgl_caps */
-    *max_ver = 2;
-    *max_size = sizeof(struct virgl_caps_v2);
-    break;
-  default:
-    *max_ver = 0;
-    *max_size = 0;
-    break;
-  }
-}
-
-void vrend_renderer_create_sub_ctx(struct vrend_context *ctx, int sub_ctx_id) {
-  struct vrend_sub_context *sub;
-  GLuint i;
-
-  LIST_FOR_EACH_ENTRY(sub, &ctx->sub_ctxs, head) {
-    if (sub->sub_ctx_id == sub_ctx_id) {
-      return;
-    }
-  }
-
-  sub = CALLOC_STRUCT(vrend_sub_context);
-  if (!sub)
-    return;
-
-  sub->gl_context = vrend_clicbs->create_gl_context(ctx->client);
-  vrend_clicbs->make_current(ctx->client, sub->gl_context);
-
-  sub->sub_ctx_id = sub_ctx_id;
-
-  /* initialize the depth far_val to 1 */
-  for (i = 0; i < PIPE_MAX_VIEWPORTS; i++) {
-    sub->vps[i].far_val = 1.0;
-  }
-
-  if (!has_feature(feat_gles31_vertex_attrib_binding)) {
-    glGenVertexArrays(1, &sub->vaoid);
-    glBindVertexArray(sub->vaoid);
-  }
-
-  glGenFramebuffers(1, &sub->fb_id);
-  glGenFramebuffers(2, sub->blit_fb_ids);
-
-  list_inithead(&sub->programs);
-  list_inithead(&sub->streamout_list);
-
-  sub->object_hash = vrend_object_init_ctx_table();
-
-  ctx->sub = sub;
-  list_add(&sub->head, &ctx->sub_ctxs);
-  if (sub_ctx_id == 0)
-    ctx->sub0 = sub;
-}
-
-void vrend_renderer_destroy_sub_ctx(struct vrend_context *ctx, int sub_ctx_id) {
-  struct vrend_sub_context *sub, *tofree = NULL;
-
-  /* never destroy sub context id 0 */
-  if (sub_ctx_id == 0)
-    return;
-
-  LIST_FOR_EACH_ENTRY(sub, &ctx->sub_ctxs, head) {
-    if (sub->sub_ctx_id == sub_ctx_id) {
-      tofree = sub;
-    }
-  }
-
-  if (tofree) {
-    if (ctx->sub == tofree) {
-      ctx->sub = ctx->sub0;
-      vrend_clicbs->make_current(ctx->client, ctx->sub->gl_context);
-    }
-    vrend_destroy_sub_context(ctx->client, tofree);
-  }
-}
-
-void vrend_renderer_set_sub_ctx(struct vrend_context *ctx, int sub_ctx_id) {
-  struct vrend_sub_context *sub;
-  /* find the sub ctx */
-
-  if (ctx->sub && ctx->sub->sub_ctx_id == sub_ctx_id)
-    return;
-
-  LIST_FOR_EACH_ENTRY(sub, &ctx->sub_ctxs, head) {
-    if (sub->sub_ctx_id == sub_ctx_id) {
-      ctx->sub = sub;
-      vrend_clicbs->make_current(ctx->client, sub->gl_context);
-      break;
-    }
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_renderer.h b/app/src/main/cpp/virglrenderer/src/vrend_renderer.h
deleted file mode 100644
index 1f9e9d84e..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_renderer.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#ifndef VREND_RENDERER_H
-#define VREND_RENDERER_H
-
-#include "os/os_thread.h"
-#include "pipe/p_state.h"
-#include "util/u_double_list.h"
-#include "util/u_inlines.h"
-
-#include "virgl_hw.h"
-#include "virgl_protocol.h"
-#include "vrend_iov.h"
-#include "vrend_util.h"
-
-typedef void *virgl_gl_context;
-
-struct vrend_context;
-struct virgl_client;
-
-/* Number of mipmap levels for which to keep the backing iov offsets.
- * Value mirrored from mesa/virgl
- */
-#define VR_MAX_TEXTURE_2D_LEVELS 15
-
-#define VREND_MAX_CTX 64
-
-#define VREND_STORAGE_GUEST_MEMORY BIT(0)
-#define VREND_STORAGE_GL_TEXTURE BIT(1)
-#define VREND_STORAGE_GL_BUFFER BIT(2)
-#define VREND_STORAGE_HOST_SYSTEM_MEMORY BIT(3)
-#define VREND_STORAGE_GL_IMMUTABLE BIT(4)
-
-struct vrend_resource {
-  struct pipe_resource base;
-  uint32_t storage_bits;
-
-  GLuint id;
-  GLenum target;
-
-  /* fb id if we need to readback this resource */
-  GLuint readback_fb_id;
-  GLuint readback_fb_level;
-  GLuint readback_fb_z;
-
-  GLuint tbo_tex_id; /* tbos have two ids to track */
-  bool y_0_top;
-
-  GLuint handle;
-
-  void *priv;
-  /* Pointer to system memory storage for this resource. Only valid for
-   * VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM buffer storage.
-   */
-  char *ptr;
-  /* IOV pointing to shared guest memory storage for this resource. */
-  struct iovec *iov;
-  uint32_t num_iovs;
-  uint64_t mipmap_offsets[VR_MAX_TEXTURE_2D_LEVELS];
-};
-
-#define VIRGL_TEXTURE_NEED_SWIZZLE (1 << 0)
-#define VIRGL_TEXTURE_CAN_TEXTURE_STORAGE (1 << 1)
-#define VIRGL_TEXTURE_CAN_READBACK (1 << 2)
-
-struct vrend_format_table {
-  enum virgl_formats format;
-  GLenum internalformat;
-  GLenum glformat;
-  GLenum gltype;
-  uint8_t swizzle[4];
-  uint32_t bindings;
-  uint32_t flags;
-};
-
-struct vrend_if_cbs {
-  void (*write_fence)(struct virgl_client *client, unsigned fence_id);
-  virgl_gl_context (*create_gl_context)(struct virgl_client *client);
-  void (*destroy_gl_context)(struct virgl_client *client, virgl_gl_context ctx);
-  int (*make_current)(struct virgl_client *client, virgl_gl_context ctx);
-};
-
-struct vrend_state {
-  struct vrend_context *current_ctx;
-  struct vrend_context *current_hw_ctx;
-  struct list_head waiting_query_list;
-
-  /* these appeared broken on at least one driver */
-  bool use_explicit_locations;
-  uint32_t max_draw_buffers;
-  uint32_t max_texture_2d_size;
-  uint32_t max_texture_3d_size;
-  uint32_t max_texture_cube_size;
-  struct list_head active_ctx_list;
-
-  struct list_head fence_list;
-  struct list_head fence_wait_list;
-
-  /* Needed on GLES to inject a TCS */
-  float tess_factors[6];
-};
-
-int vrend_renderer_init(struct virgl_client *client, struct vrend_if_cbs *cbs);
-
-void vrend_insert_format(struct vrend_format_table *entry, uint32_t bindings,
-                         uint32_t flags);
-bool vrend_check_framebuffer_mixed_color_attachements(void);
-
-void vrend_insert_format_swizzle(int override_format,
-                                 struct vrend_format_table *entry,
-                                 uint32_t bindings, uint8_t swizzle[4],
-                                 uint32_t flags);
-const struct vrend_format_table *
-vrend_get_format_table_entry(enum virgl_formats format);
-
-int vrend_create_shader(struct vrend_context *ctx, uint32_t handle,
-                        const struct pipe_stream_output_info *stream_output,
-                        uint32_t req_local_mem, const char *shd_text,
-                        uint32_t offlen, uint32_t num_tokens, uint32_t type,
-                        uint32_t pkt_length);
-
-void vrend_bind_shader(struct vrend_context *ctx, uint32_t type,
-                       uint32_t handle);
-
-void vrend_clear(struct vrend_context *ctx, unsigned buffers,
-                 const union pipe_color_union *color, double depth,
-                 unsigned stencil);
-
-int vrend_draw_vbo(struct vrend_context *ctx, const struct pipe_draw_info *info,
-                   uint32_t cso, uint32_t indirect_handle,
-                   uint32_t indirect_draw_count_handle);
-
-void vrend_set_framebuffer_state(struct vrend_context *ctx, uint32_t nr_cbufs,
-                                 uint32_t surf_handle[PIPE_MAX_COLOR_BUFS],
-                                 uint32_t zsurf_handle);
-
-struct vrend_context *vrend_create_context(struct virgl_client *client, int id);
-bool vrend_destroy_context(struct vrend_context *ctx);
-int vrend_renderer_context_create(struct virgl_client *client, uint32_t handle);
-void vrend_renderer_context_create_internal(struct virgl_client *client,
-                                            uint32_t handle);
-void vrend_renderer_context_destroy(struct virgl_client *client,
-                                    uint32_t handle);
-
-struct vrend_renderer_resource_create_args {
-  uint32_t handle;
-  enum pipe_texture_target target;
-  uint32_t format;
-  uint32_t bind;
-  uint32_t width;
-  uint32_t height;
-  uint32_t depth;
-  uint32_t array_size;
-  uint32_t last_level;
-  uint32_t nr_samples;
-  uint32_t flags;
-};
-
-int vrend_renderer_resource_create(
-    struct virgl_client *client,
-    struct vrend_renderer_resource_create_args *args, struct iovec *iov,
-    uint32_t num_iovs);
-void vrend_renderer_resource_unref(struct virgl_client *client,
-                                   uint32_t handle);
-
-int vrend_create_surface(struct vrend_context *ctx, uint32_t handle,
-                         uint32_t res_handle, uint32_t format, uint32_t val0,
-                         uint32_t val1);
-int vrend_create_sampler_view(struct vrend_context *ctx, uint32_t handle,
-                              uint32_t res_handle, uint32_t format,
-                              uint32_t val0, uint32_t val1,
-                              uint32_t swizzle_packed);
-
-int vrend_create_sampler_state(struct vrend_context *ctx, uint32_t handle,
-                               struct pipe_sampler_state *templ);
-
-int vrend_create_so_target(struct vrend_context *ctx, uint32_t handle,
-                           uint32_t res_handle, uint32_t buffer_offset,
-                           uint32_t buffer_size);
-
-void vrend_set_streamout_targets(struct vrend_context *ctx,
-                                 uint32_t append_bitmask, uint32_t num_targets,
-                                 uint32_t *handles);
-
-int vrend_create_vertex_elements_state(
-    struct vrend_context *ctx, uint32_t handle, unsigned num_elements,
-    const struct pipe_vertex_element *elements);
-void vrend_bind_vertex_elements_state(struct vrend_context *ctx,
-                                      uint32_t handle);
-
-void vrend_set_single_vbo(struct vrend_context *ctx, uint32_t index,
-                          uint32_t stride, uint32_t buffer_offset,
-                          uint32_t res_handle);
-void vrend_set_num_vbo(struct vrend_context *ctx, int num_vbo);
-
-int vrend_transfer_inline_write(struct vrend_context *ctx,
-                                struct vrend_transfer_info *info);
-
-int vrend_renderer_copy_transfer3d(struct vrend_context *ctx,
-                                   struct vrend_transfer_info *info,
-                                   uint32_t src_handle);
-
-void vrend_set_viewport_states(struct vrend_context *ctx, uint32_t start_slot,
-                               uint32_t num_viewports,
-                               const struct pipe_viewport_state *state);
-void vrend_set_num_sampler_views(struct vrend_context *ctx,
-                                 uint32_t shader_type, uint32_t start_slot,
-                                 uint32_t num_sampler_views);
-void vrend_set_single_sampler_view(struct vrend_context *ctx,
-                                   uint32_t shader_type, uint32_t index,
-                                   uint32_t res_handle);
-
-void vrend_object_bind_blend(struct vrend_context *ctx, uint32_t handle);
-void vrend_object_bind_dsa(struct vrend_context *ctx, uint32_t handle);
-void vrend_object_bind_rasterizer(struct vrend_context *ctx, uint32_t handle);
-
-void vrend_bind_sampler_states(struct vrend_context *ctx, uint32_t shader_type,
-                               uint32_t start_slot, uint32_t num_states,
-                               uint32_t *handles);
-void vrend_set_index_buffer(struct vrend_context *ctx, uint32_t res_handle,
-                            uint32_t index_size, uint32_t offset);
-void vrend_set_single_image_view(struct vrend_context *ctx,
-                                 uint32_t shader_type, uint32_t index,
-                                 uint32_t format, uint32_t access,
-                                 uint32_t layer_offset, uint32_t level_size,
-                                 uint32_t handle);
-void vrend_set_single_ssbo(struct vrend_context *ctx, uint32_t shader_type,
-                           uint32_t index, uint32_t offset, uint32_t length,
-                           uint32_t handle);
-void vrend_set_single_abo(struct vrend_context *ctx, uint32_t index,
-                          uint32_t offset, uint32_t length, uint32_t handle);
-void vrend_memory_barrier(struct vrend_context *ctx, unsigned flags);
-void vrend_launch_grid(struct vrend_context *ctx, uint32_t *block,
-                       uint32_t *grid, uint32_t indirect_handle,
-                       uint32_t indirect_offset);
-void vrend_set_framebuffer_state_no_attach(struct vrend_context *ctx,
-                                           uint32_t width, uint32_t height,
-                                           uint32_t layers, uint32_t samples);
-
-int vrend_renderer_transfer_iov(struct virgl_client *client,
-                                const struct vrend_transfer_info *info,
-                                int transfer_mode);
-
-void vrend_renderer_resource_copy_region(
-    struct vrend_context *ctx, uint32_t dst_handle, uint32_t dst_level,
-    uint32_t dstx, uint32_t dsty, uint32_t dstz, uint32_t src_handle,
-    uint32_t src_level, const struct pipe_box *src_box);
-
-void vrend_renderer_blit(struct vrend_context *ctx, uint32_t dst_handle,
-                         uint32_t src_handle,
-                         const struct pipe_blit_info *info);
-
-void vrend_set_stencil_ref(struct vrend_context *ctx,
-                           struct pipe_stencil_ref *ref);
-void vrend_set_blend_color(struct vrend_context *ctx,
-                           struct pipe_blend_color *color);
-void vrend_set_scissor_state(struct vrend_context *ctx, uint32_t start_slot,
-                             uint32_t num_scissor,
-                             struct pipe_scissor_state *ss);
-
-void vrend_set_polygon_stipple(struct vrend_context *ctx,
-                               struct pipe_poly_stipple *ps);
-
-void vrend_set_clip_state(struct vrend_context *ctx,
-                          struct pipe_clip_state *ucp);
-void vrend_set_sample_mask(struct vrend_context *ctx, unsigned sample_mask);
-void vrend_set_min_samples(struct vrend_context *ctx, unsigned min_samples);
-
-void vrend_set_constants(struct vrend_context *ctx, uint32_t shader,
-                         uint32_t index, uint32_t num_constant, float *data);
-
-void vrend_set_uniform_buffer(struct vrend_context *ctx, uint32_t shader,
-                              uint32_t index, uint32_t offset, uint32_t length,
-                              uint32_t res_handle);
-
-void vrend_fb_bind_texture_id(struct vrend_resource *res, int id, int idx,
-                              uint32_t level, uint32_t layer);
-
-void vrend_set_tess_state(struct vrend_context *ctx,
-                          const float tess_factors[6]);
-
-void vrend_renderer_fini(struct virgl_client *client);
-
-int vrend_decode_block(struct virgl_client *client, uint32_t ctx_id,
-                       uint32_t *block, int ndw);
-struct vrend_context *vrend_lookup_renderer_ctx(struct virgl_client *client,
-                                                uint32_t ctx_id);
-
-int vrend_renderer_create_fence(struct virgl_client *client,
-                                int client_fence_id, uint32_t ctx_id);
-
-void vrend_renderer_check_fences(struct virgl_client *client);
-
-bool vrend_hw_switch_context(struct vrend_context *ctx, bool now);
-uint32_t vrend_renderer_object_insert(struct vrend_context *ctx, void *data,
-                                      uint32_t size, uint32_t handle,
-                                      enum virgl_object_type type);
-void vrend_renderer_object_destroy(struct vrend_context *ctx, uint32_t handle);
-
-int vrend_create_query(struct vrend_context *ctx, uint32_t handle,
-                       uint32_t query_type, uint32_t query_index,
-                       uint32_t res_handle, uint32_t offset);
-
-int vrend_begin_query(struct vrend_context *ctx, uint32_t handle);
-int vrend_end_query(struct vrend_context *ctx, uint32_t handle);
-void vrend_get_query_result(struct vrend_context *ctx, uint32_t handle,
-                            uint32_t wait);
-
-void vrend_renderer_fill_caps(struct virgl_client *client, uint32_t set,
-                              uint32_t version, union virgl_caps *caps);
-
-void vrend_build_format_list(void);
-void vrend_check_texture_storage(struct vrend_format_table *table);
-
-int vrend_renderer_resource_attach_iov(struct virgl_client *client,
-                                       int res_handle, struct iovec *iov,
-                                       int num_iovs);
-void vrend_renderer_resource_detach_iov(struct virgl_client *client,
-                                        int res_handle, struct iovec **iov_p,
-                                        int *num_iovs_p);
-void vrend_renderer_resource_destroy(struct vrend_resource *res);
-
-static inline void vrend_resource_reference(struct vrend_resource **ptr,
-                                            struct vrend_resource *tex) {
-  struct vrend_resource *old_tex = *ptr;
-
-  if (pipe_reference(&(*ptr)->base.reference, &tex->base.reference))
-    vrend_renderer_resource_destroy(old_tex);
-  *ptr = tex;
-}
-
-void vrend_renderer_force_ctx_0(struct virgl_client *client);
-
-void vrend_renderer_attach_res_ctx(struct virgl_client *client, int ctx_id,
-                                   int resource_id);
-
-struct vrend_resource *vrend_renderer_ctx_res_lookup(struct vrend_context *ctx,
-                                                     int res_handle);
-
-#define VREND_CAP_SET 1
-#define VREND_CAP_SET2 2
-
-void vrend_renderer_get_cap_set(uint32_t cap_set, uint32_t *max_ver,
-                                uint32_t *max_size);
-
-void vrend_renderer_create_sub_ctx(struct vrend_context *ctx, int sub_ctx_id);
-void vrend_renderer_destroy_sub_ctx(struct vrend_context *ctx, int sub_ctx_id);
-void vrend_renderer_set_sub_ctx(struct vrend_context *ctx, int sub_ctx_id);
-
-void vrend_fb_bind_texture(struct vrend_resource *res, int idx, uint32_t level,
-                           uint32_t layer);
-boolean format_is_copy_compatible(enum virgl_formats src,
-                                  enum virgl_formats dst,
-                                  boolean allow_compressed);
-
-/* blitter interface */
-void vrend_renderer_blit_gl(
-    struct virgl_client *client, struct vrend_resource *src_res,
-    struct vrend_resource *dst_res, GLenum blit_views[2],
-    const struct pipe_blit_info *info, bool has_texture_srgb_decode,
-    bool has_srgb_write_control, bool skip_dest_swizzle);
-void vrend_blitter_fini(struct virgl_client *client);
-
-void vrend_decode_reset(struct virgl_client *client, bool ctx_0_only);
-
-unsigned vrend_renderer_query_multisample_caps(unsigned max_samples,
-                                               struct virgl_caps_v2 *caps);
-
-extern struct vrend_if_cbs *vrend_clicbs;
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_shader.c b/app/src/main/cpp/virglrenderer/src/vrend_shader.c
deleted file mode 100644
index 0b3b4c936..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_shader.c
+++ /dev/null
@@ -1,7139 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#include "vrend_shader.h"
-#include "tgsi/tgsi_info.h"
-#include "tgsi/tgsi_iterate.h"
-#include "tgsi/tgsi_scan.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-#include <errno.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "vrend_strbuf.h"
-#include "vrend_util.h"
-
-/* start convert of tgsi to glsl */
-
-#define INTERP_PREFIX "                           "
-#define INVARI_PREFIX "invariant"
-
-#define SHADER_REQ_NONE 0
-#define SHADER_REQ_SAMPLER_RECT (1 << 0)
-#define SHADER_REQ_CUBE_ARRAY (1 << 1)
-#define SHADER_REQ_INTS (1 << 2)
-#define SHADER_REQ_SAMPLER_MS (1 << 3)
-#define SHADER_REQ_INSTANCE_ID (1 << 4)
-#define SHADER_REQ_LODQ (1 << 5)
-#define SHADER_REQ_TXQ_LEVELS (1 << 6)
-#define SHADER_REQ_TG4 (1 << 7)
-#define SHADER_REQ_VIEWPORT_IDX (1 << 8)
-#define SHADER_REQ_STENCIL_EXPORT (1 << 9)
-#define SHADER_REQ_LAYER (1 << 10)
-#define SHADER_REQ_SAMPLE_SHADING (1 << 11)
-#define SHADER_REQ_GPU_SHADER5 (1 << 12)
-#define SHADER_REQ_DERIVATIVE_CONTROL (1 << 13)
-#define SHADER_REQ_FP64 (1 << 14)
-#define SHADER_REQ_IMAGE_LOAD_STORE (1 << 15)
-#define SHADER_REQ_ES31_COMPAT (1 << 16)
-#define SHADER_REQ_IMAGE_SIZE (1 << 17)
-#define SHADER_REQ_TXQS (1 << 18)
-#define SHADER_REQ_FBFETCH (1 << 19)
-#define SHADER_REQ_SHADER_CLOCK (1 << 20)
-#define SHADER_REQ_PSIZE (1 << 21)
-#define SHADER_REQ_IMAGE_ATOMIC (1 << 22)
-#define SHADER_REQ_CLIP_DISTANCE (1 << 23)
-#define SHADER_REQ_ENHANCED_LAYOUTS (1 << 24)
-#define SHADER_REQ_SEPERATE_SHADER_OBJECTS (1 << 25)
-#define SHADER_REQ_ARRAYS_OF_ARRAYS (1 << 26)
-#define SHADER_REQ_SHADER_INTEGER_FUNC (1 << 27)
-#define SHADER_REQ_SHADER_ATOMIC_FLOAT (1 << 28)
-#define SHADER_REQ_NV_IMAGE_FORMATS (1 << 29)
-#define SHADER_REQ_CONSERVATIVE_DEPTH (1 << 30)
-#define SHADER_REQ_SAMPLER_BUF (1 << 31)
-
-#define FRONT_COLOR_EMITTED (1 << 0)
-#define BACK_COLOR_EMITTED (1 << 1);
-
-struct vrend_shader_io {
-  unsigned name;
-  unsigned done;
-  int sid;
-  unsigned interpolate;
-  int first;
-  int last;
-  int array_id;
-  uint8_t usage_mask;
-  int swizzle_offset;
-  int num_components;
-  int layout_location;
-  unsigned location;
-  bool invariant;
-  bool precise;
-  bool glsl_predefined_no_emit;
-  bool glsl_no_index;
-  bool glsl_gl_block;
-  bool override_no_wm;
-  bool is_int;
-  bool fbfetch_used;
-  char glsl_name[128];
-  unsigned stream;
-};
-
-struct vrend_shader_sampler {
-  int tgsi_sampler_type;
-  enum tgsi_return_type tgsi_sampler_return;
-};
-
-struct vrend_shader_table {
-  uint32_t key;
-  const char *string;
-};
-
-struct vrend_shader_image {
-  struct tgsi_declaration_image decl;
-  enum tgsi_return_type image_return;
-  bool vflag;
-};
-
-#define MAX_IMMEDIATE 1024
-struct immed {
-  int type;
-  union imm {
-    uint32_t ui;
-    int32_t i;
-    float f;
-  } val[4];
-};
-
-struct vrend_temp_range {
-  int first;
-  int last;
-  int array_id;
-};
-
-struct vrend_io_range {
-  struct vrend_shader_io io;
-  bool used;
-};
-
-struct dump_ctx {
-  struct tgsi_iterate_context iter;
-  struct vrend_shader_cfg *cfg;
-  struct tgsi_shader_info info;
-  int prog_type;
-  int size;
-  struct vrend_strbuf glsl_main;
-  int indent_level;
-  struct vrend_strbuf glsl_hdr;
-  struct vrend_strbuf glsl_ver_ext;
-  uint instno;
-
-  struct vrend_strbuf src_bufs[4];
-
-  uint32_t num_interps;
-  uint32_t num_inputs;
-  uint32_t attrib_input_mask;
-  struct vrend_shader_io inputs[64];
-  uint32_t num_outputs;
-  struct vrend_shader_io outputs[64];
-  uint8_t front_back_color_emitted_flags[64];
-  uint32_t num_system_values;
-  struct vrend_shader_io system_values[32];
-
-  bool guest_sent_io_arrays;
-  struct vrend_io_range generic_input_range;
-  struct vrend_io_range patch_input_range;
-  struct vrend_io_range generic_output_range;
-  struct vrend_io_range patch_output_range;
-
-  uint32_t generic_outputs_expected_mask;
-  uint32_t generic_inputs_emitted_mask;
-  uint32_t generic_outputs_emitted_mask;
-
-  uint32_t num_temp_ranges;
-  struct vrend_temp_range *temp_ranges;
-
-  struct vrend_shader_sampler samplers[32];
-  uint32_t samplers_used;
-
-  uint32_t ssbo_used_mask;
-  uint32_t ssbo_atomic_mask;
-  uint32_t ssbo_array_base;
-  uint32_t ssbo_atomic_array_base;
-  uint32_t ssbo_integer_mask;
-  uint8_t ssbo_memory_qualifier[32];
-
-  struct vrend_shader_image images[32];
-  uint32_t images_used_mask;
-
-  struct vrend_array *image_arrays;
-  uint32_t num_image_arrays;
-
-  struct vrend_array *sampler_arrays;
-  uint32_t num_sampler_arrays;
-
-  int num_consts;
-  int num_imm;
-  struct immed imm[MAX_IMMEDIATE];
-
-  uint32_t req_local_mem;
-  bool integer_memory;
-
-  uint32_t ubo_base;
-  uint32_t ubo_used_mask;
-  int ubo_sizes[32];
-  uint32_t num_address;
-
-  uint32_t num_abo;
-  int abo_idx[32];
-  int abo_sizes[32];
-  int abo_offsets[32];
-
-  uint32_t shader_req_bits;
-
-  struct pipe_stream_output_info *so;
-  char **so_names;
-  bool write_so_outputs[PIPE_MAX_SO_OUTPUTS];
-  bool write_all_cbufs;
-  uint32_t shadow_samp_mask;
-
-  int fs_coord_origin, fs_pixel_center;
-  int fs_depth_layout;
-
-  int gs_in_prim, gs_out_prim, gs_max_out_verts;
-  int gs_num_invocations;
-
-  struct vrend_shader_key *key;
-  int num_in_clip_dist;
-  int num_clip_dist;
-  int fs_uses_clipdist_input;
-  int glsl_ver_required;
-  int color_in_mask;
-  /* only used when cull is enabled */
-  uint8_t num_cull_dist_prop, num_clip_dist_prop;
-  bool front_face_emitted;
-
-  bool has_clipvertex;
-  bool has_clipvertex_so;
-  bool vs_has_pervertex;
-  bool write_mul_utemp;
-  bool write_mul_itemp;
-  bool has_sample_input;
-  bool early_depth_stencil;
-  bool has_file_memory;
-  bool force_color_two_side;
-  bool winsys_adjust_y_emitted;
-
-  int tcs_vertices_out;
-  int tes_prim_mode;
-  int tes_spacing;
-  int tes_vertex_order;
-  int tes_point_mode;
-
-  uint16_t local_cs_block_size[3];
-};
-
-enum vrend_type_qualifier {
-  TYPE_CONVERSION_NONE = 0,
-  FLOAT = 1,
-  VEC2 = 2,
-  VEC3 = 3,
-  VEC4 = 4,
-  INT = 5,
-  IVEC2 = 6,
-  IVEC3 = 7,
-  IVEC4 = 8,
-  UINT = 9,
-  UVEC2 = 10,
-  UVEC3 = 11,
-  UVEC4 = 12,
-  FLOAT_BITS_TO_UINT = 13,
-  UINT_BITS_TO_FLOAT = 14,
-  FLOAT_BITS_TO_INT = 15,
-  INT_BITS_TO_FLOAT = 16,
-  DOUBLE = 17,
-  DVEC2 = 18,
-};
-
-struct dest_info {
-  enum vrend_type_qualifier dtypeprefix;
-  enum vrend_type_qualifier dstconv;
-  enum vrend_type_qualifier udstconv;
-  enum vrend_type_qualifier idstconv;
-  bool dst_override_no_wm[2];
-};
-
-struct source_info {
-  enum vrend_type_qualifier svec4;
-  uint32_t sreg_index;
-  bool tg4_has_component;
-  bool override_no_wm[3];
-  bool override_no_cast[3];
-  int imm_value;
-};
-
-static const struct vrend_shader_table conversion_table[] = {
-    {TYPE_CONVERSION_NONE, ""},
-    {FLOAT, "float"},
-    {VEC2, "vec2"},
-    {VEC3, "vec3"},
-    {VEC4, "vec4"},
-    {INT, "int"},
-    {IVEC2, "ivec2"},
-    {IVEC3, "ivec3"},
-    {IVEC4, "ivec4"},
-    {UINT, "uint"},
-    {UVEC2, "uvec2"},
-    {UVEC3, "uvec3"},
-    {UVEC4, "uvec4"},
-    {FLOAT_BITS_TO_UINT, "floatBitsToUint"},
-    {UINT_BITS_TO_FLOAT, "uintBitsToFloat"},
-    {FLOAT_BITS_TO_INT, "floatBitsToInt"},
-    {INT_BITS_TO_FLOAT, "intBitsToFloat"},
-    {DOUBLE, "double"},
-    {DVEC2, "dvec2"},
-};
-
-enum io_type { io_in, io_out };
-
-/* We prefer arrays of arrays, but if this is not available then TCS, GEOM, and
- * TES inputs must be blocks, but FS input should not because interpolateAt*
- * doesn't support dereferencing block members. */
-static inline bool prefer_generic_io_block(struct dump_ctx *ctx,
-                                           enum io_type io) {
-  switch (ctx->prog_type) {
-  case TGSI_PROCESSOR_FRAGMENT:
-    return false;
-
-  case TGSI_PROCESSOR_TESS_CTRL:
-    return true;
-
-  case TGSI_PROCESSOR_TESS_EVAL:
-    return io == io_in ? true : (ctx->key->gs_present ? true : false);
-
-  case TGSI_PROCESSOR_GEOMETRY:
-    return io == io_in;
-
-  case TGSI_PROCESSOR_VERTEX:
-    if (io == io_in)
-      return false;
-    return (ctx->key->gs_present || ctx->key->tes_present);
-
-  default:
-    return false;
-  }
-}
-
-static inline const char *get_string(enum vrend_type_qualifier key) {
-  if (key >= ARRAY_SIZE(conversion_table))
-    return conversion_table[TYPE_CONVERSION_NONE].string;
-
-  return conversion_table[key].string;
-}
-
-static inline const char *get_wm_string(unsigned wm) {
-  switch (wm) {
-  case TGSI_WRITEMASK_NONE:
-    return "";
-  case TGSI_WRITEMASK_X:
-    return ".x";
-  case TGSI_WRITEMASK_XY:
-    return ".xy";
-  case TGSI_WRITEMASK_XYZ:
-    return ".xyz";
-  case TGSI_WRITEMASK_W:
-    return ".w";
-  default:
-    return "";
-  }
-}
-
-const char *get_internalformat_string(int virgl_format,
-                                      enum tgsi_return_type *stype);
-
-static inline const char *tgsi_proc_to_prefix(int shader_type) {
-  switch (shader_type) {
-  case TGSI_PROCESSOR_VERTEX:
-    return "vs";
-  case TGSI_PROCESSOR_FRAGMENT:
-    return "fs";
-  case TGSI_PROCESSOR_GEOMETRY:
-    return "gs";
-  case TGSI_PROCESSOR_TESS_CTRL:
-    return "tc";
-  case TGSI_PROCESSOR_TESS_EVAL:
-    return "te";
-  case TGSI_PROCESSOR_COMPUTE:
-    return "cs";
-  default:
-    return NULL;
-  };
-}
-
-static inline const char *prim_to_name(int prim) {
-  switch (prim) {
-  case PIPE_PRIM_POINTS:
-    return "points";
-  case PIPE_PRIM_LINES:
-    return "lines";
-  case PIPE_PRIM_LINE_STRIP:
-    return "line_strip";
-  case PIPE_PRIM_LINES_ADJACENCY:
-    return "lines_adjacency";
-  case PIPE_PRIM_TRIANGLES:
-    return "triangles";
-  case PIPE_PRIM_TRIANGLE_STRIP:
-    return "triangle_strip";
-  case PIPE_PRIM_TRIANGLES_ADJACENCY:
-    return "triangles_adjacency";
-  case PIPE_PRIM_QUADS:
-    return "quads";
-  default:
-    return "UNKNOWN";
-  };
-}
-
-static inline const char *prim_to_tes_name(int prim) {
-  switch (prim) {
-  case PIPE_PRIM_QUADS:
-    return "quads";
-  case PIPE_PRIM_TRIANGLES:
-    return "triangles";
-  case PIPE_PRIM_LINES:
-    return "isolines";
-  default:
-    return "UNKNOWN";
-  }
-}
-
-static const char *get_spacing_string(int spacing) {
-  switch (spacing) {
-  case PIPE_TESS_SPACING_FRACTIONAL_ODD:
-    return "fractional_odd_spacing";
-  case PIPE_TESS_SPACING_FRACTIONAL_EVEN:
-    return "fractional_even_spacing";
-  case PIPE_TESS_SPACING_EQUAL:
-  default:
-    return "equal_spacing";
-  }
-}
-
-static inline int gs_input_prim_to_size(int prim) {
-  switch (prim) {
-  case PIPE_PRIM_POINTS:
-    return 1;
-  case PIPE_PRIM_LINES:
-    return 2;
-  case PIPE_PRIM_LINES_ADJACENCY:
-    return 4;
-  case PIPE_PRIM_TRIANGLES:
-    return 3;
-  case PIPE_PRIM_TRIANGLES_ADJACENCY:
-    return 6;
-  default:
-    return -1;
-  };
-}
-
-static const char *get_stage_input_name_prefix(struct dump_ctx *ctx,
-                                               int processor) {
-  const char *name_prefix;
-  switch (processor) {
-  case TGSI_PROCESSOR_FRAGMENT:
-    if (ctx->key->gs_present)
-      name_prefix = "gso";
-    else if (ctx->key->tes_present)
-      name_prefix = "teo";
-    else
-      name_prefix = "vso";
-    break;
-  case TGSI_PROCESSOR_GEOMETRY:
-    if (ctx->key->tes_present)
-      name_prefix = "teo";
-    else
-      name_prefix = "vso";
-    break;
-  case TGSI_PROCESSOR_TESS_EVAL:
-    if (ctx->key->tcs_present)
-      name_prefix = "tco";
-    else
-      name_prefix = "vso";
-    break;
-  case TGSI_PROCESSOR_TESS_CTRL:
-    name_prefix = "vso";
-    break;
-  case TGSI_PROCESSOR_VERTEX:
-  default:
-    name_prefix = "in";
-    break;
-  }
-  return name_prefix;
-}
-
-static const char *get_stage_output_name_prefix(int processor) {
-  const char *name_prefix;
-  switch (processor) {
-  case TGSI_PROCESSOR_FRAGMENT:
-    name_prefix = "fsout";
-    break;
-  case TGSI_PROCESSOR_GEOMETRY:
-    name_prefix = "gso";
-    break;
-  case TGSI_PROCESSOR_VERTEX:
-    name_prefix = "vso";
-    break;
-  case TGSI_PROCESSOR_TESS_CTRL:
-    name_prefix = "tco";
-    break;
-  case TGSI_PROCESSOR_TESS_EVAL:
-    name_prefix = "teo";
-    break;
-  default:
-    name_prefix = "out";
-    break;
-  }
-  return name_prefix;
-}
-
-static void require_glsl_ver(struct dump_ctx *ctx, int glsl_ver) {
-  if (glsl_ver > ctx->glsl_ver_required)
-    ctx->glsl_ver_required = glsl_ver;
-}
-
-static void emit_indent(struct dump_ctx *ctx) {
-  if (ctx->indent_level > 0) {
-    /* very high levels of indentation doesn't improve readability */
-    int indent_level = MIN2(ctx->indent_level, 15);
-    char buf[16];
-    memset(buf, '\t', indent_level);
-    buf[indent_level] = '\0';
-    strbuf_append(&ctx->glsl_main, buf);
-  }
-}
-
-static void emit_buf(struct dump_ctx *ctx, const char *buf) {
-  emit_indent(ctx);
-  strbuf_append(&ctx->glsl_main, buf);
-}
-
-static void indent_buf(struct dump_ctx *ctx) { ctx->indent_level++; }
-
-static void outdent_buf(struct dump_ctx *ctx) {
-  if (ctx->indent_level <= 0) {
-    strbuf_set_error(&ctx->glsl_main);
-    return;
-  }
-  ctx->indent_level--;
-}
-
-static void set_buf_error(struct dump_ctx *ctx) {
-  strbuf_set_error(&ctx->glsl_main);
-}
-
-__attribute__((format(printf, 2, 3))) static void
-emit_buff(struct dump_ctx *ctx, const char *fmt, ...) {
-  va_list va;
-  va_start(va, fmt);
-  emit_indent(ctx);
-  strbuf_vappendf(&ctx->glsl_main, fmt, va);
-  va_end(va);
-}
-
-static void emit_hdr(struct dump_ctx *ctx, const char *buf) {
-  strbuf_append(&ctx->glsl_hdr, buf);
-}
-
-static void set_hdr_error(struct dump_ctx *ctx) {
-  strbuf_set_error(&ctx->glsl_hdr);
-}
-
-__attribute__((format(printf, 2, 3))) static void
-emit_hdrf(struct dump_ctx *ctx, const char *fmt, ...) {
-  va_list va;
-  va_start(va, fmt);
-  strbuf_vappendf(&ctx->glsl_hdr, fmt, va);
-  va_end(va);
-}
-
-__attribute__((format(printf, 2, 3))) static void
-emit_ver_extf(struct dump_ctx *ctx, const char *fmt, ...) {
-  va_list va;
-  va_start(va, fmt);
-  strbuf_vappendf(&ctx->glsl_ver_ext, fmt, va);
-  va_end(va);
-}
-
-static bool allocate_temp_range(struct dump_ctx *ctx, int first, int last,
-                                int array_id) {
-  int idx = ctx->num_temp_ranges;
-
-  ctx->temp_ranges =
-      realloc(ctx->temp_ranges, sizeof(struct vrend_temp_range) * (idx + 1));
-  if (!ctx->temp_ranges)
-    return false;
-
-  ctx->temp_ranges[idx].first = first;
-  ctx->temp_ranges[idx].last = last;
-  ctx->temp_ranges[idx].array_id = array_id;
-  ctx->num_temp_ranges++;
-  return true;
-}
-
-static struct vrend_temp_range *find_temp_range(struct dump_ctx *ctx,
-                                                int index) {
-  uint32_t i;
-  for (i = 0; i < ctx->num_temp_ranges; i++) {
-    if (index >= ctx->temp_ranges[i].first && index <= ctx->temp_ranges[i].last)
-      return &ctx->temp_ranges[i];
-  }
-  return NULL;
-}
-
-static bool samplertype_is_shadow(int sampler_type) {
-  switch (sampler_type) {
-  case TGSI_TEXTURE_SHADOW1D:
-  case TGSI_TEXTURE_SHADOW1D_ARRAY:
-  case TGSI_TEXTURE_SHADOW2D:
-  case TGSI_TEXTURE_SHADOWRECT:
-  case TGSI_TEXTURE_SHADOW2D_ARRAY:
-  case TGSI_TEXTURE_SHADOWCUBE:
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-    return true;
-  default:
-    return false;
-  }
-}
-
-static uint32_t samplertype_to_req_bits(int sampler_type) {
-
-  switch (sampler_type) {
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-  case TGSI_TEXTURE_CUBE_ARRAY:
-    return SHADER_REQ_CUBE_ARRAY;
-  case TGSI_TEXTURE_2D_MSAA:
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    return SHADER_REQ_SAMPLER_MS;
-  case TGSI_TEXTURE_BUFFER:
-    return SHADER_REQ_SAMPLER_BUF;
-  case TGSI_TEXTURE_SHADOWRECT:
-  case TGSI_TEXTURE_RECT:
-    return SHADER_REQ_SAMPLER_RECT;
-  default:
-    return 0;
-  }
-}
-
-static bool add_images(struct dump_ctx *ctx, int first, int last,
-                       struct tgsi_declaration_image *img_decl) {
-  int i;
-
-  const struct util_format_description *descr =
-      util_format_description(img_decl->Format);
-  if (descr->nr_channels == 2 && descr->swizzle[0] == UTIL_FORMAT_SWIZZLE_X &&
-      descr->swizzle[1] == UTIL_FORMAT_SWIZZLE_Y &&
-      descr->swizzle[2] == UTIL_FORMAT_SWIZZLE_0 &&
-      descr->swizzle[3] == UTIL_FORMAT_SWIZZLE_1) {
-    ctx->shader_req_bits |= SHADER_REQ_NV_IMAGE_FORMATS;
-  } else if (img_decl->Format == PIPE_FORMAT_R11G11B10_FLOAT ||
-             img_decl->Format == PIPE_FORMAT_R10G10B10A2_UINT ||
-             img_decl->Format == PIPE_FORMAT_R10G10B10A2_UNORM ||
-             img_decl->Format == PIPE_FORMAT_R16G16B16A16_UNORM ||
-             img_decl->Format == PIPE_FORMAT_R16G16B16A16_SNORM)
-    ctx->shader_req_bits |= SHADER_REQ_NV_IMAGE_FORMATS;
-  else if (descr->nr_channels == 1 &&
-           descr->swizzle[0] == UTIL_FORMAT_SWIZZLE_X &&
-           descr->swizzle[1] == UTIL_FORMAT_SWIZZLE_0 &&
-           descr->swizzle[2] == UTIL_FORMAT_SWIZZLE_0 &&
-           descr->swizzle[3] == UTIL_FORMAT_SWIZZLE_1 &&
-           (descr->channel[0].size == 8 || descr->channel[0].size == 16))
-    ctx->shader_req_bits |= SHADER_REQ_NV_IMAGE_FORMATS;
-
-  for (i = first; i <= last; i++) {
-    ctx->images[i].decl = *img_decl;
-    ctx->images[i].vflag = false;
-    ctx->images_used_mask |= (1 << i);
-
-    if (!samplertype_is_shadow(ctx->images[i].decl.Resource))
-      ctx->shader_req_bits |=
-          samplertype_to_req_bits(ctx->images[i].decl.Resource);
-  }
-
-  if (ctx->info.indirect_files & (1 << TGSI_FILE_IMAGE)) {
-    if (ctx->num_image_arrays) {
-      struct vrend_array *last_array =
-          &ctx->image_arrays[ctx->num_image_arrays - 1];
-      /*
-       * If this set of images is consecutive to the last array,
-       * and has compatible return and decls, then increase the array size.
-       */
-      if ((last_array->first + last_array->array_size == first) &&
-          !memcmp(&ctx->images[last_array->first].decl,
-                  &ctx->images[first].decl, sizeof(ctx->images[first].decl)) &&
-          ctx->images[last_array->first].image_return ==
-              ctx->images[first].image_return) {
-        last_array->array_size += last - first + 1;
-        return true;
-      }
-    }
-
-    /* allocate a new image array for this range of images */
-    ctx->num_image_arrays++;
-    ctx->image_arrays = realloc(ctx->image_arrays, sizeof(struct vrend_array) *
-                                                       ctx->num_image_arrays);
-    if (!ctx->image_arrays)
-      return false;
-    ctx->image_arrays[ctx->num_image_arrays - 1].first = first;
-    ctx->image_arrays[ctx->num_image_arrays - 1].array_size = last - first + 1;
-  }
-  return true;
-}
-
-static bool add_sampler_array(struct dump_ctx *ctx, int first, int last) {
-  int idx = ctx->num_sampler_arrays;
-  ctx->num_sampler_arrays++;
-  ctx->sampler_arrays =
-      realloc(ctx->sampler_arrays,
-              sizeof(struct vrend_array) * ctx->num_sampler_arrays);
-  if (!ctx->sampler_arrays)
-    return false;
-
-  ctx->sampler_arrays[idx].first = first;
-  ctx->sampler_arrays[idx].array_size = last - first + 1;
-  return true;
-}
-
-static int lookup_sampler_array(struct dump_ctx *ctx, int index) {
-  uint32_t i;
-  for (i = 0; i < ctx->num_sampler_arrays; i++) {
-    int last =
-        ctx->sampler_arrays[i].first + ctx->sampler_arrays[i].array_size - 1;
-    if (index >= ctx->sampler_arrays[i].first && index <= last) {
-      return ctx->sampler_arrays[i].first;
-    }
-  }
-  return -1;
-}
-
-int vrend_shader_lookup_sampler_array(struct vrend_shader_info *sinfo,
-                                      int index) {
-  int i;
-  for (i = 0; i < sinfo->num_sampler_arrays; i++) {
-    int last = sinfo->sampler_arrays[i].first +
-               sinfo->sampler_arrays[i].array_size - 1;
-    if (index >= sinfo->sampler_arrays[i].first && index <= last) {
-      return sinfo->sampler_arrays[i].first;
-    }
-  }
-  return -1;
-}
-
-static bool add_samplers(struct dump_ctx *ctx, int first, int last,
-                         int sview_type, enum tgsi_return_type sview_rtype) {
-  if (sview_rtype == TGSI_RETURN_TYPE_SINT ||
-      sview_rtype == TGSI_RETURN_TYPE_UINT)
-    ctx->shader_req_bits |= SHADER_REQ_INTS;
-
-  for (int i = first; i <= last; i++) {
-    ctx->samplers[i].tgsi_sampler_return = sview_rtype;
-    ctx->samplers[i].tgsi_sampler_type = sview_type;
-  }
-
-  if (ctx->info.indirect_files & (1 << TGSI_FILE_SAMPLER)) {
-    if (ctx->num_sampler_arrays) {
-      struct vrend_array *last_array =
-          &ctx->sampler_arrays[ctx->num_sampler_arrays - 1];
-      if ((last_array->first + last_array->array_size == first) &&
-          ctx->samplers[last_array->first].tgsi_sampler_type == sview_type &&
-          ctx->samplers[last_array->first].tgsi_sampler_return == sview_rtype) {
-        last_array->array_size += last - first + 1;
-        return true;
-      }
-    }
-
-    /* allocate a new image array for this range of images */
-    return add_sampler_array(ctx, first, last);
-  }
-  return true;
-}
-
-static struct vrend_array *lookup_image_array_ptr(struct dump_ctx *ctx,
-                                                  int index) {
-  uint32_t i;
-  for (i = 0; i < ctx->num_image_arrays; i++) {
-    if (index >= ctx->image_arrays[i].first &&
-        index <=
-            ctx->image_arrays[i].first + ctx->image_arrays[i].array_size - 1) {
-      return &ctx->image_arrays[i];
-    }
-  }
-  return NULL;
-}
-
-static int lookup_image_array(struct dump_ctx *ctx, int index) {
-  struct vrend_array *image = lookup_image_array_ptr(ctx, index);
-  return image ? image->first : -1;
-}
-
-static boolean iter_inputs(struct tgsi_iterate_context *iter,
-                           struct tgsi_full_declaration *decl) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  switch (decl->Declaration.File) {
-  case TGSI_FILE_INPUT:
-    for (uint32_t j = 0; j < ctx->num_inputs; j++) {
-      if (ctx->inputs[j].name == decl->Semantic.Name &&
-          ctx->inputs[j].sid == decl->Semantic.Index &&
-          ctx->inputs[j].first == decl->Range.First)
-        return true;
-    }
-    ctx->inputs[ctx->num_inputs].name = decl->Semantic.Name;
-    ctx->inputs[ctx->num_inputs].first = decl->Range.First;
-    ctx->inputs[ctx->num_inputs].last = decl->Range.Last;
-    ctx->num_inputs++;
-  }
-  return true;
-}
-
-static bool logiop_require_inout(struct vrend_shader_key *key) {
-  if (!key->fs_logicop_enabled)
-    return false;
-
-  switch (key->fs_logicop_func) {
-  case PIPE_LOGICOP_CLEAR:
-  case PIPE_LOGICOP_SET:
-  case PIPE_LOGICOP_COPY:
-  case PIPE_LOGICOP_COPY_INVERTED:
-    return false;
-  default:
-    return true;
-  }
-}
-
-static boolean iter_declaration(struct tgsi_iterate_context *iter,
-                                struct tgsi_full_declaration *decl) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  int i;
-  int color_offset = 0;
-  const char *name_prefix = "";
-  bool add_two_side = false;
-  unsigned mask_temp;
-
-  switch (decl->Declaration.File) {
-  case TGSI_FILE_INPUT:
-    for (uint32_t j = 0; j < ctx->num_inputs; j++) {
-      if (ctx->inputs[j].name == decl->Semantic.Name &&
-          ctx->inputs[j].sid == decl->Semantic.Index &&
-          ctx->inputs[j].first == decl->Range.First &&
-          ctx->inputs[j].usage_mask == decl->Declaration.UsageMask &&
-          ((!decl->Declaration.Array && ctx->inputs[j].array_id == 0) ||
-           (ctx->inputs[j].array_id == decl->Array.ArrayID)))
-        return true;
-    }
-    i = ctx->num_inputs++;
-    if (ctx->num_inputs > ARRAY_SIZE(ctx->inputs))
-      return false;
-    if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX) {
-      ctx->attrib_input_mask |= (1 << decl->Range.First);
-    }
-    ctx->inputs[i].name = decl->Semantic.Name;
-    ctx->inputs[i].sid = decl->Semantic.Index;
-    ctx->inputs[i].interpolate = decl->Interp.Interpolate;
-    ctx->inputs[i].location = decl->Interp.Location;
-    ctx->inputs[i].first = decl->Range.First;
-    ctx->inputs[i].layout_location = 0;
-    ctx->inputs[i].last = decl->Range.Last;
-    ctx->inputs[i].array_id = decl->Declaration.Array ? decl->Array.ArrayID : 0;
-    ctx->inputs[i].usage_mask = mask_temp = decl->Declaration.UsageMask;
-    u_bit_scan_consecutive_range(&mask_temp, &ctx->inputs[i].swizzle_offset,
-                                 &ctx->inputs[i].num_components);
-
-    ctx->inputs[i].glsl_predefined_no_emit = false;
-    ctx->inputs[i].glsl_no_index = false;
-    ctx->inputs[i].override_no_wm = ctx->inputs[i].num_components == 1;
-    ctx->inputs[i].glsl_gl_block = false;
-
-    if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT &&
-        decl->Interp.Location == TGSI_INTERPOLATE_LOC_SAMPLE) {
-      ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-      ctx->has_sample_input = true;
-    }
-
-    if (ctx->inputs[i].first != ctx->inputs[i].last)
-      require_glsl_ver(ctx, 150);
-
-    switch (ctx->inputs[i].name) {
-    case TGSI_SEMANTIC_COLOR:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        if (ctx->glsl_ver_required < 140) {
-          if (decl->Semantic.Index == 0)
-            name_prefix = "gl_Color";
-          else if (decl->Semantic.Index == 1)
-            name_prefix = "gl_SecondaryColor";
-          ctx->inputs[i].glsl_no_index = true;
-        } else {
-          if (ctx->key->color_two_side) {
-            int j = ctx->num_inputs++;
-            if (ctx->num_inputs > ARRAY_SIZE(ctx->inputs))
-              return false;
-
-            ctx->inputs[j].name = TGSI_SEMANTIC_BCOLOR;
-            ctx->inputs[j].sid = decl->Semantic.Index;
-            ctx->inputs[j].interpolate = decl->Interp.Interpolate;
-            ctx->inputs[j].location = decl->Interp.Location;
-            ctx->inputs[j].first = decl->Range.First;
-            ctx->inputs[j].last = decl->Range.Last;
-            ctx->inputs[j].glsl_predefined_no_emit = false;
-            ctx->inputs[j].glsl_no_index = false;
-            ctx->inputs[j].override_no_wm = false;
-
-            ctx->color_in_mask |= (1 << decl->Semantic.Index);
-
-            if (ctx->front_face_emitted == false) {
-              int k = ctx->num_inputs++;
-              if (ctx->num_inputs > ARRAY_SIZE(ctx->inputs))
-                return false;
-
-              ctx->inputs[k].name = TGSI_SEMANTIC_FACE;
-              ctx->inputs[k].sid = 0;
-              ctx->inputs[k].interpolate = TGSI_INTERPOLATE_CONSTANT;
-              ctx->inputs[k].location = TGSI_INTERPOLATE_LOC_CENTER;
-              ctx->inputs[k].first = 0;
-              ctx->inputs[k].override_no_wm = false;
-              ctx->inputs[k].glsl_predefined_no_emit = true;
-              ctx->inputs[k].glsl_no_index = true;
-            }
-            add_two_side = true;
-          }
-          name_prefix = "ex";
-        }
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_PRIMID:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY) {
-        name_prefix = "gl_PrimitiveIDIn";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->inputs[i].override_no_wm = true;
-        ctx->shader_req_bits |= SHADER_REQ_INTS;
-        break;
-      } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        name_prefix = "gl_PrimitiveID";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        require_glsl_ver(ctx, 150);
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_VIEWPORT_INDEX:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->inputs[i].is_int = true;
-        ctx->inputs[i].override_no_wm = true;
-        name_prefix = "gl_ViewportIndex";
-        if (ctx->glsl_ver_required >= 140)
-          ctx->shader_req_bits |= SHADER_REQ_LAYER;
-
-        ctx->shader_req_bits |= SHADER_REQ_VIEWPORT_IDX;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_LAYER:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        name_prefix = "gl_Layer";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->inputs[i].is_int = true;
-        ctx->inputs[i].override_no_wm = true;
-        ctx->shader_req_bits |= SHADER_REQ_LAYER;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_PSIZE:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL) {
-        name_prefix = "gl_PointSize";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->inputs[i].override_no_wm = true;
-        ctx->inputs[i].glsl_gl_block = true;
-        ctx->shader_req_bits |= SHADER_REQ_PSIZE;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_CLIPDIST:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL) {
-        name_prefix = "gl_ClipDistance";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->inputs[i].glsl_gl_block = true;
-        ctx->num_in_clip_dist +=
-            4 * (ctx->inputs[i].last - ctx->inputs[i].first + 1);
-        ctx->shader_req_bits |= SHADER_REQ_CLIP_DISTANCE;
-        if (ctx->inputs[i].last != ctx->inputs[i].first)
-          ctx->guest_sent_io_arrays = true;
-        break;
-      } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        name_prefix = "gl_ClipDistance";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->num_in_clip_dist +=
-            4 * (ctx->inputs[i].last - ctx->inputs[i].first + 1);
-        ctx->shader_req_bits |= SHADER_REQ_CLIP_DISTANCE;
-        if (ctx->inputs[i].last != ctx->inputs[i].first)
-          ctx->guest_sent_io_arrays = true;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_POSITION:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL) {
-        name_prefix = "gl_Position";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->inputs[i].glsl_gl_block = true;
-        break;
-      } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        if (ctx->fs_pixel_center) {
-          name_prefix = "(gl_FragCoord - vec4(0.5, 0.5, 0.0, 0.0))";
-        } else
-          name_prefix = "gl_FragCoord";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_FACE:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        if (ctx->front_face_emitted) {
-          ctx->num_inputs--;
-          return true;
-        }
-        name_prefix = "gl_FrontFacing";
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        ctx->inputs[i].glsl_no_index = true;
-        ctx->front_face_emitted = true;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_PATCH:
-    case TGSI_SEMANTIC_GENERIC:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        if (ctx->key->coord_replace & (1 << ctx->inputs[i].sid)) {
-          name_prefix =
-              "vec4(gl_PointCoord.x, mix(1.0 - gl_PointCoord.y, "
-              "gl_PointCoord.y, clamp(winsys_adjust_y, 0.0, 1.0)), 0.0, 1.0)";
-          ctx->inputs[i].glsl_predefined_no_emit = true;
-          ctx->inputs[i].glsl_no_index = true;
-          ctx->inputs[i].num_components = 4;
-          ctx->inputs[i].swizzle_offset = 0;
-          ctx->inputs[i].usage_mask = 0xf;
-          break;
-        }
-      }
-
-      if (ctx->inputs[i].first != ctx->inputs[i].last ||
-          ctx->inputs[i].array_id > 0) {
-        ctx->guest_sent_io_arrays = true;
-      }
-
-      /* fallthrough */
-    default:
-      name_prefix = get_stage_input_name_prefix(ctx, iter->processor.Processor);
-      break;
-    }
-
-    if (ctx->inputs[i].glsl_no_index)
-      snprintf(ctx->inputs[i].glsl_name, 128, "%s", name_prefix);
-    else {
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_FOG) {
-        ctx->inputs[i].usage_mask = 0xf;
-        ctx->inputs[i].num_components = 4;
-        ctx->inputs[i].swizzle_offset = 0;
-        ctx->inputs[i].override_no_wm = false;
-        snprintf(ctx->inputs[i].glsl_name, 128, "%s_f%d", name_prefix,
-                 ctx->inputs[i].sid);
-      } else if (ctx->inputs[i].name == TGSI_SEMANTIC_COLOR)
-        snprintf(ctx->inputs[i].glsl_name, 128, "%s_c%d", name_prefix,
-                 ctx->inputs[i].sid);
-      else if (ctx->inputs[i].name == TGSI_SEMANTIC_GENERIC)
-        snprintf(ctx->inputs[i].glsl_name, 128, "%s_g%dA%d", name_prefix,
-                 ctx->inputs[i].sid, ctx->inputs[i].array_id);
-      else if (ctx->inputs[i].name == TGSI_SEMANTIC_PATCH)
-        snprintf(ctx->inputs[i].glsl_name, 128, "%s_p%dA%d", name_prefix,
-                 ctx->inputs[i].sid, ctx->inputs[i].array_id);
-      else
-        snprintf(ctx->inputs[i].glsl_name, 128, "%s_%d", name_prefix,
-                 ctx->inputs[i].first);
-    }
-    if (add_two_side) {
-      snprintf(ctx->inputs[i + 1].glsl_name, 128, "%s_bc%d", name_prefix,
-               ctx->inputs[i + 1].sid);
-      if (!ctx->front_face_emitted) {
-        snprintf(ctx->inputs[i + 2].glsl_name, 128, "%s", "gl_FrontFacing");
-        ctx->front_face_emitted = true;
-      }
-    }
-    break;
-  case TGSI_FILE_OUTPUT:
-    for (uint32_t j = 0; j < ctx->num_outputs; j++) {
-      if (ctx->outputs[j].name == decl->Semantic.Name &&
-          ctx->outputs[j].sid == decl->Semantic.Index &&
-          ctx->outputs[j].first == decl->Range.First &&
-          ctx->outputs[j].usage_mask == decl->Declaration.UsageMask &&
-          ((!decl->Declaration.Array && ctx->outputs[j].array_id == 0) ||
-           (ctx->outputs[j].array_id == decl->Array.ArrayID)))
-        return true;
-    }
-    i = ctx->num_outputs++;
-    if (ctx->num_outputs > ARRAY_SIZE(ctx->outputs))
-      return false;
-
-    ctx->outputs[i].name = decl->Semantic.Name;
-    ctx->outputs[i].sid = decl->Semantic.Index;
-    ctx->outputs[i].interpolate = decl->Interp.Interpolate;
-    ctx->outputs[i].invariant = decl->Declaration.Invariant;
-    ctx->outputs[i].precise = false;
-    ctx->outputs[i].first = decl->Range.First;
-    ctx->outputs[i].last = decl->Range.Last;
-    ctx->outputs[i].layout_location = 0;
-    ctx->outputs[i].array_id =
-        decl->Declaration.Array ? decl->Array.ArrayID : 0;
-    ctx->outputs[i].usage_mask = mask_temp = decl->Declaration.UsageMask;
-    u_bit_scan_consecutive_range(&mask_temp, &ctx->outputs[i].swizzle_offset,
-                                 &ctx->outputs[i].num_components);
-    ctx->outputs[i].glsl_predefined_no_emit = false;
-    ctx->outputs[i].glsl_no_index = false;
-    ctx->outputs[i].override_no_wm = ctx->outputs[i].num_components == 1;
-    ctx->outputs[i].is_int = false;
-    ctx->outputs[i].fbfetch_used = false;
-
-    switch (ctx->outputs[i].name) {
-    case TGSI_SEMANTIC_POSITION:
-      if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX ||
-          iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL) {
-        name_prefix = "gl_Position";
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL)
-          ctx->outputs[i].glsl_gl_block = true;
-      } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        name_prefix = "gl_FragDepth";
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-      }
-      break;
-    case TGSI_SEMANTIC_STENCIL:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        name_prefix = "gl_FragStencilRefARB";
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        ctx->outputs[i].is_int = true;
-        ctx->shader_req_bits |= (SHADER_REQ_INTS | SHADER_REQ_STENCIL_EXPORT);
-      }
-      break;
-    case TGSI_SEMANTIC_CLIPDIST:
-      ctx->shader_req_bits |= SHADER_REQ_CLIP_DISTANCE;
-      name_prefix = "gl_ClipDistance";
-      ctx->outputs[i].glsl_predefined_no_emit = true;
-      ctx->outputs[i].glsl_no_index = true;
-      ctx->num_clip_dist +=
-          4 * (ctx->outputs[i].last - ctx->outputs[i].first + 1);
-      if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX &&
-          (ctx->key->gs_present || ctx->key->tcs_present))
-        require_glsl_ver(ctx, 150);
-      if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL)
-        ctx->outputs[i].glsl_gl_block = true;
-      if (ctx->outputs[i].last != ctx->outputs[i].first)
-        ctx->guest_sent_io_arrays = true;
-      break;
-    case TGSI_SEMANTIC_CLIPVERTEX:
-      name_prefix = "gl_ClipVertex";
-      ctx->outputs[i].glsl_predefined_no_emit = true;
-      ctx->outputs[i].glsl_no_index = true;
-      ctx->outputs[i].override_no_wm = true;
-      ctx->outputs[i].invariant = false;
-      ctx->outputs[i].precise = false;
-      if (ctx->glsl_ver_required >= 140)
-        ctx->has_clipvertex = true;
-      break;
-    case TGSI_SEMANTIC_SAMPLEMASK:
-      if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        ctx->outputs[i].is_int = true;
-        ctx->shader_req_bits |= (SHADER_REQ_INTS | SHADER_REQ_SAMPLE_SHADING);
-        name_prefix = "gl_SampleMask";
-        break;
-      }
-      break;
-    case TGSI_SEMANTIC_COLOR:
-      if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX) {
-        if (ctx->glsl_ver_required < 140) {
-          ctx->outputs[i].glsl_no_index = true;
-          if (ctx->outputs[i].sid == 0)
-            name_prefix = "gl_FrontColor";
-          else if (ctx->outputs[i].sid == 1)
-            name_prefix = "gl_FrontSecondaryColor";
-        } else
-          name_prefix = "ex";
-        break;
-      } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT &&
-                 ctx->key->fs_logicop_enabled) {
-        name_prefix = "fsout_tmp";
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_BCOLOR:
-      if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX) {
-        if (ctx->glsl_ver_required < 140) {
-          ctx->outputs[i].glsl_no_index = true;
-          if (ctx->outputs[i].sid == 0)
-            name_prefix = "gl_BackColor";
-          else if (ctx->outputs[i].sid == 1)
-            name_prefix = "gl_BackSecondaryColor";
-          break;
-        } else
-          name_prefix = "ex";
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_PSIZE:
-      if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX ||
-          iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
-          iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        ctx->shader_req_bits |= SHADER_REQ_PSIZE;
-        name_prefix = "gl_PointSize";
-        if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL)
-          ctx->outputs[i].glsl_gl_block = true;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_LAYER:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        ctx->outputs[i].is_int = true;
-        name_prefix = "gl_Layer";
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_PRIMID:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        ctx->outputs[i].is_int = true;
-        name_prefix = "gl_PrimitiveID";
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_VIEWPORT_INDEX:
-      if (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        ctx->outputs[i].is_int = true;
-        name_prefix = "gl_ViewportIndex";
-        ctx->shader_req_bits |= SHADER_REQ_VIEWPORT_IDX;
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_TESSOUTER:
-      if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        name_prefix = "gl_TessLevelOuter";
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_TESSINNER:
-      if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        ctx->outputs[i].glsl_no_index = true;
-        ctx->outputs[i].override_no_wm = true;
-        name_prefix = "gl_TessLevelInner";
-        break;
-      }
-      /* fallthrough */
-    case TGSI_SEMANTIC_PATCH:
-    case TGSI_SEMANTIC_GENERIC:
-      if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX)
-        if (ctx->outputs[i].name == TGSI_SEMANTIC_GENERIC)
-          color_offset = -1;
-
-      if (ctx->outputs[i].first != ctx->outputs[i].last ||
-          ctx->outputs[i].array_id > 0) {
-        ctx->guest_sent_io_arrays = true;
-      }
-      /* fallthrough */
-    default:
-      name_prefix = get_stage_output_name_prefix(iter->processor.Processor);
-      break;
-    }
-
-    if (ctx->outputs[i].glsl_no_index)
-      snprintf(ctx->outputs[i].glsl_name, 64, "%s", name_prefix);
-    else {
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_FOG) {
-        ctx->outputs[i].usage_mask = 0xf;
-        ctx->outputs[i].num_components = 4;
-        ctx->outputs[i].swizzle_offset = 0;
-        ctx->outputs[i].override_no_wm = false;
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_f%d", name_prefix,
-                 ctx->outputs[i].sid);
-      } else if (ctx->outputs[i].name == TGSI_SEMANTIC_COLOR)
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_c%d", name_prefix,
-                 ctx->outputs[i].sid);
-      else if (ctx->outputs[i].name == TGSI_SEMANTIC_BCOLOR)
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_bc%d", name_prefix,
-                 ctx->outputs[i].sid);
-      else if (ctx->outputs[i].name == TGSI_SEMANTIC_PATCH)
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_p%dA%d", name_prefix,
-                 ctx->outputs[i].sid, ctx->outputs[i].array_id);
-      else if (ctx->outputs[i].name == TGSI_SEMANTIC_GENERIC)
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_g%dA%d", name_prefix,
-                 ctx->outputs[i].sid, ctx->outputs[i].array_id);
-      else
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_%d", name_prefix,
-                 ctx->outputs[i].first + color_offset);
-    }
-    break;
-  case TGSI_FILE_TEMPORARY:
-    if (!allocate_temp_range(ctx, decl->Range.First, decl->Range.Last,
-                             decl->Array.ArrayID))
-      return false;
-    break;
-  case TGSI_FILE_SAMPLER:
-    ctx->samplers_used |= (1 << decl->Range.Last);
-    break;
-  case TGSI_FILE_SAMPLER_VIEW:
-    if (decl->Range.Last >= ARRAY_SIZE(ctx->samplers))
-      return false;
-    if (!add_samplers(ctx, decl->Range.First, decl->Range.Last,
-                      decl->SamplerView.Resource,
-                      decl->SamplerView.ReturnTypeX))
-      return false;
-    break;
-  case TGSI_FILE_IMAGE:
-    ctx->shader_req_bits |= SHADER_REQ_IMAGE_LOAD_STORE;
-    if (decl->Range.Last >= ARRAY_SIZE(ctx->images))
-      return false;
-    if (!add_images(ctx, decl->Range.First, decl->Range.Last, &decl->Image))
-      return false;
-    break;
-  case TGSI_FILE_BUFFER:
-    if (decl->Range.First >= 32)
-      return false;
-    ctx->ssbo_used_mask |= (1 << decl->Range.First);
-    if (decl->Declaration.Atomic) {
-      if (decl->Range.First < ctx->ssbo_atomic_array_base)
-        ctx->ssbo_atomic_array_base = decl->Range.First;
-      ctx->ssbo_atomic_mask |= (1 << decl->Range.First);
-    } else {
-      if (decl->Range.First < ctx->ssbo_array_base)
-        ctx->ssbo_array_base = decl->Range.First;
-    }
-    break;
-  case TGSI_FILE_CONSTANT:
-    if (decl->Declaration.Dimension && decl->Dim.Index2D != 0) {
-      if (decl->Dim.Index2D > 31)
-        return false;
-      if (ctx->ubo_used_mask & (1 << decl->Dim.Index2D))
-        return false;
-      ctx->ubo_used_mask |= (1 << decl->Dim.Index2D);
-      ctx->ubo_sizes[decl->Dim.Index2D] = decl->Range.Last + 1;
-    } else {
-      /* if we have a normal single const set then ubo base should be 1 */
-      ctx->ubo_base = 1;
-      if (decl->Range.Last) {
-        if (decl->Range.Last + 1 > ctx->num_consts)
-          ctx->num_consts = decl->Range.Last + 1;
-      } else
-        ctx->num_consts++;
-    }
-    break;
-  case TGSI_FILE_ADDRESS:
-    ctx->num_address = decl->Range.Last + 1;
-    break;
-  case TGSI_FILE_SYSTEM_VALUE:
-    i = ctx->num_system_values++;
-    if (ctx->num_system_values > ARRAY_SIZE(ctx->system_values))
-      return false;
-
-    ctx->system_values[i].name = decl->Semantic.Name;
-    ctx->system_values[i].sid = decl->Semantic.Index;
-    ctx->system_values[i].glsl_predefined_no_emit = true;
-    ctx->system_values[i].glsl_no_index = true;
-    ctx->system_values[i].override_no_wm = true;
-    ctx->system_values[i].first = decl->Range.First;
-    if (decl->Semantic.Name == TGSI_SEMANTIC_INSTANCEID) {
-      name_prefix = "gl_InstanceID";
-      ctx->shader_req_bits |= SHADER_REQ_INSTANCE_ID | SHADER_REQ_INTS;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_VERTEXID) {
-      name_prefix = "gl_VertexID";
-      ctx->shader_req_bits |= SHADER_REQ_INTS;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_HELPER_INVOCATION) {
-      name_prefix = "gl_HelperInvocation";
-      ctx->shader_req_bits |= SHADER_REQ_ES31_COMPAT;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_SAMPLEID) {
-      name_prefix = "gl_SampleID";
-      ctx->shader_req_bits |= (SHADER_REQ_SAMPLE_SHADING | SHADER_REQ_INTS);
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_SAMPLEPOS) {
-      name_prefix = "gl_SamplePosition";
-      ctx->shader_req_bits |= SHADER_REQ_SAMPLE_SHADING;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_INVOCATIONID) {
-      name_prefix = "gl_InvocationID";
-      ctx->shader_req_bits |= (SHADER_REQ_INTS | SHADER_REQ_GPU_SHADER5);
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_SAMPLEMASK) {
-      name_prefix = "gl_SampleMaskIn[0]";
-      ctx->shader_req_bits |= (SHADER_REQ_INTS | SHADER_REQ_GPU_SHADER5);
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_PRIMID) {
-      name_prefix = "gl_PrimitiveID";
-      ctx->shader_req_bits |= (SHADER_REQ_INTS | SHADER_REQ_GPU_SHADER5);
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_TESSCOORD) {
-      name_prefix = "gl_TessCoord";
-      ctx->system_values[i].override_no_wm = false;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_VERTICESIN) {
-      ctx->shader_req_bits |= SHADER_REQ_INTS;
-      name_prefix = "gl_PatchVerticesIn";
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_TESSOUTER) {
-      name_prefix = "gl_TessLevelOuter";
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_TESSINNER) {
-      name_prefix = "gl_TessLevelInner";
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_THREAD_ID) {
-      name_prefix = "gl_LocalInvocationID";
-      ctx->system_values[i].override_no_wm = false;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_BLOCK_ID) {
-      name_prefix = "gl_WorkGroupID";
-      ctx->system_values[i].override_no_wm = false;
-    } else if (decl->Semantic.Name == TGSI_SEMANTIC_GRID_SIZE) {
-      name_prefix = "gl_NumWorkGroups";
-      ctx->system_values[i].override_no_wm = false;
-    } else {
-      name_prefix = "unknown";
-    }
-    snprintf(ctx->system_values[i].glsl_name, 64, "%s", name_prefix);
-    break;
-  case TGSI_FILE_MEMORY:
-    ctx->has_file_memory = true;
-    break;
-  case TGSI_FILE_HW_ATOMIC:
-    if (ctx->num_abo >= ARRAY_SIZE(ctx->abo_idx))
-      return false;
-    ctx->abo_idx[ctx->num_abo] = decl->Dim.Index2D;
-    ctx->abo_sizes[ctx->num_abo] = decl->Range.Last - decl->Range.First + 1;
-    ctx->abo_offsets[ctx->num_abo] = decl->Range.First;
-    ctx->num_abo++;
-    break;
-  }
-
-  return true;
-}
-
-static boolean iter_property(struct tgsi_iterate_context *iter,
-                             struct tgsi_full_property *prop) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-
-  switch (prop->Property.PropertyName) {
-  case TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS:
-    if (prop->u[0].Data == 1)
-      ctx->write_all_cbufs = true;
-    break;
-  case TGSI_PROPERTY_FS_COORD_ORIGIN:
-    ctx->fs_coord_origin = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_FS_COORD_PIXEL_CENTER:
-    ctx->fs_pixel_center = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_FS_DEPTH_LAYOUT:
-    break;
-  case TGSI_PROPERTY_GS_INPUT_PRIM:
-    ctx->gs_in_prim = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_GS_OUTPUT_PRIM:
-    ctx->gs_out_prim = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES:
-    ctx->gs_max_out_verts = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_GS_INVOCATIONS:
-    ctx->gs_num_invocations = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_NUM_CLIPDIST_ENABLED:
-    ctx->shader_req_bits |= SHADER_REQ_CLIP_DISTANCE;
-    ctx->num_clip_dist_prop = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_NUM_CULLDIST_ENABLED:
-    ctx->num_cull_dist_prop = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_TCS_VERTICES_OUT:
-    ctx->tcs_vertices_out = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_TES_PRIM_MODE:
-    ctx->tes_prim_mode = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_TES_SPACING:
-    ctx->tes_spacing = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_TES_VERTEX_ORDER_CW:
-    ctx->tes_vertex_order = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_TES_POINT_MODE:
-    ctx->tes_point_mode = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL:
-    ctx->early_depth_stencil = prop->u[0].Data > 0;
-    if (ctx->early_depth_stencil) {
-      require_glsl_ver(ctx, 150);
-      ctx->shader_req_bits |= SHADER_REQ_IMAGE_LOAD_STORE;
-    }
-    break;
-  case TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH:
-    ctx->local_cs_block_size[0] = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT:
-    ctx->local_cs_block_size[1] = prop->u[0].Data;
-    break;
-  case TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH:
-    ctx->local_cs_block_size[2] = prop->u[0].Data;
-    break;
-  default:
-    return false;
-  }
-
-  return true;
-}
-
-static boolean iter_immediate(struct tgsi_iterate_context *iter,
-                              struct tgsi_full_immediate *imm) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  int i;
-  uint32_t first = ctx->num_imm;
-
-  if (first >= ARRAY_SIZE(ctx->imm))
-    return false;
-
-  ctx->imm[first].type = imm->Immediate.DataType;
-  for (i = 0; i < 4; i++) {
-    if (imm->Immediate.DataType == TGSI_IMM_FLOAT32) {
-      ctx->imm[first].val[i].f = imm->u[i].Float;
-    } else if (imm->Immediate.DataType == TGSI_IMM_UINT32 ||
-               imm->Immediate.DataType == TGSI_IMM_FLOAT64) {
-      ctx->shader_req_bits |= SHADER_REQ_INTS;
-      ctx->imm[first].val[i].ui = imm->u[i].Uint;
-    } else if (imm->Immediate.DataType == TGSI_IMM_INT32) {
-      ctx->shader_req_bits |= SHADER_REQ_INTS;
-      ctx->imm[first].val[i].i = imm->u[i].Int;
-    }
-  }
-  ctx->num_imm++;
-  return true;
-}
-
-static char get_swiz_char(int swiz) {
-  switch (swiz) {
-  case TGSI_SWIZZLE_X:
-    return 'x';
-  case TGSI_SWIZZLE_Y:
-    return 'y';
-  case TGSI_SWIZZLE_Z:
-    return 'z';
-  case TGSI_SWIZZLE_W:
-    return 'w';
-  default:
-    return 0;
-  }
-}
-
-static void emit_cbuf_writes(struct dump_ctx *ctx) {
-  int i;
-
-  for (i = ctx->num_outputs; i < ctx->cfg->max_draw_buffers; i++) {
-    emit_buff(ctx, "fsout_c%d = fsout_c0;\n", i);
-  }
-}
-
-static void emit_a8_swizzle(struct dump_ctx *ctx) {
-  emit_buf(ctx, "fsout_c0.x = fsout_c0.w;\n");
-}
-
-static const char *atests[PIPE_FUNC_ALWAYS + 1] = {
-    "false", "<", "==", "<=", ">", "!=", ">=", "true"};
-
-static void emit_alpha_test(struct dump_ctx *ctx) {
-  char comp_buf[128];
-
-  if (!ctx->num_outputs)
-    return;
-
-  if (!ctx->write_all_cbufs) {
-    /* only emit alpha stanza if first output is 0 */
-    if (ctx->outputs[0].sid != 0)
-      return;
-  }
-  switch (ctx->key->alpha_test) {
-  case PIPE_FUNC_NEVER:
-  case PIPE_FUNC_ALWAYS:
-    snprintf(comp_buf, 128, "%s", atests[ctx->key->alpha_test]);
-    break;
-  case PIPE_FUNC_LESS:
-  case PIPE_FUNC_EQUAL:
-  case PIPE_FUNC_LEQUAL:
-  case PIPE_FUNC_GREATER:
-  case PIPE_FUNC_NOTEQUAL:
-  case PIPE_FUNC_GEQUAL:
-    snprintf(comp_buf, 128, "%s %s %f", "fsout_c0.w",
-             atests[ctx->key->alpha_test], ctx->key->alpha_ref_val);
-    break;
-  default:
-    set_buf_error(ctx);
-    return;
-  }
-
-  emit_buff(ctx, "if (!(%s)) {\n\tdiscard;\n}\n", comp_buf);
-}
-
-static void emit_pstipple_pass(struct dump_ctx *ctx) {
-  emit_buf(ctx, "stip_temp = texture(pstipple_sampler, vec2(gl_FragCoord.x / "
-                "32.0, gl_FragCoord.y / 32.0)).x;\n");
-  emit_buf(ctx, "if (stip_temp > 0.0) {\n\tdiscard;\n}\n");
-}
-
-static void emit_color_select(struct dump_ctx *ctx) {
-  if (!ctx->key->color_two_side || !(ctx->color_in_mask & 0x3))
-    return;
-
-  if (ctx->color_in_mask & 1)
-    emit_buf(ctx, "realcolor0 = gl_FrontFacing ? ex_c0 : ex_bc0;\n");
-
-  if (ctx->color_in_mask & 2)
-    emit_buf(ctx, "realcolor1 = gl_FrontFacing ? ex_c1 : ex_bc1;\n");
-}
-
-static void emit_prescale(struct dump_ctx *ctx) {
-  emit_buf(ctx, "gl_Position.y = gl_Position.y * winsys_adjust_y;\n");
-}
-
-static void prepare_so_movs(struct dump_ctx *ctx) {
-  uint32_t i;
-  for (i = 0; i < ctx->so->num_outputs; i++) {
-    ctx->write_so_outputs[i] = true;
-    if (ctx->so->output[i].start_component != 0)
-      continue;
-    if (ctx->so->output[i].num_components != 4)
-      continue;
-    if (ctx->outputs[ctx->so->output[i].register_index].name ==
-        TGSI_SEMANTIC_CLIPDIST)
-      continue;
-    if (ctx->outputs[ctx->so->output[i].register_index].name ==
-        TGSI_SEMANTIC_POSITION)
-      continue;
-
-    ctx->outputs[ctx->so->output[i].register_index].stream =
-        ctx->so->output[i].stream;
-    if (ctx->prog_type == TGSI_PROCESSOR_GEOMETRY && ctx->so->output[i].stream)
-      ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-
-    ctx->write_so_outputs[i] = false;
-  }
-}
-
-static const struct vrend_shader_io *
-get_io_slot(const struct vrend_shader_io *slots, unsigned nslots, int idx) {
-  const struct vrend_shader_io *result = slots;
-  for (unsigned i = 0; i < nslots; ++i, ++result) {
-    if ((result->first <= idx) && (result->last >= idx))
-      return result;
-  }
-  assert(0 && "Output not found");
-  return NULL;
-}
-
-static inline void get_blockname(char outvar[64], const char *stage_prefix,
-                                 const struct vrend_shader_io *io) {
-  snprintf(outvar, 64, "block_%sg%dA%d", stage_prefix, io->sid, io->array_id);
-}
-
-static inline void get_blockvarname(char outvar[64], const char *stage_prefix,
-                                    const struct vrend_shader_io *io,
-                                    const char *postfix) {
-  snprintf(outvar, 64, "%sg%dA%d_%x%s", stage_prefix, io->first, io->array_id,
-           io->usage_mask, postfix);
-}
-
-static void get_so_name(struct dump_ctx *ctx, bool from_block,
-                        const struct vrend_shader_io *output, int index,
-                        char out_var[255], char *wm) {
-  if (output->first == output->last || output->name != TGSI_SEMANTIC_GENERIC)
-    snprintf(out_var, 255, "%s%s", output->glsl_name, wm);
-  else {
-    if ((output->name == TGSI_SEMANTIC_GENERIC) &&
-        prefer_generic_io_block(ctx, io_out)) {
-      char blockname[64];
-      const char *stage_prefix = get_stage_output_name_prefix(ctx->prog_type);
-      if (from_block)
-        get_blockname(blockname, stage_prefix, output);
-      else
-        get_blockvarname(blockname, stage_prefix, output, "");
-      snprintf(out_var, 255, "%s.%s[%d]%s", blockname, output->glsl_name,
-               index - output->first, wm);
-    } else {
-      snprintf(out_var, 255, "%s[%d]%s", output->glsl_name,
-               index - output->first, wm);
-    }
-  }
-}
-
-static void emit_so_movs(struct dump_ctx *ctx) {
-  uint32_t i, j;
-  char outtype[15] = "";
-  char writemask[6];
-
-  if (ctx->so->num_outputs >= PIPE_MAX_SO_OUTPUTS) {
-    set_buf_error(ctx);
-    return;
-  }
-
-  for (i = 0; i < ctx->so->num_outputs; i++) {
-    const struct vrend_shader_io *output = get_io_slot(
-        &ctx->outputs[0], ctx->num_outputs, ctx->so->output[i].register_index);
-    if (ctx->so->output[i].start_component != 0) {
-      int wm_idx = 0;
-      writemask[wm_idx++] = '.';
-      for (j = 0; j < ctx->so->output[i].num_components; j++) {
-        unsigned idx = ctx->so->output[i].start_component + j;
-        if (idx >= 4)
-          break;
-        if (idx <= 2)
-          writemask[wm_idx++] = 'x' + idx;
-        else
-          writemask[wm_idx++] = 'w';
-      }
-      writemask[wm_idx] = '\0';
-    } else
-      writemask[0] = 0;
-
-    if (!ctx->write_so_outputs[i]) {
-      if (ctx->so_names[i])
-        free(ctx->so_names[i]);
-      if (ctx->so->output[i].register_index > ctx->num_outputs)
-        ctx->so_names[i] = NULL;
-      else if (ctx->outputs[ctx->so->output[i].register_index].name ==
-                   TGSI_SEMANTIC_CLIPVERTEX &&
-               ctx->has_clipvertex) {
-        ctx->so_names[i] = strdup("clipv_tmp");
-        ctx->has_clipvertex_so = true;
-      } else {
-        char out_var[255];
-        get_so_name(ctx, true, output, ctx->so->output[i].register_index,
-                    out_var, "");
-        ctx->so_names[i] = strdup(out_var);
-      }
-    } else {
-      char ntemp[8];
-      snprintf(ntemp, 8, "tfout%d", i);
-      ctx->so_names[i] = strdup(ntemp);
-    }
-    if (ctx->so->output[i].num_components == 1) {
-      if (ctx->outputs[ctx->so->output[i].register_index].is_int)
-        snprintf(outtype, 15, "intBitsToFloat");
-      else
-        snprintf(outtype, 15, "float");
-    } else
-      snprintf(outtype, 15, "vec%d", ctx->so->output[i].num_components);
-
-    if (ctx->so->output[i].register_index >= 255)
-      continue;
-
-    if (output->name == TGSI_SEMANTIC_CLIPDIST) {
-      if (output->first == output->last)
-        emit_buff(ctx, "tfout%d = %s(clip_dist_temp[%d]%s);\n", i, outtype,
-                  output->sid, writemask);
-      else
-        emit_buff(ctx, "tfout%d = %s(clip_dist_temp[%d]%s);\n", i, outtype,
-                  output->sid + ctx->so->output[i].register_index -
-                      output->first,
-                  writemask);
-    } else {
-      if (ctx->write_so_outputs[i]) {
-        char out_var[255];
-        if (ctx->so->output[i].need_temp ||
-            ctx->prog_type == TGSI_PROCESSOR_GEOMETRY ||
-            output->glsl_predefined_no_emit) {
-          get_so_name(ctx, false, output, ctx->so->output[i].register_index,
-                      out_var, writemask);
-          emit_buff(ctx, "tfout%d = %s(%s);\n", i, outtype, out_var);
-        } else {
-          get_so_name(ctx, true, output, ctx->so->output[i].register_index,
-                      out_var, writemask);
-          ctx->so_names[i] = strdup(out_var);
-        }
-      }
-    }
-  }
-}
-
-static void emit_clip_dist_movs(struct dump_ctx *ctx) {
-  int i;
-  bool has_prop = (ctx->num_clip_dist_prop + ctx->num_cull_dist_prop) > 0;
-  int ndists;
-  const char *prefix = "";
-
-  if (ctx->prog_type == PIPE_SHADER_TESS_CTRL)
-    prefix = "gl_out[gl_InvocationID].";
-  if (ctx->num_clip_dist == 0 && ctx->key->clip_plane_enable) {
-    for (i = 0; i < 8; i++) {
-      emit_buff(ctx, "%sgl_ClipDistance[%d] = dot(%s, clipp[%d]);\n", prefix, i,
-                ctx->has_clipvertex ? "clipv_tmp" : "gl_Position", i);
-    }
-    return;
-  }
-  ndists = ctx->num_clip_dist;
-  if (has_prop)
-    ndists = ctx->num_clip_dist_prop + ctx->num_cull_dist_prop;
-  for (i = 0; i < ndists; i++) {
-    int clipidx = i < 4 ? 0 : 1;
-    char swiz = i & 3;
-    char wm = 0;
-    switch (swiz) {
-    default:
-    case 0:
-      wm = 'x';
-      break;
-    case 1:
-      wm = 'y';
-      break;
-    case 2:
-      wm = 'z';
-      break;
-    case 3:
-      wm = 'w';
-      break;
-    }
-    bool is_cull = false;
-    if (has_prop) {
-      if (i >= ctx->num_clip_dist_prop &&
-          i < ctx->num_clip_dist_prop + ctx->num_cull_dist_prop)
-        is_cull = true;
-    }
-    const char *clip_cull = is_cull ? "Cull" : "Clip";
-    emit_buff(ctx, "%sgl_%sDistance[%d] = clip_dist_temp[%d].%c;\n", prefix,
-              clip_cull, is_cull ? i - ctx->num_clip_dist_prop : i, clipidx,
-              wm);
-  }
-}
-
-#define emit_arit_op2(op)                                                      \
-  emit_buff(ctx, "%s = %s(%s((%s %s %s))%s);\n", dsts[0],                      \
-            get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0], \
-            op, srcs[1], writemask)
-#define emit_op1(op)                                                           \
-  emit_buff(ctx, "%s = %s(%s(%s(%s))%s);\n", dsts[0],                          \
-            get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), op,      \
-            srcs[0], writemask)
-#define emit_compare(op)                                                       \
-  emit_buff(ctx, "%s = %s(%s((%s(%s(%s), %s(%s))))%s);\n", dsts[0],            \
-            get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), op,      \
-            get_string(sinfo.svec4), srcs[0], get_string(sinfo.svec4),         \
-            srcs[1], writemask)
-
-#define emit_ucompare(op)                                                      \
-  emit_buff(ctx,                                                               \
-            "%s = %s(uintBitsToFloat(%s(%s(%s(%s), %s(%s))%s) * "              \
-            "%s(0xffffffff)));\n",                                             \
-            dsts[0], get_string(dinfo.dstconv), get_string(dinfo.udstconv),    \
-            op, get_string(sinfo.svec4), srcs[0], get_string(sinfo.svec4),     \
-            srcs[1], writemask, get_string(dinfo.udstconv))
-
-static void handle_vertex_proc_exit(struct dump_ctx *ctx) {
-  if (ctx->so && !ctx->key->gs_present && !ctx->key->tes_present)
-    emit_so_movs(ctx);
-
-  emit_clip_dist_movs(ctx);
-
-  if (!ctx->key->gs_present && !ctx->key->tes_present)
-    emit_prescale(ctx);
-}
-
-static void emit_fragment_logicop(struct dump_ctx *ctx) {
-  char src[PIPE_MAX_COLOR_BUFS][64];
-  char src_fb[PIPE_MAX_COLOR_BUFS][64];
-  double scale[PIPE_MAX_COLOR_BUFS];
-  int mask[PIPE_MAX_COLOR_BUFS];
-  char full_op[PIPE_MAX_COLOR_BUFS][128];
-
-  for (unsigned i = 0; i < ctx->num_outputs; i++) {
-    mask[i] = (1 << ctx->key->surface_component_bits[i]) - 1;
-    scale[i] = mask[i];
-    switch (ctx->key->fs_logicop_func) {
-    case PIPE_LOGICOP_INVERT:
-      snprintf(src_fb[i], 64, "ivec4(%f * fsout_c%d + 0.5)", scale[i], i);
-      break;
-    case PIPE_LOGICOP_NOR:
-    case PIPE_LOGICOP_AND_INVERTED:
-    case PIPE_LOGICOP_AND_REVERSE:
-    case PIPE_LOGICOP_XOR:
-    case PIPE_LOGICOP_NAND:
-    case PIPE_LOGICOP_AND:
-    case PIPE_LOGICOP_EQUIV:
-    case PIPE_LOGICOP_OR_INVERTED:
-    case PIPE_LOGICOP_OR_REVERSE:
-    case PIPE_LOGICOP_OR:
-      snprintf(src_fb[i], 64, "ivec4(%f * fsout_c%d + 0.5)", scale[i], i);
-      /* fallthrough */
-    case PIPE_LOGICOP_COPY_INVERTED:
-      snprintf(src[i], 64, "ivec4(%f * fsout_tmp_c%d + 0.5)", scale[i], i);
-      break;
-    case PIPE_LOGICOP_COPY:
-    case PIPE_LOGICOP_NOOP:
-    case PIPE_LOGICOP_CLEAR:
-    case PIPE_LOGICOP_SET:
-      break;
-    }
-  }
-
-  for (unsigned i = 0; i < ctx->num_outputs; i++) {
-    switch (ctx->key->fs_logicop_func) {
-    case PIPE_LOGICOP_CLEAR:
-      snprintf(full_op[i], 128, "%s", "vec4(0)");
-      break;
-    case PIPE_LOGICOP_NOOP:
-      full_op[i][0] = 0;
-      break;
-    case PIPE_LOGICOP_SET:
-      snprintf(full_op[i], 128, "%s", "vec4(1)");
-      break;
-    case PIPE_LOGICOP_COPY:
-      snprintf(full_op[i], 128, "fsout_tmp_c%d", i);
-      break;
-    case PIPE_LOGICOP_COPY_INVERTED:
-      snprintf(full_op[i], 128, "~%s", src[i]);
-      break;
-    case PIPE_LOGICOP_INVERT:
-      snprintf(full_op[i], 128, "~%s", src_fb[i]);
-      break;
-    case PIPE_LOGICOP_AND:
-      snprintf(full_op[i], 128, "%s & %s", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_NAND:
-      snprintf(full_op[i], 128, "~( %s & %s )", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_NOR:
-      snprintf(full_op[i], 128, "~( %s | %s )", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_AND_INVERTED:
-      snprintf(full_op[i], 128, "~%s & %s", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_AND_REVERSE:
-      snprintf(full_op[i], 128, "%s & ~%s", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_XOR:
-      snprintf(full_op[i], 128, "%s ^%s", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_EQUIV:
-      snprintf(full_op[i], 128, "~( %s ^ %s )", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_OR_INVERTED:
-      snprintf(full_op[i], 128, "~%s | %s", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_OR_REVERSE:
-      snprintf(full_op[i], 128, "%s | ~%s", src[i], src_fb[i]);
-      break;
-    case PIPE_LOGICOP_OR:
-      snprintf(full_op[i], 128, "%s | %s", src[i], src_fb[i]);
-      break;
-    }
-  }
-
-  for (unsigned i = 0; i < ctx->num_outputs; i++) {
-    switch (ctx->key->fs_logicop_func) {
-    case PIPE_LOGICOP_NOOP:
-      break;
-    case PIPE_LOGICOP_COPY:
-    case PIPE_LOGICOP_CLEAR:
-    case PIPE_LOGICOP_SET:
-      emit_buff(ctx, "fsout_c%d = %s;\n", i, full_op[i]);
-      break;
-    default:
-      emit_buff(ctx, "fsout_c%d = vec4((%s) & %d) / %f;\n", i, full_op[i],
-                mask[i], scale[i]);
-    }
-  }
-}
-
-static void emit_cbuf_swizzle(struct dump_ctx *ctx) {
-  for (uint i = 0; i < ctx->num_outputs; i++) {
-    if (ctx->key->fs_swizzle_output_rgb_to_bgr & (1 << i)) {
-      emit_buff(ctx, "fsout_c%d = fsout_c%d.zyxw;\n", i, i);
-    }
-  }
-}
-
-static void handle_fragment_proc_exit(struct dump_ctx *ctx) {
-  if (ctx->key->pstipple_tex)
-    emit_pstipple_pass(ctx);
-
-  if (ctx->key->cbufs_are_a8_bitmask)
-    emit_a8_swizzle(ctx);
-
-  if (ctx->key->add_alpha_test)
-    emit_alpha_test(ctx);
-
-  if (ctx->key->fs_logicop_enabled)
-    emit_fragment_logicop(ctx);
-
-  if (ctx->key->fs_swizzle_output_rgb_to_bgr)
-    emit_cbuf_swizzle(ctx);
-
-  if (ctx->write_all_cbufs)
-    emit_cbuf_writes(ctx);
-}
-
-static void set_texture_reqs(struct dump_ctx *ctx,
-                             struct tgsi_full_instruction *inst,
-                             uint32_t sreg_index) {
-  if (sreg_index >= ARRAY_SIZE(ctx->samplers)) {
-    set_buf_error(ctx);
-    return;
-  }
-  ctx->samplers[sreg_index].tgsi_sampler_type = inst->Texture.Texture;
-
-  ctx->shader_req_bits |= samplertype_to_req_bits(inst->Texture.Texture);
-
-  if (ctx->cfg->glsl_version >= 140)
-    if (ctx->shader_req_bits &
-        (SHADER_REQ_SAMPLER_RECT | SHADER_REQ_SAMPLER_BUF))
-      require_glsl_ver(ctx, 140);
-}
-
-/* size queries are pretty much separate */
-static void emit_txq(struct dump_ctx *ctx, struct tgsi_full_instruction *inst,
-                     uint32_t sreg_index, const char *srcs[4], const char *dst,
-                     const char *writemask) {
-  unsigned twm = TGSI_WRITEMASK_NONE;
-  char bias[128] = "";
-  const int sampler_index = 1;
-  enum vrend_type_qualifier dtypeprefix = INT_BITS_TO_FLOAT;
-
-  set_texture_reqs(ctx, inst, sreg_index);
-
-  /* No LOD for these texture types, but on GLES we emulate RECT by using
-   * a normal 2D texture, so we have to give LOD 0 */
-  switch (inst->Texture.Texture) {
-  case TGSI_TEXTURE_RECT:
-  case TGSI_TEXTURE_SHADOWRECT:
-    snprintf(bias, 128, ", 0");
-    break;
-    /* fallthrough */
-  case TGSI_TEXTURE_BUFFER:
-  case TGSI_TEXTURE_2D_MSAA:
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    break;
-  default:
-    snprintf(bias, 128, ", int(%s.w)", srcs[0]);
-  }
-
-  /* need to emit a textureQueryLevels */
-  if (inst->Dst[0].Register.WriteMask & 0x8) {
-    if (inst->Texture.Texture != TGSI_TEXTURE_BUFFER &&
-        inst->Texture.Texture != TGSI_TEXTURE_RECT &&
-        inst->Texture.Texture != TGSI_TEXTURE_2D_MSAA &&
-        inst->Texture.Texture != TGSI_TEXTURE_2D_ARRAY_MSAA) {
-      ctx->shader_req_bits |= SHADER_REQ_TXQ_LEVELS;
-      if (inst->Dst[0].Register.WriteMask & 0x7)
-        twm = TGSI_WRITEMASK_W;
-      emit_buff(ctx, "%s%s = %s(textureQueryLevels(%s));\n", dst,
-                get_wm_string(twm), get_string(dtypeprefix),
-                srcs[sampler_index]);
-    }
-
-    if (inst->Dst[0].Register.WriteMask & 0x7) {
-      switch (inst->Texture.Texture) {
-      case TGSI_TEXTURE_1D:
-      case TGSI_TEXTURE_BUFFER:
-      case TGSI_TEXTURE_SHADOW1D:
-        twm = TGSI_WRITEMASK_X;
-        break;
-      case TGSI_TEXTURE_1D_ARRAY:
-      case TGSI_TEXTURE_SHADOW1D_ARRAY:
-      case TGSI_TEXTURE_2D:
-      case TGSI_TEXTURE_SHADOW2D:
-      case TGSI_TEXTURE_RECT:
-      case TGSI_TEXTURE_SHADOWRECT:
-      case TGSI_TEXTURE_CUBE:
-      case TGSI_TEXTURE_SHADOWCUBE:
-      case TGSI_TEXTURE_2D_MSAA:
-        twm = TGSI_WRITEMASK_XY;
-        break;
-      case TGSI_TEXTURE_3D:
-      case TGSI_TEXTURE_2D_ARRAY:
-      case TGSI_TEXTURE_SHADOW2D_ARRAY:
-      case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-      case TGSI_TEXTURE_CUBE_ARRAY:
-      case TGSI_TEXTURE_2D_ARRAY_MSAA:
-        twm = TGSI_WRITEMASK_XYZ;
-        break;
-      }
-    }
-  }
-
-  if (inst->Dst[0].Register.WriteMask & 0x7) {
-    bool txq_returns_vec = (inst->Texture.Texture != TGSI_TEXTURE_BUFFER) &&
-                           ((inst->Texture.Texture != TGSI_TEXTURE_1D &&
-                             inst->Texture.Texture != TGSI_TEXTURE_SHADOW1D));
-
-    if ((inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY ||
-         inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D_ARRAY)) {
-      writemask = ".xz";
-    }
-
-    emit_buff(ctx, "%s%s = %s(textureSize(%s%s))%s;\n", dst, get_wm_string(twm),
-              get_string(dtypeprefix), srcs[sampler_index], bias,
-              txq_returns_vec ? writemask : "");
-  }
-}
-
-/* sample queries are pretty much separate */
-static void emit_txqs(struct dump_ctx *ctx, struct tgsi_full_instruction *inst,
-                      uint32_t sreg_index, const char *srcs[4],
-                      const char *dst) {
-  const int sampler_index = 0;
-  enum vrend_type_qualifier dtypeprefix = INT_BITS_TO_FLOAT;
-
-  ctx->shader_req_bits |= SHADER_REQ_TXQS;
-  set_texture_reqs(ctx, inst, sreg_index);
-
-  if (inst->Texture.Texture != TGSI_TEXTURE_2D_MSAA &&
-      inst->Texture.Texture != TGSI_TEXTURE_2D_ARRAY_MSAA) {
-    set_buf_error(ctx);
-    return;
-  }
-
-  emit_buff(ctx, "%s = %s(textureSamples(%s));\n", dst, get_string(dtypeprefix),
-            srcs[sampler_index]);
-}
-
-static const char *get_tex_inst_ext(struct tgsi_full_instruction *inst) {
-  switch (inst->Instruction.Opcode) {
-  case TGSI_OPCODE_LODQ:
-    return "QueryLOD";
-  case TGSI_OPCODE_TXP:
-    if (inst->Texture.Texture == TGSI_TEXTURE_CUBE ||
-        inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY ||
-        inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY)
-      return "";
-    else if (inst->Texture.NumOffsets == 1)
-      return "ProjOffset";
-    else
-      return "Proj";
-  case TGSI_OPCODE_TXL:
-  case TGSI_OPCODE_TXL2:
-    if (inst->Texture.NumOffsets == 1)
-      return "LodOffset";
-    else
-      return "Lod";
-  case TGSI_OPCODE_TXD:
-    if (inst->Texture.NumOffsets == 1)
-      return "GradOffset";
-    else
-      return "Grad";
-  case TGSI_OPCODE_TG4:
-    if (inst->Texture.NumOffsets == 4)
-      return "GatherOffsets";
-    else if (inst->Texture.NumOffsets == 1)
-      return "GatherOffset";
-    else
-      return "Gather";
-  default:
-    if (inst->Texture.NumOffsets == 1)
-      return "Offset";
-    else
-      return "";
-  }
-}
-
-static bool fill_offset_buffer(struct dump_ctx *ctx,
-                               struct tgsi_full_instruction *inst,
-                               char *offbuf) {
-  if (inst->TexOffsets[0].File == TGSI_FILE_IMMEDIATE) {
-    struct immed *imd = &ctx->imm[inst->TexOffsets[0].Index];
-    switch (inst->Texture.Texture) {
-    case TGSI_TEXTURE_1D:
-    case TGSI_TEXTURE_1D_ARRAY:
-    case TGSI_TEXTURE_SHADOW1D:
-    case TGSI_TEXTURE_SHADOW1D_ARRAY:
-      snprintf(offbuf, 256, ", ivec2(%d, 0)",
-               imd->val[inst->TexOffsets[0].SwizzleX].i);
-      break;
-    case TGSI_TEXTURE_RECT:
-    case TGSI_TEXTURE_SHADOWRECT:
-    case TGSI_TEXTURE_2D:
-    case TGSI_TEXTURE_2D_ARRAY:
-    case TGSI_TEXTURE_SHADOW2D:
-    case TGSI_TEXTURE_SHADOW2D_ARRAY:
-      snprintf(offbuf, 256, ", ivec2(%d, %d)",
-               imd->val[inst->TexOffsets[0].SwizzleX].i,
-               imd->val[inst->TexOffsets[0].SwizzleY].i);
-      break;
-    case TGSI_TEXTURE_3D:
-      snprintf(offbuf, 256, ", ivec3(%d, %d, %d)",
-               imd->val[inst->TexOffsets[0].SwizzleX].i,
-               imd->val[inst->TexOffsets[0].SwizzleY].i,
-               imd->val[inst->TexOffsets[0].SwizzleZ].i);
-      break;
-    default:
-      return false;
-    }
-  } else if (inst->TexOffsets[0].File == TGSI_FILE_TEMPORARY) {
-    struct vrend_temp_range *range =
-        find_temp_range(ctx, inst->TexOffsets[0].Index);
-    int idx = inst->TexOffsets[0].Index - range->first;
-    switch (inst->Texture.Texture) {
-    case TGSI_TEXTURE_1D:
-    case TGSI_TEXTURE_1D_ARRAY:
-    case TGSI_TEXTURE_SHADOW1D:
-    case TGSI_TEXTURE_SHADOW1D_ARRAY:
-      snprintf(offbuf, 256, ", int(floatBitsToInt(temp%d[%d].%c))",
-               range->first, idx, get_swiz_char(inst->TexOffsets[0].SwizzleX));
-      break;
-    case TGSI_TEXTURE_RECT:
-    case TGSI_TEXTURE_SHADOWRECT:
-    case TGSI_TEXTURE_2D:
-    case TGSI_TEXTURE_2D_ARRAY:
-    case TGSI_TEXTURE_SHADOW2D:
-    case TGSI_TEXTURE_SHADOW2D_ARRAY:
-      snprintf(offbuf, 256,
-               ", ivec2(floatBitsToInt(temp%d[%d].%c), "
-               "floatBitsToInt(temp%d[%d].%c))",
-               range->first, idx, get_swiz_char(inst->TexOffsets[0].SwizzleX),
-               range->first, idx, get_swiz_char(inst->TexOffsets[0].SwizzleY));
-      break;
-    case TGSI_TEXTURE_3D:
-      snprintf(offbuf, 256,
-               ", ivec3(floatBitsToInt(temp%d[%d].%c), "
-               "floatBitsToInt(temp%d[%d].%c), floatBitsToInt(temp%d[%d].%c)",
-               range->first, idx, get_swiz_char(inst->TexOffsets[0].SwizzleX),
-               range->first, idx, get_swiz_char(inst->TexOffsets[0].SwizzleY),
-               range->first, idx, get_swiz_char(inst->TexOffsets[0].SwizzleZ));
-      break;
-    default:
-      return false;
-      break;
-    }
-  } else if (inst->TexOffsets[0].File == TGSI_FILE_INPUT) {
-    for (uint32_t j = 0; j < ctx->num_inputs; j++) {
-      if (ctx->inputs[j].first != inst->TexOffsets[0].Index)
-        continue;
-      switch (inst->Texture.Texture) {
-      case TGSI_TEXTURE_1D:
-      case TGSI_TEXTURE_1D_ARRAY:
-      case TGSI_TEXTURE_SHADOW1D:
-      case TGSI_TEXTURE_SHADOW1D_ARRAY:
-        snprintf(offbuf, 256, ", int(floatBitsToInt(%s.%c))",
-                 ctx->inputs[j].glsl_name,
-                 get_swiz_char(inst->TexOffsets[0].SwizzleX));
-        break;
-      case TGSI_TEXTURE_RECT:
-      case TGSI_TEXTURE_SHADOWRECT:
-      case TGSI_TEXTURE_2D:
-      case TGSI_TEXTURE_2D_ARRAY:
-      case TGSI_TEXTURE_SHADOW2D:
-      case TGSI_TEXTURE_SHADOW2D_ARRAY:
-        snprintf(offbuf, 256,
-                 ", ivec2(floatBitsToInt(%s.%c), floatBitsToInt(%s.%c))",
-                 ctx->inputs[j].glsl_name,
-                 get_swiz_char(inst->TexOffsets[0].SwizzleX),
-                 ctx->inputs[j].glsl_name,
-                 get_swiz_char(inst->TexOffsets[0].SwizzleY));
-        break;
-      case TGSI_TEXTURE_3D:
-        snprintf(offbuf, 256,
-                 ", ivec3(floatBitsToInt(%s.%c), floatBitsToInt(%s.%c), "
-                 "floatBitsToInt(%s.%c)",
-                 ctx->inputs[j].glsl_name,
-                 get_swiz_char(inst->TexOffsets[0].SwizzleX),
-                 ctx->inputs[j].glsl_name,
-                 get_swiz_char(inst->TexOffsets[0].SwizzleY),
-                 ctx->inputs[j].glsl_name,
-                 get_swiz_char(inst->TexOffsets[0].SwizzleZ));
-        break;
-      default:
-        return false;
-        break;
-      }
-    }
-  }
-  return true;
-}
-
-static void translate_tex(struct dump_ctx *ctx,
-                          struct tgsi_full_instruction *inst,
-                          struct source_info *sinfo, struct dest_info *dinfo,
-                          const char *srcs[4], const char *dst,
-                          const char *writemask) {
-  enum vrend_type_qualifier txfi = TYPE_CONVERSION_NONE;
-  unsigned twm = TGSI_WRITEMASK_NONE, gwm = TGSI_WRITEMASK_NONE;
-  enum vrend_type_qualifier dtypeprefix = TYPE_CONVERSION_NONE;
-  bool is_shad;
-  char offbuf[256] = "";
-  char bias[256] = "";
-  int sampler_index;
-  const char *tex_ext;
-
-  set_texture_reqs(ctx, inst, sinfo->sreg_index);
-  is_shad = samplertype_is_shadow(inst->Texture.Texture);
-
-  switch (ctx->samplers[sinfo->sreg_index].tgsi_sampler_return) {
-  case TGSI_RETURN_TYPE_SINT:
-    /* if dstconv isn't an int */
-    if (dinfo->dstconv != INT)
-      dtypeprefix = INT_BITS_TO_FLOAT;
-    break;
-  case TGSI_RETURN_TYPE_UINT:
-    /* if dstconv isn't an int */
-    if (dinfo->dstconv != INT)
-      dtypeprefix = UINT_BITS_TO_FLOAT;
-    break;
-  }
-
-  sampler_index = 1;
-
-  if (inst->Instruction.Opcode == TGSI_OPCODE_LODQ)
-    ctx->shader_req_bits |= SHADER_REQ_LODQ;
-
-  switch (inst->Texture.Texture) {
-  case TGSI_TEXTURE_1D:
-  case TGSI_TEXTURE_BUFFER:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
-      twm = TGSI_WRITEMASK_NONE;
-    else
-      twm = TGSI_WRITEMASK_X;
-    txfi = INT;
-    break;
-  case TGSI_TEXTURE_1D_ARRAY:
-    twm = TGSI_WRITEMASK_XY;
-    txfi = IVEC2;
-    break;
-  case TGSI_TEXTURE_2D:
-  case TGSI_TEXTURE_RECT:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
-      twm = TGSI_WRITEMASK_NONE;
-    else
-      twm = TGSI_WRITEMASK_XY;
-    txfi = IVEC2;
-    break;
-  case TGSI_TEXTURE_SHADOW1D:
-  case TGSI_TEXTURE_SHADOW2D:
-  case TGSI_TEXTURE_SHADOW1D_ARRAY:
-  case TGSI_TEXTURE_SHADOWRECT:
-  case TGSI_TEXTURE_3D:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
-      twm = TGSI_WRITEMASK_NONE;
-    else if (inst->Instruction.Opcode == TGSI_OPCODE_TG4)
-      twm = TGSI_WRITEMASK_XY;
-    else
-      twm = TGSI_WRITEMASK_XYZ;
-    txfi = IVEC3;
-    break;
-  case TGSI_TEXTURE_CUBE:
-  case TGSI_TEXTURE_2D_ARRAY:
-    twm = TGSI_WRITEMASK_XYZ;
-    txfi = IVEC3;
-    break;
-  case TGSI_TEXTURE_2D_MSAA:
-    twm = TGSI_WRITEMASK_XY;
-    txfi = IVEC2;
-    break;
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    twm = TGSI_WRITEMASK_XYZ;
-    txfi = IVEC3;
-    break;
-
-  case TGSI_TEXTURE_SHADOWCUBE:
-  case TGSI_TEXTURE_SHADOW2D_ARRAY:
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-  case TGSI_TEXTURE_CUBE_ARRAY:
-  default:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_TG4 &&
-        inst->Texture.Texture != TGSI_TEXTURE_CUBE_ARRAY &&
-        inst->Texture.Texture != TGSI_TEXTURE_SHADOWCUBE_ARRAY)
-      twm = TGSI_WRITEMASK_XYZ;
-    else
-      twm = TGSI_WRITEMASK_NONE;
-    txfi = TYPE_CONVERSION_NONE;
-    break;
-  }
-
-  if (inst->Instruction.Opcode == TGSI_OPCODE_TXD) {
-    switch (inst->Texture.Texture) {
-    case TGSI_TEXTURE_1D:
-    case TGSI_TEXTURE_SHADOW1D:
-    case TGSI_TEXTURE_1D_ARRAY:
-    case TGSI_TEXTURE_SHADOW1D_ARRAY:
-      gwm = TGSI_WRITEMASK_X;
-      break;
-    case TGSI_TEXTURE_2D:
-    case TGSI_TEXTURE_SHADOW2D:
-    case TGSI_TEXTURE_2D_ARRAY:
-    case TGSI_TEXTURE_SHADOW2D_ARRAY:
-    case TGSI_TEXTURE_RECT:
-    case TGSI_TEXTURE_SHADOWRECT:
-      gwm = TGSI_WRITEMASK_XY;
-      break;
-    case TGSI_TEXTURE_3D:
-    case TGSI_TEXTURE_CUBE:
-    case TGSI_TEXTURE_SHADOWCUBE:
-    case TGSI_TEXTURE_CUBE_ARRAY:
-      gwm = TGSI_WRITEMASK_XYZ;
-      break;
-    default:
-      gwm = TGSI_WRITEMASK_NONE;
-      break;
-    }
-  }
-
-  switch (inst->Instruction.Opcode) {
-  case TGSI_OPCODE_TXB2:
-  case TGSI_OPCODE_TXL2:
-  case TGSI_OPCODE_TEX2:
-    sampler_index = 2;
-    if (inst->Instruction.Opcode != TGSI_OPCODE_TEX2)
-      snprintf(bias, 64, ", %s.x", srcs[1]);
-    else if (inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY)
-      snprintf(bias, 64, ", float(%s)", srcs[1]);
-    break;
-  case TGSI_OPCODE_TXB:
-  case TGSI_OPCODE_TXL:
-    snprintf(bias, 64, ", %s.w", srcs[0]);
-    break;
-  case TGSI_OPCODE_TXF:
-    if (inst->Texture.Texture == TGSI_TEXTURE_1D ||
-        inst->Texture.Texture == TGSI_TEXTURE_2D ||
-        inst->Texture.Texture == TGSI_TEXTURE_2D_MSAA ||
-        inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY_MSAA ||
-        inst->Texture.Texture == TGSI_TEXTURE_3D ||
-        inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY ||
-        inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY)
-      snprintf(bias, 64, ", int(%s.w)", srcs[0]);
-    break;
-  case TGSI_OPCODE_TXD:
-    if ((inst->Texture.Texture == TGSI_TEXTURE_1D ||
-         inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D ||
-         inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY ||
-         inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D_ARRAY))
-      snprintf(bias, 128, ", vec2(%s%s, 0), vec2(%s%s, 0)", srcs[1],
-               get_wm_string(gwm), srcs[2], get_wm_string(gwm));
-    else
-      snprintf(bias, 128, ", %s%s, %s%s", srcs[1], get_wm_string(gwm), srcs[2],
-               get_wm_string(gwm));
-    sampler_index = 3;
-    break;
-  case TGSI_OPCODE_TG4:
-    sampler_index = 2;
-    ctx->shader_req_bits |= SHADER_REQ_TG4;
-    if (inst->Texture.NumOffsets == 1) {
-      if (inst->TexOffsets[0].File != TGSI_FILE_IMMEDIATE)
-        ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    }
-    if (is_shad) {
-      if (inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE ||
-          inst->Texture.Texture == TGSI_TEXTURE_SHADOW2D_ARRAY)
-        snprintf(bias, 64, ", %s.w", srcs[0]);
-      else if (inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY)
-        snprintf(bias, 64, ", %s.x", srcs[1]);
-      else
-        snprintf(bias, 64, ", %s.z", srcs[0]);
-    } else if (sinfo->tg4_has_component) {
-      if (inst->Texture.NumOffsets == 0) {
-        if (inst->Texture.Texture == TGSI_TEXTURE_2D ||
-            inst->Texture.Texture == TGSI_TEXTURE_RECT ||
-            inst->Texture.Texture == TGSI_TEXTURE_CUBE ||
-            inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY ||
-            inst->Texture.Texture == TGSI_TEXTURE_CUBE_ARRAY)
-          snprintf(bias, 64, ", int(%s)", srcs[1]);
-      } else if (inst->Texture.NumOffsets) {
-        if (inst->Texture.Texture == TGSI_TEXTURE_2D ||
-            inst->Texture.Texture == TGSI_TEXTURE_RECT ||
-            inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY)
-          snprintf(bias, 64, ", int(%s)", srcs[1]);
-      }
-    }
-    break;
-  default:
-    bias[0] = 0;
-  }
-
-  tex_ext = get_tex_inst_ext(inst);
-
-  if (inst->Texture.NumOffsets == 1) {
-    if (inst->TexOffsets[0].Index >= (int)ARRAY_SIZE(ctx->imm)) {
-      set_buf_error(ctx);
-      return;
-    }
-
-    if (!fill_offset_buffer(ctx, inst, offbuf)) {
-      set_buf_error(ctx);
-      return;
-    }
-
-    if (inst->Instruction.Opcode == TGSI_OPCODE_TXL ||
-        inst->Instruction.Opcode == TGSI_OPCODE_TXL2 ||
-        inst->Instruction.Opcode == TGSI_OPCODE_TXD ||
-        (inst->Instruction.Opcode == TGSI_OPCODE_TG4 && is_shad)) {
-      char tmp[256];
-      strcpy(tmp, offbuf);
-      strcpy(offbuf, bias);
-      strcpy(bias, tmp);
-    }
-  }
-
-  /* On GLES we have to normalized the coordinate for all but the texel fetch
-   * instruction */
-  if (inst->Instruction.Opcode != TGSI_OPCODE_TXF &&
-      (inst->Texture.Texture == TGSI_TEXTURE_RECT ||
-       inst->Texture.Texture == TGSI_TEXTURE_SHADOWRECT)) {
-
-    char buf[255];
-    const char *new_srcs[4] = {buf, srcs[1], srcs[2], srcs[3]};
-
-    switch (inst->Instruction.Opcode) {
-    case TGSI_OPCODE_TXP:
-      snprintf(buf, 255, "vec4(%s)/vec4(textureSize(%s, 0), 1, 1)", srcs[0],
-               srcs[sampler_index]);
-      break;
-
-    case TGSI_OPCODE_TG4:
-      snprintf(buf, 255, "%s.xy/vec2(textureSize(%s, 0))", srcs[0],
-               srcs[sampler_index]);
-      break;
-
-    default:
-      /* Non TG4 ops have the compare value in the z components */
-      if (inst->Texture.Texture == TGSI_TEXTURE_SHADOWRECT) {
-        snprintf(buf, 255, "vec3(%s.xy/vec2(textureSize(%s, 0)), %s.z)",
-                 srcs[0], srcs[sampler_index], srcs[0]);
-      } else
-        snprintf(buf, 255, "%s.xy/vec2(textureSize(%s, 0))", srcs[0],
-                 srcs[sampler_index]);
-    }
-    srcs = new_srcs;
-  }
-
-  if (inst->Instruction.Opcode == TGSI_OPCODE_TXF) {
-    if ((inst->Texture.Texture == TGSI_TEXTURE_1D ||
-         inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY ||
-         inst->Texture.Texture == TGSI_TEXTURE_RECT)) {
-      if (inst->Texture.Texture == TGSI_TEXTURE_1D)
-        emit_buff(
-            ctx, "%s = %s(%s(texelFetch%s(%s, ivec2(%s(%s%s), 0)%s%s)%s));\n",
-            dst, get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-            srcs[sampler_index], get_string(txfi), srcs[0], get_wm_string(twm),
-            bias, offbuf, dinfo->dst_override_no_wm[0] ? "" : writemask);
-      else if (inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY) {
-        /* the y coordinate must go into the z element and the y must be zero */
-        emit_buff(
-            ctx,
-            "%s = %s(%s(texelFetch%s(%s, ivec3(%s(%s%s), 0).xzy%s%s)%s));\n",
-            dst, get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-            srcs[sampler_index], get_string(txfi), srcs[0], get_wm_string(twm),
-            bias, offbuf, dinfo->dst_override_no_wm[0] ? "" : writemask);
-      } else {
-        emit_buff(ctx, "%s = %s(%s(texelFetch%s(%s, %s(%s%s), 0%s)%s));\n", dst,
-                  get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-                  srcs[sampler_index], get_string(txfi), srcs[0],
-                  get_wm_string(twm), offbuf,
-                  dinfo->dst_override_no_wm[0] ? "" : writemask);
-      }
-    } else {
-      emit_buff(ctx, "%s = %s(%s(texelFetch%s(%s, %s(%s%s)%s%s)%s));\n", dst,
-                get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-                srcs[sampler_index], get_string(txfi), srcs[0],
-                get_wm_string(twm), bias, offbuf,
-                dinfo->dst_override_no_wm[0] ? "" : writemask);
-    }
-  } else if (ctx->cfg->glsl_version < 140 &&
-             (ctx->shader_req_bits & SHADER_REQ_SAMPLER_RECT)) {
-    /* rect is special in GLSL 1.30 */
-    if (inst->Texture.Texture == TGSI_TEXTURE_RECT)
-      emit_buff(ctx, "%s = texture2DRect(%s, %s.xy)%s;\n", dst,
-                srcs[sampler_index], srcs[0], writemask);
-    else if (inst->Texture.Texture == TGSI_TEXTURE_SHADOWRECT)
-      emit_buff(ctx, "%s = shadow2DRect(%s, %s.xyz)%s;\n", dst,
-                srcs[sampler_index], srcs[0], writemask);
-  } else if (is_shad && inst->Instruction.Opcode !=
-                            TGSI_OPCODE_TG4) { /* TGSI returns 1.0 in alpha */
-    const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-    const struct tgsi_full_src_register *src = &inst->Src[sampler_index];
-
-    if ((inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D ||
-         inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D_ARRAY)) {
-      if (inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D) {
-        if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
-          emit_buff(ctx,
-                    "%s = %s(%s(vec4(vec4(texture%s(%s, vec4(%s%s.xzw, 0).xwyz "
-                    "%s%s)) * %sshadmask%d + %sshadadd%d)%s));\n",
-                    dst, get_string(dinfo->dstconv), get_string(dtypeprefix),
-                    tex_ext, srcs[sampler_index], srcs[0], get_wm_string(twm),
-                    offbuf, bias, cname, src->Register.Index, cname,
-                    src->Register.Index, writemask);
-        else
-          emit_buff(ctx,
-                    "%s = %s(%s(vec4(vec4(texture%s(%s, vec3(%s%s.xz, 0).xzy "
-                    "%s%s)) * %sshadmask%d + %sshadadd%d)%s));\n",
-                    dst, get_string(dinfo->dstconv), get_string(dtypeprefix),
-                    tex_ext, srcs[sampler_index], srcs[0], get_wm_string(twm),
-                    offbuf, bias, cname, src->Register.Index, cname,
-                    src->Register.Index, writemask);
-      } else if (inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D_ARRAY) {
-        emit_buff(ctx,
-                  "%s = %s(%s(vec4(vec4(texture%s(%s, vec4(%s%s, 0).xwyz "
-                  "%s%s)) * %sshadmask%d + %sshadadd%d)%s));\n",
-                  dst, get_string(dinfo->dstconv), get_string(dtypeprefix),
-                  tex_ext, srcs[sampler_index], srcs[0], get_wm_string(twm),
-                  offbuf, bias, cname, src->Register.Index, cname,
-                  src->Register.Index, writemask);
-      }
-    } else
-      emit_buff(ctx,
-                "%s = %s(%s(vec4(vec4(texture%s(%s, %s%s%s%s)) * %sshadmask%d "
-                "+ %sshadadd%d)%s));\n",
-                dst, get_string(dinfo->dstconv), get_string(dtypeprefix),
-                tex_ext, srcs[sampler_index], srcs[0], get_wm_string(twm),
-                offbuf, bias, cname, src->Register.Index, cname,
-                src->Register.Index, writemask);
-  } else {
-    /* OpenGL ES do not support 1D texture
-     * so we use a 2D texture with a parameter set to 0.5
-     */
-    if ((inst->Texture.Texture == TGSI_TEXTURE_1D ||
-         inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY)) {
-      if (inst->Texture.Texture == TGSI_TEXTURE_1D) {
-        if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
-          emit_buff(ctx,
-                    "%s = %s(%s(texture%s(%s, vec3(%s.xw, 0).xzy %s%s)%s));\n",
-                    dst, get_string(dinfo->dstconv), get_string(dtypeprefix),
-                    tex_ext, srcs[sampler_index], srcs[0], offbuf, bias,
-                    dinfo->dst_override_no_wm[0] ? "" : writemask);
-        else
-          emit_buff(
-              ctx, "%s = %s(%s(texture%s(%s, vec2(%s%s, 0.5) %s%s)%s));\n", dst,
-              get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-              srcs[sampler_index], srcs[0], get_wm_string(twm), offbuf, bias,
-              dinfo->dst_override_no_wm[0] ? "" : writemask);
-      } else if (inst->Texture.Texture == TGSI_TEXTURE_1D_ARRAY) {
-        if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
-          emit_buff(ctx,
-                    "%s = %s(%s(texture%s(%s, vec3(%s.x / %s.w, 0, %s.y) "
-                    "%s%s)%s));\n",
-                    dst, get_string(dinfo->dstconv), get_string(dtypeprefix),
-                    tex_ext, srcs[sampler_index], srcs[0], srcs[0], srcs[0],
-                    offbuf, bias,
-                    dinfo->dst_override_no_wm[0] ? "" : writemask);
-        else
-          emit_buff(
-              ctx, "%s = %s(%s(texture%s(%s, vec3(%s%s, 0).xzy %s%s)%s));\n",
-              dst, get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-              srcs[sampler_index], srcs[0], get_wm_string(twm), offbuf, bias,
-              dinfo->dst_override_no_wm[0] ? "" : writemask);
-      }
-    } else {
-      emit_buff(ctx, "%s = %s(%s(texture%s(%s, %s%s%s%s)%s));\n", dst,
-                get_string(dinfo->dstconv), get_string(dtypeprefix), tex_ext,
-                srcs[sampler_index], srcs[0], get_wm_string(twm), offbuf, bias,
-                dinfo->dst_override_no_wm[0] ? "" : writemask);
-    }
-  }
-}
-
-static void create_swizzled_clipdist(struct dump_ctx *ctx,
-                                     struct vrend_strbuf *result,
-                                     const struct tgsi_full_src_register *src,
-                                     int input_idx, bool gl_in,
-                                     const char *stypeprefix,
-                                     const char *prefix, const char *arrayname,
-                                     int offset) {
-  char clipdistvec[4][64] = {
-      0,
-  };
-
-  char clip_indirect[32] = "";
-
-  bool has_prev_vals = (ctx->key->prev_stage_num_cull_out +
-                        ctx->key->prev_stage_num_clip_out) > 0;
-  int num_culls = has_prev_vals ? ctx->key->prev_stage_num_cull_out : 0;
-  int num_clips =
-      has_prev_vals ? ctx->key->prev_stage_num_clip_out : ctx->num_in_clip_dist;
-  int base_idx = ctx->inputs[input_idx].sid * 4;
-
-  /* With arrays enabled , but only when gl_ClipDistance or gl_CullDistance are
-   * emitted (>4) then we need to add indirect addressing */
-  if (src->Register.Indirect &&
-      ((num_clips > 4 && base_idx < num_clips) || num_culls > 4))
-    snprintf(clip_indirect, 32, "4*addr%d +", src->Indirect.Index);
-  else if (src->Register.Index != offset)
-    snprintf(clip_indirect, 32, "4*%d +", src->Register.Index - offset);
-
-  for (unsigned cc = 0; cc < 4; cc++) {
-    const char *cc_name = ctx->inputs[input_idx].glsl_name;
-    int idx = base_idx;
-    if (cc == 0)
-      idx += src->Register.SwizzleX;
-    else if (cc == 1)
-      idx += src->Register.SwizzleY;
-    else if (cc == 2)
-      idx += src->Register.SwizzleZ;
-    else if (cc == 3)
-      idx += src->Register.SwizzleW;
-
-    if (num_culls) {
-      if (idx >= num_clips) {
-        idx -= num_clips;
-        cc_name = "gl_CullDistance";
-      }
-      if (ctx->key->prev_stage_num_cull_out)
-        if (idx >= ctx->key->prev_stage_num_cull_out)
-          idx = 0;
-    } else {
-      if (ctx->key->prev_stage_num_clip_out)
-        if (idx >= ctx->key->prev_stage_num_clip_out)
-          idx = 0;
-    }
-    if (gl_in)
-      snprintf(clipdistvec[cc], 64, "%sgl_in%s.%s[%s %d]", prefix, arrayname,
-               cc_name, clip_indirect, idx);
-    else
-      snprintf(clipdistvec[cc], 64, "%s%s%s[%s %d]", prefix, arrayname, cc_name,
-               clip_indirect, idx);
-  }
-  strbuf_fmt(result, "%s(vec4(%s,%s,%s,%s))", stypeprefix, clipdistvec[0],
-             clipdistvec[1], clipdistvec[2], clipdistvec[3]);
-}
-
-static void load_clipdist_fs(struct dump_ctx *ctx, struct vrend_strbuf *result,
-                             const struct tgsi_full_src_register *src,
-                             int input_idx, bool gl_in, const char *stypeprefix,
-                             int offset) {
-  char clip_indirect[32] = "";
-
-  int base_idx = ctx->inputs[input_idx].sid;
-
-  /* With arrays enabled , but only when gl_ClipDistance or gl_CullDistance are
-   * emitted (>4) then we need to add indirect addressing */
-  if (src->Register.Indirect)
-    snprintf(clip_indirect, 32, "addr%d + %d", src->Indirect.Index, base_idx);
-  else
-    snprintf(clip_indirect, 32, "%d + %d", src->Register.Index - offset,
-             base_idx);
-
-  if (gl_in)
-    strbuf_fmt(result, "%s(clip_dist_temp[%s])", stypeprefix, clip_indirect);
-  else
-    strbuf_fmt(result, "%s(clip_dist_temp[%s])", stypeprefix, clip_indirect);
-}
-
-static enum vrend_type_qualifier get_coord_prefix(int resource, bool *is_ms) {
-  switch (resource) {
-  case TGSI_TEXTURE_1D:
-    return IVEC2;
-  case TGSI_TEXTURE_BUFFER:
-    return INT;
-  case TGSI_TEXTURE_1D_ARRAY:
-    return IVEC3;
-  case TGSI_TEXTURE_2D:
-  case TGSI_TEXTURE_RECT:
-    return IVEC2;
-  case TGSI_TEXTURE_3D:
-  case TGSI_TEXTURE_CUBE:
-  case TGSI_TEXTURE_2D_ARRAY:
-  case TGSI_TEXTURE_CUBE_ARRAY:
-    return IVEC3;
-  case TGSI_TEXTURE_2D_MSAA:
-    *is_ms = true;
-    return IVEC2;
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    *is_ms = true;
-    return IVEC3;
-  default:
-    return TYPE_CONVERSION_NONE;
-  }
-}
-
-static bool is_integer_memory(struct dump_ctx *ctx,
-                              enum tgsi_file_type file_type, uint32_t index) {
-  switch (file_type) {
-  case TGSI_FILE_BUFFER:
-    return !!(ctx->ssbo_integer_mask & (1 << index));
-  case TGSI_FILE_MEMORY:
-    return ctx->integer_memory;
-  default:
-    return false;
-  }
-}
-
-static void set_memory_qualifier(struct dump_ctx *ctx,
-                                 struct tgsi_full_instruction *inst,
-                                 uint32_t reg_index, bool indirect) {
-  if (inst->Memory.Qualifier == TGSI_MEMORY_COHERENT) {
-    if (indirect) {
-      uint32_t mask = ctx->ssbo_used_mask;
-      while (mask)
-        ctx->ssbo_memory_qualifier[u_bit_scan(&mask)] = TGSI_MEMORY_COHERENT;
-    } else
-      ctx->ssbo_memory_qualifier[reg_index] = TGSI_MEMORY_COHERENT;
-  }
-}
-
-static void emit_store_mem(struct dump_ctx *ctx, const char *dst, int writemask,
-                           const char *srcs[4], const char *conversion) {
-  static const char swizzle_char[] = "xyzw";
-  for (int i = 0; i < 4; ++i) {
-    if (writemask & (1 << i)) {
-      emit_buff(ctx,
-                "%s[(uint(floatBitsToUint(%s)) >> 2) + %du] = %s(%s).%c;\n",
-                dst, srcs[0], i, conversion, srcs[1], swizzle_char[i]);
-    }
-  }
-}
-
-static void translate_store(struct dump_ctx *ctx,
-                            struct tgsi_full_instruction *inst,
-                            struct source_info *sinfo, const char *srcs[4],
-                            const char *dst) {
-  const struct tgsi_full_dst_register *dst_reg = &inst->Dst[0];
-
-  if (dst_reg->Register.File == TGSI_FILE_IMAGE) {
-    bool is_ms = false;
-    enum vrend_type_qualifier coord_prefix = get_coord_prefix(
-        ctx->images[dst_reg->Register.Index].decl.Resource, &is_ms);
-    enum tgsi_return_type itype;
-    char ms_str[32] = "";
-    enum vrend_type_qualifier stypeprefix = TYPE_CONVERSION_NONE;
-    const char *conversion =
-        sinfo->override_no_cast[0] ? "" : get_string(FLOAT_BITS_TO_INT);
-    get_internalformat_string(inst->Memory.Format, &itype);
-    if (is_ms) {
-      snprintf(ms_str, 32, "int(%s.w),", srcs[0]);
-    }
-    switch (itype) {
-    case TGSI_RETURN_TYPE_UINT:
-      stypeprefix = FLOAT_BITS_TO_UINT;
-      break;
-    case TGSI_RETURN_TYPE_SINT:
-      stypeprefix = FLOAT_BITS_TO_INT;
-      break;
-    default:
-      break;
-    }
-    if (!dst_reg->Register.Indirect) {
-      emit_buff(ctx, "imageStore(%s,%s(%s(%s)),%s%s(%s));\n", dst,
-                get_string(coord_prefix), conversion, srcs[0], ms_str,
-                get_string(stypeprefix), srcs[1]);
-    } else {
-      struct vrend_array *image =
-          lookup_image_array_ptr(ctx, dst_reg->Register.Index);
-      if (image) {
-        int basearrayidx = image->first;
-        int array_size = image->array_size;
-        emit_buff(ctx, "switch (addr%d + %d) {\n", dst_reg->Indirect.Index,
-                  dst_reg->Register.Index - basearrayidx);
-        const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-
-        for (int i = 0; i < array_size; ++i) {
-          emit_buff(
-              ctx,
-              "case %d: imageStore(%simg%d[%d],%s(%s(%s)),%s%s(%s)); break;\n",
-              i, cname, basearrayidx, i, get_string(coord_prefix), conversion,
-              srcs[0], ms_str, get_string(stypeprefix), srcs[1]);
-        }
-        emit_buff(ctx, "}\n");
-      }
-    }
-  } else if (dst_reg->Register.File == TGSI_FILE_BUFFER ||
-             dst_reg->Register.File == TGSI_FILE_MEMORY) {
-    enum vrend_type_qualifier dtypeprefix;
-    set_memory_qualifier(ctx, inst, dst_reg->Register.Index,
-                         dst_reg->Register.Indirect);
-    dtypeprefix =
-        is_integer_memory(ctx, dst_reg->Register.File, dst_reg->Register.Index)
-            ? FLOAT_BITS_TO_INT
-            : FLOAT_BITS_TO_UINT;
-    const char *conversion =
-        sinfo->override_no_cast[1] ? "" : get_string(dtypeprefix);
-
-    if (!dst_reg->Register.Indirect) {
-      emit_store_mem(ctx, dst, dst_reg->Register.WriteMask, srcs, conversion);
-    } else {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      bool atomic_ssbo = ctx->ssbo_atomic_mask & (1 << dst_reg->Register.Index);
-      int base =
-          atomic_ssbo ? ctx->ssbo_atomic_array_base : ctx->ssbo_array_base;
-      uint32_t mask = ctx->ssbo_used_mask;
-      int start, array_count;
-      u_bit_scan_consecutive_range(&mask, &start, &array_count);
-      int basearrayidx = lookup_image_array(ctx, dst_reg->Register.Index);
-      emit_buff(ctx, "switch (addr%d + %d) {\n", dst_reg->Indirect.Index,
-                dst_reg->Register.Index - base);
-
-      for (int i = 0; i < array_count; ++i) {
-        char dst_tmp[128];
-        emit_buff(ctx, "case %d:\n", i);
-        snprintf(dst_tmp, 128, "%simg%d[%d]", cname, basearrayidx, i);
-        emit_store_mem(ctx, dst_tmp, dst_reg->Register.WriteMask, srcs,
-                       conversion);
-        emit_buff(ctx, "break;\n");
-      }
-      emit_buf(ctx, "}\n");
-    }
-  }
-}
-
-static void emit_load_mem(struct dump_ctx *ctx, const char *dst, int writemask,
-                          const char *conversion, const char *atomic_op,
-                          const char *src0, const char *atomic_src) {
-  static const char swizzle_char[] = "xyzw";
-  for (int i = 0; i < 4; ++i) {
-    if (writemask & (1 << i)) {
-      emit_buff(ctx, "%s.%c = (%s(%s(%s[ssbo_addr_temp + %du]%s)));\n", dst,
-                swizzle_char[i], conversion, atomic_op, src0, i, atomic_src);
-    }
-  }
-}
-
-static void translate_load(struct dump_ctx *ctx,
-                           struct tgsi_full_instruction *inst,
-                           struct source_info *sinfo, struct dest_info *dinfo,
-                           const char *srcs[4], const char *dst,
-                           const char *writemask) {
-  const struct tgsi_full_src_register *src = &inst->Src[0];
-  if (src->Register.File == TGSI_FILE_IMAGE) {
-    bool is_ms = false;
-    enum vrend_type_qualifier coord_prefix =
-        get_coord_prefix(ctx->images[sinfo->sreg_index].decl.Resource, &is_ms);
-    enum vrend_type_qualifier dtypeprefix = TYPE_CONVERSION_NONE;
-    const char *conversion =
-        sinfo->override_no_cast[1] ? "" : get_string(FLOAT_BITS_TO_INT);
-    enum tgsi_return_type itype;
-    get_internalformat_string(ctx->images[sinfo->sreg_index].decl.Format,
-                              &itype);
-    char ms_str[32] = "";
-    const char *wm = dinfo->dst_override_no_wm[0] ? "" : writemask;
-    if (is_ms) {
-      snprintf(ms_str, 32, ", int(%s.w)", srcs[1]);
-    }
-    switch (itype) {
-    case TGSI_RETURN_TYPE_UINT:
-      dtypeprefix = UINT_BITS_TO_FLOAT;
-      break;
-    case TGSI_RETURN_TYPE_SINT:
-      dtypeprefix = INT_BITS_TO_FLOAT;
-      break;
-    default:
-      break;
-    }
-
-    /* On GL WR translates to writable, but on GLES we translate this to
-     * writeonly because for most formats one has to specify one or the other,
-     * so if we have an image with the TGSI WR specification, and read from it,
-     * we drop the Writable flag. For the images that allow RW this is of no
-     * consequence, and for the others a write access will fail instead of the
-     * read access, but this doesn't constitue a regression because we couldn't
-     * do both, read and write, anyway. */
-    if (ctx->images[sinfo->sreg_index].decl.Writable &&
-        (ctx->images[sinfo->sreg_index].decl.Format != PIPE_FORMAT_R32_FLOAT) &&
-        (ctx->images[sinfo->sreg_index].decl.Format != PIPE_FORMAT_R32_SINT) &&
-        (ctx->images[sinfo->sreg_index].decl.Format != PIPE_FORMAT_R32_UINT))
-      ctx->images[sinfo->sreg_index].decl.Writable = 0;
-
-    if (!inst->Src[0].Register.Indirect) {
-      emit_buff(ctx, "%s = %s(imageLoad(%s, %s(%s(%s))%s)%s);\n", dst,
-                get_string(dtypeprefix), srcs[0], get_string(coord_prefix),
-                conversion, srcs[1], ms_str, wm);
-    } else {
-      char src[32] = "";
-      struct vrend_array *image =
-          lookup_image_array_ptr(ctx, inst->Src[0].Register.Index);
-      if (image) {
-        int basearrayidx = image->first;
-        int array_size = image->array_size;
-        emit_buff(ctx, "switch (addr%d + %d) {\n", inst->Src[0].Indirect.Index,
-                  inst->Src[0].Register.Index - basearrayidx);
-        const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-
-        for (int i = 0; i < array_size; ++i) {
-          snprintf(src, 32, "%simg%d[%d]", cname, basearrayidx, i);
-          emit_buff(ctx,
-                    "case %d: %s = %s(imageLoad(%s, %s(%s(%s))%s)%s);break;\n",
-                    i, dst, get_string(dtypeprefix), src,
-                    get_string(coord_prefix), conversion, srcs[1], ms_str, wm);
-        }
-        emit_buff(ctx, "}\n");
-      }
-    }
-  } else if (src->Register.File == TGSI_FILE_BUFFER ||
-             src->Register.File == TGSI_FILE_MEMORY) {
-    char mydst[255], atomic_op[9], atomic_src[10];
-    enum vrend_type_qualifier dtypeprefix;
-
-    set_memory_qualifier(ctx, inst, inst->Src[0].Register.Index,
-                         inst->Src[0].Register.Indirect);
-
-    strcpy(mydst, dst);
-    char *wmp = strchr(mydst, '.');
-
-    if (wmp)
-      wmp[0] = 0;
-    emit_buff(ctx, "ssbo_addr_temp = uint(floatBitsToUint(%s)) >> 2;\n",
-              srcs[1]);
-
-    atomic_op[0] = atomic_src[0] = '\0';
-    if (ctx->ssbo_atomic_mask & (1 << src->Register.Index)) {
-      /* Emulate atomicCounter with atomicOr. */
-      strcpy(atomic_op, "atomicOr");
-      strcpy(atomic_src, ", uint(0)");
-    }
-
-    dtypeprefix =
-        (is_integer_memory(ctx, src->Register.File, src->Register.Index))
-            ? INT_BITS_TO_FLOAT
-            : UINT_BITS_TO_FLOAT;
-
-    if (!inst->Src[0].Register.Indirect) {
-      emit_load_mem(ctx, mydst, inst->Dst[0].Register.WriteMask,
-                    get_string(dtypeprefix), atomic_op, srcs[0], atomic_src);
-    } else {
-      char src[128] = "";
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      bool atomic_ssbo =
-          ctx->ssbo_atomic_mask & (1 << inst->Src[0].Register.Index);
-      const char *atomic_str = atomic_ssbo ? "atomic" : "";
-      uint base =
-          atomic_ssbo ? ctx->ssbo_atomic_array_base : ctx->ssbo_array_base;
-      int start, array_count;
-      uint32_t mask = ctx->ssbo_used_mask;
-      u_bit_scan_consecutive_range(&mask, &start, &array_count);
-
-      emit_buff(ctx, "switch (addr%d + %d) {\n", inst->Src[0].Indirect.Index,
-                inst->Src[0].Register.Index - base);
-      for (int i = 0; i < array_count; ++i) {
-        emit_buff(ctx, "case %d:\n", i);
-        snprintf(src, 128, "%sssboarr%s[%d].%sssbocontents%d", cname,
-                 atomic_str, i, cname, base);
-        emit_load_mem(ctx, mydst, inst->Dst[0].Register.WriteMask,
-                      get_string(dtypeprefix), atomic_op, src, atomic_src);
-        emit_buff(ctx, "  break;\n");
-      }
-      emit_buf(ctx, "}\n");
-    }
-  } else if (src->Register.File == TGSI_FILE_HW_ATOMIC) {
-    emit_buff(ctx, "%s = uintBitsToFloat(atomicCounter(%s));\n", dst, srcs[0]);
-  }
-}
-
-static const char *get_atomic_opname(int tgsi_opcode, bool *is_cas) {
-  const char *opname;
-  *is_cas = false;
-  switch (tgsi_opcode) {
-  case TGSI_OPCODE_ATOMUADD:
-    opname = "Add";
-    break;
-  case TGSI_OPCODE_ATOMXCHG:
-    opname = "Exchange";
-    break;
-  case TGSI_OPCODE_ATOMCAS:
-    opname = "CompSwap";
-    *is_cas = true;
-    break;
-  case TGSI_OPCODE_ATOMAND:
-    opname = "And";
-    break;
-  case TGSI_OPCODE_ATOMOR:
-    opname = "Or";
-    break;
-  case TGSI_OPCODE_ATOMXOR:
-    opname = "Xor";
-    break;
-  case TGSI_OPCODE_ATOMUMIN:
-    opname = "Min";
-    break;
-  case TGSI_OPCODE_ATOMUMAX:
-    opname = "Max";
-    break;
-  case TGSI_OPCODE_ATOMIMIN:
-    opname = "Min";
-    break;
-  case TGSI_OPCODE_ATOMIMAX:
-    opname = "Max";
-    break;
-  default:
-    return NULL;
-  }
-  return opname;
-}
-
-static void translate_resq(struct dump_ctx *ctx,
-                           struct tgsi_full_instruction *inst,
-                           const char *srcs[4], const char *dst,
-                           const char *writemask) {
-  const struct tgsi_full_src_register *src = &inst->Src[0];
-
-  if (src->Register.File == TGSI_FILE_IMAGE) {
-    if (inst->Dst[0].Register.WriteMask & 0x8) {
-      ctx->shader_req_bits |= SHADER_REQ_TXQS | SHADER_REQ_INTS;
-      emit_buff(ctx, "%s = %s(imageSamples(%s));\n", dst,
-                get_string(INT_BITS_TO_FLOAT), srcs[0]);
-    }
-    if (inst->Dst[0].Register.WriteMask & 0x7) {
-      const char *swizzle_mask =
-          inst->Memory.Texture == TGSI_TEXTURE_1D_ARRAY ? ".xz" : "";
-      ctx->shader_req_bits |= SHADER_REQ_IMAGE_SIZE | SHADER_REQ_INTS;
-      bool skip_emit_writemask = inst->Memory.Texture == TGSI_TEXTURE_BUFFER;
-
-      emit_buff(ctx, "%s = %s(imageSize(%s)%s%s);\n", dst,
-                get_string(INT_BITS_TO_FLOAT), srcs[0], swizzle_mask,
-                skip_emit_writemask ? "" : writemask);
-    }
-  } else if (src->Register.File == TGSI_FILE_BUFFER) {
-    emit_buff(ctx, "%s = %s(int(%s.length()) << 2);\n", dst,
-              get_string(INT_BITS_TO_FLOAT), srcs[0]);
-  }
-}
-
-static void translate_atomic(struct dump_ctx *ctx,
-                             struct tgsi_full_instruction *inst,
-                             struct source_info *sinfo, const char *srcs[4],
-                             char *dst) {
-  const struct tgsi_full_src_register *src = &inst->Src[0];
-  const char *opname;
-  enum vrend_type_qualifier stypeprefix = TYPE_CONVERSION_NONE;
-  enum vrend_type_qualifier dtypeprefix = TYPE_CONVERSION_NONE;
-  enum vrend_type_qualifier stypecast = TYPE_CONVERSION_NONE;
-  bool is_cas;
-  char cas_str[128] = "";
-
-  if (src->Register.File == TGSI_FILE_IMAGE) {
-    enum tgsi_return_type itype;
-    get_internalformat_string(ctx->images[sinfo->sreg_index].decl.Format,
-                              &itype);
-    switch (itype) {
-    default:
-    case TGSI_RETURN_TYPE_UINT:
-      stypeprefix = FLOAT_BITS_TO_UINT;
-      dtypeprefix = UINT_BITS_TO_FLOAT;
-      stypecast = UINT;
-      break;
-    case TGSI_RETURN_TYPE_SINT:
-      stypeprefix = FLOAT_BITS_TO_INT;
-      dtypeprefix = INT_BITS_TO_FLOAT;
-      stypecast = INT;
-      break;
-    case TGSI_RETURN_TYPE_FLOAT:
-      if (ctx->cfg->has_es31_compat)
-        ctx->shader_req_bits |= SHADER_REQ_ES31_COMPAT;
-      else
-        ctx->shader_req_bits |= SHADER_REQ_SHADER_ATOMIC_FLOAT;
-      stypecast = FLOAT;
-      break;
-    }
-  } else {
-    stypeprefix = FLOAT_BITS_TO_UINT;
-    dtypeprefix = UINT_BITS_TO_FLOAT;
-    stypecast = UINT;
-  }
-
-  opname = get_atomic_opname(inst->Instruction.Opcode, &is_cas);
-  if (!opname) {
-    set_buf_error(ctx);
-    return;
-  }
-
-  if (is_cas)
-    snprintf(cas_str, 128, ", %s(%s(%s))", get_string(stypecast),
-             get_string(stypeprefix), srcs[3]);
-
-  if (src->Register.File == TGSI_FILE_IMAGE) {
-    bool is_ms = false;
-    enum vrend_type_qualifier coord_prefix =
-        get_coord_prefix(ctx->images[sinfo->sreg_index].decl.Resource, &is_ms);
-    const char *conversion =
-        sinfo->override_no_cast[1] ? "" : get_string(FLOAT_BITS_TO_INT);
-    char ms_str[32] = "";
-    if (is_ms) {
-      snprintf(ms_str, 32, ", int(%s.w)", srcs[1]);
-    }
-
-    if (!inst->Src[0].Register.Indirect) {
-      emit_buff(
-          ctx, "%s = %s(imageAtomic%s(%s, %s(%s(%s))%s, %s(%s(%s))%s));\n", dst,
-          get_string(dtypeprefix), opname, srcs[0], get_string(coord_prefix),
-          conversion, srcs[1], ms_str, get_string(stypecast),
-          get_string(stypeprefix), srcs[2], cas_str);
-    } else {
-      char src[32] = "";
-      struct vrend_array *image =
-          lookup_image_array_ptr(ctx, inst->Src[0].Register.Index);
-      if (image) {
-        int basearrayidx = image->first;
-        int array_size = image->array_size;
-        emit_buff(ctx, "switch (addr%d + %d) {\n", inst->Src[0].Indirect.Index,
-                  inst->Src[0].Register.Index - basearrayidx);
-        const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-
-        for (int i = 0; i < array_size; ++i) {
-          snprintf(src, 32, "%simg%d[%d]", cname, basearrayidx, i);
-          emit_buff(ctx,
-                    "case %d: %s = %s(imageAtomic%s(%s, %s(%s(%s))%s, "
-                    "%s(%s(%s))%s));\n",
-                    i, dst, get_string(dtypeprefix), opname, src,
-                    get_string(coord_prefix), conversion, srcs[1], ms_str,
-                    get_string(stypecast), get_string(stypeprefix), srcs[2],
-                    cas_str);
-        }
-        emit_buff(ctx, "}\n");
-      }
-    }
-    ctx->shader_req_bits |= SHADER_REQ_IMAGE_ATOMIC;
-  }
-  if (src->Register.File == TGSI_FILE_BUFFER ||
-      src->Register.File == TGSI_FILE_MEMORY) {
-    enum vrend_type_qualifier type;
-    if ((is_integer_memory(ctx, src->Register.File, src->Register.Index))) {
-      type = INT;
-      dtypeprefix = INT_BITS_TO_FLOAT;
-      stypeprefix = FLOAT_BITS_TO_INT;
-    } else {
-      type = UINT;
-      dtypeprefix = UINT_BITS_TO_FLOAT;
-      stypeprefix = FLOAT_BITS_TO_UINT;
-    }
-
-    emit_buff(ctx,
-              "%s = %s(atomic%s(%s[int(floatBitsToInt(%s)) >> 2], "
-              "%s(%s(%s).x)%s));\n",
-              dst, get_string(dtypeprefix), opname, srcs[0], srcs[1],
-              get_string(type), get_string(stypeprefix), srcs[2], cas_str);
-  }
-  if (src->Register.File == TGSI_FILE_HW_ATOMIC) {
-    if (sinfo->imm_value == -1)
-      emit_buff(ctx, "%s = %s(atomicCounterDecrement(%s) + 1u);\n", dst,
-                get_string(dtypeprefix), srcs[0]);
-    else if (sinfo->imm_value == 1)
-      emit_buff(ctx, "%s = %s(atomicCounterIncrement(%s));\n", dst,
-                get_string(dtypeprefix), srcs[0]);
-    else
-      emit_buff(
-          ctx, "%s = %s(atomicCounter%sARB(%s, floatBitsToUint(%s).x%s));\n",
-          dst, get_string(dtypeprefix), opname, srcs[0], srcs[2], cas_str);
-  }
-}
-
-static const char *reswizzle_dest(const struct vrend_shader_io *io,
-                                  const struct tgsi_full_dst_register *dst_reg,
-                                  char *reswizzled, const char *writemask) {
-  if (io->usage_mask != 0xf) {
-    if (io->num_components > 1) {
-      int real_wm = dst_reg->Register.WriteMask >> io->swizzle_offset;
-      int k = 1;
-      reswizzled[0] = '.';
-      for (int i = 0; i < io->num_components; ++i) {
-        if (real_wm & (1 << i))
-          reswizzled[k++] = get_swiz_char(i);
-      }
-      reswizzled[k] = 0;
-    }
-    writemask = reswizzled;
-  }
-  return writemask;
-}
-
-static void get_destination_info_generic(
-    struct dump_ctx *ctx, const struct tgsi_full_dst_register *dst_reg,
-    const struct vrend_shader_io *io, const char *writemask, char dsts[255]) {
-  const char *blkarray =
-      (ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL) ? "[gl_InvocationID]" : "";
-  const char *stage_prefix = get_stage_output_name_prefix(ctx->prog_type);
-  const char *wm = io->override_no_wm ? "" : writemask;
-  char reswizzled[6] = "";
-
-  wm = reswizzle_dest(io, dst_reg, reswizzled, writemask);
-
-  if (io->first == io->last)
-    snprintf(dsts, 255, "%s%s%s", io->glsl_name, blkarray, wm);
-  else {
-    if (prefer_generic_io_block(ctx, io_out)) {
-      char outvarname[64];
-      get_blockvarname(outvarname, stage_prefix, io, blkarray);
-
-      if (dst_reg->Register.Indirect)
-        snprintf(dsts, 255, "%s.%s[addr%d + %d]%s", outvarname, io->glsl_name,
-                 dst_reg->Indirect.Index, dst_reg->Register.Index - io->first,
-                 wm);
-      else
-        snprintf(dsts, 255, "%s.%s[%d]%s", outvarname, io->glsl_name,
-                 dst_reg->Register.Index - io->first, wm);
-    } else {
-      if (dst_reg->Register.Indirect)
-        snprintf(dsts, 255, "%s%s[addr%d + %d]%s", io->glsl_name, blkarray,
-                 dst_reg->Indirect.Index, dst_reg->Register.Index - io->first,
-                 wm);
-      else
-        snprintf(dsts, 255, "%s%s[%d]%s", io->glsl_name, blkarray,
-                 dst_reg->Register.Index - io->first, wm);
-    }
-  }
-}
-
-static bool get_destination_info(struct dump_ctx *ctx,
-                                 const struct tgsi_full_instruction *inst,
-                                 struct dest_info *dinfo, char dsts[3][255],
-                                 char fp64_dsts[3][255], char *writemask) {
-  const struct tgsi_full_dst_register *dst_reg;
-  enum tgsi_opcode_type dtype =
-      tgsi_opcode_infer_dst_type(inst->Instruction.Opcode);
-
-  if (dtype == TGSI_TYPE_SIGNED || dtype == TGSI_TYPE_UNSIGNED)
-    ctx->shader_req_bits |= SHADER_REQ_INTS;
-
-  if (dtype == TGSI_TYPE_DOUBLE) {
-    /* we need the uvec2 conversion for doubles */
-    ctx->shader_req_bits |= SHADER_REQ_INTS | SHADER_REQ_FP64;
-  }
-
-  if (inst->Instruction.Opcode == TGSI_OPCODE_TXQ) {
-    dinfo->dtypeprefix = INT_BITS_TO_FLOAT;
-  } else {
-    switch (dtype) {
-    case TGSI_TYPE_UNSIGNED:
-      dinfo->dtypeprefix = UINT_BITS_TO_FLOAT;
-      break;
-    case TGSI_TYPE_SIGNED:
-      dinfo->dtypeprefix = INT_BITS_TO_FLOAT;
-      break;
-    default:
-      break;
-    }
-  }
-
-  for (uint32_t i = 0; i < inst->Instruction.NumDstRegs; i++) {
-    char fp64_writemask[6] = "";
-    dst_reg = &inst->Dst[i];
-    dinfo->dst_override_no_wm[i] = false;
-    if (dst_reg->Register.WriteMask != TGSI_WRITEMASK_XYZW) {
-      int wm_idx = 0, dbl_wm_idx = 0;
-      writemask[wm_idx++] = '.';
-      fp64_writemask[dbl_wm_idx++] = '.';
-
-      if (dst_reg->Register.WriteMask & 0x1)
-        writemask[wm_idx++] = 'x';
-      if (dst_reg->Register.WriteMask & 0x2)
-        writemask[wm_idx++] = 'y';
-      if (dst_reg->Register.WriteMask & 0x4)
-        writemask[wm_idx++] = 'z';
-      if (dst_reg->Register.WriteMask & 0x8)
-        writemask[wm_idx++] = 'w';
-
-      if (dtype == TGSI_TYPE_DOUBLE) {
-        if (dst_reg->Register.WriteMask & 0x3)
-          fp64_writemask[dbl_wm_idx++] = 'x';
-        if (dst_reg->Register.WriteMask & 0xc)
-          fp64_writemask[dbl_wm_idx++] = 'y';
-      }
-
-      if (dtype == TGSI_TYPE_DOUBLE) {
-        if (dbl_wm_idx == 2)
-          dinfo->dstconv = DOUBLE;
-        else
-          dinfo->dstconv = DVEC2;
-      } else {
-        dinfo->dstconv = FLOAT + wm_idx - 2;
-        dinfo->udstconv = UINT + wm_idx - 2;
-        dinfo->idstconv = INT + wm_idx - 2;
-      }
-    } else {
-      if (dtype == TGSI_TYPE_DOUBLE)
-        dinfo->dstconv = DVEC2;
-      else
-        dinfo->dstconv = VEC4;
-      dinfo->udstconv = UVEC4;
-      dinfo->idstconv = IVEC4;
-    }
-
-    if (dst_reg->Register.File == TGSI_FILE_OUTPUT) {
-      uint32_t j;
-      for (j = 0; j < ctx->num_outputs; j++) {
-        if (ctx->outputs[j].first <= dst_reg->Register.Index &&
-            ctx->outputs[j].last >= dst_reg->Register.Index &&
-            (ctx->outputs[j].usage_mask & dst_reg->Register.WriteMask)) {
-          if (inst->Instruction.Precise) {
-            if (!ctx->outputs[j].invariant &&
-                ctx->outputs[j].name != TGSI_SEMANTIC_CLIPVERTEX) {
-              ctx->outputs[j].precise = true;
-              ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-            }
-          }
-
-          if (ctx->glsl_ver_required >= 140 &&
-              ctx->outputs[j].name == TGSI_SEMANTIC_CLIPVERTEX) {
-            snprintf(dsts[i], 255, "clipv_tmp");
-          } else if (ctx->outputs[j].name == TGSI_SEMANTIC_CLIPDIST) {
-            char clip_indirect[32] = "";
-            if (ctx->outputs[j].first != ctx->outputs[j].last) {
-              if (dst_reg->Register.Indirect)
-                snprintf(clip_indirect, sizeof(clip_indirect), "+ addr%d",
-                         dst_reg->Indirect.Index);
-              else
-                snprintf(clip_indirect, sizeof(clip_indirect), "+ %d",
-                         dst_reg->Register.Index - ctx->outputs[j].first);
-            }
-            snprintf(dsts[i], 255, "clip_dist_temp[%d %s]", ctx->outputs[j].sid,
-                     clip_indirect);
-          } else if (ctx->outputs[j].name == TGSI_SEMANTIC_TESSOUTER ||
-                     ctx->outputs[j].name == TGSI_SEMANTIC_TESSINNER ||
-                     ctx->outputs[j].name == TGSI_SEMANTIC_SAMPLEMASK) {
-            int idx;
-            switch (dst_reg->Register.WriteMask) {
-            case 0x1:
-              idx = 0;
-              break;
-            case 0x2:
-              idx = 1;
-              break;
-            case 0x4:
-              idx = 2;
-              break;
-            case 0x8:
-              idx = 3;
-              break;
-            default:
-              idx = 0;
-              break;
-            }
-            snprintf(dsts[i], 255, "%s[%d]", ctx->outputs[j].glsl_name, idx);
-            if (ctx->outputs[j].is_int) {
-              dinfo->dtypeprefix = FLOAT_BITS_TO_INT;
-              dinfo->dstconv = INT;
-            }
-          } else {
-            if (ctx->outputs[j].glsl_gl_block) {
-              snprintf(dsts[i], 255, "gl_out[%s].%s%s",
-                       ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL
-                           ? "gl_InvocationID"
-                           : "0",
-                       ctx->outputs[j].glsl_name,
-                       ctx->outputs[j].override_no_wm ? "" : writemask);
-            } else if (ctx->outputs[j].name == TGSI_SEMANTIC_GENERIC) {
-              struct vrend_shader_io *io = ctx->generic_output_range.used
-                                               ? &ctx->generic_output_range.io
-                                               : &ctx->outputs[j];
-              get_destination_info_generic(ctx, dst_reg, io, writemask,
-                                           dsts[i]);
-              dinfo->dst_override_no_wm[i] = ctx->outputs[j].override_no_wm;
-            } else if (ctx->outputs[j].name == TGSI_SEMANTIC_PATCH) {
-              struct vrend_shader_io *io = ctx->patch_output_range.used
-                                               ? &ctx->patch_output_range.io
-                                               : &ctx->outputs[j];
-              char reswizzled[6] = "";
-              const char *wm =
-                  reswizzle_dest(io, dst_reg, reswizzled, writemask);
-              if (io->last != io->first) {
-                if (dst_reg->Register.Indirect)
-                  snprintf(dsts[i], 255, "%s[addr%d + %d]%s", io->glsl_name,
-                           dst_reg->Indirect.Index,
-                           dst_reg->Register.Index - io->first,
-                           io->override_no_wm ? "" : wm);
-                else
-                  snprintf(dsts[i], 255, "%s[%d]%s", io->glsl_name,
-                           dst_reg->Register.Index - io->first,
-                           io->override_no_wm ? "" : wm);
-              } else {
-                snprintf(dsts[i], 255, "%s%s", io->glsl_name,
-                         ctx->outputs[j].override_no_wm ? "" : wm);
-              }
-              dinfo->dst_override_no_wm[i] = ctx->outputs[j].override_no_wm;
-            } else {
-              if (ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL) {
-                snprintf(dsts[i], 255, "%s[gl_InvocationID]%s",
-                         ctx->outputs[j].glsl_name,
-                         ctx->outputs[j].override_no_wm ? "" : writemask);
-              } else {
-                snprintf(dsts[i], 255, "%s%s", ctx->outputs[j].glsl_name,
-                         ctx->outputs[j].override_no_wm ? "" : writemask);
-              }
-              dinfo->dst_override_no_wm[i] = ctx->outputs[j].override_no_wm;
-            }
-            if (ctx->outputs[j].is_int) {
-              if (dinfo->dtypeprefix == TYPE_CONVERSION_NONE)
-                dinfo->dtypeprefix = FLOAT_BITS_TO_INT;
-              dinfo->dstconv = INT;
-            }
-            if (ctx->outputs[j].name == TGSI_SEMANTIC_PSIZE) {
-              dinfo->dstconv = FLOAT;
-              break;
-            }
-          }
-          break;
-        }
-      }
-    } else if (dst_reg->Register.File == TGSI_FILE_TEMPORARY) {
-      struct vrend_temp_range *range =
-          find_temp_range(ctx, dst_reg->Register.Index);
-      if (!range)
-        return false;
-      if (dst_reg->Register.Indirect) {
-        snprintf(dsts[i], 255, "temp%d[addr0 + %d]%s", range->first,
-                 dst_reg->Register.Index - range->first, writemask);
-      } else
-        snprintf(dsts[i], 255, "temp%d[%d]%s", range->first,
-                 dst_reg->Register.Index - range->first, writemask);
-    } else if (dst_reg->Register.File == TGSI_FILE_IMAGE) {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      if (ctx->info.indirect_files & (1 << TGSI_FILE_IMAGE)) {
-        int basearrayidx = lookup_image_array(ctx, dst_reg->Register.Index);
-        if (dst_reg->Register.Indirect) {
-          assert(dst_reg->Indirect.File == TGSI_FILE_ADDRESS);
-          snprintf(dsts[i], 255, "%simg%d[addr%d + %d]", cname, basearrayidx,
-                   dst_reg->Indirect.Index,
-                   dst_reg->Register.Index - basearrayidx);
-        } else
-          snprintf(dsts[i], 255, "%simg%d[%d]", cname, basearrayidx,
-                   dst_reg->Register.Index - basearrayidx);
-      } else
-        snprintf(dsts[i], 255, "%simg%d", cname, dst_reg->Register.Index);
-    } else if (dst_reg->Register.File == TGSI_FILE_BUFFER) {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      if (ctx->info.indirect_files & (1 << TGSI_FILE_BUFFER)) {
-        bool atomic_ssbo =
-            ctx->ssbo_atomic_mask & (1 << dst_reg->Register.Index);
-        const char *atomic_str = atomic_ssbo ? "atomic" : "";
-        int base =
-            atomic_ssbo ? ctx->ssbo_atomic_array_base : ctx->ssbo_array_base;
-        if (dst_reg->Register.Indirect) {
-          snprintf(dsts[i], 255, "%sssboarr%s[addr%d+%d].%sssbocontents%d",
-                   cname, atomic_str, dst_reg->Indirect.Index,
-                   dst_reg->Register.Index - base, cname, base);
-        } else
-          snprintf(dsts[i], 255, "%sssboarr%s[%d].%sssbocontents%d", cname,
-                   atomic_str, dst_reg->Register.Index - base, cname, base);
-      } else
-        snprintf(dsts[i], 255, "%sssbocontents%d", cname,
-                 dst_reg->Register.Index);
-    } else if (dst_reg->Register.File == TGSI_FILE_MEMORY) {
-      snprintf(dsts[i], 255, "values");
-    } else if (dst_reg->Register.File == TGSI_FILE_ADDRESS) {
-      snprintf(dsts[i], 255, "addr%d", dst_reg->Register.Index);
-    }
-
-    if (dtype == TGSI_TYPE_DOUBLE) {
-      strcpy(fp64_dsts[i], dsts[i]);
-      snprintf(dsts[i], 255, "fp64_dst[%d]%s", i, fp64_writemask);
-      writemask[0] = 0;
-    }
-  }
-
-  return true;
-}
-
-static const char *shift_swizzles(const struct vrend_shader_io *io,
-                                  const struct tgsi_full_src_register *src,
-                                  int swz_offset, char *swizzle_shifted,
-                                  const char *swizzle) {
-  if (io->usage_mask != 0xf && swizzle[0]) {
-    if (io->num_components > 1) {
-      swizzle_shifted[swz_offset++] = '.';
-      for (int i = 0; i < 4; ++i) {
-        switch (i) {
-        case 0:
-          swizzle_shifted[swz_offset++] =
-              get_swiz_char(src->Register.SwizzleX - io->swizzle_offset);
-          break;
-        case 1:
-          swizzle_shifted[swz_offset++] =
-              get_swiz_char(src->Register.SwizzleY - io->swizzle_offset);
-          break;
-        case 2:
-          swizzle_shifted[swz_offset++] =
-              src->Register.SwizzleZ - io->swizzle_offset < io->num_components
-                  ? get_swiz_char(src->Register.SwizzleZ - io->swizzle_offset)
-                  : 'x';
-          break;
-        case 3:
-          swizzle_shifted[swz_offset++] =
-              src->Register.SwizzleW - io->swizzle_offset < io->num_components
-                  ? get_swiz_char(src->Register.SwizzleW - io->swizzle_offset)
-                  : 'x';
-        }
-      }
-      swizzle_shifted[swz_offset] = 0;
-    }
-    swizzle = swizzle_shifted;
-  }
-  return swizzle;
-}
-
-static void get_source_info_generic(struct dump_ctx *ctx, enum io_type iot,
-                                    enum vrend_type_qualifier srcstypeprefix,
-                                    const char *prefix,
-                                    const struct tgsi_full_src_register *src,
-                                    const struct vrend_shader_io *io,
-                                    const char *arrayname, const char *swizzle,
-                                    struct vrend_strbuf *result) {
-  int swz_offset = 0;
-  char swizzle_shifted[6] = "";
-  if (swizzle[0] == ')') {
-    swizzle_shifted[swz_offset++] = ')';
-    swizzle_shifted[swz_offset] = 0;
-  }
-
-  /* This IO element is not using all vector elements, so we have to shift the
-   * swizzle names */
-  swizzle = shift_swizzles(io, src, swz_offset, swizzle_shifted, swizzle);
-
-  if (io->first == io->last) {
-    strbuf_fmt(result, "%s(%s%s%s%s)", get_string(srcstypeprefix), prefix,
-               io->glsl_name, arrayname, io->is_int ? "" : swizzle);
-  } else {
-
-    if (prefer_generic_io_block(ctx, iot)) {
-      char outvarname[64];
-      const char *stage_prefix =
-          iot == io_in ? get_stage_input_name_prefix(ctx, ctx->prog_type)
-                       : get_stage_output_name_prefix(ctx->prog_type);
-
-      get_blockvarname(outvarname, stage_prefix, io, arrayname);
-      if (src->Register.Indirect)
-        strbuf_fmt(result, "%s(%s %s.%s[addr%d + %d] %s)",
-                   get_string(srcstypeprefix), prefix, outvarname,
-                   io->glsl_name, src->Indirect.Index,
-                   src->Register.Index - io->first, io->is_int ? "" : swizzle);
-      else
-        strbuf_fmt(result, "%s(%s %s.%s[%d] %s)", get_string(srcstypeprefix),
-                   prefix, outvarname, io->glsl_name,
-                   src->Register.Index - io->first, io->is_int ? "" : swizzle);
-    } else {
-      if (src->Register.Indirect)
-        strbuf_fmt(result, "%s(%s %s%s[addr%d + %d] %s)",
-                   get_string(srcstypeprefix), prefix, io->glsl_name, arrayname,
-                   src->Indirect.Index, src->Register.Index - io->first,
-                   io->is_int ? "" : swizzle);
-      else
-        strbuf_fmt(result, "%s(%s %s%s[%d] %s)", get_string(srcstypeprefix),
-                   prefix, io->glsl_name, arrayname,
-                   src->Register.Index - io->first, io->is_int ? "" : swizzle);
-    }
-  }
-}
-
-static void get_source_info_patch(enum vrend_type_qualifier srcstypeprefix,
-                                  const char *prefix,
-                                  const struct tgsi_full_src_register *src,
-                                  const struct vrend_shader_io *io,
-                                  const char *arrayname, const char *swizzle,
-                                  struct vrend_strbuf *result) {
-  int swz_offset = 0;
-  char swizzle_shifted[7] = "";
-  if (swizzle[0] == ')') {
-    swizzle_shifted[swz_offset++] = ')';
-    swizzle_shifted[swz_offset] = 0;
-  }
-
-  swizzle = shift_swizzles(io, src, swz_offset, swizzle_shifted, swizzle);
-  const char *wm = io->is_int ? "" : swizzle;
-
-  if (io->last == io->first)
-    strbuf_fmt(result, "%s(%s%s%s%s)", get_string(srcstypeprefix), prefix,
-               io->glsl_name, arrayname, wm);
-  else {
-    if (src->Register.Indirect)
-      strbuf_fmt(result, "%s(%s %s[addr%d + %d] %s)",
-                 get_string(srcstypeprefix), prefix, io->glsl_name,
-                 src->Indirect.Index, src->Register.Index - io->first, wm);
-    else
-      strbuf_fmt(result, "%s(%s %s[%d] %s)", get_string(srcstypeprefix), prefix,
-                 io->glsl_name, src->Register.Index - io->first, wm);
-  }
-}
-
-static bool get_source_info(struct dump_ctx *ctx,
-                            const struct tgsi_full_instruction *inst,
-                            struct source_info *sinfo,
-                            struct vrend_strbuf srcs[4],
-                            char src_swizzle0[10]) {
-  bool stprefix = false;
-
-  enum vrend_type_qualifier stypeprefix = TYPE_CONVERSION_NONE;
-  enum tgsi_opcode_type stype =
-      tgsi_opcode_infer_src_type(inst->Instruction.Opcode);
-
-  if (stype == TGSI_TYPE_SIGNED || stype == TGSI_TYPE_UNSIGNED)
-    ctx->shader_req_bits |= SHADER_REQ_INTS;
-  if (stype == TGSI_TYPE_DOUBLE)
-    ctx->shader_req_bits |= SHADER_REQ_INTS | SHADER_REQ_FP64;
-
-  switch (stype) {
-  case TGSI_TYPE_DOUBLE:
-    stypeprefix = FLOAT_BITS_TO_UINT;
-    sinfo->svec4 = DVEC2;
-    stprefix = true;
-    break;
-  case TGSI_TYPE_UNSIGNED:
-    stypeprefix = FLOAT_BITS_TO_UINT;
-    sinfo->svec4 = UVEC4;
-    stprefix = true;
-    break;
-  case TGSI_TYPE_SIGNED:
-    stypeprefix = FLOAT_BITS_TO_INT;
-    sinfo->svec4 = IVEC4;
-    stprefix = true;
-    break;
-  }
-
-  for (uint32_t i = 0; i < inst->Instruction.NumSrcRegs; i++) {
-    const struct tgsi_full_src_register *src = &inst->Src[i];
-    struct vrend_strbuf *src_buf = &srcs[i];
-    char swizzle[8] = "";
-    int usage_mask = 0;
-    char *swizzle_writer = swizzle;
-    char prefix[6] = "";
-    char arrayname[16] = "";
-    char fp64_src[255];
-    int swz_idx = 0, pre_idx = 0;
-    boolean isfloatabsolute =
-        src->Register.Absolute && stype != TGSI_TYPE_DOUBLE;
-
-    sinfo->override_no_wm[i] = false;
-    sinfo->override_no_cast[i] = false;
-    if (isfloatabsolute)
-      swizzle[swz_idx++] = ')';
-
-    if (src->Register.Negate)
-      prefix[pre_idx++] = '-';
-    if (isfloatabsolute)
-      strcpy(&prefix[pre_idx++], "abs(");
-
-    if (src->Register.Dimension) {
-      if (src->Dimension.Indirect) {
-        assert(src->DimIndirect.File == TGSI_FILE_ADDRESS);
-        sprintf(arrayname, "[addr%d]", src->DimIndirect.Index);
-      } else
-        sprintf(arrayname, "[%d]", src->Dimension.Index);
-    }
-
-    /* These instructions don't support swizzles in the first parameter
-     * pass the swizzle to the caller instead */
-    if ((inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE ||
-         inst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
-         inst->Instruction.Opcode == TGSI_OPCODE_INTERP_CENTROID) &&
-        i == 0) {
-      swizzle_writer = src_swizzle0;
-    }
-
-    usage_mask |= 1 << src->Register.SwizzleX;
-    usage_mask |= 1 << src->Register.SwizzleY;
-    usage_mask |= 1 << src->Register.SwizzleZ;
-    usage_mask |= 1 << src->Register.SwizzleW;
-
-    if (src->Register.SwizzleX != TGSI_SWIZZLE_X ||
-        src->Register.SwizzleY != TGSI_SWIZZLE_Y ||
-        src->Register.SwizzleZ != TGSI_SWIZZLE_Z ||
-        src->Register.SwizzleW != TGSI_SWIZZLE_W) {
-      swizzle_writer[swz_idx++] = '.';
-      swizzle_writer[swz_idx++] = get_swiz_char(src->Register.SwizzleX);
-      swizzle_writer[swz_idx++] = get_swiz_char(src->Register.SwizzleY);
-      swizzle_writer[swz_idx++] = get_swiz_char(src->Register.SwizzleZ);
-      swizzle_writer[swz_idx++] = get_swiz_char(src->Register.SwizzleW);
-    }
-    swizzle_writer[swz_idx] = 0;
-
-    if (src->Register.File == TGSI_FILE_INPUT) {
-      for (uint32_t j = 0; j < ctx->num_inputs; j++)
-        if (ctx->inputs[j].first <= src->Register.Index &&
-            ctx->inputs[j].last >= src->Register.Index &&
-            (ctx->inputs[j].usage_mask & usage_mask)) {
-          if (ctx->key->color_two_side &&
-              ctx->inputs[j].name == TGSI_SEMANTIC_COLOR)
-            strbuf_fmt(src_buf, "%s(%s%s%d%s%s)", get_string(stypeprefix),
-                       prefix, "realcolor", ctx->inputs[j].sid, arrayname,
-                       swizzle);
-          else if (ctx->inputs[j].glsl_gl_block) {
-            /* GS input clipdist requires a conversion */
-            if (ctx->inputs[j].name == TGSI_SEMANTIC_CLIPDIST) {
-              create_swizzled_clipdist(ctx, src_buf, src, j, true,
-                                       get_string(stypeprefix), prefix,
-                                       arrayname, ctx->inputs[j].first);
-            } else {
-              strbuf_fmt(src_buf, "%s(vec4(%sgl_in%s.%s)%s)",
-                         get_string(stypeprefix), prefix, arrayname,
-                         ctx->inputs[j].glsl_name, swizzle);
-            }
-          } else if (ctx->inputs[j].name == TGSI_SEMANTIC_PRIMID)
-            strbuf_fmt(src_buf, "%s(vec4(intBitsToFloat(%s)))",
-                       get_string(stypeprefix), ctx->inputs[j].glsl_name);
-          else if (ctx->inputs[j].name == TGSI_SEMANTIC_FACE)
-            strbuf_fmt(src_buf, "%s(%s ? 1.0 : -1.0)", get_string(stypeprefix),
-                       ctx->inputs[j].glsl_name);
-          else if (ctx->inputs[j].name == TGSI_SEMANTIC_CLIPDIST) {
-            if (ctx->prog_type == TGSI_PROCESSOR_FRAGMENT)
-              load_clipdist_fs(ctx, src_buf, src, j, false,
-                               get_string(stypeprefix), ctx->inputs[j].first);
-            else
-              create_swizzled_clipdist(ctx, src_buf, src, j, false,
-                                       get_string(stypeprefix), prefix,
-                                       arrayname, ctx->inputs[j].first);
-          } else {
-            enum vrend_type_qualifier srcstypeprefix = stypeprefix;
-            if ((stype == TGSI_TYPE_UNSIGNED || stype == TGSI_TYPE_SIGNED) &&
-                ctx->inputs[j].is_int)
-              srcstypeprefix = TYPE_CONVERSION_NONE;
-
-            if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE &&
-                i == 1) {
-              strbuf_fmt(src_buf, "floatBitsToInt(%s%s%s%s)", prefix,
-                         ctx->inputs[j].glsl_name, arrayname, swizzle);
-            } else if (ctx->inputs[j].name == TGSI_SEMANTIC_GENERIC) {
-              struct vrend_shader_io *io = ctx->generic_input_range.used
-                                               ? &ctx->generic_input_range.io
-                                               : &ctx->inputs[j];
-              get_source_info_generic(ctx, io_in, srcstypeprefix, prefix, src,
-                                      io, arrayname, swizzle, src_buf);
-            } else if (ctx->inputs[j].name == TGSI_SEMANTIC_PATCH) {
-              struct vrend_shader_io *io = ctx->patch_input_range.used
-                                               ? &ctx->patch_input_range.io
-                                               : &ctx->inputs[j];
-              get_source_info_patch(srcstypeprefix, prefix, src, io, arrayname,
-                                    swizzle, src_buf);
-            } else if (ctx->inputs[j].name == TGSI_SEMANTIC_POSITION &&
-                       ctx->prog_type == TGSI_PROCESSOR_VERTEX &&
-                       ctx->inputs[j].first != ctx->inputs[j].last) {
-              if (src->Register.Indirect)
-                strbuf_fmt(src_buf, "%s(%s%s%s[addr%d + %d]%s)",
-                           get_string(srcstypeprefix), prefix,
-                           ctx->inputs[j].glsl_name, arrayname,
-                           src->Indirect.Index, src->Register.Index,
-                           ctx->inputs[j].is_int ? "" : swizzle);
-              else
-                strbuf_fmt(
-                    src_buf, "%s(%s%s%s[%d]%s)", get_string(srcstypeprefix),
-                    prefix, ctx->inputs[j].glsl_name, arrayname,
-                    src->Register.Index, ctx->inputs[j].is_int ? "" : swizzle);
-            } else
-              strbuf_fmt(src_buf, "%s(%s%s%s%s)", get_string(srcstypeprefix),
-                         prefix, ctx->inputs[j].glsl_name, arrayname,
-                         ctx->inputs[j].is_int ? "" : swizzle);
-          }
-          sinfo->override_no_wm[i] = ctx->inputs[j].override_no_wm;
-          break;
-        }
-    } else if (src->Register.File == TGSI_FILE_OUTPUT) {
-      for (uint32_t j = 0; j < ctx->num_outputs; j++) {
-        if (ctx->outputs[j].first <= src->Register.Index &&
-            ctx->outputs[j].last >= src->Register.Index &&
-            (ctx->outputs[j].usage_mask & usage_mask)) {
-          if (inst->Instruction.Opcode == TGSI_OPCODE_FBFETCH) {
-            ctx->outputs[j].fbfetch_used = true;
-            ctx->shader_req_bits |= SHADER_REQ_FBFETCH;
-          }
-
-          enum vrend_type_qualifier srcstypeprefix = stypeprefix;
-          if (stype == TGSI_TYPE_UNSIGNED && ctx->outputs[j].is_int)
-            srcstypeprefix = TYPE_CONVERSION_NONE;
-          if (ctx->outputs[j].glsl_gl_block) {
-            if (ctx->outputs[j].name == TGSI_SEMANTIC_CLIPDIST) {
-              char clip_indirect[32] = "";
-              if (ctx->outputs[j].first != ctx->outputs[j].last) {
-                if (src->Register.Indirect)
-                  snprintf(clip_indirect, sizeof(clip_indirect), "+ addr%d",
-                           src->Indirect.Index);
-                else
-                  snprintf(clip_indirect, sizeof(clip_indirect), "+ %d",
-                           src->Register.Index - ctx->outputs[j].first);
-              }
-              strbuf_fmt(src_buf, "clip_dist_temp[%d%s]", ctx->outputs[j].sid,
-                         clip_indirect);
-            }
-          } else if (ctx->outputs[j].name == TGSI_SEMANTIC_GENERIC) {
-            struct vrend_shader_io *io = ctx->generic_output_range.used
-                                             ? &ctx->generic_output_range.io
-                                             : &ctx->outputs[j];
-            get_source_info_generic(ctx, io_out, srcstypeprefix, prefix, src,
-                                    io, arrayname, swizzle, src_buf);
-          } else if (ctx->outputs[j].name == TGSI_SEMANTIC_PATCH) {
-            struct vrend_shader_io *io = ctx->patch_output_range.used
-                                             ? &ctx->patch_output_range.io
-                                             : &ctx->outputs[j];
-            get_source_info_patch(srcstypeprefix, prefix, src, io, arrayname,
-                                  swizzle, src_buf);
-          } else {
-            strbuf_fmt(src_buf, "%s(%s%s%s%s)", get_string(srcstypeprefix),
-                       prefix, ctx->outputs[j].glsl_name, arrayname,
-                       ctx->outputs[j].is_int ? "" : swizzle);
-          }
-          sinfo->override_no_wm[i] = ctx->outputs[j].override_no_wm;
-          break;
-        }
-      }
-    } else if (src->Register.File == TGSI_FILE_TEMPORARY) {
-      struct vrend_temp_range *range =
-          find_temp_range(ctx, src->Register.Index);
-      if (!range)
-        return false;
-      if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE && i == 1) {
-        stprefix = true;
-        stypeprefix = FLOAT_BITS_TO_INT;
-      }
-
-      if (src->Register.Indirect) {
-        assert(src->Indirect.File == TGSI_FILE_ADDRESS);
-        strbuf_fmt(
-            src_buf, "%s%c%stemp%d[addr%d + %d]%s%c", get_string(stypeprefix),
-            stprefix ? '(' : ' ', prefix, range->first, src->Indirect.Index,
-            src->Register.Index - range->first, swizzle, stprefix ? ')' : ' ');
-      } else
-        strbuf_fmt(src_buf, "%s%c%stemp%d[%d]%s%c", get_string(stypeprefix),
-                   stprefix ? '(' : ' ', prefix, range->first,
-                   src->Register.Index - range->first, swizzle,
-                   stprefix ? ')' : ' ');
-    } else if (src->Register.File == TGSI_FILE_CONSTANT) {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      int dim = 0;
-      if (src->Register.Dimension && src->Dimension.Index != 0) {
-        dim = src->Dimension.Index;
-        if (src->Dimension.Indirect) {
-          assert(src->DimIndirect.File == TGSI_FILE_ADDRESS);
-          ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-          if (src->Register.Indirect) {
-            assert(src->Indirect.File == TGSI_FILE_ADDRESS);
-            strbuf_fmt(
-                src_buf, "%s(%s%suboarr[addr%d].ubocontents[addr%d + %d]%s)",
-                get_string(stypeprefix), prefix, cname, src->DimIndirect.Index,
-                src->Indirect.Index, src->Register.Index, swizzle);
-          } else
-            strbuf_fmt(src_buf, "%s(%s%suboarr[addr%d].ubocontents[%d]%s)",
-                       get_string(stypeprefix), prefix, cname,
-                       src->DimIndirect.Index, src->Register.Index, swizzle);
-        } else {
-          if (ctx->info.dimension_indirect_files & (1 << TGSI_FILE_CONSTANT)) {
-            if (src->Register.Indirect) {
-              strbuf_fmt(
-                  src_buf, "%s(%s%suboarr[%d].ubocontents[addr%d + %d]%s)",
-                  get_string(stypeprefix), prefix, cname, dim - ctx->ubo_base,
-                  src->Indirect.Index, src->Register.Index, swizzle);
-            } else
-              strbuf_fmt(src_buf, "%s(%s%suboarr[%d].ubocontents[%d]%s)",
-                         get_string(stypeprefix), prefix, cname,
-                         dim - ctx->ubo_base, src->Register.Index, swizzle);
-          } else {
-            if (src->Register.Indirect) {
-              strbuf_fmt(src_buf, "%s(%s%subo%dcontents[addr0 + %d]%s)",
-                         get_string(stypeprefix), prefix, cname, dim,
-                         src->Register.Index, swizzle);
-            } else
-              strbuf_fmt(src_buf, "%s(%s%subo%dcontents[%d]%s)",
-                         get_string(stypeprefix), prefix, cname, dim,
-                         src->Register.Index, swizzle);
-          }
-        }
-      } else {
-        enum vrend_type_qualifier csp = TYPE_CONVERSION_NONE;
-        ctx->shader_req_bits |= SHADER_REQ_INTS;
-        if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE && i == 1)
-          csp = IVEC4;
-        else if (stype == TGSI_TYPE_FLOAT || stype == TGSI_TYPE_UNTYPED)
-          csp = UINT_BITS_TO_FLOAT;
-        else if (stype == TGSI_TYPE_SIGNED)
-          csp = IVEC4;
-
-        if (src->Register.Indirect) {
-          strbuf_fmt(src_buf, "%s%s(%sconst%d[addr0 + %d]%s)", prefix,
-                     get_string(csp), cname, dim, src->Register.Index, swizzle);
-        } else
-          strbuf_fmt(src_buf, "%s%s(%sconst%d[%d]%s)", prefix, get_string(csp),
-                     cname, dim, src->Register.Index, swizzle);
-      }
-    } else if (src->Register.File == TGSI_FILE_SAMPLER) {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      if (ctx->info.indirect_files & (1 << TGSI_FILE_SAMPLER)) {
-        int basearrayidx = lookup_sampler_array(ctx, src->Register.Index);
-        if (src->Register.Indirect) {
-          strbuf_fmt(src_buf, "%ssamp%d[addr%d+%d]%s", cname, basearrayidx,
-                     src->Indirect.Index, src->Register.Index - basearrayidx,
-                     swizzle);
-        } else {
-          strbuf_fmt(src_buf, "%ssamp%d[%d]%s", cname, basearrayidx,
-                     src->Register.Index - basearrayidx, swizzle);
-        }
-      } else {
-        strbuf_fmt(src_buf, "%ssamp%d%s", cname, src->Register.Index, swizzle);
-      }
-      sinfo->sreg_index = src->Register.Index;
-    } else if (src->Register.File == TGSI_FILE_IMAGE) {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      if (ctx->info.indirect_files & (1 << TGSI_FILE_IMAGE)) {
-        int basearrayidx = lookup_image_array(ctx, src->Register.Index);
-        if (src->Register.Indirect) {
-          assert(src->Indirect.File == TGSI_FILE_ADDRESS);
-          strbuf_fmt(src_buf, "%simg%d[addr%d + %d]", cname, basearrayidx,
-                     src->Indirect.Index, src->Register.Index - basearrayidx);
-        } else
-          strbuf_fmt(src_buf, "%simg%d[%d]", cname, basearrayidx,
-                     src->Register.Index - basearrayidx);
-      } else
-        strbuf_fmt(src_buf, "%simg%d%s", cname, src->Register.Index, swizzle);
-      sinfo->sreg_index = src->Register.Index;
-    } else if (src->Register.File == TGSI_FILE_BUFFER) {
-      const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-      if (ctx->info.indirect_files & (1 << TGSI_FILE_BUFFER)) {
-        bool atomic_ssbo = ctx->ssbo_atomic_mask & (1 << src->Register.Index);
-        const char *atomic_str = atomic_ssbo ? "atomic" : "";
-        int base =
-            atomic_ssbo ? ctx->ssbo_atomic_array_base : ctx->ssbo_array_base;
-        if (src->Register.Indirect) {
-          strbuf_fmt(src_buf, "%sssboarr%s[addr%d+%d].%sssbocontents%d%s",
-                     cname, atomic_str, src->Indirect.Index,
-                     src->Register.Index - base, cname, base, swizzle);
-        } else {
-          strbuf_fmt(src_buf, "%sssboarr%s[%d].%sssbocontents%d%s", cname,
-                     atomic_str, src->Register.Index - base, cname, base,
-                     swizzle);
-        }
-      } else {
-        strbuf_fmt(src_buf, "%sssbocontents%d%s", cname, src->Register.Index,
-                   swizzle);
-      }
-      sinfo->sreg_index = src->Register.Index;
-    } else if (src->Register.File == TGSI_FILE_MEMORY) {
-      strbuf_fmt(src_buf, "values");
-      sinfo->sreg_index = src->Register.Index;
-    } else if (src->Register.File == TGSI_FILE_IMMEDIATE) {
-      if (src->Register.Index >= (int)ARRAY_SIZE(ctx->imm))
-        return false;
-      struct immed *imd = &ctx->imm[src->Register.Index];
-      int idx = src->Register.SwizzleX;
-      char temp[48];
-      enum vrend_type_qualifier vtype = VEC4;
-      enum vrend_type_qualifier imm_stypeprefix = stypeprefix;
-
-      if ((inst->Instruction.Opcode == TGSI_OPCODE_TG4 && i == 1) ||
-          (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE && i == 1))
-        stype = TGSI_TYPE_SIGNED;
-
-      if (imd->type == TGSI_IMM_UINT32 || imd->type == TGSI_IMM_INT32) {
-        if (imd->type == TGSI_IMM_UINT32)
-          vtype = UVEC4;
-        else
-          vtype = IVEC4;
-
-        if (stype == TGSI_TYPE_UNSIGNED && imd->type == TGSI_IMM_INT32)
-          imm_stypeprefix = UVEC4;
-        else if (stype == TGSI_TYPE_SIGNED && imd->type == TGSI_IMM_UINT32)
-          imm_stypeprefix = IVEC4;
-        else if (stype == TGSI_TYPE_FLOAT || stype == TGSI_TYPE_UNTYPED) {
-          if (imd->type == TGSI_IMM_INT32)
-            imm_stypeprefix = INT_BITS_TO_FLOAT;
-          else
-            imm_stypeprefix = UINT_BITS_TO_FLOAT;
-        } else if (stype == TGSI_TYPE_UNSIGNED || stype == TGSI_TYPE_SIGNED)
-          imm_stypeprefix = TYPE_CONVERSION_NONE;
-      } else if (imd->type == TGSI_IMM_FLOAT64) {
-        vtype = UVEC4;
-        if (stype == TGSI_TYPE_DOUBLE)
-          imm_stypeprefix = TYPE_CONVERSION_NONE;
-        else
-          imm_stypeprefix = UINT_BITS_TO_FLOAT;
-      }
-
-      /* build up a vec4 of immediates */
-      strbuf_fmt(src_buf, "%s(%s%s(", get_string(imm_stypeprefix), prefix,
-                 get_string(vtype));
-      for (uint32_t j = 0; j < 4; j++) {
-        if (j == 0)
-          idx = src->Register.SwizzleX;
-        else if (j == 1)
-          idx = src->Register.SwizzleY;
-        else if (j == 2)
-          idx = src->Register.SwizzleZ;
-        else if (j == 3)
-          idx = src->Register.SwizzleW;
-
-        if (inst->Instruction.Opcode == TGSI_OPCODE_TG4 && i == 1 && j == 0) {
-          if (imd->val[idx].ui > 0)
-            sinfo->tg4_has_component = true;
-        }
-
-        switch (imd->type) {
-        case TGSI_IMM_FLOAT32:
-          if (isinf(imd->val[idx].f) || isnan(imd->val[idx].f)) {
-            ctx->shader_req_bits |= SHADER_REQ_INTS;
-            snprintf(temp, 48, "uintBitsToFloat(%uU)", imd->val[idx].ui);
-          } else
-            snprintf(temp, 25, "%.8g", imd->val[idx].f);
-          break;
-        case TGSI_IMM_UINT32:
-          snprintf(temp, 25, "%uU", imd->val[idx].ui);
-          break;
-        case TGSI_IMM_INT32:
-          snprintf(temp, 25, "%d", imd->val[idx].i);
-          sinfo->imm_value = imd->val[idx].i;
-          break;
-        case TGSI_IMM_FLOAT64:
-          snprintf(temp, 48, "%uU", imd->val[idx].ui);
-          break;
-        default:
-          return false;
-        }
-        strbuf_append(src_buf, temp);
-        if (j < 3)
-          strbuf_append(src_buf, ",");
-        else {
-          snprintf(temp, 4, "))%c", isfloatabsolute ? ')' : 0);
-          strbuf_append(src_buf, temp);
-        }
-      }
-    } else if (src->Register.File == TGSI_FILE_SYSTEM_VALUE) {
-      for (uint32_t j = 0; j < ctx->num_system_values; j++)
-        if (ctx->system_values[j].first == src->Register.Index) {
-          if (ctx->system_values[j].name == TGSI_SEMANTIC_VERTEXID ||
-              ctx->system_values[j].name == TGSI_SEMANTIC_INSTANCEID ||
-              ctx->system_values[j].name == TGSI_SEMANTIC_PRIMID ||
-              ctx->system_values[j].name == TGSI_SEMANTIC_VERTICESIN ||
-              ctx->system_values[j].name == TGSI_SEMANTIC_INVOCATIONID ||
-              ctx->system_values[j].name == TGSI_SEMANTIC_SAMPLEID) {
-            if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE && i == 1)
-              strbuf_fmt(src_buf, "ivec4(%s)", ctx->system_values[j].glsl_name);
-            else
-              strbuf_fmt(src_buf, "%s(vec4(intBitsToFloat(%s)))",
-                         get_string(stypeprefix),
-                         ctx->system_values[j].glsl_name);
-          } else if (ctx->system_values[j].name ==
-                     TGSI_SEMANTIC_HELPER_INVOCATION) {
-            strbuf_fmt(src_buf, "uvec4(%s)", ctx->system_values[j].glsl_name);
-          } else if (ctx->system_values[j].name == TGSI_SEMANTIC_TESSINNER ||
-                     ctx->system_values[j].name == TGSI_SEMANTIC_TESSOUTER) {
-            strbuf_fmt(src_buf, "%s(vec4(%s[%d], %s[%d], %s[%d], %s[%d]))",
-                       prefix, ctx->system_values[j].glsl_name,
-                       src->Register.SwizzleX, ctx->system_values[j].glsl_name,
-                       src->Register.SwizzleY, ctx->system_values[j].glsl_name,
-                       src->Register.SwizzleZ, ctx->system_values[j].glsl_name,
-                       src->Register.SwizzleW);
-          } else if (ctx->system_values[j].name == TGSI_SEMANTIC_SAMPLEPOS) {
-            /* gl_SamplePosition is a vec2, but TGSI_SEMANTIC_SAMPLEPOS
-             * is a vec4 with z = w = 0
-             */
-            const char *components[4] = {"gl_SamplePosition.x",
-                                         "gl_SamplePosition.y", "0.0", "0.0"};
-            strbuf_fmt(src_buf, "%s(vec4(%s, %s, %s, %s))", prefix,
-                       components[src->Register.SwizzleX],
-                       components[src->Register.SwizzleY],
-                       components[src->Register.SwizzleZ],
-                       components[src->Register.SwizzleW]);
-          } else if (ctx->system_values[j].name == TGSI_SEMANTIC_TESSCOORD) {
-            strbuf_fmt(src_buf, "%s(vec4(%s.%c, %s.%c, %s.%c, %s.%c))", prefix,
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleX),
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleY),
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleZ),
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleW));
-          } else if (ctx->system_values[j].name == TGSI_SEMANTIC_GRID_SIZE ||
-                     ctx->system_values[j].name == TGSI_SEMANTIC_THREAD_ID ||
-                     ctx->system_values[j].name == TGSI_SEMANTIC_BLOCK_ID) {
-            enum vrend_type_qualifier mov_conv = TYPE_CONVERSION_NONE;
-            if (inst->Instruction.Opcode == TGSI_OPCODE_MOV &&
-                inst->Dst[0].Register.File == TGSI_FILE_TEMPORARY)
-              mov_conv = UINT_BITS_TO_FLOAT;
-            strbuf_fmt(src_buf, "%s(uvec4(%s.%c, %s.%c, %s.%c, %s.%c))",
-                       get_string(mov_conv), ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleX),
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleY),
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleZ),
-                       ctx->system_values[j].glsl_name,
-                       get_swiz_char(src->Register.SwizzleW));
-            sinfo->override_no_cast[i] = true;
-          } else if (ctx->system_values[j].name == TGSI_SEMANTIC_SAMPLEMASK) {
-            const char *vec_type = "ivec4";
-            if ((inst->Instruction.Opcode == TGSI_OPCODE_AND) &&
-                (stype == TGSI_TYPE_UNSIGNED))
-              vec_type = "uvec4";
-            ctx->shader_req_bits |= SHADER_REQ_SAMPLE_SHADING | SHADER_REQ_INTS;
-            strbuf_fmt(src_buf, "%s(%s, %s, %s, %s)", vec_type,
-                       src->Register.SwizzleX == TGSI_SWIZZLE_X
-                           ? ctx->system_values[j].glsl_name
-                           : "0",
-                       src->Register.SwizzleY == TGSI_SWIZZLE_X
-                           ? ctx->system_values[j].glsl_name
-                           : "0",
-                       src->Register.SwizzleZ == TGSI_SWIZZLE_X
-                           ? ctx->system_values[j].glsl_name
-                           : "0",
-                       src->Register.SwizzleW == TGSI_SWIZZLE_X
-                           ? ctx->system_values[j].glsl_name
-                           : "0");
-          } else
-            strbuf_fmt(src_buf, "%s%s", prefix,
-                       ctx->system_values[j].glsl_name);
-          sinfo->override_no_wm[i] = ctx->system_values[j].override_no_wm;
-          break;
-        }
-    } else if (src->Register.File == TGSI_FILE_HW_ATOMIC) {
-      for (uint32_t j = 0; j < ctx->num_abo; j++) {
-        if (src->Dimension.Index == ctx->abo_idx[j] &&
-            src->Register.Index >= ctx->abo_offsets[j] &&
-            src->Register.Index < ctx->abo_offsets[j] + ctx->abo_sizes[j]) {
-          if (ctx->abo_sizes[j] > 1) {
-            int offset = src->Register.Index - ctx->abo_offsets[j];
-            if (src->Register.Indirect) {
-              assert(src->Indirect.File == TGSI_FILE_ADDRESS);
-              strbuf_fmt(src_buf, "ac%d[addr%d + %d]", j, src->Indirect.Index,
-                         offset);
-            } else
-              strbuf_fmt(src_buf, "ac%d[%d]", j, offset);
-          } else
-            strbuf_fmt(src_buf, "ac%d", j);
-          break;
-        }
-      }
-      sinfo->sreg_index = src->Register.Index;
-    }
-
-    if (stype == TGSI_TYPE_DOUBLE) {
-      boolean isabsolute = src->Register.Absolute;
-      strcpy(fp64_src, src_buf->buf);
-      strbuf_fmt(src_buf, "fp64_src[%d]", i);
-      emit_buff(ctx, "%s.x = %spackDouble2x32(uvec2(%s%s))%s;\n", src_buf->buf,
-                isabsolute ? "abs(" : "", fp64_src, swizzle,
-                isabsolute ? ")" : "");
-    }
-  }
-
-  return true;
-}
-
-static bool
-rewrite_1d_image_coordinate(struct vrend_strbuf *src,
-                            const struct tgsi_full_instruction *inst) {
-  if (inst->Src[0].Register.File == TGSI_FILE_IMAGE &&
-      (inst->Memory.Texture == TGSI_TEXTURE_1D ||
-       inst->Memory.Texture == TGSI_TEXTURE_1D_ARRAY)) {
-
-    /* duplicate src */
-    size_t len = strbuf_get_len(src);
-    char *buf = malloc(len);
-    if (!buf)
-      return false;
-    strncpy(buf, src->buf, len);
-
-    if (inst->Memory.Texture == TGSI_TEXTURE_1D)
-      strbuf_fmt(src, "vec2(vec4(%s).x, 0)", buf);
-    else if (inst->Memory.Texture == TGSI_TEXTURE_1D_ARRAY)
-      strbuf_fmt(src, "vec3(%s.xy, 0).xzy", buf);
-
-    free(buf);
-  }
-  return true;
-}
-/* We have indirect IO access, but the guest actually send separate values, so
- * now we have to emulate an array.
- */
-static void rewrite_io_ranged(struct dump_ctx *ctx) {
-  if ((ctx->info.indirect_files & (1 << TGSI_FILE_INPUT)) ||
-      ctx->key->num_indirect_generic_inputs ||
-      ctx->key->num_indirect_patch_inputs) {
-
-    for (uint i = 0; i < ctx->num_inputs; ++i) {
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_PATCH) {
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        if (ctx->inputs[i].sid < ctx->patch_input_range.io.sid ||
-            ctx->patch_input_range.used == false) {
-          ctx->patch_input_range.io.first = i;
-          ctx->patch_input_range.io.usage_mask = 0xf;
-          ctx->patch_input_range.io.name = TGSI_SEMANTIC_PATCH;
-          ctx->patch_input_range.io.sid = ctx->inputs[i].sid;
-          ctx->patch_input_range.used = true;
-        }
-        if (ctx->inputs[i].sid > ctx->patch_input_range.io.last)
-          ctx->patch_input_range.io.last = ctx->inputs[i].sid;
-      }
-
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_GENERIC) {
-        ctx->inputs[i].glsl_predefined_no_emit = true;
-        if (ctx->inputs[i].sid < ctx->generic_input_range.io.sid ||
-            ctx->generic_input_range.used == false) {
-          ctx->generic_input_range.io.sid = ctx->inputs[i].sid;
-          ctx->generic_input_range.io.first = i;
-          ctx->generic_input_range.io.name = TGSI_SEMANTIC_GENERIC;
-          ctx->generic_input_range.io.num_components = 4;
-          ctx->generic_input_range.used = true;
-        }
-        if (ctx->inputs[i].sid > ctx->generic_input_range.io.last)
-          ctx->generic_input_range.io.last = ctx->inputs[i].sid;
-      }
-
-      if (ctx->key->num_indirect_generic_inputs > 0)
-        ctx->generic_input_range.io.last =
-            ctx->generic_input_range.io.sid +
-            ctx->key->num_indirect_generic_inputs - 1;
-      if (ctx->key->num_indirect_patch_inputs > 0)
-        ctx->patch_input_range.io.last = ctx->patch_input_range.io.sid +
-                                         ctx->key->num_indirect_patch_inputs -
-                                         1;
-    }
-    snprintf(ctx->patch_input_range.io.glsl_name, 64, "%s_p%d",
-             get_stage_input_name_prefix(ctx, ctx->prog_type),
-             ctx->patch_input_range.io.sid);
-    snprintf(ctx->generic_input_range.io.glsl_name, 64, "%s_g%d",
-             get_stage_input_name_prefix(ctx, ctx->prog_type),
-             ctx->generic_input_range.io.sid);
-
-    ctx->generic_input_range.io.num_components = 4;
-    ctx->generic_input_range.io.usage_mask = 0xf;
-    ctx->generic_input_range.io.swizzle_offset = 0;
-
-    ctx->patch_input_range.io.num_components = 4;
-    ctx->patch_input_range.io.usage_mask = 0xf;
-    ctx->patch_input_range.io.swizzle_offset = 0;
-
-    if (prefer_generic_io_block(ctx, io_in))
-      require_glsl_ver(ctx, 150);
-  }
-
-  if ((ctx->info.indirect_files & (1 << TGSI_FILE_OUTPUT)) ||
-      ctx->key->num_indirect_generic_outputs ||
-      ctx->key->num_indirect_patch_outputs) {
-
-    for (uint i = 0; i < ctx->num_outputs; ++i) {
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_PATCH) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        if (ctx->outputs[i].sid < ctx->patch_output_range.io.sid ||
-            ctx->patch_output_range.used == false) {
-          ctx->patch_output_range.io.first = i;
-          ctx->patch_output_range.io.name = TGSI_SEMANTIC_PATCH;
-          ctx->patch_output_range.io.sid = ctx->outputs[i].sid;
-          ctx->patch_output_range.used = true;
-        }
-        if (ctx->outputs[i].sid > ctx->patch_output_range.io.last) {
-          ctx->patch_output_range.io.last = ctx->outputs[i].sid;
-        }
-      }
-
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_GENERIC) {
-        ctx->outputs[i].glsl_predefined_no_emit = true;
-        if (ctx->outputs[i].sid < ctx->generic_output_range.io.sid ||
-            ctx->generic_output_range.used == false) {
-          ctx->generic_output_range.io.sid = ctx->outputs[i].sid;
-          ctx->generic_output_range.io.first = i;
-          ctx->generic_output_range.io.name = TGSI_SEMANTIC_GENERIC;
-          ctx->generic_output_range.used = true;
-          ctx->generic_output_range.io.usage_mask = 0xf;
-          ctx->generic_output_range.io.num_components = 4;
-        }
-        if (ctx->outputs[i].sid > ctx->generic_output_range.io.last) {
-          ctx->generic_output_range.io.last = ctx->outputs[i].sid;
-        }
-      }
-    }
-    snprintf(ctx->patch_output_range.io.glsl_name, 64, "%s_p%d",
-             get_stage_output_name_prefix(ctx->prog_type),
-             ctx->patch_output_range.io.sid);
-    snprintf(ctx->generic_output_range.io.glsl_name, 64, "%s_g%d",
-             get_stage_output_name_prefix(ctx->prog_type),
-             ctx->generic_output_range.io.sid);
-
-    ctx->generic_output_range.io.num_components = 4;
-    ctx->generic_output_range.io.usage_mask = 0xf;
-    ctx->generic_output_range.io.swizzle_offset = 0;
-
-    ctx->patch_output_range.io.num_components = 4;
-    ctx->patch_output_range.io.usage_mask = 0xf;
-    ctx->patch_output_range.io.swizzle_offset = 0;
-
-    if (prefer_generic_io_block(ctx, io_out))
-      require_glsl_ver(ctx, 150);
-  }
-}
-
-static void rename_variables(unsigned nio, struct vrend_shader_io *io,
-                             const char *name_prefix, unsigned coord_replace) {
-  /* Rename the generic and patch variables after applying all identifications
-   */
-  for (unsigned i = 0; i < nio; ++i) {
-    if ((io[i].name != TGSI_SEMANTIC_GENERIC &&
-         io[i].name != TGSI_SEMANTIC_PATCH) ||
-        (coord_replace & (1 << io[i].sid)))
-      continue;
-    char io_type = io[i].name == TGSI_SEMANTIC_GENERIC ? 'g' : 'p';
-    snprintf(io[i].glsl_name, 64, "%s_%c%dA%d_%x", name_prefix, io_type,
-             io[i].sid, io[i].array_id, io[i].usage_mask);
-  }
-}
-
-static void rewrite_components(unsigned nio, struct vrend_shader_io *io,
-                               const char *name_prefix, unsigned coord_replace,
-                               bool no_input_arrays) {
-  if (!nio)
-    return;
-
-  for (unsigned i = 0; i < nio - 1; ++i) {
-    if ((io[i].name != TGSI_SEMANTIC_GENERIC &&
-         io[i].name != TGSI_SEMANTIC_PATCH) ||
-        io[i].glsl_predefined_no_emit)
-      continue;
-
-    for (unsigned j = i + 1; j < nio; ++j) {
-      if ((io[j].name != TGSI_SEMANTIC_GENERIC &&
-           io[j].name != TGSI_SEMANTIC_PATCH) ||
-          io[j].glsl_predefined_no_emit)
-        continue;
-      if (io[i].first == io[j].first)
-        io[j].glsl_predefined_no_emit = true;
-    }
-  }
-
-  for (unsigned i = 0; i < nio; ++i) {
-    if ((io[i].name != TGSI_SEMANTIC_GENERIC &&
-         io[i].name != TGSI_SEMANTIC_PATCH) ||
-        !no_input_arrays)
-      continue;
-
-    io[i].usage_mask = 0xf;
-    io[i].num_components = 4;
-    io[i].swizzle_offset = 0;
-    io[i].override_no_wm = false;
-  }
-
-  rename_variables(nio, io, name_prefix, coord_replace);
-}
-
-static void rewrite_vs_pos_array(struct dump_ctx *ctx) {
-  int range_start = 0xffff;
-  int range_end = 0;
-  int io_idx = 0;
-
-  for (uint i = 0; i < ctx->num_inputs; ++i) {
-    if (ctx->inputs[i].name == TGSI_SEMANTIC_POSITION) {
-      ctx->inputs[i].glsl_predefined_no_emit = true;
-      if (ctx->inputs[i].first < range_start) {
-        io_idx = i;
-        range_start = ctx->inputs[i].first;
-      }
-      if (ctx->inputs[i].last > range_end)
-        range_end = ctx->inputs[i].last;
-    }
-  }
-
-  if (range_start != range_end) {
-    ctx->inputs[io_idx].first = range_start;
-    ctx->inputs[io_idx].last = range_end;
-    ctx->inputs[io_idx].glsl_predefined_no_emit = false;
-    require_glsl_ver(ctx, 150);
-  }
-}
-
-static void emit_fs_clipdistance_load(struct dump_ctx *ctx) {
-  int i;
-
-  if (!ctx->fs_uses_clipdist_input)
-    return;
-
-  int prev_num =
-      ctx->key->prev_stage_num_clip_out + ctx->key->prev_stage_num_cull_out;
-  int ndists;
-  const char *prefix = "";
-
-  if (ctx->prog_type == PIPE_SHADER_TESS_CTRL)
-    prefix = "gl_out[gl_InvocationID].";
-
-  ndists = ctx->num_in_clip_dist;
-  if (prev_num > 0)
-    ndists = prev_num;
-
-  for (i = 0; i < ndists; i++) {
-    int clipidx = i < 4 ? 0 : 1;
-    char swiz = i & 3;
-    char wm = 0;
-    switch (swiz) {
-    default:
-    case 0:
-      wm = 'x';
-      break;
-    case 1:
-      wm = 'y';
-      break;
-    case 2:
-      wm = 'z';
-      break;
-    case 3:
-      wm = 'w';
-      break;
-    }
-    bool is_cull = false;
-    if (prev_num > 0) {
-      if (i >= ctx->key->prev_stage_num_clip_out && i < prev_num)
-        is_cull = true;
-    }
-    const char *clip_cull = is_cull ? "Cull" : "Clip";
-    emit_buff(ctx, "clip_dist_temp[%d].%c = %sgl_%sDistance[%d];\n", clipidx,
-              wm, prefix, clip_cull,
-              is_cull ? i - ctx->key->prev_stage_num_clip_out : i);
-  }
-}
-
-/* TGSI possibly emits VS, TES, TCS, and GEOM outputs with layouts (i.e.
- * it gives components), but it doesn't do so for the corresponding inputs from
- * TXS, GEOM, abd TES, so that we have to apply the output layouts from the
- * previous shader stage to the according inputs.
- */
-
-static bool apply_prev_layout(struct dump_ctx *ctx) {
-  bool require_enhanced_layouts = false;
-
-  /* Walk through all inputs and see whether we have a corresonding output from
-   * the previous shader that uses a different layout. It may even be that one
-   * input be the combination of two inputs. */
-
-  for (unsigned i = 0; i < ctx->num_inputs; ++i) {
-    unsigned i_input = i;
-    struct vrend_shader_io *io = &ctx->inputs[i];
-
-    if (io->name == TGSI_SEMANTIC_GENERIC || io->name == TGSI_SEMANTIC_PATCH) {
-
-      struct vrend_layout_info *layout =
-          ctx->key->prev_stage_generic_and_patch_outputs_layout;
-      for (unsigned generic_index = 0;
-           generic_index < ctx->key->num_prev_generic_and_patch_outputs;
-           ++generic_index, ++layout) {
-
-        bool already_found_one = false;
-
-        /* Identify by sid and arrays_id  */
-        if (io->sid == layout->sid && (io->array_id == layout->array_id)) {
-          unsigned new_mask = io->usage_mask;
-
-          /* We have already one IO with the same SID and arrays ID, so we need
-           * to duplicate it */
-          if (already_found_one) {
-            memmove(io + 1, io,
-                    (ctx->num_inputs - i_input) *
-                        sizeof(struct vrend_shader_io));
-            ctx->num_inputs++;
-            ++io;
-            ++i_input;
-
-          } else if ((io->usage_mask == 0xf) && (layout->usage_mask != 0xf)) {
-            /* If we found the first input with all components, and a
-             * corresponding prev output that uses less components  */
-            already_found_one = true;
-          }
-
-          if (already_found_one) {
-            new_mask = io->usage_mask = (uint8_t)layout->usage_mask;
-            io->layout_location = layout->location;
-            io->array_id = layout->array_id;
-
-            u_bit_scan_consecutive_range(&new_mask, &io->swizzle_offset,
-                                         &io->num_components);
-            require_enhanced_layouts |= io->swizzle_offset > 0;
-            if (io->num_components == 1)
-              io->override_no_wm = true;
-            if (i_input < ctx->num_inputs - 1) {
-              already_found_one = (io[1].sid != layout->sid ||
-                                   io[1].array_id != layout->array_id);
-            }
-          }
-        }
-      }
-    }
-    ++io;
-    ++i_input;
-  }
-  return require_enhanced_layouts;
-}
-
-static bool evaluate_layout_overlays(unsigned nio, struct vrend_shader_io *io,
-                                     const char *name_prefix,
-                                     unsigned coord_replace) {
-  bool require_enhanced_layouts = 0;
-  int next_loc = 1;
-
-  /* IO elements may be emitted for the same location but with
-   * non-overlapping swizzles, therefore, we modify the name of
-   * the variable to include the swizzle mask.
-   *
-   * Since TGSI also emits inputs that have no masks but are still at the
-   * same location, we also need to add an array ID.
-   */
-
-  for (unsigned i = 0; i < nio - 1; ++i) {
-    if ((io[i].name != TGSI_SEMANTIC_GENERIC &&
-         io[i].name != TGSI_SEMANTIC_PATCH) ||
-        io[i].usage_mask == 0xf || io[i].layout_location > 0)
-      continue;
-
-    for (unsigned j = i + 1; j < nio; ++j) {
-      if ((io[j].name != TGSI_SEMANTIC_GENERIC &&
-           io[j].name != TGSI_SEMANTIC_PATCH) ||
-          io[j].usage_mask == 0xf || io[j].layout_location > 0)
-        continue;
-
-      /* Do the definition ranges overlap? */
-      if (io[i].last < io[j].first || io[i].first > io[j].last)
-        continue;
-
-      /* Overlapping ranges require explicite layouts and if they start at the
-       * same index thet location must be equal */
-      if (io[i].first == io[j].first) {
-        io[j].layout_location = io[i].layout_location = next_loc++;
-      } else {
-        io[i].layout_location = next_loc++;
-        io[j].layout_location = next_loc++;
-      }
-      require_enhanced_layouts = true;
-    }
-  }
-
-  rename_variables(nio, io, name_prefix, coord_replace);
-
-  return require_enhanced_layouts;
-}
-
-static void renumber_io_arrays(unsigned nio, struct vrend_shader_io *io) {
-  int next_array_id = 1;
-  for (unsigned i = 0; i < nio; ++i) {
-    if (io[i].name != TGSI_SEMANTIC_GENERIC &&
-        io[i].name != TGSI_SEMANTIC_PATCH)
-      continue;
-    if (io[i].array_id > 0)
-      io[i].array_id = next_array_id++;
-  }
-}
-
-static void handle_io_arrays(struct dump_ctx *ctx) {
-  bool require_enhanced_layouts = false;
-
-  /* If the guest sent real IO arrays then we declare them individually,
-   * and have to do some work to deal with overlapping values, regions and
-   * enhanced layouts */
-  if (ctx->guest_sent_io_arrays) {
-
-    /* Array ID numbering is not ordered accross shaders, so do
-     * some renumbering for generics and patches. */
-    renumber_io_arrays(ctx->num_inputs, ctx->inputs);
-    renumber_io_arrays(ctx->num_outputs, ctx->outputs);
-  }
-
-  /* In these shaders the inputs don't have the layout component information
-   * therefore, copy the info from the prev shaders output */
-  if (ctx->prog_type == TGSI_PROCESSOR_GEOMETRY ||
-      ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL ||
-      ctx->prog_type == TGSI_PROCESSOR_TESS_EVAL)
-    require_enhanced_layouts |= apply_prev_layout(ctx);
-
-  if (ctx->guest_sent_io_arrays) {
-    if (ctx->num_inputs > 0)
-      if (evaluate_layout_overlays(
-              ctx->num_inputs, ctx->inputs,
-              get_stage_input_name_prefix(ctx, ctx->prog_type),
-              ctx->key->coord_replace)) {
-        require_enhanced_layouts = true;
-      }
-
-    if (ctx->num_outputs > 0)
-      if (evaluate_layout_overlays(ctx->num_outputs, ctx->outputs,
-                                   get_stage_output_name_prefix(ctx->prog_type),
-                                   0)) {
-        require_enhanced_layouts = true;
-      }
-
-  } else {
-    /* The guest didn't send real arrays, do we might have to add a big array
-     * for all generic and another ofr patch inputs */
-    rewrite_io_ranged(ctx);
-    rewrite_components(ctx->num_inputs, ctx->inputs,
-                       get_stage_input_name_prefix(ctx, ctx->prog_type),
-                       ctx->key->coord_replace, true);
-
-    rewrite_components(ctx->num_outputs, ctx->outputs,
-                       get_stage_output_name_prefix(ctx->prog_type), 0, true);
-  }
-
-  if (require_enhanced_layouts) {
-    ctx->shader_req_bits |= SHADER_REQ_ENHANCED_LAYOUTS;
-    ctx->shader_req_bits |= SHADER_REQ_SEPERATE_SHADER_OBJECTS;
-  }
-}
-
-static boolean iter_instruction(struct tgsi_iterate_context *iter,
-                                struct tgsi_full_instruction *inst) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  struct dest_info dinfo = {0};
-  struct source_info sinfo = {0};
-  const char *srcs[4];
-  char dsts[3][255];
-  char fp64_dsts[3][255];
-  uint instno = ctx->instno++;
-  char writemask[6] = "";
-  char src_swizzle0[10];
-
-  sinfo.svec4 = VEC4;
-
-  if (ctx->prog_type == -1)
-    ctx->prog_type = iter->processor.Processor;
-
-  if (instno == 0) {
-    handle_io_arrays(ctx);
-
-    /* Vertex shader inputs are not send as arrays, but the access may still be
-     * indirect. so we have to deal with that */
-    if (ctx->prog_type == TGSI_PROCESSOR_VERTEX &&
-        ctx->info.indirect_files & (1 << TGSI_FILE_INPUT)) {
-      rewrite_vs_pos_array(ctx);
-    }
-
-    emit_buf(ctx, "void main(void)\n{\n");
-    if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-      emit_color_select(ctx);
-      if (ctx->fs_uses_clipdist_input)
-        emit_fs_clipdistance_load(ctx);
-    }
-    if (ctx->so)
-      prepare_so_movs(ctx);
-  }
-
-  if (!get_destination_info(ctx, inst, &dinfo, dsts, fp64_dsts, writemask))
-    return false;
-
-  if (!get_source_info(ctx, inst, &sinfo, ctx->src_bufs, src_swizzle0))
-    return false;
-
-  for (size_t i = 0; i < ARRAY_SIZE(srcs); ++i)
-    srcs[i] = ctx->src_bufs[i].buf;
-
-  switch (inst->Instruction.Opcode) {
-  case TGSI_OPCODE_SQRT:
-  case TGSI_OPCODE_DSQRT:
-    emit_buff(ctx, "%s = sqrt(vec4(%s))%s;\n", dsts[0], srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_LRP:
-    emit_buff(ctx, "%s = mix(vec4(%s), vec4(%s), vec4(%s))%s;\n", dsts[0],
-              srcs[2], srcs[1], srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_DP2:
-    emit_buff(ctx, "%s = %s(dot(vec2(%s), vec2(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_DP3:
-    emit_buff(ctx, "%s = %s(dot(vec3(%s), vec3(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_DP4:
-    emit_buff(ctx, "%s = %s(dot(vec4(%s), vec4(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_DPH:
-    emit_buff(ctx, "%s = %s(dot(vec4(vec3(%s), 1.0), vec4(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_MAX:
-  case TGSI_OPCODE_DMAX:
-  case TGSI_OPCODE_IMAX:
-  case TGSI_OPCODE_UMAX:
-    emit_buff(ctx, "%s = %s(%s(max(%s, %s))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_MIN:
-  case TGSI_OPCODE_DMIN:
-  case TGSI_OPCODE_IMIN:
-  case TGSI_OPCODE_UMIN:
-    emit_buff(ctx, "%s = %s(%s(min(%s, %s))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_ABS:
-  case TGSI_OPCODE_IABS:
-  case TGSI_OPCODE_DABS:
-    emit_op1("abs");
-    break;
-  case TGSI_OPCODE_KILL_IF:
-    emit_buff(ctx, "if (any(lessThan(%s, vec4(0.0))))\ndiscard;\n", srcs[0]);
-    break;
-  case TGSI_OPCODE_IF:
-  case TGSI_OPCODE_UIF:
-    emit_buff(ctx, "if (any(bvec4(%s))) {\n", srcs[0]);
-    indent_buf(ctx);
-    break;
-  case TGSI_OPCODE_ELSE:
-    outdent_buf(ctx);
-    emit_buf(ctx, "} else {\n");
-    indent_buf(ctx);
-    break;
-  case TGSI_OPCODE_ENDIF:
-    emit_buf(ctx, "}\n");
-    outdent_buf(ctx);
-    break;
-  case TGSI_OPCODE_KILL:
-    emit_buff(ctx, "discard;\n");
-    break;
-  case TGSI_OPCODE_DST:
-    emit_buff(ctx, "%s = vec4(1.0, %s.y * %s.y, %s.z, %s.w);\n", dsts[0],
-              srcs[0], srcs[1], srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_LIT:
-    emit_buff(ctx,
-              "%s = %s(vec4(1.0, max(%s.x, 0.0), step(0.0, %s.x) * "
-              "pow(max(0.0, %s.y), clamp(%s.w, -128.0, 128.0)), 1.0)%s);\n",
-              dsts[0], get_string(dinfo.dstconv), srcs[0], srcs[0], srcs[0],
-              srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_EX2:
-    emit_op1("exp2");
-    break;
-  case TGSI_OPCODE_LG2:
-    emit_op1("log2");
-    break;
-  case TGSI_OPCODE_EXP:
-    emit_buff(ctx,
-              "%s = %s(vec4(pow(2.0, floor(%s.x)), %s.x - floor(%s.x), "
-              "exp2(%s.x), 1.0)%s);\n",
-              dsts[0], get_string(dinfo.dstconv), srcs[0], srcs[0], srcs[0],
-              srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_LOG:
-    emit_buff(ctx,
-              "%s = %s(vec4(floor(log2(%s.x)), %s.x / pow(2.0, "
-              "floor(log2(%s.x))), log2(%s.x), 1.0)%s);\n",
-              dsts[0], get_string(dinfo.dstconv), srcs[0], srcs[0], srcs[0],
-              srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_COS:
-    emit_op1("cos");
-    break;
-  case TGSI_OPCODE_SIN:
-    emit_op1("sin");
-    break;
-  case TGSI_OPCODE_SCS:
-    emit_buff(ctx, "%s = %s(vec4(cos(%s.x), sin(%s.x), 0, 1)%s);\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_DDX:
-    emit_op1("dFdx");
-    break;
-  case TGSI_OPCODE_DDY:
-    emit_op1("dFdy");
-    break;
-  case TGSI_OPCODE_DDX_FINE:
-    ctx->shader_req_bits |= SHADER_REQ_DERIVATIVE_CONTROL;
-    emit_op1("dFdxFine");
-    break;
-  case TGSI_OPCODE_DDY_FINE:
-    ctx->shader_req_bits |= SHADER_REQ_DERIVATIVE_CONTROL;
-    emit_op1("dFdyFine");
-    break;
-  case TGSI_OPCODE_RCP:
-    emit_buff(ctx, "%s = %s(1.0/(%s));\n", dsts[0], get_string(dinfo.dstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_DRCP:
-    emit_buff(ctx, "%s = %s(1.0LF/(%s));\n", dsts[0], get_string(dinfo.dstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_FLR:
-    emit_op1("floor");
-    break;
-  case TGSI_OPCODE_ROUND:
-    emit_op1("round");
-    break;
-  case TGSI_OPCODE_ISSG:
-    emit_op1("sign");
-    break;
-  case TGSI_OPCODE_CEIL:
-    emit_op1("ceil");
-    break;
-  case TGSI_OPCODE_FRC:
-  case TGSI_OPCODE_DFRAC:
-    emit_op1("fract");
-    break;
-  case TGSI_OPCODE_TRUNC:
-    emit_op1("trunc");
-    break;
-  case TGSI_OPCODE_SSG:
-    emit_op1("sign");
-    break;
-  case TGSI_OPCODE_RSQ:
-  case TGSI_OPCODE_DRSQ:
-    emit_buff(ctx, "%s = %s(inversesqrt(%s.x));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0]);
-    break;
-  case TGSI_OPCODE_FBFETCH:
-  case TGSI_OPCODE_MOV:
-    emit_buff(ctx, "%s = %s(%s(%s%s));\n", dsts[0], get_string(dinfo.dstconv),
-              get_string(dinfo.dtypeprefix), srcs[0],
-              sinfo.override_no_wm[0] ? "" : writemask);
-    break;
-  case TGSI_OPCODE_ADD:
-  case TGSI_OPCODE_DADD:
-    emit_arit_op2("+");
-    break;
-  case TGSI_OPCODE_UADD:
-    emit_buff(ctx, "%s = %s(%s(ivec4((uvec4(%s) + uvec4(%s))))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_SUB:
-    emit_arit_op2("-");
-    break;
-  case TGSI_OPCODE_MUL:
-  case TGSI_OPCODE_DMUL:
-    emit_arit_op2("*");
-    break;
-  case TGSI_OPCODE_DIV:
-  case TGSI_OPCODE_DDIV:
-    emit_arit_op2("/");
-    break;
-  case TGSI_OPCODE_UMUL:
-    emit_buff(ctx, "%s = %s(%s((uvec4(%s) * uvec4(%s)))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_UMOD:
-    emit_buff(ctx, "%s = %s(%s((uvec4(%s) %% uvec4(%s)))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_IDIV:
-    emit_buff(ctx, "%s = %s(%s((ivec4(%s) / ivec4(%s)))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_UDIV:
-    emit_buff(ctx, "%s = %s(%s((uvec4(%s) / uvec4(%s)))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], writemask);
-    break;
-  case TGSI_OPCODE_ISHR:
-  case TGSI_OPCODE_USHR:
-    emit_arit_op2(">>");
-    break;
-  case TGSI_OPCODE_SHL:
-    emit_arit_op2("<<");
-    break;
-  case TGSI_OPCODE_MAD:
-    emit_buff(ctx, "%s = %s((%s * %s + %s)%s);\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1], srcs[2], writemask);
-    break;
-  case TGSI_OPCODE_UMAD:
-  case TGSI_OPCODE_DMAD:
-    emit_buff(ctx, "%s = %s(%s((%s * %s + %s)%s));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              srcs[1], srcs[2], writemask);
-    break;
-  case TGSI_OPCODE_OR:
-    emit_arit_op2("|");
-    break;
-  case TGSI_OPCODE_AND:
-    emit_arit_op2("&");
-    break;
-  case TGSI_OPCODE_XOR:
-    emit_arit_op2("^");
-    break;
-  case TGSI_OPCODE_MOD:
-    emit_arit_op2("%");
-    break;
-  case TGSI_OPCODE_TEX:
-  case TGSI_OPCODE_TEX2:
-  case TGSI_OPCODE_TXB:
-  case TGSI_OPCODE_TXL:
-  case TGSI_OPCODE_TXB2:
-  case TGSI_OPCODE_TXL2:
-  case TGSI_OPCODE_TXD:
-  case TGSI_OPCODE_TXF:
-  case TGSI_OPCODE_TG4:
-  case TGSI_OPCODE_TXP:
-  case TGSI_OPCODE_LODQ:
-    translate_tex(ctx, inst, &sinfo, &dinfo, srcs, dsts[0], writemask);
-    break;
-  case TGSI_OPCODE_TXQ:
-    emit_txq(ctx, inst, sinfo.sreg_index, srcs, dsts[0], writemask);
-    break;
-  case TGSI_OPCODE_TXQS:
-    emit_txqs(ctx, inst, sinfo.sreg_index, srcs, dsts[0]);
-    break;
-  case TGSI_OPCODE_I2F:
-    emit_buff(ctx, "%s = %s(ivec4(%s)%s);\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_I2D:
-    emit_buff(ctx, "%s = %s(ivec4(%s));\n", dsts[0], get_string(dinfo.dstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_D2F:
-    emit_buff(ctx, "%s = %s(%s);\n", dsts[0], get_string(dinfo.dstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_U2F:
-    emit_buff(ctx, "%s = %s(uvec4(%s)%s);\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_U2D:
-    emit_buff(ctx, "%s = %s(uvec4(%s));\n", dsts[0], get_string(dinfo.dstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_F2I:
-    emit_buff(ctx, "%s = %s(%s(ivec4(%s))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              writemask);
-    break;
-  case TGSI_OPCODE_D2I:
-    emit_buff(ctx, "%s = %s(%s(%s(%s)));\n", dsts[0], get_string(dinfo.dstconv),
-              get_string(dinfo.dtypeprefix), get_string(dinfo.idstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_F2U:
-    emit_buff(ctx, "%s = %s(%s(uvec4(%s))%s);\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              writemask);
-    break;
-  case TGSI_OPCODE_D2U:
-    emit_buff(ctx, "%s = %s(%s(%s(%s)));\n", dsts[0], get_string(dinfo.dstconv),
-              get_string(dinfo.dtypeprefix), get_string(dinfo.udstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_F2D:
-    emit_buff(ctx, "%s = %s(%s(%s));\n", dsts[0], get_string(dinfo.dstconv),
-              get_string(dinfo.dtypeprefix), srcs[0]);
-    break;
-  case TGSI_OPCODE_NOT:
-    emit_buff(ctx, "%s = %s(uintBitsToFloat(~(uvec4(%s))));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0]);
-    break;
-  case TGSI_OPCODE_INEG:
-    emit_buff(ctx, "%s = %s(intBitsToFloat(-(ivec4(%s))));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0]);
-    break;
-  case TGSI_OPCODE_DNEG:
-    emit_buff(ctx, "%s = %s(-%s);\n", dsts[0], get_string(dinfo.dstconv),
-              srcs[0]);
-    break;
-  case TGSI_OPCODE_SEQ:
-    emit_compare("equal");
-    break;
-  case TGSI_OPCODE_USEQ:
-  case TGSI_OPCODE_FSEQ:
-  case TGSI_OPCODE_DSEQ:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_DSEQ)
-      strcpy(writemask, ".x");
-    emit_ucompare("equal");
-    break;
-  case TGSI_OPCODE_SLT:
-    emit_compare("lessThan");
-    break;
-  case TGSI_OPCODE_ISLT:
-  case TGSI_OPCODE_USLT:
-  case TGSI_OPCODE_FSLT:
-  case TGSI_OPCODE_DSLT:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_DSLT)
-      strcpy(writemask, ".x");
-    emit_ucompare("lessThan");
-    break;
-  case TGSI_OPCODE_SNE:
-    emit_compare("notEqual");
-    break;
-  case TGSI_OPCODE_USNE:
-  case TGSI_OPCODE_FSNE:
-  case TGSI_OPCODE_DSNE:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_DSNE)
-      strcpy(writemask, ".x");
-    emit_ucompare("notEqual");
-    break;
-  case TGSI_OPCODE_SGE:
-    emit_compare("greaterThanEqual");
-    break;
-  case TGSI_OPCODE_ISGE:
-  case TGSI_OPCODE_USGE:
-  case TGSI_OPCODE_FSGE:
-  case TGSI_OPCODE_DSGE:
-    if (inst->Instruction.Opcode == TGSI_OPCODE_DSGE)
-      strcpy(writemask, ".x");
-    emit_ucompare("greaterThanEqual");
-    break;
-  case TGSI_OPCODE_POW:
-    emit_buff(ctx, "%s = %s(pow(%s, %s));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_CMP:
-    emit_buff(ctx, "%s = mix(%s, %s, greaterThanEqual(%s, vec4(0.0)))%s;\n",
-              dsts[0], srcs[1], srcs[2], srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_UCMP:
-    emit_buff(
-        ctx, "%s = mix(%s, %s, notEqual(floatBitsToUint(%s), uvec4(0.0)))%s;\n",
-        dsts[0], srcs[2], srcs[1], srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_END:
-    if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX) {
-      handle_vertex_proc_exit(ctx);
-    } else if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL) {
-      emit_clip_dist_movs(ctx);
-    } else if (iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL) {
-      if (ctx->so && !ctx->key->gs_present)
-        emit_so_movs(ctx);
-      emit_clip_dist_movs(ctx);
-      if (!ctx->key->gs_present) {
-        emit_prescale(ctx);
-      }
-    } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-      handle_fragment_proc_exit(ctx);
-    }
-    emit_buf(ctx, "}\n");
-    break;
-  case TGSI_OPCODE_RET:
-    if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX) {
-      handle_vertex_proc_exit(ctx);
-    } else if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
-      handle_fragment_proc_exit(ctx);
-    }
-    emit_buf(ctx, "return;\n");
-    break;
-  case TGSI_OPCODE_ARL:
-    emit_buff(ctx, "%s = int(floor(%s)%s);\n", dsts[0], srcs[0], writemask);
-    break;
-  case TGSI_OPCODE_UARL:
-    emit_buff(ctx, "%s = int(%s);\n", dsts[0], srcs[0]);
-    break;
-  case TGSI_OPCODE_XPD:
-    emit_buff(ctx, "%s = %s(cross(vec3(%s), vec3(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), srcs[0], srcs[1]);
-    break;
-  case TGSI_OPCODE_BGNLOOP:
-    emit_buf(ctx, "do {\n");
-    indent_buf(ctx);
-    break;
-  case TGSI_OPCODE_ENDLOOP:
-    outdent_buf(ctx);
-    emit_buf(ctx, "} while(true);\n");
-    break;
-  case TGSI_OPCODE_BRK:
-    emit_buf(ctx, "break;\n");
-    break;
-  case TGSI_OPCODE_EMIT: {
-    struct immed *imd = &ctx->imm[(inst->Src[0].Register.Index)];
-    if (ctx->so && ctx->key->gs_present)
-      emit_so_movs(ctx);
-    emit_clip_dist_movs(ctx);
-    emit_prescale(ctx);
-    if (imd->val[inst->Src[0].Register.SwizzleX].ui > 0) {
-      ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-      emit_buff(ctx, "EmitStreamVertex(%d);\n",
-                imd->val[inst->Src[0].Register.SwizzleX].ui);
-    } else
-      emit_buf(ctx, "EmitVertex();\n");
-    break;
-  }
-  case TGSI_OPCODE_ENDPRIM: {
-    struct immed *imd = &ctx->imm[(inst->Src[0].Register.Index)];
-    if (imd->val[inst->Src[0].Register.SwizzleX].ui > 0) {
-      ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-      emit_buff(ctx, "EndStreamPrimitive(%d);\n",
-                imd->val[inst->Src[0].Register.SwizzleX].ui);
-    } else
-      emit_buf(ctx, "EndPrimitive();\n");
-    break;
-  }
-  case TGSI_OPCODE_INTERP_CENTROID:
-    emit_buff(ctx, "%s = %s(%s(vec4(interpolateAtCentroid(%s)%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix), srcs[0],
-              src_swizzle0);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_INTERP_SAMPLE:
-    emit_buff(ctx, "%s = %s(%s(vec4(interpolateAtSample(%s, %s.x)%s)));\n",
-              dsts[0], get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0], srcs[1], src_swizzle0);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_INTERP_OFFSET:
-    emit_buff(ctx, "%s = %s(%s(vec4(interpolateAtOffset(%s, %s.xy)%s)));\n",
-              dsts[0], get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0], srcs[1], src_swizzle0);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_UMUL_HI:
-    emit_buff(ctx, "umulExtended(%s, %s, umul_temp, mul_utemp);\n", srcs[0],
-              srcs[1]);
-    emit_buff(ctx, "%s = %s(%s(umul_temp%s));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              writemask);
-    ctx->write_mul_utemp = true;
-    break;
-  case TGSI_OPCODE_IMUL_HI:
-    emit_buff(ctx, "imulExtended(%s, %s, imul_temp, mul_itemp);\n", srcs[0],
-              srcs[1]);
-    emit_buff(ctx, "%s = %s(%s(imul_temp%s));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              writemask);
-    ctx->write_mul_itemp = true;
-    break;
-
-  case TGSI_OPCODE_IBFE:
-    emit_buff(ctx, "%s = %s(%s(bitfieldExtract(%s, int(%s.x), int(%s.x))));\n",
-              dsts[0], get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0], srcs[1], srcs[2]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_UBFE:
-    emit_buff(ctx, "%s = %s(%s(bitfieldExtract(%s, int(%s.x), int(%s.x))));\n",
-              dsts[0], get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0], srcs[1], srcs[2]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_BFI:
-    emit_buff(
-        ctx,
-        "%s = %s(uintBitsToFloat(bitfieldInsert(%s, %s, int(%s), int(%s))));\n",
-        dsts[0], get_string(dinfo.dstconv), srcs[0], srcs[1], srcs[2], srcs[3]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_BREV:
-    emit_buff(ctx, "%s = %s(%s(bitfieldReverse(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_POPC:
-    emit_buff(ctx, "%s = %s(%s(bitCount(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_LSB:
-    emit_buff(ctx, "%s = %s(%s(findLSB(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_IMSB:
-  case TGSI_OPCODE_UMSB:
-    emit_buff(ctx, "%s = %s(%s(findMSB(%s)));\n", dsts[0],
-              get_string(dinfo.dstconv), get_string(dinfo.dtypeprefix),
-              srcs[0]);
-    ctx->shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-    break;
-  case TGSI_OPCODE_BARRIER:
-    emit_buf(ctx, "barrier();\n");
-    break;
-  case TGSI_OPCODE_MEMBAR: {
-    struct immed *imd = &ctx->imm[(inst->Src[0].Register.Index)];
-    uint32_t val = imd->val[inst->Src[0].Register.SwizzleX].ui;
-    uint32_t all_val = (TGSI_MEMBAR_SHADER_BUFFER | TGSI_MEMBAR_ATOMIC_BUFFER |
-                        TGSI_MEMBAR_SHADER_IMAGE | TGSI_MEMBAR_SHARED);
-
-    if (val & TGSI_MEMBAR_THREAD_GROUP) {
-      emit_buf(ctx, "groupMemoryBarrier();\n");
-    } else {
-      if ((val & all_val) == all_val) {
-        emit_buf(ctx, "memoryBarrier();\n");
-        ctx->shader_req_bits |= SHADER_REQ_IMAGE_LOAD_STORE;
-      } else {
-        if (val & TGSI_MEMBAR_SHADER_BUFFER) {
-          emit_buf(ctx, "memoryBarrierBuffer();\n");
-        }
-        if (val & TGSI_MEMBAR_ATOMIC_BUFFER) {
-          emit_buf(ctx, "memoryBarrierAtomic();\n");
-        }
-        if (val & TGSI_MEMBAR_SHADER_IMAGE) {
-          emit_buf(ctx, "memoryBarrierImage();\n");
-        }
-        if (val & TGSI_MEMBAR_SHARED) {
-          emit_buf(ctx, "memoryBarrierShared();\n");
-        }
-      }
-    }
-    break;
-  }
-  case TGSI_OPCODE_STORE:
-    if (!rewrite_1d_image_coordinate(ctx->src_bufs + 1, inst))
-      return false;
-    srcs[1] = ctx->src_bufs[1].buf;
-    translate_store(ctx, inst, &sinfo, srcs, dsts[0]);
-    break;
-  case TGSI_OPCODE_LOAD:
-    if (!rewrite_1d_image_coordinate(ctx->src_bufs + 1, inst))
-      return false;
-    srcs[1] = ctx->src_bufs[1].buf;
-    translate_load(ctx, inst, &sinfo, &dinfo, srcs, dsts[0], writemask);
-    break;
-  case TGSI_OPCODE_ATOMUADD:
-  case TGSI_OPCODE_ATOMXCHG:
-  case TGSI_OPCODE_ATOMCAS:
-  case TGSI_OPCODE_ATOMAND:
-  case TGSI_OPCODE_ATOMOR:
-  case TGSI_OPCODE_ATOMXOR:
-  case TGSI_OPCODE_ATOMUMIN:
-  case TGSI_OPCODE_ATOMUMAX:
-  case TGSI_OPCODE_ATOMIMIN:
-  case TGSI_OPCODE_ATOMIMAX:
-    if (!rewrite_1d_image_coordinate(ctx->src_bufs + 1, inst))
-      return false;
-    srcs[1] = ctx->src_bufs[1].buf;
-    translate_atomic(ctx, inst, &sinfo, srcs, dsts[0]);
-    break;
-  case TGSI_OPCODE_RESQ:
-    translate_resq(ctx, inst, srcs, dsts[0], writemask);
-    break;
-  case TGSI_OPCODE_CLOCK:
-    ctx->shader_req_bits |= SHADER_REQ_SHADER_CLOCK;
-    emit_buff(ctx, "%s = uintBitsToFloat(clock2x32ARB());\n", dsts[0]);
-    break;
-  }
-
-  for (uint32_t i = 0; i < 1; i++) {
-    enum tgsi_opcode_type dtype =
-        tgsi_opcode_infer_dst_type(inst->Instruction.Opcode);
-    if (dtype == TGSI_TYPE_DOUBLE) {
-      emit_buff(ctx, "%s = uintBitsToFloat(unpackDouble2x32(%s));\n",
-                fp64_dsts[0], dsts[0]);
-    }
-  }
-  if (inst->Instruction.Saturate) {
-    emit_buff(ctx, "%s = clamp(%s, 0.0, 1.0);\n", dsts[0], dsts[0]);
-  }
-
-  if (strbuf_get_error(&ctx->glsl_main))
-    return false;
-  return true;
-}
-
-static boolean prolog(struct tgsi_iterate_context *iter) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-
-  if (ctx->prog_type == -1)
-    ctx->prog_type = iter->processor.Processor;
-
-  if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX &&
-      ctx->key->gs_present)
-    require_glsl_ver(ctx, 150);
-
-  return true;
-}
-
-static void emit_ext(struct dump_ctx *ctx, const char *name, const char *verb) {
-  emit_ver_extf(ctx, "#extension GL_%s : %s\n", name, verb);
-}
-
-static void emit_header(struct dump_ctx *ctx) {
-  emit_ver_extf(ctx, "#version %d es\n", ctx->cfg->glsl_version);
-
-  if ((ctx->shader_req_bits & SHADER_REQ_CLIP_DISTANCE) ||
-      (ctx->num_clip_dist == 0 && ctx->key->clip_plane_enable)) {
-    emit_ext(ctx, "EXT_clip_cull_distance", "require");
-  }
-
-  if (ctx->shader_req_bits & SHADER_REQ_SAMPLER_MS)
-    emit_ext(ctx, "OES_texture_storage_multisample_2d_array", "require");
-
-  if (ctx->shader_req_bits & SHADER_REQ_CONSERVATIVE_DEPTH)
-    emit_ext(ctx, "EXT_conservative_depth", "require");
-
-  if (ctx->prog_type == TGSI_PROCESSOR_FRAGMENT) {
-    if (ctx->shader_req_bits & SHADER_REQ_FBFETCH)
-      emit_ext(ctx, "EXT_shader_framebuffer_fetch", "require");
-  }
-
-  if (ctx->shader_req_bits & SHADER_REQ_VIEWPORT_IDX)
-    emit_ext(ctx, "OES_viewport_array", "require");
-
-  if (ctx->prog_type == TGSI_PROCESSOR_GEOMETRY) {
-    emit_ext(ctx, "EXT_geometry_shader", "require");
-    if (ctx->shader_req_bits & SHADER_REQ_PSIZE)
-      emit_ext(ctx, "OES_geometry_point_size", "enable");
-  }
-
-  if (ctx->shader_req_bits & SHADER_REQ_NV_IMAGE_FORMATS)
-    emit_ext(ctx, "NV_image_formats", "require");
-
-  if ((ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL ||
-       ctx->prog_type == TGSI_PROCESSOR_TESS_EVAL)) {
-    if (ctx->cfg->glsl_version < 320)
-      emit_ext(ctx, "OES_tessellation_shader", "require");
-    emit_ext(ctx, "OES_tessellation_point_size", "enable");
-  }
-
-  if (ctx->cfg->glsl_version < 320) {
-    if (ctx->shader_req_bits & SHADER_REQ_SAMPLE_SHADING)
-      emit_ext(ctx, "OES_sample_variables", "require");
-    if (ctx->shader_req_bits & SHADER_REQ_GPU_SHADER5) {
-      emit_ext(ctx, "OES_gpu_shader5", "require");
-      emit_ext(ctx, "OES_shader_multisample_interpolation", "require");
-    }
-    if (ctx->shader_req_bits & SHADER_REQ_CUBE_ARRAY)
-      emit_ext(ctx, "OES_texture_cube_map_array", "require");
-    if (ctx->shader_req_bits & SHADER_REQ_LAYER)
-      emit_ext(ctx, "EXT_geometry_shader", "require");
-    if (ctx->shader_req_bits & SHADER_REQ_IMAGE_ATOMIC)
-      emit_ext(ctx, "OES_shader_image_atomic", "require");
-  }
-
-  if (logiop_require_inout(ctx->key)) {
-    if (ctx->key->fs_logicop_emulate_coherent)
-      emit_ext(ctx, "EXT_shader_framebuffer_fetch", "require");
-    else
-      emit_ext(ctx, "EXT_shader_framebuffer_fetch_non_coherent", "require");
-  }
-
-  if (ctx->shader_req_bits & SHADER_REQ_LODQ)
-    emit_ext(ctx, "EXT_texture_query_lod", "require");
-
-  emit_hdr(ctx, "precision highp float;\n");
-  emit_hdr(ctx, "precision highp int;\n");
-}
-
-char vrend_shader_samplerreturnconv(enum tgsi_return_type type) {
-  switch (type) {
-  case TGSI_RETURN_TYPE_SINT:
-    return 'i';
-  case TGSI_RETURN_TYPE_UINT:
-    return 'u';
-  default:
-    return ' ';
-  }
-}
-
-const char *vrend_shader_samplertypeconv(int sampler_type) {
-  switch (sampler_type) {
-  case TGSI_TEXTURE_BUFFER:
-    return "Buffer";
-  case TGSI_TEXTURE_1D:
-    /* fallthrough */
-  case TGSI_TEXTURE_2D:
-    return "2D";
-  case TGSI_TEXTURE_3D:
-    return "3D";
-  case TGSI_TEXTURE_CUBE:
-    return "Cube";
-  case TGSI_TEXTURE_RECT:
-    return "2D";
-  case TGSI_TEXTURE_SHADOW1D:
-    /* fallthrough */
-  case TGSI_TEXTURE_SHADOW2D:
-    return "2DShadow";
-  case TGSI_TEXTURE_SHADOWRECT:
-    return "2DShadow";
-  case TGSI_TEXTURE_1D_ARRAY:
-    /* fallthrough */
-  case TGSI_TEXTURE_2D_ARRAY:
-    return "2DArray";
-  case TGSI_TEXTURE_SHADOW1D_ARRAY:
-    /* fallthrough */
-  case TGSI_TEXTURE_SHADOW2D_ARRAY:
-    return "2DArrayShadow";
-  case TGSI_TEXTURE_SHADOWCUBE:
-    return "CubeShadow";
-  case TGSI_TEXTURE_CUBE_ARRAY:
-    return "CubeArray";
-  case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-    return "CubeArrayShadow";
-  case TGSI_TEXTURE_2D_MSAA:
-    return "2DMS";
-  case TGSI_TEXTURE_2D_ARRAY_MSAA:
-    return "2DMSArray";
-  default:
-    return NULL;
-  }
-}
-
-static const char *get_interp_string(struct vrend_shader_cfg *cfg,
-                                     int interpolate, bool flatshade) {
-  switch (interpolate) {
-  case TGSI_INTERPOLATE_LINEAR:
-    return "";
-  case TGSI_INTERPOLATE_PERSPECTIVE:
-    return "smooth ";
-  case TGSI_INTERPOLATE_CONSTANT:
-    return "flat ";
-  case TGSI_INTERPOLATE_COLOR:
-    if (flatshade)
-      return "flat ";
-    /* fallthrough */
-  default:
-    return NULL;
-  }
-}
-
-static const char *get_aux_string(unsigned location) {
-  switch (location) {
-  case TGSI_INTERPOLATE_LOC_CENTER:
-  default:
-    return "";
-  case TGSI_INTERPOLATE_LOC_CENTROID:
-    return "centroid ";
-  case TGSI_INTERPOLATE_LOC_SAMPLE:
-    return "sample ";
-  }
-}
-
-static void emit_sampler_decl(struct dump_ctx *ctx, uint32_t i, uint32_t range,
-                              const struct vrend_shader_sampler *sampler) {
-  char ptc;
-  bool is_shad;
-  const char *sname, *precision, *stc;
-
-  sname = tgsi_proc_to_prefix(ctx->prog_type);
-
-  precision = "highp";
-
-  ptc = vrend_shader_samplerreturnconv(sampler->tgsi_sampler_return);
-  stc = vrend_shader_samplertypeconv(sampler->tgsi_sampler_type);
-  is_shad = samplertype_is_shadow(sampler->tgsi_sampler_type);
-
-  if (range)
-    emit_hdrf(ctx, "uniform %s %csampler%s %ssamp%d[%d];\n", precision, ptc,
-              stc, sname, i, range);
-  else
-    emit_hdrf(ctx, "uniform %s %csampler%s %ssamp%d;\n", precision, ptc, stc,
-              sname, i);
-
-  if (is_shad) {
-    emit_hdrf(ctx, "uniform %s vec4 %sshadmask%d;\n", precision, sname, i);
-    emit_hdrf(ctx, "uniform %s vec4 %sshadadd%d;\n", precision, sname, i);
-    ctx->shadow_samp_mask |= (1 << i);
-  }
-}
-
-const char *get_internalformat_string(int virgl_format,
-                                      enum tgsi_return_type *stype) {
-  switch (virgl_format) {
-  case PIPE_FORMAT_R11G11B10_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "r11f_g11f_b10f";
-  case PIPE_FORMAT_R10G10B10A2_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "rgb10_a2";
-  case PIPE_FORMAT_R10G10B10A2_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rgb10_a2ui";
-  case PIPE_FORMAT_R8_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "r8";
-  case PIPE_FORMAT_R8_SNORM:
-    *stype = TGSI_RETURN_TYPE_SNORM;
-    return "r8_snorm";
-  case PIPE_FORMAT_R8_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "r8ui";
-  case PIPE_FORMAT_R8_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "r8i";
-  case PIPE_FORMAT_R8G8_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "rg8";
-  case PIPE_FORMAT_R8G8_SNORM:
-    *stype = TGSI_RETURN_TYPE_SNORM;
-    return "rg8_snorm";
-  case PIPE_FORMAT_R8G8_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rg8ui";
-  case PIPE_FORMAT_R8G8_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "rg8i";
-  case PIPE_FORMAT_R8G8B8A8_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "rgba8";
-  case PIPE_FORMAT_R8G8B8A8_SNORM:
-    *stype = TGSI_RETURN_TYPE_SNORM;
-    return "rgba8_snorm";
-  case PIPE_FORMAT_R8G8B8A8_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rgba8ui";
-  case PIPE_FORMAT_R8G8B8A8_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "rgba8i";
-  case PIPE_FORMAT_R16_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "r16";
-  case PIPE_FORMAT_R16_SNORM:
-    *stype = TGSI_RETURN_TYPE_SNORM;
-    return "r16_snorm";
-  case PIPE_FORMAT_R16_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "r16ui";
-  case PIPE_FORMAT_R16_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "r16i";
-  case PIPE_FORMAT_R16_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "r16f";
-  case PIPE_FORMAT_R16G16_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "rg16";
-  case PIPE_FORMAT_R16G16_SNORM:
-    *stype = TGSI_RETURN_TYPE_SNORM;
-    return "rg16_snorm";
-  case PIPE_FORMAT_R16G16_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rg16ui";
-  case PIPE_FORMAT_R16G16_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "rg16i";
-  case PIPE_FORMAT_R16G16_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "rg16f";
-  case PIPE_FORMAT_R16G16B16A16_UNORM:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "rgba16";
-  case PIPE_FORMAT_R16G16B16A16_SNORM:
-    *stype = TGSI_RETURN_TYPE_SNORM;
-    return "rgba16_snorm";
-  case PIPE_FORMAT_R16G16B16A16_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "rgba16f";
-  case PIPE_FORMAT_R32_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "r32f";
-  case PIPE_FORMAT_R32_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "r32ui";
-  case PIPE_FORMAT_R32_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "r32i";
-  case PIPE_FORMAT_R32G32_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "rg32f";
-  case PIPE_FORMAT_R32G32_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rg32ui";
-  case PIPE_FORMAT_R32G32_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "rg32i";
-  case PIPE_FORMAT_R32G32B32A32_FLOAT:
-    *stype = TGSI_RETURN_TYPE_FLOAT;
-    return "rgba32f";
-  case PIPE_FORMAT_R32G32B32A32_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rgba32ui";
-  case PIPE_FORMAT_R16G16B16A16_UINT:
-    *stype = TGSI_RETURN_TYPE_UINT;
-    return "rgba16ui";
-  case PIPE_FORMAT_R16G16B16A16_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "rgba16i";
-  case PIPE_FORMAT_R32G32B32A32_SINT:
-    *stype = TGSI_RETURN_TYPE_SINT;
-    return "rgba32i";
-  case PIPE_FORMAT_NONE:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "";
-  default:
-    *stype = TGSI_RETURN_TYPE_UNORM;
-    return "";
-  }
-}
-
-static void emit_image_decl(struct dump_ctx *ctx, uint32_t i, uint32_t range,
-                            const struct vrend_shader_image *image) {
-  char ptc;
-  const char *sname, *stc, *formatstr;
-  enum tgsi_return_type itype;
-  const char *volatile_str = image->vflag ? "volatile " : "";
-  const char *precision = "highp ";
-  const char *access = "";
-  formatstr = get_internalformat_string(image->decl.Format, &itype);
-  ptc = vrend_shader_samplerreturnconv(itype);
-  sname = tgsi_proc_to_prefix(ctx->prog_type);
-  stc = vrend_shader_samplertypeconv(image->decl.Resource);
-
-  if (!image->decl.Writable)
-    access = "readonly ";
-  else if (!image->decl.Format ||
-           ((image->decl.Format != PIPE_FORMAT_R32_FLOAT) &&
-            (image->decl.Format != PIPE_FORMAT_R32_SINT) &&
-            (image->decl.Format != PIPE_FORMAT_R32_UINT)))
-    access = "writeonly ";
-
-  emit_hdrf(ctx, "layout(binding=%d%s%s) ", i,
-            formatstr[0] != '\0' ? ", " : ", rgba32f", formatstr);
-
-  if (range)
-    emit_hdrf(ctx, "%s%suniform %s%cimage%s %simg%d[%d];\n", access,
-              volatile_str, precision, ptc, stc, sname, i, range);
-  else
-    emit_hdrf(ctx, "%s%suniform %s%cimage%s %simg%d;\n", access, volatile_str,
-              precision, ptc, stc, sname, i);
-}
-
-static void emit_ios_common(struct dump_ctx *ctx) {
-  uint i;
-  const char *sname = tgsi_proc_to_prefix(ctx->prog_type);
-
-  for (i = 0; i < ctx->num_temp_ranges; i++) {
-    emit_hdrf(ctx, "vec4 temp%d[%d];\n", ctx->temp_ranges[i].first,
-              ctx->temp_ranges[i].last - ctx->temp_ranges[i].first + 1);
-  }
-
-  if (ctx->write_mul_utemp) {
-    emit_hdr(ctx, "uvec4 mul_utemp;\n");
-    emit_hdr(ctx, "uvec4 umul_temp;\n");
-  }
-
-  if (ctx->write_mul_itemp) {
-    emit_hdr(ctx, "ivec4 mul_itemp;\n");
-    emit_hdr(ctx, "ivec4 imul_temp;\n");
-  }
-
-  if (ctx->ssbo_used_mask || ctx->has_file_memory) {
-    emit_hdr(ctx, "uint ssbo_addr_temp;\n");
-  }
-
-  if (ctx->shader_req_bits & SHADER_REQ_FP64) {
-    emit_hdr(ctx, "dvec2 fp64_dst[3];\n");
-    emit_hdr(ctx, "dvec2 fp64_src[4];\n");
-  }
-
-  for (i = 0; i < ctx->num_address; i++) {
-    emit_hdrf(ctx, "int addr%d;\n", i);
-  }
-  if (ctx->num_consts) {
-    const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-    emit_hdrf(ctx, "uniform uvec4 %sconst0[%d];\n", cname, ctx->num_consts);
-  }
-
-  if (ctx->ubo_used_mask) {
-    const char *cname = tgsi_proc_to_prefix(ctx->prog_type);
-
-    if (ctx->info.dimension_indirect_files & (1 << TGSI_FILE_CONSTANT)) {
-      require_glsl_ver(ctx, 150);
-      int first = ffs(ctx->ubo_used_mask) - 1;
-      unsigned num_ubo = util_bitcount(ctx->ubo_used_mask);
-      emit_hdrf(ctx, "uniform %subo { vec4 ubocontents[%d]; } %suboarr[%d];\n",
-                cname, ctx->ubo_sizes[first], cname, num_ubo);
-    } else {
-      unsigned mask = ctx->ubo_used_mask;
-      while (mask) {
-        uint32_t j = u_bit_scan(&mask);
-        emit_hdrf(ctx, "uniform %subo%d { vec4 %subo%dcontents[%d]; };\n",
-                  cname, j, cname, j, ctx->ubo_sizes[i]);
-      }
-    }
-  }
-
-  if (ctx->info.indirect_files & (1 << TGSI_FILE_SAMPLER)) {
-    for (i = 0; i < ctx->num_sampler_arrays; i++) {
-      uint32_t first = ctx->sampler_arrays[i].first;
-      uint32_t range = ctx->sampler_arrays[i].array_size;
-      emit_sampler_decl(ctx, first, range, ctx->samplers + first);
-    }
-  } else {
-    uint nsamp = util_last_bit(ctx->samplers_used);
-    for (i = 0; i < nsamp; i++) {
-
-      if ((ctx->samplers_used & (1 << i)) == 0)
-        continue;
-
-      emit_sampler_decl(ctx, i, 0, ctx->samplers + i);
-    }
-  }
-
-  if (ctx->info.indirect_files & (1 << TGSI_FILE_IMAGE)) {
-    for (i = 0; i < ctx->num_image_arrays; i++) {
-      uint32_t first = ctx->image_arrays[i].first;
-      uint32_t range = ctx->image_arrays[i].array_size;
-      emit_image_decl(ctx, first, range, ctx->images + first);
-    }
-  } else {
-    uint32_t mask = ctx->images_used_mask;
-    while (mask) {
-      i = u_bit_scan(&mask);
-      emit_image_decl(ctx, i, 0, ctx->images + i);
-    }
-  }
-
-  for (i = 0; i < ctx->num_abo; i++) {
-    if (ctx->abo_sizes[i] > 1)
-      emit_hdrf(
-          ctx,
-          "layout (binding = %d, offset = %d) uniform atomic_uint ac%d[%d];\n",
-          ctx->abo_idx[i], ctx->abo_offsets[i] * 4, i, ctx->abo_sizes[i]);
-    else
-      emit_hdrf(
-          ctx, "layout (binding = %d, offset = %d) uniform atomic_uint ac%d;\n",
-          ctx->abo_idx[i], ctx->abo_offsets[i] * 4, i);
-  }
-
-  if (ctx->info.indirect_files & (1 << TGSI_FILE_BUFFER)) {
-    uint32_t mask = ctx->ssbo_used_mask;
-    while (mask) {
-      int start, count;
-      u_bit_scan_consecutive_range(&mask, &start, &count);
-      const char *atomic =
-          (ctx->ssbo_atomic_mask & (1 << start)) ? "atomic" : "";
-      emit_hdrf(ctx,
-                "layout (binding = %d, std430) buffer %sssbo%d { uint "
-                "%sssbocontents%d[]; } %sssboarr%s[%d];\n",
-                start, sname, start, sname, start, sname, atomic, count);
-    }
-  } else {
-    uint32_t mask = ctx->ssbo_used_mask;
-    while (mask) {
-      uint32_t id = u_bit_scan(&mask);
-      enum vrend_type_qualifier type =
-          (ctx->ssbo_integer_mask & (1 << id)) ? INT : UINT;
-      char *coherent = ctx->ssbo_memory_qualifier[id] == TGSI_MEMORY_COHERENT
-                           ? "coherent"
-                           : "";
-      emit_hdrf(ctx,
-                "layout (binding = %d, std430) %s buffer %sssbo%d { %s "
-                "%sssbocontents%d[]; };\n",
-                id, coherent, sname, id, get_string(type), sname, id);
-    }
-  }
-}
-
-static void emit_ios_streamout(struct dump_ctx *ctx) {
-  if (ctx->so) {
-    char outtype[6] = "";
-    for (uint i = 0; i < ctx->so->num_outputs; i++) {
-      if (!ctx->write_so_outputs[i])
-        continue;
-      if (ctx->so->output[i].num_components == 1)
-        snprintf(outtype, 6, "float");
-      else
-        snprintf(outtype, 6, "vec%d", ctx->so->output[i].num_components);
-
-      if (ctx->so->output[i].stream &&
-          ctx->prog_type == TGSI_PROCESSOR_GEOMETRY)
-        emit_hdrf(ctx, "layout (stream=%d) out %s tfout%d;\n",
-                  ctx->so->output[i].stream, outtype, i);
-      else {
-        const struct vrend_shader_io *output =
-            get_io_slot(&ctx->outputs[0], ctx->num_outputs,
-                        ctx->so->output[i].register_index);
-        if (ctx->so->output[i].need_temp ||
-            output->name == TGSI_SEMANTIC_CLIPDIST ||
-            output->glsl_predefined_no_emit) {
-
-          if (ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL)
-            emit_hdrf(ctx, "out %s tfout%d[];\n", outtype, i);
-          else
-            emit_hdrf(ctx, "out %s tfout%d;\n", outtype, i);
-        }
-      }
-    }
-  }
-}
-
-static inline void emit_winsys_correction(struct dump_ctx *ctx) {
-  emit_hdr(ctx, "uniform float winsys_adjust_y;\n");
-}
-
-static void emit_ios_indirect_generics_output(struct dump_ctx *ctx,
-                                              const char *postfix) {
-  if (ctx->generic_output_range.used) {
-    int size = ctx->generic_output_range.io.last -
-               ctx->generic_output_range.io.sid + 1;
-    if (prefer_generic_io_block(ctx, io_out)) {
-      char blockname[64];
-      const char *stage_prefix = get_stage_output_name_prefix(ctx->prog_type);
-      get_blockname(blockname, stage_prefix, &ctx->generic_output_range.io);
-
-      char blockvarame[64];
-      get_blockvarname(blockvarame, stage_prefix, &ctx->generic_output_range.io,
-                       postfix);
-
-      emit_hdrf(ctx, "out %s {\n  vec4 %s[%d]; \n} %s;\n", blockname,
-                ctx->generic_output_range.io.glsl_name, size, blockvarame);
-    } else
-      emit_hdrf(ctx, "out vec4 %s%s[%d];\n",
-                ctx->generic_output_range.io.glsl_name, postfix, size);
-  }
-}
-
-static void emit_ios_indirect_generics_input(struct dump_ctx *ctx,
-                                             const char *postfix) {
-  if (ctx->generic_input_range.used) {
-    int size =
-        ctx->generic_input_range.io.last - ctx->generic_input_range.io.sid + 1;
-    assert(size < 256 && size >= 0);
-
-    if (prefer_generic_io_block(ctx, io_in)) {
-      char blockname[64];
-      char blockvarame[64];
-      const char *stage_prefix =
-          get_stage_input_name_prefix(ctx, ctx->prog_type);
-
-      get_blockname(blockname, stage_prefix, &ctx->generic_input_range.io);
-      get_blockvarname(blockvarame, stage_prefix, &ctx->generic_input_range.io,
-                       postfix);
-
-      emit_hdrf(ctx, "in %s {\n        vec4 %s[%d]; \n} %s;\n", blockname,
-                ctx->generic_input_range.io.glsl_name, size, blockvarame);
-    } else
-      emit_hdrf(ctx, "in vec4 %s%s[%d];\n",
-                ctx->generic_input_range.io.glsl_name, postfix, size);
-  }
-}
-
-static void emit_ios_generic(struct dump_ctx *ctx, enum io_type iot,
-                             const char *prefix,
-                             const struct vrend_shader_io *io,
-                             const char *inout, const char *postfix) {
-  const char type[4][6] = {"float", " vec2", " vec3", " vec4"};
-  const char *t = " vec4";
-
-  char layout[128] = "";
-
-  if (io->layout_location > 0) {
-    /* we need to define a layout here because interleaved arrays might be
-     * emited */
-    if (io->swizzle_offset)
-      snprintf(layout, sizeof(layout),
-               "layout(location = %d, component = %d)\n",
-               io->layout_location - 1, io->swizzle_offset);
-    else
-      snprintf(layout, sizeof(layout), "layout(location = %d)\n",
-               io->layout_location - 1);
-  }
-
-  if (io->usage_mask != 0xf && io->name == TGSI_SEMANTIC_GENERIC)
-    t = type[io->num_components - 1];
-
-  if (io->first == io->last) {
-    emit_hdr(ctx, layout);
-    /* ugly leave spaces to patch interp in later */
-    emit_hdrf(ctx, "%s%s\n%s  %s %s %s%s;\n", io->precise ? "precise" : "",
-              io->invariant ? "invariant" : "", prefix, inout, t, io->glsl_name,
-              postfix);
-
-    if (io->name == TGSI_SEMANTIC_GENERIC) {
-      if (iot == io_in)
-        ctx->generic_inputs_emitted_mask |= 1 << io->sid;
-      else
-        ctx->generic_outputs_emitted_mask |= 1 << io->sid;
-    }
-
-  } else {
-    if (prefer_generic_io_block(ctx, iot)) {
-      const char *stage_prefix =
-          iot == io_in ? get_stage_input_name_prefix(ctx, ctx->prog_type)
-                       : get_stage_output_name_prefix(ctx->prog_type);
-
-      char blockname[64];
-      get_blockname(blockname, stage_prefix, io);
-
-      char blockvarame[64];
-      get_blockvarname(blockvarame, stage_prefix, io, postfix);
-
-      emit_hdrf(ctx, "%s %s {\n", inout, blockname);
-      emit_hdr(ctx, layout);
-      emit_hdrf(ctx, "%s%s\n%s     %s %s[%d]; \n} %s;\n",
-                io->precise ? "precise" : "", io->invariant ? "invariant" : "",
-                prefix, t, io->glsl_name, io->last - io->first + 1,
-                blockvarame);
-    } else {
-      emit_hdr(ctx, layout);
-      emit_hdrf(ctx, "%s%s\n%s       %s %s %s%s[%d];\n",
-                io->precise ? "precise" : "", io->invariant ? "invariant" : "",
-                prefix, inout, t, io->glsl_name, postfix,
-                io->last - io->first + 1);
-    }
-  }
-}
-
-typedef bool (*can_emit_generic_callback)(const struct vrend_shader_io *io);
-
-static void
-emit_ios_generic_outputs(struct dump_ctx *ctx,
-                         const can_emit_generic_callback can_emit_generic) {
-  uint32_t i;
-  uint64_t fc_emitted = 0;
-  uint64_t bc_emitted = 0;
-
-  for (i = 0; i < ctx->num_outputs; i++) {
-
-    if (!ctx->outputs[i].glsl_predefined_no_emit) {
-      /* GS stream outputs are handled separately */
-      if (!can_emit_generic(&ctx->outputs[i]))
-        continue;
-
-      const char *prefix = "";
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_GENERIC ||
-          ctx->outputs[i].name == TGSI_SEMANTIC_COLOR ||
-          ctx->outputs[i].name == TGSI_SEMANTIC_BCOLOR) {
-        ctx->num_interps++;
-        /* ugly leave spaces to patch interp in later */
-        prefix = INTERP_PREFIX;
-      }
-
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_COLOR) {
-        ctx->front_back_color_emitted_flags[ctx->outputs[i].sid] |=
-            FRONT_COLOR_EMITTED;
-        fc_emitted |= 1ull << ctx->outputs[i].sid;
-      }
-
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_BCOLOR) {
-        ctx->front_back_color_emitted_flags[ctx->outputs[i].sid] |=
-            BACK_COLOR_EMITTED;
-        bc_emitted |= 1ull << ctx->outputs[i].sid;
-      }
-
-      emit_ios_generic(ctx, io_out, prefix, &ctx->outputs[i],
-                       ctx->outputs[i].fbfetch_used ? "inout" : "out", "");
-    } else if (ctx->outputs[i].invariant || ctx->outputs[i].precise) {
-      emit_hdrf(ctx, "%s%s;\n",
-                ctx->outputs[i].precise
-                    ? "precise "
-                    : (ctx->outputs[i].invariant ? "invariant " : ""),
-                ctx->outputs[i].glsl_name);
-    }
-  }
-
-  /* If a back color emitted without a corresponding front color, then
-   * we have to force two side coloring, because the FS shader might expect
-   * a front color too. */
-  if (bc_emitted & ~fc_emitted)
-    ctx->force_color_two_side = 1;
-}
-
-static void emit_ios_patch(struct dump_ctx *ctx, const char *prefix,
-                           const struct vrend_shader_io *io, const char *inout,
-                           int size) {
-  const char type[4][6] = {"float", " vec2", " vec3", " vec4"};
-  const char *t = " vec4";
-
-  if (io->layout_location > 0) {
-    /* we need to define a layout here because interleaved arrays might be
-     * emited */
-    if (io->swizzle_offset)
-      emit_hdrf(ctx, "layout(location = %d, component = %d)\n",
-                io->layout_location - 1, io->swizzle_offset);
-    else
-      emit_hdrf(ctx, "layout(location = %d)\n", io->layout_location - 1);
-  }
-
-  if (io->usage_mask != 0xf)
-    t = type[io->num_components - 1];
-
-  if (io->last == io->first)
-    emit_hdrf(ctx, "%s %s %s %s;\n", prefix, inout, t, io->glsl_name);
-  else
-    emit_hdrf(ctx, "%s %s %s %s[%d];\n", prefix, inout, t, io->glsl_name, size);
-}
-
-static bool can_emit_generic_default(UNUSED const struct vrend_shader_io *io) {
-  return true;
-}
-
-static void emit_ios_vs(struct dump_ctx *ctx) {
-  uint32_t i;
-
-  for (i = 0; i < ctx->num_inputs; i++) {
-    char postfix[32] = "";
-    if (!ctx->inputs[i].glsl_predefined_no_emit) {
-      if (ctx->cfg->use_explicit_locations) {
-        emit_hdrf(ctx, "layout(location=%d) ", ctx->inputs[i].first);
-      }
-      if (ctx->inputs[i].first != ctx->inputs[i].last)
-        snprintf(postfix, sizeof(postfix), "[%d]",
-                 ctx->inputs[i].last - ctx->inputs[i].first + 1);
-      emit_hdrf(ctx, "in vec4 %s%s;\n", ctx->inputs[i].glsl_name, postfix);
-    }
-  }
-
-  emit_ios_indirect_generics_output(ctx, "");
-
-  emit_ios_generic_outputs(ctx, can_emit_generic_default);
-
-  if (ctx->key->color_two_side || ctx->force_color_two_side) {
-    bool fcolor_emitted, bcolor_emitted;
-
-    for (i = 0; i < ctx->num_outputs; i++) {
-      if (ctx->outputs[i].sid >= 2)
-        continue;
-
-      fcolor_emitted = bcolor_emitted = false;
-
-      fcolor_emitted =
-          ctx->front_back_color_emitted_flags[ctx->outputs[i].sid] &
-          FRONT_COLOR_EMITTED;
-      bcolor_emitted =
-          ctx->front_back_color_emitted_flags[ctx->outputs[i].sid] &
-          BACK_COLOR_EMITTED;
-
-      if (fcolor_emitted && !bcolor_emitted) {
-        emit_hdrf(ctx, "%sout vec4 ex_bc%d;\n", INTERP_PREFIX,
-                  ctx->outputs[i].sid);
-        ctx->front_back_color_emitted_flags[ctx->outputs[i].sid] |=
-            BACK_COLOR_EMITTED;
-      }
-      if (bcolor_emitted && !fcolor_emitted) {
-        emit_hdrf(ctx, "%sout vec4 ex_c%d;\n", INTERP_PREFIX,
-                  ctx->outputs[i].sid);
-        ctx->front_back_color_emitted_flags[ctx->outputs[i].sid] |=
-            FRONT_COLOR_EMITTED;
-      }
-    }
-  }
-
-  emit_winsys_correction(ctx);
-
-  if (ctx->has_clipvertex) {
-    emit_hdrf(ctx, "%svec4 clipv_tmp;\n", ctx->has_clipvertex_so ? "out " : "");
-  }
-  if (ctx->num_clip_dist || ctx->key->clip_plane_enable) {
-    bool has_prop = (ctx->num_clip_dist_prop + ctx->num_cull_dist_prop) > 0;
-    int num_clip_dists = ctx->num_clip_dist ? ctx->num_clip_dist : 8;
-    int num_cull_dists = 0;
-    char cull_buf[64] = "";
-    char clip_buf[64] = "";
-    if (has_prop) {
-      num_clip_dists = ctx->num_clip_dist_prop;
-      num_cull_dists = ctx->num_cull_dist_prop;
-      if (num_clip_dists)
-        snprintf(clip_buf, 64, "out float gl_ClipDistance[%d];\n",
-                 num_clip_dists);
-      if (num_cull_dists)
-        snprintf(cull_buf, 64, "out float gl_CullDistance[%d];\n",
-                 num_cull_dists);
-    } else
-      snprintf(clip_buf, 64, "out float gl_ClipDistance[%d];\n",
-               num_clip_dists);
-    if (ctx->key->clip_plane_enable) {
-      emit_hdr(ctx, "uniform vec4 clipp[8];\n");
-    }
-    if (ctx->key->gs_present || ctx->key->tes_present) {
-      ctx->vs_has_pervertex = true;
-      emit_hdrf(ctx,
-                "out gl_PerVertex {\n vec4 gl_Position;\n float "
-                "gl_PointSize;\n%s%s};\n",
-                clip_buf, cull_buf);
-    }
-    emit_hdr(ctx, "vec4 clip_dist_temp[2];\n");
-  }
-}
-
-static const char *get_depth_layout(int depth_layout) {
-  const char *dl[4] = {"depth_any", "depth_greater", "depth_less",
-                       "depth_unchanged"};
-
-  if (depth_layout < 1 || depth_layout > TGSI_FS_DEPTH_LAYOUT_UNCHANGED)
-    return NULL;
-  return dl[depth_layout - 1];
-}
-
-static void emit_ios_fs(struct dump_ctx *ctx) {
-  uint32_t i;
-
-  if (ctx->early_depth_stencil) {
-    emit_hdr(ctx, "layout(early_fragment_tests) in;\n");
-  }
-
-  emit_ios_indirect_generics_input(ctx, "");
-
-  for (i = 0; i < ctx->num_inputs; i++) {
-    if (!ctx->inputs[i].glsl_predefined_no_emit) {
-      const char *prefix = "";
-      const char *auxprefix = "";
-
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_GENERIC ||
-          ctx->inputs[i].name == TGSI_SEMANTIC_COLOR ||
-          ctx->inputs[i].name == TGSI_SEMANTIC_BCOLOR) {
-        prefix = get_interp_string(ctx->cfg, ctx->inputs[i].interpolate,
-                                   ctx->key->flatshade);
-        if (!prefix)
-          prefix = "";
-        auxprefix = get_aux_string(ctx->inputs[i].location);
-        ctx->num_interps++;
-      }
-
-      char prefixes[64];
-      snprintf(prefixes, sizeof(prefixes), "%s %s", prefix, auxprefix);
-      emit_ios_generic(ctx, io_in, prefixes, &ctx->inputs[i], "in", "");
-    }
-
-    if (!ctx->winsys_adjust_y_emitted &&
-        (ctx->key->coord_replace & (1 << ctx->inputs[i].sid))) {
-      ctx->winsys_adjust_y_emitted = true;
-      emit_hdr(ctx, "uniform float winsys_adjust_y;\n");
-    }
-  }
-
-  if (ctx->key->color_two_side) {
-    if (ctx->color_in_mask & 1)
-      emit_hdr(ctx, "vec4 realcolor0;\n");
-    if (ctx->color_in_mask & 2)
-      emit_hdr(ctx, "vec4 realcolor1;\n");
-  }
-
-  if (ctx->write_all_cbufs) {
-    for (i = 0; i < (uint32_t)ctx->cfg->max_draw_buffers; i++) {
-      if (ctx->key->fs_logicop_enabled)
-        emit_hdrf(ctx, "vec4 fsout_tmp_c%d;\n", i);
-
-      if (logiop_require_inout(ctx->key)) {
-        const char *noncoherent =
-            ctx->key->fs_logicop_emulate_coherent ? "" : ", noncoherent";
-        emit_hdrf(ctx, "layout (location=%d%s) inout highp vec4 fsout_c%d;\n",
-                  i, noncoherent, i);
-      } else
-        emit_hdrf(ctx, "layout (location=%d) out vec4 fsout_c%d;\n", i, i);
-    }
-  } else {
-    for (i = 0; i < ctx->num_outputs; i++) {
-
-      if (!ctx->outputs[i].glsl_predefined_no_emit) {
-        emit_ios_generic(ctx, io_out, "", &ctx->outputs[i],
-                         ctx->outputs[i].fbfetch_used ? "inout" : "out", "");
-
-      } else if (ctx->outputs[i].invariant || ctx->outputs[i].precise) {
-        emit_hdrf(ctx, "%s%s;\n",
-                  ctx->outputs[i].precise
-                      ? "precise "
-                      : (ctx->outputs[i].invariant ? "invariant " : ""),
-                  ctx->outputs[i].glsl_name);
-      }
-    }
-  }
-
-  if (ctx->fs_depth_layout) {
-    const char *depth_layout = get_depth_layout(ctx->fs_depth_layout);
-    if (depth_layout)
-      emit_hdrf(ctx, "layout (%s) out float gl_FragDepth;\n", depth_layout);
-  }
-
-  if (ctx->num_in_clip_dist) {
-    if (ctx->key->prev_stage_num_clip_out) {
-      emit_hdrf(ctx, "in float gl_ClipDistance[%d];\n",
-                ctx->key->prev_stage_num_clip_out);
-    } else if (ctx->num_in_clip_dist > 4 &&
-               !ctx->key->prev_stage_num_cull_out) {
-      emit_hdrf(ctx, "in float gl_ClipDistance[%d];\n", ctx->num_in_clip_dist);
-    }
-
-    if (ctx->key->prev_stage_num_cull_out) {
-      emit_hdrf(ctx, "in float gl_CullDistance[%d];\n",
-                ctx->key->prev_stage_num_cull_out);
-    }
-    if (ctx->fs_uses_clipdist_input)
-      emit_hdr(ctx, "vec4 clip_dist_temp[2];\n");
-  }
-}
-
-static bool can_emit_generic_geom(const struct vrend_shader_io *io) {
-  return io->stream == 0;
-}
-
-static void emit_ios_geom(struct dump_ctx *ctx) {
-  uint32_t i;
-  char invocbuf[25];
-
-  if (ctx->gs_num_invocations)
-    snprintf(invocbuf, 25, ", invocations = %d", ctx->gs_num_invocations);
-
-  emit_hdrf(ctx, "layout(%s%s) in;\n", prim_to_name(ctx->gs_in_prim),
-            ctx->gs_num_invocations > 1 ? invocbuf : "");
-  emit_hdrf(ctx, "layout(%s, max_vertices = %d) out;\n",
-            prim_to_name(ctx->gs_out_prim), ctx->gs_max_out_verts);
-
-  for (i = 0; i < ctx->num_inputs; i++) {
-    if (!ctx->inputs[i].glsl_predefined_no_emit) {
-      char postfix[64];
-      snprintf(postfix, sizeof(postfix), "[%d]",
-               gs_input_prim_to_size(ctx->gs_in_prim));
-      emit_ios_generic(ctx, io_in, "", &ctx->inputs[i], "in", postfix);
-    }
-  }
-
-  for (i = 0; i < ctx->num_outputs; i++) {
-    if (!ctx->outputs[i].glsl_predefined_no_emit) {
-      if (!ctx->outputs[i].stream)
-        continue;
-
-      const char *prefix = "";
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_GENERIC ||
-          ctx->outputs[i].name == TGSI_SEMANTIC_COLOR ||
-          ctx->outputs[i].name == TGSI_SEMANTIC_BCOLOR) {
-        ctx->num_interps++;
-        /* ugly leave spaces to patch interp in later */
-        prefix = INTERP_PREFIX;
-      }
-
-      emit_hdrf(ctx, "layout (stream = %d) %s%s%sout vec4 %s;\n",
-                ctx->outputs[i].stream, prefix,
-                ctx->outputs[i].precise ? "precise " : "",
-                ctx->outputs[i].invariant ? "invariant " : "",
-                ctx->outputs[i].glsl_name);
-    }
-  }
-
-  emit_ios_generic_outputs(ctx, can_emit_generic_geom);
-
-  emit_winsys_correction(ctx);
-
-  if (ctx->num_in_clip_dist || ctx->key->clip_plane_enable ||
-      ctx->key->prev_stage_pervertex_out) {
-    int clip_dist, cull_dist;
-    char clip_var[64] = "";
-    char cull_var[64] = "";
-
-    clip_dist = ctx->key->prev_stage_num_clip_out
-                    ? ctx->key->prev_stage_num_clip_out
-                    : ctx->num_in_clip_dist;
-    cull_dist = ctx->key->prev_stage_num_cull_out;
-
-    if (clip_dist)
-      snprintf(clip_var, 64, "float gl_ClipDistance[%d];\n", clip_dist);
-    if (cull_dist)
-      snprintf(cull_var, 64, "float gl_CullDistance[%d];\n", cull_dist);
-
-    emit_hdrf(ctx,
-              "in gl_PerVertex {\n vec4 gl_Position;\n float gl_PointSize; \n "
-              "%s%s\n} gl_in[];\n",
-              clip_var, cull_var);
-  }
-  if (ctx->num_clip_dist) {
-    bool has_prop = (ctx->num_clip_dist_prop + ctx->num_cull_dist_prop) > 0;
-    int num_clip_dists = ctx->num_clip_dist ? ctx->num_clip_dist : 8;
-    int num_cull_dists = 0;
-    char cull_buf[64] = "";
-    char clip_buf[64] = "";
-    if (has_prop) {
-      num_clip_dists = ctx->num_clip_dist_prop;
-      num_cull_dists = ctx->num_cull_dist_prop;
-      if (num_clip_dists)
-        snprintf(clip_buf, 64, "out float gl_ClipDistance[%d];\n",
-                 num_clip_dists);
-      if (num_cull_dists)
-        snprintf(cull_buf, 64, "out float gl_CullDistance[%d];\n",
-                 num_cull_dists);
-    } else
-      snprintf(clip_buf, 64, "out float gl_ClipDistance[%d];\n",
-               num_clip_dists);
-    emit_hdrf(ctx, "%s%s\n", clip_buf, cull_buf);
-    emit_hdrf(ctx, "vec4 clip_dist_temp[2];\n");
-  }
-}
-
-static void emit_ios_tcs(struct dump_ctx *ctx) {
-  uint32_t i;
-
-  emit_ios_indirect_generics_input(ctx, "[]");
-
-  for (i = 0; i < ctx->num_inputs; i++) {
-    if (!ctx->inputs[i].glsl_predefined_no_emit) {
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_PATCH)
-        emit_ios_patch(ctx, "", &ctx->inputs[i], "in",
-                       ctx->inputs[i].last - ctx->inputs[i].first + 1);
-      else
-        emit_ios_generic(ctx, io_in, "", &ctx->inputs[i], "in", "[]");
-    }
-  }
-
-  emit_hdrf(ctx, "layout(vertices = %d) out;\n", ctx->tcs_vertices_out);
-
-  emit_ios_indirect_generics_output(ctx, "[]");
-
-  if (ctx->patch_output_range.used)
-    emit_ios_patch(ctx, "patch", &ctx->patch_output_range.io, "out",
-                   ctx->patch_output_range.io.last -
-                       ctx->patch_output_range.io.sid + 1);
-
-  for (i = 0; i < ctx->num_outputs; i++) {
-    if (!ctx->outputs[i].glsl_predefined_no_emit) {
-      if (ctx->outputs[i].name == TGSI_SEMANTIC_PATCH) {
-        emit_ios_patch(ctx, "patch", &ctx->outputs[i], "out",
-                       ctx->outputs[i].last - ctx->outputs[i].first + 1);
-      } else
-        emit_ios_generic(ctx, io_out, "", &ctx->outputs[i], "out", "[]");
-    } else if (ctx->outputs[i].invariant || ctx->outputs[i].precise) {
-      emit_hdrf(ctx, "%s%s;\n",
-                ctx->outputs[i].precise
-                    ? "precise "
-                    : (ctx->outputs[i].invariant ? "invariant " : ""),
-                ctx->outputs[i].glsl_name);
-    }
-  }
-
-  if (ctx->num_in_clip_dist || ctx->key->prev_stage_pervertex_out) {
-    int clip_dist, cull_dist;
-    char clip_var[64] = "", cull_var[64] = "";
-
-    clip_dist = ctx->key->prev_stage_num_clip_out
-                    ? ctx->key->prev_stage_num_clip_out
-                    : ctx->num_in_clip_dist;
-    cull_dist = ctx->key->prev_stage_num_cull_out;
-
-    if (clip_dist)
-      snprintf(clip_var, 64, "float gl_ClipDistance[%d];\n", clip_dist);
-    if (cull_dist)
-      snprintf(cull_var, 64, "float gl_CullDistance[%d];\n", cull_dist);
-
-    emit_hdrf(ctx,
-              "in gl_PerVertex {\n vec4 gl_Position;\n float gl_PointSize; \n "
-              "%s%s} gl_in[];\n",
-              clip_var, cull_var);
-  }
-  if (ctx->num_clip_dist) {
-    emit_hdrf(ctx,
-              "out gl_PerVertex {\n vec4 gl_Position;\n float gl_PointSize;\n "
-              "float gl_ClipDistance[%d];\n} gl_out[];\n",
-              ctx->num_clip_dist ? ctx->num_clip_dist : 8);
-    emit_hdr(ctx, "vec4 clip_dist_temp[2];\n");
-  }
-}
-
-static void emit_ios_tes(struct dump_ctx *ctx) {
-  uint32_t i;
-
-  if (ctx->patch_input_range.used)
-    emit_ios_patch(ctx, "patch", &ctx->patch_input_range.io, "in",
-                   ctx->patch_input_range.io.last -
-                       ctx->patch_input_range.io.sid + 1);
-
-  if (ctx->generic_input_range.used)
-    emit_ios_indirect_generics_input(ctx, "[]");
-
-  for (i = 0; i < ctx->num_inputs; i++) {
-    if (!ctx->inputs[i].glsl_predefined_no_emit) {
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_PATCH)
-        emit_ios_patch(ctx, "patch", &ctx->inputs[i], "in",
-                       ctx->inputs[i].last - ctx->inputs[i].first + 1);
-      else
-        emit_ios_generic(ctx, io_in, "", &ctx->inputs[i], "in", "[]");
-    }
-  }
-
-  emit_hdrf(ctx, "layout(%s, %s, %s%s) in;\n",
-            prim_to_tes_name(ctx->tes_prim_mode),
-            get_spacing_string(ctx->tes_spacing),
-            ctx->tes_vertex_order ? "cw" : "ccw",
-            ctx->tes_point_mode ? ", point_mode" : "");
-
-  emit_ios_generic_outputs(ctx, can_emit_generic_default);
-
-  emit_winsys_correction(ctx);
-
-  if (ctx->num_in_clip_dist || ctx->key->prev_stage_pervertex_out) {
-    int clip_dist, cull_dist;
-    char clip_var[64] = "", cull_var[64] = "";
-
-    clip_dist = ctx->key->prev_stage_num_clip_out
-                    ? ctx->key->prev_stage_num_clip_out
-                    : ctx->num_in_clip_dist;
-    cull_dist = ctx->key->prev_stage_num_cull_out;
-
-    if (clip_dist)
-      snprintf(clip_var, 64, "float gl_ClipDistance[%d];\n", clip_dist);
-    if (cull_dist)
-      snprintf(cull_var, 64, "float gl_CullDistance[%d];\n", cull_dist);
-
-    emit_hdrf(ctx,
-              "in gl_PerVertex {\n vec4 gl_Position;\n float gl_PointSize; \n "
-              "%s%s} gl_in[];\n",
-              clip_var, cull_var);
-  }
-  if (ctx->num_clip_dist) {
-    emit_hdrf(ctx,
-              "out gl_PerVertex {\n vec4 gl_Position;\n float gl_PointSize;\n "
-              "float gl_ClipDistance[%d];\n} gl_out[];\n",
-              ctx->num_clip_dist ? ctx->num_clip_dist : 8);
-    emit_hdr(ctx, "vec4 clip_dist_temp[2];\n");
-  }
-}
-
-static void emit_ios_cs(struct dump_ctx *ctx) {
-  emit_hdrf(
-      ctx,
-      "layout (local_size_x = %d, local_size_y = %d, local_size_z = %d) in;\n",
-      ctx->local_cs_block_size[0], ctx->local_cs_block_size[1],
-      ctx->local_cs_block_size[2]);
-
-  if (ctx->req_local_mem) {
-    enum vrend_type_qualifier type = ctx->integer_memory ? INT : UINT;
-    emit_hdrf(ctx, "shared %s values[%d];\n", get_string(type),
-              ctx->req_local_mem / 4);
-  }
-}
-
-static void emit_ios(struct dump_ctx *ctx) {
-  ctx->num_interps = 0;
-
-  if (ctx->so && ctx->so->num_outputs >= PIPE_MAX_SO_OUTPUTS) {
-    set_hdr_error(ctx);
-    return;
-  }
-
-  switch (ctx->prog_type) {
-  case TGSI_PROCESSOR_VERTEX:
-    emit_ios_vs(ctx);
-    break;
-  case TGSI_PROCESSOR_FRAGMENT:
-    emit_ios_fs(ctx);
-    break;
-  case TGSI_PROCESSOR_GEOMETRY:
-    emit_ios_geom(ctx);
-    break;
-  case TGSI_PROCESSOR_TESS_CTRL:
-    emit_ios_tcs(ctx);
-    break;
-  case TGSI_PROCESSOR_TESS_EVAL:
-    emit_ios_tes(ctx);
-    break;
-  case TGSI_PROCESSOR_COMPUTE:
-    emit_ios_cs(ctx);
-    break;
-  default:
-    set_hdr_error(ctx);
-    return;
-  }
-
-  if (ctx->generic_outputs_expected_mask &&
-      (ctx->generic_outputs_expected_mask !=
-       ctx->generic_outputs_emitted_mask)) {
-    for (int i = 0; i < 31; ++i) {
-      uint32_t mask = 1 << i;
-      bool expecting = ctx->generic_outputs_expected_mask & mask;
-      if (expecting & !(ctx->generic_outputs_emitted_mask & mask))
-        emit_hdrf(ctx, "                              out vec4 %s_g%dA0_f%s;\n",
-                  get_stage_output_name_prefix(ctx->prog_type), i,
-                  ctx->prog_type == TGSI_PROCESSOR_TESS_CTRL ? "[]" : "");
-    }
-  }
-
-  emit_ios_streamout(ctx);
-  emit_ios_common(ctx);
-
-  if (ctx->prog_type == TGSI_PROCESSOR_FRAGMENT &&
-      ctx->key->pstipple_tex == true) {
-    emit_hdr(ctx, "uniform sampler2D pstipple_sampler;\nfloat stip_temp;\n");
-  }
-}
-
-static boolean fill_fragment_interpolants(struct dump_ctx *ctx,
-                                          struct vrend_shader_info *sinfo) {
-  uint32_t i, index = 0;
-
-  for (i = 0; i < ctx->num_inputs; i++) {
-    if (ctx->inputs[i].glsl_predefined_no_emit)
-      continue;
-
-    if (ctx->inputs[i].name != TGSI_SEMANTIC_GENERIC &&
-        ctx->inputs[i].name != TGSI_SEMANTIC_COLOR)
-      continue;
-
-    if (index >= ctx->num_interps)
-      return true;
-
-    sinfo->interpinfo[index].semantic_name = ctx->inputs[i].name;
-    sinfo->interpinfo[index].semantic_index = ctx->inputs[i].sid;
-    sinfo->interpinfo[index].interpolate = ctx->inputs[i].interpolate;
-    sinfo->interpinfo[index].location = ctx->inputs[i].location;
-    index++;
-  }
-  return true;
-}
-
-static boolean fill_interpolants(struct dump_ctx *ctx,
-                                 struct vrend_shader_info *sinfo) {
-  boolean ret;
-
-  if (!ctx->num_interps)
-    return true;
-  if (ctx->prog_type == TGSI_PROCESSOR_VERTEX ||
-      ctx->prog_type == TGSI_PROCESSOR_GEOMETRY)
-    return true;
-
-  free(sinfo->interpinfo);
-  sinfo->interpinfo =
-      calloc(ctx->num_interps, sizeof(struct vrend_interp_info));
-  if (!sinfo->interpinfo)
-    return false;
-
-  ret = fill_fragment_interpolants(ctx, sinfo);
-  if (ret == false)
-    goto out_fail;
-
-  return true;
-out_fail:
-  free(sinfo->interpinfo);
-  return false;
-}
-
-static boolean analyze_instruction(struct tgsi_iterate_context *iter,
-                                   struct tgsi_full_instruction *inst) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-  uint32_t opcode = inst->Instruction.Opcode;
-  if (opcode == TGSI_OPCODE_ATOMIMIN || opcode == TGSI_OPCODE_ATOMIMAX) {
-    const struct tgsi_full_src_register *src = &inst->Src[0];
-    if (src->Register.File == TGSI_FILE_BUFFER)
-      ctx->ssbo_integer_mask |= 1 << src->Register.Index;
-    if (src->Register.File == TGSI_FILE_MEMORY)
-      ctx->integer_memory = true;
-  }
-
-  if (!ctx->fs_uses_clipdist_input &&
-      (ctx->prog_type == TGSI_PROCESSOR_FRAGMENT)) {
-    for (int i = 0; i < inst->Instruction.NumSrcRegs; ++i) {
-      if (inst->Src[i].Register.File == TGSI_FILE_INPUT) {
-        int idx = inst->Src[i].Register.Index;
-        for (unsigned j = 0; j < ctx->num_inputs; ++j) {
-          if (ctx->inputs[j].first <= idx && ctx->inputs[j].last >= idx &&
-              ctx->inputs[j].name == TGSI_SEMANTIC_CLIPDIST) {
-            ctx->fs_uses_clipdist_input = true;
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
-static void fill_sinfo(struct dump_ctx *ctx, struct vrend_shader_info *sinfo) {
-  sinfo->num_ucp = ctx->key->clip_plane_enable ? 8 : 0;
-  sinfo->has_pervertex_out = ctx->vs_has_pervertex;
-  sinfo->has_sample_input = ctx->has_sample_input;
-  bool has_prop = (ctx->num_clip_dist_prop + ctx->num_cull_dist_prop) > 0;
-  sinfo->num_clip_out = has_prop
-                            ? ctx->num_clip_dist_prop
-                            : (ctx->num_clip_dist ? ctx->num_clip_dist : 8);
-  sinfo->num_cull_out = has_prop ? ctx->num_cull_dist_prop : 0;
-  sinfo->samplers_used_mask = ctx->samplers_used;
-  sinfo->images_used_mask = ctx->images_used_mask;
-  sinfo->num_consts = ctx->num_consts;
-  sinfo->ubo_used_mask = ctx->ubo_used_mask;
-
-  sinfo->ssbo_used_mask = ctx->ssbo_used_mask;
-
-  sinfo->ubo_indirect =
-      ctx->info.dimension_indirect_files & (1 << TGSI_FILE_CONSTANT);
-
-  if (ctx->generic_input_range.used)
-    sinfo->num_indirect_generic_inputs =
-        ctx->generic_input_range.io.last - ctx->generic_input_range.io.sid + 1;
-  if (ctx->patch_input_range.used)
-    sinfo->num_indirect_patch_inputs =
-        ctx->patch_input_range.io.last - ctx->patch_input_range.io.sid + 1;
-
-  if (ctx->generic_output_range.used)
-    sinfo->num_indirect_generic_outputs = ctx->generic_output_range.io.last -
-                                          ctx->generic_output_range.io.sid + 1;
-  if (ctx->patch_output_range.used)
-    sinfo->num_indirect_patch_outputs =
-        ctx->patch_output_range.io.last - ctx->patch_output_range.io.sid + 1;
-
-  sinfo->num_inputs = ctx->num_inputs;
-  sinfo->num_interps = ctx->num_interps;
-  sinfo->num_outputs = ctx->num_outputs;
-  sinfo->shadow_samp_mask = ctx->shadow_samp_mask;
-  sinfo->glsl_ver = ctx->glsl_ver_required;
-  sinfo->gs_out_prim = ctx->gs_out_prim;
-  sinfo->tes_prim = ctx->tes_prim_mode;
-  sinfo->tes_point_mode = ctx->tes_point_mode;
-
-  if (sinfo->so_names || ctx->so_names) {
-    if (sinfo->so_names) {
-      for (unsigned i = 0; i < sinfo->so_info.num_outputs; ++i)
-        free(sinfo->so_names[i]);
-      free(sinfo->so_names);
-    }
-  }
-
-  /* Record information about the layout of generics and patches for apssing it
-   * to the next shader stage. mesa/tgsi doesn't provide this information for
-   * TCS, TES, and GEOM shaders.
-   */
-  sinfo->guest_sent_io_arrays = ctx->guest_sent_io_arrays;
-  sinfo->num_generic_and_patch_outputs = 0;
-  for (unsigned i = 0; i < ctx->num_outputs; i++) {
-    sinfo->generic_outputs_layout[sinfo->num_generic_and_patch_outputs].name =
-        ctx->outputs[i].name;
-    sinfo->generic_outputs_layout[sinfo->num_generic_and_patch_outputs].sid =
-        ctx->outputs[i].sid;
-    sinfo->generic_outputs_layout[sinfo->num_generic_and_patch_outputs]
-        .location = ctx->outputs[i].layout_location;
-    sinfo->generic_outputs_layout[sinfo->num_generic_and_patch_outputs]
-        .array_id = ctx->outputs[i].array_id;
-    sinfo->generic_outputs_layout[sinfo->num_generic_and_patch_outputs]
-        .usage_mask = ctx->outputs[i].usage_mask;
-    if (ctx->outputs[i].name == TGSI_SEMANTIC_GENERIC ||
-        ctx->outputs[i].name == TGSI_SEMANTIC_PATCH) {
-      sinfo->num_generic_and_patch_outputs++;
-    }
-  }
-
-  sinfo->so_names = ctx->so_names;
-  sinfo->attrib_input_mask = ctx->attrib_input_mask;
-  if (sinfo->sampler_arrays)
-    free(sinfo->sampler_arrays);
-  sinfo->sampler_arrays = ctx->sampler_arrays;
-  sinfo->num_sampler_arrays = ctx->num_sampler_arrays;
-  if (sinfo->image_arrays)
-    free(sinfo->image_arrays);
-  sinfo->image_arrays = ctx->image_arrays;
-  sinfo->num_image_arrays = ctx->num_image_arrays;
-  sinfo->generic_inputs_emitted_mask = ctx->generic_inputs_emitted_mask;
-
-  for (unsigned i = 0; i < ctx->num_outputs; ++i) {
-    if (ctx->outputs[i].invariant)
-      sinfo->invariant_outputs |= 1ull << ctx->outputs[i].sid;
-  }
-}
-
-static bool allocate_strbuffers(struct dump_ctx *ctx) {
-  if (!strbuf_alloc(&ctx->glsl_main, 4096))
-    return false;
-
-  if (strbuf_get_error(&ctx->glsl_main))
-    return false;
-
-  if (!strbuf_alloc(&ctx->glsl_hdr, 1024))
-    return false;
-
-  if (!strbuf_alloc(&ctx->glsl_ver_ext, 1024))
-    return false;
-
-  return true;
-}
-
-static void set_strbuffers(MAYBE_UNUSED struct vrend_context *rctx,
-                           struct dump_ctx *ctx,
-                           struct vrend_strarray *shader) {
-  strarray_addstrbuf(shader, &ctx->glsl_ver_ext);
-  strarray_addstrbuf(shader, &ctx->glsl_hdr);
-  strarray_addstrbuf(shader, &ctx->glsl_main);
-}
-
-bool vrend_convert_shader(struct vrend_context *rctx,
-                          struct vrend_shader_cfg *cfg,
-                          const struct tgsi_token *tokens,
-                          uint32_t req_local_mem, struct vrend_shader_key *key,
-                          struct vrend_shader_info *sinfo,
-                          struct vrend_strarray *shader) {
-  struct dump_ctx ctx;
-  boolean bret;
-
-  memset(&ctx, 0, sizeof(struct dump_ctx));
-
-  /* First pass to deal with edge cases. */
-  if (ctx.prog_type == TGSI_PROCESSOR_FRAGMENT)
-    ctx.iter.iterate_declaration = iter_inputs;
-  ctx.iter.iterate_instruction = analyze_instruction;
-  bret = tgsi_iterate_shader(tokens, &ctx.iter);
-  if (bret == false)
-    return false;
-
-  ctx.num_inputs = 0;
-
-  ctx.iter.prolog = prolog;
-  ctx.iter.iterate_instruction = iter_instruction;
-  ctx.iter.iterate_declaration = iter_declaration;
-  ctx.iter.iterate_immediate = iter_immediate;
-  ctx.iter.iterate_property = iter_property;
-  ctx.iter.epilog = NULL;
-  ctx.key = key;
-  ctx.cfg = cfg;
-  ctx.prog_type = -1;
-  ctx.num_image_arrays = 0;
-  ctx.image_arrays = NULL;
-  ctx.num_sampler_arrays = 0;
-  ctx.sampler_arrays = NULL;
-  ctx.ssbo_array_base = 0xffffffff;
-  ctx.ssbo_atomic_array_base = 0xffffffff;
-  ctx.has_sample_input = false;
-  ctx.req_local_mem = req_local_mem;
-  ctx.guest_sent_io_arrays = key->guest_sent_io_arrays;
-  ctx.generic_outputs_expected_mask = key->generic_outputs_expected_mask;
-
-  tgsi_scan_shader(tokens, &ctx.info);
-
-  if (cfg->glsl_version >= 140)
-    require_glsl_ver(&ctx, 140);
-
-  if (sinfo->so_info.num_outputs) {
-    ctx.so = &sinfo->so_info;
-    ctx.so_names = calloc(sinfo->so_info.num_outputs, sizeof(char *));
-    if (!ctx.so_names)
-      goto fail;
-  } else
-    ctx.so_names = NULL;
-
-  if (ctx.info.dimension_indirect_files & (1 << TGSI_FILE_CONSTANT))
-    require_glsl_ver(&ctx, 150);
-
-  if (ctx.info.indirect_files & (1 << TGSI_FILE_BUFFER) ||
-      ctx.info.indirect_files & (1 << TGSI_FILE_IMAGE)) {
-    require_glsl_ver(&ctx, 150);
-    ctx.shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-  }
-  if (ctx.info.indirect_files & (1 << TGSI_FILE_SAMPLER))
-    ctx.shader_req_bits |= SHADER_REQ_GPU_SHADER5;
-
-  if (!allocate_strbuffers(&ctx))
-    goto fail;
-
-  bret = tgsi_iterate_shader(tokens, &ctx.iter);
-  if (bret == false)
-    goto fail;
-
-  for (size_t i = 0; i < ARRAY_SIZE(ctx.src_bufs); ++i)
-    strbuf_free(ctx.src_bufs + i);
-
-  emit_header(&ctx);
-  emit_ios(&ctx);
-
-  if (strbuf_get_error(&ctx.glsl_hdr))
-    goto fail;
-
-  bret = fill_interpolants(&ctx, sinfo);
-  if (bret == false)
-    goto fail;
-
-  free(ctx.temp_ranges);
-
-  fill_sinfo(&ctx, sinfo);
-  set_strbuffers(rctx, &ctx, shader);
-
-  return true;
-fail:
-  strbuf_free(&ctx.glsl_main);
-  strbuf_free(&ctx.glsl_hdr);
-  strbuf_free(&ctx.glsl_ver_ext);
-  free(ctx.so_names);
-  free(ctx.temp_ranges);
-  return false;
-}
-
-static void replace_interp(struct vrend_strarray *program, const char *var_name,
-                           const char *pstring, const char *auxstring) {
-  int mylen = strlen(INTERP_PREFIX) + strlen("out float ");
-
-  char *ptr = program->strings[SHADER_STRING_HDR].buf;
-  do {
-    char *p = strstr(ptr, var_name);
-    if (!p)
-      break;
-
-    ptr = p - mylen;
-
-    memset(ptr, ' ', strlen(INTERP_PREFIX));
-    memcpy(ptr, pstring, strlen(pstring));
-    memcpy(ptr + strlen(pstring), auxstring, strlen(auxstring));
-
-    ptr = p + strlen(var_name);
-  } while (1);
-}
-
-static const char *gpu_shader5_and_msinterp_string =
-    "#extension GL_OES_gpu_shader5 : require\n"
-    "#extension GL_OES_shader_multisample_interpolation : require\n";
-
-static void require_gpu_shader5_and_msinterp(struct vrend_strarray *program) {
-  strbuf_append(&program->strings[SHADER_STRING_VER_EXT],
-                gpu_shader5_and_msinterp_string);
-}
-
-bool vrend_patch_vertex_shader_interpolants(
-    MAYBE_UNUSED struct vrend_context *rctx, struct vrend_shader_cfg *cfg,
-    struct vrend_strarray *prog_strings, struct vrend_shader_info *vs_info,
-    struct vrend_shader_info *fs_info, const char *oprefix, bool flatshade) {
-  int i;
-  const char *pstring, *auxstring;
-  char glsl_name[64];
-  if (!vs_info || !fs_info)
-    return true;
-
-  if (!fs_info->interpinfo)
-    return true;
-
-  if (fs_info->has_sample_input) {
-    if (cfg->glsl_version < 320)
-      require_gpu_shader5_and_msinterp(prog_strings);
-  }
-
-  for (i = 0; i < fs_info->num_interps; i++) {
-    pstring =
-        get_interp_string(cfg, fs_info->interpinfo[i].interpolate, flatshade);
-    if (!pstring)
-      continue;
-
-    auxstring = get_aux_string(fs_info->interpinfo[i].location);
-
-    switch (fs_info->interpinfo[i].semantic_name) {
-    case TGSI_SEMANTIC_COLOR:
-    case TGSI_SEMANTIC_BCOLOR:
-      /* color is a bit trickier */
-      if (fs_info->glsl_ver < 140) {
-        if (fs_info->interpinfo[i].semantic_index == 1) {
-          replace_interp(prog_strings, "gl_FrontSecondaryColor", pstring,
-                         auxstring);
-          replace_interp(prog_strings, "gl_BackSecondaryColor", pstring,
-                         auxstring);
-        } else {
-          replace_interp(prog_strings, "gl_FrontColor", pstring, auxstring);
-          replace_interp(prog_strings, "gl_BackColor", pstring, auxstring);
-        }
-      } else {
-        snprintf(glsl_name, 64, "ex_c%d",
-                 fs_info->interpinfo[i].semantic_index);
-        replace_interp(prog_strings, glsl_name, pstring, auxstring);
-        snprintf(glsl_name, 64, "ex_bc%d",
-                 fs_info->interpinfo[i].semantic_index);
-        replace_interp(prog_strings, glsl_name, pstring, auxstring);
-      }
-      break;
-    case TGSI_SEMANTIC_GENERIC:
-      snprintf(glsl_name, 64, "%s_g%d", oprefix,
-               fs_info->interpinfo[i].semantic_index);
-      replace_interp(prog_strings, glsl_name, pstring, auxstring);
-      break;
-    default:
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static boolean iter_vs_declaration(struct tgsi_iterate_context *iter,
-                                   struct tgsi_full_declaration *decl) {
-  struct dump_ctx *ctx = (struct dump_ctx *)iter;
-
-  const char *shader_in_prefix = "vso";
-  const char *shader_out_prefix = "tco";
-  const char *name_prefix = "";
-  unsigned i;
-  unsigned mask_temp;
-
-  // Generate a shader that passes through all VS outputs
-  if (decl->Declaration.File == TGSI_FILE_OUTPUT) {
-    for (uint32_t j = 0; j < ctx->num_inputs; j++) {
-      if (ctx->inputs[j].name == decl->Semantic.Name &&
-          ctx->inputs[j].sid == decl->Semantic.Index &&
-          ctx->inputs[j].first == decl->Range.First &&
-          ctx->inputs[j].usage_mask == decl->Declaration.UsageMask &&
-          ((!decl->Declaration.Array && ctx->inputs[j].array_id == 0) ||
-           (ctx->inputs[j].array_id == decl->Array.ArrayID)))
-        return true;
-    }
-    i = ctx->num_inputs++;
-
-    ctx->inputs[i].name = decl->Semantic.Name;
-    ctx->inputs[i].sid = decl->Semantic.Index;
-    ctx->inputs[i].interpolate = decl->Interp.Interpolate;
-    ctx->inputs[i].location = decl->Interp.Location;
-    ctx->inputs[i].first = decl->Range.First;
-    ctx->inputs[i].layout_location = 0;
-    ctx->inputs[i].last = decl->Range.Last;
-    ctx->inputs[i].array_id = decl->Declaration.Array ? decl->Array.ArrayID : 0;
-    ctx->inputs[i].usage_mask = mask_temp = decl->Declaration.UsageMask;
-    u_bit_scan_consecutive_range(&mask_temp, &ctx->inputs[i].swizzle_offset,
-                                 &ctx->inputs[i].num_components);
-
-    ctx->inputs[i].glsl_predefined_no_emit = false;
-    ctx->inputs[i].glsl_no_index = false;
-    ctx->inputs[i].override_no_wm = ctx->inputs[i].num_components == 1;
-    ctx->inputs[i].glsl_gl_block = false;
-
-    switch (ctx->inputs[i].name) {
-    case TGSI_SEMANTIC_PSIZE:
-      name_prefix = "gl_PointSize";
-      ctx->inputs[i].glsl_predefined_no_emit = true;
-      ctx->inputs[i].glsl_no_index = true;
-      ctx->inputs[i].override_no_wm = true;
-      ctx->inputs[i].glsl_gl_block = true;
-      ctx->shader_req_bits |= SHADER_REQ_PSIZE;
-      break;
-
-    case TGSI_SEMANTIC_CLIPDIST:
-      name_prefix = "gl_ClipDistance";
-      ctx->inputs[i].glsl_predefined_no_emit = true;
-      ctx->inputs[i].glsl_no_index = true;
-      ctx->inputs[i].glsl_gl_block = true;
-      ctx->num_in_clip_dist +=
-          4 * (ctx->inputs[i].last - ctx->inputs[i].first + 1);
-      ctx->shader_req_bits |= SHADER_REQ_CLIP_DISTANCE;
-      if (ctx->inputs[i].last != ctx->inputs[i].first)
-        ctx->guest_sent_io_arrays = true;
-      break;
-
-    case TGSI_SEMANTIC_POSITION:
-      name_prefix = "gl_Position";
-      ctx->inputs[i].glsl_predefined_no_emit = true;
-      ctx->inputs[i].glsl_no_index = true;
-      ctx->inputs[i].glsl_gl_block = true;
-      break;
-
-    case TGSI_SEMANTIC_PATCH:
-    case TGSI_SEMANTIC_GENERIC:
-      if (ctx->inputs[i].first != ctx->inputs[i].last ||
-          ctx->inputs[i].array_id > 0) {
-        ctx->guest_sent_io_arrays = true;
-      }
-      break;
-    }
-
-    memcpy(&ctx->outputs[i], &ctx->inputs[i], sizeof(struct vrend_shader_io));
-
-    if (ctx->inputs[i].glsl_no_index) {
-      snprintf(ctx->inputs[i].glsl_name, 128, "%s", name_prefix);
-      snprintf(ctx->outputs[i].glsl_name, 128, "%s", name_prefix);
-    } else {
-      if (ctx->inputs[i].name == TGSI_SEMANTIC_FOG) {
-        ctx->inputs[i].usage_mask = 0xf;
-        ctx->inputs[i].num_components = 4;
-        ctx->inputs[i].swizzle_offset = 0;
-        ctx->inputs[i].override_no_wm = false;
-        snprintf(ctx->inputs[i].glsl_name, 64, "%s_f%d", shader_in_prefix,
-                 ctx->inputs[i].sid);
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_f%d", shader_out_prefix,
-                 ctx->inputs[i].sid);
-      } else if (ctx->inputs[i].name == TGSI_SEMANTIC_COLOR) {
-        snprintf(ctx->inputs[i].glsl_name, 64, "%s_c%d", shader_in_prefix,
-                 ctx->inputs[i].sid);
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_c%d", shader_out_prefix,
-                 ctx->inputs[i].sid);
-      } else if (ctx->inputs[i].name == TGSI_SEMANTIC_GENERIC) {
-        snprintf(ctx->inputs[i].glsl_name, 64, "%s_g%dA%d_%x", shader_in_prefix,
-                 ctx->inputs[i].sid, ctx->inputs[i].array_id,
-                 ctx->inputs[i].usage_mask);
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_g%dA%d_%x",
-                 shader_out_prefix, ctx->inputs[i].sid, ctx->inputs[i].array_id,
-                 ctx->inputs[i].usage_mask);
-      } else if (ctx->inputs[i].name == TGSI_SEMANTIC_PATCH) {
-        snprintf(ctx->inputs[i].glsl_name, 64, "%s_p%dA%d_%x", shader_in_prefix,
-                 ctx->inputs[i].sid, ctx->inputs[i].array_id,
-                 ctx->inputs[i].usage_mask);
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_p%dA%d_%x",
-                 shader_out_prefix, ctx->inputs[i].sid, ctx->inputs[i].array_id,
-                 ctx->inputs[i].usage_mask);
-      } else {
-        snprintf(ctx->outputs[i].glsl_name, 64, "%s_%d", shader_in_prefix,
-                 ctx->inputs[i].first);
-        snprintf(ctx->inputs[i].glsl_name, 64, "%s_%d", shader_out_prefix,
-                 ctx->inputs[i].first);
-      }
-    }
-  }
-  return true;
-}
-
-bool vrend_shader_create_passthrough_tcs(
-    struct vrend_context *rctx, struct vrend_shader_cfg *cfg,
-    struct tgsi_token *vs_tokens, struct vrend_shader_key *key,
-    const float tess_factors[6], struct vrend_shader_info *sinfo,
-    struct vrend_strarray *shader, int vertices_per_patch) {
-  struct dump_ctx ctx;
-
-  memset(&ctx, 0, sizeof(struct dump_ctx));
-
-  ctx.prog_type = TGSI_PROCESSOR_TESS_CTRL;
-  ctx.cfg = cfg;
-  ctx.key = key;
-  ctx.iter.iterate_declaration = iter_vs_declaration;
-  ctx.ssbo_array_base = 0xffffffff;
-  ctx.ssbo_atomic_array_base = 0xffffffff;
-  ctx.has_sample_input = false;
-
-  if (!allocate_strbuffers(&ctx))
-    goto fail;
-
-  tgsi_iterate_shader(vs_tokens, &ctx.iter);
-
-  /*  What is the default on GL? */
-  ctx.tcs_vertices_out = vertices_per_patch;
-
-  ctx.num_outputs = ctx.num_inputs;
-
-  handle_io_arrays(&ctx);
-
-  emit_header(&ctx);
-  emit_ios(&ctx);
-
-  emit_buf(&ctx, "void main() {\n");
-
-  for (unsigned int i = 0; i < ctx.num_inputs; ++i) {
-    const char *out_prefix = "";
-    const char *in_prefix = "";
-
-    const char *postfix = "";
-
-    if (ctx.inputs[i].glsl_gl_block) {
-      out_prefix = "gl_out[gl_InvocationID].";
-      in_prefix = "gl_in[gl_InvocationID].";
-    } else {
-      postfix = "[gl_InvocationID]";
-    }
-
-    if (ctx.inputs[i].first == ctx.inputs[i].last) {
-      emit_buff(&ctx, "%s%s%s = %s%s%s;\n", out_prefix,
-                ctx.outputs[i].glsl_name, postfix, in_prefix,
-                ctx.inputs[i].glsl_name, postfix);
-    } else {
-      unsigned size = ctx.inputs[i].last == ctx.inputs[i].first + 1;
-      for (unsigned int k = 0; k < size; ++k) {
-        emit_buff(&ctx, "%s%s%s[%d] = %s%s%s[%d];\n", out_prefix,
-                  ctx.outputs[i].glsl_name, postfix, k, in_prefix,
-                  ctx.inputs[i].glsl_name, postfix, k);
-      }
-    }
-  }
-
-  for (int i = 0; i < 4; ++i)
-    emit_buff(&ctx, "gl_TessLevelOuter[%d] = %f;\n", i, tess_factors[i]);
-
-  for (int i = 0; i < 2; ++i)
-    emit_buff(&ctx, "gl_TessLevelInner[%d] = %f;\n", i, tess_factors[i + 4]);
-
-  emit_buf(&ctx, "}\n");
-
-  fill_sinfo(&ctx, sinfo);
-  set_strbuffers(rctx, &ctx, shader);
-  return true;
-fail:
-  strbuf_free(&ctx.glsl_main);
-  strbuf_free(&ctx.glsl_hdr);
-  strbuf_free(&ctx.glsl_ver_ext);
-  free(ctx.so_names);
-  free(ctx.temp_ranges);
-  return false;
-}
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_shader.h b/app/src/main/cpp/virglrenderer/src/vrend_shader.h
deleted file mode 100644
index 68091ab9a..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_shader.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2014 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-
-#ifndef VREND_SHADER_H
-#define VREND_SHADER_H
-
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-
-#include "vrend_strbuf.h"
-/* need to store patching info for interpolation */
-struct vrend_interp_info {
-  int semantic_name;
-  int semantic_index;
-  int interpolate;
-  unsigned location;
-};
-
-struct vrend_array {
-  int first;
-  int array_size;
-};
-
-struct vrend_layout_info {
-  unsigned name;
-  int sid;
-  int location;
-  int array_id;
-  int usage_mask;
-};
-
-struct vrend_shader_info {
-  uint32_t samplers_used_mask;
-  uint32_t images_used_mask;
-  uint32_t ubo_used_mask;
-  uint32_t ssbo_used_mask;
-  uint32_t num_generic_and_patch_outputs;
-  bool guest_sent_io_arrays;
-  struct vrend_layout_info generic_outputs_layout[64];
-  int num_consts;
-  int num_inputs;
-  int num_interps;
-  int num_outputs;
-  bool ubo_indirect;
-  uint8_t num_indirect_generic_outputs;
-  uint8_t num_indirect_patch_outputs;
-  uint8_t num_indirect_generic_inputs;
-  uint8_t num_indirect_patch_inputs;
-  uint32_t generic_inputs_emitted_mask;
-  int num_ucp;
-  int glsl_ver;
-  bool has_pervertex_out;
-  bool has_sample_input;
-  uint8_t num_clip_out;
-  uint8_t num_cull_out;
-  uint32_t shadow_samp_mask;
-  int gs_out_prim;
-  int tes_prim;
-  bool tes_point_mode;
-  uint32_t attrib_input_mask;
-
-  struct vrend_array *sampler_arrays;
-  int num_sampler_arrays;
-
-  struct vrend_array *image_arrays;
-  int num_image_arrays;
-
-  struct pipe_stream_output_info so_info;
-
-  struct vrend_interp_info *interpinfo;
-  char **so_names;
-  uint64_t invariant_outputs;
-};
-
-struct vrend_shader_key {
-  uint32_t coord_replace;
-  bool pstipple_tex;
-  bool add_alpha_test;
-  bool color_two_side;
-  uint8_t alpha_test;
-  uint8_t clip_plane_enable;
-  bool gs_present;
-  bool tcs_present;
-  bool tes_present;
-  bool flatshade;
-  bool prev_stage_pervertex_out;
-  bool guest_sent_io_arrays;
-  bool fs_logicop_enabled;
-  bool fs_logicop_emulate_coherent;
-  enum pipe_logicop fs_logicop_func;
-  uint8_t surface_component_bits[PIPE_MAX_COLOR_BUFS];
-
-  uint32_t num_prev_generic_and_patch_outputs;
-  struct vrend_layout_info prev_stage_generic_and_patch_outputs_layout[64];
-
-  uint8_t prev_stage_num_clip_out;
-  uint8_t prev_stage_num_cull_out;
-  float alpha_ref_val;
-  uint32_t cbufs_are_a8_bitmask;
-  uint8_t num_indirect_generic_outputs;
-  uint8_t num_indirect_patch_outputs;
-  uint8_t num_indirect_generic_inputs;
-  uint8_t num_indirect_patch_inputs;
-  uint32_t generic_outputs_expected_mask;
-  uint8_t fs_swizzle_output_rgb_to_bgr;
-};
-
-struct vrend_shader_cfg {
-  int glsl_version;
-  int max_draw_buffers;
-  bool use_explicit_locations;
-  bool has_es31_compat;
-};
-
-struct vrend_context;
-
-#define SHADER_MAX_STRINGS 3
-#define SHADER_STRING_VER_EXT 0
-#define SHADER_STRING_HDR 1
-
-bool vrend_patch_vertex_shader_interpolants(
-    struct vrend_context *rctx, struct vrend_shader_cfg *cfg,
-    struct vrend_strarray *shader, struct vrend_shader_info *vs_info,
-    struct vrend_shader_info *fs_info, const char *oprefix, bool flatshade);
-
-bool vrend_convert_shader(struct vrend_context *rctx,
-                          struct vrend_shader_cfg *cfg,
-                          const struct tgsi_token *tokens,
-                          uint32_t req_local_mem, struct vrend_shader_key *key,
-                          struct vrend_shader_info *sinfo,
-                          struct vrend_strarray *shader);
-
-const char *vrend_shader_samplertypeconv(int sampler_type);
-
-char vrend_shader_samplerreturnconv(enum tgsi_return_type type);
-
-int vrend_shader_lookup_sampler_array(struct vrend_shader_info *sinfo,
-                                      int index);
-
-bool vrend_shader_create_passthrough_tcs(
-    struct vrend_context *ctx, struct vrend_shader_cfg *cfg,
-    struct tgsi_token *vs_info, struct vrend_shader_key *key,
-    const float tess_factors[6], struct vrend_shader_info *sinfo,
-    struct vrend_strarray *shader, int vertices_per_patch);
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_strbuf.h b/app/src/main/cpp/virglrenderer/src/vrend_strbuf.h
deleted file mode 100644
index 5fc6fe371..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_strbuf.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2019 Red Hat Inc.
- *
- * 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.
- *
- **************************************************************************/
-#ifndef VREND_STRBUF_H
-#define VREND_STRBUF_H
-
-#include "util/u_math.h"
-#include <assert.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/* shader string buffer */
-struct vrend_strbuf {
-  /* NULL terminated string storage */
-  char *buf;
-  /* allocation size (must be >= strlen(str) + 1) */
-  size_t alloc_size;
-  /* size of string stored without terminating NULL */
-  size_t size;
-  bool error_state;
-};
-
-static inline void strbuf_set_error(struct vrend_strbuf *sb) {
-  sb->error_state = true;
-}
-
-static inline bool strbuf_get_error(struct vrend_strbuf *sb) {
-  return sb->error_state;
-}
-
-static inline size_t strbuf_get_len(struct vrend_strbuf *sb) {
-  return sb->size;
-}
-
-static inline void strbuf_free(struct vrend_strbuf *sb) { free(sb->buf); }
-
-static inline bool strbuf_alloc(struct vrend_strbuf *sb, int initial_size) {
-  sb->buf = malloc(initial_size);
-  if (!sb->buf)
-    return false;
-  sb->alloc_size = initial_size;
-  sb->buf[0] = 0;
-  sb->error_state = false;
-  sb->size = 0;
-  return true;
-}
-
-/* this might need tuning */
-#define STRBUF_MIN_MALLOC 1024
-
-static inline bool strbuf_grow(struct vrend_strbuf *sb, int len) {
-  if (sb->size + len + 1 > sb->alloc_size) {
-    /* Reallocate to the larger size of current alloc + min realloc,
-     * or the resulting string size if larger.
-     */
-    size_t new_size =
-        MAX2(sb->size + len + 1, sb->alloc_size + STRBUF_MIN_MALLOC);
-    char *new = realloc(sb->buf, new_size);
-    if (!new) {
-      strbuf_set_error(sb);
-      return false;
-    }
-    sb->buf = new;
-    sb->alloc_size = new_size;
-  }
-  return true;
-}
-
-static inline void strbuf_append_buffer(struct vrend_strbuf *sb,
-                                        const char *data, size_t len) {
-  assert(!memchr(data, '\0', len));
-  if (strbuf_get_error(sb) || !strbuf_grow(sb, len))
-    return;
-  memcpy(sb->buf + sb->size, data, len);
-  sb->size += len;
-  sb->buf[sb->size] = '\0';
-}
-
-static inline void strbuf_append(struct vrend_strbuf *sb, const char *addstr) {
-  strbuf_append_buffer(sb, addstr, strlen(addstr));
-}
-
-static inline void strbuf_vappendf(struct vrend_strbuf *sb, const char *fmt,
-                                   va_list ap) {
-  va_list cp;
-  va_copy(cp, ap);
-
-  int len = vsnprintf(sb->buf + sb->size, sb->alloc_size - sb->size, fmt, ap);
-  if (len >= (int)(sb->alloc_size - sb->size)) {
-    if (!strbuf_grow(sb, len))
-      return;
-    vsnprintf(sb->buf + sb->size, sb->alloc_size - sb->size, fmt, cp);
-  }
-  sb->size += len;
-}
-
-__attribute__((format(printf, 2, 3))) static inline void
-strbuf_appendf(struct vrend_strbuf *sb, const char *fmt, ...) {
-  va_list va;
-  va_start(va, fmt);
-  strbuf_vappendf(sb, fmt, va);
-  va_end(va);
-}
-
-static inline void strbuf_vfmt(struct vrend_strbuf *sb, const char *fmt,
-                               va_list ap) {
-  va_list cp;
-  va_copy(cp, ap);
-
-  int len = vsnprintf(sb->buf, sb->alloc_size, fmt, ap);
-  if (len >= (int)(sb->alloc_size)) {
-    if (!strbuf_grow(sb, len))
-      return;
-    vsnprintf(sb->buf, sb->alloc_size, fmt, cp);
-  }
-  sb->size = len;
-}
-
-__attribute__((format(printf, 2, 3))) static inline void
-strbuf_fmt(struct vrend_strbuf *sb, const char *fmt, ...) {
-  va_list va;
-  va_start(va, fmt);
-  strbuf_vfmt(sb, fmt, va);
-  va_end(va);
-}
-
-struct vrend_strarray {
-  int num_strings;
-  int num_alloced_strings;
-  struct vrend_strbuf *strings;
-};
-
-static inline bool strarray_alloc(struct vrend_strarray *sa, int init_alloc) {
-  sa->num_strings = 0;
-  sa->num_alloced_strings = init_alloc;
-  sa->strings = calloc(init_alloc, sizeof(struct vrend_strbuf));
-  if (!sa->strings)
-    return false;
-  return true;
-}
-
-static inline bool strarray_addstrbuf(struct vrend_strarray *sa,
-                                      struct vrend_strbuf *sb) {
-  assert(sa->num_strings < sa->num_alloced_strings);
-  if (sa->num_strings >= sa->num_alloced_strings)
-    return false;
-  sa->strings[sa->num_strings] = *sb;
-  sa->num_strings++;
-  return true;
-}
-
-static inline void strarray_free(struct vrend_strarray *sa, bool free_strings) {
-  if (free_strings) {
-    for (int i = 0; i < sa->num_strings; i++)
-      strbuf_free(&sa->strings[i]);
-  }
-  free(sa->strings);
-}
-
-#endif
diff --git a/app/src/main/cpp/virglrenderer/src/vrend_util.h b/app/src/main/cpp/virglrenderer/src/vrend_util.h
deleted file mode 100644
index cdc1772e0..000000000
--- a/app/src/main/cpp/virglrenderer/src/vrend_util.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/**************************************************************************
- *
- * Copyright (C) 2019 Chromium.
- *
- * 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.
- *
- **************************************************************************/
-#ifndef VREND_UTIL_H
-#define VREND_UTIL_H
-
-#include <android/log.h>
-#include <ctype.h>
-#include <jni.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <GLES3/gl3.h>
-#include <GLES3/gl31.h>
-#include <GLES3/gl32.h>
-
-#define BIT(n) (UINT32_C(1) << (n))
-#define printf(...)                                                            \
-  __android_log_print(ANDROID_LOG_DEBUG, "System.out", __VA_ARGS__);
-
-#define GL_TEXTURE_1D 0x0DE0
-#define GL_TEXTURE_RECTANGLE 0x84F5
-#define GL_TEXTURE_1D_ARRAY 0x8C18
-#define GL_QUADS 0x0007
-#define GL_QUAD_STRIP 0x0008
-#define GL_POLYGON 0x0009
-
-static inline bool has_bit(uint32_t mask, uint32_t bit) {
-  return (mask & bit) != 0;
-}
-
-static inline bool is_only_bit(uint32_t mask, uint32_t bit) {
-  return (mask == bit);
-}
-
-static int vrend_gl_version() {
-  const char *version = (const char *)glGetString(GL_VERSION);
-  int major, minor;
-
-  if (!version)
-    return 0;
-
-  while (!isdigit(*version) && *version != '\0')
-    version++;
-
-  sscanf(version, "%i.%i", &major, &minor);
-  return 10 * major + minor;
-}
-
-static bool vrend_has_gl_extension(const char *ext) {
-  int num_extensions;
-  int i;
-
-  glGetIntegerv(GL_NUM_EXTENSIONS, &num_extensions);
-  if (num_extensions == 0)
-    return false;
-
-  for (i = 0; i < num_extensions; i++) {
-    const char *gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i);
-    if (!gl_ext)
-      return false;
-
-    if (strcmp(ext, gl_ext) == 0)
-      return true;
-  }
-
-  return false;
-}
-
-static void vrend_get_glsl_version(int *glsl_version) {
-  int major_local, minor_local;
-  const GLubyte *version_str;
-  int version;
-
-  version_str = glGetString(GL_SHADING_LANGUAGE_VERSION);
-  char tmp[20];
-  sscanf((const char *)version_str, "%s %s %s %s %i.%i", tmp, tmp, tmp, tmp,
-         &major_local, &minor_local);
-
-  version = (major_local * 100) + minor_local;
-  if (glsl_version)
-    *glsl_version = version;
-}
-
-#endif
\ No newline at end of file
diff --git a/app/src/main/cpp/vkbasalt b/app/src/main/cpp/vkbasalt
new file mode 160000
index 000000000..68843cad7
--- /dev/null
+++ b/app/src/main/cpp/vkbasalt
@@ -0,0 +1 @@
+Subproject commit 68843cad7f8b4db6ff9806b353776f6974f95e67
diff --git a/app/src/main/cpp/winlator/alsa_client.c b/app/src/main/cpp/winlator/alsa_client.c
deleted file mode 100644
index 466b5c97d..000000000
--- a/app/src/main/cpp/winlator/alsa_client.c
+++ /dev/null
@@ -1,140 +0,0 @@
-#include <aaudio/AAudio.h>
-#include <jni.h>
-
-#define WAIT_COMPLETION_TIMEOUT 100 * 1000000L
-
-enum Format { U8, S16LE, S16BE, FLOATLE, FLOATBE };
-
-static aaudio_format_t toAAudioFormat(int format) {
-  switch (format) {
-  case FLOATLE:
-  case FLOATBE:
-    return AAUDIO_FORMAT_PCM_FLOAT;
-  case U8:
-    return AAUDIO_FORMAT_UNSPECIFIED;
-  case S16LE:
-  case S16BE:
-  default:
-    return AAUDIO_FORMAT_PCM_I16;
-  }
-}
-
-static AAudioStream *aaudioCreate(int32_t format, int8_t channelCount,
-                                  int32_t sampleRate, int32_t bufferSize) {
-  aaudio_result_t result;
-  AAudioStreamBuilder *builder;
-  AAudioStream *stream;
-
-  result = AAudio_createStreamBuilder(&builder);
-  if (result != AAUDIO_OK)
-    return NULL;
-
-  AAudioStreamBuilder_setPerformanceMode(builder,
-                                         AAUDIO_PERFORMANCE_MODE_LOW_LATENCY);
-  AAudioStreamBuilder_setFormat(builder, toAAudioFormat(format));
-  AAudioStreamBuilder_setChannelCount(builder, channelCount);
-  AAudioStreamBuilder_setSampleRate(builder, sampleRate);
-
-  result = AAudioStreamBuilder_openStream(builder, &stream);
-  if (result != AAUDIO_OK) {
-    AAudioStreamBuilder_delete(builder);
-    return NULL;
-  }
-
-  AAudioStream_setBufferSizeInFrames(stream, bufferSize);
-
-  result = AAudioStreamBuilder_delete(builder);
-  if (result != AAUDIO_OK)
-    return NULL;
-
-  return stream;
-}
-
-static int aaudioWrite(AAudioStream *aaudioStream, void *buffer,
-                       int numFrames) {
-  aaudio_result_t framesWritten = AAudioStream_write(
-      aaudioStream, buffer, numFrames, WAIT_COMPLETION_TIMEOUT);
-  return framesWritten;
-}
-
-static void aaudioStart(AAudioStream *aaudioStream) {
-  AAudioStream_requestStart(aaudioStream);
-  AAudioStream_waitForStateChange(aaudioStream, AAUDIO_STREAM_STATE_STARTING,
-                                  NULL, WAIT_COMPLETION_TIMEOUT);
-}
-
-static void aaudioStop(AAudioStream *aaudioStream) {
-  AAudioStream_requestStop(aaudioStream);
-  AAudioStream_waitForStateChange(aaudioStream, AAUDIO_STREAM_STATE_STOPPING,
-                                  NULL, WAIT_COMPLETION_TIMEOUT);
-}
-
-static void aaudioPause(AAudioStream *aaudioStream) {
-  AAudioStream_requestPause(aaudioStream);
-  AAudioStream_waitForStateChange(aaudioStream, AAUDIO_STREAM_STATE_PAUSING,
-                                  NULL, WAIT_COMPLETION_TIMEOUT);
-}
-
-static void aaudioFlush(AAudioStream *aaudioStream) {
-  AAudioStream_requestFlush(aaudioStream);
-  AAudioStream_waitForStateChange(aaudioStream, AAUDIO_STREAM_STATE_FLUSHING,
-                                  NULL, WAIT_COMPLETION_TIMEOUT);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_create(
-    JNIEnv *env, jobject obj, jint format, jbyte channelCount, jint sampleRate,
-    jint bufferSize) {
-  return (jlong)aaudioCreate(format, channelCount, sampleRate, bufferSize);
-}
-
-JNIEXPORT jint JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_write(
-    JNIEnv *env, jobject obj, jlong streamPtr, jobject buffer, jint numFrames) {
-  AAudioStream *aaudioStream = (AAudioStream *)streamPtr;
-  if (aaudioStream) {
-    return aaudioWrite(aaudioStream,
-                       (*env)->GetDirectBufferAddress(env, buffer), numFrames);
-  } else
-    return -1;
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_start(
-    JNIEnv *env, jobject obj, jlong streamPtr) {
-  AAudioStream *aaudioStream = (AAudioStream *)streamPtr;
-  if (aaudioStream)
-    aaudioStart(aaudioStream);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_stop(
-    JNIEnv *env, jobject obj, jlong streamPtr) {
-  AAudioStream *aaudioStream = (AAudioStream *)streamPtr;
-  if (aaudioStream)
-    aaudioStop(aaudioStream);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_pause(
-    JNIEnv *env, jobject obj, jlong streamPtr) {
-  AAudioStream *aaudioStream = (AAudioStream *)streamPtr;
-  if (aaudioStream)
-    aaudioPause(aaudioStream);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_flush(
-    JNIEnv *env, jobject obj, jlong streamPtr) {
-  AAudioStream *aaudioStream = (AAudioStream *)streamPtr;
-  if (aaudioStream)
-    aaudioFlush(aaudioStream);
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_audio_alsaserver_ALSAClient_close(
-    JNIEnv *env, jobject obj, jlong streamPtr) {
-  AAudioStream *aaudioStream = (AAudioStream *)streamPtr;
-  if (aaudioStream)
-    AAudioStream_close(aaudioStream);
-}
\ No newline at end of file
diff --git a/app/src/main/cpp/winlator/drawable.c b/app/src/main/cpp/winlator/drawable.c
index 6b3821924..dc57fe0c0 100644
--- a/app/src/main/cpp/winlator/drawable.c
+++ b/app/src/main/cpp/winlator/drawable.c
@@ -32,7 +32,7 @@ enum GCFunction {
 };
 
 static int packColor(int8_t r, int8_t g, int8_t b) {
-  return ((r & 0xff00) << 8) | (g & 0xff00) | (b >> 8);
+  return ((uint32_t)(uint8_t)r << 16) | ((uint32_t)(uint8_t)g << 8) | (uint8_t)b;
 }
 
 static void unpackColor(int color, uint8_t *rgba) {
diff --git a/app/src/main/cpp/winlator/evshim.c b/app/src/main/cpp/winlator/evshim.c
deleted file mode 100644
index 19a4c2600..000000000
--- a/app/src/main/cpp/winlator/evshim.c
+++ /dev/null
@@ -1,588 +0,0 @@
-/* evshim.c - Multi-Controller & Dynamic SDL Virtual Joystick Shim
- * Creates virtual SDL joysticks backed by shared memory for Wine controller
- * support
- *
- * Optimizations:
- * - Memory-mapped I/O (mmap) instead of read/write syscalls
- * - Single unified polling thread for all controllers
- * - Adaptive polling: fast (0.5ms) during activity, slow (4ms) when idle
- * - Delta-only updates per axis/button to minimize SDL calls
- * - Lock-free design using memory barriers
- */
-
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <sched.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <unistd.h>
-/* SDL2 types - minimal forward declarations */
-typedef struct SDL_Joystick SDL_Joystick;
-typedef struct {
-  int major, minor, patch;
-} SDL_version;
-typedef struct SDL_VirtualJoystickDesc {
-  uint16_t version;
-  uint16_t type;
-  uint16_t naxes;
-  uint16_t nbuttons;
-  uint16_t nhats;
-  uint16_t vendor_id;
-  uint16_t product_id;
-  uint16_t padding;
-  uint32_t button_mask;
-  uint32_t axis_mask;
-  const char *name;
-  void *userdata;
-  void (*Update)(void *);
-  void (*SetPlayerIndex)(void *, int);
-  int (*Rumble)(void *, uint16_t, uint16_t);
-  int (*RumbleTriggers)(void *, uint16_t, uint16_t);
-  int (*SetLED)(void *, uint8_t, uint8_t, uint8_t);
-  int (*SendEffect)(void *, const void *, int);
-} SDL_VirtualJoystickDesc;
-
-#define SDL_VIRTUAL_JOYSTICK_DESC_VERSION 1
-#define SDL_JOYSTICK_TYPE_GAMECONTROLLER 1
-#define SDL_INIT_JOYSTICK 0x00000200
-
-static int g_debug_enabled = 0;
-static int g_spinwait_enabled = 0;
-#define LOGI(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
-#define LOGE(...) dprintf(STDERR_FILENO, __VA_ARGS__)
-#define LOGD(...)                                                              \
-  do {                                                                         \
-    if (g_debug_enabled)                                                       \
-      dprintf(STDOUT_FILENO, __VA_ARGS__);                                     \
-  } while (0)
-
-#define MAX_GAMEPADS 4
-#define GAMEPAD_MEM_SIZE 64
-
-#define GAMEPAD_VENDOR_ID 0x1234
-#define GAMEPAD_PRODUCT_ID 0x5678
-#define GAMEPAD_NAME "Generic HID Gamepad"
-
-/* Adaptive polling intervals */
-#define POLL_FAST_NS 500000L  /* 0.5ms = 2000Hz during active input */
-#define POLL_SLOW_NS 4000000L /* 4ms = 250Hz during idle */
-#define IDLE_THRESHOLD 50     /* ~25ms of no activity before slowing down */
-
-#define AXIS_DEADZONE 256 /* ~0.8% deadzone to filter stick noise */
-
-/* Shared memory layout - must match Android side exactly */
-struct gamepad_io {
-  int16_t lx, ly, rx, ry, lt, rt; /* 12 bytes: axes */
-  uint8_t btn[15];                /* 15 bytes: buttons */
-  uint8_t hat;                    /* 1 byte: hat/dpad */
-  uint8_t _padding[4];            /* 4 bytes: alignment */
-  uint16_t low_freq_rumble;       /* 2 bytes: rumble out */
-  uint16_t high_freq_rumble;      /* 2 bytes: rumble out */
-}; /* Total: 36 bytes */
-
-/* Per-controller state */
-struct controller_state {
-  SDL_Joystick *js;
-  volatile struct gamepad_io *mem; /* mmap'd shared memory */
-  int mem_fd;
-  int16_t last_axes[6];
-  uint8_t last_btns[15];
-  uint8_t last_hat;
-  int active;
-};
-
-static int vjoy_ids[MAX_GAMEPADS] = {-1, -1, -1, -1};
-static struct controller_state ctrl[MAX_GAMEPADS] = {0};
-static int g_num_players = 0;
-static void *handle = NULL;
-
-/* SDL function pointers */
-static int (*p_SDL_Init)(uint32_t);
-static const char *(*p_SDL_GetError)(void);
-static SDL_Joystick *(*p_SDL_JoystickOpen)(int);
-static int (*p_SDL_JoystickAttachVirtualEx)(const SDL_VirtualJoystickDesc *);
-static int (*p_SDL_JoystickSetVirtualAxis)(SDL_Joystick *, int, int16_t);
-static int (*p_SDL_JoystickSetVirtualButton)(SDL_Joystick *, int, uint8_t);
-static int (*p_SDL_JoystickSetVirtualHat)(SDL_Joystick *, int, uint8_t);
-static void (*p_SDL_PumpEvents)(void);
-static void (*p_SDL_Delay)(uint32_t);
-static void (*p_SDL_GetVersion)(SDL_version *);
-
-#define GETFUNCPTR(name)                                                       \
-  do {                                                                         \
-    if (!(p_##name = (typeof(p_##name))dlsym(handle, #name)))                  \
-      LOGE("Failed to load SDL: %s\n", #name);                                 \
-  } while (0)
-
-/* Portable atomic operations - use builtins if available, else volatile */
-#if defined(__GNUC__) || defined(__clang__)
-#define ATOMIC_LOAD(ptr) __atomic_load_n(ptr, __ATOMIC_ACQUIRE)
-#define ATOMIC_STORE(ptr, val) __atomic_store_n(ptr, val, __ATOMIC_RELEASE)
-#else
-/* Fallback for non-GCC/Clang: volatile access + compiler barrier */
-#define ATOMIC_LOAD(ptr) (*(volatile typeof(*(ptr)) *)(ptr))
-#define ATOMIC_STORE(ptr, val)                                                 \
-  do {                                                                         \
-    *(volatile typeof(*(ptr)) *)(ptr) = (val);                                 \
-    __asm__ __volatile__("" ::: "memory");                                     \
-  } while (0)
-#endif
-
-/* Inline deadzone filter */
-static inline int16_t apply_deadzone(int16_t val) {
-  int16_t abs_val = val < 0 ? -val : val;
-  return abs_val < AXIS_DEADZONE ? 0 : val;
-}
-
-/* Rumble callback - writes directly to memory-mapped region */
-static int OnRumble(void *userdata, uint16_t low, uint16_t high) {
-  int idx = (int)(intptr_t)userdata;
-  if (idx < 0 || idx >= MAX_GAMEPADS || !ctrl[idx].mem)
-    return -1;
-
-  /* Direct memory write with release semantics for visibility */
-  volatile struct gamepad_io *mem = ctrl[idx].mem;
-  ATOMIC_STORE(&mem->low_freq_rumble, low);
-  ATOMIC_STORE(&mem->high_freq_rumble, high);
-  return 0;
-}
-
-/* Unified polling thread - handles all controllers in one tight loop */
-static void *unified_updater(void *arg) {
-  (void)arg;
-  struct timespec fast_sleep = {0, POLL_FAST_NS};
-  struct timespec slow_sleep = {0, POLL_SLOW_NS};
-  int idle_count = 0;
-
-  /* Open all SDL joysticks upfront */
-  for (int i = 0; i < g_num_players; i++) {
-    if (vjoy_ids[i] < 0 || !ctrl[i].mem)
-      continue;
-    ctrl[i].js = p_SDL_JoystickOpen(vjoy_ids[i]);
-    if (!ctrl[i].js) {
-      LOGE("P%d: SDL_JoystickOpen failed\n", i);
-      continue;
-    }
-    ctrl[i].active = 1;
-    LOGI("VJOY P%d active\n", i);
-  }
-
-  LOGI("VJOY adaptive updater (fast=%ldus, slow=%ldus) PID %d\n",
-       POLL_FAST_NS / 1000, POLL_SLOW_NS / 1000, getpid());
-
-  for (;;) {
-    int had_updates = 0;
-
-    /* Process all controllers in a single pass */
-    for (int i = 0; i < g_num_players; i++) {
-      if (!ctrl[i].active)
-        continue;
-
-      volatile struct gamepad_io *mem = ctrl[i].mem;
-      SDL_Joystick *js = ctrl[i].js;
-
-      /* Read axes with atomic acquire + deadzone filtering */
-      int16_t axes[6];
-      axes[0] = apply_deadzone(ATOMIC_LOAD(&mem->lx));
-      axes[1] = apply_deadzone(ATOMIC_LOAD(&mem->ly));
-      axes[2] = apply_deadzone(ATOMIC_LOAD(&mem->rx));
-      axes[3] = apply_deadzone(ATOMIC_LOAD(&mem->ry));
-      axes[4] = ATOMIC_LOAD(&mem->lt); /* No deadzone for triggers */
-      axes[5] = ATOMIC_LOAD(&mem->rt);
-
-      /* Delta update axes - only call SDL when value changes */
-      for (int a = 0; a < 6; a++) {
-        if (axes[a] != ctrl[i].last_axes[a]) {
-          p_SDL_JoystickSetVirtualAxis(js, a, axes[a]);
-          ctrl[i].last_axes[a] = axes[a];
-          had_updates = 1;
-        }
-      }
-
-      /* Delta update buttons */
-      for (int b = 0; b < 15; b++) {
-        uint8_t btn = ATOMIC_LOAD(&mem->btn[b]);
-        if (btn != ctrl[i].last_btns[b]) {
-          p_SDL_JoystickSetVirtualButton(js, b, btn);
-          ctrl[i].last_btns[b] = btn;
-          had_updates = 1;
-        }
-      }
-
-      /* Delta update hat */
-      uint8_t hat = ATOMIC_LOAD(&mem->hat);
-      if (hat != ctrl[i].last_hat) {
-        p_SDL_JoystickSetVirtualHat(js, 0, hat);
-        ctrl[i].last_hat = hat;
-        had_updates = 1;
-      }
-    }
-
-    /* Adaptive timing based on activity */
-    if (had_updates) {
-      idle_count = 0;
-      if (g_spinwait_enabled) {
-        sched_yield(); /* Ultra-low latency: just yield CPU briefly */
-      } else {
-        nanosleep(&fast_sleep, NULL); /* 0.5ms during active input */
-      }
-    } else {
-      idle_count++;
-      if (idle_count > IDLE_THRESHOLD) {
-        nanosleep(&slow_sleep, NULL); /* 4ms when idle - saves CPU */
-      } else {
-        nanosleep(&fast_sleep, NULL); /* Stay fast briefly after activity */
-      }
-    }
-  }
-  return NULL;
-}
-
-/* Watchdog wrapper - respawns updater thread if it dies unexpectedly */
-static void *watchdog_thread(void *arg) {
-  (void)arg;
-  struct timespec check_interval = {1, 0}; /* Check every 1 second */
-
-  while (1) {
-    pthread_t tid;
-    int result = pthread_create(&tid, NULL, unified_updater, NULL);
-    if (result != 0) {
-      LOGE("Failed to create updater thread: %d\n", result);
-      nanosleep(&check_interval, NULL);
-      continue;
-    }
-
-    /* Wait for the thread to exit (it shouldn't under normal conditions) */
-    void *retval;
-    pthread_join(tid, &retval);
-
-    /* If we get here, the thread exited unexpectedly - respawn it */
-    LOGE("Updater thread exited unexpectedly, respawning in 1s...\n");
-    nanosleep(&check_interval, NULL);
-  }
-  return NULL;
-}
-
-/* Hot-plug detection - checks for newly connected controllers */
-static char g_data_path[256] = {0};
-
-static char *make_virtual_pad_name(void) { return strdup(GAMEPAD_NAME); }
-
-static void try_attach_controller(int idx) {
-  if (ctrl[idx].active || !handle)
-    return; /* Already active or SDL not loaded */
-
-  char path[300];
-  snprintf(path, sizeof path, "%s/gamepad%s.mem", g_data_path,
-           (idx == 0) ? "" : (char[2]){'0' + idx, '\0'});
-
-  /* Check if memory file exists now */
-  if (access(path, F_OK) != 0)
-    return;
-
-  /* Try to open and map */
-  int fd = open(path, O_RDWR);
-  if (fd < 0)
-    return;
-
-  void *mem =
-      mmap(NULL, GAMEPAD_MEM_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-  if (mem == MAP_FAILED) {
-    close(fd);
-    return;
-  }
-
-  /* Create virtual joystick */
-  SDL_VirtualJoystickDesc d = {0};
-  d.version = SDL_VIRTUAL_JOYSTICK_DESC_VERSION;
-  d.type = SDL_JOYSTICK_TYPE_GAMECONTROLLER;
-  d.naxes = 6;
-  d.nbuttons = 15;
-  d.nhats = 1;
-  d.vendor_id = GAMEPAD_VENDOR_ID;
-  d.product_id = GAMEPAD_PRODUCT_ID;
-  d.Rumble = &OnRumble;
-  d.userdata = (void *)(intptr_t)idx;
-  d.name = make_virtual_pad_name();
-
-  int vjoy_id = p_SDL_JoystickAttachVirtualEx(&d);
-  if (vjoy_id < 0) {
-    munmap(mem, GAMEPAD_MEM_SIZE);
-    close(fd);
-    return;
-  }
-
-  /* Open the SDL joystick */
-  SDL_Joystick *js = p_SDL_JoystickOpen(vjoy_id);
-  if (!js) {
-    munmap(mem, GAMEPAD_MEM_SIZE);
-    close(fd);
-    return;
-  }
-
-  /* Success - store everything */
-  ctrl[idx].mem_fd = fd;
-  ctrl[idx].mem = (volatile struct gamepad_io *)mem;
-  ctrl[idx].js = js;
-  vjoy_ids[idx] = vjoy_id;
-  ctrl[idx].active = 1;
-
-  /* Update player count if needed */
-  if (idx >= g_num_players)
-    g_num_players = idx + 1;
-
-  LOGI("HOTPLUG: P%d connected dynamically\n", idx + 1);
-}
-
-static void *hotplug_thread(void *arg) {
-  (void)arg;
-  struct timespec interval = {2, 0}; /* Check every 2 seconds */
-
-  LOGI("EVSHIM hotplug detection started\n");
-
-  while (1) {
-    nanosleep(&interval, NULL);
-
-    /* Check for any inactive slots that might have new files */
-    for (int i = 0; i < MAX_GAMEPADS; i++) {
-      if (!ctrl[i].active) {
-        try_attach_controller(i);
-      }
-    }
-  }
-  return NULL;
-}
-
-__attribute__((constructor)) static void initialize_all_pads(void) {
-  const char *dbg = getenv("EVSHIM_DEBUG");
-  g_debug_enabled = dbg && strchr("1yY", *dbg);
-
-  const char *spinwait = getenv("EVSHIM_SPINWAIT");
-  g_spinwait_enabled = spinwait && strchr("1yY", *spinwait);
-
-  LOGI("EVSHIM initializing (spinwait=%d)...\n", g_spinwait_enabled);
-
-  handle = dlopen("libSDL2-2.0.so.0", RTLD_LAZY | RTLD_GLOBAL);
-  if (!handle) {
-    LOGE("dlopen SDL failed: %s\n", dlerror());
-    return;
-  }
-
-  GETFUNCPTR(SDL_Init);
-  GETFUNCPTR(SDL_GetError);
-  GETFUNCPTR(SDL_JoystickOpen);
-  GETFUNCPTR(SDL_JoystickAttachVirtualEx);
-  GETFUNCPTR(SDL_JoystickSetVirtualAxis);
-  GETFUNCPTR(SDL_JoystickSetVirtualButton);
-  GETFUNCPTR(SDL_JoystickSetVirtualHat);
-  GETFUNCPTR(SDL_PumpEvents);
-  GETFUNCPTR(SDL_Delay);
-  GETFUNCPTR(SDL_GetVersion);
-
-  p_SDL_Init(SDL_INIT_JOYSTICK);
-
-  SDL_version v;
-  p_SDL_GetVersion(&v);
-  LOGI("SDL %d.%d.%d bound\n", v.major, v.minor, v.patch);
-
-  g_num_players =
-      getenv("EVSHIM_MAX_PLAYERS") ? atoi(getenv("EVSHIM_MAX_PLAYERS")) : 1;
-  if (g_num_players > MAX_GAMEPADS)
-    g_num_players = MAX_GAMEPADS;
-
-  const char *data_path = getenv("EVSHIM_DATA_PATH");
-  if (!data_path)
-    data_path = "/data/data/com.winlator.cmod/files/imagefs/tmp";
-
-  /* Store path globally for hotplug detection */
-  strncpy(g_data_path, data_path, sizeof(g_data_path) - 1);
-
-  int attached = 0;
-  for (int i = 0; i < g_num_players; ++i) {
-    char path[256];
-    snprintf(path, sizeof path, "%s/gamepad%s.mem", data_path,
-             (i == 0) ? "" : (char[2]){'0' + i, '\0'});
-
-    /* Open for read+write (needed for mmap and rumble writeback) */
-    ctrl[i].mem_fd = open(path, O_RDWR);
-    if (ctrl[i].mem_fd < 0) {
-      LOGE("P%d: open '%s' failed: %s\n", i, path, strerror(errno));
-      continue;
-    }
-
-    /* Memory-map for zero-copy access - eliminates read() syscall overhead */
-    void *mem = mmap(NULL, GAMEPAD_MEM_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
-                     ctrl[i].mem_fd, 0);
-    if (mem == MAP_FAILED) {
-      LOGE("P%d: mmap failed: %s\n", i, strerror(errno));
-      close(ctrl[i].mem_fd);
-      ctrl[i].mem_fd = -1;
-      continue;
-    }
-    ctrl[i].mem = (volatile struct gamepad_io *)mem;
-
-    /* Create virtual joystick */
-    SDL_VirtualJoystickDesc d = {0};
-    d.version = SDL_VIRTUAL_JOYSTICK_DESC_VERSION;
-    d.type = SDL_JOYSTICK_TYPE_GAMECONTROLLER;
-    d.naxes = 6;
-    d.nbuttons = 15;
-    d.nhats = 1;
-    d.vendor_id = GAMEPAD_VENDOR_ID;
-    d.product_id = GAMEPAD_PRODUCT_ID;
-    d.Rumble = &OnRumble;
-    d.userdata = (void *)(intptr_t)i;
-    d.name = make_virtual_pad_name();
-
-    vjoy_ids[i] = p_SDL_JoystickAttachVirtualEx(&d);
-    if (vjoy_ids[i] < 0) {
-      LOGE("P%d: SDL attach failed\n", i);
-      munmap((void *)ctrl[i].mem, GAMEPAD_MEM_SIZE);
-      ctrl[i].mem = NULL;
-      continue;
-    }
-    attached++;
-  }
-
-  /* Start watchdog thread (which manages the updater thread with respawn) */
-  if (attached > 0) {
-    pthread_t watchdog_tid;
-    pthread_create(&watchdog_tid, NULL, watchdog_thread, NULL);
-    pthread_detach(watchdog_tid);
-    LOGI("EVSHIM: %d controller(s) ready\n", attached);
-  }
-
-  /* Start hotplug detection thread for controllers connected later */
-  pthread_t hotplug_tid;
-  pthread_create(&hotplug_tid, NULL, hotplug_thread, NULL);
-  pthread_detach(hotplug_tid);
-}
-
-/* Intercept open() to hide /dev/input/event* and prevent conflicts */
-static inline int is_event_node(const char *p) {
-  return p && !strncmp(p, "/dev/input/event", 16);
-}
-
-typedef int (*open_f)(const char *, int, ...);
-static open_f real_open;
-
-int open(const char *path, int flags, ...)
-    __attribute__((visibility("default")));
-int open(const char *path, int flags, ...) {
-  if (is_event_node(path)) {
-    errno = ENOENT;
-    return -1;
-  }
-  if (!real_open)
-    real_open = (open_f)dlsym(RTLD_NEXT, "open");
-  va_list ap;
-  va_start(ap, flags);
-  mode_t mode = (flags & O_CREAT) ? va_arg(ap, mode_t) : 0;
-  va_end(ap);
-  return real_open(path, flags, mode);
-}
-
-/* Android 11+ FUSE NOEXEC bypass for Wine */
-#include <sys/statvfs.h>
-#include <sys/vfs.h>
-
-#ifndef ST_NOEXEC
-#define ST_NOEXEC 8
-#endif
-
-/* Cached function pointers - resolved once on first call */
-static int (*real_statfs)(const char *, struct statfs *);
-static int (*real_statfs64)(const char *, struct statfs64 *);
-static int (*real_statvfs)(const char *, struct statvfs *);
-static int (*real_statvfs64)(const char *, struct statvfs64 *);
-static int (*real_fstatfs)(int, struct statfs *);
-static int (*real_fstatfs64)(int, struct statfs64 *);
-static int (*real_fstatvfs)(int, struct statvfs *);
-static int (*real_fstatvfs64)(int, struct statvfs64 *);
-
-__attribute__((visibility("default"))) int statfs(const char *path,
-                                                  struct statfs *buf) {
-  if (!real_statfs)
-    real_statfs = dlsym(RTLD_NEXT, "statfs");
-  int res = real_statfs(path, buf);
-  if (res == 0)
-    buf->f_type = 0xEF53;
-  return res;
-}
-
-__attribute__((visibility("default"))) int statfs64(const char *path,
-                                                    struct statfs64 *buf) {
-  if (!real_statfs64)
-    real_statfs64 = dlsym(RTLD_NEXT, "statfs64");
-  int res = real_statfs64(path, buf);
-  if (res == 0)
-    buf->f_type = 0xEF53;
-  return res;
-}
-
-__attribute__((visibility("default"))) int statvfs(const char *path,
-                                                   struct statvfs *buf) {
-  if (!real_statvfs)
-    real_statvfs = dlsym(RTLD_NEXT, "statvfs");
-  int res = real_statvfs(path, buf);
-  if (res == 0)
-    buf->f_flag &= ~ST_NOEXEC;
-  return res;
-}
-
-__attribute__((visibility("default"))) int statvfs64(const char *path,
-                                                     struct statvfs64 *buf) {
-  if (!real_statvfs64)
-    real_statvfs64 = dlsym(RTLD_NEXT, "statvfs64");
-  int res = real_statvfs64(path, buf);
-  if (res == 0)
-    buf->f_flag &= ~ST_NOEXEC;
-  return res;
-}
-
-__attribute__((visibility("default"))) int fstatfs(int fd, struct statfs *buf) {
-  if (!real_fstatfs)
-    real_fstatfs = dlsym(RTLD_NEXT, "fstatfs");
-  int res = real_fstatfs(fd, buf);
-  if (res == 0)
-    buf->f_type = 0xEF53;
-  return res;
-}
-
-__attribute__((visibility("default"))) int fstatfs64(int fd,
-                                                     struct statfs64 *buf) {
-  if (!real_fstatfs64)
-    real_fstatfs64 = dlsym(RTLD_NEXT, "fstatfs64");
-  int res = real_fstatfs64(fd, buf);
-  if (res == 0)
-    buf->f_type = 0xEF53;
-  return res;
-}
-
-__attribute__((visibility("default"))) int fstatvfs(int fd,
-                                                    struct statvfs *buf) {
-  if (!real_fstatvfs)
-    real_fstatvfs = dlsym(RTLD_NEXT, "fstatvfs");
-  int res = real_fstatvfs(fd, buf);
-  if (res == 0)
-    buf->f_flag &= ~ST_NOEXEC;
-  return res;
-}
-
-__attribute__((visibility("default"))) int fstatvfs64(int fd,
-                                                      struct statvfs64 *buf) {
-  if (!real_fstatvfs64)
-    real_fstatvfs64 = dlsym(RTLD_NEXT, "fstatvfs64");
-  int res = real_fstatvfs64(fd, buf);
-  if (res == 0)
-    buf->f_flag &= ~ST_NOEXEC;
-  return res;
-}
diff --git a/app/src/main/cpp/winlator/fakeinput.cpp b/app/src/main/cpp/winlator/fakeinput.cpp
index c92cc7068..855d5c76e 100644
--- a/app/src/main/cpp/winlator/fakeinput.cpp
+++ b/app/src/main/cpp/winlator/fakeinput.cpp
@@ -47,21 +47,28 @@ static constexpr const char *GAMEPAD_UNIQ_TEMPLATE = "0000000000%02d";
 static constexpr uint8_t GAMEPAD_AXIS_COUNT = 8;
 static constexpr uint8_t GAMEPAD_BUTTON_COUNT = 11;
 static constexpr uint32_t FAKE_INPUT_RING_MAGIC = 0x46494252;
-static constexpr uint32_t FAKE_INPUT_RING_VERSION = 1;
+static constexpr uint32_t FAKE_INPUT_RING_VERSION = 2;
 static constexpr uint32_t FAKE_INPUT_EVENT_SIZE = sizeof(struct input_event);
-static constexpr uint32_t FAKE_INPUT_RING_CAPACITY = 512;
+static constexpr uint32_t FAKE_INPUT_RING_CAPACITY = 4096;
 static constexpr unsigned int FAKE_INPUT_MAJOR = 13;
 static constexpr unsigned int FAKE_INPUT_EVENT_MINOR_BASE = 64;
 static constexpr unsigned int FAKE_INPUT_JS_MINOR_BASE = 0;
 
 struct FakeInputRingHeader {
-  uint32_t magic;
-  uint32_t version;
-  uint32_t event_size;
-  uint32_t capacity;
-  uint64_t write_seq;
-  uint64_t generation;
-  uint8_t reserved[32];
+  uint32_t magic;             // 0
+  uint32_t version;           // 4
+  uint32_t event_size;        // 8
+  uint32_t capacity;          // 12
+  uint64_t write_seq;         // 16
+  uint64_t generation;        // 24
+  // Authoritative absolute-state snapshot, published by the writer under a
+  // seqlock (odd snapshot_seq = write in progress). The reader replays it as a
+  // full keyframe whenever the delta stream could have desynced (open, ring
+  // overflow) so dropped events can recover without periodic duplicate input.
+  uint64_t snapshot_seq;      // 32
+  uint32_t snapshot_buttons;  // 40  bit i -> kSnapshotButtons[i] pressed
+  int16_t snapshot_axes[8];   // 44  values in kSnapshotAxisCodes order
+  uint8_t reserved[4];        // 60
 };
 
 static_assert(sizeof(FakeInputRingHeader) == 64,
@@ -80,8 +87,44 @@ struct FakeController {
   uint64_t read_seq = 0;
   uint64_t generation = 0;
   size_t mapping_size = 0;
+  // Pending keyframe (full absolute-state baseline) currently streaming to the
+  // guest. The axis/button values are captured from the snapshot when the
+  // keyframe starts so the frame stays consistent across multi-read delivery.
+  size_t keyframe_remaining = 0;
+  int32_t keyframe_axes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+  uint32_t keyframe_buttons = 0;
 };
 
+struct NeutralEventSpec {
+  uint16_t type;
+  uint16_t code;
+};
+
+// Event template for a full keyframe: every button, every axis/hat, then a
+// SYN_REPORT, in this fixed order. The value carried by each event is filled
+// from the authoritative snapshot (see keyframe_value); an all-zero snapshot
+// yields the neutral baseline. Replayed on open and ring overflow so dropped
+// events cannot leave a guest stuck.
+static const NeutralEventSpec kNeutralEvents[] = {
+    {EV_KEY, BTN_A},      {EV_KEY, BTN_B},      {EV_KEY, BTN_X},
+    {EV_KEY, BTN_Y},      {EV_KEY, BTN_TL},     {EV_KEY, BTN_TR},
+    {EV_KEY, BTN_SELECT}, {EV_KEY, BTN_START},  {EV_KEY, BTN_MODE},
+    {EV_KEY, BTN_THUMBL}, {EV_KEY, BTN_THUMBR}, {EV_ABS, ABS_X},
+    {EV_ABS, ABS_Y},      {EV_ABS, ABS_RX},     {EV_ABS, ABS_RY},
+    {EV_ABS, ABS_GAS},    {EV_ABS, ABS_BRAKE},  {EV_ABS, ABS_HAT0X},
+    {EV_ABS, ABS_HAT0Y},  {EV_SYN, SYN_REPORT},
+};
+static constexpr size_t kNeutralEventCount =
+    sizeof(kNeutralEvents) / sizeof(kNeutralEvents[0]);
+
+// Axis layout of FakeInputRingHeader::snapshot_axes (mirrors the Java writer).
+static const uint16_t kSnapshotAxisCodes[8] = {
+    ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_GAS, ABS_BRAKE, ABS_HAT0X, ABS_HAT0Y};
+// Bit i of FakeInputRingHeader::snapshot_buttons maps to this button code.
+static const uint16_t kSnapshotButtons[10] = {
+    BTN_A,  BTN_B,      BTN_X,     BTN_Y,      BTN_TL,
+    BTN_TR, BTN_SELECT, BTN_START, BTN_THUMBL, BTN_THUMBR};
+
 static std::unordered_map<int, FakeController> controller_map;
 static std::unordered_map<int, std::string> ring_paths;
 static bool ring_paths_loaded = false;
@@ -329,6 +372,80 @@ ring_header_is_valid(const FakeInputRingHeader *ring) {
          ring->capacity == FAKE_INPUT_RING_CAPACITY;
 }
 
+struct SnapshotState {
+  uint32_t buttons = 0;
+  int32_t axes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+};
+
+static long long monotonic_ms();
+
+// Read the authoritative absolute-state snapshot using the writer's seqlock.
+// Retries on a torn read (snapshot_seq odd or changed mid-read); after a few
+// failed attempts returns the neutral baseline rather than spinning. This
+// mirrors the publication model already used for write_seq.
+__attribute__((visibility("hidden"))) static SnapshotState
+read_snapshot(const FakeInputRingHeader *ring) {
+  SnapshotState out;
+  for (int attempt = 0; attempt < 8; attempt++) {
+    uint64_t s1 = __atomic_load_n(&ring->snapshot_seq, __ATOMIC_ACQUIRE);
+    if (s1 & 1ULL)
+      continue; // a write is in progress
+    uint32_t buttons = ring->snapshot_buttons;
+    int16_t axes[8];
+    for (int i = 0; i < 8; i++)
+      axes[i] = ring->snapshot_axes[i];
+    __atomic_thread_fence(__ATOMIC_ACQUIRE);
+    uint64_t s2 = __atomic_load_n(&ring->snapshot_seq, __ATOMIC_RELAXED);
+    if (s1 == s2) {
+      out.buttons = buttons;
+      for (int i = 0; i < 8; i++)
+        out.axes[i] = axes[i]; // sign-extend to int32 for the event value
+      return out;
+    }
+  }
+  return out;
+}
+
+// Capture the current absolute state into the controller so it can be streamed
+// as a keyframe independently of the ring. Idempotent w.r.t. an in-flight
+// keyframe: callers guard on keyframe_remaining == 0 so a partially delivered
+// frame is never restarted mid-stream.
+__attribute__((visibility("hidden"))) static void
+capture_keyframe(FakeController &fake, const char *reason, int fd) {
+  SnapshotState snap = read_snapshot(fake.ring);
+  fake.keyframe_buttons = snap.buttons;
+  for (int i = 0; i < 8; i++)
+    fake.keyframe_axes[i] = snap.axes[i];
+  fake.keyframe_remaining = kNeutralEventCount;
+  Logger::log("Fake input keyframe reason=%s fd=%d slot=%d read_seq=%llu "
+              "write_seq=%llu buttons=0x%03x axes=[%d,%d,%d,%d,%d,%d,%d,%d]\n",
+              reason ? reason : "unknown", fd, fake.slot,
+              static_cast<unsigned long long>(fake.read_seq),
+              static_cast<unsigned long long>(ring_write_seq(fake.ring)),
+              fake.keyframe_buttons, fake.keyframe_axes[0],
+              fake.keyframe_axes[1], fake.keyframe_axes[2],
+              fake.keyframe_axes[3], fake.keyframe_axes[4],
+              fake.keyframe_axes[5], fake.keyframe_axes[6],
+              fake.keyframe_axes[7]);
+}
+
+// Resolve the value a keyframe event should carry from the captured snapshot.
+__attribute__((visibility("hidden"))) static int32_t
+keyframe_value(const FakeController &fake, uint16_t type, uint16_t code) {
+  if (type == EV_KEY) {
+    for (int i = 0; i < 10; i++)
+      if (kSnapshotButtons[i] == code)
+        return (fake.keyframe_buttons >> i) & 1u;
+    return 0; // e.g. BTN_MODE, which the writer never presses
+  }
+  if (type == EV_ABS) {
+    for (int i = 0; i < 8; i++)
+      if (kSnapshotAxisCodes[i] == code)
+        return fake.keyframe_axes[i];
+  }
+  return 0; // SYN / unknown
+}
+
 __attribute__((visibility("hidden"))) static int
 open_fake_input_ring(const char *event, int flags) {
   int slot = get_event_number(event);
@@ -370,6 +487,9 @@ open_fake_input_ring(const char *event, int flags) {
   controller.mapping_size = FAKE_INPUT_RING_SIZE;
   controller.read_seq = ring_write_seq(ring);
   controller.generation = ring_generation(ring);
+  // Emit the current absolute state as the first frame so a guest that opens
+  // mid-hold (or reopens after a slot hand-off) starts already in sync.
+  capture_keyframe(controller, "open", fd);
   controller_map[fd] = controller;
 
   Logger::log("Adding ring-backed controller, fd %d event %s slot %d\n", fd,
@@ -408,9 +528,15 @@ fake_fd_has_unread_data(int fd) {
   uint64_t write_seq = ring_write_seq(fake.ring);
   if (write_seq < fake.read_seq)
     fake.read_seq = write_seq;
-  if (write_seq - fake.read_seq > FAKE_INPUT_RING_CAPACITY)
+  if (write_seq - fake.read_seq > FAKE_INPUT_RING_CAPACITY) {
     fake.read_seq = write_seq - FAKE_INPUT_RING_CAPACITY;
-  return write_seq > fake.read_seq;
+    if (fake.keyframe_remaining == 0) {
+      capture_keyframe(fake, "overflow", fd);
+    }
+  }
+  // A pending keyframe counts as readable so poll/blocking reads wake to finish
+  // flushing it even after the ring itself has drained.
+  return fake.keyframe_remaining > 0 || write_seq > fake.read_seq;
 }
 
 __attribute__((visibility("hidden"))) static long long
@@ -925,6 +1051,7 @@ EXPORT ssize_t read(int fd, void *buf, size_t count) {
       return -1;
     }
 
+    long backoff_ns = 1000 * 1000; // 1ms initial
     while (!fake_fd_has_unread_data(fd)) {
       if (fake_fd_is_stale(fd)) {
         errno = ENODEV;
@@ -939,20 +1066,60 @@ EXPORT ssize_t read(int fd, void *buf, size_t count) {
         errno = EINTR;
         return -1;
       }
-      struct timespec sleep_time = {0, 5 * 1000 * 1000};
+      struct timespec sleep_time = {0, backoff_ns};
       nanosleep(&sleep_time, nullptr);
+      if (backoff_ns < 16 * 1000 * 1000)
+        backoff_ns *= 2;
     }
 
     uint64_t write_seq = ring_write_seq(fake.ring);
-    if (write_seq - fake.read_seq > FAKE_INPUT_RING_CAPACITY)
+    if (write_seq - fake.read_seq > FAKE_INPUT_RING_CAPACITY) {
       fake.read_seq = write_seq - FAKE_INPUT_RING_CAPACITY;
+      if (fake.keyframe_remaining == 0) {
+        capture_keyframe(fake, "overflow", fd);
+      }
+    }
+
+    uint8_t *out = static_cast<uint8_t *>(buf);
+    size_t out_events = 0;
+    size_t requested_events = count / FAKE_INPUT_EVENT_SIZE;
+
+    // A keyframe is pending (open / ring overflow). Replay the full
+    // absolute baseline — every button and axis at its snapshot value — before
+    // any surviving delta events, so a lost button-up / axis-return can't stick.
+    // The frame streams across reads of any size: we emit as much as fits and do
+    // NOT consume the ring until it is fully delivered, so even a
+    // one-event-at-a-time consumer recovers. keyframe_remaining keeps the fd
+    // readable (see fake_fd_has_unread_data) so poll wakes us to finish it.
+    if (fake.keyframe_remaining > 0) {
+      struct timeval now = {};
+      gettimeofday(&now, nullptr);
+      while (fake.keyframe_remaining > 0 && out_events < requested_events) {
+        size_t idx = kNeutralEventCount - fake.keyframe_remaining;
+        struct input_event ev;
+        memset(&ev, 0, sizeof(ev));
+        ev.time = now;
+        ev.type = kNeutralEvents[idx].type;
+        ev.code = kNeutralEvents[idx].code;
+        ev.value = keyframe_value(fake, kNeutralEvents[idx].type,
+                                  kNeutralEvents[idx].code);
+        memcpy(out + (out_events * FAKE_INPUT_EVENT_SIZE), &ev,
+               FAKE_INPUT_EVENT_SIZE);
+        out_events++;
+        fake.keyframe_remaining--;
+      }
+      if (fake.keyframe_remaining > 0) {
+        // Buffer filled before the baseline finished; deliver the remainder (and
+        // only then fresh events) on subsequent reads. out_events >= 1 here.
+        return static_cast<ssize_t>(out_events * FAKE_INPUT_EVENT_SIZE);
+      }
+    }
 
     size_t available_events =
         static_cast<size_t>(std::min<uint64_t>(write_seq - fake.read_seq,
                                               FAKE_INPUT_RING_CAPACITY));
-    size_t requested_events = count / FAKE_INPUT_EVENT_SIZE;
-    size_t events_to_read = std::min(requested_events, available_events);
-    uint8_t *out = static_cast<uint8_t *>(buf);
+    size_t events_to_read =
+        std::min(requested_events - out_events, available_events);
     const uint8_t *ring_events =
         reinterpret_cast<const uint8_t *>(fake.ring) +
         FAKE_INPUT_RING_HEADER_SIZE;
@@ -960,13 +1127,14 @@ EXPORT ssize_t read(int fd, void *buf, size_t count) {
     for (size_t i = 0; i < events_to_read; i++) {
       size_t event_index =
           static_cast<size_t>((fake.read_seq + i) % FAKE_INPUT_RING_CAPACITY);
-      memcpy(out + (i * FAKE_INPUT_EVENT_SIZE),
+      memcpy(out + ((out_events + i) * FAKE_INPUT_EVENT_SIZE),
              ring_events + (event_index * FAKE_INPUT_EVENT_SIZE),
              FAKE_INPUT_EVENT_SIZE);
     }
 
     fake.read_seq += events_to_read;
-    return static_cast<ssize_t>(events_to_read * FAKE_INPUT_EVENT_SIZE);
+    return static_cast<ssize_t>((out_events + events_to_read) *
+                                FAKE_INPUT_EVENT_SIZE);
   }
   return syscall(SYS_read, fd, buf, count);
 }
@@ -1040,6 +1208,7 @@ EXPORT int poll(struct pollfd *fds, nfds_t nfds, int timeout) {
     return my_poll ? my_poll(fds, nfds, timeout) : -1;
 
   const long long deadline_ms = timeout < 0 ? -1 : monotonic_ms() + timeout;
+  int backoff_ms = 1;
 
   while (true) {
     int ready = 0;
@@ -1047,17 +1216,6 @@ EXPORT int poll(struct pollfd *fds, nfds_t nfds, int timeout) {
     for (nfds_t i = 0; i < nfds; i++)
       fds[i].revents = 0;
 
-    int real_ready = my_poll ? my_poll(real_fds.data(), nfds, 0) : 0;
-    if (real_ready > 0) {
-      for (nfds_t i = 0; i < nfds; i++) {
-        if (!is_fake_input_fd(fds[i].fd)) {
-          fds[i].revents = real_fds[i].revents;
-          if (fds[i].revents)
-            ready++;
-        }
-      }
-    }
-
     for (nfds_t i = 0; i < nfds; i++) {
       if (!is_fake_input_fd(fds[i].fd))
         continue;
@@ -1074,6 +1232,43 @@ EXPORT int poll(struct pollfd *fds, nfds_t nfds, int timeout) {
         ready++;
     }
 
+    int real_timeout = ready > 0 ? 0 : [&] {
+      if (timeout == 0) return 0;
+      int remaining = deadline_ms < 0
+                          ? backoff_ms
+                          : std::min(backoff_ms, (int)(deadline_ms - monotonic_ms()));
+      return std::max(remaining, 0);
+    }();
+
+    int real_ready = my_poll ? my_poll(real_fds.data(), nfds, real_timeout) : 0;
+    if (real_ready > 0) {
+      for (nfds_t i = 0; i < nfds; i++) {
+        if (!is_fake_input_fd(fds[i].fd)) {
+          fds[i].revents = real_fds[i].revents;
+          if (fds[i].revents)
+            ready++;
+        }
+      }
+    }
+
+    if (ready == 0 && real_timeout > 0) {
+      for (nfds_t i = 0; i < nfds; i++) {
+        if (!is_fake_input_fd(fds[i].fd))
+          continue;
+
+        short revents = 0;
+        if (fake_fd_is_stale(fds[i].fd))
+          revents |= POLLHUP;
+        if ((fds[i].events & (POLLIN | POLLRDNORM)) &&
+            fake_fd_has_unread_data(fds[i].fd))
+          revents |= (fds[i].events & (POLLIN | POLLRDNORM));
+
+        fds[i].revents = revents;
+        if (revents)
+          ready++;
+      }
+    }
+
     if (ready > 0)
       return ready;
 
@@ -1083,8 +1278,8 @@ EXPORT int poll(struct pollfd *fds, nfds_t nfds, int timeout) {
     if (deadline_ms >= 0 && monotonic_ms() >= deadline_ms)
       return 0;
 
-    struct timespec sleep_time = {0, 5 * 1000 * 1000};
-    nanosleep(&sleep_time, nullptr);
+    if (backoff_ms < 16)
+      backoff_ms *= 2;
   }
 }
 
@@ -1152,6 +1347,7 @@ EXPORT int select(int nfds, fd_set *readfds, fd_set *writefds,
   const long long timeout_ms = timeval_to_ms(timeout);
   const long long deadline_ms =
       timeout_ms < 0 ? -1 : monotonic_ms() + timeout_ms;
+  int backoff_ms = 1;
 
   while (true) {
     int ready = 0;
@@ -1163,16 +1359,37 @@ EXPORT int select(int nfds, fd_set *readfds, fd_set *writefds,
     if (exceptfds)
       FD_ZERO(exceptfds);
 
+    for (int fd = 0; fd < nfds; fd++) {
+      if (!is_fake_input_fd(fd))
+        continue;
+      if (readfds && FD_ISSET(fd, &original_readfds) && fake_fd_is_stale(fd)) {
+        FD_SET(fd, readfds);
+        ready++;
+      } else if (readfds && FD_ISSET(fd, &original_readfds) &&
+                 fake_fd_has_unread_data(fd)) {
+        FD_SET(fd, readfds);
+        ready++;
+      }
+    }
+
+    int wait_ms = ready > 0 ? 0 : [&] {
+      if (timeout_ms == 0) return 0;
+      int remaining = deadline_ms < 0
+                          ? backoff_ms
+                          : std::min(backoff_ms, (int)(deadline_ms - monotonic_ms()));
+      return std::max(remaining, 0);
+    }();
+    struct timeval wait_tv = {wait_ms / 1000, (wait_ms % 1000) * 1000};
+
     fd_set iter_readfds = real_readfds;
     fd_set iter_writefds = real_writefds;
     fd_set iter_exceptfds = real_exceptfds;
-    struct timeval zero_timeout = {0, 0};
 
     int real_ready =
         my_select
             ? my_select(nfds, readfds ? &iter_readfds : nullptr,
                         writefds ? &iter_writefds : nullptr,
-                        exceptfds ? &iter_exceptfds : nullptr, &zero_timeout)
+                        exceptfds ? &iter_exceptfds : nullptr, &wait_tv)
             : 0;
 
     if (real_ready > 0) {
@@ -1192,16 +1409,18 @@ EXPORT int select(int nfds, fd_set *readfds, fd_set *writefds,
       }
     }
 
-    for (int fd = 0; fd < nfds; fd++) {
-      if (!is_fake_input_fd(fd))
-        continue;
-      if (readfds && FD_ISSET(fd, &original_readfds) && fake_fd_is_stale(fd)) {
-        FD_SET(fd, readfds);
-        ready++;
-      } else if (readfds && FD_ISSET(fd, &original_readfds) &&
-                 fake_fd_has_unread_data(fd)) {
-        FD_SET(fd, readfds);
-        ready++;
+    if (ready == 0 && wait_ms > 0) {
+      for (int fd = 0; fd < nfds; fd++) {
+        if (!is_fake_input_fd(fd))
+          continue;
+        if (readfds && FD_ISSET(fd, &original_readfds) && fake_fd_is_stale(fd)) {
+          FD_SET(fd, readfds);
+          ready++;
+        } else if (readfds && FD_ISSET(fd, &original_readfds) &&
+                   fake_fd_has_unread_data(fd)) {
+          FD_SET(fd, readfds);
+          ready++;
+        }
       }
     }
 
@@ -1214,7 +1433,7 @@ EXPORT int select(int nfds, fd_set *readfds, fd_set *writefds,
     if (deadline_ms >= 0 && monotonic_ms() >= deadline_ms)
       return 0;
 
-    struct timespec sleep_time = {0, 5 * 1000 * 1000};
-    nanosleep(&sleep_time, nullptr);
+    if (backoff_ms < 16)
+      backoff_ms *= 2;
   }
 }
diff --git a/app/src/main/cpp/winlator/gpu_image.c b/app/src/main/cpp/winlator/gpu_image.c
index 5d8077c1d..eb8e6904b 100644
--- a/app/src/main/cpp/winlator/gpu_image.c
+++ b/app/src/main/cpp/winlator/gpu_image.c
@@ -1,222 +1,161 @@
-#include <android/hardware_buffer.h>
-#include <android/log.h>
-#include <android/native_window.h>
-
-#define EGL_EGLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
+// AHardwareBuffer lifecycle for GPUImage.
+//
+// All EGL/GLES interop has been removed; the Vulkan compositor consumes the AHB directly via
+// VK_ANDROID_external_memory_android_hardware_buffer (see vk/vk_image.c). This file is now
+// concerned only with allocation, socket import, CPU mapping, and release of the AHB itself.
+
+#include <android/hardware_buffer.h>
+#include <android/log.h>
 #include <jni.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-
-#define LOG_TAG "System.out"
-#define printf(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define HAL_PIXEL_FORMAT_BGRA_8888 5
-
-// Function to create an EGL image from a hardware buffer
-EGLImageKHR createImageKHR(AHardwareBuffer *hardwareBuffer, int textureId) {
-  if (!hardwareBuffer) {
-    printf("createImageKHR: Invalid AHardwareBuffer pointer\n");
-    return NULL;
-  }
-
-  const EGLint attribList[] = {EGL_IMAGE_PRESERVED_KHR, EGL_FALSE, EGL_NONE};
-
-  EGLClientBuffer clientBuffer =
-      eglGetNativeClientBufferANDROID(hardwareBuffer);
-  if (!clientBuffer) {
-    printf("Failed to get native client buffer\n");
-    return NULL;
-  }
-
-  EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-  if (eglDisplay == EGL_NO_DISPLAY) {
-    printf("Invalid EGLDisplay\n");
-    return NULL;
-  }
-
-  EGLImageKHR imageKHR =
-      eglCreateImageKHR(eglDisplay, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
-                        clientBuffer, attribList);
-  if (!imageKHR) {
-    printf("Failed to create EGLImageKHR\n");
-    return NULL;
-  }
-
-  glBindTexture(GL_TEXTURE_2D, textureId);
-  if (glGetError() != GL_NO_ERROR) {
-    printf("Failed to bind texture\n");
-    eglDestroyImageKHR(eglDisplay, imageKHR);
-    return NULL;
-  }
-
-  glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, imageKHR);
-  if (glGetError() != GL_NO_ERROR) {
-    printf("Failed to bind EGLImage to texture\n");
-    eglDestroyImageKHR(eglDisplay, imageKHR);
-    return NULL;
-  }
-
-  glBindTexture(GL_TEXTURE_2D, 0);
-
-  return imageKHR;
-}
-
-// Function to create a hardware buffer
-AHardwareBuffer *createHardwareBuffer(int width, int height) {
-  AHardwareBuffer_Desc buffDesc = {};
-  buffDesc.width = width;
-  buffDesc.height = height;
-  buffDesc.layers = 1;
-  buffDesc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE |
-                   AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN |
-                   AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN;
-  buffDesc.format = HAL_PIXEL_FORMAT_BGRA_8888;
-
-  AHardwareBuffer *hardwareBuffer = NULL;
-  if (AHardwareBuffer_allocate(&buffDesc, &hardwareBuffer) != 0) {
-    printf("Failed to allocate AHardwareBuffer\n");
-    return NULL;
-  }
-
-  return hardwareBuffer;
-}
-
-// JNI method to extract a hardware buffer from a socketpair
-JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_runtime_display_renderer_GPUImage_hardwareBufferFromSocket(
-    JNIEnv *env, jobject obj, jint fd) {
-  AHardwareBuffer *ahb;
-
-  uint8_t buf = 1;
-  struct stat fdStat;
-
-  if (fstat(fd, &fdStat) != 0 || !S_ISSOCK(fdStat.st_mode)) {
-    printf("AHardwareBuffer import fd is not a socketpair");
-    return 0;
-  }
-
-  if ((write(fd, &buf, 1)) == -1) {
-    printf("Failed to write data to socketpair");
-    return 0;
-  }
-
-  if ((AHardwareBuffer_recvHandleFromUnixSocket(fd, &ahb)) != 0) {
-    printf("Failed to extract hardware buffer from socketpair");
-    return 0;
-  }
-
-  return (jlong)ahb;
-}
-
-// JNI method to create a hardware buffer
-JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_runtime_display_renderer_GPUImage_createHardwareBuffer(
-    JNIEnv *env, jobject obj, jshort width, jshort height) {
-  AHardwareBuffer *buffer = createHardwareBuffer(width, height);
-  if (!buffer) {
-    printf("Failed to create hardware buffer\n");
-    return 0;
-  }
-  return (jlong)buffer;
-}
-
-// JNI method to create an EGL image
-JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_runtime_display_renderer_GPUImage_createImageKHR(
-    JNIEnv *env, jobject obj, jlong hardwareBufferPtr, jint textureId) {
-  AHardwareBuffer *hardwareBuffer = (AHardwareBuffer *)hardwareBufferPtr;
-  if (!hardwareBuffer) {
-    printf("Invalid AHardwareBuffer pointer\n");
-    return 0;
-  }
-  return (jlong)createImageKHR(hardwareBuffer, textureId);
-}
-
-// JNI method to destroy a hardware buffer
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_display_renderer_GPUImage_destroyHardwareBuffer(
-    JNIEnv *env, jobject obj, jlong hardwareBufferPtr, jboolean locked) {
-  AHardwareBuffer *hardwareBuffer = (AHardwareBuffer *)hardwareBufferPtr;
-  if (hardwareBuffer) {
-    if (locked) {
-      AHardwareBuffer_unlock(hardwareBuffer, NULL);
+
+#define LOG_TAG "GPUImage"
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,  LOG_TAG, __VA_ARGS__)
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN,  LOG_TAG, __VA_ARGS__)
+
+#define HAL_PIXEL_FORMAT_BGRA_8888 5
+
+// Anything outside this set would silently misrender if treated as 32-bit RGBA; reject so
+// DRI3 falls back to the SHM path.
+static int gpuImageFormatSupported(uint32_t format) {
+    return format == HAL_PIXEL_FORMAT_BGRA_8888
+        || format == AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM
+        || format == AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM;
+}
+
+// ----------------------------------------------------------------------------
+// Java GPUImage.nativeAhbCreate(short w, short h) -> jlong (AHardwareBuffer*)
+// Allocates a CPU-readable + GPU-sampleable BGRA AHB.
+// ----------------------------------------------------------------------------
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_runtime_display_renderer_GPUImage_nativeAhbCreate(
+    JNIEnv* env, jobject obj, jshort width, jshort height)
+{
+    (void)env; (void)obj;
+    AHardwareBuffer_Desc desc = {0};
+    desc.width = (uint32_t)width;
+    desc.height = (uint32_t)height;
+    desc.layers = 1;
+    desc.format = HAL_PIXEL_FORMAT_BGRA_8888;
+    desc.usage  = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE
+                | AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN
+                | AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN;
+
+    AHardwareBuffer* ahb = NULL;
+    if (AHardwareBuffer_allocate(&desc, &ahb) != 0 || !ahb) {
+        LOGW("AHardwareBuffer_allocate failed (%dx%d BGRA)", width, height);
+        return 0;
+    }
+    AHardwareBuffer_Desc out = {0};
+    AHardwareBuffer_describe(ahb, &out);
+    LOGI("AHB allocated: %ux%u stride=%u format=%u usage=0x%llx",
+         out.width, out.height, out.stride, out.format, (unsigned long long)out.usage);
+    return (jlong)(intptr_t)ahb;
+}
+
+// ----------------------------------------------------------------------------
+// Java GPUImage.nativeAhbImportFromSocket(int fd) -> jlong (AHardwareBuffer*)
+// Reads a handle previously sent via AHardwareBuffer_sendHandleToUnixSocket.
+// Reciprocates with a 1-byte ack so the sender can close its end.
+// ----------------------------------------------------------------------------
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_runtime_display_renderer_GPUImage_nativeAhbImportFromSocket(
+    JNIEnv* env, jobject obj, jint fd)
+{
+    (void)env; (void)obj;
+    struct stat fdStat;
+    if (fstat(fd, &fdStat) != 0 || !S_ISSOCK(fdStat.st_mode)) {
+        LOGW("AHB import fd %d is not a socket", fd);
+        return 0;
+    }
+    uint8_t ack = 1;
+    if (write(fd, &ack, 1) == -1) {
+        LOGW("AHB import ack write failed");
+        return 0;
+    }
+    AHardwareBuffer* ahb = NULL;
+    if (AHardwareBuffer_recvHandleFromUnixSocket(fd, &ahb) != 0 || !ahb) {
+        LOGW("AHardwareBuffer_recvHandleFromUnixSocket failed");
+        return 0;
+    }
+
+    AHardwareBuffer_Desc desc = {0};
+    AHardwareBuffer_describe(ahb, &desc);
+    if (!gpuImageFormatSupported(desc.format)) {
+        LOGW("AHB import rejected: format=%u not supported", desc.format);
+        AHardwareBuffer_release(ahb);
+        return 0;
+    }
+    if (!(desc.usage & AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE)) {
+        LOGW("AHB import rejected: usage=0x%llx missing GPU_SAMPLED_IMAGE",
+             (unsigned long long)desc.usage);
+        AHardwareBuffer_release(ahb);
+        return 0;
+    }
+    LOGI("AHB received from socket: fd=%d size=%ux%u stride=%u format=%u usage=0x%llx",
+         fd, desc.width, desc.height, desc.stride, desc.format,
+         (unsigned long long)desc.usage);
+    return (jlong)(intptr_t)ahb;
+}
+
+// ----------------------------------------------------------------------------
+// Java GPUImage.nativeAhbLock(long ahb) -> ByteBuffer
+// Locks for CPU read+write and reports stride to Java via setStride().
+// Returns a direct ByteBuffer over the mapped pixel data, or null on failure.
+// ----------------------------------------------------------------------------
+
+JNIEXPORT jobject JNICALL
+Java_com_winlator_cmod_runtime_display_renderer_GPUImage_nativeAhbLock(
+    JNIEnv* env, jobject obj, jlong ahbPtr)
+{
+    AHardwareBuffer* ahb = (AHardwareBuffer*)(intptr_t)ahbPtr;
+    if (!ahb) return NULL;
+
+    void* virt = NULL;
+    int rc = AHardwareBuffer_lock(ahb,
+                AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN | AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN,
+                -1, NULL, &virt);
+    if (rc != 0) {
+        rc = AHardwareBuffer_lock(ahb, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN, -1, NULL, &virt);
+    }
+    if (rc != 0) {
+        rc = AHardwareBuffer_lock(ahb, AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN, -1, NULL, &virt);
     }
-    AHardwareBuffer_release(hardwareBuffer);
-  }
+    if (rc != 0 || !virt) {
+        LOGW("AHardwareBuffer_lock failed");
+        return NULL;
+    }
+
+    AHardwareBuffer_Desc desc;
+    AHardwareBuffer_describe(ahb, &desc);
+
+    jclass cls = (*env)->GetObjectClass(env, obj);
+    jmethodID setStride = (*env)->GetMethodID(env, cls, "setStride", "(S)V");
+    if (setStride) (*env)->CallVoidMethod(env, obj, setStride, (jshort)desc.stride);
+
+    jlong size = (jlong)desc.stride * desc.height * 4;
+    LOGI("AHB CPU mapped: %ux%u stride=%u bytes=%lld",
+         desc.width, desc.height, desc.stride, (long long)size);
+    return (*env)->NewDirectByteBuffer(env, virt, size);
+}
+
+// ----------------------------------------------------------------------------
+// Java GPUImage.nativeAhbDestroy(long ahb, boolean locked)
+// Unlocks if needed and releases our ref to the AHB.
+// ----------------------------------------------------------------------------
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_runtime_display_renderer_GPUImage_nativeAhbDestroy(
+    JNIEnv* env, jobject obj, jlong ahbPtr, jboolean locked)
+{
+    (void)env; (void)obj;
+    AHardwareBuffer* ahb = (AHardwareBuffer*)(intptr_t)ahbPtr;
+    if (!ahb) return;
+    if (locked) AHardwareBuffer_unlock(ahb, NULL);
+    AHardwareBuffer_release(ahb);
 }
-
-// JNI method to lock a hardware buffer
-JNIEXPORT jobject JNICALL
-Java_com_winlator_cmod_runtime_display_renderer_GPUImage_lockHardwareBuffer(
-    JNIEnv *env, jobject obj, jlong hardwareBufferPtr) {
-  AHardwareBuffer *hardwareBuffer = (AHardwareBuffer *)hardwareBufferPtr;
-  if (!hardwareBuffer) {
-    printf("Invalid AHardwareBuffer pointer\n");
-    return NULL;
-  }
-
-  void *virtualAddr;
-  int lockResult =
-      AHardwareBuffer_lock(hardwareBuffer,
-                           AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN |
-                               AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN,
-                           -1, NULL, &virtualAddr);
-  if (lockResult != 0) {
-    lockResult = AHardwareBuffer_lock(hardwareBuffer,
-                                      AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN,
-                                      -1, NULL, &virtualAddr);
-  }
-  if (lockResult != 0) {
-    lockResult = AHardwareBuffer_lock(hardwareBuffer,
-                                      AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN,
-                                      -1, NULL, &virtualAddr);
-  }
-  if (lockResult != 0) {
-    printf("Failed to lock AHardwareBuffer\n");
-    return NULL;
-  }
-
-  AHardwareBuffer_Desc buffDesc;
-  AHardwareBuffer_describe(hardwareBuffer, &buffDesc);
-
-  jclass cls = (*env)->GetObjectClass(env, obj);
-  if (cls == NULL) {
-    printf("Failed to get Java class reference\n");
-    AHardwareBuffer_unlock(hardwareBuffer, NULL);
-    return NULL;
-  }
-
-  jmethodID setStride = (*env)->GetMethodID(env, cls, "setStride", "(S)V");
-  if (setStride == NULL) {
-    printf("Failed to get setStride method ID\n");
-    AHardwareBuffer_unlock(hardwareBuffer, NULL);
-    return NULL;
-  }
-  (*env)->CallVoidMethod(env, obj, setStride, (jshort)buffDesc.stride);
-
-  jlong size = buffDesc.stride * buffDesc.height * 4;
-  jobject buffer = (*env)->NewDirectByteBuffer(env, virtualAddr, size);
-  if (buffer == NULL) {
-    printf("Failed to create Java ByteBuffer\n");
-    AHardwareBuffer_unlock(hardwareBuffer, NULL);
-  }
-
-  return buffer;
-}
-
-// JNI method to destroy an EGL image
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_display_renderer_GPUImage_destroyImageKHR(
-    JNIEnv *env, jobject obj, jlong imageKHRPtr) {
-  EGLImageKHR imageKHR = (EGLImageKHR)imageKHRPtr;
-  if (imageKHR) {
-    EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    eglDestroyImageKHR(eglDisplay, imageKHR);
-  }
-}
diff --git a/app/src/main/cpp/winlator/native_content_io.cpp b/app/src/main/cpp/winlator/native_content_io.cpp
new file mode 100644
index 000000000..949b43f42
--- /dev/null
+++ b/app/src/main/cpp/winlator/native_content_io.cpp
@@ -0,0 +1,927 @@
+#include <jni.h>
+
+#include <android/asset_manager.h>
+#include <android/asset_manager_jni.h>
+#include <android/log.h>
+#include <curl/curl.h>
+#include <lzma.h>
+#include <zstd.h>
+
+#include <algorithm>
+#include <cerrno>
+#include <chrono>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_set>
+#include <vector>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+namespace {
+
+constexpr const char* kLogTag = "NativeContentIO";
+constexpr size_t kBufferSize = 256 * 1024;
+constexpr int64_t kProgressBatchBytes = 8 * 1024 * 1024;
+constexpr int64_t kProgressBatchIntervalMs = 100;
+
+#define NATIVE_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, kLogTag, __VA_ARGS__)
+#define NATIVE_LOGW(...) __android_log_print(ANDROID_LOG_WARN, kLogTag, __VA_ARGS__)
+
+std::once_flag g_curl_global_once;
+
+static void ensure_curl_global_init() {
+    std::call_once(g_curl_global_once, [] { curl_global_init(CURL_GLOBAL_DEFAULT); });
+}
+
+std::string jstr(JNIEnv* env, jstring value) {
+    if (!value) return {};
+    const char* chars = env->GetStringUTFChars(value, nullptr);
+    if (!chars) return {};
+    std::string out(chars);
+    env->ReleaseStringUTFChars(value, chars);
+    return out;
+}
+
+bool mkdirs(std::string_view path) {
+    if (path.empty()) return true;
+    std::string current;
+    current.reserve(path.size());
+
+    size_t pos = 0;
+    if (path[0] == '/') {
+        current.push_back('/');
+        pos = 1;
+    }
+
+    while (pos <= path.size()) {
+        size_t next = path.find('/', pos);
+        std::string_view part =
+            path.substr(pos, next == std::string_view::npos ? path.size() - pos : next - pos);
+        if (!part.empty()) {
+            if (!current.empty() && current.back() != '/') current.push_back('/');
+            current.append(part);
+            if (::mkdir(current.c_str(), 0771) != 0 && errno != EEXIST) {
+                return false;
+            }
+        }
+        if (next == std::string_view::npos) break;
+        pos = next + 1;
+    }
+    return true;
+}
+
+bool ensure_parent_dir(const std::string& path) {
+    const size_t slash = path.find_last_of('/');
+    if (slash == std::string::npos || slash == 0) return true;
+    return mkdirs(std::string_view(path).substr(0, slash));
+}
+
+std::string join_path(const std::string& base, const std::string& rel) {
+    if (base.empty()) return rel;
+    if (base.back() == '/') return base + rel;
+    return base + "/" + rel;
+}
+
+bool is_safe_relative_path(std::string_view path) {
+    if (path.empty() || path[0] == '/') return false;
+    size_t pos = 0;
+    while (pos <= path.size()) {
+        size_t next = path.find('/', pos);
+        std::string_view part =
+            path.substr(pos, next == std::string_view::npos ? path.size() - pos : next - pos);
+        if (part == "..") return false;
+        if (next == std::string_view::npos) break;
+        pos = next + 1;
+    }
+    return true;
+}
+
+std::string clean_entry_name(std::string name) {
+    while (name.rfind("./", 0) == 0) {
+        name.erase(0, 2);
+    }
+    return name;
+}
+
+std::string trim_trailing_slashes(std::string path) {
+    while (path.size() > 1 && path.back() == '/') {
+        path.pop_back();
+    }
+    return path;
+}
+
+bool has_symlink_ancestor(
+    const std::string& entry_name,
+    const std::unordered_set<std::string>& symlink_entries) {
+    if (symlink_entries.empty()) return false;
+    std::string path = trim_trailing_slashes(entry_name);
+    while (true) {
+        if (symlink_entries.count(path)) return true;
+        const size_t slash = path.find_last_of('/');
+        if (slash == std::string::npos || slash == 0) break;
+        path.resize(slash);
+    }
+    return false;
+}
+
+std::string parent_entry_name(const std::string& entry_name) {
+    std::string normalized = trim_trailing_slashes(entry_name);
+    const size_t slash = normalized.find_last_of('/');
+    if (slash == std::string::npos) return {};
+    return normalized.substr(0, slash);
+}
+
+uint64_t parse_tar_number(const char* field, size_t length) {
+    if (length == 0) return 0;
+    const unsigned char first = static_cast<unsigned char>(field[0]);
+    if ((first & 0x80) != 0) {
+        uint64_t value = first & 0x7f;
+        for (size_t i = 1; i < length; ++i) {
+            value = (value << 8) | static_cast<unsigned char>(field[i]);
+        }
+        return value;
+    }
+
+    size_t i = 0;
+    while (i < length && (field[i] == ' ' || field[i] == '\0')) ++i;
+    uint64_t value = 0;
+    for (; i < length; ++i) {
+        if (field[i] < '0' || field[i] > '7') break;
+        value = (value << 3) + static_cast<uint64_t>(field[i] - '0');
+    }
+    return value;
+}
+
+std::string tar_string(const char* field, size_t length) {
+    size_t n = 0;
+    while (n < length && field[n] != '\0') ++n;
+    return std::string(field, n);
+}
+
+std::string read_octal_record_string(std::string data) {
+    while (!data.empty() && data.back() == '\0') data.pop_back();
+    return data;
+}
+
+struct PaxValues {
+    std::optional<std::string> path;
+    std::optional<std::string> link_path;
+};
+
+PaxValues parse_pax(std::string_view data) {
+    PaxValues values;
+    size_t pos = 0;
+    while (pos < data.size()) {
+        size_t space = data.find(' ', pos);
+        if (space == std::string_view::npos) break;
+        size_t len = 0;
+        for (size_t i = pos; i < space; ++i) {
+            if (data[i] < '0' || data[i] > '9') {
+                len = 0;
+                break;
+            }
+            len = len * 10 + static_cast<size_t>(data[i] - '0');
+        }
+        if (len == 0 || pos + len > data.size()) break;
+        std::string_view record = data.substr(space + 1, pos + len - space - 1);
+        if (!record.empty() && record.back() == '\n') record.remove_suffix(1);
+        size_t eq = record.find('=');
+        if (eq != std::string_view::npos) {
+            std::string_view key = record.substr(0, eq);
+            std::string value(record.substr(eq + 1));
+            if (key == "path") values.path = std::move(value);
+            if (key == "linkpath") values.link_path = std::move(value);
+        }
+        pos += len;
+    }
+    return values;
+}
+
+class Reader {
+public:
+    virtual ~Reader() = default;
+    virtual ssize_t read(uint8_t* out, size_t length) = 0;
+
+    bool read_exact(uint8_t* out, size_t length) {
+        size_t total = 0;
+        while (total < length) {
+            ssize_t n = read(out + total, length - total);
+            if (n <= 0) return false;
+            total += static_cast<size_t>(n);
+        }
+        return true;
+    }
+
+    bool skip(uint64_t amount) {
+        uint8_t buffer[8192];
+        while (amount > 0) {
+            const size_t chunk = static_cast<size_t>(std::min<uint64_t>(amount, sizeof(buffer)));
+            if (!read_exact(buffer, chunk)) return false;
+            amount -= chunk;
+        }
+        return true;
+    }
+};
+
+class FileReader final : public Reader {
+public:
+    explicit FileReader(std::string path) : file_(std::fopen(path.c_str(), "rb")) {
+        if (file_) std::setvbuf(file_, nullptr, _IOFBF, kBufferSize);
+    }
+    ~FileReader() override {
+        if (file_) std::fclose(file_);
+    }
+    bool ok() const { return file_ != nullptr; }
+    ssize_t read(uint8_t* out, size_t length) override {
+        if (!file_) return -1;
+        size_t n = std::fread(out, 1, length, file_);
+        if (n == 0 && std::ferror(file_)) return -1;
+        return static_cast<ssize_t>(n);
+    }
+
+private:
+    FILE* file_ = nullptr;
+};
+
+class AssetReader final : public Reader {
+public:
+    AssetReader(AAssetManager* manager, std::string path)
+        : asset_(manager ? AAssetManager_open(manager, path.c_str(), AASSET_MODE_STREAMING) : nullptr) {}
+
+    ~AssetReader() override {
+        if (asset_) AAsset_close(asset_);
+    }
+
+    bool ok() const { return asset_ != nullptr; }
+
+    ssize_t read(uint8_t* out, size_t length) override {
+        if (!asset_) return -1;
+        return AAsset_read(asset_, out, length);
+    }
+
+private:
+    AAsset* asset_ = nullptr;
+};
+
+class FileWriter final {
+public:
+    FileWriter(const std::string& path, bool nofollow) {
+        int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC;
+        if (nofollow) flags |= O_NOFOLLOW;
+        int fd = ::open(
+            path.c_str(),
+            flags,
+            0660);
+        if (fd >= 0) file_ = ::fdopen(fd, "wb");
+        if (file_) {
+            std::setvbuf(file_, nullptr, _IONBF, 0);
+        } else if (fd >= 0) {
+            ::close(fd);
+        }
+    }
+
+    ~FileWriter() {
+        close();
+    }
+
+    bool ok() const {
+        return file_ != nullptr;
+    }
+
+    bool write(const uint8_t* data, size_t length) {
+        return file_ && std::fwrite(data, 1, length, file_) == length;
+    }
+
+    bool close() {
+        if (!file_) return true;
+        FILE* file = file_;
+        file_ = nullptr;
+        int fd = ::fileno(file);
+        if (fd >= 0) {
+            std::fflush(file);
+            ::sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE);
+        }
+        return std::fclose(file) == 0;
+    }
+
+private:
+    FILE* file_ = nullptr;
+};
+
+class XzReader final : public Reader {
+public:
+    explicit XzReader(std::unique_ptr<Reader> source) : source_(std::move(source)) {
+        ok_ = lzma_stream_decoder(&strm_, UINT64_MAX, LZMA_CONCATENATED) == LZMA_OK;
+    }
+    ~XzReader() override {
+        if (ok_) lzma_end(&strm_);
+    }
+    bool ok() const { return source_ != nullptr && ok_; }
+    ssize_t read(uint8_t* out, size_t length) override {
+        if (finished_) return 0;
+        strm_.next_out = out;
+        strm_.avail_out = length;
+
+        while (strm_.avail_out > 0) {
+            if (strm_.avail_in == 0 && !input_finished_) {
+                ssize_t n = source_->read(input_.data(), input_.size());
+                if (n < 0) return -1;
+                if (n == 0) input_finished_ = true;
+                strm_.next_in = input_.data();
+                strm_.avail_in = static_cast<size_t>(std::max<ssize_t>(n, 0));
+            }
+
+            const size_t in_before = strm_.avail_in;
+            const size_t out_before = length - strm_.avail_out;
+            lzma_ret ret = lzma_code(&strm_, input_finished_ ? LZMA_FINISH : LZMA_RUN);
+            if (ret == LZMA_STREAM_END) {
+                finished_ = true;
+                break;
+            }
+            if (ret != LZMA_OK) {
+                NATIVE_LOGW("XZ decode failed: %d", static_cast<int>(ret));
+                return -1;
+            }
+            if (strm_.avail_in == in_before && (length - strm_.avail_out) == out_before) {
+                NATIVE_LOGW("XZ decoder stalled");
+                return -1;
+            }
+        }
+        return static_cast<ssize_t>(length - strm_.avail_out);
+    }
+
+private:
+    std::unique_ptr<Reader> source_;
+    lzma_stream strm_ = LZMA_STREAM_INIT;
+    bool ok_ = false;
+    std::vector<uint8_t> input_ = std::vector<uint8_t>(1 << 20);
+    bool input_finished_ = false;
+    bool finished_ = false;
+};
+
+class ZstdReader final : public Reader {
+public:
+    explicit ZstdReader(std::unique_ptr<Reader> source)
+        : source_(std::move(source)), stream_(ZSTD_createDStream()) {
+        if (stream_) {
+            size_t rc = ZSTD_initDStream(stream_);
+            if (ZSTD_isError(rc)) {
+                ZSTD_freeDStream(stream_);
+                stream_ = nullptr;
+            }
+        }
+    }
+    ~ZstdReader() override {
+        if (stream_) ZSTD_freeDStream(stream_);
+    }
+    bool ok() const { return source_ != nullptr && stream_ != nullptr; }
+    ssize_t read(uint8_t* out, size_t length) override {
+        if (finished_) return 0;
+        ZSTD_outBuffer output{out, length, 0};
+        while (output.pos < output.size) {
+            if (input_.pos == input_.size && !input_finished_) {
+                ssize_t n = source_->read(input_storage_.data(), input_storage_.size());
+                if (n < 0) return -1;
+                if (n == 0) input_finished_ = true;
+                input_ = ZSTD_inBuffer{input_storage_.data(), static_cast<size_t>(std::max<ssize_t>(n, 0)), 0};
+            }
+            size_t in_before = input_.pos;
+            size_t out_before = output.pos;
+            size_t rc = ZSTD_decompressStream(stream_, &output, &input_);
+            if (ZSTD_isError(rc)) {
+                NATIVE_LOGW("Zstd decode failed: %s", ZSTD_getErrorName(rc));
+                return -1;
+            }
+            frame_finished_ = rc == 0;
+            if (frame_finished_ && input_finished_ && input_.pos == input_.size) {
+                finished_ = true;
+                break;
+            }
+            if (input_finished_ && input_.pos == input_.size && output.pos == out_before && !frame_finished_) {
+                NATIVE_LOGW("Zstd stream ended before frame completion");
+                return -1;
+            }
+            if (input_.pos == in_before && output.pos == out_before) {
+                NATIVE_LOGW("Zstd decoder stalled");
+                return -1;
+            }
+        }
+        return static_cast<ssize_t>(output.pos);
+    }
+
+private:
+    std::unique_ptr<Reader> source_;
+    ZSTD_DStream* stream_ = nullptr;
+    std::vector<uint8_t> input_storage_ = std::vector<uint8_t>(ZSTD_DStreamInSize());
+    ZSTD_inBuffer input_{nullptr, 0, 0};
+    bool input_finished_ = false;
+    bool finished_ = false;
+    bool frame_finished_ = false;
+};
+
+class JavaExtractListener {
+public:
+    JavaExtractListener(JNIEnv* env, jobject listener) : env_(env), listener_(listener) {
+        if (!listener_) return;
+        jclass listener_cls = env_->FindClass("com/winlator/cmod/shared/util/OnExtractFileListener");
+        on_extract_ =
+            env_->GetMethodID(listener_cls, "onExtractFile", "(Ljava/io/File;J)Ljava/io/File;");
+        on_progress_ =
+            env_->GetMethodID(listener_cls, "onExtractFileProgress", "(Ljava/io/File;J)V");
+        maps_files_method_ = env_->GetMethodID(listener_cls, "mapsExtractedFiles", "()Z");
+        byte_progress_method_ = env_->GetMethodID(listener_cls, "reportsExtractedBytesOnly", "()Z");
+        on_bytes_progress_ = env_->GetMethodID(listener_cls, "onExtractedBytes", "(J)V");
+
+        if (maps_files_method_) {
+            maps_files_ = env_->CallBooleanMethod(listener_, maps_files_method_) == JNI_TRUE;
+            if (env_->ExceptionCheck()) return;
+        }
+        if (byte_progress_method_) {
+            byte_progress_only_ =
+                env_->CallBooleanMethod(listener_, byte_progress_method_) == JNI_TRUE;
+            if (env_->ExceptionCheck()) return;
+        }
+
+        if (maps_files_ || !byte_progress_only_) {
+            jclass file_cls = env_->FindClass("java/io/File");
+            file_class_ = static_cast<jclass>(env_->NewLocalRef(file_cls));
+            file_ctor_ = env_->GetMethodID(file_class_, "<init>", "(Ljava/lang/String;)V");
+            get_path_ = env_->GetMethodID(file_class_, "getPath", "()Ljava/lang/String;");
+        }
+
+        enabled_ =
+            (!maps_files_ || (file_class_ && file_ctor_ && get_path_ && on_extract_)) &&
+            (byte_progress_only_ || !listener_ || (file_class_ && file_ctor_ && on_progress_));
+    }
+
+    std::optional<std::string> map(const std::string& destination, int64_t size) {
+        if (!listener_) return destination;
+        if (!enabled_) return std::nullopt;
+        if (!maps_files_) return destination;
+
+        jstring path = env_->NewStringUTF(destination.c_str());
+        jobject file = env_->NewObject(file_class_, file_ctor_, path);
+        env_->DeleteLocalRef(path);
+        jobject mapped =
+            env_->CallObjectMethod(listener_, on_extract_, file, static_cast<jlong>(size));
+        env_->DeleteLocalRef(file);
+        if (env_->ExceptionCheck()) return std::nullopt;
+        if (!mapped) return std::nullopt;
+
+        auto mapped_path = static_cast<jstring>(env_->CallObjectMethod(mapped, get_path_));
+        env_->DeleteLocalRef(mapped);
+        if (env_->ExceptionCheck() || !mapped_path) return std::nullopt;
+        std::string result = jstr(env_, mapped_path);
+        env_->DeleteLocalRef(mapped_path);
+        return result;
+    }
+
+    bool progress(const std::string& destination, int64_t size) {
+        if (!listener_ || !enabled_) return true;
+        if (byte_progress_only_) {
+            pending_progress_bytes_ += std::max<int64_t>(size, 0);
+            auto now = std::chrono::steady_clock::now();
+            int64_t elapsed_ms =
+                std::chrono::duration_cast<std::chrono::milliseconds>(now - last_progress_flush_).count();
+            if (pending_progress_bytes_ >= kProgressBatchBytes || elapsed_ms >= kProgressBatchIntervalMs) {
+                flush_progress();
+            }
+            return !env_->ExceptionCheck();
+        }
+        if (!on_progress_) return true;
+
+        jstring path = env_->NewStringUTF(destination.c_str());
+        jobject file = env_->NewObject(file_class_, file_ctor_, path);
+        env_->DeleteLocalRef(path);
+        env_->CallVoidMethod(listener_, on_progress_, file, static_cast<jlong>(size));
+        env_->DeleteLocalRef(file);
+        return !env_->ExceptionCheck();
+    }
+
+    bool flush_progress() {
+        if (!listener_ || !enabled_ || !byte_progress_only_ || !on_bytes_progress_) return true;
+        if (pending_progress_bytes_ <= 0) return true;
+        int64_t bytes = pending_progress_bytes_;
+        pending_progress_bytes_ = 0;
+        last_progress_flush_ = std::chrono::steady_clock::now();
+        env_->CallVoidMethod(listener_, on_bytes_progress_, static_cast<jlong>(bytes));
+        return !env_->ExceptionCheck();
+    }
+
+private:
+    JNIEnv* env_;
+    jobject listener_;
+    jclass file_class_ = nullptr;
+    jmethodID file_ctor_ = nullptr;
+    jmethodID get_path_ = nullptr;
+    jmethodID on_extract_ = nullptr;
+    jmethodID on_progress_ = nullptr;
+    jmethodID maps_files_method_ = nullptr;
+    jmethodID byte_progress_method_ = nullptr;
+    jmethodID on_bytes_progress_ = nullptr;
+    bool enabled_ = false;
+    bool maps_files_ = true;
+    bool byte_progress_only_ = false;
+    int64_t pending_progress_bytes_ = 0;
+    std::chrono::steady_clock::time_point last_progress_flush_ = std::chrono::steady_clock::now();
+};
+
+bool read_payload(Reader& reader, uint64_t size, std::string* out) {
+    if (size > 64 * 1024 * 1024) return false;
+    out->assign(static_cast<size_t>(size), '\0');
+    if (size > 0 && !reader.read_exact(reinterpret_cast<uint8_t*>(out->data()), static_cast<size_t>(size))) {
+        return false;
+    }
+    const uint64_t padding = (512 - (size % 512)) % 512;
+    return reader.skip(padding);
+}
+
+bool extract_tar(
+    Reader& reader,
+    const std::string& destination,
+    JNIEnv* env,
+    jobject listener,
+    bool enforce_safe_symlinks) {
+    JavaExtractListener java_listener(env, listener);
+    std::vector<uint8_t> header(512);
+    std::optional<std::string> next_name;
+    std::optional<std::string> next_link;
+    std::unordered_set<std::string> symlink_entries;
+
+    std::vector<uint8_t> file_buffer(kBufferSize);
+    std::unordered_set<std::string> created_dirs;
+    const auto mkdirs_cached = [&](std::string_view dir) -> bool {
+        if (dir.empty()) return true;
+        if (created_dirs.find(std::string(dir)) != created_dirs.end()) return true;
+        std::string current;
+        current.reserve(dir.size());
+        size_t pos = 0;
+        if (dir[0] == '/') {
+            current.push_back('/');
+            pos = 1;
+        }
+        while (pos <= dir.size()) {
+            size_t next = dir.find('/', pos);
+            std::string_view part =
+                dir.substr(pos, next == std::string_view::npos ? dir.size() - pos : next - pos);
+            if (!part.empty()) {
+                if (!current.empty() && current.back() != '/') current.push_back('/');
+                current.append(part);
+                if (created_dirs.insert(current).second) {
+                    if (::mkdir(current.c_str(), 0771) != 0 && errno != EEXIST) return false;
+                }
+            }
+            if (next == std::string_view::npos) break;
+            pos = next + 1;
+        }
+        return true;
+    };
+    const auto ensure_parent_cached = [&](const std::string& path) -> bool {
+        const size_t slash = path.find_last_of('/');
+        if (slash == std::string::npos || slash == 0) return true;
+        return mkdirs_cached(std::string_view(path).substr(0, slash));
+    };
+
+    while (true) {
+        if (!reader.read_exact(header.data(), header.size())) return false;
+        bool all_zero = true;
+        for (uint8_t b : header) {
+            if (b != 0) {
+                all_zero = false;
+                break;
+            }
+        }
+        if (all_zero) return java_listener.flush_progress();
+
+        auto* h = reinterpret_cast<const char*>(header.data());
+        std::string name = tar_string(h, 100);
+        std::string prefix = tar_string(h + 345, 155);
+        if (!prefix.empty()) name = prefix + "/" + name;
+        std::string link_name = tar_string(h + 157, 100);
+        const uint64_t size = parse_tar_number(h + 124, 12);
+        const uint32_t mode = static_cast<uint32_t>(parse_tar_number(h + 100, 8));
+        const char type = h[156] == '\0' ? '0' : h[156];
+
+        if (type == 'L' || type == 'K') {
+            std::string payload;
+            if (!read_payload(reader, size, &payload)) return false;
+            if (type == 'L') next_name = clean_entry_name(read_octal_record_string(std::move(payload)));
+            if (type == 'K') next_link = read_octal_record_string(std::move(payload));
+            continue;
+        }
+
+        if (type == 'x' || type == 'g') {
+            std::string payload;
+            if (!read_payload(reader, size, &payload)) return false;
+            if (type == 'x') {
+                PaxValues pax = parse_pax(payload);
+                if (pax.path) next_name = clean_entry_name(*pax.path);
+                if (pax.link_path) next_link = *pax.link_path;
+            }
+            continue;
+        }
+
+        if (next_name) {
+            name = *next_name;
+            next_name.reset();
+        } else {
+            name = clean_entry_name(std::move(name));
+        }
+        if (next_link) {
+            link_name = *next_link;
+            next_link.reset();
+        }
+
+        const uint64_t padding = (512 - (size % 512)) % 512;
+        if (!is_safe_relative_path(name)) {
+            if (!reader.skip(size + padding)) return false;
+            continue;
+        }
+
+        const bool is_symlink = type == '2';
+        if (!is_symlink && has_symlink_ancestor(name, symlink_entries)) {
+            NATIVE_LOGW("skipping archive entry under symlink: %s", name.c_str());
+            if (!reader.skip(size + padding)) return false;
+            continue;
+        }
+
+        std::string out_path = join_path(destination, name);
+        auto mapped = java_listener.map(out_path, static_cast<int64_t>(size));
+        if (!mapped) {
+            if (!reader.skip(size + padding)) return false;
+            continue;
+        }
+        out_path = std::move(*mapped);
+
+        if (type == '5') {
+            if (!mkdirs_cached(out_path)) return false;
+        } else if (type == '2') {
+            // Wine prefixes legitimately use links like c: -> ../drive_c and z: -> /.
+            // Allow the link itself, but never extract later archive entries through it.
+            std::string parent_name = parent_entry_name(name);
+            if (!parent_name.empty() && has_symlink_ancestor(parent_name, symlink_entries)) {
+                NATIVE_LOGW("skipping symlink under symlinked parent: %s", name.c_str());
+                if (!reader.skip(size + padding)) return false;
+                continue;
+            }
+            if (!ensure_parent_cached(out_path)) return false;
+            ::unlink(out_path.c_str());
+            if (::symlink(link_name.c_str(), out_path.c_str()) != 0 && errno != EEXIST) {
+                NATIVE_LOGW("symlink failed for %s: %s", out_path.c_str(), std::strerror(errno));
+            }
+            symlink_entries.insert(trim_trailing_slashes(name));
+        } else if (type == '0' || type == '\0') {
+            if (!ensure_parent_cached(out_path)) return false;
+            FileWriter out(out_path, enforce_safe_symlinks);
+            if (!out.ok()) return false;
+
+            uint64_t remaining = size;
+            bool ok = true;
+            while (remaining > 0) {
+                const size_t chunk = static_cast<size_t>(std::min<uint64_t>(remaining, file_buffer.size()));
+                if (!reader.read_exact(file_buffer.data(), chunk)) {
+                    ok = false;
+                    break;
+                }
+                if (!out.write(file_buffer.data(), chunk)) {
+                    ok = false;
+                    break;
+                }
+                remaining -= chunk;
+            }
+            if (!out.close()) ok = false;
+            if (!ok) return false;
+            if ((mode & 0111) != 0) ::chmod(out_path.c_str(), 0771);
+            if (!java_listener.progress(out_path, static_cast<int64_t>(size))) return false;
+            if (!reader.skip(padding)) return false;
+            continue;
+        } else if (type == '1') {
+            if (!ensure_parent_cached(out_path)) return false;
+            ::unlink(out_path.c_str());
+            std::string clean_link_name = clean_entry_name(link_name);
+            if (!is_safe_relative_path(clean_link_name)) {
+                if (!reader.skip(size + padding)) return false;
+                continue;
+            }
+            if (has_symlink_ancestor(clean_link_name, symlink_entries)) {
+                NATIVE_LOGW("skipping hard link through symlink ancestor: %s", clean_link_name.c_str());
+                if (!reader.skip(size + padding)) return false;
+                continue;
+            }
+            std::string link_path = join_path(destination, clean_link_name);
+            if (::link(link_path.c_str(), out_path.c_str()) != 0) {
+                NATIVE_LOGW("hard link failed for %s: %s", out_path.c_str(), std::strerror(errno));
+            }
+            if (!java_listener.progress(out_path, static_cast<int64_t>(size))) return false;
+        }
+
+        if (!reader.skip(size + padding)) return false;
+        if (type == '5') ::chmod(out_path.c_str(), 0771);
+    }
+}
+
+struct DownloadContext {
+    FILE* file = nullptr;
+    JNIEnv* env = nullptr;
+    jobject listener = nullptr;
+    jmethodID on_progress = nullptr;
+    std::chrono::steady_clock::time_point last_update = std::chrono::steady_clock::now();
+};
+
+size_t curl_write_file(char* ptr, size_t size, size_t nmemb, void* userdata) {
+    auto* ctx = static_cast<DownloadContext*>(userdata);
+    const size_t bytes = size * nmemb;
+    return std::fwrite(ptr, 1, bytes, ctx->file);
+}
+
+int curl_progress(void* userdata, curl_off_t total, curl_off_t now, curl_off_t, curl_off_t) {
+    auto* ctx = static_cast<DownloadContext*>(userdata);
+    if (!ctx->listener || !ctx->on_progress) return 0;
+
+    auto current = std::chrono::steady_clock::now();
+    if (now == 0 || total == now ||
+        std::chrono::duration_cast<std::chrono::milliseconds>(current - ctx->last_update).count() >= 80) {
+        ctx->env->CallVoidMethod(
+            ctx->listener,
+            ctx->on_progress,
+            static_cast<jlong>(now),
+            static_cast<jlong>(total > 0 ? total : -1));
+        ctx->last_update = current;
+        if (ctx->env->ExceptionCheck()) return 1;
+    }
+    return 0;
+}
+
+void configure_curl_common(CURL* curl, const std::string& url, const std::string& ca_bundle) {
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15L);
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 0L);
+    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L);
+    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 30L);
+    curl_easy_setopt(curl, CURLOPT_USERAGENT, "WinNative/1.0");
+    curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "identity");
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L);
+    if (!ca_bundle.empty()) curl_easy_setopt(curl, CURLOPT_CAINFO, ca_bundle.c_str());
+}
+
+}  // namespace
+
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_shared_io_NativeContentIO_nativeExtractArchive(
+    JNIEnv* env, jclass, jint type, jstring jsource, jstring jdestination, jobject listener) {
+    std::string source = jstr(env, jsource);
+    std::string destination = jstr(env, jdestination);
+    if (source.empty() || destination.empty()) return JNI_FALSE;
+    if (!mkdirs(destination)) return JNI_FALSE;
+
+    bool ok = false;
+    if (type == 0) {
+        auto raw = std::make_unique<FileReader>(source);
+        if (!raw->ok()) return JNI_FALSE;
+        XzReader reader(std::move(raw));
+        ok = reader.ok() && extract_tar(reader, destination, env, listener, true);
+    } else if (type == 1) {
+        auto raw = std::make_unique<FileReader>(source);
+        if (!raw->ok()) return JNI_FALSE;
+        ZstdReader reader(std::move(raw));
+        ok = reader.ok() && extract_tar(reader, destination, env, listener, true);
+    }
+    if (!ok && env->ExceptionCheck()) return JNI_FALSE;
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_shared_io_NativeContentIO_nativeExtractAsset(
+    JNIEnv* env,
+    jclass,
+    jint type,
+    jobject jasset_manager,
+    jstring jasset_file,
+    jstring jdestination,
+    jobject listener) {
+    AAssetManager* manager = AAssetManager_fromJava(env, jasset_manager);
+    std::string asset_file = jstr(env, jasset_file);
+    std::string destination = jstr(env, jdestination);
+    if (!manager || asset_file.empty() || destination.empty()) return JNI_FALSE;
+    if (!mkdirs(destination)) return JNI_FALSE;
+
+    bool ok = false;
+    if (type == 0) {
+        auto raw = std::make_unique<AssetReader>(manager, asset_file);
+        if (!raw->ok()) return JNI_FALSE;
+        XzReader reader(std::move(raw));
+        ok = reader.ok() && extract_tar(reader, destination, env, listener, false);
+    } else if (type == 1) {
+        auto raw = std::make_unique<AssetReader>(manager, asset_file);
+        if (!raw->ok()) return JNI_FALSE;
+        ZstdReader reader(std::move(raw));
+        ok = reader.ok() && extract_tar(reader, destination, env, listener, false);
+    }
+    if (!ok && env->ExceptionCheck()) return JNI_FALSE;
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_shared_io_NativeContentIO_nativeDownloadFile(
+    JNIEnv* env, jclass, jstring jaddress, jstring jdestination, jstring jca_bundle, jobject listener) {
+    std::string address = jstr(env, jaddress);
+    std::string destination = jstr(env, jdestination);
+    std::string ca_bundle = jstr(env, jca_bundle);
+    if (address.empty() || destination.empty() || !ensure_parent_dir(destination)) return JNI_FALSE;
+
+    ensure_curl_global_init();
+    std::string partial = destination + ".part";
+    FILE* file = std::fopen(partial.c_str(), "wb");
+    if (!file) return JNI_FALSE;
+    std::setvbuf(file, nullptr, _IOFBF, kBufferSize);
+
+    DownloadContext ctx;
+    ctx.file = file;
+    ctx.env = env;
+    ctx.listener = listener;
+    if (listener) {
+        jclass cls = env->GetObjectClass(listener);
+        ctx.on_progress = env->GetMethodID(cls, "onProgress", "(JJ)V");
+        if (ctx.on_progress) {
+            env->CallVoidMethod(listener, ctx.on_progress, static_cast<jlong>(0), static_cast<jlong>(-1));
+        }
+    }
+
+    CURL* curl = curl_easy_init();
+    if (!curl) {
+        std::fclose(file);
+        ::unlink(partial.c_str());
+        return JNI_FALSE;
+    }
+    configure_curl_common(curl, address, ca_bundle);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_file);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &ctx);
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
+    curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, curl_progress);
+    curl_easy_setopt(curl, CURLOPT_XFERINFODATA, &ctx);
+
+    CURLcode rc = curl_easy_perform(curl);
+    long status = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status);
+    curl_off_t downloaded = 0;
+    curl_off_t expected = -1;
+    curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &downloaded);
+    curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &expected);
+    curl_easy_cleanup(curl);
+
+    bool ok = (rc == CURLE_OK && status >= 200 && status < 300);
+    if (expected >= 0 && downloaded != expected) ok = false;
+    if (std::fclose(file) != 0) ok = false;
+
+    if (ok && listener && ctx.on_progress && !env->ExceptionCheck()) {
+        env->CallVoidMethod(listener, ctx.on_progress, static_cast<jlong>(downloaded), static_cast<jlong>(downloaded));
+    }
+
+    if (!ok || env->ExceptionCheck()) {
+        ::unlink(partial.c_str());
+        NATIVE_LOGW("download failed for %s: curl=%d http=%ld", address.c_str(), static_cast<int>(rc), status);
+        return JNI_FALSE;
+    }
+
+    ::unlink(destination.c_str());
+    if (::rename(partial.c_str(), destination.c_str()) != 0) {
+        ::unlink(partial.c_str());
+        return JNI_FALSE;
+    }
+    return JNI_TRUE;
+}
+
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_shared_io_NativeContentIO_nativeFetchContentLength(
+    JNIEnv* env, jclass, jstring jaddress, jstring jca_bundle) {
+    std::string address = jstr(env, jaddress);
+    std::string ca_bundle = jstr(env, jca_bundle);
+    if (address.empty()) return -1;
+
+    ensure_curl_global_init();
+    CURL* curl = curl_easy_init();
+    if (!curl) return -1;
+    configure_curl_common(curl, address, ca_bundle);
+    curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
+    curl_easy_setopt(curl, CURLOPT_HEADER, 0L);
+
+    CURLcode rc = curl_easy_perform(curl);
+    long status = 0;
+    curl_off_t length = -1;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status);
+    curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &length);
+    curl_easy_cleanup(curl);
+    if (rc != CURLE_OK || status < 200 || status >= 300 || length < 0) return -1;
+    return static_cast<jlong>(length);
+}
diff --git a/app/src/main/cpp/winlator/ring_fence.c b/app/src/main/cpp/winlator/ring_fence.c
new file mode 100644
index 000000000..634f3a0a7
--- /dev/null
+++ b/app/src/main/cpp/winlator/ring_fence.c
@@ -0,0 +1,13 @@
+#include <jni.h>
+#include <stdatomic.h>
+
+// Store-store barrier (dmb ish on arm64) so ring event/snapshot payload stores
+// are visible to the guest-side reader before the sequence word that publishes
+// them. Pairs with the __ATOMIC_ACQUIRE loads in fakeinput.cpp.
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_runtime_input_controls_FakeInputWriter_nativeStoreFence(
+    JNIEnv *env, jclass clazz) {
+  (void)env;
+  (void)clazz;
+  atomic_thread_fence(memory_order_release);
+}
diff --git a/app/src/main/cpp/winlator/surface_compositor.c b/app/src/main/cpp/winlator/surface_compositor.c
index 910303897..f6ed4ba40 100644
--- a/app/src/main/cpp/winlator/surface_compositor.c
+++ b/app/src/main/cpp/winlator/surface_compositor.c
@@ -1,28 +1,20 @@
-// JNI wrapper around Android's ASurfaceControl / ASurfaceTransaction NDK API
-// (libandroid.so, API 29+). Phase-by-phase scope:
-//   * Phase 1 — `nativeIsAvailable` probe; nothing else.
-//   * Phase 2.1 — lifecycle: create a child ASurfaceControl bound to the
-//     XServerView's SurfaceView, hide it, parent it to the SurfaceView's
-//     layer, expose attach/detach/setColor/release.
-//   * Phase 2.2+ — buffer push, sync fence, real game frames.
+// JNI wrapper around ASurfaceControl / ASurfaceTransaction (libandroid.so,
+// API 29+). Hands a DRI3 game frame's AHardwareBuffer to a child
+// ASurfaceControl layer so HWC can scan it out from a DPU overlay plane
+// instead of the renderer blitting it.
 //
-// Symbols are resolved via dlopen/dlsym so the shared library still loads on
-// minSdk-26 devices that lack the API-29 entry points. Calling any resolved
-// pointer on a pre-API-29 device is gated by the Java side checking
-// `isAvailable()` first.
+// Symbols are dlopen/dlsym'd so the library still loads on minSdk-26 devices;
+// the Java side gates every call on SurfaceCompositor.isAvailable().
 //
-// Quoting the NDK documentation referenced while writing this:
-//   * `ASurfaceControl_createFromWindow` (surface_control.h:50-65) — caller
-//     owns the returned ASurfaceControl and must release it.
-//   * `ASurfaceTransaction_reparent` (surface_control.h:298-307) — passing
-//     a null new_parent removes the surface from the display.
-//   * `ASurfaceTransaction_setVisibility` (surface_control.h:323) — HIDE/SHOW.
-//   * `ASurfaceTransaction_setZOrder` (surface_control.h:329-339) — relative
-//     to siblings; default is 0; behaviour with same z is undefined.
-//   * `ASurfaceTransaction_setColor` (surface_control.h:359-370) — sets the
-//     background color for a layer that has no buffer; useful as a Phase 2.2
-//     proof-of-life and to avoid the "blank initial frame" race when a fresh
-//     SurfaceControl is shown before its first real buffer arrives.
+// Device-safety invariants (regressing any of these has caused soft reboots):
+//   - Never allocate a CPU_WRITE + COMPOSER_OVERLAY buffer. That combination
+//     panics some gralloc implementations (Adreno 6xx qdgralloc, MediaTek,
+//     older Exynos). This is why there is no proof-of-life smoke-test buffer.
+//   - Reject negative destination coordinates; some OEM ROMs crash SF on them.
+//   - Never release an ASurfaceControl while SF is still processing a
+//     transaction on it — crashes SF on Xiaomi/HyperOS.
+//
+// Ported from https://github.com/WinNative-Emu/WinNative/pull/380
 #include <android/data_space.h>
 #include <android/hardware_buffer.h>
 #include <android/log.h>
@@ -30,12 +22,14 @@
 #include <android/native_window_jni.h>
 #include <android/rect.h>
 #include <dlfcn.h>
+#include <errno.h>
 #include <jni.h>
 #include <pthread.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #define LOG_TAG "SurfaceCompositor"
@@ -48,22 +42,19 @@ struct ASurfaceControl;
 struct ASurfaceTransaction;
 
 // Mirror of `enum ASurfaceTransactionVisibility` (surface_control.h:312-315).
-// Hard-coded so we don't need to include <android/surface_control.h> (which
-// would fail to compile on minSdk-26 toolchains for direct symbol references).
 #define DC_VISIBILITY_HIDE ((int8_t)0)
 #define DC_VISIBILITY_SHOW ((int8_t)1)
 
 // Mirror of `enum ASurfaceTransactionTransparency` (surface_control.h:447-451).
-// OPAQUE tells HWC the buffer is fully opaque so it can skip per-pixel
-// alpha blending — important on Snapdragon DPUs where the alpha-blend stage
-// engages the HDR-aware composition pipeline (mixed SDR/HDR routing) which
-// boosts SDR-layer brightness vs the legacy GL composition path.
+// OPAQUE tells HWC the buffer is fully opaque so it can skip per-pixel alpha
+// blending — important on Snapdragon DPUs where the alpha-blend stage engages
+// the HDR-aware composition pipeline (mixed SDR/HDR routing) which boosts SDR
+// layer brightness vs the legacy GL composition path.
 #define DC_TRANSPARENCY_TRANSPARENT ((int8_t)0)
 #define DC_TRANSPARENCY_TRANSLUCENT ((int8_t)1)
 #define DC_TRANSPARENCY_OPAQUE      ((int8_t)2)
 
-// Function-pointer typedefs for every libandroid.so symbol we use. Kept in
-// the order they're documented in surface_control.h for easy cross-reference.
+// Function-pointer typedefs for every libandroid.so symbol we use.
 typedef struct ASurfaceControl* (*pfn_ASurfaceControl_createFromWindow)(
     ANativeWindow* parent, const char* debug_name);
 typedef void (*pfn_ASurfaceControl_release)(struct ASurfaceControl* sc);
@@ -82,7 +73,7 @@ typedef void (*pfn_ASurfaceTransaction_setZOrder)(struct ASurfaceTransaction* t,
 typedef void (*pfn_ASurfaceTransaction_setColor)(struct ASurfaceTransaction* t,
                                                  struct ASurfaceControl* sc,
                                                  float r, float g, float b, float alpha,
-                                                 int dataspace /* ADataSpace */);
+                                                 int dataspace);
 typedef void (*pfn_ASurfaceTransaction_setBuffer)(struct ASurfaceTransaction* t,
                                                   struct ASurfaceControl* sc,
                                                   AHardwareBuffer* buffer,
@@ -93,9 +84,7 @@ typedef void (*pfn_ASurfaceTransaction_setGeometry)(struct ASurfaceTransaction*
                                                     const ARect* source,
                                                     const ARect* destination,
                                                     int32_t transform);
-// API-31+ preferred geometry. When all four are present we prefer this path
-// per surface_control.h:387-391 ("setGeometry deprecated; use setCrop,
-// setPosition, setBufferTransform, setScale instead").
+// API-31+ preferred geometry.
 typedef void (*pfn_ASurfaceTransaction_setPosition)(struct ASurfaceTransaction* t,
                                                     struct ASurfaceControl* sc,
                                                     int32_t x, int32_t y);
@@ -108,28 +97,10 @@ typedef void (*pfn_ASurfaceTransaction_setCrop)(struct ASurfaceTransaction* t,
 typedef void (*pfn_ASurfaceTransaction_setBufferTransform)(struct ASurfaceTransaction* t,
                                                            struct ASurfaceControl* sc,
                                                            int32_t transform);
-
-// Phase 4 — colour / brightness control to neutralise the Snapdragon DPU's
-// HDR-aware composition pipeline that boosts SDR layer brightness vs the
-// legacy GL composition path.
-//
-// `setBufferDataSpace` (API 29) — explicit ADATASPACE_SRGB so HWC can't pick
-//     ADATASPACE_UNKNOWN from gralloc metadata and route through a path that
-//     speculatively decodes-then-re-encodes.
-// `setBufferTransparency` (API 29) — OPAQUE skips per-pixel alpha blend,
-//     bypassing the mixed-SDR/HDR routing stage on layers known to be
-//     fully-opaque (game swap-chain frames are RGBA8888 with alpha=1.0).
-// `setExtendedRangeBrightness` (API 34) — pin layer's extended-range ratio
-//     to (1.0, 1.0) so SurfaceFlinger's SDR-on-HDR-panel path doesn't apply
-//     a midtone boost. Default is (1.0, 1.0) but the AOSP pipeline only
-//     skips the boost when the call is explicit.
-//
-// All three are optional: if dlsym returns null we degrade to the prior
-// (visibly brighter) behaviour and log it once at startup so the missing
-// symbol is diagnosable from logcat without a re-build.
+// Colour / brightness control (optional — null on older Android).
 typedef void (*pfn_ASurfaceTransaction_setBufferDataSpace)(struct ASurfaceTransaction* t,
                                                            struct ASurfaceControl* sc,
-                                                           int data_space /* ADataSpace */);
+                                                           int data_space);
 typedef void (*pfn_ASurfaceTransaction_setBufferTransparency)(struct ASurfaceTransaction* t,
                                                               struct ASurfaceControl* sc,
                                                               int8_t transparency);
@@ -165,9 +136,113 @@ static pfn_ASurfaceTransaction_setBufferDataSpace g_tx_set_buffer_dataspace = NU
 static pfn_ASurfaceTransaction_setBufferTransparency g_tx_set_buffer_transparency = NULL;
 static pfn_ASurfaceTransaction_setExtendedRangeBrightness g_tx_set_extended_range_brightness = NULL;
 
-// `__typeof__` is the documented-extension spelling that doesn't trip
-// `-Wgnu-typeof-extension` under pedantic Clang flags. Equivalent to GCC/C23
-// `typeof` in every case we use it.
+// Hardware fence sync: setOnComplete callback fires on SF's binder thread when the buffer is on display.
+typedef struct ASurfaceTransactionStats ASurfaceTransactionStats;
+typedef void (*ASurfaceTransaction_OnComplete)(void* context, ASurfaceTransactionStats* stats);
+typedef void (*pfn_ASurfaceTransaction_setOnComplete)(struct ASurfaceTransaction* t, void* context, ASurfaceTransaction_OnComplete func);
+static pfn_ASurfaceTransaction_setOnComplete g_tx_set_on_complete = NULL;
+static bool g_has_on_complete = false;
+
+// === ATOMIC SUBMISSION GATE ===
+static pthread_mutex_t g_inflight_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t  g_inflight_cv    = PTHREAD_COND_INITIALIZER;
+static int g_inflight_count = 0;
+// Atomic flag: true while a transaction is pending in SF's pipeline.
+static volatile bool g_transaction_pending = false;
+
+static void inflight_increment(void) {
+    pthread_mutex_lock(&g_inflight_mutex);
+    g_inflight_count++;
+    pthread_mutex_unlock(&g_inflight_mutex);
+}
+
+static void inflight_decrement(void) {
+    pthread_mutex_lock(&g_inflight_mutex);
+    if (g_inflight_count > 0) g_inflight_count--;
+    if (g_inflight_count == 0) {
+        g_transaction_pending = false;
+        pthread_cond_broadcast(&g_inflight_cv);
+    }
+    pthread_mutex_unlock(&g_inflight_mutex);
+}
+
+// SF binder thread callback: flips the atomic gate back to false.
+static void on_transaction_complete(void* context, ASurfaceTransactionStats* stats) {
+    (void)context; (void)stats;
+    inflight_decrement();
+}
+
+// Block until any pending transaction completes (condvar wait, not busy-wait).
+static void wait_for_transaction_gate(long timeout_ms) {
+    struct timespec deadline;
+    clock_gettime(CLOCK_REALTIME, &deadline);
+    int64_t add_ns = (int64_t)timeout_ms * 1000000L;
+    deadline.tv_sec += (time_t)(add_ns / 1000000000L);
+    deadline.tv_nsec += (long)(add_ns % 1000000000L);
+    if (deadline.tv_nsec >= 1000000000L) { deadline.tv_nsec -= 1000000000L; deadline.tv_sec += 1; }
+    pthread_mutex_lock(&g_inflight_mutex);
+    while (g_transaction_pending) {
+        if (pthread_cond_timedwait(&g_inflight_cv, &g_inflight_mutex, &deadline) == ETIMEDOUT) {
+            g_transaction_pending = false; // force-clear on timeout to prevent deadlock
+            break;
+        }
+    }
+    pthread_mutex_unlock(&g_inflight_mutex);
+}
+
+// JNI: nativeWaitForPreviousFrame — blocks render thread until SF finishes (hardware signal, no CPU polling).
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeWaitForPreviousFrame(
+    JNIEnv* env, jobject thiz, jlong timeout_ms) {
+    (void)env; (void)thiz;
+    // g_inflight_count is only safe to read under the mutex; the loop below
+    // already short-circuits when nothing is in flight.
+    if (!g_has_on_complete) return JNI_TRUE;
+    struct timespec deadline;
+    clock_gettime(CLOCK_REALTIME, &deadline);
+    int64_t add_ns = (int64_t)timeout_ms * 1000000L;
+    deadline.tv_sec += (time_t)(add_ns / 1000000000L);
+    deadline.tv_nsec += (long)(add_ns % 1000000000L);
+    if (deadline.tv_nsec >= 1000000000L) { deadline.tv_nsec -= 1000000000L; deadline.tv_sec += 1; }
+    pthread_mutex_lock(&g_inflight_mutex);
+    bool ok = true;
+    while (g_inflight_count > 0) {
+        if (pthread_cond_timedwait(&g_inflight_cv, &g_inflight_mutex, &deadline) == ETIMEDOUT) {
+            ok = false; break;
+        }
+    }
+    pthread_mutex_unlock(&g_inflight_mutex);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+// Wait up to 500ms for all in-flight transactions to complete. Returns true
+// if all cleared, false on timeout (in which case release proceeds anyway —
+// holding the SC longer risks a worse deadlock).
+static bool inflight_wait_all(void) {
+    struct timespec deadline;
+    clock_gettime(CLOCK_REALTIME, &deadline);
+    deadline.tv_nsec += 500 * 1000000L;
+    if (deadline.tv_nsec >= 1000000000L) {
+        deadline.tv_nsec -= 1000000000L;
+        deadline.tv_sec += 1;
+    }
+    pthread_mutex_lock(&g_inflight_mutex);
+    bool ok = true;
+    while (g_inflight_count > 0) {
+        if (pthread_cond_timedwait(&g_inflight_cv, &g_inflight_mutex, &deadline) == ETIMEDOUT) {
+            LOGW("inflight_wait_all: timed out with %d in-flight; proceeding with release",
+                 g_inflight_count);
+            g_inflight_count = 0;
+            g_transaction_pending = false;
+            pthread_cond_broadcast(&g_inflight_cv);
+            ok = false;
+            break;
+        }
+    }
+    pthread_mutex_unlock(&g_inflight_mutex);
+    return ok;
+}
+
 #define RESOLVE(target, name) do {                              \
         void* sym = dlsym(g_libandroid, (name));                \
         (target) = (__typeof__(target))sym;                     \
@@ -194,60 +269,56 @@ static void init_once_locked(void) {
     RESOLVE(g_tx_set_color,        "ASurfaceTransaction_setColor");
     RESOLVE(g_tx_set_buffer,       "ASurfaceTransaction_setBuffer");
     RESOLVE(g_tx_set_geometry,     "ASurfaceTransaction_setGeometry");
-    // Optional API-31+ symbols — null on API 29/30, in which case we fall back
-    // to setGeometry. Not part of the availability gate.
+    // Optional API-31+ symbols — null on API 29/30, fall back to setGeometry.
     RESOLVE(g_tx_set_position,         "ASurfaceTransaction_setPosition");
     RESOLVE(g_tx_set_scale,            "ASurfaceTransaction_setScale");
     RESOLVE(g_tx_set_crop,             "ASurfaceTransaction_setCrop");
     RESOLVE(g_tx_set_buffer_transform, "ASurfaceTransaction_setBufferTransform");
-    // Phase 4 colour / brightness symbols. Optional — failure to resolve
-    // means we'll see the visibly-brighter behaviour and log the miss.
+    // Optional Phase-4 colour / brightness symbols.
     RESOLVE(g_tx_set_buffer_dataspace,         "ASurfaceTransaction_setBufferDataSpace");
     RESOLVE(g_tx_set_buffer_transparency,      "ASurfaceTransaction_setBufferTransparency");
     RESOLVE(g_tx_set_extended_range_brightness, "ASurfaceTransaction_setExtendedRangeBrightness");
+    RESOLVE(g_tx_set_on_complete, "ASurfaceTransaction_setOnComplete");
+    g_has_on_complete = (g_tx_set_on_complete != NULL);
+
+    // Availability gate: the Phase-1 lifecycle symbols + setBuffer + at least
+    // one COMPLETE geometry API (either the deprecated setGeometry, or all
+    // three of setPosition + setScale + setCrop) must be present.
+    bool has_complete_geometry_31 =
+        g_tx_set_position && g_tx_set_scale && g_tx_set_crop;
+    bool has_geometry = g_tx_set_geometry || has_complete_geometry_31;
+
+    g_available = g_create_from_window && g_sc_release
+                  && g_tx_create && g_tx_delete && g_tx_apply
+                  && g_tx_reparent && g_tx_set_visibility && g_tx_set_zorder
+                  && g_tx_set_buffer && has_geometry;
 
-    // Phase-1 lifecycle symbols + setBuffer + at least one COMPLETE geometry
-    // path are mandatory. The modern path requires all three of
-    // setPosition+setScale+setCrop together — accepting setPosition alone
-    // would leave us with no scaling primitive and silently render at the
-    // wrong size on a hypothetical device that ships only the position
-    // symbol. Fall back to setGeometry whenever any of the trio is missing.
-    bool modern_geom_complete = (g_tx_set_position != NULL) &&
-                                (g_tx_set_scale != NULL) &&
-                                (g_tx_set_crop != NULL);
-    bool legacy_geom = (g_tx_set_geometry != NULL);
-    g_available = (g_create_from_window != NULL) && (g_sc_release != NULL) &&
-                  (g_tx_create != NULL) && (g_tx_delete != NULL) &&
-                  (g_tx_apply != NULL) && (g_tx_reparent != NULL) &&
-                  (g_tx_set_visibility != NULL) && (g_tx_set_zorder != NULL) &&
-                  (g_tx_set_color != NULL) && (g_tx_set_buffer != NULL) &&
-                  (modern_geom_complete || legacy_geom);
     if (g_available) {
-        LOGI("Direct Composition NDK symbols resolved (geom=%s)",
-             modern_geom_complete ? "API31+" : "API29 setGeometry");
-        // Per-symbol diagnostic for the Phase 4 colour fix surface — printed
-        // once on first probe so we can distinguish "fix didn't apply" from
-        // "fix applied, vendor pipeline still boosting" in post-deploy
-        // logcats without rebuilding.
-        LOGI("Direct Composition colour symbols: setBufferDataSpace=%s setBufferTransparency=%s setExtendedRangeBrightness=%s",
+        LOGI("Direct Composition available. Geometry path: %s, colour symbols: "
+             "setBufferDataSpace=%s setBufferTransparency=%s setExtendedRangeBrightness=%s",
+             has_complete_geometry_31 ? "API-31+ (setPosition/setScale/setCrop)"
+                                       : "API-29 (setGeometry)",
              g_tx_set_buffer_dataspace          ? "yes" : "MISSING",
              g_tx_set_buffer_transparency       ? "yes" : "MISSING",
-             g_tx_set_extended_range_brightness ? "yes" : "MISSING (API < 34)");
+             g_tx_set_extended_range_brightness ? "yes (API 34+)" : "MISSING (API < 34)");
+        if (!g_has_on_complete) {
+            LOGW("ASurfaceTransaction_setOnComplete missing — no completion "
+                 "tracking; release falls back to a timed wait");
+        }
     } else {
-        LOGW("Direct Composition NDK symbols missing (API < 29 or stripped libandroid)");
+        LOGW("Direct Composition NOT available — missing required symbols");
     }
 }
 
 static bool ensure_initialised(void) {
     pthread_mutex_lock(&g_init_mutex);
     init_once_locked();
-    bool available = g_available;
     pthread_mutex_unlock(&g_init_mutex);
-    return available;
+    return g_available;
 }
 
 // ---------------------------------------------------------------------------
-// JNI: nativeIsAvailable() — Phase 1 probe, unchanged in Phase 2.
+// JNI: nativeIsAvailable() -> jboolean
 // ---------------------------------------------------------------------------
 JNIEXPORT jboolean JNICALL
 Java_com_winlator_cmod_runtime_display_composition_SurfaceCompositor_nativeIsAvailable(
@@ -257,182 +328,133 @@ Java_com_winlator_cmod_runtime_display_composition_SurfaceCompositor_nativeIsAva
     return ensure_initialised() ? JNI_TRUE : JNI_FALSE;
 }
 
-// ---------------------------------------------------------------------------
-// JNI: nativeAttachToSurface(Surface) -> jlong (ASurfaceControl*)
-//
-// Creates a child SurfaceControl bound to the SurfaceView's ANativeWindow.
-// Initial state is HIDDEN with z-order 1 (above the SurfaceView's primary
-// BufferQueue, which sits at the default z=0). Subsequent transactions
-// (Phase 2.2+) flip visibility on and push buffers.
-//
-// On any failure returns 0 and the Java caller falls back to the GLRenderer
-// path. The ANativeWindow is acquired and released within this call — the
-// returned ASurfaceControl holds its own reference to the underlying
-// SurfaceFlinger layer via the parent layer relationship.
-// ---------------------------------------------------------------------------
+// Creates a child ASurfaceControl at z=1, hidden until the first pushBuffer.
 JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeAttachToSurface(
-    JNIEnv* env, jclass clazz, jobject surface) {
-    (void)clazz;
-    if (!ensure_initialised()) {
-        LOGW("attachToSurface called but NDK is unavailable");
-        return 0;
-    }
+Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeCreateFromWindow(
+    JNIEnv* env, jobject thiz, jobject surface, jstring debug_name) {
+    (void)thiz;
+    if (!ensure_initialised()) return 0;
     if (surface == NULL) {
-        LOGE("attachToSurface called with null Surface");
+        LOGW("nativeCreateFromWindow: null Surface");
         return 0;
     }
-
-    ANativeWindow* window = ANativeWindow_fromSurface(env, surface);
-    if (window == NULL) {
-        LOGE("ANativeWindow_fromSurface returned null");
+    ANativeWindow* win = ANativeWindow_fromSurface(env, surface);
+    if (win == NULL) {
+        LOGE("nativeCreateFromWindow: ANativeWindow_fromSurface returned null");
         return 0;
     }
 
-    struct ASurfaceControl* sc = g_create_from_window(window, "winnative-direct-composition");
-    // ANativeWindow_fromSurface incremented the window's refcount; release our
-    // ref now — the SurfaceControl holds its own internal reference to the
-    // SurfaceFlinger layer that the window referenced.
-    ANativeWindow_release(window);
+    // Track the JNI-owned copy separately: if GetStringUTFChars fails we fall
+    // back to the literal, and releasing a literal is undefined behaviour.
+    const char* jni_name = NULL;
+    if (debug_name != NULL) {
+        jni_name = (*env)->GetStringUTFChars(env, debug_name, NULL);
+    }
+    const char* name_str = jni_name ? jni_name : "winnative-direct-composition";
 
+    struct ASurfaceControl* sc = g_create_from_window(win, name_str);
+    ANativeWindow_release(win);  // release the ref fromSurface acquired
+    if (jni_name != NULL) {
+        (*env)->ReleaseStringUTFChars(env, debug_name, jni_name);
+    }
     if (sc == NULL) {
-        LOGE("ASurfaceControl_createFromWindow returned null");
+        LOGE("nativeCreateFromWindow: ASurfaceControl_createFromWindow failed");
         return 0;
     }
 
-    // Initial transaction: hidden and z=1 (above the SurfaceView's primary BQ
-    // which is z=0). Per surface_control.h:323-326 a fresh SurfaceControl
-    // starts hidden by default, but applying the explicit setVisibility(HIDE)
-    // here makes the contract observable on the SurfaceFlinger side and
-    // guarantees we don't get a one-frame flash of an uninitialised layer.
+    // Hide the layer initially + set z=1. We show it on the first successful
+    // pushBuffer (atomic show + setBuffer avoids the blank-frame race).
     struct ASurfaceTransaction* tx = g_tx_create();
     if (tx == NULL) {
-        LOGE("ASurfaceTransaction_create returned null; releasing SC");
+        LOGE("nativeCreateFromWindow: tx_create failed");
         g_sc_release(sc);
         return 0;
     }
     g_tx_set_visibility(tx, sc, DC_VISIBILITY_HIDE);
     g_tx_set_zorder(tx, sc, 1);
+    inflight_increment();
     g_tx_apply(tx);
+    inflight_decrement();
     g_tx_delete(tx);
 
-    LOGI("Direct Composition layer attached (sc=%p)", (void*)sc);
+    LOGI("Direct Composition layer created: sc=%p", (void*)sc);
     return (jlong)(uintptr_t)sc;
 }
 
-// ---------------------------------------------------------------------------
-// JNI: nativeDetachAndRelease(jlong sc) -> void
-//
-// Reparents the SurfaceControl to null in a transaction, applies, then
-// releases. Per the agent research and Chromium's
-// android_surface_control_compat.cc convention, reparent-to-null *must*
-// happen before release, otherwise SurfaceFlinger may keep the orphaned
-// layer alive briefly past the parent's destruction and produce ghost
-// frames on re-attach.
-// ---------------------------------------------------------------------------
+// Reparents to null, drains in-flight transactions, then releases.
 JNIEXPORT void JNICALL
 Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeDetachAndRelease(
-    JNIEnv* env, jclass clazz, jlong sc_ptr) {
+    JNIEnv* env, jobject thiz, jlong sc_ptr) {
     (void)env;
-    (void)clazz;
+    (void)thiz;
     if (sc_ptr == 0) return;
-    if (!ensure_initialised()) {
-        // Should be impossible — the layer wouldn't exist if init had failed —
-        // but be defensive and don't dereference unresolved symbols.
-        LOGE("detachAndRelease called but NDK is unavailable; leaking SC=%p",
-             (void*)(uintptr_t)sc_ptr);
-        return;
-    }
+    if (!ensure_initialised()) return;
+
     struct ASurfaceControl* sc = (struct ASurfaceControl*)(uintptr_t)sc_ptr;
 
+    // Reparent to null — removes the layer from the display atomically.
     struct ASurfaceTransaction* tx = g_tx_create();
     if (tx != NULL) {
         g_tx_reparent(tx, sc, NULL);
+        inflight_increment();
         g_tx_apply(tx);
+        inflight_decrement();
         g_tx_delete(tx);
-    } else {
-        LOGW("detachAndRelease: tx_create failed; releasing without reparent");
     }
-    g_sc_release(sc);
-    LOGI("Direct Composition layer released (sc=%p)", (void*)sc);
-}
-
-// ---------------------------------------------------------------------------
-// JNI: nativeSetColor(jlong sc, float r, float g, float b, float a) -> void
-//
-// Phase 2.1 proof-of-life. Paints a solid color on the layer and unhides it
-// with the same transaction (atomic — avoids the documented "blank initial
-// frame" race). Useful as a smoke test that the lifecycle is wired correctly
-// before Phase 2.2 plumbs real AHardwareBuffer content.
-// ---------------------------------------------------------------------------
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeSetColor(
-    JNIEnv* env, jclass clazz, jlong sc_ptr,
-    jfloat r, jfloat g, jfloat b, jfloat a) {
-    (void)env;
-    (void)clazz;
-    if (sc_ptr == 0 || !ensure_initialised()) return;
-    struct ASurfaceControl* sc = (struct ASurfaceControl*)(uintptr_t)sc_ptr;
 
-    struct ASurfaceTransaction* tx = g_tx_create();
-    if (tx == NULL) {
-        LOGE("setColor: tx_create failed");
-        return;
+    // Wait for all in-flight transactions (including the one we just applied)
+    // to be processed by SF before releasing. This is the critical soft-boot
+    // fix: releasing a SC while SF is still processing a transaction on it
+    // crashes SF on Xiaomi/HyperOS 2.0+.
+    inflight_wait_all();
+
+    // Without setOnComplete there is nothing to count, so inflight_wait_all
+    // returns immediately and the release above would race SF exactly as it
+    // does on unhardened builds. Fall back to a bounded sleep (~2 frames at
+    // 60Hz) so SF has had time to process the reparent. Teardown-only, and
+    // only on devices whose libandroid.so lacks the symbol.
+    if (!g_has_on_complete) {
+        struct timespec ts = { .tv_sec = 0, .tv_nsec = 32 * 1000000L };
+        nanosleep(&ts, NULL);
     }
-    g_tx_set_color(tx, sc, r, g, b, a, ADATASPACE_SRGB);
-    g_tx_set_visibility(tx, sc, DC_VISIBILITY_SHOW);
-    g_tx_apply(tx);
-    g_tx_delete(tx);
+
+    g_sc_release(sc);
+    LOGI("Direct Composition layer released: sc=%p", (void*)sc);
 }
 
-// ---------------------------------------------------------------------------
-// JNI: nativeHide(jlong sc) -> void
-//
-// Hides the layer (used when falling back to the GLRenderer path on a frame
-// where direct-scanout doesn't qualify, see Phase 2.5).
-// ---------------------------------------------------------------------------
 JNIEXPORT void JNICALL
 Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeHide(
-    JNIEnv* env, jclass clazz, jlong sc_ptr) {
+    JNIEnv* env, jobject thiz, jlong sc_ptr) {
     (void)env;
-    (void)clazz;
-    if (sc_ptr == 0 || !ensure_initialised()) return;
+    (void)thiz;
+    if (sc_ptr == 0) return;
+    if (!ensure_initialised()) return;
     struct ASurfaceControl* sc = (struct ASurfaceControl*)(uintptr_t)sc_ptr;
-
     struct ASurfaceTransaction* tx = g_tx_create();
     if (tx == NULL) return;
     g_tx_set_visibility(tx, sc, DC_VISIBILITY_HIDE);
+    inflight_increment();
     g_tx_apply(tx);
+    inflight_decrement();
     g_tx_delete(tx);
 }
 
-// ---------------------------------------------------------------------------
-// JNI: nativePushBuffer(sc, ahb, x, y, w, h, fence_fd) -> jboolean
-//
-// Phase 2.2: hand an AHardwareBuffer-backed image to the SurfaceControl in
-// one transaction. The transaction also positions/sizes the layer in the
-// SurfaceView's coordinate space and unhides it (atomic — same transaction
-// avoids the documented "blank initial frame" race when transitioning from
-// hidden to first-buffer).
+// Per-frame hot path: setBuffer + geometry + SHOW in one atomic transaction,
+// which avoids a blank-frame race. The caller only invokes this when the
+// buffer or geometry actually changed.
 //
-// Geometry path:
-//   * Prefer setPosition + setScale + setCrop + setBufferTransform (API 31+)
-//   * Fall back to deprecated setGeometry (API 29-30)
-//
-// `acquire_fence_fd` semantics per surface_control.h:343-348: framework
-// takes ownership and closes it. Pass -1 when no GPU writes are pending
-// (e.g. the test buffer that was filled on the CPU before we got here).
-// ---------------------------------------------------------------------------
+// acquire_fence_fd must be closed on every error path — the framework only
+// takes ownership once setBuffer succeeds.
 JNIEXPORT jboolean JNICALL
 Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativePushBuffer(
     JNIEnv* env, jclass clazz, jlong sc_ptr, jlong ahb_ptr,
     jint dst_x, jint dst_y, jint dst_w, jint dst_h, jint acquire_fence_fd,
-    jboolean opaque) {
+    jboolean opaque, jboolean pace) {
     (void)env;
     (void)clazz;
+
+    // --- Validation ---
     if (sc_ptr == 0 || ahb_ptr == 0) {
-        // We promised the framework that we'd close any fence FD we received,
-        // even on the failure path — otherwise we leak FDs.
         if (acquire_fence_fd >= 0) close(acquire_fence_fd);
         return JNI_FALSE;
     }
@@ -440,8 +462,9 @@ Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_native
         if (acquire_fence_fd >= 0) close(acquire_fence_fd);
         return JNI_FALSE;
     }
-    if (dst_w <= 0 || dst_h <= 0) {
-        LOGW("pushBuffer: invalid dst rect %dx%d", dst_w, dst_h);
+    // Negative destination coordinates crash SF on some OEM ROMs.
+    if (dst_x < 0 || dst_y < 0 || dst_w <= 0 || dst_h <= 0) {
+        LOGW("pushBuffer: invalid dst rect %dx%d at (%d,%d)", dst_w, dst_h, dst_x, dst_y);
         if (acquire_fence_fd >= 0) close(acquire_fence_fd);
         return JNI_FALSE;
     }
@@ -449,7 +472,7 @@ Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_native
     struct ASurfaceControl* sc = (struct ASurfaceControl*)(uintptr_t)sc_ptr;
     AHardwareBuffer* ahb = (AHardwareBuffer*)(uintptr_t)ahb_ptr;
 
-    // Source rect = the entire buffer extents — query AHB for its native dims.
+    // Source rect = the entire buffer extents.
     AHardwareBuffer_Desc desc;
     memset(&desc, 0, sizeof(desc));
     AHardwareBuffer_describe(ahb, &desc);
@@ -458,6 +481,12 @@ Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_native
         if (acquire_fence_fd >= 0) close(acquire_fence_fd);
         return JNI_FALSE;
     }
+    if (!(desc.usage & AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY)) {
+        LOGW("pushBuffer: AHB usage 0x%llx lacks COMPOSER_OVERLAY, rejecting",
+             (unsigned long long)desc.usage);
+        if (acquire_fence_fd >= 0) close(acquire_fence_fd);
+        return JNI_FALSE;
+    }
 
     struct ASurfaceTransaction* tx = g_tx_create();
     if (tx == NULL) {
@@ -466,168 +495,64 @@ Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_native
         return JNI_FALSE;
     }
 
-    // setBuffer takes ownership of acquire_fence_fd. After this call, the
-    // framework will close the fd; we MUST NOT touch it again.
+    // setBuffer takes ownership of acquire_fence_fd on success. After this
+    // call the framework will close the fd; we MUST NOT touch it again.
     g_tx_set_buffer(tx, sc, ahb, acquire_fence_fd);
 
-    // Phase 4 colour / brightness control. Each call is best-effort — if the
-    // symbol wasn't resolved (older Android, stripped libandroid) we skip and
-    // the layer falls back to whatever default the platform applies. The
-    // missing-symbol case was logged once at init.
-    //
-    // Order within the transaction is irrelevant per surface_control.h:
-    // properties are committed atomically on apply().
+    // Colour / brightness control; each call is best-effort.
     if (g_tx_set_buffer_dataspace != NULL) {
         // Explicit ADATASPACE_SRGB so HWC can't pick UNKNOWN-via-gralloc and
         // route through a speculative re-encoding path.
         g_tx_set_buffer_dataspace(tx, sc, ADATASPACE_SRGB);
     }
     if (g_tx_set_buffer_transparency != NULL) {
-        // Caller-declared opacity — game frames are typically RGBA8888 with
-        // alpha=1.0 throughout, declaring OPAQUE skips alpha blending and
-        // bypasses the mixed-SDR/HDR routing stage that brightens layers.
-        // Untrusted/translucent surfaces pass opaque=false to keep
-        // PREMULTIPLIED behaviour.
+        // OPAQUE skips alpha blending, bypassing the mixed-SDR/HDR routing
+        // stage that brightens layers on Snapdragon DPUs.
         g_tx_set_buffer_transparency(tx, sc,
             opaque ? DC_TRANSPARENCY_OPAQUE : DC_TRANSPARENCY_TRANSLUCENT);
     }
     if (g_tx_set_extended_range_brightness != NULL) {
-        // Pin extended-range to (1.0, 1.0) — explicit "no HDR headroom
-        // requested." Default value but only assertively skips the
-        // SDR-on-HDR-panel midtone boost when stated.
+        // Pin extended-range to (1.0, 1.0) — explicit "no HDR headroom".
         g_tx_set_extended_range_brightness(tx, sc, 1.0f, 1.0f);
     }
 
-    // Geometry. The modern path lets us crop and scale independently; if
-    // unavailable on the device's libandroid, fall back to setGeometry.
-    if (g_tx_set_position != NULL && g_tx_set_scale != NULL && g_tx_set_crop != NULL) {
+    // Geometry: prefer API-31+ setPosition + setScale + setCrop; fall back to
+    // deprecated setGeometry on API 29-30.
+    if (g_tx_set_position && g_tx_set_scale && g_tx_set_crop) {
+        g_tx_set_position(tx, sc, dst_x, dst_y);
+        g_tx_set_scale(tx, sc,
+                       (float)dst_w / (float)desc.width,
+                       (float)dst_h / (float)desc.height);
         ARect crop = { 0, 0, (int32_t)desc.width, (int32_t)desc.height };
         g_tx_set_crop(tx, sc, &crop);
-        g_tx_set_position(tx, sc, dst_x, dst_y);
-        float xs = (float)dst_w / (float)desc.width;
-        float ys = (float)dst_h / (float)desc.height;
-        g_tx_set_scale(tx, sc, xs, ys);
-        if (g_tx_set_buffer_transform != NULL) {
-            g_tx_set_buffer_transform(tx, sc, 0); // no transform
-        }
-    } else if (g_tx_set_geometry != NULL) {
+    } else if (g_tx_set_geometry) {
         ARect src = { 0, 0, (int32_t)desc.width, (int32_t)desc.height };
         ARect dst = { dst_x, dst_y, dst_x + dst_w, dst_y + dst_h };
         g_tx_set_geometry(tx, sc, &src, &dst, 0);
     } else {
-        LOGE("pushBuffer: no geometry function available — should be impossible past availability gate");
+        LOGE("pushBuffer: no geometry API available");
+        // setBuffer already took ownership of acquire_fence_fd — but since we're
+        // deleting the tx without apply(), SF never processes it. The fd is leaked.
+        // Fix: we can't close it (setBuffer may have already consumed it), but
+        // g_tx_delete should handle cleanup. Log the error and proceed with apply
+        // so the framework closes the fd properly.
     }
 
-    // Unhide in the same transaction so the very first frame is the buffer
-    // we just supplied, not a blank/uninit layer.
+    // Atomic with setBuffer, so the layer never shows an empty frame.
     g_tx_set_visibility(tx, sc, DC_VISIBILITY_SHOW);
-    g_tx_apply(tx);
-    g_tx_delete(tx);
-    return JNI_TRUE;
-}
-
-// ---------------------------------------------------------------------------
-// JNI: nativeAllocateTestBuffer(width, height, argb_color) -> jlong
-//
-// Phase 2.2 smoke-test helper: allocates an AHardwareBuffer and CPU-fills it
-// with a single colour. Used so we can prove the SurfaceControl path is alive
-// (a small magenta swatch on top of the X server) before plumbing real Wine
-// frames in Phase 2.3.
-//
-// Format / usage: RGBA_8888 + GPU_SAMPLED_IMAGE + CPU_WRITE_RARELY +
-// COMPOSER_OVERLAY. Per surface_control.h:343-345 setBuffer requires
-// GPU_SAMPLED_IMAGE; COMPOSER_OVERLAY is a hint to gralloc that the buffer
-// may be scanned out by the display controller.
-// ---------------------------------------------------------------------------
-JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeAllocateTestBuffer(
-    JNIEnv* env, jclass clazz, jint width, jint height, jint argb_color) {
-    (void)env;
-    (void)clazz;
-    if (width <= 0 || height <= 0) return 0;
-
-    // Try the ideal flag set first: GPU sampling, CPU write (so we can fill
-    // the buffer in software), and COMPOSER_OVERLAY (hint to gralloc that
-    // this buffer should be eligible for HWC overlay-plane scanout). Some
-    // gralloc implementations on recent Adreno devices reject the
-    // CPU_WRITE + COMPOSER_OVERLAY combo — in that case fall back to a
-    // CPU-only buffer. We lose the overlay hint, but the smoke test still
-    // proves the SurfaceControl path is alive.
-    AHardwareBuffer_Desc desc;
-    memset(&desc, 0, sizeof(desc));
-    desc.width = (uint32_t)width;
-    desc.height = (uint32_t)height;
-    desc.layers = 1;
-    desc.format = AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
-    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE
-               | AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY
-               | AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY;
-
-    AHardwareBuffer* ahb = NULL;
-    int rc = AHardwareBuffer_allocate(&desc, &ahb);
-    if (rc != 0 || ahb == NULL) {
-        LOGW("allocateTestBuffer: GPU+CPU+OVERLAY failed (rc=%d), retrying without OVERLAY", rc);
-        desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE
-                   | AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY;
-        rc = AHardwareBuffer_allocate(&desc, &ahb);
-        if (rc != 0 || ahb == NULL) {
-            LOGW("allocateTestBuffer: both flag combos failed (rc=%d) for %dx%d",
-                 rc, width, height);
-            return 0;
-        }
-    }
 
-    void* mapped = NULL;
-    if (AHardwareBuffer_lock(
-            ahb, AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY,
-            -1, NULL, &mapped) != 0 || mapped == NULL) {
-        LOGW("allocateTestBuffer: AHardwareBuffer_lock failed");
-        AHardwareBuffer_release(ahb);
-        return 0;
-    }
-
-    // After lock we need the actual stride from gralloc — re-describe.
-    AHardwareBuffer_Desc realDesc;
-    memset(&realDesc, 0, sizeof(realDesc));
-    AHardwareBuffer_describe(ahb, &realDesc);
-
-    // Convert ARGB jint to little-endian RGBA u32. AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM
-    // is byte-packed: R, G, B, A. Java jint = 0xAARRGGBB. Layout the bytes as R,G,B,A.
-    uint8_t a = (uint8_t)((argb_color >> 24) & 0xFF);
-    uint8_t r = (uint8_t)((argb_color >> 16) & 0xFF);
-    uint8_t g = (uint8_t)((argb_color >>  8) & 0xFF);
-    uint8_t b = (uint8_t)((argb_color      ) & 0xFF);
-
-    uint8_t* base = (uint8_t*)mapped;
-    for (uint32_t y = 0; y < realDesc.height; ++y) {
-        uint8_t* row = base + (size_t)y * (size_t)realDesc.stride * 4u;
-        for (uint32_t x = 0; x < realDesc.width; ++x) {
-            row[x*4 + 0] = r;
-            row[x*4 + 1] = g;
-            row[x*4 + 2] = b;
-            row[x*4 + 3] = a;
-        }
-    }
-
-    if (AHardwareBuffer_unlock(ahb, NULL) != 0) {
-        LOGW("allocateTestBuffer: AHardwareBuffer_unlock failed");
-        // Keep the buffer anyway; SurfaceFlinger doesn't care about lock state.
+    // Block until SF has retired the previous transaction, so we pace to the
+    // display rather than queueing ahead of it.
+    if (g_has_on_complete) {
+        if (pace) wait_for_transaction_gate(17); // ~60Hz budget; condvar wait, not busy-spin
+        g_tx_set_on_complete(tx, NULL, on_transaction_complete);
+        g_transaction_pending = true;
+        inflight_increment();
+        g_tx_apply(tx);
+    } else {
+        g_tx_apply(tx);
     }
-    return (jlong)(uintptr_t)ahb;
-}
+    g_tx_delete(tx);
 
-// ---------------------------------------------------------------------------
-// JNI: nativeReleaseBuffer(ahbPtr) -> void
-//
-// Drops our reference to a test AHardwareBuffer. SurfaceFlinger may still
-// hold a ref if the buffer is the layer's current setBuffer — that's OK,
-// AHardwareBuffer is reference-counted and the layer's ref is independent.
-// ---------------------------------------------------------------------------
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_runtime_display_composition_DirectCompositionLayer_nativeReleaseBuffer(
-    JNIEnv* env, jclass clazz, jlong ahb_ptr) {
-    (void)env;
-    (void)clazz;
-    if (ahb_ptr == 0) return;
-    AHardwareBuffer_release((AHardwareBuffer*)(uintptr_t)ahb_ptr);
+    return JNI_TRUE;
 }
diff --git a/app/src/main/cpp/winlator/sync_fence.c b/app/src/main/cpp/winlator/sync_fence.c
new file mode 100644
index 000000000..46c6f3a0c
--- /dev/null
+++ b/app/src/main/cpp/winlator/sync_fence.c
@@ -0,0 +1,127 @@
+// Native sync_file / eventfd helpers backing SyncExtension's fence FDs.
+
+#include <android/log.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <jni.h>
+#include <poll.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/eventfd.h>
+#include <unistd.h>
+
+#define LOG_TAG "SyncFenceFd"
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+
+JNIEXPORT jintArray JNICALL
+Java_com_winlator_cmod_runtime_display_connector_SyncFenceFd_pollFds(
+    JNIEnv* env, jclass cls, jintArray fdsArray, jint timeoutMs)
+{
+    (void)cls;
+    if (fdsArray == NULL) return NULL;
+    jsize n = (*env)->GetArrayLength(env, fdsArray);
+    if (n == 0) return (*env)->NewIntArray(env, 0);
+
+    jint* fdsRaw = (*env)->GetIntArrayElements(env, fdsArray, NULL);
+    if (!fdsRaw) return NULL;
+
+    struct pollfd* pfds = calloc((size_t)n, sizeof(struct pollfd));
+    if (!pfds) {
+        (*env)->ReleaseIntArrayElements(env, fdsArray, fdsRaw, JNI_ABORT);
+        return NULL;
+    }
+    for (jsize i = 0; i < n; i++) {
+        pfds[i].fd = fdsRaw[i];
+        pfds[i].events = POLLIN;
+    }
+    (*env)->ReleaseIntArrayElements(env, fdsArray, fdsRaw, JNI_ABORT);
+
+    int rc;
+    do {
+        rc = poll(pfds, (nfds_t)n, timeoutMs);
+    } while (rc < 0 && errno == EINTR);
+
+    if (rc < 0) {
+        LOGW("poll() failed: %d", errno);
+        free(pfds);
+        return NULL;
+    }
+
+    jintArray result = (*env)->NewIntArray(env, n);
+    if (!result) {
+        free(pfds);
+        return NULL;
+    }
+
+    jint* revents = calloc((size_t)n, sizeof(jint));
+    if (!revents) {
+        free(pfds);
+        return NULL;
+    }
+    if (rc > 0) {
+        for (jsize i = 0; i < n; i++) revents[i] = (jint)pfds[i].revents;
+    }
+    (*env)->SetIntArrayRegion(env, result, 0, n, revents);
+    free(revents);
+    free(pfds);
+    return result;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_runtime_display_connector_SyncFenceFd_createSignalEventFd(
+    JNIEnv* env, jclass cls)
+{
+    (void)env; (void)cls;
+    int fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+    if (fd < 0) LOGW("eventfd() failed: %d", errno);
+    return fd;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_runtime_display_connector_SyncFenceFd_dupFd(
+    JNIEnv* env, jclass cls, jint fd)
+{
+    (void)env; (void)cls;
+    if (fd < 0) return -1;
+    int dup_fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
+    if (dup_fd < 0) LOGW("dup fd %d failed: %d", fd, errno);
+    return dup_fd;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_runtime_display_connector_SyncFenceFd_signalEventFd(
+    JNIEnv* env, jclass cls, jint fd)
+{
+    (void)env; (void)cls;
+    if (fd < 0) return;
+    uint64_t one = 1;
+    ssize_t r;
+    do {
+        r = write(fd, &one, sizeof(one));
+    } while (r < 0 && errno == EINTR);
+    if (r != (ssize_t)sizeof(one) && errno != EAGAIN) {
+        LOGW("eventfd signal failed on fd %d: %d", fd, errno);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_runtime_display_connector_SyncFenceFd_drainEventFd(
+    JNIEnv* env, jclass cls, jint fd)
+{
+    (void)env; (void)cls;
+    if (fd < 0) return;
+    uint64_t buf;
+    ssize_t r;
+    do {
+        r = read(fd, &buf, sizeof(buf));
+    } while (r < 0 && errno == EINTR);
+    // EAGAIN (nothing buffered) is expected; any other error is harmless here.
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_runtime_display_connector_SyncFenceFd_closeFd(
+    JNIEnv* env, jclass cls, jint fd)
+{
+    (void)env; (void)cls;
+    if (fd >= 0) close(fd);
+}
diff --git a/app/src/main/cpp/winlator/vk/bin2c.cmake b/app/src/main/cpp/winlator/vk/bin2c.cmake
new file mode 100644
index 000000000..c986fac9b
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/bin2c.cmake
@@ -0,0 +1,57 @@
+# bin2c.cmake — converts a binary SPIR-V file into a C header containing a uint32_t array.
+#
+# Required inputs:
+#   INPUT_FILE   path to .spv binary
+#   OUTPUT_FILE  path to .h to write
+#   VAR_NAME     C identifier for the array
+#
+# Invocation:
+#   ${CMAKE_COMMAND} -DINPUT_FILE=... -DOUTPUT_FILE=... -DVAR_NAME=... -P bin2c.cmake
+
+if(NOT INPUT_FILE OR NOT OUTPUT_FILE OR NOT VAR_NAME)
+    message(FATAL_ERROR "bin2c.cmake requires INPUT_FILE, OUTPUT_FILE, VAR_NAME")
+endif()
+
+file(READ "${INPUT_FILE}" hex_data HEX)
+string(LENGTH "${hex_data}" hex_len)
+math(EXPR byte_count "${hex_len} / 2")
+math(EXPR word_count "${byte_count} / 4")
+
+# SPIR-V is little-endian; chunk the hex stream into 4-byte little-endian words.
+set(words "")
+set(line_words "")
+set(words_per_line 0)
+math(EXPR last_byte_offset "${hex_len} - 8")
+
+set(i 0)
+while(i LESS hex_len)
+    string(SUBSTRING "${hex_data}" ${i} 2 b0)
+    math(EXPR i "${i} + 2")
+    string(SUBSTRING "${hex_data}" ${i} 2 b1)
+    math(EXPR i "${i} + 2")
+    string(SUBSTRING "${hex_data}" ${i} 2 b2)
+    math(EXPR i "${i} + 2")
+    string(SUBSTRING "${hex_data}" ${i} 2 b3)
+    math(EXPR i "${i} + 2")
+    string(APPEND line_words "0x${b3}${b2}${b1}${b0}, ")
+    math(EXPR words_per_line "${words_per_line} + 1")
+    if(words_per_line EQUAL 8)
+        string(APPEND words "    ${line_words}\n")
+        set(line_words "")
+        set(words_per_line 0)
+    endif()
+endwhile()
+if(words_per_line GREATER 0)
+    string(APPEND words "    ${line_words}\n")
+endif()
+
+file(WRITE "${OUTPUT_FILE}"
+"// Auto-generated from ${INPUT_FILE}. Do not edit.
+#pragma once
+#include <stdint.h>
+#include <stddef.h>
+
+static const uint32_t ${VAR_NAME}[] = {
+${words}};
+static const size_t ${VAR_NAME}_size = sizeof(${VAR_NAME});
+")
diff --git a/app/src/main/cpp/winlator/vk/shaders/blit.frag b/app/src/main/cpp/winlator/vk/shaders/blit.frag
new file mode 100644
index 000000000..18959355b
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/blit.frag
@@ -0,0 +1,10 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+void main() {
+    outColor = texture(screenTexture, vUV);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/cursor.frag b/app/src/main/cpp/winlator/vk/shaders/cursor.frag
new file mode 100644
index 000000000..69df6e951
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/cursor.frag
@@ -0,0 +1,10 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D srcTexture;
+
+void main() {
+    outColor = texture(srcTexture, vUV);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_coloradj.frag b/app/src/main/cpp/winlator/vk/shaders/effect_coloradj.frag
new file mode 100644
index 000000000..72891c484
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_coloradj.frag
@@ -0,0 +1,21 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float brightness;
+    float contrast;
+    float gamma;
+} pc;
+
+void main() {
+    vec3 color = texture(screenTexture, vUV).rgb;
+    vec3 adjusted = color + vec3(pc.brightness);
+    adjusted = (adjusted - 0.5) * (1.0 + pc.contrast) + 0.5;
+    adjusted = pow(clamp(adjusted, 0.0, 1.0), vec3(1.0 / max(pc.gamma, 0.01)));
+    outColor = vec4(clamp(adjusted, 0.0, 1.0), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_colorblind.frag b/app/src/main/cpp/winlator/vk/shaders/effect_colorblind.frag
new file mode 100644
index 000000000..4c8e06dfd
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_colorblind.frag
@@ -0,0 +1,52 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float mode;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec3 src = texture(screenTexture, vUV).rgb;
+    int m = int(pc.mode + 0.5);
+
+    vec3 c = pow(src, vec3(2.2));
+
+    float L = 17.8824   * c.r + 43.5161  * c.g + 4.11935 * c.b;
+    float M = 3.45565   * c.r + 27.1554  * c.g + 3.86714 * c.b;
+    float S = 0.0299566 * c.r + 0.184309 * c.g + 1.46709 * c.b;
+
+    float dL = L;
+    float dM = M;
+    float dS = S;
+    if (m == 1) {
+        dL = 2.02344 * M - 2.52581 * S;
+    } else if (m == 2) {
+        dM = 0.494207 * L + 1.24827 * S;
+    } else {
+        dS = -0.395913 * L + 0.801109 * M;
+    }
+
+    vec3 sim;
+    sim.r =  0.0809444479    * dL - 0.130504409   * dM + 0.116721066  * dS;
+    sim.g = -0.0102485335    * dL + 0.0540193266  * dM - 0.113614708  * dS;
+    sim.b = -0.000365296938  * dL - 0.00412161469 * dM + 0.693511405  * dS;
+
+    vec3 err = c - sim;
+    vec3 corrected = c;
+    if (m == 3) {
+        corrected.r += err.r + 0.7 * err.b;
+        corrected.g += err.g + 0.7 * err.b;
+    } else {
+        corrected.g += 0.7 * err.r + err.g;
+        corrected.b += 0.7 * err.r + err.b;
+    }
+    corrected = clamp(corrected, 0.0, 1.0);
+    outColor = vec4(pow(corrected, vec3(1.0 / 2.2)), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_colorgrade.frag b/app/src/main/cpp/winlator/vk/shaders/effect_colorgrade.frag
new file mode 100644
index 000000000..d9c85ed90
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_colorgrade.frag
@@ -0,0 +1,23 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float saturation;
+    float temperature;
+    float tint;
+} pc;
+
+void main() {
+    vec3 c = texture(screenTexture, vUV).rgb;
+    c.r *= 1.0 + pc.temperature * 0.30;
+    c.b *= 1.0 - pc.temperature * 0.30;
+    c.g *= 1.0 + pc.tint * 0.20;
+    float luma = dot(c, vec3(0.299, 0.587, 0.114));
+    c = mix(vec3(luma), c, pc.saturation);
+    outColor = vec4(clamp(c, 0.0, 1.0), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_crt.frag b/app/src/main/cpp/winlator/vk/shaders/effect_crt.frag
new file mode 100644
index 000000000..dd14a4fe4
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_crt.frag
@@ -0,0 +1,29 @@
+#version 450
+
+#define CA_AMOUNT 1.0025
+#define SCANLINE_INTENSITY_X 0.125
+#define SCANLINE_INTENSITY_Y 0.375
+#define SCANLINE_SIZE 1024.0
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float p0;
+    float p1;
+} pc;
+
+void main() {
+    vec4 finalColor = texture(screenTexture, vUV);
+    finalColor.rgb = vec3(
+        texture(screenTexture, (vUV - 0.5) * CA_AMOUNT + 0.5).r,
+        finalColor.g,
+        texture(screenTexture, (vUV - 0.5) / CA_AMOUNT + 0.5).b
+    );
+    float scanlineX = abs(sin(vUV.x * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_X);
+    float scanlineY = abs(sin(vUV.y * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_Y);
+    outColor = vec4(mix(finalColor.rgb, vec3(0.0), scanlineX + scanlineY), finalColor.a);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_hdr.frag b/app/src/main/cpp/winlator/vk/shaders/effect_hdr.frag
new file mode 100644
index 000000000..92d49fca1
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_hdr.frag
@@ -0,0 +1,49 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float p0;
+    float p1;
+} pc;
+
+const float HDRPower = 1.30;
+const float radius1  = 0.793;
+const float radius2  = 0.870;
+
+void main() {
+    vec2 texcoord = vUV;
+    vec2 px = 1.0 / pc.resolution;
+    vec3 color = texture(screenTexture, texcoord).rgb;
+
+    vec3 bloom_sum1  = texture(screenTexture, texcoord + vec2( 1.5, -1.5) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2(-1.5, -1.5) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2( 1.5,  1.5) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2(-1.5,  1.5) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2( 0.0, -2.5) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2( 0.0,  2.5) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2(-2.5,  0.0) * radius1 * px).rgb;
+         bloom_sum1 += texture(screenTexture, texcoord + vec2( 2.5,  0.0) * radius1 * px).rgb;
+         bloom_sum1 *= 0.005;
+
+    vec3 bloom_sum2  = texture(screenTexture, texcoord + vec2( 1.5, -1.5) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2(-1.5, -1.5) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2( 1.5,  1.5) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2(-1.5,  1.5) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2( 0.0, -2.5) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2( 0.0,  2.5) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2(-2.5,  0.0) * radius2 * px).rgb;
+         bloom_sum2 += texture(screenTexture, texcoord + vec2( 2.5,  0.0) * radius2 * px).rgb;
+         bloom_sum2 *= 0.010;
+
+    float dist = radius2 - radius1;
+    vec3 HDR = (color + (bloom_sum2 - bloom_sum1)) * dist;
+    vec3 blend = HDR + color;
+    color = pow(abs(blend), vec3(abs(HDRPower))) + HDR;
+
+    outColor = vec4(clamp(color, 0.0, 1.0), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_natural.frag b/app/src/main/cpp/winlator/vk/shaders/effect_natural.frag
new file mode 100644
index 000000000..ca3e8ba9e
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_natural.frag
@@ -0,0 +1,28 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float p0;
+    float p1;
+} pc;
+
+const mat3 RGBtoYIQ = mat3(0.299, 0.596, 0.212,
+                           0.587,-0.275,-0.523,
+                           0.114,-0.321, 0.311);
+const mat3 YIQtoRGB = mat3(1.0, 1.0, 1.0,
+                           0.95568806,-0.27158179,-1.10817732,
+                           0.61985809,-0.64687381, 1.70506455);
+const vec3 val00 = vec3(1.2, 1.2, 1.2);
+
+void main() {
+    vec3 c0 = texture(screenTexture, vUV).rgb;
+    vec3 t0 = c0 * RGBtoYIQ;
+    t0 = vec3(pow(t0.r, 1.12), t0.gb * val00.gb);
+    vec3 cFinal = t0 * YIQtoRGB;
+    outColor = vec4(cFinal, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_ntsc.frag b/app/src/main/cpp/winlator/vk/shaders/effect_ntsc.frag
new file mode 100644
index 000000000..2c864554f
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_ntsc.frag
@@ -0,0 +1,27 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float p0;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec2 res = pc.resolution.x > 0.0 ? pc.resolution : vec2(1280.0, 720.0);
+    vec2 texel = 1.0 / max(res, vec2(1.0));
+
+    vec3 color = texture(screenTexture, vUV).rgb;
+    vec3 shifted = color;
+    shifted.r = texture(screenTexture, vUV + vec2(0.0, texel.y * 1.25)).r;
+    shifted.b = texture(screenTexture, vUV - vec2(0.0, texel.y * 1.25)).b;
+
+    float bleed = sin((vUV.x * max(res.x, 1.0) + vUV.y * 24.0) * 0.45) * 0.018;
+    vec3 ntsc = clamp(mix(color, shifted + vec3(bleed), 0.65), 0.0, 1.0);
+    outColor = vec4(ntsc, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_ntsc2.frag b/app/src/main/cpp/winlator/vk/shaders/effect_ntsc2.frag
new file mode 100644
index 000000000..e6cfaeb73
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_ntsc2.frag
@@ -0,0 +1,27 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float p0;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec2 res = pc.resolution.x > 0.0 ? pc.resolution : vec2(1280.0, 720.0);
+    vec2 texel = 1.0 / max(res, vec2(1.0));
+
+    vec3 color = texture(screenTexture, vUV).rgb;
+    vec3 shifted = color;
+    shifted.r = texture(screenTexture, vUV + vec2(texel.x * 1.25, 0.0)).r;
+    shifted.b = texture(screenTexture, vUV - vec2(texel.x * 1.25, 0.0)).b;
+
+    float bleed = sin((vUV.y * max(res.y, 1.0) + vUV.x * 24.0) * 0.45) * 0.018;
+    vec3 ntsc = clamp(mix(color, shifted + vec3(bleed), 0.65), 0.0, 1.0);
+    outColor = vec4(ntsc, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_pixelate.frag b/app/src/main/cpp/winlator/vk/shaders/effect_pixelate.frag
new file mode 100644
index 000000000..129dfa7ed
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_pixelate.frag
@@ -0,0 +1,21 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float blockSize;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec2 res = pc.resolution.x > 0.0 ? pc.resolution : vec2(1280.0, 720.0);
+    float bs = max(pc.blockSize, 1.0);
+    vec2 grid = max(res / bs, vec2(1.0));
+    vec2 uv = (floor(vUV * grid) + 0.5) / grid;
+    outColor = vec4(texture(screenTexture, uv).rgb, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_scanlines.frag b/app/src/main/cpp/winlator/vk/shaders/effect_scanlines.frag
new file mode 100644
index 000000000..1d8260021
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_scanlines.frag
@@ -0,0 +1,21 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float intensity;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec2 res = pc.resolution.x > 0.0 ? pc.resolution : vec2(1280.0, 720.0);
+    vec3 c = texture(screenTexture, vUV).rgb;
+    float band = 0.5 + 0.5 * sin(vUV.y * res.y * 1.5708);
+    c *= 1.0 - pc.intensity * (1.0 - band);
+    outColor = vec4(clamp(c, 0.0, 1.0), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_sharpen.frag b/app/src/main/cpp/winlator/vk/shaders/effect_sharpen.frag
new file mode 100644
index 000000000..c6f4907a7
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_sharpen.frag
@@ -0,0 +1,29 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float strength;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec2 res = pc.resolution.x > 0.0 ? pc.resolution : vec2(1280.0, 720.0);
+    vec2 t = 1.0 / max(res, vec2(1.0));
+
+    vec3 c = texture(screenTexture, vUV).rgb;
+    vec3 blur = (
+        texture(screenTexture, vUV + vec2(0.0, -t.y)).rgb +
+        texture(screenTexture, vUV + vec2(0.0,  t.y)).rgb +
+        texture(screenTexture, vUV + vec2(-t.x, 0.0)).rgb +
+        texture(screenTexture, vUV + vec2( t.x, 0.0)).rgb
+    ) * 0.25;
+
+    vec3 sharp = c + (c - blur) * (pc.strength * 1.5);
+    outColor = vec4(clamp(sharp, 0.0, 1.0), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_toon.frag b/app/src/main/cpp/winlator/vk/shaders/effect_toon.frag
new file mode 100644
index 000000000..0efeefdd7
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_toon.frag
@@ -0,0 +1,20 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2 resolution;
+    float p0;
+    float p1;
+    float p2;
+} pc;
+
+void main() {
+    vec3 c = texture(screenTexture, vUV).rgb;
+    float levels = 6.0;
+    vec3 toon = floor(clamp(c, 0.0, 1.0) * levels + 0.5) / levels;
+    outColor = vec4(toon, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/effect_vivid.frag b/app/src/main/cpp/winlator/vk/shaders/effect_vivid.frag
new file mode 100644
index 000000000..19b615f88
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/effect_vivid.frag
@@ -0,0 +1,37 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2  resolution;
+    float saturation;
+    float contrast;
+    float sharpness;
+    float mode;
+} pc;
+
+void main() {
+    float SAT = pc.saturation > 0.0 ? pc.saturation : 1.0;
+    float CON = pc.contrast > 0.0 ? pc.contrast : 1.0;
+    float SHARP = pc.sharpness > 0.0 ? pc.sharpness : 0.5;
+
+    vec2 res = pc.resolution.x > 0.0 ? pc.resolution : vec2(1280.0, 720.0);
+    vec2 stp = 1.0 / res;
+
+    vec3 center = texture(screenTexture, vUV).rgb;
+    center = (center - 0.5) * CON + 0.5;
+    float gray = dot(center, vec3(0.299, 0.587, 0.114));
+    center = mix(vec3(gray), center, SAT);
+    vec3 blur = (
+        texture(screenTexture, vUV + vec2(0.0, -stp.y)).rgb +
+        texture(screenTexture, vUV + vec2(0.0,  stp.y)).rgb +
+        texture(screenTexture, vUV + vec2(-stp.x, 0.0)).rgb +
+        texture(screenTexture, vUV + vec2( stp.x, 0.0)).rgb
+    ) * 0.25;
+
+    center = center + (center - blur) * SHARP;
+    outColor = vec4(clamp(center, 0.0, 1.0), 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/quad.vert b/app/src/main/cpp/winlator/vk/shaders/quad.vert
new file mode 100644
index 000000000..34e88df8b
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/quad.vert
@@ -0,0 +1,10 @@
+#version 450
+
+layout(location = 0) out vec2 vUV;
+
+// Full-screen triangle: covers the viewport with a single triangle drawn from 3 vertices.
+// gl_VertexIndex 0 -> (-1,-1), 1 -> (3,-1), 2 -> (-1,3); UV mirrors clip-space [0..1] within visible quad.
+void main() {
+    vUV = vec2((gl_VertexIndex << 1) & 2, gl_VertexIndex & 2);
+    gl_Position = vec4(vUV * 2.0 - 1.0, 0.0, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/sgsr1.frag b/app/src/main/cpp/winlator/vk/shaders/sgsr1.frag
new file mode 100644
index 000000000..37a7bc07b
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/sgsr1.frag
@@ -0,0 +1,108 @@
+#version 450
+
+// Snapdragon Game Super Resolution 1 spatial upscale pass.
+//
+// Adapted for WinNative's Vulkan compositor from Qualcomm's SGSR v1 mobile
+// fragment shader.
+// Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
+// SPDX-License-Identifier: BSD-3-Clause
+
+// Keep SGSR math mediump, but texel-space coordinates highp.
+precision mediump float;
+precision highp int;
+
+layout(location = 0) in highp vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform mediump sampler2D screenTexture;
+
+layout(push_constant) uniform PC {
+    vec2  resolution;
+    float saturation;
+    float contrast;
+    float sharpness;
+    float mode;
+} pc;
+
+const int OPERATION_MODE = 1; // RGBA mode uses green as the luma proxy.
+const float EDGE_THRESHOLD = 8.0 / 255.0;
+
+float fastLanczos2(float x) {
+    float wA = x - 4.0;
+    float wB = x * wA - wA;
+    wA *= wA;
+    return wB * wA;
+}
+
+vec2 weightY(float dx, float dy, float c, float std) {
+    float x = (dx * dx + dy * dy) * 0.55 + clamp(abs(c) * std, 0.0, 1.0);
+    float w = fastLanczos2(x);
+    return vec2(w, w * c);
+}
+
+void main() {
+    highp vec2 inputSize = vec2(textureSize(screenTexture, 0));
+    vec4 color = vec4(textureLod(screenTexture, vUV, 0.0).rgb, 1.0);
+
+    if (inputSize.x < 2.0 || inputSize.y < 2.0) {
+        outColor = color;
+        return;
+    }
+
+    highp vec4 viewportInfo = vec4(1.0 / inputSize, inputSize);
+    highp vec2 imgCoord = vUV * viewportInfo.zw + vec2(-0.5, 0.5);
+    highp vec2 imgCoordPixel = floor(imgCoord);
+    highp vec2 coord = imgCoordPixel * viewportInfo.xy;
+    vec2 pl = imgCoord - imgCoordPixel;
+
+    vec4 left = textureGather(screenTexture, coord, OPERATION_MODE);
+    float centerY = color[OPERATION_MODE];
+    float edgeVote = abs(left.z - left.y) + abs(centerY - left.y) + abs(centerY - left.z);
+
+    if (edgeVote > EDGE_THRESHOLD) {
+        coord.x += viewportInfo.x;
+        vec4 right = textureGather(screenTexture, coord + vec2(viewportInfo.x, 0.0),
+                                   OPERATION_MODE);
+        vec4 upDown;
+        upDown.xy = textureGather(screenTexture, coord + vec2(0.0, -viewportInfo.y),
+                                  OPERATION_MODE).wz;
+        upDown.zw = textureGather(screenTexture, coord + vec2(0.0, viewportInfo.y),
+                                  OPERATION_MODE).yx;
+
+        float mean = (left.y + left.z + right.x + right.w) * 0.25;
+        left -= vec4(mean);
+        right -= vec4(mean);
+        upDown -= vec4(mean);
+        color.w = centerY - mean;
+
+        float sum =
+            abs(left.x) + abs(left.y) + abs(left.z) + abs(left.w) +
+            abs(right.x) + abs(right.y) + abs(right.z) + abs(right.w) +
+            abs(upDown.x) + abs(upDown.y) + abs(upDown.z) + abs(upDown.w);
+        float std = 2.181818 / max(sum, 1.0e-6);
+
+        vec2 aWY = weightY(pl.x,       pl.y + 1.0,  upDown.x, std);
+        aWY += weightY(pl.x - 1.0, pl.y + 1.0,  upDown.y, std);
+        aWY += weightY(pl.x - 1.0, pl.y - 2.0,  upDown.z, std);
+        aWY += weightY(pl.x,       pl.y - 2.0,  upDown.w, std);
+        aWY += weightY(pl.x + 1.0, pl.y - 1.0,  left.x, std);
+        aWY += weightY(pl.x,       pl.y - 1.0,  left.y, std);
+        aWY += weightY(pl.x,       pl.y,        left.z, std);
+        aWY += weightY(pl.x + 1.0, pl.y,        left.w, std);
+        aWY += weightY(pl.x - 1.0, pl.y - 1.0,  right.x, std);
+        aWY += weightY(pl.x - 2.0, pl.y - 1.0,  right.y, std);
+        aWY += weightY(pl.x - 2.0, pl.y,        right.z, std);
+        aWY += weightY(pl.x - 1.0, pl.y,        right.w, std);
+
+        float finalY = aWY.y / max(aWY.x, 1.0e-6);
+        float maxY = max(max(left.y, left.z), max(right.x, right.w));
+        float minY = min(min(left.y, left.z), min(right.x, right.w));
+        float edgeSharpness = mix(1.0, 2.0, clamp(pc.sharpness, 0.0, 1.0));
+        finalY = clamp(edgeSharpness * finalY, minY, maxY);
+
+        float deltaY = clamp(finalY - color.w, -23.0 / 255.0, 23.0 / 255.0);
+        color.rgb = clamp(color.rgb + vec3(deltaY), 0.0, 1.0);
+    }
+
+    outColor = vec4(color.rgb, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/window.frag b/app/src/main/cpp/winlator/vk/shaders/window.frag
new file mode 100644
index 000000000..08fc442aa
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/window.frag
@@ -0,0 +1,20 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+layout(set = 0, binding = 0) uniform sampler2D srcTexture;
+layout(push_constant) uniform PC {
+    float xform[6];
+    vec2 viewSize;
+    vec4 uvRect;
+    int swapRB;
+} pc;
+
+void main() {
+    vec3 color = texture(srcTexture, vUV).rgb;
+    if (pc.swapRB != 0) {
+        color = color.bgr;
+    }
+    outColor = vec4(color, 1.0);
+}
diff --git a/app/src/main/cpp/winlator/vk/shaders/window.vert b/app/src/main/cpp/winlator/vk/shaders/window.vert
new file mode 100644
index 000000000..ff27e9b0d
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/shaders/window.vert
@@ -0,0 +1,23 @@
+#version 450
+
+layout(location = 0) in vec2 position;
+layout(location = 0) out vec2 vUV;
+
+layout(push_constant) uniform PC {
+    float xform[6];
+    vec2 viewSize;
+    vec4 uvRect;
+} pc;
+
+void main() {
+    vUV = mix(pc.uvRect.xy, pc.uvRect.zw, position);
+    vec2 t = vec2(
+        pc.xform[0] * position.x + pc.xform[2] * position.y + pc.xform[4],
+        pc.xform[1] * position.x + pc.xform[3] * position.y + pc.xform[5]
+    );
+    gl_Position = vec4(
+        2.0 * t.x / pc.viewSize.x - 1.0,
+        2.0 * t.y / pc.viewSize.y - 1.0,
+        0.0, 1.0
+    );
+}
diff --git a/app/src/main/cpp/winlator/vk/vk_dispatch.c b/app/src/main/cpp/winlator/vk/vk_dispatch.c
new file mode 100644
index 000000000..870c1456c
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/vk_dispatch.c
@@ -0,0 +1,177 @@
+#include "vk_dispatch.h"
+
+#include <android/log.h>
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define LOG_TAG "VkDispatch"
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+
+VkDispatch vkd;
+
+bool vkd_init(void* libvulkan_handle) {
+    if (!libvulkan_handle) return false;
+    memset(&vkd, 0, sizeof(vkd));
+
+    vkd.GetInstanceProcAddr =
+        (PFN_vkGetInstanceProcAddr)dlsym(libvulkan_handle, "vkGetInstanceProcAddr");
+    if (!vkd.GetInstanceProcAddr) {
+        LOGE("dlsym(vkGetInstanceProcAddr) failed: %s", dlerror());
+        return false;
+    }
+
+    // Per spec, these three resolve with VK_NULL_HANDLE before any instance exists.
+    vkd.CreateInstance = (PFN_vkCreateInstance)
+        vkd.GetInstanceProcAddr(VK_NULL_HANDLE, "vkCreateInstance");
+    vkd.EnumerateInstanceExtensionProperties = (PFN_vkEnumerateInstanceExtensionProperties)
+        vkd.GetInstanceProcAddr(VK_NULL_HANDLE, "vkEnumerateInstanceExtensionProperties");
+    vkd.EnumerateInstanceLayerProperties = (PFN_vkEnumerateInstanceLayerProperties)
+        vkd.GetInstanceProcAddr(VK_NULL_HANDLE, "vkEnumerateInstanceLayerProperties");
+
+    if (!vkd.CreateInstance) {
+        LOGE("vkGetInstanceProcAddr returned NULL for vkCreateInstance");
+        return false;
+    }
+    return true;
+}
+
+bool vkd_load_instance(VkInstance instance) {
+    if (!vkd.GetInstanceProcAddr || instance == VK_NULL_HANDLE) return false;
+
+    // Device entry points resolve via vkGetInstanceProcAddr too — the loader trampolines.
+    // See vk_dispatch.h for the rationale.
+    #define LOAD(name) \
+        vkd.name = (PFN_vk##name)vkd.GetInstanceProcAddr(instance, "vk" #name)
+
+    // Instance / physical-device
+    LOAD(DestroyInstance);
+    LOAD(EnumeratePhysicalDevices);
+    LOAD(GetPhysicalDeviceProperties);
+    LOAD(GetPhysicalDeviceMemoryProperties);
+    LOAD(GetPhysicalDeviceQueueFamilyProperties);
+    LOAD(GetPhysicalDeviceFormatProperties);
+    LOAD(GetPhysicalDeviceImageFormatProperties);
+    LOAD(GetPhysicalDeviceSurfaceCapabilitiesKHR);
+    LOAD(GetPhysicalDeviceSurfaceFormatsKHR);
+    LOAD(GetPhysicalDeviceSurfacePresentModesKHR);
+    LOAD(GetPhysicalDeviceSurfaceSupportKHR);
+    LOAD(CreateAndroidSurfaceKHR);
+    LOAD(DestroySurfaceKHR);
+    LOAD(CreateDevice);
+    LOAD(EnumerateDeviceExtensionProperties);
+    LOAD(CreateDebugUtilsMessengerEXT);
+    LOAD(DestroyDebugUtilsMessengerEXT);
+
+    // Device
+    LOAD(GetDeviceProcAddr);
+    LOAD(DestroyDevice);
+    LOAD(GetDeviceQueue);
+    LOAD(DeviceWaitIdle);
+
+    // Memory
+    LOAD(AllocateMemory);
+    LOAD(FreeMemory);
+    LOAD(MapMemory);
+    LOAD(UnmapMemory);
+    LOAD(FlushMappedMemoryRanges);
+    LOAD(GetAndroidHardwareBufferPropertiesANDROID);
+
+    // Buffer
+    LOAD(CreateBuffer);
+    LOAD(DestroyBuffer);
+    LOAD(BindBufferMemory);
+    LOAD(GetBufferMemoryRequirements);
+
+    // Image / image view
+    LOAD(CreateImage);
+    LOAD(DestroyImage);
+    LOAD(BindImageMemory);
+    LOAD(GetImageMemoryRequirements);
+    LOAD(CreateImageView);
+    LOAD(DestroyImageView);
+
+    // Sampler / YCbCr
+    LOAD(CreateSampler);
+    LOAD(DestroySampler);
+    LOAD(CreateSamplerYcbcrConversion);
+    LOAD(DestroySamplerYcbcrConversion);
+    LOAD(CreateSamplerYcbcrConversionKHR);
+    LOAD(DestroySamplerYcbcrConversionKHR);
+
+    // Descriptors
+    LOAD(CreateDescriptorSetLayout);
+    LOAD(DestroyDescriptorSetLayout);
+    LOAD(CreateDescriptorPool);
+    LOAD(DestroyDescriptorPool);
+    LOAD(AllocateDescriptorSets);
+    LOAD(FreeDescriptorSets);
+    LOAD(UpdateDescriptorSets);
+
+    // Pipeline
+    LOAD(CreatePipelineLayout);
+    LOAD(DestroyPipelineLayout);
+    LOAD(CreateGraphicsPipelines);
+    LOAD(DestroyPipeline);
+    LOAD(CreateShaderModule);
+    LOAD(DestroyShaderModule);
+
+    // RenderPass / Framebuffer
+    LOAD(CreateRenderPass);
+    LOAD(DestroyRenderPass);
+    LOAD(CreateFramebuffer);
+    LOAD(DestroyFramebuffer);
+
+    // Sync
+    LOAD(CreateFence);
+    LOAD(DestroyFence);
+    LOAD(ResetFences);
+    LOAD(WaitForFences);
+    LOAD(CreateSemaphore);
+    LOAD(DestroySemaphore);
+
+    // Commands
+    LOAD(CreateCommandPool);
+    LOAD(DestroyCommandPool);
+    LOAD(ResetCommandPool);
+    LOAD(AllocateCommandBuffers);
+    LOAD(FreeCommandBuffers);
+    LOAD(BeginCommandBuffer);
+    LOAD(EndCommandBuffer);
+    LOAD(ResetCommandBuffer);
+    LOAD(CmdBeginRenderPass);
+    LOAD(CmdEndRenderPass);
+    LOAD(CmdBindPipeline);
+    LOAD(CmdBindDescriptorSets);
+    LOAD(CmdBindVertexBuffers);
+    LOAD(CmdPushConstants);
+    LOAD(CmdSetViewport);
+    LOAD(CmdSetScissor);
+    LOAD(CmdDraw);
+    LOAD(CmdPipelineBarrier);
+    LOAD(CmdCopyBufferToImage);
+    LOAD(CmdBlitImage);
+
+    // Queue
+    LOAD(QueueSubmit);
+    LOAD(QueueWaitIdle);
+    LOAD(QueuePresentKHR);
+
+    // Swapchain
+    LOAD(CreateSwapchainKHR);
+    LOAD(DestroySwapchainKHR);
+    LOAD(GetSwapchainImagesKHR);
+    LOAD(AcquireNextImageKHR);
+
+    #undef LOAD
+
+    if (!vkd.DestroyInstance || !vkd.EnumeratePhysicalDevices || !vkd.CreateDevice) {
+        LOGE("vkd_load_instance: required core entry points missing");
+        return false;
+    }
+    return true;
+}
+
+void vkd_unload(void) {
+    memset(&vkd, 0, sizeof(vkd));
+}
diff --git a/app/src/main/cpp/winlator/vk/vk_dispatch.h b/app/src/main/cpp/winlator/vk/vk_dispatch.h
new file mode 100644
index 000000000..812b084b6
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/vk_dispatch.h
@@ -0,0 +1,266 @@
+// Function-pointer dispatch for the compositor's Vulkan calls.
+//
+// Required because adrenotools-loaded drivers live in an isolated linker namespace and do
+// not share global symbols with the system loader — every call must resolve through the
+// libvulkan handle chosen at dlopen time.
+//
+// Init order: vkd_init(handle) -> vkCreateInstance(...) -> vkd_load_instance(instance).
+
+#pragma once
+
+#ifndef VK_NO_PROTOTYPES
+#define VK_NO_PROTOTYPES
+#endif
+#include <stdbool.h>
+#include <vulkan/vulkan.h>
+
+typedef struct VkDispatch {
+    // Loader-level (resolved via dlsym + vkGetInstanceProcAddr(NULL, ...))
+    PFN_vkGetInstanceProcAddr GetInstanceProcAddr;
+    PFN_vkCreateInstance CreateInstance;
+    PFN_vkEnumerateInstanceExtensionProperties EnumerateInstanceExtensionProperties;
+    PFN_vkEnumerateInstanceLayerProperties EnumerateInstanceLayerProperties;
+
+    // Instance / physical-device
+    PFN_vkDestroyInstance DestroyInstance;
+    PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices;
+    PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
+    PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties;
+    PFN_vkGetPhysicalDeviceQueueFamilyProperties GetPhysicalDeviceQueueFamilyProperties;
+    PFN_vkGetPhysicalDeviceFormatProperties GetPhysicalDeviceFormatProperties;
+    PFN_vkGetPhysicalDeviceImageFormatProperties GetPhysicalDeviceImageFormatProperties;
+    PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR GetPhysicalDeviceSurfaceCapabilitiesKHR;
+    PFN_vkGetPhysicalDeviceSurfaceFormatsKHR GetPhysicalDeviceSurfaceFormatsKHR;
+    PFN_vkGetPhysicalDeviceSurfacePresentModesKHR GetPhysicalDeviceSurfacePresentModesKHR;
+    PFN_vkGetPhysicalDeviceSurfaceSupportKHR GetPhysicalDeviceSurfaceSupportKHR;
+    PFN_vkCreateAndroidSurfaceKHR CreateAndroidSurfaceKHR;
+    PFN_vkDestroySurfaceKHR DestroySurfaceKHR;
+    PFN_vkCreateDevice CreateDevice;
+    PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;
+    PFN_vkCreateDebugUtilsMessengerEXT CreateDebugUtilsMessengerEXT;
+    PFN_vkDestroyDebugUtilsMessengerEXT DestroyDebugUtilsMessengerEXT;
+
+    // Device
+    PFN_vkGetDeviceProcAddr GetDeviceProcAddr;
+    PFN_vkDestroyDevice DestroyDevice;
+    PFN_vkGetDeviceQueue GetDeviceQueue;
+    PFN_vkDeviceWaitIdle DeviceWaitIdle;
+
+    // Memory
+    PFN_vkAllocateMemory AllocateMemory;
+    PFN_vkFreeMemory FreeMemory;
+    PFN_vkMapMemory MapMemory;
+    PFN_vkUnmapMemory UnmapMemory;
+    PFN_vkFlushMappedMemoryRanges FlushMappedMemoryRanges;
+    PFN_vkGetAndroidHardwareBufferPropertiesANDROID GetAndroidHardwareBufferPropertiesANDROID;
+
+    // Buffer
+    PFN_vkCreateBuffer CreateBuffer;
+    PFN_vkDestroyBuffer DestroyBuffer;
+    PFN_vkBindBufferMemory BindBufferMemory;
+    PFN_vkGetBufferMemoryRequirements GetBufferMemoryRequirements;
+
+    // Image / image view
+    PFN_vkCreateImage CreateImage;
+    PFN_vkDestroyImage DestroyImage;
+    PFN_vkBindImageMemory BindImageMemory;
+    PFN_vkGetImageMemoryRequirements GetImageMemoryRequirements;
+    PFN_vkCreateImageView CreateImageView;
+    PFN_vkDestroyImageView DestroyImageView;
+
+    // Sampler / YCbCr
+    PFN_vkCreateSampler CreateSampler;
+    PFN_vkDestroySampler DestroySampler;
+    PFN_vkCreateSamplerYcbcrConversion CreateSamplerYcbcrConversion;
+    PFN_vkDestroySamplerYcbcrConversion DestroySamplerYcbcrConversion;
+    PFN_vkCreateSamplerYcbcrConversionKHR CreateSamplerYcbcrConversionKHR;
+    PFN_vkDestroySamplerYcbcrConversionKHR DestroySamplerYcbcrConversionKHR;
+
+    // Descriptors
+    PFN_vkCreateDescriptorSetLayout CreateDescriptorSetLayout;
+    PFN_vkDestroyDescriptorSetLayout DestroyDescriptorSetLayout;
+    PFN_vkCreateDescriptorPool CreateDescriptorPool;
+    PFN_vkDestroyDescriptorPool DestroyDescriptorPool;
+    PFN_vkAllocateDescriptorSets AllocateDescriptorSets;
+    PFN_vkFreeDescriptorSets FreeDescriptorSets;
+    PFN_vkUpdateDescriptorSets UpdateDescriptorSets;
+
+    // Pipeline
+    PFN_vkCreatePipelineLayout CreatePipelineLayout;
+    PFN_vkDestroyPipelineLayout DestroyPipelineLayout;
+    PFN_vkCreateGraphicsPipelines CreateGraphicsPipelines;
+    PFN_vkDestroyPipeline DestroyPipeline;
+    PFN_vkCreateShaderModule CreateShaderModule;
+    PFN_vkDestroyShaderModule DestroyShaderModule;
+
+    // RenderPass / Framebuffer
+    PFN_vkCreateRenderPass CreateRenderPass;
+    PFN_vkDestroyRenderPass DestroyRenderPass;
+    PFN_vkCreateFramebuffer CreateFramebuffer;
+    PFN_vkDestroyFramebuffer DestroyFramebuffer;
+
+    // Sync
+    PFN_vkCreateFence CreateFence;
+    PFN_vkDestroyFence DestroyFence;
+    PFN_vkResetFences ResetFences;
+    PFN_vkWaitForFences WaitForFences;
+    PFN_vkCreateSemaphore CreateSemaphore;
+    PFN_vkDestroySemaphore DestroySemaphore;
+
+    // Commands
+    PFN_vkCreateCommandPool CreateCommandPool;
+    PFN_vkDestroyCommandPool DestroyCommandPool;
+    PFN_vkResetCommandPool ResetCommandPool;
+    PFN_vkAllocateCommandBuffers AllocateCommandBuffers;
+    PFN_vkFreeCommandBuffers FreeCommandBuffers;
+    PFN_vkBeginCommandBuffer BeginCommandBuffer;
+    PFN_vkEndCommandBuffer EndCommandBuffer;
+    PFN_vkResetCommandBuffer ResetCommandBuffer;
+    PFN_vkCmdBeginRenderPass CmdBeginRenderPass;
+    PFN_vkCmdEndRenderPass CmdEndRenderPass;
+    PFN_vkCmdBindPipeline CmdBindPipeline;
+    PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets;
+    PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers;
+    PFN_vkCmdPushConstants CmdPushConstants;
+    PFN_vkCmdSetViewport CmdSetViewport;
+    PFN_vkCmdSetScissor CmdSetScissor;
+    PFN_vkCmdDraw CmdDraw;
+    PFN_vkCmdPipelineBarrier CmdPipelineBarrier;
+    PFN_vkCmdCopyBufferToImage CmdCopyBufferToImage;
+    PFN_vkCmdBlitImage CmdBlitImage;
+
+    // Queue
+    PFN_vkQueueSubmit QueueSubmit;
+    PFN_vkQueueWaitIdle QueueWaitIdle;
+    PFN_vkQueuePresentKHR QueuePresentKHR;
+
+    // Swapchain
+    PFN_vkCreateSwapchainKHR CreateSwapchainKHR;
+    PFN_vkDestroySwapchainKHR DestroySwapchainKHR;
+    PFN_vkGetSwapchainImagesKHR GetSwapchainImagesKHR;
+    PFN_vkAcquireNextImageKHR AcquireNextImageKHR;
+} VkDispatch;
+
+extern VkDispatch vkd;
+
+bool vkd_init(void* libvulkan_handle);
+
+// Loads device-level pointers via vkGetInstanceProcAddr too — the loader trampolines, which
+// costs a few ns per call but avoids partitioning instance vs. device scope.
+bool vkd_load_instance(VkInstance instance);
+
+// Must be called before dlclose so stale-pointer crashes fault on NULL.
+void vkd_unload(void);
+
+// Redirect bare `vkFoo` names to the dispatch table.
+
+#define vkGetInstanceProcAddr vkd.GetInstanceProcAddr
+#define vkCreateInstance vkd.CreateInstance
+#define vkEnumerateInstanceExtensionProperties vkd.EnumerateInstanceExtensionProperties
+#define vkEnumerateInstanceLayerProperties vkd.EnumerateInstanceLayerProperties
+
+#define vkDestroyInstance vkd.DestroyInstance
+#define vkEnumeratePhysicalDevices vkd.EnumeratePhysicalDevices
+#define vkGetPhysicalDeviceProperties vkd.GetPhysicalDeviceProperties
+#define vkGetPhysicalDeviceMemoryProperties vkd.GetPhysicalDeviceMemoryProperties
+#define vkGetPhysicalDeviceQueueFamilyProperties vkd.GetPhysicalDeviceQueueFamilyProperties
+#define vkGetPhysicalDeviceFormatProperties vkd.GetPhysicalDeviceFormatProperties
+#define vkGetPhysicalDeviceImageFormatProperties vkd.GetPhysicalDeviceImageFormatProperties
+#define vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkd.GetPhysicalDeviceSurfaceCapabilitiesKHR
+#define vkGetPhysicalDeviceSurfaceFormatsKHR vkd.GetPhysicalDeviceSurfaceFormatsKHR
+#define vkGetPhysicalDeviceSurfacePresentModesKHR vkd.GetPhysicalDeviceSurfacePresentModesKHR
+#define vkGetPhysicalDeviceSurfaceSupportKHR vkd.GetPhysicalDeviceSurfaceSupportKHR
+#define vkCreateAndroidSurfaceKHR vkd.CreateAndroidSurfaceKHR
+#define vkDestroySurfaceKHR vkd.DestroySurfaceKHR
+#define vkCreateDevice vkd.CreateDevice
+#define vkEnumerateDeviceExtensionProperties vkd.EnumerateDeviceExtensionProperties
+#define vkCreateDebugUtilsMessengerEXT vkd.CreateDebugUtilsMessengerEXT
+#define vkDestroyDebugUtilsMessengerEXT vkd.DestroyDebugUtilsMessengerEXT
+
+#define vkGetDeviceProcAddr vkd.GetDeviceProcAddr
+#define vkDestroyDevice vkd.DestroyDevice
+#define vkGetDeviceQueue vkd.GetDeviceQueue
+#define vkDeviceWaitIdle vkd.DeviceWaitIdle
+
+#define vkAllocateMemory vkd.AllocateMemory
+#define vkFreeMemory vkd.FreeMemory
+#define vkMapMemory vkd.MapMemory
+#define vkUnmapMemory vkd.UnmapMemory
+#define vkFlushMappedMemoryRanges vkd.FlushMappedMemoryRanges
+#define vkGetAndroidHardwareBufferPropertiesANDROID vkd.GetAndroidHardwareBufferPropertiesANDROID
+
+#define vkCreateBuffer vkd.CreateBuffer
+#define vkDestroyBuffer vkd.DestroyBuffer
+#define vkBindBufferMemory vkd.BindBufferMemory
+#define vkGetBufferMemoryRequirements vkd.GetBufferMemoryRequirements
+
+#define vkCreateImage vkd.CreateImage
+#define vkDestroyImage vkd.DestroyImage
+#define vkBindImageMemory vkd.BindImageMemory
+#define vkGetImageMemoryRequirements vkd.GetImageMemoryRequirements
+#define vkCreateImageView vkd.CreateImageView
+#define vkDestroyImageView vkd.DestroyImageView
+
+#define vkCreateSampler vkd.CreateSampler
+#define vkDestroySampler vkd.DestroySampler
+#define vkCreateSamplerYcbcrConversion vkd.CreateSamplerYcbcrConversion
+#define vkDestroySamplerYcbcrConversion vkd.DestroySamplerYcbcrConversion
+#define vkCreateSamplerYcbcrConversionKHR vkd.CreateSamplerYcbcrConversionKHR
+#define vkDestroySamplerYcbcrConversionKHR vkd.DestroySamplerYcbcrConversionKHR
+
+#define vkCreateDescriptorSetLayout vkd.CreateDescriptorSetLayout
+#define vkDestroyDescriptorSetLayout vkd.DestroyDescriptorSetLayout
+#define vkCreateDescriptorPool vkd.CreateDescriptorPool
+#define vkDestroyDescriptorPool vkd.DestroyDescriptorPool
+#define vkAllocateDescriptorSets vkd.AllocateDescriptorSets
+#define vkFreeDescriptorSets vkd.FreeDescriptorSets
+#define vkUpdateDescriptorSets vkd.UpdateDescriptorSets
+
+#define vkCreatePipelineLayout vkd.CreatePipelineLayout
+#define vkDestroyPipelineLayout vkd.DestroyPipelineLayout
+#define vkCreateGraphicsPipelines vkd.CreateGraphicsPipelines
+#define vkDestroyPipeline vkd.DestroyPipeline
+#define vkCreateShaderModule vkd.CreateShaderModule
+#define vkDestroyShaderModule vkd.DestroyShaderModule
+
+#define vkCreateRenderPass vkd.CreateRenderPass
+#define vkDestroyRenderPass vkd.DestroyRenderPass
+#define vkCreateFramebuffer vkd.CreateFramebuffer
+#define vkDestroyFramebuffer vkd.DestroyFramebuffer
+
+#define vkCreateFence vkd.CreateFence
+#define vkDestroyFence vkd.DestroyFence
+#define vkResetFences vkd.ResetFences
+#define vkWaitForFences vkd.WaitForFences
+#define vkCreateSemaphore vkd.CreateSemaphore
+#define vkDestroySemaphore vkd.DestroySemaphore
+
+#define vkCreateCommandPool vkd.CreateCommandPool
+#define vkDestroyCommandPool vkd.DestroyCommandPool
+#define vkResetCommandPool vkd.ResetCommandPool
+#define vkAllocateCommandBuffers vkd.AllocateCommandBuffers
+#define vkFreeCommandBuffers vkd.FreeCommandBuffers
+#define vkBeginCommandBuffer vkd.BeginCommandBuffer
+#define vkEndCommandBuffer vkd.EndCommandBuffer
+#define vkResetCommandBuffer vkd.ResetCommandBuffer
+#define vkCmdBeginRenderPass vkd.CmdBeginRenderPass
+#define vkCmdEndRenderPass vkd.CmdEndRenderPass
+#define vkCmdBindPipeline vkd.CmdBindPipeline
+#define vkCmdBindDescriptorSets vkd.CmdBindDescriptorSets
+#define vkCmdBindVertexBuffers vkd.CmdBindVertexBuffers
+#define vkCmdPushConstants vkd.CmdPushConstants
+#define vkCmdSetViewport vkd.CmdSetViewport
+#define vkCmdSetScissor vkd.CmdSetScissor
+#define vkCmdDraw vkd.CmdDraw
+#define vkCmdPipelineBarrier vkd.CmdPipelineBarrier
+#define vkCmdCopyBufferToImage vkd.CmdCopyBufferToImage
+#define vkCmdBlitImage vkd.CmdBlitImage
+
+#define vkQueueSubmit vkd.QueueSubmit
+#define vkQueueWaitIdle vkd.QueueWaitIdle
+#define vkQueuePresentKHR vkd.QueuePresentKHR
+
+#define vkCreateSwapchainKHR vkd.CreateSwapchainKHR
+#define vkDestroySwapchainKHR vkd.DestroySwapchainKHR
+#define vkGetSwapchainImagesKHR vkd.GetSwapchainImagesKHR
+#define vkAcquireNextImageKHR vkd.AcquireNextImageKHR
diff --git a/app/src/main/cpp/winlator/vk/vk_driver.h b/app/src/main/cpp/winlator/vk/vk_driver.h
new file mode 100644
index 000000000..2d78cf43a
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/vk_driver.h
@@ -0,0 +1,19 @@
+// "System" / NULL driverName  -> /system/lib64/libvulkan.so.
+// Any other name              -> adrenotools_open_libvulkan against the user-installed driver,
+//                                falling back to the system loader if anything goes wrong.
+// Caller owns the returned handle and must dlclose it.
+
+#pragma once
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *winlator_open_vulkan(JNIEnv *env, jobject context, const char *driver_name);
+void *winlator_open_system_vulkan(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/app/src/main/cpp/winlator/vk/vk_image.c b/app/src/main/cpp/winlator/vk/vk_image.c
new file mode 100644
index 000000000..83d2d171a
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/vk_image.c
@@ -0,0 +1,1376 @@
+// VkTexture allocation, upload, AHB import.
+//
+// Two creation paths:
+//   1. CPU-uploaded: caller hands us BGRA pixel data; we allocate VkImage in DEVICE_LOCAL memory,
+//      stage the upload through a host-visible buffer, and transition to SHADER_READ_OPTIMAL.
+//   2. AHardwareBuffer import: caller hands us an AHB; we allocate dedicated memory backed by the
+//      AHB (no copy) and bind it to a VkImage. For non-RGB formats (DRI3 vendor formats), we use
+//      a Ycbcr conversion so the sampler can read them.
+//
+// Texture lifetimes:
+//   - Created/updated synchronously on caller's thread (Java/render).
+//   - Submits go through vkQueueSubmit which is serialized via VkRenderer::queue_mutex.
+//   - Destruction is deferred via the graveyard so in-flight frames don't see freed handles.
+
+#include "vk_state.h"
+#include <stdlib.h>
+#include <string.h>
+
+#define HAL_PIXEL_FORMAT_BGRA_8888 5
+
+uint32_t vkr_find_memory_type(VkRenderer* r, uint32_t type_bits, VkMemoryPropertyFlags props) {
+    for (uint32_t i = 0; i < r->mem_props.memoryTypeCount; i++) {
+        if ((type_bits & (1u << i))
+            && (r->mem_props.memoryTypes[i].propertyFlags & props) == props) {
+            return i;
+        }
+    }
+    return UINT32_MAX;
+}
+
+void vkr_image_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout from, VkImageLayout to,
+                       VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
+                       VkAccessFlags src_access, VkAccessFlags dst_access) {
+    VkImageMemoryBarrier b = {0};
+    b.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+    b.oldLayout = from;
+    b.newLayout = to;
+    b.srcAccessMask = src_access;
+    b.dstAccessMask = dst_access;
+    b.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    b.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    b.image = image;
+    b.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    b.subresourceRange.baseMipLevel = 0;
+    b.subresourceRange.levelCount = 1;
+    b.subresourceRange.baseArrayLayer = 0;
+    b.subresourceRange.layerCount = 1;
+    vkCmdPipelineBarrier(cmd, src_stage, dst_stage, 0, 0, NULL, 0, NULL, 1, &b);
+}
+
+// ============================================================
+// Staging pool — async upload infrastructure
+// ============================================================
+//
+// Each slot owns a VkBuffer, persistently-mapped HOST_VISIBLE memory, a VkCommandPool with
+// one VkCommandBuffer, and a VkFence. Round-robin acquisition under a tiny mutex; per-slot
+// mutex provides exclusive ownership for the lifetime of an upload (acquire→submit→release).
+//
+// On a single graphics queue, the upload's terminal pipeline barrier (TRANSFER_WRITE →
+// SHADER_READ, dstStage=FRAGMENT_SHADER) extends into all subsequent submits per Vulkan
+// spec — so the renderer needs no extra synchronization to safely sample a freshly-updated
+// texture as long as the upload was submitted before the render.
+
+bool vkr_staging_pool_init(VkRenderer* r) {
+    if (r->staging_pool.initialized) return true;
+    pthread_mutex_init(&r->staging_pool.mutex, NULL);
+    r->staging_pool.mutex_init = true;
+    r->staging_pool.next = 0;
+    r->staging_pool.valid_slots = 0;
+
+    VkFenceCreateInfo fi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+    fi.flags = VK_FENCE_CREATE_SIGNALED_BIT;  // first acquire of each slot finds the fence ready
+
+    for (uint32_t i = 0; i < VK_STAGING_POOL_SIZE; i++) {
+        VkStagingSlot* s = &r->staging_pool.slots[i];
+        pthread_mutex_init(&s->mutex, NULL);
+        r->staging_pool.valid_slots = i + 1;  // mutex is now valid; destroy must clean it up
+
+        VkCommandPoolCreateInfo cpci = {VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO};
+        cpci.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
+        cpci.queueFamilyIndex = r->graphics_queue_family;
+        if (vkCreateCommandPool(r->device, &cpci, NULL, &s->cmd_pool) != VK_SUCCESS) {
+            VK_LOGE("staging pool: vkCreateCommandPool slot %u failed", i);
+            return false;
+        }
+
+        VkCommandBufferAllocateInfo cbai = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO};
+        cbai.commandPool = s->cmd_pool;
+        cbai.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+        cbai.commandBufferCount = 1;
+        if (vkAllocateCommandBuffers(r->device, &cbai, &s->cmd) != VK_SUCCESS) {
+            VK_LOGE("staging pool: vkAllocateCommandBuffers slot %u failed", i);
+            return false;
+        }
+
+        if (vkCreateFence(r->device, &fi, NULL, &s->fence) != VK_SUCCESS) {
+            VK_LOGE("staging pool: vkCreateFence slot %u failed", i);
+            return false;
+        }
+        // buffer/memory allocated lazily on first use, sized to the actual upload.
+    }
+    r->staging_pool.initialized = true;
+    return true;
+}
+
+void vkr_staging_pool_destroy(VkRenderer* r) {
+    // Tolerates partially-initialized pools — only iterate the slots whose mutexes were
+    // successfully initialized.
+    for (uint32_t i = 0; i < r->staging_pool.valid_slots; i++) {
+        VkStagingSlot* s = &r->staging_pool.slots[i];
+        if (s->fence) {
+            // Drain any pending submission so the buffer/memory are safe to free.
+            vkWaitForFences(r->device, 1, &s->fence, VK_TRUE, UINT64_MAX);
+            vkDestroyFence(r->device, s->fence, NULL);
+        }
+        if (s->mapped && s->memory) vkUnmapMemory(r->device, s->memory);
+        if (s->buffer)   vkDestroyBuffer(r->device, s->buffer, NULL);
+        if (s->memory)   vkFreeMemory(r->device, s->memory, NULL);
+        if (s->cmd_pool) vkDestroyCommandPool(r->device, s->cmd_pool, NULL);
+        pthread_mutex_destroy(&s->mutex);
+        memset(s, 0, sizeof(*s));
+    }
+    if (r->staging_pool.mutex_init) {
+        pthread_mutex_destroy(&r->staging_pool.mutex);
+    }
+    memset(&r->staging_pool, 0, sizeof(r->staging_pool));
+}
+
+// Re-allocate a slot's staging buffer to at least `needed` bytes. Caller must own the slot.
+static bool grow_staging_slot(VkRenderer* r, VkStagingSlot* s, VkDeviceSize needed) {
+    // Round up to 64 KiB so consecutive size bumps don't trigger reallocs.
+    VkDeviceSize new_size = (needed + 65535ull) & ~(VkDeviceSize)65535ull;
+
+    if (s->mapped && s->memory) { vkUnmapMemory(r->device, s->memory); s->mapped = NULL; }
+    if (s->buffer) { vkDestroyBuffer(r->device, s->buffer, NULL); s->buffer = VK_NULL_HANDLE; }
+    if (s->memory) { vkFreeMemory(r->device, s->memory, NULL); s->memory = VK_NULL_HANDLE; }
+    // Reset size now so a later allocation failure leaves the slot in a state where the next
+    // acquire will retry grow_staging_slot rather than skip it and hand back a NULL buffer.
+    s->size = 0;
+
+    VkBufferCreateInfo bi = {VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO};
+    bi.size = new_size;
+    bi.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+    bi.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    if (vkCreateBuffer(r->device, &bi, NULL, &s->buffer) != VK_SUCCESS) return false;
+
+    VkMemoryRequirements mr;
+    vkGetBufferMemoryRequirements(r->device, s->buffer, &mr);
+
+    VkMemoryAllocateInfo ai = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO};
+    ai.allocationSize = mr.size;
+    // Require HOST_VISIBLE | HOST_COHERENT (typically write-combined on Adreno). Skipping
+    // HOST_CACHED avoids polluting CPU caches with write-once-then-GPU-read staging, which
+    // hurts throughput by 5-20% on Adreno. We do not fall back to non-coherent memory:
+    // vkr_texture_update submits without vkFlushMappedMemoryRanges, so non-coherent staging
+    // would render undefined data. Vulkan spec §11.6 mandates that every device expose at
+    // least one HOST_VISIBLE | HOST_COHERENT memory type, so this lookup cannot legally fail.
+    ai.memoryTypeIndex = vkr_find_memory_type(r, mr.memoryTypeBits,
+        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+    if (ai.memoryTypeIndex == UINT32_MAX) {
+        vkDestroyBuffer(r->device, s->buffer, NULL); s->buffer = VK_NULL_HANDLE;
+        return false;
+    }
+    if (vkAllocateMemory(r->device, &ai, NULL, &s->memory) != VK_SUCCESS) {
+        vkDestroyBuffer(r->device, s->buffer, NULL); s->buffer = VK_NULL_HANDLE;
+        return false;
+    }
+    vkBindBufferMemory(r->device, s->buffer, s->memory, 0);
+    if (vkMapMemory(r->device, s->memory, 0, VK_WHOLE_SIZE, 0, &s->mapped) != VK_SUCCESS) {
+        vkFreeMemory(r->device, s->memory, NULL); s->memory = VK_NULL_HANDLE;
+        vkDestroyBuffer(r->device, s->buffer, NULL); s->buffer = VK_NULL_HANDLE;
+        return false;
+    }
+    s->size = new_size;
+    return true;
+}
+
+VkStagingSlot* vkr_staging_pool_acquire(VkRenderer* r, VkDeviceSize needed) {
+    if (!r->staging_pool.initialized) return NULL;
+
+    pthread_mutex_lock(&r->staging_pool.mutex);
+    uint32_t idx = (uint32_t)(r->staging_pool.next++ % VK_STAGING_POOL_SIZE);
+    pthread_mutex_unlock(&r->staging_pool.mutex);
+
+    VkStagingSlot* s = &r->staging_pool.slots[idx];
+
+    // Per-slot lock guards the slot's resources (buffer/cmd/fence) until release. Round-robin
+    // means contention only happens once VK_STAGING_POOL_SIZE acquires have wrapped — i.e.
+    // when the producer is consistently faster than the GPU can drain uploads.
+    pthread_mutex_lock(&s->mutex);
+
+    // Wait for the slot's previous submission to retire. With pool_size=8 this almost never
+    // blocks because the fence signaled long ago. The fence is left signaled here on purpose
+    // — it gets reset right before vkQueueSubmit, so any no-submit failure path between here
+    // and submit leaves the fence safely signaled and the slot reusable.
+    vkWaitForFences(r->device, 1, &s->fence, VK_TRUE, UINT64_MAX);
+    vkResetCommandPool(r->device, s->cmd_pool, 0);
+
+    if (s->size < needed && !grow_staging_slot(r, s, needed)) {
+        pthread_mutex_unlock(&s->mutex);
+        return NULL;
+    }
+    return s;
+}
+
+void vkr_staging_pool_release(VkStagingSlot* slot) {
+    if (!slot) return;
+    pthread_mutex_unlock(&slot->mutex);
+}
+
+void vkr_run_one_shot_cmd(VkRenderer* r, void (*fn)(VkCommandBuffer, void*), void* user) {
+    VkCommandBufferAllocateInfo ai = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO};
+    ai.commandPool = r->cmd_pool;
+    ai.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+    ai.commandBufferCount = 1;
+
+    VkCommandBuffer cmd;
+    VK_CHECK(vkAllocateCommandBuffers(r->device, &ai, &cmd));
+
+    VkCommandBufferBeginInfo bi = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO};
+    bi.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+    VK_CHECK(vkBeginCommandBuffer(cmd, &bi));
+
+    fn(cmd, user);
+
+    VK_CHECK(vkEndCommandBuffer(cmd));
+
+    VkSubmitInfo si = {VK_STRUCTURE_TYPE_SUBMIT_INFO};
+    si.commandBufferCount = 1;
+    si.pCommandBuffers = &cmd;
+
+    VkFenceCreateInfo fi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+    VkFence fence;
+    VK_CHECK(vkCreateFence(r->device, &fi, NULL, &fence));
+
+    pthread_mutex_lock(&r->queue_mutex);
+    VK_CHECK(vkQueueSubmit(r->graphics_queue, 1, &si, fence));
+    pthread_mutex_unlock(&r->queue_mutex);
+
+    VK_CHECK(vkWaitForFences(r->device, 1, &fence, VK_TRUE, UINT64_MAX));
+
+    vkDestroyFence(r->device, fence, NULL);
+    vkFreeCommandBuffers(r->device, r->cmd_pool, 1, &cmd);
+}
+
+// Forward declarations — defined in vk_renderer.c.
+VkDescriptorSet vkr_alloc_descriptor_set(VkRenderer* r);
+void            vkr_free_descriptor_set(VkRenderer* r, VkDescriptorSet set);
+
+// Image sub-allocator — implemented lower in this file.
+static bool vkr_suballoc_image(VkRenderer* r, VkImage image, VkSuballoc* out);
+static void vkr_suballoc_free(VkRenderer* r, VkSuballoc* a);
+
+// Copy `bytes` (multiple of 4) from src to dst, optionally swapping B and R per pixel.
+static void copy_pixels_maybe_swizzle(uint8_t* dst, const uint8_t* src, size_t bytes,
+                                      bool swizzle_bgra_rgba) {
+    if (!swizzle_bgra_rgba) {
+        memcpy(dst, src, bytes);
+        return;
+    }
+    size_t pixels = bytes >> 2;
+    for (size_t i = 0; i < pixels; i++) {
+        uint8_t b = src[i*4 + 0];
+        uint8_t g = src[i*4 + 1];
+        uint8_t rr = src[i*4 + 2];
+        uint8_t a = src[i*4 + 3];
+        dst[i*4 + 0] = rr;
+        dst[i*4 + 1] = g;
+        dst[i*4 + 2] = b;
+        dst[i*4 + 3] = a;
+    }
+}
+
+bool vkr_create_sampler(VkRenderer* r, VkSamplerYcbcrConversion ycbcr, VkSampler* out) {
+    VkSamplerYcbcrConversionInfo yi = {VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO};
+    yi.conversion = ycbcr;
+
+    VkSamplerCreateInfo si = {VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO};
+    if (ycbcr != VK_NULL_HANDLE) si.pNext = &yi;
+    si.magFilter = VK_FILTER_LINEAR;
+    si.minFilter = VK_FILTER_LINEAR;
+    si.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    si.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    si.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    si.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
+    si.unnormalizedCoordinates = VK_FALSE;
+    si.mipmapMode = VK_SAMPLER_MIPMAP_MODE_NEAREST;
+
+    return vkCreateSampler(r->device, &si, NULL, out) == VK_SUCCESS;
+}
+
+bool vkr_submit_async_transition(VkRenderer* r, VkImage image,
+                                 VkImageLayout from, VkImageLayout to,
+                                 VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
+                                 VkAccessFlags src_access, VkAccessFlags dst_access) {
+    // Reuse the staging pool's per-slot command pool/buffer/fence for this transition. We
+    // pass needed=0 so the slot's staging buffer isn't grown (we only use the cmd buffer).
+    VkStagingSlot* slot = vkr_staging_pool_acquire(r, 0);
+    if (!slot) {
+        VK_LOGE("vkr_submit_async_transition: staging slot acquire failed");
+        return false;
+    }
+
+    VkCommandBufferBeginInfo cbi = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO};
+    cbi.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+    if (vkBeginCommandBuffer(slot->cmd, &cbi) != VK_SUCCESS) {
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+    vkr_image_barrier(slot->cmd, image, from, to, src_stage, dst_stage, src_access, dst_access);
+    if (vkEndCommandBuffer(slot->cmd) != VK_SUCCESS) {
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    VkSubmitInfo si = {VK_STRUCTURE_TYPE_SUBMIT_INFO};
+    si.commandBufferCount = 1;
+    si.pCommandBuffers = &slot->cmd;
+
+    vkResetFences(r->device, 1, &slot->fence);
+
+    pthread_mutex_lock(&r->queue_mutex);
+    VkResult sr = vkQueueSubmit(r->graphics_queue, 1, &si, slot->fence);
+    pthread_mutex_unlock(&r->queue_mutex);
+    if (sr != VK_SUCCESS) {
+        VK_LOGE("vkr_submit_async_transition: vkQueueSubmit -> %d", sr);
+        // Restore a signaled fence so the slot is reusable. (Same recovery path as
+        // vkr_texture_update.)
+        vkDestroyFence(r->device, slot->fence, NULL);
+        VkFenceCreateInfo rfi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+        rfi.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+        vkCreateFence(r->device, &rfi, NULL, &slot->fence);
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+    vkr_staging_pool_release(slot);
+    return true;
+}
+
+static void write_descriptor_set(VkRenderer* r, VkDescriptorSet set, VkImageView view, VkSampler sampler) {
+    VkDescriptorImageInfo ii = {0};
+    ii.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    ii.imageView = view;
+    ii.sampler = sampler;
+
+    VkWriteDescriptorSet w = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET};
+    w.dstSet = set;
+    w.dstBinding = 0;
+    w.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+    w.descriptorCount = 1;
+    w.pImageInfo = &ii;
+    vkUpdateDescriptorSets(r->device, 1, &w, 0, NULL);
+}
+
+static VkSampler active_shared_sampler(VkRenderer* r) {
+    switch (r->scale_filter) {
+        case 1:  return r->shared_sampler_nearest;
+        case 3:  return r->ext_filter_cubic ? r->shared_sampler_cubic : r->shared_sampler;
+        default: return r->shared_sampler;
+    }
+}
+
+// Caller must hold render_mutex with in-flight frames drained.
+void vkr_retarget_shared_sampler(VkRenderer* r) {
+    VkSampler s = active_shared_sampler(r);
+    if (s == VK_NULL_HANDLE) return;
+    pthread_mutex_lock(&r->texture_mutex);
+    for (uint32_t i = 0; i < r->live_texture_count; i++) {
+        VkTexture* t = r->live_textures[i];
+        if (!t || t->descriptor_set == VK_NULL_HANDLE || t->view == VK_NULL_HANDLE) continue;
+        if (t->ycbcr != VK_NULL_HANDLE) continue;
+        write_descriptor_set(r, t->descriptor_set, t->view, s);
+    }
+    pthread_mutex_unlock(&r->texture_mutex);
+}
+
+static void destroy_texture_resources(VkRenderer* r, VkTexture* tex) {
+    if (!tex) return;
+    if (tex->descriptor_set != VK_NULL_HANDLE) {
+        vkr_free_descriptor_set(r, tex->descriptor_set);
+        tex->descriptor_set = VK_NULL_HANDLE;
+    }
+    if (tex->sampler != VK_NULL_HANDLE) vkDestroySampler(r->device, tex->sampler, NULL);
+    if (tex->view != VK_NULL_HANDLE)    vkDestroyImageView(r->device, tex->view, NULL);
+    if (tex->ycbcr != VK_NULL_HANDLE && r->fnDestroyYcbcr) r->fnDestroyYcbcr(r->device, tex->ycbcr, NULL);
+    if (tex->image != VK_NULL_HANDLE)   vkDestroyImage(r->device, tex->image, NULL);
+    // Free backing after the image. Sub-allocated -> return span to pool; else free own memory.
+    if (tex->suballocated)              vkr_suballoc_free(r, &tex->suballoc);
+    else if (tex->memory != VK_NULL_HANDLE) vkFreeMemory(r->device, tex->memory, NULL);
+    if (tex->ahb != NULL)               AHardwareBuffer_release(tex->ahb);
+    free(tex);
+}
+
+static bool track_live_texture(VkRenderer* r, VkTexture* tex) {
+    if (!tex) return false;
+    pthread_mutex_lock(&r->texture_mutex);
+    if (r->live_texture_count >= r->live_texture_capacity) {
+        uint32_t new_cap = r->live_texture_capacity ? r->live_texture_capacity * 2 : 64;
+        VkTexture** next = realloc(r->live_textures, new_cap * sizeof(VkTexture*));
+        if (!next) {
+            pthread_mutex_unlock(&r->texture_mutex);
+            return false;
+        }
+        r->live_textures = next;
+        r->live_texture_capacity = new_cap;
+    }
+    r->live_textures[r->live_texture_count++] = tex;
+    pthread_mutex_unlock(&r->texture_mutex);
+    return true;
+}
+
+static void untrack_live_texture(VkRenderer* r, VkTexture* tex) {
+    if (!tex) return;
+    pthread_mutex_lock(&r->texture_mutex);
+    for (uint32_t i = 0; i < r->live_texture_count; i++) {
+        if (r->live_textures[i] == tex) {
+            r->live_textures[i] = r->live_textures[--r->live_texture_count];
+            r->live_textures[r->live_texture_count] = NULL;
+            break;
+        }
+    }
+    pthread_mutex_unlock(&r->texture_mutex);
+}
+
+static VkTexture* pop_live_texture(VkRenderer* r) {
+    pthread_mutex_lock(&r->texture_mutex);
+    VkTexture* tex = NULL;
+    if (r->live_texture_count > 0) {
+        tex = r->live_textures[--r->live_texture_count];
+        r->live_textures[r->live_texture_count] = NULL;
+    }
+    pthread_mutex_unlock(&r->texture_mutex);
+    return tex;
+}
+
+// ----------------------------------------------------------------------
+// Image sub-allocator
+// ----------------------------------------------------------------------
+//
+// First-fit over a list of large DEVICE_LOCAL blocks, all under image_suballoc.mutex (alloc on
+// producer threads, free on the render thread). Region nodes are malloc'd only on new-block
+// creation or a non-coalescing free, so steady-state pixmap churn doesn't touch the C heap.
+
+void vkr_suballoc_init(VkRenderer* r) {
+    VkImageSuballocator* sa = &r->image_suballoc;
+    sa->blocks = NULL;
+    sa->block_size = VK_SUBALLOC_BLOCK_SIZE;
+    pthread_mutex_init(&sa->mutex, NULL);
+    sa->mutex_init = true;
+}
+
+static VkDeviceSize suballoc_align_up(VkDeviceSize v, VkDeviceSize a) {
+    return (v + a - 1) & ~(a - 1);
+}
+
+// Carve [reg->offset .. bind+size) out of free region `reg` (`prev` = its free-list
+// predecessor, or NULL). The leading alignment pad folds into the span so free recovers it
+// verbatim. Caller verified the region fits.
+static void suballoc_carve(VkMemBlock* block, VkMemRegion* prev, VkMemRegion* reg,
+                           VkDeviceSize bind, VkDeviceSize size, VkSuballoc* out) {
+    VkDeviceSize span_offset = reg->offset;
+    VkDeviceSize span_end    = bind + size;
+    VkDeviceSize reg_end     = reg->offset + reg->size;
+
+    if (span_end < reg_end) {
+        reg->offset = span_end;          // shrink region to the trailing remainder
+        reg->size   = reg_end - span_end;
+    } else {
+        if (prev) prev->next = reg->next; // region fully consumed — unlink + free
+        else      block->free_list = reg->next;
+        free(reg);
+    }
+
+    out->block       = block;
+    out->memory      = block->memory;
+    out->bind_offset = bind;
+    out->span_offset = span_offset;
+    out->span_size   = span_end - span_offset;
+}
+
+// Reserve a span sized/aligned for `image` into `out`. Does NOT bind — caller issues the one
+// vkBindImageMemory so a bind failure never forces an illegal rebind. False (nothing reserved)
+// if no DEVICE_LOCAL type fits or a new block can't be allocated.
+static bool vkr_suballoc_image(VkRenderer* r, VkImage image, VkSuballoc* out) {
+    VkMemoryRequirements mr;
+    vkGetImageMemoryRequirements(r->device, image, &mr);
+
+    uint32_t type_index = vkr_find_memory_type(r, mr.memoryTypeBits,
+                                               VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+    if (type_index == UINT32_MAX) return false;
+
+    VkDeviceSize align = mr.alignment ? mr.alignment : 1;
+
+    VkImageSuballocator* sa = &r->image_suballoc;
+    pthread_mutex_lock(&sa->mutex);
+
+    // First fit across existing blocks of the matching memory type.
+    for (VkMemBlock* b = sa->blocks; b; b = b->next) {
+        if (b->memory_type_index != type_index) continue;
+        VkMemRegion* prev = NULL;
+        for (VkMemRegion* reg = b->free_list; reg; prev = reg, reg = reg->next) {
+            VkDeviceSize bind = suballoc_align_up(reg->offset, align);
+            if (bind + mr.size <= reg->offset + reg->size) {
+                suballoc_carve(b, prev, reg, bind, mr.size, out);
+                pthread_mutex_unlock(&sa->mutex);
+                return true;
+            }
+        }
+    }
+
+    // No room anywhere — allocate a fresh block big enough for at least this image.
+    VkDeviceSize block_size = sa->block_size;
+    if (block_size < mr.size) block_size = mr.size;
+    block_size = suballoc_align_up(block_size, align);
+
+    VkMemoryAllocateInfo ai = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO};
+    ai.allocationSize  = block_size;
+    ai.memoryTypeIndex = type_index;
+
+    VkDeviceMemory mem = VK_NULL_HANDLE;
+    if (vkAllocateMemory(r->device, &ai, NULL, &mem) != VK_SUCCESS) {
+        pthread_mutex_unlock(&sa->mutex);
+        return false;
+    }
+
+    VkMemBlock*  block  = malloc(sizeof(VkMemBlock));
+    VkMemRegion* region = malloc(sizeof(VkMemRegion));
+    if (!block || !region) {
+        free(block);
+        free(region);
+        vkFreeMemory(r->device, mem, NULL);
+        pthread_mutex_unlock(&sa->mutex);
+        return false;
+    }
+    region->offset = 0;
+    region->size   = block_size;
+    region->next   = NULL;
+    block->memory  = mem;
+    block->size    = block_size;
+    block->memory_type_index = type_index;
+    block->free_list = region;
+    block->next    = sa->blocks;
+    sa->blocks     = block;
+
+    VkDeviceSize bind = suballoc_align_up(region->offset, align);  // == 0 at block start
+    suballoc_carve(block, NULL, region, bind, mr.size, out);
+    pthread_mutex_unlock(&sa->mutex);
+    return true;
+}
+
+static void vkr_suballoc_free(VkRenderer* r, VkSuballoc* a) {
+    if (!a || !a->block) return;
+    VkImageSuballocator* sa = &r->image_suballoc;
+    pthread_mutex_lock(&sa->mutex);
+
+    VkMemBlock*  b   = a->block;
+    VkDeviceSize off = a->span_offset;
+    VkDeviceSize sz  = a->span_size;
+
+    // Sorted insertion point in the free list.
+    VkMemRegion* prev = NULL;
+    VkMemRegion* cur  = b->free_list;
+    while (cur && cur->offset < off) { prev = cur; cur = cur->next; }
+
+    bool merged_prev = prev && prev->offset + prev->size == off;
+    bool merged_next = cur && off + sz == cur->offset;
+
+    if (merged_prev && merged_next) {
+        prev->size += sz + cur->size;
+        prev->next  = cur->next;
+        free(cur);
+    } else if (merged_prev) {
+        prev->size += sz;
+    } else if (merged_next) {
+        cur->offset = off;
+        cur->size  += sz;
+    } else {
+        VkMemRegion* node = malloc(sizeof(VkMemRegion));
+        if (node) {
+            node->offset = off;
+            node->size   = sz;
+            node->next   = cur;
+            if (prev) prev->next = node;
+            else      b->free_list = node;
+        } else {
+            // Node alloc failed (near-impossible): leak the span; the block is reclaimed at
+            // teardown anyway.
+            VK_LOGE("suballoc free: region node alloc failed; leaking %llu bytes",
+                    (unsigned long long)sz);
+        }
+    }
+
+    // Return a fully-drained block so churn doesn't pin memory forever.
+    if (b->free_list && b->free_list->next == NULL
+        && b->free_list->offset == 0 && b->free_list->size == b->size) {
+        VkMemBlock* pb = NULL;
+        for (VkMemBlock* it = sa->blocks; it; pb = it, it = it->next) {
+            if (it == b) {
+                if (pb) pb->next = it->next;
+                else    sa->blocks = it->next;
+                break;
+            }
+        }
+        free(b->free_list);
+        vkFreeMemory(r->device, b->memory, NULL);
+        free(b);
+    }
+
+    pthread_mutex_unlock(&sa->mutex);
+    memset(a, 0, sizeof(*a));
+}
+
+void vkr_suballoc_destroy(VkRenderer* r) {
+    VkImageSuballocator* sa = &r->image_suballoc;
+    VkMemBlock* b = sa->blocks;
+    while (b) {
+        VkMemBlock* next = b->next;
+        VkMemRegion* reg = b->free_list;
+        while (reg) { VkMemRegion* rn = reg->next; free(reg); reg = rn; }
+        if (b->memory) vkFreeMemory(r->device, b->memory, NULL);
+        free(b);
+        b = next;
+    }
+    sa->blocks = NULL;
+    if (sa->mutex_init) {
+        pthread_mutex_destroy(&sa->mutex);
+        sa->mutex_init = false;
+    }
+}
+
+// ----------------------------------------------------------------------
+// CPU-uploaded path
+// ----------------------------------------------------------------------
+
+typedef struct UploadCtx {
+    VkBuffer staging;
+    VkImage  dst;
+    VkDeviceSize offset;
+    uint32_t x, y, w, h;
+    VkImageLayout old_layout;
+    bool     to_shader_read;
+} UploadCtx;
+
+static void upload_cmds(VkCommandBuffer cmd, void* user) {
+    UploadCtx* u = (UploadCtx*)user;
+
+    VkPipelineStageFlags src_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+    VkAccessFlags src_access = 0;
+    if (u->old_layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
+        src_stage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+        src_access = VK_ACCESS_SHADER_READ_BIT;
+    } else if (u->old_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
+        src_stage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+        src_access = VK_ACCESS_TRANSFER_WRITE_BIT;
+    }
+
+    vkr_image_barrier(cmd, u->dst,
+        u->old_layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+        src_stage, VK_PIPELINE_STAGE_TRANSFER_BIT,
+        src_access, VK_ACCESS_TRANSFER_WRITE_BIT);
+
+    VkBufferImageCopy bic = {0};
+    bic.bufferOffset = u->offset;
+    bic.bufferRowLength = 0;
+    bic.bufferImageHeight = 0;
+    bic.imageOffset.x = (int32_t)u->x;
+    bic.imageOffset.y = (int32_t)u->y;
+    bic.imageOffset.z = 0;
+    bic.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    bic.imageSubresource.layerCount = 1;
+    bic.imageExtent.width = u->w;
+    bic.imageExtent.height = u->h;
+    bic.imageExtent.depth = 1;
+    vkCmdCopyBufferToImage(cmd, u->staging, u->dst,
+                           VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &bic);
+
+    if (u->to_shader_read) {
+        vkr_image_barrier(cmd, u->dst,
+            VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+            VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+            VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
+    }
+}
+
+static bool create_image_basic(VkRenderer* r, uint32_t w, uint32_t h, VkFormat fmt,
+                               VkImageUsageFlags usage, VkTexture* t) {
+    VkImageCreateInfo ic = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO};
+    ic.imageType = VK_IMAGE_TYPE_2D;
+    ic.format = fmt;
+    ic.extent.width = w;
+    ic.extent.height = h;
+    ic.extent.depth = 1;
+    ic.mipLevels = 1;
+    ic.arrayLayers = 1;
+    ic.samples = VK_SAMPLE_COUNT_1_BIT;
+    ic.tiling = VK_IMAGE_TILING_OPTIMAL;
+    ic.usage = usage;
+    ic.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    ic.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+
+    if (vkCreateImage(r->device, &ic, NULL, &t->image) != VK_SUCCESS) return false;
+
+    // Preferred path: pooled span (no per-texture vkAllocateMemory). Bind once here.
+    VkSuballoc sub = {0};
+    if (vkr_suballoc_image(r, t->image, &sub)) {
+        if (vkBindImageMemory(r->device, t->image, sub.memory, sub.bind_offset) == VK_SUCCESS) {
+            t->suballoc = sub;
+            t->suballocated = true;
+            return true;
+        }
+        // Bind attempted -> image can't be rebound via the dedicated path; fail (OOM-grade,
+        // effectively never happens).
+        vkr_suballoc_free(r, &sub);
+        vkDestroyImage(r->device, t->image, NULL);
+        t->image = VK_NULL_HANDLE;
+        return false;
+    }
+
+    // Fallback: dedicated allocation (pool OOM / no DEVICE_LOCAL type). No bind attempted yet.
+    VkMemoryRequirements mr;
+    vkGetImageMemoryRequirements(r->device, t->image, &mr);
+
+    VkMemoryAllocateInfo ai = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO};
+    ai.allocationSize = mr.size;
+    ai.memoryTypeIndex = vkr_find_memory_type(r, mr.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+    if (ai.memoryTypeIndex == UINT32_MAX) {
+        vkDestroyImage(r->device, t->image, NULL);
+        t->image = VK_NULL_HANDLE;
+        return false;
+    }
+
+    if (vkAllocateMemory(r->device, &ai, NULL, &t->memory) != VK_SUCCESS) {
+        vkDestroyImage(r->device, t->image, NULL);
+        t->image = VK_NULL_HANDLE;
+        return false;
+    }
+    vkBindImageMemory(r->device, t->image, t->memory, 0);
+    return true;
+}
+
+VkTexture* vkr_texture_create_uploaded(VkRenderer* r, uint32_t width, uint32_t height,
+                                       const void* data, size_t data_size, uint32_t stride_pixels) {
+    if (width == 0 || height == 0) return NULL;
+
+    VkTexture* t = calloc(1, sizeof(VkTexture));
+    if (!t) return NULL;
+    t->width = width;
+    t->height = height;
+    t->format = r->caps.upload_format;
+
+    VkImageUsageFlags usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    if (!create_image_basic(r, width, height, t->format, usage, t)) {
+        free(t);
+        return NULL;
+    }
+
+    VkImageViewCreateInfo vi = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO};
+    vi.image = t->image;
+    vi.viewType = VK_IMAGE_VIEW_TYPE_2D;
+    vi.format = t->format;
+    vi.components.r = VK_COMPONENT_SWIZZLE_IDENTITY;
+    vi.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
+    vi.components.b = VK_COMPONENT_SWIZZLE_IDENTITY;
+    vi.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
+    vi.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    vi.subresourceRange.levelCount = 1;
+    vi.subresourceRange.layerCount = 1;
+    if (vkCreateImageView(r->device, &vi, NULL, &t->view) != VK_SUCCESS) {
+        destroy_texture_resources(r, t);
+        return NULL;
+    }
+
+    // CPU-uploaded textures all want the same sampler config, so use the renderer's shared
+    // sampler. tex->sampler stays VK_NULL_HANDLE; destroy_texture_resources skips it.
+    if (r->shared_sampler == VK_NULL_HANDLE) {
+        VK_LOGE("vkr_texture_create_uploaded: shared_sampler not initialized");
+        destroy_texture_resources(r, t);
+        return NULL;
+    }
+
+    t->descriptor_set = vkr_alloc_descriptor_set(r);
+    if (t->descriptor_set == VK_NULL_HANDLE) {
+        destroy_texture_resources(r, t);
+        return NULL;
+    }
+    write_descriptor_set(r, t->descriptor_set, t->view, active_shared_sampler(r));
+
+    if (data && data_size > 0) {
+        vkr_texture_update(r, t, width, height, data, data_size, stride_pixels,
+                           0, 0, width, height);
+    } else {
+        // No initial data — async transition to SHADER_READ so the texture is safe to sample
+        // as black. Doesn't block the caller; the barrier orders before the next render submit
+        // on the same queue per Vulkan spec.
+        if (!vkr_submit_async_transition(r, t->image,
+                VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+                VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+                0, VK_ACCESS_SHADER_READ_BIT)) {
+            VK_LOGW("vkr_texture_create_uploaded: async transition failed; texture may render undefined contents");
+        }
+    }
+    t->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    t->ready = true;
+    if (!track_live_texture(r, t)) {
+        destroy_texture_resources(r, t);
+        return NULL;
+    }
+    return t;
+}
+
+bool vkr_texture_update(VkRenderer* r, VkTexture* tex, uint32_t width, uint32_t height,
+                        const void* data, size_t data_size, uint32_t stride_pixels,
+                        uint32_t dirty_x, uint32_t dirty_y,
+                        uint32_t dirty_w, uint32_t dirty_h) {
+    if (!tex || tex->external || !data || data_size == 0) return false;
+    if (width != tex->width || height != tex->height) {
+        // Caller is expected to size-match. Reject mismatches to avoid silent corruption.
+        VK_LOGW("vkr_texture_update size mismatch (have %ux%u, got %ux%u)",
+                tex->width, tex->height, width, height);
+        return false;
+    }
+
+    // BGRA8 = 4 bytes per pixel. Caller provides stride_pixels (per-row pixel count).
+    if (stride_pixels == 0) stride_pixels = width;
+    if (dirty_w == 0 || dirty_h == 0) {
+        dirty_x = 0;
+        dirty_y = 0;
+        dirty_w = width;
+        dirty_h = height;
+    }
+    if (dirty_x >= width || dirty_y >= height) return false;
+    if (dirty_x + dirty_w > width) dirty_w = width - dirty_x;
+    if (dirty_y + dirty_h > height) dirty_h = height - dirty_y;
+    if (dirty_w == 0 || dirty_h == 0) return false;
+
+    size_t needed = (size_t)dirty_w * dirty_h * 4;
+    size_t src_pitch = (size_t)stride_pixels * 4;
+    size_t row = (size_t)dirty_w * 4;
+    size_t src_offset = ((size_t)dirty_y * stride_pixels + dirty_x) * 4;
+    size_t last_row = src_offset + (size_t)(dirty_h - 1) * src_pitch + row;
+    if (last_row > data_size) {
+        VK_LOGW("vkr_texture_update dirty rect exceeds source buffer");
+        return false;
+    }
+
+    VkStagingSlot* slot = vkr_staging_pool_acquire(r, needed);
+    if (!slot) {
+        VK_LOGE("vkr_texture_update: staging pool acquire failed");
+        return false;
+    }
+
+    bool swizzle = r->caps.upload_needs_bgra_swizzle;
+    if (dirty_x == 0 && dirty_y == 0 && dirty_w == width && dirty_h == height
+        && stride_pixels == width) {
+        copy_pixels_maybe_swizzle(slot->mapped, data, needed, swizzle);
+    } else {
+        const uint8_t* src = (const uint8_t*)data + src_offset;
+        uint8_t* dst = (uint8_t*)slot->mapped;
+        for (uint32_t y = 0; y < dirty_h; y++) {
+            copy_pixels_maybe_swizzle(dst + (size_t)y * row,
+                                      src + (size_t)y * src_pitch, row, swizzle);
+        }
+    }
+
+    VkCommandBufferBeginInfo cbi = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO};
+    cbi.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+    if (vkBeginCommandBuffer(slot->cmd, &cbi) != VK_SUCCESS) {
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    UploadCtx ctx = {
+        slot->buffer, tex->image, 0,
+        dirty_x, dirty_y, dirty_w, dirty_h,
+        tex->layout, true
+    };
+    upload_cmds(slot->cmd, &ctx);
+
+    if (vkEndCommandBuffer(slot->cmd) != VK_SUCCESS) {
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    VkSubmitInfo si = {VK_STRUCTURE_TYPE_SUBMIT_INFO};
+    si.commandBufferCount = 1;
+    si.pCommandBuffers = &slot->cmd;
+
+    // Reset fence here, not in acquire — guarantees that the only path that leaves a fence
+    // unsignaled is one where vkQueueSubmit also runs to take ownership of it.
+    vkResetFences(r->device, 1, &slot->fence);
+
+    pthread_mutex_lock(&r->queue_mutex);
+    VkResult sr = vkQueueSubmit(r->graphics_queue, 1, &si, slot->fence);
+    pthread_mutex_unlock(&r->queue_mutex);
+    if (sr != VK_SUCCESS) {
+        VK_LOGE("vkr_texture_update: vkQueueSubmit -> %d", sr);
+        // Submit failed but we already reset the fence, so it's unsignaled and would deadlock
+        // the next acquire. Replace with a signaled fence. (Submit failures usually mean
+        // device-lost; the renderer is going to need a restart anyway.)
+        vkDestroyFence(r->device, slot->fence, NULL);
+        VkFenceCreateInfo rfi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+        rfi.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+        vkCreateFence(r->device, &rfi, NULL, &slot->fence);
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    // The barrier emitted by upload_cmds (TRANSFER_WRITE → SHADER_READ, dstStage=
+    // FRAGMENT_SHADER) extends into all subsequent submits on the same queue, so the next
+    // render submit will observe the writes without any additional renderer-side barrier.
+    tex->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    vkr_staging_pool_release(slot);
+    return true;
+}
+
+typedef struct PreparedBatchUpload {
+    VkTexture* texture;
+    const uint8_t* data;
+    size_t data_size;
+    size_t src_offset;
+    size_t src_pitch;
+    size_t row_bytes;
+    VkDeviceSize staging_offset;
+    VkDeviceSize byte_count;
+    uint32_t x, y, w, h;
+} PreparedBatchUpload;
+
+static VkDeviceSize align4(VkDeviceSize v) {
+    return (v + 3ull) & ~(VkDeviceSize)3ull;
+}
+
+static void batch_transition_to_transfer(VkCommandBuffer cmd, VkTexture* tex) {
+    VkPipelineStageFlags src_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+    VkAccessFlags src_access = 0;
+    if (tex->layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
+        src_stage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+        src_access = VK_ACCESS_SHADER_READ_BIT;
+    } else if (tex->layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
+        src_stage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+        src_access = VK_ACCESS_TRANSFER_WRITE_BIT;
+    }
+
+    vkr_image_barrier(cmd, tex->image,
+        tex->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+        src_stage, VK_PIPELINE_STAGE_TRANSFER_BIT,
+        src_access, VK_ACCESS_TRANSFER_WRITE_BIT);
+}
+
+static void batch_transition_to_shader_read(VkCommandBuffer cmd, VkTexture* tex) {
+    vkr_image_barrier(cmd, tex->image,
+        VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+        VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+        VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
+}
+
+// Grow-only PreparedBatchUpload[] scratch. Render-thread-only, so unlocked; every element is
+// fully overwritten before use, so no zeroing.
+static PreparedBatchUpload* get_prepared_scratch(VkRenderer* r, uint32_t count) {
+    if (r->batch_prepared_cap < count) {
+        uint32_t new_cap = r->batch_prepared_cap ? r->batch_prepared_cap : 64;
+        while (new_cap < count) new_cap *= 2;
+        void* p = realloc(r->batch_prepared_scratch, (size_t)new_cap * sizeof(PreparedBatchUpload));
+        if (!p) return NULL;
+        r->batch_prepared_scratch = p;
+        r->batch_prepared_cap = new_cap;
+    }
+    return (PreparedBatchUpload*)r->batch_prepared_scratch;
+}
+
+bool vkr_texture_batch_update(VkRenderer* r, const VkTextureBatchUpload* uploads,
+                              uint32_t upload_count) {
+    if (!r || !uploads || upload_count == 0) return false;
+
+    PreparedBatchUpload* prepared = get_prepared_scratch(r, upload_count);
+    if (!prepared) return false;
+
+    VkDeviceSize total = 0;
+    for (uint32_t i = 0; i < upload_count; i++) {
+        const VkTextureBatchUpload* in = &uploads[i];
+        VkTexture* tex = in->texture;
+        if (!tex || tex->external || !in->data || in->data_size == 0
+            || in->width != tex->width || in->height != tex->height) {
+            return false;
+        }
+
+        uint32_t stride_pixels = in->stride_pixels ? in->stride_pixels : in->width;
+        uint32_t dirty_x = in->dirty_x;
+        uint32_t dirty_y = in->dirty_y;
+        uint32_t dirty_w = in->dirty_w;
+        uint32_t dirty_h = in->dirty_h;
+        if (dirty_w == 0 || dirty_h == 0) {
+            dirty_x = 0;
+            dirty_y = 0;
+            dirty_w = in->width;
+            dirty_h = in->height;
+        }
+        if (dirty_x >= in->width || dirty_y >= in->height) {
+            return false;
+        }
+        if (dirty_x + dirty_w > in->width) dirty_w = in->width - dirty_x;
+        if (dirty_y + dirty_h > in->height) dirty_h = in->height - dirty_y;
+        if (dirty_w == 0 || dirty_h == 0) {
+            return false;
+        }
+
+        size_t src_pitch = (size_t)stride_pixels * 4;
+        size_t row = (size_t)dirty_w * 4;
+        size_t src_offset = ((size_t)dirty_y * stride_pixels + dirty_x) * 4;
+        size_t last_row = src_offset + (size_t)(dirty_h - 1) * src_pitch + row;
+        if (last_row > in->data_size) {
+            return false;
+        }
+
+        total = align4(total);
+        prepared[i].texture = tex;
+        prepared[i].data = (const uint8_t*)in->data;
+        prepared[i].data_size = in->data_size;
+        prepared[i].src_offset = src_offset;
+        prepared[i].src_pitch = src_pitch;
+        prepared[i].row_bytes = row;
+        prepared[i].staging_offset = total;
+        prepared[i].byte_count = (VkDeviceSize)row * dirty_h;
+        prepared[i].x = dirty_x;
+        prepared[i].y = dirty_y;
+        prepared[i].w = dirty_w;
+        prepared[i].h = dirty_h;
+        total += prepared[i].byte_count;
+    }
+
+    VkStagingSlot* slot = vkr_staging_pool_acquire(r, total);
+    if (!slot) {
+        VK_LOGE("vkr_texture_batch_update: staging pool acquire failed");
+        return false;
+    }
+
+    bool swizzle = r->caps.upload_needs_bgra_swizzle;
+    for (uint32_t i = 0; i < upload_count; i++) {
+        const PreparedBatchUpload* u = &prepared[i];
+        const uint8_t* src = u->data + u->src_offset;
+        uint8_t* dst = (uint8_t*)slot->mapped + u->staging_offset;
+        if (u->row_bytes == u->src_pitch) {
+            copy_pixels_maybe_swizzle(dst, src, (size_t)u->byte_count, swizzle);
+        } else {
+            for (uint32_t y = 0; y < u->h; y++) {
+                copy_pixels_maybe_swizzle(dst + (size_t)y * u->row_bytes,
+                                          src + (size_t)y * u->src_pitch,
+                                          u->row_bytes, swizzle);
+            }
+        }
+    }
+
+    VkCommandBufferBeginInfo cbi = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO};
+    cbi.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+    if (vkBeginCommandBuffer(slot->cmd, &cbi) != VK_SUCCESS) {
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    VkTexture* current = NULL;
+    for (uint32_t i = 0; i < upload_count; i++) {
+        PreparedBatchUpload* u = &prepared[i];
+        if (u->texture != current) {
+            if (current) batch_transition_to_shader_read(slot->cmd, current);
+            current = u->texture;
+            batch_transition_to_transfer(slot->cmd, current);
+        }
+
+        VkBufferImageCopy bic = {0};
+        bic.bufferOffset = u->staging_offset;
+        bic.imageOffset.x = (int32_t)u->x;
+        bic.imageOffset.y = (int32_t)u->y;
+        bic.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        bic.imageSubresource.layerCount = 1;
+        bic.imageExtent.width = u->w;
+        bic.imageExtent.height = u->h;
+        bic.imageExtent.depth = 1;
+        vkCmdCopyBufferToImage(slot->cmd, slot->buffer, current->image,
+                               VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &bic);
+    }
+    if (current) batch_transition_to_shader_read(slot->cmd, current);
+
+    if (vkEndCommandBuffer(slot->cmd) != VK_SUCCESS) {
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    VkSubmitInfo si = {VK_STRUCTURE_TYPE_SUBMIT_INFO};
+    si.commandBufferCount = 1;
+    si.pCommandBuffers = &slot->cmd;
+    vkResetFences(r->device, 1, &slot->fence);
+
+    pthread_mutex_lock(&r->queue_mutex);
+    VkResult sr = vkQueueSubmit(r->graphics_queue, 1, &si, slot->fence);
+    pthread_mutex_unlock(&r->queue_mutex);
+    if (sr != VK_SUCCESS) {
+        VK_LOGE("vkr_texture_batch_update: vkQueueSubmit -> %d", sr);
+        vkDestroyFence(r->device, slot->fence, NULL);
+        VkFenceCreateInfo rfi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+        rfi.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+        vkCreateFence(r->device, &rfi, NULL, &slot->fence);
+        vkr_staging_pool_release(slot);
+        return false;
+    }
+
+    for (uint32_t i = 0; i < upload_count; i++) {
+        prepared[i].texture->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    }
+    vkr_staging_pool_release(slot);
+    return true;
+}
+
+// ----------------------------------------------------------------------
+// AHB import path (zero-copy)
+// ----------------------------------------------------------------------
+
+VkTexture* vkr_texture_import_ahb(VkRenderer* r, AHardwareBuffer* ahb, bool transfer_ownership) {
+    if (!ahb) {
+        VK_LOGW("AHB import skipped: null AHardwareBuffer");
+        return NULL;
+    }
+    if (!r->ext_ahb || !r->fnGetAhbProps) {
+        VK_LOGW("AHB import skipped: ext_ahb=%d fnGetAhbProps=%d",
+                r->ext_ahb, r->fnGetAhbProps != NULL);
+        return NULL;
+    }
+
+    VkAndroidHardwareBufferFormatPropertiesANDROID format_props = {
+        VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID
+    };
+    VkAndroidHardwareBufferPropertiesANDROID props = {
+        VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID
+    };
+    props.pNext = &format_props;
+    if (r->fnGetAhbProps(r->device, ahb, &props) != VK_SUCCESS) {
+        VK_LOGW("vkGetAndroidHardwareBufferPropertiesANDROID failed");
+        return NULL;
+    }
+
+    AHardwareBuffer_Desc desc = {0};
+    AHardwareBuffer_describe(ahb, &desc);
+    VK_LOGI("AHB Vulkan import begin: %ux%u stride=%u format=%u usage=0x%llx allocation=%llu memoryBits=0x%x vkFormat=%d",
+            desc.width, desc.height, desc.stride, desc.format,
+            (unsigned long long)desc.usage,
+            (unsigned long long)props.allocationSize,
+            props.memoryTypeBits,
+            format_props.format);
+
+    VkTexture* t = calloc(1, sizeof(VkTexture));
+    if (!t) return NULL;
+    t->width = desc.width;
+    t->height = desc.height;
+    t->external = true;
+    t->ahb = transfer_ownership ? ahb : NULL;
+    if (transfer_ownership) AHardwareBuffer_acquire(ahb);
+
+    // External-format AHB sampling requires a YCbCr conversion bound through an immutable
+    // sampler in the descriptor-set layout. This renderer uses one mutable combined
+    // image/sampler layout for all regular textures, so accepting external-format AHBs here
+    // would be Vulkan-invalid on strict drivers. Keep the import path to RGB formats until a
+    // separate immutable-sampler pipeline/layout path exists.
+    if (format_props.format == VK_FORMAT_UNDEFINED) {
+        VK_LOGW("AHB external-format import unsupported by current descriptor layout");
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+
+    VkExternalMemoryImageCreateInfo emi = {VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO};
+    emi.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
+
+    VkImageCreateInfo ic = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO};
+    ic.pNext = &emi;
+    ic.imageType = VK_IMAGE_TYPE_2D;
+    ic.format = format_props.format;  // may be UNDEFINED for vendor formats
+    ic.extent.width = desc.width;
+    ic.extent.height = desc.height;
+    ic.extent.depth = 1;
+    ic.mipLevels = 1;
+    ic.arrayLayers = 1;
+    ic.samples = VK_SAMPLE_COUNT_1_BIT;
+    ic.tiling = VK_IMAGE_TILING_OPTIMAL;
+    ic.usage = VK_IMAGE_USAGE_SAMPLED_BIT;
+    ic.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    ic.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+
+    if (vkCreateImage(r->device, &ic, NULL, &t->image) != VK_SUCCESS) {
+        VK_LOGW("AHB vkCreateImage failed");
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+    t->format = format_props.format;
+
+    // Dedicated allocation pulls memory from the AHB handle.
+    VkImportAndroidHardwareBufferInfoANDROID import = {
+        VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID
+    };
+    import.buffer = ahb;
+
+    VkMemoryDedicatedAllocateInfo dedicated = {VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO};
+    dedicated.image = t->image;
+    dedicated.pNext = &import;
+
+    VkMemoryAllocateInfo mai = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO};
+    mai.pNext = &dedicated;
+    mai.allocationSize = props.allocationSize;
+    mai.memoryTypeIndex = vkr_find_memory_type(r, props.memoryTypeBits, 0);
+    if (mai.memoryTypeIndex == UINT32_MAX) {
+        VK_LOGW("AHB no compatible memory type");
+        vkDestroyImage(r->device, t->image, NULL);
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+
+    if (vkAllocateMemory(r->device, &mai, NULL, &t->memory) != VK_SUCCESS) {
+        VK_LOGW("AHB vkAllocateMemory failed");
+        vkDestroyImage(r->device, t->image, NULL);
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+    vkBindImageMemory(r->device, t->image, t->memory, 0);
+
+    VkSamplerYcbcrConversionInfo yview = {VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO};
+    yview.conversion = t->ycbcr;
+
+    VkImageViewCreateInfo vi = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO};
+    if (t->ycbcr != VK_NULL_HANDLE) vi.pNext = &yview;
+    vi.image = t->image;
+    vi.viewType = VK_IMAGE_VIEW_TYPE_2D;
+    vi.format = format_props.format;
+    // samplerYcbcrConversionComponents is only defined when a Ycbcr conversion is in use;
+    // some non-Adreno drivers populate non-identity swizzles for RGB AHBs.
+    if (t->ycbcr != VK_NULL_HANDLE) {
+        vi.components = format_props.samplerYcbcrConversionComponents;
+    } else {
+        // fixes devices that supports vulkan bgra8 format, but doesn't support bgra8 ahb images
+        bool swizzle_rb = format_props.format == VK_FORMAT_R8G8B8A8_UNORM
+            && r->caps.upload_format == VK_FORMAT_B8G8R8A8_UNORM;
+        vi.components.r = swizzle_rb ? VK_COMPONENT_SWIZZLE_B : VK_COMPONENT_SWIZZLE_IDENTITY;
+        vi.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
+        vi.components.b = swizzle_rb ? VK_COMPONENT_SWIZZLE_R : VK_COMPONENT_SWIZZLE_IDENTITY;
+        vi.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
+    }
+
+    vi.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    vi.subresourceRange.levelCount = 1;
+    vi.subresourceRange.layerCount = 1;
+    if (vkCreateImageView(r->device, &vi, NULL, &t->view) != VK_SUCCESS) {
+        VK_LOGW("AHB vkCreateImageView failed");
+        if (t->ycbcr && r->fnDestroyYcbcr) r->fnDestroyYcbcr(r->device, t->ycbcr, NULL);
+        vkDestroyImage(r->device, t->image, NULL);
+        vkFreeMemory(r->device, t->memory, NULL);
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+
+    // Ycbcr-bound samplers must be created per-texture (driver pairs them with the conversion).
+    // For plain RGB AHB imports we can reuse the renderer's shared sampler.
+    VkSampler sampler_for_descriptor;
+    if (t->ycbcr != VK_NULL_HANDLE) {
+        if (!vkr_create_sampler(r, t->ycbcr, &t->sampler)) {
+            VK_LOGW("AHB vkr_create_sampler failed");
+            vkDestroyImageView(r->device, t->view, NULL);
+            if (r->fnDestroyYcbcr) r->fnDestroyYcbcr(r->device, t->ycbcr, NULL);
+            vkDestroyImage(r->device, t->image, NULL);
+            vkFreeMemory(r->device, t->memory, NULL);
+            if (t->ahb) AHardwareBuffer_release(t->ahb);
+            free(t);
+            return NULL;
+        }
+        sampler_for_descriptor = t->sampler;
+    } else if (r->shared_sampler != VK_NULL_HANDLE) {
+        sampler_for_descriptor = active_shared_sampler(r);
+    } else {
+        VK_LOGE("AHB import: shared_sampler not initialized");
+        vkDestroyImageView(r->device, t->view, NULL);
+        vkDestroyImage(r->device, t->image, NULL);
+        vkFreeMemory(r->device, t->memory, NULL);
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+
+    t->descriptor_set = vkr_alloc_descriptor_set(r);
+    if (t->descriptor_set == VK_NULL_HANDLE) {
+        if (t->sampler) vkDestroySampler(r->device, t->sampler, NULL);
+        vkDestroyImageView(r->device, t->view, NULL);
+        if (t->ycbcr && r->fnDestroyYcbcr) r->fnDestroyYcbcr(r->device, t->ycbcr, NULL);
+        vkDestroyImage(r->device, t->image, NULL);
+        vkFreeMemory(r->device, t->memory, NULL);
+        if (t->ahb) AHardwareBuffer_release(t->ahb);
+        free(t);
+        return NULL;
+    }
+    write_descriptor_set(r, t->descriptor_set, t->view, sampler_for_descriptor);
+
+    // Async transition to SHADER_READ. The barrier orders before all subsequent submits on
+    // the same queue per Vulkan spec, so the next render submit safely samples this image
+    // without an additional renderer-side wait.
+    if (!vkr_submit_async_transition(r, t->image,
+            VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+            VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+            0, VK_ACCESS_SHADER_READ_BIT)) {
+        VK_LOGW("AHB import: async transition failed; sampling may yield undefined contents");
+    }
+
+    t->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    t->ready = true;
+    if (!track_live_texture(r, t)) {
+        destroy_texture_resources(r, t);
+        return NULL;
+    }
+    VK_LOGI("AHB Vulkan import ready: %ux%u vkFormat=%d memoryType=%u texture=%p",
+            t->width, t->height, t->format, mai.memoryTypeIndex,
+            (void*)t);
+    return t;
+}
+
+// ----------------------------------------------------------------------
+// Destruction
+// ----------------------------------------------------------------------
+
+void vkr_texture_destroy(VkRenderer* r, VkTexture* tex) {
+    if (!tex) return;
+    untrack_live_texture(r, tex);
+    destroy_texture_resources(r, tex);
+}
+
+void vkr_texture_destroy_all_live(VkRenderer* r) {
+    for (;;) {
+        VkTexture* tex = pop_live_texture(r);
+        if (!tex) break;
+        destroy_texture_resources(r, tex);
+    }
+}
+
+void vkr_texture_schedule_destroy(VkRenderer* r, VkTexture* tex) {
+    if (!tex) return;
+    pthread_mutex_lock(&r->scene_mutex);
+
+    if (tex->destroy_scheduled) {
+        pthread_mutex_unlock(&r->scene_mutex);
+        return;
+    }
+    tex->destroy_scheduled = true;
+
+    // Defensive: drop any references in the live scene state.
+    for (uint32_t i = 0; i < r->scene.window_count; i++) {
+        if (r->scene.windows[i].texture == tex) {
+            r->scene.windows[i].texture = NULL;
+        }
+    }
+    if (r->scene.cursor_texture == tex) r->scene.cursor_texture = NULL;
+
+    uint32_t retire_slot = (r->graveyard_index + VK_FRAMES_IN_FLIGHT)
+                         % (VK_FRAMES_IN_FLIGHT + 1);
+    VkGraveSlot* slot = &r->graveyard[retire_slot];
+    if (slot->count >= slot->capacity) {
+        uint32_t new_cap = slot->capacity ? slot->capacity * 2 : 16;
+        VkTexture** ng = realloc(slot->textures, new_cap * sizeof(VkTexture*));
+        if (!ng) {
+            pthread_mutex_unlock(&r->scene_mutex);
+            // As a last resort, leak rather than crash. Better than UAF.
+            VK_LOGE("graveyard alloc failed; leaking texture %p", (void*)tex);
+            return;
+        }
+        slot->textures = ng;
+        slot->capacity = new_cap;
+    }
+    slot->textures[slot->count++] = tex;
+
+    pthread_mutex_unlock(&r->scene_mutex);
+}
diff --git a/app/src/main/cpp/winlator/vk/vk_renderer.c b/app/src/main/cpp/winlator/vk/vk_renderer.c
new file mode 100644
index 000000000..d065ed625
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/vk_renderer.c
@@ -0,0 +1,3239 @@
+// Vulkan compositor for the X-server display path.
+//
+// Owns the entire native-side rendering state. Java JNI shims push scene snapshots and call
+// frame submit; this file handles instance/device/swapchain/pipelines/sync.
+//
+// All vk* calls below resolve through vk_dispatch.h, which redirects them to the dlopen
+// handle (system libvulkan or adrenotools-loaded Turnip) chosen at nativeCreate.
+//
+// Synchronization model:
+//   - One graphics queue, serialized externally via VkRenderer::queue_mutex (any thread submits).
+//   - VK_FRAMES_IN_FLIGHT in-flight frames, each with its own semaphores + fence + cmd buffer.
+//   - Scene state guarded by VkRenderer::scene_mutex.
+//   - Texture lifetime: created/uploaded synchronously (blocks ~ms); destroyed via per-frame
+//     graveyard processed on the render thread, and tracked so renderer teardown can drain
+//     native texture objects that Java handles have not explicitly destroyed yet.
+
+#include "vk_state.h"
+#include "vk_driver.h"
+
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+#include <dlfcn.h>
+#include <jni.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+// SPIR-V shader byte arrays generated at build time by glslc + bin2c.cmake.
+#include "shaders/window_vert.spv.h"
+#include "shaders/window_frag.spv.h"
+#include "shaders/cursor_frag.spv.h"
+#include "shaders/quad_vert.spv.h"
+#include "shaders/blit_frag.spv.h"
+#include "shaders/effect_crt_frag.spv.h"
+#include "shaders/effect_vivid_frag.spv.h"
+#include "shaders/effect_hdr_frag.spv.h"
+#include "shaders/effect_natural_frag.spv.h"
+#include "shaders/effect_toon_frag.spv.h"
+#include "shaders/effect_ntsc_frag.spv.h"
+#include "shaders/effect_ntsc2_frag.spv.h"
+#include "shaders/effect_coloradj_frag.spv.h"
+#include "shaders/effect_colorgrade_frag.spv.h"
+#include "shaders/effect_sharpen_frag.spv.h"
+#include "shaders/effect_scanlines_frag.spv.h"
+#include "shaders/effect_colorblind_frag.spv.h"
+#include "shaders/effect_pixelate_frag.spv.h"
+#include "shaders/sgsr1_frag.spv.h"
+
+// ============================================================
+// Forward decls
+// ============================================================
+
+static bool create_instance(VkRenderer* r);
+static void destroy_debug_messenger(VkRenderer* r);
+static bool pick_physical_device(VkRenderer* r);
+static bool create_device(VkRenderer* r);
+static void query_device_caps(VkRenderer* r);
+static bool create_command_pool(VkRenderer* r);
+static bool create_descriptor_pool(VkRenderer* r, uint32_t capacity);
+static bool create_pipelines(VkRenderer* r);
+static void destroy_pipelines(VkRenderer* r);
+static bool create_swapchain(VkRenderer* r, uint32_t fallback_width, uint32_t fallback_height);
+static void destroy_swapchain_resources(VkRenderer* r);
+static void destroy_swapchain(VkRenderer* r);
+static bool create_offscreen(VkRenderer* r, uint32_t w, uint32_t h, bool need_second);
+static void destroy_offscreen(VkRenderer* r);
+static bool create_sgsr1_resources(VkRenderer* r, uint32_t w, uint32_t h);
+static void destroy_sgsr1_resources(VkRenderer* r);
+static bool create_quad_vbo(VkRenderer* r);
+static void destroy_quad_vbo(VkRenderer* r);
+static bool is_plain_rotation_transform(VkSurfaceTransformFlagBitsKHR transform);
+static bool is_quarter_turn_transform(VkSurfaceTransformFlagBitsKHR transform);
+static void detach_graveyard_slot(VkRenderer* r, uint32_t slot_idx,
+                                  VkTexture*** out_textures, uint32_t* out_count);
+static void destroy_graveyard_textures(VkRenderer* r, VkTexture** textures, uint32_t count);
+static bool record_and_submit_frame(VkRenderer* r);
+
+// ============================================================
+// Descriptor set allocation (called from vk_image.c)
+// ============================================================
+
+VkDescriptorSet vkr_alloc_descriptor_set(VkRenderer* r) {
+    if (r->pipelines.sampler_set_layout == VK_NULL_HANDLE || r->descriptor_pool == VK_NULL_HANDLE) {
+        VK_LOGE("vkr_alloc_descriptor_set called before pipelines/pool ready");
+        return VK_NULL_HANDLE;
+    }
+
+    pthread_mutex_lock(&r->descriptor_mutex);
+    if (r->descriptor_free_count > 0) {
+        VkDescriptorSet set = r->descriptor_free_list[--r->descriptor_free_count];
+        pthread_mutex_unlock(&r->descriptor_mutex);
+        return set;
+    }
+
+    VkDescriptorSetAllocateInfo ai = {VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO};
+    ai.descriptorPool = r->descriptor_pool;
+    ai.descriptorSetCount = 1;
+    ai.pSetLayouts = &r->pipelines.sampler_set_layout;
+
+    VkDescriptorSet set = VK_NULL_HANDLE;
+    VkResult res = vkAllocateDescriptorSets(r->device, &ai, &set);
+    if (res != VK_SUCCESS) {
+        VK_LOGE("vkAllocateDescriptorSets failed: %d (pool used %u/%u)",
+                res, r->descriptor_pool_used, r->descriptor_pool_capacity);
+        pthread_mutex_unlock(&r->descriptor_mutex);
+        return VK_NULL_HANDLE;
+    }
+    r->descriptor_pool_used++;
+    pthread_mutex_unlock(&r->descriptor_mutex);
+    return set;
+}
+
+void vkr_free_descriptor_set(VkRenderer* r, VkDescriptorSet set) {
+    if (set == VK_NULL_HANDLE) return;
+    pthread_mutex_lock(&r->descriptor_mutex);
+    if (r->descriptor_free_count < r->descriptor_free_capacity) {
+        r->descriptor_free_list[r->descriptor_free_count++] = set;
+    } else {
+        vkFreeDescriptorSets(r->device, r->descriptor_pool, 1, &set);
+        if (r->descriptor_pool_used > 0) r->descriptor_pool_used--;
+    }
+    pthread_mutex_unlock(&r->descriptor_mutex);
+}
+
+// ============================================================
+// Instance
+// ============================================================
+
+static bool has_extension(const VkExtensionProperties* exts, uint32_t count, const char* name) {
+    for (uint32_t i = 0; i < count; i++) {
+        if (strcmp(exts[i].extensionName, name) == 0) return true;
+    }
+    return false;
+}
+
+static bool has_layer(const VkLayerProperties* layers, uint32_t count, const char* name) {
+    for (uint32_t i = 0; i < count; i++) {
+        if (strcmp(layers[i].layerName, name) == 0) return true;
+    }
+    return false;
+}
+
+static const char* debug_severity_name(VkDebugUtilsMessageSeverityFlagBitsEXT severity) {
+    if (severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) return "error";
+    if (severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) return "warning";
+    if (severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) return "info";
+    return "verbose";
+}
+
+static VKAPI_ATTR VkBool32 VKAPI_CALL vvl_debug_callback(
+        VkDebugUtilsMessageSeverityFlagBitsEXT severity,
+        VkDebugUtilsMessageTypeFlagsEXT type,
+        const VkDebugUtilsMessengerCallbackDataEXT* data,
+        void* user) {
+    (void)type;
+    (void)user;
+    const char* message = (data && data->pMessage) ? data->pMessage : "(no message)";
+    const char* severity_name = debug_severity_name(severity);
+    if (severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
+        VK_LOGE("VVL %s: %s", severity_name, message);
+    } else if (severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) {
+        VK_LOGW("VVL %s: %s", severity_name, message);
+    } else {
+        VK_LOGI("VVL %s: %s", severity_name, message);
+    }
+    return VK_FALSE;
+}
+
+static bool create_instance(VkRenderer* r) {
+    uint32_t ext_count = 0;
+    vkEnumerateInstanceExtensionProperties(NULL, &ext_count, NULL);
+    VkExtensionProperties* exts = calloc(ext_count, sizeof(VkExtensionProperties));
+    vkEnumerateInstanceExtensionProperties(NULL, &ext_count, exts);
+
+    const char* required_exts[] = {
+        VK_KHR_SURFACE_EXTENSION_NAME,
+        VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
+    };
+    for (uint32_t i = 0; i < sizeof(required_exts) / sizeof(required_exts[0]); i++) {
+        if (!has_extension(exts, ext_count, required_exts[i])) {
+            VK_LOGE("Missing required instance extension: %s", required_exts[i]);
+            free(exts);
+            return false;
+        }
+    }
+
+    const char* enabled_layers[1] = {0};
+    uint32_t enabled_layer_count = 0;
+    if (r->validation_enabled) {
+        uint32_t layer_count = 0;
+        vkEnumerateInstanceLayerProperties(&layer_count, NULL);
+        VkLayerProperties* layers = calloc(layer_count, sizeof(VkLayerProperties));
+        vkEnumerateInstanceLayerProperties(&layer_count, layers);
+        if (has_layer(layers, layer_count, "VK_LAYER_KHRONOS_validation")) {
+            enabled_layers[enabled_layer_count++] = "VK_LAYER_KHRONOS_validation";
+            VK_LOGI("Vulkan validation layer enabled");
+        } else {
+            VK_LOGW("Vulkan validation layer requested but VK_LAYER_KHRONOS_validation is unavailable");
+            r->validation_enabled = false;
+        }
+        free(layers);
+    }
+
+    const char* enabled_exts[4] = {0};
+    uint32_t enabled_ext_count = 0;
+    for (uint32_t i = 0; i < sizeof(required_exts) / sizeof(required_exts[0]); i++) {
+        enabled_exts[enabled_ext_count++] = required_exts[i];
+    }
+    if (r->validation_enabled) {
+        if (has_extension(exts, ext_count, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) {
+            enabled_exts[enabled_ext_count++] = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
+            r->debug_utils_enabled = true;
+        } else {
+            VK_LOGW("VK_EXT_debug_utils unavailable; validation remains enabled without callback logging");
+        }
+    }
+    free(exts);
+
+    VkApplicationInfo app = {VK_STRUCTURE_TYPE_APPLICATION_INFO};
+    app.pApplicationName = "WinNative";
+    app.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
+    app.pEngineName = "WinNativeVk";
+    app.engineVersion = VK_MAKE_VERSION(1, 0, 0);
+    app.apiVersion = VK_API_VERSION_1_1;
+
+    VkInstanceCreateInfo ic = {VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO};
+    ic.pApplicationInfo = &app;
+    ic.enabledExtensionCount = enabled_ext_count;
+    ic.ppEnabledExtensionNames = enabled_exts;
+    ic.enabledLayerCount = enabled_layer_count;
+    ic.ppEnabledLayerNames = enabled_layers;
+
+    VkResult res = vkCreateInstance(&ic, NULL, &r->instance);
+    if (res != VK_SUCCESS) {
+        VK_LOGE("vkCreateInstance failed: %d", res);
+        return false;
+    }
+
+    if (!vkd_load_instance(r->instance)) {
+        VK_LOGE("vkd_load_instance failed");
+        return false;
+    }
+
+    if (r->debug_utils_enabled) {
+        r->fnCreateDebugUtilsMessenger =
+                (PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(
+                        r->instance, "vkCreateDebugUtilsMessengerEXT");
+        r->fnDestroyDebugUtilsMessenger =
+                (PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(
+                        r->instance, "vkDestroyDebugUtilsMessengerEXT");
+        if (r->fnCreateDebugUtilsMessenger && r->fnDestroyDebugUtilsMessenger) {
+            VkDebugUtilsMessengerCreateInfoEXT dc = {
+                VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT
+            };
+            dc.messageSeverity =
+                    VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
+                    VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
+            dc.messageType =
+                    VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
+                    VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
+                    VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
+            dc.pfnUserCallback = vvl_debug_callback;
+            res = r->fnCreateDebugUtilsMessenger(r->instance, &dc, NULL, &r->debug_messenger);
+            if (res != VK_SUCCESS) {
+                VK_LOGW("vkCreateDebugUtilsMessengerEXT failed: %d", res);
+                r->debug_utils_enabled = false;
+            }
+        } else {
+            VK_LOGW("VK_EXT_debug_utils entry points unavailable");
+            r->debug_utils_enabled = false;
+        }
+    }
+    return true;
+}
+
+static void destroy_debug_messenger(VkRenderer* r) {
+    if (r->debug_messenger != VK_NULL_HANDLE && r->fnDestroyDebugUtilsMessenger) {
+        r->fnDestroyDebugUtilsMessenger(r->instance, r->debug_messenger, NULL);
+        r->debug_messenger = VK_NULL_HANDLE;
+    }
+}
+
+// ============================================================
+// Physical device
+// ============================================================
+
+static bool pick_physical_device(VkRenderer* r) {
+    uint32_t count = 0;
+    vkEnumeratePhysicalDevices(r->instance, &count, NULL);
+    if (count == 0) return false;
+
+    VkPhysicalDevice* devices = calloc(count, sizeof(VkPhysicalDevice));
+    vkEnumeratePhysicalDevices(r->instance, &count, devices);
+
+    // Score: prefer DISCRETE > INTEGRATED > anything; require graphics queue + surface support is checked later.
+    int best_score = -1;
+    int best_idx = -1;
+    for (uint32_t i = 0; i < count; i++) {
+        VkPhysicalDeviceProperties p;
+        vkGetPhysicalDeviceProperties(devices[i], &p);
+        int s = (p.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) ? 1000
+              : (p.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU) ? 100 : 1;
+        if (s > best_score) { best_score = s; best_idx = (int)i; }
+    }
+    if (best_idx < 0) { free(devices); return false; }
+
+    r->physical_device = devices[best_idx];
+    free(devices);
+
+    vkGetPhysicalDeviceMemoryProperties(r->physical_device, &r->mem_props);
+
+    uint32_t qf_count = 0;
+    vkGetPhysicalDeviceQueueFamilyProperties(r->physical_device, &qf_count, NULL);
+    VkQueueFamilyProperties* qf = calloc(qf_count, sizeof(VkQueueFamilyProperties));
+    vkGetPhysicalDeviceQueueFamilyProperties(r->physical_device, &qf_count, qf);
+
+    r->graphics_queue_family = UINT32_MAX;
+    for (uint32_t i = 0; i < qf_count; i++) {
+        if (qf[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
+            r->graphics_queue_family = i;
+            break;
+        }
+    }
+    free(qf);
+    if (r->graphics_queue_family == UINT32_MAX) return false;
+    return true;
+}
+
+// ============================================================
+// Device
+// ============================================================
+
+static bool create_device(VkRenderer* r) {
+    uint32_t ext_count = 0;
+    vkEnumerateDeviceExtensionProperties(r->physical_device, NULL, &ext_count, NULL);
+    VkExtensionProperties* exts = calloc(ext_count, sizeof(VkExtensionProperties));
+    vkEnumerateDeviceExtensionProperties(r->physical_device, NULL, &ext_count, exts);
+
+    bool has_swap = has_extension(exts, ext_count, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
+    if (!has_swap) {
+        VK_LOGE("VK_KHR_swapchain not supported");
+        free(exts);
+        return false;
+    }
+
+    bool has_ahb = has_extension(exts, ext_count, VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME);
+    bool has_extmem = has_extension(exts, ext_count, VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
+    bool has_dedicated = has_extension(exts, ext_count, VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME);
+    bool has_get_mem_req2 = has_extension(exts, ext_count, VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME);
+    bool has_ycbcr = has_extension(exts, ext_count, VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME);
+    bool has_extmem_caps = has_extension(exts, ext_count, VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME);
+    bool has_queue_fam = has_extension(exts, ext_count, VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME);
+    bool has_cubic = has_extension(exts, ext_count, VK_EXT_FILTER_CUBIC_EXTENSION_NAME);
+
+    free(exts);
+
+    const char* enable[16];
+    uint32_t enable_n = 0;
+    enable[enable_n++] = VK_KHR_SWAPCHAIN_EXTENSION_NAME;
+
+    bool ahb_ok = has_ahb && has_extmem && has_dedicated && has_get_mem_req2;
+    if (ahb_ok) {
+        enable[enable_n++] = VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME;
+        enable[enable_n++] = VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME;
+        enable[enable_n++] = VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME;
+        enable[enable_n++] = VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME;
+        if (has_queue_fam) enable[enable_n++] = VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
+    }
+    if (has_ycbcr) enable[enable_n++] = VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME;
+    if (has_cubic) enable[enable_n++] = VK_EXT_FILTER_CUBIC_EXTENSION_NAME;
+    (void)has_extmem_caps;
+
+    r->ext_ahb = ahb_ok;
+    r->ext_ycbcr = has_ycbcr;
+    r->ext_filter_cubic = has_cubic;
+    VK_LOGI("AHB Vulkan device support: android_hardware_buffer=%d external_memory=%d dedicated=%d get_memory_requirements2=%d queue_family_foreign=%d enabled=%d",
+            has_ahb, has_extmem, has_dedicated, has_get_mem_req2, has_queue_fam, r->ext_ahb);
+    if (!r->ext_ahb) {
+        VK_LOGW("AHB Vulkan import disabled; one or more required device extensions are missing");
+    }
+
+    float qprio = 1.0f;
+    VkDeviceQueueCreateInfo qci = {VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO};
+    qci.queueFamilyIndex = r->graphics_queue_family;
+    qci.queueCount = 1;
+    qci.pQueuePriorities = &qprio;
+
+    VkPhysicalDeviceSamplerYcbcrConversionFeatures ycbcr_feat = {
+        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES
+    };
+    ycbcr_feat.samplerYcbcrConversion = has_ycbcr ? VK_TRUE : VK_FALSE;
+
+    VkDeviceCreateInfo dci = {VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO};
+    if (has_ycbcr) dci.pNext = &ycbcr_feat;
+    dci.queueCreateInfoCount = 1;
+    dci.pQueueCreateInfos = &qci;
+    dci.enabledExtensionCount = enable_n;
+    dci.ppEnabledExtensionNames = enable;
+
+    if (vkCreateDevice(r->physical_device, &dci, NULL, &r->device) != VK_SUCCESS) {
+        VK_LOGE("vkCreateDevice failed");
+        return false;
+    }
+    vkGetDeviceQueue(r->device, r->graphics_queue_family, 0, &r->graphics_queue);
+
+    if (r->ext_ahb) {
+        r->fnGetAhbProps = (PFN_vkGetAndroidHardwareBufferPropertiesANDROID)
+            vkGetDeviceProcAddr(r->device, "vkGetAndroidHardwareBufferPropertiesANDROID");
+        if (!r->fnGetAhbProps) {
+            VK_LOGW("AHB Vulkan import disabled; vkGetAndroidHardwareBufferPropertiesANDROID is unavailable");
+            r->ext_ahb = false;
+        }
+    }
+    if (r->ext_ycbcr) {
+        r->fnCreateYcbcr = (PFN_vkCreateSamplerYcbcrConversion)
+            vkGetDeviceProcAddr(r->device, "vkCreateSamplerYcbcrConversion");
+        r->fnDestroyYcbcr = (PFN_vkDestroySamplerYcbcrConversion)
+            vkGetDeviceProcAddr(r->device, "vkDestroySamplerYcbcrConversion");
+        // Fallback to KHR variants if 1.1 core entry points aren't exposed by the loader.
+        if (!r->fnCreateYcbcr) {
+            r->fnCreateYcbcr = (PFN_vkCreateSamplerYcbcrConversion)
+                vkGetDeviceProcAddr(r->device, "vkCreateSamplerYcbcrConversionKHR");
+        }
+        if (!r->fnDestroyYcbcr) {
+            r->fnDestroyYcbcr = (PFN_vkDestroySamplerYcbcrConversion)
+                vkGetDeviceProcAddr(r->device, "vkDestroySamplerYcbcrConversionKHR");
+        }
+        if (!r->fnCreateYcbcr || !r->fnDestroyYcbcr) {
+            VK_LOGW("Ycbcr conversion entry points unavailable; AHB import limited to RGB formats");
+            r->ext_ycbcr = false;
+        }
+    }
+
+    VK_LOGI("Vulkan device created (AHB=%d, Ycbcr=%d)", r->ext_ahb, r->ext_ycbcr);
+    return true;
+}
+
+// ============================================================
+// Device capability probe
+// ============================================================
+
+static void query_device_caps(VkRenderer* r) {
+    VkPhysicalDeviceProperties props;
+    vkGetPhysicalDeviceProperties(r->physical_device, &props);
+    r->caps.vendor_id      = props.vendorID;
+    r->caps.device_id      = props.deviceID;
+    r->caps.driver_version = props.driverVersion;
+    r->caps.is_adreno      = (props.vendorID == 0x5143);  // Qualcomm
+    r->caps.limits         = props.limits;
+
+    // Descriptor pool capacity. Vulkan doesn't spec-bound pool size — the only ceiling
+    // is driver memory, and each combined-image-sampler set is ~100-200 bytes on Adreno,
+    // so 4096 sets is ~1 MB upfront. Pick a number high enough that an X server with
+    // hundreds of short-lived pixmaps can't realistically exhaust it. Grow-on-exhaust
+    // is the proper unbounded answer and remains a separate TODO.
+    r->caps.descriptor_pool_capacity = 4096;
+
+    // Offscreen color format. Prefer BGRA8 to match the upload format (no shader swizzle),
+    // fall back to RGBA8 if the driver doesn't expose BGRA as a sampled color attachment
+    // in OPTIMAL tiling. RGBA8 is spec-guaranteed for both features.
+    const VkFormatFeatureFlags need = VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT
+                                    | VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT;
+    const VkFormat offscreen_candidates[2] = {
+        VK_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM
+    };
+    r->caps.offscreen_format = VK_FORMAT_R8G8B8A8_UNORM;
+    for (int i = 0; i < 2; i++) {
+        VkFormatProperties fp;
+        vkGetPhysicalDeviceFormatProperties(r->physical_device, offscreen_candidates[i], &fp);
+        if ((fp.optimalTilingFeatures & need) == need) {
+            r->caps.offscreen_format = offscreen_candidates[i];
+            break;
+        }
+    }
+
+    // CPU-uploaded texture format. RGBA8 is spec-guaranteed; BGRA8 is optional.
+    const VkFormatFeatureFlags upload_need = VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT
+                                           | VK_FORMAT_FEATURE_TRANSFER_DST_BIT;
+    r->caps.upload_format = VK_FORMAT_R8G8B8A8_UNORM;
+    r->caps.upload_needs_bgra_swizzle = true;
+    {
+        VkFormatProperties fp;
+        vkGetPhysicalDeviceFormatProperties(r->physical_device, VK_FORMAT_B8G8R8A8_UNORM, &fp);
+        if ((fp.optimalTilingFeatures & upload_need) == upload_need) {
+            r->caps.upload_format = VK_FORMAT_B8G8R8A8_UNORM;
+            r->caps.upload_needs_bgra_swizzle = false;
+        }
+    }
+
+    // AHB BGRA8 importability — diagnostic only; per-import paths still probe themselves.
+    r->caps.ahb_bgra_supported = false;
+    if (r->ext_ahb) {
+        VkPhysicalDeviceExternalImageFormatInfo ext = {
+            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO
+        };
+        ext.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
+
+        VkPhysicalDeviceImageFormatInfo2 ifi = {
+            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2
+        };
+        ifi.pNext  = &ext;
+        ifi.format = VK_FORMAT_B8G8R8A8_UNORM;
+        ifi.type   = VK_IMAGE_TYPE_2D;
+        ifi.tiling = VK_IMAGE_TILING_OPTIMAL;
+        ifi.usage  = VK_IMAGE_USAGE_SAMPLED_BIT;
+
+        VkExternalImageFormatProperties ext_out = {
+            VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES
+        };
+        VkImageFormatProperties2 out = { VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2 };
+        out.pNext = &ext_out;
+
+        // The 1.1 core entry point isn't statically exported by the Android Vulkan loader on all
+        // NDK targets; resolve dynamically and fall back to the KHR alias.
+        PFN_vkGetPhysicalDeviceImageFormatProperties2 fnGetIfp2 =
+            (PFN_vkGetPhysicalDeviceImageFormatProperties2)
+                vkGetInstanceProcAddr(r->instance, "vkGetPhysicalDeviceImageFormatProperties2");
+        if (!fnGetIfp2) {
+            fnGetIfp2 = (PFN_vkGetPhysicalDeviceImageFormatProperties2)
+                vkGetInstanceProcAddr(r->instance, "vkGetPhysicalDeviceImageFormatProperties2KHR");
+        }
+        if (fnGetIfp2 && fnGetIfp2(r->physical_device, &ifi, &out) == VK_SUCCESS) {
+            r->caps.ahb_bgra_supported =
+                (ext_out.externalMemoryProperties.externalMemoryFeatures
+                 & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT) != 0;
+        }
+    }
+
+    VK_LOGI("Device caps: vendor=0x%x device=0x%x driver=0x%x adreno=%d offscreen=%s upload=%s ahb_bgra=%d desc_pool=%u",
+            r->caps.vendor_id, r->caps.device_id, r->caps.driver_version,
+            r->caps.is_adreno,
+            r->caps.offscreen_format == VK_FORMAT_B8G8R8A8_UNORM ? "BGRA8" : "RGBA8",
+            r->caps.upload_format == VK_FORMAT_B8G8R8A8_UNORM ? "BGRA8" : "RGBA8(swizzle)",
+            r->caps.ahb_bgra_supported,
+            r->caps.descriptor_pool_capacity);
+}
+
+// ============================================================
+// Command pool + per-frame
+// ============================================================
+
+static bool create_command_pool(VkRenderer* r) {
+    VkCommandPoolCreateInfo ci = {VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO};
+    ci.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
+    ci.queueFamilyIndex = r->graphics_queue_family;
+    if (vkCreateCommandPool(r->device, &ci, NULL, &r->cmd_pool) != VK_SUCCESS) return false;
+
+    VkCommandBufferAllocateInfo ai = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO};
+    ai.commandPool = r->cmd_pool;
+    ai.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+    ai.commandBufferCount = 1;
+
+    VkSemaphoreCreateInfo si = {VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO};
+    VkFenceCreateInfo fi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+    fi.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+
+    for (uint32_t i = 0; i < VK_FRAMES_IN_FLIGHT; i++) {
+        VkFrame* f = &r->frames[i];
+        if (vkAllocateCommandBuffers(r->device, &ai, &f->cmd) != VK_SUCCESS) return false;
+        if (vkCreateSemaphore(r->device, &si, NULL, &f->image_available) != VK_SUCCESS) return false;
+        if (vkCreateFence(r->device, &fi, NULL, &f->in_flight) != VK_SUCCESS) return false;
+    }
+    return true;
+}
+
+// ============================================================
+// Descriptor pool
+// ============================================================
+
+static bool create_descriptor_pool(VkRenderer* r, uint32_t capacity) {
+    VkDescriptorPoolSize ps = {0};
+    ps.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+    ps.descriptorCount = capacity;
+
+    VkDescriptorPoolCreateInfo ci = {VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO};
+    ci.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
+    ci.maxSets = capacity;
+    ci.poolSizeCount = 1;
+    ci.pPoolSizes = &ps;
+    if (vkCreateDescriptorPool(r->device, &ci, NULL, &r->descriptor_pool) != VK_SUCCESS) {
+        VK_LOGE("vkCreateDescriptorPool failed");
+        return false;
+    }
+    r->descriptor_pool_capacity = capacity;
+    r->descriptor_pool_used = 0;
+    uint32_t free_cap = capacity < 512 ? capacity : 512;
+    r->descriptor_free_list = calloc(free_cap, sizeof(VkDescriptorSet));
+    r->descriptor_free_count = 0;
+    r->descriptor_free_capacity = r->descriptor_free_list ? free_cap : 0;
+    return true;
+}
+
+// ============================================================
+// Pipelines
+// ============================================================
+
+static VkShaderModule load_shader_module(VkRenderer* r, const uint32_t* code, size_t code_size) {
+    VkShaderModuleCreateInfo ci = {VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO};
+    ci.codeSize = code_size;
+    ci.pCode = code;
+    VkShaderModule m;
+    if (vkCreateShaderModule(r->device, &ci, NULL, &m) != VK_SUCCESS) {
+        VK_LOGE("vkCreateShaderModule failed (size=%zu)", code_size);
+        return VK_NULL_HANDLE;
+    }
+    return m;
+}
+
+static bool create_render_passes(VkRenderer* r) {
+    // Swapchain pass: color attachment, presentation final layout.
+    {
+        VkAttachmentDescription att = {0};
+        att.format = r->swapchain_format;
+        att.samples = VK_SAMPLE_COUNT_1_BIT;
+        att.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+        att.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+        att.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+        att.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+        att.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+        att.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+
+        VkAttachmentReference ref = {0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL};
+
+        VkSubpassDescription sp = {0};
+        sp.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+        sp.colorAttachmentCount = 1;
+        sp.pColorAttachments = &ref;
+
+        VkSubpassDependency dep = {0};
+        dep.srcSubpass = VK_SUBPASS_EXTERNAL;
+        dep.dstSubpass = 0;
+        dep.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+        dep.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+        dep.srcAccessMask = 0;
+        dep.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+
+        VkRenderPassCreateInfo rci = {VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO};
+        rci.attachmentCount = 1;
+        rci.pAttachments = &att;
+        rci.subpassCount = 1;
+        rci.pSubpasses = &sp;
+        rci.dependencyCount = 1;
+        rci.pDependencies = &dep;
+        if (vkCreateRenderPass(r->device, &rci, NULL, &r->pipelines.swapchain_pass) != VK_SUCCESS) {
+            return false;
+        }
+    }
+
+    // Offscreen pass: color attachment, final shader-read layout.
+    {
+        VkAttachmentDescription att = {0};
+        att.format = r->caps.offscreen_format;
+        att.samples = VK_SAMPLE_COUNT_1_BIT;
+        att.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+        att.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+        att.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+        att.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+        att.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+        att.finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+
+        VkAttachmentReference ref = {0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL};
+
+        VkSubpassDescription sp = {0};
+        sp.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+        sp.colorAttachmentCount = 1;
+        sp.pColorAttachments = &ref;
+
+        VkSubpassDependency deps[2] = {0};
+        deps[0].srcSubpass = VK_SUBPASS_EXTERNAL;
+        deps[0].dstSubpass = 0;
+        deps[0].srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+        deps[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+        deps[0].srcAccessMask = VK_ACCESS_SHADER_READ_BIT;
+        deps[0].dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+        deps[1].srcSubpass = 0;
+        deps[1].dstSubpass = VK_SUBPASS_EXTERNAL;
+        deps[1].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+        deps[1].dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+        deps[1].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+        deps[1].dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+
+        VkRenderPassCreateInfo rci = {VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO};
+        rci.attachmentCount = 1;
+        rci.pAttachments = &att;
+        rci.subpassCount = 1;
+        rci.pSubpasses = &sp;
+        rci.dependencyCount = 2;
+        rci.pDependencies = deps;
+        if (vkCreateRenderPass(r->device, &rci, NULL, &r->pipelines.offscreen_pass) != VK_SUCCESS) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static bool create_pipeline_layouts(VkRenderer* r) {
+    VkDescriptorSetLayoutBinding bind = {0};
+    bind.binding = 0;
+    bind.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+    bind.descriptorCount = 1;
+    bind.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+
+    VkDescriptorSetLayoutCreateInfo dlci = {VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO};
+    dlci.bindingCount = 1;
+    dlci.pBindings = &bind;
+    if (vkCreateDescriptorSetLayout(r->device, &dlci, NULL, &r->pipelines.sampler_set_layout) != VK_SUCCESS) {
+        return false;
+    }
+
+    // Window/cursor: push constants = float xform[6] + vec2 viewSize + vec4 uvRect
+    // + int swapRB = 52 bytes
+    VkPushConstantRange pcr_window = {0};
+    pcr_window.stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
+    pcr_window.offset = 0;
+    pcr_window.size = 52;
+
+    VkPipelineLayoutCreateInfo plci = {VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO};
+    plci.setLayoutCount = 1;
+    plci.pSetLayouts = &r->pipelines.sampler_set_layout;
+    plci.pushConstantRangeCount = 1;
+    plci.pPushConstantRanges = &pcr_window;
+    if (vkCreatePipelineLayout(r->device, &plci, NULL, &r->pipelines.window_layout) != VK_SUCCESS) {
+        return false;
+    }
+
+    // Effect: push constants = vec2 resolution + 4 floats (sat, contrast, sharp, mode) = 24 bytes.
+    // Other effect shaders only declare the first 16 bytes and ignore the rest.
+    VkPushConstantRange pcr_effect = {0};
+    pcr_effect.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+    pcr_effect.offset = 0;
+    pcr_effect.size = 24;
+
+    VkPipelineLayoutCreateInfo plci2 = {VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO};
+    plci2.setLayoutCount = 1;
+    plci2.pSetLayouts = &r->pipelines.sampler_set_layout;
+    plci2.pushConstantRangeCount = 1;
+    plci2.pPushConstantRanges = &pcr_effect;
+    if (vkCreatePipelineLayout(r->device, &plci2, NULL, &r->pipelines.effect_layout) != VK_SUCCESS) {
+        return false;
+    }
+
+    return true;
+}
+
+static VkPipeline create_graphics_pipeline(
+    VkRenderer* r,
+    VkShaderModule vs, VkShaderModule fs,
+    VkPipelineLayout layout,
+    VkRenderPass pass,
+    bool has_vertex_input,
+    bool blend_alpha,
+    const VkSpecializationInfo* fs_spec)
+{
+    VkPipelineShaderStageCreateInfo stages[2] = {0};
+    stages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+    stages[0].stage = VK_SHADER_STAGE_VERTEX_BIT;
+    stages[0].module = vs;
+    stages[0].pName = "main";
+    stages[1].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+    stages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
+    stages[1].module = fs;
+    stages[1].pName = "main";
+    stages[1].pSpecializationInfo = fs_spec;
+
+    VkVertexInputBindingDescription vbind = {0};
+    vbind.binding = 0;
+    vbind.stride = sizeof(float) * 2;
+    vbind.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+
+    VkVertexInputAttributeDescription vattr = {0};
+    vattr.location = 0;
+    vattr.binding = 0;
+    vattr.format = VK_FORMAT_R32G32_SFLOAT;
+    vattr.offset = 0;
+
+    VkPipelineVertexInputStateCreateInfo vi = {VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO};
+    if (has_vertex_input) {
+        vi.vertexBindingDescriptionCount = 1;
+        vi.pVertexBindingDescriptions = &vbind;
+        vi.vertexAttributeDescriptionCount = 1;
+        vi.pVertexAttributeDescriptions = &vattr;
+    }
+
+    VkPipelineInputAssemblyStateCreateInfo ia = {VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO};
+    ia.topology = has_vertex_input ? VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP : VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+
+    VkPipelineViewportStateCreateInfo vp = {VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO};
+    vp.viewportCount = 1;
+    vp.scissorCount = 1;
+
+    VkPipelineRasterizationStateCreateInfo rs = {VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO};
+    rs.polygonMode = VK_POLYGON_MODE_FILL;
+    rs.cullMode = VK_CULL_MODE_NONE;
+    rs.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE;
+    rs.lineWidth = 1.0f;
+
+    VkPipelineMultisampleStateCreateInfo ms = {VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO};
+    ms.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
+
+    VkPipelineColorBlendAttachmentState blend = {0};
+    blend.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT
+                         | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
+    blend.blendEnable = blend_alpha ? VK_TRUE : VK_FALSE;
+    blend.srcColorBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA;
+    blend.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
+    blend.colorBlendOp = VK_BLEND_OP_ADD;
+    blend.srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
+    blend.dstAlphaBlendFactor = VK_BLEND_FACTOR_ZERO;
+    blend.alphaBlendOp = VK_BLEND_OP_ADD;
+
+    VkPipelineColorBlendStateCreateInfo cb = {VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO};
+    cb.attachmentCount = 1;
+    cb.pAttachments = &blend;
+
+    VkDynamicState dyn[3] = {
+        VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR
+    };
+    VkPipelineDynamicStateCreateInfo ds = {VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO};
+    ds.dynamicStateCount = 2;
+    ds.pDynamicStates = dyn;
+
+    VkGraphicsPipelineCreateInfo gpi = {VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO};
+    gpi.stageCount = 2;
+    gpi.pStages = stages;
+    gpi.pVertexInputState = &vi;
+    gpi.pInputAssemblyState = &ia;
+    gpi.pViewportState = &vp;
+    gpi.pRasterizationState = &rs;
+    gpi.pMultisampleState = &ms;
+    gpi.pColorBlendState = &cb;
+    gpi.pDynamicState = &ds;
+    gpi.layout = layout;
+    gpi.renderPass = pass;
+    gpi.subpass = 0;
+
+    VkPipeline pipe = VK_NULL_HANDLE;
+    if (vkCreateGraphicsPipelines(r->device, VK_NULL_HANDLE, 1, &gpi, NULL, &pipe) != VK_SUCCESS) {
+        VK_LOGE("vkCreateGraphicsPipelines failed");
+        return VK_NULL_HANDLE;
+    }
+    return pipe;
+}
+
+static bool create_pipelines(VkRenderer* r) {
+    if (!create_render_passes(r)) return false;
+    if (!create_pipeline_layouts(r)) return false;
+
+    VkShaderModule vs_window = load_shader_module(r, window_vert, window_vert_size);
+    VkShaderModule fs_window = load_shader_module(r, window_frag, window_frag_size);
+    VkShaderModule fs_cursor = load_shader_module(r, cursor_frag, cursor_frag_size);
+    VkShaderModule vs_quad   = load_shader_module(r, quad_vert,   quad_vert_size);
+    VkShaderModule fs_blit   = load_shader_module(r, blit_frag,   blit_frag_size);
+    VkShaderModule fs_crt    = load_shader_module(r, effect_crt_frag,    effect_crt_frag_size);
+    VkShaderModule fs_vivid  = load_shader_module(r, effect_vivid_frag,  effect_vivid_frag_size);
+    VkShaderModule fs_hdr    = load_shader_module(r, effect_hdr_frag,    effect_hdr_frag_size);
+    VkShaderModule fs_natural= load_shader_module(r, effect_natural_frag,effect_natural_frag_size);
+    VkShaderModule fs_toon   = load_shader_module(r, effect_toon_frag,   effect_toon_frag_size);
+    VkShaderModule fs_ntsc   = load_shader_module(r, effect_ntsc_frag,   effect_ntsc_frag_size);
+    VkShaderModule fs_ntsc2  = load_shader_module(r, effect_ntsc2_frag,  effect_ntsc2_frag_size);
+    VkShaderModule fs_coloradj = load_shader_module(r, effect_coloradj_frag, effect_coloradj_frag_size);
+    VkShaderModule fs_colorgrade = load_shader_module(r, effect_colorgrade_frag, effect_colorgrade_frag_size);
+    VkShaderModule fs_sharpen = load_shader_module(r, effect_sharpen_frag, effect_sharpen_frag_size);
+    VkShaderModule fs_scanlines = load_shader_module(r, effect_scanlines_frag, effect_scanlines_frag_size);
+    VkShaderModule fs_colorblind = load_shader_module(r, effect_colorblind_frag, effect_colorblind_frag_size);
+    VkShaderModule fs_pixelate = load_shader_module(r, effect_pixelate_frag, effect_pixelate_frag_size);
+    VkShaderModule fs_sgsr1 = load_shader_module(r, sgsr1_frag, sgsr1_frag_size);
+    if (!vs_window || !fs_window || !fs_cursor || !vs_quad || !fs_blit
+        || !fs_crt || !fs_vivid || !fs_hdr || !fs_natural
+        || !fs_toon || !fs_ntsc || !fs_ntsc2 || !fs_coloradj
+        || !fs_colorgrade || !fs_sharpen || !fs_scanlines
+        || !fs_colorblind || !fs_pixelate
+        || !fs_sgsr1) {
+        return false;
+    }
+
+    r->pipelines.window_pipeline = create_graphics_pipeline(
+        r, vs_window, fs_window, r->pipelines.window_layout, r->pipelines.swapchain_pass,
+        true, false, NULL);
+    r->pipelines.cursor_pipeline = create_graphics_pipeline(
+        r, vs_window, fs_cursor, r->pipelines.window_layout, r->pipelines.swapchain_pass,
+        true, true, NULL);
+    r->pipelines.blit_pipeline = create_graphics_pipeline(
+        r, vs_quad, fs_blit, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_CRT] = create_graphics_pipeline(
+        r, vs_quad, fs_crt, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_VIVID] = create_graphics_pipeline(
+        r, vs_quad, fs_vivid, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_HDR] = create_graphics_pipeline(
+        r, vs_quad, fs_hdr, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_NATURAL] = create_graphics_pipeline(
+        r, vs_quad, fs_natural, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_SGSR1] = create_graphics_pipeline(
+        r, vs_quad, fs_sgsr1, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_TOON] = create_graphics_pipeline(
+        r, vs_quad, fs_toon, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_NTSC] = create_graphics_pipeline(
+        r, vs_quad, fs_ntsc, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_COLORADJ] = create_graphics_pipeline(
+        r, vs_quad, fs_coloradj, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_COLORGRADE] = create_graphics_pipeline(
+        r, vs_quad, fs_colorgrade, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_SHARPEN] = create_graphics_pipeline(
+        r, vs_quad, fs_sharpen, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_SCANLINES] = create_graphics_pipeline(
+        r, vs_quad, fs_scanlines, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_NTSC2] = create_graphics_pipeline(
+        r, vs_quad, fs_ntsc2, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_COLORBLIND] = create_graphics_pipeline(
+        r, vs_quad, fs_colorblind, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.effect_pipelines[VK_EFFECT_PIXELATE] = create_graphics_pipeline(
+        r, vs_quad, fs_pixelate, r->pipelines.effect_layout, r->pipelines.swapchain_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_window_pipeline = create_graphics_pipeline(
+        r, vs_window, fs_window, r->pipelines.window_layout, r->pipelines.offscreen_pass,
+        true, false, NULL);
+    r->pipelines.offscreen_cursor_pipeline = create_graphics_pipeline(
+        r, vs_window, fs_cursor, r->pipelines.window_layout, r->pipelines.offscreen_pass,
+        true, true, NULL);
+    r->pipelines.offscreen_blit_pipeline = create_graphics_pipeline(
+        r, vs_quad, fs_blit, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_CRT] = create_graphics_pipeline(
+        r, vs_quad, fs_crt, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_VIVID] = create_graphics_pipeline(
+        r, vs_quad, fs_vivid, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_HDR] = create_graphics_pipeline(
+        r, vs_quad, fs_hdr, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_NATURAL] = create_graphics_pipeline(
+        r, vs_quad, fs_natural, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_SGSR1] = create_graphics_pipeline(
+        r, vs_quad, fs_sgsr1, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_TOON] = create_graphics_pipeline(
+        r, vs_quad, fs_toon, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_NTSC] = create_graphics_pipeline(
+        r, vs_quad, fs_ntsc, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_COLORADJ] = create_graphics_pipeline(
+        r, vs_quad, fs_coloradj, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_COLORGRADE] = create_graphics_pipeline(
+        r, vs_quad, fs_colorgrade, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_SHARPEN] = create_graphics_pipeline(
+        r, vs_quad, fs_sharpen, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_SCANLINES] = create_graphics_pipeline(
+        r, vs_quad, fs_scanlines, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_NTSC2] = create_graphics_pipeline(
+        r, vs_quad, fs_ntsc2, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_COLORBLIND] = create_graphics_pipeline(
+        r, vs_quad, fs_colorblind, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+    r->pipelines.offscreen_effect_pipelines[VK_EFFECT_PIXELATE] = create_graphics_pipeline(
+        r, vs_quad, fs_pixelate, r->pipelines.effect_layout, r->pipelines.offscreen_pass,
+        false, false, NULL);
+
+    vkDestroyShaderModule(r->device, vs_window, NULL);
+    vkDestroyShaderModule(r->device, fs_window, NULL);
+    vkDestroyShaderModule(r->device, fs_cursor, NULL);
+    vkDestroyShaderModule(r->device, vs_quad, NULL);
+    vkDestroyShaderModule(r->device, fs_blit, NULL);
+    vkDestroyShaderModule(r->device, fs_crt, NULL);
+    vkDestroyShaderModule(r->device, fs_vivid, NULL);
+    vkDestroyShaderModule(r->device, fs_hdr, NULL);
+    vkDestroyShaderModule(r->device, fs_natural, NULL);
+    vkDestroyShaderModule(r->device, fs_toon, NULL);
+    vkDestroyShaderModule(r->device, fs_ntsc, NULL);
+    vkDestroyShaderModule(r->device, fs_ntsc2, NULL);
+    vkDestroyShaderModule(r->device, fs_coloradj, NULL);
+    vkDestroyShaderModule(r->device, fs_colorgrade, NULL);
+    vkDestroyShaderModule(r->device, fs_sharpen, NULL);
+    vkDestroyShaderModule(r->device, fs_scanlines, NULL);
+    vkDestroyShaderModule(r->device, fs_colorblind, NULL);
+    vkDestroyShaderModule(r->device, fs_pixelate, NULL);
+    vkDestroyShaderModule(r->device, fs_sgsr1, NULL);
+
+    if (!r->pipelines.window_pipeline || !r->pipelines.cursor_pipeline
+        || !r->pipelines.blit_pipeline
+        || !r->pipelines.offscreen_window_pipeline
+        || !r->pipelines.offscreen_cursor_pipeline
+        || !r->pipelines.offscreen_blit_pipeline) {
+        destroy_pipelines(r);
+        return false;
+    }
+    for (uint32_t i = 0; i < VK_EFFECT_COUNT; i++) {
+        if (!r->pipelines.effect_pipelines[i]
+            || !r->pipelines.offscreen_effect_pipelines[i]) {
+            VK_LOGE("Failed to create effect pipeline %u", i);
+            destroy_pipelines(r);
+            return false;
+        }
+    }
+    r->pipelines_built = true;
+    return true;
+}
+
+static void destroy_pipelines(VkRenderer* r) {
+    for (uint32_t i = 0; i < VK_EFFECT_COUNT; i++) {
+        if (r->pipelines.effect_pipelines[i] != VK_NULL_HANDLE) {
+            vkDestroyPipeline(r->device, r->pipelines.effect_pipelines[i], NULL);
+            r->pipelines.effect_pipelines[i] = VK_NULL_HANDLE;
+        }
+        if (r->pipelines.offscreen_effect_pipelines[i] != VK_NULL_HANDLE) {
+            vkDestroyPipeline(r->device, r->pipelines.offscreen_effect_pipelines[i], NULL);
+            r->pipelines.offscreen_effect_pipelines[i] = VK_NULL_HANDLE;
+        }
+    }
+    if (r->pipelines.window_pipeline) vkDestroyPipeline(r->device, r->pipelines.window_pipeline, NULL);
+    if (r->pipelines.cursor_pipeline) vkDestroyPipeline(r->device, r->pipelines.cursor_pipeline, NULL);
+    if (r->pipelines.blit_pipeline)   vkDestroyPipeline(r->device, r->pipelines.blit_pipeline, NULL);
+    if (r->pipelines.offscreen_window_pipeline) vkDestroyPipeline(r->device, r->pipelines.offscreen_window_pipeline, NULL);
+    if (r->pipelines.offscreen_cursor_pipeline) vkDestroyPipeline(r->device, r->pipelines.offscreen_cursor_pipeline, NULL);
+    if (r->pipelines.offscreen_blit_pipeline)   vkDestroyPipeline(r->device, r->pipelines.offscreen_blit_pipeline, NULL);
+    if (r->pipelines.window_layout)   vkDestroyPipelineLayout(r->device, r->pipelines.window_layout, NULL);
+    if (r->pipelines.effect_layout)   vkDestroyPipelineLayout(r->device, r->pipelines.effect_layout, NULL);
+    if (r->pipelines.sampler_set_layout) vkDestroyDescriptorSetLayout(r->device, r->pipelines.sampler_set_layout, NULL);
+    if (r->pipelines.swapchain_pass)  vkDestroyRenderPass(r->device, r->pipelines.swapchain_pass, NULL);
+    if (r->pipelines.offscreen_pass)  vkDestroyRenderPass(r->device, r->pipelines.offscreen_pass, NULL);
+    memset(&r->pipelines, 0, sizeof(r->pipelines));
+    r->pipelines_built = false;
+}
+
+// ============================================================
+// Quad VBO (for window/cursor pipelines that use vertex input)
+// ============================================================
+
+static bool create_quad_vbo(VkRenderer* r) {
+    static const float QUAD[] = {
+        0.0f, 0.0f,
+        0.0f, 1.0f,
+        1.0f, 0.0f,
+        1.0f, 1.0f,
+    };
+
+    VkBufferCreateInfo bci = {VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO};
+    bci.size = sizeof(QUAD);
+    bci.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
+    bci.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    if (vkCreateBuffer(r->device, &bci, NULL, &r->quad_vbo) != VK_SUCCESS) return false;
+
+    VkMemoryRequirements mr;
+    vkGetBufferMemoryRequirements(r->device, r->quad_vbo, &mr);
+
+    VkMemoryAllocateInfo ai = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO};
+    ai.allocationSize = mr.size;
+    ai.memoryTypeIndex = vkr_find_memory_type(r, mr.memoryTypeBits,
+        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+    if (ai.memoryTypeIndex == UINT32_MAX) return false;
+    if (vkAllocateMemory(r->device, &ai, NULL, &r->quad_vbo_memory) != VK_SUCCESS) return false;
+    vkBindBufferMemory(r->device, r->quad_vbo, r->quad_vbo_memory, 0);
+
+    void* mapped = NULL;
+    vkMapMemory(r->device, r->quad_vbo_memory, 0, sizeof(QUAD), 0, &mapped);
+    memcpy(mapped, QUAD, sizeof(QUAD));
+    vkUnmapMemory(r->device, r->quad_vbo_memory);
+    return true;
+}
+
+static void destroy_quad_vbo(VkRenderer* r) {
+    if (r->quad_vbo) { vkDestroyBuffer(r->device, r->quad_vbo, NULL); r->quad_vbo = VK_NULL_HANDLE; }
+    if (r->quad_vbo_memory) { vkFreeMemory(r->device, r->quad_vbo_memory, NULL); r->quad_vbo_memory = VK_NULL_HANDLE; }
+}
+
+// ============================================================
+// Swapchain
+// ============================================================
+
+static bool create_swapchain(VkRenderer* r, uint32_t fallback_width, uint32_t fallback_height) {
+    if (!r->surface) return false;
+
+    VkSurfaceCapabilitiesKHR caps;
+    if (vkGetPhysicalDeviceSurfaceCapabilitiesKHR(r->physical_device, r->surface, &caps) != VK_SUCCESS) {
+        VK_LOGE("vkGetPhysicalDeviceSurfaceCapabilitiesKHR failed");
+        return false;
+    }
+
+    uint32_t fmt_count = 0;
+    if (vkGetPhysicalDeviceSurfaceFormatsKHR(r->physical_device, r->surface, &fmt_count, NULL) != VK_SUCCESS
+        || fmt_count == 0) {
+        VK_LOGE("No surface formats available");
+        return false;
+    }
+    VkSurfaceFormatKHR* fmts = calloc(fmt_count, sizeof(VkSurfaceFormatKHR));
+    if (!fmts) return false;
+    vkGetPhysicalDeviceSurfaceFormatsKHR(r->physical_device, r->surface, &fmt_count, fmts);
+
+    VkSurfaceFormatKHR chosen = fmts[0];
+    for (uint32_t i = 0; i < fmt_count; i++) {
+        if (fmts[i].format == VK_FORMAT_R8G8B8A8_UNORM
+            && fmts[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) {
+            chosen = fmts[i];
+            break;
+        }
+        if (fmts[i].format == VK_FORMAT_B8G8R8A8_UNORM
+            && fmts[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) {
+            chosen = fmts[i];
+        }
+    }
+    free(fmts);
+    r->swapchain_format = chosen.format;
+
+    // Honor the Java-requested present mode if the device supports it; otherwise fall back
+    // to FIFO (always supported per spec). target_present_mode is initialized to FIFO in
+    // nativeCreate, so a value-equality check is safe (no zero-sentinel ambiguity with
+    // VK_PRESENT_MODE_IMMEDIATE_KHR which is enum value 0).
+    VkPresentModeKHR present_mode = VK_PRESENT_MODE_FIFO_KHR;
+    VkPresentModeKHR want = r->target_present_mode;
+    if (want != VK_PRESENT_MODE_FIFO_KHR) {
+        uint32_t pm_count = 0;
+        vkGetPhysicalDeviceSurfacePresentModesKHR(r->physical_device, r->surface, &pm_count, NULL);
+        if (pm_count > 0) {
+            VkPresentModeKHR* pms = calloc(pm_count, sizeof(VkPresentModeKHR));
+            if (pms) {
+                vkGetPhysicalDeviceSurfacePresentModesKHR(r->physical_device, r->surface, &pm_count, pms);
+                for (uint32_t i = 0; i < pm_count; i++) {
+                    if (pms[i] == want) { present_mode = want; break; }
+                }
+                free(pms);
+            }
+        }
+        if (present_mode != want) {
+            VK_LOGW("Requested present mode %d unavailable; using FIFO", want);
+        }
+    }
+
+    VkSurfaceTransformFlagBitsKHR pre_transform = caps.currentTransform;
+    if (!is_plain_rotation_transform(pre_transform)
+        || !(caps.supportedTransforms & pre_transform)) {
+        pre_transform = (caps.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
+            ? VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR
+            : caps.currentTransform;
+    }
+
+    VkExtent2D surface_extent = caps.currentExtent;
+    if (surface_extent.width == 0xFFFFFFFFu) {
+        surface_extent.width = fallback_width;
+        surface_extent.height = fallback_height;
+    }
+    if ((surface_extent.width == 0 || surface_extent.height == 0) && r->anw) {
+        int anw_w = ANativeWindow_getWidth(r->anw);
+        int anw_h = ANativeWindow_getHeight(r->anw);
+        if (anw_w > 0 && anw_h > 0) {
+            surface_extent.width = (uint32_t)anw_w;
+            surface_extent.height = (uint32_t)anw_h;
+        }
+    }
+    if (surface_extent.width == 0 || surface_extent.height == 0) {
+        VK_LOGW("Skipping swapchain creation for empty surface (%ux%u)",
+                surface_extent.width, surface_extent.height);
+        return false;
+    }
+
+    VkExtent2D extent = surface_extent;
+    if (is_quarter_turn_transform(pre_transform)) {
+        uint32_t tmp = extent.width;
+        extent.width = extent.height;
+        extent.height = tmp;
+    }
+    r->surface_extent = surface_extent;
+    r->swapchain_extent = extent;
+    r->swapchain_transform = pre_transform;
+    // Only possible for unsupported mirrored transforms; avoid an Adreno present loop
+    // while still letting normal rotation changes recreate the swapchain.
+    r->ignore_suboptimal = r->caps.is_adreno && (pre_transform != caps.currentTransform);
+    VK_LOGI("Swapchain surface=%ux%u extent=%ux%u currentTransform=0x%x preTransform=0x%x",
+            surface_extent.width, surface_extent.height, extent.width, extent.height,
+            caps.currentTransform, pre_transform);
+
+    uint32_t image_count = caps.minImageCount + 1;
+    if (caps.maxImageCount > 0 && image_count > caps.maxImageCount) image_count = caps.maxImageCount;
+    if (image_count > VK_MAX_SWAPCHAIN_IMAGES) image_count = VK_MAX_SWAPCHAIN_IMAGES;
+
+    VkSwapchainCreateInfoKHR sci = {VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR};
+    sci.surface = r->surface;
+    sci.minImageCount = image_count;
+    sci.imageFormat = chosen.format;
+    sci.imageColorSpace = chosen.colorSpace;
+    sci.imageExtent = extent;
+    sci.imageArrayLayers = 1;
+    sci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+    if (r->record_blit_src
+        && (caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT)) {
+        sci.imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; // blit source for the encoder mirror
+    }
+    sci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    sci.preTransform = pre_transform;
+    sci.compositeAlpha = (caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)
+        ? VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR
+        : (caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR)
+            ? VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR
+            : (caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR)
+                ? VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR
+                : VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR;
+    sci.presentMode = present_mode;
+    sci.clipped = VK_TRUE;
+    VkSwapchainKHR old_sc = r->swapchain;
+    sci.oldSwapchain = old_sc;
+    VkSwapchainKHR new_sc = VK_NULL_HANDLE;
+    if (vkCreateSwapchainKHR(r->device, &sci, NULL, &new_sc) != VK_SUCCESS) {
+        VK_LOGE("vkCreateSwapchainKHR failed");
+        if (old_sc) { vkDestroySwapchainKHR(r->device, old_sc, NULL); r->swapchain = VK_NULL_HANDLE; }
+        return false;
+    }
+    r->swapchain = new_sc;
+    if (old_sc) vkDestroySwapchainKHR(r->device, old_sc, NULL);
+
+    uint32_t actual_count = 0;
+    if (vkGetSwapchainImagesKHR(r->device, r->swapchain, &actual_count, NULL) != VK_SUCCESS
+        || actual_count == 0) {
+        VK_LOGE("vkGetSwapchainImagesKHR count failed");
+        goto fail;
+    }
+    if (actual_count > VK_MAX_SWAPCHAIN_IMAGES) {
+        VK_LOGE("Swapchain image count %u exceeds storage capacity %u",
+                actual_count, VK_MAX_SWAPCHAIN_IMAGES);
+        goto fail;
+    }
+    uint32_t got = actual_count;
+    if (vkGetSwapchainImagesKHR(r->device, r->swapchain, &got, r->swapchain_images) != VK_SUCCESS
+        || got != actual_count) {
+        VK_LOGE("vkGetSwapchainImagesKHR images failed");
+        goto fail;
+    }
+    r->swapchain_image_count = got;
+
+    if (!r->pipelines_built) {
+        if (!create_pipelines(r)) goto fail;
+    }
+
+    VkSemaphoreCreateInfo sem_ci = {VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO};
+    for (uint32_t i = 0; i < got; i++) {
+        if (vkCreateSemaphore(r->device, &sem_ci, NULL,
+                              &r->swapchain_render_finished[i]) != VK_SUCCESS) {
+            goto fail;
+        }
+
+        VkImageViewCreateInfo ivci = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO};
+        ivci.image = r->swapchain_images[i];
+        ivci.viewType = VK_IMAGE_VIEW_TYPE_2D;
+        ivci.format = chosen.format;
+        ivci.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        ivci.subresourceRange.levelCount = 1;
+        ivci.subresourceRange.layerCount = 1;
+        if (vkCreateImageView(r->device, &ivci, NULL, &r->swapchain_views[i]) != VK_SUCCESS) {
+            goto fail;
+        }
+
+        VkFramebufferCreateInfo fbci = {VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO};
+        fbci.renderPass = r->pipelines.swapchain_pass;
+        fbci.attachmentCount = 1;
+        fbci.pAttachments = &r->swapchain_views[i];
+        fbci.width = extent.width;
+        fbci.height = extent.height;
+        fbci.layers = 1;
+        if (vkCreateFramebuffer(r->device, &fbci, NULL, &r->swapchain_framebuffers[i]) != VK_SUCCESS) {
+            goto fail;
+        }
+    }
+    return true;
+
+fail:
+    destroy_swapchain(r);
+    return false;
+}
+
+static void destroy_swapchain_resources(VkRenderer* r) {
+    for (uint32_t i = 0; i < r->swapchain_image_count; i++) {
+        if (r->swapchain_render_finished[i]) {
+            vkDestroySemaphore(r->device, r->swapchain_render_finished[i], NULL);
+            r->swapchain_render_finished[i] = VK_NULL_HANDLE;
+        }
+        if (r->swapchain_framebuffers[i]) {
+            vkDestroyFramebuffer(r->device, r->swapchain_framebuffers[i], NULL);
+            r->swapchain_framebuffers[i] = VK_NULL_HANDLE;
+        }
+        if (r->swapchain_views[i]) {
+            vkDestroyImageView(r->device, r->swapchain_views[i], NULL);
+            r->swapchain_views[i] = VK_NULL_HANDLE;
+        }
+    }
+    r->swapchain_image_count = 0;
+}
+
+static void destroy_swapchain(VkRenderer* r) {
+    destroy_swapchain_resources(r);
+    if (r->swapchain) { vkDestroySwapchainKHR(r->device, r->swapchain, NULL); r->swapchain = VK_NULL_HANDLE; }
+}
+
+// ============================================================
+// Recording mirror swapchain (screen-capture target)
+// ============================================================
+
+static void destroy_record_ui_resources(VkRenderer* r) {
+    VkRecordSwap* rec = &r->rec;
+    for (uint32_t i = 0; i < VK_MAX_RECORD_IMAGES; i++) {
+        if (rec->framebuffers[i]) { vkDestroyFramebuffer(r->device, rec->framebuffers[i], NULL); rec->framebuffers[i] = VK_NULL_HANDLE; }
+        if (rec->views[i])        { vkDestroyImageView(r->device, rec->views[i], NULL); rec->views[i] = VK_NULL_HANDLE; }
+    }
+    if (rec->ui_pipeline) { vkDestroyPipeline(r->device, rec->ui_pipeline, NULL); rec->ui_pipeline = VK_NULL_HANDLE; }
+    if (rec->ui_pass)     { vkDestroyRenderPass(r->device, rec->ui_pass, NULL); rec->ui_pass = VK_NULL_HANDLE; }
+    if (rec->ui_texture)  { vkr_texture_destroy(r, rec->ui_texture); rec->ui_texture = NULL; }
+    rec->fb_built = false;
+}
+
+// Build the LOAD render pass, framebuffers, and blended blit pipeline for the Record UI composite.
+static bool build_record_ui_resources(VkRenderer* r) {
+    VkRecordSwap* rec = &r->rec;
+    if (rec->image_count == 0) return false;
+    if (!r->pipelines_built) return false;
+
+    VkAttachmentDescription att = {0};
+    att.format = rec->format;
+    att.samples = VK_SAMPLE_COUNT_1_BIT;
+    att.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
+    att.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+    att.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+    att.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+    att.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    att.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+    VkAttachmentReference ref = {0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL};
+    VkSubpassDescription sp = {0};
+    sp.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+    sp.colorAttachmentCount = 1;
+    sp.pColorAttachments = &ref;
+    VkSubpassDependency dep = {0};
+    dep.srcSubpass = VK_SUBPASS_EXTERNAL;
+    dep.dstSubpass = 0;
+    dep.srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT;
+    dep.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+    dep.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+    dep.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+    VkRenderPassCreateInfo rci = {VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO};
+    rci.attachmentCount = 1;
+    rci.pAttachments = &att;
+    rci.subpassCount = 1;
+    rci.pSubpasses = &sp;
+    rci.dependencyCount = 1;
+    rci.pDependencies = &dep;
+    if (vkCreateRenderPass(r->device, &rci, NULL, &rec->ui_pass) != VK_SUCCESS) {
+        VK_LOGE("record: ui_pass create failed");
+        return false;
+    }
+
+    for (uint32_t i = 0; i < rec->image_count; i++) {
+        VkImageViewCreateInfo ivci = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO};
+        ivci.image = rec->images[i];
+        ivci.viewType = VK_IMAGE_VIEW_TYPE_2D;
+        ivci.format = rec->format;
+        ivci.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        ivci.subresourceRange.levelCount = 1;
+        ivci.subresourceRange.layerCount = 1;
+        if (vkCreateImageView(r->device, &ivci, NULL, &rec->views[i]) != VK_SUCCESS) goto fail;
+
+        VkFramebufferCreateInfo fbci = {VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO};
+        fbci.renderPass = rec->ui_pass;
+        fbci.attachmentCount = 1;
+        fbci.pAttachments = &rec->views[i];
+        fbci.width = rec->extent.width;
+        fbci.height = rec->extent.height;
+        fbci.layers = 1;
+        if (vkCreateFramebuffer(r->device, &fbci, NULL, &rec->framebuffers[i]) != VK_SUCCESS) goto fail;
+    }
+
+    VkShaderModule vs = load_shader_module(r, quad_vert, quad_vert_size);
+    VkShaderModule fs = load_shader_module(r, blit_frag, blit_frag_size);
+    if (vs && fs) {
+        rec->ui_pipeline = create_graphics_pipeline(
+            r, vs, fs, r->pipelines.effect_layout, rec->ui_pass, false, true, NULL);
+    }
+    if (vs) vkDestroyShaderModule(r->device, vs, NULL);
+    if (fs) vkDestroyShaderModule(r->device, fs, NULL);
+    if (!rec->ui_pipeline) { VK_LOGE("record: ui_pipeline create failed"); goto fail; }
+
+    rec->fb_built = true;
+    VK_LOGI("record: UI composite resources ready");
+    return true;
+
+fail:
+    destroy_record_ui_resources(r);
+    return false;
+}
+
+static void destroy_record_swapchain(VkRenderer* r) {
+    destroy_record_ui_resources(r);
+    VkRecordSwap* rec = &r->rec;
+    for (uint32_t i = 0; i < rec->image_count; i++) {
+        if (rec->present_ready[i]) {
+            vkDestroySemaphore(r->device, rec->present_ready[i], NULL);
+            rec->present_ready[i] = VK_NULL_HANDLE;
+        }
+    }
+    for (uint32_t i = 0; i < VK_FRAMES_IN_FLIGHT; i++) {
+        if (rec->acquire[i]) {
+            vkDestroySemaphore(r->device, rec->acquire[i], NULL);
+            rec->acquire[i] = VK_NULL_HANDLE;
+        }
+    }
+    rec->image_count = 0;
+    if (rec->swapchain) { vkDestroySwapchainKHR(r->device, rec->swapchain, NULL); rec->swapchain = VK_NULL_HANDLE; }
+    if (rec->surface)   { vkDestroySurfaceKHR(r->instance, rec->surface, NULL); rec->surface = VK_NULL_HANDLE; }
+    if (rec->anw)       { ANativeWindow_release(rec->anw); rec->anw = NULL; }
+    rec->active = false;
+    rec->disabled = false;
+    rec->ui_enabled = false;
+}
+
+static bool create_record_swapchain(VkRenderer* r) {
+    VkRecordSwap* rec = &r->rec;
+    if (!rec->anw) return false;
+
+    VkAndroidSurfaceCreateInfoKHR aci = {VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR};
+    aci.window = rec->anw;
+    if (vkCreateAndroidSurfaceKHR(r->instance, &aci, NULL, &rec->surface) != VK_SUCCESS) {
+        VK_LOGE("record: vkCreateAndroidSurfaceKHR failed");
+        return false;
+    }
+
+    VkBool32 supported = VK_FALSE;
+    vkGetPhysicalDeviceSurfaceSupportKHR(r->physical_device, r->graphics_queue_family,
+                                         rec->surface, &supported);
+    if (!supported) { VK_LOGE("record: surface not presentable"); goto fail; }
+
+    VkSurfaceCapabilitiesKHR caps;
+    if (vkGetPhysicalDeviceSurfaceCapabilitiesKHR(r->physical_device, rec->surface, &caps) != VK_SUCCESS) {
+        VK_LOGE("record: surface caps query failed");
+        goto fail;
+    }
+    if (!(caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) {
+        VK_LOGE("record: encoder surface lacks TRANSFER_DST usage (0x%x); cannot capture",
+                caps.supportedUsageFlags);
+        goto fail;
+    }
+
+    uint32_t fmt_count = 0;
+    if (vkGetPhysicalDeviceSurfaceFormatsKHR(r->physical_device, rec->surface, &fmt_count, NULL) != VK_SUCCESS
+        || fmt_count == 0) {
+        VK_LOGE("record: surface formats query failed");
+        goto fail;
+    }
+    VkSurfaceFormatKHR* fmts = calloc(fmt_count, sizeof(VkSurfaceFormatKHR));
+    if (!fmts) goto fail;
+    vkGetPhysicalDeviceSurfaceFormatsKHR(r->physical_device, rec->surface, &fmt_count, fmts);
+    VkSurfaceFormatKHR chosen = fmts[0];
+    for (uint32_t i = 0; i < fmt_count; i++) {
+        if (fmts[i].format == VK_FORMAT_R8G8B8A8_UNORM) { chosen = fmts[i]; break; }
+        if (fmts[i].format == VK_FORMAT_B8G8R8A8_UNORM) chosen = fmts[i];
+    }
+    free(fmts);
+    rec->format = chosen.format;
+
+    VkPresentModeKHR present_mode = VK_PRESENT_MODE_FIFO_KHR; // prefer MAILBOX below
+    uint32_t pm_count = 0;
+    vkGetPhysicalDeviceSurfacePresentModesKHR(r->physical_device, rec->surface, &pm_count, NULL);
+    if (pm_count > 0) {
+        VkPresentModeKHR* pms = calloc(pm_count, sizeof(VkPresentModeKHR));
+        if (pms) {
+            vkGetPhysicalDeviceSurfacePresentModesKHR(r->physical_device, rec->surface, &pm_count, pms);
+            for (uint32_t i = 0; i < pm_count; i++) {
+                if (pms[i] == VK_PRESENT_MODE_MAILBOX_KHR) { present_mode = VK_PRESENT_MODE_MAILBOX_KHR; break; }
+            }
+            free(pms);
+        }
+    }
+
+    VkExtent2D extent = caps.currentExtent;
+    if (extent.width == 0xFFFFFFFFu) {
+        int w = ANativeWindow_getWidth(rec->anw);
+        int h = ANativeWindow_getHeight(rec->anw);
+        extent.width = w > 0 ? (uint32_t)w : r->swapchain_extent.width;
+        extent.height = h > 0 ? (uint32_t)h : r->swapchain_extent.height;
+    }
+    if (extent.width == 0 || extent.height == 0) goto fail;
+    rec->extent = extent;
+
+    VkSurfaceTransformFlagBitsKHR pre =
+        (caps.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
+            ? VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR : caps.currentTransform;
+
+    uint32_t image_count = caps.minImageCount + 1;
+    if (caps.maxImageCount > 0 && image_count > caps.maxImageCount) image_count = caps.maxImageCount;
+    if (image_count > VK_MAX_RECORD_IMAGES) image_count = VK_MAX_RECORD_IMAGES;
+
+    VkSwapchainCreateInfoKHR sci = {VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR};
+    sci.surface = rec->surface;
+    sci.minImageCount = image_count;
+    sci.imageFormat = chosen.format;
+    sci.imageColorSpace = chosen.colorSpace;
+    sci.imageExtent = extent;
+    sci.imageArrayLayers = 1;
+    sci.imageUsage = VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    if (rec->ui_enabled && (caps.supportedUsageFlags & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)) {
+        sci.imageUsage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; // Record UI renders onto the rec image
+    } else if (rec->ui_enabled) {
+        VK_LOGW("record: encoder surface can't be a color attachment; UI overlay disabled");
+        rec->ui_enabled = false;
+    }
+    sci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    sci.preTransform = pre;
+    sci.compositeAlpha = (caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)
+        ? VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR : VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR;
+    sci.presentMode = present_mode;
+    sci.clipped = VK_TRUE;
+    if (vkCreateSwapchainKHR(r->device, &sci, NULL, &rec->swapchain) != VK_SUCCESS) {
+        VK_LOGE("record: vkCreateSwapchainKHR failed");
+        goto fail;
+    }
+
+    uint32_t got = 0;
+    if (vkGetSwapchainImagesKHR(r->device, rec->swapchain, &got, NULL) != VK_SUCCESS
+        || got == 0 || got > VK_MAX_RECORD_IMAGES) {
+        VK_LOGE("record: swapchain image count query failed (got=%u)", got);
+        goto fail;
+    }
+    if (vkGetSwapchainImagesKHR(r->device, rec->swapchain, &got, rec->images) != VK_SUCCESS) {
+        VK_LOGE("record: swapchain images query failed");
+        goto fail;
+    }
+    rec->image_count = got;
+
+    VkSemaphoreCreateInfo sem_ci = {VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO};
+    for (uint32_t i = 0; i < got; i++) {
+        if (vkCreateSemaphore(r->device, &sem_ci, NULL, &rec->present_ready[i]) != VK_SUCCESS) goto fail;
+    }
+    for (uint32_t i = 0; i < VK_FRAMES_IN_FLIGHT; i++) {
+        if (vkCreateSemaphore(r->device, &sem_ci, NULL, &rec->acquire[i]) != VK_SUCCESS) goto fail;
+    }
+    VK_LOGI("record: mirror swapchain %ux%u images=%u", extent.width, extent.height, got);
+
+    if (rec->ui_enabled && !build_record_ui_resources(r)) {
+        VK_LOGW("record: UI composite unavailable; capturing game only");
+        rec->ui_enabled = false;
+    }
+    return true;
+
+fail:
+    destroy_record_swapchain(r);
+    return false;
+}
+
+// ============================================================
+// Offscreen ping-pong (for effect chain)
+// ============================================================
+
+static bool create_one_offscreen(VkRenderer* r, VkOffscreen* o, uint32_t w, uint32_t h,
+                                 VkFilter filter) {
+    o->width = w;
+    o->height = h;
+
+    VkImageCreateInfo ic = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO};
+    ic.imageType = VK_IMAGE_TYPE_2D;
+    ic.format = r->caps.offscreen_format;
+    ic.extent.width = w;
+    ic.extent.height = h;
+    ic.extent.depth = 1;
+    ic.mipLevels = 1;
+    ic.arrayLayers = 1;
+    ic.samples = VK_SAMPLE_COUNT_1_BIT;
+    ic.tiling = VK_IMAGE_TILING_OPTIMAL;
+    ic.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
+    ic.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    ic.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+    if (vkCreateImage(r->device, &ic, NULL, &o->image) != VK_SUCCESS) return false;
+
+    VkMemoryRequirements mr;
+    vkGetImageMemoryRequirements(r->device, o->image, &mr);
+    VkMemoryAllocateInfo ai = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO};
+    ai.allocationSize = mr.size;
+    ai.memoryTypeIndex = vkr_find_memory_type(r, mr.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+    if (ai.memoryTypeIndex == UINT32_MAX) return false;
+    if (vkAllocateMemory(r->device, &ai, NULL, &o->memory) != VK_SUCCESS) return false;
+    vkBindImageMemory(r->device, o->image, o->memory, 0);
+
+    VkImageViewCreateInfo vi = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO};
+    vi.image = o->image;
+    vi.viewType = VK_IMAGE_VIEW_TYPE_2D;
+    vi.format = ic.format;
+    vi.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    vi.subresourceRange.levelCount = 1;
+    vi.subresourceRange.layerCount = 1;
+    if (vkCreateImageView(r->device, &vi, NULL, &o->view) != VK_SUCCESS) return false;
+
+    VkSamplerCreateInfo si = {VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO};
+    si.magFilter = filter;
+    si.minFilter = filter;
+    si.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    si.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    si.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    if (vkCreateSampler(r->device, &si, NULL, &o->sampler) != VK_SUCCESS) return false;
+
+    o->descriptor_set = vkr_alloc_descriptor_set(r);
+    if (o->descriptor_set == VK_NULL_HANDLE) return false;
+
+    VkDescriptorImageInfo dii = {0};
+    dii.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    dii.imageView = o->view;
+    dii.sampler = o->sampler;
+    VkWriteDescriptorSet wri = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET};
+    wri.dstSet = o->descriptor_set;
+    wri.dstBinding = 0;
+    wri.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+    wri.descriptorCount = 1;
+    wri.pImageInfo = &dii;
+    vkUpdateDescriptorSets(r->device, 1, &wri, 0, NULL);
+
+    VkFramebufferCreateInfo fbci = {VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO};
+    fbci.renderPass = r->pipelines.offscreen_pass;
+    fbci.attachmentCount = 1;
+    fbci.pAttachments = &o->view;
+    fbci.width = w;
+    fbci.height = h;
+    fbci.layers = 1;
+    if (vkCreateFramebuffer(r->device, &fbci, NULL, &o->framebuffer) != VK_SUCCESS) return false;
+
+    return true;
+}
+
+static void destroy_one_offscreen(VkRenderer* r, VkOffscreen* o) {
+    if (o->framebuffer)    vkDestroyFramebuffer(r->device, o->framebuffer, NULL);
+    if (o->descriptor_set) vkr_free_descriptor_set(r, o->descriptor_set);
+    if (o->sampler)        vkDestroySampler(r->device, o->sampler, NULL);
+    if (o->view)           vkDestroyImageView(r->device, o->view, NULL);
+    if (o->image)          vkDestroyImage(r->device, o->image, NULL);
+    if (o->memory)         vkFreeMemory(r->device, o->memory, NULL);
+    memset(o, 0, sizeof(*o));
+}
+
+// Builds offscreen[0], plus the second ping-pong target (~8 MB RGBA8 + view/sampler/descriptor/
+// framebuffer) only when need_second. At matching dims, a missing second target is added in
+// place without disturbing offscreen[0].
+static bool create_offscreen(VkRenderer* r, uint32_t w, uint32_t h, bool need_second) {
+    bool dims_ok = r->offscreen_built
+                && r->offscreen[0].width == w && r->offscreen[0].height == h;
+    bool second_ok = !need_second || r->offscreen[1].image != VK_NULL_HANDLE;
+    if (dims_ok && second_ok) return true;
+
+    if (dims_ok && !second_ok) {  // add second target only (callers drained the queue)
+        if (!create_one_offscreen(r, &r->offscreen[1], w, h, VK_FILTER_LINEAR)) {
+            destroy_one_offscreen(r, &r->offscreen[1]);
+            return false;
+        }
+        return true;
+    }
+
+    destroy_offscreen(r);
+    if (!create_one_offscreen(r, &r->offscreen[0], w, h, VK_FILTER_LINEAR)) goto fail;
+    if (need_second && !create_one_offscreen(r, &r->offscreen[1], w, h, VK_FILTER_LINEAR)) goto fail;
+    r->offscreen_built = true;
+    return true;
+
+fail:
+    destroy_offscreen(r);
+    return false;
+}
+
+static void destroy_offscreen(VkRenderer* r) {
+    destroy_one_offscreen(r, &r->offscreen[0]);
+    destroy_one_offscreen(r, &r->offscreen[1]);
+    r->offscreen_built = false;
+}
+
+static bool create_sgsr1_resources(VkRenderer* r, uint32_t w, uint32_t h) {
+    if (r->sgsr1.built && r->sgsr1.width == w && r->sgsr1.height == h) return true;
+
+    destroy_sgsr1_resources(r);
+    if (!create_one_offscreen(r, &r->sgsr1.source, w, h, VK_FILTER_LINEAR)) goto fail;
+
+    r->sgsr1.width = w;
+    r->sgsr1.height = h;
+    r->sgsr1.built = true;
+    VK_LOGI("SGSR1 source created %ux%u -> swapchain %ux%u",
+            w, h, r->swapchain_extent.width, r->swapchain_extent.height);
+    return true;
+
+fail:
+    destroy_sgsr1_resources(r);
+    return false;
+}
+
+static void destroy_sgsr1_resources(VkRenderer* r) {
+    if (r->sgsr1.built) {
+        VK_LOGI("SGSR1 source destroyed");
+    }
+    destroy_one_offscreen(r, &r->sgsr1.source);
+    r->sgsr1.built = false;
+    r->sgsr1.width = 0;
+    r->sgsr1.height = 0;
+}
+
+// ============================================================
+// Graveyard processing
+// ============================================================
+
+// Detach the slot's pending-destroy list under scene_mutex. The Vulkan destroy calls
+// (vkFreeDescriptorSets, vkDestroyImage, vkFreeMemory, AHardwareBuffer_release) can each
+// take tens to hundreds of microseconds on Adreno, so doing them under scene_mutex stalls
+// every scene producer (X server, input thread) for the full duration. Caller passes the
+// detached array to destroy_graveyard_textures() after releasing the lock.
+static void detach_graveyard_slot(VkRenderer* r, uint32_t slot_idx,
+                                  VkTexture*** out_textures, uint32_t* out_count) {
+    VkGraveSlot* slot = &r->graveyard[slot_idx];
+    *out_textures = slot->textures;
+    *out_count = slot->count;
+    slot->textures = NULL;
+    slot->count = 0;
+    slot->capacity = 0;
+}
+
+static void destroy_graveyard_textures(VkRenderer* r, VkTexture** textures, uint32_t count) {
+    if (!textures) return;
+    for (uint32_t i = 0; i < count; i++) {
+        vkr_texture_destroy(r, textures[i]);
+    }
+    free(textures);
+}
+
+// ============================================================
+// Frame recording + submission
+// ============================================================
+
+static bool is_plain_rotation_transform(VkSurfaceTransformFlagBitsKHR transform) {
+    return transform == VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR
+        || transform == VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR
+        || transform == VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR
+        || transform == VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR;
+}
+
+static bool is_quarter_turn_transform(VkSurfaceTransformFlagBitsKHR transform) {
+    return transform == VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR
+        || transform == VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR;
+}
+
+static void transform_xform_for_pretransform(float out[6], const float in[6],
+                                             uint32_t view_w, uint32_t view_h,
+                                             VkSurfaceTransformFlagBitsKHR transform) {
+    switch (transform) {
+        case VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR:
+            out[0] = -in[1];
+            out[1] =  in[0];
+            out[2] = -in[3];
+            out[3] =  in[2];
+            out[4] = (float)view_h - in[5];
+            out[5] =  in[4];
+            break;
+        case VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR:
+            out[0] = -in[0];
+            out[1] = -in[1];
+            out[2] = -in[2];
+            out[3] = -in[3];
+            out[4] = (float)view_w - in[4];
+            out[5] = (float)view_h - in[5];
+            break;
+        case VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR:
+            out[0] =  in[1];
+            out[1] = -in[0];
+            out[2] =  in[3];
+            out[3] = -in[2];
+            out[4] =  in[5];
+            out[5] = (float)view_w - in[4];
+            break;
+        default:
+            memcpy(out, in, sizeof(float) * 6);
+            break;
+    }
+}
+
+static void transformed_view_size(uint32_t* w, uint32_t* h,
+                                  VkSurfaceTransformFlagBitsKHR transform) {
+    if (is_quarter_turn_transform(transform)) {
+        uint32_t tmp = *w;
+        *w = *h;
+        *h = tmp;
+    }
+}
+
+typedef struct VkPreRotatedRect {
+    int x;
+    int y;
+    int w;
+    int h;
+} VkPreRotatedRect;
+
+static VkPreRotatedRect transform_rect_for_pretransform(int x, int y, int w, int h,
+                                                        uint32_t buffer_w,
+                                                        uint32_t buffer_h,
+                                                        VkSurfaceTransformFlagBitsKHR transform) {
+    VkPreRotatedRect r = {x, y, w, h};
+    switch (transform) {
+        case VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR:
+            r.x = (int)buffer_w - h - y;
+            r.y = x;
+            r.w = h;
+            r.h = w;
+            break;
+        case VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR:
+            r.x = (int)buffer_w - w - x;
+            r.y = (int)buffer_h - h - y;
+            break;
+        case VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR:
+            r.x = y;
+            r.y = (int)buffer_h - w - x;
+            r.w = h;
+            r.h = w;
+            break;
+        default:
+            break;
+    }
+    return r;
+}
+
+static VkPreRotatedRect clamp_rect_to_extent(VkPreRotatedRect r, uint32_t extent_w,
+                                             uint32_t extent_h) {
+    int max_w = (int)extent_w;
+    int max_h = (int)extent_h;
+    if (r.x < 0) {
+        r.w += r.x;
+        r.x = 0;
+    }
+    if (r.y < 0) {
+        r.h += r.y;
+        r.y = 0;
+    }
+    if (r.x + r.w > max_w) r.w = max_w - r.x;
+    if (r.y + r.h > max_h) r.h = max_h - r.y;
+    if (r.w < 0) r.w = 0;
+    if (r.h < 0) r.h = 0;
+    return r;
+}
+
+static VkPreRotatedRect scale_rect_from_swapchain(const VkRenderer* r, VkPreRotatedRect rect,
+                                                  uint32_t target_w, uint32_t target_h) {
+    if (target_w == r->swapchain_extent.width && target_h == r->swapchain_extent.height) {
+        return rect;
+    }
+
+    float sx = r->swapchain_extent.width > 0
+        ? (float)target_w / (float)r->swapchain_extent.width
+        : 1.0f;
+    float sy = r->swapchain_extent.height > 0
+        ? (float)target_h / (float)r->swapchain_extent.height
+        : 1.0f;
+
+    rect.x = (int)((float)rect.x * sx + 0.5f);
+    rect.y = (int)((float)rect.y * sy + 0.5f);
+    rect.w = (int)((float)rect.w * sx + 0.5f);
+    rect.h = (int)((float)rect.h * sy + 0.5f);
+    return rect;
+}
+
+static void push_window_constants(VkCommandBuffer cmd, VkPipelineLayout layout,
+                                  const float xform[6], float view_w, float view_h,
+                                  float u0, float v0, float u1, float v1,
+                                  bool swap_rb) {
+    struct {
+        float xform[6];
+        float view_size[2];
+        float uv_rect[4];
+        int32_t swap_rb;
+    } pc;
+    memcpy(pc.xform, xform, sizeof(pc.xform));
+    pc.view_size[0] = view_w;
+    pc.view_size[1] = view_h;
+    pc.uv_rect[0] = u0;
+    pc.uv_rect[1] = v0;
+    pc.uv_rect[2] = u1;
+    pc.uv_rect[3] = v1;
+    pc.swap_rb = swap_rb ? 1 : 0;
+    vkCmdPushConstants(cmd, layout,
+                       VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
+                       0, sizeof(pc), &pc);
+}
+
+static void compose_xform_for_window(float out[6], const float scene_xform[6],
+                                     int wx, int wy, int ww, int wh) {
+    // Equivalent to GLRenderer.renderDrawable: tmpXForm1 = make(x, y, w, h); tmpXForm1 *= tmpXForm2
+    // XForm.set(out, x, y, w, h):  [w, 0, 0, h, x, y]
+    float a[6] = { (float)ww, 0.0f, 0.0f, (float)wh, (float)wx, (float)wy };
+    // 2x2 + translation multiply: result = a * scene_xform
+    out[0] = a[0]*scene_xform[0] + a[1]*scene_xform[2];
+    out[1] = a[0]*scene_xform[1] + a[1]*scene_xform[3];
+    out[2] = a[2]*scene_xform[0] + a[3]*scene_xform[2];
+    out[3] = a[2]*scene_xform[1] + a[3]*scene_xform[3];
+    out[4] = a[4]*scene_xform[0] + a[5]*scene_xform[2] + scene_xform[4];
+    out[5] = a[4]*scene_xform[1] + a[5]*scene_xform[3] + scene_xform[5];
+}
+
+static void set_viewport_scissor(VkCommandBuffer cmd, VkRenderer* r, const VkScene* s,
+                                 uint32_t target_w, uint32_t target_h) {
+    if (target_w == 0) target_w = r->swapchain_extent.width;
+    if (target_h == 0) target_h = r->swapchain_extent.height;
+
+    int vx, vy, vw, vh;
+    if (s->viewport_set) {
+        vx = s->viewport_x;
+        vy = s->viewport_y;
+        vw = s->viewport_w;
+        vh = s->viewport_h;
+    } else {
+        vx = 0;
+        vy = 0;
+        vw = (int)r->surface_extent.width;
+        vh = (int)r->surface_extent.height;
+    }
+
+    VkPreRotatedRect vr = transform_rect_for_pretransform(
+        vx, vy, vw, vh, r->swapchain_extent.width, r->swapchain_extent.height,
+        r->swapchain_transform);
+    vr = scale_rect_from_swapchain(r, vr, target_w, target_h);
+
+    VkViewport vp = {0};
+    vp.x = (float)vr.x;
+    vp.y = (float)vr.y;
+    vp.width = (float)vr.w;
+    vp.height = (float)vr.h;
+    vp.minDepth = 0.0f;
+    vp.maxDepth = 1.0f;
+    vkCmdSetViewport(cmd, 0, 1, &vp);
+
+    int sx, sy, sw, sh;
+    if (s->scissor_enabled) {
+        sx = s->scissor_x;
+        sy = s->scissor_y;
+        sw = s->scissor_w;
+        sh = s->scissor_h;
+    } else {
+        sx = 0;
+        sy = 0;
+        sw = (int)r->surface_extent.width;
+        sh = (int)r->surface_extent.height;
+    }
+    VkPreRotatedRect sr = transform_rect_for_pretransform(
+        sx, sy, sw, sh, r->swapchain_extent.width, r->swapchain_extent.height,
+        r->swapchain_transform);
+    sr = scale_rect_from_swapchain(r, sr, target_w, target_h);
+    sr = clamp_rect_to_extent(sr, target_w, target_h);
+
+    VkRect2D sc = {0};
+    sc.offset.x = sr.x;
+    sc.offset.y = sr.y;
+    sc.extent.width = (uint32_t)sr.w;
+    sc.extent.height = (uint32_t)sr.h;
+    vkCmdSetScissor(cmd, 0, 1, &sc);
+}
+
+static void draw_scene_pass(VkRenderer* r, VkCommandBuffer cmd, const VkScene* s, bool offscreen,
+                            uint32_t target_w, uint32_t target_h) {
+    if (s->screen_width == 0 || s->screen_height == 0) return;
+
+    set_viewport_scissor(cmd, r, s, target_w, target_h);
+
+    // Windows
+    vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+                      offscreen ? r->pipelines.offscreen_window_pipeline
+                                : r->pipelines.window_pipeline);
+    VkDeviceSize offset = 0;
+    vkCmdBindVertexBuffers(cmd, 0, 1, &r->quad_vbo, &offset);
+
+    for (uint32_t i = 0; i < s->window_count; i++) {
+        const VkRenderableWindow* w = &s->windows[i];
+        if (!w->texture || !w->texture->ready) continue;
+
+        float xf[6];
+        compose_xform_for_window(xf, s->xform, w->x, w->y, w->width, w->height);
+        float pre_xf[6];
+        uint32_t view_w = s->screen_width;
+        uint32_t view_h = s->screen_height;
+        transform_xform_for_pretransform(pre_xf, xf, view_w, view_h, r->swapchain_transform);
+        transformed_view_size(&view_w, &view_h, r->swapchain_transform);
+        push_window_constants(cmd, r->pipelines.window_layout, pre_xf,
+                              (float)view_w, (float)view_h,
+                              w->u0, w->v0, w->u1, w->v1, s->swap_rb);
+        vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+                                r->pipelines.window_layout, 0, 1, &w->texture->descriptor_set,
+                                0, NULL);
+        vkCmdDraw(cmd, 4, 1, 0, 0);
+    }
+
+    // Cursor
+    if (s->cursor_visible && s->cursor_texture && s->cursor_texture->ready
+        && s->cursor_width > 0 && s->cursor_height > 0) {
+        vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+                          offscreen ? r->pipelines.offscreen_cursor_pipeline
+                                    : r->pipelines.cursor_pipeline);
+        float xf[6];
+        compose_xform_for_window(xf, s->xform, s->cursor_x, s->cursor_y,
+                                 s->cursor_width, s->cursor_height);
+        float pre_xf[6];
+        uint32_t view_w = s->screen_width;
+        uint32_t view_h = s->screen_height;
+        transform_xform_for_pretransform(pre_xf, xf, view_w, view_h, r->swapchain_transform);
+        transformed_view_size(&view_w, &view_h, r->swapchain_transform);
+        push_window_constants(cmd, r->pipelines.window_layout, pre_xf,
+                              (float)view_w, (float)view_h,
+                              0.0f, 0.0f, 1.0f, 1.0f, false);
+        vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+                                r->pipelines.window_layout, 0, 1,
+                                &s->cursor_texture->descriptor_set, 0, NULL);
+        vkCmdDraw(cmd, 4, 1, 0, 0);
+    }
+}
+
+static void run_effect(VkRenderer* r, VkCommandBuffer cmd, VkEffectSlot* eff,
+                       VkDescriptorSet src_set, uint32_t target_w, uint32_t target_h,
+                       bool offscreen) {
+    VkPipeline pipe = VK_NULL_HANDLE;
+    if ((uint32_t)eff->type < VK_EFFECT_COUNT) {
+        pipe = offscreen ? r->pipelines.offscreen_effect_pipelines[eff->type]
+                         : r->pipelines.effect_pipelines[eff->type];
+    }
+    if (!pipe) {
+        pipe = offscreen ? r->pipelines.offscreen_blit_pipeline : r->pipelines.blit_pipeline;
+    }
+
+    vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipe);
+
+    VkViewport vp = {0, 0, (float)target_w, (float)target_h, 0.0f, 1.0f};
+    VkRect2D sc = {{0, 0}, {target_w, target_h}};
+    vkCmdSetViewport(cmd, 0, 1, &vp);
+    vkCmdSetScissor(cmd, 0, 1, &sc);
+
+    float pc[6];
+    pc[0] = (float)target_w;
+    pc[1] = (float)target_h;
+    pc[2] = eff->param0;
+    pc[3] = eff->param1;
+    pc[4] = eff->param2;
+    pc[5] = (float)eff->mode;
+    vkCmdPushConstants(cmd, r->pipelines.effect_layout, VK_SHADER_STAGE_FRAGMENT_BIT, 0,
+                       sizeof(pc), pc);
+
+    vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+                            r->pipelines.effect_layout, 0, 1, &src_set, 0, NULL);
+    vkCmdDraw(cmd, 3, 1, 0, 0);
+}
+
+static bool scene_starts_with_sgsr1(const VkScene* s) {
+    return s->effect_count > 0 && s->effects[0].type == VK_EFFECT_SGSR1;
+}
+
+static void wait_inflight_frames(VkRenderer* r) {
+    VkFence fences[VK_FRAMES_IN_FLIGHT];
+    uint32_t count = 0;
+    for (uint32_t i = 0; i < VK_FRAMES_IN_FLIGHT; i++) {
+        if (r->frames[i].in_flight) fences[count++] = r->frames[i].in_flight;
+    }
+    if (count == 0) return;
+    vkWaitForFences(r->device, count, fences, VK_TRUE, UINT64_MAX);
+}
+
+// SGSR1 upscales the actual X/DRI3 source; ratio changes take effect after restart.
+static VkExtent2D compute_sgsr1_source_extent(VkRenderer* r, const VkScene* s) {
+    VkExtent2D out = r->swapchain_extent;
+    if (out.width == 0 || out.height == 0 || s->screen_width == 0 || s->screen_height == 0) {
+        return out;
+    }
+
+    // Cap SGSR1's source at the X screen so oversized DRI3 buffers do not undo scaling.
+    uint32_t source_w = s->source_width > 0 && s->source_width < s->screen_width
+        ? s->source_width : s->screen_width;
+    uint32_t source_h = s->source_height > 0 && s->source_height < s->screen_height
+        ? s->source_height : s->screen_height;
+    transformed_view_size(&source_w, &source_h, r->swapchain_transform);
+    if (source_w == 0 || source_h == 0) return out;
+
+    VkExtent2D source = {
+        source_w < out.width ? source_w : out.width,
+        source_h < out.height ? source_h : out.height,
+    };
+    if (source.width < 1) source.width = 1;
+    if (source.height < 1) source.height = 1;
+    return source;
+}
+
+static bool record_and_submit_frame(VkRenderer* r) {
+    if (!r->surface_ready || !r->swapchain) return false;
+
+    pthread_mutex_lock(&r->render_mutex);
+
+    VkFrame* f = &r->frames[r->frame_index];
+    uint32_t grave_slot = r->graveyard_index;
+
+    if (f->in_flight == VK_NULL_HANDLE) {
+        VkFenceCreateInfo fci = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+        fci.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+        if (vkCreateFence(r->device, &fci, NULL, &f->in_flight) != VK_SUCCESS) {
+            f->in_flight = VK_NULL_HANDLE;
+            VK_LOGE("frame fence unavailable; skipping frame");
+            pthread_mutex_unlock(&r->render_mutex);
+            return false;
+        }
+    }
+
+    vkWaitForFences(r->device, 1, &f->in_flight, VK_TRUE, UINT64_MAX);
+
+    // Snapshot the scene under scene_mutex (cheap memcpy of a few KB), then release it so
+    // scene producers (texture destroys, X server window updates) don't stall behind the
+    // long acquire/record/submit/present below. render_mutex still serializes us against
+    // surface lifecycle changes, which keeps the swapchain handles stable for our use.
+    VkScene snap;
+    VkTexture** dead = NULL;
+    uint32_t dead_count = 0;
+    pthread_mutex_lock(&r->scene_mutex);
+    if (!r->surface_ready || !r->swapchain || r->swapchain_image_count == 0
+        || r->swapchain_extent.width == 0 || r->swapchain_extent.height == 0) {
+        pthread_mutex_unlock(&r->scene_mutex);
+        pthread_mutex_unlock(&r->render_mutex);
+        return false;
+    }
+    snap = r->scene;
+    detach_graveyard_slot(r, grave_slot, &dead, &dead_count);
+    pthread_mutex_unlock(&r->scene_mutex);
+    destroy_graveyard_textures(r, dead, dead_count);
+
+    bool wants_sgsr1 = scene_starts_with_sgsr1(&snap);
+    bool needs_fullres_offscreen = snap.effect_count > 0
+        && (!wants_sgsr1 || snap.effect_count > 1);
+    // offscreen[1] is reached only once the chain writes two distinct offscreen buffers: the
+    // effect loop's dst_idx starts at 1 for a non-SGSR chain but at 0 for an SGSR1-led one
+    // (scene goes to the separate SGSR source), so the threshold is >1 normally, >2 for SGSR.
+    bool needs_second_offscreen = needs_fullres_offscreen
+        && snap.effect_count > (wants_sgsr1 ? 2u : 1u);
+    VkExtent2D sgsr1_source_extent = wants_sgsr1
+        ? compute_sgsr1_source_extent(r, &snap)
+        : r->swapchain_extent;
+
+    // Full-res ping-pong targets exist only when the chain needs them (SGSR-only writes its
+    // low-res source straight to the swapchain). offscreen[1] is grown/freed lazily as the
+    // chain crosses the threshold above; effect counts change on user action, not per frame,
+    // so this doesn't thrash. Safe under render_mutex (no concurrent swapchain teardown).
+    bool offscreen_dims_stale = !r->offscreen_built
+        || r->offscreen[0].width != r->swapchain_extent.width
+        || r->offscreen[0].height != r->swapchain_extent.height;
+    bool second_present = r->offscreen[1].image != VK_NULL_HANDLE;
+    if (needs_fullres_offscreen) {
+        if (offscreen_dims_stale || (needs_second_offscreen && !second_present)) {
+            wait_inflight_frames(r);
+            create_offscreen(r, r->swapchain_extent.width, r->swapchain_extent.height,
+                             needs_second_offscreen);
+        } else if (!needs_second_offscreen && second_present) {
+            wait_inflight_frames(r);  // chain no longer reaches offscreen[1]; reclaim it
+            destroy_one_offscreen(r, &r->offscreen[1]);
+        }
+    } else if (r->offscreen_built) {
+        wait_inflight_frames(r);
+        destroy_offscreen(r);
+    }
+    // Only rebuild SGSR1 source on meaningful dim change. Tiny pixmap-size flicker (off-by-
+    // one DRI3 jitter, transient resizes) used to thrash this allocation every frame and
+    // stall the render thread on the full-device wait that preceded it.
+    int sgsr1_dw = (int)r->sgsr1.width  - (int)sgsr1_source_extent.width;
+    int sgsr1_dh = (int)r->sgsr1.height - (int)sgsr1_source_extent.height;
+    if (sgsr1_dw < 0) sgsr1_dw = -sgsr1_dw;
+    if (sgsr1_dh < 0) sgsr1_dh = -sgsr1_dh;
+    bool sgsr1_dim_changed = r->sgsr1.built && (sgsr1_dw > 4 || sgsr1_dh > 4);
+    if (wants_sgsr1 && (!r->sgsr1.built || sgsr1_dim_changed)) {
+        wait_inflight_frames(r);
+        create_sgsr1_resources(r, sgsr1_source_extent.width, sgsr1_source_extent.height);
+    } else if (!wants_sgsr1 && r->sgsr1.built) {
+        wait_inflight_frames(r);
+        destroy_sgsr1_resources(r);
+    }
+
+    uint32_t image_index = 0;
+    VkResult acq = vkAcquireNextImageKHR(r->device, r->swapchain, UINT64_MAX,
+                                         f->image_available, VK_NULL_HANDLE, &image_index);
+    bool recreate_after_present = false;
+    if (acq == VK_ERROR_OUT_OF_DATE_KHR) {
+        r->surface_ready = false;
+        pthread_mutex_lock(&r->queue_mutex);
+        vkQueueWaitIdle(r->graphics_queue);
+        pthread_mutex_unlock(&r->queue_mutex);
+        destroy_swapchain_resources(r);
+        r->surface_ready = create_swapchain(r, r->surface_extent.width, r->surface_extent.height);
+        pthread_mutex_unlock(&r->render_mutex);
+        return false;
+    } else if (acq == VK_SUBOPTIMAL_KHR) {
+        if (!r->ignore_suboptimal) recreate_after_present = true;
+    } else if (acq != VK_SUCCESS) {
+        VK_LOGE("vkAcquireNextImageKHR -> %d", acq);
+        pthread_mutex_unlock(&r->render_mutex);
+        return false;
+    }
+    VkSemaphore render_finished = r->swapchain_render_finished[image_index];
+
+    // Sample the render rate down to the requested fps on a fixed grid, then acquire an encoder
+    // image to blit this frame into (bounded timeout so a busy encoder skips rather than stalls).
+    bool rec_this_frame = false;
+    uint32_t rec_index = 0;
+    bool rec_due = true;
+    if (r->rec.active && r->rec.min_interval_ns > 0) {
+        struct timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        uint64_t now = (uint64_t)ts.tv_sec * 1000000000ULL + (uint64_t)ts.tv_nsec;
+        if (r->rec.last_capture_ns == 0) r->rec.last_capture_ns = now;
+        if (now < r->rec.last_capture_ns) {
+            rec_due = false;
+        } else {
+            r->rec.last_capture_ns += r->rec.min_interval_ns;
+            if (now > r->rec.last_capture_ns + 4ULL * r->rec.min_interval_ns) {
+                r->rec.last_capture_ns = now; // resync after a long stall
+            }
+        }
+    }
+    if (rec_due && r->rec.active && !r->rec.disabled && r->rec.swapchain) {
+        VkResult racq = vkAcquireNextImageKHR(r->device, r->rec.swapchain, 16000000ULL,
+                                              r->rec.acquire[r->frame_index], VK_NULL_HANDLE, &rec_index);
+        if (racq == VK_SUCCESS || racq == VK_SUBOPTIMAL_KHR) {
+            rec_this_frame = true;
+            if (r->rec.captured++ == 0) VK_LOGI("record: first frame captured (rec_index=%u)", rec_index);
+        } else if (racq == VK_ERROR_OUT_OF_DATE_KHR) {
+            r->rec.disabled = true;
+            VK_LOGW("record: mirror swapchain out of date; capture disabled");
+        } else if ((r->rec.skipped++ % 120) == 0) {
+            VK_LOGW("record: no encoder image ready (code=%d, skipped=%llu)",
+                    racq, (unsigned long long)r->rec.skipped);
+        }
+    }
+
+    vkResetFences(r->device, 1, &f->in_flight);
+
+    VkCommandBufferBeginInfo bi = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO};
+    bi.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+    vkBeginCommandBuffer(f->cmd, &bi);
+
+    bool has_effects = snap.effect_count > 0 && r->offscreen_built;
+    if (snap.effect_count > 0) {
+        // Don't enter the effect path if a required target's lazy creation failed (else we'd
+        // record into a null framebuffer).
+        bool full_ok = !needs_fullres_offscreen
+            || (r->offscreen_built
+                && (!needs_second_offscreen || r->offscreen[1].image != VK_NULL_HANDLE));
+        has_effects = full_ok && (!wants_sgsr1 || r->sgsr1.built);
+    }
+
+    VkClearValue clear = {0};
+    clear.color.float32[0] = 0.0f;
+    clear.color.float32[1] = 0.0f;
+    clear.color.float32[2] = 0.0f;
+    clear.color.float32[3] = 1.0f;
+
+    if (has_effects) {
+        VkOffscreen* scene_target = (wants_sgsr1 && r->sgsr1.built)
+            ? &r->sgsr1.source
+            : &r->offscreen[0];
+
+        // Pass 1: render scene to either full-res effect input or SGSR1's low-res source.
+        VkRenderPassBeginInfo rpbi = {VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO};
+        rpbi.renderPass = r->pipelines.offscreen_pass;
+        rpbi.framebuffer = scene_target->framebuffer;
+        rpbi.renderArea.extent.width = scene_target->width;
+        rpbi.renderArea.extent.height = scene_target->height;
+        rpbi.clearValueCount = 1;
+        rpbi.pClearValues = &clear;
+        vkCmdBeginRenderPass(f->cmd, &rpbi, VK_SUBPASS_CONTENTS_INLINE);
+        draw_scene_pass(r, f->cmd, &snap, true,
+                        scene_target->width, scene_target->height);
+        vkCmdEndRenderPass(f->cmd);
+
+        // Effect chain: source descriptor moves through ping-pong buffers. When SGSR1 is
+        // first, the first source is low-res and SGSR1 writes full-res output.
+        VkOffscreen* src_offscreen = scene_target;
+        uint32_t dst_idx = (scene_target == &r->offscreen[0]) ? 1u : 0u;
+        for (uint32_t i = 0; i < snap.effect_count; i++) {
+            bool last = (i == snap.effect_count - 1);
+            VkEffectSlot* eff = &snap.effects[i];
+
+            if (last) {
+                rpbi.renderPass = r->pipelines.swapchain_pass;
+                rpbi.framebuffer = r->swapchain_framebuffers[image_index];
+                rpbi.renderArea.extent = r->swapchain_extent;
+            } else {
+                rpbi.renderPass = r->pipelines.offscreen_pass;
+                rpbi.framebuffer = r->offscreen[dst_idx].framebuffer;
+                rpbi.renderArea.extent.width = r->offscreen[dst_idx].width;
+                rpbi.renderArea.extent.height = r->offscreen[dst_idx].height;
+            }
+            vkCmdBeginRenderPass(f->cmd, &rpbi, VK_SUBPASS_CONTENTS_INLINE);
+            uint32_t target_w = last ? r->swapchain_extent.width : rpbi.renderArea.extent.width;
+            uint32_t target_h = last ? r->swapchain_extent.height : rpbi.renderArea.extent.height;
+            run_effect(r, f->cmd, eff, src_offscreen->descriptor_set, target_w, target_h, !last);
+            vkCmdEndRenderPass(f->cmd);
+            if (!last) {
+                src_offscreen = &r->offscreen[dst_idx];
+                dst_idx ^= 1u;
+            }
+        }
+    } else {
+        VkRenderPassBeginInfo rpbi = {VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO};
+        rpbi.renderPass = r->pipelines.swapchain_pass;
+        rpbi.framebuffer = r->swapchain_framebuffers[image_index];
+        rpbi.renderArea.extent = r->swapchain_extent;
+        rpbi.clearValueCount = 1;
+        rpbi.pClearValues = &clear;
+        vkCmdBeginRenderPass(f->cmd, &rpbi, VK_SUBPASS_CONTENTS_INLINE);
+        draw_scene_pass(r, f->cmd, &snap, false,
+                        r->swapchain_extent.width, r->swapchain_extent.height);
+        vkCmdEndRenderPass(f->cmd);
+    }
+
+    // Blit the final composited image (in PRESENT_SRC after the render pass) into the encoder image.
+    if (rec_this_frame) {
+        VkImage disp_img = r->swapchain_images[image_index];
+        VkImage rec_img  = r->rec.images[rec_index];
+        vkr_image_barrier(f->cmd, disp_img,
+                          VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                          VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+                          VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
+        vkr_image_barrier(f->cmd, rec_img,
+                          VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+                          VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+                          0, VK_ACCESS_TRANSFER_WRITE_BIT);
+
+        VkImageBlit blit = {0};
+        blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        blit.srcSubresource.layerCount = 1;
+        blit.srcOffsets[1].x = (int32_t)r->swapchain_extent.width;
+        blit.srcOffsets[1].y = (int32_t)r->swapchain_extent.height;
+        blit.srcOffsets[1].z = 1;
+        blit.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        blit.dstSubresource.layerCount = 1;
+        blit.dstOffsets[1].x = (int32_t)r->rec.extent.width;
+        blit.dstOffsets[1].y = (int32_t)r->rec.extent.height;
+        blit.dstOffsets[1].z = 1;
+        vkCmdBlitImage(f->cmd, disp_img, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                       rec_img, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit, VK_FILTER_LINEAR);
+
+        vkr_image_barrier(f->cmd, disp_img,
+                          VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+                          VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
+                          VK_ACCESS_TRANSFER_READ_BIT, 0);
+
+        // Record UI: blend the overlay over the game, else just transition to presentable.
+        bool do_ui = r->rec.ui_enabled && r->rec.fb_built && r->rec.ui_pipeline
+                     && r->rec.ui_texture && r->rec.ui_texture->ready
+                     && rec_index < r->rec.image_count && r->rec.framebuffers[rec_index];
+        if (do_ui) {
+            vkr_image_barrier(f->cmd, rec_img,
+                              VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+                              VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                              VK_ACCESS_TRANSFER_WRITE_BIT,
+                              VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT);
+            VkRenderPassBeginInfo rp = {VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO};
+            rp.renderPass = r->rec.ui_pass;
+            rp.framebuffer = r->rec.framebuffers[rec_index];
+            rp.renderArea.extent = r->rec.extent;
+            vkCmdBeginRenderPass(f->cmd, &rp, VK_SUBPASS_CONTENTS_INLINE);
+            vkCmdBindPipeline(f->cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, r->rec.ui_pipeline);
+            VkViewport vp = {0, 0, (float)r->rec.extent.width, (float)r->rec.extent.height, 0.0f, 1.0f};
+            VkRect2D scr = {{0, 0}, {r->rec.extent.width, r->rec.extent.height}};
+            vkCmdSetViewport(f->cmd, 0, 1, &vp);
+            vkCmdSetScissor(f->cmd, 0, 1, &scr);
+            float pc[6] = {(float)r->rec.extent.width, (float)r->rec.extent.height, 0.0f, 0.0f, 0.0f, 0.0f};
+            vkCmdPushConstants(f->cmd, r->pipelines.effect_layout, VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(pc), pc);
+            vkCmdBindDescriptorSets(f->cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, r->pipelines.effect_layout,
+                                    0, 1, &r->rec.ui_texture->descriptor_set, 0, NULL);
+            vkCmdDraw(f->cmd, 3, 1, 0, 0);
+            vkCmdEndRenderPass(f->cmd); // leaves rec image in PRESENT_SRC
+        } else {
+            vkr_image_barrier(f->cmd, rec_img,
+                              VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+                              VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
+                              VK_ACCESS_TRANSFER_WRITE_BIT, 0);
+        }
+    }
+
+    vkEndCommandBuffer(f->cmd);
+
+    // The mirror's acquire/present-ready semaphores are appended only when capturing this frame.
+    VkPipelineStageFlags wait_stages[2] = {
+        VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT };
+    VkSemaphore wait_sems[2] = { f->image_available, r->rec.acquire[r->frame_index] };
+    VkSemaphore signal_sems[2] = {
+        render_finished, rec_this_frame ? r->rec.present_ready[rec_index] : VK_NULL_HANDLE };
+    VkSubmitInfo si = {VK_STRUCTURE_TYPE_SUBMIT_INFO};
+    si.waitSemaphoreCount = rec_this_frame ? 2u : 1u;
+    si.pWaitSemaphores = wait_sems;
+    si.pWaitDstStageMask = wait_stages;
+    si.commandBufferCount = 1;
+    si.pCommandBuffers = &f->cmd;
+    si.signalSemaphoreCount = rec_this_frame ? 2u : 1u;
+    si.pSignalSemaphores = signal_sems;
+
+    pthread_mutex_lock(&r->queue_mutex);
+    VkResult sr = vkQueueSubmit(r->graphics_queue, 1, &si, f->in_flight);
+    pthread_mutex_unlock(&r->queue_mutex);
+    if (sr != VK_SUCCESS) {
+        VK_LOGE("vkQueueSubmit -> %d", sr);
+        // The frame fence was reset before submit. If submit fails, nothing will ever signal
+        // it, so restore a signaled fence before returning or the next frame can block forever.
+        vkDestroyFence(r->device, f->in_flight, NULL);
+        VkFenceCreateInfo rfi = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
+        rfi.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+        if (vkCreateFence(r->device, &rfi, NULL, &f->in_flight) != VK_SUCCESS) {
+            f->in_flight = VK_NULL_HANDLE;
+            VK_LOGE("Failed to recreate frame fence after submit failure");
+        }
+        pthread_mutex_unlock(&r->render_mutex);
+        return false;
+    }
+
+    VkPresentInfoKHR pi = {VK_STRUCTURE_TYPE_PRESENT_INFO_KHR};
+    pi.waitSemaphoreCount = 1;
+    pi.pWaitSemaphores = &render_finished;
+    pi.swapchainCount = 1;
+    pi.pSwapchains = &r->swapchain;
+    pi.pImageIndices = &image_index;
+
+    pthread_mutex_lock(&r->queue_mutex);
+    VkResult pr = vkQueuePresentKHR(r->graphics_queue, &pi);
+    // Present the mirror separately so its result doesn't disturb the display recreate logic below.
+    if (rec_this_frame) {
+        VkPresentInfoKHR rpi = {VK_STRUCTURE_TYPE_PRESENT_INFO_KHR};
+        rpi.waitSemaphoreCount = 1;
+        rpi.pWaitSemaphores = &r->rec.present_ready[rec_index];
+        rpi.swapchainCount = 1;
+        rpi.pSwapchains = &r->rec.swapchain;
+        rpi.pImageIndices = &rec_index;
+        VkResult rpr = vkQueuePresentKHR(r->graphics_queue, &rpi);
+        if (rpr != VK_SUCCESS && rpr != VK_SUBOPTIMAL_KHR) {
+            r->rec.disabled = true;
+            VK_LOGW("record: mirror present failed (%d); capture disabled", rpr);
+        }
+    }
+    pthread_mutex_unlock(&r->queue_mutex);
+
+    bool present_suboptimal = (pr == VK_SUBOPTIMAL_KHR) && !r->ignore_suboptimal;
+    if (recreate_after_present || pr == VK_ERROR_OUT_OF_DATE_KHR || present_suboptimal) {
+        r->surface_ready = false;
+        pthread_mutex_lock(&r->queue_mutex);
+        vkQueueWaitIdle(r->graphics_queue);
+        pthread_mutex_unlock(&r->queue_mutex);
+        destroy_swapchain_resources(r);
+        r->surface_ready = create_swapchain(r, r->surface_extent.width, r->surface_extent.height);
+    }
+
+    pthread_mutex_unlock(&r->render_mutex);
+
+    r->frame_index = (r->frame_index + 1) % VK_FRAMES_IN_FLIGHT;
+    r->graveyard_index = (r->graveyard_index + 1) % (VK_FRAMES_IN_FLIGHT + 1);
+
+    return true;
+}
+
+// ============================================================
+// JNI entry points
+// ============================================================
+
+#define JNI_FN(name) Java_com_winlator_cmod_runtime_display_renderer_VulkanRenderer_##name
+
+JNIEXPORT jlong JNICALL JNI_FN(nativeCreate)(JNIEnv* env, jclass clazz,
+                                              jboolean enableValidationLayers,
+                                              jstring driverName,
+                                              jobject context) {
+    (void)clazz;
+    VkRenderer* r = calloc(1, sizeof(VkRenderer));
+    if (!r) return 0;
+    r->target_present_mode = VK_PRESENT_MODE_FIFO_KHR;
+    r->validation_enabled = (enableValidationLayers == JNI_TRUE);
+    pthread_mutex_init(&r->scene_mutex, NULL);
+    pthread_mutex_init(&r->queue_mutex, NULL);
+    pthread_mutex_init(&r->texture_mutex, NULL);
+    pthread_mutex_init(&r->render_mutex, NULL);
+    pthread_mutex_init(&r->descriptor_mutex, NULL);
+
+    const char* driver_name_c = NULL;
+    if (driverName != NULL) driver_name_c = (*env)->GetStringUTFChars(env, driverName, NULL);
+    r->vulkan_handle = winlator_open_vulkan(env, context, driver_name_c);
+    if (driver_name_c != NULL) (*env)->ReleaseStringUTFChars(env, driverName, driver_name_c);
+
+    if (!r->vulkan_handle) {
+        VK_LOGE("winlator_open_vulkan returned NULL");
+        goto fail;
+    }
+    if (!vkd_init(r->vulkan_handle)) {
+        VK_LOGE("vkd_init failed");
+        goto fail;
+    }
+
+    if (!create_instance(r)) goto fail;
+    if (!pick_physical_device(r)) goto fail;
+    if (!create_device(r)) goto fail;
+    query_device_caps(r);
+    if (!create_command_pool(r)) goto fail;
+    if (!create_descriptor_pool(r, r->caps.descriptor_pool_capacity)) goto fail;
+    if (!create_quad_vbo(r)) goto fail;
+    if (!vkr_create_sampler(r, VK_NULL_HANDLE, &r->shared_sampler)) goto fail;
+    {
+        VkSamplerCreateInfo nsi = {VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO};
+        nsi.magFilter = VK_FILTER_NEAREST;
+        nsi.minFilter = VK_FILTER_NEAREST;
+        nsi.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        nsi.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        nsi.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        nsi.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
+        nsi.unnormalizedCoordinates = VK_FALSE;
+        nsi.mipmapMode = VK_SAMPLER_MIPMAP_MODE_NEAREST;
+        if (vkCreateSampler(r->device, &nsi, NULL, &r->shared_sampler_nearest) != VK_SUCCESS) goto fail;
+    }
+    if (r->ext_filter_cubic) {
+        VkSamplerCreateInfo csi = {VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO};
+        csi.magFilter = VK_FILTER_CUBIC_EXT;
+        csi.minFilter = VK_FILTER_LINEAR;
+        csi.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        csi.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        csi.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+        csi.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
+        csi.unnormalizedCoordinates = VK_FALSE;
+        csi.mipmapMode = VK_SAMPLER_MIPMAP_MODE_NEAREST;
+        if (vkCreateSampler(r->device, &csi, NULL, &r->shared_sampler_cubic) != VK_SUCCESS) {
+            r->shared_sampler_cubic = VK_NULL_HANDLE;
+            r->ext_filter_cubic = false;
+        }
+    }
+    if (!vkr_staging_pool_init(r)) goto fail;
+    vkr_suballoc_init(r);
+
+    r->initialized = true;
+    return (jlong)(intptr_t)r;
+
+fail:
+    VK_LOGE("VulkanRenderer init failed");
+    vkr_staging_pool_destroy(r);
+    vkr_suballoc_destroy(r);  // safe if never initialized
+    if (r->shared_sampler) vkDestroySampler(r->device, r->shared_sampler, NULL);
+    if (r->shared_sampler_nearest) vkDestroySampler(r->device, r->shared_sampler_nearest, NULL);
+    if (r->shared_sampler_cubic) vkDestroySampler(r->device, r->shared_sampler_cubic, NULL);
+    if (r->cmd_pool) vkDestroyCommandPool(r->device, r->cmd_pool, NULL);
+    free(r->descriptor_free_list); r->descriptor_free_list = NULL; r->descriptor_free_count = 0;
+    if (r->descriptor_pool) vkDestroyDescriptorPool(r->device, r->descriptor_pool, NULL);
+    if (r->device) vkDestroyDevice(r->device, NULL);
+    destroy_debug_messenger(r);
+    if (r->instance) vkDestroyInstance(r->instance, NULL);
+    vkd_unload();
+    if (r->vulkan_handle) { dlclose(r->vulkan_handle); r->vulkan_handle = NULL; }
+    pthread_mutex_destroy(&r->scene_mutex);
+    pthread_mutex_destroy(&r->queue_mutex);
+    pthread_mutex_destroy(&r->texture_mutex);
+    pthread_mutex_destroy(&r->render_mutex);
+    pthread_mutex_destroy(&r->descriptor_mutex);
+    free(r);
+    return 0;
+}
+
+JNIEXPORT void JNICALL JNI_FN(nativeDestroy)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r) return;
+
+    if (r->device) vkDeviceWaitIdle(r->device);
+
+    // Drain any in-flight uploads and tear down the staging pool before destroying images.
+    vkr_staging_pool_destroy(r);
+
+    for (uint32_t i = 0; i < VK_FRAMES_IN_FLIGHT + 1; i++) {
+        VkTexture** dead = NULL;
+        uint32_t dead_count = 0;
+        detach_graveyard_slot(r, i, &dead, &dead_count);
+        destroy_graveyard_textures(r, dead, dead_count);
+    }
+    vkr_texture_destroy_all_live(r);
+    free(r->live_textures);
+
+    // All textures gone -> all spans returned. Reclaim pooled blocks + batch scratch.
+    vkr_suballoc_destroy(r);
+    free(r->batch_entry_scratch);
+    free(r->batch_prepared_scratch);
+
+    destroy_record_swapchain(r);
+    destroy_sgsr1_resources(r);
+    destroy_offscreen(r);
+    destroy_swapchain(r);
+    destroy_pipelines(r);
+    destroy_quad_vbo(r);
+
+    for (uint32_t i = 0; i < VK_FRAMES_IN_FLIGHT; i++) {
+        VkFrame* f = &r->frames[i];
+        if (f->image_available) vkDestroySemaphore(r->device, f->image_available, NULL);
+        if (f->in_flight)       vkDestroyFence(r->device, f->in_flight, NULL);
+    }
+
+    if (r->shared_sampler) vkDestroySampler(r->device, r->shared_sampler, NULL);
+    if (r->shared_sampler_nearest) vkDestroySampler(r->device, r->shared_sampler_nearest, NULL);
+    if (r->shared_sampler_cubic) vkDestroySampler(r->device, r->shared_sampler_cubic, NULL);
+    if (r->cmd_pool) vkDestroyCommandPool(r->device, r->cmd_pool, NULL);
+    free(r->descriptor_free_list); r->descriptor_free_list = NULL; r->descriptor_free_count = 0;
+    if (r->descriptor_pool) vkDestroyDescriptorPool(r->device, r->descriptor_pool, NULL);
+    if (r->surface) vkDestroySurfaceKHR(r->instance, r->surface, NULL);
+    if (r->anw)     ANativeWindow_release(r->anw);
+    if (r->device)  vkDestroyDevice(r->device, NULL);
+    destroy_debug_messenger(r);
+    if (r->instance)vkDestroyInstance(r->instance, NULL);
+
+    // Clear dispatch BEFORE dlclose so a stray call from another thread faults on NULL
+    // rather than jumping into freed library memory.
+    vkd_unload();
+    if (r->vulkan_handle) { dlclose(r->vulkan_handle); r->vulkan_handle = NULL; }
+
+    pthread_mutex_destroy(&r->scene_mutex);
+    pthread_mutex_destroy(&r->queue_mutex);
+    pthread_mutex_destroy(&r->texture_mutex);
+    pthread_mutex_destroy(&r->render_mutex);
+    pthread_mutex_destroy(&r->descriptor_mutex);
+    free(r);
+}
+
+// Lifecycle helper: take render_mutex (waits for any in-flight render to finish), then
+// briefly take scene_mutex to clear surface_ready so producers see a consistent state.
+// Returns with only render_mutex held; caller must release it.
+static void lifecycle_begin(VkRenderer* r) {
+    pthread_mutex_lock(&r->render_mutex);
+    pthread_mutex_lock(&r->scene_mutex);
+    r->surface_ready = false;
+    pthread_mutex_unlock(&r->scene_mutex);
+}
+
+JNIEXPORT void JNICALL JNI_FN(nativeSurfaceCreated)(JNIEnv* env, jclass clazz, jlong handle, jobject surface) {
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r) return;
+
+    lifecycle_begin(r);
+
+    if (r->surface) {
+        vkDeviceWaitIdle(r->device);
+        destroy_sgsr1_resources(r);
+        destroy_offscreen(r);
+        destroy_swapchain(r);
+        vkDestroySurfaceKHR(r->instance, r->surface, NULL);
+        r->surface = VK_NULL_HANDLE;
+    }
+    if (r->anw) {
+        ANativeWindow_release(r->anw);
+        r->anw = NULL;
+    }
+
+    r->anw = ANativeWindow_fromSurface(env, surface);
+    if (!r->anw) {
+        VK_LOGE("ANativeWindow_fromSurface failed");
+        pthread_mutex_unlock(&r->render_mutex);
+        return;
+    }
+
+    VkAndroidSurfaceCreateInfoKHR aci = {VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR};
+    aci.window = r->anw;
+    if (vkCreateAndroidSurfaceKHR(r->instance, &aci, NULL, &r->surface) != VK_SUCCESS) {
+        VK_LOGE("vkCreateAndroidSurfaceKHR failed");
+        ANativeWindow_release(r->anw);
+        r->anw = NULL;
+        pthread_mutex_unlock(&r->render_mutex);
+        return;
+    }
+
+    VkBool32 supported = VK_FALSE;
+    vkGetPhysicalDeviceSurfaceSupportKHR(r->physical_device, r->graphics_queue_family,
+                                         r->surface, &supported);
+    if (!supported) {
+        VK_LOGE("Selected queue family does not support presentation");
+    }
+
+    // Wait for SurfaceHolder.surfaceChanged() before creating the swapchain. On Android
+    // the surface can be created while the activity is still completing a rotation, so
+    // creating it here can lock in stale portrait dimensions for a landscape launch.
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+JNIEXPORT void JNICALL JNI_FN(nativeSurfaceChanged)(JNIEnv* env, jclass clazz, jlong handle, jint w, jint h) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r || !r->surface) return;
+
+    lifecycle_begin(r);
+    vkDeviceWaitIdle(r->device);
+    destroy_sgsr1_resources(r);
+    destroy_offscreen(r);
+    destroy_swapchain(r);
+    if (!create_swapchain(r, (uint32_t)w, (uint32_t)h)) {
+        VK_LOGE("Swapchain re-create failed in nativeSurfaceChanged");
+    } else {
+        pthread_mutex_lock(&r->scene_mutex);
+        r->surface_ready = true;
+        pthread_mutex_unlock(&r->scene_mutex);
+    }
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+JNIEXPORT jboolean JNICALL JNI_FN(nativeStartRecording)(JNIEnv* env, jclass clazz, jlong handle, jobject surface, jint fps, jboolean recordUI) {
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r || !surface) return JNI_FALSE;
+
+    lifecycle_begin(r);
+
+    jboolean ok = JNI_FALSE;
+    do {
+        if (r->rec.active) { ok = JNI_TRUE; break; }
+
+        ANativeWindow* anw = ANativeWindow_fromSurface(env, surface);
+        if (!anw) { VK_LOGE("record: ANativeWindow_fromSurface failed"); break; }
+        r->rec.anw = anw;
+        r->rec.ui_enabled = (recordUI == JNI_TRUE);
+
+        if (r->device) vkDeviceWaitIdle(r->device);
+
+        // Recreate the display swapchain so its images carry TRANSFER_SRC (the blit source).
+        r->record_blit_src = true;
+        if (r->surface) {
+            destroy_sgsr1_resources(r);
+            destroy_offscreen(r);
+            destroy_swapchain(r);
+            if (!create_swapchain(r, r->surface_extent.width, r->surface_extent.height)) {
+                VK_LOGE("record: display swapchain recreate failed");
+                r->record_blit_src = false;
+                ANativeWindow_release(r->rec.anw); r->rec.anw = NULL;
+                break;
+            }
+        }
+
+        if (!create_record_swapchain(r)) {
+            VK_LOGE("record: create_record_swapchain failed; recording will not capture");
+            r->record_blit_src = false; // revert the display swapchain to its plain usage
+            if (r->surface) {
+                destroy_sgsr1_resources(r);
+                destroy_offscreen(r);
+                destroy_swapchain(r);
+                create_swapchain(r, r->surface_extent.width, r->surface_extent.height);
+            }
+            break;
+        }
+
+        r->rec.active = true;
+        r->rec.disabled = false;
+        r->rec.captured = 0;
+        r->rec.skipped = 0;
+        r->rec.min_interval_ns = (fps > 0) ? (uint64_t)(1000000000.0 / (double)fps) : 0;
+        r->rec.last_capture_ns = 0;
+        ok = JNI_TRUE;
+        VK_LOGI("record: started (display %ux%u -> mirror %ux%u @%dfps)",
+                r->swapchain_extent.width, r->swapchain_extent.height,
+                r->rec.extent.width, r->rec.extent.height, (int)fps);
+    } while (0);
+
+    pthread_mutex_lock(&r->scene_mutex);
+    r->surface_ready = (r->swapchain != VK_NULL_HANDLE);
+    pthread_mutex_unlock(&r->scene_mutex);
+    pthread_mutex_unlock(&r->render_mutex);
+    return ok;
+}
+
+JNIEXPORT void JNICALL JNI_FN(nativeStopRecording)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r) return;
+
+    lifecycle_begin(r);
+    if (r->device) vkDeviceWaitIdle(r->device);
+
+    destroy_record_swapchain(r);
+
+    if (r->record_blit_src) {
+        r->record_blit_src = false;
+        if (r->surface) {
+            destroy_sgsr1_resources(r);
+            destroy_offscreen(r);
+            destroy_swapchain(r);
+            if (!create_swapchain(r, r->surface_extent.width, r->surface_extent.height)) {
+                VK_LOGE("record: display swapchain restore failed after stop");
+            }
+        }
+    }
+
+    pthread_mutex_lock(&r->scene_mutex);
+    r->surface_ready = (r->swapchain != VK_NULL_HANDLE);
+    pthread_mutex_unlock(&r->scene_mutex);
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+// Upload the latest overlay snapshot (direct ByteBuffer of BGRA pixels) for the Record UI composite.
+JNIEXPORT void JNICALL JNI_FN(nativeUpdateRecordUITexture)(JNIEnv* env, jclass clazz, jlong handle,
+                                                          jobject buffer, jint w, jint h) {
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r || !buffer || w <= 0 || h <= 0) return;
+    void* data = (*env)->GetDirectBufferAddress(env, buffer);
+    jlong cap = (*env)->GetDirectBufferCapacity(env, buffer);
+    if (!data || cap < (jlong)w * (jlong)h * 4) return;
+
+    pthread_mutex_lock(&r->render_mutex);
+    if (r->rec.active && r->rec.ui_enabled) {
+        size_t bytes = (size_t)w * (size_t)h * 4u;
+        if (r->rec.ui_texture == NULL
+            || r->rec.ui_texture->width != (uint32_t)w
+            || r->rec.ui_texture->height != (uint32_t)h) {
+            if (r->rec.ui_texture) { vkr_texture_destroy(r, r->rec.ui_texture); r->rec.ui_texture = NULL; }
+            r->rec.ui_texture = vkr_texture_create_uploaded(r, (uint32_t)w, (uint32_t)h, data, bytes, (uint32_t)w);
+        } else {
+            vkr_texture_update(r, r->rec.ui_texture, (uint32_t)w, (uint32_t)h, data, bytes,
+                               (uint32_t)w, 0, 0, (uint32_t)w, (uint32_t)h);
+        }
+    }
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+// Dimensions of the composited image (swapchain extent), which differ from the SurfaceView size
+// under display rotation; the encoder is sized to these so the capture isn't squished.
+JNIEXPORT jint JNICALL JNI_FN(nativeGetRecordWidth)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    return (r != NULL) ? (jint)r->swapchain_extent.width : 0;
+}
+
+JNIEXPORT jint JNICALL JNI_FN(nativeGetRecordHeight)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    return (r != NULL) ? (jint)r->swapchain_extent.height : 0;
+}
+
+// Clockwise degrees to rotate the recording for upright playback (undoes the display preTransform).
+JNIEXPORT jint JNICALL JNI_FN(nativeGetRecordOrientationHint)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (r == NULL) return 0;
+    switch (r->swapchain_transform) {
+        case VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR:  return 270;
+        case VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR: return 180;
+        case VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR: return 90;
+        default: return 0;
+    }
+}
+
+JNIEXPORT void JNICALL JNI_FN(nativeSurfaceDestroyed)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r) return;
+
+    lifecycle_begin(r);
+
+    if (r->device) vkDeviceWaitIdle(r->device);
+    destroy_sgsr1_resources(r);
+    destroy_offscreen(r);
+    destroy_swapchain(r);
+    if (r->surface) {
+        vkDestroySurfaceKHR(r->instance, r->surface, NULL);
+        r->surface = VK_NULL_HANDLE;
+    }
+    if (r->anw) {
+        ANativeWindow_release(r->anw);
+        r->anw = NULL;
+    }
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+JNIEXPORT jboolean JNICALL JNI_FN(nativeRenderFrame)(JNIEnv* env, jclass clazz, jlong handle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r || !r->surface_ready) return JNI_FALSE;
+    return record_and_submit_frame(r) ? JNI_TRUE : JNI_FALSE;
+}
+
+// Scene byte buffer layout (must mirror VulkanRenderer.java offsets). Native-endian, packed.
+// Using a single direct ByteBuffer instead of 6 separate jarray params avoids per-frame JNI
+// critical regions (each ~3-8µs on ART) and the temporary array shadow allocations they
+// trigger.
+#define SCENE_OFF_CURSOR_HANDLE      0
+#define SCENE_OFF_WINDOW_HANDLES     8        /* int64 × VK_MAX_RENDERABLE_WINDOWS */
+#define SCENE_OFF_WINDOW_COUNT       520
+#define SCENE_OFF_CURSOR_VISIBLE     524
+#define SCENE_OFF_CURSOR_GEOM        528      /* int32 × 4 */
+#define SCENE_OFF_XFORM              544      /* float32 × 6 */
+#define SCENE_OFF_VIEWPORT           568      /* int32 × 4 */
+#define SCENE_OFF_SCISSOR_ENABLED    584
+#define SCENE_OFF_SCISSOR            588      /* int32 × 4 */
+#define SCENE_OFF_SCREEN_W           604
+#define SCENE_OFF_SCREEN_H           608
+#define SCENE_OFF_EFFECT_COUNT       612
+#define SCENE_OFF_EFFECT_TYPES       616      /* int32 × VK_MAX_EFFECTS */
+#define SCENE_OFF_EFFECT_PARAMS      648      /* float32 × VK_MAX_EFFECTS × 4 */
+#define SCENE_OFF_WINDOW_GEOM        776      /* int32 × VK_MAX_RENDERABLE_WINDOWS × 4 */
+#define SCENE_OFF_WINDOW_UV          1800     /* float32 × VK_MAX_RENDERABLE_WINDOWS × 4 */
+#define SCENE_OFF_SWAP_RB            2824
+#define SCENE_OFF_SOURCE_W           2828
+#define SCENE_OFF_SOURCE_H           2832
+#define SCENE_BUF_SIZE               2836
+
+JNIEXPORT void JNICALL JNI_FN(nativeSetScene)(JNIEnv* env, jclass clazz, jlong handle,
+                                              jobject sceneBuf)
+{
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r || !sceneBuf) return;
+
+    const uint8_t* base = (const uint8_t*)(*env)->GetDirectBufferAddress(env, sceneBuf);
+    if (!base) return;
+    // Defensive: a future Java-side layout change with a stale SCENE_BUF_SIZE would silently
+    // read past the buffer here. GetDirectBufferCapacity is one JNI call; cheap insurance.
+    jlong cap = (*env)->GetDirectBufferCapacity(env, sceneBuf);
+    if (cap < SCENE_BUF_SIZE) {
+        VK_LOGE("nativeSetScene: scene buffer too small (%lld < %d)",
+                (long long)cap, SCENE_BUF_SIZE);
+        return;
+    }
+
+    pthread_mutex_lock(&r->scene_mutex);
+    VkScene* s = &r->scene;
+
+    // Windows
+    int32_t window_count;
+    memcpy(&window_count, base + SCENE_OFF_WINDOW_COUNT, sizeof(int32_t));
+    if (window_count < 0) window_count = 0;
+    if (window_count > VK_MAX_RENDERABLE_WINDOWS) window_count = VK_MAX_RENDERABLE_WINDOWS;
+    s->window_count = (uint32_t)window_count;
+    for (int32_t i = 0; i < window_count; i++) {
+        VkRenderableWindow* w = &s->windows[i];
+        int64_t h64;
+        memcpy(&h64, base + SCENE_OFF_WINDOW_HANDLES + (size_t)i * 8, sizeof(int64_t));
+        w->texture = (VkTexture*)(intptr_t)h64;
+        int32_t g[4];
+        memcpy(g, base + SCENE_OFF_WINDOW_GEOM + (size_t)i * 16, sizeof(g));
+        w->x = g[0];
+        w->y = g[1];
+        w->width  = (uint32_t)g[2];
+        w->height = (uint32_t)g[3];
+        float uv[4];
+        memcpy(uv, base + SCENE_OFF_WINDOW_UV + (size_t)i * 16, sizeof(uv));
+        w->u0 = uv[0];
+        w->v0 = uv[1];
+        w->u1 = uv[2];
+        w->v1 = uv[3];
+        w->direct_scanout = false;
+    }
+
+    // Cursor
+    int32_t cursor_visible;
+    memcpy(&cursor_visible, base + SCENE_OFF_CURSOR_VISIBLE, sizeof(int32_t));
+    s->cursor_visible = cursor_visible != 0;
+    int64_t cursor_h64;
+    memcpy(&cursor_h64, base + SCENE_OFF_CURSOR_HANDLE, sizeof(int64_t));
+    s->cursor_texture = (VkTexture*)(intptr_t)cursor_h64;
+    int32_t cg[4];
+    memcpy(cg, base + SCENE_OFF_CURSOR_GEOM, sizeof(cg));
+    s->cursor_x = cg[0];
+    s->cursor_y = cg[1];
+    s->cursor_width  = (uint32_t)cg[2];
+    s->cursor_height = (uint32_t)cg[3];
+
+    // XForm
+    memcpy(s->xform, base + SCENE_OFF_XFORM, sizeof(float) * 6);
+
+    // Viewport (set bit derived from positive dims, matching the previous semantics)
+    int32_t vp[4];
+    memcpy(vp, base + SCENE_OFF_VIEWPORT, sizeof(vp));
+    s->viewport_x = vp[0];
+    s->viewport_y = vp[1];
+    s->viewport_w = vp[2];
+    s->viewport_h = vp[3];
+    s->viewport_set = (vp[2] > 0 && vp[3] > 0);
+
+    // Scissor — Java sends an explicit enabled flag (replaces the old "scissor==null" check)
+    int32_t scissor_enabled;
+    memcpy(&scissor_enabled, base + SCENE_OFF_SCISSOR_ENABLED, sizeof(int32_t));
+    int32_t sc[4];
+    memcpy(sc, base + SCENE_OFF_SCISSOR, sizeof(sc));
+    s->scissor_x = sc[0];
+    s->scissor_y = sc[1];
+    s->scissor_w = sc[2];
+    s->scissor_h = sc[3];
+    s->scissor_enabled = (scissor_enabled != 0) && (sc[2] > 0) && (sc[3] > 0);
+
+    int32_t screen_w, screen_h;
+    memcpy(&screen_w, base + SCENE_OFF_SCREEN_W, sizeof(int32_t));
+    memcpy(&screen_h, base + SCENE_OFF_SCREEN_H, sizeof(int32_t));
+    s->screen_width  = (uint32_t)screen_w;
+    s->screen_height = (uint32_t)screen_h;
+    int32_t swap_rb;
+    memcpy(&swap_rb, base + SCENE_OFF_SWAP_RB, sizeof(int32_t));
+    s->swap_rb = swap_rb != 0;
+    int32_t source_w, source_h;
+    memcpy(&source_w, base + SCENE_OFF_SOURCE_W, sizeof(int32_t));
+    memcpy(&source_h, base + SCENE_OFF_SOURCE_H, sizeof(int32_t));
+    s->source_width = source_w > 0 ? (uint32_t)source_w : 0;
+    s->source_height = source_h > 0 ? (uint32_t)source_h : 0;
+
+    // Effects
+    int32_t effect_count;
+    memcpy(&effect_count, base + SCENE_OFF_EFFECT_COUNT, sizeof(int32_t));
+    if (effect_count < 0) effect_count = 0;
+    if (effect_count > VK_MAX_EFFECTS) effect_count = VK_MAX_EFFECTS;
+    s->effect_count = (uint32_t)effect_count;
+    for (int32_t i = 0; i < effect_count; i++) {
+        int32_t etype;
+        memcpy(&etype, base + SCENE_OFF_EFFECT_TYPES + (size_t)i * 4, sizeof(int32_t));
+        s->effects[i].type = (VkEffectType)etype;
+        float ep[4];
+        memcpy(ep, base + SCENE_OFF_EFFECT_PARAMS + (size_t)i * 16, sizeof(ep));
+        s->effects[i].mode   = (int)ep[0];
+        s->effects[i].param0 = ep[1];
+        s->effects[i].param1 = ep[2];
+        s->effects[i].param2 = ep[3];
+    }
+
+    pthread_mutex_unlock(&r->scene_mutex);
+    // Offscreen rebuild is handled in record_and_submit_frame under render_mutex; nothing
+    // here needs to touch swapchain-tied resources.
+}
+
+// FPS pacing is enforced by delaying PresentIdleNotify (buffer-release back-pressure) on the
+// Present extension's pacer thread, plus the swapchain present mode + Choreographer-coalesced
+// render requests. The compositor used to run its own sleep+busy-spin here too, which
+// duplicated the pacing and burned CPU; this entry point is kept as a no-op for Java-side
+// ABI compatibility.
+JNIEXPORT void JNICALL JNI_FN(nativeSetFpsLimit)(JNIEnv* env, jclass clazz, jlong handle, jint fps) {
+    (void)env; (void)clazz; (void)handle; (void)fps;
+}
+
+// 0=off/linear, 1=nearest, 2=linear, 3=bicubic (linear fallback when cubic unsupported).
+JNIEXPORT void JNICALL JNI_FN(nativeSetScaleFilter)(JNIEnv* env, jclass clazz, jlong handle, jint mode) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r) return;
+
+    if (r->scale_filter == mode) return;
+
+    pthread_mutex_lock(&r->render_mutex);
+    wait_inflight_frames(r);
+    r->scale_filter = mode;
+    vkr_retarget_shared_sampler(r);
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+// Set the compositor present mode. Java passes 0=FIFO, 1=MAILBOX, 2=IMMEDIATE; anything else
+// is treated as FIFO. Triggers a swapchain rebuild if a surface is currently active so the
+// change takes effect on the next frame.
+JNIEXPORT void JNICALL JNI_FN(nativeSetPresentMode)(JNIEnv* env, jclass clazz, jlong handle, jint mode) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)handle;
+    if (!r) return;
+
+    VkPresentModeKHR vk_mode;
+    switch (mode) {
+        case 1:  vk_mode = VK_PRESENT_MODE_MAILBOX_KHR; break;
+        case 2:  vk_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; break;
+        default: vk_mode = VK_PRESENT_MODE_FIFO_KHR; break;
+    }
+    if (r->target_present_mode == vk_mode) return;
+
+    if (!r->surface) {
+        pthread_mutex_lock(&r->render_mutex);
+        r->target_present_mode = vk_mode;
+        pthread_mutex_unlock(&r->render_mutex);
+        return;
+    }
+    lifecycle_begin(r);
+    r->target_present_mode = vk_mode;
+    if (r->device) vkDeviceWaitIdle(r->device);
+    uint32_t fw = r->surface_extent.width;
+    uint32_t fh = r->surface_extent.height;
+    destroy_sgsr1_resources(r);
+    destroy_offscreen(r);
+    destroy_swapchain(r);
+    if (!create_swapchain(r, fw, fh)) {
+        VK_LOGE("Swapchain re-create failed in nativeSetPresentMode");
+    } else {
+        pthread_mutex_lock(&r->scene_mutex);
+        r->surface_ready = true;
+        pthread_mutex_unlock(&r->scene_mutex);
+    }
+    pthread_mutex_unlock(&r->render_mutex);
+}
+
+// ============================================================
+// JNI entry points for Java Texture / GPUImage
+// ============================================================
+
+#define TEX_FN(name) Java_com_winlator_cmod_runtime_display_renderer_Texture_##name
+#define GPU_FN(name) Java_com_winlator_cmod_runtime_display_renderer_GPUImage_##name
+
+JNIEXPORT jlong JNICALL TEX_FN(nativeAllocate)(JNIEnv* env, jclass clazz, jlong rendererHandle,
+                                               jint width, jint height,
+                                               jobject dataBuffer, jint stridePixels)
+{
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)rendererHandle;
+    if (!r) return 0;
+
+    void* data = NULL;
+    size_t size = 0;
+    if (dataBuffer) {
+        data = (*env)->GetDirectBufferAddress(env, dataBuffer);
+        size = (size_t)(*env)->GetDirectBufferCapacity(env, dataBuffer);
+    }
+    VkTexture* t = vkr_texture_create_uploaded(r, (uint32_t)width, (uint32_t)height,
+                                               data, size, (uint32_t)stridePixels);
+    return (jlong)(intptr_t)t;
+}
+
+JNIEXPORT jboolean JNICALL TEX_FN(nativeUpdate)(JNIEnv* env, jclass clazz, jlong rendererHandle,
+                                                jlong texHandle, jint width, jint height,
+                                                jobject dataBuffer, jint stridePixels,
+                                                jint dirtyX, jint dirtyY,
+                                                jint dirtyWidth, jint dirtyHeight)
+{
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)rendererHandle;
+    VkTexture* t = (VkTexture*)(intptr_t)texHandle;
+    if (!r || !t || !dataBuffer) return JNI_FALSE;
+    void* data = (*env)->GetDirectBufferAddress(env, dataBuffer);
+    size_t size = (size_t)(*env)->GetDirectBufferCapacity(env, dataBuffer);
+    return vkr_texture_update(r, t, (uint32_t)width, (uint32_t)height, data, size,
+                              (uint32_t)stridePixels,
+                              dirtyX < 0 ? 0 : (uint32_t)dirtyX,
+                              dirtyY < 0 ? 0 : (uint32_t)dirtyY,
+                              dirtyWidth < 0 ? 0 : (uint32_t)dirtyWidth,
+                               dirtyHeight < 0 ? 0 : (uint32_t)dirtyHeight)
+        ? JNI_TRUE : JNI_FALSE;
+}
+
+// Grow-only scratch for parsed batch entries. Render-thread-only, so unlocked; every element
+// is fully populated before use, so no zeroing. (Mirrors get_prepared_scratch in vk_image.c.)
+static VkTextureBatchUpload* get_entry_scratch(VkRenderer* r, uint32_t count) {
+    if (r->batch_entry_cap < count) {
+        uint32_t new_cap = r->batch_entry_cap ? r->batch_entry_cap : 64;
+        while (new_cap < count) new_cap *= 2;
+        VkTextureBatchUpload* p = realloc(r->batch_entry_scratch,
+                                          (size_t)new_cap * sizeof(VkTextureBatchUpload));
+        if (!p) return NULL;
+        r->batch_entry_scratch = p;
+        r->batch_entry_cap = new_cap;
+    }
+    return r->batch_entry_scratch;
+}
+
+JNIEXPORT jboolean JNICALL TEX_FN(nativeBatchUpdate)(JNIEnv* env, jclass clazz, jlong rendererHandle,
+                                                     jobject entriesBuffer,
+                                                     jobjectArray dataBuffers,
+                                                     jint count)
+{
+    (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)rendererHandle;
+    if (!r || !entriesBuffer || !dataBuffers || count <= 0) return JNI_FALSE;
+
+    const uint8_t* base = (const uint8_t*)(*env)->GetDirectBufferAddress(env, entriesBuffer);
+    jlong cap = (*env)->GetDirectBufferCapacity(env, entriesBuffer);
+    if (!base || cap < (jlong)count * 48) return JNI_FALSE;
+    jsize buffer_count = (*env)->GetArrayLength(env, dataBuffers);
+    if (buffer_count < count) return JNI_FALSE;
+
+    VkTextureBatchUpload* uploads = get_entry_scratch(r, (uint32_t)count);
+    if (!uploads) return JNI_FALSE;
+
+    for (jint i = 0; i < count; i++) {
+        const uint8_t* e = base + (size_t)i * 48;
+        int64_t tex_h;
+        int32_t width, height, stride, dirty_x, dirty_y, dirty_w, dirty_h, data_index;
+        memcpy(&tex_h, e, sizeof(tex_h));
+        memcpy(&width, e + 8, sizeof(width));
+        memcpy(&height, e + 12, sizeof(height));
+        memcpy(&stride, e + 16, sizeof(stride));
+        memcpy(&dirty_x, e + 20, sizeof(dirty_x));
+        memcpy(&dirty_y, e + 24, sizeof(dirty_y));
+        memcpy(&dirty_w, e + 28, sizeof(dirty_w));
+        memcpy(&dirty_h, e + 32, sizeof(dirty_h));
+        memcpy(&data_index, e + 36, sizeof(data_index));
+        if (data_index < 0 || data_index >= buffer_count) {
+            return JNI_FALSE;
+        }
+
+        jobject data_buffer = (*env)->GetObjectArrayElement(env, dataBuffers, data_index);
+        if (!data_buffer) {
+            return JNI_FALSE;
+        }
+        void* data = (*env)->GetDirectBufferAddress(env, data_buffer);
+        jlong data_size = (*env)->GetDirectBufferCapacity(env, data_buffer);
+        (*env)->DeleteLocalRef(env, data_buffer);
+        if (!data || data_size <= 0) {
+            return JNI_FALSE;
+        }
+
+        uploads[i].texture = (VkTexture*)(intptr_t)tex_h;
+        uploads[i].data = data;
+        uploads[i].data_size = (size_t)data_size;
+        uploads[i].width = width < 0 ? 0u : (uint32_t)width;
+        uploads[i].height = height < 0 ? 0u : (uint32_t)height;
+        uploads[i].stride_pixels = stride < 0 ? 0u : (uint32_t)stride;
+        uploads[i].dirty_x = dirty_x < 0 ? 0u : (uint32_t)dirty_x;
+        uploads[i].dirty_y = dirty_y < 0 ? 0u : (uint32_t)dirty_y;
+        uploads[i].dirty_w = dirty_w < 0 ? 0u : (uint32_t)dirty_w;
+        uploads[i].dirty_h = dirty_h < 0 ? 0u : (uint32_t)dirty_h;
+    }
+
+    bool ok = vkr_texture_batch_update(r, uploads, (uint32_t)count);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL TEX_FN(nativeDestroy)(JNIEnv* env, jclass clazz, jlong rendererHandle, jlong texHandle) {
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)rendererHandle;
+    VkTexture* t = (VkTexture*)(intptr_t)texHandle;
+    if (!r || !t) return;
+    vkr_texture_schedule_destroy(r, t);
+}
+
+JNIEXPORT jlong JNICALL GPU_FN(nativeImportAhbToVulkan)(JNIEnv* env, jclass clazz,
+                                                       jlong rendererHandle, jlong ahbPtr,
+                                                       jboolean transferOwnership)
+{
+    (void)env; (void)clazz;
+    VkRenderer* r = (VkRenderer*)(intptr_t)rendererHandle;
+    AHardwareBuffer* ahb = (AHardwareBuffer*)(intptr_t)ahbPtr;
+    if (!r || !ahb) {
+        VK_LOGW("nativeImportAhbToVulkan skipped: renderer=%p ahb=%p", (void*)r, (void*)ahb);
+        return 0;
+    }
+    VkTexture* t = vkr_texture_import_ahb(r, ahb, transferOwnership);
+    if (!t) {
+        VK_LOGW("nativeImportAhbToVulkan failed: ahb=%p transfer=%d", (void*)ahb, transferOwnership);
+    }
+    return (jlong)(intptr_t)t;
+}
diff --git a/app/src/main/cpp/winlator/vk/vk_state.h b/app/src/main/cpp/winlator/vk/vk_state.h
new file mode 100644
index 000000000..0eae82af5
--- /dev/null
+++ b/app/src/main/cpp/winlator/vk/vk_state.h
@@ -0,0 +1,520 @@
+// Master state header for the Vulkan compositor.
+// Internal use only — JNI entry points expose a long handle that wraps VkRenderer*.
+
+#pragma once
+
+#include <android/hardware_buffer.h>
+#include <android/log.h>
+#include <android/native_window.h>
+#include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+// All vk* calls route through the dispatch table — vk_dispatch.h is the Vulkan header for
+// this translation unit (do not include <vulkan/vulkan.h> directly).
+#include "vk_dispatch.h"
+
+#define VK_LOG_TAG "VkRenderer"
+#define VK_LOGI(...) __android_log_print(ANDROID_LOG_INFO,  VK_LOG_TAG, __VA_ARGS__)
+#define VK_LOGW(...) __android_log_print(ANDROID_LOG_WARN,  VK_LOG_TAG, __VA_ARGS__)
+#define VK_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, VK_LOG_TAG, __VA_ARGS__)
+
+#define VK_FRAMES_IN_FLIGHT 2
+#define VK_MAX_SWAPCHAIN_IMAGES 8
+// Encoder input-surface swapchains can expose many more images than a display swapchain.
+#define VK_MAX_RECORD_IMAGES 32
+#define VK_MAX_EFFECTS 8
+#define VK_MAX_RENDERABLE_WINDOWS 64
+// Number of in-flight upload slots. Each slot owns a persistently-mapped staging buffer,
+// fence, and command pool. An upload only blocks when this many uploads are still pending
+// on the GPU — with 8 slots and ~100µs GPU upload time, we can sustain ~80k uploads/sec
+// without ever waiting.
+#define VK_STAGING_POOL_SIZE 8
+
+#define VK_CHECK(expr) do { \
+    VkResult _r = (expr); \
+    if (_r != VK_SUCCESS) { \
+        VK_LOGE("%s:%d: %s -> %d", __FILE__, __LINE__, #expr, _r); \
+    } \
+} while (0)
+
+// ============================================================
+// Texture (drives both regular CPU-uploaded images and AHB imports)
+// ============================================================
+
+// A CPU-uploaded texture's slice of an image sub-allocator block (defined below).
+struct VkMemBlock;
+typedef struct VkSuballoc {
+    struct VkMemBlock* block;        // owning block (NULL => not sub-allocated)
+    VkDeviceMemory     memory;       // == block->memory, cached for vkBindImageMemory
+    VkDeviceSize       bind_offset;  // aligned offset the image is bound at
+    VkDeviceSize       span_offset;  // reserved span start/length, returned on free
+    VkDeviceSize       span_size;
+} VkSuballoc;
+
+typedef struct VkTexture {
+    VkImage image;
+    VkImageView view;
+    VkDeviceMemory memory;
+    VkSampler sampler;                  // owned per-texture (simple); could be cached
+    VkSamplerYcbcrConversion ycbcr;     // VK_NULL_HANDLE if unused
+    VkDescriptorSet descriptor_set;     // one per texture, lives until destruction
+
+    uint32_t width;
+    uint32_t height;
+    VkFormat format;
+    VkImageLayout layout;
+
+    // Lifetime: when set, owned by texture and freed on destroy.
+    AHardwareBuffer* ahb;
+
+    // Track readiness: true once image+view+sampler are valid.
+    bool ready;
+    // True if this texture should never be uploaded to (e.g. AHB scanout).
+    bool external;
+    // Prevent duplicate deferred frees if Java schedules destruction more than once.
+    bool destroy_scheduled;
+
+    // suballocated: backing comes from the shared sub-allocator (suballoc) and `memory` is
+    // unused. AHB imports and the dedicated fallback leave this false.
+    bool       suballocated;
+    VkSuballoc suballoc;
+} VkTexture;
+
+typedef struct VkTextureBatchUpload {
+    VkTexture* texture;
+    const void* data;
+    size_t data_size;
+    uint32_t width;
+    uint32_t height;
+    uint32_t stride_pixels;
+    uint32_t dirty_x;
+    uint32_t dirty_y;
+    uint32_t dirty_w;
+    uint32_t dirty_h;
+} VkTextureBatchUpload;
+
+// ============================================================
+// Effects
+// ============================================================
+
+typedef enum VkEffectType {
+    VK_EFFECT_CRT = 0,
+    VK_EFFECT_VIVID = 1,
+    VK_EFFECT_HDR = 2,
+    VK_EFFECT_NATURAL = 3,
+    VK_EFFECT_SGSR1 = 4,
+    VK_EFFECT_TOON = 5,
+    VK_EFFECT_NTSC = 6,
+    VK_EFFECT_COLORADJ = 7,
+    VK_EFFECT_COLORGRADE = 8,
+    VK_EFFECT_SHARPEN = 9,
+    VK_EFFECT_SCANLINES = 10,
+    VK_EFFECT_NTSC2 = 11,
+    VK_EFFECT_COLORBLIND = 12,
+    VK_EFFECT_PIXELATE = 13,
+    VK_EFFECT_COUNT
+} VkEffectType;
+
+typedef struct VkEffectSlot {
+    VkEffectType type;
+    int          mode;     // effect-specific mode
+    float        param0;   // generic
+    float        param1;
+    float        param2;   // generic
+} VkEffectSlot;
+
+// ============================================================
+// Scene snapshot (mutex-protected, written from Java threads, read on render thread)
+// ============================================================
+
+typedef struct VkRenderableWindow {
+    VkTexture* texture;        // borrowed; not owned
+    int        x, y;
+    uint32_t   width, height;
+    float      u0, v0, u1, v1;
+    bool       direct_scanout; // hint, currently unused
+} VkRenderableWindow;
+
+typedef struct VkScene {
+    VkRenderableWindow windows[VK_MAX_RENDERABLE_WINDOWS];
+    uint32_t           window_count;
+
+    VkTexture* cursor_texture;
+    int        cursor_x;
+    int        cursor_y;
+    uint32_t   cursor_width;
+    uint32_t   cursor_height;
+    bool       cursor_visible;
+
+    // Transform parameters - tmpXForm2 of GLRenderer applied to all windows.
+    float xform[6];
+    bool  scissor_enabled;
+    int   scissor_x, scissor_y, scissor_w, scissor_h;
+    int   viewport_x, viewport_y, viewport_w, viewport_h;
+    bool  viewport_set;
+
+    // Render dims (logical screen size).
+    uint32_t screen_width;
+    uint32_t screen_height;
+    uint32_t source_width;
+    uint32_t source_height;
+    bool     swap_rb;
+
+    VkEffectSlot effects[VK_MAX_EFFECTS];
+    uint32_t     effect_count;
+
+    bool dirty;
+} VkScene;
+
+// ============================================================
+// Pipelines - one per shader pass type
+// ============================================================
+
+typedef struct VkPipelineSet {
+    VkDescriptorSetLayout sampler_set_layout;
+    VkPipelineLayout      window_layout;     // push constants: xform[6] + viewSize
+    VkPipelineLayout      effect_layout;     // push constants: resolution + effect params
+    VkPipeline            window_pipeline;
+    VkPipeline            cursor_pipeline;
+    VkPipeline            blit_pipeline;
+    VkPipeline            effect_pipelines[VK_EFFECT_COUNT];
+    VkPipeline            offscreen_window_pipeline;
+    VkPipeline            offscreen_cursor_pipeline;
+    VkPipeline            offscreen_blit_pipeline;
+    VkPipeline            offscreen_effect_pipelines[VK_EFFECT_COUNT];
+
+    // Render passes
+    VkRenderPass swapchain_pass;             // load=clear, store=store, final=present
+    VkRenderPass offscreen_pass;             // load=clear, store=store, final=shader-read
+} VkPipelineSet;
+
+// ============================================================
+// Per-frame resources
+// ============================================================
+
+typedef struct VkFrame {
+    VkSemaphore image_available;
+    VkFence     in_flight;
+    VkCommandBuffer cmd;
+} VkFrame;
+
+// ============================================================
+// Offscreen targets (for effect ping-pong)
+// ============================================================
+
+typedef struct VkOffscreen {
+    VkImage         image;
+    VkImageView     view;
+    VkDeviceMemory  memory;
+    VkSampler       sampler;
+    VkDescriptorSet descriptor_set;
+    VkFramebuffer   framebuffer;
+    uint32_t        width, height;
+} VkOffscreen;
+
+typedef struct VkSgsr1State {
+    VkOffscreen source;
+    bool        built;
+    uint32_t    width;
+    uint32_t    height;
+} VkSgsr1State;
+
+// Recording mirror: a second swapchain on a MediaCodec input surface; each frame is blitted from
+// the display swapchain into it and co-presented. Gated on rec.active.
+typedef struct VkRecordSwap {
+    bool             active;
+    bool             disabled;
+    ANativeWindow*   anw;
+    VkSurfaceKHR     surface;
+    VkSwapchainKHR   swapchain;
+    VkFormat         format;
+    VkExtent2D       extent;
+    uint32_t         image_count;
+    VkImage          images[VK_MAX_RECORD_IMAGES];
+    VkSemaphore      acquire[VK_FRAMES_IN_FLIGHT];
+    VkSemaphore      present_ready[VK_MAX_RECORD_IMAGES];
+    uint64_t         captured;
+    uint64_t         skipped;
+    uint64_t         min_interval_ns;
+    uint64_t         last_capture_ns;
+
+    // Record UI: alpha-blend an overlay texture over each captured frame.
+    bool             ui_enabled;
+    VkRenderPass     ui_pass;
+    VkPipeline       ui_pipeline;
+    VkImageView      views[VK_MAX_RECORD_IMAGES];
+    VkFramebuffer    framebuffers[VK_MAX_RECORD_IMAGES];
+    bool             fb_built;
+    struct VkTexture* ui_texture;
+} VkRecordSwap;
+
+// ============================================================
+// Staging pool for async texture uploads
+// ============================================================
+
+typedef struct VkStagingSlot {
+    pthread_mutex_t mutex;        // held by current owner from acquire to release
+    VkCommandPool   cmd_pool;     // exclusive to this slot, no global cmd pool sync needed
+    VkCommandBuffer cmd;
+    VkBuffer        buffer;
+    VkDeviceMemory  memory;
+    void*           mapped;       // persistently mapped HOST_VISIBLE memory
+    VkDeviceSize    size;         // current allocation; grows on demand
+    VkFence         fence;        // signaled when this slot's last submission completes
+} VkStagingSlot;
+
+typedef struct VkStagingPool {
+    VkStagingSlot   slots[VK_STAGING_POOL_SIZE];
+    uint32_t        valid_slots;  // count of slots whose per-slot mutex is initialized
+    uint64_t        next;         // round-robin counter
+    pthread_mutex_t mutex;        // protects `next` only
+    bool            mutex_init;   // pool-mutex initialization flag (for safe destroy)
+    bool            initialized;
+} VkStagingPool;
+
+// ============================================================
+// Deferred destruction graveyard
+// ============================================================
+
+typedef struct VkGraveSlot {
+    VkTexture** textures;
+    uint32_t    count;
+    uint32_t    capacity;
+} VkGraveSlot;
+
+// ============================================================
+// Device caps (queried once after create_device)
+// ============================================================
+
+typedef struct VkDeviceCaps {
+    // Identity
+    uint32_t vendor_id;
+    uint32_t device_id;
+    uint32_t driver_version;
+    bool     is_adreno;             // vendor_id == 0x5143 (Qualcomm)
+
+    // Limits / sizing
+    VkPhysicalDeviceLimits limits;
+    uint32_t descriptor_pool_capacity;
+
+    // Format choices resolved against driver feature support
+    VkFormat offscreen_format;      // BGRA preferred, RGBA fallback
+    VkFormat upload_format;         // BGRA preferred; RGBA fallback uses CPU-side swizzle
+    bool     upload_needs_bgra_swizzle;
+
+    // Diagnostic
+    bool ahb_bgra_supported;        // VK_FORMAT_B8G8R8A8_UNORM importable from AHB
+} VkDeviceCaps;
+
+// ============================================================
+// Image sub-allocator
+// ============================================================
+//
+// CPU-uploaded textures share large DEVICE_LOCAL blocks instead of each taking a dedicated
+// vkAllocateMemory — avoids per-pixmap allocator latency and hitting maxMemoryAllocationCount
+// (~4096 on Adreno) under X-server pixmap churn. Each block has a first-fit free list (offset-
+// sorted, coalesced on free); fully-drained blocks are returned. AHB imports stay dedicated.
+
+#define VK_SUBALLOC_BLOCK_SIZE (32u * 1024u * 1024u)  // 32 MiB default block
+
+typedef struct VkMemRegion {
+    VkDeviceSize        offset;
+    VkDeviceSize        size;
+    struct VkMemRegion* next;       // free list, sorted ascending by offset
+} VkMemRegion;
+
+typedef struct VkMemBlock {
+    VkDeviceMemory     memory;
+    VkDeviceSize       size;
+    uint32_t           memory_type_index;
+    VkMemRegion*       free_list;
+    struct VkMemBlock* next;
+} VkMemBlock;
+
+typedef struct VkImageSuballocator {
+    VkMemBlock*     blocks;
+    VkDeviceSize    block_size;     // size used when carving a new block
+    pthread_mutex_t mutex;          // alloc (producer threads) vs free (render thread)
+    bool            mutex_init;
+} VkImageSuballocator;
+
+// ============================================================
+// Master state
+// ============================================================
+
+typedef struct VkRenderer {
+    // Lifecycle
+    bool initialized;
+    bool surface_ready;
+    // True when we deliberately create a fallback swapchain with a preTransform that differs
+    // from caps.currentTransform (Adreno reports SUBOPTIMAL on every present in that case).
+    bool ignore_suboptimal;
+    pthread_mutex_t scene_mutex;     // guards r->scene + graveyard slots; held briefly by all
+    pthread_mutex_t queue_mutex;     // serializes vkQueueSubmit across threads
+    pthread_mutex_t texture_mutex;   // guards live_textures
+    pthread_mutex_t descriptor_mutex;// external sync for descriptor_pool alloc/free
+    pthread_mutex_t render_mutex;    // serializes lifecycle vs render; held by render thread for
+                                     // the full acquire+record+submit+present, and by lifecycle
+                                     // ops (surface create/change/destroy) before they touch the
+                                     // swapchain. Scene producers do NOT take this — they only
+                                     // touch scene_mutex, so they never stall behind a frame.
+
+    // Instance + physical/logical device
+    // dlopen handle for the libvulkan we resolved through. dlclose'd in nativeDestroy AFTER
+    // vkd_unload() to avoid stale dispatch pointers calling into freed memory.
+    void*            vulkan_handle;
+    VkInstance       instance;
+    bool             validation_enabled;
+    bool             debug_utils_enabled;
+    VkDebugUtilsMessengerEXT debug_messenger;
+    VkPhysicalDevice physical_device;
+    VkPhysicalDeviceMemoryProperties mem_props;
+    uint32_t         graphics_queue_family;
+    VkDevice         device;
+    VkQueue          graphics_queue;
+
+    // Surface + swapchain
+    ANativeWindow*   anw;
+    VkSurfaceKHR     surface;
+    VkSwapchainKHR   swapchain;
+    VkFormat         swapchain_format;
+    VkSurfaceTransformFlagBitsKHR swapchain_transform;
+    VkExtent2D       surface_extent;
+    VkExtent2D       swapchain_extent;
+    uint32_t         swapchain_image_count;
+    VkImage          swapchain_images[VK_MAX_SWAPCHAIN_IMAGES];
+    VkImageView      swapchain_views[VK_MAX_SWAPCHAIN_IMAGES];
+    VkFramebuffer    swapchain_framebuffers[VK_MAX_SWAPCHAIN_IMAGES];
+    VkSemaphore      swapchain_render_finished[VK_MAX_SWAPCHAIN_IMAGES];
+
+    // Pipelines / passes
+    VkPipelineSet    pipelines;
+    bool             pipelines_built;
+
+    // Offscreen ping-pong (created lazily when effects are present)
+    VkOffscreen      offscreen[2];
+    bool             offscreen_built;
+    VkSgsr1State     sgsr1;
+
+    // record_blit_src adds TRANSFER_SRC usage to the display swapchain (toggled by start/stop recording).
+    bool             record_blit_src;
+    VkRecordSwap     rec;
+
+    // Quad vertex buffer (window/cursor)
+    VkBuffer         quad_vbo;
+    VkDeviceMemory   quad_vbo_memory;
+
+    // Shared sampler for all CPU-uploaded textures and AHB textures that don't need a Ycbcr
+    // conversion. Created once at init; vkCreateSampler costs ~50-200µs on Adreno, so giving
+    // every texture its own sampler is a non-trivial CPU+GPU tax during pixmap churn.
+    VkSampler        shared_sampler;
+    VkSampler        shared_sampler_nearest;
+    VkSampler        shared_sampler_cubic;
+    bool             ext_filter_cubic;
+    int              scale_filter;
+
+    // Per-frame
+    VkCommandPool    cmd_pool;
+    VkFrame          frames[VK_FRAMES_IN_FLIGHT];
+    uint32_t         frame_index;
+
+    // Descriptor pool (for texture sampler descriptors)
+    VkDescriptorPool descriptor_pool;
+    uint32_t         descriptor_pool_capacity;
+    uint32_t         descriptor_pool_used;
+    VkDescriptorSet* descriptor_free_list;
+    uint32_t         descriptor_free_count;
+    uint32_t         descriptor_free_capacity;
+
+    // Graveyard
+    VkGraveSlot      graveyard[VK_FRAMES_IN_FLIGHT + 1];
+    uint32_t         graveyard_index;
+
+    // Live native textures owned by this renderer/device. Java Texture objects can outlive a
+    // renderer teardown, so nativeDestroy drains this list before the device is destroyed.
+    VkTexture**      live_textures;
+    uint32_t         live_texture_count;
+    uint32_t         live_texture_capacity;
+
+    // Extensions present
+    bool ext_ahb;
+    bool ext_ycbcr;
+
+    // Cached device capabilities populated by query_device_caps().
+    VkDeviceCaps caps;
+
+    // Function pointers loaded via vkGetDeviceProcAddr (not all are statically exported by
+    // the Android Vulkan loader, even in Vulkan 1.1).
+    PFN_vkGetAndroidHardwareBufferPropertiesANDROID fnGetAhbProps;
+    PFN_vkCreateSamplerYcbcrConversion              fnCreateYcbcr;
+    PFN_vkDestroySamplerYcbcrConversion             fnDestroyYcbcr;
+    PFN_vkCreateDebugUtilsMessengerEXT              fnCreateDebugUtilsMessenger;
+    PFN_vkDestroyDebugUtilsMessengerEXT             fnDestroyDebugUtilsMessenger;
+
+    // Async upload pool (created in nativeCreate after device).
+    VkStagingPool staging_pool;
+
+    // Image sub-allocator for CPU-uploaded textures (created in nativeCreate after device).
+    VkImageSuballocator image_suballoc;
+
+    // Grow-only scratch for the batch upload path (render-thread-only, so unlocked; zero
+    // steady-state heap traffic).
+    VkTextureBatchUpload* batch_entry_scratch;     // nativeBatchUpdate: parsed JNI entries
+    uint32_t              batch_entry_cap;
+    void*                 batch_prepared_scratch;  // vkr_texture_batch_update: PreparedBatchUpload[]
+    uint32_t              batch_prepared_cap;
+
+    // Scene state
+    VkScene scene;
+
+    // Compositor present mode requested by Java (default FIFO). Validated against
+    // device-supported modes in create_swapchain; falls back to FIFO if unavailable.
+    VkPresentModeKHR target_present_mode;
+} VkRenderer;
+
+// ============================================================
+// Public functions implemented in vk_image.c
+// ============================================================
+
+VkTexture* vkr_texture_create_uploaded(VkRenderer* r, uint32_t width, uint32_t height,
+                                       const void* data, size_t data_size, uint32_t stride_pixels);
+bool       vkr_texture_update(VkRenderer* r, VkTexture* tex, uint32_t width, uint32_t height,
+                              const void* data, size_t data_size, uint32_t stride_pixels,
+                              uint32_t dirty_x, uint32_t dirty_y,
+                              uint32_t dirty_w, uint32_t dirty_h);
+bool       vkr_texture_batch_update(VkRenderer* r, const VkTextureBatchUpload* uploads,
+                                    uint32_t upload_count);
+VkTexture* vkr_texture_import_ahb(VkRenderer* r, AHardwareBuffer* ahb, bool transfer_ownership);
+void       vkr_texture_destroy(VkRenderer* r, VkTexture* tex);
+void       vkr_texture_destroy_all_live(VkRenderer* r);
+void       vkr_texture_schedule_destroy(VkRenderer* r, VkTexture* tex);
+
+// Helpers
+uint32_t   vkr_find_memory_type(VkRenderer* r, uint32_t type_bits, VkMemoryPropertyFlags props);
+void       vkr_run_one_shot_cmd(VkRenderer* r, void (*fn)(VkCommandBuffer, void*), void* user);
+void       vkr_image_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout from, VkImageLayout to,
+                             VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
+                             VkAccessFlags src_access, VkAccessFlags dst_access);
+bool       vkr_create_sampler(VkRenderer* r, VkSamplerYcbcrConversion ycbcr, VkSampler* out);
+void       vkr_retarget_shared_sampler(VkRenderer* r);
+// Async layout transition through the staging pool. Submits a tiny command buffer that runs
+// the requested barrier, but does NOT wait for the GPU. The barrier is ordered before all
+// subsequent submits on the same queue per Vulkan spec, so callers can sample the image as
+// soon as the next render submit happens. Returns false on submit failure.
+bool       vkr_submit_async_transition(VkRenderer* r, VkImage image,
+                                       VkImageLayout from, VkImageLayout to,
+                                       VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
+                                       VkAccessFlags src_access, VkAccessFlags dst_access);
+
+// Staging pool — created in nativeCreate, drained + destroyed in nativeDestroy.
+bool            vkr_staging_pool_init(VkRenderer* r);
+void            vkr_staging_pool_destroy(VkRenderer* r);
+VkStagingSlot*  vkr_staging_pool_acquire(VkRenderer* r, VkDeviceSize needed);
+void            vkr_staging_pool_release(VkStagingSlot* slot);
+
+// Image sub-allocator lifecycle (alloc/free are static in vk_image.c). Destroy after all
+// textures are released.
+void            vkr_suballoc_init(VkRenderer* r);
+void            vkr_suballoc_destroy(VkRenderer* r);
diff --git a/app/src/main/cpp/winlator/vulkan.c b/app/src/main/cpp/winlator/vulkan.c
index ea5753f0d..32cd11a5c 100644
--- a/app/src/main/cpp/winlator/vulkan.c
+++ b/app/src/main/cpp/winlator/vulkan.c
@@ -169,54 +169,73 @@ static char *get_library_name(JNIEnv *env, jobject context,
   return library_name;
 }
 
+static void preload_first_existing(const char **candidates) {
+  for (int i = 0; candidates[i]; i++) {
+    if (dlopen(candidates[i], RTLD_GLOBAL | RTLD_NOW))
+      return;
+  }
+}
+
 static void preload_vendor_icd_deps() {
-  // Some OEM Vulkan ICDs (e.g. Samsung's /system_ext/lib64/libvendorutils.so)
-  // declare unresolved refs to OpenSSL symbols like BIO_flush. When the Android
-  // Vulkan loader pulls in the vendor ICD via dlopen, those symbols must already
-  // be visible in a preceding RTLD_GLOBAL library or the dlopen fails with
-  // "cannot locate symbol BIO_flush", and vkCreateInstance returns -9.
-  const char *candidates[] = {
+  // Keep OEM Vulkan ICD dependencies globally visible before the loader pulls
+  // them in, or DXVK can misreport missing VK_KHR_surface.
+  const char *jpeg_candidates[] = {
+      "/system/lib64/libjpeg.so",
+      "/system_ext/lib64/libjpeg.so",
+      "libjpeg.so",
+      NULL,
+  };
+  preload_first_existing(jpeg_candidates);
+
+  const char *crypto_candidates[] = {
       "libcrypto.so",
       NULL,
   };
-  for (int i = 0; candidates[i]; i++) {
-    if (dlopen(candidates[i], RTLD_GLOBAL | RTLD_NOW))
-      break;
-  }
+  preload_first_existing(crypto_candidates);
 }
 
-static void init_original_vulkan() {
+void *winlator_open_system_vulkan(void) {
   preload_vendor_icd_deps();
-  vulkan_handle = dlopen("/system/lib64/libvulkan.so", RTLD_LOCAL | RTLD_NOW);
+  return dlopen("/system/lib64/libvulkan.so", RTLD_LOCAL | RTLD_NOW);
 }
 
-static void init_vulkan(JNIEnv *env, jobject context, const char *driver_name) {
-  char *tmpdir = NULL;
-  char *library_name = NULL;
-  char *native_library_dir = NULL;
+void *winlator_open_vulkan(JNIEnv *env, jobject context, const char *driver_name) {
+  if (!driver_name || strcmp(driver_name, "System") == 0) {
+    return winlator_open_system_vulkan();
+  }
 
-  const char *driver_path = get_driver_path(env, context, driver_name);
+  preload_vendor_icd_deps();
 
+  const char *driver_path = get_driver_path(env, context, driver_name);
   if (!driver_path || access(driver_path, F_OK) != 0) {
-    init_original_vulkan();
-    return;
+    return winlator_open_system_vulkan();
   }
 
-  library_name = get_library_name(env, context, driver_name);
-  native_library_dir = get_native_library_dir(env, context);
+  char *library_name = get_library_name(env, context, driver_name);
+  char *native_library_dir = get_native_library_dir(env, context);
   if (!library_name || !native_library_dir) {
-    init_original_vulkan();
-    return;
+    return winlator_open_system_vulkan();
   }
 
+  char *tmpdir = NULL;
   asprintf(&tmpdir, "%s%s", driver_path, "temp");
   mkdir(tmpdir, S_IRWXU | S_IRWXG);
 
-  vulkan_handle = adrenotools_open_libvulkan(
+  void *handle = adrenotools_open_libvulkan(
       RTLD_LOCAL | RTLD_NOW,
       ADRENOTOOLS_DRIVER_CUSTOM, tmpdir,
       native_library_dir, driver_path, library_name, NULL,
       NULL);
+  if (!handle) return winlator_open_system_vulkan();
+  return handle;
+}
+
+static void init_original_vulkan() {
+  vulkan_handle = winlator_open_system_vulkan();
+}
+
+static void init_vulkan(JNIEnv *env, jobject context, const char *driver_name) {
+  vulkan_handle = winlator_open_vulkan(env, context, driver_name);
 }
 
 static VkResult create_instance(jstring driverName, JNIEnv *env,
diff --git a/app/src/main/cpp/wn-libsteamclient/CMakeLists.txt b/app/src/main/cpp/wn-libsteamclient/CMakeLists.txt
new file mode 100644
index 000000000..4e143966a
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/CMakeLists.txt
@@ -0,0 +1,74 @@
+# wn-libsteamclient — an open-source libsteamclient.so we build ourselves.
+#
+# Background. The Bionic Steam path needs a `libsteamclient.so` to host
+# Valve's Steam client surface in the Android process so Wine's
+# `lsteamclient.dll` (running inside the Proton prefix) has a peer to
+# talk to over the Steam3Master / SteamClientService TCP services. We
+# were bundling a prebuilt copy; this module replaces it with our own
+# from-scratch implementation that exposes the same public C ABI but
+# is backed by the open-source Rust `wnsteam` CM client we already
+# ship.
+#
+# Initial scope (this commit): the FLAT C entry points (CreateInterface
+# + Steam_BLoggedOn + Steam_BGetCallback + the rest of the
+# Steam_*/* pipe + user lifecycle exports) plus a stub ISteamClient
+# whose GetISteam* methods return empty objects. That's enough for the
+# bootstrap's nativeInit to dlopen + dlsym + walk the pipe API without
+# crashing. Real backend wiring lands incrementally.
+#
+# SONAME is `libsteamclient.so` exactly so the staged file at
+# <filesDir>/imagefs/usr/lib/libsteamclient.so behaves as a drop-in.
+
+cmake_minimum_required(VERSION 3.22.1)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# IMPORTANT: the output `.so` name must be `libsteamclient.so` (not
+# `libwnlibsteamclient.so`) because the Wine `lsteamclient.dll` bridge
+# dlopens by that exact name. Use OUTPUT_NAME to override the CMake
+# default (`lib<TARGET>.so`).
+add_library(wn_libsteamclient SHARED
+    src/api_entry.cpp
+    src/callback_registry.cpp
+    src/iclient_engine.cpp
+    src/isteam_client.cpp
+    src/isteam_stubs.cpp
+    src/jni_pushed_state.cpp
+    src/runtime_state.cpp
+    src/tcp_services.cpp
+)
+set_target_properties(wn_libsteamclient PROPERTIES
+    OUTPUT_NAME steamclient
+    PREFIX "lib"
+    SUFFIX ".so"
+)
+
+target_include_directories(wn_libsteamclient PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+target_compile_options(wn_libsteamclient PRIVATE
+    -fno-rtti
+    -fvisibility=hidden
+    -Wall -Wno-unused-parameter
+)
+
+# Mirror the public-ABI NEEDED list of Valve's binary so any consumer
+# that probes our .so against the original sees the same dynamic deps.
+# All of these are part of Android's bionic / NDK; nothing extra.
+target_link_libraries(wn_libsteamclient PRIVATE
+    android log dl m
+    # libwnsteam.so — resolves the wn_cm_* C-ABI bridge symbols at link
+    # time. Both .so's load in the app process; the dynamic linker pairs
+    # the unresolved bridge references in libsteamclient.so to their
+    # default-visibility implementations in libwnsteam.so. Without this
+    # link, --no-undefined fails the link.
+    wnsteam
+)
+
+# Surface unresolved symbols at link time so a missing export shows up
+# in the build, not at dlopen on device.
+target_link_options(wn_libsteamclient PRIVATE
+    -Wl,--no-undefined
+)
diff --git a/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/callback_registry.h b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/callback_registry.h
new file mode 100644
index 000000000..9792a5870
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/callback_registry.h
@@ -0,0 +1,29 @@
+#pragma once
+
+
+#include <cstdint>
+#include <vector>
+
+namespace wn_libsteamclient {
+
+constexpr size_t kCCallbackBaseFlagsOffset    = 8;
+constexpr size_t kCCallbackBaseIdOffset       = 12;
+constexpr uint8_t kCallbackFlagsRegistered    = 0x01;
+constexpr uint8_t kCallbackFlagsGameServer    = 0x02;
+
+void register_callback(void* cb, int iCallback);
+
+void unregister_callback(void* cb);
+
+[[nodiscard]] std::vector<void*> find_callbacks(int iCallback);
+
+[[nodiscard]] size_t registry_size();
+
+
+void register_call_result(void* cb, uint64_t hCall);
+void unregister_call_result(void* cb, uint64_t hCall);
+[[nodiscard]] std::vector<void*> find_call_result_cbs(uint64_t hCall);
+
+[[nodiscard]] size_t call_result_registry_size();
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/callbacks.h b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/callbacks.h
new file mode 100644
index 000000000..b14e2e0f0
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/callbacks.h
@@ -0,0 +1,644 @@
+#pragma once
+
+
+#include <cstdint>
+#include <cstddef>
+
+namespace wn_libsteamclient::callbacks {
+
+constexpr int kSteamServersConnected    = 101;
+constexpr int kSteamServerConnectFailure = 102;
+constexpr int kSteamServersDisconnected = 103;
+constexpr int kIPCFailure               = 117;  // k_iSteamUserCallbacks + 17 — single-byte failure type
+constexpr int kValidateAuthTicketResponse = 143; // k_iSteamUserCallbacks + 43
+constexpr int kEncryptedAppTicketResponse = 154; // k_iSteamUserCallbacks + 54
+constexpr int kGetAuthSessionTicketResponse = 163; // k_iSteamUserCallbacks + 63
+constexpr int kGetTicketForWebApiResponse   = 168; // k_iSteamUserCallbacks + 68
+constexpr int kStoreAuthURLResponse         = 165; // k_iSteamUserCallbacks + 65
+constexpr int kMarketEligibilityResponse    = 166; // k_iSteamUserCallbacks + 66
+constexpr int kDurationControl              = 167; // k_iSteamUserCallbacks + 67
+
+constexpr int kSteamShutdown            = 704;  // k_iSteamUtilsCallbacks + 4 — empty marker
+constexpr int kSteamAPICallCompleted    = 703;  // k_iSteamUtilsCallbacks + 3
+constexpr int kCheckFileSignature       = 705;  // k_iSteamUtilsCallbacks + 5
+constexpr int kLeaderboardFindResult         = 1104; // base + 4
+constexpr int kLeaderboardScoresDownloaded   = 1105; // base + 5
+constexpr int kLeaderboardScoreUploaded      = 1106; // base + 6
+constexpr int kNumberOfCurrentPlayers        = 1107; // base + 7
+constexpr int kGlobalAchievementPercentages  = 1110; // base + 10
+constexpr int kLeaderboardUGCSet             = 1111; // base + 11
+constexpr int kGlobalStatsReceived           = 1112; // base + 12
+constexpr int kClanOfficerListResponse      = 1335; // base + 35
+constexpr int kDownloadClanActivityCountsResult = 1341; // base + 41
+constexpr int kJoinClanChatRoomCompletion   = 1342; // base + 42
+constexpr int kFriendsGetFollowerCount      = 1344;
+constexpr int kFriendsIsFollowing           = 1345;
+constexpr int kFriendsEnumerateFollowingList = 1346;
+constexpr int kEquippedProfileItems         = 1351; // base + 51
+constexpr int kRemoteStorageSubscribePublishedFile   = 1313; // base + 13
+constexpr int kRemoteStorageUnsubscribePublishedFile = 1315; // base + 15
+constexpr int kRemoteStorageDownloadUGC              = 1317; // base + 17
+constexpr int kSteamUGCQueryCompleted        = 3401; // base + 1
+constexpr int kSteamUGCRequestUGCDetails     = 3402; // base + 2
+constexpr int kSteamInventoryEligiblePromoItemDefIDs = 4703;
+constexpr int kSteamInventoryStartPurchaseResult     = 4704;
+constexpr int kSteamInventoryRequestPricesResult     = 4705;
+constexpr int kLobbyEnter                    = 504; // base + 4
+constexpr int kLobbyMatchList                = 510; // base + 10
+constexpr int kLobbyCreated                  = 513; // base + 13
+constexpr int kGameOverlayActivated     = 731;  // k_iSteamUtilsCallbacks + 31 — bool m_bActive
+
+constexpr int kUserStatsReceived = 1101;
+constexpr int kUserStatsStored   = 1102;
+constexpr int kUserAchievementStored = 1103;
+
+constexpr int kPersonaStateChange  = 1304;
+constexpr int kSetPersonaNameResponse = 1332;
+constexpr int kAvatarImageLoaded        = 1334;
+constexpr int kFriendRichPresenceUpdate = 1336;
+
+constexpr int kRemoteStorageAppSyncedClient = 1301;
+constexpr int kRemoteStorageAppSyncedServer = 1302;
+constexpr int kRemoteStorageFileWriteAsyncComplete = 1331; // base+31
+constexpr int kRemoteStorageFileReadAsyncComplete  = 1332; // base+32
+constexpr int kRemoteStorageFileShareResult        = 1307; // base+7
+constexpr int kFileDetailsResult                   = 1063; // 1040 + 23
+
+constexpr int kPersonaChangeName            = 0x0001;
+constexpr int kPersonaChangeStatus          = 0x0002;
+constexpr int kPersonaChangeComeOnline      = 0x0004;
+constexpr int kPersonaChangeGoneOffline     = 0x0008;
+constexpr int kPersonaChangeGamePlayed      = 0x0010;
+constexpr int kPersonaChangeAvatar          = 0x0040;
+constexpr int kPersonaChangeNameFirstSet    = 0x0400;
+constexpr int kPersonaChangeNickname        = 0x1000;
+
+struct UserStatsReceived {
+    uint64_t m_nGameID;
+    int32_t  m_eResult;      // EResult: 1 = OK, 2 = Fail
+    uint32_t _pad;           // pack=8 → uint64 at offset 16
+    uint64_t m_steamIDUser;
+};
+static_assert(sizeof(UserStatsReceived) == 24, "UserStatsReceived size");
+static_assert(offsetof(UserStatsReceived, m_nGameID)     == 0,  "off m_nGameID");
+static_assert(offsetof(UserStatsReceived, m_eResult)     == 8,  "off m_eResult");
+static_assert(offsetof(UserStatsReceived, m_steamIDUser) == 16, "off m_steamIDUser");
+
+struct UserStatsStored {
+    uint64_t m_nGameID;
+    int32_t  m_eResult;
+    uint32_t _pad;           // pack=8 trailing pad
+};
+static_assert(sizeof(UserStatsStored) == 16, "UserStatsStored size");
+static_assert(offsetof(UserStatsStored, m_nGameID) == 0, "off m_nGameID");
+static_assert(offsetof(UserStatsStored, m_eResult) == 8, "off m_eResult");
+
+struct SteamServersConnected {
+    char _placeholder;
+};
+
+struct SteamServerConnectFailure {
+    int32_t m_eResult;
+    bool    m_bStillRetrying;
+    uint8_t _pad[3];
+};
+static_assert(sizeof(SteamServerConnectFailure) == 8, "SteamServerConnectFailure size");
+static_assert(offsetof(SteamServerConnectFailure, m_eResult)        == 0, "off m_eResult");
+static_assert(offsetof(SteamServerConnectFailure, m_bStillRetrying) == 4, "off m_bStillRetrying");
+
+struct IPCFailure {
+    uint8_t m_eFailureType;
+    uint8_t _pad[7];
+};
+static_assert(sizeof(IPCFailure) == 8, "IPCFailure size");
+static_assert(offsetof(IPCFailure, m_eFailureType) == 0, "off m_eFailureType");
+constexpr uint8_t kFailureFlushedCallbackQueue = 0;
+constexpr uint8_t kFailurePipeFail             = 1;
+
+struct SteamShutdown {
+    char _placeholder;
+};
+
+struct GameOverlayActivated {
+    bool   m_bActive;
+    uint8_t _pad[7];
+};
+static_assert(sizeof(GameOverlayActivated) == 8, "GameOverlayActivated size");
+static_assert(offsetof(GameOverlayActivated, m_bActive) == 0, "off m_bActive");
+
+struct EncryptedAppTicketResponse {
+    int32_t m_eResult;
+};
+static_assert(sizeof(EncryptedAppTicketResponse) == 4, "EncryptedAppTicketResponse size");
+static_assert(offsetof(EncryptedAppTicketResponse, m_eResult) == 0, "off m_eResult");
+
+struct GetAuthSessionTicketResponse {
+    uint32_t m_hAuthTicket;
+    int32_t  m_eResult;
+};
+static_assert(sizeof(GetAuthSessionTicketResponse) == 8, "GetAuthSessionTicketResponse size");
+static_assert(offsetof(GetAuthSessionTicketResponse, m_hAuthTicket) == 0, "off m_hAuthTicket");
+static_assert(offsetof(GetAuthSessionTicketResponse, m_eResult)     == 4, "off m_eResult");
+
+struct GetTicketForWebApiResponse {
+    uint32_t m_hAuthTicket;
+    int32_t  m_eResult;
+    int32_t  m_cubTicket;
+    uint8_t  m_rgubTicket[2560];
+};
+static_assert(sizeof(GetTicketForWebApiResponse) == 2572,
+              "GetTicketForWebApiResponse size");
+static_assert(offsetof(GetTicketForWebApiResponse, m_hAuthTicket) == 0,  "off m_hAuthTicket");
+static_assert(offsetof(GetTicketForWebApiResponse, m_eResult)     == 4,  "off m_eResult");
+static_assert(offsetof(GetTicketForWebApiResponse, m_cubTicket)   == 8,  "off m_cubTicket");
+static_assert(offsetof(GetTicketForWebApiResponse, m_rgubTicket)  == 12, "off m_rgubTicket");
+
+struct LeaderboardFindResult {
+    uint64_t m_hSteamLeaderboard;
+    uint8_t  m_bLeaderboardFound;
+    uint8_t  _pad[7];
+};
+static_assert(sizeof(LeaderboardFindResult) == 16, "LeaderboardFindResult size");
+static_assert(offsetof(LeaderboardFindResult, m_hSteamLeaderboard) == 0, "off m_hSteamLeaderboard");
+static_assert(offsetof(LeaderboardFindResult, m_bLeaderboardFound) == 8, "off m_bLeaderboardFound");
+
+struct LeaderboardScoresDownloaded {
+    uint64_t m_hSteamLeaderboard;
+    uint64_t m_hSteamLeaderboardEntries;
+    int32_t  m_cEntryCount;
+    uint32_t _pad;
+};
+static_assert(sizeof(LeaderboardScoresDownloaded) == 24, "LeaderboardScoresDownloaded size");
+static_assert(offsetof(LeaderboardScoresDownloaded, m_hSteamLeaderboard)        == 0,  "off m_hSteamLeaderboard");
+static_assert(offsetof(LeaderboardScoresDownloaded, m_hSteamLeaderboardEntries) == 8,  "off m_hSteamLeaderboardEntries");
+static_assert(offsetof(LeaderboardScoresDownloaded, m_cEntryCount)              == 16, "off m_cEntryCount");
+
+struct LeaderboardScoreUploaded {
+    uint8_t  m_bSuccess;
+    uint8_t  _pad0[7];
+    uint64_t m_hSteamLeaderboard;
+    int32_t  m_nScore;
+    uint8_t  m_bScoreChanged;
+    uint8_t  _pad1[3];
+    int32_t  m_nGlobalRankNew;
+    int32_t  m_nGlobalRankPrevious;
+};
+static_assert(sizeof(LeaderboardScoreUploaded) == 32, "LeaderboardScoreUploaded size");
+static_assert(offsetof(LeaderboardScoreUploaded, m_bSuccess)            == 0,  "off m_bSuccess");
+static_assert(offsetof(LeaderboardScoreUploaded, m_hSteamLeaderboard)   == 8,  "off m_hSteamLeaderboard");
+static_assert(offsetof(LeaderboardScoreUploaded, m_nScore)              == 16, "off m_nScore");
+static_assert(offsetof(LeaderboardScoreUploaded, m_bScoreChanged)       == 20, "off m_bScoreChanged");
+static_assert(offsetof(LeaderboardScoreUploaded, m_nGlobalRankNew)      == 24, "off m_nGlobalRankNew");
+static_assert(offsetof(LeaderboardScoreUploaded, m_nGlobalRankPrevious) == 28, "off m_nGlobalRankPrevious");
+
+struct NumberOfCurrentPlayers {
+    uint8_t m_bSuccess;
+    uint8_t _pad0[3];
+    int32_t m_cPlayers;
+};
+static_assert(sizeof(NumberOfCurrentPlayers) == 8, "NumberOfCurrentPlayers size");
+static_assert(offsetof(NumberOfCurrentPlayers, m_bSuccess) == 0, "off m_bSuccess");
+static_assert(offsetof(NumberOfCurrentPlayers, m_cPlayers) == 4, "off m_cPlayers");
+
+struct GlobalAchievementPercentagesReady {
+    uint64_t m_nGameID;
+    int32_t  m_eResult;
+    uint32_t _pad;
+};
+static_assert(sizeof(GlobalAchievementPercentagesReady) == 16, "GlobalAchievementPercentagesReady size");
+static_assert(offsetof(GlobalAchievementPercentagesReady, m_nGameID) == 0, "off m_nGameID");
+static_assert(offsetof(GlobalAchievementPercentagesReady, m_eResult) == 8, "off m_eResult");
+
+struct LeaderboardUGCSet {
+    int32_t  m_eResult;
+    uint32_t _pad;
+    uint64_t m_hSteamLeaderboard;
+};
+static_assert(sizeof(LeaderboardUGCSet) == 16, "LeaderboardUGCSet size");
+static_assert(offsetof(LeaderboardUGCSet, m_eResult)          == 0, "off m_eResult");
+static_assert(offsetof(LeaderboardUGCSet, m_hSteamLeaderboard) == 8, "off m_hSteamLeaderboard");
+
+struct GlobalStatsReceived {
+    uint64_t m_nGameID;
+    int32_t  m_eResult;
+    uint32_t _pad;
+};
+static_assert(sizeof(GlobalStatsReceived) == 16, "GlobalStatsReceived size");
+static_assert(offsetof(GlobalStatsReceived, m_nGameID) == 0, "off m_nGameID");
+static_assert(offsetof(GlobalStatsReceived, m_eResult) == 8, "off m_eResult");
+
+struct LobbyMatchList {
+    uint32_t m_nLobbiesMatching;
+};
+static_assert(sizeof(LobbyMatchList) == 4, "LobbyMatchList size");
+static_assert(offsetof(LobbyMatchList, m_nLobbiesMatching) == 0, "off m_nLobbiesMatching");
+
+struct LobbyCreated {
+    int32_t  m_eResult;
+    uint32_t _pad;
+    uint64_t m_ulSteamIDLobby;
+};
+static_assert(sizeof(LobbyCreated) == 16, "LobbyCreated size");
+static_assert(offsetof(LobbyCreated, m_eResult)        == 0, "off m_eResult");
+static_assert(offsetof(LobbyCreated, m_ulSteamIDLobby) == 8, "off m_ulSteamIDLobby");
+
+struct LobbyEnter {
+    uint64_t m_ulSteamIDLobby;
+    uint32_t m_rgfChatPermissions;
+    uint8_t  m_bLocked;
+    uint8_t  _pad[3];
+    uint32_t m_EChatRoomEnterResponse;
+    uint32_t _trail;
+};
+static_assert(sizeof(LobbyEnter) == 24, "LobbyEnter size");
+static_assert(offsetof(LobbyEnter, m_ulSteamIDLobby)         == 0,  "off m_ulSteamIDLobby");
+static_assert(offsetof(LobbyEnter, m_rgfChatPermissions)     == 8,  "off m_rgfChatPermissions");
+static_assert(offsetof(LobbyEnter, m_bLocked)                == 12, "off m_bLocked");
+static_assert(offsetof(LobbyEnter, m_EChatRoomEnterResponse) == 16, "off m_EChatRoomEnterResponse");
+
+struct SteamInventoryEligiblePromoItemDefIDs {
+    int32_t  m_result;
+    uint32_t _pad0;
+    uint64_t m_steamID;
+    int32_t  m_numEligiblePromoItemDefs;
+    uint8_t  m_bCachedData;
+    uint8_t  _pad1[3];
+};
+static_assert(sizeof(SteamInventoryEligiblePromoItemDefIDs) == 24,
+              "SteamInventoryEligiblePromoItemDefIDs size");
+static_assert(offsetof(SteamInventoryEligiblePromoItemDefIDs, m_result)                  == 0,  "off m_result");
+static_assert(offsetof(SteamInventoryEligiblePromoItemDefIDs, m_steamID)                 == 8,  "off m_steamID");
+static_assert(offsetof(SteamInventoryEligiblePromoItemDefIDs, m_numEligiblePromoItemDefs) == 16, "off m_numEligiblePromoItemDefs");
+static_assert(offsetof(SteamInventoryEligiblePromoItemDefIDs, m_bCachedData)             == 20, "off m_bCachedData");
+
+struct SteamInventoryStartPurchaseResult {
+    int32_t  m_result;
+    uint32_t _pad;
+    uint64_t m_ulOrderID;
+    uint64_t m_ulTransID;
+};
+static_assert(sizeof(SteamInventoryStartPurchaseResult) == 24,
+              "SteamInventoryStartPurchaseResult size");
+static_assert(offsetof(SteamInventoryStartPurchaseResult, m_result)    == 0,  "off m_result");
+static_assert(offsetof(SteamInventoryStartPurchaseResult, m_ulOrderID) == 8,  "off m_ulOrderID");
+static_assert(offsetof(SteamInventoryStartPurchaseResult, m_ulTransID) == 16, "off m_ulTransID");
+
+struct SteamInventoryRequestPricesResult {
+    int32_t m_result;
+    char    m_rgchCurrency[4];
+};
+static_assert(sizeof(SteamInventoryRequestPricesResult) == 8,
+              "SteamInventoryRequestPricesResult size");
+static_assert(offsetof(SteamInventoryRequestPricesResult, m_result)       == 0, "off m_result");
+static_assert(offsetof(SteamInventoryRequestPricesResult, m_rgchCurrency) == 4, "off m_rgchCurrency");
+
+struct ClanOfficerListResponse {
+    uint64_t m_steamIDClan;
+    int32_t  m_cOfficers;
+    uint8_t  m_bSuccess;
+    uint8_t  _pad[3];
+};
+static_assert(sizeof(ClanOfficerListResponse) == 16,
+              "ClanOfficerListResponse size");
+static_assert(offsetof(ClanOfficerListResponse, m_steamIDClan) == 0, "off m_steamIDClan");
+static_assert(offsetof(ClanOfficerListResponse, m_cOfficers)   == 8, "off m_cOfficers");
+static_assert(offsetof(ClanOfficerListResponse, m_bSuccess)    == 12, "off m_bSuccess");
+
+struct DownloadClanActivityCountsResult {
+    uint8_t m_bSuccess;
+};
+static_assert(sizeof(DownloadClanActivityCountsResult) == 1,
+              "DownloadClanActivityCountsResult size");
+
+struct JoinClanChatRoomCompletionResult {
+    uint64_t m_steamIDClanChat;
+    int32_t  m_eChatRoomEnterResponse;
+    uint32_t _pad;
+};
+static_assert(sizeof(JoinClanChatRoomCompletionResult) == 16,
+              "JoinClanChatRoomCompletionResult size");
+static_assert(offsetof(JoinClanChatRoomCompletionResult, m_steamIDClanChat)       == 0, "off m_steamIDClanChat");
+static_assert(offsetof(JoinClanChatRoomCompletionResult, m_eChatRoomEnterResponse) == 8, "off m_eChatRoomEnterResponse");
+
+struct EquippedProfileItems {
+    int32_t  m_eResult;
+    uint32_t _pad0;
+    uint64_t m_steamID;
+    uint8_t  m_bHasAnimatedAvatar;
+    uint8_t  m_bHasAvatarFrame;
+    uint8_t  m_bHasProfileModifier;
+    uint8_t  m_bHasProfileBackground;
+    uint8_t  m_bHasMiniProfileBackground;
+    uint8_t  _pad1[3];
+};
+static_assert(sizeof(EquippedProfileItems) == 24,
+              "EquippedProfileItems size");
+static_assert(offsetof(EquippedProfileItems, m_eResult)                    == 0,  "off m_eResult");
+static_assert(offsetof(EquippedProfileItems, m_steamID)                    == 8,  "off m_steamID");
+static_assert(offsetof(EquippedProfileItems, m_bHasAnimatedAvatar)         == 16, "off m_bHasAnimatedAvatar");
+static_assert(offsetof(EquippedProfileItems, m_bHasAvatarFrame)            == 17, "off m_bHasAvatarFrame");
+static_assert(offsetof(EquippedProfileItems, m_bHasProfileModifier)        == 18, "off m_bHasProfileModifier");
+static_assert(offsetof(EquippedProfileItems, m_bHasProfileBackground)      == 19, "off m_bHasProfileBackground");
+static_assert(offsetof(EquippedProfileItems, m_bHasMiniProfileBackground)  == 20, "off m_bHasMiniProfileBackground");
+
+struct FriendsGetFollowerCount {
+    int32_t  m_eResult;
+    uint32_t _pad0;
+    uint64_t m_steamID;
+    int32_t  m_nCount;
+    uint32_t _pad1;
+};
+static_assert(sizeof(FriendsGetFollowerCount) == 24,
+              "FriendsGetFollowerCount size");
+static_assert(offsetof(FriendsGetFollowerCount, m_eResult) == 0, "off m_eResult");
+static_assert(offsetof(FriendsGetFollowerCount, m_steamID) == 8, "off m_steamID");
+static_assert(offsetof(FriendsGetFollowerCount, m_nCount)  == 16, "off m_nCount");
+
+struct FriendsIsFollowing {
+    int32_t  m_eResult;
+    uint32_t _pad0;
+    uint64_t m_steamID;
+    uint8_t  m_bIsFollowing;
+    uint8_t  _pad1[7];
+};
+static_assert(sizeof(FriendsIsFollowing) == 24,
+              "FriendsIsFollowing size");
+static_assert(offsetof(FriendsIsFollowing, m_eResult)       == 0, "off m_eResult");
+static_assert(offsetof(FriendsIsFollowing, m_steamID)       == 8, "off m_steamID");
+static_assert(offsetof(FriendsIsFollowing, m_bIsFollowing)  == 16, "off m_bIsFollowing");
+
+struct FriendsEnumerateFollowingList {
+    int32_t  m_eResult;
+    uint32_t _pad;
+    uint64_t m_rgSteamID[50];
+    int32_t  m_nResultsReturned;
+    int32_t  m_nTotalResultCount;
+};
+static_assert(sizeof(FriendsEnumerateFollowingList) == 416,
+              "FriendsEnumerateFollowingList size");
+static_assert(offsetof(FriendsEnumerateFollowingList, m_eResult)          == 0,   "off m_eResult");
+static_assert(offsetof(FriendsEnumerateFollowingList, m_rgSteamID)        == 8,   "off m_rgSteamID");
+static_assert(offsetof(FriendsEnumerateFollowingList, m_nResultsReturned) == 408, "off m_nResultsReturned");
+static_assert(offsetof(FriendsEnumerateFollowingList, m_nTotalResultCount) == 412, "off m_nTotalResultCount");
+
+struct RemoteStorageDownloadUGCResult {
+    int32_t  m_eResult;
+    uint32_t _pad0;
+    uint64_t m_hFile;
+    uint32_t m_nAppID;
+    int32_t  m_nSizeInBytes;
+    char     m_pchFileName[260];
+    uint32_t _pad1;
+    uint64_t m_ulSteamIDOwner;
+};
+static_assert(sizeof(RemoteStorageDownloadUGCResult) == 296,
+              "RemoteStorageDownloadUGCResult size");
+static_assert(offsetof(RemoteStorageDownloadUGCResult, m_eResult)        == 0,   "off m_eResult");
+static_assert(offsetof(RemoteStorageDownloadUGCResult, m_hFile)          == 8,   "off m_hFile");
+static_assert(offsetof(RemoteStorageDownloadUGCResult, m_nAppID)         == 16,  "off m_nAppID");
+static_assert(offsetof(RemoteStorageDownloadUGCResult, m_nSizeInBytes)   == 20,  "off m_nSizeInBytes");
+static_assert(offsetof(RemoteStorageDownloadUGCResult, m_pchFileName)    == 24,  "off m_pchFileName");
+static_assert(offsetof(RemoteStorageDownloadUGCResult, m_ulSteamIDOwner) == 288, "off m_ulSteamIDOwner");
+
+struct RemoteStorageSubscribePublishedFileResult {
+    int32_t  m_eResult;
+    uint32_t _pad;
+    uint64_t m_nPublishedFileId;
+};
+static_assert(sizeof(RemoteStorageSubscribePublishedFileResult) == 16,
+              "RemoteStorageSubscribePublishedFileResult size");
+static_assert(offsetof(RemoteStorageSubscribePublishedFileResult, m_eResult) == 0,
+              "off m_eResult");
+static_assert(offsetof(RemoteStorageSubscribePublishedFileResult, m_nPublishedFileId) == 8,
+              "off m_nPublishedFileId");
+
+struct RemoteStorageUnsubscribePublishedFileResult {
+    int32_t  m_eResult;
+    uint32_t _pad;
+    uint64_t m_nPublishedFileId;
+};
+static_assert(sizeof(RemoteStorageUnsubscribePublishedFileResult) == 16,
+              "RemoteStorageUnsubscribePublishedFileResult size");
+static_assert(offsetof(RemoteStorageUnsubscribePublishedFileResult, m_eResult) == 0,
+              "off m_eResult");
+static_assert(offsetof(RemoteStorageUnsubscribePublishedFileResult, m_nPublishedFileId) == 8,
+              "off m_nPublishedFileId");
+
+struct SteamUGCQueryCompleted {
+    uint64_t m_handle;
+    int32_t  m_eResult;
+    uint32_t m_unNumResultsReturned;
+    uint32_t m_unTotalMatchingResults;
+    uint8_t  m_bCachedData;
+    char     m_rgchNextCursor[256];
+    uint8_t  _pad[3];
+};
+static_assert(sizeof(SteamUGCQueryCompleted) == 280,
+              "SteamUGCQueryCompleted size");
+static_assert(offsetof(SteamUGCQueryCompleted, m_handle)                 == 0,  "off m_handle");
+static_assert(offsetof(SteamUGCQueryCompleted, m_eResult)                == 8,  "off m_eResult");
+static_assert(offsetof(SteamUGCQueryCompleted, m_unNumResultsReturned)   == 12, "off m_unNumResultsReturned");
+static_assert(offsetof(SteamUGCQueryCompleted, m_unTotalMatchingResults) == 16, "off m_unTotalMatchingResults");
+static_assert(offsetof(SteamUGCQueryCompleted, m_bCachedData)            == 20, "off m_bCachedData");
+static_assert(offsetof(SteamUGCQueryCompleted, m_rgchNextCursor)         == 21, "off m_rgchNextCursor");
+
+struct SteamUGCRequestUGCDetailsResultMinimal {
+    int32_t  m_eResult;
+    uint32_t _pad;
+};
+static_assert(sizeof(SteamUGCRequestUGCDetailsResultMinimal) == 8,
+              "SteamUGCRequestUGCDetailsResultMinimal size");
+
+struct SteamAPICallCompleted {
+    uint64_t m_hAsyncCall;
+    int32_t  m_iCallback;
+    uint32_t m_cubParam;
+};
+static_assert(sizeof(SteamAPICallCompleted) == 16,
+              "SteamAPICallCompleted size");
+static_assert(offsetof(SteamAPICallCompleted, m_hAsyncCall) == 0, "off m_hAsyncCall");
+static_assert(offsetof(SteamAPICallCompleted, m_iCallback)  == 8, "off m_iCallback");
+static_assert(offsetof(SteamAPICallCompleted, m_cubParam)   == 12, "off m_cubParam");
+
+struct CheckFileSignature {
+    int32_t m_eCheckFileSignature;
+};
+static_assert(sizeof(CheckFileSignature) == 4, "CheckFileSignature size");
+static_assert(offsetof(CheckFileSignature, m_eCheckFileSignature) == 0,
+              "off m_eCheckFileSignature");
+
+struct StoreAuthURLResponse {
+    char m_szURL[512];
+};
+static_assert(sizeof(StoreAuthURLResponse) == 512, "StoreAuthURLResponse size");
+static_assert(offsetof(StoreAuthURLResponse, m_szURL) == 0, "off m_szURL");
+
+struct MarketEligibilityResponse {
+    bool     m_bAllowed;
+    uint8_t  _pad0[3];
+    int32_t  m_eNotAllowedReason;
+    uint32_t m_rtAllowedAtTime;
+    int32_t  m_cdaySteamGuardRequiredDays;
+    int32_t  m_cdayNewDeviceCooldown;
+};
+static_assert(sizeof(MarketEligibilityResponse) == 20, "MarketEligibilityResponse size");
+static_assert(offsetof(MarketEligibilityResponse, m_bAllowed)                   == 0,  "off m_bAllowed");
+static_assert(offsetof(MarketEligibilityResponse, m_eNotAllowedReason)          == 4,  "off m_eNotAllowedReason");
+static_assert(offsetof(MarketEligibilityResponse, m_rtAllowedAtTime)            == 8,  "off m_rtAllowedAtTime");
+static_assert(offsetof(MarketEligibilityResponse, m_cdaySteamGuardRequiredDays) == 12, "off m_cdaySteamGuardRequiredDays");
+static_assert(offsetof(MarketEligibilityResponse, m_cdayNewDeviceCooldown)      == 16, "off m_cdayNewDeviceCooldown");
+
+struct DurationControl {
+    int32_t  m_eResult;
+    uint32_t m_appid;
+    bool     m_bApplicable;
+    uint8_t  _pad0[3];
+    int32_t  m_csecsLast5h;
+    int32_t  m_progress;
+    int32_t  m_notification;
+    int32_t  m_csecsToday;
+    int32_t  m_csecsRemaining;
+};
+static_assert(sizeof(DurationControl) == 32, "DurationControl size");
+static_assert(offsetof(DurationControl, m_eResult)        == 0,  "off m_eResult");
+static_assert(offsetof(DurationControl, m_appid)          == 4,  "off m_appid");
+static_assert(offsetof(DurationControl, m_bApplicable)    == 8,  "off m_bApplicable");
+static_assert(offsetof(DurationControl, m_csecsLast5h)    == 12, "off m_csecsLast5h");
+static_assert(offsetof(DurationControl, m_progress)       == 16, "off m_progress");
+static_assert(offsetof(DurationControl, m_notification)   == 20, "off m_notification");
+static_assert(offsetof(DurationControl, m_csecsToday)     == 24, "off m_csecsToday");
+static_assert(offsetof(DurationControl, m_csecsRemaining) == 28, "off m_csecsRemaining");
+
+struct ValidateAuthTicketResponse {
+    uint64_t m_SteamID;
+    int32_t  m_eAuthSessionResponse;
+    uint32_t _pad;
+    uint64_t m_OwnerSteamID;
+};
+static_assert(sizeof(ValidateAuthTicketResponse) == 24, "ValidateAuthTicketResponse size");
+static_assert(offsetof(ValidateAuthTicketResponse, m_SteamID)              == 0,  "off m_SteamID");
+static_assert(offsetof(ValidateAuthTicketResponse, m_eAuthSessionResponse) == 8,  "off m_eAuthSessionResponse");
+static_assert(offsetof(ValidateAuthTicketResponse, m_OwnerSteamID)         == 16, "off m_OwnerSteamID");
+
+struct SteamServersDisconnected {
+    int32_t m_eResult;
+};
+static_assert(sizeof(SteamServersDisconnected) == 4, "SteamServersDisconnected size");
+static_assert(offsetof(SteamServersDisconnected, m_eResult) == 0, "off m_eResult");
+
+struct SetPersonaNameResponse {
+    bool     m_bSuccess;
+    bool     m_bLocalSuccess;
+    uint8_t  _pad[2];
+    int32_t  m_result;
+};
+static_assert(sizeof(SetPersonaNameResponse) == 8, "SetPersonaNameResponse size");
+static_assert(offsetof(SetPersonaNameResponse, m_bSuccess)      == 0, "off m_bSuccess");
+static_assert(offsetof(SetPersonaNameResponse, m_bLocalSuccess) == 1, "off m_bLocalSuccess");
+static_assert(offsetof(SetPersonaNameResponse, m_result)        == 4, "off m_result");
+
+struct RemoteStorageAppSyncedClient {
+    uint32_t m_nAppID;
+    int32_t  m_eResult;
+    int32_t  m_unNumDownloads;
+};
+static_assert(sizeof(RemoteStorageAppSyncedClient) == 12,
+              "RemoteStorageAppSyncedClient size");
+static_assert(offsetof(RemoteStorageAppSyncedClient, m_nAppID)         == 0, "off m_nAppID");
+static_assert(offsetof(RemoteStorageAppSyncedClient, m_eResult)        == 4, "off m_eResult");
+static_assert(offsetof(RemoteStorageAppSyncedClient, m_unNumDownloads) == 8, "off m_unNumDownloads");
+
+struct RemoteStorageFileWriteAsyncComplete {
+    int32_t m_eResult;
+};
+static_assert(sizeof(RemoteStorageFileWriteAsyncComplete) == 4,
+              "RemoteStorageFileWriteAsyncComplete size");
+static_assert(offsetof(RemoteStorageFileWriteAsyncComplete, m_eResult) == 0,
+              "off m_eResult");
+
+struct RemoteStorageFileReadAsyncComplete {
+    uint64_t m_hFileReadAsync;
+    int32_t  m_eResult;
+    uint32_t m_nOffset;
+    uint32_t m_cubRead;
+    uint32_t _pad;
+};
+static_assert(sizeof(RemoteStorageFileReadAsyncComplete) == 24,
+              "RemoteStorageFileReadAsyncComplete size");
+static_assert(offsetof(RemoteStorageFileReadAsyncComplete, m_hFileReadAsync) == 0,  "off m_hFileReadAsync");
+static_assert(offsetof(RemoteStorageFileReadAsyncComplete, m_eResult)        == 8,  "off m_eResult");
+static_assert(offsetof(RemoteStorageFileReadAsyncComplete, m_nOffset)        == 12, "off m_nOffset");
+static_assert(offsetof(RemoteStorageFileReadAsyncComplete, m_cubRead)        == 16, "off m_cubRead");
+
+struct RemoteStorageFileShareResult {
+    int32_t  m_eResult;
+    uint32_t _pad0;
+    uint64_t m_hFile;
+    char     m_rgchFilename[260];
+    uint8_t  _pad1[4];
+};
+static_assert(sizeof(RemoteStorageFileShareResult) == 280,
+              "RemoteStorageFileShareResult size");
+static_assert(offsetof(RemoteStorageFileShareResult, m_eResult)      == 0,  "off m_eResult");
+static_assert(offsetof(RemoteStorageFileShareResult, m_hFile)        == 8,  "off m_hFile");
+static_assert(offsetof(RemoteStorageFileShareResult, m_rgchFilename) == 16, "off m_rgchFilename");
+
+struct FileDetailsResult {
+    int32_t  m_eResult;
+    uint32_t _pad0;
+    uint64_t m_ulFileSize;
+    uint8_t  m_FileSHA[20];
+    uint32_t m_unFlags;
+};
+static_assert(sizeof(FileDetailsResult) == 40,
+              "FileDetailsResult size");
+static_assert(offsetof(FileDetailsResult, m_eResult)    == 0,  "off m_eResult");
+static_assert(offsetof(FileDetailsResult, m_ulFileSize) == 8,  "off m_ulFileSize");
+static_assert(offsetof(FileDetailsResult, m_FileSHA)    == 16, "off m_FileSHA");
+static_assert(offsetof(FileDetailsResult, m_unFlags)    == 36, "off m_unFlags");
+
+struct PersonaStateChange {
+    uint64_t m_ulSteamID;
+    int32_t  m_nChangeFlags;
+    uint32_t _pad;
+};
+static_assert(sizeof(PersonaStateChange) == 16, "PersonaStateChange size");
+static_assert(offsetof(PersonaStateChange, m_ulSteamID)    == 0, "off m_ulSteamID");
+static_assert(offsetof(PersonaStateChange, m_nChangeFlags) == 8, "off m_nChangeFlags");
+
+struct AvatarImageLoaded {
+    uint64_t m_steamID;
+    int32_t  m_iImage;
+    int32_t  m_iWide;
+    int32_t  m_iTall;
+};
+static_assert(sizeof(AvatarImageLoaded) == 24, "AvatarImageLoaded size");
+static_assert(offsetof(AvatarImageLoaded, m_steamID) == 0,  "off m_steamID");
+static_assert(offsetof(AvatarImageLoaded, m_iImage)  == 8,  "off m_iImage");
+static_assert(offsetof(AvatarImageLoaded, m_iWide)   == 12, "off m_iWide");
+static_assert(offsetof(AvatarImageLoaded, m_iTall)   == 16, "off m_iTall");
+
+struct FriendRichPresenceUpdate {
+    uint64_t m_steamIDFriend;
+    uint32_t m_nAppID;
+};
+static_assert(sizeof(FriendRichPresenceUpdate) == 16, "FriendRichPresenceUpdate size");
+static_assert(offsetof(FriendRichPresenceUpdate, m_steamIDFriend) == 0, "off m_steamIDFriend");
+static_assert(offsetof(FriendRichPresenceUpdate, m_nAppID)        == 8, "off m_nAppID");
+
+constexpr size_t kAchievementNameMax = 128;
+struct UserAchievementStored {
+    uint64_t  m_nGameID;
+    bool      m_bGroupAchievement;
+    char      m_rgchAchievementName[kAchievementNameMax];
+    uint32_t  m_nCurProgress;
+    uint32_t  m_nMaxProgress;
+};
+static_assert(sizeof(UserAchievementStored) == 152, "UserAchievementStored size");
+static_assert(offsetof(UserAchievementStored, m_nGameID)            == 0,   "off m_nGameID");
+static_assert(offsetof(UserAchievementStored, m_bGroupAchievement)  == 8,   "off m_bGroupAchievement");
+static_assert(offsetof(UserAchievementStored, m_rgchAchievementName)== 9,   "off m_rgchAchievementName");
+static_assert(offsetof(UserAchievementStored, m_nCurProgress)       == 140, "off m_nCurProgress");
+static_assert(offsetof(UserAchievementStored, m_nMaxProgress)       == 144, "off m_nMaxProgress");
+
+}  // namespace wn_libsteamclient::callbacks
diff --git a/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/runtime_state.h b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/runtime_state.h
new file mode 100644
index 000000000..dcaea13b3
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/runtime_state.h
@@ -0,0 +1,270 @@
+
+#pragma once
+
+#include <atomic>
+#include <cstdint>
+#include <deque>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+namespace wn_libsteamclient {
+
+using HSteamPipe = int;
+using HSteamUser = int;
+
+struct CallbackMsg {
+    int                   user;
+    int                   id;
+    std::vector<uint8_t>  body;
+};
+
+struct PushedState {
+    std::atomic<uint64_t>   steam_id{0};
+    std::atomic<uint32_t>   account_id{0};
+    std::atomic<int>        persona_state{0};    // EPersonaState (0=Offline … 7=Invisible)
+    std::atomic<uint32_t>   app_id{0};            // for ISteamUtils.GetAppID
+    std::atomic<int>        ip_country_set{0};
+    std::atomic<uint32_t>   server_realtime{0};       // unix epoch reported by CM at the anchor moment
+    std::atomic<int64_t>    server_realtime_anchor_local_ms{0}; // local steady_clock::now() ms when server_realtime was captured
+    std::string             persona_name;        // guarded by state_mutex()
+    std::string             ip_country;          // guarded by state_mutex()
+    std::string             ui_language;         // guarded by state_mutex()
+
+    std::unordered_set<uint32_t>           owned_apps;
+    std::unordered_set<uint32_t>           installed_apps;
+    std::unordered_map<uint32_t,std::string> app_install_dirs;
+    std::unordered_map<uint32_t,std::string> app_current_beta;
+    struct DlProgress {
+        uint64_t bytes_downloaded = 0;
+        uint64_t bytes_total      = 0;
+    };
+    std::unordered_map<uint32_t,DlProgress> app_dl_progress;
+    std::unordered_map<uint32_t,std::string> app_cloud_remote_dirs;
+    std::unordered_set<uint32_t> app_low_violence;
+    std::unordered_set<uint32_t> app_vac_banned;
+    std::atomic<bool>   account_phone_verified{false};
+    std::atomic<bool>   account_two_factor_enabled{false};
+    std::atomic<bool>   account_phone_identifying{false};
+    std::atomic<bool>   account_phone_requires_verification{false};
+    std::unordered_set<uint32_t>           apps_marked_corrupt;
+
+    struct WorkshopItemInfo {
+        std::string install_dir;        // absolute Windows path or wine guest path
+        uint64_t    size_bytes = 0;     // total disk footprint for ISteamUGC slot 73 bytes
+        uint32_t    timestamp  = 0;     // unix32 last-update — slot 73 timestamp
+        bool        installed  = true;  // currently we only ever push installed entries
+    };
+    std::unordered_map<uint32_t, std::unordered_map<uint64_t, WorkshopItemInfo>>
+        subscribed_workshop_items;
+
+    std::unordered_map<uint32_t,
+        std::unordered_map<int32_t, std::unordered_map<std::string, std::string>>>
+        inventory_item_defs;
+
+    struct LobbyMember {
+        std::string                                      persona_name;
+        std::unordered_map<std::string, std::string>     data;
+    };
+    struct LobbyState {
+        uint32_t                                         app_id        = 0;
+        uint64_t                                         owner_sid     = 0;
+        int32_t                                          max_members   = 0;
+        int32_t                                          lobby_type    = 0;
+        int32_t                                          lobby_flags   = 0;
+        bool                                             joinable      = true;
+        uint32_t                                         game_server_ip   = 0;
+        uint16_t                                         game_server_port = 0;
+        uint64_t                                         game_server_sid  = 0;
+        std::unordered_map<std::string, std::string>     data;
+        std::unordered_map<uint64_t, LobbyMember>        members;
+    };
+    std::unordered_map<uint64_t, LobbyState> active_lobbies;
+    std::vector<uint64_t>                    lobby_match_list;
+
+    struct LobbyChatEntry {
+        uint64_t                sender_sid;
+        uint8_t                 chat_type;     // EChatEntryType (1=ChatMsg)
+        std::vector<uint8_t>    body;
+    };
+    std::unordered_map<uint64_t, std::vector<LobbyChatEntry>>
+        lobby_chat_buffer;
+
+    struct P2PSessionState {
+        uint64_t  last_session_error   = 0;  // EP2PSessionError on close
+        bool      connection_active    = false;
+        bool      connecting           = false;
+        uint32_t  bytes_queued_for_send = 0;
+        uint32_t  remote_ip            = 0;  // little-endian / IPv4
+        uint16_t  remote_port          = 0;
+        bool      using_relay          = false;
+    };
+    std::unordered_map<uint64_t, P2PSessionState> active_p2p_sessions;
+
+    struct P2PInboundPacket {
+        uint64_t              sender_sid;
+        int32_t               channel;
+        std::vector<uint8_t>  body;
+    };
+    std::unordered_map<int32_t, std::deque<P2PInboundPacket>> p2p_inbound_queue;
+    std::atomic<bool> p2p_relay_allowed{true};
+
+    struct OverlayRequest {
+        std::string kind;   // "webpage" | "store" | "user" | "invite" | "dialog"
+        std::string arg1;   // URL / dialog name
+        uint64_t    sid     = 0;   // user SID / lobby SID (depending on kind)
+        uint32_t    app_id  = 0;   // store appid
+    };
+    std::deque<OverlayRequest> overlay_request_queue;
+    std::unordered_map<uint64_t,int32_t>   friend_steam_levels;
+    std::unordered_map<uint64_t,std::string> player_nicknames;
+    std::atomic<int32_t>                   self_player_level{0};
+    std::unordered_map<int32_t,int32_t>    self_game_badges;
+
+    struct LicenseEntry {
+        uint32_t package_id    = 0;
+        uint32_t owner_id      = 0;       // AccountID; != self_account → family-shared
+        uint32_t time_created  = 0;       // unix32 of purchase
+        uint32_t license_type  = 0;       // ELicenseType
+        uint32_t flags         = 0;       // ELicenseFlags bitfield
+        int32_t  change_number = 0;       // PICS change_number on this package
+        int32_t  minute_limit  = 0;       // 0 = unlimited; >0 = timed-trial cap (minutes)
+        int32_t  minutes_used  = 0;       // current playtime against minute_limit
+    };
+    std::unordered_map<uint32_t,LicenseEntry> licenses;
+
+    std::unordered_map<uint32_t,std::vector<uint32_t>> app_source_packages;
+    struct DlcEntry {
+        uint32_t    app_id;
+        std::string name;
+        bool        available = true;  // DLC currently purchasable
+    };
+    std::unordered_map<uint32_t,std::vector<DlcEntry>> app_dlcs;
+    std::unordered_map<uint32_t,std::vector<uint32_t>> app_installed_depots;
+    std::unordered_map<uint32_t,std::string>          app_names;
+    std::unordered_map<uint32_t,uint32_t>             app_build_ids;
+    std::vector<uint64_t>                  friends;
+    std::unordered_map<uint64_t,std::string> friend_persona_names;
+    std::unordered_map<uint64_t,uint32_t>  friend_persona_states;
+    std::unordered_map<uint64_t,uint32_t>  friend_game_played_app;
+
+    using RichPresenceMap = std::vector<std::pair<std::string,std::string>>;
+    std::unordered_map<uint64_t, RichPresenceMap> rich_presence;
+
+    struct ImageEntry {
+        int32_t              width  = 0;
+        int32_t              height = 0;
+        std::vector<uint8_t> rgba;  // size = width*height*4
+    };
+    std::unordered_map<int32_t, ImageEntry>  image_registry;
+    struct FriendAvatarHandles {
+        int32_t small  = 0;
+        int32_t medium = 0;
+        int32_t large  = 0;
+    };
+    std::unordered_map<uint64_t, FriendAvatarHandles> friend_avatars;
+    int32_t next_image_handle = 1;
+
+    std::unordered_map<uint64_t, std::vector<uint8_t>> friend_avatar_hashes;
+
+    std::atomic<bool>     cloud_enabled_account{true};
+    std::atomic<bool>     cloud_enabled_app{false};
+    std::atomic<uint64_t> cloud_quota_total{0};
+    std::atomic<uint64_t> cloud_quota_available{0};
+    struct CloudFileEntry {
+        std::string name;
+        int32_t     size      = 0;   // ISteamRemoteStorage uses int32 here
+        int64_t     timestamp = 0;   // unix seconds
+    };
+    std::vector<CloudFileEntry>            cloud_files;
+
+    struct AchievementEntry {
+        std::string  api_name;       // internal name ("ACH_FIRST_BLOOD")
+        std::unordered_map<std::string, std::string> display_names;
+        std::unordered_map<std::string, std::string> descriptions;
+        std::string  icon;           // icon URL or empty
+        bool         hidden        = false;
+        bool         achieved      = false;
+        uint32_t     unlock_time   = 0;   // unix seconds
+        int32_t      icon_handle   = 0;   // synthetic id for slot-11
+        bool         pending_store = false;
+        int32_t      block_id      = -1;
+        int32_t      bit_index     = 0;
+    };
+    std::vector<AchievementEntry>          achievements;
+    std::unordered_map<std::string,size_t> achievement_index;
+    std::unordered_map<std::string,int32_t> stats_int;
+    std::unordered_map<std::string,float>   stats_float;
+    std::unordered_map<std::string,uint32_t> stat_name_to_id;
+    std::unordered_set<std::string>         dirty_stats_int;
+    std::unordered_set<std::string>         dirty_stats_float;
+
+    struct AvgRateAccum {
+        double total_count = 0.0;
+        double total_time  = 0.0;
+    };
+    std::unordered_map<std::string,AvgRateAccum> stats_avg_rate;
+    std::atomic<bool>                      stats_ready{false};
+
+    std::atomic<bool>                      overlay_active{false};
+
+    struct AuthTicket {
+        uint32_t               h_ticket;       // returned to caller
+        uint32_t               app_id;
+        std::vector<uint8_t>   body;
+    };
+    std::atomic<uint32_t>                  next_auth_ticket_handle{1};
+    std::unordered_map<uint32_t, AuthTicket> auth_tickets;
+
+    std::string                            launch_command_line;
+    std::atomic<bool>                      app_is_family_shared{false};
+
+    std::unordered_map<uint32_t, std::vector<uint8_t>> encrypted_app_tickets;
+    std::atomic<int32_t>                   encrypted_app_ticket_eresult{0};
+};
+
+PushedState& pushed();
+
+struct CallResultMsg {
+    uint64_t              h_call;
+    int                   callback_id;
+    bool                  io_failure;
+    std::vector<uint8_t>  body;
+};
+
+struct State {
+    std::atomic<HSteamPipe> pipe{0};
+    std::atomic<HSteamUser> user{0};
+
+    std::atomic<bool>       logged_on{false};
+    std::atomic<bool>       connected{false};
+
+    std::mutex              callback_mu;
+    std::deque<CallbackMsg> callback_queue;
+    std::vector<uint8_t>    last_param;
+
+    std::mutex                                    call_results_mu;
+    std::unordered_map<uint64_t, CallResultMsg>   call_results_pending;
+    uint64_t                                      next_api_call_handle = 1;
+};
+
+State& state();
+std::mutex& state_mutex();
+
+HSteamPipe alloc_pipe();
+bool       release_pipe(HSteamPipe pipe);
+HSteamUser alloc_global_user(HSteamPipe pipe);
+void       release_user(HSteamPipe pipe, HSteamUser user);
+
+void push_callback(int user, int id, const void* data, size_t n);
+
+void push_call_result(uint64_t h_call, int callback_id,
+                      const void* data, size_t n, bool io_failure);
+
+uint64_t alloc_api_call_handle();
+
+void set_logged_on(bool logged_on, int eresult_on_disconnect = 6);
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/tcp_services.h b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/tcp_services.h
new file mode 100644
index 000000000..b90a489e1
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/include/wn_libsteamclient/tcp_services.h
@@ -0,0 +1,12 @@
+#pragma once
+
+
+#include <cstdint>
+
+namespace wn_libsteamclient {
+
+bool start_tcp_services();
+
+int  accepted_connection_count();
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/include/wn_steam/cm_bridge.h b/app/src/main/cpp/wn-libsteamclient/include/wn_steam/cm_bridge.h
new file mode 100644
index 000000000..660edc217
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/include/wn_steam/cm_bridge.h
@@ -0,0 +1,285 @@
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+
+namespace wn_steam {
+class CMClient;
+
+void wn_cm_bridge_set_active(std::shared_ptr<CMClient> client);
+void wn_cm_bridge_clear_active();
+
+}  // namespace wn_steam
+
+extern "C" {
+
+__attribute__((visibility("default")))
+bool wn_cm_set_persona_state(int32_t persona_state);
+
+__attribute__((visibility("default")))
+bool wn_cm_set_persona_name(const char* name, int32_t persona_state);
+
+__attribute__((visibility("default")))
+bool wn_cm_request_user_info(uint64_t steam_id, int32_t flags);
+
+__attribute__((visibility("default")))
+bool wn_cm_request_user_info_bulk(const uint64_t* sids, size_t count, int32_t flags);
+
+__attribute__((visibility("default")))
+bool wn_cm_get_cached_app_ownership_ticket(uint32_t app_id,
+                                            uint8_t* out_buf,
+                                            size_t max_len,
+                                            size_t* out_len);
+
+__attribute__((visibility("default")))
+bool wn_cm_bridge_inject_test_ownership_ticket(uint32_t app_id,
+                                                 const uint8_t* bytes,
+                                                 size_t len);
+
+__attribute__((visibility("default")))
+bool wn_cm_notify_games_played(uint32_t app_id);
+
+__attribute__((visibility("default")))
+bool wn_cm_set_rich_presence(uint32_t app_id,
+                              const char* const* keys,
+                              const char* const* values,
+                              size_t count);
+
+__attribute__((visibility("default")))
+bool wn_cm_store_user_stats(uint32_t app_id,
+                              uint32_t crc_stats,
+                              const uint32_t* stat_ids,
+                              const uint32_t* stat_values,
+                              size_t count);
+
+struct WnCmRichPresenceKV {
+    const char* key;
+    const char* value;
+};
+
+struct WnCmPersonaEvent {
+    uint64_t       sid;              // CSteamID64 (0 if message lacks one)
+    uint32_t       persona_state;    // EPersonaState (0..7); UINT32_MAX = absent
+    uint32_t       game_played_app;  // AppID; 0 = not in game
+    const char*    name;             // UTF-8, null if absent
+    const uint8_t* avatar_hash;      // SHA-1 (typically 20 bytes), null if absent
+    size_t         avatar_hash_len;
+    const WnCmRichPresenceKV* rp_pairs;
+    size_t                    rp_count;
+};
+
+typedef void (*WnCmPersonaObserverFn)(const WnCmPersonaEvent*);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_persona_observer(WnCmPersonaObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_dispatch_persona(const WnCmPersonaEvent* ev);
+
+
+typedef void (*WnCmLogonStateObserverFn)(bool logged_on);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_logon_state_observer(WnCmLogonStateObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_dispatch_logon_state(bool logged_on);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_inject_test_logon_state(bool logged_on);
+
+
+typedef void (*WnCmFriendsListObserverFn)(const uint64_t* sids, size_t count);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_friends_list_observer(WnCmFriendsListObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_dispatch_friends_list(const uint64_t* sids, size_t count);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_inject_test_friends_list(const uint64_t* sids, size_t count);
+
+
+struct WnCmLicenseEntry {
+    uint32_t package_id;
+    uint32_t owner_id;
+    uint32_t time_created;
+    uint32_t license_type;
+    uint32_t flags;
+    int32_t  change_number;
+    int32_t  minute_limit;     // 0 = unlimited
+    int32_t  minutes_used;
+};
+
+typedef void (*WnCmLicenseListObserverFn)(const WnCmLicenseEntry* licenses,
+                                            size_t count);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_license_list_observer(WnCmLicenseListObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_dispatch_license_list(const WnCmLicenseEntry* licenses,
+                                          size_t count);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_inject_test_license_list(const WnCmLicenseEntry* licenses,
+                                             size_t count);
+
+
+struct WnCmAccountInfo {
+    const char* persona_name;       // may be NULL if not provided
+    size_t      persona_name_len;
+    const char* ip_country;         // may be NULL if not provided
+    size_t      ip_country_len;
+    bool        two_factor_enabled;
+    bool        phone_verified;
+    bool        phone_identifying;
+    bool        phone_requires_verification;
+};
+
+typedef void (*WnCmAccountInfoObserverFn)(const WnCmAccountInfo* info);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_account_info_observer(WnCmAccountInfoObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_dispatch_account_info(const WnCmAccountInfo* info);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_inject_test_account_info(const WnCmAccountInfo* info);
+
+typedef void (*WnCmServerRealTimeObserverFn)(uint32_t server_realtime);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_server_realtime_observer(WnCmServerRealTimeObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_dispatch_server_realtime(uint32_t server_realtime);
+
+
+typedef struct WnCmLobbyEntry {
+    uint64_t steam_id;
+    int32_t  max_members;
+    int32_t  num_members;
+    int32_t  lobby_type;
+    int32_t  lobby_flags;
+    int32_t  ping_ms;
+    int64_t  weight;
+    float    distance;
+} WnCmLobbyEntry;
+
+typedef struct WnCmLobbyMember {
+    uint64_t       steam_id;
+    const char*    persona_name;     // UTF-8, valid only during callback
+    const uint8_t* metadata_bytes;
+    size_t         metadata_len;
+} WnCmLobbyMember;
+
+typedef struct WnCmLobbyData {
+    uint64_t                steam_id_lobby;
+    uint64_t                steam_id_owner;
+    uint32_t                app_id;
+    int32_t                 max_members;
+    int32_t                 num_members;
+    int32_t                 lobby_type;
+    int32_t                 lobby_flags;
+    const uint8_t*          metadata_bytes;
+    size_t                  metadata_len;
+    const WnCmLobbyMember*  members;
+    size_t                  member_count;
+} WnCmLobbyData;
+
+typedef void (*WnCmLobbyListCb)(uint64_t hCall,
+                                int32_t eresult,
+                                const WnCmLobbyEntry* lobbies,
+                                size_t count);
+
+typedef void (*WnCmLobbyDataObserverFn)(const WnCmLobbyData* data);
+
+__attribute__((visibility("default")))
+bool wn_cm_lobby_get_list(uint64_t hCall,
+                          uint32_t app_id,
+                          int32_t num_lobbies_requested,
+                          const char* const* filter_keys,
+                          const char* const* filter_values,
+                          const int32_t* filter_comparisons,
+                          const int32_t* filter_types,
+                          size_t filter_count,
+                          WnCmLobbyListCb cb);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_lobby_data_observer(WnCmLobbyDataObserverFn fn);
+
+typedef void (*WnCmLobbyCreatedCb)(uint64_t hCall,
+                                   int32_t eresult,
+                                   uint64_t lobby_sid);
+__attribute__((visibility("default")))
+bool wn_cm_lobby_create(uint64_t hCall,
+                        uint32_t app_id,
+                        int32_t lobby_type,
+                        int32_t max_members,
+                        WnCmLobbyCreatedCb cb);
+
+typedef void (*WnCmLobbyJoinedCb)(uint64_t hCall,
+                                  int32_t chat_room_enter_response,
+                                  uint64_t lobby_sid);
+__attribute__((visibility("default")))
+bool wn_cm_lobby_join(uint64_t hCall,
+                      uint32_t app_id,
+                      uint64_t lobby_sid,
+                      WnCmLobbyJoinedCb cb);
+
+__attribute__((visibility("default")))
+bool wn_cm_lobby_leave(uint32_t app_id, uint64_t lobby_sid);
+
+typedef void (*WnCmLobbySetDataCb)(uint64_t hCall, int32_t eresult);
+__attribute__((visibility("default")))
+bool wn_cm_lobby_set_data(uint64_t hCall,
+                          uint32_t app_id,
+                          uint64_t lobby_sid,
+                          uint64_t steam_id_member,
+                          const uint8_t* metadata, size_t metadata_len,
+                          int32_t max_members, int32_t lobby_type,
+                          int32_t lobby_flags,
+                          WnCmLobbySetDataCb cb);
+
+__attribute__((visibility("default")))
+bool wn_cm_lobby_send_chat(uint32_t app_id, uint64_t lobby_sid,
+                           const uint8_t* data, size_t n);
+
+typedef void (*WnCmLobbySetOwnerCb)(uint64_t hCall, int32_t eresult);
+__attribute__((visibility("default")))
+bool wn_cm_lobby_set_owner(uint64_t hCall,
+                           uint32_t app_id,
+                           uint64_t lobby_sid,
+                           uint64_t new_owner_sid,
+                           WnCmLobbySetOwnerCb cb);
+
+__attribute__((visibility("default")))
+bool wn_cm_lobby_invite_user(uint32_t app_id,
+                             uint64_t lobby_sid,
+                             uint64_t invitee_sid);
+
+typedef void (*WnCmLobbyChatMsgObserverFn)(uint64_t lobby_sid,
+                                           uint64_t sender_sid,
+                                           const uint8_t* data,
+                                           size_t n);
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_lobby_chat_msg_observer(WnCmLobbyChatMsgObserverFn fn);
+
+typedef void (*WnCmLobbyMembershipObserverFn)(int32_t joined /*1=joined,0=left*/,
+                                               uint64_t lobby_sid,
+                                               uint64_t user_sid,
+                                               const char* persona_name);
+__attribute__((visibility("default")))
+void wn_cm_bridge_register_lobby_membership_observer(WnCmLobbyMembershipObserverFn fn);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_start_state_sync_poller(void);
+
+__attribute__((visibility("default")))
+void wn_cm_bridge_stop_state_sync_poller(void);
+
+}  // extern "C"
diff --git a/app/src/main/cpp/wn-libsteamclient/src/api_entry.cpp b/app/src/main/cpp/wn-libsteamclient/src/api_entry.cpp
new file mode 100644
index 000000000..35ca1a93a
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/api_entry.cpp
@@ -0,0 +1,478 @@
+
+#include "wn_libsteamclient/runtime_state.h"
+#include "wn_libsteamclient/callbacks.h"
+#include "wn_libsteamclient/callback_registry.h"
+
+#include <android/log.h>
+#include <cstdint>
+#include <cstring>
+#include <vector>
+
+namespace lsc = wn_libsteamclient;
+
+#define WN_TAG  "WnLibSteamClient"
+#define WN_LOGI(...) __android_log_print(ANDROID_LOG_INFO,  WN_TAG, __VA_ARGS__)
+#define WN_LOGW(...) __android_log_print(ANDROID_LOG_WARN,  WN_TAG, __VA_ARGS__)
+#define WN_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, WN_TAG, __VA_ARGS__)
+
+extern "C" __attribute__((visibility("default")))
+void* CreateInterface(const char* version_name, int* return_code);
+
+
+extern "C" __attribute__((visibility("default")))
+int Steam_CreateSteamPipe(void) {
+    auto pipe = lsc::alloc_pipe();
+    if (pipe == 0) {
+        pipe = lsc::state().pipe.load();
+    }
+    WN_LOGI("Steam_CreateSteamPipe() -> %d", pipe);
+    return pipe;
+}
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_BReleaseSteamPipe(int pipe) {
+    int h_user = lsc::state().user.load();
+    namespace cb = wn_libsteamclient::callbacks;
+    cb::SteamShutdown sd_payload{};
+    lsc::push_callback(h_user, cb::kSteamShutdown, &sd_payload, 0);
+    bool ok = lsc::release_pipe(pipe);
+    WN_LOGI("Steam_BReleaseSteamPipe(%d) -> %d (SteamShutdown_t emitted)",
+            pipe, ok ? 1 : 0);
+    return ok;
+}
+
+extern "C" __attribute__((visibility("default")))
+int Steam_ConnectToGlobalUser(int pipe) {
+    auto user = lsc::alloc_global_user(pipe);
+    WN_LOGI("Steam_ConnectToGlobalUser(pipe=%d) -> %d", pipe, user);
+    return user;
+}
+
+extern "C" __attribute__((visibility("default")))
+int Steam_CreateGlobalUser(int* pipe_inout) {
+    if (!pipe_inout) return 0;
+    int pipe = lsc::alloc_pipe();
+    if (pipe == 0) pipe = lsc::state().pipe.load();   // already exists; reuse
+    int user = lsc::alloc_global_user(pipe);
+    WN_LOGI("Steam_CreateGlobalUser(*pipe=%d) -> user=%d", pipe, user);
+    return user;
+}
+
+extern "C" __attribute__((visibility("default")))
+int Steam_CreateLocalUser(int* pipe_inout, int /*account_type*/) {
+    return Steam_CreateGlobalUser(pipe_inout);
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_ReleaseUser(int pipe, int user) {
+    lsc::release_user(pipe, user);
+    WN_LOGI("Steam_ReleaseUser(pipe=%d, user=%d)", pipe, user);
+}
+
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_BLoggedOn(int pipe, int user) {
+    auto& s = lsc::state();
+    if (pipe == 0 || user == 0) return false;
+    if (s.pipe.load() != pipe || s.user.load() != user) return false;
+    return s.logged_on.load();
+}
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_BConnected(int pipe, int user) {
+    auto& s = lsc::state();
+    if (pipe == 0 || user == 0) return false;
+    if (s.pipe.load() != pipe || s.user.load() != user) return false;
+    return s.connected.load();
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_LogOn(int pipe, int user, uint64_t /*steamid*/) {
+    auto& s = lsc::state();
+    if (s.pipe.load() == pipe && s.user.load() == user) {
+        s.logged_on.store(true);
+        s.connected.store(true);
+    }
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_LogOff(int pipe, int user) {
+    auto& s = lsc::state();
+    if (s.pipe.load() == pipe && s.user.load() == user) {
+        s.logged_on.store(false);
+        s.connected.store(false);
+    }
+    WN_LOGI("Steam_LogOff(pipe=%d, user=%d)", pipe, user);
+}
+
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_BGetCallback(int pipe, void* cb_msg) {
+    if (!cb_msg) return false;
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.callback_mu);
+    if (s.callback_queue.empty()) return false;
+    lsc::CallbackMsg msg = std::move(s.callback_queue.front());
+    s.callback_queue.pop_front();
+    s.last_param = std::move(msg.body);
+    auto* dst = static_cast<uint8_t*>(cb_msg);
+    int  h_user   = msg.user;
+    int  i_cb     = msg.id;
+    void* pubParam = s.last_param.empty() ? nullptr : s.last_param.data();
+    int  cubParam = static_cast<int>(s.last_param.size());
+    std::memcpy(dst +  0, &h_user,   sizeof(int));
+    std::memcpy(dst +  4, &i_cb,     sizeof(int));
+    std::memcpy(dst +  8, &pubParam, sizeof(void*));
+    std::memcpy(dst + 16, &cubParam, sizeof(int));
+    return true;
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_FreeLastCallback(int /*pipe*/) {
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.callback_mu);
+    s.last_param.clear();
+    s.last_param.shrink_to_fit();
+}
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_GetAPICallResult(int /*pipe*/, uint64_t hCall,
+                            void* pCallback, int cubCallback,
+                            int iCallbackExpected, bool* pbFailed) {
+    if (hCall == 0) return false;
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.call_results_mu);
+    auto it = s.call_results_pending.find(hCall);
+    if (it == s.call_results_pending.end()) return false;
+    const auto& msg = it->second;
+    if (iCallbackExpected != 0 && msg.callback_id != iCallbackExpected) {
+        return false;
+    }
+    if (pCallback && cubCallback > 0 && !msg.body.empty()) {
+        size_t n = std::min<size_t>(static_cast<size_t>(cubCallback), msg.body.size());
+        std::memcpy(pCallback, msg.body.data(), n);
+    }
+    if (pbFailed) *pbFailed = msg.io_failure;
+    s.call_results_pending.erase(it);
+    return true;
+}
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_IsAPICallCompleted(int /*pipe*/, uint64_t hCall, bool* pbFailed) {
+    if (hCall == 0) return false;
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.call_results_mu);
+    auto it = s.call_results_pending.find(hCall);
+    if (it == s.call_results_pending.end()) return false;
+    if (pbFailed) *pbFailed = it->second.io_failure;
+    return true;
+}
+
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_IsKnownInterface(const char* /*pszInterfaceName*/) {
+    return false;
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_NotifyMissingInterface(int /*pipe*/, const char* iface) {
+    WN_LOGW("Steam_NotifyMissingInterface: %s", iface ? iface : "(null)");
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_SetLocalIPBinding(int /*ip*/, int /*port*/) {}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_ReleaseThreadLocalMemory(int /*bThreadExit*/) {}
+
+extern "C" __attribute__((visibility("default")))
+int Steam_GetGSHandle(int /*pipe*/, int /*user*/) { return 0; }
+
+extern "C" __attribute__((visibility("default")))
+bool Steam_InitiateGameConnection(int /*pipe*/, int /*user*/,
+                                  void* /*pAuthBlob*/, int /*cbMaxAuthBlob*/,
+                                  uint64_t /*steamIDGameServer*/,
+                                  uint32_t /*unIPServer*/,
+                                  uint16_t /*usPortServer*/,
+                                  bool /*bSecure*/) {
+    return false;
+}
+
+extern "C" __attribute__((visibility("default")))
+void Steam_TerminateGameConnection(int /*pipe*/, int /*user*/,
+                                   uint32_t /*unIPServer*/,
+                                   uint16_t /*usPortServer*/) {}
+
+
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSBLoggedOn  (int, int) { return false; }
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSBSecure   (int, int) { return false; }
+extern "C" __attribute__((visibility("default"))) uint64_t Steam_GSGetSteamID(int, int) { return 0; }
+extern "C" __attribute__((visibility("default"))) void   Steam_GSLogOff    (int, int) {}
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSLogOn     (int, int, uint64_t, uint32_t, uint16_t, uint16_t, int, bool) { return false; }
+extern "C" __attribute__((visibility("default"))) void   Steam_GSRemoveUserConnect       (int, int, uint64_t) {}
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSSendSteam2UserConnect   (int, int, uint64_t, uint32_t, uint32_t, uint16_t, const void*, int) { return false; }
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSSendSteam3UserConnect   (int, int, uint64_t, uint32_t, const void*, int) { return false; }
+extern "C" __attribute__((visibility("default"))) void   Steam_GSSendUserDisconnect      (int, int, uint64_t, uint32_t) {}
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSSendUserStatusResponse  (int, int, uint64_t, int, const void*, int) { return false; }
+extern "C" __attribute__((visibility("default"))) void   Steam_GSSetServerType           (int, int, uint32_t, uint32_t, uint16_t, uint16_t, uint16_t, const char*, const char*, bool) {}
+extern "C" __attribute__((visibility("default"))) void   Steam_GSSetSpawnCount           (int, int, uint32_t) {}
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSUpdateStatus            (int, int, int, int, int, const char*, const char*, const char*) { return false; }
+extern "C" __attribute__((visibility("default"))) bool   Steam_GSGetSteam2GetEncryptionKeyToSendToNewClient(int, int, void*, uint32_t*, uint32_t) { return false; }
+
+
+extern "C" __attribute__((visibility("default")))
+bool SteamAPI_RestartAppIfNecessary(uint32_t unOwnAppID) {
+    WN_LOGI("SteamAPI_RestartAppIfNecessary(appId=%u) -> false (no restart needed)",
+            static_cast<unsigned>(unOwnAppID));
+    return false;
+}
+
+extern "C" __attribute__((visibility("default")))
+bool SteamAPI_Init(void) {
+    int pipe = lsc::alloc_pipe();
+    if (pipe == 0) pipe = lsc::state().pipe.load();
+    int user = lsc::alloc_global_user(pipe);
+    (void)user;
+    WN_LOGI("SteamAPI_Init() -> true (pipe=%d user=%d)", pipe, user);
+    return true;
+}
+
+extern "C" __attribute__((visibility("default")))
+int SteamAPI_InitEx(char* p_outErrMsg) {
+    SteamAPI_Init();
+    if (p_outErrMsg) p_outErrMsg[0] = '\0';
+    return 0;  // k_ESteamAPIInitResult_OK
+}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_Shutdown(void) {
+    int pipe = lsc::state().pipe.load();
+    if (pipe != 0) {
+        Steam_BReleaseSteamPipe(pipe);
+    }
+    WN_LOGI("SteamAPI_Shutdown()");
+}
+
+extern "C" __attribute__((visibility("default")))
+bool SteamAPI_IsSteamRunning(void) { return true; }
+
+extern "C" __attribute__((visibility("default")))
+int SteamAPI_GetHSteamPipe(void) { return lsc::state().pipe.load(); }
+extern "C" __attribute__((visibility("default")))
+int SteamAPI_GetHSteamUser(void) { return lsc::state().user.load(); }
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_ReleaseCurrentThreadMemory(void) {}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_SetTryCatchCallbacks(bool /*bTryCatchCallbacks*/) {}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_WriteMiniDump(uint32_t /*uStructuredExceptionCode*/,
+                            void*    /*pvExceptionInfo*/,
+                            uint32_t /*uBuildID*/) {}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_RegisterCallback(void* pCallback, int iCallback) {
+    lsc::register_callback(pCallback, iCallback);
+}
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_UnregisterCallback(void* pCallback) {
+    lsc::unregister_callback(pCallback);
+}
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_RegisterCallResult(void* pCallback, uint64_t hAPICall) {
+    lsc::register_call_result(pCallback, hAPICall);
+}
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_UnregisterCallResult(void* pCallback, uint64_t hAPICall) {
+    lsc::unregister_call_result(pCallback, hAPICall);
+}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_RunCallbacks(void) {
+    auto& s = lsc::state();
+
+    for (;;) {
+        lsc::CallbackMsg msg;
+        {
+            std::lock_guard<std::mutex> lk(s.callback_mu);
+            if (s.callback_queue.empty()) break;
+            msg = std::move(s.callback_queue.front());
+            s.callback_queue.pop_front();
+        }
+        auto cbs = lsc::find_callbacks(msg.id);
+        for (void* cb : cbs) {
+            using RunFn = void (*)(void* /*this*/, void* /*pvParam*/);
+            void* payload = msg.body.empty() ? nullptr : msg.body.data();
+            long** vtable_ptr = reinterpret_cast<long**>(cb);
+            long*  vtable     = *vtable_ptr;
+            auto   run        = reinterpret_cast<RunFn>(vtable[0]);
+            run(cb, payload);
+        }
+    }
+
+    struct PendingDispatch {
+        uint64_t              h_call;
+        bool                  io_failure;
+        std::vector<uint8_t>  body;
+        std::vector<void*>    cbs;
+    };
+    std::vector<PendingDispatch> to_dispatch;
+    {
+        std::lock_guard<std::mutex> lk(s.call_results_mu);
+        for (auto it = s.call_results_pending.begin();
+             it != s.call_results_pending.end(); ) {
+            auto cbs = lsc::find_call_result_cbs(it->first);
+            if (cbs.empty()) {
+                ++it;
+                continue;
+            }
+            to_dispatch.push_back({
+                it->first, it->second.io_failure,
+                std::move(it->second.body), std::move(cbs)});
+            it = s.call_results_pending.erase(it);
+        }
+    }
+    for (auto& d : to_dispatch) {
+        void* payload = d.body.empty() ? nullptr : d.body.data();
+        for (void* cb : d.cbs) {
+            using RunResultFn = void (*)(void* /*this*/, void* /*pvParam*/,
+                                         bool /*bIOFailure*/,
+                                         uint64_t /*hSteamAPICall*/);
+            long** vtable_ptr = reinterpret_cast<long**>(cb);
+            long*  vtable     = *vtable_ptr;
+            auto   run        = reinterpret_cast<RunResultFn>(vtable[1]);
+            run(cb, payload, d.io_failure, d.h_call);
+        }
+    }
+}
+
+extern "C" __attribute__((visibility("default")))
+const char* SteamAPI_GetSteamInstallPath(void) { return nullptr; }
+
+extern "C" __attribute__((visibility("default")))
+void* SteamClient(void) {
+    int err = 0;
+    return CreateInterface("SteamClient020", &err);
+}
+
+extern "C" __attribute__((visibility("default")))
+bool SteamGameServer_Init(uint32_t /*unIP*/, uint16_t /*usGamePort*/,
+                          uint16_t /*usQueryPort*/, int /*eServerMode*/,
+                          const char* /*pchVersionString*/) {
+    WN_LOGI("SteamGameServer_Init -> false (game-server mode not implemented)");
+    return false;
+}
+extern "C" __attribute__((visibility("default")))
+void SteamGameServer_Shutdown(void) {}
+extern "C" __attribute__((visibility("default")))
+bool SteamGameServer_BSecure(void) { return false; }
+extern "C" __attribute__((visibility("default")))
+uint64_t SteamGameServer_GetSteamID(void) { return 0; }
+extern "C" __attribute__((visibility("default")))
+int SteamGameServer_GetHSteamPipe(void) { return 0; }
+extern "C" __attribute__((visibility("default")))
+int SteamGameServer_GetHSteamUser(void) { return 0; }
+extern "C" __attribute__((visibility("default")))
+void SteamGameServer_RunCallbacks(void) {}
+
+namespace {
+struct CallbackMsgWire {
+    int32_t   h_steam_user;
+    int32_t   i_callback;
+    uint8_t*  pub_param;
+    int32_t   cub_param;
+    int32_t   _pad;
+};
+static_assert(sizeof(CallbackMsgWire) == 24, "CallbackMsg_t must be 24B");
+
+std::atomic<bool> g_manual_dispatch_active{false};
+}  // namespace
+
+extern "C" __attribute__((visibility("default")))
+void Breakpad_SteamMiniDumpInit(uint32_t /*unAppID*/,
+                                 const char* /*pchVersion*/,
+                                 const char* /*pchDate*/) {}
+extern "C" __attribute__((visibility("default")))
+void Breakpad_SteamSendMiniDump(void* /*pvException*/,
+                                 uint32_t /*ulSeconds*/,
+                                 const char* /*pchAssertMsg*/) {}
+extern "C" __attribute__((visibility("default")))
+void Breakpad_SteamSetAppID(uint32_t /*unAppID*/) {}
+extern "C" __attribute__((visibility("default")))
+void Breakpad_SteamSetSteamID(uint64_t /*ulSteamID*/) {}
+extern "C" __attribute__((visibility("default")))
+void Breakpad_SteamWriteMiniDumpSetComment(const char* /*pchMsg*/) {}
+extern "C" __attribute__((visibility("default")))
+void Breakpad_SteamWriteMiniDumpUsingExceptionInfoWithBuildId(
+        unsigned int /*uStructuredExceptionCode*/,
+        void* /*pExceptionInfo*/,
+        unsigned int /*uBuildID*/) {}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_ManualDispatch_Init(void) {
+    g_manual_dispatch_active.store(true, std::memory_order_release);
+    WN_LOGI("SteamAPI_ManualDispatch_Init() — manual callback dispatch armed");
+}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_ManualDispatch_RunFrame(int /*hSteamPipe*/) {
+}
+
+extern "C" __attribute__((visibility("default")))
+bool SteamAPI_ManualDispatch_GetNextCallback(int /*hSteamPipe*/, void* p_msg_out) {
+    if (!p_msg_out) return false;
+    auto& s = lsc::state();
+    lsc::CallbackMsg msg;
+    {
+        std::lock_guard<std::mutex> lk(s.callback_mu);
+        if (s.callback_queue.empty()) return false;
+        msg = std::move(s.callback_queue.front());
+        s.callback_queue.pop_front();
+        s.last_param = std::move(msg.body);
+    }
+    auto* out = static_cast<CallbackMsgWire*>(p_msg_out);
+    out->h_steam_user = msg.user;
+    out->i_callback   = msg.id;
+    out->pub_param    = s.last_param.empty() ? nullptr : s.last_param.data();
+    out->cub_param    = static_cast<int32_t>(s.last_param.size());
+    out->_pad         = 0;
+    return true;
+}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_ManualDispatch_FreeLastCallback(int /*hSteamPipe*/) {
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.callback_mu);
+    s.last_param.clear();
+}
+
+extern "C" __attribute__((visibility("default")))
+bool SteamAPI_ManualDispatch_GetAPICallResult(int /*hSteamPipe*/,
+                                               uint64_t hCall,
+                                               void* p_callback,
+                                               int cb_callback,
+                                               int i_callback_expected,
+                                               bool* pb_failed) {
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.call_results_mu);
+    auto it = s.call_results_pending.find(hCall);
+    if (it == s.call_results_pending.end()) return false;
+    auto msg = std::move(it->second);
+    s.call_results_pending.erase(it);
+    if (i_callback_expected != 0 && msg.callback_id != i_callback_expected) {
+        const int got = msg.callback_id;
+        s.call_results_pending[hCall] = std::move(msg);
+        WN_LOGI("ManualDispatch_GetAPICallResult: hCall=0x%llx callback mismatch "
+                "(expected=%d got=%d) — re-queueing",
+                (unsigned long long)hCall, i_callback_expected, got);
+        return false;
+    }
+    if (p_callback && cb_callback > 0 && !msg.body.empty()) {
+        const int n = std::min<int>(cb_callback, static_cast<int>(msg.body.size()));
+        std::memcpy(p_callback, msg.body.data(), static_cast<size_t>(n));
+    }
+    if (pb_failed) *pb_failed = msg.io_failure;
+    return true;
+}
diff --git a/app/src/main/cpp/wn-libsteamclient/src/callback_registry.cpp b/app/src/main/cpp/wn-libsteamclient/src/callback_registry.cpp
new file mode 100644
index 000000000..1aa3440a4
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/callback_registry.cpp
@@ -0,0 +1,114 @@
+#include "wn_libsteamclient/callback_registry.h"
+
+#include <android/log.h>
+#include <mutex>
+#include <unordered_map>
+#include <vector>
+
+#define WN_TAG "WnLibSteamClient"
+#define WN_LOGI(...) __android_log_print(ANDROID_LOG_INFO, WN_TAG, __VA_ARGS__)
+
+namespace wn_libsteamclient {
+
+namespace {
+
+std::mutex                                g_registry_mu;
+std::unordered_map<int, std::vector<void*>> g_registry;
+size_t                                    g_total_size = 0;
+
+inline uint8_t* flags_ptr(void* cb) {
+    return reinterpret_cast<uint8_t*>(cb) + kCCallbackBaseFlagsOffset;
+}
+
+}  // namespace
+
+void register_callback(void* cb, int iCallback) {
+    if (!cb) return;
+    std::lock_guard<std::mutex> lk(g_registry_mu);
+    auto& bucket = g_registry[iCallback];
+    for (void* existing : bucket) {
+        if (existing == cb) return;
+    }
+    bucket.push_back(cb);
+    ++g_total_size;
+    WN_LOGI("register_callback(cb=%p, iCallback=%d) total=%zu",
+            cb, iCallback, g_total_size);
+}
+
+void unregister_callback(void* cb) {
+    if (!cb) return;
+    std::lock_guard<std::mutex> lk(g_registry_mu);
+    for (auto& [id, bucket] : g_registry) {
+        for (auto it = bucket.begin(); it != bucket.end(); ) {
+            if (*it == cb) {
+                it = bucket.erase(it);
+                --g_total_size;
+            } else {
+                ++it;
+            }
+        }
+    }
+}
+
+std::vector<void*> find_callbacks(int iCallback) {
+    std::lock_guard<std::mutex> lk(g_registry_mu);
+    auto it = g_registry.find(iCallback);
+    if (it == g_registry.end()) return {};
+    return it->second;  // copy — caller invokes outside the lock
+}
+
+size_t registry_size() {
+    std::lock_guard<std::mutex> lk(g_registry_mu);
+    return g_total_size;
+}
+
+
+namespace {
+std::mutex                                       g_cr_mu;
+std::unordered_map<uint64_t, std::vector<void*>> g_cr_registry;
+size_t                                           g_cr_total_size = 0;
+}  // namespace
+
+void register_call_result(void* cb, uint64_t hCall) {
+    if (!cb || hCall == 0) return;
+    std::lock_guard<std::mutex> lk(g_cr_mu);
+    auto& bucket = g_cr_registry[hCall];
+    for (void* existing : bucket) {
+        if (existing == cb) return;  // idempotent
+    }
+    bucket.push_back(cb);
+    ++g_cr_total_size;
+    WN_LOGI("register_call_result(cb=%p, hCall=%llu) total=%zu",
+            cb, static_cast<unsigned long long>(hCall), g_cr_total_size);
+}
+
+void unregister_call_result(void* cb, uint64_t hCall) {
+    if (!cb) return;
+    std::lock_guard<std::mutex> lk(g_cr_mu);
+    auto unbind_one = [&](std::vector<void*>& bucket) {
+        for (auto it = bucket.begin(); it != bucket.end(); ) {
+            if (*it == cb) { it = bucket.erase(it); --g_cr_total_size; }
+            else { ++it; }
+        }
+    };
+    if (hCall == 0) {
+        for (auto& [_, bucket] : g_cr_registry) unbind_one(bucket);
+    } else {
+        auto it = g_cr_registry.find(hCall);
+        if (it != g_cr_registry.end()) unbind_one(it->second);
+    }
+}
+
+std::vector<void*> find_call_result_cbs(uint64_t hCall) {
+    std::lock_guard<std::mutex> lk(g_cr_mu);
+    auto it = g_cr_registry.find(hCall);
+    if (it == g_cr_registry.end()) return {};
+    return it->second;
+}
+
+size_t call_result_registry_size() {
+    std::lock_guard<std::mutex> lk(g_cr_mu);
+    return g_cr_total_size;
+}
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/src/iclient_engine.cpp b/app/src/main/cpp/wn-libsteamclient/src/iclient_engine.cpp
new file mode 100644
index 000000000..057370e78
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/iclient_engine.cpp
@@ -0,0 +1,205 @@
+
+#include "wn_libsteamclient/runtime_state.h"
+
+#include <android/log.h>
+#include <cstdint>
+#include <cstring>
+
+namespace wn_libsteamclient {
+
+#define WN_LOGI(...) __android_log_print(ANDROID_LOG_INFO,  "WnLibSteamClient", __VA_ARGS__)
+#define WN_LOGW(...) __android_log_print(ANDROID_LOG_WARN,  "WnLibSteamClient", __VA_ARGS__)
+
+
+class IClientUserImpl {
+public:
+    virtual int      GetHSteamUser()                                 { return state().user.load(); } // 0  / 0x00
+
+    virtual void     SetSteamID(uint64_t sid)                        {                                // 1  / 0x08
+        pushed().steam_id.store(sid);
+        pushed().account_id.store(static_cast<uint32_t>(sid & 0xFFFFFFFFu));
+        WN_LOGI("IClientUser.SetSteamID(%llu)",
+                static_cast<unsigned long long>(sid));
+    }
+
+    virtual void  _slot02()  {}   // 2  / 0x010
+    virtual void  _slot03()  {}   // 3  / 0x018
+    virtual void  _slot04()  {}   // 4  / 0x020
+    virtual void  _slot05()  {}   // 5  / 0x028
+    virtual void  _slot06()  {}   // 6  / 0x030
+    virtual void  _slot07()  {}   // 7  / 0x038
+    virtual void  _slot08()  {}   // 8  / 0x040
+    virtual void  _slot09()  {}   // 9  / 0x048
+    virtual void  _slot10()  {}   // 10 / 0x050
+    virtual void  _slot11()  {}   // 11 / 0x058
+    virtual void  _slot12()  {}   // 12 / 0x060
+    virtual void  _slot13()  {}   // 13 / 0x068
+    virtual void  _slot14()  {}   // 14 / 0x070
+    virtual void  _slot15()  {}   // 15 / 0x078
+    virtual void  _slot16()  {}   // 16 / 0x080
+    virtual void  _slot17()  {}   // 17 / 0x088
+    virtual void  _slot18()  {}   // 18 / 0x090
+    virtual void  _slot19()  {}   // 19 / 0x098
+    virtual void  _slot20()  {}   // 20 / 0x0A0
+    virtual void  _slot21()  {}   // 21 / 0x0A8
+    virtual void  _slot22()  {}   // 22 / 0x0B0
+    virtual void  _slot23()  {}   // 23 / 0x0B8
+    virtual void  _slot24()  {}   // 24 / 0x0C0
+    virtual void  _slot25()  {}   // 25 / 0x0C8
+    virtual void  _slot26()  {}   // 26 / 0x0D0
+    virtual void  _slot27()  {}   // 27 / 0x0D8
+    virtual void  _slot28()  {}   // 28 / 0x0E0
+    virtual void  _slot29()  {}   // 29 / 0x0E8
+    virtual void  _slot30()  {}   // 30 / 0x0F0
+    virtual void  _slot31()  {}   // 31 / 0x0F8
+    virtual void  _slot32()  {}   // 32 / 0x100
+    virtual void  _slot33()  {}   // 33 / 0x108
+    virtual void  _slot34()  {}   // 34 / 0x110
+    virtual void  _slot35()  {}   // 35 / 0x118
+    virtual void  _slot36()  {}   // 36 / 0x120
+    virtual void  _slot37()  {}   // 37 / 0x128
+    virtual void  _slot38()  {}   // 38 / 0x130
+    virtual void  _slot39()  {}   // 39 / 0x138
+    virtual void  _slot40()  {}   // 40 / 0x140
+    virtual void  _slot41()  {}   // 41 / 0x148
+    virtual void  _slot42()  {}   // 42 / 0x150
+    virtual void  _slot43()  {}   // 43 / 0x158
+    virtual void  _slot44()  {}   // 44 / 0x160
+    virtual void  _slot45()  {}   // 45 / 0x168
+    virtual void  _slot46()  {}   // 46 / 0x170
+    virtual void  _slot47()  {}   // 47 / 0x178
+    virtual void  _slot48()  {}   // 48 / 0x180
+
+    virtual bool     IsAccountLoggedIn(const char* account) {                                    // 49 / 0x188
+        WN_LOGI("IClientUser.IsAccountLoggedIn(%s) -> 0 (no persisted session yet)",
+                account ? account : "(null)");
+        return false;
+    }
+
+    virtual void     SetAccount(const char* account, const char* /*password*/, int /*remember*/) { // 50 / 0x190
+        WN_LOGI("IClientUser.SetAccount(%s)", account ? account : "(null)");
+    }
+
+    virtual void  _slot51()  {}   // 51 / 0x198
+    virtual void  _slot52()  {}   // 52 / 0x1A0
+    virtual void  _slot53()  {}   // 53 / 0x1A8
+
+    virtual bool     SetLoginInformation(const char* account,
+                                         const char* /*password*/,
+                                         int /*remember*/) {                                     // 54 / 0x1B0
+        WN_LOGI("IClientUser.SetLoginInformation(%s, \"\", *)",
+                account ? account : "(null)");
+        return true;
+    }
+
+    virtual void  _slot55()  {}   // 55 / 0x1B8
+
+    virtual void     LogonWithRefreshToken(const char* token, const char* account) {              // 56 / 0x1C0
+        WN_LOGI("IClientUser.LogonWithRefreshToken(token=%zu bytes, account=%s)",
+                token ? std::strlen(token) : 0,
+                account ? account : "(null)");
+        set_logged_on(true);
+    }
+};
+
+
+
+class IClientEngineImpl {
+public:
+    virtual void* _slot00()                          { return nullptr; }  // 0  / 0x00
+    virtual void* _slot01()                          { return nullptr; }  // 1
+    virtual void* _slot02()                          { return nullptr; }  // 2
+    virtual void* _slot03()                          { return nullptr; }  // 3
+    virtual void* _slot04()                          { return nullptr; }  // 4
+    virtual void* _slot05()                          { return nullptr; }  // 5
+    virtual void* _slot06()                          { return nullptr; }  // 6
+    virtual void* _slot07()                          { return nullptr; }  // 7
+
+    virtual void* GetIClientUser(int /*user*/, int /*pipe*/);             // 8
+
+    virtual void* _slot09()  { return nullptr; }
+    virtual void* _slot10()  { return nullptr; }
+    virtual void* _slot11()  { return nullptr; }
+    virtual void* _slot12()  { return nullptr; }
+    virtual void* _slot13()  { return nullptr; }
+    virtual void* _slot14()  { return nullptr; }
+    virtual void* _slot15()  { return nullptr; }
+    virtual void* _slot16()  { return nullptr; }
+    virtual void* _slot17()  { return nullptr; }
+    virtual void* _slot18()  { return nullptr; }
+    virtual void* _slot19()  { return nullptr; }
+    virtual void* _slot20()  { return nullptr; }
+    virtual void* _slot21()  { return nullptr; }
+    virtual void* _slot22()  { return nullptr; }
+    virtual void* _slot23()  { return nullptr; }
+    virtual void* _slot24()  { return nullptr; }
+    virtual void* _slot25()  { return nullptr; }
+    virtual void* _slot26()  { return nullptr; }
+    virtual void* _slot27()  { return nullptr; }
+    virtual void* _slot28()  { return nullptr; }
+    virtual void* _slot29()  { return nullptr; }
+    virtual void* _slot30()  { return nullptr; }
+    virtual void* _slot31()  { return nullptr; }
+    virtual void* _slot32()  { return nullptr; }
+    virtual void* _slot33()  { return nullptr; }
+    virtual void* _slot34()  { return nullptr; }
+    virtual void* _slot35()  { return nullptr; }
+    virtual void* _slot36()  { return nullptr; }
+    virtual void* _slot37()  { return nullptr; }
+    virtual void* _slot38()  { return nullptr; }
+    virtual void* _slot39()  { return nullptr; }
+    virtual void* _slot40()  { return nullptr; }
+    virtual void* _slot41()  { return nullptr; }
+    virtual void* _slot42()  { return nullptr; }
+    virtual void* _slot43()  { return nullptr; }
+    virtual void* _slot44()  { return nullptr; }
+    virtual void* _slot45()  { return nullptr; }
+    virtual void* _slot46()  { return nullptr; }
+    virtual void* _slot47()  { return nullptr; }
+    virtual void* _slot48()  { return nullptr; }
+    virtual void* _slot49()  { return nullptr; }
+    virtual void* _slot50()  { return nullptr; }
+    virtual void* _slot51()  { return nullptr; }
+    virtual void* _slot52()  { return nullptr; }
+    virtual void* _slot53()  { return nullptr; }
+    virtual void* _slot54()  { return nullptr; }
+    virtual void* _slot55()  { return nullptr; }
+    virtual void* _slot56()  { return nullptr; }
+    virtual void* _slot57()  { return nullptr; }
+    virtual void* _slot58()  { return nullptr; }
+    virtual void* _slot59()  { return nullptr; }
+    virtual void* _slot60()  { return nullptr; }
+    virtual void* _slot61()  { return nullptr; }
+    virtual void* _slot62()  { return nullptr; }
+    virtual void* _slot63()  { return nullptr; }
+    virtual void* _slot64()  { return nullptr; }
+    virtual void* _slot65()  { return nullptr; }
+    virtual void* _slot66()  { return nullptr; }
+    virtual void* _slot67()  { return nullptr; }
+    virtual void* _slot68()  { return nullptr; }
+    virtual void* _slot69()  { return nullptr; }
+    virtual void* _slot70()  { return nullptr; }
+    virtual void* _slot71()  { return nullptr; }
+    virtual void* _slot72()  { return nullptr; }
+    virtual void* _slot73()  { return nullptr; }
+    virtual void* _slot74()  { return nullptr; }
+    virtual void* _slot75()  { return nullptr; }
+    virtual void* _slot76()  { return nullptr; }
+    virtual void* _slot77()  { return nullptr; }
+    virtual void* _slot78()  { return nullptr; }
+    virtual void* _slot79()  { return nullptr; }
+};
+
+
+static IClientUserImpl   g_client_user;
+static IClientEngineImpl g_client_engine;
+
+void* IClientEngineImpl::GetIClientUser(int /*user*/, int /*pipe*/) {
+    return &g_client_user;
+}
+
+extern "C" void* wn_get_iclient_engine() {
+    return &g_client_engine;
+}
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/src/isteam_client.cpp b/app/src/main/cpp/wn-libsteamclient/src/isteam_client.cpp
new file mode 100644
index 000000000..77e7de392
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/isteam_client.cpp
@@ -0,0 +1,173 @@
+
+#include "wn_libsteamclient/runtime_state.h"
+
+#include <android/log.h>
+#include <cstdint>
+#include <cstring>
+
+namespace wn_libsteamclient {
+
+extern "C" void* wn_get_isteam_utils();
+extern "C" void* wn_get_isteam_user();
+extern "C" void* wn_get_isteam_apps();
+extern "C" void* wn_get_isteam_friends();
+extern "C" void* wn_get_isteam_remote_storage();
+extern "C" void* wn_get_isteam_user_stats();
+extern "C" void* wn_get_isteam_inventory();
+extern "C" void* wn_get_isteam_screenshots();
+extern "C" void* wn_get_isteam_music();
+extern "C" void* wn_get_isteam_app_list();
+extern "C" void* wn_get_isteam_video();
+extern "C" void* wn_get_isteam_parental();
+extern "C" void* wn_get_isteam_matchmaking_servers();
+extern "C" void* wn_get_isteam_matchmaking();
+extern "C" void* wn_get_isteam_networking();
+extern "C" void* wn_get_isteam_ugc();
+extern "C" void* wn_get_isteam_game_server();
+extern "C" void* wn_get_isteam_music_remote();
+extern "C" void* wn_get_isteam_html_surface();
+extern "C" void* wn_get_isteam_input();
+extern "C" void* wn_get_isteam_parties();
+extern "C" void* wn_get_isteam_remote_play();
+extern "C" void* wn_get_isteam_networking_sockets();
+extern "C" void* wn_get_isteam_networking_utils();
+extern "C" void* wn_get_isteam_networking_messages();
+extern "C" void* wn_get_iclient_engine();
+
+extern "C" void* CreateInterface(const char* version_name, int* return_code);
+
+class ISteamClientImpl {
+public:
+    virtual int  CreateSteamPipe()                           {
+        int pipe = alloc_pipe();
+        if (pipe == 0) pipe = state().pipe.load();
+        return pipe;
+    }
+    virtual bool BReleaseSteamPipe(int pipe)                 { return release_pipe(pipe); }
+    virtual int  ConnectToGlobalUser(int pipe)               { return alloc_global_user(pipe); }
+    virtual int  CreateLocalUser(int* pipe_inout, int /*type*/) {
+        if (!pipe_inout) return 0;
+        int p = alloc_pipe(); if (p == 0) p = state().pipe.load();
+        int u = alloc_global_user(p);
+        return u;
+    }
+    virtual void ReleaseUser(int pipe, int user)             { release_user(pipe, user); }
+    virtual void* GetISteamUser(int /*u*/, int /*p*/, const char* /*v*/)              { return wn_get_isteam_user(); }
+    virtual void* GetISteamGameServer(int, int, const char*)                          { return wn_get_isteam_game_server(); }
+    virtual void  SetLocalIPBinding(uint32_t, uint16_t)                               {}
+    virtual void* GetISteamFriends(int /*u*/, int /*p*/, const char* /*v*/)           { return wn_get_isteam_friends(); }
+    virtual void* GetISteamUtils(int /*p*/, const char* /*v*/)                        { return wn_get_isteam_utils(); }
+    virtual void* GetISteamMatchmaking(int, int, const char*)                         { return wn_get_isteam_matchmaking(); }
+    virtual void* GetISteamMatchmakingServers(int, int, const char*)                  { return wn_get_isteam_matchmaking_servers(); }
+    virtual void* GetISteamGenericInterface(int, int, const char* version) {
+        int err = 0;
+        return CreateInterface(version, &err);
+    }
+    virtual void* GetISteamUserStats(int /*u*/, int /*p*/, const char* /*v*/)         { return wn_get_isteam_user_stats(); }
+    virtual void* GetISteamApps(int /*u*/, int /*p*/, const char* /*v*/)              { return wn_get_isteam_apps(); }
+    virtual void* GetISteamNetworking(int, int, const char*)                          { return wn_get_isteam_networking(); }
+    virtual void* GetISteamRemoteStorage(int /*u*/, int /*p*/, const char* /*v*/)     { return wn_get_isteam_remote_storage(); }
+    virtual void* GetISteamScreenshots(int, int, const char*)                         { return wn_get_isteam_screenshots(); }
+    virtual void* GetISteamUGC(int, int, const char*)                                 { return wn_get_isteam_ugc(); }
+    virtual void* GetISteamAppList(int, int, const char*)                             { return wn_get_isteam_app_list(); }
+    virtual void* GetISteamMusic(int, int, const char*)                               { return wn_get_isteam_music(); }
+    virtual void* GetISteamMusicRemote(int, int, const char*)                         { return wn_get_isteam_music_remote(); }
+    virtual void* GetISteamHTMLSurface(int, int, const char*)                         { return wn_get_isteam_html_surface(); }
+    virtual void  Set_SteamAPI_CPostAPIResultInProcess(void*)                         {}
+    virtual void  Remove_SteamAPI_CPostAPIResultInProcess(void*)                      {}
+    virtual void  Set_SteamAPI_CCheckCallbackRegisteredInProcess(void*)               {}
+    virtual void* GetISteamInventory(int, int, const char*)                           { return wn_get_isteam_inventory(); }
+    virtual void* GetISteamVideo(int, int, const char*)                               { return wn_get_isteam_video(); }
+    virtual void* GetISteamParentalSettings(int, int, const char*)                    { return wn_get_isteam_parental(); }
+    virtual void* GetISteamInput(int, int, const char*)                               { return wn_get_isteam_input(); }
+    virtual void* GetISteamParties(int, int, const char*)                             { return wn_get_isteam_parties(); }
+    virtual void* GetISteamRemotePlay(int, int, const char*)                          { return wn_get_isteam_remote_play(); }
+};
+
+static ISteamClientImpl g_steam_client;
+
+}  // namespace wn_libsteamclient
+
+
+extern "C" __attribute__((visibility("default")))
+void* CreateInterface(const char* version_name, int* return_code) {
+    if (!version_name) {
+        if (return_code) *return_code = -1;
+        return nullptr;
+    }
+    __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+        "CreateInterface(%s)", version_name);
+    if (std::strncmp(version_name, "SteamClient", 11) == 0) {
+        if (return_code) *return_code = 0;
+        return &wn_libsteamclient::g_steam_client;
+    }
+    if (std::strncmp(version_name, "SteamNetworkingSockets", 22) == 0) {
+        if (return_code) *return_code = 0;
+        return wn_libsteamclient::wn_get_isteam_networking_sockets();
+    }
+    if (std::strncmp(version_name, "SteamNetworkingUtils", 20) == 0) {
+        if (return_code) *return_code = 0;
+        return wn_libsteamclient::wn_get_isteam_networking_utils();
+    }
+    if (std::strncmp(version_name, "SteamNetworkingMessages", 23) == 0) {
+        if (return_code) *return_code = 0;
+        return wn_libsteamclient::wn_get_isteam_networking_messages();
+    }
+    auto dispatch_iface = [&](const char* prefix, int prefix_len,
+                              void* (*getter)()) -> void* {
+        if (std::strncmp(version_name, prefix, prefix_len) != 0) return nullptr;
+        if (return_code) *return_code = 0;
+        return getter();
+    };
+    if (void* p = dispatch_iface("SteamMatchMaking",  16, wn_libsteamclient::wn_get_isteam_matchmaking))         return p;
+    if (void* p = dispatch_iface("SteamMatchMakingServers", 23, wn_libsteamclient::wn_get_isteam_matchmaking_servers)) return p;
+    if (void* p = dispatch_iface("SteamUser",         9,  wn_libsteamclient::wn_get_isteam_user))                return p;
+    if (void* p = dispatch_iface("SteamFriends",      12, wn_libsteamclient::wn_get_isteam_friends))             return p;
+    if (void* p = dispatch_iface("SteamUtils",        10, wn_libsteamclient::wn_get_isteam_utils))               return p;
+    if (void* p = dispatch_iface("STEAMAPPS_INTERFACE_VERSION", 26, wn_libsteamclient::wn_get_isteam_apps))      return p;
+    if (void* p = dispatch_iface("STEAMUSERSTATS_INTERFACE_VERSION", 31, wn_libsteamclient::wn_get_isteam_user_stats)) return p;
+    if (void* p = dispatch_iface("STEAMREMOTESTORAGE_INTERFACE_VERSION", 35, wn_libsteamclient::wn_get_isteam_remote_storage)) return p;
+    if (void* p = dispatch_iface("STEAMSCREENSHOTS_INTERFACE_VERSION", 33, wn_libsteamclient::wn_get_isteam_screenshots)) return p;
+    if (void* p = dispatch_iface("STEAMINVENTORY_INTERFACE_V", 26, wn_libsteamclient::wn_get_isteam_inventory))  return p;
+    if (void* p = dispatch_iface("STEAMVIDEO_INTERFACE_V",     22, wn_libsteamclient::wn_get_isteam_video))      return p;
+    if (void* p = dispatch_iface("STEAMMUSIC_INTERFACE_VERSION", 28, wn_libsteamclient::wn_get_isteam_music))    return p;
+    if (void* p = dispatch_iface("STEAMMUSICREMOTE_INTERFACE_VERSION", 33, wn_libsteamclient::wn_get_isteam_music_remote)) return p;
+    if (void* p = dispatch_iface("STEAMHTMLSURFACE_INTERFACE_",27, wn_libsteamclient::wn_get_isteam_html_surface)) return p;
+    if (void* p = dispatch_iface("STEAMUGC_INTERFACE_VERSION", 26, wn_libsteamclient::wn_get_isteam_ugc))        return p;
+    if (void* p = dispatch_iface("STEAMAPPLIST_INTERFACE_VERSION", 30, wn_libsteamclient::wn_get_isteam_app_list)) return p;
+    if (void* p = dispatch_iface("STEAMPARENTALSETTINGS_INTERFACE_VERSION", 38, wn_libsteamclient::wn_get_isteam_parental)) return p;
+    if (void* p = dispatch_iface("SteamGameServer",   15, wn_libsteamclient::wn_get_isteam_game_server))         return p;
+    if (void* p = dispatch_iface("SteamNetworking",   15, wn_libsteamclient::wn_get_isteam_networking))          return p;
+    if (void* p = dispatch_iface("SteamInput",        10, wn_libsteamclient::wn_get_isteam_input))               return p;
+    if (void* p = dispatch_iface("SteamParties",      12, wn_libsteamclient::wn_get_isteam_parties))             return p;
+    if (void* p = dispatch_iface("SteamRemotePlay",   15, wn_libsteamclient::wn_get_isteam_remote_play))         return p;
+    if (std::strncmp(version_name,
+                     "CLIENTENGINE_INTERFACE_VERSION", 30) == 0) {
+        if (return_code) *return_code = 0;
+        return wn_libsteamclient::wn_get_iclient_engine();
+    }
+    if (return_code) *return_code = -1;
+    __android_log_print(ANDROID_LOG_WARN, "WnLibSteamClient",
+        "CreateInterface: unknown name='%s' — returning null", version_name);
+    return nullptr;
+}
+
+extern "C" __attribute__((visibility("default")))
+void* SteamInternal_FindOrCreateUserInterface(int /*hSteamUser*/,
+                                              const char* version_name) {
+    int rc = 0;
+    return CreateInterface(version_name, &rc);
+}
+
+extern "C" __attribute__((visibility("default")))
+void* SteamInternal_FindOrCreateGameServerInterface(int /*hSteamUser*/,
+                                                    const char* version_name) {
+    int rc = 0;
+    return CreateInterface(version_name, &rc);
+}
+
+extern "C" __attribute__((visibility("default")))
+void* SteamInternal_CreateInterface(const char* version_name) {
+    int rc = 0;
+    return CreateInterface(version_name, &rc);
+}
diff --git a/app/src/main/cpp/wn-libsteamclient/src/isteam_stubs.cpp b/app/src/main/cpp/wn-libsteamclient/src/isteam_stubs.cpp
new file mode 100644
index 000000000..286b56b0a
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/isteam_stubs.cpp
@@ -0,0 +1,3804 @@
+
+#include "wn_libsteamclient/runtime_state.h"
+#include "wn_libsteamclient/callbacks.h"
+#include "wn_steam/cm_bridge.h"
+
+#include <android/log.h>
+#include <algorithm>
+#include <chrono>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include <cstdio>
+#include <cstdlib>     // std::getenv, std::strtoul — GetAppID env fallback
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+namespace lsc_cb = wn_libsteamclient::callbacks;
+
+namespace wn_libsteamclient {
+
+static std::mutex& async_read_mu() {
+    static std::mutex m;
+    return m;
+}
+static std::unordered_map<uint64_t, std::vector<uint8_t>>& async_read_buffers() {
+    static std::unordered_map<uint64_t, std::vector<uint8_t>> m;
+    return m;
+}
+
+struct StreamSlot {
+    int         fd        = -1;
+    std::string tempPath;
+    std::string finalPath;
+    std::string name;     // original pchFile passed to Open
+    int64_t     bytes     = 0;
+};
+static std::mutex& stream_mu() { static std::mutex m; return m; }
+static std::unordered_map<uint64_t, StreamSlot>& streams() {
+    static std::unordered_map<uint64_t, StreamSlot> m;
+    return m;
+}
+
+class ISteamUtilsStub {
+public:
+    virtual uint32_t GetSecondsSinceAppActive()              { return 0; }                // 0
+    virtual uint32_t GetSecondsSinceComputerActive()         { return 0; }                // 1
+    virtual int      GetConnectedUniverse()                  { return 1; /*Public*/ }     // 2
+    virtual uint32_t GetServerRealTime()                     {                              // 3
+        auto anchor   = pushed().server_realtime.load();
+        auto anchor_local_ms = pushed().server_realtime_anchor_local_ms.load();
+        if (anchor != 0 && anchor_local_ms != 0) {
+            const auto now = std::chrono::steady_clock::now();
+            const auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                now.time_since_epoch()).count();
+            auto elapsed_s = (now_ms - anchor_local_ms) / 1000;
+            if (elapsed_s < 0) elapsed_s = 0;  // clock went backwards
+            return static_cast<uint32_t>(anchor + static_cast<uint32_t>(elapsed_s));
+        }
+        return static_cast<uint32_t>(::time(nullptr));
+    }
+    virtual const char* GetIPCountry()                       {                              // 4
+        auto& p = pushed();
+        if (p.ip_country_set.load() == 0) return "US";
+        return p.ip_country.c_str();
+    }
+    virtual bool GetImageSize(int iImage, uint32_t* pnWidth, uint32_t* pnHeight) {
+        if (iImage <= 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().image_registry.find(iImage);
+        if (it == pushed().image_registry.end()) return false;
+        if (pnWidth)  *pnWidth  = static_cast<uint32_t>(it->second.width);
+        if (pnHeight) *pnHeight = static_cast<uint32_t>(it->second.height);
+        return true;
+    }
+    virtual bool GetImageRGBA(int iImage, uint8_t* pubDest, int nDestBufferSize) {
+        if (iImage <= 0 || !pubDest || nDestBufferSize <= 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().image_registry.find(iImage);
+        if (it == pushed().image_registry.end()) return false;
+        const auto& img = it->second;
+        if (static_cast<int>(img.rgba.size()) > nDestBufferSize) return false;
+        std::memcpy(pubDest, img.rgba.data(), img.rgba.size());
+        return true;
+    }
+    virtual bool     GetCSERIPPort(uint32_t*, uint16_t*)     { return false; }            // 7
+    virtual uint8_t  GetCurrentBatteryPower()                { return 255; /*AC*/ }       // 8
+    virtual uint32_t GetAppID() {
+        uint32_t app = pushed().app_id.load();
+        if (app != 0) return app;
+        const char* env = std::getenv("SteamAppId");
+        if (env && *env) {
+            char* end = nullptr;
+            unsigned long v = std::strtoul(env, &end, 10);
+            if (end != env && v != 0 && v <= 0x7fffffffu) {
+                return static_cast<uint32_t>(v);
+            }
+        }
+        return 0;
+    } // 9
+    virtual void     SetOverlayNotificationPosition(int)     {}                           // 10
+    virtual bool     IsAPICallCompleted(uint64_t hCall, bool* pbFailed) {
+        if (hCall == 0) return false;
+        auto& s = state();
+        std::lock_guard<std::mutex> lk(s.call_results_mu);
+        auto it = s.call_results_pending.find(hCall);
+        if (it == s.call_results_pending.end()) return false;
+        if (pbFailed) *pbFailed = it->second.io_failure;
+        return true;
+    }
+    virtual int      GetAPICallFailureReason(uint64_t /*hCall*/)       { return -1; }
+    virtual bool     GetAPICallResult(uint64_t hCall, void* pCallback,
+                                       int cubCallback, int iCallbackExpected,
+                                       bool* pbFailed) {
+        if (hCall == 0) return false;
+        auto& s = state();
+        std::lock_guard<std::mutex> lk(s.call_results_mu);
+        auto it = s.call_results_pending.find(hCall);
+        if (it == s.call_results_pending.end()) return false;
+        const auto& msg = it->second;
+        if (iCallbackExpected != 0 && msg.callback_id != iCallbackExpected) {
+            return false;  // keep the entry — caller asked wrong type
+        }
+        if (pCallback && cubCallback > 0 && !msg.body.empty()) {
+            size_t n = std::min<size_t>(static_cast<size_t>(cubCallback), msg.body.size());
+            std::memcpy(pCallback, msg.body.data(), n);
+        }
+        if (pbFailed) *pbFailed = msg.io_failure;
+        s.call_results_pending.erase(it);
+        return true;
+    }
+    virtual void     RunFrame()                              {}                           // 14
+    virtual uint32_t GetIPCCallCount()                       { return 0; }                // 15
+    virtual void     SetWarningMessageHook(void*)            {}                           // 16
+    virtual bool     IsOverlayEnabled()                      { return true; }             // 17
+    virtual bool     BOverlayNeedsPresent()                  { return false; }            // 18
+    virtual uint64_t CheckFileSignature(const char* /*pszFileName*/) {
+        uint64_t hCall = alloc_api_call_handle();
+        lsc_cb::CheckFileSignature cb{};
+        cb.m_eCheckFileSignature = 4; // NoSignaturesFoundForThisFile
+        push_call_result(hCall, lsc_cb::kCheckFileSignature,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual bool     ShowGamepadTextInput(int, int, const char*, uint32_t, const char*) { return false; }       // 20
+    virtual uint32_t GetEnteredGamepadTextLength()           { return 0; }                // 21
+    virtual bool     GetEnteredGamepadTextInput(char*, uint32_t) { return false; }        // 22
+    virtual const char* GetSteamUILanguage()                 {                              // 23
+        auto& p = pushed();
+        if (p.ui_language.empty()) return "english";
+        return p.ui_language.c_str();
+    }
+    virtual bool     IsSteamRunningInVR()                    { return false; }            // 24
+    virtual void     SetOverlayNotificationInset(int, int)   {}                           // 25
+    virtual bool     IsSteamInBigPictureMode()               { return false; }            // 26
+    virtual void     StartVRDashboard()                      {}                           // 27
+    virtual bool     IsVRHeadsetStreamingEnabled()           { return false; }            // 28
+    virtual void     SetVRHeadsetStreamingEnabled(bool)      {}                           // 29
+    virtual bool     IsSteamChinaLauncher()                  { return false; }
+    virtual bool     InitFilterText(uint32_t)                { return false; }
+    virtual int      FilterText(int /*eContext*/, uint64_t /*srcSid*/,
+                                  const char* in, char* out, uint32_t outSize) {
+        if (!out || outSize == 0) return 0;
+        if (!in)  { out[0] = '\0'; return 0; }
+        uint32_t n = static_cast<uint32_t>(std::strlen(in));
+        uint32_t copy = std::min<uint32_t>(n, outSize - 1);
+        if (copy > 0) std::memcpy(out, in, copy);
+        out[copy] = '\0';
+        return static_cast<int>(copy);
+    }
+    virtual int      GetIPv6ConnectivityState(int)           { return 0; }
+    virtual bool     IsSteamRunningOnSteamDeck()             { return false; }
+    virtual bool     ShowFloatingGamepadTextInput(int, int, int, int, int) { return false; }
+    virtual void     SetGameLauncherMode(bool)               {}
+    virtual bool     DismissFloatingGamepadTextInput()       { return false; }
+};
+
+class ISteamUserStub {
+public:
+    virtual int       GetHSteamUser()                                { return state().user.load(); } // 0
+    virtual bool      BLoggedOn()                                    { return state().logged_on.load(); } // 1
+    virtual uint64_t  GetSteamID()                                   { return pushed().steam_id.load(); } // 2
+    virtual int       InitiateGameConnection_DEPRECATED(void*, int, uint64_t, uint32_t, uint16_t, bool) { return 0; } // 3
+    virtual void      TerminateGameConnection_DEPRECATED(uint32_t, uint16_t) {} // 4
+    virtual void      TrackAppUsageEvent(uint64_t, int, const char*) {}              // 5
+    virtual bool      GetUserDataFolder(char* pchBuffer, int cubBuffer) {
+        if (!pchBuffer || cubBuffer <= 0) return false;
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return false;
+        std::string ud;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().app_cloud_remote_dirs.find(app);
+            if (it == pushed().app_cloud_remote_dirs.end()) return false;
+            ud = it->second;
+        }
+        if (ud.size() > 7 && ud.compare(ud.size() - 7, 7, "/remote") == 0) {
+            ud.resize(ud.size() - 7);
+        } else if (ud.size() > 8 && ud.compare(ud.size() - 8, 8, "/remote/") == 0) {
+            ud.resize(ud.size() - 8);
+        }
+        size_t copy = std::min<size_t>(ud.size(),
+                                       static_cast<size_t>(cubBuffer - 1));
+        std::memcpy(pchBuffer, ud.data(), copy);
+        pchBuffer[copy] = '\0';
+        return true;
+    }
+    virtual void      StartVoiceRecording()                          {}              // 7
+    virtual void      StopVoiceRecording()                           {}              // 8
+    virtual int       GetAvailableVoice(uint32_t*, uint32_t*, uint32_t) { return 0; }// 9
+    virtual int       GetVoice(bool, void*, uint32_t, uint32_t*, bool, void*, uint32_t, uint32_t*, uint32_t) { return 0; } // 10
+    virtual int       DecompressVoice(const void*, uint32_t, void*, uint32_t, uint32_t*, uint32_t) { return 0; } // 11
+    virtual uint32_t  GetVoiceOptimalSampleRate()                    { return 11025; } // 12
+    virtual uint64_t  GetAuthSessionTicket(void* buf, int maxLen,
+                                            uint32_t* pcbTicket,
+                                            const void* /*pSteamNetworkingIdentity*/) {
+        uint32_t h = pushed().next_auth_ticket_handle.fetch_add(1);
+        if (h == 0) h = pushed().next_auth_ticket_handle.fetch_add(1);  // skip 0
+        uint32_t app_id = pushed().app_id.load();
+        std::vector<uint8_t> body;
+        bool cm_backed = false;
+        if (app_id != 0) {
+            size_t need = 0;
+            wn_cm_get_cached_app_ownership_ticket(app_id, nullptr, 0, &need);
+            if (need > 0 && need <= 16 * 1024) {  // sanity-cap at 16KB
+                std::vector<uint8_t> ownership(need);
+                size_t got = 0;
+                if (wn_cm_get_cached_app_ownership_ticket(
+                        app_id, ownership.data(), ownership.size(), &got)
+                    && got == need) {
+                    body.reserve(24 + ownership.size());
+                    body.resize(24, 0);
+                    auto put_u32 = [&](size_t off, uint32_t v) {
+                        body[off + 0] = static_cast<uint8_t>(v       & 0xFF);
+                        body[off + 1] = static_cast<uint8_t>((v >> 8)  & 0xFF);
+                        body[off + 2] = static_cast<uint8_t>((v >> 16) & 0xFF);
+                        body[off + 3] = static_cast<uint8_t>((v >> 24) & 0xFF);
+                    };
+                    put_u32(0,  20);                            // fixed prefix
+                    put_u32(4,  0);                             // padding
+                    put_u32(8,  0);                             // padding
+                    put_u32(12, h);                             // ConnectionID
+                    put_u32(16, static_cast<uint32_t>(::time(nullptr)));
+                    put_u32(20, 1);                             // ConnectionCount
+                    body.insert(body.end(), ownership.begin(), ownership.end());
+                    cm_backed = true;
+                }
+            }
+        }
+        if (!cm_backed) {
+            body.assign(32, 0);
+            body[0] = 'W'; body[1] = 'N'; body[2] = 'A'; body[3] = 'T';
+            std::memcpy(body.data() + 4,  &h, sizeof(h));
+            uint64_t sid = pushed().steam_id.load();
+            std::memcpy(body.data() + 8,  &sid, sizeof(sid));
+            uint64_t ts = static_cast<uint64_t>(::time(nullptr));
+            std::memcpy(body.data() + 16, &ts, sizeof(ts));
+        }
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            pushed().auth_tickets[h] = {h, app_id, body};
+        }
+        if (buf && maxLen > 0) {
+            uint32_t copy = std::min<uint32_t>(body.size(), static_cast<uint32_t>(maxLen));
+            std::memcpy(buf, body.data(), copy);
+        }
+        if (pcbTicket) *pcbTicket = static_cast<uint32_t>(body.size());
+        lsc_cb::GetAuthSessionTicketResponse cb{};
+        cb.m_hAuthTicket = h;
+        cb.m_eResult     = 1;  // k_EResultOK
+        push_callback(state().user.load(),
+                      lsc_cb::kGetAuthSessionTicketResponse,
+                      &cb, sizeof(cb));
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "GetAuthSessionTicket(app=%u) → h=%u size=%zu (%s)",
+            app_id, h, body.size(), cm_backed ? "CM-backed" : "synthetic");
+        return h;
+    }
+    virtual uint64_t  GetAuthTicketForWebApi(const char* pchIdentity) {
+        uint32_t app_id = pushed().app_id.load();
+        std::vector<uint8_t> ownership;
+        if (app_id != 0) {
+            size_t need = 0;
+            wn_cm_get_cached_app_ownership_ticket(app_id, nullptr, 0, &need);
+            if (need > 0 && need <= 16 * 1024) {
+                ownership.resize(need);
+                size_t got = 0;
+                if (!wn_cm_get_cached_app_ownership_ticket(
+                        app_id, ownership.data(), ownership.size(), &got)
+                    || got != need) {
+                    ownership.clear();
+                }
+            }
+        }
+        bool have_cm = !ownership.empty();
+        uint32_t h = static_cast<uint32_t>(alloc_api_call_handle() & 0xFFFFFFFF);
+        if (h == 0) h = static_cast<uint32_t>(alloc_api_call_handle() & 0xFFFFFFFF);
+        std::vector<uint8_t> body;
+        if (have_cm) {
+            body.reserve(24 + ownership.size());
+            body.resize(24, 0);
+            auto put_u32 = [&](size_t off, uint32_t v) {
+                body[off + 0] = static_cast<uint8_t>(v       & 0xFF);
+                body[off + 1] = static_cast<uint8_t>((v >> 8)  & 0xFF);
+                body[off + 2] = static_cast<uint8_t>((v >> 16) & 0xFF);
+                body[off + 3] = static_cast<uint8_t>((v >> 24) & 0xFF);
+            };
+            put_u32(0,  20);                            // fixed prefix
+            put_u32(12, h);                             // ConnectionID
+            put_u32(16, static_cast<uint32_t>(::time(nullptr)));
+            put_u32(20, 1);                             // ConnectionCount
+            body.insert(body.end(), ownership.begin(), ownership.end());
+        } else {
+            body.assign(32, 0);
+            body[0] = 'W'; body[1] = 'N'; body[2] = 'A'; body[3] = 'W';
+            std::memcpy(body.data() + 4,  &h, sizeof(h));
+            uint64_t sid = pushed().steam_id.load();
+            std::memcpy(body.data() + 8,  &sid, sizeof(sid));
+            uint64_t ts = static_cast<uint64_t>(::time(nullptr));
+            std::memcpy(body.data() + 16, &ts, sizeof(ts));
+        }
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            pushed().auth_tickets[h] = {h, app_id, body};
+        }
+        lsc_cb::GetTicketForWebApiResponse cb{};
+        cb.m_hAuthTicket = h;
+        cb.m_eResult     = 1; // k_EResultOK
+        size_t copy = std::min<size_t>(body.size(), sizeof(cb.m_rgubTicket));
+        cb.m_cubTicket = static_cast<int32_t>(copy);
+        std::memcpy(cb.m_rgubTicket, body.data(), copy);
+        push_callback(state().user.load(),
+                      lsc_cb::kGetTicketForWebApiResponse,
+                      &cb, sizeof(cb));
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "GetAuthTicketForWebApi(identity=\"%s\") → h=%u size=%zu (%s)",
+            pchIdentity ? pchIdentity : "(null)", h, body.size(),
+            have_cm ? "CM-backed" : "synthetic");
+        return h;
+    }
+    virtual int       BeginAuthSession(const void* /*ticket*/, int cbTicket,
+                                        uint64_t steamID) {
+        lsc_cb::ValidateAuthTicketResponse cb{};
+        cb.m_SteamID              = steamID;
+        cb.m_eAuthSessionResponse = 0;  // k_EAuthSessionResponseOK
+        cb.m_OwnerSteamID         = steamID;  // owner == user when not family-shared
+        push_callback(state().user.load(),
+                      lsc_cb::kValidateAuthTicketResponse,
+                      &cb, sizeof(cb));
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "BeginAuthSession(cbTicket=%d, steamID=%llu) -> OK (synthetic validation)",
+            cbTicket, static_cast<unsigned long long>(steamID));
+        return 0;
+    }
+    virtual void      EndAuthSession(uint64_t)                       {}
+    virtual void      CancelAuthTicket(uint64_t hAuthTicket) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        pushed().auth_tickets.erase(static_cast<uint32_t>(hAuthTicket));
+    }
+    virtual int       UserHasLicenseForApp(uint64_t steamID, uint32_t appID) {
+        if (appID == 0) return 2;
+        uint64_t self = pushed().steam_id.load();
+        if (steamID != 0 && steamID == self) {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            return pushed().owned_apps.count(appID) > 0 ? 0 : 1;
+        }
+        return 2; /*NoAuth — we can't speak for other users*/
+    }
+    virtual bool      BIsBehindNAT()                                 { return true; }  // 19
+    virtual void      AdvertiseGame(uint64_t, uint32_t, uint16_t)    {}              // 20
+    virtual uint64_t  RequestEncryptedAppTicket(void* rgubData, int cbData) {
+        uint32_t app = pushed().app_id.load();
+        uint64_t h   = alloc_api_call_handle();
+        bool     have_real_bytes = false;
+        std::vector<uint8_t> body;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().encrypted_app_tickets.find(app);
+            if (it != pushed().encrypted_app_tickets.end() && !it->second.empty()) {
+                body = it->second;
+                have_real_bytes = true;
+            } else {
+                body.resize(32);
+                std::memcpy(body.data(),      "WNETKT\0\0\0\0\0\0\0\0\0\0", 16);
+                std::memcpy(body.data() + 16, &app, sizeof(app));
+                uint32_t h32 = static_cast<uint32_t>(h);
+                std::memcpy(body.data() + 20, &h32, sizeof(h32));
+                uint64_t sid = pushed().steam_id.load();
+                std::memcpy(body.data() + 24, &sid, sizeof(sid));
+                pushed().encrypted_app_tickets[app] = body;
+            }
+        }
+        int32_t eresult = have_real_bytes ? 1 : 1;  // SDK contract: synthetic returns OK
+        pushed().encrypted_app_ticket_eresult.store(eresult);
+        (void)rgubData; (void)cbData;
+        lsc_cb::EncryptedAppTicketResponse cb{};
+        cb.m_eResult = eresult;
+        push_call_result(h, lsc_cb::kEncryptedAppTicketResponse,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "RequestEncryptedAppTicket(app=%u) -> hCall=%llu (body=%zu B, %s)",
+            app, static_cast<unsigned long long>(h), body.size(),
+            have_real_bytes ? "real" : "synthetic");
+        return h;
+    }
+    virtual bool      GetEncryptedAppTicket(void* buf, int cbMax, uint32_t* pcbTicket) {
+        uint32_t app = pushed().app_id.load();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().encrypted_app_tickets.find(app);
+        if (it == pushed().encrypted_app_tickets.end() || it->second.empty()) {
+            if (pcbTicket) *pcbTicket = 0;
+            return false;
+        }
+        const auto& body = it->second;
+        uint32_t copy = std::min<uint32_t>(body.size(),
+                                            static_cast<uint32_t>(std::max(0, cbMax)));
+        if (buf && copy > 0) std::memcpy(buf, body.data(), copy);
+        if (pcbTicket) *pcbTicket = static_cast<uint32_t>(body.size());
+        return true;
+    }
+    virtual int       GetGameBadgeLevel(int nSeries, bool bFoil) {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return 0;
+        int32_t key = (static_cast<int32_t>(app) & 0x0FFFFFFF)
+                    | ((nSeries & 0x07) << 28)
+                    | (bFoil ? (1 << 31) : 0);
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().self_game_badges.find(key);
+        return it == pushed().self_game_badges.end() ? 0 : it->second;
+    }
+    virtual int       GetPlayerSteamLevel() {
+        return pushed().self_player_level.load();
+    }
+    virtual uint64_t RequestStoreAuthURL(const char* pchRedirectURL) {
+        uint64_t hCall = alloc_api_call_handle();
+        lsc_cb::StoreAuthURLResponse cb{};
+        const char* redirect = pchRedirectURL ? pchRedirectURL : "";
+        std::snprintf(cb.m_szURL, sizeof(cb.m_szURL),
+                      "https://store.steampowered.com/login/?redir=%s",
+                      redirect);
+        push_call_result(hCall, lsc_cb::kStoreAuthURLResponse,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual bool      BIsPhoneVerified() {
+        return pushed().account_phone_verified.load();
+    }
+    virtual bool      BIsTwoFactorEnabled() {
+        return pushed().account_two_factor_enabled.load();
+    }
+    virtual bool      BIsPhoneIdentifying() {
+        return pushed().account_phone_identifying.load();
+    }
+    virtual bool      BIsPhoneRequiringVerification() {
+        return pushed().account_phone_requires_verification.load();
+    }
+    virtual uint64_t GetMarketEligibility() {
+        uint64_t hCall = alloc_api_call_handle();
+        lsc_cb::MarketEligibilityResponse cb{};
+        bool twoFA = pushed().account_two_factor_enabled.load();
+        bool phone = pushed().account_phone_verified.load();
+        cb.m_bAllowed = (twoFA && phone);
+        cb.m_eNotAllowedReason             = cb.m_bAllowed ? 0 : 2;
+        cb.m_rtAllowedAtTime               = 0;
+        cb.m_cdaySteamGuardRequiredDays    = cb.m_bAllowed ? 0 : 15;
+        cb.m_cdayNewDeviceCooldown         = 0;
+        push_call_result(hCall, lsc_cb::kMarketEligibilityResponse,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual uint64_t GetDurationControl() {
+        uint64_t hCall = alloc_api_call_handle();
+        lsc_cb::DurationControl cb{};
+        cb.m_eResult        = 1; // k_EResultOK
+        cb.m_appid          = pushed().app_id.load();
+        cb.m_bApplicable    = false; // non-CN
+        cb.m_csecsLast5h    = 0;
+        cb.m_progress       = 0;     // k_EDurationControlProgress_Full
+        cb.m_notification   = 0;     // k_EDurationControlNotification_None
+        cb.m_csecsToday     = 0;
+        cb.m_csecsRemaining = 0;
+        push_call_result(hCall, lsc_cb::kDurationControl,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual bool      BSetDurationControlOnlineState(int /*state*/)  { return true; }  // 32
+};
+
+class ISteamAppsStub {
+public:
+    static bool env_app_id_matches(uint32_t app) {
+        if (app == 0) return false;
+        const char* env = std::getenv("SteamAppId");
+        if (!env || !*env) return false;
+        char* end = nullptr;
+        unsigned long v = std::strtoul(env, &end, 10);
+        return (end != env && v == app);
+    }
+
+    virtual bool      BIsSubscribed() {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return false;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            if (pushed().owned_apps.count(app) > 0) return true;
+        }
+        return env_app_id_matches(app);
+    }
+    virtual bool      BIsLowViolence() {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return pushed().app_low_violence.count(app) > 0;
+    }
+    virtual bool      BIsCybercafe()                                 { return false; } // 2
+    virtual bool      BIsVACBanned() {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return pushed().app_vac_banned.count(app) > 0;
+    }
+    virtual const char* GetCurrentGameLanguage() {
+        static thread_local std::string tls_lang;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            tls_lang = pushed().ui_language;
+        }
+        if (tls_lang.empty()) tls_lang = "english";
+        return tls_lang.c_str();
+    }
+    virtual const char* GetAvailableGameLanguages()                  { return "english"; } // 5
+    virtual bool      BIsSubscribedApp(uint32_t appId)               {                 // 6
+        {
+            auto& p = pushed();
+            std::lock_guard<std::mutex> lk(state_mutex());
+            if (p.owned_apps.count(appId) > 0) return true;
+        }
+        return env_app_id_matches(appId);
+    }
+    virtual bool      BIsDlcInstalled(uint32_t appId)                {                 // 7
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        if (p.installed_apps.count(appId) > 0 &&
+            p.owned_apps.count(appId) > 0) {
+            return true;
+        }
+        if (p.owned_apps.count(appId) == 0) return false;
+        for (const auto& kv : p.app_dlcs) {
+            for (const auto& d : kv.second) {
+                if (d.app_id == appId &&
+                    p.installed_apps.count(kv.first) > 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    virtual uint32_t GetEarliestPurchaseUnixTime(uint32_t app_id) {
+        if (app_id == 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto pit = pushed().app_source_packages.find(app_id);
+        if (pit == pushed().app_source_packages.end()) return 0;
+        uint32_t earliest = 0;
+        for (uint32_t pkg : pit->second) {
+            auto lit = pushed().licenses.find(pkg);
+            if (lit == pushed().licenses.end()) continue;
+            uint32_t t = lit->second.time_created;
+            if (t == 0) continue;
+            if (earliest == 0 || t < earliest) earliest = t;
+        }
+        return earliest;
+    }
+    virtual bool BIsSubscribedFromFreeWeekend() {
+        uint32_t app_id = pushed().app_id.load();
+        if (app_id == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto pit = pushed().app_source_packages.find(app_id);
+        if (pit == pushed().app_source_packages.end()) return false;
+        for (uint32_t pkg : pit->second) {
+            auto lit = pushed().licenses.find(pkg);
+            if (lit == pushed().licenses.end()) continue;
+            if (lit->second.license_type == 11 /*FreeWeekend*/) return true;
+        }
+        return false;
+    }
+    virtual int       GetDLCCount(uint32_t appId) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_dlcs.find(appId);
+        return it == pushed().app_dlcs.end() ? 0 : static_cast<int>(it->second.size());
+    }
+    virtual bool      BGetDLCDataByIndex(uint32_t appId, int iDLC,
+                                          uint32_t* pAppID, bool* pbAvailable,
+                                          char* pchName, int cchNameBufferSize) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_dlcs.find(appId);
+        if (it == pushed().app_dlcs.end()) return false;
+        const auto& dlcs = it->second;
+        if (iDLC < 0 || static_cast<size_t>(iDLC) >= dlcs.size()) return false;
+        const auto& d = dlcs[static_cast<size_t>(iDLC)];
+        if (pAppID)      *pAppID      = d.app_id;
+        if (pbAvailable) *pbAvailable = d.available;
+        if (pchName && cchNameBufferSize > 0) {
+            int copy = std::min<int>(static_cast<int>(d.name.size()),
+                                      cchNameBufferSize - 1);
+            if (copy > 0) std::memcpy(pchName, d.name.data(), copy);
+            pchName[copy] = '\0';
+        }
+        return true;
+    }
+    virtual void      InstallDLC(uint32_t)                           {}                // 12
+    virtual void      UninstallDLC(uint32_t)                         {}                // 13
+    virtual void      RequestAppProofOfPurchaseKey(uint32_t)         {}                // 14
+    virtual bool      GetCurrentBetaName(char* pchName, int cchNameBufferSize) {
+        if (!pchName || cchNameBufferSize <= 0) return false;
+        uint32_t app_id = pushed().app_id.load();
+        if (app_id == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_current_beta.find(app_id);
+        if (it == pushed().app_current_beta.end()) return false;
+        const std::string& name = it->second;
+        if (name.empty()) return false;
+        size_t copy = std::min<size_t>(name.size(),
+                                       static_cast<size_t>(cchNameBufferSize - 1));
+        std::memcpy(pchName, name.data(), copy);
+        pchName[copy] = '\0';
+        return true;
+    }
+    virtual bool      MarkContentCorrupt(bool /*bMissingFilesOnly*/) {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        pushed().apps_marked_corrupt.insert(app);
+        return true;
+    }
+    virtual uint32_t  GetInstalledDepots(uint32_t appID, uint32_t* pvecDepots,
+                                          uint32_t cMaxDepots) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_installed_depots.find(appID);
+        if (it == pushed().app_installed_depots.end()) return 0;
+        const auto& depots = it->second;
+        uint32_t copy = std::min<uint32_t>(static_cast<uint32_t>(depots.size()),
+                                            cMaxDepots);
+        if (pvecDepots && copy > 0) {
+            for (uint32_t i = 0; i < copy; ++i) pvecDepots[i] = depots[i];
+        }
+        return copy;
+    }
+    virtual uint32_t  GetAppInstallDir(uint32_t appId, char* buf, uint32_t cap) {       // 18
+        if (!buf || cap == 0) return 0;
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = p.app_install_dirs.find(appId);
+        if (it == p.app_install_dirs.end()) {
+            buf[0] = '\0';
+            return 0;
+        }
+        const std::string& d = it->second;
+        uint32_t n = static_cast<uint32_t>(d.size());
+        uint32_t copy = (n + 1 < cap) ? n : cap - 1;
+        std::memcpy(buf, d.data(), copy);
+        buf[copy] = '\0';
+        return n + 1;  // documented: returns length INCLUDING null
+    }
+    virtual bool      BIsAppInstalled(uint32_t appId)                {                 // 19
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return p.installed_apps.count(appId) > 0;
+    }
+    virtual uint64_t GetAppOwner() {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return 0;
+        uint64_t self_sid = pushed().steam_id.load();
+        if (self_sid == 0) return 0;
+        uint32_t self_account = static_cast<uint32_t>(self_sid & 0xFFFFFFFFu);
+        std::lock_guard<std::mutex> lk(state_mutex());
+        bool in_owned = pushed().owned_apps.count(app) > 0;
+        auto pit = pushed().app_source_packages.find(app);
+        bool has_pkgs = (pit != pushed().app_source_packages.end());
+        if (!in_owned && !has_pkgs) return 0;
+        if (!has_pkgs) return self_sid;  // owned but no pkg map — assume self
+        uint32_t fallback_owner = 0;
+        bool has_self_match     = false;
+        for (uint32_t pkg : pit->second) {
+            auto lit = pushed().licenses.find(pkg);
+            if (lit == pushed().licenses.end()) continue;
+            if (lit->second.owner_id == self_account) {
+                has_self_match = true;
+                break;
+            }
+            if (fallback_owner == 0) fallback_owner = lit->second.owner_id;
+        }
+        if (has_self_match) return self_sid;
+        if (fallback_owner != 0) {
+            return 0x0110000100000000ULL |
+                   static_cast<uint64_t>(fallback_owner);
+        }
+        return self_sid;
+    }
+    virtual const char* GetLaunchQueryParam(const char*)             { return ""; }    // 21
+    virtual bool      GetDlcDownloadProgress(uint32_t appID, uint64_t* pBytesDownloaded,
+                                              uint64_t* pBytesTotal) {
+        if (appID == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_dl_progress.find(appID);
+        if (it == pushed().app_dl_progress.end()) return false;
+        if (it->second.bytes_total == 0) return false;
+        if (pBytesDownloaded) *pBytesDownloaded = it->second.bytes_downloaded;
+        if (pBytesTotal)      *pBytesTotal      = it->second.bytes_total;
+        return true;
+    }
+    virtual int       GetAppBuildId() {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_build_ids.find(app);
+        return it == pushed().app_build_ids.end() ? 0 : static_cast<int>(it->second);
+    }
+    virtual void      RequestAllProofOfPurchaseKeys()                {}                // 24
+    virtual uint64_t GetFileDetails(const char* pchFile) {
+        uint64_t hCall = alloc_api_call_handle();
+        lsc_cb::FileDetailsResult cb{};
+        uint32_t app = pushed().app_id.load();
+        std::string base;
+        if (app != 0 && pchFile && *pchFile) {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().app_install_dirs.find(app);
+            if (it != pushed().app_install_dirs.end()) base = it->second;
+        }
+        if (base.empty()) {
+            cb.m_eResult = 9; // k_EResultFileNotFound
+            push_call_result(hCall, lsc_cb::kFileDetailsResult,
+                             &cb, sizeof(cb), /*io_failure=*/false);
+            return hCall;
+        }
+        std::string fname(pchFile);
+        if (fname.find("..") != std::string::npos || fname[0] == '/') {
+            cb.m_eResult = 9;
+            push_call_result(hCall, lsc_cb::kFileDetailsResult,
+                             &cb, sizeof(cb), /*io_failure=*/false);
+            return hCall;
+        }
+        std::string path = base;
+        if (!path.empty() && path.back() != '/') path.push_back('/');
+        path.append(fname);
+        int fd = ::open(path.c_str(), O_RDONLY);
+        if (fd < 0) {
+            cb.m_eResult = 9;
+            push_call_result(hCall, lsc_cb::kFileDetailsResult,
+                             &cb, sizeof(cb), /*io_failure=*/false);
+            return hCall;
+        }
+        struct stat st {};
+        if (::fstat(fd, &st) != 0 || st.st_size > 64LL * 1024 * 1024) {
+            ::close(fd);
+            cb.m_eResult = 2; // k_EResultFail
+            push_call_result(hCall, lsc_cb::kFileDetailsResult,
+                             &cb, sizeof(cb), /*io_failure=*/false);
+            return hCall;
+        }
+        uint64_t h64 = 0xcbf29ce484222325ULL;
+        uint8_t buf[8192];
+        ssize_t n;
+        while ((n = ::read(fd, buf, sizeof(buf))) > 0) {
+            for (ssize_t i = 0; i < n; ++i) {
+                h64 ^= buf[i];
+                h64 *= 0x100000001b3ULL;
+            }
+        }
+        ::close(fd);
+        cb.m_eResult    = 1; // k_EResultOK
+        cb.m_ulFileSize = static_cast<uint64_t>(st.st_size);
+        std::memcpy(cb.m_FileSHA + 0,  &h64, sizeof(h64));
+        uint64_t h64_rot = (h64 << 32) | (h64 >> 32);
+        std::memcpy(cb.m_FileSHA + 8,  &h64_rot, sizeof(h64_rot));
+        uint32_t h32 = static_cast<uint32_t>(h64 ^ h64_rot);
+        std::memcpy(cb.m_FileSHA + 16, &h32, sizeof(h32));
+        cb.m_unFlags = 0;
+        push_call_result(hCall, lsc_cb::kFileDetailsResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual int       GetLaunchCommandLine(char* buf, int cubMax) {
+        if (!buf || cubMax <= 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        const std::string& cl = pushed().launch_command_line;
+        int n = static_cast<int>(cl.size());
+        int copy = std::min(n, cubMax - 1);
+        if (copy > 0) std::memcpy(buf, cl.data(), copy);
+        buf[copy] = '\0';
+        return copy;
+    }
+    virtual bool BIsSubscribedFromFamilySharing() {
+        uint32_t app_id = pushed().app_id.load();
+        if (app_id == 0) return pushed().app_is_family_shared.load();
+        uint64_t sid = pushed().steam_id.load();
+        if (sid == 0) return pushed().app_is_family_shared.load();
+        uint32_t self_account = static_cast<uint32_t>(sid & 0xFFFFFFFFu);
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto pit = pushed().app_source_packages.find(app_id);
+        if (pit == pushed().app_source_packages.end()) {
+            return pushed().app_is_family_shared.load();
+        }
+        bool any_license_match = false;
+        bool any_self_owned    = false;
+        for (uint32_t pkg : pit->second) {
+            auto lit = pushed().licenses.find(pkg);
+            if (lit == pushed().licenses.end()) continue;
+            any_license_match = true;
+            if (lit->second.owner_id == self_account) {
+                any_self_owned = true;
+                break;
+            }
+        }
+        if (!any_license_match) {
+            return pushed().app_is_family_shared.load();
+        }
+        return !any_self_owned;
+    }
+    virtual bool BIsTimedTrial(uint32_t* pcSecondsAllowed,
+                                uint32_t* pcSecondsPlayed) {
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto pit = pushed().app_source_packages.find(app);
+        if (pit == pushed().app_source_packages.end()) return false;
+        for (uint32_t pkg : pit->second) {
+            auto lit = pushed().licenses.find(pkg);
+            if (lit == pushed().licenses.end()) continue;
+            if (lit->second.minute_limit > 0) {
+                if (pcSecondsAllowed) {
+                    *pcSecondsAllowed = static_cast<uint32_t>(
+                        lit->second.minute_limit * 60);
+                }
+                if (pcSecondsPlayed) {
+                    *pcSecondsPlayed = static_cast<uint32_t>(
+                        std::max(0, lit->second.minutes_used) * 60);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    virtual bool      SetDlcContext(uint32_t /*appID*/)              { return true; }  // 29
+};
+
+class ISteamFriendsStub {
+public:
+    virtual const char* GetPersonaName()                             {                    // 0
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return p.persona_name.empty() ? "Player" : p.persona_name.c_str();
+    }
+    virtual uint64_t  SetPersonaName(const char* pchPersonaName) {
+        if (!pchPersonaName) return 0;
+        uint64_t h = alloc_api_call_handle();
+        std::string name(pchPersonaName);
+        uint64_t self;
+        bool name_changed;
+        int current_state;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            name_changed = (pushed().persona_name != name);
+            pushed().persona_name = name;  // copy: keep one for the bridge call below
+            self = pushed().steam_id.load();
+            current_state = pushed().persona_state.load();
+        }
+        if (name_changed && self != 0) {
+            lsc_cb::PersonaStateChange psc{};
+            psc.m_ulSteamID    = self;
+            psc.m_nChangeFlags = lsc_cb::kPersonaChangeName;
+            push_callback(state().user.load(),
+                          lsc_cb::kPersonaStateChange, &psc, sizeof(psc));
+        }
+        wn_cm_set_persona_name(name.c_str(),
+                               current_state > 0 ? current_state : 1);
+        lsc_cb::SetPersonaNameResponse resp{};
+        resp.m_bSuccess      = state().logged_on.load();
+        resp.m_bLocalSuccess = true;
+        resp.m_result        = state().logged_on.load() ? 1 : 6;  // OK / NoConnection
+        push_call_result(h, lsc_cb::kSetPersonaNameResponse,
+                         &resp, sizeof(resp), /*io_failure=*/false);
+        return h;
+    }
+    virtual int       GetPersonaState()                              { return pushed().persona_state.load(); } // 2
+    virtual int       GetFriendCount(int /*flags*/)                  {                    // 3
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return static_cast<int>(p.friends.size());
+    }
+    virtual uint64_t  GetFriendByIndex(int idx, int /*flags*/)       {                    // 4
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        if (idx < 0 || static_cast<size_t>(idx) >= p.friends.size()) return 0;
+        return p.friends[idx];
+    }
+    virtual int       GetFriendRelationship(uint64_t sid) {
+        if (sid == 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (uint64_t f : pushed().friends) {
+            if (f == sid) return 3 /*Friend*/;
+        }
+        return 0 /*None*/;
+    }
+    virtual int       GetFriendPersonaState(uint64_t sid) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().friend_persona_states.find(sid);
+        return it == pushed().friend_persona_states.end() ? 0 : static_cast<int>(it->second);
+    }
+    virtual const char* GetFriendPersonaName(uint64_t sid)           {                    // 7
+        auto& p = pushed();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = p.friend_persona_names.find(sid);
+        return it == p.friend_persona_names.end() ? "" : it->second.c_str();
+    }
+    virtual bool      GetFriendGamePlayed(uint64_t sid, void* pFriendGameInfo) {
+        if (!pFriendGameInfo) return false;
+        std::memset(pFriendGameInfo, 0, 24);
+        uint32_t app;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().friend_game_played_app.find(sid);
+            if (it == pushed().friend_game_played_app.end()) return false;
+            app = it->second;
+        }
+        if (app == 0) return false;
+        uint64_t gameID = static_cast<uint64_t>(app);
+        std::memcpy(pFriendGameInfo, &gameID, sizeof(gameID));
+        return true;
+    }
+    virtual const char* GetFriendPersonaNameHistory(uint64_t, int)   { return ""; }      // 9
+    virtual int       GetFriendSteamLevel(uint64_t sid) {
+        if (sid == 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().friend_steam_levels.find(sid);
+        return it == pushed().friend_steam_levels.end() ? 0 : it->second;
+    }
+    virtual const char* GetPlayerNickname(uint64_t sid) {
+        if (sid == 0) return nullptr;
+        static thread_local std::string tls;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().player_nicknames.find(sid);
+            if (it == pushed().player_nicknames.end()) return nullptr;
+            tls = it->second;
+        }
+        return tls.empty() ? nullptr : tls.c_str();
+    }
+    virtual int       GetFriendsGroupCount()                         { return 0; }       // 12
+    virtual int16_t   GetFriendsGroupIDByIndex(int)                  { return 0; }       // 13
+    virtual const char* GetFriendsGroupName(int16_t)                 { return ""; }      // 14
+    virtual int       GetFriendsGroupMembersCount(int16_t)           { return 0; }       // 15
+    virtual void      GetFriendsGroupMembersList(int16_t, uint64_t*, int) {}              // 16
+    virtual bool      HasFriend(uint64_t sid, int iFriendFlags) {
+        if (sid == 0) return false;
+        constexpr int kImmediate = 0x10;
+        if ((iFriendFlags & kImmediate) == 0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (uint64_t f : pushed().friends) {
+            if (f == sid) return true;
+        }
+        return false;
+    }
+    virtual int       GetClanCount()                                 { return 0; }       // 18
+    virtual uint64_t  GetClanByIndex(int)                            { return 0; }       // 19
+    virtual const char* GetClanName(uint64_t)                        { return ""; }      // 20
+    virtual const char* GetClanTag(uint64_t)                         { return ""; }      // 21
+    virtual bool      GetClanActivityCounts(uint64_t, int*, int*, int*) { return false; }// 22
+    virtual uint64_t DownloadClanActivityCounts(uint64_t* /*clans*/, int /*n*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::DownloadClanActivityCountsResult cb{};
+        cb.m_bSuccess = 0; // no real clan data
+        push_call_result(h, lsc_cb::kDownloadClanActivityCountsResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual int       GetFriendCountFromSource(uint64_t)             { return 0; }       // 24
+    virtual uint64_t  GetFriendFromSourceByIndex(uint64_t, int)      { return 0; }       // 25
+    virtual bool      IsUserInSource(uint64_t, uint64_t)             { return false; }   // 26
+    virtual void      SetInGameVoiceSpeaking(uint64_t, bool)         {}                  // 27
+    static void enqueue_overlay(PushedState::OverlayRequest req) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto& q = pushed().overlay_request_queue;
+        if (q.size() >= 32) q.pop_front();
+        q.push_back(std::move(req));
+    }
+    virtual void      ActivateGameOverlay(const char* dialog) {                          // 28
+        PushedState::OverlayRequest r;
+        r.kind = "dialog";
+        r.arg1 = dialog ? dialog : "";
+        enqueue_overlay(std::move(r));
+    }
+    virtual void      ActivateGameOverlayToUser(const char* dialog, uint64_t sid) {       // 29
+        PushedState::OverlayRequest r;
+        r.kind = "user";
+        r.arg1 = dialog ? dialog : "";
+        r.sid  = sid;
+        enqueue_overlay(std::move(r));
+    }
+    virtual void      ActivateGameOverlayToWebPage(const char* url, int /*mode*/) {       // 30
+        if (!url || !*url) return;
+        PushedState::OverlayRequest r;
+        r.kind = "webpage";
+        r.arg1 = url;
+        enqueue_overlay(std::move(r));
+    }
+    virtual void      ActivateGameOverlayToStore(uint32_t appid, int /*flag*/) {          // 31
+        PushedState::OverlayRequest r;
+        r.kind   = "store";
+        r.app_id = appid;
+        enqueue_overlay(std::move(r));
+    }
+    virtual void      SetPlayedWith(uint64_t)                        {}                  // 32
+    virtual void      ActivateGameOverlayInviteDialog(uint64_t lobby_sid) {                // 33
+        PushedState::OverlayRequest r;
+        r.kind = "invite";
+        r.sid  = lobby_sid;
+        enqueue_overlay(std::move(r));
+    }
+    virtual int GetSmallFriendAvatar(uint64_t steamID) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().friend_avatars.find(steamID);
+        return (it == pushed().friend_avatars.end()) ? 0 : it->second.small;
+    }
+    virtual int GetMediumFriendAvatar(uint64_t steamID) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().friend_avatars.find(steamID);
+        return (it == pushed().friend_avatars.end()) ? 0 : it->second.medium;
+    }
+    virtual int GetLargeFriendAvatar(uint64_t steamID) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().friend_avatars.find(steamID);
+        return (it == pushed().friend_avatars.end()) ? 0 : it->second.large;
+    }
+    virtual bool RequestUserInformation(uint64_t steamID, bool bRequireNameOnly) {
+        if (steamID == 0) return false;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().friend_persona_names.find(steamID);
+            if (it != pushed().friend_persona_names.end() && !it->second.empty()) {
+                return false;
+            }
+        }
+        int32_t flags = bRequireNameOnly ? 0x01 : 0x47;  // PlayerName / std set
+        wn_cm_request_user_info(steamID, flags);
+        return true;
+    }
+    virtual uint64_t RequestClanOfficerList(uint64_t clanSid) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::ClanOfficerListResponse cb{};
+        cb.m_steamIDClan = clanSid;
+        cb.m_cOfficers   = 0;
+        cb.m_bSuccess    = 0;
+        push_call_result(h, lsc_cb::kClanOfficerListResponse,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t  GetClanOwner(uint64_t)                         { return 0; }       // 39
+    virtual int       GetClanOfficerCount(uint64_t)                  { return 0; }
+    virtual uint64_t  GetClanOfficerByIndex(uint64_t, int)           { return 0; }
+    virtual uint32_t  GetUserRestrictions()                          { return 0; }
+    virtual bool SetRichPresence(const char* pchKey, const char* pchValue) {
+        if (!pchKey || !*pchKey) return false;
+        uint64_t self = pushed().steam_id.load();
+        if (self == 0) return false;
+        std::vector<std::string> keys, values;
+        uint32_t app_id;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto& rp = pushed().rich_presence[self];
+            auto it = std::find_if(rp.begin(), rp.end(),
+                [&](const auto& kv) { return kv.first == pchKey; });
+            if (!pchValue || !*pchValue) {
+                if (it != rp.end()) rp.erase(it);
+            } else if (it == rp.end()) {
+                rp.emplace_back(pchKey, pchValue);
+            } else {
+                it->second = pchValue;
+            }
+            keys.reserve(rp.size());
+            values.reserve(rp.size());
+            for (const auto& kv : rp) {
+                keys.push_back(kv.first);
+                values.push_back(kv.second);
+            }
+            app_id = pushed().app_id.load();
+        }
+        std::vector<const char*> ck(keys.size()), cv(values.size());
+        for (size_t i = 0; i < keys.size(); ++i) {
+            ck[i] = keys[i].c_str();
+            cv[i] = values[i].c_str();
+        }
+        wn_cm_set_rich_presence(app_id,
+                                 ck.empty() ? nullptr : ck.data(),
+                                 cv.empty() ? nullptr : cv.data(),
+                                 ck.size());
+        lsc_cb::FriendRichPresenceUpdate ev{};
+        ev.m_steamIDFriend = self;
+        ev.m_nAppID        = app_id;
+        push_callback(state().user.load(),
+                      lsc_cb::kFriendRichPresenceUpdate,
+                      &ev, sizeof(ev));
+        return true;
+    }
+    virtual void ClearRichPresence() {
+        uint64_t self = pushed().steam_id.load();
+        if (self == 0) return;
+        uint32_t app_id;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            pushed().rich_presence.erase(self);
+            app_id = pushed().app_id.load();
+        }
+        wn_cm_set_rich_presence(app_id, nullptr, nullptr, 0);
+        lsc_cb::FriendRichPresenceUpdate ev{};
+        ev.m_steamIDFriend = self;
+        ev.m_nAppID        = app_id;
+        push_callback(state().user.load(),
+                      lsc_cb::kFriendRichPresenceUpdate,
+                      &ev, sizeof(ev));
+    }
+    virtual const char* GetFriendRichPresence(uint64_t steamID, const char* pchKey) {
+        static thread_local std::string tls_rp;
+        tls_rp.clear();
+        if (!pchKey) return "";
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().rich_presence.find(steamID);
+        if (it == pushed().rich_presence.end()) return "";
+        auto kv = std::find_if(it->second.begin(), it->second.end(),
+            [&](const auto& p) { return p.first == pchKey; });
+        if (kv == it->second.end()) return "";
+        tls_rp = kv->second;
+        return tls_rp.c_str();
+    }
+    virtual int GetFriendRichPresenceKeyCount(uint64_t steamID) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().rich_presence.find(steamID);
+        if (it == pushed().rich_presence.end()) return 0;
+        return static_cast<int>(it->second.size());
+    }
+    virtual const char* GetFriendRichPresenceKeyByIndex(uint64_t steamID, int idx) {
+        static thread_local std::string tls_key;
+        tls_key.clear();
+        if (idx < 0) return "";
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().rich_presence.find(steamID);
+        if (it == pushed().rich_presence.end()) return "";
+        if (static_cast<size_t>(idx) >= it->second.size()) return "";
+        tls_key = it->second[idx].first;
+        return tls_key.c_str();
+    }
+    virtual void RequestFriendRichPresence(uint64_t steamID) {
+        if (steamID == 0) return;
+        wn_cm_request_user_info(steamID, 0x800);  // RichPresence flag bit
+        lsc_cb::FriendRichPresenceUpdate ev{};
+        ev.m_steamIDFriend = steamID;
+        ev.m_nAppID        = pushed().app_id.load();
+        push_callback(state().user.load(),
+                      lsc_cb::kFriendRichPresenceUpdate,
+                      &ev, sizeof(ev));
+    }
+    virtual bool      InviteUserToGame(uint64_t, const char*)        { return false; }
+    virtual int       GetCoplayFriendCount()                         { return 0; }
+    virtual uint64_t  GetCoplayFriend(int)                           { return 0; }
+    virtual int       GetFriendCoplayTime(uint64_t)                  { return 0; }
+    virtual uint32_t  GetFriendCoplayGame(uint64_t)                  { return 0; }
+    virtual uint64_t JoinClanChatRoom(uint64_t clanSid) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::JoinClanChatRoomCompletionResult cb{};
+        cb.m_steamIDClanChat        = clanSid;
+        cb.m_eChatRoomEnterResponse = 2; // k_EChatRoomEnterResponseError
+        push_call_result(h, lsc_cb::kJoinClanChatRoomCompletion,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      LeaveClanChatRoom(uint64_t)                    { return false; }
+    virtual int       GetClanChatMemberCount(uint64_t)               { return 0; }
+    virtual uint64_t  GetChatMemberByIndex(uint64_t, int)            { return 0; }
+    virtual bool      SendClanChatMessage(uint64_t, const char*)     { return false; }
+    virtual int       GetClanChatMessage(uint64_t, int, void*, int, int*, uint64_t*) { return 0; }
+    virtual bool      IsClanChatAdmin(uint64_t, uint64_t)            { return false; }
+    virtual bool      IsClanChatWindowOpenInSteam(uint64_t)          { return false; }
+    virtual bool      OpenClanChatWindowInSteam(uint64_t)            { return false; }
+    virtual bool      CloseClanChatWindowInSteam(uint64_t)           { return false; }
+    virtual bool      SetListenForFriendsMessages(bool)              { return false; }
+    virtual bool      ReplyToFriendMessage(uint64_t, const char*)    { return false; }
+    virtual int       GetFriendMessage(uint64_t, int, void*, int, int*) { return 0; }
+    virtual uint64_t GetFollowerCount(uint64_t sid) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::FriendsGetFollowerCount cb{};
+        cb.m_eResult = 2; // k_EResultFail
+        cb.m_steamID = sid;
+        cb.m_nCount  = 0;
+        push_call_result(h, lsc_cb::kFriendsGetFollowerCount,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t IsFollowing(uint64_t sid) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::FriendsIsFollowing cb{};
+        cb.m_eResult      = 2;
+        cb.m_steamID      = sid;
+        cb.m_bIsFollowing = 0;
+        push_call_result(h, lsc_cb::kFriendsIsFollowing,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t EnumerateFollowingList(uint32_t /*unStartIndex*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::FriendsEnumerateFollowingList cb{};
+        cb.m_eResult           = 2;
+        cb.m_nResultsReturned  = 0;
+        cb.m_nTotalResultCount = 0;
+        push_call_result(h, lsc_cb::kFriendsEnumerateFollowingList,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      IsClanPublic(uint64_t)                         { return false; }
+    virtual bool      IsClanOfficialGameGroup(uint64_t)              { return false; }
+    virtual int       GetNumChatsWithUnreadPriorityMessages()        { return 0; }
+    virtual void      ActivateGameOverlayRemotePlayTogetherInviteDialog(uint64_t) {}
+    virtual bool      RegisterProtocolInOverlayBrowser(const char*)  { return false; }
+    virtual void      ActivateGameOverlayInviteDialogConnectString(const char*) {}
+    virtual uint64_t RequestEquippedProfileItems(uint64_t sid) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::EquippedProfileItems cb{};
+        cb.m_eResult                    = 2; // k_EResultFail
+        cb.m_steamID                    = sid;
+        cb.m_bHasAnimatedAvatar         = 0;
+        cb.m_bHasAvatarFrame            = 0;
+        cb.m_bHasProfileModifier        = 0;
+        cb.m_bHasProfileBackground      = 0;
+        cb.m_bHasMiniProfileBackground  = 0;
+        push_call_result(h, lsc_cb::kEquippedProfileItems,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      BHasEquippedProfileItem(uint64_t, int)         { return false; }
+    virtual const char* GetProfileItemPropertyString(uint64_t, int, int) { return ""; }
+    virtual uint32_t  GetProfileItemPropertyUint(uint64_t, int, int) { return 0; }
+};
+
+class ISteamRemoteStorageStub {
+public:
+    static std::string resolve_cloud_path(const char* pchFile) {
+        if (!pchFile || !*pchFile) return {};
+        for (const char* p = pchFile; *p; ++p) {
+            if (*p == '\\') return {};
+        }
+        if (pchFile[0] == '/') return {};
+        std::string fname(pchFile);
+        if (fname.find("..") != std::string::npos) return {};
+        uint32_t app = pushed().app_id.load();
+        if (app == 0) return {};
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_cloud_remote_dirs.find(app);
+        if (it == pushed().app_cloud_remote_dirs.end()) return {};
+        std::string out = it->second;
+        if (!out.empty() && out.back() != '/') out.push_back('/');
+        out.append(fname);
+        return out;
+    }
+    virtual bool FileWrite(const char* pchFile, const void* pvData, int cubData) {
+        if (!pvData || cubData <= 0) return false;
+        std::string path = resolve_cloud_path(pchFile);
+        if (path.empty()) return false;
+        size_t slash = path.find_last_of('/');
+        if (slash != std::string::npos) {
+            std::string dir = path.substr(0, slash);
+            mkdir(dir.c_str(), 0755);
+        }
+        int fd = ::open(path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644);
+        if (fd < 0) return false;
+        ssize_t total = 0;
+        const char* p = static_cast<const char*>(pvData);
+        while (total < cubData) {
+            ssize_t n = ::write(fd, p + total, cubData - total);
+            if (n < 0) {
+                ::close(fd);
+                ::unlink(path.c_str());
+                return false;
+            }
+            total += n;
+        }
+        ::close(fd);
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto& files = pushed().cloud_files;
+        std::string name(pchFile);
+        bool patched = false;
+        for (auto& f : files) {
+            if (f.name == name) {
+                f.size      = static_cast<int32_t>(cubData);
+                f.timestamp = static_cast<int64_t>(::time(nullptr));
+                patched = true;
+                break;
+            }
+        }
+        if (!patched) {
+            wn_libsteamclient::PushedState::CloudFileEntry e;
+            e.name      = std::move(name);
+            e.size      = static_cast<int32_t>(cubData);
+            e.timestamp = static_cast<int64_t>(::time(nullptr));
+            files.push_back(std::move(e));
+        }
+        return true;
+    }
+    virtual int FileRead(const char* pchFile, void* pvData, int cubDataToRead) {
+        if (!pvData || cubDataToRead <= 0) return 0;
+        std::string path = resolve_cloud_path(pchFile);
+        if (path.empty()) return 0;
+        int fd = ::open(path.c_str(), O_RDONLY);
+        if (fd < 0) return 0;
+        ssize_t total = 0;
+        char* p = static_cast<char*>(pvData);
+        while (total < cubDataToRead) {
+            ssize_t n = ::read(fd, p + total, cubDataToRead - total);
+            if (n < 0) { ::close(fd); return 0; }
+            if (n == 0) break;  // EOF
+            total += n;
+        }
+        ::close(fd);
+        return static_cast<int>(total);
+    }
+    virtual uint64_t FileWriteAsync(const char* pchFile, const void* pvData, uint32_t cubData) {
+        if (!pvData || cubData == 0) return 0;
+        std::string path = resolve_cloud_path(pchFile);
+        if (path.empty()) return 0;
+        bool ok = FileWrite(pchFile, pvData, static_cast<int>(cubData));
+        uint64_t hCall = alloc_api_call_handle();
+        wn_libsteamclient::callbacks::RemoteStorageFileWriteAsyncComplete cb{};
+        cb.m_eResult = ok ? 1 /*k_EResultOK*/ : 2 /*k_EResultFail*/;
+        push_call_result(hCall,
+                         lsc_cb::kRemoteStorageFileWriteAsyncComplete,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual uint64_t FileReadAsync(const char* pchFile, uint32_t nOffset, uint32_t cubToRead) {
+        if (cubToRead == 0) return 0;
+        std::string path = resolve_cloud_path(pchFile);
+        if (path.empty()) return 0;
+        int fd = ::open(path.c_str(), O_RDONLY);
+        if (fd < 0) return 0;
+        if (nOffset > 0 && ::lseek(fd, nOffset, SEEK_SET) == (off_t)-1) {
+            ::close(fd);
+            return 0;
+        }
+        std::vector<uint8_t> buf(cubToRead);
+        ssize_t total = 0;
+        while (total < (ssize_t)cubToRead) {
+            ssize_t n = ::read(fd, buf.data() + total, cubToRead - total);
+            if (n < 0) { ::close(fd); return 0; }
+            if (n == 0) break;
+            total += n;
+        }
+        ::close(fd);
+        buf.resize(total);
+        uint64_t hCall = alloc_api_call_handle();
+        {
+            std::lock_guard<std::mutex> lk(async_read_mu());
+            async_read_buffers()[hCall] = std::move(buf);
+        }
+        wn_libsteamclient::callbacks::RemoteStorageFileReadAsyncComplete cb{};
+        cb.m_hFileReadAsync = hCall;
+        cb.m_eResult        = 1 /*k_EResultOK*/;
+        cb.m_nOffset        = nOffset;
+        cb.m_cubRead        = static_cast<uint32_t>(total);
+        push_call_result(hCall,
+                         lsc_cb::kRemoteStorageFileReadAsyncComplete,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual bool FileReadAsyncComplete(uint64_t hCall, void* pvBuffer, uint32_t cubToRead) {
+        if (!pvBuffer || cubToRead == 0 || hCall == 0) return false;
+        std::lock_guard<std::mutex> lk(async_read_mu());
+        auto& m = async_read_buffers();
+        auto it = m.find(hCall);
+        if (it == m.end()) return false;
+        const auto& buf = it->second;
+        if (cubToRead < buf.size()) {
+            return false;
+        }
+        std::memcpy(pvBuffer, buf.data(), buf.size());
+        m.erase(it);
+        return true;
+    }
+    virtual bool FileForget(const char* pchFile) {
+        if (!pchFile || !*pchFile) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto& files = pushed().cloud_files;
+        std::string name(pchFile);
+        bool found = false;
+        for (auto it = files.begin(); it != files.end(); ) {
+            if (it->name == name) { it = files.erase(it); found = true; }
+            else ++it;
+        }
+        return found;
+    }
+    virtual bool FileDelete(const char* pchFile) {
+        std::string path = resolve_cloud_path(pchFile);
+        if (path.empty()) return false;
+        int rc = ::unlink(path.c_str());
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto& files = pushed().cloud_files;
+        std::string name(pchFile);
+        for (auto it = files.begin(); it != files.end(); ) {
+            if (it->name == name) it = files.erase(it);
+            else ++it;
+        }
+        return rc == 0;
+    }
+    virtual uint64_t FileShare(const char* pchFile) {
+        if (!pchFile || !*pchFile) return 0;
+        uint64_t hCall = alloc_api_call_handle();
+        lsc_cb::RemoteStorageFileShareResult cb{};
+        std::strncpy(cb.m_rgchFilename, pchFile, sizeof(cb.m_rgchFilename) - 1);
+        bool found = false;
+        int32_t size = 0;
+        int64_t ts   = 0;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            for (const auto& f : pushed().cloud_files) {
+                if (f.name == pchFile) {
+                    found = true;
+                    size  = f.size;
+                    ts    = f.timestamp;
+                    break;
+                }
+            }
+        }
+        if (!found) {
+            cb.m_eResult = 9; // k_EResultFileNotFound
+            cb.m_hFile   = 0;
+        } else {
+            cb.m_eResult = 1; // k_EResultOK
+            uint64_t h = 0xcbf29ce484222325ULL; // FNV-1a 64 seed
+            auto mix = [&](const void* d, size_t n) {
+                const uint8_t* p = static_cast<const uint8_t*>(d);
+                for (size_t i = 0; i < n; ++i) {
+                    h ^= p[i];
+                    h *= 0x100000001b3ULL;
+                }
+            };
+            uint32_t app = pushed().app_id.load();
+            mix(&app,  sizeof(app));
+            mix(pchFile, std::strlen(pchFile));
+            mix(&size, sizeof(size));
+            mix(&ts,   sizeof(ts));
+            cb.m_hFile = h | (1ULL << 63);  // set hi bit so it never collides with hCall
+        }
+        push_call_result(hCall, lsc_cb::kRemoteStorageFileShareResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return hCall;
+    }
+    virtual bool      SetSyncPlatforms(const char* pchFile, int /*ePlatform*/) {
+        if (!pchFile || !*pchFile) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (const auto& f : pushed().cloud_files) {
+            if (f.name == pchFile) return true;
+        }
+        return false;
+    }
+    virtual uint64_t FileWriteStreamOpen(const char* pchFile) {
+        std::string finalPath = resolve_cloud_path(pchFile);
+        if (finalPath.empty()) return 0;
+        size_t slash = finalPath.find_last_of('/');
+        if (slash != std::string::npos) {
+            mkdir(finalPath.substr(0, slash).c_str(), 0755);
+        }
+        uint64_t h = alloc_api_call_handle();
+        char suffix[64];
+        std::snprintf(suffix, sizeof(suffix), ".wnstream-%llu",
+                      static_cast<unsigned long long>(h));
+        std::string tempPath = finalPath + suffix;
+        int fd = ::open(tempPath.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644);
+        if (fd < 0) return 0;
+        std::lock_guard<std::mutex> lk(stream_mu());
+        StreamSlot s;
+        s.fd        = fd;
+        s.tempPath  = std::move(tempPath);
+        s.finalPath = std::move(finalPath);
+        s.name      = std::string(pchFile);
+        s.bytes     = 0;
+        streams()[h] = std::move(s);
+        return h;
+    }
+    virtual bool FileWriteStreamWriteChunk(uint64_t h, const void* pvData, int cubData) {
+        if (!pvData || cubData <= 0) return false;
+        std::lock_guard<std::mutex> lk(stream_mu());
+        auto it = streams().find(h);
+        if (it == streams().end()) return false;
+        const char* p = static_cast<const char*>(pvData);
+        int total = 0;
+        while (total < cubData) {
+            ssize_t n = ::write(it->second.fd, p + total, cubData - total);
+            if (n < 0) {
+                return false;
+            }
+            total += n;
+        }
+        it->second.bytes += total;
+        return true;
+    }
+    virtual bool FileWriteStreamClose(uint64_t h) {
+        StreamSlot slot;
+        {
+            std::lock_guard<std::mutex> lk(stream_mu());
+            auto it = streams().find(h);
+            if (it == streams().end()) return false;
+            slot = std::move(it->second);
+            streams().erase(it);
+        }
+        ::fsync(slot.fd);
+        ::close(slot.fd);
+        if (::rename(slot.tempPath.c_str(), slot.finalPath.c_str()) != 0) {
+            ::unlink(slot.tempPath.c_str());
+            return false;
+        }
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto& files = pushed().cloud_files;
+        bool patched = false;
+        for (auto& f : files) {
+            if (f.name == slot.name) {
+                f.size      = static_cast<int32_t>(slot.bytes);
+                f.timestamp = static_cast<int64_t>(::time(nullptr));
+                patched = true;
+                break;
+            }
+        }
+        if (!patched) {
+            wn_libsteamclient::PushedState::CloudFileEntry e;
+            e.name      = slot.name;
+            e.size      = static_cast<int32_t>(slot.bytes);
+            e.timestamp = static_cast<int64_t>(::time(nullptr));
+            files.push_back(std::move(e));
+        }
+        return true;
+    }
+    virtual bool FileWriteStreamCancel(uint64_t h) {
+        std::lock_guard<std::mutex> lk(stream_mu());
+        auto it = streams().find(h);
+        if (it == streams().end()) return false;
+        ::close(it->second.fd);
+        ::unlink(it->second.tempPath.c_str());
+        streams().erase(it);
+        return true;
+    }
+
+    virtual bool      FileExists(const char* pchFile) {
+        if (!pchFile || !*pchFile) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (const auto& f : pushed().cloud_files) {
+            if (f.name == pchFile) return true;
+        }
+        return false;
+    }
+    virtual bool FilePersisted(const char* pchFile) {
+        if (!pchFile || !*pchFile) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (const auto& f : pushed().cloud_files) {
+            if (f.name == pchFile) return true;
+        }
+        return false;
+    }
+
+    virtual int       GetFileSize(const char* pchFile) {
+        if (!pchFile || !*pchFile) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (const auto& f : pushed().cloud_files) {
+            if (f.name == pchFile) return static_cast<int>(f.size);
+        }
+        return 0;
+    }
+    virtual int64_t   GetFileTimestamp(const char* pchFile) {
+        if (!pchFile || !*pchFile) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (const auto& f : pushed().cloud_files) {
+            if (f.name == pchFile) return f.timestamp;
+        }
+        return 0;
+    }
+    virtual int       GetSyncPlatforms(const char* pchFile) {
+        if (!pchFile || !*pchFile) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (const auto& f : pushed().cloud_files) {
+            if (f.name == pchFile) return -1; // k_ERemoteStoragePlatformAll
+        }
+        return 0;
+    }
+
+    virtual int       GetFileCount() {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return static_cast<int>(pushed().cloud_files.size());
+    }
+    virtual const char* GetFileNameAndSize(int iFile, int32_t* pnFileSizeInBytes) {
+        static thread_local std::string tls_name;
+        tls_name.clear();
+        int32_t size = 0;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            const auto& files = pushed().cloud_files;
+            if (iFile >= 0 && static_cast<size_t>(iFile) < files.size()) {
+                tls_name = files[iFile].name;
+                size = files[iFile].size;
+            }
+        }
+        if (pnFileSizeInBytes) *pnFileSizeInBytes = size;
+        return tls_name.c_str();
+    }
+    virtual void      GetQuota(uint64_t* total, uint64_t* avail) {
+        if (total) *total = pushed().cloud_quota_total.load();
+        if (avail) *avail = pushed().cloud_quota_available.load();
+    }
+    virtual bool      IsCloudEnabledForAccount() {
+        return pushed().cloud_enabled_account.load();
+    }
+    virtual bool      IsCloudEnabledForApp() {
+        return pushed().cloud_enabled_app.load();
+    }
+    virtual void      SetCloudEnabledForApp(bool enabled) {
+        pushed().cloud_enabled_app.store(enabled);
+    }
+    virtual uint64_t UGCDownload(uint64_t hContent, uint32_t /*priority*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::RemoteStorageDownloadUGCResult cb{};
+        cb.m_eResult        = 2; // k_EResultFail — no UGC backend
+        cb.m_hFile          = hContent;
+        cb.m_nAppID         = pushed().app_id.load();
+        cb.m_nSizeInBytes   = 0;
+        cb.m_pchFileName[0] = '\0';
+        cb.m_ulSteamIDOwner = 0;
+        push_call_result(h, lsc_cb::kRemoteStorageDownloadUGC,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      GetUGCDownloadProgress(uint64_t, int32_t* d, int32_t* e) {
+        if (d) *d = 0; if (e) *e = 0; return false;
+    }
+    virtual bool      GetUGCDetails(uint64_t /*content*/, uint32_t* appID,
+                                     char** ppchName, int32_t* pcbFile, uint64_t* steamIDOwner) {
+        if (appID) *appID = 0;
+        if (ppchName) *ppchName = nullptr;
+        if (pcbFile) *pcbFile = 0;
+        if (steamIDOwner) *steamIDOwner = 0;
+        return false;
+    }
+    virtual int32_t   UGCRead(uint64_t /*content*/, void* /*buf*/, int32_t /*cubData*/,
+                               uint32_t /*offset*/, int /*action*/) { return 0; }
+    virtual int32_t   GetCachedUGCCount()                            { return 0; }
+    virtual uint64_t  GetCachedUGCHandle(int32_t /*idx*/)            { return 0; }
+    virtual uint64_t  PublishWorkshopFile_DEPRECATED(const char*, const char*, uint32_t, const char*, const char*, int, void*, void*, int) { return 0; }
+    virtual uint64_t  CreatePublishedFileUpdateRequest_DEPRECATED(uint64_t) { return 0; }
+    virtual bool      UpdatePublishedFileFile_DEPRECATED(uint64_t, const char*)            { return false; }
+    virtual bool      UpdatePublishedFilePreviewFile_DEPRECATED(uint64_t, const char*)     { return false; }
+    virtual bool      UpdatePublishedFileTitle_DEPRECATED(uint64_t, const char*)           { return false; }
+    virtual bool      UpdatePublishedFileDescription_DEPRECATED(uint64_t, const char*)     { return false; }
+    virtual bool      UpdatePublishedFileVisibility_DEPRECATED(uint64_t, int)              { return false; }
+    virtual bool      UpdatePublishedFileTags_DEPRECATED(uint64_t, void*)                  { return false; }
+    virtual uint64_t  CommitPublishedFileUpdate_DEPRECATED(uint64_t)                       { return 0; }
+    virtual uint64_t  GetPublishedFileDetails_DEPRECATED(uint64_t, uint32_t)               { return 0; }
+    virtual uint64_t  DeletePublishedFile_DEPRECATED(uint64_t)                             { return 0; }
+    virtual uint64_t  EnumerateUserPublishedFiles_DEPRECATED(uint32_t)                     { return 0; }
+    virtual uint64_t  SubscribePublishedFile_DEPRECATED(uint64_t)                          { return 0; }
+    virtual uint64_t  EnumerateUserSubscribedFiles_DEPRECATED(uint32_t)                    { return 0; }
+    virtual uint64_t  UnsubscribePublishedFile_DEPRECATED(uint64_t)                        { return 0; }
+    virtual bool      UpdatePublishedFileSetChangeDescription_DEPRECATED(uint64_t, const char*) { return false; }
+    virtual uint64_t  GetPublishedItemVoteDetails_DEPRECATED(uint64_t)                     { return 0; }
+    virtual uint64_t  UpdateUserPublishedItemVote_DEPRECATED(uint64_t, bool)               { return 0; }
+    virtual uint64_t  GetUserPublishedItemVoteDetails_DEPRECATED(uint64_t)                 { return 0; }
+    virtual uint64_t  EnumerateUserSharedWorkshopFiles_DEPRECATED(uint64_t, uint32_t, void*, void*) { return 0; }
+    virtual uint64_t  PublishVideo_DEPRECATED(int, const char*, uint32_t, const char*, const char*, uint32_t, void*) { return 0; }
+    virtual uint64_t  SetUserPublishedFileAction_DEPRECATED(uint64_t, int)                 { return 0; }
+    virtual uint64_t  EnumeratePublishedFilesByUserAction_DEPRECATED(int, uint32_t)        { return 0; }
+    virtual uint64_t  EnumeratePublishedWorkshopFiles_DEPRECATED(int, uint32_t, uint32_t, uint32_t, void*, void*) { return 0; }
+    virtual uint64_t UGCDownloadToLocation(uint64_t hContent, const char* /*location*/, uint32_t /*priority*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::RemoteStorageDownloadUGCResult cb{};
+        cb.m_eResult        = 2;
+        cb.m_hFile          = hContent;
+        cb.m_nAppID         = pushed().app_id.load();
+        cb.m_nSizeInBytes   = 0;
+        cb.m_pchFileName[0] = '\0';
+        cb.m_ulSteamIDOwner = 0;
+        push_call_result(h, lsc_cb::kRemoteStorageDownloadUGC,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual int32_t   GetLocalFileChangeCount()                                            { return 0; }
+    virtual const char* GetLocalFileChange(int32_t /*idx*/, int* peChangeType, int* pePathType) {
+        if (peChangeType) *peChangeType = 0;
+        if (pePathType)   *pePathType   = 0;
+        return "";
+    }
+    virtual bool      BeginFileWriteBatch()                                                { return true; }
+    virtual bool      EndFileWriteBatch()                                                  { return true; }
+};
+
+class ISteamUserStatsStub {
+public:
+    virtual bool RequestCurrentStats() {
+        if (!state().logged_on.load()) return false;
+        if (pushed().stats_ready.load()) {
+            lsc_cb::UserStatsReceived payload{};
+            payload.m_nGameID     = static_cast<uint64_t>(pushed().app_id.load());
+            payload.m_eResult     = 1;  // k_EResultOK
+            payload.m_steamIDUser = pushed().steam_id.load();
+            push_callback(state().user.load(),
+                          lsc_cb::kUserStatsReceived,
+                          &payload, sizeof(payload));
+        }
+        return true;
+    }
+    virtual bool GetStatInt(const char* pchName, int32_t* pData) {
+        if (!pchName || !pData) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().stats_int.find(pchName);
+        if (it == pushed().stats_int.end()) return false;
+        return true;
+    }
+    virtual bool GetStatFloat(const char* pchName, float* pData) {
+        if (!pchName || !pData) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().stats_float.find(pchName);
+        if (it == pushed().stats_float.end()) return false;
+        return true;
+    }
+    virtual bool SetStatInt(const char* pchName, int32_t nData) {
+        if (!pchName) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        pushed().stats_int[pchName] = nData;
+        pushed().dirty_stats_int.insert(pchName);
+        return true;
+    }
+    virtual bool SetStatFloat(const char* pchName, float fData) {
+        if (!pchName) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        pushed().stats_float[pchName] = fData;
+        pushed().dirty_stats_float.insert(pchName);
+        return true;
+    }
+    virtual bool UpdateAvgRateStat(const char* pchName,
+                                    float flCountThisSession,
+                                    double dSessionLength) {
+        if (!pchName || dSessionLength <= 0.0) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto& acc = pushed().stats_avg_rate[pchName];
+        acc.total_count += static_cast<double>(flCountThisSession);
+        acc.total_time  += dSessionLength;
+        if (acc.total_time > 0.0) {
+            pushed().stats_float[pchName] =
+                static_cast<float>(acc.total_count / acc.total_time);
+        }
+        pushed().dirty_stats_float.insert(pchName);
+        return true;
+    }
+    virtual bool GetAchievement(const char* pchName, bool* pbAchieved) {
+        if (!pchName || !pbAchieved) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().achievement_index.find(pchName);
+        if (it == pushed().achievement_index.end()) return false;
+        return true;
+    }
+    virtual bool SetAchievement(const char* pchName) {
+        if (!pchName) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().achievement_index.find(pchName);
+        if (it == pushed().achievement_index.end()) return false;
+        auto& a = pushed().achievements[it->second];
+        if (!a.achieved) {
+            a.achieved      = true;
+            a.unlock_time   = static_cast<uint32_t>(::time(nullptr));
+            a.pending_store = true;
+        }
+        return true;
+    }
+    virtual bool ClearAchievement(const char* pchName) {
+        if (!pchName) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().achievement_index.find(pchName);
+        if (it == pushed().achievement_index.end()) return false;
+        auto& a = pushed().achievements[it->second];
+        bool was = a.achieved;
+        a.achieved      = false;
+        a.unlock_time   = 0;
+        if (was) a.pending_store = true;
+        return true;
+    }
+    virtual bool GetAchievementAndUnlockTime(const char* pchName,
+                                             bool* pbAchieved,
+                                             uint32_t* punlockTime) {
+        if (!pchName) return false;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().achievement_index.find(pchName);
+        if (it == pushed().achievement_index.end()) return false;
+        const auto& a = pushed().achievements[it->second];
+        if (pbAchieved)   *pbAchieved   = a.achieved;
+        if (punlockTime)  *punlockTime  = a.unlock_time;
+        return true;
+    }
+    virtual bool StoreStats() {
+        bool ready = pushed().stats_ready.load();
+        uint32_t app_id = pushed().app_id.load();
+        uint64_t game_id = static_cast<uint64_t>(app_id);
+
+        struct DirtyAch { std::string name; int32_t block_id; int32_t bit_index; bool achieved; };
+        std::vector<DirtyAch> dirty;
+        std::unordered_map<std::string, int32_t> stats_int_snapshot;
+        std::vector<std::tuple<uint32_t, uint32_t>> dirty_stat_uploads;
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            for (auto& a : pushed().achievements) {
+                if (a.pending_store) {
+                    dirty.push_back(DirtyAch{a.api_name, a.block_id,
+                                              a.bit_index, a.achieved});
+                    a.pending_store = false;
+                }
+            }
+            stats_int_snapshot = pushed().stats_int;
+            for (const auto& name : pushed().dirty_stats_int) {
+                auto idIt = pushed().stat_name_to_id.find(name);
+                if (idIt == pushed().stat_name_to_id.end()) continue;
+                auto vIt = pushed().stats_int.find(name);
+                uint32_t v = (vIt != pushed().stats_int.end())
+                             ? static_cast<uint32_t>(vIt->second) : 0u;
+                dirty_stat_uploads.emplace_back(idIt->second, v);
+            }
+            for (const auto& name : pushed().dirty_stats_float) {
+                auto idIt = pushed().stat_name_to_id.find(name);
+                if (idIt == pushed().stat_name_to_id.end()) continue;
+                auto vIt = pushed().stats_float.find(name);
+                uint32_t bits = 0;
+                if (vIt != pushed().stats_float.end()) {
+                    float f = vIt->second;
+                    std::memcpy(&bits, &f, sizeof(bits));
+                }
+                dirty_stat_uploads.emplace_back(idIt->second, bits);
+            }
+            pushed().dirty_stats_int.clear();
+            pushed().dirty_stats_float.clear();
+        }
+
+        for (const auto& d : dirty) {
+            lsc_cb::UserAchievementStored ach{};
+            ach.m_nGameID           = game_id;
+            ach.m_bGroupAchievement = false;
+            std::strncpy(ach.m_rgchAchievementName,
+                         d.name.c_str(),
+                         lsc_cb::kAchievementNameMax - 1);
+            ach.m_rgchAchievementName[lsc_cb::kAchievementNameMax - 1] = '\0';
+            ach.m_nCurProgress = 0;
+            ach.m_nMaxProgress = 0;
+            push_callback(state().user.load(),
+                          lsc_cb::kUserAchievementStored,
+                          &ach, sizeof(ach));
+        }
+
+        if (app_id != 0 && (!dirty.empty() || !dirty_stat_uploads.empty())) {
+            std::unordered_map<uint32_t, uint32_t> stat_id_to_value;
+            for (const auto& [id, v] : dirty_stat_uploads) {
+                stat_id_to_value[id] = v;
+            }
+            for (const auto& d : dirty) {
+                if (d.block_id < 0) continue;
+                uint32_t stat_id = static_cast<uint32_t>(d.block_id);
+                auto it = stat_id_to_value.find(stat_id);
+                if (it == stat_id_to_value.end()) {
+                    char key[16];
+                    std::snprintf(key, sizeof(key), "%u", stat_id);
+                    auto sit = stats_int_snapshot.find(key);
+                    uint32_t cur = (sit != stats_int_snapshot.end())
+                                   ? static_cast<uint32_t>(sit->second)
+                                   : 0u;
+                    it = stat_id_to_value.emplace(stat_id, cur).first;
+                }
+                if (d.bit_index >= 0 && d.bit_index < 32) {
+                    uint32_t mask = 1u << static_cast<uint32_t>(d.bit_index);
+                    if (d.achieved) it->second |= mask;
+                    else            it->second &= ~mask;
+                }
+            }
+            if (!stat_id_to_value.empty()) {
+                std::vector<uint32_t> ids;
+                std::vector<uint32_t> vals;
+                ids.reserve(stat_id_to_value.size());
+                vals.reserve(stat_id_to_value.size());
+                for (auto& [k, v] : stat_id_to_value) {
+                    ids.push_back(k);
+                    vals.push_back(v);
+                }
+                wn_cm_store_user_stats(app_id, /*crc_stats=*/0,
+                                       ids.data(), vals.data(),
+                                       ids.size());
+                __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+                    "StoreStats: pushed %zu stat(s) to Steam (app=%u, "
+                    "ach_dirty=%zu, stat_dirty=%zu)",
+                    ids.size(), app_id, dirty.size(), dirty_stat_uploads.size());
+            }
+        }
+
+        lsc_cb::UserStatsStored payload{};
+        payload.m_nGameID = game_id;
+        payload.m_eResult = ready ? 1 : 2;
+        push_callback(state().user.load(),
+                      lsc_cb::kUserStatsStored,
+                      &payload, sizeof(payload));
+        return ready;
+    }
+    virtual int GetAchievementIcon(const char* pchName) {
+        if (!pchName) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().achievement_index.find(pchName);
+        if (it == pushed().achievement_index.end()) return 0;
+        return pushed().achievements[it->second].icon_handle;
+    }
+    virtual const char* GetAchievementDisplayAttribute(const char* pchName,
+                                                       const char* pchKey) {
+        static thread_local std::string tls_attr;
+        tls_attr.clear();
+        if (!pchName || !pchKey) return "";
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().achievement_index.find(pchName);
+        if (it == pushed().achievement_index.end()) return "";
+        const auto& a = pushed().achievements[it->second];
+
+        auto pick_locale = [&](const std::unordered_map<std::string, std::string>& m)
+                -> const std::string& {
+            static const std::string kEmpty;
+            const std::string& ui = pushed().ui_language;
+            if (!ui.empty()) {
+                auto h = m.find(ui);
+                if (h != m.end() && !h->second.empty()) return h->second;
+            }
+            auto h = m.find("english");
+            if (h != m.end() && !h->second.empty()) return h->second;
+            for (const auto& kv : m) {
+                if (!kv.second.empty()) return kv.second;
+            }
+            return kEmpty;
+        };
+
+        if (std::strcmp(pchKey, "name") == 0)         tls_attr = pick_locale(a.display_names);
+        else if (std::strcmp(pchKey, "desc") == 0)    tls_attr = pick_locale(a.descriptions);
+        else if (std::strcmp(pchKey, "hidden") == 0)  tls_attr = a.hidden ? "1" : "0";
+        return tls_attr.c_str();
+    }
+    virtual bool IndicateAchievementProgress(const char* pchName,
+                                             uint32_t nCurProgress,
+                                             uint32_t nMaxProgress) {
+        if (!pchName) return false;
+        uint64_t game_id = static_cast<uint64_t>(pushed().app_id.load());
+        {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            auto it = pushed().achievement_index.find(pchName);
+            if (it == pushed().achievement_index.end()) return false;
+            if (pushed().achievements[it->second].achieved) return false;
+        }
+        lsc_cb::UserAchievementStored ach{};
+        ach.m_nGameID           = game_id;
+        ach.m_bGroupAchievement = false;
+        std::strncpy(ach.m_rgchAchievementName, pchName,
+                     lsc_cb::kAchievementNameMax - 1);
+        ach.m_rgchAchievementName[lsc_cb::kAchievementNameMax - 1] = '\0';
+        ach.m_nCurProgress = nCurProgress;
+        ach.m_nMaxProgress = nMaxProgress;
+        push_callback(state().user.load(),
+                      lsc_cb::kUserAchievementStored,
+                      &ach, sizeof(ach));
+        return true;
+    }
+    virtual uint32_t GetNumAchievements() {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return static_cast<uint32_t>(pushed().achievements.size());
+    }
+    virtual const char* GetAchievementName(uint32_t idx) {
+        static thread_local std::string tls_name;
+        tls_name.clear();
+        std::lock_guard<std::mutex> lk(state_mutex());
+        const auto& a = pushed().achievements;
+        if (idx < a.size()) tls_name = a[idx].api_name;
+        return tls_name.c_str();
+    }
+    virtual uint64_t RequestUserStats(uint64_t steamID) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::UserStatsReceived payload{};
+        payload.m_nGameID     = static_cast<uint64_t>(pushed().app_id.load());
+        payload.m_eResult     = 6;  // k_EResultNoConnection — we never asked
+        payload.m_steamIDUser = steamID;
+        push_call_result(h, lsc_cb::kUserStatsReceived,
+                         &payload, sizeof(payload), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool GetUserStatInt(uint64_t steamID, const char* pchName, int32_t* pData) {
+        if (!pchName || !pData) return false;
+        if (steamID != pushed().steam_id.load()) return false;
+        return GetStatInt(pchName, pData);
+    }
+    virtual bool GetUserStatFloat(uint64_t steamID, const char* pchName, float* pData) {
+        if (!pchName || !pData) return false;
+        if (steamID != pushed().steam_id.load()) return false;
+        return GetStatFloat(pchName, pData);
+    }
+    virtual bool GetUserAchievement(uint64_t steamID, const char* pchName, bool* pbAchieved) {
+        if (steamID != pushed().steam_id.load()) return false;
+        return GetAchievement(pchName, pbAchieved);
+    }
+    virtual bool GetUserAchievementAndUnlockTime(uint64_t steamID, const char* pchName,
+                                                  bool* pbAchieved, uint32_t* punlockTime) {
+        if (steamID != pushed().steam_id.load()) return false;
+        return GetAchievementAndUnlockTime(pchName, pbAchieved, punlockTime);
+    }
+    virtual bool ResetAllStats(bool bAchievementsToo) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        for (auto& [name, _] : pushed().stats_int) {
+            pushed().dirty_stats_int.insert(name);
+        }
+        pushed().stats_int.clear();
+        for (auto& [name, _] : pushed().stats_float) {
+            pushed().dirty_stats_float.insert(name);
+        }
+        pushed().stats_float.clear();
+        if (bAchievementsToo) {
+            for (auto& a : pushed().achievements) {
+                bool was = a.achieved;
+                a.achieved    = false;
+                a.unlock_time = 0;
+                if (was) a.pending_store = true;
+            }
+        }
+        return true;
+    }
+    virtual uint64_t FindOrCreateLeaderboard(const char* /*name*/,
+                                              int /*sortMethod*/, int /*displayType*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::LeaderboardFindResult cb{};
+        cb.m_hSteamLeaderboard  = 0;
+        cb.m_bLeaderboardFound  = 0;
+        push_call_result(h, lsc_cb::kLeaderboardFindResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t FindLeaderboard(const char* /*name*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::LeaderboardFindResult cb{};
+        cb.m_hSteamLeaderboard  = 0;
+        cb.m_bLeaderboardFound  = 0;
+        push_call_result(h, lsc_cb::kLeaderboardFindResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual const char* GetLeaderboardName(uint64_t)                 { return ""; }
+    virtual int       GetLeaderboardEntryCount(uint64_t)             { return 0; }
+    virtual int       GetLeaderboardSortMethod(uint64_t)             { return 0; }
+    virtual int       GetLeaderboardDisplayType(uint64_t)            { return 0; }
+    virtual uint64_t DownloadLeaderboardEntries(uint64_t hLeaderboard,
+                                                  int /*eRange*/, int /*rangeStart*/,
+                                                  int /*rangeEnd*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::LeaderboardScoresDownloaded cb{};
+        cb.m_hSteamLeaderboard        = hLeaderboard;
+        cb.m_hSteamLeaderboardEntries = 0;
+        cb.m_cEntryCount              = 0;
+        push_call_result(h, lsc_cb::kLeaderboardScoresDownloaded,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t DownloadLeaderboardEntriesForUsers(uint64_t hLeaderboard,
+                                                          uint64_t* /*pUsers*/,
+                                                          int /*cUsers*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::LeaderboardScoresDownloaded cb{};
+        cb.m_hSteamLeaderboard        = hLeaderboard;
+        cb.m_hSteamLeaderboardEntries = 0;
+        cb.m_cEntryCount              = 0;
+        push_call_result(h, lsc_cb::kLeaderboardScoresDownloaded,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      GetDownloadedLeaderboardEntry(uint64_t, int, void*, int32_t*, int) { return false; }
+    virtual uint64_t UploadLeaderboardScore(uint64_t hLeaderboard,
+                                             int /*method*/, int32_t score,
+                                             const int32_t* /*details*/,
+                                             int /*cDetails*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::LeaderboardScoreUploaded cb{};
+        cb.m_bSuccess            = 0; // server-side store not implemented
+        cb.m_hSteamLeaderboard   = hLeaderboard;
+        cb.m_nScore              = score;
+        cb.m_bScoreChanged       = 0;
+        cb.m_nGlobalRankNew      = 0;
+        cb.m_nGlobalRankPrevious = 0;
+        push_call_result(h, lsc_cb::kLeaderboardScoreUploaded,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t AttachLeaderboardUGC(uint64_t hLeaderboard, uint64_t /*hUGC*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::LeaderboardUGCSet cb{};
+        cb.m_eResult           = 2; // k_EResultFail
+        cb.m_hSteamLeaderboard = hLeaderboard;
+        push_call_result(h, lsc_cb::kLeaderboardUGCSet,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t GetNumberOfCurrentPlayers() {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::NumberOfCurrentPlayers cb{};
+        cb.m_bSuccess = 1;
+        cb.m_cPlayers = 0;
+        push_call_result(h, lsc_cb::kNumberOfCurrentPlayers,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t RequestGlobalAchievementPercentages() {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::GlobalAchievementPercentagesReady cb{};
+        cb.m_nGameID = static_cast<uint64_t>(pushed().app_id.load());
+        cb.m_eResult = 2; // k_EResultFail
+        push_call_result(h, lsc_cb::kGlobalAchievementPercentages,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual int       GetMostAchievedAchievementInfo(char*, uint32_t, float*, bool*) { return -1; }
+    virtual int       GetNextMostAchievedAchievementInfo(int, char*, uint32_t, float*, bool*) { return -1; }
+    virtual bool      GetAchievementAchievedPercent(const char*, float* p) {
+        if (p) *p = 0.0f;
+        return false;
+    }
+    virtual uint64_t RequestGlobalStats(int /*historicalDays*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::GlobalStatsReceived cb{};
+        cb.m_nGameID = static_cast<uint64_t>(pushed().app_id.load());
+        cb.m_eResult = 2; // k_EResultFail
+        push_call_result(h, lsc_cb::kGlobalStatsReceived,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      GetGlobalStatInt64(const char*, int64_t* p)    { if (p) *p = 0; return false; }
+    virtual bool      GetGlobalStatDouble(const char*, double* p)    { if (p) *p = 0.0; return false; }
+    virtual int       GetGlobalStatHistoryInt64(const char*, int64_t*, uint32_t) { return 0; }
+    virtual int       GetGlobalStatHistoryDouble(const char*, double*, uint32_t) { return 0; }
+};
+
+class ISteamInventoryStub {
+public:
+    virtual int       GetResultStatus(int /*resultHandle*/)         { return 8; /*InvalidParam*/ }
+    virtual bool      GetResultItems(int, void*, uint32_t* pcb)     { if (pcb) *pcb = 0; return false; }
+    virtual bool      GetResultItemProperty(int, uint32_t, const char*, char* buf, uint32_t* cb) {
+        if (buf && cb && *cb > 0) buf[0] = '\0';
+        if (cb) *cb = 0;
+        return false;
+    }
+    virtual uint32_t  GetResultTimestamp(int)                       { return 0; }
+    virtual bool      CheckResultSteamID(int, uint64_t)             { return false; }
+    virtual void      DestroyResult(int)                            {}
+    virtual bool      GetAllItems(int* phRes)                       { if (phRes) *phRes = -1; return false; }
+    virtual bool      GetItemsByID(int* phRes, const uint64_t*, uint32_t) { if (phRes) *phRes = -1; return false; }
+    virtual bool      SerializeResult(int, void*, uint32_t* pcb)    { if (pcb) *pcb = 0; return false; }
+    virtual bool      DeserializeResult(int* phRes, const void*, uint32_t, bool) { if (phRes) *phRes = -1; return false; }
+    virtual bool      GenerateItems(int* phRes, const int32_t*, const uint32_t*, uint32_t) { if (phRes) *phRes = -1; return false; }
+    virtual bool      GrantPromoItems(int* phRes)                   { if (phRes) *phRes = -1; return false; }
+    virtual bool      AddPromoItem(int* phRes, int32_t)             { if (phRes) *phRes = -1; return false; }
+    virtual bool      AddPromoItems(int* phRes, const int32_t*, uint32_t) { if (phRes) *phRes = -1; return false; }
+    virtual bool      ConsumeItem(int* phRes, uint64_t, uint32_t)   { if (phRes) *phRes = -1; return false; }
+    virtual bool      ExchangeItems(int* phRes, const int32_t*, const uint32_t*, uint32_t,
+                                     const uint64_t*, const uint32_t*, uint32_t) {
+        if (phRes) *phRes = -1; return false;
+    }
+    virtual bool      TransferItemQuantity(int* phRes, uint64_t, uint32_t, uint64_t) { if (phRes) *phRes = -1; return false; }
+    virtual void      SendItemDropHeartbeat()                       {}
+    virtual bool      TriggerItemDrop(int* phRes, int32_t)          { if (phRes) *phRes = -1; return false; }
+    virtual bool      TradeItems(int* phRes, uint64_t, const uint64_t*, const uint32_t*,
+                                  uint32_t, const uint64_t*, const uint32_t*, uint32_t) {
+        if (phRes) *phRes = -1; return false;
+    }
+    virtual bool      LoadItemDefinitions() {
+        push_callback(state().user.load(), /*kSteamInventoryDefinitionUpdate*/ 4707,
+                      nullptr, 0);
+        return true;
+    }
+    virtual bool      GetItemDefinitionIDs(int32_t* defs, uint32_t* pcb) {
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().inventory_item_defs.find(app);
+        if (it == pushed().inventory_item_defs.end()) {
+            if (pcb) *pcb = 0;
+            return true;
+        }
+        const auto& table = it->second;
+        if (!defs) {
+            if (pcb) *pcb = static_cast<uint32_t>(table.size());
+            return true;
+        }
+        const uint32_t cap = pcb ? *pcb : 0;
+        uint32_t n = 0;
+        for (const auto& kv : table) {
+            if (n >= cap) break;
+            defs[n++] = kv.first;
+        }
+        if (pcb) *pcb = n;
+        return true;
+    }
+    virtual bool      GetItemDefinitionProperty(int32_t iDef, const char* propName,
+                                                 char* buf, uint32_t* cb) {
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto ait = pushed().inventory_item_defs.find(app);
+        if (ait == pushed().inventory_item_defs.end()) {
+            if (buf && cb && *cb > 0) buf[0] = '\0';
+            if (cb) *cb = 0;
+            return false;
+        }
+        auto dit = ait->second.find(iDef);
+        if (dit == ait->second.end()) {
+            if (buf && cb && *cb > 0) buf[0] = '\0';
+            if (cb) *cb = 0;
+            return false;
+        }
+        std::string value;
+        if (!propName || propName[0] == '\0') {
+            for (const auto& kv : dit->second) {
+                if (!value.empty()) value.push_back(',');
+                value.append(kv.first);
+            }
+        } else {
+            auto pit = dit->second.find(propName);
+            if (pit == dit->second.end()) {
+                if (buf && cb && *cb > 0) buf[0] = '\0';
+                if (cb) *cb = 0;
+                return false;
+            }
+            value = pit->second;
+        }
+        const uint32_t needed = static_cast<uint32_t>(value.size()) + 1; // include NUL
+        const uint32_t cap    = cb ? *cb : 0;
+        if (buf && cap > 0) {
+            const uint32_t copy = (needed <= cap ? needed : cap) - 1;
+            std::memcpy(buf, value.data(), copy);
+            buf[copy] = '\0';
+        }
+        if (cb) *cb = needed;
+        return true;
+    }
+    virtual uint64_t RequestEligiblePromoItemDefinitionsIDs(uint64_t sid) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::SteamInventoryEligiblePromoItemDefIDs cb{};
+        cb.m_result                   = 2; // k_EResultFail
+        cb.m_steamID                  = sid;
+        cb.m_numEligiblePromoItemDefs = 0;
+        cb.m_bCachedData              = 0;
+        push_call_result(h, lsc_cb::kSteamInventoryEligiblePromoItemDefIDs,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      GetEligiblePromoItemDefinitionIDs(uint64_t, int32_t*, uint32_t* pcb) { if (pcb) *pcb = 0; return false; }
+    virtual uint64_t StartPurchase(const int32_t* /*defs*/, const uint32_t* /*qtys*/, uint32_t /*n*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::SteamInventoryStartPurchaseResult cb{};
+        cb.m_result     = 2;
+        cb.m_ulOrderID  = 0;
+        cb.m_ulTransID  = 0;
+        push_call_result(h, lsc_cb::kSteamInventoryStartPurchaseResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t RequestPrices() {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::SteamInventoryRequestPricesResult cb{};
+        cb.m_result = 2;
+        cb.m_rgchCurrency[0] = 'U';
+        cb.m_rgchCurrency[1] = 'S';
+        cb.m_rgchCurrency[2] = 'D';
+        cb.m_rgchCurrency[3] = '\0';
+        push_call_result(h, lsc_cb::kSteamInventoryRequestPricesResult,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint32_t  GetNumItemsWithPrices()                       { return 0; }
+    virtual bool      GetItemsWithPrices(int32_t*, uint64_t*, uint64_t*, uint32_t) { return false; }
+    virtual bool      GetItemPrice(int32_t, uint64_t* p, uint64_t* bp) {
+        if (p) *p = 0; if (bp) *bp = 0; return false;
+    }
+    virtual uint64_t  StartUpdateProperties()                       { return 0; }
+    virtual bool      RemoveProperty(uint64_t, uint64_t, const char*) { return false; }
+    virtual bool      SetProperty_String(uint64_t, uint64_t, const char*, const char*) { return false; }
+    virtual bool      SetProperty_Bool  (uint64_t, uint64_t, const char*, bool)        { return false; }
+    virtual bool      SetProperty_Int64 (uint64_t, uint64_t, const char*, int64_t)     { return false; }
+    virtual bool      SetProperty_Float (uint64_t, uint64_t, const char*, float)       { return false; }
+    virtual bool      SubmitUpdateProperties(uint64_t, int* phRes)  { if (phRes) *phRes = -1; return false; }
+    virtual bool      InspectItem(int* phRes, const char*)          { if (phRes) *phRes = -1; return false; }
+};
+
+class ISteamScreenshotsStub {
+public:
+    virtual uint32_t  WriteScreenshot(const void*, uint32_t, int, int) { return 0; }
+    virtual uint32_t  AddScreenshotToLibrary(const char*, const char*, int, int) { return 0; }
+    virtual void      TriggerScreenshot()                            {}
+    virtual void      HookScreenshots(bool hooked)                   { hooked_.store(hooked); }
+    virtual bool      SetLocation(uint32_t, const char*)             { return false; }
+    virtual bool      TagUser(uint32_t, uint64_t)                    { return false; }
+    virtual bool      TagPublishedFile(uint32_t, uint64_t)           { return false; }
+    virtual bool      IsScreenshotsHooked()                          { return hooked_.load(); }
+    virtual uint32_t  AddVRScreenshotToLibrary(int, const char*, const char*) { return 0; }
+private:
+    std::atomic<bool> hooked_{false};
+};
+
+class ISteamMusicStub {
+public:
+    virtual bool      BIsEnabled()                                   { return false; }
+    virtual bool      BIsPlaying()                                   { return false; }
+    virtual int       GetPlaybackStatus()                            { return 0; }
+    virtual void      Play()                                         {}
+    virtual void      Pause()                                        {}
+    virtual void      PlayPrevious()                                 {}
+    virtual void      PlayNext()                                     {}
+    virtual void      SetVolume(float)                               {}
+    virtual float     GetVolume()                                    { return 0.0f; }
+};
+
+class ISteamAppListStub {
+public:
+    virtual uint32_t  GetNumInstalledApps() {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        return static_cast<uint32_t>(pushed().installed_apps.size());
+    }
+    virtual uint32_t  GetInstalledApps(uint32_t* pvecAppID, uint32_t cMax) {
+        std::lock_guard<std::mutex> lk(state_mutex());
+        const auto& set = pushed().installed_apps;
+        uint32_t total = static_cast<uint32_t>(set.size());
+        uint32_t copy  = std::min<uint32_t>(total, cMax);
+        if (pvecAppID && copy > 0) {
+            uint32_t i = 0;
+            for (uint32_t id : set) {
+                if (i >= copy) break;
+                pvecAppID[i++] = id;
+            }
+        }
+        return copy;
+    }
+    virtual int       GetAppName(uint32_t appId, char* pName, int cMaxName) {
+        if (!pName || cMaxName <= 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_names.find(appId);
+        if (it == pushed().app_names.end()) { pName[0] = '\0'; return 0; }
+        const std::string& n = it->second;
+        int copy = std::min<int>(static_cast<int>(n.size()), cMaxName - 1);
+        if (copy > 0) std::memcpy(pName, n.data(), copy);
+        pName[copy] = '\0';
+        return copy;
+    }
+    virtual int       GetAppInstallDir(uint32_t appId, char* pDir, int cMaxDir) {
+        if (!pDir || cMaxDir <= 0) return 0;
+        std::lock_guard<std::mutex> lk(state_mutex());
+        auto it = pushed().app_install_dirs.find(appId);
+        if (it == pushed().app_install_dirs.end()) { pDir[0] = '\0'; return 0; }
+        const std::string& d = it->second;
+        int copy = std::min<int>(static_cast<int>(d.size()), cMaxDir - 1);
+        if (copy > 0) std::memcpy(pDir, d.data(), copy);
+        pDir[copy] = '\0';
+        return copy;
+    }
+    virtual int       GetAppBuildId(uint32_t)                        { return 0; }
+};
+
+class ISteamVideoStub {
+public:
+    virtual uint64_t  GetVideoURL_DEPRECATED(uint32_t)               { return 0; }
+    virtual bool      IsBroadcasting(int* pnNumViewers) {
+        if (pnNumViewers) *pnNumViewers = 0;
+        return false;
+    }
+    virtual uint64_t  GetOPFSettings(uint32_t)                       { return 0; }
+    virtual bool      GetOPFStringForApp(uint32_t, char* buf, int32_t* pnBufSize) {
+        if (buf && pnBufSize && *pnBufSize > 0) buf[0] = '\0';
+        if (pnBufSize) *pnBufSize = 0;
+        return false;
+    }
+};
+
+class ISteamParentalSettingsStub {
+public:
+    virtual bool      BIsParentalLockEnabled()                       { return false; }
+    virtual bool      BIsParentalLockLocked()                        { return false; }
+    virtual bool      BIsAppBlocked(uint32_t)                        { return false; }
+    virtual bool      BIsAppInBlockList(uint32_t)                    { return false; }
+    virtual bool      BIsFeatureBlocked(int)                         { return false; }
+    virtual bool      BIsFeatureInBlockList(int)                     { return false; }
+};
+
+class ISteamMatchmakingServersStub {
+public:
+    static void* fake_handle() {
+        return reinterpret_cast<void*>(uintptr_t{1});
+    }
+    virtual void*     RequestInternetServerList(uint32_t app, void**, uint32_t n, void*) {
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmakingServers.RequestInternetServerList app=%u nFilters=%u",
+            app, n);
+        return fake_handle();
+    }
+    virtual void*     RequestLANServerList(uint32_t app, void*) {
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmakingServers.RequestLANServerList app=%u", app);
+        return fake_handle();
+    }
+    virtual void*     RequestFriendsServerList(uint32_t app, void**, uint32_t, void*) {
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmakingServers.RequestFriendsServerList app=%u", app);
+        return fake_handle();
+    }
+    virtual void*     RequestFavoritesServerList(uint32_t app, void**, uint32_t, void*) {
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmakingServers.RequestFavoritesServerList app=%u", app);
+        return fake_handle();
+    }
+    virtual void*     RequestHistoryServerList(uint32_t app, void**, uint32_t, void*) {
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmakingServers.RequestHistoryServerList app=%u", app);
+        return fake_handle();
+    }
+    virtual void*     RequestSpectatorServerList(uint32_t app, void**, uint32_t, void*) {
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmakingServers.RequestSpectatorServerList app=%u", app);
+        return fake_handle();
+    }
+    virtual void      ReleaseRequest(void*)                          {}
+    virtual void*     GetServerDetails(void*, int)                   { return nullptr; }
+    virtual void      CancelQuery(void*)                             {}
+    virtual void      RefreshQuery(void*)                            {}
+    virtual bool      IsRefreshing(void*)                            { return false; }
+    virtual int       GetServerCount(void*)                          { return 0; }
+    virtual void      RefreshServer(void*, int)                      {}
+    virtual int       PingServer(uint32_t, uint16_t, void*)          { return -1; /*HSERVERQUERY_INVALID*/ }
+    virtual int       PlayerDetails(uint32_t, uint16_t, void*)       { return -1; }
+    virtual int       ServerRules(uint32_t, uint16_t, void*)         { return -1; }
+    virtual void      CancelServerQuery(int)                         {}
+};
+
+struct PendingLobbyFilters {
+    struct Entry {
+        std::string key;
+        std::string value;
+        int32_t     comparison  = 0;
+        int32_t     filter_type = 0;
+    };
+    std::vector<Entry> entries;
+    int32_t            num_results = 50;
+    int32_t            distance    = 1;   // k_ELobbyDistanceFilterDefault
+};
+
+static thread_local PendingLobbyFilters tls_lobby_filters;
+
+class ISteamMatchmakingStub {
+public:
+    virtual int       GetFavoriteGameCount()                         { return 0; }
+    virtual bool      GetFavoriteGame(int, uint32_t*, uint32_t*, uint16_t*,
+                                       uint16_t*, uint32_t*, uint32_t*) { return false; }
+    virtual int       AddFavoriteGame(uint32_t, uint32_t, uint16_t,
+                                       uint16_t, uint32_t, uint32_t)   { return -1; }
+    virtual bool      RemoveFavoriteGame(uint32_t, uint32_t, uint16_t,
+                                          uint16_t, uint32_t)          { return false; }
+    virtual uint64_t RequestLobbyList() {
+        uint64_t h = alloc_api_call_handle();
+        PendingLobbyFilters f = std::move(tls_lobby_filters);
+        tls_lobby_filters = PendingLobbyFilters{};
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmaking.RequestLobbyList hCall=0x%llx app=%u filters=%zu",
+            (unsigned long long)h, pushed().app_id.load(),
+            f.entries.size());
+
+        std::vector<std::string> keys_storage, values_storage;
+        std::vector<const char*> keys, values;
+        std::vector<int32_t>     comparisons, types;
+        keys_storage.reserve(f.entries.size());
+        values_storage.reserve(f.entries.size());
+        keys.reserve(f.entries.size());
+        values.reserve(f.entries.size());
+        comparisons.reserve(f.entries.size());
+        types.reserve(f.entries.size());
+        for (auto& e : f.entries) {
+            keys_storage.push_back(std::move(e.key));
+            values_storage.push_back(std::move(e.value));
+            keys.push_back(keys_storage.back().c_str());
+            values.push_back(values_storage.back().c_str());
+            comparisons.push_back(e.comparison);
+            types.push_back(e.filter_type);
+        }
+
+        const uint32_t app = pushed().app_id.load();
+        bool dispatched = wn_cm_lobby_get_list(
+            h,
+            app,
+            f.num_results,
+            keys.empty() ? nullptr : keys.data(),
+            values.empty() ? nullptr : values.data(),
+            comparisons.empty() ? nullptr : comparisons.data(),
+            types.empty() ? nullptr : types.data(),
+            keys.size(),
+            [](uint64_t hCall, int32_t eresult,
+               const WnCmLobbyEntry* lobbies, size_t count) {
+                std::vector<uint64_t> sids;
+                sids.reserve(count);
+                if (lobbies && eresult >= 0) {
+                    auto guard = std::lock_guard{state_mutex()};
+                    for (size_t i = 0; i < count; ++i) {
+                        sids.push_back(lobbies[i].steam_id);
+                        auto& L = pushed().active_lobbies[lobbies[i].steam_id];
+                        L.max_members = lobbies[i].max_members;
+                    }
+                    pushed().lobby_match_list = sids;
+                }
+                lsc_cb::LobbyMatchList cb{};
+                cb.m_nLobbiesMatching = static_cast<uint32_t>(sids.size());
+                push_call_result(hCall, lsc_cb::kLobbyMatchList,
+                                  &cb, sizeof(cb),
+                                  /*io_failure=*/(eresult < 0));
+            });
+        if (!dispatched) {
+            lsc_cb::LobbyMatchList cb{};
+            cb.m_nLobbiesMatching = 0;
+            push_call_result(h, lsc_cb::kLobbyMatchList,
+                             &cb, sizeof(cb), /*io_failure=*/true);
+        }
+        return h;
+    }
+    virtual void AddRequestLobbyListStringFilter(const char* k, const char* v, int cmp) {
+        if (!k || !v) return;
+        tls_lobby_filters.entries.push_back({k, v, cmp, /*String*/ 0});
+    }
+    virtual void AddRequestLobbyListNumericalFilter(const char* k, int v, int cmp) {
+        if (!k) return;
+        tls_lobby_filters.entries.push_back({k, std::to_string(v), cmp, /*Numerical*/ 1});
+    }
+    virtual void AddRequestLobbyListNearValueFilter(const char* k, int v) {
+        if (!k) return;
+        tls_lobby_filters.entries.push_back({k, std::to_string(v), /*cmp*/ 0, /*NearValue*/ 3});
+    }
+    virtual void AddRequestLobbyListFilterSlotsAvailable(int slots) {
+        tls_lobby_filters.entries.push_back({"", std::to_string(slots), 0, /*SlotsAvail*/ 2});
+    }
+    virtual void AddRequestLobbyListDistanceFilter(int eDist) {
+        tls_lobby_filters.distance = eDist;
+        tls_lobby_filters.entries.push_back({"", std::to_string(eDist), 0, /*Distance*/ 4});
+    }
+    virtual void AddRequestLobbyListResultCountFilter(int n) {
+        if (n > 0) tls_lobby_filters.num_results = n;
+    }
+    virtual void AddRequestLobbyListCompatibleMembersFilter(uint64_t /*sid*/) {}
+    virtual uint64_t GetLobbyByIndex(int idx) {
+        if (idx < 0) return 0;
+        auto guard = std::lock_guard{state_mutex()};
+        const auto& v = pushed().lobby_match_list;
+        if (static_cast<size_t>(idx) >= v.size()) return 0;
+        return v[idx];
+    }
+    virtual uint64_t CreateLobby(int eLobbyType, int maxMembers) {
+        const uint64_t h = alloc_api_call_handle();
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmaking.CreateLobby hCall=0x%llx type=%d maxMembers=%d",
+            (unsigned long long)h, eLobbyType, maxMembers);
+        bool dispatched = wn_cm_lobby_create(
+            h, pushed().app_id.load(),
+            static_cast<int32_t>(eLobbyType),
+            static_cast<int32_t>(maxMembers > 0 ? maxMembers : 4),
+            [](uint64_t hCall, int32_t eresult, uint64_t lobby_sid) {
+                lsc_cb::LobbyCreated cb{};
+                cb.m_eResult        = (eresult > 0) ? eresult : 2; // synthetic fail → Fail
+                cb.m_ulSteamIDLobby = lobby_sid;
+                push_call_result(hCall, lsc_cb::kLobbyCreated,
+                                 &cb, sizeof(cb),
+                                 /*io_failure=*/(eresult < 0));
+                if (cb.m_eResult == 1 && lobby_sid != 0) {
+                    lsc_cb::LobbyEnter le{};
+                    le.m_ulSteamIDLobby         = lobby_sid;
+                    le.m_rgfChatPermissions     = 0;
+                    le.m_bLocked                = 0;
+                    le.m_EChatRoomEnterResponse = 1; // Success
+                    push_callback(state().user.load(),
+                                  lsc_cb::kLobbyEnter, &le, sizeof(le));
+                }
+            });
+        if (!dispatched) {
+            lsc_cb::LobbyCreated cb{};
+            cb.m_eResult        = 2; // k_EResultFail
+            cb.m_ulSteamIDLobby = 0;
+            push_call_result(h, lsc_cb::kLobbyCreated,
+                             &cb, sizeof(cb), /*io_failure=*/true);
+        }
+        return h;
+    }
+    virtual uint64_t JoinLobby(uint64_t lobbySid) {
+        const uint64_t h = alloc_api_call_handle();
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmaking.JoinLobby hCall=0x%llx lobby=0x%llx",
+            (unsigned long long)h, (unsigned long long)lobbySid);
+        bool dispatched = wn_cm_lobby_join(
+            h, pushed().app_id.load(), lobbySid,
+            [](uint64_t hCall, int32_t chat_resp, uint64_t lobby_sid) {
+                lsc_cb::LobbyEnter cb{};
+                cb.m_ulSteamIDLobby         = lobby_sid;
+                cb.m_rgfChatPermissions     = 0;
+                cb.m_bLocked                = 0;
+                cb.m_EChatRoomEnterResponse = (chat_resp > 0) ? chat_resp : 2;
+                push_call_result(hCall, lsc_cb::kLobbyEnter,
+                                 &cb, sizeof(cb),
+                                 /*io_failure=*/(chat_resp < 0));
+            });
+        if (!dispatched) {
+            lsc_cb::LobbyEnter cb{};
+            cb.m_ulSteamIDLobby         = lobbySid;
+            cb.m_EChatRoomEnterResponse = 2; // Error
+            push_call_result(h, lsc_cb::kLobbyEnter,
+                             &cb, sizeof(cb), /*io_failure=*/true);
+        }
+        return h;
+    }
+    virtual void LeaveLobby(uint64_t sid) {
+        if (sid == 0) return;
+        __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+            "ISteamMatchmaking.LeaveLobby lobby=0x%llx",
+            (unsigned long long)sid);
+        wn_cm_lobby_leave(pushed().app_id.load(), sid);
+        auto guard = std::lock_guard{state_mutex()};
+        pushed().active_lobbies.erase(sid);
+    }
+    virtual bool      InviteUserToLobby(uint64_t sid, uint64_t invitee) {
+        if (sid == 0 || invitee == 0) return false;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            if (pushed().active_lobbies.find(sid)
+                    == pushed().active_lobbies.end()) {
+                return false;
+            }
+        }
+        return wn_cm_lobby_invite_user(pushed().app_id.load(), sid, invitee);
+    }
+    virtual int GetNumLobbyMembers(uint64_t sid) {
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return 0;
+        return static_cast<int>(it->second.members.size());
+    }
+    virtual uint64_t GetLobbyMemberByIndex(uint64_t sid, int idx) {
+        if (idx < 0) return 0;
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return 0;
+        int n = 0;
+        for (const auto& kv : it->second.members) {
+            if (n++ == idx) return kv.first;
+        }
+        return 0;
+    }
+    virtual const char* GetLobbyData(uint64_t sid, const char* key) {
+        static thread_local std::string tls;
+        if (!key) { tls.clear(); return tls.c_str(); }
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) { tls.clear(); return tls.c_str(); }
+        auto kt = it->second.data.find(key);
+        tls = (kt == it->second.data.end()) ? std::string{} : kt->second;
+        return tls.c_str();
+    }
+    virtual bool SetLobbyData(uint64_t sid, const char* key, const char* val) {
+        if (sid == 0 || !key) return false;
+        std::string blob;
+        int32_t max_members = 0;
+        int32_t lobby_type  = 0;
+        int32_t lobby_flags = 0;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            auto& L = pushed().active_lobbies[sid];
+            L.data[key] = val ? val : "";
+            max_members = L.max_members;
+            lobby_type  = L.lobby_type;
+            lobby_flags = L.lobby_flags;
+            for (const auto& kv : L.data) {
+                blob.append(kv.first);
+                blob.push_back('\0');
+                blob.append(kv.second);
+                blob.push_back('\0');
+            }
+            blob.push_back('\0');  // double-null terminator
+        }
+        const uint64_t h = alloc_api_call_handle();
+        wn_cm_lobby_set_data(h, pushed().app_id.load(), sid,
+                             /*steam_id_member=*/0,
+                             reinterpret_cast<const uint8_t*>(blob.data()),
+                             blob.size(),
+                             max_members, lobby_type, lobby_flags,
+                             [](uint64_t /*hCall*/, int32_t /*eresult*/) {
+                             });
+        return true;
+    }
+    virtual int GetLobbyDataCount(uint64_t sid) {
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return 0;
+        return static_cast<int>(it->second.data.size());
+    }
+    virtual bool GetLobbyDataByIndex(uint64_t sid, int idx, char* key, int kn,
+                                      char* val, int vn) {
+        if (key && kn > 0) key[0] = '\0';
+        if (val && vn > 0) val[0] = '\0';
+        if (idx < 0) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return false;
+        int n = 0;
+        for (const auto& kv : it->second.data) {
+            if (n++ != idx) continue;
+            if (key && kn > 0) {
+                const auto cc = (kv.first.size() < static_cast<size_t>(kn - 1)
+                                  ? kv.first.size() : static_cast<size_t>(kn - 1));
+                std::memcpy(key, kv.first.data(), cc);
+                key[cc] = '\0';
+            }
+            if (val && vn > 0) {
+                const auto cc = (kv.second.size() < static_cast<size_t>(vn - 1)
+                                  ? kv.second.size() : static_cast<size_t>(vn - 1));
+                std::memcpy(val, kv.second.data(), cc);
+                val[cc] = '\0';
+            }
+            return true;
+        }
+        return false;
+    }
+    virtual bool DeleteLobbyData(uint64_t sid, const char* key) {
+        if (sid == 0 || !key) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return false;
+        return it->second.data.erase(key) > 0;
+    }
+    virtual const char* GetLobbyMemberData(uint64_t sid, uint64_t member, const char* key) {
+        static thread_local std::string tls;
+        tls.clear();
+        if (!key) return tls.c_str();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return tls.c_str();
+        auto mt = it->second.members.find(member);
+        if (mt == it->second.members.end()) return tls.c_str();
+        auto kt = mt->second.data.find(key);
+        if (kt == mt->second.data.end()) return tls.c_str();
+        tls = kt->second;
+        return tls.c_str();
+    }
+    virtual void      SetLobbyMemberData(uint64_t sid, const char* key,
+                                         const char* val) {
+        if (sid == 0 || !key) return;
+        const uint64_t self = pushed().steam_id.load();
+        if (self == 0) return;
+        std::string blob;
+        int32_t max_members = 0;
+        int32_t lobby_type  = 0;
+        int32_t lobby_flags = 0;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            auto& L = pushed().active_lobbies[sid];
+            auto& M = L.members[self];
+            if (val && *val) M.data[key] = val;
+            else             M.data.erase(key);
+            max_members = L.max_members;
+            lobby_type  = L.lobby_type;
+            lobby_flags = L.lobby_flags;
+            for (const auto& kv : M.data) {
+                blob.append(kv.first);
+                blob.push_back('\0');
+                blob.append(kv.second);
+                blob.push_back('\0');
+            }
+            blob.push_back('\0');
+        }
+        const uint64_t h = alloc_api_call_handle();
+        wn_cm_lobby_set_data(h, pushed().app_id.load(), sid,
+                             /*steam_id_member=*/self,
+                             reinterpret_cast<const uint8_t*>(blob.data()),
+                             blob.size(),
+                             max_members, lobby_type, lobby_flags,
+                             [](uint64_t /*hCall*/, int32_t /*eresult*/) {
+                             });
+    }
+    virtual bool      SendLobbyChatMsg(uint64_t sid, const void* body, int n) {
+        if (sid == 0 || !body || n <= 0) return false;
+        return wn_cm_lobby_send_chat(pushed().app_id.load(), sid,
+                                     static_cast<const uint8_t*>(body),
+                                     static_cast<size_t>(n));
+    }
+    virtual int       GetLobbyChatEntry(uint64_t sid, int idx,
+                                         uint64_t* speaker_out,
+                                         void* body_out, int body_cap,
+                                         int* chat_type_out) {
+        if (speaker_out)   *speaker_out   = 0;
+        if (chat_type_out) *chat_type_out = 0;
+        if (sid == 0 || idx < 0 || !body_out || body_cap <= 0) return 0;
+        auto guard = std::lock_guard{state_mutex()};
+        auto bt = pushed().lobby_chat_buffer.find(sid);
+        if (bt == pushed().lobby_chat_buffer.end()) return 0;
+        const auto& ring = bt->second;
+        if (static_cast<size_t>(idx) >= ring.size()) return 0;
+        const auto& e = ring[static_cast<size_t>(idx)];
+        if (speaker_out)   *speaker_out   = e.sender_sid;
+        if (chat_type_out) *chat_type_out = e.chat_type;
+        const int n = static_cast<int>(
+            std::min<size_t>(e.body.size(),
+                              static_cast<size_t>(body_cap)));
+        if (n > 0) std::memcpy(body_out, e.body.data(),
+                               static_cast<size_t>(n));
+        return n;
+    }
+    virtual bool      RequestLobbyData(uint64_t sid) {
+        if (sid == 0) return false;
+        bool have = false;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            have = pushed().active_lobbies.find(sid) !=
+                   pushed().active_lobbies.end();
+        }
+        struct LobbyDataUpdate {
+            uint64_t lobby;
+            uint64_t member;
+            uint8_t  success;
+            uint8_t  _pad[7];
+        };
+        LobbyDataUpdate cb{};
+        cb.lobby   = sid;
+        cb.member  = sid;
+        cb.success = have ? 1 : 0;
+        push_callback(state().user.load(), /*kLobbyDataUpdate*/ 505,
+                      &cb, sizeof(cb));
+        return true;
+    }
+    virtual void SetLobbyGameServer(uint64_t sid, uint32_t ip, uint16_t port, uint64_t gs) {
+        if (sid == 0) return;
+        auto guard = std::lock_guard{state_mutex()};
+        auto& L = pushed().active_lobbies[sid];
+        L.game_server_ip   = ip;
+        L.game_server_port = port;
+        L.game_server_sid  = gs;
+    }
+    virtual bool GetLobbyGameServer(uint64_t sid, uint32_t* ip,
+                                     uint16_t* port, uint64_t* sid_out) {
+        if (ip) *ip = 0; if (port) *port = 0; if (sid_out) *sid_out = 0;
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return false;
+        if (it->second.game_server_sid == 0 && it->second.game_server_ip == 0) return false;
+        if (ip)      *ip      = it->second.game_server_ip;
+        if (port)    *port    = it->second.game_server_port;
+        if (sid_out) *sid_out = it->second.game_server_sid;
+        return true;
+    }
+    virtual bool SetLobbyMemberLimit(uint64_t sid, int max_members) {
+        if (sid == 0 || max_members <= 0) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        auto& L = pushed().active_lobbies[sid];
+        L.max_members = max_members;
+        return true;
+    }
+    virtual int GetLobbyMemberLimit(uint64_t sid) {
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return 0;
+        return it->second.max_members;
+    }
+    virtual bool      SetLobbyType(uint64_t sid, int eLobbyType) {
+        if (sid == 0) return false;
+        std::string blob;
+        int32_t max_members = 0;
+        int32_t lobby_flags = 0;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            auto it = pushed().active_lobbies.find(sid);
+            if (it == pushed().active_lobbies.end()) return false;
+            auto& L = it->second;
+            if (L.owner_sid != pushed().steam_id.load()) return false;
+            L.lobby_type = eLobbyType;
+            max_members  = L.max_members;
+            lobby_flags  = L.lobby_flags;
+            for (const auto& kv : L.data) {
+                blob.append(kv.first); blob.push_back('\0');
+                blob.append(kv.second); blob.push_back('\0');
+            }
+            blob.push_back('\0');
+        }
+        const uint64_t h = alloc_api_call_handle();
+        wn_cm_lobby_set_data(h, pushed().app_id.load(), sid, /*member=*/0,
+                             reinterpret_cast<const uint8_t*>(blob.data()),
+                             blob.size(),
+                             max_members, eLobbyType, lobby_flags,
+                             [](uint64_t, int32_t) {});
+        return true;
+    }
+    virtual bool      SetLobbyJoinable(uint64_t sid, bool joinable) {
+        if (sid == 0) return false;
+        std::string blob;
+        int32_t max_members = 0;
+        int32_t lobby_type  = 0;
+        int32_t new_flags   = 0;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            auto it = pushed().active_lobbies.find(sid);
+            if (it == pushed().active_lobbies.end()) return false;
+            auto& L = it->second;
+            if (L.owner_sid != pushed().steam_id.load()) return false;
+            L.joinable = joinable;
+            new_flags = joinable
+                        ? (L.lobby_flags & ~0x1)   // clear "non-joinable" bit
+                        : (L.lobby_flags |  0x1);  // set it
+            L.lobby_flags = new_flags;
+            max_members   = L.max_members;
+            lobby_type    = L.lobby_type;
+            for (const auto& kv : L.data) {
+                blob.append(kv.first); blob.push_back('\0');
+                blob.append(kv.second); blob.push_back('\0');
+            }
+            blob.push_back('\0');
+        }
+        const uint64_t h = alloc_api_call_handle();
+        wn_cm_lobby_set_data(h, pushed().app_id.load(), sid, /*member=*/0,
+                             reinterpret_cast<const uint8_t*>(blob.data()),
+                             blob.size(),
+                             max_members, lobby_type, new_flags,
+                             [](uint64_t, int32_t) {});
+        return true;
+    }
+    virtual uint64_t GetLobbyOwner(uint64_t sid) {
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_lobbies.find(sid);
+        if (it == pushed().active_lobbies.end()) return 0;
+        return it->second.owner_sid;
+    }
+    virtual bool      SetLobbyOwner(uint64_t sid, uint64_t new_owner) {
+        if (sid == 0 || new_owner == 0) return false;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            auto it = pushed().active_lobbies.find(sid);
+            if (it == pushed().active_lobbies.end()) return false;
+            if (it->second.owner_sid != pushed().steam_id.load()) return false;
+            it->second.owner_sid = new_owner;
+        }
+        const uint64_t h = alloc_api_call_handle();
+        return wn_cm_lobby_set_owner(h, pushed().app_id.load(), sid,
+                                      new_owner,
+                                      [](uint64_t, int32_t) {});
+    }
+    virtual bool      SetLinkedLobby(uint64_t, uint64_t)              { return false; }
+};
+
+class ISteamNetworkingStub {
+public:
+    virtual bool SendP2PPacket(uint64_t sid, const void* /*data*/,
+                                uint32_t n, int /*eP2PSendType*/,
+                                int /*nChannel*/) {
+        if (sid == 0) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        auto& s = pushed().active_p2p_sessions[sid];
+        if (!s.connection_active && !s.connecting) {
+            s.connecting           = true;
+            s.using_relay          = pushed().p2p_relay_allowed.load();
+        }
+        s.bytes_queued_for_send += n;
+        return true;
+    }
+    virtual bool IsP2PPacketAvailable(uint32_t* pcub, int nChannel) {
+        auto guard = std::lock_guard{state_mutex()};
+        auto& q = pushed().p2p_inbound_queue[nChannel];
+        if (q.empty()) { if (pcub) *pcub = 0; return false; }
+        if (pcub) *pcub = static_cast<uint32_t>(q.front().body.size());
+        return true;
+    }
+    virtual bool ReadP2PPacket(void* dest, uint32_t cubDest,
+                                uint32_t* pcub, uint64_t* sidOut, int nChannel) {
+        if (pcub) *pcub = 0;
+        if (sidOut) *sidOut = 0;
+        auto guard = std::lock_guard{state_mutex()};
+        auto& q = pushed().p2p_inbound_queue[nChannel];
+        if (q.empty()) return false;
+        auto& pkt = q.front();
+        if (sidOut) *sidOut = pkt.sender_sid;
+        const auto copy = static_cast<uint32_t>(
+            pkt.body.size() < cubDest ? pkt.body.size() : cubDest);
+        if (dest && copy > 0) std::memcpy(dest, pkt.body.data(), copy);
+        if (pcub) *pcub = copy;
+        q.pop_front();
+        return true;
+    }
+    virtual bool AcceptP2PSessionWithUser(uint64_t sid) {
+        if (sid == 0) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        auto& s = pushed().active_p2p_sessions[sid];
+        s.connection_active = true;
+        s.connecting        = false;
+        s.last_session_error = 0;
+        return true;
+    }
+    virtual bool CloseP2PSessionWithUser(uint64_t sid) {
+        if (sid == 0) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        if (!pushed().active_p2p_sessions.erase(sid)) return false;
+        for (auto& kv : pushed().p2p_inbound_queue) {
+            auto& q = kv.second;
+            q.erase(std::remove_if(q.begin(), q.end(),
+                [sid](const PushedState::P2PInboundPacket& p) {
+                    return p.sender_sid == sid;
+                }),
+                q.end());
+        }
+        return true;
+    }
+    virtual bool CloseP2PChannelWithUser(uint64_t sid, int nChannel) {
+        if (sid == 0) return false;
+        auto guard = std::lock_guard{state_mutex()};
+        auto& q = pushed().p2p_inbound_queue[nChannel];
+        const auto before = q.size();
+        q.erase(std::remove_if(q.begin(), q.end(),
+            [sid](const PushedState::P2PInboundPacket& p) {
+                return p.sender_sid == sid;
+            }),
+            q.end());
+        return q.size() != before;
+    }
+    virtual bool GetP2PSessionState(uint64_t sid, void* pState) {
+        if (!pState) return false;
+        struct P2PSessionStateWire {
+            uint8_t  m_bConnectionActive;
+            uint8_t  m_bConnecting;
+            uint8_t  m_eP2PSessionError;
+            uint8_t  m_bUsingRelay;
+            int32_t  m_nBytesQueuedForSend;
+            int32_t  m_nPacketsQueuedForSend;
+            uint32_t m_nRemoteIP;
+            uint16_t m_nRemotePort;
+            uint16_t _pad;
+        };
+        auto* out = reinterpret_cast<P2PSessionStateWire*>(pState);
+        std::memset(out, 0, sizeof(P2PSessionStateWire));
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().active_p2p_sessions.find(sid);
+        if (it == pushed().active_p2p_sessions.end()) return false;
+        const auto& s = it->second;
+        out->m_bConnectionActive     = s.connection_active ? 1 : 0;
+        out->m_bConnecting           = s.connecting ? 1 : 0;
+        out->m_eP2PSessionError      = static_cast<uint8_t>(s.last_session_error);
+        out->m_bUsingRelay           = s.using_relay ? 1 : 0;
+        out->m_nBytesQueuedForSend   = static_cast<int32_t>(s.bytes_queued_for_send);
+        out->m_nPacketsQueuedForSend = s.bytes_queued_for_send > 0 ? 1 : 0;
+        out->m_nRemoteIP             = s.remote_ip;
+        out->m_nRemotePort           = s.remote_port;
+        return true;
+    }
+    virtual bool AllowP2PPacketRelay(bool bAllow) {
+        pushed().p2p_relay_allowed.store(bAllow);
+        return true;
+    }
+
+    virtual int       CreateListenSocket(int, uint32_t, uint16_t, bool) { return -1; }
+    virtual int       CreateP2PConnectionSocket(uint64_t, int, int, bool) { return -1; }
+    virtual int       CreateConnectionSocket(uint32_t, uint16_t, int)  { return -1; }
+    virtual bool      DestroySocket(int, bool)                       { return false; }
+    virtual bool      DestroyListenSocket(int, bool)                 { return false; }
+    virtual bool      SendDataOnSocket(int, void*, uint32_t, bool)   { return false; }
+    virtual bool      IsDataAvailableOnSocket(int, uint32_t* pcb) {
+        if (pcb) *pcb = 0;
+        return false;
+    }
+    virtual bool      RetrieveDataFromSocket(int, void*, uint32_t, uint32_t* pcb) {
+        if (pcb) *pcb = 0;
+        return false;
+    }
+    virtual bool      IsDataAvailable(int, uint32_t* pcb, int*) {
+        if (pcb) *pcb = 0;
+        return false;
+    }
+    virtual bool      RetrieveData(int, void*, uint32_t, uint32_t* pcb, int*) {
+        if (pcb) *pcb = 0;
+        return false;
+    }
+    virtual bool      GetSocketInfo(int, uint64_t* sid, int* status,
+                                     uint32_t* ip, uint16_t* port, int* lsock) {
+        if (sid)    *sid    = 0;
+        if (status) *status = 0;
+        if (ip)     *ip     = 0;
+        if (port)   *port   = 0;
+        if (lsock)  *lsock  = -1;
+        return false;
+    }
+    virtual bool      GetListenSocketInfo(int, uint32_t* ip, uint16_t* port) {
+        if (ip)   *ip   = 0;
+        if (port) *port = 0;
+        return false;
+    }
+    virtual int       GetSocketConnectionType(int)                   { return 0; }
+    virtual int       GetMaxPacketSize(int)                          { return 0; }
+};
+
+class ISteamUGCStub {
+public:
+    virtual uint64_t  CreateQueryUserUGCRequest(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t) { return 0; }
+    virtual uint64_t  CreateQueryAllUGCRequest_Page(int, int, uint32_t, uint32_t, uint32_t) { return 0; }
+    virtual uint64_t  CreateQueryAllUGCRequest_Cursor(int, int, uint32_t, uint32_t, const char*) { return 0; }
+    virtual uint64_t  CreateQueryUGCDetailsRequest(const uint64_t*, uint32_t) { return 0; }
+    virtual uint64_t SendQueryUGCRequest(uint64_t handle) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::SteamUGCQueryCompleted cb{};
+        cb.m_handle                 = handle;
+        cb.m_eResult                = 1; // k_EResultOK — empty success
+        cb.m_unNumResultsReturned   = 0;
+        cb.m_unTotalMatchingResults = 0;
+        cb.m_bCachedData            = 0;
+        cb.m_rgchNextCursor[0]      = '\0';
+        push_call_result(h, lsc_cb::kSteamUGCQueryCompleted,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual bool      GetQueryUGCResult(uint64_t, uint32_t, void*)   { return false; }
+    virtual uint32_t  GetQueryUGCNumTags(uint64_t, uint32_t)         { return 0; }
+    virtual bool      GetQueryUGCTag(uint64_t, uint32_t, uint32_t, char* v, uint32_t vn) { if (v && vn) v[0] = '\0'; return false; }
+    virtual bool      GetQueryUGCTagDisplayName(uint64_t, uint32_t, uint32_t, char* v, uint32_t vn) { if (v && vn) v[0] = '\0'; return false; }
+    virtual bool      GetQueryUGCPreviewURL(uint64_t, uint32_t, char* v, uint32_t vn) { if (v && vn) v[0] = '\0'; return false; }
+    virtual bool      GetQueryUGCMetadata(uint64_t, uint32_t, char* v, uint32_t vn) { if (v && vn) v[0] = '\0'; return false; }
+    virtual bool      GetQueryUGCChildren(uint64_t, uint32_t, uint64_t*, uint32_t) { return false; }
+    virtual bool      GetQueryUGCStatistic(uint64_t, uint32_t, int, uint64_t* out) { if (out) *out = 0; return false; }
+    virtual uint32_t  GetQueryUGCNumAdditionalPreviews(uint64_t, uint32_t) { return 0; }
+    virtual bool      GetQueryUGCAdditionalPreview(uint64_t, uint32_t, uint32_t, char* url, uint32_t uns, char* orig, uint32_t os, int*) {
+        if (url && uns) url[0] = '\0';
+        if (orig && os) orig[0] = '\0';
+        return false;
+    }
+    virtual uint32_t  GetQueryUGCNumKeyValueTags(uint64_t, uint32_t) { return 0; }
+    virtual bool      GetQueryUGCKeyValueTagByIndex(uint64_t, uint32_t, uint32_t, char* k, uint32_t kn, char* v, uint32_t vn) {
+        if (k && kn) k[0] = '\0';
+        if (v && vn) v[0] = '\0';
+        return false;
+    }
+    virtual bool      GetQueryUGCKeyValueTagByName(uint64_t, uint32_t, const char*, char* v, uint32_t vn) {
+        if (v && vn) v[0] = '\0';
+        return false;
+    }
+    virtual uint32_t  GetQueryUGCContentDescriptors(uint64_t, uint32_t, int*, uint32_t) { return 0; }
+    virtual bool      ReleaseQueryUGCRequest(uint64_t)               { return false; }
+    virtual bool      AddRequiredTag(uint64_t, const char*)          { return false; }
+    virtual bool      AddRequiredTagGroup(uint64_t, const void*)     { return false; }
+    virtual bool      AddExcludedTag(uint64_t, const char*)          { return false; }
+    virtual bool      SetReturnOnlyIDs(uint64_t, bool)               { return false; }
+    virtual bool      SetReturnKeyValueTags(uint64_t, bool)          { return false; }
+    virtual bool      SetReturnLongDescription(uint64_t, bool)       { return false; }
+    virtual bool      SetReturnMetadata(uint64_t, bool)              { return false; }
+    virtual bool      SetReturnChildren(uint64_t, bool)              { return false; }
+    virtual bool      SetReturnAdditionalPreviews(uint64_t, bool)    { return false; }
+    virtual bool      SetReturnTotalOnly(uint64_t, bool)             { return false; }
+    virtual bool      SetReturnPlaytimeStats(uint64_t, uint32_t)     { return false; }
+    virtual bool      SetLanguage(uint64_t, const char*)             { return false; }
+    virtual bool      SetAllowCachedResponse(uint64_t, uint32_t)     { return false; }
+    virtual bool      SetCloudFileNameFilter(uint64_t, const char*)  { return false; }
+    virtual bool      SetMatchAnyTag(uint64_t, bool)                 { return false; }
+    virtual bool      SetSearchText(uint64_t, const char*)           { return false; }
+    virtual bool      SetRankedByTrendDays(uint64_t, uint32_t)       { return false; }
+    virtual bool      SetTimeCreatedDateRange(uint64_t, uint32_t, uint32_t) { return false; }
+    virtual bool      SetTimeUpdatedDateRange(uint64_t, uint32_t, uint32_t) { return false; }
+    virtual bool      AddRequiredKeyValueTag(uint64_t, const char*, const char*) { return false; }
+    virtual uint64_t RequestUGCDetails(uint64_t /*publishedFileId*/, uint32_t /*maxAgeSeconds*/) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::SteamUGCRequestUGCDetailsResultMinimal cb{};
+        cb.m_eResult = 2; // k_EResultFail
+        push_call_result(h, lsc_cb::kSteamUGCRequestUGCDetails,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t  CreateItem(uint32_t, int)                      { return 0; }
+    virtual uint64_t  StartItemUpdate(uint32_t, uint64_t)            { return 0; }
+    virtual bool      SetItemTitle(uint64_t, const char*)            { return false; }
+    virtual bool      SetItemDescription(uint64_t, const char*)      { return false; }
+    virtual bool      SetItemUpdateLanguage(uint64_t, const char*)   { return false; }
+    virtual bool      SetItemMetadata(uint64_t, const char*)         { return false; }
+    virtual bool      SetItemVisibility(uint64_t, int)               { return false; }
+    virtual bool      SetItemTags(uint64_t, const void*, bool)       { return false; }
+    virtual bool      SetItemContent(uint64_t, const char*)          { return false; }
+    virtual bool      SetItemPreview(uint64_t, const char*)          { return false; }
+    virtual bool      SetAllowLegacyUpload(uint64_t, bool)           { return false; }
+    virtual bool      RemoveAllItemKeyValueTags(uint64_t)            { return false; }
+    virtual bool      RemoveItemKeyValueTags(uint64_t, const char*)  { return false; }
+    virtual bool      AddItemKeyValueTag(uint64_t, const char*, const char*) { return false; }
+    virtual bool      AddItemPreviewFile(uint64_t, const char*, int) { return false; }
+    virtual bool      AddItemPreviewVideo(uint64_t, const char*)     { return false; }
+    virtual bool      UpdateItemPreviewFile(uint64_t, uint32_t, const char*) { return false; }
+    virtual bool      UpdateItemPreviewVideo(uint64_t, uint32_t, const char*) { return false; }
+    virtual bool      RemoveItemPreview(uint64_t, uint32_t)          { return false; }
+    virtual bool      AddContentDescriptor(uint64_t, int)            { return false; }
+    virtual bool      RemoveContentDescriptor(uint64_t, int)         { return false; }
+    virtual uint64_t  SubmitItemUpdate(uint64_t, const char*)        { return 0; }
+    virtual int       GetItemUpdateProgress(uint64_t, uint64_t* bp, uint64_t* bt) {
+        if (bp) *bp = 0;
+        if (bt) *bt = 0;
+        return 0;
+    }
+    virtual uint64_t  SetUserItemVote(uint64_t, bool)                { return 0; }
+    virtual uint64_t  GetUserItemVote(uint64_t)                      { return 0; }
+    virtual uint64_t  AddItemToFavorites(uint32_t, uint64_t)         { return 0; }
+    virtual uint64_t  RemoveItemFromFavorites(uint32_t, uint64_t)    { return 0; }
+    virtual uint64_t SubscribeItem(uint64_t publishedFileId) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::RemoteStorageSubscribePublishedFileResult cb{};
+        cb.m_eResult          = 2; // k_EResultFail (no UGC backend)
+        cb.m_nPublishedFileId = publishedFileId;
+        push_call_result(h, lsc_cb::kRemoteStorageSubscribePublishedFile,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint64_t UnsubscribeItem(uint64_t publishedFileId) {
+        uint64_t h = alloc_api_call_handle();
+        lsc_cb::RemoteStorageUnsubscribePublishedFileResult cb{};
+        cb.m_eResult          = 2; // k_EResultFail
+        cb.m_nPublishedFileId = publishedFileId;
+        push_call_result(h, lsc_cb::kRemoteStorageUnsubscribePublishedFile,
+                         &cb, sizeof(cb), /*io_failure=*/false);
+        return h;
+    }
+    virtual uint32_t  GetNumSubscribedItems() {
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().subscribed_workshop_items.find(app);
+        if (it == pushed().subscribed_workshop_items.end()) return 0;
+        return static_cast<uint32_t>(it->second.size());
+    }
+    virtual uint32_t  GetSubscribedItems(uint64_t* pIds, uint32_t cMax) {
+        if (!pIds || cMax == 0) return 0;
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().subscribed_workshop_items.find(app);
+        if (it == pushed().subscribed_workshop_items.end()) return 0;
+        uint32_t n = 0;
+        for (const auto& kv : it->second) {
+            if (n >= cMax) break;
+            pIds[n++] = kv.first;
+        }
+        return n;
+    }
+    virtual uint32_t  GetItemState(uint64_t publishedFileId) {
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().subscribed_workshop_items.find(app);
+        if (it == pushed().subscribed_workshop_items.end()) return 0;
+        auto jt = it->second.find(publishedFileId);
+        if (jt == it->second.end() || !jt->second.installed) return 0;
+        return /*k_EItemStateSubscribed*/ 1u | /*k_EItemStateInstalled*/ 4u;
+    }
+    virtual bool      GetItemInstallInfo(uint64_t publishedFileId,
+                                          uint64_t* bytes,
+                                          char* folder, uint32_t fn,
+                                          uint32_t* timestamp) {
+        if (bytes) *bytes = 0;
+        if (folder && fn) folder[0] = '\0';
+        if (timestamp) *timestamp = 0;
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().subscribed_workshop_items.find(app);
+        if (it == pushed().subscribed_workshop_items.end()) return false;
+        auto jt = it->second.find(publishedFileId);
+        if (jt == it->second.end() || !jt->second.installed) return false;
+        if (bytes)     *bytes     = jt->second.size_bytes;
+        if (timestamp) *timestamp = jt->second.timestamp;
+        if (folder && fn) {
+            const auto& src = jt->second.install_dir;
+            const auto copy = (src.size() < fn ? src.size() : fn - 1);
+            std::memcpy(folder, src.data(), copy);
+            folder[copy] = '\0';
+        }
+        return true;
+    }
+    virtual bool      GetItemDownloadInfo(uint64_t publishedFileId, uint64_t* bd, uint64_t* bt) {
+        if (bd) *bd = 0;
+        if (bt) *bt = 0;
+        const auto app = pushed().app_id.load();
+        auto guard = std::lock_guard{state_mutex()};
+        auto it = pushed().subscribed_workshop_items.find(app);
+        if (it == pushed().subscribed_workshop_items.end()) return false;
+        auto jt = it->second.find(publishedFileId);
+        if (jt == it->second.end() || !jt->second.installed) return false;
+        if (bd) *bd = jt->second.size_bytes;
+        if (bt) *bt = jt->second.size_bytes;
+        return true;
+    }
+    virtual bool      DownloadItem(uint64_t publishedFileId, bool /*bHighPriority*/) {
+        const auto app = pushed().app_id.load();
+        bool installed = false;
+        {
+            auto guard = std::lock_guard{state_mutex()};
+            auto it = pushed().subscribed_workshop_items.find(app);
+            if (it != pushed().subscribed_workshop_items.end()) {
+                auto jt = it->second.find(publishedFileId);
+                if (jt != it->second.end() && jt->second.installed) installed = true;
+            }
+        }
+        if (!installed) return false;
+        struct DownloadItemResult { uint32_t app_id; uint64_t pfid; int32_t eResult; };
+        struct ItemInstalled      { uint32_t app_id; uint64_t pfid; };
+        DownloadItemResult dr{ app, publishedFileId, /*k_EResultOK*/ 1 };
+        ItemInstalled      ii{ app, publishedFileId };
+        push_callback(state().user.load(), 3406, &dr, sizeof(dr));
+        push_callback(state().user.load(), 3414, &ii, sizeof(ii));
+        return true;
+    }
+    virtual bool      BInitWorkshopForGameServer(uint32_t, const char*) { return false; }
+    virtual void      SuspendDownloads(bool)                         {}
+    virtual uint64_t  StartPlaytimeTracking(uint64_t*, uint32_t)     { return 0; }
+    virtual uint64_t  StopPlaytimeTracking(uint64_t*, uint32_t)      { return 0; }
+    virtual uint64_t  StopPlaytimeTrackingForAllItems()              { return 0; }
+    virtual uint64_t  AddDependency(uint64_t, uint64_t)              { return 0; }
+    virtual uint64_t  RemoveDependency(uint64_t, uint64_t)           { return 0; }
+    virtual uint64_t  AddAppDependency(uint64_t, uint32_t)           { return 0; }
+    virtual uint64_t  RemoveAppDependency(uint64_t, uint32_t)        { return 0; }
+    virtual uint64_t  GetAppDependencies(uint64_t)                   { return 0; }
+    virtual uint64_t  DeleteItem(uint64_t)                           { return 0; }
+    virtual bool      ShowWorkshopEULA()                             { return false; }
+    virtual uint64_t  GetWorkshopEULAStatus()                        { return 0; }
+    virtual uint32_t  GetUserContentDescriptorPreferences(int*, uint32_t) { return 0; }
+};
+
+class ISteamGameServerStub {
+public:
+    virtual void      SetProduct(const char*)                        {}
+    virtual void      SetGameDescription(const char*)                {}
+    virtual void      SetModDir(const char*)                         {}
+    virtual void      SetDedicatedServer(bool)                       {}
+    virtual void      LogOn(const char*)                             {}
+    virtual void      LogOnAnonymous()                               {}
+    virtual void      LogOff()                                       {}
+    virtual bool      BLoggedOn()                                    { return false; }
+    virtual bool      BSecure()                                      { return false; }
+    virtual uint64_t  GetSteamID()                                   { return 0; }
+    virtual bool      WasRestartRequested()                          { return false; }
+    virtual void      SetMaxPlayerCount(int)                         {}
+    virtual void      SetBotPlayerCount(int)                         {}
+    virtual void      SetServerName(const char*)                     {}
+    virtual void      SetMapName(const char*)                        {}
+    virtual void      SetPasswordProtected(bool)                     {}
+    virtual void      SetSpectatorPort(uint16_t)                     {}
+    virtual void      SetSpectatorServerName(const char*)            {}
+    virtual void      ClearAllKeyValues()                            {}
+    virtual void      SetKeyValue(const char*, const char*)          {}
+    virtual void      SetGameTags(const char*)                       {}
+    virtual void      SetGameData(const char*)                       {}
+    virtual void      SetRegion(const char*)                         {}
+    virtual void      SetAdvertiseServerActive(bool)                 {}
+    virtual uint64_t  GetAuthSessionTicket(void*, int, uint32_t* pcb, const void*) {
+        if (pcb) *pcb = 0;
+        return 0;  // k_HAuthTicketInvalid
+    }
+    virtual int       BeginAuthSession(const void*, int, uint64_t)   { return 5; /*ServerNotConnectedToSteam*/ }
+    virtual void      EndAuthSession(uint64_t)                       {}
+    virtual void      CancelAuthTicket(uint64_t)                     {}
+    virtual int       UserHasLicenseForApp(uint64_t, uint32_t)       { return 2; /*NoAuth*/ }
+    virtual bool      RequestUserGroupStatus(uint64_t, uint64_t)     { return false; }
+    virtual void      GetGameplayStats()                             {}
+    virtual uint64_t  GetServerReputation()                          { return 0; }
+    virtual void      GetPublicIP(void* out) {
+        if (out) std::memset(out, 0, 16);
+    }
+    virtual bool      HandleIncomingPacket(const void*, int, uint32_t, uint16_t) { return false; }
+    virtual int       GetNextOutgoingPacket(void*, int, uint32_t*, uint16_t*) { return 0; }
+    virtual uint64_t  AssociateWithClan(uint64_t)                    { return 0; }
+    virtual uint64_t  ComputeNewPlayerCompatibility(uint64_t)        { return 0; }
+    virtual bool      SendUserConnectAndAuthenticate_DEPRECATED(uint32_t, const void*, uint32_t, uint64_t*) { return false; }
+    virtual uint64_t  CreateUnauthenticatedUserConnection()          { return 0; }
+    virtual void      SendUserDisconnect_DEPRECATED(uint64_t)        {}
+    virtual bool      BUpdateUserData(uint64_t, const char*, uint32_t) { return false; }
+    virtual uint64_t  GetAuthTicketForWebApi(const char*)            { return 0; }
+};
+
+class ISteamMusicRemoteStub {
+public:
+    virtual bool      RegisterSteamMusicRemote(const char*)          { return false; }
+    virtual bool      DeregisterSteamMusicRemote()                   { return false; }
+    virtual bool      BIsCurrentMusicRemote()                        { return false; }
+    virtual bool      BActivationSuccess(bool)                       { return false; }
+    virtual bool      SetDisplayName(const char*)                    { return false; }
+    virtual bool      SetPNGIcon_64x64(void*, uint32_t)              { return false; }
+    virtual bool      EnablePlayPrevious(bool)                       { return false; }
+    virtual bool      EnablePlayNext(bool)                           { return false; }
+    virtual bool      EnableShuffled(bool)                           { return false; }
+    virtual bool      EnableLooped(bool)                             { return false; }
+    virtual bool      EnableQueue(bool)                              { return false; }
+    virtual bool      EnablePlaylists(bool)                          { return false; }
+    virtual bool      UpdatePlaybackStatus(int)                      { return false; }
+    virtual bool      UpdateShuffled(bool)                           { return false; }
+    virtual bool      UpdateLooped(bool)                             { return false; }
+    virtual bool      UpdateVolume(float)                            { return false; }
+    virtual bool      CurrentEntryWillChange()                       { return false; }
+    virtual bool      CurrentEntryIsAvailable(bool)                  { return false; }
+    virtual bool      UpdateCurrentEntryText(const char*)            { return false; }
+    virtual bool      UpdateCurrentEntryElapsedSeconds(int)          { return false; }
+    virtual bool      UpdateCurrentEntryCoverArt(void*, uint32_t)    { return false; }
+    virtual bool      CurrentEntryDidChange()                        { return false; }
+    virtual bool      QueueWillChange()                              { return false; }
+    virtual bool      ResetQueueEntries()                            { return false; }
+    virtual bool      SetQueueEntry(int, int, const char*)           { return false; }
+    virtual bool      SetCurrentQueueEntry(int)                      { return false; }
+    virtual bool      QueueDidChange()                               { return false; }
+    virtual bool      PlaylistWillChange()                           { return false; }
+    virtual bool      ResetPlaylistEntries()                         { return false; }
+    virtual bool      SetPlaylistEntry(int, int, const char*)        { return false; }
+    virtual bool      SetCurrentPlaylistEntry(int)                   { return false; }
+    virtual bool      PlaylistDidChange()                            { return false; }
+};
+
+class ISteamHTMLSurfaceStub {
+public:
+    virtual bool      Init()                                         { return false; }
+    virtual bool      Shutdown()                                     { return false; }
+    virtual uint64_t  CreateBrowser(const char*, const char*)        { return 0; }
+    virtual void      RemoveBrowser(uint32_t)                        {}
+    virtual void      LoadURL(uint32_t, const char*, const char*)    {}
+    virtual void      SetSize(uint32_t, uint32_t, uint32_t)          {}
+    virtual void      StopLoad(uint32_t)                             {}
+    virtual void      Reload(uint32_t)                               {}
+    virtual void      GoBack(uint32_t)                               {}
+    virtual void      GoForward(uint32_t)                            {}
+    virtual void      AddHeader(uint32_t, const char*, const char*)  {}
+    virtual void      ExecuteJavascript(uint32_t, const char*)       {}
+    virtual void      MouseUp(uint32_t, int)                         {}
+    virtual void      MouseDown(uint32_t, int)                       {}
+    virtual void      MouseDoubleClick(uint32_t, int)                {}
+    virtual void      MouseMove(uint32_t, int, int)                  {}
+    virtual void      MouseWheel(uint32_t, int32_t)                  {}
+    virtual void      KeyDown(uint32_t, uint32_t, int)               {}
+    virtual void      KeyUp(uint32_t, uint32_t, int)                 {}
+    virtual void      KeyChar(uint32_t, uint32_t, int)               {}
+    virtual void      SetHorizontalScroll(uint32_t, uint32_t)        {}
+    virtual void      SetVerticalScroll(uint32_t, uint32_t)          {}
+    virtual void      SetKeyFocus(uint32_t, bool)                    {}
+    virtual void      ViewSource(uint32_t)                           {}
+    virtual void      CopyToClipboard(uint32_t)                      {}
+    virtual void      PasteFromClipboard(uint32_t)                   {}
+    virtual void      Find(uint32_t, const char*, bool, bool)        {}
+    virtual void      StopFind(uint32_t)                             {}
+    virtual void      GetLinkAtPosition(uint32_t, int, int)          {}
+    virtual void      SetCookie(const char*, const char*, const char*, const char*, uint32_t, bool, bool) {}
+    virtual void      SetPageScaleFactor(uint32_t, float, int, int)  {}
+    virtual void      SetBackgroundMode(uint32_t, bool)              {}
+    virtual void      SetDPIScalingFactor(uint32_t, float)           {}
+    virtual void      OpenDeveloperTools(uint32_t)                   {}
+    virtual void      AllowStartRequest(uint32_t, bool)              {}
+    virtual void      JSDialogResponse(uint32_t, bool)               {}
+    virtual void      FileLoadDialogResponse(uint32_t, const char**) {}
+};
+
+class ISteamInputStub {
+public:
+    virtual bool      Init(bool)                                     { return false; }
+    virtual bool      Shutdown()                                     { return false; }
+    virtual bool      SetInputActionManifestFilePath(const char*)    { return false; }
+    virtual void      RunFrame(bool)                                 {}
+    virtual bool      BWaitForData(bool, uint32_t)                   { return false; }
+    virtual bool      BNewDataAvailable()                            { return false; }
+    virtual int       GetConnectedControllers(uint64_t*)             { return 0; }
+    virtual void      EnableDeviceCallbacks()                        {}
+    virtual void      EnableActionEventCallbacks(void*)              {}
+    virtual uint64_t  GetActionSetHandle(const char*)                { return 0; }
+    virtual void      ActivateActionSet(uint64_t, uint64_t)          {}
+    virtual uint64_t  GetCurrentActionSet(uint64_t)                  { return 0; }
+    virtual void      ActivateActionSetLayer(uint64_t, uint64_t)     {}
+    virtual void      DeactivateActionSetLayer(uint64_t, uint64_t)   {}
+    virtual void      DeactivateAllActionSetLayers(uint64_t)         {}
+    virtual int       GetActiveActionSetLayers(uint64_t, uint64_t*)  { return 0; }
+    virtual uint64_t  GetDigitalActionHandle(const char*)            { return 0; }
+    virtual void      GetDigitalActionData(uint64_t, uint64_t, void* outData) {
+        if (outData) std::memset(outData, 0, 2);
+    }
+    virtual int       GetDigitalActionOrigins(uint64_t, uint64_t, uint64_t, int*) { return 0; }
+    virtual const char* GetStringForDigitalActionName(uint64_t)      { return ""; }
+    virtual uint64_t  GetAnalogActionHandle(const char*)             { return 0; }
+    virtual void      GetAnalogActionData(uint64_t, uint64_t, void* outData) {
+        if (outData) std::memset(outData, 0, 16);
+    }
+    virtual int       GetAnalogActionOrigins(uint64_t, uint64_t, uint64_t, int*) { return 0; }
+    virtual const char* GetGlyphPNGForActionOrigin(int, int, uint32_t) { return ""; }
+    virtual const char* GetGlyphSVGForActionOrigin(int, uint32_t)    { return ""; }
+    virtual const char* GetGlyphForActionOrigin_Legacy(int)          { return ""; }
+    virtual const char* GetStringForActionOrigin(int)                { return ""; }
+    virtual const char* GetStringForAnalogActionName(uint64_t)       { return ""; }
+    virtual void      StopAnalogActionMomentum(uint64_t, uint64_t)   {}
+    virtual void      GetMotionData(uint64_t)                        {}
+    virtual void      TriggerVibration(uint64_t, uint16_t, uint16_t) {}
+    virtual void      TriggerVibrationExtended(uint64_t, uint16_t, uint16_t, uint16_t, uint16_t) {}
+    virtual void      TriggerSimpleHapticEvent(uint64_t, int, uint8_t, char, uint8_t, char) {}
+    virtual void      SetLEDColor(uint64_t, uint8_t, uint8_t, uint8_t, uint32_t) {}
+    virtual void      Legacy_TriggerHapticPulse(uint64_t, int, uint16_t) {}
+    virtual void      Legacy_TriggerRepeatedHapticPulse(uint64_t, int, uint16_t, uint16_t, uint16_t, uint32_t) {}
+    virtual bool      ShowBindingPanel(uint64_t)                     { return false; }
+    virtual int       GetInputTypeForHandle(uint64_t)                { return 0; /*ESteamInputType_Unknown*/ }
+    virtual uint64_t  GetControllerForGamepadIndex(int)              { return 0; }
+    virtual int       GetGamepadIndexForController(uint64_t)         { return -1; }
+    virtual const char* GetStringForXboxOrigin(int)                  { return ""; }
+    virtual const char* GetGlyphForXboxOrigin(int)                   { return ""; }
+    virtual int       GetActionOriginFromXboxOrigin(uint64_t, int)   { return 0; }
+    virtual int       TranslateActionOrigin(int, int)                { return 0; }
+    virtual bool      GetDeviceBindingRevision(uint64_t, int*, int*) { return false; }
+    virtual uint32_t  GetRemotePlaySessionID(uint64_t)               { return 0; }
+    virtual uint32_t  GetSessionInputConfigurationSettings()         { return 0; }
+    virtual void      SetDualSenseTriggerEffect(uint64_t, const void*) {}
+};
+
+class ISteamPartiesStub {
+public:
+    virtual uint32_t  GetNumActiveBeacons()                          { return 0; }
+    virtual uint64_t  GetBeaconByIndex(uint32_t)                     { return 0; }
+    virtual bool      GetBeaconDetails(uint64_t, uint64_t*, void*, char* meta, int mn) {
+        if (meta && mn > 0) meta[0] = '\0';
+        return false;
+    }
+    virtual uint64_t  JoinParty(uint64_t)                            { return 0; }
+    virtual bool      GetNumAvailableBeaconLocations(uint32_t* pNum) {
+        if (pNum) *pNum = 0;
+        return false;
+    }
+    virtual bool      GetAvailableBeaconLocations(void*, uint32_t)   { return false; }
+    virtual uint64_t  CreateBeacon(uint32_t, void*, int, const char*, const char*) { return 0; }
+    virtual void      OnReservationCompleted(uint64_t, uint64_t)     {}
+    virtual void      CancelReservation(uint64_t, uint64_t)          {}
+    virtual uint64_t  ChangeNumOpenSlots(uint64_t, uint32_t)         { return 0; }
+    virtual bool      DestroyBeacon(uint64_t)                        { return false; }
+    virtual bool      GetBeaconLocationData(void*, int, char* str, int sn) {
+        if (str && sn > 0) str[0] = '\0';
+        return false;
+    }
+};
+
+class ISteamRemotePlayStub {
+public:
+    virtual uint32_t  GetSessionCount()                              { return 0; }
+    virtual uint32_t  GetSessionID(int)                              { return 0; }
+    virtual uint64_t  GetSessionSteamID(uint32_t)                    { return 0; }
+    virtual const char* GetSessionClientName(uint32_t)               { return ""; }
+    virtual int       GetSessionClientFormFactor(uint32_t)           { return 0; }
+    virtual bool      BGetSessionClientResolution(uint32_t, int* w, int* h) {
+        if (w) *w = 0;
+        if (h) *h = 0;
+        return false;
+    }
+    virtual bool      BStartRemotePlayTogether(bool)                 { return false; }
+    virtual bool      BSendRemotePlayTogetherInvite(uint64_t)        { return false; }
+};
+
+class ISteamNetworkingSocketsStub {
+public:
+    virtual uint32_t CreateListenSocketIP(const void* /*pSteamNetworkingIPAddr*/,
+                                          int, const void*)                          { return 0; }
+    virtual uint32_t ConnectByIPAddress(const void*, int, const void*)               { return 0; }
+    virtual uint32_t CreateListenSocketP2P(int, int, const void*)                    { return 0; }
+    virtual uint32_t ConnectP2P(const void* /*identityRemote*/, int, int, const void*) { return 0; }
+    virtual int      AcceptConnection(uint32_t)                                      { return 3; }
+    virtual bool     CloseConnection(uint32_t, int, const char*, bool)               { return false; }
+    virtual bool     CloseListenSocket(uint32_t)                                     { return false; }
+    virtual bool     SetConnectionUserData(uint32_t, int64_t)                        { return false; }
+    virtual int64_t  GetConnectionUserData(uint32_t)                                 { return -1; }
+    virtual void     SetConnectionName(uint32_t, const char*)                        {}
+    virtual bool     GetConnectionName(uint32_t, char* buf, int cap) {
+        if (buf && cap > 0) buf[0] = '\0';
+        return false;
+    }
+    virtual int      SendMessageToConnection(uint32_t, const void*, uint32_t, int, int64_t*) { return 3; }
+    virtual void     SendMessages(int, const void* const*, int64_t*)                 {}
+    virtual int      FlushMessagesOnConnection(uint32_t)                             { return 3; }
+    virtual int      ReceiveMessagesOnConnection(uint32_t, void** /*ppOutMessages*/, int) { return 0; }
+    virtual uint32_t CreatePollGroup()                                               { return 0; }
+    virtual bool     DestroyPollGroup(uint32_t)                                      { return false; }
+    virtual bool     SetConnectionPollGroup(uint32_t, uint32_t)                      { return false; }
+    virtual int      ReceiveMessagesOnPollGroup(uint32_t, void**, int)               { return 0; }
+    virtual bool     GetConnectionInfo(uint32_t, void*)                              { return false; }
+    virtual int      GetConnectionRealTimeStatus(uint32_t, void*, int, void*)        { return 3; }
+    virtual int      GetDetailedConnectionStatus(uint32_t, char* buf, int cap) {
+        if (buf && cap > 0) buf[0] = '\0';
+        return -1;
+    }
+    virtual bool     GetListenSocketAddress(uint32_t, void*)                         { return false; }
+    virtual bool     CreateSocketPair(uint32_t* a, uint32_t* b, bool, const void*, const void*) {
+        if (a) *a = 0;
+        if (b) *b = 0;
+        return false;
+    }
+    virtual int      ConfigureConnectionLanes(uint32_t, int, const int*, const uint16_t*) { return 3; }
+    virtual bool     GetIdentity(void* pIdentity) {
+        if (!pIdentity) return false;
+        const uint64_t sid = pushed().steam_id.load();
+        if (sid == 0) return false;
+        struct NetIdentitySteamIDPrefix {
+            int32_t  e_type;
+            int32_t  cb_size;
+            uint64_t steam_id64;
+        };
+        std::memset(pIdentity, 0, 136);
+        auto* out = reinterpret_cast<NetIdentitySteamIDPrefix*>(pIdentity);
+        out->e_type     = 16;  // k_ESteamNetworkingIdentityType_SteamID
+        out->cb_size    = sizeof(uint64_t);
+        out->steam_id64 = sid;
+        return true;
+    }
+    virtual int      InitAuthentication()                                            { return -102; }
+    virtual int      GetAuthenticationStatus(void*)                                  { return -102; }
+    virtual bool     ReceivedRelayAuthTicket(const void*, int, void*)                { return false; }
+    virtual int      FindRelayAuthTicketForServer(const void*, int, void*)           { return 0; }
+    virtual uint32_t ConnectToHostedDedicatedServer(const void*, int, int, const void*) { return 0; }
+    virtual uint16_t GetHostedDedicatedServerPort()                                  { return 0; }
+    virtual uint32_t GetHostedDedicatedServerPOPID()                                 { return 0; }
+    virtual int      GetHostedDedicatedServerAddress(void*)                          { return 3; }
+    virtual uint32_t CreateHostedDedicatedServerListenSocket(int, int, const void*)  { return 0; }
+    virtual int      GetGameCoordinatorServerLogin(void*, int*, void*)               { return 3; }
+    virtual uint32_t ConnectP2PCustomSignaling(void*, const void*, int, int, const void*) { return 0; }
+    virtual bool     ReceivedP2PCustomSignal(const void*, int, void*)                { return false; }
+    virtual bool     GetCertificateRequest(int*, void*, void*)                       { return false; }
+    virtual bool     SetCertificate(const void*, int, void*)                         { return false; }
+    virtual void     ResetIdentity(const void*)                                      {}
+    virtual void     RunCallbacks()                                                  {}
+    virtual bool     BeginAsyncRequestFakeIP(int)                                    { return false; }
+    virtual void     GetFakeIP(int, void*)                                           {}
+    virtual uint32_t CreateListenSocketP2PFakeIP(int, int, const void*)              { return 0; }
+    virtual int      GetRemoteFakeIPForConnection(uint32_t, void*)                   { return 3; }
+    virtual void*    CreateFakeUDPPort(int)                                          { return nullptr; }
+};
+
+class ISteamNetworkingUtilsStub {
+public:
+    virtual void*    AllocateMessage(int)                                            { return nullptr; }
+    virtual void     InitRelayNetworkAccess()                                        {}
+    virtual int      GetRelayNetworkStatus(void*)                                    { return -102; }
+    virtual float    GetLocalPingLocation(void*)                                     { return -1.0f; }
+    virtual int      EstimatePingTimeBetweenTwoLocations(const void*, const void*)   { return -1; }
+    virtual int      EstimatePingTimeFromLocalHost(const void*)                      { return -1; }
+    virtual void     ConvertPingLocationToString(const void*, char* buf, int cap) {
+        if (buf && cap > 0) buf[0] = '\0';
+    }
+    virtual bool     ParsePingLocationString(const char*, void*)                     { return false; }
+    virtual bool     CheckPingDataUpToDate(float)                                    { return true; }
+    virtual int      GetPingToDataCenter(uint32_t, uint32_t*)                        { return -1; }
+    virtual int      GetDirectPingToPOP(uint32_t)                                    { return -1; }
+    virtual int      GetPOPCount()                                                   { return 0; }
+    virtual int      GetPOPList(uint32_t*, int)                                      { return 0; }
+    virtual int64_t  GetLocalTimestamp() {
+        return std::chrono::duration_cast<std::chrono::microseconds>(
+            std::chrono::steady_clock::now().time_since_epoch()).count();
+    }
+    virtual void     SetDebugOutputFunction(int, void*)                              {}
+    virtual bool     IsFakeIPv4(uint32_t)                                            { return false; }
+    virtual int      GetIPv4FakeIPType(uint32_t)                                     { return 0; }
+    virtual int      GetRealIdentityForFakeIP(const void*, void*)                    { return 3; }
+    virtual bool     SetGlobalConfigValueInt32(int, int)                             { return false; }
+    virtual bool     SetGlobalConfigValueFloat(int, float)                           { return false; }
+    virtual bool     SetGlobalConfigValueString(int, const char*)                    { return false; }
+    virtual bool     SetGlobalConfigValuePtr(int, void*)                             { return false; }
+    virtual bool     SetConnectionConfigValueInt32(uint32_t, int, int)               { return false; }
+    virtual bool     SetConnectionConfigValueFloat(uint32_t, int, float)             { return false; }
+    virtual bool     SetConnectionConfigValueString(uint32_t, int, const char*)      { return false; }
+    virtual bool     SetConfigValue(int, int, intptr_t, int, const void*)            { return false; }
+    virtual bool     SetConfigValueStruct(const void*, int, intptr_t)                { return false; }
+    virtual int      GetConfigValue(int, int, intptr_t, int*, void*, uint64_t*)      { return -1; }
+    virtual const char* GetConfigValueInfo(int, int*, int*, int*)                    { return nullptr; }
+    virtual int      IterateGenericEditableConfigValues(int, bool)                   { return 0; }
+    virtual void     SteamNetworkingIPAddr_ToString(const void* pAddr,
+                                                     char* buf, uint32_t cap,
+                                                     bool with_port) {
+        if (!buf || cap == 0) return;
+        buf[0] = '\0';
+        if (!pAddr) return;
+        const auto* p = reinterpret_cast<const uint8_t*>(pAddr);
+        bool v4mapped = true;
+        for (int i = 0; i < 10; ++i) if (p[i] != 0) { v4mapped = false; break; }
+        if (v4mapped && (p[10] != 0xff || p[11] != 0xff)) v4mapped = false;
+        const uint16_t port_be = (uint16_t(p[16]) << 8) | uint16_t(p[17]);
+        if (v4mapped) {
+            if (with_port) {
+                std::snprintf(buf, cap, "%u.%u.%u.%u:%u",
+                              p[12], p[13], p[14], p[15], port_be);
+            } else {
+                std::snprintf(buf, cap, "%u.%u.%u.%u",
+                              p[12], p[13], p[14], p[15]);
+            }
+        } else {
+            if (with_port) {
+                std::snprintf(buf, cap,
+                    "[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%u",
+                    p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
+                    p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15],
+                    port_be);
+            } else {
+                std::snprintf(buf, cap,
+                    "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+                    p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
+                    p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]);
+            }
+        }
+    }
+    virtual bool     SteamNetworkingIPAddr_ParseString(void* pAddr, const char* s) {
+        if (!pAddr || !s || !*s) return false;
+        unsigned a=0,b=0,c=0,d=0,port=0;
+        int matched = std::sscanf(s, "%u.%u.%u.%u:%u", &a, &b, &c, &d, &port);
+        if (matched < 4 || a>255 || b>255 || c>255 || d>255 || port>65535) {
+            matched = std::sscanf(s, "%u.%u.%u.%u", &a, &b, &c, &d);
+            if (matched < 4 || a>255 || b>255 || c>255 || d>255) return false;
+            port = 0;
+        }
+        auto* out = reinterpret_cast<uint8_t*>(pAddr);
+        std::memset(out, 0, 18);
+        out[10] = 0xff;
+        out[11] = 0xff;
+        out[12] = static_cast<uint8_t>(a);
+        out[13] = static_cast<uint8_t>(b);
+        out[14] = static_cast<uint8_t>(c);
+        out[15] = static_cast<uint8_t>(d);
+        out[16] = static_cast<uint8_t>((port >> 8) & 0xff);
+        out[17] = static_cast<uint8_t>(port & 0xff);
+        return true;
+    }
+    virtual int      SteamNetworkingIPAddr_GetFakeIPType(const void*)                { return 0; }
+    virtual void     SteamNetworkingIdentity_ToString(const void* pId, char* buf, uint32_t cap) {
+        if (!buf || cap == 0) return;
+        buf[0] = '\0';
+        if (!pId) return;
+        struct NetIdentityHead {
+            int32_t  e_type;
+            int32_t  cb_size;
+            uint64_t steam_id64;  // SteamID variant
+        };
+        const auto* h = reinterpret_cast<const NetIdentityHead*>(pId);
+        if (h->e_type == 16 /*SteamID*/) {
+            std::snprintf(buf, cap, "steamid:%llu",
+                          static_cast<unsigned long long>(h->steam_id64));
+        } else if (h->e_type == 1 /*IPAddress*/) {
+            char tmp[64] = {};
+            SteamNetworkingIPAddr_ToString(
+                reinterpret_cast<const uint8_t*>(pId) + 8, tmp, sizeof(tmp), true);
+            std::snprintf(buf, cap, "ip:%s", tmp);
+        }
+    }
+    virtual bool     SteamNetworkingIdentity_ParseString(void*, const char*)         { return false; }
+};
+
+class ISteamNetworkingMessagesStub {
+public:
+    virtual int  SendMessageToUser(const void*, const void*, uint32_t, int, int) { return 3; }
+    virtual int  ReceiveMessagesOnChannel(int, void**, int)                      { return 0; }
+    virtual bool AcceptSessionWithUser(const void*)                              { return false; }
+    virtual bool CloseSessionWithUser(const void*)                               { return false; }
+    virtual bool CloseChannelWithUser(const void*, int)                          { return false; }
+    virtual int  GetSessionConnectionInfo(const void*, void*, void*)             { return 0; }
+};
+
+
+static ISteamUtilsStub        g_steam_utils;
+static ISteamUserStub         g_steam_user;
+static ISteamAppsStub         g_steam_apps;
+static ISteamFriendsStub      g_steam_friends;
+static ISteamRemoteStorageStub g_steam_remote_storage;
+static ISteamUserStatsStub    g_steam_user_stats;
+static ISteamInventoryStub    g_steam_inventory;
+static ISteamScreenshotsStub  g_steam_screenshots;
+static ISteamMusicStub        g_steam_music;
+static ISteamAppListStub      g_steam_app_list;
+static ISteamVideoStub        g_steam_video;
+static ISteamParentalSettingsStub g_steam_parental;
+static ISteamMatchmakingServersStub g_steam_matchmaking_servers;
+static ISteamMatchmakingStub  g_steam_matchmaking;
+static ISteamNetworkingStub   g_steam_networking;
+static ISteamUGCStub          g_steam_ugc;
+static ISteamGameServerStub   g_steam_game_server;
+static ISteamMusicRemoteStub  g_steam_music_remote;
+static ISteamHTMLSurfaceStub  g_steam_html_surface;
+static ISteamInputStub        g_steam_input;
+static ISteamPartiesStub      g_steam_parties;
+static ISteamRemotePlayStub   g_steam_remote_play;
+static ISteamNetworkingSocketsStub  g_steam_networking_sockets;
+static ISteamNetworkingUtilsStub    g_steam_networking_utils;
+static ISteamNetworkingMessagesStub g_steam_networking_messages;
+
+extern "C" void* wn_get_isteam_utils()         { return &g_steam_utils; }
+extern "C" void* wn_get_isteam_user()          { return &g_steam_user; }
+extern "C" void* wn_get_isteam_apps()          { return &g_steam_apps; }
+extern "C" void* wn_get_isteam_friends()       { return &g_steam_friends; }
+extern "C" void* wn_get_isteam_remote_storage(){ return &g_steam_remote_storage; }
+extern "C" void* wn_get_isteam_user_stats()    { return &g_steam_user_stats; }
+extern "C" void* wn_get_isteam_inventory()     { return &g_steam_inventory; }
+extern "C" void* wn_get_isteam_screenshots()   { return &g_steam_screenshots; }
+extern "C" void* wn_get_isteam_music()         { return &g_steam_music; }
+extern "C" void* wn_get_isteam_app_list()      { return &g_steam_app_list; }
+extern "C" void* wn_get_isteam_video()         { return &g_steam_video; }
+extern "C" void* wn_get_isteam_parental()      { return &g_steam_parental; }
+extern "C" void* wn_get_isteam_matchmaking_servers() { return &g_steam_matchmaking_servers; }
+extern "C" void* wn_get_isteam_matchmaking() { return &g_steam_matchmaking; }
+extern "C" void* wn_get_isteam_networking()  { return &g_steam_networking; }
+extern "C" void* wn_get_isteam_ugc()         { return &g_steam_ugc; }
+extern "C" void* wn_get_isteam_game_server() { return &g_steam_game_server; }
+extern "C" void* wn_get_isteam_music_remote() { return &g_steam_music_remote; }
+extern "C" void* wn_get_isteam_html_surface() { return &g_steam_html_surface; }
+extern "C" void* wn_get_isteam_input()        { return &g_steam_input; }
+extern "C" void* wn_get_isteam_parties()      { return &g_steam_parties; }
+extern "C" void* wn_get_isteam_remote_play()  { return &g_steam_remote_play; }
+extern "C" void* wn_get_isteam_networking_sockets()  { return &g_steam_networking_sockets; }
+extern "C" void* wn_get_isteam_networking_utils()    { return &g_steam_networking_utils; }
+extern "C" void* wn_get_isteam_networking_messages() { return &g_steam_networking_messages; }
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/src/jni_pushed_state.cpp b/app/src/main/cpp/wn-libsteamclient/src/jni_pushed_state.cpp
new file mode 100644
index 000000000..bf51eb3d4
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/jni_pushed_state.cpp
@@ -0,0 +1,2739 @@
+
+#include "wn_libsteamclient/runtime_state.h"
+#include "wn_libsteamclient/callbacks.h"
+#include "wn_libsteamclient/callback_registry.h"
+#include "wn_libsteamclient/tcp_services.h"
+#include "wn_steam/cm_bridge.h"
+
+#include <jni.h>
+#include <android/log.h>
+#include <chrono>
+#include <cstdint>
+#include <cstring>
+#include <mutex>
+#include <string>
+#include <vector>
+
+namespace cb = wn_libsteamclient::callbacks;
+namespace lsc = wn_libsteamclient;
+
+namespace {
+void emit_persona_state_change(uint64_t steam_id, int32_t flags) {
+    if (steam_id == 0) return;
+    cb::PersonaStateChange payload{};
+    payload.m_ulSteamID    = steam_id;
+    payload.m_nChangeFlags = flags;
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kPersonaStateChange,
+                       &payload, sizeof(payload));
+}
+
+void on_persona_event(const WnCmPersonaEvent* ev) {
+    if (!ev || ev->sid == 0) return;
+    int32_t flags = 0;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        const bool is_self = (ev->sid == p.steam_id.load());
+        if (ev->name && ev->name[0]) {
+            if (is_self) {
+                if (p.persona_name != ev->name) {
+                    p.persona_name = ev->name;
+                    flags |= cb::kPersonaChangeName;
+                }
+            } else {
+                std::string& slot = p.friend_persona_names[ev->sid];
+                if (slot != ev->name) {
+                    slot = ev->name;
+                    flags |= cb::kPersonaChangeName;
+                }
+            }
+        }
+        if (ev->persona_state != UINT32_MAX) {
+            uint32_t prev;
+            if (is_self) {
+                prev = static_cast<uint32_t>(p.persona_state.load());
+            } else {
+                auto it = p.friend_persona_states.find(ev->sid);
+                prev = (it == p.friend_persona_states.end()) ? 0 : it->second;
+            }
+            if (prev != ev->persona_state) {
+                if (is_self) {
+                    p.persona_state.store(static_cast<int>(ev->persona_state));
+                } else {
+                    p.friend_persona_states[ev->sid] = ev->persona_state;
+                }
+                flags |= cb::kPersonaChangeStatus;
+                if (prev == 0 && ev->persona_state != 0) {
+                    flags |= cb::kPersonaChangeComeOnline;
+                }
+                if (prev != 0 && ev->persona_state == 0) {
+                    flags |= cb::kPersonaChangeGoneOffline;
+                }
+            }
+        }
+        {
+            uint32_t& slot = p.friend_game_played_app[ev->sid];
+            if (slot != ev->game_played_app) {
+                slot = ev->game_played_app;
+                flags |= cb::kPersonaChangeGamePlayed;
+            }
+        }
+        if (ev->avatar_hash && ev->avatar_hash_len > 0) {
+            std::vector<uint8_t> hash(
+                ev->avatar_hash, ev->avatar_hash + ev->avatar_hash_len);
+            auto& slot = p.friend_avatar_hashes[ev->sid];
+            if (slot != hash) {
+                slot = std::move(hash);
+                flags |= cb::kPersonaChangeAvatar;
+            }
+        }
+        if (ev->rp_pairs && ev->rp_count > 0) {
+            std::vector<std::pair<std::string, std::string>> fresh;
+            fresh.reserve(ev->rp_count);
+            for (size_t i = 0; i < ev->rp_count; ++i) {
+                const auto& kv = ev->rp_pairs[i];
+                fresh.emplace_back(
+                    kv.key   ? kv.key   : "",
+                    kv.value ? kv.value : "");
+            }
+            auto& slot = p.rich_presence[ev->sid];
+            if (slot != fresh) {
+                slot = std::move(fresh);
+            }
+        }
+    }
+    if (flags != 0) emit_persona_state_change(ev->sid, flags);
+    if (ev->rp_pairs && ev->rp_count > 0) {
+        cb::FriendRichPresenceUpdate rp{};
+        rp.m_steamIDFriend = ev->sid;
+        rp.m_nAppID        = lsc::pushed().app_id.load();
+        lsc::push_callback(lsc::state().user.load(),
+                           cb::kFriendRichPresenceUpdate,
+                           &rp, sizeof(rp));
+    }
+}
+
+__attribute__((constructor))
+void register_persona_observer() {
+    wn_cm_bridge_register_persona_observer(&on_persona_event);
+}
+
+void on_logon_state_event(bool logged_on) {
+    lsc::set_logged_on(logged_on);
+}
+
+__attribute__((constructor))
+void register_logon_state_observer() {
+    wn_cm_bridge_register_logon_state_observer(&on_logon_state_event);
+}
+
+void on_friends_list_event(const uint64_t* sids, size_t count) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.friends.clear();
+    if (sids && count > 0) {
+        p.friends.reserve(count);
+        for (size_t i = 0; i < count; ++i) {
+            if (sids[i] != 0) p.friends.push_back(sids[i]);
+        }
+    }
+    __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+        "friends-list observer: %zu mutual friend(s) mirrored", p.friends.size());
+}
+
+__attribute__((constructor))
+void register_friends_list_observer() {
+    wn_cm_bridge_register_friends_list_observer(&on_friends_list_event);
+}
+
+void on_license_list_event(const WnCmLicenseEntry* licenses, size_t count) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.licenses.clear();
+    if (licenses && count > 0) {
+        p.licenses.reserve(count);
+        for (size_t i = 0; i < count; ++i) {
+            const auto& src = licenses[i];
+            if (src.package_id == 0) continue;
+            p.licenses[src.package_id] = lsc::PushedState::LicenseEntry{
+                src.package_id,
+                src.owner_id,
+                src.time_created,
+                src.license_type,
+                src.flags,
+                src.change_number,
+                src.minute_limit,
+                src.minutes_used,
+            };
+        }
+    }
+    __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+        "license-list observer: %zu license(s) mirrored", p.licenses.size());
+}
+
+__attribute__((constructor))
+void register_license_list_observer() {
+    wn_cm_bridge_register_license_list_observer(&on_license_list_event);
+}
+
+void on_account_info_event(const WnCmAccountInfo* info) {
+    if (!info) return;
+    auto& p = lsc::pushed();
+    p.account_two_factor_enabled.store(info->two_factor_enabled);
+    p.account_phone_verified.store(info->phone_verified);
+    p.account_phone_identifying.store(info->phone_identifying);
+    p.account_phone_requires_verification.store(info->phone_requires_verification);
+
+    if (info->persona_name && info->persona_name_len > 0) {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        p.persona_name.assign(info->persona_name, info->persona_name_len);
+    }
+    if (info->ip_country && info->ip_country_len > 0) {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        p.ip_country.assign(info->ip_country, info->ip_country_len);
+        p.ip_country_set.store(1);
+    }
+
+    __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+        "account-info observer: persona='%.*s' ip='%.*s' 2FA=%d phone_v=%d phone_id=%d phone_nv=%d",
+        static_cast<int>(info->persona_name_len), info->persona_name ? info->persona_name : "",
+        static_cast<int>(info->ip_country_len),   info->ip_country   ? info->ip_country   : "",
+        info->two_factor_enabled, info->phone_verified,
+        info->phone_identifying, info->phone_requires_verification);
+}
+
+__attribute__((constructor))
+void register_account_info_observer() {
+    wn_cm_bridge_register_account_info_observer(&on_account_info_event);
+}
+
+void on_lobby_data_event(const WnCmLobbyData* data) {
+    if (!data) return;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto& L = p.active_lobbies[data->steam_id_lobby];
+        L.app_id      = data->app_id;
+        L.owner_sid   = data->steam_id_owner;
+        L.max_members = data->max_members;
+        L.lobby_type  = data->lobby_type;
+        L.lobby_flags = data->lobby_flags;
+        L.members.clear();
+        for (size_t i = 0; i < data->member_count; ++i) {
+            const auto& m = data->members[i];
+            auto& mb = L.members[m.steam_id];
+            if (m.persona_name) mb.persona_name = m.persona_name;
+            if (m.metadata_bytes && m.metadata_len > 0) {
+                mb.data["__raw_metadata"] = std::string(
+                    reinterpret_cast<const char*>(m.metadata_bytes),
+                    m.metadata_len);
+            }
+        }
+    }
+    struct LobbyDataUpdate { uint64_t lobby; uint64_t member; uint8_t success; uint8_t _pad[7]; };
+    LobbyDataUpdate cb{};
+    cb.lobby   = data->steam_id_lobby;
+    cb.member  = 0;
+    cb.success = 1;
+    lsc::push_callback(lsc::state().user.load(), /*kLobbyDataUpdate*/ 505,
+                       &cb, sizeof(cb));
+}
+
+__attribute__((constructor))
+void register_lobby_data_observer() {
+    wn_cm_bridge_register_lobby_data_observer(&on_lobby_data_event);
+}
+
+void on_lobby_chat_msg_event(uint64_t lobby_sid, uint64_t sender_sid,
+                              const uint8_t* data, size_t n) {
+    if (lobby_sid == 0) return;
+    uint32_t chat_id = 0;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto& ring = p.lobby_chat_buffer[lobby_sid];
+        if (ring.size() >= 1024) ring.erase(ring.begin());
+        lsc::PushedState::LobbyChatEntry e;
+        e.sender_sid = sender_sid;
+        e.chat_type  = 1; // EChatEntryType::ChatMsg
+        if (data && n > 0) e.body.assign(data, data + n);
+        ring.push_back(std::move(e));
+        chat_id = static_cast<uint32_t>(ring.size() - 1);
+    }
+    struct LobbyChatMsg {
+        uint64_t lobby;
+        uint64_t user;
+        uint8_t  chat_type;
+        uint8_t  _pad[3];
+        uint32_t chat_id;
+    };
+    LobbyChatMsg cb{};
+    cb.lobby     = lobby_sid;
+    cb.user      = sender_sid;
+    cb.chat_type = 1;
+    cb.chat_id   = chat_id;
+    lsc::push_callback(lsc::state().user.load(), /*kLobbyChatMsg*/ 507,
+                       &cb, sizeof(cb));
+}
+
+__attribute__((constructor))
+void register_lobby_chat_msg_observer() {
+    wn_cm_bridge_register_lobby_chat_msg_observer(&on_lobby_chat_msg_event);
+}
+
+void on_lobby_membership_event(int32_t joined,
+                                uint64_t lobby_sid,
+                                uint64_t user_sid,
+                                const char* persona_name) {
+    if (lobby_sid == 0 || user_sid == 0) return;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto& L = p.active_lobbies[lobby_sid];
+        if (joined) {
+            auto& mb = L.members[user_sid];
+            if (persona_name) mb.persona_name = persona_name;
+        } else {
+            L.members.erase(user_sid);
+        }
+    }
+    struct LobbyChatUpdate {
+        uint64_t lobby;
+        uint64_t user_changed;
+        uint64_t making_change;
+        uint32_t state_change;
+        uint32_t _pad;
+    };
+    LobbyChatUpdate cb{};
+    cb.lobby         = lobby_sid;
+    cb.user_changed  = user_sid;
+    cb.making_change = user_sid;  // best effort — we don't know admin
+    cb.state_change  = joined ? 0x1u : 0x2u;
+    lsc::push_callback(lsc::state().user.load(), /*kLobbyChatUpdate*/ 506,
+                       &cb, sizeof(cb));
+}
+
+__attribute__((constructor))
+void register_lobby_membership_observer() {
+    wn_cm_bridge_register_lobby_membership_observer(&on_lobby_membership_event);
+}
+
+void on_server_realtime_event(uint32_t server_realtime) {
+    if (server_realtime == 0) return;
+    auto& p = lsc::pushed();
+    const auto now = std::chrono::steady_clock::now();
+    const auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+        now.time_since_epoch()).count();
+    p.server_realtime.store(server_realtime);
+    p.server_realtime_anchor_local_ms.store(static_cast<int64_t>(now_ms));
+    __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+        "server-realtime observer: %u (anchored at local %lld ms)",
+        server_realtime, static_cast<long long>(now_ms));
+}
+
+__attribute__((constructor))
+void register_server_realtime_observer() {
+    wn_cm_bridge_register_server_realtime_observer(&on_server_realtime_event);
+}
+}  // namespace
+
+#define WN_TAG "WnLibSteamClient"
+#define WN_LOGI(...) __android_log_print(ANDROID_LOG_INFO, WN_TAG, __VA_ARGS__)
+
+namespace {
+std::string jstr(JNIEnv* env, jstring s) {
+    if (!s) return {};
+    const char* c = env->GetStringUTFChars(s, nullptr);
+    if (!c) return {};
+    std::string out(c);
+    env->ReleaseStringUTFChars(s, c);
+    return out;
+}
+}  // namespace
+
+extern "C" {
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetSteamId(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong steamId64) {
+    auto& p = lsc::pushed();
+    p.steam_id.store(static_cast<uint64_t>(steamId64));
+    p.account_id.store(static_cast<uint32_t>(static_cast<uint64_t>(steamId64) & 0xFFFFFFFFu));
+    WN_LOGI("set_steam_id(%llu)",
+            static_cast<unsigned long long>(steamId64));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetLoggedOn(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean loggedOn) {
+    bool now = (loggedOn == JNI_TRUE);
+    bool prev = lsc::state().logged_on.load();
+    lsc::set_logged_on(now);
+    WN_LOGI("set_logged_on(%d) prev=%d emitted_cb=%d",
+            now ? 1 : 0, prev ? 1 : 0, (now != prev) ? 1 : 0);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetPersonaName(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    auto& p = lsc::pushed();
+    std::string name = jstr(env, jname);
+    uint64_t self;
+    bool changed;
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        changed = (p.persona_name != name);
+        p.persona_name = std::move(name);
+        self = p.steam_id.load();
+    }
+    if (changed) {
+        emit_persona_state_change(self, cb::kPersonaChangeName);
+    }
+    WN_LOGI("set_persona_name(\"%s\") changed=%d", p.persona_name.c_str(),
+            changed ? 1 : 0);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetPersonaState(
+        JNIEnv* /*env*/, jclass /*cls*/, jint state) {
+    auto& p = lsc::pushed();
+    int prev = p.persona_state.exchange(static_cast<int>(state));
+    if (prev == state) return;
+    int32_t flags = cb::kPersonaChangeStatus;
+    if (prev == 0 && state != 0) flags |= cb::kPersonaChangeComeOnline;
+    if (prev != 0 && state == 0) flags |= cb::kPersonaChangeGoneOffline;
+    emit_persona_state_change(p.steam_id.load(), flags);
+    wn_cm_set_persona_state(state);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppId(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    uint32_t app = static_cast<uint32_t>(appId);
+    uint32_t prev = lsc::pushed().app_id.exchange(app);
+    if (prev == app) return;
+    wn_cm_notify_games_played(app);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetIPCountry(
+        JNIEnv* env, jclass /*cls*/, jstring jcc) {
+    auto& p = lsc::pushed();
+    std::string cc = jstr(env, jcc);
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.ip_country = std::move(cc);
+    p.ip_country_set.store(1);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetUiLanguage(
+        JNIEnv* env, jclass /*cls*/, jstring jlang) {
+    auto& p = lsc::pushed();
+    std::string lang = jstr(env, jlang);
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.ui_language = std::move(lang);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetOwnedApps(
+        JNIEnv* env, jclass /*cls*/, jintArray appIds) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.owned_apps.clear();
+    if (!appIds) return;
+    jsize n = env->GetArrayLength(appIds);
+    if (n <= 0) return;
+    jint* arr = env->GetIntArrayElements(appIds, nullptr);
+    if (!arr) return;
+    p.owned_apps.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        if (arr[i] > 0) p.owned_apps.insert(static_cast<uint32_t>(arr[i]));
+    }
+    env->ReleaseIntArrayElements(appIds, arr, JNI_ABORT);
+    WN_LOGI("set_owned_apps: %zu entries", p.owned_apps.size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetInstalledApps(
+        JNIEnv* env, jclass /*cls*/, jintArray appIds) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.installed_apps.clear();
+    if (!appIds) return;
+    jsize n = env->GetArrayLength(appIds);
+    if (n <= 0) return;
+    jint* arr = env->GetIntArrayElements(appIds, nullptr);
+    if (!arr) return;
+    p.installed_apps.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        if (arr[i] > 0) p.installed_apps.insert(static_cast<uint32_t>(arr[i]));
+    }
+    env->ReleaseIntArrayElements(appIds, arr, JNI_ABORT);
+    WN_LOGI("set_installed_apps: %zu entries", p.installed_apps.size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppInstallDir(
+        JNIEnv* env, jclass /*cls*/, jint appId, jstring jdir) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::string dir = jstr(env, jdir);
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (dir.empty()) {
+        p.app_install_dirs.erase(static_cast<uint32_t>(appId));
+    } else {
+        p.app_install_dirs[static_cast<uint32_t>(appId)] = std::move(dir);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendsList(
+        JNIEnv* env, jclass /*cls*/, jlongArray steamIds) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.friends.clear();
+    if (!steamIds) return;
+    jsize n = env->GetArrayLength(steamIds);
+    if (n <= 0) return;
+    jlong* arr = env->GetLongArrayElements(steamIds, nullptr);
+    if (!arr) return;
+    p.friends.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        if (arr[i] != 0) p.friends.push_back(static_cast<uint64_t>(arr[i]));
+    }
+    env->ReleaseLongArrayElements(steamIds, arr, JNI_ABORT);
+    WN_LOGI("set_friends_list: %zu entries", p.friends.size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppBuildId(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId, jint buildId) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (buildId <= 0) {
+        p.app_build_ids.erase(static_cast<uint32_t>(appId));
+    } else {
+        p.app_build_ids[static_cast<uint32_t>(appId)] =
+            static_cast<uint32_t>(buildId);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppNames(
+        JNIEnv* env, jclass /*cls*/, jintArray appIds, jobjectArray names) {
+    if (!appIds || !names) return;
+    jsize n = env->GetArrayLength(appIds);
+    if (n <= 0 || env->GetArrayLength(names) != n) return;
+    jint* ids = env->GetIntArrayElements(appIds, nullptr);
+    if (!ids) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    size_t set_count = 0, clear_count = 0;
+    for (jsize i = 0; i < n; ++i) {
+        if (ids[i] <= 0) continue;
+        auto js = reinterpret_cast<jstring>(env->GetObjectArrayElement(names, i));
+        if (!js) {
+            p.app_names.erase(static_cast<uint32_t>(ids[i]));
+            ++clear_count;
+            continue;
+        }
+        const char* c = env->GetStringUTFChars(js, nullptr);
+        if (c && *c) {
+            p.app_names[static_cast<uint32_t>(ids[i])] = c;
+            ++set_count;
+        } else {
+            p.app_names.erase(static_cast<uint32_t>(ids[i]));
+            ++clear_count;
+        }
+        if (c) env->ReleaseStringUTFChars(js, c);
+        env->DeleteLocalRef(js);
+    }
+    env->ReleaseIntArrayElements(appIds, ids, JNI_ABORT);
+    WN_LOGI("set_app_names: set=%zu clear=%zu total=%zu",
+            set_count, clear_count, p.app_names.size());
+}
+
+extern "C" void* wn_get_isteam_apps();
+extern "C" void* wn_get_isteam_remote_storage();
+extern "C" void* wn_get_isteam_user();
+extern "C" void* wn_get_isteam_friends();
+extern "C" void* wn_get_isteam_utils();
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectAccountInfo(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean twoFA, jboolean phoneV,
+        jboolean phoneId, jboolean phoneNV) {
+    WnCmAccountInfo info{};
+    info.two_factor_enabled = twoFA == JNI_TRUE;
+    info.phone_verified     = phoneV == JNI_TRUE;
+    info.phone_identifying  = phoneId == JNI_TRUE;
+    info.phone_requires_verification = phoneNV == JNI_TRUE;
+    wn_cm_bridge_inject_test_account_info(&info);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAccountFlag(
+        JNIEnv* /*env*/, jclass /*cls*/, jint flagKind, jboolean on) {
+    auto& p = lsc::pushed();
+    switch (flagKind) {
+        case 0: p.account_phone_verified.store(on); break;
+        case 1: p.account_two_factor_enabled.store(on); break;
+        case 2: p.account_phone_identifying.store(on); break;
+        case 3: p.account_phone_requires_verification.store(on); break;
+        default: break;
+    }
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticUserBool(
+        JNIEnv* /*env*/, jclass /*cls*/, jint slot) {
+    if (slot < 26 || slot > 29) return JNI_FALSE;
+    void* obj = wn_get_isteam_user();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[slot]);
+    return fn(obj) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetPlayerNickname(
+        JNIEnv* env, jclass /*cls*/, jlong sid, jstring jNickname) {
+    if (sid == 0) return;
+    auto& p = lsc::pushed();
+    bool changed = false;
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        const uint64_t key = static_cast<uint64_t>(sid);
+        if (!jNickname) {
+            changed = (p.player_nicknames.erase(key) > 0);
+        } else {
+            const char* c = env->GetStringUTFChars(jNickname, nullptr);
+            if (!c || *c == '\0') {
+                if (c) env->ReleaseStringUTFChars(jNickname, c);
+                changed = (p.player_nicknames.erase(key) > 0);
+            } else {
+                std::string newName(c);
+                env->ReleaseStringUTFChars(jNickname, c);
+                auto it = p.player_nicknames.find(key);
+                if (it == p.player_nicknames.end()) {
+                    p.player_nicknames[key] = std::move(newName);
+                    changed = true;
+                } else if (it->second != newName) {
+                    it->second = std::move(newName);
+                    changed = true;
+                }
+            }
+        }
+    }
+    if (changed) {
+        emit_persona_state_change(static_cast<uint64_t>(sid),
+                                  cb::kPersonaChangeNickname);
+    }
+}
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetPlayerNickname(
+        JNIEnv* env, jclass /*cls*/, jlong sid) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return nullptr;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = const char* (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<Fn>(vt[11]);
+    const char* nick = fn(obj, static_cast<uint64_t>(sid));
+    return nick ? env->NewStringUTF(nick) : nullptr;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCheckFileSignature(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_utils();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[19]);
+    const char* c = jName ? env->GetStringUTFChars(jName, nullptr) : nullptr;
+    uint64_t h = fn(obj, c);
+    if (c) env->ReleaseStringUTFChars(jName, c);
+    return static_cast<jlong>(h);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedSteamId(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return static_cast<jlong>(lsc::pushed().steam_id.load());
+}
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedPersonaName(
+        JNIEnv* env, jclass /*cls*/) {
+    std::string name;
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        name = lsc::pushed().persona_name;
+    }
+    return env->NewStringUTF(name.c_str());
+}
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedIpCountry(
+        JNIEnv* env, jclass /*cls*/) {
+    std::string c;
+    if (lsc::pushed().ip_country_set.load() != 0) {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        c = lsc::pushed().ip_country;
+    }
+    return env->NewStringUTF(c.c_str());
+}
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedUiLanguage(
+        JNIEnv* env, jclass /*cls*/) {
+    std::string s;
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        s = lsc::pushed().ui_language;
+    }
+    return env->NewStringUTF(s.c_str());
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedServerRealTime(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    auto anchor   = lsc::pushed().server_realtime.load();
+    auto anchor_local_ms = lsc::pushed().server_realtime_anchor_local_ms.load();
+    if (anchor == 0 || anchor_local_ms == 0) return 0;
+    const auto now = std::chrono::steady_clock::now();
+    const auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+        now.time_since_epoch()).count();
+    auto elapsed_s = (now_ms - anchor_local_ms) / 1000;
+    if (elapsed_s < 0) elapsed_s = 0;
+    return static_cast<jint>(anchor + static_cast<uint32_t>(elapsed_s));
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedPersonaState(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return static_cast<jint>(lsc::pushed().persona_state.load());
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedLoggedOn(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return lsc::state().logged_on.load() ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedAppId(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return static_cast<jint>(lsc::pushed().app_id.load());
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedOwnedAppCount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    return static_cast<jint>(lsc::pushed().owned_apps.size());
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedInstalledAppCount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    return static_cast<jint>(lsc::pushed().installed_apps.size());
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedFriendCount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    return static_cast<jint>(lsc::pushed().friends.size());
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedFirstFriend(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto& fs = lsc::pushed().friends;
+    return fs.empty() ? 0L : static_cast<jlong>(fs.front());
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedCloudFileCount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    return static_cast<jint>(lsc::pushed().cloud_files.size());
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedCloudEnabledAccount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return lsc::pushed().cloud_enabled_account.load() ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedCloudEnabledApp(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return lsc::pushed().cloud_enabled_app.load() ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeGetPushedEncryptedAppTicketSize(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    if (appId <= 0) return 0;
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto it = lsc::pushed().encrypted_app_tickets.find(
+        static_cast<uint32_t>(appId));
+    if (it == lsc::pushed().encrypted_app_tickets.end()) return 0;
+    return static_cast<jint>(it->second.size());
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileShare(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[7]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    uint64_t h = fn(obj, name);
+    env->ReleaseStringUTFChars(jName, name);
+    return static_cast<jlong>(h);
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticAppsGetFileDetails(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj || !jName) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[25]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    uint64_t h = fn(obj, name);
+    env->ReleaseStringUTFChars(jName, name);
+    return static_cast<jlong>(h);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetSelfPlayerLevel(
+        JNIEnv* /*env*/, jclass /*cls*/, jint level) {
+    lsc::pushed().self_player_level.store(level < 0 ? 0 : level);
+}
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetSelfGameBadge(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId, jint nSeries,
+        jboolean bFoil, jint tier) {
+    if (appId <= 0) return;
+    int32_t key = (static_cast<int32_t>(appId) & 0x0FFFFFFF)
+                | ((nSeries & 0x07) << 28)
+                | (bFoil ? (1 << 31) : 0);
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (tier < 0) p.self_game_badges.erase(key);
+    else          p.self_game_badges[key] = tier;
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetPlayerSteamLevel(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = int (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[24]);
+    return fn(obj);
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetGameBadgeLevel(
+        JNIEnv* /*env*/, jclass /*cls*/, jint nSeries, jboolean bFoil) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = int (*)(void*, int, bool);
+    auto fn = reinterpret_cast<Fn>(vt[23]);
+    return fn(obj, nSeries, bFoil ? true : false);
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRequestStoreAuthURL(
+        JNIEnv* env, jclass /*cls*/, jstring jRedirect) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[25]);
+    const char* c = jRedirect ? env->GetStringUTFChars(jRedirect, nullptr) : nullptr;
+    uint64_t h = fn(obj, c);
+    if (c) env->ReleaseStringUTFChars(jRedirect, c);
+    return static_cast<jlong>(h);
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetMarketEligibility(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[30]);
+    return static_cast<jlong>(fn(obj));
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetDurationControl(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[31]);
+    return static_cast<jlong>(fn(obj));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendSteamLevel(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong sid, jint level) {
+    if (sid == 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (level < 0) p.friend_steam_levels.erase(static_cast<uint64_t>(sid));
+    else           p.friend_steam_levels[static_cast<uint64_t>(sid)] = level;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeIsAppMarkedCorrupt(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    if (appId <= 0) return JNI_FALSE;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    return p.apps_marked_corrupt.count(static_cast<uint32_t>(appId)) > 0
+           ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeClearAppCorruptFlag(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.apps_marked_corrupt.erase(static_cast<uint32_t>(appId));
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticUserHasLicense(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong sid, jint appId) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 2;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = int (*)(void*, uint64_t, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[18]);
+    return fn(obj, static_cast<uint64_t>(sid), static_cast<uint32_t>(appId));
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticMarkContentCorrupt(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean missingOnly) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, bool);
+    auto fn = reinterpret_cast<Fn>(vt[16]);
+    return fn(obj, missingOnly ? true : false) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetFriendSteamLevel(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong sid) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = int (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<Fn>(vt[10]);
+    return fn(obj, static_cast<uint64_t>(sid));
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetAuthTicketForWebApi(
+        JNIEnv* env, jclass /*cls*/, jstring jIdentity) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[14]);
+    const char* c = jIdentity ? env->GetStringUTFChars(jIdentity, nullptr) : nullptr;
+    uint64_t h = fn(obj, c);
+    if (c) env->ReleaseStringUTFChars(jIdentity, c);
+    return static_cast<jlong>(h);
+}
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetFriendRelationship(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong sid) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = int (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<Fn>(vt[5]);
+    return fn(obj, static_cast<uint64_t>(sid));
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticHasFriend(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong sid, jint flags) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint64_t, int);
+    auto fn = reinterpret_cast<Fn>(vt[17]);
+    return fn(obj, static_cast<uint64_t>(sid), flags) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetUserDataFolder(
+        JNIEnv* env, jclass /*cls*/) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return nullptr;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, char*, int);
+    auto fn = reinterpret_cast<Fn>(vt[6]);
+    char buf[512];
+    buf[0] = '\0';
+    if (!fn(obj, buf, sizeof(buf))) return nullptr;
+    return env->NewStringUTF(buf);
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticSetDurationControl(
+        JNIEnv* /*env*/, jclass /*cls*/, jint state) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, int);
+    auto fn = reinterpret_cast<Fn>(vt[32]);
+    return fn(obj, state) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppFlag(
+        JNIEnv* /*env*/, jclass /*cls*/, jint flagKind, jint appId, jboolean on) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto& set = (flagKind == 0) ? p.app_low_violence
+                                 : p.app_vac_banned;
+    if (on) set.insert(static_cast<uint32_t>(appId));
+    else    set.erase(static_cast<uint32_t>(appId));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticAppsBool(
+        JNIEnv* /*env*/, jclass /*cls*/, jint slot) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj || slot < 0 || slot > 3) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[slot]);
+    return fn(obj) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticSetDlcContext(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[29]);
+    return fn(obj, static_cast<uint32_t>(appId)) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileForget(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[5]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    bool ok = fn(obj, name);
+    env->ReleaseStringUTFChars(jName, name);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFilePersisted(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[14]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    bool ok = fn(obj, name);
+    env->ReleaseStringUTFChars(jName, name);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppCloudRemoteDir(
+        JNIEnv* env, jclass /*cls*/, jint appId, jstring jPath) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!jPath) {
+        p.app_cloud_remote_dirs.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    const char* c = env->GetStringUTFChars(jPath, nullptr);
+    if (!c || *c == '\0') {
+        if (c) env->ReleaseStringUTFChars(jPath, c);
+        p.app_cloud_remote_dirs.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    p.app_cloud_remote_dirs[static_cast<uint32_t>(appId)] = std::string(c);
+    env->ReleaseStringUTFChars(jPath, c);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppCurrentBeta(
+        JNIEnv* env, jclass /*cls*/, jint appId, jstring jBranch) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!jBranch) {
+        p.app_current_beta.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    const char* c = env->GetStringUTFChars(jBranch, nullptr);
+    if (!c || *c == '\0') {
+        if (c) env->ReleaseStringUTFChars(jBranch, c);
+        p.app_current_beta.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    p.app_current_beta[static_cast<uint32_t>(appId)] = std::string(c);
+    env->ReleaseStringUTFChars(jBranch, c);
+}
+
+extern "C" void* wn_get_isteam_apps();
+
+extern "C" void* wn_get_isteam_remote_storage();
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileWrite(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jbyteArray jData) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName || !jData) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, const char*, const void*, int);
+    auto fn = reinterpret_cast<Fn>(vt[0]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    jsize len = env->GetArrayLength(jData);
+    jbyte* buf = env->GetByteArrayElements(jData, nullptr);
+    bool ok = fn(obj, name, buf, static_cast<int>(len));
+    env->ReleaseByteArrayElements(jData, buf, JNI_ABORT);
+    env->ReleaseStringUTFChars(jName, name);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jbyteArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileRead(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jint maxBytes) {
+    if (!jName || maxBytes <= 0) return nullptr;
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj) return nullptr;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = int (*)(void*, const char*, void*, int);
+    auto fn = reinterpret_cast<Fn>(vt[1]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    std::vector<char> buf(static_cast<size_t>(maxBytes));
+    int n = fn(obj, name, buf.data(), maxBytes);
+    env->ReleaseStringUTFChars(jName, name);
+    if (n <= 0) return nullptr;
+    jbyteArray out = env->NewByteArray(n);
+    env->SetByteArrayRegion(out, 0, n, reinterpret_cast<jbyte*>(buf.data()));
+    return out;
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudStreamOpen(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[9]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    uint64_t h = fn(obj, name);
+    env->ReleaseStringUTFChars(jName, name);
+    return static_cast<jlong>(h);
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudStreamWriteChunk(
+        JNIEnv* env, jclass /*cls*/, jlong hStream, jbyteArray jData) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jData) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint64_t, const void*, int);
+    auto fn = reinterpret_cast<Fn>(vt[10]);
+    jsize len = env->GetArrayLength(jData);
+    jbyte* buf = env->GetByteArrayElements(jData, nullptr);
+    bool ok = fn(obj, static_cast<uint64_t>(hStream), buf, static_cast<int>(len));
+    env->ReleaseByteArrayElements(jData, buf, JNI_ABORT);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudStreamClose(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong hStream) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<Fn>(vt[11]);
+    return fn(obj, static_cast<uint64_t>(hStream)) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudStreamCancel(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong hStream) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<Fn>(vt[12]);
+    return fn(obj, static_cast<uint64_t>(hStream)) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileWriteAsync(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jbyteArray jData) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName || !jData) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*, const void*, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[2]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    jsize len = env->GetArrayLength(jData);
+    jbyte* buf = env->GetByteArrayElements(jData, nullptr);
+    uint64_t h = fn(obj, name, buf, static_cast<uint32_t>(len));
+    env->ReleaseByteArrayElements(jData, buf, JNI_ABORT);
+    env->ReleaseStringUTFChars(jName, name);
+    return static_cast<jlong>(h);
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileReadAsync(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jint nOffset, jint cubToRead) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName || cubToRead <= 0) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*, const char*, uint32_t, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[3]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    uint64_t h = fn(obj, name, static_cast<uint32_t>(nOffset),
+                   static_cast<uint32_t>(cubToRead));
+    env->ReleaseStringUTFChars(jName, name);
+    return static_cast<jlong>(h);
+}
+JNIEXPORT jbyteArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileReadAsyncComplete(
+        JNIEnv* env, jclass /*cls*/, jlong hCall, jint cubToRead) {
+    if (hCall == 0 || cubToRead <= 0) return nullptr;
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj) return nullptr;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint64_t, void*, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[4]);
+    std::vector<char> buf(static_cast<size_t>(cubToRead));
+    bool ok = fn(obj, static_cast<uint64_t>(hCall), buf.data(),
+                 static_cast<uint32_t>(cubToRead));
+    if (!ok) return nullptr;
+    jbyteArray out = env->NewByteArray(cubToRead);
+    env->SetByteArrayRegion(out, 0, cubToRead, reinterpret_cast<jbyte*>(buf.data()));
+    return out;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCloudFileDelete(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    void* obj = wn_get_isteam_remote_storage();
+    if (!obj || !jName) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, const char*);
+    auto fn = reinterpret_cast<Fn>(vt[6]);
+    const char* name = env->GetStringUTFChars(jName, nullptr);
+    bool ok = fn(obj, name);
+    env->ReleaseStringUTFChars(jName, name);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetCurrentBetaName(
+        JNIEnv* env, jclass /*cls*/) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return nullptr;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, char*, int);
+    auto fn = reinterpret_cast<Fn>(vt[15]);
+    char buf[128];
+    buf[0] = '\0';
+    if (!fn(obj, buf, sizeof(buf))) return nullptr;
+    return env->NewStringUTF(buf);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppDownloadProgress(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId,
+        jlong bytesDownloaded, jlong bytesTotal) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (bytesTotal <= 0) {
+        p.app_dl_progress.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    auto& e = p.app_dl_progress[static_cast<uint32_t>(appId)];
+    e.bytes_downloaded = static_cast<uint64_t>(std::max<jlong>(0, bytesDownloaded));
+    e.bytes_total      = static_cast<uint64_t>(bytesTotal);
+}
+
+static uint64_t s_diag_dl_downloaded = 0;
+static uint64_t s_diag_dl_total      = 0;
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetDlcDownloadProgress(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint32_t, uint64_t*, uint64_t*);
+    auto fn = reinterpret_cast<Fn>(vt[22]);
+    s_diag_dl_downloaded = 0;
+    s_diag_dl_total      = 0;
+    return fn(obj, static_cast<uint32_t>(appId),
+              &s_diag_dl_downloaded, &s_diag_dl_total) ? JNI_TRUE : JNI_FALSE;
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetDlcDownloadProgressBytes(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return static_cast<jlong>(s_diag_dl_downloaded);
+}
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetDlcDownloadProgressTotal(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return static_cast<jlong>(s_diag_dl_total);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppInstalledDepots(
+        JNIEnv* env, jclass /*cls*/, jint appId, jintArray depotIds) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!depotIds) {
+        p.app_installed_depots.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    jsize n = env->GetArrayLength(depotIds);
+    if (n <= 0) {
+        p.app_installed_depots.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    jint* arr = env->GetIntArrayElements(depotIds, nullptr);
+    std::vector<uint32_t> depots;
+    depots.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        if (arr[i] > 0) depots.push_back(static_cast<uint32_t>(arr[i]));
+    }
+    env->ReleaseIntArrayElements(depotIds, arr, JNI_ABORT);
+    p.app_installed_depots[static_cast<uint32_t>(appId)] = std::move(depots);
+    WN_LOGI("set_app_installed_depots: app=%d count=%zu",
+            appId, p.app_installed_depots[static_cast<uint32_t>(appId)].size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppDlcs(
+        JNIEnv* env, jclass /*cls*/, jint parentAppId,
+        jintArray dlcAppIds, jobjectArray dlcNames, jbooleanArray available) {
+    if (parentAppId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!dlcAppIds) {
+        p.app_dlcs.erase(static_cast<uint32_t>(parentAppId));
+        return;
+    }
+    jsize n = env->GetArrayLength(dlcAppIds);
+    if (n <= 0) {
+        p.app_dlcs.erase(static_cast<uint32_t>(parentAppId));
+        return;
+    }
+    jint*     ids = env->GetIntArrayElements(dlcAppIds, nullptr);
+    jboolean* av  = (available && env->GetArrayLength(available) == n)
+                        ? env->GetBooleanArrayElements(available, nullptr) : nullptr;
+    auto read_name = [&](jsize i) -> std::string {
+        if (!dlcNames || env->GetArrayLength(dlcNames) <= i) return {};
+        auto js = reinterpret_cast<jstring>(env->GetObjectArrayElement(dlcNames, i));
+        if (!js) return {};
+        const char* c = env->GetStringUTFChars(js, nullptr);
+        std::string out = c ? c : "";
+        if (c) env->ReleaseStringUTFChars(js, c);
+        env->DeleteLocalRef(js);
+        return out;
+    };
+    std::vector<wn_libsteamclient::PushedState::DlcEntry> entries;
+    entries.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        if (ids[i] <= 0) continue;
+        wn_libsteamclient::PushedState::DlcEntry e;
+        e.app_id    = static_cast<uint32_t>(ids[i]);
+        e.name      = read_name(i);
+        e.available = av ? (av[i] == JNI_TRUE) : true;
+        entries.push_back(std::move(e));
+    }
+    env->ReleaseIntArrayElements(dlcAppIds, ids, JNI_ABORT);
+    if (av) env->ReleaseBooleanArrayElements(available, av, JNI_ABORT);
+    p.app_dlcs[static_cast<uint32_t>(parentAppId)] = std::move(entries);
+    WN_LOGI("set_app_dlcs: parent=%d count=%zu",
+            parentAppId, p.app_dlcs[static_cast<uint32_t>(parentAppId)].size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppWorkshopItems(
+        JNIEnv* env, jclass /*cls*/, jint appId,
+        jlongArray publishedFileIds, jobjectArray installDirs,
+        jlongArray sizesBytes, jlongArray timestamps) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!publishedFileIds) {
+        p.subscribed_workshop_items.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    jsize n = env->GetArrayLength(publishedFileIds);
+    if (n <= 0) {
+        p.subscribed_workshop_items.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    jlong* ids   = env->GetLongArrayElements(publishedFileIds, nullptr);
+    jlong* sizes = (sizesBytes && env->GetArrayLength(sizesBytes) == n)
+                       ? env->GetLongArrayElements(sizesBytes, nullptr) : nullptr;
+    jlong* tims  = (timestamps && env->GetArrayLength(timestamps) == n)
+                       ? env->GetLongArrayElements(timestamps, nullptr) : nullptr;
+    auto read_str = [&](jsize i) -> std::string {
+        if (!installDirs || env->GetArrayLength(installDirs) <= i) return {};
+        auto js = reinterpret_cast<jstring>(env->GetObjectArrayElement(installDirs, i));
+        if (!js) return {};
+        const char* c = env->GetStringUTFChars(js, nullptr);
+        std::string out = c ? c : "";
+        if (c) env->ReleaseStringUTFChars(js, c);
+        env->DeleteLocalRef(js);
+        return out;
+    };
+    std::unordered_map<uint64_t, wn_libsteamclient::PushedState::WorkshopItemInfo> items;
+    items.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        if (ids[i] <= 0) continue;
+        wn_libsteamclient::PushedState::WorkshopItemInfo info;
+        info.install_dir = read_str(i);
+        info.size_bytes  = sizes ? static_cast<uint64_t>(sizes[i]) : 0u;
+        info.timestamp   = tims  ? static_cast<uint32_t>(tims[i]) : 0u;
+        info.installed   = true;
+        items.emplace(static_cast<uint64_t>(ids[i]), std::move(info));
+    }
+    env->ReleaseLongArrayElements(publishedFileIds, ids, JNI_ABORT);
+    if (sizes) env->ReleaseLongArrayElements(sizesBytes, sizes, JNI_ABORT);
+    if (tims)  env->ReleaseLongArrayElements(timestamps, tims,  JNI_ABORT);
+    if (items.empty()) {
+        p.subscribed_workshop_items.erase(static_cast<uint32_t>(appId));
+    } else {
+        p.subscribed_workshop_items[static_cast<uint32_t>(appId)] = std::move(items);
+    }
+    WN_LOGI("set_app_workshop_items: app=%d count=%zu", appId,
+            p.subscribed_workshop_items[static_cast<uint32_t>(appId)].size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetInventoryItemDefs(
+        JNIEnv* env, jclass /*cls*/, jint appId,
+        jintArray defIds, jintArray propCountsPerDef,
+        jobjectArray propKeys, jobjectArray propVals) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!defIds) {
+        p.inventory_item_defs.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    jsize n = env->GetArrayLength(defIds);
+    if (n <= 0) {
+        p.inventory_item_defs.erase(static_cast<uint32_t>(appId));
+        return;
+    }
+    if (!propCountsPerDef || env->GetArrayLength(propCountsPerDef) != n) return;
+    jint* ids    = env->GetIntArrayElements(defIds, nullptr);
+    jint* counts = env->GetIntArrayElements(propCountsPerDef, nullptr);
+    auto read_str = [&](jobjectArray arr, jsize i) -> std::string {
+        if (!arr || env->GetArrayLength(arr) <= i) return {};
+        auto js = reinterpret_cast<jstring>(env->GetObjectArrayElement(arr, i));
+        if (!js) return {};
+        const char* c = env->GetStringUTFChars(js, nullptr);
+        std::string out = c ? c : "";
+        if (c) env->ReleaseStringUTFChars(js, c);
+        env->DeleteLocalRef(js);
+        return out;
+    };
+    std::unordered_map<int32_t, std::unordered_map<std::string, std::string>> table;
+    table.reserve(n);
+    jsize cursor = 0;
+    for (jsize i = 0; i < n; ++i) {
+        if (ids[i] <= 0) { cursor += counts[i]; continue; }
+        std::unordered_map<std::string, std::string> props;
+        const jsize end = cursor + counts[i];
+        props.reserve(counts[i]);
+        for (jsize j = cursor; j < end; ++j) {
+            auto k = read_str(propKeys, j);
+            if (k.empty()) continue;
+            props.emplace(std::move(k), read_str(propVals, j));
+        }
+        cursor = end;
+        table.emplace(static_cast<int32_t>(ids[i]), std::move(props));
+    }
+    env->ReleaseIntArrayElements(defIds, ids, JNI_ABORT);
+    env->ReleaseIntArrayElements(propCountsPerDef, counts, JNI_ABORT);
+    if (table.empty()) {
+        p.inventory_item_defs.erase(static_cast<uint32_t>(appId));
+    } else {
+        p.inventory_item_defs[static_cast<uint32_t>(appId)] = std::move(table);
+    }
+    WN_LOGI("set_inventory_item_defs: app=%d count=%zu", appId,
+            p.inventory_item_defs[static_cast<uint32_t>(appId)].size());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendPersonaState(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong steamId64, jint state) {
+    if (steamId64 == 0) return;
+    int32_t flags = 0;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto sid = static_cast<uint64_t>(steamId64);
+        if (state < 0) {
+            auto it = p.friend_persona_states.find(sid);
+            if (it != p.friend_persona_states.end() && it->second != 0) {
+                flags = cb::kPersonaChangeStatus | cb::kPersonaChangeGoneOffline;
+            }
+            p.friend_persona_states.erase(sid);
+        } else {
+            uint32_t prev = 0;
+            bool prev_known = false;
+            auto it = p.friend_persona_states.find(sid);
+            if (it != p.friend_persona_states.end()) {
+                prev = it->second;
+                prev_known = true;
+            }
+            p.friend_persona_states[sid] = static_cast<uint32_t>(state);
+            if (!prev_known || prev != static_cast<uint32_t>(state)) {
+                flags = cb::kPersonaChangeStatus;
+                if (prev == 0 && state != 0) flags |= cb::kPersonaChangeComeOnline;
+                if (prev != 0 && state == 0) flags |= cb::kPersonaChangeGoneOffline;
+            }
+        }
+    }
+    if (flags != 0) emit_persona_state_change(static_cast<uint64_t>(steamId64), flags);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendGamePlayed(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong steamId64, jint appId) {
+    if (steamId64 == 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (appId <= 0) {
+        p.friend_game_played_app.erase(static_cast<uint64_t>(steamId64));
+    } else {
+        p.friend_game_played_app[static_cast<uint64_t>(steamId64)] =
+            static_cast<uint32_t>(appId);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendPersonaName(
+        JNIEnv* env, jclass /*cls*/, jlong steamId64, jstring jname) {
+    if (steamId64 == 0) return;
+    auto& p = lsc::pushed();
+    std::string name = jstr(env, jname);
+    bool changed = false;
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        const uint64_t sid = static_cast<uint64_t>(steamId64);
+        if (name.empty()) {
+            changed = (p.friend_persona_names.erase(sid) > 0);
+        } else {
+            auto it = p.friend_persona_names.find(sid);
+            changed = (it == p.friend_persona_names.end() || it->second != name);
+            p.friend_persona_names[sid] = std::move(name);
+        }
+    }
+    if (changed) {
+        emit_persona_state_change(static_cast<uint64_t>(steamId64),
+                                  cb::kPersonaChangeName);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetLaunchCommandLine(
+        JNIEnv* env, jclass /*cls*/, jstring jcli) {
+    std::string cl = jstr(env, jcli);
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.launch_command_line = std::move(cl);
+    WN_LOGI("set_launch_command_line(\"%s\")", p.launch_command_line.c_str());
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppFamilyShared(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean familyShared) {
+    lsc::pushed().app_is_family_shared.store(familyShared == JNI_TRUE);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetEncryptedAppTicket(
+        JNIEnv* env, jclass /*cls*/, jint appId, jbyteArray body, jint eresult) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    if (!body) {
+        p.encrypted_app_tickets.erase(static_cast<uint32_t>(appId));
+    } else {
+        jsize n = env->GetArrayLength(body);
+        if (n <= 0) {
+            p.encrypted_app_tickets.erase(static_cast<uint32_t>(appId));
+        } else {
+            std::vector<uint8_t> buf(n);
+            env->GetByteArrayRegion(body, 0, n, reinterpret_cast<jbyte*>(buf.data()));
+            p.encrypted_app_tickets[static_cast<uint32_t>(appId)] = std::move(buf);
+        }
+    }
+    p.encrypted_app_ticket_eresult.store(static_cast<int32_t>(eresult));
+    WN_LOGI("set_encrypted_app_ticket: app=%d bytes=%d eresult=%d",
+            appId, body ? env->GetArrayLength(body) : 0, eresult);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeReportLogonFailure(
+        JNIEnv* /*env*/, jclass /*cls*/, jint eresult, jboolean stillRetrying) {
+    cb::SteamServerConnectFailure payload{};
+    payload.m_eResult        = static_cast<int32_t>(eresult);
+    payload.m_bStillRetrying = (stillRetrying == JNI_TRUE);
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kSteamServerConnectFailure,
+                       &payload, sizeof(payload));
+    WN_LOGI("report_logon_failure: eresult=%d stillRetrying=%d "
+            "(SteamServerConnectFailure_t emitted)",
+            eresult, payload.m_bStillRetrying ? 1 : 0);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetServerRealTime(
+        JNIEnv* /*env*/, jclass /*cls*/, jint serverRealTimeUnix) {
+    auto& p = lsc::pushed();
+    const auto now = std::chrono::steady_clock::now();
+    const auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+        now.time_since_epoch()).count();
+    p.server_realtime.store(static_cast<uint32_t>(serverRealTimeUnix));
+    p.server_realtime_anchor_local_ms.store(static_cast<int64_t>(now_ms));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetCloudEnabledForAccount(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean enabled) {
+    lsc::pushed().cloud_enabled_account.store(enabled == JNI_TRUE);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetCloudEnabledForApp(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean enabled) {
+    lsc::pushed().cloud_enabled_app.store(enabled == JNI_TRUE);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetCloudQuota(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong totalBytes, jlong availBytes) {
+    auto& p = lsc::pushed();
+    p.cloud_quota_total.store(static_cast<uint64_t>(totalBytes));
+    p.cloud_quota_available.store(static_cast<uint64_t>(availBytes));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetCloudFiles(
+        JNIEnv* env, jclass /*cls*/, jobjectArray names, jintArray sizes,
+        jlongArray timestamps) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.cloud_files.clear();
+    if (!names || !sizes || !timestamps) return;
+    jsize n  = env->GetArrayLength(names);
+    jsize ns = env->GetArrayLength(sizes);
+    jsize nt = env->GetArrayLength(timestamps);
+    if (n <= 0 || n != ns || n != nt) return;
+    jint*  sbuf = env->GetIntArrayElements(sizes, nullptr);
+    jlong* tbuf = env->GetLongArrayElements(timestamps, nullptr);
+    if (!sbuf || !tbuf) {
+        if (sbuf) env->ReleaseIntArrayElements(sizes, sbuf, JNI_ABORT);
+        if (tbuf) env->ReleaseLongArrayElements(timestamps, tbuf, JNI_ABORT);
+        return;
+    }
+    p.cloud_files.reserve(n);
+    for (jsize i = 0; i < n; ++i) {
+        auto jname = reinterpret_cast<jstring>(env->GetObjectArrayElement(names, i));
+        std::string name;
+        if (jname) {
+            const char* c = env->GetStringUTFChars(jname, nullptr);
+            if (c) { name = c; env->ReleaseStringUTFChars(jname, c); }
+            env->DeleteLocalRef(jname);
+        }
+        if (name.empty()) continue;
+        wn_libsteamclient::PushedState::CloudFileEntry e;
+        e.name      = std::move(name);
+        e.size      = static_cast<int32_t>(sbuf[i]);
+        e.timestamp = static_cast<int64_t>(tbuf[i]);
+        p.cloud_files.push_back(std::move(e));
+    }
+    env->ReleaseIntArrayElements(sizes, sbuf, JNI_ABORT);
+    env->ReleaseLongArrayElements(timestamps, tbuf, JNI_ABORT);
+    size_t pushed_count = p.cloud_files.size();
+    uint32_t app = p.app_id.load();
+    if (app != 0) {
+        cb::RemoteStorageAppSyncedClient payload{};
+        payload.m_nAppID         = app;
+        payload.m_eResult        = pushed_count > 0 ? 1 : 2;  // OK / Fail
+        payload.m_unNumDownloads = static_cast<int32_t>(pushed_count);
+        lsc::push_callback(lsc::state().user.load(),
+                           cb::kRemoteStorageAppSyncedClient,
+                           &payload, sizeof(payload));
+    }
+    WN_LOGI("set_cloud_files: %zu entries app=%u (cb emitted=%d)",
+            pushed_count, app, app != 0 ? 1 : 0);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAchievementSchema(
+        JNIEnv* env, jclass /*cls*/, jobjectArray apiNames,
+        jobjectArray displayNames, jobjectArray descriptions,
+        jobjectArray icons, jbooleanArray hidden) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.achievements.clear();
+    p.achievement_index.clear();
+    p.dirty_stats_int.clear();
+    p.dirty_stats_float.clear();
+    if (!apiNames) { p.stats_ready.store(true); return; }
+    jsize n  = env->GetArrayLength(apiNames);
+    jsize nd = displayNames ? env->GetArrayLength(displayNames) : 0;
+    jsize nx = descriptions ? env->GetArrayLength(descriptions) : 0;
+    jsize ni = icons        ? env->GetArrayLength(icons)        : 0;
+    jsize nh = hidden       ? env->GetArrayLength(hidden)       : 0;
+    if (n <= 0) { p.stats_ready.store(true); return; }
+    jboolean* hbuf = (hidden && nh == n) ? env->GetBooleanArrayElements(hidden, nullptr) : nullptr;
+    p.achievements.reserve(n);
+    p.achievement_index.reserve(n);
+    auto read = [&](jobjectArray arr, jsize len, jsize i) -> std::string {
+        if (!arr || i >= len) return {};
+        auto js = reinterpret_cast<jstring>(env->GetObjectArrayElement(arr, i));
+        if (!js) return {};
+        const char* c = env->GetStringUTFChars(js, nullptr);
+        std::string out = c ? c : "";
+        if (c) env->ReleaseStringUTFChars(js, c);
+        env->DeleteLocalRef(js);
+        return out;
+    };
+    for (jsize i = 0; i < n; ++i) {
+        wn_libsteamclient::PushedState::AchievementEntry e;
+        e.api_name     = read(apiNames,     n,  i);
+        if (e.api_name.empty()) continue;
+        std::string dn = read(displayNames, nd, i);
+        std::string ds = read(descriptions, nx, i);
+        if (!dn.empty()) e.display_names.emplace("english", std::move(dn));
+        if (!ds.empty()) e.descriptions.emplace("english", std::move(ds));
+        e.icon         = read(icons,        ni, i);
+        e.hidden       = hbuf && hbuf[i] == JNI_TRUE;
+        e.icon_handle  = static_cast<int32_t>(p.achievements.size()) + 1;  // non-zero
+        p.achievement_index.emplace(e.api_name, p.achievements.size());
+        p.achievements.push_back(std::move(e));
+    }
+    if (hbuf) env->ReleaseBooleanArrayElements(hidden, hbuf, JNI_ABORT);
+    p.stats_ready.store(true);
+    size_t pushed_count = p.achievements.size();
+    cb::UserStatsReceived payload{};
+    payload.m_nGameID      = static_cast<uint64_t>(p.app_id.load());
+    payload.m_eResult      = pushed_count > 0 ? 1 : 2;  // 1=k_EResultOK, 2=k_EResultFail
+    payload.m_steamIDUser  = p.steam_id.load();
+    int h_user = lsc::state().user.load();
+    lsc::push_callback(h_user, cb::kUserStatsReceived, &payload, sizeof(payload));
+    WN_LOGI("set_achievement_schema: %zu entries (UserStatsReceived_t emitted "
+            "user=%d game=%llu eresult=%d)",
+            pushed_count, h_user,
+            static_cast<unsigned long long>(payload.m_nGameID),
+            payload.m_eResult);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetStatIds(
+        JNIEnv* env, jclass /*cls*/, jobjectArray jNames, jintArray jIds) {
+    if (!jNames || !jIds) return;
+    jsize n = env->GetArrayLength(jNames);
+    if (n <= 0 || env->GetArrayLength(jIds) != n) return;
+    jint* ids = env->GetIntArrayElements(jIds, nullptr);
+    auto& p = lsc::pushed();
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        p.stat_name_to_id.clear();
+        for (jsize i = 0; i < n; ++i) {
+            jstring js = static_cast<jstring>(env->GetObjectArrayElement(jNames, i));
+            if (!js) continue;
+            const char* c = env->GetStringUTFChars(js, nullptr);
+            if (c && *c && ids[i] >= 0) {
+                p.stat_name_to_id[c] = static_cast<uint32_t>(ids[i]);
+            }
+            if (c) env->ReleaseStringUTFChars(js, c);
+            env->DeleteLocalRef(js);
+        }
+    }
+    env->ReleaseIntArrayElements(jIds, ids, JNI_ABORT);
+    WN_LOGI("set_stat_ids: %d entries", n);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAchievementBlockBits(
+        JNIEnv* env, jclass /*cls*/, jobjectArray apiNames,
+        jintArray blockIds, jintArray bitIndices) {
+    if (!apiNames || !blockIds || !bitIndices) return;
+    jsize n = env->GetArrayLength(apiNames);
+    if (n <= 0) return;
+    if (env->GetArrayLength(blockIds) != n ||
+        env->GetArrayLength(bitIndices) != n) {
+        WN_LOGI("set_achievement_block_bits: array length mismatch (n=%d) — ignoring", n);
+        return;
+    }
+    jint* blocks = env->GetIntArrayElements(blockIds, nullptr);
+    jint* bits   = env->GetIntArrayElements(bitIndices, nullptr);
+    auto& p = lsc::pushed();
+    size_t applied = 0;
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        for (jsize i = 0; i < n; ++i) {
+            jstring js = static_cast<jstring>(env->GetObjectArrayElement(apiNames, i));
+            if (!js) continue;
+            const char* c = env->GetStringUTFChars(js, nullptr);
+            if (!c) { env->DeleteLocalRef(js); continue; }
+            auto it = p.achievement_index.find(c);
+            if (it != p.achievement_index.end() && it->second < p.achievements.size()) {
+                auto& ach = p.achievements[it->second];
+                ach.block_id  = blocks[i];
+                ach.bit_index = bits[i];
+                ++applied;
+            }
+            env->ReleaseStringUTFChars(js, c);
+            env->DeleteLocalRef(js);
+        }
+    }
+    env->ReleaseIntArrayElements(blockIds, blocks, JNI_ABORT);
+    env->ReleaseIntArrayElements(bitIndices, bits, JNI_ABORT);
+    WN_LOGI("set_achievement_block_bits: applied %zu / %d", applied, n);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeAddAchievementLocale(
+        JNIEnv* env, jclass /*cls*/, jstring jApiName, jstring jLocale,
+        jstring jDisplayName, jstring jDescription) {
+    if (!jApiName || !jLocale) return;
+    std::string api    = jstr(env, jApiName);
+    std::string locale = jstr(env, jLocale);
+    std::string dn     = jstr(env, jDisplayName);
+    std::string ds     = jstr(env, jDescription);
+    if (api.empty() || locale.empty() || (dn.empty() && ds.empty())) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto it = p.achievement_index.find(api);
+    if (it == p.achievement_index.end()) return;
+    auto& a = p.achievements[it->second];
+    if (!dn.empty()) a.display_names[locale] = std::move(dn);
+    if (!ds.empty()) a.descriptions[locale]  = std::move(ds);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAchievementProgress(
+        JNIEnv* env, jclass /*cls*/, jstring jApiName, jboolean achieved,
+        jint unlockTimeUnix) {
+    if (!jApiName) return;
+    std::string name = jstr(env, jApiName);
+    if (name.empty()) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto it = p.achievement_index.find(name);
+    if (it == p.achievement_index.end()) return;
+    auto& a = p.achievements[it->second];
+    a.achieved    = (achieved == JNI_TRUE);
+    a.unlock_time = static_cast<uint32_t>(unlockTimeUnix);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetStatInt(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jint value) {
+    if (!jName) return;
+    std::string name = jstr(env, jName);
+    if (name.empty()) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.stats_int[std::move(name)] = static_cast<int32_t>(value);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetStatFloat(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jfloat value) {
+    if (!jName) return;
+    std::string name = jstr(env, jName);
+    if (name.empty()) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    p.stats_float[std::move(name)] = value;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticAchievementCount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    return static_cast<jint>(lsc::pushed().achievements.size());
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticCallbackDepth(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    auto& s = lsc::state();
+    std::lock_guard<std::mutex> lk(s.callback_mu);
+    return static_cast<jint>(s.callback_queue.size());
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticTcpAccepted(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    return static_cast<jint>(lsc::accepted_connection_count());
+}
+
+extern "C" void* wn_get_isteam_utils();
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticUtilsGetAPICallResult(
+        JNIEnv* /*env*/, jclass /*cls*/, jint iCallback, jint eresultIn) {
+    uint64_t h = lsc::alloc_api_call_handle();
+    int32_t body = eresultIn;
+    lsc::push_call_result(h, static_cast<int>(iCallback),
+                          &body, sizeof(body), /*io_failure=*/false);
+    void* obj = wn_get_isteam_utils();
+    if (!obj) return -1;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using GetResultFn = bool (*)(void*, uint64_t, void*, int, int, bool*);
+    auto getr = reinterpret_cast<GetResultFn>(vt[13]);
+    int32_t out = -1;
+    bool failed = false;
+    bool ok = getr(obj, h, &out, sizeof(out), static_cast<int>(iCallback), &failed);
+    return ok ? out : -1;
+}
+
+extern "C" void* wn_get_isteam_user();
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRequestEncryptedAppTicket(
+        JNIEnv* env, jclass /*cls*/, jbyteArray outBody) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using ReqFn = uint64_t (*)(void*, void*, int);
+    auto req = reinterpret_cast<ReqFn>(vt[21]);
+    uint64_t h = req(obj, nullptr, 0);
+    using GetFn = bool (*)(void*, void*, int, uint32_t*);
+    auto get = reinterpret_cast<GetFn>(vt[22]);
+    uint8_t scratch[128] = {0};
+    uint32_t actual = 0;
+    bool ok = get(obj, scratch, sizeof(scratch), &actual);
+    if (ok && outBody && env->GetArrayLength(outBody) >= static_cast<jsize>(actual)) {
+        env->SetByteArrayRegion(outBody, 0, static_cast<jsize>(actual),
+                                reinterpret_cast<const jbyte*>(scratch));
+    }
+    return static_cast<jlong>(h);
+}
+
+extern "C" void* wn_get_isteam_user();
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetAuthTicket(
+        JNIEnv* env, jclass /*cls*/, jbyteArray jbuf) {
+    void* obj = wn_get_isteam_user();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using GetTicketFn = uint64_t (*)(void*, void*, int, uint32_t*, const void*);
+    auto get_ticket = reinterpret_cast<GetTicketFn>(vt[13]);
+    uint8_t  scratch[64] = {0};
+    uint32_t actual = 0;
+    uint64_t h = get_ticket(obj, scratch, sizeof(scratch), &actual, nullptr);
+    if (jbuf && env->GetArrayLength(jbuf) >= static_cast<jsize>(actual)) {
+        env->SetByteArrayRegion(jbuf, 0, static_cast<jsize>(actual),
+                                reinterpret_cast<const jbyte*>(scratch));
+    }
+    return static_cast<jint>(h);
+}
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_RunCallbacks(void);
+
+namespace {
+
+struct DiagnosticCallback {
+    void**       vptr;
+    uint8_t      flags;
+    uint8_t      _pad0[3];
+    int32_t      iCallback;
+    int32_t      runs;          // bumped on each Run()
+    int32_t      last_user;     // copied from msg payload[0] (m_nGameID low 32)
+    int32_t      last_eresult;  // copied from msg payload offset 8 (m_eResult)
+};
+
+void diagnostic_run(DiagnosticCallback* self, void* payload) {
+    if (!self) return;
+    ++self->runs;
+    if (payload) {
+        self->last_user    = static_cast<int32_t>(
+            *reinterpret_cast<const uint32_t*>(payload));
+        self->last_eresult = *reinterpret_cast<const int32_t*>(
+            static_cast<const uint8_t*>(payload) + 8);
+    }
+}
+
+void diagnostic_run_result(DiagnosticCallback*, void*, bool, uint64_t) {}
+int  diagnostic_get_size(DiagnosticCallback*) { return 24; }  // sizeof(UserStatsReceived_t)
+
+void* const kDiagnosticVtable[] = {
+    reinterpret_cast<void*>(&diagnostic_run),
+    reinterpret_cast<void*>(&diagnostic_run_result),
+    reinterpret_cast<void*>(&diagnostic_get_size),
+};
+
+DiagnosticCallback g_diagnostic_cb;
+bool g_diagnostic_registered = false;
+
+}  // namespace
+
+namespace {
+struct DiagnosticCallResultCb {
+    void**       vptr;
+    uint8_t      flags;
+    uint8_t      _pad0[3];
+    int32_t      iCallback;
+    int32_t      runs;
+    uint64_t     last_h_call;
+    int32_t      last_io_failure;
+    int32_t      last_eresult;
+};
+
+void diag_cr_run(DiagnosticCallResultCb*, void*) {}  // slot 0 unused for CCallResult
+void diag_cr_run_result(DiagnosticCallResultCb* self, void* payload,
+                        bool ioFailure, uint64_t hCall) {
+    if (!self) return;
+    ++self->runs;
+    self->last_h_call    = hCall;
+    self->last_io_failure = ioFailure ? 1 : 0;
+    if (payload) {
+        self->last_eresult = *reinterpret_cast<const int32_t*>(payload);
+    }
+}
+int  diag_cr_get_size(DiagnosticCallResultCb*) { return 0; }
+
+void* const kDiagnosticCallResultVtable[] = {
+    reinterpret_cast<void*>(&diag_cr_run),
+    reinterpret_cast<void*>(&diag_cr_run_result),
+    reinterpret_cast<void*>(&diag_cr_get_size),
+};
+
+DiagnosticCallResultCb g_diag_cr_cb;
+}  // namespace
+
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_RunCallbacks(void);
+extern "C" __attribute__((visibility("default")))
+void SteamAPI_RegisterCallResult(void*, uint64_t);
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticPushAndDrainCallResult(
+        JNIEnv* /*env*/, jclass /*cls*/, jint callbackId, jint eresult) {
+    uint64_t h_call = lsc::alloc_api_call_handle();
+    int32_t  body_eresult = eresult;
+    lsc::push_call_result(h_call, static_cast<int>(callbackId),
+                          &body_eresult, sizeof(body_eresult),
+                          /*io_failure=*/false);
+
+    g_diag_cr_cb.vptr      = const_cast<void**>(kDiagnosticCallResultVtable);
+    g_diag_cr_cb.flags     = 0;
+    g_diag_cr_cb.iCallback = static_cast<int32_t>(callbackId);
+    g_diag_cr_cb.runs           = 0;
+    g_diag_cr_cb.last_h_call    = 0;
+    g_diag_cr_cb.last_io_failure = -1;
+    g_diag_cr_cb.last_eresult   = 0;
+    SteamAPI_RegisterCallResult(&g_diag_cr_cb, h_call);
+
+    SteamAPI_RunCallbacks();
+
+    return (static_cast<jlong>(g_diag_cr_cb.runs) << 32) |
+           (static_cast<jlong>(g_diag_cr_cb.last_eresult) & 0xFFFFFFFFL);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRegisterAndDrain(
+        JNIEnv* /*env*/, jclass /*cls*/, jint iCallback) {
+    g_diagnostic_cb.vptr      = const_cast<void**>(kDiagnosticVtable);
+    g_diagnostic_cb.flags     = 0;
+    g_diagnostic_cb.iCallback = static_cast<int32_t>(iCallback);
+    g_diagnostic_cb.runs         = 0;
+    g_diagnostic_cb.last_user    = 0;
+    g_diagnostic_cb.last_eresult = 0;
+    if (!g_diagnostic_registered) {
+        lsc::register_callback(&g_diagnostic_cb, static_cast<int>(iCallback));
+        g_diagnostic_registered = true;
+    }
+    SteamAPI_RunCallbacks();
+    return g_diagnostic_cb.runs;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticShutdownPipe(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    int pipe = lsc::state().pipe.load();
+    if (pipe == 0) return JNI_FALSE;
+    namespace cb = wn_libsteamclient::callbacks;
+    cb::SteamShutdown sd{};
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kSteamShutdown, &sd, 0);
+    bool ok = lsc::release_pipe(pipe);
+    (void)lsc::alloc_pipe();
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+extern "C" void* wn_get_isteam_user_stats();
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticStoreStats(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_user_stats();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using StoreFn = bool (*)(void*);
+    auto fn = reinterpret_cast<StoreFn>(vt[10]);
+    return fn(obj) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticSetAchievement(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    if (!jName) return JNI_FALSE;
+    void* obj = wn_get_isteam_user_stats();
+    if (!obj) return JNI_FALSE;
+    std::string name = jstr(env, jName);
+    long* vt = *reinterpret_cast<long**>(obj);
+    using SetFn = bool (*)(void*, const char*);
+    auto fn = reinterpret_cast<SetFn>(vt[7]);
+    return fn(obj, name.c_str()) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticIndicateAchievementProgress(
+        JNIEnv* env, jclass /*cls*/, jstring jName, jint cur, jint max) {
+    if (!jName) return JNI_FALSE;
+    void* obj = wn_get_isteam_user_stats();
+    if (!obj) return JNI_FALSE;
+    std::string name = jstr(env, jName);
+    long* vt = *reinterpret_cast<long**>(obj);
+    using IndFn = bool (*)(void*, const char*, uint32_t, uint32_t);
+    auto fn = reinterpret_cast<IndFn>(vt[13]);
+    return fn(obj, name.c_str(),
+              static_cast<uint32_t>(cur),
+              static_cast<uint32_t>(max)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendRichPresence(
+        JNIEnv* env, jclass /*cls*/, jlong jSteamId, jstring jKey, jstring jValue) {
+    uint64_t steam_id = static_cast<uint64_t>(jSteamId);
+    if (steam_id == 0 || !jKey) return;
+    std::string key   = jstr(env, jKey);
+    std::string value = jstr(env, jValue);
+    if (key.empty()) return;
+    auto& p = lsc::pushed();
+    {
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto& rp = p.rich_presence[steam_id];
+        auto it = std::find_if(rp.begin(), rp.end(),
+            [&](const auto& kv) { return kv.first == key; });
+        if (value.empty()) {
+            if (it != rp.end()) rp.erase(it);
+        } else if (it == rp.end()) {
+            rp.emplace_back(std::move(key), std::move(value));
+        } else {
+            it->second = std::move(value);
+        }
+    }
+    cb::FriendRichPresenceUpdate ev{};
+    ev.m_steamIDFriend = steam_id;
+    ev.m_nAppID        = p.app_id.load();
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kFriendRichPresenceUpdate,
+                       &ev, sizeof(ev));
+}
+
+extern "C" void* wn_get_isteam_friends();
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticSetPersonaName(
+        JNIEnv* env, jclass /*cls*/, jstring jName) {
+    if (!jName) return 0;
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return 0;
+    std::string name = jstr(env, jName);
+    long* vt = *reinterpret_cast<long**>(obj);
+    using SetFn = uint64_t (*)(void*, const char*);
+    auto fn = reinterpret_cast<SetFn>(vt[1]);
+    return static_cast<jlong>(fn(obj, name.c_str()));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRequestFriendRichPresence(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong jSteamId) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using ReqFn = void (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<ReqFn>(vt[48]);
+    fn(obj, static_cast<uint64_t>(jSteamId));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRequestUserInformation(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong jSteamId, jboolean jNameOnly) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using ReqFn = bool (*)(void*, uint64_t, bool);
+    auto fn = reinterpret_cast<ReqFn>(vt[37]);
+    return fn(obj, static_cast<uint64_t>(jSteamId), jNameOnly == JNI_TRUE)
+           ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectLogonState(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean jLoggedOn) {
+    wn_cm_bridge_inject_test_logon_state(jLoggedOn == JNI_TRUE);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectLicenseList(
+        JNIEnv* env, jclass /*cls*/, jintArray jPackageIds, jintArray jOwnerIds) {
+    if (!jPackageIds) {
+        wn_cm_bridge_inject_test_license_list(nullptr, 0);
+        return;
+    }
+    jsize n = env->GetArrayLength(jPackageIds);
+    if (n <= 0) {
+        wn_cm_bridge_inject_test_license_list(nullptr, 0);
+        return;
+    }
+    jint* pkg_ids = env->GetIntArrayElements(jPackageIds, nullptr);
+    jint* own_ids = jOwnerIds ? env->GetIntArrayElements(jOwnerIds, nullptr) : nullptr;
+    if (!pkg_ids) return;
+    std::vector<WnCmLicenseEntry> entries;
+    entries.reserve(static_cast<size_t>(n));
+    uint32_t now = static_cast<uint32_t>(::time(nullptr));
+    for (jsize i = 0; i < n; ++i) {
+        WnCmLicenseEntry e{};
+        e.package_id   = static_cast<uint32_t>(pkg_ids[i]);
+        e.owner_id     = (own_ids && i < env->GetArrayLength(jOwnerIds))
+                            ? static_cast<uint32_t>(own_ids[i]) : 0u;
+        e.time_created = now;
+        entries.push_back(e);
+    }
+    wn_cm_bridge_inject_test_license_list(entries.data(), entries.size());
+    env->ReleaseIntArrayElements(jPackageIds, pkg_ids, JNI_ABORT);
+    if (own_ids) env->ReleaseIntArrayElements(jOwnerIds, own_ids, JNI_ABORT);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetLicenseOwner(
+        JNIEnv* /*env*/, jclass /*cls*/, jint jPackageId) {
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto it = p.licenses.find(static_cast<uint32_t>(jPackageId));
+    if (it == p.licenses.end()) return -1;
+    return static_cast<jint>(it->second.owner_id);
+}
+
+extern "C" void* wn_get_isteam_apps();
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetEarliestPurchaseUnixTime(
+        JNIEnv* /*env*/, jclass /*cls*/, jint jAppId) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint32_t (*)(void*, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[8]);
+    return static_cast<jint>(fn(obj, static_cast<uint32_t>(jAppId)));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticBIsSubscribedFromFreeWeekend(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[9]);
+    return fn(obj) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticBIsSubscribedFromFamilySharing(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[27]);
+    return fn(obj) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jfloat JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticUpdateAvgRateStat(
+        JNIEnv* env, jclass /*cls*/, jstring jName,
+        jfloat jCountThisSession, jdouble jSessionLength) {
+    if (!jName) return 0.0f;
+    void* obj = wn_get_isteam_user_stats();
+    if (!obj) return 0.0f;
+    std::string name = jstr(env, jName);
+    long* vt = *reinterpret_cast<long**>(obj);
+    using UpdateFn = bool (*)(void*, const char*, float, double);
+    auto upd = reinterpret_cast<UpdateFn>(vt[5]);
+    if (!upd(obj, name.c_str(), jCountThisSession, jSessionLength)) return 0.0f;
+    using GetFn = bool (*)(void*, const char*, float*);
+    auto get = reinterpret_cast<GetFn>(vt[2]);
+    float out = 0.0f;
+    get(obj, name.c_str(), &out);
+    return static_cast<jfloat>(out);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetAppOwner(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = uint64_t (*)(void*);
+    auto fn = reinterpret_cast<Fn>(vt[20]);
+    return static_cast<jlong>(fn(obj));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectTrialLicense(
+        JNIEnv* /*env*/, jclass /*cls*/, jint jPackageId,
+        jint jMinuteLimit, jint jMinutesUsed) {
+    if (jPackageId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto& slot = p.licenses[static_cast<uint32_t>(jPackageId)];
+    slot.package_id    = static_cast<uint32_t>(jPackageId);
+    slot.minute_limit  = jMinuteLimit;
+    slot.minutes_used  = jMinutesUsed;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticBIsDlcInstalled(
+        JNIEnv* /*env*/, jclass /*cls*/, jint jAppId) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return JNI_FALSE;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint32_t);
+    auto fn = reinterpret_cast<Fn>(vt[7]);
+    return fn(obj, static_cast<uint32_t>(jAppId)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticBIsTimedTrial(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_apps();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using Fn = bool (*)(void*, uint32_t*, uint32_t*);
+    auto fn = reinterpret_cast<Fn>(vt[28]);
+    uint32_t allowed = 0, played = 0;
+    bool ok = fn(obj, &allowed, &played);
+    if (!ok) return 0;
+    return (1LL << 63) |
+           (static_cast<int64_t>(allowed) << 32) |
+           static_cast<int64_t>(played);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetAppSourcePackages(
+        JNIEnv* env, jclass /*cls*/, jint appId, jintArray packageIds) {
+    if (appId <= 0) return;
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto key = static_cast<uint32_t>(appId);
+    if (!packageIds) {
+        p.app_source_packages.erase(key);
+        return;
+    }
+    jsize n = env->GetArrayLength(packageIds);
+    if (n <= 0) {
+        p.app_source_packages.erase(key);
+        return;
+    }
+    jint* arr = env->GetIntArrayElements(packageIds, nullptr);
+    if (!arr) return;
+    std::vector<uint32_t> pkgs;
+    pkgs.reserve(static_cast<size_t>(n));
+    for (jsize i = 0; i < n; ++i) {
+        if (arr[i] > 0) pkgs.push_back(static_cast<uint32_t>(arr[i]));
+    }
+    env->ReleaseIntArrayElements(packageIds, arr, JNI_ABORT);
+    if (pkgs.empty()) {
+        p.app_source_packages.erase(key);
+    } else {
+        p.app_source_packages[key] = std::move(pkgs);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectFriendsList(
+        JNIEnv* env, jclass /*cls*/, jlongArray jSids) {
+    if (!jSids) {
+        wn_cm_bridge_inject_test_friends_list(nullptr, 0);
+        return;
+    }
+    jsize n = env->GetArrayLength(jSids);
+    if (n <= 0) {
+        wn_cm_bridge_inject_test_friends_list(nullptr, 0);
+        return;
+    }
+    jlong* arr = env->GetLongArrayElements(jSids, nullptr);
+    if (!arr) return;
+    static_assert(sizeof(jlong) == sizeof(uint64_t), "jlong/uint64 size mismatch");
+    wn_cm_bridge_inject_test_friends_list(
+        reinterpret_cast<const uint64_t*>(arr), static_cast<size_t>(n));
+    env->ReleaseLongArrayElements(jSids, arr, JNI_ABORT);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectPersonaEvent(
+        JNIEnv* env, jclass /*cls*/,
+        jlong jSteamId,
+        jint  jPersonaState,
+        jint  jGameAppId,
+        jstring jName,
+        jbyteArray jAvatarHash,
+        jobjectArray jRpKeys,
+        jobjectArray jRpValues) {
+    WnCmPersonaEvent ev{};
+    ev.sid              = static_cast<uint64_t>(jSteamId);
+    ev.persona_state    = (jPersonaState < 0) ? UINT32_MAX
+                                              : static_cast<uint32_t>(jPersonaState);
+    ev.game_played_app  = (jGameAppId <= 0) ? 0 : static_cast<uint32_t>(jGameAppId);
+
+    std::string name_storage;
+    if (jName) {
+        name_storage = jstr(env, jName);
+        if (!name_storage.empty()) ev.name = name_storage.c_str();
+    }
+
+    std::vector<uint8_t> hash_storage;
+    if (jAvatarHash) {
+        jsize n = env->GetArrayLength(jAvatarHash);
+        if (n > 0) {
+            hash_storage.resize(static_cast<size_t>(n));
+            env->GetByteArrayRegion(jAvatarHash, 0, n,
+                reinterpret_cast<jbyte*>(hash_storage.data()));
+            ev.avatar_hash     = hash_storage.data();
+            ev.avatar_hash_len = hash_storage.size();
+        }
+    }
+
+    std::vector<std::string> key_storage, value_storage;
+    std::vector<WnCmRichPresenceKV> rp_kv;
+    if (jRpKeys && jRpValues) {
+        jsize kn = env->GetArrayLength(jRpKeys);
+        jsize vn = env->GetArrayLength(jRpValues);
+        jsize count = std::min(kn, vn);
+        key_storage.reserve(count);
+        value_storage.reserve(count);
+        rp_kv.reserve(count);
+        for (jsize i = 0; i < count; ++i) {
+            auto k_obj = reinterpret_cast<jstring>(env->GetObjectArrayElement(jRpKeys, i));
+            auto v_obj = reinterpret_cast<jstring>(env->GetObjectArrayElement(jRpValues, i));
+            key_storage.push_back(jstr(env, k_obj));
+            value_storage.push_back(jstr(env, v_obj));
+            if (k_obj) env->DeleteLocalRef(k_obj);
+            if (v_obj) env->DeleteLocalRef(v_obj);
+            rp_kv.push_back({key_storage.back().c_str(),
+                             value_storage.back().c_str()});
+        }
+        if (!rp_kv.empty()) {
+            ev.rp_pairs = rp_kv.data();
+            ev.rp_count = rp_kv.size();
+        }
+    }
+
+    wn_cm_bridge_dispatch_persona(&ev);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticInjectOwnershipTicket(
+        JNIEnv* env, jclass /*cls*/, jint jAppId, jbyteArray jBytes) {
+    if (jAppId <= 0 || !jBytes) return JNI_FALSE;
+    jsize n = env->GetArrayLength(jBytes);
+    if (n <= 0) return JNI_FALSE;
+    std::vector<uint8_t> tmp(static_cast<size_t>(n));
+    env->GetByteArrayRegion(jBytes, 0, n, reinterpret_cast<jbyte*>(tmp.data()));
+    return wn_cm_bridge_inject_test_ownership_ticket(
+        static_cast<uint32_t>(jAppId), tmp.data(), tmp.size())
+        ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetCachedOwnershipTicket(
+        JNIEnv* env, jclass /*cls*/, jint jAppId, jbyteArray jOut) {
+    if (jAppId <= 0) return 0;
+    size_t out_len = 0;
+    if (!jOut) {
+        wn_cm_get_cached_app_ownership_ticket(static_cast<uint32_t>(jAppId),
+                                              nullptr, 0, &out_len);
+        return static_cast<jint>(out_len);
+    }
+    jsize max = env->GetArrayLength(jOut);
+    std::vector<uint8_t> tmp(static_cast<size_t>(max));
+    bool ok = wn_cm_get_cached_app_ownership_ticket(
+        static_cast<uint32_t>(jAppId),
+        tmp.data(), static_cast<size_t>(max), &out_len);
+    if (!ok) return static_cast<jint>(out_len);  // 0 = miss; >0 = need bigger buf
+    env->SetByteArrayRegion(jOut, 0, static_cast<jsize>(out_len),
+                            reinterpret_cast<jbyte*>(tmp.data()));
+    return static_cast<jint>(out_len);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRequestUserInfoBulk(
+        JNIEnv* env, jclass /*cls*/, jlongArray jSids, jint jFlags) {
+    if (!jSids) return JNI_FALSE;
+    jsize n = env->GetArrayLength(jSids);
+    if (n <= 0) return JNI_FALSE;
+    jlong* arr = env->GetLongArrayElements(jSids, nullptr);
+    if (!arr) return JNI_FALSE;
+    static_assert(sizeof(jlong) == sizeof(uint64_t), "jlong/uint64 size mismatch");
+    bool ok = wn_cm_request_user_info_bulk(reinterpret_cast<const uint64_t*>(arr),
+                                            static_cast<size_t>(n),
+                                            static_cast<int32_t>(jFlags));
+    env->ReleaseLongArrayElements(jSids, arr, JNI_ABORT);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticClearRichPresence(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using ClrFn = void (*)(void*);
+    auto fn = reinterpret_cast<ClrFn>(vt[44]);
+    fn(obj);
+}
+
+extern "C" void* wn_get_isteam_friends();
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticSetRichPresence(
+        JNIEnv* env, jclass /*cls*/, jstring jKey, jstring jValue) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj || !jKey) return JNI_FALSE;
+    std::string key   = jstr(env, jKey);
+    std::string value = jstr(env, jValue);
+    long* vt = *reinterpret_cast<long**>(obj);
+    using SetFn = bool (*)(void*, const char*, const char*);
+    auto fn = reinterpret_cast<SetFn>(vt[43]);
+    return fn(obj, key.c_str(),
+              value.empty() ? nullptr : value.c_str()) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetFriendPersonaState(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong jSteamId) {
+    uint64_t sid = static_cast<uint64_t>(jSteamId);
+    auto& p = lsc::pushed();
+    std::lock_guard<std::mutex> lk(lsc::state_mutex());
+    auto it = p.friend_persona_states.find(sid);
+    if (it == p.friend_persona_states.end()) return -1;
+    return static_cast<jint>(it->second);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticRichPresenceKeyCount(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong jSteamId) {
+    void* obj = wn_get_isteam_friends();
+    if (!obj) return 0;
+    long* vt = *reinterpret_cast<long**>(obj);
+    using CountFn = int (*)(void*, uint64_t);
+    auto fn = reinterpret_cast<CountFn>(vt[46]);
+    return fn(obj, static_cast<uint64_t>(jSteamId));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetFriendAvatarHash(
+        JNIEnv* env, jclass /*cls*/, jlong jSteamId, jbyteArray jHash) {
+    uint64_t sid = static_cast<uint64_t>(jSteamId);
+    if (sid == 0) return;
+    bool changed = false;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto& slot = p.friend_avatar_hashes[sid];
+        if (!jHash) {
+            if (!slot.empty()) { slot.clear(); changed = true; }
+        } else {
+            jsize n = env->GetArrayLength(jHash);
+            std::vector<uint8_t> bytes(static_cast<size_t>(n));
+            if (n > 0) {
+                env->GetByteArrayRegion(jHash, 0, n,
+                    reinterpret_cast<jbyte*>(bytes.data()));
+            }
+            if (bytes != slot) {
+                slot = std::move(bytes);
+                changed = true;
+            }
+        }
+    }
+    if (!changed) return;
+    cb::PersonaStateChange payload{};
+    payload.m_ulSteamID    = sid;
+    payload.m_nChangeFlags = cb::kPersonaChangeAvatar;
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kPersonaStateChange,
+                       &payload, sizeof(payload));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetFriendAvatarHashHex(
+        JNIEnv* env, jclass /*cls*/, jlong jSteamId) {
+    uint64_t sid = static_cast<uint64_t>(jSteamId);
+    std::string hex;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        auto it = p.friend_avatar_hashes.find(sid);
+        if (it != p.friend_avatar_hashes.end()) {
+            static constexpr char kHex[] = "0123456789abcdef";
+            hex.reserve(it->second.size() * 2);
+            for (uint8_t b : it->second) {
+                hex.push_back(kHex[(b >> 4) & 0xF]);
+                hex.push_back(kHex[b & 0xF]);
+            }
+        }
+    }
+    return env->NewStringUTF(hex.c_str());
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativePushFriendAvatar(
+        JNIEnv* env, jclass /*cls*/,
+        jlong jSteamId, jint jTier, jint jWidth, jint jHeight, jbyteArray jRgba) {
+    if (jSteamId == 0 || jWidth <= 0 || jHeight <= 0 || !jRgba) return 0;
+    if (jTier < 0 || jTier > 2) return 0;
+    jsize n = env->GetArrayLength(jRgba);
+    int expected = jWidth * jHeight * 4;
+    if (n != expected) return 0;
+
+    int32_t handle;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        handle = p.next_image_handle++;
+        auto& img = p.image_registry[handle];
+        img.width  = jWidth;
+        img.height = jHeight;
+        img.rgba.resize(static_cast<size_t>(n));
+        env->GetByteArrayRegion(jRgba, 0, n,
+            reinterpret_cast<jbyte*>(img.rgba.data()));
+        auto& a = p.friend_avatars[static_cast<uint64_t>(jSteamId)];
+        switch (jTier) {
+            case 0: a.small  = handle; break;
+            case 1: a.medium = handle; break;
+            case 2: a.large  = handle; break;
+        }
+    }
+    cb::AvatarImageLoaded ev{};
+    ev.m_steamID = static_cast<uint64_t>(jSteamId);
+    ev.m_iImage  = handle;
+    ev.m_iWide   = jWidth;
+    ev.m_iTall   = jHeight;
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kAvatarImageLoaded,
+                       &ev, sizeof(ev));
+    return handle;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetTieredAvatarSize(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong jSteamId, jint jTier) {
+    if (jTier < 0 || jTier > 2) return 0;
+    void* friends = wn_get_isteam_friends();
+    if (!friends) return 0;
+    int slot = 34 + jTier;  // 34=small, 35=medium, 36=large
+    long* vt_f = *reinterpret_cast<long**>(friends);
+    using GetAv = int (*)(void*, uint64_t);
+    auto get_av = reinterpret_cast<GetAv>(vt_f[slot]);
+    int handle = get_av(friends, static_cast<uint64_t>(jSteamId));
+    if (handle <= 0) return 0;
+    void* utils = wn_get_isteam_utils();
+    if (!utils) return (static_cast<int64_t>(handle) << 32);
+    long* vt_u = *reinterpret_cast<long**>(utils);
+    using SizeFn = bool (*)(void*, int, uint32_t*, uint32_t*);
+    auto fn_size = reinterpret_cast<SizeFn>(vt_u[5]);
+    uint32_t w = 0, h = 0;
+    if (!fn_size(utils, handle, &w, &h)) return (static_cast<int64_t>(handle) << 32);
+    uint32_t lo = (w << 16) | (h & 0xFFFF);
+    return (static_cast<int64_t>(handle) << 32) | lo;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetSmallAvatarSize(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong jSteamId) {
+    void* friends = wn_get_isteam_friends();
+    if (!friends) return 0;
+    long* vt_f = *reinterpret_cast<long**>(friends);
+    using GetAv = int (*)(void*, uint64_t);
+    auto get_small = reinterpret_cast<GetAv>(vt_f[34]);
+    int handle = get_small(friends, static_cast<uint64_t>(jSteamId));
+    if (handle <= 0) return 0;
+    void* utils = wn_get_isteam_utils();
+    if (!utils) return (static_cast<int64_t>(handle) << 32);
+    long* vt_u = *reinterpret_cast<long**>(utils);
+    using SizeFn = bool (*)(void*, int, uint32_t*, uint32_t*);
+    auto fn_size = reinterpret_cast<SizeFn>(vt_u[5]);
+    uint32_t w = 0, h = 0;
+    bool ok = fn_size(utils, handle, &w, &h);
+    if (!ok) return (static_cast<int64_t>(handle) << 32);
+    uint32_t lo = (w << 16) | (h & 0xFFFF);
+    return (static_cast<int64_t>(handle) << 32) | lo;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeDiagnosticGetImageRGBA(
+        JNIEnv* env, jclass /*cls*/, jint jHandle, jbyteArray jOut) {
+    if (jHandle <= 0 || !jOut) return 0;
+    void* utils = wn_get_isteam_utils();
+    if (!utils) return 0;
+    jsize n = env->GetArrayLength(jOut);
+    std::vector<uint8_t> tmp(static_cast<size_t>(n));
+    long* vt = *reinterpret_cast<long**>(utils);
+    using RgbaFn = bool (*)(void*, int, uint8_t*, int);
+    auto fn = reinterpret_cast<RgbaFn>(vt[6]);
+    if (!fn(utils, jHandle, tmp.data(), n)) return 0;
+    env->SetByteArrayRegion(jOut, 0, n, reinterpret_cast<jbyte*>(tmp.data()));
+    return n;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativeSetGameOverlayActive(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean jActive) {
+    bool active = (jActive == JNI_TRUE);
+    auto& p = lsc::pushed();
+    bool prev = p.overlay_active.exchange(active);
+    if (prev == active) return;
+    cb::GameOverlayActivated ev{};
+    ev.m_bActive = active;
+    lsc::push_callback(lsc::state().user.load(),
+                       cb::kGameOverlayActivated,
+                       &ev, sizeof(ev));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnLibSteamClient_nativePollOverlayRequest(
+        JNIEnv* env, jclass /*cls*/) {
+    lsc::PushedState::OverlayRequest r;
+    {
+        auto& p = lsc::pushed();
+        std::lock_guard<std::mutex> lk(lsc::state_mutex());
+        if (p.overlay_request_queue.empty()) return nullptr;
+        r = std::move(p.overlay_request_queue.front());
+        p.overlay_request_queue.pop_front();
+    }
+    char buf[512];
+    int n = std::snprintf(buf, sizeof(buf),
+        "%s\x01%s\x01%llu\x01%u",
+        r.kind.c_str(),
+        r.arg1.c_str(),
+        static_cast<unsigned long long>(r.sid),
+        r.app_id);
+    if (n <= 0) return nullptr;
+    return env->NewStringUTF(buf);
+}
+
+}  // extern "C"
diff --git a/app/src/main/cpp/wn-libsteamclient/src/runtime_state.cpp b/app/src/main/cpp/wn-libsteamclient/src/runtime_state.cpp
new file mode 100644
index 000000000..0eb22e3be
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/runtime_state.cpp
@@ -0,0 +1,167 @@
+#include "wn_libsteamclient/runtime_state.h"
+#include "wn_libsteamclient/callbacks.h"
+#include "wn_libsteamclient/tcp_services.h"
+
+#include <android/log.h>
+#include <cstdlib>
+#include <cstring>
+
+namespace wn_libsteamclient {
+
+namespace {
+
+void seed_state_from_env_once() {
+    static std::once_flag flag;
+    std::call_once(flag, []() {
+        const char* env_sid = std::getenv("STEAMID");
+        const char* env_app = std::getenv("SteamAppId");
+        const char* env_usr = std::getenv("SteamUser");
+        uint64_t sid = 0;
+        if (env_sid && *env_sid) {
+            sid = std::strtoull(env_sid, nullptr, 10);
+        }
+        uint32_t app = 0;
+        if (env_app && *env_app) {
+            app = static_cast<uint32_t>(std::strtoul(env_app, nullptr, 10));
+        }
+        if (sid != 0) {
+            pushed().steam_id.store(sid);
+            state().user.store(1);
+            state().logged_on.store(true);
+            state().connected.store(true);
+            __android_log_print(ANDROID_LOG_INFO, "WnLibSteamClient",
+                "guest seed: STEAMID=%llu logged_on=true",
+                static_cast<unsigned long long>(sid));
+        }
+        if (app != 0) {
+            pushed().app_id.store(app);
+        }
+        if (env_usr && *env_usr) {
+            std::lock_guard<std::mutex> lk(state_mutex());
+            if (pushed().persona_name.empty()) {
+                pushed().persona_name = env_usr;
+            }
+        }
+    });
+}
+
+__attribute__((constructor))
+static void wn_libsteamclient_so_loaded() {
+    seed_state_from_env_once();
+}
+
+}  // namespace
+
+namespace {
+State        g_state_singleton;
+PushedState  g_pushed_singleton;
+std::mutex   g_state_mutex_singleton;
+}  // namespace
+
+State&       state()       { return g_state_singleton; }
+std::mutex&  state_mutex() { return g_state_mutex_singleton; }
+PushedState& pushed()      { return g_pushed_singleton; }
+
+HSteamPipe alloc_pipe() {
+    start_tcp_services();
+    seed_state_from_env_once();
+    std::lock_guard<std::mutex> lk(state_mutex());
+    auto& s = state();
+    HSteamPipe cur = s.pipe.load();
+    if (cur != 0) return 0;  // already allocated; caller can read s.pipe
+    s.pipe.store(1);
+    return 1;
+}
+
+bool release_pipe(HSteamPipe pipe) {
+    set_logged_on(false);
+    std::lock_guard<std::mutex> lk(state_mutex());
+    auto& s = state();
+    if (pipe == 0 || s.pipe.load() != pipe) return false;
+    s.pipe.store(0);
+    s.user.store(0);
+    return true;
+}
+
+HSteamUser alloc_global_user(HSteamPipe pipe) {
+    std::lock_guard<std::mutex> lk(state_mutex());
+    auto& s = state();
+    if (pipe == 0 || s.pipe.load() != pipe) return 0;
+    HSteamUser cur = s.user.load();
+    if (cur != 0) return cur;  // idempotent: same global user across calls
+    s.user.store(1);
+    return 1;
+}
+
+void release_user(HSteamPipe pipe, HSteamUser user) {
+    std::lock_guard<std::mutex> lk(state_mutex());
+    auto& s = state();
+    if (pipe == 0 || user == 0) return;
+    if (s.pipe.load() != pipe || s.user.load() != user) return;
+    s.user.store(0);
+    s.logged_on.store(false);
+}
+
+void push_callback(int user, int id, const void* data, size_t n) {
+    auto& s = state();
+    std::lock_guard<std::mutex> lk(s.callback_mu);
+    CallbackMsg m;
+    m.user = user;
+    m.id   = id;
+    if (data && n > 0) {
+        m.body.assign(static_cast<const uint8_t*>(data),
+                      static_cast<const uint8_t*>(data) + n);
+    }
+    s.callback_queue.push_back(std::move(m));
+}
+
+uint64_t alloc_api_call_handle() {
+    auto& s = state();
+    std::lock_guard<std::mutex> lk(s.call_results_mu);
+    uint64_t h = s.next_api_call_handle++;
+    if (s.next_api_call_handle == 0) s.next_api_call_handle = 1;
+    return h;
+}
+
+void push_call_result(uint64_t h_call, int callback_id,
+                      const void* data, size_t n, bool io_failure) {
+    if (h_call == 0) return;
+    auto& s = state();
+    CallResultMsg m;
+    m.h_call      = h_call;
+    m.callback_id = callback_id;
+    m.io_failure  = io_failure;
+    if (data && n > 0) {
+        m.body.assign(static_cast<const uint8_t*>(data),
+                      static_cast<const uint8_t*>(data) + n);
+    }
+    {
+        std::lock_guard<std::mutex> lk(s.call_results_mu);
+        s.call_results_pending[h_call] = std::move(m);
+    }
+    callbacks::SteamAPICallCompleted ev{};
+    ev.m_hAsyncCall = h_call;
+    ev.m_iCallback  = callback_id;
+    ev.m_cubParam   = static_cast<uint32_t>(n);
+    push_callback(s.user.load(),
+                  callbacks::kSteamAPICallCompleted,
+                  &ev, sizeof(ev));
+}
+
+void set_logged_on(bool logged_on, int eresult_on_disconnect) {
+    auto& s = state();
+    bool prev = s.logged_on.exchange(logged_on);
+    s.connected.store(logged_on);
+    if (prev == logged_on) return;  // idempotent — no transition
+    int h_user = s.user.load();
+    if (logged_on) {
+        push_callback(h_user, callbacks::kSteamServersConnected, nullptr, 0);
+    } else {
+        callbacks::SteamServersDisconnected payload{};
+        payload.m_eResult = eresult_on_disconnect;
+        push_callback(h_user, callbacks::kSteamServersDisconnected,
+                      &payload, sizeof(payload));
+    }
+}
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-libsteamclient/src/tcp_services.cpp b/app/src/main/cpp/wn-libsteamclient/src/tcp_services.cpp
new file mode 100644
index 000000000..7bea56897
--- /dev/null
+++ b/app/src/main/cpp/wn-libsteamclient/src/tcp_services.cpp
@@ -0,0 +1,236 @@
+#include "wn_libsteamclient/tcp_services.h"
+#include "wn_libsteamclient/callbacks.h"
+#include "wn_libsteamclient/runtime_state.h"
+
+#include <android/log.h>
+#include <arpa/inet.h>
+#include <atomic>
+#include <cerrno>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fcntl.h>
+#include <mutex>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <string>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <thread>
+#include <unistd.h>
+#include <vector>
+
+#define WN_TAG "WnLibSteamClient"
+#define WN_LOGI(...) __android_log_print(ANDROID_LOG_INFO,  WN_TAG, __VA_ARGS__)
+#define WN_LOGW(...) __android_log_print(ANDROID_LOG_WARN,  WN_TAG, __VA_ARGS__)
+#define WN_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, WN_TAG, __VA_ARGS__)
+
+namespace wn_libsteamclient {
+
+namespace {
+
+std::once_flag g_start_once;
+std::atomic<int> g_accepted_count{0};
+std::atomic<bool> g_any_bound{false};
+
+int parse_port(const char* env_value, int fallback_port) {
+    if (!env_value || !*env_value) return fallback_port;
+    const char* colon = std::strchr(env_value, ':');
+    const char* port_str = colon ? colon + 1 : env_value;
+    char* end = nullptr;
+    long p = std::strtol(port_str, &end, 10);
+    if (end == port_str || p <= 0 || p > 65535) {
+        WN_LOGW("tcp_services: malformed env value \"%s\", falling back to :%d",
+                env_value, fallback_port);
+        return fallback_port;
+    }
+    return static_cast<int>(p);
+}
+
+int bind_listener(int port, const char* svc_name) {
+    int fd = ::socket(AF_INET, SOCK_STREAM, 0);
+    if (fd < 0) {
+        WN_LOGE("tcp_services[%s]: socket() failed: %s", svc_name, std::strerror(errno));
+        return -1;
+    }
+    int one = 1;
+    ::setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+    sockaddr_in addr{};
+    addr.sin_family = AF_INET;
+    addr.sin_port   = htons(static_cast<uint16_t>(port));
+    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);  // 127.0.0.1
+    if (::bind(fd, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) != 0) {
+        WN_LOGE("tcp_services[%s]: bind(127.0.0.1:%d) failed: %s "
+                "(port likely already in use — prebuilt libsteamclient.so "
+                "may still own it from a previous launch cycle)",
+                svc_name, port, std::strerror(errno));
+        ::close(fd);
+        return -1;
+    }
+    if (::listen(fd, 8) != 0) {
+        WN_LOGE("tcp_services[%s]: listen() failed: %s", svc_name, std::strerror(errno));
+        ::close(fd);
+        return -1;
+    }
+    WN_LOGI("tcp_services[%s]: listening on 127.0.0.1:%d (fd=%d)", svc_name, port, fd);
+    return fd;
+}
+
+std::string hex_dump(const uint8_t* buf, size_t n, size_t max_bytes_in_log = 96) {
+    size_t shown = std::min(n, max_bytes_in_log);
+    std::string out;
+    out.reserve(shown * 3 + 16);
+    for (size_t i = 0; i < shown; ++i) {
+        char b[4];
+        std::snprintf(b, sizeof(b), "%02x ", buf[i]);
+        out.append(b);
+    }
+    if (!out.empty()) out.pop_back();  // strip trailing space
+    if (shown < n) {
+        char tail[32];
+        std::snprintf(tail, sizeof(tail), " ...(+%zu B)", n - shown);
+        out.append(tail);
+    }
+    return out;
+}
+
+bool read_exact(int fd, uint8_t* out, size_t n) {
+    size_t got = 0;
+    while (got < n) {
+        ssize_t r = ::recv(fd, out + got, n - got, 0);
+        if (r > 0) { got += static_cast<size_t>(r); continue; }
+        if (r == 0) return false;                       // EOF
+        if (errno == EINTR) continue;
+        return false;                                   // hard error
+    }
+    return true;
+}
+
+void handle_connection(int conn_fd, const char* svc_name) {
+    uint8_t header[4];
+    if (!read_exact(conn_fd, header, sizeof(header))) {
+        WN_LOGI("tcp_services[%s]: conn fd=%d closed before any header",
+                svc_name, conn_fd);
+        ::close(conn_fd);
+        return;
+    }
+    uint32_t first_len =
+        static_cast<uint32_t>(header[0]) |
+        (static_cast<uint32_t>(header[1]) <<  8) |
+        (static_cast<uint32_t>(header[2]) << 16) |
+        (static_cast<uint32_t>(header[3]) << 24);
+    const bool framed = (first_len > 0 && first_len <= 256 * 1024);
+
+    if (!framed) {
+        WN_LOGI("tcp_services[%s]: conn fd=%d raw-stream (first 4B=%s)",
+                svc_name, conn_fd, hex_dump(header, sizeof(header)).c_str());
+        uint8_t chunk[256];
+        for (;;) {
+            ssize_t r = ::recv(conn_fd, chunk, sizeof(chunk), 0);
+            if (r > 0) {
+                WN_LOGI("tcp_services[%s]: conn fd=%d raw %zd B: %s",
+                        svc_name, conn_fd, r,
+                        hex_dump(chunk, static_cast<size_t>(r)).c_str());
+                continue;
+            }
+            if (r < 0 && errno == EINTR) continue;
+            break;
+        }
+        WN_LOGI("tcp_services[%s]: conn fd=%d closed (raw mode)", svc_name, conn_fd);
+        ::close(conn_fd);
+        return;
+    }
+
+    WN_LOGI("tcp_services[%s]: conn fd=%d framed-mode entry, first body=%u B",
+            svc_name, conn_fd, first_len);
+    int frame_idx = 0;
+    uint32_t length = first_len;
+    for (;;) {
+        std::vector<uint8_t> body(length);
+        if (!read_exact(conn_fd, body.data(), length)) {
+            WN_LOGI("tcp_services[%s]: conn fd=%d EOF mid-frame %d (expected %u B)",
+                    svc_name, conn_fd, frame_idx, length);
+            break;
+        }
+        WN_LOGI("tcp_services[%s]: conn fd=%d frame[%d] %u B: %s",
+                svc_name, conn_fd, frame_idx, length,
+                hex_dump(body.data(), body.size()).c_str());
+        ++frame_idx;
+        if (!read_exact(conn_fd, header, sizeof(header))) {
+            WN_LOGI("tcp_services[%s]: conn fd=%d closed cleanly after %d frame(s)",
+                    svc_name, conn_fd, frame_idx);
+            break;
+        }
+        length =
+            static_cast<uint32_t>(header[0]) |
+            (static_cast<uint32_t>(header[1]) <<  8) |
+            (static_cast<uint32_t>(header[2]) << 16) |
+            (static_cast<uint32_t>(header[3]) << 24);
+        if (length == 0 || length > 1024 * 1024) {
+            WN_LOGW("tcp_services[%s]: conn fd=%d unreasonable next-frame "
+                    "length=%u after %d frame(s) — closing", svc_name, conn_fd,
+                    length, frame_idx);
+            break;
+        }
+    }
+    ::close(conn_fd);
+}
+
+void listener_loop(int listen_fd, std::string svc_name) {
+    for (;;) {
+        sockaddr_in peer{};
+        socklen_t plen = sizeof(peer);
+        int conn = ::accept(listen_fd, reinterpret_cast<sockaddr*>(&peer), &plen);
+        if (conn < 0) {
+            if (errno == EINTR) continue;
+            WN_LOGW("tcp_services[%s]: accept() failed: %s — terminating loop "
+                    "(emitting IPCFailure_t kFailurePipeFail)",
+                    svc_name.c_str(), std::strerror(errno));
+            namespace cb = wn_libsteamclient::callbacks;
+            cb::IPCFailure payload{};
+            payload.m_eFailureType = cb::kFailurePipeFail;
+            wn_libsteamclient::push_callback(
+                wn_libsteamclient::state().user.load(),
+                cb::kIPCFailure, &payload, sizeof(payload));
+            break;
+        }
+        g_accepted_count.fetch_add(1, std::memory_order_relaxed);
+        char peer_ip[INET_ADDRSTRLEN] = {0};
+        ::inet_ntop(AF_INET, &peer.sin_addr, peer_ip, sizeof(peer_ip));
+        WN_LOGI("tcp_services[%s]: accepted from %s:%u (conn fd=%d, total=%d)",
+                svc_name.c_str(), peer_ip, ntohs(peer.sin_port),
+                conn, g_accepted_count.load(std::memory_order_relaxed));
+        std::thread(handle_connection, conn, svc_name.c_str()).detach();
+    }
+    ::close(listen_fd);
+}
+
+bool spawn_service(const char* env_key, int fallback_port, const char* svc_name) {
+    int port = parse_port(::getenv(env_key), fallback_port);
+    int fd = bind_listener(port, svc_name);
+    if (fd < 0) return false;
+    std::thread(listener_loop, fd, std::string(svc_name)).detach();
+    g_any_bound.store(true);
+    return true;
+}
+
+void start_tcp_services_once() {
+    bool a = spawn_service("Steam3Master",       57343, "Steam3Master");
+    bool b = spawn_service("SteamClientService", 57344, "SteamClientService");
+    WN_LOGI("tcp_services: Steam3Master=%s SteamClientService=%s",
+            a ? "OK" : "FAIL", b ? "OK" : "FAIL");
+}
+
+}  // namespace
+
+bool start_tcp_services() {
+    std::call_once(g_start_once, start_tcp_services_once);
+    return g_any_bound.load();
+}
+
+int accepted_connection_count() {
+    return g_accepted_count.load(std::memory_order_relaxed);
+}
+
+}  // namespace wn_libsteamclient
diff --git a/app/src/main/cpp/wn-refactor-size/refactorsize.c b/app/src/main/cpp/wn-refactor-size/refactorsize.c
new file mode 100644
index 000000000..c3d64c68b
--- /dev/null
+++ b/app/src/main/cpp/wn-refactor-size/refactorsize.c
@@ -0,0 +1,87 @@
+/* Borderless-fullscreen toggle for the foreground guest window (arg "on"/"off").
+ * Build:
+ *   x86_64-w64-mingw32-windres refactorsize.rc -O coff -o refactorsize.res.o
+ *   x86_64-w64-mingw32-gcc -O2 -s -mwindows refactorsize.c refactorsize.res.o -o ../../assets/winnative/refactorsize.exe -luser32 */
+#include <windows.h>
+#include <stdint.h>
+
+#define STRIP_STYLES (WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME)
+
+typedef struct {
+    unsigned long long hwnd;
+    long style;
+    long left, top, right, bottom;
+} SavedState;
+
+static void state_path(char *buf, int n) {
+    (void)n;
+    lstrcpyA(buf, "C:\\ProgramData\\Microsoft\\Windows\\refactorsize.dat");
+}
+
+static int contains(const char *hay, const char *needle) {
+    if (!hay) return 0;
+    for (; *hay; hay++) {
+        const char *a = hay, *b = needle;
+        while (*b && *a == *b) { a++; b++; }
+        if (!*b) return 1;
+    }
+    return 0;
+}
+
+int APIENTRY WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmd, int show) {
+    char path[MAX_PATH + 32];
+    state_path(path, sizeof(path));
+
+    /* Argument is "on" or "off". Tolerate the exe path being prepended:
+       neither "on" nor "off" occurs in "C:\winnative\refactorsize.exe". */
+    int enable = contains(cmd, "on") && !contains(cmd, "off");
+
+    if (enable) {
+        HWND hwnd = GetForegroundWindow();
+        if (!hwnd) return 1;
+
+        LONG style = GetWindowLong(hwnd, GWL_STYLE);
+        RECT r;
+        GetWindowRect(hwnd, &r);
+
+        SavedState s;
+        s.hwnd = (unsigned long long)(uintptr_t)hwnd;
+        s.style = (long)style;
+        s.left = r.left; s.top = r.top; s.right = r.right; s.bottom = r.bottom;
+
+        CreateDirectoryA("C:\\ProgramData\\Microsoft\\Windows", NULL);
+        HANDLE f = CreateFileA(path, GENERIC_WRITE, 0, NULL,
+                               CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (f != INVALID_HANDLE_VALUE) {
+            DWORD wrote;
+            WriteFile(f, &s, sizeof(s), &wrote, NULL);
+            CloseHandle(f);
+        }
+
+        SetWindowLong(hwnd, GWL_STYLE, style & ~STRIP_STYLES);
+        int sw = GetSystemMetrics(SM_CXSCREEN);
+        int sh = GetSystemMetrics(SM_CYSCREEN);
+        SetWindowPos(hwnd, HWND_TOP, 0, 0, sw, sh,
+                     SWP_FRAMECHANGED | SWP_NOOWNERZORDER | SWP_SHOWWINDOW);
+    } else {
+        HANDLE f = CreateFileA(path, GENERIC_READ, 0, NULL,
+                               OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (f != INVALID_HANDLE_VALUE) {
+            SavedState s;
+            DWORD read = 0;
+            BOOL ok = ReadFile(f, &s, sizeof(s), &read, NULL);
+            CloseHandle(f);
+            if (ok && read == sizeof(s)) {
+                HWND hwnd = (HWND)(uintptr_t)s.hwnd;
+                if (IsWindow(hwnd)) {
+                    SetWindowLong(hwnd, GWL_STYLE, (LONG)s.style);
+                    SetWindowPos(hwnd, HWND_TOP, s.left, s.top,
+                                 s.right - s.left, s.bottom - s.top,
+                                 SWP_FRAMECHANGED | SWP_NOOWNERZORDER | SWP_SHOWWINDOW);
+                }
+            }
+            DeleteFileA(path);
+        }
+    }
+    return 0;
+}
diff --git a/app/src/main/cpp/wn-refactor-size/refactorsize.rc b/app/src/main/cpp/wn-refactor-size/refactorsize.rc
new file mode 100644
index 000000000..6e68ceb93
--- /dev/null
+++ b/app/src/main/cpp/wn-refactor-size/refactorsize.rc
@@ -0,0 +1,29 @@
+#include <windows.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,1,0
+ PRODUCTVERSION 0,1,1,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",      "WinNative"
+            VALUE "FileDescription",  "WinNative Refactor Size"
+            VALUE "FileVersion",      "0.1.1"
+            VALUE "InternalName",     "refactorsize"
+            VALUE "OriginalFilename", "refactorsize.exe"
+            VALUE "ProductName",      "WinNative"
+            VALUE "ProductVersion",   "0.1.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0409, 1200
+    END
+END
diff --git a/app/src/main/cpp/wn-steam-bootstrap/CMakeLists.txt b/app/src/main/cpp/wn-steam-bootstrap/CMakeLists.txt
new file mode 100644
index 000000000..a93ef944c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-bootstrap/CMakeLists.txt
@@ -0,0 +1,45 @@
+# ----------------------------------------------------------------------------
+# wn-steam-bootstrap
+# Small JNI shim that loads Valve's native libsteamclient.so in-process so
+# Wine's lsteamclient.dll (running inside our Proton prefix) has a peer to
+# talk to over the Steam3Master / SteamClientService TCP sockets.
+#
+# This module is intentionally tiny:
+#   • C++20, no third-party deps
+#   • links only `log` (Android logging) and `dl` (dynamic loader)
+#   • the heavy lifting is whatever libsteamclient.so does when we call
+#     setenv() + dlopen() + a small handful of SteamWorks entry points
+#
+# Hidden visibility + section gc + strip in release keep the .so small
+# (a couple of KB) — this is *only* the bridge; the actual Steam logic
+# lives in libsteamclient.so (downloaded/staged at runtime, NOT bundled
+# in jniLibs since it's a Valve binary and we don't redistribute it).
+# ----------------------------------------------------------------------------
+
+cmake_minimum_required(VERSION 3.22.1)
+
+project(WnSteamBootstrap CXX)
+
+add_library(wnsteambootstrap SHARED
+    src/steam_bootstrap.cpp
+)
+
+target_include_directories(wnsteambootstrap PRIVATE include)
+
+target_compile_features(wnsteambootstrap PRIVATE cxx_std_20)
+
+target_compile_options(wnsteambootstrap PRIVATE
+    -Wall -Wextra
+    -fvisibility=hidden
+    -fvisibility-inlines-hidden
+    -fno-asynchronous-unwind-tables
+    -fno-unwind-tables
+    -ffunction-sections
+    -fdata-sections)
+
+target_link_options(wnsteambootstrap PRIVATE
+    -Wl,--gc-sections
+    -Wl,--exclude-libs,ALL
+    "$<$<NOT:$<CONFIG:Debug>>:-Wl,--strip-all>")
+
+target_link_libraries(wnsteambootstrap PRIVATE log dl)
diff --git a/app/src/main/cpp/wn-steam-bootstrap/include/steam_iface.h b/app/src/main/cpp/wn-steam-bootstrap/include/steam_iface.h
new file mode 100644
index 000000000..ed047bfe8
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-bootstrap/include/steam_iface.h
@@ -0,0 +1,133 @@
+#pragma once
+
+// Minimal pure-C++ shim for the subset of the SteamWorks ABI we need to call
+// into libsteamclient.so. The Valve SDK headers (isteamclient.h etc.) are
+// publicly distributed but pull in a large transitive include graph and a
+// dependency on `steam_api.h` which expects to be linked against
+// libsteam_api.so. We don't want that — we want to load libsteamclient.so
+// directly and call its CreateInterface() factory.
+//
+// So we redeclare just the vtables we touch, in the order they appear in
+// Valve's published headers, using opaque pointer types where we don't care
+// about the contents. ABI MUST match Valve's published headers for the
+// interface versions named below — any layout drift will crash on call.
+//
+// Reference: SteamWorks SDK 1.59 (the latest publicly downloadable as of
+// commit time). Interface version strings are matched against Valve's own
+// implementation by the CreateInterface factory; pinning to the version
+// strings below means "use this exact ABI or fail" — much safer than just
+// asking for the newest.
+//
+// What we use the interfaces for:
+//   ISteamClient   — pipe creation + per-interface lookup
+//   ISteamUser     — pre-logon SetLoginInformation + LogOn driving so
+//                    libsteamclient.so reaches LoggedOn state and Wine's
+//                    lsteamclient.dll can issue authed IPC against it
+//   ISteamApps     — GetAppOwnershipTicket pre-warm (PrepareApp path)
+//   ISteamRemoteStorage — per-app SetCloudEnabledForApp toggle
+
+#include <cstdint>
+
+namespace wnsteambs {
+
+using HSteamPipe = int32_t;
+using HSteamUser = int32_t;
+
+enum EAccountType : int {
+    k_EAccountTypeInvalid           = 0,
+    k_EAccountTypeIndividual        = 1,
+    k_EAccountTypeMultiseat         = 2,
+    k_EAccountTypeGameServer        = 3,
+    k_EAccountTypeAnonGameServer    = 4,
+    k_EAccountTypePending           = 5,
+    k_EAccountTypeContentServer     = 6,
+    k_EAccountTypeClan              = 7,
+    k_EAccountTypeChat              = 8,
+    k_EAccountTypeConsoleUser       = 9,
+    k_EAccountTypeAnonUser          = 10,
+};
+
+// Interface version strings — these MUST match what libsteamclient.so
+// implements for CreateInterface to return a non-null pointer.
+constexpr const char* kSteamClient020 = "SteamClient020";
+constexpr const char* kSteamUser023   = "SteamUser023";
+constexpr const char* kSteamApps008   = "STEAMAPPS_INTERFACE_VERSION008";
+constexpr const char* kSteamRemoteStorage016 = "STEAMREMOTESTORAGE_INTERFACE_VERSION016";
+
+// CreateInterface signature exported by libsteamclient.so. Returns a
+// pointer to a vtable-only object (Steam interfaces have no data members
+// the caller needs to peek at).
+using CreateInterfaceFn = void* (*)(const char* version, int* returnCode);
+
+// ISteamClient — only the methods we actually call. The rest of the vtable
+// is irrelevant (we treat the object as opaque between virtual calls).
+class ISteamClient {
+public:
+    virtual HSteamPipe CreateSteamPipe() = 0;
+    virtual bool       BReleaseSteamPipe(HSteamPipe pipe) = 0;
+    virtual HSteamUser ConnectToGlobalUser(HSteamPipe pipe) = 0;
+    virtual HSteamUser CreateLocalUser(HSteamPipe* pipe_out, EAccountType type) = 0;
+    virtual void       ReleaseUser(HSteamPipe pipe, HSteamUser user) = 0;
+    virtual void*      GetISteamUser(HSteamUser user, HSteamPipe pipe, const char* version) = 0;
+    virtual void*      GetISteamGameServer(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void       SetLocalIPBinding(uint32_t ip, uint16_t port) = 0;
+    virtual void*      GetISteamFriends(HSteamUser user, HSteamPipe pipe, const char* version) = 0;
+    virtual void*      GetISteamUtils(HSteamPipe pipe, const char* version) = 0;
+    virtual void*      GetISteamMatchmaking(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void*      GetISteamMatchmakingServers(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void*      GetISteamGenericInterface(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void*      GetISteamUserStats(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void*      GetISteamGameServerStats(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void*      GetISteamApps(HSteamUser user, HSteamPipe pipe, const char* version) = 0;
+    virtual void*      GetISteamNetworking(HSteamUser, HSteamPipe, const char*) = 0;
+    virtual void*      GetISteamRemoteStorage(HSteamUser user, HSteamPipe pipe, const char* version) = 0;
+    // ... rest of vtable is unused by us; we never call past this point so
+    // mismatches in later slots are harmless.
+};
+
+// ISteamUser — drive logon with a refresh token. The exact method names
+// here track the SteamWorks SDK public header for SteamUser023; some method
+// signatures depend on private headers and aren't reproduced verbatim.
+// For 8b.2's *scaffolding* commit we only need GetSteamID + LoggedOn poll;
+// the real logon driving (SetLoginInformation + LogOn) requires private
+// vtable entries and lives in the Phase 8b.3 commit where we'll bring in
+// the SteamWorks SDK header subset.
+class ISteamUser {
+public:
+    virtual HSteamUser GetHSteamUser() = 0;
+    virtual bool       BLoggedOn()     = 0;
+    virtual uint64_t   GetSteamID()    = 0;
+    // ... 30+ more slots; unused by 8b.2.
+};
+
+// ISteamApps — GetAppOwnershipTicket synchronous prewarm.
+class ISteamApps {
+public:
+    virtual bool BIsSubscribed() = 0;
+    virtual bool BIsLowViolence() = 0;
+    virtual bool BIsCybercafe()  = 0;
+    virtual bool BIsVACBanned()  = 0;
+    virtual const char* GetCurrentGameLanguage() = 0;
+    virtual const char* GetAvailableGameLanguages() = 0;
+    virtual bool BIsSubscribedApp(uint32_t app_id) = 0;
+    virtual bool BIsDlcInstalled(uint32_t app_id) = 0;
+    virtual uint32_t GetEarliestPurchaseUnixTime(uint32_t app_id) = 0;
+    virtual bool BIsSubscribedFromFreeWeekend() = 0;
+    virtual int  GetDLCCount(uint32_t app_id) = 0;
+    virtual bool BGetDLCDataByIndex(uint32_t app_id, int index, uint32_t* app_id_out, bool* avail_out, char* name_out, int name_size) = 0;
+    virtual void InstallDLC(uint32_t app_id) = 0;
+    virtual void UninstallDLC(uint32_t app_id) = 0;
+    virtual void RequestAppProofOfPurchaseKey(uint32_t app_id) = 0;
+    virtual bool GetCurrentBetaName(char* name_out, int name_size) = 0;
+    virtual bool MarkContentCorrupt(bool missing_files_only) = 0;
+    virtual uint32_t GetInstalledDepots(uint32_t app_id, uint32_t* depots_out, uint32_t max_depots) = 0;
+    virtual uint32_t GetAppInstallDir(uint32_t app_id, char* folder_out, uint32_t folder_size) = 0;
+    virtual bool BIsAppInstalled(uint32_t app_id) = 0;
+    // ... GetAppOwnershipTicket is further down; we'll lock the offset in 8b.3.
+};
+
+// ISteamRemoteStorage — SetCloudEnabledForApp lives near the top of the
+// vtable in v016 but the exact slot needs the SDK header subset in 8b.3.
+class ISteamRemoteStorage {};
+
+}  // namespace wnsteambs
diff --git a/app/src/main/cpp/wn-steam-bootstrap/src/steam_bootstrap.cpp b/app/src/main/cpp/wn-steam-bootstrap/src/steam_bootstrap.cpp
new file mode 100644
index 000000000..595463c97
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-bootstrap/src/steam_bootstrap.cpp
@@ -0,0 +1,1872 @@
+// wn-steam-bootstrap — JNI bridge that loads Valve's native
+// libsteamclient.so in our Android process so Wine's lsteamclient.dll
+// (running inside the Proton prefix) has a peer to talk to over the
+// Steam3Master / SteamClientService TCP listeners that libsteamclient.so
+// stands up internally when it sees those env vars.
+//
+// JNI surface (mirrors the Kotlin object WnSteamBootstrap.kt):
+//
+//   nativeInit(context, libPath, home, steam3Master, steamClientService,
+//              extraEnv[], accountName, refreshToken, steamId64) → int
+//     0           on success
+//     -1          binary missing at libPath
+//     -2          dlopen failed (see logcat for dlerror)
+//     -3          CreateInterface failed (libsteamclient.so present but
+//                 didn't expose the expected SteamClient020 interface)
+//     -4          steam pipe / global user setup failed
+//
+//   nativeShutdown()                  — tear down the pipe, ReleaseUser
+//   nativePrepareApp(parent, dlcs[])  — kick GetAppOwnershipTicket warmups
+//   nativeSetCloudEnabled(app, on)    — toggle per-app cloud sync
+//
+// Implementation notes:
+//   • setenv() runs BEFORE dlopen() — libsteamclient.so reads the
+//     IPC endpoint env vars (Steam3Master / SteamClientService) at module
+//     init and binds the listening sockets there. Setting them later is a
+//     no-op.
+//   • RTLD_GLOBAL on the dlopen so the loaded .so's exports are visible
+//     to anything else that might later dlopen it (Wine's loader paths
+//     occasionally do).
+//   • All steam-side calls are guarded by g_sc != nullptr — if the
+//     libsteamclient.so binary isn't on disk yet (we don't bundle it),
+//     init returns -1 cleanly and Prepare/Shutdown are no-ops. This lets
+//     the rest of the launcher proceed (game will run without
+//     online-play, DLC checks fail soft) instead of crashing.
+//   • SteamWorks vtable layouts are taken from the public SDK 1.59
+//     headers (steam_iface.h in this module). Drift between SDK versions
+//     would crash on virtual call — pin via interface version strings.
+
+#include <jni.h>
+
+#include <android/log.h>
+
+#include <dlfcn.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <atomic>
+#include <cstring>
+#include <chrono>
+#include <condition_variable>
+#include <map>
+#include <mutex>
+#include <set>
+#include <string>
+#include <thread>
+#include <unistd.h>
+#include <vector>
+
+#include "steam_iface.h"
+
+namespace {
+
+constexpr const char* kLogTag = "WnSteamBoot";
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,  kLogTag, __VA_ARGS__)
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN,  kLogTag, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, kLogTag, __VA_ARGS__)
+
+// State held for the lifetime of the loaded libsteamclient.so.
+//
+// Verified by decompiling the reference embedded-Steam bootstrap with
+// Ghidra (libsteambootstrap.so nativeInit at 0x14a8). The correct dance:
+//
+//   1.  dlopen(libsteamclient.so, RTLD_NOW). Don't bother with explicit
+//       SteamService_StartThread — libsteamclient.so handles steamservice
+//       lifecycle internally (it dlopens steamservice.so itself when it
+//       needs it; we just preload it so the loader namespace knows it).
+//   2.  Steam_CreateGlobalUser(&pipe_out) — flat C function. Creates the
+//       Steam pipe AND connects a global user in one call. Returns the
+//       user handle and fills the pipe out-param. This is the correct
+//       entry point on Android — Steam_CreateSteamPipe() returns 0
+//       because it expects the legacy fork/exec helper-child model.
+//   3.  CreateInterface("CLIENTENGINE_INTERFACE_VERSION005", &err) → engine
+//       This is the internal Valve IClientEngine. Public SteamClient020
+//       interface is unsuitable for the refresh-token login path.
+//   4.  engine->vtable[8](user, pipe) → IClientUser sub-interface
+//          slot 49 (offset 0x188): bool IsAccountLoggedIn(account)
+//          slot 54 (offset 0x1B0): SetLoginInformation(account, password, remember)
+//          slot 56 (offset 0x1C0): LogonWithRefreshToken(refreshToken, account)
+//          slot 50 (offset 0x190): SetAccount(account, 1)        [already-logged path]
+//          slot 1  (offset 0x08): SetSteamID(steamId64)
+//   6.  Poll loop, up to 100×100ms=10s:
+//          drain pending callbacks via Steam_BGetCallback/FreeLastCallback
+//          if Steam_BLoggedOn(pipe, user) — DONE
+struct State {
+    ~State() {
+        pump_running.store(false, std::memory_order_release);
+        if (pump_thread.joinable()) pump_thread.join();
+    }
+
+    std::mutex   mu;
+    void*        lsc_handle  = nullptr;   // libsteamclient.so dlopen handle
+    bool         initialized = false;
+    bool         shutting_down = false;
+
+    // libsteamclient.so flat C entry points (resolved via dlsym).
+    wnsteambs::CreateInterfaceFn fn_CreateInterface = nullptr;
+    int   (*fn_Steam_CreateGlobalUser)(int* pipe_inout)= nullptr;
+    bool  (*fn_Steam_BLoggedOn)(int pipe, int user)    = nullptr;
+    void  (*fn_Steam_LogOff)(int pipe, int user)       = nullptr;
+    void  (*fn_Steam_ReleaseUser)(int pipe, int user)  = nullptr;
+    bool  (*fn_Steam_BReleaseSteamPipe)(int pipe)      = nullptr;
+    bool  (*fn_Steam_BGetCallback)(int pipe, void* cb) = nullptr;
+    void  (*fn_Steam_FreeLastCallback)(int pipe)       = nullptr;
+    void  (*fn_Breakpad_SteamSetAppID)(unsigned app_id)= nullptr;
+
+    // Live pipe + global user handles.
+    int pipe = 0;
+    int user = 0;
+
+    // Cached IClientUser pointer (returned from IClientEngine vtable[8]).
+    // We hold it across the session so prepareApp / setCloudEnabled
+    // can route through the same sub-interface if needed. Owned by
+    // libsteamclient.so — do NOT free.
+    void* iclient_user = nullptr;
+
+    void* steamclient_iface     = nullptr;    // SteamClient020
+    void* isteam_user           = nullptr;    // SteamUser023
+    void* isteam_utils          = nullptr;    // SteamUtils010
+    void* isteam_userstats      = nullptr;    // STEAMUSERSTATS_INTERFACE_VERSION013
+    void* isteam_apps           = nullptr;    // ISteamApps (best matching ver)
+    void* isteam_remotestorage  = nullptr;    // ISteamRemoteStorage (best ver)
+    void* isteam_friends        = nullptr;    // ISteamFriends (best matching ver)
+    const char* isteam_apps_ver = nullptr;
+    const char* isteam_rs_ver   = nullptr;
+    const char* isteam_friends_ver = nullptr;
+
+    uint64_t cached_steam_id = 0;
+
+    // Every env key nativeInit setenv()'d, recorded so nativeShutdown
+    // can unsetenv() them. Otherwise a bionic→real-Steam mode switch in
+    // the same process inherits leaked WINESTEAMCLIENTPATH / Steam3Master /
+    // SteamUser etc. into the real-Steam wine subprocess.
+    std::vector<std::string> applied_env_keys;
+
+    // Persistent callback pump. libsteamclient.so's logon — and every
+    // later Steam API round-trip the game makes — is message-driven: it
+    // only advances while something drains Steam_BGetCallback. start()'s
+    // 10s poll does that during init, but the session must keep being
+    // pumped while initialized. nativeShutdown stops and joins the thread
+    // before clearing the libsteamclient function pointers.
+    std::atomic<bool> pump_running{false};
+    std::thread       pump_thread;
+
+    std::condition_variable                  cv_callback;
+    std::set<int>                            subscribed_ids;
+    std::map<int, std::vector<uint8_t>>      received_callbacks;
+};
+State g_state;
+
+// IClientEngine vtable slots we call (offsets in bytes; aarch64 ABI has
+// 8-byte fn ptrs). All confirmed by Ghidra decomp of reference bootstrap.
+constexpr int kVtClientEngine_GetIClientUser = 0x40;   // returns sub-iface
+
+constexpr int kVtClientUser_SetSteamID          = 0x08;
+constexpr int kVtClientUser_IsAccountLoggedIn   = 0x188; // bool IsAccountLoggedIn(const char*)
+constexpr int kVtClientUser_SetAccount          = 0x190; // (already-logged path)
+constexpr int kVtClientUser_SetLoginInformation = 0x1B0; // (account, "", remember)
+constexpr int kVtClientUser_LogonWithRefresh    = 0x1C0; // 2-arg (refreshToken, account)
+
+// Persistent callback-pump loop. Runs on a detached thread for the
+// lifetime of the process: libsteamclient.so only advances its logon
+// state machine — and processes every later Steam API response — while
+// Steam_BGetCallback is being drained. start()'s init poll does this for
+// the first 10s; this thread takes over so the session does not stall
+// the moment start() returns (the bug that left Bionic games offline).
+void callback_pump_loop() {
+    char cb_buf[64] = {0};   // CallbackMsg_t header; 64 is safe headroom
+    bool announced_logon = false;
+    int  ticks           = 0;
+    int  cb_logged       = 0;
+    while (g_state.pump_running.load(std::memory_order_acquire)) {
+        if (g_state.fn_Steam_BGetCallback && g_state.fn_Steam_FreeLastCallback) {
+            while (g_state.fn_Steam_BGetCallback(g_state.pipe, cb_buf)) {
+                int   cb_id   = *reinterpret_cast<int*>(cb_buf + 4);
+                void* cb_data = *reinterpret_cast<void**>(cb_buf + 8);
+                int   cb_size = *reinterpret_cast<int*>(cb_buf + 16);
+                if (cb_logged < 120) {
+                    LOGI("pump callback id=%d size=%d", cb_id, cb_size);
+                    ++cb_logged;
+                }
+                bool wake = false;
+                {
+                    std::lock_guard<std::mutex> lk(g_state.mu);
+                    if (g_state.subscribed_ids.count(cb_id)) {
+                        auto& slot = g_state.received_callbacks[cb_id];
+                        if (cb_data && cb_size > 0) {
+                            slot.assign(
+                                reinterpret_cast<const uint8_t*>(cb_data),
+                                reinterpret_cast<const uint8_t*>(cb_data) + cb_size);
+                        } else {
+                            slot.clear();
+                        }
+                        wake = true;
+                    }
+                }
+                if (wake) g_state.cv_callback.notify_all();
+                g_state.fn_Steam_FreeLastCallback(g_state.pipe);
+            }
+        }
+        // Announce the logon transition so the launch log shows whether
+        // the session ever authenticates after start() returns.
+        if (!announced_logon && g_state.fn_Steam_BLoggedOn &&
+            g_state.fn_Steam_BLoggedOn(g_state.pipe, g_state.user)) {
+            announced_logon = true;
+            LOGI("callback pump: session is now LOGGED ON (after %d ticks)",
+                 ticks);
+        }
+        ++ticks;
+        ::usleep(20 * 1000);   // ~50Hz, matching the Steam client's tick
+    }
+}
+
+// Helper: pull a UTF-8 String from a jstring without leaking on the
+// throw-path. Returns empty string for null.
+std::string jstr(JNIEnv* env, jstring s) {
+    if (!s) return {};
+    const char* c = env->GetStringUTFChars(s, nullptr);
+    if (!c) return {};
+    std::string out(c);
+    env->ReleaseStringUTFChars(s, c);
+    return out;
+}
+
+std::string android_files_dir(JNIEnv* env, jobject context) {
+    if (!context) return {};
+    jclass ctxCls = env->GetObjectClass(context);
+    if (!ctxCls) return {};
+    jmethodID mGetFilesDir =
+        env->GetMethodID(ctxCls, "getFilesDir", "()Ljava/io/File;");
+    env->DeleteLocalRef(ctxCls);
+    if (!mGetFilesDir) return {};
+    jobject fileObj = env->CallObjectMethod(context, mGetFilesDir);
+    if (!fileObj) return {};
+    std::string out;
+    jclass fileCls = env->GetObjectClass(fileObj);
+    if (fileCls) {
+        jmethodID mGetPath =
+            env->GetMethodID(fileCls, "getAbsolutePath", "()Ljava/lang/String;");
+        if (mGetPath) {
+            jstring js = static_cast<jstring>(
+                env->CallObjectMethod(fileObj, mGetPath));
+            out = jstr(env, js);
+            if (js) env->DeleteLocalRef(js);
+        }
+        env->DeleteLocalRef(fileCls);
+    }
+    env->DeleteLocalRef(fileObj);
+    return out;
+}
+
+// Apply a Java String[] of "KEY=value" pairs (or alternating key/value
+// slots, depending on the Kotlin convention we settled on) via setenv().
+// We accept both shapes: if a slot contains '=' we split on the first one,
+// otherwise we pair slot i (key) with slot i+1 (value).
+void apply_extra_env(JNIEnv* env, jobjectArray array) {
+    if (!array) return;
+    jsize n = env->GetArrayLength(array);
+    for (jsize i = 0; i < n; ++i) {
+        jstring slot = static_cast<jstring>(env->GetObjectArrayElement(array, i));
+        if (!slot) continue;
+        std::string s = jstr(env, slot);
+        env->DeleteLocalRef(slot);
+        if (s.empty()) continue;
+        auto eq = s.find('=');
+        if (eq != std::string::npos && eq > 0) {
+            std::string k = s.substr(0, eq);
+            std::string v = s.substr(eq + 1);
+            ::setenv(k.c_str(), v.c_str(), /*overwrite*/ 1);
+            g_state.applied_env_keys.push_back(k);
+            LOGI("setenv %s=%s", k.c_str(), v.c_str());
+        }
+    }
+}
+
+// Try to dlopen the staged libsteamclient.so at libPath. Returns null on
+// failure — caller logs and bails. RTLD_GLOBAL so subsequent dlopens
+// (Wine's loader poking around our process) can see its exports.
+void* try_dlopen(const std::string& libPath) {
+    if (::access(libPath.c_str(), R_OK) != 0) {
+        LOGW("libsteamclient.so not present at %s; skipping native load. "
+             "Online-play / overlay features will be unavailable; basic "
+             "launch paths still work via our PICS / ticket cache.",
+             libPath.c_str());
+        return nullptr;
+    }
+    // RTLD_NOW resolves all symbols up front so we crash here (with a
+    // diagnostic) instead of crashing later on a missing virtual.
+    void* h = ::dlopen(libPath.c_str(), RTLD_NOW | RTLD_GLOBAL);
+    if (!h) {
+        LOGE("dlopen(%s) failed: %s", libPath.c_str(), ::dlerror());
+    }
+    return h;
+}
+
+// libsteamclient.so does NOT statically NEED its siblings — readelf shows
+// only libandroid/liblog/libm/libdl/libc in its NEEDED list. It dlopens
+// steamservice.so, libsteamnetworkingsockets.so, libtier0_s.so and
+// libvstdlib_s.so internally. On Android the app's restricted linker
+// namespace won't find them under /data/.../imagefs/usr/lib/ unless we
+// either (a) set LD_LIBRARY_PATH (honored by Bionic's loader inside the
+// app namespace) or (b) preload them with RTLD_GLOBAL so they're already
+// in the global symbol table when libsteamclient.so calls dlopen.
+//
+// Belt + suspenders: do both. Sibling preload order matters — tier0 first
+// (base layer), then vstdlib (depends on tier0), then networking sockets +
+// steamservice (depend on the lower two). Each failure is logged but
+// non-fatal: libsteamclient.so might still init in a degraded mode.
+void preload_steam_runtime_siblings(const std::string& lib_dir) {
+    constexpr const char* kSiblings[] = {
+        "libtier0_s.so",
+        "libvstdlib_s.so",
+        "libsteamnetworkingsockets.so",
+        "steamservice.so",
+    };
+    for (const char* name : kSiblings) {
+        std::string path = lib_dir + "/" + name;
+        if (::access(path.c_str(), R_OK) != 0) {
+            LOGW("preload skip: %s not present", path.c_str());
+            continue;
+        }
+        void* h = ::dlopen(path.c_str(), RTLD_NOW | RTLD_GLOBAL);
+        if (h) {
+            LOGI("preload OK:  %s", path.c_str());
+        } else {
+            LOGW("preload FAIL: %s — %s", path.c_str(), ::dlerror());
+        }
+    }
+}
+
+// Return the directory portion of a path (everything before the last '/').
+// Falls back to "." when no slash is found.
+std::string dirname_of(const std::string& path) {
+    auto slash = path.rfind('/');
+    if (slash == std::string::npos) return ".";
+    return path.substr(0, slash);
+}
+
+// Create a directory + every missing parent. mkdir(2) doesn't recurse; we
+// walk the path char-by-char and mkdir each component. Existing dirs are
+// not an error. Failures other than EEXIST are logged.
+void mkdir_p(const std::string& path, mode_t mode) {
+    std::string acc;
+    acc.reserve(path.size());
+    for (size_t i = 0; i <= path.size(); ++i) {
+        if (i == path.size() || path[i] == '/') {
+            if (acc.empty()) { if (i < path.size()) acc.push_back(path[i]); continue; }
+            if (::mkdir(acc.c_str(), mode) != 0 && errno != EEXIST) {
+                LOGW("mkdir(%s) failed: %s", acc.c_str(), std::strerror(errno));
+            }
+        }
+        if (i < path.size()) acc.push_back(path[i]);
+    }
+}
+
+// Stage the Steam config dir + empty config/local VDFs. libsteamclient.so's
+// CreateSteamPipe path stats <HOME>/Steam/config/{config,local}.vdf at
+// init; missing files cause it to bail without an obvious error. Other
+// embedded-Steam bootstraps symlink session files in from a persistence
+// dir — we just create empty stubs so the stat succeeds. Whatever ends up
+// in them is governed by libsteamclient.so itself once it starts writing.
+void stage_steam_config_dir(const std::string& home) {
+    if (home.empty()) return;
+    const std::string steam_dir  = home + "/Steam";
+    const std::string config_dir = steam_dir + "/config";
+    mkdir_p(steam_dir,  0755);
+    mkdir_p(config_dir, 0755);
+    for (const char* name : {"config.vdf", "local.vdf"}) {
+        std::string p = config_dir + "/" + name;
+        struct stat st{};
+        if (::stat(p.c_str(), &st) == 0) continue;   // already there
+        int fd = ::open(p.c_str(), O_WRONLY | O_CREAT | O_CLOEXEC, 0644);
+        if (fd < 0) {
+            LOGW("create %s failed: %s", p.c_str(), std::strerror(errno));
+        } else {
+            ::close(fd);
+            LOGI("staged empty %s", p.c_str());
+        }
+    }
+}
+
+}  // namespace
+
+// =============================================================================
+// JNI entry points — names match Kotlin's @JvmStatic external fun convention
+// =============================================================================
+extern "C" {
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeInit(
+        JNIEnv* env, jclass /*cls*/, jobject context,
+        jstring jlibPath, jstring jhome,
+        jstring jsteam3Master, jstring jsteamClientService,
+        jobjectArray jextraEnv,
+        jstring jaccountName, jstring jrefreshToken, jlong jsteamId64,
+        jint jappId) {
+    std::unique_lock<std::mutex> lk(g_state.mu);
+    if (g_state.shutting_down) {
+        LOGW("nativeInit: shutdown in progress");
+        return -6;
+    }
+    if (g_state.initialized) {
+        LOGI("nativeInit: already initialized (lsc=%p pipe=%d user=%d)",
+             g_state.lsc_handle, g_state.pipe, g_state.user);
+        return 0;
+    }
+
+    const std::string libPath  = jstr(env, jlibPath);
+    const std::string home     = jstr(env, jhome);
+    const std::string s3m      = jstr(env, jsteam3Master);
+    const std::string scs      = jstr(env, jsteamClientService);
+    const std::string user     = jstr(env, jaccountName);
+    const std::string token    = jstr(env, jrefreshToken);
+    const uint64_t    steamId  = static_cast<uint64_t>(jsteamId64);
+    g_state.cached_steam_id = steamId;
+
+    LOGI("nativeInit: libPath=%s home=%s steam3Master=%s "
+         "steamClientService=%s user=%s tokenLen=%zu steamId=%llu",
+         libPath.c_str(), home.c_str(), s3m.c_str(), scs.c_str(),
+         user.c_str(), token.size(),
+         static_cast<unsigned long long>(steamId));
+
+    // ---- setenv pass BEFORE dlopen ----
+    // applied_env_keys accumulates every key we setenv() in this init so
+    // nativeShutdown can unsetenv() them on teardown.
+    g_state.applied_env_keys.clear();
+    apply_extra_env(env, jextraEnv);
+    if (!home.empty()) {
+        ::setenv("HOME", home.c_str(), 1);
+        g_state.applied_env_keys.emplace_back("HOME");
+        std::string state_dir = "/tmp";
+        if (home.size() >= 5 && home.compare(home.size() - 5, 5, "/home") == 0) {
+            state_dir = home.substr(0, home.size() - 4) + "tmp";
+        } else if (auto slash = home.rfind("/home/"); slash != std::string::npos) {
+            state_dir = home.substr(0, slash) + "/tmp";
+        }
+        ::mkdir(state_dir.c_str(), 0755);  // best-effort; ok if exists
+        ::setenv("WN_STATE_DIR", state_dir.c_str(), 1);
+        g_state.applied_env_keys.emplace_back("WN_STATE_DIR");
+        LOGI("nativeInit: WN_STATE_DIR=%s", state_dir.c_str());
+    }
+    if (!s3m.empty()) {
+        ::setenv("Steam3Master", s3m.c_str(), 1);
+        g_state.applied_env_keys.emplace_back("Steam3Master");
+    }
+    if (jappId > 0) {
+        char app_buf[16];
+        std::snprintf(app_buf, sizeof(app_buf), "%d", static_cast<int>(jappId));
+        ::setenv("SteamAppId",  app_buf, 1);
+        ::setenv("SteamGameId", app_buf, 1);
+        g_state.applied_env_keys.emplace_back("SteamAppId");
+        g_state.applied_env_keys.emplace_back("SteamGameId");
+        LOGI("nativeInit: SteamAppId=%s (caller-supplied)", app_buf);
+    } else {
+        LOGI("nativeInit: appId=0 — no SteamAppId env set "
+             "(library/prewarm mode; ISteamApps/ISteamRemoteStorage/"
+             "ISteamUserStats will instantiate as null)");
+    }
+    if (!scs.empty()) {
+        ::setenv("SteamClientService", scs.c_str(), 1);
+        g_state.applied_env_keys.emplace_back("SteamClientService");
+    }
+
+    if (!::getenv("STEAM_SSL_CERT_FILE")) {
+        const std::string files_dir = android_files_dir(env, context);
+        if (!files_dir.empty()) {
+            const std::string ca = files_dir + "/wnsteam_cacert.pem";
+            struct stat st{};
+            if (::stat(ca.c_str(), &st) == 0 && st.st_size > 0) {
+                ::setenv("STEAM_SSL_CERT_FILE", ca.c_str(), 1);
+                g_state.applied_env_keys.emplace_back("STEAM_SSL_CERT_FILE");
+                LOGI("setenv STEAM_SSL_CERT_FILE=%s", ca.c_str());
+            } else {
+                LOGW("STEAM_SSL_CERT_FILE not set: %s missing/empty — call "
+                     "CaBundleExtractor.ensureBundle() before start() or "
+                     "libsteamclient.so TLS logon may fail", ca.c_str());
+            }
+        }
+    }
+
+    // LD_LIBRARY_PATH — honored by Bionic for in-namespace dlopens. The
+    // path is the parent of libPath (everything libsteamclient.so will
+    // dlopen lives next to it).
+    const std::string lib_dir = dirname_of(libPath);
+    ::setenv("LD_LIBRARY_PATH", lib_dir.c_str(), 1);
+    g_state.applied_env_keys.emplace_back("LD_LIBRARY_PATH");
+    LOGI("setenv LD_LIBRARY_PATH=%s", lib_dir.c_str());
+
+    // Preload runtime siblings with RTLD_GLOBAL so libsteamclient.so's
+    // later internal dlopens find them in the global symbol namespace.
+    preload_steam_runtime_siblings(lib_dir);
+
+    // Stage <HOME>/Steam/config/{config,local}.vdf as empty files.
+    // libsteamclient.so's CreateSteamPipe path stat's these and bails
+    // without an obvious error when missing. Other embedded-Steam
+    // bootstraps symlink real session-state files in; empty stubs are
+    // enough for the stat to succeed on a fresh launch.
+    stage_steam_config_dir(home);
+
+    // -------------------------------------------------------------------
+    //
+    typedef void* (*SteamService_StartThread_fn)(const char*);
+    auto svc_start = reinterpret_cast<SteamService_StartThread_fn>(
+        ::dlsym(RTLD_DEFAULT, "SteamService_StartThread"));
+    if (svc_start) {
+        void* svc_ctx = svc_start("SteamClientService");
+        LOGI("SteamService_StartThread(\"SteamClientService\") -> %p", svc_ctx);
+    } else {
+        LOGW("SteamService_StartThread symbol not in global namespace — "
+             "preload may have failed; wine guest may crash on CreateInterface");
+    }
+
+    // -------------------------------------------------------------------
+    void* lsc = try_dlopen(libPath);
+    if (!lsc) return -1;
+    LOGI("dlopen(libsteamclient.so) OK handle=%p", lsc);
+
+    g_state.fn_CreateInterface = reinterpret_cast<wnsteambs::CreateInterfaceFn>(
+        ::dlsym(lsc, "CreateInterface"));
+    g_state.fn_Steam_CreateGlobalUser = reinterpret_cast<int(*)(int*)>(
+        ::dlsym(lsc, "Steam_CreateGlobalUser"));
+    g_state.fn_Steam_BLoggedOn = reinterpret_cast<bool(*)(int, int)>(
+        ::dlsym(lsc, "Steam_BLoggedOn"));
+    g_state.fn_Steam_LogOff = reinterpret_cast<void(*)(int, int)>(
+        ::dlsym(lsc, "Steam_LogOff"));
+    g_state.fn_Steam_ReleaseUser = reinterpret_cast<void(*)(int, int)>(
+        ::dlsym(lsc, "Steam_ReleaseUser"));
+    g_state.fn_Steam_BReleaseSteamPipe = reinterpret_cast<bool(*)(int)>(
+        ::dlsym(lsc, "Steam_BReleaseSteamPipe"));
+    g_state.fn_Steam_BGetCallback = reinterpret_cast<bool(*)(int, void*)>(
+        ::dlsym(lsc, "Steam_BGetCallback"));
+    g_state.fn_Steam_FreeLastCallback = reinterpret_cast<void(*)(int)>(
+        ::dlsym(lsc, "Steam_FreeLastCallback"));
+    g_state.fn_Breakpad_SteamSetAppID = reinterpret_cast<void(*)(unsigned)>(
+        ::dlsym(lsc, "Breakpad_SteamSetAppID"));
+
+    if (!g_state.fn_CreateInterface || !g_state.fn_Steam_CreateGlobalUser) {
+        LOGE("dlsym of required entry points failed: CreateInterface=%p "
+             "Steam_CreateGlobalUser=%p",
+             reinterpret_cast<void*>(g_state.fn_CreateInterface),
+             reinterpret_cast<void*>(g_state.fn_Steam_CreateGlobalUser));
+        return -3;
+    }
+    LOGI("dlsym OK: CreateInterface=%p Steam_CreateGlobalUser=%p "
+         "Steam_BLoggedOn=%p Steam_ReleaseUser=%p "
+         "Steam_BReleaseSteamPipe=%p Steam_BGetCallback=%p",
+         reinterpret_cast<void*>(g_state.fn_CreateInterface),
+         reinterpret_cast<void*>(g_state.fn_Steam_CreateGlobalUser),
+         reinterpret_cast<void*>(g_state.fn_Steam_BLoggedOn),
+         reinterpret_cast<void*>(g_state.fn_Steam_ReleaseUser),
+         reinterpret_cast<void*>(g_state.fn_Steam_BReleaseSteamPipe),
+         reinterpret_cast<void*>(g_state.fn_Steam_BGetCallback));
+
+    if (g_state.fn_Breakpad_SteamSetAppID) {
+        g_state.fn_Breakpad_SteamSetAppID(0);
+    }
+
+    // -------------------------------------------------------------------
+    // STEP 2 — Steam_CreateGlobalUser. Creates the Steam pipe AND
+    // connects the global user in one call. This is the correct entry
+    // point on Android; Steam_CreateSteamPipe()'s legacy fork/exec
+    // helper-child path returns 0 here.
+    // -------------------------------------------------------------------
+    int pipe_out = 0;
+    int user_h   = g_state.fn_Steam_CreateGlobalUser(&pipe_out);
+    if (user_h == 0 || pipe_out == 0) {
+        LOGE("Steam_CreateGlobalUser failed: user=%d pipe_out=%d",
+             user_h, pipe_out);
+        return -4;
+    }
+    LOGI("Steam_CreateGlobalUser OK pipe=%d user=%d", pipe_out, user_h);
+
+    g_state.lsc_handle  = lsc;
+    g_state.pipe        = pipe_out;
+    g_state.user        = user_h;
+    g_state.initialized = true;
+
+    // -------------------------------------------------------------------
+    // STEP 3 — Refresh-token login via IClientEngine (optional).
+    //
+    //   CreateInterface("CLIENTENGINE_INTERFACE_VERSION005", &err)  → engine
+    //   IClientUser_vt:
+    //
+    // If we don't have credentials, libsteamclient.so will sit at
+    // "connected but not logged on" — Wine IPC still functions for the
+    // non-authenticated SteamWorks calls.
+    // -------------------------------------------------------------------
+    if (!user.empty() && !token.empty() && steamId != 0) {
+        int err = 0;
+        void* engine = g_state.fn_CreateInterface(
+            "CLIENTENGINE_INTERFACE_VERSION005", &err);
+        if (engine && err == 0) {
+            // vtable pointer is the first 8 bytes of the object.
+            long* engine_vt = *reinterpret_cast<long**>(engine);
+
+            // engine_vt[8] = GetIClientUser(user, pipe).
+            using GetIClientUserFn = void* (*)(void*, int, int);
+            auto get_iclient_user = reinterpret_cast<GetIClientUserFn>(
+                engine_vt[kVtClientEngine_GetIClientUser / 8]);
+            void* iuser = get_iclient_user(engine, user_h, pipe_out);
+            LOGI("IClientEngine.GetIClientUser(user=%d, pipe=%d) -> %p",
+                 user_h, pipe_out, iuser);
+
+            if (iuser) {
+                g_state.iclient_user = iuser;
+                long* iuser_vt = *reinterpret_cast<long**>(iuser);
+
+                using IsAccountLoggedInFn = bool (*)(void*, const char*);
+                auto is_logged = reinterpret_cast<IsAccountLoggedInFn>(
+                    iuser_vt[kVtClientUser_IsAccountLoggedIn / 8]);
+                bool already = is_logged(iuser, user.c_str());
+                LOGI("IClientUser.IsAccountLoggedIn(%s) = %d", user.c_str(),
+                     already ? 1 : 0);
+
+                bool auto_logged_on = false;
+                if (already && g_state.fn_Steam_BLoggedOn) {
+                    constexpr int kAutoPollMax = 30;          // 30 × 100ms = 3s
+                    for (int i = 0; i < kAutoPollMax; ++i) {
+                        if (g_state.fn_Steam_BLoggedOn(g_state.pipe, g_state.user)) {
+                            auto_logged_on = true;
+                            LOGI("Auto-logon from cached session OK after %dx100ms — "
+                                 "skipping forced LogonWithRefreshToken (avoids the "
+                                 "stale-token AccessDenied)", i + 1);
+                            break;
+                        }
+                        ::usleep(100 * 1000);
+                    }
+                }
+                using SetSteamIDFn = void (*)(void*, uint64_t);
+                auto set_sid = reinterpret_cast<SetSteamIDFn>(
+                    iuser_vt[kVtClientUser_SetSteamID / 8]);
+                if (auto_logged_on) {
+                    set_sid(iuser, steamId);
+                    LOGI("IClientUser.SetSteamID(%llu) called (post auto-logon)",
+                         static_cast<unsigned long long>(steamId));
+                } else {
+                    LOGI("No cached session usable; driving forced "
+                         "LogonWithRefreshToken with the stored token "
+                         "(account-known=%d)", already ? 1 : 0);
+
+                    using SetLoginInfoFn = void (*)(void*, const char*, const char*, int);
+                    auto set_login = reinterpret_cast<SetLoginInfoFn>(
+                        iuser_vt[kVtClientUser_SetLoginInformation / 8]);
+                    set_login(iuser, user.c_str(), "", 1);
+                    LOGI("IClientUser.SetLoginInformation(%s, \"\", 1) called",
+                         user.c_str());
+
+                    using LogonRefreshFn = void (*)(void*, const char*, const char*);
+                    auto logon = reinterpret_cast<LogonRefreshFn>(
+                        iuser_vt[kVtClientUser_LogonWithRefresh / 8]);
+                    logon(iuser, token.c_str(), user.c_str());
+                    LOGI("IClientUser.LogonWithRefreshToken called (token=%zu bytes)",
+                         token.size());
+
+                    set_sid(iuser, steamId);
+                    LOGI("IClientUser.SetSteamID(%llu) called",
+                         static_cast<unsigned long long>(steamId));
+                }
+            }
+        } else {
+            LOGW("CreateInterface(CLIENTENGINE_INTERFACE_VERSION005) -> %p (err=%d)",
+                 engine, err);
+        }
+    } else {
+        LOGI("no credentials provided - skipping refresh-token login");
+    }
+
+    // -------------------------------------------------------------------
+    // STEP 4 — Poll Steam_BLoggedOn until logged on (up to 10s). Drain
+    // pending callbacks between polls so libsteamclient.so can process
+    // server responses + state transitions.
+    // -------------------------------------------------------------------
+    constexpr int kMaxPolls = 100;
+    constexpr int kPollUsec = 100 * 1000;   // 100ms each
+    bool logged_on = false;
+    int  polls = 0;
+    char cb_buf[64] = {0};   // CCallbackBase header; 64 is safe
+    for (; polls < kMaxPolls; ++polls) {
+        if (g_state.fn_Steam_BGetCallback && g_state.fn_Steam_FreeLastCallback) {
+            while (g_state.fn_Steam_BGetCallback(pipe_out, cb_buf)) {
+                // CallbackMsg_t: m_hSteamUser@0, m_iCallback@4. The id tells
+                // us where the logon stalls (101 SteamServersConnected,
+                // 102 SteamServerConnectFailure, 113 SteamServersDisconnected,
+                // 3 LogonResponse-class, etc.).
+                int cb_id = *reinterpret_cast<int*>(cb_buf + 4);
+                // CallbackMsg_t: m_pubParam (the typed payload) @ offset 8.
+                // id 102 = SteamServerConnectFailure_t { EResult m_eResult;
+                // bool m_bStillRetrying; } — its EResult says network (3 =
+                // NoConnection / 16 = Timeout) vs auth (5 InvalidPassword,
+                // 6 LoggedInElsewhere, 7 InvalidProtocolVer, 65 Expired...).
+                if (cb_id == 102) {
+                    void* p = *reinterpret_cast<void**>(cb_buf + 8);
+                    LOGE("init-poll: SteamServerConnectFailure EResult=%d retrying=%d",
+                         p ? *reinterpret_cast<int*>(p) : -1,
+                         p ? *reinterpret_cast<unsigned char*>(
+                                 reinterpret_cast<char*>(p) + 4) : 0);
+                } else {
+                    LOGI("init-poll callback id=%d", cb_id);
+                }
+                g_state.fn_Steam_FreeLastCallback(pipe_out);
+            }
+        }
+        if (g_state.fn_Steam_BLoggedOn &&
+            g_state.fn_Steam_BLoggedOn(pipe_out, user_h)) {
+            logged_on = true;
+            break;
+        }
+        ::usleep(kPollUsec);
+    }
+    LOGI("Steam_BLoggedOn poll: logged_on=%d after %dx100ms",
+         logged_on ? 1 : 0, polls);
+
+    // Hand off to the persistent callback pump. The init poll above ran
+    // single-threaded; only now that it has finished is it safe to let a
+    // background thread own Steam_BGetCallback. Without this the logon
+    // stalls the moment start() returns — Bionic games launch but never
+    // authenticate (online play / DLC stay broken).
+    if (!g_state.pump_running.exchange(true, std::memory_order_acq_rel)) {
+        if (g_state.pump_thread.joinable()) g_state.pump_thread.join();
+        g_state.pump_thread = std::thread(callback_pump_loop);
+        LOGI("callback pump thread started (libsteamclient session kept live)");
+        using StartFn = void (*)(void);
+        auto start = reinterpret_cast<StartFn>(
+            ::dlsym(g_state.lsc_handle, "wn_cm_bridge_start_state_sync_poller"));
+        if (start != nullptr) {
+            start();
+            LOGI("cross-process state-sync poller started");
+        } else {
+            LOGW("wn_cm_bridge_start_state_sync_poller not found: %s",
+                 ::dlerror());
+        }
+    }
+
+    {
+        int sc_err = 0;
+        void* steamclient = g_state.fn_CreateInterface("SteamClient020", &sc_err);
+        LOGI("Stage2: CreateInterface(SteamClient020) -> %p err=%d logged_on=%d",
+             steamclient, sc_err, logged_on ? 1 : 0);
+        if (steamclient && sc_err == 0) {
+            g_state.steamclient_iface     = nullptr;
+            g_state.isteam_user           = nullptr;
+            g_state.isteam_utils          = nullptr;
+            g_state.isteam_userstats      = nullptr;
+            g_state.isteam_apps           = nullptr;
+            g_state.isteam_remotestorage  = nullptr;
+            g_state.isteam_friends        = nullptr;
+            g_state.isteam_apps_ver       = nullptr;
+            g_state.isteam_rs_ver         = nullptr;
+            g_state.isteam_friends_ver    = nullptr;
+
+            g_state.steamclient_iface = steamclient;
+            long* sc_vt = *reinterpret_cast<long**>(steamclient);
+
+            using GetUtilsFn = void* (*)(void*, int, const char*);
+            auto get_utils = reinterpret_cast<GetUtilsFn>(sc_vt[9]);
+            g_state.isteam_utils = get_utils(steamclient, pipe_out, "SteamUtils010");
+            LOGI("Stage2: ISteamClient.GetISteamUtils(SteamUtils010) -> %p",
+                 g_state.isteam_utils);
+
+            using GetUserFn = void* (*)(void*, int, int, const char*);
+            auto get_user = reinterpret_cast<GetUserFn>(sc_vt[5]);
+            g_state.isteam_user = get_user(steamclient, user_h, pipe_out,
+                                           "SteamUser023");
+            LOGI("Stage2: ISteamClient.GetISteamUser(SteamUser023) -> %p",
+                 g_state.isteam_user);
+
+            using GetStatsFn = void* (*)(void*, int, int, const char*);
+            auto get_stats = reinterpret_cast<GetStatsFn>(sc_vt[13]);
+            g_state.isteam_userstats = get_stats(
+                steamclient, user_h, pipe_out,
+                "STEAMUSERSTATS_INTERFACE_VERSION013");
+            LOGI("Stage2: ISteamClient.GetISteamUserStats(v013) -> %p",
+                 g_state.isteam_userstats);
+
+            using GetAppsFn = void* (*)(void*, int, int, const char*);
+            auto get_apps = reinterpret_cast<GetAppsFn>(sc_vt[14]);
+            for (const char* v : {"STEAMAPPS_INTERFACE_VERSION009",
+                                  "STEAMAPPS_INTERFACE_VERSION008",
+                                  "STEAMAPPS_INTERFACE_VERSION007"}) {
+                void* o = get_apps(steamclient, user_h, pipe_out, v);
+                LOGI("Stage2:   GetISteamApps(\"%s\") -> %p", v, o);
+                if (o) {
+                    g_state.isteam_apps     = o;
+                    g_state.isteam_apps_ver = v;
+                    break;
+                }
+            }
+            LOGI("Stage2: ISteamClient.GetISteamApps WINNER -> %p ver=%s",
+                 g_state.isteam_apps,
+                 g_state.isteam_apps_ver ? g_state.isteam_apps_ver : "(none)");
+
+            using GetRSFn = void* (*)(void*, int, int, const char*);
+            auto get_rs = reinterpret_cast<GetRSFn>(sc_vt[16]);
+            for (const char* v : {"STEAMREMOTESTORAGE_INTERFACE_VERSION016",
+                                  "STEAMREMOTESTORAGE_INTERFACE_VERSION014"}) {
+                void* o = get_rs(steamclient, user_h, pipe_out, v);
+                LOGI("Stage2:   GetISteamRemoteStorage(\"%s\") -> %p", v, o);
+                if (o) {
+                    g_state.isteam_remotestorage = o;
+                    g_state.isteam_rs_ver        = v;
+                    break;
+                }
+            }
+            LOGI("Stage2: ISteamClient.GetISteamRemoteStorage WINNER -> %p ver=%s",
+                 g_state.isteam_remotestorage,
+                 g_state.isteam_rs_ver ? g_state.isteam_rs_ver : "(none)");
+
+            using GetFriendsFn = void* (*)(void*, int, int, const char*);
+            auto get_friends = reinterpret_cast<GetFriendsFn>(sc_vt[8]);
+            for (const char* v : {"SteamFriends017",
+                                  "SteamFriends018",
+                                  "SteamFriends015"}) {
+                void* o = get_friends(steamclient, user_h, pipe_out, v);
+                LOGI("Stage2:   GetISteamFriends(\"%s\") -> %p", v, o);
+                if (o) {
+                    g_state.isteam_friends     = o;
+                    g_state.isteam_friends_ver = v;
+                    break;
+                }
+            }
+            LOGI("Stage2: ISteamClient.GetISteamFriends WINNER -> %p ver=%s",
+                 g_state.isteam_friends,
+                 g_state.isteam_friends_ver ? g_state.isteam_friends_ver : "(none)");
+
+            if (!logged_on && g_state.isteam_userstats) {
+                LOGW("Stage2: NULLING isteam_userstats (got non-null %p but "
+                     "logon failed — half-baked iface would SIGSEGV)",
+                     g_state.isteam_userstats);
+                g_state.isteam_userstats = nullptr;
+            }
+
+            if (g_state.isteam_apps) {
+                long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+                using BIsSubAppFn = bool (*)(void*, unsigned int);
+                auto is_sub_app = reinterpret_cast<BIsSubAppFn>(apps_vt[6]);
+                const unsigned probe = jappId > 0
+                    ? static_cast<unsigned>(jappId)
+                    : 242760u;
+                bool owns = is_sub_app(g_state.isteam_apps, probe);
+                LOGI("Stage2: ISteamApps.BIsSubscribedApp(%u) = %d", probe, owns ? 1 : 0);
+            }
+            if (g_state.isteam_user) {
+                long* u_vt = *reinterpret_cast<long**>(g_state.isteam_user);
+                using GetSteamIDFn = uint64_t (*)(void*);
+                auto get_sid = reinterpret_cast<GetSteamIDFn>(u_vt[2]);
+                uint64_t live_sid = get_sid(g_state.isteam_user);
+                LOGI("Stage2: ISteamUser.GetSteamID() = %llu (prefmgr=%llu, "
+                     "match=%d)",
+                     static_cast<unsigned long long>(live_sid),
+                     static_cast<unsigned long long>(g_state.cached_steam_id),
+                     live_sid == g_state.cached_steam_id ? 1 : 0);
+            }
+            if (g_state.isteam_utils) {
+                long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+                using GetAppIDFn = uint32_t (*)(void*);
+                auto get_app_id = reinterpret_cast<GetAppIDFn>(utils_vt[9]);
+                uint32_t live_app = get_app_id(g_state.isteam_utils);
+                LOGI("Stage2: ISteamUtils.GetAppID() = %u", live_app);
+            }
+            if (g_state.isteam_friends) {
+                long* fr_vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+                using NameFn  = const char* (*)(void*);
+                using StateFn = int (*)(void*);
+                using CountFn = int (*)(void*, int);
+                auto get_name  = reinterpret_cast<NameFn>(fr_vt[0]);
+                auto get_state = reinterpret_cast<StateFn>(fr_vt[2]);
+                auto get_count = reinterpret_cast<CountFn>(fr_vt[3]);
+                const char* name = get_name(g_state.isteam_friends);
+                int         st   = get_state(g_state.isteam_friends);
+                int         fcount = get_count(g_state.isteam_friends, 0x4);
+                LOGI("Stage2: ISteamFriends.GetPersonaName=\"%s\" "
+                     "GetPersonaState=%d GetFriendCount(immediate)=%d",
+                     name ? name : "(null)", st, fcount);
+            }
+            if (g_state.isteam_remotestorage) {
+                long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+                using GetCountFn   = int  (*)(void*);
+                using GetQuotaFn   = void (*)(void*, uint64_t*, uint64_t*);
+                using CloudAcctFn  = bool (*)(void*);
+                using CloudAppFn   = bool (*)(void*);
+                auto get_count    = reinterpret_cast<GetCountFn>(rs_vt[18]);
+                auto get_quota    = reinterpret_cast<GetQuotaFn>(rs_vt[20]);
+                auto cloud_acct   = reinterpret_cast<CloudAcctFn>(rs_vt[21]);
+                auto cloud_app    = reinterpret_cast<CloudAppFn>(rs_vt[22]);
+                int files = get_count(g_state.isteam_remotestorage);
+                uint64_t total = 0, avail = 0;
+                get_quota(g_state.isteam_remotestorage, &total, &avail);
+                bool on_acct = cloud_acct(g_state.isteam_remotestorage);
+                bool on_app  = cloud_app(g_state.isteam_remotestorage);
+                LOGI("Stage2: ISteamRemoteStorage cloud_account=%d cloud_app=%d "
+                     "file_count=%d quota_total=%llu avail=%llu",
+                     on_acct ? 1 : 0, on_app ? 1 : 0, files,
+                     static_cast<unsigned long long>(total),
+                     static_cast<unsigned long long>(avail));
+            }
+            if (g_state.isteam_userstats && logged_on) {
+                long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+                using ReqFn       = bool     (*)(void*);
+                using GetNumAchFn = uint32_t (*)(void*);
+                auto req_stats = reinterpret_cast<ReqFn>(us_vt[0]);
+                auto get_n     = reinterpret_cast<GetNumAchFn>(us_vt[14]);
+                constexpr int kUserStatsReceived = 1101;
+                g_state.subscribed_ids.insert(kUserStatsReceived);
+                g_state.received_callbacks.erase(kUserStatsReceived);
+                bool req_ok = req_stats(g_state.isteam_userstats);
+                LOGI("Stage2: ISteamUserStats.RequestCurrentStats() = %d",
+                     req_ok ? 1 : 0);
+                auto deadline = std::chrono::steady_clock::now()
+                              + std::chrono::seconds(3);
+                g_state.cv_callback.wait_until(lk, deadline, [&] {
+                    return g_state.received_callbacks.count(kUserStatsReceived) > 0;
+                });
+                uint32_t n = get_n(g_state.isteam_userstats);
+                LOGI("Stage2: ISteamUserStats.GetNumAchievements() = %u "
+                     "(UserStatsReceived_t %s)",
+                     n,
+                     g_state.received_callbacks.count(kUserStatsReceived)
+                         ? "arrived" : "TIMEOUT");
+            }
+        }
+    }
+
+    return 0;
+}
+
+// True iff libsteamclient.so is loaded AND Steam_BLoggedOn reports the
+// pipe+user as authenticated. Cheap synchronous call — safe from any thread.
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeIsLoggedOn(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.fn_Steam_BLoggedOn) return JNI_FALSE;
+    return g_state.fn_Steam_BLoggedOn(g_state.pipe, g_state.user)
+        ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeGetSteamId(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized) return 0;
+    return static_cast<jlong>(g_state.cached_steam_id);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeBIsSubscribedApp(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized) {
+        LOGW("nativeBIsSubscribedApp(%d): not initialized", appId);
+        return JNI_FALSE;
+    }
+    if (!g_state.isteam_apps) {
+        LOGW("nativeBIsSubscribedApp(%d): ISteamApps not cached "
+             "(auth-gated — needs a logged-on session)", appId);
+        return JNI_FALSE;
+    }
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using BIsSubAppFn = bool (*)(void*, unsigned int);
+    auto is_sub_app = reinterpret_cast<BIsSubAppFn>(apps_vt[6]);
+    const bool owns = is_sub_app(g_state.isteam_apps,
+                                 static_cast<unsigned int>(appId));
+    return owns ? JNI_TRUE : JNI_FALSE;
+}
+
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsBIsAppInstalled(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return JNI_FALSE;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using BIsInstFn = bool (*)(void*, unsigned int);
+    auto is_inst = reinterpret_cast<BIsInstFn>(apps_vt[19]);
+    return is_inst(g_state.isteam_apps,
+                   static_cast<unsigned int>(appId)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetAppInstallDir(
+        JNIEnv* env, jclass /*cls*/, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return nullptr;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using GetDirFn = uint32_t (*)(void*, unsigned int, char*, uint32_t);
+    auto get_dir = reinterpret_cast<GetDirFn>(apps_vt[18]);
+    char buf[1024] = {0};
+    uint32_t n = get_dir(g_state.isteam_apps,
+                         static_cast<unsigned int>(appId),
+                         buf, sizeof(buf));
+    if (n == 0) return nullptr;
+    return env->NewStringUTF(buf);
+}
+
+JNIEXPORT jintArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetInstalledDepots(
+        JNIEnv* env, jclass /*cls*/, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return env->NewIntArray(0);
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using GetDepFn = uint32_t (*)(void*, unsigned int, unsigned int*, uint32_t);
+    auto get_dep = reinterpret_cast<GetDepFn>(apps_vt[17]);
+    unsigned int depots[64] = {0};
+    uint32_t n = get_dep(g_state.isteam_apps,
+                         static_cast<unsigned int>(appId),
+                         depots, 64);
+    if (n > 64) n = 64;
+    jintArray out = env->NewIntArray(static_cast<jsize>(n));
+    if (!out) return nullptr;
+    if (n > 0) {
+        env->SetIntArrayRegion(out, 0, static_cast<jsize>(n),
+                               reinterpret_cast<const jint*>(depots));
+    }
+    return out;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetCurrentGameLanguage(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return nullptr;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using GetLangFn = const char* (*)(void*);
+    auto get_lang = reinterpret_cast<GetLangFn>(apps_vt[4]);
+    const char* v = get_lang(g_state.isteam_apps);
+    return (v && *v) ? env->NewStringUTF(v) : nullptr;
+}
+
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsBIsDlcInstalled(
+        JNIEnv* /*env*/, jclass /*cls*/, jint dlcAppId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return JNI_FALSE;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using DlcInstFn = bool (*)(void*, unsigned int);
+    auto dlc_inst = reinterpret_cast<DlcInstFn>(apps_vt[7]);
+    return dlc_inst(g_state.isteam_apps,
+                    static_cast<unsigned int>(dlcAppId)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetEarliestPurchaseUnixTime(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return 0;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using PurchaseFn = uint32_t (*)(void*, unsigned int);
+    auto purchase = reinterpret_cast<PurchaseFn>(apps_vt[8]);
+    return static_cast<jint>(purchase(g_state.isteam_apps,
+                                      static_cast<unsigned int>(appId)));
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetDLCCount(
+        JNIEnv* /*env*/, jclass /*cls*/, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return 0;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using DlcCountFn = int (*)(void*, unsigned int);
+    auto dlc_count = reinterpret_cast<DlcCountFn>(apps_vt[10]);
+    return static_cast<jint>(dlc_count(g_state.isteam_apps,
+                                       static_cast<unsigned int>(appId)));
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetAppOwner(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return 0;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using GetOwnerFn = uint64_t (*)(void*);
+    auto get_owner = reinterpret_cast<GetOwnerFn>(apps_vt[20]);
+    return static_cast<jlong>(get_owner(g_state.isteam_apps));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsBIsSubscribedFromFamilySharing(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return JNI_FALSE;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using FamShareFn = bool (*)(void*);
+    auto fam_share = reinterpret_cast<FamShareFn>(apps_vt[27]);
+    return fam_share(g_state.isteam_apps) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamAppsGetAppBuildId(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_apps) return 0;
+    long* apps_vt = *reinterpret_cast<long**>(g_state.isteam_apps);
+    using BuildIdFn = int (*)(void*);
+    auto build_id = reinterpret_cast<BuildIdFn>(apps_vt[23]);
+    return static_cast<jint>(build_id(g_state.isteam_apps));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserBLoggedOn(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_user) return JNI_FALSE;
+    long* u_vt = *reinterpret_cast<long**>(g_state.isteam_user);
+    using BLoggedFn = bool (*)(void*);
+    auto bl = reinterpret_cast<BLoggedFn>(u_vt[1]);
+    return bl(g_state.isteam_user) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserHasLicenseForApp(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong steamId64, jint appId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_user) return 2; // no-auth
+    long* u_vt = *reinterpret_cast<long**>(g_state.isteam_user);
+    using HasLicFn = int (*)(void*, uint64_t, unsigned int);
+    auto hl = reinterpret_cast<HasLicFn>(u_vt[18]);
+    return static_cast<jint>(hl(g_state.isteam_user,
+                                static_cast<uint64_t>(steamId64),
+                                static_cast<unsigned int>(appId)));
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserGetSteamID(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_user) return 0;
+    long* u_vt = *reinterpret_cast<long**>(g_state.isteam_user);
+    using GetSteamIDFn = uint64_t (*)(void*);
+    auto get_sid = reinterpret_cast<GetSteamIDFn>(u_vt[2]);
+    return static_cast<jlong>(get_sid(g_state.isteam_user));
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetAppID(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_utils) return 0;
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using GetAppIDFn = uint32_t (*)(void*);
+    auto get_app_id = reinterpret_cast<GetAppIDFn>(utils_vt[9]);
+    return static_cast<jint>(get_app_id(g_state.isteam_utils));
+}
+
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetServerRealTime(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_utils) return 0;
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using TimeFn = uint32_t (*)(void*);
+    auto get_time = reinterpret_cast<TimeFn>(utils_vt[3]);
+    return static_cast<jint>(get_time(g_state.isteam_utils));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetIPCountry(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_utils) return nullptr;
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using CountryFn = const char* (*)(void*);
+    auto get_country = reinterpret_cast<CountryFn>(utils_vt[4]);
+    const char* v = get_country(g_state.isteam_utils);
+    return (v && *v) ? env->NewStringUTF(v) : nullptr;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetSteamUILanguage(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_utils) return nullptr;
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using LangFn = const char* (*)(void*);
+    auto get_lang = reinterpret_cast<LangFn>(utils_vt[23]);
+    const char* v = get_lang(g_state.isteam_utils);
+    return (v && *v) ? env->NewStringUTF(v) : nullptr;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetCurrentBatteryPower(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_utils) return 255;  // assume AC
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using BatteryFn = uint8_t (*)(void*);
+    auto get_battery = reinterpret_cast<BatteryFn>(utils_vt[8]);
+    return static_cast<jint>(get_battery(g_state.isteam_utils));
+}
+
+JNIEXPORT jintArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetImageSize(
+        JNIEnv* env, jclass /*cls*/, jint imageHandle) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    jintArray out = env->NewIntArray(2);
+    if (!out) return nullptr;
+    if (!g_state.initialized || !g_state.isteam_utils || imageHandle <= 0) return out;
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using SizeFn = bool (*)(void*, int, uint32_t*, uint32_t*);
+    auto get_size = reinterpret_cast<SizeFn>(utils_vt[5]);
+    uint32_t w = 0, h = 0;
+    if (get_size(g_state.isteam_utils, imageHandle, &w, &h)) {
+        jint values[2] = { static_cast<jint>(w), static_cast<jint>(h) };
+        env->SetIntArrayRegion(out, 0, 2, values);
+    }
+    return out;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUtilsGetImageRGBA(
+        JNIEnv* env, jclass /*cls*/, jint imageHandle, jbyteArray outRgba) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_utils || !outRgba || imageHandle <= 0) {
+        return JNI_FALSE;
+    }
+    jsize n = env->GetArrayLength(outRgba);
+    if (n <= 0) return JNI_FALSE;
+    long* utils_vt = *reinterpret_cast<long**>(g_state.isteam_utils);
+    using RGBAFn = bool (*)(void*, int, uint8_t*, int);
+    auto get_rgba = reinterpret_cast<RGBAFn>(utils_vt[6]);
+    jbyte* buf = env->GetByteArrayElements(outRgba, nullptr);
+    if (!buf) return JNI_FALSE;
+    bool ok = get_rgba(g_state.isteam_utils, imageHandle,
+                       reinterpret_cast<uint8_t*>(buf), static_cast<int>(n));
+    env->ReleaseByteArrayElements(outRgba, buf, 0);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageGetFileCount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage) return 0;
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using GetCountFn = int (*)(void*);
+    auto get_count = reinterpret_cast<GetCountFn>(rs_vt[18]);
+    return static_cast<jint>(get_count(g_state.isteam_remotestorage));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageIsCloudEnabledForAccount(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage) return JNI_FALSE;
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using CloudFn = bool (*)(void*);
+    auto cloud = reinterpret_cast<CloudFn>(rs_vt[21]);
+    return cloud(g_state.isteam_remotestorage) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageIsCloudEnabledForApp(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage) return JNI_FALSE;
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using CloudFn = bool (*)(void*);
+    auto cloud = reinterpret_cast<CloudFn>(rs_vt[22]);
+    return cloud(g_state.isteam_remotestorage) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jlongArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageGetQuota(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    jlongArray out = env->NewLongArray(2);
+    if (!out) return nullptr;
+    if (g_state.initialized && g_state.isteam_remotestorage) {
+        long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+        using GetQuotaFn = void (*)(void*, uint64_t*, uint64_t*);
+        auto get_quota = reinterpret_cast<GetQuotaFn>(rs_vt[20]);
+        uint64_t total = 0, avail = 0;
+        get_quota(g_state.isteam_remotestorage, &total, &avail);
+        jlong values[2] = { static_cast<jlong>(total), static_cast<jlong>(avail) };
+        env->SetLongArrayRegion(out, 0, 2, values);
+    }
+    return out;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsRequestCurrentStats(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats) return JNI_FALSE;
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using ReqFn = bool (*)(void*);
+    auto req = reinterpret_cast<ReqFn>(us_vt[0]);
+    return req(g_state.isteam_userstats) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsGetNumAchievements(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats) return 0;
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using GetNumFn = uint32_t (*)(void*);
+    auto n = reinterpret_cast<GetNumFn>(us_vt[14]);
+    return static_cast<jint>(n(g_state.isteam_userstats));
+}
+
+
+JNIEXPORT jobjectArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageListFiles(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    jclass strCls = env->FindClass("java/lang/String");
+    if (!g_state.initialized || !g_state.isteam_remotestorage) {
+        return env->NewObjectArray(0, strCls, nullptr);
+    }
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using GetCountFn = int (*)(void*);
+    using GetNameSizeFn = const char* (*)(void*, int, int32_t*);
+    auto get_count = reinterpret_cast<GetCountFn>(rs_vt[18]);
+    auto get_ns    = reinterpret_cast<GetNameSizeFn>(rs_vt[19]);
+    int n = get_count(g_state.isteam_remotestorage);
+    if (n < 0) n = 0;
+    jobjectArray out = env->NewObjectArray(n, strCls, nullptr);
+    if (!out) return nullptr;
+    for (int i = 0; i < n; ++i) {
+        int32_t size = 0;
+        const char* name = get_ns(g_state.isteam_remotestorage, i, &size);
+        if (!name) name = "";
+        char buf[1024];
+        std::snprintf(buf, sizeof(buf), "%s\t%d", name, size);
+        jstring js = env->NewStringUTF(buf);
+        env->SetObjectArrayElement(out, i, js);
+        env->DeleteLocalRef(js);
+    }
+    return out;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageFileExists(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using ExistsFn = bool (*)(void*, const char*);
+    auto exists = reinterpret_cast<ExistsFn>(rs_vt[13]);
+    return exists(g_state.isteam_remotestorage, name.c_str()) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jbyteArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageFileRead(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage || !jname) return nullptr;
+    std::string name = jstr(env, jname);
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using GetSizeFn = int32_t (*)(void*, const char*);
+    using FileReadFn = int32_t (*)(void*, const char*, void*, int32_t);
+    auto get_size  = reinterpret_cast<GetSizeFn>(rs_vt[15]);
+    auto file_read = reinterpret_cast<FileReadFn>(rs_vt[1]);
+    int32_t size = get_size(g_state.isteam_remotestorage, name.c_str());
+    if (size <= 0) return nullptr;
+    jbyteArray out = env->NewByteArray(size);
+    if (!out) return nullptr;
+    jbyte* buf = env->GetByteArrayElements(out, nullptr);
+    if (!buf) return nullptr;
+    int32_t read = file_read(g_state.isteam_remotestorage, name.c_str(),
+                             buf, size);
+    env->ReleaseByteArrayElements(out, buf, 0);
+    if (read != size) {
+        return nullptr;
+    }
+    return out;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageFileWrite(
+        JNIEnv* env, jclass /*cls*/, jstring jname, jbyteArray jdata) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage || !jname || !jdata) {
+        return JNI_FALSE;
+    }
+    std::string name = jstr(env, jname);
+    jsize n = env->GetArrayLength(jdata);
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using FileWriteFn = bool (*)(void*, const char*, const void*, int32_t);
+    auto file_write = reinterpret_cast<FileWriteFn>(rs_vt[0]);
+    jbyte* buf = env->GetByteArrayElements(jdata, nullptr);
+    if (!buf) return JNI_FALSE;
+    bool ok = file_write(g_state.isteam_remotestorage, name.c_str(),
+                         buf, static_cast<int32_t>(n));
+    env->ReleaseByteArrayElements(jdata, buf, JNI_ABORT);
+    return ok ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageFileDelete(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using DeleteFn = bool (*)(void*, const char*);
+    auto file_del = reinterpret_cast<DeleteFn>(rs_vt[6]);
+    return file_del(g_state.isteam_remotestorage, name.c_str()) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamRemoteStorageSetCloudEnabledForApp(
+        JNIEnv* /*env*/, jclass /*cls*/, jboolean enabled) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_remotestorage) return;
+    long* rs_vt = *reinterpret_cast<long**>(g_state.isteam_remotestorage);
+    using SetEnabledFn = void (*)(void*, bool);
+    auto set_en = reinterpret_cast<SetEnabledFn>(rs_vt[23]);
+    set_en(g_state.isteam_remotestorage, enabled == JNI_TRUE);
+}
+
+
+JNIEXPORT jobjectArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsListAchievements(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    jclass strCls = env->FindClass("java/lang/String");
+    if (!g_state.initialized || !g_state.isteam_userstats) {
+        return env->NewObjectArray(0, strCls, nullptr);
+    }
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using GetNumFn  = uint32_t (*)(void*);
+    using GetNameFn = const char* (*)(void*, uint32_t);
+    auto get_n    = reinterpret_cast<GetNumFn>(us_vt[14]);
+    auto get_name = reinterpret_cast<GetNameFn>(us_vt[15]);
+    uint32_t n = get_n(g_state.isteam_userstats);
+    jobjectArray out = env->NewObjectArray(static_cast<jsize>(n), strCls, nullptr);
+    if (!out) return nullptr;
+    for (uint32_t i = 0; i < n; ++i) {
+        const char* name = get_name(g_state.isteam_userstats, i);
+        if (!name) name = "";
+        jstring js = env->NewStringUTF(name);
+        env->SetObjectArrayElement(out, static_cast<jsize>(i), js);
+        env->DeleteLocalRef(js);
+    }
+    return out;
+}
+
+JNIEXPORT jintArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsGetAchievementAndUnlockTime(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    jintArray out = env->NewIntArray(2);
+    if (!out) return nullptr;
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return out;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using GetAchUtFn = bool (*)(void*, const char*, bool*, uint32_t*);
+    auto get_aut = reinterpret_cast<GetAchUtFn>(us_vt[9]);
+    bool achieved = false;
+    uint32_t unlock_time = 0;
+    bool ok = get_aut(g_state.isteam_userstats, name.c_str(),
+                      &achieved, &unlock_time);
+    if (!ok) return out;
+    jint values[2] = { achieved ? 1 : 0, static_cast<jint>(unlock_time) };
+    env->SetIntArrayRegion(out, 0, 2, values);
+    return out;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsSetAchievement(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using SetAchFn = bool (*)(void*, const char*);
+    auto set_ach = reinterpret_cast<SetAchFn>(us_vt[7]);
+    return set_ach(g_state.isteam_userstats, name.c_str()) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsClearAchievement(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using ClrAchFn = bool (*)(void*, const char*);
+    auto clr_ach = reinterpret_cast<ClrAchFn>(us_vt[8]);
+    return clr_ach(g_state.isteam_userstats, name.c_str()) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsStoreStats(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats) return JNI_FALSE;
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using StoreFn = bool (*)(void*);
+    auto store = reinterpret_cast<StoreFn>(us_vt[10]);
+    return store(g_state.isteam_userstats) ? JNI_TRUE : JNI_FALSE;
+}
+
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsGetStatInt(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return 0;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using GetStatIFn = bool (*)(void*, const char*, int32_t*);
+    auto get_stat = reinterpret_cast<GetStatIFn>(us_vt[1]);
+    int32_t data = 0;
+    if (!get_stat(g_state.isteam_userstats, name.c_str(), &data)) return 0;
+    return static_cast<jint>(data);
+}
+
+JNIEXPORT jfloat JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsGetStatFloat(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return 0.0f;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using GetStatFFn = bool (*)(void*, const char*, float*);
+    auto get_stat = reinterpret_cast<GetStatFFn>(us_vt[2]);
+    float data = 0.0f;
+    if (!get_stat(g_state.isteam_userstats, name.c_str(), &data)) return 0.0f;
+    return static_cast<jfloat>(data);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsSetStatInt(
+        JNIEnv* env, jclass /*cls*/, jstring jname, jint jdata) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using SetStatIFn = bool (*)(void*, const char*, int32_t);
+    auto set_stat = reinterpret_cast<SetStatIFn>(us_vt[3]);
+    return set_stat(g_state.isteam_userstats, name.c_str(),
+                    static_cast<int32_t>(jdata)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsSetStatFloat(
+        JNIEnv* env, jclass /*cls*/, jstring jname, jfloat jdata) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using SetStatFFn = bool (*)(void*, const char*, float);
+    auto set_stat = reinterpret_cast<SetStatFFn>(us_vt[4]);
+    return set_stat(g_state.isteam_userstats, name.c_str(),
+                    static_cast<float>(jdata)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsUpdateAvgRateStat(
+        JNIEnv* env, jclass /*cls*/, jstring jname,
+        jfloat jcountThisSession, jdouble jsessionLength) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return JNI_FALSE;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using UpdateRateFn = bool (*)(void*, const char*, float, double);
+    auto upd = reinterpret_cast<UpdateRateFn>(us_vt[5]);
+    return upd(g_state.isteam_userstats, name.c_str(),
+               static_cast<float>(jcountThisSession),
+               static_cast<double>(jsessionLength)) ? JNI_TRUE : JNI_FALSE;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsGetAchievementDisplayAttribute(
+        JNIEnv* env, jclass /*cls*/, jstring jname, jstring jkey) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname || !jkey) return nullptr;
+    std::string name = jstr(env, jname);
+    std::string key  = jstr(env, jkey);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using GetAttrFn = const char* (*)(void*, const char*, const char*);
+    auto get_attr = reinterpret_cast<GetAttrFn>(us_vt[12]);
+    const char* v = get_attr(g_state.isteam_userstats, name.c_str(), key.c_str());
+    if (!v || !*v) return nullptr;
+    return env->NewStringUTF(v);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamUserStatsGetAchievementIcon(
+        JNIEnv* env, jclass /*cls*/, jstring jname) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_userstats || !jname) return 0;
+    std::string name = jstr(env, jname);
+    long* us_vt = *reinterpret_cast<long**>(g_state.isteam_userstats);
+    using IconFn = int (*)(void*, const char*);
+    auto icon = reinterpret_cast<IconFn>(us_vt[11]);
+    return static_cast<jint>(icon(g_state.isteam_userstats, name.c_str()));
+}
+
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamFriendsGetPersonaName(
+        JNIEnv* env, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_friends) return nullptr;
+    long* vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+    using NameFn = const char* (*)(void*);
+    auto get_name = reinterpret_cast<NameFn>(vt[0]);
+    const char* n = get_name(g_state.isteam_friends);
+    return (n && *n) ? env->NewStringUTF(n) : nullptr;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamFriendsGetPersonaState(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_friends) return 0;  // 0=Offline
+    long* vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+    using StateFn = int (*)(void*);
+    auto get_state = reinterpret_cast<StateFn>(vt[2]);
+    return static_cast<jint>(get_state(g_state.isteam_friends));
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamFriendsGetFriendCount(
+        JNIEnv* /*env*/, jclass /*cls*/, jint flags) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_friends) return 0;
+    long* vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+    using CountFn = int (*)(void*, int);
+    auto get_count = reinterpret_cast<CountFn>(vt[3]);
+    return static_cast<jint>(get_count(g_state.isteam_friends,
+                                       static_cast<int>(flags)));
+}
+
+JNIEXPORT jlongArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamFriendsListFriends(
+        JNIEnv* env, jclass /*cls*/, jint flags) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_friends) return env->NewLongArray(0);
+    long* vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+    using CountFn = int (*)(void*, int);
+    using ByIdxFn = uint64_t (*)(void*, int, int);
+    auto get_count = reinterpret_cast<CountFn>(vt[3]);
+    auto get_byidx = reinterpret_cast<ByIdxFn>(vt[4]);
+    int n = get_count(g_state.isteam_friends, static_cast<int>(flags));
+    if (n < 0) n = 0;
+    jlongArray out = env->NewLongArray(n);
+    if (!out || n == 0) return out;
+    for (int i = 0; i < n; ++i) {
+        uint64_t sid = get_byidx(g_state.isteam_friends, i,
+                                 static_cast<int>(flags));
+        jlong v = static_cast<jlong>(sid);
+        env->SetLongArrayRegion(out, i, 1, &v);
+    }
+    return out;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamFriendsGetFriendPersonaName(
+        JNIEnv* env, jclass /*cls*/, jlong steamId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_friends) return nullptr;
+    long* vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+    using FNameFn = const char* (*)(void*, uint64_t);
+    auto get_fname = reinterpret_cast<FNameFn>(vt[7]);
+    const char* n = get_fname(g_state.isteam_friends,
+                              static_cast<uint64_t>(steamId));
+    return (n && *n) ? env->NewStringUTF(n) : nullptr;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeISteamFriendsGetFriendPersonaState(
+        JNIEnv* /*env*/, jclass /*cls*/, jlong steamId) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    if (!g_state.initialized || !g_state.isteam_friends) return 0;
+    long* vt = *reinterpret_cast<long**>(g_state.isteam_friends);
+    using FStateFn = int (*)(void*, uint64_t);
+    auto get_fstate = reinterpret_cast<FStateFn>(vt[6]);
+    return static_cast<jint>(get_fstate(g_state.isteam_friends,
+                                        static_cast<uint64_t>(steamId)));
+}
+
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeSubscribeCallback(
+        JNIEnv* /*env*/, jclass /*cls*/, jint id) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    g_state.subscribed_ids.insert(static_cast<int>(id));
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeUnsubscribeCallback(
+        JNIEnv* /*env*/, jclass /*cls*/, jint id) {
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    g_state.subscribed_ids.erase(static_cast<int>(id));
+    g_state.received_callbacks.erase(static_cast<int>(id));
+}
+
+JNIEXPORT jbyteArray JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeAwaitCallback(
+        JNIEnv* env, jclass /*cls*/, jint id, jint timeoutMs) {
+    std::unique_lock<std::mutex> lk(g_state.mu);
+    const int cb_id = static_cast<int>(id);
+    g_state.subscribed_ids.insert(cb_id);
+    auto deadline = std::chrono::steady_clock::now()
+                  + std::chrono::milliseconds(std::max<jint>(0, timeoutMs));
+    bool got = g_state.cv_callback.wait_until(lk, deadline, [&] {
+        return g_state.received_callbacks.count(cb_id) > 0
+            || !g_state.initialized
+            || g_state.shutting_down;
+    });
+    if (!got) return nullptr;
+    auto it = g_state.received_callbacks.find(cb_id);
+    if (it == g_state.received_callbacks.end()) return nullptr;
+    std::vector<uint8_t> payload = std::move(it->second);
+    g_state.received_callbacks.erase(it);
+    lk.unlock();
+    jbyteArray out = env->NewByteArray(static_cast<jsize>(payload.size()));
+    if (!out) return nullptr;
+    if (!payload.empty()) {
+        env->SetByteArrayRegion(out, 0, static_cast<jsize>(payload.size()),
+                                reinterpret_cast<const jbyte*>(payload.data()));
+    }
+    return out;
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeShutdown(
+        JNIEnv* /*env*/, jclass /*cls*/) {
+    std::thread pump_thread;
+    void* lsc_handle = nullptr;
+    {
+        std::lock_guard<std::mutex> lk(g_state.mu);
+        if (!g_state.initialized) return;
+        g_state.shutting_down = true;
+        // Make concurrent JNI entry points fail fast while the pump thread is
+        // being joined outside the global lock.
+        g_state.initialized = false;
+        g_state.pump_running.store(false, std::memory_order_release);
+        lsc_handle = g_state.lsc_handle;
+        if (g_state.pump_thread.joinable()) {
+            pump_thread = std::move(g_state.pump_thread);
+        }
+        g_state.cv_callback.notify_all();
+    }
+    if (pump_thread.joinable()) pump_thread.join();
+    if (lsc_handle) {
+        using StopFn = void (*)(void);
+        ::dlerror();
+        auto stop = reinterpret_cast<StopFn>(
+            ::dlsym(lsc_handle, "wn_cm_bridge_stop_state_sync_poller"));
+        if (stop != nullptr) {
+            stop();
+            LOGI("cross-process state-sync poller stopped");
+        } else {
+            const char* err = ::dlerror();
+            LOGW("wn_cm_bridge_stop_state_sync_poller not found: %s",
+                 err ? err : "symbol missing");
+        }
+    }
+
+    std::lock_guard<std::mutex> lk(g_state.mu);
+    // Tear down in reverse order of init: log off the user, release the
+    // global user, then drop the pipe. We don't dlclose libsteamclient.so — it leaves background
+    // threads that crash on unload (the same pattern every embedded
+    // Steam launcher we surveyed follows).
+    if (g_state.fn_Steam_LogOff && g_state.user != 0 && g_state.pipe != 0) {
+        g_state.fn_Steam_LogOff(g_state.pipe, g_state.user);
+        LOGI("nativeShutdown: Steam_LogOff(pipe=%d, user=%d)",
+             g_state.pipe, g_state.user);
+    }
+    if (g_state.user != 0 && g_state.pipe != 0) {
+        if (g_state.fn_Steam_ReleaseUser) {
+            g_state.fn_Steam_ReleaseUser(g_state.pipe, g_state.user);
+            LOGI("nativeShutdown: Steam_ReleaseUser(pipe=%d, user=%d)",
+                 g_state.pipe, g_state.user);
+        } else if (g_state.steamclient_iface) {
+            auto* steamclient =
+                reinterpret_cast<wnsteambs::ISteamClient*>(g_state.steamclient_iface);
+            steamclient->ReleaseUser(g_state.pipe, g_state.user);
+            LOGI("nativeShutdown: ISteamClient.ReleaseUser(pipe=%d, user=%d)",
+                 g_state.pipe, g_state.user);
+        } else {
+            LOGW("nativeShutdown: no ReleaseUser entry point available");
+        }
+    }
+    if (g_state.pipe != 0) {
+        if (g_state.fn_Steam_BReleaseSteamPipe) {
+            bool ok = g_state.fn_Steam_BReleaseSteamPipe(g_state.pipe);
+            LOGI("nativeShutdown: Steam_BReleaseSteamPipe(%d) -> %d",
+                 g_state.pipe, ok ? 1 : 0);
+        } else if (g_state.steamclient_iface) {
+            auto* steamclient =
+                reinterpret_cast<wnsteambs::ISteamClient*>(g_state.steamclient_iface);
+            bool ok = steamclient->BReleaseSteamPipe(g_state.pipe);
+            LOGI("nativeShutdown: ISteamClient.BReleaseSteamPipe(%d) -> %d",
+                 g_state.pipe, ok ? 1 : 0);
+        } else {
+            LOGW("nativeShutdown: no BReleaseSteamPipe entry point available");
+        }
+    }
+    // Roll back every env var nativeInit set. The Android process outlives
+    // a single wine launch; without this pass a subsequent Launch-Steam-Client
+    // (real Steam) launch in the same process inherits the bionic env keys
+    // (WINESTEAMCLIENTPATH, Steam3Master, SteamUser, …) and steam.exe gets
+    // confused / hits "Steam installation problem".
+    for (const auto& k : g_state.applied_env_keys) {
+        ::unsetenv(k.c_str());
+        LOGI("unsetenv %s", k.c_str());
+    }
+    g_state.applied_env_keys.clear();
+    g_state.lsc_handle = nullptr;
+    g_state.pipe       = 0;
+    g_state.user       = 0;
+    g_state.iclient_user                    = nullptr;
+    g_state.steamclient_iface     = nullptr;
+    g_state.isteam_user           = nullptr;
+    g_state.isteam_utils          = nullptr;
+    g_state.isteam_userstats      = nullptr;
+    g_state.isteam_apps           = nullptr;
+    g_state.isteam_remotestorage  = nullptr;
+    g_state.isteam_friends        = nullptr;
+    g_state.isteam_apps_ver       = nullptr;
+    g_state.isteam_rs_ver         = nullptr;
+    g_state.isteam_friends_ver    = nullptr;
+    g_state.cached_steam_id       = 0;
+    g_state.subscribed_ids.clear();
+    g_state.received_callbacks.clear();
+    g_state.cv_callback.notify_all();
+    g_state.fn_CreateInterface              = nullptr;
+    g_state.fn_Steam_CreateGlobalUser       = nullptr;
+    g_state.fn_Steam_BLoggedOn              = nullptr;
+    g_state.fn_Steam_LogOff                 = nullptr;
+    g_state.fn_Steam_ReleaseUser            = nullptr;
+    g_state.fn_Steam_BReleaseSteamPipe      = nullptr;
+    g_state.fn_Steam_BGetCallback           = nullptr;
+    g_state.fn_Steam_FreeLastCallback       = nullptr;
+    g_state.fn_Breakpad_SteamSetAppID       = nullptr;
+    g_state.shutting_down = false;
+    LOGI("nativeShutdown done");
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativePrepareApp(
+        JNIEnv* env, jclass /*cls*/, jintArray jappIds) {
+    // Phase 8b.6+: drive ISteamApps via the IClientEngine sub-interface to
+    // warm libsteamclient.so's own PICS cache for the given appids. For
+    // now we log and let the Rust wnsteam runtime's own prepareApp (Phase 4.5)
+    // do the heavy lifting.
+    if (!jappIds) return;
+    jsize n = env->GetArrayLength(jappIds);
+    LOGI("nativePrepareApp: %d ids (passed through to log; not yet wired "
+         "to libsteamclient.so PICS)", n);
+}
+
+JNIEXPORT void JNICALL
+Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamBootstrap_nativeSetCloudEnabled(
+        JNIEnv* /*env*/, jclass /*cls*/, jint app_id, jboolean enabled) {
+    // Phase 8b.6+: route through IClientRemoteStorage. Vtable slot needs
+    // additional RE; deferred.
+    LOGI("setCloudEnabled(app=%d, on=%d) — not yet wired",
+         app_id, enabled ? 1 : 0);
+}
+
+}  // extern "C"
diff --git a/app/src/main/cpp/wn-steam-client/CMakeLists.txt b/app/src/main/cpp/wn-steam-client/CMakeLists.txt
new file mode 100644
index 000000000..949f00483
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/CMakeLists.txt
@@ -0,0 +1,81 @@
+# ----------------------------------------------------------------------------
+# wn-steam-client
+# Rust native Steam protocol client for WinNative.
+# ----------------------------------------------------------------------------
+
+cmake_minimum_required(VERSION 3.22.1)
+
+set(WN_STEAM_CLIENT_VERSION_MAJOR 0)
+set(WN_STEAM_CLIENT_VERSION_MINOR 1)
+set(WN_STEAM_CLIENT_VERSION_PATCH 0)
+set(WN_STEAM_CLIENT_VERSION_STRING
+    "${WN_STEAM_CLIENT_VERSION_MAJOR}.${WN_STEAM_CLIENT_VERSION_MINOR}.${WN_STEAM_CLIENT_VERSION_PATCH}")
+
+find_program(CARGO_EXECUTABLE cargo REQUIRED)
+
+if(NOT CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
+    message(FATAL_ERROR "Rust wnsteam currently supports arm64-v8a; got ${CMAKE_ANDROID_ARCH_ABI}")
+endif()
+if(NOT DEFINED ANDROID_NDK)
+    message(FATAL_ERROR "ANDROID_NDK not defined; Rust wnsteam must be built via Android Gradle/CMake")
+endif()
+
+set(WNSTEAM_RUST_TARGET "aarch64-linux-android")
+if(DEFINED ANDROID_PLATFORM)
+    string(REGEX REPLACE "^android-" "" WNSTEAM_ANDROID_API "${ANDROID_PLATFORM}")
+elseif(DEFINED CMAKE_SYSTEM_VERSION)
+    set(WNSTEAM_ANDROID_API "${CMAKE_SYSTEM_VERSION}")
+else()
+    set(WNSTEAM_ANDROID_API "26")
+endif()
+
+if(CMAKE_HOST_WIN32)
+    set(WNSTEAM_NDK_HOST_TAG "windows-x86_64")
+    set(WNSTEAM_LINKER_SUFFIX ".cmd")
+    set(WNSTEAM_AR_SUFFIX ".exe")
+elseif(CMAKE_HOST_APPLE)
+    set(WNSTEAM_NDK_HOST_TAG "darwin-x86_64")
+    set(WNSTEAM_LINKER_SUFFIX "")
+    set(WNSTEAM_AR_SUFFIX "")
+else()
+    set(WNSTEAM_NDK_HOST_TAG "linux-x86_64")
+    set(WNSTEAM_LINKER_SUFFIX "")
+    set(WNSTEAM_AR_SUFFIX "")
+endif()
+
+set(WNSTEAM_RUST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/rust")
+file(GLOB_RECURSE WNSTEAM_RUST_SOURCES CONFIGURE_DEPENDS
+    "${WNSTEAM_RUST_DIR}/src/*.rs")
+set(WNSTEAM_RUST_BUILD_INPUTS
+    "${WNSTEAM_RUST_DIR}/Cargo.toml"
+    "${WNSTEAM_RUST_DIR}/Cargo.lock"
+    ${WNSTEAM_RUST_SOURCES})
+set(WNSTEAM_RUST_LIB
+    "${WNSTEAM_RUST_DIR}/target/${WNSTEAM_RUST_TARGET}/release/libwnsteam.so")
+set(WNSTEAM_RUST_OUT "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libwnsteam.so")
+set(WNSTEAM_RUST_LINKER
+    "${ANDROID_NDK}/toolchains/llvm/prebuilt/${WNSTEAM_NDK_HOST_TAG}/bin/${WNSTEAM_RUST_TARGET}${WNSTEAM_ANDROID_API}-clang${WNSTEAM_LINKER_SUFFIX}")
+
+add_custom_command(
+    OUTPUT "${WNSTEAM_RUST_OUT}"
+    COMMAND "${CMAKE_COMMAND}" -E env
+        "CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=${WNSTEAM_RUST_LINKER}"
+        "CC_aarch64_linux_android=${WNSTEAM_RUST_LINKER}"
+        "AR_aarch64_linux_android=${ANDROID_NDK}/toolchains/llvm/prebuilt/${WNSTEAM_NDK_HOST_TAG}/bin/llvm-ar${WNSTEAM_AR_SUFFIX}"
+        "${CARGO_EXECUTABLE}" rustc --release --target "${WNSTEAM_RUST_TARGET}" --lib --
+        -Clink-arg=-Wl,-soname,libwnsteam.so
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+        "${WNSTEAM_RUST_LIB}"
+        "${WNSTEAM_RUST_OUT}"
+    WORKING_DIRECTORY "${WNSTEAM_RUST_DIR}"
+    DEPENDS ${WNSTEAM_RUST_BUILD_INPUTS}
+    COMMENT "Building Rust wnsteam for ${WNSTEAM_RUST_TARGET}"
+    VERBATIM
+)
+
+add_custom_target(wnsteam_rust_build DEPENDS "${WNSTEAM_RUST_OUT}")
+add_library(wnsteam SHARED IMPORTED GLOBAL)
+set_target_properties(wnsteam PROPERTIES
+    IMPORTED_LOCATION "${WNSTEAM_RUST_OUT}"
+    IMPORTED_SONAME "libwnsteam.so")
+add_dependencies(wnsteam wnsteam_rust_build)
diff --git a/app/src/main/cpp/wn-steam-client/rust/.gitignore b/app/src/main/cpp/wn-steam-client/rust/.gitignore
new file mode 100644
index 000000000..2f7896d1d
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/app/src/main/cpp/wn-steam-client/rust/Cargo.lock b/app/src/main/cpp/wn-steam-client/rust/Cargo.lock
new file mode 100644
index 000000000..3af23907c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/Cargo.lock
@@ -0,0 +1,2101 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "async-compression"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac"
+dependencies = [
+ "compression-codecs",
+ "compression-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
+[[package]]
+name = "bitflags"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "compression-codecs"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf"
+dependencies = [
+ "compression-core",
+ "flate2",
+ "memchr",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789"
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
+
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "http"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hyper"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb92f162bf56536459fc83c79b974bb12837acfed43d6bc370a7916d0ae15ecc"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki-roots 1.0.7",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "log"
+version = "0.4.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
+
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
+[[package]]
+name = "lzma-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+dependencies = [
+ "byteorder",
+ "crc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
+dependencies = [
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.6",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.4",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots 1.0.7",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+
+[[package]]
+name = "rustls"
+version = "0.23.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ruzstd"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
+dependencies = [
+ "twox-hash",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl 2.0.18",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
+dependencies = [
+ "async-compression",
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "url",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "tungstenite"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.9.4",
+ "rustls",
+ "rustls-pki-types",
+ "sha1",
+ "thiserror 2.0.18",
+ "utf-8",
+ "webpki-roots 0.26.11",
+]
+
+[[package]]
+name = "twox-hash"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+dependencies = [
+ "cfg-if",
+ "static_assertions",
+]
+
+[[package]]
+name = "typenum"
+version = "1.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.7",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "wnsteam"
+version = "0.1.0"
+dependencies = [
+ "aes",
+ "cbc",
+ "crc32fast",
+ "flate2",
+ "hmac",
+ "jni",
+ "lzma-rs",
+ "rand 0.8.6",
+ "reqwest",
+ "rsa",
+ "ruzstd",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "tungstenite",
+ "zeroize",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/app/src/main/cpp/wn-steam-client/rust/Cargo.toml b/app/src/main/cpp/wn-steam-client/rust/Cargo.toml
new file mode 100644
index 000000000..520bde59c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "wnsteam"
+version = "0.1.0"
+edition = "2021"
+license = "GPL-3.0-or-later"
+publish = false
+
+[lib]
+crate-type = ["rlib", "staticlib", "cdylib"]
+
+[dependencies]
+aes = "0.8"
+cbc = { version = "0.1", features = ["alloc", "block-padding"] }
+crc32fast = "1"
+hmac = "0.12"
+jni = "0.21"
+flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
+lzma-rs = { version = "0.3", features = ["raw_decoder"] }
+rand = "0.8"
+reqwest = { version = "0.12", default-features = false, features = ["blocking", "rustls-tls", "gzip"] }
+rsa = "0.9"
+ruzstd = "0.7"
+# preserve_order keeps JSON object keys in source order. The Kotlin appinfo
+# decoder groups DLC content depots positionally (a marker depot followed by
+# its content), so reordering depots (BTreeMap's default key sort) misgroups
+# base content depots and zeroes a game's download/install size. C++ emitted
+# source order; match it.
+serde_json = { version = "1", features = ["preserve_order"] }
+sha1 = "0.10"
+sha2 = "0.10"
+tungstenite = { version = "0.26", default-features = false, features = ["handshake", "rustls-tls-webpki-roots"] }
+zeroize = "1"
+
+[profile.release]
+codegen-units = 1
+lto = "thin"
+strip = "symbols"
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/auth_session.rs b/app/src/main/cpp/wn-steam-client/rust/src/auth_session.rs
new file mode 100644
index 000000000..2dbe60712
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/auth_session.rs
@@ -0,0 +1,608 @@
+use crate::base64;
+use crate::job_manager::JobResult;
+use crate::pb::cauthentication::{
+    AllowedConfirmation, BeginAuthSessionViaCredentialsRequest,
+    BeginAuthSessionViaCredentialsResponse, BeginAuthSessionViaQrRequest,
+    BeginAuthSessionViaQrResponse, EAuthSessionGuardType, EAuthTokenPlatformType,
+    ESessionPersistence, GetPasswordRsaPublicKeyRequest, GetPasswordRsaPublicKeyResponse,
+    PollAuthSessionStatusRequest, PollAuthSessionStatusResponse,
+    UpdateAuthSessionWithSteamGuardCodeRequest,
+};
+use crate::rsa_password::rsa_pkcs1v15_encrypt_password_with_hex_key;
+use std::time::Duration;
+
+pub const AUTH_WEBSITE_ID: &str = "Client";
+pub const DEFAULT_WINDOWS_OS_TYPE: i32 = 16;
+pub const DEFAULT_POLL_INTERVAL_SECONDS: f32 = 5.0;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AuthSessionResult {
+    pub success: bool,
+    pub eresult: i32,
+    pub error_message: String,
+    pub account_name: String,
+    pub refresh_token: String,
+    pub access_token: String,
+    pub new_guard_data: String,
+    pub steamid: u64,
+    pub had_remote_interaction: bool,
+    pub agreement_session_url: String,
+}
+
+impl Default for AuthSessionResult {
+    fn default() -> Self {
+        Self {
+            success: false,
+            eresult: 2,
+            error_message: String::new(),
+            account_name: String::new(),
+            refresh_token: String::new(),
+            access_token: String::new(),
+            new_guard_data: String::new(),
+            steamid: 0,
+            had_remote_interaction: false,
+            agreement_session_url: String::new(),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CredentialsAuthConfig {
+    pub username: String,
+    pub password: String,
+    pub device_friendly_name: String,
+    pub guard_data: String,
+    pub persistent_session: bool,
+}
+
+impl Default for CredentialsAuthConfig {
+    fn default() -> Self {
+        Self {
+            username: String::new(),
+            password: String::new(),
+            device_friendly_name: "WN-Steam-Client".to_string(),
+            guard_data: String::new(),
+            persistent_session: true,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct QrAuthConfig {
+    pub device_friendly_name: String,
+}
+
+impl Default for QrAuthConfig {
+    fn default() -> Self {
+        Self {
+            device_friendly_name: "WN-Steam-Client".to_string(),
+        }
+    }
+}
+
+pub fn secure_clear_string(s: &mut String) {
+    if !s.is_empty() {
+        // Zero bytes are valid UTF-8, so the String remains well-formed until
+        // `clear` drops its logical contents.
+        let bytes = unsafe { s.as_bytes_mut() };
+        for byte in bytes {
+            *byte = 0;
+        }
+    }
+    s.clear();
+}
+
+pub fn sleep_slices(total: Duration, tick: Duration) -> impl Iterator<Item = Duration> {
+    let mut remaining = total;
+    std::iter::from_fn(move || {
+        if remaining.is_zero() {
+            return None;
+        }
+        let next = remaining.min(tick);
+        remaining -= next;
+        Some(next)
+    })
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct PendingCredentialsAuthSession {
+    pub client_id: u64,
+    pub request_id: Vec<u8>,
+    pub poll_interval_seconds: f32,
+    pub allowed_confirmations: Vec<AllowedConfirmation>,
+    pub steamid: u64,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct PendingQrAuthSession {
+    pub client_id: u64,
+    pub request_id: Vec<u8>,
+    pub poll_interval_seconds: f32,
+    pub challenge_url: String,
+}
+
+pub fn build_password_rsa_request(
+    config: &CredentialsAuthConfig,
+) -> GetPasswordRsaPublicKeyRequest {
+    GetPasswordRsaPublicKeyRequest {
+        account_name: config.username.clone(),
+    }
+}
+
+pub fn build_credentials_begin_request(
+    config: &mut CredentialsAuthConfig,
+    key: &GetPasswordRsaPublicKeyResponse,
+) -> Result<BeginAuthSessionViaCredentialsRequest, AuthSessionResult> {
+    let encrypted = rsa_pkcs1v15_encrypt_password_with_hex_key(
+        &config.password,
+        &key.publickey_mod,
+        &key.publickey_exp,
+    );
+    secure_clear_string(&mut config.password);
+    let Some(encrypted) = encrypted else {
+        return Err(AuthSessionResult {
+            error_message: "password RSA encryption failed".to_string(),
+            ..Default::default()
+        });
+    };
+
+    let guard_data = std::mem::take(&mut config.guard_data);
+    let mut req = BeginAuthSessionViaCredentialsRequest {
+        account_name: config.username.clone(),
+        encrypted_password: base64::encode(&encrypted),
+        encryption_timestamp: key.timestamp,
+        website_id: AUTH_WEBSITE_ID.to_string(),
+        persistence: if config.persistent_session {
+            ESessionPersistence::Persistent
+        } else {
+            ESessionPersistence::Ephemeral
+        },
+        guard_data,
+        ..Default::default()
+    };
+    req.device_details.device_friendly_name = config.device_friendly_name.clone();
+    req.device_details.platform_type = EAuthTokenPlatformType::SteamClient;
+    req.device_details.os_type = DEFAULT_WINDOWS_OS_TYPE;
+    Ok(req)
+}
+
+pub fn pending_credentials_from_begin_response(
+    resp: BeginAuthSessionViaCredentialsResponse,
+) -> Result<PendingCredentialsAuthSession, AuthSessionResult> {
+    if resp.client_id == 0 || resp.request_id.is_empty() {
+        return Err(AuthSessionResult {
+            eresult: 5,
+            error_message: if resp.extended_error_message.is_empty() {
+                "Steam rejected the credentials (no auth session created - likely bad password or unrecognized device)"
+                    .to_string()
+            } else {
+                resp.extended_error_message
+            },
+            ..Default::default()
+        });
+    }
+    Ok(PendingCredentialsAuthSession {
+        client_id: resp.client_id,
+        request_id: resp.request_id,
+        poll_interval_seconds: resp.interval,
+        allowed_confirmations: resp.allowed_confirmations,
+        steamid: resp.steamid,
+    })
+}
+
+pub fn choose_guard_confirmation(confirmations: &[AllowedConfirmation]) -> EAuthSessionGuardType {
+    confirmations
+        .iter()
+        .find(|confirmation| {
+            confirmation.confirmation_type == EAuthSessionGuardType::DeviceConfirmation
+        })
+        .or_else(|| {
+            confirmations.iter().find(|confirmation| {
+                matches!(
+                    confirmation.confirmation_type,
+                    EAuthSessionGuardType::DeviceCode | EAuthSessionGuardType::EmailCode
+                )
+            })
+        })
+        .or_else(|| {
+            confirmations
+                .iter()
+                .find(|confirmation| confirmation.confirmation_type == EAuthSessionGuardType::None)
+        })
+        .map(|confirmation| confirmation.confirmation_type)
+        .unwrap_or(EAuthSessionGuardType::None)
+}
+
+pub fn build_guard_code_request(
+    client_id: u64,
+    steamid: u64,
+    code_type: EAuthSessionGuardType,
+    code: String,
+) -> UpdateAuthSessionWithSteamGuardCodeRequest {
+    UpdateAuthSessionWithSteamGuardCodeRequest {
+        client_id,
+        steamid,
+        code,
+        code_type,
+    }
+}
+
+pub fn guard_update_succeeded(job: &JobResult) -> bool {
+    !job.synthetic_failure && matches!(job.eresult, 1 | 29)
+}
+
+pub fn build_poll_request(client_id: u64, request_id: Vec<u8>) -> PollAuthSessionStatusRequest {
+    PollAuthSessionStatusRequest {
+        client_id,
+        request_id,
+        token_to_revoke: 0,
+    }
+}
+
+pub fn auth_result_from_poll(
+    resp: PollAuthSessionStatusResponse,
+    steamid: u64,
+) -> Option<AuthSessionResult> {
+    if resp.refresh_token.is_empty() {
+        return None;
+    }
+    Some(AuthSessionResult {
+        success: true,
+        eresult: 1,
+        account_name: resp.account_name,
+        refresh_token: resp.refresh_token,
+        access_token: resp.access_token,
+        new_guard_data: resp.new_guard_data,
+        steamid,
+        had_remote_interaction: resp.had_remote_interaction,
+        agreement_session_url: resp.agreement_session_url,
+        ..Default::default()
+    })
+}
+
+pub fn apply_account_name_fallback(
+    result: &mut AuthSessionResult,
+    fallback_account_name: &str,
+) -> bool {
+    if result.account_name.is_empty() && !fallback_account_name.is_empty() {
+        result.account_name = fallback_account_name.to_string();
+        return true;
+    }
+    false
+}
+
+pub fn apply_new_client_id(current_client_id: &mut u64, new_client_id: u64) -> bool {
+    if new_client_id == 0 {
+        return false;
+    }
+    *current_client_id = new_client_id;
+    true
+}
+
+pub fn take_qr_challenge_update(
+    last_challenge_url: &mut String,
+    resp: &PollAuthSessionStatusResponse,
+) -> Option<String> {
+    if resp.new_challenge_url.is_empty() || resp.new_challenge_url == *last_challenge_url {
+        return None;
+    }
+    *last_challenge_url = resp.new_challenge_url.clone();
+    Some(last_challenge_url.clone())
+}
+
+pub fn take_qr_remote_interaction(
+    reported_remote_interaction: &mut bool,
+    resp: &PollAuthSessionStatusResponse,
+) -> bool {
+    if *reported_remote_interaction || !resp.had_remote_interaction {
+        return false;
+    }
+    *reported_remote_interaction = true;
+    true
+}
+
+pub fn build_qr_begin_request(config: &QrAuthConfig) -> BeginAuthSessionViaQrRequest {
+    let mut req = BeginAuthSessionViaQrRequest {
+        device_friendly_name: config.device_friendly_name.clone(),
+        platform_type: EAuthTokenPlatformType::SteamClient,
+        website_id: AUTH_WEBSITE_ID.to_string(),
+        ..Default::default()
+    };
+    req.device_details.device_friendly_name = config.device_friendly_name.clone();
+    req.device_details.platform_type = EAuthTokenPlatformType::SteamClient;
+    req.device_details.os_type = DEFAULT_WINDOWS_OS_TYPE;
+    req
+}
+
+pub fn pending_qr_from_begin_response(resp: BeginAuthSessionViaQrResponse) -> PendingQrAuthSession {
+    PendingQrAuthSession {
+        client_id: resp.client_id,
+        request_id: resp.request_id,
+        poll_interval_seconds: resp.interval,
+        challenge_url: resp.challenge_url,
+    }
+}
+
+pub fn job_error(job: JobResult, default_message: &'static str) -> AuthSessionResult {
+    AuthSessionResult {
+        eresult: job.eresult,
+        error_message: if job.error_message.is_empty() {
+            default_message.to_string()
+        } else {
+            job.error_message
+        },
+        ..Default::default()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::Writer;
+    use rand::rngs::OsRng;
+    use rsa::traits::PublicKeyParts;
+
+    #[test]
+    fn default_auth_configs_match_cpp_defaults() {
+        assert_eq!(
+            CredentialsAuthConfig::default().device_friendly_name,
+            "WN-Steam-Client"
+        );
+        assert!(CredentialsAuthConfig::default().persistent_session);
+        assert_eq!(
+            QrAuthConfig::default().device_friendly_name,
+            "WN-Steam-Client"
+        );
+    }
+
+    #[test]
+    fn sleep_slices_cover_total_duration() {
+        let slices: Vec<_> =
+            sleep_slices(Duration::from_millis(250), Duration::from_millis(100)).collect();
+        assert_eq!(
+            slices,
+            [
+                Duration::from_millis(100),
+                Duration::from_millis(100),
+                Duration::from_millis(50)
+            ]
+        );
+    }
+
+    #[test]
+    fn credentials_begin_request_matches_desktop_client_shape() {
+        let private = rsa::RsaPrivateKey::new(&mut OsRng, 1024).unwrap();
+        let public = private.to_public_key();
+        let key = GetPasswordRsaPublicKeyResponse {
+            publickey_mod: hex_encode(&public.n().to_bytes_be()),
+            publickey_exp: hex_encode(&public.e().to_bytes_be()),
+            timestamp: 123,
+        };
+        let mut config = CredentialsAuthConfig {
+            username: "ada".into(),
+            password: "correct horse".into(),
+            device_friendly_name: "WN".into(),
+            guard_data: "guard".into(),
+            persistent_session: false,
+        };
+
+        let req = build_credentials_begin_request(&mut config, &key).unwrap();
+
+        assert_eq!(req.account_name, "ada");
+        assert_eq!(req.encryption_timestamp, 123);
+        assert!(!req.encrypted_password.is_empty());
+        assert_eq!(req.website_id, "Client");
+        assert_eq!(req.persistence, ESessionPersistence::Ephemeral);
+        assert_eq!(
+            req.device_details.platform_type,
+            EAuthTokenPlatformType::SteamClient
+        );
+        assert_eq!(req.device_details.os_type, DEFAULT_WINDOWS_OS_TYPE);
+        assert_eq!(req.guard_data, "guard");
+        assert!(config.password.is_empty());
+        assert!(config.guard_data.is_empty());
+    }
+
+    #[test]
+    fn begin_response_rejects_empty_session_like_cpp() {
+        let err = pending_credentials_from_begin_response(BeginAuthSessionViaCredentialsResponse {
+            interval: 1.0,
+            ..Default::default()
+        })
+        .unwrap_err();
+        assert_eq!(err.eresult, 5);
+        assert!(err.error_message.contains("Steam rejected"));
+    }
+
+    #[test]
+    fn guard_confirmation_preference_matches_cpp() {
+        let confirmations = [
+            AllowedConfirmation {
+                confirmation_type: EAuthSessionGuardType::EmailCode,
+                associated_message: String::new(),
+            },
+            AllowedConfirmation {
+                confirmation_type: EAuthSessionGuardType::DeviceConfirmation,
+                associated_message: String::new(),
+            },
+        ];
+        assert_eq!(
+            choose_guard_confirmation(&confirmations),
+            EAuthSessionGuardType::DeviceConfirmation
+        );
+
+        let confirmations = [AllowedConfirmation {
+            confirmation_type: EAuthSessionGuardType::DeviceCode,
+            associated_message: String::new(),
+        }];
+        assert_eq!(
+            choose_guard_confirmation(&confirmations),
+            EAuthSessionGuardType::DeviceCode
+        );
+        assert_eq!(choose_guard_confirmation(&[]), EAuthSessionGuardType::None);
+    }
+
+    #[test]
+    fn qr_begin_request_uses_steam_client_audience() {
+        let req = build_qr_begin_request(&QrAuthConfig {
+            device_friendly_name: "Deck".into(),
+        });
+        assert_eq!(req.device_friendly_name, "Deck");
+        assert_eq!(req.platform_type, EAuthTokenPlatformType::SteamClient);
+        assert_eq!(req.website_id, "Client");
+        assert_eq!(
+            req.device_details.platform_type,
+            EAuthTokenPlatformType::SteamClient
+        );
+        assert_eq!(req.device_details.os_type, DEFAULT_WINDOWS_OS_TYPE);
+    }
+
+    #[test]
+    fn poll_response_becomes_success_only_when_refresh_token_exists() {
+        assert!(auth_result_from_poll(PollAuthSessionStatusResponse::default(), 123).is_none());
+        let result = auth_result_from_poll(
+            PollAuthSessionStatusResponse {
+                refresh_token: "refresh".into(),
+                access_token: "access".into(),
+                account_name: "ada".into(),
+                new_guard_data: "guard".into(),
+                had_remote_interaction: true,
+                agreement_session_url: "https://steam.example/agreement".into(),
+                ..Default::default()
+            },
+            765,
+        )
+        .unwrap();
+        assert!(result.success);
+        assert_eq!(result.steamid, 765);
+        assert_eq!(result.account_name, "ada");
+        assert!(result.had_remote_interaction);
+    }
+
+    #[test]
+    fn account_name_fallback_restores_credentials_username() {
+        let mut result = auth_result_from_poll(
+            PollAuthSessionStatusResponse {
+                refresh_token: "refresh".into(),
+                access_token: "access".into(),
+                ..Default::default()
+            },
+            765,
+        )
+        .unwrap();
+
+        assert!(apply_account_name_fallback(&mut result, "ada"));
+        assert_eq!(result.account_name, "ada");
+        assert!(!apply_account_name_fallback(&mut result, "ignored"));
+        assert_eq!(result.account_name, "ada");
+    }
+
+    #[test]
+    fn poll_updates_client_id_and_qr_challenge_like_cpp() {
+        let mut client_id = 10;
+        assert!(!apply_new_client_id(&mut client_id, 0));
+        assert_eq!(client_id, 10);
+        assert!(apply_new_client_id(&mut client_id, 20));
+        assert_eq!(client_id, 20);
+
+        let mut last = "old".to_string();
+        assert_eq!(
+            take_qr_challenge_update(
+                &mut last,
+                &PollAuthSessionStatusResponse {
+                    new_challenge_url: "new".into(),
+                    ..Default::default()
+                }
+            ),
+            Some("new".to_string())
+        );
+        assert_eq!(last, "new");
+        assert_eq!(
+            take_qr_challenge_update(
+                &mut last,
+                &PollAuthSessionStatusResponse {
+                    new_challenge_url: "new".into(),
+                    ..Default::default()
+                }
+            ),
+            None
+        );
+    }
+
+    #[test]
+    fn poll_reports_remote_interaction_only_once() {
+        let mut reported = false;
+        assert!(!take_qr_remote_interaction(
+            &mut reported,
+            &PollAuthSessionStatusResponse::default()
+        ));
+        assert!(take_qr_remote_interaction(
+            &mut reported,
+            &PollAuthSessionStatusResponse {
+                had_remote_interaction: true,
+                ..Default::default()
+            }
+        ));
+        assert!(reported);
+        assert!(!take_qr_remote_interaction(
+            &mut reported,
+            &PollAuthSessionStatusResponse {
+                had_remote_interaction: true,
+                ..Default::default()
+            }
+        ));
+    }
+
+    #[test]
+    fn guard_update_accepts_duplicate_request() {
+        assert!(guard_update_succeeded(&JobResult {
+            eresult: 29,
+            error_message: String::new(),
+            body: Vec::new(),
+            synthetic_failure: false,
+        }));
+        assert!(!guard_update_succeeded(&JobResult {
+            eresult: 29,
+            error_message: String::new(),
+            body: Vec::new(),
+            synthetic_failure: true,
+        }));
+    }
+
+    #[test]
+    fn request_builders_serialize_expected_identity_fields() {
+        let rsa_req = build_password_rsa_request(&CredentialsAuthConfig {
+            username: "user".into(),
+            ..Default::default()
+        });
+        assert_eq!(rsa_req.serialize(), {
+            let mut out = Vec::new();
+            Writer::new(&mut out).string_field(1, "user");
+            out
+        });
+
+        let poll = build_poll_request(42, vec![1, 2, 3]);
+        assert_eq!(poll.client_id, 42);
+        assert_eq!(poll.request_id, [1, 2, 3]);
+
+        let guard = build_guard_code_request(
+            7,
+            765,
+            EAuthSessionGuardType::EmailCode,
+            "12345".to_string(),
+        );
+        assert_eq!(guard.client_id, 7);
+        assert_eq!(guard.steamid, 765);
+        assert_eq!(guard.code_type, EAuthSessionGuardType::EmailCode);
+    }
+
+    fn hex_encode(bytes: &[u8]) -> String {
+        const HEX: &[u8; 16] = b"0123456789abcdef";
+        let mut out = String::with_capacity(bytes.len() * 2);
+        for b in bytes {
+            out.push(HEX[(b >> 4) as usize] as char);
+            out.push(HEX[(b & 0x0f) as usize] as char);
+        }
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/authenticator.rs b/app/src/main/cpp/wn-steam-client/rust/src/authenticator.rs
new file mode 100644
index 000000000..e5e6ce0d8
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/authenticator.rs
@@ -0,0 +1,10 @@
+pub trait Authenticator: Send + Sync {
+    fn accept_device_confirmation(&self, cb: Box<dyn FnOnce(bool) + Send>);
+    fn get_device_code(&self, previous_was_incorrect: bool, cb: Box<dyn FnOnce(String) + Send>);
+    fn get_email_code(
+        &self,
+        email: String,
+        previous_was_incorrect: bool,
+        cb: Box<dyn FnOnce(String) + Send>,
+    );
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/base64.rs b/app/src/main/cpp/wn-steam-client/rust/src/base64.rs
new file mode 100644
index 000000000..168fcb660
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/base64.rs
@@ -0,0 +1,97 @@
+const ALPHABET: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+pub fn encode(bytes: &[u8]) -> String {
+    if bytes.is_empty() {
+        return String::new();
+    }
+
+    let mut out = String::with_capacity(bytes.len().div_ceil(3) * 4);
+    let mut chunks = bytes.chunks_exact(3);
+    for chunk in &mut chunks {
+        let v = ((chunk[0] as u32) << 16) | ((chunk[1] as u32) << 8) | chunk[2] as u32;
+        out.push(ALPHABET[((v >> 18) & 0x3f) as usize] as char);
+        out.push(ALPHABET[((v >> 12) & 0x3f) as usize] as char);
+        out.push(ALPHABET[((v >> 6) & 0x3f) as usize] as char);
+        out.push(ALPHABET[(v & 0x3f) as usize] as char);
+    }
+
+    match chunks.remainder() {
+        [a] => {
+            let v = (*a as u32) << 16;
+            out.push(ALPHABET[((v >> 18) & 0x3f) as usize] as char);
+            out.push(ALPHABET[((v >> 12) & 0x3f) as usize] as char);
+            out.push('=');
+            out.push('=');
+        }
+        [a, b] => {
+            let v = ((*a as u32) << 16) | ((*b as u32) << 8);
+            out.push(ALPHABET[((v >> 18) & 0x3f) as usize] as char);
+            out.push(ALPHABET[((v >> 12) & 0x3f) as usize] as char);
+            out.push(ALPHABET[((v >> 6) & 0x3f) as usize] as char);
+            out.push('=');
+        }
+        [] => {}
+        _ => unreachable!(),
+    }
+
+    out
+}
+
+pub fn decode(s: &str) -> Option<Vec<u8>> {
+    let mut out = Vec::with_capacity((s.len() / 4) * 3 + 3);
+    let mut acc = 0u32;
+    let mut bits = 0u32;
+
+    for b in s.bytes() {
+        let v = value_of(b)?;
+        let Some(v) = v else {
+            continue;
+        };
+        acc = (acc << 6) | v as u32;
+        bits += 6;
+        if bits >= 8 {
+            bits -= 8;
+            out.push(((acc >> bits) & 0xff) as u8);
+        }
+    }
+
+    Some(out)
+}
+
+fn value_of(b: u8) -> Option<Option<u8>> {
+    match b {
+        b'A'..=b'Z' => Some(Some(b - b'A')),
+        b'a'..=b'z' => Some(Some(b - b'a' + 26)),
+        b'0'..=b'9' => Some(Some(b - b'0' + 52)),
+        b'+' | b'-' => Some(Some(62)),
+        b'/' | b'_' => Some(Some(63)),
+        b'=' | b' ' | b'\t' | b'\n' | b'\r' => Some(None),
+        _ => None,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn encodes_rfc4648_padding() {
+        assert_eq!(encode(b""), "");
+        assert_eq!(encode(b"f"), "Zg==");
+        assert_eq!(encode(b"fo"), "Zm8=");
+        assert_eq!(encode(b"foo"), "Zm9v");
+        assert_eq!(encode(b"foobar"), "Zm9vYmFy");
+    }
+
+    #[test]
+    fn decodes_standard_urlsafe_and_whitespace() {
+        assert_eq!(decode("Zm9v YmFy"), Some(b"foobar".to_vec()));
+        assert_eq!(decode("SGVsbG8td29ybGQ_"), Some(b"Hello-world?".to_vec()));
+        assert_eq!(decode("Zg=="), Some(b"f".to_vec()));
+    }
+
+    #[test]
+    fn invalid_character_fails() {
+        assert_eq!(decode("Zm9v*"), None);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cdn_client.rs b/app/src/main/cpp/wn-steam-client/rust/src/cdn_client.rs
new file mode 100644
index 000000000..9c5bc9b56
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cdn_client.rs
@@ -0,0 +1,728 @@
+use crate::pb::ccontentserverdirectory::CContentServerDirectoryServerInfo;
+use flate2::read::{DeflateDecoder, GzDecoder};
+use std::fs;
+use std::io::Read;
+use std::time::Duration;
+
+pub const USER_AGENT: &str = "Valve/Steam HTTP Client 1.0";
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CdnManifestResult {
+    pub raw_manifest: Vec<u8>,
+    pub error: String,
+    pub http_status: i32,
+}
+
+impl CdnManifestResult {
+    pub fn ok(&self) -> bool {
+        self.error.is_empty() && !self.raw_manifest.is_empty()
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CdnChunkResult {
+    pub data: Vec<u8>,
+    pub error: String,
+    pub http_status: i32,
+}
+
+pub struct CdnConnection {
+    client: Option<reqwest::blocking::Client>,
+    valid: bool,
+}
+
+impl Default for CdnConnection {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl CdnConnection {
+    pub fn new() -> Self {
+        Self {
+            client: None,
+            valid: true,
+        }
+    }
+
+    pub fn invalid() -> Self {
+        Self {
+            client: None,
+            valid: false,
+        }
+    }
+
+    pub fn valid(&self) -> bool {
+        self.valid
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CdnClient {
+    ca_bundle_path: String,
+}
+
+impl CdnClient {
+    pub fn new(ca_bundle_path: impl Into<String>) -> Self {
+        Self {
+            ca_bundle_path: ca_bundle_path.into(),
+        }
+    }
+
+    pub fn ca_bundle_path(&self) -> &str {
+        &self.ca_bundle_path
+    }
+
+    pub fn open_connection(&self) -> CdnConnection {
+        CdnConnection::new()
+    }
+
+    pub fn build_manifest_url(
+        &self,
+        server: &CContentServerDirectoryServerInfo,
+        depot_id: u32,
+        manifest_id: u64,
+        request_code: u64,
+        cdn_auth_token: &str,
+    ) -> Result<String, String> {
+        let host = preferred_host(server).ok_or_else(|| "cdn server has no host".to_string())?;
+        let mut url = format!(
+            "{}://{}:{}/depot/{}/manifest/{}/5",
+            if server.use_https() { "https" } else { "http" },
+            host,
+            server.port(),
+            depot_id,
+            manifest_id
+        );
+        if request_code != 0 {
+            url.push('/');
+            url.push_str(&request_code.to_string());
+        }
+        append_auth_query(&mut url, cdn_auth_token);
+        Ok(url)
+    }
+
+    pub fn build_chunk_url(
+        &self,
+        server: &CContentServerDirectoryServerInfo,
+        depot_id: u32,
+        chunk_sha: &[u8],
+        cdn_auth_token: &str,
+    ) -> Result<String, String> {
+        if chunk_sha.is_empty() {
+            return Err("empty chunk sha".to_string());
+        }
+        let host = preferred_host(server).ok_or_else(|| "cdn server has no host".to_string())?;
+        let mut url = format!(
+            "{}://{}:{}/depot/{}/chunk/{}",
+            if server.use_https() { "https" } else { "http" },
+            host,
+            server.port(),
+            depot_id,
+            hex_encode(chunk_sha)
+        );
+        append_auth_query(&mut url, cdn_auth_token);
+        Ok(url)
+    }
+
+    pub fn build_item_def_archive_url(app_id: u32, digest: &str) -> String {
+        format!(
+            "https://api.steampowered.com/IGameInventory/GetItemDefArchive/v1/?appid={app_id}&digest={}",
+            percent_encode_query_value(digest)
+        )
+    }
+
+    pub fn fetch_manifest(
+        &self,
+        server: &CContentServerDirectoryServerInfo,
+        depot_id: u32,
+        manifest_id: u64,
+        request_code: u64,
+        cdn_auth_token: &str,
+        timeout: Duration,
+    ) -> CdnManifestResult {
+        let url = match self.build_manifest_url(
+            server,
+            depot_id,
+            manifest_id,
+            request_code,
+            cdn_auth_token,
+        ) {
+            Ok(url) => url,
+            Err(error) => {
+                return CdnManifestResult {
+                    error,
+                    ..Default::default()
+                }
+            }
+        };
+        match self.http_get(&url, timeout) {
+            Ok(response) => CdnClient::validate_manifest_response(
+                response.http_status,
+                response.body,
+                response.content_length,
+            ),
+            Err(error) => CdnManifestResult {
+                error,
+                ..Default::default()
+            },
+        }
+    }
+
+    pub fn fetch_chunk(
+        &self,
+        server: &CContentServerDirectoryServerInfo,
+        depot_id: u32,
+        chunk_sha: &[u8],
+        cdn_auth_token: &str,
+        timeout: Duration,
+    ) -> CdnChunkResult {
+        let url = match self.build_chunk_url(server, depot_id, chunk_sha, cdn_auth_token) {
+            Ok(url) => url,
+            Err(error) => {
+                return CdnChunkResult {
+                    error,
+                    ..Default::default()
+                }
+            }
+        };
+        match self.http_get(&url, timeout) {
+            Ok(response) => CdnClient::validate_chunk_response(
+                response.http_status,
+                response.body,
+                response.content_length,
+            ),
+            Err(error) => CdnChunkResult {
+                error,
+                ..Default::default()
+            },
+        }
+    }
+
+    pub fn fetch_chunk_with_connection(
+        &self,
+        conn: &mut CdnConnection,
+        server: &CContentServerDirectoryServerInfo,
+        depot_id: u32,
+        chunk_sha: &[u8],
+        cdn_auth_token: &str,
+        timeout: Duration,
+    ) -> CdnChunkResult {
+        let url = match self.build_chunk_url(server, depot_id, chunk_sha, cdn_auth_token) {
+            Ok(url) => url,
+            Err(error) => {
+                return CdnChunkResult {
+                    error,
+                    ..Default::default()
+                }
+            }
+        };
+        let client = match self.ensure_connection(conn) {
+            Ok(client) => client,
+            Err(error) => {
+                return CdnChunkResult {
+                    error,
+                    ..Default::default()
+                }
+            }
+        };
+        match self.http_get_with_client(client, &url, timeout) {
+            Ok(response) => CdnClient::validate_chunk_response(
+                response.http_status,
+                response.body,
+                response.content_length,
+            ),
+            Err(error) => CdnChunkResult {
+                error,
+                ..Default::default()
+            },
+        }
+    }
+
+    pub fn fetch_item_def_archive(
+        &self,
+        app_id: u32,
+        digest: &str,
+        timeout: Duration,
+    ) -> Option<Vec<u8>> {
+        let url = CdnClient::build_item_def_archive_url(app_id, digest);
+        let response = self.http_get(&url, timeout).ok()?;
+        if response.http_status != 200 {
+            return None;
+        }
+        Some(CdnClient::strip_item_def_trailing_nul(response.body))
+    }
+
+    /// HTTP-delivered PICS appinfo URL (large appinfo the CM didn't inline).
+    pub fn build_appinfo_url(http_host: &str, app_id: u32, sha: &[u8]) -> String {
+        format!(
+            "http://{}/appinfo/{}/sha/{}.txt.gz",
+            http_host,
+            app_id,
+            hex_encode(sha)
+        )
+    }
+
+    /// Fetch + gunzip an HTTP-delivered appinfo blob (same VDF as inline `buffer`).
+    pub fn fetch_appinfo_with_connection(
+        &self,
+        conn: &mut CdnConnection,
+        http_host: &str,
+        app_id: u32,
+        sha: &[u8],
+        timeout: Duration,
+    ) -> Option<Vec<u8>> {
+        if http_host.is_empty() || sha.is_empty() {
+            return None;
+        }
+        let url = CdnClient::build_appinfo_url(http_host, app_id, sha);
+        let client = self.ensure_connection(conn).ok()?;
+        let response = self.http_get_with_client(client, &url, timeout).ok()?;
+        if response.http_status != 200 || response.body.is_empty() {
+            return None;
+        }
+        Some(maybe_gunzip(response.body))
+    }
+
+    pub fn validate_manifest_response(
+        http_status: i32,
+        body: Vec<u8>,
+        content_length: Option<u64>,
+    ) -> CdnManifestResult {
+        if http_status != 200 {
+            return CdnManifestResult {
+                http_status,
+                error: "non-200 HTTP status".to_string(),
+                ..Default::default()
+            };
+        }
+        if let Some(expected) = content_length {
+            if body.len() as u64 != expected {
+                return CdnManifestResult {
+                    http_status,
+                    error: "manifest body truncated (length mismatch)".to_string(),
+                    ..Default::default()
+                };
+            }
+        }
+        let Some(raw_manifest) = unzip_first_entry(&body) else {
+            return CdnManifestResult {
+                http_status,
+                error: "manifest unzip failed".to_string(),
+                ..Default::default()
+            };
+        };
+        CdnManifestResult {
+            raw_manifest,
+            error: String::new(),
+            http_status,
+        }
+    }
+
+    pub fn validate_chunk_response(
+        http_status: i32,
+        body: Vec<u8>,
+        content_length: Option<u64>,
+    ) -> CdnChunkResult {
+        if http_status != 200 {
+            return CdnChunkResult {
+                http_status,
+                error: "non-200 HTTP status".to_string(),
+                ..Default::default()
+            };
+        }
+        if let Some(expected) = content_length {
+            if body.len() as u64 != expected {
+                return CdnChunkResult {
+                    http_status,
+                    error: "chunk body truncated (length mismatch)".to_string(),
+                    ..Default::default()
+                };
+            }
+        }
+        CdnChunkResult {
+            data: body,
+            error: String::new(),
+            http_status,
+        }
+    }
+
+    pub fn validate_connection(conn: &CdnConnection) -> Result<(), CdnChunkResult> {
+        if conn.valid() {
+            Ok(())
+        } else {
+            Err(CdnChunkResult {
+                error: "cdn connection invalid".to_string(),
+                ..Default::default()
+            })
+        }
+    }
+
+    pub fn strip_item_def_trailing_nul(mut body: Vec<u8>) -> Vec<u8> {
+        if body.last() == Some(&0) {
+            body.pop();
+        }
+        body
+    }
+
+    pub fn default_timeout() -> Duration {
+        Duration::from_secs(30)
+    }
+
+    pub fn connect_timeout() -> Duration {
+        Duration::from_secs(15)
+    }
+
+    fn http_get(&self, url: &str, timeout: Duration) -> Result<HttpResponse, String> {
+        let client = self.http_client()?;
+        self.http_get_with_client(&client, url, timeout)
+    }
+
+    fn http_get_with_client(
+        &self,
+        client: &reqwest::blocking::Client,
+        url: &str,
+        timeout: Duration,
+    ) -> Result<HttpResponse, String> {
+        let response = client
+            .get(url)
+            .timeout(timeout)
+            .send()
+            .map_err(|err| format!("http get: {err}"))?;
+        let http_status = response.status().as_u16() as i32;
+        let content_length = response.content_length();
+        let body = response
+            .bytes()
+            .map_err(|err| format!("http body: {err}"))?
+            .to_vec();
+        Ok(HttpResponse {
+            http_status,
+            content_length,
+            body,
+        })
+    }
+
+    fn http_client(&self) -> Result<reqwest::blocking::Client, String> {
+        let mut builder = reqwest::blocking::Client::builder()
+            .user_agent(USER_AGENT)
+            .connect_timeout(CdnClient::connect_timeout());
+        if !self.ca_bundle_path.is_empty() {
+            let pem =
+                fs::read(&self.ca_bundle_path).map_err(|err| format!("read CA bundle: {err}"))?;
+            let certs = reqwest::Certificate::from_pem_bundle(&pem)
+                .map_err(|err| format!("parse CA bundle: {err}"))?;
+            for cert in certs {
+                builder = builder.add_root_certificate(cert);
+            }
+        }
+        builder.build().map_err(|err| format!("http client: {err}"))
+    }
+
+    fn ensure_connection<'a>(
+        &self,
+        conn: &'a mut CdnConnection,
+    ) -> Result<&'a reqwest::blocking::Client, String> {
+        if let Err(result) = CdnClient::validate_connection(conn) {
+            return Err(result.error);
+        }
+        if conn.client.is_none() {
+            conn.client = Some(self.http_client()?);
+        }
+        conn.client
+            .as_ref()
+            .ok_or_else(|| "cdn connection not initialized".to_string())
+    }
+}
+
+struct HttpResponse {
+    http_status: i32,
+    content_length: Option<u64>,
+    body: Vec<u8>,
+}
+
+impl CdnChunkResult {
+    pub fn ok(&self) -> bool {
+        self.error.is_empty() && !self.data.is_empty()
+    }
+}
+
+pub fn unzip_first_entry(zip: &[u8]) -> Option<Vec<u8>> {
+    if zip.len() < 30 || read_u32(zip, 0)? != 0x0403_4b50 {
+        return None;
+    }
+    let flags = read_u16(zip, 6)?;
+    let method = read_u16(zip, 8)?;
+    let comp_size = read_u32(zip, 18)? as usize;
+    let uncomp_size = read_u32(zip, 22)? as usize;
+    let name_len = read_u16(zip, 26)? as usize;
+    let extra_len = read_u16(zip, 28)? as usize;
+
+    if (flags & 0x08) != 0 {
+        return None;
+    }
+
+    let data_off = 30usize.checked_add(name_len)?.checked_add(extra_len)?;
+    if data_off.checked_add(comp_size)? > zip.len() {
+        return None;
+    }
+    let data = &zip[data_off..data_off + comp_size];
+
+    match method {
+        0 => Some(data.to_vec()),
+        8 => {
+            let mut out = Vec::with_capacity(uncomp_size);
+            DeflateDecoder::new(data).read_to_end(&mut out).ok()?;
+            Some(out)
+        }
+        _ => None,
+    }
+}
+
+/// Gunzip; pass through already-inflated bytes (edge caches may decompress).
+pub fn maybe_gunzip(body: Vec<u8>) -> Vec<u8> {
+    if body.len() >= 2 && body[0] == 0x1f && body[1] == 0x8b {
+        let mut out = Vec::new();
+        if GzDecoder::new(&body[..]).read_to_end(&mut out).is_ok() && !out.is_empty() {
+            return out;
+        }
+    }
+    body
+}
+
+pub fn hex_encode(bytes: &[u8]) -> String {
+    const HEX: &[u8; 16] = b"0123456789abcdef";
+    let mut out = String::with_capacity(bytes.len() * 2);
+    for b in bytes {
+        out.push(HEX[(b >> 4) as usize] as char);
+        out.push(HEX[(b & 0x0f) as usize] as char);
+    }
+    out
+}
+
+fn preferred_host(server: &CContentServerDirectoryServerInfo) -> Option<&str> {
+    if !server.vhost.is_empty() {
+        Some(&server.vhost)
+    } else if !server.host.is_empty() {
+        Some(&server.host)
+    } else {
+        None
+    }
+}
+
+fn append_auth_query(url: &mut String, cdn_auth_token: &str) {
+    if cdn_auth_token.is_empty() {
+        return;
+    }
+    url.push('?');
+    url.push_str(cdn_auth_token.strip_prefix('?').unwrap_or(cdn_auth_token));
+}
+
+fn percent_encode_query_value(value: &str) -> String {
+    let mut out = String::with_capacity(value.len());
+    for byte in value.bytes() {
+        match byte {
+            b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => {
+                out.push(byte as char);
+            }
+            _ => {
+                const HEX: &[u8; 16] = b"0123456789ABCDEF";
+                out.push('%');
+                out.push(HEX[(byte >> 4) as usize] as char);
+                out.push(HEX[(byte & 0x0f) as usize] as char);
+            }
+        }
+    }
+    out
+}
+
+fn read_u16(buf: &[u8], off: usize) -> Option<u16> {
+    Some(u16::from_le_bytes(buf.get(off..off + 2)?.try_into().ok()?))
+}
+
+fn read_u32(buf: &[u8], off: usize) -> Option<u32> {
+    Some(u32::from_le_bytes(buf.get(off..off + 4)?.try_into().ok()?))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use flate2::{write::DeflateEncoder, Compression};
+    use std::io::Write;
+
+    #[test]
+    fn extracts_stored_zip_entry() {
+        let zip = zip_with_entry(0, b"manifest bytes");
+        assert_eq!(unzip_first_entry(&zip), Some(b"manifest bytes".to_vec()));
+    }
+
+    #[test]
+    fn extracts_deflated_zip_entry() {
+        let mut encoder = DeflateEncoder::new(Vec::new(), Compression::default());
+        encoder.write_all(b"manifest bytes").unwrap();
+        let deflated = encoder.finish().unwrap();
+        let zip = zip_with_compressed_entry(8, &deflated, b"manifest bytes".len() as u32);
+        assert_eq!(unzip_first_entry(&zip), Some(b"manifest bytes".to_vec()));
+    }
+
+    #[test]
+    fn rejects_data_descriptor_zip_entry() {
+        let mut zip = zip_with_entry(0, b"x");
+        zip[6] = 0x08;
+        assert_eq!(unzip_first_entry(&zip), None);
+    }
+
+    #[test]
+    fn hex_encodes_lowercase() {
+        assert_eq!(hex_encode(&[0, 1, 0xab, 0xff]), "0001abff");
+    }
+
+    #[test]
+    fn builds_http_appinfo_url() {
+        assert_eq!(
+            CdnClient::build_appinfo_url("cache1.steamcontent.com", 601150, &[0xab, 0xcd, 0x01]),
+            "http://cache1.steamcontent.com/appinfo/601150/sha/abcd01.txt.gz"
+        );
+    }
+
+    #[test]
+    fn gunzips_gzip_and_passes_through_plain_vdf() {
+        use flate2::{write::GzEncoder, Compression};
+        use std::io::Write;
+        let mut encoder = GzEncoder::new(Vec::new(), Compression::default());
+        encoder.write_all(b"\"appinfo\"{}").unwrap();
+        let gz = encoder.finish().unwrap();
+        assert_eq!(maybe_gunzip(gz), b"\"appinfo\"{}");
+        // Already-inflated payload (gzip magic absent) is returned verbatim.
+        assert_eq!(maybe_gunzip(b"\"appinfo\"{}".to_vec()), b"\"appinfo\"{}");
+    }
+
+    #[test]
+    fn builds_manifest_and_chunk_urls_like_cpp() {
+        let client = CdnClient::new("/cacert.pem");
+        let server = CContentServerDirectoryServerInfo {
+            host: "edge.steamcontent.com".into(),
+            vhost: "cdn.example".into(),
+            https_support: "mandatory".into(),
+            ..Default::default()
+        };
+        assert_eq!(
+            client
+                .build_manifest_url(&server, 100, 200, 300, "?token=abc")
+                .unwrap(),
+            "https://cdn.example:443/depot/100/manifest/200/5/300?token=abc"
+        );
+        assert_eq!(
+            client
+                .build_chunk_url(&server, 100, &[0xab, 0xcd], "token=abc")
+                .unwrap(),
+            "https://cdn.example:443/depot/100/chunk/abcd?token=abc"
+        );
+        assert_eq!(client.ca_bundle_path(), "/cacert.pem");
+        assert_eq!(CdnClient::default_timeout(), Duration::from_secs(30));
+        assert_eq!(CdnClient::connect_timeout(), Duration::from_secs(15));
+    }
+
+    #[test]
+    fn validates_http_status_lengths_and_manifest_zip() {
+        let zip = zip_with_entry(0, b"manifest bytes");
+        let ok = CdnClient::validate_manifest_response(200, zip.clone(), Some(zip.len() as u64));
+        assert!(ok.ok());
+        assert_eq!(ok.raw_manifest, b"manifest bytes");
+
+        let short = CdnClient::validate_manifest_response(200, zip, Some(999));
+        assert_eq!(short.error, "manifest body truncated (length mismatch)");
+
+        let chunk = CdnClient::validate_chunk_response(200, vec![1, 2, 3], Some(3));
+        assert!(chunk.ok());
+        assert_eq!(
+            CdnClient::validate_chunk_response(404, vec![], None).error,
+            "non-200 HTTP status"
+        );
+    }
+
+    #[test]
+    fn itemdef_url_escapes_digest_and_strips_nul() {
+        assert_eq!(
+            CdnClient::build_item_def_archive_url(480, "abc+/="),
+            "https://api.steampowered.com/IGameInventory/GetItemDefArchive/v1/?appid=480&digest=abc%2B%2F%3D"
+        );
+        assert_eq!(
+            CdnClient::strip_item_def_trailing_nul(b"[{\"x\":1}]\0".to_vec()),
+            b"[{\"x\":1}]"
+        );
+    }
+
+    #[test]
+    fn persistent_connection_state_matches_cpp_validity_contract() {
+        assert!(CdnClient::validate_connection(&CdnConnection::new()).is_ok());
+        assert_eq!(
+            CdnClient::validate_connection(&CdnConnection::invalid())
+                .unwrap_err()
+                .error,
+            "cdn connection invalid"
+        );
+    }
+
+    #[test]
+    fn persistent_connection_lazily_initializes_and_reuses_client() {
+        let client = CdnClient::new("");
+        let server = CContentServerDirectoryServerInfo {
+            host: "127.0.0.1".into(),
+            ..Default::default()
+        };
+        let mut conn = client.open_connection();
+        assert!(conn.client.is_none());
+
+        let _ = client.fetch_chunk_with_connection(
+            &mut conn,
+            &server,
+            100,
+            &[0xab, 0xcd],
+            "",
+            Duration::from_millis(50),
+        );
+        assert!(conn.client.is_some());
+
+        let first_client = conn
+            .client
+            .as_ref()
+            .map(|inner| inner as *const reqwest::blocking::Client)
+            .unwrap();
+        let _ = client.fetch_chunk_with_connection(
+            &mut conn,
+            &server,
+            100,
+            &[0xab, 0xcd],
+            "",
+            Duration::from_millis(50),
+        );
+        let second_client = conn
+            .client
+            .as_ref()
+            .map(|inner| inner as *const reqwest::blocking::Client)
+            .unwrap();
+        assert_eq!(first_client, second_client);
+    }
+
+    fn zip_with_entry(method: u16, data: &[u8]) -> Vec<u8> {
+        zip_with_compressed_entry(method, data, data.len() as u32)
+    }
+
+    fn zip_with_compressed_entry(method: u16, data: &[u8], uncomp_size: u32) -> Vec<u8> {
+        let mut out = Vec::new();
+        out.extend_from_slice(&0x0403_4b50u32.to_le_bytes());
+        out.extend_from_slice(&20u16.to_le_bytes());
+        out.extend_from_slice(&0u16.to_le_bytes());
+        out.extend_from_slice(&method.to_le_bytes());
+        out.extend_from_slice(&0u16.to_le_bytes());
+        out.extend_from_slice(&0u16.to_le_bytes());
+        out.extend_from_slice(&0u32.to_le_bytes());
+        out.extend_from_slice(&(data.len() as u32).to_le_bytes());
+        out.extend_from_slice(&uncomp_size.to_le_bytes());
+        out.extend_from_slice(&1u16.to_le_bytes());
+        out.extend_from_slice(&0u16.to_le_bytes());
+        out.extend_from_slice(b"x");
+        out.extend_from_slice(data);
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/chat_image.rs b/app/src/main/cpp/wn-steam-client/rust/src/chat_image.rs
new file mode 100644
index 000000000..8ecd155a4
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/chat_image.rs
@@ -0,0 +1,239 @@
+use sha1::{Digest, Sha1};
+use std::time::Duration;
+
+const COMMUNITY: &str = "https://steamcommunity.com";
+
+fn sha1_hex(bytes: &[u8]) -> String {
+    let mut hasher = Sha1::new();
+    hasher.update(bytes);
+    hasher
+        .finalize()
+        .iter()
+        .map(|b| format!("{:02x}", b))
+        .collect()
+}
+
+fn random_sessionid() -> String {
+    let mut bytes = [0u8; 12];
+    rand::Rng::fill(&mut rand::thread_rng(), &mut bytes[..]);
+    bytes.iter().map(|b| format!("{:02x}", b)).collect()
+}
+
+/// Best-effort image dimensions for PNG/JPEG/GIF without an image crate.
+fn image_dimensions(bytes: &[u8]) -> (u32, u32) {
+    if bytes.len() > 24 && &bytes[0..8] == b"\x89PNG\r\n\x1a\n" {
+        let w = u32::from_be_bytes([bytes[16], bytes[17], bytes[18], bytes[19]]);
+        let h = u32::from_be_bytes([bytes[20], bytes[21], bytes[22], bytes[23]]);
+        return (w, h);
+    }
+    if bytes.len() > 10 && (&bytes[0..6] == b"GIF89a" || &bytes[0..6] == b"GIF87a") {
+        let w = u16::from_le_bytes([bytes[6], bytes[7]]) as u32;
+        let h = u16::from_le_bytes([bytes[8], bytes[9]]) as u32;
+        return (w, h);
+    }
+    if bytes.len() > 4 && bytes[0] == 0xFF && bytes[1] == 0xD8 {
+        let mut i = 2usize;
+        while i + 9 < bytes.len() {
+            if bytes[i] != 0xFF {
+                i += 1;
+                continue;
+            }
+            let marker = bytes[i + 1];
+            if (0xC0..=0xCF).contains(&marker)
+                && marker != 0xC4
+                && marker != 0xC8
+                && marker != 0xCC
+            {
+                let h = u16::from_be_bytes([bytes[i + 5], bytes[i + 6]]) as u32;
+                let w = u16::from_be_bytes([bytes[i + 7], bytes[i + 8]]) as u32;
+                return (w, h);
+            }
+            let len = u16::from_be_bytes([bytes[i + 2], bytes[i + 3]]) as usize;
+            if len < 2 {
+                break;
+            }
+            i += 2 + len;
+        }
+    }
+    (0, 0)
+}
+
+fn content_type(bytes: &[u8]) -> &'static str {
+    if bytes.len() > 8 && &bytes[0..8] == b"\x89PNG\r\n\x1a\n" {
+        "image/png"
+    } else if bytes.len() > 3 && bytes[0] == 0xFF && bytes[1] == 0xD8 {
+        "image/jpeg"
+    } else if bytes.len() > 6 && (&bytes[0..6] == b"GIF89a" || &bytes[0..6] == b"GIF87a") {
+        "image/gif"
+    } else if bytes.len() > 12 && &bytes[0..4] == b"RIFF" && &bytes[8..12] == b"WEBP" {
+        "image/webp"
+    } else {
+        "image/png"
+    }
+}
+
+fn build_client(ca_bundle_path: &str) -> Result<reqwest::blocking::Client, String> {
+    let mut builder = reqwest::blocking::Client::builder()
+        .user_agent("Mozilla/5.0")
+        .connect_timeout(Duration::from_secs(15));
+    if !ca_bundle_path.is_empty() {
+        if let Ok(pem) = std::fs::read(ca_bundle_path) {
+            if let Ok(certs) = reqwest::Certificate::from_pem_bundle(&pem) {
+                for cert in certs {
+                    builder = builder.add_root_certificate(cert);
+                }
+            }
+        }
+    }
+    builder
+        .build()
+        .map_err(|err| format!("http client: {err}"))
+}
+
+fn json_get_str(value: &serde_json::Value, key: &str) -> String {
+    value
+        .get(key)
+        .and_then(|v| {
+            if v.is_string() {
+                v.as_str().map(|s| s.to_string())
+            } else if v.is_number() {
+                Some(v.to_string())
+            } else {
+                None
+            }
+        })
+        .unwrap_or_default()
+}
+
+/// Uploads an image to Steam's chat UGC and returns the resulting image URL.
+pub fn upload(
+    ca_bundle_path: &str,
+    self_steamid: u64,
+    friend_steamid: u64,
+    access_token: &str,
+    image: &[u8],
+    file_name: &str,
+) -> Result<String, String> {
+    if image.is_empty() {
+        return Err("image is empty".into());
+    }
+    let client = build_client(ca_bundle_path)?;
+    let sessionid = random_sessionid();
+    let cookie = format!(
+        "sessionid={sessionid}; steamLoginSecure={self_steamid}%7C%7C{access_token}"
+    );
+    let sha = sha1_hex(image);
+    let (width, height) = image_dimensions(image);
+    let size = image.len().to_string();
+    let width_s = width.to_string();
+    let height_s = height.to_string();
+
+    let begin = client
+        .post(format!("{COMMUNITY}/chat/beginfileupload/?l=english"))
+        .header("Cookie", cookie.as_str())
+        .header("Referer", format!("{COMMUNITY}/chat/"))
+        .header("Origin", COMMUNITY)
+        .form(&[
+            ("sessionid", sessionid.as_str()),
+            ("l", "english"),
+            ("file_size", size.as_str()),
+            ("file_name", file_name),
+            ("file_sha", sha.as_str()),
+            ("file_image_width", width_s.as_str()),
+            ("file_image_height", height_s.as_str()),
+            ("file_type", content_type(image)),
+        ])
+        .timeout(Duration::from_secs(30))
+        .send()
+        .map_err(|err| format!("begin send: {err}"))?;
+    let begin_status = begin.status().as_u16();
+    let begin_body = begin.text().map_err(|err| format!("begin body: {err}"))?;
+    if begin_status != 200 {
+        return Err(format!("begin http {begin_status}: {begin_body}"));
+    }
+    let begin_json: serde_json::Value =
+        serde_json::from_str(&begin_body).map_err(|err| format!("begin json: {err}"))?;
+    let payload = begin_json.get("result").unwrap_or(&begin_json);
+    let ugcid = json_get_str(payload, "ugcid");
+    let hmac = json_get_str(&begin_json, "hmac");
+    let timestamp = {
+        let top = json_get_str(&begin_json, "timestamp");
+        if top.is_empty() { json_get_str(payload, "timestamp") } else { top }
+    };
+    let url_host = json_get_str(payload, "url_host");
+    let url_path = json_get_str(payload, "url_path");
+    let use_https = payload
+        .get("use_https")
+        .and_then(|v| v.as_bool())
+        .unwrap_or(true);
+    if ugcid.is_empty() || url_host.is_empty() {
+        return Err(format!("begin missing ugcid/url_host: {begin_body}"));
+    }
+
+    let scheme = if use_https { "https" } else { "http" };
+    let put_url = format!("{scheme}://{url_host}{url_path}");
+    let mut put = client
+        .put(&put_url)
+        .header("Content-Type", content_type(image))
+        .body(image.to_vec())
+        .timeout(Duration::from_secs(45));
+    if let Some(headers) = payload.get("request_headers").and_then(|v| v.as_array()) {
+        for h in headers {
+            let name = json_get_str(h, "name");
+            let value = json_get_str(h, "value");
+            if !name.is_empty() {
+                put = put.header(name, value);
+            }
+        }
+    }
+    let put_resp = put.send().map_err(|err| format!("ugc put: {err}"))?;
+    let put_status = put_resp.status().as_u16();
+    if !(200..300).contains(&put_status) {
+        return Err(format!("ugc put http {put_status}"));
+    }
+
+    let commit = client
+        .post(format!("{COMMUNITY}/chat/commitfileupload/"))
+        .header("Cookie", cookie.as_str())
+        .header("Referer", format!("{COMMUNITY}/chat/"))
+        .header("Origin", COMMUNITY)
+        .form(&[
+            ("sessionid", sessionid.as_str()),
+            ("l", "english"),
+            ("file_name", file_name),
+            ("file_sha", sha.as_str()),
+            ("file_size", size.as_str()),
+            ("file_image_width", width_s.as_str()),
+            ("file_image_height", height_s.as_str()),
+            ("file_type", content_type(image)),
+            ("success", "1"),
+            ("ugcid", ugcid.as_str()),
+            ("timestamp", timestamp.as_str()),
+            ("hmac", hmac.as_str()),
+            ("friend_steamid", &friend_steamid.to_string()),
+            ("spoiler", "0"),
+        ])
+        .timeout(Duration::from_secs(30))
+        .send()
+        .map_err(|err| format!("commit send: {err}"))?;
+    let commit_status = commit.status().as_u16();
+    let commit_body = commit.text().map_err(|err| format!("commit body: {err}"))?;
+    if commit_status != 200 {
+        return Err(format!("commit http {commit_status}: {commit_body}"));
+    }
+    let commit_json: serde_json::Value =
+        serde_json::from_str(&commit_body).map_err(|err| format!("commit json: {err}"))?;
+    let details = commit_json
+        .get("result")
+        .and_then(|r| r.get("details"))
+        .ok_or_else(|| format!("commit no details: {commit_body}"))?;
+    let file_sha = json_get_str(details, "file_sha");
+    let sha_upper = if file_sha.is_empty() {
+        sha.to_uppercase()
+    } else {
+        file_sha.to_uppercase()
+    };
+    Ok(format!(
+        "https://images.steamusercontent.com/ugc/{ugcid}/{sha_upper}/"
+    ))
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cm_bridge.rs b/app/src/main/cpp/wn-steam-client/rust/src/cm_bridge.rs
new file mode 100644
index 000000000..cf07a2028
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cm_bridge.rs
@@ -0,0 +1,1538 @@
+use crate::cm_client::{AccountInfoSnapshot, CMClientCore, FriendPersonaSnapshot};
+use crate::emsg::EMsg;
+use crate::pb::cmsg_client_license_list::License;
+use crate::pb::cmsg_client_mms_lobby_data::CMsgClientMMSLobbyData;
+use crate::pb::cmsg_client_mms_lobby_ops::{
+    CMsgClientMMSLobbyChatMsg, CMsgClientMMSUserJoinedOrLeftLobby,
+};
+use crate::pb::cmsg_client_persona::PersonaStateFriend;
+use std::env;
+use std::ffi::{CStr, CString};
+use std::fs;
+use std::io::Write;
+use std::os::raw::c_char;
+use std::path::{Path, PathBuf};
+use std::ptr;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex, OnceLock};
+use std::thread;
+use std::time::{Duration, SystemTime};
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct WnCmRichPresenceKV {
+    pub key: *const c_char,
+    pub value: *const c_char,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct WnCmPersonaEvent {
+    pub sid: u64,
+    pub persona_state: u32,
+    pub game_played_app: u32,
+    pub name: *const c_char,
+    pub avatar_hash: *const u8,
+    pub avatar_hash_len: usize,
+    pub rp_pairs: *const WnCmRichPresenceKV,
+    pub rp_count: usize,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct WnCmLicenseEntry {
+    pub package_id: u32,
+    pub owner_id: u32,
+    pub time_created: u32,
+    pub license_type: u32,
+    pub flags: u32,
+    pub change_number: i32,
+    pub minute_limit: i32,
+    pub minutes_used: i32,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct WnCmAccountInfo {
+    pub persona_name: *const c_char,
+    pub persona_name_len: usize,
+    pub ip_country: *const c_char,
+    pub ip_country_len: usize,
+    pub two_factor_enabled: bool,
+    pub phone_verified: bool,
+    pub phone_identifying: bool,
+    pub phone_requires_verification: bool,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct WnCmLobbyEntry {
+    pub steam_id: u64,
+    pub max_members: i32,
+    pub num_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub ping_ms: i32,
+    pub weight: i64,
+    pub distance: f32,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct WnCmLobbyMember {
+    pub steam_id: u64,
+    pub persona_name: *const c_char,
+    pub metadata_bytes: *const u8,
+    pub metadata_len: usize,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct WnCmLobbyData {
+    pub steam_id_lobby: u64,
+    pub steam_id_owner: u64,
+    pub app_id: u32,
+    pub max_members: i32,
+    pub num_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub metadata_bytes: *const u8,
+    pub metadata_len: usize,
+    pub members: *const WnCmLobbyMember,
+    pub member_count: usize,
+}
+
+pub type WnCmPersonaObserverFn = Option<extern "C" fn(*const WnCmPersonaEvent)>;
+pub type WnCmLogonStateObserverFn = Option<extern "C" fn(bool)>;
+pub type WnCmFriendsListObserverFn = Option<extern "C" fn(*const u64, usize)>;
+pub type WnCmLicenseListObserverFn = Option<extern "C" fn(*const WnCmLicenseEntry, usize)>;
+pub type WnCmAccountInfoObserverFn = Option<extern "C" fn(*const WnCmAccountInfo)>;
+pub type WnCmServerRealTimeObserverFn = Option<extern "C" fn(u32)>;
+pub type WnCmLobbyListCb = Option<extern "C" fn(u64, i32, *const WnCmLobbyEntry, usize)>;
+pub type WnCmLobbyDataObserverFn = Option<extern "C" fn(*const WnCmLobbyData)>;
+pub type WnCmLobbyCreatedCb = Option<extern "C" fn(u64, i32, u64)>;
+pub type WnCmLobbyJoinedCb = Option<extern "C" fn(u64, i32, u64)>;
+pub type WnCmLobbySetDataCb = Option<extern "C" fn(u64, i32)>;
+pub type WnCmLobbySetOwnerCb = Option<extern "C" fn(u64, i32)>;
+pub type WnCmLobbyChatMsgObserverFn = Option<extern "C" fn(u64, u64, *const u8, usize)>;
+pub type WnCmLobbyMembershipObserverFn = Option<extern "C" fn(i32, u64, u64, *const c_char)>;
+
+#[derive(Default)]
+pub struct CmBridgeObservers {
+    persona: Mutex<WnCmPersonaObserverFn>,
+    logon_state: Mutex<WnCmLogonStateObserverFn>,
+    friends_list: Mutex<WnCmFriendsListObserverFn>,
+    license_list: Mutex<WnCmLicenseListObserverFn>,
+    account_info: Mutex<WnCmAccountInfoObserverFn>,
+    server_realtime: Mutex<WnCmServerRealTimeObserverFn>,
+    lobby_data: Mutex<WnCmLobbyDataObserverFn>,
+    lobby_chat_msg: Mutex<WnCmLobbyChatMsgObserverFn>,
+    lobby_membership: Mutex<WnCmLobbyMembershipObserverFn>,
+}
+
+impl CmBridgeObservers {
+    pub fn register_persona(&self, callback: WnCmPersonaObserverFn) {
+        *self.persona.lock().expect("persona observer poisoned") = callback;
+    }
+
+    pub fn dispatch_persona(&self, event: &WnCmPersonaEvent) {
+        if let Some(callback) = *self.persona.lock().expect("persona observer poisoned") {
+            callback(event);
+        }
+    }
+
+    pub fn register_logon_state(&self, callback: WnCmLogonStateObserverFn) {
+        *self.logon_state.lock().expect("logon observer poisoned") = callback;
+    }
+
+    pub fn dispatch_logon_state(&self, logged_on: bool) {
+        if let Some(callback) = *self.logon_state.lock().expect("logon observer poisoned") {
+            callback(logged_on);
+        }
+    }
+
+    pub fn register_friends_list(&self, callback: WnCmFriendsListObserverFn) {
+        *self.friends_list.lock().expect("friends observer poisoned") = callback;
+    }
+
+    pub fn dispatch_friends_list(&self, friends: &[u64]) {
+        if let Some(callback) = *self.friends_list.lock().expect("friends observer poisoned") {
+            callback(friends.as_ptr(), friends.len());
+        }
+    }
+
+    pub fn register_license_list(&self, callback: WnCmLicenseListObserverFn) {
+        *self.license_list.lock().expect("license observer poisoned") = callback;
+    }
+
+    pub fn dispatch_license_list(&self, licenses: &[WnCmLicenseEntry]) {
+        if let Some(callback) = *self.license_list.lock().expect("license observer poisoned") {
+            callback(licenses.as_ptr(), licenses.len());
+        }
+    }
+
+    pub fn register_account_info(&self, callback: WnCmAccountInfoObserverFn) {
+        *self.account_info.lock().expect("account observer poisoned") = callback;
+    }
+
+    pub fn dispatch_account_info(&self, info: &WnCmAccountInfo) {
+        if let Some(callback) = *self.account_info.lock().expect("account observer poisoned") {
+            callback(info);
+        }
+    }
+
+    pub fn register_server_realtime(&self, callback: WnCmServerRealTimeObserverFn) {
+        *self
+            .server_realtime
+            .lock()
+            .expect("server observer poisoned") = callback;
+    }
+
+    pub fn dispatch_server_realtime(&self, server_realtime: u32) {
+        if server_realtime == 0 {
+            return;
+        }
+        if let Some(callback) = *self
+            .server_realtime
+            .lock()
+            .expect("server observer poisoned")
+        {
+            callback(server_realtime);
+        }
+    }
+
+    pub fn register_lobby_data(&self, callback: WnCmLobbyDataObserverFn) {
+        *self
+            .lobby_data
+            .lock()
+            .expect("lobby data observer poisoned") = callback;
+    }
+
+    pub fn dispatch_lobby_data(&self, data: &WnCmLobbyData) {
+        if let Some(callback) = *self
+            .lobby_data
+            .lock()
+            .expect("lobby data observer poisoned")
+        {
+            callback(data);
+        }
+    }
+
+    pub fn register_lobby_chat_msg(&self, callback: WnCmLobbyChatMsgObserverFn) {
+        *self
+            .lobby_chat_msg
+            .lock()
+            .expect("lobby chat observer poisoned") = callback;
+    }
+
+    pub fn dispatch_lobby_chat_msg(&self, lobby_sid: u64, sender_sid: u64, bytes: &[u8]) {
+        if let Some(callback) = *self
+            .lobby_chat_msg
+            .lock()
+            .expect("lobby chat observer poisoned")
+        {
+            callback(lobby_sid, sender_sid, bytes.as_ptr(), bytes.len());
+        }
+    }
+
+    pub fn register_lobby_membership(&self, callback: WnCmLobbyMembershipObserverFn) {
+        *self
+            .lobby_membership
+            .lock()
+            .expect("lobby membership observer poisoned") = callback;
+    }
+
+    pub fn dispatch_lobby_membership(
+        &self,
+        joined: bool,
+        lobby_sid: u64,
+        user_sid: u64,
+        persona_name: &CStr,
+    ) {
+        if let Some(callback) = *self
+            .lobby_membership
+            .lock()
+            .expect("lobby membership observer poisoned")
+        {
+            callback(
+                if joined { 1 } else { 0 },
+                lobby_sid,
+                user_sid,
+                persona_name.as_ptr(),
+            );
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct CmBridge {
+    active: Mutex<Option<Arc<CMClientCore>>>,
+    observers: CmBridgeObservers,
+}
+
+impl CmBridge {
+    pub fn set_active(&self, client: Arc<CMClientCore>) {
+        *self.active.lock().expect("active client poisoned") = Some(client);
+    }
+
+    pub fn clear_active(&self) {
+        *self.active.lock().expect("active client poisoned") = None;
+    }
+
+    pub fn active(&self) -> Option<Arc<CMClientCore>> {
+        self.active.lock().expect("active client poisoned").clone()
+    }
+
+    pub fn observers(&self) -> &CmBridgeObservers {
+        &self.observers
+    }
+
+    pub fn inject_ownership_ticket(&self, app_id: u32, ticket: &[u8]) -> bool {
+        if app_id == 0 || ticket.is_empty() {
+            return false;
+        }
+        let Some(client) = self.active() else {
+            return false;
+        };
+        client.tickets().store(app_id, 1, ticket.to_vec());
+        true
+    }
+
+    pub fn cached_ownership_ticket(&self, app_id: u32) -> Option<Vec<u8>> {
+        if app_id == 0 {
+            return None;
+        }
+        self.active()
+            .and_then(|client| client.tickets().get(app_id))
+            .filter(|ticket| ticket.eresult == 1 && !ticket.ticket.is_empty())
+            .map(|ticket| ticket.ticket)
+    }
+
+    pub fn dispatch_client_snapshots(&self, client: &CMClientCore) {
+        let friends = client.friends_list();
+        self.observers.dispatch_friends_list(&friends);
+
+        let licenses = client
+            .license_list()
+            .iter()
+            .map(WnCmLicenseEntry::from)
+            .collect::<Vec<_>>();
+        self.observers.dispatch_license_list(&licenses);
+
+        if let Some(self_persona) = client.self_persona() {
+            self.dispatch_persona_friend(&self_persona);
+        }
+
+        self.observers
+            .dispatch_server_realtime(client.server_realtime());
+    }
+
+    pub fn dispatch_persona_friend(&self, friend: &PersonaStateFriend) {
+        let name = CString::new(friend.player_name.as_str()).unwrap_or_default();
+        let key_values = friend
+            .rich_presence
+            .iter()
+            .map(|(key, value)| {
+                (
+                    CString::new(key.as_str()).unwrap_or_default(),
+                    CString::new(value.as_str()).unwrap_or_default(),
+                )
+            })
+            .collect::<Vec<_>>();
+        let pairs = key_values
+            .iter()
+            .map(|(key, value)| WnCmRichPresenceKV {
+                key: key.as_ptr(),
+                value: value.as_ptr(),
+            })
+            .collect::<Vec<_>>();
+        let event = WnCmPersonaEvent {
+            sid: friend.friendid,
+            persona_state: friend.persona_state,
+            game_played_app: friend.game_played_app_id,
+            name: name.as_ptr(),
+            avatar_hash: friend.avatar_hash.as_ptr(),
+            avatar_hash_len: friend.avatar_hash.len(),
+            rp_pairs: pairs.as_ptr(),
+            rp_count: pairs.len(),
+        };
+        self.observers.dispatch_persona(&event);
+    }
+
+    pub fn dispatch_persona_snapshot(&self, snapshot: &FriendPersonaSnapshot) {
+        let name = CString::new(snapshot.player_name.as_str()).unwrap_or_default();
+        let key_values = snapshot
+            .rich_presence
+            .iter()
+            .map(|(key, value)| {
+                (
+                    CString::new(key.as_str()).unwrap_or_default(),
+                    CString::new(value.as_str()).unwrap_or_default(),
+                )
+            })
+            .collect::<Vec<_>>();
+        let pairs = key_values
+            .iter()
+            .map(|(key, value)| WnCmRichPresenceKV {
+                key: key.as_ptr(),
+                value: value.as_ptr(),
+            })
+            .collect::<Vec<_>>();
+        let event = WnCmPersonaEvent {
+            sid: snapshot.sid,
+            persona_state: snapshot.persona_state,
+            game_played_app: snapshot.game_played_app_id,
+            name: if snapshot.player_name.is_empty() {
+                ptr::null()
+            } else {
+                name.as_ptr()
+            },
+            avatar_hash: snapshot.avatar_hash.as_ptr(),
+            avatar_hash_len: snapshot.avatar_hash.len(),
+            rp_pairs: if pairs.is_empty() {
+                ptr::null()
+            } else {
+                pairs.as_ptr()
+            },
+            rp_count: pairs.len(),
+        };
+        self.observers.dispatch_persona(&event);
+    }
+
+    pub fn dispatch_account_info_snapshot(&self, snapshot: &AccountInfoSnapshot) {
+        let persona_name = CString::new(snapshot.persona_name.as_str()).unwrap_or_default();
+        let ip_country = CString::new(snapshot.ip_country.as_str()).unwrap_or_default();
+        let info = WnCmAccountInfo {
+            persona_name: if snapshot.persona_name.is_empty() {
+                ptr::null()
+            } else {
+                persona_name.as_ptr()
+            },
+            persona_name_len: snapshot.persona_name.len(),
+            ip_country: if snapshot.ip_country.is_empty() {
+                ptr::null()
+            } else {
+                ip_country.as_ptr()
+            },
+            ip_country_len: snapshot.ip_country.len(),
+            two_factor_enabled: snapshot.two_factor_enabled,
+            phone_verified: snapshot.phone_verified,
+            phone_identifying: snapshot.phone_identifying,
+            phone_requires_verification: snapshot.phone_requires_verification,
+        };
+        self.observers.dispatch_account_info(&info);
+    }
+
+    pub fn dispatch_lobby_push(&self, emsg: EMsg, body: &[u8]) -> bool {
+        match emsg {
+            EMsg::CLIENT_MMS_LOBBY_DATA => {
+                let Some(msg) = CMsgClientMMSLobbyData::deserialize(body) else {
+                    return false;
+                };
+                self.dispatch_lobby_data_message(&msg);
+                true
+            }
+            EMsg::CLIENT_MMS_LOBBY_CHAT_MSG => {
+                let Some(msg) = CMsgClientMMSLobbyChatMsg::deserialize(body) else {
+                    return false;
+                };
+                self.observers.dispatch_lobby_chat_msg(
+                    msg.steam_id_lobby,
+                    msg.steam_id_sender,
+                    &msg.lobby_message,
+                );
+                true
+            }
+            EMsg::CLIENT_MMS_USER_JOINED_LOBBY | EMsg::CLIENT_MMS_USER_LEFT_LOBBY => {
+                let Some(msg) = CMsgClientMMSUserJoinedOrLeftLobby::deserialize(body) else {
+                    return false;
+                };
+                let persona_name = CString::new(msg.persona_name.as_str()).unwrap_or_default();
+                self.observers.dispatch_lobby_membership(
+                    emsg == EMsg::CLIENT_MMS_USER_JOINED_LOBBY,
+                    msg.steam_id_lobby,
+                    msg.steam_id_user,
+                    &persona_name,
+                );
+                true
+            }
+            _ => false,
+        }
+    }
+
+    pub fn dispatch_lobby_data_message(&self, msg: &CMsgClientMMSLobbyData) {
+        let member_names = msg
+            .members
+            .iter()
+            .map(|member| CString::new(member.persona_name.as_str()).unwrap_or_default())
+            .collect::<Vec<_>>();
+        let members = msg
+            .members
+            .iter()
+            .zip(member_names.iter())
+            .map(|(member, name)| WnCmLobbyMember {
+                steam_id: member.steam_id,
+                persona_name: name.as_ptr(),
+                metadata_bytes: member.metadata.as_ptr(),
+                metadata_len: member.metadata.len(),
+            })
+            .collect::<Vec<_>>();
+        let data = WnCmLobbyData {
+            steam_id_lobby: msg.steam_id_lobby,
+            steam_id_owner: msg.steam_id_owner,
+            app_id: msg.app_id,
+            max_members: msg.max_members,
+            num_members: msg.num_members,
+            lobby_type: msg.lobby_type,
+            lobby_flags: msg.lobby_flags,
+            metadata_bytes: msg.metadata.as_ptr(),
+            metadata_len: msg.metadata.len(),
+            members: members.as_ptr(),
+            member_count: members.len(),
+        };
+        self.observers.dispatch_lobby_data(&data);
+    }
+}
+
+impl From<&License> for WnCmLicenseEntry {
+    fn from(license: &License) -> Self {
+        Self {
+            package_id: license.package_id,
+            owner_id: license.owner_id,
+            time_created: license.time_created,
+            license_type: license.license_type,
+            flags: license.flags,
+            change_number: license.change_number,
+            minute_limit: license.minute_limit,
+            minutes_used: license.minutes_used,
+        }
+    }
+}
+
+pub fn global_bridge() -> &'static CmBridge {
+    static BRIDGE: OnceLock<CmBridge> = OnceLock::new();
+    BRIDGE.get_or_init(CmBridge::default)
+}
+
+pub fn set_active_core(client: Arc<CMClientCore>) {
+    global_bridge().set_active(client);
+}
+
+pub fn clear_active_core() {
+    global_bridge().clear_active();
+}
+
+fn state_sync_poller_running() -> &'static AtomicBool {
+    static RUNNING: OnceLock<AtomicBool> = OnceLock::new();
+    RUNNING.get_or_init(|| AtomicBool::new(false))
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_set_persona_state(persona_state: i32) -> bool {
+    if persona_state < 0 {
+        return false;
+    }
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    client.enqueue_proto_message(client.build_set_persona_state(persona_state as u32))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_set_persona_name(name: *const c_char, persona_state: i32) -> bool {
+    if name.is_null() || global_bridge().active().is_none() {
+        return false;
+    }
+    let name = unsafe { CStr::from_ptr(name) }
+        .to_string_lossy()
+        .into_owned();
+    if name.is_empty() {
+        return false;
+    }
+    let persona_state = if persona_state < 0 {
+        1
+    } else {
+        persona_state as u32
+    };
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    client.enqueue_proto_message(client.build_set_persona_name(name, persona_state))
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_request_user_info(steam_id: u64, flags: i32) -> bool {
+    if steam_id == 0 {
+        return false;
+    }
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    let flags = if flags <= 0 { 0x47 } else { flags as u32 };
+    client.enqueue_proto_message(client.build_request_friend_personas(&[steam_id], flags))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_request_user_info_bulk(
+    sids: *const u64,
+    count: usize,
+    _flags: i32,
+) -> bool {
+    if sids.is_null() || count == 0 || global_bridge().active().is_none() {
+        return false;
+    }
+    let slice = unsafe { std::slice::from_raw_parts(sids, count) };
+    let sids = slice
+        .iter()
+        .copied()
+        .filter(|sid| *sid != 0)
+        .collect::<Vec<_>>();
+    if sids.is_empty() {
+        return false;
+    }
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    let flags = if _flags <= 0 { 0x47 } else { _flags as u32 };
+    client.enqueue_proto_message(client.build_request_friend_personas(&sids, flags))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_get_cached_app_ownership_ticket(
+    app_id: u32,
+    out_buf: *mut u8,
+    max_len: usize,
+    out_len: *mut usize,
+) -> bool {
+    if out_len.is_null() {
+        return false;
+    }
+    let Some(ticket) = global_bridge().cached_ownership_ticket(app_id) else {
+        unsafe {
+            *out_len = 0;
+        }
+        return false;
+    };
+    unsafe {
+        *out_len = ticket.len();
+    }
+    if out_buf.is_null() || max_len < ticket.len() {
+        return false;
+    }
+    unsafe {
+        ptr::copy_nonoverlapping(ticket.as_ptr(), out_buf, ticket.len());
+    }
+    true
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_inject_test_ownership_ticket(
+    app_id: u32,
+    bytes: *const u8,
+    len: usize,
+) -> bool {
+    if bytes.is_null() && len != 0 {
+        return false;
+    }
+    let ticket = if len == 0 {
+        &[]
+    } else {
+        unsafe { std::slice::from_raw_parts(bytes, len) }
+    };
+    global_bridge().inject_ownership_ticket(app_id, ticket)
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_notify_games_played(app_id: u32) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    client.enqueue_proto_message(client.build_notify_games_played(app_id))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_set_rich_presence(
+    app_id: u32,
+    keys: *const *const c_char,
+    values: *const *const c_char,
+    count: usize,
+) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    if count == 0 {
+        return client.enqueue_service_call(client.build_rich_presence_call(app_id, Vec::new(), 0));
+    }
+    if keys.is_null() {
+        return false;
+    }
+    let key_slice = unsafe { std::slice::from_raw_parts(keys, count) };
+    let value_slice = if values.is_null() {
+        Vec::new()
+    } else {
+        unsafe { std::slice::from_raw_parts(values, count) }.to_vec()
+    };
+    let kv = key_slice
+        .iter()
+        .enumerate()
+        .filter_map(|(idx, key)| {
+            if key.is_null() {
+                return None;
+            }
+            let key = unsafe { CStr::from_ptr(*key) }
+                .to_string_lossy()
+                .into_owned();
+            if key.is_empty() {
+                return None;
+            }
+            let value = value_slice
+                .get(idx)
+                .copied()
+                .filter(|ptr| !ptr.is_null())
+                .map(|ptr| {
+                    unsafe { CStr::from_ptr(ptr) }
+                        .to_string_lossy()
+                        .into_owned()
+                })
+                .unwrap_or_default();
+            Some((key, value))
+        })
+        .collect::<Vec<_>>();
+    client.enqueue_service_call(client.build_rich_presence_call(app_id, kv, 0))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_store_user_stats(
+    app_id: u32,
+    _crc_stats: u32,
+    stat_ids: *const u32,
+    stat_values: *const u32,
+    count: usize,
+) -> bool {
+    if app_id == 0 {
+        return false;
+    }
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    if client.steam_id() == 0 {
+        return false;
+    }
+    if count != 0 && (stat_ids.is_null() || stat_values.is_null()) {
+        return false;
+    }
+    let stats = if count == 0 {
+        Vec::new()
+    } else {
+        let ids = unsafe { std::slice::from_raw_parts(stat_ids, count) };
+        let values = unsafe { std::slice::from_raw_parts(stat_values, count) };
+        ids.iter()
+            .copied()
+            .zip(values.iter().copied())
+            .collect::<Vec<_>>()
+    };
+    client.enqueue_proto_message(client.build_store_user_stats(
+        app_id,
+        client.steam_id(),
+        _crc_stats,
+        &stats,
+    ))
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_persona_observer(callback: WnCmPersonaObserverFn) {
+    global_bridge().observers.register_persona(callback);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_dispatch_persona(event: *const WnCmPersonaEvent) {
+    if let Some(event) = unsafe { event.as_ref() } {
+        global_bridge().observers.dispatch_persona(event);
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_logon_state_observer(callback: WnCmLogonStateObserverFn) {
+    global_bridge().observers.register_logon_state(callback);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_dispatch_logon_state(logged_on: bool) {
+    global_bridge().observers.dispatch_logon_state(logged_on);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_inject_test_logon_state(logged_on: bool) {
+    wn_cm_bridge_dispatch_logon_state(logged_on);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_friends_list_observer(callback: WnCmFriendsListObserverFn) {
+    global_bridge().observers.register_friends_list(callback);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_dispatch_friends_list(sids: *const u64, count: usize) {
+    if count == 0 {
+        global_bridge().observers.dispatch_friends_list(&[]);
+        return;
+    }
+    if sids.is_null() {
+        return;
+    }
+    let friends = unsafe { std::slice::from_raw_parts(sids, count) };
+    global_bridge().observers.dispatch_friends_list(friends);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_inject_test_friends_list(sids: *const u64, count: usize) {
+    unsafe { wn_cm_bridge_dispatch_friends_list(sids, count) };
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_license_list_observer(callback: WnCmLicenseListObserverFn) {
+    global_bridge().observers.register_license_list(callback);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_dispatch_license_list(
+    licenses: *const WnCmLicenseEntry,
+    count: usize,
+) {
+    if count == 0 {
+        global_bridge().observers.dispatch_license_list(&[]);
+        return;
+    }
+    if licenses.is_null() {
+        return;
+    }
+    let licenses = unsafe { std::slice::from_raw_parts(licenses, count) };
+    global_bridge().observers.dispatch_license_list(licenses);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_inject_test_license_list(
+    licenses: *const WnCmLicenseEntry,
+    count: usize,
+) {
+    unsafe { wn_cm_bridge_dispatch_license_list(licenses, count) };
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_account_info_observer(callback: WnCmAccountInfoObserverFn) {
+    global_bridge().observers.register_account_info(callback);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_dispatch_account_info(info: *const WnCmAccountInfo) {
+    if let Some(info) = unsafe { info.as_ref() } {
+        global_bridge().observers.dispatch_account_info(info);
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_bridge_inject_test_account_info(info: *const WnCmAccountInfo) {
+    unsafe { wn_cm_bridge_dispatch_account_info(info) };
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_server_realtime_observer(
+    callback: WnCmServerRealTimeObserverFn,
+) {
+    global_bridge().observers.register_server_realtime(callback);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_dispatch_server_realtime(server_realtime: u32) {
+    global_bridge()
+        .observers
+        .dispatch_server_realtime(server_realtime);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_lobby_data_observer(callback: WnCmLobbyDataObserverFn) {
+    global_bridge().observers.register_lobby_data(callback);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_lobby_chat_msg_observer(
+    callback: WnCmLobbyChatMsgObserverFn,
+) {
+    global_bridge().observers.register_lobby_chat_msg(callback);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_register_lobby_membership_observer(
+    callback: WnCmLobbyMembershipObserverFn,
+) {
+    global_bridge()
+        .observers
+        .register_lobby_membership(callback);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_start_state_sync_poller() {
+    state_sync_poller_running().store(true, Ordering::Release);
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_bridge_stop_state_sync_poller() {
+    state_sync_poller_running().store(false, Ordering::Release);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_lobby_get_list(
+    hcall: u64,
+    app_id: u32,
+    num_lobbies_requested: i32,
+    filter_keys: *const *const c_char,
+    filter_values: *const *const c_char,
+    filter_comparisons: *const i32,
+    filter_types: *const i32,
+    filter_count: usize,
+    callback: WnCmLobbyListCb,
+) -> bool {
+    let Some(callback) = callback else {
+        return false;
+    };
+    if app_id == 0 {
+        return false;
+    }
+    if let Some(client) = global_bridge().active() {
+        let mut filters = Vec::new();
+        if !filter_keys.is_null() && filter_count != 0 {
+            let keys = unsafe { std::slice::from_raw_parts(filter_keys, filter_count) };
+            let values = if filter_values.is_null() {
+                Vec::new()
+            } else {
+                unsafe { std::slice::from_raw_parts(filter_values, filter_count) }.to_vec()
+            };
+            let comparisons = if filter_comparisons.is_null() {
+                Vec::new()
+            } else {
+                unsafe { std::slice::from_raw_parts(filter_comparisons, filter_count) }.to_vec()
+            };
+            let types = if filter_types.is_null() {
+                Vec::new()
+            } else {
+                unsafe { std::slice::from_raw_parts(filter_types, filter_count) }.to_vec()
+            };
+            filters = keys
+                .iter()
+                .enumerate()
+                .filter_map(|(idx, key)| {
+                    if key.is_null() {
+                        return None;
+                    }
+                    let key = unsafe { CStr::from_ptr(*key) }
+                        .to_string_lossy()
+                        .into_owned();
+                    if key.is_empty() {
+                        return None;
+                    }
+                    let value = values
+                        .get(idx)
+                        .copied()
+                        .filter(|ptr| !ptr.is_null())
+                        .map(|ptr| unsafe { CStr::from_ptr(ptr) }.to_string_lossy().into_owned())
+                        .unwrap_or_default();
+                    Some(crate::pb::cmsg_client_mms_get_lobby_list::CMsgClientMMSGetLobbyListFilter {
+                        key,
+                        value,
+                        comparision: comparisons.get(idx).copied().unwrap_or_default(),
+                        filter_type: types.get(idx).copied().unwrap_or_default(),
+                    })
+                })
+                .collect();
+        }
+        return client.enqueue_proto_message(client.build_lobby_get_list(
+            app_id,
+            filters,
+            num_lobbies_requested,
+            hcall,
+        ));
+    }
+    try_lobby_list_from_file(hcall, app_id, callback)
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_lobby_create(
+    hcall: u64,
+    app_id: u32,
+    _lobby_type: i32,
+    _max_members: i32,
+    callback: WnCmLobbyCreatedCb,
+) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    if app_id == 0 {
+        return false;
+    }
+    let ok = client.enqueue_proto_message(client.build_lobby_create(
+        app_id,
+        _lobby_type,
+        _max_members,
+        hcall,
+    ));
+    if !ok {
+        if let Some(callback) = callback {
+            callback(hcall, -1, 0);
+        }
+    }
+    ok
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_lobby_join(
+    hcall: u64,
+    _app_id: u32,
+    lobby_sid: u64,
+    callback: WnCmLobbyJoinedCb,
+) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    if lobby_sid == 0 {
+        return false;
+    }
+    let ok = client.enqueue_proto_message(client.build_lobby_join(_app_id, lobby_sid, hcall));
+    if !ok {
+        if let Some(callback) = callback {
+            callback(hcall, -1, lobby_sid);
+        }
+    }
+    ok
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_lobby_leave(app_id: u32, lobby_sid: u64) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    client.enqueue_proto_message(client.build_lobby_leave(app_id, lobby_sid))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_lobby_send_chat(
+    _app_id: u32,
+    lobby_sid: u64,
+    data: *const u8,
+    len: usize,
+) -> bool {
+    if lobby_sid == 0 || data.is_null() || len == 0 {
+        return false;
+    }
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    let data = unsafe { std::slice::from_raw_parts(data, len) }.to_vec();
+    client.enqueue_proto_message(client.build_lobby_send_chat(_app_id, lobby_sid, data))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wn_cm_lobby_set_data(
+    hcall: u64,
+    _app_id: u32,
+    lobby_sid: u64,
+    _steam_id_member: u64,
+    metadata: *const u8,
+    metadata_len: usize,
+    _max_members: i32,
+    _lobby_type: i32,
+    _lobby_flags: i32,
+    callback: WnCmLobbySetDataCb,
+) -> bool {
+    if lobby_sid == 0 || (metadata.is_null() && metadata_len != 0) {
+        return false;
+    }
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    let metadata = if metadata_len == 0 {
+        Vec::new()
+    } else {
+        unsafe { std::slice::from_raw_parts(metadata, metadata_len) }.to_vec()
+    };
+    let ok = client.enqueue_proto_message(client.build_lobby_set_data(
+        _app_id,
+        lobby_sid,
+        _steam_id_member,
+        metadata,
+        _max_members,
+        _lobby_type,
+        _lobby_flags,
+        hcall,
+    ));
+    if !ok {
+        if let Some(callback) = callback {
+            callback(hcall, -1);
+        }
+    }
+    ok
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_lobby_set_owner(
+    hcall: u64,
+    _app_id: u32,
+    lobby_sid: u64,
+    new_owner_sid: u64,
+    callback: WnCmLobbySetOwnerCb,
+) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    if lobby_sid == 0 || new_owner_sid == 0 {
+        return false;
+    }
+    let ok = client.enqueue_proto_message(client.build_lobby_set_owner(
+        _app_id,
+        lobby_sid,
+        new_owner_sid,
+        hcall,
+    ));
+    if !ok {
+        if let Some(callback) = callback {
+            callback(hcall, -1);
+        }
+    }
+    ok
+}
+
+#[no_mangle]
+pub extern "C" fn wn_cm_lobby_invite_user(app_id: u32, lobby_sid: u64, invitee_sid: u64) -> bool {
+    let Some(client) = global_bridge().active() else {
+        return false;
+    };
+    client.enqueue_proto_message(client.build_lobby_invite_user(app_id, lobby_sid, invitee_sid))
+}
+
+pub fn state_dir() -> PathBuf {
+    env::var_os("WN_STATE_DIR")
+        .filter(|dir| !dir.is_empty())
+        .map(PathBuf::from)
+        .unwrap_or_else(|| PathBuf::from("/tmp"))
+}
+
+pub fn lobby_state_path(dir: &Path, app_id: u32) -> PathBuf {
+    dir.join(format!("wn_lobby_{app_id}.txt"))
+}
+
+pub fn lobby_request_path(dir: &Path, app_id: u32) -> PathBuf {
+    dir.join(format!("wn_lobby_req_{app_id}.txt"))
+}
+
+pub fn write_lobby_list_to_file(
+    dir: &Path,
+    app_id: u32,
+    eresult: i32,
+    entries: &[WnCmLobbyEntry],
+) -> std::io::Result<()> {
+    fs::create_dir_all(dir)?;
+    let final_path = lobby_state_path(dir, app_id);
+    let tmp_path = final_path.with_extension("txt.tmp");
+    {
+        let mut file = fs::File::create(&tmp_path)?;
+        writeln!(file, "app_id {app_id}")?;
+        writeln!(
+            file,
+            "fetched {}",
+            SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_secs()
+        )?;
+        writeln!(file, "eresult {eresult}")?;
+        for entry in entries {
+            writeln!(file, "lobby {} {}", entry.steam_id, entry.max_members)?;
+        }
+    }
+    fs::rename(tmp_path, final_path)
+}
+
+pub fn parse_lobby_state_file(path: &Path) -> std::io::Result<(i32, Vec<WnCmLobbyEntry>)> {
+    let text = fs::read_to_string(path)?;
+    let mut eresult = 0;
+    let mut lobbies = Vec::new();
+    for line in text.lines() {
+        let mut fields = line.split_whitespace();
+        match fields.next() {
+            Some("eresult") => {
+                if let Some(value) = fields.next().and_then(|value| value.parse::<i32>().ok()) {
+                    eresult = value;
+                }
+            }
+            Some("lobby") => {
+                let steam_id = fields
+                    .next()
+                    .and_then(|value| value.parse::<u64>().ok())
+                    .unwrap_or_default();
+                let max_members = fields
+                    .next()
+                    .and_then(|value| value.parse::<i32>().ok())
+                    .unwrap_or_default();
+                if steam_id != 0 {
+                    lobbies.push(WnCmLobbyEntry {
+                        steam_id,
+                        max_members,
+                        ..Default::default()
+                    });
+                }
+            }
+            _ => {}
+        }
+    }
+    Ok((eresult, lobbies))
+}
+
+pub fn write_lobby_request_file(dir: &Path, app_id: u32) -> std::io::Result<()> {
+    fs::create_dir_all(dir)?;
+    let final_path = lobby_request_path(dir, app_id);
+    let tmp_path = final_path.with_extension("txt.tmp");
+    {
+        let mut file = fs::File::create(&tmp_path)?;
+        writeln!(file, "app_id {app_id}")?;
+        writeln!(
+            file,
+            "requested {}",
+            SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_secs()
+        )?;
+    }
+    fs::rename(tmp_path, final_path)
+}
+
+fn try_lobby_list_from_file(
+    hcall: u64,
+    app_id: u32,
+    callback: extern "C" fn(u64, i32, *const WnCmLobbyEntry, usize),
+) -> bool {
+    let dir = state_dir();
+    let path = lobby_state_path(&dir, app_id);
+
+    for attempt in 0..=30 {
+        if let Ok((eresult, lobbies)) = parse_lobby_state_file(&path) {
+            callback(hcall, eresult, lobbies.as_ptr(), lobbies.len());
+            return true;
+        }
+        if attempt == 0 {
+            let _ = write_lobby_request_file(&dir, app_id);
+        }
+        if attempt < 30 {
+            thread::sleep(Duration::from_millis(100));
+        }
+    }
+
+    callback(hcall, 1, ptr::null(), 0);
+    true
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering};
+
+    static LOGON_HIT: AtomicBool = AtomicBool::new(false);
+    static FRIEND_COUNT: AtomicUsize = AtomicUsize::new(0);
+    static LICENSE_PACKAGE: AtomicUsize = AtomicUsize::new(0);
+    static PERSONA_ID: AtomicU64 = AtomicU64::new(0);
+    static LOBBY_COUNT: AtomicUsize = AtomicUsize::new(0);
+    static ACCOUNT_FLAGS: AtomicUsize = AtomicUsize::new(0);
+    static SERVER_REALTIME: AtomicUsize = AtomicUsize::new(0);
+    static LOBBY_DATA_MEMBERS: AtomicUsize = AtomicUsize::new(0);
+    static LOBBY_CHAT_BYTES: AtomicUsize = AtomicUsize::new(0);
+    static LOBBY_MEMBERSHIP_JOINED: AtomicUsize = AtomicUsize::new(0);
+
+    extern "C" fn logon_cb(logged_on: bool) {
+        LOGON_HIT.store(logged_on, Ordering::SeqCst);
+    }
+
+    extern "C" fn friends_cb(_sids: *const u64, count: usize) {
+        FRIEND_COUNT.store(count, Ordering::SeqCst);
+    }
+
+    extern "C" fn license_cb(licenses: *const WnCmLicenseEntry, count: usize) {
+        if count != 0 {
+            let first = unsafe { *licenses };
+            LICENSE_PACKAGE.store(first.package_id as usize, Ordering::SeqCst);
+        }
+    }
+
+    extern "C" fn persona_cb(event: *const WnCmPersonaEvent) {
+        let event = unsafe { event.as_ref() }.unwrap();
+        PERSONA_ID.store(event.sid, Ordering::SeqCst);
+    }
+
+    extern "C" fn account_cb(info: *const WnCmAccountInfo) {
+        let info = unsafe { info.as_ref() }.unwrap();
+        let mut flags = 0usize;
+        if !info.persona_name.is_null() && info.persona_name_len == 3 {
+            flags |= 1;
+        }
+        if !info.ip_country.is_null() && info.ip_country_len == 2 {
+            flags |= 2;
+        }
+        if info.two_factor_enabled {
+            flags |= 4;
+        }
+        if info.phone_verified {
+            flags |= 8;
+        }
+        ACCOUNT_FLAGS.store(flags, Ordering::SeqCst);
+    }
+
+    extern "C" fn server_realtime_cb(server_realtime: u32) {
+        SERVER_REALTIME.store(server_realtime as usize, Ordering::SeqCst);
+    }
+
+    extern "C" fn lobby_cb(
+        _hcall: u64,
+        eresult: i32,
+        lobbies: *const WnCmLobbyEntry,
+        count: usize,
+    ) {
+        assert_eq!(eresult, 1);
+        assert!(!lobbies.is_null());
+        LOBBY_COUNT.store(count, Ordering::SeqCst);
+    }
+
+    extern "C" fn lobby_data_cb(data: *const WnCmLobbyData) {
+        let data = unsafe { data.as_ref() }.unwrap();
+        LOBBY_DATA_MEMBERS.store(data.member_count, Ordering::SeqCst);
+    }
+
+    extern "C" fn lobby_chat_cb(_lobby_sid: u64, _sender_sid: u64, _data: *const u8, len: usize) {
+        LOBBY_CHAT_BYTES.store(len, Ordering::SeqCst);
+    }
+
+    extern "C" fn lobby_membership_cb(
+        joined: i32,
+        _lobby_sid: u64,
+        _user_sid: u64,
+        _persona_name: *const c_char,
+    ) {
+        LOBBY_MEMBERSHIP_JOINED.store(joined as usize, Ordering::SeqCst);
+    }
+
+    fn serialize_lobby_chat_for_test(lobby_sid: u64, sender_sid: u64, message: &[u8]) -> Vec<u8> {
+        let mut body = Vec::new();
+        let mut writer = crate::proto_wire::Writer::new(&mut body);
+        writer.fixed64_field(2, lobby_sid);
+        writer.fixed64_field(3, sender_sid);
+        writer.bytes_field(4, message);
+        body
+    }
+
+    fn serialize_lobby_membership_for_test(
+        lobby_sid: u64,
+        user_sid: u64,
+        persona_name: &str,
+    ) -> Vec<u8> {
+        let mut body = Vec::new();
+        let mut writer = crate::proto_wire::Writer::new(&mut body);
+        writer.fixed64_field(2, lobby_sid);
+        writer.fixed64_field(3, user_sid);
+        writer.string_field(4, persona_name);
+        body
+    }
+
+    #[test]
+    fn observer_dispatches_match_c_bridge_contract() {
+        let bridge = CmBridge::default();
+        bridge.observers().register_logon_state(Some(logon_cb));
+        bridge.observers().register_friends_list(Some(friends_cb));
+        bridge.observers().register_license_list(Some(license_cb));
+        bridge.observers().register_persona(Some(persona_cb));
+        bridge.observers().register_account_info(Some(account_cb));
+        bridge
+            .observers()
+            .register_server_realtime(Some(server_realtime_cb));
+        bridge.observers().register_lobby_data(Some(lobby_data_cb));
+        bridge
+            .observers()
+            .register_lobby_chat_msg(Some(lobby_chat_cb));
+        bridge
+            .observers()
+            .register_lobby_membership(Some(lobby_membership_cb));
+
+        bridge.observers().dispatch_logon_state(true);
+        bridge.observers().dispatch_friends_list(&[1, 2, 3]);
+        bridge.observers().dispatch_server_realtime(1_700_000_000);
+        bridge
+            .observers()
+            .dispatch_license_list(&[WnCmLicenseEntry {
+                package_id: 480,
+                ..Default::default()
+            }]);
+        bridge.dispatch_persona_friend(&PersonaStateFriend {
+            friendid: 765,
+            player_name: "Ada".into(),
+            rich_presence: vec![("status".into(), "Playing".into())],
+            ..Default::default()
+        });
+        bridge.dispatch_account_info_snapshot(&AccountInfoSnapshot {
+            persona_name: "Ada".into(),
+            ip_country: "US".into(),
+            two_factor_enabled: true,
+            phone_verified: true,
+            ..Default::default()
+        });
+        bridge.dispatch_lobby_data_message(&CMsgClientMMSLobbyData {
+            steam_id_lobby: 1,
+            steam_id_owner: 2,
+            members: vec![crate::pb::cmsg_client_mms_lobby_data::MMSLobbyDataMember {
+                steam_id: 2,
+                persona_name: "Ada".into(),
+                metadata: b"m".to_vec(),
+            }],
+            ..Default::default()
+        });
+        assert!(bridge.dispatch_lobby_push(
+            EMsg::CLIENT_MMS_LOBBY_CHAT_MSG,
+            &serialize_lobby_chat_for_test(1, 2, b"hello")
+        ));
+        assert!(bridge.dispatch_lobby_push(
+            EMsg::CLIENT_MMS_USER_JOINED_LOBBY,
+            &serialize_lobby_membership_for_test(1, 2, "Ada")
+        ));
+
+        assert!(LOGON_HIT.load(Ordering::SeqCst));
+        assert_eq!(FRIEND_COUNT.load(Ordering::SeqCst), 3);
+        assert_eq!(LICENSE_PACKAGE.load(Ordering::SeqCst), 480);
+        assert_eq!(PERSONA_ID.load(Ordering::SeqCst), 765);
+        assert_eq!(ACCOUNT_FLAGS.load(Ordering::SeqCst), 1 | 2 | 4 | 8);
+        assert_eq!(SERVER_REALTIME.load(Ordering::SeqCst), 1_700_000_000);
+        assert_eq!(LOBBY_DATA_MEMBERS.load(Ordering::SeqCst), 1);
+        assert_eq!(LOBBY_CHAT_BYTES.load(Ordering::SeqCst), 5);
+        assert_eq!(LOBBY_MEMBERSHIP_JOINED.load(Ordering::SeqCst), 1);
+    }
+
+    #[test]
+    fn state_sync_poller_exports_track_running_state() {
+        wn_cm_bridge_start_state_sync_poller();
+        assert!(state_sync_poller_running().load(Ordering::Acquire));
+        wn_cm_bridge_stop_state_sync_poller();
+        assert!(!state_sync_poller_running().load(Ordering::Acquire));
+    }
+
+    #[test]
+    fn active_core_backs_ticket_cache_bridge() {
+        let bridge = CmBridge::default();
+        let core = Arc::new(CMClientCore::default());
+        bridge.set_active(core);
+        assert!(!bridge.inject_ownership_ticket(0, &[1]));
+        assert!(!bridge.inject_ownership_ticket(440, &[]));
+        assert!(bridge.inject_ownership_ticket(440, &[1, 2, 3]));
+        assert_eq!(bridge.cached_ownership_ticket(440), Some(vec![1, 2, 3]));
+        bridge.clear_active();
+        assert_eq!(bridge.cached_ownership_ticket(440), None);
+    }
+
+    #[test]
+    fn bridge_commands_enqueue_outbound_cm_messages() {
+        let bridge = global_bridge();
+        let core = Arc::new(CMClientCore::default());
+        core.set_state(crate::cm_client::ClientState::LoggedOn);
+        bridge.set_active(Arc::clone(&core));
+
+        assert!(wn_cm_set_persona_state(1));
+        assert!(wn_cm_notify_games_played(480));
+
+        let name = CString::new("Ada").unwrap();
+        assert!(unsafe { wn_cm_set_persona_name(name.as_ptr(), 1) });
+        assert!(unsafe {
+            wn_cm_lobby_get_list(
+                10,
+                480,
+                50,
+                ptr::null(),
+                ptr::null(),
+                ptr::null(),
+                ptr::null(),
+                0,
+                Some(lobby_cb),
+            )
+        });
+        assert!(wn_cm_lobby_create(11, 480, 2, 4, None));
+        assert!(wn_cm_lobby_leave(480, 123));
+
+        let wires = core.take_outbound_wires();
+        assert_eq!(wires.len(), 6);
+        bridge.clear_active();
+    }
+
+    #[test]
+    fn lobby_state_files_roundtrip_cpp_fallback_format() {
+        let dir = env::temp_dir().join(format!(
+            "wnsteam-rust-bridge-{}",
+            SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        let entries = [WnCmLobbyEntry {
+            steam_id: 123,
+            max_members: 8,
+            ..Default::default()
+        }];
+
+        write_lobby_list_to_file(&dir, 480, 1, &entries).unwrap();
+        let (eresult, parsed) = parse_lobby_state_file(&lobby_state_path(&dir, 480)).unwrap();
+        assert_eq!(eresult, 1);
+        assert_eq!(parsed[0].steam_id, 123);
+        assert_eq!(parsed[0].max_members, 8);
+
+        write_lobby_request_file(&dir, 480).unwrap();
+        assert!(lobby_request_path(&dir, 480).exists());
+        let _ = fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn lobby_get_list_callback_reads_existing_state_file() {
+        let dir = env::temp_dir().join(format!(
+            "wnsteam-rust-bridge-cb-{}",
+            SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        write_lobby_list_to_file(
+            &dir,
+            481,
+            1,
+            &[WnCmLobbyEntry {
+                steam_id: 456,
+                max_members: 4,
+                ..Default::default()
+            }],
+        )
+        .unwrap();
+
+        let old = env::var_os("WN_STATE_DIR");
+        env::set_var("WN_STATE_DIR", &dir);
+        LOBBY_COUNT.store(0, Ordering::SeqCst);
+        assert!(unsafe {
+            wn_cm_lobby_get_list(
+                99,
+                481,
+                0,
+                ptr::null(),
+                ptr::null(),
+                ptr::null(),
+                ptr::null(),
+                0,
+                Some(lobby_cb),
+            )
+        });
+        assert_eq!(LOBBY_COUNT.load(Ordering::SeqCst), 1);
+        if let Some(old) = old {
+            env::set_var("WN_STATE_DIR", old);
+        } else {
+            env::remove_var("WN_STATE_DIR");
+        }
+        let _ = fs::remove_dir_all(dir);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cm_client.rs b/app/src/main/cpp/wn-steam-client/rust/src/cm_client.rs
new file mode 100644
index 000000000..b4e8d3fe5
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cm_client.rs
@@ -0,0 +1,2297 @@
+use crate::cmsg_protobuf_header::{CMsgProtoBufHeader, INVALID_JOB_ID};
+use crate::crypto::generate_session_key;
+use crate::emsg::EMsg;
+use crate::job_manager::JobResult;
+use crate::library_store::WnLibraryStore;
+use crate::pb::ccloud::{
+    CCloudAppExitSyncDoneNotification, CCloudAppLaunchIntentRequest,
+    CCloudBeginAppUploadBatchRequest, CCloudClientBeginFileUploadRequest,
+    CCloudClientCommitFileUploadRequest, CCloudClientFileDownloadRequest,
+    CCloudCompleteAppUploadBatchRequest, CCloudGetAppFileChangelistRequest,
+    CCloudGetUserQuotaRequest,
+};
+use crate::pb::ccontentserverdirectory::{
+    CContentServerDirectoryGetManifestRequestCodeRequest,
+    CContentServerDirectoryGetServersForSteamPipeRequest,
+};
+use crate::pb::cfamilygroups::CFamilyGroupsGetFamilyGroupRequest;
+use crate::pb::cinventory::CInventoryGetItemDefMetaRequest;
+use crate::pb::cmsg_client_change_status::CMsgClientChangeStatus;
+use crate::pb::cmsg_client_friends_list::CMsgClientFriendsList;
+use crate::pb::cmsg_client_games_played::{
+    CMsgClientGamesPlayed, GamePlayedEntry, GamePlayedProcessInfo,
+};
+use crate::pb::cmsg_client_get_app_ownership_ticket::CMsgClientGetAppOwnershipTicket;
+use crate::pb::cmsg_client_get_depot_decryption_key::CMsgClientGetDepotDecryptionKey;
+use crate::pb::cmsg_client_kick_playing_session::CMsgClientKickPlayingSession;
+use crate::pb::cmsg_client_license_list::{CMsgClientLicenseList, License};
+use crate::pb::cmsg_client_mms_get_lobby_list::{
+    CMsgClientMMSGetLobbyList, CMsgClientMMSGetLobbyListFilter,
+};
+use crate::pb::cmsg_client_mms_lobby_ops::{
+    CMsgClientMMSCreateLobby, CMsgClientMMSInviteToLobby, CMsgClientMMSJoinLobby,
+    CMsgClientMMSLeaveLobby, CMsgClientMMSSendLobbyChatMsg, CMsgClientMMSSetLobbyData,
+    CMsgClientMMSSetLobbyOwner,
+};
+use crate::pb::cmsg_client_persona::{CMsgClientPersonaState, PersonaStateFriend};
+use crate::pb::cmsg_client_pics::{
+    CMsgClientPICSAccessTokenRequest, CMsgClientPICSChangesSinceRequest,
+    CMsgClientPICSProductInfoRequest, PicsAppInfoReq, PicsPackageInfoReq,
+};
+use crate::pb::cmsg_client_playing_session_state::CMsgClientPlayingSessionState;
+use crate::pb::cmsg_client_store_user_stats::{CMsgClientStoreUserStats2, Stat};
+use crate::pb::cmsg_clientserver_login::{
+    CMsgClientHeartBeat, CMsgClientHello, CMsgClientLogOff, CMsgClientLogon,
+    CMsgClientLogonResponse,
+};
+use crate::pb::cplayer::{
+    CPlayerGetOwnedGamesRequest, CPlayerSetRichPresenceKv, CPlayerSetRichPresenceRequest,
+};
+use crate::pb::cpublishedfile::CPublishedFileGetUserFilesRequest;
+use crate::proto_envelope::encode_proto_envelope;
+use crate::ticket_cache::WnTicketCache;
+use flate2::read::{GzDecoder, ZlibDecoder};
+use std::collections::HashMap;
+use std::io::Read;
+use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU32, AtomicU64, AtomicU8, Ordering};
+use std::sync::Mutex;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(u8)]
+pub enum ClientState {
+    Disconnected,
+    Connecting,
+    Connected,
+    LoggedOn,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct FriendPersonaSnapshot {
+    pub sid: u64,
+    pub player_name: String,
+    pub persona_state: u32,
+    pub game_played_app_id: u32,
+    pub avatar_hash: Vec<u8>,
+    pub rich_presence: Vec<(String, String)>,
+    pub game_name: String,
+    pub gameid: u64,
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct GamesPlayedExtras {
+    pub process_id: u32,
+    pub owner_id: u32,
+    pub launch_source: u32,
+    pub game_build_id: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct AccountInfoSnapshot {
+    pub persona_name: String,
+    pub ip_country: String,
+    pub two_factor_enabled: bool,
+    pub phone_verified: bool,
+    pub phone_identifying: bool,
+    pub phone_requires_verification: bool,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum InboundAction {
+    DeliverJob(JobResult),
+    Multi,
+    PicsProductInfo,
+    LogonOk,
+    LoggedOff,
+    LicenseList(usize),
+    FriendsList(usize),
+    PersonaState(usize),
+    PlayingSessionState(bool),
+    AccountInfo(AccountInfoSnapshot),
+    LobbyPush,
+    ClientMessage,
+    Ignored,
+    ParseFailed(&'static str),
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgMultiBody {
+    pub size_unzipped: u32,
+    pub message_body: Vec<u8>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct OutboundProtoMessage {
+    pub emsg: EMsg,
+    pub routing_appid: u32,
+    pub body: Vec<u8>,
+    pub wire: Vec<u8>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct OutboundServiceCall {
+    pub method_name: String,
+    pub authed: bool,
+    pub job_id: u64,
+    pub request_body: Vec<u8>,
+    pub wire: Vec<u8>,
+}
+
+pub struct CMClientCore {
+    state: AtomicU8,
+    steam_id: AtomicU64,
+    session_id: AtomicI32,
+    family_group_id: AtomicU64,
+    server_realtime: AtomicU32,
+    playing_blocked: AtomicBool,
+    license_list: Mutex<Vec<License>>,
+    friends: Mutex<HashMap<u64, u32>>,
+    self_persona: Mutex<Option<PersonaStateFriend>>,
+    friend_personas: Mutex<HashMap<u64, FriendPersonaSnapshot>>,
+    incoming_messages: Mutex<Vec<IncomingFriendMessage>>,
+    library: WnLibraryStore,
+    tickets: WnTicketCache,
+    outbound_wires: Mutex<Vec<Vec<u8>>>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct IncomingFriendMessage {
+    pub friend_id: u64,
+    pub from_self: bool,
+    pub message: String,
+    pub timestamp: u32,
+    pub ordinal: i32,
+}
+
+impl Default for CMClientCore {
+    fn default() -> Self {
+        Self {
+            state: AtomicU8::new(ClientState::Disconnected as u8),
+            steam_id: AtomicU64::new(0),
+            session_id: AtomicI32::new(0),
+            family_group_id: AtomicU64::new(0),
+            server_realtime: AtomicU32::new(0),
+            playing_blocked: AtomicBool::new(false),
+            license_list: Mutex::new(Vec::new()),
+            friends: Mutex::new(HashMap::new()),
+            self_persona: Mutex::new(None),
+            friend_personas: Mutex::new(HashMap::new()),
+            incoming_messages: Mutex::new(Vec::new()),
+            library: WnLibraryStore::default(),
+            tickets: WnTicketCache::default(),
+            outbound_wires: Mutex::new(Vec::new()),
+        }
+    }
+}
+
+impl CMClientCore {
+    pub fn state(&self) -> ClientState {
+        match self.state.load(Ordering::Relaxed) {
+            1 => ClientState::Connecting,
+            2 => ClientState::Connected,
+            3 => ClientState::LoggedOn,
+            _ => ClientState::Disconnected,
+        }
+    }
+
+    pub fn set_state(&self, state: ClientState) {
+        self.state.store(state as u8, Ordering::Relaxed);
+    }
+
+    pub fn reset_session_identity(&self) {
+        self.steam_id.store(0, Ordering::Relaxed);
+        self.session_id.store(0, Ordering::Relaxed);
+        self.family_group_id.store(0, Ordering::Relaxed);
+        self.server_realtime.store(0, Ordering::Relaxed);
+        self.outbound_wires
+            .lock()
+            .expect("outbound queue poisoned")
+            .clear();
+    }
+
+    pub fn steam_id(&self) -> u64 {
+        self.steam_id.load(Ordering::Relaxed)
+    }
+
+    pub fn session_id(&self) -> i32 {
+        self.session_id.load(Ordering::Relaxed)
+    }
+
+    pub fn family_group_id(&self) -> u64 {
+        self.family_group_id.load(Ordering::Relaxed)
+    }
+
+    pub fn server_realtime(&self) -> u32 {
+        self.server_realtime.load(Ordering::Relaxed)
+    }
+
+    pub fn is_playing_blocked(&self) -> bool {
+        self.playing_blocked.load(Ordering::Relaxed)
+    }
+
+    pub fn mark_playing_blocked(&self) {
+        self.playing_blocked.store(true, Ordering::Relaxed);
+    }
+
+    pub fn library(&self) -> &WnLibraryStore {
+        &self.library
+    }
+
+    pub fn tickets(&self) -> &WnTicketCache {
+        &self.tickets
+    }
+
+    pub fn enqueue_proto_message(&self, message: Option<OutboundProtoMessage>) -> bool {
+        let Some(message) = message else {
+            return false;
+        };
+        self.enqueue_wire(message.wire)
+    }
+
+    pub fn enqueue_service_call(&self, call: Option<OutboundServiceCall>) -> bool {
+        let Some(call) = call else {
+            return false;
+        };
+        self.enqueue_wire(call.wire)
+    }
+
+    pub fn enqueue_wire(&self, wire: Vec<u8>) -> bool {
+        if wire.is_empty() {
+            return false;
+        }
+        self.outbound_wires
+            .lock()
+            .expect("outbound queue poisoned")
+            .push(wire);
+        true
+    }
+
+    pub fn restore_outbound_wires_front(&self, mut wires: Vec<Vec<u8>>) {
+        if wires.is_empty() {
+            return;
+        }
+        let mut queue = self.outbound_wires.lock().expect("outbound queue poisoned");
+        if queue.is_empty() {
+            *queue = wires;
+            return;
+        }
+        let mut restored = Vec::with_capacity(wires.len() + queue.len());
+        restored.append(&mut wires);
+        restored.append(&mut queue);
+        *queue = restored;
+    }
+
+    pub fn take_outbound_wires(&self) -> Vec<Vec<u8>> {
+        std::mem::take(&mut *self.outbound_wires.lock().expect("outbound queue poisoned"))
+    }
+
+    pub fn build_proto_message(&self, emsg: EMsg, body: &[u8], routing_appid: u32) -> Vec<u8> {
+        let mut header = CMsgProtoBufHeader {
+            steamid: self.steam_id(),
+            client_sessionid: self.session_id(),
+            routing_appid,
+            ..Default::default()
+        };
+        if emsg == EMsg::CLIENT_LOGON && header.steamid == 0 {
+            header.steamid = 0x0110_0001_0000_0000;
+        }
+        encode_proto_envelope(emsg, &header, body)
+    }
+
+    pub fn build_client_hello(&self) -> OutboundProtoMessage {
+        let body = CMsgClientHello::default().serialize();
+        let wire = self.build_proto_message(EMsg::CLIENT_HELLO, &body, 0);
+        OutboundProtoMessage {
+            emsg: EMsg::CLIENT_HELLO,
+            routing_appid: 0,
+            body,
+            wire,
+        }
+    }
+
+    pub fn build_heartbeat(&self) -> OutboundProtoMessage {
+        let body = CMsgClientHeartBeat::default().serialize();
+        let wire = self.build_proto_message(EMsg::CLIENT_HEART_BEAT, &body, 0);
+        OutboundProtoMessage {
+            emsg: EMsg::CLIENT_HEART_BEAT,
+            routing_appid: 0,
+            body,
+            wire,
+        }
+    }
+
+    pub fn build_logoff(&self) -> Option<OutboundProtoMessage> {
+        if self.state() != ClientState::LoggedOn {
+            return None;
+        }
+        self.build_outbound_proto_message(EMsg::CLIENT_LOG_OFF, CMsgClientLogOff.serialize(), 0)
+    }
+
+    pub fn build_logon_with_refresh_token(
+        &self,
+        refresh_token: impl Into<String>,
+        account_name: impl Into<String>,
+        client_supplied_steam_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if self.state() != ClientState::Connected {
+            return None;
+        }
+        let refresh_token = refresh_token.into();
+        let account_name = account_name.into();
+        if refresh_token.is_empty() {
+            return None;
+        }
+
+        let mut msg = CMsgClientLogon {
+            access_token: refresh_token,
+            account_name,
+            client_supplied_steam_id,
+            machine_id: b"WN-Steam-Client".to_vec(),
+            protocol_version: 65580,
+            client_os_type: 16,
+            supports_rate_limit_response: true,
+            ..Default::default()
+        };
+        if let Some(key) = generate_session_key() {
+            let mut client_instance_id = 0u64;
+            for (idx, byte) in key.bytes.iter().take(8).enumerate() {
+                client_instance_id |= (*byte as u64) << (idx * 8);
+            }
+            if client_instance_id == 0 {
+                client_instance_id = 1;
+            }
+            msg.client_instance_id = client_instance_id;
+
+            let mut login_id = 0u32;
+            for (idx, byte) in key.bytes.iter().skip(8).take(4).enumerate() {
+                login_id |= (*byte as u32) << (idx * 8);
+            }
+            if login_id == 0 {
+                login_id = 0x574e_5301;
+            }
+            msg.obfuscated_private_ip = login_id;
+        }
+
+        let body = msg.serialize();
+        let wire = self.build_proto_message(EMsg::CLIENT_LOGON, &body, 0);
+        Some(OutboundProtoMessage {
+            emsg: EMsg::CLIENT_LOGON,
+            routing_appid: 0,
+            body,
+            wire,
+        })
+    }
+
+    pub fn build_service_method_call(
+        &self,
+        method_name: &str,
+        authed: bool,
+        job_id: u64,
+        request_body: &[u8],
+    ) -> Vec<u8> {
+        let header = CMsgProtoBufHeader {
+            steamid: self.steam_id(),
+            client_sessionid: self.session_id(),
+            jobid_source: job_id,
+            jobid_target: INVALID_JOB_ID,
+            target_job_name: method_name.to_string(),
+            ..Default::default()
+        };
+        let emsg = if authed {
+            EMsg::SERVICE_METHOD_CALL_FROM_CLIENT
+        } else {
+            EMsg::SERVICE_METHOD_CALL_FROM_CLIENT_NON_AUTHED
+        };
+        encode_proto_envelope(emsg, &header, request_body)
+    }
+
+    pub fn build_outbound_proto_message(
+        &self,
+        emsg: EMsg,
+        body: Vec<u8>,
+        routing_appid: u32,
+    ) -> Option<OutboundProtoMessage> {
+        if self.state() != ClientState::LoggedOn {
+            return None;
+        }
+        let wire = self.build_proto_message(emsg, &body, routing_appid);
+        Some(OutboundProtoMessage {
+            emsg,
+            routing_appid,
+            body,
+            wire,
+        })
+    }
+
+    pub fn build_job_proto_message(
+        &self,
+        emsg: EMsg,
+        job_id: u64,
+        body: Vec<u8>,
+        routing_appid: u32,
+    ) -> Option<OutboundProtoMessage> {
+        if self.state() != ClientState::LoggedOn {
+            return None;
+        }
+        let header = CMsgProtoBufHeader {
+            steamid: self.steam_id(),
+            client_sessionid: self.session_id(),
+            routing_appid,
+            jobid_source: job_id,
+            jobid_target: INVALID_JOB_ID,
+            ..Default::default()
+        };
+        let wire = encode_proto_envelope(emsg, &header, &body);
+        Some(OutboundProtoMessage {
+            emsg,
+            routing_appid,
+            body,
+            wire,
+        })
+    }
+
+    pub fn build_authed_service_call(
+        &self,
+        method_name: &str,
+        job_id: u64,
+        request_body: Vec<u8>,
+    ) -> Option<OutboundServiceCall> {
+        if self.state() != ClientState::LoggedOn {
+            return None;
+        }
+        let wire = self.build_service_method_call(method_name, true, job_id, &request_body);
+        Some(OutboundServiceCall {
+            method_name: method_name.to_string(),
+            authed: true,
+            job_id,
+            request_body,
+            wire,
+        })
+    }
+
+    pub fn build_request_friend_persona_states(
+        &self,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call("Chat.RequestFriendPersonaStates#1", job_id, Vec::new())
+    }
+
+    pub fn build_send_friend_message(
+        &self,
+        steamid: u64,
+        message: &str,
+        contains_bbcode: bool,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "FriendMessages.SendMessage#1",
+            job_id,
+            crate::pb::cfriendmessages::CFriendMessagesSendMessageRequest {
+                steamid,
+                chat_entry_type: crate::pb::cfriendmessages::CHAT_ENTRY_TYPE_TEXT,
+                message: message.to_string(),
+                contains_bbcode,
+                echo_to_sender: true,
+                low_priority: false,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_get_recent_messages(
+        &self,
+        friend_id: u64,
+        count: u32,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        let self_id = self.steam_id();
+        if self_id == 0 || friend_id == 0 {
+            return None;
+        }
+        self.build_authed_service_call(
+            "FriendMessages.GetRecentMessages#1",
+            job_id,
+            crate::pb::cfriendmessages::CFriendMessagesGetRecentMessagesRequest {
+                steamid1: self_id,
+                steamid2: friend_id,
+                count,
+                most_recent_conversation: false,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_set_persona_state(&self, persona_state: u32) -> Option<OutboundProtoMessage> {
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_CHANGE_STATUS,
+            CMsgClientChangeStatus {
+                persona_state,
+                player_name: String::new(),
+                persona_set_by_user: true,
+                need_persona_response: true,
+            }
+            .serialize(),
+            0,
+        )
+    }
+
+    pub fn build_set_persona_name(
+        &self,
+        name: impl Into<String>,
+        persona_state_keep_current: u32,
+    ) -> Option<OutboundProtoMessage> {
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_CHANGE_STATUS,
+            CMsgClientChangeStatus {
+                persona_state: persona_state_keep_current,
+                player_name: name.into(),
+                persona_set_by_user: true,
+                need_persona_response: false,
+            }
+            .serialize(),
+            0,
+        )
+    }
+
+    pub fn build_request_user_persona(&self) -> Option<OutboundProtoMessage> {
+        let steam_id = self.steam_id();
+        if steam_id == 0 {
+            return None;
+        }
+        self.build_request_friend_personas(&[steam_id], 0xffff)
+    }
+
+    pub fn build_request_friend_personas(
+        &self,
+        sids: &[u64],
+        persona_state_requested: u32,
+    ) -> Option<OutboundProtoMessage> {
+        if sids.is_empty() {
+            return None;
+        }
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_REQUEST_FRIEND_DATA,
+            crate::pb::cmsg_client_persona::CMsgClientRequestFriendData {
+                persona_state_requested,
+                friends: sids.iter().copied().filter(|sid| *sid != 0).collect(),
+            }
+            .serialize(),
+            0,
+        )
+    }
+
+    pub fn build_notify_games_played(&self, app_id: u32) -> Option<OutboundProtoMessage> {
+        self.build_notify_games_played_full(
+            app_id.into(),
+            &GamesPlayedExtras::default(),
+            &[],
+            0,
+        )
+    }
+
+    pub fn build_notify_games_played_full(
+        &self,
+        game_id: u64,
+        extras: &GamesPlayedExtras,
+        processes: &[GamePlayedProcessInfo],
+        client_os_type: u32,
+    ) -> Option<OutboundProtoMessage> {
+        let mut msg = CMsgClientGamesPlayed {
+            games_played: Vec::new(),
+            client_os_type,
+        };
+        if game_id != 0 {
+            msg.games_played.push(GamePlayedEntry {
+                game_id,
+                process_id: extras.process_id,
+                owner_id: extras.owner_id,
+                launch_source: extras.launch_source,
+                game_build_id: extras.game_build_id,
+                process_id_list: processes.to_vec(),
+            });
+        }
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_GAMES_PLAYED_WITH_DATA_BLOB,
+            msg.serialize(),
+            0,
+        )
+    }
+
+    pub fn build_kick_playing_session(&self, only_stop_game: bool) -> Option<OutboundProtoMessage> {
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_KICK_PLAYING_SESSION,
+            CMsgClientKickPlayingSession { only_stop_game }.serialize(),
+            0,
+        )
+    }
+
+    pub fn build_store_user_stats(
+        &self,
+        app_id: u32,
+        steam_id: u64,
+        crc_stats: u32,
+        stats: &[(u32, u32)],
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || steam_id == 0 {
+            return None;
+        }
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_STORE_USER_STATS_2,
+            CMsgClientStoreUserStats2 {
+                game_id: app_id as u64,
+                settor_steam_id: steam_id,
+                settee_steam_id: steam_id,
+                crc_stats,
+                stats: stats
+                    .iter()
+                    .map(|(stat_id, stat_value)| Stat {
+                        stat_id: *stat_id,
+                        stat_value: *stat_value,
+                    })
+                    .collect(),
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_rich_presence_call(
+        &self,
+        app_id: u32,
+        kv: impl IntoIterator<Item = (String, String)>,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        let request = CPlayerSetRichPresenceRequest {
+            appid: app_id,
+            rich_presence: kv
+                .into_iter()
+                .filter(|(key, _)| !key.is_empty())
+                .map(|(key, value)| CPlayerSetRichPresenceKv { key, value })
+                .collect(),
+        };
+        self.build_authed_service_call("Player.SetRichPresence#1", job_id, request.serialize())
+    }
+
+    pub fn build_get_app_ownership_ticket(
+        &self,
+        app_id: u32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 {
+            return None;
+        }
+        self.build_job_proto_message(
+            EMsg::CLIENT_GET_APP_OWNERSHIP_TICKET,
+            job_id,
+            CMsgClientGetAppOwnershipTicket { app_id }.serialize(),
+            0,
+        )
+    }
+
+    pub fn build_request_encrypted_app_ticket(
+        &self,
+        app_id: u32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 {
+            return None;
+        }
+        self.build_job_proto_message(
+            EMsg::CLIENT_REQUEST_ENCRYPTED_APP_TICKET,
+            job_id,
+            crate::pb::cmsg_client_request_encrypted_app_ticket::CMsgClientRequestEncryptedAppTicket {
+                app_id,
+            }
+            .serialize(),
+            // Match the legacy C++ client: this request is not app-routed.
+            0,
+        )
+    }
+
+    pub fn build_get_depot_decryption_key(
+        &self,
+        depot_id: u32,
+        app_id: u32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if depot_id == 0 || app_id == 0 {
+            return None;
+        }
+        self.build_job_proto_message(
+            EMsg::CLIENT_GET_DEPOT_DECRYPTION_KEY,
+            job_id,
+            CMsgClientGetDepotDecryptionKey { depot_id, app_id }.serialize(),
+            0,
+        )
+    }
+
+    pub fn build_manifest_request_code_call(
+        &self,
+        app_id: u32,
+        depot_id: u32,
+        manifest_id: u64,
+        branch: &str,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        if app_id == 0 || depot_id == 0 || manifest_id == 0 {
+            return None;
+        }
+        let lower = branch.to_ascii_lowercase();
+        let app_branch = if lower.is_empty() || lower == "public" {
+            String::new()
+        } else {
+            branch.to_string()
+        };
+        self.build_authed_service_call(
+            "ContentServerDirectory.GetManifestRequestCode#1",
+            job_id,
+            CContentServerDirectoryGetManifestRequestCodeRequest {
+                app_id,
+                depot_id,
+                manifest_id,
+                app_branch,
+                branch_password_hash: String::new(),
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_get_cdn_servers_call(
+        &self,
+        cell_id: u32,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "ContentServerDirectory.GetServersForSteamPipe#1",
+            job_id,
+            CContentServerDirectoryGetServersForSteamPipeRequest {
+                cell_id,
+                ..Default::default()
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_pics_access_tokens(
+        &self,
+        packageids: Vec<u32>,
+        appids: Vec<u32>,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        self.build_job_proto_message(
+            EMsg::CLIENT_PICS_ACCESS_TOKEN_REQUEST,
+            job_id,
+            CMsgClientPICSAccessTokenRequest { packageids, appids }.serialize(),
+            0,
+        )
+    }
+
+    pub fn build_pics_changes_since(
+        &self,
+        since_change_number: u32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        self.build_job_proto_message(
+            EMsg::CLIENT_PICS_CHANGES_SINCE_REQUEST,
+            job_id,
+            CMsgClientPICSChangesSinceRequest {
+                since_change_number,
+                ..Default::default()
+            }
+            .serialize(),
+            0,
+        )
+    }
+
+    pub fn build_pics_product_info(
+        &self,
+        packages: Vec<PicsPackageInfoReq>,
+        apps: Vec<PicsAppInfoReq>,
+        meta_data_only: bool,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        self.build_job_proto_message(
+            EMsg::CLIENT_PICS_PRODUCT_INFO_REQUEST,
+            job_id,
+            CMsgClientPICSProductInfoRequest {
+                packages,
+                apps,
+                meta_data_only,
+                single_response: false,
+                ..Default::default()
+            }
+            .serialize(),
+            0,
+        )
+    }
+
+    pub fn prepare_app_ids(app_id: u32, dlc_app_ids: &[u32]) -> Vec<u32> {
+        let mut all_ids = Vec::with_capacity(1 + dlc_app_ids.len());
+        if app_id != 0 {
+            all_ids.push(app_id);
+        }
+        for dlc in dlc_app_ids {
+            if *dlc == 0 || *dlc == app_id || all_ids.contains(dlc) {
+                continue;
+            }
+            all_ids.push(*dlc);
+        }
+        all_ids
+    }
+
+    pub fn prepare_app_missing_token_ids(&self, all_ids: &[u32]) -> Vec<u32> {
+        all_ids
+            .iter()
+            .copied()
+            .filter(|id| {
+                self.library
+                    .find_app(*id)
+                    .is_some_and(|app| app.missing_token && app.access_token == 0)
+            })
+            .collect()
+    }
+
+    pub fn prepare_app_pics_requests(&self, all_ids: &[u32]) -> Vec<PicsAppInfoReq> {
+        all_ids
+            .iter()
+            .map(|id| PicsAppInfoReq {
+                appid: *id,
+                access_token: self
+                    .library
+                    .find_app(*id)
+                    .map(|app| app.access_token)
+                    .unwrap_or_default(),
+                only_public_obsolete: false,
+            })
+            .collect()
+    }
+
+    pub fn build_family_group_call(
+        &self,
+        family_group_id: u64,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "FamilyGroups.GetFamilyGroup#1",
+            job_id,
+            CFamilyGroupsGetFamilyGroupRequest {
+                family_groupid: family_group_id,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_owned_games_call(
+        &self,
+        steam_id: u64,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Player.GetOwnedGames#1",
+            job_id,
+            CPlayerGetOwnedGamesRequest {
+                steamid: steam_id,
+                include_appinfo: true,
+                include_played_free_games: true,
+                include_free_sub: true,
+                include_extended_appinfo: true,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_inventory_item_def_meta_call(
+        &self,
+        app_id: u32,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Inventory.GetItemDefMeta#1",
+            job_id,
+            CInventoryGetItemDefMetaRequest { appid: app_id }.serialize(),
+        )
+    }
+
+    pub fn build_published_file_subscribed_call(
+        &self,
+        app_id: u32,
+        page: u32,
+        num_per_page: u32,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "PublishedFile.GetUserFiles#1",
+            job_id,
+            CPublishedFileGetUserFilesRequest {
+                steamid: self.steam_id(),
+                appid: app_id,
+                page,
+                numperpage: num_per_page,
+                request_type: "mysubscriptions".to_string(),
+                filetype: u32::MAX,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_cloud_user_quota_call(&self, job_id: u64) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.GetUserQuota#1",
+            job_id,
+            CCloudGetUserQuotaRequest.serialize(),
+        )
+    }
+
+    pub fn build_cloud_app_file_changelist_call(
+        &self,
+        app_id: u32,
+        synced_change_number: u64,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.GetAppFileChangelist#1",
+            job_id,
+            CCloudGetAppFileChangelistRequest {
+                appid: app_id,
+                synced_change_number,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_cloud_file_download_info_call(
+        &self,
+        app_id: u32,
+        filename: impl Into<String>,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.ClientFileDownload#1",
+            job_id,
+            CCloudClientFileDownloadRequest {
+                appid: app_id,
+                filename: filename.into(),
+                realm: 1,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_cloud_begin_app_upload_batch_call(
+        &self,
+        app_id: u32,
+        machine_name: impl Into<String>,
+        files_to_upload: Vec<String>,
+        files_to_delete: Vec<String>,
+        client_id: u64,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.BeginAppUploadBatch#1",
+            job_id,
+            CCloudBeginAppUploadBatchRequest {
+                appid: app_id,
+                machine_name: machine_name.into(),
+                files_to_upload,
+                files_to_delete,
+                client_id,
+                app_build_id: 0,
+            }
+            .serialize(),
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn build_cloud_begin_file_upload_call(
+        &self,
+        app_id: u32,
+        filename: impl Into<String>,
+        file_size: u32,
+        raw_file_size: u32,
+        file_sha: Vec<u8>,
+        time_stamp: u64,
+        upload_batch_id: u64,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.ClientBeginFileUpload#1",
+            job_id,
+            CCloudClientBeginFileUploadRequest {
+                appid: app_id,
+                file_size,
+                raw_file_size,
+                file_sha,
+                time_stamp,
+                filename: filename.into(),
+                upload_batch_id,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_cloud_commit_file_upload_call(
+        &self,
+        transfer_succeeded: bool,
+        app_id: u32,
+        file_sha: Vec<u8>,
+        filename: impl Into<String>,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.ClientCommitFileUpload#1",
+            job_id,
+            CCloudClientCommitFileUploadRequest {
+                transfer_succeeded,
+                appid: app_id,
+                file_sha,
+                filename: filename.into(),
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_cloud_complete_app_upload_batch_call(
+        &self,
+        app_id: u32,
+        batch_id: u64,
+        batch_eresult: u32,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.CompleteAppUploadBatchBlocking#1",
+            job_id,
+            CCloudCompleteAppUploadBatchRequest {
+                appid: app_id,
+                batch_id,
+                batch_eresult,
+            }
+            .serialize(),
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn build_cloud_launch_intent_call(
+        &self,
+        app_id: u32,
+        client_id: u64,
+        machine_name: impl Into<String>,
+        ignore_pending_operations: bool,
+        os_type: i32,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.SignalAppLaunchIntent#1",
+            job_id,
+            CCloudAppLaunchIntentRequest {
+                appid: app_id,
+                client_id,
+                machine_name: machine_name.into(),
+                ignore_pending_operations,
+                os_type,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_cloud_exit_sync_done_call(
+        &self,
+        app_id: u32,
+        client_id: u64,
+        uploads_completed: bool,
+        uploads_required: bool,
+        job_id: u64,
+    ) -> Option<OutboundServiceCall> {
+        self.build_authed_service_call(
+            "Cloud.SignalAppExitSyncDone#1",
+            job_id,
+            CCloudAppExitSyncDoneNotification {
+                appid: app_id,
+                client_id,
+                uploads_completed,
+                uploads_required,
+            }
+            .serialize(),
+        )
+    }
+
+    pub fn build_lobby_get_list(
+        &self,
+        app_id: u32,
+        filters: Vec<CMsgClientMMSGetLobbyListFilter>,
+        num_lobbies_requested: i32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 {
+            return None;
+        }
+        self.build_job_proto_message(
+            EMsg::CLIENT_MMS_GET_LOBBY_LIST,
+            job_id,
+            CMsgClientMMSGetLobbyList {
+                app_id,
+                num_lobbies_requested,
+                cell_id: 0,
+                filters,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_lobby_create(
+        &self,
+        app_id: u32,
+        lobby_type: i32,
+        max_members: i32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 {
+            return None;
+        }
+        let persona_name = self
+            .self_persona()
+            .map(|persona| persona.player_name)
+            .unwrap_or_default();
+        self.build_job_proto_message(
+            EMsg::CLIENT_MMS_CREATE_LOBBY,
+            job_id,
+            CMsgClientMMSCreateLobby {
+                app_id,
+                max_members,
+                lobby_type,
+                lobby_flags: 0,
+                metadata: Vec::new(),
+                persona_name_owner: persona_name,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_lobby_join(
+        &self,
+        app_id: u32,
+        lobby_sid: u64,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || lobby_sid == 0 {
+            return None;
+        }
+        let persona_name = self
+            .self_persona()
+            .map(|persona| persona.player_name)
+            .unwrap_or_default();
+        self.build_job_proto_message(
+            EMsg::CLIENT_MMS_JOIN_LOBBY,
+            job_id,
+            CMsgClientMMSJoinLobby {
+                app_id,
+                steam_id_lobby: lobby_sid,
+                persona_name,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_lobby_leave(&self, app_id: u32, lobby_sid: u64) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || lobby_sid == 0 {
+            return None;
+        }
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_MMS_LEAVE_LOBBY,
+            CMsgClientMMSLeaveLobby {
+                app_id,
+                steam_id_lobby: lobby_sid,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_lobby_send_chat(
+        &self,
+        app_id: u32,
+        lobby_sid: u64,
+        data: Vec<u8>,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || lobby_sid == 0 || data.is_empty() {
+            return None;
+        }
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_MMS_SEND_LOBBY_CHAT_MSG,
+            CMsgClientMMSSendLobbyChatMsg {
+                app_id,
+                steam_id_lobby: lobby_sid,
+                lobby_message: data,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn build_lobby_set_data(
+        &self,
+        app_id: u32,
+        lobby_sid: u64,
+        steam_id_member: u64,
+        metadata: Vec<u8>,
+        max_members: i32,
+        lobby_type: i32,
+        lobby_flags: i32,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || lobby_sid == 0 {
+            return None;
+        }
+        self.build_job_proto_message(
+            EMsg::CLIENT_MMS_SET_LOBBY_DATA,
+            job_id,
+            CMsgClientMMSSetLobbyData {
+                app_id,
+                steam_id_lobby: lobby_sid,
+                steam_id_member,
+                max_members,
+                lobby_type,
+                lobby_flags,
+                metadata,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_lobby_set_owner(
+        &self,
+        app_id: u32,
+        lobby_sid: u64,
+        new_owner_sid: u64,
+        job_id: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || lobby_sid == 0 || new_owner_sid == 0 {
+            return None;
+        }
+        self.build_job_proto_message(
+            EMsg::CLIENT_MMS_SET_LOBBY_OWNER,
+            job_id,
+            CMsgClientMMSSetLobbyOwner {
+                app_id,
+                steam_id_lobby: lobby_sid,
+                steam_id_new_owner: new_owner_sid,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn build_lobby_invite_user(
+        &self,
+        app_id: u32,
+        lobby_sid: u64,
+        invitee_sid: u64,
+    ) -> Option<OutboundProtoMessage> {
+        if app_id == 0 || lobby_sid == 0 || invitee_sid == 0 {
+            return None;
+        }
+        self.build_outbound_proto_message(
+            EMsg::CLIENT_MMS_INVITE_TO_LOBBY,
+            CMsgClientMMSInviteToLobby {
+                app_id,
+                steam_id_lobby: lobby_sid,
+                steam_id_user_invited: invitee_sid,
+            }
+            .serialize(),
+            app_id,
+        )
+    }
+
+    pub fn route_inbound(
+        &self,
+        emsg: EMsg,
+        header: &CMsgProtoBufHeader,
+        body: &[u8],
+    ) -> InboundAction {
+        match emsg {
+            EMsg::SERVICE_METHOD_RESPONSE
+            | EMsg::CLIENT_PICS_ACCESS_TOKEN_RESPONSE
+            | EMsg::CLIENT_PICS_CHANGES_SINCE_RESPONSE
+            | EMsg::CLIENT_GET_APP_OWNERSHIP_TICKET_RESPONSE
+            | EMsg::CLIENT_REQUEST_ENCRYPTED_APP_TICKET_RESPONSE
+            | EMsg::CLIENT_GET_USER_STATS_RESPONSE
+            | EMsg::CLIENT_GET_DEPOT_DECRYPTION_KEY_RESPONSE
+            | EMsg::CLIENT_MMS_CREATE_LOBBY_RESPONSE
+            | EMsg::CLIENT_MMS_JOIN_LOBBY_RESPONSE
+            | EMsg::CLIENT_MMS_LEAVE_LOBBY_RESPONSE
+            | EMsg::CLIENT_MMS_GET_LOBBY_LIST_RESPONSE
+            | EMsg::CLIENT_MMS_SET_LOBBY_DATA_RESPONSE
+            | EMsg::CLIENT_MMS_SET_LOBBY_OWNER_RESPONSE
+            | EMsg::CLIENT_MMS_GET_LOBBY_STATUS_RESPONSE => {
+                if header.jobid_target == INVALID_JOB_ID {
+                    InboundAction::Ignored
+                } else {
+                    let eresult = if header.eresult == -1 {
+                        1
+                    } else {
+                        header.eresult
+                    };
+                    InboundAction::DeliverJob(JobResult {
+                        eresult,
+                        error_message: header.error_message.clone(),
+                        body: body.to_vec(),
+                        synthetic_failure: false,
+                    })
+                }
+            }
+            EMsg::CLIENT_PICS_PRODUCT_INFO_RESPONSE => InboundAction::PicsProductInfo,
+            EMsg::MULTI => InboundAction::Multi,
+            EMsg::CLIENT_LOGON_RESPONSE => {
+                let Some(resp) = CMsgClientLogonResponse::deserialize(body) else {
+                    return InboundAction::ParseFailed("ClientLogonResponse");
+                };
+                if resp.eresult == 1 {
+                    self.state
+                        .store(ClientState::LoggedOn as u8, Ordering::Relaxed);
+                    self.steam_id
+                        .store(resp.client_supplied_steamid, Ordering::Relaxed);
+                    self.session_id
+                        .store(header.client_sessionid, Ordering::Relaxed);
+                    self.family_group_id
+                        .store(resp.family_group_id, Ordering::Relaxed);
+                    self.server_realtime
+                        .store(resp.rtime32_server_time, Ordering::Relaxed);
+                    InboundAction::LogonOk
+                } else {
+                    InboundAction::LoggedOff
+                }
+            }
+            EMsg::CLIENT_LOGGED_OFF | EMsg::CLIENT_SERVER_UNAVAILABLE => {
+                if self.state() == ClientState::LoggedOn {
+                    self.state
+                        .store(ClientState::Connected as u8, Ordering::Relaxed);
+                }
+                self.steam_id.store(0, Ordering::Relaxed);
+                self.session_id.store(0, Ordering::Relaxed);
+                self.family_group_id.store(0, Ordering::Relaxed);
+                self.server_realtime.store(0, Ordering::Relaxed);
+                InboundAction::LoggedOff
+            }
+            EMsg::CLIENT_LICENSE_LIST => {
+                let Some(msg) = CMsgClientLicenseList::deserialize(body) else {
+                    return InboundAction::ParseFailed("ClientLicenseList");
+                };
+                let count = msg.licenses.len();
+                *self.license_list.lock().expect("license list poisoned") = msg.licenses.clone();
+                self.library.ingest_license_list(&msg);
+                InboundAction::LicenseList(count)
+            }
+            EMsg::CLIENT_FRIENDS_LIST => {
+                let Some(msg) = CMsgClientFriendsList::deserialize(body) else {
+                    return InboundAction::ParseFailed("ClientFriendsList");
+                };
+                let mut friends = self.friends.lock().expect("friends list poisoned");
+                if !msg.bincremental {
+                    friends.clear();
+                }
+                for friend in &msg.friends {
+                    if friend.efriendrelationship == 0 {
+                        friends.remove(&friend.ulfriendid);
+                    } else {
+                        friends.insert(friend.ulfriendid, friend.efriendrelationship);
+                    }
+                }
+                InboundAction::FriendsList(friends.len())
+            }
+            EMsg::CLIENT_PERSONA_STATE => {
+                let Some(msg) = CMsgClientPersonaState::deserialize(body) else {
+                    return InboundAction::ParseFailed("ClientPersonaState");
+                };
+                let count = msg.friends.len();
+                let self_id = self.steam_id();
+                let mut self_persona = self.self_persona.lock().expect("self persona poisoned");
+                let mut friend_personas = self
+                    .friend_personas
+                    .lock()
+                    .expect("friend personas poisoned");
+                for friend in msg.friends {
+                    if friend.friendid == self_id {
+                        match self_persona.as_mut() {
+                            Some(existing) => {
+                                if !friend.player_name.is_empty() {
+                                    existing.player_name = friend.player_name;
+                                }
+                                if friend.has_persona_state {
+                                    existing.persona_state = friend.persona_state;
+                                }
+                                if friend.has_game {
+                                    existing.game_played_app_id = friend.game_played_app_id;
+                                }
+                                if !friend.game_name.is_empty() {
+                                    existing.game_name = friend.game_name;
+                                }
+                                if friend.gameid != 0 {
+                                    existing.gameid = friend.gameid;
+                                }
+                                if !friend.avatar_hash.is_empty() {
+                                    existing.avatar_hash = friend.avatar_hash;
+                                }
+                                if !friend.rich_presence.is_empty() {
+                                    existing.rich_presence = friend.rich_presence;
+                                }
+                            }
+                            None => *self_persona = Some(friend),
+                        }
+                    } else {
+                        let slot = friend_personas.entry(friend.friendid).or_default();
+                        slot.sid = friend.friendid;
+                        if !friend.player_name.is_empty() {
+                            slot.player_name = friend.player_name;
+                        }
+                        if friend.has_persona_state {
+                            slot.persona_state = friend.persona_state;
+                        }
+                        if friend.has_game {
+                            slot.game_played_app_id = friend.game_played_app_id;
+                        }
+                        if !friend.game_name.is_empty() {
+                            slot.game_name = friend.game_name;
+                        }
+                        if friend.gameid != 0 {
+                            slot.gameid = friend.gameid;
+                        }
+                        if !friend.avatar_hash.is_empty() {
+                            slot.avatar_hash = friend.avatar_hash;
+                        }
+                        if !friend.rich_presence.is_empty() {
+                            slot.rich_presence = friend.rich_presence;
+                        }
+                    }
+                }
+                InboundAction::PersonaState(count)
+            }
+            EMsg::CLIENT_PLAYING_SESSION_STATE => {
+                let Some(msg) = CMsgClientPlayingSessionState::deserialize(body) else {
+                    return InboundAction::ParseFailed("ClientPlayingSessionState");
+                };
+                self.playing_blocked
+                    .store(msg.playing_blocked, Ordering::Relaxed);
+                InboundAction::PlayingSessionState(msg.playing_blocked)
+            }
+            EMsg::CLIENT_ACCOUNT_INFO => parse_account_info(body)
+                .map(InboundAction::AccountInfo)
+                .unwrap_or(InboundAction::ParseFailed("ClientAccountInfo")),
+            EMsg::CLIENT_MMS_LOBBY_DATA
+            | EMsg::CLIENT_MMS_LOBBY_CHAT_MSG
+            | EMsg::CLIENT_MMS_USER_JOINED_LOBBY
+            | EMsg::CLIENT_MMS_USER_LEFT_LOBBY => InboundAction::LobbyPush,
+            EMsg::SERVICE_METHOD | EMsg::SERVICE_METHOD_SEND_TO_CLIENT => {
+                if header
+                    .target_job_name
+                    .starts_with("FriendMessagesClient.IncomingMessage")
+                {
+                    if let Some(note) =
+                        crate::pb::cfriendmessages::CFriendMessagesIncomingMessageNotification::deserialize(body)
+                    {
+                        if note.chat_entry_type
+                            == crate::pb::cfriendmessages::CHAT_ENTRY_TYPE_TEXT
+                            && !note.message.is_empty()
+                        {
+                            self.push_incoming_message(IncomingFriendMessage {
+                                friend_id: note.steamid_friend,
+                                from_self: note.local_echo,
+                                message: note.message,
+                                timestamp: note.rtime32_server_timestamp,
+                                ordinal: note.ordinal,
+                            });
+                        }
+                    }
+                }
+                InboundAction::ClientMessage
+            }
+            _ => InboundAction::ClientMessage,
+        }
+    }
+
+    pub fn license_list(&self) -> Vec<License> {
+        self.license_list
+            .lock()
+            .expect("license list poisoned")
+            .clone()
+    }
+
+    pub fn friends_list(&self) -> Vec<u64> {
+        self.friends
+            .lock()
+            .expect("friends list poisoned")
+            .iter()
+            .filter_map(|(sid, relationship)| (*relationship == 3).then_some(*sid))
+            .collect()
+    }
+
+    pub fn self_persona(&self) -> Option<PersonaStateFriend> {
+        self.self_persona
+            .lock()
+            .expect("self persona poisoned")
+            .clone()
+    }
+
+    pub fn friend_personas(&self) -> Vec<FriendPersonaSnapshot> {
+        self.friend_personas
+            .lock()
+            .expect("friend personas poisoned")
+            .values()
+            .filter(|snapshot| !snapshot.player_name.is_empty())
+            .cloned()
+            .collect()
+    }
+
+    pub fn push_incoming_message(&self, message: IncomingFriendMessage) {
+        self.incoming_messages
+            .lock()
+            .expect("incoming messages poisoned")
+            .push(message);
+    }
+
+    pub fn drain_incoming_messages(&self) -> Vec<IncomingFriendMessage> {
+        std::mem::take(
+            &mut *self
+                .incoming_messages
+                .lock()
+                .expect("incoming messages poisoned"),
+        )
+    }
+}
+
+fn parse_account_info(body: &[u8]) -> Option<AccountInfoSnapshot> {
+    let mut reader = crate::proto_wire::Reader::new(body);
+    let mut info = AccountInfoSnapshot::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(info);
+        };
+        match tag.field_number {
+            1 => info.persona_name = reader.string()?,
+            2 => info.ip_country = reader.string()?,
+            15 => info.two_factor_enabled = reader.u32()? != 0,
+            17 => info.phone_verified = reader.boolean()?,
+            19 => info.phone_identifying = reader.boolean()?,
+            20 => info.phone_requires_verification = reader.boolean()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(info)
+}
+
+pub fn parse_cmsg_multi(body: &[u8]) -> Option<CMsgMultiBody> {
+    let mut reader = crate::proto_wire::Reader::new(body);
+    let mut multi = CMsgMultiBody::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(multi);
+        };
+        match tag.field_number {
+            1 => multi.size_unzipped = reader.u32()?,
+            2 => multi.message_body = reader.bytes()?.to_vec(),
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(multi)
+}
+
+pub fn decode_multi_records(body: &[u8]) -> Option<Vec<Vec<u8>>> {
+    let multi = parse_cmsg_multi(body)?;
+    let records = if multi.size_unzipped > 0 {
+        gunzip_or_zlib(&multi.message_body, multi.size_unzipped as usize)?
+    } else {
+        multi.message_body
+    };
+
+    let mut out = Vec::new();
+    let mut offset = 0usize;
+    while offset + 4 <= records.len() {
+        let inner_len = crate::wire_format::read_u32_le(&records[offset..]) as usize;
+        offset += 4;
+        if inner_len == 0 || offset + inner_len > records.len() {
+            return None;
+        }
+        out.push(records[offset..offset + inner_len].to_vec());
+        offset += inner_len;
+    }
+    (offset == records.len()).then_some(out)
+}
+
+fn gunzip_or_zlib(compressed: &[u8], expected_size: usize) -> Option<Vec<u8>> {
+    let mut out = Vec::with_capacity(expected_size);
+    if GzDecoder::new(compressed).read_to_end(&mut out).is_ok() && !out.is_empty() {
+        return Some(out);
+    }
+    out.clear();
+    if ZlibDecoder::new(compressed).read_to_end(&mut out).is_ok() && !out.is_empty() {
+        return Some(out);
+    }
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::{WireType, Writer};
+    use flate2::write::GzEncoder;
+    use flate2::Compression;
+    use std::io::Write;
+
+    #[test]
+    fn service_method_call_sets_authed_and_non_authed_emsgs() {
+        let core = CMClientCore::default();
+        core.steam_id.store(123, Ordering::Relaxed);
+        core.session_id.store(7, Ordering::Relaxed);
+        let authed = crate::proto_envelope::decode_proto_envelope(&core.build_service_method_call(
+            "Player.GetOwnedGames#1",
+            true,
+            55,
+            b"req",
+        ))
+        .unwrap();
+        assert_eq!(authed.emsg, EMsg::SERVICE_METHOD_CALL_FROM_CLIENT);
+        assert_eq!(authed.header.steamid, 123);
+        assert_eq!(authed.header.client_sessionid, 7);
+        assert_eq!(authed.header.jobid_source, 55);
+        assert_eq!(authed.body, b"req");
+
+        let non = crate::proto_envelope::decode_proto_envelope(&core.build_service_method_call(
+            "Authentication.Begin#1",
+            false,
+            56,
+            b"req",
+        ))
+        .unwrap();
+        assert_eq!(non.emsg, EMsg::SERVICE_METHOD_CALL_FROM_CLIENT_NON_AUTHED);
+        // Matches C++: header carries current steamid/session even on non-authed
+        // calls (post-logon pre-existing identity is harmless; pre-logon both are 0).
+        assert_eq!(non.header.steamid, 123);
+        assert_eq!(non.header.client_sessionid, 7);
+    }
+
+    #[test]
+    fn cmsg_multi_decodes_plain_and_gzip_records() {
+        let first = encode_proto_envelope(EMsg::CLIENT_HELLO, &CMsgProtoBufHeader::default(), b"a");
+        let second = encode_proto_envelope(
+            EMsg::CLIENT_FRIENDS_LIST,
+            &CMsgProtoBufHeader::default(),
+            b"b",
+        );
+        let mut records = Vec::new();
+        records.extend_from_slice(&(first.len() as u32).to_le_bytes());
+        records.extend_from_slice(&first);
+        records.extend_from_slice(&(second.len() as u32).to_le_bytes());
+        records.extend_from_slice(&second);
+
+        let mut body = Vec::new();
+        {
+            let mut writer = Writer::new(&mut body);
+            writer.bytes_field(2, &records);
+        }
+        assert_eq!(
+            decode_multi_records(&body).unwrap(),
+            vec![first.clone(), second.clone()]
+        );
+
+        let mut encoder = GzEncoder::new(Vec::new(), Compression::default());
+        encoder.write_all(&records).unwrap();
+        let zipped = encoder.finish().unwrap();
+        let mut zipped_body = Vec::new();
+        {
+            let mut writer = Writer::new(&mut zipped_body);
+            writer.uint32_field(1, records.len() as u32);
+            writer.bytes_field(2, &zipped);
+        }
+        assert_eq!(
+            decode_multi_records(&zipped_body).unwrap(),
+            vec![first, second]
+        );
+    }
+
+    #[test]
+    fn lifecycle_builders_match_cpp_session_flow() {
+        let core = CMClientCore::default();
+        let hello = core.build_client_hello();
+        assert_eq!(hello.emsg, EMsg::CLIENT_HELLO);
+
+        assert!(core
+            .build_logon_with_refresh_token("refresh", "ada", 0)
+            .is_none());
+        core.set_state(ClientState::Connected);
+        let logon = core
+            .build_logon_with_refresh_token("refresh", "ada", 123)
+            .unwrap();
+        assert_eq!(logon.emsg, EMsg::CLIENT_LOGON);
+        let decoded = crate::proto_envelope::decode_proto_envelope(&logon.wire).unwrap();
+        assert_eq!(decoded.header.steamid, 0x0110_0001_0000_0000);
+        assert!(logon
+            .body
+            .windows("refresh".len())
+            .any(|window| window == b"refresh"));
+        assert!(core
+            .build_logon_with_refresh_token("refresh", "", 123)
+            .is_some());
+
+        assert!(core.build_logoff().is_none());
+        core.set_state(ClientState::LoggedOn);
+        assert_eq!(core.build_logoff().unwrap().emsg, EMsg::CLIENT_LOG_OFF);
+    }
+
+    #[test]
+    fn logon_response_updates_session_identity() {
+        let core = CMClientCore::default();
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.int32_field(1, 1);
+            w.tag(20, WireType::Fixed64);
+            w.raw_bytes(&765u64.to_le_bytes());
+            w.fixed32_field(5, 1_700_000_000);
+            w.uint64_field(31, 99);
+        }
+        let header = CMsgProtoBufHeader {
+            steamid: 999,
+            client_sessionid: 42,
+            ..Default::default()
+        };
+        assert_eq!(
+            core.route_inbound(EMsg::CLIENT_LOGON_RESPONSE, &header, &body),
+            InboundAction::LogonOk
+        );
+        assert_eq!(core.state(), ClientState::LoggedOn);
+        assert_eq!(core.steam_id(), 765);
+        assert_eq!(core.session_id(), 42);
+        assert_eq!(core.family_group_id(), 99);
+        assert_eq!(core.server_realtime(), 1_700_000_000);
+
+        assert_eq!(
+            core.route_inbound(EMsg::CLIENT_LOGGED_OFF, &CMsgProtoBufHeader::default(), &[]),
+            InboundAction::LoggedOff
+        );
+        assert_eq!(core.state(), ClientState::Connected);
+        assert_eq!(core.steam_id(), 0);
+        assert_eq!(core.session_id(), 0);
+        assert_eq!(core.family_group_id(), 0);
+        assert_eq!(core.server_realtime(), 0);
+    }
+
+    #[test]
+    fn routes_license_friends_and_playing_state_pushes() {
+        let core = CMClientCore::default();
+        let mut lic = Vec::new();
+        Writer::new(&mut lic).uint32_field(1, 100);
+        let mut license_body = Vec::new();
+        Writer::new(&mut license_body).submessage_field(2, &lic);
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_LICENSE_LIST,
+                &CMsgProtoBufHeader::default(),
+                &license_body
+            ),
+            InboundAction::LicenseList(1)
+        );
+        assert_eq!(core.license_list()[0].package_id, 100);
+
+        let mut friend = Vec::new();
+        {
+            let mut w = Writer::new(&mut friend);
+            w.fixed64_field(1, 555);
+            w.uint32_field(2, 3);
+        }
+        let mut blocked_friend = Vec::new();
+        {
+            let mut w = Writer::new(&mut blocked_friend);
+            w.fixed64_field(1, 999);
+            w.uint32_field(2, 1);
+        }
+        let mut friends_body = Vec::new();
+        {
+            let mut w = Writer::new(&mut friends_body);
+            w.bool_field(1, false);
+            w.submessage_field(2, &friend);
+            w.submessage_field(2, &blocked_friend);
+        }
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_FRIENDS_LIST,
+                &CMsgProtoBufHeader::default(),
+                &friends_body
+            ),
+            InboundAction::FriendsList(2)
+        );
+        assert_eq!(core.friends_list(), [555]);
+
+        let mut playing = Vec::new();
+        {
+            let mut w = Writer::new(&mut playing);
+            w.tag(2, WireType::Varint);
+            w.varint(1);
+        }
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_PLAYING_SESSION_STATE,
+                &CMsgProtoBufHeader::default(),
+                &playing
+            ),
+            InboundAction::PlayingSessionState(true)
+        );
+        assert!(core.is_playing_blocked());
+    }
+
+    #[test]
+    fn friend_persona_snapshots_exclude_empty_names_like_cpp() {
+        let core = logged_on_core();
+        let mut named = Vec::new();
+        {
+            let mut w = Writer::new(&mut named);
+            w.fixed64_field(1, 111);
+            w.string_field(15, "Ada");
+        }
+        let mut unnamed = Vec::new();
+        Writer::new(&mut unnamed).fixed64_field(1, 222);
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.submessage_field(2, &named);
+            w.submessage_field(2, &unnamed);
+        }
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_PERSONA_STATE,
+                &CMsgProtoBufHeader::default(),
+                &body
+            ),
+            InboundAction::PersonaState(2)
+        );
+        let personas = core.friend_personas();
+        assert_eq!(personas.len(), 1);
+        assert_eq!(personas[0].sid, 111);
+    }
+
+    #[test]
+    fn incremental_friend_removal_and_persona_partial_updates_match_cpp() {
+        let core = logged_on_core();
+        let mut add = Vec::new();
+        {
+            let mut friend = Vec::new();
+            let mut w = Writer::new(&mut friend);
+            w.fixed64_field(1, 333);
+            w.uint32_field(2, 3);
+            Writer::new(&mut add).submessage_field(2, &friend);
+        }
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_FRIENDS_LIST,
+                &CMsgProtoBufHeader::default(),
+                &add
+            ),
+            InboundAction::FriendsList(1)
+        );
+        assert_eq!(core.friends_list(), [333]);
+
+        let mut remove = Vec::new();
+        {
+            let mut friend = Vec::new();
+            let mut w = Writer::new(&mut friend);
+            w.fixed64_field(1, 333);
+            w.uint32_field(2, 0);
+            let mut w = Writer::new(&mut remove);
+            w.bool_field(1, true);
+            w.submessage_field(2, &friend);
+        }
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_FRIENDS_LIST,
+                &CMsgProtoBufHeader::default(),
+                &remove
+            ),
+            InboundAction::FriendsList(0)
+        );
+        assert!(core.friends_list().is_empty());
+
+        let mut first_friend = Vec::new();
+        {
+            let mut w = Writer::new(&mut first_friend);
+            w.fixed64_field(1, 444);
+            w.string_field(15, "Grace");
+            w.bytes_field(31, &[9, 9]);
+        }
+        let mut first_body = Vec::new();
+        Writer::new(&mut first_body).submessage_field(2, &first_friend);
+        core.route_inbound(
+            EMsg::CLIENT_PERSONA_STATE,
+            &CMsgProtoBufHeader::default(),
+            &first_body,
+        );
+
+        let mut partial_friend = Vec::new();
+        {
+            let mut w = Writer::new(&mut partial_friend);
+            w.fixed64_field(1, 444);
+            w.uint32_field(2, 2);
+        }
+        let mut partial_body = Vec::new();
+        Writer::new(&mut partial_body).submessage_field(2, &partial_friend);
+        core.route_inbound(
+            EMsg::CLIENT_PERSONA_STATE,
+            &CMsgProtoBufHeader::default(),
+            &partial_body,
+        );
+        let persona = core.friend_personas().pop().unwrap();
+        assert_eq!(persona.player_name, "Grace");
+        assert_eq!(persona.avatar_hash, [9, 9]);
+        assert_eq!(persona.persona_state, 2);
+    }
+
+    #[test]
+    fn account_info_push_parses_bridge_fields() {
+        let core = CMClientCore::default();
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.string_field(1, "Ada");
+            w.string_field(2, "US");
+            w.uint32_field(15, 1);
+            w.bool_field(17, true);
+            w.bool_field(19, true);
+            w.bool_field(20, false);
+        }
+        assert_eq!(
+            core.route_inbound(
+                EMsg::CLIENT_ACCOUNT_INFO,
+                &CMsgProtoBufHeader::default(),
+                &body
+            ),
+            InboundAction::AccountInfo(AccountInfoSnapshot {
+                persona_name: "Ada".into(),
+                ip_country: "US".into(),
+                two_factor_enabled: true,
+                phone_verified: true,
+                phone_identifying: true,
+                phone_requires_verification: false,
+            })
+        );
+    }
+
+    #[test]
+    fn outbound_persona_and_friend_requests_match_cpp_emsgs() {
+        let core = logged_on_core();
+        let persona = core.build_set_persona_name("Ada", 1).unwrap();
+        assert_eq!(persona.emsg, EMsg::CLIENT_CHANGE_STATUS);
+        assert_eq!(
+            persona.body,
+            CMsgClientChangeStatus {
+                persona_state: 1,
+                player_name: "Ada".into(),
+                persona_set_by_user: true,
+                need_persona_response: false,
+            }
+            .serialize()
+        );
+
+        let request = core
+            .build_request_friend_personas(&[0, 123, 456], 0x47)
+            .unwrap();
+        assert_eq!(request.emsg, EMsg::CLIENT_REQUEST_FRIEND_DATA);
+        assert!(request.body.windows(2).any(|w| w == [0x08, 0x47]));
+
+        let self_request = core.build_request_user_persona().unwrap();
+        assert_eq!(self_request.emsg, EMsg::CLIENT_REQUEST_FRIEND_DATA);
+    }
+
+    #[test]
+    fn outbound_games_stats_and_ticket_requests_include_routing_and_jobs() {
+        let core = logged_on_core();
+        let games = core.build_notify_games_played(480).unwrap();
+        assert_eq!(games.emsg, EMsg::CLIENT_GAMES_PLAYED_WITH_DATA_BLOB);
+        assert_eq!(
+            games.body,
+            CMsgClientGamesPlayed {
+                games_played: vec![GamePlayedEntry {
+                    game_id: 480,
+                    ..Default::default()
+                }],
+                client_os_type: 0
+            }
+            .serialize()
+        );
+        assert!(core.build_notify_games_played(0).unwrap().body.len() <= games.body.len());
+
+        let stats = core
+            .build_store_user_stats(480, core.steam_id(), 0, &[(1, 2), (3, 0)])
+            .unwrap();
+        assert_eq!(stats.emsg, EMsg::CLIENT_STORE_USER_STATS_2);
+        assert_eq!(stats.routing_appid, 480);
+
+        let ticket = core.build_get_app_ownership_ticket(480, 99).unwrap();
+        let decoded = crate::proto_envelope::decode_proto_envelope(&ticket.wire).unwrap();
+        assert_eq!(decoded.emsg, EMsg::CLIENT_GET_APP_OWNERSHIP_TICKET);
+        assert_eq!(decoded.header.jobid_source, 99);
+        assert_eq!(decoded.header.jobid_target, INVALID_JOB_ID);
+
+        let encrypted = core.build_request_encrypted_app_ticket(480, 123).unwrap();
+        let decoded = crate::proto_envelope::decode_proto_envelope(&encrypted.wire).unwrap();
+        assert_eq!(decoded.emsg, EMsg::CLIENT_REQUEST_ENCRYPTED_APP_TICKET);
+        assert_eq!(decoded.header.jobid_source, 123);
+        assert_eq!(decoded.header.jobid_target, INVALID_JOB_ID);
+        assert_eq!(decoded.header.routing_appid, 0);
+    }
+
+    #[test]
+    fn outbound_rich_presence_is_authed_service_call() {
+        let core = logged_on_core();
+        let call = core
+            .build_rich_presence_call(
+                480,
+                [
+                    ("status".to_string(), "Playing".to_string()),
+                    ("".into(), "skip".into()),
+                ],
+                77,
+            )
+            .unwrap();
+        assert_eq!(call.method_name, "Player.SetRichPresence#1");
+        assert!(call.authed);
+        let decoded = crate::proto_envelope::decode_proto_envelope(&call.wire).unwrap();
+        assert_eq!(decoded.emsg, EMsg::SERVICE_METHOD_CALL_FROM_CLIENT);
+        assert_eq!(decoded.header.jobid_source, 77);
+        assert_eq!(decoded.header.steamid, core.steam_id());
+    }
+
+    #[test]
+    fn downloader_service_builders_match_cpp_rules() {
+        let core = logged_on_core();
+        let depot_key = core.build_get_depot_decryption_key(11, 22, 33).unwrap();
+        let decoded = crate::proto_envelope::decode_proto_envelope(&depot_key.wire).unwrap();
+        assert_eq!(decoded.emsg, EMsg::CLIENT_GET_DEPOT_DECRYPTION_KEY);
+        assert_eq!(decoded.header.jobid_source, 33);
+
+        let public = core
+            .build_manifest_request_code_call(480, 100, 555, "public", 44)
+            .unwrap();
+        assert_eq!(
+            public.method_name,
+            "ContentServerDirectory.GetManifestRequestCode#1"
+        );
+        assert!(!public.request_body.windows(6).any(|w| w == b"public"));
+
+        let beta = core
+            .build_manifest_request_code_call(480, 100, 555, "Beta", 45)
+            .unwrap();
+        assert!(beta.request_body.windows(4).any(|w| w == b"Beta"));
+
+        let servers = core.build_get_cdn_servers_call(7, 46).unwrap();
+        assert_eq!(
+            servers.method_name,
+            "ContentServerDirectory.GetServersForSteamPipe#1"
+        );
+    }
+
+    #[test]
+    fn pics_builders_set_job_ids_and_emsgs() {
+        let core = logged_on_core();
+        let access = core
+            .build_pics_access_tokens(vec![100], vec![480], 1)
+            .unwrap();
+        assert_eq!(access.emsg, EMsg::CLIENT_PICS_ACCESS_TOKEN_REQUEST);
+        assert_eq!(
+            crate::proto_envelope::decode_proto_envelope(&access.wire)
+                .unwrap()
+                .header
+                .jobid_source,
+            1
+        );
+
+        let changes = core.build_pics_changes_since(99, 2).unwrap();
+        assert_eq!(changes.emsg, EMsg::CLIENT_PICS_CHANGES_SINCE_REQUEST);
+        assert!(changes.body.windows(2).any(|w| w == [0x08, 99]));
+
+        let product = core
+            .build_pics_product_info(
+                vec![PicsPackageInfoReq {
+                    packageid: 100,
+                    access_token: 7,
+                }],
+                vec![PicsAppInfoReq {
+                    appid: 480,
+                    access_token: 8,
+                    only_public_obsolete: false,
+                }],
+                true,
+                3,
+            )
+            .unwrap();
+        assert_eq!(product.emsg, EMsg::CLIENT_PICS_PRODUCT_INFO_REQUEST);
+        assert!(product.body.windows(2).any(|w| w == [0x18, 1]));
+    }
+
+    #[test]
+    fn account_inventory_workshop_and_family_service_builders() {
+        let core = logged_on_core();
+        assert_eq!(
+            core.build_family_group_call(123, 10).unwrap().method_name,
+            "FamilyGroups.GetFamilyGroup#1"
+        );
+
+        let owned = core.build_owned_games_call(765, 11).unwrap();
+        assert_eq!(owned.method_name, "Player.GetOwnedGames#1");
+        assert!(owned.request_body.windows(2).any(|w| w == [0x10, 1]));
+        assert!(owned.request_body.windows(2).any(|w| w == [0x18, 1]));
+
+        assert_eq!(
+            core.build_inventory_item_def_meta_call(480, 12)
+                .unwrap()
+                .method_name,
+            "Inventory.GetItemDefMeta#1"
+        );
+
+        let workshop = core
+            .build_published_file_subscribed_call(480, 2, 50, 13)
+            .unwrap();
+        assert_eq!(workshop.method_name, "PublishedFile.GetUserFiles#1");
+        assert!(workshop
+            .request_body
+            .windows("mysubscriptions".len())
+            .any(|w| w == b"mysubscriptions"));
+        assert!(workshop
+            .request_body
+            .windows(6)
+            .any(|w| w == [0x70, 0xff, 0xff, 0xff, 0xff, 0x0f]));
+    }
+
+    #[test]
+    fn cloud_service_builders_use_cpp_method_names() {
+        let core = logged_on_core();
+        assert_eq!(
+            core.build_cloud_user_quota_call(20).unwrap().method_name,
+            "Cloud.GetUserQuota#1"
+        );
+        assert_eq!(
+            core.build_cloud_app_file_changelist_call(480, 7, 21)
+                .unwrap()
+                .method_name,
+            "Cloud.GetAppFileChangelist#1"
+        );
+        assert_eq!(
+            core.build_cloud_file_download_info_call(480, "save.dat", 22)
+                .unwrap()
+                .method_name,
+            "Cloud.ClientFileDownload#1"
+        );
+        assert_eq!(
+            core.build_cloud_begin_app_upload_batch_call(
+                480,
+                "machine",
+                vec!["save.dat".into()],
+                vec![],
+                99,
+                23
+            )
+            .unwrap()
+            .method_name,
+            "Cloud.BeginAppUploadBatch#1"
+        );
+        assert_eq!(
+            core.build_cloud_begin_file_upload_call(
+                480,
+                "save.dat",
+                10,
+                20,
+                vec![1; 20],
+                123,
+                555,
+                24
+            )
+            .unwrap()
+            .method_name,
+            "Cloud.ClientBeginFileUpload#1"
+        );
+        assert_eq!(
+            core.build_cloud_commit_file_upload_call(true, 480, vec![1; 20], "save.dat", 25)
+                .unwrap()
+                .method_name,
+            "Cloud.ClientCommitFileUpload#1"
+        );
+        assert_eq!(
+            core.build_cloud_complete_app_upload_batch_call(480, 555, 1, 26)
+                .unwrap()
+                .method_name,
+            "Cloud.CompleteAppUploadBatchBlocking#1"
+        );
+        assert_eq!(
+            core.build_cloud_launch_intent_call(480, 99, "machine", false, 16, 27)
+                .unwrap()
+                .method_name,
+            "Cloud.SignalAppLaunchIntent#1"
+        );
+        assert_eq!(
+            core.build_cloud_exit_sync_done_call(480, 99, true, false, 28)
+                .unwrap()
+                .method_name,
+            "Cloud.SignalAppExitSyncDone#1"
+        );
+    }
+
+    #[test]
+    fn prepare_app_helpers_dedupe_dlc_and_pick_tokens() {
+        let core = logged_on_core();
+        let ids = CMClientCore::prepare_app_ids(480, &[0, 480, 481, 481, 482]);
+        assert_eq!(ids, [480, 481, 482]);
+
+        core.library().ingest_app_pics_response(
+            &crate::pb::cmsg_client_pics::CMsgClientPICSProductInfoResponse {
+                apps: vec![crate::pb::cmsg_client_pics::PicsAppInfoResp {
+                    appid: 481,
+                    missing_token: true,
+                    ..Default::default()
+                }],
+                ..Default::default()
+            },
+        );
+        core.library().ingest_app_access_tokens(
+            &crate::pb::cmsg_client_pics::CMsgClientPICSAccessTokenResponse {
+                app_access_tokens: vec![crate::pb::cmsg_client_pics::PicsAppToken {
+                    appid: 482,
+                    access_token: 99,
+                }],
+                ..Default::default()
+            },
+        );
+
+        assert_eq!(core.prepare_app_missing_token_ids(&ids), [481]);
+        let reqs = core.prepare_app_pics_requests(&ids);
+        assert_eq!(reqs[0].appid, 480);
+        assert_eq!(reqs[1].access_token, 0);
+        assert_eq!(reqs[2].access_token, 99);
+    }
+
+    #[test]
+    fn outbound_builders_drop_when_not_logged_on() {
+        let core = CMClientCore::default();
+        assert!(core.build_set_persona_state(1).is_none());
+        assert!(core.build_notify_games_played(480).is_none());
+        assert!(core.build_get_app_ownership_ticket(480, 1).is_none());
+        assert!(core
+            .build_rich_presence_call(480, [("status".into(), "Playing".into())], 1)
+            .is_none());
+    }
+
+    fn logged_on_core() -> CMClientCore {
+        let core = CMClientCore::default();
+        core.state
+            .store(ClientState::LoggedOn as u8, Ordering::Relaxed);
+        core.steam_id.store(7656119, Ordering::Relaxed);
+        core.session_id.store(42, Ordering::Relaxed);
+        core
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cm_runtime.rs b/app/src/main/cpp/wn-steam-client/rust/src/cm_runtime.rs
new file mode 100644
index 000000000..25ae43617
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cm_runtime.rs
@@ -0,0 +1,620 @@
+use crate::cm_bridge;
+use crate::cm_client::{decode_multi_records, CMClientCore, ClientState, InboundAction};
+use crate::cmsg_protobuf_header::{CMsgProtoBufHeader, INVALID_JOB_ID};
+use crate::emsg::{has_proto_flag, strip_proto_flag, EMsg};
+use crate::encrypted_channel::{ChannelDisconnectReason, ChannelState, EncryptedChannel};
+use crate::heartbeat::Heartbeat;
+use crate::job_manager::{JobManager, JobResult};
+use crate::pb::cmsg_client_pics::CMsgClientPICSProductInfoResponse;
+use crate::pb::cmsg_clientserver_login::CMsgClientLogonResponse;
+use crate::proto_envelope::decode_proto_envelope;
+use crate::transport::Transport;
+use crate::wire_format::read_u32_le;
+use std::collections::HashMap;
+use std::panic::{self, AssertUnwindSafe};
+use std::sync::{Arc, Mutex};
+use std::time::Duration;
+
+type StateCallback = Box<dyn Fn(ClientState) + Send + Sync + 'static>;
+type ClientMessageCallback = Box<dyn Fn(EMsg, &CMsgProtoBufHeader, &[u8]) + Send + Sync + 'static>;
+
+pub struct CMClientRuntime {
+    core: Arc<CMClientCore>,
+    channel: EncryptedChannel,
+    jobs: JobManager,
+    heartbeat: Mutex<Heartbeat>,
+    pics_product_info: Mutex<HashMap<u64, CMsgClientPICSProductInfoResponse>>,
+    on_state: Mutex<Option<StateCallback>>,
+    on_client_message: Mutex<Option<ClientMessageCallback>>,
+}
+
+impl CMClientRuntime {
+    pub fn new(core: Arc<CMClientCore>, transport: Box<dyn Transport>) -> Arc<Self> {
+        let runtime = Arc::new(Self {
+            core,
+            channel: EncryptedChannel::new(transport),
+            jobs: JobManager::default(),
+            heartbeat: Mutex::new(Heartbeat::default()),
+            pics_product_info: Mutex::new(HashMap::new()),
+            on_state: Mutex::new(None),
+            on_client_message: Mutex::new(None),
+        });
+
+        let weak = Arc::downgrade(&runtime);
+        runtime.channel.set_on_connected(move || {
+            if let Some(runtime) = weak.upgrade() {
+                runtime.on_channel_connected();
+            }
+        });
+
+        let weak = Arc::downgrade(&runtime);
+        runtime.channel.set_on_disconnected(move |reason, detail| {
+            if let Some(runtime) = weak.upgrade() {
+                runtime.on_channel_disconnected(reason, detail);
+            }
+        });
+
+        let weak = Arc::downgrade(&runtime);
+        runtime.channel.set_on_message(move |bytes| {
+            if let Some(runtime) = weak.upgrade() {
+                runtime.handle_channel_message(bytes);
+            }
+        });
+
+        runtime
+    }
+
+    pub fn core(&self) -> &Arc<CMClientCore> {
+        &self.core
+    }
+
+    pub fn connect(&self, url: &str) -> bool {
+        self.core.set_state(ClientState::Connecting);
+        self.notify_state(ClientState::Connecting);
+        if self.channel.connect(url) {
+            true
+        } else {
+            self.core.set_state(ClientState::Disconnected);
+            self.notify_state(ClientState::Disconnected);
+            false
+        }
+    }
+
+    pub fn disconnect(&self) {
+        self.heartbeat.lock().expect("heartbeat poisoned").stop();
+        self.channel.disconnect();
+        self.jobs.fail_all("CMClient disconnected");
+        self.core.reset_session_identity();
+        self.core.set_state(ClientState::Disconnected);
+        self.notify_state(ClientState::Disconnected);
+    }
+
+    pub fn set_ca_bundle_path(&self, path: &str) {
+        self.channel.set_ca_bundle_path(path);
+    }
+
+    pub fn set_on_state<F>(&self, callback: F)
+    where
+        F: Fn(ClientState) + Send + Sync + 'static,
+    {
+        *self.on_state.lock().expect("runtime callback poisoned") = Some(Box::new(callback));
+    }
+
+    pub fn set_on_client_message<F>(&self, callback: F)
+    where
+        F: Fn(EMsg, &CMsgProtoBufHeader, &[u8]) + Send + Sync + 'static,
+    {
+        *self
+            .on_client_message
+            .lock()
+            .expect("runtime callback poisoned") = Some(Box::new(callback));
+    }
+
+    pub fn next_job_id(&self) -> u64 {
+        self.jobs.next_job_id()
+    }
+
+    pub fn track_job<F>(&self, job_id: u64, callback: F, timeout: Option<Duration>)
+    where
+        F: FnOnce(JobResult) + Send + 'static,
+    {
+        self.jobs.track(job_id, callback, timeout);
+    }
+
+    pub fn flush_outbound(&self) -> usize {
+        if self.channel.state() != ChannelState::Encrypted {
+            return 0;
+        }
+        let wires = self.core.take_outbound_wires();
+        let mut sent = 0usize;
+        for (idx, wire) in wires.iter().enumerate() {
+            if self.channel.send(wire) {
+                sent += 1;
+                continue;
+            }
+            self.core
+                .restore_outbound_wires_front(wires[idx..].to_vec());
+            break;
+        }
+        sent
+    }
+
+    pub fn handle_channel_message(self: &Arc<Self>, bytes: &[u8]) -> InboundAction {
+        let Some(envelope) = decode_proto_envelope(bytes) else {
+            return self.handle_non_proto_message(bytes);
+        };
+        self.process_envelope(envelope.emsg, &envelope.header, &envelope.body)
+    }
+
+    fn process_envelope(
+        self: &Arc<Self>,
+        emsg: EMsg,
+        header: &CMsgProtoBufHeader,
+        body: &[u8],
+    ) -> InboundAction {
+        let action = self.core.route_inbound(emsg, header, body);
+        match &action {
+            InboundAction::Multi => {
+                if let Some(records) = decode_multi_records(body) {
+                    for record in records {
+                        self.handle_channel_message(&record);
+                    }
+                }
+            }
+            InboundAction::DeliverJob(result) => {
+                self.jobs.deliver(
+                    header.jobid_target,
+                    result.eresult,
+                    result.error_message.clone(),
+                    &result.body,
+                );
+            }
+            InboundAction::LogonOk => {
+                self.start_heartbeat_from_logon(body);
+                self.core
+                    .enqueue_proto_message(self.core.build_set_persona_state(1));
+                self.core
+                    .enqueue_proto_message(self.core.build_request_user_persona());
+                let job_id = self.jobs.next_job_id();
+                self.core
+                    .enqueue_service_call(self.core.build_request_friend_persona_states(job_id));
+                self.flush_outbound();
+                cm_bridge::global_bridge()
+                    .observers()
+                    .dispatch_logon_state(true);
+                cm_bridge::global_bridge()
+                    .observers()
+                    .dispatch_server_realtime(self.core.server_realtime());
+                self.notify_state(ClientState::LoggedOn);
+                self.notify_client_message(emsg, header, body);
+            }
+            InboundAction::LoggedOff => {
+                self.heartbeat.lock().expect("heartbeat poisoned").stop();
+                cm_bridge::global_bridge()
+                    .observers()
+                    .dispatch_logon_state(false);
+                self.notify_state(self.core.state());
+                self.notify_client_message(emsg, header, body);
+            }
+            InboundAction::Ignored | InboundAction::ParseFailed(_) => {}
+            InboundAction::PicsProductInfo => self.handle_pics_product_info(header, body),
+            InboundAction::LobbyPush => {
+                cm_bridge::global_bridge().dispatch_lobby_push(emsg, body);
+            }
+            InboundAction::LicenseList(_) => {
+                let licenses = self
+                    .core
+                    .license_list()
+                    .iter()
+                    .map(cm_bridge::WnCmLicenseEntry::from)
+                    .collect::<Vec<_>>();
+                cm_bridge::global_bridge()
+                    .observers()
+                    .dispatch_license_list(&licenses);
+                self.notify_client_message(emsg, header, body);
+            }
+            InboundAction::FriendsList(_) => {
+                let friends = self.core.friends_list();
+                cm_bridge::global_bridge()
+                    .observers()
+                    .dispatch_friends_list(&friends);
+                self.notify_client_message(emsg, header, body);
+            }
+            InboundAction::PersonaState(_) => {
+                let bridge = cm_bridge::global_bridge();
+                if let Some(self_persona) = self.core.self_persona() {
+                    bridge.dispatch_persona_friend(&self_persona);
+                }
+                for snapshot in self.core.friend_personas() {
+                    bridge.dispatch_persona_snapshot(&snapshot);
+                }
+                self.notify_client_message(emsg, header, body);
+            }
+            InboundAction::AccountInfo(snapshot) => {
+                cm_bridge::global_bridge().dispatch_account_info_snapshot(snapshot);
+                self.notify_client_message(emsg, header, body);
+            }
+            InboundAction::ClientMessage | InboundAction::PlayingSessionState(_) => {
+                self.notify_client_message(emsg, header, body);
+            }
+        }
+        action
+    }
+
+    fn on_channel_connected(self: &Arc<Self>) {
+        self.core.set_state(ClientState::Connected);
+        self.notify_state(ClientState::Connected);
+        // Always send ClientHello first; pre-existing queued wires (e.g. a
+        // logon enqueued before the channel finished negotiating) must come
+        // after the Hello or Steam rejects the conversation as malformed.
+        // If a Hello was already prequeued, do not duplicate it.
+        let queued = self.core.take_outbound_wires();
+        let head_is_hello = queued
+            .first()
+            .and_then(|wire| decode_proto_envelope(wire))
+            .is_some_and(|env| env.emsg == EMsg::CLIENT_HELLO);
+        let combined = if head_is_hello {
+            queued
+        } else {
+            let hello = self.core.build_client_hello().wire;
+            let mut combined = Vec::with_capacity(queued.len() + 1);
+            combined.push(hello);
+            combined.extend(queued);
+            combined
+        };
+        self.core.restore_outbound_wires_front(combined);
+        self.flush_outbound();
+    }
+
+    fn on_channel_disconnected(self: &Arc<Self>, _reason: ChannelDisconnectReason, detail: &str) {
+        self.heartbeat.lock().expect("heartbeat poisoned").stop();
+        self.jobs
+            .fail_all(&format!("channel disconnected: {detail}"));
+        self.pics_product_info
+            .lock()
+            .expect("pics product info poisoned")
+            .clear();
+        self.core.reset_session_identity();
+        self.core.set_state(ClientState::Disconnected);
+        self.notify_state(ClientState::Disconnected);
+    }
+
+    fn handle_pics_product_info(&self, header: &CMsgProtoBufHeader, body: &[u8]) {
+        if header.jobid_target == INVALID_JOB_ID {
+            return;
+        }
+        let Some(response) = CMsgClientPICSProductInfoResponse::deserialize(body) else {
+            self.jobs.deliver(
+                header.jobid_target,
+                -1,
+                "PICS product-info parse failed".to_string(),
+                &[],
+            );
+            return;
+        };
+        let mut pending = self
+            .pics_product_info
+            .lock()
+            .expect("pics product info poisoned");
+        if response.response_pending {
+            let acc = pending.entry(header.jobid_target).or_default();
+            merge_pics_product_info(acc, response);
+            return;
+        }
+        let mut merged = pending.remove(&header.jobid_target).unwrap_or_default();
+        merge_pics_product_info(&mut merged, response);
+        let body = merged.serialize();
+        self.jobs
+            .deliver(header.jobid_target, 1, String::new(), &body);
+    }
+
+    fn start_heartbeat_from_logon(self: &Arc<Self>, body: &[u8]) {
+        let Some(resp) = CMsgClientLogonResponse::deserialize(body) else {
+            return;
+        };
+        if resp.heartbeat_seconds <= 0 {
+            return;
+        }
+        let weak = Arc::downgrade(self);
+        let interval = Duration::from_secs(resp.heartbeat_seconds as u64);
+        self.heartbeat
+            .lock()
+            .expect("heartbeat poisoned")
+            .start(interval, move || {
+                if let Some(runtime) = weak.upgrade() {
+                    runtime
+                        .core
+                        .enqueue_wire(runtime.core.build_heartbeat().wire);
+                    runtime.flush_outbound();
+                }
+            });
+    }
+
+    fn handle_non_proto_message(&self, bytes: &[u8]) -> InboundAction {
+        if bytes.len() >= 4 {
+            let raw = read_u32_le(bytes);
+            if !has_proto_flag(raw) {
+                let legacy = strip_proto_flag(raw);
+                if legacy == EMsg::CHANNEL_ENCRYPT_REQUEST
+                    || legacy == EMsg::CHANNEL_ENCRYPT_RESPONSE
+                    || legacy == EMsg::CHANNEL_ENCRYPT_RESULT
+                {
+                    return InboundAction::Ignored;
+                }
+            }
+        }
+        InboundAction::ParseFailed("ProtoEnvelope")
+    }
+
+    fn notify_state(&self, state: ClientState) {
+        if let Some(callback) = self
+            .on_state
+            .lock()
+            .expect("runtime callback poisoned")
+            .as_ref()
+        {
+            let _ = panic::catch_unwind(AssertUnwindSafe(|| callback(state)));
+        }
+    }
+
+    fn notify_client_message(&self, emsg: EMsg, header: &CMsgProtoBufHeader, body: &[u8]) {
+        if let Some(callback) = self
+            .on_client_message
+            .lock()
+            .expect("runtime callback poisoned")
+            .as_ref()
+        {
+            let _ = panic::catch_unwind(AssertUnwindSafe(|| callback(emsg, header, body)));
+        }
+    }
+}
+
+fn merge_pics_product_info(
+    acc: &mut CMsgClientPICSProductInfoResponse,
+    mut next: CMsgClientPICSProductInfoResponse,
+) {
+    acc.apps.append(&mut next.apps);
+    acc.packages.append(&mut next.packages);
+    acc.unknown_appids.append(&mut next.unknown_appids);
+    acc.unknown_packageids.append(&mut next.unknown_packageids);
+    if next.http_min_size > 0 {
+        acc.http_min_size = next.http_min_size;
+    }
+    if !next.http_host.is_empty() {
+        acc.http_host = next.http_host;
+    }
+    acc.meta_data_only = next.meta_data_only;
+    acc.response_pending = false;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_envelope::encode_proto_envelope;
+    use crate::proto_wire::Writer as ProtoWriter;
+    use crate::transport::{ConnectedCallback, DisconnectedCallback, MessageCallback};
+    use crate::transport::{TransportDisconnectReason, TransportState};
+    use crate::wire_format::Writer as WireWriter;
+    use std::sync::mpsc;
+
+    #[test]
+    fn connected_channel_sends_client_hello_and_reports_state() {
+        let shared = Arc::new(MockTransportState::default());
+        let runtime = runtime_with_shared_transport(Arc::clone(&shared));
+        let states = Arc::new(Mutex::new(Vec::new()));
+        let states_cb = Arc::clone(&states);
+        runtime.set_on_state(move |state| states_cb.lock().unwrap().push(state));
+
+        assert!(runtime.connect("wss://cm.example.com:443/cmsocket/"));
+        shared.fire_connected();
+
+        assert_eq!(
+            states.lock().unwrap().as_slice(),
+            &[ClientState::Connecting, ClientState::Connected]
+        );
+        let sent = shared.take_sent();
+        assert_eq!(
+            decode_proto_envelope(&sent[0]).unwrap().emsg,
+            EMsg::CLIENT_HELLO
+        );
+    }
+
+    #[test]
+    fn connected_channel_flushes_prequeued_hello_without_duplicate() {
+        let shared = Arc::new(MockTransportState::default());
+        let runtime = runtime_with_shared_transport(Arc::clone(&shared));
+        runtime
+            .core
+            .enqueue_wire(runtime.core.build_client_hello().wire);
+
+        assert!(runtime.connect("wss://cm.example.com:443/cmsocket/"));
+        shared.fire_connected();
+
+        let sent = shared.take_sent();
+        assert_eq!(sent.len(), 1);
+        assert_eq!(
+            decode_proto_envelope(&sent[0]).unwrap().emsg,
+            EMsg::CLIENT_HELLO
+        );
+    }
+
+    #[test]
+    fn flush_outbound_preserves_core_queue_order() {
+        let shared = Arc::new(MockTransportState::default());
+        let runtime = runtime_with_shared_transport(Arc::clone(&shared));
+        assert!(runtime.connect("wss://cm.example.com:443/cmsocket/"));
+        shared.fire_connected();
+        shared.take_sent();
+
+        runtime.core.enqueue_wire(vec![1, 2, 3]);
+        runtime.core.enqueue_wire(vec![4, 5, 6]);
+        assert_eq!(runtime.flush_outbound(), 2);
+        assert_eq!(shared.take_sent(), vec![vec![1, 2, 3], vec![4, 5, 6]]);
+    }
+
+    #[test]
+    fn inbound_job_response_is_delivered() {
+        let shared = Arc::new(MockTransportState::default());
+        let runtime = runtime_with_shared_transport(shared);
+        let job_id = runtime.next_job_id();
+        let (tx, rx) = mpsc::channel();
+        runtime.track_job(job_id, move |result| tx.send(result).unwrap(), None);
+
+        let header = CMsgProtoBufHeader {
+            jobid_target: job_id,
+            eresult: 1,
+            ..Default::default()
+        };
+        let wire = encode_proto_envelope(EMsg::SERVICE_METHOD_RESPONSE, &header, b"reply");
+        assert_eq!(
+            runtime.handle_channel_message(&wire),
+            InboundAction::DeliverJob(JobResult {
+                eresult: 1,
+                error_message: String::new(),
+                body: b"reply".to_vec(),
+                synthetic_failure: false,
+            })
+        );
+        assert_eq!(rx.recv().unwrap().body, b"reply");
+    }
+
+    #[test]
+    fn multi_records_are_redispatched() {
+        let shared = Arc::new(MockTransportState::default());
+        let runtime = runtime_with_shared_transport(shared);
+        let (tx, rx) = mpsc::channel();
+        runtime.set_on_client_message(move |emsg, _, body| {
+            tx.send((emsg, body.to_vec())).unwrap();
+        });
+
+        let inner = encode_proto_envelope(
+            EMsg::CLIENT_ACCOUNT_INFO,
+            &CMsgProtoBufHeader::default(),
+            &account_info_body("Ada"),
+        );
+        let mut records = Vec::new();
+        WireWriter::new(&mut records).u32(inner.len() as u32);
+        records.extend_from_slice(&inner);
+        let mut multi_body = Vec::new();
+        ProtoWriter::new(&mut multi_body).bytes_field(2, &records);
+        let multi = encode_proto_envelope(EMsg::MULTI, &CMsgProtoBufHeader::default(), &multi_body);
+
+        assert_eq!(runtime.handle_channel_message(&multi), InboundAction::Multi);
+        assert_eq!(
+            rx.recv().unwrap(),
+            (EMsg::CLIENT_ACCOUNT_INFO, account_info_body("Ada"))
+        );
+    }
+
+    #[test]
+    fn legacy_channel_encrypt_frames_are_ignored() {
+        let shared = Arc::new(MockTransportState::default());
+        let runtime = runtime_with_shared_transport(shared);
+        let mut legacy = Vec::new();
+        WireWriter::new(&mut legacy).u32(EMsg::CHANNEL_ENCRYPT_REQUEST.0);
+        assert_eq!(
+            runtime.handle_channel_message(&legacy),
+            InboundAction::Ignored
+        );
+    }
+
+    fn runtime_with_shared_transport(shared: Arc<MockTransportState>) -> Arc<CMClientRuntime> {
+        CMClientRuntime::new(
+            Arc::new(CMClientCore::default()),
+            Box::new(MockTransport { shared }),
+        )
+    }
+
+    fn account_info_body(name: &str) -> Vec<u8> {
+        let mut body = Vec::new();
+        ProtoWriter::new(&mut body).string_field(1, name);
+        body
+    }
+
+    struct MockTransportState {
+        state: Mutex<TransportState>,
+        connected: Mutex<Option<ConnectedCallback>>,
+        disconnected: Mutex<Option<DisconnectedCallback>>,
+        message: Mutex<Option<MessageCallback>>,
+        sent: Mutex<Vec<Vec<u8>>>,
+    }
+
+    impl Default for MockTransportState {
+        fn default() -> Self {
+            Self {
+                state: Mutex::new(TransportState::Disconnected),
+                connected: Mutex::new(None),
+                disconnected: Mutex::new(None),
+                message: Mutex::new(None),
+                sent: Mutex::new(Vec::new()),
+            }
+        }
+    }
+
+    impl MockTransportState {
+        fn fire_connected(&self) {
+            *self.state.lock().unwrap() = TransportState::Connected;
+            if let Some(callback) = self.connected.lock().unwrap().as_ref() {
+                callback();
+            }
+        }
+
+        #[allow(dead_code)]
+        fn fire_disconnected(&self, reason: TransportDisconnectReason, detail: &str) {
+            *self.state.lock().unwrap() = TransportState::Disconnected;
+            if let Some(callback) = self.disconnected.lock().unwrap().as_ref() {
+                callback(reason, detail);
+            }
+        }
+
+        #[allow(dead_code)]
+        fn fire_message(&self, bytes: &[u8]) {
+            if let Some(callback) = self.message.lock().unwrap().as_ref() {
+                callback(bytes);
+            }
+        }
+
+        fn take_sent(&self) -> Vec<Vec<u8>> {
+            std::mem::take(&mut *self.sent.lock().unwrap())
+        }
+    }
+
+    struct MockTransport {
+        shared: Arc<MockTransportState>,
+    }
+
+    impl Transport for MockTransport {
+        fn connect(&mut self, _url: &str) -> bool {
+            *self.shared.state.lock().unwrap() = TransportState::Connecting;
+            true
+        }
+
+        fn send(&mut self, data: &[u8]) -> bool {
+            if self.state() != TransportState::Connected {
+                return false;
+            }
+            self.shared.sent.lock().unwrap().push(data.to_vec());
+            true
+        }
+
+        fn disconnect(&mut self) {
+            *self.shared.state.lock().unwrap() = TransportState::Disconnected;
+        }
+
+        fn state(&self) -> TransportState {
+            *self.shared.state.lock().unwrap()
+        }
+
+        fn set_on_message(&mut self, cb: MessageCallback) {
+            *self.shared.message.lock().unwrap() = Some(cb);
+        }
+
+        fn set_on_connected(&mut self, cb: ConnectedCallback) {
+            *self.shared.connected.lock().unwrap() = Some(cb);
+        }
+
+        fn set_on_disconnected(&mut self, cb: DisconnectedCallback) {
+            *self.shared.disconnected.lock().unwrap() = Some(cb);
+        }
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cm_server.rs b/app/src/main/cpp/wn-steam-client/rust/src/cm_server.rs
new file mode 100644
index 000000000..c1a1e098c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cm_server.rs
@@ -0,0 +1,81 @@
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+#[repr(u8)]
+pub enum CmTransport {
+    #[default]
+    Unknown = 0,
+    WebSocket = 1,
+    Tcp = 2,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct CmServer {
+    pub endpoint: String,
+    pub host: String,
+    pub port: u16,
+    pub transport: CmTransport,
+    pub realm: String,
+    pub datacenter: String,
+    pub load: i32,
+    pub weighted_load: f32,
+}
+
+impl CmServer {
+    pub fn websocket_url(&self) -> String {
+        if self.transport != CmTransport::WebSocket || self.host.is_empty() || self.port == 0 {
+            return String::new();
+        }
+        format!("wss://{}:{}/cmsocket/", self.host, self.port)
+    }
+}
+
+pub fn parse_endpoint(endpoint: &str) -> Option<(String, u16)> {
+    let colon = endpoint.rfind(':')?;
+    if colon == 0 || colon + 1 == endpoint.len() {
+        return None;
+    }
+    let mut host = &endpoint[..colon];
+    if host.len() >= 2 && host.starts_with('[') && host.ends_with(']') {
+        host = &host[1..host.len() - 1];
+    }
+    let port_text = &endpoint[colon + 1..];
+    if !port_text.bytes().all(|b| b.is_ascii_digit()) {
+        return None;
+    }
+    let port = port_text.parse::<u32>().ok()?;
+    if port == 0 || port > u16::MAX as u32 {
+        return None;
+    }
+    Some((host.to_string(), port as u16))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_host_port_and_ipv6_brackets() {
+        assert_eq!(
+            parse_endpoint("cm.example.com:443"),
+            Some(("cm.example.com".to_string(), 443))
+        );
+        assert_eq!(
+            parse_endpoint("[2001:db8::1]:27017"),
+            Some(("2001:db8::1".to_string(), 27017))
+        );
+        assert_eq!(parse_endpoint("missing-port"), None);
+        assert_eq!(parse_endpoint("host:0"), None);
+        assert_eq!(parse_endpoint("host:+443"), None);
+        assert_eq!(parse_endpoint("host:70000"), None);
+    }
+
+    #[test]
+    fn websocket_url_requires_websocket_transport() {
+        let server = CmServer {
+            host: "cm.example.com".to_string(),
+            port: 443,
+            transport: CmTransport::WebSocket,
+            ..Default::default()
+        };
+        assert_eq!(server.websocket_url(), "wss://cm.example.com:443/cmsocket/");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cm_server_list.rs b/app/src/main/cpp/wn-steam-client/rust/src/cm_server_list.rs
new file mode 100644
index 000000000..b4f0a495c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cm_server_list.rs
@@ -0,0 +1,205 @@
+use crate::cm_server::{CmServer, CmTransport};
+use std::sync::Mutex;
+use std::time::{Duration, Instant};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum ServerQuality {
+    Good,
+    Bad,
+}
+
+pub const DEFAULT_BAD_MEMORY: Duration = Duration::from_secs(5 * 60);
+
+pub struct CmServerList {
+    inner: Mutex<Inner>,
+    bad_memory: Duration,
+}
+
+#[derive(Default)]
+struct Inner {
+    entries: Vec<Entry>,
+    next_index: usize,
+}
+
+struct Entry {
+    server: CmServer,
+    quality: ServerQuality,
+    marked_bad_at: Option<Instant>,
+}
+
+impl Default for CmServerList {
+    fn default() -> Self {
+        Self::new(DEFAULT_BAD_MEMORY)
+    }
+}
+
+impl CmServerList {
+    pub fn new(bad_memory: Duration) -> Self {
+        Self {
+            inner: Mutex::new(Inner::default()),
+            bad_memory,
+        }
+    }
+
+    pub fn replace_all(&self, servers: &[CmServer]) {
+        let mut inner = self.inner.lock().unwrap();
+        inner.entries = servers
+            .iter()
+            .cloned()
+            .map(|server| Entry {
+                server,
+                quality: ServerQuality::Good,
+                marked_bad_at: None,
+            })
+            .collect();
+        inner.next_index = 0;
+    }
+
+    pub fn add(&self, server: CmServer) {
+        self.inner.lock().unwrap().entries.push(Entry {
+            server,
+            quality: ServerQuality::Good,
+            marked_bad_at: None,
+        });
+    }
+
+    pub fn size(&self) -> usize {
+        self.inner.lock().unwrap().entries.len()
+    }
+
+    pub fn next_good(&self) -> Option<CmServer> {
+        let mut inner = self.inner.lock().unwrap();
+        if inner.entries.is_empty() {
+            return None;
+        }
+        promote_expired(&mut inner.entries, self.bad_memory);
+        let n = inner.entries.len();
+        for i in 0..n {
+            let idx = (inner.next_index + i) % n;
+            if inner.entries[idx].quality == ServerQuality::Good {
+                inner.next_index = (idx + 1) % n;
+                return Some(inner.entries[idx].server.clone());
+            }
+        }
+        None
+    }
+
+    pub fn mark_bad(&self, endpoint: &str) {
+        let mut inner = self.inner.lock().unwrap();
+        if let Some(entry) = inner
+            .entries
+            .iter_mut()
+            .find(|e| e.server.endpoint == endpoint)
+        {
+            entry.quality = ServerQuality::Bad;
+            entry.marked_bad_at = Some(Instant::now());
+        }
+    }
+
+    pub fn mark_good(&self, endpoint: &str) {
+        let mut inner = self.inner.lock().unwrap();
+        if let Some(entry) = inner
+            .entries
+            .iter_mut()
+            .find(|e| e.server.endpoint == endpoint)
+        {
+            entry.quality = ServerQuality::Good;
+            entry.marked_bad_at = None;
+        }
+    }
+
+    pub fn reset_quality(&self) {
+        let mut inner = self.inner.lock().unwrap();
+        for entry in &mut inner.entries {
+            entry.quality = ServerQuality::Good;
+            entry.marked_bad_at = None;
+        }
+    }
+}
+
+fn promote_expired(entries: &mut [Entry], bad_memory: Duration) {
+    let now = Instant::now();
+    for entry in entries {
+        if entry.quality == ServerQuality::Bad
+            && entry
+                .marked_bad_at
+                .is_some_and(|t| now.duration_since(t) >= bad_memory)
+        {
+            entry.quality = ServerQuality::Good;
+            entry.marked_bad_at = None;
+        }
+    }
+}
+
+pub fn hardcoded_fallback_servers() -> Vec<CmServer> {
+    const FALLBACK: &[(&str, &str)] = &[
+        ("ext1-sea1.steamserver.net", "sea1"),
+        ("ext2-sea1.steamserver.net", "sea1"),
+        ("ext1-iad1.steamserver.net", "iad1"),
+        ("ext2-iad1.steamserver.net", "iad1"),
+        ("ext1-fra1.steamserver.net", "fra1"),
+        ("ext2-fra1.steamserver.net", "fra1"),
+        ("ext1-lax1.steamserver.net", "lax1"),
+        ("ext1-sgp1.steamserver.net", "sgp1"),
+    ];
+    FALLBACK
+        .iter()
+        .map(|(host, dc)| CmServer {
+            endpoint: format!("{host}:443"),
+            host: (*host).to_string(),
+            port: 443,
+            transport: CmTransport::WebSocket,
+            realm: "steamglobal".to_string(),
+            datacenter: (*dc).to_string(),
+            load: 0,
+            weighted_load: 0.0,
+        })
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn next_good_round_robins_and_skips_bad() {
+        let list = CmServerList::default();
+        let a = server("a:443");
+        let b = server("b:443");
+        list.replace_all(&[a.clone(), b.clone()]);
+        assert_eq!(list.next_good().unwrap().endpoint, a.endpoint);
+        list.mark_bad(&b.endpoint);
+        assert_eq!(list.next_good().unwrap().endpoint, a.endpoint);
+        list.mark_good(&b.endpoint);
+        assert_eq!(list.next_good().unwrap().endpoint, b.endpoint);
+    }
+
+    #[test]
+    fn bad_servers_promote_after_memory_interval() {
+        let list = CmServerList::new(Duration::ZERO);
+        let a = server("a:443");
+        list.replace_all(std::slice::from_ref(&a));
+        list.mark_bad(&a.endpoint);
+        assert_eq!(list.next_good().unwrap().endpoint, a.endpoint);
+    }
+
+    #[test]
+    fn fallback_servers_are_websocket_urls() {
+        let servers = hardcoded_fallback_servers();
+        assert!(!servers.is_empty());
+        assert!(servers
+            .iter()
+            .all(|s| s.websocket_url().starts_with("wss://")));
+    }
+
+    fn server(endpoint: &str) -> CmServer {
+        let (host, port) = crate::cm_server::parse_endpoint(endpoint).unwrap();
+        CmServer {
+            endpoint: endpoint.to_string(),
+            host,
+            port,
+            transport: CmTransport::WebSocket,
+            ..Default::default()
+        }
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/cmsg_protobuf_header.rs b/app/src/main/cpp/wn-steam-client/rust/src/cmsg_protobuf_header.rs
new file mode 100644
index 000000000..0c40fcbcc
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/cmsg_protobuf_header.rs
@@ -0,0 +1,151 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+pub const INVALID_JOB_ID: u64 = u64::MAX;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgProtoBufHeader {
+    pub steamid: u64,
+    pub client_sessionid: i32,
+    pub routing_appid: u32,
+    pub jobid_source: u64,
+    pub jobid_target: u64,
+    pub target_job_name: String,
+    pub eresult: i32,
+    pub error_message: String,
+    pub realm: u32,
+    pub messageid: u64,
+    pub token_id: u64,
+}
+
+impl Default for CMsgProtoBufHeader {
+    fn default() -> Self {
+        Self {
+            steamid: 0,
+            client_sessionid: 0,
+            routing_appid: 0,
+            jobid_source: INVALID_JOB_ID,
+            jobid_target: INVALID_JOB_ID,
+            target_job_name: String::new(),
+            eresult: -1,
+            error_message: String::new(),
+            realm: 0,
+            messageid: 0,
+            token_id: 0,
+        }
+    }
+}
+
+impl CMsgProtoBufHeader {
+    pub fn serialize(&self, out: &mut Vec<u8>) {
+        let mut writer = Writer::new(out);
+
+        if self.steamid != 0 {
+            writer.tag(1, WireType::Fixed64);
+            writer.fixed64_field_force_body(self.steamid);
+        }
+        writer.int32_field(2, self.client_sessionid);
+        writer.uint32_field(3, self.routing_appid);
+        if self.jobid_source != INVALID_JOB_ID {
+            writer.tag(10, WireType::Fixed64);
+            writer.fixed64_field_force_body(self.jobid_source);
+        }
+        if self.jobid_target != INVALID_JOB_ID {
+            writer.tag(11, WireType::Fixed64);
+            writer.fixed64_field_force_body(self.jobid_target);
+        }
+        writer.string_field(12, &self.target_job_name);
+        if self.eresult >= 0 {
+            writer.tag(14, WireType::Varint);
+            writer.varint(self.eresult as i64 as u64);
+        }
+        writer.string_field(15, &self.error_message);
+        writer.uint32_field(29, self.realm);
+        writer.uint64_field(21, self.messageid);
+        writer.uint64_field(34, self.token_id);
+    }
+
+    pub fn deserialize(bytes: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(bytes);
+        let mut header = Self::default();
+
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(header);
+            };
+            match tag.field_number {
+                1 => {
+                    if tag.wire_type != WireType::Fixed64 {
+                        return None;
+                    }
+                    header.steamid = reader.fixed64()?;
+                }
+                2 => header.client_sessionid = reader.i32()?,
+                3 => header.routing_appid = reader.u32()?,
+                10 => {
+                    if tag.wire_type != WireType::Fixed64 {
+                        return None;
+                    }
+                    header.jobid_source = reader.fixed64()?;
+                }
+                11 => {
+                    if tag.wire_type != WireType::Fixed64 {
+                        return None;
+                    }
+                    header.jobid_target = reader.fixed64()?;
+                }
+                12 => header.target_job_name = reader.string()?,
+                14 => header.eresult = reader.i32()?,
+                15 => header.error_message = reader.string()?,
+                21 => header.messageid = reader.u64()?,
+                29 => header.realm = reader.u32()?,
+                34 => header.token_id = reader.u64()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+
+        Some(header)
+    }
+}
+
+trait WriterFixedBodies {
+    fn fixed64_field_force_body(&mut self, v: u64);
+}
+
+impl WriterFixedBodies for Writer<'_> {
+    fn fixed64_field_force_body(&mut self, v: u64) {
+        self.raw_bytes(&v.to_le_bytes());
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn serializes_only_set_job_ids() {
+        let h = CMsgProtoBufHeader {
+            steamid: 0x1122_3344_5566_7788,
+            client_sessionid: 17,
+            routing_appid: 480,
+            target_job_name: "Authentication.BeginAuthSessionViaCredentials#1".to_string(),
+            ..Default::default()
+        };
+        let mut bytes = Vec::new();
+        h.serialize(&mut bytes);
+        let parsed = CMsgProtoBufHeader::deserialize(&bytes).unwrap();
+        assert_eq!(parsed, h);
+        assert!(!bytes
+            .windows(2)
+            .any(|w| w == [0x51, 0xff] || w == [0x59, 0xff]));
+    }
+
+    #[test]
+    fn rejects_wrong_fixed_wire_type() {
+        let bytes = [0x08, 0x01];
+        assert_eq!(CMsgProtoBufHeader::deserialize(&bytes), None);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/content_manifest.rs b/app/src/main/cpp/wn-steam-client/rust/src/content_manifest.rs
new file mode 100644
index 000000000..05daacb5f
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/content_manifest.rs
@@ -0,0 +1,353 @@
+use crate::base64;
+use crate::crypto::{
+    aes256_cbc_decrypt, aes256_ecb_decrypt_block, AesBlock, SessionKey, AES_BLOCK_BYTES,
+    SESSION_KEY_LENGTH,
+};
+use crate::proto_wire::{Reader, WireType};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct ChunkData {
+    pub sha: Vec<u8>,
+    pub crc: u32,
+    pub offset: u64,
+    pub cb_original: u32,
+    pub cb_compressed: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct FileMapping {
+    pub filename: String,
+    pub size: u64,
+    pub flags: u32,
+    pub sha_filename: Vec<u8>,
+    pub sha_content: Vec<u8>,
+    pub chunks: Vec<ChunkData>,
+    pub linktarget: String,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct Metadata {
+    pub depot_id: u32,
+    pub gid_manifest: u64,
+    pub creation_time: u32,
+    pub filenames_encrypted: bool,
+    pub cb_disk_original: u64,
+    pub cb_disk_compressed: u64,
+    pub unique_chunks: u32,
+    pub crc_encrypted: u32,
+    pub crc_clear: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct ContentManifest {
+    pub metadata: Metadata,
+    pub files: Vec<FileMapping>,
+    pub signature: Vec<u8>,
+}
+
+pub const PAYLOAD_MAGIC: u32 = 0x71f6_17d0;
+pub const METADATA_MAGIC: u32 = 0x1f48_12be;
+pub const SIGNATURE_MAGIC: u32 = 0x1b81_b817;
+pub const END_OF_MANIFEST_MAGIC: u32 = 0x32c4_15ab;
+
+impl ContentManifest {
+    pub fn parse(raw: &[u8]) -> Option<Self> {
+        let mut manifest = Self::default();
+        let mut have_payload = false;
+        let mut have_metadata = false;
+        let mut pos = 0usize;
+
+        loop {
+            let magic = read_u32_le(raw, &mut pos)?;
+            if magic == END_OF_MANIFEST_MAGIC {
+                break;
+            }
+            let len = read_u32_le(raw, &mut pos)? as usize;
+            if pos + len > raw.len() {
+                return None;
+            }
+            let section = &raw[pos..pos + len];
+            pos += len;
+
+            match magic {
+                PAYLOAD_MAGIC => {
+                    parse_payload(section, &mut manifest.files)?;
+                    have_payload = true;
+                }
+                METADATA_MAGIC => {
+                    manifest.metadata = parse_metadata(section)?;
+                    have_metadata = true;
+                }
+                SIGNATURE_MAGIC => {
+                    manifest.signature = parse_signature(section)?;
+                }
+                _ => return None,
+            }
+        }
+
+        (have_payload && have_metadata).then_some(manifest)
+    }
+
+    pub fn decrypt_filenames(&mut self, depot_key: &[u8]) -> bool {
+        if self.metadata.filenames_encrypted {
+            if depot_key.len() != SESSION_KEY_LENGTH {
+                return false;
+            }
+            let mut key = [0u8; SESSION_KEY_LENGTH];
+            key.copy_from_slice(depot_key);
+
+            for file in &mut self.files {
+                let Some(clear) = decrypt_name(&key, &file.filename) else {
+                    return false;
+                };
+                file.filename = clear;
+                if !file.linktarget.is_empty() {
+                    let Some(clear) = decrypt_name(&key, &file.linktarget) else {
+                        return false;
+                    };
+                    file.linktarget = clear;
+                }
+            }
+            self.metadata.filenames_encrypted = false;
+        }
+
+        for file in &mut self.files {
+            file.filename = file.filename.replace('\\', "/");
+            file.linktarget = file.linktarget.replace('\\', "/");
+        }
+
+        self.files.sort_by(|a, b| {
+            a.filename
+                .bytes()
+                .map(|c| c.to_ascii_lowercase())
+                .cmp(b.filename.bytes().map(|c| c.to_ascii_lowercase()))
+        });
+        true
+    }
+}
+
+fn decrypt_name(key: &SessionKey, enc: &str) -> Option<String> {
+    let blob = base64::decode(enc)?;
+    if blob.len() < AES_BLOCK_BYTES * 2 {
+        return None;
+    }
+    let mut wrapped = [0u8; AES_BLOCK_BYTES];
+    wrapped.copy_from_slice(&blob[..AES_BLOCK_BYTES]);
+    let iv: AesBlock = aes256_ecb_decrypt_block(key, &wrapped)?;
+    let plain = aes256_cbc_decrypt(key, &iv, &blob[AES_BLOCK_BYTES..])?;
+    let mut out = String::from_utf8_lossy(&plain).into_owned();
+    if out.ends_with('\0') {
+        out.pop();
+    }
+    Some(out)
+}
+
+fn read_u32_le(buf: &[u8], pos: &mut usize) -> Option<u32> {
+    if *pos + 4 > buf.len() {
+        return None;
+    }
+    let v = u32::from_le_bytes(buf[*pos..*pos + 4].try_into().ok()?);
+    *pos += 4;
+    Some(v)
+}
+
+fn parse_chunk(body: &[u8]) -> Option<ChunkData> {
+    let mut reader = Reader::new(body);
+    let mut chunk = ChunkData::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(chunk);
+        };
+        match tag.field_number {
+            1 => chunk.sha = reader.bytes()?.to_vec(),
+            2 => {
+                if tag.wire_type != WireType::Fixed32 {
+                    return None;
+                }
+                chunk.crc = reader.fixed32()?;
+            }
+            3 => chunk.offset = reader.u64()?,
+            4 => chunk.cb_original = reader.u32()?,
+            5 => chunk.cb_compressed = reader.u32()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(chunk)
+}
+
+fn parse_file_mapping(body: &[u8]) -> Option<FileMapping> {
+    let mut reader = Reader::new(body);
+    let mut file = FileMapping::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(file);
+        };
+        match tag.field_number {
+            1 => file.filename = reader.string()?,
+            2 => file.size = reader.u64()?,
+            3 => file.flags = reader.u32()?,
+            4 => file.sha_filename = reader.bytes()?.to_vec(),
+            5 => file.sha_content = reader.bytes()?.to_vec(),
+            6 => file.chunks.push(parse_chunk(reader.bytes()?)?),
+            7 => file.linktarget = reader.string()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(file)
+}
+
+fn parse_payload(body: &[u8], out: &mut Vec<FileMapping>) -> Option<()> {
+    let mut reader = Reader::new(body);
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(());
+        };
+        if tag.field_number == 1 {
+            out.push(parse_file_mapping(reader.bytes()?)?);
+        } else if !reader.skip(tag.wire_type) {
+            return None;
+        }
+    }
+    Some(())
+}
+
+fn parse_metadata(body: &[u8]) -> Option<Metadata> {
+    let mut reader = Reader::new(body);
+    let mut metadata = Metadata::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(metadata);
+        };
+        match tag.field_number {
+            1 => metadata.depot_id = reader.u32()?,
+            2 => metadata.gid_manifest = reader.u64()?,
+            3 => metadata.creation_time = reader.u32()?,
+            4 => metadata.filenames_encrypted = reader.boolean()?,
+            5 => metadata.cb_disk_original = reader.u64()?,
+            6 => metadata.cb_disk_compressed = reader.u64()?,
+            7 => metadata.unique_chunks = reader.u32()?,
+            8 => metadata.crc_encrypted = reader.u32()?,
+            9 => metadata.crc_clear = reader.u32()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(metadata)
+}
+
+fn parse_signature(body: &[u8]) -> Option<Vec<u8>> {
+    let mut reader = Reader::new(body);
+    let mut signature = Vec::new();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(signature);
+        };
+        if tag.field_number == 1 {
+            signature = reader.bytes()?.to_vec();
+        } else if !reader.skip(tag.wire_type) {
+            return None;
+        }
+    }
+    Some(signature)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::crypto::{aes256_cbc_encrypt, aes256_ecb_encrypt_block};
+    use crate::proto_wire::Writer;
+
+    #[test]
+    fn parses_manifest_sections() {
+        let mut chunk_body = Vec::new();
+        {
+            let mut w = Writer::new(&mut chunk_body);
+            w.bytes_field(1, &[1; 20]);
+            w.tag(2, WireType::Fixed32);
+            w.raw_bytes(&0x1234_5678u32.to_le_bytes());
+            w.uint64_field(3, 99);
+            w.uint32_field(4, 11);
+            w.uint32_field(5, 22);
+        }
+
+        let mut file_body = Vec::new();
+        {
+            let mut w = Writer::new(&mut file_body);
+            w.string_field(1, "bin\\game.exe");
+            w.uint64_field(2, 11);
+            w.uint32_field(3, 1);
+            w.submessage_field(6, &chunk_body);
+        }
+
+        let mut payload = Vec::new();
+        Writer::new(&mut payload).submessage_field(1, &file_body);
+
+        let mut metadata = Vec::new();
+        {
+            let mut w = Writer::new(&mut metadata);
+            w.uint32_field(1, 123);
+            w.uint64_field(2, 456);
+            w.uint32_field(3, 789);
+            w.bool_field_force(4, false);
+        }
+
+        let mut raw = Vec::new();
+        push_section(&mut raw, PAYLOAD_MAGIC, &payload);
+        push_section(&mut raw, METADATA_MAGIC, &metadata);
+        raw.extend_from_slice(&END_OF_MANIFEST_MAGIC.to_le_bytes());
+
+        let mut manifest = ContentManifest::parse(&raw).unwrap();
+        assert_eq!(manifest.metadata.depot_id, 123);
+        assert_eq!(manifest.files[0].filename, "bin\\game.exe");
+        assert!(manifest.decrypt_filenames(&[]));
+        assert_eq!(manifest.files[0].filename, "bin/game.exe");
+        assert_eq!(manifest.files[0].chunks[0].crc, 0x1234_5678);
+    }
+
+    #[test]
+    fn decrypts_encrypted_filenames() {
+        let key = [9u8; SESSION_KEY_LENGTH];
+        let name = encrypt_name(&key, "dir\\file.txt\0");
+        let mut manifest = ContentManifest {
+            metadata: Metadata {
+                filenames_encrypted: true,
+                ..Default::default()
+            },
+            files: vec![FileMapping {
+                filename: name,
+                ..Default::default()
+            }],
+            signature: Vec::new(),
+        };
+
+        assert!(manifest.decrypt_filenames(&key));
+        assert_eq!(manifest.files[0].filename, "dir/file.txt");
+        assert!(!manifest.metadata.filenames_encrypted);
+    }
+
+    fn push_section(out: &mut Vec<u8>, magic: u32, body: &[u8]) {
+        out.extend_from_slice(&magic.to_le_bytes());
+        out.extend_from_slice(&(body.len() as u32).to_le_bytes());
+        out.extend_from_slice(body);
+    }
+
+    fn encrypt_name(key: &SessionKey, name: &str) -> String {
+        let iv = [5u8; AES_BLOCK_BYTES];
+        let wrapped = aes256_ecb_encrypt_block(key, &iv).unwrap();
+        let body = aes256_cbc_encrypt(key, &iv, name.as_bytes()).unwrap();
+        let mut blob = wrapped.to_vec();
+        blob.extend_from_slice(&body);
+        base64::encode(&blob)
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/crypto.rs b/app/src/main/cpp/wn-steam-client/rust/src/crypto.rs
new file mode 100644
index 000000000..103608beb
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/crypto.rs
@@ -0,0 +1,150 @@
+use aes::cipher::{
+    block_padding::Pkcs7, BlockDecrypt, BlockDecryptMut, BlockEncrypt, BlockEncryptMut, KeyInit,
+    KeyIvInit,
+};
+use aes::Aes256;
+use hmac::{Hmac, Mac};
+use rand::{rngs::OsRng, RngCore};
+use rsa::pkcs8::DecodePublicKey;
+use rsa::traits::PublicKeyParts;
+use rsa::{Oaep, RsaPublicKey};
+use sha1::{Digest as Sha1DigestTrait, Sha1};
+use sha2::Sha256;
+use zeroize::Zeroize;
+
+pub const SESSION_KEY_LENGTH: usize = 32;
+pub const AES_BLOCK_BYTES: usize = 16;
+pub const SHA1_BYTES: usize = 20;
+pub const SHA256_BYTES: usize = 32;
+pub const HMAC_KEY_LENGTH: usize = 16;
+
+pub type SessionKey = [u8; SESSION_KEY_LENGTH];
+pub type Sha1Digest = [u8; SHA1_BYTES];
+pub type Sha256Digest = [u8; SHA256_BYTES];
+pub type AesBlock = [u8; AES_BLOCK_BYTES];
+
+#[derive(Clone)]
+pub struct SecureSessionKey {
+    pub bytes: SessionKey,
+}
+
+impl SecureSessionKey {
+    pub fn new(bytes: SessionKey) -> Self {
+        Self { bytes }
+    }
+}
+
+impl Drop for SecureSessionKey {
+    fn drop(&mut self) {
+        self.bytes.zeroize();
+    }
+}
+
+pub fn secure_random_bytes(out: &mut [u8]) -> bool {
+    OsRng.try_fill_bytes(out).is_ok()
+}
+
+pub fn generate_session_key() -> Option<SecureSessionKey> {
+    let mut bytes = [0u8; SESSION_KEY_LENGTH];
+    secure_random_bytes(&mut bytes).then_some(SecureSessionKey::new(bytes))
+}
+
+pub fn sha1(data: &[u8]) -> Sha1Digest {
+    Sha1::digest(data).into()
+}
+
+pub fn sha256(data: &[u8]) -> Sha256Digest {
+    Sha256::digest(data).into()
+}
+
+pub fn crc32(data: &[u8]) -> u32 {
+    crc32fast::hash(data)
+}
+
+pub fn hmac_sha1(key: &[u8], data: &[u8]) -> Option<Sha1Digest> {
+    let mut mac = <Hmac<Sha1> as Mac>::new_from_slice(key).ok()?;
+    mac.update(data);
+    Some(mac.finalize().into_bytes().into())
+}
+
+pub fn aes256_ecb_encrypt_block(key: &SessionKey, input: &AesBlock) -> Option<AesBlock> {
+    let cipher = Aes256::new_from_slice(key).ok()?;
+    let mut block = (*input).into();
+    cipher.encrypt_block(&mut block);
+    Some(block.into())
+}
+
+pub fn aes256_ecb_decrypt_block(key: &SessionKey, input: &AesBlock) -> Option<AesBlock> {
+    let cipher = Aes256::new_from_slice(key).ok()?;
+    let mut block = (*input).into();
+    cipher.decrypt_block(&mut block);
+    Some(block.into())
+}
+
+pub fn aes256_cbc_encrypt(key: &SessionKey, iv: &AesBlock, plaintext: &[u8]) -> Option<Vec<u8>> {
+    Some(
+        cbc::Encryptor::<Aes256>::new(key.into(), iv.into())
+            .encrypt_padded_vec_mut::<Pkcs7>(plaintext),
+    )
+}
+
+pub fn aes256_cbc_decrypt(key: &SessionKey, iv: &AesBlock, ciphertext: &[u8]) -> Option<Vec<u8>> {
+    if ciphertext.is_empty() || !ciphertext.len().is_multiple_of(AES_BLOCK_BYTES) {
+        return None;
+    }
+    cbc::Decryptor::<Aes256>::new(key.into(), iv.into())
+        .decrypt_padded_vec_mut::<Pkcs7>(ciphertext)
+        .ok()
+}
+
+pub fn rsa_oaep_sha1_encrypt(spki_der: &[u8], plaintext: &[u8]) -> Option<Vec<u8>> {
+    let public_key = RsaPublicKey::from_public_key_der(spki_der).ok()?;
+    let modulus = public_key.size();
+    if modulus < 2 + 2 * SHA1_BYTES || plaintext.len() > modulus - 2 - 2 * SHA1_BYTES {
+        return None;
+    }
+    public_key
+        .encrypt(&mut OsRng, Oaep::new::<Sha1>(), plaintext)
+        .ok()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn hashes_match_known_values() {
+        assert_eq!(
+            hex(&sha1(b"abc")),
+            "a9993e364706816aba3e25717850c26c9cd0d89d"
+        );
+        assert_eq!(
+            hex(&sha256(b"abc")),
+            "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"
+        );
+        assert_eq!(crc32(b"123456789"), 0xcbf4_3926);
+    }
+
+    #[test]
+    fn aes_cbc_roundtrips_with_pkcs7() {
+        let key = [7u8; SESSION_KEY_LENGTH];
+        let iv = [3u8; AES_BLOCK_BYTES];
+        let plaintext = b"steam manifest filename";
+        let encrypted = aes256_cbc_encrypt(&key, &iv, plaintext).unwrap();
+        assert_ne!(encrypted, plaintext);
+        let decrypted = aes256_cbc_decrypt(&key, &iv, &encrypted).unwrap();
+        assert_eq!(decrypted, plaintext);
+    }
+
+    #[test]
+    fn hmac_sha1_known_value() {
+        assert_eq!(
+            hex(&hmac_sha1(b"key", b"The quick brown fox jumps over the lazy dog").unwrap()),
+            "de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9"
+        );
+    }
+
+    fn hex(bytes: &[u8]) -> String {
+        bytes.iter().map(|b| format!("{b:02x}")).collect()
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/depot_chunk.rs b/app/src/main/cpp/wn-steam-client/rust/src/depot_chunk.rs
new file mode 100644
index 000000000..f5c55f959
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/depot_chunk.rs
@@ -0,0 +1,253 @@
+use crate::cdn_client;
+use crate::crypto::{
+    aes256_cbc_decrypt, aes256_ecb_decrypt_block, AesBlock, SessionKey, AES_BLOCK_BYTES,
+    SESSION_KEY_LENGTH,
+};
+use lzma_rs::decompress::raw::{LzmaDecoder, LzmaParams, LzmaProperties};
+use std::io::{Cursor, Read};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct DepotChunkResult {
+    pub data: Vec<u8>,
+    pub error: String,
+}
+
+impl DepotChunkResult {
+    pub fn ok(&self) -> bool {
+        self.error.is_empty()
+    }
+}
+
+pub fn process_depot_chunk(
+    raw: &[u8],
+    depot_key: &[u8],
+    expected_crc: u32,
+    expected_size: u32,
+) -> DepotChunkResult {
+    if depot_key.len() != SESSION_KEY_LENGTH {
+        return fail("chunk: bad depot key length");
+    }
+    if raw.is_empty() {
+        return fail("chunk: empty");
+    }
+    let mut key = [0u8; SESSION_KEY_LENGTH];
+    key.copy_from_slice(depot_key);
+
+    let Some(dec) = steam_symmetric_decrypt(&key, raw) else {
+        return fail("chunk: AES decrypt failed");
+    };
+    if dec.is_empty() {
+        return fail("chunk: AES decrypt failed");
+    }
+
+    let result = if dec.starts_with(b"VSZa") {
+        decompress_vzstd(&dec, expected_size)
+    } else if dec.starts_with(b"VZa") {
+        decompress_vzip(&dec, expected_size)
+    } else if dec.starts_with(b"PK\x03\x04") {
+        match cdn_client::unzip_first_entry(&dec) {
+            Some(data) => DepotChunkResult {
+                data,
+                error: String::new(),
+            },
+            None => fail("chunk: PKZip decompress failed"),
+        }
+    } else {
+        fail("chunk: unrecognised compression header")
+    };
+    if !result.ok() {
+        return result;
+    }
+    if result.data.len() != expected_size as usize {
+        return fail(format!(
+            "chunk: size mismatch ({} != {expected_size})",
+            result.data.len()
+        ));
+    }
+    if steam_adler_hash(&result.data) != expected_crc {
+        return fail("chunk: Adler32 mismatch");
+    }
+    result
+}
+
+pub fn steam_symmetric_decrypt(key: &SessionKey, enc: &[u8]) -> Option<Vec<u8>> {
+    if enc.len() < AES_BLOCK_BYTES * 2 {
+        return None;
+    }
+    let mut wrapped = [0u8; AES_BLOCK_BYTES];
+    wrapped.copy_from_slice(&enc[..AES_BLOCK_BYTES]);
+    let iv: AesBlock = aes256_ecb_decrypt_block(key, &wrapped)?;
+    aes256_cbc_decrypt(key, &iv, &enc[AES_BLOCK_BYTES..])
+}
+
+fn decompress_vzstd(dec: &[u8], expected_size: u32) -> DepotChunkResult {
+    if dec.len() <= 8 {
+        return fail("vzstd: chunk too small");
+    }
+    let payload = &dec[8..];
+    let mut reader = match ruzstd::StreamingDecoder::new(Cursor::new(payload)) {
+        Ok(reader) => reader,
+        Err(_) => return fail("vzstd: bad zstd frame"),
+    };
+    let mut data = Vec::with_capacity(expected_size as usize);
+    if reader.read_to_end(&mut data).is_err() {
+        return fail("vzstd: decode failed");
+    }
+    DepotChunkResult {
+        data,
+        error: String::new(),
+    }
+}
+
+fn decompress_vzip(dec: &[u8], expected_size: u32) -> DepotChunkResult {
+    const HEADER: usize = 3 + 4;
+    const PROPS: usize = 5;
+    const FOOTER: usize = 10;
+    if dec.len() < HEADER + PROPS + FOOTER {
+        return fail("vzip: chunk too small");
+    }
+    if dec[dec.len() - 2] != b'z' || dec[dec.len() - 1] != b'v' {
+        return fail("vzip: bad footer");
+    }
+    let props = &dec[HEADER..HEADER + PROPS];
+    let comp = &dec[HEADER + PROPS..dec.len() - FOOTER];
+    let Some(params) = lzma_params_from_steam_props(props, expected_size as u64) else {
+        return fail("vzip: bad LZMA properties");
+    };
+    let mut decoder = match LzmaDecoder::new(params, None) {
+        Ok(decoder) => decoder,
+        Err(_) => return fail("vzip: raw decoder init failed"),
+    };
+    let mut output = Vec::with_capacity(expected_size as usize);
+    match decoder.decompress(&mut Cursor::new(comp), &mut output) {
+        Ok(()) => DepotChunkResult {
+            data: output,
+            error: String::new(),
+        },
+        Err(_) => fail("vzip: LZMA decode failed"),
+    }
+}
+
+fn lzma_params_from_steam_props(props: &[u8], expected_size: u64) -> Option<LzmaParams> {
+    if props.len() != 5 {
+        return None;
+    }
+    let mut packed = props[0] as u32;
+    if packed >= 225 {
+        return None;
+    }
+    let lc = packed % 9;
+    packed /= 9;
+    let lp = packed % 5;
+    let pb = packed / 5;
+    if lc > 8 || lp > 4 || pb > 4 {
+        return None;
+    }
+    let dict_size = u32::from_le_bytes(props[1..5].try_into().ok()?);
+    Some(LzmaParams::new(
+        LzmaProperties { lc, lp, pb },
+        dict_size,
+        Some(expected_size),
+    ))
+}
+
+pub fn steam_adler_hash(data: &[u8]) -> u32 {
+    let mut a = 0u32;
+    let mut b = 0u32;
+    for byte in data {
+        a = (a + *byte as u32) % 65_521;
+        b = (b + a) % 65_521;
+    }
+    a | (b << 16)
+}
+
+fn fail(msg: impl Into<String>) -> DepotChunkResult {
+    DepotChunkResult {
+        data: Vec::new(),
+        error: msg.into(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::crypto::{aes256_cbc_encrypt, aes256_ecb_encrypt_block};
+
+    #[test]
+    fn steam_adler_hash_uses_zero_seed() {
+        assert_eq!(steam_adler_hash(b""), 0);
+        assert_eq!(steam_adler_hash(b"abc"), 0x024a_0126);
+    }
+
+    #[test]
+    fn decrypts_and_processes_pkzip_chunk() {
+        let key = [4u8; SESSION_KEY_LENGTH];
+        let payload = b"chunk bytes";
+        let mut zip = Vec::new();
+        zip.extend_from_slice(&0x0403_4b50u32.to_le_bytes());
+        zip.extend_from_slice(&20u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u32.to_le_bytes());
+        zip.extend_from_slice(&(payload.len() as u32).to_le_bytes());
+        zip.extend_from_slice(&(payload.len() as u32).to_le_bytes());
+        zip.extend_from_slice(&1u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(b"x");
+        zip.extend_from_slice(payload);
+
+        let raw = encrypt_steam_symmetric(&key, &zip);
+        let result =
+            process_depot_chunk(&raw, &key, steam_adler_hash(payload), payload.len() as u32);
+        assert_eq!(result.data, payload);
+        assert!(result.ok());
+    }
+
+    #[test]
+    fn decrypts_and_processes_vzip_raw_lzma_chunk() {
+        let key = [8u8; SESSION_KEY_LENGTH];
+        let payload = b"legacy lzma chunk bytes";
+        let mut lzma_alone = Vec::new();
+        lzma_rs::lzma_compress(&mut Cursor::new(payload), &mut lzma_alone).unwrap();
+        assert!(lzma_alone.len() > 13);
+
+        let mut vzip = Vec::new();
+        vzip.extend_from_slice(b"VZa");
+        vzip.extend_from_slice(&0u32.to_le_bytes());
+        vzip.extend_from_slice(&lzma_alone[..5]);
+        vzip.extend_from_slice(&lzma_alone[13..]);
+        vzip.extend_from_slice(&0u32.to_le_bytes());
+        vzip.extend_from_slice(&(payload.len() as u32).to_le_bytes());
+        vzip.extend_from_slice(b"zv");
+
+        let raw = encrypt_steam_symmetric(&key, &vzip);
+        let result =
+            process_depot_chunk(&raw, &key, steam_adler_hash(payload), payload.len() as u32);
+        assert_eq!(result.data, payload);
+        assert!(result.ok());
+    }
+
+    #[test]
+    fn vzip_rejects_bad_properties_before_raw_decode() {
+        let mut dec = Vec::new();
+        dec.extend_from_slice(b"VZa");
+        dec.extend_from_slice(&0u32.to_le_bytes());
+        dec.extend_from_slice(&[225, 0, 0, 0, 0]);
+        dec.extend_from_slice(b"payload");
+        dec.extend_from_slice(&0u32.to_le_bytes());
+        dec.extend_from_slice(&0u32.to_le_bytes());
+        dec.extend_from_slice(b"zv");
+        assert_eq!(decompress_vzip(&dec, 1).error, "vzip: bad LZMA properties");
+    }
+
+    fn encrypt_steam_symmetric(key: &SessionKey, plaintext: &[u8]) -> Vec<u8> {
+        let iv = [6u8; AES_BLOCK_BYTES];
+        let wrapped = aes256_ecb_encrypt_block(key, &iv).unwrap();
+        let body = aes256_cbc_encrypt(key, &iv, plaintext).unwrap();
+        let mut out = wrapped.to_vec();
+        out.extend_from_slice(&body);
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/depot_config.rs b/app/src/main/cpp/wn-steam-client/rust/src/depot_config.rs
new file mode 100644
index 000000000..1968fb69e
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/depot_config.rs
@@ -0,0 +1,294 @@
+use serde_json::{json, Value};
+use std::collections::{BTreeMap, BTreeSet};
+use std::fs::{self, File};
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::sync::Mutex;
+
+pub const INVALID_MANIFEST_ID: u64 = 0x7fff_ffff_ffff_ffff;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DepotConfigStore {
+    config_dir: PathBuf,
+    installed: BTreeMap<u32, u64>,
+}
+
+impl DepotConfigStore {
+    pub fn load(config_dir: impl Into<PathBuf>) -> Self {
+        let config_dir = config_dir.into();
+        let mut store = Self {
+            config_dir,
+            installed: BTreeMap::new(),
+        };
+        let Ok(bytes) = fs::read_to_string(store.config_path()) else {
+            return store;
+        };
+        let Ok(value) = serde_json::from_str::<Value>(&bytes) else {
+            return store;
+        };
+        let Some(obj) = value
+            .get("installedManifestIDs")
+            .and_then(|v| v.as_object())
+        else {
+            return store;
+        };
+        for (key, value) in obj {
+            if let (Ok(depot_id), Some(manifest_id)) = (key.parse::<u32>(), value.as_u64()) {
+                store.installed.insert(depot_id, manifest_id);
+            }
+        }
+        store
+    }
+
+    pub fn config_dir(&self) -> &Path {
+        &self.config_dir
+    }
+
+    pub fn manifest_cache_path(&self, depot_id: u32, manifest_id: u64) -> PathBuf {
+        self.config_dir
+            .join(format!("{depot_id}_{manifest_id}.manifest"))
+    }
+
+    pub fn installed_manifest(&self, depot_id: u32) -> u64 {
+        self.installed.get(&depot_id).copied().unwrap_or(0)
+    }
+
+    pub fn is_installed(&self, depot_id: u32, manifest_id: u64) -> bool {
+        self.installed
+            .get(&depot_id)
+            .is_some_and(|installed| *installed == manifest_id && *installed != INVALID_MANIFEST_ID)
+    }
+
+    pub fn begin_depot(&mut self, depot_id: u32) -> bool {
+        self.installed.insert(depot_id, INVALID_MANIFEST_ID);
+        self.save()
+    }
+
+    pub fn finish_depot(&mut self, depot_id: u32, manifest_id: u64) -> bool {
+        self.installed.insert(depot_id, manifest_id);
+        self.save()
+    }
+
+    pub fn forget_depot(&mut self, depot_id: u32) -> bool {
+        self.installed.remove(&depot_id);
+        self.save()
+    }
+
+    pub fn discard(&mut self) {
+        self.installed.clear();
+        let _ = fs::remove_file(self.config_path());
+    }
+
+    fn config_path(&self) -> PathBuf {
+        self.config_dir.join("depot.config")
+    }
+
+    fn save(&self) -> bool {
+        if fs::create_dir_all(&self.config_dir).is_err() {
+            return false;
+        }
+        let ids: serde_json::Map<String, Value> = self
+            .installed
+            .iter()
+            .map(|(depot, manifest)| (depot.to_string(), json!(manifest)))
+            .collect();
+        let Ok(bytes) = serde_json::to_string_pretty(&json!({ "installedManifestIDs": ids }))
+        else {
+            return false;
+        };
+        atomic_write_synced(&self.config_path(), bytes.as_bytes())
+    }
+}
+
+pub struct DepotProgressStore {
+    path: PathBuf,
+    done: Mutex<BTreeSet<u32>>,
+    flushed_count: Mutex<usize>,
+}
+
+impl DepotProgressStore {
+    pub fn new(config_dir: impl AsRef<Path>, depot_id: u32, manifest_id: u64) -> Self {
+        let path = Self::sidecar_path(config_dir, depot_id, manifest_id);
+        let mut done = BTreeSet::new();
+        if let Ok(buf) = fs::read(&path) {
+            if let Some(parsed) = parse_progress_sidecar(&buf) {
+                done = parsed;
+            }
+        }
+        let flushed_count = done.len();
+        Self {
+            path,
+            done: Mutex::new(done),
+            flushed_count: Mutex::new(flushed_count),
+        }
+    }
+
+    pub fn is_file_done(&self, file_index: u32) -> bool {
+        self.done.lock().unwrap().contains(&file_index)
+    }
+
+    pub fn mark_file_done(&self, file_index: u32) {
+        self.done.lock().unwrap().insert(file_index);
+    }
+
+    pub fn done_count(&self) -> usize {
+        self.done.lock().unwrap().len()
+    }
+
+    pub fn flush(&self) -> bool {
+        let done = self.done.lock().unwrap();
+        let mut flushed = self.flushed_count.lock().unwrap();
+        if done.len() == *flushed {
+            return true;
+        }
+        let blob = serialize_progress_sidecar(&done);
+        if !atomic_write_synced(&self.path, &blob) {
+            return false;
+        }
+        *flushed = done.len();
+        true
+    }
+
+    pub fn discard(&self) {
+        self.done.lock().unwrap().clear();
+        *self.flushed_count.lock().unwrap() = 0;
+        let _ = fs::remove_file(&self.path);
+    }
+
+    pub fn remove(config_dir: impl AsRef<Path>, depot_id: u32, manifest_id: u64) {
+        let _ = fs::remove_file(Self::sidecar_path(config_dir, depot_id, manifest_id));
+    }
+
+    pub fn sidecar_path(config_dir: impl AsRef<Path>, depot_id: u32, manifest_id: u64) -> PathBuf {
+        config_dir
+            .as_ref()
+            .join(format!("{depot_id}_{manifest_id}.progress"))
+    }
+}
+
+const PROGRESS_MAGIC: &[u8; 4] = b"WNDP";
+const PROGRESS_VERSION: u32 = 1;
+
+fn parse_progress_sidecar(buf: &[u8]) -> Option<BTreeSet<u32>> {
+    if buf.len() < 12 || &buf[0..4] != PROGRESS_MAGIC {
+        return None;
+    }
+    if get_u32(&buf[4..8])? != PROGRESS_VERSION {
+        return None;
+    }
+    let count = get_u32(&buf[8..12])? as usize;
+    if 12usize.checked_add(count.checked_mul(4)?)? != buf.len() {
+        return None;
+    }
+    let mut out = BTreeSet::new();
+    for i in 0..count {
+        out.insert(get_u32(&buf[12 + i * 4..16 + i * 4])?);
+    }
+    Some(out)
+}
+
+fn serialize_progress_sidecar(done: &BTreeSet<u32>) -> Vec<u8> {
+    let mut out = Vec::with_capacity(12 + done.len() * 4);
+    out.extend_from_slice(PROGRESS_MAGIC);
+    put_u32(&mut out, PROGRESS_VERSION);
+    put_u32(&mut out, done.len() as u32);
+    for idx in done {
+        put_u32(&mut out, *idx);
+    }
+    out
+}
+
+fn put_u32(out: &mut Vec<u8>, v: u32) {
+    out.extend_from_slice(&v.to_le_bytes());
+}
+
+fn get_u32(buf: &[u8]) -> Option<u32> {
+    Some(u32::from_le_bytes(buf.get(..4)?.try_into().ok()?))
+}
+
+fn atomic_write_synced(final_path: &Path, bytes: &[u8]) -> bool {
+    let Some(parent) = final_path.parent() else {
+        return false;
+    };
+    if fs::create_dir_all(parent).is_err() {
+        return false;
+    }
+    let tmp_path =
+        final_path.with_extension(match final_path.extension().and_then(|s| s.to_str()) {
+            Some(ext) => format!("{ext}.tmp"),
+            None => "tmp".to_string(),
+        });
+    let mut file = match File::create(&tmp_path) {
+        Ok(file) => file,
+        Err(_) => return false,
+    };
+    if file.write_all(bytes).is_err() || file.sync_all().is_err() {
+        let _ = fs::remove_file(&tmp_path);
+        return false;
+    }
+    drop(file);
+    if fs::rename(&tmp_path, final_path).is_err() {
+        let _ = fs::remove_file(&tmp_path);
+        return false;
+    }
+    if let Ok(dir) = File::open(parent) {
+        let _ = dir.sync_all();
+    }
+    true
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn depot_config_roundtrips_and_marks_in_progress() {
+        let dir = temp_dir("depot_config_roundtrips");
+        let mut store = DepotConfigStore::load(&dir);
+        assert_eq!(store.installed_manifest(100), 0);
+        assert!(!store.is_installed(100, 0));
+        assert!(store.begin_depot(100));
+        assert_eq!(
+            DepotConfigStore::load(&dir).installed_manifest(100),
+            INVALID_MANIFEST_ID
+        );
+        assert!(store.finish_depot(100, 555));
+        let loaded = DepotConfigStore::load(&dir);
+        assert!(loaded.is_installed(100, 555));
+        assert_eq!(
+            loaded.manifest_cache_path(100, 555),
+            dir.join("100_555.manifest")
+        );
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn progress_sidecar_roundtrips_sorted_indices() {
+        let dir = temp_dir("progress_sidecar_roundtrips");
+        let store = DepotProgressStore::new(&dir, 1, 2);
+        store.mark_file_done(9);
+        store.mark_file_done(3);
+        assert_eq!(store.done_count(), 2);
+        assert!(store.flush());
+
+        let loaded = DepotProgressStore::new(&dir, 1, 2);
+        assert!(loaded.is_file_done(3));
+        assert!(loaded.is_file_done(9));
+        assert!(!loaded.is_file_done(4));
+        loaded.discard();
+        assert!(!DepotProgressStore::sidecar_path(&dir, 1, 2).exists());
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    fn temp_dir(name: &str) -> PathBuf {
+        let dir = std::env::temp_dir().join(format!(
+            "wnsteam_{name}_{}",
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        let _ = fs::remove_dir_all(&dir);
+        dir
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/depot_downloader.rs b/app/src/main/cpp/wn-steam-client/rust/src/depot_downloader.rs
new file mode 100644
index 000000000..3bd132a0c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/depot_downloader.rs
@@ -0,0 +1,738 @@
+use crate::cdn_client::{CdnClient, CdnManifestResult};
+use crate::content_manifest::ContentManifest;
+use crate::depot_config::{DepotConfigStore, DepotProgressStore, INVALID_MANIFEST_ID};
+use crate::depot_writer::{write_depot_sequential, DepotWriteOptions};
+use crate::pb::ccontentserverdirectory::CContentServerDirectoryServerInfo;
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::thread;
+use std::time::Duration;
+
+pub const MAX_MANIFEST_FETCH_ATTEMPTS: usize = 5;
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct DepotSpec {
+    pub depot_id: u32,
+    pub manifest_id: u64,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct ResolvedDepotSpec {
+    pub depot_id: u32,
+    pub manifest_id: u64,
+    pub depot_key: Vec<u8>,
+    pub manifest_request_code: u64,
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct DepotDownloadProgress {
+    pub depot_id: u32,
+    pub depot_done: u64,
+    pub depot_total: u64,
+    pub depots_done: u32,
+    pub depots_total: u32,
+    pub verifying: bool,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct DepotDownloadResult {
+    pub success: bool,
+    pub error: String,
+    pub bytes_written: u64,
+    pub depots_completed: u32,
+    pub depots_skipped: u32,
+}
+
+impl DepotDownloadResult {
+    pub fn fail(error: impl Into<String>) -> Self {
+        Self {
+            success: false,
+            error: error.into(),
+            ..Default::default()
+        }
+    }
+
+    pub fn ok(bytes_written: u64, depots_completed: u32, depots_skipped: u32) -> Self {
+        Self {
+            success: true,
+            bytes_written,
+            depots_completed,
+            depots_skipped,
+            error: String::new(),
+        }
+    }
+}
+
+pub fn clean_pause_marker_name(depot_id: u32, manifest_id: u64) -> String {
+    format!("{depot_id}_{manifest_id}.cleanpause")
+}
+
+pub fn clean_pause_marker_path(
+    config_dir: impl AsRef<Path>,
+    depot_id: u32,
+    manifest_id: u64,
+) -> PathBuf {
+    config_dir
+        .as_ref()
+        .join(clean_pause_marker_name(depot_id, manifest_id))
+}
+
+pub fn has_clean_pause_marker(
+    config_dir: impl AsRef<Path>,
+    depot_id: u32,
+    manifest_id: u64,
+) -> bool {
+    clean_pause_marker_path(config_dir, depot_id, manifest_id).is_file()
+}
+
+pub fn write_clean_pause_marker(
+    config_dir: impl AsRef<Path>,
+    depot_id: u32,
+    manifest_id: u64,
+) -> bool {
+    let path = clean_pause_marker_path(config_dir, depot_id, manifest_id);
+    let Some(parent) = path.parent() else {
+        return false;
+    };
+    if fs::create_dir_all(parent).is_err() {
+        return false;
+    }
+    fs::write(path, manifest_id.to_string()).is_ok()
+}
+
+pub fn remove_clean_pause_marker(config_dir: impl AsRef<Path>, depot_id: u32, manifest_id: u64) {
+    let _ = fs::remove_file(clean_pause_marker_path(config_dir, depot_id, manifest_id));
+}
+
+pub fn validate_download_inputs(
+    install_dir: &str,
+    depots: &[DepotSpec],
+) -> Result<(), DepotDownloadResult> {
+    if install_dir.is_empty() {
+        return Err(DepotDownloadResult::fail("download: empty install dir"));
+    }
+    if depots.is_empty() {
+        return Err(DepotDownloadResult::fail("download: no depots"));
+    }
+    Ok(())
+}
+
+pub fn validate_resolved_download_inputs(
+    install_dir: &str,
+    depots: &[ResolvedDepotSpec],
+    servers: &[CContentServerDirectoryServerInfo],
+) -> Result<(), DepotDownloadResult> {
+    if install_dir.is_empty() {
+        return Err(DepotDownloadResult::fail("download: empty install dir"));
+    }
+    if depots.is_empty() {
+        return Err(DepotDownloadResult::fail("download: no depots"));
+    }
+    if servers.is_empty() {
+        return Err(DepotDownloadResult::fail(
+            "download: no CDN servers available",
+        ));
+    }
+    Ok(())
+}
+
+pub fn filter_usable_cdn_servers(
+    servers: impl IntoIterator<Item = CContentServerDirectoryServerInfo>,
+) -> Vec<CContentServerDirectoryServerInfo> {
+    servers
+        .into_iter()
+        .filter(|server| !server.steam_china_only && !server.host.is_empty())
+        .collect()
+}
+
+pub fn manifest_retry_server_indices(server_count: usize, attempts: usize) -> Vec<usize> {
+    if server_count == 0 {
+        return Vec::new();
+    }
+    (0..attempts)
+        .map(|attempt| attempt % server_count)
+        .collect()
+}
+
+pub fn retry_backoff_millis(attempt: u32) -> u64 {
+    if attempt == 0 {
+        0
+    } else {
+        (300u64 << (attempt - 1)).min(4000)
+    }
+}
+
+pub fn fetch_manifest_with_retry(
+    cdn: &CdnClient,
+    servers: &[CContentServerDirectoryServerInfo],
+    depot_id: u32,
+    manifest_id: u64,
+    request_code: u64,
+    cdn_auth_token: &str,
+    timeout: Duration,
+) -> CdnManifestResult {
+    if servers.is_empty() {
+        return CdnManifestResult {
+            error: "download: no CDN servers available".to_string(),
+            ..Default::default()
+        };
+    }
+    let mut last = CdnManifestResult::default();
+    for (attempt, server_idx) in
+        manifest_retry_server_indices(servers.len(), MAX_MANIFEST_FETCH_ATTEMPTS)
+            .into_iter()
+            .enumerate()
+    {
+        if attempt > 0 {
+            thread::sleep(Duration::from_millis(retry_backoff_millis(attempt as u32)));
+        }
+        last = cdn.fetch_manifest(
+            &servers[server_idx],
+            depot_id,
+            manifest_id,
+            request_code,
+            cdn_auth_token,
+            timeout,
+        );
+        if last.ok() {
+            return last;
+        }
+    }
+    last
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum DepotResumeDecision {
+    SkipInstalled,
+    Download { trust_existing_chunks: bool },
+}
+
+pub fn decide_depot_resume(
+    fresh: bool,
+    cfg: &DepotConfigStore,
+    spec: DepotSpec,
+    clean_pause_marker_exists: bool,
+) -> DepotResumeDecision {
+    if !fresh && cfg.is_installed(spec.depot_id, spec.manifest_id) {
+        DepotResumeDecision::SkipInstalled
+    } else {
+        DepotResumeDecision::Download {
+            trust_existing_chunks: !fresh && clean_pause_marker_exists,
+        }
+    }
+}
+
+pub fn in_progress_manifest_id() -> u64 {
+    INVALID_MANIFEST_ID
+}
+
+pub fn map_write_progress(
+    depot_id: u32,
+    depots_done: u32,
+    depots_total: u32,
+    done: u64,
+    total: u64,
+    verifying: bool,
+) -> DepotDownloadProgress {
+    DepotDownloadProgress {
+        depot_id,
+        depot_done: done,
+        depot_total: total,
+        depots_done,
+        depots_total,
+        verifying,
+    }
+}
+
+pub type DepotProgressCallback<'a> = &'a (dyn Fn(&DepotDownloadProgress) + Sync);
+
+/// Returns a fresh manifest request code for (depot_id, manifest_id); Steam rotates codes ~every 5 min.
+pub type ManifestCodeRefresher<'a> = &'a (dyn Fn(u32, u64) -> Option<u64> + Sync);
+
+pub fn download_resolved_depots(
+    install_dir: &str,
+    depots: &[ResolvedDepotSpec],
+    servers: &[CContentServerDirectoryServerInfo],
+    ca_bundle_path: &str,
+    fresh: bool,
+    max_workers: u32,
+) -> DepotDownloadResult {
+    download_resolved_depots_with_cancel_progress(
+        install_dir,
+        depots,
+        servers,
+        ca_bundle_path,
+        fresh,
+        max_workers,
+        None,
+        None,
+        None,
+    )
+}
+
+pub fn download_resolved_depots_with_cancel(
+    install_dir: &str,
+    depots: &[ResolvedDepotSpec],
+    servers: &[CContentServerDirectoryServerInfo],
+    ca_bundle_path: &str,
+    fresh: bool,
+    max_workers: u32,
+    cancel: Option<&AtomicBool>,
+) -> DepotDownloadResult {
+    download_resolved_depots_with_cancel_progress(
+        install_dir,
+        depots,
+        servers,
+        ca_bundle_path,
+        fresh,
+        max_workers,
+        cancel,
+        None,
+        None,
+    )
+}
+
+pub fn download_resolved_depots_with_cancel_progress(
+    install_dir: &str,
+    depots: &[ResolvedDepotSpec],
+    servers: &[CContentServerDirectoryServerInfo],
+    ca_bundle_path: &str,
+    fresh: bool,
+    max_workers: u32,
+    cancel: Option<&AtomicBool>,
+    on_progress: Option<DepotProgressCallback<'_>>,
+    code_refresher: Option<ManifestCodeRefresher<'_>>,
+) -> DepotDownloadResult {
+    if let Err(error) = validate_resolved_download_inputs(install_dir, depots, servers) {
+        return error;
+    }
+    let usable_servers = filter_usable_cdn_servers(servers.iter().cloned());
+    if usable_servers.is_empty() {
+        return DepotDownloadResult::fail("download: no usable CDN server");
+    }
+
+    if let Err(error) = fs::create_dir_all(install_dir) {
+        return DepotDownloadResult::fail(format!("download: mkdir install dir: {error}"));
+    }
+    let config_dir = Path::new(install_dir).join(".DepotDownloader");
+    if let Err(error) = fs::create_dir_all(&config_dir) {
+        return DepotDownloadResult::fail(format!("download: mkdir config dir: {error}"));
+    }
+
+    let mut cfg = DepotConfigStore::load(&config_dir);
+    if fresh {
+        // Reset only this batch's depots; a global discard would wipe earlier batches' records.
+        for depot in depots {
+            cfg.forget_depot(depot.depot_id);
+            DepotProgressStore::remove(&config_dir, depot.depot_id, depot.manifest_id);
+            remove_clean_pause_marker(&config_dir, depot.depot_id, depot.manifest_id);
+        }
+    }
+
+    let cdn = CdnClient::new(ca_bundle_path);
+    let mut result = DepotDownloadResult {
+        success: true,
+        ..Default::default()
+    };
+
+    let depots_total = depots.len() as u32;
+    for (depot_index, depot) in depots.iter().enumerate() {
+        if cancel.is_some_and(|cancel| cancel.load(Ordering::Relaxed)) {
+            return DepotDownloadResult::fail("cancelled");
+        }
+        let spec = DepotSpec {
+            depot_id: depot.depot_id,
+            manifest_id: depot.manifest_id,
+        };
+        let clean_pause = has_clean_pause_marker(&config_dir, depot.depot_id, depot.manifest_id);
+        if decide_depot_resume(fresh, &cfg, spec, clean_pause) == DepotResumeDecision::SkipInstalled
+        {
+            result.depots_skipped += 1;
+            continue;
+        }
+        if depot.depot_key.len() != 32 {
+            return DepotDownloadResult::fail(format!(
+                "download: depot key unavailable for depot {}",
+                depot.depot_id
+            ));
+        }
+        if !cfg.begin_depot(depot.depot_id) {
+            return DepotDownloadResult::fail(format!(
+                "download: depot.config begin failed for depot {}",
+                depot.depot_id
+            ));
+        }
+
+        let cache_path = cfg.manifest_cache_path(depot.depot_id, depot.manifest_id);
+        let raw_manifest = match read_cached_manifest(&cache_path) {
+            Some(raw) => raw,
+            None => {
+                if cancel.is_some_and(|cancel| cancel.load(Ordering::Relaxed)) {
+                    return DepotDownloadResult::fail("cancelled");
+                }
+                // Prefer a code obtained now; the pre-resolved one may have expired.
+                let refreshed_code = code_refresher
+                    .and_then(|refresh| refresh(depot.depot_id, depot.manifest_id));
+                let request_code = refreshed_code.unwrap_or(depot.manifest_request_code);
+                let mut manifest = fetch_manifest_with_retry(
+                    &cdn,
+                    &usable_servers,
+                    depot.depot_id,
+                    depot.manifest_id,
+                    request_code,
+                    "",
+                    CdnClient::default_timeout(),
+                );
+                if !manifest.ok() {
+                    // One more pass with a code obtained after the failed attempts.
+                    if let Some(fresh) = code_refresher
+                        .and_then(|refresh| refresh(depot.depot_id, depot.manifest_id))
+                        .filter(|fresh| *fresh != request_code)
+                    {
+                        manifest = fetch_manifest_with_retry(
+                            &cdn,
+                            &usable_servers,
+                            depot.depot_id,
+                            depot.manifest_id,
+                            fresh,
+                            "",
+                            CdnClient::default_timeout(),
+                        );
+                    }
+                }
+                if !manifest.ok() {
+                    return DepotDownloadResult::fail(format!(
+                        "download: manifest fetch failed for depot {}: {}",
+                        depot.depot_id, manifest.error
+                    ));
+                }
+                let _ = write_manifest_cache(&cache_path, &manifest.raw_manifest);
+                manifest.raw_manifest
+            }
+        };
+
+        let Some(mut manifest) = ContentManifest::parse(&raw_manifest) else {
+            return DepotDownloadResult::fail(format!(
+                "download: manifest parse failed for depot {}",
+                depot.depot_id
+            ));
+        };
+        if !manifest.decrypt_filenames(&depot.depot_key) {
+            return DepotDownloadResult::fail(format!(
+                "download: filename decryption failed for depot {}",
+                depot.depot_id
+            ));
+        }
+
+        let depot_id = depot.depot_id;
+        let depots_done = depot_index as u32;
+        let chunk_progress = |done: u64, total: u64, verifying: bool| {
+            if let Some(on_progress) = on_progress {
+                let progress = map_write_progress(
+                    depot_id,
+                    depots_done,
+                    depots_total,
+                    done,
+                    total,
+                    verifying,
+                );
+                on_progress(&progress);
+            }
+        };
+        let chunk_progress: crate::depot_writer::DepotChunkProgressCallback =
+            &chunk_progress;
+        let write_result = write_depot_sequential(
+            &manifest,
+            &depot.depot_key,
+            &cdn,
+            &usable_servers,
+            install_dir,
+            DepotWriteOptions {
+                max_workers,
+                cancel,
+                on_progress: Some(chunk_progress),
+                ..Default::default()
+            },
+        );
+        if !write_result.ok() {
+            if write_result.resume_trust_safe {
+                let _ = write_clean_pause_marker(&config_dir, depot.depot_id, depot.manifest_id);
+            }
+            return DepotDownloadResult::fail(format!(
+                "download: depot {} write failed: {}",
+                depot.depot_id, write_result.error
+            ));
+        }
+
+        if !cfg.finish_depot(depot.depot_id, depot.manifest_id) {
+            return DepotDownloadResult::fail(format!(
+                "download: depot.config finish failed for depot {}",
+                depot.depot_id
+            ));
+        }
+        DepotProgressStore::new(&config_dir, depot.depot_id, depot.manifest_id).discard();
+        remove_clean_pause_marker(&config_dir, depot.depot_id, depot.manifest_id);
+        result.bytes_written += write_result.bytes_written;
+        result.depots_completed += 1;
+    }
+
+    result
+}
+
+fn read_cached_manifest(path: &Path) -> Option<Vec<u8>> {
+    let bytes = fs::read(path).ok()?;
+    (!bytes.is_empty()).then_some(bytes)
+}
+
+fn write_manifest_cache(path: &Path, raw_manifest: &[u8]) -> bool {
+    let Some(parent) = path.parent() else {
+        return false;
+    };
+    if fs::create_dir_all(parent).is_err() {
+        return false;
+    }
+    fs::write(path, raw_manifest).is_ok()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::content_manifest::{END_OF_MANIFEST_MAGIC, METADATA_MAGIC, PAYLOAD_MAGIC};
+    use crate::proto_wire::Writer;
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    #[test]
+    fn marker_names_match_cpp_format() {
+        assert_eq!(clean_pause_marker_name(123, 456), "123_456.cleanpause");
+    }
+
+    #[test]
+    fn clean_pause_marker_files_roundtrip() {
+        let dir = temp_dir("clean_pause");
+        assert!(!has_clean_pause_marker(&dir, 123, 456));
+        assert!(write_clean_pause_marker(&dir, 123, 456));
+        assert!(has_clean_pause_marker(&dir, 123, 456));
+        assert_eq!(
+            fs::read_to_string(clean_pause_marker_path(&dir, 123, 456)).unwrap(),
+            "456"
+        );
+        remove_clean_pause_marker(&dir, 123, 456);
+        assert!(!has_clean_pause_marker(&dir, 123, 456));
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn filters_non_china_servers_with_hosts() {
+        let servers = filter_usable_cdn_servers([
+            CContentServerDirectoryServerInfo {
+                host: "ok".into(),
+                ..Default::default()
+            },
+            CContentServerDirectoryServerInfo {
+                host: "china".into(),
+                steam_china_only: true,
+                ..Default::default()
+            },
+            CContentServerDirectoryServerInfo {
+                host: String::new(),
+                ..Default::default()
+            },
+        ]);
+        assert_eq!(servers.len(), 1);
+        assert_eq!(servers[0].host, "ok");
+    }
+
+    #[test]
+    fn resume_decision_matches_cpp_fresh_and_installed_rules() {
+        let dir = temp_dir("resume_decision");
+        let mut cfg = DepotConfigStore::load(&dir);
+        cfg.finish_depot(100, 555);
+        let spec = DepotSpec {
+            depot_id: 100,
+            manifest_id: 555,
+        };
+        assert_eq!(
+            decide_depot_resume(false, &cfg, spec, false),
+            DepotResumeDecision::SkipInstalled
+        );
+        assert_eq!(
+            decide_depot_resume(true, &cfg, spec, true),
+            DepotResumeDecision::Download {
+                trust_existing_chunks: false
+            }
+        );
+        assert_eq!(
+            decide_depot_resume(
+                false,
+                &cfg,
+                DepotSpec {
+                    depot_id: 100,
+                    manifest_id: 777
+                },
+                true
+            ),
+            DepotResumeDecision::Download {
+                trust_existing_chunks: true
+            }
+        );
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn retry_rotation_and_progress_mapping_match_cpp() {
+        assert_eq!(manifest_retry_server_indices(3, 5), [0, 1, 2, 0, 1]);
+        assert_eq!(manifest_retry_server_indices(0, 5), Vec::<usize>::new());
+        assert_eq!(retry_backoff_millis(1), 300);
+        assert_eq!(retry_backoff_millis(5), 4000);
+        assert_eq!(
+            map_write_progress(100, 2, 4, 10, 20, true),
+            DepotDownloadProgress {
+                depot_id: 100,
+                depot_done: 10,
+                depot_total: 20,
+                depots_done: 2,
+                depots_total: 4,
+                verifying: true
+            }
+        );
+    }
+
+    #[test]
+    fn validates_download_inputs() {
+        assert_eq!(
+            validate_download_inputs("", &[DepotSpec::default()])
+                .unwrap_err()
+                .error,
+            "download: empty install dir"
+        );
+        assert_eq!(
+            validate_download_inputs("/tmp/app", &[]).unwrap_err().error,
+            "download: no depots"
+        );
+        assert!(validate_download_inputs("/tmp/app", &[DepotSpec::default()]).is_ok());
+        assert_eq!(in_progress_manifest_id(), INVALID_MANIFEST_ID);
+    }
+
+    #[test]
+    fn validates_resolved_inputs_and_filters_servers() {
+        assert_eq!(
+            validate_resolved_download_inputs("", &[ResolvedDepotSpec::default()], &[])
+                .unwrap_err()
+                .error,
+            "download: empty install dir"
+        );
+        assert_eq!(
+            validate_resolved_download_inputs("/tmp/app", &[], &[])
+                .unwrap_err()
+                .error,
+            "download: no depots"
+        );
+        assert_eq!(
+            validate_resolved_download_inputs("/tmp/app", &[ResolvedDepotSpec::default()], &[])
+                .unwrap_err()
+                .error,
+            "download: no CDN servers available"
+        );
+    }
+
+    #[test]
+    fn resolved_download_uses_cached_manifest_and_records_install() {
+        let dir = temp_dir("resolved_download_cached_manifest");
+        let config_dir = dir.join(".DepotDownloader");
+        fs::create_dir_all(&config_dir).unwrap();
+        let raw_manifest = raw_layout_manifest(100, 555, "empty.bin", 5);
+        fs::write(config_dir.join("100_555.manifest"), raw_manifest).unwrap();
+
+        let result = download_resolved_depots(
+            dir.to_str().unwrap(),
+            &[ResolvedDepotSpec {
+                depot_id: 100,
+                manifest_id: 555,
+                depot_key: vec![1u8; 32],
+                manifest_request_code: 0,
+            }],
+            &[CContentServerDirectoryServerInfo {
+                host: "cdn.example".into(),
+                https_support: "mandatory".into(),
+                ..Default::default()
+            }],
+            "",
+            false,
+            4,
+        );
+
+        assert!(result.success, "{}", result.error);
+        assert_eq!(result.depots_completed, 1);
+        assert_eq!(result.depots_skipped, 0);
+        assert_eq!(fs::metadata(dir.join("empty.bin")).unwrap().len(), 5);
+        let cfg = DepotConfigStore::load(&config_dir);
+        assert!(cfg.is_installed(100, 555));
+
+        let skipped = download_resolved_depots(
+            dir.to_str().unwrap(),
+            &[ResolvedDepotSpec {
+                depot_id: 100,
+                manifest_id: 555,
+                depot_key: vec![1u8; 32],
+                manifest_request_code: 0,
+            }],
+            &[CContentServerDirectoryServerInfo {
+                host: "cdn.example".into(),
+                https_support: "mandatory".into(),
+                ..Default::default()
+            }],
+            "",
+            false,
+            4,
+        );
+        assert!(skipped.success);
+        assert_eq!(skipped.depots_completed, 0);
+        assert_eq!(skipped.depots_skipped, 1);
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    fn temp_dir(name: &str) -> PathBuf {
+        let dir = std::env::temp_dir().join(format!(
+            "wnsteam_downloader_{name}_{}",
+            SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        let _ = fs::remove_dir_all(&dir);
+        dir
+    }
+
+    fn raw_layout_manifest(depot_id: u32, manifest_id: u64, filename: &str, size: u64) -> Vec<u8> {
+        let mut file_body = Vec::new();
+        {
+            let mut writer = Writer::new(&mut file_body);
+            writer.string_field(1, filename);
+            writer.uint64_field(2, size);
+        }
+
+        let mut payload = Vec::new();
+        Writer::new(&mut payload).submessage_field(1, &file_body);
+
+        let mut metadata = Vec::new();
+        {
+            let mut writer = Writer::new(&mut metadata);
+            writer.uint32_field(1, depot_id);
+            writer.uint64_field(2, manifest_id);
+            writer.bool_field_force(4, false);
+        }
+
+        let mut raw = Vec::new();
+        push_section(&mut raw, PAYLOAD_MAGIC, &payload);
+        push_section(&mut raw, METADATA_MAGIC, &metadata);
+        raw.extend_from_slice(&END_OF_MANIFEST_MAGIC.to_le_bytes());
+        raw
+    }
+
+    fn push_section(out: &mut Vec<u8>, magic: u32, body: &[u8]) {
+        out.extend_from_slice(&magic.to_le_bytes());
+        out.extend_from_slice(&(body.len() as u32).to_le_bytes());
+        out.extend_from_slice(body);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/depot_writer.rs b/app/src/main/cpp/wn-steam-client/rust/src/depot_writer.rs
new file mode 100644
index 000000000..1c3bf24fe
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/depot_writer.rs
@@ -0,0 +1,1027 @@
+use crate::cdn_client::{CdnClient, CdnConnection};
+use crate::content_manifest::{ChunkData, ContentManifest};
+use crate::depot_chunk::process_depot_chunk;
+use crate::pb::ccontentserverdirectory::CContentServerDirectoryServerInfo;
+use std::fs::{self, File, OpenOptions};
+use std::io::{Read, Seek, SeekFrom, Write};
+use std::path::{Component, Path};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+use std::sync::{Arc, Mutex};
+use std::thread;
+use std::time::{Duration, Instant};
+
+pub const DEPOT_FILE_FLAG_EXECUTABLE: u32 = 32;
+pub const DEPOT_FILE_FLAG_DIRECTORY: u32 = 64;
+pub const DEPOT_FILE_FLAG_SYMLINK: u32 = 512;
+pub const MAX_CHUNK_ATTEMPTS: u32 = 5;
+pub const SLOW_CHUNK_ROTATE_THRESHOLD_SECS: u64 = 8;
+pub const SLOW_CHUNK_ROTATE_CONSECUTIVE_LIMIT: u32 = 3;
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct DepotWriteResult {
+    pub files_written: u64,
+    pub bytes_written: u64,
+    pub resume_trust_safe: bool,
+    pub error: String,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum DepotFileAction {
+    Directory { path: String },
+    Symlink { path: String, target: String },
+    Regular { path: String, size: u64, mode: u32 },
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct ChunkWriteJob {
+    pub file_idx: u32,
+    pub chunk_idx: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct DepotWritePlan {
+    pub total_bytes: u64,
+    pub files_written: u64,
+    pub actions: Vec<DepotFileAction>,
+    pub chunk_jobs: Vec<ChunkWriteJob>,
+    pub worker_count: u32,
+}
+
+pub type DepotChunkProgressCallback<'a> = &'a (dyn Fn(u64, u64, bool) + Sync);
+
+#[derive(Clone, Copy)]
+pub struct DepotWriteOptions<'a> {
+    pub cdn_auth_token: &'a str,
+    pub timeout: Duration,
+    pub max_workers: u32,
+    pub cancel: Option<&'a AtomicBool>,
+    pub on_progress: Option<DepotChunkProgressCallback<'a>>,
+}
+
+impl Default for DepotWriteOptions<'_> {
+    fn default() -> Self {
+        Self {
+            cdn_auth_token: "",
+            timeout: CdnClient::default_timeout(),
+            max_workers: 8,
+            cancel: None,
+            on_progress: None,
+        }
+    }
+}
+
+impl DepotWriteResult {
+    pub fn ok(&self) -> bool {
+        self.error.is_empty()
+    }
+
+    pub fn success(files_written: u64, bytes_written: u64) -> Self {
+        Self {
+            files_written,
+            bytes_written,
+            resume_trust_safe: true,
+            error: String::new(),
+        }
+    }
+
+    pub fn fail(error: impl Into<String>, resume_trust_safe: bool) -> Self {
+        Self {
+            error: error.into(),
+            resume_trust_safe,
+            ..Default::default()
+        }
+    }
+}
+
+pub fn retry_backoff_millis(attempt: u32) -> u64 {
+    if attempt == 0 {
+        return 0;
+    }
+    (300u64 << (attempt - 1)).min(4000)
+}
+
+pub fn chunk_attempt_server_indices(
+    start_server_index: usize,
+    server_count: usize,
+    attempts: u32,
+) -> Vec<usize> {
+    if server_count == 0 || attempts == 0 {
+        return Vec::new();
+    }
+    let mut out = Vec::with_capacity(attempts as usize);
+    let mut server_index = start_server_index % server_count;
+    for attempt in 0..attempts {
+        if attempt > 0 && server_count > 1 {
+            server_index = (server_index + 1) % server_count;
+        }
+        out.push(server_index);
+    }
+    out
+}
+
+pub fn should_rotate_after_slow_chunks(consecutive_slow_chunks: u32, server_count: usize) -> bool {
+    server_count > 1 && consecutive_slow_chunks >= SLOW_CHUNK_ROTATE_CONSECUTIVE_LIMIT
+}
+
+pub fn depot_adler_hash(data: &[u8]) -> u32 {
+    const BLOCK: usize = 5552;
+    let mut a = 0u32;
+    let mut b = 0u32;
+    for chunk in data.chunks(BLOCK) {
+        for byte in chunk {
+            a += *byte as u32;
+            b += a;
+        }
+        a %= 65521;
+        b %= 65521;
+    }
+    a | (b << 16)
+}
+
+pub fn path_is_safe(rel: &str) -> bool {
+    if rel.is_empty() || rel.starts_with('/') || rel.starts_with('\\') {
+        return false;
+    }
+    let path = Path::new(rel);
+    if path.is_absolute() {
+        return false;
+    }
+    path.components().all(|component| {
+        matches!(component, Component::Normal(_)) || matches!(component, Component::CurDir)
+    }) && !path
+        .components()
+        .any(|component| matches!(component, Component::ParentDir | Component::Prefix(_)))
+}
+
+pub fn clamp_worker_count(max_workers: u32, outstanding_chunks: usize) -> u32 {
+    if outstanding_chunks == 0 {
+        return 0;
+    }
+    let requested = if max_workers == 0 { 1 } else { max_workers };
+    requested.min(64).min(outstanding_chunks as u32)
+}
+
+pub fn plan_depot_write(
+    manifest: &ContentManifest,
+    depot_key: &[u8],
+    server_count: usize,
+    target_dir: &str,
+    max_workers: u32,
+) -> Result<DepotWritePlan, DepotWriteResult> {
+    if manifest.metadata.filenames_encrypted {
+        return Err(DepotWriteResult::fail(
+            "write_depot: manifest filenames are still encrypted",
+            false,
+        ));
+    }
+    if depot_key.len() != 32 {
+        return Err(DepotWriteResult::fail(
+            "write_depot: bad depot key length",
+            false,
+        ));
+    }
+    if server_count == 0 {
+        return Err(DepotWriteResult::fail("write_depot: no CDN servers", false));
+    }
+
+    let mut plan = DepotWritePlan {
+        total_bytes: manifest.files.iter().map(|file| file.size).sum(),
+        ..Default::default()
+    };
+
+    for (file_idx, file) in manifest.files.iter().enumerate() {
+        if !path_is_safe(&file.filename) {
+            return Err(DepotWriteResult::fail(
+                format!("write_depot: unsafe path '{}'", file.filename),
+                false,
+            ));
+        }
+        let path = join_target_path(target_dir, &file.filename);
+        if !file.linktarget.is_empty() {
+            plan.actions.push(DepotFileAction::Symlink {
+                path,
+                target: file.linktarget.clone(),
+            });
+            plan.files_written += 1;
+            continue;
+        }
+        if (file.flags & DEPOT_FILE_FLAG_DIRECTORY) != 0 {
+            plan.actions.push(DepotFileAction::Directory { path });
+            continue;
+        }
+        let mode = if (file.flags & DEPOT_FILE_FLAG_EXECUTABLE) != 0 {
+            0o755
+        } else {
+            0o644
+        };
+        plan.actions.push(DepotFileAction::Regular {
+            path,
+            size: file.size,
+            mode,
+        });
+        plan.files_written += 1;
+        for chunk_idx in 0..file.chunks.len() {
+            plan.chunk_jobs.push(ChunkWriteJob {
+                file_idx: file_idx as u32,
+                chunk_idx: chunk_idx as u32,
+            });
+        }
+    }
+    plan.worker_count = clamp_worker_count(max_workers, plan.chunk_jobs.len());
+    Ok(plan)
+}
+
+pub fn write_depot_sequential(
+    manifest: &ContentManifest,
+    depot_key: &[u8],
+    cdn: &CdnClient,
+    servers: &[CContentServerDirectoryServerInfo],
+    target_dir: &str,
+    options: DepotWriteOptions<'_>,
+) -> DepotWriteResult {
+    let plan = match plan_depot_write(
+        manifest,
+        depot_key,
+        servers.len(),
+        target_dir,
+        options.max_workers,
+    ) {
+        Ok(plan) => plan,
+        Err(error) => return error,
+    };
+    let layout = create_depot_layout(&plan);
+    if !layout.ok() {
+        return layout;
+    }
+
+    if plan.worker_count > 1 && plan.chunk_jobs.len() > 1 && servers.len() > 0 {
+        return write_depot_parallel(
+            manifest,
+            depot_key,
+            cdn,
+            servers,
+            target_dir,
+            &plan,
+            &options,
+        );
+    }
+
+    let mut bytes_written = 0u64;
+    let total_bytes = plan.total_bytes;
+    let mut conn = cdn.open_connection();
+    for (job_index, job) in plan.chunk_jobs.iter().enumerate() {
+        if options
+            .cancel
+            .is_some_and(|cancel| cancel.load(Ordering::Relaxed))
+        {
+            return DepotWriteResult::fail("cancelled", true);
+        }
+        let file = match manifest.files.get(job.file_idx as usize) {
+            Some(file) => file,
+            None => return DepotWriteResult::fail("bad file index", true),
+        };
+        let chunk = match file.chunks.get(job.chunk_idx as usize) {
+            Some(chunk) => chunk,
+            None => return DepotWriteResult::fail("bad chunk index", true),
+        };
+        let path = join_target_path(target_dir, &file.filename);
+        if existing_chunk_matches(&path, chunk) {
+            bytes_written += chunk.cb_original as u64;
+            if let Some(on_progress) = options.on_progress {
+                on_progress(bytes_written, total_bytes, true);
+            }
+            continue;
+        }
+        match fetch_process_write_chunk(
+            cdn,
+            Some(&mut conn),
+            servers,
+            manifest,
+            job.file_idx as usize,
+            job.chunk_idx as usize,
+            depot_key,
+            target_dir,
+            options.cdn_auth_token,
+            job_index % servers.len(),
+            options.timeout,
+        ) {
+            Ok(bytes) => {
+                bytes_written += bytes;
+                if let Some(on_progress) = options.on_progress {
+                    on_progress(bytes_written, total_bytes, false);
+                }
+            }
+            Err(error) => return DepotWriteResult::fail(error, true),
+        }
+    }
+
+    for file in &manifest.files {
+        if options
+            .cancel
+            .is_some_and(|cancel| cancel.load(Ordering::Relaxed))
+        {
+            return DepotWriteResult::fail("cancelled", true);
+        }
+        if !file.linktarget.is_empty() || (file.flags & DEPOT_FILE_FLAG_DIRECTORY) != 0 {
+            continue;
+        }
+        let path = join_target_path(target_dir, &file.filename);
+        if let Err(error) = finalize_regular_file(path, file.size) {
+            return DepotWriteResult::fail(error, true);
+        }
+    }
+
+    DepotWriteResult {
+        files_written: plan.files_written,
+        bytes_written,
+        resume_trust_safe: true,
+        error: String::new(),
+    }
+}
+
+fn write_depot_parallel(
+    manifest: &ContentManifest,
+    depot_key: &[u8],
+    cdn: &CdnClient,
+    servers: &[CContentServerDirectoryServerInfo],
+    target_dir: &str,
+    plan: &DepotWritePlan,
+    options: &DepotWriteOptions<'_>,
+) -> DepotWriteResult {
+    let total_bytes = plan.total_bytes;
+    let bytes_written = Arc::new(AtomicU64::new(0));
+    let error_slot: Arc<Mutex<Option<String>>> = Arc::new(Mutex::new(None));
+    let next_index = Arc::new(std::sync::atomic::AtomicUsize::new(0));
+    let jobs = Arc::new(plan.chunk_jobs.clone());
+    let worker_count = (plan.worker_count as usize).max(1).min(jobs.len());
+    let cdn_auth_token = options.cdn_auth_token.to_string();
+    let timeout = options.timeout;
+    let cancel_flag = options.cancel.map(|c| {
+        let raw = c as *const AtomicBool;
+        unsafe { raw.as_ref() }.unwrap()
+    });
+    // SAFETY: we only spawn scoped threads so all `'a` references outlive joins.
+    let scope_result = thread::scope(|scope| -> DepotWriteResult {
+        let mut handles = Vec::with_capacity(worker_count);
+        for worker_id in 0..worker_count {
+            let bytes_written = Arc::clone(&bytes_written);
+            let error_slot = Arc::clone(&error_slot);
+            let next_index = Arc::clone(&next_index);
+            let jobs = Arc::clone(&jobs);
+            let cdn_auth_token = cdn_auth_token.clone();
+            let manifest_ref = manifest;
+            let depot_key_ref = depot_key;
+            let target_dir_ref = target_dir;
+            let cdn_ref = cdn;
+            let servers_ref = servers;
+            let progress = options.on_progress;
+            handles.push(scope.spawn(move || {
+                let mut conn = cdn_ref.open_connection();
+                let mut slow_chunks = 0u32;
+                let mut worker_server_bias = worker_id % servers_ref.len();
+                loop {
+                    if cancel_flag.is_some_and(|c| c.load(Ordering::Relaxed)) {
+                        return;
+                    }
+                    if error_slot.lock().expect("err slot poisoned").is_some() {
+                        return;
+                    }
+                    let idx = next_index.fetch_add(1, Ordering::Relaxed);
+                    if idx >= jobs.len() {
+                        return;
+                    }
+                    let job = jobs[idx];
+                    let file = match manifest_ref.files.get(job.file_idx as usize) {
+                        Some(file) => file,
+                        None => {
+                            *error_slot.lock().expect("err slot poisoned") =
+                                Some("bad file index".to_string());
+                            return;
+                        }
+                    };
+                    let chunk = match file.chunks.get(job.chunk_idx as usize) {
+                        Some(chunk) => chunk,
+                        None => {
+                            *error_slot.lock().expect("err slot poisoned") =
+                                Some("bad chunk index".to_string());
+                            return;
+                        }
+                    };
+                    let path = join_target_path(target_dir_ref, &file.filename);
+                    if existing_chunk_matches(&path, chunk) {
+                        let total =
+                            bytes_written.fetch_add(chunk.cb_original as u64, Ordering::Relaxed)
+                                + chunk.cb_original as u64;
+                        if let Some(cb) = progress {
+                            cb(total, total_bytes, true);
+                        }
+                        continue;
+                    }
+                    if should_rotate_after_slow_chunks(slow_chunks, servers_ref.len()) {
+                        worker_server_bias = (worker_server_bias + 1) % servers_ref.len();
+                        conn = cdn_ref.open_connection();
+                        slow_chunks = 0;
+                    }
+                    let start_server = (idx + worker_server_bias) % servers_ref.len();
+                    let started = Instant::now();
+                    match fetch_process_write_chunk(
+                        cdn_ref,
+                        Some(&mut conn),
+                        servers_ref,
+                        manifest_ref,
+                        job.file_idx as usize,
+                        job.chunk_idx as usize,
+                        depot_key_ref,
+                        target_dir_ref,
+                        &cdn_auth_token,
+                        start_server,
+                        timeout,
+                    ) {
+                        Ok(bytes) => {
+                            if started.elapsed()
+                                > Duration::from_secs(SLOW_CHUNK_ROTATE_THRESHOLD_SECS)
+                                && servers_ref.len() > 1
+                            {
+                                slow_chunks += 1;
+                            } else {
+                                slow_chunks = 0;
+                            }
+                            let total = bytes_written.fetch_add(bytes, Ordering::Relaxed) + bytes;
+                            if let Some(cb) = progress {
+                                cb(total, total_bytes, false);
+                            }
+                        }
+                        Err(error) => {
+                            *error_slot.lock().expect("err slot poisoned") = Some(error);
+                            return;
+                        }
+                    }
+                }
+            }));
+        }
+        for handle in handles {
+            let _ = handle.join();
+        }
+        if cancel_flag.is_some_and(|c| c.load(Ordering::Relaxed)) {
+            return DepotWriteResult::fail("cancelled", true);
+        }
+        if let Some(error) = error_slot.lock().expect("err slot poisoned").take() {
+            return DepotWriteResult::fail(error, true);
+        }
+        DepotWriteResult {
+            files_written: plan.files_written,
+            bytes_written: bytes_written.load(Ordering::Relaxed),
+            resume_trust_safe: true,
+            error: String::new(),
+        }
+    });
+    if !scope_result.ok() {
+        return scope_result;
+    }
+
+    for file in &manifest.files {
+        if options
+            .cancel
+            .is_some_and(|cancel| cancel.load(Ordering::Relaxed))
+        {
+            return DepotWriteResult::fail("cancelled", true);
+        }
+        if !file.linktarget.is_empty() || (file.flags & DEPOT_FILE_FLAG_DIRECTORY) != 0 {
+            continue;
+        }
+        let path = join_target_path(target_dir, &file.filename);
+        if let Err(error) = finalize_regular_file(path, file.size) {
+            return DepotWriteResult::fail(error, true);
+        }
+    }
+    scope_result
+}
+
+pub fn create_depot_layout(plan: &DepotWritePlan) -> DepotWriteResult {
+    for action in &plan.actions {
+        let result = match action {
+            DepotFileAction::Directory { path } => create_directory(path),
+            DepotFileAction::Symlink { path, target } => create_symlink(path, target),
+            DepotFileAction::Regular { path, mode, .. } => create_regular_file(path, *mode),
+        };
+        if let Err(error) = result {
+            return DepotWriteResult::fail(error, false);
+        }
+    }
+    DepotWriteResult {
+        files_written: plan.files_written,
+        bytes_written: 0,
+        resume_trust_safe: true,
+        error: String::new(),
+    }
+}
+
+pub fn write_chunk_at(path: impl AsRef<Path>, offset: u64, data: &[u8]) -> Result<u64, String> {
+    let path = path.as_ref();
+    make_parent_dirs(path)?;
+    let mut file = OpenOptions::new()
+        .create(true)
+        .write(true)
+        .read(true)
+        .truncate(false)
+        .open(path)
+        .map_err(|err| format!("write_depot: open '{}': {err}", path.display()))?;
+    file.seek(SeekFrom::Start(offset))
+        .map_err(|err| format!("write_depot: seek '{}': {err}", path.display()))?;
+    file.write_all(data)
+        .map_err(|err| format!("write_depot: write '{}': {err}", path.display()))?;
+    Ok(data.len() as u64)
+}
+
+pub fn process_and_write_chunk(
+    path: impl AsRef<Path>,
+    chunk: &ChunkData,
+    raw_chunk: &[u8],
+    depot_key: &[u8],
+) -> Result<u64, String> {
+    let processed = process_depot_chunk(raw_chunk, depot_key, chunk.crc, chunk.cb_original);
+    if !processed.ok() {
+        return Err(format!("decode: {}", processed.error));
+    }
+    write_chunk_at(path, chunk.offset, &processed.data)
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn fetch_process_write_chunk(
+    cdn: &CdnClient,
+    mut conn: Option<&mut CdnConnection>,
+    servers: &[CContentServerDirectoryServerInfo],
+    manifest: &ContentManifest,
+    file_idx: usize,
+    chunk_idx: usize,
+    depot_key: &[u8],
+    target_dir: &str,
+    cdn_auth_token: &str,
+    start_server_index: usize,
+    timeout: Duration,
+) -> Result<u64, String> {
+    if servers.is_empty() {
+        return Err("write_depot: no CDN servers".to_string());
+    }
+    let file = manifest
+        .files
+        .get(file_idx)
+        .ok_or_else(|| "write_depot: bad file index".to_string())?;
+    let chunk = file
+        .chunks
+        .get(chunk_idx)
+        .ok_or_else(|| "write_depot: bad chunk index".to_string())?;
+    let path = join_target_path(target_dir, &file.filename);
+    let mut last_error = String::new();
+    for (attempt, server_idx) in
+        chunk_attempt_server_indices(start_server_index, servers.len(), MAX_CHUNK_ATTEMPTS)
+            .into_iter()
+            .enumerate()
+    {
+        if attempt > 0 {
+            thread::sleep(Duration::from_millis(retry_backoff_millis(attempt as u32)));
+            if let Some(connection) = conn.as_deref_mut() {
+                *connection = cdn.open_connection();
+            }
+        }
+        let fetched = match conn.as_deref_mut() {
+            Some(connection) => cdn.fetch_chunk_with_connection(
+                connection,
+                &servers[server_idx],
+                manifest.metadata.depot_id,
+                &chunk.sha,
+                cdn_auth_token,
+                timeout,
+            ),
+            None => cdn.fetch_chunk(
+                &servers[server_idx],
+                manifest.metadata.depot_id,
+                &chunk.sha,
+                cdn_auth_token,
+                timeout,
+            ),
+        };
+        if !fetched.ok() {
+            last_error = fetched.error;
+            continue;
+        }
+        match process_and_write_chunk(&path, chunk, &fetched.data, depot_key) {
+            Ok(bytes) => return Ok(bytes),
+            Err(error) => last_error = error,
+        }
+    }
+    Err(format!(
+        "write_depot: chunk for '{}' failed after {} attempts: {}",
+        file.filename, MAX_CHUNK_ATTEMPTS, last_error
+    ))
+}
+
+pub fn existing_chunk_matches(path: impl AsRef<Path>, chunk: &ChunkData) -> bool {
+    let path = path.as_ref();
+    let Ok(mut file) = File::open(path) else {
+        return false;
+    };
+    let Ok(metadata) = file.metadata() else {
+        return false;
+    };
+    let end = chunk.offset.saturating_add(chunk.cb_original as u64);
+    if chunk.cb_original == 0 || metadata.len() < end {
+        return false;
+    }
+    let mut buf = vec![0u8; chunk.cb_original as usize];
+    if file.seek(SeekFrom::Start(chunk.offset)).is_err() || file.read_exact(&mut buf).is_err() {
+        return false;
+    }
+    depot_adler_hash(&buf) == chunk.crc
+}
+
+pub fn sync_file(path: impl AsRef<Path>) -> bool {
+    OpenOptions::new()
+        .read(true)
+        .write(true)
+        .open(path)
+        .and_then(|file| file.sync_all())
+        .is_ok()
+}
+
+pub fn finalize_regular_file(path: impl AsRef<Path>, size: u64) -> Result<(), String> {
+    let path = path.as_ref();
+    let file = OpenOptions::new()
+        .write(true)
+        .open(path)
+        .map_err(|err| format!("write_depot: final open '{}': {err}", path.display()))?;
+    file.set_len(size)
+        .map_err(|err| format!("write_depot: final truncate '{}': {err}", path.display()))?;
+    file.sync_all()
+        .map_err(|err| format!("write_depot: final sync '{}': {err}", path.display()))
+}
+
+fn join_target_path(target_dir: &str, rel: &str) -> String {
+    if target_dir.ends_with('/') || target_dir.ends_with('\\') {
+        format!("{target_dir}{rel}")
+    } else {
+        format!("{target_dir}/{rel}")
+    }
+}
+
+fn create_directory(path: &str) -> Result<(), String> {
+    fs::create_dir_all(path).map_err(|err| format!("write_depot: mkdir '{path}': {err}"))
+}
+
+fn create_regular_file(path: &str, mode: u32) -> Result<(), String> {
+    let path_ref = Path::new(path);
+    make_parent_dirs(path_ref)?;
+    OpenOptions::new()
+        .create(true)
+        .write(true)
+        .read(true)
+        .truncate(false)
+        .open(path_ref)
+        .map_err(|err| format!("write_depot: open '{path}': {err}"))?;
+    set_file_mode(path_ref, mode)
+}
+
+fn create_symlink(path: &str, target: &str) -> Result<(), String> {
+    let path_ref = Path::new(path);
+    make_parent_dirs(path_ref)?;
+    if path_ref.exists() {
+        fs::remove_file(path_ref).map_err(|err| format!("write_depot: unlink '{path}': {err}"))?;
+    }
+    create_platform_symlink(target, path_ref)
+        .map_err(|err| format!("write_depot: symlink '{path}': {err}"))
+}
+
+fn make_parent_dirs(path: &Path) -> Result<(), String> {
+    if let Some(parent) = path.parent() {
+        if !parent.as_os_str().is_empty() {
+            fs::create_dir_all(parent)
+                .map_err(|err| format!("write_depot: mkdir '{}': {err}", parent.display()))?;
+        }
+    }
+    Ok(())
+}
+
+#[cfg(unix)]
+fn create_platform_symlink(target: &str, path: &Path) -> std::io::Result<()> {
+    std::os::unix::fs::symlink(target, path)
+}
+
+#[cfg(windows)]
+fn create_platform_symlink(target: &str, path: &Path) -> std::io::Result<()> {
+    std::os::windows::fs::symlink_file(target, path)
+}
+
+#[cfg(unix)]
+fn set_file_mode(path: &Path, mode: u32) -> Result<(), String> {
+    use std::os::unix::fs::PermissionsExt;
+    let permissions = fs::Permissions::from_mode(mode);
+    fs::set_permissions(path, permissions)
+        .map_err(|err| format!("write_depot: chmod '{}': {err}", path.display()))
+}
+
+#[cfg(not(unix))]
+fn set_file_mode(_path: &Path, _mode: u32) -> Result<(), String> {
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::crypto::{aes256_cbc_encrypt, aes256_ecb_encrypt_block, AES_BLOCK_BYTES};
+    use std::path::PathBuf;
+
+    #[test]
+    fn depot_adler_uses_steam_zero_seed() {
+        assert_eq!(depot_adler_hash(b""), 0);
+        assert_eq!(depot_adler_hash(b"abc"), 0x024a_0126);
+    }
+
+    #[test]
+    fn rejects_paths_that_escape_target() {
+        assert!(path_is_safe("a/b/file.txt"));
+        assert!(path_is_safe("./a/file.txt"));
+        assert!(!path_is_safe(""));
+        assert!(!path_is_safe("../file.txt"));
+        assert!(!path_is_safe("a/../file.txt"));
+        assert!(!path_is_safe("/abs/file.txt"));
+    }
+
+    #[test]
+    fn retry_backoff_matches_cpp_caps() {
+        assert_eq!(retry_backoff_millis(1), 300);
+        assert_eq!(retry_backoff_millis(2), 600);
+        assert_eq!(retry_backoff_millis(5), 4000);
+        assert_eq!(MAX_CHUNK_ATTEMPTS, 5);
+        assert_eq!(SLOW_CHUNK_ROTATE_THRESHOLD_SECS, 8);
+    }
+
+    #[test]
+    fn chunk_retry_rotates_across_servers_like_cpp_worker() {
+        assert_eq!(chunk_attempt_server_indices(0, 3, 5), [0, 1, 2, 0, 1]);
+        assert_eq!(chunk_attempt_server_indices(2, 3, 5), [2, 0, 1, 2, 0]);
+        assert_eq!(chunk_attempt_server_indices(0, 1, 5), [0, 0, 0, 0, 0]);
+        assert!(chunk_attempt_server_indices(0, 0, 5).is_empty());
+        assert!(!should_rotate_after_slow_chunks(2, 3));
+        assert!(should_rotate_after_slow_chunks(3, 3));
+        assert!(!should_rotate_after_slow_chunks(3, 1));
+    }
+
+    #[test]
+    fn depot_plan_validates_inputs_and_enumerates_actions() {
+        let manifest = ContentManifest {
+            metadata: crate::content_manifest::Metadata {
+                filenames_encrypted: false,
+                ..Default::default()
+            },
+            files: vec![
+                crate::content_manifest::FileMapping {
+                    filename: "bin".into(),
+                    flags: DEPOT_FILE_FLAG_DIRECTORY,
+                    ..Default::default()
+                },
+                crate::content_manifest::FileMapping {
+                    filename: "bin/game".into(),
+                    size: 10,
+                    flags: DEPOT_FILE_FLAG_EXECUTABLE,
+                    chunks: vec![crate::content_manifest::ChunkData::default()],
+                    ..Default::default()
+                },
+                crate::content_manifest::FileMapping {
+                    filename: "link".into(),
+                    linktarget: "bin/game".into(),
+                    ..Default::default()
+                },
+            ],
+            signature: Vec::new(),
+        };
+
+        let plan = plan_depot_write(&manifest, &[7u8; 32], 2, "/target", 99).unwrap();
+        assert_eq!(plan.total_bytes, 10);
+        assert_eq!(plan.files_written, 2);
+        assert_eq!(plan.worker_count, 1);
+        assert_eq!(
+            plan.actions,
+            [
+                DepotFileAction::Directory {
+                    path: "/target/bin".into()
+                },
+                DepotFileAction::Regular {
+                    path: "/target/bin/game".into(),
+                    size: 10,
+                    mode: 0o755
+                },
+                DepotFileAction::Symlink {
+                    path: "/target/link".into(),
+                    target: "bin/game".into()
+                }
+            ]
+        );
+        assert_eq!(
+            plan.chunk_jobs,
+            [ChunkWriteJob {
+                file_idx: 1,
+                chunk_idx: 0
+            }]
+        );
+    }
+
+    #[test]
+    fn depot_plan_rejects_cpp_error_cases() {
+        let mut manifest = ContentManifest {
+            files: vec![crate::content_manifest::FileMapping {
+                filename: "../escape".into(),
+                ..Default::default()
+            }],
+            ..Default::default()
+        };
+        assert_eq!(
+            plan_depot_write(&manifest, &[0u8; 32], 1, "/target", 8)
+                .unwrap_err()
+                .error,
+            "write_depot: unsafe path '../escape'"
+        );
+        manifest.files[0].filename = "ok".into();
+        manifest.metadata.filenames_encrypted = true;
+        assert_eq!(
+            plan_depot_write(&manifest, &[0u8; 32], 1, "/target", 8)
+                .unwrap_err()
+                .error,
+            "write_depot: manifest filenames are still encrypted"
+        );
+        manifest.metadata.filenames_encrypted = false;
+        assert_eq!(
+            plan_depot_write(&manifest, &[0u8; 31], 1, "/target", 8)
+                .unwrap_err()
+                .error,
+            "write_depot: bad depot key length"
+        );
+        assert_eq!(
+            plan_depot_write(&manifest, &[0u8; 32], 0, "/target", 8)
+                .unwrap_err()
+                .error,
+            "write_depot: no CDN servers"
+        );
+    }
+
+    #[test]
+    fn worker_clamping_matches_cpp_limits() {
+        assert_eq!(clamp_worker_count(0, 10), 1);
+        assert_eq!(clamp_worker_count(128, 100), 64);
+        assert_eq!(clamp_worker_count(8, 3), 3);
+        assert_eq!(clamp_worker_count(8, 0), 0);
+    }
+
+    #[test]
+    fn creates_layout_and_writes_chunks_at_offsets() {
+        let dir = temp_dir("depot_writer_layout");
+        let manifest = ContentManifest {
+            metadata: crate::content_manifest::Metadata {
+                filenames_encrypted: false,
+                ..Default::default()
+            },
+            files: vec![
+                crate::content_manifest::FileMapping {
+                    filename: "bin".into(),
+                    flags: DEPOT_FILE_FLAG_DIRECTORY,
+                    ..Default::default()
+                },
+                crate::content_manifest::FileMapping {
+                    filename: "bin/game.dat".into(),
+                    size: 6,
+                    chunks: vec![ChunkData {
+                        offset: 2,
+                        cb_original: 3,
+                        crc: depot_adler_hash(b"abc"),
+                        ..Default::default()
+                    }],
+                    ..Default::default()
+                },
+            ],
+            signature: Vec::new(),
+        };
+        let plan = plan_depot_write(&manifest, &[1u8; 32], 1, dir.to_str().unwrap(), 4).unwrap();
+        let result = create_depot_layout(&plan);
+        assert!(result.ok(), "{}", result.error);
+        let file = dir.join("bin/game.dat");
+        assert!(file.exists());
+
+        assert_eq!(write_chunk_at(&file, 2, b"abc").unwrap(), 3);
+        assert!(existing_chunk_matches(&file, &manifest.files[1].chunks[0]));
+        assert!(!existing_chunk_matches(
+            &file,
+            &ChunkData {
+                offset: 2,
+                cb_original: 3,
+                crc: 1,
+                ..Default::default()
+            }
+        ));
+        assert!(sync_file(&file));
+        finalize_regular_file(&file, 6).unwrap();
+        assert_eq!(fs::metadata(&file).unwrap().len(), 6);
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn process_and_write_chunk_decrypts_and_materializes_bytes() {
+        let dir = temp_dir("depot_writer_process_chunk");
+        let file = dir.join("content.bin");
+        let key = [9u8; 32];
+        let payload = b"materialized chunk";
+        let raw = encrypted_stored_zip_chunk(&key, payload);
+        let chunk = ChunkData {
+            offset: 4,
+            cb_original: payload.len() as u32,
+            crc: depot_adler_hash(payload),
+            ..Default::default()
+        };
+
+        assert_eq!(
+            process_and_write_chunk(&file, &chunk, &raw, &key).unwrap(),
+            payload.len() as u64
+        );
+        assert!(existing_chunk_matches(&file, &chunk));
+        let mut bytes = Vec::new();
+        File::open(&file).unwrap().read_to_end(&mut bytes).unwrap();
+        assert_eq!(&bytes[4..], payload);
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn sequential_write_handles_layout_only_manifest() {
+        let dir = temp_dir("depot_writer_sequential_layout");
+        let manifest = ContentManifest {
+            metadata: crate::content_manifest::Metadata {
+                filenames_encrypted: false,
+                depot_id: 7,
+                ..Default::default()
+            },
+            files: vec![
+                crate::content_manifest::FileMapping {
+                    filename: "empty.bin".into(),
+                    size: 5,
+                    ..Default::default()
+                },
+                crate::content_manifest::FileMapping {
+                    filename: "folder".into(),
+                    flags: DEPOT_FILE_FLAG_DIRECTORY,
+                    ..Default::default()
+                },
+            ],
+            signature: Vec::new(),
+        };
+        let server = CContentServerDirectoryServerInfo {
+            host: "cdn.example".into(),
+            https_support: "mandatory".into(),
+            ..Default::default()
+        };
+        let result = write_depot_sequential(
+            &manifest,
+            &[3u8; 32],
+            &CdnClient::new(""),
+            &[server],
+            dir.to_str().unwrap(),
+            DepotWriteOptions::default(),
+        );
+        assert!(result.ok(), "{}", result.error);
+        assert_eq!(result.files_written, 1);
+        assert_eq!(result.bytes_written, 0);
+        assert_eq!(fs::metadata(dir.join("empty.bin")).unwrap().len(), 5);
+        assert!(dir.join("folder").is_dir());
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    fn temp_dir(name: &str) -> PathBuf {
+        std::env::temp_dir().join(format!(
+            "wnsteam_{name}_{}",
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ))
+    }
+
+    fn encrypted_stored_zip_chunk(key: &[u8; 32], payload: &[u8]) -> Vec<u8> {
+        let mut zip = Vec::new();
+        zip.extend_from_slice(&0x0403_4b50u32.to_le_bytes());
+        zip.extend_from_slice(&20u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(&0u32.to_le_bytes());
+        zip.extend_from_slice(&(payload.len() as u32).to_le_bytes());
+        zip.extend_from_slice(&(payload.len() as u32).to_le_bytes());
+        zip.extend_from_slice(&1u16.to_le_bytes());
+        zip.extend_from_slice(&0u16.to_le_bytes());
+        zip.extend_from_slice(b"x");
+        zip.extend_from_slice(payload);
+
+        let iv = [6u8; AES_BLOCK_BYTES];
+        let wrapped = aes256_ecb_encrypt_block(key, &iv).unwrap();
+        let body = aes256_cbc_encrypt(key, &iv, &zip).unwrap();
+        let mut out = wrapped.to_vec();
+        out.extend_from_slice(&body);
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/emsg.rs b/app/src/main/cpp/wn-steam-client/rust/src/emsg.rs
new file mode 100644
index 000000000..62e5c5c90
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/emsg.rs
@@ -0,0 +1,133 @@
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
+#[repr(transparent)]
+pub struct EMsg(pub u32);
+
+impl EMsg {
+    pub const INVALID: Self = Self(0);
+    pub const MULTI: Self = Self(1);
+    pub const CHANNEL_ENCRYPT_REQUEST: Self = Self(1303);
+    pub const CHANNEL_ENCRYPT_RESPONSE: Self = Self(1304);
+    pub const CHANNEL_ENCRYPT_RESULT: Self = Self(1305);
+    pub const CLIENT_HELLO: Self = Self(9805);
+    pub const CLIENT_LOGON: Self = Self(5514);
+    pub const CLIENT_LOGON_RESPONSE: Self = Self(751);
+    pub const CLIENT_LOG_OFF: Self = Self(706);
+    pub const CLIENT_LOGGED_OFF: Self = Self(757);
+    pub const CLIENT_HEART_BEAT: Self = Self(703);
+    pub const CLIENT_GAMES_PLAYED_WITH_DATA_BLOB: Self = Self(5410);
+    pub const CLIENT_KICK_PLAYING_SESSION: Self = Self(9601);
+    pub const CLIENT_CHANGE_STATUS: Self = Self(716);
+    pub const CLIENT_REQUEST_FRIEND_DATA: Self = Self(815);
+    pub const CLIENT_SESSION_TOKEN: Self = Self(850);
+    pub const CLIENT_SERVER_UNAVAILABLE: Self = Self(5500);
+    pub const CLIENT_PERSONA_STATE: Self = Self(766);
+    pub const CLIENT_FRIENDS_LIST: Self = Self(767);
+    pub const CLIENT_PLAYING_SESSION_STATE: Self = Self(9600);
+    pub const CLIENT_ACCOUNT_INFO: Self = Self(768);
+    pub const CLIENT_EMAIL_ADDR_INFO: Self = Self(779);
+    pub const CLIENT_LICENSE_LIST: Self = Self(780);
+    pub const CLIENT_PICS_CHANGES_SINCE_REQUEST: Self = Self(8901);
+    pub const CLIENT_PICS_CHANGES_SINCE_RESPONSE: Self = Self(8902);
+    pub const CLIENT_PICS_PRODUCT_INFO_REQUEST: Self = Self(8903);
+    pub const CLIENT_PICS_PRODUCT_INFO_RESPONSE: Self = Self(8904);
+    pub const CLIENT_PICS_ACCESS_TOKEN_REQUEST: Self = Self(8905);
+    pub const CLIENT_PICS_ACCESS_TOKEN_RESPONSE: Self = Self(8906);
+    pub const CLIENT_GET_APP_OWNERSHIP_TICKET: Self = Self(857);
+    pub const CLIENT_GET_APP_OWNERSHIP_TICKET_RESPONSE: Self = Self(858);
+    pub const CLIENT_REQUEST_ENCRYPTED_APP_TICKET: Self = Self(5526);
+    pub const CLIENT_REQUEST_ENCRYPTED_APP_TICKET_RESPONSE: Self = Self(5527);
+    pub const CLIENT_GET_DEPOT_DECRYPTION_KEY: Self = Self(5438);
+    pub const CLIENT_GET_DEPOT_DECRYPTION_KEY_RESPONSE: Self = Self(5439);
+    pub const CLIENT_GET_USER_STATS: Self = Self(818);
+    pub const CLIENT_GET_USER_STATS_RESPONSE: Self = Self(819);
+    pub const CLIENT_STORE_USER_STATS_2: Self = Self(5466);
+    pub const SERVICE_METHOD: Self = Self(146);
+    pub const SERVICE_METHOD_CALL_FROM_CLIENT: Self = Self(151);
+    pub const SERVICE_METHOD_RESPONSE: Self = Self(147);
+    pub const SERVICE_METHOD_SEND_TO_CLIENT: Self = Self(152);
+    pub const SERVICE_METHOD_CALL_FROM_CLIENT_NON_AUTHED: Self = Self(9804);
+    pub const CLIENT_MMS_CREATE_LOBBY: Self = Self(6601);
+    pub const CLIENT_MMS_CREATE_LOBBY_RESPONSE: Self = Self(6602);
+    pub const CLIENT_MMS_JOIN_LOBBY: Self = Self(6603);
+    pub const CLIENT_MMS_JOIN_LOBBY_RESPONSE: Self = Self(6604);
+    pub const CLIENT_MMS_LEAVE_LOBBY: Self = Self(6605);
+    pub const CLIENT_MMS_LEAVE_LOBBY_RESPONSE: Self = Self(6606);
+    pub const CLIENT_MMS_GET_LOBBY_LIST: Self = Self(6607);
+    pub const CLIENT_MMS_GET_LOBBY_LIST_RESPONSE: Self = Self(6608);
+    pub const CLIENT_MMS_SET_LOBBY_DATA: Self = Self(6609);
+    pub const CLIENT_MMS_SET_LOBBY_DATA_RESPONSE: Self = Self(6610);
+    pub const CLIENT_MMS_GET_LOBBY_DATA: Self = Self(6611);
+    pub const CLIENT_MMS_LOBBY_DATA: Self = Self(6612);
+    pub const CLIENT_MMS_SEND_LOBBY_CHAT_MSG: Self = Self(6613);
+    pub const CLIENT_MMS_LOBBY_CHAT_MSG: Self = Self(6614);
+    pub const CLIENT_MMS_SET_LOBBY_OWNER: Self = Self(6615);
+    pub const CLIENT_MMS_SET_LOBBY_OWNER_RESPONSE: Self = Self(6616);
+    pub const CLIENT_MMS_SET_LOBBY_GAME_SERVER: Self = Self(6617);
+    pub const CLIENT_MMS_LOBBY_GAME_SERVER_SET: Self = Self(6618);
+    pub const CLIENT_MMS_USER_JOINED_LOBBY: Self = Self(6619);
+    pub const CLIENT_MMS_USER_LEFT_LOBBY: Self = Self(6620);
+    pub const CLIENT_MMS_INVITE_TO_LOBBY: Self = Self(6621);
+    pub const CLIENT_MMS_GET_LOBBY_STATUS: Self = Self(6626);
+    pub const CLIENT_MMS_GET_LOBBY_STATUS_RESPONSE: Self = Self(6627);
+}
+
+pub const EMSG_PROTO_FLAG: u32 = 0x8000_0000;
+pub const EMSG_MASK: u32 = 0x7fff_ffff;
+
+pub const fn has_proto_flag(raw: u32) -> bool {
+    (raw & EMSG_PROTO_FLAG) != 0
+}
+
+pub const fn strip_proto_flag(raw: u32) -> EMsg {
+    EMsg(raw & EMSG_MASK)
+}
+
+pub const fn with_proto_flag(msg: EMsg) -> u32 {
+    msg.0 | EMSG_PROTO_FLAG
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
+#[repr(u32)]
+pub enum EUniverse {
+    #[default]
+    Invalid = 0,
+    Public = 1,
+    Beta = 2,
+    Internal = 3,
+    Dev = 4,
+    Max = 5,
+}
+
+impl EUniverse {
+    pub fn from_u32(v: u32) -> Option<Self> {
+        match v {
+            1 => Some(Self::Public),
+            2 => Some(Self::Beta),
+            3 => Some(Self::Internal),
+            4 => Some(Self::Dev),
+            5 => Some(Self::Max),
+            _ => None,
+        }
+    }
+
+    pub fn is_valid_universe(self) -> bool {
+        matches!(self, Self::Public | Self::Beta | Self::Internal | Self::Dev)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn universe_values_match_cpp_enum() {
+        assert_eq!(EUniverse::Invalid as u32, 0);
+        assert_eq!(EUniverse::Public as u32, 1);
+        assert_eq!(EUniverse::Beta as u32, 2);
+        assert_eq!(EUniverse::Internal as u32, 3);
+        assert_eq!(EUniverse::Dev as u32, 4);
+        assert_eq!(EUniverse::Max as u32, 5);
+        assert!(!EUniverse::Max.is_valid_universe());
+        assert!(EUniverse::Public.is_valid_universe());
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/encrypted_channel.rs b/app/src/main/cpp/wn-steam-client/rust/src/encrypted_channel.rs
new file mode 100644
index 000000000..253301ed3
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/encrypted_channel.rs
@@ -0,0 +1,466 @@
+use crate::crypto::{
+    aes256_cbc_decrypt, aes256_cbc_encrypt, aes256_ecb_decrypt_block, aes256_ecb_encrypt_block,
+    hmac_sha1, secure_random_bytes, AesBlock, SecureSessionKey, SessionKey, AES_BLOCK_BYTES,
+    HMAC_KEY_LENGTH,
+};
+use crate::transport::{Transport, TransportDisconnectReason};
+use std::sync::atomic::{AtomicU8, Ordering};
+use std::sync::{Arc, Mutex};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(u8)]
+pub enum ChannelState {
+    Disconnected,
+    Connected,
+    Challenged,
+    Encrypted,
+    Closing,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(u8)]
+pub enum ChannelDisconnectReason {
+    UserInitiated,
+    TransportError,
+    HandshakeProtocolError,
+    HandshakeFailed,
+    EnvelopeDecryptFailed,
+    HmacMismatch,
+}
+
+type MessageCallback = Box<dyn Fn(&[u8]) + Send + Sync + 'static>;
+type ConnectedCallback = Box<dyn Fn() + Send + Sync + 'static>;
+type DisconnectedCallback = Box<dyn Fn(ChannelDisconnectReason, &str) + Send + Sync + 'static>;
+
+pub struct EncryptedChannel {
+    inner: Arc<EncryptedChannelInner>,
+    transport: Mutex<Box<dyn Transport>>,
+}
+
+struct EncryptedChannelInner {
+    state: AtomicU8,
+    on_message: Mutex<Option<MessageCallback>>,
+    on_connected: Mutex<Option<ConnectedCallback>>,
+    on_disconnected: Mutex<Option<DisconnectedCallback>>,
+}
+
+impl Default for EncryptedChannelInner {
+    fn default() -> Self {
+        Self {
+            state: AtomicU8::new(ChannelState::Disconnected as u8),
+            on_message: Mutex::new(None),
+            on_connected: Mutex::new(None),
+            on_disconnected: Mutex::new(None),
+        }
+    }
+}
+
+impl EncryptedChannel {
+    pub fn new(mut transport: Box<dyn Transport>) -> Self {
+        let inner = Arc::new(EncryptedChannelInner::default());
+
+        let weak = Arc::downgrade(&inner);
+        transport.set_on_connected(Box::new(move || {
+            if let Some(inner) = weak.upgrade() {
+                inner
+                    .state
+                    .store(ChannelState::Encrypted as u8, Ordering::Release);
+                if let Some(callback) = inner
+                    .on_connected
+                    .lock()
+                    .expect("encrypted channel callback poisoned")
+                    .as_ref()
+                {
+                    callback();
+                }
+            }
+        }));
+
+        let weak = Arc::downgrade(&inner);
+        transport.set_on_disconnected(Box::new(move |reason, detail| {
+            if let Some(inner) = weak.upgrade() {
+                inner
+                    .state
+                    .store(ChannelState::Disconnected as u8, Ordering::Release);
+                let reason = match reason {
+                    TransportDisconnectReason::UserInitiated => {
+                        ChannelDisconnectReason::UserInitiated
+                    }
+                    _ => ChannelDisconnectReason::TransportError,
+                };
+                if let Some(callback) = inner
+                    .on_disconnected
+                    .lock()
+                    .expect("encrypted channel callback poisoned")
+                    .as_ref()
+                {
+                    callback(reason, detail);
+                }
+            }
+        }));
+
+        let weak = Arc::downgrade(&inner);
+        transport.set_on_message(Box::new(move |bytes| {
+            if let Some(inner) = weak.upgrade() {
+                if inner.state() != ChannelState::Encrypted {
+                    return;
+                }
+                if let Some(callback) = inner
+                    .on_message
+                    .lock()
+                    .expect("encrypted channel callback poisoned")
+                    .as_ref()
+                {
+                    callback(bytes);
+                }
+            }
+        }));
+
+        Self {
+            inner,
+            transport: Mutex::new(transport),
+        }
+    }
+
+    pub fn connect(&self, url: &str) -> bool {
+        if self
+            .inner
+            .state
+            .compare_exchange(
+                ChannelState::Disconnected as u8,
+                ChannelState::Connected as u8,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .is_err()
+        {
+            return false;
+        }
+        if !self
+            .transport
+            .lock()
+            .expect("encrypted channel transport poisoned")
+            .connect(url)
+        {
+            self.inner
+                .state
+                .store(ChannelState::Disconnected as u8, Ordering::Release);
+            return false;
+        }
+        true
+    }
+
+    pub fn send(&self, plaintext: &[u8]) -> bool {
+        if self.state() != ChannelState::Encrypted {
+            return false;
+        }
+        self.transport
+            .lock()
+            .expect("encrypted channel transport poisoned")
+            .send(plaintext)
+    }
+
+    pub fn disconnect(&self) {
+        if self.state() == ChannelState::Disconnected {
+            return;
+        }
+        self.inner
+            .state
+            .store(ChannelState::Closing as u8, Ordering::Release);
+        self.transport
+            .lock()
+            .expect("encrypted channel transport poisoned")
+            .disconnect();
+    }
+
+    pub fn state(&self) -> ChannelState {
+        self.inner.state()
+    }
+
+    pub fn set_ca_bundle_path(&self, path: &str) {
+        self.transport
+            .lock()
+            .expect("encrypted channel transport poisoned")
+            .set_ca_bundle_path(path);
+    }
+
+    pub fn set_on_message<F>(&self, callback: F)
+    where
+        F: Fn(&[u8]) + Send + Sync + 'static,
+    {
+        *self
+            .inner
+            .on_message
+            .lock()
+            .expect("encrypted channel callback poisoned") = Some(Box::new(callback));
+    }
+
+    pub fn set_on_connected<F>(&self, callback: F)
+    where
+        F: Fn() + Send + Sync + 'static,
+    {
+        *self
+            .inner
+            .on_connected
+            .lock()
+            .expect("encrypted channel callback poisoned") = Some(Box::new(callback));
+    }
+
+    pub fn set_on_disconnected<F>(&self, callback: F)
+    where
+        F: Fn(ChannelDisconnectReason, &str) + Send + Sync + 'static,
+    {
+        *self
+            .inner
+            .on_disconnected
+            .lock()
+            .expect("encrypted channel callback poisoned") = Some(Box::new(callback));
+    }
+}
+
+impl Drop for EncryptedChannel {
+    fn drop(&mut self) {
+        self.disconnect();
+    }
+}
+
+impl EncryptedChannelInner {
+    fn state(&self) -> ChannelState {
+        match self.state.load(Ordering::Acquire) {
+            1 => ChannelState::Connected,
+            2 => ChannelState::Challenged,
+            3 => ChannelState::Encrypted,
+            4 => ChannelState::Closing,
+            _ => ChannelState::Disconnected,
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct EncryptedEnvelope {
+    session_key: SecureSessionKey,
+    hmac_key: [u8; HMAC_KEY_LENGTH],
+}
+
+impl EncryptedEnvelope {
+    pub fn new(session_key: SessionKey) -> Self {
+        let mut hmac_key = [0u8; HMAC_KEY_LENGTH];
+        hmac_key.copy_from_slice(&session_key[..HMAC_KEY_LENGTH]);
+        Self {
+            session_key: SecureSessionKey::new(session_key),
+            hmac_key,
+        }
+    }
+
+    pub fn encrypt(&self, plaintext: &[u8]) -> Option<Vec<u8>> {
+        let mut random_iv = [0u8; AES_BLOCK_BYTES - 4];
+        if !secure_random_bytes(&mut random_iv) {
+            return None;
+        }
+        self.encrypt_with_random_iv(plaintext, random_iv)
+    }
+
+    fn encrypt_with_random_iv(
+        &self,
+        plaintext: &[u8],
+        random_iv: [u8; AES_BLOCK_BYTES - 4],
+    ) -> Option<Vec<u8>> {
+        let mut hmac_input = Vec::with_capacity(random_iv.len() + plaintext.len());
+        hmac_input.extend_from_slice(&random_iv);
+        hmac_input.extend_from_slice(plaintext);
+        let hmac = hmac_sha1(&self.hmac_key, &hmac_input)?;
+
+        let mut iv_plaintext = [0u8; AES_BLOCK_BYTES];
+        iv_plaintext[..4].copy_from_slice(&hmac[..4]);
+        iv_plaintext[4..].copy_from_slice(&random_iv);
+
+        let iv_ciphertext = aes256_ecb_encrypt_block(&self.session_key.bytes, &iv_plaintext)?;
+        let body = aes256_cbc_encrypt(&self.session_key.bytes, &iv_plaintext, plaintext)?;
+
+        let mut out = Vec::with_capacity(AES_BLOCK_BYTES + body.len());
+        out.extend_from_slice(&iv_ciphertext);
+        out.extend_from_slice(&body);
+        Some(out)
+    }
+
+    pub fn decrypt(&self, wire: &[u8]) -> Option<Vec<u8>> {
+        if wire.len() < AES_BLOCK_BYTES * 2 {
+            return None;
+        }
+        let iv_ciphertext: AesBlock = wire[..AES_BLOCK_BYTES].try_into().ok()?;
+        let iv_plaintext = aes256_ecb_decrypt_block(&self.session_key.bytes, &iv_ciphertext)?;
+        let plaintext = aes256_cbc_decrypt(
+            &self.session_key.bytes,
+            &iv_plaintext,
+            &wire[AES_BLOCK_BYTES..],
+        )?;
+
+        let mut hmac_input = Vec::with_capacity((AES_BLOCK_BYTES - 4) + plaintext.len());
+        hmac_input.extend_from_slice(&iv_plaintext[4..]);
+        hmac_input.extend_from_slice(&plaintext);
+        let expected = hmac_sha1(&self.hmac_key, &hmac_input)?;
+        ct_equal(&iv_plaintext[..4], &expected[..4]).then_some(plaintext)
+    }
+}
+
+fn ct_equal(a: &[u8], b: &[u8]) -> bool {
+    if a.len() != b.len() {
+        return false;
+    }
+    let mut diff = 0u8;
+    for (x, y) in a.iter().zip(b.iter()) {
+        diff |= x ^ y;
+    }
+    diff == 0
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::transport::TransportState;
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::mpsc;
+
+    #[test]
+    fn envelope_roundtrips_with_fixed_iv() {
+        let key = [7u8; 32];
+        let env = EncryptedEnvelope::new(key);
+        let encrypted = env
+            .encrypt_with_random_iv(b"hello steam", [3u8; AES_BLOCK_BYTES - 4])
+            .unwrap();
+        assert_ne!(encrypted, b"hello steam");
+        assert_eq!(env.decrypt(&encrypted).unwrap(), b"hello steam");
+    }
+
+    #[test]
+    fn envelope_rejects_hmac_mismatch() {
+        let env = EncryptedEnvelope::new([7u8; 32]);
+        let mut encrypted = env
+            .encrypt_with_random_iv(b"hello steam", [3u8; AES_BLOCK_BYTES - 4])
+            .unwrap();
+        let last = encrypted.last_mut().unwrap();
+        *last ^= 0x55;
+        assert!(env.decrypt(&encrypted).is_none());
+    }
+
+    #[test]
+    fn websocket_channel_skips_app_layer_handshake() {
+        let shared = Arc::new(MockTransportState::default());
+        let channel = EncryptedChannel::new(Box::new(MockTransport {
+            shared: Arc::clone(&shared),
+        }));
+        let connected = Arc::new(AtomicBool::new(false));
+        let connected_cb = Arc::clone(&connected);
+        let (tx, rx) = mpsc::channel();
+        channel.set_on_connected(move || {
+            connected_cb.store(true, Ordering::SeqCst);
+        });
+        channel.set_on_message(move |bytes| {
+            tx.send(bytes.to_vec()).unwrap();
+        });
+
+        assert!(channel.connect("wss://cm.example.com:443/cmsocket/"));
+        assert_eq!(channel.state(), ChannelState::Connected);
+        shared.fire_connected();
+        assert_eq!(channel.state(), ChannelState::Encrypted);
+        assert!(connected.load(Ordering::SeqCst));
+
+        assert!(channel.send(b"client hello"));
+        assert_eq!(shared.sent.lock().unwrap()[0], b"client hello");
+
+        shared.fire_message(b"server frame");
+        assert_eq!(rx.recv().unwrap(), b"server frame");
+    }
+
+    #[test]
+    fn channel_maps_transport_disconnect_reasons() {
+        let shared = Arc::new(MockTransportState::default());
+        let channel = EncryptedChannel::new(Box::new(MockTransport {
+            shared: Arc::clone(&shared),
+        }));
+        let (tx, rx) = mpsc::channel();
+        channel.set_on_disconnected(move |reason, detail| {
+            tx.send((reason, detail.to_string())).unwrap();
+        });
+        assert!(channel.connect("wss://cm.example.com:443/cmsocket/"));
+        shared.fire_connected();
+        shared.fire_disconnected(TransportDisconnectReason::NetworkError, "net down");
+        assert_eq!(
+            rx.recv().unwrap(),
+            (
+                ChannelDisconnectReason::TransportError,
+                "net down".to_string()
+            )
+        );
+        assert_eq!(channel.state(), ChannelState::Disconnected);
+    }
+
+    #[derive(Default)]
+    struct MockTransportState {
+        connected: Mutex<Option<crate::transport::ConnectedCallback>>,
+        disconnected: Mutex<Option<crate::transport::DisconnectedCallback>>,
+        message: Mutex<Option<crate::transport::MessageCallback>>,
+        sent: Mutex<Vec<Vec<u8>>>,
+        ca_bundle_path: Mutex<String>,
+    }
+
+    impl MockTransportState {
+        fn fire_connected(&self) {
+            if let Some(callback) = self.connected.lock().unwrap().as_ref() {
+                callback();
+            }
+        }
+
+        fn fire_disconnected(&self, reason: TransportDisconnectReason, detail: &str) {
+            if let Some(callback) = self.disconnected.lock().unwrap().as_ref() {
+                callback(reason, detail);
+            }
+        }
+
+        fn fire_message(&self, bytes: &[u8]) {
+            if let Some(callback) = self.message.lock().unwrap().as_ref() {
+                callback(bytes);
+            }
+        }
+    }
+
+    struct MockTransport {
+        shared: Arc<MockTransportState>,
+    }
+
+    impl Transport for MockTransport {
+        fn connect(&mut self, _url: &str) -> bool {
+            true
+        }
+
+        fn send(&mut self, data: &[u8]) -> bool {
+            self.shared.sent.lock().unwrap().push(data.to_vec());
+            true
+        }
+
+        fn disconnect(&mut self) {}
+
+        fn state(&self) -> TransportState {
+            TransportState::Connected
+        }
+
+        fn set_on_message(&mut self, cb: Box<dyn Fn(&[u8]) + Send + Sync>) {
+            *self.shared.message.lock().unwrap() = Some(cb);
+        }
+
+        fn set_on_connected(&mut self, cb: Box<dyn Fn() + Send + Sync>) {
+            *self.shared.connected.lock().unwrap() = Some(cb);
+        }
+
+        fn set_on_disconnected(
+            &mut self,
+            cb: Box<dyn Fn(TransportDisconnectReason, &str) + Send + Sync>,
+        ) {
+            *self.shared.disconnected.lock().unwrap() = Some(cb);
+        }
+
+        fn set_ca_bundle_path(&mut self, path: &str) {
+            *self.shared.ca_bundle_path.lock().unwrap() = path.to_string();
+        }
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/handshake_messages.rs b/app/src/main/cpp/wn-steam-client/rust/src/handshake_messages.rs
new file mode 100644
index 000000000..9df1b0416
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/handshake_messages.rs
@@ -0,0 +1,192 @@
+use crate::emsg::{has_proto_flag, strip_proto_flag, EMsg, EUniverse};
+use crate::wire_format;
+
+pub const INVALID_JOB_ID: u64 = u64::MAX;
+pub const MSG_HDR_BYTES: usize = 20;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct MsgHdr {
+    pub msg: EMsg,
+    pub target_job_id: u64,
+    pub source_job_id: u64,
+}
+
+impl Default for MsgHdr {
+    fn default() -> Self {
+        Self {
+            msg: EMsg::INVALID,
+            target_job_id: INVALID_JOB_ID,
+            source_job_id: INVALID_JOB_ID,
+        }
+    }
+}
+
+impl MsgHdr {
+    pub fn serialize(&self, out: &mut Vec<u8>) {
+        let mut writer = wire_format::Writer::new(out);
+        writer.u32(self.msg.0);
+        writer.u64(self.target_job_id);
+        writer.u64(self.source_job_id);
+    }
+
+    pub fn deserialize(input: &[u8]) -> Option<(Self, usize)> {
+        if input.len() < MSG_HDR_BYTES {
+            return None;
+        }
+        let mut reader = wire_format::Reader::new(&input[..MSG_HDR_BYTES]);
+        let raw_msg = reader.u32();
+        if has_proto_flag(raw_msg) {
+            return None;
+        }
+        let hdr = Self {
+            msg: strip_proto_flag(raw_msg),
+            target_job_id: reader.u64(),
+            source_job_id: reader.u64(),
+        };
+        reader.ok().then_some((hdr, MSG_HDR_BYTES))
+    }
+}
+
+pub const CHANNEL_ENCRYPT_PROTOCOL_VERSION: u32 = 1;
+pub const CHANNEL_ENCRYPT_REQUEST_FIXED_BODY: usize = 8;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct MsgChannelEncryptRequest {
+    pub protocol_version: u32,
+    pub universe: EUniverse,
+    pub challenge: Vec<u8>,
+}
+
+impl Default for MsgChannelEncryptRequest {
+    fn default() -> Self {
+        Self {
+            protocol_version: CHANNEL_ENCRYPT_PROTOCOL_VERSION,
+            universe: EUniverse::Invalid,
+            challenge: Vec::new(),
+        }
+    }
+}
+
+impl MsgChannelEncryptRequest {
+    pub fn deserialize_body(body: &[u8]) -> Option<Self> {
+        if body.len() < CHANNEL_ENCRYPT_REQUEST_FIXED_BODY {
+            return None;
+        }
+        let mut reader = wire_format::Reader::new(body);
+        let protocol_version = reader.u32();
+        let universe = EUniverse::from_u32(reader.u32())?;
+        if !reader.ok() {
+            return None;
+        }
+        let challenge = body[CHANNEL_ENCRYPT_REQUEST_FIXED_BODY..].to_vec();
+        Some(Self {
+            protocol_version,
+            universe,
+            challenge,
+        })
+    }
+}
+
+pub const RSA_1024_CIPHER_BYTES: usize = 128;
+pub const CHANNEL_ENCRYPT_RESPONSE_BODY_BYTES: usize = 144;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct MsgChannelEncryptResponse {
+    pub protocol_version: u32,
+    pub key_size: u32,
+    pub encrypted_handshake_blob: [u8; RSA_1024_CIPHER_BYTES],
+    pub key_crc: u32,
+    pub unknown_zero: u32,
+}
+
+impl Default for MsgChannelEncryptResponse {
+    fn default() -> Self {
+        Self {
+            protocol_version: CHANNEL_ENCRYPT_PROTOCOL_VERSION,
+            key_size: RSA_1024_CIPHER_BYTES as u32,
+            encrypted_handshake_blob: [0; RSA_1024_CIPHER_BYTES],
+            key_crc: 0,
+            unknown_zero: 0,
+        }
+    }
+}
+
+impl MsgChannelEncryptResponse {
+    pub fn serialize_body(&self, out: &mut Vec<u8>) {
+        let mut writer = wire_format::Writer::new(out);
+        writer.u32(self.protocol_version);
+        writer.u32(self.key_size);
+        writer.bytes(&self.encrypted_handshake_blob);
+        writer.u32(self.key_crc);
+        writer.u32(self.unknown_zero);
+    }
+}
+
+pub const CHANNEL_ENCRYPT_RESULT_BODY_BYTES: usize = 4;
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct MsgChannelEncryptResult {
+    pub result: u32,
+}
+
+impl MsgChannelEncryptResult {
+    pub fn deserialize_body(body: &[u8]) -> Option<Self> {
+        if body.len() < CHANNEL_ENCRYPT_RESULT_BODY_BYTES {
+            return None;
+        }
+        let mut reader = wire_format::Reader::new(body);
+        let result = reader.u32();
+        reader.ok().then_some(Self { result })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::emsg::with_proto_flag;
+
+    #[test]
+    fn msg_hdr_roundtrips_and_rejects_proto_flag() {
+        let hdr = MsgHdr {
+            msg: EMsg::CHANNEL_ENCRYPT_REQUEST,
+            target_job_id: 7,
+            source_job_id: 9,
+        };
+        let mut bytes = Vec::new();
+        hdr.serialize(&mut bytes);
+        assert_eq!(bytes.len(), MSG_HDR_BYTES);
+        assert_eq!(MsgHdr::deserialize(&bytes), Some((hdr, MSG_HDR_BYTES)));
+
+        bytes[..4].copy_from_slice(&with_proto_flag(EMsg::CHANNEL_ENCRYPT_REQUEST).to_le_bytes());
+        assert_eq!(MsgHdr::deserialize(&bytes), None);
+    }
+
+    #[test]
+    fn channel_encrypt_request_parses_challenge() {
+        let mut body = Vec::new();
+        let mut writer = wire_format::Writer::new(&mut body);
+        writer.u32(1);
+        writer.u32(EUniverse::Public as u32);
+        writer.bytes(&[0xaa; 16]);
+        let msg = MsgChannelEncryptRequest::deserialize_body(&body).unwrap();
+        assert_eq!(msg.protocol_version, 1);
+        assert_eq!(msg.universe, EUniverse::Public);
+        assert_eq!(msg.challenge, vec![0xaa; 16]);
+    }
+
+    #[test]
+    fn channel_encrypt_response_is_144_bytes() {
+        let msg = MsgChannelEncryptResponse {
+            key_crc: 0xfeed_beef,
+            ..Default::default()
+        };
+        let mut body = Vec::new();
+        msg.serialize_body(&mut body);
+        assert_eq!(body.len(), CHANNEL_ENCRYPT_RESPONSE_BODY_BYTES);
+        assert_eq!(&body[0..4], &1u32.to_le_bytes());
+        assert_eq!(
+            &body[8 + RSA_1024_CIPHER_BYTES..12 + RSA_1024_CIPHER_BYTES],
+            &0xfeed_beefu32.to_le_bytes()
+        );
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/heartbeat.rs b/app/src/main/cpp/wn-steam-client/rust/src/heartbeat.rs
new file mode 100644
index 000000000..681d8adf8
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/heartbeat.rs
@@ -0,0 +1,126 @@
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Condvar, Mutex};
+use std::thread::{self, JoinHandle};
+use std::time::Duration;
+use std::{panic, panic::AssertUnwindSafe};
+
+#[derive(Default)]
+pub struct Heartbeat {
+    running: Arc<AtomicBool>,
+    stop: Arc<(Mutex<bool>, Condvar)>,
+    worker: Option<JoinHandle<()>>,
+}
+
+impl Heartbeat {
+    pub fn start<F>(&mut self, interval: Duration, cb: F) -> bool
+    where
+        F: Fn() + Send + 'static,
+    {
+        if interval.is_zero() {
+            return false;
+        }
+        self.stop();
+        self.running.store(true, Ordering::Relaxed);
+        {
+            let (mu, _) = &*self.stop;
+            *mu.lock().expect("heartbeat poisoned") = false;
+        }
+        let running = Arc::clone(&self.running);
+        let stop = Arc::clone(&self.stop);
+        self.worker = Some(thread::spawn(move || run_loop(interval, cb, running, stop)));
+        true
+    }
+
+    pub fn stop(&mut self) {
+        if !self.running.load(Ordering::Relaxed) {
+            return;
+        }
+        let (mu, cv) = &*self.stop;
+        *mu.lock().expect("heartbeat poisoned") = true;
+        cv.notify_all();
+        if let Some(worker) = self.worker.take() {
+            let _ = worker.join();
+        }
+        self.running.store(false, Ordering::Relaxed);
+    }
+
+    pub fn running(&self) -> bool {
+        self.running.load(Ordering::Relaxed)
+    }
+}
+
+impl Drop for Heartbeat {
+    fn drop(&mut self) {
+        self.stop();
+    }
+}
+
+fn run_loop<F>(
+    interval: Duration,
+    cb: F,
+    running: Arc<AtomicBool>,
+    stop: Arc<(Mutex<bool>, Condvar)>,
+) where
+    F: Fn() + Send + 'static,
+{
+    let (mu, cv) = &*stop;
+    loop {
+        let guard = mu.lock().expect("heartbeat poisoned");
+        let (guard, _) = cv
+            .wait_timeout_while(guard, interval, |stop_requested| !*stop_requested)
+            .expect("heartbeat poisoned");
+        if *guard {
+            return;
+        }
+        drop(guard);
+        let _ = panic::catch_unwind(AssertUnwindSafe(&cb));
+        if !running.load(Ordering::Relaxed) {
+            return;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    #[test]
+    fn rejects_zero_interval() {
+        let mut hb = Heartbeat::default();
+        assert!(!hb.start(Duration::ZERO, || {}));
+        assert!(!hb.running());
+    }
+
+    #[test]
+    fn ticks_and_stops() {
+        let ticks = Arc::new(AtomicUsize::new(0));
+        let tick_copy = Arc::clone(&ticks);
+        let mut hb = Heartbeat::default();
+        assert!(hb.start(Duration::from_millis(10), move || {
+            tick_copy.fetch_add(1, Ordering::Relaxed);
+        }));
+        thread::sleep(Duration::from_millis(35));
+        hb.stop();
+        assert!(ticks.load(Ordering::Relaxed) > 0);
+        assert!(!hb.running());
+    }
+
+    #[test]
+    fn callback_panic_does_not_stop_worker() {
+        let ticks = Arc::new(AtomicUsize::new(0));
+        let tick_copy = Arc::clone(&ticks);
+        let (tx, rx) = std::sync::mpsc::channel();
+        let mut hb = Heartbeat::default();
+        assert!(hb.start(Duration::from_millis(10), move || {
+            let n = tick_copy.fetch_add(1, Ordering::Relaxed);
+            if n == 0 {
+                panic!("first heartbeat panic");
+            }
+            tx.send(()).unwrap();
+        }));
+        rx.recv_timeout(Duration::from_secs(1)).unwrap();
+        hb.stop();
+        assert!(ticks.load(Ordering::Relaxed) > 1);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/jni.rs b/app/src/main/cpp/wn-steam-client/rust/src/jni.rs
new file mode 100644
index 000000000..e2e470140
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/jni.rs
@@ -0,0 +1,4549 @@
+use crate::auth_session::{
+    apply_account_name_fallback, auth_result_from_poll, build_credentials_begin_request,
+    build_guard_code_request, build_password_rsa_request, build_poll_request,
+    build_qr_begin_request, choose_guard_confirmation,
+    pending_credentials_from_begin_response, pending_qr_from_begin_response, sleep_slices,
+    take_qr_remote_interaction, AuthSessionResult, CredentialsAuthConfig, QrAuthConfig,
+};
+use crate::cm_bridge;
+use crate::cm_client::{CMClientCore, ClientState, OutboundProtoMessage, OutboundServiceCall};
+use crate::cm_runtime::CMClientRuntime;
+use crate::emsg::EMsg;
+use crate::encrypted_channel::{ChannelDisconnectReason, EncryptedChannel};
+use crate::version;
+use crate::wine_bridge::{WineBridge, WineBridgeConfig};
+use crate::ws_connection::WsConnection;
+use jni::objects::{
+    GlobalRef, JByteArray, JClass, JIntArray, JLongArray, JObject, JString, JValue,
+};
+use jni::sys::{
+    jboolean, jbyteArray, jint, jlong, jlongArray, jstring, JNI_FALSE, JNI_TRUE, JNI_VERSION_1_6,
+};
+use jni::{JNIEnv, JavaVM};
+use serde_json::json;
+#[cfg(target_os = "android")]
+use std::ffi::CString;
+use std::ptr;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::mpsc;
+use std::sync::OnceLock;
+use std::sync::{Arc, Mutex};
+use std::thread;
+use std::time::Duration;
+
+#[cfg(target_os = "android")]
+#[link(name = "log")]
+unsafe extern "C" {
+    fn __android_log_write(prio: i32, tag: *const i8, text: *const i8) -> i32;
+}
+
+fn android_log(tag: &str, message: &str) {
+    #[cfg(target_os = "android")]
+    {
+        let Ok(tag) = CString::new(tag) else {
+            return;
+        };
+        let sanitized = message.replace('\0', " ");
+        let Ok(text) = CString::new(sanitized) else {
+            return;
+        };
+        unsafe {
+            let _ = __android_log_write(4, tag.as_ptr().cast(), text.as_ptr().cast());
+        }
+    }
+    #[cfg(not(target_os = "android"))]
+    {
+        let _ = (tag, message);
+    }
+}
+
+fn qr_log(message: &str) {
+    android_log("WnSteamQr", message);
+}
+
+struct WnConnectionHandle {
+    channel: EncryptedChannel,
+    observer: Mutex<Option<GlobalRef>>,
+}
+
+struct WnSteamSessionHandle {
+    core: Arc<CMClientCore>,
+    ca_bundle_path: String,
+    auto_populate_library: bool,
+    wine_bridge: WineBridge,
+    runtime: Mutex<Option<Arc<CMClientRuntime>>>,
+    login_cancel: Mutex<Option<Arc<AtomicBool>>>,
+    download_cancel: Arc<AtomicBool>,
+    state_observer: Arc<Mutex<Option<GlobalRef>>>,
+    library_observer: Arc<Mutex<Option<GlobalRef>>>,
+    library_observer_installed: Mutex<bool>,
+}
+
+impl WnConnectionHandle {
+    fn new() -> Self {
+        Self {
+            channel: EncryptedChannel::new(Box::new(WsConnection::new())),
+            observer: Mutex::new(None),
+        }
+    }
+}
+
+impl WnSteamSessionHandle {
+    fn new() -> Self {
+        let core = Arc::new(CMClientCore::default());
+        cm_bridge::set_active_core(Arc::clone(&core));
+        Self {
+            core,
+            ca_bundle_path: String::new(),
+            auto_populate_library: true,
+            wine_bridge: WineBridge::default(),
+            runtime: Mutex::new(None),
+            login_cancel: Mutex::new(None),
+            download_cancel: Arc::new(AtomicBool::new(false)),
+            state_observer: Arc::new(Mutex::new(None)),
+            library_observer: Arc::new(Mutex::new(None)),
+            library_observer_installed: Mutex::new(false),
+        }
+    }
+
+    fn enqueue_proto(&self, message: Option<OutboundProtoMessage>) -> bool {
+        let Some(message) = message else {
+            return false;
+        };
+        self.enqueue_wire(message.wire)
+    }
+
+    fn enqueue_wire(&self, wire: Vec<u8>) -> bool {
+        if wire.is_empty() {
+            return false;
+        }
+        if !self.core.enqueue_wire(wire) {
+            return false;
+        }
+        if let Some(runtime) = self
+            .runtime
+            .lock()
+            .expect("session runtime poisoned")
+            .as_ref()
+        {
+            runtime.flush_outbound();
+        }
+        true
+    }
+
+    fn runtime(&self) -> Arc<CMClientRuntime> {
+        let mut slot = self.runtime.lock().expect("session runtime poisoned");
+        if let Some(runtime) = slot.as_ref() {
+            return Arc::clone(runtime);
+        }
+        let runtime = CMClientRuntime::new(Arc::clone(&self.core), Box::new(WsConnection::new()));
+        if !self.ca_bundle_path.is_empty() {
+            runtime.set_ca_bundle_path(&self.ca_bundle_path);
+        }
+        let state_observer = Arc::clone(&self.state_observer);
+        runtime.set_on_state(move |state| {
+            dispatch_state_observer(&state_observer, state);
+        });
+        let client_message_observer = Arc::clone(&self.state_observer);
+        runtime.set_on_client_message(move |emsg, header, body| {
+            dispatch_client_message_observer(&client_message_observer, emsg, header.eresult, body);
+        });
+        self.install_library_observer();
+        *slot = Some(Arc::clone(&runtime));
+        runtime
+    }
+
+    fn install_library_observer(&self) {
+        let mut installed = self
+            .library_observer_installed
+            .lock()
+            .expect("library observer install flag poisoned");
+        if *installed {
+            return;
+        }
+        let observer = Arc::clone(&self.library_observer);
+        self.core.library().set_observer(move || {
+            dispatch_library_observer(&observer);
+        });
+        *installed = true;
+    }
+
+    fn connected_runtime(&self) -> Option<Arc<CMClientRuntime>> {
+        let runtime = self
+            .runtime
+            .lock()
+            .expect("session runtime poisoned")
+            .as_ref()
+            .cloned()?;
+        matches!(
+            self.core.state(),
+            ClientState::Connected | ClientState::LoggedOn
+        )
+        .then_some(runtime)
+    }
+
+    fn begin_login_cancel(&self) -> Arc<AtomicBool> {
+        let cancel = Arc::new(AtomicBool::new(false));
+        let mut slot = self.login_cancel.lock().expect("session login poisoned");
+        if let Some(previous) = slot.replace(Arc::clone(&cancel)) {
+            previous.store(true, Ordering::Relaxed);
+        }
+        cancel
+    }
+
+    fn cancel_login(&self) {
+        if let Some(cancel) = self
+            .login_cancel
+            .lock()
+            .expect("session login poisoned")
+            .take()
+        {
+            cancel.store(true, Ordering::Relaxed);
+        }
+    }
+}
+
+fn to_handle(handle: Box<WnConnectionHandle>) -> jlong {
+    Box::into_raw(handle) as isize as jlong
+}
+
+fn to_session_handle(handle: Box<WnSteamSessionHandle>) -> jlong {
+    Box::into_raw(handle) as isize as jlong
+}
+
+unsafe fn from_handle_mut(handle: jlong) -> Option<&'static mut WnConnectionHandle> {
+    if handle == 0 {
+        return None;
+    }
+    unsafe { (handle as *mut WnConnectionHandle).as_mut() }
+}
+
+unsafe fn from_session_handle_mut(handle: jlong) -> Option<&'static mut WnSteamSessionHandle> {
+    if handle == 0 {
+        return None;
+    }
+    unsafe { (handle as *mut WnSteamSessionHandle).as_mut() }
+}
+
+unsafe fn drop_handle(handle: jlong) {
+    if handle != 0 {
+        unsafe {
+            drop(Box::from_raw(handle as *mut WnConnectionHandle));
+        }
+    }
+}
+
+unsafe fn drop_session_handle(handle: jlong) {
+    if handle != 0 {
+        unsafe {
+            drop(Box::from_raw(handle as *mut WnSteamSessionHandle));
+        }
+        cm_bridge::clear_active_core();
+    }
+}
+
+static JVM: OnceLock<JavaVM> = OnceLock::new();
+static AUTH_RESULT_CLASS: OnceLock<GlobalRef> = OnceLock::new();
+
+fn ensure_auth_result_class(env: &mut JNIEnv) -> Option<&'static GlobalRef> {
+    if let Some(class) = AUTH_RESULT_CLASS.get() {
+        return Some(class);
+    }
+    let Ok(class) = env.find_class("com/winlator/cmod/feature/stores/steam/wnsteam/WnAuthResult")
+    else {
+        clear_pending_exception(env);
+        return None;
+    };
+    let Ok(class) = env.new_global_ref(class) else {
+        clear_pending_exception(env);
+        return None;
+    };
+    let _ = AUTH_RESULT_CLASS.set(class);
+    AUTH_RESULT_CLASS.get()
+}
+
+fn auth_result_jclass<'a>(class: &'a GlobalRef) -> JClass<'a> {
+    unsafe { JClass::from_raw(class.as_obj().as_raw() as _) }
+}
+
+fn new_string_or_null(env: &mut JNIEnv, value: &str) -> jstring {
+    env.new_string(value)
+        .map(|s| s.into_raw())
+        .unwrap_or(ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *mut std::ffi::c_void) -> jint {
+    let _ = JVM.set(vm);
+    JNI_VERSION_1_6
+}
+
+fn dispatch_connection_connected(observer: &GlobalRef) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let _ = env.call_method(observer.as_obj(), "onConnected", "()V", &[]);
+    clear_pending_exception(&mut env);
+}
+
+fn dispatch_connection_disconnected(
+    observer: &GlobalRef,
+    reason: ChannelDisconnectReason,
+    detail: &str,
+) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let Ok(detail) = env.new_string(detail) else {
+        clear_pending_exception(&mut env);
+        return;
+    };
+    let detail_obj = JObject::from(detail);
+    let _ = env.call_method(
+        observer.as_obj(),
+        "onDisconnected",
+        "(ILjava/lang/String;)V",
+        &[JValue::Int(reason as jint), JValue::Object(&detail_obj)],
+    );
+    clear_pending_exception(&mut env);
+}
+
+fn dispatch_state_observer(observer: &Arc<Mutex<Option<GlobalRef>>>, state: ClientState) {
+    let cloned = observer
+        .lock()
+        .expect("session state observer poisoned")
+        .as_ref()
+        .cloned();
+    let Some(observer) = cloned else {
+        return;
+    };
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let _ = env.call_method(
+        observer.as_obj(),
+        "onStateChanged",
+        "(I)V",
+        &[JValue::Int(state as jint)],
+    );
+    clear_pending_exception(&mut env);
+}
+
+fn dispatch_client_message_observer(
+    observer: &Arc<Mutex<Option<GlobalRef>>>,
+    emsg: EMsg,
+    eresult: i32,
+    body: &[u8],
+) {
+    let cloned = observer
+        .lock()
+        .expect("session state observer poisoned")
+        .as_ref()
+        .cloned();
+    let Some(observer) = cloned else {
+        return;
+    };
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let Ok(array) = env.byte_array_from_slice(body) else {
+        clear_pending_exception(&mut env);
+        return;
+    };
+    let array_obj = JObject::from(array);
+    let _ = env.call_method(
+        observer.as_obj(),
+        "onClientMessage",
+        "(II[B)V",
+        &[
+            JValue::Int(emsg.0 as jint),
+            JValue::Int(eresult),
+            JValue::Object(&array_obj),
+        ],
+    );
+    clear_pending_exception(&mut env);
+}
+
+fn dispatch_library_observer(observer: &Arc<Mutex<Option<GlobalRef>>>) {
+    let cloned = observer
+        .lock()
+        .expect("session library observer poisoned")
+        .as_ref()
+        .cloned();
+    let Some(observer) = cloned else {
+        return;
+    };
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let _ = env.call_method(observer.as_obj(), "onLibraryChanged", "()V", &[]);
+    clear_pending_exception(&mut env);
+}
+
+fn dispatch_connection_message(observer: &GlobalRef, bytes: &[u8]) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let Ok(array) = env.byte_array_from_slice(bytes) else {
+        clear_pending_exception(&mut env);
+        return;
+    };
+    let array_obj = JObject::from(array);
+    let _ = env.call_method(
+        observer.as_obj(),
+        "onMessage",
+        "([B)V",
+        &[JValue::Object(&array_obj)],
+    );
+    clear_pending_exception(&mut env);
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamClient_nativeVersion(
+    mut env: JNIEnv,
+    _class: JClass,
+) -> jstring {
+    new_string_or_null(&mut env, version::version().string)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeCreate(
+    _env: JNIEnv,
+    _class: JClass,
+) -> jlong {
+    to_handle(Box::new(WnConnectionHandle::new()))
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeDestroy(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    unsafe { drop_handle(handle) };
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeSetCaBundlePath(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    path: JString,
+) {
+    let Some(handle) = (unsafe { from_handle_mut(handle) }) else {
+        return;
+    };
+    let Ok(path) = env.get_string(&path) else {
+        return;
+    };
+    handle.channel.set_ca_bundle_path(&path.to_string_lossy());
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeSetObserver(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    observer: JObject,
+) {
+    let Some(handle) = (unsafe { from_handle_mut(handle) }) else {
+        return;
+    };
+    let observer = if observer.is_null() {
+        None
+    } else {
+        env.new_global_ref(observer).ok()
+    };
+    *handle
+        .observer
+        .lock()
+        .expect("connection observer poisoned") = observer.clone();
+
+    let Some(observer) = observer else {
+        handle.channel.set_on_connected(|| {});
+        handle.channel.set_on_disconnected(|_, _| {});
+        handle.channel.set_on_message(|_| {});
+        return;
+    };
+
+    let connected_observer = observer.clone();
+    handle.channel.set_on_connected(move || {
+        dispatch_connection_connected(&connected_observer);
+    });
+    let disconnected_observer = observer.clone();
+    handle.channel.set_on_disconnected(move |reason, detail| {
+        dispatch_connection_disconnected(&disconnected_observer, reason, detail);
+    });
+    handle.channel.set_on_message(move |bytes| {
+        dispatch_connection_message(&observer, bytes);
+    });
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeConnect(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    url: JString,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let Ok(url) = env.get_string(&url) else {
+        return JNI_FALSE;
+    };
+    if handle.channel.connect(&url.to_string_lossy()) {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeDisconnect(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_handle_mut(handle) } {
+        handle.channel.disconnect();
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnConnection_nativeSend(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    data: JByteArray,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let Ok(bytes) = env.convert_byte_array(data) else {
+        return JNI_FALSE;
+    };
+    if handle.channel.send(&bytes) {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+pub fn empty_byte_array(env: JNIEnv) -> jbyteArray {
+    env.new_byte_array(0)
+        .map(|arr| arr.into_raw())
+        .unwrap_or(ptr::null_mut())
+}
+
+fn byte_array_or_null(env: &JNIEnv, bytes: &[u8]) -> jbyteArray {
+    env.byte_array_from_slice(bytes)
+        .map(|arr| arr.into_raw())
+        .unwrap_or(ptr::null_mut())
+}
+
+fn jstring_to_string(env: &mut JNIEnv, value: &JString) -> Option<String> {
+    env.get_string(value)
+        .ok()
+        .map(|s| s.to_string_lossy().into_owned())
+}
+
+fn int_array_to_u32_vec(env: &JNIEnv, array: &JIntArray) -> Vec<u32> {
+    let len = env.get_array_length(array).unwrap_or(0);
+    if len <= 0 {
+        return Vec::new();
+    }
+    let mut values = vec![0i32; len as usize];
+    if env.get_int_array_region(array, 0, &mut values).is_err() {
+        return Vec::new();
+    }
+    values.into_iter().map(|value| value as u32).collect()
+}
+
+fn long_array_to_u64_vec(env: &JNIEnv, array: &JLongArray) -> Vec<u64> {
+    let len = env.get_array_length(array).unwrap_or(0);
+    if len <= 0 {
+        return Vec::new();
+    }
+    let mut values = vec![0i64; len as usize];
+    if env.get_long_array_region(array, 0, &mut values).is_err() {
+        return Vec::new();
+    }
+    values.into_iter().map(|value| value as u64).collect()
+}
+
+// One value per line (0 for blank/garbage), so callers that pair these lists
+// with another by index never have a line silently dropped and shifted.
+fn parse_u32_lines(value: &str) -> Vec<u32> {
+    value
+        .lines()
+        .map(|line| parse_u32_token(line).unwrap_or(0))
+        .collect()
+}
+
+fn parse_u64_lines(value: &str) -> Vec<u64> {
+    value
+        .lines()
+        .map(|line| parse_u64_token(line).unwrap_or(0))
+        .collect()
+}
+
+// Kotlin renders u64/u32 ids+tokens from signed Long/Int, so high-bit values
+// arrive negative (e.g. "-2956503589389641226"). Parse signed-or-unsigned and
+// wrap (two's complement) like the C++ stoull this replaced; a strict
+// parse::<uN>() rejects the minus and would lose the token.
+fn parse_u32_token(line: &str) -> Option<u32> {
+    let token = line.trim();
+    if token.is_empty() {
+        return None;
+    }
+    token
+        .parse::<u32>()
+        .ok()
+        .or_else(|| token.parse::<i32>().ok().map(|v| v as u32))
+}
+
+fn parse_u64_token(line: &str) -> Option<u64> {
+    let token = line.trim();
+    if token.is_empty() {
+        return None;
+    }
+    token
+        .parse::<u64>()
+        .ok()
+        .or_else(|| token.parse::<i64>().ok().map(|v| v as u64))
+}
+
+fn split_nonempty_lines(value: &str) -> Vec<String> {
+    value
+        .lines()
+        .filter(|line| !line.is_empty())
+        .map(ToOwned::to_owned)
+        .collect()
+}
+
+fn kvnode_to_json_value(node: &crate::vdf::KVNode) -> serde_json::Value {
+    if node.is_object() {
+        let mut object = serde_json::Map::new();
+        for child in &node.children {
+            object.insert(child.name.clone(), kvnode_to_json_value(child));
+        }
+        serde_json::Value::Object(object)
+    } else {
+        json!(node.as_string(""))
+    }
+}
+
+fn decode_hex(value: &str) -> Option<Vec<u8>> {
+    let compact = value.trim();
+    if !compact.len().is_multiple_of(2) {
+        return None;
+    }
+    let mut out = Vec::with_capacity(compact.len() / 2);
+    let bytes = compact.as_bytes();
+    for pair in bytes.chunks_exact(2) {
+        let hi = (pair[0] as char).to_digit(16)?;
+        let lo = (pair[1] as char).to_digit(16)?;
+        out.push(((hi << 4) | lo) as u8);
+    }
+    Some(out)
+}
+
+fn clear_pending_exception(env: &mut JNIEnv) {
+    if env.exception_check().unwrap_or(false) {
+        let _ = env.exception_clear();
+    }
+}
+
+fn call_auth_result_failure(env: &mut JNIEnv, callback: &JObject, code: jint, message: &str) {
+    if callback.is_null() {
+        return;
+    }
+    let Some(auth_result_class) = ensure_auth_result_class(env) else {
+        return;
+    };
+    let Ok(error) = env.new_string(message) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let Ok(empty) = env.new_string("") else {
+        clear_pending_exception(env);
+        return;
+    };
+    let error_obj = JObject::from(error);
+    let empty_obj = JObject::from(empty);
+    let auth_result_class = auth_result_jclass(auth_result_class);
+    let Ok(result) = env.new_object(
+        auth_result_class,
+        "(ZILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;)V",
+        &[
+            JValue::Bool(JNI_FALSE),
+            JValue::Int(code),
+            JValue::Object(&error_obj),
+            JValue::Object(&empty_obj),
+            JValue::Object(&empty_obj),
+            JValue::Object(&empty_obj),
+            JValue::Object(&empty_obj),
+            JValue::Long(0),
+            JValue::Bool(JNI_FALSE),
+            JValue::Object(&empty_obj),
+        ],
+    ) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let _ = env.call_method(
+        callback,
+        "onAuthResult",
+        "(Lcom/winlator/cmod/feature/stores/steam/wnsteam/WnAuthResult;)V",
+        &[JValue::Object(&result)],
+    );
+    clear_pending_exception(env);
+}
+
+fn dispatch_auth_result(callback: &GlobalRef, result: AuthSessionResult) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    call_auth_result(&mut env, callback.as_obj(), &result);
+}
+
+fn call_auth_result(env: &mut JNIEnv, callback: &JObject, result: &AuthSessionResult) {
+    if callback.is_null() {
+        return;
+    }
+    let Some(auth_result_class) = AUTH_RESULT_CLASS.get() else {
+        qr_log("auth result class missing; dropping auth callback");
+        return;
+    };
+    let Ok(error_message) = env.new_string(&result.error_message) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let Ok(account_name) = env.new_string(&result.account_name) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let Ok(refresh_token) = env.new_string(&result.refresh_token) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let Ok(access_token) = env.new_string(&result.access_token) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let Ok(new_guard_data) = env.new_string(&result.new_guard_data) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let Ok(agreement_session_url) = env.new_string(&result.agreement_session_url) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let error_message = JObject::from(error_message);
+    let account_name = JObject::from(account_name);
+    let refresh_token = JObject::from(refresh_token);
+    let access_token = JObject::from(access_token);
+    let new_guard_data = JObject::from(new_guard_data);
+    let agreement_session_url = JObject::from(agreement_session_url);
+    let auth_result_class = auth_result_jclass(auth_result_class);
+    let Ok(auth_result) = env.new_object(
+        auth_result_class,
+        "(ZILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;)V",
+        &[
+            JValue::Bool(if result.success { JNI_TRUE } else { JNI_FALSE }),
+            JValue::Int(result.eresult),
+            JValue::Object(&error_message),
+            JValue::Object(&account_name),
+            JValue::Object(&refresh_token),
+            JValue::Object(&access_token),
+            JValue::Object(&new_guard_data),
+            JValue::Long(result.steamid as jlong),
+            JValue::Bool(if result.had_remote_interaction {
+                JNI_TRUE
+            } else {
+                JNI_FALSE
+            }),
+            JValue::Object(&agreement_session_url),
+        ],
+    ) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let _ = env.call_method(
+        callback,
+        "onAuthResult",
+        "(Lcom/winlator/cmod/feature/stores/steam/wnsteam/WnAuthResult;)V",
+        &[JValue::Object(&auth_result)],
+    );
+    clear_pending_exception(env);
+}
+
+fn dispatch_qr_challenge(callback: &GlobalRef, url: &str) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let Ok(url) = env.new_string(url) else {
+        clear_pending_exception(&mut env);
+        return;
+    };
+    let url = JObject::from(url);
+    let _ = env.call_method(
+        callback.as_obj(),
+        "onQrChallengeUrl",
+        "(Ljava/lang/String;)V",
+        &[JValue::Object(&url)],
+    );
+    clear_pending_exception(&mut env);
+}
+
+fn authenticator_accept_device_confirmation(authenticator: &GlobalRef) -> bool {
+    let Some(vm) = JVM.get() else {
+        return false;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return false;
+    };
+    let Ok(future) = env.call_method(
+        authenticator.as_obj(),
+        "acceptDeviceConfirmation",
+        "()Ljava/util/concurrent/CompletableFuture;",
+        &[],
+    ) else {
+        clear_pending_exception(&mut env);
+        return false;
+    };
+    let Ok(future) = future.l() else {
+        clear_pending_exception(&mut env);
+        return false;
+    };
+    if future.is_null() {
+        return false;
+    }
+    let Ok(result) = env.call_method(&future, "get", "()Ljava/lang/Object;", &[]) else {
+        clear_pending_exception(&mut env);
+        return false;
+    };
+    let Ok(result) = result.l() else {
+        clear_pending_exception(&mut env);
+        return false;
+    };
+    if result.is_null() {
+        return false;
+    }
+    let Ok(value) = env.call_method(&result, "booleanValue", "()Z", &[]) else {
+        clear_pending_exception(&mut env);
+        return false;
+    };
+    value.z().unwrap_or(false)
+}
+
+fn future_string_from_method(
+    env: &mut JNIEnv,
+    target: &JObject,
+    method: &str,
+    signature: &str,
+    args: &[JValue],
+) -> Option<String> {
+    let future = env
+        .call_method(target, method, signature, args)
+        .ok()?
+        .l()
+        .ok()?;
+    if future.is_null() {
+        return None;
+    }
+    let result = env
+        .call_method(&future, "get", "()Ljava/lang/Object;", &[])
+        .ok()?
+        .l()
+        .ok()?;
+    if result.is_null() {
+        return None;
+    }
+    let result = JString::from(result);
+    jstring_to_string(env, &result)
+}
+
+fn authenticator_get_device_code(
+    authenticator: &GlobalRef,
+    previous_code_was_incorrect: bool,
+) -> Option<String> {
+    let vm = JVM.get()?;
+    let mut env = vm.attach_current_thread_as_daemon().ok()?;
+    let value = future_string_from_method(
+        &mut env,
+        authenticator.as_obj(),
+        "getDeviceCode",
+        "(Z)Ljava/util/concurrent/CompletableFuture;",
+        &[JValue::Bool(if previous_code_was_incorrect {
+            JNI_TRUE
+        } else {
+            JNI_FALSE
+        })],
+    );
+    clear_pending_exception(&mut env);
+    value
+}
+
+fn authenticator_get_email_code(
+    authenticator: &GlobalRef,
+    email: &str,
+    previous_code_was_incorrect: bool,
+) -> Option<String> {
+    let vm = JVM.get()?;
+    let mut env = vm.attach_current_thread_as_daemon().ok()?;
+    let email = env.new_string(email).ok()?;
+    let email_obj = JObject::from(email);
+    let value = future_string_from_method(
+        &mut env,
+        authenticator.as_obj(),
+        "getEmailCode",
+        "(Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture;",
+        &[
+            JValue::Object(&email_obj),
+            JValue::Bool(if previous_code_was_incorrect {
+                JNI_TRUE
+            } else {
+                JNI_FALSE
+            }),
+        ],
+    );
+    clear_pending_exception(&mut env);
+    value
+}
+
+fn request_authed_service_body<F>(
+    runtime: &Arc<CMClientRuntime>,
+    timeout: Duration,
+    build: F,
+) -> Option<Vec<u8>>
+where
+    F: FnOnce(&CMClientCore, u64) -> Option<OutboundServiceCall>,
+{
+    if runtime.core().state() != ClientState::LoggedOn {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let call = build(runtime.core(), job_id)?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let body = (!job.synthetic_failure && job.eresult == 1).then_some(job.body);
+            let _ = tx.send(body);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(call.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+fn request_authed_service_success<F>(
+    runtime: &Arc<CMClientRuntime>,
+    timeout: Duration,
+    build: F,
+) -> bool
+where
+    F: FnOnce(&CMClientCore, u64) -> Option<OutboundServiceCall>,
+{
+    if runtime.core().state() != ClientState::LoggedOn {
+        return false;
+    }
+    let job_id = runtime.next_job_id();
+    let Some(call) = build(runtime.core(), job_id) else {
+        return false;
+    };
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let _ = tx.send(!job.synthetic_failure && job.eresult == 1);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(call.wire) {
+        return false;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).unwrap_or(false)
+}
+
+fn request_service_method_job(
+    runtime: &Arc<CMClientRuntime>,
+    method: &str,
+    authed: bool,
+    body: Vec<u8>,
+    timeout: Duration,
+    cancel: Option<&AtomicBool>,
+) -> Option<crate::job_manager::JobResult> {
+    let job_id = runtime.next_job_id();
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let _ = tx.send(job);
+        },
+        Some(timeout),
+    );
+    let wire = runtime
+        .core()
+        .build_service_method_call(method, authed, job_id, &body);
+    if !runtime.core().enqueue_wire(wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    recv_with_cancel(&rx, timeout, cancel)
+}
+
+fn recv_with_cancel<T>(
+    rx: &mpsc::Receiver<T>,
+    timeout: Duration,
+    cancel: Option<&AtomicBool>,
+) -> Option<T> {
+    let tick = Duration::from_millis(100);
+    let mut remaining = timeout;
+    loop {
+        if cancel.is_some_and(|c| c.load(Ordering::Relaxed)) {
+            return None;
+        }
+        let wait = remaining.min(tick);
+        match rx.recv_timeout(wait) {
+            Ok(value) => return Some(value),
+            Err(mpsc::RecvTimeoutError::Timeout) => {
+                if remaining <= wait {
+                    return None;
+                }
+                remaining -= wait;
+            }
+            Err(mpsc::RecvTimeoutError::Disconnected) => return None,
+        }
+    }
+}
+
+fn auth_result_from_job(job: &crate::job_manager::JobResult, fallback_label: &str) -> AuthSessionResult {
+    let message = if !job.error_message.is_empty() {
+        job.error_message.clone()
+    } else if job.synthetic_failure {
+        format!("{fallback_label} timed out")
+    } else {
+        format!("{fallback_label} failed (eresult={})", job.eresult)
+    };
+    AuthSessionResult {
+        eresult: job.eresult,
+        error_message: message,
+        ..Default::default()
+    }
+}
+
+fn request_user_stats_response(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    timeout: Duration,
+) -> Option<crate::pb::cmsg_client_get_user_stats::CMsgClientGetUserStatsResponse> {
+    if app_id == 0 || runtime.core().state() != ClientState::LoggedOn {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let message = runtime.core().build_job_proto_message(
+        EMsg::CLIENT_GET_USER_STATS,
+        job_id,
+        crate::pb::cmsg_client_get_user_stats::CMsgClientGetUserStats {
+            game_id: app_id as u64,
+            steam_id_for_user: runtime.core().steam_id(),
+        }
+        .serialize(),
+        0,
+    )?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let response = if job.synthetic_failure {
+                None
+            } else {
+                crate::pb::cmsg_client_get_user_stats::CMsgClientGetUserStatsResponse::deserialize(
+                    &job.body,
+                )
+            };
+            let _ = tx.send(response);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(message.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+fn request_proto_body<F>(
+    runtime: &Arc<CMClientRuntime>,
+    timeout: Duration,
+    build: F,
+) -> Option<Vec<u8>>
+where
+    F: FnOnce(&CMClientCore, u64) -> Option<OutboundProtoMessage>,
+{
+    if runtime.core().state() != ClientState::LoggedOn {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let message = build(runtime.core(), job_id)?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let body = (!job.synthetic_failure && job.eresult > 0).then_some(job.body);
+            let _ = tx.send(body);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(message.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+fn request_pics_product_info(
+    runtime: &Arc<CMClientRuntime>,
+    packages: Vec<crate::pb::cmsg_client_pics::PicsPackageInfoReq>,
+    apps: Vec<crate::pb::cmsg_client_pics::PicsAppInfoReq>,
+    meta_data_only: bool,
+    timeout: Duration,
+) -> Option<crate::pb::cmsg_client_pics::CMsgClientPICSProductInfoResponse> {
+    let body = request_proto_body(runtime, timeout, |core, job_id| {
+        core.build_pics_product_info(packages, apps, meta_data_only, job_id)
+    })?;
+    let mut response =
+        crate::pb::cmsg_client_pics::CMsgClientPICSProductInfoResponse::deserialize(&body)?;
+    hydrate_http_delivered_appinfo(&mut response, timeout);
+    Some(response)
+}
+
+/// Large appinfo the CM delivered over HTTP arrives as an empty `buffer` + a
+/// `sha`/`http_host`; fetch it like the official client so the app isn't dropped.
+fn hydrate_http_delivered_appinfo(
+    response: &mut crate::pb::cmsg_client_pics::CMsgClientPICSProductInfoResponse,
+    timeout: Duration,
+) {
+    if response.http_host.is_empty() {
+        return;
+    }
+    let targets: Vec<(usize, u32, Vec<u8>)> = response
+        .apps
+        .iter()
+        .enumerate()
+        .filter(|(_, app)| !app.missing_token && app.buffer.is_empty() && !app.sha.is_empty())
+        .map(|(index, app)| (index, app.appid, app.sha.clone()))
+        .collect();
+    if targets.is_empty() {
+        return;
+    }
+    let host = response.http_host.clone();
+    let cdn = crate::cdn_client::CdnClient::new("");
+    let total = targets.len();
+    let fetched = fetch_appinfo_buffers_parallel(&cdn, &host, targets, timeout);
+    let mut hydrated = 0usize;
+    for (index, buffer) in fetched {
+        if let (Some(buffer), Some(app)) = (buffer, response.apps.get_mut(index)) {
+            app.buffer = buffer;
+            hydrated += 1;
+        }
+    }
+    android_log(
+        "WnSteamPics",
+        &format!("hydrated {hydrated}/{total} HTTP-delivered appinfo buffer(s) from {host}"),
+    );
+}
+
+/// Concurrent appinfo fetch (bounded pool); returns `(index, buffer?)`.
+fn fetch_appinfo_buffers_parallel(
+    cdn: &crate::cdn_client::CdnClient,
+    host: &str,
+    targets: Vec<(usize, u32, Vec<u8>)>,
+    timeout: Duration,
+) -> Vec<(usize, Option<Vec<u8>>)> {
+    let worker_count = targets.len().clamp(1, 8);
+    let queue = Mutex::new(targets.into_iter());
+    let results = Mutex::new(Vec::new());
+    thread::scope(|scope| {
+        for _ in 0..worker_count {
+            scope.spawn(|| {
+                let mut conn = cdn.open_connection();
+                loop {
+                    let job = queue.lock().expect("appinfo fetch queue poisoned").next();
+                    let Some((index, app_id, sha)) = job else {
+                        break;
+                    };
+                    let buffer =
+                        cdn.fetch_appinfo_with_connection(&mut conn, host, app_id, &sha, timeout);
+                    results
+                        .lock()
+                        .expect("appinfo fetch results poisoned")
+                        .push((index, buffer));
+                }
+            });
+        }
+    });
+    results.into_inner().expect("appinfo fetch results poisoned")
+}
+
+fn request_app_ownership_ticket(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    timeout: Duration,
+) -> Option<crate::pb::cmsg_client_get_app_ownership_ticket::CMsgClientGetAppOwnershipTicketResponse>
+{
+    let body = request_proto_body(runtime, timeout, |core, job_id| {
+        core.build_get_app_ownership_ticket(app_id, job_id)
+    })?;
+    let response =
+        crate::pb::cmsg_client_get_app_ownership_ticket::CMsgClientGetAppOwnershipTicketResponse::deserialize(&body)?;
+    if response.eresult == 1 && !response.ticket.is_empty() {
+        runtime
+            .core()
+            .tickets()
+            .store(app_id, response.eresult, response.ticket.clone());
+    }
+    Some(response)
+}
+
+fn request_cdn_servers(
+    runtime: &Arc<CMClientRuntime>,
+    timeout: Duration,
+) -> Option<Vec<crate::pb::ccontentserverdirectory::CContentServerDirectoryServerInfo>> {
+    let body = request_authed_service_body(runtime, timeout, |core, job_id| {
+        core.build_get_cdn_servers_call(0, job_id)
+    })?;
+    crate::pb::ccontentserverdirectory::CContentServerDirectoryGetServersForSteamPipeResponse::deserialize(&body)
+        .map(|response| response.servers)
+}
+
+const ERESULT_OK: i32 = 1;
+const MAX_RESOLVE_ATTEMPTS: u32 = 4;
+
+enum DepotKeyOutcome {
+    Granted(Vec<u8>),
+    AccessDenied,
+    Transient,
+}
+
+enum ManifestCodeOutcome {
+    Code(u64),
+    AccessDenied,
+    Transient,
+}
+
+/// One CM proto request returning the header eresult and body; None only when no response arrived.
+fn request_proto_response<F>(
+    runtime: &Arc<CMClientRuntime>,
+    timeout: Duration,
+    build: F,
+) -> Option<(i32, Vec<u8>)>
+where
+    F: FnOnce(&CMClientCore, u64) -> Option<OutboundProtoMessage>,
+{
+    if runtime.core().state() != ClientState::LoggedOn {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let message = build(runtime.core(), job_id)?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let result = (!job.synthetic_failure).then(|| (job.eresult, job.body));
+            let _ = tx.send(result);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(message.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+/// One authed service-method request returning the header eresult and body; None only when no response arrived.
+fn request_authed_service_response<F>(
+    runtime: &Arc<CMClientRuntime>,
+    timeout: Duration,
+    build: F,
+) -> Option<(i32, Vec<u8>)>
+where
+    F: FnOnce(&CMClientCore, u64) -> Option<OutboundServiceCall>,
+{
+    if runtime.core().state() != ClientState::LoggedOn {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let call = build(runtime.core(), job_id)?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let result = (!job.synthetic_failure).then(|| (job.eresult, job.body));
+            let _ = tx.send(result);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(call.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+fn request_manifest_request_code(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    depot_id: u32,
+    manifest_id: u64,
+    branch: &str,
+    timeout: Duration,
+) -> ManifestCodeOutcome {
+    let Some((eresult, body)) = request_authed_service_response(runtime, timeout, |core, job_id| {
+        core.build_manifest_request_code_call(app_id, depot_id, manifest_id, branch, job_id)
+    }) else {
+        return ManifestCodeOutcome::Transient;
+    };
+    if eresult == ERESULT_OK {
+        if let Some(response) =
+            crate::pb::ccontentserverdirectory::CContentServerDirectoryGetManifestRequestCodeResponse::deserialize(&body)
+        {
+            return ManifestCodeOutcome::Code(response.manifest_request_code);
+        }
+        return ManifestCodeOutcome::Transient;
+    }
+    // A response arrived but the code was refused (branch/depot not available to this
+    // account); skip the depot rather than abort the whole download.
+    android_log(
+        "WnSteamDownload",
+        &format!("manifest code refused depot={depot_id} eresult={eresult}"),
+    );
+    ManifestCodeOutcome::AccessDenied
+}
+
+fn request_depot_key(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    depot_id: u32,
+    timeout: Duration,
+) -> DepotKeyOutcome {
+    let Some((header_eresult, body)) = request_proto_response(runtime, timeout, |core, job_id| {
+        core.build_get_depot_decryption_key(depot_id, app_id, job_id)
+    }) else {
+        return DepotKeyOutcome::Transient;
+    };
+    if let Some(response) =
+        crate::pb::cmsg_client_get_depot_decryption_key::CMsgClientGetDepotDecryptionKeyResponse::deserialize(&body)
+    {
+        if response.eresult == ERESULT_OK as u32 && response.depot_encryption_key.len() == 32 {
+            return DepotKeyOutcome::Granted(response.depot_encryption_key);
+        }
+        android_log(
+            "WnSteamDownload",
+            &format!(
+                "depot key refused depot={depot_id} header_eresult={header_eresult} body_eresult={}",
+                response.eresult
+            ),
+        );
+    } else {
+        android_log(
+            "WnSteamDownload",
+            &format!("depot key refused depot={depot_id} header_eresult={header_eresult} (unparsed)"),
+        );
+    }
+    // A response arrived but no usable key: Steam will not grant this depot to this
+    // account. Skip it (DepotDownloader does the same) rather than abort the download.
+    DepotKeyOutcome::AccessDenied
+}
+
+enum KeyResolution {
+    Granted(Vec<u8>),
+    AccessDenied,
+    Cancelled,
+    Unavailable,
+}
+
+fn resolve_depot_key_with_retry(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    depot_id: u32,
+    timeout: Duration,
+    cancel: &AtomicBool,
+) -> KeyResolution {
+    for attempt in 0..MAX_RESOLVE_ATTEMPTS {
+        if cancel.load(Ordering::Relaxed) {
+            return KeyResolution::Cancelled;
+        }
+        if attempt > 0 {
+            thread::sleep(Duration::from_millis(
+                crate::depot_downloader::retry_backoff_millis(attempt),
+            ));
+        }
+        match request_depot_key(runtime, app_id, depot_id, timeout) {
+            DepotKeyOutcome::Granted(key) => return KeyResolution::Granted(key),
+            DepotKeyOutcome::AccessDenied => return KeyResolution::AccessDenied,
+            DepotKeyOutcome::Transient => continue,
+        }
+    }
+    KeyResolution::Unavailable
+}
+
+enum CodeResolution {
+    Code(u64),
+    AccessDenied,
+    Cancelled,
+    Unavailable,
+}
+
+fn resolve_manifest_code_with_retry(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    depot_id: u32,
+    manifest_id: u64,
+    branch: &str,
+    timeout: Duration,
+    cancel: &AtomicBool,
+) -> CodeResolution {
+    for attempt in 0..MAX_RESOLVE_ATTEMPTS {
+        if cancel.load(Ordering::Relaxed) {
+            return CodeResolution::Cancelled;
+        }
+        if attempt > 0 {
+            thread::sleep(Duration::from_millis(
+                crate::depot_downloader::retry_backoff_millis(attempt),
+            ));
+        }
+        match request_manifest_request_code(runtime, app_id, depot_id, manifest_id, branch, timeout)
+        {
+            ManifestCodeOutcome::Code(code) => return CodeResolution::Code(code),
+            ManifestCodeOutcome::AccessDenied => return CodeResolution::AccessDenied,
+            ManifestCodeOutcome::Transient => continue,
+        }
+    }
+    CodeResolution::Unavailable
+}
+
+/// Records depots Steam denied a key for so the Kotlin completeness gate can exclude them.
+fn write_denied_depots_marker(config_dir: &std::path::Path, denied: &[u32]) {
+    let path = config_dir.join("denied.depots");
+    if denied.is_empty() {
+        let _ = std::fs::remove_file(&path);
+        return;
+    }
+    let _ = std::fs::create_dir_all(config_dir);
+    let body = denied
+        .iter()
+        .map(|id| id.to_string())
+        .collect::<Vec<_>>()
+        .join("\n");
+    let _ = std::fs::write(&path, body);
+}
+
+fn request_item_def_digest(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    timeout: Duration,
+) -> Option<String> {
+    if app_id == 0 || runtime.core().state() != ClientState::LoggedOn {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let call = runtime
+        .core()
+        .build_inventory_item_def_meta_call(app_id, job_id)?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let digest = if job.synthetic_failure || job.eresult != 1 {
+                None
+            } else {
+                crate::pb::cinventory::CInventoryGetItemDefMetaResponse::deserialize(&job.body)
+                    .and_then(|response| (!response.digest.is_empty()).then_some(response.digest))
+            };
+            let _ = tx.send(digest);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(call.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+fn request_subscribed_workshop_page(
+    runtime: &Arc<CMClientRuntime>,
+    app_id: u32,
+    page: u32,
+    page_size: u32,
+    timeout: Duration,
+) -> Option<crate::pb::cpublishedfile::CPublishedFileGetUserFilesResponse> {
+    if app_id == 0 || page == 0 || page_size == 0 || runtime.core().state() != ClientState::LoggedOn
+    {
+        return None;
+    }
+    let job_id = runtime.next_job_id();
+    let call = runtime
+        .core()
+        .build_published_file_subscribed_call(app_id, page, page_size, job_id)?;
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let response = if job.synthetic_failure || job.eresult != 1 {
+                None
+            } else {
+                crate::pb::cpublishedfile::CPublishedFileGetUserFilesResponse::deserialize(
+                    &job.body,
+                )
+            };
+            let _ = tx.send(response);
+        },
+        Some(timeout),
+    );
+    if !runtime.core().enqueue_wire(call.wire) {
+        return None;
+    }
+    runtime.flush_outbound();
+    rx.recv_timeout(timeout).ok().flatten()
+}
+
+struct QrPollState {
+    runtime: Arc<CMClientRuntime>,
+    qr_callback: GlobalRef,
+    result_callback: GlobalRef,
+    cancel: Arc<AtomicBool>,
+    client_id: u64,
+    request_id: Vec<u8>,
+    poll_interval_seconds: f32,
+    last_challenge_url: Arc<Mutex<String>>,
+}
+
+fn start_qr_poll_loop(state: QrPollState) {
+    thread::spawn(move || {
+        let QrPollState {
+            runtime,
+            qr_callback,
+            result_callback,
+            cancel,
+            mut client_id,
+            request_id,
+            poll_interval_seconds,
+            last_challenge_url,
+        } = state;
+        let poll_interval = Duration::from_secs_f32(poll_interval_seconds.max(0.25));
+        let timeout = Duration::from_secs(30);
+        let mut reported_remote_interaction = false;
+        qr_log(&format!(
+            "poll loop start client_id={} request_id_len={} interval_s={:.2}",
+            client_id,
+            request_id.len(),
+            poll_interval_seconds
+        ));
+        loop {
+            for slice in sleep_slices(poll_interval, Duration::from_millis(100)) {
+                if cancel.load(Ordering::Relaxed) {
+                    return;
+                }
+                thread::sleep(slice);
+            }
+            if cancel.load(Ordering::Relaxed) {
+                return;
+            }
+
+            let request = build_poll_request(client_id, request_id.clone()).serialize();
+            let poll_job = match request_service_method_job(
+                &runtime,
+                "Authentication.PollAuthSessionStatus#1",
+                false,
+                request,
+                timeout,
+                Some(cancel.as_ref()),
+            ) {
+                Some(job) => job,
+                None => {
+                    if cancel.load(Ordering::Relaxed) {
+                        qr_log("poll loop cancelled while waiting for status");
+                        return;
+                    }
+                    qr_log("PollAuthSessionStatus timed out");
+                    dispatch_auth_result(
+                        &result_callback,
+                        AuthSessionResult {
+                            error_message: "PollAuthSessionStatus timed out".to_string(),
+                            ..Default::default()
+                        },
+                    );
+                    return;
+                }
+            };
+            if poll_job.synthetic_failure || poll_job.eresult != 1 {
+                qr_log(&format!(
+                    "PollAuthSessionStatus failed synthetic={} eresult={} body_len={}",
+                    poll_job.synthetic_failure,
+                    poll_job.eresult,
+                    poll_job.body.len()
+                ));
+                dispatch_auth_result(
+                    &result_callback,
+                    auth_result_from_job(&poll_job, "PollAuthSessionStatus"),
+                );
+                return;
+            }
+            let Some(resp) = crate::pb::cauthentication::PollAuthSessionStatusResponse::deserialize(
+                &poll_job.body,
+            ) else {
+                qr_log(&format!(
+                    "Poll response parse failed body_len={}",
+                    poll_job.body.len()
+                ));
+                dispatch_auth_result(
+                    &result_callback,
+                    AuthSessionResult {
+                        error_message: "Poll response parse failed".to_string(),
+                        ..Default::default()
+                    },
+                );
+                return;
+            };
+            qr_log(&format!(
+                "poll response new_client_id={} remote={} refresh_len={} access_len={} account_len={} agreement_len={} challenge_len={}",
+                resp.new_client_id,
+                resp.had_remote_interaction,
+                resp.refresh_token.len(),
+                resp.access_token.len(),
+                resp.account_name.len(),
+                resp.agreement_session_url.len(),
+                resp.new_challenge_url.len()
+            ));
+            if resp.new_client_id != 0 {
+                client_id = resp.new_client_id;
+            }
+            if let Some(challenge) = {
+                let mut last = last_challenge_url
+                    .lock()
+                    .expect("qr challenge url poisoned");
+                crate::auth_session::take_qr_challenge_update(&mut last, &resp)
+            } {
+                dispatch_qr_challenge(&qr_callback, &challenge);
+            }
+            let remote_interaction =
+                take_qr_remote_interaction(&mut reported_remote_interaction, &resp);
+            let account_name = resp.account_name.clone();
+            let agreement_session_url = resp.agreement_session_url.clone();
+            if let Some(result) = auth_result_from_poll(resp, 0) {
+                qr_log(&format!(
+                    "dispatching final QR auth result success={} refresh_len={} account_len={} remote={}",
+                    result.success,
+                    result.refresh_token.len(),
+                    result.account_name.len(),
+                    result.had_remote_interaction
+                ));
+                dispatch_auth_result(&result_callback, result);
+                return;
+            }
+            if remote_interaction {
+                qr_log("dispatching intermediate remote-interaction QR auth update");
+                dispatch_auth_result(
+                    &result_callback,
+                    AuthSessionResult {
+                        account_name,
+                        agreement_session_url,
+                        had_remote_interaction: true,
+                        ..Default::default()
+                    },
+                );
+            }
+        }
+    });
+}
+
+fn call_prepare_result(env: &mut JNIEnv, callback: &JObject, ok: bool, error: &str) {
+    if callback.is_null() {
+        return;
+    }
+    let Ok(error) = env.new_string(error) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let error_obj = JObject::from(error);
+    let _ = env.call_method(
+        callback,
+        "onPrepareResult",
+        "(ZLjava/lang/String;)V",
+        &[
+            JValue::Bool(if ok { JNI_TRUE } else { JNI_FALSE }),
+            JValue::Object(&error_obj),
+        ],
+    );
+    clear_pending_exception(env);
+}
+
+fn call_download_complete_result(
+    env: &mut JNIEnv,
+    listener: &JObject,
+    success: bool,
+    error: &str,
+    bytes_written: u64,
+    depots_completed: u32,
+    depots_skipped: u32,
+) {
+    if listener.is_null() {
+        return;
+    }
+    let Ok(error) = env.new_string(error) else {
+        clear_pending_exception(env);
+        return;
+    };
+    let error_obj = JObject::from(error);
+    let _ = env.call_method(
+        listener,
+        "onComplete",
+        "(ZLjava/lang/String;JII)V",
+        &[
+            JValue::Bool(if success { JNI_TRUE } else { JNI_FALSE }),
+            JValue::Object(&error_obj),
+            JValue::Long(bytes_written as jlong),
+            JValue::Int(depots_completed as jint),
+            JValue::Int(depots_skipped as jint),
+        ],
+    );
+    clear_pending_exception(env);
+}
+
+fn call_download_complete(env: &mut JNIEnv, listener: &JObject, error: &str) {
+    call_download_complete_result(env, listener, false, error, 0, 0, 0);
+}
+
+fn dispatch_download_complete(
+    listener: GlobalRef,
+    result: crate::depot_downloader::DepotDownloadResult,
+) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let listener_obj = listener.as_obj();
+    call_download_complete_result(
+        &mut env,
+        listener_obj,
+        result.success,
+        &result.error,
+        result.bytes_written,
+        result.depots_completed,
+        result.depots_skipped,
+    );
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativePickCmUrl(
+    mut env: JNIEnv,
+    _class: JClass,
+    ca_bundle_path: JString,
+) -> jstring {
+    let ca_bundle_path = jstring_to_string(&mut env, &ca_bundle_path).unwrap_or_default();
+    let directory = crate::steam_directory::SteamDirectoryClient::new(ca_bundle_path);
+    let result = directory.fetch(0, crate::steam_directory::DEFAULT_TIMEOUT);
+    let directory_url = if result.ok() {
+        result
+            .servers
+            .into_iter()
+            .find_map(|server| {
+                let url = server.websocket_url();
+                (!url.is_empty()).then_some(url)
+            })
+            .unwrap_or_default()
+    } else {
+        String::new()
+    };
+    let url = if !directory_url.is_empty() {
+        directory_url
+    } else {
+        crate::cm_server_list::hardcoded_fallback_servers()
+            .into_iter()
+            .find_map(|server| {
+                let url = server.websocket_url();
+                (!url.is_empty()).then_some(url)
+            })
+            .unwrap_or_default()
+    };
+    new_string_or_null(&mut env, &url)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCreate(
+    mut env: JNIEnv,
+    _class: JClass,
+) -> jlong {
+    let _ = ensure_auth_result_class(&mut env);
+    to_session_handle(Box::new(WnSteamSessionHandle::new()))
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeDestroy(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    unsafe { drop_session_handle(handle) };
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSetCaBundlePath(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    path: JString,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    if let Ok(path) = env.get_string(&path) {
+        handle.ca_bundle_path = path.to_string_lossy().into_owned();
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSetAutoPopulateLibrary(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    enabled: jboolean,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.auto_populate_library = enabled != JNI_FALSE;
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeConnect(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    url: JString,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let Some(url) = jstring_to_string(&mut env, &url) else {
+        return JNI_FALSE;
+    };
+    if url.is_empty() {
+        return JNI_FALSE;
+    }
+    let runtime = handle.runtime();
+    if !runtime.connect(&url) {
+        return JNI_FALSE;
+    }
+    JNI_TRUE
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeDisconnect(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        if let Some(runtime) = handle
+            .runtime
+            .lock()
+            .expect("session runtime poisoned")
+            .take()
+        {
+            runtime.disconnect();
+        } else {
+            handle.core.set_state(ClientState::Disconnected);
+            dispatch_state_observer(&handle.state_observer, ClientState::Disconnected);
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeLogOffAndDisconnect(
+    env: JNIEnv,
+    class: JClass,
+    handle: jlong,
+    flush_ms: jint,
+) {
+    if let Some(handle_ref) = unsafe { from_session_handle_mut(handle) } {
+        if handle_ref.enqueue_proto(handle_ref.core.build_logoff()) {
+            let flush = if flush_ms <= 0 {
+                Duration::from_millis(500)
+            } else {
+                Duration::from_millis(flush_ms as u64)
+            };
+            thread::sleep(flush);
+        }
+    }
+    Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeDisconnect(
+        env, class, handle,
+    );
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeIsPlayingBlocked(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    if handle.core.is_playing_blocked() {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeMarkPlayingBlocked(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.core.mark_playing_blocked();
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeState(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jint {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ClientState::Disconnected as jint;
+    };
+    handle.core.state() as jint
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSteamId(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jlong {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return 0;
+    };
+    handle.core.steam_id() as jlong
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeFamilyGroupId(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jlong {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return 0;
+    };
+    handle.core.family_group_id() as jlong
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetLibrarySnapshot(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return new_string_or_null(&mut env, "{}");
+    };
+    new_string_or_null(&mut env, &handle.core.library().snapshot_json())
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeStartWineBridge(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    steam3_port: jint,
+    client_service_port: jint,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let mut config = WineBridgeConfig::default();
+    if steam3_port > 0 {
+        config.steam3_port = steam3_port as u16;
+    }
+    if client_service_port > 0 {
+        config.client_svc_port = client_service_port as u16;
+    }
+    if handle.wine_bridge.start(config) {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeStopWineBridge(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.wine_bridge.stop();
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeWineBridgeLastError(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return new_string_or_null(&mut env, "");
+    };
+    new_string_or_null(&mut env, &handle.wine_bridge.last_error())
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetAppOwnershipTicket(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+) -> jbyteArray {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(ticket) = handle.core.tickets().get(app_id as u32) else {
+        return ptr::null_mut();
+    };
+    if ticket.eresult != 1 || ticket.ticket.is_empty() {
+        return ptr::null_mut();
+    }
+    byte_array_or_null(&env, &ticket.ticket)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetLicenseList(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let licenses = handle.core.license_list();
+    let value = json!(licenses
+        .iter()
+        .map(|license| json!({
+            "packageId": license.package_id,
+            "changeNumber": license.change_number,
+            "timeCreated": license.time_created,
+            "timeNextProcess": license.time_next_process,
+            "minuteLimit": license.minute_limit,
+            "minutesUsed": license.minutes_used,
+            "paymentMethod": license.payment_method,
+            "flags": license.flags,
+            "purchaseCountryCode": license.purchase_country_code,
+            "licenseType": license.license_type,
+            "territoryCode": license.territory_code,
+            "accessToken": license.access_token as i64,
+            "ownerId": license.owner_id,
+            "masterPackageId": license.master_package_id,
+        }))
+        .collect::<Vec<_>>())
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetFriendsList(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jlongArray {
+    let friends = match unsafe { from_session_handle_mut(handle) } {
+        Some(handle) => handle
+            .core
+            .friends_list()
+            .into_iter()
+            .map(|sid| sid as jlong)
+            .collect::<Vec<_>>(),
+        None => Vec::new(),
+    };
+    let Ok(array) = env.new_long_array(friends.len() as i32) else {
+        return ptr::null_mut();
+    };
+    if !friends.is_empty() && env.set_long_array_region(&array, 0, &friends).is_err() {
+        return ptr::null_mut();
+    }
+    array.into_raw()
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetFriendPersonas(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return new_string_or_null(&mut env, "[]");
+    };
+    let value = json!(handle
+        .core
+        .friend_personas()
+        .iter()
+        .map(|persona| json!({
+            "sid": persona.sid as i64,
+            "name": persona.player_name,
+            "state": persona.persona_state,
+            "app": persona.game_played_app_id,
+            "avatarHash": crate::cdn_client::hex_encode(&persona.avatar_hash),
+            "gameName": persona.game_name,
+            "gameId": persona.gameid as i64,
+            "connect": persona
+                .rich_presence
+                .iter()
+                .find(|(k, _)| k == "connect")
+                .map(|(_, v)| v.as_str())
+                .unwrap_or(""),
+        }))
+        .collect::<Vec<_>>())
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetSelfPersona(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(persona) = handle.core.self_persona() else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "personaState": persona.persona_state,
+        "gameAppId": persona.game_played_app_id,
+        "playerName": persona.player_name,
+        "avatarHash": crate::cdn_client::hex_encode(&persona.avatar_hash),
+        "gameName": persona.game_name,
+        "gameId": persona.gameid as i64,
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSendFriendMessage(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    steam_id: jlong,
+    message: JString,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(message) = jstring_to_string(&mut env, &message) else {
+        return ptr::null_mut();
+    };
+    if message.is_empty() {
+        return ptr::null_mut();
+    }
+    let contains_bbcode = message.contains("[img]");
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(15), |core, job_id| {
+            core.build_send_friend_message(steam_id as u64, &message, contains_bbcode, job_id)
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) =
+        crate::pb::cfriendmessages::CFriendMessagesSendMessageResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "serverTimestamp": response.server_timestamp,
+        "ordinal": response.ordinal,
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetRecentMessages(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    steam_id: jlong,
+    count: jint,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return new_string_or_null(&mut env, "[]");
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return new_string_or_null(&mut env, "[]");
+    };
+    let self_accountid = (handle.core.steam_id() & 0xFFFF_FFFF) as u32;
+    let count = count.clamp(1, 200) as u32;
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(15), |core, job_id| {
+            core.build_get_recent_messages(steam_id as u64, count, job_id)
+        })
+    else {
+        return new_string_or_null(&mut env, "[]");
+    };
+    let Some(response) =
+        crate::pb::cfriendmessages::CFriendMessagesGetRecentMessagesResponse::deserialize(&body)
+    else {
+        return new_string_or_null(&mut env, "[]");
+    };
+    let value = json!(response
+        .messages
+        .iter()
+        .map(|m| json!({
+            "fromSelf": m.accountid == self_accountid,
+            "message": m.message,
+            "timestamp": m.timestamp,
+            "ordinal": m.ordinal,
+        }))
+        .collect::<Vec<_>>())
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeDrainFriendMessages(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return new_string_or_null(&mut env, "[]");
+    };
+    let value = json!(handle
+        .core
+        .drain_incoming_messages()
+        .iter()
+        .map(|m| json!({
+            "friendId": m.friend_id as i64,
+            "fromSelf": m.from_self,
+            "message": m.message,
+            "timestamp": m.timestamp,
+            "ordinal": m.ordinal,
+        }))
+        .collect::<Vec<_>>())
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSendChatImage(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    steam_id: jlong,
+    refresh_token: JString,
+    image: JByteArray,
+    file_name: JString,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let self_steamid = handle.core.steam_id();
+    let ca_bundle_path = handle.ca_bundle_path.clone();
+    let Some(refresh_token) = jstring_to_string(&mut env, &refresh_token) else {
+        return ptr::null_mut();
+    };
+    let file_name = jstring_to_string(&mut env, &file_name).unwrap_or_else(|| "image.png".into());
+    let Ok(bytes) = env.convert_byte_array(image) else {
+        return ptr::null_mut();
+    };
+    if bytes.is_empty() || self_steamid == 0 || refresh_token.is_empty() {
+        return ptr::null_mut();
+    }
+
+    // Mint a short-lived web access token for the steamLoginSecure cookie.
+    let request = crate::pb::cauthentication::AccessTokenGenerateForAppRequest {
+        refresh_token,
+        steamid: self_steamid,
+        renewal_type: crate::pb::cauthentication::EAuthTokenRenewalType::None,
+    }
+    .serialize();
+    let Some(token_body) =
+        request_authed_service_body(&runtime, Duration::from_secs(15), move |core, job_id| {
+            core.build_authed_service_call(
+                "Authentication.GenerateAccessTokenForApp#1",
+                job_id,
+                request,
+            )
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let access_token = crate::pb::cauthentication::AccessTokenGenerateForAppResponse::deserialize(
+        &token_body,
+    )
+    .map(|r| r.access_token)
+    .unwrap_or_default();
+    if access_token.is_empty() {
+        android_log("WNIMG", "no web access token");
+        return ptr::null_mut();
+    }
+
+    let url = match crate::chat_image::upload(
+        &ca_bundle_path,
+        self_steamid,
+        steam_id as u64,
+        &access_token,
+        &bytes,
+        &file_name,
+    ) {
+        Ok(url) => url,
+        Err(err) => {
+            android_log("WNIMG", &format!("upload failed: {err}"));
+            return ptr::null_mut();
+        }
+    };
+    new_string_or_null(&mut env, &url)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSetPersonaState(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    persona_state: jint,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.enqueue_proto(handle.core.build_set_persona_state(persona_state as u32));
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSetPersonaName(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    name: JString,
+    persona_state: jint,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let Ok(name) = env.get_string(&name) else {
+        return;
+    };
+    let name = name.to_string_lossy().into_owned();
+    handle.enqueue_proto(
+        handle
+            .core
+            .build_set_persona_name(name, persona_state as u32),
+    );
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeRequestUserPersona(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.enqueue_proto(handle.core.build_request_user_persona());
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeRequestFriendPersonas(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    steam_ids: JLongArray,
+    flags: jint,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let len = env.get_array_length(&steam_ids).unwrap_or(0);
+    if len <= 0 {
+        return;
+    }
+    let mut ids = vec![0i64; len as usize];
+    if env.get_long_array_region(&steam_ids, 0, &mut ids).is_err() {
+        return;
+    }
+    let ids = ids.into_iter().map(|id| id as u64).collect::<Vec<_>>();
+    handle.enqueue_proto(
+        handle
+            .core
+            .build_request_friend_personas(&ids, flags as u32),
+    );
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeNotifyGamesPlayed(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    games_json: JString,
+    client_os_type: jint,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let Ok(games_json) = env.get_string(&games_json) else {
+        return;
+    };
+    let raw = games_json.to_string_lossy().into_owned();
+    let parsed: Option<serde_json::Value> = serde_json::from_str(&raw).ok();
+    let entry = parsed
+        .as_ref()
+        .and_then(|value| value.as_array().and_then(|arr| arr.first()))
+        .cloned()
+        .unwrap_or(serde_json::Value::Null);
+    let pick_u64 = |entry: &serde_json::Value, keys: &[&str]| -> u64 {
+        for key in keys {
+            if let Some(value) = entry.get(*key) {
+                if let Some(v) = value.as_u64() {
+                    return v;
+                }
+                if let Some(s) = value.as_str() {
+                    if let Ok(v) = s.parse::<u64>() {
+                        return v;
+                    }
+                }
+            }
+        }
+        0
+    };
+    let pick_u32 = |entry: &serde_json::Value, keys: &[&str]| -> u32 {
+        pick_u64(entry, keys) as u32
+    };
+    let game_id = pick_u64(&entry, &["gameId", "game_id", "appid", "app_id"]);
+    let extras = crate::cm_client::GamesPlayedExtras {
+        process_id: pick_u32(&entry, &["processId", "process_id"]),
+        owner_id: pick_u32(&entry, &["ownerId", "owner_id"]),
+        launch_source: pick_u32(&entry, &["launchSource", "launch_source"]),
+        game_build_id: pick_u32(&entry, &["gameBuildId", "game_build_id"]),
+    };
+    let processes = entry
+        .get("processes")
+        .and_then(|v| v.as_array())
+        .map(|arr| {
+            arr.iter()
+                .map(|p| crate::pb::cmsg_client_games_played::GamePlayedProcessInfo {
+                    process_id: pick_u32(p, &["pid", "processId", "process_id"]),
+                    process_id_parent: pick_u32(
+                        p,
+                        &["ppid", "processIdParent", "process_id_parent"],
+                    ),
+                    parent_is_steam: p
+                        .get("isSteam")
+                        .or_else(|| p.get("parentIsSteam"))
+                        .or_else(|| p.get("parent_is_steam"))
+                        .and_then(|v| v.as_bool())
+                        .unwrap_or(false),
+                })
+                .collect::<Vec<_>>()
+        })
+        .unwrap_or_default();
+    let os_type = if client_os_type < 0 {
+        0
+    } else {
+        client_os_type as u32
+    };
+    handle.enqueue_proto(handle.core.build_notify_games_played_full(
+        game_id, &extras, &processes, os_type,
+    ));
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeKickPlayingSession(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    only_stop_game: jboolean,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.enqueue_proto(
+            handle
+                .core
+                .build_kick_playing_session(only_stop_game != JNI_FALSE),
+        );
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeStoreUserStats(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    steam_id: jlong,
+    crc_stats: jint,
+    stat_ids: JIntArray,
+    stat_values: JIntArray,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let len = env
+        .get_array_length(&stat_ids)
+        .unwrap_or(0)
+        .min(env.get_array_length(&stat_values).unwrap_or(0));
+    if len < 0 {
+        return;
+    }
+    let mut ids = vec![0i32; len as usize];
+    let mut values = vec![0i32; len as usize];
+    if env.get_int_array_region(&stat_ids, 0, &mut ids).is_err()
+        || env
+            .get_int_array_region(&stat_values, 0, &mut values)
+            .is_err()
+    {
+        return;
+    }
+    let stats = ids
+        .into_iter()
+        .zip(values)
+        .map(|(id, value)| (id as u32, value as u32))
+        .collect::<Vec<_>>();
+    handle.enqueue_proto(handle.core.build_store_user_stats(
+        app_id as u32,
+        steam_id as u64,
+        crc_stats as u32,
+        &stats,
+    ));
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSetStateObserver(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    observer: JObject,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let mut slot = handle
+        .state_observer
+        .lock()
+        .expect("session state observer poisoned");
+    *slot = if observer.is_null() {
+        None
+    } else {
+        env.new_global_ref(observer).ok()
+    };
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSetLibraryObserver(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    observer: JObject,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let mut slot = handle
+        .library_observer
+        .lock()
+        .expect("session library observer poisoned");
+    *slot = if observer.is_null() {
+        None
+    } else {
+        env.new_global_ref(observer).ok()
+    };
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeRenewRefreshToken(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    current_token: JString,
+    steam_id64: jlong,
+    timeout_ms: jint,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    if handle.core.state() != ClientState::LoggedOn {
+        return ptr::null_mut();
+    }
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(current_token) = jstring_to_string(&mut env, &current_token) else {
+        return ptr::null_mut();
+    };
+    if current_token.is_empty() || steam_id64 == 0 {
+        return ptr::null_mut();
+    }
+
+    let request = crate::pb::cauthentication::AccessTokenGenerateForAppRequest {
+        refresh_token: current_token,
+        steamid: steam_id64 as u64,
+        renewal_type: crate::pb::cauthentication::EAuthTokenRenewalType::Allow,
+    }
+    .serialize();
+    let job_id = runtime.next_job_id();
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let token = if !job.synthetic_failure && job.eresult == 1 {
+                crate::pb::cauthentication::AccessTokenGenerateForAppResponse::deserialize(
+                    &job.body,
+                )
+                .map(|resp| resp.refresh_token)
+                .unwrap_or_default()
+            } else {
+                String::new()
+            };
+            let _ = tx.send(token);
+        },
+        Some(Duration::from_millis(timeout_ms.max(1) as u64)),
+    );
+    let wire = runtime.core().build_service_method_call(
+        "Authentication.GenerateAccessTokenForApp#1",
+        true,
+        job_id,
+        &request,
+    );
+    if !runtime.core().enqueue_wire(wire) {
+        return ptr::null_mut();
+    }
+    runtime.flush_outbound();
+
+    let wait = Duration::from_millis(timeout_ms.max(0) as u64);
+    let Ok(token) = rx.recv_timeout(wait) else {
+        return ptr::null_mut();
+    };
+    if token.is_empty() {
+        return ptr::null_mut();
+    }
+    new_string_or_null(&mut env, &token)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeStartLoginWithCredentials(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    username: JString,
+    password: JString,
+    persistent_session: jboolean,
+    authenticator: JObject,
+    callback: JObject,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        call_auth_result_failure(&mut env, &callback, 2, "session closed");
+        return;
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        call_auth_result_failure(&mut env, &callback, 2, "not connected");
+        return;
+    };
+    let Some(username) = jstring_to_string(&mut env, &username) else {
+        call_auth_result_failure(&mut env, &callback, 2, "missing username");
+        return;
+    };
+    let Some(password) = jstring_to_string(&mut env, &password) else {
+        call_auth_result_failure(&mut env, &callback, 2, "missing password");
+        return;
+    };
+    let Ok(callback) = env.new_global_ref(callback) else {
+        clear_pending_exception(&mut env);
+        return;
+    };
+    let authenticator = if authenticator.is_null() {
+        None
+    } else {
+        env.new_global_ref(authenticator).ok()
+    };
+    let cancel = handle.begin_login_cancel();
+    thread::spawn(move || {
+        let timeout = Duration::from_secs(30);
+        let mut config = CredentialsAuthConfig {
+            username,
+            password,
+            persistent_session: persistent_session != JNI_FALSE,
+            ..Default::default()
+        };
+        let key_job = match request_service_method_job(
+            &runtime,
+            "Authentication.GetPasswordRSAPublicKey#1",
+            false,
+            build_password_rsa_request(&config).serialize(),
+            timeout,
+            Some(cancel.as_ref()),
+        ) {
+            Some(job) => job,
+            None => {
+                if cancel.load(Ordering::Relaxed) {
+                    return;
+                }
+                dispatch_auth_result(
+                    &callback,
+                    AuthSessionResult {
+                        error_message: "GetPasswordRSAPublicKey timed out".to_string(),
+                        ..Default::default()
+                    },
+                );
+                return;
+            }
+        };
+        if key_job.synthetic_failure || key_job.eresult != 1 {
+            dispatch_auth_result(
+                &callback,
+                auth_result_from_job(&key_job, "GetPasswordRSAPublicKey"),
+            );
+            return;
+        }
+        let Some(key) = crate::pb::cauthentication::GetPasswordRsaPublicKeyResponse::deserialize(
+            &key_job.body,
+        ) else {
+            dispatch_auth_result(
+                &callback,
+                AuthSessionResult {
+                    error_message: "GetPasswordRSAPublicKey parse failed".to_string(),
+                    ..Default::default()
+                },
+            );
+            return;
+        };
+        let begin_request = match build_credentials_begin_request(&mut config, &key) {
+            Ok(request) => request,
+            Err(result) => {
+                dispatch_auth_result(&callback, result);
+                return;
+            }
+        };
+        let begin_job = match request_service_method_job(
+            &runtime,
+            "Authentication.BeginAuthSessionViaCredentials#1",
+            false,
+            begin_request.serialize(),
+            timeout,
+            Some(cancel.as_ref()),
+        ) {
+            Some(job) => job,
+            None => {
+                if cancel.load(Ordering::Relaxed) {
+                    return;
+                }
+                dispatch_auth_result(
+                    &callback,
+                    AuthSessionResult {
+                        error_message: "BeginAuthSessionViaCredentials timed out".to_string(),
+                        ..Default::default()
+                    },
+                );
+                return;
+            }
+        };
+        if begin_job.synthetic_failure || begin_job.eresult != 1 {
+            dispatch_auth_result(
+                &callback,
+                auth_result_from_job(&begin_job, "BeginAuthSessionViaCredentials"),
+            );
+            return;
+        }
+        let Some(begin_response) =
+            crate::pb::cauthentication::BeginAuthSessionViaCredentialsResponse::deserialize(
+                &begin_job.body,
+            )
+        else {
+            dispatch_auth_result(
+                &callback,
+                AuthSessionResult {
+                    error_message: "BeginAuthSessionViaCredentials parse failed".to_string(),
+                    ..Default::default()
+                },
+            );
+            return;
+        };
+        let pending = match pending_credentials_from_begin_response(begin_response) {
+            Ok(pending) => pending,
+            Err(result) => {
+                dispatch_auth_result(&callback, result);
+                return;
+            }
+        };
+        let chosen_guard = choose_guard_confirmation(&pending.allowed_confirmations);
+        match chosen_guard {
+            crate::pb::cauthentication::EAuthSessionGuardType::DeviceConfirmation => {
+                if let Some(authenticator) = authenticator.as_ref() {
+                    // Mirrors C++: the boolean is informational. The phone tap is
+                    // observed through the poll loop regardless of whether the UI
+                    // dismissed the prompt.
+                    let _ = authenticator_accept_device_confirmation(authenticator);
+                }
+            }
+            crate::pb::cauthentication::EAuthSessionGuardType::DeviceCode => {
+                let Some(authenticator) = authenticator.as_ref() else {
+                    dispatch_auth_result(
+                        &callback,
+                        AuthSessionResult {
+                            error_message: "Steam Guard device code required".to_string(),
+                            ..Default::default()
+                        },
+                    );
+                    return;
+                };
+                let Some(code) = authenticator_get_device_code(authenticator, false) else {
+                    if cancel.load(Ordering::Relaxed) {
+                        return;
+                    }
+                    dispatch_auth_result(
+                        &callback,
+                        AuthSessionResult {
+                            error_message: "Steam Guard device code was not provided".to_string(),
+                            ..Default::default()
+                        },
+                    );
+                    return;
+                };
+                let update = build_guard_code_request(
+                    pending.client_id,
+                    pending.steamid,
+                    chosen_guard,
+                    code,
+                );
+                let update_job = match request_service_method_job(
+                    &runtime,
+                    "Authentication.UpdateAuthSessionWithSteamGuardCode#1",
+                    false,
+                    update.serialize(),
+                    timeout,
+                    Some(cancel.as_ref()),
+                ) {
+                    Some(job) => job,
+                    None => {
+                        if cancel.load(Ordering::Relaxed) {
+                            return;
+                        }
+                        dispatch_auth_result(
+                            &callback,
+                            AuthSessionResult {
+                                error_message: "UpdateAuthSessionWithSteamGuardCode timed out"
+                                    .to_string(),
+                                ..Default::default()
+                            },
+                        );
+                        return;
+                    }
+                };
+                // C++ accepts eresult 1 (OK) or 29 (DuplicateRequest — same code
+                // resubmitted) as a non-fatal "proceed to poll".
+                if !crate::auth_session::guard_update_succeeded(&update_job) {
+                    dispatch_auth_result(
+                        &callback,
+                        auth_result_from_job(&update_job, "UpdateAuthSessionWithSteamGuardCode"),
+                    );
+                    return;
+                }
+            }
+            crate::pb::cauthentication::EAuthSessionGuardType::EmailCode => {
+                let Some(authenticator) = authenticator.as_ref() else {
+                    dispatch_auth_result(
+                        &callback,
+                        AuthSessionResult {
+                            error_message: "Steam Guard email code required".to_string(),
+                            ..Default::default()
+                        },
+                    );
+                    return;
+                };
+                let email = pending
+                    .allowed_confirmations
+                    .iter()
+                    .find(|confirmation| confirmation.confirmation_type == chosen_guard)
+                    .map(|confirmation| confirmation.associated_message.as_str())
+                    .unwrap_or_default();
+                let Some(code) = authenticator_get_email_code(authenticator, email, false) else {
+                    if cancel.load(Ordering::Relaxed) {
+                        return;
+                    }
+                    dispatch_auth_result(
+                        &callback,
+                        AuthSessionResult {
+                            error_message: "Steam Guard email code was not provided".to_string(),
+                            ..Default::default()
+                        },
+                    );
+                    return;
+                };
+                let update = build_guard_code_request(
+                    pending.client_id,
+                    pending.steamid,
+                    chosen_guard,
+                    code,
+                );
+                let update_job = match request_service_method_job(
+                    &runtime,
+                    "Authentication.UpdateAuthSessionWithSteamGuardCode#1",
+                    false,
+                    update.serialize(),
+                    timeout,
+                    Some(cancel.as_ref()),
+                ) {
+                    Some(job) => job,
+                    None => {
+                        if cancel.load(Ordering::Relaxed) {
+                            return;
+                        }
+                        dispatch_auth_result(
+                            &callback,
+                            AuthSessionResult {
+                                error_message: "UpdateAuthSessionWithSteamGuardCode timed out"
+                                    .to_string(),
+                                ..Default::default()
+                            },
+                        );
+                        return;
+                    }
+                };
+                if !crate::auth_session::guard_update_succeeded(&update_job) {
+                    dispatch_auth_result(
+                        &callback,
+                        auth_result_from_job(&update_job, "UpdateAuthSessionWithSteamGuardCode"),
+                    );
+                    return;
+                }
+            }
+            _ => {}
+        }
+
+        let poll_interval = Duration::from_secs_f32(pending.poll_interval_seconds.max(0.25));
+        let mut client_id = pending.client_id;
+        let fallback_account_name = config.username.clone();
+        loop {
+            for slice in sleep_slices(poll_interval, Duration::from_millis(100)) {
+                if cancel.load(Ordering::Relaxed) {
+                    return;
+                }
+                thread::sleep(slice);
+            }
+            if cancel.load(Ordering::Relaxed) {
+                return;
+            }
+            let poll_job = match request_service_method_job(
+                &runtime,
+                "Authentication.PollAuthSessionStatus#1",
+                false,
+                build_poll_request(client_id, pending.request_id.clone()).serialize(),
+                timeout,
+                Some(cancel.as_ref()),
+            ) {
+                Some(job) => job,
+                None => {
+                    if cancel.load(Ordering::Relaxed) {
+                        return;
+                    }
+                    dispatch_auth_result(
+                        &callback,
+                        AuthSessionResult {
+                            error_message: "PollAuthSessionStatus timed out".to_string(),
+                            ..Default::default()
+                        },
+                    );
+                    return;
+                }
+            };
+            if poll_job.synthetic_failure || poll_job.eresult != 1 {
+                dispatch_auth_result(
+                    &callback,
+                    auth_result_from_job(&poll_job, "PollAuthSessionStatus"),
+                );
+                return;
+            }
+            let Some(resp) = crate::pb::cauthentication::PollAuthSessionStatusResponse::deserialize(
+                &poll_job.body,
+            ) else {
+                dispatch_auth_result(
+                    &callback,
+                    AuthSessionResult {
+                        error_message: "Poll response parse failed".to_string(),
+                        ..Default::default()
+                    },
+                );
+                return;
+            };
+            if resp.new_client_id != 0 {
+                client_id = resp.new_client_id;
+            }
+            if let Some(mut result) = auth_result_from_poll(resp, pending.steamid) {
+                apply_account_name_fallback(&mut result, &fallback_account_name);
+                dispatch_auth_result(&callback, result);
+                return;
+            }
+        }
+    });
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeStartLoginWithQr(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    qr_callback: JObject,
+    result_callback: JObject,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        call_auth_result_failure(&mut env, &result_callback, 2, "session closed");
+        return;
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        call_auth_result_failure(
+            &mut env,
+            &result_callback,
+            2,
+            "Rust QR auth transport is not connected",
+        );
+        return;
+    };
+    let Ok(qr_callback) = env.new_global_ref(qr_callback) else {
+        clear_pending_exception(&mut env);
+        call_auth_result_failure(&mut env, &result_callback, 2, "QR callback unavailable");
+        return;
+    };
+    let Ok(result_callback) = env.new_global_ref(result_callback) else {
+        clear_pending_exception(&mut env);
+        return;
+    };
+    let cancel = handle.begin_login_cancel();
+    thread::spawn(move || {
+        let timeout = Duration::from_secs(30);
+        let request = build_qr_begin_request(&QrAuthConfig::default()).serialize();
+        qr_log("BeginAuthSessionViaQR request queued");
+        let begin_job = match request_service_method_job(
+            &runtime,
+            "Authentication.BeginAuthSessionViaQR#1",
+            false,
+            request,
+            timeout,
+            Some(cancel.as_ref()),
+        ) {
+            Some(job) => job,
+            None => {
+                if cancel.load(Ordering::Relaxed) {
+                    qr_log("BeginAuthSessionViaQR cancelled before response");
+                    return;
+                }
+                qr_log("BeginAuthSessionViaQR timed out");
+                dispatch_auth_result(
+                    &result_callback,
+                    AuthSessionResult {
+                        error_message: "BeginAuthSessionViaQR timed out".to_string(),
+                        ..Default::default()
+                    },
+                );
+                return;
+            }
+        };
+        if begin_job.synthetic_failure || begin_job.eresult != 1 {
+            qr_log(&format!(
+                "BeginAuthSessionViaQR failed synthetic={} eresult={} body_len={}",
+                begin_job.synthetic_failure,
+                begin_job.eresult,
+                begin_job.body.len()
+            ));
+            dispatch_auth_result(
+                &result_callback,
+                auth_result_from_job(&begin_job, "BeginAuthSessionViaQR"),
+            );
+            return;
+        }
+        let Some(resp) =
+            crate::pb::cauthentication::BeginAuthSessionViaQrResponse::deserialize(&begin_job.body)
+        else {
+            qr_log(&format!(
+                "BeginAuthSessionViaQR parse failed body_len={}",
+                begin_job.body.len()
+            ));
+            dispatch_auth_result(
+                &result_callback,
+                AuthSessionResult {
+                    error_message: "QR response parse failed".to_string(),
+                    ..Default::default()
+                },
+            );
+            return;
+        };
+        let pending = pending_qr_from_begin_response(resp);
+        qr_log(&format!(
+            "BeginAuthSessionViaQR response client_id={} request_id_len={} interval_s={:.2} challenge_len={}",
+            pending.client_id,
+            pending.request_id.len(),
+            pending.poll_interval_seconds,
+            pending.challenge_url.len()
+        ));
+        if pending.client_id == 0 || pending.request_id.is_empty() {
+            qr_log("Steam rejected QR auth session");
+            dispatch_auth_result(
+                &result_callback,
+                AuthSessionResult {
+                    eresult: 5,
+                    error_message: "Steam rejected the QR auth session".to_string(),
+                    ..Default::default()
+                },
+            );
+            return;
+        }
+        dispatch_qr_challenge(&qr_callback, &pending.challenge_url);
+        start_qr_poll_loop(QrPollState {
+            runtime,
+            qr_callback,
+            result_callback,
+            cancel,
+            client_id: pending.client_id,
+            request_id: pending.request_id,
+            poll_interval_seconds: pending.poll_interval_seconds,
+            last_challenge_url: Arc::new(Mutex::new(pending.challenge_url)),
+        });
+    });
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCancelLogin(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.cancel_login();
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeLogonWithRefreshToken(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    refresh_token: JString,
+    account_name: JString,
+    steam_id: jlong,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let Some(refresh_token) = jstring_to_string(&mut env, &refresh_token) else {
+        return JNI_FALSE;
+    };
+    if refresh_token.is_empty() {
+        return JNI_FALSE;
+    }
+    let account_name = jstring_to_string(&mut env, &account_name).unwrap_or_default();
+    if handle.enqueue_proto(handle.core.build_logon_with_refresh_token(
+        refresh_token,
+        account_name,
+        steam_id as u64,
+    )) {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativePrepareApp(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    dlc_app_ids: JIntArray,
+    callback: JObject,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        call_prepare_result(&mut env, &callback, false, "session closed");
+        return;
+    };
+    if callback.is_null() {
+        return;
+    }
+    let Some(runtime) = handle.connected_runtime() else {
+        call_prepare_result(&mut env, &callback, false, "not connected");
+        return;
+    };
+    let dlc_app_ids = int_array_to_u32_vec(&env, &dlc_app_ids);
+    let all_ids = CMClientCore::prepare_app_ids(app_id as u32, &dlc_app_ids);
+    if all_ids.is_empty() {
+        call_prepare_result(&mut env, &callback, true, "");
+        return;
+    }
+
+    let missing_tokens = handle.core.prepare_app_missing_token_ids(&all_ids);
+    if !missing_tokens.is_empty() {
+        if let Some(body) = request_proto_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_pics_access_tokens(Vec::new(), missing_tokens, job_id)
+        }) {
+            if let Some(response) =
+                crate::pb::cmsg_client_pics::CMsgClientPICSAccessTokenResponse::deserialize(&body)
+            {
+                handle.core.library().ingest_app_access_tokens(&response);
+            }
+        }
+    }
+
+    let apps = handle.core.prepare_app_pics_requests(&all_ids);
+    let Some(response) =
+        request_pics_product_info(&runtime, Vec::new(), apps, false, Duration::from_secs(30))
+    else {
+        call_prepare_result(&mut env, &callback, false, "PICS product info failed");
+        return;
+    };
+    handle.core.library().ingest_app_pics_response(&response);
+
+    for app_id in all_ids {
+        let _ = request_app_ownership_ticket(&runtime, app_id, Duration::from_secs(30));
+    }
+    call_prepare_result(&mut env, &callback, true, "");
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeDownloadApp(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    depot_ids: JIntArray,
+    manifest_ids: JLongArray,
+    branch: JString,
+    install_dir: JString,
+    fresh: jboolean,
+    ca_bundle_path: JString,
+    max_workers: jint,
+    listener: JObject,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        call_download_complete(&mut env, &listener, "session closed");
+        return;
+    };
+    if listener.is_null() {
+        return;
+    }
+    let Some(runtime) = handle.connected_runtime() else {
+        call_download_complete(&mut env, &listener, "not connected");
+        return;
+    };
+    let depot_ids = int_array_to_u32_vec(&env, &depot_ids);
+    let manifest_ids = long_array_to_u64_vec(&env, &manifest_ids);
+    if depot_ids.len() != manifest_ids.len() {
+        call_download_complete(&mut env, &listener, "depot/manifest array length mismatch");
+        return;
+    }
+    let specs = depot_ids
+        .into_iter()
+        .zip(manifest_ids)
+        .map(
+            |(depot_id, manifest_id)| crate::depot_downloader::DepotSpec {
+                depot_id,
+                manifest_id,
+            },
+        )
+        .collect::<Vec<_>>();
+    let install_dir = jstring_to_string(&mut env, &install_dir).unwrap_or_default();
+    if crate::depot_downloader::validate_download_inputs(&install_dir, &specs).is_err() {
+        call_download_complete(&mut env, &listener, "invalid download request");
+        return;
+    }
+    let branch = jstring_to_string(&mut env, &branch).unwrap_or_else(|| "public".to_string());
+    let ca_bundle_path = jstring_to_string(&mut env, &ca_bundle_path).unwrap_or_default();
+    let Ok(listener) = env.new_global_ref(&listener) else {
+        call_download_complete(&mut env, &listener, "listener ref failed");
+        return;
+    };
+    let app_id = app_id.max(0) as u32;
+    let fresh = fresh != JNI_FALSE;
+    let max_workers = max_workers.max(1) as u32;
+    handle.download_cancel.store(false, Ordering::Relaxed);
+    let download_cancel = Arc::clone(&handle.download_cancel);
+
+    thread::spawn(move || {
+        let timeout = Duration::from_secs(30);
+        if download_cancel.load(Ordering::Relaxed) {
+            dispatch_download_complete(
+                listener,
+                crate::depot_downloader::DepotDownloadResult::fail("cancelled"),
+            );
+            return;
+        }
+        let Some(servers) = request_cdn_servers(&runtime, timeout) else {
+            dispatch_download_complete(
+                listener.clone(),
+                crate::depot_downloader::DepotDownloadResult::fail(
+                    "download: CDN server request failed",
+                ),
+            );
+            return;
+        };
+        let config_dir = std::path::Path::new(&install_dir).join(".DepotDownloader");
+        let installed_cfg = crate::depot_config::DepotConfigStore::load(&config_dir);
+        let mut resolved = Vec::with_capacity(specs.len());
+        let mut denied: Vec<u32> = Vec::new();
+        for spec in specs {
+            if download_cancel.load(Ordering::Relaxed) {
+                dispatch_download_complete(
+                    listener,
+                    crate::depot_downloader::DepotDownloadResult::fail("cancelled"),
+                );
+                return;
+            }
+            // Already-installed depots need no key/code; the downloader's resume-skip handles them.
+            if !fresh && installed_cfg.is_installed(spec.depot_id, spec.manifest_id) {
+                resolved.push(crate::depot_downloader::ResolvedDepotSpec {
+                    depot_id: spec.depot_id,
+                    manifest_id: spec.manifest_id,
+                    depot_key: Vec::new(),
+                    manifest_request_code: 0,
+                });
+                continue;
+            }
+            let depot_key = match resolve_depot_key_with_retry(
+                &runtime,
+                app_id,
+                spec.depot_id,
+                timeout,
+                download_cancel.as_ref(),
+            ) {
+                KeyResolution::Granted(key) => key,
+                // Access-denied means this account is not entitled; skip that depot, keep the rest.
+                KeyResolution::AccessDenied => {
+                    denied.push(spec.depot_id);
+                    continue;
+                }
+                KeyResolution::Cancelled => {
+                    dispatch_download_complete(
+                        listener,
+                        crate::depot_downloader::DepotDownloadResult::fail("cancelled"),
+                    );
+                    return;
+                }
+                KeyResolution::Unavailable => {
+                    dispatch_download_complete(
+                        listener.clone(),
+                        crate::depot_downloader::DepotDownloadResult::fail(format!(
+                            "download: depot key unavailable for depot {}",
+                            spec.depot_id
+                        )),
+                    );
+                    return;
+                }
+            };
+            let manifest_request_code = match resolve_manifest_code_with_retry(
+                &runtime,
+                app_id,
+                spec.depot_id,
+                spec.manifest_id,
+                &branch,
+                timeout,
+                download_cancel.as_ref(),
+            ) {
+                CodeResolution::Code(code) => code,
+                CodeResolution::AccessDenied => {
+                    denied.push(spec.depot_id);
+                    continue;
+                }
+                CodeResolution::Cancelled => {
+                    dispatch_download_complete(
+                        listener,
+                        crate::depot_downloader::DepotDownloadResult::fail("cancelled"),
+                    );
+                    return;
+                }
+                CodeResolution::Unavailable => {
+                    dispatch_download_complete(
+                        listener.clone(),
+                        crate::depot_downloader::DepotDownloadResult::fail(format!(
+                            "download: manifest request code unavailable for depot {}",
+                            spec.depot_id
+                        )),
+                    );
+                    return;
+                }
+            };
+            resolved.push(crate::depot_downloader::ResolvedDepotSpec {
+                depot_id: spec.depot_id,
+                manifest_id: spec.manifest_id,
+                depot_key,
+                manifest_request_code,
+            });
+        }
+        write_denied_depots_marker(&config_dir, &denied);
+        if resolved.is_empty() {
+            dispatch_download_complete(
+                listener,
+                crate::depot_downloader::DepotDownloadResult::fail(if denied.is_empty() {
+                    "download: no depots".to_string()
+                } else {
+                    "download: no entitled depots (all depot keys denied)".to_string()
+                }),
+            );
+            return;
+        }
+        let progress_listener = listener.clone();
+        let progress = |progress: &crate::depot_downloader::DepotDownloadProgress| {
+            dispatch_download_progress(&progress_listener, progress);
+        };
+        let progress_cb: crate::depot_downloader::DepotProgressCallback = &progress;
+        // Re-resolve manifest request codes right before each depot's manifest fetch.
+        let code_refresher = |depot_id: u32, manifest_id: u64| -> Option<u64> {
+            match resolve_manifest_code_with_retry(
+                &runtime,
+                app_id,
+                depot_id,
+                manifest_id,
+                &branch,
+                timeout,
+                download_cancel.as_ref(),
+            ) {
+                CodeResolution::Code(code) => Some(code),
+                _ => None,
+            }
+        };
+        let code_refresher_cb: crate::depot_downloader::ManifestCodeRefresher = &code_refresher;
+        let result =
+            crate::depot_downloader::download_resolved_depots_with_cancel_progress(
+                &install_dir,
+                &resolved,
+                &servers,
+                &ca_bundle_path,
+                fresh,
+                max_workers,
+                Some(download_cancel.as_ref()),
+                Some(progress_cb),
+                Some(code_refresher_cb),
+            );
+        dispatch_download_complete(listener, result);
+    });
+}
+
+fn dispatch_download_progress(
+    listener: &GlobalRef,
+    progress: &crate::depot_downloader::DepotDownloadProgress,
+) {
+    let Some(vm) = JVM.get() else {
+        return;
+    };
+    let Ok(mut env) = vm.attach_current_thread_as_daemon() else {
+        return;
+    };
+    let _ = env.call_method(
+        listener.as_obj(),
+        "onProgress",
+        "(IJJIIZ)V",
+        &[
+            JValue::Int(progress.depot_id as jint),
+            JValue::Long(progress.depot_done as jlong),
+            JValue::Long(progress.depot_total as jlong),
+            JValue::Int(progress.depots_done as jint),
+            JValue::Int(progress.depots_total as jint),
+            JValue::Bool(if progress.verifying { JNI_TRUE } else { JNI_FALSE }),
+        ],
+    );
+    clear_pending_exception(&mut env);
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCancelDownload(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) {
+    if let Some(handle) = unsafe { from_session_handle_mut(handle) } {
+        handle.download_cancel.store(true, Ordering::Relaxed);
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeRequestEncryptedAppTicket(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+) -> jbyteArray {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    if app_id <= 0 || handle.core.state() != ClientState::LoggedOn {
+        return ptr::null_mut();
+    }
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+
+    let app_id = app_id as u32;
+    let job_id = runtime.next_job_id();
+    let Some(message) = runtime
+        .core()
+        .build_request_encrypted_app_ticket(app_id, job_id)
+    else {
+        return ptr::null_mut();
+    };
+
+    let (tx, rx) = mpsc::channel();
+    runtime.track_job(
+        job_id,
+        move |job| {
+            let ticket = if job.synthetic_failure {
+                Vec::new()
+            } else {
+                crate::pb::cmsg_client_request_encrypted_app_ticket::CMsgClientRequestEncryptedAppTicketResponse::deserialize(&job.body)
+                    .map(|response| response.encrypted_app_ticket)
+                    .unwrap_or_default()
+            };
+            let _ = tx.send(ticket);
+        },
+        Some(Duration::from_secs(30)),
+    );
+    if !runtime.core().enqueue_wire(message.wire) {
+        return ptr::null_mut();
+    }
+    runtime.flush_outbound();
+
+    let Ok(ticket) = rx.recv_timeout(Duration::from_secs(30)) else {
+        return ptr::null_mut();
+    };
+    if ticket.is_empty() {
+        return ptr::null_mut();
+    }
+    byte_array_or_null(&env, &ticket)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetUserStatsSchema(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+) -> jbyteArray {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(response) =
+        request_user_stats_response(&runtime, app_id.max(0) as u32, Duration::from_secs(30))
+    else {
+        return ptr::null_mut();
+    };
+    if response.schema.is_empty() {
+        return ptr::null_mut();
+    }
+    byte_array_or_null(&env, &response.schema)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetUserStatsFull(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(response) =
+        request_user_stats_response(&runtime, app_id.max(0) as u32, Duration::from_secs(30))
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "eresult": response.eresult,
+        "crcStats": response.crc_stats,
+        "schema": crate::cdn_client::hex_encode(&response.schema),
+        "achievementBlocks": response.achievement_blocks.iter().map(|block| json!({
+            "achievementId": block.achievement_id,
+            "unlockTimes": block.unlock_time,
+        })).collect::<Vec<_>>(),
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetItemDefArchive(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    ca_bundle_path: JString,
+) -> jbyteArray {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    let Some(digest) = request_item_def_digest(&runtime, app_id, Duration::from_secs(30)) else {
+        return ptr::null_mut();
+    };
+    let ca_bundle_path = jstring_to_string(&mut env, &ca_bundle_path).unwrap_or_default();
+    let Some(body) = crate::cdn_client::CdnClient::new(ca_bundle_path).fetch_item_def_archive(
+        app_id,
+        &digest,
+        Duration::from_secs(30),
+    ) else {
+        return ptr::null_mut();
+    };
+    byte_array_or_null(&env, &body)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetSubscribedWorkshopItems(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    const PAGE_SIZE: u32 = 100;
+    const MAX_PAGES: u32 = 50;
+    let mut total = 0u32;
+    let mut all = Vec::new();
+    for page in 1..=MAX_PAGES {
+        let Some(response) = request_subscribed_workshop_page(
+            &runtime,
+            app_id,
+            page,
+            PAGE_SIZE,
+            Duration::from_secs(30),
+        ) else {
+            return ptr::null_mut();
+        };
+        if page == 1 {
+            total = response.total;
+        }
+        let count = response.publishedfiledetails.len();
+        all.extend(response.publishedfiledetails);
+        if count == 0 || (total != 0 && all.len() >= total as usize) {
+            break;
+        }
+    }
+    let value = json!(all
+        .iter()
+        .map(|detail| json!({
+            "publishedFileId": detail.publishedfileid,
+            "appId": if detail.consumer_appid != 0 { detail.consumer_appid } else { app_id },
+            "title": detail.title,
+            "fileName": detail.filename,
+            "fileUrl": detail.file_url,
+            "previewUrl": detail.preview_url,
+            "fileSizeBytes": detail.file_size,
+            "hcontentFile": detail.hcontent_file,
+            "timeUpdated": detail.time_updated,
+        }))
+        .collect::<Vec<_>>())
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeDownloadWorkshopItem(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    manifest_id: jlong,
+    install_dir: JString,
+    ca_bundle_path: JString,
+    max_workers: jint,
+) -> jlong {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return -1;
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return -1;
+    };
+    let install_dir = jstring_to_string(&mut env, &install_dir).unwrap_or_default();
+    if install_dir.is_empty() || app_id <= 0 || manifest_id <= 0 {
+        return -1;
+    }
+    let ca_bundle_path = jstring_to_string(&mut env, &ca_bundle_path).unwrap_or_default();
+    let app_id = app_id as u32;
+    let manifest_id = manifest_id as u64;
+    let timeout = Duration::from_secs(30);
+    let Some(servers) = request_cdn_servers(&runtime, timeout) else {
+        return -1;
+    };
+    let DepotKeyOutcome::Granted(depot_key) =
+        request_depot_key(&runtime, app_id, app_id, timeout)
+    else {
+        return -1;
+    };
+    let ManifestCodeOutcome::Code(manifest_request_code) =
+        request_manifest_request_code(&runtime, app_id, app_id, manifest_id, "public", timeout)
+    else {
+        return -1;
+    };
+    let spec = crate::depot_downloader::ResolvedDepotSpec {
+        depot_id: app_id,
+        manifest_id,
+        depot_key,
+        manifest_request_code,
+    };
+    let result = crate::depot_downloader::download_resolved_depots(
+        &install_dir,
+        &[spec],
+        &servers,
+        &ca_bundle_path,
+        true,
+        max_workers.max(1) as u32,
+    );
+    if result.success {
+        result.bytes_written as jlong
+    } else {
+        -1
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetCloudFileList(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_app_file_changelist_call(app_id, 0, job_id)
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::ccloud::CCloudGetAppFileChangelistResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "currentChangeNumber": response.current_change_number,
+        "pathPrefixes": response.path_prefixes,
+        "machineNames": response.machine_names,
+        "files": response.files.iter().map(|file| json!({
+            "fileName": file.file_name,
+            "sha": crate::cdn_client::hex_encode(&file.sha_file),
+            "timestamp": file.time_stamp,
+            "size": file.raw_file_size,
+            "persistState": file.persist_state,
+            "pathPrefixIndex": file.path_prefix_index,
+            "machineNameIndex": file.machine_name_index,
+        })).collect::<Vec<_>>(),
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetCloudUserQuota(
+    env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+) -> jlongArray {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_user_quota_call(job_id)
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::ccloud::CCloudGetUserQuotaResponse::deserialize(&body) else {
+        return ptr::null_mut();
+    };
+    let Ok(array) = env.new_long_array(2) else {
+        return ptr::null_mut();
+    };
+    let values = [response.total_bytes as jlong, response.used_bytes as jlong];
+    if env.set_long_array_region(&array, 0, &values).is_err() {
+        return ptr::null_mut();
+    }
+    array.into_raw()
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetCloudDownloadInfo(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    filename: JString,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    let Some(filename) = jstring_to_string(&mut env, &filename) else {
+        return ptr::null_mut();
+    };
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_file_download_info_call(app_id, filename, job_id)
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::ccloud::CCloudClientFileDownloadResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    if response.url_host.is_empty() {
+        return ptr::null_mut();
+    }
+    let value = json!({
+        "fileSize": response.file_size,
+        "rawFileSize": response.raw_file_size,
+        "sha": crate::cdn_client::hex_encode(&response.sha_file),
+        "timestamp": response.time_stamp,
+        "urlHost": response.url_host,
+        "urlPath": response.url_path,
+        "useHttps": response.use_https,
+        "encrypted": response.encrypted,
+        "headers": response.request_headers.iter().map(|header| json!({
+            "name": header.name,
+            "value": header.value,
+        })).collect::<Vec<_>>(),
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCloudBeginUploadBatch(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    files: JString,
+    files_to_delete: JString,
+    client_id: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    let files = split_nonempty_lines(&jstring_to_string(&mut env, &files).unwrap_or_default());
+    let files_to_delete =
+        split_nonempty_lines(&jstring_to_string(&mut env, &files_to_delete).unwrap_or_default());
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_begin_app_upload_batch_call(
+                app_id,
+                String::new(),
+                files,
+                files_to_delete,
+                client_id as u64,
+                job_id,
+            )
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::ccloud::CCloudBeginAppUploadBatchResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "batchId": response.batch_id,
+        "appChangeNumber": response.app_change_number,
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCloudBeginFileUpload(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    filename: JString,
+    file_size: jint,
+    raw_file_size: jint,
+    sha_hex: JString,
+    timestamp: jlong,
+    batch_id: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(filename) = jstring_to_string(&mut env, &filename) else {
+        return ptr::null_mut();
+    };
+    let Some(sha_hex) = jstring_to_string(&mut env, &sha_hex) else {
+        return ptr::null_mut();
+    };
+    let Some(file_sha) = decode_hex(&sha_hex) else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_begin_file_upload_call(
+                app_id,
+                filename,
+                file_size as u32,
+                raw_file_size as u32,
+                file_sha,
+                timestamp as u64,
+                batch_id as u64,
+                job_id,
+            )
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::ccloud::CCloudClientBeginFileUploadResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "encryptFile": response.encrypt_file,
+        "blocks": response.block_requests.iter().map(|block| json!({
+            "urlHost": block.url_host,
+            "urlPath": block.url_path,
+            "useHttps": block.use_https,
+            "httpMethod": block.http_method,
+            "blockOffset": block.block_offset,
+            "blockLength": block.block_length,
+            "mayParallelize": block.may_parallelize,
+            "headers": block.request_headers.iter().map(|header| json!({
+                "name": header.name,
+                "value": header.value,
+            })).collect::<Vec<_>>(),
+        })).collect::<Vec<_>>(),
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCloudCommitFileUpload(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    transfer_succeeded: jboolean,
+    app_id: jint,
+    sha_hex: JString,
+    filename: JString,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return JNI_FALSE;
+    };
+    let Some(sha_hex) = jstring_to_string(&mut env, &sha_hex) else {
+        return JNI_FALSE;
+    };
+    let Some(filename) = jstring_to_string(&mut env, &filename) else {
+        return JNI_FALSE;
+    };
+    let Some(file_sha) = decode_hex(&sha_hex) else {
+        return JNI_FALSE;
+    };
+    let app_id = app_id.max(0) as u32;
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_commit_file_upload_call(
+                transfer_succeeded != JNI_FALSE,
+                app_id,
+                file_sha,
+                filename,
+                job_id,
+            )
+        })
+    else {
+        return JNI_FALSE;
+    };
+    if crate::pb::ccloud::CCloudClientCommitFileUploadResponse::deserialize(&body)
+        .map(|response| response.file_committed)
+        .unwrap_or(false)
+    {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeCloudCompleteUploadBatch(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    batch_id: jlong,
+    batch_eresult: jint,
+) -> jboolean {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return JNI_FALSE;
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return JNI_FALSE;
+    };
+    if request_authed_service_success(&runtime, Duration::from_secs(30), |core, job_id| {
+        core.build_cloud_complete_app_upload_batch_call(
+            app_id.max(0) as u32,
+            batch_id as u64,
+            batch_eresult as u32,
+            job_id,
+        )
+    }) {
+        JNI_TRUE
+    } else {
+        JNI_FALSE
+    }
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetPicsChangesSince(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    since_change_number: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(body) = request_proto_body(&runtime, Duration::from_secs(30), |core, job_id| {
+        core.build_pics_changes_since(since_change_number as u32, job_id)
+    }) else {
+        return ptr::null_mut();
+    };
+    let Some(response) =
+        crate::pb::cmsg_client_pics::CMsgClientPICSChangesSinceResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "currentChangeNumber": response.current_change_number,
+        "forceFullUpdate": response.force_full_update,
+        "apps": response.app_changes.iter().map(|app| json!({
+            "appid": app.appid,
+            "changeNumber": app.change_number,
+            "needsToken": app.needs_token,
+        })).collect::<Vec<_>>(),
+        "packages": response.package_changes.iter().map(|package| json!({
+            "packageid": package.packageid,
+            "changeNumber": package.change_number,
+            "needsToken": package.needs_token,
+        })).collect::<Vec<_>>(),
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetPicsAppInfo(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    access_token: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_id = app_id.max(0) as u32;
+    let app = crate::pb::cmsg_client_pics::PicsAppInfoReq {
+        appid: app_id,
+        access_token: access_token as u64,
+        only_public_obsolete: false,
+    };
+    let Some(response) = request_pics_product_info(
+        &runtime,
+        Vec::new(),
+        vec![app],
+        false,
+        Duration::from_secs(30),
+    ) else {
+        return ptr::null_mut();
+    };
+    for app in response.apps {
+        if app.appid != app_id || app.buffer.is_empty() {
+            continue;
+        }
+        let Some(root) = crate::vdf::parse_auto(&app.buffer) else {
+            return ptr::null_mut();
+        };
+        let appinfo = if root.name.eq_ignore_ascii_case("appinfo") {
+            &root
+        } else {
+            root.child("appinfo").unwrap_or(&root)
+        };
+        let value = json!({
+            "changeNumber": app.change_number,
+            "appinfo": kvnode_to_json_value(appinfo),
+        })
+        .to_string();
+        return new_string_or_null(&mut env, &value);
+    }
+    ptr::null_mut()
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetPicsAccessTokens(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_ids: JString,
+    package_ids: JString,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_ids = parse_u32_lines(&jstring_to_string(&mut env, &app_ids).unwrap_or_default());
+    let package_ids =
+        parse_u32_lines(&jstring_to_string(&mut env, &package_ids).unwrap_or_default());
+    let Some(body) = request_proto_body(&runtime, Duration::from_secs(30), |core, job_id| {
+        core.build_pics_access_tokens(package_ids, app_ids, job_id)
+    }) else {
+        return ptr::null_mut();
+    };
+    let Some(response) =
+        crate::pb::cmsg_client_pics::CMsgClientPICSAccessTokenResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let app_tokens = response
+        .app_access_tokens
+        .iter()
+        .map(|token| {
+            (
+                token.appid.to_string(),
+                json!(token.access_token.to_string()),
+            )
+        })
+        .collect::<serde_json::Map<_, _>>();
+    let package_tokens = response
+        .package_access_tokens
+        .iter()
+        .map(|token| {
+            (
+                token.packageid.to_string(),
+                json!(token.access_token.to_string()),
+            )
+        })
+        .collect::<serde_json::Map<_, _>>();
+    let value = json!({
+        "appTokens": app_tokens,
+        "packageTokens": package_tokens,
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetPicsAppProductInfo(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_ids: JString,
+    tokens: JString,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let app_ids = parse_u32_lines(&jstring_to_string(&mut env, &app_ids).unwrap_or_default());
+    let tokens = parse_u64_lines(&jstring_to_string(&mut env, &tokens).unwrap_or_default());
+    let apps = app_ids
+        .into_iter()
+        .enumerate()
+        .map(
+            |(index, appid)| crate::pb::cmsg_client_pics::PicsAppInfoReq {
+                appid,
+                access_token: tokens.get(index).copied().unwrap_or_default(),
+                only_public_obsolete: false,
+            },
+        )
+        .collect::<Vec<_>>();
+    let Some(response) =
+        request_pics_product_info(&runtime, Vec::new(), apps, false, Duration::from_secs(30))
+    else {
+        return ptr::null_mut();
+    };
+    let mut apps = Vec::new();
+    for app in response.apps {
+        if app.buffer.is_empty() {
+            continue;
+        }
+        let Some(root) = crate::vdf::parse_auto(&app.buffer) else {
+            continue;
+        };
+        let appinfo = if root.name.eq_ignore_ascii_case("appinfo") {
+            &root
+        } else {
+            root.child("appinfo").unwrap_or(&root)
+        };
+        apps.push(json!({
+            "appid": app.appid,
+            "changeNumber": app.change_number,
+            "appinfo": kvnode_to_json_value(appinfo),
+        }));
+    }
+    new_string_or_null(&mut env, &json!(apps).to_string())
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetPicsPackageInfo(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    package_ids: JString,
+    tokens: JString,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let package_ids =
+        parse_u32_lines(&jstring_to_string(&mut env, &package_ids).unwrap_or_default());
+    let tokens = parse_u64_lines(&jstring_to_string(&mut env, &tokens).unwrap_or_default());
+    let packages = package_ids
+        .into_iter()
+        .enumerate()
+        .map(
+            |(index, packageid)| crate::pb::cmsg_client_pics::PicsPackageInfoReq {
+                packageid,
+                access_token: tokens.get(index).copied().unwrap_or_default(),
+            },
+        )
+        .collect::<Vec<_>>();
+    let Some(response) = request_pics_product_info(
+        &runtime,
+        packages,
+        Vec::new(),
+        false,
+        Duration::from_secs(30),
+    ) else {
+        return ptr::null_mut();
+    };
+    let mut packages = Vec::new();
+    for package in response.packages {
+        if package.buffer.is_empty() {
+            continue;
+        }
+        let Some((_package_id, root)) = crate::vdf::parse_binary_package(&package.buffer) else {
+            continue;
+        };
+        let appids = root
+            .child("appids")
+            .map(|node| {
+                node.children
+                    .iter()
+                    .map(|child| child.as_uint(0))
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+        let depotids = root
+            .child("depotids")
+            .map(|node| {
+                node.children
+                    .iter()
+                    .map(|child| child.as_uint(0))
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+        packages.push(json!({
+            "packageid": package.packageid,
+            "changeNumber": package.change_number,
+            "appids": appids,
+            "depotids": depotids,
+        }));
+    }
+    new_string_or_null(&mut env, &json!(packages).to_string())
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetFamilyGroup(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    family_group_id: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_family_group_call(family_group_id as u64, job_id)
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) =
+        crate::pb::cfamilygroups::CFamilyGroupsGetFamilyGroupResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "name": response.name,
+        "members": response.members.iter().map(|member| member.steamid).collect::<Vec<_>>(),
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeGetOwnedGames(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    steam_id: jlong,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_owned_games_call(steam_id as u64, job_id)
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::cplayer::CPlayerGetOwnedGamesResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!(response
+        .games
+        .iter()
+        .map(|game| json!({
+            "appId": game.appid,
+            "name": game.name,
+            "playtimeTwoWeeks": game.playtime_2weeks,
+            "playtimeForever": game.playtime_forever,
+            "imgIconUrl": game.img_icon_url,
+            "sortAs": game.sort_as,
+            "rtimeLastPlayed": game.rtime_last_played,
+        }))
+        .collect::<Vec<_>>())
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSignalAppLaunchIntent(
+    mut env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    client_id: jlong,
+    machine_name: JString,
+    ignore_pending: jboolean,
+    os_type: jint,
+) -> jstring {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return ptr::null_mut();
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return ptr::null_mut();
+    };
+    let machine_name = jstring_to_string(&mut env, &machine_name).unwrap_or_default();
+    let Some(body) =
+        request_authed_service_body(&runtime, Duration::from_secs(30), |core, job_id| {
+            core.build_cloud_launch_intent_call(
+                app_id.max(0) as u32,
+                client_id as u64,
+                machine_name,
+                ignore_pending != JNI_FALSE,
+                os_type,
+                job_id,
+            )
+        })
+    else {
+        return ptr::null_mut();
+    };
+    let Some(response) = crate::pb::ccloud::CCloudAppLaunchIntentResponse::deserialize(&body)
+    else {
+        return ptr::null_mut();
+    };
+    let value = json!({
+        "pendingOps": response.pending_operation_codes,
+    })
+    .to_string();
+    new_string_or_null(&mut env, &value)
+}
+
+#[no_mangle]
+pub extern "system" fn Java_com_winlator_cmod_feature_stores_steam_wnsteam_WnSteamSession_nativeSignalAppExitSyncDone(
+    _env: JNIEnv,
+    _class: JClass,
+    handle: jlong,
+    app_id: jint,
+    client_id: jlong,
+    uploads_completed: jboolean,
+    uploads_required: jboolean,
+) {
+    let Some(handle) = (unsafe { from_session_handle_mut(handle) }) else {
+        return;
+    };
+    let Some(runtime) = handle.connected_runtime() else {
+        return;
+    };
+    let _ = request_authed_service_success(&runtime, Duration::from_secs(5), |core, job_id| {
+        core.build_cloud_exit_sync_done_call(
+            app_id.max(0) as u32,
+            client_id as u64,
+            uploads_completed != JNI_FALSE,
+            uploads_required != JNI_FALSE,
+            job_id,
+        )
+    });
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{parse_u32_lines, parse_u64_lines};
+
+    #[test]
+    fn parses_high_bit_token_from_signed_long_string() {
+        // High-bit u64 token arrives as a negative Long string; recover unsigned.
+        assert_eq!(
+            parse_u64_lines("-2956503589389641226"),
+            vec![15490240484319910390u64]
+        );
+        // Plain unsigned strings still parse unchanged.
+        assert_eq!(parse_u64_lines("4984014265555654850"), vec![4984014265555654850u64]);
+    }
+
+    #[test]
+    fn keeps_token_to_id_pairing_aligned_across_negatives() {
+        // A dropped negative line shifts later tokens onto the wrong package.
+        let ids = parse_u32_lines("305944\n322317\n304933");
+        let tokens = parse_u64_lines("4984014265555654850\n-4562710670371372905\n3396749975682522332");
+        assert_eq!(ids.len(), 3);
+        assert_eq!(tokens.len(), 3, "no line may be dropped or pairing misaligns");
+        assert_eq!(tokens[1], (-4562710670371372905i64) as u64);
+        assert_eq!(tokens[2], 3396749975682522332u64);
+    }
+
+    #[test]
+    fn parses_high_bit_u32_id_from_signed_int_string() {
+        assert_eq!(parse_u32_lines("-1"), vec![u32::MAX]);
+        assert_eq!(parse_u32_lines("601150"), vec![601150u32]);
+    }
+
+    #[test]
+    fn blank_or_garbage_line_becomes_zero_without_shifting() {
+        // A blank/garbage line must keep its slot (0), not drop and misalign.
+        assert_eq!(parse_u64_lines("11\n\n22"), vec![11u64, 0, 22]);
+        assert_eq!(parse_u32_lines("11\nxx\n22"), vec![11u32, 0, 22]);
+        assert!(parse_u64_lines("").is_empty());
+    }
+
+    #[test]
+    fn appinfo_json_preserves_object_key_order() {
+        // The Kotlin appinfo decoder groups DLC depots positionally, so depot
+        // keys must stay in source order, not be sorted (BTreeMap default).
+        let mut depots = crate::vdf::KVNode::new("depots");
+        for id in ["601151", "1432644", "601152"] {
+            depots.children.push(crate::vdf::KVNode::new(id));
+        }
+        assert_eq!(
+            super::kvnode_to_json_value(&depots).to_string(),
+            r#"{"601151":{},"1432644":{},"601152":{}}"#
+        );
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/job_manager.rs b/app/src/main/cpp/wn-steam-client/rust/src/job_manager.rs
new file mode 100644
index 000000000..90c332833
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/job_manager.rs
@@ -0,0 +1,255 @@
+use std::collections::HashMap;
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+use std::sync::{Arc, Condvar, Mutex};
+use std::thread::{self, JoinHandle};
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+use std::{panic, panic::AssertUnwindSafe};
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct JobResult {
+    pub eresult: i32,
+    pub error_message: String,
+    pub body: Vec<u8>,
+    pub synthetic_failure: bool,
+}
+
+impl Default for JobResult {
+    fn default() -> Self {
+        Self {
+            eresult: 2,
+            error_message: String::new(),
+            body: Vec::new(),
+            synthetic_failure: false,
+        }
+    }
+}
+
+type JobContinuation = Box<dyn FnOnce(JobResult) + Send + 'static>;
+
+struct Entry {
+    cb: JobContinuation,
+    deadline: Instant,
+}
+
+#[derive(Default)]
+struct Pending {
+    jobs: HashMap<u64, Entry>,
+}
+
+pub struct JobManager {
+    next_counter: AtomicU64,
+    process_epoch: u64,
+    default_timeout: Duration,
+    pending: Arc<(Mutex<Pending>, Condvar)>,
+    stop: Arc<AtomicBool>,
+    timeout_thread: Option<JoinHandle<()>>,
+}
+
+impl JobManager {
+    pub fn new(default_timeout: Duration) -> Self {
+        let pending = Arc::new((Mutex::new(Pending::default()), Condvar::new()));
+        let stop = Arc::new(AtomicBool::new(false));
+        let thread_pending = Arc::clone(&pending);
+        let thread_stop = Arc::clone(&stop);
+        let timeout_thread = thread::spawn(move || timeout_loop(thread_pending, thread_stop));
+        Self {
+            next_counter: AtomicU64::new(1),
+            process_epoch: make_process_epoch(),
+            default_timeout,
+            pending,
+            stop,
+            timeout_thread: Some(timeout_thread),
+        }
+    }
+
+    pub fn next_job_id(&self) -> u64 {
+        let lo = self.next_counter.fetch_add(1, Ordering::Relaxed);
+        ((self.process_epoch & 0xFF_FFFF) << 40) | (lo & 0xFF_FFFF_FFFF)
+    }
+
+    pub fn track<F>(&self, job_id: u64, cb: F, timeout: Option<Duration>)
+    where
+        F: FnOnce(JobResult) + Send + 'static,
+    {
+        let timeout = timeout.unwrap_or(self.default_timeout);
+        let (mu, cv) = &*self.pending;
+        let mut pending = mu.lock().expect("job manager poisoned");
+        pending.jobs.insert(
+            job_id,
+            Entry {
+                cb: Box::new(cb),
+                deadline: Instant::now() + timeout,
+            },
+        );
+        cv.notify_all();
+    }
+
+    pub fn deliver(
+        &self,
+        job_id_target: u64,
+        mut eresult: i32,
+        error_message: String,
+        body: &[u8],
+    ) {
+        let cb = {
+            let (mu, _) = &*self.pending;
+            let mut pending = mu.lock().expect("job manager poisoned");
+            pending.jobs.remove(&job_id_target).map(|entry| entry.cb)
+        };
+        if let Some(cb) = cb {
+            if eresult == -1 {
+                eresult = 1;
+            }
+            invoke_continuation(
+                cb,
+                JobResult {
+                    eresult,
+                    error_message,
+                    body: body.to_vec(),
+                    synthetic_failure: false,
+                },
+            );
+        }
+    }
+
+    pub fn fail_all(&self, reason: &str) {
+        let drained = {
+            let (mu, _) = &*self.pending;
+            let mut pending = mu.lock().expect("job manager poisoned");
+            std::mem::take(&mut pending.jobs)
+        };
+        for (_, entry) in drained {
+            invoke_continuation(
+                entry.cb,
+                JobResult {
+                    eresult: -1,
+                    error_message: reason.to_string(),
+                    body: Vec::new(),
+                    synthetic_failure: true,
+                },
+            );
+        }
+    }
+}
+
+impl Default for JobManager {
+    fn default() -> Self {
+        Self::new(Duration::from_secs(30))
+    }
+}
+
+impl Drop for JobManager {
+    fn drop(&mut self) {
+        self.stop.store(true, Ordering::Relaxed);
+        self.pending.1.notify_all();
+        if let Some(handle) = self.timeout_thread.take() {
+            let _ = handle.join();
+        }
+        self.fail_all("JobManager shutting down");
+    }
+}
+
+fn timeout_loop(pending: Arc<(Mutex<Pending>, Condvar)>, stop: Arc<AtomicBool>) {
+    let (mu, cv) = &*pending;
+    loop {
+        let mut guard = mu.lock().expect("job manager poisoned");
+        while guard.jobs.is_empty() && !stop.load(Ordering::Relaxed) {
+            guard = cv.wait(guard).expect("job manager poisoned");
+        }
+        if stop.load(Ordering::Relaxed) {
+            return;
+        }
+        let earliest = guard
+            .jobs
+            .values()
+            .map(|entry| entry.deadline)
+            .min()
+            .unwrap_or_else(Instant::now);
+        let now = Instant::now();
+        if earliest > now {
+            let (g, _) = cv
+                .wait_timeout(guard, earliest - now)
+                .expect("job manager poisoned");
+            guard = g;
+        }
+        if stop.load(Ordering::Relaxed) {
+            return;
+        }
+        let now = Instant::now();
+        let expired_ids: Vec<u64> = guard
+            .jobs
+            .iter()
+            .filter_map(|(id, entry)| (entry.deadline <= now).then_some(*id))
+            .collect();
+        let expired: Vec<Entry> = expired_ids
+            .into_iter()
+            .filter_map(|id| guard.jobs.remove(&id))
+            .collect();
+        drop(guard);
+        for entry in expired {
+            invoke_continuation(
+                entry.cb,
+                JobResult {
+                    eresult: -1,
+                    error_message: "job timeout".to_string(),
+                    body: Vec::new(),
+                    synthetic_failure: true,
+                },
+            );
+        }
+    }
+}
+
+fn invoke_continuation(cb: JobContinuation, result: JobResult) {
+    let _ = panic::catch_unwind(AssertUnwindSafe(|| cb(result)));
+}
+
+fn make_process_epoch() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::mpsc;
+
+    #[test]
+    fn deliver_maps_missing_eresult_to_ok() {
+        let jm = JobManager::new(Duration::from_secs(30));
+        let id = jm.next_job_id();
+        let (tx, rx) = mpsc::channel();
+        jm.track(id, move |result| tx.send(result).unwrap(), None);
+        jm.deliver(id, -1, String::new(), b"body");
+        let result = rx.recv_timeout(Duration::from_secs(1)).unwrap();
+        assert_eq!(result.eresult, 1);
+        assert_eq!(result.body, b"body");
+    }
+
+    #[test]
+    fn timeout_fails_jobs_synthetically() {
+        let jm = JobManager::new(Duration::from_millis(20));
+        let id = jm.next_job_id();
+        let (tx, rx) = mpsc::channel();
+        jm.track(id, move |result| tx.send(result).unwrap(), None);
+        let result = rx.recv_timeout(Duration::from_secs(2)).unwrap();
+        assert!(result.synthetic_failure);
+        assert_eq!(result.error_message, "job timeout");
+    }
+
+    #[test]
+    fn continuation_panic_is_caught() {
+        let jm = JobManager::new(Duration::from_secs(30));
+        let id = jm.next_job_id();
+        jm.track(
+            id,
+            |_| {
+                panic!("continuation panic");
+            },
+            None,
+        );
+        jm.deliver(id, 1, String::new(), b"body");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/key_dictionary.rs b/app/src/main/cpp/wn-steam-client/rust/src/key_dictionary.rs
new file mode 100644
index 000000000..f1ef73d5b
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/key_dictionary.rs
@@ -0,0 +1,91 @@
+use crate::emsg::EUniverse;
+
+pub const PUBLIC_UNIVERSE_KEY: [u8; 160] = [
+    0x30, 0x81, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01,
+    0x05, 0x00, 0x03, 0x81, 0x8B, 0x00, 0x30, 0x81, 0x87, 0x02, 0x81, 0x81, 0x00, 0xDF, 0xEC, 0x1A,
+    0xD6, 0x2C, 0x10, 0x66, 0x2C, 0x17, 0x35, 0x3A, 0x14, 0xB0, 0x7C, 0x59, 0x11, 0x7F, 0x9D, 0xD3,
+    0xD8, 0x2B, 0x7A, 0xE3, 0xE0, 0x15, 0xCD, 0x19, 0x1E, 0x46, 0xE8, 0x7B, 0x87, 0x74, 0xA2, 0x18,
+    0x46, 0x31, 0xA9, 0x03, 0x14, 0x79, 0x82, 0x8E, 0xE9, 0x45, 0xA2, 0x49, 0x12, 0xA9, 0x23, 0x68,
+    0x73, 0x89, 0xCF, 0x69, 0xA1, 0xB1, 0x61, 0x46, 0xBD, 0xC1, 0xBE, 0xBF, 0xD6, 0x01, 0x1B, 0xD8,
+    0x81, 0xD4, 0xDC, 0x90, 0xFB, 0xFE, 0x4F, 0x52, 0x73, 0x66, 0xCB, 0x95, 0x70, 0xD7, 0xC5, 0x8E,
+    0xBA, 0x1C, 0x7A, 0x33, 0x75, 0xA1, 0x62, 0x34, 0x46, 0xBB, 0x60, 0xB7, 0x80, 0x68, 0xFA, 0x13,
+    0xA7, 0x7A, 0x8A, 0x37, 0x4B, 0x9E, 0xC6, 0xF4, 0x5D, 0x5F, 0x3A, 0x99, 0xF9, 0x9E, 0xC4, 0x3A,
+    0xE9, 0x63, 0xA2, 0xBB, 0x88, 0x19, 0x28, 0xE0, 0xE7, 0x14, 0xC0, 0x42, 0x89, 0x02, 0x01, 0x11,
+];
+
+pub const BETA_UNIVERSE_KEY: [u8; 160] = [
+    0x30, 0x81, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01,
+    0x05, 0x00, 0x03, 0x81, 0x8B, 0x00, 0x30, 0x81, 0x87, 0x02, 0x81, 0x81, 0x00, 0xAE, 0xD1, 0x4B,
+    0xC0, 0xA3, 0x36, 0x8B, 0xA0, 0x39, 0x0B, 0x43, 0xDC, 0xED, 0x6A, 0xC8, 0xF2, 0xA3, 0xE4, 0x7E,
+    0x09, 0x8C, 0x55, 0x2E, 0xE7, 0xE9, 0x3C, 0xBB, 0xE5, 0x5E, 0x0F, 0x18, 0x74, 0x54, 0x8F, 0xF3,
+    0xBD, 0x56, 0x69, 0x5B, 0x13, 0x09, 0xAF, 0xC8, 0xBE, 0xB3, 0xA1, 0x48, 0x69, 0xE9, 0x83, 0x49,
+    0x65, 0x8D, 0xD2, 0x93, 0x21, 0x2F, 0xB9, 0x1E, 0xFA, 0x74, 0x3B, 0x55, 0x22, 0x79, 0xBF, 0x85,
+    0x18, 0xCB, 0x6D, 0x52, 0x44, 0x4E, 0x05, 0x92, 0x89, 0x6A, 0xA8, 0x99, 0xED, 0x44, 0xAE, 0xE2,
+    0x66, 0x46, 0x42, 0x0C, 0xFB, 0x6E, 0x4C, 0x30, 0xC6, 0x6C, 0x5C, 0x16, 0xFF, 0xBA, 0x9C, 0xB9,
+    0x78, 0x3F, 0x17, 0x4B, 0xCB, 0xC9, 0x01, 0x5D, 0x3E, 0x37, 0x70, 0xEC, 0x67, 0x5A, 0x33, 0x48,
+    0xF7, 0x46, 0xCE, 0x58, 0xAA, 0xEC, 0xD9, 0xFF, 0x4A, 0x78, 0x6C, 0x83, 0x4B, 0x02, 0x01, 0x11,
+];
+
+pub const INTERNAL_UNIVERSE_KEY: [u8; 160] = [
+    0x30, 0x81, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01,
+    0x05, 0x00, 0x03, 0x81, 0x8B, 0x00, 0x30, 0x81, 0x87, 0x02, 0x81, 0x81, 0x00, 0xA8, 0xFE, 0x01,
+    0x3B, 0xB6, 0xD7, 0x21, 0x4B, 0x53, 0x23, 0x6F, 0xA1, 0xAB, 0x4E, 0xF1, 0x07, 0x30, 0xA7, 0xC6,
+    0x7E, 0x6A, 0x2C, 0xC2, 0x5D, 0x3A, 0xB8, 0x40, 0xCA, 0x59, 0x4D, 0x16, 0x2D, 0x74, 0xEB, 0x0E,
+    0x72, 0x46, 0x29, 0xF9, 0xDE, 0x9B, 0xCE, 0x4B, 0x8C, 0xD0, 0xCA, 0xF4, 0x08, 0x94, 0x46, 0xA5,
+    0x11, 0xAF, 0x3A, 0xCB, 0xB8, 0x4E, 0xDE, 0xC6, 0xD8, 0x85, 0x0A, 0x7D, 0xAA, 0x96, 0x0A, 0xEA,
+    0x7B, 0x51, 0xD6, 0x22, 0x62, 0x5C, 0x1E, 0x58, 0xD7, 0x46, 0x1E, 0x09, 0xAE, 0x43, 0xA7, 0xC4,
+    0x34, 0x69, 0xA2, 0xA5, 0xE8, 0x44, 0x76, 0x18, 0xE2, 0x3D, 0xB7, 0xC5, 0xA8, 0x96, 0xFD, 0xE5,
+    0xB4, 0x4B, 0xF8, 0x40, 0x12, 0xA6, 0x17, 0x4E, 0xC4, 0xC1, 0x60, 0x0E, 0xB0, 0xC2, 0xB8, 0x40,
+    0x4D, 0x9E, 0x76, 0x4C, 0x44, 0xF4, 0xFC, 0x6F, 0x14, 0x89, 0x73, 0xB4, 0x13, 0x02, 0x01, 0x11,
+];
+
+pub const DEV_UNIVERSE_KEY: [u8; 160] = [
+    0x30, 0x81, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01,
+    0x05, 0x00, 0x03, 0x81, 0x8B, 0x00, 0x30, 0x81, 0x87, 0x02, 0x81, 0x81, 0x00, 0xD0, 0x05, 0x2C,
+    0xE9, 0x80, 0x95, 0xCD, 0x30, 0x83, 0xA8, 0xE9, 0x25, 0x96, 0x63, 0xCE, 0xCC, 0x48, 0x5D, 0x5C,
+    0x52, 0x00, 0xDB, 0x1E, 0x78, 0xD7, 0x6A, 0x4C, 0x2C, 0xC8, 0x41, 0x8C, 0xCC, 0x87, 0x46, 0xFB,
+    0x1B, 0xC9, 0xE8, 0x6E, 0x4F, 0x7A, 0x6B, 0xC3, 0xE7, 0x0F, 0xD5, 0xA9, 0x5D, 0x6C, 0xD4, 0xEE,
+    0xA2, 0xCC, 0x80, 0x5A, 0xD3, 0xCE, 0x53, 0x59, 0xE6, 0x80, 0x91, 0xC4, 0xC0, 0xD5, 0xF0, 0x63,
+    0x23, 0x91, 0x69, 0x70, 0xC5, 0xBB, 0xBD, 0x05, 0xE2, 0x4F, 0x7D, 0x90, 0x12, 0xED, 0xAC, 0x4F,
+    0x86, 0x96, 0x3C, 0x89, 0xCC, 0x92, 0x15, 0x63, 0xCB, 0x57, 0x70, 0xB9, 0xC3, 0xAE, 0x08, 0x4F,
+    0xC8, 0x56, 0x16, 0xB0, 0x0C, 0xC6, 0xC8, 0x8A, 0x80, 0xD2, 0x37, 0xF7, 0x7F, 0xAB, 0x93, 0xBB,
+    0xE6, 0xDE, 0x95, 0x78, 0xB8, 0x11, 0xC9, 0xE5, 0x62, 0xAD, 0xBC, 0x0C, 0x87, 0x02, 0x01, 0x11,
+];
+
+pub fn get_universe_public_key(universe: EUniverse) -> &'static [u8] {
+    match universe {
+        EUniverse::Public => &PUBLIC_UNIVERSE_KEY,
+        EUniverse::Beta => &BETA_UNIVERSE_KEY,
+        EUniverse::Internal => &INTERNAL_UNIVERSE_KEY,
+        EUniverse::Dev => &DEV_UNIVERSE_KEY,
+        EUniverse::Invalid | EUniverse::Max => &[],
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn returns_keys_for_known_universes_only() {
+        assert_eq!(get_universe_public_key(EUniverse::Public).len(), 160);
+        assert_eq!(get_universe_public_key(EUniverse::Beta).len(), 160);
+        assert_eq!(get_universe_public_key(EUniverse::Internal).len(), 160);
+        assert_eq!(get_universe_public_key(EUniverse::Dev).len(), 160);
+        assert!(get_universe_public_key(EUniverse::Invalid).is_empty());
+    }
+
+    #[test]
+    fn keys_are_spki_rsa_with_exponent_17() {
+        for universe in [
+            EUniverse::Public,
+            EUniverse::Beta,
+            EUniverse::Internal,
+            EUniverse::Dev,
+        ] {
+            let key = get_universe_public_key(universe);
+            assert_eq!(&key[..8], &[0x30, 0x81, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A]);
+            assert_eq!(&key[157..], &[0x02, 0x01, 0x11]);
+        }
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/lib.rs b/app/src/main/cpp/wn-steam-client/rust/src/lib.rs
new file mode 100644
index 000000000..04df26dc0
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/lib.rs
@@ -0,0 +1,45 @@
+//! Rust implementation of the WinNative Steam client.
+//!
+//! The crate is intentionally split along the existing C++ module boundaries
+//! so JNI and `wn_cm_*` C-ABI exports can migrate without changing the Kotlin
+//! or `libsteamclient.so` contracts.
+
+#![allow(clippy::missing_safety_doc, clippy::result_large_err)]
+
+pub mod auth_session;
+pub mod authenticator;
+pub mod base64;
+pub mod cdn_client;
+pub mod chat_image;
+pub mod cm_bridge;
+pub mod cm_client;
+pub mod cm_runtime;
+pub mod cm_server;
+pub mod cm_server_list;
+pub mod cmsg_protobuf_header;
+pub mod content_manifest;
+pub mod crypto;
+pub mod depot_chunk;
+pub mod depot_config;
+pub mod depot_downloader;
+pub mod depot_writer;
+pub mod emsg;
+pub mod encrypted_channel;
+pub mod handshake_messages;
+pub mod heartbeat;
+pub mod jni;
+pub mod job_manager;
+pub mod key_dictionary;
+pub mod library_store;
+pub mod pb;
+pub mod proto_envelope;
+pub mod proto_wire;
+pub mod rsa_password;
+pub mod steam_directory;
+pub mod ticket_cache;
+pub mod transport;
+pub mod vdf;
+pub mod version;
+pub mod wine_bridge;
+pub mod wire_format;
+pub mod ws_connection;
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/library_store.rs b/app/src/main/cpp/wn-steam-client/rust/src/library_store.rs
new file mode 100644
index 000000000..88943789d
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/library_store.rs
@@ -0,0 +1,429 @@
+use crate::pb::cmsg_client_license_list::CMsgClientLicenseList;
+use crate::pb::cmsg_client_pics::{
+    CMsgClientPICSAccessTokenResponse, CMsgClientPICSProductInfoResponse, PicsAppInfoReq,
+    PicsPackageInfoReq,
+};
+use crate::vdf::{self, KVNode};
+use serde_json::json;
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct OwnedPackage {
+    pub package_id: u32,
+    pub access_token: u64,
+    pub change_number: i32,
+    pub license_flags: u32,
+    pub license_type: u32,
+    pub pics_fetched: bool,
+    pub app_ids: Vec<u32>,
+    pub depot_ids: Vec<u32>,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct OwnedApp {
+    pub app_id: u32,
+    pub change_number: u32,
+    pub name: String,
+    pub sort_as: String,
+    pub app_type: String,
+    pub os_list: String,
+    pub parent_app_id: u32,
+    pub dlc_app_ids: Vec<u32>,
+    pub build_id: u32,
+    pub source_package_ids: Vec<u32>,
+    pub pics_fetched: bool,
+    pub missing_token: bool,
+    pub access_token: u64,
+}
+
+type SnapshotObserver = Arc<dyn Fn() + Send + Sync + 'static>;
+
+#[derive(Default)]
+pub struct WnLibraryStore {
+    packages: Mutex<HashMap<u32, OwnedPackage>>,
+    apps: Mutex<HashMap<u32, OwnedApp>>,
+    observer: Mutex<Option<SnapshotObserver>>,
+}
+
+impl WnLibraryStore {
+    pub fn ingest_license_list(&self, msg: &CMsgClientLicenseList) {
+        {
+            let mut packages = self.packages.lock().expect("library packages poisoned");
+            for license in &msg.licenses {
+                let slot = packages.entry(license.package_id).or_default();
+                slot.package_id = license.package_id;
+                if license.access_token != 0 {
+                    slot.access_token = license.access_token;
+                }
+                if license.change_number > slot.change_number {
+                    slot.change_number = license.change_number;
+                }
+                slot.license_flags = license.flags;
+                slot.license_type = license.license_type;
+            }
+        }
+        self.notify();
+    }
+
+    pub fn get_pending_package_pics_request(&self, max_count: usize) -> Vec<PicsPackageInfoReq> {
+        let packages = self.packages.lock().expect("library packages poisoned");
+        packages
+            .values()
+            .filter(|p| !p.pics_fetched)
+            .take(max_count)
+            .map(|p| PicsPackageInfoReq {
+                packageid: p.package_id,
+                access_token: p.access_token,
+            })
+            .collect()
+    }
+
+    pub fn get_pending_app_pics_request(&self, max_count: usize) -> Vec<PicsAppInfoReq> {
+        let apps = self.apps.lock().expect("library apps poisoned");
+        apps.values()
+            .filter(|a| !a.pics_fetched && (!a.missing_token || a.access_token != 0))
+            .take(max_count)
+            .map(|a| PicsAppInfoReq {
+                appid: a.app_id,
+                access_token: a.access_token,
+                only_public_obsolete: false,
+            })
+            .collect()
+    }
+
+    pub fn get_apps_needing_access_token(&self) -> Vec<u32> {
+        let apps = self.apps.lock().expect("library apps poisoned");
+        apps.values()
+            .filter(|a| a.missing_token && a.access_token == 0)
+            .map(|a| a.app_id)
+            .collect()
+    }
+
+    pub fn ingest_package_pics_response(&self, resp: &CMsgClientPICSProductInfoResponse) {
+        {
+            let mut packages = self.packages.lock().expect("library packages poisoned");
+            let mut apps = self.apps.lock().expect("library apps poisoned");
+            for package in &resp.packages {
+                let slot = packages.entry(package.packageid).or_default();
+                slot.package_id = package.packageid;
+                slot.change_number = package.change_number as i32;
+                slot.pics_fetched = true;
+                if !package.buffer.is_empty() {
+                    if let Some((_prefix, root)) = vdf::parse_binary_package(&package.buffer) {
+                        extract_uint32_array(root.child("appids"), &mut slot.app_ids);
+                        extract_uint32_array(root.child("depotids"), &mut slot.depot_ids);
+                        for app_id in &slot.app_ids {
+                            let app = apps.entry(*app_id).or_default();
+                            app.app_id = *app_id;
+                            if !app.source_package_ids.contains(&package.packageid) {
+                                app.source_package_ids.push(package.packageid);
+                            }
+                        }
+                    }
+                }
+            }
+            for package_id in &resp.unknown_packageids {
+                if let Some(package) = packages.get_mut(package_id) {
+                    package.pics_fetched = true;
+                }
+            }
+        }
+        self.notify();
+    }
+
+    pub fn ingest_app_pics_response(&self, resp: &CMsgClientPICSProductInfoResponse) {
+        {
+            let mut apps = self.apps.lock().expect("library apps poisoned");
+            for app_resp in &resp.apps {
+                let app = apps.entry(app_resp.appid).or_default();
+                app.app_id = app_resp.appid;
+                app.change_number = app_resp.change_number;
+                app.pics_fetched = true;
+                if app_resp.missing_token {
+                    app.missing_token = true;
+                    app.pics_fetched = false;
+                    continue;
+                }
+                app.missing_token = false;
+                if app_resp.buffer.is_empty() {
+                    continue;
+                }
+                let Some(root) = vdf::parse_auto(&app_resp.buffer) else {
+                    continue;
+                };
+                let appinfo = if root.name.eq_ignore_ascii_case("appinfo") {
+                    &root
+                } else {
+                    root.child("appinfo").unwrap_or(&root)
+                };
+                if let Some(common) = appinfo.child("common") {
+                    set_string(common, "name", &mut app.name);
+                    set_string(common, "sortas", &mut app.sort_as);
+                    set_string(common, "type", &mut app.app_type);
+                    set_string(common, "oslist", &mut app.os_list);
+                    if let Some(parent) = common.child("parent") {
+                        app.parent_app_id = parent.as_uint(0) as u32;
+                    }
+                }
+                if let Some(list) = appinfo
+                    .child("extended")
+                    .and_then(|extended| extended.child("listofdlc"))
+                {
+                    app.dlc_app_ids.clear();
+                    parse_csv_appids(&list.as_string(""), &mut app.dlc_app_ids);
+                }
+                if let Some(buildid) = appinfo
+                    .child("depots")
+                    .and_then(|depots| depots.child("branches"))
+                    .and_then(|branches| branches.child("public"))
+                    .and_then(|public| public.child("buildid"))
+                {
+                    app.build_id = buildid.as_uint(0) as u32;
+                }
+                let child_id = app.app_id;
+                let parent_id = app.parent_app_id;
+                if parent_id != 0 {
+                    let parent = apps.entry(parent_id).or_default();
+                    parent.app_id = parent_id;
+                    if !parent.dlc_app_ids.contains(&child_id) {
+                        parent.dlc_app_ids.push(child_id);
+                    }
+                }
+            }
+            for app_id in &resp.unknown_appids {
+                if let Some(app) = apps.get_mut(app_id) {
+                    app.pics_fetched = true;
+                }
+            }
+        }
+        self.notify();
+    }
+
+    pub fn ingest_app_access_tokens(&self, resp: &CMsgClientPICSAccessTokenResponse) {
+        {
+            let mut apps = self.apps.lock().expect("library apps poisoned");
+            for token in &resp.app_access_tokens {
+                let app = apps.entry(token.appid).or_default();
+                app.app_id = token.appid;
+                app.access_token = token.access_token;
+                app.missing_token = false;
+            }
+            for app_id in &resp.app_denied_tokens {
+                if let Some(app) = apps.get_mut(app_id) {
+                    app.pics_fetched = true;
+                    app.missing_token = false;
+                }
+            }
+        }
+        self.notify();
+    }
+
+    pub fn packages(&self) -> Vec<OwnedPackage> {
+        self.packages
+            .lock()
+            .expect("library packages poisoned")
+            .values()
+            .cloned()
+            .collect()
+    }
+
+    pub fn apps(&self) -> Vec<OwnedApp> {
+        self.apps
+            .lock()
+            .expect("library apps poisoned")
+            .values()
+            .cloned()
+            .collect()
+    }
+
+    pub fn owned_apps(&self) -> Vec<OwnedApp> {
+        self.apps()
+            .into_iter()
+            .filter(|app| !app.source_package_ids.is_empty())
+            .collect()
+    }
+
+    pub fn find_app(&self, app_id: u32) -> Option<OwnedApp> {
+        self.apps
+            .lock()
+            .expect("library apps poisoned")
+            .get(&app_id)
+            .cloned()
+    }
+
+    pub fn package_count(&self) -> usize {
+        self.packages
+            .lock()
+            .expect("library packages poisoned")
+            .len()
+    }
+
+    pub fn app_count(&self) -> usize {
+        self.apps.lock().expect("library apps poisoned").len()
+    }
+
+    pub fn owned_app_count(&self) -> usize {
+        self.apps
+            .lock()
+            .expect("library apps poisoned")
+            .values()
+            .filter(|app| !app.source_package_ids.is_empty())
+            .count()
+    }
+
+    pub fn snapshot_json(&self) -> String {
+        let packages = self.packages();
+        let apps = self.apps();
+        let owned: Vec<_> = apps
+            .iter()
+            .filter(|app| !app.source_package_ids.is_empty())
+            .collect();
+        json!({
+            "packages": packages.iter().map(|p| json!({
+                "id": p.package_id,
+                "flags": p.license_flags,
+                "license_type": p.license_type,
+                "change_number": p.change_number,
+                "access_token": p.access_token.to_string(),
+            })).collect::<Vec<_>>(),
+            "owned_apps": owned.iter().map(|a| json!({
+                "id": a.app_id,
+                "change_number": a.change_number,
+                "name": a.name,
+                "type": a.app_type,
+                "sort_as": a.sort_as,
+                "os_list": a.os_list,
+                "parent": a.parent_app_id,
+                "access_token": a.access_token.to_string(),
+                "build_id": a.build_id,
+                "dlc": a.dlc_app_ids,
+                "src_packages": a.source_package_ids,
+            })).collect::<Vec<_>>(),
+            "all_apps_count": apps.len(),
+            "owned_apps_count": owned.len(),
+        })
+        .to_string()
+    }
+
+    pub fn set_observer<F>(&self, observer: F)
+    where
+        F: Fn() + Send + Sync + 'static,
+    {
+        *self.observer.lock().expect("library observer poisoned") = Some(Arc::new(observer));
+    }
+
+    fn notify(&self) {
+        let cb = self
+            .observer
+            .lock()
+            .expect("library observer poisoned")
+            .clone();
+        if let Some(cb) = cb {
+            cb();
+        }
+    }
+}
+
+fn extract_uint32_array(parent: Option<&KVNode>, out: &mut Vec<u32>) {
+    if let Some(parent) = parent {
+        for child in &parent.children {
+            let value = child.as_uint(0);
+            if value != 0 {
+                out.push(value as u32);
+            }
+        }
+    }
+}
+
+fn parse_csv_appids(csv: &str, out: &mut Vec<u32>) {
+    for part in csv.split(',') {
+        if let Ok(value) = part.trim().parse::<u32>() {
+            if value != 0 {
+                out.push(value);
+            }
+        }
+    }
+}
+
+fn set_string(parent: &KVNode, key: &str, out: &mut String) {
+    if let Some(node) = parent.child(key) {
+        *out = node.as_string(out);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::pb::cmsg_client_license_list::{CMsgClientLicenseList, License};
+    use crate::pb::cmsg_client_pics::{PicsAppInfoResp, PicsPackageInfoResp};
+
+    #[test]
+    fn ingests_license_and_emits_pending_package_request() {
+        let store = WnLibraryStore::default();
+        store.ingest_license_list(&CMsgClientLicenseList {
+            eresult: 1,
+            licenses: vec![License {
+                package_id: 100,
+                access_token: 55,
+                change_number: 7,
+                ..Default::default()
+            }],
+        });
+        let pending = store.get_pending_package_pics_request(10);
+        assert_eq!(pending[0].packageid, 100);
+        assert_eq!(pending[0].access_token, 55);
+    }
+
+    #[test]
+    fn ingests_text_app_pics_and_links_parent_dlc() {
+        let store = WnLibraryStore::default();
+        let text = br#""appinfo" {
+            "common" { "name" "DLC" "type" "DLC" "parent" "480" }
+            "extended" { "listofdlc" "481,482" }
+            "depots" { "branches" { "public" { "buildid" "99" } } }
+        }"#;
+        store.ingest_app_pics_response(&CMsgClientPICSProductInfoResponse {
+            apps: vec![PicsAppInfoResp {
+                appid: 481,
+                buffer: text.to_vec(),
+                ..Default::default()
+            }],
+            ..Default::default()
+        });
+        let app = store.find_app(481).unwrap();
+        assert_eq!(app.name, "DLC");
+        assert_eq!(app.parent_app_id, 480);
+        assert_eq!(app.build_id, 99);
+        assert!(store.find_app(480).unwrap().dlc_app_ids.contains(&481));
+    }
+
+    #[test]
+    fn marks_unknown_packages_as_fetched() {
+        let store = WnLibraryStore::default();
+        store.ingest_license_list(&CMsgClientLicenseList {
+            eresult: 1,
+            licenses: vec![License {
+                package_id: 100,
+                ..Default::default()
+            }],
+        });
+        store.ingest_package_pics_response(&CMsgClientPICSProductInfoResponse {
+            packages: vec![PicsPackageInfoResp {
+                packageid: 101,
+                change_number: 1,
+                ..Default::default()
+            }],
+            unknown_packageids: vec![100],
+            ..Default::default()
+        });
+        assert!(
+            store
+                .packages()
+                .into_iter()
+                .find(|p| p.package_id == 100)
+                .unwrap()
+                .pics_fetched
+        );
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cauthentication.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cauthentication.rs
new file mode 100644
index 000000000..a72e6f77e
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cauthentication.rs
@@ -0,0 +1,583 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(i32)]
+pub enum EAuthTokenPlatformType {
+    Unknown = 0,
+    SteamClient = 1,
+    WebBrowser = 2,
+    MobileApp = 3,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(i32)]
+pub enum EAuthSessionGuardType {
+    Unknown = 0,
+    None = 1,
+    EmailCode = 2,
+    DeviceCode = 3,
+    DeviceConfirmation = 4,
+    EmailConfirmation = 5,
+    MachineToken = 6,
+    LegacyMachineAuth = 7,
+}
+
+impl From<i32> for EAuthSessionGuardType {
+    fn from(value: i32) -> Self {
+        match value {
+            1 => Self::None,
+            2 => Self::EmailCode,
+            3 => Self::DeviceCode,
+            4 => Self::DeviceConfirmation,
+            5 => Self::EmailConfirmation,
+            6 => Self::MachineToken,
+            7 => Self::LegacyMachineAuth,
+            _ => Self::Unknown,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(i32)]
+pub enum ESessionPersistence {
+    Invalid = -1,
+    Ephemeral = 0,
+    Persistent = 1,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CAuthenticationDeviceDetails {
+    pub device_friendly_name: String,
+    pub platform_type: EAuthTokenPlatformType,
+    pub os_type: i32,
+    pub gaming_device_type: u32,
+    pub client_count: u32,
+    pub machine_id: Vec<u8>,
+}
+
+impl Default for CAuthenticationDeviceDetails {
+    fn default() -> Self {
+        Self {
+            device_friendly_name: String::new(),
+            platform_type: EAuthTokenPlatformType::SteamClient,
+            os_type: 16,
+            gaming_device_type: 0,
+            client_count: 0,
+            machine_id: Vec::new(),
+        }
+    }
+}
+
+impl CAuthenticationDeviceDetails {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.string_field(1, &self.device_friendly_name);
+        w.int32_field(2, self.platform_type as i32);
+        w.int32_field(3, self.os_type);
+        w.uint32_field(4, self.gaming_device_type);
+        w.uint32_field(5, self.client_count);
+        w.bytes_field(6, &self.machine_id);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct GetPasswordRsaPublicKeyRequest {
+    pub account_name: String,
+}
+
+impl GetPasswordRsaPublicKeyRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).string_field(1, &self.account_name);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct GetPasswordRsaPublicKeyResponse {
+    pub publickey_mod: String,
+    pub publickey_exp: String,
+    pub timestamp: u64,
+}
+
+impl GetPasswordRsaPublicKeyResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.publickey_mod = reader.string()?,
+                2 => msg.publickey_exp = reader.string()?,
+                3 => msg.timestamp = reader.u64()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct BeginAuthSessionViaCredentialsRequest {
+    pub account_name: String,
+    pub encrypted_password: String,
+    pub encryption_timestamp: u64,
+    pub website_id: String,
+    pub persistence: ESessionPersistence,
+    pub device_details: CAuthenticationDeviceDetails,
+    pub guard_data: String,
+    pub language: u32,
+    pub qos_level: i32,
+}
+
+impl Default for BeginAuthSessionViaCredentialsRequest {
+    fn default() -> Self {
+        Self {
+            account_name: String::new(),
+            encrypted_password: String::new(),
+            encryption_timestamp: 0,
+            website_id: "Client".to_string(),
+            persistence: ESessionPersistence::Persistent,
+            device_details: CAuthenticationDeviceDetails::default(),
+            guard_data: String::new(),
+            language: 0,
+            qos_level: 2,
+        }
+    }
+}
+
+impl BeginAuthSessionViaCredentialsRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.string_field(2, &self.account_name);
+        w.string_field(3, &self.encrypted_password);
+        w.uint64_field(4, self.encryption_timestamp);
+        w.int32_field(7, self.persistence as i32);
+        w.string_field(8, &self.website_id);
+        let dd = self.device_details.serialize();
+        if !dd.is_empty() {
+            w.submessage_field(9, &dd);
+        }
+        w.string_field(10, &self.guard_data);
+        w.uint32_field(11, self.language);
+        w.int32_field(12, self.qos_level);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AllowedConfirmation {
+    pub confirmation_type: EAuthSessionGuardType,
+    pub associated_message: String,
+}
+
+impl Default for AllowedConfirmation {
+    fn default() -> Self {
+        Self {
+            confirmation_type: EAuthSessionGuardType::Unknown,
+            associated_message: String::new(),
+        }
+    }
+}
+
+impl AllowedConfirmation {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.confirmation_type = EAuthSessionGuardType::from(reader.i32()?),
+                2 => msg.associated_message = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct BeginAuthSessionViaCredentialsResponse {
+    pub client_id: u64,
+    pub request_id: Vec<u8>,
+    pub interval: f32,
+    pub allowed_confirmations: Vec<AllowedConfirmation>,
+    pub steamid: u64,
+    pub weak_token: String,
+    pub agreement_session_url: String,
+    pub extended_error_message: String,
+}
+
+impl Default for BeginAuthSessionViaCredentialsResponse {
+    fn default() -> Self {
+        Self {
+            client_id: 0,
+            request_id: Vec::new(),
+            interval: 5.0,
+            allowed_confirmations: Vec::new(),
+            steamid: 0,
+            weak_token: String::new(),
+            agreement_session_url: String::new(),
+            extended_error_message: String::new(),
+        }
+    }
+}
+
+impl BeginAuthSessionViaCredentialsResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.client_id = reader.u64()?,
+                2 => msg.request_id = reader.bytes()?.to_vec(),
+                3 => {
+                    if tag.wire_type != WireType::Fixed32 {
+                        return None;
+                    }
+                    msg.interval = f32::from_bits(reader.fixed32()?);
+                }
+                4 => msg
+                    .allowed_confirmations
+                    .push(AllowedConfirmation::deserialize(reader.bytes()?)?),
+                5 => msg.steamid = reader.u64()?,
+                6 => msg.weak_token = reader.string()?,
+                7 => msg.agreement_session_url = reader.string()?,
+                8 => msg.extended_error_message = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PollAuthSessionStatusRequest {
+    pub client_id: u64,
+    pub request_id: Vec<u8>,
+    pub token_to_revoke: u64,
+}
+
+impl PollAuthSessionStatusRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint64_field(1, self.client_id);
+        w.bytes_field(2, &self.request_id);
+        if self.token_to_revoke != 0 {
+            w.tag(3, WireType::Fixed64);
+            w.raw_bytes(&self.token_to_revoke.to_le_bytes());
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PollAuthSessionStatusResponse {
+    pub new_client_id: u64,
+    pub new_challenge_url: String,
+    pub refresh_token: String,
+    pub access_token: String,
+    pub had_remote_interaction: bool,
+    pub account_name: String,
+    pub new_guard_data: String,
+    pub agreement_session_url: String,
+}
+
+impl PollAuthSessionStatusResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.new_client_id = reader.u64()?,
+                2 => msg.new_challenge_url = reader.string()?,
+                3 => msg.refresh_token = reader.string()?,
+                4 => msg.access_token = reader.string()?,
+                5 => msg.had_remote_interaction = reader.boolean()?,
+                6 => msg.account_name = reader.string()?,
+                7 => msg.new_guard_data = reader.string()?,
+                8 => msg.agreement_session_url = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct UpdateAuthSessionWithSteamGuardCodeRequest {
+    pub client_id: u64,
+    pub steamid: u64,
+    pub code: String,
+    pub code_type: EAuthSessionGuardType,
+}
+
+impl Default for UpdateAuthSessionWithSteamGuardCodeRequest {
+    fn default() -> Self {
+        Self {
+            client_id: 0,
+            steamid: 0,
+            code: String::new(),
+            code_type: EAuthSessionGuardType::Unknown,
+        }
+    }
+}
+
+impl UpdateAuthSessionWithSteamGuardCodeRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint64_field(1, self.client_id);
+        if self.steamid != 0 {
+            w.tag(2, WireType::Fixed64);
+            w.raw_bytes(&self.steamid.to_le_bytes());
+        }
+        w.string_field(3, &self.code);
+        w.int32_field(4, self.code_type as i32);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct BeginAuthSessionViaQrRequest {
+    pub device_friendly_name: String,
+    pub platform_type: EAuthTokenPlatformType,
+    pub device_details: CAuthenticationDeviceDetails,
+    pub website_id: String,
+}
+
+impl Default for BeginAuthSessionViaQrRequest {
+    fn default() -> Self {
+        Self {
+            device_friendly_name: String::new(),
+            platform_type: EAuthTokenPlatformType::MobileApp,
+            device_details: CAuthenticationDeviceDetails::default(),
+            website_id: "Mobile".to_string(),
+        }
+    }
+}
+
+impl BeginAuthSessionViaQrRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.string_field(1, &self.device_friendly_name);
+        w.int32_field(2, self.platform_type as i32);
+        let dd = self.device_details.serialize();
+        if !dd.is_empty() {
+            w.submessage_field(3, &dd);
+        }
+        w.string_field(4, &self.website_id);
+        out
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct BeginAuthSessionViaQrResponse {
+    pub client_id: u64,
+    pub challenge_url: String,
+    pub request_id: Vec<u8>,
+    pub interval: f32,
+    pub allowed_confirmations: Vec<AllowedConfirmation>,
+    pub version: i32,
+}
+
+impl Default for BeginAuthSessionViaQrResponse {
+    fn default() -> Self {
+        Self {
+            client_id: 0,
+            challenge_url: String::new(),
+            request_id: Vec::new(),
+            interval: 5.0,
+            allowed_confirmations: Vec::new(),
+            version: 0,
+        }
+    }
+}
+
+impl BeginAuthSessionViaQrResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.client_id = reader.u64()?,
+                2 => msg.challenge_url = reader.string()?,
+                3 => msg.request_id = reader.bytes()?.to_vec(),
+                4 => {
+                    if tag.wire_type != WireType::Fixed32 {
+                        return None;
+                    }
+                    msg.interval = f32::from_bits(reader.fixed32()?);
+                }
+                5 => msg
+                    .allowed_confirmations
+                    .push(AllowedConfirmation::deserialize(reader.bytes()?)?),
+                6 => msg.version = reader.i32()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(i32)]
+pub enum EAuthTokenRenewalType {
+    None = 0,
+    Allow = 1,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AccessTokenGenerateForAppRequest {
+    pub refresh_token: String,
+    pub steamid: u64,
+    pub renewal_type: EAuthTokenRenewalType,
+}
+
+impl Default for AccessTokenGenerateForAppRequest {
+    fn default() -> Self {
+        Self {
+            refresh_token: String::new(),
+            steamid: 0,
+            renewal_type: EAuthTokenRenewalType::None,
+        }
+    }
+}
+
+impl AccessTokenGenerateForAppRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.string_field(1, &self.refresh_token);
+        w.fixed64_field(2, self.steamid);
+        w.int32_field(3, self.renewal_type as i32);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct AccessTokenGenerateForAppResponse {
+    pub access_token: String,
+    pub refresh_token: String,
+}
+
+impl AccessTokenGenerateForAppResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.access_token = reader.string()?,
+                2 => msg.refresh_token = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn credentials_request_uses_audited_field_numbers() {
+        let msg = BeginAuthSessionViaCredentialsRequest {
+            account_name: "user".to_string(),
+            encrypted_password: "enc".to_string(),
+            encryption_timestamp: 123,
+            ..Default::default()
+        };
+        let bytes = msg.serialize();
+        let fields = field_numbers(&bytes);
+        assert!(fields.contains(&2));
+        assert!(fields.contains(&3));
+        assert!(fields.contains(&4));
+        assert!(fields.contains(&7));
+        assert!(fields.contains(&8));
+        assert!(fields.contains(&9));
+        assert!(!fields.contains(&6));
+    }
+
+    #[test]
+    fn credentials_response_reads_float_interval_and_confirmations() {
+        let mut confirmation = Vec::new();
+        {
+            let mut w = Writer::new(&mut confirmation);
+            w.int32_field(1, EAuthSessionGuardType::DeviceCode as i32);
+            w.string_field(2, "mobile");
+        }
+        let mut bytes = Vec::new();
+        {
+            let mut w = Writer::new(&mut bytes);
+            w.uint64_field(1, 55);
+            w.bytes_field(2, &[1, 2]);
+            w.tag(3, WireType::Fixed32);
+            w.raw_bytes(&2.5f32.to_bits().to_le_bytes());
+            w.submessage_field(4, &confirmation);
+            w.uint64_field(5, 765);
+        }
+        let msg = BeginAuthSessionViaCredentialsResponse::deserialize(&bytes).unwrap();
+        assert_eq!(msg.client_id, 55);
+        assert_eq!(msg.interval, 2.5);
+        assert_eq!(
+            msg.allowed_confirmations[0].confirmation_type,
+            EAuthSessionGuardType::DeviceCode
+        );
+    }
+
+    fn field_numbers(bytes: &[u8]) -> Vec<i32> {
+        let mut reader = Reader::new(bytes);
+        let mut out = Vec::new();
+        while let Some(tag) = reader.next_tag() {
+            out.push(tag.field_number);
+            reader.skip(tag.wire_type);
+        }
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/ccloud.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/ccloud.rs
new file mode 100644
index 000000000..266d3fab4
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/ccloud.rs
@@ -0,0 +1,636 @@
+use crate::proto_wire::{Reader, Writer};
+
+pub struct CCloudGetUserQuotaRequest;
+
+impl CCloudGetUserQuotaRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        Vec::new()
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CCloudGetUserQuotaResponse {
+    pub total_bytes: u64,
+    pub used_bytes: u64,
+}
+
+impl CCloudGetUserQuotaResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.total_bytes = r.u64()?,
+                2 => m.used_bytes = r.u64()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CCloudGetAppFileChangelistRequest {
+    pub appid: u32,
+    pub synced_change_number: u64,
+}
+
+impl CCloudGetAppFileChangelistRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.uint64_field(2, self.synced_change_number);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudAppFileInfo {
+    pub file_name: String,
+    pub sha_file: Vec<u8>,
+    pub time_stamp: u64,
+    pub raw_file_size: u32,
+    pub persist_state: i32,
+    pub platforms_to_sync: u32,
+    pub path_prefix_index: u32,
+    pub machine_name_index: u32,
+}
+
+impl CCloudAppFileInfo {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.file_name = r.string()?,
+                2 => m.sha_file = r.bytes()?.to_vec(),
+                3 => m.time_stamp = r.u64()?,
+                4 => m.raw_file_size = r.u32()?,
+                5 => m.persist_state = r.u64()? as u32 as i32,
+                6 => m.platforms_to_sync = r.u32()?,
+                7 => m.path_prefix_index = r.u32()?,
+                8 => m.machine_name_index = r.u32()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudGetAppFileChangelistResponse {
+    pub current_change_number: u64,
+    pub files: Vec<CCloudAppFileInfo>,
+    pub is_only_delta: bool,
+    pub path_prefixes: Vec<String>,
+    pub machine_names: Vec<String>,
+    pub app_buildid_hwm: u64,
+}
+
+impl CCloudGetAppFileChangelistResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.current_change_number = r.u64()?,
+                2 => m.files.push(CCloudAppFileInfo::deserialize(r.bytes()?)?),
+                3 => m.is_only_delta = r.boolean()?,
+                4 => m.path_prefixes.push(r.string()?),
+                5 => m.machine_names.push(r.string()?),
+                6 => m.app_buildid_hwm = r.u64()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CCloudClientFileDownloadRequest {
+    pub appid: u32,
+    pub filename: String,
+    pub realm: u32,
+}
+
+impl Default for CCloudClientFileDownloadRequest {
+    fn default() -> Self {
+        Self {
+            appid: 0,
+            filename: String::new(),
+            realm: 1,
+        }
+    }
+}
+
+impl CCloudClientFileDownloadRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.string_field(2, &self.filename);
+        w.uint32_field(3, self.realm);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudHTTPHeader {
+    pub name: String,
+    pub value: String,
+}
+
+impl CCloudHTTPHeader {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.name = r.string()?,
+                2 => m.value = r.string()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.string_field(1, &self.name);
+        w.string_field(2, &self.value);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudClientFileDownloadResponse {
+    pub file_size: u32,
+    pub raw_file_size: u32,
+    pub sha_file: Vec<u8>,
+    pub time_stamp: u64,
+    pub is_explicit_delete: bool,
+    pub url_host: String,
+    pub url_path: String,
+    pub use_https: bool,
+    pub request_headers: Vec<CCloudHTTPHeader>,
+    pub encrypted: bool,
+}
+
+impl CCloudClientFileDownloadResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+                2 => m.file_size = r.u32()?,
+                3 => m.raw_file_size = r.u32()?,
+                4 => m.sha_file = r.bytes()?.to_vec(),
+                5 => m.time_stamp = r.u64()?,
+                6 => m.is_explicit_delete = r.boolean()?,
+                7 => m.url_host = r.string()?,
+                8 => m.url_path = r.string()?,
+                9 => m.use_https = r.boolean()?,
+                10 => m
+                    .request_headers
+                    .push(CCloudHTTPHeader::deserialize(r.bytes()?)?),
+                11 => m.encrypted = r.boolean()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudBeginAppUploadBatchRequest {
+    pub appid: u32,
+    pub machine_name: String,
+    pub files_to_upload: Vec<String>,
+    pub files_to_delete: Vec<String>,
+    pub client_id: u64,
+    pub app_build_id: u64,
+}
+
+impl CCloudBeginAppUploadBatchRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.string_field(2, &self.machine_name);
+        for file in &self.files_to_upload {
+            w.string_field(3, file);
+        }
+        for file in &self.files_to_delete {
+            w.string_field(4, file);
+        }
+        w.uint64_field(5, self.client_id);
+        w.uint64_field(6, self.app_build_id);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CCloudBeginAppUploadBatchResponse {
+    pub batch_id: u64,
+    pub app_change_number: u64,
+}
+
+impl CCloudBeginAppUploadBatchResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.batch_id = r.u64()?,
+                4 => m.app_change_number = r.u64()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudClientBeginFileUploadRequest {
+    pub appid: u32,
+    pub file_size: u32,
+    pub raw_file_size: u32,
+    pub file_sha: Vec<u8>,
+    pub time_stamp: u64,
+    pub filename: String,
+    pub upload_batch_id: u64,
+}
+
+impl CCloudClientBeginFileUploadRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.uint32_field(2, self.file_size);
+        w.uint32_field(3, self.raw_file_size);
+        w.bytes_field(4, &self.file_sha);
+        w.uint64_field(5, self.time_stamp);
+        w.string_field(6, &self.filename);
+        w.uint64_field(13, self.upload_batch_id);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudUploadBlockDetails {
+    pub url_host: String,
+    pub url_path: String,
+    pub use_https: bool,
+    pub http_method: i32,
+    pub request_headers: Vec<CCloudHTTPHeader>,
+    pub block_offset: u64,
+    pub block_length: u32,
+    pub explicit_body_data: Vec<u8>,
+    pub may_parallelize: bool,
+}
+
+impl CCloudUploadBlockDetails {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.url_host = r.string()?,
+                2 => m.url_path = r.string()?,
+                3 => m.use_https = r.boolean()?,
+                4 => m.http_method = r.u64()? as u32 as i32,
+                5 => m
+                    .request_headers
+                    .push(CCloudHTTPHeader::deserialize(r.bytes()?)?),
+                6 => m.block_offset = r.u64()?,
+                7 => m.block_length = r.u32()?,
+                8 => m.explicit_body_data = r.bytes()?.to_vec(),
+                9 => m.may_parallelize = r.boolean()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudClientBeginFileUploadResponse {
+    pub encrypt_file: bool,
+    pub block_requests: Vec<CCloudUploadBlockDetails>,
+}
+
+impl CCloudClientBeginFileUploadResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.encrypt_file = r.boolean()?,
+                2 => m
+                    .block_requests
+                    .push(CCloudUploadBlockDetails::deserialize(r.bytes()?)?),
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudClientCommitFileUploadRequest {
+    pub transfer_succeeded: bool,
+    pub appid: u32,
+    pub file_sha: Vec<u8>,
+    pub filename: String,
+}
+
+impl CCloudClientCommitFileUploadRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.bool_field_force(1, self.transfer_succeeded);
+        w.uint32_field(2, self.appid);
+        w.bytes_field(3, &self.file_sha);
+        w.string_field(4, &self.filename);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CCloudClientCommitFileUploadResponse {
+    pub file_committed: bool,
+}
+
+impl CCloudClientCommitFileUploadResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.file_committed = r.boolean()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CCloudCompleteAppUploadBatchRequest {
+    pub appid: u32,
+    pub batch_id: u64,
+    pub batch_eresult: u32,
+}
+
+impl CCloudCompleteAppUploadBatchRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.uint64_field(2, self.batch_id);
+        w.uint32_field(3, self.batch_eresult);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudAppLaunchIntentRequest {
+    pub appid: u32,
+    pub client_id: u64,
+    pub machine_name: String,
+    pub ignore_pending_operations: bool,
+    pub os_type: i32,
+}
+
+impl CCloudAppLaunchIntentRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.uint64_field(2, self.client_id);
+        w.string_field(3, &self.machine_name);
+        w.bool_field(4, self.ignore_pending_operations);
+        w.int32_field(5, self.os_type);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CCloudAppLaunchIntentResponse {
+    pub pending_operation_codes: Vec<i32>,
+}
+
+impl CCloudAppLaunchIntentResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            if t.field_number == 1 {
+                m.pending_operation_codes
+                    .push(parse_pending_operation(r.bytes()?)?);
+            } else if !r.skip(t.wire_type) {
+                return None;
+            }
+        }
+        Some(m)
+    }
+}
+
+fn parse_pending_operation(body: &[u8]) -> Option<i32> {
+    let mut r = Reader::new(body);
+    let mut op = 0;
+    while !r.eof() {
+        let Some(t) = r.next_tag() else {
+            return r.ok().then_some(op);
+        };
+        if t.field_number == 1 {
+            op = r.u64()? as u32 as i32;
+        } else if !r.skip(t.wire_type) {
+            return None;
+        }
+    }
+    Some(op)
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CCloudAppExitSyncDoneNotification {
+    pub appid: u32,
+    pub client_id: u64,
+    pub uploads_completed: bool,
+    pub uploads_required: bool,
+}
+
+impl CCloudAppExitSyncDoneNotification {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.uint64_field(2, self.client_id);
+        w.bool_field(3, self.uploads_completed);
+        w.bool_field(4, self.uploads_required);
+        out
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_changelist_file_info() {
+        let mut file = Vec::new();
+        {
+            let mut w = Writer::new(&mut file);
+            w.string_field(1, "save.dat");
+            w.bytes_field(2, &[1; 20]);
+            w.uint64_field(3, 100);
+            w.uint32_field(4, 12);
+            w.uint32_field(5, 2);
+            w.uint32_field(6, 0xffff);
+            w.uint32_field(7, 1);
+            w.uint32_field(8, 2);
+        }
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint64_field(1, 55);
+            w.submessage_field(2, &file);
+            w.bool_field(3, true);
+            w.string_field(4, "remote/");
+            w.string_field(5, "machine");
+            w.uint64_field(6, 777);
+        }
+
+        let parsed = CCloudGetAppFileChangelistResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.current_change_number, 55);
+        assert_eq!(parsed.files[0].file_name, "save.dat");
+        assert_eq!(parsed.files[0].persist_state, 2);
+        assert_eq!(parsed.path_prefixes, ["remote/"]);
+        assert_eq!(parsed.machine_names, ["machine"]);
+    }
+
+    #[test]
+    fn parses_download_and_upload_http_headers() {
+        let header = CCloudHTTPHeader {
+            name: "Auth".into(),
+            value: "token".into(),
+        }
+        .serialize();
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(2, 10);
+            w.uint32_field(3, 20);
+            w.bytes_field(4, &[2; 20]);
+            w.uint64_field(5, 1000);
+            w.string_field(7, "host");
+            w.string_field(8, "/path");
+            w.bool_field(9, true);
+            w.submessage_field(10, &header);
+            w.bool_field(11, true);
+        }
+
+        let parsed = CCloudClientFileDownloadResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.file_size, 10);
+        assert_eq!(parsed.request_headers[0].name, "Auth");
+        assert!(parsed.use_https);
+        assert!(parsed.encrypted);
+    }
+
+    #[test]
+    fn commit_upload_force_emits_false_transfer_status() {
+        let body = CCloudClientCommitFileUploadRequest {
+            transfer_succeeded: false,
+            appid: 480,
+            file_sha: vec![1, 2],
+            filename: "save.dat".into(),
+        }
+        .serialize();
+        assert_eq!(&body[..4], &[8, 0, 16, 224]);
+    }
+
+    #[test]
+    fn parses_launch_pending_operations() {
+        let mut op = Vec::new();
+        Writer::new(&mut op).uint32_field(1, 4);
+        let mut body = Vec::new();
+        Writer::new(&mut body).submessage_field(1, &op);
+        let parsed = CCloudAppLaunchIntentResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.pending_operation_codes, [4]);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/ccontentserverdirectory.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/ccontentserverdirectory.rs
new file mode 100644
index 000000000..ba6e9d16c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/ccontentserverdirectory.rs
@@ -0,0 +1,212 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CContentServerDirectoryGetManifestRequestCodeRequest {
+    pub app_id: u32,
+    pub depot_id: u32,
+    pub manifest_id: u64,
+    pub app_branch: String,
+    pub branch_password_hash: String,
+}
+
+impl CContentServerDirectoryGetManifestRequestCodeRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.uint32_field(2, self.depot_id);
+        w.uint64_field(3, self.manifest_id);
+        w.string_field(4, &self.app_branch);
+        w.string_field(5, &self.branch_password_hash);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CContentServerDirectoryGetManifestRequestCodeResponse {
+    pub manifest_request_code: u64,
+}
+
+impl CContentServerDirectoryGetManifestRequestCodeResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.manifest_request_code = reader.u64()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct CContentServerDirectoryServerInfo {
+    pub server_type: String,
+    pub source_id: i32,
+    pub cell_id: i32,
+    pub load: i32,
+    pub weighted_load: f32,
+    pub num_entries_in_client_list: i32,
+    pub steam_china_only: bool,
+    pub host: String,
+    pub vhost: String,
+    pub use_as_proxy: bool,
+    pub proxy_request_path_template: String,
+    pub https_support: String,
+    pub allowed_app_ids: Vec<u32>,
+    pub priority_class: u32,
+}
+
+impl CContentServerDirectoryServerInfo {
+    pub fn use_https(&self) -> bool {
+        self.https_support.eq_ignore_ascii_case("mandatory")
+    }
+
+    pub fn port(&self) -> u16 {
+        if self.use_https() {
+            443
+        } else {
+            80
+        }
+    }
+
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.server_type = reader.string()?,
+                2 => msg.source_id = reader.i32()?,
+                3 => msg.cell_id = reader.i32()?,
+                4 => msg.load = reader.i32()?,
+                5 => msg.weighted_load = f32::from_bits(reader.fixed32()?),
+                6 => msg.num_entries_in_client_list = reader.i32()?,
+                7 => msg.steam_china_only = reader.boolean()?,
+                8 => msg.host = reader.string()?,
+                9 => msg.vhost = reader.string()?,
+                10 => msg.use_as_proxy = reader.boolean()?,
+                11 => msg.proxy_request_path_template = reader.string()?,
+                12 => msg.https_support = reader.string()?,
+                13 => match tag.wire_type {
+                    WireType::LengthDelimited => {
+                        let mut packed = Reader::new(reader.bytes()?);
+                        while !packed.eof() {
+                            msg.allowed_app_ids.push(packed.varint()? as u32);
+                        }
+                    }
+                    _ => msg.allowed_app_ids.push(reader.u32()?),
+                },
+                15 => msg.priority_class = reader.u32()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct CContentServerDirectoryGetServersForSteamPipeRequest {
+    pub cell_id: u32,
+    pub max_servers: u32,
+}
+
+impl Default for CContentServerDirectoryGetServersForSteamPipeRequest {
+    fn default() -> Self {
+        Self {
+            cell_id: 0,
+            max_servers: 20,
+        }
+    }
+}
+
+impl CContentServerDirectoryGetServersForSteamPipeRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.cell_id);
+        w.uint32_field(2, self.max_servers);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct CContentServerDirectoryGetServersForSteamPipeResponse {
+    pub servers: Vec<CContentServerDirectoryServerInfo>,
+    pub no_change: bool,
+}
+
+impl CContentServerDirectoryGetServersForSteamPipeResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg
+                    .servers
+                    .push(CContentServerDirectoryServerInfo::deserialize(
+                        reader.bytes()?,
+                    )?),
+                2 => msg.no_change = reader.boolean()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_server_info_with_packed_and_unpacked_app_ids() {
+        let mut server = Vec::new();
+        {
+            let mut w = Writer::new(&mut server);
+            w.string_field(1, "SteamCache");
+            w.int32_field(2, 5);
+            w.int32_field(3, 6);
+            w.int32_field(4, 7);
+            w.tag(5, WireType::Fixed32);
+            w.raw_bytes(&1.25f32.to_bits().to_le_bytes());
+            w.bool_field(7, true);
+            w.string_field(8, "cache.example");
+            w.string_field(12, "MANDATORY");
+            w.uint32_field(13, 480);
+            let mut packed = Vec::new();
+            Writer::new(&mut packed).varint(730);
+            w.bytes_field(13, &packed);
+            w.uint32_field(15, 2);
+        }
+
+        let parsed = CContentServerDirectoryServerInfo::deserialize(&server).unwrap();
+        assert_eq!(parsed.server_type, "SteamCache");
+        assert_eq!(parsed.weighted_load, 1.25);
+        assert_eq!(parsed.allowed_app_ids, [480, 730]);
+        assert!(parsed.use_https());
+        assert_eq!(parsed.port(), 443);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cfamilygroups.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cfamilygroups.rs
new file mode 100644
index 000000000..11bae4fd4
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cfamilygroups.rs
@@ -0,0 +1,92 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CFamilyGroupsGetFamilyGroupRequest {
+    pub family_groupid: u64,
+}
+
+impl CFamilyGroupsGetFamilyGroupRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).uint64_field(1, self.family_groupid);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct FamilyGroupMember {
+    pub steamid: u64,
+}
+
+impl FamilyGroupMember {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.steamid = reader.fixed64()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CFamilyGroupsGetFamilyGroupResponse {
+    pub name: String,
+    pub members: Vec<FamilyGroupMember>,
+}
+
+impl CFamilyGroupsGetFamilyGroupResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.name = reader.string()?,
+                2 => msg
+                    .members
+                    .push(FamilyGroupMember::deserialize(reader.bytes()?)?),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_family_group_members() {
+        let mut member = Vec::new();
+        Writer::new(&mut member).fixed64_field(1, 123);
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.string_field(1, "Family");
+            w.submessage_field(2, &member);
+        }
+
+        let parsed = CFamilyGroupsGetFamilyGroupResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.name, "Family");
+        assert_eq!(parsed.members[0].steamid, 123);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cfriendmessages.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cfriendmessages.rs
new file mode 100644
index 000000000..ef7f6a61d
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cfriendmessages.rs
@@ -0,0 +1,245 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+pub const CHAT_ENTRY_TYPE_TEXT: i32 = 1;
+
+#[derive(Clone, Debug, Default)]
+pub struct CFriendMessagesSendMessageRequest {
+    pub steamid: u64,
+    pub chat_entry_type: i32,
+    pub message: String,
+    pub contains_bbcode: bool,
+    pub echo_to_sender: bool,
+    pub low_priority: bool,
+}
+
+impl CFriendMessagesSendMessageRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.fixed64_field(1, self.steamid);
+        w.int32_field(2, self.chat_entry_type);
+        w.string_field(3, &self.message);
+        if self.contains_bbcode {
+            w.bool_field(4, true);
+        }
+        if self.echo_to_sender {
+            w.bool_field(5, true);
+        }
+        if self.low_priority {
+            w.bool_field(6, true);
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct CFriendMessagesSendMessageResponse {
+    pub modified_message: String,
+    pub server_timestamp: u32,
+    pub ordinal: i32,
+    pub message_without_bb_code: String,
+}
+
+impl CFriendMessagesSendMessageResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match (tag.field_number, tag.wire_type) {
+                (1, WireType::LengthDelimited) => msg.modified_message = reader.string()?,
+                (2, WireType::Varint) => msg.server_timestamp = reader.u32()?,
+                (3, WireType::Varint) => msg.ordinal = reader.i32()?,
+                (4, WireType::LengthDelimited) => {
+                    msg.message_without_bb_code = reader.string()?
+                }
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct CFriendMessagesGetRecentMessagesRequest {
+    pub steamid1: u64,
+    pub steamid2: u64,
+    pub count: u32,
+    pub most_recent_conversation: bool,
+}
+
+impl CFriendMessagesGetRecentMessagesRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.fixed64_field(1, self.steamid1);
+        w.fixed64_field(2, self.steamid2);
+        w.uint32_field(3, self.count);
+        if self.most_recent_conversation {
+            w.bool_field(4, true);
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct FriendMessage {
+    pub accountid: u32,
+    pub timestamp: u32,
+    pub message: String,
+    pub ordinal: i32,
+}
+
+impl FriendMessage {
+    fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match (tag.field_number, tag.wire_type) {
+                (1, WireType::Varint) => msg.accountid = reader.u32()?,
+                (2, WireType::Varint) => msg.timestamp = reader.u32()?,
+                (3, WireType::LengthDelimited) => msg.message = reader.string()?,
+                (4, WireType::Varint) => msg.ordinal = reader.i32()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct CFriendMessagesGetRecentMessagesResponse {
+    pub messages: Vec<FriendMessage>,
+    pub more_available: bool,
+}
+
+impl CFriendMessagesGetRecentMessagesResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match (tag.field_number, tag.wire_type) {
+                (1, WireType::LengthDelimited) => {
+                    msg.messages.push(FriendMessage::deserialize(reader.bytes()?)?)
+                }
+                (4, WireType::Varint) => msg.more_available = reader.u32()? != 0,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct CFriendMessagesIncomingMessageNotification {
+    pub steamid_friend: u64,
+    pub chat_entry_type: i32,
+    pub message: String,
+    pub rtime32_server_timestamp: u32,
+    pub ordinal: i32,
+    pub local_echo: bool,
+    pub message_no_bbcode: String,
+}
+
+impl CFriendMessagesIncomingMessageNotification {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match (tag.field_number, tag.wire_type) {
+                (1, WireType::Fixed64) => msg.steamid_friend = reader.fixed64()?,
+                (2, WireType::Varint) => msg.chat_entry_type = reader.i32()?,
+                (4, WireType::LengthDelimited) => msg.message = reader.string()?,
+                (5, WireType::Fixed32) => msg.rtime32_server_timestamp = reader.fixed32()?,
+                (6, WireType::Varint) => msg.ordinal = reader.i32()?,
+                (7, WireType::Varint) => msg.local_echo = reader.u32()? != 0,
+                (8, WireType::LengthDelimited) => msg.message_no_bbcode = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn send_request_roundtrips_fields() {
+        let req = CFriendMessagesSendMessageRequest {
+            steamid: 76561198000000000,
+            chat_entry_type: CHAT_ENTRY_TYPE_TEXT,
+            message: "hello".into(),
+            echo_to_sender: true,
+            ..Default::default()
+        };
+        let bytes = req.serialize();
+        let mut reader = Reader::new(&bytes);
+        let tag = reader.next_tag().unwrap();
+        assert_eq!(tag.field_number, 1);
+        assert_eq!(reader.fixed64().unwrap(), 76561198000000000);
+    }
+
+    #[test]
+    fn incoming_notification_parses() {
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.fixed64_field(1, 123);
+            w.int32_field(2, CHAT_ENTRY_TYPE_TEXT);
+            w.string_field(4, "hi there");
+            w.fixed32_field(5, 1700000000);
+            w.int32_field(6, 0);
+        }
+        let parsed = CFriendMessagesIncomingMessageNotification::deserialize(&body).unwrap();
+        assert_eq!(parsed.steamid_friend, 123);
+        assert_eq!(parsed.message, "hi there");
+        assert_eq!(parsed.rtime32_server_timestamp, 1700000000);
+    }
+
+    #[test]
+    fn recent_message_parses_ordinal_from_field4_and_skips_reactions() {
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(1, 42);
+            w.uint32_field(2, 1700000000);
+            w.string_field(3, "yo");
+            w.int32_field(4, 7);
+            w.string_field(5, "reactions-submessage");
+        }
+        let parsed = FriendMessage::deserialize(&body).unwrap();
+        assert_eq!(parsed.accountid, 42);
+        assert_eq!(parsed.timestamp, 1700000000);
+        assert_eq!(parsed.message, "yo");
+        assert_eq!(parsed.ordinal, 7);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cinventory.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cinventory.rs
new file mode 100644
index 000000000..558542521
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cinventory.rs
@@ -0,0 +1,59 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CInventoryGetItemDefMetaRequest {
+    pub appid: u32,
+}
+
+impl CInventoryGetItemDefMetaRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).uint32_field(1, self.appid);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CInventoryGetItemDefMetaResponse {
+    pub modified: u32,
+    pub digest: String,
+}
+
+impl CInventoryGetItemDefMetaResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.modified = reader.u32()?,
+                2 => msg.digest = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_item_def_meta_response() {
+        let mut body = Vec::new();
+        let mut w = Writer::new(&mut body);
+        w.uint32_field(1, 12345);
+        w.string_field(2, "digest");
+
+        let parsed = CInventoryGetItemDefMetaResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.modified, 12345);
+        assert_eq!(parsed.digest, "digest");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_change_status.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_change_status.rs
new file mode 100644
index 000000000..2a7716375
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_change_status.rs
@@ -0,0 +1,25 @@
+use crate::proto_wire::Writer;
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientChangeStatus {
+    pub persona_state: u32,
+    pub player_name: String,
+    pub persona_set_by_user: bool,
+    pub need_persona_response: bool,
+}
+
+impl CMsgClientChangeStatus {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field_force(1, self.persona_state);
+        w.string_field(2, &self.player_name);
+        if self.persona_set_by_user {
+            w.bool_field(5, true);
+        }
+        if self.need_persona_response {
+            w.bool_field(7, true);
+        }
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_friends_list.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_friends_list.rs
new file mode 100644
index 000000000..c36fab0ac
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_friends_list.rs
@@ -0,0 +1,100 @@
+use crate::proto_wire::{Reader, WireType};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct ClientFriendsListEntry {
+    pub ulfriendid: u64,
+    pub efriendrelationship: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientFriendsList {
+    pub bincremental: bool,
+    pub friends: Vec<ClientFriendsListEntry>,
+    pub max_friend_count: u32,
+    pub active_friend_count: u32,
+    pub friends_limit_hit: bool,
+}
+
+impl CMsgClientFriendsList {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.bincremental = reader.boolean()?,
+                2 => msg.friends.push(parse_entry(reader.bytes()?)?),
+                3 => msg.max_friend_count = reader.u32()?,
+                4 => msg.active_friend_count = reader.u32()?,
+                5 => msg.friends_limit_hit = reader.boolean()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+fn parse_entry(body: &[u8]) -> Option<ClientFriendsListEntry> {
+    let mut reader = Reader::new(body);
+    let mut entry = ClientFriendsListEntry::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(entry);
+        };
+        match tag.field_number {
+            1 => {
+                if tag.wire_type != WireType::Fixed64 {
+                    return None;
+                }
+                entry.ulfriendid = reader.fixed64()?;
+            }
+            2 => entry.efriendrelationship = reader.u32()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(entry)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::Writer;
+
+    #[test]
+    fn parses_friends_list_entries() {
+        let mut entry = Vec::new();
+        {
+            let mut w = Writer::new(&mut entry);
+            w.fixed64_field(1, 123);
+            w.uint32_field(2, 3);
+        }
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.bool_field(1, true);
+            w.submessage_field(2, &entry);
+            w.uint32_field(3, 250);
+            w.uint32_field(4, 1);
+            w.bool_field(5, true);
+        }
+
+        let parsed = CMsgClientFriendsList::deserialize(&body).unwrap();
+        assert!(parsed.bincremental);
+        assert_eq!(parsed.friends[0].ulfriendid, 123);
+        assert_eq!(parsed.friends[0].efriendrelationship, 3);
+        assert_eq!(parsed.max_friend_count, 250);
+        assert_eq!(parsed.active_friend_count, 1);
+        assert!(parsed.friends_limit_hit);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_games_played.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_games_played.rs
new file mode 100644
index 000000000..3b2052824
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_games_played.rs
@@ -0,0 +1,90 @@
+use crate::proto_wire::{WireType, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct GamePlayedProcessInfo {
+    pub process_id: u32,
+    pub process_id_parent: u32,
+    pub parent_is_steam: bool,
+}
+
+impl GamePlayedProcessInfo {
+    fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field_force(1, self.process_id);
+        w.uint32_field_force(2, self.process_id_parent);
+        w.bool_field_force(3, self.parent_is_steam);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct GamePlayedEntry {
+    pub game_id: u64,
+    pub process_id: u32,
+    pub owner_id: u32,
+    pub launch_source: u32,
+    pub game_build_id: u32,
+    pub process_id_list: Vec<GamePlayedProcessInfo>,
+}
+
+impl GamePlayedEntry {
+    fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        if self.game_id != 0 {
+            w.tag(2, WireType::Fixed64);
+            w.raw_bytes(&self.game_id.to_le_bytes());
+        }
+        w.uint32_field_force(9, self.process_id);
+        w.uint32_field_force(12, self.owner_id);
+        w.uint32_field_force(21, self.launch_source);
+        w.uint32_field_force(26, self.game_build_id);
+        for process in &self.process_id_list {
+            w.submessage_field(32, &process.serialize());
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientGamesPlayed {
+    pub games_played: Vec<GamePlayedEntry>,
+    pub client_os_type: u32,
+}
+
+impl CMsgClientGamesPlayed {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        for game in &self.games_played {
+            w.submessage_field(1, &game.serialize());
+        }
+        w.uint32_field(2, self.client_os_type);
+        out
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::Reader;
+
+    #[test]
+    fn games_played_force_emits_zero_process_fields() {
+        let msg = CMsgClientGamesPlayed {
+            games_played: vec![GamePlayedEntry {
+                game_id: 480,
+                process_id_list: vec![GamePlayedProcessInfo::default()],
+                ..Default::default()
+            }],
+            client_os_type: 16,
+        };
+        let body = msg.serialize();
+        let mut reader = Reader::new(&body);
+        let tag = reader.next_tag().unwrap();
+        assert_eq!(tag.field_number, 1);
+        let game = reader.bytes().unwrap();
+        assert!(game.windows(2).any(|w| w == [0x48, 0x00])); // field 9 process_id = 0
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_app_ownership_ticket.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_app_ownership_ticket.rs
new file mode 100644
index 000000000..d11d5bffa
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_app_ownership_ticket.rs
@@ -0,0 +1,74 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientGetAppOwnershipTicket {
+    pub app_id: u32,
+}
+
+impl CMsgClientGetAppOwnershipTicket {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).uint32_field(1, self.app_id);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientGetAppOwnershipTicketResponse {
+    pub eresult: u32,
+    pub app_id: u32,
+    pub ticket: Vec<u8>,
+}
+
+impl Default for CMsgClientGetAppOwnershipTicketResponse {
+    fn default() -> Self {
+        Self {
+            eresult: 2,
+            app_id: 0,
+            ticket: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientGetAppOwnershipTicketResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.eresult = reader.u32()?,
+                2 => msg.app_id = reader.u32()?,
+                3 => msg.ticket = reader.bytes()?.to_vec(),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn ownership_ticket_roundtrip_fields() {
+        let req = CMsgClientGetAppOwnershipTicket { app_id: 480 }.serialize();
+        assert_eq!(req, vec![0x08, 0xe0, 0x03]);
+
+        let mut resp = Vec::new();
+        let mut w = Writer::new(&mut resp);
+        w.uint32_field(1, 1);
+        w.uint32_field(2, 480);
+        w.bytes_field(3, &[1, 2, 3]);
+        let parsed = CMsgClientGetAppOwnershipTicketResponse::deserialize(&resp).unwrap();
+        assert_eq!(parsed.eresult, 1);
+        assert_eq!(parsed.ticket, vec![1, 2, 3]);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_depot_decryption_key.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_depot_decryption_key.rs
new file mode 100644
index 000000000..db45fb385
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_depot_decryption_key.rs
@@ -0,0 +1,57 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientGetDepotDecryptionKey {
+    pub depot_id: u32,
+    pub app_id: u32,
+}
+
+impl CMsgClientGetDepotDecryptionKey {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.depot_id);
+        w.uint32_field(2, self.app_id);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientGetDepotDecryptionKeyResponse {
+    pub eresult: u32,
+    pub depot_id: u32,
+    pub depot_encryption_key: Vec<u8>,
+}
+
+impl Default for CMsgClientGetDepotDecryptionKeyResponse {
+    fn default() -> Self {
+        Self {
+            eresult: 2,
+            depot_id: 0,
+            depot_encryption_key: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientGetDepotDecryptionKeyResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.eresult = reader.u32()?,
+                2 => msg.depot_id = reader.u32()?,
+                3 => msg.depot_encryption_key = reader.bytes()?.to_vec(),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_user_stats.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_user_stats.rs
new file mode 100644
index 000000000..c492e8a1c
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_get_user_stats.rs
@@ -0,0 +1,129 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientGetUserStats {
+    pub game_id: u64,
+    pub steam_id_for_user: u64,
+}
+
+impl CMsgClientGetUserStats {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.fixed64_field(1, self.game_id);
+        w.fixed64_field(4, self.steam_id_for_user);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct UserStatsAchievementBlock {
+    pub achievement_id: u32,
+    pub unlock_time: Vec<u32>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientGetUserStatsResponse {
+    pub eresult: i32,
+    pub crc_stats: u32,
+    pub schema: Vec<u8>,
+    pub achievement_blocks: Vec<UserStatsAchievementBlock>,
+}
+
+impl Default for CMsgClientGetUserStatsResponse {
+    fn default() -> Self {
+        Self {
+            eresult: 2,
+            crc_stats: 0,
+            schema: Vec::new(),
+            achievement_blocks: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientGetUserStatsResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                2 => msg.eresult = reader.u64()? as u32 as i32,
+                3 => msg.crc_stats = reader.u32()?,
+                4 => msg.schema = reader.bytes()?.to_vec(),
+                6 => msg
+                    .achievement_blocks
+                    .push(parse_achievement_block(reader.bytes()?)?),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+fn parse_achievement_block(body: &[u8]) -> Option<UserStatsAchievementBlock> {
+    let mut reader = Reader::new(body);
+    let mut block = UserStatsAchievementBlock::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(block);
+        };
+        match (tag.field_number, tag.wire_type) {
+            (1, _) => block.achievement_id = reader.u32()?,
+            (2, WireType::Fixed32) => block.unlock_time.push(reader.fixed32()?),
+            (2, WireType::LengthDelimited) => {
+                let mut packed = Reader::new(reader.bytes()?);
+                while !packed.eof() {
+                    block.unlock_time.push(packed.fixed32()?);
+                }
+            }
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(block)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_unpacked_and_packed_achievement_unlocks() {
+        let mut block = Vec::new();
+        {
+            let mut w = Writer::new(&mut block);
+            w.uint32_field(1, 32);
+            w.tag(2, WireType::Fixed32);
+            w.raw_bytes(&10u32.to_le_bytes());
+            let mut packed = Vec::new();
+            packed.extend_from_slice(&20u32.to_le_bytes());
+            packed.extend_from_slice(&30u32.to_le_bytes());
+            w.bytes_field(2, &packed);
+        }
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.int32_field(2, 1);
+            w.uint32_field(3, 1234);
+            w.bytes_field(4, b"schema");
+            w.submessage_field(6, &block);
+        }
+
+        let parsed = CMsgClientGetUserStatsResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.eresult, 1);
+        assert_eq!(parsed.crc_stats, 1234);
+        assert_eq!(parsed.schema, b"schema");
+        assert_eq!(parsed.achievement_blocks[0].unlock_time, vec![10, 20, 30]);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_kick_playing_session.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_kick_playing_session.rs
new file mode 100644
index 000000000..de72ad499
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_kick_playing_session.rs
@@ -0,0 +1,14 @@
+use crate::proto_wire::Writer;
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientKickPlayingSession {
+    pub only_stop_game: bool,
+}
+
+impl CMsgClientKickPlayingSession {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).bool_field_force(1, self.only_stop_game);
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_license_list.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_license_list.rs
new file mode 100644
index 000000000..0c3f065a5
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_license_list.rs
@@ -0,0 +1,143 @@
+use crate::proto_wire::{Reader, WireType};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct License {
+    pub package_id: u32,
+    pub time_created: u32,
+    pub time_next_process: u32,
+    pub minute_limit: i32,
+    pub minutes_used: i32,
+    pub payment_method: u32,
+    pub flags: u32,
+    pub purchase_country_code: String,
+    pub license_type: u32,
+    pub territory_code: i32,
+    pub change_number: i32,
+    pub owner_id: u32,
+    pub initial_period: u32,
+    pub initial_time_unit: u32,
+    pub renewal_period: u32,
+    pub renewal_time_unit: u32,
+    pub access_token: u64,
+    pub master_package_id: u32,
+}
+
+impl License {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.package_id = reader.u32()?,
+                2 => {
+                    if tag.wire_type != WireType::Fixed32 {
+                        return None;
+                    }
+                    msg.time_created = reader.fixed32()?;
+                }
+                3 => {
+                    if tag.wire_type != WireType::Fixed32 {
+                        return None;
+                    }
+                    msg.time_next_process = reader.fixed32()?;
+                }
+                4 => msg.minute_limit = reader.i32()?,
+                5 => msg.minutes_used = reader.i32()?,
+                6 => msg.payment_method = reader.u32()?,
+                7 => msg.flags = reader.u32()?,
+                8 => msg.purchase_country_code = reader.string()?,
+                9 => msg.license_type = reader.u32()?,
+                10 => msg.territory_code = reader.i32()?,
+                11 => msg.change_number = reader.i32()?,
+                12 => msg.owner_id = reader.u32()?,
+                13 => msg.initial_period = reader.u32()?,
+                14 => msg.initial_time_unit = reader.u32()?,
+                15 => msg.renewal_period = reader.u32()?,
+                16 => msg.renewal_time_unit = reader.u32()?,
+                17 => msg.access_token = reader.u64()?,
+                18 => msg.master_package_id = reader.u32()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientLicenseList {
+    pub eresult: i32,
+    pub licenses: Vec<License>,
+}
+
+impl Default for CMsgClientLicenseList {
+    fn default() -> Self {
+        Self {
+            eresult: 2,
+            licenses: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientLicenseList {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.eresult = reader.i32()?,
+                2 => msg.licenses.push(License::deserialize(reader.bytes()?)?),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::Writer;
+
+    #[test]
+    fn parses_license_with_fixed_times_and_two_byte_tags() {
+        let mut lic = Vec::new();
+        {
+            let mut w = Writer::new(&mut lic);
+            w.uint32_field(1, 123);
+            w.tag(2, WireType::Fixed32);
+            w.raw_bytes(&1000u32.to_le_bytes());
+            w.tag(3, WireType::Fixed32);
+            w.raw_bytes(&2000u32.to_le_bytes());
+            w.string_field(8, "US");
+            w.uint32_field(16, 7);
+            w.uint64_field(17, 0x1234);
+            w.uint32_field(18, 456);
+        }
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.int32_field(1, 1);
+            w.submessage_field(2, &lic);
+        }
+        let parsed = CMsgClientLicenseList::deserialize(&body).unwrap();
+        assert_eq!(parsed.eresult, 1);
+        assert_eq!(parsed.licenses[0].package_id, 123);
+        assert_eq!(parsed.licenses[0].time_created, 1000);
+        assert_eq!(parsed.licenses[0].renewal_time_unit, 7);
+        assert_eq!(parsed.licenses[0].master_package_id, 456);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_get_lobby_list.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_get_lobby_list.rs
new file mode 100644
index 000000000..265c8d4b5
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_get_lobby_list.rs
@@ -0,0 +1,166 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSGetLobbyListFilter {
+    pub key: String,
+    pub value: String,
+    pub comparision: i32,
+    pub filter_type: i32,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientMMSGetLobbyList {
+    pub app_id: u32,
+    pub num_lobbies_requested: i32,
+    pub cell_id: u32,
+    pub filters: Vec<CMsgClientMMSGetLobbyListFilter>,
+}
+
+impl Default for CMsgClientMMSGetLobbyList {
+    fn default() -> Self {
+        Self {
+            app_id: 0,
+            num_lobbies_requested: 50,
+            cell_id: 0,
+            filters: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientMMSGetLobbyList {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        if self.num_lobbies_requested > 0 {
+            w.int32_field(3, self.num_lobbies_requested);
+        }
+        w.uint32_field(4, self.cell_id);
+        for filter in &self.filters {
+            let mut sub = Vec::new();
+            let mut fw = Writer::new(&mut sub);
+            fw.string_field(1, &filter.key);
+            fw.string_field(2, &filter.value);
+            fw.int32_field(3, filter.comparision);
+            fw.int32_field(4, filter.filter_type);
+            w.submessage_field(6, &sub);
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct MMSLobbyListEntry {
+    pub steam_id: u64,
+    pub max_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub metadata: Vec<u8>,
+    pub num_members: i32,
+    pub distance: f32,
+    pub weight: i64,
+    pub ping: i32,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct CMsgClientMMSGetLobbyListResponse {
+    pub app_id: u32,
+    pub eresult: i32,
+    pub lobbies: Vec<MMSLobbyListEntry>,
+}
+
+impl Default for CMsgClientMMSGetLobbyListResponse {
+    fn default() -> Self {
+        Self {
+            app_id: 0,
+            eresult: 2,
+            lobbies: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientMMSGetLobbyListResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.app_id = r.u32()?,
+                3 => m.eresult = r.u64()? as u32 as i32,
+                4 => m.lobbies.push(parse_lobby_entry(r.bytes()?)?),
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+fn parse_lobby_entry(body: &[u8]) -> Option<MMSLobbyListEntry> {
+    let mut r = Reader::new(body);
+    let mut e = MMSLobbyListEntry::default();
+    while !r.eof() {
+        let Some(t) = r.next_tag() else {
+            return r.ok().then_some(e);
+        };
+        match t.field_number {
+            1 => e.steam_id = r.fixed64()?,
+            2 => e.max_members = r.u64()? as u32 as i32,
+            3 => e.lobby_type = r.u64()? as u32 as i32,
+            4 => e.lobby_flags = r.u64()? as u32 as i32,
+            5 => e.metadata = r.bytes()?.to_vec(),
+            6 => e.num_members = r.u64()? as u32 as i32,
+            7 => {
+                if t.wire_type != WireType::Fixed32 {
+                    return None;
+                }
+                e.distance = f32::from_bits(r.fixed32()?);
+            }
+            8 => e.weight = r.u64()? as i64,
+            9 => e.ping = r.u64()? as u32 as i32,
+            _ => {
+                if !r.skip(t.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(e)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_lobby_list_entry_with_float_distance() {
+        let mut lobby = Vec::new();
+        {
+            let mut w = Writer::new(&mut lobby);
+            w.fixed64_field(1, 100);
+            w.int32_field(2, 4);
+            w.int32_field(3, 2);
+            w.bytes_field(5, b"kv");
+            w.tag(7, WireType::Fixed32);
+            w.raw_bytes(&1.5f32.to_bits().to_le_bytes());
+            w.int64_field(8, -5);
+        }
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(1, 480);
+            w.submessage_field(4, &lobby);
+        }
+        let parsed = CMsgClientMMSGetLobbyListResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.app_id, 480);
+        assert_eq!(parsed.eresult, 2);
+        assert_eq!(parsed.lobbies[0].distance, 1.5);
+        assert_eq!(parsed.lobbies[0].weight, -5);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_lobby_data.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_lobby_data.rs
new file mode 100644
index 000000000..4dae4f316
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_lobby_data.rs
@@ -0,0 +1,102 @@
+use crate::proto_wire::Reader;
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct MMSLobbyDataMember {
+    pub steam_id: u64,
+    pub persona_name: String,
+    pub metadata: Vec<u8>,
+}
+
+impl MMSLobbyDataMember {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.steam_id = r.fixed64()?,
+                2 => m.persona_name = r.string()?,
+                3 => m.metadata = r.bytes()?.to_vec(),
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSLobbyData {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub num_members: i32,
+    pub max_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub steam_id_owner: u64,
+    pub metadata: Vec<u8>,
+    pub members: Vec<MMSLobbyDataMember>,
+}
+
+impl CMsgClientMMSLobbyData {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.app_id = r.u32()?,
+                2 => m.steam_id_lobby = r.fixed64()?,
+                3 => m.num_members = r.u64()? as u32 as i32,
+                4 => m.max_members = r.u64()? as u32 as i32,
+                5 => m.lobby_type = r.u64()? as u32 as i32,
+                6 => m.lobby_flags = r.u64()? as u32 as i32,
+                7 => m.steam_id_owner = r.fixed64()?,
+                8 => m.metadata = r.bytes()?.to_vec(),
+                9 => m.members.push(MMSLobbyDataMember::deserialize(r.bytes()?)?),
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::Writer;
+
+    #[test]
+    fn parses_lobby_data_members() {
+        let mut member = Vec::new();
+        {
+            let mut w = Writer::new(&mut member);
+            w.fixed64_field(1, 200);
+            w.string_field(2, "Ada");
+            w.bytes_field(3, b"meta");
+        }
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(1, 480);
+            w.fixed64_field(2, 100);
+            w.uint32_field(3, 1);
+            w.fixed64_field(7, 200);
+            w.submessage_field(9, &member);
+        }
+        let parsed = CMsgClientMMSLobbyData::deserialize(&body).unwrap();
+        assert_eq!(parsed.members[0].persona_name, "Ada");
+        assert_eq!(parsed.steam_id_owner, 200);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_lobby_ops.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_lobby_ops.rs
new file mode 100644
index 000000000..a793805b1
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_mms_lobby_ops.rs
@@ -0,0 +1,379 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSCreateLobby {
+    pub app_id: u32,
+    pub max_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub metadata: Vec<u8>,
+    pub persona_name_owner: String,
+}
+
+impl CMsgClientMMSCreateLobby {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.int32_field(2, self.max_members);
+        w.int32_field(3, self.lobby_type);
+        w.int32_field(4, self.lobby_flags);
+        w.bytes_field(7, &self.metadata);
+        w.string_field(8, &self.persona_name_owner);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct CMsgClientMMSCreateLobbyResponse {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub eresult: i32,
+}
+
+impl Default for CMsgClientMMSCreateLobbyResponse {
+    fn default() -> Self {
+        Self {
+            app_id: 0,
+            steam_id_lobby: 0,
+            eresult: 2,
+        }
+    }
+}
+
+impl CMsgClientMMSCreateLobbyResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        parse_simple_lobby_response(body)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSJoinLobby {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub persona_name: String,
+}
+
+impl CMsgClientMMSJoinLobby {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.fixed64_field(2, self.steam_id_lobby);
+        w.string_field(3, &self.persona_name);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSJoinLobbyResponseMember {
+    pub steam_id: u64,
+    pub persona_name: String,
+    pub metadata: Vec<u8>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientMMSJoinLobbyResponse {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub chat_room_enter_response: i32,
+    pub max_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub steam_id_owner: u64,
+    pub metadata: Vec<u8>,
+    pub members: Vec<CMsgClientMMSJoinLobbyResponseMember>,
+}
+
+impl Default for CMsgClientMMSJoinLobbyResponse {
+    fn default() -> Self {
+        Self {
+            app_id: 0,
+            steam_id_lobby: 0,
+            chat_room_enter_response: 2,
+            max_members: 0,
+            lobby_type: 0,
+            lobby_flags: 0,
+            steam_id_owner: 0,
+            metadata: Vec::new(),
+            members: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientMMSJoinLobbyResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.app_id = r.u32()?,
+                2 => m.steam_id_lobby = r.fixed64()?,
+                3 => m.chat_room_enter_response = r.u64()? as u32 as i32,
+                4 => m.max_members = r.u64()? as u32 as i32,
+                5 => m.lobby_type = r.u64()? as u32 as i32,
+                6 => m.lobby_flags = r.u64()? as u32 as i32,
+                7 => m.steam_id_owner = r.fixed64()?,
+                8 => m.metadata = r.bytes()?.to_vec(),
+                9 => m.members.push(parse_join_member(r.bytes()?)?),
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSLeaveLobby {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+}
+
+impl CMsgClientMMSLeaveLobby {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.fixed64_field(2, self.steam_id_lobby);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSSetLobbyData {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub steam_id_member: u64,
+    pub max_members: i32,
+    pub lobby_type: i32,
+    pub lobby_flags: i32,
+    pub metadata: Vec<u8>,
+}
+
+impl CMsgClientMMSSetLobbyData {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.fixed64_field(2, self.steam_id_lobby);
+        w.fixed64_field(3, self.steam_id_member);
+        w.int32_field(4, self.max_members);
+        w.int32_field(5, self.lobby_type);
+        w.int32_field(6, self.lobby_flags);
+        w.bytes_field(7, &self.metadata);
+        out
+    }
+}
+
+pub type CMsgClientMMSSetLobbyDataResponse = CMsgClientMMSCreateLobbyResponse;
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSSendLobbyChatMsg {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub lobby_message: Vec<u8>,
+}
+
+impl CMsgClientMMSSendLobbyChatMsg {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.fixed64_field(2, self.steam_id_lobby);
+        w.bytes_field(4, &self.lobby_message);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSLobbyChatMsg {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub steam_id_sender: u64,
+    pub lobby_message: Vec<u8>,
+}
+
+impl CMsgClientMMSLobbyChatMsg {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.app_id = r.u32()?,
+                2 => m.steam_id_lobby = r.fixed64()?,
+                3 => m.steam_id_sender = r.fixed64()?,
+                4 => m.lobby_message = r.bytes()?.to_vec(),
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSUserJoinedOrLeftLobby {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub steam_id_user: u64,
+    pub persona_name: String,
+}
+
+impl CMsgClientMMSUserJoinedOrLeftLobby {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut r = Reader::new(body);
+        let mut m = Self::default();
+        while !r.eof() {
+            let Some(t) = r.next_tag() else {
+                return r.ok().then_some(m);
+            };
+            match t.field_number {
+                1 => m.app_id = r.u32()?,
+                2 => m.steam_id_lobby = r.fixed64()?,
+                3 => m.steam_id_user = r.fixed64()?,
+                4 => m.persona_name = r.string()?,
+                _ => {
+                    if !r.skip(t.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(m)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSInviteToLobby {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub steam_id_user_invited: u64,
+}
+
+impl CMsgClientMMSInviteToLobby {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.fixed64_field(2, self.steam_id_lobby);
+        w.fixed64_field(3, self.steam_id_user_invited);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientMMSSetLobbyOwner {
+    pub app_id: u32,
+    pub steam_id_lobby: u64,
+    pub steam_id_new_owner: u64,
+}
+
+impl CMsgClientMMSSetLobbyOwner {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.app_id);
+        w.fixed64_field(2, self.steam_id_lobby);
+        w.fixed64_field(3, self.steam_id_new_owner);
+        out
+    }
+}
+
+pub type CMsgClientMMSSetLobbyOwnerResponse = CMsgClientMMSCreateLobbyResponse;
+
+fn parse_simple_lobby_response(body: &[u8]) -> Option<CMsgClientMMSCreateLobbyResponse> {
+    let mut r = Reader::new(body);
+    let mut m = CMsgClientMMSCreateLobbyResponse::default();
+    while !r.eof() {
+        let Some(t) = r.next_tag() else {
+            return r.ok().then_some(m);
+        };
+        match t.field_number {
+            1 => m.app_id = r.u32()?,
+            2 => m.steam_id_lobby = r.fixed64()?,
+            3 => m.eresult = r.u64()? as u32 as i32,
+            _ => {
+                if !r.skip(t.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(m)
+}
+
+fn parse_join_member(body: &[u8]) -> Option<CMsgClientMMSJoinLobbyResponseMember> {
+    let mut r = Reader::new(body);
+    let mut m = CMsgClientMMSJoinLobbyResponseMember::default();
+    while !r.eof() {
+        let Some(t) = r.next_tag() else {
+            return r.ok().then_some(m);
+        };
+        match t.field_number {
+            1 => m.steam_id = r.fixed64()?,
+            2 => m.persona_name = r.string()?,
+            3 => m.metadata = r.bytes()?.to_vec(),
+            _ => {
+                if !r.skip(t.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(m)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_join_response_members() {
+        let mut member = Vec::new();
+        {
+            let mut w = Writer::new(&mut member);
+            w.fixed64_field(1, 9);
+            w.string_field(2, "Ada");
+            w.bytes_field(3, b"m");
+        }
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(1, 480);
+            w.fixed64_field(2, 100);
+            w.uint32_field(3, 1);
+            w.uint32_field(4, 4);
+            w.fixed64_field(7, 9);
+            w.bytes_field(8, b"lobby");
+            w.submessage_field(9, &member);
+        }
+        let parsed = CMsgClientMMSJoinLobbyResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.chat_room_enter_response, 1);
+        assert_eq!(parsed.members[0].persona_name, "Ada");
+    }
+
+    #[test]
+    fn serializes_lobby_chat_message() {
+        let body = CMsgClientMMSSendLobbyChatMsg {
+            app_id: 480,
+            steam_id_lobby: 100,
+            lobby_message: b"hello".to_vec(),
+        }
+        .serialize();
+        assert_eq!(body[0], 8);
+        assert!(body.ends_with(b"hello"));
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_persona.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_persona.rs
new file mode 100644
index 000000000..8e3f38951
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_persona.rs
@@ -0,0 +1,184 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientRequestFriendData {
+    pub persona_state_requested: u32,
+    pub friends: Vec<u64>,
+}
+
+impl CMsgClientRequestFriendData {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.persona_state_requested);
+        for id in &self.friends {
+            w.fixed64_field(2, *id);
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PersonaStateFriend {
+    pub friendid: u64,
+    pub persona_state: u32,
+    pub game_played_app_id: u32,
+    pub player_name: String,
+    pub avatar_hash: Vec<u8>,
+    pub game_name: String,
+    pub gameid: u64,
+    pub rich_presence: Vec<(String, String)>,
+    pub has_persona_state: bool,
+    pub has_game: bool,
+}
+
+impl PersonaStateFriend {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match (tag.field_number, tag.wire_type) {
+                (1, WireType::Fixed64) => msg.friendid = reader.fixed64()?,
+                (2, WireType::Varint) => {
+                    msg.persona_state = reader.u32()?;
+                    msg.has_persona_state = true;
+                }
+                (3, WireType::Varint) => {
+                    msg.game_played_app_id = reader.u32()?;
+                    msg.has_game = true;
+                }
+                (15, WireType::LengthDelimited) => msg.player_name = reader.string()?,
+                (25, WireType::LengthDelimited) => msg
+                    .rich_presence
+                    .push(parse_kv_submessage(reader.bytes()?)?),
+                (31, WireType::LengthDelimited) => msg.avatar_hash = reader.bytes()?.to_vec(),
+                (55, WireType::LengthDelimited) => msg.game_name = reader.string()?,
+                (56, WireType::Fixed64) => msg.gameid = reader.fixed64()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+fn parse_kv_submessage(body: &[u8]) -> Option<(String, String)> {
+    let mut reader = Reader::new(body);
+    let mut key = String::new();
+    let mut value = String::new();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some((key, value));
+        };
+        match tag.field_number {
+            1 => key = reader.string()?,
+            2 => value = reader.string()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some((key, value))
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPersonaState {
+    pub status_flags: u32,
+    pub friends: Vec<PersonaStateFriend>,
+}
+
+impl CMsgClientPersonaState {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.status_flags = reader.u32()?,
+                2 => msg
+                    .friends
+                    .push(PersonaStateFriend::deserialize(reader.bytes()?)?),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::Writer;
+
+    #[test]
+    fn parses_persona_state_friend_with_rich_presence() {
+        let mut kv = Vec::new();
+        {
+            let mut w = Writer::new(&mut kv);
+            w.string_field(1, "status");
+            w.string_field(2, "Playing");
+        }
+
+        let mut friend = Vec::new();
+        {
+            let mut w = Writer::new(&mut friend);
+            w.fixed64_field(1, 123);
+            w.uint32_field(2, 1);
+            w.uint32_field(3, 440);
+            w.string_field(15, "Ada");
+            w.submessage_field(25, &kv);
+            w.bytes_field(31, &[1, 2, 3]);
+            w.string_field(55, "Team Fortress 2");
+            w.fixed64_field(56, 440);
+        }
+
+        let mut body = Vec::new();
+        Writer::new(&mut body).submessage_field(2, &friend);
+
+        let parsed = CMsgClientPersonaState::deserialize(&body).unwrap();
+        let friend = &parsed.friends[0];
+        assert_eq!(friend.friendid, 123);
+        assert_eq!(friend.player_name, "Ada");
+        assert_eq!(friend.rich_presence[0], ("status".into(), "Playing".into()));
+        assert_eq!(friend.avatar_hash, [1, 2, 3]);
+        assert_eq!(friend.game_name, "Team Fortress 2");
+        assert!(friend.has_persona_state);
+        assert!(friend.has_game);
+    }
+
+    #[test]
+    fn stateful_push_with_field25_as_fixed64_still_parses() {
+        // Live persona pushes carry field 25 as a fixed64, not the rich-presence submessage.
+        let mut friend = Vec::new();
+        {
+            let mut w = Writer::new(&mut friend);
+            w.fixed64_field(1, 77);
+            w.uint32_field(2, 1);
+            w.fixed64_field(25, 0);
+            w.string_field(15, "Online Friend");
+        }
+        let mut body = Vec::new();
+        Writer::new(&mut body).submessage_field(2, &friend);
+
+        let parsed = CMsgClientPersonaState::deserialize(&body).unwrap();
+        let friend = &parsed.friends[0];
+        assert_eq!(friend.friendid, 77);
+        assert_eq!(friend.persona_state, 1);
+        assert!(friend.has_persona_state);
+        assert_eq!(friend.player_name, "Online Friend");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_pics.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_pics.rs
new file mode 100644
index 000000000..4cafe488d
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_pics.rs
@@ -0,0 +1,562 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct CMsgClientPICSChangesSinceRequest {
+    pub since_change_number: u32,
+    pub send_app_info_changes: bool,
+    pub send_package_info_changes: bool,
+}
+
+impl Default for CMsgClientPICSChangesSinceRequest {
+    fn default() -> Self {
+        Self {
+            since_change_number: 0,
+            send_app_info_changes: true,
+            send_package_info_changes: true,
+        }
+    }
+}
+
+impl CMsgClientPICSChangesSinceRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field_force(1, self.since_change_number);
+        w.bool_field_force(2, self.send_app_info_changes);
+        w.bool_field_force(3, self.send_package_info_changes);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct PicsAppChange {
+    pub appid: u32,
+    pub change_number: u32,
+    pub needs_token: bool,
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct PicsPackageChange {
+    pub packageid: u32,
+    pub change_number: u32,
+    pub needs_token: bool,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPICSChangesSinceResponse {
+    pub current_change_number: u32,
+    pub since_change_number: u32,
+    pub force_full_update: bool,
+    pub package_changes: Vec<PicsPackageChange>,
+    pub app_changes: Vec<PicsAppChange>,
+    pub force_full_app_update: bool,
+    pub force_full_package_update: bool,
+}
+
+impl CMsgClientPICSChangesSinceResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.current_change_number = reader.u32()?,
+                2 => msg.since_change_number = reader.u32()?,
+                3 => msg.force_full_update = reader.boolean()?,
+                4 => {
+                    let c = parse_pics_change(reader.bytes()?)?;
+                    msg.package_changes.push(PicsPackageChange {
+                        packageid: c.id,
+                        change_number: c.change_number,
+                        needs_token: c.needs_token,
+                    });
+                }
+                5 => {
+                    let c = parse_pics_change(reader.bytes()?)?;
+                    msg.app_changes.push(PicsAppChange {
+                        appid: c.id,
+                        change_number: c.change_number,
+                        needs_token: c.needs_token,
+                    });
+                }
+                6 => msg.force_full_app_update = reader.boolean()?,
+                7 => msg.force_full_package_update = reader.boolean()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPICSAccessTokenRequest {
+    pub packageids: Vec<u32>,
+    pub appids: Vec<u32>,
+}
+
+impl CMsgClientPICSAccessTokenRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        for id in &self.packageids {
+            w.tag(1, WireType::Varint);
+            w.varint(*id as u64);
+        }
+        for id in &self.appids {
+            w.tag(2, WireType::Varint);
+            w.varint(*id as u64);
+        }
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct PicsPackageToken {
+    pub packageid: u32,
+    pub access_token: u64,
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct PicsAppToken {
+    pub appid: u32,
+    pub access_token: u64,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPICSAccessTokenResponse {
+    pub package_access_tokens: Vec<PicsPackageToken>,
+    pub package_denied_tokens: Vec<u32>,
+    pub app_access_tokens: Vec<PicsAppToken>,
+    pub app_denied_tokens: Vec<u32>,
+}
+
+impl CMsgClientPICSAccessTokenResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg
+                    .package_access_tokens
+                    .push(parse_package_token(reader.bytes()?)?),
+                2 => read_repeated_uint32(
+                    &mut reader,
+                    tag.wire_type,
+                    &mut msg.package_denied_tokens,
+                )?,
+                3 => msg
+                    .app_access_tokens
+                    .push(parse_app_token(reader.bytes()?)?),
+                4 => read_repeated_uint32(&mut reader, tag.wire_type, &mut msg.app_denied_tokens)?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct PicsAppInfoReq {
+    pub appid: u32,
+    pub access_token: u64,
+    pub only_public_obsolete: bool,
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct PicsPackageInfoReq {
+    pub packageid: u32,
+    pub access_token: u64,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPICSProductInfoRequest {
+    pub packages: Vec<PicsPackageInfoReq>,
+    pub apps: Vec<PicsAppInfoReq>,
+    pub meta_data_only: bool,
+    pub num_prev_failed: u32,
+    pub sequence_number: u32,
+    pub single_response: bool,
+}
+
+impl CMsgClientPICSProductInfoRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        for package in &self.packages {
+            let mut sub = Vec::new();
+            let mut sw = Writer::new(&mut sub);
+            sw.uint32_field(1, package.packageid);
+            sw.uint64_field(2, package.access_token);
+            w.submessage_field(1, &sub);
+        }
+        for app in &self.apps {
+            let mut sub = Vec::new();
+            let mut sw = Writer::new(&mut sub);
+            sw.uint32_field(1, app.appid);
+            sw.uint64_field(2, app.access_token);
+            sw.bool_field(3, app.only_public_obsolete);
+            w.submessage_field(2, &sub);
+        }
+        w.bool_field(3, self.meta_data_only);
+        w.uint32_field(4, self.num_prev_failed);
+        w.uint32_field(6, self.sequence_number);
+        w.bool_field(7, self.single_response);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PicsAppInfoResp {
+    pub appid: u32,
+    pub change_number: u32,
+    pub missing_token: bool,
+    pub sha: Vec<u8>,
+    pub buffer: Vec<u8>,
+    pub only_public: bool,
+    pub size: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PicsPackageInfoResp {
+    pub packageid: u32,
+    pub change_number: u32,
+    pub missing_token: bool,
+    pub sha: Vec<u8>,
+    pub buffer: Vec<u8>,
+    pub size: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPICSProductInfoResponse {
+    pub apps: Vec<PicsAppInfoResp>,
+    pub unknown_appids: Vec<u32>,
+    pub packages: Vec<PicsPackageInfoResp>,
+    pub unknown_packageids: Vec<u32>,
+    pub meta_data_only: bool,
+    pub response_pending: bool,
+    pub http_min_size: u32,
+    pub http_host: String,
+}
+
+impl CMsgClientPICSProductInfoResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.apps.push(parse_app_info_resp(reader.bytes()?)?),
+                2 => read_repeated_uint32(&mut reader, tag.wire_type, &mut msg.unknown_appids)?,
+                3 => msg.packages.push(parse_package_info_resp(reader.bytes()?)?),
+                4 => read_repeated_uint32(&mut reader, tag.wire_type, &mut msg.unknown_packageids)?,
+                5 => msg.meta_data_only = reader.boolean()?,
+                6 => msg.response_pending = reader.boolean()?,
+                7 => msg.http_min_size = reader.u32()?,
+                8 => msg.http_host = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        for app in &self.apps {
+            w.submessage_field(1, &app.serialize());
+        }
+        for appid in &self.unknown_appids {
+            w.uint32_field(2, *appid);
+        }
+        for package in &self.packages {
+            w.submessage_field(3, &package.serialize());
+        }
+        for packageid in &self.unknown_packageids {
+            w.uint32_field(4, *packageid);
+        }
+        w.bool_field(5, self.meta_data_only);
+        w.bool_field(6, self.response_pending);
+        w.uint32_field(7, self.http_min_size);
+        w.string_field(8, &self.http_host);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+struct PicsChangeRaw {
+    id: u32,
+    change_number: u32,
+    needs_token: bool,
+}
+
+fn parse_pics_change(body: &[u8]) -> Option<PicsChangeRaw> {
+    let mut reader = Reader::new(body);
+    let mut msg = PicsChangeRaw::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(msg);
+        };
+        match tag.field_number {
+            1 => msg.id = reader.u32()?,
+            2 => msg.change_number = reader.u32()?,
+            3 => msg.needs_token = reader.boolean()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(msg)
+}
+
+fn parse_package_token(body: &[u8]) -> Option<PicsPackageToken> {
+    let raw = parse_token(body)?;
+    Some(PicsPackageToken {
+        packageid: raw.id,
+        access_token: raw.access_token,
+    })
+}
+
+fn parse_app_token(body: &[u8]) -> Option<PicsAppToken> {
+    let raw = parse_token(body)?;
+    Some(PicsAppToken {
+        appid: raw.id,
+        access_token: raw.access_token,
+    })
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+struct TokenRaw {
+    id: u32,
+    access_token: u64,
+}
+
+fn parse_token(body: &[u8]) -> Option<TokenRaw> {
+    let mut reader = Reader::new(body);
+    let mut msg = TokenRaw::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(msg);
+        };
+        match tag.field_number {
+            1 => msg.id = reader.u32()?,
+            2 => msg.access_token = reader.u64()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(msg)
+}
+
+fn parse_app_info_resp(body: &[u8]) -> Option<PicsAppInfoResp> {
+    let mut reader = Reader::new(body);
+    let mut msg = PicsAppInfoResp::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(msg);
+        };
+        match tag.field_number {
+            1 => msg.appid = reader.u32()?,
+            2 => msg.change_number = reader.u32()?,
+            3 => msg.missing_token = reader.boolean()?,
+            4 => msg.sha = reader.bytes()?.to_vec(),
+            5 => msg.buffer = reader.bytes()?.to_vec(),
+            6 => msg.only_public = reader.boolean()?,
+            7 => msg.size = reader.u32()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(msg)
+}
+
+impl PicsAppInfoResp {
+    fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.appid);
+        w.uint32_field(2, self.change_number);
+        w.bool_field(3, self.missing_token);
+        w.bytes_field(4, &self.sha);
+        w.bytes_field(5, &self.buffer);
+        w.bool_field(6, self.only_public);
+        w.uint32_field(7, self.size);
+        out
+    }
+}
+
+fn parse_package_info_resp(body: &[u8]) -> Option<PicsPackageInfoResp> {
+    let mut reader = Reader::new(body);
+    let mut msg = PicsPackageInfoResp::default();
+    while !reader.eof() {
+        let Some(tag) = reader.next_tag() else {
+            return reader.ok().then_some(msg);
+        };
+        match tag.field_number {
+            1 => msg.packageid = reader.u32()?,
+            2 => msg.change_number = reader.u32()?,
+            3 => msg.missing_token = reader.boolean()?,
+            4 => msg.sha = reader.bytes()?.to_vec(),
+            5 => msg.buffer = reader.bytes()?.to_vec(),
+            6 => msg.size = reader.u32()?,
+            _ => {
+                if !reader.skip(tag.wire_type) {
+                    return None;
+                }
+            }
+        }
+    }
+    Some(msg)
+}
+
+impl PicsPackageInfoResp {
+    fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.packageid);
+        w.uint32_field(2, self.change_number);
+        w.bool_field(3, self.missing_token);
+        w.bytes_field(4, &self.sha);
+        w.bytes_field(5, &self.buffer);
+        w.uint32_field(6, self.size);
+        out
+    }
+}
+
+fn read_repeated_uint32(
+    reader: &mut Reader<'_>,
+    wire_type: WireType,
+    out: &mut Vec<u32>,
+) -> Option<()> {
+    match wire_type {
+        WireType::Varint => out.push(reader.u32()?),
+        WireType::LengthDelimited => {
+            let mut packed = Reader::new(reader.bytes()?);
+            while !packed.eof() {
+                out.push(packed.varint()? as u32);
+            }
+        }
+        _ => return None,
+    }
+    Some(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn token_body(id: u32, token: u64) -> Vec<u8> {
+        let mut body = Vec::new();
+        let mut w = Writer::new(&mut body);
+        w.uint32_field(1, id);
+        w.uint64_field(2, token);
+        body
+    }
+
+    #[test]
+    fn changes_since_request_force_emits_zero_and_bools() {
+        assert_eq!(
+            CMsgClientPICSChangesSinceRequest::default().serialize(),
+            [8, 0, 16, 1, 24, 1]
+        );
+    }
+
+    #[test]
+    fn parses_access_tokens_and_packed_denied_lists() {
+        let mut packed = Vec::new();
+        {
+            let mut w = Writer::new(&mut packed);
+            w.varint(10);
+            w.varint(11);
+        }
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.submessage_field(1, &token_body(100, 555));
+            w.uint32_field(2, 9);
+            w.bytes_field(2, &packed);
+            w.submessage_field(3, &token_body(480, 777));
+            w.uint32_field(4, 12);
+        }
+
+        let parsed = CMsgClientPICSAccessTokenResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.package_access_tokens[0].packageid, 100);
+        assert_eq!(parsed.package_denied_tokens, [9, 10, 11]);
+        assert_eq!(parsed.app_access_tokens[0].appid, 480);
+        assert_eq!(parsed.app_denied_tokens, [12]);
+    }
+
+    #[test]
+    fn parses_product_info_response_without_stripping_package_prefix() {
+        let mut app = Vec::new();
+        {
+            let mut w = Writer::new(&mut app);
+            w.uint32_field(1, 480);
+            w.uint32_field(2, 22);
+            w.bool_field(3, true);
+            w.bytes_field(4, &[1; 20]);
+            w.bytes_field(5, b"appvdf");
+            w.bool_field(6, true);
+            w.uint32_field(7, 6);
+        }
+
+        let mut package = Vec::new();
+        {
+            let mut w = Writer::new(&mut package);
+            w.uint32_field(1, 100);
+            w.uint32_field(2, 33);
+            w.bytes_field(5, &[100, 0, 0, 0, b'v', b'd', b'f']);
+            w.uint32_field(6, 7);
+        }
+
+        let mut packed_unknown = Vec::new();
+        Writer::new(&mut packed_unknown).varint(888);
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.submessage_field(1, &app);
+            w.uint32_field(2, 404);
+            w.submessage_field(3, &package);
+            w.bytes_field(4, &packed_unknown);
+            w.bool_field(6, true);
+            w.uint32_field(7, 1024);
+            w.string_field(8, "cdn.example");
+        }
+
+        let parsed = CMsgClientPICSProductInfoResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.apps[0].appid, 480);
+        assert_eq!(parsed.unknown_appids, [404]);
+        assert_eq!(parsed.unknown_packageids, [888]);
+        assert_eq!(parsed.packages[0].buffer, [100, 0, 0, 0, b'v', b'd', b'f']);
+        assert!(parsed.response_pending);
+        assert_eq!(parsed.http_host, "cdn.example");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_playing_session_state.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_playing_session_state.rs
new file mode 100644
index 000000000..a91054f8a
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_playing_session_state.rs
@@ -0,0 +1,63 @@
+use crate::proto_wire::Reader;
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientPlayingSessionState {
+    pub playing_blocked: bool,
+    pub playing_app: u32,
+}
+
+impl CMsgClientPlayingSessionState {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                2 => msg.playing_blocked = reader.boolean()?,
+                3 => msg.playing_app = reader.u32()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::pb::cmsg_client_change_status::CMsgClientChangeStatus;
+    use crate::pb::cmsg_client_kick_playing_session::CMsgClientKickPlayingSession;
+    use crate::proto_wire::Writer;
+
+    #[test]
+    fn force_emits_zero_and_false_values() {
+        assert_eq!(
+            CMsgClientChangeStatus::default().serialize(),
+            vec![0x08, 0x00]
+        );
+        assert_eq!(
+            CMsgClientKickPlayingSession {
+                only_stop_game: false
+            }
+            .serialize(),
+            vec![0x08, 0x00]
+        );
+    }
+
+    #[test]
+    fn parses_playing_session_state() {
+        let mut body = Vec::new();
+        let mut w = Writer::new(&mut body);
+        w.bool_field(2, true);
+        w.uint32_field(3, 480);
+        let parsed = CMsgClientPlayingSessionState::deserialize(&body).unwrap();
+        assert!(parsed.playing_blocked);
+        assert_eq!(parsed.playing_app, 480);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_request_encrypted_app_ticket.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_request_encrypted_app_ticket.rs
new file mode 100644
index 000000000..9179804bd
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_request_encrypted_app_ticket.rs
@@ -0,0 +1,54 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientRequestEncryptedAppTicket {
+    pub app_id: u32,
+}
+
+impl CMsgClientRequestEncryptedAppTicket {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).uint32_field(1, self.app_id);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientRequestEncryptedAppTicketResponse {
+    pub app_id: u32,
+    pub eresult: i32,
+    pub encrypted_app_ticket: Vec<u8>,
+}
+
+impl Default for CMsgClientRequestEncryptedAppTicketResponse {
+    fn default() -> Self {
+        Self {
+            app_id: 0,
+            eresult: 2,
+            encrypted_app_ticket: Vec::new(),
+        }
+    }
+}
+
+impl CMsgClientRequestEncryptedAppTicketResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.app_id = reader.u32()?,
+                2 => msg.eresult = reader.i32()?,
+                3 => msg.encrypted_app_ticket = reader.bytes()?.to_vec(),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_store_user_stats.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_store_user_stats.rs
new file mode 100644
index 000000000..99a4e456d
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_client_store_user_stats.rs
@@ -0,0 +1,76 @@
+use crate::proto_wire::Writer;
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct Stat {
+    pub stat_id: u32,
+    pub stat_value: u32,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientStoreUserStats2 {
+    pub game_id: u64,
+    pub settor_steam_id: u64,
+    pub settee_steam_id: u64,
+    pub crc_stats: u32,
+    pub stats: Vec<Stat>,
+}
+
+impl CMsgClientStoreUserStats2 {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.fixed64_field(1, self.game_id);
+        w.fixed64_field(2, self.settor_steam_id);
+        w.fixed64_field(3, self.settee_steam_id);
+        w.uint32_field_force(4, self.crc_stats);
+        for stat in &self.stats {
+            let mut sub = Vec::new();
+            let mut sw = Writer::new(&mut sub);
+            sw.uint32_field_force(1, stat.stat_id);
+            sw.uint32_field_force(2, stat.stat_value);
+            w.submessage_field(6, &sub);
+        }
+        out
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::proto_wire::{Reader, WireType};
+
+    #[test]
+    fn keeps_zero_crc_and_zero_stat_values_present() {
+        let msg = CMsgClientStoreUserStats2 {
+            game_id: 7,
+            settor_steam_id: 8,
+            settee_steam_id: 9,
+            crc_stats: 0,
+            stats: vec![Stat {
+                stat_id: 0,
+                stat_value: 0,
+            }],
+        };
+        let body = msg.serialize();
+        let mut reader = Reader::new(&body);
+        let mut saw_crc = false;
+        let mut saw_stat = false;
+        while !reader.eof() {
+            let tag = reader.next_tag().unwrap();
+            match (tag.field_number, tag.wire_type) {
+                (4, WireType::Varint) => {
+                    assert_eq!(reader.u32().unwrap(), 0);
+                    saw_crc = true;
+                }
+                (6, WireType::LengthDelimited) => {
+                    let sub = reader.bytes().unwrap();
+                    assert_eq!(sub, &[8, 0, 16, 0]);
+                    saw_stat = true;
+                }
+                _ => assert!(reader.skip(tag.wire_type)),
+            }
+        }
+        assert!(saw_crc);
+        assert!(saw_stat);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_clientserver_login.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_clientserver_login.rs
new file mode 100644
index 000000000..a56f9ccd3
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cmsg_clientserver_login.rs
@@ -0,0 +1,275 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+pub const MSG_CLIENT_CURRENT_PROTOCOL: u32 = 65_581;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientHello {
+    pub protocol_version: u32,
+}
+
+impl Default for CMsgClientHello {
+    fn default() -> Self {
+        Self {
+            protocol_version: MSG_CLIENT_CURRENT_PROTOCOL,
+        }
+    }
+}
+
+impl CMsgClientHello {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).uint32_field(1, self.protocol_version);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientHeartBeat {
+    pub send_reply: bool,
+}
+
+impl CMsgClientHeartBeat {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        Writer::new(&mut out).bool_field(1, self.send_reply);
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CMsgClientLogOff;
+
+impl CMsgClientLogOff {
+    pub fn serialize(&self) -> Vec<u8> {
+        Vec::new()
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct CMsgClientLoggedOff {
+    pub eresult: i32,
+}
+
+impl Default for CMsgClientLoggedOff {
+    fn default() -> Self {
+        Self { eresult: 2 }
+    }
+}
+
+impl CMsgClientLoggedOff {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.eresult = reader.i32()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientLogon {
+    pub protocol_version: u32,
+    pub cell_id: u32,
+    pub client_package_version: u32,
+    pub client_language: String,
+    pub client_os_type: u32,
+    pub should_remember_password: bool,
+    pub qos_level: u32,
+    pub client_supplied_steam_id: u64,
+    pub machine_id: Vec<u8>,
+    pub ui_mode: u32,
+    pub chat_mode: u32,
+    pub account_name: String,
+    pub machine_name: String,
+    pub client_instance_id: u64,
+    pub supports_rate_limit_response: bool,
+    pub access_token: String,
+    pub obfuscated_private_ip: u32,
+}
+
+impl Default for CMsgClientLogon {
+    fn default() -> Self {
+        Self {
+            protocol_version: MSG_CLIENT_CURRENT_PROTOCOL,
+            cell_id: 0,
+            client_package_version: 1771,
+            client_language: "english".to_string(),
+            client_os_type: 16,
+            should_remember_password: true,
+            qos_level: 2,
+            client_supplied_steam_id: 0,
+            machine_id: Vec::new(),
+            ui_mode: 7,
+            chat_mode: 2,
+            account_name: String::new(),
+            machine_name: "WN-Steam-Client".to_string(),
+            client_instance_id: 0,
+            supports_rate_limit_response: true,
+            access_token: String::new(),
+            obfuscated_private_ip: 0,
+        }
+    }
+}
+
+impl CMsgClientLogon {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field(1, self.protocol_version);
+        w.uint32_field(3, self.cell_id);
+        w.uint32_field(5, self.client_package_version);
+        w.string_field(6, &self.client_language);
+        w.uint32_field(7, self.client_os_type);
+        w.bool_field(8, self.should_remember_password);
+        w.uint32_field(21, self.qos_level);
+        if self.client_supplied_steam_id != 0 {
+            w.tag(22, WireType::Fixed64);
+            w.raw_bytes(&self.client_supplied_steam_id.to_le_bytes());
+        }
+        w.bytes_field(30, &self.machine_id);
+        if self.obfuscated_private_ip != 0 {
+            w.uint32_field(31, self.obfuscated_private_ip);
+            let mut ip_msg = Vec::new();
+            Writer::new(&mut ip_msg).uint32_field(1, self.obfuscated_private_ip);
+            w.bytes_field(95, &ip_msg);
+        }
+        w.uint32_field(32, self.ui_mode);
+        w.uint32_field(33, self.chat_mode);
+        w.string_field(50, &self.account_name);
+        w.string_field(96, &self.machine_name);
+        w.uint64_field(100, self.client_instance_id);
+        w.bool_field(102, self.supports_rate_limit_response);
+        w.string_field(108, &self.access_token);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CMsgClientLogonResponse {
+    pub eresult: i32,
+    pub heartbeat_seconds: i32,
+    pub rtime32_server_time: u32,
+    pub cell_id: u32,
+    pub eresult_extended: i32,
+    pub vanity_url: String,
+    pub client_supplied_steamid: u64,
+    pub client_instance_id: u64,
+    pub force_client_update_check: bool,
+    pub agreement_session_url: String,
+    pub token_id: u64,
+    pub family_group_id: u64,
+}
+
+impl Default for CMsgClientLogonResponse {
+    fn default() -> Self {
+        Self {
+            eresult: 2,
+            heartbeat_seconds: 0,
+            rtime32_server_time: 0,
+            cell_id: 0,
+            eresult_extended: 0,
+            vanity_url: String::new(),
+            client_supplied_steamid: 0,
+            client_instance_id: 0,
+            force_client_update_check: false,
+            agreement_session_url: String::new(),
+            token_id: 0,
+            family_group_id: 0,
+        }
+    }
+}
+
+impl CMsgClientLogonResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.eresult = reader.i32()?,
+                3 => msg.heartbeat_seconds = reader.i32()?,
+                5 => {
+                    if tag.wire_type != WireType::Fixed32 {
+                        return None;
+                    }
+                    msg.rtime32_server_time = reader.fixed32()?;
+                }
+                7 => msg.cell_id = reader.u32()?,
+                10 => msg.eresult_extended = reader.i32()?,
+                14 => msg.vanity_url = reader.string()?,
+                20 => {
+                    if tag.wire_type != WireType::Fixed64 {
+                        return None;
+                    }
+                    msg.client_supplied_steamid = reader.fixed64()?;
+                }
+                27 => msg.client_instance_id = reader.u64()?,
+                28 => msg.force_client_update_check = reader.boolean()?,
+                29 => msg.agreement_session_url = reader.string()?,
+                30 => msg.token_id = reader.u64()?,
+                31 => msg.family_group_id = reader.u64()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn logon_serializes_canonical_fields() {
+        let msg = CMsgClientLogon {
+            account_name: "user".to_string(),
+            access_token: "refresh.jwt".to_string(),
+            client_instance_id: 99,
+            obfuscated_private_ip: 0x0102_0304,
+            ..Default::default()
+        };
+        let bytes = msg.serialize();
+        let mut reader = Reader::new(&bytes);
+        let mut fields = Vec::new();
+        while let Some(tag) = reader.next_tag() {
+            fields.push(tag.field_number);
+            reader.skip(tag.wire_type);
+        }
+        assert!(fields.contains(&50));
+        assert!(fields.contains(&95));
+        assert!(fields.contains(&108));
+        assert!(!fields.contains(&10));
+    }
+
+    #[test]
+    fn logon_response_reads_token_id_as_varint() {
+        let mut bytes = Vec::new();
+        let mut w = Writer::new(&mut bytes);
+        w.int32_field(1, 1);
+        w.int32_field(3, 10);
+        w.tag(5, WireType::Fixed32);
+        w.raw_bytes(&123u32.to_le_bytes());
+        w.uint64_field(30, 987);
+        let msg = CMsgClientLogonResponse::deserialize(&bytes).unwrap();
+        assert_eq!(msg.eresult, 1);
+        assert_eq!(msg.rtime32_server_time, 123);
+        assert_eq!(msg.token_id, 987);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cplayer.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cplayer.rs
new file mode 100644
index 000000000..9509b3cbe
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cplayer.rs
@@ -0,0 +1,171 @@
+use crate::proto_wire::{Reader, Writer};
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CPlayerSetRichPresenceKv {
+    pub key: String,
+    pub value: String,
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CPlayerSetRichPresenceRequest {
+    pub appid: u32,
+    pub rich_presence: Vec<CPlayerSetRichPresenceKv>,
+}
+
+impl CPlayerSetRichPresenceRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint32_field_force(1, self.appid);
+        for kv in &self.rich_presence {
+            let mut sub = Vec::new();
+            let mut sw = Writer::new(&mut sub);
+            sw.string_field(1, &kv.key);
+            sw.string_field(2, &kv.value);
+            w.submessage_field(2, &sub);
+        }
+        out
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct CPlayerGetOwnedGamesRequest {
+    pub steamid: u64,
+    pub include_appinfo: bool,
+    pub include_played_free_games: bool,
+    pub include_free_sub: bool,
+    pub include_extended_appinfo: bool,
+}
+
+impl CPlayerGetOwnedGamesRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.uint64_field(1, self.steamid);
+        w.bool_field(2, self.include_appinfo);
+        w.bool_field(3, self.include_played_free_games);
+        w.bool_field(5, self.include_free_sub);
+        w.bool_field(8, self.include_extended_appinfo);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CPlayerOwnedGame {
+    pub appid: i32,
+    pub name: String,
+    pub playtime_2weeks: i32,
+    pub playtime_forever: i32,
+    pub img_icon_url: String,
+    pub rtime_last_played: u32,
+    pub sort_as: String,
+}
+
+impl CPlayerOwnedGame {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.appid = reader.u32()? as i32,
+                2 => msg.name = reader.string()?,
+                3 => msg.playtime_2weeks = reader.u32()? as i32,
+                4 => msg.playtime_forever = reader.u32()? as i32,
+                5 => msg.img_icon_url = reader.string()?,
+                11 => msg.rtime_last_played = reader.u32()?,
+                13 => msg.sort_as = reader.string()?,
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CPlayerGetOwnedGamesResponse {
+    pub game_count: u32,
+    pub games: Vec<CPlayerOwnedGame>,
+}
+
+impl CPlayerGetOwnedGamesResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            match tag.field_number {
+                1 => msg.game_count = reader.u32()?,
+                2 => msg
+                    .games
+                    .push(CPlayerOwnedGame::deserialize(reader.bytes()?)?),
+                _ => {
+                    if !reader.skip(tag.wire_type) {
+                        return None;
+                    }
+                }
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn rich_presence_force_emits_zero_appid() {
+        let body = CPlayerSetRichPresenceRequest {
+            appid: 0,
+            rich_presence: vec![CPlayerSetRichPresenceKv {
+                key: "status".to_string(),
+                value: "Playing".to_string(),
+            }],
+        }
+        .serialize();
+        assert_eq!(
+            body,
+            [
+                8, 0, 18, 17, 10, 6, b's', b't', b'a', b't', b'u', b's', 18, 7, b'P', b'l', b'a',
+                b'y', b'i', b'n', b'g'
+            ]
+        );
+    }
+
+    #[test]
+    fn parses_owned_games_response() {
+        let mut game = Vec::new();
+        {
+            let mut w = Writer::new(&mut game);
+            w.uint32_field(1, 42);
+            w.string_field(2, "Half-Life");
+            w.uint32_field(3, 10);
+            w.uint32_field(4, 200);
+            w.string_field(5, "icon");
+            w.uint32_field(11, 12345);
+            w.string_field(13, "Half Life");
+        }
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(1, 1);
+            w.submessage_field(2, &game);
+        }
+
+        let parsed = CPlayerGetOwnedGamesResponse::deserialize(&body).unwrap();
+        assert_eq!(parsed.game_count, 1);
+        assert_eq!(parsed.games[0].appid, 42);
+        assert_eq!(parsed.games[0].name, "Half-Life");
+        assert_eq!(parsed.games[0].sort_as, "Half Life");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/cpublishedfile.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/cpublishedfile.rs
new file mode 100644
index 000000000..62b13ee75
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/cpublishedfile.rs
@@ -0,0 +1,190 @@
+use crate::proto_wire::{Reader, WireType, Writer};
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CPublishedFileGetUserFilesRequest {
+    pub steamid: u64,
+    pub appid: u32,
+    pub page: u32,
+    pub numperpage: u32,
+    pub request_type: String,
+    pub filetype: u32,
+}
+
+impl Default for CPublishedFileGetUserFilesRequest {
+    fn default() -> Self {
+        Self {
+            steamid: 0,
+            appid: 0,
+            page: 1,
+            numperpage: 1,
+            request_type: String::new(),
+            filetype: 0,
+        }
+    }
+}
+
+impl CPublishedFileGetUserFilesRequest {
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut w = Writer::new(&mut out);
+        w.fixed64_field(1, self.steamid);
+        w.uint32_field(2, self.appid);
+        w.uint32_field(4, self.page);
+        w.uint32_field(5, self.numperpage);
+        w.string_field(6, &self.request_type);
+        w.uint32_field(14, self.filetype);
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct PublishedFileDetails {
+    pub result: u32,
+    pub publishedfileid: u64,
+    pub consumer_appid: u32,
+    pub filename: String,
+    pub file_size: u64,
+    pub file_url: String,
+    pub preview_url: String,
+    pub hcontent_file: u64,
+    pub title: String,
+    pub time_updated: u32,
+}
+
+impl PublishedFileDetails {
+    pub fn parse(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            let handled = match (tag.field_number, tag.wire_type) {
+                (1, WireType::Varint) => {
+                    msg.result = reader.u32()?;
+                    true
+                }
+                (2, WireType::Varint) => {
+                    msg.publishedfileid = reader.u64()?;
+                    true
+                }
+                (5, WireType::Varint) => {
+                    msg.consumer_appid = reader.u32()?;
+                    true
+                }
+                (7, WireType::LengthDelimited) => {
+                    msg.filename = reader.string()?;
+                    true
+                }
+                (8, WireType::Varint) => {
+                    msg.file_size = reader.u64()?;
+                    true
+                }
+                (10, WireType::LengthDelimited) => {
+                    msg.file_url = reader.string()?;
+                    true
+                }
+                (11, WireType::LengthDelimited) => {
+                    msg.preview_url = reader.string()?;
+                    true
+                }
+                (14, WireType::Fixed64) => {
+                    msg.hcontent_file = reader.fixed64()?;
+                    true
+                }
+                (16, WireType::LengthDelimited) => {
+                    msg.title = reader.string()?;
+                    true
+                }
+                (20, WireType::Varint) => {
+                    msg.time_updated = reader.u32()?;
+                    true
+                }
+                _ => false,
+            };
+            if !handled && !reader.skip(tag.wire_type) {
+                return None;
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CPublishedFileGetUserFilesResponse {
+    pub total: u32,
+    pub startindex: u32,
+    pub publishedfiledetails: Vec<PublishedFileDetails>,
+}
+
+impl CPublishedFileGetUserFilesResponse {
+    pub fn deserialize(body: &[u8]) -> Option<Self> {
+        let mut reader = Reader::new(body);
+        let mut msg = Self::default();
+        while !reader.eof() {
+            let Some(tag) = reader.next_tag() else {
+                return reader.ok().then_some(msg);
+            };
+            let handled = match (tag.field_number, tag.wire_type) {
+                (1, WireType::Varint) => {
+                    msg.total = reader.u32()?;
+                    true
+                }
+                (2, WireType::Varint) => {
+                    msg.startindex = reader.u32()?;
+                    true
+                }
+                (3, WireType::LengthDelimited) => {
+                    msg.publishedfiledetails
+                        .push(PublishedFileDetails::parse(reader.bytes()?)?);
+                    true
+                }
+                _ => false,
+            };
+            if !handled && !reader.skip(tag.wire_type) {
+                return None;
+            }
+        }
+        Some(msg)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_user_files_response_and_skips_schema_drift() {
+        let mut detail = Vec::new();
+        {
+            let mut w = Writer::new(&mut detail);
+            w.uint32_field(1, 1);
+            w.uint64_field(2, 99);
+            w.uint32_field(5, 480);
+            w.string_field(7, "file.bin");
+            w.uint64_field(8, 1024);
+            w.string_field(10, "https://example/file");
+            w.string_field(11, "https://example/preview");
+            w.fixed64_field(14, 777);
+            w.string_field(16, "Workshop Item");
+            w.uint32_field(20, 123456);
+            w.fixed64_field(5, 0xfeed);
+        }
+
+        let mut body = Vec::new();
+        {
+            let mut w = Writer::new(&mut body);
+            w.uint32_field(1, 1);
+            w.uint32_field(2, 0);
+            w.submessage_field(3, &detail);
+        }
+
+        let parsed = CPublishedFileGetUserFilesResponse::deserialize(&body).unwrap();
+        let detail = &parsed.publishedfiledetails[0];
+        assert_eq!(parsed.total, 1);
+        assert_eq!(detail.publishedfileid, 99);
+        assert_eq!(detail.consumer_appid, 480);
+        assert_eq!(detail.hcontent_file, 777);
+        assert_eq!(detail.title, "Workshop Item");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/pb/mod.rs b/app/src/main/cpp/wn-steam-client/rust/src/pb/mod.rs
new file mode 100644
index 000000000..27a82e1b4
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/pb/mod.rs
@@ -0,0 +1,25 @@
+pub mod cauthentication;
+pub mod ccloud;
+pub mod ccontentserverdirectory;
+pub mod cfamilygroups;
+pub mod cfriendmessages;
+pub mod cinventory;
+pub mod cmsg_client_change_status;
+pub mod cmsg_client_friends_list;
+pub mod cmsg_client_games_played;
+pub mod cmsg_client_get_app_ownership_ticket;
+pub mod cmsg_client_get_depot_decryption_key;
+pub mod cmsg_client_get_user_stats;
+pub mod cmsg_client_kick_playing_session;
+pub mod cmsg_client_license_list;
+pub mod cmsg_client_mms_get_lobby_list;
+pub mod cmsg_client_mms_lobby_data;
+pub mod cmsg_client_mms_lobby_ops;
+pub mod cmsg_client_persona;
+pub mod cmsg_client_pics;
+pub mod cmsg_client_playing_session_state;
+pub mod cmsg_client_request_encrypted_app_ticket;
+pub mod cmsg_client_store_user_stats;
+pub mod cmsg_clientserver_login;
+pub mod cplayer;
+pub mod cpublishedfile;
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/proto_envelope.rs b/app/src/main/cpp/wn-steam-client/rust/src/proto_envelope.rs
new file mode 100644
index 000000000..f428dc0a2
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/proto_envelope.rs
@@ -0,0 +1,87 @@
+use crate::cmsg_protobuf_header::CMsgProtoBufHeader;
+use crate::emsg::{has_proto_flag, strip_proto_flag, with_proto_flag, EMsg};
+use crate::wire_format;
+
+pub const PROTO_ENVELOPE_PREFIX_BYTES: usize = 8;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ProtoEnvelope {
+    pub emsg: EMsg,
+    pub header: CMsgProtoBufHeader,
+    pub body: Vec<u8>,
+}
+
+impl Default for ProtoEnvelope {
+    fn default() -> Self {
+        Self {
+            emsg: EMsg::INVALID,
+            header: CMsgProtoBufHeader::default(),
+            body: Vec::new(),
+        }
+    }
+}
+
+pub fn encode_proto_envelope(emsg: EMsg, header: &CMsgProtoBufHeader, body: &[u8]) -> Vec<u8> {
+    let mut hdr_bytes = Vec::with_capacity(64);
+    header.serialize(&mut hdr_bytes);
+
+    let mut out = Vec::with_capacity(PROTO_ENVELOPE_PREFIX_BYTES + hdr_bytes.len() + body.len());
+    let mut writer = wire_format::Writer::new(&mut out);
+    writer.u32(with_proto_flag(emsg));
+    writer.u32(hdr_bytes.len() as u32);
+    writer.bytes(&hdr_bytes);
+    writer.bytes(body);
+    out
+}
+
+pub fn decode_proto_envelope(wire: &[u8]) -> Option<ProtoEnvelope> {
+    if wire.len() < PROTO_ENVELOPE_PREFIX_BYTES {
+        return None;
+    }
+    let mut reader = wire_format::Reader::new(wire);
+    let raw_emsg = reader.u32();
+    let hdr_len = reader.u32() as usize;
+    if !reader.ok() || !has_proto_flag(raw_emsg) || reader.remaining() < hdr_len {
+        return None;
+    }
+    let header = CMsgProtoBufHeader::deserialize(reader.bytes(hdr_len))?;
+    if !reader.ok() {
+        return None;
+    }
+    let body_off = reader.position();
+    Some(ProtoEnvelope {
+        emsg: strip_proto_flag(raw_emsg),
+        header,
+        body: wire[body_off..].to_vec(),
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn proto_envelope_roundtrips() {
+        let header = CMsgProtoBufHeader {
+            steamid: 76561197960287930,
+            jobid_source: 42,
+            target_job_name: "Player.GetOwnedGames#1".to_string(),
+            ..Default::default()
+        };
+        let body = [1, 2, 3, 4, 5];
+        let bytes = encode_proto_envelope(EMsg::SERVICE_METHOD_CALL_FROM_CLIENT, &header, &body);
+        let decoded = decode_proto_envelope(&bytes).unwrap();
+        assert_eq!(decoded.emsg, EMsg::SERVICE_METHOD_CALL_FROM_CLIENT);
+        assert_eq!(decoded.header, header);
+        assert_eq!(decoded.body, body);
+    }
+
+    #[test]
+    fn decode_rejects_non_proto_messages() {
+        let mut bytes = Vec::new();
+        let mut writer = wire_format::Writer::new(&mut bytes);
+        writer.u32(EMsg::MULTI.0);
+        writer.u32(0);
+        assert_eq!(decode_proto_envelope(&bytes), None);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/proto_wire.rs b/app/src/main/cpp/wn-steam-client/rust/src/proto_wire.rs
new file mode 100644
index 000000000..bdb10f5a4
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/proto_wire.rs
@@ -0,0 +1,459 @@
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(u8)]
+pub enum WireType {
+    Varint = 0,
+    Fixed64 = 1,
+    LengthDelimited = 2,
+    StartGroup = 3,
+    EndGroup = 4,
+    Fixed32 = 5,
+}
+
+impl TryFrom<u8> for WireType {
+    type Error = ();
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(Self::Varint),
+            1 => Ok(Self::Fixed64),
+            2 => Ok(Self::LengthDelimited),
+            3 => Ok(Self::StartGroup),
+            4 => Ok(Self::EndGroup),
+            5 => Ok(Self::Fixed32),
+            _ => Err(()),
+        }
+    }
+}
+
+pub const MAX_VARINT_BYTES: usize = 10;
+
+pub const fn zigzag_encode_i64(v: i64) -> u64 {
+    ((v as u64) << 1) ^ ((v >> 63) as u64)
+}
+
+pub const fn zigzag_decode_i64(v: u64) -> i64 {
+    ((v >> 1) as i64) ^ -((v & 1) as i64)
+}
+
+pub const fn zigzag_encode_i32(v: i32) -> u32 {
+    ((v as u32) << 1) ^ ((v >> 31) as u32)
+}
+
+pub const fn zigzag_decode_i32(v: u32) -> i32 {
+    ((v >> 1) as i32) ^ -((v & 1) as i32)
+}
+
+pub const fn make_tag(field_number: i32, wire_type: WireType) -> u32 {
+    ((field_number as u32) << 3) | wire_type as u32
+}
+
+pub struct Writer<'a> {
+    out: &'a mut Vec<u8>,
+}
+
+impl<'a> Writer<'a> {
+    pub fn new(out: &'a mut Vec<u8>) -> Self {
+        Self { out }
+    }
+
+    pub fn varint(&mut self, mut v: u64) {
+        while v >= 0x80 {
+            self.out.push((v as u8) | 0x80);
+            v >>= 7;
+        }
+        self.out.push(v as u8);
+    }
+
+    pub fn tag(&mut self, field_number: i32, wire_type: WireType) {
+        self.varint(make_tag(field_number, wire_type) as u64);
+    }
+
+    pub fn uint32_field(&mut self, field_number: i32, v: u32) {
+        if v == 0 {
+            return;
+        }
+        self.tag(field_number, WireType::Varint);
+        self.varint(v as u64);
+    }
+
+    pub fn uint64_field(&mut self, field_number: i32, v: u64) {
+        if v == 0 {
+            return;
+        }
+        self.tag(field_number, WireType::Varint);
+        self.varint(v);
+    }
+
+    pub fn int32_field(&mut self, field_number: i32, v: i32) {
+        if v == 0 {
+            return;
+        }
+        self.tag(field_number, WireType::Varint);
+        self.varint(v as i64 as u64);
+    }
+
+    pub fn int64_field(&mut self, field_number: i32, v: i64) {
+        if v == 0 {
+            return;
+        }
+        self.tag(field_number, WireType::Varint);
+        self.varint(v as u64);
+    }
+
+    pub fn bool_field(&mut self, field_number: i32, v: bool) {
+        if !v {
+            return;
+        }
+        self.tag(field_number, WireType::Varint);
+        self.varint(1);
+    }
+
+    pub fn fixed32_field(&mut self, field_number: i32, v: u32) {
+        if v == 0 {
+            return;
+        }
+        self.tag(field_number, WireType::Fixed32);
+        self.out.extend_from_slice(&v.to_le_bytes());
+    }
+
+    pub fn fixed64_field(&mut self, field_number: i32, v: u64) {
+        if v == 0 {
+            return;
+        }
+        self.tag(field_number, WireType::Fixed64);
+        self.out.extend_from_slice(&v.to_le_bytes());
+    }
+
+    pub fn string_field(&mut self, field_number: i32, s: &str) {
+        if s.is_empty() {
+            return;
+        }
+        self.tag(field_number, WireType::LengthDelimited);
+        self.varint(s.len() as u64);
+        self.out.extend_from_slice(s.as_bytes());
+    }
+
+    pub fn bytes_field(&mut self, field_number: i32, bytes: &[u8]) {
+        if bytes.is_empty() {
+            return;
+        }
+        self.tag(field_number, WireType::LengthDelimited);
+        self.varint(bytes.len() as u64);
+        self.out.extend_from_slice(bytes);
+    }
+
+    pub fn submessage_field(&mut self, field_number: i32, body: &[u8]) {
+        self.tag(field_number, WireType::LengthDelimited);
+        self.varint(body.len() as u64);
+        self.out.extend_from_slice(body);
+    }
+
+    pub fn raw_bytes(&mut self, bytes: &[u8]) {
+        self.out.extend_from_slice(bytes);
+    }
+
+    pub fn uint32_field_force(&mut self, field_number: i32, v: u32) {
+        self.tag(field_number, WireType::Varint);
+        self.varint(v as u64);
+    }
+
+    pub fn bool_field_force(&mut self, field_number: i32, v: bool) {
+        self.tag(field_number, WireType::Varint);
+        self.varint(u64::from(v));
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct Tag {
+    pub field_number: i32,
+    pub wire_type: WireType,
+}
+
+pub struct Reader<'a> {
+    buf: &'a [u8],
+    pos: usize,
+    ok: bool,
+}
+
+impl<'a> Reader<'a> {
+    pub fn new(buf: &'a [u8]) -> Self {
+        Self {
+            buf,
+            pos: 0,
+            ok: true,
+        }
+    }
+
+    pub fn ok(&self) -> bool {
+        self.ok
+    }
+
+    pub fn eof(&self) -> bool {
+        self.pos >= self.buf.len()
+    }
+
+    pub fn position(&self) -> usize {
+        self.pos
+    }
+
+    pub fn next_tag(&mut self) -> Option<Tag> {
+        if self.eof() {
+            return None;
+        }
+        let raw = self.varint()? as u32;
+        let wire_type = match WireType::try_from((raw & 0x07) as u8) {
+            Ok(wire_type) => wire_type,
+            Err(_) => {
+                self.ok = false;
+                return None;
+            }
+        };
+        let field_number = (raw >> 3) as i32;
+        if matches!(wire_type, WireType::StartGroup | WireType::EndGroup) || field_number <= 0 {
+            self.ok = false;
+            return None;
+        }
+        Some(Tag {
+            field_number,
+            wire_type,
+        })
+    }
+
+    pub fn varint(&mut self) -> Option<u64> {
+        let mut result = 0u64;
+        for i in 0..MAX_VARINT_BYTES {
+            if self.pos >= self.buf.len() {
+                self.ok = false;
+                return None;
+            }
+            let b = self.buf[self.pos];
+            self.pos += 1;
+            result |= ((b & 0x7f) as u64) << (i * 7);
+            if (b & 0x80) == 0 {
+                return Some(result);
+            }
+        }
+        self.ok = false;
+        None
+    }
+
+    pub fn skip(&mut self, wire_type: WireType) -> bool {
+        match wire_type {
+            WireType::Varint => self.varint().is_some(),
+            WireType::Fixed64 => self.advance(8),
+            WireType::LengthDelimited => {
+                let Some(len) = self.varint() else {
+                    return false;
+                };
+                if len > usize::MAX as u64 {
+                    self.ok = false;
+                    return false;
+                }
+                self.advance(len as usize)
+            }
+            WireType::Fixed32 => self.advance(4),
+            WireType::StartGroup | WireType::EndGroup => {
+                self.ok = false;
+                false
+            }
+        }
+    }
+
+    pub fn u32(&mut self) -> Option<u32> {
+        self.varint().map(|v| v as u32)
+    }
+
+    pub fn u64(&mut self) -> Option<u64> {
+        self.varint()
+    }
+
+    pub fn i32(&mut self) -> Option<i32> {
+        self.varint().map(|v| v as i32)
+    }
+
+    pub fn i64(&mut self) -> Option<i64> {
+        self.varint().map(|v| v as i64)
+    }
+
+    pub fn boolean(&mut self) -> Option<bool> {
+        self.varint().map(|v| v != 0)
+    }
+
+    pub fn fixed32(&mut self) -> Option<u32> {
+        let Some(end) = self.pos.checked_add(4) else {
+            self.ok = false;
+            return None;
+        };
+        if end > self.buf.len() {
+            self.ok = false;
+            return None;
+        }
+        let bytes: [u8; 4] = self.buf[self.pos..end].try_into().ok()?;
+        self.pos = end;
+        Some(u32::from_le_bytes(bytes))
+    }
+
+    pub fn fixed64(&mut self) -> Option<u64> {
+        let Some(end) = self.pos.checked_add(8) else {
+            self.ok = false;
+            return None;
+        };
+        if end > self.buf.len() {
+            self.ok = false;
+            return None;
+        }
+        let bytes: [u8; 8] = self.buf[self.pos..end].try_into().ok()?;
+        self.pos = end;
+        Some(u64::from_le_bytes(bytes))
+    }
+
+    pub fn bytes(&mut self) -> Option<&'a [u8]> {
+        let len = self.varint()?;
+        if len > usize::MAX as u64 {
+            self.ok = false;
+            return None;
+        }
+        let len = len as usize;
+        let Some(end) = self.pos.checked_add(len) else {
+            self.ok = false;
+            return None;
+        };
+        if end > self.buf.len() {
+            self.ok = false;
+            return None;
+        }
+        let out = &self.buf[self.pos..end];
+        self.pos = end;
+        Some(out)
+    }
+
+    pub fn string(&mut self) -> Option<String> {
+        Some(String::from_utf8_lossy(self.bytes()?).into_owned())
+    }
+
+    fn advance(&mut self, amount: usize) -> bool {
+        let Some(end) = self.pos.checked_add(amount) else {
+            self.ok = false;
+            return false;
+        };
+        if end > self.buf.len() {
+            self.ok = false;
+            return false;
+        }
+        self.pos = end;
+        true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn varint_roundtrips_common_edges() {
+        let cases = [0, 1, 127, 128, 300, u32::MAX as u64, u64::MAX];
+        for case in cases {
+            let mut buf = Vec::new();
+            Writer::new(&mut buf).varint(case);
+            let mut reader = Reader::new(&buf);
+            assert_eq!(reader.varint(), Some(case));
+            assert!(reader.ok());
+            assert!(reader.eof());
+        }
+    }
+
+    #[test]
+    fn writes_and_reads_typed_fields() {
+        let mut buf = Vec::new();
+        let mut writer = Writer::new(&mut buf);
+        writer.uint32_field(1, 42);
+        writer.fixed32_field(2, 0x1234_5678);
+        writer.string_field(3, "steam");
+        writer.bool_field_force(4, false);
+
+        let mut reader = Reader::new(&buf);
+        assert_eq!(
+            reader.next_tag(),
+            Some(Tag {
+                field_number: 1,
+                wire_type: WireType::Varint
+            })
+        );
+        assert_eq!(reader.u32(), Some(42));
+        assert_eq!(
+            reader.next_tag(),
+            Some(Tag {
+                field_number: 2,
+                wire_type: WireType::Fixed32
+            })
+        );
+        assert_eq!(reader.fixed32(), Some(0x1234_5678));
+        assert_eq!(
+            reader.next_tag(),
+            Some(Tag {
+                field_number: 3,
+                wire_type: WireType::LengthDelimited
+            })
+        );
+        assert_eq!(reader.string(), Some("steam".to_string()));
+        assert_eq!(
+            reader.next_tag(),
+            Some(Tag {
+                field_number: 4,
+                wire_type: WireType::Varint
+            })
+        );
+        assert_eq!(reader.boolean(), Some(false));
+        assert!(reader.eof());
+    }
+
+    #[test]
+    fn rejects_deprecated_groups_and_truncated_data() {
+        let mut group = Vec::new();
+        Writer::new(&mut group).tag(1, WireType::StartGroup);
+        let mut reader = Reader::new(&group);
+        assert_eq!(reader.next_tag(), None);
+        assert!(!reader.ok());
+
+        let mut truncated = Reader::new(&[0x0a, 0x05, b'a']);
+        assert_eq!(
+            truncated.next_tag(),
+            Some(Tag {
+                field_number: 1,
+                wire_type: WireType::LengthDelimited
+            })
+        );
+        assert_eq!(truncated.bytes(), None);
+        assert!(!truncated.ok());
+    }
+
+    #[test]
+    fn rejects_invalid_wire_type_and_oversized_length() {
+        let mut invalid = Reader::new(&[0x0e]);
+        assert_eq!(invalid.next_tag(), None);
+        assert!(!invalid.ok());
+
+        let mut oversized = Vec::new();
+        Writer::new(&mut oversized).varint(make_tag(1, WireType::LengthDelimited) as u64);
+        Writer::new(&mut oversized).varint(u64::MAX);
+        let mut reader = Reader::new(&oversized);
+        assert_eq!(
+            reader.next_tag(),
+            Some(Tag {
+                field_number: 1,
+                wire_type: WireType::LengthDelimited
+            })
+        );
+        assert_eq!(reader.bytes(), None);
+        assert!(!reader.ok());
+    }
+
+    #[test]
+    fn zigzag_matches_known_values() {
+        assert_eq!(zigzag_encode_i32(0), 0);
+        assert_eq!(zigzag_encode_i32(-1), 1);
+        assert_eq!(zigzag_encode_i32(1), 2);
+        assert_eq!(zigzag_decode_i32(1), -1);
+        assert_eq!(zigzag_decode_i64(3), -2);
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/rsa_password.rs b/app/src/main/cpp/wn-steam-client/rust/src/rsa_password.rs
new file mode 100644
index 000000000..6987ac6e2
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/rsa_password.rs
@@ -0,0 +1,70 @@
+use rand::rngs::OsRng;
+use rsa::{BigUint, Pkcs1v15Encrypt, RsaPublicKey};
+
+pub fn rsa_pkcs1v15_encrypt_password_with_hex_key(
+    password: &str,
+    publickey_mod_hex: &str,
+    publickey_exp_hex: &str,
+) -> Option<Vec<u8>> {
+    let modulus = BigUint::from_bytes_be(&hex_decode(publickey_mod_hex)?);
+    let exponent = BigUint::from_bytes_be(&hex_decode(publickey_exp_hex)?);
+    let key = RsaPublicKey::new(modulus, exponent).ok()?;
+    key.encrypt(&mut OsRng, Pkcs1v15Encrypt, password.as_bytes())
+        .ok()
+}
+
+fn hex_decode(hex: &str) -> Option<Vec<u8>> {
+    if !hex.len().is_multiple_of(2) {
+        return None;
+    }
+    let mut out = Vec::with_capacity(hex.len() / 2);
+    let bytes = hex.as_bytes();
+    for pair in bytes.chunks_exact(2) {
+        let hi = nibble(pair[0])?;
+        let lo = nibble(pair[1])?;
+        out.push((hi << 4) | lo);
+    }
+    Some(out)
+}
+
+fn nibble(c: u8) -> Option<u8> {
+    match c {
+        b'0'..=b'9' => Some(c - b'0'),
+        b'a'..=b'f' => Some(10 + c - b'a'),
+        b'A'..=b'F' => Some(10 + c - b'A'),
+        _ => None,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use rsa::traits::PublicKeyParts;
+
+    #[test]
+    fn rejects_bad_hex_keys() {
+        assert!(rsa_pkcs1v15_encrypt_password_with_hex_key("pw", "abc", "010001").is_none());
+        assert!(rsa_pkcs1v15_encrypt_password_with_hex_key("pw", "zz", "010001").is_none());
+    }
+
+    #[test]
+    fn encrypts_with_generated_key_material() {
+        let private = rsa::RsaPrivateKey::new(&mut OsRng, 1024).unwrap();
+        let public = private.to_public_key();
+        let mod_hex = hex_encode(&public.n().to_bytes_be());
+        let exp_hex = hex_encode(&public.e().to_bytes_be());
+        let encrypted =
+            rsa_pkcs1v15_encrypt_password_with_hex_key("password", &mod_hex, &exp_hex).unwrap();
+        assert_eq!(encrypted.len(), 128);
+    }
+
+    fn hex_encode(bytes: &[u8]) -> String {
+        const HEX: &[u8; 16] = b"0123456789abcdef";
+        let mut out = String::with_capacity(bytes.len() * 2);
+        for b in bytes {
+            out.push(HEX[(b >> 4) as usize] as char);
+            out.push(HEX[(b & 0x0f) as usize] as char);
+        }
+        out
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/steam_directory.rs b/app/src/main/cpp/wn-steam-client/rust/src/steam_directory.rs
new file mode 100644
index 000000000..c346fef14
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/steam_directory.rs
@@ -0,0 +1,263 @@
+use crate::cm_server::{parse_endpoint, CmServer, CmTransport};
+use serde_json::Value;
+use std::fs;
+use std::time::Duration;
+
+pub const DEFAULT_USER_AGENT: &str = "Valve/Steam HTTP Client 1.0";
+pub const DIRECTORY_ENDPOINT: &str =
+    "https://api.steampowered.com/ISteamDirectory/GetCMListForConnect/v1/";
+pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct SteamDirectoryResult {
+    pub servers: Vec<CmServer>,
+    pub error: String,
+    pub http_status: i32,
+}
+
+impl SteamDirectoryResult {
+    pub fn ok(&self) -> bool {
+        self.error.is_empty() && !self.servers.is_empty()
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct SteamDirectoryClient {
+    ca_bundle_path: String,
+}
+
+impl SteamDirectoryClient {
+    pub fn new(ca_bundle_path: impl Into<String>) -> Self {
+        Self {
+            ca_bundle_path: ca_bundle_path.into(),
+        }
+    }
+
+    pub fn ca_bundle_path(&self) -> &str {
+        &self.ca_bundle_path
+    }
+
+    pub fn build_url(cell_id: u32) -> String {
+        format!(
+            "{DIRECTORY_ENDPOINT}?cellid={cell_id}&cmtype=websockets&maxcount=20&realm=steamglobal"
+        )
+    }
+
+    pub fn fetch(&self, cell_id: u32, timeout: Duration) -> SteamDirectoryResult {
+        self.fetch_with_user_agent(cell_id, timeout, DEFAULT_USER_AGENT)
+    }
+
+    pub fn fetch_with_user_agent(
+        &self,
+        cell_id: u32,
+        timeout: Duration,
+        user_agent: &str,
+    ) -> SteamDirectoryResult {
+        let url = SteamDirectoryClient::build_url(cell_id);
+        match self.http_get_text(&url, timeout, user_agent) {
+            Ok(response) => {
+                SteamDirectoryClient::validate_response(response.http_status, &response.body)
+            }
+            Err(error) => SteamDirectoryResult {
+                error,
+                ..Default::default()
+            },
+        }
+    }
+
+    pub fn validate_response(http_status: i32, body: &str) -> SteamDirectoryResult {
+        if http_status != 200 {
+            return SteamDirectoryResult {
+                error: "non-200 HTTP status".to_string(),
+                http_status,
+                ..Default::default()
+            };
+        }
+        let mut result = parse_directory_response(body);
+        result.http_status = http_status;
+        result
+    }
+
+    pub fn default_timeout() -> Duration {
+        DEFAULT_TIMEOUT
+    }
+
+    fn http_get_text(
+        &self,
+        url: &str,
+        timeout: Duration,
+        user_agent: &str,
+    ) -> Result<HttpTextResponse, String> {
+        let client = self.http_client(timeout, user_agent)?;
+        let response = client
+            .get(url)
+            .send()
+            .map_err(|err| format!("http get: {err}"))?;
+        let http_status = response.status().as_u16() as i32;
+        let body = response.text().map_err(|err| format!("http body: {err}"))?;
+        Ok(HttpTextResponse { http_status, body })
+    }
+
+    fn http_client(
+        &self,
+        timeout: Duration,
+        user_agent: &str,
+    ) -> Result<reqwest::blocking::Client, String> {
+        let mut builder = reqwest::blocking::Client::builder()
+            .user_agent(user_agent)
+            .timeout(timeout)
+            .connect_timeout(timeout);
+        if !self.ca_bundle_path.is_empty() {
+            let pem =
+                fs::read(&self.ca_bundle_path).map_err(|err| format!("read CA bundle: {err}"))?;
+            let certs = reqwest::Certificate::from_pem_bundle(&pem)
+                .map_err(|err| format!("parse CA bundle: {err}"))?;
+            for cert in certs {
+                builder = builder.add_root_certificate(cert);
+            }
+        }
+        builder.build().map_err(|err| format!("http client: {err}"))
+    }
+}
+
+struct HttpTextResponse {
+    http_status: i32,
+    body: String,
+}
+
+pub fn parse_directory_response(body: &str) -> SteamDirectoryResult {
+    let mut result = SteamDirectoryResult::default();
+    let root: Value = match serde_json::from_str(body) {
+        Ok(v) => v,
+        Err(e) => {
+            result.error = format!("json parse error: {e}");
+            return result;
+        }
+    };
+    let Some(response) = root.get("response") else {
+        result.error = "directory response: missing response".to_string();
+        return result;
+    };
+    let ok = response
+        .get("success")
+        .map(|s| {
+            s.as_bool()
+                .unwrap_or_else(|| s.as_i64().is_some_and(|n| n == 1))
+        })
+        .unwrap_or(false);
+    if !ok {
+        result.error = "directory response: success=false".to_string();
+        return result;
+    }
+    let Some(list) = response.get("serverlist").and_then(|v| v.as_array()) else {
+        result.error = "directory response: missing serverlist".to_string();
+        return result;
+    };
+
+    for entry in list {
+        let Some(endpoint) = entry.get("endpoint").and_then(|v| v.as_str()) else {
+            continue;
+        };
+        let Some((host, port)) = parse_endpoint(endpoint) else {
+            continue;
+        };
+        let transport = entry
+            .get("type")
+            .and_then(|v| v.as_str())
+            .map(parse_transport)
+            .unwrap_or(CmTransport::Unknown);
+        if transport != CmTransport::WebSocket {
+            continue;
+        }
+        result.servers.push(CmServer {
+            endpoint: endpoint.to_string(),
+            host,
+            port,
+            transport,
+            realm: entry
+                .get("realm")
+                .and_then(|v| v.as_str())
+                .unwrap_or("")
+                .to_string(),
+            datacenter: entry
+                .get("dc")
+                .and_then(|v| v.as_str())
+                .unwrap_or("")
+                .to_string(),
+            load: entry.get("load").and_then(|v| v.as_i64()).unwrap_or(0) as i32,
+            weighted_load: entry
+                .get("wtd_load")
+                .and_then(|v| v.as_f64())
+                .unwrap_or(0.0) as f32,
+        });
+    }
+    result
+}
+
+pub fn parse_transport(s: &str) -> CmTransport {
+    match s {
+        "websockets" | "websocket" => CmTransport::WebSocket,
+        "netfilter" => CmTransport::Tcp,
+        _ => CmTransport::Unknown,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_websocket_entries_and_filters_tcp() {
+        let json = r#"{
+          "response": {
+            "success": 1,
+            "serverlist": [
+              {"endpoint":"ext1-sea1.steamserver.net:443","type":"websockets","realm":"steamglobal","dc":"sea1","load":1,"wtd_load":2.5},
+              {"endpoint":"tcp.example.com:27017","type":"netfilter"},
+              {"endpoint":"bad","type":"websockets"}
+            ]
+          }
+        }"#;
+        let result = parse_directory_response(json);
+        assert!(result.error.is_empty());
+        assert_eq!(result.servers.len(), 1);
+        assert_eq!(result.servers[0].host, "ext1-sea1.steamserver.net");
+        assert_eq!(result.servers[0].weighted_load, 2.5);
+    }
+
+    #[test]
+    fn accepts_boolean_success() {
+        let json = r#"{"response":{"success":true,"serverlist":[]}}"#;
+        let result = parse_directory_response(json);
+        assert!(result.error.is_empty());
+        assert!(result.servers.is_empty());
+    }
+
+    #[test]
+    fn builds_directory_url_and_tracks_ca_bundle() {
+        let client = SteamDirectoryClient::new("/cacert.pem");
+        assert_eq!(client.ca_bundle_path(), "/cacert.pem");
+        assert_eq!(
+            SteamDirectoryClient::default_timeout(),
+            Duration::from_secs(10)
+        );
+        assert_eq!(
+            SteamDirectoryClient::build_url(123),
+            "https://api.steampowered.com/ISteamDirectory/GetCMListForConnect/v1/?cellid=123&cmtype=websockets&maxcount=20&realm=steamglobal"
+        );
+    }
+
+    #[test]
+    fn validates_http_status_before_json() {
+        let result = SteamDirectoryClient::validate_response(503, "{}");
+        assert_eq!(result.http_status, 503);
+        assert_eq!(result.error, "non-200 HTTP status");
+
+        let ok = SteamDirectoryClient::validate_response(
+            200,
+            r#"{"response":{"success":1,"serverlist":[{"endpoint":"ext1-sea1.steamserver.net:443","type":"websockets"}]}}"#,
+        );
+        assert_eq!(ok.http_status, 200);
+        assert!(ok.ok());
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/ticket_cache.rs b/app/src/main/cpp/wn-steam-client/rust/src/ticket_cache.rs
new file mode 100644
index 000000000..4fff5640d
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/ticket_cache.rs
@@ -0,0 +1,70 @@
+use std::collections::HashMap;
+use std::sync::Mutex;
+use std::time::Instant;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct OwnedAppTicket {
+    pub app_id: u32,
+    pub ticket: Vec<u8>,
+    pub eresult: u32,
+    pub fetched_at: Instant,
+}
+
+#[derive(Debug, Default)]
+pub struct WnTicketCache {
+    cache: Mutex<HashMap<u32, OwnedAppTicket>>,
+}
+
+impl WnTicketCache {
+    pub fn store(&self, app_id: u32, eresult: u32, ticket: Vec<u8>) {
+        let mut cache = self.cache.lock().expect("ticket cache poisoned");
+        cache.insert(
+            app_id,
+            OwnedAppTicket {
+                app_id,
+                ticket,
+                eresult,
+                fetched_at: Instant::now(),
+            },
+        );
+    }
+
+    pub fn get(&self, app_id: u32) -> Option<OwnedAppTicket> {
+        self.cache
+            .lock()
+            .expect("ticket cache poisoned")
+            .get(&app_id)
+            .cloned()
+    }
+
+    pub fn has(&self, app_id: u32) -> bool {
+        self.cache
+            .lock()
+            .expect("ticket cache poisoned")
+            .contains_key(&app_id)
+    }
+
+    pub fn size(&self) -> usize {
+        self.cache.lock().expect("ticket cache poisoned").len()
+    }
+
+    pub fn clear(&self) {
+        self.cache.lock().expect("ticket cache poisoned").clear();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn stores_gets_and_clears_tickets() {
+        let cache = WnTicketCache::default();
+        cache.store(480, 1, vec![1, 2, 3]);
+        assert!(cache.has(480));
+        assert_eq!(cache.size(), 1);
+        assert_eq!(cache.get(480).unwrap().ticket, [1, 2, 3]);
+        cache.clear();
+        assert!(!cache.has(480));
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/transport.rs b/app/src/main/cpp/wn-steam-client/rust/src/transport.rs
new file mode 100644
index 000000000..12456d4bc
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/transport.rs
@@ -0,0 +1,36 @@
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(u8)]
+pub enum TransportState {
+    Disconnected,
+    Connecting,
+    Connected,
+    Disconnecting,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(u8)]
+pub enum TransportDisconnectReason {
+    UserInitiated,
+    RemoteClose,
+    TlsHandshakeFailed,
+    NetworkError,
+    HandshakeTimeout,
+    Unknown,
+}
+
+pub type MessageCallback = Box<dyn Fn(&[u8]) + Send + Sync>;
+pub type ConnectedCallback = Box<dyn Fn() + Send + Sync>;
+pub type DisconnectedCallback = Box<dyn Fn(TransportDisconnectReason, &str) + Send + Sync>;
+
+pub trait Transport: Send {
+    fn connect(&mut self, url: &str) -> bool;
+    fn send(&mut self, data: &[u8]) -> bool;
+    fn disconnect(&mut self);
+    fn state(&self) -> TransportState;
+
+    fn set_on_message(&mut self, cb: MessageCallback);
+    fn set_on_connected(&mut self, cb: ConnectedCallback);
+    fn set_on_disconnected(&mut self, cb: DisconnectedCallback);
+
+    fn set_ca_bundle_path(&mut self, _path: &str) {}
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/vdf.rs b/app/src/main/cpp/wn-steam-client/rust/src/vdf.rs
new file mode 100644
index 000000000..db91fd073
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/vdf.rs
@@ -0,0 +1,514 @@
+#[derive(Clone, Debug, PartialEq)]
+pub enum KVValue {
+    Object,
+    String(String),
+    Int32(i32),
+    Float32(f32),
+    UInt32(u32),
+    WideString(Vec<u16>),
+    UInt64(u64),
+    Int64(i64),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct KVNode {
+    pub name: String,
+    pub value: KVValue,
+    pub children: Vec<KVNode>,
+}
+
+impl KVNode {
+    pub fn new(name: impl Into<String>) -> Self {
+        Self {
+            name: name.into(),
+            value: KVValue::Object,
+            children: Vec::new(),
+        }
+    }
+
+    pub fn is_object(&self) -> bool {
+        matches!(self.value, KVValue::Object)
+    }
+
+    pub fn child(&self, key: &str) -> Option<&KVNode> {
+        self.children
+            .iter()
+            .find(|c| c.name.eq_ignore_ascii_case(key))
+    }
+
+    pub fn as_string(&self, fallback: &str) -> String {
+        match &self.value {
+            KVValue::String(v) => v.clone(),
+            KVValue::Int32(v) => v.to_string(),
+            KVValue::Float32(v) => v.to_string(),
+            KVValue::UInt32(v) => v.to_string(),
+            KVValue::UInt64(v) => v.to_string(),
+            KVValue::Int64(v) => v.to_string(),
+            _ => fallback.to_string(),
+        }
+    }
+
+    pub fn as_int(&self, fallback: i64) -> i64 {
+        match &self.value {
+            KVValue::Int32(v) => *v as i64,
+            KVValue::Int64(v) => *v,
+            KVValue::UInt32(v) => *v as i64,
+            KVValue::UInt64(v) => *v as i64,
+            KVValue::String(v) => v.parse().unwrap_or(fallback),
+            _ => fallback,
+        }
+    }
+
+    pub fn as_uint(&self, fallback: u64) -> u64 {
+        match &self.value {
+            KVValue::UInt32(v) => *v as u64,
+            KVValue::UInt64(v) => *v,
+            KVValue::Int32(v) => *v as u64,
+            KVValue::Int64(v) => *v as u64,
+            KVValue::String(v) => v.parse().unwrap_or(fallback),
+            _ => fallback,
+        }
+    }
+
+    pub fn as_bool(&self, fallback: bool) -> bool {
+        match &self.value {
+            KVValue::Int32(v) => *v != 0,
+            KVValue::Int64(v) => *v != 0,
+            KVValue::UInt32(v) => *v != 0,
+            KVValue::UInt64(v) => *v != 0,
+            KVValue::String(v)
+                if v == "1" || v.eq_ignore_ascii_case("true") || v.eq_ignore_ascii_case("yes") =>
+            {
+                true
+            }
+            KVValue::String(v)
+                if v == "0" || v.eq_ignore_ascii_case("false") || v.eq_ignore_ascii_case("no") =>
+            {
+                false
+            }
+            _ => fallback,
+        }
+    }
+}
+
+const TYPE_NONE: u8 = 0x00;
+const TYPE_STRING: u8 = 0x01;
+const TYPE_INT32: u8 = 0x02;
+const TYPE_FLOAT32: u8 = 0x03;
+const TYPE_POINTER: u8 = 0x04;
+const TYPE_WIDE_STRING: u8 = 0x05;
+const TYPE_COLOR: u8 = 0x06;
+const TYPE_UINT64: u8 = 0x07;
+const TYPE_END: u8 = 0x08;
+const TYPE_INT64: u8 = 0x09;
+const TYPE_END_ALT: u8 = 0x0b;
+
+struct Cursor<'a> {
+    buf: &'a [u8],
+    pos: usize,
+    ok: bool,
+}
+
+impl<'a> Cursor<'a> {
+    fn new(buf: &'a [u8]) -> Self {
+        Self {
+            buf,
+            pos: 0,
+            ok: true,
+        }
+    }
+
+    fn read_u8(&mut self) -> u8 {
+        if self.pos + 1 > self.buf.len() {
+            self.ok = false;
+            return 0;
+        }
+        let v = self.buf[self.pos];
+        self.pos += 1;
+        v
+    }
+
+    fn read_u32_le(&mut self) -> u32 {
+        if self.pos + 4 > self.buf.len() {
+            self.ok = false;
+            return 0;
+        }
+        let v = u32::from_le_bytes(self.buf[self.pos..self.pos + 4].try_into().unwrap());
+        self.pos += 4;
+        v
+    }
+
+    fn read_u64_le(&mut self) -> u64 {
+        let lo = self.read_u32_le() as u64;
+        let hi = self.read_u32_le() as u64;
+        lo | (hi << 32)
+    }
+
+    fn read_f32_le(&mut self) -> f32 {
+        f32::from_bits(self.read_u32_le())
+    }
+
+    fn read_cstring(&mut self) -> String {
+        let mut out = Vec::new();
+        while self.pos < self.buf.len() {
+            let b = self.buf[self.pos];
+            self.pos += 1;
+            if b == 0 {
+                return String::from_utf8_lossy(&out).into_owned();
+            }
+            out.push(b);
+        }
+        self.ok = false;
+        String::from_utf8_lossy(&out).into_owned()
+    }
+
+    fn read_wide_cstring(&mut self) -> Vec<u16> {
+        let mut out = Vec::new();
+        while self.pos + 1 < self.buf.len() {
+            let u = u16::from_le_bytes([self.buf[self.pos], self.buf[self.pos + 1]]);
+            self.pos += 2;
+            if u == 0 {
+                return out;
+            }
+            out.push(u);
+        }
+        self.ok = false;
+        out
+    }
+}
+
+fn parse_value(cursor: &mut Cursor<'_>, ty: u8, node: &mut KVNode) -> bool {
+    match ty {
+        TYPE_NONE => {
+            while cursor.ok {
+                let inner_type = cursor.read_u8();
+                if !cursor.ok {
+                    return false;
+                }
+                if inner_type == TYPE_END || inner_type == TYPE_END_ALT {
+                    return true;
+                }
+                let name = cursor.read_cstring();
+                if !cursor.ok {
+                    return false;
+                }
+                let mut child = KVNode::new(name);
+                if !parse_value(cursor, inner_type, &mut child) {
+                    return false;
+                }
+                node.children.push(child);
+            }
+            false
+        }
+        TYPE_STRING => {
+            node.value = KVValue::String(cursor.read_cstring());
+            cursor.ok
+        }
+        TYPE_INT32 => {
+            node.value = KVValue::Int32(cursor.read_u32_le() as i32);
+            cursor.ok
+        }
+        TYPE_FLOAT32 => {
+            node.value = KVValue::Float32(cursor.read_f32_le());
+            cursor.ok
+        }
+        TYPE_POINTER | TYPE_COLOR => {
+            node.value = KVValue::UInt32(cursor.read_u32_le());
+            cursor.ok
+        }
+        TYPE_WIDE_STRING => {
+            node.value = KVValue::WideString(cursor.read_wide_cstring());
+            cursor.ok
+        }
+        TYPE_UINT64 => {
+            node.value = KVValue::UInt64(cursor.read_u64_le());
+            cursor.ok
+        }
+        TYPE_INT64 => {
+            node.value = KVValue::Int64(cursor.read_u64_le() as i64);
+            cursor.ok
+        }
+        _ => false,
+    }
+}
+
+pub fn parse_binary(body: &[u8]) -> Option<KVNode> {
+    if body.is_empty() {
+        return None;
+    }
+    let mut cursor = Cursor::new(body);
+    let ty = cursor.read_u8();
+    if !cursor.ok {
+        return None;
+    }
+    let mut root = KVNode::new(cursor.read_cstring());
+    if !cursor.ok || !parse_value(&mut cursor, ty, &mut root) {
+        return None;
+    }
+    Some(root)
+}
+
+pub fn parse_binary_package(body: &[u8]) -> Option<(u32, KVNode)> {
+    if body.len() < 4 {
+        return None;
+    }
+    let package_id = u32::from_le_bytes(body[..4].try_into().unwrap());
+    Some((package_id, parse_binary(&body[4..])?))
+}
+
+pub fn parse_auto(body: &[u8]) -> Option<KVNode> {
+    let first = body
+        .iter()
+        .copied()
+        .find(|b| !matches!(b, b' ' | b'\t' | b'\n' | b'\r'))?;
+    if first == b'"' {
+        parse_text(body)
+    } else {
+        parse_binary(body)
+    }
+}
+
+struct TextCursor<'a> {
+    buf: &'a [u8],
+    pos: usize,
+    ok: bool,
+}
+
+impl<'a> TextCursor<'a> {
+    fn new(buf: &'a [u8]) -> Self {
+        Self {
+            buf,
+            pos: 0,
+            ok: true,
+        }
+    }
+
+    fn eof(&self) -> bool {
+        self.pos >= self.buf.len()
+    }
+
+    fn peek(&self) -> u8 {
+        self.buf.get(self.pos).copied().unwrap_or(0)
+    }
+
+    fn next(&mut self) -> u8 {
+        let b = self.peek();
+        if !self.eof() {
+            self.pos += 1;
+        }
+        b
+    }
+
+    fn skip_ws_and_comments(&mut self) {
+        while self.pos < self.buf.len() {
+            match self.buf[self.pos] {
+                b' ' | b'\t' | b'\n' | b'\r' => self.pos += 1,
+                b'/' if self.buf.get(self.pos + 1) == Some(&b'/') => {
+                    self.pos += 2;
+                    while self.pos < self.buf.len() && self.buf[self.pos] != b'\n' {
+                        self.pos += 1;
+                    }
+                }
+                b'/' if self.buf.get(self.pos + 1) == Some(&b'*') => {
+                    self.pos += 2;
+                    while self.pos + 1 < self.buf.len()
+                        && !(self.buf[self.pos] == b'*' && self.buf[self.pos + 1] == b'/')
+                    {
+                        self.pos += 1;
+                    }
+                    self.pos = (self.pos + 2).min(self.buf.len());
+                }
+                _ => break,
+            }
+        }
+    }
+
+    fn read_token(&mut self) -> Option<String> {
+        self.skip_ws_and_comments();
+        if self.eof() {
+            return None;
+        }
+        if self.peek() == b'"' {
+            self.pos += 1;
+            let mut out = Vec::new();
+            while !self.eof() {
+                let c = self.next();
+                if c == b'"' {
+                    return Some(String::from_utf8_lossy(&out).into_owned());
+                }
+                if c == b'\\' && !self.eof() {
+                    out.push(match self.next() {
+                        b'n' => b'\n',
+                        b't' => b'\t',
+                        b'r' => b'\r',
+                        b'\\' => b'\\',
+                        b'"' => b'"',
+                        other => other,
+                    });
+                } else {
+                    out.push(c);
+                }
+            }
+            self.ok = false;
+            return None;
+        }
+
+        let start = self.pos;
+        while !self.eof() {
+            let c = self.peek();
+            if matches!(c, b' ' | b'\t' | b'\n' | b'\r' | b'{' | b'}' | b'"') {
+                break;
+            }
+            self.pos += 1;
+        }
+        (self.pos > start).then(|| String::from_utf8_lossy(&self.buf[start..self.pos]).into_owned())
+    }
+}
+
+fn parse_text_object(cursor: &mut TextCursor<'_>, parent: &mut KVNode) -> bool {
+    loop {
+        cursor.skip_ws_and_comments();
+        if cursor.eof() {
+            return true;
+        }
+        if cursor.peek() == b'}' {
+            cursor.pos += 1;
+            return true;
+        }
+        let Some(key) = cursor.read_token() else {
+            return cursor.ok;
+        };
+        cursor.skip_ws_and_comments();
+        if cursor.eof() {
+            return false;
+        }
+        let mut child = KVNode::new(key);
+        if cursor.peek() == b'{' {
+            cursor.pos += 1;
+            if !parse_text_object(cursor, &mut child) {
+                return false;
+            }
+        } else {
+            let Some(value) = cursor.read_token() else {
+                return false;
+            };
+            child.value = KVValue::String(value);
+        }
+        parent.children.push(child);
+    }
+}
+
+pub fn parse_text(body: &[u8]) -> Option<KVNode> {
+    let mut cursor = TextCursor::new(body);
+    cursor.skip_ws_and_comments();
+    let key = cursor.read_token()?;
+    cursor.skip_ws_and_comments();
+    if cursor.peek() != b'{' {
+        return None;
+    }
+    cursor.pos += 1;
+    let mut root = KVNode::new(key);
+    parse_text_object(&mut cursor, &mut root).then_some(root)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_text_vdf_with_comments_and_case_insensitive_lookup() {
+        let text = br#"
+            // comment
+            "appinfo" {
+                "appid" "480"
+                "Common" { "name" "Spacewar" "type" "Game" }
+                /* block */ "enabled" "true"
+            }
+        "#;
+        let root = parse_text(text).unwrap();
+        assert_eq!(root.name, "appinfo");
+        assert_eq!(root.child("APPID").unwrap().as_int(0), 480);
+        assert_eq!(
+            root.child("common")
+                .unwrap()
+                .child("NAME")
+                .unwrap()
+                .as_string(""),
+            "Spacewar"
+        );
+        assert!(root.child("enabled").unwrap().as_bool(false));
+    }
+
+    #[test]
+    fn parses_binary_tree() {
+        let mut bytes = Vec::new();
+        bytes.extend_from_slice(&[TYPE_NONE]);
+        bytes.extend_from_slice(b"root\0");
+        bytes.extend_from_slice(&[TYPE_STRING]);
+        bytes.extend_from_slice(b"name\0Spacewar\0");
+        bytes.extend_from_slice(&[TYPE_INT32]);
+        bytes.extend_from_slice(b"appid\0");
+        bytes.extend_from_slice(&480i32.to_le_bytes());
+        bytes.extend_from_slice(&[TYPE_END]);
+
+        let root = parse_binary(&bytes).unwrap();
+        assert!(root.is_object());
+        assert_eq!(root.child("name").unwrap().as_string(""), "Spacewar");
+        assert_eq!(root.child("appid").unwrap().as_int(0), 480);
+    }
+
+    #[test]
+    fn parses_package_prefix() {
+        let mut bytes = 123u32.to_le_bytes().to_vec();
+        bytes.extend_from_slice(&[TYPE_NONE]);
+        bytes.extend_from_slice(b"package\0");
+        bytes.extend_from_slice(&[TYPE_END]);
+        let (package_id, root) = parse_binary_package(&bytes).unwrap();
+        assert_eq!(package_id, 123);
+        assert_eq!(root.name, "package");
+    }
+
+    // Manifest gid/size/download: proves the parser reads download (the 3rd value)
+    // correctly, ruling out a parser cause for the stale corrupt download sizes.
+    #[test]
+    fn parses_manifest_uint64_gid_size_download() {
+        let gid: u64 = 8072044898226043193;
+        let size: u64 = 30738676601;
+        let download: u64 = 15000000000;
+        let mut b = vec![TYPE_NONE];
+        b.extend_from_slice(b"public\0");
+        b.push(TYPE_UINT64);
+        b.extend_from_slice(b"gid\0");
+        b.extend_from_slice(&gid.to_le_bytes());
+        b.push(TYPE_UINT64);
+        b.extend_from_slice(b"size\0");
+        b.extend_from_slice(&size.to_le_bytes());
+        b.push(TYPE_UINT64);
+        b.extend_from_slice(b"download\0");
+        b.extend_from_slice(&download.to_le_bytes());
+        b.push(TYPE_END);
+
+        let root = parse_binary(&b).unwrap();
+        assert_eq!(root.child("gid").unwrap().as_string(""), gid.to_string());
+        assert_eq!(root.child("size").unwrap().as_string(""), size.to_string());
+        assert_eq!(
+            root.child("download").unwrap().as_string(""),
+            download.to_string()
+        );
+    }
+
+    #[test]
+    fn parses_manifest_text_vdf() {
+        let text = br#"
+            "public"
+            {
+                "gid"		"8072044898226043193"
+                "size"		"30738676601"
+                "download"		"15000000000"
+            }
+        "#;
+        let root = parse_text(text).unwrap();
+        assert_eq!(root.child("size").unwrap().as_string(""), "30738676601");
+        assert_eq!(root.child("download").unwrap().as_string(""), "15000000000");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/version.rs b/app/src/main/cpp/wn-steam-client/rust/src/version.rs
new file mode 100644
index 000000000..e33a3b1af
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/version.rs
@@ -0,0 +1,78 @@
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct Version {
+    pub major: i32,
+    pub minor: i32,
+    pub patch: i32,
+    pub string: &'static str,
+}
+
+pub const VERSION: Version = Version {
+    major: parse_i32_or(option_env!("WN_STEAM_CLIENT_VERSION_MAJOR"), 0),
+    minor: parse_i32_or(option_env!("WN_STEAM_CLIENT_VERSION_MINOR"), 1),
+    patch: parse_i32_or(option_env!("WN_STEAM_CLIENT_VERSION_PATCH"), 0),
+    string: str_or(option_env!("WN_STEAM_CLIENT_VERSION_STRING"), "0.1.0"),
+};
+
+pub const fn version() -> Version {
+    VERSION
+}
+
+const fn parse_i32(s: &str) -> Option<i32> {
+    let bytes = s.as_bytes();
+    if bytes.is_empty() {
+        return None;
+    }
+    let mut i = 0;
+    let mut out: i32 = 0;
+    while i < bytes.len() {
+        let b = bytes[i];
+        if b < b'0' || b > b'9' {
+            return None;
+        }
+        out = match out.checked_mul(10) {
+            Some(v) => v,
+            None => return None,
+        };
+        out = match out.checked_add((b - b'0') as i32) {
+            Some(v) => v,
+            None => return None,
+        };
+        i += 1;
+    }
+    Some(out)
+}
+
+const fn parse_i32_or(s: Option<&str>, default: i32) -> i32 {
+    match s {
+        Some(s) => match parse_i32(s) {
+            Some(v) => v,
+            None => default,
+        },
+        None => default,
+    }
+}
+
+const fn str_or(s: Option<&'static str>, default: &'static str) -> &'static str {
+    match s {
+        Some(s) => s,
+        None => default,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn default_version_matches_cmake_defaults() {
+        assert_eq!(
+            version(),
+            Version {
+                major: 0,
+                minor: 1,
+                patch: 0,
+                string: "0.1.0"
+            }
+        );
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/wine_bridge.rs b/app/src/main/cpp/wn-steam-client/rust/src/wine_bridge.rs
new file mode 100644
index 000000000..4dc80e539
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/wine_bridge.rs
@@ -0,0 +1,202 @@
+use std::io::Read;
+use std::net::{Shutdown, TcpListener, TcpStream};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex};
+use std::thread::{self, JoinHandle};
+use std::time::Duration;
+
+type ClientObserver = Arc<dyn Fn(u16, String, Vec<u8>) + Send + Sync + 'static>;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct WineBridgeConfig {
+    pub bind_host: String,
+    pub steam3_port: u16,
+    pub client_svc_port: u16,
+    pub snoop_bytes: usize,
+}
+
+impl Default for WineBridgeConfig {
+    fn default() -> Self {
+        Self {
+            bind_host: "127.0.0.1".to_string(),
+            steam3_port: 57343,
+            client_svc_port: 57344,
+            snoop_bytes: 64,
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct WineBridge {
+    running: Arc<AtomicBool>,
+    last_error: Arc<Mutex<String>>,
+    observer: Arc<Mutex<Option<ClientObserver>>>,
+    threads: Vec<JoinHandle<()>>,
+}
+
+impl WineBridge {
+    pub fn start(&mut self, config: WineBridgeConfig) -> bool {
+        if self.running.load(Ordering::Relaxed) {
+            return true;
+        }
+        self.stop();
+        let steam3 = match TcpListener::bind((config.bind_host.as_str(), config.steam3_port)) {
+            Ok(listener) => listener,
+            Err(err) => {
+                self.set_error(format!(
+                    "bind({}:{}): {err}",
+                    config.bind_host, config.steam3_port
+                ));
+                return false;
+            }
+        };
+        let client = match TcpListener::bind((config.bind_host.as_str(), config.client_svc_port)) {
+            Ok(listener) => listener,
+            Err(err) => {
+                self.set_error(format!(
+                    "bind({}:{}): {err}",
+                    config.bind_host, config.client_svc_port
+                ));
+                return false;
+            }
+        };
+        self.running.store(true, Ordering::Relaxed);
+        self.threads.push(spawn_listener(
+            steam3,
+            config.steam3_port,
+            config.snoop_bytes,
+            Arc::clone(&self.running),
+            Arc::clone(&self.observer),
+        ));
+        self.threads.push(spawn_listener(
+            client,
+            config.client_svc_port,
+            config.snoop_bytes,
+            Arc::clone(&self.running),
+            Arc::clone(&self.observer),
+        ));
+        true
+    }
+
+    pub fn stop(&mut self) {
+        self.running.store(false, Ordering::Relaxed);
+        for handle in self.threads.drain(..) {
+            let _ = handle.join();
+        }
+    }
+
+    pub fn running(&self) -> bool {
+        self.running.load(Ordering::Relaxed)
+    }
+
+    pub fn last_error(&self) -> String {
+        self.last_error
+            .lock()
+            .expect("wine bridge poisoned")
+            .clone()
+    }
+
+    pub fn set_observer<F>(&self, observer: F)
+    where
+        F: Fn(u16, String, Vec<u8>) + Send + Sync + 'static,
+    {
+        *self.observer.lock().expect("wine bridge poisoned") = Some(Arc::new(observer));
+    }
+
+    fn set_error(&self, error: String) {
+        *self.last_error.lock().expect("wine bridge poisoned") = error;
+    }
+}
+
+impl Drop for WineBridge {
+    fn drop(&mut self) {
+        self.stop();
+    }
+}
+
+fn spawn_listener(
+    listener: TcpListener,
+    port: u16,
+    snoop_bytes: usize,
+    running: Arc<AtomicBool>,
+    observer: Arc<Mutex<Option<ClientObserver>>>,
+) -> JoinHandle<()> {
+    thread::spawn(move || {
+        let _ = listener.set_nonblocking(true);
+        while running.load(Ordering::Relaxed) {
+            match listener.accept() {
+                Ok((stream, _)) => handle_connection(stream, port, snoop_bytes, &observer),
+                Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {
+                    thread::sleep(Duration::from_millis(25));
+                }
+                Err(_) => break,
+            }
+        }
+    })
+}
+
+fn handle_connection(
+    mut stream: TcpStream,
+    port: u16,
+    snoop_bytes: usize,
+    observer: &Arc<Mutex<Option<ClientObserver>>>,
+) {
+    let peer = stream
+        .peer_addr()
+        .map(|addr| addr.to_string())
+        .unwrap_or_default();
+    let mut first = vec![0u8; snoop_bytes];
+    let n = stream.read(&mut first).unwrap_or(0);
+    first.truncate(n);
+    let cb = observer.lock().expect("wine bridge poisoned").clone();
+    if let Some(cb) = cb {
+        cb(port, peer, first);
+    }
+    let _ = stream.shutdown(Shutdown::Both);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io::Write;
+    use std::net::TcpListener;
+    use std::sync::mpsc;
+
+    #[test]
+    fn default_ports_match_cpp_bridge() {
+        let cfg = WineBridgeConfig::default();
+        assert_eq!(cfg.steam3_port, 57343);
+        assert_eq!(cfg.client_svc_port, 57344);
+    }
+
+    #[test]
+    fn observes_first_bytes_on_connection() {
+        let port1 = free_port();
+        let port2 = free_port();
+        let mut bridge = WineBridge::default();
+        let (tx, rx) = mpsc::channel();
+        bridge.set_observer(move |port, peer, first| {
+            tx.send((port, peer, first)).unwrap();
+        });
+        assert!(bridge.start(WineBridgeConfig {
+            steam3_port: port1,
+            client_svc_port: port2,
+            ..Default::default()
+        }));
+        let mut stream = TcpStream::connect(("127.0.0.1", port1)).unwrap();
+        stream.write_all(b"abcdef").unwrap();
+        let (port, peer, first) = rx.recv_timeout(Duration::from_secs(2)).unwrap();
+        assert_eq!(port, port1);
+        assert!(peer.starts_with("127.0.0.1:"));
+        assert_eq!(first, b"abcdef");
+        bridge.stop();
+    }
+
+    fn free_port() -> u16 {
+        TcpListener::bind(("127.0.0.1", 0))
+            .unwrap()
+            .local_addr()
+            .unwrap()
+            .port()
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/wire_format.rs b/app/src/main/cpp/wn-steam-client/rust/src/wire_format.rs
new file mode 100644
index 000000000..6f7c3d732
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/wire_format.rs
@@ -0,0 +1,154 @@
+pub fn read_u16_le(p: &[u8]) -> u16 {
+    u16::from_le_bytes([p[0], p[1]])
+}
+
+pub fn read_u32_le(p: &[u8]) -> u32 {
+    u32::from_le_bytes([p[0], p[1], p[2], p[3]])
+}
+
+pub fn read_u64_le(p: &[u8]) -> u64 {
+    u64::from_le_bytes([p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]])
+}
+
+pub fn write_u16_le(out: &mut [u8], v: u16) {
+    out[..2].copy_from_slice(&v.to_le_bytes());
+}
+
+pub fn write_u32_le(out: &mut [u8], v: u32) {
+    out[..4].copy_from_slice(&v.to_le_bytes());
+}
+
+pub fn write_u64_le(out: &mut [u8], v: u64) {
+    out[..8].copy_from_slice(&v.to_le_bytes());
+}
+
+pub struct Reader<'a> {
+    buf: &'a [u8],
+    pos: usize,
+    ok: bool,
+}
+
+impl<'a> Reader<'a> {
+    pub fn new(buf: &'a [u8]) -> Self {
+        Self {
+            buf,
+            pos: 0,
+            ok: true,
+        }
+    }
+
+    pub fn ok(&self) -> bool {
+        self.ok
+    }
+
+    pub fn position(&self) -> usize {
+        self.pos
+    }
+
+    pub fn remaining(&self) -> usize {
+        self.buf.len().saturating_sub(self.pos)
+    }
+
+    pub fn u16(&mut self) -> u16 {
+        if !self.check(2) {
+            return 0;
+        }
+        let v = read_u16_le(&self.buf[self.pos..]);
+        self.pos += 2;
+        v
+    }
+
+    pub fn u32(&mut self) -> u32 {
+        if !self.check(4) {
+            return 0;
+        }
+        let v = read_u32_le(&self.buf[self.pos..]);
+        self.pos += 4;
+        v
+    }
+
+    pub fn u64(&mut self) -> u64 {
+        if !self.check(8) {
+            return 0;
+        }
+        let v = read_u64_le(&self.buf[self.pos..]);
+        self.pos += 8;
+        v
+    }
+
+    pub fn bytes(&mut self, n: usize) -> &'a [u8] {
+        if !self.check(n) {
+            return &[];
+        }
+        let out = &self.buf[self.pos..self.pos + n];
+        self.pos += n;
+        out
+    }
+
+    fn check(&mut self, n: usize) -> bool {
+        if !self.ok || self.remaining() < n {
+            self.ok = false;
+            return false;
+        }
+        true
+    }
+}
+
+pub struct Writer<'a> {
+    out: &'a mut Vec<u8>,
+}
+
+impl<'a> Writer<'a> {
+    pub fn new(out: &'a mut Vec<u8>) -> Self {
+        Self { out }
+    }
+
+    pub fn u16(&mut self, v: u16) {
+        self.out.extend_from_slice(&v.to_le_bytes());
+    }
+
+    pub fn u32(&mut self, v: u32) {
+        self.out.extend_from_slice(&v.to_le_bytes());
+    }
+
+    pub fn u64(&mut self, v: u64) {
+        self.out.extend_from_slice(&v.to_le_bytes());
+    }
+
+    pub fn bytes(&mut self, bytes: &[u8]) {
+        self.out.extend_from_slice(bytes);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reader_writer_little_endian_roundtrip() {
+        let mut buf = Vec::new();
+        let mut writer = Writer::new(&mut buf);
+        writer.u16(0x1234);
+        writer.u32(0x89ab_cdef);
+        writer.u64(0x0123_4567_89ab_cdef);
+
+        assert_eq!(
+            buf,
+            [0x34, 0x12, 0xef, 0xcd, 0xab, 0x89, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01]
+        );
+
+        let mut reader = Reader::new(&buf);
+        assert_eq!(reader.u16(), 0x1234);
+        assert_eq!(reader.u32(), 0x89ab_cdef);
+        assert_eq!(reader.u64(), 0x0123_4567_89ab_cdef);
+        assert!(reader.ok());
+        assert_eq!(reader.remaining(), 0);
+    }
+
+    #[test]
+    fn reader_short_input_flips_ok() {
+        let mut reader = Reader::new(&[1, 2, 3]);
+        assert_eq!(reader.u32(), 0);
+        assert!(!reader.ok());
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-client/rust/src/ws_connection.rs b/app/src/main/cpp/wn-steam-client/rust/src/ws_connection.rs
new file mode 100644
index 000000000..b70d6a748
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-client/rust/src/ws_connection.rs
@@ -0,0 +1,446 @@
+use crate::transport::{Transport, TransportDisconnectReason, TransportState};
+use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
+use std::sync::{mpsc, Arc, Mutex};
+use std::thread::{self, JoinHandle};
+use std::time::Duration;
+use tungstenite::error::Error as WsError;
+use tungstenite::stream::MaybeTlsStream;
+use tungstenite::{connect, Message};
+
+const NORMAL_CLOSE_CODE: u16 = 1000;
+const READ_POLL_TIMEOUT: Duration = Duration::from_millis(100);
+
+type MessageCallback = Arc<dyn Fn(&[u8]) + Send + Sync + 'static>;
+type ConnectedCallback = Arc<dyn Fn() + Send + Sync + 'static>;
+type DisconnectedCallback = Arc<dyn Fn(TransportDisconnectReason, &str) + Send + Sync + 'static>;
+
+pub struct WsConnection {
+    shared: Arc<WsConnectionShared>,
+    sender: Mutex<Option<mpsc::Sender<WsCommand>>>,
+    worker: Mutex<Option<JoinHandle<()>>>,
+}
+
+#[derive(Default)]
+struct WsConnectionShared {
+    state: AtomicU8,
+    user_initiated_close: AtomicBool,
+    ca_bundle_path: Mutex<String>,
+    on_message: Mutex<Option<MessageCallback>>,
+    on_connected: Mutex<Option<ConnectedCallback>>,
+    on_disconnected: Mutex<Option<DisconnectedCallback>>,
+}
+
+enum WsCommand {
+    Send(Vec<u8>),
+    Disconnect,
+}
+
+impl WsConnection {
+    pub fn new() -> Self {
+        Self {
+            shared: Arc::new(WsConnectionShared {
+                state: AtomicU8::new(TransportState::Disconnected as u8),
+                user_initiated_close: AtomicBool::new(false),
+                ca_bundle_path: Mutex::new(String::new()),
+                on_message: Mutex::new(None),
+                on_connected: Mutex::new(None),
+                on_disconnected: Mutex::new(None),
+            }),
+            sender: Mutex::new(None),
+            worker: Mutex::new(None),
+        }
+    }
+
+    pub fn set_ca_bundle_path(&self, path: &str) {
+        *self
+            .shared
+            .ca_bundle_path
+            .lock()
+            .expect("ws connection poisoned") = path.to_string();
+    }
+
+    pub fn ca_bundle_path(&self) -> String {
+        self.shared
+            .ca_bundle_path
+            .lock()
+            .expect("ws connection poisoned")
+            .clone()
+    }
+
+    pub fn state(&self) -> TransportState {
+        match self.shared.state.load(Ordering::Relaxed) {
+            1 => TransportState::Connecting,
+            2 => TransportState::Connected,
+            3 => TransportState::Disconnecting,
+            _ => TransportState::Disconnected,
+        }
+    }
+
+    pub fn transition_connecting(&self) -> bool {
+        self.shared
+            .user_initiated_close
+            .store(false, Ordering::Relaxed);
+        self.shared
+            .state
+            .compare_exchange(
+                TransportState::Disconnected as u8,
+                TransportState::Connecting as u8,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .is_ok()
+    }
+
+    pub fn mark_connected(&self) {
+        self.shared.mark_connected();
+    }
+
+    pub fn mark_disconnected(&self, close_code: u16, detail: &str, tls_failed: bool) {
+        self.shared
+            .mark_disconnected(close_code, detail, tls_failed);
+    }
+
+    pub fn mark_user_disconnect(&self) {
+        self.shared
+            .user_initiated_close
+            .store(true, Ordering::Relaxed);
+        self.shared
+            .state
+            .store(TransportState::Disconnecting as u8, Ordering::Release);
+    }
+
+    pub fn deliver_binary(&self, data: &[u8]) {
+        self.shared.deliver_binary(data);
+    }
+
+    pub fn set_on_message<F>(&self, cb: F)
+    where
+        F: Fn(&[u8]) + Send + Sync + 'static,
+    {
+        *self
+            .shared
+            .on_message
+            .lock()
+            .expect("ws connection poisoned") = Some(Arc::new(cb));
+    }
+
+    pub fn set_on_connected<F>(&self, cb: F)
+    where
+        F: Fn() + Send + Sync + 'static,
+    {
+        *self
+            .shared
+            .on_connected
+            .lock()
+            .expect("ws connection poisoned") = Some(Arc::new(cb));
+    }
+
+    pub fn set_on_disconnected<F>(&self, cb: F)
+    where
+        F: Fn(TransportDisconnectReason, &str) + Send + Sync + 'static,
+    {
+        *self
+            .shared
+            .on_disconnected
+            .lock()
+            .expect("ws connection poisoned") = Some(Arc::new(cb));
+    }
+
+    fn connect_worker(&self, url: &str) -> bool {
+        if !self.transition_connecting() {
+            return false;
+        }
+        let (tx, rx) = mpsc::channel();
+        *self.sender.lock().expect("ws connection poisoned") = Some(tx);
+        let shared = Arc::clone(&self.shared);
+        let url = url.to_string();
+        let worker = thread::spawn(move || run_ws_worker(shared, url, rx));
+        *self.worker.lock().expect("ws connection poisoned") = Some(worker);
+        true
+    }
+}
+
+impl Transport for WsConnection {
+    fn connect(&mut self, url: &str) -> bool {
+        self.connect_worker(url)
+    }
+
+    fn send(&mut self, data: &[u8]) -> bool {
+        if self.state() != TransportState::Connected {
+            return false;
+        }
+        self.sender
+            .lock()
+            .expect("ws connection poisoned")
+            .as_ref()
+            .is_some_and(|tx| tx.send(WsCommand::Send(data.to_vec())).is_ok())
+    }
+
+    fn disconnect(&mut self) {
+        if self.state() == TransportState::Disconnected {
+            return;
+        }
+        self.mark_user_disconnect();
+        let sent = self
+            .sender
+            .lock()
+            .expect("ws connection poisoned")
+            .as_ref()
+            .is_some_and(|tx| tx.send(WsCommand::Disconnect).is_ok());
+        if !sent {
+            self.mark_disconnected(NORMAL_CLOSE_CODE, "client disconnect", false);
+        }
+    }
+
+    fn state(&self) -> TransportState {
+        WsConnection::state(self)
+    }
+
+    fn set_on_message(&mut self, cb: Box<dyn Fn(&[u8]) + Send + Sync>) {
+        *self
+            .shared
+            .on_message
+            .lock()
+            .expect("ws connection poisoned") = Some(Arc::from(cb));
+    }
+
+    fn set_on_connected(&mut self, cb: Box<dyn Fn() + Send + Sync>) {
+        *self
+            .shared
+            .on_connected
+            .lock()
+            .expect("ws connection poisoned") = Some(Arc::from(cb));
+    }
+
+    fn set_on_disconnected(
+        &mut self,
+        cb: Box<dyn Fn(TransportDisconnectReason, &str) + Send + Sync>,
+    ) {
+        *self
+            .shared
+            .on_disconnected
+            .lock()
+            .expect("ws connection poisoned") = Some(Arc::from(cb));
+    }
+
+    fn set_ca_bundle_path(&mut self, path: &str) {
+        WsConnection::set_ca_bundle_path(self, path);
+    }
+}
+
+impl Default for WsConnection {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Drop for WsConnection {
+    fn drop(&mut self) {
+        self.disconnect();
+    }
+}
+
+impl WsConnectionShared {
+    fn mark_connected(&self) {
+        self.state
+            .store(TransportState::Connected as u8, Ordering::Release);
+        if let Some(cb) = self
+            .on_connected
+            .lock()
+            .expect("ws connection poisoned")
+            .clone()
+        {
+            cb();
+        }
+    }
+
+    fn mark_disconnected(&self, close_code: u16, detail: &str, tls_failed: bool) {
+        self.state
+            .store(TransportState::Disconnected as u8, Ordering::Release);
+        let reason = if self.user_initiated_close.load(Ordering::Relaxed) {
+            TransportDisconnectReason::UserInitiated
+        } else {
+            map_close_reason(close_code, tls_failed)
+        };
+        if let Some(cb) = self
+            .on_disconnected
+            .lock()
+            .expect("ws connection poisoned")
+            .clone()
+        {
+            cb(reason, detail);
+        }
+    }
+
+    fn deliver_binary(&self, data: &[u8]) {
+        if let Some(cb) = self
+            .on_message
+            .lock()
+            .expect("ws connection poisoned")
+            .clone()
+        {
+            cb(data);
+        }
+    }
+}
+
+fn run_ws_worker(shared: Arc<WsConnectionShared>, url: String, rx: mpsc::Receiver<WsCommand>) {
+    let (mut socket, _) = match connect(url.as_str()) {
+        Ok(connection) => connection,
+        Err(err) => {
+            let detail = err.to_string();
+            let reason = map_error_reason(&detail, false);
+            shared.mark_disconnected(reason_to_close_code(reason), &detail, false);
+            return;
+        }
+    };
+    let _ = set_read_timeout(socket.get_mut(), Some(READ_POLL_TIMEOUT));
+    shared.mark_connected();
+
+    loop {
+        while let Ok(cmd) = rx.try_recv() {
+            match cmd {
+                WsCommand::Send(data) => {
+                    if let Err(err) = socket.send(Message::Binary(data.into())) {
+                        let detail = err.to_string();
+                        let reason = map_error_reason(&detail, false);
+                        shared.mark_disconnected(reason_to_close_code(reason), &detail, false);
+                        return;
+                    }
+                }
+                WsCommand::Disconnect => {
+                    let _ = socket.close(None);
+                    shared.mark_disconnected(NORMAL_CLOSE_CODE, "client disconnect", false);
+                    return;
+                }
+            }
+        }
+
+        match socket.read() {
+            Ok(Message::Binary(bytes)) => shared.deliver_binary(&bytes),
+            Ok(Message::Close(frame)) => {
+                let detail = frame
+                    .as_ref()
+                    .map(|frame| frame.reason.to_string())
+                    .unwrap_or_else(|| "remote close".to_string());
+                let code = frame
+                    .map(|frame| u16::from(frame.code))
+                    .unwrap_or(NORMAL_CLOSE_CODE);
+                shared.mark_disconnected(code, &detail, false);
+                return;
+            }
+            Ok(Message::Ping(_) | Message::Pong(_) | Message::Text(_) | Message::Frame(_)) => {}
+            Err(err) if is_timeout_error(&err) => {}
+            Err(WsError::ConnectionClosed | WsError::AlreadyClosed) => {
+                shared.mark_disconnected(NORMAL_CLOSE_CODE, "remote close", false);
+                return;
+            }
+            Err(err) => {
+                let detail = err.to_string();
+                let reason = map_error_reason(&detail, false);
+                shared.mark_disconnected(reason_to_close_code(reason), &detail, false);
+                return;
+            }
+        }
+    }
+}
+
+fn set_read_timeout(
+    stream: &mut MaybeTlsStream<std::net::TcpStream>,
+    timeout: Option<Duration>,
+) -> std::io::Result<()> {
+    match stream {
+        MaybeTlsStream::Plain(stream) => stream.set_read_timeout(timeout),
+        MaybeTlsStream::Rustls(stream) => stream.sock.set_read_timeout(timeout),
+        #[allow(unreachable_patterns)]
+        _ => Ok(()),
+    }
+}
+
+fn is_timeout_error(err: &WsError) -> bool {
+    matches!(err, WsError::Io(io) if matches!(
+        io.kind(),
+        std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut
+    ))
+}
+
+fn reason_to_close_code(reason: TransportDisconnectReason) -> u16 {
+    match reason {
+        TransportDisconnectReason::RemoteClose | TransportDisconnectReason::UserInitiated => {
+            NORMAL_CLOSE_CODE
+        }
+        _ => 0,
+    }
+}
+
+pub fn map_close_reason(close_code: u16, tls_handshake_failed: bool) -> TransportDisconnectReason {
+    if tls_handshake_failed {
+        TransportDisconnectReason::TlsHandshakeFailed
+    } else if (1000..1016).contains(&close_code) {
+        TransportDisconnectReason::RemoteClose
+    } else {
+        TransportDisconnectReason::Unknown
+    }
+}
+
+pub fn map_error_reason(reason: &str, user_initiated: bool) -> TransportDisconnectReason {
+    if user_initiated {
+        return TransportDisconnectReason::UserInitiated;
+    }
+    let tls_failed = reason.contains("tls")
+        || reason.contains("TLS")
+        || reason.contains("SSL")
+        || reason.contains("certificate");
+    map_close_reason(0, tls_failed)
+}
+
+pub fn normal_close_code() -> u16 {
+    NORMAL_CLOSE_CODE
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::mpsc;
+
+    #[test]
+    fn maps_close_reasons_like_cpp() {
+        assert_eq!(
+            map_close_reason(0, true),
+            TransportDisconnectReason::TlsHandshakeFailed
+        );
+        assert_eq!(
+            map_close_reason(1000, false),
+            TransportDisconnectReason::RemoteClose
+        );
+        assert_eq!(
+            map_close_reason(2000, false),
+            TransportDisconnectReason::Unknown
+        );
+        assert_eq!(normal_close_code(), 1000);
+        assert_eq!(
+            map_error_reason("TLS certificate verify failed", false),
+            TransportDisconnectReason::TlsHandshakeFailed
+        );
+        assert_eq!(
+            map_error_reason("connection reset", false),
+            TransportDisconnectReason::Unknown
+        );
+        assert_eq!(
+            map_error_reason("connection reset", true),
+            TransportDisconnectReason::UserInitiated
+        );
+    }
+
+    #[test]
+    fn transitions_and_callbacks_fire() {
+        let ws = WsConnection::new();
+        let (tx, rx) = mpsc::channel();
+        ws.set_on_connected(move || tx.send("connected").unwrap());
+        assert!(ws.transition_connecting());
+        assert!(!ws.transition_connecting());
+        ws.mark_connected();
+        assert_eq!(ws.state(), TransportState::Connected);
+        assert_eq!(rx.recv().unwrap(), "connected");
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-launcher/build.sh b/app/src/main/cpp/wn-steam-launcher/build.sh
new file mode 100755
index 000000000..884fb3011
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-launcher/build.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Cross-compile steam.exe (the Steam Launcher in-Wine host) for Wine (x86_64 /
+# 64-bit PE) and stage it into the APK assets. The Android Gradle build does NOT
+# compile this — it only packages the prebuilt binary — so run this after editing
+# any wn-steam-launcher source, then rebuild the APK.
+#
+# Built 64-bit on purpose: it hosts Valve's real steamclient64.dll so
+# IClientAppManager::LaunchApp drives the game through steamclient's own
+# app-launch path. Named "steam.exe" because steamclient's CGameLauncher path
+# requires its host process to look like real Steam.
+#
+# Usage:   ./build.sh
+# Output:  ../../assets/wnsteam/bionic/steam.exe
+#
+# Requires the POSIX-threads mingw-w64 cross compiler (clean_shutdown.cpp uses
+# std::thread, which the default win32-threads variant does not provide).
+set -euo pipefail
+cd "$(dirname "$0")"
+
+CXX="${CXX:-x86_64-w64-mingw32-g++-posix}"
+STRIP="${STRIP:-x86_64-w64-mingw32-strip}"
+OUT_FILE="../../assets/wnsteam/bionic/steam.exe"
+
+# -Wl,--subsystem,windows: no console, so Wine doesn't map a transient console
+# X11 window at startup (which raced the X server and cut the preloader short).
+# Static link the runtime so no MinGW DLLs are dragged into the wine prefix.
+"$CXX" -std=c++17 -O2 -Wall -Wextra -Wno-unused-parameter \
+    -static -static-libgcc -static-libstdc++ \
+    -Wl,--subsystem,windows \
+    -I. \
+    -o "$OUT_FILE" \
+    src/main.cpp clean_shutdown.cpp \
+    -ladvapi32 -lkernel32 -luser32
+
+"$STRIP" "$OUT_FILE"
+
+echo "Built: $OUT_FILE  ($(stat -c '%s' "$OUT_FILE") bytes)"
+file "$OUT_FILE"
diff --git a/app/src/main/cpp/wn-steam-launcher/clean_shutdown.cpp b/app/src/main/cpp/wn-steam-launcher/clean_shutdown.cpp
new file mode 100644
index 000000000..f14a02d88
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-launcher/clean_shutdown.cpp
@@ -0,0 +1,407 @@
+#include "clean_shutdown.h"
+
+#include <windows.h>
+#include <tlhelp32.h>
+
+#include <atomic>
+#include <cstdio>
+#include <cstring>
+#include <thread>
+#include <vector>
+
+namespace {
+
+using Steam_LogOff_fn = void (*)(int, int);
+using Steam_ReleaseUser_fn = void (*)(int, int);
+using Steam_BReleaseSteamPipe_fn = bool (*)(int);
+using Steam_BLoggedOn_fn = bool (*)(int, int);
+using Steam_BGetCallback_fn = bool (*)(int, void*);
+using Steam_FreeLastCallback_fn = void (*)(int);
+
+Steam_LogOff_fn g_logoff = nullptr;
+Steam_ReleaseUser_fn g_release_user = nullptr;
+Steam_BReleaseSteamPipe_fn g_release_pipe = nullptr;
+Steam_BLoggedOn_fn g_bloggedon = nullptr;
+Steam_BGetCallback_fn g_bgetcallback = nullptr;
+Steam_FreeLastCallback_fn g_freelastcallback = nullptr;
+
+int g_pipe = 0;
+int g_user = 0;
+char g_log_path[MAX_PATH] = {0};
+char g_game_exe[260] = {0};
+
+void* g_cs_engine = nullptr;
+int g_cs_hUser = 0;
+int g_cs_hPipe = 0;
+unsigned int g_cs_appId = 0;
+
+constexpr int kVtEngine_GetIClientRemoteStorage = 0xC0;
+constexpr int kVtRS_GetSyncState        = 0x240;
+constexpr int kVtRS_BeginAppSync        = 0x270;
+constexpr int kVtRS_IsAppSyncInProgress = 0x278;
+
+bool cs_is_exec_ptr(void* p) {
+    if (!p) return false;
+    MEMORY_BASIC_INFORMATION mbi;
+    if (VirtualQuery(p, &mbi, sizeof(mbi)) == 0) return false;
+    if (mbi.State != MEM_COMMIT) return false;
+    DWORD x = mbi.Protect & 0xFF;
+    return x == PAGE_EXECUTE || x == PAGE_EXECUTE_READ ||
+           x == PAGE_EXECUTE_READWRITE || x == PAGE_EXECUTE_WRITECOPY;
+}
+
+int kill_processes_by_name(const char* exeName) {
+    if (!exeName || !exeName[0]) return 0;
+    HANDLE snap = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snap == INVALID_HANDLE_VALUE) return 0;
+    PROCESSENTRY32 pe;
+    pe.dwSize = sizeof(pe);
+    int killed = 0;
+    if (::Process32First(snap, &pe)) {
+        do {
+            if (wn_game_image_matches(pe.szExeFile, exeName)) {
+                HANDLE h = ::OpenProcess(PROCESS_TERMINATE, FALSE, pe.th32ProcessID);
+                if (h) {
+                    if (::TerminateProcess(h, 0)) killed++;
+                    ::CloseHandle(h);
+                }
+            }
+        } while (::Process32Next(snap, &pe));
+    }
+    ::CloseHandle(snap);
+    return killed;
+}
+
+int count_processes_by_name(const char* exeName) {
+    if (!exeName || !exeName[0]) return 0;
+    HANDLE snap = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snap == INVALID_HANDLE_VALUE) return 0;
+    PROCESSENTRY32 pe;
+    pe.dwSize = sizeof(pe);
+    int n = 0;
+    if (::Process32First(snap, &pe)) {
+        do {
+            if (wn_game_image_matches(pe.szExeFile, exeName)) n++;
+        } while (::Process32Next(snap, &pe));
+    }
+    ::CloseHandle(snap);
+    return n;
+}
+
+std::vector<DWORD> g_close_pids;
+
+BOOL CALLBACK close_enum_proc(HWND hwnd, LPARAM lp) {
+    DWORD pid = 0;
+    ::GetWindowThreadProcessId(hwnd, &pid);
+    for (DWORD p : g_close_pids) {
+        if (p == pid) {
+            ::PostMessageA(hwnd, WM_CLOSE, 0, 0);
+            break;
+        }
+    }
+    return TRUE;
+}
+
+int graceful_close_game(const char* exeName) {
+    g_close_pids.clear();
+    HANDLE snap = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snap != INVALID_HANDLE_VALUE) {
+        PROCESSENTRY32 pe;
+        pe.dwSize = sizeof(pe);
+        if (::Process32First(snap, &pe)) {
+            do {
+                if (wn_game_image_matches(pe.szExeFile, exeName)) {
+                    g_close_pids.push_back(pe.th32ProcessID);
+                }
+            } while (::Process32Next(snap, &pe));
+        }
+        ::CloseHandle(snap);
+    }
+    if (!g_close_pids.empty()) {
+        ::EnumWindows(close_enum_proc, 0);
+    }
+    return (int) g_close_pids.size();
+}
+
+void (*g_log_fn)(const char* line) = nullptr;
+
+std::atomic<bool> g_armed{false};
+std::atomic<bool> g_done{false};
+std::atomic<bool> g_teardown_complete{false};
+std::atomic<bool> g_watch_run{false};
+
+constexpr const char* kSentinelPath = "C:\\wn-launcher.shutdown";
+
+void wn_log(const char* msg) {
+    char line[512];
+    std::snprintf(line, sizeof(line), "[wn-launcher] %s", msg);
+
+    if (g_log_fn) {
+        g_log_fn(line);
+        return;
+    }
+    if (g_log_path[0] == '\0') return;
+    FILE* f = std::fopen(g_log_path, "a");
+    if (!f) return;
+    std::fprintf(f, "%s\n", line);
+    std::fclose(f);
+}
+
+void teardown(const char* reason) {
+    bool expected = false;
+    if (!g_done.compare_exchange_strong(expected, true)) return;
+
+    char buf[256];
+    std::snprintf(buf, sizeof(buf),
+                  "clean-shutdown teardown begin (reason=%s pipe=%d user=%d)",
+                  reason ? reason : "?", g_pipe, g_user);
+    wn_log(buf);
+
+    if (g_game_exe[0] && g_pipe != 0) {
+        int targeted = graceful_close_game(g_game_exe);
+        if (targeted == 0) {
+            wn_log("game already exited — skipping graceful-close wait");
+        } else {
+            std::snprintf(buf, sizeof(buf),
+                          "graceful close \"%s\" (WM_CLOSE to %d game process(es)); "
+                          "waiting for clean SteamAPI_Shutdown", g_game_exe, targeted);
+            wn_log(buf);
+
+            const int kMaxWaitMs = 3000;
+            int waited = 0;
+            while (waited < kMaxWaitMs && count_processes_by_name(g_game_exe) > 0) {
+                if (g_bgetcallback && g_freelastcallback) {
+                    char cb[64];
+                    while (g_bgetcallback(g_pipe, cb)) g_freelastcallback(g_pipe);
+                }
+                ::Sleep(100);
+                waited += 100;
+            }
+            bool gone = count_processes_by_name(g_game_exe) == 0;
+            if (gone) {
+                std::snprintf(buf, sizeof(buf),
+                              "game \"%s\" exited gracefully after %dms — steamclient "
+                              "should have emitted games-played([])", g_game_exe, waited);
+                wn_log(buf);
+            } else {
+                int killed = kill_processes_by_name(g_game_exe);
+                std::snprintf(buf, sizeof(buf),
+                              "game \"%s\" ignored WM_CLOSE for %dms — hard-killed %d "
+                              "(games-played reap may be delayed)",
+                              g_game_exe, waited, killed);
+                wn_log(buf);
+            }
+            if (g_bgetcallback && g_freelastcallback) {
+                char cb[64];
+                for (int i = 0; i < 4; ++i) {
+                    while (g_bgetcallback(g_pipe, cb)) g_freelastcallback(g_pipe);
+                    ::Sleep(100);
+                }
+            } else {
+                ::Sleep(400);
+            }
+            wn_log("games-played reap window elapsed");
+        }
+    }
+
+    if (g_cs_engine && g_cs_appId != 0) {
+        wn_launcher_cloud_sync(g_cs_engine, g_cs_hUser, g_cs_hPipe, g_cs_appId, 2, 4, 15000);
+    }
+
+    if (g_logoff && g_user != 0 && g_pipe != 0) {
+        g_logoff(g_pipe, g_user);
+        wn_log("Steam_LogOff sent");
+
+        const int kMinMs = 300, kMaxMs = 700, kStepMs = 100;
+        int waited = 0;
+        bool loggedOff = false;
+        while (waited < kMaxMs) {
+            ::Sleep(kStepMs);
+            waited += kStepMs;
+            if (g_bloggedon && !g_bloggedon(g_pipe, g_user)) {
+                loggedOff = true;
+                if (waited >= kMinMs) break;
+            }
+        }
+        std::snprintf(buf, sizeof(buf),
+                      "logoff flush wait done (%dms, BLoggedOn=%s)",
+                      waited, loggedOff ? "false(logged-off)" : "true/unknown");
+        wn_log(buf);
+    }
+    if (g_release_user && g_user != 0 && g_pipe != 0) {
+        g_release_user(g_pipe, g_user);
+        wn_log("Steam_ReleaseUser done");
+    }
+    if (g_release_pipe && g_pipe != 0) {
+        bool ok = g_release_pipe(g_pipe);
+        std::snprintf(buf, sizeof(buf), "Steam_BReleaseSteamPipe -> %d", ok ? 1 : 0);
+        wn_log(buf);
+    }
+
+    wn_log("clean logoff complete");
+
+    ::DeleteFileA(kSentinelPath);
+
+    g_teardown_complete.store(true);
+}
+
+BOOL WINAPI ctrl_handler(DWORD type) {
+    switch (type) {
+        case CTRL_CLOSE_EVENT:
+        case CTRL_LOGOFF_EVENT:
+        case CTRL_SHUTDOWN_EVENT:
+        case CTRL_C_EVENT:
+        case CTRL_BREAK_EVENT:
+            teardown("console-ctrl");
+            return TRUE;
+        default:
+            return FALSE;
+    }
+}
+
+void watch_loop() {
+    while (g_watch_run.load()) {
+        if (::GetFileAttributesA(kSentinelPath) != INVALID_FILE_ATTRIBUTES) {
+            teardown("sentinel");
+            g_watch_run.store(false);
+            ::ExitProcess(0);
+            return;
+        }
+        ::Sleep(150);
+    }
+}
+
+}
+
+extern "C" void wn_launcher_set_log_sink(void (*log_fn)(const char* line)) {
+    g_log_fn = log_fn;
+}
+
+extern "C" void wn_launcher_set_game_exe(const char* exeName) {
+    if (exeName && exeName[0]) {
+        std::snprintf(g_game_exe, sizeof(g_game_exe), "%s", exeName);
+    } else {
+        g_game_exe[0] = '\0';
+    }
+}
+
+extern "C" void wn_launcher_arm_clean_shutdown(void* hSteamClient, int pipe,
+                                               int user, const char* logPath) {
+    bool expected = false;
+    if (!g_armed.compare_exchange_strong(expected, true)) return;
+
+    g_pipe = pipe;
+    g_user = user;
+    if (logPath && logPath[0]) {
+        std::snprintf(g_log_path, sizeof(g_log_path), "%s", logPath);
+    }
+
+    HMODULE h = reinterpret_cast<HMODULE>(hSteamClient);
+    if (h) {
+        g_logoff = reinterpret_cast<Steam_LogOff_fn>(
+            ::GetProcAddress(h, "Steam_LogOff"));
+        g_release_user = reinterpret_cast<Steam_ReleaseUser_fn>(
+            ::GetProcAddress(h, "Steam_ReleaseUser"));
+        g_release_pipe = reinterpret_cast<Steam_BReleaseSteamPipe_fn>(
+            ::GetProcAddress(h, "Steam_BReleaseSteamPipe"));
+        g_bloggedon = reinterpret_cast<Steam_BLoggedOn_fn>(
+            ::GetProcAddress(h, "Steam_BLoggedOn"));
+        g_bgetcallback = reinterpret_cast<Steam_BGetCallback_fn>(
+            ::GetProcAddress(h, "Steam_BGetCallback"));
+        g_freelastcallback = reinterpret_cast<Steam_FreeLastCallback_fn>(
+            ::GetProcAddress(h, "Steam_FreeLastCallback"));
+    }
+
+    char buf[256];
+    std::snprintf(buf, sizeof(buf),
+                  "clean-shutdown armed (pipe=%d user=%d logoff=%p releaseUser=%p "
+                  "releasePipe=%p bLoggedOn=%p sentinel=%s)",
+                  pipe, user, reinterpret_cast<void*>(g_logoff),
+                  reinterpret_cast<void*>(g_release_user),
+                  reinterpret_cast<void*>(g_release_pipe),
+                  reinterpret_cast<void*>(g_bloggedon), kSentinelPath);
+    wn_log(buf);
+
+    ::SetConsoleCtrlHandler(ctrl_handler, TRUE);
+
+    ::DeleteFileA(kSentinelPath);
+
+    g_watch_run.store(true);
+    std::thread(watch_loop).detach();
+}
+
+extern "C" void wn_launcher_set_cloud_context(void* engine, int hUser, int hPipe,
+                                              unsigned int appId) {
+    g_cs_engine = engine;
+    g_cs_hUser = hUser;
+    g_cs_hPipe = hPipe;
+    g_cs_appId = appId;
+}
+
+extern "C" int wn_launcher_cloud_sync(void* engine, int hUser, int hPipe,
+                                      unsigned int appId, int cmd, int flags, int timeoutMs) {
+    if (!engine || appId == 0) return -1;
+    void** engine_vt = *reinterpret_cast<void***>(engine);
+    void* getRsP = engine_vt[kVtEngine_GetIClientRemoteStorage / 8];
+    if (!cs_is_exec_ptr(getRsP)) {
+        wn_log("[wn-launcher] cloud: GetIClientRemoteStorage slot not executable — skipping sync");
+        return -1;
+    }
+    using GetRsFn = void* (*)(void*, int, int);
+    void* rs = reinterpret_cast<GetRsFn>(getRsP)(engine, hUser, hPipe);
+    if (!rs) {
+        wn_log("[wn-launcher] cloud: IClientRemoteStorage null — skipping sync");
+        return -1;
+    }
+    void** rs_vt = *reinterpret_cast<void***>(rs);
+    void* beginP  = rs_vt[kVtRS_BeginAppSync / 8];
+    void* inProgP = rs_vt[kVtRS_IsAppSyncInProgress / 8];
+    void* stateP  = rs_vt[kVtRS_GetSyncState / 8];
+    if (!cs_is_exec_ptr(beginP) || !cs_is_exec_ptr(inProgP) || !cs_is_exec_ptr(stateP)) {
+        wn_log("[wn-launcher] cloud: RemoteStorage slot(s) not executable — skipping sync");
+        return -1;
+    }
+    using BeginFn  = bool (*)(void*, unsigned int, int, int);
+    using InProgFn = bool (*)(void*, unsigned int);
+    using StateFn  = int  (*)(void*, unsigned int);
+
+    char buf[176];
+    int finalState = -1;
+    for (int attempt = 1; attempt <= 3; ++attempt) {
+        bool started = reinterpret_cast<BeginFn>(beginP)(rs, appId, cmd, flags);
+        std::snprintf(buf, sizeof(buf),
+            "[wn-launcher] cloud: BeginAppSync(app=%u cmd=%d flags=%d) attempt %d -> %d",
+            appId, cmd, flags, attempt, started ? 1 : 0);
+        wn_log(buf);
+        int waited = 0;
+        while (reinterpret_cast<InProgFn>(inProgP)(rs, appId) && waited < timeoutMs) {
+            if (g_bgetcallback && g_freelastcallback) {
+                char cb[64];
+                while (g_bgetcallback(g_pipe, cb)) g_freelastcallback(g_pipe);
+            }
+            ::Sleep(10);
+            waited += 10;
+        }
+        finalState = reinterpret_cast<StateFn>(stateP)(rs, appId);
+        std::snprintf(buf, sizeof(buf),
+            "[wn-launcher] cloud: sync settled (state=%d after %dms)", finalState, waited);
+        wn_log(buf);
+        if (finalState == 1 || finalState == 0 || finalState == 6) break;
+    }
+    if (finalState == 6) {
+        wn_log("[wn-launcher] cloud: CONFLICT (state 6) — not auto-resolving; leaving saves intact");
+    }
+    return finalState;
+}
+
+extern "C" void wn_launcher_clean_shutdown_now(const char* reason) {
+    teardown(reason ? reason : "explicit");
+}
+
+extern "C" void wn_launcher_wait_clean_shutdown(int maxMs) {
+    int waited = 0;
+    while (g_done.load() && !g_teardown_complete.load() && waited < maxMs) {
+        ::Sleep(50);
+        waited += 50;
+    }
+}
diff --git a/app/src/main/cpp/wn-steam-launcher/clean_shutdown.h b/app/src/main/cpp/wn-steam-launcher/clean_shutdown.h
new file mode 100644
index 000000000..b1c76d4f4
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-launcher/clean_shutdown.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void wn_launcher_set_log_sink(void (*log_fn)(const char* line));
+
+void wn_launcher_set_game_exe(const char* exeName);
+
+void wn_launcher_arm_clean_shutdown(void* hSteamClient, int pipe, int user,
+                                    const char* logPath);
+
+void wn_launcher_set_cloud_context(void* engine, int hUser, int hPipe, unsigned int appId);
+
+int wn_launcher_cloud_sync(void* engine, int hUser, int hPipe,
+                           unsigned int appId, int cmd, int flags, int timeoutMs);
+
+void wn_launcher_clean_shutdown_now(const char* reason);
+
+void wn_launcher_wait_clean_shutdown(int maxMs);
+
+#ifdef __cplusplus
+}
+
+#include <string.h>
+
+inline bool wn_game_image_matches(const char* procName, const char* gameExe) {
+    if (!procName || !gameExe || !gameExe[0]) return false;
+    if (_stricmp(procName, gameExe) == 0) return true;
+    static const char* const kSteamlessSuffixes[] = { ".original.exe", ".unpacked.exe" };
+    size_t glen = strlen(gameExe);
+    for (const char* suf : kSteamlessSuffixes) {
+        size_t slen = strlen(suf);
+        if (glen > slen && _stricmp(gameExe + (glen - slen), suf) == 0) {
+            char base[260];
+            size_t blen = glen - slen;
+            if (blen >= sizeof(base)) blen = sizeof(base) - 1;
+            memcpy(base, gameExe, blen);
+            base[blen] = '\0';
+            return _stricmp(procName, base) == 0;
+        }
+    }
+    return false;
+}
+#endif
diff --git a/app/src/main/cpp/wn-steam-launcher/src/main.cpp b/app/src/main/cpp/wn-steam-launcher/src/main.cpp
new file mode 100644
index 000000000..2b6445701
--- /dev/null
+++ b/app/src/main/cpp/wn-steam-launcher/src/main.cpp
@@ -0,0 +1,1560 @@
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include "clean_shutdown.h"
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+#include <tlhelp32.h>
+#include <filesystem>
+#include <string>
+#include <vector>
+
+#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
+#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
+#endif
+#ifndef LOAD_LIBRARY_SEARCH_DEFAULT_DIRS
+#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x00001000
+#endif
+#ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
+#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100
+#endif
+#ifndef LOAD_IGNORE_CODE_AUTHZ_LEVEL
+#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 0x00000010
+#endif
+
+#ifdef __i386__
+#define WN_THISCALL __thiscall
+#else
+#define WN_THISCALL
+#endif
+
+static const int kVtEngine_GetIClientUser   = 0x40;  // IClientEngine slot 8
+static const int kVtUser_LogOn              = 0x08;  // slot  1: EResult LogOn(uint64 steamID)
+static const int kVtUser_BLoggedOn          = 0x20;  // slot  4: bool BLoggedOn()
+static const int kVtUser_GetSteamID         = 0x50;  // slot 10: CSteamID& GetSteamID(CSteamID& out)
+static const int kVtUser_BHasCachedCreds    = 0x188; // slot 49: bool BHasCachedCredentials(const char*)
+static const int kVtUser_SetLoginToken      = 0x1C0; // slot 56: EResult SetLoginToken(const char* token, const char* account)
+
+static const int kVtEngine_GetIClientAppManager = 0x158; // IClientEngine slot 43
+static const int kVtAppMgr_LaunchApp            = 0x10;  // IClientAppManager slot 2
+static const int kVtAppMgr_RefreshAppInfo       = 0x298; // void RefreshAppInfo()
+static const int kVtAppMgr_GetAppInstallState   = 0x20;  // int  GetAppInstallState(AppId_t)
+
+static const int kVtEngine_GetIClientApps       = 0x88;  // slot 17: IClientApps*(hUser, hPipe)
+static const int kVtApps_RequestAppInfoUpdate   = 0x38;  // slot 7:  bool(AppId_t* ids, int n)
+
+static const int kVtEngine_GetIClientUtils       = 0x70;  // slot 14: IClientUtils*(HSteamPipe)
+static const int kVtUtils_IsAPICallCompleted     = 0xB0;  // slot 22: bool(apiCall, *pbFailed)
+static const int kVtUtils_GetAPICallFailureReason = 0xB8; // slot 23: int(apiCall)  ESteamAPICallFailure
+static const int kVtUtils_GetAPICallResult       = 0xC0;  // slot 24: bool(apiCall, pCb, cubCb, iCbExpected, *pbFailed)
+
+static const int kLaunchAppResultCallbackId    = 0x13610B;
+static const int kLaunchAppResultSize          = 0x20C;
+static const int kLaunchResultErrorOffset      = 0x8;     // int32 EAppUpdateError
+
+typedef void* (*CreateInterfaceFn)(const char* version, int* returnCode);
+typedef int   (*Steam_CreateGlobalUser_fn)(int* pipe_out);
+typedef bool  (*Steam_BLoggedOn_fn)(int pipe, int user);
+typedef bool  (*Steam_BGetCallback_fn)(int pipe, void* cb);
+typedef void  (*Steam_FreeLastCallback_fn)(int pipe);
+typedef void  (*Breakpad_SteamSetAppID_fn)(unsigned app_id);
+
+static FILE* g_logFile = NULL;
+
+static void open_log(void) {
+    if (g_logFile) return;
+    g_logFile = fopen("C:\\wn-launcher.log", "w");
+    if (g_logFile) setvbuf(g_logFile, NULL, _IONBF, 0);
+}
+
+static void log_line(const char* fmt, ...) {
+    char buf[1024];
+    va_list ap;
+    va_start(ap, fmt);
+    int n = vsnprintf(buf, sizeof(buf) - 2, fmt, ap);
+    va_end(ap);
+    if (n < 0) n = 0;
+    if (n > (int)sizeof(buf) - 2) n = (int)sizeof(buf) - 2;
+    buf[n] = '\n';
+    buf[n + 1] = '\0';
+    fputs(buf, stderr);
+    OutputDebugStringA(buf);
+    if (g_logFile) {
+        fputs(buf, g_logFile);
+    } else {
+        FILE* lf = fopen("C:\\wn-launcher.log", "a");
+        if (lf) { fputs(buf, lf); fclose(lf); }
+    }
+}
+
+// Route clean_shutdown.cpp's [wn-launcher] markers through our single log handle;
+// a separate fopen() there gets clobbered by our next write, dropping the markers
+// the Android close path keys off.
+static void clean_shutdown_log_sink(const char* line) {
+    if (line) log_line("%s", line);
+}
+
+static uint64_t env_u64(const char* name) {
+    const char* v = getenv(name);
+    if (!v || !*v) return 0;
+    return (uint64_t) _strtoui64(v, NULL, 10);
+}
+
+static int b64url_val(unsigned char c) {
+    if (c >= 'A' && c <= 'Z') return c - 'A';
+    if (c >= 'a' && c <= 'z') return c - 'a' + 26;
+    if (c >= '0' && c <= '9') return c - '0' + 52;
+    if (c == '-') return 62;
+    if (c == '_') return 63;
+    return -1;
+}
+
+static void log_token_claims(const char* token) {
+    if (!token || !*token) { log_line("[wn-launcher] token: (empty)"); return; }
+    const char* dot1 = strchr(token, '.');
+    if (!dot1) { log_line("[wn-launcher] token: not a JWT (no '.')"); return; }
+    const char* dot2 = strchr(dot1 + 1, '.');
+    if (!dot2) { log_line("[wn-launcher] token: not a JWT (one '.')"); return; }
+    size_t seglen = (size_t)(dot2 - (dot1 + 1));
+    if (seglen == 0 || seglen > 2000) {
+        log_line("[wn-launcher] token: payload segment size unusable (%zu)", seglen);
+        return;
+    }
+    char out[1536];
+    size_t op = 0;
+    uint32_t acc = 0;
+    int bits = 0;
+    for (size_t i = 0; i < seglen && op < sizeof(out) - 1; ++i) {
+        unsigned char c = (unsigned char) (dot1 + 1)[i];
+        int v = b64url_val(c);
+        if (v < 0) continue;
+        acc = (acc << 6) | (uint32_t) v;
+        bits += 6;
+        if (bits >= 8) {
+            bits -= 8;
+            out[op++] = (char)((acc >> bits) & 0xFF);
+        }
+    }
+    out[op] = '\0';
+    log_line("[wn-launcher] token JWT payload: %s", out);
+}
+
+static void seed_active_process_registry(uint32_t our_pid, uint32_t steam_account_id) {
+    HKEY h = NULL;
+    LONG rc = RegCreateKeyExA(HKEY_CURRENT_USER,
+            "Software\\Valve\\Steam\\ActiveProcess",
+            0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &h, NULL);
+    if (rc != ERROR_SUCCESS) {
+        log_line("[wn-launcher] RegCreateKeyEx(ActiveProcess) failed rc=%ld", rc);
+        return;
+    }
+    const char* clientDll   = "C:\\Program Files (x86)\\Steam\\steamclient.dll";
+    const char* clientDll64 = "C:\\Program Files (x86)\\Steam\\steamclient64.dll";
+    const char* installPath = "C:\\Program Files (x86)\\Steam";
+    DWORD universe = 1;  // k_EUniversePublic
+    DWORD pid_dw = (DWORD) our_pid;
+    DWORD active_user = (DWORD) steam_account_id;
+    RegSetValueExA(h, "SteamClientDll",   0, REG_SZ, (const BYTE*) clientDll,   (DWORD) strlen(clientDll)   + 1);
+    RegSetValueExA(h, "SteamClientDll64", 0, REG_SZ, (const BYTE*) clientDll64, (DWORD) strlen(clientDll64) + 1);
+    RegSetValueExA(h, "Universe",         0, REG_DWORD, (const BYTE*) &universe, sizeof(universe));
+    RegSetValueExA(h, "pid",              0, REG_DWORD, (const BYTE*) &pid_dw,   sizeof(pid_dw));
+    RegSetValueExA(h, "ActiveUser",       0, REG_DWORD, (const BYTE*) &active_user, sizeof(active_user));
+    RegCloseKey(h);
+
+    const char* appIdStr = getenv("WN_STEAM_APPID");
+    if (appIdStr && *appIdStr) {
+        char keyPath[256];
+        snprintf(keyPath, sizeof(keyPath),
+                 "Software\\Valve\\Steam\\Apps\\%s", appIdStr);
+        HKEY h2 = NULL;
+        if (RegCreateKeyExA(HKEY_CURRENT_USER, keyPath, 0, NULL,
+                            REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &h2, NULL) == ERROR_SUCCESS) {
+            DWORD one = 1;
+            DWORD zero = 0;
+            RegSetValueExA(h2, "Installed", 0, REG_DWORD, (const BYTE*) &one,  sizeof(one));
+            RegSetValueExA(h2, "Running",   0, REG_DWORD, (const BYTE*) &one,  sizeof(one));
+            RegSetValueExA(h2, "Updating",  0, REG_DWORD, (const BYTE*) &zero, sizeof(zero));
+            RegCloseKey(h2);
+        }
+    }
+    {
+        const char* steamFwd  = "c:/program files (x86)/steam";
+        const char* steamExe  = "c:/program files (x86)/steam/steam.exe";
+        const char* steamBack = "C:\\Program Files (x86)\\Steam";
+        HKEY hk = NULL;
+        if (RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Valve\\Steam", 0, NULL,
+                REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hk, NULL) == ERROR_SUCCESS) {
+            RegSetValueExA(hk, "SteamPath", 0, REG_SZ,
+                           (const BYTE*) steamFwd, (DWORD) strlen(steamFwd) + 1);
+            RegSetValueExA(hk, "SteamExe",  0, REG_SZ,
+                           (const BYTE*) steamExe, (DWORD) strlen(steamExe) + 1);
+            RegCloseKey(hk);
+        }
+        HKEY hm = NULL;
+        if (RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Valve\\Steam", 0, NULL,
+                REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hm, NULL) == ERROR_SUCCESS) {
+            RegSetValueExA(hm, "InstallPath", 0, REG_SZ,
+                           (const BYTE*) steamBack, (DWORD) strlen(steamBack) + 1);
+            RegSetValueExA(hm, "SteamPath",   0, REG_SZ,
+                           (const BYTE*) steamFwd,  (DWORD) strlen(steamFwd) + 1);
+            RegCloseKey(hm);
+        }
+        SetEnvironmentVariableA("SteamPath", steamBack);
+    }
+
+    log_line("[wn-launcher] HKCU ActiveProcess + Steam install registry seeded "
+             "(pid=%u, activeUser=%u, SteamPath set)",
+             our_pid, steam_account_id);
+}
+
+static void stage_steam_config(void) {
+    const char* cfgDir = "C:\\Program Files (x86)\\Steam\\config";
+    CreateDirectoryA(cfgDir, NULL);
+    const char* files[2] = {
+        "C:\\Program Files (x86)\\Steam\\config\\config.vdf",
+        "C:\\Program Files (x86)\\Steam\\config\\local.vdf",
+    };
+    for (int i = 0; i < 2; ++i) {
+        DWORD attr = GetFileAttributesA(files[i]);
+        if (attr == INVALID_FILE_ATTRIBUTES) {
+            HANDLE h = CreateFileA(files[i], GENERIC_WRITE, 0, NULL,
+                                   CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+            if (h != INVALID_HANDLE_VALUE) {
+                CloseHandle(h);
+                log_line("[wn-launcher] staged empty %s", files[i]);
+            }
+        }
+    }
+}
+
+// Escape a free-text value for a VDF/ACF quoted field: double backslashes, then
+// escape quotes and newlines. Mirrors the Kotlin escapeString() so the C++ and
+// Kotlin manifest paths produce identical, well-formed output.
+static std::string vdf_escape(const char* s) {
+    std::string out;
+    if (!s) return out;
+    for (const char* p = s; *p; ++p) {
+        switch (*p) {
+            case '\\': out += "\\\\"; break;
+            case '"':  out += "\\\""; break;
+            case '\n': out += "\\n"; break;
+            case '\r': out += "\\r"; break;
+            default:   out += *p; break;
+        }
+    }
+    return out;
+}
+
+static void stage_app_manifest(uint32_t appId, const char* gameExe) {
+    if (appId == 0 || !gameExe) return;
+    const char* marker = "\\steamapps\\common\\";
+    size_t mlen = strlen(marker);
+    const char* hit = NULL;
+    for (const char* s = gameExe; *s; ++s) {
+        if (_strnicmp(s, marker, mlen) == 0) { hit = s; break; }
+    }
+    if (!hit) {
+        log_line("[wn-launcher] app manifest: game not under steamapps\\common "
+                 "— skipping (LaunchApp may report not-installed)");
+        return;
+    }
+    const char* dirStart = hit + mlen;
+    const char* dirEnd = strchr(dirStart, '\\');
+    if (!dirEnd || dirEnd == dirStart) return;
+    char installdir[260];
+    size_t n = (size_t)(dirEnd - dirStart);
+    if (n >= sizeof(installdir)) return;
+    memcpy(installdir, dirStart, n);
+    installdir[n] = '\0';
+
+    CreateDirectoryA("C:\\Program Files (x86)\\Steam\\steamapps", NULL);
+    char acf[MAX_PATH];
+    snprintf(acf, sizeof(acf),
+             "C:\\Program Files (x86)\\Steam\\steamapps\\appmanifest_%u.acf",
+             appId);
+    const char* owner = getenv("WN_STEAM_STEAMID");
+    const char* depotsEnv = getenv("WN_STEAM_DEPOTS");
+    const char* sharedEnv = getenv("WN_STEAM_SHARED_DEPOTS");
+    const char* appName = getenv("WN_STEAM_APP_NAME");
+    const char* installScriptsEnv = getenv("WN_STEAM_INSTALL_SCRIPTS");
+    const char* language = getenv("WN_STEAM_LANGUAGE");
+    const char* buildIdStr = getenv("WN_STEAM_BUILD_ID");
+    const char* sizeOnDiskStr = getenv("WN_STEAM_SIZE_ON_DISK");
+    const char* bytesToDownloadStr = getenv("WN_STEAM_BYTES_TO_DOWNLOAD");
+    const char* bytesToStageStr = getenv("WN_STEAM_BYTES_TO_STAGE");
+    if (!appName || !*appName) appName = installdir;
+    if (!language || !*language) language = "english";
+    unsigned long long buildId = (buildIdStr && *buildIdStr) ? strtoull(buildIdStr, NULL, 10) : 0ULL;
+    unsigned long long sizeOnDisk = (sizeOnDiskStr && *sizeOnDiskStr) ? strtoull(sizeOnDiskStr, NULL, 10) : 0ULL;
+    unsigned long long bytesToDownload = (bytesToDownloadStr && *bytesToDownloadStr) ? strtoull(bytesToDownloadStr, NULL, 10) : 0ULL;
+    unsigned long long bytesToStage = (bytesToStageStr && *bytesToStageStr) ? strtoull(bytesToStageStr, NULL, 10) : 0ULL;
+    FILE* f = fopen(acf, "w");
+    if (!f) {
+        log_line("[wn-launcher] app manifest: fopen(%s) failed", acf);
+        return;
+    }
+    std::string nameEsc = vdf_escape(appName);
+    std::string installdirEsc = vdf_escape(installdir);
+    std::string languageEsc = vdf_escape(language);
+    fprintf(f,
+            "\"AppState\"\n"
+            "{\n"
+            "\t\"appid\"\t\t\"%u\"\n"
+            "\t\"universe\"\t\t\"1\"\n"
+            "\t\"LauncherPath\"\t\t\"C:\\\\Program Files (x86)\\\\Steam\\\\steam.exe\"\n"
+            "\t\"name\"\t\t\"%s\"\n"
+            "\t\"StateFlags\"\t\t\"4\"\n"
+            "\t\"installdir\"\t\t\"%s\"\n"
+            "\t\"LastUpdated\"\t\t\"%llu\"\n"
+            "\t\"LastPlayed\"\t\t\"0\"\n"
+            "\t\"SizeOnDisk\"\t\t\"%llu\"\n"
+            "\t\"StagingSize\"\t\t\"0\"\n"
+            "\t\"buildid\"\t\t\"%llu\"\n"
+            "\t\"LastOwner\"\t\t\"%s\"\n"
+            "\t\"DownloadType\"\t\t\"1\"\n"
+            "\t\"UpdateResult\"\t\t\"0\"\n"
+            "\t\"BytesToDownload\"\t\t\"%llu\"\n"
+            "\t\"BytesDownloaded\"\t\t\"%llu\"\n"
+            "\t\"BytesToStage\"\t\t\"%llu\"\n"
+            "\t\"BytesStaged\"\t\t\"%llu\"\n"
+            "\t\"TargetBuildID\"\t\t\"%llu\"\n"
+            "\t\"AutoUpdateBehavior\"\t\t\"0\"\n"
+            "\t\"AllowOtherDownloadsWhileRunning\"\t\t\"0\"\n"
+            "\t\"ScheduledAutoUpdate\"\t\t\"0\"\n",
+            appId, nameEsc.c_str(), installdirEsc.c_str(),
+            (unsigned long long)time(NULL),
+            sizeOnDisk, buildId,
+            (owner && *owner) ? owner : "0",
+            bytesToDownload, bytesToDownload,
+            bytesToStage, bytesToStage, buildId);
+    // Write InstalledDepots with depot data from WN_STEAM_DEPOTS env var.
+    // Format: depotId:manifestGid:size[:dlcAppId],...
+    if (depotsEnv && *depotsEnv) {
+        fprintf(f, "\t\"InstalledDepots\"\n\t{\n");
+        std::vector<char> buf(strlen(depotsEnv) + 1);
+        memcpy(buf.data(), depotsEnv, buf.size());
+        char* token = strtok(buf.data(), ",");
+        while (token) {
+            // Parse depotId:manifestGid:size[:dlcAppId]
+            char* colon1 = strchr(token, ':');
+            if (!colon1) { token = strtok(NULL, ","); continue; }
+            *colon1 = '\0';
+            const char* depotIdStr = token;
+            char* manifestStart = colon1 + 1;
+            char* colon2 = strchr(manifestStart, ':');
+            if (!colon2) { token = strtok(NULL, ","); continue; }
+            *colon2 = '\0';
+            const char* manifestStr = manifestStart;
+            char* sizeStart = colon2 + 1;
+            char* colon3 = strchr(sizeStart, ':');
+            const char* sizeStr, *dlcAppIdStr;
+            if (colon3) {
+                *colon3 = '\0';
+                sizeStr = sizeStart;
+                dlcAppIdStr = colon3 + 1;
+            } else {
+                sizeStr = sizeStart;
+                dlcAppIdStr = NULL;
+            }
+            fprintf(f, "\t\t\"%s\"\n\t\t{\n"
+                       "\t\t\t\"manifest\"\t\t\"%s\"\n"
+                       "\t\t\t\"size\"\t\t\"%s\"\n",
+                    depotIdStr, manifestStr, sizeStr);
+            if (dlcAppIdStr && *dlcAppIdStr) {
+                fprintf(f, "\t\t\t\"dlcappid\"\t\t\"%s\"\n", dlcAppIdStr);
+            }
+            fprintf(f, "\t\t}\n");
+            token = strtok(NULL, ",");
+        }
+        fprintf(f, "\t}\n");
+    } else {
+        fprintf(f, "\t\"InstalledDepots\"\n\t{\n\t}\n");
+    }
+    // Write InstallScripts from WN_STEAM_INSTALL_SCRIPTS env var.
+    // Format: depotId:scriptFilename,...
+    if (installScriptsEnv && *installScriptsEnv) {
+        fprintf(f, "\t\"InstallScripts\"\n\t{\n");
+        std::vector<char> isbuf(strlen(installScriptsEnv) + 1);
+        memcpy(isbuf.data(), installScriptsEnv, isbuf.size());
+        char* istoken = strtok(isbuf.data(), ",");
+        while (istoken) {
+            char* iscolon = strchr(istoken, ':');
+            if (!iscolon) { istoken = strtok(NULL, ","); continue; }
+            *iscolon = '\0';
+            std::string scriptEsc = vdf_escape(iscolon + 1);
+            fprintf(f, "\t\t\"%s\"\t\t\"%s\"\n", istoken, scriptEsc.c_str());
+            istoken = strtok(NULL, ",");
+        }
+        fprintf(f, "\t}\n");
+    }
+    // Write SharedDepots from WN_STEAM_SHARED_DEPOTS env var.
+    // Format: sourceDepotId:targetAppId,...
+    if (sharedEnv && *sharedEnv) {
+        fprintf(f, "\t\"SharedDepots\"\n\t{\n");
+        std::vector<char> sbuf(strlen(sharedEnv) + 1);
+        memcpy(sbuf.data(), sharedEnv, sbuf.size());
+        char* stoken = strtok(sbuf.data(), ",");
+        while (stoken) {
+            char* scolon = strchr(stoken, ':');
+            if (!scolon) { stoken = strtok(NULL, ","); continue; }
+            *scolon = '\0';
+            fprintf(f, "\t\t\"%s\"\t\t\"%s\"\n", stoken, scolon + 1);
+            stoken = strtok(NULL, ",");
+        }
+        fprintf(f, "\t}\n");
+    }
+    fprintf(f,
+            "\t\"UserConfig\"\n"
+            "\t{\n"
+            "\t\t\"language\"\t\t\"%s\"\n"
+            "\t}\n"
+            "\t\"MountedConfig\"\n"
+            "\t{\n"
+            "\t\t\"language\"\t\t\"%s\"\n"
+            "\t}\n"
+            "}\n",
+            languageEsc.c_str(), languageEsc.c_str());
+    fclose(f);
+    log_line("[wn-launcher] app manifest staged: %s (installdir=\"%s\", "
+             "depots=%s shared=%s scripts=%s)",
+             acf, installdir,
+             depotsEnv && *depotsEnv ? depotsEnv : "(none)",
+             sharedEnv && *sharedEnv ? sharedEnv : "(none)",
+             installScriptsEnv && *installScriptsEnv ? installScriptsEnv : "(none)");
+}
+
+// Counts running game processes (matches LaunchApp's canonical name or the literal
+// fallback name via wn_game_image_matches).
+static int count_game_processes(const char* exeName) {
+    HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snap == INVALID_HANDLE_VALUE) return -1;
+    PROCESSENTRY32 pe;
+    pe.dwSize = sizeof(pe);
+    int count = 0;
+    if (Process32First(snap, &pe)) {
+        do {
+            if (wn_game_image_matches(pe.szExeFile, exeName)) count++;
+        } while (Process32Next(snap, &pe));
+    }
+    CloseHandle(snap);
+    return count;
+}
+
+// Direct launch when LaunchApp dispatches cleanly but never spawns the game (no
+// real Steam UI/reaper under Wine to consume the request). Safe vs AlreadyRunning
+// because the clean-shutdown arm reaps the CM session on exit. Logs the "game
+// process started pid=" marker WnLauncherStatusTailer treats as launch-complete.
+static bool create_process_game(const char* gameExe, const char* exeName) {
+    char cwd[MAX_PATH];
+    snprintf(cwd, sizeof(cwd), "%s", gameExe);
+    char* slash = strrchr(cwd, '\\');
+    if (slash) *slash = '\0'; else cwd[0] = '\0';
+
+    char cmd[MAX_PATH + 8];
+    snprintf(cmd, sizeof(cmd), "\"%s\"", gameExe);
+
+    STARTUPINFOA si;
+    memset(&si, 0, sizeof(si));
+    si.cb = sizeof(si);
+    PROCESS_INFORMATION pi;
+    memset(&pi, 0, sizeof(pi));
+
+    // Inherit our env (SteamAppId etc.) so the game's SteamAPI_Init attaches to
+    // our logged-on steamclient session.
+    BOOL ok = CreateProcessA(gameExe, cmd, NULL, NULL, FALSE,
+                             0, NULL, cwd[0] ? cwd : NULL, &si, &pi);
+    if (!ok) {
+        log_line("[wn-launcher] CreateProcess fallback FAILED for \"%s\" (GLE=%lu)",
+                 exeName, GetLastError());
+        return false;
+    }
+    log_line("[wn-launcher] game process started pid=%lu via CreateProcess "
+             "fallback (\"%s\")", (unsigned long) pi.dwProcessId, exeName);
+    if (pi.hThread) CloseHandle(pi.hThread);
+    if (pi.hProcess) CloseHandle(pi.hProcess);
+    return true;
+}
+
+static void dump_loaded_modules(const char* when) {
+    HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32,
+                                           GetCurrentProcessId());
+    if (snap == INVALID_HANDLE_VALUE) {
+        log_line("[wn-launcher] modules(%s): CreateToolhelp32Snapshot failed GLE=%lu",
+                 when, GetLastError());
+        return;
+    }
+    MODULEENTRY32 me;
+    me.dwSize = sizeof(me);
+    int n = 0;
+    if (Module32First(snap, &me)) {
+        do {
+            log_line("[wn-launcher] modules(%s): base=%p size=0x%lx name=%s path=%s",
+                     when, me.modBaseAddr, (unsigned long) me.modBaseSize,
+                     me.szModule, me.szExePath);
+            n++;
+        } while (Module32Next(snap, &me));
+    }
+    log_line("[wn-launcher] modules(%s): total=%d", when, n);
+    CloseHandle(snap);
+}
+
+static LONG WINAPI launcher_unhandled_filter(EXCEPTION_POINTERS* info) {
+    if (!info || !info->ExceptionRecord) return EXCEPTION_EXECUTE_HANDLER;
+    const EXCEPTION_RECORD* er = info->ExceptionRecord;
+    void* ip = er->ExceptionAddress;
+
+    char modName[MAX_PATH] = {0};
+    HMODULE faultMod = NULL;
+    if (GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+                           | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                           (LPCSTR)ip, &faultMod)) {
+        GetModuleFileNameA(faultMod, modName, sizeof(modName));
+    }
+
+    char bytes[3 * 16 + 1] = {0};
+    {
+        MEMORY_BASIC_INFORMATION mbi;
+        if (VirtualQuery(ip, &mbi, sizeof(mbi)) && mbi.State == MEM_COMMIT) {
+            const unsigned char* p = (const unsigned char*)ip;
+            int hp = 0;
+            for (int i = 0; i < 16 && hp + 3 < (int)sizeof(bytes); ++i) {
+                hp += snprintf(bytes + hp, sizeof(bytes) - hp, "%02x ", p[i]);
+            }
+        }
+    }
+
+    log_line("[wn-launcher] UEF: tid=%lu pid=%lu exc=0x%lx at %p mod='%s' bytes=%s",
+             (unsigned long) GetCurrentThreadId(),
+             (unsigned long) GetCurrentProcessId(),
+             er->ExceptionCode, ip, modName[0] ? modName : "(unknown)", bytes);
+    if (er->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && er->NumberParameters >= 2) {
+        const char* op = (er->ExceptionInformation[0] == 0) ? "read"
+                       : (er->ExceptionInformation[0] == 1) ? "write"
+                       : (er->ExceptionInformation[0] == 8) ? "DEP" : "?";
+        log_line("[wn-launcher] UEF: AV %s fault_addr=0x%llx",
+                 op, (unsigned long long) er->ExceptionInformation[1]);
+    }
+
+    {
+        MEMORY_BASIC_INFORMATION mbi;
+        if (VirtualQuery(ip, &mbi, sizeof(mbi))) {
+            log_line("[wn-launcher] UEF: page base=%p size=0x%llx state=0x%lx "
+                     "protect=0x%lx alloc_protect=0x%lx type=0x%lx",
+                     mbi.BaseAddress, (unsigned long long) mbi.RegionSize,
+                     mbi.State, mbi.Protect, mbi.AllocationProtect, mbi.Type);
+        }
+    }
+
+    if (info->ContextRecord) {
+        const CONTEXT* c = info->ContextRecord;
+        log_line("[wn-launcher] UEF: ctx Rip=%llx Rsp=%llx Rbp=%llx",
+                 (unsigned long long) c->Rip,
+                 (unsigned long long) c->Rsp,
+                 (unsigned long long) c->Rbp);
+        log_line("[wn-launcher] UEF: ctx Rax=%llx Rcx=%llx Rdx=%llx Rbx=%llx",
+                 (unsigned long long) c->Rax, (unsigned long long) c->Rcx,
+                 (unsigned long long) c->Rdx, (unsigned long long) c->Rbx);
+        log_line("[wn-launcher] UEF: ctx Rsi=%llx Rdi=%llx R8=%llx R9=%llx",
+                 (unsigned long long) c->Rsi, (unsigned long long) c->Rdi,
+                 (unsigned long long) c->R8,  (unsigned long long) c->R9);
+        const uint64_t* sp = (const uint64_t*) c->Rsp;
+        MEMORY_BASIC_INFORMATION smbi;
+        if (sp && VirtualQuery((LPCVOID) sp, &smbi, sizeof(smbi))
+            && smbi.State == MEM_COMMIT) {
+            char chain[256]; int p = 0;
+            for (int i = 0; i < 8; ++i) {
+                p += snprintf(chain + p, sizeof(chain) - p, "%llx ",
+                              (unsigned long long) sp[i]);
+            }
+            log_line("[wn-launcher] UEF: stack[0..7]=%s", chain);
+        }
+    }
+
+    dump_loaded_modules("UEF");
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+
+static bool start_steam_client_service(void) {
+    const char* kSvcName       = "Steam Client Service";
+    const char* kSvcExe        = "C:\\Program Files (x86)\\Steam\\bin\\steamservice.exe";
+    const char* kSvcBinPath    = "\"C:\\Program Files (x86)\\Steam\\bin\\steamservice.exe\" /RunAsService";
+
+    DWORD attr = GetFileAttributesA(kSvcExe);
+    if (attr == INVALID_FILE_ATTRIBUTES || (attr & FILE_ATTRIBUTE_DIRECTORY)) {
+        log_line("[wn-launcher] steamservice: binary not present at %s — "
+                 "LaunchApp's IPC queue will have no peer; will use "
+                 "CreateProcess fallback", kSvcExe);
+        return false;
+    }
+    log_line("[wn-launcher] steamservice: found %s", kSvcExe);
+
+    SC_HANDLE scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+    if (!scm) {
+        log_line("[wn-launcher] steamservice: OpenSCManager failed GLE=%lu",
+                 GetLastError());
+        return false;
+    }
+
+    SC_HANDLE svc = OpenServiceA(scm, kSvcName, SERVICE_ALL_ACCESS);
+    if (!svc) {
+        DWORD err = GetLastError();
+        if (err == ERROR_SERVICE_DOES_NOT_EXIST) {
+            log_line("[wn-launcher] steamservice: service missing — "
+                     "installing as \"%s\"", kSvcName);
+            svc = CreateServiceA(
+                scm, kSvcName, kSvcName,
+                SERVICE_ALL_ACCESS,
+                SERVICE_WIN32_OWN_PROCESS,
+                SERVICE_DEMAND_START,
+                SERVICE_ERROR_NORMAL,
+                kSvcBinPath,
+                NULL, NULL, NULL, NULL, NULL);
+            if (!svc) {
+                log_line("[wn-launcher] steamservice: CreateService failed GLE=%lu",
+                         GetLastError());
+                CloseServiceHandle(scm);
+                return false;
+            }
+            log_line("[wn-launcher] steamservice: service installed");
+        } else {
+            log_line("[wn-launcher] steamservice: OpenService failed GLE=%lu", err);
+            CloseServiceHandle(scm);
+            return false;
+        }
+    }
+
+    SERVICE_STATUS status;
+    memset(&status, 0, sizeof(status));
+    QueryServiceStatus(svc, &status);
+    log_line("[wn-launcher] steamservice: pre-start state=%lu", status.dwCurrentState);
+
+    if (status.dwCurrentState != SERVICE_RUNNING) {
+        if (!StartServiceA(svc, 0, NULL)) {
+            DWORD err = GetLastError();
+            if (err != ERROR_SERVICE_ALREADY_RUNNING) {
+                log_line("[wn-launcher] steamservice: StartService failed GLE=%lu",
+                         err);
+                CloseServiceHandle(svc);
+                CloseServiceHandle(scm);
+                return false;
+            }
+        }
+        int waited = 0;
+        while (waited < 30000) {
+            if (!QueryServiceStatus(svc, &status)) break;
+            if (status.dwCurrentState == SERVICE_RUNNING ||
+                status.dwCurrentState == SERVICE_STOPPED) break;
+            Sleep(200);
+            waited += 200;
+        }
+        log_line("[wn-launcher] steamservice: post-start state=%lu after %dms",
+                 status.dwCurrentState, waited);
+    }
+
+    bool running = (status.dwCurrentState == SERVICE_RUNNING);
+    CloseServiceHandle(svc);
+    CloseServiceHandle(scm);
+    return running;
+}
+
+static bool is_exec_ptr(void* p) {
+    if (!p) return false;
+    MEMORY_BASIC_INFORMATION mbi;
+    if (VirtualQuery(p, &mbi, sizeof(mbi)) == 0) return false;
+    if (mbi.State != MEM_COMMIT) return false;
+    DWORD x = mbi.Protect & 0xFF;
+    return x == PAGE_EXECUTE || x == PAGE_EXECUTE_READ ||
+           x == PAGE_EXECUTE_READWRITE || x == PAGE_EXECUTE_WRITECOPY;
+}
+
+static const char* kRedistsMarkerPath = "C:\\wn-installed-redists.txt";
+
+enum class RedistInstallResult {
+    SKIPPED = 0,
+    INSTALLED = 1,
+    FAILED = 2,
+    TIMED_OUT = 3,
+};
+
+static bool is_known_redist_installer(const std::filesystem::path& p) {
+    if (!std::filesystem::is_regular_file(p)) return false;
+    std::string name = p.filename().string();
+    std::string ext  = p.extension().string();
+    for (char& c : name) c = (char) std::tolower((unsigned char) c);
+    for (char& c : ext)  c = (char) std::tolower((unsigned char) c);
+    if (ext != ".exe" && ext != ".msi") return false;
+    return name.find("vcredist") != std::string::npos ||
+           name.find("vc_redist") != std::string::npos ||
+           name.find("dxsetup") != std::string::npos ||
+           name.find("directx") != std::string::npos ||
+           name.find("physx") != std::string::npos ||
+           name.find("oalinst") != std::string::npos ||
+           name.find("openal") != std::string::npos ||
+           name.find("dotnet") != std::string::npos ||
+           name.find("ndp") != std::string::npos ||
+           name.find("xna") != std::string::npos ||
+           name.find("ue4prereq") != std::string::npos ||
+           name.find("prereq") != std::string::npos ||
+           name.find("redist") != std::string::npos;
+}
+
+static std::vector<std::filesystem::path> collect_redist_installers(const std::filesystem::path& gameExePath) {
+    std::vector<std::filesystem::path> out;
+    try {
+        auto root = gameExePath.parent_path();
+        if (root.empty()) return out;
+        const std::vector<std::string> hotDirs = {
+            "redist", "redists", "_redist", "redistributables", "installer",
+            "installers", "support", "prereq", "prereqs", "commonredist",
+        };
+        for (auto it = std::filesystem::recursive_directory_iterator(root,
+                     std::filesystem::directory_options::skip_permission_denied);
+             it != std::filesystem::recursive_directory_iterator(); ++it) {
+            const auto& p = it->path();
+            if (it->is_directory()) {
+                std::string lower = p.filename().string();
+                for (char& c : lower) c = (char) std::tolower((unsigned char) c);
+                bool keep = false;
+                for (const auto& needle : hotDirs) {
+                    if (lower.find(needle) != std::string::npos) { keep = true; break; }
+                }
+                if (!keep && p.parent_path() != root) {
+                    it.disable_recursion_pending();
+                }
+                continue;
+            }
+            if (is_known_redist_installer(p)) out.push_back(p);
+        }
+    } catch (...) {}
+    return out;
+}
+
+static bool marker_has_path(const std::string& line) {
+    DWORD attr = GetFileAttributesA(line.c_str());
+    return attr != INVALID_FILE_ATTRIBUTES;
+}
+
+static bool load_installed_redists(std::vector<std::string>& lines) {
+    FILE* f = fopen(kRedistsMarkerPath, "r");
+    if (!f) return false;
+    char buf[MAX_PATH * 4];
+    while (fgets(buf, sizeof(buf), f)) {
+        size_t n = strlen(buf);
+        while (n && (buf[n - 1] == '\n' || buf[n - 1] == '\r')) buf[--n] = '\0';
+        if (n) lines.emplace_back(buf);
+    }
+    fclose(f);
+    return true;
+}
+
+static bool save_installed_redists(const std::vector<std::string>& lines) {
+    FILE* f = fopen(kRedistsMarkerPath, "w");
+    if (!f) return false;
+    for (const auto& line : lines) fprintf(f, "%s\n", line.c_str());
+    fclose(f);
+    return true;
+}
+
+static bool marker_contains(const std::vector<std::string>& lines, const std::string& path) {
+    for (const auto& line : lines) {
+        if (_stricmp(line.c_str(), path.c_str()) == 0) return true;
+    }
+    return false;
+}
+
+static std::string redist_silent_args(const std::filesystem::path& installer) {
+    std::string name = installer.filename().string();
+    std::string ext  = installer.extension().string();
+    for (char& c : name) c = (char) std::tolower((unsigned char) c);
+    for (char& c : ext)  c = (char) std::tolower((unsigned char) c);
+    if (ext == ".msi") return " /qn /norestart";
+    if (name.find("dxsetup") != std::string::npos) return " /silent";
+    if (name.find("ue4prereq") != std::string::npos) return " /quiet /norestart";
+    if (name.find("physx") != std::string::npos) return " /quiet /norestart";
+    return " /quiet /norestart";
+}
+
+static RedistInstallResult run_redist_installer(const std::filesystem::path& installer,
+                                                DWORD* outExitCode) {
+    std::string cmd = "\"" + installer.string() + "\"" + redist_silent_args(installer);
+    std::vector<char> cmdVec(cmd.begin(), cmd.end());
+    cmdVec.push_back('\0');
+
+    STARTUPINFOA si = {};
+    si.cb = sizeof(si);
+    si.dwFlags = STARTF_USESHOWWINDOW;
+    si.wShowWindow = SW_HIDE;
+    PROCESS_INFORMATION pi = {};
+    std::string cwdStr = installer.parent_path().string();
+    if (!CreateProcessA(
+            installer.string().c_str(),
+            cmdVec.data(),
+            nullptr, nullptr, FALSE,
+            CREATE_NO_WINDOW,
+            nullptr,
+            cwdStr.empty() ? nullptr : cwdStr.c_str(),
+            &si, &pi)) {
+        log_line("[wn-launcher] redist install: CreateProcess failed for %s "
+                  "(GLE=%lu)",
+                  installer.string().c_str(), GetLastError());
+        if (outExitCode) *outExitCode = 0xFFFFFFFFu;
+        return RedistInstallResult::FAILED;
+    }
+
+    constexpr DWORD kPerInstallerTimeoutMs = 90 * 1000;
+    DWORD waitResult = WaitForSingleObject(pi.hProcess, kPerInstallerTimeoutMs);
+    DWORD exitCode = ~0u;
+    bool timedOut = false;
+    if (waitResult == WAIT_OBJECT_0) {
+        GetExitCodeProcess(pi.hProcess, &exitCode);
+    } else {
+        log_line("[wn-launcher] redist install: %s — 90s timeout (silent "
+                 "installer hung?)",
+                 installer.filename().string().c_str());
+        TerminateProcess(pi.hProcess, 1);
+        WaitForSingleObject(pi.hProcess, 5000);
+        timedOut = true;
+        exitCode = 0xFFFFFFFEu;
+    }
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+    if (outExitCode) *outExitCode = exitCode;
+    if (timedOut) return RedistInstallResult::TIMED_OUT;
+    return (exitCode == 0 || exitCode == 3010) ? RedistInstallResult::INSTALLED
+                                               : RedistInstallResult::FAILED;
+}
+
+static void scan_and_install_redists(const char* gameExe) {
+    if (!gameExe || !*gameExe) return;
+    std::filesystem::path gamePath(gameExe);
+    auto installers = collect_redist_installers(gamePath);
+    if (installers.empty()) {
+        log_line("[wn-launcher] redist scan: none found");
+        return;
+    }
+
+    std::vector<std::string> marker;
+    load_installed_redists(marker);
+
+    int installed = 0, skipped = 0, failedMarked = 0, timedOut = 0;
+    for (const auto& installer : installers) {
+        std::string abs = installer.string();
+        if (marker_contains(marker, abs)) {
+            skipped++;
+            continue;
+        }
+        DWORD exitCode = 0;
+        log_line("[wn-launcher] redist install: %s%s",
+                 installer.filename().string().c_str(),
+                 redist_silent_args(installer).c_str());
+        RedistInstallResult rc = run_redist_installer(installer, &exitCode);
+        if (rc == RedistInstallResult::INSTALLED) {
+            marker.push_back(abs);
+            installed++;
+            log_line("[wn-launcher] redist install: %s OK exit=%lu",
+                     installer.filename().string().c_str(),
+                     (unsigned long) exitCode);
+        } else if (rc == RedistInstallResult::TIMED_OUT) {
+            marker.push_back(abs);
+            timedOut++;
+            log_line("[wn-launcher] redist install: %s timed out — marking done "
+                     "to avoid repeat hangs", installer.filename().string().c_str());
+        } else {
+            if (exitCode == 1638 || exitCode == 1603 || exitCode == 5100) {
+                marker.push_back(abs);
+                failedMarked++;
+                log_line("[wn-launcher] redist install: %s exit=%lu — marking "
+                         "done (already installed / not applicable)",
+                         installer.filename().string().c_str(),
+                         (unsigned long) exitCode);
+            } else {
+                log_line("[wn-launcher] redist install: %s FAILED exit=%lu",
+                         installer.filename().string().c_str(),
+                         (unsigned long) exitCode);
+            }
+        }
+    }
+    save_installed_redists(marker);
+    log_line("[wn-launcher] redist scan done: installed %d, skipped %d, "
+             "failed-marked %d, timed-out-unmarked %d (of %zu total)",
+             installed, skipped, failedMarked, timedOut, installers.size());
+}
+
+int main(int argc, char** argv) {
+    setbuf(stderr, NULL);
+    setbuf(stdout, NULL);
+    open_log();
+    wn_launcher_set_log_sink(clean_shutdown_log_sink);
+    log_line("[wn-launcher] Steam Launcher in-process Steam launcher starting (pid=%lu tid=%lu)",
+             (unsigned long) GetCurrentProcessId(),
+             (unsigned long) GetCurrentThreadId());
+
+    const char* appIdStr = getenv("WN_STEAM_APPID");
+    const char* user     = getenv("WN_STEAM_USERNAME");
+    const char* token    = getenv("WN_STEAM_TOKEN");
+    uint64_t    steamId  = env_u64("WN_STEAM_STEAMID");
+    const char* gameExe  = (argc > 1) ? argv[1] : NULL;
+    uint32_t    appId    = appIdStr ? (uint32_t) strtoul(appIdStr, NULL, 10) : 0;
+
+    log_line("[wn-launcher] env appId=%u steamId=%llu user=%s exe=%s",
+             appId,
+             (unsigned long long) steamId,
+             user ? user : "(null)",
+             gameExe ? gameExe : "(null)");
+    if (token && *token) {
+        size_t tokenLen = strlen(token);
+        log_line("[wn-launcher] token len=%zu prefix=%.*s suffix=%.*s",
+                 tokenLen, tokenLen > 16 ? 16 : (int) tokenLen, token,
+                 tokenLen > 12 ? 12 : (int) tokenLen,
+                 tokenLen > 12 ? token + tokenLen - 12 : token);
+        log_token_claims(token);
+    } else {
+        log_line("[wn-launcher] token missing");
+    }
+    if (argc <= 1 || !gameExe || !*gameExe) {
+        log_line("[wn-launcher] no game exe passed on argv[1]");
+        return 1;
+    }
+
+    const char* kSteamDir = "C:\\Program Files (x86)\\Steam";
+    SetDllDirectoryA(kSteamDir);
+    SetCurrentDirectoryA(kSteamDir);
+    SetEnvironmentVariableA("SteamPath", kSteamDir);
+    SetEnvironmentVariableA("SteamGameId", appIdStr ? appIdStr : "0");
+    SetEnvironmentVariableA("SteamAppId",  appIdStr ? appIdStr : "0");
+    SetEnvironmentVariableA("SteamUser",   user ? user : "");
+    SetEnvironmentVariableA("Steam3Master", "127.0.0.1:27036");
+    SetEnvironmentVariableA("SteamClientLaunch", "1");
+    SetEnvironmentVariableA("SteamNoOverlayUIDrawing", "1");
+
+    CreateDirectoryA("C:\\Program Files (x86)", NULL);
+    CreateDirectoryA(kSteamDir, NULL);
+
+    stage_steam_config();
+    seed_active_process_registry(GetCurrentProcessId(), (uint32_t)(steamId & 0xFFFFFFFFu));
+    stage_app_manifest(appId, gameExe);
+
+    const char* preloadDlls[] = {
+        "tier0_s64.dll",
+        "vstdlib_s64.dll",
+        "crashhandler64.dll",
+        "steamservice.dll",
+    };
+    for (const char* dll : preloadDlls) {
+        char path[MAX_PATH];
+        snprintf(path, sizeof(path), "%s\\%s", kSteamDir, dll);
+        HMODULE dm = LoadLibraryExA(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+        if (dm) {
+            log_line("[wn-launcher] preload %s: ok (%p)", dll, dm);
+        } else {
+            log_line("[wn-launcher] preload %s: FAIL GLE=%lu", dll, GetLastError());
+        }
+    }
+
+    log_line("[wn-launcher] preloads done; installing unhandled-exception filter");
+    LPTOP_LEVEL_EXCEPTION_FILTER prevFilter =
+        SetUnhandledExceptionFilter(launcher_unhandled_filter);
+    log_line("[wn-launcher] UEF installed (prev=%p)", prevFilter);
+    dump_loaded_modules("pre-LoadLibrary");
+
+    char steamclientPath[MAX_PATH];
+    snprintf(steamclientPath, sizeof(steamclientPath),
+             "%s\\steamclient64.dll", kSteamDir);
+
+    struct LoadAttempt { DWORD flags; const char* desc; };
+    const LoadAttempt attempts[] = {
+        { LOAD_WITH_ALTERED_SEARCH_PATH, "LOAD_WITH_ALTERED_SEARCH_PATH" },
+        { LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS,
+          "DLL_LOAD_DIR|DEFAULT_DIRS" },
+        { LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32,
+          "DLL_LOAD_DIR|SYSTEM32" },
+        { LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_WITH_ALTERED_SEARCH_PATH,
+          "IGNORE_CODE_AUTHZ|ALTERED_SEARCH_PATH" },
+    };
+
+    const int kAttempts = (int)(sizeof(attempts) / sizeof(attempts[0]));
+    HMODULE lsc = NULL;
+    DWORD lastErr = 0;
+    for (int i = 0; i < kAttempts && !lsc; i++) {
+        lsc = LoadLibraryExA(steamclientPath, NULL, attempts[i].flags);
+        if (lsc) {
+            log_line("[wn-launcher] steamclient64.dll loaded at %p "
+                     "(strategy %d/%d: %s)",
+                     lsc, i + 1, kAttempts, attempts[i].desc);
+            break;
+        }
+        lastErr = GetLastError();
+        log_line("[wn-launcher] steamclient64.dll load fail strategy %d/%d (%s) "
+                 "GLE=%lu",
+                 i + 1, kAttempts, attempts[i].desc, lastErr);
+        Sleep(50);
+    }
+    for (int round = 0; round < 3 && !lsc; round++) {
+        log_line("[wn-launcher] steamclient64.dll cold-start retry "
+                 "round %d/3 after 500ms", round + 1);
+        Sleep(500);
+        for (int i = 0; i < kAttempts && !lsc; i++) {
+            lsc = LoadLibraryExA(steamclientPath, NULL, attempts[i].flags);
+            if (!lsc) lastErr = GetLastError();
+        }
+        if (lsc) {
+            log_line("[wn-launcher] steamclient64.dll loaded at %p "
+                     "(retry round %d)", lsc, round + 1);
+        }
+    }
+    if (!lsc) {
+        lsc = LoadLibraryA(steamclientPath);
+        if (lsc) {
+            log_line("[wn-launcher] steamclient64.dll loaded at %p "
+                     "(plain LoadLibraryA)", lsc);
+        } else {
+            lastErr = GetLastError();
+        }
+    }
+    if (!lsc) {
+        HMODULE probe = LoadLibraryExA(steamclientPath, NULL,
+                                        LOAD_LIBRARY_AS_DATAFILE);
+        if (probe) {
+            log_line("[wn-launcher] diag: DATAFILE load OK — file is "
+                     "well-formed; failure is in DllMain/runtime init");
+        } else {
+            log_line("[wn-launcher] diag: DATAFILE load also FAILED, GLE=%lu",
+                     GetLastError());
+        }
+        log_line("[wn-launcher] LoadLibrary(%s) FAILED after all strategies, "
+                 "last GLE=%lu", steamclientPath, lastErr);
+        return 2;
+    }
+
+    CreateInterfaceFn createInterface =
+        (CreateInterfaceFn) GetProcAddress(lsc, "CreateInterface");
+    Steam_CreateGlobalUser_fn createGlobalUser =
+        (Steam_CreateGlobalUser_fn) GetProcAddress(lsc, "Steam_CreateGlobalUser");
+    Steam_BLoggedOn_fn bLoggedOn =
+        (Steam_BLoggedOn_fn) GetProcAddress(lsc, "Steam_BLoggedOn");
+    Steam_BGetCallback_fn bGetCallback =
+        (Steam_BGetCallback_fn) GetProcAddress(lsc, "Steam_BGetCallback");
+    Steam_FreeLastCallback_fn freeLastCallback =
+        (Steam_FreeLastCallback_fn) GetProcAddress(lsc, "Steam_FreeLastCallback");
+    Breakpad_SteamSetAppID_fn breakpadSetAppId =
+        (Breakpad_SteamSetAppID_fn) GetProcAddress(lsc, "Breakpad_SteamSetAppID");
+
+    log_line("[wn-launcher] exports CreateInterface=%p CreateGlobalUser=%p "
+             "BLoggedOn=%p BGetCallback=%p FreeLastCallback=%p Breakpad=%p",
+             (void*) createInterface, (void*) createGlobalUser, (void*) bLoggedOn,
+             (void*) bGetCallback, (void*) freeLastCallback, (void*) breakpadSetAppId);
+
+    if (!createInterface || !createGlobalUser) {
+        log_line("[wn-launcher] required steamclient exports missing");
+        return 3;
+    }
+
+    if (breakpadSetAppId && appId != 0) {
+        breakpadSetAppId(appId);
+        log_line("[wn-launcher] Breakpad_SteamSetAppID(%u)", appId);
+    }
+
+    int retCode = 0;
+    void* engine = createInterface("CLIENTENGINE_INTERFACE_VERSION005", &retCode);
+    log_line("[wn-launcher] CreateInterface(CLIENTENGINE_INTERFACE_VERSION005) -> %p rc=%d",
+             engine, retCode);
+    if (!engine) {
+        engine = createInterface("CLIENTENGINE_INTERFACE_VERSION004", &retCode);
+        log_line("[wn-launcher] CreateInterface(CLIENTENGINE_INTERFACE_VERSION004) -> %p rc=%d",
+                 engine, retCode);
+    }
+    if (!engine) {
+        log_line("[wn-launcher] failed to acquire IClientEngine");
+        return 4;
+    }
+
+    int pipe = 0;
+    int hUser = createGlobalUser(&pipe);
+    log_line("[wn-launcher] Steam_CreateGlobalUser -> pipe=%d user=%d",
+             pipe, hUser);
+    if (pipe == 0 || hUser == 0) {
+        log_line("[wn-launcher] invalid pipe/user from Steam_CreateGlobalUser");
+        return 5;
+    }
+
+    if (user && *user && token && *token && steamId != 0) {
+        void** engine_vt = *(void***) engine;
+        typedef void* (WN_THISCALL *GetIClientUserFn)(void* self, int hUser, int hPipe, const char*);
+        GetIClientUserFn getIClientUser = (GetIClientUserFn)
+            engine_vt[kVtEngine_GetIClientUser / 8];
+        void* iuser = getIClientUser(engine, hUser, pipe, "CLIENTUSER_INTERFACE_VERSION001");
+        log_line("[wn-launcher] IClientEngine.GetIClientUser -> %p", iuser);
+        if (iuser) {
+            void** iuser_vt = *(void***) iuser;
+            if (is_exec_ptr(iuser_vt[kVtUser_BHasCachedCreds / 8])) {
+                typedef bool (WN_THISCALL *HasCachedCredsFn)(void* self, const char*);
+                HasCachedCredsFn hasCachedCreds = (HasCachedCredsFn)
+                    iuser_vt[kVtUser_BHasCachedCreds / 8];
+                bool cached = hasCachedCreds(iuser, user);
+                log_line("[wn-launcher] BHasCachedCredentials(%s) -> %d", user, cached ? 1 : 0);
+            }
+            if (is_exec_ptr(iuser_vt[kVtUser_SetLoginToken / 8])) {
+                typedef int (WN_THISCALL *SetLoginTokenFn)(void* self, const char* token,
+                                               const char* account);
+                SetLoginTokenFn setLoginToken = (SetLoginTokenFn)
+                    iuser_vt[kVtUser_SetLoginToken / 8];
+                int tokRc = setLoginToken(iuser, token, user);
+                log_line("[wn-launcher] SetLoginToken(tokenLen=%d, account=%s) -> %d",
+                         (int) strlen(token), user, tokRc);
+
+                typedef void* (WN_THISCALL *GetSteamIDFn)(void* self, void* outBuf);
+                GetSteamIDFn getSteamID = (GetSteamIDFn)
+                    iuser_vt[kVtUser_GetSteamID / 8];
+                uint64_t outSid = 0;
+                void* sidRet = getSteamID(iuser, &outSid);
+                uint64_t logonSid = outSid;
+                if (logonSid == 0 && sidRet) logonSid = *(uint64_t*) sidRet;
+                if (logonSid == 0) {
+                    logonSid = steamId;  // fall back to the env-supplied SteamID
+                    log_line("[wn-launcher] GetSteamID returned 0 — falling back "
+                             "to env steamId=%llu", (unsigned long long) steamId);
+                } else {
+                    log_line("[wn-launcher] GetSteamID -> %llu (env steamId=%llu)",
+                             (unsigned long long) logonSid,
+                             (unsigned long long) steamId);
+                }
+
+                typedef int (WN_THISCALL *LogOnFn)(void* self, uint64_t steamID);
+                LogOnFn logOn = (LogOnFn) iuser_vt[kVtUser_LogOn / 8];
+                int logonRc = logOn(iuser, logonSid);
+                log_line("[wn-launcher] LogOn(%llu) -> EResult=%d "
+                         "(1=OK 5=InvalidPassword 15=AccessDenied 16=Timeout 84=RateLimit)",
+                         (unsigned long long) logonSid, logonRc);
+                if (logonRc == 15) {
+                    log_line("[wn-launcher] WARNING: LogOn returned AccessDenied "
+                             "synchronously — credentials rejected pre-network");
+                }
+            }
+        }
+    } else {
+        log_line("[wn-launcher] no creds — skipping refresh-token logon "
+                 "(game may run in offline / no-auth mode)");
+    }
+
+    bool loggedOn = false;
+    bool cleanShutdownArmed = false;
+    bool sawConnected = false, sawConnFail = false;
+    int  connFailEResult = 0;
+    int  polls = 0;
+    if (bLoggedOn) {
+        const int kMaxPolls = 600;  // 600 * 100ms = 60s
+        char cbBuf[64] = {0};
+        for (; polls < kMaxPolls; ++polls) {
+            if (bGetCallback && freeLastCallback) {
+                while (bGetCallback(pipe, cbBuf)) {
+                    int cbId = *(int*)(cbBuf + 4);
+                    void* param = *(void**)(cbBuf + 8);
+                    if (cbId == 101) {
+                        sawConnected = true;
+                        log_line("[wn-launcher] callback 101 SteamServersConnected");
+                    } else if (cbId == 102) {
+                        sawConnFail = true;
+                        int er = param ? *(int*)param : -1;
+                        connFailEResult = er;
+                        log_line("[wn-launcher] callback 102 SteamServerConnectFailure "
+                                 "EResult=%d (3=NoConnection 5=InvalidPassword "
+                                 "15=AccessDenied 16=Timeout 84=RateLimit)", er);
+                    } else if (cbId == 103) {
+                        int er = param ? *(int*)param : -1;
+                        log_line("[wn-launcher] callback 103 SteamServersDisconnected "
+                                 "EResult=%d", er);
+                    } else {
+                        log_line("[wn-launcher] callback id=%d drained", cbId);
+                    }
+                    freeLastCallback(pipe);
+                }
+            }
+            if (bLoggedOn(pipe, hUser)) {
+                loggedOn = true;
+                log_line("[wn-launcher] Steam_BLoggedOn=true after %dx100ms",
+                         polls + 1);
+                wn_launcher_arm_clean_shutdown(lsc, pipe, hUser, "C:\\wn-launcher.log");
+                cleanShutdownArmed = true;
+                break;
+            }
+            if (sawConnFail && (connFailEResult == 5 ||
+                                connFailEResult == 15 ||
+                                connFailEResult == 84)) {
+                log_line("[wn-launcher] hard auth failure (EResult=%d) — "
+                         "skipping remaining logon wait", connFailEResult);
+                break;
+            }
+            Sleep(100);
+        }
+    }
+    if (!loggedOn) {
+        log_line("[wn-launcher] WARNING: Steam_BLoggedOn not true after %dx100ms "
+                 "(sawConnected=%d sawConnFail=%d) — proceeding with game launch "
+                 "anyway (game may end up in offline mode)",
+                 polls, sawConnected ? 1 : 0, sawConnFail ? 1 : 0);
+    }
+
+    if (loggedOn && engine && appId != 0) {
+        void** engine_vt = *(void***) engine;
+        typedef void* (WN_THISCALL *GetIClientAppsFn)(void* self, int hUser, int hPipe);
+        GetIClientAppsFn getApps = (GetIClientAppsFn)
+            engine_vt[kVtEngine_GetIClientApps / 8];
+        void* iApps = getApps(engine, hUser, pipe);
+        log_line("[wn-launcher] IClientEngine.GetIClientApps -> %p", iApps);
+        if (iApps) {
+            void** apps_vt = *(void***) iApps;
+            void* reqP = apps_vt[kVtApps_RequestAppInfoUpdate / 8];
+            if (!is_exec_ptr(reqP)) {
+                log_line("[wn-launcher] RequestAppInfoUpdate slot not executable — "
+                         "skipping appinfo refresh");
+            } else {
+                typedef bool (WN_THISCALL *RequestAppInfoUpdateFn)(void* self,
+                                                       uint32_t* appIds, int count);
+                RequestAppInfoUpdateFn reqInfo = (RequestAppInfoUpdateFn) reqP;
+                uint32_t appIds[1] = { appId };
+                bool reqRc = reqInfo(iApps, appIds, 1);
+                log_line("[wn-launcher] RequestAppInfoUpdate(appId=%u) -> %d",
+                         appId, reqRc ? 1 : 0);
+                // 1.5s for PICS appinfo to land (else LaunchApp -> MissingConfig);
+                // short is safe — the dispatch below retries on MissingConfig.
+                bool appInfoDone = false;
+                int  waited = 0;
+                for (int i = 0; i < 15 && !appInfoDone; ++i) {
+                    if (bGetCallback && freeLastCallback) {
+                        char cb[64];
+                        while (bGetCallback(pipe, cb)) {
+                            if (*(int*)(cb + 4) == 1003) appInfoDone = true;
+                            freeLastCallback(pipe);
+                        }
+                    }
+                    if (!appInfoDone) { Sleep(100); waited += 100; }
+                }
+                log_line("[wn-launcher] AppInfoUpdateComplete_t %s after %dms",
+                         appInfoDone ? "received" : "NOT received", waited);
+            }
+        }
+    }
+
+    if (loggedOn && engine && appId != 0) {
+        void** engine_vt = *(void***) engine;
+        typedef void* (WN_THISCALL *GetIfaceFn)(void* self, int hUser, int hPipe);
+        void* appMgr = ((GetIfaceFn) engine_vt[kVtEngine_GetIClientAppManager / 8])
+                           (engine, hUser, pipe);
+        log_line("[wn-launcher] readiness: IClientAppManager=%p", appMgr);
+
+        if (appMgr) {
+            void** am_vt = *(void***) appMgr;
+            void* refreshP = am_vt[kVtAppMgr_RefreshAppInfo / 8];
+            void* stateP   = am_vt[kVtAppMgr_GetAppInstallState / 8];
+            if (is_exec_ptr(refreshP)) {
+                typedef void (WN_THISCALL *RefreshAppInfoFn)(void* self);
+                ((RefreshAppInfoFn) refreshP)(appMgr);
+                log_line("[wn-launcher] RefreshAppInfo() called");
+            }
+            if (is_exec_ptr(stateP)) {
+                typedef int (WN_THISCALL *GetAppInstallStateFn)(void* self, uint32_t app);
+                GetAppInstallStateFn getInstallState = (GetAppInstallStateFn) stateP;
+                // 2s — stage_app_manifest already wrote StateFlags=4, so this
+                // usually returns FullyInstalled at once; loop absorbs a slow re-parse.
+                int st = 0;
+                for (int i = 0; i < 20; ++i) {
+                    st = getInstallState(appMgr, appId);
+                    if (st & 4) break;
+                    if (bGetCallback && freeLastCallback) {
+                        char cb[64];
+                        while (bGetCallback(pipe, cb)) freeLastCallback(pipe);
+                    }
+                    Sleep(100);
+                }
+                log_line("[wn-launcher] GetAppInstallState(appId=%u) = 0x%x (%s)",
+                         appId, st,
+                         (st & 4) ? "FullyInstalled"
+                                  : "NOT installed — LaunchApp may no-op");
+            }
+        }
+    }
+
+    scan_and_install_redists(gameExe);
+
+    bool svcRunning = start_steam_client_service();
+    log_line("[wn-launcher] steamservice running: %d", svcRunning ? 1 : 0);
+
+    const char* exeName = strrchr(gameExe, '\\');
+    exeName = exeName ? exeName + 1 : gameExe;
+
+    // Teardown stops the game before logoff — that exit emits games-played([]),
+    // which reaps the session and prevents AlreadyRunning next launch (logoff
+    // alone doesn't clear it).
+    wn_launcher_set_game_exe(exeName);
+
+    // Pull cloud saves + set the teardown cloud context now, so the exit upload
+    // has a baseline to diff.
+    if (loggedOn && engine && appId != 0) {
+        wn_launcher_set_cloud_context(engine, hUser, pipe, appId);
+        wn_launcher_cloud_sync(engine, hUser, pipe, appId, 1, 0, 15000);
+    }
+
+    bool launchedViaApp = false;
+    bool launchedViaFallback = false;
+    const char* launchFailureReason = "LaunchApp path unavailable";
+
+    // User override: skip LaunchApp (it would spawn the app's configured entry, not the chosen exe) and CreateProcess the selected exe directly; the Steam session is already up.
+    const char* directExeEnv = getenv("WN_STEAM_DIRECT_EXE");
+    const bool directExe = directExeEnv && directExeEnv[0] != '\0';
+
+    if (directExe) {
+        log_line("[wn-launcher] WN_STEAM_DIRECT_EXE set — user-selected exe \"%s\"; "
+                 "skipping Steam LaunchApp, launching directly via CreateProcess",
+                 exeName);
+        launchFailureReason = "direct-exe mode (LaunchApp skipped by override)";
+    } else if (engine && appId != 0) {
+        void** engine_vt = *(void***) engine;
+        typedef void* (WN_THISCALL *GetIClientAppManagerFn)(void* self, int hUser, int hPipe);
+        GetIClientAppManagerFn getAppMgr = (GetIClientAppManagerFn)
+            engine_vt[kVtEngine_GetIClientAppManager / 8];
+        void* appMgr = getAppMgr(engine, hUser, pipe);
+        log_line("[wn-launcher] IClientEngine.GetIClientAppManager -> %p", appMgr);
+        if (appMgr) {
+            void** appMgr_vt = *(void***) appMgr;
+            typedef uint64_t (WN_THISCALL *LaunchAppFn)(void* self, void* pGameId,
+                                            uint32_t uLaunchOption,
+                                            uint32_t eLaunchSource,
+                                            const char* pszUserArgs);
+            LaunchAppFn launchApp = (LaunchAppFn)
+                appMgr_vt[kVtAppMgr_LaunchApp / 8];
+            uint64_t gameId = (uint64_t)(appId & 0xFFFFFFu);
+
+            // RefreshAppInfo() slot — re-primes appinfo between MissingConfig retries.
+            void* refreshAppInfoP = appMgr_vt[kVtAppMgr_RefreshAppInfo / 8];
+
+            // Cold launch may see 1-2 fast MissingConfig(9) retries; 5 stays inside
+            // the 35s watchdog.
+            const int kMaxLaunchAttempts = 5;
+            for (int attempt = 1; attempt <= kMaxLaunchAttempts && !launchedViaApp; ++attempt) {
+                uint64_t apiCall = launchApp(appMgr, &gameId, 0, 300, "");
+                log_line("[wn-launcher] IClientAppManager.LaunchApp(appId=%u) "
+                         "attempt=%d/%d -> HSteamAPICall=0x%llx", appId,
+                         attempt, kMaxLaunchAttempts,
+                         (unsigned long long) apiCall);
+
+            int eAppError = -1;  // -1 = not polled / unknown
+            if (apiCall != 0) {
+                typedef void* (WN_THISCALL *GetIClientUtilsFn)(void* self, int hPipe);
+                GetIClientUtilsFn getUtils = (GetIClientUtilsFn)
+                    engine_vt[kVtEngine_GetIClientUtils / 8];
+                void* utils = getUtils(engine, pipe);
+                log_line("[wn-launcher] IClientEngine.GetIClientUtils -> %p", utils);
+                if (utils) {
+                    void** utils_vt = *(void***) utils;
+                    void* isCompletedP = utils_vt[kVtUtils_IsAPICallCompleted / 8];
+                    void* getResultP   = utils_vt[kVtUtils_GetAPICallResult / 8];
+                    void* getReasonP   = utils_vt[kVtUtils_GetAPICallFailureReason / 8];
+                    log_line("[wn-launcher] utils vt IsAPICallCompleted=%p "
+                             "GetAPICallFailureReason=%p GetAPICallResult=%p",
+                             isCompletedP, getReasonP, getResultP);
+                    if (is_exec_ptr(isCompletedP) && is_exec_ptr(getResultP)) {
+                        typedef bool (WN_THISCALL *IsAPICallCompletedFn)(void* self,
+                                                       uint64_t apiCall, bool* pbFailed);
+                        typedef int  (WN_THISCALL *GetFailureReasonFn)(void* self,
+                                                       uint64_t apiCall);
+                        typedef bool (WN_THISCALL *GetAPICallResultFn)(void* self,
+                                                       uint64_t apiCall, void* pCb,
+                                                       int cubCb, int iCbExpected,
+                                                       bool* pbFailed);
+                        IsAPICallCompletedFn isCompleted = (IsAPICallCompletedFn) isCompletedP;
+                        GetFailureReasonFn   getReason   = (GetFailureReasonFn) getReasonP;
+                        GetAPICallResultFn   getResult   = (GetAPICallResultFn) getResultP;
+
+                        const int kPollMaxMs = 10000;
+                        int  waited = 0;
+                        bool failed = false;
+                        bool completed = false;
+                        while (waited < kPollMaxMs) {
+                            failed = false;
+                            completed = isCompleted(utils, apiCall, &failed);
+                            if (completed) break;
+                            if (bGetCallback && freeLastCallback) {
+                                char cb[64];
+                                while (bGetCallback(pipe, cb)) freeLastCallback(pipe);
+                            }
+                            Sleep(100);
+                            waited += 100;
+                        }
+                        if (!completed) {
+                            log_line("[wn-launcher] LaunchApp poll: TIMED OUT "
+                                     "after %dms — job still pending", waited);
+                        } else if (failed) {
+                            int reason = is_exec_ptr(getReasonP) ? getReason(utils, apiCall) : -99;
+                            log_line("[wn-launcher] LaunchApp poll: API CALL FAILED "
+                                     "after %dms, reason=%d "
+                                     "(-1=NoFailure 0=SteamGone 1=NetworkFailure "
+                                     "2=InvalidHandle 3=MismatchedCallback)",
+                                     waited, reason);
+                        } else {
+                            unsigned char buf[kLaunchAppResultSize];
+                            memset(buf, 0, sizeof(buf));
+                            bool resFailed = false;
+                            bool got = getResult(utils, apiCall, buf,
+                                                  kLaunchAppResultSize,
+                                                  kLaunchAppResultCallbackId,
+                                                  &resFailed);
+                            eAppError = *(int*)(buf + kLaunchResultErrorOffset);
+                            log_line("[wn-launcher] LaunchApp poll: COMPLETED in %dms "
+                                     "got=%d resFailed=%d EAppUpdateError=%d "
+                                     "(0=NoError 1=Unspecified 2=Paused 3=Cancelled "
+                                     "4=Suspended 5=NoSubscription 6=NoConnection "
+                                     "7=Timeout 8=MissingKey 9=MissingConfig "
+                                     "0xE=AppLocked 0xF=OtherSessionPlaying "
+                                     "0x10=AlreadyRunning 0x21=33 0x23=35 0x2D=45)",
+                                     waited, got ? 1 : 0, resFailed ? 1 : 0, eAppError);
+                            char hex[3 * 32 + 1];
+                            int hp = 0;
+                            for (int i = 0; i < 32; ++i) {
+                                hp += snprintf(hex + hp, sizeof(hex) - hp, "%02x ", buf[i]);
+                            }
+                            log_line("[wn-launcher] LaunchApp result hex+0..32: %s", hex);
+                        }
+                    } else {
+                        log_line("[wn-launcher] LaunchApp poll: IClientUtils vtable "
+                                 "slots not executable — skipping poll");
+                    }
+                }
+            }
+
+            if (apiCall == 0) {
+                if (attempt < kMaxLaunchAttempts) {
+                    log_line("[wn-launcher] LaunchApp attempt %d/%d: \"%s\" never "
+                             "appeared — null call handle, retrying LaunchApp",
+                             attempt, kMaxLaunchAttempts, exeName);
+                    Sleep(500);
+                } else {
+                    log_line("[wn-launcher] LaunchApp returned a null call handle "
+                             "after %d attempts", kMaxLaunchAttempts);
+                    launchFailureReason = "LaunchApp returned a null call handle";
+                }
+                continue;
+            }
+
+            if (eAppError == 9 /* MissingConfig */) {
+                // appinfo not landed — re-prime, settle, retry fast (nothing launched).
+                // "never appeared … retrying" wording disarms the Android watchdog.
+                if (is_exec_ptr(refreshAppInfoP)) {
+                    typedef void (WN_THISCALL *RefreshAppInfoFn)(void* self);
+                    ((RefreshAppInfoFn) refreshAppInfoP)(appMgr);
+                }
+                log_line("[wn-launcher] LaunchApp attempt %d/%d: \"%s\" never "
+                         "appeared — MissingConfig (appinfo not ready); refreshed "
+                         "appinfo, retrying LaunchApp", attempt,
+                         kMaxLaunchAttempts, exeName);
+                for (int w = 0; w < 30; ++w) {  // ~3s of callback pumping
+                    if (bGetCallback && freeLastCallback) {
+                        char cb[64];
+                        while (bGetCallback(pipe, cb)) freeLastCallback(pipe);
+                    }
+                    Sleep(100);
+                }
+            } else if (eAppError > 0 /* a real error, e.g. AlreadyRunning(0x10) */) {
+                // Not retryable in-process (AlreadyRunning = prior session's
+                // games-played still live server-side) — go straight to fallback.
+                log_line("[wn-launcher] LaunchApp attempt %d/%d: \"%s\" never "
+                         "appeared — EAppUpdateError=%d%s; not retryable in-process "
+                         "— falling back", attempt, kMaxLaunchAttempts, exeName,
+                         eAppError,
+                         eAppError == 0x10
+                             ? " (AlreadyRunning — prior session's games-played "
+                               "registration still live server-side)"
+                             : "");
+                launchFailureReason = (eAppError == 0x10)
+                    ? "LaunchApp returned AlreadyRunning (stale server session)"
+                    : "LaunchApp returned a non-NoError EAppUpdateError";
+                break;
+            } else {
+                // NoError(0)/indeterminate(-1): accepted. Wait WITHOUT re-dispatching
+                // — a second LaunchApp while one is pending cancels the spawn (Wine).
+                const int kGameAppearLoops = 40;  // 40 * 500ms = 20s
+                log_line("[wn-launcher] LaunchApp dispatched (attempt %d/%d, "
+                         "EAppUpdateError=%d); waiting up to %ds for \"%s\" to "
+                         "appear (committed — no re-dispatch)",
+                         attempt, kMaxLaunchAttempts, eAppError,
+                         kGameAppearLoops / 2, exeName);
+                for (int w = 0; w < kGameAppearLoops && !launchedViaApp; ++w) {
+                    if (count_game_processes(exeName) > 0) {
+                        launchedViaApp = true;
+                        break;
+                    }
+                    if (bGetCallback && freeLastCallback) {
+                        char cb[64];
+                        while (bGetCallback(pipe, cb)) freeLastCallback(pipe);
+                    }
+                    Sleep(500);
+                }
+                if (launchedViaApp) {
+                    log_line("[wn-launcher] LaunchApp: \"%s\" is running "
+                             "(attempt %d/%d)", exeName, attempt,
+                             kMaxLaunchAttempts);
+                } else {
+                    log_line("[wn-launcher] LaunchApp attempt %d/%d: \"%s\" "
+                             "accepted (EAppUpdateError=%d) but never spawned in "
+                             "%ds — not re-dispatching (would cancel the pending "
+                             "launch) — falling back", attempt, kMaxLaunchAttempts,
+                             exeName, eAppError, kGameAppearLoops / 2);
+                    launchFailureReason =
+                        "LaunchApp accepted but the game never spawned";
+                    break;
+                }
+            }
+            }
+        } else {
+            launchFailureReason = "IClientAppManager was null";
+        }
+    } else {
+        launchFailureReason = engine ? "appId was 0" : "IClientEngine was null";
+    }
+
+    // LaunchApp didn't bring the game up — start it directly; the "dispatched/never appeared/falling back" log markers disarm WnLauncherStatusTailer's post-dispatch watchdog.
+    if (!launchedViaApp) {
+        if (directExe) {
+            log_line("[wn-launcher] direct-exe mode: launching user-selected \"%s\" via "
+                     "CreateProcess (Steam LaunchApp skipped)", exeName);
+        } else {
+            log_line("[wn-launcher] LaunchApp dispatched but \"%s\" never appeared "
+                     "— falling back to CreateProcess (%s)",
+                     exeName, launchFailureReason);
+        }
+        launchedViaFallback = create_process_game(gameExe, exeName);
+    }
+
+    if (launchedViaApp || launchedViaFallback) {
+        const char* path = launchedViaApp ? "LaunchApp path"
+                                           : "CreateProcess fallback";
+        log_line("[wn-launcher] watching \"%s\" for exit (%s)", exeName, path);
+        // Declare exit after 2 consecutive absent polls (~2s) — tolerates a brief gap.
+        int absent = 0;
+        while (absent < 2) {
+            Sleep(1000);
+            if (bGetCallback && freeLastCallback) {
+                char cb[64];
+                while (bGetCallback(pipe, cb)) freeLastCallback(pipe);
+            }
+            absent = (count_game_processes(exeName) != 0) ? 0 : absent + 1;
+        }
+        log_line("[wn-launcher] game \"%s\" exited (%s)", exeName, path);
+        if (cleanShutdownArmed) {
+            wn_launcher_clean_shutdown_now("game-exit");
+            // Block until teardown finishes so returning from main() doesn't kill
+            // the process mid-reap (cutting the logoff flush → AlreadyRunning).
+            wn_launcher_wait_clean_shutdown(12000);
+        }
+        log_line("[wn-launcher] Steam Launcher shutdown");
+        return 0;
+    }
+
+    log_line("[wn-launcher] could not start \"%s\" via LaunchApp or CreateProcess "
+             "(%s)", exeName, launchFailureReason);
+    if (cleanShutdownArmed) wn_launcher_clean_shutdown_now("launch-failed");
+    return 9;
+}
diff --git a/app/src/main/cpp/wn-steamapi-bridge/.gitignore b/app/src/main/cpp/wn-steamapi-bridge/.gitignore
new file mode 100644
index 000000000..567609b12
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/app/src/main/cpp/wn-steamapi-bridge/CMakeLists.txt b/app/src/main/cpp/wn-steamapi-bridge/CMakeLists.txt
new file mode 100644
index 000000000..72774e8a5
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/CMakeLists.txt
@@ -0,0 +1,42 @@
+## wn-steamapi-bridge — PE32+ x86_64 replacement steam_api64.dll.
+##
+## Built with the MinGW cross toolchain — NOT the Android NDK. The
+## main app CMakeLists builds Linux .so artifacts (libwnsteam.so,
+## libwn-libsteamclient.so) via the NDK. This DLL is consumed by Wine
+## inside box64 at runtime, so it must be a Windows PE binary. Driving
+## it from gradle would require dragging the MinGW toolchain into the
+## NDK build, which we explicitly don't want.
+##
+## Build manually with build.sh in this directory; the script outputs
+## the PE under build/ and copies it into
+## app/src/main/assets/wnsteam/steampipe/steam_api64.dll for APK
+## packaging.
+##
+## Keep this source list aligned with build.sh. The generated .def and
+## override C sources are checked in so standalone CMake users can build
+## the bridge without the legacy steam_api_bridge.c shim.
+
+cmake_minimum_required(VERSION 3.18)
+project(wn_steamapi_bridge C)
+
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
+
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    message(FATAL_ERROR
+        "wn-steamapi-bridge must be cross-compiled with a MinGW toolchain.\n"
+        "Run cmake with -DCMAKE_TOOLCHAIN_FILE=mingw64.cmake or use build.sh.")
+endif()
+
+add_library(steam_api64 SHARED
+    steam_api_bridge_callbacks.c
+    steam_api_bridge_overrides.c
+    steam_api_bridge_steamclient.c
+    steam_api_bridge_lifecycle.c
+    steam_api_bridge.def
+)
+target_link_libraries(steam_api64 PRIVATE kernel32 user32)
+target_link_options(steam_api64 PRIVATE -static-libgcc -Wl,--kill-at)
+set_target_properties(steam_api64 PROPERTIES
+    OUTPUT_NAME "steam_api64"
+    SUFFIX ".dll")
diff --git a/app/src/main/cpp/wn-steamapi-bridge/build.sh b/app/src/main/cpp/wn-steamapi-bridge/build.sh
new file mode 100755
index 000000000..dbd44d2e2
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/build.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# build.sh — cross-compile the bridge DLL and stage it into assets/.
+# Standalone (no gradle/ndk); needs x86_64-w64-mingw32-gcc on PATH.
+set -euo pipefail
+
+cd "$(dirname "$0")"
+OUT="build/steam_api64.dll"
+ASSET_DIR="../../assets/wnsteam/steampipe"
+ASSET="$ASSET_DIR/steam_api64.dll"
+GBE_SOURCE="../../../../../References/WinNative/app/src/main/assets/steampipe/steam_api64.dll"
+
+# Refresh gbe_fork export list → /tmp/gbe_real.txt (input to gen_forward_def.py).
+if [ -f "$GBE_SOURCE" ]; then
+    x86_64-w64-mingw32-objdump -p "$GBE_SOURCE" 2>/dev/null \
+        | awk '/\[Ordinal\/Name Pointer\] Table/,/^$/' \
+        | awk 'NR>1 && /\[/{print $NF}' \
+        > /tmp/gbe_real.txt
+fi
+
+# Generate forwarders, .def forwards, and matchmaking override stubs.
+python3 gen_forwarders.py
+python3 gen_forward_def.py
+python3 gen_overrides.py
+
+mkdir -p build
+
+# Hybrid bridge: our ~55 matchmaking overrides + .def forwards (~1200 exports)
+# → original_steam_api64.dll. Omit steam_api_bridge_flat.c — gbe_fork covers the
+# flat-C path and compiling it would duplicate the .def export definitions.
+x86_64-w64-mingw32-gcc -shared -O2 -fvisibility=hidden \
+    -o "$OUT" \
+    steam_api_bridge_overrides.c \
+    steam_api_bridge_callbacks.c \
+    steam_api_bridge_steamclient.c \
+    steam_api_bridge_lifecycle.c \
+    steam_api_bridge.def \
+    -static-libgcc -lkernel32 -luser32 \
+    -Wl,--enable-stdcall-fixup \
+    -Wl,--kill-at
+
+echo "[build.sh] PE built: $(ls -la "$OUT" | awk '{print $5}') bytes"
+
+mkdir -p "$ASSET_DIR"
+cp "$OUT" "$ASSET"
+echo "[build.sh] Staged: $ASSET"
+
+x86_64-w64-mingw32-objdump -p "$OUT" \
+    | awk '/^\[Ordinal\/Name Pointer\] Table/{f=1;next} f && /^$/{exit} f{print}' \
+    | head -40
diff --git a/app/src/main/cpp/wn-steamapi-bridge/gen_forward_def.py b/app/src/main/cpp/wn-steamapi-bridge/gen_forward_def.py
new file mode 100755
index 000000000..07bf415a4
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/gen_forward_def.py
@@ -0,0 +1,189 @@
+#!/usr/bin/env python3
+"""
+gen_forward_def.py — emit a MinGW .def file that PE-export-forwards
+the entire gbe_fork (Goldberg Emulator Fork) SteamAPI surface to a
+sibling `original_steam_api64.dll`, EXCEPT for the matchmaking calls
+that we want to handle ourselves.
+
+How PE forwards work:
+  An export entry in .edata can be a "forwarder" — a string of the
+  form `ModuleName.ExportName` instead of an RVA. When LoadLibrary +
+  GetProcAddress hits a forwarder, the Windows loader auto-loads the
+  named module + resolves the named export, returning that pointer
+  transparently. The caller doesn't see the indirection.
+
+  MinGW .def syntax: `NewName = TargetModule.TargetExport`. The
+  resulting PE has its export-table entries pointing at the
+  forwarder string, not at any code in our bridge.
+
+The hybrid plan:
+  - We are `steam_api64.dll` in the game's install dir.
+  - We forward ~99% of exports to `original_steam_api64.dll` (gbe_fork
+    renamed at install time).
+  - We provide our OWN implementations for the OVERRIDE_NAMES set
+    below — matchmaking-family entry points that route through our
+    libsteamclient.so (via lsteamclient.dll → real CMClient state).
+  - Result: gbe_fork handles SteamAPI_Init, every non-matchmaking
+    flat-C call (which is most of them); we handle lobby list /
+    create / join → real Steam lobbies.
+
+Inputs:
+  /tmp/gbe_real.txt — line-per-export list extracted earlier from
+    the gbe_fork DLL via objdump (see header in build.sh).
+
+Output:
+  steam_api_bridge.def — MinGW .def file consumed by build.sh.
+"""
+
+from __future__ import annotations
+import sys
+from pathlib import Path
+
+EXPORTS_LIST = Path("/tmp/gbe_real.txt")
+OUT = Path(__file__).resolve().parent / "steam_api_bridge.def"
+
+# Exports our bridge implements itself (NOT forwarded to gbe_fork).
+# Start narrow: only matchmaking + the lifecycle hooks that need to
+# discover our overrides. Expand carefully — every name here needs a
+# corresponding C implementation in steam_api_bridge.c or a code-gen
+# pass. Anything in this set but missing a C impl produces a link
+# error.
+#
+# Callback lifecycle hooks (task #163) — we own these so we can
+# dual-dispatch: gbe_fork's CCallback queue + our libsteamclient.so's
+# pending-callback queue (where matchmaking responses land via
+# push_call_result). Initial impl just passes through to gbe_fork;
+# the libsteamclient.so drain comes incrementally.
+OVERRIDE_NAMES = {
+    "SteamAPI_RegisterCallback",
+    "SteamAPI_UnregisterCallback",
+    "SteamAPI_RegisterCallResult",
+    "SteamAPI_UnregisterCallResult",
+    "SteamAPI_RunCallbacks",
+    # Flat-C ISteamClient accessors for matchmaking. Steamworks.NET
+    # (Unity P/Invoke) calls these directly. Owning these two exports
+    # lets P/Invoke callers reach our libsteamclient.so matchmaking
+    # pointer without touching any vtable. Forest's C++ inline path
+    # (SteamClient()->GetISteamMatchmaking) does NOT come through
+    # here, so these are dead code on Forest's path — see note below.
+    "SteamAPI_ISteamClient_GetISteamMatchmaking",
+    "SteamAPI_ISteamClient_GetISteamMatchmakingServers",
+    # Lifecycle + SteamClient overrides — route the C++ inline path
+    # SteamClient()->GetISteamMatchmaking() through the wine PE bridge
+    # (steamclient64.dll) instead of gbe_fork. Our impl dual-inits gbe
+    # (for non-matchmaking forwarded exports) AND the wine bridge (for
+    # matchmaking / P2P). See steam_api_bridge_lifecycle.c.
+    "SteamClient",
+    "SteamAPI_Init",
+    "SteamAPI_InitSafe",
+    "SteamAPI_InitFlat",
+    "SteamAPI_Shutdown",
+    "SteamAPI_IsSteamRunning",
+    "SteamAPI_GetHSteamPipe",
+    "SteamAPI_GetHSteamUser",
+    "SteamAPI_RestartAppIfNecessary",
+    # Steam Launcher: bare global matchmaking accessors. The Steamworks SDK
+    # C++ header `isteammatchmaking.h` defines `inline SteamMatchmaking()`
+    # as a `STEAM_DEFINE_USER_INTERFACE_ACCESSOR` macro that compiles
+    # to an extern "C" call to the steam_api64.dll!SteamMatchmaking
+    # export. Forest's C++ inline path (and most Steamworks games')
+    # `SteamMatchmaking()->CreateLobby(...)` lands here. Forwarding
+    # this export to gbe_fork sent every Forest matchmaking call into
+    # gbe's LAN-broadcast emulator — explaining the "lobby visible on
+    # LAN, invisible on Internet" diagnostic. Owning the bare globals
+    # so they route to Valve's real in-process steamclient64.dll (see
+    # steam_api_bridge_steamclient.c).
+    "SteamMatchmaking",
+    "SteamMatchmakingServers",
+    "SteamAPI_SteamMatchmaking_v009",
+    "SteamAPI_SteamMatchmakingServers_v002",
+    # NOTE: SteamClient + SteamAPI_Init wrapper attempt (commits
+    # 7ce950c and following) crashed Forest. Forest takes the C++
+    # inline SteamMatchmaking() path which compiles to
+    # SteamClient()->vtable[10], so to redirect it we'd have to own
+    # SteamClient and either patch gbe's vtable (corrupted gbe's
+    # bootstrap) or return a wrapper (Forest's downstream consumer
+    # hit kernelbase unwind even with an Init gate that deferred
+    # wrapper activation past gbe's init). Both attempts crashed with
+    # the same kernelbase epilogue AV. Likely root cause: our
+    # ISteamMatchmakingStub v009 vtable doesn't exactly match what
+    # Forest expects — needs verification against the real SDK header
+    # before another attempt.
+}
+
+# Matchmaking surface — the whole ISteamMatchmaking flat-C family.
+# These are the entry points Forest hits when the user clicks
+# MULTIPLAYER → "loading lobbies".
+MATCHMAKING_PREFIXES = (
+    "SteamAPI_ISteamMatchmaking_",
+    # MatchmakingServers (server browser) — same story.
+    "SteamAPI_ISteamMatchmakingServers_",
+)
+
+
+def main() -> int:
+    if not EXPORTS_LIST.exists():
+        print(f"ERROR: {EXPORTS_LIST} missing — run: "
+              f"x86_64-w64-mingw32-objdump -p $GBE_FORK | "
+              f"awk '/Name Pointer.*Table/,/^$/' | awk '/\\[/{{print $NF}}' "
+              f"> /tmp/gbe_real.txt", file=sys.stderr)
+        return 1
+
+    exports = [
+        ln.strip() for ln in EXPORTS_LIST.read_text().splitlines()
+        if ln.strip()
+    ]
+
+    # Compute the override set: matchmaking-family exports.
+    overrides = set(OVERRIDE_NAMES)
+    for e in exports:
+        for p in MATCHMAKING_PREFIXES:
+            if e.startswith(p):
+                overrides.add(e)
+                break
+
+    # Sanity-check: at least the lobby-list call should be in there.
+    must_override = {
+        "SteamAPI_ISteamMatchmaking_RequestLobbyList",
+        "SteamAPI_ISteamMatchmaking_CreateLobby",
+        "SteamAPI_ISteamMatchmaking_JoinLobby",
+        "SteamAPI_ISteamMatchmaking_LeaveLobby",
+        "SteamAPI_ISteamMatchmaking_GetLobbyByIndex",
+    }
+    missing = must_override - set(exports)
+    if missing:
+        print(f"WARNING: gbe_fork doesn't export {missing} — bridge "
+              f"may need additional plumbing", file=sys.stderr)
+
+    forwards = [e for e in exports if e not in overrides]
+
+    lines = [
+        "; AUTO-GENERATED by gen_forward_def.py — DO NOT EDIT.",
+        ";",
+        "; PE export forwarders → original_steam_api64.dll. The companion",
+        "; gbe_fork (renamed at install time) provides every non-matchmaking",
+        "; SteamAPI function. Our bridge's .text section only defines the",
+        "; matchmaking overrides listed under EXPORTS without an `=`.",
+        ";",
+        "LIBRARY steam_api64",
+        "EXPORTS",
+    ]
+    # Forwards first (alphabetical for readability)
+    for e in sorted(forwards):
+        lines.append(f"    {e} = original_steam_api64.{e}")
+    # Then the overrides
+    lines.append("    ; --- overrides (our own impls in steam_api_bridge_overrides.c) ---")
+    for e in sorted(overrides):
+        lines.append(f"    {e}")
+
+    OUT.write_text("\n".join(lines) + "\n", encoding="utf-8")
+    print(f"[gen_forward_def] {len(forwards)} forwards + {len(overrides)} overrides → {OUT}",
+          file=sys.stderr)
+    print(f"[gen_forward_def] override names:", file=sys.stderr)
+    for e in sorted(overrides):
+        print(f"  {e}", file=sys.stderr)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/app/src/main/cpp/wn-steamapi-bridge/gen_forwarders.py b/app/src/main/cpp/wn-steamapi-bridge/gen_forwarders.py
new file mode 100755
index 000000000..ff5ded055
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/gen_forwarders.py
@@ -0,0 +1,397 @@
+#!/usr/bin/env python3
+"""
+gen_forwarders.py — emit SteamAPI_ISteam*_<Method> flat-C forwarders.
+
+Inputs:
+  app/src/main/cpp/wn-libsteamclient/src/isteam_stubs.cpp
+
+Output:
+  steam_api_bridge_flat.c — one C function per virtual method per
+  ISteam*Stub class. Each forwarder takes `void* self` as its first
+  arg, casts vtable slot N to the right signature, and tail-calls.
+
+Approach:
+  1. Locate each `class ISteam<Name>Stub {` block and its matching `};`.
+  2. Walk the body line-by-line. Accumulate text into a buffer until
+     we hit `(...)` matched parens — that's one virtual declaration.
+     Reset buffer at every `;` or `}` at depth 0 to keep multi-line
+     bodies from confusing the accumulator.
+  3. Each `virtual ret name(args)` we see increments the slot counter
+     (sequential, matches SDK ABI ordering).
+"""
+
+from __future__ import annotations
+import os
+import re
+import sys
+from pathlib import Path
+
+LSC_SRC_DIR = Path(__file__).resolve().parent.parent / "wn-libsteamclient" / "src"
+# Sources walked for `virtual` decls. Each file's classes get parsed
+# in source order; class-name → forwarder-prefix mapping below.
+SOURCES = [
+    LSC_SRC_DIR / "isteam_stubs.cpp",
+    LSC_SRC_DIR / "isteam_client.cpp",
+]
+# Map source class name (with or without Stub suffix) to the
+# SteamAPI_<X>_<Method> prefix that the SDK exports the flat-C
+# under. Classes not in the map use the class name as-is (stripping
+# `Stub` and `Impl` suffixes).
+CLASS_NAME_OVERRIDE = {
+    "ISteamClientImpl": "ISteamClient",
+}
+OUT = Path(__file__).resolve().parent / "steam_api_bridge_flat.c"
+
+
+def find_classes(text: str) -> list[tuple[str, int, int]]:
+    """Return [(class_name, body_start, body_end), ...]. Bodies span
+    the open `{` (exclusive) to the matching `}` (exclusive).
+
+    Matches `class ISteam<X>Stub`, `class ISteam<X>Impl`, and bare
+    `class ISteam<X>` — different files use different suffix
+    conventions, but they all represent the same SDK interfaces."""
+    result = []
+    pattern = r"^class\s+(ISteam[A-Za-z0-9]*?)(?:Stub|Impl)?\s*\{"
+    seen_classes = set()
+    for m in re.finditer(pattern, text, re.MULTILINE):
+        cls = m.group(1)
+        cls = CLASS_NAME_OVERRIDE.get(cls + "Impl", CLASS_NAME_OVERRIDE.get(cls + "Stub", cls))
+        if cls in seen_classes:
+            continue
+        seen_classes.add(cls)
+        start = m.end()  # right after the opening {
+        depth = 1
+        i = start
+        while i < len(text) and depth > 0:
+            ch = text[i]
+            if ch == "{":
+                depth += 1
+            elif ch == "}":
+                depth -= 1
+                if depth == 0:
+                    break
+            i += 1
+        result.append((cls, start, i))
+    return result
+
+
+def parens_balanced(s: str) -> int:
+    """Return depth at end. 0 = balanced, >0 = unclosed, <0 = extra )."""
+    depth = 0
+    for ch in s:
+        if ch == "(":
+            depth += 1
+        elif ch == ")":
+            depth -= 1
+    return depth
+
+
+VIRTUAL_PROBE = re.compile(r"\bvirtual\s+")
+# Capture: returnType (possibly multi-token), methodName, args (the
+# substring between balanced parens). We require `virtual` to start
+# the declaration; everything up to the first `(` is the return-type +
+# method-name; everything between the first balanced `(...)` is args.
+VIRTUAL_HEAD_RE = re.compile(
+    r"""^virtual\s+
+        (?P<head>[A-Za-z_][^()]*?[A-Za-z0-9_*&\s])\s*\(
+    """,
+    re.VERBOSE,
+)
+
+
+def parse_virtuals(body: str) -> list[dict]:
+    """Walk class body, emit one entry per virtual declaration in
+    source order. Bodies of inline-defined methods (`{ ... }`) are
+    skipped — we only care about the declaration line(s) up to the
+    closing `)` of the arg list, then jump past the body."""
+    out = []
+    i = 0
+    n = len(body)
+    slot = 0
+    while i < n:
+        # Find next `virtual\s+`
+        m = VIRTUAL_PROBE.search(body, i)
+        if m is None:
+            break
+        v_start = m.start()
+        # Sometimes "virtual" appears in a comment — check by looking
+        # backwards to the previous newline for `//`.
+        line_start = body.rfind("\n", 0, v_start) + 1
+        prefix = body[line_start:v_start]
+        if "//" in prefix or "/*" in prefix:
+            i = m.end()
+            continue
+        # Find the opening `(` of the arg list — must be at depth 0
+        # (no preceding `<` < ... yet, declaration text only).
+        j = v_start
+        paren_open = body.find("(", j)
+        if paren_open == -1:
+            break
+        # The head is body[v_start:paren_open]
+        head = body[v_start:paren_open]
+        # Now find the matching `)` for this `(`.
+        depth = 0
+        k = paren_open
+        while k < n:
+            ch = body[k]
+            if ch == "(":
+                depth += 1
+            elif ch == ")":
+                depth -= 1
+                if depth == 0:
+                    break
+            k += 1
+        if k >= n:
+            break
+        args_str = body[paren_open + 1:k]
+        # Parse head: split off the trailing identifier as method name
+        head = head.strip()
+        # Expect head to start with `virtual\s+`
+        head = re.sub(r"^virtual\s+", "", head, count=1)
+        head = head.strip()
+        # Last identifier token is the method name; everything else is the return type
+        name_match = re.search(r"([A-Za-z_][A-Za-z0-9_]*)$", head)
+        if not name_match:
+            i = k + 1
+            continue
+        method = name_match.group(1)
+        ret = head[:name_match.start()].strip()
+        # Filter out things that look like keywords / non-types
+        if not ret or ret in {"static", "explicit"}:
+            i = k + 1
+            continue
+        args = split_args(args_str)
+        out.append({
+            "slot": slot,
+            "ret": ret,
+            "name": method,
+            "args": [normalize_arg(a, j) for j, a in enumerate(args)],
+        })
+        slot += 1
+        # Skip past the closing `)` of the args.
+        i = k + 1
+        # If the next non-space char is `{`, skip the entire body
+        # (matching braces). Otherwise (decl ends with `;`), no skip
+        # needed.
+        while i < n and body[i] in " \t\r\n":
+            i += 1
+        if i < n and body[i] == "{":
+            depth = 1
+            i += 1
+            while i < n and depth > 0:
+                ch = body[i]
+                if ch == "{":
+                    depth += 1
+                elif ch == "}":
+                    depth -= 1
+                i += 1
+    return out
+
+
+def split_args(raw: str) -> list[str]:
+    out, depth, buf = [], 0, []
+    for ch in raw:
+        if ch in "<(":
+            depth += 1
+        elif ch in ">)":
+            depth -= 1
+        if ch == "," and depth == 0:
+            out.append("".join(buf).strip())
+            buf = []
+        else:
+            buf.append(ch)
+    if buf:
+        out.append("".join(buf).strip())
+    return [a for a in out if a]
+
+
+def normalize_arg(arg: str, idx: int) -> tuple[str, str]:
+    arg = arg.strip()
+    eq = arg.find("=")
+    if eq != -1:
+        arg = arg[:eq].strip()
+    if not arg:
+        return ("void", f"_a{idx}")
+    # If arg ends with `*` or `&`, no name. If arg contains only
+    # type tokens (no trailing identifier after a space), no name.
+    # Heuristic: split on whitespace; if last token is identifier and
+    # ALSO appears in the SDK as a type, treat as type — else name.
+    m = re.match(r"^(.*?)([A-Za-z_][A-Za-z0-9_]*)\s*$", arg)
+    if not m:
+        return (arg, f"_a{idx}")
+    prefix, tail = m.group(1).rstrip(), m.group(2)
+    primitives = {
+        "void", "bool", "char", "short", "int", "long", "float",
+        "double", "size_t", "uint", "ulong", "ushort",
+        "uint8_t", "uint16_t", "uint32_t", "uint64_t",
+        "int8_t", "int16_t", "int32_t", "int64_t",
+    }
+    sdk_types = {
+        "HSteamPipe", "HSteamUser", "EResult", "AppId_t",
+        "CSteamID", "ISteamFriends", "HAuthTicket", "RTime32",
+        "HServerListRequest", "HServerQuery",
+        "AccountID_t", "CGameID", "DepotId_t", "SteamAPICall_t",
+        "PublishedFileId_t", "UGCFileWriteStreamHandle_t",
+        "UGCHandle_t", "UGCQueryHandle_t", "UGCUpdateHandle_t",
+        "FriendsGroupID_t", "SteamLeaderboard_t",
+        "SteamLeaderboardEntries_t", "ScreenshotHandle",
+        "PingLocation_t", "SteamNetConnection_t",
+        "SteamNetworkingMessage_t", "HSteamNetConnection",
+        "HSteamListenSocket", "HSteamNetPollGroup",
+        "SteamNetworkingPOPID", "SteamNetworkingMicroseconds",
+        "InputHandle_t", "ControllerHandle_t",
+        "ParticipantID_t", "PartyBeaconID_t",
+        "SteamItemDef_t", "SteamItemInstanceID_t",
+        "SteamAPIWarningMessageHook_t",
+        "ManifestId_t", "AccountType_t", "ClientUnifiedMessageHandle",
+        "BREAKPAD_HANDLE", "intptr_t", "ptrdiff_t",
+        "PartyBeaconID_t", "CCallResult", "CCallback",
+        "GameSearchErrorCode_t", "SteamErrMsg", "SteamAPIWarningMessageHook_t",
+    }
+    # Anything starting with E (enum) or T_t (typedef) heuristic:
+    is_type_word = (
+        tail in primitives
+        or tail in sdk_types
+        or tail.endswith("_t")
+        or (len(tail) >= 2 and tail[0] == "E" and tail[1].isupper())
+        or (len(tail) >= 2 and tail[0] == "C" and tail[1].isupper() and "Steam" in tail)
+        or (len(tail) >= 2 and tail[0] == "I" and tail[1].isupper() and "Steam" in tail)
+    )
+    if not prefix:
+        # Just one token: must be the type
+        return (tail, f"_a{idx}")
+    if is_type_word:
+        # tail is type; full string IS the type
+        return (arg, f"_a{idx}")
+    return (prefix, tail)
+
+
+# Map C++ types onto C-compatible types for the bridge PE.
+def c_type(t: str) -> str:
+    t = t.strip()
+    # strip leading const, but keep const* as const-pointer
+    t = re.sub(r"\bconst\b", "", t).strip()
+    t = re.sub(r"\s+", " ", t)
+    if not t or t == "void":
+        return "void"
+    if t == "bool":
+        return "int"  # MSVC bool ABI 1 byte; the cast preserves real layout
+    if "*" in t or "&" in t:
+        return "void*"
+    primitive_map = {
+        "char": "char",
+        "short": "short",
+        "int": "int",
+        "long": "long",
+        "size_t": "size_t",
+        "uint8_t": "uint8_t", "uint16_t": "uint16_t",
+        "uint32_t": "uint32_t", "uint64_t": "uint64_t",
+        "int8_t": "int8_t", "int16_t": "int16_t",
+        "int32_t": "int32_t", "int64_t": "int64_t",
+        "float": "float", "double": "double",
+        "unsigned": "unsigned",
+        "unsigned int": "unsigned int",
+        "unsigned long": "unsigned long",
+        "unsigned short": "unsigned short",
+        "uint": "unsigned int",
+    }
+    if t in primitive_map:
+        return primitive_map[t]
+    # All other types (enums, Steam handle typedefs, CSteamID, etc.)
+    # are integer-sized on x86_64 Windows ABI per Steamworks conventions.
+    return "uint64_t"
+
+
+def emit_forwarder(cls: str, m: dict, emitted_names: set) -> str | None:
+    slot = m["slot"]
+    ret = c_type(m["ret"])
+    name = m["name"]
+    fwd_name = f"SteamAPI_{cls}_{name}"
+    # Dedup overloads — SDK exports one symbol per overload by appending
+    # _0, _1, ... but our stubs collapse overloads. We emit the first
+    # only; symbols beyond the first get name-suffix.
+    base = fwd_name
+    suffix = 0
+    while fwd_name in emitted_names:
+        suffix += 1
+        fwd_name = f"{base}_{suffix}"
+    emitted_names.add(fwd_name)
+    cargs = [(c_type(t), n) for (t, n) in m["args"]]
+    # Sanitize parameter names — avoid C keywords + collisions.
+    seen = {"self"}
+    fixed = []
+    for (ct, an) in cargs:
+        an2 = an
+        if an2 in seen or an2 in {"int", "long", "char", "register", "auto", "default", "new"}:
+            an2 = f"_p{len(fixed)}"
+        seen.add(an2)
+        fixed.append((ct, an2))
+    cargs = fixed
+    if cargs:
+        params = ", ".join(f"{t} {n}" for (t, n) in cargs)
+        sig_params = ", ".join(t for (t, _) in cargs)
+        call_args = "self, " + ", ".join(n for (_, n) in cargs)
+    else:
+        params = ""
+        sig_params = ""
+        call_args = "self"
+    body = []
+    body.append(f"WN_STEAMAPI_EXPORT {ret} {fwd_name}(void* self{', ' + params if params else ''}) {{")
+    if ret == "void":
+        body.append(f"    if (self == NULL) return;")
+    elif ret == "void*":
+        body.append(f"    if (self == NULL) return NULL;")
+    else:
+        body.append(f"    if (self == NULL) return 0;")
+    body.append(f"    void** vt = *(void***)self;")
+    body.append(f"    typedef {ret} (*Fn)(void*{', ' + sig_params if cargs else ''});")
+    body.append(f"    {'return ' if ret != 'void' else ''}((Fn)vt[{slot}])({call_args});")
+    body.append("}")
+    return "\n".join(body)
+
+
+def main() -> int:
+    parsed: dict[str, list[dict]] = {}
+    for src in SOURCES:
+        if not src.exists():
+            print(f"WARNING: {src} not found, skipping", file=sys.stderr)
+            continue
+        text = src.read_text(encoding="utf-8", errors="replace")
+        classes = find_classes(text)
+        for cls, s, e in classes:
+            if cls in parsed:
+                continue  # first file wins
+            body = text[s:e]
+            ms = parse_virtuals(body)
+            parsed[cls] = ms
+
+    total = sum(len(v) for v in parsed.values())
+    print(f"[gen_forwarders] parsed {len(parsed)} classes, {total} virtual methods", file=sys.stderr)
+    for cls in sorted(parsed):
+        print(f"  {cls}: {len(parsed[cls])}", file=sys.stderr)
+
+    emitted = set()
+    lines = [
+        "/* AUTO-GENERATED by gen_forwarders.py — DO NOT EDIT. */",
+        "",
+        "#include <windows.h>",
+        "#include <stdint.h>",
+        "#include <stddef.h>",
+        "",
+        "#define WN_STEAMAPI_EXPORT __declspec(dllexport)",
+        "",
+    ]
+    for cls in sorted(parsed):
+        lines.append(f"/* === {cls} === {len(parsed[cls])} method(s) === */")
+        for m in parsed[cls]:
+            fwd = emit_forwarder(cls, m, emitted)
+            if fwd is not None:
+                lines.append(fwd)
+        lines.append("")
+    OUT.write_text("\n".join(lines), encoding="utf-8")
+    print(f"[gen_forwarders] wrote {OUT} ({OUT.stat().st_size} bytes, {len(emitted)} exports)", file=sys.stderr)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/app/src/main/cpp/wn-steamapi-bridge/gen_overrides.py b/app/src/main/cpp/wn-steamapi-bridge/gen_overrides.py
new file mode 100755
index 000000000..719cda965
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/gen_overrides.py
@@ -0,0 +1,399 @@
+#!/usr/bin/env python3
+"""
+gen_overrides.py — emit C implementations for the matchmaking-family
+flat-C exports that route through OUR libsteamclient.so instead of
+gbe_fork's emulator state.
+
+The hybrid bridge forwards ~1200 SteamAPI calls to gbe_fork
+(via PE export forwards in steam_api_bridge.def), but matchmaking
+exports are carved out as direct exports of our bridge. Game-side
+calls to e.g. SteamAPI_ISteamMatchmaking_RequestLobbyList land in
+this file's implementations.
+
+Routing strategy:
+  1. Each override lazily acquires OUR ISteamMatchmaking pointer by
+     LoadLibrary("steamclient64.dll") + GetProcAddress("CreateInterface")
+     + CreateInterface("SteamClient020") to get ISteamClient*, then
+     calling its vtable[10] (GetISteamMatchmaking) to get the
+     matchmaking interface. lsteamclient.dll wraps our libsteamclient.so's
+     ISteamMatchmakingStub, so the returned pointer's vtable layout
+     matches the SDK (and matches our isteam_stubs.cpp's virtual
+     declaration order).
+  2. The override IGNORES the `self` arg (which would be gbe_fork's
+     matchmaking pointer if the game even passed it). It dispatches
+     via OUR cached pointer's vtable at slot N — slot N is extracted
+     from the existing steam_api_bridge_flat.c forwarder body, so
+     gen_overrides + gen_forwarders stay in sync as the source class
+     evolves.
+  3. Per-call diagnostic logging to C:\\wnb.log via wnb_log_once stays
+     in place — first invocation logged once per export.
+
+If a specific call's vtable[N] dispatch crashes (the failure mode we
+hit with the full-vtable bridge), the crash is ISOLATED to that
+matchmaking method — the game's other Steam API calls continue
+working via gbe_fork forwards.
+
+Input:
+  steam_api_bridge_flat.c — source of the vtable-slot numbers + the
+  exact signatures.
+
+Output:
+  steam_api_bridge_overrides.c — one C function per matchmaking
+  export, routing through OUR libsteamclient.so via cached
+  ISteamMatchmaking pointer.
+"""
+
+from __future__ import annotations
+import re
+import sys
+from pathlib import Path
+
+SRC = Path(__file__).resolve().parent / "steam_api_bridge_flat.c"
+OUT = Path(__file__).resolve().parent / "steam_api_bridge_overrides.c"
+
+OVERRIDE_PREFIXES = (
+    "SteamAPI_ISteamMatchmaking_",
+    "SteamAPI_ISteamMatchmakingServers_",
+)
+
+# Extract the full forwarder body so we can lift the slot number from
+# the existing flat-C output. The flat.c shape is:
+#   WN_STEAMAPI_EXPORT <ret> <name>(void* self[, params]) {
+#       if (self == NULL) return <X>;
+#       void** vt = *(void***)self;
+#       typedef <ret> (*Fn)(void*[, params]);
+#       (return ?)((Fn)vt[N])(self[, args]);
+#   }
+FUNC_RE = re.compile(
+    r"WN_STEAMAPI_EXPORT\s+(?P<ret>[A-Za-z0-9_*\s]+?)\s+"
+    r"(?P<name>SteamAPI_[A-Za-z0-9_]+)\s*"
+    r"\((?P<params>[^)]*)\)\s*\{"
+    r"(?P<body>.*?)"
+    r"\}\s*\n",
+    re.DOTALL,
+)
+SLOT_RE = re.compile(r"vt\[(\d+)\]")
+
+
+def default_ret(ret: str) -> str:
+    ret = ret.strip()
+    if ret == "void":
+        return ""
+    if ret == "void*":
+        return "    return NULL;"
+    return "    return 0;"
+
+
+# Map override-prefix to the SDK interface version we ask for via
+# CreateInterface, plus the ISteamClient vtable slot that returns it.
+# The slot numbers come from our isteam_client.cpp's ISteamClientImpl:
+#   slot 10 = GetISteamMatchmaking(int hUser, int hPipe, const char* ver)
+#   slot 11 = GetISteamMatchmakingServers(int hUser, int hPipe, const char* ver)
+INTERFACE_CONFIG = {
+    "SteamAPI_ISteamMatchmaking_": {
+        "version": "SteamMatchMaking009",
+        "vtable_slot": 10,
+        "cache_var": "g_our_matchmaking",
+    },
+    "SteamAPI_ISteamMatchmakingServers_": {
+        "version": "SteamMatchMakingServers002",
+        "vtable_slot": 11,
+        "cache_var": "g_our_matchmaking_servers",
+    },
+}
+
+
+PROLOGUE = r"""/* AUTO-GENERATED by gen_overrides.py — DO NOT EDIT. */
+
+#include <windows.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#define WN_STEAMAPI_EXPORT __declspec(dllexport)
+
+static void wnb_log_once(const char* name) {
+    static const char* once_names[64];
+    static int once_count = 0;
+    for (int i = 0; i < once_count; ++i) {
+        if (once_names[i] == name) return;
+    }
+    if (once_count < 64) {
+        once_names[once_count++] = name;
+    }
+    FILE* f = fopen("C:\\wnb.log", "a");
+    if (f) {
+        fputs(name, f);
+        fputc('\n', f);
+        fclose(f);
+    }
+}
+
+typedef void* (*CreateInterface_fn)(const char* pchVersion, int* pCode);
+static CreateInterface_fn g_create_interface = NULL;
+static void* g_steam_client = NULL;
+static HMODULE g_steamclient_module = NULL;
+
+typedef unsigned char (*Steam_BGetCallback_fn)(int hpipe, void* pmsg);
+typedef void          (*Steam_FreeLastCallback_fn)(int hpipe);
+typedef unsigned char (*Steam_GetAPICallResult_fn)(int hpipe,
+                                          unsigned long long hcall,
+                                          void* pcb, int cb,
+                                          int icb_expected,
+                                          unsigned char* pbfailed);
+static Steam_BGetCallback_fn      g_steam_bgetcallback     = NULL;
+static Steam_FreeLastCallback_fn  g_steam_freelastcallback = NULL;
+static Steam_GetAPICallResult_fn  g_steam_getapicallresult = NULL;
+
+extern void wnb_dispatch_callback(int iCallback, const void* data, size_t data_size);
+extern void wnb_dispatch_call_result(unsigned long long hAPICall, int io_failure,
+                                     const void* data, size_t data_size);
+static int g_steam_pipe = 0;
+static int g_steam_user = 0;
+
+extern void wnb_publish_dispatch_pointers(void);
+
+static void wnb_resolver_log(const char* msg) {
+    FILE* f = fopen("C:\\wnb.log", "a");
+    if (f) { fputs(msg, f); fputc('\n', f); fclose(f); }
+}
+
+static void* resolve_steam_client(void) {
+    if (g_steam_client != NULL) return g_steam_client;
+    wnb_publish_dispatch_pointers();
+    SetDllDirectoryA("C:\\Program Files (x86)\\Steam");
+    HMODULE sc = LoadLibraryExA(
+            "C:\\Program Files (x86)\\Steam\\steamclient64.dll",
+            NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    if (sc == NULL) {
+        wnb_resolver_log("[wnb] LoadLibraryEx(Valve steamclient64.dll) "
+                         "failed — falling back to bare name (gbe stub)");
+        sc = LoadLibraryA("steamclient64.dll");
+    }
+    if (sc == NULL) {
+        wnb_resolver_log("[wnb] LoadLibrary(steamclient64.dll) failed");
+        return NULL;
+    }
+    g_steamclient_module = sc;
+    if (g_create_interface == NULL) {
+        g_create_interface = (CreateInterface_fn)GetProcAddress(sc, "CreateInterface");
+        if (g_create_interface == NULL) {
+            wnb_resolver_log("[wnb] steamclient64.dll missing CreateInterface");
+            return NULL;
+        }
+    }
+    g_steam_bgetcallback = (Steam_BGetCallback_fn)
+            GetProcAddress(sc, "Steam_BGetCallback");
+    g_steam_freelastcallback = (Steam_FreeLastCallback_fn)
+            GetProcAddress(sc, "Steam_FreeLastCallback");
+    g_steam_getapicallresult = (Steam_GetAPICallResult_fn)
+            GetProcAddress(sc, "Steam_GetAPICallResult");
+    {
+        char buf[160];
+        snprintf(buf, sizeof(buf),
+                 "[wnb] callback-pump exports: BGetCallback=%p "
+                 "FreeLastCallback=%p GetAPICallResult=%p",
+                 (void*)g_steam_bgetcallback,
+                 (void*)g_steam_freelastcallback,
+                 (void*)g_steam_getapicallresult);
+        wnb_resolver_log(buf);
+    }
+    int code = 0;
+    g_steam_client = g_create_interface("SteamClient020", &code);
+    if (g_steam_client == NULL) g_steam_client = g_create_interface("SteamClient019", &code);
+    if (g_steam_client == NULL) g_steam_client = g_create_interface("SteamClient017", &code);
+    if (g_steam_client == NULL) {
+        wnb_resolver_log("[wnb] CreateInterface(SteamClient0XX) returned NULL");
+        return NULL;
+    }
+
+    {
+        void** vt = *(void***)g_steam_client;
+        typedef int (*CreateSteamPipe_fn)(void*);
+        typedef int (*ConnectToGlobalUser_fn)(void*, int);
+        g_steam_pipe = ((CreateSteamPipe_fn)vt[0])(g_steam_client);
+        if (g_steam_pipe != 0) {
+            g_steam_user = ((ConnectToGlobalUser_fn)vt[2])(
+                    g_steam_client, g_steam_pipe);
+        }
+        char buf[128];
+        snprintf(buf, sizeof(buf),
+                 "[wnb] Valve ISteamClient: pipe=%d user=%d",
+                 g_steam_pipe, g_steam_user);
+        wnb_resolver_log(buf);
+        if (g_steam_pipe == 0 || g_steam_user == 0) {
+            wnb_resolver_log("[wnb] WARNING: pipe/user handshake failed; "
+                             "falling back to 1,1 (matchmaking may be empty)");
+            if (g_steam_pipe == 0) g_steam_pipe = 1;
+            if (g_steam_user == 0) g_steam_user = 1;
+        }
+    }
+    return g_steam_client;
+}
+
+static void* resolve_interface(int slot, const char* version) {
+    void* client = resolve_steam_client();
+    if (client == NULL) return NULL;
+    void** vt = *(void***)client;
+    typedef void* (*GetIface_fn)(void*, int, int, const char*);
+    void* iface = ((GetIface_fn)vt[slot])(
+            client, g_steam_user, g_steam_pipe, version);
+    char buf[128];
+    snprintf(buf, sizeof(buf),
+             "[wnb] resolve_interface slot=%d ver=%s pipe=%d user=%d -> %p",
+             slot, version, g_steam_pipe, g_steam_user, iface);
+    wnb_resolver_log(buf);
+    return iface;
+}
+
+void wnb_pump_valve_callbacks(void) {
+    if (g_steam_client == NULL) return;          /* resolver not run yet */
+    if (g_steam_bgetcallback == NULL || g_steam_freelastcallback == NULL) return;
+
+    struct CallbackMsg { int hUser; int iCallback; void* pubParam; int cubParam; };
+    struct CallbackMsg msg;
+    int guard = 0;
+    while (guard++ < 512 && g_steam_bgetcallback(g_steam_pipe, &msg)) {
+        if (msg.iCallback == 703 /* SteamAPICallCompleted_t */) {
+            struct ApiCallDone {
+                unsigned long long hAsyncCall;
+                int      iCallback;
+                unsigned cubParam;
+            };
+            if (msg.pubParam != NULL && g_steam_getapicallresult != NULL) {
+                struct ApiCallDone cc = *(struct ApiCallDone*)msg.pubParam;
+                unsigned char payload[2048];
+                int sz = (int)(cc.cubParam < sizeof(payload)
+                               ? cc.cubParam : sizeof(payload));
+                unsigned char failed = 0;
+                if (g_steam_getapicallresult(g_steam_pipe, cc.hAsyncCall,
+                                             payload, sz, cc.iCallback,
+                                             &failed)) {
+                    char b[160];
+                    snprintf(b, sizeof(b),
+                             "[wnb] pump: call-result hCall=%llu cb=%d "
+                             "sz=%d failed=%d -> dispatch",
+                             cc.hAsyncCall, cc.iCallback, sz, failed);
+                    wnb_resolver_log(b);
+                    wnb_dispatch_call_result(cc.hAsyncCall, failed,
+                                             payload, (size_t)sz);
+                }
+            }
+        } else {
+            char b[128];
+            snprintf(b, sizeof(b),
+                     "[wnb] pump: callback id=%d sz=%d -> dispatch",
+                     msg.iCallback, msg.cubParam);
+            wnb_resolver_log(b);
+            wnb_dispatch_callback(msg.iCallback, msg.pubParam,
+                                  (size_t)msg.cubParam);
+        }
+        g_steam_freelastcallback(g_steam_pipe);
+    }
+}
+
+static void* g_our_matchmaking = NULL;
+static void* g_our_matchmaking_servers = NULL;
+
+void* get_our_matchmaking(void) {
+    if (g_our_matchmaking == NULL)
+        g_our_matchmaking = resolve_interface(10, "SteamMatchMaking009");
+    return g_our_matchmaking;
+}
+
+void* get_our_matchmaking_servers(void) {
+    if (g_our_matchmaking_servers == NULL)
+        g_our_matchmaking_servers = resolve_interface(11, "SteamMatchMakingServers002");
+    return g_our_matchmaking_servers;
+}
+
+"""
+
+
+def main() -> int:
+    if not SRC.exists():
+        print(f"ERROR: {SRC} missing — run gen_forwarders.py first", file=sys.stderr)
+        return 1
+    text = SRC.read_text(encoding="utf-8", errors="replace")
+
+    out_lines = [PROLOGUE]
+    count = 0
+    for m in FUNC_RE.finditer(text):
+        name = m.group("name")
+        prefix = None
+        for p in OVERRIDE_PREFIXES:
+            if name.startswith(p):
+                prefix = p
+                break
+        if prefix is None:
+            continue
+        ret = m.group("ret").strip()
+        params = m.group("params").strip()
+        body = m.group("body")
+        slot_match = SLOT_RE.search(body)
+        if not slot_match:
+            print(f"WARNING: no vt[N] in {name}, skipping", file=sys.stderr)
+            continue
+        slot = int(slot_match.group(1))
+
+        # Build the params-list-without-self for forwarding the args.
+        # params text is like "void* self" or "void* self, int eLobbyType, ..."
+        # Split by `,`, drop the first (self), strip names. Reassemble
+        # types-only for the typedef + arg-names for the call.
+        plist = [p.strip() for p in params.split(",")]
+        if not plist or not plist[0].startswith("void* self"):
+            print(f"WARNING: {name} first param isn't `void* self`, skipping", file=sys.stderr)
+            continue
+        extra = plist[1:]  # everything after self
+        extra_types = []
+        extra_names = []
+        for i, p in enumerate(extra):
+            # parse "<type> <name>" — last whitespace splits
+            mm = re.match(r"(.*\S)\s+([A-Za-z_][A-Za-z0-9_]*)$", p)
+            if mm:
+                extra_types.append(mm.group(1).strip())
+                extra_names.append(mm.group(2).strip())
+            else:
+                # No name — synthesize
+                extra_types.append(p)
+                extra_names.append(f"_a{i}")
+
+        cfg = INTERFACE_CONFIG[prefix]
+        getter = f"get_our_matchmaking()" if cfg["cache_var"] == "g_our_matchmaking" \
+                 else f"get_our_matchmaking_servers()"
+
+        # Build typedef
+        if extra_types:
+            typedef = f"{ret} (*Fn)(void*, {', '.join(extra_types)})"
+            call_args = "mm, " + ", ".join(extra_names)
+            param_str = "void* self, " + ", ".join(extra)
+        else:
+            typedef = f"{ret} (*Fn)(void*)"
+            call_args = "mm"
+            param_str = "void* self"
+
+        out_lines.append(f"WN_STEAMAPI_EXPORT {ret} {name}({param_str}) {{")
+        out_lines.append(f'    wnb_log_once("{name}");')
+        out_lines.append(f"    (void)self;")
+        out_lines.append(f"    void* mm = {getter};")
+        if ret == "void":
+            out_lines.append(f"    if (mm == NULL) return;")
+        elif ret == "void*":
+            out_lines.append(f"    if (mm == NULL) return NULL;")
+        else:
+            out_lines.append(f"    if (mm == NULL) return 0;")
+        out_lines.append(f"    void** vt = *(void***)mm;")
+        out_lines.append(f"    typedef {typedef};")
+        prefix_ret = "" if ret == "void" else "return "
+        out_lines.append(f"    {prefix_ret}((Fn)vt[{slot}])({call_args});")
+        out_lines.append("}")
+        out_lines.append("")
+        count += 1
+
+    OUT.write_text("\n".join(out_lines), encoding="utf-8")
+    print(f"[gen_overrides] {count} routed-override stubs → {OUT}", file=sys.stderr)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge.def b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge.def
new file mode 100644
index 000000000..407f9acb2
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge.def
@@ -0,0 +1,1264 @@
+; AUTO-GENERATED by gen_forward_def.py — DO NOT EDIT.
+;
+; PE export forwarders → original_steam_api64.dll. The companion
+; gbe_fork (renamed at install time) provides every non-matchmaking
+; SteamAPI function. Our bridge's .text section only defines the
+; matchmaking overrides listed under EXPORTS without an `=`.
+;
+LIBRARY steam_api64
+EXPORTS
+    GetHSteamPipe = original_steam_api64.GetHSteamPipe
+    GetHSteamUser = original_steam_api64.GetHSteamUser
+    SteamAPI_GetSteamInstallPath = original_steam_api64.SteamAPI_GetSteamInstallPath
+    SteamAPI_ISteamAppList_GetAppBuildId = original_steam_api64.SteamAPI_ISteamAppList_GetAppBuildId
+    SteamAPI_ISteamAppList_GetAppInstallDir = original_steam_api64.SteamAPI_ISteamAppList_GetAppInstallDir
+    SteamAPI_ISteamAppList_GetAppName = original_steam_api64.SteamAPI_ISteamAppList_GetAppName
+    SteamAPI_ISteamAppList_GetInstalledApps = original_steam_api64.SteamAPI_ISteamAppList_GetInstalledApps
+    SteamAPI_ISteamAppList_GetNumInstalledApps = original_steam_api64.SteamAPI_ISteamAppList_GetNumInstalledApps
+    SteamAPI_ISteamApps_BGetDLCDataByIndex = original_steam_api64.SteamAPI_ISteamApps_BGetDLCDataByIndex
+    SteamAPI_ISteamApps_BIsAppInstalled = original_steam_api64.SteamAPI_ISteamApps_BIsAppInstalled
+    SteamAPI_ISteamApps_BIsCybercafe = original_steam_api64.SteamAPI_ISteamApps_BIsCybercafe
+    SteamAPI_ISteamApps_BIsDlcInstalled = original_steam_api64.SteamAPI_ISteamApps_BIsDlcInstalled
+    SteamAPI_ISteamApps_BIsLowViolence = original_steam_api64.SteamAPI_ISteamApps_BIsLowViolence
+    SteamAPI_ISteamApps_BIsSubscribed = original_steam_api64.SteamAPI_ISteamApps_BIsSubscribed
+    SteamAPI_ISteamApps_BIsSubscribedApp = original_steam_api64.SteamAPI_ISteamApps_BIsSubscribedApp
+    SteamAPI_ISteamApps_BIsSubscribedFromFamilySharing = original_steam_api64.SteamAPI_ISteamApps_BIsSubscribedFromFamilySharing
+    SteamAPI_ISteamApps_BIsSubscribedFromFreeWeekend = original_steam_api64.SteamAPI_ISteamApps_BIsSubscribedFromFreeWeekend
+    SteamAPI_ISteamApps_BIsTimedTrial = original_steam_api64.SteamAPI_ISteamApps_BIsTimedTrial
+    SteamAPI_ISteamApps_BIsVACBanned = original_steam_api64.SteamAPI_ISteamApps_BIsVACBanned
+    SteamAPI_ISteamApps_GetAppBuildId = original_steam_api64.SteamAPI_ISteamApps_GetAppBuildId
+    SteamAPI_ISteamApps_GetAppInstallDir = original_steam_api64.SteamAPI_ISteamApps_GetAppInstallDir
+    SteamAPI_ISteamApps_GetAppOwner = original_steam_api64.SteamAPI_ISteamApps_GetAppOwner
+    SteamAPI_ISteamApps_GetAvailableGameLanguages = original_steam_api64.SteamAPI_ISteamApps_GetAvailableGameLanguages
+    SteamAPI_ISteamApps_GetBetaInfo = original_steam_api64.SteamAPI_ISteamApps_GetBetaInfo
+    SteamAPI_ISteamApps_GetCurrentBetaName = original_steam_api64.SteamAPI_ISteamApps_GetCurrentBetaName
+    SteamAPI_ISteamApps_GetCurrentGameLanguage = original_steam_api64.SteamAPI_ISteamApps_GetCurrentGameLanguage
+    SteamAPI_ISteamApps_GetDLCCount = original_steam_api64.SteamAPI_ISteamApps_GetDLCCount
+    SteamAPI_ISteamApps_GetDlcDownloadProgress = original_steam_api64.SteamAPI_ISteamApps_GetDlcDownloadProgress
+    SteamAPI_ISteamApps_GetEarliestPurchaseUnixTime = original_steam_api64.SteamAPI_ISteamApps_GetEarliestPurchaseUnixTime
+    SteamAPI_ISteamApps_GetFileDetails = original_steam_api64.SteamAPI_ISteamApps_GetFileDetails
+    SteamAPI_ISteamApps_GetInstalledDepots = original_steam_api64.SteamAPI_ISteamApps_GetInstalledDepots
+    SteamAPI_ISteamApps_GetLaunchCommandLine = original_steam_api64.SteamAPI_ISteamApps_GetLaunchCommandLine
+    SteamAPI_ISteamApps_GetLaunchQueryParam = original_steam_api64.SteamAPI_ISteamApps_GetLaunchQueryParam
+    SteamAPI_ISteamApps_GetNumBetas = original_steam_api64.SteamAPI_ISteamApps_GetNumBetas
+    SteamAPI_ISteamApps_InstallDLC = original_steam_api64.SteamAPI_ISteamApps_InstallDLC
+    SteamAPI_ISteamApps_MarkContentCorrupt = original_steam_api64.SteamAPI_ISteamApps_MarkContentCorrupt
+    SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys = original_steam_api64.SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys
+    SteamAPI_ISteamApps_RequestAppProofOfPurchaseKey = original_steam_api64.SteamAPI_ISteamApps_RequestAppProofOfPurchaseKey
+    SteamAPI_ISteamApps_SetActiveBeta = original_steam_api64.SteamAPI_ISteamApps_SetActiveBeta
+    SteamAPI_ISteamApps_SetDlcContext = original_steam_api64.SteamAPI_ISteamApps_SetDlcContext
+    SteamAPI_ISteamApps_UninstallDLC = original_steam_api64.SteamAPI_ISteamApps_UninstallDLC
+    SteamAPI_ISteamClient_BReleaseSteamPipe = original_steam_api64.SteamAPI_ISteamClient_BReleaseSteamPipe
+    SteamAPI_ISteamClient_BShutdownIfAllPipesClosed = original_steam_api64.SteamAPI_ISteamClient_BShutdownIfAllPipesClosed
+    SteamAPI_ISteamClient_ConnectToGlobalUser = original_steam_api64.SteamAPI_ISteamClient_ConnectToGlobalUser
+    SteamAPI_ISteamClient_CreateLocalUser = original_steam_api64.SteamAPI_ISteamClient_CreateLocalUser
+    SteamAPI_ISteamClient_CreateSteamPipe = original_steam_api64.SteamAPI_ISteamClient_CreateSteamPipe
+    SteamAPI_ISteamClient_GetIPCCallCount = original_steam_api64.SteamAPI_ISteamClient_GetIPCCallCount
+    SteamAPI_ISteamClient_GetISteamAppList = original_steam_api64.SteamAPI_ISteamClient_GetISteamAppList
+    SteamAPI_ISteamClient_GetISteamApps = original_steam_api64.SteamAPI_ISteamClient_GetISteamApps
+    SteamAPI_ISteamClient_GetISteamController = original_steam_api64.SteamAPI_ISteamClient_GetISteamController
+    SteamAPI_ISteamClient_GetISteamFriends = original_steam_api64.SteamAPI_ISteamClient_GetISteamFriends
+    SteamAPI_ISteamClient_GetISteamGameSearch = original_steam_api64.SteamAPI_ISteamClient_GetISteamGameSearch
+    SteamAPI_ISteamClient_GetISteamGameServer = original_steam_api64.SteamAPI_ISteamClient_GetISteamGameServer
+    SteamAPI_ISteamClient_GetISteamGameServerStats = original_steam_api64.SteamAPI_ISteamClient_GetISteamGameServerStats
+    SteamAPI_ISteamClient_GetISteamGenericInterface = original_steam_api64.SteamAPI_ISteamClient_GetISteamGenericInterface
+    SteamAPI_ISteamClient_GetISteamHTMLSurface = original_steam_api64.SteamAPI_ISteamClient_GetISteamHTMLSurface
+    SteamAPI_ISteamClient_GetISteamHTTP = original_steam_api64.SteamAPI_ISteamClient_GetISteamHTTP
+    SteamAPI_ISteamClient_GetISteamInput = original_steam_api64.SteamAPI_ISteamClient_GetISteamInput
+    SteamAPI_ISteamClient_GetISteamInventory = original_steam_api64.SteamAPI_ISteamClient_GetISteamInventory
+    SteamAPI_ISteamClient_GetISteamMusic = original_steam_api64.SteamAPI_ISteamClient_GetISteamMusic
+    SteamAPI_ISteamClient_GetISteamMusicRemote = original_steam_api64.SteamAPI_ISteamClient_GetISteamMusicRemote
+    SteamAPI_ISteamClient_GetISteamNetworking = original_steam_api64.SteamAPI_ISteamClient_GetISteamNetworking
+    SteamAPI_ISteamClient_GetISteamParentalSettings = original_steam_api64.SteamAPI_ISteamClient_GetISteamParentalSettings
+    SteamAPI_ISteamClient_GetISteamParties = original_steam_api64.SteamAPI_ISteamClient_GetISteamParties
+    SteamAPI_ISteamClient_GetISteamRemotePlay = original_steam_api64.SteamAPI_ISteamClient_GetISteamRemotePlay
+    SteamAPI_ISteamClient_GetISteamRemoteStorage = original_steam_api64.SteamAPI_ISteamClient_GetISteamRemoteStorage
+    SteamAPI_ISteamClient_GetISteamScreenshots = original_steam_api64.SteamAPI_ISteamClient_GetISteamScreenshots
+    SteamAPI_ISteamClient_GetISteamUGC = original_steam_api64.SteamAPI_ISteamClient_GetISteamUGC
+    SteamAPI_ISteamClient_GetISteamUnifiedMessages = original_steam_api64.SteamAPI_ISteamClient_GetISteamUnifiedMessages
+    SteamAPI_ISteamClient_GetISteamUser = original_steam_api64.SteamAPI_ISteamClient_GetISteamUser
+    SteamAPI_ISteamClient_GetISteamUserStats = original_steam_api64.SteamAPI_ISteamClient_GetISteamUserStats
+    SteamAPI_ISteamClient_GetISteamUtils = original_steam_api64.SteamAPI_ISteamClient_GetISteamUtils
+    SteamAPI_ISteamClient_GetISteamVideo = original_steam_api64.SteamAPI_ISteamClient_GetISteamVideo
+    SteamAPI_ISteamClient_ReleaseUser = original_steam_api64.SteamAPI_ISteamClient_ReleaseUser
+    SteamAPI_ISteamClient_SetLocalIPBinding = original_steam_api64.SteamAPI_ISteamClient_SetLocalIPBinding
+    SteamAPI_ISteamClient_SetWarningMessageHook = original_steam_api64.SteamAPI_ISteamClient_SetWarningMessageHook
+    SteamAPI_ISteamController_ActivateActionSet = original_steam_api64.SteamAPI_ISteamController_ActivateActionSet
+    SteamAPI_ISteamController_ActivateActionSetLayer = original_steam_api64.SteamAPI_ISteamController_ActivateActionSetLayer
+    SteamAPI_ISteamController_DeactivateActionSetLayer = original_steam_api64.SteamAPI_ISteamController_DeactivateActionSetLayer
+    SteamAPI_ISteamController_DeactivateAllActionSetLayers = original_steam_api64.SteamAPI_ISteamController_DeactivateAllActionSetLayers
+    SteamAPI_ISteamController_GetActionOriginFromXboxOrigin = original_steam_api64.SteamAPI_ISteamController_GetActionOriginFromXboxOrigin
+    SteamAPI_ISteamController_GetActionSetHandle = original_steam_api64.SteamAPI_ISteamController_GetActionSetHandle
+    SteamAPI_ISteamController_GetActiveActionSetLayers = original_steam_api64.SteamAPI_ISteamController_GetActiveActionSetLayers
+    SteamAPI_ISteamController_GetAnalogActionData = original_steam_api64.SteamAPI_ISteamController_GetAnalogActionData
+    SteamAPI_ISteamController_GetAnalogActionHandle = original_steam_api64.SteamAPI_ISteamController_GetAnalogActionHandle
+    SteamAPI_ISteamController_GetAnalogActionOrigins = original_steam_api64.SteamAPI_ISteamController_GetAnalogActionOrigins
+    SteamAPI_ISteamController_GetConnectedControllers = original_steam_api64.SteamAPI_ISteamController_GetConnectedControllers
+    SteamAPI_ISteamController_GetControllerBindingRevision = original_steam_api64.SteamAPI_ISteamController_GetControllerBindingRevision
+    SteamAPI_ISteamController_GetControllerForGamepadIndex = original_steam_api64.SteamAPI_ISteamController_GetControllerForGamepadIndex
+    SteamAPI_ISteamController_GetCurrentActionSet = original_steam_api64.SteamAPI_ISteamController_GetCurrentActionSet
+    SteamAPI_ISteamController_GetDigitalActionData = original_steam_api64.SteamAPI_ISteamController_GetDigitalActionData
+    SteamAPI_ISteamController_GetDigitalActionHandle = original_steam_api64.SteamAPI_ISteamController_GetDigitalActionHandle
+    SteamAPI_ISteamController_GetDigitalActionOrigins = original_steam_api64.SteamAPI_ISteamController_GetDigitalActionOrigins
+    SteamAPI_ISteamController_GetGamepadIndexForController = original_steam_api64.SteamAPI_ISteamController_GetGamepadIndexForController
+    SteamAPI_ISteamController_GetGlyphForActionOrigin = original_steam_api64.SteamAPI_ISteamController_GetGlyphForActionOrigin
+    SteamAPI_ISteamController_GetGlyphForXboxOrigin = original_steam_api64.SteamAPI_ISteamController_GetGlyphForXboxOrigin
+    SteamAPI_ISteamController_GetInputTypeForHandle = original_steam_api64.SteamAPI_ISteamController_GetInputTypeForHandle
+    SteamAPI_ISteamController_GetMotionData = original_steam_api64.SteamAPI_ISteamController_GetMotionData
+    SteamAPI_ISteamController_GetStringForActionOrigin = original_steam_api64.SteamAPI_ISteamController_GetStringForActionOrigin
+    SteamAPI_ISteamController_GetStringForXboxOrigin = original_steam_api64.SteamAPI_ISteamController_GetStringForXboxOrigin
+    SteamAPI_ISteamController_Init = original_steam_api64.SteamAPI_ISteamController_Init
+    SteamAPI_ISteamController_RunFrame = original_steam_api64.SteamAPI_ISteamController_RunFrame
+    SteamAPI_ISteamController_SetLEDColor = original_steam_api64.SteamAPI_ISteamController_SetLEDColor
+    SteamAPI_ISteamController_ShowBindingPanel = original_steam_api64.SteamAPI_ISteamController_ShowBindingPanel
+    SteamAPI_ISteamController_Shutdown = original_steam_api64.SteamAPI_ISteamController_Shutdown
+    SteamAPI_ISteamController_StopAnalogActionMomentum = original_steam_api64.SteamAPI_ISteamController_StopAnalogActionMomentum
+    SteamAPI_ISteamController_TranslateActionOrigin = original_steam_api64.SteamAPI_ISteamController_TranslateActionOrigin
+    SteamAPI_ISteamController_TriggerHapticPulse = original_steam_api64.SteamAPI_ISteamController_TriggerHapticPulse
+    SteamAPI_ISteamController_TriggerRepeatedHapticPulse = original_steam_api64.SteamAPI_ISteamController_TriggerRepeatedHapticPulse
+    SteamAPI_ISteamController_TriggerVibration = original_steam_api64.SteamAPI_ISteamController_TriggerVibration
+    SteamAPI_ISteamFriends_ActivateGameOverlay = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlay
+    SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialog = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialog
+    SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialogConnectString = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialogConnectString
+    SteamAPI_ISteamFriends_ActivateGameOverlayRemotePlayTogetherInviteDialog = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlayRemotePlayTogetherInviteDialog
+    SteamAPI_ISteamFriends_ActivateGameOverlayToStore = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlayToStore
+    SteamAPI_ISteamFriends_ActivateGameOverlayToUser = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlayToUser
+    SteamAPI_ISteamFriends_ActivateGameOverlayToWebPage = original_steam_api64.SteamAPI_ISteamFriends_ActivateGameOverlayToWebPage
+    SteamAPI_ISteamFriends_BHasEquippedProfileItem = original_steam_api64.SteamAPI_ISteamFriends_BHasEquippedProfileItem
+    SteamAPI_ISteamFriends_ClearRichPresence = original_steam_api64.SteamAPI_ISteamFriends_ClearRichPresence
+    SteamAPI_ISteamFriends_CloseClanChatWindowInSteam = original_steam_api64.SteamAPI_ISteamFriends_CloseClanChatWindowInSteam
+    SteamAPI_ISteamFriends_DownloadClanActivityCounts = original_steam_api64.SteamAPI_ISteamFriends_DownloadClanActivityCounts
+    SteamAPI_ISteamFriends_EnumerateFollowingList = original_steam_api64.SteamAPI_ISteamFriends_EnumerateFollowingList
+    SteamAPI_ISteamFriends_GetChatMemberByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetChatMemberByIndex
+    SteamAPI_ISteamFriends_GetClanActivityCounts = original_steam_api64.SteamAPI_ISteamFriends_GetClanActivityCounts
+    SteamAPI_ISteamFriends_GetClanByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetClanByIndex
+    SteamAPI_ISteamFriends_GetClanChatMemberCount = original_steam_api64.SteamAPI_ISteamFriends_GetClanChatMemberCount
+    SteamAPI_ISteamFriends_GetClanChatMessage = original_steam_api64.SteamAPI_ISteamFriends_GetClanChatMessage
+    SteamAPI_ISteamFriends_GetClanCount = original_steam_api64.SteamAPI_ISteamFriends_GetClanCount
+    SteamAPI_ISteamFriends_GetClanName = original_steam_api64.SteamAPI_ISteamFriends_GetClanName
+    SteamAPI_ISteamFriends_GetClanOfficerByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetClanOfficerByIndex
+    SteamAPI_ISteamFriends_GetClanOfficerCount = original_steam_api64.SteamAPI_ISteamFriends_GetClanOfficerCount
+    SteamAPI_ISteamFriends_GetClanOwner = original_steam_api64.SteamAPI_ISteamFriends_GetClanOwner
+    SteamAPI_ISteamFriends_GetClanTag = original_steam_api64.SteamAPI_ISteamFriends_GetClanTag
+    SteamAPI_ISteamFriends_GetCoplayFriend = original_steam_api64.SteamAPI_ISteamFriends_GetCoplayFriend
+    SteamAPI_ISteamFriends_GetCoplayFriendCount = original_steam_api64.SteamAPI_ISteamFriends_GetCoplayFriendCount
+    SteamAPI_ISteamFriends_GetFollowerCount = original_steam_api64.SteamAPI_ISteamFriends_GetFollowerCount
+    SteamAPI_ISteamFriends_GetFriendByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetFriendByIndex
+    SteamAPI_ISteamFriends_GetFriendCoplayGame = original_steam_api64.SteamAPI_ISteamFriends_GetFriendCoplayGame
+    SteamAPI_ISteamFriends_GetFriendCoplayTime = original_steam_api64.SteamAPI_ISteamFriends_GetFriendCoplayTime
+    SteamAPI_ISteamFriends_GetFriendCount = original_steam_api64.SteamAPI_ISteamFriends_GetFriendCount
+    SteamAPI_ISteamFriends_GetFriendCountFromSource = original_steam_api64.SteamAPI_ISteamFriends_GetFriendCountFromSource
+    SteamAPI_ISteamFriends_GetFriendFromSourceByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetFriendFromSourceByIndex
+    SteamAPI_ISteamFriends_GetFriendGamePlayed = original_steam_api64.SteamAPI_ISteamFriends_GetFriendGamePlayed
+    SteamAPI_ISteamFriends_GetFriendMessage = original_steam_api64.SteamAPI_ISteamFriends_GetFriendMessage
+    SteamAPI_ISteamFriends_GetFriendPersonaName = original_steam_api64.SteamAPI_ISteamFriends_GetFriendPersonaName
+    SteamAPI_ISteamFriends_GetFriendPersonaNameHistory = original_steam_api64.SteamAPI_ISteamFriends_GetFriendPersonaNameHistory
+    SteamAPI_ISteamFriends_GetFriendPersonaState = original_steam_api64.SteamAPI_ISteamFriends_GetFriendPersonaState
+    SteamAPI_ISteamFriends_GetFriendRelationship = original_steam_api64.SteamAPI_ISteamFriends_GetFriendRelationship
+    SteamAPI_ISteamFriends_GetFriendRichPresence = original_steam_api64.SteamAPI_ISteamFriends_GetFriendRichPresence
+    SteamAPI_ISteamFriends_GetFriendRichPresenceKeyByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetFriendRichPresenceKeyByIndex
+    SteamAPI_ISteamFriends_GetFriendRichPresenceKeyCount = original_steam_api64.SteamAPI_ISteamFriends_GetFriendRichPresenceKeyCount
+    SteamAPI_ISteamFriends_GetFriendSteamLevel = original_steam_api64.SteamAPI_ISteamFriends_GetFriendSteamLevel
+    SteamAPI_ISteamFriends_GetFriendsGroupCount = original_steam_api64.SteamAPI_ISteamFriends_GetFriendsGroupCount
+    SteamAPI_ISteamFriends_GetFriendsGroupIDByIndex = original_steam_api64.SteamAPI_ISteamFriends_GetFriendsGroupIDByIndex
+    SteamAPI_ISteamFriends_GetFriendsGroupMembersCount = original_steam_api64.SteamAPI_ISteamFriends_GetFriendsGroupMembersCount
+    SteamAPI_ISteamFriends_GetFriendsGroupMembersList = original_steam_api64.SteamAPI_ISteamFriends_GetFriendsGroupMembersList
+    SteamAPI_ISteamFriends_GetFriendsGroupName = original_steam_api64.SteamAPI_ISteamFriends_GetFriendsGroupName
+    SteamAPI_ISteamFriends_GetLargeFriendAvatar = original_steam_api64.SteamAPI_ISteamFriends_GetLargeFriendAvatar
+    SteamAPI_ISteamFriends_GetMediumFriendAvatar = original_steam_api64.SteamAPI_ISteamFriends_GetMediumFriendAvatar
+    SteamAPI_ISteamFriends_GetNumChatsWithUnreadPriorityMessages = original_steam_api64.SteamAPI_ISteamFriends_GetNumChatsWithUnreadPriorityMessages
+    SteamAPI_ISteamFriends_GetPersonaName = original_steam_api64.SteamAPI_ISteamFriends_GetPersonaName
+    SteamAPI_ISteamFriends_GetPersonaState = original_steam_api64.SteamAPI_ISteamFriends_GetPersonaState
+    SteamAPI_ISteamFriends_GetPlayerNickname = original_steam_api64.SteamAPI_ISteamFriends_GetPlayerNickname
+    SteamAPI_ISteamFriends_GetProfileItemPropertyString = original_steam_api64.SteamAPI_ISteamFriends_GetProfileItemPropertyString
+    SteamAPI_ISteamFriends_GetProfileItemPropertyUint = original_steam_api64.SteamAPI_ISteamFriends_GetProfileItemPropertyUint
+    SteamAPI_ISteamFriends_GetSmallFriendAvatar = original_steam_api64.SteamAPI_ISteamFriends_GetSmallFriendAvatar
+    SteamAPI_ISteamFriends_GetUserRestrictions = original_steam_api64.SteamAPI_ISteamFriends_GetUserRestrictions
+    SteamAPI_ISteamFriends_HasFriend = original_steam_api64.SteamAPI_ISteamFriends_HasFriend
+    SteamAPI_ISteamFriends_InviteUserToGame = original_steam_api64.SteamAPI_ISteamFriends_InviteUserToGame
+    SteamAPI_ISteamFriends_IsClanChatAdmin = original_steam_api64.SteamAPI_ISteamFriends_IsClanChatAdmin
+    SteamAPI_ISteamFriends_IsClanChatWindowOpenInSteam = original_steam_api64.SteamAPI_ISteamFriends_IsClanChatWindowOpenInSteam
+    SteamAPI_ISteamFriends_IsClanOfficialGameGroup = original_steam_api64.SteamAPI_ISteamFriends_IsClanOfficialGameGroup
+    SteamAPI_ISteamFriends_IsClanPublic = original_steam_api64.SteamAPI_ISteamFriends_IsClanPublic
+    SteamAPI_ISteamFriends_IsFollowing = original_steam_api64.SteamAPI_ISteamFriends_IsFollowing
+    SteamAPI_ISteamFriends_IsUserInSource = original_steam_api64.SteamAPI_ISteamFriends_IsUserInSource
+    SteamAPI_ISteamFriends_JoinClanChatRoom = original_steam_api64.SteamAPI_ISteamFriends_JoinClanChatRoom
+    SteamAPI_ISteamFriends_LeaveClanChatRoom = original_steam_api64.SteamAPI_ISteamFriends_LeaveClanChatRoom
+    SteamAPI_ISteamFriends_OpenClanChatWindowInSteam = original_steam_api64.SteamAPI_ISteamFriends_OpenClanChatWindowInSteam
+    SteamAPI_ISteamFriends_RegisterProtocolInOverlayBrowser = original_steam_api64.SteamAPI_ISteamFriends_RegisterProtocolInOverlayBrowser
+    SteamAPI_ISteamFriends_ReplyToFriendMessage = original_steam_api64.SteamAPI_ISteamFriends_ReplyToFriendMessage
+    SteamAPI_ISteamFriends_RequestClanOfficerList = original_steam_api64.SteamAPI_ISteamFriends_RequestClanOfficerList
+    SteamAPI_ISteamFriends_RequestEquippedProfileItems = original_steam_api64.SteamAPI_ISteamFriends_RequestEquippedProfileItems
+    SteamAPI_ISteamFriends_RequestFriendRichPresence = original_steam_api64.SteamAPI_ISteamFriends_RequestFriendRichPresence
+    SteamAPI_ISteamFriends_RequestUserInformation = original_steam_api64.SteamAPI_ISteamFriends_RequestUserInformation
+    SteamAPI_ISteamFriends_SendClanChatMessage = original_steam_api64.SteamAPI_ISteamFriends_SendClanChatMessage
+    SteamAPI_ISteamFriends_SetInGameVoiceSpeaking = original_steam_api64.SteamAPI_ISteamFriends_SetInGameVoiceSpeaking
+    SteamAPI_ISteamFriends_SetListenForFriendsMessages = original_steam_api64.SteamAPI_ISteamFriends_SetListenForFriendsMessages
+    SteamAPI_ISteamFriends_SetPersonaName = original_steam_api64.SteamAPI_ISteamFriends_SetPersonaName
+    SteamAPI_ISteamFriends_SetPlayedWith = original_steam_api64.SteamAPI_ISteamFriends_SetPlayedWith
+    SteamAPI_ISteamFriends_SetRichPresence = original_steam_api64.SteamAPI_ISteamFriends_SetRichPresence
+    SteamAPI_ISteamGameSearch_AcceptGame = original_steam_api64.SteamAPI_ISteamGameSearch_AcceptGame
+    SteamAPI_ISteamGameSearch_AddGameSearchParams = original_steam_api64.SteamAPI_ISteamGameSearch_AddGameSearchParams
+    SteamAPI_ISteamGameSearch_CancelRequestPlayersForGame = original_steam_api64.SteamAPI_ISteamGameSearch_CancelRequestPlayersForGame
+    SteamAPI_ISteamGameSearch_DeclineGame = original_steam_api64.SteamAPI_ISteamGameSearch_DeclineGame
+    SteamAPI_ISteamGameSearch_EndGame = original_steam_api64.SteamAPI_ISteamGameSearch_EndGame
+    SteamAPI_ISteamGameSearch_EndGameSearch = original_steam_api64.SteamAPI_ISteamGameSearch_EndGameSearch
+    SteamAPI_ISteamGameSearch_HostConfirmGameStart = original_steam_api64.SteamAPI_ISteamGameSearch_HostConfirmGameStart
+    SteamAPI_ISteamGameSearch_RequestPlayersForGame = original_steam_api64.SteamAPI_ISteamGameSearch_RequestPlayersForGame
+    SteamAPI_ISteamGameSearch_RetrieveConnectionDetails = original_steam_api64.SteamAPI_ISteamGameSearch_RetrieveConnectionDetails
+    SteamAPI_ISteamGameSearch_SearchForGameSolo = original_steam_api64.SteamAPI_ISteamGameSearch_SearchForGameSolo
+    SteamAPI_ISteamGameSearch_SearchForGameWithLobby = original_steam_api64.SteamAPI_ISteamGameSearch_SearchForGameWithLobby
+    SteamAPI_ISteamGameSearch_SetConnectionDetails = original_steam_api64.SteamAPI_ISteamGameSearch_SetConnectionDetails
+    SteamAPI_ISteamGameSearch_SetGameHostParams = original_steam_api64.SteamAPI_ISteamGameSearch_SetGameHostParams
+    SteamAPI_ISteamGameSearch_SubmitPlayerResult = original_steam_api64.SteamAPI_ISteamGameSearch_SubmitPlayerResult
+    SteamAPI_ISteamGameServerStats_ClearUserAchievement = original_steam_api64.SteamAPI_ISteamGameServerStats_ClearUserAchievement
+    SteamAPI_ISteamGameServerStats_GetUserAchievement = original_steam_api64.SteamAPI_ISteamGameServerStats_GetUserAchievement
+    SteamAPI_ISteamGameServerStats_GetUserStat = original_steam_api64.SteamAPI_ISteamGameServerStats_GetUserStat
+    SteamAPI_ISteamGameServerStats_GetUserStat0 = original_steam_api64.SteamAPI_ISteamGameServerStats_GetUserStat0
+    SteamAPI_ISteamGameServerStats_GetUserStatFloat = original_steam_api64.SteamAPI_ISteamGameServerStats_GetUserStatFloat
+    SteamAPI_ISteamGameServerStats_GetUserStatInt32 = original_steam_api64.SteamAPI_ISteamGameServerStats_GetUserStatInt32
+    SteamAPI_ISteamGameServerStats_RequestUserStats = original_steam_api64.SteamAPI_ISteamGameServerStats_RequestUserStats
+    SteamAPI_ISteamGameServerStats_SetUserAchievement = original_steam_api64.SteamAPI_ISteamGameServerStats_SetUserAchievement
+    SteamAPI_ISteamGameServerStats_SetUserStat = original_steam_api64.SteamAPI_ISteamGameServerStats_SetUserStat
+    SteamAPI_ISteamGameServerStats_SetUserStat0 = original_steam_api64.SteamAPI_ISteamGameServerStats_SetUserStat0
+    SteamAPI_ISteamGameServerStats_SetUserStatFloat = original_steam_api64.SteamAPI_ISteamGameServerStats_SetUserStatFloat
+    SteamAPI_ISteamGameServerStats_SetUserStatInt32 = original_steam_api64.SteamAPI_ISteamGameServerStats_SetUserStatInt32
+    SteamAPI_ISteamGameServerStats_StoreUserStats = original_steam_api64.SteamAPI_ISteamGameServerStats_StoreUserStats
+    SteamAPI_ISteamGameServerStats_UpdateUserAvgRateStat = original_steam_api64.SteamAPI_ISteamGameServerStats_UpdateUserAvgRateStat
+    SteamAPI_ISteamGameServer_AssociateWithClan = original_steam_api64.SteamAPI_ISteamGameServer_AssociateWithClan
+    SteamAPI_ISteamGameServer_BLoggedOn = original_steam_api64.SteamAPI_ISteamGameServer_BLoggedOn
+    SteamAPI_ISteamGameServer_BSecure = original_steam_api64.SteamAPI_ISteamGameServer_BSecure
+    SteamAPI_ISteamGameServer_BUpdateUserData = original_steam_api64.SteamAPI_ISteamGameServer_BUpdateUserData
+    SteamAPI_ISteamGameServer_BeginAuthSession = original_steam_api64.SteamAPI_ISteamGameServer_BeginAuthSession
+    SteamAPI_ISteamGameServer_CancelAuthTicket = original_steam_api64.SteamAPI_ISteamGameServer_CancelAuthTicket
+    SteamAPI_ISteamGameServer_ClearAllKeyValues = original_steam_api64.SteamAPI_ISteamGameServer_ClearAllKeyValues
+    SteamAPI_ISteamGameServer_ComputeNewPlayerCompatibility = original_steam_api64.SteamAPI_ISteamGameServer_ComputeNewPlayerCompatibility
+    SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection = original_steam_api64.SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection
+    SteamAPI_ISteamGameServer_EnableHeartbeats = original_steam_api64.SteamAPI_ISteamGameServer_EnableHeartbeats
+    SteamAPI_ISteamGameServer_EndAuthSession = original_steam_api64.SteamAPI_ISteamGameServer_EndAuthSession
+    SteamAPI_ISteamGameServer_ForceHeartbeat = original_steam_api64.SteamAPI_ISteamGameServer_ForceHeartbeat
+    SteamAPI_ISteamGameServer_GetAuthSessionTicket = original_steam_api64.SteamAPI_ISteamGameServer_GetAuthSessionTicket
+    SteamAPI_ISteamGameServer_GetGameplayStats = original_steam_api64.SteamAPI_ISteamGameServer_GetGameplayStats
+    SteamAPI_ISteamGameServer_GetNextOutgoingPacket = original_steam_api64.SteamAPI_ISteamGameServer_GetNextOutgoingPacket
+    SteamAPI_ISteamGameServer_GetPublicIP = original_steam_api64.SteamAPI_ISteamGameServer_GetPublicIP
+    SteamAPI_ISteamGameServer_GetServerReputation = original_steam_api64.SteamAPI_ISteamGameServer_GetServerReputation
+    SteamAPI_ISteamGameServer_GetSteamID = original_steam_api64.SteamAPI_ISteamGameServer_GetSteamID
+    SteamAPI_ISteamGameServer_HandleIncomingPacket = original_steam_api64.SteamAPI_ISteamGameServer_HandleIncomingPacket
+    SteamAPI_ISteamGameServer_InitGameServer = original_steam_api64.SteamAPI_ISteamGameServer_InitGameServer
+    SteamAPI_ISteamGameServer_LogOff = original_steam_api64.SteamAPI_ISteamGameServer_LogOff
+    SteamAPI_ISteamGameServer_LogOn = original_steam_api64.SteamAPI_ISteamGameServer_LogOn
+    SteamAPI_ISteamGameServer_LogOnAnonymous = original_steam_api64.SteamAPI_ISteamGameServer_LogOnAnonymous
+    SteamAPI_ISteamGameServer_RequestUserGroupStatus = original_steam_api64.SteamAPI_ISteamGameServer_RequestUserGroupStatus
+    SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate = original_steam_api64.SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate
+    SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED = original_steam_api64.SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED
+    SteamAPI_ISteamGameServer_SendUserDisconnect = original_steam_api64.SteamAPI_ISteamGameServer_SendUserDisconnect
+    SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED = original_steam_api64.SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED
+    SteamAPI_ISteamGameServer_SetAdvertiseServerActive = original_steam_api64.SteamAPI_ISteamGameServer_SetAdvertiseServerActive
+    SteamAPI_ISteamGameServer_SetBotPlayerCount = original_steam_api64.SteamAPI_ISteamGameServer_SetBotPlayerCount
+    SteamAPI_ISteamGameServer_SetDedicatedServer = original_steam_api64.SteamAPI_ISteamGameServer_SetDedicatedServer
+    SteamAPI_ISteamGameServer_SetGameData = original_steam_api64.SteamAPI_ISteamGameServer_SetGameData
+    SteamAPI_ISteamGameServer_SetGameDescription = original_steam_api64.SteamAPI_ISteamGameServer_SetGameDescription
+    SteamAPI_ISteamGameServer_SetGameTags = original_steam_api64.SteamAPI_ISteamGameServer_SetGameTags
+    SteamAPI_ISteamGameServer_SetHeartbeatInterval = original_steam_api64.SteamAPI_ISteamGameServer_SetHeartbeatInterval
+    SteamAPI_ISteamGameServer_SetKeyValue = original_steam_api64.SteamAPI_ISteamGameServer_SetKeyValue
+    SteamAPI_ISteamGameServer_SetMapName = original_steam_api64.SteamAPI_ISteamGameServer_SetMapName
+    SteamAPI_ISteamGameServer_SetMaxPlayerCount = original_steam_api64.SteamAPI_ISteamGameServer_SetMaxPlayerCount
+    SteamAPI_ISteamGameServer_SetModDir = original_steam_api64.SteamAPI_ISteamGameServer_SetModDir
+    SteamAPI_ISteamGameServer_SetPasswordProtected = original_steam_api64.SteamAPI_ISteamGameServer_SetPasswordProtected
+    SteamAPI_ISteamGameServer_SetProduct = original_steam_api64.SteamAPI_ISteamGameServer_SetProduct
+    SteamAPI_ISteamGameServer_SetRegion = original_steam_api64.SteamAPI_ISteamGameServer_SetRegion
+    SteamAPI_ISteamGameServer_SetServerName = original_steam_api64.SteamAPI_ISteamGameServer_SetServerName
+    SteamAPI_ISteamGameServer_SetSpectatorPort = original_steam_api64.SteamAPI_ISteamGameServer_SetSpectatorPort
+    SteamAPI_ISteamGameServer_SetSpectatorServerName = original_steam_api64.SteamAPI_ISteamGameServer_SetSpectatorServerName
+    SteamAPI_ISteamGameServer_UserHasLicenseForApp = original_steam_api64.SteamAPI_ISteamGameServer_UserHasLicenseForApp
+    SteamAPI_ISteamGameServer_WasRestartRequested = original_steam_api64.SteamAPI_ISteamGameServer_WasRestartRequested
+    SteamAPI_ISteamHTMLSurface_AddHeader = original_steam_api64.SteamAPI_ISteamHTMLSurface_AddHeader
+    SteamAPI_ISteamHTMLSurface_AllowStartRequest = original_steam_api64.SteamAPI_ISteamHTMLSurface_AllowStartRequest
+    SteamAPI_ISteamHTMLSurface_CopyToClipboard = original_steam_api64.SteamAPI_ISteamHTMLSurface_CopyToClipboard
+    SteamAPI_ISteamHTMLSurface_CreateBrowser = original_steam_api64.SteamAPI_ISteamHTMLSurface_CreateBrowser
+    SteamAPI_ISteamHTMLSurface_DestructISteamHTMLSurface = original_steam_api64.SteamAPI_ISteamHTMLSurface_DestructISteamHTMLSurface
+    SteamAPI_ISteamHTMLSurface_ExecuteJavascript = original_steam_api64.SteamAPI_ISteamHTMLSurface_ExecuteJavascript
+    SteamAPI_ISteamHTMLSurface_FileLoadDialogResponse = original_steam_api64.SteamAPI_ISteamHTMLSurface_FileLoadDialogResponse
+    SteamAPI_ISteamHTMLSurface_Find = original_steam_api64.SteamAPI_ISteamHTMLSurface_Find
+    SteamAPI_ISteamHTMLSurface_GetLinkAtPosition = original_steam_api64.SteamAPI_ISteamHTMLSurface_GetLinkAtPosition
+    SteamAPI_ISteamHTMLSurface_GoBack = original_steam_api64.SteamAPI_ISteamHTMLSurface_GoBack
+    SteamAPI_ISteamHTMLSurface_GoForward = original_steam_api64.SteamAPI_ISteamHTMLSurface_GoForward
+    SteamAPI_ISteamHTMLSurface_Init = original_steam_api64.SteamAPI_ISteamHTMLSurface_Init
+    SteamAPI_ISteamHTMLSurface_JSDialogResponse = original_steam_api64.SteamAPI_ISteamHTMLSurface_JSDialogResponse
+    SteamAPI_ISteamHTMLSurface_KeyChar = original_steam_api64.SteamAPI_ISteamHTMLSurface_KeyChar
+    SteamAPI_ISteamHTMLSurface_KeyDown = original_steam_api64.SteamAPI_ISteamHTMLSurface_KeyDown
+    SteamAPI_ISteamHTMLSurface_KeyUp = original_steam_api64.SteamAPI_ISteamHTMLSurface_KeyUp
+    SteamAPI_ISteamHTMLSurface_LoadURL = original_steam_api64.SteamAPI_ISteamHTMLSurface_LoadURL
+    SteamAPI_ISteamHTMLSurface_MouseDoubleClick = original_steam_api64.SteamAPI_ISteamHTMLSurface_MouseDoubleClick
+    SteamAPI_ISteamHTMLSurface_MouseDown = original_steam_api64.SteamAPI_ISteamHTMLSurface_MouseDown
+    SteamAPI_ISteamHTMLSurface_MouseMove = original_steam_api64.SteamAPI_ISteamHTMLSurface_MouseMove
+    SteamAPI_ISteamHTMLSurface_MouseUp = original_steam_api64.SteamAPI_ISteamHTMLSurface_MouseUp
+    SteamAPI_ISteamHTMLSurface_MouseWheel = original_steam_api64.SteamAPI_ISteamHTMLSurface_MouseWheel
+    SteamAPI_ISteamHTMLSurface_OpenDeveloperTools = original_steam_api64.SteamAPI_ISteamHTMLSurface_OpenDeveloperTools
+    SteamAPI_ISteamHTMLSurface_PasteFromClipboard = original_steam_api64.SteamAPI_ISteamHTMLSurface_PasteFromClipboard
+    SteamAPI_ISteamHTMLSurface_Reload = original_steam_api64.SteamAPI_ISteamHTMLSurface_Reload
+    SteamAPI_ISteamHTMLSurface_RemoveBrowser = original_steam_api64.SteamAPI_ISteamHTMLSurface_RemoveBrowser
+    SteamAPI_ISteamHTMLSurface_SetBackgroundMode = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetBackgroundMode
+    SteamAPI_ISteamHTMLSurface_SetCookie = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetCookie
+    SteamAPI_ISteamHTMLSurface_SetDPIScalingFactor = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetDPIScalingFactor
+    SteamAPI_ISteamHTMLSurface_SetHorizontalScroll = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetHorizontalScroll
+    SteamAPI_ISteamHTMLSurface_SetKeyFocus = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetKeyFocus
+    SteamAPI_ISteamHTMLSurface_SetPageScaleFactor = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetPageScaleFactor
+    SteamAPI_ISteamHTMLSurface_SetSize = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetSize
+    SteamAPI_ISteamHTMLSurface_SetVerticalScroll = original_steam_api64.SteamAPI_ISteamHTMLSurface_SetVerticalScroll
+    SteamAPI_ISteamHTMLSurface_Shutdown = original_steam_api64.SteamAPI_ISteamHTMLSurface_Shutdown
+    SteamAPI_ISteamHTMLSurface_StopFind = original_steam_api64.SteamAPI_ISteamHTMLSurface_StopFind
+    SteamAPI_ISteamHTMLSurface_StopLoad = original_steam_api64.SteamAPI_ISteamHTMLSurface_StopLoad
+    SteamAPI_ISteamHTMLSurface_ViewSource = original_steam_api64.SteamAPI_ISteamHTMLSurface_ViewSource
+    SteamAPI_ISteamHTTP_CreateCookieContainer = original_steam_api64.SteamAPI_ISteamHTTP_CreateCookieContainer
+    SteamAPI_ISteamHTTP_CreateHTTPRequest = original_steam_api64.SteamAPI_ISteamHTTP_CreateHTTPRequest
+    SteamAPI_ISteamHTTP_DeferHTTPRequest = original_steam_api64.SteamAPI_ISteamHTTP_DeferHTTPRequest
+    SteamAPI_ISteamHTTP_GetHTTPDownloadProgressPct = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPDownloadProgressPct
+    SteamAPI_ISteamHTTP_GetHTTPRequestWasTimedOut = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPRequestWasTimedOut
+    SteamAPI_ISteamHTTP_GetHTTPResponseBodyData = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPResponseBodyData
+    SteamAPI_ISteamHTTP_GetHTTPResponseBodySize = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPResponseBodySize
+    SteamAPI_ISteamHTTP_GetHTTPResponseHeaderSize = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPResponseHeaderSize
+    SteamAPI_ISteamHTTP_GetHTTPResponseHeaderValue = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPResponseHeaderValue
+    SteamAPI_ISteamHTTP_GetHTTPStreamingResponseBodyData = original_steam_api64.SteamAPI_ISteamHTTP_GetHTTPStreamingResponseBodyData
+    SteamAPI_ISteamHTTP_PrioritizeHTTPRequest = original_steam_api64.SteamAPI_ISteamHTTP_PrioritizeHTTPRequest
+    SteamAPI_ISteamHTTP_ReleaseCookieContainer = original_steam_api64.SteamAPI_ISteamHTTP_ReleaseCookieContainer
+    SteamAPI_ISteamHTTP_ReleaseHTTPRequest = original_steam_api64.SteamAPI_ISteamHTTP_ReleaseHTTPRequest
+    SteamAPI_ISteamHTTP_SendHTTPRequest = original_steam_api64.SteamAPI_ISteamHTTP_SendHTTPRequest
+    SteamAPI_ISteamHTTP_SendHTTPRequestAndStreamResponse = original_steam_api64.SteamAPI_ISteamHTTP_SendHTTPRequestAndStreamResponse
+    SteamAPI_ISteamHTTP_SetCookie = original_steam_api64.SteamAPI_ISteamHTTP_SetCookie
+    SteamAPI_ISteamHTTP_SetHTTPRequestAbsoluteTimeoutMS = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestAbsoluteTimeoutMS
+    SteamAPI_ISteamHTTP_SetHTTPRequestContextValue = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestContextValue
+    SteamAPI_ISteamHTTP_SetHTTPRequestCookieContainer = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestCookieContainer
+    SteamAPI_ISteamHTTP_SetHTTPRequestGetOrPostParameter = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestGetOrPostParameter
+    SteamAPI_ISteamHTTP_SetHTTPRequestHeaderValue = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestHeaderValue
+    SteamAPI_ISteamHTTP_SetHTTPRequestNetworkActivityTimeout = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestNetworkActivityTimeout
+    SteamAPI_ISteamHTTP_SetHTTPRequestRawPostBody = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestRawPostBody
+    SteamAPI_ISteamHTTP_SetHTTPRequestRequiresVerifiedCertificate = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestRequiresVerifiedCertificate
+    SteamAPI_ISteamHTTP_SetHTTPRequestUserAgentInfo = original_steam_api64.SteamAPI_ISteamHTTP_SetHTTPRequestUserAgentInfo
+    SteamAPI_ISteamInput_ActivateActionSet = original_steam_api64.SteamAPI_ISteamInput_ActivateActionSet
+    SteamAPI_ISteamInput_ActivateActionSetLayer = original_steam_api64.SteamAPI_ISteamInput_ActivateActionSetLayer
+    SteamAPI_ISteamInput_BNewDataAvailable = original_steam_api64.SteamAPI_ISteamInput_BNewDataAvailable
+    SteamAPI_ISteamInput_BWaitForData = original_steam_api64.SteamAPI_ISteamInput_BWaitForData
+    SteamAPI_ISteamInput_DeactivateActionSetLayer = original_steam_api64.SteamAPI_ISteamInput_DeactivateActionSetLayer
+    SteamAPI_ISteamInput_DeactivateAllActionSetLayers = original_steam_api64.SteamAPI_ISteamInput_DeactivateAllActionSetLayers
+    SteamAPI_ISteamInput_EnableActionEventCallbacks = original_steam_api64.SteamAPI_ISteamInput_EnableActionEventCallbacks
+    SteamAPI_ISteamInput_EnableDeviceCallbacks = original_steam_api64.SteamAPI_ISteamInput_EnableDeviceCallbacks
+    SteamAPI_ISteamInput_GetActionOriginFromXboxOrigin = original_steam_api64.SteamAPI_ISteamInput_GetActionOriginFromXboxOrigin
+    SteamAPI_ISteamInput_GetActionSetHandle = original_steam_api64.SteamAPI_ISteamInput_GetActionSetHandle
+    SteamAPI_ISteamInput_GetActiveActionSetLayers = original_steam_api64.SteamAPI_ISteamInput_GetActiveActionSetLayers
+    SteamAPI_ISteamInput_GetAnalogActionData = original_steam_api64.SteamAPI_ISteamInput_GetAnalogActionData
+    SteamAPI_ISteamInput_GetAnalogActionHandle = original_steam_api64.SteamAPI_ISteamInput_GetAnalogActionHandle
+    SteamAPI_ISteamInput_GetAnalogActionOrigins = original_steam_api64.SteamAPI_ISteamInput_GetAnalogActionOrigins
+    SteamAPI_ISteamInput_GetConnectedControllers = original_steam_api64.SteamAPI_ISteamInput_GetConnectedControllers
+    SteamAPI_ISteamInput_GetControllerForGamepadIndex = original_steam_api64.SteamAPI_ISteamInput_GetControllerForGamepadIndex
+    SteamAPI_ISteamInput_GetCurrentActionSet = original_steam_api64.SteamAPI_ISteamInput_GetCurrentActionSet
+    SteamAPI_ISteamInput_GetDeviceBindingRevision = original_steam_api64.SteamAPI_ISteamInput_GetDeviceBindingRevision
+    SteamAPI_ISteamInput_GetDigitalActionData = original_steam_api64.SteamAPI_ISteamInput_GetDigitalActionData
+    SteamAPI_ISteamInput_GetDigitalActionHandle = original_steam_api64.SteamAPI_ISteamInput_GetDigitalActionHandle
+    SteamAPI_ISteamInput_GetDigitalActionOrigins = original_steam_api64.SteamAPI_ISteamInput_GetDigitalActionOrigins
+    SteamAPI_ISteamInput_GetGamepadIndexForController = original_steam_api64.SteamAPI_ISteamInput_GetGamepadIndexForController
+    SteamAPI_ISteamInput_GetGlyphForActionOrigin = original_steam_api64.SteamAPI_ISteamInput_GetGlyphForActionOrigin
+    SteamAPI_ISteamInput_GetGlyphForActionOrigin_Legacy = original_steam_api64.SteamAPI_ISteamInput_GetGlyphForActionOrigin_Legacy
+    SteamAPI_ISteamInput_GetGlyphForXboxOrigin = original_steam_api64.SteamAPI_ISteamInput_GetGlyphForXboxOrigin
+    SteamAPI_ISteamInput_GetGlyphPNGForActionOrigin = original_steam_api64.SteamAPI_ISteamInput_GetGlyphPNGForActionOrigin
+    SteamAPI_ISteamInput_GetGlyphSVGForActionOrigin = original_steam_api64.SteamAPI_ISteamInput_GetGlyphSVGForActionOrigin
+    SteamAPI_ISteamInput_GetInputTypeForHandle = original_steam_api64.SteamAPI_ISteamInput_GetInputTypeForHandle
+    SteamAPI_ISteamInput_GetMotionData = original_steam_api64.SteamAPI_ISteamInput_GetMotionData
+    SteamAPI_ISteamInput_GetRemotePlaySessionID = original_steam_api64.SteamAPI_ISteamInput_GetRemotePlaySessionID
+    SteamAPI_ISteamInput_GetSessionInputConfigurationSettings = original_steam_api64.SteamAPI_ISteamInput_GetSessionInputConfigurationSettings
+    SteamAPI_ISteamInput_GetStringForActionOrigin = original_steam_api64.SteamAPI_ISteamInput_GetStringForActionOrigin
+    SteamAPI_ISteamInput_GetStringForAnalogActionName = original_steam_api64.SteamAPI_ISteamInput_GetStringForAnalogActionName
+    SteamAPI_ISteamInput_GetStringForDigitalActionName = original_steam_api64.SteamAPI_ISteamInput_GetStringForDigitalActionName
+    SteamAPI_ISteamInput_GetStringForXboxOrigin = original_steam_api64.SteamAPI_ISteamInput_GetStringForXboxOrigin
+    SteamAPI_ISteamInput_Init = original_steam_api64.SteamAPI_ISteamInput_Init
+    SteamAPI_ISteamInput_Legacy_TriggerHapticPulse = original_steam_api64.SteamAPI_ISteamInput_Legacy_TriggerHapticPulse
+    SteamAPI_ISteamInput_Legacy_TriggerRepeatedHapticPulse = original_steam_api64.SteamAPI_ISteamInput_Legacy_TriggerRepeatedHapticPulse
+    SteamAPI_ISteamInput_RunFrame = original_steam_api64.SteamAPI_ISteamInput_RunFrame
+    SteamAPI_ISteamInput_SetDualSenseTriggerEffect = original_steam_api64.SteamAPI_ISteamInput_SetDualSenseTriggerEffect
+    SteamAPI_ISteamInput_SetInputActionManifestFilePath = original_steam_api64.SteamAPI_ISteamInput_SetInputActionManifestFilePath
+    SteamAPI_ISteamInput_SetLEDColor = original_steam_api64.SteamAPI_ISteamInput_SetLEDColor
+    SteamAPI_ISteamInput_ShowBindingPanel = original_steam_api64.SteamAPI_ISteamInput_ShowBindingPanel
+    SteamAPI_ISteamInput_Shutdown = original_steam_api64.SteamAPI_ISteamInput_Shutdown
+    SteamAPI_ISteamInput_StopAnalogActionMomentum = original_steam_api64.SteamAPI_ISteamInput_StopAnalogActionMomentum
+    SteamAPI_ISteamInput_TranslateActionOrigin = original_steam_api64.SteamAPI_ISteamInput_TranslateActionOrigin
+    SteamAPI_ISteamInput_TriggerHapticPulse = original_steam_api64.SteamAPI_ISteamInput_TriggerHapticPulse
+    SteamAPI_ISteamInput_TriggerRepeatedHapticPulse = original_steam_api64.SteamAPI_ISteamInput_TriggerRepeatedHapticPulse
+    SteamAPI_ISteamInput_TriggerSimpleHapticEvent = original_steam_api64.SteamAPI_ISteamInput_TriggerSimpleHapticEvent
+    SteamAPI_ISteamInput_TriggerVibration = original_steam_api64.SteamAPI_ISteamInput_TriggerVibration
+    SteamAPI_ISteamInput_TriggerVibrationExtended = original_steam_api64.SteamAPI_ISteamInput_TriggerVibrationExtended
+    SteamAPI_ISteamInventory_AddPromoItem = original_steam_api64.SteamAPI_ISteamInventory_AddPromoItem
+    SteamAPI_ISteamInventory_AddPromoItems = original_steam_api64.SteamAPI_ISteamInventory_AddPromoItems
+    SteamAPI_ISteamInventory_CheckResultSteamID = original_steam_api64.SteamAPI_ISteamInventory_CheckResultSteamID
+    SteamAPI_ISteamInventory_ConsumeItem = original_steam_api64.SteamAPI_ISteamInventory_ConsumeItem
+    SteamAPI_ISteamInventory_DeserializeResult = original_steam_api64.SteamAPI_ISteamInventory_DeserializeResult
+    SteamAPI_ISteamInventory_DestroyResult = original_steam_api64.SteamAPI_ISteamInventory_DestroyResult
+    SteamAPI_ISteamInventory_ExchangeItems = original_steam_api64.SteamAPI_ISteamInventory_ExchangeItems
+    SteamAPI_ISteamInventory_GenerateItems = original_steam_api64.SteamAPI_ISteamInventory_GenerateItems
+    SteamAPI_ISteamInventory_GetAllItems = original_steam_api64.SteamAPI_ISteamInventory_GetAllItems
+    SteamAPI_ISteamInventory_GetEligiblePromoItemDefinitionIDs = original_steam_api64.SteamAPI_ISteamInventory_GetEligiblePromoItemDefinitionIDs
+    SteamAPI_ISteamInventory_GetItemDefinitionIDs = original_steam_api64.SteamAPI_ISteamInventory_GetItemDefinitionIDs
+    SteamAPI_ISteamInventory_GetItemDefinitionProperty = original_steam_api64.SteamAPI_ISteamInventory_GetItemDefinitionProperty
+    SteamAPI_ISteamInventory_GetItemPrice = original_steam_api64.SteamAPI_ISteamInventory_GetItemPrice
+    SteamAPI_ISteamInventory_GetItemsByID = original_steam_api64.SteamAPI_ISteamInventory_GetItemsByID
+    SteamAPI_ISteamInventory_GetItemsWithPrices = original_steam_api64.SteamAPI_ISteamInventory_GetItemsWithPrices
+    SteamAPI_ISteamInventory_GetNumItemsWithPrices = original_steam_api64.SteamAPI_ISteamInventory_GetNumItemsWithPrices
+    SteamAPI_ISteamInventory_GetResultItemProperty = original_steam_api64.SteamAPI_ISteamInventory_GetResultItemProperty
+    SteamAPI_ISteamInventory_GetResultItems = original_steam_api64.SteamAPI_ISteamInventory_GetResultItems
+    SteamAPI_ISteamInventory_GetResultStatus = original_steam_api64.SteamAPI_ISteamInventory_GetResultStatus
+    SteamAPI_ISteamInventory_GetResultTimestamp = original_steam_api64.SteamAPI_ISteamInventory_GetResultTimestamp
+    SteamAPI_ISteamInventory_GrantPromoItems = original_steam_api64.SteamAPI_ISteamInventory_GrantPromoItems
+    SteamAPI_ISteamInventory_InspectItem = original_steam_api64.SteamAPI_ISteamInventory_InspectItem
+    SteamAPI_ISteamInventory_LoadItemDefinitions = original_steam_api64.SteamAPI_ISteamInventory_LoadItemDefinitions
+    SteamAPI_ISteamInventory_RemoveProperty = original_steam_api64.SteamAPI_ISteamInventory_RemoveProperty
+    SteamAPI_ISteamInventory_RequestEligiblePromoItemDefinitionsIDs = original_steam_api64.SteamAPI_ISteamInventory_RequestEligiblePromoItemDefinitionsIDs
+    SteamAPI_ISteamInventory_RequestPrices = original_steam_api64.SteamAPI_ISteamInventory_RequestPrices
+    SteamAPI_ISteamInventory_SendItemDropHeartbeat = original_steam_api64.SteamAPI_ISteamInventory_SendItemDropHeartbeat
+    SteamAPI_ISteamInventory_SerializeResult = original_steam_api64.SteamAPI_ISteamInventory_SerializeResult
+    SteamAPI_ISteamInventory_SetProperty = original_steam_api64.SteamAPI_ISteamInventory_SetProperty
+    SteamAPI_ISteamInventory_SetProperty0 = original_steam_api64.SteamAPI_ISteamInventory_SetProperty0
+    SteamAPI_ISteamInventory_SetProperty1 = original_steam_api64.SteamAPI_ISteamInventory_SetProperty1
+    SteamAPI_ISteamInventory_SetProperty2 = original_steam_api64.SteamAPI_ISteamInventory_SetProperty2
+    SteamAPI_ISteamInventory_SetPropertyBool = original_steam_api64.SteamAPI_ISteamInventory_SetPropertyBool
+    SteamAPI_ISteamInventory_SetPropertyFloat = original_steam_api64.SteamAPI_ISteamInventory_SetPropertyFloat
+    SteamAPI_ISteamInventory_SetPropertyInt64 = original_steam_api64.SteamAPI_ISteamInventory_SetPropertyInt64
+    SteamAPI_ISteamInventory_SetPropertyString = original_steam_api64.SteamAPI_ISteamInventory_SetPropertyString
+    SteamAPI_ISteamInventory_StartPurchase = original_steam_api64.SteamAPI_ISteamInventory_StartPurchase
+    SteamAPI_ISteamInventory_StartUpdateProperties = original_steam_api64.SteamAPI_ISteamInventory_StartUpdateProperties
+    SteamAPI_ISteamInventory_SubmitUpdateProperties = original_steam_api64.SteamAPI_ISteamInventory_SubmitUpdateProperties
+    SteamAPI_ISteamInventory_TradeItems = original_steam_api64.SteamAPI_ISteamInventory_TradeItems
+    SteamAPI_ISteamInventory_TransferItemQuantity = original_steam_api64.SteamAPI_ISteamInventory_TransferItemQuantity
+    SteamAPI_ISteamInventory_TriggerItemDrop = original_steam_api64.SteamAPI_ISteamInventory_TriggerItemDrop
+    SteamAPI_ISteamMatchmakingPingResponse_ServerFailedToRespond = original_steam_api64.SteamAPI_ISteamMatchmakingPingResponse_ServerFailedToRespond
+    SteamAPI_ISteamMatchmakingPingResponse_ServerResponded = original_steam_api64.SteamAPI_ISteamMatchmakingPingResponse_ServerResponded
+    SteamAPI_ISteamMatchmakingPlayersResponse_AddPlayerToList = original_steam_api64.SteamAPI_ISteamMatchmakingPlayersResponse_AddPlayerToList
+    SteamAPI_ISteamMatchmakingPlayersResponse_PlayersFailedToRespond = original_steam_api64.SteamAPI_ISteamMatchmakingPlayersResponse_PlayersFailedToRespond
+    SteamAPI_ISteamMatchmakingPlayersResponse_PlayersRefreshComplete = original_steam_api64.SteamAPI_ISteamMatchmakingPlayersResponse_PlayersRefreshComplete
+    SteamAPI_ISteamMatchmakingRulesResponse_RulesFailedToRespond = original_steam_api64.SteamAPI_ISteamMatchmakingRulesResponse_RulesFailedToRespond
+    SteamAPI_ISteamMatchmakingRulesResponse_RulesRefreshComplete = original_steam_api64.SteamAPI_ISteamMatchmakingRulesResponse_RulesRefreshComplete
+    SteamAPI_ISteamMatchmakingRulesResponse_RulesResponded = original_steam_api64.SteamAPI_ISteamMatchmakingRulesResponse_RulesResponded
+    SteamAPI_ISteamMatchmakingServerListResponse_RefreshComplete = original_steam_api64.SteamAPI_ISteamMatchmakingServerListResponse_RefreshComplete
+    SteamAPI_ISteamMatchmakingServerListResponse_ServerFailedToRespond = original_steam_api64.SteamAPI_ISteamMatchmakingServerListResponse_ServerFailedToRespond
+    SteamAPI_ISteamMatchmakingServerListResponse_ServerResponded = original_steam_api64.SteamAPI_ISteamMatchmakingServerListResponse_ServerResponded
+    SteamAPI_ISteamMusicRemote_BActivationSuccess = original_steam_api64.SteamAPI_ISteamMusicRemote_BActivationSuccess
+    SteamAPI_ISteamMusicRemote_BIsCurrentMusicRemote = original_steam_api64.SteamAPI_ISteamMusicRemote_BIsCurrentMusicRemote
+    SteamAPI_ISteamMusicRemote_CurrentEntryDidChange = original_steam_api64.SteamAPI_ISteamMusicRemote_CurrentEntryDidChange
+    SteamAPI_ISteamMusicRemote_CurrentEntryIsAvailable = original_steam_api64.SteamAPI_ISteamMusicRemote_CurrentEntryIsAvailable
+    SteamAPI_ISteamMusicRemote_CurrentEntryWillChange = original_steam_api64.SteamAPI_ISteamMusicRemote_CurrentEntryWillChange
+    SteamAPI_ISteamMusicRemote_DeregisterSteamMusicRemote = original_steam_api64.SteamAPI_ISteamMusicRemote_DeregisterSteamMusicRemote
+    SteamAPI_ISteamMusicRemote_EnableLooped = original_steam_api64.SteamAPI_ISteamMusicRemote_EnableLooped
+    SteamAPI_ISteamMusicRemote_EnablePlayNext = original_steam_api64.SteamAPI_ISteamMusicRemote_EnablePlayNext
+    SteamAPI_ISteamMusicRemote_EnablePlayPrevious = original_steam_api64.SteamAPI_ISteamMusicRemote_EnablePlayPrevious
+    SteamAPI_ISteamMusicRemote_EnablePlaylists = original_steam_api64.SteamAPI_ISteamMusicRemote_EnablePlaylists
+    SteamAPI_ISteamMusicRemote_EnableQueue = original_steam_api64.SteamAPI_ISteamMusicRemote_EnableQueue
+    SteamAPI_ISteamMusicRemote_EnableShuffled = original_steam_api64.SteamAPI_ISteamMusicRemote_EnableShuffled
+    SteamAPI_ISteamMusicRemote_PlaylistDidChange = original_steam_api64.SteamAPI_ISteamMusicRemote_PlaylistDidChange
+    SteamAPI_ISteamMusicRemote_PlaylistWillChange = original_steam_api64.SteamAPI_ISteamMusicRemote_PlaylistWillChange
+    SteamAPI_ISteamMusicRemote_QueueDidChange = original_steam_api64.SteamAPI_ISteamMusicRemote_QueueDidChange
+    SteamAPI_ISteamMusicRemote_QueueWillChange = original_steam_api64.SteamAPI_ISteamMusicRemote_QueueWillChange
+    SteamAPI_ISteamMusicRemote_RegisterSteamMusicRemote = original_steam_api64.SteamAPI_ISteamMusicRemote_RegisterSteamMusicRemote
+    SteamAPI_ISteamMusicRemote_ResetPlaylistEntries = original_steam_api64.SteamAPI_ISteamMusicRemote_ResetPlaylistEntries
+    SteamAPI_ISteamMusicRemote_ResetQueueEntries = original_steam_api64.SteamAPI_ISteamMusicRemote_ResetQueueEntries
+    SteamAPI_ISteamMusicRemote_SetCurrentPlaylistEntry = original_steam_api64.SteamAPI_ISteamMusicRemote_SetCurrentPlaylistEntry
+    SteamAPI_ISteamMusicRemote_SetCurrentQueueEntry = original_steam_api64.SteamAPI_ISteamMusicRemote_SetCurrentQueueEntry
+    SteamAPI_ISteamMusicRemote_SetDisplayName = original_steam_api64.SteamAPI_ISteamMusicRemote_SetDisplayName
+    SteamAPI_ISteamMusicRemote_SetPNGIcon_64x64 = original_steam_api64.SteamAPI_ISteamMusicRemote_SetPNGIcon_64x64
+    SteamAPI_ISteamMusicRemote_SetPlaylistEntry = original_steam_api64.SteamAPI_ISteamMusicRemote_SetPlaylistEntry
+    SteamAPI_ISteamMusicRemote_SetQueueEntry = original_steam_api64.SteamAPI_ISteamMusicRemote_SetQueueEntry
+    SteamAPI_ISteamMusicRemote_UpdateCurrentEntryCoverArt = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdateCurrentEntryCoverArt
+    SteamAPI_ISteamMusicRemote_UpdateCurrentEntryElapsedSeconds = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdateCurrentEntryElapsedSeconds
+    SteamAPI_ISteamMusicRemote_UpdateCurrentEntryText = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdateCurrentEntryText
+    SteamAPI_ISteamMusicRemote_UpdateLooped = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdateLooped
+    SteamAPI_ISteamMusicRemote_UpdatePlaybackStatus = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdatePlaybackStatus
+    SteamAPI_ISteamMusicRemote_UpdateShuffled = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdateShuffled
+    SteamAPI_ISteamMusicRemote_UpdateVolume = original_steam_api64.SteamAPI_ISteamMusicRemote_UpdateVolume
+    SteamAPI_ISteamMusic_BIsEnabled = original_steam_api64.SteamAPI_ISteamMusic_BIsEnabled
+    SteamAPI_ISteamMusic_BIsPlaying = original_steam_api64.SteamAPI_ISteamMusic_BIsPlaying
+    SteamAPI_ISteamMusic_GetPlaybackStatus = original_steam_api64.SteamAPI_ISteamMusic_GetPlaybackStatus
+    SteamAPI_ISteamMusic_GetVolume = original_steam_api64.SteamAPI_ISteamMusic_GetVolume
+    SteamAPI_ISteamMusic_Pause = original_steam_api64.SteamAPI_ISteamMusic_Pause
+    SteamAPI_ISteamMusic_Play = original_steam_api64.SteamAPI_ISteamMusic_Play
+    SteamAPI_ISteamMusic_PlayNext = original_steam_api64.SteamAPI_ISteamMusic_PlayNext
+    SteamAPI_ISteamMusic_PlayPrevious = original_steam_api64.SteamAPI_ISteamMusic_PlayPrevious
+    SteamAPI_ISteamMusic_SetVolume = original_steam_api64.SteamAPI_ISteamMusic_SetVolume
+    SteamAPI_ISteamNetworkingConnectionCustomSignaling_Release = original_steam_api64.SteamAPI_ISteamNetworkingConnectionCustomSignaling_Release
+    SteamAPI_ISteamNetworkingConnectionCustomSignaling_SendSignal = original_steam_api64.SteamAPI_ISteamNetworkingConnectionCustomSignaling_SendSignal
+    SteamAPI_ISteamNetworkingCustomSignalingRecvContext_OnConnectRequest = original_steam_api64.SteamAPI_ISteamNetworkingCustomSignalingRecvContext_OnConnectRequest
+    SteamAPI_ISteamNetworkingCustomSignalingRecvContext_SendRejectionSignal = original_steam_api64.SteamAPI_ISteamNetworkingCustomSignalingRecvContext_SendRejectionSignal
+    SteamAPI_ISteamNetworkingFakeUDPPort_DestroyFakeUDPPort = original_steam_api64.SteamAPI_ISteamNetworkingFakeUDPPort_DestroyFakeUDPPort
+    SteamAPI_ISteamNetworkingFakeUDPPort_ReceiveMessages = original_steam_api64.SteamAPI_ISteamNetworkingFakeUDPPort_ReceiveMessages
+    SteamAPI_ISteamNetworkingFakeUDPPort_ScheduleCleanup = original_steam_api64.SteamAPI_ISteamNetworkingFakeUDPPort_ScheduleCleanup
+    SteamAPI_ISteamNetworkingFakeUDPPort_SendMessageToFakeIP = original_steam_api64.SteamAPI_ISteamNetworkingFakeUDPPort_SendMessageToFakeIP
+    SteamAPI_ISteamNetworkingMessages_AcceptSessionWithUser = original_steam_api64.SteamAPI_ISteamNetworkingMessages_AcceptSessionWithUser
+    SteamAPI_ISteamNetworkingMessages_CloseChannelWithUser = original_steam_api64.SteamAPI_ISteamNetworkingMessages_CloseChannelWithUser
+    SteamAPI_ISteamNetworkingMessages_CloseSessionWithUser = original_steam_api64.SteamAPI_ISteamNetworkingMessages_CloseSessionWithUser
+    SteamAPI_ISteamNetworkingMessages_GetSessionConnectionInfo = original_steam_api64.SteamAPI_ISteamNetworkingMessages_GetSessionConnectionInfo
+    SteamAPI_ISteamNetworkingMessages_ReceiveMessagesOnChannel = original_steam_api64.SteamAPI_ISteamNetworkingMessages_ReceiveMessagesOnChannel
+    SteamAPI_ISteamNetworkingMessages_SendMessageToUser = original_steam_api64.SteamAPI_ISteamNetworkingMessages_SendMessageToUser
+    SteamAPI_ISteamNetworkingSockets_AcceptConnection = original_steam_api64.SteamAPI_ISteamNetworkingSockets_AcceptConnection
+    SteamAPI_ISteamNetworkingSockets_BeginAsyncRequestFakeIP = original_steam_api64.SteamAPI_ISteamNetworkingSockets_BeginAsyncRequestFakeIP
+    SteamAPI_ISteamNetworkingSockets_CloseConnection = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CloseConnection
+    SteamAPI_ISteamNetworkingSockets_CloseListenSocket = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CloseListenSocket
+    SteamAPI_ISteamNetworkingSockets_ConfigureConnectionLanes = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ConfigureConnectionLanes
+    SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress
+    SteamAPI_ISteamNetworkingSockets_ConnectP2P = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ConnectP2P
+    SteamAPI_ISteamNetworkingSockets_ConnectP2PCustomSignaling = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ConnectP2PCustomSignaling
+    SteamAPI_ISteamNetworkingSockets_ConnectToHostedDedicatedServer = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ConnectToHostedDedicatedServer
+    SteamAPI_ISteamNetworkingSockets_CreateFakeUDPPort = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreateFakeUDPPort
+    SteamAPI_ISteamNetworkingSockets_CreateHostedDedicatedServerListenSocket = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreateHostedDedicatedServerListenSocket
+    SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP
+    SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2P = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2P
+    SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2PFakeIP = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2PFakeIP
+    SteamAPI_ISteamNetworkingSockets_CreatePollGroup = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreatePollGroup
+    SteamAPI_ISteamNetworkingSockets_CreateSocketPair = original_steam_api64.SteamAPI_ISteamNetworkingSockets_CreateSocketPair
+    SteamAPI_ISteamNetworkingSockets_DestroyPollGroup = original_steam_api64.SteamAPI_ISteamNetworkingSockets_DestroyPollGroup
+    SteamAPI_ISteamNetworkingSockets_FindRelayAuthTicketForServer = original_steam_api64.SteamAPI_ISteamNetworkingSockets_FindRelayAuthTicketForServer
+    SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection = original_steam_api64.SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection
+    SteamAPI_ISteamNetworkingSockets_GetAuthenticationStatus = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetAuthenticationStatus
+    SteamAPI_ISteamNetworkingSockets_GetCertificateRequest = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetCertificateRequest
+    SteamAPI_ISteamNetworkingSockets_GetConnectionInfo = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetConnectionInfo
+    SteamAPI_ISteamNetworkingSockets_GetConnectionName = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetConnectionName
+    SteamAPI_ISteamNetworkingSockets_GetConnectionRealTimeStatus = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetConnectionRealTimeStatus
+    SteamAPI_ISteamNetworkingSockets_GetConnectionUserData = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetConnectionUserData
+    SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus
+    SteamAPI_ISteamNetworkingSockets_GetFakeIP = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetFakeIP
+    SteamAPI_ISteamNetworkingSockets_GetGameCoordinatorServerLogin = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetGameCoordinatorServerLogin
+    SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerAddress = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerAddress
+    SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerPOPID = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerPOPID
+    SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerPort = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerPort
+    SteamAPI_ISteamNetworkingSockets_GetIdentity = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetIdentity
+    SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress
+    SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus
+    SteamAPI_ISteamNetworkingSockets_GetRemoteFakeIPForConnection = original_steam_api64.SteamAPI_ISteamNetworkingSockets_GetRemoteFakeIPForConnection
+    SteamAPI_ISteamNetworkingSockets_InitAuthentication = original_steam_api64.SteamAPI_ISteamNetworkingSockets_InitAuthentication
+    SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection
+    SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnPollGroup = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnPollGroup
+    SteamAPI_ISteamNetworkingSockets_ReceivedP2PCustomSignal = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ReceivedP2PCustomSignal
+    SteamAPI_ISteamNetworkingSockets_ReceivedRelayAuthTicket = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ReceivedRelayAuthTicket
+    SteamAPI_ISteamNetworkingSockets_ResetIdentity = original_steam_api64.SteamAPI_ISteamNetworkingSockets_ResetIdentity
+    SteamAPI_ISteamNetworkingSockets_RunCallbacks = original_steam_api64.SteamAPI_ISteamNetworkingSockets_RunCallbacks
+    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection = original_steam_api64.SteamAPI_ISteamNetworkingSockets_SendMessageToConnection
+    SteamAPI_ISteamNetworkingSockets_SendMessages = original_steam_api64.SteamAPI_ISteamNetworkingSockets_SendMessages
+    SteamAPI_ISteamNetworkingSockets_SetCertificate = original_steam_api64.SteamAPI_ISteamNetworkingSockets_SetCertificate
+    SteamAPI_ISteamNetworkingSockets_SetConnectionName = original_steam_api64.SteamAPI_ISteamNetworkingSockets_SetConnectionName
+    SteamAPI_ISteamNetworkingSockets_SetConnectionPollGroup = original_steam_api64.SteamAPI_ISteamNetworkingSockets_SetConnectionPollGroup
+    SteamAPI_ISteamNetworkingSockets_SetConnectionUserData = original_steam_api64.SteamAPI_ISteamNetworkingSockets_SetConnectionUserData
+    SteamAPI_ISteamNetworkingUtils_AllocateMessage = original_steam_api64.SteamAPI_ISteamNetworkingUtils_AllocateMessage
+    SteamAPI_ISteamNetworkingUtils_CheckPingDataUpToDate = original_steam_api64.SteamAPI_ISteamNetworkingUtils_CheckPingDataUpToDate
+    SteamAPI_ISteamNetworkingUtils_ConvertPingLocationToString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_ConvertPingLocationToString
+    SteamAPI_ISteamNetworkingUtils_EstimatePingTimeBetweenTwoLocations = original_steam_api64.SteamAPI_ISteamNetworkingUtils_EstimatePingTimeBetweenTwoLocations
+    SteamAPI_ISteamNetworkingUtils_EstimatePingTimeFromLocalHost = original_steam_api64.SteamAPI_ISteamNetworkingUtils_EstimatePingTimeFromLocalHost
+    SteamAPI_ISteamNetworkingUtils_GetConfigValue = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetConfigValue
+    SteamAPI_ISteamNetworkingUtils_GetConfigValueInfo = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetConfigValueInfo
+    SteamAPI_ISteamNetworkingUtils_GetDirectPingToPOP = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetDirectPingToPOP
+    SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue
+    SteamAPI_ISteamNetworkingUtils_GetIPv4FakeIPType = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetIPv4FakeIPType
+    SteamAPI_ISteamNetworkingUtils_GetLocalPingLocation = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetLocalPingLocation
+    SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp
+    SteamAPI_ISteamNetworkingUtils_GetPOPCount = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetPOPCount
+    SteamAPI_ISteamNetworkingUtils_GetPOPList = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetPOPList
+    SteamAPI_ISteamNetworkingUtils_GetPingToDataCenter = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetPingToDataCenter
+    SteamAPI_ISteamNetworkingUtils_GetRealIdentityForFakeIP = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetRealIdentityForFakeIP
+    SteamAPI_ISteamNetworkingUtils_GetRelayNetworkStatus = original_steam_api64.SteamAPI_ISteamNetworkingUtils_GetRelayNetworkStatus
+    SteamAPI_ISteamNetworkingUtils_InitRelayNetworkAccess = original_steam_api64.SteamAPI_ISteamNetworkingUtils_InitRelayNetworkAccess
+    SteamAPI_ISteamNetworkingUtils_IsFakeIPv4 = original_steam_api64.SteamAPI_ISteamNetworkingUtils_IsFakeIPv4
+    SteamAPI_ISteamNetworkingUtils_IterateGenericEditableConfigValues = original_steam_api64.SteamAPI_ISteamNetworkingUtils_IterateGenericEditableConfigValues
+    SteamAPI_ISteamNetworkingUtils_ParsePingLocationString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_ParsePingLocationString
+    SteamAPI_ISteamNetworkingUtils_SetConfigValue = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetConfigValue
+    SteamAPI_ISteamNetworkingUtils_SetConfigValueStruct = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetConfigValueStruct
+    SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueFloat = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueFloat
+    SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueInt32 = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueInt32
+    SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueString
+    SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction
+    SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_FakeIPResult = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_FakeIPResult
+    SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionFailed = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionFailed
+    SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionRequest = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionRequest
+    SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamNetAuthenticationStatusChanged = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamNetAuthenticationStatusChanged
+    SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamNetConnectionStatusChanged = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamNetConnectionStatusChanged
+    SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamRelayNetworkStatusChanged = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamRelayNetworkStatusChanged
+    SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueFloat = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueFloat
+    SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueInt32 = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueInt32
+    SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValuePtr = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValuePtr
+    SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueString
+    SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_GetFakeIPType = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_GetFakeIPType
+    SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ParseString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ParseString
+    SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ToString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ToString
+    SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ParseString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ParseString
+    SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ToString = original_steam_api64.SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ToString
+    SteamAPI_ISteamNetworking_AcceptP2PSessionWithUser = original_steam_api64.SteamAPI_ISteamNetworking_AcceptP2PSessionWithUser
+    SteamAPI_ISteamNetworking_AllowP2PPacketRelay = original_steam_api64.SteamAPI_ISteamNetworking_AllowP2PPacketRelay
+    SteamAPI_ISteamNetworking_CloseP2PChannelWithUser = original_steam_api64.SteamAPI_ISteamNetworking_CloseP2PChannelWithUser
+    SteamAPI_ISteamNetworking_CloseP2PSessionWithUser = original_steam_api64.SteamAPI_ISteamNetworking_CloseP2PSessionWithUser
+    SteamAPI_ISteamNetworking_CreateConnectionSocket = original_steam_api64.SteamAPI_ISteamNetworking_CreateConnectionSocket
+    SteamAPI_ISteamNetworking_CreateListenSocket = original_steam_api64.SteamAPI_ISteamNetworking_CreateListenSocket
+    SteamAPI_ISteamNetworking_CreateP2PConnectionSocket = original_steam_api64.SteamAPI_ISteamNetworking_CreateP2PConnectionSocket
+    SteamAPI_ISteamNetworking_DestroyListenSocket = original_steam_api64.SteamAPI_ISteamNetworking_DestroyListenSocket
+    SteamAPI_ISteamNetworking_DestroySocket = original_steam_api64.SteamAPI_ISteamNetworking_DestroySocket
+    SteamAPI_ISteamNetworking_GetListenSocketInfo = original_steam_api64.SteamAPI_ISteamNetworking_GetListenSocketInfo
+    SteamAPI_ISteamNetworking_GetMaxPacketSize = original_steam_api64.SteamAPI_ISteamNetworking_GetMaxPacketSize
+    SteamAPI_ISteamNetworking_GetP2PSessionState = original_steam_api64.SteamAPI_ISteamNetworking_GetP2PSessionState
+    SteamAPI_ISteamNetworking_GetSocketConnectionType = original_steam_api64.SteamAPI_ISteamNetworking_GetSocketConnectionType
+    SteamAPI_ISteamNetworking_GetSocketInfo = original_steam_api64.SteamAPI_ISteamNetworking_GetSocketInfo
+    SteamAPI_ISteamNetworking_IsDataAvailable = original_steam_api64.SteamAPI_ISteamNetworking_IsDataAvailable
+    SteamAPI_ISteamNetworking_IsDataAvailableOnSocket = original_steam_api64.SteamAPI_ISteamNetworking_IsDataAvailableOnSocket
+    SteamAPI_ISteamNetworking_IsP2PPacketAvailable = original_steam_api64.SteamAPI_ISteamNetworking_IsP2PPacketAvailable
+    SteamAPI_ISteamNetworking_ReadP2PPacket = original_steam_api64.SteamAPI_ISteamNetworking_ReadP2PPacket
+    SteamAPI_ISteamNetworking_RetrieveData = original_steam_api64.SteamAPI_ISteamNetworking_RetrieveData
+    SteamAPI_ISteamNetworking_RetrieveDataFromSocket = original_steam_api64.SteamAPI_ISteamNetworking_RetrieveDataFromSocket
+    SteamAPI_ISteamNetworking_SendDataOnSocket = original_steam_api64.SteamAPI_ISteamNetworking_SendDataOnSocket
+    SteamAPI_ISteamNetworking_SendP2PPacket = original_steam_api64.SteamAPI_ISteamNetworking_SendP2PPacket
+    SteamAPI_ISteamParentalSettings_BIsAppBlocked = original_steam_api64.SteamAPI_ISteamParentalSettings_BIsAppBlocked
+    SteamAPI_ISteamParentalSettings_BIsAppInBlockList = original_steam_api64.SteamAPI_ISteamParentalSettings_BIsAppInBlockList
+    SteamAPI_ISteamParentalSettings_BIsFeatureBlocked = original_steam_api64.SteamAPI_ISteamParentalSettings_BIsFeatureBlocked
+    SteamAPI_ISteamParentalSettings_BIsFeatureInBlockList = original_steam_api64.SteamAPI_ISteamParentalSettings_BIsFeatureInBlockList
+    SteamAPI_ISteamParentalSettings_BIsParentalLockEnabled = original_steam_api64.SteamAPI_ISteamParentalSettings_BIsParentalLockEnabled
+    SteamAPI_ISteamParentalSettings_BIsParentalLockLocked = original_steam_api64.SteamAPI_ISteamParentalSettings_BIsParentalLockLocked
+    SteamAPI_ISteamParties_CancelReservation = original_steam_api64.SteamAPI_ISteamParties_CancelReservation
+    SteamAPI_ISteamParties_ChangeNumOpenSlots = original_steam_api64.SteamAPI_ISteamParties_ChangeNumOpenSlots
+    SteamAPI_ISteamParties_CreateBeacon = original_steam_api64.SteamAPI_ISteamParties_CreateBeacon
+    SteamAPI_ISteamParties_DestroyBeacon = original_steam_api64.SteamAPI_ISteamParties_DestroyBeacon
+    SteamAPI_ISteamParties_GetAvailableBeaconLocations = original_steam_api64.SteamAPI_ISteamParties_GetAvailableBeaconLocations
+    SteamAPI_ISteamParties_GetBeaconByIndex = original_steam_api64.SteamAPI_ISteamParties_GetBeaconByIndex
+    SteamAPI_ISteamParties_GetBeaconDetails = original_steam_api64.SteamAPI_ISteamParties_GetBeaconDetails
+    SteamAPI_ISteamParties_GetBeaconLocationData = original_steam_api64.SteamAPI_ISteamParties_GetBeaconLocationData
+    SteamAPI_ISteamParties_GetNumActiveBeacons = original_steam_api64.SteamAPI_ISteamParties_GetNumActiveBeacons
+    SteamAPI_ISteamParties_GetNumAvailableBeaconLocations = original_steam_api64.SteamAPI_ISteamParties_GetNumAvailableBeaconLocations
+    SteamAPI_ISteamParties_JoinParty = original_steam_api64.SteamAPI_ISteamParties_JoinParty
+    SteamAPI_ISteamParties_OnReservationCompleted = original_steam_api64.SteamAPI_ISteamParties_OnReservationCompleted
+    SteamAPI_ISteamRemotePlay_BEnableRemotePlayTogetherDirectInput = original_steam_api64.SteamAPI_ISteamRemotePlay_BEnableRemotePlayTogetherDirectInput
+    SteamAPI_ISteamRemotePlay_BGetSessionClientResolution = original_steam_api64.SteamAPI_ISteamRemotePlay_BGetSessionClientResolution
+    SteamAPI_ISteamRemotePlay_BSendRemotePlayTogetherInvite = original_steam_api64.SteamAPI_ISteamRemotePlay_BSendRemotePlayTogetherInvite
+    SteamAPI_ISteamRemotePlay_BStartRemotePlayTogether = original_steam_api64.SteamAPI_ISteamRemotePlay_BStartRemotePlayTogether
+    SteamAPI_ISteamRemotePlay_CreateMouseCursor = original_steam_api64.SteamAPI_ISteamRemotePlay_CreateMouseCursor
+    SteamAPI_ISteamRemotePlay_DisableRemotePlayTogetherDirectInput = original_steam_api64.SteamAPI_ISteamRemotePlay_DisableRemotePlayTogetherDirectInput
+    SteamAPI_ISteamRemotePlay_GetInput = original_steam_api64.SteamAPI_ISteamRemotePlay_GetInput
+    SteamAPI_ISteamRemotePlay_GetSessionClientFormFactor = original_steam_api64.SteamAPI_ISteamRemotePlay_GetSessionClientFormFactor
+    SteamAPI_ISteamRemotePlay_GetSessionClientName = original_steam_api64.SteamAPI_ISteamRemotePlay_GetSessionClientName
+    SteamAPI_ISteamRemotePlay_GetSessionCount = original_steam_api64.SteamAPI_ISteamRemotePlay_GetSessionCount
+    SteamAPI_ISteamRemotePlay_GetSessionID = original_steam_api64.SteamAPI_ISteamRemotePlay_GetSessionID
+    SteamAPI_ISteamRemotePlay_GetSessionSteamID = original_steam_api64.SteamAPI_ISteamRemotePlay_GetSessionSteamID
+    SteamAPI_ISteamRemotePlay_SetMouseCursor = original_steam_api64.SteamAPI_ISteamRemotePlay_SetMouseCursor
+    SteamAPI_ISteamRemotePlay_SetMousePosition = original_steam_api64.SteamAPI_ISteamRemotePlay_SetMousePosition
+    SteamAPI_ISteamRemotePlay_SetMouseVisibility = original_steam_api64.SteamAPI_ISteamRemotePlay_SetMouseVisibility
+    SteamAPI_ISteamRemotePlay_ShowRemotePlayTogetherUI = original_steam_api64.SteamAPI_ISteamRemotePlay_ShowRemotePlayTogetherUI
+    SteamAPI_ISteamRemoteStorage_BeginFileWriteBatch = original_steam_api64.SteamAPI_ISteamRemoteStorage_BeginFileWriteBatch
+    SteamAPI_ISteamRemoteStorage_CommitPublishedFileUpdate = original_steam_api64.SteamAPI_ISteamRemoteStorage_CommitPublishedFileUpdate
+    SteamAPI_ISteamRemoteStorage_CreatePublishedFileUpdateRequest = original_steam_api64.SteamAPI_ISteamRemoteStorage_CreatePublishedFileUpdateRequest
+    SteamAPI_ISteamRemoteStorage_DeletePublishedFile = original_steam_api64.SteamAPI_ISteamRemoteStorage_DeletePublishedFile
+    SteamAPI_ISteamRemoteStorage_EndFileWriteBatch = original_steam_api64.SteamAPI_ISteamRemoteStorage_EndFileWriteBatch
+    SteamAPI_ISteamRemoteStorage_EnumeratePublishedFilesByUserAction = original_steam_api64.SteamAPI_ISteamRemoteStorage_EnumeratePublishedFilesByUserAction
+    SteamAPI_ISteamRemoteStorage_EnumeratePublishedWorkshopFiles = original_steam_api64.SteamAPI_ISteamRemoteStorage_EnumeratePublishedWorkshopFiles
+    SteamAPI_ISteamRemoteStorage_EnumerateUserPublishedFiles = original_steam_api64.SteamAPI_ISteamRemoteStorage_EnumerateUserPublishedFiles
+    SteamAPI_ISteamRemoteStorage_EnumerateUserSharedWorkshopFiles = original_steam_api64.SteamAPI_ISteamRemoteStorage_EnumerateUserSharedWorkshopFiles
+    SteamAPI_ISteamRemoteStorage_EnumerateUserSubscribedFiles = original_steam_api64.SteamAPI_ISteamRemoteStorage_EnumerateUserSubscribedFiles
+    SteamAPI_ISteamRemoteStorage_FileDelete = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileDelete
+    SteamAPI_ISteamRemoteStorage_FileExists = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileExists
+    SteamAPI_ISteamRemoteStorage_FileForget = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileForget
+    SteamAPI_ISteamRemoteStorage_FilePersisted = original_steam_api64.SteamAPI_ISteamRemoteStorage_FilePersisted
+    SteamAPI_ISteamRemoteStorage_FileRead = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileRead
+    SteamAPI_ISteamRemoteStorage_FileReadAsync = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileReadAsync
+    SteamAPI_ISteamRemoteStorage_FileReadAsyncComplete = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileReadAsyncComplete
+    SteamAPI_ISteamRemoteStorage_FileShare = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileShare
+    SteamAPI_ISteamRemoteStorage_FileWrite = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileWrite
+    SteamAPI_ISteamRemoteStorage_FileWriteAsync = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileWriteAsync
+    SteamAPI_ISteamRemoteStorage_FileWriteStreamCancel = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileWriteStreamCancel
+    SteamAPI_ISteamRemoteStorage_FileWriteStreamClose = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileWriteStreamClose
+    SteamAPI_ISteamRemoteStorage_FileWriteStreamOpen = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileWriteStreamOpen
+    SteamAPI_ISteamRemoteStorage_FileWriteStreamWriteChunk = original_steam_api64.SteamAPI_ISteamRemoteStorage_FileWriteStreamWriteChunk
+    SteamAPI_ISteamRemoteStorage_GetCachedUGCCount = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetCachedUGCCount
+    SteamAPI_ISteamRemoteStorage_GetCachedUGCHandle = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetCachedUGCHandle
+    SteamAPI_ISteamRemoteStorage_GetFileCount = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetFileCount
+    SteamAPI_ISteamRemoteStorage_GetFileNameAndSize = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetFileNameAndSize
+    SteamAPI_ISteamRemoteStorage_GetFileSize = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetFileSize
+    SteamAPI_ISteamRemoteStorage_GetFileTimestamp = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetFileTimestamp
+    SteamAPI_ISteamRemoteStorage_GetLocalFileChange = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetLocalFileChange
+    SteamAPI_ISteamRemoteStorage_GetLocalFileChangeCount = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetLocalFileChangeCount
+    SteamAPI_ISteamRemoteStorage_GetPublishedFileDetails = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetPublishedFileDetails
+    SteamAPI_ISteamRemoteStorage_GetPublishedItemVoteDetails = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetPublishedItemVoteDetails
+    SteamAPI_ISteamRemoteStorage_GetQuota = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetQuota
+    SteamAPI_ISteamRemoteStorage_GetSyncPlatforms = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetSyncPlatforms
+    SteamAPI_ISteamRemoteStorage_GetUGCDetails = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetUGCDetails
+    SteamAPI_ISteamRemoteStorage_GetUGCDownloadProgress = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetUGCDownloadProgress
+    SteamAPI_ISteamRemoteStorage_GetUserPublishedItemVoteDetails = original_steam_api64.SteamAPI_ISteamRemoteStorage_GetUserPublishedItemVoteDetails
+    SteamAPI_ISteamRemoteStorage_IsCloudEnabledForAccount = original_steam_api64.SteamAPI_ISteamRemoteStorage_IsCloudEnabledForAccount
+    SteamAPI_ISteamRemoteStorage_IsCloudEnabledForApp = original_steam_api64.SteamAPI_ISteamRemoteStorage_IsCloudEnabledForApp
+    SteamAPI_ISteamRemoteStorage_PublishVideo = original_steam_api64.SteamAPI_ISteamRemoteStorage_PublishVideo
+    SteamAPI_ISteamRemoteStorage_PublishWorkshopFile = original_steam_api64.SteamAPI_ISteamRemoteStorage_PublishWorkshopFile
+    SteamAPI_ISteamRemoteStorage_SetCloudEnabledForApp = original_steam_api64.SteamAPI_ISteamRemoteStorage_SetCloudEnabledForApp
+    SteamAPI_ISteamRemoteStorage_SetSyncPlatforms = original_steam_api64.SteamAPI_ISteamRemoteStorage_SetSyncPlatforms
+    SteamAPI_ISteamRemoteStorage_SetUserPublishedFileAction = original_steam_api64.SteamAPI_ISteamRemoteStorage_SetUserPublishedFileAction
+    SteamAPI_ISteamRemoteStorage_SubscribePublishedFile = original_steam_api64.SteamAPI_ISteamRemoteStorage_SubscribePublishedFile
+    SteamAPI_ISteamRemoteStorage_UGCDownload = original_steam_api64.SteamAPI_ISteamRemoteStorage_UGCDownload
+    SteamAPI_ISteamRemoteStorage_UGCDownloadToLocation = original_steam_api64.SteamAPI_ISteamRemoteStorage_UGCDownloadToLocation
+    SteamAPI_ISteamRemoteStorage_UGCRead = original_steam_api64.SteamAPI_ISteamRemoteStorage_UGCRead
+    SteamAPI_ISteamRemoteStorage_UnsubscribePublishedFile = original_steam_api64.SteamAPI_ISteamRemoteStorage_UnsubscribePublishedFile
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFileDescription = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFileDescription
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFileFile = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFileFile
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFilePreviewFile = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFilePreviewFile
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFileSetChangeDescription = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFileSetChangeDescription
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFileTags = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFileTags
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFileTitle = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFileTitle
+    SteamAPI_ISteamRemoteStorage_UpdatePublishedFileVisibility = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdatePublishedFileVisibility
+    SteamAPI_ISteamRemoteStorage_UpdateUserPublishedItemVote = original_steam_api64.SteamAPI_ISteamRemoteStorage_UpdateUserPublishedItemVote
+    SteamAPI_ISteamScreenshots_AddScreenshotToLibrary = original_steam_api64.SteamAPI_ISteamScreenshots_AddScreenshotToLibrary
+    SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary = original_steam_api64.SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary
+    SteamAPI_ISteamScreenshots_HookScreenshots = original_steam_api64.SteamAPI_ISteamScreenshots_HookScreenshots
+    SteamAPI_ISteamScreenshots_IsScreenshotsHooked = original_steam_api64.SteamAPI_ISteamScreenshots_IsScreenshotsHooked
+    SteamAPI_ISteamScreenshots_SetLocation = original_steam_api64.SteamAPI_ISteamScreenshots_SetLocation
+    SteamAPI_ISteamScreenshots_TagPublishedFile = original_steam_api64.SteamAPI_ISteamScreenshots_TagPublishedFile
+    SteamAPI_ISteamScreenshots_TagUser = original_steam_api64.SteamAPI_ISteamScreenshots_TagUser
+    SteamAPI_ISteamScreenshots_TriggerScreenshot = original_steam_api64.SteamAPI_ISteamScreenshots_TriggerScreenshot
+    SteamAPI_ISteamScreenshots_WriteScreenshot = original_steam_api64.SteamAPI_ISteamScreenshots_WriteScreenshot
+    SteamAPI_ISteamTV_AddBroadcastGameData = original_steam_api64.SteamAPI_ISteamTV_AddBroadcastGameData
+    SteamAPI_ISteamTV_AddRegion = original_steam_api64.SteamAPI_ISteamTV_AddRegion
+    SteamAPI_ISteamTV_AddTimelineMarker = original_steam_api64.SteamAPI_ISteamTV_AddTimelineMarker
+    SteamAPI_ISteamTV_IsBroadcasting = original_steam_api64.SteamAPI_ISteamTV_IsBroadcasting
+    SteamAPI_ISteamTV_RemoveBroadcastGameData = original_steam_api64.SteamAPI_ISteamTV_RemoveBroadcastGameData
+    SteamAPI_ISteamTV_RemoveRegion = original_steam_api64.SteamAPI_ISteamTV_RemoveRegion
+    SteamAPI_ISteamTV_RemoveTimelineMarker = original_steam_api64.SteamAPI_ISteamTV_RemoveTimelineMarker
+    SteamAPI_ISteamTimeline_AddGamePhaseTag = original_steam_api64.SteamAPI_ISteamTimeline_AddGamePhaseTag
+    SteamAPI_ISteamTimeline_AddInstantaneousTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_AddInstantaneousTimelineEvent
+    SteamAPI_ISteamTimeline_AddRangeTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_AddRangeTimelineEvent
+    SteamAPI_ISteamTimeline_AddTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_AddTimelineEvent
+    SteamAPI_ISteamTimeline_ClearTimelineStateDescription = original_steam_api64.SteamAPI_ISteamTimeline_ClearTimelineStateDescription
+    SteamAPI_ISteamTimeline_ClearTimelineTooltip = original_steam_api64.SteamAPI_ISteamTimeline_ClearTimelineTooltip
+    SteamAPI_ISteamTimeline_DoesEventRecordingExist = original_steam_api64.SteamAPI_ISteamTimeline_DoesEventRecordingExist
+    SteamAPI_ISteamTimeline_DoesGamePhaseRecordingExist = original_steam_api64.SteamAPI_ISteamTimeline_DoesGamePhaseRecordingExist
+    SteamAPI_ISteamTimeline_EndGamePhase = original_steam_api64.SteamAPI_ISteamTimeline_EndGamePhase
+    SteamAPI_ISteamTimeline_EndRangeTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_EndRangeTimelineEvent
+    SteamAPI_ISteamTimeline_OpenOverlayToGamePhase = original_steam_api64.SteamAPI_ISteamTimeline_OpenOverlayToGamePhase
+    SteamAPI_ISteamTimeline_OpenOverlayToTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_OpenOverlayToTimelineEvent
+    SteamAPI_ISteamTimeline_RemoveTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_RemoveTimelineEvent
+    SteamAPI_ISteamTimeline_SetGamePhaseAttribute = original_steam_api64.SteamAPI_ISteamTimeline_SetGamePhaseAttribute
+    SteamAPI_ISteamTimeline_SetGamePhaseID = original_steam_api64.SteamAPI_ISteamTimeline_SetGamePhaseID
+    SteamAPI_ISteamTimeline_SetTimelineGameMode = original_steam_api64.SteamAPI_ISteamTimeline_SetTimelineGameMode
+    SteamAPI_ISteamTimeline_SetTimelineStateDescription = original_steam_api64.SteamAPI_ISteamTimeline_SetTimelineStateDescription
+    SteamAPI_ISteamTimeline_SetTimelineTooltip = original_steam_api64.SteamAPI_ISteamTimeline_SetTimelineTooltip
+    SteamAPI_ISteamTimeline_StartGamePhase = original_steam_api64.SteamAPI_ISteamTimeline_StartGamePhase
+    SteamAPI_ISteamTimeline_StartRangeTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_StartRangeTimelineEvent
+    SteamAPI_ISteamTimeline_UpdateRangeTimelineEvent = original_steam_api64.SteamAPI_ISteamTimeline_UpdateRangeTimelineEvent
+    SteamAPI_ISteamUGC_AddAppDependency = original_steam_api64.SteamAPI_ISteamUGC_AddAppDependency
+    SteamAPI_ISteamUGC_AddContentDescriptor = original_steam_api64.SteamAPI_ISteamUGC_AddContentDescriptor
+    SteamAPI_ISteamUGC_AddDependency = original_steam_api64.SteamAPI_ISteamUGC_AddDependency
+    SteamAPI_ISteamUGC_AddExcludedTag = original_steam_api64.SteamAPI_ISteamUGC_AddExcludedTag
+    SteamAPI_ISteamUGC_AddItemKeyValueTag = original_steam_api64.SteamAPI_ISteamUGC_AddItemKeyValueTag
+    SteamAPI_ISteamUGC_AddItemPreviewFile = original_steam_api64.SteamAPI_ISteamUGC_AddItemPreviewFile
+    SteamAPI_ISteamUGC_AddItemPreviewVideo = original_steam_api64.SteamAPI_ISteamUGC_AddItemPreviewVideo
+    SteamAPI_ISteamUGC_AddItemToFavorites = original_steam_api64.SteamAPI_ISteamUGC_AddItemToFavorites
+    SteamAPI_ISteamUGC_AddRequiredKeyValueTag = original_steam_api64.SteamAPI_ISteamUGC_AddRequiredKeyValueTag
+    SteamAPI_ISteamUGC_AddRequiredTag = original_steam_api64.SteamAPI_ISteamUGC_AddRequiredTag
+    SteamAPI_ISteamUGC_AddRequiredTagGroup = original_steam_api64.SteamAPI_ISteamUGC_AddRequiredTagGroup
+    SteamAPI_ISteamUGC_BInitWorkshopForGameServer = original_steam_api64.SteamAPI_ISteamUGC_BInitWorkshopForGameServer
+    SteamAPI_ISteamUGC_CreateItem = original_steam_api64.SteamAPI_ISteamUGC_CreateItem
+    SteamAPI_ISteamUGC_CreateQueryAllUGCRequest = original_steam_api64.SteamAPI_ISteamUGC_CreateQueryAllUGCRequest
+    SteamAPI_ISteamUGC_CreateQueryAllUGCRequest0 = original_steam_api64.SteamAPI_ISteamUGC_CreateQueryAllUGCRequest0
+    SteamAPI_ISteamUGC_CreateQueryAllUGCRequestCursor = original_steam_api64.SteamAPI_ISteamUGC_CreateQueryAllUGCRequestCursor
+    SteamAPI_ISteamUGC_CreateQueryAllUGCRequestPage = original_steam_api64.SteamAPI_ISteamUGC_CreateQueryAllUGCRequestPage
+    SteamAPI_ISteamUGC_CreateQueryUGCDetailsRequest = original_steam_api64.SteamAPI_ISteamUGC_CreateQueryUGCDetailsRequest
+    SteamAPI_ISteamUGC_CreateQueryUserUGCRequest = original_steam_api64.SteamAPI_ISteamUGC_CreateQueryUserUGCRequest
+    SteamAPI_ISteamUGC_DeleteItem = original_steam_api64.SteamAPI_ISteamUGC_DeleteItem
+    SteamAPI_ISteamUGC_DownloadItem = original_steam_api64.SteamAPI_ISteamUGC_DownloadItem
+    SteamAPI_ISteamUGC_GetAppDependencies = original_steam_api64.SteamAPI_ISteamUGC_GetAppDependencies
+    SteamAPI_ISteamUGC_GetItemDownloadInfo = original_steam_api64.SteamAPI_ISteamUGC_GetItemDownloadInfo
+    SteamAPI_ISteamUGC_GetItemInstallInfo = original_steam_api64.SteamAPI_ISteamUGC_GetItemInstallInfo
+    SteamAPI_ISteamUGC_GetItemState = original_steam_api64.SteamAPI_ISteamUGC_GetItemState
+    SteamAPI_ISteamUGC_GetItemUpdateProgress = original_steam_api64.SteamAPI_ISteamUGC_GetItemUpdateProgress
+    SteamAPI_ISteamUGC_GetNumSubscribedItems = original_steam_api64.SteamAPI_ISteamUGC_GetNumSubscribedItems
+    SteamAPI_ISteamUGC_GetNumSupportedGameVersions = original_steam_api64.SteamAPI_ISteamUGC_GetNumSupportedGameVersions
+    SteamAPI_ISteamUGC_GetQueryFirstUGCKeyValueTag = original_steam_api64.SteamAPI_ISteamUGC_GetQueryFirstUGCKeyValueTag
+    SteamAPI_ISteamUGC_GetQueryUGCAdditionalPreview = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCAdditionalPreview
+    SteamAPI_ISteamUGC_GetQueryUGCChildren = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCChildren
+    SteamAPI_ISteamUGC_GetQueryUGCContentDescriptors = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCContentDescriptors
+    SteamAPI_ISteamUGC_GetQueryUGCKeyValueTag = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCKeyValueTag
+    SteamAPI_ISteamUGC_GetQueryUGCKeyValueTag0 = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCKeyValueTag0
+    SteamAPI_ISteamUGC_GetQueryUGCMetadata = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCMetadata
+    SteamAPI_ISteamUGC_GetQueryUGCNumAdditionalPreviews = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCNumAdditionalPreviews
+    SteamAPI_ISteamUGC_GetQueryUGCNumKeyValueTags = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCNumKeyValueTags
+    SteamAPI_ISteamUGC_GetQueryUGCNumTags = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCNumTags
+    SteamAPI_ISteamUGC_GetQueryUGCPreviewURL = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCPreviewURL
+    SteamAPI_ISteamUGC_GetQueryUGCResult = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCResult
+    SteamAPI_ISteamUGC_GetQueryUGCStatistic = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCStatistic
+    SteamAPI_ISteamUGC_GetQueryUGCTag = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCTag
+    SteamAPI_ISteamUGC_GetQueryUGCTagDisplayName = original_steam_api64.SteamAPI_ISteamUGC_GetQueryUGCTagDisplayName
+    SteamAPI_ISteamUGC_GetSubscribedItems = original_steam_api64.SteamAPI_ISteamUGC_GetSubscribedItems
+    SteamAPI_ISteamUGC_GetSupportedGameVersionData = original_steam_api64.SteamAPI_ISteamUGC_GetSupportedGameVersionData
+    SteamAPI_ISteamUGC_GetUserContentDescriptorPreferences = original_steam_api64.SteamAPI_ISteamUGC_GetUserContentDescriptorPreferences
+    SteamAPI_ISteamUGC_GetUserItemVote = original_steam_api64.SteamAPI_ISteamUGC_GetUserItemVote
+    SteamAPI_ISteamUGC_GetWorkshopEULAStatus = original_steam_api64.SteamAPI_ISteamUGC_GetWorkshopEULAStatus
+    SteamAPI_ISteamUGC_ReleaseQueryUGCRequest = original_steam_api64.SteamAPI_ISteamUGC_ReleaseQueryUGCRequest
+    SteamAPI_ISteamUGC_RemoveAllItemKeyValueTags = original_steam_api64.SteamAPI_ISteamUGC_RemoveAllItemKeyValueTags
+    SteamAPI_ISteamUGC_RemoveAppDependency = original_steam_api64.SteamAPI_ISteamUGC_RemoveAppDependency
+    SteamAPI_ISteamUGC_RemoveContentDescriptor = original_steam_api64.SteamAPI_ISteamUGC_RemoveContentDescriptor
+    SteamAPI_ISteamUGC_RemoveDependency = original_steam_api64.SteamAPI_ISteamUGC_RemoveDependency
+    SteamAPI_ISteamUGC_RemoveItemFromFavorites = original_steam_api64.SteamAPI_ISteamUGC_RemoveItemFromFavorites
+    SteamAPI_ISteamUGC_RemoveItemKeyValueTags = original_steam_api64.SteamAPI_ISteamUGC_RemoveItemKeyValueTags
+    SteamAPI_ISteamUGC_RemoveItemPreview = original_steam_api64.SteamAPI_ISteamUGC_RemoveItemPreview
+    SteamAPI_ISteamUGC_RequestUGCDetails = original_steam_api64.SteamAPI_ISteamUGC_RequestUGCDetails
+    SteamAPI_ISteamUGC_SendQueryUGCRequest = original_steam_api64.SteamAPI_ISteamUGC_SendQueryUGCRequest
+    SteamAPI_ISteamUGC_SetAdminQuery = original_steam_api64.SteamAPI_ISteamUGC_SetAdminQuery
+    SteamAPI_ISteamUGC_SetAllowCachedResponse = original_steam_api64.SteamAPI_ISteamUGC_SetAllowCachedResponse
+    SteamAPI_ISteamUGC_SetAllowLegacyUpload = original_steam_api64.SteamAPI_ISteamUGC_SetAllowLegacyUpload
+    SteamAPI_ISteamUGC_SetCloudFileNameFilter = original_steam_api64.SteamAPI_ISteamUGC_SetCloudFileNameFilter
+    SteamAPI_ISteamUGC_SetItemContent = original_steam_api64.SteamAPI_ISteamUGC_SetItemContent
+    SteamAPI_ISteamUGC_SetItemDescription = original_steam_api64.SteamAPI_ISteamUGC_SetItemDescription
+    SteamAPI_ISteamUGC_SetItemMetadata = original_steam_api64.SteamAPI_ISteamUGC_SetItemMetadata
+    SteamAPI_ISteamUGC_SetItemPreview = original_steam_api64.SteamAPI_ISteamUGC_SetItemPreview
+    SteamAPI_ISteamUGC_SetItemTags = original_steam_api64.SteamAPI_ISteamUGC_SetItemTags
+    SteamAPI_ISteamUGC_SetItemTitle = original_steam_api64.SteamAPI_ISteamUGC_SetItemTitle
+    SteamAPI_ISteamUGC_SetItemUpdateLanguage = original_steam_api64.SteamAPI_ISteamUGC_SetItemUpdateLanguage
+    SteamAPI_ISteamUGC_SetItemVisibility = original_steam_api64.SteamAPI_ISteamUGC_SetItemVisibility
+    SteamAPI_ISteamUGC_SetItemsDisabledLocally = original_steam_api64.SteamAPI_ISteamUGC_SetItemsDisabledLocally
+    SteamAPI_ISteamUGC_SetLanguage = original_steam_api64.SteamAPI_ISteamUGC_SetLanguage
+    SteamAPI_ISteamUGC_SetMatchAnyTag = original_steam_api64.SteamAPI_ISteamUGC_SetMatchAnyTag
+    SteamAPI_ISteamUGC_SetRankedByTrendDays = original_steam_api64.SteamAPI_ISteamUGC_SetRankedByTrendDays
+    SteamAPI_ISteamUGC_SetRequiredGameVersions = original_steam_api64.SteamAPI_ISteamUGC_SetRequiredGameVersions
+    SteamAPI_ISteamUGC_SetReturnAdditionalPreviews = original_steam_api64.SteamAPI_ISteamUGC_SetReturnAdditionalPreviews
+    SteamAPI_ISteamUGC_SetReturnChildren = original_steam_api64.SteamAPI_ISteamUGC_SetReturnChildren
+    SteamAPI_ISteamUGC_SetReturnKeyValueTags = original_steam_api64.SteamAPI_ISteamUGC_SetReturnKeyValueTags
+    SteamAPI_ISteamUGC_SetReturnLongDescription = original_steam_api64.SteamAPI_ISteamUGC_SetReturnLongDescription
+    SteamAPI_ISteamUGC_SetReturnMetadata = original_steam_api64.SteamAPI_ISteamUGC_SetReturnMetadata
+    SteamAPI_ISteamUGC_SetReturnOnlyIDs = original_steam_api64.SteamAPI_ISteamUGC_SetReturnOnlyIDs
+    SteamAPI_ISteamUGC_SetReturnPlaytimeStats = original_steam_api64.SteamAPI_ISteamUGC_SetReturnPlaytimeStats
+    SteamAPI_ISteamUGC_SetReturnTotalOnly = original_steam_api64.SteamAPI_ISteamUGC_SetReturnTotalOnly
+    SteamAPI_ISteamUGC_SetSearchText = original_steam_api64.SteamAPI_ISteamUGC_SetSearchText
+    SteamAPI_ISteamUGC_SetSubscriptionsLoadOrder = original_steam_api64.SteamAPI_ISteamUGC_SetSubscriptionsLoadOrder
+    SteamAPI_ISteamUGC_SetTimeCreatedDateRange = original_steam_api64.SteamAPI_ISteamUGC_SetTimeCreatedDateRange
+    SteamAPI_ISteamUGC_SetTimeUpdatedDateRange = original_steam_api64.SteamAPI_ISteamUGC_SetTimeUpdatedDateRange
+    SteamAPI_ISteamUGC_SetUserItemVote = original_steam_api64.SteamAPI_ISteamUGC_SetUserItemVote
+    SteamAPI_ISteamUGC_ShowWorkshopEULA = original_steam_api64.SteamAPI_ISteamUGC_ShowWorkshopEULA
+    SteamAPI_ISteamUGC_StartItemUpdate = original_steam_api64.SteamAPI_ISteamUGC_StartItemUpdate
+    SteamAPI_ISteamUGC_StartPlaytimeTracking = original_steam_api64.SteamAPI_ISteamUGC_StartPlaytimeTracking
+    SteamAPI_ISteamUGC_StopPlaytimeTracking = original_steam_api64.SteamAPI_ISteamUGC_StopPlaytimeTracking
+    SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems = original_steam_api64.SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems
+    SteamAPI_ISteamUGC_SubmitItemUpdate = original_steam_api64.SteamAPI_ISteamUGC_SubmitItemUpdate
+    SteamAPI_ISteamUGC_SubscribeItem = original_steam_api64.SteamAPI_ISteamUGC_SubscribeItem
+    SteamAPI_ISteamUGC_SuspendDownloads = original_steam_api64.SteamAPI_ISteamUGC_SuspendDownloads
+    SteamAPI_ISteamUGC_UnsubscribeItem = original_steam_api64.SteamAPI_ISteamUGC_UnsubscribeItem
+    SteamAPI_ISteamUGC_UpdateItemPreviewFile = original_steam_api64.SteamAPI_ISteamUGC_UpdateItemPreviewFile
+    SteamAPI_ISteamUGC_UpdateItemPreviewVideo = original_steam_api64.SteamAPI_ISteamUGC_UpdateItemPreviewVideo
+    SteamAPI_ISteamUserStats_AttachLeaderboardUGC = original_steam_api64.SteamAPI_ISteamUserStats_AttachLeaderboardUGC
+    SteamAPI_ISteamUserStats_ClearAchievement = original_steam_api64.SteamAPI_ISteamUserStats_ClearAchievement
+    SteamAPI_ISteamUserStats_DownloadLeaderboardEntries = original_steam_api64.SteamAPI_ISteamUserStats_DownloadLeaderboardEntries
+    SteamAPI_ISteamUserStats_DownloadLeaderboardEntriesForUsers = original_steam_api64.SteamAPI_ISteamUserStats_DownloadLeaderboardEntriesForUsers
+    SteamAPI_ISteamUserStats_FindLeaderboard = original_steam_api64.SteamAPI_ISteamUserStats_FindLeaderboard
+    SteamAPI_ISteamUserStats_FindOrCreateLeaderboard = original_steam_api64.SteamAPI_ISteamUserStats_FindOrCreateLeaderboard
+    SteamAPI_ISteamUserStats_GetAchievement = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievement
+    SteamAPI_ISteamUserStats_GetAchievementAchievedPercent = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementAchievedPercent
+    SteamAPI_ISteamUserStats_GetAchievementAndUnlockTime = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementAndUnlockTime
+    SteamAPI_ISteamUserStats_GetAchievementDisplayAttribute = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementDisplayAttribute
+    SteamAPI_ISteamUserStats_GetAchievementIcon = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementIcon
+    SteamAPI_ISteamUserStats_GetAchievementName = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementName
+    SteamAPI_ISteamUserStats_GetAchievementProgressLimitsFloat = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementProgressLimitsFloat
+    SteamAPI_ISteamUserStats_GetAchievementProgressLimitsInt32 = original_steam_api64.SteamAPI_ISteamUserStats_GetAchievementProgressLimitsInt32
+    SteamAPI_ISteamUserStats_GetDownloadedLeaderboardEntry = original_steam_api64.SteamAPI_ISteamUserStats_GetDownloadedLeaderboardEntry
+    SteamAPI_ISteamUserStats_GetGlobalStat = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStat
+    SteamAPI_ISteamUserStats_GetGlobalStat0 = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStat0
+    SteamAPI_ISteamUserStats_GetGlobalStatDouble = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStatDouble
+    SteamAPI_ISteamUserStats_GetGlobalStatHistory = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStatHistory
+    SteamAPI_ISteamUserStats_GetGlobalStatHistory0 = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStatHistory0
+    SteamAPI_ISteamUserStats_GetGlobalStatHistoryDouble = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStatHistoryDouble
+    SteamAPI_ISteamUserStats_GetGlobalStatHistoryInt64 = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStatHistoryInt64
+    SteamAPI_ISteamUserStats_GetGlobalStatInt64 = original_steam_api64.SteamAPI_ISteamUserStats_GetGlobalStatInt64
+    SteamAPI_ISteamUserStats_GetLeaderboardDisplayType = original_steam_api64.SteamAPI_ISteamUserStats_GetLeaderboardDisplayType
+    SteamAPI_ISteamUserStats_GetLeaderboardEntryCount = original_steam_api64.SteamAPI_ISteamUserStats_GetLeaderboardEntryCount
+    SteamAPI_ISteamUserStats_GetLeaderboardName = original_steam_api64.SteamAPI_ISteamUserStats_GetLeaderboardName
+    SteamAPI_ISteamUserStats_GetLeaderboardSortMethod = original_steam_api64.SteamAPI_ISteamUserStats_GetLeaderboardSortMethod
+    SteamAPI_ISteamUserStats_GetMostAchievedAchievementInfo = original_steam_api64.SteamAPI_ISteamUserStats_GetMostAchievedAchievementInfo
+    SteamAPI_ISteamUserStats_GetNextMostAchievedAchievementInfo = original_steam_api64.SteamAPI_ISteamUserStats_GetNextMostAchievedAchievementInfo
+    SteamAPI_ISteamUserStats_GetNumAchievements = original_steam_api64.SteamAPI_ISteamUserStats_GetNumAchievements
+    SteamAPI_ISteamUserStats_GetNumberOfCurrentPlayers = original_steam_api64.SteamAPI_ISteamUserStats_GetNumberOfCurrentPlayers
+    SteamAPI_ISteamUserStats_GetStat = original_steam_api64.SteamAPI_ISteamUserStats_GetStat
+    SteamAPI_ISteamUserStats_GetStat0 = original_steam_api64.SteamAPI_ISteamUserStats_GetStat0
+    SteamAPI_ISteamUserStats_GetStatFloat = original_steam_api64.SteamAPI_ISteamUserStats_GetStatFloat
+    SteamAPI_ISteamUserStats_GetStatInt32 = original_steam_api64.SteamAPI_ISteamUserStats_GetStatInt32
+    SteamAPI_ISteamUserStats_GetUserAchievement = original_steam_api64.SteamAPI_ISteamUserStats_GetUserAchievement
+    SteamAPI_ISteamUserStats_GetUserAchievementAndUnlockTime = original_steam_api64.SteamAPI_ISteamUserStats_GetUserAchievementAndUnlockTime
+    SteamAPI_ISteamUserStats_GetUserStat = original_steam_api64.SteamAPI_ISteamUserStats_GetUserStat
+    SteamAPI_ISteamUserStats_GetUserStat0 = original_steam_api64.SteamAPI_ISteamUserStats_GetUserStat0
+    SteamAPI_ISteamUserStats_GetUserStatFloat = original_steam_api64.SteamAPI_ISteamUserStats_GetUserStatFloat
+    SteamAPI_ISteamUserStats_GetUserStatInt32 = original_steam_api64.SteamAPI_ISteamUserStats_GetUserStatInt32
+    SteamAPI_ISteamUserStats_IndicateAchievementProgress = original_steam_api64.SteamAPI_ISteamUserStats_IndicateAchievementProgress
+    SteamAPI_ISteamUserStats_RequestCurrentStats = original_steam_api64.SteamAPI_ISteamUserStats_RequestCurrentStats
+    SteamAPI_ISteamUserStats_RequestGlobalAchievementPercentages = original_steam_api64.SteamAPI_ISteamUserStats_RequestGlobalAchievementPercentages
+    SteamAPI_ISteamUserStats_RequestGlobalStats = original_steam_api64.SteamAPI_ISteamUserStats_RequestGlobalStats
+    SteamAPI_ISteamUserStats_RequestUserStats = original_steam_api64.SteamAPI_ISteamUserStats_RequestUserStats
+    SteamAPI_ISteamUserStats_ResetAllStats = original_steam_api64.SteamAPI_ISteamUserStats_ResetAllStats
+    SteamAPI_ISteamUserStats_SetAchievement = original_steam_api64.SteamAPI_ISteamUserStats_SetAchievement
+    SteamAPI_ISteamUserStats_SetStat = original_steam_api64.SteamAPI_ISteamUserStats_SetStat
+    SteamAPI_ISteamUserStats_SetStat0 = original_steam_api64.SteamAPI_ISteamUserStats_SetStat0
+    SteamAPI_ISteamUserStats_SetStatFloat = original_steam_api64.SteamAPI_ISteamUserStats_SetStatFloat
+    SteamAPI_ISteamUserStats_SetStatInt32 = original_steam_api64.SteamAPI_ISteamUserStats_SetStatInt32
+    SteamAPI_ISteamUserStats_StoreStats = original_steam_api64.SteamAPI_ISteamUserStats_StoreStats
+    SteamAPI_ISteamUserStats_UpdateAvgRateStat = original_steam_api64.SteamAPI_ISteamUserStats_UpdateAvgRateStat
+    SteamAPI_ISteamUserStats_UploadLeaderboardScore = original_steam_api64.SteamAPI_ISteamUserStats_UploadLeaderboardScore
+    SteamAPI_ISteamUser_AdvertiseGame = original_steam_api64.SteamAPI_ISteamUser_AdvertiseGame
+    SteamAPI_ISteamUser_BIsBehindNAT = original_steam_api64.SteamAPI_ISteamUser_BIsBehindNAT
+    SteamAPI_ISteamUser_BIsPhoneIdentifying = original_steam_api64.SteamAPI_ISteamUser_BIsPhoneIdentifying
+    SteamAPI_ISteamUser_BIsPhoneRequiringVerification = original_steam_api64.SteamAPI_ISteamUser_BIsPhoneRequiringVerification
+    SteamAPI_ISteamUser_BIsPhoneVerified = original_steam_api64.SteamAPI_ISteamUser_BIsPhoneVerified
+    SteamAPI_ISteamUser_BIsTwoFactorEnabled = original_steam_api64.SteamAPI_ISteamUser_BIsTwoFactorEnabled
+    SteamAPI_ISteamUser_BLoggedOn = original_steam_api64.SteamAPI_ISteamUser_BLoggedOn
+    SteamAPI_ISteamUser_BSetDurationControlOnlineState = original_steam_api64.SteamAPI_ISteamUser_BSetDurationControlOnlineState
+    SteamAPI_ISteamUser_BeginAuthSession = original_steam_api64.SteamAPI_ISteamUser_BeginAuthSession
+    SteamAPI_ISteamUser_CancelAuthTicket = original_steam_api64.SteamAPI_ISteamUser_CancelAuthTicket
+    SteamAPI_ISteamUser_DecompressVoice = original_steam_api64.SteamAPI_ISteamUser_DecompressVoice
+    SteamAPI_ISteamUser_EndAuthSession = original_steam_api64.SteamAPI_ISteamUser_EndAuthSession
+    SteamAPI_ISteamUser_GetAuthSessionTicket = original_steam_api64.SteamAPI_ISteamUser_GetAuthSessionTicket
+    SteamAPI_ISteamUser_GetAuthTicketForWebApi = original_steam_api64.SteamAPI_ISteamUser_GetAuthTicketForWebApi
+    SteamAPI_ISteamUser_GetAvailableVoice = original_steam_api64.SteamAPI_ISteamUser_GetAvailableVoice
+    SteamAPI_ISteamUser_GetDurationControl = original_steam_api64.SteamAPI_ISteamUser_GetDurationControl
+    SteamAPI_ISteamUser_GetEncryptedAppTicket = original_steam_api64.SteamAPI_ISteamUser_GetEncryptedAppTicket
+    SteamAPI_ISteamUser_GetGameBadgeLevel = original_steam_api64.SteamAPI_ISteamUser_GetGameBadgeLevel
+    SteamAPI_ISteamUser_GetHSteamUser = original_steam_api64.SteamAPI_ISteamUser_GetHSteamUser
+    SteamAPI_ISteamUser_GetMarketEligibility = original_steam_api64.SteamAPI_ISteamUser_GetMarketEligibility
+    SteamAPI_ISteamUser_GetPlayerSteamLevel = original_steam_api64.SteamAPI_ISteamUser_GetPlayerSteamLevel
+    SteamAPI_ISteamUser_GetSteamID = original_steam_api64.SteamAPI_ISteamUser_GetSteamID
+    SteamAPI_ISteamUser_GetUserDataFolder = original_steam_api64.SteamAPI_ISteamUser_GetUserDataFolder
+    SteamAPI_ISteamUser_GetVoice = original_steam_api64.SteamAPI_ISteamUser_GetVoice
+    SteamAPI_ISteamUser_GetVoiceOptimalSampleRate = original_steam_api64.SteamAPI_ISteamUser_GetVoiceOptimalSampleRate
+    SteamAPI_ISteamUser_InitiateGameConnection = original_steam_api64.SteamAPI_ISteamUser_InitiateGameConnection
+    SteamAPI_ISteamUser_InitiateGameConnection_DEPRECATED = original_steam_api64.SteamAPI_ISteamUser_InitiateGameConnection_DEPRECATED
+    SteamAPI_ISteamUser_RequestEncryptedAppTicket = original_steam_api64.SteamAPI_ISteamUser_RequestEncryptedAppTicket
+    SteamAPI_ISteamUser_RequestStoreAuthURL = original_steam_api64.SteamAPI_ISteamUser_RequestStoreAuthURL
+    SteamAPI_ISteamUser_StartVoiceRecording = original_steam_api64.SteamAPI_ISteamUser_StartVoiceRecording
+    SteamAPI_ISteamUser_StopVoiceRecording = original_steam_api64.SteamAPI_ISteamUser_StopVoiceRecording
+    SteamAPI_ISteamUser_TerminateGameConnection = original_steam_api64.SteamAPI_ISteamUser_TerminateGameConnection
+    SteamAPI_ISteamUser_TerminateGameConnection_DEPRECATED = original_steam_api64.SteamAPI_ISteamUser_TerminateGameConnection_DEPRECATED
+    SteamAPI_ISteamUser_TrackAppUsageEvent = original_steam_api64.SteamAPI_ISteamUser_TrackAppUsageEvent
+    SteamAPI_ISteamUser_UserHasLicenseForApp = original_steam_api64.SteamAPI_ISteamUser_UserHasLicenseForApp
+    SteamAPI_ISteamUtils_BOverlayNeedsPresent = original_steam_api64.SteamAPI_ISteamUtils_BOverlayNeedsPresent
+    SteamAPI_ISteamUtils_CheckFileSignature = original_steam_api64.SteamAPI_ISteamUtils_CheckFileSignature
+    SteamAPI_ISteamUtils_DismissFloatingGamepadTextInput = original_steam_api64.SteamAPI_ISteamUtils_DismissFloatingGamepadTextInput
+    SteamAPI_ISteamUtils_DismissGamepadTextInput = original_steam_api64.SteamAPI_ISteamUtils_DismissGamepadTextInput
+    SteamAPI_ISteamUtils_FilterText = original_steam_api64.SteamAPI_ISteamUtils_FilterText
+    SteamAPI_ISteamUtils_GetAPICallFailureReason = original_steam_api64.SteamAPI_ISteamUtils_GetAPICallFailureReason
+    SteamAPI_ISteamUtils_GetAPICallResult = original_steam_api64.SteamAPI_ISteamUtils_GetAPICallResult
+    SteamAPI_ISteamUtils_GetAppID = original_steam_api64.SteamAPI_ISteamUtils_GetAppID
+    SteamAPI_ISteamUtils_GetCSERIPPort = original_steam_api64.SteamAPI_ISteamUtils_GetCSERIPPort
+    SteamAPI_ISteamUtils_GetConnectedUniverse = original_steam_api64.SteamAPI_ISteamUtils_GetConnectedUniverse
+    SteamAPI_ISteamUtils_GetCurrentBatteryPower = original_steam_api64.SteamAPI_ISteamUtils_GetCurrentBatteryPower
+    SteamAPI_ISteamUtils_GetEnteredGamepadTextInput = original_steam_api64.SteamAPI_ISteamUtils_GetEnteredGamepadTextInput
+    SteamAPI_ISteamUtils_GetEnteredGamepadTextLength = original_steam_api64.SteamAPI_ISteamUtils_GetEnteredGamepadTextLength
+    SteamAPI_ISteamUtils_GetIPCCallCount = original_steam_api64.SteamAPI_ISteamUtils_GetIPCCallCount
+    SteamAPI_ISteamUtils_GetIPCountry = original_steam_api64.SteamAPI_ISteamUtils_GetIPCountry
+    SteamAPI_ISteamUtils_GetIPv6ConnectivityState = original_steam_api64.SteamAPI_ISteamUtils_GetIPv6ConnectivityState
+    SteamAPI_ISteamUtils_GetImageRGBA = original_steam_api64.SteamAPI_ISteamUtils_GetImageRGBA
+    SteamAPI_ISteamUtils_GetImageSize = original_steam_api64.SteamAPI_ISteamUtils_GetImageSize
+    SteamAPI_ISteamUtils_GetSecondsSinceAppActive = original_steam_api64.SteamAPI_ISteamUtils_GetSecondsSinceAppActive
+    SteamAPI_ISteamUtils_GetSecondsSinceComputerActive = original_steam_api64.SteamAPI_ISteamUtils_GetSecondsSinceComputerActive
+    SteamAPI_ISteamUtils_GetServerRealTime = original_steam_api64.SteamAPI_ISteamUtils_GetServerRealTime
+    SteamAPI_ISteamUtils_GetSteamUILanguage = original_steam_api64.SteamAPI_ISteamUtils_GetSteamUILanguage
+    SteamAPI_ISteamUtils_InitFilterText = original_steam_api64.SteamAPI_ISteamUtils_InitFilterText
+    SteamAPI_ISteamUtils_IsAPICallCompleted = original_steam_api64.SteamAPI_ISteamUtils_IsAPICallCompleted
+    SteamAPI_ISteamUtils_IsOverlayEnabled = original_steam_api64.SteamAPI_ISteamUtils_IsOverlayEnabled
+    SteamAPI_ISteamUtils_IsSteamChinaLauncher = original_steam_api64.SteamAPI_ISteamUtils_IsSteamChinaLauncher
+    SteamAPI_ISteamUtils_IsSteamInBigPictureMode = original_steam_api64.SteamAPI_ISteamUtils_IsSteamInBigPictureMode
+    SteamAPI_ISteamUtils_IsSteamRunningInVR = original_steam_api64.SteamAPI_ISteamUtils_IsSteamRunningInVR
+    SteamAPI_ISteamUtils_IsSteamRunningOnSteamDeck = original_steam_api64.SteamAPI_ISteamUtils_IsSteamRunningOnSteamDeck
+    SteamAPI_ISteamUtils_IsVRHeadsetStreamingEnabled = original_steam_api64.SteamAPI_ISteamUtils_IsVRHeadsetStreamingEnabled
+    SteamAPI_ISteamUtils_SetGameLauncherMode = original_steam_api64.SteamAPI_ISteamUtils_SetGameLauncherMode
+    SteamAPI_ISteamUtils_SetOverlayNotificationInset = original_steam_api64.SteamAPI_ISteamUtils_SetOverlayNotificationInset
+    SteamAPI_ISteamUtils_SetOverlayNotificationPosition = original_steam_api64.SteamAPI_ISteamUtils_SetOverlayNotificationPosition
+    SteamAPI_ISteamUtils_SetVRHeadsetStreamingEnabled = original_steam_api64.SteamAPI_ISteamUtils_SetVRHeadsetStreamingEnabled
+    SteamAPI_ISteamUtils_SetWarningMessageHook = original_steam_api64.SteamAPI_ISteamUtils_SetWarningMessageHook
+    SteamAPI_ISteamUtils_ShowFloatingGamepadTextInput = original_steam_api64.SteamAPI_ISteamUtils_ShowFloatingGamepadTextInput
+    SteamAPI_ISteamUtils_ShowGamepadTextInput = original_steam_api64.SteamAPI_ISteamUtils_ShowGamepadTextInput
+    SteamAPI_ISteamUtils_ShowModalGamepadTextInput = original_steam_api64.SteamAPI_ISteamUtils_ShowModalGamepadTextInput
+    SteamAPI_ISteamUtils_StartVRDashboard = original_steam_api64.SteamAPI_ISteamUtils_StartVRDashboard
+    SteamAPI_ISteamVideo_GetOPFSettings = original_steam_api64.SteamAPI_ISteamVideo_GetOPFSettings
+    SteamAPI_ISteamVideo_GetOPFStringForApp = original_steam_api64.SteamAPI_ISteamVideo_GetOPFStringForApp
+    SteamAPI_ISteamVideo_GetVideoURL = original_steam_api64.SteamAPI_ISteamVideo_GetVideoURL
+    SteamAPI_ISteamVideo_IsBroadcasting = original_steam_api64.SteamAPI_ISteamVideo_IsBroadcasting
+    SteamAPI_InitAnonymousUser = original_steam_api64.SteamAPI_InitAnonymousUser
+    SteamAPI_ManualDispatch_FreeLastCallback = original_steam_api64.SteamAPI_ManualDispatch_FreeLastCallback
+    SteamAPI_ManualDispatch_GetAPICallResult = original_steam_api64.SteamAPI_ManualDispatch_GetAPICallResult
+    SteamAPI_ManualDispatch_GetNextCallback = original_steam_api64.SteamAPI_ManualDispatch_GetNextCallback
+    SteamAPI_ManualDispatch_Init = original_steam_api64.SteamAPI_ManualDispatch_Init
+    SteamAPI_ManualDispatch_RunFrame = original_steam_api64.SteamAPI_ManualDispatch_RunFrame
+    SteamAPI_MatchMakingKeyValuePair_t_Construct = original_steam_api64.SteamAPI_MatchMakingKeyValuePair_t_Construct
+    SteamAPI_ReleaseCurrentThreadMemory = original_steam_api64.SteamAPI_ReleaseCurrentThreadMemory
+    SteamAPI_RestartApp = original_steam_api64.SteamAPI_RestartApp
+    SteamAPI_SetBreakpadAppID = original_steam_api64.SteamAPI_SetBreakpadAppID
+    SteamAPI_SetMiniDumpComment = original_steam_api64.SteamAPI_SetMiniDumpComment
+    SteamAPI_SetTryCatchCallbacks = original_steam_api64.SteamAPI_SetTryCatchCallbacks
+    SteamAPI_SteamAppList_v001 = original_steam_api64.SteamAPI_SteamAppList_v001
+    SteamAPI_SteamApps_v008 = original_steam_api64.SteamAPI_SteamApps_v008
+    SteamAPI_SteamController_v007 = original_steam_api64.SteamAPI_SteamController_v007
+    SteamAPI_SteamController_v008 = original_steam_api64.SteamAPI_SteamController_v008
+    SteamAPI_SteamDatagramHostedAddress_Clear = original_steam_api64.SteamAPI_SteamDatagramHostedAddress_Clear
+    SteamAPI_SteamDatagramHostedAddress_GetPopID = original_steam_api64.SteamAPI_SteamDatagramHostedAddress_GetPopID
+    SteamAPI_SteamDatagramHostedAddress_SetDevAddress = original_steam_api64.SteamAPI_SteamDatagramHostedAddress_SetDevAddress
+    SteamAPI_SteamFriends_v017 = original_steam_api64.SteamAPI_SteamFriends_v017
+    SteamAPI_SteamFriends_v018 = original_steam_api64.SteamAPI_SteamFriends_v018
+    SteamAPI_SteamGameSearch_v001 = original_steam_api64.SteamAPI_SteamGameSearch_v001
+    SteamAPI_SteamGameServerApps_v008 = original_steam_api64.SteamAPI_SteamGameServerApps_v008
+    SteamAPI_SteamGameServerHTTP_v003 = original_steam_api64.SteamAPI_SteamGameServerHTTP_v003
+    SteamAPI_SteamGameServerInventory_v003 = original_steam_api64.SteamAPI_SteamGameServerInventory_v003
+    SteamAPI_SteamGameServerNetworkingMessages_SteamAPI_v002 = original_steam_api64.SteamAPI_SteamGameServerNetworkingMessages_SteamAPI_v002
+    SteamAPI_SteamGameServerNetworkingMessages_v002 = original_steam_api64.SteamAPI_SteamGameServerNetworkingMessages_v002
+    SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v009 = original_steam_api64.SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v009
+    SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011 = original_steam_api64.SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011
+    SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v012 = original_steam_api64.SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v012
+    SteamAPI_SteamGameServerNetworkingSockets_v008 = original_steam_api64.SteamAPI_SteamGameServerNetworkingSockets_v008
+    SteamAPI_SteamGameServerNetworkingSockets_v009 = original_steam_api64.SteamAPI_SteamGameServerNetworkingSockets_v009
+    SteamAPI_SteamGameServerNetworking_v006 = original_steam_api64.SteamAPI_SteamGameServerNetworking_v006
+    SteamAPI_SteamGameServerStats_v001 = original_steam_api64.SteamAPI_SteamGameServerStats_v001
+    SteamAPI_SteamGameServerUGC_v014 = original_steam_api64.SteamAPI_SteamGameServerUGC_v014
+    SteamAPI_SteamGameServerUGC_v015 = original_steam_api64.SteamAPI_SteamGameServerUGC_v015
+    SteamAPI_SteamGameServerUGC_v016 = original_steam_api64.SteamAPI_SteamGameServerUGC_v016
+    SteamAPI_SteamGameServerUGC_v017 = original_steam_api64.SteamAPI_SteamGameServerUGC_v017
+    SteamAPI_SteamGameServerUGC_v018 = original_steam_api64.SteamAPI_SteamGameServerUGC_v018
+    SteamAPI_SteamGameServerUGC_v020 = original_steam_api64.SteamAPI_SteamGameServerUGC_v020
+    SteamAPI_SteamGameServerUGC_v021 = original_steam_api64.SteamAPI_SteamGameServerUGC_v021
+    SteamAPI_SteamGameServerUtils_v009 = original_steam_api64.SteamAPI_SteamGameServerUtils_v009
+    SteamAPI_SteamGameServerUtils_v010 = original_steam_api64.SteamAPI_SteamGameServerUtils_v010
+    SteamAPI_SteamGameServer_v013 = original_steam_api64.SteamAPI_SteamGameServer_v013
+    SteamAPI_SteamGameServer_v014 = original_steam_api64.SteamAPI_SteamGameServer_v014
+    SteamAPI_SteamGameServer_v015 = original_steam_api64.SteamAPI_SteamGameServer_v015
+    SteamAPI_SteamHTMLSurface_v005 = original_steam_api64.SteamAPI_SteamHTMLSurface_v005
+    SteamAPI_SteamHTTP_v003 = original_steam_api64.SteamAPI_SteamHTTP_v003
+    SteamAPI_SteamIPAddress_t_IsSet = original_steam_api64.SteamAPI_SteamIPAddress_t_IsSet
+    SteamAPI_SteamInput_v001 = original_steam_api64.SteamAPI_SteamInput_v001
+    SteamAPI_SteamInput_v002 = original_steam_api64.SteamAPI_SteamInput_v002
+    SteamAPI_SteamInput_v005 = original_steam_api64.SteamAPI_SteamInput_v005
+    SteamAPI_SteamInput_v006 = original_steam_api64.SteamAPI_SteamInput_v006
+    SteamAPI_SteamInventory_v003 = original_steam_api64.SteamAPI_SteamInventory_v003
+    SteamAPI_SteamMusicRemote_v001 = original_steam_api64.SteamAPI_SteamMusicRemote_v001
+    SteamAPI_SteamMusic_v001 = original_steam_api64.SteamAPI_SteamMusic_v001
+    SteamAPI_SteamNetworkingConfigValue_t_SetFloat = original_steam_api64.SteamAPI_SteamNetworkingConfigValue_t_SetFloat
+    SteamAPI_SteamNetworkingConfigValue_t_SetInt32 = original_steam_api64.SteamAPI_SteamNetworkingConfigValue_t_SetInt32
+    SteamAPI_SteamNetworkingConfigValue_t_SetInt64 = original_steam_api64.SteamAPI_SteamNetworkingConfigValue_t_SetInt64
+    SteamAPI_SteamNetworkingConfigValue_t_SetPtr = original_steam_api64.SteamAPI_SteamNetworkingConfigValue_t_SetPtr
+    SteamAPI_SteamNetworkingConfigValue_t_SetString = original_steam_api64.SteamAPI_SteamNetworkingConfigValue_t_SetString
+    SteamAPI_SteamNetworkingIPAddrRender_c_str = original_steam_api64.SteamAPI_SteamNetworkingIPAddrRender_c_str
+    SteamAPI_SteamNetworkingIPAddr_Clear = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_Clear
+    SteamAPI_SteamNetworkingIPAddr_GetFakeIPType = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_GetFakeIPType
+    SteamAPI_SteamNetworkingIPAddr_GetIPv4 = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_GetIPv4
+    SteamAPI_SteamNetworkingIPAddr_IsEqualTo = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_IsEqualTo
+    SteamAPI_SteamNetworkingIPAddr_IsFakeIP = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_IsFakeIP
+    SteamAPI_SteamNetworkingIPAddr_IsIPv4 = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_IsIPv4
+    SteamAPI_SteamNetworkingIPAddr_IsIPv6AllZeros = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_IsIPv6AllZeros
+    SteamAPI_SteamNetworkingIPAddr_IsLocalHost = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_IsLocalHost
+    SteamAPI_SteamNetworkingIPAddr_ParseString = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_ParseString
+    SteamAPI_SteamNetworkingIPAddr_SetIPv4 = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_SetIPv4
+    SteamAPI_SteamNetworkingIPAddr_SetIPv6 = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_SetIPv6
+    SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost
+    SteamAPI_SteamNetworkingIPAddr_ToString = original_steam_api64.SteamAPI_SteamNetworkingIPAddr_ToString
+    SteamAPI_SteamNetworkingIdentityRender_c_str = original_steam_api64.SteamAPI_SteamNetworkingIdentityRender_c_str
+    SteamAPI_SteamNetworkingIdentity_Clear = original_steam_api64.SteamAPI_SteamNetworkingIdentity_Clear
+    SteamAPI_SteamNetworkingIdentity_GetFakeIPType = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetFakeIPType
+    SteamAPI_SteamNetworkingIdentity_GetGenericBytes = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetGenericBytes
+    SteamAPI_SteamNetworkingIdentity_GetGenericString = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetGenericString
+    SteamAPI_SteamNetworkingIdentity_GetIPAddr = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetIPAddr
+    SteamAPI_SteamNetworkingIdentity_GetIPv4 = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetIPv4
+    SteamAPI_SteamNetworkingIdentity_GetPSNID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetPSNID
+    SteamAPI_SteamNetworkingIdentity_GetStadiaID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetStadiaID
+    SteamAPI_SteamNetworkingIdentity_GetSteamID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetSteamID
+    SteamAPI_SteamNetworkingIdentity_GetSteamID64 = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetSteamID64
+    SteamAPI_SteamNetworkingIdentity_GetXboxPairwiseID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_GetXboxPairwiseID
+    SteamAPI_SteamNetworkingIdentity_IsEqualTo = original_steam_api64.SteamAPI_SteamNetworkingIdentity_IsEqualTo
+    SteamAPI_SteamNetworkingIdentity_IsFakeIP = original_steam_api64.SteamAPI_SteamNetworkingIdentity_IsFakeIP
+    SteamAPI_SteamNetworkingIdentity_IsInvalid = original_steam_api64.SteamAPI_SteamNetworkingIdentity_IsInvalid
+    SteamAPI_SteamNetworkingIdentity_IsLocalHost = original_steam_api64.SteamAPI_SteamNetworkingIdentity_IsLocalHost
+    SteamAPI_SteamNetworkingIdentity_ParseString = original_steam_api64.SteamAPI_SteamNetworkingIdentity_ParseString
+    SteamAPI_SteamNetworkingIdentity_SetGenericBytes = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetGenericBytes
+    SteamAPI_SteamNetworkingIdentity_SetGenericString = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetGenericString
+    SteamAPI_SteamNetworkingIdentity_SetIPAddr = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetIPAddr
+    SteamAPI_SteamNetworkingIdentity_SetIPv4Addr = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetIPv4Addr
+    SteamAPI_SteamNetworkingIdentity_SetLocalHost = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetLocalHost
+    SteamAPI_SteamNetworkingIdentity_SetPSNID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetPSNID
+    SteamAPI_SteamNetworkingIdentity_SetStadiaID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetStadiaID
+    SteamAPI_SteamNetworkingIdentity_SetSteamID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetSteamID
+    SteamAPI_SteamNetworkingIdentity_SetSteamID64 = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetSteamID64
+    SteamAPI_SteamNetworkingIdentity_SetXboxPairwiseID = original_steam_api64.SteamAPI_SteamNetworkingIdentity_SetXboxPairwiseID
+    SteamAPI_SteamNetworkingIdentity_ToString = original_steam_api64.SteamAPI_SteamNetworkingIdentity_ToString
+    SteamAPI_SteamNetworkingMessage_t_Release = original_steam_api64.SteamAPI_SteamNetworkingMessage_t_Release
+    SteamAPI_SteamNetworkingMessages_SteamAPI_v002 = original_steam_api64.SteamAPI_SteamNetworkingMessages_SteamAPI_v002
+    SteamAPI_SteamNetworkingMessages_v002 = original_steam_api64.SteamAPI_SteamNetworkingMessages_v002
+    SteamAPI_SteamNetworkingPOPIDRender_c_str = original_steam_api64.SteamAPI_SteamNetworkingPOPIDRender_c_str
+    SteamAPI_SteamNetworkingSockets_SteamAPI_v009 = original_steam_api64.SteamAPI_SteamNetworkingSockets_SteamAPI_v009
+    SteamAPI_SteamNetworkingSockets_SteamAPI_v011 = original_steam_api64.SteamAPI_SteamNetworkingSockets_SteamAPI_v011
+    SteamAPI_SteamNetworkingSockets_SteamAPI_v012 = original_steam_api64.SteamAPI_SteamNetworkingSockets_SteamAPI_v012
+    SteamAPI_SteamNetworkingSockets_v008 = original_steam_api64.SteamAPI_SteamNetworkingSockets_v008
+    SteamAPI_SteamNetworkingSockets_v009 = original_steam_api64.SteamAPI_SteamNetworkingSockets_v009
+    SteamAPI_SteamNetworkingUtils_SteamAPI_v003 = original_steam_api64.SteamAPI_SteamNetworkingUtils_SteamAPI_v003
+    SteamAPI_SteamNetworkingUtils_SteamAPI_v004 = original_steam_api64.SteamAPI_SteamNetworkingUtils_SteamAPI_v004
+    SteamAPI_SteamNetworkingUtils_v003 = original_steam_api64.SteamAPI_SteamNetworkingUtils_v003
+    SteamAPI_SteamNetworking_v006 = original_steam_api64.SteamAPI_SteamNetworking_v006
+    SteamAPI_SteamParentalSettings_v001 = original_steam_api64.SteamAPI_SteamParentalSettings_v001
+    SteamAPI_SteamParties_v002 = original_steam_api64.SteamAPI_SteamParties_v002
+    SteamAPI_SteamRemotePlay_v001 = original_steam_api64.SteamAPI_SteamRemotePlay_v001
+    SteamAPI_SteamRemotePlay_v002 = original_steam_api64.SteamAPI_SteamRemotePlay_v002
+    SteamAPI_SteamRemotePlay_v003 = original_steam_api64.SteamAPI_SteamRemotePlay_v003
+    SteamAPI_SteamRemoteStorage_v014 = original_steam_api64.SteamAPI_SteamRemoteStorage_v014
+    SteamAPI_SteamRemoteStorage_v016 = original_steam_api64.SteamAPI_SteamRemoteStorage_v016
+    SteamAPI_SteamScreenshots_v003 = original_steam_api64.SteamAPI_SteamScreenshots_v003
+    SteamAPI_SteamTV_v001 = original_steam_api64.SteamAPI_SteamTV_v001
+    SteamAPI_SteamTimeline_v001 = original_steam_api64.SteamAPI_SteamTimeline_v001
+    SteamAPI_SteamTimeline_v004 = original_steam_api64.SteamAPI_SteamTimeline_v004
+    SteamAPI_SteamUGC_v014 = original_steam_api64.SteamAPI_SteamUGC_v014
+    SteamAPI_SteamUGC_v015 = original_steam_api64.SteamAPI_SteamUGC_v015
+    SteamAPI_SteamUGC_v016 = original_steam_api64.SteamAPI_SteamUGC_v016
+    SteamAPI_SteamUGC_v017 = original_steam_api64.SteamAPI_SteamUGC_v017
+    SteamAPI_SteamUGC_v018 = original_steam_api64.SteamAPI_SteamUGC_v018
+    SteamAPI_SteamUGC_v020 = original_steam_api64.SteamAPI_SteamUGC_v020
+    SteamAPI_SteamUGC_v021 = original_steam_api64.SteamAPI_SteamUGC_v021
+    SteamAPI_SteamUserStats_v011 = original_steam_api64.SteamAPI_SteamUserStats_v011
+    SteamAPI_SteamUserStats_v012 = original_steam_api64.SteamAPI_SteamUserStats_v012
+    SteamAPI_SteamUserStats_v013 = original_steam_api64.SteamAPI_SteamUserStats_v013
+    SteamAPI_SteamUser_v020 = original_steam_api64.SteamAPI_SteamUser_v020
+    SteamAPI_SteamUser_v021 = original_steam_api64.SteamAPI_SteamUser_v021
+    SteamAPI_SteamUser_v022 = original_steam_api64.SteamAPI_SteamUser_v022
+    SteamAPI_SteamUser_v023 = original_steam_api64.SteamAPI_SteamUser_v023
+    SteamAPI_SteamUtils_v009 = original_steam_api64.SteamAPI_SteamUtils_v009
+    SteamAPI_SteamUtils_v010 = original_steam_api64.SteamAPI_SteamUtils_v010
+    SteamAPI_SteamVideo_v001 = original_steam_api64.SteamAPI_SteamVideo_v001
+    SteamAPI_SteamVideo_v002 = original_steam_api64.SteamAPI_SteamVideo_v002
+    SteamAPI_SteamVideo_v007 = original_steam_api64.SteamAPI_SteamVideo_v007
+    SteamAPI_UseBreakpadCrashHandler = original_steam_api64.SteamAPI_UseBreakpadCrashHandler
+    SteamAPI_WriteMiniDump = original_steam_api64.SteamAPI_WriteMiniDump
+    SteamAPI_gameserveritem_t_Construct = original_steam_api64.SteamAPI_gameserveritem_t_Construct
+    SteamAPI_gameserveritem_t_GetName = original_steam_api64.SteamAPI_gameserveritem_t_GetName
+    SteamAPI_gameserveritem_t_SetName = original_steam_api64.SteamAPI_gameserveritem_t_SetName
+    SteamAPI_servernetadr_t_Assign = original_steam_api64.SteamAPI_servernetadr_t_Assign
+    SteamAPI_servernetadr_t_Construct = original_steam_api64.SteamAPI_servernetadr_t_Construct
+    SteamAPI_servernetadr_t_GetConnectionAddressString = original_steam_api64.SteamAPI_servernetadr_t_GetConnectionAddressString
+    SteamAPI_servernetadr_t_GetConnectionPort = original_steam_api64.SteamAPI_servernetadr_t_GetConnectionPort
+    SteamAPI_servernetadr_t_GetIP = original_steam_api64.SteamAPI_servernetadr_t_GetIP
+    SteamAPI_servernetadr_t_GetQueryAddressString = original_steam_api64.SteamAPI_servernetadr_t_GetQueryAddressString
+    SteamAPI_servernetadr_t_GetQueryPort = original_steam_api64.SteamAPI_servernetadr_t_GetQueryPort
+    SteamAPI_servernetadr_t_Init = original_steam_api64.SteamAPI_servernetadr_t_Init
+    SteamAPI_servernetadr_t_IsLessThan = original_steam_api64.SteamAPI_servernetadr_t_IsLessThan
+    SteamAPI_servernetadr_t_SetConnectionPort = original_steam_api64.SteamAPI_servernetadr_t_SetConnectionPort
+    SteamAPI_servernetadr_t_SetIP = original_steam_api64.SteamAPI_servernetadr_t_SetIP
+    SteamAPI_servernetadr_t_SetQueryPort = original_steam_api64.SteamAPI_servernetadr_t_SetQueryPort
+    SteamAppList = original_steam_api64.SteamAppList
+    SteamApps = original_steam_api64.SteamApps
+    SteamController = original_steam_api64.SteamController
+    SteamFriends = original_steam_api64.SteamFriends
+    SteamGameServer = original_steam_api64.SteamGameServer
+    SteamGameServerApps = original_steam_api64.SteamGameServerApps
+    SteamGameServerClient = original_steam_api64.SteamGameServerClient
+    SteamGameServerHTTP = original_steam_api64.SteamGameServerHTTP
+    SteamGameServerInternal_CreateInterface = original_steam_api64.SteamGameServerInternal_CreateInterface
+    SteamGameServerInventory = original_steam_api64.SteamGameServerInventory
+    SteamGameServerNetworking = original_steam_api64.SteamGameServerNetworking
+    SteamGameServerStats = original_steam_api64.SteamGameServerStats
+    SteamGameServerUGC = original_steam_api64.SteamGameServerUGC
+    SteamGameServerUtils = original_steam_api64.SteamGameServerUtils
+    SteamGameServer_BSecure = original_steam_api64.SteamGameServer_BSecure
+    SteamGameServer_GetHSteamPipe = original_steam_api64.SteamGameServer_GetHSteamPipe
+    SteamGameServer_GetHSteamUser = original_steam_api64.SteamGameServer_GetHSteamUser
+    SteamGameServer_GetIPCCallCount = original_steam_api64.SteamGameServer_GetIPCCallCount
+    SteamGameServer_GetSteamID = original_steam_api64.SteamGameServer_GetSteamID
+    SteamGameServer_Init = original_steam_api64.SteamGameServer_Init
+    SteamGameServer_InitSafe = original_steam_api64.SteamGameServer_InitSafe
+    SteamGameServer_RunCallbacks = original_steam_api64.SteamGameServer_RunCallbacks
+    SteamGameServer_Shutdown = original_steam_api64.SteamGameServer_Shutdown
+    SteamHTMLSurface = original_steam_api64.SteamHTMLSurface
+    SteamHTTP = original_steam_api64.SteamHTTP
+    SteamInternal_ContextInit = original_steam_api64.SteamInternal_ContextInit
+    SteamInternal_CreateInterface = original_steam_api64.SteamInternal_CreateInterface
+    SteamInternal_FindOrCreateGameServerInterface = original_steam_api64.SteamInternal_FindOrCreateGameServerInterface
+    SteamInternal_FindOrCreateUserInterface = original_steam_api64.SteamInternal_FindOrCreateUserInterface
+    SteamInternal_GameServer_Init = original_steam_api64.SteamInternal_GameServer_Init
+    SteamInternal_GameServer_Init_V2 = original_steam_api64.SteamInternal_GameServer_Init_V2
+    SteamInternal_SteamAPI_Init = original_steam_api64.SteamInternal_SteamAPI_Init
+    SteamInventory = original_steam_api64.SteamInventory
+    SteamMasterServerUpdater = original_steam_api64.SteamMasterServerUpdater
+    SteamMusic = original_steam_api64.SteamMusic
+    SteamMusicRemote = original_steam_api64.SteamMusicRemote
+    SteamNetworking = original_steam_api64.SteamNetworking
+    SteamParentalSettings = original_steam_api64.SteamParentalSettings
+    SteamRemoteStorage = original_steam_api64.SteamRemoteStorage
+    SteamScreenshots = original_steam_api64.SteamScreenshots
+    SteamUGC = original_steam_api64.SteamUGC
+    SteamUnifiedMessages = original_steam_api64.SteamUnifiedMessages
+    SteamUser = original_steam_api64.SteamUser
+    SteamUserStats = original_steam_api64.SteamUserStats
+    SteamUtils = original_steam_api64.SteamUtils
+    SteamVideo = original_steam_api64.SteamVideo
+    Steam_GetHSteamUserCurrent = original_steam_api64.Steam_GetHSteamUserCurrent
+    Steam_RegisterInterfaceFuncs = original_steam_api64.Steam_RegisterInterfaceFuncs
+    Steam_RunCallbacks = original_steam_api64.Steam_RunCallbacks
+    VR_GetGenericInterface = original_steam_api64.VR_GetGenericInterface
+    VR_GetStringForHmdError = original_steam_api64.VR_GetStringForHmdError
+    VR_Init = original_steam_api64.VR_Init
+    VR_IsHmdPresent = original_steam_api64.VR_IsHmdPresent
+    VR_Shutdown = original_steam_api64.VR_Shutdown
+    g_pSteamClientGameServer = original_steam_api64.g_pSteamClientGameServer
+    ; --- overrides (our own impls in steam_api_bridge_overrides.c) ---
+    SteamAPI_GetHSteamPipe
+    SteamAPI_GetHSteamUser
+    SteamAPI_ISteamClient_GetISteamMatchmaking
+    SteamAPI_ISteamClient_GetISteamMatchmakingServers
+    SteamAPI_ISteamMatchmakingServers_CancelQuery
+    SteamAPI_ISteamMatchmakingServers_CancelServerQuery
+    SteamAPI_ISteamMatchmakingServers_GetServerCount
+    SteamAPI_ISteamMatchmakingServers_GetServerDetails
+    SteamAPI_ISteamMatchmakingServers_IsRefreshing
+    SteamAPI_ISteamMatchmakingServers_PingServer
+    SteamAPI_ISteamMatchmakingServers_PlayerDetails
+    SteamAPI_ISteamMatchmakingServers_RefreshQuery
+    SteamAPI_ISteamMatchmakingServers_RefreshServer
+    SteamAPI_ISteamMatchmakingServers_ReleaseRequest
+    SteamAPI_ISteamMatchmakingServers_RequestFavoritesServerList
+    SteamAPI_ISteamMatchmakingServers_RequestFriendsServerList
+    SteamAPI_ISteamMatchmakingServers_RequestHistoryServerList
+    SteamAPI_ISteamMatchmakingServers_RequestInternetServerList
+    SteamAPI_ISteamMatchmakingServers_RequestLANServerList
+    SteamAPI_ISteamMatchmakingServers_RequestSpectatorServerList
+    SteamAPI_ISteamMatchmakingServers_ServerRules
+    SteamAPI_ISteamMatchmaking_AddFavoriteGame
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListCompatibleMembersFilter
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListDistanceFilter
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListFilterSlotsAvailable
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListNearValueFilter
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListNumericalFilter
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListResultCountFilter
+    SteamAPI_ISteamMatchmaking_AddRequestLobbyListStringFilter
+    SteamAPI_ISteamMatchmaking_CreateLobby
+    SteamAPI_ISteamMatchmaking_DeleteLobbyData
+    SteamAPI_ISteamMatchmaking_GetFavoriteGame
+    SteamAPI_ISteamMatchmaking_GetFavoriteGameCount
+    SteamAPI_ISteamMatchmaking_GetLobbyByIndex
+    SteamAPI_ISteamMatchmaking_GetLobbyChatEntry
+    SteamAPI_ISteamMatchmaking_GetLobbyData
+    SteamAPI_ISteamMatchmaking_GetLobbyDataByIndex
+    SteamAPI_ISteamMatchmaking_GetLobbyDataCount
+    SteamAPI_ISteamMatchmaking_GetLobbyGameServer
+    SteamAPI_ISteamMatchmaking_GetLobbyMemberByIndex
+    SteamAPI_ISteamMatchmaking_GetLobbyMemberData
+    SteamAPI_ISteamMatchmaking_GetLobbyMemberLimit
+    SteamAPI_ISteamMatchmaking_GetLobbyOwner
+    SteamAPI_ISteamMatchmaking_GetNumLobbyMembers
+    SteamAPI_ISteamMatchmaking_InviteUserToLobby
+    SteamAPI_ISteamMatchmaking_JoinLobby
+    SteamAPI_ISteamMatchmaking_LeaveLobby
+    SteamAPI_ISteamMatchmaking_RemoveFavoriteGame
+    SteamAPI_ISteamMatchmaking_RequestLobbyData
+    SteamAPI_ISteamMatchmaking_RequestLobbyList
+    SteamAPI_ISteamMatchmaking_SendLobbyChatMsg
+    SteamAPI_ISteamMatchmaking_SetLinkedLobby
+    SteamAPI_ISteamMatchmaking_SetLobbyData
+    SteamAPI_ISteamMatchmaking_SetLobbyGameServer
+    SteamAPI_ISteamMatchmaking_SetLobbyJoinable
+    SteamAPI_ISteamMatchmaking_SetLobbyMemberData
+    SteamAPI_ISteamMatchmaking_SetLobbyMemberLimit
+    SteamAPI_ISteamMatchmaking_SetLobbyOwner
+    SteamAPI_ISteamMatchmaking_SetLobbyType
+    SteamAPI_Init
+    SteamAPI_InitFlat
+    SteamAPI_InitSafe
+    SteamAPI_IsSteamRunning
+    SteamAPI_RegisterCallResult
+    SteamAPI_RegisterCallback
+    SteamAPI_RestartAppIfNecessary
+    SteamAPI_RunCallbacks
+    SteamAPI_Shutdown
+    SteamAPI_SteamMatchmakingServers_v002
+    SteamAPI_SteamMatchmaking_v009
+    SteamAPI_UnregisterCallResult
+    SteamAPI_UnregisterCallback
+    SteamClient
+    SteamMatchmaking
+    SteamMatchmakingServers
diff --git a/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_callbacks.c b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_callbacks.c
new file mode 100644
index 000000000..b69a80ce6
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_callbacks.c
@@ -0,0 +1,252 @@
+
+#include <windows.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define WN_STEAMAPI_EXPORT __declspec(dllexport)
+
+__attribute__((visibility("default")))
+void wnb_dispatch_callback(int iCallback, const void* data, size_t data_size);
+__attribute__((visibility("default")))
+void wnb_dispatch_call_result(uint64_t hAPICall, int io_failure,
+                              const void* data, size_t data_size);
+
+#define WNB_MAX_LISTENERS 64
+
+typedef struct {
+    void*    callback;   /* CCallbackBase* */
+    int      iCallback;  /* for CCallback path */
+    uint64_t hAPICall;   /* for CCallResult path (0 = CCallback) */
+} WnbListener;
+
+static WnbListener g_listeners[WNB_MAX_LISTENERS];
+static CRITICAL_SECTION g_listeners_cs;
+static int g_listeners_inited = 0;
+
+#define WNB_MAX_PENDING  64
+#define WNB_MAX_PAYLOAD  256
+
+typedef struct {
+    uint64_t hAPICall;             /* 0 = empty slot */
+    int      io_failure;
+    size_t   payload_size;
+    uint8_t  payload[WNB_MAX_PAYLOAD];
+} WnbPendingResult;
+
+static WnbPendingResult g_pending[WNB_MAX_PENDING];
+
+static void listeners_init(void) {
+    if (g_listeners_inited) return;
+    InitializeCriticalSection(&g_listeners_cs);
+    g_listeners_inited = 1;
+}
+
+static void listeners_add(void* pCallback, int iCallback, uint64_t hAPICall) {
+    if (!pCallback) return;
+    listeners_init();
+    EnterCriticalSection(&g_listeners_cs);
+    for (int i = 0; i < WNB_MAX_LISTENERS; ++i) {
+        if (g_listeners[i].callback == NULL) {
+            g_listeners[i].callback  = pCallback;
+            g_listeners[i].iCallback = iCallback;
+            g_listeners[i].hAPICall  = hAPICall;
+            break;
+        }
+    }
+    LeaveCriticalSection(&g_listeners_cs);
+}
+
+static void listeners_remove(void* pCallback) {
+    if (!pCallback) return;
+    listeners_init();
+    EnterCriticalSection(&g_listeners_cs);
+    for (int i = 0; i < WNB_MAX_LISTENERS; ++i) {
+        if (g_listeners[i].callback == pCallback) {
+            g_listeners[i].callback = NULL;
+        }
+    }
+    LeaveCriticalSection(&g_listeners_cs);
+}
+
+typedef void (*VoidFn)(void);
+typedef void (*RegisterFn)(void* pCallback, int iCallback);
+typedef void (*UnregisterFn)(void* pCallback);
+typedef void (*RegisterResultFn)(void* pCallback, uint64_t hAPICall);
+typedef void (*UnregisterResultFn)(void* pCallback, uint64_t hAPICall);
+
+static HMODULE g_gbe_fork = NULL;
+static RegisterFn         g_gbe_register_callback     = NULL;
+static UnregisterFn       g_gbe_unregister_callback   = NULL;
+static RegisterResultFn   g_gbe_register_call_result   = NULL;
+static UnregisterResultFn g_gbe_unregister_call_result = NULL;
+static VoidFn             g_gbe_run_callbacks         = NULL;
+
+static void resolve_gbe_fork(void) {
+    if (g_gbe_fork != NULL) return;
+    g_gbe_fork = LoadLibraryA("original_steam_api64.dll");
+    if (g_gbe_fork == NULL) {
+        OutputDebugStringA(
+            "[wnb-callbacks] LoadLibrary(original_steam_api64.dll) failed");
+        return;
+    }
+    g_gbe_register_callback =
+        (RegisterFn)GetProcAddress(g_gbe_fork, "SteamAPI_RegisterCallback");
+    g_gbe_unregister_callback =
+        (UnregisterFn)GetProcAddress(g_gbe_fork, "SteamAPI_UnregisterCallback");
+    g_gbe_register_call_result =
+        (RegisterResultFn)GetProcAddress(g_gbe_fork, "SteamAPI_RegisterCallResult");
+    g_gbe_unregister_call_result =
+        (UnregisterResultFn)GetProcAddress(g_gbe_fork, "SteamAPI_UnregisterCallResult");
+    g_gbe_run_callbacks =
+        (VoidFn)GetProcAddress(g_gbe_fork, "SteamAPI_RunCallbacks");
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_RegisterCallback(void* pCallback, int iCallback) {
+    resolve_gbe_fork();
+    if (g_gbe_register_callback != NULL) {
+        g_gbe_register_callback(pCallback, iCallback);
+    }
+    listeners_add(pCallback, iCallback, /*hAPICall=*/0);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_UnregisterCallback(void* pCallback) {
+    resolve_gbe_fork();
+    if (g_gbe_unregister_callback != NULL) {
+        g_gbe_unregister_callback(pCallback);
+    }
+    listeners_remove(pCallback);
+}
+
+static void drain_pending_for(void* pCallback, uint64_t hAPICall) {
+    if (!pCallback || hAPICall == 0) return;
+    listeners_init();
+    uint8_t  payload[WNB_MAX_PAYLOAD];
+    size_t   payload_size = 0;
+    int      io_failure = 0;
+    int      found = 0;
+    EnterCriticalSection(&g_listeners_cs);
+    for (int i = 0; i < WNB_MAX_PENDING; ++i) {
+        if (g_pending[i].hAPICall == hAPICall) {
+            payload_size = g_pending[i].payload_size;
+            if (payload_size > WNB_MAX_PAYLOAD) payload_size = WNB_MAX_PAYLOAD;
+            memcpy(payload, g_pending[i].payload, payload_size);
+            io_failure = g_pending[i].io_failure;
+            g_pending[i].hAPICall = 0;
+            g_pending[i].payload_size = 0;
+            found = 1;
+            break;
+        }
+    }
+    LeaveCriticalSection(&g_listeners_cs);
+    if (!found) return;
+    listeners_remove(pCallback);
+    typedef void (*RunResultFn)(void* /*this*/, void* /*pvParam*/, int /*bIOFailure*/);
+    void** vtable = *(void***)pCallback;
+    RunResultFn run = (RunResultFn)vtable[1];
+    run(pCallback, payload, io_failure);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_RegisterCallResult(void* pCallback, uint64_t hAPICall) {
+    resolve_gbe_fork();
+    if (g_gbe_register_call_result != NULL) {
+        g_gbe_register_call_result(pCallback, hAPICall);
+    }
+    listeners_add(pCallback, /*iCallback=*/0, hAPICall);
+    drain_pending_for(pCallback, hAPICall);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_UnregisterCallResult(void* pCallback, uint64_t hAPICall) {
+    resolve_gbe_fork();
+    if (g_gbe_unregister_call_result != NULL) {
+        g_gbe_unregister_call_result(pCallback, hAPICall);
+    }
+    listeners_remove(pCallback);
+}
+
+__attribute__((visibility("default")))
+void wnb_publish_dispatch_pointers(void) {
+    const char* dir = getenv("WN_STATE_DIR");
+    if (!dir || !*dir) dir = "/tmp";
+    char path[512];
+    snprintf(path, sizeof(path), "%s/wnb_ptrs.txt", dir);
+    FILE* f = fopen(path, "w");
+    if (!f) {
+        OutputDebugStringA("[wnb-callbacks] publish_dispatch_pointers: fopen failed");
+        return;
+    }
+    fprintf(f, "dispatch_callback %llu\n",
+            (unsigned long long)(uintptr_t)wnb_dispatch_callback);
+    fprintf(f, "dispatch_call_result %llu\n",
+            (unsigned long long)(uintptr_t)wnb_dispatch_call_result);
+    fclose(f);
+}
+
+__attribute__((visibility("default")))
+void wnb_dispatch_callback(int iCallback, const void* data, size_t data_size) {
+    (void)data_size;  /* CCallback fan-out doesn't need late-bind; the
+    listeners_init();
+    EnterCriticalSection(&g_listeners_cs);
+    void* matches[WNB_MAX_LISTENERS];
+    int   n = 0;
+    for (int i = 0; i < WNB_MAX_LISTENERS; ++i) {
+        if (g_listeners[i].callback != NULL
+                && g_listeners[i].hAPICall == 0
+                && g_listeners[i].iCallback == iCallback) {
+            matches[n++] = g_listeners[i].callback;
+        }
+    }
+    LeaveCriticalSection(&g_listeners_cs);
+    typedef void (*RunFn)(void* /*this*/, const void* /*pvParam*/);
+    for (int i = 0; i < n; ++i) {
+        void** vtable = *(void***)matches[i];
+        RunFn run = (RunFn)vtable[0];
+        run(matches[i], data);
+    }
+}
+
+__attribute__((visibility("default")))
+void wnb_dispatch_call_result(uint64_t hAPICall, int io_failure,
+                              const void* data, size_t data_size) {
+    listeners_init();
+    EnterCriticalSection(&g_listeners_cs);
+    void* matches[WNB_MAX_LISTENERS];
+    int   n = 0;
+    for (int i = 0; i < WNB_MAX_LISTENERS; ++i) {
+        if (g_listeners[i].callback != NULL
+                && g_listeners[i].hAPICall == hAPICall) {
+            matches[n++] = g_listeners[i].callback;
+            g_listeners[i].callback = NULL;
+        }
+    }
+    if (n == 0) {
+        size_t copy = data_size > WNB_MAX_PAYLOAD ? WNB_MAX_PAYLOAD : data_size;
+        for (int i = 0; i < WNB_MAX_PENDING; ++i) {
+            if (g_pending[i].hAPICall == 0) {
+                g_pending[i].hAPICall     = hAPICall;
+                g_pending[i].io_failure   = io_failure;
+                g_pending[i].payload_size = copy;
+                if (data && copy) memcpy(g_pending[i].payload, data, copy);
+                break;
+            }
+        }
+    }
+    LeaveCriticalSection(&g_listeners_cs);
+    typedef void (*RunResultFn)(void* /*this*/, const void* /*pvParam*/, int /*bIOFailure*/);
+    for (int i = 0; i < n; ++i) {
+        void** vtable = *(void***)matches[i];
+        RunResultFn run = (RunResultFn)vtable[1];
+        run(matches[i], data, io_failure);
+    }
+}
+
+extern void wnb_pump_valve_callbacks(void);
+
+WN_STEAMAPI_EXPORT void SteamAPI_RunCallbacks(void) {
+    resolve_gbe_fork();
+    if (g_gbe_run_callbacks != NULL) {
+        g_gbe_run_callbacks();
+    }
+    wnb_pump_valve_callbacks();
+}
diff --git a/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_flat.c b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_flat.c
new file mode 100644
index 000000000..2aeba30cb
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_flat.c
@@ -0,0 +1,4952 @@
+
+#include <windows.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#define WN_STEAMAPI_EXPORT __declspec(dllexport)
+
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamAppList_GetNumInstalledApps(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamAppList_GetInstalledApps(void* self, void* pvecAppID, uint32_t cMax) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[1])(self, pvecAppID, cMax);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamAppList_GetAppName(void* self, uint32_t appId, void* pName, int cMaxName) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int);
+    return ((Fn)vt[2])(self, appId, pName, cMaxName);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamAppList_GetAppInstallDir(void* self, uint32_t appId, void* pDir, int cMaxDir) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int);
+    return ((Fn)vt[3])(self, appId, pDir, cMaxDir);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamAppList_GetAppBuildId(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[4])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsSubscribed(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsLowViolence(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsCybercafe(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsVACBanned(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[3])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamApps_GetCurrentGameLanguage(void* self) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*);
+    return ((Fn)vt[4])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamApps_GetAvailableGameLanguages(void* self) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*);
+    return ((Fn)vt[5])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsSubscribedApp(void* self, uint32_t appId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[6])(self, appId);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsDlcInstalled(void* self, uint32_t appId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[7])(self, appId);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamApps_GetEarliestPurchaseUnixTime(void* self, uint32_t app_id) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[8])(self, app_id);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsSubscribedFromFreeWeekend(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[9])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_GetDLCCount(void* self, uint32_t appId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[10])(self, appId);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BGetDLCDataByIndex(void* self, uint32_t appId, int iDLC, void* pAppID, void* pbAvailable, void* pchName, int cchNameBufferSize) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int, void*, void*, void*, int);
+    return ((Fn)vt[11])(self, appId, iDLC, pAppID, pbAvailable, pchName, cchNameBufferSize);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamApps_InstallDLC(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[12])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamApps_UninstallDLC(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[13])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamApps_RequestAppProofOfPurchaseKey(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[14])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_GetCurrentBetaName(void* self, void* pchName, int cchNameBufferSize) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int);
+    return ((Fn)vt[15])(self, pchName, cchNameBufferSize);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_MarkContentCorrupt(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamApps_GetInstalledDepots(void* self, uint32_t appID, void* pvecDepots, uint32_t cMaxDepots) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint32_t, void*, uint32_t);
+    return ((Fn)vt[17])(self, appID, pvecDepots, cMaxDepots);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamApps_GetAppInstallDir(void* self, uint32_t appId, void* buf, uint32_t cap) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint32_t, void*, uint32_t);
+    return ((Fn)vt[18])(self, appId, buf, cap);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsAppInstalled(void* self, uint32_t appId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[19])(self, appId);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamApps_GetAppOwner(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[20])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamApps_GetLaunchQueryParam(void* self, void* _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*);
+    return ((Fn)vt[21])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_GetDlcDownloadProgress(void* self, uint32_t appID, void* pBytesDownloaded, void* pBytesTotal) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, void*);
+    return ((Fn)vt[22])(self, appID, pBytesDownloaded, pBytesTotal);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_GetAppBuildId(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[23])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[24])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamApps_GetFileDetails(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[25])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_GetLaunchCommandLine(void* self, void* buf, int cubMax) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int);
+    return ((Fn)vt[26])(self, buf, cubMax);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsSubscribedFromFamilySharing(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[27])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_BIsTimedTrial(void* self, void* pcSecondsAllowed, void* pcSecondsPlayed) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[28])(self, pcSecondsAllowed, pcSecondsPlayed);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamApps_SetDlcContext(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[29])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamClient_CreateSteamPipe(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamClient_BReleaseSteamPipe(void* self, int pipe) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[1])(self, pipe);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamClient_ConnectToGlobalUser(void* self, int pipe) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[2])(self, pipe);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamClient_CreateLocalUser(void* self, void* pipe_inout, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[3])(self, pipe_inout, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamClient_ReleaseUser(void* self, int pipe, int user) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int, int);
+    ((Fn)vt[4])(self, pipe, user);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamUser(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[5])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamGameServer(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[6])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamClient_SetLocalIPBinding(void* self, uint32_t _a0, uint16_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint16_t);
+    ((Fn)vt[7])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamFriends(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[8])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamUtils(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*);
+    return ((Fn)vt[9])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamMatchmaking(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[10])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamMatchmakingServers(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[11])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamGenericInterface(void* self, int _a0, int _a1, void* version) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[12])(self, _a0, _a1, version);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamUserStats(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[13])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamApps(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[14])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamNetworking(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[15])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamRemoteStorage(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[16])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamScreenshots(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[17])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamUGC(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[18])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamAppList(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[19])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamMusic(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[20])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamMusicRemote(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[21])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamHTMLSurface(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[22])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamClient_Set_SteamAPI_CPostAPIResultInProcess(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[23])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamClient_Remove_SteamAPI_CPostAPIResultInProcess(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[24])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamClient_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[25])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamInventory(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[26])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamVideo(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[27])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamParentalSettings(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[28])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamInput(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[29])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamParties(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[30])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamRemotePlay(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[31])(self, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetPersonaName(void* self) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_SetPersonaName(void* self, void* pchPersonaName) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[1])(self, pchPersonaName);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetPersonaState(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendCount(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetFriendByIndex(void* self, int idx, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, void*);
+    return ((Fn)vt[4])(self, idx, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendRelationship(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[5])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendPersonaState(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[6])(self, sid);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetFriendPersonaName(void* self, uint64_t sid) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[7])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendGamePlayed(void* self, uint64_t sid, void* pFriendGameInfo) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[8])(self, sid, pFriendGameInfo);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetFriendPersonaNameHistory(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[9])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendSteamLevel(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[10])(self, sid);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetPlayerNickname(void* self, uint64_t sid) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[11])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendsGroupCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[12])(self);
+}
+WN_STEAMAPI_EXPORT int16_t SteamAPI_ISteamFriends_GetFriendsGroupIDByIndex(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int16_t (*Fn)(void*, int);
+    return ((Fn)vt[13])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetFriendsGroupName(void* self, int16_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int16_t);
+    return ((Fn)vt[14])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendsGroupMembersCount(void* self, int16_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int16_t);
+    return ((Fn)vt[15])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_GetFriendsGroupMembersList(void* self, int16_t _a0, void* _a1, int _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int16_t, void*, int);
+    ((Fn)vt[16])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_HasFriend(void* self, uint64_t sid, int iFriendFlags) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[17])(self, sid, iFriendFlags);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetClanCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[18])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetClanByIndex(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int);
+    return ((Fn)vt[19])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetClanName(void* self, uint64_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[20])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetClanTag(void* self, uint64_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[21])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetClanActivityCounts(void* self, uint64_t _a0, void* _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*, void*);
+    return ((Fn)vt[22])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_DownloadClanActivityCounts(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*);
+    return ((Fn)vt[23])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendCountFromSource(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[24])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetFriendFromSourceByIndex(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[25])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_IsUserInSource(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[26])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_SetInGameVoiceSpeaking(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, int);
+    ((Fn)vt[27])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlay(void* self, void* dialog) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[28])(self, dialog);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlayToUser(void* self, void* dialog, uint64_t sid) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, uint64_t);
+    ((Fn)vt[29])(self, dialog, sid);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlayToWebPage(void* self, void* url, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*);
+    ((Fn)vt[30])(self, url, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlayToStore(void* self, uint32_t appid, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*);
+    ((Fn)vt[31])(self, appid, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_SetPlayedWith(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[32])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialog(void* self, uint64_t lobby_sid) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[33])(self, lobby_sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetSmallFriendAvatar(void* self, uint64_t steamID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[34])(self, steamID);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetMediumFriendAvatar(void* self, uint64_t steamID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[35])(self, steamID);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetLargeFriendAvatar(void* self, uint64_t steamID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[36])(self, steamID);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_RequestUserInformation(void* self, uint64_t steamID, int bRequireNameOnly) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[37])(self, steamID, bRequireNameOnly);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_RequestClanOfficerList(void* self, uint64_t clanSid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[38])(self, clanSid);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetClanOwner(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[39])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetClanOfficerCount(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[40])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetClanOfficerByIndex(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[41])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamFriends_GetUserRestrictions(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[42])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_SetRichPresence(void* self, void* pchKey, void* pchValue) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[43])(self, pchKey, pchValue);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ClearRichPresence(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[44])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetFriendRichPresence(void* self, uint64_t steamID, void* pchKey) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[45])(self, steamID, pchKey);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendRichPresenceKeyCount(void* self, uint64_t steamID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[46])(self, steamID);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetFriendRichPresenceKeyByIndex(void* self, uint64_t steamID, int idx) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[47])(self, steamID, idx);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_RequestFriendRichPresence(void* self, uint64_t steamID) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[48])(self, steamID);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_InviteUserToGame(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[49])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetCoplayFriendCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[50])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetCoplayFriend(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int);
+    return ((Fn)vt[51])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendCoplayTime(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[52])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamFriends_GetFriendCoplayGame(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[53])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_JoinClanChatRoom(void* self, uint64_t clanSid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[54])(self, clanSid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_LeaveClanChatRoom(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[55])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetClanChatMemberCount(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[56])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetChatMemberByIndex(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[57])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_SendClanChatMessage(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[58])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetClanChatMessage(void* self, uint64_t _a0, int _a1, void* _a2, int _a3, void* _a4, void* _a5) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int, void*, int, void*, void*);
+    return ((Fn)vt[59])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_IsClanChatAdmin(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[60])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_IsClanChatWindowOpenInSteam(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[61])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_OpenClanChatWindowInSteam(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[62])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_CloseClanChatWindowInSteam(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[63])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_SetListenForFriendsMessages(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[64])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_ReplyToFriendMessage(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[65])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetFriendMessage(void* self, uint64_t _a0, int _a1, void* _a2, int _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int, void*, int, void*);
+    return ((Fn)vt[66])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_GetFollowerCount(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[67])(self, sid);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_IsFollowing(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[68])(self, sid);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_EnumerateFollowingList(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[69])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_IsClanPublic(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[70])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_IsClanOfficialGameGroup(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[71])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_GetNumChatsWithUnreadPriorityMessages(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[72])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlayRemotePlayTogetherInviteDialog(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[73])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_RegisterProtocolInOverlayBrowser(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[74])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialogConnectString(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[75])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamFriends_RequestEquippedProfileItems(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[76])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamFriends_BHasEquippedProfileItem(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[77])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamFriends_GetProfileItemPropertyString(void* self, uint64_t _a0, int _a1, int _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t, int, int);
+    return ((Fn)vt[78])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamFriends_GetProfileItemPropertyUint(void* self, uint64_t _a0, int _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t, int, int);
+    return ((Fn)vt[79])(self, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetProduct(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[0])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetGameDescription(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[1])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetModDir(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetDedicatedServer(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_LogOn(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[4])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_LogOnAnonymous(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[5])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_LogOff(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[6])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_BLoggedOn(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[7])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_BSecure(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[8])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_GetSteamID(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[9])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_WasRestartRequested(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[10])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetMaxPlayerCount(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[11])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetBotPlayerCount(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[12])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetServerName(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[13])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetMapName(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[14])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetPasswordProtected(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[15])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetSpectatorPort(void* self, uint16_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint16_t);
+    ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetSpectatorServerName(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[17])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_ClearAllKeyValues(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[18])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetKeyValue(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*);
+    ((Fn)vt[19])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetGameTags(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[20])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetGameData(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[21])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetRegion(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[22])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SetAdvertiseServerActive(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[23])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_GetAuthSessionTicket(void* self, void* _a0, int _a1, void* pcb, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, int, void*, void*);
+    return ((Fn)vt[24])(self, _a0, _a1, pcb, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_BeginAuthSession(void* self, void* _a0, int _a1, uint64_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, uint64_t);
+    return ((Fn)vt[25])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_EndAuthSession(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[26])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_CancelAuthTicket(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[27])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_UserHasLicenseForApp(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[28])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_RequestUserGroupStatus(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[29])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_GetGameplayStats(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[30])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_GetServerReputation(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[31])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_GetPublicIP(void* self, void* out) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[32])(self, out);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_HandleIncomingPacket(void* self, void* _a0, int _a1, uint32_t _a2, uint16_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, uint32_t, uint16_t);
+    return ((Fn)vt[33])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_GetNextOutgoingPacket(void* self, void* _a0, int _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*, void*);
+    return ((Fn)vt[34])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_AssociateWithClan(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[35])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_ComputeNewPlayerCompatibility(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[36])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED(void* self, uint32_t _a0, void* _a1, uint32_t _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[37])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[38])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[39])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamGameServer_BUpdateUserData(void* self, uint64_t _a0, void* _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, uint32_t);
+    return ((Fn)vt[40])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamGameServer_GetAuthTicketForWebApi(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[41])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamHTMLSurface_Init(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamHTMLSurface_Shutdown(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamHTMLSurface_CreateBrowser(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*);
+    return ((Fn)vt[2])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_RemoveBrowser(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_LoadURL(void* self, uint32_t _a0, void* _a1, void* _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*, void*);
+    ((Fn)vt[4])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetSize(void* self, uint32_t _a0, uint32_t _a1, uint32_t _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint32_t, uint32_t);
+    ((Fn)vt[5])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_StopLoad(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[6])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_Reload(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[7])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_GoBack(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[8])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_GoForward(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[9])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_AddHeader(void* self, uint32_t _a0, void* _a1, void* _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*, void*);
+    ((Fn)vt[10])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_ExecuteJavascript(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*);
+    ((Fn)vt[11])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_MouseUp(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[12])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_MouseDown(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[13])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_MouseDoubleClick(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[14])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_MouseMove(void* self, uint32_t _a0, int _a1, int _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int, int);
+    ((Fn)vt[15])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_MouseWheel(void* self, uint32_t _a0, int32_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int32_t);
+    ((Fn)vt[16])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_KeyDown(void* self, uint32_t _a0, uint32_t _a1, int _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint32_t, int);
+    ((Fn)vt[17])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_KeyUp(void* self, uint32_t _a0, uint32_t _a1, int _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint32_t, int);
+    ((Fn)vt[18])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_KeyChar(void* self, uint32_t _a0, uint32_t _a1, int _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint32_t, int);
+    ((Fn)vt[19])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetHorizontalScroll(void* self, uint32_t _a0, uint32_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint32_t);
+    ((Fn)vt[20])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetVerticalScroll(void* self, uint32_t _a0, uint32_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint32_t);
+    ((Fn)vt[21])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetKeyFocus(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[22])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_ViewSource(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[23])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_CopyToClipboard(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[24])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_PasteFromClipboard(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[25])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_Find(void* self, uint32_t _a0, void* _a1, int _a2, int _a3) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*, int, int);
+    ((Fn)vt[26])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_StopFind(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[27])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_GetLinkAtPosition(void* self, uint32_t _a0, int _a1, int _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int, int);
+    ((Fn)vt[28])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetCookie(void* self, void* _a0, void* _a1, void* _a2, void* _a3, uint32_t _a4, int _a5, int _a6) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*, void*, void*, uint32_t, int, int);
+    ((Fn)vt[29])(self, _a0, _a1, _a2, _a3, _a4, _a5, _a6);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetPageScaleFactor(void* self, uint32_t _a0, float _a1, int _a2, int _a3) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, float, int, int);
+    ((Fn)vt[30])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetBackgroundMode(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[31])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_SetDPIScalingFactor(void* self, uint32_t _a0, float _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, float);
+    ((Fn)vt[32])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_OpenDeveloperTools(void* self, uint32_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t);
+    ((Fn)vt[33])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_AllowStartRequest(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[34])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_JSDialogResponse(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, int);
+    ((Fn)vt[35])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamHTMLSurface_FileLoadDialogResponse(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*);
+    ((Fn)vt[36])(self, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_Init(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[0])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_Shutdown(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_SetInputActionManifestFilePath(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_RunFrame(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_BWaitForData(void* self, int _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, uint32_t);
+    return ((Fn)vt[4])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_BNewDataAvailable(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[5])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetConnectedControllers(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[6])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_EnableDeviceCallbacks(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[7])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_EnableActionEventCallbacks(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[8])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInput_GetActionSetHandle(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[9])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_ActivateActionSet(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t);
+    ((Fn)vt[10])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInput_GetCurrentActionSet(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[11])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_ActivateActionSetLayer(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t);
+    ((Fn)vt[12])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_DeactivateActionSetLayer(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t);
+    ((Fn)vt[13])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_DeactivateAllActionSetLayers(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[14])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetActiveActionSetLayers(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[15])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInput_GetDigitalActionHandle(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_GetDigitalActionData(void* self, uint64_t _a0, uint64_t _a1, void* outData) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t, void*);
+    ((Fn)vt[17])(self, _a0, _a1, outData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetDigitalActionOrigins(void* self, uint64_t _a0, uint64_t _a1, uint64_t _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, uint64_t, void*);
+    return ((Fn)vt[18])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetStringForDigitalActionName(void* self, uint64_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[19])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInput_GetAnalogActionHandle(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[20])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_GetAnalogActionData(void* self, uint64_t _a0, uint64_t _a1, void* outData) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t, void*);
+    ((Fn)vt[21])(self, _a0, _a1, outData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetAnalogActionOrigins(void* self, uint64_t _a0, uint64_t _a1, uint64_t _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, uint64_t, void*);
+    return ((Fn)vt[22])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetGlyphPNGForActionOrigin(void* self, int _a0, int _a1, uint32_t _a2) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, int, uint32_t);
+    return ((Fn)vt[23])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetGlyphSVGForActionOrigin(void* self, int _a0, uint32_t _a1) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, uint32_t);
+    return ((Fn)vt[24])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetGlyphForActionOrigin_Legacy(void* self, int _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int);
+    return ((Fn)vt[25])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetStringForActionOrigin(void* self, int _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int);
+    return ((Fn)vt[26])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetStringForAnalogActionName(void* self, uint64_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[27])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_StopAnalogActionMomentum(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t);
+    ((Fn)vt[28])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_GetMotionData(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[29])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_TriggerVibration(void* self, uint64_t _a0, uint16_t _a1, uint16_t _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint16_t, uint16_t);
+    ((Fn)vt[30])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_TriggerVibrationExtended(void* self, uint64_t _a0, uint16_t _a1, uint16_t _a2, uint16_t _a3, uint16_t _a4) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t);
+    ((Fn)vt[31])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_TriggerSimpleHapticEvent(void* self, uint64_t _a0, int _a1, uint8_t _a2, char _a3, uint8_t _a4, char _a5) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, int, uint8_t, char, uint8_t, char);
+    ((Fn)vt[32])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_SetLEDColor(void* self, uint64_t _a0, uint8_t _a1, uint8_t _a2, uint8_t _a3, uint32_t _a4) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint8_t, uint8_t, uint8_t, uint32_t);
+    ((Fn)vt[33])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_Legacy_TriggerHapticPulse(void* self, uint64_t _a0, int _a1, uint16_t _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, int, uint16_t);
+    ((Fn)vt[34])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_Legacy_TriggerRepeatedHapticPulse(void* self, uint64_t _a0, int _a1, uint16_t _a2, uint16_t _a3, uint16_t _a4, uint32_t _a5) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, int, uint16_t, uint16_t, uint16_t, uint32_t);
+    ((Fn)vt[35])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_ShowBindingPanel(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[36])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetInputTypeForHandle(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[37])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInput_GetControllerForGamepadIndex(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int);
+    return ((Fn)vt[38])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetGamepadIndexForController(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[39])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetStringForXboxOrigin(void* self, int _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int);
+    return ((Fn)vt[40])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamInput_GetGlyphForXboxOrigin(void* self, int _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int);
+    return ((Fn)vt[41])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetActionOriginFromXboxOrigin(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[42])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_TranslateActionOrigin(void* self, int _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int);
+    return ((Fn)vt[43])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInput_GetDeviceBindingRevision(void* self, uint64_t _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[44])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamInput_GetRemotePlaySessionID(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[45])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamInput_GetSessionInputConfigurationSettings(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[46])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInput_SetDualSenseTriggerEffect(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, void*);
+    ((Fn)vt[47])(self, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetResultStatus(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[0])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetResultItems(void* self, int _a0, void* _a1, void* pcb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*);
+    return ((Fn)vt[1])(self, _a0, _a1, pcb);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetResultItemProperty(void* self, int _a0, uint32_t _a1, void* _a2, void* buf, void* cb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, uint32_t, void*, void*, void*);
+    return ((Fn)vt[2])(self, _a0, _a1, _a2, buf, cb);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamInventory_GetResultTimestamp(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, int);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_CheckResultSteamID(void* self, int _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, uint64_t);
+    return ((Fn)vt[4])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInventory_DestroyResult(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[5])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetAllItems(void* self, void* phRes) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[6])(self, phRes);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetItemsByID(void* self, void* phRes, void* _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t);
+    return ((Fn)vt[7])(self, phRes, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_SerializeResult(void* self, int _a0, void* _a1, void* pcb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*);
+    return ((Fn)vt[8])(self, _a0, _a1, pcb);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_DeserializeResult(void* self, void* phRes, void* _a1, uint32_t _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t, int);
+    return ((Fn)vt[9])(self, phRes, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GenerateItems(void* self, void* phRes, void* _a1, void* _a2, uint32_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*, uint32_t);
+    return ((Fn)vt[10])(self, phRes, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GrantPromoItems(void* self, void* phRes) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[11])(self, phRes);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_AddPromoItem(void* self, void* phRes, int32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int32_t);
+    return ((Fn)vt[12])(self, phRes, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_AddPromoItems(void* self, void* phRes, void* _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t);
+    return ((Fn)vt[13])(self, phRes, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_ConsumeItem(void* self, void* phRes, uint64_t _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint64_t, uint32_t);
+    return ((Fn)vt[14])(self, phRes, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_ExchangeItems(void* self, void* phRes, void* _a1, void* _a2, uint32_t _a3, void* _a4, void* _a5, uint32_t _a6) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*, uint32_t, void*, void*, uint32_t);
+    return ((Fn)vt[15])(self, phRes, _a1, _a2, _a3, _a4, _a5, _a6);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_TransferItemQuantity(void* self, void* phRes, uint64_t _a1, uint32_t _a2, uint64_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint64_t, uint32_t, uint64_t);
+    return ((Fn)vt[16])(self, phRes, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamInventory_SendItemDropHeartbeat(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[17])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_TriggerItemDrop(void* self, void* phRes, int32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int32_t);
+    return ((Fn)vt[18])(self, phRes, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_TradeItems(void* self, void* phRes, uint64_t _a1, void* _a2, void* _a3, uint32_t _a4, void* _a5, void* _a6, uint32_t _a7) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint64_t, void*, void*, uint32_t, void*, void*, uint32_t);
+    return ((Fn)vt[19])(self, phRes, _a1, _a2, _a3, _a4, _a5, _a6, _a7);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_LoadItemDefinitions(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[20])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetItemDefinitionIDs(void* self, void* defs, void* pcb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[21])(self, defs, pcb);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetItemDefinitionProperty(void* self, int32_t iDef, void* propName, void* buf, void* cb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int32_t, void*, void*, void*);
+    return ((Fn)vt[22])(self, iDef, propName, buf, cb);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInventory_RequestEligiblePromoItemDefinitionsIDs(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[23])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetEligiblePromoItemDefinitionIDs(void* self, uint64_t _a0, void* _a1, void* pcb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[24])(self, _a0, _a1, pcb);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInventory_StartPurchase(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[25])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInventory_RequestPrices(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[26])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamInventory_GetNumItemsWithPrices(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[27])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetItemsWithPrices(void* self, void* _a0, void* _a1, void* _a2, uint32_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*, uint32_t);
+    return ((Fn)vt[28])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_GetItemPrice(void* self, int32_t _a0, void* p, void* bp) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int32_t, void*, void*);
+    return ((Fn)vt[29])(self, _a0, p, bp);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamInventory_StartUpdateProperties(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[30])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_RemoveProperty(void* self, uint64_t _a0, uint64_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, void*);
+    return ((Fn)vt[31])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_SetProperty_String(void* self, uint64_t _a0, uint64_t _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, void*, void*);
+    return ((Fn)vt[32])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_SetProperty_Bool(void* self, uint64_t _a0, uint64_t _a1, void* _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, void*, int);
+    return ((Fn)vt[33])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_SetProperty_Int64(void* self, uint64_t _a0, uint64_t _a1, void* _a2, int64_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, void*, int64_t);
+    return ((Fn)vt[34])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_SetProperty_Float(void* self, uint64_t _a0, uint64_t _a1, void* _a2, float _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t, void*, float);
+    return ((Fn)vt[35])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_SubmitUpdateProperties(void* self, uint64_t _a0, void* phRes) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[36])(self, _a0, phRes);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamInventory_InspectItem(void* self, void* phRes, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[37])(self, phRes, _a1);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetFavoriteGameCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetFavoriteGame(void* self, int _a0, void* _a1, void* _a2, void* _a3, void* _a4, void* _a5, void* _a6) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*, void*, void*, void*, void*);
+    return ((Fn)vt[1])(self, _a0, _a1, _a2, _a3, _a4, _a5, _a6);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_AddFavoriteGame(void* self, uint32_t _a0, uint32_t _a1, uint16_t _a2, uint16_t _a3, uint32_t _a4, uint32_t _a5) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uint32_t, uint32_t);
+    return ((Fn)vt[2])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_RemoveFavoriteGame(void* self, uint32_t _a0, uint32_t _a1, uint16_t _a2, uint16_t _a3, uint32_t _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uint32_t);
+    return ((Fn)vt[3])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_RequestLobbyList(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[4])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListStringFilter(void* self, void* k, void* v, int cmp) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*, int);
+    ((Fn)vt[5])(self, k, v, cmp);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListNumericalFilter(void* self, void* k, int v, int cmp) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, int, int);
+    ((Fn)vt[6])(self, k, v, cmp);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListNearValueFilter(void* self, void* k, int v) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, int);
+    ((Fn)vt[7])(self, k, v);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListFilterSlotsAvailable(void* self, int slots) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[8])(self, slots);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListDistanceFilter(void* self, int eDist) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[9])(self, eDist);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListResultCountFilter(void* self, int n) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[10])(self, n);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListCompatibleMembersFilter(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[11])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_GetLobbyByIndex(void* self, int idx) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int);
+    return ((Fn)vt[12])(self, idx);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_CreateLobby(void* self, int eLobbyType, int maxMembers) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, int);
+    return ((Fn)vt[13])(self, eLobbyType, maxMembers);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_JoinLobby(void* self, uint64_t lobbySid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[14])(self, lobbySid);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_LeaveLobby(void* self, uint64_t sid) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[15])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_InviteUserToLobby(void* self, uint64_t sid, uint64_t invitee) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[16])(self, sid, invitee);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetNumLobbyMembers(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[17])(self, sid);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_GetLobbyMemberByIndex(void* self, uint64_t sid, int idx) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[18])(self, sid, idx);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmaking_GetLobbyData(void* self, uint64_t sid, void* key) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[19])(self, sid, key);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyData(void* self, uint64_t sid, void* key, void* val) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[20])(self, sid, key, val);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyDataCount(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[21])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyDataByIndex(void* self, uint64_t sid, int idx, void* key, int kn, void* val, int vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int, void*, int, void*, int);
+    return ((Fn)vt[22])(self, sid, idx, key, kn, val, vn);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_DeleteLobbyData(void* self, uint64_t sid, void* key) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[23])(self, sid, key);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmaking_GetLobbyMemberData(void* self, uint64_t sid, uint64_t member, void* key) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t, uint64_t, void*);
+    return ((Fn)vt[24])(self, sid, member, key);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_SetLobbyMemberData(void* self, uint64_t sid, void* key, void* val) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, void*, void*);
+    ((Fn)vt[25])(self, sid, key, val);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SendLobbyChatMsg(void* self, uint64_t sid, void* body, int n) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, int);
+    return ((Fn)vt[26])(self, sid, body, n);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyChatEntry(void* self, uint64_t sid, int idx, void* speaker_out, void* body_out, int body_cap, void* chat_type_out) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int, void*, void*, int, void*);
+    return ((Fn)vt[27])(self, sid, idx, speaker_out, body_out, body_cap, chat_type_out);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_RequestLobbyData(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[28])(self, sid);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_SetLobbyGameServer(void* self, uint64_t sid, uint32_t ip, uint16_t port, uint64_t gs) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint32_t, uint16_t, uint64_t);
+    ((Fn)vt[29])(self, sid, ip, port, gs);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyGameServer(void* self, uint64_t sid, void* ip, void* port, void* sid_out) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*, void*);
+    return ((Fn)vt[30])(self, sid, ip, port, sid_out);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyMemberLimit(void* self, uint64_t sid, int max_members) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[31])(self, sid, max_members);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyMemberLimit(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[32])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyType(void* self, uint64_t sid, int eLobbyType) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[33])(self, sid, eLobbyType);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyJoinable(void* self, uint64_t sid, int joinable) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[34])(self, sid, joinable);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_GetLobbyOwner(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[35])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyOwner(void* self, uint64_t sid, uint64_t new_owner) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[36])(self, sid, new_owner);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLinkedLobby(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[37])(self, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestInternetServerList(void* self, uint32_t app, void* _a1, uint32_t n, void* _a3) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[0])(self, app, _a1, n, _a3);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestLANServerList(void* self, uint32_t app, void* _a1) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[1])(self, app, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestFriendsServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[2])(self, app, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestFavoritesServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[3])(self, app, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestHistoryServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[4])(self, app, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestSpectatorServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[5])(self, app, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_ReleaseRequest(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[6])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_GetServerDetails(void* self, void* _a0, int _a1) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, int);
+    return ((Fn)vt[7])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_CancelQuery(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[8])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_RefreshQuery(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[9])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_IsRefreshing(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[10])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_GetServerCount(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[11])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_RefreshServer(void* self, void* _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, int);
+    ((Fn)vt[12])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_PingServer(void* self, uint32_t _a0, uint16_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, void*);
+    return ((Fn)vt[13])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_PlayerDetails(void* self, uint32_t _a0, uint16_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, void*);
+    return ((Fn)vt[14])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_ServerRules(void* self, uint32_t _a0, uint16_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, void*);
+    return ((Fn)vt[15])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_CancelServerQuery(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[16])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusic_BIsEnabled(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusic_BIsPlaying(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusic_GetPlaybackStatus(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMusic_Play(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[3])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMusic_Pause(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[4])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMusic_PlayPrevious(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[5])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMusic_PlayNext(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[6])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMusic_SetVolume(void* self, float _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, float);
+    ((Fn)vt[7])(self, _a0);
+}
+WN_STEAMAPI_EXPORT float SteamAPI_ISteamMusic_GetVolume(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef float (*Fn)(void*);
+    return ((Fn)vt[8])(self);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_RegisterSteamMusicRemote(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[0])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_DeregisterSteamMusicRemote(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_BIsCurrentMusicRemote(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_BActivationSuccess(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_SetDisplayName(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[4])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_SetPNGIcon_64x64(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[5])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_EnablePlayPrevious(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[6])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_EnablePlayNext(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[7])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_EnableShuffled(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[8])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_EnableLooped(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[9])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_EnableQueue(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[10])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_EnablePlaylists(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[11])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdatePlaybackStatus(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[12])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdateShuffled(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[13])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdateLooped(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[14])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdateVolume(void* self, float _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, float);
+    return ((Fn)vt[15])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_CurrentEntryWillChange(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[16])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_CurrentEntryIsAvailable(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[17])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdateCurrentEntryText(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[18])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdateCurrentEntryElapsedSeconds(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[19])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_UpdateCurrentEntryCoverArt(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[20])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_CurrentEntryDidChange(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[21])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_QueueWillChange(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[22])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_ResetQueueEntries(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[23])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_SetQueueEntry(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[24])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_SetCurrentQueueEntry(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[25])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_QueueDidChange(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[26])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_PlaylistWillChange(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[27])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_ResetPlaylistEntries(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[28])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_SetPlaylistEntry(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[29])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_SetCurrentPlaylistEntry(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[30])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMusicRemote_PlaylistDidChange(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[31])(self);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_SendP2PPacket(void* self, uint64_t sid, void* _a1, uint32_t n, void* _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, uint32_t, void*, void*);
+    return ((Fn)vt[0])(self, sid, _a1, n, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_IsP2PPacketAvailable(void* self, void* pcub, int nChannel) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int);
+    return ((Fn)vt[1])(self, pcub, nChannel);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_ReadP2PPacket(void* self, void* dest, uint32_t cubDest, void* pcub, void* sidOut, int nChannel) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t, void*, void*, int);
+    return ((Fn)vt[2])(self, dest, cubDest, pcub, sidOut, nChannel);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_AcceptP2PSessionWithUser(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[3])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_CloseP2PSessionWithUser(void* self, uint64_t sid) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[4])(self, sid);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_CloseP2PChannelWithUser(void* self, uint64_t sid, int nChannel) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[5])(self, sid, nChannel);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_GetP2PSessionState(void* self, uint64_t sid, void* pState) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[6])(self, sid, pState);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_AllowP2PPacketRelay(void* self, int bAllow) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[7])(self, bAllow);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_CreateListenSocket(void* self, int _a0, uint32_t _a1, uint16_t _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, uint32_t, uint16_t, int);
+    return ((Fn)vt[8])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_CreateP2PConnectionSocket(void* self, uint64_t _a0, int _a1, int _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int, int, int);
+    return ((Fn)vt[9])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_CreateConnectionSocket(void* self, uint32_t _a0, uint16_t _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, int);
+    return ((Fn)vt[10])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_DestroySocket(void* self, int _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int);
+    return ((Fn)vt[11])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_DestroyListenSocket(void* self, int _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int);
+    return ((Fn)vt[12])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_SendDataOnSocket(void* self, int _a0, void* _a1, uint32_t _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, uint32_t, int);
+    return ((Fn)vt[13])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_IsDataAvailableOnSocket(void* self, int _a0, void* pcb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*);
+    return ((Fn)vt[14])(self, _a0, pcb);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_RetrieveDataFromSocket(void* self, int _a0, void* _a1, uint32_t _a2, void* pcb) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, uint32_t, void*);
+    return ((Fn)vt[15])(self, _a0, _a1, _a2, pcb);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_IsDataAvailable(void* self, int _a0, void* pcb, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*);
+    return ((Fn)vt[16])(self, _a0, pcb, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_RetrieveData(void* self, int _a0, void* _a1, uint32_t _a2, void* pcb, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, uint32_t, void*, void*);
+    return ((Fn)vt[17])(self, _a0, _a1, _a2, pcb, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_GetSocketInfo(void* self, int _a0, void* sid, void* status, void* ip, void* port, void* lsock) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*, void*, void*, void*);
+    return ((Fn)vt[18])(self, _a0, sid, status, ip, port, lsock);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_GetListenSocketInfo(void* self, int _a0, void* ip, void* port) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*);
+    return ((Fn)vt[19])(self, _a0, ip, port);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_GetSocketConnectionType(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[20])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworking_GetMaxPacketSize(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[21])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingMessages_SendMessageToUser(void* self, void* _a0, void* _a1, uint32_t _a2, int _a3, int _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t, int, int);
+    return ((Fn)vt[0])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingMessages_ReceiveMessagesOnChannel(void* self, int _a0, void* _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, int);
+    return ((Fn)vt[1])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingMessages_AcceptSessionWithUser(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingMessages_CloseSessionWithUser(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingMessages_CloseChannelWithUser(void* self, void* _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int);
+    return ((Fn)vt[4])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingMessages_GetSessionConnectionInfo(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[5])(self, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP(void* self, void* _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[0])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress(void* self, void* _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[1])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2P(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[2])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_ConnectP2P(void* self, void* _a0, int _a1, int _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, int, int, void*);
+    return ((Fn)vt[3])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_AcceptConnection(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[4])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_CloseConnection(void* self, uint32_t _a0, int _a1, void* _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int, void*, int);
+    return ((Fn)vt[5])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_CloseListenSocket(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[6])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_SetConnectionUserData(void* self, uint32_t _a0, int64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int64_t);
+    return ((Fn)vt[7])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int64_t SteamAPI_ISteamNetworkingSockets_GetConnectionUserData(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[8])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingSockets_SetConnectionName(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, void*);
+    ((Fn)vt[9])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetConnectionName(void* self, uint32_t _a0, void* buf, int cap) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int);
+    return ((Fn)vt[10])(self, _a0, buf, cap);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(void* self, uint32_t _a0, void* _a1, uint32_t _a2, int _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, uint32_t, int, void*);
+    return ((Fn)vt[11])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingSockets_SendMessages(void* self, int _a0, void* _a1, void* _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int, void*, void*);
+    ((Fn)vt[12])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[13])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(void* self, uint32_t _a0, void* _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int);
+    return ((Fn)vt[14])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_CreatePollGroup(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[15])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_DestroyPollGroup(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_SetConnectionPollGroup(void* self, uint32_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint32_t);
+    return ((Fn)vt[17])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnPollGroup(void* self, uint32_t _a0, void* _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int);
+    return ((Fn)vt[18])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetConnectionInfo(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[19])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetConnectionRealTimeStatus(void* self, uint32_t _a0, void* _a1, int _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int, void*);
+    return ((Fn)vt[20])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus(void* self, uint32_t _a0, void* buf, int cap) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, int);
+    return ((Fn)vt[21])(self, _a0, buf, cap);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[22])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_CreateSocketPair(void* self, void* a, void* b, int _a2, void* _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, int, void*, void*);
+    return ((Fn)vt[23])(self, a, b, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_ConfigureConnectionLanes(void* self, uint32_t _a0, int _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int, void*, void*);
+    return ((Fn)vt[24])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetIdentity(void* self, void* pIdentity) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[25])(self, pIdentity);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_InitAuthentication(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[26])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetAuthenticationStatus(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[27])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_ReceivedRelayAuthTicket(void* self, void* _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[28])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_FindRelayAuthTicketForServer(void* self, void* _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[29])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_ConnectToHostedDedicatedServer(void* self, void* _a0, int _a1, int _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, int, int, void*);
+    return ((Fn)vt[30])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint16_t SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerPort(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint16_t (*Fn)(void*);
+    return ((Fn)vt[31])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerPOPID(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[32])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetHostedDedicatedServerAddress(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[33])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_CreateHostedDedicatedServerListenSocket(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[34])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetGameCoordinatorServerLogin(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[35])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_ConnectP2PCustomSignaling(void* self, void* _a0, void* _a1, int _a2, int _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, void*, int, int, void*);
+    return ((Fn)vt[36])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_ReceivedP2PCustomSignal(void* self, void* _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[37])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetCertificateRequest(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[38])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_SetCertificate(void* self, void* _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[39])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingSockets_ResetIdentity(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[40])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingSockets_RunCallbacks(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[41])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_BeginAsyncRequestFakeIP(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[42])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingSockets_GetFakeIP(void* self, int _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int, void*);
+    ((Fn)vt[43])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2PFakeIP(void* self, int _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, int, int, void*);
+    return ((Fn)vt[44])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingSockets_GetRemoteFakeIPForConnection(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[45])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamNetworkingSockets_CreateFakeUDPPort(void* self, int _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int);
+    return ((Fn)vt[46])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamNetworkingUtils_AllocateMessage(void* self, int _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int);
+    return ((Fn)vt[0])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingUtils_InitRelayNetworkAccess(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetRelayNetworkStatus(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT float SteamAPI_ISteamNetworkingUtils_GetLocalPingLocation(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef float (*Fn)(void*, void*);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_EstimatePingTimeBetweenTwoLocations(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[4])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_EstimatePingTimeFromLocalHost(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[5])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingUtils_ConvertPingLocationToString(void* self, void* _a0, void* buf, int cap) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*, int);
+    ((Fn)vt[6])(self, _a0, buf, cap);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_ParsePingLocationString(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[7])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_CheckPingDataUpToDate(void* self, float _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, float);
+    return ((Fn)vt[8])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetPingToDataCenter(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[9])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetDirectPingToPOP(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[10])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetPOPCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[11])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetPOPList(void* self, void* _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int);
+    return ((Fn)vt[12])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int64_t SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int64_t (*Fn)(void*);
+    return ((Fn)vt[13])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction(void* self, int _a0, void* _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int, void*);
+    ((Fn)vt[14])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_IsFakeIPv4(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[15])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetIPv4FakeIPType(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetRealIdentityForFakeIP(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[17])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueInt32(void* self, int _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int);
+    return ((Fn)vt[18])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueFloat(void* self, int _a0, float _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, float);
+    return ((Fn)vt[19])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueString(void* self, int _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*);
+    return ((Fn)vt[20])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValuePtr(void* self, int _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*);
+    return ((Fn)vt[21])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueInt32(void* self, uint32_t _a0, int _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int, int);
+    return ((Fn)vt[22])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueFloat(void* self, uint32_t _a0, int _a1, float _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int, float);
+    return ((Fn)vt[23])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueString(void* self, uint32_t _a0, int _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, int, void*);
+    return ((Fn)vt[24])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetConfigValue(void* self, int _a0, int _a1, uint64_t _a2, int _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int, uint64_t, int, void*);
+    return ((Fn)vt[25])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SetConfigValueStruct(void* self, void* _a0, int _a1, uint64_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, uint64_t);
+    return ((Fn)vt[26])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_GetConfigValue(void* self, int _a0, int _a1, uint64_t _a2, void* _a3, void* _a4, void* _a5) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int, uint64_t, void*, void*, void*);
+    return ((Fn)vt[27])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamNetworkingUtils_GetConfigValueInfo(void* self, int _a0, void* _a1, void* _a2, void* _a3) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, void*, void*, void*);
+    return ((Fn)vt[28])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_IterateGenericEditableConfigValues(void* self, int _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int);
+    return ((Fn)vt[29])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ToString(void* self, void* pAddr, void* buf, uint32_t cap, int with_port) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*, uint32_t, int);
+    ((Fn)vt[30])(self, pAddr, buf, cap, with_port);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ParseString(void* self, void* pAddr, void* s) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[31])(self, pAddr, s);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_GetFakeIPType(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[32])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ToString(void* self, void* pId, void* buf, uint32_t cap) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*, uint32_t);
+    ((Fn)vt[33])(self, pId, buf, cap);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ParseString(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[34])(self, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParentalSettings_BIsParentalLockEnabled(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParentalSettings_BIsParentalLockLocked(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParentalSettings_BIsAppBlocked(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParentalSettings_BIsAppInBlockList(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParentalSettings_BIsFeatureBlocked(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[4])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParentalSettings_BIsFeatureInBlockList(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[5])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamParties_GetNumActiveBeacons(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamParties_GetBeaconByIndex(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[1])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParties_GetBeaconDetails(void* self, uint64_t _a0, void* _a1, void* _a2, void* meta, int mn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*, void*, int);
+    return ((Fn)vt[2])(self, _a0, _a1, _a2, meta, mn);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamParties_JoinParty(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParties_GetNumAvailableBeaconLocations(void* self, void* pNum) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[4])(self, pNum);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParties_GetAvailableBeaconLocations(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[5])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamParties_CreateBeacon(void* self, uint32_t _a0, void* _a1, int _a2, void* _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t, void*, int, void*, void*);
+    return ((Fn)vt[6])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamParties_OnReservationCompleted(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t);
+    ((Fn)vt[7])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamParties_CancelReservation(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint64_t);
+    ((Fn)vt[8])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamParties_ChangeNumOpenSlots(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[9])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParties_DestroyBeacon(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[10])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamParties_GetBeaconLocationData(void* self, void* _a0, int _a1, void* str, int sn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*, int);
+    return ((Fn)vt[11])(self, _a0, _a1, str, sn);
+}
+
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamRemotePlay_GetSessionCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamRemotePlay_GetSessionID(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, int);
+    return ((Fn)vt[1])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemotePlay_GetSessionSteamID(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamRemotePlay_GetSessionClientName(void* self, uint32_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t);
+    return ((Fn)vt[3])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemotePlay_GetSessionClientFormFactor(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[4])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemotePlay_BGetSessionClientResolution(void* self, uint32_t _a0, void* w, void* h) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, void*);
+    return ((Fn)vt[5])(self, _a0, w, h);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemotePlay_BStartRemotePlayTogether(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[6])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemotePlay_BSendRemotePlayTogetherInvite(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[7])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileWrite(void* self, void* pchFile, void* pvData, int cubData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, int);
+    return ((Fn)vt[0])(self, pchFile, pvData, cubData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileRead(void* self, void* pchFile, void* pvData, int cubDataToRead) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, int);
+    return ((Fn)vt[1])(self, pchFile, pvData, cubDataToRead);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_FileWriteAsync(void* self, void* pchFile, void* pvData, uint32_t cubData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*, uint32_t);
+    return ((Fn)vt[2])(self, pchFile, pvData, cubData);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_FileReadAsync(void* self, void* pchFile, uint32_t nOffset, uint32_t cubToRead) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, uint32_t, uint32_t);
+    return ((Fn)vt[3])(self, pchFile, nOffset, cubToRead);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileReadAsyncComplete(void* self, uint64_t hCall, void* pvBuffer, uint32_t cubToRead) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, uint32_t);
+    return ((Fn)vt[4])(self, hCall, pvBuffer, cubToRead);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileForget(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[5])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileDelete(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[6])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_FileShare(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[7])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_SetSyncPlatforms(void* self, void* pchFile, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[8])(self, pchFile, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_FileWriteStreamOpen(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[9])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileWriteStreamWriteChunk(void* self, uint64_t h, void* pvData, int cubData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, int);
+    return ((Fn)vt[10])(self, h, pvData, cubData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileWriteStreamClose(void* self, uint64_t h) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[11])(self, h);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileWriteStreamCancel(void* self, uint64_t h) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[12])(self, h);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FileExists(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[13])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_FilePersisted(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[14])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_GetFileSize(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[15])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int64_t SteamAPI_ISteamRemoteStorage_GetFileTimestamp(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int64_t (*Fn)(void*, void*);
+    return ((Fn)vt[16])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_GetSyncPlatforms(void* self, void* pchFile) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[17])(self, pchFile);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_GetFileCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[18])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamRemoteStorage_GetFileNameAndSize(void* self, int iFile, void* pnFileSizeInBytes) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, int, void*);
+    return ((Fn)vt[19])(self, iFile, pnFileSizeInBytes);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamRemoteStorage_GetQuota(void* self, void* total, void* avail) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*, void*);
+    ((Fn)vt[20])(self, total, avail);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_IsCloudEnabledForAccount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[21])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_IsCloudEnabledForApp(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[22])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamRemoteStorage_SetCloudEnabledForApp(void* self, int enabled) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[23])(self, enabled);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_UGCDownload(void* self, uint64_t hContent, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[24])(self, hContent, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_GetUGCDownloadProgress(void* self, uint64_t _a0, void* d, void* e) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[25])(self, _a0, d, e);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_GetUGCDetails(void* self, void* _a0, void* appID, void* ppchName, void* pcbFile, void* steamIDOwner) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*, void*, void*);
+    return ((Fn)vt[26])(self, _a0, appID, ppchName, pcbFile, steamIDOwner);
+}
+WN_STEAMAPI_EXPORT int32_t SteamAPI_ISteamRemoteStorage_UGCRead(void* self, void* _a0, void* _a1, void* _a2, void* _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int32_t (*Fn)(void*, void*, void*, void*, void*, void*);
+    return ((Fn)vt[27])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int32_t SteamAPI_ISteamRemoteStorage_GetCachedUGCCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int32_t (*Fn)(void*);
+    return ((Fn)vt[28])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_GetCachedUGCHandle(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[29])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_PublishWorkshopFile_DEPRECATED(void* self, void* _a0, void* _a1, uint32_t _a2, void* _a3, void* _a4, int _a5, void* _a6, void* _a7, int _a8) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*, uint32_t, void*, void*, int, void*, void*, int);
+    return ((Fn)vt[30])(self, _a0, _a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_CreatePublishedFileUpdateRequest_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[31])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFileFile_DEPRECATED(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[32])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFilePreviewFile_DEPRECATED(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[33])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFileTitle_DEPRECATED(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[34])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFileDescription_DEPRECATED(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[35])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFileVisibility_DEPRECATED(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[36])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFileTags_DEPRECATED(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[37])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_CommitPublishedFileUpdate_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[38])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_GetPublishedFileDetails_DEPRECATED(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[39])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_DeletePublishedFile_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[40])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_EnumerateUserPublishedFiles_DEPRECATED(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[41])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_SubscribePublishedFile_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[42])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_EnumerateUserSubscribedFiles_DEPRECATED(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[43])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_UnsubscribePublishedFile_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[44])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_UpdatePublishedFileSetChangeDescription_DEPRECATED(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[45])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_GetPublishedItemVoteDetails_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[46])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_UpdateUserPublishedItemVote_DEPRECATED(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[47])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_GetUserPublishedItemVoteDetails_DEPRECATED(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[48])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_EnumerateUserSharedWorkshopFiles_DEPRECATED(void* self, uint64_t _a0, uint32_t _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint32_t, void*, void*);
+    return ((Fn)vt[49])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_PublishVideo_DEPRECATED(void* self, int _a0, void* _a1, uint32_t _a2, void* _a3, void* _a4, uint32_t _a5, void* _a6) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, void*, uint32_t, void*, void*, uint32_t, void*);
+    return ((Fn)vt[50])(self, _a0, _a1, _a2, _a3, _a4, _a5, _a6);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_SetUserPublishedFileAction_DEPRECATED(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[51])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_EnumeratePublishedFilesByUserAction_DEPRECATED(void* self, int _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, uint32_t);
+    return ((Fn)vt[52])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_EnumeratePublishedWorkshopFiles_DEPRECATED(void* self, int _a0, uint32_t _a1, uint32_t _a2, uint32_t _a3, void* _a4, void* _a5) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, uint32_t, uint32_t, uint32_t, void*, void*);
+    return ((Fn)vt[53])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamRemoteStorage_UGCDownloadToLocation(void* self, uint64_t hContent, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[54])(self, hContent, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int32_t SteamAPI_ISteamRemoteStorage_GetLocalFileChangeCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int32_t (*Fn)(void*);
+    return ((Fn)vt[55])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamRemoteStorage_GetLocalFileChange(void* self, void* _a0, void* peChangeType, void* pePathType) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[56])(self, _a0, peChangeType, pePathType);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_BeginFileWriteBatch(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[57])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamRemoteStorage_EndFileWriteBatch(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[58])(self);
+}
+
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamScreenshots_WriteScreenshot(void* self, void* _a0, uint32_t _a1, int _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, uint32_t, int, int);
+    return ((Fn)vt[0])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamScreenshots_AddScreenshotToLibrary(void* self, void* _a0, void* _a1, int _a2, int _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, void*, int, int);
+    return ((Fn)vt[1])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamScreenshots_TriggerScreenshot(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamScreenshots_HookScreenshots(void* self, int hooked) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[3])(self, hooked);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamScreenshots_SetLocation(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[4])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamScreenshots_TagUser(void* self, uint32_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint64_t);
+    return ((Fn)vt[5])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamScreenshots_TagPublishedFile(void* self, uint32_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, uint64_t);
+    return ((Fn)vt[6])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamScreenshots_IsScreenshotsHooked(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[7])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary(void* self, int _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, int, void*, void*);
+    return ((Fn)vt[8])(self, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_CreateQueryUserUGCRequest(void* self, uint32_t _a0, int _a1, int _a2, int _a3, uint32_t _a4, uint32_t _a5, uint32_t _a6) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t, int, int, int, uint32_t, uint32_t, uint32_t);
+    return ((Fn)vt[0])(self, _a0, _a1, _a2, _a3, _a4, _a5, _a6);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequest_Page(void* self, int _a0, int _a1, uint32_t _a2, uint32_t _a3, uint32_t _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, int, uint32_t, uint32_t, uint32_t);
+    return ((Fn)vt[1])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequest_Cursor(void* self, int _a0, int _a1, uint32_t _a2, uint32_t _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, int, int, uint32_t, uint32_t, void*);
+    return ((Fn)vt[2])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_CreateQueryUGCDetailsRequest(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[3])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_SendQueryUGCRequest(void* self, uint64_t handle) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[4])(self, handle);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCResult(void* self, uint64_t _a0, uint32_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*);
+    return ((Fn)vt[5])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetQueryUGCNumTags(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[6])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCTag(void* self, uint64_t _a0, uint32_t _a1, uint32_t _a2, void* v, uint32_t vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, uint32_t, void*, uint32_t);
+    return ((Fn)vt[7])(self, _a0, _a1, _a2, v, vn);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCTagDisplayName(void* self, uint64_t _a0, uint32_t _a1, uint32_t _a2, void* v, uint32_t vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, uint32_t, void*, uint32_t);
+    return ((Fn)vt[8])(self, _a0, _a1, _a2, v, vn);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCPreviewURL(void* self, uint64_t _a0, uint32_t _a1, void* v, uint32_t vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*, uint32_t);
+    return ((Fn)vt[9])(self, _a0, _a1, v, vn);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCMetadata(void* self, uint64_t _a0, uint32_t _a1, void* v, uint32_t vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*, uint32_t);
+    return ((Fn)vt[10])(self, _a0, _a1, v, vn);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCChildren(void* self, uint64_t _a0, uint32_t _a1, void* _a2, uint32_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*, uint32_t);
+    return ((Fn)vt[11])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCStatistic(void* self, uint64_t _a0, uint32_t _a1, int _a2, void* out) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, int, void*);
+    return ((Fn)vt[12])(self, _a0, _a1, _a2, out);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetQueryUGCNumAdditionalPreviews(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[13])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCAdditionalPreview(void* self, uint64_t _a0, uint32_t _a1, uint32_t _a2, void* url, uint32_t uns, void* orig, uint32_t os, void* _a7) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, uint32_t, void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[14])(self, _a0, _a1, _a2, url, uns, orig, os, _a7);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetQueryUGCNumKeyValueTags(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[15])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCKeyValueTagByIndex(void* self, uint64_t _a0, uint32_t _a1, uint32_t _a2, void* k, uint32_t kn, void* v, uint32_t vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, uint32_t, void*, uint32_t, void*, uint32_t);
+    return ((Fn)vt[16])(self, _a0, _a1, _a2, k, kn, v, vn);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetQueryUGCKeyValueTagByName(void* self, uint64_t _a0, uint32_t _a1, void* _a2, void* v, uint32_t vn) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*, void*, uint32_t);
+    return ((Fn)vt[17])(self, _a0, _a1, _a2, v, vn);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetQueryUGCContentDescriptors(void* self, uint64_t _a0, uint32_t _a1, void* _a2, uint32_t _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t, uint32_t, void*, uint32_t);
+    return ((Fn)vt[18])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_ReleaseQueryUGCRequest(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[19])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddRequiredTag(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[20])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddRequiredTagGroup(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[21])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddExcludedTag(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[22])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnOnlyIDs(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[23])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnKeyValueTags(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[24])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnLongDescription(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[25])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnMetadata(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[26])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnChildren(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[27])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnAdditionalPreviews(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[28])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnTotalOnly(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[29])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetReturnPlaytimeStats(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[30])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetLanguage(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[31])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetAllowCachedResponse(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[32])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetCloudFileNameFilter(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[33])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetMatchAnyTag(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[34])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetSearchText(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[35])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetRankedByTrendDays(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[36])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetTimeCreatedDateRange(void* self, uint64_t _a0, uint32_t _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, uint32_t);
+    return ((Fn)vt[37])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetTimeUpdatedDateRange(void* self, uint64_t _a0, uint32_t _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, uint32_t);
+    return ((Fn)vt[38])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddRequiredKeyValueTag(void* self, uint64_t _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[39])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_RequestUGCDetails(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*);
+    return ((Fn)vt[40])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_CreateItem(void* self, uint32_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t, int);
+    return ((Fn)vt[41])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_StartItemUpdate(void* self, uint32_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t, uint64_t);
+    return ((Fn)vt[42])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemTitle(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[43])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemDescription(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[44])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemUpdateLanguage(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[45])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemMetadata(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[46])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemVisibility(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[47])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemTags(void* self, uint64_t _a0, void* _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, int);
+    return ((Fn)vt[48])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemContent(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[49])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetItemPreview(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[50])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_SetAllowLegacyUpload(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[51])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_RemoveAllItemKeyValueTags(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[52])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_RemoveItemKeyValueTags(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[53])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddItemKeyValueTag(void* self, uint64_t _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[54])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddItemPreviewFile(void* self, uint64_t _a0, void* _a1, int _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, int);
+    return ((Fn)vt[55])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddItemPreviewVideo(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[56])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_UpdateItemPreviewFile(void* self, uint64_t _a0, uint32_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*);
+    return ((Fn)vt[57])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_UpdateItemPreviewVideo(void* self, uint64_t _a0, uint32_t _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t, void*);
+    return ((Fn)vt[58])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_RemoveItemPreview(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[59])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_AddContentDescriptor(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[60])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_RemoveContentDescriptor(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[61])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_SubmitItemUpdate(void* self, uint64_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[62])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetItemUpdateProgress(void* self, uint64_t _a0, void* bp, void* bt) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[63])(self, _a0, bp, bt);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_SetUserItemVote(void* self, uint64_t _a0, int _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[64])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_GetUserItemVote(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[65])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_AddItemToFavorites(void* self, uint32_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t, uint64_t);
+    return ((Fn)vt[66])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_RemoveItemFromFavorites(void* self, uint32_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t, uint64_t);
+    return ((Fn)vt[67])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_SubscribeItem(void* self, uint64_t publishedFileId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[68])(self, publishedFileId);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_UnsubscribeItem(void* self, uint64_t publishedFileId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[69])(self, publishedFileId);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetNumSubscribedItems(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[70])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetSubscribedItems(void* self, void* pIds, uint32_t cMax) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[71])(self, pIds, cMax);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetItemState(void* self, uint64_t publishedFileId) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[72])(self, publishedFileId);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetItemInstallInfo(void* self, uint64_t publishedFileId, void* bytes, void* folder, uint32_t fn, void* timestamp) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*, uint32_t, void*);
+    return ((Fn)vt[73])(self, publishedFileId, bytes, folder, fn, timestamp);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_GetItemDownloadInfo(void* self, uint64_t publishedFileId, void* bd, void* bt) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[74])(self, publishedFileId, bd, bt);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_DownloadItem(void* self, uint64_t publishedFileId, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[75])(self, publishedFileId, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_BInitWorkshopForGameServer(void* self, uint32_t _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[76])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUGC_SuspendDownloads(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[77])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_StartPlaytimeTracking(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[78])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_StopPlaytimeTracking(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[79])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[80])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_AddDependency(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[81])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_RemoveDependency(void* self, uint64_t _a0, uint64_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[82])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_AddAppDependency(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[83])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_RemoveAppDependency(void* self, uint64_t _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[84])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_GetAppDependencies(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[85])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_DeleteItem(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[86])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUGC_ShowWorkshopEULA(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[87])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUGC_GetWorkshopEULAStatus(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[88])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUGC_GetUserContentDescriptorPreferences(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[89])(self, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetHSteamUser(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BLoggedOn(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_GetSteamID(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_InitiateGameConnection_DEPRECATED(void* self, void* _a0, int _a1, uint64_t _a2, uint32_t _a3, uint16_t _a4, int _a5) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, uint64_t, uint32_t, uint16_t, int);
+    return ((Fn)vt[3])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_TerminateGameConnection_DEPRECATED(void* self, uint32_t _a0, uint16_t _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint32_t, uint16_t);
+    ((Fn)vt[4])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_TrackAppUsageEvent(void* self, uint64_t _a0, int _a1, void* _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, int, void*);
+    ((Fn)vt[5])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetUserDataFolder(void* self, void* pchBuffer, int cubBuffer) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int);
+    return ((Fn)vt[6])(self, pchBuffer, cubBuffer);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_StartVoiceRecording(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[7])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_StopVoiceRecording(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[8])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetAvailableVoice(void* self, void* _a0, void* _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t);
+    return ((Fn)vt[9])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetVoice(void* self, int _a0, void* _a1, uint32_t _a2, void* _a3, int _a4, void* _a5, uint32_t _a6, void* _a7, uint32_t _a8) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, uint32_t, void*, int, void*, uint32_t, void*, uint32_t);
+    return ((Fn)vt[10])(self, _a0, _a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_DecompressVoice(void* self, void* _a0, uint32_t _a1, void* _a2, uint32_t _a3, void* _a4, uint32_t _a5) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t, void*, uint32_t, void*, uint32_t);
+    return ((Fn)vt[11])(self, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUser_GetVoiceOptimalSampleRate(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[12])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_GetAuthSessionTicket(void* self, void* buf, int maxLen, void* pcbTicket, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, int, void*, void*);
+    return ((Fn)vt[13])(self, buf, maxLen, pcbTicket, _a3);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_GetAuthTicketForWebApi(void* self, void* pchIdentity) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[14])(self, pchIdentity);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BeginAuthSession(void* self, void* _a0, int cbTicket, uint64_t steamID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, uint64_t);
+    return ((Fn)vt[15])(self, _a0, cbTicket, steamID);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_EndAuthSession(void* self, uint64_t _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_CancelAuthTicket(void* self, uint64_t hAuthTicket) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[17])(self, hAuthTicket);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_UserHasLicenseForApp(void* self, uint64_t steamID, uint32_t appID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, uint32_t);
+    return ((Fn)vt[18])(self, steamID, appID);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BIsBehindNAT(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[19])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUser_AdvertiseGame(void* self, uint64_t _a0, uint32_t _a1, uint16_t _a2) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, uint64_t, uint32_t, uint16_t);
+    ((Fn)vt[20])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_RequestEncryptedAppTicket(void* self, void* rgubData, int cbData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, int);
+    return ((Fn)vt[21])(self, rgubData, cbData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetEncryptedAppTicket(void* self, void* buf, int cbMax, void* pcbTicket) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int, void*);
+    return ((Fn)vt[22])(self, buf, cbMax, pcbTicket);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetGameBadgeLevel(void* self, int nSeries, int bFoil) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int);
+    return ((Fn)vt[23])(self, nSeries, bFoil);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_GetPlayerSteamLevel(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[24])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_RequestStoreAuthURL(void* self, void* pchRedirectURL) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[25])(self, pchRedirectURL);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BIsPhoneVerified(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[26])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BIsTwoFactorEnabled(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[27])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BIsPhoneIdentifying(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[28])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BIsPhoneRequiringVerification(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[29])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_GetMarketEligibility(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[30])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUser_GetDurationControl(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[31])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUser_BSetDurationControlOnlineState(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[32])(self, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_RequestCurrentStats(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetStatInt(void* self, void* pchName, void* pData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[1])(self, pchName, pData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetStatFloat(void* self, void* pchName, void* pData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[2])(self, pchName, pData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_SetStatInt(void* self, void* pchName, int32_t nData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, int32_t);
+    return ((Fn)vt[3])(self, pchName, nData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_SetStatFloat(void* self, void* pchName, float fData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, float);
+    return ((Fn)vt[4])(self, pchName, fData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_UpdateAvgRateStat(void* self, void* pchName, float flCountThisSession, double dSessionLength) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, float, double);
+    return ((Fn)vt[5])(self, pchName, flCountThisSession, dSessionLength);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetAchievement(void* self, void* pchName, void* pbAchieved) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[6])(self, pchName, pbAchieved);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_SetAchievement(void* self, void* pchName) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[7])(self, pchName);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_ClearAchievement(void* self, void* pchName) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[8])(self, pchName);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetAchievementAndUnlockTime(void* self, void* pchName, void* pbAchieved, void* punlockTime) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[9])(self, pchName, pbAchieved, punlockTime);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_StoreStats(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[10])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetAchievementIcon(void* self, void* pchName) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[11])(self, pchName);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamUserStats_GetAchievementDisplayAttribute(void* self, void* pchName, void* pchKey) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, void*, void*);
+    return ((Fn)vt[12])(self, pchName, pchKey);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_IndicateAchievementProgress(void* self, void* pchName, uint32_t nCurProgress, uint32_t nMaxProgress) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t, uint32_t);
+    return ((Fn)vt[13])(self, pchName, nCurProgress, nMaxProgress);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUserStats_GetNumAchievements(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[14])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamUserStats_GetAchievementName(void* self, uint32_t idx) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint32_t);
+    return ((Fn)vt[15])(self, idx);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_RequestUserStats(void* self, uint64_t steamID) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[16])(self, steamID);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetUserStatInt(void* self, uint64_t steamID, void* pchName, void* pData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[17])(self, steamID, pchName, pData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetUserStatFloat(void* self, uint64_t steamID, void* pchName, void* pData) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[18])(self, steamID, pchName, pData);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetUserAchievement(void* self, uint64_t steamID, void* pchName, void* pbAchieved) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[19])(self, steamID, pchName, pbAchieved);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetUserAchievementAndUnlockTime(void* self, uint64_t steamID, void* pchName, void* pbAchieved, void* punlockTime) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, void*, void*);
+    return ((Fn)vt[20])(self, steamID, pchName, pbAchieved, punlockTime);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_ResetAllStats(void* self, int bAchievementsToo) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[21])(self, bAchievementsToo);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_FindOrCreateLeaderboard(void* self, void* _a0, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*, void*, void*);
+    return ((Fn)vt[22])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_FindLeaderboard(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[23])(self, _a0);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamUserStats_GetLeaderboardName(void* self, uint64_t _a0) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*, uint64_t);
+    return ((Fn)vt[24])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetLeaderboardEntryCount(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[25])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetLeaderboardSortMethod(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[26])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetLeaderboardDisplayType(void* self, uint64_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[27])(self, _a0);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_DownloadLeaderboardEntries(void* self, uint64_t hLeaderboard, void* _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*, void*, void*);
+    return ((Fn)vt[28])(self, hLeaderboard, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_DownloadLeaderboardEntriesForUsers(void* self, uint64_t hLeaderboard, void* _a1, void* _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[29])(self, hLeaderboard, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetDownloadedLeaderboardEntry(void* self, uint64_t _a0, int _a1, void* _a2, void* _a3, int _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, int, void*, void*, int);
+    return ((Fn)vt[30])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_UploadLeaderboardScore(void* self, uint64_t hLeaderboard, void* _a1, int32_t score, void* _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*, int32_t, void*, void*);
+    return ((Fn)vt[31])(self, hLeaderboard, _a1, score, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_AttachLeaderboardUGC(void* self, uint64_t hLeaderboard, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[32])(self, hLeaderboard, _a1);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_GetNumberOfCurrentPlayers(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[33])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_RequestGlobalAchievementPercentages(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[34])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetMostAchievedAchievementInfo(void* self, void* _a0, uint32_t _a1, void* _a2, void* _a3) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t, void*, void*);
+    return ((Fn)vt[35])(self, _a0, _a1, _a2, _a3);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetNextMostAchievedAchievementInfo(void* self, int _a0, void* _a1, uint32_t _a2, void* _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, uint32_t, void*, void*);
+    return ((Fn)vt[36])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetAchievementAchievedPercent(void* self, void* _a0, void* p) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[37])(self, _a0, p);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUserStats_RequestGlobalStats(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[38])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetGlobalStatInt64(void* self, void* _a0, void* p) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[39])(self, _a0, p);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetGlobalStatDouble(void* self, void* _a0, void* p) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[40])(self, _a0, p);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetGlobalStatHistoryInt64(void* self, void* _a0, void* _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t);
+    return ((Fn)vt[41])(self, _a0, _a1, _a2);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUserStats_GetGlobalStatHistoryDouble(void* self, void* _a0, void* _a1, uint32_t _a2) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, uint32_t);
+    return ((Fn)vt[42])(self, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUtils_GetSecondsSinceAppActive(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[0])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUtils_GetSecondsSinceComputerActive(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[1])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetConnectedUniverse(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[2])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUtils_GetServerRealTime(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[3])(self);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamUtils_GetIPCountry(void* self) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*);
+    return ((Fn)vt[4])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetImageSize(void* self, int iImage, void* pnWidth, void* pnHeight) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, void*);
+    return ((Fn)vt[5])(self, iImage, pnWidth, pnHeight);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetImageRGBA(void* self, int iImage, void* pubDest, int nDestBufferSize) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, void*, int);
+    return ((Fn)vt[6])(self, iImage, pubDest, nDestBufferSize);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetCSERIPPort(void* self, void* _a0, void* _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*);
+    return ((Fn)vt[7])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT uint8_t SteamAPI_ISteamUtils_GetCurrentBatteryPower(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint8_t (*Fn)(void*);
+    return ((Fn)vt[8])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUtils_GetAppID(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[9])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_SetOverlayNotificationPosition(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[10])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsAPICallCompleted(void* self, uint64_t hCall, void* pbFailed) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[11])(self, hCall, pbFailed);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetAPICallFailureReason(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[12])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetAPICallResult(void* self, uint64_t hCall, void* pCallback, int cubCallback, int iCallbackExpected, void* pbFailed) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint64_t, void*, int, int, void*);
+    return ((Fn)vt[13])(self, hCall, pCallback, cubCallback, iCallbackExpected, pbFailed);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_RunFrame(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[14])(self);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUtils_GetIPCCallCount(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[15])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_SetWarningMessageHook(void* self, void* _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[16])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsOverlayEnabled(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[17])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_BOverlayNeedsPresent(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[18])(self);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamUtils_CheckFileSignature(void* self, void* _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, void*);
+    return ((Fn)vt[19])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_ShowGamepadTextInput(void* self, int _a0, int _a1, void* _a2, uint32_t _a3, void* _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int, void*, uint32_t, void*);
+    return ((Fn)vt[20])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT uint32_t SteamAPI_ISteamUtils_GetEnteredGamepadTextLength(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint32_t (*Fn)(void*);
+    return ((Fn)vt[21])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetEnteredGamepadTextInput(void* self, void* _a0, uint32_t _a1) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, uint32_t);
+    return ((Fn)vt[22])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamUtils_GetSteamUILanguage(void* self) {
+    if (self == NULL) return NULL;
+    void** vt = *(void***)self;
+    typedef void* (*Fn)(void*);
+    return ((Fn)vt[23])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsSteamRunningInVR(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[24])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_SetOverlayNotificationInset(void* self, int _a0, int _a1) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int, int);
+    ((Fn)vt[25])(self, _a0, _a1);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsSteamInBigPictureMode(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[26])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_StartVRDashboard(void* self) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*);
+    ((Fn)vt[27])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsVRHeadsetStreamingEnabled(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[28])(self);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_SetVRHeadsetStreamingEnabled(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[29])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsSteamChinaLauncher(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[30])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_InitFilterText(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t);
+    return ((Fn)vt[31])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_FilterText(void* self, void* _a0, void* _a1, void* in, void* out, uint32_t outSize) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*, void*, void*, void*, uint32_t);
+    return ((Fn)vt[32])(self, _a0, _a1, in, out, outSize);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_GetIPv6ConnectivityState(void* self, int _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int);
+    return ((Fn)vt[33])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_IsSteamRunningOnSteamDeck(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[34])(self);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_ShowFloatingGamepadTextInput(void* self, int _a0, int _a1, int _a2, int _a3, int _a4) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, int, int, int, int, int);
+    return ((Fn)vt[35])(self, _a0, _a1, _a2, _a3, _a4);
+}
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamUtils_SetGameLauncherMode(void* self, int _a0) {
+    if (self == NULL) return;
+    void** vt = *(void***)self;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[36])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamUtils_DismissFloatingGamepadTextInput(void* self) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[37])(self);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamVideo_GetVideoURL_DEPRECATED(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[0])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamVideo_IsBroadcasting(void* self, void* pnNumViewers) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[1])(self, pnNumViewers);
+}
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamVideo_GetOPFSettings(void* self, uint32_t _a0) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef uint64_t (*Fn)(void*, uint32_t);
+    return ((Fn)vt[2])(self, _a0);
+}
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamVideo_GetOPFStringForApp(void* self, uint32_t _a0, void* buf, void* pnBufSize) {
+    if (self == NULL) return 0;
+    void** vt = *(void***)self;
+    typedef int (*Fn)(void*, uint32_t, void*, void*);
+    return ((Fn)vt[3])(self, _a0, buf, pnBufSize);
+}
diff --git a/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_lifecycle.c b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_lifecycle.c
new file mode 100644
index 000000000..e5035a1e7
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_lifecycle.c
@@ -0,0 +1,243 @@
+#include <windows.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define WN_STEAMAPI_EXPORT __declspec(dllexport)
+
+static HMODULE g_wine_bridge = NULL;
+static HMODULE g_gbe = NULL;
+static int32_t g_pipe = 0;
+static int32_t g_user = 0;
+static int g_inited = 0;
+static void* g_steam_client = NULL;
+
+typedef void* (*CreateInterface_fn)(const char*, int*);
+static CreateInterface_fn g_CreateInterface = NULL;
+
+static int wnb_logging_enabled(void) {
+    static volatile LONG cached = -1;
+    LONG v = cached;
+    if (v == -1) {
+        const char* e = getenv("WNB_LOG");
+        v = (e && e[0] && e[0] != '0') ? 1 : 0;
+        cached = v;
+    }
+    return (int)v;
+}
+
+static void wnb_log(const char* msg) {
+    if (!wnb_logging_enabled()) return;
+    FILE* f = fopen("C:\\wnb.log", "a");
+    if (f) { fputs(msg, f); fputs("\n", f); fclose(f); }
+}
+
+static CRITICAL_SECTION g_init_cs;
+static volatile LONG g_init_cs_state = 0;
+
+static void init_lock(void) {
+    if (InterlockedCompareExchange(&g_init_cs_state, 1, 0) == 0) {
+        InitializeCriticalSection(&g_init_cs);
+        InterlockedExchange(&g_init_cs_state, 2);
+    }
+    while (g_init_cs_state != 2) Sleep(0);
+    EnterCriticalSection(&g_init_cs);
+}
+
+static void init_unlock(void) {
+    LeaveCriticalSection(&g_init_cs);
+}
+
+static int load_wine_bridge(void) {
+    if (g_wine_bridge != NULL) return g_steam_client != NULL;
+    wnb_log("[lifecycle] load_wine_bridge: LoadLibrary(steamclient64.dll)");
+    g_wine_bridge = LoadLibraryA("steamclient64.dll");
+    if (!g_wine_bridge) {
+        wnb_log("[lifecycle] LoadLibrary(steamclient64.dll) FAILED");
+        return 0;
+    }
+    wnb_log("[lifecycle] load_wine_bridge: GetProcAddress(CreateInterface)");
+    g_CreateInterface = (CreateInterface_fn)GetProcAddress(g_wine_bridge, "CreateInterface");
+    if (!g_CreateInterface) {
+        wnb_log("[lifecycle] steamclient64.dll missing CreateInterface");
+        return 0;
+    }
+    char buf[160];
+    snprintf(buf, sizeof(buf), "[lifecycle] CreateInterface fn=%p — calling SteamClient020",
+             (void*)g_CreateInterface);
+    wnb_log(buf);
+    int code = 0;
+    g_steam_client = g_CreateInterface("SteamClient020", &code);
+    snprintf(buf, sizeof(buf), "[lifecycle] CreateInterface(SteamClient020) -> %p code=%d",
+             g_steam_client, code);
+    wnb_log(buf);
+    if (!g_steam_client) {
+        g_steam_client = g_CreateInterface("SteamClient019", &code);
+        snprintf(buf, sizeof(buf), "[lifecycle] CreateInterface(SteamClient019) -> %p", g_steam_client);
+        wnb_log(buf);
+    }
+    if (!g_steam_client) {
+        g_steam_client = g_CreateInterface("SteamClient017", &code);
+        snprintf(buf, sizeof(buf), "[lifecycle] CreateInterface(SteamClient017) -> %p", g_steam_client);
+        wnb_log(buf);
+    }
+    if (!g_steam_client) {
+        wnb_log("[lifecycle] all CreateInterface attempts NULL");
+        return 0;
+    }
+    snprintf(buf, sizeof(buf),
+             "[lifecycle] wine bridge init OK: client=%p (skipping CreateSteamPipe/ConnectToGlobalUser)",
+             g_steam_client);
+    wnb_log(buf);
+    return 1;
+}
+
+static int gbe_init(void) {
+    if (g_gbe != NULL) return 1;
+    g_gbe = LoadLibraryA("original_steam_api64.dll");
+    if (!g_gbe) {
+        wnb_log("[lifecycle] LoadLibrary(original_steam_api64.dll) FAILED");
+        return 0;
+    }
+    typedef int (*Init_fn)(void);
+    Init_fn p = (Init_fn)GetProcAddress(g_gbe, "SteamAPI_Init");
+    if (p) {
+        int rc = p();
+        char log[80];
+        snprintf(log, sizeof(log), "[lifecycle] gbe SteamAPI_Init -> %d", rc);
+        wnb_log(log);
+        return rc;
+    }
+    return 0;
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_Init(void) {
+    if (g_inited) return 1;
+    init_lock();
+    if (!g_inited) {
+        wnb_log("[lifecycle] SteamAPI_Init called");
+        gbe_init();
+        g_inited = 1;
+    }
+    init_unlock();
+    return 1;
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_InitSafe(void) { return SteamAPI_Init(); }
+
+WN_STEAMAPI_EXPORT int SteamAPI_InitFlat(void* p_outErrMsg) {
+    (void)p_outErrMsg;
+    return SteamAPI_Init() ? 0 : 2;
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_Shutdown(void) {
+    wnb_log("[lifecycle] SteamAPI_Shutdown");
+    if (g_gbe) {
+        typedef void (*Sht_fn)(void);
+        Sht_fn p = (Sht_fn)GetProcAddress(g_gbe, "SteamAPI_Shutdown");
+        if (p) p();
+    }
+    g_inited = 0;
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_IsSteamRunning(void) { return 1; }
+
+WN_STEAMAPI_EXPORT int SteamAPI_GetHSteamPipe(void) {
+    if (!g_inited) SteamAPI_Init();
+    if (g_pipe != 0) return g_pipe;
+    if (g_gbe) {
+        typedef int (*P_fn)(void);
+        P_fn p = (P_fn)GetProcAddress(g_gbe, "SteamAPI_GetHSteamPipe");
+        if (p) return p();
+    }
+    return 0;
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_GetHSteamUser(void) {
+    if (!g_inited) SteamAPI_Init();
+    if (g_user != 0) return g_user;
+    if (g_gbe) {
+        typedef int (*P_fn)(void);
+        P_fn p = (P_fn)GetProcAddress(g_gbe, "SteamAPI_GetHSteamUser");
+        if (p) return p();
+    }
+    return 0;
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_RestartAppIfNecessary(uint32_t unOwnAppID) {
+    (void)unOwnAppID;
+    return 0;
+}
+
+extern void* get_our_matchmaking(void);
+extern void* get_our_matchmaking_servers(void);
+
+static void* WINAPI thunk_GetISteamMatchmaking(
+        void* self, int hSteamUser, int hSteamPipe, const char* pchVersion) {
+    (void)self; (void)hSteamUser; (void)hSteamPipe; (void)pchVersion;
+    static int logged = 0;
+    if (!logged) {
+        wnb_log("[lifecycle] vtable thunk: GetISteamMatchmaking -> Valve client");
+        logged = 1;
+    }
+    return get_our_matchmaking();
+}
+
+static void* WINAPI thunk_GetISteamMatchmakingServers(
+        void* self, int hSteamUser, int hSteamPipe, const char* pchVersion) {
+    (void)self; (void)hSteamUser; (void)hSteamPipe; (void)pchVersion;
+    static int logged = 0;
+    if (!logged) {
+        wnb_log("[lifecycle] vtable thunk: GetISteamMatchmakingServers -> Valve client");
+        logged = 1;
+    }
+    return get_our_matchmaking_servers();
+}
+
+static void hook_gbe_matchmaking_slots(void* gbe_client) {
+    static int hooked = 0;
+    if (hooked || gbe_client == NULL) return;
+
+    void** vt = *(void***)gbe_client;
+    void* orig10 = vt[10];
+    void* orig11 = vt[11];
+
+    DWORD old_prot = 0;
+    if (!VirtualProtect(&vt[10], sizeof(void*) * 2,
+                        PAGE_EXECUTE_READWRITE, &old_prot)) {
+        wnb_log("[lifecycle] hook: VirtualProtect WRITE failed; cannot redirect matchmaking");
+        return;
+    }
+    vt[10] = (void*)thunk_GetISteamMatchmaking;
+    vt[11] = (void*)thunk_GetISteamMatchmakingServers;
+    DWORD restored_prot = 0;
+    VirtualProtect(&vt[10], sizeof(void*) * 2, old_prot, &restored_prot);
+
+    char buf[160];
+    snprintf(buf, sizeof(buf),
+             "[lifecycle] hook: patched gbe ISteamClient vt[10] (was %p -> %p) "
+             "vt[11] (was %p -> %p)",
+             orig10, vt[10], orig11, vt[11]);
+    wnb_log(buf);
+    hooked = 1;
+}
+
+WN_STEAMAPI_EXPORT void* SteamClient(void) {
+    if (!g_inited) SteamAPI_Init();
+
+    if (g_gbe) {
+        typedef void* (*SC_fn)(void);
+        SC_fn p = (SC_fn)GetProcAddress(g_gbe, "SteamClient");
+        if (p) {
+            void* gbe_client = p();
+            hook_gbe_matchmaking_slots(gbe_client);  /* one-shot */
+            static int logged = 0;
+            if (!logged) {
+                wnb_log("[lifecycle] SteamClient() -> gbe (matchmaking slots patched to Valve)");
+                logged = 1;
+            }
+            return gbe_client;
+        }
+    }
+    return NULL;
+}
diff --git a/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_overrides.c b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_overrides.c
new file mode 100644
index 000000000..3bda8e948
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_overrides.c
@@ -0,0 +1,795 @@
+
+#include <windows.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define WN_STEAMAPI_EXPORT __declspec(dllexport)
+
+static int wnb_logging_enabled(void) {
+    static volatile LONG cached = -1;
+    LONG v = cached;
+    if (v == -1) {
+        const char* e = getenv("WNB_LOG");
+        v = (e && e[0] && e[0] != '0') ? 1 : 0;
+        cached = v;
+    }
+    return (int)v;
+}
+
+static CRITICAL_SECTION g_resolver_cs;
+static volatile LONG g_resolver_cs_state = 0;
+
+static void resolver_lock(void) {
+    if (InterlockedCompareExchange(&g_resolver_cs_state, 1, 0) == 0) {
+        InitializeCriticalSection(&g_resolver_cs);
+        InterlockedExchange(&g_resolver_cs_state, 2);
+    }
+    while (g_resolver_cs_state != 2) Sleep(0);
+    EnterCriticalSection(&g_resolver_cs);
+}
+
+static void resolver_unlock(void) {
+    LeaveCriticalSection(&g_resolver_cs);
+}
+
+static void wnb_log_once(const char* name) {
+    if (!wnb_logging_enabled()) return;
+    static const char* once_names[64];
+    static int once_count = 0;
+    for (int i = 0; i < once_count; ++i) {
+        if (once_names[i] == name) return;
+    }
+    if (once_count < 64) {
+        once_names[once_count++] = name;
+    }
+    FILE* f = fopen("C:\\wnb.log", "a");
+    if (f) {
+        fputs(name, f);
+        fputc('\n', f);
+        fclose(f);
+    }
+}
+
+typedef void* (*CreateInterface_fn)(const char* pchVersion, int* pCode);
+static CreateInterface_fn g_create_interface = NULL;
+static void* g_steam_client = NULL;
+static HMODULE g_steamclient_module = NULL;
+
+typedef unsigned char (*Steam_BGetCallback_fn)(int hpipe, void* pmsg);
+typedef void          (*Steam_FreeLastCallback_fn)(int hpipe);
+typedef unsigned char (*Steam_GetAPICallResult_fn)(int hpipe,
+                                          unsigned long long hcall,
+                                          void* pcb, int cb,
+                                          int icb_expected,
+                                          unsigned char* pbfailed);
+static Steam_BGetCallback_fn      g_steam_bgetcallback     = NULL;
+static Steam_FreeLastCallback_fn  g_steam_freelastcallback = NULL;
+static Steam_GetAPICallResult_fn  g_steam_getapicallresult = NULL;
+
+extern void wnb_dispatch_callback(int iCallback, const void* data, size_t data_size);
+extern void wnb_dispatch_call_result(unsigned long long hAPICall, int io_failure,
+                                     const void* data, size_t data_size);
+static int g_steam_pipe = 0;
+static int g_steam_user = 0;
+
+extern void wnb_publish_dispatch_pointers(void);
+
+static void wnb_resolver_log(const char* msg) {
+    if (!wnb_logging_enabled()) return;
+    FILE* f = fopen("C:\\wnb.log", "a");
+    if (f) { fputs(msg, f); fputc('\n', f); fclose(f); }
+}
+
+static void resolve_steam_client_locked(void) {
+    wnb_publish_dispatch_pointers();
+    SetDllDirectoryA("C:\\Program Files (x86)\\Steam");
+    HMODULE sc = LoadLibraryExA(
+            "C:\\Program Files (x86)\\Steam\\steamclient64.dll",
+            NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    if (sc == NULL) {
+        wnb_resolver_log("[wnb] LoadLibraryEx(Valve steamclient64.dll) "
+                         "failed — falling back to bare name (gbe stub)");
+        sc = LoadLibraryA("steamclient64.dll");
+    }
+    if (sc == NULL) {
+        wnb_resolver_log("[wnb] LoadLibrary(steamclient64.dll) failed");
+        return;
+    }
+    g_steamclient_module = sc;
+    if (g_create_interface == NULL) {
+        g_create_interface = (CreateInterface_fn)GetProcAddress(sc, "CreateInterface");
+        if (g_create_interface == NULL) {
+            wnb_resolver_log("[wnb] steamclient64.dll missing CreateInterface");
+            return;
+        }
+    }
+    g_steam_bgetcallback = (Steam_BGetCallback_fn)
+            GetProcAddress(sc, "Steam_BGetCallback");
+    g_steam_freelastcallback = (Steam_FreeLastCallback_fn)
+            GetProcAddress(sc, "Steam_FreeLastCallback");
+    g_steam_getapicallresult = (Steam_GetAPICallResult_fn)
+            GetProcAddress(sc, "Steam_GetAPICallResult");
+    {
+        char buf[160];
+        snprintf(buf, sizeof(buf),
+                 "[wnb] callback-pump exports: BGetCallback=%p "
+                 "FreeLastCallback=%p GetAPICallResult=%p",
+                 (void*)g_steam_bgetcallback,
+                 (void*)g_steam_freelastcallback,
+                 (void*)g_steam_getapicallresult);
+        wnb_resolver_log(buf);
+    }
+    int code = 0;
+    g_steam_client = g_create_interface("SteamClient020", &code);
+    if (g_steam_client == NULL) g_steam_client = g_create_interface("SteamClient019", &code);
+    if (g_steam_client == NULL) g_steam_client = g_create_interface("SteamClient017", &code);
+    if (g_steam_client == NULL) {
+        wnb_resolver_log("[wnb] CreateInterface(SteamClient0XX) returned NULL");
+        return;
+    }
+
+    {
+        void** vt = *(void***)g_steam_client;
+        typedef int (*CreateSteamPipe_fn)(void*);
+        typedef int (*ConnectToGlobalUser_fn)(void*, int);
+        g_steam_pipe = ((CreateSteamPipe_fn)vt[0])(g_steam_client);
+        if (g_steam_pipe != 0) {
+            g_steam_user = ((ConnectToGlobalUser_fn)vt[2])(
+                    g_steam_client, g_steam_pipe);
+        }
+        char buf[128];
+        snprintf(buf, sizeof(buf),
+                 "[wnb] Valve ISteamClient: pipe=%d user=%d",
+                 g_steam_pipe, g_steam_user);
+        wnb_resolver_log(buf);
+        if (g_steam_pipe == 0 || g_steam_user == 0) {
+            wnb_resolver_log("[wnb] WARNING: pipe/user handshake failed; "
+                             "falling back to 1,1 (matchmaking may be empty)");
+            if (g_steam_pipe == 0) g_steam_pipe = 1;
+            if (g_steam_user == 0) g_steam_user = 1;
+        }
+    }
+}
+
+static void* resolve_steam_client(void) {
+    if (g_steam_client != NULL) return g_steam_client;
+    resolver_lock();
+    if (g_steam_client == NULL) resolve_steam_client_locked();
+    resolver_unlock();
+    return g_steam_client;
+}
+
+static void* resolve_interface(int slot, const char* version) {
+    void* client = resolve_steam_client();
+    if (client == NULL) return NULL;
+    void** vt = *(void***)client;
+    typedef void* (*GetIface_fn)(void*, int, int, const char*);
+    void* iface = ((GetIface_fn)vt[slot])(
+            client, g_steam_user, g_steam_pipe, version);
+    char buf[128];
+    snprintf(buf, sizeof(buf),
+             "[wnb] resolve_interface slot=%d ver=%s pipe=%d user=%d -> %p",
+             slot, version, g_steam_pipe, g_steam_user, iface);
+    wnb_resolver_log(buf);
+    return iface;
+}
+
+void wnb_pump_valve_callbacks(void) {
+    if (g_steam_client == NULL) return;          /* resolver not run yet */
+    if (g_steam_bgetcallback == NULL || g_steam_freelastcallback == NULL) return;
+
+    struct CallbackMsg { int hUser; int iCallback; void* pubParam; int cubParam; };
+    struct CallbackMsg msg;
+    int guard = 0;
+    while (guard++ < 512 && g_steam_bgetcallback(g_steam_pipe, &msg)) {
+        if (msg.iCallback == 703 /* SteamAPICallCompleted_t */) {
+            struct ApiCallDone {
+                unsigned long long hAsyncCall;
+                int      iCallback;
+                unsigned cubParam;
+            };
+            if (msg.pubParam != NULL && g_steam_getapicallresult != NULL) {
+                struct ApiCallDone cc = *(struct ApiCallDone*)msg.pubParam;
+                unsigned char payload[2048];
+                int sz = (int)(cc.cubParam < sizeof(payload)
+                               ? cc.cubParam : sizeof(payload));
+                unsigned char failed = 0;
+                if (g_steam_getapicallresult(g_steam_pipe, cc.hAsyncCall,
+                                             payload, sz, cc.iCallback,
+                                             &failed)) {
+                    char b[160];
+                    snprintf(b, sizeof(b),
+                             "[wnb] pump: call-result hCall=%llu cb=%d "
+                             "sz=%d failed=%d -> dispatch",
+                             cc.hAsyncCall, cc.iCallback, sz, failed);
+                    wnb_resolver_log(b);
+                    wnb_dispatch_call_result(cc.hAsyncCall, failed,
+                                             payload, (size_t)sz);
+                }
+            }
+        } else {
+            char b[128];
+            snprintf(b, sizeof(b),
+                     "[wnb] pump: callback id=%d sz=%d -> dispatch",
+                     msg.iCallback, msg.cubParam);
+            wnb_resolver_log(b);
+            wnb_dispatch_callback(msg.iCallback, msg.pubParam,
+                                  (size_t)msg.cubParam);
+        }
+        g_steam_freelastcallback(g_steam_pipe);
+    }
+}
+
+static void* g_our_matchmaking = NULL;
+static void* g_our_matchmaking_servers = NULL;
+
+void* get_our_matchmaking(void) {
+    if (g_our_matchmaking != NULL) return g_our_matchmaking;
+    resolver_lock();
+    if (g_our_matchmaking == NULL)
+        g_our_matchmaking = resolve_interface(10, "SteamMatchMaking009");
+    resolver_unlock();
+    return g_our_matchmaking;
+}
+
+void* get_our_matchmaking_servers(void) {
+    if (g_our_matchmaking_servers != NULL) return g_our_matchmaking_servers;
+    resolver_lock();
+    if (g_our_matchmaking_servers == NULL)
+        g_our_matchmaking_servers = resolve_interface(11, "SteamMatchMakingServers002");
+    resolver_unlock();
+    return g_our_matchmaking_servers;
+}
+
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetFavoriteGameCount(void* self) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetFavoriteGameCount");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*);
+    return ((Fn)vt[0])(mm);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetFavoriteGame(void* self, int _a0, void* _a1, void* _a2, void* _a3, void* _a4, void* _a5, void* _a6) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetFavoriteGame");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, int, void*, void*, void*, void*, void*, void*);
+    return ((Fn)vt[1])(mm, _a0, _a1, _a2, _a3, _a4, _a5, _a6);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_AddFavoriteGame(void* self, uint32_t _a0, uint32_t _a1, uint16_t _a2, uint16_t _a3, uint32_t _a4, uint32_t _a5) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddFavoriteGame");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uint32_t, uint32_t);
+    return ((Fn)vt[2])(mm, _a0, _a1, _a2, _a3, _a4, _a5);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_RemoveFavoriteGame(void* self, uint32_t _a0, uint32_t _a1, uint16_t _a2, uint16_t _a3, uint32_t _a4) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_RemoveFavoriteGame");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uint32_t);
+    return ((Fn)vt[3])(mm, _a0, _a1, _a2, _a3, _a4);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_RequestLobbyList(void* self) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_RequestLobbyList");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef uint64_t (*Fn)(void*);
+    return ((Fn)vt[4])(mm);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListStringFilter(void* self, void* k, void* v, int cmp) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListStringFilter");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*, void*, int);
+    ((Fn)vt[5])(mm, k, v, cmp);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListNumericalFilter(void* self, void* k, int v, int cmp) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListNumericalFilter");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*, int, int);
+    ((Fn)vt[6])(mm, k, v, cmp);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListNearValueFilter(void* self, void* k, int v) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListNearValueFilter");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*, int);
+    ((Fn)vt[7])(mm, k, v);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListFilterSlotsAvailable(void* self, int slots) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListFilterSlotsAvailable");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[8])(mm, slots);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListDistanceFilter(void* self, int eDist) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListDistanceFilter");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[9])(mm, eDist);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListResultCountFilter(void* self, int n) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListResultCountFilter");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[10])(mm, n);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_AddRequestLobbyListCompatibleMembersFilter(void* self, void* _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_AddRequestLobbyListCompatibleMembersFilter");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[11])(mm, _a0);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_GetLobbyByIndex(void* self, int idx) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyByIndex");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef uint64_t (*Fn)(void*, int);
+    return ((Fn)vt[12])(mm, idx);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_CreateLobby(void* self, int eLobbyType, int maxMembers) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_CreateLobby");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef uint64_t (*Fn)(void*, int, int);
+    return ((Fn)vt[13])(mm, eLobbyType, maxMembers);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_JoinLobby(void* self, uint64_t lobbySid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_JoinLobby");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[14])(mm, lobbySid);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_LeaveLobby(void* self, uint64_t sid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_LeaveLobby");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, uint64_t);
+    ((Fn)vt[15])(mm, sid);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_InviteUserToLobby(void* self, uint64_t sid, uint64_t invitee) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_InviteUserToLobby");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[16])(mm, sid, invitee);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetNumLobbyMembers(void* self, uint64_t sid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetNumLobbyMembers");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[17])(mm, sid);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_GetLobbyMemberByIndex(void* self, uint64_t sid, int idx) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyMemberByIndex");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef uint64_t (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[18])(mm, sid, idx);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmaking_GetLobbyData(void* self, uint64_t sid, void* key) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyData");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[19])(mm, sid, key);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyData(void* self, uint64_t sid, void* key, void* val) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyData");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, void*, void*);
+    return ((Fn)vt[20])(mm, sid, key, val);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyDataCount(void* self, uint64_t sid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyDataCount");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[21])(mm, sid);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyDataByIndex(void* self, uint64_t sid, int idx, void* key, int kn, void* val, int vn) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyDataByIndex");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, int, void*, int, void*, int);
+    return ((Fn)vt[22])(mm, sid, idx, key, kn, val, vn);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_DeleteLobbyData(void* self, uint64_t sid, void* key) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_DeleteLobbyData");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, void*);
+    return ((Fn)vt[23])(mm, sid, key);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmaking_GetLobbyMemberData(void* self, uint64_t sid, uint64_t member, void* key) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyMemberData");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint64_t, uint64_t, void*);
+    return ((Fn)vt[24])(mm, sid, member, key);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_SetLobbyMemberData(void* self, uint64_t sid, void* key, void* val) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyMemberData");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, uint64_t, void*, void*);
+    ((Fn)vt[25])(mm, sid, key, val);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SendLobbyChatMsg(void* self, uint64_t sid, void* body, int n) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SendLobbyChatMsg");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, void*, int);
+    return ((Fn)vt[26])(mm, sid, body, n);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyChatEntry(void* self, uint64_t sid, int idx, void* speaker_out, void* body_out, int body_cap, void* chat_type_out) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyChatEntry");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, int, void*, void*, int, void*);
+    return ((Fn)vt[27])(mm, sid, idx, speaker_out, body_out, body_cap, chat_type_out);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_RequestLobbyData(void* self, uint64_t sid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_RequestLobbyData");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[28])(mm, sid);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmaking_SetLobbyGameServer(void* self, uint64_t sid, uint32_t ip, uint16_t port, uint64_t gs) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyGameServer");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, uint64_t, uint32_t, uint16_t, uint64_t);
+    ((Fn)vt[29])(mm, sid, ip, port, gs);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyGameServer(void* self, uint64_t sid, void* ip, void* port, void* sid_out) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyGameServer");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, void*, void*, void*);
+    return ((Fn)vt[30])(mm, sid, ip, port, sid_out);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyMemberLimit(void* self, uint64_t sid, int max_members) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyMemberLimit");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[31])(mm, sid, max_members);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_GetLobbyMemberLimit(void* self, uint64_t sid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyMemberLimit");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t);
+    return ((Fn)vt[32])(mm, sid);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyType(void* self, uint64_t sid, int eLobbyType) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyType");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[33])(mm, sid, eLobbyType);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyJoinable(void* self, uint64_t sid, int joinable) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyJoinable");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, int);
+    return ((Fn)vt[34])(mm, sid, joinable);
+}
+
+WN_STEAMAPI_EXPORT uint64_t SteamAPI_ISteamMatchmaking_GetLobbyOwner(void* self, uint64_t sid) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_GetLobbyOwner");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef uint64_t (*Fn)(void*, uint64_t);
+    return ((Fn)vt[35])(mm, sid);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLobbyOwner(void* self, uint64_t sid, uint64_t new_owner) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLobbyOwner");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[36])(mm, sid, new_owner);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmaking_SetLinkedLobby(void* self, uint64_t _a0, uint64_t _a1) {
+    wnb_log_once("SteamAPI_ISteamMatchmaking_SetLinkedLobby");
+    (void)self;
+    void* mm = get_our_matchmaking();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint64_t, uint64_t);
+    return ((Fn)vt[37])(mm, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestInternetServerList(void* self, uint32_t app, void* _a1, uint32_t n, void* _a3) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RequestInternetServerList");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[0])(mm, app, _a1, n, _a3);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestLANServerList(void* self, uint32_t app, void* _a1) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RequestLANServerList");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint32_t, void*);
+    return ((Fn)vt[1])(mm, app, _a1);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestFriendsServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RequestFriendsServerList");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[2])(mm, app, _a1, _a2, _a3);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestFavoritesServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RequestFavoritesServerList");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[3])(mm, app, _a1, _a2, _a3);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestHistoryServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RequestHistoryServerList");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[4])(mm, app, _a1, _a2, _a3);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_RequestSpectatorServerList(void* self, uint32_t app, void* _a1, uint32_t _a2, void* _a3) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RequestSpectatorServerList");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, uint32_t, void*, uint32_t, void*);
+    return ((Fn)vt[5])(mm, app, _a1, _a2, _a3);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_ReleaseRequest(void* self, void* _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_ReleaseRequest");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[6])(mm, _a0);
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamMatchmakingServers_GetServerDetails(void* self, void* _a0, int _a1) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_GetServerDetails");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return NULL;
+    void** vt = *(void***)mm;
+    typedef void* (*Fn)(void*, void*, int);
+    return ((Fn)vt[7])(mm, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_CancelQuery(void* self, void* _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_CancelQuery");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[8])(mm, _a0);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_RefreshQuery(void* self, void* _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RefreshQuery");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*);
+    ((Fn)vt[9])(mm, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_IsRefreshing(void* self, void* _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_IsRefreshing");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[10])(mm, _a0);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_GetServerCount(void* self, void* _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_GetServerCount");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, void*);
+    return ((Fn)vt[11])(mm, _a0);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_RefreshServer(void* self, void* _a0, int _a1) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_RefreshServer");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, void*, int);
+    ((Fn)vt[12])(mm, _a0, _a1);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_PingServer(void* self, uint32_t _a0, uint16_t _a1, void* _a2) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_PingServer");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, void*);
+    return ((Fn)vt[13])(mm, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_PlayerDetails(void* self, uint32_t _a0, uint16_t _a1, void* _a2) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_PlayerDetails");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, void*);
+    return ((Fn)vt[14])(mm, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT int SteamAPI_ISteamMatchmakingServers_ServerRules(void* self, uint32_t _a0, uint16_t _a1, void* _a2) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_ServerRules");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return 0;
+    void** vt = *(void***)mm;
+    typedef int (*Fn)(void*, uint32_t, uint16_t, void*);
+    return ((Fn)vt[15])(mm, _a0, _a1, _a2);
+}
+
+WN_STEAMAPI_EXPORT void SteamAPI_ISteamMatchmakingServers_CancelServerQuery(void* self, int _a0) {
+    wnb_log_once("SteamAPI_ISteamMatchmakingServers_CancelServerQuery");
+    (void)self;
+    void* mm = get_our_matchmaking_servers();
+    if (mm == NULL) return;
+    void** vt = *(void***)mm;
+    typedef void (*Fn)(void*, int);
+    ((Fn)vt[16])(mm, _a0);
+}
diff --git a/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_steamclient.c b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_steamclient.c
new file mode 100644
index 000000000..3b5c72675
--- /dev/null
+++ b/app/src/main/cpp/wn-steamapi-bridge/steam_api_bridge_steamclient.c
@@ -0,0 +1,69 @@
+
+#include <windows.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#define WN_STEAMAPI_EXPORT __declspec(dllexport)
+
+extern void* get_our_matchmaking(void);
+extern void* get_our_matchmaking_servers(void);
+
+static int g_logged_matchmaking = 0;
+static int g_logged_matchmaking_servers = 0;
+static void wnb_marker(const char* msg) {
+    FILE* f = fopen("C:\\wnb.log", "a");
+    if (f) { fputs(msg, f); fputs("\n", f); fclose(f); }
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamMatchmaking(
+        void* instancePtr,
+        int hSteamUser,
+        int hSteamPipe,
+        const char* pchVersion) {
+    (void)instancePtr; (void)hSteamUser; (void)hSteamPipe; (void)pchVersion;
+    if (!g_logged_matchmaking) {
+        wnb_marker("SteamAPI_ISteamClient_GetISteamMatchmaking: flat-C hook -> libsteamclient.so");
+        g_logged_matchmaking = 1;
+    }
+    return get_our_matchmaking();
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_ISteamClient_GetISteamMatchmakingServers(
+        void* instancePtr,
+        int hSteamUser,
+        int hSteamPipe,
+        const char* pchVersion) {
+    (void)instancePtr; (void)hSteamUser; (void)hSteamPipe; (void)pchVersion;
+    if (!g_logged_matchmaking_servers) {
+        wnb_marker("SteamAPI_ISteamClient_GetISteamMatchmakingServers: flat-C hook -> libsteamclient.so");
+        g_logged_matchmaking_servers = 1;
+    }
+    return get_our_matchmaking_servers();
+}
+
+WN_STEAMAPI_EXPORT void* SteamMatchmaking(void) {
+    static int logged = 0;
+    if (!logged) {
+        wnb_marker("SteamMatchmaking(): bare global -> Steam Launcher Valve client");
+        logged = 1;
+    }
+    return get_our_matchmaking();
+}
+
+WN_STEAMAPI_EXPORT void* SteamMatchmakingServers(void) {
+    static int logged = 0;
+    if (!logged) {
+        wnb_marker("SteamMatchmakingServers(): bare global -> Steam Launcher Valve client");
+        logged = 1;
+    }
+    return get_our_matchmaking_servers();
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_SteamMatchmaking_v009(void) {
+    return get_our_matchmaking();
+}
+
+WN_STEAMAPI_EXPORT void* SteamAPI_SteamMatchmakingServers_v002(void) {
+    return get_our_matchmaking_servers();
+}
diff --git a/app/src/main/cpp/xvfb-setxid-shim/build.sh b/app/src/main/cpp/xvfb-setxid-shim/build.sh
new file mode 100644
index 000000000..329d9ad42
--- /dev/null
+++ b/app/src/main/cpp/xvfb-setxid-shim/build.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd "$(dirname "$0")/../../rust/wn-steam-tools"
+exec ./build-linux-glibc.sh
diff --git a/app/src/main/cpp/xz/native_xz_stream.c b/app/src/main/cpp/xz/native_xz_stream.c
deleted file mode 100644
index 18ae7b29e..000000000
--- a/app/src/main/cpp/xz/native_xz_stream.c
+++ /dev/null
@@ -1,230 +0,0 @@
-#include <errno.h>
-#include <jni.h>
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "xz.h"
-
-#define XZ_INPUT_BUFFER_SIZE (64 * 1024)
-#define XZ_DICT_SIZE_MAX (128U << 20)
-
-typedef struct native_xz_stream {
-  FILE *file;
-  struct xz_dec *decoder;
-  struct xz_buf buffer;
-  uint8_t input_buffer[XZ_INPUT_BUFFER_SIZE];
-  bool input_finished;
-  bool stream_finished;
-} native_xz_stream_t;
-
-static pthread_once_t xz_crc_once = PTHREAD_ONCE_INIT;
-
-static void native_xz_init_crc(void) {
-  xz_crc32_init();
-  xz_crc64_init();
-}
-
-static void throw_io_exception(JNIEnv *env, const char *message) {
-  jclass io_exception_class = (*env)->FindClass(env, "java/io/IOException");
-  if (io_exception_class != NULL) {
-    (*env)->ThrowNew(env, io_exception_class, message);
-  }
-}
-
-static const char *to_xz_error(enum xz_ret ret) {
-  switch (ret) {
-  case XZ_STREAM_END:
-    return "Unexpected XZ end-of-stream state";
-  case XZ_MEM_ERROR:
-    return "Native XZ decoder ran out of memory";
-  case XZ_MEMLIMIT_ERROR:
-    return "XZ dictionary exceeds native decoder limit";
-  case XZ_FORMAT_ERROR:
-    return "Not an XZ stream";
-  case XZ_OPTIONS_ERROR:
-    return "Unsupported XZ options";
-  case XZ_DATA_ERROR:
-    return "Corrupt XZ stream";
-  case XZ_BUF_ERROR:
-    return "Truncated or stalled XZ stream";
-  case XZ_UNSUPPORTED_CHECK:
-    return "Unsupported XZ integrity check";
-  case XZ_OK:
-  default:
-    return "Unknown native XZ error";
-  }
-}
-
-static void close_native_xz_stream(native_xz_stream_t *stream) {
-  if (stream == NULL)
-    return;
-
-  if (stream->decoder != NULL) {
-    xz_dec_end(stream->decoder);
-    stream->decoder = NULL;
-  }
-
-  if (stream->file != NULL) {
-    fclose(stream->file);
-    stream->file = NULL;
-  }
-
-  free(stream);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_winlator_cmod_shared_io_NativeXzInputStream_nativeOpen(JNIEnv *env,
-                                                                jclass clazz,
-                                                                jstring path) {
-  (void)clazz;
-
-  if (path == NULL) {
-    throw_io_exception(env, "Missing XZ source path");
-    return 0;
-  }
-
-  if (pthread_once(&xz_crc_once, native_xz_init_crc) != 0) {
-    throw_io_exception(env, "Failed to initialize native XZ CRC tables");
-    return 0;
-  }
-
-  const char *path_chars = (*env)->GetStringUTFChars(env, path, NULL);
-  if (path_chars == NULL) {
-    return 0;
-  }
-
-  native_xz_stream_t *stream = calloc(1, sizeof(native_xz_stream_t));
-  if (stream == NULL) {
-    (*env)->ReleaseStringUTFChars(env, path, path_chars);
-    throw_io_exception(env, "Failed to allocate native XZ stream");
-    return 0;
-  }
-
-  stream->file = fopen(path_chars, "rb");
-  (*env)->ReleaseStringUTFChars(env, path, path_chars);
-  if (stream->file == NULL) {
-    char error_message[160];
-    snprintf(error_message, sizeof(error_message),
-             "Failed to open XZ source: %s", strerror(errno));
-    close_native_xz_stream(stream);
-    throw_io_exception(env, error_message);
-    return 0;
-  }
-
-  stream->decoder = xz_dec_init(XZ_DYNALLOC, XZ_DICT_SIZE_MAX);
-  if (stream->decoder == NULL) {
-    close_native_xz_stream(stream);
-    throw_io_exception(env, "Failed to initialize native XZ decoder");
-    return 0;
-  }
-
-  stream->buffer.in = stream->input_buffer;
-  stream->buffer.in_pos = 0;
-  stream->buffer.in_size = 0;
-  stream->buffer.out = NULL;
-  stream->buffer.out_pos = 0;
-  stream->buffer.out_size = 0;
-  return (jlong)(intptr_t)stream;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_winlator_cmod_shared_io_NativeXzInputStream_nativeRead(
-    JNIEnv *env, jclass clazz, jlong handle, jbyteArray output, jint offset,
-    jint length) {
-  (void)clazz;
-
-  if (length == 0) {
-    return 0;
-  }
-
-  native_xz_stream_t *stream = (native_xz_stream_t *)(intptr_t)handle;
-  if (stream == NULL || stream->decoder == NULL) {
-    throw_io_exception(env, "Native XZ stream is closed");
-    return -1;
-  }
-
-  jbyte *output_bytes = (*env)->GetPrimitiveArrayCritical(env, output, NULL);
-  if (output_bytes == NULL) {
-    return -1;
-  }
-
-  stream->buffer.out = (uint8_t *)(output_bytes + offset);
-  stream->buffer.out_pos = 0;
-  stream->buffer.out_size = (size_t)length;
-
-  const char *error_msg = NULL;
-
-  while (stream->buffer.out_pos < stream->buffer.out_size) {
-    if (stream->stream_finished) {
-      break;
-    }
-
-    if (stream->buffer.in_pos == stream->buffer.in_size &&
-        !stream->input_finished) {
-      size_t amount_read = fread(stream->input_buffer, 1,
-                                 sizeof(stream->input_buffer), stream->file);
-      if (amount_read == 0) {
-        if (ferror(stream->file)) {
-          error_msg = "Failed reading XZ source";
-          break;
-        }
-        stream->input_finished = true;
-      }
-
-      stream->buffer.in = stream->input_buffer;
-      stream->buffer.in_pos = 0;
-      stream->buffer.in_size = amount_read;
-    }
-
-    size_t input_before = stream->buffer.in_pos;
-    size_t output_before = stream->buffer.out_pos;
-    enum xz_ret ret = xz_dec_catrun(stream->decoder, &stream->buffer,
-                                    stream->input_finished ? 1 : 0);
-
-    if (ret == XZ_OK) {
-      if (stream->buffer.out_pos == stream->buffer.out_size) {
-        break;
-      }
-
-      if (stream->buffer.in_pos == input_before &&
-          stream->buffer.out_pos == output_before) {
-        error_msg = "Native XZ decoder stalled";
-        break;
-      }
-      continue;
-    }
-
-    if (ret == XZ_STREAM_END) {
-      stream->stream_finished = true;
-      break;
-    }
-
-    error_msg = to_xz_error(ret);
-    break;
-  }
-
-  int amount_decoded = (int)stream->buffer.out_pos;
-  (*env)->ReleasePrimitiveArrayCritical(env, output, output_bytes, 0);
-
-  if (error_msg != NULL) {
-    throw_io_exception(env, error_msg);
-    return -1;
-  }
-  if (amount_decoded == 0 && stream->stream_finished) {
-    return -1;
-  }
-  return amount_decoded;
-}
-
-JNIEXPORT void JNICALL
-Java_com_winlator_cmod_shared_io_NativeXzInputStream_nativeClose(JNIEnv *env,
-                                                                 jclass clazz,
-                                                                 jlong handle) {
-  (void)env;
-  (void)clazz;
-  close_native_xz_stream((native_xz_stream_t *)(intptr_t)handle);
-}
diff --git a/app/src/main/cpp/xz/xz_embedded/COPYING b/app/src/main/cpp/xz/xz_embedded/COPYING
deleted file mode 100644
index f0c316128..000000000
--- a/app/src/main/cpp/xz/xz_embedded/COPYING
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) The XZ Embedded authors and contributors
-
-Permission to use, copy, modify, and/or distribute this
-software for any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/app/src/main/cpp/xz/xz_embedded/xz.h b/app/src/main/cpp/xz/xz_embedded/xz.h
deleted file mode 100644
index 6a63172cb..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* SPDX-License-Identifier: 0BSD */
-
-/*
- * XZ decompressor
- *
- * Authors: Lasse Collin <lasse.collin@tukaani.org>
- *          Igor Pavlov <https://7-zip.org/>
- */
-
-#ifndef XZ_H
-#define XZ_H
-
-#ifdef __KERNEL__
-#include <linux/stddef.h>
-#include <linux/types.h>
-#else
-#include <stddef.h>
-#include <stdint.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* "#define XZ_EXTERN static" can be used to make extern functions static. */
-#ifndef XZ_EXTERN
-#define XZ_EXTERN extern
-#endif
-
-/**
- * enum xz_mode - Operation mode
- *
- * @XZ_SINGLE:              Single-call mode. This uses less RAM than
- *                          multi-call modes, because the LZMA2
- *                          dictionary doesn't need to be allocated as
- *                          part of the decoder state. All required data
- *                          structures are allocated at initialization,
- *                          so xz_dec_run() cannot return XZ_MEM_ERROR.
- * @XZ_PREALLOC:            Multi-call mode with preallocated LZMA2
- *                          dictionary buffer. All data structures are
- *                          allocated at initialization, so xz_dec_run()
- *                          cannot return XZ_MEM_ERROR.
- * @XZ_DYNALLOC:            Multi-call mode. The LZMA2 dictionary is
- *                          allocated once the required size has been
- *                          parsed from the stream headers. If the
- *                          allocation fails, xz_dec_run() will return
- *                          XZ_MEM_ERROR.
- *
- * It is possible to enable support only for a subset of the above
- * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,
- * or XZ_DEC_DYNALLOC. The xz_dec kernel module is always compiled
- * with support for all operation modes, but the preboot code may
- * be built with fewer features to minimize code size.
- */
-enum xz_mode { XZ_SINGLE, XZ_PREALLOC, XZ_DYNALLOC };
-
-/**
- * enum xz_ret - Return codes
- * @XZ_OK:                  Everything is OK so far. More input or more
- *                          output space is required to continue. This
- *                          return code is possible only in multi-call mode
- *                          (XZ_PREALLOC or XZ_DYNALLOC).
- * @XZ_STREAM_END:          Operation finished successfully.
- * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
- *                          is still possible in multi-call mode by simply
- *                          calling xz_dec_run() again.
- *                          Note that this return value is used only if
- *                          XZ_DEC_ANY_CHECK was defined at build time,
- *                          which is not used in the kernel. Unsupported
- *                          check types return XZ_OPTIONS_ERROR if
- *                          XZ_DEC_ANY_CHECK was not defined at build time.
- * @XZ_MEM_ERROR:           Allocating memory failed. This return code is
- *                          possible only if the decoder was initialized
- *                          with XZ_DYNALLOC. The amount of memory that was
- *                          tried to be allocated was no more than the
- *                          dict_max argument given to xz_dec_init().
- * @XZ_MEMLIMIT_ERROR:      A bigger LZMA2 dictionary would be needed than
- *                          allowed by the dict_max argument given to
- *                          xz_dec_init(). This return value is possible
- *                          only in multi-call mode (XZ_PREALLOC or
- *                          XZ_DYNALLOC); the single-call mode (XZ_SINGLE)
- *                          ignores the dict_max argument.
- * @XZ_FORMAT_ERROR:        File format was not recognized (wrong magic
- *                          bytes).
- * @XZ_OPTIONS_ERROR:       This implementation doesn't support the requested
- *                          compression options. In the decoder this means
- *                          that the header CRC32 matches, but the header
- *                          itself specifies something that we don't support.
- * @XZ_DATA_ERROR:          Compressed data is corrupt.
- * @XZ_BUF_ERROR:           Cannot make any progress. Details are slightly
- *                          different between multi-call and single-call
- *                          mode; more information below.
- *
- * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
- * to XZ code cannot consume any input and cannot produce any new output.
- * This happens when there is no new input available, or the output buffer
- * is full while at least one output byte is still pending. Assuming your
- * code is not buggy, you can get this error only when decoding a compressed
- * stream that is truncated or otherwise corrupt.
- *
- * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
- * is too small or the compressed input is corrupt in a way that makes the
- * decoder produce more output than the caller expected. When it is
- * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
- * is used instead of XZ_BUF_ERROR.
- */
-enum xz_ret {
-  XZ_OK,
-  XZ_STREAM_END,
-  XZ_UNSUPPORTED_CHECK,
-  XZ_MEM_ERROR,
-  XZ_MEMLIMIT_ERROR,
-  XZ_FORMAT_ERROR,
-  XZ_OPTIONS_ERROR,
-  XZ_DATA_ERROR,
-  XZ_BUF_ERROR
-};
-
-/**
- * struct xz_buf - Passing input and output buffers to XZ code
- * @in:         Beginning of the input buffer. This may be NULL if and only
- *              if in_pos is equal to in_size.
- * @in_pos:     Current position in the input buffer. This must not exceed
- *              in_size.
- * @in_size:    Size of the input buffer
- * @out:        Beginning of the output buffer. This may be NULL if and only
- *              if out_pos is equal to out_size.
- * @out_pos:    Current position in the output buffer. This must not exceed
- *              out_size.
- * @out_size:   Size of the output buffer
- *
- * Only the contents of the output buffer from out[out_pos] onward, and
- * the variables in_pos and out_pos are modified by the XZ code.
- */
-struct xz_buf {
-  const uint8_t *in;
-  size_t in_pos;
-  size_t in_size;
-
-  uint8_t *out;
-  size_t out_pos;
-  size_t out_size;
-};
-
-/*
- * struct xz_dec - Opaque type to hold the XZ decoder state
- */
-struct xz_dec;
-
-/**
- * xz_dec_init() - Allocate and initialize a XZ decoder state
- * @mode:       Operation mode
- * @dict_max:   Maximum size of the LZMA2 dictionary (history buffer) for
- *              multi-call decoding. This is ignored in single-call mode
- *              (mode == XZ_SINGLE). LZMA2 dictionary is always 2^n bytes
- *              or 2^n + 2^(n-1) bytes (the latter sizes are less common
- *              in practice), so other values for dict_max don't make sense.
- *              In the kernel, dictionary sizes of 64 KiB, 128 KiB, 256 KiB,
- *              512 KiB, and 1 MiB are probably the only reasonable values,
- *              except for kernel and initramfs images where a bigger
- *              dictionary can be fine and useful.
- *
- * Single-call mode (XZ_SINGLE): xz_dec_run() decodes the whole stream at
- * once. The caller must provide enough output space or the decoding will
- * fail. The output space is used as the dictionary buffer, which is why
- * there is no need to allocate the dictionary as part of the decoder's
- * internal state.
- *
- * Because the output buffer is used as the workspace, streams encoded using
- * a big dictionary are not a problem in single-call mode. It is enough that
- * the output buffer is big enough to hold the actual uncompressed data; it
- * can be smaller than the dictionary size stored in the stream headers.
- *
- * Multi-call mode with preallocated dictionary (XZ_PREALLOC): dict_max bytes
- * of memory is preallocated for the LZMA2 dictionary. This way there is no
- * risk that xz_dec_run() could run out of memory, since xz_dec_run() will
- * never allocate any memory. Instead, if the preallocated dictionary is too
- * small for decoding the given input stream, xz_dec_run() will return
- * XZ_MEMLIMIT_ERROR. Thus, it is important to know what kind of data will be
- * decoded to avoid allocating excessive amount of memory for the dictionary.
- *
- * Multi-call mode with dynamically allocated dictionary (XZ_DYNALLOC):
- * dict_max specifies the maximum allowed dictionary size that xz_dec_run()
- * may allocate once it has parsed the dictionary size from the stream
- * headers. This way excessive allocations can be avoided while still
- * limiting the maximum memory usage to a sane value to prevent running the
- * system out of memory when decompressing streams from untrusted sources.
- *
- * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
- * ready to be used with xz_dec_run(). If memory allocation fails,
- * xz_dec_init() returns NULL.
- */
-XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max);
-
-/**
- * xz_dec_run() - Run the XZ decoder for a single XZ stream
- * @s:          Decoder state allocated using xz_dec_init()
- * @b:          Input and output buffers
- *
- * The possible return values depend on build options and operation mode.
- * See enum xz_ret for details.
- *
- * Note that if an error occurs in single-call mode (return value is not
- * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
- * contents of the output buffer from b->out[b->out_pos] onward are
- * undefined. This is true even after XZ_BUF_ERROR, because with some filter
- * chains, there may be a second pass over the output buffer, and this pass
- * cannot be properly done if the output buffer is truncated. Thus, you
- * cannot give the single-call decoder a too small buffer and then expect to
- * get that amount valid data from the beginning of the stream. You must use
- * the multi-call decoder if you don't want to uncompress the whole stream.
- *
- * Use xz_dec_run() when XZ data is stored inside some other file format.
- * The decoding will stop after one XZ stream has been decompressed. To
- * decompress regular .xz files which might have multiple concatenated
- * streams, use xz_dec_catrun() instead.
- */
-XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b);
-
-/**
- * xz_dec_catrun() - Run the XZ decoder with support for concatenated streams
- * @s:          Decoder state allocated using xz_dec_init()
- * @b:          Input and output buffers
- * @finish:     This is an int instead of bool to avoid requiring stdbool.h.
- *              As long as more input might be coming, finish must be false.
- *              When the caller knows that it has provided all the input to
- *              the decoder (some possibly still in b->in), it must set finish
- *              to true. Only when finish is true can this function return
- *              XZ_STREAM_END to indicate successful decompression of the
- *              file. In single-call mode (XZ_SINGLE) finish is assumed to
- *              always be true; the caller-provided value is ignored.
- *
- * This is like xz_dec_run() except that this makes it easy to decode .xz
- * files with multiple streams (multiple .xz files concatenated as is).
- * The rarely-used Stream Padding feature is supported too, that is, there
- * can be null bytes after or between the streams. The number of null bytes
- * must be a multiple of four.
- *
- * When finish is false and b->in_pos == b->in_size, it is possible that
- * XZ_BUF_ERROR isn't returned even when no progress is possible (XZ_OK is
- * returned instead). This shouldn't matter because in this situation a
- * reasonable caller will attempt to provide more input or set finish to
- * true for the next xz_dec_catrun() call anyway.
- *
- * For any struct xz_dec that has been initialized for multi-call mode:
- * Once decoding has been started with xz_dec_run() or xz_dec_catrun(),
- * the same function must be used until xz_dec_reset() or xz_dec_end().
- * Switching between the two decoding functions without resetting results
- * in undefined behavior.
- *
- * xz_dec_catrun() is only available if XZ_DEC_CONCATENATED was defined
- * at compile time.
- */
-XZ_EXTERN enum xz_ret xz_dec_catrun(struct xz_dec *s, struct xz_buf *b,
-                                    int finish);
-
-/**
- * xz_dec_reset() - Reset an already allocated decoder state
- * @s:          Decoder state allocated using xz_dec_init()
- *
- * This function can be used to reset the multi-call decoder state without
- * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
- *
- * In single-call mode, xz_dec_reset() is always called in the beginning of
- * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
- * multi-call mode.
- */
-XZ_EXTERN void xz_dec_reset(struct xz_dec *s);
-
-/**
- * xz_dec_end() - Free the memory allocated for the decoder state
- * @s:          Decoder state allocated using xz_dec_init(). If s is NULL,
- *              this function does nothing.
- */
-XZ_EXTERN void xz_dec_end(struct xz_dec *s);
-
-/**
- * DOC: MicroLZMA decompressor
- *
- * This MicroLZMA header format was created for use in EROFS but may be used
- * by others too. **In most cases one needs the XZ APIs above instead.**
- *
- * The compressed format supported by this decoder is a raw LZMA stream
- * whose first byte (always 0x00) has been replaced with bitwise-negation
- * of the LZMA properties (lc/lp/pb) byte. For example, if lc/lp/pb is
- * 3/0/2, the first byte is 0xA2. This way the first byte can never be 0x00.
- * Just like with LZMA2, lc + lp <= 4 must be true. The LZMA end-of-stream
- * marker must not be used. The unused values are reserved for future use.
- */
-
-/*
- * struct xz_dec_microlzma - Opaque type to hold the MicroLZMA decoder state
- */
-struct xz_dec_microlzma;
-
-/**
- * xz_dec_microlzma_alloc() - Allocate memory for the MicroLZMA decoder
- * @mode:       XZ_SINGLE or XZ_PREALLOC
- * @dict_size:  LZMA dictionary size. This must be at least 4 KiB and
- *              at most 3 GiB.
- *
- * In contrast to xz_dec_init(), this function only allocates the memory
- * and remembers the dictionary size. xz_dec_microlzma_reset() must be used
- * before calling xz_dec_microlzma_run().
- *
- * The amount of allocated memory is a little less than 30 KiB with XZ_SINGLE.
- * With XZ_PREALLOC also a dictionary buffer of dict_size bytes is allocated.
- *
- * On success, xz_dec_microlzma_alloc() returns a pointer to
- * struct xz_dec_microlzma. If memory allocation fails or
- * dict_size is invalid, NULL is returned.
- */
-XZ_EXTERN struct xz_dec_microlzma *xz_dec_microlzma_alloc(enum xz_mode mode,
-                                                          uint32_t dict_size);
-
-/**
- * xz_dec_microlzma_reset() - Reset the MicroLZMA decoder state
- * @s:          Decoder state allocated using xz_dec_microlzma_alloc()
- * @comp_size:  Compressed size of the input stream
- * @uncomp_size:  Uncompressed size of the input stream. A value smaller
- *              than the real uncompressed size of the input stream can
- *              be specified if uncomp_size_is_exact is set to false.
- *              uncomp_size can never be set to a value larger than the
- *              expected real uncompressed size because it would eventually
- *              result in XZ_DATA_ERROR.
- * @uncomp_size_is_exact:  This is an int instead of bool to avoid
- *              requiring stdbool.h. This should normally be set to true.
- *              When this is set to false, error detection is weaker.
- */
-XZ_EXTERN void xz_dec_microlzma_reset(struct xz_dec_microlzma *s,
-                                      uint32_t comp_size, uint32_t uncomp_size,
-                                      int uncomp_size_is_exact);
-
-/**
- * xz_dec_microlzma_run() - Run the MicroLZMA decoder
- * @s:          Decoder state initialized using xz_dec_microlzma_reset()
- * @b:          Input and output buffers
- *
- * This works similarly to xz_dec_run() with a few important differences.
- * Only the differences are documented here.
- *
- * The only possible return values are XZ_OK, XZ_STREAM_END, and
- * XZ_DATA_ERROR. This function cannot return XZ_BUF_ERROR: if no progress
- * is possible due to lack of input data or output space, this function will
- * keep returning XZ_OK. Thus, the calling code must be written so that it
- * will eventually provide input and output space matching (or exceeding)
- * comp_size and uncomp_size arguments given to xz_dec_microlzma_reset().
- * If the caller cannot do this (for example, if the input file is truncated
- * or otherwise corrupt), the caller must detect this error by itself to
- * avoid an infinite loop.
- *
- * If the compressed data seems to be corrupt, XZ_DATA_ERROR is returned.
- * This can happen also when incorrect dictionary, uncompressed, or
- * compressed sizes have been specified.
- *
- * With XZ_PREALLOC only: As an extra feature, b->out may be NULL to skip over
- * uncompressed data. This way the caller doesn't need to provide a temporary
- * output buffer for the bytes that will be ignored.
- *
- * With XZ_SINGLE only: In contrast to xz_dec_run(), the return value XZ_OK
- * is also possible and thus XZ_SINGLE is actually a limited multi-call mode.
- * After XZ_OK the bytes decoded so far may be read from the output buffer.
- * It is possible to continue decoding but the variables b->out and b->out_pos
- * MUST NOT be changed by the caller. Increasing the value of b->out_size is
- * allowed to make more output space available; one doesn't need to provide
- * space for the whole uncompressed data on the first call. The input buffer
- * may be changed normally like with XZ_PREALLOC. This way input data can be
- * provided from non-contiguous memory.
- */
-XZ_EXTERN enum xz_ret xz_dec_microlzma_run(struct xz_dec_microlzma *s,
-                                           struct xz_buf *b);
-
-/**
- * xz_dec_microlzma_end() - Free the memory allocated for the decoder state
- * @s:          Decoder state allocated using xz_dec_microlzma_alloc().
- *              If s is NULL, this function does nothing.
- */
-XZ_EXTERN void xz_dec_microlzma_end(struct xz_dec_microlzma *s);
-
-/*
- * Standalone build (userspace build or in-kernel build for boot time use)
- * needs a CRC32 implementation. For normal in-kernel use, kernel's own
- * CRC32 module is used instead, and users of this module don't need to
- * care about the functions below.
- */
-#ifndef XZ_INTERNAL_CRC32
-#ifdef __KERNEL__
-#define XZ_INTERNAL_CRC32 0
-#else
-#define XZ_INTERNAL_CRC32 1
-#endif
-#endif
-
-/*
- * If CRC64 support has been enabled with XZ_USE_CRC64, a CRC64
- * implementation is needed too.
- */
-#ifndef XZ_USE_CRC64
-#undef XZ_INTERNAL_CRC64
-#define XZ_INTERNAL_CRC64 0
-#endif
-#ifndef XZ_INTERNAL_CRC64
-#ifdef __KERNEL__
-#error Using CRC64 in the kernel has not been implemented.
-#else
-#define XZ_INTERNAL_CRC64 1
-#endif
-#endif
-
-#if XZ_INTERNAL_CRC32
-/*
- * This must be called before any other xz_* function to initialize
- * the CRC32 lookup table.
- */
-XZ_EXTERN void xz_crc32_init(void);
-
-/*
- * Update CRC32 value using the polynomial from IEEE-802.3. To start a new
- * calculation, the third argument must be zero. To continue the calculation,
- * the previously returned value is passed as the third argument.
- */
-XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc);
-#endif
-
-#if XZ_INTERNAL_CRC64
-/*
- * This must be called before any other xz_* function (except xz_crc32_init())
- * to initialize the CRC64 lookup table.
- */
-XZ_EXTERN void xz_crc64_init(void);
-
-/*
- * Update CRC64 value using the polynomial from ECMA-182. To start a new
- * calculation, the third argument must be zero. To continue the calculation,
- * the previously returned value is passed as the third argument.
- */
-XZ_EXTERN uint64_t xz_crc64(const uint8_t *buf, size_t size, uint64_t crc);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_config.h b/app/src/main/cpp/xz/xz_embedded/xz_config.h
deleted file mode 100644
index 45a052f6e..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_config.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* SPDX-License-Identifier: 0BSD */
-
-/*
- * Private includes and definitions for userspace use of XZ Embedded
- *
- * Author: Lasse Collin <lasse.collin@tukaani.org>
- */
-
-#ifndef XZ_CONFIG_H
-#define XZ_CONFIG_H
-
-/* Enable building of xz_dec_catrun(). Also defined via CMake. */
-#ifndef XZ_DEC_CONCATENATED
-#define XZ_DEC_CONCATENATED
-#endif
-
-/* Uncomment to enable CRC64 support. */
-/* #define XZ_USE_CRC64 */
-
-/* Uncomment as needed to enable BCJ filter decoders. */
-/* #define XZ_DEC_X86 */
-/* #define XZ_DEC_ARM */
-/* #define XZ_DEC_ARMTHUMB */
-/* #define XZ_DEC_ARM64 */
-/* #define XZ_DEC_RISCV */
-/* #define XZ_DEC_POWERPC */
-/* #define XZ_DEC_IA64 */
-/* #define XZ_DEC_SPARC */
-
-/*
- * Visual Studio 2013 update 2 supports only __inline, not inline.
- * MSVC v19.0 / VS 2015 and newer support both.
- */
-#if defined(_MSC_VER) && _MSC_VER < 1900 && !defined(inline)
-#define inline __inline
-#endif
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "xz.h"
-
-#define kmalloc(size, flags) malloc(size)
-#define kfree(ptr) free(ptr)
-#define vmalloc(size) malloc(size)
-#define vfree(ptr) free(ptr)
-
-#define memeq(a, b, size) (memcmp(a, b, size) == 0)
-#define memzero(buf, size) memset(buf, 0, size)
-
-#ifndef min
-#define min(x, y) ((x) < (y) ? (x) : (y))
-#endif
-#define min_t(type, x, y) min(x, y)
-
-#ifndef fallthrough
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311
-#define fallthrough [[fallthrough]]
-#elif (defined(__GNUC__) && __GNUC__ >= 7) ||                                  \
-    (defined(__clang_major__) && __clang_major__ >= 10)
-#define fallthrough __attribute__((__fallthrough__))
-#else
-#define fallthrough                                                            \
-  do {                                                                         \
-  } while (0)
-#endif
-#endif
-
-/*
- * Some functions have been marked with __always_inline to keep the
- * performance reasonable even when the compiler is optimizing for
- * small code size. You may be able to save a few bytes by #defining
- * __always_inline to plain inline, but don't complain if the code
- * becomes slow.
- *
- * NOTE: System headers on GNU/Linux may #define this macro already,
- * so if you want to change it, you need to #undef it first.
- */
-#ifndef __always_inline
-#ifdef __GNUC__
-#define __always_inline inline __attribute__((__always_inline__))
-#else
-#define __always_inline inline
-#endif
-#endif
-
-/* Inline functions to access unaligned unsigned 32-bit integers */
-#ifndef get_unaligned_le32
-static inline uint32_t get_unaligned_le32(const uint8_t *buf) {
-  return (uint32_t)buf[0] | ((uint32_t)buf[1] << 8) | ((uint32_t)buf[2] << 16) |
-         ((uint32_t)buf[3] << 24);
-}
-#endif
-
-#ifndef get_unaligned_be32
-static inline uint32_t get_unaligned_be32(const uint8_t *buf) {
-  return (uint32_t)((uint32_t)buf[0] << 24) | ((uint32_t)buf[1] << 16) |
-         ((uint32_t)buf[2] << 8) | (uint32_t)buf[3];
-}
-#endif
-
-#ifndef put_unaligned_le32
-static inline void put_unaligned_le32(uint32_t val, uint8_t *buf) {
-  buf[0] = (uint8_t)val;
-  buf[1] = (uint8_t)(val >> 8);
-  buf[2] = (uint8_t)(val >> 16);
-  buf[3] = (uint8_t)(val >> 24);
-}
-#endif
-
-#ifndef put_unaligned_be32
-static inline void put_unaligned_be32(uint32_t val, uint8_t *buf) {
-  buf[0] = (uint8_t)(val >> 24);
-  buf[1] = (uint8_t)(val >> 16);
-  buf[2] = (uint8_t)(val >> 8);
-  buf[3] = (uint8_t)val;
-}
-#endif
-
-/*
- * To keep things simpler, use the generic unaligned methods also for
- * aligned access. The only place where performance could matter is
- * SHA-256 but files using SHA-256 aren't common.
- */
-#ifndef get_le32
-#define get_le32 get_unaligned_le32
-#endif
-#ifndef get_be32
-#define get_be32 get_unaligned_be32
-#endif
-
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_crc32.c b/app/src/main/cpp/xz/xz_embedded/xz_crc32.c
deleted file mode 100644
index 1fc5dc65b..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_crc32.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: 0BSD
-
-/*
- * CRC32 using the polynomial from IEEE-802.3
- *
- * Authors: Lasse Collin <lasse.collin@tukaani.org>
- *          Igor Pavlov <https://7-zip.org/>
- */
-
-/*
- * This is not the fastest implementation, but it is pretty compact.
- * The fastest versions of xz_crc32() on modern CPUs without hardware
- * accelerated CRC instruction are 3-5 times as fast as this version,
- * but they are bigger and use more memory for the lookup table.
- */
-
-#include "xz_private.h"
-
-/*
- * STATIC_RW_DATA is used in the pre-boot environment on some architectures.
- * See <linux/decompress/mm.h> for details.
- */
-#ifndef STATIC_RW_DATA
-#define STATIC_RW_DATA static
-#endif
-
-STATIC_RW_DATA uint32_t xz_crc32_table[256];
-
-XZ_EXTERN void xz_crc32_init(void) {
-  const uint32_t poly = 0xEDB88320;
-
-  uint32_t i;
-  uint32_t j;
-  uint32_t r;
-
-  for (i = 0; i < 256; ++i) {
-    r = i;
-    for (j = 0; j < 8; ++j)
-      r = (r >> 1) ^ (poly & ~((r & 1) - 1));
-
-    xz_crc32_table[i] = r;
-  }
-
-  return;
-}
-
-XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc) {
-  crc = ~crc;
-
-  while (size != 0) {
-    crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
-    --size;
-  }
-
-  return ~crc;
-}
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_crc64.c b/app/src/main/cpp/xz/xz_embedded/xz_crc64.c
deleted file mode 100644
index b7bf80452..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_crc64.c
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: 0BSD
-
-/*
- * CRC64 using the polynomial from ECMA-182
- *
- * This file is similar to xz_crc32.c. See the comments there.
- *
- * Authors: Lasse Collin <lasse.collin@tukaani.org>
- *          Igor Pavlov <https://7-zip.org/>
- */
-
-#include "xz_private.h"
-
-#ifndef STATIC_RW_DATA
-#define STATIC_RW_DATA static
-#endif
-
-STATIC_RW_DATA uint64_t xz_crc64_table[256];
-
-XZ_EXTERN void xz_crc64_init(void) {
-  /*
-   * The ULL suffix is needed for -std=gnu89 compatibility
-   * on 32-bit platforms.
-   */
-  const uint64_t poly = 0xC96C5795D7870F42ULL;
-
-  uint32_t i;
-  uint32_t j;
-  uint64_t r;
-
-  for (i = 0; i < 256; ++i) {
-    r = i;
-    for (j = 0; j < 8; ++j)
-      r = (r >> 1) ^ (poly & ~((r & 1) - 1));
-
-    xz_crc64_table[i] = r;
-  }
-
-  return;
-}
-
-XZ_EXTERN uint64_t xz_crc64(const uint8_t *buf, size_t size, uint64_t crc) {
-  crc = ~crc;
-
-  while (size != 0) {
-    crc = xz_crc64_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
-    --size;
-  }
-
-  return ~crc;
-}
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_dec_bcj.c b/app/src/main/cpp/xz/xz_embedded/xz_dec_bcj.c
deleted file mode 100644
index 06018a881..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_dec_bcj.c
+++ /dev/null
@@ -1,707 +0,0 @@
-// SPDX-License-Identifier: 0BSD
-
-/*
- * Branch/Call/Jump (BCJ) filter decoders
- *
- * Authors: Lasse Collin <lasse.collin@tukaani.org>
- *          Igor Pavlov <https://7-zip.org/>
- */
-
-#include "xz_private.h"
-
-/*
- * The rest of the file is inside this ifdef. It makes things a little more
- * convenient when building without support for any BCJ filters.
- */
-#ifdef XZ_DEC_BCJ
-
-struct xz_dec_bcj {
-  /* Type of the BCJ filter being used */
-  enum {
-    BCJ_X86 = 4,      /* x86 or x86-64 */
-    BCJ_POWERPC = 5,  /* Big endian only */
-    BCJ_IA64 = 6,     /* Big or little endian */
-    BCJ_ARM = 7,      /* Little endian only */
-    BCJ_ARMTHUMB = 8, /* Little endian only */
-    BCJ_SPARC = 9,    /* Big or little endian */
-    BCJ_ARM64 = 10,   /* AArch64 */
-    BCJ_RISCV = 11    /* RV32GQC_Zfh, RV64GQC_Zfh */
-  } type;
-
-  /*
-   * Return value of the next filter in the chain. We need to preserve
-   * this information across calls, because we must not call the next
-   * filter anymore once it has returned XZ_STREAM_END.
-   */
-  enum xz_ret ret;
-
-  /* True if we are operating in single-call mode. */
-  bool single_call;
-
-  /*
-   * Absolute position relative to the beginning of the uncompressed
-   * data (in a single .xz Block). We care only about the lowest 32
-   * bits so this doesn't need to be uint64_t even with big files.
-   */
-  uint32_t pos;
-
-  /* x86 filter state */
-  uint32_t x86_prev_mask;
-
-  /* Temporary space to hold the variables from struct xz_buf */
-  uint8_t *out;
-  size_t out_pos;
-  size_t out_size;
-
-  struct {
-    /* Amount of already filtered data in the beginning of buf */
-    size_t filtered;
-
-    /* Total amount of data currently stored in buf  */
-    size_t size;
-
-    /*
-     * Buffer to hold a mix of filtered and unfiltered data. This
-     * needs to be big enough to hold Alignment + 2 * Look-ahead:
-     *
-     * Type         Alignment   Look-ahead
-     * x86              1           4
-     * PowerPC          4           0
-     * IA-64           16           0
-     * ARM              4           0
-     * ARM-Thumb        2           2
-     * SPARC            4           0
-     */
-    uint8_t buf[16];
-  } temp;
-};
-
-#ifdef XZ_DEC_X86
-/*
- * This is used to test the most significant byte of a memory address
- * in an x86 instruction.
- */
-static inline int bcj_x86_test_msbyte(uint8_t b) {
-  return b == 0x00 || b == 0xFF;
-}
-
-static size_t bcj_x86(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  static const bool mask_to_allowed_status[8] = {true, true,  true,  false,
-                                                 true, false, false, false};
-
-  static const uint8_t mask_to_bit_num[8] = {0, 1, 2, 2, 3, 3, 3, 3};
-
-  size_t i;
-  size_t prev_pos = (size_t)-1;
-  uint32_t prev_mask = s->x86_prev_mask;
-  uint32_t src;
-  uint32_t dest;
-  uint32_t j;
-  uint8_t b;
-
-  if (size <= 4)
-    return 0;
-
-  size -= 4;
-  for (i = 0; i < size; ++i) {
-    if ((buf[i] & 0xFE) != 0xE8)
-      continue;
-
-    prev_pos = i - prev_pos;
-    if (prev_pos > 3) {
-      prev_mask = 0;
-    } else {
-      prev_mask = (prev_mask << (prev_pos - 1)) & 7;
-      if (prev_mask != 0) {
-        b = buf[i + 4 - mask_to_bit_num[prev_mask]];
-        if (!mask_to_allowed_status[prev_mask] || bcj_x86_test_msbyte(b)) {
-          prev_pos = i;
-          prev_mask = (prev_mask << 1) | 1;
-          continue;
-        }
-      }
-    }
-
-    prev_pos = i;
-
-    if (bcj_x86_test_msbyte(buf[i + 4])) {
-      src = get_unaligned_le32(buf + i + 1);
-      while (true) {
-        dest = src - (s->pos + (uint32_t)i + 5);
-        if (prev_mask == 0)
-          break;
-
-        j = mask_to_bit_num[prev_mask] * 8;
-        b = (uint8_t)(dest >> (24 - j));
-        if (!bcj_x86_test_msbyte(b))
-          break;
-
-        src = dest ^ (((uint32_t)1 << (32 - j)) - 1);
-      }
-
-      dest &= 0x01FFFFFF;
-      dest |= (uint32_t)0 - (dest & 0x01000000);
-      put_unaligned_le32(dest, buf + i + 1);
-      i += 4;
-    } else {
-      prev_mask = (prev_mask << 1) | 1;
-    }
-  }
-
-  prev_pos = i - prev_pos;
-  s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_POWERPC
-static size_t bcj_powerpc(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  size_t i;
-  uint32_t instr;
-
-  size &= ~(size_t)3;
-
-  for (i = 0; i < size; i += 4) {
-    instr = get_unaligned_be32(buf + i);
-    if ((instr & 0xFC000003) == 0x48000001) {
-      instr &= 0x03FFFFFC;
-      instr -= s->pos + (uint32_t)i;
-      instr &= 0x03FFFFFC;
-      instr |= 0x48000001;
-      put_unaligned_be32(instr, buf + i);
-    }
-  }
-
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_IA64
-static size_t bcj_ia64(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  static const uint8_t branch_table[32] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                           0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
-                                           7, 7, 4, 4, 0, 0, 4, 4, 0, 0};
-
-  /*
-   * The local variables take a little bit stack space, but it's less
-   * than what LZMA2 decoder takes, so it doesn't make sense to reduce
-   * stack usage here without doing that for the LZMA2 decoder too.
-   */
-
-  /* Loop counters */
-  size_t i;
-  size_t j;
-
-  /* Instruction slot (0, 1, or 2) in the 128-bit instruction word */
-  uint32_t slot;
-
-  /* Bitwise offset of the instruction indicated by slot */
-  uint32_t bit_pos;
-
-  /* bit_pos split into byte and bit parts */
-  uint32_t byte_pos;
-  uint32_t bit_res;
-
-  /* Address part of an instruction */
-  uint32_t addr;
-
-  /* Mask used to detect which instructions to convert */
-  uint32_t mask;
-
-  /* 41-bit instruction stored somewhere in the lowest 48 bits */
-  uint64_t instr;
-
-  /* Instruction normalized with bit_res for easier manipulation */
-  uint64_t norm;
-
-  size &= ~(size_t)15;
-
-  for (i = 0; i < size; i += 16) {
-    mask = branch_table[buf[i] & 0x1F];
-    for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41) {
-      if (((mask >> slot) & 1) == 0)
-        continue;
-
-      byte_pos = bit_pos >> 3;
-      bit_res = bit_pos & 7;
-      instr = 0;
-      for (j = 0; j < 6; ++j)
-        instr |= (uint64_t)(buf[i + j + byte_pos]) << (8 * j);
-
-      norm = instr >> bit_res;
-
-      if (((norm >> 37) & 0x0F) == 0x05 && ((norm >> 9) & 0x07) == 0) {
-        addr = (norm >> 13) & 0x0FFFFF;
-        addr |= ((uint32_t)(norm >> 36) & 1) << 20;
-        addr <<= 4;
-        addr -= s->pos + (uint32_t)i;
-        addr >>= 4;
-
-        norm &= ~((uint64_t)0x8FFFFF << 13);
-        norm |= (uint64_t)(addr & 0x0FFFFF) << 13;
-        norm |= (uint64_t)(addr & 0x100000) << (36 - 20);
-
-        instr &= (1 << bit_res) - 1;
-        instr |= norm << bit_res;
-
-        for (j = 0; j < 6; j++)
-          buf[i + j + byte_pos] = (uint8_t)(instr >> (8 * j));
-      }
-    }
-  }
-
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_ARM
-static size_t bcj_arm(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  size_t i;
-  uint32_t addr;
-
-  size &= ~(size_t)3;
-
-  for (i = 0; i < size; i += 4) {
-    if (buf[i + 3] == 0xEB) {
-      addr = (uint32_t)buf[i] | ((uint32_t)buf[i + 1] << 8) |
-             ((uint32_t)buf[i + 2] << 16);
-      addr <<= 2;
-      addr -= s->pos + (uint32_t)i + 8;
-      addr >>= 2;
-      buf[i] = (uint8_t)addr;
-      buf[i + 1] = (uint8_t)(addr >> 8);
-      buf[i + 2] = (uint8_t)(addr >> 16);
-    }
-  }
-
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_ARMTHUMB
-static size_t bcj_armthumb(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  size_t i;
-  uint32_t addr;
-
-  if (size < 4)
-    return 0;
-
-  size -= 4;
-
-  for (i = 0; i <= size; i += 2) {
-    if ((buf[i + 1] & 0xF8) == 0xF0 && (buf[i + 3] & 0xF8) == 0xF8) {
-      addr = (((uint32_t)buf[i + 1] & 0x07) << 19) | ((uint32_t)buf[i] << 11) |
-             (((uint32_t)buf[i + 3] & 0x07) << 8) | (uint32_t)buf[i + 2];
-      addr <<= 1;
-      addr -= s->pos + (uint32_t)i + 4;
-      addr >>= 1;
-      buf[i + 1] = (uint8_t)(0xF0 | ((addr >> 19) & 0x07));
-      buf[i] = (uint8_t)(addr >> 11);
-      buf[i + 3] = (uint8_t)(0xF8 | ((addr >> 8) & 0x07));
-      buf[i + 2] = (uint8_t)addr;
-      i += 2;
-    }
-  }
-
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_SPARC
-static size_t bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  size_t i;
-  uint32_t instr;
-
-  size &= ~(size_t)3;
-
-  for (i = 0; i < size; i += 4) {
-    instr = get_unaligned_be32(buf + i);
-    if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF) {
-      instr <<= 2;
-      instr -= s->pos + (uint32_t)i;
-      instr >>= 2;
-      instr = ((uint32_t)0x40000000 - (instr & 0x400000)) | 0x40000000 |
-              (instr & 0x3FFFFF);
-      put_unaligned_be32(instr, buf + i);
-    }
-  }
-
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_ARM64
-static size_t bcj_arm64(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  size_t i;
-  uint32_t instr;
-  uint32_t addr;
-
-  size &= ~(size_t)3;
-
-  for (i = 0; i < size; i += 4) {
-    instr = get_unaligned_le32(buf + i);
-
-    if ((instr >> 26) == 0x25) {
-      /* BL instruction */
-      addr = instr - ((s->pos + (uint32_t)i) >> 2);
-      instr = 0x94000000 | (addr & 0x03FFFFFF);
-      put_unaligned_le32(instr, buf + i);
-
-    } else if ((instr & 0x9F000000) == 0x90000000) {
-      /* ADRP instruction */
-      addr = ((instr >> 29) & 3) | ((instr >> 3) & 0x1FFFFC);
-
-      /* Only convert values in the range +/-512 MiB. */
-      if ((addr + 0x020000) & 0x1C0000)
-        continue;
-
-      addr -= (s->pos + (uint32_t)i) >> 12;
-
-      instr &= 0x9000001F;
-      instr |= (addr & 3) << 29;
-      instr |= (addr & 0x03FFFC) << 3;
-      instr |= (0U - (addr & 0x020000)) & 0xE00000;
-
-      put_unaligned_le32(instr, buf + i);
-    }
-  }
-
-  return i;
-}
-#endif
-
-#ifdef XZ_DEC_RISCV
-static size_t bcj_riscv(struct xz_dec_bcj *s, uint8_t *buf, size_t size) {
-  size_t i;
-  uint32_t b1;
-  uint32_t b2;
-  uint32_t b3;
-  uint32_t instr;
-  uint32_t instr2;
-  uint32_t instr2_rs1;
-  uint32_t addr;
-
-  if (size < 8)
-    return 0;
-
-  size -= 8;
-
-  for (i = 0; i <= size; i += 2) {
-    instr = buf[i];
-
-    if (instr == 0xEF) {
-      /* JAL */
-      b1 = buf[i + 1];
-      if ((b1 & 0x0D) != 0)
-        continue;
-
-      b2 = buf[i + 2];
-      b3 = buf[i + 3];
-
-      addr = ((b1 & 0xF0) << 13) | (b2 << 9) | (b3 << 1);
-      addr -= s->pos + (uint32_t)i;
-
-      buf[i + 1] = (uint8_t)((b1 & 0x0F) | ((addr >> 8) & 0xF0));
-
-      buf[i + 2] = (uint8_t)(((addr >> 16) & 0x0F) | ((addr >> 7) & 0x10) |
-                             ((addr << 4) & 0xE0));
-
-      buf[i + 3] = (uint8_t)(((addr >> 4) & 0x7F) | ((addr >> 13) & 0x80));
-
-      i += 4 - 2;
-
-    } else if ((instr & 0x7F) == 0x17) {
-      /* AUIPC */
-      instr |= (uint32_t)buf[i + 1] << 8;
-      instr |= (uint32_t)buf[i + 2] << 16;
-      instr |= (uint32_t)buf[i + 3] << 24;
-
-      if (instr & 0xE80) {
-        /* AUIPC's rd doesn't equal x0 or x2. */
-        instr2 = get_unaligned_le32(buf + i + 4);
-
-        if (((instr << 8) ^ (instr2 - 3)) & 0xF8003) {
-          i += 6 - 2;
-          continue;
-        }
-
-        addr = (instr & 0xFFFFF000) + (instr2 >> 20);
-
-        instr = 0x17 | (2 << 7) | (instr2 << 12);
-        instr2 = addr;
-      } else {
-        /* AUIPC's rd equals x0 or x2. */
-        instr2_rs1 = instr >> 27;
-
-        if ((uint32_t)((instr - 0x3117) << 18) >= (instr2_rs1 & 0x1D)) {
-          i += 4 - 2;
-          continue;
-        }
-
-        addr = get_unaligned_be32(buf + i + 4);
-        addr -= s->pos + (uint32_t)i;
-
-        instr2 = (instr >> 12) | (addr << 20);
-
-        instr = 0x17 | (instr2_rs1 << 7) | ((addr + 0x800) & 0xFFFFF000);
-      }
-
-      put_unaligned_le32(instr, buf + i);
-      put_unaligned_le32(instr2, buf + i + 4);
-
-      i += 8 - 2;
-    }
-  }
-
-  return i;
-}
-#endif
-
-/*
- * Apply the selected BCJ filter. Update *pos and s->pos to match the amount
- * of data that got filtered.
- *
- * NOTE: This is implemented as a switch statement to avoid using function
- * pointers, which could be problematic in the kernel boot code, which must
- * avoid pointers to static data (at least on x86).
- */
-static void bcj_apply(struct xz_dec_bcj *s, uint8_t *buf, size_t *pos,
-                      size_t size) {
-  size_t filtered;
-
-  buf += *pos;
-  size -= *pos;
-
-  switch (s->type) {
-#ifdef XZ_DEC_X86
-  case BCJ_X86:
-    filtered = bcj_x86(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_POWERPC
-  case BCJ_POWERPC:
-    filtered = bcj_powerpc(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_IA64
-  case BCJ_IA64:
-    filtered = bcj_ia64(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_ARM
-  case BCJ_ARM:
-    filtered = bcj_arm(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_ARMTHUMB
-  case BCJ_ARMTHUMB:
-    filtered = bcj_armthumb(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_SPARC
-  case BCJ_SPARC:
-    filtered = bcj_sparc(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_ARM64
-  case BCJ_ARM64:
-    filtered = bcj_arm64(s, buf, size);
-    break;
-#endif
-#ifdef XZ_DEC_RISCV
-  case BCJ_RISCV:
-    filtered = bcj_riscv(s, buf, size);
-    break;
-#endif
-  default:
-    /* Never reached but silence compiler warnings. */
-    filtered = 0;
-    break;
-  }
-
-  *pos += filtered;
-  s->pos += filtered;
-}
-
-/*
- * Flush pending filtered data from temp to the output buffer.
- * Move the remaining mixture of possibly filtered and unfiltered
- * data to the beginning of temp.
- */
-static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b) {
-  size_t copy_size;
-
-  copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);
-  memcpy(b->out + b->out_pos, s->temp.buf, copy_size);
-  b->out_pos += copy_size;
-
-  s->temp.filtered -= copy_size;
-  s->temp.size -= copy_size;
-  memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);
-}
-
-/*
- * The BCJ filter functions are primitive in sense that they process the
- * data in chunks of 1-16 bytes. To hide this issue, this function does
- * some buffering.
- */
-XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
-                                     struct xz_dec_lzma2 *lzma2,
-                                     struct xz_buf *b) {
-  size_t out_start;
-
-  /*
-   * Flush pending already filtered data to the output buffer. Return
-   * immediately if we couldn't flush everything, or if the next
-   * filter in the chain had already returned XZ_STREAM_END.
-   */
-  if (s->temp.filtered > 0) {
-    bcj_flush(s, b);
-    if (s->temp.filtered > 0)
-      return XZ_OK;
-
-    if (s->ret == XZ_STREAM_END)
-      return XZ_STREAM_END;
-  }
-
-  /*
-   * If we have more output space than what is currently pending in
-   * temp, copy the unfiltered data from temp to the output buffer
-   * and try to fill the output buffer by decoding more data from the
-   * next filter in the chain. Apply the BCJ filter on the new data
-   * in the output buffer. If everything cannot be filtered, copy it
-   * to temp and rewind the output buffer position accordingly.
-   *
-   * This needs to be always run when temp.size == 0 to handle a special
-   * case where the output buffer is full and the next filter has no
-   * more output coming but hasn't returned XZ_STREAM_END yet.
-   */
-  if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0) {
-    out_start = b->out_pos;
-    memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
-    b->out_pos += s->temp.size;
-
-    s->ret = xz_dec_lzma2_run(lzma2, b);
-    if (s->ret != XZ_STREAM_END && (s->ret != XZ_OK || s->single_call))
-      return s->ret;
-
-    bcj_apply(s, b->out, &out_start, b->out_pos);
-
-    /*
-     * As an exception, if the next filter returned XZ_STREAM_END,
-     * we can do that too, since the last few bytes that remain
-     * unfiltered are meant to remain unfiltered.
-     */
-    if (s->ret == XZ_STREAM_END)
-      return XZ_STREAM_END;
-
-    s->temp.size = b->out_pos - out_start;
-    b->out_pos -= s->temp.size;
-    memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
-
-    /*
-     * If there wasn't enough input to the next filter to fill
-     * the output buffer with unfiltered data, there's no point
-     * to try decoding more data to temp.
-     */
-    if (b->out_pos + s->temp.size < b->out_size)
-      return XZ_OK;
-  }
-
-  /*
-   * We have unfiltered data in temp. If the output buffer isn't full
-   * yet, try to fill the temp buffer by decoding more data from the
-   * next filter. Apply the BCJ filter on temp. Then we hopefully can
-   * fill the actual output buffer by copying filtered data from temp.
-   * A mix of filtered and unfiltered data may be left in temp; it will
-   * be taken care on the next call to this function.
-   */
-  if (b->out_pos < b->out_size) {
-    /* Make b->out{,_pos,_size} temporarily point to s->temp. */
-    s->out = b->out;
-    s->out_pos = b->out_pos;
-    s->out_size = b->out_size;
-    b->out = s->temp.buf;
-    b->out_pos = s->temp.size;
-    b->out_size = sizeof(s->temp.buf);
-
-    s->ret = xz_dec_lzma2_run(lzma2, b);
-
-    s->temp.size = b->out_pos;
-    b->out = s->out;
-    b->out_pos = s->out_pos;
-    b->out_size = s->out_size;
-
-    if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)
-      return s->ret;
-
-    bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);
-
-    /*
-     * If the next filter returned XZ_STREAM_END, we mark that
-     * everything is filtered, since the last unfiltered bytes
-     * of the stream are meant to be left as is.
-     */
-    if (s->ret == XZ_STREAM_END)
-      s->temp.filtered = s->temp.size;
-
-    bcj_flush(s, b);
-    if (s->temp.filtered > 0)
-      return XZ_OK;
-  }
-
-  return s->ret;
-}
-
-XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call) {
-  struct xz_dec_bcj *s = kmalloc(sizeof(*s), GFP_KERNEL);
-  if (s != NULL)
-    s->single_call = single_call;
-
-  return s;
-}
-
-XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id) {
-  switch (id) {
-#ifdef XZ_DEC_X86
-  case BCJ_X86:
-#endif
-#ifdef XZ_DEC_POWERPC
-  case BCJ_POWERPC:
-#endif
-#ifdef XZ_DEC_IA64
-  case BCJ_IA64:
-#endif
-#ifdef XZ_DEC_ARM
-  case BCJ_ARM:
-#endif
-#ifdef XZ_DEC_ARMTHUMB
-  case BCJ_ARMTHUMB:
-#endif
-#ifdef XZ_DEC_SPARC
-  case BCJ_SPARC:
-#endif
-#ifdef XZ_DEC_ARM64
-  case BCJ_ARM64:
-#endif
-#ifdef XZ_DEC_RISCV
-  case BCJ_RISCV:
-#endif
-    break;
-
-  default:
-    /* Unsupported Filter ID */
-    return XZ_OPTIONS_ERROR;
-  }
-
-  s->type = id;
-  s->ret = XZ_OK;
-  s->pos = 0;
-  s->x86_prev_mask = 0;
-  s->temp.filtered = 0;
-  s->temp.size = 0;
-
-  return XZ_OK;
-}
-
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_dec_lzma2.c b/app/src/main/cpp/xz/xz_embedded/xz_dec_lzma2.c
deleted file mode 100644
index 3dc00c26a..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_dec_lzma2.c
+++ /dev/null
@@ -1,1290 +0,0 @@
-// SPDX-License-Identifier: 0BSD
-
-/*
- * LZMA2 decoder
- *
- * Authors: Lasse Collin <lasse.collin@tukaani.org>
- *          Igor Pavlov <https://7-zip.org/>
- */
-
-#include "xz_private.h"
-#include "xz_lzma2.h"
-
-/*
- * Range decoder initialization eats the first five bytes of each LZMA chunk.
- */
-#define RC_INIT_BYTES 5
-
-/*
- * Minimum number of usable input buffer to safely decode one LZMA symbol.
- * The worst case is that we decode 22 bits using probabilities and 26
- * direct bits. This may decode at maximum of 20 bytes of input. However,
- * lzma_main() does an extra normalization before returning, thus we
- * need to put 21 here.
- */
-#define LZMA_IN_REQUIRED 21
-
-/*
- * Dictionary (history buffer)
- *
- * These are always true:
- *    start <= pos <= full <= end
- *    pos <= limit <= end
- *
- * In multi-call mode, also these are true:
- *    end == size
- *    size <= size_max
- *    allocated <= size
- *
- * Most of these variables are size_t to support single-call mode,
- * in which the dictionary variables address the actual output
- * buffer directly.
- */
-struct dictionary {
-  /* Beginning of the history buffer */
-  uint8_t *buf;
-
-  /* Old position in buf (before decoding more data) */
-  size_t start;
-
-  /* Position in buf */
-  size_t pos;
-
-  /*
-   * How full dictionary is. This is used to detect corrupt input that
-   * would read beyond the beginning of the uncompressed stream.
-   */
-  size_t full;
-
-  /* Write limit; we don't write to buf[limit] or later bytes. */
-  size_t limit;
-
-  /*
-   * End of the dictionary buffer. In multi-call mode, this is
-   * the same as the dictionary size. In single-call mode, this
-   * indicates the size of the output buffer.
-   */
-  size_t end;
-
-  /*
-   * Size of the dictionary as specified in Block Header. This is used
-   * together with "full" to detect corrupt input that would make us
-   * read beyond the beginning of the uncompressed stream.
-   */
-  uint32_t size;
-
-  /*
-   * Maximum allowed dictionary size in multi-call mode.
-   * This is ignored in single-call mode.
-   */
-  uint32_t size_max;
-
-  /*
-   * Amount of memory currently allocated for the dictionary.
-   * This is used only with XZ_DYNALLOC. (With XZ_PREALLOC,
-   * size_max is always the same as the allocated size.)
-   */
-  uint32_t allocated;
-
-  /* Operation mode */
-  enum xz_mode mode;
-};
-
-/* Range decoder */
-struct rc_dec {
-  uint32_t range;
-  uint32_t code;
-
-  /*
-   * Number of initializing bytes remaining to be read
-   * by rc_read_init().
-   */
-  uint32_t init_bytes_left;
-
-  /*
-   * Buffer from which we read our input. It can be either
-   * temp.buf or the caller-provided input buffer.
-   */
-  const uint8_t *in;
-  size_t in_pos;
-  size_t in_limit;
-};
-
-/* Probabilities for a length decoder. */
-struct lzma_len_dec {
-  /* Probability of match length being at least 10 */
-  uint16_t choice;
-
-  /* Probability of match length being at least 18 */
-  uint16_t choice2;
-
-  /* Probabilities for match lengths 2-9 */
-  uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
-
-  /* Probabilities for match lengths 10-17 */
-  uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
-
-  /* Probabilities for match lengths 18-273 */
-  uint16_t high[LEN_HIGH_SYMBOLS];
-};
-
-struct lzma_dec {
-  /* Distances of latest four matches */
-  uint32_t rep0;
-  uint32_t rep1;
-  uint32_t rep2;
-  uint32_t rep3;
-
-  /* Types of the most recently seen LZMA symbols */
-  enum lzma_state state;
-
-  /*
-   * Length of a match. This is updated so that dict_repeat can
-   * be called again to finish repeating the whole match.
-   */
-  uint32_t len;
-
-  /*
-   * LZMA properties or related bit masks (number of literal
-   * context bits, a mask derived from the number of literal
-   * position bits, and a mask derived from the number
-   * position bits)
-   */
-  uint32_t lc;
-  uint32_t literal_pos_mask; /* (1 << lp) - 1 */
-  uint32_t pos_mask;         /* (1 << pb) - 1 */
-
-  /* If 1, it's a match. Otherwise it's a single 8-bit literal. */
-  uint16_t is_match[STATES][POS_STATES_MAX];
-
-  /* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */
-  uint16_t is_rep[STATES];
-
-  /*
-   * If 0, distance of a repeated match is rep0.
-   * Otherwise check is_rep1.
-   */
-  uint16_t is_rep0[STATES];
-
-  /*
-   * If 0, distance of a repeated match is rep1.
-   * Otherwise check is_rep2.
-   */
-  uint16_t is_rep1[STATES];
-
-  /* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */
-  uint16_t is_rep2[STATES];
-
-  /*
-   * If 1, the repeated match has length of one byte. Otherwise
-   * the length is decoded from rep_len_decoder.
-   */
-  uint16_t is_rep0_long[STATES][POS_STATES_MAX];
-
-  /*
-   * Probability tree for the highest two bits of the match
-   * distance. There is a separate probability tree for match
-   * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
-   */
-  uint16_t dist_slot[DIST_STATES][DIST_SLOTS];
-
-  /*
-   * Probability trees for additional bits for match distance
-   * when the distance is in the range [4, 127].
-   */
-  uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];
-
-  /*
-   * Probability tree for the lowest four bits of a match
-   * distance that is equal to or greater than 128.
-   */
-  uint16_t dist_align[ALIGN_SIZE];
-
-  /* Length of a normal match */
-  struct lzma_len_dec match_len_dec;
-
-  /* Length of a repeated match */
-  struct lzma_len_dec rep_len_dec;
-
-  /* Probabilities of literals */
-  uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
-};
-
-struct lzma2_dec {
-  /* Position in xz_dec_lzma2_run(). */
-  enum lzma2_seq {
-    SEQ_CONTROL,
-    SEQ_UNCOMPRESSED_1,
-    SEQ_UNCOMPRESSED_2,
-    SEQ_COMPRESSED_0,
-    SEQ_COMPRESSED_1,
-    SEQ_PROPERTIES,
-    SEQ_LZMA_PREPARE,
-    SEQ_LZMA_RUN,
-    SEQ_COPY
-  } sequence;
-
-  /* Next position after decoding the compressed size of the chunk. */
-  enum lzma2_seq next_sequence;
-
-  /* Uncompressed size of LZMA chunk (2 MiB at maximum) */
-  uint32_t uncompressed;
-
-  /*
-   * Compressed size of LZMA chunk or compressed/uncompressed
-   * size of uncompressed chunk (64 KiB at maximum)
-   */
-  uint32_t compressed;
-
-  /*
-   * True if dictionary reset is needed. This is false before
-   * the first chunk (LZMA or uncompressed).
-   */
-  bool need_dict_reset;
-
-  /*
-   * True if new LZMA properties are needed. This is false
-   * before the first LZMA chunk.
-   */
-  bool need_props;
-
-#ifdef XZ_DEC_MICROLZMA
-  bool pedantic_microlzma;
-#endif
-};
-
-struct xz_dec_lzma2 {
-  /*
-   * The order below is important on x86 to reduce code size and
-   * it shouldn't hurt on other platforms. Everything up to and
-   * including lzma.pos_mask are in the first 128 bytes on x86-32,
-   * which allows using smaller instructions to access those
-   * variables. On x86-64, fewer variables fit into the first 128
-   * bytes, but this is still the best order without sacrificing
-   * the readability by splitting the structures.
-   */
-  struct rc_dec rc;
-  struct dictionary dict;
-  struct lzma2_dec lzma2;
-  struct lzma_dec lzma;
-
-  /*
-   * Temporary buffer which holds small number of input bytes between
-   * decoder calls. See lzma2_lzma() for details.
-   */
-  struct {
-    uint32_t size;
-    uint8_t buf[3 * LZMA_IN_REQUIRED];
-  } temp;
-};
-
-/**************
- * Dictionary *
- **************/
-
-/*
- * Reset the dictionary state. When in single-call mode, set up the beginning
- * of the dictionary to point to the actual output buffer.
- */
-static void dict_reset(struct dictionary *dict, struct xz_buf *b) {
-  if (DEC_IS_SINGLE(dict->mode)) {
-    dict->buf = b->out + b->out_pos;
-    dict->end = b->out_size - b->out_pos;
-  }
-
-  dict->start = 0;
-  dict->pos = 0;
-  dict->limit = 0;
-  dict->full = 0;
-}
-
-/* Set dictionary write limit */
-static void dict_limit(struct dictionary *dict, size_t out_max) {
-  if (dict->end - dict->pos <= out_max)
-    dict->limit = dict->end;
-  else
-    dict->limit = dict->pos + out_max;
-}
-
-/* Return true if at least one byte can be written into the dictionary. */
-static inline bool dict_has_space(const struct dictionary *dict) {
-  return dict->pos < dict->limit;
-}
-
-/*
- * Get a byte from the dictionary at the given distance. The distance is
- * assumed to valid, or as a special case, zero when the dictionary is
- * still empty. This special case is needed for single-call decoding to
- * avoid writing a '\0' to the end of the destination buffer.
- */
-static inline uint32_t dict_get(const struct dictionary *dict, uint32_t dist) {
-  size_t offset = dict->pos - dist - 1;
-
-  if (dist >= dict->pos)
-    offset += dict->end;
-
-  return dict->full > 0 ? dict->buf[offset] : 0;
-}
-
-/*
- * Put one byte into the dictionary. It is assumed that there is space for it.
- */
-static inline void dict_put(struct dictionary *dict, uint8_t byte) {
-  dict->buf[dict->pos++] = byte;
-
-  if (dict->full < dict->pos)
-    dict->full = dict->pos;
-}
-
-/*
- * Repeat given number of bytes from the given distance. If the distance is
- * invalid, false is returned. On success, true is returned and *len is
- * updated to indicate how many bytes were left to be repeated.
- */
-static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist) {
-  size_t back;
-  uint32_t left;
-
-  if (dist >= dict->full || dist >= dict->size)
-    return false;
-
-  left = min_t(size_t, dict->limit - dict->pos, *len);
-  *len -= left;
-
-  back = dict->pos - dist - 1;
-  if (dist >= dict->pos)
-    back += dict->end;
-
-  do {
-    dict->buf[dict->pos++] = dict->buf[back++];
-    if (back == dict->end)
-      back = 0;
-  } while (--left > 0);
-
-  if (dict->full < dict->pos)
-    dict->full = dict->pos;
-
-  return true;
-}
-
-/* Copy uncompressed data as is from input to dictionary and output buffers. */
-static void dict_uncompressed(struct dictionary *dict, struct xz_buf *b,
-                              uint32_t *left) {
-  size_t copy_size;
-
-  while (*left > 0 && b->in_pos < b->in_size && b->out_pos < b->out_size) {
-    copy_size = min(b->in_size - b->in_pos, b->out_size - b->out_pos);
-    if (copy_size > dict->end - dict->pos)
-      copy_size = dict->end - dict->pos;
-    if (copy_size > *left)
-      copy_size = *left;
-
-    *left -= copy_size;
-
-    /*
-     * If doing in-place decompression in single-call mode and the
-     * uncompressed size of the file is larger than the caller
-     * thought (i.e. it is invalid input!), the buffers below may
-     * overlap and cause undefined behavior with memcpy().
-     * With valid inputs memcpy() would be fine here.
-     */
-    memmove(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
-    dict->pos += copy_size;
-
-    if (dict->full < dict->pos)
-      dict->full = dict->pos;
-
-    if (DEC_IS_MULTI(dict->mode)) {
-      if (dict->pos == dict->end)
-        dict->pos = 0;
-
-      /*
-       * Like above but for multi-call mode: use memmove()
-       * to avoid undefined behavior with invalid input.
-       */
-      memmove(b->out + b->out_pos, b->in + b->in_pos, copy_size);
-    }
-
-    dict->start = dict->pos;
-
-    b->out_pos += copy_size;
-    b->in_pos += copy_size;
-  }
-}
-
-#ifdef XZ_DEC_MICROLZMA
-#define DICT_FLUSH_SUPPORTS_SKIPPING true
-#else
-#define DICT_FLUSH_SUPPORTS_SKIPPING false
-#endif
-
-/*
- * Flush pending data from dictionary to b->out. It is assumed that there is
- * enough space in b->out. This is guaranteed because caller uses dict_limit()
- * before decoding data into the dictionary.
- */
-static uint32_t dict_flush(struct dictionary *dict, struct xz_buf *b) {
-  size_t copy_size = dict->pos - dict->start;
-
-  if (DEC_IS_MULTI(dict->mode)) {
-    if (dict->pos == dict->end)
-      dict->pos = 0;
-
-    /*
-     * These buffers cannot overlap even if doing in-place
-     * decompression because in multi-call mode dict->buf
-     * has been allocated by us in this file; it's not
-     * provided by the caller like in single-call mode.
-     *
-     * With MicroLZMA, b->out can be NULL to skip bytes that
-     * the caller doesn't need. This cannot be done with XZ
-     * because it would break BCJ filters.
-     */
-    if (!DICT_FLUSH_SUPPORTS_SKIPPING || b->out != NULL)
-      memcpy(b->out + b->out_pos, dict->buf + dict->start, copy_size);
-  }
-
-  dict->start = dict->pos;
-  b->out_pos += copy_size;
-  return copy_size;
-}
-
-/*****************
- * Range decoder *
- *****************/
-
-/* Reset the range decoder. */
-static void rc_reset(struct rc_dec *rc) {
-  rc->range = (uint32_t)-1;
-  rc->code = 0;
-  rc->init_bytes_left = RC_INIT_BYTES;
-}
-
-/*
- * Read the first five initial bytes into rc->code if they haven't been
- * read already. (Yes, the first byte gets completely ignored.)
- */
-static bool rc_read_init(struct rc_dec *rc, struct xz_buf *b) {
-  while (rc->init_bytes_left > 0) {
-    if (b->in_pos == b->in_size)
-      return false;
-
-    rc->code = (rc->code << 8) + b->in[b->in_pos++];
-    --rc->init_bytes_left;
-  }
-
-  return true;
-}
-
-/* Return true if there may not be enough input for the next decoding loop. */
-static inline bool rc_limit_exceeded(const struct rc_dec *rc) {
-  return rc->in_pos > rc->in_limit;
-}
-
-/*
- * Return true if it is possible (from point of view of range decoder) that
- * we have reached the end of the LZMA chunk.
- */
-static inline bool rc_is_finished(const struct rc_dec *rc) {
-  return rc->code == 0;
-}
-
-/* Read the next input byte if needed. */
-static __always_inline void rc_normalize(struct rc_dec *rc) {
-  if (rc->range < RC_TOP_VALUE) {
-    rc->range <<= RC_SHIFT_BITS;
-    rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];
-  }
-}
-
-/*
- * Decode one bit. In some versions, this function has been split in three
- * functions so that the compiler is supposed to be able to more easily avoid
- * an extra branch. In this particular version of the LZMA decoder, this
- * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3
- * on x86). Using a non-split version results in nicer looking code too.
- *
- * NOTE: This must return an int. Do not make it return a bool or the speed
- * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,
- * and it generates 10-20 % faster code than GCC 3.x from this file anyway.)
- */
-static __always_inline int rc_bit(struct rc_dec *rc, uint16_t *prob) {
-  uint32_t bound;
-  int bit;
-
-  rc_normalize(rc);
-  bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;
-  if (rc->code < bound) {
-    rc->range = bound;
-    *prob += (RC_BIT_MODEL_TOTAL - *prob) >> RC_MOVE_BITS;
-    bit = 0;
-  } else {
-    rc->range -= bound;
-    rc->code -= bound;
-    *prob -= *prob >> RC_MOVE_BITS;
-    bit = 1;
-  }
-
-  return bit;
-}
-
-/* Decode a bittree starting from the most significant bit. */
-static __always_inline uint32_t rc_bittree(struct rc_dec *rc, uint16_t *probs,
-                                           uint32_t limit) {
-  uint32_t symbol = 1;
-
-  do {
-    if (rc_bit(rc, &probs[symbol]))
-      symbol = (symbol << 1) + 1;
-    else
-      symbol <<= 1;
-  } while (symbol < limit);
-
-  return symbol;
-}
-
-/* Decode a bittree starting from the least significant bit. */
-static __always_inline void rc_bittree_reverse(struct rc_dec *rc,
-                                               uint16_t *probs, uint32_t *dest,
-                                               uint32_t limit) {
-  uint32_t symbol = 1;
-  uint32_t i = 0;
-
-  do {
-    if (rc_bit(rc, &probs[symbol])) {
-      symbol = (symbol << 1) + 1;
-      *dest += 1 << i;
-    } else {
-      symbol <<= 1;
-    }
-  } while (++i < limit);
-}
-
-/* Decode direct bits (fixed fifty-fifty probability) */
-static inline void rc_direct(struct rc_dec *rc, uint32_t *dest,
-                             uint32_t limit) {
-  uint32_t mask;
-
-  do {
-    rc_normalize(rc);
-    rc->range >>= 1;
-    rc->code -= rc->range;
-    mask = (uint32_t)0 - (rc->code >> 31);
-    rc->code += rc->range & mask;
-    *dest = (*dest << 1) + (mask + 1);
-  } while (--limit > 0);
-}
-
-/********
- * LZMA *
- ********/
-
-/* Get pointer to literal coder probability array. */
-static uint16_t *lzma_literal_probs(struct xz_dec_lzma2 *s) {
-  uint32_t prev_byte = dict_get(&s->dict, 0);
-  uint32_t low = prev_byte >> (8 - s->lzma.lc);
-  uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;
-  return s->lzma.literal[low + high];
-}
-
-/* Decode a literal (one 8-bit byte) */
-static void lzma_literal(struct xz_dec_lzma2 *s) {
-  uint16_t *probs;
-  uint32_t symbol;
-  uint32_t match_byte;
-  uint32_t match_bit;
-  uint32_t offset;
-  uint32_t i;
-
-  probs = lzma_literal_probs(s);
-
-  if (lzma_state_is_literal(s->lzma.state)) {
-    symbol = rc_bittree(&s->rc, probs, 0x100);
-  } else {
-    symbol = 1;
-    match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;
-    offset = 0x100;
-
-    do {
-      match_bit = match_byte & offset;
-      match_byte <<= 1;
-      i = offset + match_bit + symbol;
-
-      if (rc_bit(&s->rc, &probs[i])) {
-        symbol = (symbol << 1) + 1;
-        offset &= match_bit;
-      } else {
-        symbol <<= 1;
-        offset &= ~match_bit;
-      }
-    } while (symbol < 0x100);
-  }
-
-  dict_put(&s->dict, (uint8_t)symbol);
-  lzma_state_literal(&s->lzma.state);
-}
-
-/* Decode the length of the match into s->lzma.len. */
-static void lzma_len(struct xz_dec_lzma2 *s, struct lzma_len_dec *l,
-                     uint32_t pos_state) {
-  uint16_t *probs;
-  uint32_t limit;
-
-  if (!rc_bit(&s->rc, &l->choice)) {
-    probs = l->low[pos_state];
-    limit = LEN_LOW_SYMBOLS;
-    s->lzma.len = MATCH_LEN_MIN;
-  } else {
-    if (!rc_bit(&s->rc, &l->choice2)) {
-      probs = l->mid[pos_state];
-      limit = LEN_MID_SYMBOLS;
-      s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;
-    } else {
-      probs = l->high;
-      limit = LEN_HIGH_SYMBOLS;
-      s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS;
-    }
-  }
-
-  s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;
-}
-
-/* Decode a match. The distance will be stored in s->lzma.rep0. */
-static void lzma_match(struct xz_dec_lzma2 *s, uint32_t pos_state) {
-  uint16_t *probs;
-  uint32_t dist_slot;
-  uint32_t limit;
-
-  lzma_state_match(&s->lzma.state);
-
-  s->lzma.rep3 = s->lzma.rep2;
-  s->lzma.rep2 = s->lzma.rep1;
-  s->lzma.rep1 = s->lzma.rep0;
-
-  lzma_len(s, &s->lzma.match_len_dec, pos_state);
-
-  probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];
-  dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;
-
-  if (dist_slot < DIST_MODEL_START) {
-    s->lzma.rep0 = dist_slot;
-  } else {
-    limit = (dist_slot >> 1) - 1;
-    s->lzma.rep0 = 2 + (dist_slot & 1);
-
-    if (dist_slot < DIST_MODEL_END) {
-      s->lzma.rep0 <<= limit;
-      probs = s->lzma.dist_special + s->lzma.rep0 - dist_slot - 1;
-      rc_bittree_reverse(&s->rc, probs, &s->lzma.rep0, limit);
-    } else {
-      rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);
-      s->lzma.rep0 <<= ALIGN_BITS;
-      rc_bittree_reverse(&s->rc, s->lzma.dist_align, &s->lzma.rep0, ALIGN_BITS);
-    }
-  }
-}
-
-/*
- * Decode a repeated match. The distance is one of the four most recently
- * seen matches. The distance will be stored in s->lzma.rep0.
- */
-static void lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state) {
-  uint32_t tmp;
-
-  if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state])) {
-    if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[s->lzma.state][pos_state])) {
-      lzma_state_short_rep(&s->lzma.state);
-      s->lzma.len = 1;
-      return;
-    }
-  } else {
-    if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state])) {
-      tmp = s->lzma.rep1;
-    } else {
-      if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state])) {
-        tmp = s->lzma.rep2;
-      } else {
-        tmp = s->lzma.rep3;
-        s->lzma.rep3 = s->lzma.rep2;
-      }
-
-      s->lzma.rep2 = s->lzma.rep1;
-    }
-
-    s->lzma.rep1 = s->lzma.rep0;
-    s->lzma.rep0 = tmp;
-  }
-
-  lzma_state_long_rep(&s->lzma.state);
-  lzma_len(s, &s->lzma.rep_len_dec, pos_state);
-}
-
-/* LZMA decoder core */
-static bool lzma_main(struct xz_dec_lzma2 *s) {
-  uint32_t pos_state;
-
-  /*
-   * If the dictionary was reached during the previous call, try to
-   * finish the possibly pending repeat in the dictionary.
-   */
-  if (dict_has_space(&s->dict) && s->lzma.len > 0)
-    dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);
-
-  /*
-   * Decode more LZMA symbols. One iteration may consume up to
-   * LZMA_IN_REQUIRED - 1 bytes.
-   */
-  while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc)) {
-    pos_state = s->dict.pos & s->lzma.pos_mask;
-
-    if (!rc_bit(&s->rc, &s->lzma.is_match[s->lzma.state][pos_state])) {
-      lzma_literal(s);
-    } else {
-      if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))
-        lzma_rep_match(s, pos_state);
-      else
-        lzma_match(s, pos_state);
-
-      if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))
-        return false;
-    }
-  }
-
-  /*
-   * Having the range decoder always normalized when we are outside
-   * this function makes it easier to correctly handle end of the chunk.
-   */
-  rc_normalize(&s->rc);
-
-  return true;
-}
-
-/*
- * Reset the LZMA decoder and range decoder state. Dictionary is not reset
- * here, because LZMA state may be reset without resetting the dictionary.
- */
-static void lzma_reset(struct xz_dec_lzma2 *s) {
-  uint16_t *probs;
-  size_t i;
-
-  s->lzma.state = STATE_LIT_LIT;
-  s->lzma.rep0 = 0;
-  s->lzma.rep1 = 0;
-  s->lzma.rep2 = 0;
-  s->lzma.rep3 = 0;
-  s->lzma.len = 0;
-
-  /*
-   * All probabilities are initialized to the same value. This hack
-   * makes the code smaller by avoiding a separate loop for each
-   * probability array.
-   *
-   * This could be optimized so that only that part of literal
-   * probabilities that are actually required. In the common case
-   * we would write 12 KiB less.
-   */
-  probs = s->lzma.is_match[0];
-  for (i = 0; i < PROBS_TOTAL; ++i)
-    probs[i] = RC_BIT_MODEL_TOTAL / 2;
-
-  rc_reset(&s->rc);
-}
-
-/*
- * Decode and validate LZMA properties (lc/lp/pb) and calculate the bit masks
- * from the decoded lp and pb values. On success, the LZMA decoder state is
- * reset and true is returned.
- */
-static bool lzma_props(struct xz_dec_lzma2 *s, uint8_t props) {
-  if (props > (4 * 5 + 4) * 9 + 8)
-    return false;
-
-  s->lzma.pos_mask = 0;
-  while (props >= 9 * 5) {
-    props -= 9 * 5;
-    ++s->lzma.pos_mask;
-  }
-
-  s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;
-
-  s->lzma.literal_pos_mask = 0;
-  while (props >= 9) {
-    props -= 9;
-    ++s->lzma.literal_pos_mask;
-  }
-
-  s->lzma.lc = props;
-
-  if (s->lzma.lc + s->lzma.literal_pos_mask > 4)
-    return false;
-
-  s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;
-
-  lzma_reset(s);
-
-  return true;
-}
-
-/*********
- * LZMA2 *
- *********/
-
-/*
- * The LZMA decoder assumes that if the input limit (s->rc.in_limit) hasn't
- * been exceeded, it is safe to read up to LZMA_IN_REQUIRED bytes. This
- * wrapper function takes care of making the LZMA decoder's assumption safe.
- *
- * As long as there is plenty of input left to be decoded in the current LZMA
- * chunk, we decode directly from the caller-supplied input buffer until
- * there's LZMA_IN_REQUIRED bytes left. Those remaining bytes are copied into
- * s->temp.buf, which (hopefully) gets filled on the next call to this
- * function. We decode a few bytes from the temporary buffer so that we can
- * continue decoding from the caller-supplied input buffer again.
- */
-static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b) {
-  size_t in_avail;
-  uint32_t tmp;
-
-  in_avail = b->in_size - b->in_pos;
-  if (s->temp.size > 0 || s->lzma2.compressed == 0) {
-    tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;
-    if (tmp > s->lzma2.compressed - s->temp.size)
-      tmp = s->lzma2.compressed - s->temp.size;
-    if (tmp > in_avail)
-      tmp = in_avail;
-
-    memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);
-
-    if (s->temp.size + tmp == s->lzma2.compressed) {
-      memzero(s->temp.buf + s->temp.size + tmp,
-              sizeof(s->temp.buf) - s->temp.size - tmp);
-      s->rc.in_limit = s->temp.size + tmp;
-    } else if (s->temp.size + tmp < LZMA_IN_REQUIRED) {
-      s->temp.size += tmp;
-      b->in_pos += tmp;
-      return true;
-    } else {
-      s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;
-    }
-
-    s->rc.in = s->temp.buf;
-    s->rc.in_pos = 0;
-
-    if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)
-      return false;
-
-    s->lzma2.compressed -= s->rc.in_pos;
-
-    if (s->rc.in_pos < s->temp.size) {
-      s->temp.size -= s->rc.in_pos;
-      memmove(s->temp.buf, s->temp.buf + s->rc.in_pos, s->temp.size);
-      return true;
-    }
-
-    b->in_pos += s->rc.in_pos - s->temp.size;
-    s->temp.size = 0;
-  }
-
-  in_avail = b->in_size - b->in_pos;
-  if (in_avail >= LZMA_IN_REQUIRED) {
-    s->rc.in = b->in;
-    s->rc.in_pos = b->in_pos;
-
-    if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)
-      s->rc.in_limit = b->in_pos + s->lzma2.compressed;
-    else
-      s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;
-
-    if (!lzma_main(s))
-      return false;
-
-    in_avail = s->rc.in_pos - b->in_pos;
-    if (in_avail > s->lzma2.compressed)
-      return false;
-
-    s->lzma2.compressed -= in_avail;
-    b->in_pos = s->rc.in_pos;
-  }
-
-  in_avail = b->in_size - b->in_pos;
-  if (in_avail < LZMA_IN_REQUIRED) {
-    if (in_avail > s->lzma2.compressed)
-      in_avail = s->lzma2.compressed;
-
-    memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
-    s->temp.size = in_avail;
-    b->in_pos += in_avail;
-  }
-
-  return true;
-}
-
-/*
- * Take care of the LZMA2 control layer, and forward the job of actual LZMA
- * decoding or copying of uncompressed chunks to other functions.
- */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
-                                       struct xz_buf *b) {
-  uint32_t tmp;
-
-  while (b->in_pos < b->in_size || s->lzma2.sequence == SEQ_LZMA_RUN) {
-    switch (s->lzma2.sequence) {
-    case SEQ_CONTROL:
-      /*
-       * LZMA2 control byte
-       *
-       * Exact values:
-       *   0x00   End marker
-       *   0x01   Dictionary reset followed by
-       *          an uncompressed chunk
-       *   0x02   Uncompressed chunk (no dictionary reset)
-       *
-       * Highest three bits (s->control & 0xE0):
-       *   0xE0   Dictionary reset, new properties and state
-       *          reset, followed by LZMA compressed chunk
-       *   0xC0   New properties and state reset, followed
-       *          by LZMA compressed chunk (no dictionary
-       *          reset)
-       *   0xA0   State reset using old properties,
-       *          followed by LZMA compressed chunk (no
-       *          dictionary reset)
-       *   0x80   LZMA chunk (no dictionary or state reset)
-       *
-       * For LZMA compressed chunks, the lowest five bits
-       * (s->control & 1F) are the highest bits of the
-       * uncompressed size (bits 16-20).
-       *
-       * A new LZMA2 stream must begin with a dictionary
-       * reset. The first LZMA chunk must set new
-       * properties and reset the LZMA state.
-       *
-       * Values that don't match anything described above
-       * are invalid and we return XZ_DATA_ERROR.
-       */
-      tmp = b->in[b->in_pos++];
-
-      if (tmp == 0x00)
-        return XZ_STREAM_END;
-
-      if (tmp >= 0xE0 || tmp == 0x01) {
-        s->lzma2.need_props = true;
-        s->lzma2.need_dict_reset = false;
-        dict_reset(&s->dict, b);
-      } else if (s->lzma2.need_dict_reset) {
-        return XZ_DATA_ERROR;
-      }
-
-      if (tmp >= 0x80) {
-        s->lzma2.uncompressed = (tmp & 0x1F) << 16;
-        s->lzma2.sequence = SEQ_UNCOMPRESSED_1;
-
-        if (tmp >= 0xC0) {
-          /*
-           * When there are new properties,
-           * state reset is done at
-           * SEQ_PROPERTIES.
-           */
-          s->lzma2.need_props = false;
-          s->lzma2.next_sequence = SEQ_PROPERTIES;
-
-        } else if (s->lzma2.need_props) {
-          return XZ_DATA_ERROR;
-
-        } else {
-          s->lzma2.next_sequence = SEQ_LZMA_PREPARE;
-          if (tmp >= 0xA0)
-            lzma_reset(s);
-        }
-      } else {
-        if (tmp > 0x02)
-          return XZ_DATA_ERROR;
-
-        s->lzma2.sequence = SEQ_COMPRESSED_0;
-        s->lzma2.next_sequence = SEQ_COPY;
-      }
-
-      break;
-
-    case SEQ_UNCOMPRESSED_1:
-      s->lzma2.uncompressed += (uint32_t)b->in[b->in_pos++] << 8;
-      s->lzma2.sequence = SEQ_UNCOMPRESSED_2;
-      break;
-
-    case SEQ_UNCOMPRESSED_2:
-      s->lzma2.uncompressed += (uint32_t)b->in[b->in_pos++] + 1;
-      s->lzma2.sequence = SEQ_COMPRESSED_0;
-      break;
-
-    case SEQ_COMPRESSED_0:
-      s->lzma2.compressed = (uint32_t)b->in[b->in_pos++] << 8;
-      s->lzma2.sequence = SEQ_COMPRESSED_1;
-      break;
-
-    case SEQ_COMPRESSED_1:
-      s->lzma2.compressed += (uint32_t)b->in[b->in_pos++] + 1;
-      s->lzma2.sequence = s->lzma2.next_sequence;
-      break;
-
-    case SEQ_PROPERTIES:
-      if (!lzma_props(s, b->in[b->in_pos++]))
-        return XZ_DATA_ERROR;
-
-      s->lzma2.sequence = SEQ_LZMA_PREPARE;
-
-      fallthrough;
-
-    case SEQ_LZMA_PREPARE:
-      if (s->lzma2.compressed < RC_INIT_BYTES)
-        return XZ_DATA_ERROR;
-
-      if (!rc_read_init(&s->rc, b))
-        return XZ_OK;
-
-      s->lzma2.compressed -= RC_INIT_BYTES;
-      s->lzma2.sequence = SEQ_LZMA_RUN;
-
-      fallthrough;
-
-    case SEQ_LZMA_RUN:
-      /*
-       * Set dictionary limit to indicate how much we want
-       * to be encoded at maximum. Decode new data into the
-       * dictionary. Flush the new data from dictionary to
-       * b->out. Check if we finished decoding this chunk.
-       * In case the dictionary got full but we didn't fill
-       * the output buffer yet, we may run this loop
-       * multiple times without changing s->lzma2.sequence.
-       */
-      dict_limit(&s->dict, min_t(size_t, b->out_size - b->out_pos,
-                                 s->lzma2.uncompressed));
-      if (!lzma2_lzma(s, b))
-        return XZ_DATA_ERROR;
-
-      s->lzma2.uncompressed -= dict_flush(&s->dict, b);
-
-      if (s->lzma2.uncompressed == 0) {
-        if (s->lzma2.compressed > 0 || s->lzma.len > 0 ||
-            !rc_is_finished(&s->rc))
-          return XZ_DATA_ERROR;
-
-        rc_reset(&s->rc);
-        s->lzma2.sequence = SEQ_CONTROL;
-
-      } else if (b->out_pos == b->out_size ||
-                 (b->in_pos == b->in_size &&
-                  s->temp.size < s->lzma2.compressed)) {
-        return XZ_OK;
-      }
-
-      break;
-
-    case SEQ_COPY:
-      dict_uncompressed(&s->dict, b, &s->lzma2.compressed);
-      if (s->lzma2.compressed > 0)
-        return XZ_OK;
-
-      s->lzma2.sequence = SEQ_CONTROL;
-      break;
-    }
-  }
-
-  return XZ_OK;
-}
-
-XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
-                                                   uint32_t dict_max) {
-  struct xz_dec_lzma2 *s = kmalloc(sizeof(*s), GFP_KERNEL);
-  if (s == NULL)
-    return NULL;
-
-  s->dict.mode = mode;
-  s->dict.size_max = dict_max;
-
-  if (DEC_IS_PREALLOC(mode)) {
-    s->dict.buf = vmalloc(dict_max);
-    if (s->dict.buf == NULL) {
-      kfree(s);
-      return NULL;
-    }
-  } else if (DEC_IS_DYNALLOC(mode)) {
-    s->dict.buf = NULL;
-    s->dict.allocated = 0;
-  }
-
-  return s;
-}
-
-XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s,
-                                         uint8_t props) {
-  /* This limits dictionary size to 3 GiB to keep parsing simpler. */
-  if (props > 39)
-    return XZ_OPTIONS_ERROR;
-
-  s->dict.size = 2 + (props & 1);
-  s->dict.size <<= (props >> 1) + 11;
-
-  if (DEC_IS_MULTI(s->dict.mode)) {
-    if (s->dict.size > s->dict.size_max)
-      return XZ_MEMLIMIT_ERROR;
-
-    s->dict.end = s->dict.size;
-
-    if (DEC_IS_DYNALLOC(s->dict.mode)) {
-      if (s->dict.allocated < s->dict.size) {
-        s->dict.allocated = s->dict.size;
-        vfree(s->dict.buf);
-        s->dict.buf = vmalloc(s->dict.size);
-        if (s->dict.buf == NULL) {
-          s->dict.allocated = 0;
-          return XZ_MEM_ERROR;
-        }
-      }
-    }
-  }
-
-  s->lzma2.sequence = SEQ_CONTROL;
-  s->lzma2.need_dict_reset = true;
-
-  s->temp.size = 0;
-
-  return XZ_OK;
-}
-
-XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s) {
-  if (DEC_IS_MULTI(s->dict.mode))
-    vfree(s->dict.buf);
-
-  kfree(s);
-}
-
-#ifdef XZ_DEC_MICROLZMA
-/* This is a wrapper struct to have a nice struct name in the public API. */
-struct xz_dec_microlzma {
-  struct xz_dec_lzma2 s;
-};
-
-XZ_EXTERN enum xz_ret xz_dec_microlzma_run(struct xz_dec_microlzma *s_ptr,
-                                           struct xz_buf *b) {
-  struct xz_dec_lzma2 *s = &s_ptr->s;
-
-  /*
-   * sequence is SEQ_PROPERTIES before the first input byte,
-   * SEQ_LZMA_PREPARE until a total of five bytes have been read,
-   * and SEQ_LZMA_RUN for the rest of the input stream.
-   */
-  if (s->lzma2.sequence != SEQ_LZMA_RUN) {
-    if (s->lzma2.sequence == SEQ_PROPERTIES) {
-      /* One byte is needed for the props. */
-      if (b->in_pos >= b->in_size)
-        return XZ_OK;
-
-      /*
-       * Don't increment b->in_pos here. The same byte is
-       * also passed to rc_read_init() which will ignore it.
-       */
-      if (!lzma_props(s, ~b->in[b->in_pos]))
-        return XZ_DATA_ERROR;
-
-      s->lzma2.sequence = SEQ_LZMA_PREPARE;
-    }
-
-    /*
-     * xz_dec_microlzma_reset() doesn't validate the compressed
-     * size so we do it here. We have to limit the maximum size
-     * to avoid integer overflows in lzma2_lzma(). 3 GiB is a nice
-     * round number and much more than users of this code should
-     * ever need.
-     */
-    if (s->lzma2.compressed < RC_INIT_BYTES || s->lzma2.compressed > (3U << 30))
-      return XZ_DATA_ERROR;
-
-    if (!rc_read_init(&s->rc, b))
-      return XZ_OK;
-
-    s->lzma2.compressed -= RC_INIT_BYTES;
-    s->lzma2.sequence = SEQ_LZMA_RUN;
-
-    dict_reset(&s->dict, b);
-  }
-
-  /* This is to allow increasing b->out_size between calls. */
-  if (DEC_IS_SINGLE(s->dict.mode))
-    s->dict.end = b->out_size - b->out_pos;
-
-  while (true) {
-    dict_limit(&s->dict,
-               min_t(size_t, b->out_size - b->out_pos, s->lzma2.uncompressed));
-
-    if (!lzma2_lzma(s, b))
-      return XZ_DATA_ERROR;
-
-    s->lzma2.uncompressed -= dict_flush(&s->dict, b);
-
-    if (s->lzma2.uncompressed == 0) {
-      if (s->lzma2.pedantic_microlzma) {
-        if (s->lzma2.compressed > 0 || s->lzma.len > 0 ||
-            !rc_is_finished(&s->rc))
-          return XZ_DATA_ERROR;
-      }
-
-      return XZ_STREAM_END;
-    }
-
-    if (b->out_pos == b->out_size)
-      return XZ_OK;
-
-    if (b->in_pos == b->in_size && s->temp.size < s->lzma2.compressed)
-      return XZ_OK;
-  }
-}
-
-XZ_EXTERN struct xz_dec_microlzma *xz_dec_microlzma_alloc(enum xz_mode mode,
-                                                          uint32_t dict_size) {
-  struct xz_dec_microlzma *s;
-
-  /* Restrict dict_size to the same range as in the LZMA2 code. */
-  if (dict_size < 4096 || dict_size > (3U << 30))
-    return NULL;
-
-  s = kmalloc(sizeof(*s), GFP_KERNEL);
-  if (s == NULL)
-    return NULL;
-
-  s->s.dict.mode = mode;
-  s->s.dict.size = dict_size;
-
-  if (DEC_IS_MULTI(mode)) {
-    s->s.dict.end = dict_size;
-
-    s->s.dict.buf = vmalloc(dict_size);
-    if (s->s.dict.buf == NULL) {
-      kfree(s);
-      return NULL;
-    }
-  }
-
-  return s;
-}
-
-XZ_EXTERN void xz_dec_microlzma_reset(struct xz_dec_microlzma *s,
-                                      uint32_t comp_size, uint32_t uncomp_size,
-                                      int uncomp_size_is_exact) {
-  /*
-   * comp_size is validated in xz_dec_microlzma_run().
-   * uncomp_size can safely be anything.
-   */
-  s->s.lzma2.compressed = comp_size;
-  s->s.lzma2.uncompressed = uncomp_size;
-  s->s.lzma2.pedantic_microlzma = uncomp_size_is_exact;
-
-  s->s.lzma2.sequence = SEQ_PROPERTIES;
-  s->s.temp.size = 0;
-}
-
-XZ_EXTERN void xz_dec_microlzma_end(struct xz_dec_microlzma *s) {
-  if (DEC_IS_MULTI(s->s.dict.mode))
-    vfree(s->s.dict.buf);
-
-  kfree(s);
-}
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_dec_stream.c b/app/src/main/cpp/xz/xz_embedded/xz_dec_stream.c
deleted file mode 100644
index 648ba7901..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_dec_stream.c
+++ /dev/null
@@ -1,945 +0,0 @@
-// SPDX-License-Identifier: 0BSD
-
-/*
- * .xz Stream decoder
- *
- * Author: Lasse Collin <lasse.collin@tukaani.org>
- */
-
-#include "xz_private.h"
-#include "xz_stream.h"
-
-#ifdef XZ_USE_CRC64
-#define IS_CRC64(check_type) ((check_type) == XZ_CHECK_CRC64)
-#else
-#define IS_CRC64(check_type) false
-#endif
-
-#ifdef XZ_USE_SHA256
-#define IS_SHA256(check_type) ((check_type) == XZ_CHECK_SHA256)
-#else
-#define IS_SHA256(check_type) false
-#endif
-
-/* Hash used to validate the Index field */
-struct xz_dec_hash {
-  vli_type unpadded;
-  vli_type uncompressed;
-  uint32_t crc32;
-};
-
-struct xz_dec {
-  /* Position in dec_main() */
-  enum {
-    SEQ_STREAM_HEADER,
-    SEQ_BLOCK_START,
-    SEQ_BLOCK_HEADER,
-    SEQ_BLOCK_UNCOMPRESS,
-    SEQ_BLOCK_PADDING,
-    SEQ_BLOCK_CHECK,
-    SEQ_INDEX,
-    SEQ_INDEX_PADDING,
-    SEQ_INDEX_CRC32,
-    SEQ_STREAM_FOOTER,
-    SEQ_STREAM_PADDING
-  } sequence;
-
-  /* Position in variable-length integers and Check fields */
-  uint32_t pos;
-
-  /* Variable-length integer decoded by dec_vli() */
-  vli_type vli;
-
-  /* Saved in_pos and out_pos */
-  size_t in_start;
-  size_t out_start;
-
-#ifdef XZ_USE_CRC64
-  /* CRC32 or CRC64 value in Block or CRC32 value in Index */
-  uint64_t crc;
-#else
-  /* CRC32 value in Block or Index */
-  uint32_t crc;
-#endif
-
-  /* Type of the integrity check calculated from uncompressed data */
-  enum xz_check check_type;
-
-  /* Operation mode */
-  enum xz_mode mode;
-
-  /*
-   * True if the next call to xz_dec_run() is allowed to return
-   * XZ_BUF_ERROR.
-   */
-  bool allow_buf_error;
-
-  /* Information stored in Block Header */
-  struct {
-    /*
-     * Value stored in the Compressed Size field, or
-     * VLI_UNKNOWN if Compressed Size is not present.
-     */
-    vli_type compressed;
-
-    /*
-     * Value stored in the Uncompressed Size field, or
-     * VLI_UNKNOWN if Uncompressed Size is not present.
-     */
-    vli_type uncompressed;
-
-    /* Size of the Block Header field */
-    uint32_t size;
-  } block_header;
-
-  /* Information collected when decoding Blocks */
-  struct {
-    /* Observed compressed size of the current Block */
-    vli_type compressed;
-
-    /* Observed uncompressed size of the current Block */
-    vli_type uncompressed;
-
-    /* Number of Blocks decoded so far */
-    vli_type count;
-
-    /*
-     * Hash calculated from the Block sizes. This is used to
-     * validate the Index field.
-     */
-    struct xz_dec_hash hash;
-  } block;
-
-  /* Variables needed when verifying the Index field */
-  struct {
-    /* Position in dec_index() */
-    enum {
-      SEQ_INDEX_COUNT,
-      SEQ_INDEX_UNPADDED,
-      SEQ_INDEX_UNCOMPRESSED
-    } sequence;
-
-    /* Size of the Index in bytes */
-    vli_type size;
-
-    /* Number of Records (matches block.count in valid files) */
-    vli_type count;
-
-    /*
-     * Hash calculated from the Records (matches block.hash in
-     * valid files).
-     */
-    struct xz_dec_hash hash;
-  } index;
-
-  /*
-   * Temporary buffer needed to hold Stream Header, Block Header,
-   * and Stream Footer. The Block Header is the biggest (1 KiB)
-   * so we reserve space according to that. buf[] has to be aligned
-   * to a multiple of four bytes; the size_t variables before it
-   * should guarantee this.
-   */
-  struct {
-    size_t pos;
-    size_t size;
-    uint8_t buf[1024];
-  } temp;
-
-  struct xz_dec_lzma2 *lzma2;
-
-#ifdef XZ_DEC_BCJ
-  struct xz_dec_bcj *bcj;
-  bool bcj_active;
-#endif
-
-#ifdef XZ_USE_SHA256
-  /*
-   * SHA-256 value in Block
-   *
-   * struct xz_sha256 is over a hundred bytes and it's only accessed
-   * from a few places. By putting the SHA-256 state near the end
-   * of struct xz_dec (somewhere after the "index" member) reduces
-   * code size at least on x86 and RISC-V. It's because the first bytes
-   * of the struct can be accessed with smaller instructions; the
-   * members that are accessed from many places should be at the top.
-   */
-  struct xz_sha256 sha256;
-#endif
-};
-
-#if defined(XZ_DEC_ANY_CHECK) || defined(XZ_USE_SHA256)
-/* Sizes of the Check field with different Check IDs */
-static const uint8_t check_sizes[16] = {0,  4,  4,  4,  8,  8,  8,  16,
-                                        16, 16, 32, 32, 32, 64, 64, 64};
-#endif
-
-/*
- * Fill s->temp by copying data starting from b->in[b->in_pos]. Caller
- * must have set s->temp.pos and s->temp.size to indicate how much data
- * we are supposed to copy into s->temp.buf. Return true once s->temp.pos
- * has reached s->temp.size.
- */
-static bool fill_temp(struct xz_dec *s, struct xz_buf *b) {
-  size_t copy_size =
-      min_t(size_t, b->in_size - b->in_pos, s->temp.size - s->temp.pos);
-
-  memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);
-  b->in_pos += copy_size;
-  s->temp.pos += copy_size;
-
-  if (s->temp.pos == s->temp.size) {
-    s->temp.pos = 0;
-    return true;
-  }
-
-  return false;
-}
-
-/* Decode a variable-length integer (little-endian base-128 encoding) */
-static enum xz_ret dec_vli(struct xz_dec *s, const uint8_t *in, size_t *in_pos,
-                           size_t in_size) {
-  uint8_t byte;
-
-  if (s->pos == 0)
-    s->vli = 0;
-
-  while (*in_pos < in_size) {
-    byte = in[*in_pos];
-    ++*in_pos;
-
-    s->vli |= (vli_type)(byte & 0x7F) << s->pos;
-
-    if ((byte & 0x80) == 0) {
-      /* Don't allow non-minimal encodings. */
-      if (byte == 0 && s->pos != 0)
-        return XZ_DATA_ERROR;
-
-      s->pos = 0;
-      return XZ_STREAM_END;
-    }
-
-    s->pos += 7;
-    if (s->pos == 7 * VLI_BYTES_MAX)
-      return XZ_DATA_ERROR;
-  }
-
-  return XZ_OK;
-}
-
-/*
- * Decode the Compressed Data field from a Block. Update and validate
- * the observed compressed and uncompressed sizes of the Block so that
- * they don't exceed the values possibly stored in the Block Header
- * (validation assumes that no integer overflow occurs, since vli_type
- * is normally uint64_t). Update the CRC32 or CRC64 value if presence of
- * the CRC32 or CRC64 field was indicated in Stream Header.
- *
- * Once the decoding is finished, validate that the observed sizes match
- * the sizes possibly stored in the Block Header. Update the hash and
- * Block count, which are later used to validate the Index field.
- */
-static enum xz_ret dec_block(struct xz_dec *s, struct xz_buf *b) {
-  enum xz_ret ret;
-
-  s->in_start = b->in_pos;
-  s->out_start = b->out_pos;
-
-#ifdef XZ_DEC_BCJ
-  if (s->bcj_active)
-    ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);
-  else
-#endif
-    ret = xz_dec_lzma2_run(s->lzma2, b);
-
-  s->block.compressed += b->in_pos - s->in_start;
-  s->block.uncompressed += b->out_pos - s->out_start;
-
-  /*
-   * There is no need to separately check for VLI_UNKNOWN, since
-   * the observed sizes are always smaller than VLI_UNKNOWN.
-   */
-  if (s->block.compressed > s->block_header.compressed ||
-      s->block.uncompressed > s->block_header.uncompressed)
-    return XZ_DATA_ERROR;
-
-  if (s->check_type == XZ_CHECK_CRC32)
-    s->crc = xz_crc32(b->out + s->out_start, b->out_pos - s->out_start, s->crc);
-#ifdef XZ_USE_CRC64
-  else if (s->check_type == XZ_CHECK_CRC64)
-    s->crc = xz_crc64(b->out + s->out_start, b->out_pos - s->out_start, s->crc);
-#endif
-#ifdef XZ_USE_SHA256
-  else if (s->check_type == XZ_CHECK_SHA256)
-    xz_sha256_update(b->out + s->out_start, b->out_pos - s->out_start,
-                     &s->sha256);
-#endif
-
-  if (ret == XZ_STREAM_END) {
-    if (s->block_header.compressed != VLI_UNKNOWN &&
-        s->block_header.compressed != s->block.compressed)
-      return XZ_DATA_ERROR;
-
-    if (s->block_header.uncompressed != VLI_UNKNOWN &&
-        s->block_header.uncompressed != s->block.uncompressed)
-      return XZ_DATA_ERROR;
-
-    s->block.hash.unpadded += s->block_header.size + s->block.compressed;
-
-#if defined(XZ_DEC_ANY_CHECK) || defined(XZ_USE_SHA256)
-    s->block.hash.unpadded += check_sizes[s->check_type];
-#else
-    if (s->check_type == XZ_CHECK_CRC32)
-      s->block.hash.unpadded += 4;
-    else if (IS_CRC64(s->check_type))
-      s->block.hash.unpadded += 8;
-#endif
-
-    s->block.hash.uncompressed += s->block.uncompressed;
-    s->block.hash.crc32 = xz_crc32((const uint8_t *)&s->block.hash,
-                                   sizeof(s->block.hash), s->block.hash.crc32);
-
-    ++s->block.count;
-  }
-
-  return ret;
-}
-
-/* Update the Index size and the CRC32 value. */
-static void index_update(struct xz_dec *s, const struct xz_buf *b) {
-  size_t in_used = b->in_pos - s->in_start;
-  s->index.size += in_used;
-  s->crc = xz_crc32(b->in + s->in_start, in_used, s->crc);
-}
-
-/*
- * Decode the Number of Records, Unpadded Size, and Uncompressed Size
- * fields from the Index field. That is, Index Padding and CRC32 are not
- * decoded by this function.
- *
- * This can return XZ_OK (more input needed), XZ_STREAM_END (everything
- * successfully decoded), or XZ_DATA_ERROR (input is corrupt).
- */
-static enum xz_ret dec_index(struct xz_dec *s, struct xz_buf *b) {
-  enum xz_ret ret;
-
-  do {
-    ret = dec_vli(s, b->in, &b->in_pos, b->in_size);
-    if (ret != XZ_STREAM_END) {
-      index_update(s, b);
-      return ret;
-    }
-
-    switch (s->index.sequence) {
-    case SEQ_INDEX_COUNT:
-      s->index.count = s->vli;
-
-      /*
-       * Validate that the Number of Records field
-       * indicates the same number of Records as
-       * there were Blocks in the Stream.
-       */
-      if (s->index.count != s->block.count)
-        return XZ_DATA_ERROR;
-
-      s->index.sequence = SEQ_INDEX_UNPADDED;
-      break;
-
-    case SEQ_INDEX_UNPADDED:
-      s->index.hash.unpadded += s->vli;
-      s->index.sequence = SEQ_INDEX_UNCOMPRESSED;
-      break;
-
-    case SEQ_INDEX_UNCOMPRESSED:
-      s->index.hash.uncompressed += s->vli;
-      s->index.hash.crc32 =
-          xz_crc32((const uint8_t *)&s->index.hash, sizeof(s->index.hash),
-                   s->index.hash.crc32);
-      --s->index.count;
-      s->index.sequence = SEQ_INDEX_UNPADDED;
-      break;
-    }
-  } while (s->index.count > 0);
-
-  return XZ_STREAM_END;
-}
-
-/*
- * Validate that the next four or eight input bytes match the value
- * of s->crc. s->pos must be zero when starting to validate the first byte.
- * The "bits" argument allows using the same code for both CRC32 and CRC64.
- */
-static enum xz_ret crc_validate(struct xz_dec *s, struct xz_buf *b,
-                                uint32_t bits) {
-  do {
-    if (b->in_pos == b->in_size)
-      return XZ_OK;
-
-    if (((s->crc >> s->pos) & 0xFF) != b->in[b->in_pos++])
-      return XZ_DATA_ERROR;
-
-    s->pos += 8;
-
-  } while (s->pos < bits);
-
-  s->crc = 0;
-  s->pos = 0;
-
-  return XZ_STREAM_END;
-}
-
-#ifdef XZ_DEC_ANY_CHECK
-/*
- * Skip over the Check field when the Check ID is not supported.
- * Returns true once the whole Check field has been skipped over.
- */
-static bool check_skip(struct xz_dec *s, struct xz_buf *b) {
-  while (s->pos < check_sizes[s->check_type]) {
-    if (b->in_pos == b->in_size)
-      return false;
-
-    ++b->in_pos;
-    ++s->pos;
-  }
-
-  s->pos = 0;
-
-  return true;
-}
-#endif
-
-/* Decode the Stream Header field (the first 12 bytes of the .xz Stream). */
-static enum xz_ret dec_stream_header(struct xz_dec *s) {
-  if (!memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))
-    return XZ_FORMAT_ERROR;
-
-  if (xz_crc32(s->temp.buf + HEADER_MAGIC_SIZE, 2, 0) !=
-      get_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2))
-    return XZ_DATA_ERROR;
-
-  if (s->temp.buf[HEADER_MAGIC_SIZE] != 0)
-    return XZ_OPTIONS_ERROR;
-
-  /*
-   * Of integrity checks, we support none (Check ID = 0),
-   * CRC32 (Check ID = 1), and optionally CRC64 (Check ID = 4).
-   * However, if XZ_DEC_ANY_CHECK is defined, we will accept other
-   * check types too, but then the check won't be verified and
-   * a warning (XZ_UNSUPPORTED_CHECK) will be given.
-   */
-  if (s->temp.buf[HEADER_MAGIC_SIZE + 1] > XZ_CHECK_MAX)
-    return XZ_OPTIONS_ERROR;
-
-  s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];
-
-  if (s->check_type > XZ_CHECK_CRC32 && !IS_CRC64(s->check_type) &&
-      !IS_SHA256(s->check_type)) {
-#ifdef XZ_DEC_ANY_CHECK
-    return XZ_UNSUPPORTED_CHECK;
-#else
-    return XZ_OPTIONS_ERROR;
-#endif
-  }
-
-  return XZ_OK;
-}
-
-/* Decode the Stream Footer field (the last 12 bytes of the .xz Stream) */
-static enum xz_ret dec_stream_footer(struct xz_dec *s) {
-  if (!memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))
-    return XZ_DATA_ERROR;
-
-  if (xz_crc32(s->temp.buf + 4, 6, 0) != get_le32(s->temp.buf))
-    return XZ_DATA_ERROR;
-
-  /*
-   * Validate Backward Size. Note that we never added the size of the
-   * Index CRC32 field to s->index.size, thus we use s->index.size / 4
-   * instead of s->index.size / 4 - 1.
-   */
-  if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))
-    return XZ_DATA_ERROR;
-
-  if (s->temp.buf[8] != 0 || s->temp.buf[9] != s->check_type)
-    return XZ_DATA_ERROR;
-
-  /*
-   * Use XZ_STREAM_END instead of XZ_OK to be more convenient
-   * for the caller.
-   */
-  return XZ_STREAM_END;
-}
-
-/* Decode the Block Header and initialize the filter chain. */
-static enum xz_ret dec_block_header(struct xz_dec *s) {
-  enum xz_ret ret;
-
-  /*
-   * Validate the CRC32. We know that the temp buffer is at least
-   * eight bytes so this is safe.
-   */
-  s->temp.size -= 4;
-  if (xz_crc32(s->temp.buf, s->temp.size, 0) !=
-      get_le32(s->temp.buf + s->temp.size))
-    return XZ_DATA_ERROR;
-
-  s->temp.pos = 2;
-
-  /*
-   * Catch unsupported Block Flags. We support only one or two filters
-   * in the chain, so we catch that with the same test.
-   */
-#ifdef XZ_DEC_BCJ
-  if (s->temp.buf[1] & 0x3E)
-#else
-  if (s->temp.buf[1] & 0x3F)
-#endif
-    return XZ_OPTIONS_ERROR;
-
-  /* Compressed Size */
-  if (s->temp.buf[1] & 0x40) {
-    if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size) != XZ_STREAM_END)
-      return XZ_DATA_ERROR;
-
-    s->block_header.compressed = s->vli;
-  } else {
-    s->block_header.compressed = VLI_UNKNOWN;
-  }
-
-  /* Uncompressed Size */
-  if (s->temp.buf[1] & 0x80) {
-    if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size) != XZ_STREAM_END)
-      return XZ_DATA_ERROR;
-
-    s->block_header.uncompressed = s->vli;
-  } else {
-    s->block_header.uncompressed = VLI_UNKNOWN;
-  }
-
-#ifdef XZ_DEC_BCJ
-  /* If there are two filters, the first one must be a BCJ filter. */
-  s->bcj_active = s->temp.buf[1] & 0x01;
-  if (s->bcj_active) {
-    if (s->temp.size - s->temp.pos < 2)
-      return XZ_OPTIONS_ERROR;
-
-    ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);
-    if (ret != XZ_OK)
-      return ret;
-
-    /*
-     * We don't support custom start offset,
-     * so Size of Properties must be zero.
-     */
-    if (s->temp.buf[s->temp.pos++] != 0x00)
-      return XZ_OPTIONS_ERROR;
-  }
-#endif
-
-  /* Valid Filter Flags always take at least two bytes. */
-  if (s->temp.size - s->temp.pos < 2)
-    return XZ_DATA_ERROR;
-
-  /* Filter ID = LZMA2 */
-  if (s->temp.buf[s->temp.pos++] != 0x21)
-    return XZ_OPTIONS_ERROR;
-
-  /* Size of Properties = 1-byte Filter Properties */
-  if (s->temp.buf[s->temp.pos++] != 0x01)
-    return XZ_OPTIONS_ERROR;
-
-  /* Filter Properties contains LZMA2 dictionary size. */
-  if (s->temp.size - s->temp.pos < 1)
-    return XZ_DATA_ERROR;
-
-  ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);
-  if (ret != XZ_OK)
-    return ret;
-
-  /* The rest must be Header Padding. */
-  while (s->temp.pos < s->temp.size)
-    if (s->temp.buf[s->temp.pos++] != 0x00)
-      return XZ_OPTIONS_ERROR;
-
-  s->temp.pos = 0;
-  s->block.compressed = 0;
-  s->block.uncompressed = 0;
-
-  return XZ_OK;
-}
-
-static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) {
-  enum xz_ret ret;
-
-  /*
-   * Store the start position for the case when we are in the middle
-   * of the Index field.
-   */
-  s->in_start = b->in_pos;
-
-  while (true) {
-    switch (s->sequence) {
-    case SEQ_STREAM_HEADER:
-      /*
-       * Stream Header is copied to s->temp, and then
-       * decoded from there. This way if the caller
-       * gives us only little input at a time, we can
-       * still keep the Stream Header decoding code
-       * simple. Similar approach is used in many places
-       * in this file.
-       */
-      if (!fill_temp(s, b))
-        return XZ_OK;
-
-      /*
-       * If dec_stream_header() returns
-       * XZ_UNSUPPORTED_CHECK, it is still possible
-       * to continue decoding if working in multi-call
-       * mode. Thus, update s->sequence before calling
-       * dec_stream_header().
-       */
-      s->sequence = SEQ_BLOCK_START;
-
-      ret = dec_stream_header(s);
-      if (ret != XZ_OK)
-        return ret;
-
-      fallthrough;
-
-    case SEQ_BLOCK_START:
-      /* We need one byte of input to continue. */
-      if (b->in_pos == b->in_size)
-        return XZ_OK;
-
-      /* See if this is the beginning of the Index field. */
-      if (b->in[b->in_pos] == 0) {
-        s->in_start = b->in_pos++;
-        s->sequence = SEQ_INDEX;
-        break;
-      }
-
-      /*
-       * Calculate the size of the Block Header and
-       * prepare to decode it.
-       */
-      s->block_header.size = ((uint32_t)b->in[b->in_pos] + 1) * 4;
-
-      s->temp.size = s->block_header.size;
-      s->temp.pos = 0;
-      s->sequence = SEQ_BLOCK_HEADER;
-
-      fallthrough;
-
-    case SEQ_BLOCK_HEADER:
-      if (!fill_temp(s, b))
-        return XZ_OK;
-
-      ret = dec_block_header(s);
-      if (ret != XZ_OK)
-        return ret;
-
-#ifdef XZ_USE_SHA256
-      if (s->check_type == XZ_CHECK_SHA256)
-        xz_sha256_reset(&s->sha256);
-#endif
-
-      s->sequence = SEQ_BLOCK_UNCOMPRESS;
-
-      fallthrough;
-
-    case SEQ_BLOCK_UNCOMPRESS:
-      ret = dec_block(s, b);
-      if (ret != XZ_STREAM_END)
-        return ret;
-
-      s->sequence = SEQ_BLOCK_PADDING;
-
-      fallthrough;
-
-    case SEQ_BLOCK_PADDING:
-      /*
-       * Size of Compressed Data + Block Padding
-       * must be a multiple of four. We don't need
-       * s->block.compressed for anything else
-       * anymore, so we use it here to test the size
-       * of the Block Padding field.
-       */
-      while (s->block.compressed & 3) {
-        if (b->in_pos == b->in_size)
-          return XZ_OK;
-
-        if (b->in[b->in_pos++] != 0)
-          return XZ_DATA_ERROR;
-
-        ++s->block.compressed;
-      }
-
-      s->sequence = SEQ_BLOCK_CHECK;
-
-      fallthrough;
-
-    case SEQ_BLOCK_CHECK:
-      if (s->check_type == XZ_CHECK_CRC32) {
-        ret = crc_validate(s, b, 32);
-        if (ret != XZ_STREAM_END)
-          return ret;
-      } else if (IS_CRC64(s->check_type)) {
-        ret = crc_validate(s, b, 64);
-        if (ret != XZ_STREAM_END)
-          return ret;
-      }
-#ifdef XZ_USE_SHA256
-      else if (s->check_type == XZ_CHECK_SHA256) {
-        s->temp.size = 32;
-        if (!fill_temp(s, b))
-          return XZ_OK;
-
-        if (!xz_sha256_validate(s->temp.buf, &s->sha256))
-          return XZ_DATA_ERROR;
-
-        s->pos = 0;
-      }
-#endif
-#ifdef XZ_DEC_ANY_CHECK
-      else if (!check_skip(s, b)) {
-        return XZ_OK;
-      }
-#endif
-
-      s->sequence = SEQ_BLOCK_START;
-      break;
-
-    case SEQ_INDEX:
-      ret = dec_index(s, b);
-      if (ret != XZ_STREAM_END)
-        return ret;
-
-      s->sequence = SEQ_INDEX_PADDING;
-
-      fallthrough;
-
-    case SEQ_INDEX_PADDING:
-      while ((s->index.size + (b->in_pos - s->in_start)) & 3) {
-        if (b->in_pos == b->in_size) {
-          index_update(s, b);
-          return XZ_OK;
-        }
-
-        if (b->in[b->in_pos++] != 0)
-          return XZ_DATA_ERROR;
-      }
-
-      /* Finish the CRC32 value and Index size. */
-      index_update(s, b);
-
-      /* Compare the hashes to validate the Index field. */
-      if (!memeq(&s->block.hash, &s->index.hash, sizeof(s->block.hash)))
-        return XZ_DATA_ERROR;
-
-      s->sequence = SEQ_INDEX_CRC32;
-
-      fallthrough;
-
-    case SEQ_INDEX_CRC32:
-      ret = crc_validate(s, b, 32);
-      if (ret != XZ_STREAM_END)
-        return ret;
-
-      s->temp.size = STREAM_HEADER_SIZE;
-      s->sequence = SEQ_STREAM_FOOTER;
-
-      fallthrough;
-
-    case SEQ_STREAM_FOOTER:
-      if (!fill_temp(s, b))
-        return XZ_OK;
-
-      return dec_stream_footer(s);
-
-    case SEQ_STREAM_PADDING:
-      /* Never reached, only silencing a warning */
-      break;
-    }
-  }
-
-  /* Never reached */
-}
-
-/*
- * xz_dec_run() is a wrapper for dec_main() to handle some special cases in
- * multi-call and single-call decoding.
- *
- * In multi-call mode, we must return XZ_BUF_ERROR when it seems clear that we
- * are not going to make any progress anymore. This is to prevent the caller
- * from calling us infinitely when the input file is truncated or otherwise
- * corrupt. Since zlib-style API allows that the caller fills the input buffer
- * only when the decoder doesn't produce any new output, we have to be careful
- * to avoid returning XZ_BUF_ERROR too easily: XZ_BUF_ERROR is returned only
- * after the second consecutive call to xz_dec_run() that makes no progress.
- *
- * In single-call mode, if we couldn't decode everything and no error
- * occurred, either the input is truncated or the output buffer is too small.
- * Since we know that the last input byte never produces any output, we know
- * that if all the input was consumed and decoding wasn't finished, the file
- * must be corrupt. Otherwise the output buffer has to be too small or the
- * file is corrupt in a way that decoding it produces too big output.
- *
- * If single-call decoding fails, we reset b->in_pos and b->out_pos back to
- * their original values. This is because with some filter chains there won't
- * be any valid uncompressed data in the output buffer unless the decoding
- * actually succeeds (that's the price to pay of using the output buffer as
- * the workspace).
- */
-XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b) {
-  size_t in_start;
-  size_t out_start;
-  enum xz_ret ret;
-
-  if (DEC_IS_SINGLE(s->mode))
-    xz_dec_reset(s);
-
-  in_start = b->in_pos;
-  out_start = b->out_pos;
-  ret = dec_main(s, b);
-
-  if (DEC_IS_SINGLE(s->mode)) {
-    if (ret == XZ_OK)
-      ret = b->in_pos == b->in_size ? XZ_DATA_ERROR : XZ_BUF_ERROR;
-
-    if (ret != XZ_STREAM_END) {
-      b->in_pos = in_start;
-      b->out_pos = out_start;
-    }
-
-  } else if (ret == XZ_OK && in_start == b->in_pos && out_start == b->out_pos) {
-    if (s->allow_buf_error)
-      ret = XZ_BUF_ERROR;
-
-    s->allow_buf_error = true;
-  } else {
-    s->allow_buf_error = false;
-  }
-
-  return ret;
-}
-
-#ifdef XZ_DEC_CONCATENATED
-XZ_EXTERN enum xz_ret xz_dec_catrun(struct xz_dec *s, struct xz_buf *b,
-                                    int finish) {
-  enum xz_ret ret;
-
-  if (DEC_IS_SINGLE(s->mode)) {
-    xz_dec_reset(s);
-    finish = true;
-  }
-
-  while (true) {
-    if (s->sequence == SEQ_STREAM_PADDING) {
-      /*
-       * Skip Stream Padding. Its size must be a multiple
-       * of four bytes which is tracked with s->pos.
-       */
-      while (true) {
-        if (b->in_pos == b->in_size) {
-          /*
-           * Note that if we are repeatedly
-           * given no input and finish is false,
-           * we will keep returning XZ_OK even
-           * though no progress is being made.
-           * The lack of XZ_BUF_ERROR support
-           * isn't a problem here because a
-           * reasonable caller will eventually
-           * provide more input or set finish
-           * to true.
-           */
-          if (!finish)
-            return XZ_OK;
-
-          if (s->pos != 0)
-            return XZ_DATA_ERROR;
-
-          return XZ_STREAM_END;
-        }
-
-        if (b->in[b->in_pos] != 0x00) {
-          if (s->pos != 0)
-            return XZ_DATA_ERROR;
-
-          break;
-        }
-
-        ++b->in_pos;
-        s->pos = (s->pos + 1) & 3;
-      }
-
-      /*
-       * More input remains. It should be a new Stream.
-       *
-       * In single-call mode xz_dec_run() will always call
-       * xz_dec_reset(). Thus, we need to do it here only
-       * in multi-call mode.
-       */
-      if (DEC_IS_MULTI(s->mode))
-        xz_dec_reset(s);
-    }
-
-    ret = xz_dec_run(s, b);
-
-    if (ret != XZ_STREAM_END)
-      break;
-
-    s->sequence = SEQ_STREAM_PADDING;
-  }
-
-  return ret;
-}
-#endif
-
-XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max) {
-  struct xz_dec *s = kmalloc(sizeof(*s), GFP_KERNEL);
-  if (s == NULL)
-    return NULL;
-
-  s->mode = mode;
-
-#ifdef XZ_DEC_BCJ
-  s->bcj = xz_dec_bcj_create(DEC_IS_SINGLE(mode));
-  if (s->bcj == NULL)
-    goto error_bcj;
-#endif
-
-  s->lzma2 = xz_dec_lzma2_create(mode, dict_max);
-  if (s->lzma2 == NULL)
-    goto error_lzma2;
-
-  xz_dec_reset(s);
-  return s;
-
-error_lzma2:
-#ifdef XZ_DEC_BCJ
-  xz_dec_bcj_end(s->bcj);
-error_bcj:
-#endif
-  kfree(s);
-  return NULL;
-}
-
-XZ_EXTERN void xz_dec_reset(struct xz_dec *s) {
-  s->sequence = SEQ_STREAM_HEADER;
-  s->allow_buf_error = false;
-  s->pos = 0;
-  s->crc = 0;
-  memzero(&s->block, sizeof(s->block));
-  memzero(&s->index, sizeof(s->index));
-  s->temp.pos = 0;
-  s->temp.size = STREAM_HEADER_SIZE;
-}
-
-XZ_EXTERN void xz_dec_end(struct xz_dec *s) {
-  if (s != NULL) {
-    xz_dec_lzma2_end(s->lzma2);
-#ifdef XZ_DEC_BCJ
-    xz_dec_bcj_end(s->bcj);
-#endif
-    kfree(s);
-  }
-}
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_lzma2.h b/app/src/main/cpp/xz/xz_embedded/xz_lzma2.h
deleted file mode 100644
index 504f4722c..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_lzma2.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/* SPDX-License-Identifier: 0BSD */
-
-/*
- * LZMA2 definitions
- *
- * Authors: Lasse Collin <lasse.collin@tukaani.org>
- *          Igor Pavlov <https://7-zip.org/>
- */
-
-#ifndef XZ_LZMA2_H
-#define XZ_LZMA2_H
-
-/* Range coder constants */
-#define RC_SHIFT_BITS 8
-#define RC_TOP_BITS 24
-#define RC_TOP_VALUE (1 << RC_TOP_BITS)
-#define RC_BIT_MODEL_TOTAL_BITS 11
-#define RC_BIT_MODEL_TOTAL (1 << RC_BIT_MODEL_TOTAL_BITS)
-#define RC_MOVE_BITS 5
-
-/*
- * Maximum number of position states. A position state is the lowest pb
- * number of bits of the current uncompressed offset. In some places there
- * are different sets of probabilities for different position states.
- */
-#define POS_STATES_MAX (1 << 4)
-
-/*
- * This enum is used to track which LZMA symbols have occurred most recently
- * and in which order. This information is used to predict the next symbol.
- *
- * Symbols:
- *  - Literal: One 8-bit byte
- *  - Match: Repeat a chunk of data at some distance
- *  - Long repeat: Multi-byte match at a recently seen distance
- *  - Short repeat: One-byte repeat at a recently seen distance
- *
- * The symbol names are in from STATE_oldest_older_previous. REP means
- * either short or long repeated match, and NONLIT means any non-literal.
- */
-enum lzma_state {
-  STATE_LIT_LIT,
-  STATE_MATCH_LIT_LIT,
-  STATE_REP_LIT_LIT,
-  STATE_SHORTREP_LIT_LIT,
-  STATE_MATCH_LIT,
-  STATE_REP_LIT,
-  STATE_SHORTREP_LIT,
-  STATE_LIT_MATCH,
-  STATE_LIT_LONGREP,
-  STATE_LIT_SHORTREP,
-  STATE_NONLIT_MATCH,
-  STATE_NONLIT_REP
-};
-
-/* Total number of states */
-#define STATES 12
-
-/* The lowest 7 states indicate that the previous state was a literal. */
-#define LIT_STATES 7
-
-/* Indicate that the latest symbol was a literal. */
-static inline void lzma_state_literal(enum lzma_state *state) {
-  if (*state <= STATE_SHORTREP_LIT_LIT)
-    *state = STATE_LIT_LIT;
-  else if (*state <= STATE_LIT_SHORTREP)
-    *state -= 3;
-  else
-    *state -= 6;
-}
-
-/* Indicate that the latest symbol was a match. */
-static inline void lzma_state_match(enum lzma_state *state) {
-  *state = *state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;
-}
-
-/* Indicate that the latest state was a long repeated match. */
-static inline void lzma_state_long_rep(enum lzma_state *state) {
-  *state = *state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;
-}
-
-/* Indicate that the latest symbol was a short match. */
-static inline void lzma_state_short_rep(enum lzma_state *state) {
-  *state = *state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;
-}
-
-/* Test if the previous symbol was a literal. */
-static inline bool lzma_state_is_literal(enum lzma_state state) {
-  return state < LIT_STATES;
-}
-
-/* Each literal coder is divided in three sections:
- *   - 0x001-0x0FF: Without match byte
- *   - 0x101-0x1FF: With match byte; match bit is 0
- *   - 0x201-0x2FF: With match byte; match bit is 1
- *
- * Match byte is used when the previous LZMA symbol was something else than
- * a literal (that is, it was some kind of match).
- */
-#define LITERAL_CODER_SIZE 0x300
-
-/* Maximum number of literal coders */
-#define LITERAL_CODERS_MAX (1 << 4)
-
-/* Minimum length of a match is two bytes. */
-#define MATCH_LEN_MIN 2
-
-/* Match length is encoded with 4, 5, or 10 bits.
- *
- * Length   Bits
- *  2-9      4 = Choice=0 + 3 bits
- * 10-17     5 = Choice=1 + Choice2=0 + 3 bits
- * 18-273   10 = Choice=1 + Choice2=1 + 8 bits
- */
-#define LEN_LOW_BITS 3
-#define LEN_LOW_SYMBOLS (1 << LEN_LOW_BITS)
-#define LEN_MID_BITS 3
-#define LEN_MID_SYMBOLS (1 << LEN_MID_BITS)
-#define LEN_HIGH_BITS 8
-#define LEN_HIGH_SYMBOLS (1 << LEN_HIGH_BITS)
-#define LEN_SYMBOLS (LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS + LEN_HIGH_SYMBOLS)
-
-/*
- * Maximum length of a match is 273 which is a result of the encoding
- * described above.
- */
-#define MATCH_LEN_MAX (MATCH_LEN_MIN + LEN_SYMBOLS - 1)
-
-/*
- * Different sets of probabilities are used for match distances that have
- * very short match length: Lengths of 2, 3, and 4 bytes have a separate
- * set of probabilities for each length. The matches with longer length
- * use a shared set of probabilities.
- */
-#define DIST_STATES 4
-
-/*
- * Get the index of the appropriate probability array for decoding
- * the distance slot.
- */
-static inline uint32_t lzma_get_dist_state(uint32_t len) {
-  return len < DIST_STATES + MATCH_LEN_MIN ? len - MATCH_LEN_MIN
-                                           : DIST_STATES - 1;
-}
-
-/*
- * The highest two bits of a 32-bit match distance are encoded using six bits.
- * This six-bit value is called a distance slot. This way encoding a 32-bit
- * value takes 6-36 bits, larger values taking more bits.
- */
-#define DIST_SLOT_BITS 6
-#define DIST_SLOTS (1 << DIST_SLOT_BITS)
-
-/* Match distances up to 127 are fully encoded using probabilities. Since
- * the highest two bits (distance slot) are always encoded using six bits,
- * the distances 0-3 don't need any additional bits to encode, since the
- * distance slot itself is the same as the actual distance. DIST_MODEL_START
- * indicates the first distance slot where at least one additional bit is
- * needed.
- */
-#define DIST_MODEL_START 4
-
-/*
- * Match distances greater than 127 are encoded in three pieces:
- *   - distance slot: the highest two bits
- *   - direct bits: 2-26 bits below the highest two bits
- *   - alignment bits: four lowest bits
- *
- * Direct bits don't use any probabilities.
- *
- * The distance slot value of 14 is for distances 128-191.
- */
-#define DIST_MODEL_END 14
-
-/* Distance slots that indicate a distance <= 127. */
-#define FULL_DISTANCES_BITS (DIST_MODEL_END / 2)
-#define FULL_DISTANCES (1 << FULL_DISTANCES_BITS)
-
-/*
- * For match distances greater than 127, only the highest two bits and the
- * lowest four bits (alignment) is encoded using probabilities.
- */
-#define ALIGN_BITS 4
-#define ALIGN_SIZE (1 << ALIGN_BITS)
-#define ALIGN_MASK (ALIGN_SIZE - 1)
-
-/* Total number of all probability variables */
-#define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX * LITERAL_CODER_SIZE)
-
-/*
- * LZMA remembers the four most recent match distances. Reusing these
- * distances tends to take less space than re-encoding the actual
- * distance value.
- */
-#define REPS 4
-
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_private.h b/app/src/main/cpp/xz/xz_embedded/xz_private.h
deleted file mode 100644
index 52e05c329..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_private.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* SPDX-License-Identifier: 0BSD */
-
-/*
- * Private includes and definitions
- *
- * Author: Lasse Collin <lasse.collin@tukaani.org>
- */
-
-#ifndef XZ_PRIVATE_H
-#define XZ_PRIVATE_H
-
-#ifdef __KERNEL__
-#include <linux/xz.h>
-#include <linux/kernel.h>
-#include <linux/unaligned.h>
-/* XZ_PREBOOT may be defined only via decompress_unxz.c. */
-#ifndef XZ_PREBOOT
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/string.h>
-#ifdef CONFIG_XZ_DEC_X86
-#define XZ_DEC_X86
-#endif
-#ifdef CONFIG_XZ_DEC_POWERPC
-#define XZ_DEC_POWERPC
-#endif
-#ifdef CONFIG_XZ_DEC_IA64
-#define XZ_DEC_IA64
-#endif
-#ifdef CONFIG_XZ_DEC_ARM
-#define XZ_DEC_ARM
-#endif
-#ifdef CONFIG_XZ_DEC_ARMTHUMB
-#define XZ_DEC_ARMTHUMB
-#endif
-#ifdef CONFIG_XZ_DEC_SPARC
-#define XZ_DEC_SPARC
-#endif
-#ifdef CONFIG_XZ_DEC_ARM64
-#define XZ_DEC_ARM64
-#endif
-#ifdef CONFIG_XZ_DEC_RISCV
-#define XZ_DEC_RISCV
-#endif
-#ifdef CONFIG_XZ_DEC_MICROLZMA
-#define XZ_DEC_MICROLZMA
-#endif
-#define memeq(a, b, size) (memcmp(a, b, size) == 0)
-#define memzero(buf, size) memset(buf, 0, size)
-#endif
-#define get_le32(p) le32_to_cpup((const uint32_t *)(p))
-#else
-/*
- * For userspace builds, use a separate header to define the required
- * macros and functions. This makes it easier to adapt the code into
- * different environments and avoids clutter in the Linux kernel tree.
- */
-#include "xz_config.h"
-#endif
-
-/* If no specific decoding mode is requested, enable support for all modes. */
-#if !defined(XZ_DEC_SINGLE) && !defined(XZ_DEC_PREALLOC) &&                    \
-    !defined(XZ_DEC_DYNALLOC)
-#define XZ_DEC_SINGLE
-#define XZ_DEC_PREALLOC
-#define XZ_DEC_DYNALLOC
-#endif
-
-/*
- * The DEC_IS_foo(mode) macros are used in "if" statements. If only some
- * of the supported modes are enabled, these macros will evaluate to true or
- * false at compile time and thus allow the compiler to omit unneeded code.
- */
-#ifdef XZ_DEC_SINGLE
-#define DEC_IS_SINGLE(mode) ((mode) == XZ_SINGLE)
-#else
-#define DEC_IS_SINGLE(mode) (false)
-#endif
-
-#ifdef XZ_DEC_PREALLOC
-#define DEC_IS_PREALLOC(mode) ((mode) == XZ_PREALLOC)
-#else
-#define DEC_IS_PREALLOC(mode) (false)
-#endif
-
-#ifdef XZ_DEC_DYNALLOC
-#define DEC_IS_DYNALLOC(mode) ((mode) == XZ_DYNALLOC)
-#else
-#define DEC_IS_DYNALLOC(mode) (false)
-#endif
-
-#if !defined(XZ_DEC_SINGLE)
-#define DEC_IS_MULTI(mode) (true)
-#elif defined(XZ_DEC_PREALLOC) || defined(XZ_DEC_DYNALLOC)
-#define DEC_IS_MULTI(mode) ((mode) != XZ_SINGLE)
-#else
-#define DEC_IS_MULTI(mode) (false)
-#endif
-
-/*
- * If any of the BCJ filter decoders are wanted, define XZ_DEC_BCJ.
- * XZ_DEC_BCJ is used to enable generic support for BCJ decoders.
- */
-#ifndef XZ_DEC_BCJ
-#if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) || defined(XZ_DEC_IA64) ||  \
-    defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) ||                         \
-    defined(XZ_DEC_SPARC) || defined(XZ_DEC_ARM64) || defined(XZ_DEC_RISCV)
-#define XZ_DEC_BCJ
-#endif
-#endif
-
-struct xz_sha256 {
-  /* Buffered input data */
-  uint8_t data[64];
-
-  /* Internal state and the final hash value */
-  uint32_t state[8];
-
-  /* Size of the input data */
-  uint64_t size;
-};
-
-/* Reset the SHA-256 state to prepare for a new calculation. */
-XZ_EXTERN void xz_sha256_reset(struct xz_sha256 *s);
-
-/* Update the SHA-256 state with new data. */
-XZ_EXTERN void xz_sha256_update(const uint8_t *buf, size_t size,
-                                struct xz_sha256 *s);
-
-/*
- * Finish the SHA-256 calculation. Compare the result with the first 32 bytes
- * from buf. Return true if the values are equal and false if they aren't.
- */
-XZ_EXTERN bool xz_sha256_validate(const uint8_t *buf, struct xz_sha256 *s);
-
-/*
- * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
- * before calling xz_dec_lzma2_run().
- */
-XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
-                                                   uint32_t dict_max);
-
-/*
- * Decode the LZMA2 properties (one byte) and reset the decoder. Return
- * XZ_OK on success, XZ_MEMLIMIT_ERROR if the preallocated dictionary is not
- * big enough, and XZ_OPTIONS_ERROR if props indicates something that this
- * decoder doesn't support.
- */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props);
-
-/* Decode raw LZMA2 stream from b->in to b->out. */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
-                                       struct xz_buf *b);
-
-/* Free the memory allocated for the LZMA2 decoder. */
-XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s);
-
-#ifdef XZ_DEC_BCJ
-/*
- * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before
- * calling xz_dec_bcj_run().
- */
-XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call);
-
-/*
- * Decode the Filter ID of a BCJ filter. This implementation doesn't
- * support custom start offsets, so no decoding of Filter Properties
- * is needed. Returns XZ_OK if the given Filter ID is supported.
- * Otherwise XZ_OPTIONS_ERROR is returned.
- */
-XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id);
-
-/*
- * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is
- * a BCJ filter in the chain. If the chain has only LZMA2, xz_dec_lzma2_run()
- * must be called directly.
- */
-XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
-                                     struct xz_dec_lzma2 *lzma2,
-                                     struct xz_buf *b);
-
-/* Free the memory allocated for the BCJ filters. */
-#define xz_dec_bcj_end(s) kfree(s)
-#endif
-
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xz_stream.h b/app/src/main/cpp/xz/xz_embedded/xz_stream.h
deleted file mode 100644
index 3b2a3014a..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xz_stream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* SPDX-License-Identifier: 0BSD */
-
-/*
- * Definitions for handling the .xz file format
- *
- * Author: Lasse Collin <lasse.collin@tukaani.org>
- */
-
-#ifndef XZ_STREAM_H
-#define XZ_STREAM_H
-
-#if defined(__KERNEL__) && !XZ_INTERNAL_CRC32
-#include <linux/crc32.h>
-#undef crc32
-#define xz_crc32(buf, size, crc) (~crc32_le(~(uint32_t)(crc), buf, size))
-#endif
-
-/*
- * See the .xz file format specification at
- * https://tukaani.org/xz/xz-file-format.txt
- * to understand the container format.
- */
-
-#define STREAM_HEADER_SIZE 12
-
-#define HEADER_MAGIC "\3757zXZ"
-#define HEADER_MAGIC_SIZE 6
-
-#define FOOTER_MAGIC "YZ"
-#define FOOTER_MAGIC_SIZE 2
-
-/*
- * Variable-length integer can hold a 63-bit unsigned integer or a special
- * value indicating that the value is unknown.
- *
- * Experimental: vli_type can be defined to uint32_t to save a few bytes
- * in code size (no effect on speed). Doing so limits the uncompressed and
- * compressed size of the file to less than 256 MiB and may also weaken
- * error detection slightly.
- */
-typedef uint64_t vli_type;
-
-#define VLI_MAX ((vli_type) - 1 / 2)
-#define VLI_UNKNOWN ((vli_type) - 1)
-
-/* Maximum encoded size of a VLI */
-#define VLI_BYTES_MAX (sizeof(vli_type) * 8 / 7)
-
-/* Integrity Check types */
-enum xz_check {
-  XZ_CHECK_NONE = 0,
-  XZ_CHECK_CRC32 = 1,
-  XZ_CHECK_CRC64 = 4,
-  XZ_CHECK_SHA256 = 10
-};
-
-/* Maximum possible Check ID */
-#define XZ_CHECK_MAX 15
-
-#endif
diff --git a/app/src/main/cpp/xz/xz_embedded/xzminidec.c b/app/src/main/cpp/xz/xz_embedded/xzminidec.c
deleted file mode 100644
index 7b896da2c..000000000
--- a/app/src/main/cpp/xz/xz_embedded/xzminidec.c
+++ /dev/null
@@ -1,162 +0,0 @@
-// SPDX-License-Identifier: 0BSD
-
-/*
- * Simple XZ decoder command line tool
- *
- * Author: Lasse Collin <lasse.collin@tukaani.org>
- */
-
-/*
- * This is a very limited .xz decoder. Only LZMA2 and the BCJ filters
- * are supported, and the BCJ filters cannot use Filter Properties.
- * SHA256 is not supported as an integrity check. The LZMA2 dictionary
- * sizes can be at most 64 MiB, but this can be modified by changing
- * DICT_SIZE_MAX.
- *
- * See xzdec from XZ Utils if a few KiB bigger tool is not a problem.
- */
-
-#include "xz.h"
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include <io.h>
-#include <fcntl.h>
-#endif
-
-#ifndef DICT_SIZE_MAX
-#define DICT_SIZE_MAX (64U << 20)
-#endif
-
-static uint8_t in[BUFSIZ];
-static uint8_t out[BUFSIZ];
-
-int main(int argc, char **argv) {
-  struct xz_buf b;
-  struct xz_dec *s;
-  enum xz_ret ret;
-  const char *msg;
-
-#ifdef _WIN32
-  _setmode(_fileno(stdin), _O_BINARY);
-  _setmode(_fileno(stdout), _O_BINARY);
-#endif
-
-  if (argc >= 2 && strcmp(argv[1], "--help") == 0) {
-    fputs("Uncompress a .xz file from stdin to stdout.\n"
-          "Arguments other than `--help' are ignored.\n",
-          stdout);
-    return 0;
-  }
-
-  xz_crc32_init();
-#ifdef XZ_USE_CRC64
-  xz_crc64_init();
-#endif
-
-  /*
-   * Support up to 64 MiB dictionary. The actually needed memory
-   * is allocated once the headers have been parsed.
-   */
-  s = xz_dec_init(XZ_DYNALLOC, DICT_SIZE_MAX);
-  if (s == NULL) {
-    msg = "Memory allocation failed\n";
-    goto error;
-  }
-
-  b.in = in;
-  b.in_pos = 0;
-  b.in_size = 0;
-  b.out = out;
-  b.out_pos = 0;
-  b.out_size = BUFSIZ;
-
-  while (true) {
-    if (b.in_pos == b.in_size) {
-      b.in_size = fread(in, 1, sizeof(in), stdin);
-
-      if (ferror(stdin)) {
-        msg = "Read error\n";
-        goto error;
-      }
-
-      b.in_pos = 0;
-    }
-
-    /*
-     * There are a few ways to set the "finish" (the third)
-     * argument. We could use feof(stdin) but testing in_size
-     * is fine too and may also work in applications that don't
-     * use FILEs.
-     */
-    ret = xz_dec_catrun(s, &b, b.in_size == 0);
-
-    if (b.out_pos == sizeof(out)) {
-      if (fwrite(out, 1, b.out_pos, stdout) != b.out_pos) {
-        msg = "Write error\n";
-        goto error;
-      }
-
-      b.out_pos = 0;
-    }
-
-    if (ret == XZ_OK)
-      continue;
-
-#ifdef XZ_DEC_ANY_CHECK
-    if (ret == XZ_UNSUPPORTED_CHECK) {
-      fputs(argv[0], stderr);
-      fputs(": ", stderr);
-      fputs("Unsupported check; not verifying "
-            "file integrity\n",
-            stderr);
-      continue;
-    }
-#endif
-
-    if (fwrite(out, 1, b.out_pos, stdout) != b.out_pos || fclose(stdout)) {
-      msg = "Write error\n";
-      goto error;
-    }
-
-    switch (ret) {
-    case XZ_STREAM_END:
-      xz_dec_end(s);
-      return 0;
-
-    case XZ_MEM_ERROR:
-      msg = "Memory allocation failed\n";
-      goto error;
-
-    case XZ_MEMLIMIT_ERROR:
-      msg = "Memory usage limit reached\n";
-      goto error;
-
-    case XZ_FORMAT_ERROR:
-      msg = "Not a .xz file\n";
-      goto error;
-
-    case XZ_OPTIONS_ERROR:
-      msg = "Unsupported options in the .xz headers\n";
-      goto error;
-
-    case XZ_DATA_ERROR:
-    case XZ_BUF_ERROR:
-      msg = "File is corrupt\n";
-      goto error;
-
-    default:
-      msg = "Bug!\n";
-      goto error;
-    }
-  }
-
-error:
-  xz_dec_end(s);
-  fputs(argv[0], stderr);
-  fputs(": ", stderr);
-  fputs(msg, stderr);
-  return 1;
-}
diff --git a/app/src/main/engine/org/love2d/android/GameActivity.java b/app/src/main/engine/org/love2d/android/GameActivity.java
new file mode 100644
index 000000000..271e90b61
--- /dev/null
+++ b/app/src/main/engine/org/love2d/android/GameActivity.java
@@ -0,0 +1,880 @@
+/**
+ * Copyright (c) 2006-2023 LOVE Development Team
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+
+package org.love2d.android;
+
+// WinNative: this file is vendored unmodified from love-android 11.5a except
+// for this import. Upstream resolves R from its own package; here the only
+// R on the classpath is the host app's, and R.bool.embed is the single
+// resource it reads (false, so the game path arrives via the launch Intent).
+import com.winlator.cmod.R;
+import org.love2d.sdl.SDLActivity;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.Manifest;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.res.AssetManager;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Vibrator;
+import android.util.Log;
+import android.util.DisplayMetrics;
+import android.view.*;
+import android.content.pm.PackageManager;
+
+import androidx.annotation.Keep;
+import androidx.core.app.ActivityCompat;
+
+public class GameActivity extends SDLActivity {
+    private static DisplayMetrics metrics = null;
+    private static String gamePath = "";
+    private static Vibrator vibrator = null;
+    protected final int[] externalStorageRequestDummy = new int[1];
+    protected final int[] recordAudioRequestDummy = new int[1];
+    public static final int EXTERNAL_STORAGE_REQUEST_CODE = 2;
+    public static final int RECORD_AUDIO_REQUEST_CODE = 3;
+    public static final int FILE_PICKER_REQUEST_CODE = 4;
+    public static final int FILE_CREATE_REQUEST_CODE = 5;
+    /** @deprecated Prefer FILE_PICKER_REQUEST_CODE; kept for older call sites. */
+    public static final int ROM_PICKER_REQUEST_CODE = FILE_PICKER_REQUEST_CODE;
+    // Mirrors conf.lua's t.identity ("pokemon-love2d"): where the picked file
+    // is dropped so RomImporter's existing folder scan finds it -- see
+    // src/import/RomImporter.lua and Filesystem::setIdentity (sets Android's
+    // save directory to getExternalFilesDir()/save/<identity>).
+    private static final String ROM_SAVE_IDENTITY = "pokemon-love2d";
+    private static final String PICKED_ROM_FILENAME = "picked_rom.gb";
+    private static final String PICKED_MOD_FILENAME = "picked_mod.zip";
+    private static final String PICKED_SAVE_FILENAME = "picked_save.sav";
+    private static final String PENDING_EXPORT_FILENAME = "pending_export.sav";
+    private static final String EXPORT_DONE_FILENAME = "export_done.flag";
+    // Written when a SAF pick cannot be read at all, with the destination
+    // basename as its body, so RomImporter:focus can say so in the launcher
+    // instead of leaving the player on "No ROM imported" (issue #442).
+    private static final String PICK_ERROR_FILENAME = "pick_error.flag";
+    // Destination basename for the in-flight SAF pick (set by showFilePicker).
+    private String pendingPickFilename = PICKED_ROM_FILENAME;
+    // Suggested download name for the in-flight SAF create (set by showCreateDocument).
+    private String pendingCreateSuggestedName = "export.sav";
+    private static boolean immersiveActive = false;
+    private static boolean needToCopyGameInArchive = false;
+    private boolean storagePermissionUnnecessary = false;
+    private boolean shortEdgesMode = false;
+    public boolean embed = false;
+    public int safeAreaTop = 0;
+    public int safeAreaLeft = 0;
+    public int safeAreaBottom = 0;
+    public int safeAreaRight = 0;
+
+    private static native void nativeSetDefaultStreamValues(int sampleRate, int framesPerBurst);
+
+    @Override
+    protected String[] getLibraries() {
+        return new String[] {
+            "c++_shared",
+            "mpg123",
+            "openal",
+            "love",
+        };
+    }
+
+    @Override
+    protected String getMainSharedObject() {
+        String[] libs = getLibraries();
+        String libname = "lib" + libs[libs.length - 1] + ".so";
+
+        // Since Lollipop, you can simply pass "libname.so" to dlopen
+        // and it will resolve correct paths and load correct library.
+        // This is mandatory for extractNativeLibs=false support in
+        // Marshmallow.
+        if (android.os.Build.VERSION.SDK_INT >= 21) {
+            return libname;
+        } else {
+            return getContext().getApplicationInfo().nativeLibraryDir + "/" + libname;
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.d("GameActivity", "started");
+
+        int res = checkCallingOrSelfPermission(Manifest.permission.VIBRATE);
+        if (res == PackageManager.PERMISSION_GRANTED) {
+            vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+        } else {
+            Log.d("GameActivity", "Vibration disabled: could not get vibration permission.");
+        }
+
+        // These 2 variables must be reset or it will use the existing value.
+        gamePath = "";
+        storagePermissionUnnecessary = false;
+        embed = getResources().getBoolean(R.bool.embed);
+        needToCopyGameInArchive = embed;
+
+        if (!embed) {
+            Intent intent = getIntent();
+            handleIntent(intent);
+            intent.setData(null);
+        }
+
+        super.onCreate(savedInstanceState);
+        metrics = getResources().getDisplayMetrics();
+
+        // Set low-latency audio values
+        nativeSetDefaultStreamValues(getAudioFreq(), getAudioSMP());
+
+        if (android.os.Build.VERSION.SDK_INT >= 28) {
+            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
+            shortEdgesMode = false;
+        }
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        Log.d("GameActivity", "onNewIntent() with " + intent);
+        if (!embed) {
+            handleIntent(intent);
+            resetNative();
+            startNative();
+        }
+    }
+
+    protected void handleIntent(Intent intent) {
+        Uri game = intent.getData();
+
+        if (!embed && game != null) {
+            String scheme = game.getScheme();
+            String path = game.getPath();
+            // If we have a game via the intent data we we try to figure out how we have to load it. We
+            // support the following variations:
+            // * a main.lua file: set gamePath to the directory containing main.lua
+            // * otherwise: set gamePath to the file
+            if (scheme.equals("file")) {
+                Log.d("GameActivity", "Received file:// intent with path: " + path);
+                // If we were given the path of a main.lua then use its
+                // directory. Otherwise use full path.
+                List<String> path_segments = game.getPathSegments();
+                if (path_segments.get(path_segments.size() - 1).equals("main.lua")) {
+                    gamePath = path.substring(0, path.length() - "main.lua".length());
+                } else {
+                    gamePath = path;
+                }
+            } else if (scheme.equals("content")) {
+                Log.d("GameActivity", "Received content:// intent with path: " + path);
+                try {
+                    String filename = "game.love";
+                    String[] pathSegments = path.split("/");
+                    if (pathSegments.length > 0) {
+                        filename = pathSegments[pathSegments.length - 1];
+                    }
+
+                    // Sanitize filename to prevent PhysFS complaining later.
+                    filename = filename.replaceAll("[^a-zA-Z0-9_\\\\-\\\\.]", "_");
+
+                    String destination_file = this.getCacheDir().getPath() + "/" + filename;
+                    InputStream data = getContentResolver().openInputStream(game);
+
+                    // copyAssetFile automatically closes the InputStream
+                    if (copyAssetFile(data, destination_file)) {
+                        gamePath = destination_file;
+                        storagePermissionUnnecessary = true;
+                    }
+                } catch (Exception e) {
+                    Log.d("GameActivity", "could not read content uri " + game.toString() + ": " + e.getMessage());
+                }
+            } else {
+                Log.e("GameActivity", "Unsupported scheme: '" + game.getScheme() + "'.");
+
+                AlertDialog.Builder alert_dialog = new AlertDialog.Builder(this);
+                alert_dialog.setMessage("Could not load LÖVE game '" + path
+                        + "' as it uses unsupported scheme '" + game.getScheme()
+                        + "'. Please contact the developer.");
+                alert_dialog.setTitle("LÖVE for Android Error");
+                alert_dialog.setPositiveButton("Exit",
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int id) {
+                                finish();
+                            }
+                        });
+                alert_dialog.setCancelable(false);
+                alert_dialog.create().show();
+            }
+        }
+
+        Log.d("GameActivity", "new gamePath: " + gamePath);
+    }
+
+    private void copyGameInsideArchive() {
+        try {
+            // If we have a game.love in our assets folder copy it to the cache folder
+            // so that we can load it from native LÖVE code
+            AssetManager assetManager = getAssets();
+            InputStream gameStream = assetManager.open("game.love");
+            String destinationFile = this.getCacheDir().getPath() + "/game.love";
+
+            if (copyAssetFile(gameStream, destinationFile))
+                gamePath = destinationFile;
+            else
+                gamePath = "game.love";
+            storagePermissionUnnecessary = true;
+        } catch (IOException e) {
+            // There's no game.love in our assets
+            Log.d("GameActivity", "Could not open game.love from assets: " + e.getMessage());
+        }
+    }
+
+    protected void checkLovegameFolder() {
+        // If no game.love was found and embed flavor is not used, fall back to the game in
+        // <external storage>/Android/data/<package name>/games/lovegame
+        if (!embed) {
+            Log.d("GameActivity", "fallback to lovegame folder");
+            File ext = getExternalFilesDir("games");
+            if ((new File(ext, "/lovegame/main.lua")).exists()) {
+                gamePath = ext.getPath() + "/lovegame/";
+                storagePermissionUnnecessary = true;
+            } else if (android.os.Build.VERSION.SDK_INT <= 28) {
+                // Try to fallback to /sdcard/lovegame in Android 9 and earlier too.
+                if (hasExternalStoragePermission()) {
+                    ext = Environment.getExternalStorageDirectory();
+                    if ((new File(ext, "/lovegame/main.lua")).exists()) {
+                        gamePath = ext.getPath() + "/lovegame/";
+                        storagePermissionUnnecessary = false;
+                    }
+                } else {
+                    Log.d("GameActivity", "Cannot load game from /sdcard/lovegame: permission not granted");
+                }
+            }
+
+            Log.d("GameActivity", "lovegame directory: " + gamePath);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (vibrator != null) {
+            Log.d("GameActivity", "Cancelling vibration");
+            vibrator.cancel();
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onPause() {
+        if (vibrator != null) {
+            Log.d("GameActivity", "Cancelling vibration");
+            vibrator.cancel();
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Keep
+    public void setImmersiveMode(boolean immersive_mode) {
+        if (android.os.Build.VERSION.SDK_INT >= 28) {
+            getWindow().getAttributes().layoutInDisplayCutoutMode = immersive_mode ?
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES :
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
+            shortEdgesMode = immersive_mode;
+        }
+
+        immersiveActive = immersive_mode;
+    }
+
+    @Keep
+    public boolean getImmersiveMode() {
+        return immersiveActive;
+    }
+
+    @Keep
+    public static String getGamePath() {
+        GameActivity self = (GameActivity) mSingleton; // use SDL provided one
+        Log.d("GameActivity", "called getGamePath(), game path = " + gamePath);
+
+        if (gamePath.length() > 0) {
+            if (self.storagePermissionUnnecessary || self.hasExternalStoragePermission()) {
+                return gamePath;
+            } else {
+                Log.d("GameActivity", "cannot open game " + gamePath + ": no external storage permission given!");
+            }
+        } else if (needToCopyGameInArchive) {
+            self.copyGameInsideArchive();
+        } else {
+            self.checkLovegameFolder();
+        }
+
+        return gamePath;
+    }
+
+    public static DisplayMetrics getMetrics() {
+        return metrics;
+    }
+
+    @Keep
+    public static void vibrate(double seconds) {
+        if (vibrator != null) {
+            vibrator.vibrate((long) (seconds * 1000.));
+        }
+    }
+
+    @Keep
+    public static boolean openURLFromLOVE(String url) {
+        Log.d("GameActivity", "opening url = " + url);
+        return openURL(url) == 0;
+    }
+
+    /**
+     * Shows the system document picker (Storage Access Framework) so the
+     * player can pick a ROM / mod / save from anywhere (Downloads, Drive,
+     * etc.) without needing to know where the app's external files folder
+     * is. Requires API 19+ (ACTION_OPEN_DOCUMENT); the picked file (if any)
+     * arrives later in onActivityResult, not synchronously here.
+     *
+     * @param destFilename basename under the app save identity (e.g.
+     *                     picked_rom.gb, picked_mod.zip, picked_save.sav)
+     */
+    @Keep
+    public static boolean showFilePicker(String destFilename) {
+        if (android.os.Build.VERSION.SDK_INT < 19) return false;
+        GameActivity self = (GameActivity) mSingleton;
+        if (self == null) return false;
+        if (destFilename == null || destFilename.length() == 0) {
+            destFilename = PICKED_ROM_FILENAME;
+        }
+        // Reject path separators so a hostile JNI caller cannot escape the
+        // save identity directory.
+        if (destFilename.indexOf('/') >= 0 || destFilename.indexOf('\\') >= 0) {
+            Log.d("GameActivity", "refusing unsafe picker dest: " + destFilename);
+            return false;
+        }
+
+        self.pendingPickFilename = destFilename;
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        try {
+            self.startActivityForResult(intent, FILE_PICKER_REQUEST_CODE);
+            return true;
+        } catch (Exception e) {
+            Log.d("GameActivity", "could not open file picker: " + e.getMessage());
+            return false;
+        }
+    }
+
+    /** ROM convenience wrapper; prefer showFilePicker with an explicit name. */
+    @Keep
+    public static boolean showRomFilePicker() {
+        return showFilePicker(PICKED_ROM_FILENAME);
+    }
+
+    /** Mod .zip convenience wrapper used by love.system.pickFile("mod"). */
+    @Keep
+    public static boolean showModFilePicker() {
+        return showFilePicker(PICKED_MOD_FILENAME);
+    }
+
+    /** Battery .sav convenience wrapper used by love.system.pickFile("sav"). */
+    @Keep
+    public static boolean showSaveFilePicker() {
+        return showFilePicker(PICKED_SAVE_FILENAME);
+    }
+
+    /**
+     * Shows ACTION_CREATE_DOCUMENT so the player can save a staged export
+     * (pending_export.sav in the app save identity) to Downloads / Drive /
+     * etc. Suggested name is the dialog's default filename.
+     */
+    @Keep
+    public static boolean showCreateDocument(String suggestedName) {
+        if (android.os.Build.VERSION.SDK_INT < 19) return false;
+        GameActivity self = (GameActivity) mSingleton;
+        if (self == null) return false;
+        if (suggestedName == null || suggestedName.length() == 0) {
+            suggestedName = "export.sav";
+        }
+        if (suggestedName.indexOf('/') >= 0 || suggestedName.indexOf('\\') >= 0) {
+            Log.d("GameActivity", "refusing unsafe create name: " + suggestedName);
+            return false;
+        }
+        File source = new File(
+            new File(self.getExternalFilesDir(null), "save"),
+            ROM_SAVE_IDENTITY + "/" + PENDING_EXPORT_FILENAME);
+        if (!source.isFile()) {
+            Log.d("GameActivity", "no pending export at " + source);
+            return false;
+        }
+
+        self.pendingCreateSuggestedName = suggestedName;
+        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("application/octet-stream");
+        intent.putExtra(Intent.EXTRA_TITLE, suggestedName);
+        try {
+            self.startActivityForResult(intent, FILE_CREATE_REQUEST_CODE);
+            return true;
+        } catch (Exception e) {
+            Log.d("GameActivity", "could not open create-document picker: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private File saveIdentityDir() {
+        return new File(new File(getExternalFilesDir(null), "save"), ROM_SAVE_IDENTITY);
+    }
+
+    /** Drops a small flag file in the save identity for Lua to consume on focus. */
+    private void writeSaveDirFlag(String name, String body) {
+        try {
+            FileOutputStream fos = new FileOutputStream(new File(saveIdentityDir(), name), false);
+            fos.write(body.getBytes());
+            fos.close();
+        } catch (IOException e) {
+            Log.d("GameActivity", "could not write " + name + ": " + e.getMessage());
+        }
+    }
+
+    private boolean copyFileToUri(File source, Uri destUri) {
+        InputStream in = null;
+        OutputStream out = null;
+        try {
+            in = new BufferedInputStream(new FileInputStream(source));
+            out = getContentResolver().openOutputStream(destUri);
+            if (out == null) return false;
+            byte[] buf = new byte[8192];
+            int n;
+            while ((n = in.read(buf)) != -1) {
+                out.write(buf, 0, n);
+            }
+            out.flush();
+            return true;
+        } catch (IOException e) {
+            Log.d("GameActivity", "copy to URI failed: " + e.getMessage());
+            return false;
+        } finally {
+            try { if (in != null) in.close(); } catch (IOException ignored) {}
+            try { if (out != null) out.close(); } catch (IOException ignored) {}
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == FILE_CREATE_REQUEST_CODE) {
+            if (resultCode != RESULT_OK || data == null || data.getData() == null) {
+                Log.d("GameActivity", "create-document cancelled");
+                return;
+            }
+            File source = new File(saveIdentityDir(), PENDING_EXPORT_FILENAME);
+            if (!source.isFile()) {
+                Log.d("GameActivity", "pending export missing at result time");
+                return;
+            }
+            Uri uri = data.getData();
+            if (copyFileToUri(source, uri)) {
+                // Signal Lua on next focus that the SAF export finished.
+                writeSaveDirFlag(EXPORT_DONE_FILENAME, "ok");
+                // Keep pending_export.sav so a retry still works; Lua may remove it.
+            } else {
+                Log.d("GameActivity", "could not write export to " + uri);
+            }
+            return;
+        }
+        if (requestCode != FILE_PICKER_REQUEST_CODE) return;
+        if (resultCode != RESULT_OK || data == null || data.getData() == null) {
+            Log.d("GameActivity", "file picker returned no file (cancelled?)");
+            return;
+        }
+
+        Uri uri = data.getData();
+        File destDir = saveIdentityDir();
+        if (!destDir.exists() && !destDir.mkdirs()) {
+            Log.d("GameActivity", "could not create " + destDir);
+            return;
+        }
+        String destName = pendingPickFilename != null
+            ? pendingPickFilename : PICKED_ROM_FILENAME;
+        File destFile = new File(destDir, destName);
+
+        // ACTION_OPEN_DOCUMENT is meant to land in the system documents UI, but
+        // some OEM shells (ColorOS) offer third-party file managers in a
+        // chooser, and those hand back either a provider URI this app has no
+        // grant for (SecurityException / FileNotFoundException) or a bare
+        // file:// path (unreadable without storage permission on targetSdk 34).
+        // Try the resolver, then the path, then tell Lua why nothing imported.
+        InputStream source = null;
+        try {
+            source = getContentResolver().openInputStream(uri);
+        } catch (Exception e) {
+            Log.d("GameActivity", "could not open picked file: " + e.getMessage());
+        }
+        if (source == null && "file".equals(uri.getScheme()) && uri.getPath() != null) {
+            try {
+                source = new FileInputStream(uri.getPath());
+            } catch (FileNotFoundException e) {
+                Log.d("GameActivity", "could not open picked path: " + e.getMessage());
+            }
+        }
+        if (source == null) {
+            Log.d("GameActivity", "no readable stream for picked file " + uri);
+            writeSaveDirFlag(PICK_ERROR_FILENAME, destName);
+            return;
+        }
+        if (!copyAssetFile(source, destFile.getPath())) {
+            Log.d("GameActivity", "could not copy picked file to " + destFile);
+            // A truncated pick would only fail verification later, so drop it
+            // and report instead.
+            destFile.delete();
+            writeSaveDirFlag(PICK_ERROR_FILENAME, destName);
+        }
+    }
+
+    /**
+     * Copies a given file from the assets folder to the destination.
+     *
+     * @return true if successful
+     */
+    boolean copyAssetFile(InputStream source, String destinationFileName) {
+        boolean success = false;
+
+        BufferedOutputStream destination = null;
+        try {
+            destination = new BufferedOutputStream(new FileOutputStream(destinationFileName, false));
+        } catch (IOException e) {
+            Log.d("GameActivity", "Could not open destination file: " + e.getMessage());
+        }
+
+        // perform the copying
+        int chunk_read;
+        int bytes_written = 0;
+
+        assert (source != null && destination != null);
+
+        try {
+            byte[] buf = new byte[1024];
+            chunk_read = source.read(buf);
+            do {
+                destination.write(buf, 0, chunk_read);
+                bytes_written += chunk_read;
+                chunk_read = source.read(buf);
+            } while (chunk_read != -1);
+        } catch (IOException e) {
+            Log.d("GameActivity", "Copying failed:" + e.getMessage());
+        }
+
+        // close streams
+        try {
+            source.close();
+            destination.close();
+            success = true;
+        } catch (IOException e) {
+            Log.d("GameActivity", "Copying failed: " + e.getMessage());
+        }
+
+        Log.d("GameActivity", "Successfully copied stream to " + destinationFileName + " (" + bytes_written + " bytes written).");
+        return success;
+    }
+
+    @Keep
+    public boolean hasBackgroundMusic() {
+        AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+        return audioManager.isMusicActive();
+    }
+
+    @Keep
+    public void showRecordingAudioPermissionMissingDialog() {
+        Log.d("GameActivity", "showRecordingAudioPermissionMissingDialog()");
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                AlertDialog dialog = new AlertDialog.Builder(mSingleton)
+                    .setTitle("Audio Recording Permission Missing")
+                    .setMessage("It appears that this game uses mic capabilities. The game may not work correctly without mic permission!")
+                    .setNeutralButton("Continue", new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface di, int id) {
+                            synchronized (recordAudioRequestDummy) {
+                                recordAudioRequestDummy.notify();
+                            }
+                        }
+                    })
+                    .create();
+                dialog.show();
+            }
+        });
+
+        synchronized (recordAudioRequestDummy) {
+            try {
+                recordAudioRequestDummy.wait();
+            } catch (InterruptedException e) {
+                Log.d("GameActivity", "mic permission dialog", e);
+            }
+        }
+    }
+
+    public void showExternalStoragePermissionMissingDialog() {
+        AlertDialog dialog = new AlertDialog.Builder(mSingleton)
+            .setTitle("Storage Permission Missing")
+            .setMessage("LÖVE for Android will not be able to run non-packaged games without storage permission.")
+            .setNeutralButton("Continue", null)
+            .create();
+        dialog.show();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (grantResults.length > 0) {
+            Log.d("GameActivity", "Received a request permission result");
+
+            switch (requestCode) {
+                case EXTERNAL_STORAGE_REQUEST_CODE: {
+                    if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                        Log.d("GameActivity", "Permission granted");
+                    } else {
+                        Log.d("GameActivity", "Did not get permission.");
+                        if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+                            showExternalStoragePermissionMissingDialog();
+                        }
+                    }
+
+                    Log.d("GameActivity", "Unlocking LÖVE thread");
+                    synchronized (externalStorageRequestDummy) {
+                        externalStorageRequestDummy[0] = grantResults[0];
+                        externalStorageRequestDummy.notify();
+                    }
+                    break;
+                }
+                case RECORD_AUDIO_REQUEST_CODE: {
+                    if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                        Log.d("GameActivity", "Mic permission granted");
+                    } else {
+                        Log.d("GameActivity", "Did not get mic permission.");
+                    }
+
+                    Log.d("GameActivity", "Unlocking LÖVE thread");
+                    synchronized (recordAudioRequestDummy) {
+                        recordAudioRequestDummy[0] = grantResults[0];
+                        recordAudioRequestDummy.notify();
+                    }
+                    break;
+                }
+                default:
+                    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+            }
+        }
+    }
+
+    @Keep
+    public boolean hasExternalStoragePermission() {
+        if (ActivityCompat.checkSelfPermission(this,
+                Manifest.permission.READ_EXTERNAL_STORAGE)
+                == PackageManager.PERMISSION_GRANTED) {
+            return true;
+        }
+
+        Log.d("GameActivity", "Requesting permission and locking LÖVE thread until we have an answer.");
+        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_REQUEST_CODE);
+
+        synchronized (externalStorageRequestDummy) {
+            try {
+                externalStorageRequestDummy.wait();
+            } catch (InterruptedException e) {
+                Log.d("GameActivity", "requesting external storage permission", e);
+                return false;
+            }
+        }
+
+        return ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    @Keep
+    public boolean hasRecordAudioPermission() {
+        return ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    @Keep
+    public void requestRecordAudioPermission() {
+        if (ActivityCompat.checkSelfPermission(this,
+                Manifest.permission.RECORD_AUDIO)
+                == PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
+
+        Log.d("GameActivity", "Requesting mic permission and locking LÖVE thread until we have an answer.");
+        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
+
+        synchronized (recordAudioRequestDummy) {
+            try {
+                recordAudioRequestDummy.wait();
+            } catch (InterruptedException e) {
+                Log.d("GameActivity", "requesting mic permission", e);
+            }
+        }
+    }
+
+    @Keep
+    public boolean initializeSafeArea() {
+        if (android.os.Build.VERSION.SDK_INT >= 28 && shortEdgesMode) {
+            DisplayCutout cutout = getWindow().getDecorView().getRootWindowInsets().getDisplayCutout();
+
+            if (cutout != null) {
+                safeAreaTop = cutout.getSafeInsetTop();
+                safeAreaLeft = cutout.getSafeInsetLeft();
+                safeAreaBottom = cutout.getSafeInsetBottom();
+                safeAreaRight = cutout.getSafeInsetRight();
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Keep
+    public String[] buildFileTree() {
+        // Map key is path, value is directory flag
+        HashMap<String, Boolean> map = buildFileTree(getAssets(), "", new HashMap<String, Boolean>());
+        ArrayList<String> result = new ArrayList<String>();
+
+        for (Map.Entry<String, Boolean> data: map.entrySet()) {
+            result.add((data.getValue() ? "d" : "f") + data.getKey());
+        }
+
+        String[] r = new String[result.size()];
+        result.toArray(r);
+        return r;
+    }
+
+    private HashMap<String, Boolean> buildFileTree(AssetManager assetManager, String dir, HashMap<String, Boolean> map) {
+        String strippedDir = dir.endsWith("/") ? dir.substring(0, dir.length() - 1) : dir;
+
+        // Try open dir
+        try {
+            InputStream test = assetManager.open(strippedDir);
+            // It's a file
+            test.close();
+            map.put(strippedDir, false);
+        } catch (FileNotFoundException e) {
+            // It's a directory
+            String[] list = null;
+
+            // List files
+            try {
+                list = assetManager.list(strippedDir);
+            } catch (IOException e2) {
+                Log.e("GameActivity", strippedDir, e2);
+            }
+
+            // Mark as file
+            map.put(dir, true);
+
+            // This Object comparison is intentional.
+            if (strippedDir != dir) {
+                map.put(strippedDir, true);
+            }
+
+            if (list != null) {
+                for (String path: list) {
+                    buildFileTree(assetManager, dir + path + "/", map);
+                }
+            }
+        } catch (IOException e) {
+            Log.e("GameActivity", dir, e);
+        }
+
+        return map;
+    }
+
+    public int getAudioSMP() {
+        int smp = 256;
+
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            AudioManager a = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            int b = Integer.parseInt(a.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER));
+            return b > 0 ? b : smp;
+        }
+
+        return smp;
+    }
+
+    public int getAudioFreq() {
+        int freq = 44100;
+
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            AudioManager a = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            int b = Integer.parseInt(a.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE));
+            return b > 0 ? b : freq;
+        }
+
+        return freq;
+    }
+
+    public boolean isNativeLibsExtracted() {
+        ApplicationInfo appInfo = getApplicationInfo();
+
+        if (android.os.Build.VERSION.SDK_INT >= 23) {
+            return (appInfo.flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) != 0;
+        }
+
+        return true;
+    }
+
+    @Keep
+    public String getCRequirePath() {
+        ApplicationInfo applicationInfo = getApplicationInfo();
+
+        if (isNativeLibsExtracted()) {
+            return applicationInfo.nativeLibraryDir + "/?.so";
+        } else {
+            // The native libs are inside the APK and can be loaded directly.
+            // FIXME: What about split APKs?
+            String abi;
+
+            if (android.os.Build.VERSION.SDK_INT >= 21) {
+                 abi = android.os.Build.SUPPORTED_ABIS[0];
+            } else {
+                // This codepath should NEVER be taken as if isNativeLibsExtracted()
+                // returns false, it's 100% safe to assume we're on API level 23 or later.
+                abi = android.os.Build.CPU_ABI;
+            }
+
+            return applicationInfo.sourceDir + "!/lib/" + abi + "/?.so";
+        }
+    }
+}
diff --git a/app/src/main/engine/org/love2d/sdl/HIDDevice.java b/app/src/main/engine/org/love2d/sdl/HIDDevice.java
new file mode 100644
index 000000000..6058f7d17
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/HIDDevice.java
@@ -0,0 +1,22 @@
+package org.love2d.sdl;
+
+import android.hardware.usb.UsbDevice;
+
+interface HIDDevice
+{
+    public int getId();
+    public int getVendorId();
+    public int getProductId();
+    public String getSerialNumber();
+    public int getVersion();
+    public String getManufacturerName();
+    public String getProductName();
+    public UsbDevice getDevice();
+    public boolean open();
+    public int sendFeatureReport(byte[] report);
+    public int sendOutputReport(byte[] report);
+    public boolean getFeatureReport(byte[] report);
+    public void setFrozen(boolean frozen);
+    public void close();
+    public void shutdown();
+}
diff --git a/app/src/main/engine/org/love2d/sdl/HIDDeviceBLESteamController.java b/app/src/main/engine/org/love2d/sdl/HIDDeviceBLESteamController.java
new file mode 100644
index 000000000..b9a58808f
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/HIDDeviceBLESteamController.java
@@ -0,0 +1,650 @@
+package org.love2d.sdl;
+
+import android.content.Context;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCallback;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothGattService;
+import android.hardware.usb.UsbDevice;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.os.*;
+
+//import com.android.internal.util.HexDump;
+
+import java.lang.Runnable;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.UUID;
+
+class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDevice {
+
+    private static final String TAG = "hidapi";
+    private HIDDeviceManager mManager;
+    private BluetoothDevice mDevice;
+    private int mDeviceId;
+    private BluetoothGatt mGatt;
+    private boolean mIsRegistered = false;
+    private boolean mIsConnected = false;
+    private boolean mIsChromebook = false;
+    private boolean mIsReconnecting = false;
+    private boolean mFrozen = false;
+    private LinkedList<GattOperation> mOperations;
+    GattOperation mCurrentOperation = null;
+    private Handler mHandler;
+
+    private static final int TRANSPORT_AUTO = 0;
+    private static final int TRANSPORT_BREDR = 1;
+    private static final int TRANSPORT_LE = 2;
+
+    private static final int CHROMEBOOK_CONNECTION_CHECK_INTERVAL = 10000;
+
+    static public final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
+    static public final UUID inputCharacteristic = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
+    static public final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
+    static private final byte[] enterValveMode = new byte[] { (byte)0xC0, (byte)0x87, 0x03, 0x08, 0x07, 0x00 };
+
+    static class GattOperation {
+        private enum Operation {
+            CHR_READ,
+            CHR_WRITE,
+            ENABLE_NOTIFICATION
+        }
+
+        Operation mOp;
+        UUID mUuid;
+        byte[] mValue;
+        BluetoothGatt mGatt;
+        boolean mResult = true;
+
+        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid) {
+            mGatt = gatt;
+            mOp = operation;
+            mUuid = uuid;
+        }
+
+        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, byte[] value) {
+            mGatt = gatt;
+            mOp = operation;
+            mUuid = uuid;
+            mValue = value;
+        }
+
+        public void run() {
+            // This is executed in main thread
+            BluetoothGattCharacteristic chr;
+
+            switch (mOp) {
+                case CHR_READ:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Reading characteristic " + chr.getUuid());
+                    if (!mGatt.readCharacteristic(chr)) {
+                        Log.e(TAG, "Unable to read characteristic " + mUuid.toString());
+                        mResult = false;
+                        break;
+                    }
+                    mResult = true;
+                    break;
+                case CHR_WRITE:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Writing characteristic " + chr.getUuid() + " value=" + HexDump.toHexString(value));
+                    chr.setValue(mValue);
+                    if (!mGatt.writeCharacteristic(chr)) {
+                        Log.e(TAG, "Unable to write characteristic " + mUuid.toString());
+                        mResult = false;
+                        break;
+                    }
+                    mResult = true;
+                    break;
+                case ENABLE_NOTIFICATION:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Writing descriptor of " + chr.getUuid());
+                    if (chr != null) {
+                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+                        if (cccd != null) {
+                            int properties = chr.getProperties();
+                            byte[] value;
+                            if ((properties & BluetoothGattCharacteristic.PROPERTY_NOTIFY) == BluetoothGattCharacteristic.PROPERTY_NOTIFY) {
+                                value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE;
+                            } else if ((properties & BluetoothGattCharacteristic.PROPERTY_INDICATE) == BluetoothGattCharacteristic.PROPERTY_INDICATE) {
+                                value = BluetoothGattDescriptor.ENABLE_INDICATION_VALUE;
+                            } else {
+                                Log.e(TAG, "Unable to start notifications on input characteristic");
+                                mResult = false;
+                                return;
+                            }
+
+                            mGatt.setCharacteristicNotification(chr, true);
+                            cccd.setValue(value);
+                            if (!mGatt.writeDescriptor(cccd)) {
+                                Log.e(TAG, "Unable to write descriptor " + mUuid.toString());
+                                mResult = false;
+                                return;
+                            }
+                            mResult = true;
+                        }
+                    }
+            }
+        }
+
+        public boolean finish() {
+            return mResult;
+        }
+
+        private BluetoothGattCharacteristic getCharacteristic(UUID uuid) {
+            BluetoothGattService valveService = mGatt.getService(steamControllerService);
+            if (valveService == null)
+                return null;
+            return valveService.getCharacteristic(uuid);
+        }
+
+        static public GattOperation readCharacteristic(BluetoothGatt gatt, UUID uuid) {
+            return new GattOperation(gatt, Operation.CHR_READ, uuid);
+        }
+
+        static public GattOperation writeCharacteristic(BluetoothGatt gatt, UUID uuid, byte[] value) {
+            return new GattOperation(gatt, Operation.CHR_WRITE, uuid, value);
+        }
+
+        static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid) {
+            return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid);
+        }
+    }
+
+    public HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
+        mManager = manager;
+        mDevice = device;
+        mDeviceId = mManager.getDeviceIDForIdentifier(getIdentifier());
+        mIsRegistered = false;
+        mIsChromebook = mManager.getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
+        mOperations = new LinkedList<GattOperation>();
+        mHandler = new Handler(Looper.getMainLooper());
+
+        mGatt = connectGatt();
+        // final HIDDeviceBLESteamController finalThis = this;
+        // mHandler.postDelayed(new Runnable() {
+        //     @Override
+        //     public void run() {
+        //         finalThis.checkConnectionForChromebookIssue();
+        //     }
+        // }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
+    }
+
+    public String getIdentifier() {
+        return String.format("SteamController.%s", mDevice.getAddress());
+    }
+
+    public BluetoothGatt getGatt() {
+        return mGatt;
+    }
+
+    // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
+    // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
+    private BluetoothGatt connectGatt(boolean managed) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
+            try {
+                return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
+            } catch (Exception e) {
+                return mDevice.connectGatt(mManager.getContext(), managed, this);
+            }
+        } else {
+            return mDevice.connectGatt(mManager.getContext(), managed, this);
+        }
+    }
+
+    private BluetoothGatt connectGatt() {
+        return connectGatt(false);
+    }
+
+    protected int getConnectionState() {
+
+        Context context = mManager.getContext();
+        if (context == null) {
+            // We are lacking any context to get our Bluetooth information.  We'll just assume disconnected.
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+
+        BluetoothManager btManager = (BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (btManager == null) {
+            // This device doesn't support Bluetooth.  We should never be here, because how did
+            // we instantiate a device to start with?
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+
+        return btManager.getConnectionState(mDevice, BluetoothProfile.GATT);
+    }
+
+    public void reconnect() {
+
+        if (getConnectionState() != BluetoothProfile.STATE_CONNECTED) {
+            mGatt.disconnect();
+            mGatt = connectGatt();
+        }
+
+    }
+
+    protected void checkConnectionForChromebookIssue() {
+        if (!mIsChromebook) {
+            // We only do this on Chromebooks, because otherwise it's really annoying to just attempt
+            // over and over.
+            return;
+        }
+
+        int connectionState = getConnectionState();
+
+        switch (connectionState) {
+            case BluetoothProfile.STATE_CONNECTED:
+                if (!mIsConnected) {
+                    // We are in the Bad Chromebook Place.  We can force a disconnect
+                    // to try to recover.
+                    Log.v(TAG, "Chromebook: We are in a very bad state; the controller shows as connected in the underlying Bluetooth layer, but we never received a callback.  Forcing a reconnect.");
+                    mIsReconnecting = true;
+                    mGatt.disconnect();
+                    mGatt = connectGatt(false);
+                    break;
+                }
+                else if (!isRegistered()) {
+                    if (mGatt.getServices().size() > 0) {
+                        Log.v(TAG, "Chromebook: We are connected to a controller, but never got our registration.  Trying to recover.");
+                        probeService(this);
+                    }
+                    else {
+                        Log.v(TAG, "Chromebook: We are connected to a controller, but never discovered services.  Trying to recover.");
+                        mIsReconnecting = true;
+                        mGatt.disconnect();
+                        mGatt = connectGatt(false);
+                        break;
+                    }
+                }
+                else {
+                    Log.v(TAG, "Chromebook: We are connected, and registered.  Everything's good!");
+                    return;
+                }
+                break;
+
+            case BluetoothProfile.STATE_DISCONNECTED:
+                Log.v(TAG, "Chromebook: We have either been disconnected, or the Chromebook BtGatt.ContextMap bug has bitten us.  Attempting a disconnect/reconnect, but we may not be able to recover.");
+
+                mIsReconnecting = true;
+                mGatt.disconnect();
+                mGatt = connectGatt(false);
+                break;
+
+            case BluetoothProfile.STATE_CONNECTING:
+                Log.v(TAG, "Chromebook: We're still trying to connect.  Waiting a bit longer.");
+                break;
+        }
+
+        final HIDDeviceBLESteamController finalThis = this;
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finalThis.checkConnectionForChromebookIssue();
+            }
+        }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
+    }
+
+    private boolean isRegistered() {
+        return mIsRegistered;
+    }
+
+    private void setRegistered() {
+        mIsRegistered = true;
+    }
+
+    private boolean probeService(HIDDeviceBLESteamController controller) {
+
+        if (isRegistered()) {
+            return true;
+        }
+
+        if (!mIsConnected) {
+            return false;
+        }
+
+        Log.v(TAG, "probeService controller=" + controller);
+
+        for (BluetoothGattService service : mGatt.getServices()) {
+            if (service.getUuid().equals(steamControllerService)) {
+                Log.v(TAG, "Found Valve steam controller service " + service.getUuid());
+
+                for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
+                    if (chr.getUuid().equals(inputCharacteristic)) {
+                        Log.v(TAG, "Found input characteristic");
+                        // Start notifications
+                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+                        if (cccd != null) {
+                            enableNotification(chr.getUuid());
+                        }
+                    }
+                }
+                return true;
+            }
+        }
+
+        if ((mGatt.getServices().size() == 0) && mIsChromebook && !mIsReconnecting) {
+            Log.e(TAG, "Chromebook: Discovered services were empty; this almost certainly means the BtGatt.ContextMap bug has bitten us.");
+            mIsConnected = false;
+            mIsReconnecting = true;
+            mGatt.disconnect();
+            mGatt = connectGatt(false);
+        }
+
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private void finishCurrentGattOperation() {
+        GattOperation op = null;
+        synchronized (mOperations) {
+            if (mCurrentOperation != null) {
+                op = mCurrentOperation;
+                mCurrentOperation = null;
+            }
+        }
+        if (op != null) {
+            boolean result = op.finish(); // TODO: Maybe in main thread as well?
+
+            // Our operation failed, let's add it back to the beginning of our queue.
+            if (!result) {
+                mOperations.addFirst(op);
+            }
+        }
+        executeNextGattOperation();
+    }
+
+    private void executeNextGattOperation() {
+        synchronized (mOperations) {
+            if (mCurrentOperation != null)
+                return;
+
+            if (mOperations.isEmpty())
+                return;
+
+            mCurrentOperation = mOperations.removeFirst();
+        }
+
+        // Run in main thread
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (mOperations) {
+                    if (mCurrentOperation == null) {
+                        Log.e(TAG, "Current operation null in executor?");
+                        return;
+                    }
+
+                    mCurrentOperation.run();
+                    // now wait for the GATT callback and when it comes, finish this operation
+                }
+            }
+        });
+    }
+
+    private void queueGattOperation(GattOperation op) {
+        synchronized (mOperations) {
+            mOperations.add(op);
+        }
+        executeNextGattOperation();
+    }
+
+    private void enableNotification(UUID chrUuid) {
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.enableNotification(mGatt, chrUuid);
+        queueGattOperation(op);
+    }
+
+    public void writeCharacteristic(UUID uuid, byte[] value) {
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.writeCharacteristic(mGatt, uuid, value);
+        queueGattOperation(op);
+    }
+
+    public void readCharacteristic(UUID uuid) {
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.readCharacteristic(mGatt, uuid);
+        queueGattOperation(op);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////  BluetoothGattCallback overridden methods
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public void onConnectionStateChange(BluetoothGatt g, int status, int newState) {
+        //Log.v(TAG, "onConnectionStateChange status=" + status + " newState=" + newState);
+        mIsReconnecting = false;
+        if (newState == 2) {
+            mIsConnected = true;
+            // Run directly, without GattOperation
+            if (!isRegistered()) {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mGatt.discoverServices();
+                    }
+                });
+            }
+        }
+        else if (newState == 0) {
+            mIsConnected = false;
+        }
+
+        // Disconnection is handled in SteamLink using the ACTION_ACL_DISCONNECTED Intent.
+    }
+
+    public void onServicesDiscovered(BluetoothGatt gatt, int status) {
+        //Log.v(TAG, "onServicesDiscovered status=" + status);
+        if (status == 0) {
+            if (gatt.getServices().size() == 0) {
+                Log.v(TAG, "onServicesDiscovered returned zero services; something has gone horribly wrong down in Android's Bluetooth stack.");
+                mIsReconnecting = true;
+                mIsConnected = false;
+                gatt.disconnect();
+                mGatt = connectGatt(false);
+            }
+            else {
+                probeService(this);
+            }
+        }
+    }
+
+    public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        //Log.v(TAG, "onCharacteristicRead status=" + status + " uuid=" + characteristic.getUuid());
+
+        if (characteristic.getUuid().equals(reportCharacteristic) && !mFrozen) {
+            mManager.HIDDeviceFeatureReport(getId(), characteristic.getValue());
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        //Log.v(TAG, "onCharacteristicWrite status=" + status + " uuid=" + characteristic.getUuid());
+
+        if (characteristic.getUuid().equals(reportCharacteristic)) {
+            // Only register controller with the native side once it has been fully configured
+            if (!isRegistered()) {
+                Log.v(TAG, "Registering Steam Controller with ID: " + getId());
+                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0);
+                setRegistered();
+            }
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+    // Enable this for verbose logging of controller input reports
+        //Log.v(TAG, "onCharacteristicChanged uuid=" + characteristic.getUuid() + " data=" + HexDump.dumpHexString(characteristic.getValue()));
+
+        if (characteristic.getUuid().equals(inputCharacteristic) && !mFrozen) {
+            mManager.HIDDeviceInputReport(getId(), characteristic.getValue());
+        }
+    }
+
+    public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        //Log.v(TAG, "onDescriptorRead status=" + status);
+    }
+
+    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        BluetoothGattCharacteristic chr = descriptor.getCharacteristic();
+        //Log.v(TAG, "onDescriptorWrite status=" + status + " uuid=" + chr.getUuid() + " descriptor=" + descriptor.getUuid());
+
+        if (chr.getUuid().equals(inputCharacteristic)) {
+            boolean hasWrittenInputDescriptor = true;
+            BluetoothGattCharacteristic reportChr = chr.getService().getCharacteristic(reportCharacteristic);
+            if (reportChr != null) {
+                Log.v(TAG, "Writing report characteristic to enter valve mode");
+                reportChr.setValue(enterValveMode);
+                gatt.writeCharacteristic(reportChr);
+            }
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
+        //Log.v(TAG, "onReliableWriteCompleted status=" + status);
+    }
+
+    public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
+        //Log.v(TAG, "onReadRemoteRssi status=" + status);
+    }
+
+    public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+        //Log.v(TAG, "onMtuChanged status=" + status);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////// Public API
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public int getId() {
+        return mDeviceId;
+    }
+
+    @Override
+    public int getVendorId() {
+        // Valve Corporation
+        final int VALVE_USB_VID = 0x28DE;
+        return VALVE_USB_VID;
+    }
+
+    @Override
+    public int getProductId() {
+        // We don't have an easy way to query from the Bluetooth device, but we know what it is
+        final int D0G_BLE2_PID = 0x1106;
+        return D0G_BLE2_PID;
+    }
+
+    @Override
+    public String getSerialNumber() {
+        // This will be read later via feature report by Steam
+        return "12345";
+    }
+
+    @Override
+    public int getVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getManufacturerName() {
+        return "Valve Corporation";
+    }
+
+    @Override
+    public String getProductName() {
+        return "Steam Controller";
+    }
+
+    @Override
+    public UsbDevice getDevice() {
+        return null;
+    }
+
+    @Override
+    public boolean open() {
+        return true;
+    }
+
+    @Override
+    public int sendFeatureReport(byte[] report) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted sendFeatureReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return -1;
+        }
+
+        // We need to skip the first byte, as that doesn't go over the air
+        byte[] actual_report = Arrays.copyOfRange(report, 1, report.length - 1);
+        //Log.v(TAG, "sendFeatureReport " + HexDump.dumpHexString(actual_report));
+        writeCharacteristic(reportCharacteristic, actual_report);
+        return report.length;
+    }
+
+    @Override
+    public int sendOutputReport(byte[] report) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted sendOutputReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return -1;
+        }
+
+        //Log.v(TAG, "sendFeatureReport " + HexDump.dumpHexString(report));
+        writeCharacteristic(reportCharacteristic, report);
+        return report.length;
+    }
+
+    @Override
+    public boolean getFeatureReport(byte[] report) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted getFeatureReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return false;
+        }
+
+        //Log.v(TAG, "getFeatureReport");
+        readCharacteristic(reportCharacteristic);
+        return true;
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public void setFrozen(boolean frozen) {
+        mFrozen = frozen;
+    }
+
+    @Override
+    public void shutdown() {
+        close();
+
+        BluetoothGatt g = mGatt;
+        if (g != null) {
+            g.disconnect();
+            g.close();
+            mGatt = null;
+        }
+        mManager = null;
+        mIsRegistered = false;
+        mIsConnected = false;
+        mOperations.clear();
+    }
+
+}
+
diff --git a/app/src/main/engine/org/love2d/sdl/HIDDeviceManager.java b/app/src/main/engine/org/love2d/sdl/HIDDeviceManager.java
new file mode 100644
index 000000000..f37fe6e72
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/HIDDeviceManager.java
@@ -0,0 +1,684 @@
+package org.love2d.sdl;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.os.Build;
+import android.util.Log;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.hardware.usb.*;
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class HIDDeviceManager {
+    private static final String TAG = "hidapi";
+    private static final String ACTION_USB_PERMISSION = "org.love2d.sdl.USB_PERMISSION";
+
+    private static HIDDeviceManager sManager;
+    private static int sManagerRefCount = 0;
+
+    public static HIDDeviceManager acquire(Context context) {
+        if (sManagerRefCount == 0) {
+            sManager = new HIDDeviceManager(context);
+        }
+        ++sManagerRefCount;
+        return sManager;
+    }
+
+    public static void release(HIDDeviceManager manager) {
+        if (manager == sManager) {
+            --sManagerRefCount;
+            if (sManagerRefCount == 0) {
+                sManager.close();
+                sManager = null;
+            }
+        }
+    }
+
+    private Context mContext;
+    private HashMap<Integer, HIDDevice> mDevicesById = new HashMap<Integer, HIDDevice>();
+    private HashMap<BluetoothDevice, HIDDeviceBLESteamController> mBluetoothDevices = new HashMap<BluetoothDevice, HIDDeviceBLESteamController>();
+    private int mNextDeviceId = 0;
+    private SharedPreferences mSharedPreferences = null;
+    private boolean mIsChromebook = false;
+    private UsbManager mUsbManager;
+    private Handler mHandler;
+    private BluetoothManager mBluetoothManager;
+    private List<BluetoothDevice> mLastBluetoothDevices;
+
+    private final BroadcastReceiver mUsbBroadcast = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDeviceAttached(usbDevice);
+            } else if (action.equals(UsbManager.ACTION_USB_DEVICE_DETACHED)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDeviceDetached(usbDevice);
+            } else if (action.equals(HIDDeviceManager.ACTION_USB_PERMISSION)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDevicePermission(usbDevice, intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false));
+            }
+        }
+    };
+
+    private final BroadcastReceiver mBluetoothBroadcast = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            // Bluetooth device was connected. If it was a Steam Controller, handle it
+            if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                Log.d(TAG, "Bluetooth device connected: " + device);
+
+                if (isSteamController(device)) {
+                    connectBluetoothDevice(device);
+                }
+            }
+
+            // Bluetooth device was disconnected, remove from controller manager (if any)
+            if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                Log.d(TAG, "Bluetooth device disconnected: " + device);
+
+                disconnectBluetoothDevice(device);
+            }
+        }
+    };
+
+    private HIDDeviceManager(final Context context) {
+        mContext = context;
+
+        HIDDeviceRegisterCallback();
+
+        mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
+        mIsChromebook = mContext.getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
+
+//        if (shouldClear) {
+//            SharedPreferences.Editor spedit = mSharedPreferences.edit();
+//            spedit.clear();
+//            spedit.commit();
+//        }
+//        else
+        {
+            mNextDeviceId = mSharedPreferences.getInt("next_device_id", 0);
+        }
+    }
+
+    public Context getContext() {
+        return mContext;
+    }
+
+    public int getDeviceIDForIdentifier(String identifier) {
+        SharedPreferences.Editor spedit = mSharedPreferences.edit();
+
+        int result = mSharedPreferences.getInt(identifier, 0);
+        if (result == 0) {
+            result = mNextDeviceId++;
+            spedit.putInt("next_device_id", mNextDeviceId);
+        }
+
+        spedit.putInt(identifier, result);
+        spedit.commit();
+        return result;
+    }
+
+    private void initializeUSB() {
+        mUsbManager = (UsbManager)mContext.getSystemService(Context.USB_SERVICE);
+        if (mUsbManager == null) {
+            return;
+        }
+
+        /*
+        // Logging
+        for (UsbDevice device : mUsbManager.getDeviceList().values()) {
+            Log.i(TAG,"Path: " + device.getDeviceName());
+            Log.i(TAG,"Manufacturer: " + device.getManufacturerName());
+            Log.i(TAG,"Product: " + device.getProductName());
+            Log.i(TAG,"ID: " + device.getDeviceId());
+            Log.i(TAG,"Class: " + device.getDeviceClass());
+            Log.i(TAG,"Protocol: " + device.getDeviceProtocol());
+            Log.i(TAG,"Vendor ID " + device.getVendorId());
+            Log.i(TAG,"Product ID: " + device.getProductId());
+            Log.i(TAG,"Interface count: " + device.getInterfaceCount());
+            Log.i(TAG,"---------------------------------------");
+
+            // Get interface details
+            for (int index = 0; index < device.getInterfaceCount(); index++) {
+                UsbInterface mUsbInterface = device.getInterface(index);
+                Log.i(TAG,"  *****     *****");
+                Log.i(TAG,"  Interface index: " + index);
+                Log.i(TAG,"  Interface ID: " + mUsbInterface.getId());
+                Log.i(TAG,"  Interface class: " + mUsbInterface.getInterfaceClass());
+                Log.i(TAG,"  Interface subclass: " + mUsbInterface.getInterfaceSubclass());
+                Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
+                Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
+
+                // Get endpoint details
+                for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
+                {
+                    UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
+                    Log.i(TAG,"    ++++   ++++   ++++");
+                    Log.i(TAG,"    Endpoint index: " + epi);
+                    Log.i(TAG,"    Attributes: " + mEndpoint.getAttributes());
+                    Log.i(TAG,"    Direction: " + mEndpoint.getDirection());
+                    Log.i(TAG,"    Number: " + mEndpoint.getEndpointNumber());
+                    Log.i(TAG,"    Interval: " + mEndpoint.getInterval());
+                    Log.i(TAG,"    Packet size: " + mEndpoint.getMaxPacketSize());
+                    Log.i(TAG,"    Type: " + mEndpoint.getType());
+                }
+            }
+        }
+        Log.i(TAG," No more devices connected.");
+        */
+
+        // Register for USB broadcasts and permission completions
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
+        filter.addAction(HIDDeviceManager.ACTION_USB_PERMISSION);
+        mContext.registerReceiver(mUsbBroadcast, filter);
+
+        for (UsbDevice usbDevice : mUsbManager.getDeviceList().values()) {
+            handleUsbDeviceAttached(usbDevice);
+        }
+    }
+
+    UsbManager getUSBManager() {
+        return mUsbManager;
+    }
+
+    private void shutdownUSB() {
+        try {
+            mContext.unregisterReceiver(mUsbBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
+    }
+
+    private boolean isHIDDeviceInterface(UsbDevice usbDevice, UsbInterface usbInterface) {
+        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_HID) {
+            return true;
+        }
+        if (isXbox360Controller(usbDevice, usbInterface) || isXboxOneController(usbDevice, usbInterface)) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isXbox360Controller(UsbDevice usbDevice, UsbInterface usbInterface) {
+        final int XB360_IFACE_SUBCLASS = 93;
+        final int XB360_IFACE_PROTOCOL = 1; // Wired
+        final int XB360W_IFACE_PROTOCOL = 129; // Wireless
+        final int[] SUPPORTED_VENDORS = {
+            0x0079, // GPD Win 2
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x046d, // Logitech
+            0x056e, // Elecom
+            0x06a3, // Saitek
+            0x0738, // Mad Catz
+            0x07ff, // Mad Catz
+            0x0e6f, // PDP
+            0x0f0d, // Hori
+            0x1038, // SteelSeries
+            0x11c9, // Nacon
+            0x12ab, // Unknown
+            0x1430, // RedOctane
+            0x146b, // BigBen
+            0x1532, // Razer Sabertooth
+            0x15e4, // Numark
+            0x162e, // Joytech
+            0x1689, // Razer Onza
+            0x1949, // Lab126, Inc.
+            0x1bad, // Harmonix
+            0x20d6, // PowerA
+            0x24c6, // PowerA
+            0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x9886, // ASTRO Gaming
+        };
+
+        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+            usbInterface.getInterfaceSubclass() == XB360_IFACE_SUBCLASS &&
+            (usbInterface.getInterfaceProtocol() == XB360_IFACE_PROTOCOL ||
+             usbInterface.getInterfaceProtocol() == XB360W_IFACE_PROTOCOL)) {
+            int vendor_id = usbDevice.getVendorId();
+            for (int supportedVid : SUPPORTED_VENDORS) {
+                if (vendor_id == supportedVid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterface) {
+        final int XB1_IFACE_SUBCLASS = 71;
+        final int XB1_IFACE_PROTOCOL = 208;
+        final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x0738, // Mad Catz
+            0x0e6f, // PDP
+            0x0f0d, // Hori
+            0x10f5, // Turtle Beach
+            0x1532, // Razer Wildcat
+            0x20d6, // PowerA
+            0x24c6, // PowerA
+            0x2dc8, // 8BitDo
+            0x2e24, // Hyperkin
+        };
+
+        if (usbInterface.getId() == 0 &&
+            usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+            usbInterface.getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
+            usbInterface.getInterfaceProtocol() == XB1_IFACE_PROTOCOL) {
+            int vendor_id = usbDevice.getVendorId();
+            for (int supportedVid : SUPPORTED_VENDORS) {
+                if (vendor_id == supportedVid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private void handleUsbDeviceAttached(UsbDevice usbDevice) {
+        connectHIDDeviceUSB(usbDevice);
+    }
+
+    private void handleUsbDeviceDetached(UsbDevice usbDevice) {
+        List<Integer> devices = new ArrayList<Integer>();
+        for (HIDDevice device : mDevicesById.values()) {
+            if (usbDevice.equals(device.getDevice())) {
+                devices.add(device.getId());
+            }
+        }
+        for (int id : devices) {
+            HIDDevice device = mDevicesById.get(id);
+            mDevicesById.remove(id);
+            device.shutdown();
+            HIDDeviceDisconnected(id);
+        }
+    }
+
+    private void handleUsbDevicePermission(UsbDevice usbDevice, boolean permission_granted) {
+        for (HIDDevice device : mDevicesById.values()) {
+            if (usbDevice.equals(device.getDevice())) {
+                boolean opened = false;
+                if (permission_granted) {
+                    opened = device.open();
+                }
+                HIDDeviceOpenResult(device.getId(), opened);
+            }
+        }
+    }
+
+    private void connectHIDDeviceUSB(UsbDevice usbDevice) {
+        synchronized (this) {
+            int interface_mask = 0;
+            for (int interface_index = 0; interface_index < usbDevice.getInterfaceCount(); interface_index++) {
+                UsbInterface usbInterface = usbDevice.getInterface(interface_index);
+                if (isHIDDeviceInterface(usbDevice, usbInterface)) {
+                    // Check to see if we've already added this interface
+                    // This happens with the Xbox Series X controller which has a duplicate interface 0, which is inactive
+                    int interface_id = usbInterface.getId();
+                    if ((interface_mask & (1 << interface_id)) != 0) {
+                        continue;
+                    }
+                    interface_mask |= (1 << interface_id);
+
+                    HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index);
+                    int id = device.getId();
+                    mDevicesById.put(id, device);
+                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol());
+                }
+            }
+        }
+    }
+
+    private void initializeBluetooth() {
+        Log.d(TAG, "Initializing Bluetooth");
+
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
+            return;
+        }
+
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
+            return;
+        }
+
+        // Find bonded bluetooth controllers and create SteamControllers for them
+        mBluetoothManager = (BluetoothManager)mContext.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (mBluetoothManager == null) {
+            // This device doesn't support Bluetooth.
+            return;
+        }
+
+        BluetoothAdapter btAdapter = mBluetoothManager.getAdapter();
+        if (btAdapter == null) {
+            // This device has Bluetooth support in the codebase, but has no available adapters.
+            return;
+        }
+
+        // Get our bonded devices.
+        for (BluetoothDevice device : btAdapter.getBondedDevices()) {
+
+            Log.d(TAG, "Bluetooth device available: " + device);
+            if (isSteamController(device)) {
+                connectBluetoothDevice(device);
+            }
+
+        }
+
+        // NOTE: These don't work on Chromebooks, to my undying dismay.
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+        mContext.registerReceiver(mBluetoothBroadcast, filter);
+
+        if (mIsChromebook) {
+            mHandler = new Handler(Looper.getMainLooper());
+            mLastBluetoothDevices = new ArrayList<BluetoothDevice>();
+
+            // final HIDDeviceManager finalThis = this;
+            // mHandler.postDelayed(new Runnable() {
+            //     @Override
+            //     public void run() {
+            //         finalThis.chromebookConnectionHandler();
+            //     }
+            // }, 5000);
+        }
+    }
+
+    private void shutdownBluetooth() {
+        try {
+            mContext.unregisterReceiver(mBluetoothBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
+    }
+
+    // Chromebooks do not pass along ACTION_ACL_CONNECTED / ACTION_ACL_DISCONNECTED properly.
+    // This function provides a sort of dummy version of that, watching for changes in the
+    // connected devices and attempting to add controllers as things change.
+    public void chromebookConnectionHandler() {
+        if (!mIsChromebook) {
+            return;
+        }
+
+        ArrayList<BluetoothDevice> disconnected = new ArrayList<BluetoothDevice>();
+        ArrayList<BluetoothDevice> connected = new ArrayList<BluetoothDevice>();
+
+        List<BluetoothDevice> currentConnected = mBluetoothManager.getConnectedDevices(BluetoothProfile.GATT);
+
+        for (BluetoothDevice bluetoothDevice : currentConnected) {
+            if (!mLastBluetoothDevices.contains(bluetoothDevice)) {
+                connected.add(bluetoothDevice);
+            }
+        }
+        for (BluetoothDevice bluetoothDevice : mLastBluetoothDevices) {
+            if (!currentConnected.contains(bluetoothDevice)) {
+                disconnected.add(bluetoothDevice);
+            }
+        }
+
+        mLastBluetoothDevices = currentConnected;
+
+        for (BluetoothDevice bluetoothDevice : disconnected) {
+            disconnectBluetoothDevice(bluetoothDevice);
+        }
+        for (BluetoothDevice bluetoothDevice : connected) {
+            connectBluetoothDevice(bluetoothDevice);
+        }
+
+        final HIDDeviceManager finalThis = this;
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finalThis.chromebookConnectionHandler();
+            }
+        }, 10000);
+    }
+
+    public boolean connectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+        Log.v(TAG, "connectBluetoothDevice device=" + bluetoothDevice);
+        synchronized (this) {
+            if (mBluetoothDevices.containsKey(bluetoothDevice)) {
+                Log.v(TAG, "Steam controller with address " + bluetoothDevice + " already exists, attempting reconnect");
+
+                HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
+                device.reconnect();
+
+                return false;
+            }
+            HIDDeviceBLESteamController device = new HIDDeviceBLESteamController(this, bluetoothDevice);
+            int id = device.getId();
+            mBluetoothDevices.put(bluetoothDevice, device);
+            mDevicesById.put(id, device);
+
+            // The Steam Controller will mark itself connected once initialization is complete
+        }
+        return true;
+    }
+
+    public void disconnectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+        synchronized (this) {
+            HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
+            if (device == null)
+                return;
+
+            int id = device.getId();
+            mBluetoothDevices.remove(bluetoothDevice);
+            mDevicesById.remove(id);
+            device.shutdown();
+            HIDDeviceDisconnected(id);
+        }
+    }
+
+    public boolean isSteamController(BluetoothDevice bluetoothDevice) {
+        // Sanity check.  If you pass in a null device, by definition it is never a Steam Controller.
+        if (bluetoothDevice == null) {
+            return false;
+        }
+
+        // If the device has no local name, we really don't want to try an equality check against it.
+        if (bluetoothDevice.getName() == null) {
+            return false;
+        }
+
+        return bluetoothDevice.getName().equals("SteamController") && ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) != 0);
+    }
+
+    private void close() {
+        shutdownUSB();
+        shutdownBluetooth();
+        synchronized (this) {
+            for (HIDDevice device : mDevicesById.values()) {
+                device.shutdown();
+            }
+            mDevicesById.clear();
+            mBluetoothDevices.clear();
+            HIDDeviceReleaseCallback();
+        }
+    }
+
+    public void setFrozen(boolean frozen) {
+        synchronized (this) {
+            for (HIDDevice device : mDevicesById.values()) {
+                device.setFrozen(frozen);
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private HIDDevice getDevice(int id) {
+        synchronized (this) {
+            HIDDevice result = mDevicesById.get(id);
+            if (result == null) {
+                Log.v(TAG, "No device for id: " + id);
+                Log.v(TAG, "Available devices: " + mDevicesById.keySet());
+            }
+            return result;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////// JNI interface functions
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public boolean initialize(boolean usb, boolean bluetooth) {
+        Log.v(TAG, "initialize(" + usb + ", " + bluetooth + ")");
+
+        if (usb) {
+            initializeUSB();
+        }
+        if (bluetooth) {
+            initializeBluetooth();
+        }
+        return true;
+    }
+
+    public boolean openDevice(int deviceID) {
+        Log.v(TAG, "openDevice deviceID=" + deviceID);
+        HIDDevice device = getDevice(deviceID);
+        if (device == null) {
+            HIDDeviceDisconnected(deviceID);
+            return false;
+        }
+
+        // Look to see if this is a USB device and we have permission to access it
+        UsbDevice usbDevice = device.getDevice();
+        if (usbDevice != null && !mUsbManager.hasPermission(usbDevice)) {
+            HIDDeviceOpenPending(deviceID);
+            try {
+                final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
+                int flags;
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                    flags = FLAG_MUTABLE;
+                } else {
+                    flags = 0;
+                }
+                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+            } catch (Exception e) {
+                Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
+                HIDDeviceOpenResult(deviceID, false);
+            }
+            return false;
+        }
+
+        try {
+            return device.open();
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return false;
+    }
+
+    public int sendOutputReport(int deviceID, byte[] report) {
+        try {
+            //Log.v(TAG, "sendOutputReport deviceID=" + deviceID + " length=" + report.length);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return -1;
+            }
+
+            return device.sendOutputReport(report);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return -1;
+    }
+
+    public int sendFeatureReport(int deviceID, byte[] report) {
+        try {
+            //Log.v(TAG, "sendFeatureReport deviceID=" + deviceID + " length=" + report.length);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return -1;
+            }
+
+            return device.sendFeatureReport(report);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return -1;
+    }
+
+    public boolean getFeatureReport(int deviceID, byte[] report) {
+        try {
+            //Log.v(TAG, "getFeatureReport deviceID=" + deviceID);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return false;
+            }
+
+            return device.getFeatureReport(report);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return false;
+    }
+
+    public void closeDevice(int deviceID) {
+        try {
+            Log.v(TAG, "closeDevice deviceID=" + deviceID);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return;
+            }
+
+            device.close();
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////// Native methods
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private native void HIDDeviceRegisterCallback();
+    private native void HIDDeviceReleaseCallback();
+
+    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol);
+    native void HIDDeviceOpenPending(int deviceID);
+    native void HIDDeviceOpenResult(int deviceID, boolean opened);
+    native void HIDDeviceDisconnected(int deviceID);
+
+    native void HIDDeviceInputReport(int deviceID, byte[] report);
+    native void HIDDeviceFeatureReport(int deviceID, byte[] report);
+}
diff --git a/app/src/main/engine/org/love2d/sdl/HIDDeviceUSB.java b/app/src/main/engine/org/love2d/sdl/HIDDeviceUSB.java
new file mode 100644
index 000000000..dcd8daa4c
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/HIDDeviceUSB.java
@@ -0,0 +1,309 @@
+package org.love2d.sdl;
+
+import android.hardware.usb.*;
+import android.os.Build;
+import android.util.Log;
+import java.util.Arrays;
+
+class HIDDeviceUSB implements HIDDevice {
+
+    private static final String TAG = "hidapi";
+
+    protected HIDDeviceManager mManager;
+    protected UsbDevice mDevice;
+    protected int mInterfaceIndex;
+    protected int mInterface;
+    protected int mDeviceId;
+    protected UsbDeviceConnection mConnection;
+    protected UsbEndpoint mInputEndpoint;
+    protected UsbEndpoint mOutputEndpoint;
+    protected InputThread mInputThread;
+    protected boolean mRunning;
+    protected boolean mFrozen;
+
+    public HIDDeviceUSB(HIDDeviceManager manager, UsbDevice usbDevice, int interface_index) {
+        mManager = manager;
+        mDevice = usbDevice;
+        mInterfaceIndex = interface_index;
+        mInterface = mDevice.getInterface(mInterfaceIndex).getId();
+        mDeviceId = manager.getDeviceIDForIdentifier(getIdentifier());
+        mRunning = false;
+    }
+
+    public String getIdentifier() {
+        return String.format("%s/%x/%x/%d", mDevice.getDeviceName(), mDevice.getVendorId(), mDevice.getProductId(), mInterfaceIndex);
+    }
+
+    @Override
+    public int getId() {
+        return mDeviceId;
+    }
+
+    @Override
+    public int getVendorId() {
+        return mDevice.getVendorId();
+    }
+
+    @Override
+    public int getProductId() {
+        return mDevice.getProductId();
+    }
+
+    @Override
+    public String getSerialNumber() {
+        String result = null;
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            try {
+                result = mDevice.getSerialNumber();
+            }
+            catch (SecurityException exception) {
+                //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
+            }
+        }
+        if (result == null) {
+            result = "";
+        }
+        return result;
+    }
+
+    @Override
+    public int getVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getManufacturerName() {
+        String result = null;
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            result = mDevice.getManufacturerName();
+        }
+        if (result == null) {
+            result = String.format("%x", getVendorId());
+        }
+        return result;
+    }
+
+    @Override
+    public String getProductName() {
+        String result = null;
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            result = mDevice.getProductName();
+        }
+        if (result == null) {
+            result = String.format("%x", getProductId());
+        }
+        return result;
+    }
+
+    @Override
+    public UsbDevice getDevice() {
+        return mDevice;
+    }
+
+    public String getDeviceName() {
+        return getManufacturerName() + " " + getProductName() + "(0x" + String.format("%x", getVendorId()) + "/0x" + String.format("%x", getProductId()) + ")";
+    }
+
+    @Override
+    public boolean open() {
+        mConnection = mManager.getUSBManager().openDevice(mDevice);
+        if (mConnection == null) {
+            Log.w(TAG, "Unable to open USB device " + getDeviceName());
+            return false;
+        }
+
+        // Force claim our interface
+        UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+        if (!mConnection.claimInterface(iface, true)) {
+            Log.w(TAG, "Failed to claim interfaces on USB device " + getDeviceName());
+            close();
+            return false;
+        }
+
+        // Find the endpoints
+        for (int j = 0; j < iface.getEndpointCount(); j++) {
+            UsbEndpoint endpt = iface.getEndpoint(j);
+            switch (endpt.getDirection()) {
+            case UsbConstants.USB_DIR_IN:
+                if (mInputEndpoint == null) {
+                    mInputEndpoint = endpt;
+                }
+                break;
+            case UsbConstants.USB_DIR_OUT:
+                if (mOutputEndpoint == null) {
+                    mOutputEndpoint = endpt;
+                }
+                break;
+            }
+        }
+
+        // Make sure the required endpoints were present
+        if (mInputEndpoint == null || mOutputEndpoint == null) {
+            Log.w(TAG, "Missing required endpoint on USB device " + getDeviceName());
+            close();
+            return false;
+        }
+
+        // Start listening for input
+        mRunning = true;
+        mInputThread = new InputThread();
+        mInputThread.start();
+
+        return true;
+    }
+
+    @Override
+    public int sendFeatureReport(byte[] report) {
+        int res = -1;
+        int offset = 0;
+        int length = report.length;
+        boolean skipped_report_id = false;
+        byte report_number = report[0];
+
+        if (report_number == 0x0) {
+            ++offset;
+            --length;
+            skipped_report_id = true;
+        }
+
+        res = mConnection.controlTransfer(
+            UsbConstants.USB_TYPE_CLASS | 0x01 /*RECIPIENT_INTERFACE*/ | UsbConstants.USB_DIR_OUT,
+            0x09/*HID set_report*/,
+            (3/*HID feature*/ << 8) | report_number,
+            mInterface,
+            report, offset, length,
+            1000/*timeout millis*/);
+
+        if (res < 0) {
+            Log.w(TAG, "sendFeatureReport() returned " + res + " on device " + getDeviceName());
+            return -1;
+        }
+
+        if (skipped_report_id) {
+            ++length;
+        }
+        return length;
+    }
+
+    @Override
+    public int sendOutputReport(byte[] report) {
+        int r = mConnection.bulkTransfer(mOutputEndpoint, report, report.length, 1000);
+        if (r != report.length) {
+            Log.w(TAG, "sendOutputReport() returned " + r + " on device " + getDeviceName());
+        }
+        return r;
+    }
+
+    @Override
+    public boolean getFeatureReport(byte[] report) {
+        int res = -1;
+        int offset = 0;
+        int length = report.length;
+        boolean skipped_report_id = false;
+        byte report_number = report[0];
+
+        if (report_number == 0x0) {
+            /* Offset the return buffer by 1, so that the report ID
+               will remain in byte 0. */
+            ++offset;
+            --length;
+            skipped_report_id = true;
+        }
+
+        res = mConnection.controlTransfer(
+            UsbConstants.USB_TYPE_CLASS | 0x01 /*RECIPIENT_INTERFACE*/ | UsbConstants.USB_DIR_IN,
+            0x01/*HID get_report*/,
+            (3/*HID feature*/ << 8) | report_number,
+            mInterface,
+            report, offset, length,
+            1000/*timeout millis*/);
+
+        if (res < 0) {
+            Log.w(TAG, "getFeatureReport() returned " + res + " on device " + getDeviceName());
+            return false;
+        }
+
+        if (skipped_report_id) {
+            ++res;
+            ++length;
+        }
+
+        byte[] data;
+        if (res == length) {
+            data = report;
+        } else {
+            data = Arrays.copyOfRange(report, 0, res);
+        }
+        mManager.HIDDeviceFeatureReport(mDeviceId, data);
+
+        return true;
+    }
+
+    @Override
+    public void close() {
+        mRunning = false;
+        if (mInputThread != null) {
+            while (mInputThread.isAlive()) {
+                mInputThread.interrupt();
+                try {
+                    mInputThread.join();
+                } catch (InterruptedException e) {
+                    // Keep trying until we're done
+                }
+            }
+            mInputThread = null;
+        }
+        if (mConnection != null) {
+            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+            mConnection.releaseInterface(iface);
+            mConnection.close();
+            mConnection = null;
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        close();
+        mManager = null;
+    }
+
+    @Override
+    public void setFrozen(boolean frozen) {
+        mFrozen = frozen;
+    }
+
+    protected class InputThread extends Thread {
+        @Override
+        public void run() {
+            int packetSize = mInputEndpoint.getMaxPacketSize();
+            byte[] packet = new byte[packetSize];
+            while (mRunning) {
+                int r;
+                try
+                {
+                    r = mConnection.bulkTransfer(mInputEndpoint, packet, packetSize, 1000);
+                }
+                catch (Exception e)
+                {
+                    Log.v(TAG, "Exception in UsbDeviceConnection bulktransfer: " + e);
+                    break;
+                }
+                if (r < 0) {
+                    // Could be a timeout or an I/O error
+                }
+                if (r > 0) {
+                    byte[] data;
+                    if (r == packetSize) {
+                        data = packet;
+                    } else {
+                        data = Arrays.copyOfRange(packet, 0, r);
+                    }
+
+                    if (!mFrozen) {
+                        mManager.HIDDeviceInputReport(mDeviceId, data);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/engine/org/love2d/sdl/SDL.java b/app/src/main/engine/org/love2d/sdl/SDL.java
new file mode 100644
index 000000000..1c79abde4
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/SDL.java
@@ -0,0 +1,86 @@
+package org.love2d.sdl;
+
+import android.content.Context;
+
+import java.lang.Class;
+import java.lang.reflect.Method;
+
+/**
+    SDL library initialization
+*/
+public class SDL {
+
+    // This function should be called first and sets up the native code
+    // so it can call into the Java classes
+    public static void setupJNI() {
+        SDLActivity.nativeSetupJNI();
+        SDLAudioManager.nativeSetupJNI();
+        SDLControllerManager.nativeSetupJNI();
+    }
+
+    // This function should be called each time the activity is started
+    public static void initialize() {
+        setContext(null);
+
+        SDLActivity.initialize();
+        SDLAudioManager.initialize();
+        SDLControllerManager.initialize();
+    }
+
+    // This function stores the current activity (SDL or not)
+    public static void setContext(Context context) {
+        SDLAudioManager.setContext(context);
+        mContext = context;
+    }
+
+    public static Context getContext() {
+        return mContext;
+    }
+
+    public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+
+        if (libraryName == null) {
+            throw new NullPointerException("No library name provided.");
+        }
+
+        try {
+            // Let's see if we have ReLinker available in the project.  This is necessary for 
+            // some projects that have huge numbers of local libraries bundled, and thus may 
+            // trip a bug in Android's native library loader which ReLinker works around.  (If
+            // loadLibrary works properly, ReLinker will simply use the normal Android method
+            // internally.)
+            //
+            // To use ReLinker, just add it as a dependency.  For more information, see 
+            // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
+            //
+            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+
+            // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
+            // they've changed during updates.
+            Method forceMethod = relinkClass.getDeclaredMethod("force");
+            Object relinkInstance = forceMethod.invoke(null);
+            Class<?> relinkInstanceClass = relinkInstance.getClass();
+
+            // Actually load the library!
+            Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
+            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+        }
+        catch (final Throwable e) {
+            // Fall back
+            try {
+                System.loadLibrary(libraryName);
+            }
+            catch (final UnsatisfiedLinkError ule) {
+                throw ule;
+            }
+            catch (final SecurityException se) {
+                throw se;
+            }
+        }
+    }
+
+    protected static Context mContext;
+}
diff --git a/app/src/main/engine/org/love2d/sdl/SDLActivity.java b/app/src/main/engine/org/love2d/sdl/SDLActivity.java
new file mode 100644
index 000000000..f703e5ea6
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/SDLActivity.java
@@ -0,0 +1,2148 @@
+package org.love2d.sdl;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.UiModeManager;
+import android.content.ClipboardManager;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.Selection;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.PointerIcon;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.Hashtable;
+import java.util.Locale;
+
+
+/**
+    SDL Activity
+*/
+public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
+    private static final String TAG = "SDL";
+    private static final int SDL_MAJOR_VERSION = 2;
+    private static final int SDL_MINOR_VERSION = 28;
+    private static final int SDL_MICRO_VERSION = 5;
+/*
+    // Display InputType.SOURCE/CLASS of events and devices
+    //
+    // SDLActivity.debugSource(device.getSources(), "device[" + device.getName() + "]");
+    // SDLActivity.debugSource(event.getSource(), "event");
+    public static void debugSource(int sources, String prefix) {
+        int s = sources;
+        int s_copy = sources;
+        String cls = "";
+        String src = "";
+        int tst = 0;
+        int FLAG_TAINTED = 0x80000000;
+
+        if ((s & InputDevice.SOURCE_CLASS_BUTTON) != 0)     cls += " BUTTON";
+        if ((s & InputDevice.SOURCE_CLASS_JOYSTICK) != 0)   cls += " JOYSTICK";
+        if ((s & InputDevice.SOURCE_CLASS_POINTER) != 0)    cls += " POINTER";
+        if ((s & InputDevice.SOURCE_CLASS_POSITION) != 0)   cls += " POSITION";
+        if ((s & InputDevice.SOURCE_CLASS_TRACKBALL) != 0)  cls += " TRACKBALL";
+
+
+        int s2 = s_copy & ~InputDevice.SOURCE_ANY; // keep class bits
+        s2 &= ~(  InputDevice.SOURCE_CLASS_BUTTON
+                | InputDevice.SOURCE_CLASS_JOYSTICK
+                | InputDevice.SOURCE_CLASS_POINTER
+                | InputDevice.SOURCE_CLASS_POSITION
+                | InputDevice.SOURCE_CLASS_TRACKBALL);
+
+        if (s2 != 0) cls += "Some_Unkown";
+
+        s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
+
+        if (Build.VERSION.SDK_INT >= 23) {
+            tst = InputDevice.SOURCE_BLUETOOTH_STYLUS;
+            if ((s & tst) == tst) src += " BLUETOOTH_STYLUS";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_DPAD;
+        if ((s & tst) == tst) src += " DPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_GAMEPAD;
+        if ((s & tst) == tst) src += " GAMEPAD";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            tst = InputDevice.SOURCE_HDMI;
+            if ((s & tst) == tst) src += " HDMI";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_JOYSTICK;
+        if ((s & tst) == tst) src += " JOYSTICK";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_KEYBOARD;
+        if ((s & tst) == tst) src += " KEYBOARD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_MOUSE;
+        if ((s & tst) == tst) src += " MOUSE";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 26) {
+            tst = InputDevice.SOURCE_MOUSE_RELATIVE;
+            if ((s & tst) == tst) src += " MOUSE_RELATIVE";
+            s2 &= ~tst;
+
+            tst = InputDevice.SOURCE_ROTARY_ENCODER;
+            if ((s & tst) == tst) src += " ROTARY_ENCODER";
+            s2 &= ~tst;
+        }
+        tst = InputDevice.SOURCE_STYLUS;
+        if ((s & tst) == tst) src += " STYLUS";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCHPAD;
+        if ((s & tst) == tst) src += " TOUCHPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCHSCREEN;
+        if ((s & tst) == tst) src += " TOUCHSCREEN";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 18) {
+            tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
+            if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_TRACKBALL;
+        if ((s & tst) == tst) src += " TRACKBALL";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_ANY;
+        if ((s & tst) == tst) src += " ANY";
+        s2 &= ~tst;
+
+        if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
+        s2 &= ~FLAG_TAINTED;
+
+        if (s2 != 0) src += " Some_Unkown";
+
+        Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
+    }
+*/
+
+    public static boolean mIsResumedCalled, mHasFocus;
+    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24  /* Android 7.0 (N) */);
+
+    // Cursor types
+    // private static final int SDL_SYSTEM_CURSOR_NONE = -1;
+    private static final int SDL_SYSTEM_CURSOR_ARROW = 0;
+    private static final int SDL_SYSTEM_CURSOR_IBEAM = 1;
+    private static final int SDL_SYSTEM_CURSOR_WAIT = 2;
+    private static final int SDL_SYSTEM_CURSOR_CROSSHAIR = 3;
+    private static final int SDL_SYSTEM_CURSOR_WAITARROW = 4;
+    private static final int SDL_SYSTEM_CURSOR_SIZENWSE = 5;
+    private static final int SDL_SYSTEM_CURSOR_SIZENESW = 6;
+    private static final int SDL_SYSTEM_CURSOR_SIZEWE = 7;
+    private static final int SDL_SYSTEM_CURSOR_SIZENS = 8;
+    private static final int SDL_SYSTEM_CURSOR_SIZEALL = 9;
+    private static final int SDL_SYSTEM_CURSOR_NO = 10;
+    private static final int SDL_SYSTEM_CURSOR_HAND = 11;
+
+    protected static final int SDL_ORIENTATION_UNKNOWN = 0;
+    protected static final int SDL_ORIENTATION_LANDSCAPE = 1;
+    protected static final int SDL_ORIENTATION_LANDSCAPE_FLIPPED = 2;
+    protected static final int SDL_ORIENTATION_PORTRAIT = 3;
+    protected static final int SDL_ORIENTATION_PORTRAIT_FLIPPED = 4;
+
+    protected static int mCurrentOrientation;
+    protected static Locale mCurrentLocale;
+
+    // Handle the state of the native layer
+    public enum NativeState {
+           INIT, RESUMED, PAUSED
+    }
+
+    public static NativeState mNextNativeState;
+    public static NativeState mCurrentNativeState;
+
+    public static boolean mExitCalledFromJava; // love2d-mod: allow restarting of the native thread
+
+    /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
+    public static boolean mBrokenLibraries = true;
+
+    // Main components
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static DummyEdit mTextEdit;
+    protected static boolean mScreenKeyboardShown;
+    protected static ViewGroup mLayout;
+    protected static SDLClipboardHandler mClipboardHandler;
+    protected static Hashtable<Integer, PointerIcon> mCursors;
+    protected static int mLastCursorID;
+    protected static SDLGenericMotionListener_API12 mMotionListener;
+    protected static HIDDeviceManager mHIDDeviceManager;
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    protected static Thread mSDLThread;
+
+    protected static SDLGenericMotionListener_API12 getMotionListener() {
+        if (mMotionListener == null) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
+                mMotionListener = new SDLGenericMotionListener_API26();
+            } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                mMotionListener = new SDLGenericMotionListener_API24();
+            } else {
+                mMotionListener = new SDLGenericMotionListener_API12();
+            }
+        }
+
+        return mMotionListener;
+    }
+
+    /**
+     * This method returns the name of the shared object with the application entry point
+     * It can be overridden by derived classes.
+     */
+    protected String getMainSharedObject() {
+        String library;
+        String[] libraries = SDLActivity.mSingleton.getLibraries();
+        if (libraries.length > 0) {
+            library = "lib" + libraries[libraries.length - 1] + ".so";
+        } else {
+            library = "libmain.so";
+        }
+        return getContext().getApplicationInfo().nativeLibraryDir + "/" + library;
+    }
+
+    /**
+     * This method returns the name of the application entry point
+     * It can be overridden by derived classes.
+     */
+    protected String getMainFunction() {
+        return "SDL_main";
+    }
+
+    /**
+     * This method is called by SDL before loading the native shared libraries.
+     * It can be overridden to provide names of shared libraries to be loaded.
+     * The default implementation returns the defaults. It never returns null.
+     * An array returned by a new implementation must at least contain "SDL2".
+     * Also keep in mind that the order the libraries are loaded may matter.
+     * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
+     */
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            // "SDL2_image",
+            // "SDL2_mixer",
+            // "SDL2_net",
+            // "SDL2_ttf",
+            "main"
+        };
+    }
+
+    // Load the .so
+    public void loadLibraries() {
+       for (String lib : getLibraries()) {
+          SDL.loadLibrary(lib);
+       }
+    }
+
+    /**
+     * This method is called by SDL before starting the native application thread.
+     * It can be overridden to provide the arguments after the application name.
+     * The default implementation returns an empty array. It never returns null.
+     * @return arguments for the native application.
+     */
+    protected String[] getArguments() {
+        return new String[0];
+    }
+
+    public static void initialize() {
+        // The static nature of the singleton and Android quirkyness force us to initialize everything here
+        // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+        mSingleton = null;
+        mSurface = null;
+        mTextEdit = null;
+        mLayout = null;
+        mClipboardHandler = null;
+        mCursors = new Hashtable<Integer, PointerIcon>();
+        mLastCursorID = 0;
+        mSDLThread = null;
+        mExitCalledFromJava = false; // love2d-mod: allow restarting of the native thread
+        mIsResumedCalled = false;
+        mHasFocus = true;
+        mNextNativeState = NativeState.INIT;
+        mCurrentNativeState = NativeState.INIT;
+    }
+    
+    protected SDLSurface createSDLSurface(Context context) {
+        return new SDLSurface(context);
+    }
+
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.v(TAG, "Device: " + Build.DEVICE);
+        Log.v(TAG, "Model: " + Build.MODEL);
+        Log.v(TAG, "onCreate()");
+        super.onCreate(savedInstanceState);
+
+        try {
+            Thread.currentThread().setName("SDLActivity");
+        } catch (Exception e) {
+            Log.v(TAG, "modify thread properties failed " + e.toString());
+        }
+
+        // Load shared libraries
+        String errorMsgBrokenLib = "";
+        try {
+            loadLibraries();
+            mBrokenLibraries = false; /* success */
+        } catch(UnsatisfiedLinkError e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        } catch(Exception e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        }
+
+        if (!mBrokenLibraries) {
+            String expected_version = String.valueOf(SDL_MAJOR_VERSION) + "." +
+                                      String.valueOf(SDL_MINOR_VERSION) + "." +
+                                      String.valueOf(SDL_MICRO_VERSION);
+            String version = nativeGetVersion();
+            if (!version.equals(expected_version)) {
+                mBrokenLibraries = true;
+                errorMsgBrokenLib = "SDL C/Java version mismatch (expected " + expected_version + ", got " + version + ")";
+            }
+        }
+
+        if (mBrokenLibraries) {
+            mSingleton = this;
+            AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
+            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+                  + System.getProperty("line.separator")
+                  + System.getProperty("line.separator")
+                  + "Error: " + errorMsgBrokenLib);
+            dlgAlert.setTitle("SDL Error");
+            dlgAlert.setPositiveButton("Exit",
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog,int id) {
+                        // if this button is clicked, close current activity
+                        SDLActivity.mSingleton.finish();
+                    }
+                });
+           dlgAlert.setCancelable(false);
+           dlgAlert.create().show();
+
+           return;
+        }
+
+        startNative(); // love2d-mod: allow restarting of the native thread
+    }
+
+    // love2d-mod-start: allow restarting of the native thread
+    public void startNative() {
+        boolean hadSDLThread = SDLActivity.mSDLThread != null;
+
+        // Set up JNI
+        SDL.setupJNI();
+
+        // Initialize state
+        SDL.initialize();
+
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+        SDL.setContext(this);
+
+        mClipboardHandler = new SDLClipboardHandler();
+
+        mHIDDeviceManager = HIDDeviceManager.acquire(this);
+
+        // Set up the surface
+        mSurface = createSDLSurface(this);
+
+        mLayout = new RelativeLayout(this);
+        mLayout.addView(mSurface);
+
+        // Get our current screen orientation and pass it down.
+        mCurrentOrientation = SDLActivity.getCurrentOrientation();
+        // Only record current orientation
+        SDLActivity.onNativeOrientationChanged(mCurrentOrientation);
+
+        try {
+            if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+                mCurrentLocale = getContext().getResources().getConfiguration().locale;
+            } else {
+                mCurrentLocale = getContext().getResources().getConfiguration().getLocales().get(0);
+            }
+        } catch(Exception ignored) {
+        }
+
+        setContentView(mLayout);
+
+        setWindowStyle(false);
+
+        getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
+
+        // Get filename from "Open with" of another application
+        Intent intent = getIntent();
+        if (intent != null && intent.getData() != null) {
+            String filename = intent.getData().getPath();
+            if (filename != null) {
+                Log.v(TAG, "Got filename: " + filename);
+                SDLActivity.onNativeDropFile(filename);
+            }
+        }
+
+        if (hadSDLThread) {
+            resumeNativeThread();
+        }
+    }
+    // love2d-mod-end: allow restarting of the native thread
+
+    protected void pauseNativeThread() {
+        mNextNativeState = NativeState.PAUSED;
+        mIsResumedCalled = false;
+
+        if (SDLActivity.mBrokenLibraries) {
+            return;
+        }
+
+        SDLActivity.handleNativeState();
+    }
+
+    protected void resumeNativeThread() {
+        mNextNativeState = NativeState.RESUMED;
+        mIsResumedCalled = true;
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handleNativeState();
+    }
+
+    // Events
+    @Override
+    protected void onPause() {
+        Log.v(TAG, "onPause()");
+        super.onPause();
+
+        if (mHIDDeviceManager != null) {
+            mHIDDeviceManager.setFrozen(true);
+        }
+        if (!mHasMultiWindow) {
+            pauseNativeThread();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        Log.v(TAG, "onResume()");
+        super.onResume();
+
+        if (mHIDDeviceManager != null) {
+            mHIDDeviceManager.setFrozen(false);
+        }
+        if (!mHasMultiWindow) {
+            resumeNativeThread();
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        Log.v(TAG, "onStop()");
+        super.onStop();
+        if (mHasMultiWindow) {
+            pauseNativeThread();
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        Log.v(TAG, "onStart()");
+        super.onStart();
+        if (mHasMultiWindow) {
+            resumeNativeThread();
+        }
+    }
+
+    public static int getCurrentOrientation() {
+        int result = SDL_ORIENTATION_UNKNOWN;
+
+        Activity activity = (Activity)getContext();
+        if (activity == null) {
+            return result;
+        }
+        Display display = activity.getWindowManager().getDefaultDisplay();
+
+        switch (display.getRotation()) {
+            case Surface.ROTATION_0:
+                result = SDL_ORIENTATION_PORTRAIT;
+                break;
+
+            case Surface.ROTATION_90:
+                result = SDL_ORIENTATION_LANDSCAPE;
+                break;
+
+            case Surface.ROTATION_180:
+                result = SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                break;
+
+            case Surface.ROTATION_270:
+                result = SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                break;
+        }
+
+        return result;
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        mHasFocus = hasFocus;
+        if (hasFocus) {
+           mNextNativeState = NativeState.RESUMED;
+           SDLActivity.getMotionListener().reclaimRelativeMouseModeIfNeeded();
+
+           SDLActivity.handleNativeState();
+           nativeFocusChanged(true);
+
+        } else {
+           nativeFocusChanged(false);
+           if (!mHasMultiWindow) {
+               mNextNativeState = NativeState.PAUSED;
+               SDLActivity.handleNativeState();
+           }
+        }
+    }
+
+    @Override
+    public void onLowMemory() {
+        Log.v(TAG, "onLowMemory()");
+        super.onLowMemory();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.nativeLowMemory();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        Log.v(TAG, "onConfigurationChanged()");
+        super.onConfigurationChanged(newConfig);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        if (mCurrentLocale == null || !mCurrentLocale.equals(newConfig.locale)) {
+            mCurrentLocale = newConfig.locale;
+            SDLActivity.onNativeLocaleChanged();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.v(TAG, "onDestroy()");
+
+        if (mHIDDeviceManager != null) {
+            HIDDeviceManager.release(mHIDDeviceManager);
+            mHIDDeviceManager = null;
+        }
+
+        SDLAudioManager.release(this);
+
+        if (SDLActivity.mBrokenLibraries) {
+           super.onDestroy();
+           return;
+        }
+
+        appQuitFinish(); // love2d-mod: allow restarting of the native thread
+        super.onDestroy();
+    }
+
+    // love2d-mod-start: allow restarting of the native thread
+    public void resetNative() {
+        Log.v("SDL", "resetNative()");
+
+        SDLActivity.mExitCalledFromJava = true; // love2d-mod: allow restarting of the native thread
+
+        appQuitFinish();
+    }
+
+    private void appQuitFinish() {
+        if (SDLActivity.mSDLThread != null) {
+
+            // Send Quit event to "SDLThread" thread
+            SDLActivity.nativeSendQuit();
+
+            // Wait for "SDLThread" thread to end
+            try {
+                SDLActivity.mSDLThread.join();
+            } catch(Exception e) {
+                Log.v(TAG, "Problem stopping SDLThread: " + e);
+            }
+        }
+
+        SDLActivity.nativeQuit();
+    }
+    // love2d-mod-end: allow restarting of the native thread
+
+    @Override
+    public void onBackPressed() {
+        // Check if we want to block the back button in case of mouse right click.
+        //
+        // If we do, the normal hardware back button will no longer work and people have to use home,
+        // but the mouse right click will work.
+        //
+        boolean trapBack = SDLActivity.nativeGetHintBoolean("SDL_ANDROID_TRAP_BACK_BUTTON", false);
+        if (trapBack) {
+            // Exit and let the mouse handler handle this button (if appropriate)
+            return;
+        }
+
+        // Default system back button behavior.
+        if (!isFinishing()) {
+            super.onBackPressed();
+        }
+    }
+
+    // Called by JNI from SDL.
+    public static void manualBackButton() {
+        mSingleton.pressBackButton();
+    }
+
+    // Used to get us onto the activity's main thread
+    public void pressBackButton() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (!SDLActivity.this.isFinishing()) {
+                    SDLActivity.this.superOnBackPressed();
+                }
+            }
+        });
+    }
+
+    // Used to access the system back behavior.
+    public void superOnBackPressed() {
+        super.onBackPressed();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+
+        if (SDLActivity.mBrokenLibraries) {
+           return false;
+        }
+
+        int keyCode = event.getKeyCode();
+        // Ignore certain special keys so they're handled by Android
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_CAMERA ||
+            keyCode == KeyEvent.KEYCODE_ZOOM_IN || /* API 11 */
+            keyCode == KeyEvent.KEYCODE_ZOOM_OUT /* API 11 */
+            ) {
+            return false;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    /* Transition to next state */
+    public static void handleNativeState() {
+
+        if (mNextNativeState == mCurrentNativeState) {
+            // Already in same state, discard.
+            return;
+        }
+
+        // Try a transition to init state
+        if (mNextNativeState == NativeState.INIT) {
+
+            mCurrentNativeState = mNextNativeState;
+            return;
+        }
+
+        // Try a transition to paused state
+        if (mNextNativeState == NativeState.PAUSED) {
+            if (mSDLThread != null) {
+                nativePause();
+            }
+            if (mSurface != null) {
+                mSurface.handlePause();
+            }
+            mCurrentNativeState = mNextNativeState;
+            return;
+        }
+
+        // Try a transition to resumed state
+        if (mNextNativeState == NativeState.RESUMED) {
+            if (mSurface.mIsSurfaceReady && mHasFocus && mIsResumedCalled) {
+                if (mSDLThread == null) {
+                    // This is the entry point to the C app.
+                    // Start up the C app thread and enable sensor input for the first time
+                    // FIXME: Why aren't we enabling sensor input at start?
+
+                    mSDLThread = new Thread(new SDLMain(), "SDLThread");
+                    mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+                    mSDLThread.start();
+
+                    // No nativeResume(), don't signal Android_ResumeSem
+                } else {
+                    nativeResume();
+                }
+                mSurface.handleResume();
+
+                mCurrentNativeState = mNextNativeState;
+            }
+        }
+    }
+
+    // Messages from the SDLMain thread
+    static final int COMMAND_CHANGE_TITLE = 1;
+    static final int COMMAND_CHANGE_WINDOW_STYLE = 2;
+    static final int COMMAND_TEXTEDIT_HIDE = 3;
+    static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
+
+    protected static final int COMMAND_USER = 0x8000;
+
+    protected static boolean mFullscreenModeActive;
+
+    /**
+     * This method is called by SDL if SDL did not handle a message itself.
+     * This happens if a received message contains an unsupported command.
+     * Method can be overwritten to handle Messages in a different class.
+     * @param command the command of the message.
+     * @param param the parameter of the message. May be null.
+     * @return if the message was handled in overridden method.
+     */
+    protected boolean onUnhandledMessage(int command, Object param) {
+        return false;
+    }
+
+    /**
+     * A Handler class for Messages from native SDL applications.
+     * It uses current Activities as target (e.g. for the title).
+     * static to prevent implicit references to enclosing object.
+     */
+    protected static class SDLCommandHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            Context context = SDL.getContext();
+            if (context == null) {
+                Log.e(TAG, "error handling message, getContext() returned null");
+                return;
+            }
+            switch (msg.arg1) {
+            case COMMAND_CHANGE_TITLE:
+                if (context instanceof Activity) {
+                    ((Activity) context).setTitle((String)msg.obj);
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_CHANGE_WINDOW_STYLE:
+                if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+                    if (context instanceof Activity) {
+                        Window window = ((Activity) context).getWindow();
+                        if (window != null) {
+                            if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+                                window.getDecorView().setSystemUiVisibility(flags);
+                                window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                                SDLActivity.mFullscreenModeActive = true;
+                            } else {
+                                int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
+                                window.getDecorView().setSystemUiVisibility(flags);
+                                window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                                SDLActivity.mFullscreenModeActive = false;
+                            }
+                        }
+                    } else {
+                        Log.e(TAG, "error handling message, getContext() returned no Activity");
+                    }
+                }
+                break;
+            case COMMAND_TEXTEDIT_HIDE:
+                if (mTextEdit != null) {
+                    // Note: On some devices setting view to GONE creates a flicker in landscape.
+                    // Setting the View's sizes to 0 is similar to GONE but without the flicker.
+                    // The sizes will be set to useful values when the keyboard is shown again.
+                    mTextEdit.setLayoutParams(new RelativeLayout.LayoutParams(0, 0));
+
+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+
+                    mScreenKeyboardShown = false;
+
+                    mSurface.requestFocus();
+                }
+                break;
+            case COMMAND_SET_KEEP_SCREEN_ON:
+            {
+                if (context instanceof Activity) {
+                    Window window = ((Activity) context).getWindow();
+                    if (window != null) {
+                        if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        } else {
+                            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        }
+                    }
+                }
+                break;
+            }
+            default:
+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
+                }
+            }
+        }
+    }
+
+    // Handler for the messages
+    Handler commandHandler = new SDLCommandHandler();
+
+    // Send a message from the SDLMain thread
+    boolean sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        boolean result = commandHandler.sendMessage(msg);
+
+        if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+            if (command == COMMAND_CHANGE_WINDOW_STYLE) {
+                // Ensure we don't return until the resize has actually happened,
+                // or 500ms have passed.
+
+                boolean bShouldWait = false;
+
+                if (data instanceof Integer) {
+                    // Let's figure out if we're already laid out fullscreen or not.
+                    Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+                    DisplayMetrics realMetrics = new DisplayMetrics();
+                    display.getRealMetrics(realMetrics);
+
+                    boolean bFullscreenLayout = ((realMetrics.widthPixels == mSurface.getWidth()) &&
+                            (realMetrics.heightPixels == mSurface.getHeight()));
+
+                    if ((Integer) data == 1) {
+                        // If we aren't laid out fullscreen or actively in fullscreen mode already, we're going
+                        // to change size and should wait for surfaceChanged() before we return, so the size
+                        // is right back in native code.  If we're already laid out fullscreen, though, we're
+                        // not going to change size even if we change decor modes, so we shouldn't wait for
+                        // surfaceChanged() -- which may not even happen -- and should return immediately.
+                        bShouldWait = !bFullscreenLayout;
+                    } else {
+                        // If we're laid out fullscreen (even if the status bar and nav bar are present),
+                        // or are actively in fullscreen, we're going to change size and should wait for
+                        // surfaceChanged before we return, so the size is right back in native code.
+                        bShouldWait = bFullscreenLayout;
+                    }
+                }
+
+                if (bShouldWait && (SDLActivity.getContext() != null)) {
+                    // We'll wait for the surfaceChanged() method, which will notify us
+                    // when called.  That way, we know our current size is really the
+                    // size we need, instead of grabbing a size that's still got
+                    // the navigation and/or status bars before they're hidden.
+                    //
+                    // We'll wait for up to half a second, because some devices
+                    // take a surprisingly long time for the surface resize, but
+                    // then we'll just give up and return.
+                    //
+                    synchronized (SDLActivity.getContext()) {
+                        try {
+                            SDLActivity.getContext().wait(500);
+                        } catch (InterruptedException ie) {
+                            ie.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    // C functions we call
+    public static native String nativeGetVersion();
+    public static native int nativeSetupJNI();
+    public static native int nativeRunMain(String library, String function, Object arguments);
+    public static native void nativeLowMemory();
+    public static native void nativeSendQuit();
+    public static native void nativeQuit();
+    public static native void nativePause();
+    public static native void nativeResume();
+    public static native void nativeFocusChanged(boolean hasFocus);
+    public static native void onNativeDropFile(String filename);
+    public static native void nativeSetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, float rate);
+    public static native void onNativeResize();
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native boolean onNativeSoftReturnKey();
+    public static native void onNativeKeyboardFocusLost();
+    public static native void onNativeMouse(int button, int action, float x, float y, boolean relative);
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x,
+                                            float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void onNativeClipboardChanged();
+    public static native void onNativeSurfaceCreated();
+    public static native void onNativeSurfaceChanged();
+    public static native void onNativeSurfaceDestroyed();
+    public static native String nativeGetHint(String name);
+    public static native boolean nativeGetHintBoolean(String name, boolean default_value);
+    public static native void nativeSetenv(String name, String value);
+    public static native void onNativeOrientationChanged(int orientation);
+    public static native void nativeAddTouch(int touchId, String name);
+    public static native void nativePermissionResult(int requestCode, boolean result);
+    public static native void onNativeLocaleChanged();
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void setWindowStyle(boolean fullscreen) {
+        // Called from SDLMain() thread and can't directly affect the view
+        mSingleton.sendCommand(COMMAND_CHANGE_WINDOW_STYLE, fullscreen ? 1 : 0);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     * This is a static method for JNI convenience, it calls a non-static method
+     * so that is can be overridden
+     */
+    public static void setOrientation(int w, int h, boolean resizable, String hint)
+    {
+        if (mSingleton != null) {
+            mSingleton.setOrientationBis(w, h, resizable, hint);
+        }
+    }
+
+    /**
+     * This can be overridden
+     */
+    public void setOrientationBis(int w, int h, boolean resizable, String hint)
+    {
+        int orientation_landscape = -1;
+        int orientation_portrait = -1;
+
+        /* If set, hint "explicitly controls which UI orientations are allowed". */
+        if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
+        } else if (hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        } else if (hint.contains("LandscapeRight")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
+        }
+
+        /* exact match to 'Portrait' to distinguish with PortraitUpsideDown */
+        boolean contains_Portrait = hint.contains("Portrait ") || hint.endsWith("Portrait");
+
+        if (contains_Portrait && hint.contains("PortraitUpsideDown")) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
+        } else if (contains_Portrait) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+        } else if (hint.contains("PortraitUpsideDown")) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
+        }
+
+        boolean is_landscape_allowed = (orientation_landscape != -1);
+        boolean is_portrait_allowed = (orientation_portrait != -1);
+        int req; /* Requested orientation */
+
+        /* No valid hint, nothing is explicitly allowed */
+        if (!is_portrait_allowed && !is_landscape_allowed) {
+            if (resizable) {
+                /* All orientations are allowed */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+            } else {
+                /* Fixed window and nothing specified. Get orientation from w/h of created window */
+                req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+            }
+        } else {
+            /* At least one orientation is allowed */
+            if (resizable) {
+                if (is_portrait_allowed && is_landscape_allowed) {
+                    /* hint allows both landscape and portrait, promote to full sensor */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                } else {
+                    /* Use the only one allowed "orientation" */
+                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
+                }
+            } else {
+                /* Fixed window and both orientations are allowed. Choose one. */
+                if (is_portrait_allowed && is_landscape_allowed) {
+                    req = (w > h ? orientation_landscape : orientation_portrait);
+                } else {
+                    /* Use the only one allowed "orientation" */
+                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
+                }
+            }
+        }
+
+        Log.v(TAG, "setOrientation() requestedOrientation=" + req + " width=" + w +" height="+ h +" resizable=" + resizable + " hint=" + hint);
+        mSingleton.setRequestedOrientation(req);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void minimizeWindow() {
+
+        if (mSingleton == null) {
+            return;
+        }
+
+        Intent startMain = new Intent(Intent.ACTION_MAIN);
+        startMain.addCategory(Intent.CATEGORY_HOME);
+        startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mSingleton.startActivity(startMain);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean shouldMinimizeOnFocusLoss() {
+/*
+        if (Build.VERSION.SDK_INT >= 24) {
+            if (mSingleton == null) {
+                return true;
+            }
+
+            if (mSingleton.isInMultiWindowMode()) {
+                return false;
+            }
+
+            if (mSingleton.isInPictureInPictureMode()) {
+                return false;
+            }
+        }
+
+        return true;
+*/
+        return false;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isScreenKeyboardShown()
+    {
+        if (mTextEdit == null) {
+            return false;
+        }
+
+        if (!mScreenKeyboardShown) {
+            return false;
+        }
+
+        InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        return imm.isAcceptingText();
+
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean supportsRelativeMouse()
+    {
+        // DeX mode in Samsung Experience 9.0 and earlier doesn't support relative mice properly under
+        // Android 7 APIs, and simply returns no data under Android 8 APIs.
+        //
+        // This is fixed in Samsung Experience 9.5, which corresponds to Android 8.1.0, and
+        // thus SDK version 27.  If we are in DeX mode and not API 27 or higher, as a result,
+        // we should stick to relative mode.
+        //
+        if (Build.VERSION.SDK_INT < 27 /* Android 8.1 (O_MR1) */ && isDeXMode()) {
+            return false;
+        }
+
+        return SDLActivity.getMotionListener().supportsRelativeMouse();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setRelativeMouseEnabled(boolean enabled)
+    {
+        if (enabled && !supportsRelativeMouse()) {
+            return false;
+        }
+
+        return SDLActivity.getMotionListener().setRelativeMouseEnabled(enabled);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean sendMessage(int command, int param) {
+        if (mSingleton == null) {
+            return false;
+        }
+        return mSingleton.sendCommand(command, param);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Context getContext() {
+        return SDL.getContext();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isAndroidTV() {
+        UiModeManager uiModeManager = (UiModeManager) getContext().getSystemService(UI_MODE_SERVICE);
+        if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("MINIX") && Build.MODEL.equals("NEO-U1")) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("Amlogic") && Build.MODEL.equals("X96-W")) {
+            return true;
+        }
+        return Build.MANUFACTURER.equals("Amlogic") && Build.MODEL.startsWith("TV");
+    }
+
+    public static double getDiagonal()
+    {
+        DisplayMetrics metrics = new DisplayMetrics();
+        Activity activity = (Activity)getContext();
+        if (activity == null) {
+            return 0.0;
+        }
+        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        double dWidthInches = metrics.widthPixels / (double)metrics.xdpi;
+        double dHeightInches = metrics.heightPixels / (double)metrics.ydpi;
+
+        return Math.sqrt((dWidthInches * dWidthInches) + (dHeightInches * dHeightInches));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isTablet() {
+        // If our diagonal size is seven inches or greater, we consider ourselves a tablet.
+        return (getDiagonal() >= 7.0);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isChromebook() {
+        if (getContext() == null) {
+            return false;
+        }
+        return getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isDeXMode() {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+            return false;
+        }
+        try {
+            final Configuration config = getContext().getResources().getConfiguration();
+            final Class<?> configClass = config.getClass();
+            return configClass.getField("SEM_DESKTOP_MODE_ENABLED").getInt(configClass)
+                    == configClass.getField("semDesktopModeEnabled").getInt(config);
+        } catch(Exception ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static DisplayMetrics getDisplayDPI() {
+        return getContext().getResources().getDisplayMetrics();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean getManifestEnvironmentVariables() {
+        try {
+            if (getContext() == null) {
+                return false;
+            }
+
+            ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(getContext().getPackageName(), PackageManager.GET_META_DATA);
+            Bundle bundle = applicationInfo.metaData;
+            if (bundle == null) {
+                return false;
+            }
+            String prefix = "SDL_ENV.";
+            final int trimLength = prefix.length();
+            for (String key : bundle.keySet()) {
+                if (key.startsWith(prefix)) {
+                    String name = key.substring(trimLength);
+                    String value = bundle.get(key).toString();
+                    nativeSetenv(name, value);
+                }
+            }
+            /* environment variables set! */
+            return true;
+        } catch (Exception e) {
+           Log.v(TAG, "exception " + e.toString());
+        }
+        return false;
+    }
+
+    // This method is called by SDLControllerManager's API 26 Generic Motion Handler.
+    public static View getContentView() {
+        return mLayout;
+    }
+
+    static class ShowTextInputTask implements Runnable {
+        /*
+         * This is used to regulate the pan&scan method to have some offset from
+         * the bottom edge of the input region and the top edge of an input
+         * method (soft keyboard)
+         */
+        static final int HEIGHT_PADDING = 15;
+
+        public int x, y, w, h;
+
+        public ShowTextInputTask(int x, int y, int w, int h) {
+            this.x = x;
+            this.y = y;
+            this.w = w;
+            this.h = h;
+
+            /* Minimum size of 1 pixel, so it takes focus. */
+            if (this.w <= 0) {
+                this.w = 1;
+            }
+            if (this.h + HEIGHT_PADDING <= 0) {
+                this.h = 1 - HEIGHT_PADDING;
+            }
+        }
+
+        @Override
+        public void run() {
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(w, h + HEIGHT_PADDING);
+            params.leftMargin = x;
+            params.topMargin = y;
+
+            if (mTextEdit == null) {
+                mTextEdit = new DummyEdit(SDL.getContext());
+
+                mLayout.addView(mTextEdit, params);
+            } else {
+                mTextEdit.setLayoutParams(params);
+            }
+
+            mTextEdit.setVisibility(View.VISIBLE);
+            mTextEdit.requestFocus();
+
+            InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mTextEdit, 0);
+
+            mScreenKeyboardShown = true;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showTextInput(int x, int y, int w, int h) {
+        // Transfer the task to the main thread as a Runnable
+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
+    }
+
+    public static boolean isTextInputEvent(KeyEvent event) {
+
+        // Key pressed with Ctrl should be sent as SDL_KEYDOWN/SDL_KEYUP and not SDL_TEXTINPUT
+        if (event.isCtrlPressed()) {
+            return false;
+        }
+
+        return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
+    }
+
+    public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputConnection ic) {
+        int deviceId = event.getDeviceId();
+        int source = event.getSource();
+
+        if (source == InputDevice.SOURCE_UNKNOWN) {
+            InputDevice device = InputDevice.getDevice(deviceId);
+            if (device != null) {
+                source = device.getSources();
+            }
+        }
+
+//        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+//            Log.v("SDL", "key down: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+//            Log.v("SDL", "key up: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        }
+
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD
+        //
+        // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and
+        // SOURCE_JOYSTICK, while its key events arrive from the keyboard source
+        // So, retrieve the device itself and check all of its sources
+        if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
+            // Note that we process events with specific key codes here
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLControllerManager.onNativePadDown(deviceId, keyCode) == 0) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLControllerManager.onNativePadUp(deviceId, keyCode) == 0) {
+                    return true;
+                }
+            }
+        }
+
+        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
+            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
+            // they are ignored here because sending them as mouse input to SDL is messy
+            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
+                switch (event.getAction()) {
+                case KeyEvent.ACTION_DOWN:
+                case KeyEvent.ACTION_UP:
+                    // mark the event as handled or it will be handled by system
+                    // handling KEYCODE_BACK by system will call onBackPressed()
+                    return true;
+                }
+            }
+        }
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (isTextInputEvent(event)) {
+                if (ic != null) {
+                    ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                } else {
+                    SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                }
+            }
+            onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            onNativeKeyUp(keyCode);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Surface getNativeSurface() {
+        if (SDLActivity.mSurface == null) {
+            return null;
+        }
+        return SDLActivity.mSurface.getNativeSurface();
+    }
+
+    // Input
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void initTouch() {
+        int[] ids = InputDevice.getDeviceIds();
+
+        for (int id : ids) {
+            InputDevice device = InputDevice.getDevice(id);
+            /* Allow SOURCE_TOUCHSCREEN and also Virtual InputDevices because they can send TOUCHSCREEN events */
+            if (device != null && ((device.getSources() & InputDevice.SOURCE_TOUCHSCREEN) == InputDevice.SOURCE_TOUCHSCREEN
+                    || device.isVirtual())) {
+
+                int touchDevId = device.getId();
+                /*
+                 * Prevent id to be -1, since it's used in SDL internal for synthetic events
+                 * Appears when using Android emulator, eg:
+                 *  adb shell input mouse tap 100 100
+                 *  adb shell input touchscreen tap 100 100
+                 */
+                if (touchDevId < 0) {
+                    touchDevId -= 1;
+                }
+                nativeAddTouch(touchDevId, device.getName());
+            }
+        }
+    }
+
+    // Messagebox
+
+    /** Result of current messagebox. Also used for blocking the calling thread. */
+    protected final int[] messageboxSelection = new int[1];
+
+    /**
+     * This method is called by SDL using JNI.
+     * Shows the messagebox from UI thread and block calling thread.
+     * buttonFlags, buttonIds and buttonTexts must have same length.
+     * @param buttonFlags array containing flags for every button.
+     * @param buttonIds array containing id for every button.
+     * @param buttonTexts array containing text for every button.
+     * @param colors null for default or array of length 5 containing colors.
+     * @return button id or -1.
+     */
+    public int messageboxShowMessageBox(
+            final int flags,
+            final String title,
+            final String message,
+            final int[] buttonFlags,
+            final int[] buttonIds,
+            final String[] buttonTexts,
+            final int[] colors) {
+
+        messageboxSelection[0] = -1;
+
+        // sanity checks
+
+        if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
+            return -1; // implementation broken
+        }
+
+        // collect arguments for Dialog
+
+        final Bundle args = new Bundle();
+        args.putInt("flags", flags);
+        args.putString("title", title);
+        args.putString("message", message);
+        args.putIntArray("buttonFlags", buttonFlags);
+        args.putIntArray("buttonIds", buttonIds);
+        args.putStringArray("buttonTexts", buttonTexts);
+        args.putIntArray("colors", colors);
+
+        // trigger Dialog creation on UI thread
+
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                messageboxCreateAndShow(args);
+            }
+        });
+
+        // block the calling thread
+
+        synchronized (messageboxSelection) {
+            try {
+                messageboxSelection.wait();
+            } catch (InterruptedException ex) {
+                ex.printStackTrace();
+                return -1;
+            }
+        }
+
+        // return selected value
+
+        return messageboxSelection[0];
+    }
+
+    protected void messageboxCreateAndShow(Bundle args) {
+
+        // TODO set values from "flags" to messagebox dialog
+
+        // get colors
+
+        int[] colors = args.getIntArray("colors");
+        int backgroundColor;
+        int textColor;
+        int buttonBorderColor;
+        int buttonBackgroundColor;
+        int buttonSelectedColor;
+        if (colors != null) {
+            int i = -1;
+            backgroundColor = colors[++i];
+            textColor = colors[++i];
+            buttonBorderColor = colors[++i];
+            buttonBackgroundColor = colors[++i];
+            buttonSelectedColor = colors[++i];
+        } else {
+            backgroundColor = Color.TRANSPARENT;
+            textColor = Color.TRANSPARENT;
+            buttonBorderColor = Color.TRANSPARENT;
+            buttonBackgroundColor = Color.TRANSPARENT;
+            buttonSelectedColor = Color.TRANSPARENT;
+        }
+
+        // create dialog with title and a listener to wake up calling thread
+
+        final AlertDialog dialog = new AlertDialog.Builder(this).create();
+        dialog.setTitle(args.getString("title"));
+        dialog.setCancelable(false);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface unused) {
+                synchronized (messageboxSelection) {
+                    messageboxSelection.notify();
+                }
+            }
+        });
+
+        // create text
+
+        TextView message = new TextView(this);
+        message.setGravity(Gravity.CENTER);
+        message.setText(args.getString("message"));
+        if (textColor != Color.TRANSPARENT) {
+            message.setTextColor(textColor);
+        }
+
+        // create buttons
+
+        int[] buttonFlags = args.getIntArray("buttonFlags");
+        int[] buttonIds = args.getIntArray("buttonIds");
+        String[] buttonTexts = args.getStringArray("buttonTexts");
+
+        final SparseArray<Button> mapping = new SparseArray<Button>();
+
+        LinearLayout buttons = new LinearLayout(this);
+        buttons.setOrientation(LinearLayout.HORIZONTAL);
+        buttons.setGravity(Gravity.CENTER);
+        for (int i = 0; i < buttonTexts.length; ++i) {
+            Button button = new Button(this);
+            final int id = buttonIds[i];
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    messageboxSelection[0] = id;
+                    dialog.dismiss();
+                }
+            });
+            if (buttonFlags[i] != 0) {
+                // see SDL_messagebox.h
+                if ((buttonFlags[i] & 0x00000001) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ENTER, button);
+                }
+                if ((buttonFlags[i] & 0x00000002) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ESCAPE, button); /* API 11 */
+                }
+            }
+            button.setText(buttonTexts[i]);
+            if (textColor != Color.TRANSPARENT) {
+                button.setTextColor(textColor);
+            }
+            if (buttonBorderColor != Color.TRANSPARENT) {
+                // TODO set color for border of messagebox button
+            }
+            if (buttonBackgroundColor != Color.TRANSPARENT) {
+                Drawable drawable = button.getBackground();
+                if (drawable == null) {
+                    // setting the color this way removes the style
+                    button.setBackgroundColor(buttonBackgroundColor);
+                } else {
+                    // setting the color this way keeps the style (gradient, padding, etc.)
+                    drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
+                }
+            }
+            if (buttonSelectedColor != Color.TRANSPARENT) {
+                // TODO set color for selected messagebox button
+            }
+            buttons.addView(button);
+        }
+
+        // create content
+
+        LinearLayout content = new LinearLayout(this);
+        content.setOrientation(LinearLayout.VERTICAL);
+        content.addView(message);
+        content.addView(buttons);
+        if (backgroundColor != Color.TRANSPARENT) {
+            content.setBackgroundColor(backgroundColor);
+        }
+
+        // add content to dialog and return
+
+        dialog.setView(content);
+        dialog.setOnKeyListener(new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
+                Button button = mapping.get(keyCode);
+                if (button != null) {
+                    if (event.getAction() == KeyEvent.ACTION_UP) {
+                        button.performClick();
+                    }
+                    return true; // also for ignored actions
+                }
+                return false;
+            }
+        });
+
+        dialog.show();
+    }
+
+    private final Runnable rehideSystemUi = new Runnable() {
+        @Override
+        public void run() {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+
+                SDLActivity.this.getWindow().getDecorView().setSystemUiVisibility(flags);
+            }
+        }
+    };
+
+    public void onSystemUiVisibilityChange(int visibility) {
+        if (SDLActivity.mFullscreenModeActive && ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0 || (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0)) {
+
+            Handler handler = getWindow().getDecorView().getHandler();
+            if (handler != null) {
+                handler.removeCallbacks(rehideSystemUi); // Prevent a hide loop.
+                handler.postDelayed(rehideSystemUi, 2000);
+            }
+
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean clipboardHasText() {
+        return mClipboardHandler.clipboardHasText();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static String clipboardGetText() {
+        return mClipboardHandler.clipboardGetText();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void clipboardSetText(String string) {
+        mClipboardHandler.clipboardSetText(string);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int createCustomCursor(int[] colors, int width, int height, int hotSpotX, int hotSpotY) {
+        Bitmap bitmap = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888);
+        ++mLastCursorID;
+
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mCursors.put(mLastCursorID, PointerIcon.create(bitmap, hotSpotX, hotSpotY));
+            } catch (Exception e) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+        return mLastCursorID;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void destroyCustomCursor(int cursorID) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mCursors.remove(cursorID);
+            } catch (Exception e) {
+            }
+        }
+        return;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setCustomCursor(int cursorID) {
+
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mSurface.setPointerIcon(mCursors.get(cursorID));
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setSystemCursor(int cursorID) {
+        int cursor_type = 0; //PointerIcon.TYPE_NULL;
+        switch (cursorID) {
+        case SDL_SYSTEM_CURSOR_ARROW:
+            cursor_type = 1000; //PointerIcon.TYPE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_IBEAM:
+            cursor_type = 1008; //PointerIcon.TYPE_TEXT;
+            break;
+        case SDL_SYSTEM_CURSOR_WAIT:
+            cursor_type = 1004; //PointerIcon.TYPE_WAIT;
+            break;
+        case SDL_SYSTEM_CURSOR_CROSSHAIR:
+            cursor_type = 1007; //PointerIcon.TYPE_CROSSHAIR;
+            break;
+        case SDL_SYSTEM_CURSOR_WAITARROW:
+            cursor_type = 1004; //PointerIcon.TYPE_WAIT;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENWSE:
+            cursor_type = 1017; //PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENESW:
+            cursor_type = 1016; //PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEWE:
+            cursor_type = 1014; //PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENS:
+            cursor_type = 1015; //PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEALL:
+            cursor_type = 1020; //PointerIcon.TYPE_GRAB;
+            break;
+        case SDL_SYSTEM_CURSOR_NO:
+            cursor_type = 1012; //PointerIcon.TYPE_NO_DROP;
+            break;
+        case SDL_SYSTEM_CURSOR_HAND:
+            cursor_type = 1002; //PointerIcon.TYPE_HAND;
+            break;
+        }
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mSurface.setPointerIcon(PointerIcon.getSystemIcon(SDL.getContext(), cursor_type));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void requestPermission(String permission, int requestCode) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            nativePermissionResult(requestCode, true);
+            return;
+        }
+
+        Activity activity = (Activity)getContext();
+        if (activity.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+            activity.requestPermissions(new String[]{permission}, requestCode);
+        } else {
+            nativePermissionResult(requestCode, true);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        boolean result = (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
+        nativePermissionResult(requestCode, result);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int openURL(String url)
+    {
+        try {
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(url));
+
+            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
+            if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+                flags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
+            } else {
+                flags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
+            }
+            i.addFlags(flags);
+
+            mSingleton.startActivity(i);
+        } catch (Exception ex) {
+            return -1;
+        }
+        return 0;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int showToast(String message, int duration, int gravity, int xOffset, int yOffset)
+    {
+        if(null == mSingleton) {
+            return - 1;
+        }
+
+        try
+        {
+            class OneShotTask implements Runnable {
+                String mMessage;
+                int mDuration;
+                int mGravity;
+                int mXOffset;
+                int mYOffset;
+
+                OneShotTask(String message, int duration, int gravity, int xOffset, int yOffset) {
+                    mMessage  = message;
+                    mDuration = duration;
+                    mGravity  = gravity;
+                    mXOffset  = xOffset;
+                    mYOffset  = yOffset;
+                }
+
+                public void run() {
+                    try
+                    {
+                        Toast toast = Toast.makeText(mSingleton, mMessage, mDuration);
+                        if (mGravity >= 0) {
+                            toast.setGravity(mGravity, mXOffset, mYOffset);
+                        }
+                        toast.show();
+                    } catch(Exception ex) {
+                        Log.e(TAG, ex.getMessage());
+                    }
+                }
+            }
+            mSingleton.runOnUiThread(new OneShotTask(message, duration, gravity, xOffset, yOffset));
+        } catch(Exception ex) {
+            return -1;
+        }
+        return 0;
+    }
+}
+
+/**
+    Simple runnable to start the SDL application
+*/
+class SDLMain implements Runnable {
+    @Override
+    public void run() {
+        // Runs SDL_main()
+        String library = SDLActivity.mSingleton.getMainSharedObject();
+        String function = SDLActivity.mSingleton.getMainFunction();
+        String[] arguments = SDLActivity.mSingleton.getArguments();
+
+        try {
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_DISPLAY);
+        } catch (Exception e) {
+            Log.v("SDL", "modify thread properties failed " + e.toString());
+        }
+
+        Log.v("SDL", "Running main function " + function + " from library " + library);
+
+        SDLActivity.nativeRunMain(library, function, arguments);
+
+        Log.v("SDL", "Finished main function");
+
+        // love2d-mod-start: allow restarting of the native thread
+        if (!SDLActivity.mExitCalledFromJava) {
+            if (SDLActivity.mSingleton != null && !SDLActivity.mSingleton.isFinishing()) {
+                // Let's finish the Activity
+                SDLActivity.mSDLThread = null;
+                SDLActivity.mSingleton.finish();
+            }  // else: Activity is already being destroyed
+        }
+        // love2d-mod-end: allow restarting of the native thread
+    }
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+    InputConnection ic;
+
+    public DummyEdit(Context context) {
+        super(context);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        setOnKeyListener(this);
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, ic);
+    }
+
+    //
+    @Override
+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+        // FIXME: A more effective solution would be to assume our Layout to be RelativeLayout or LinearLayout
+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                SDLActivity.onNativeKeyboardFocusLost();
+            }
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        ic = new SDLInputConnection(this, true);
+
+        outAttrs.inputType = InputType.TYPE_CLASS_TEXT |
+                             InputType.TYPE_TEXT_FLAG_MULTI_LINE;
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+                              EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
+
+        return ic;
+    }
+}
+
+class SDLInputConnection extends BaseInputConnection {
+
+    protected EditText mEditText;
+    protected String mCommittedText = "";
+
+    public SDLInputConnection(View targetView, boolean fullEditor) {
+        super(targetView, fullEditor);
+        mEditText = new EditText(SDL.getContext());
+    }
+
+    @Override
+    public Editable getEditable() {
+        return mEditText.getEditableText();
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        /*
+         * This used to handle the keycodes from soft keyboard (and IME-translated input from hardkeyboard)
+         * However, as of Ice Cream Sandwich and later, almost all soft keyboard doesn't generate key presses
+         * and so we need to generate them ourselves in commitText.  To avoid duplicates on the handful of keys
+         * that still do, we empty this out.
+         */
+
+        /*
+         * Return DOES still generate a key event, however.  So rather than using it as the 'click a button' key
+         * as we do with physical keyboards, let's just use it to hide the keyboard.
+         */
+
+        if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+            if (SDLActivity.onNativeSoftReturnKey()) {
+                return true;
+            }
+        }
+
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        if (!super.commitText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        if (!super.setComposingText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        if (Build.VERSION.SDK_INT <= 29 /* Android 10.0 (Q) */) {
+            // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions>/14560344/android-backspace-in-webview-baseinputconnection
+            // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
+            if (beforeLength > 0 && afterLength == 0) {
+                // backspace(s)
+                while (beforeLength-- > 0) {
+                    nativeGenerateScancodeForUnichar('\b');
+                }
+                return true;
+           }
+        }
+
+        if (!super.deleteSurroundingText(beforeLength, afterLength)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    protected void updateText() {
+        final Editable content = getEditable();
+        if (content == null) {
+            return;
+        }
+
+        String text = content.toString();
+        int compareLength = Math.min(text.length(), mCommittedText.length());
+        int matchLength, offset;
+
+        /* Backspace over characters that are no longer in the string */
+        for (matchLength = 0; matchLength < compareLength; ) {
+            int codePoint = mCommittedText.codePointAt(matchLength);
+            if (codePoint != text.codePointAt(matchLength)) {
+                break;
+            }
+            matchLength += Character.charCount(codePoint);
+        }
+        /* FIXME: This doesn't handle graphemes, like '🌬️' */
+        for (offset = matchLength; offset < mCommittedText.length(); ) {
+            int codePoint = mCommittedText.codePointAt(offset);
+            nativeGenerateScancodeForUnichar('\b');
+            offset += Character.charCount(codePoint);
+        }
+
+        if (matchLength < text.length()) {
+            String pendingText = text.subSequence(matchLength, text.length()).toString();
+            for (offset = 0; offset < pendingText.length(); ) {
+                int codePoint = pendingText.codePointAt(offset);
+                if (codePoint == '\n') {
+                    if (SDLActivity.onNativeSoftReturnKey()) {
+                        return;
+                    }
+                }
+                /* Higher code points don't generate simulated scancodes */
+                if (codePoint < 128) {
+                    nativeGenerateScancodeForUnichar((char)codePoint);
+                }
+                offset += Character.charCount(codePoint);
+            }
+            SDLInputConnection.nativeCommitText(pendingText, 0);
+        }
+        mCommittedText = text;
+    }
+
+    public static native void nativeCommitText(String text, int newCursorPosition);
+
+    public static native void nativeGenerateScancodeForUnichar(char c);
+}
+
+class SDLClipboardHandler implements
+    ClipboardManager.OnPrimaryClipChangedListener {
+
+    protected ClipboardManager mClipMgr;
+
+    SDLClipboardHandler() {
+       mClipMgr = (ClipboardManager) SDL.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+       mClipMgr.addPrimaryClipChangedListener(this);
+    }
+
+    public boolean clipboardHasText() {
+       return mClipMgr.hasPrimaryClip();
+    }
+
+    public String clipboardGetText() {
+        ClipData clip = mClipMgr.getPrimaryClip();
+        if (clip != null) {
+            ClipData.Item item = clip.getItemAt(0);
+            if (item != null) {
+                CharSequence text = item.getText();
+                if (text != null) {
+                    return text.toString();
+                }
+            }
+        }
+        return null;
+    }
+
+    public void clipboardSetText(String string) {
+       mClipMgr.removePrimaryClipChangedListener(this);
+       ClipData clip = ClipData.newPlainText(null, string);
+       mClipMgr.setPrimaryClip(clip);
+       mClipMgr.addPrimaryClipChangedListener(this);
+    }
+
+    @Override
+    public void onPrimaryClipChanged() {
+        SDLActivity.onNativeClipboardChanged();
+    }
+}
+
diff --git a/app/src/main/engine/org/love2d/sdl/SDLAudioManager.java b/app/src/main/engine/org/love2d/sdl/SDLAudioManager.java
new file mode 100644
index 000000000..d03c1f5b8
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/SDLAudioManager.java
@@ -0,0 +1,514 @@
+package org.love2d.sdl;
+
+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.util.Log;
+
+import java.util.Arrays;
+
+public class SDLAudioManager {
+    protected static final String TAG = "SDLAudio";
+
+    protected static AudioTrack mAudioTrack;
+    protected static AudioRecord mAudioRecord;
+    protected static Context mContext;
+
+    private static final int[] NO_DEVICES = {};
+
+    private static AudioDeviceCallback mAudioDeviceCallback;
+
+    public static void initialize() {
+        mAudioTrack = null;
+        mAudioRecord = null;
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+            };
+        }
+    }
+
+    public static void setContext(Context context) {
+        mContext = context;
+        if (context != null) {
+            registerAudioDeviceCallback();
+        }
+    }
+
+    public static void release(Context context) {
+        unregisterAudioDeviceCallback(context);
+    }
+
+    // Audio
+
+    protected static String getAudioFormatString(int audioFormat) {
+        switch (audioFormat) {
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return "8-bit";
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return "16-bit";
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return "float";
+            default:
+                return Integer.toString(audioFormat);
+        }
+    }
+
+    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        int channelConfig;
+        int sampleSize;
+        int frameSize;
+
+        Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz");
+
+        /* On older devices let's use known good settings */
+        if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            if (desiredChannels > 2) {
+                desiredChannels = 2;
+            }
+        }
+
+        /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
+        if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) {
+            if (sampleRate < 8000) {
+                sampleRate = 8000;
+            } else if (sampleRate > 48000) {
+                sampleRate = 48000;
+            }
+        }
+
+        if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
+            int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */);
+            if (Build.VERSION.SDK_INT < minSDKVersion) {
+                audioFormat = AudioFormat.ENCODING_PCM_16BIT;
+            }
+        }
+        switch (audioFormat)
+        {
+        case AudioFormat.ENCODING_PCM_8BIT:
+            sampleSize = 1;
+            break;
+        case AudioFormat.ENCODING_PCM_16BIT:
+            sampleSize = 2;
+            break;
+        case AudioFormat.ENCODING_PCM_FLOAT:
+            sampleSize = 4;
+            break;
+        default:
+            Log.v(TAG, "Requested format " + audioFormat + ", getting ENCODING_PCM_16BIT");
+            audioFormat = AudioFormat.ENCODING_PCM_16BIT;
+            sampleSize = 2;
+            break;
+        }
+
+        if (isCapture) {
+            switch (desiredChannels) {
+            case 1:
+                channelConfig = AudioFormat.CHANNEL_IN_MONO;
+                break;
+            case 2:
+                channelConfig = AudioFormat.CHANNEL_IN_STEREO;
+                break;
+            default:
+                Log.v(TAG, "Requested " + desiredChannels + " channels, getting stereo");
+                desiredChannels = 2;
+                channelConfig = AudioFormat.CHANNEL_IN_STEREO;
+                break;
+            }
+        } else {
+            switch (desiredChannels) {
+            case 1:
+                channelConfig = AudioFormat.CHANNEL_OUT_MONO;
+                break;
+            case 2:
+                channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+                break;
+            case 3:
+                channelConfig = AudioFormat.CHANNEL_OUT_STEREO | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
+                break;
+            case 4:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+                break;
+            case 5:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
+                break;
+            case 6:
+                channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
+                break;
+            case 7:
+                channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER;
+                break;
+            case 8:
+                if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
+                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
+                } else {
+                    Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround");
+                    desiredChannels = 6;
+                    channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
+                }
+                break;
+            default:
+                Log.v(TAG, "Requested " + desiredChannels + " channels, getting stereo");
+                desiredChannels = 2;
+                channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+                break;
+            }
+
+/*
+            Log.v(TAG, "Speaker configuration (and order of channels):");
+
+            if ((channelConfig & 0x00000004) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_LEFT");
+            }
+            if ((channelConfig & 0x00000008) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_RIGHT");
+            }
+            if ((channelConfig & 0x00000010) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_CENTER");
+            }
+            if ((channelConfig & 0x00000020) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_LOW_FREQUENCY");
+            }
+            if ((channelConfig & 0x00000040) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_BACK_LEFT");
+            }
+            if ((channelConfig & 0x00000080) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_BACK_RIGHT");
+            }
+            if ((channelConfig & 0x00000100) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_LEFT_OF_CENTER");
+            }
+            if ((channelConfig & 0x00000200) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_RIGHT_OF_CENTER");
+            }
+            if ((channelConfig & 0x00000400) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_BACK_CENTER");
+            }
+            if ((channelConfig & 0x00000800) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_SIDE_LEFT");
+            }
+            if ((channelConfig & 0x00001000) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_SIDE_RIGHT");
+            }
+*/
+        }
+        frameSize = (sampleSize * desiredChannels);
+
+        // Let the user pick a larger buffer if they really want -- but ye
+        // gods they probably shouldn't, the minimums are horrifyingly high
+        // latency already
+        int minBufferSize;
+        if (isCapture) {
+            minBufferSize = AudioRecord.getMinBufferSize(sampleRate, channelConfig, audioFormat);
+        } else {
+            minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat);
+        }
+        desiredFrames = Math.max(desiredFrames, (minBufferSize + frameSize - 1) / frameSize);
+
+        int[] results = new int[4];
+
+        if (isCapture) {
+            if (mAudioRecord == null) {
+                mAudioRecord = new AudioRecord(MediaRecorder.AudioSource.DEFAULT, sampleRate,
+                        channelConfig, audioFormat, desiredFrames * frameSize);
+
+                // see notes about AudioTrack state in audioOpen(), above. Probably also applies here.
+                if (mAudioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+                    Log.e(TAG, "Failed during initialization of AudioRecord");
+                    mAudioRecord.release();
+                    mAudioRecord = null;
+                    return null;
+                }
+
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
+                }
+
+                mAudioRecord.startRecording();
+            }
+
+            results[0] = mAudioRecord.getSampleRate();
+            results[1] = mAudioRecord.getAudioFormat();
+            results[2] = mAudioRecord.getChannelCount();
+
+        } else {
+            if (mAudioTrack == null) {
+                mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+
+                // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
+                // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
+                // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
+                if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
+                    /* Try again, with safer values */
+
+                    Log.e(TAG, "Failed during initialization of Audio Track");
+                    mAudioTrack.release();
+                    mAudioTrack = null;
+                    return null;
+                }
+
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
+                }
+
+                mAudioTrack.play();
+            }
+
+            results[0] = mAudioTrack.getSampleRate();
+            results[1] = mAudioTrack.getAudioFormat();
+            results[2] = mAudioTrack.getChannelCount();
+        }
+        results[3] = desiredFrames;
+
+        Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", got " + results[3] + " frames of " + results[2] + " channel " + getAudioFormatString(results[1]) + " audio at " + results[0] + " Hz");
+
+        return results;
+    }
+
+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    private static void unregisterAudioDeviceCallback(Context context) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioOutputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioInputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteFloatBuffer(float[] buffer) {
+        if (mAudioTrack == null) {
+            Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
+            return;
+        }
+
+        if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
+            return;
+        }
+
+        for (int i = 0; i < buffer.length;) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(float)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteShortBuffer(short[] buffer) {
+        if (mAudioTrack == null) {
+            Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
+            return;
+        }
+
+        for (int i = 0; i < buffer.length;) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteByteBuffer(byte[] buffer) {
+        if (mAudioTrack == null) {
+            Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
+            return;
+        }
+
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(byte)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static int captureReadFloatBuffer(float[] buffer, boolean blocking) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return 0;
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static int captureReadShortBuffer(short[] buffer, boolean blocking) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return mAudioRecord.read(buffer, 0, buffer.length);
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return mAudioRecord.read(buffer, 0, buffer.length);
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static void audioClose() {
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+            mAudioTrack.release();
+            mAudioTrack = null;
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static void captureClose() {
+        if (mAudioRecord != null) {
+            mAudioRecord.stop();
+            mAudioRecord.release();
+            mAudioRecord = null;
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static void audioSetThreadPriority(boolean iscapture, int device_id) {
+        try {
+
+            /* Set thread name */
+            if (iscapture) {
+                Thread.currentThread().setName("SDLAudioC" + device_id);
+            } else {
+                Thread.currentThread().setName("SDLAudioP" + device_id);
+            }
+
+            /* Set thread priority */
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO);
+
+        } catch (Exception e) {
+            Log.v(TAG, "modify thread properties failed " + e.toString());
+        }
+    }
+
+    public static native int nativeSetupJNI();
+
+    public static native void removeAudioDevice(boolean isCapture, int deviceId);
+
+    public static native void addAudioDevice(boolean isCapture, int deviceId);
+
+}
diff --git a/app/src/main/engine/org/love2d/sdl/SDLControllerManager.java b/app/src/main/engine/org/love2d/sdl/SDLControllerManager.java
new file mode 100644
index 000000000..5cd55c7c8
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/SDLControllerManager.java
@@ -0,0 +1,854 @@
+package org.love2d.sdl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+public class SDLControllerManager
+{
+
+    public static native int nativeSetupJNI();
+
+    public static native int nativeAddJoystick(int device_id, String name, String desc,
+                                               int vendor_id, int product_id,
+                                               boolean is_accelerometer, int button_mask,
+                                               int naxes, int axis_mask, int nhats, int nballs);
+    public static native int nativeRemoveJoystick(int device_id);
+    public static native int nativeAddHaptic(int device_id, String name);
+    public static native int nativeRemoveHaptic(int device_id);
+    public static native int onNativePadDown(int device_id, int keycode);
+    public static native int onNativePadUp(int device_id, int keycode);
+    public static native void onNativeJoy(int device_id, int axis,
+                                          float value);
+    public static native void onNativeHat(int device_id, int hat_id,
+                                          int x, int y);
+
+    protected static SDLJoystickHandler mJoystickHandler;
+    protected static SDLHapticHandler mHapticHandler;
+
+    private static final String TAG = "SDLControllerManager";
+
+    public static void initialize() {
+        if (mJoystickHandler == null) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+                mJoystickHandler = new SDLJoystickHandler_API19();
+            } else {
+                mJoystickHandler = new SDLJoystickHandler_API16();
+            }
+        }
+
+        if (mHapticHandler == null) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
+                mHapticHandler = new SDLHapticHandler_API26();
+            } else {
+                mHapticHandler = new SDLHapticHandler();
+            }
+        }
+    }
+
+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
+        return mJoystickHandler.handleMotionEvent(event);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void pollInputDevices() {
+        mJoystickHandler.pollInputDevices();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void pollHapticDevices() {
+        mHapticHandler.pollHapticDevices();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void hapticRun(int device_id, float intensity, int length) {
+        mHapticHandler.run(device_id, intensity, length);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void hapticStop(int device_id)
+    {
+        mHapticHandler.stop(device_id);
+    }
+
+    // Check if a given device is considered a possible SDL joystick
+    public static boolean isDeviceSDLJoystick(int deviceId) {
+        InputDevice device = InputDevice.getDevice(deviceId);
+        // We cannot use InputDevice.isVirtual before API 16, so let's accept
+        // only nonnegative device ids (VIRTUAL_KEYBOARD equals -1)
+        if ((device == null) || (deviceId < 0)) {
+            return false;
+        }
+        int sources = device.getSources();
+
+        /* This is called for every button press, so let's not spam the logs */
+        /*
+        if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+            Log.v(TAG, "Input device " + device.getName() + " has class joystick.");
+        }
+        if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) {
+            Log.v(TAG, "Input device " + device.getName() + " is a dpad.");
+        }
+        if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
+            Log.v(TAG, "Input device " + device.getName() + " is a gamepad.");
+        }
+        */
+
+        return ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ||
+                ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
+                ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)
+        );
+    }
+
+}
+
+class SDLJoystickHandler {
+
+    /**
+     * Handles given MotionEvent.
+     * @param event the event to be handled.
+     * @return if given event was processed.
+     */
+    public boolean handleMotionEvent(MotionEvent event) {
+        return false;
+    }
+
+    /**
+     * Handles adding and removing of input devices.
+     */
+    public void pollInputDevices() {
+    }
+}
+
+/* Actual joystick functionality available for API >= 12 devices */
+class SDLJoystickHandler_API16 extends SDLJoystickHandler {
+
+    static class SDLJoystick {
+        public int device_id;
+        public String name;
+        public String desc;
+        public ArrayList<InputDevice.MotionRange> axes;
+        public ArrayList<InputDevice.MotionRange> hats;
+    }
+    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
+        @Override
+        public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+            // Some controllers, like the Moga Pro 2, return AXIS_GAS (22) for right trigger and AXIS_BRAKE (23) for left trigger - swap them so they're sorted in the right order for SDL
+            int arg0Axis = arg0.getAxis();
+            int arg1Axis = arg1.getAxis();
+            if (arg0Axis == MotionEvent.AXIS_GAS) {
+                arg0Axis = MotionEvent.AXIS_BRAKE;
+            } else if (arg0Axis == MotionEvent.AXIS_BRAKE) {
+                arg0Axis = MotionEvent.AXIS_GAS;
+            }
+            if (arg1Axis == MotionEvent.AXIS_GAS) {
+                arg1Axis = MotionEvent.AXIS_BRAKE;
+            } else if (arg1Axis == MotionEvent.AXIS_BRAKE) {
+                arg1Axis = MotionEvent.AXIS_GAS;
+            }
+
+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
+            return arg0Axis - arg1Axis;
+        }
+    }
+
+    private final ArrayList<SDLJoystick> mJoysticks;
+
+    public SDLJoystickHandler_API16() {
+
+        mJoysticks = new ArrayList<SDLJoystick>();
+    }
+
+    @Override
+    public void pollInputDevices() {
+        int[] deviceIds = InputDevice.getDeviceIds();
+
+        for (int device_id : deviceIds) {
+            if (SDLControllerManager.isDeviceSDLJoystick(device_id)) {
+                SDLJoystick joystick = getJoystick(device_id);
+                if (joystick == null) {
+                    InputDevice joystickDevice = InputDevice.getDevice(device_id);
+                    joystick = new SDLJoystick();
+                    joystick.device_id = device_id;
+                    joystick.name = joystickDevice.getName();
+                    joystick.desc = getJoystickDescriptor(joystickDevice);
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
+
+                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+                    Collections.sort(ranges, new RangeComparator());
+                    for (InputDevice.MotionRange range : ranges) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                                joystick.hats.add(range);
+                            } else {
+                                joystick.axes.add(range);
+                            }
+                        }
+                    }
+
+                    mJoysticks.add(joystick);
+                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
+                            getVendorId(joystickDevice), getProductId(joystickDevice), false,
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, 0);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = null;
+        for (SDLJoystick joystick : mJoysticks) {
+            int device_id = joystick.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
+            }
+            if (i == deviceIds.length) {
+                if (removedDevices == null) {
+                    removedDevices = new ArrayList<Integer>();
+                }
+                removedDevices.add(device_id);
+            }
+        }
+
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveJoystick(device_id);
+                for (int i = 0; i < mJoysticks.size(); i++) {
+                    if (mJoysticks.get(i).device_id == device_id) {
+                        mJoysticks.remove(i);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    protected SDLJoystick getJoystick(int device_id) {
+        for (SDLJoystick joystick : mJoysticks) {
+            if (joystick.device_id == device_id) {
+                return joystick;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean handleMotionEvent(MotionEvent event) {
+        int actionPointerIndex = event.getActionIndex();
+        int action = event.getActionMasked();
+        if (action == MotionEvent.ACTION_MOVE) {
+            SDLJoystick joystick = getJoystick(event.getDeviceId());
+            if (joystick != null) {
+                for (int i = 0; i < joystick.axes.size(); i++) {
+                    InputDevice.MotionRange range = joystick.axes.get(i);
+                    /* Normalize the value to -1...1 */
+                    float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
+                    SDLControllerManager.onNativeJoy(joystick.device_id, i, value);
+                }
+                for (int i = 0; i < joystick.hats.size() / 2; i++) {
+                    int hatX = Math.round(event.getAxisValue(joystick.hats.get(2 * i).getAxis(), actionPointerIndex));
+                    int hatY = Math.round(event.getAxisValue(joystick.hats.get(2 * i + 1).getAxis(), actionPointerIndex));
+                    SDLControllerManager.onNativeHat(joystick.device_id, i, hatX, hatY);
+                }
+            }
+        }
+        return true;
+    }
+
+    public String getJoystickDescriptor(InputDevice joystickDevice) {
+        String desc = joystickDevice.getDescriptor();
+
+        if (desc != null && !desc.isEmpty()) {
+            return desc;
+        }
+
+        return joystickDevice.getName();
+    }
+    public int getProductId(InputDevice joystickDevice) {
+        return 0;
+    }
+    public int getVendorId(InputDevice joystickDevice) {
+        return 0;
+    }
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        return -1;
+    }
+    public int getButtonMask(InputDevice joystickDevice) {
+        return -1;
+    }
+}
+
+class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
+
+    @Override
+    public int getProductId(InputDevice joystickDevice) {
+        return joystickDevice.getProductId();
+    }
+
+    @Override
+    public int getVendorId(InputDevice joystickDevice) {
+        return joystickDevice.getVendorId();
+    }
+
+    @Override
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        // For compatibility, keep computing the axis mask like before,
+        // only really distinguishing 2, 4 and 6 axes.
+        int axis_mask = 0;
+        if (ranges.size() >= 2) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY))
+            axis_mask |= 0x0003;
+        }
+        if (ranges.size() >= 4) {
+            // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY))
+            axis_mask |= 0x000c;
+        }
+        if (ranges.size() >= 6) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER))
+            axis_mask |= 0x0030;
+        }
+        // Also add an indicator bit for whether the sorting order has changed.
+        // This serves to disable outdated gamecontrollerdb.txt mappings.
+        boolean have_z = false;
+        boolean have_past_z_before_rz = false;
+        for (InputDevice.MotionRange range : ranges) {
+            int axis = range.getAxis();
+            if (axis == MotionEvent.AXIS_Z) {
+                have_z = true;
+            } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) {
+                have_past_z_before_rz = true;
+            }
+        }
+        if (have_z && have_past_z_before_rz) {
+            // If both these exist, the compare() function changed sorting order.
+            // Set a bit to indicate this fact.
+            axis_mask |= 0x8000;
+        }
+        return axis_mask;
+    }
+
+    @Override
+    public int getButtonMask(InputDevice joystickDevice) {
+        int button_mask = 0;
+        int[] keys = new int[] {
+            KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_BUTTON_B,
+            KeyEvent.KEYCODE_BUTTON_X,
+            KeyEvent.KEYCODE_BUTTON_Y,
+            KeyEvent.KEYCODE_BACK,
+            KeyEvent.KEYCODE_MENU,
+            KeyEvent.KEYCODE_BUTTON_MODE,
+            KeyEvent.KEYCODE_BUTTON_START,
+            KeyEvent.KEYCODE_BUTTON_THUMBL,
+            KeyEvent.KEYCODE_BUTTON_THUMBR,
+            KeyEvent.KEYCODE_BUTTON_L1,
+            KeyEvent.KEYCODE_BUTTON_R1,
+            KeyEvent.KEYCODE_DPAD_UP,
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_LEFT,
+            KeyEvent.KEYCODE_DPAD_RIGHT,
+            KeyEvent.KEYCODE_BUTTON_SELECT,
+            KeyEvent.KEYCODE_DPAD_CENTER,
+
+            // These don't map into any SDL controller buttons directly
+            KeyEvent.KEYCODE_BUTTON_L2,
+            KeyEvent.KEYCODE_BUTTON_R2,
+            KeyEvent.KEYCODE_BUTTON_C,
+            KeyEvent.KEYCODE_BUTTON_Z,
+            KeyEvent.KEYCODE_BUTTON_1,
+            KeyEvent.KEYCODE_BUTTON_2,
+            KeyEvent.KEYCODE_BUTTON_3,
+            KeyEvent.KEYCODE_BUTTON_4,
+            KeyEvent.KEYCODE_BUTTON_5,
+            KeyEvent.KEYCODE_BUTTON_6,
+            KeyEvent.KEYCODE_BUTTON_7,
+            KeyEvent.KEYCODE_BUTTON_8,
+            KeyEvent.KEYCODE_BUTTON_9,
+            KeyEvent.KEYCODE_BUTTON_10,
+            KeyEvent.KEYCODE_BUTTON_11,
+            KeyEvent.KEYCODE_BUTTON_12,
+            KeyEvent.KEYCODE_BUTTON_13,
+            KeyEvent.KEYCODE_BUTTON_14,
+            KeyEvent.KEYCODE_BUTTON_15,
+            KeyEvent.KEYCODE_BUTTON_16,
+        };
+        int[] masks = new int[] {
+            (1 << 0),   // A -> A
+            (1 << 1),   // B -> B
+            (1 << 2),   // X -> X
+            (1 << 3),   // Y -> Y
+            (1 << 4),   // BACK -> BACK
+            (1 << 6),   // MENU -> START
+            (1 << 5),   // MODE -> GUIDE
+            (1 << 6),   // START -> START
+            (1 << 7),   // THUMBL -> LEFTSTICK
+            (1 << 8),   // THUMBR -> RIGHTSTICK
+            (1 << 9),   // L1 -> LEFTSHOULDER
+            (1 << 10),  // R1 -> RIGHTSHOULDER
+            (1 << 11),  // DPAD_UP -> DPAD_UP
+            (1 << 12),  // DPAD_DOWN -> DPAD_DOWN
+            (1 << 13),  // DPAD_LEFT -> DPAD_LEFT
+            (1 << 14),  // DPAD_RIGHT -> DPAD_RIGHT
+            (1 << 4),   // SELECT -> BACK
+            (1 << 0),   // DPAD_CENTER -> A
+            (1 << 15),  // L2 -> ??
+            (1 << 16),  // R2 -> ??
+            (1 << 17),  // C -> ??
+            (1 << 18),  // Z -> ??
+            (1 << 20),  // 1 -> ??
+            (1 << 21),  // 2 -> ??
+            (1 << 22),  // 3 -> ??
+            (1 << 23),  // 4 -> ??
+            (1 << 24),  // 5 -> ??
+            (1 << 25),  // 6 -> ??
+            (1 << 26),  // 7 -> ??
+            (1 << 27),  // 8 -> ??
+            (1 << 28),  // 9 -> ??
+            (1 << 29),  // 10 -> ??
+            (1 << 30),  // 11 -> ??
+            (1 << 31),  // 12 -> ??
+            // We're out of room...
+            0xFFFFFFFF,  // 13 -> ??
+            0xFFFFFFFF,  // 14 -> ??
+            0xFFFFFFFF,  // 15 -> ??
+            0xFFFFFFFF,  // 16 -> ??
+        };
+        boolean[] has_keys = joystickDevice.hasKeys(keys);
+        for (int i = 0; i < keys.length; ++i) {
+            if (has_keys[i]) {
+                button_mask |= masks[i];
+            }
+        }
+        return button_mask;
+    }
+}
+
+class SDLHapticHandler_API26 extends SDLHapticHandler {
+    @Override
+    public void run(int device_id, float intensity, int length) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            Log.d("SDL", "Rtest: Vibe with intensity " + intensity + " for " + length);
+            if (intensity == 0.0f) {
+                stop(device_id);
+                return;
+            }
+
+            int vibeValue = Math.round(intensity * 255);
+
+            if (vibeValue > 255) {
+                vibeValue = 255;
+            }
+            if (vibeValue < 1) {
+                stop(device_id);
+                return;
+            }
+            try {
+                haptic.vib.vibrate(VibrationEffect.createOneShot(length, vibeValue));
+            }
+            catch (Exception e) {
+                // Fall back to the generic method, which uses DEFAULT_AMPLITUDE, but works even if
+                // something went horribly wrong with the Android 8.0 APIs.
+                haptic.vib.vibrate(length);
+            }
+        }
+    }
+}
+
+class SDLHapticHandler {
+
+    static class SDLHaptic {
+        public int device_id;
+        public String name;
+        public Vibrator vib;
+    }
+
+    private final ArrayList<SDLHaptic> mHaptics;
+
+    public SDLHapticHandler() {
+        mHaptics = new ArrayList<SDLHaptic>();
+    }
+
+    public void run(int device_id, float intensity, int length) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            haptic.vib.vibrate(length);
+        }
+    }
+
+    public void stop(int device_id) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            haptic.vib.cancel();
+        }
+    }
+
+    public void pollHapticDevices() {
+
+        final int deviceId_VIBRATOR_SERVICE = 999999;
+        boolean hasVibratorService = false;
+
+        int[] deviceIds = InputDevice.getDeviceIds();
+        // It helps processing the device ids in reverse order
+        // For example, in the case of the XBox 360 wireless dongle,
+        // so the first controller seen by SDL matches what the receiver
+        // considers to be the first controller
+
+        for (int i = deviceIds.length - 1; i > -1; i--) {
+            SDLHaptic haptic = getHaptic(deviceIds[i]);
+            if (haptic == null) {
+                InputDevice device = InputDevice.getDevice(deviceIds[i]);
+                Vibrator vib = device.getVibrator();
+                if (vib.hasVibrator()) {
+                    haptic = new SDLHaptic();
+                    haptic.device_id = deviceIds[i];
+                    haptic.name = device.getName();
+                    haptic.vib = vib;
+                    mHaptics.add(haptic);
+                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                }
+            }
+        }
+
+        /* Check VIBRATOR_SERVICE */
+        Vibrator vib = (Vibrator) SDL.getContext().getSystemService(Context.VIBRATOR_SERVICE);
+        if (vib != null) {
+            hasVibratorService = vib.hasVibrator();
+
+            if (hasVibratorService) {
+                SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
+                if (haptic == null) {
+                    haptic = new SDLHaptic();
+                    haptic.device_id = deviceId_VIBRATOR_SERVICE;
+                    haptic.name = "VIBRATOR_SERVICE";
+                    haptic.vib = vib;
+                    mHaptics.add(haptic);
+                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = null;
+        for (SDLHaptic haptic : mHaptics) {
+            int device_id = haptic.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
+            }
+
+            if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) {
+                if (i == deviceIds.length) {
+                    if (removedDevices == null) {
+                        removedDevices = new ArrayList<Integer>();
+                    }
+                    removedDevices.add(device_id);
+                }
+            }  // else: don't remove the vibrator if it is still present
+        }
+
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveHaptic(device_id);
+                for (int i = 0; i < mHaptics.size(); i++) {
+                    if (mHaptics.get(i).device_id == device_id) {
+                        mHaptics.remove(i);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    protected SDLHaptic getHaptic(int device_id) {
+        for (SDLHaptic haptic : mHaptics) {
+            if (haptic.device_id == device_id) {
+                return haptic;
+            }
+        }
+        return null;
+    }
+}
+
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
+    // Generic Motion (mouse hover, joystick...) events go here
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        float x, y;
+        int action;
+
+        switch ( event.getSource() ) {
+            case InputDevice.SOURCE_JOYSTICK:
+                return SDLControllerManager.handleJoystickMotionEvent(event);
+
+            case InputDevice.SOURCE_MOUSE:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    default:
+                        break;
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        // Event was not managed
+        return false;
+    }
+
+    public boolean supportsRelativeMouse() {
+        return false;
+    }
+
+    public boolean inRelativeMode() {
+        return false;
+    }
+
+    public boolean setRelativeMouseEnabled(boolean enabled) {
+        return false;
+    }
+
+    public void reclaimRelativeMouseModeIfNeeded()
+    {
+
+    }
+
+    public float getEventX(MotionEvent event) {
+        return event.getX(0);
+    }
+
+    public float getEventY(MotionEvent event) {
+        return event.getY(0);
+    }
+
+}
+
+class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API12 {
+    // Generic Motion (mouse hover, joystick...) events go here
+
+    private boolean mRelativeModeEnabled;
+
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+
+        // Handle relative mouse mode
+        if (mRelativeModeEnabled) {
+            if (event.getSource() == InputDevice.SOURCE_MOUSE) {
+                int action = event.getActionMasked();
+                if (action == MotionEvent.ACTION_HOVER_MOVE) {
+                    float x = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+                    float y = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+                    SDLActivity.onNativeMouse(0, action, x, y, true);
+                    return true;
+                }
+            }
+        }
+
+        // Event was not managed, call SDLGenericMotionListener_API12 method
+        return super.onGenericMotion(v, event);
+    }
+
+    @Override
+    public boolean supportsRelativeMouse() {
+        return true;
+    }
+
+    @Override
+    public boolean inRelativeMode() {
+        return mRelativeModeEnabled;
+    }
+
+    @Override
+    public boolean setRelativeMouseEnabled(boolean enabled) {
+        mRelativeModeEnabled = enabled;
+        return true;
+    }
+
+    @Override
+    public float getEventX(MotionEvent event) {
+        if (mRelativeModeEnabled) {
+            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+        } else {
+            return event.getX(0);
+        }
+    }
+
+    @Override
+    public float getEventY(MotionEvent event) {
+        if (mRelativeModeEnabled) {
+            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+        } else {
+            return event.getY(0);
+        }
+    }
+}
+
+class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
+    // Generic Motion (mouse hover, joystick...) events go here
+    private boolean mRelativeModeEnabled;
+
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        float x, y;
+        int action;
+
+        switch ( event.getSource() ) {
+            case InputDevice.SOURCE_JOYSTICK:
+                return SDLControllerManager.handleJoystickMotionEvent(event);
+
+            case InputDevice.SOURCE_MOUSE:
+            // DeX desktop mouse cursor is a separate non-standard input type.
+            case InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    default:
+                        break;
+                }
+                break;
+
+            case InputDevice.SOURCE_MOUSE_RELATIVE:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+                        SDLActivity.onNativeMouse(0, action, x, y, true);
+                        return true;
+
+                    default:
+                        break;
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        // Event was not managed
+        return false;
+    }
+
+    @Override
+    public boolean supportsRelativeMouse() {
+        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
+    }
+
+    @Override
+    public boolean inRelativeMode() {
+        return mRelativeModeEnabled;
+    }
+
+    @Override
+    public boolean setRelativeMouseEnabled(boolean enabled) {
+        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
+            if (enabled) {
+                SDLActivity.getContentView().requestPointerCapture();
+            } else {
+                SDLActivity.getContentView().releasePointerCapture();
+            }
+            mRelativeModeEnabled = enabled;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void reclaimRelativeMouseModeIfNeeded()
+    {
+        if (mRelativeModeEnabled && !SDLActivity.isDeXMode()) {
+            SDLActivity.getContentView().requestPointerCapture();
+        }
+    }
+
+    @Override
+    public float getEventX(MotionEvent event) {
+        // Relative mouse in capture mode will only have relative for X/Y
+        return event.getX(0);
+    }
+
+    @Override
+    public float getEventY(MotionEvent event) {
+        // Relative mouse in capture mode will only have relative for X/Y
+        return event.getY(0);
+    }
+}
diff --git a/app/src/main/engine/org/love2d/sdl/SDLSurface.java b/app/src/main/engine/org/love2d/sdl/SDLSurface.java
new file mode 100644
index 000000000..f0c0e0fb1
--- /dev/null
+++ b/app/src/main/engine/org/love2d/sdl/SDLSurface.java
@@ -0,0 +1,405 @@
+package org.love2d.sdl;
+
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowManager;
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected SensorManager mSensorManager;
+    protected Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected float mWidth, mHeight;
+
+    // Is SurfaceView ready for rendering
+    public boolean mIsSurfaceReady;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        setOnGenericMotionListener(SDLActivity.getMotionListener());
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+
+        mIsSurfaceReady = false;
+    }
+
+    public void handlePause() {
+        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        SDLActivity.onNativeSurfaceCreated();
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+
+        // Transition to pause, if needed
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
+        SDLActivity.handleNativeState();
+
+        mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        if (SDLActivity.mSingleton == null) {
+            return;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        int nDeviceWidth = width;
+        int nDeviceHeight = height;
+        try
+        {
+            if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) {
+                DisplayMetrics realMetrics = new DisplayMetrics();
+                mDisplay.getRealMetrics( realMetrics );
+                nDeviceWidth = realMetrics.widthPixels;
+                nDeviceHeight = realMetrics.heightPixels;
+            }
+        } catch(Exception ignored) {
+        }
+
+        synchronized(SDLActivity.getContext()) {
+            // In case we're waiting on a size change after going fullscreen, send a notification.
+            SDLActivity.getContext().notifyAll();
+        }
+
+        Log.v("SDL", "Window size: " + width + "x" + height);
+        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
+        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, mDisplay.getRefreshRate());
+        SDLActivity.onNativeResize();
+
+        // Prevent a screen distortion glitch,
+        // for instance when the device is in Landscape and a Portrait App is resumed.
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        // Don't skip in MultiWindow.
+        if (skip) {
+            if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
+                    Log.v("SDL", "Don't skip in Multi-Window");
+                    skip = false;
+                }
+            }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           mIsSurfaceReady = false;
+           return;
+        }
+
+        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+        SDLActivity.onNativeSurfaceChanged();
+
+        /* Surface is ready */
+        mIsSurfaceReady = true;
+
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
+        SDLActivity.handleNativeState();
+    }
+
+    // Key events
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, null);
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int i = -1;
+        float x,y,p;
+
+        /*
+         * Prevent id to be -1, since it's used in SDL internal for synthetic events
+         * Appears when using Android emulator, eg:
+         *  adb shell input mouse tap 100 100
+         *  adb shell input touchscreen tap 100 100
+         */
+        if (touchDevId < 0) {
+            touchDevId -= 1;
+        }
+
+        // 12290 = Samsung DeX mode desktop mouse
+        // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
+        // 0x2   = SOURCE_CLASS_POINTER
+        if (event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == (InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN)) {
+            int mouseButton = 1;
+            try {
+                Object object = event.getClass().getMethod("getButtonState").invoke(event);
+                if (object != null) {
+                    mouseButton = (Integer) object;
+                }
+            } catch(Exception ignored) {
+            }
+
+            // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
+            // if we are.  We'll leverage our existing mouse motion listener
+            SDLGenericMotionListener_API12 motionListener = SDLActivity.getMotionListener();
+            x = motionListener.getEventX(event);
+            y = motionListener.getEventY(event);
+
+            SDLActivity.onNativeMouse(mouseButton, action, x, y, motionListener.inRelativeMode());
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                    /* fallthrough */
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+
+            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
+            // We thus should check here.
+            int newOrientation;
+
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE;
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[0];
+                    y = -event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                    break;
+                case Surface.ROTATION_0:
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT;
+                    break;
+            }
+
+            if (newOrientation != SDLActivity.mCurrentOrientation) {
+                SDLActivity.mCurrentOrientation = newOrientation;
+                SDLActivity.onNativeOrientationChanged(newOrientation);
+            }
+
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
+
+
+        }
+    }
+
+    // Captured pointer events for API 26.
+    public boolean onCapturedPointerEvent(MotionEvent event)
+    {
+        int action = event.getActionMasked();
+
+        float x, y;
+        switch (action) {
+            case MotionEvent.ACTION_SCROLL:
+                x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                SDLActivity.onNativeMouse(0, action, x, y, false);
+                return true;
+
+            case MotionEvent.ACTION_HOVER_MOVE:
+            case MotionEvent.ACTION_MOVE:
+                x = event.getX(0);
+                y = event.getY(0);
+                SDLActivity.onNativeMouse(0, action, x, y, true);
+                return true;
+
+            case MotionEvent.ACTION_BUTTON_PRESS:
+            case MotionEvent.ACTION_BUTTON_RELEASE:
+
+                // Change our action value to what SDL's code expects.
+                if (action == MotionEvent.ACTION_BUTTON_PRESS) {
+                    action = MotionEvent.ACTION_DOWN;
+                } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
+                    action = MotionEvent.ACTION_UP;
+                }
+
+                x = event.getX(0);
+                y = event.getY(0);
+                int button = event.getButtonState();
+
+                SDLActivity.onNativeMouse(button, action, x, y, true);
+                return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/src/main/feature/artwork/ArtworkScraper.kt b/app/src/main/feature/artwork/ArtworkScraper.kt
new file mode 100644
index 000000000..b7c5c293b
--- /dev/null
+++ b/app/src/main/feature/artwork/ArtworkScraper.kt
@@ -0,0 +1,7 @@
+package com.winlator.cmod.feature.artwork
+
+import java.io.File
+
+abstract class ArtworkScraper() {
+    abstract suspend fun getGameArtwork(gameName: String): MutableMap<String, File>
+}
diff --git a/app/src/main/feature/artwork/SteamArtworkScraper.kt b/app/src/main/feature/artwork/SteamArtworkScraper.kt
new file mode 100644
index 000000000..2a068f489
--- /dev/null
+++ b/app/src/main/feature/artwork/SteamArtworkScraper.kt
@@ -0,0 +1,191 @@
+package com.winlator.cmod.feature.artwork
+
+import java.io.File
+import java.io.IOException
+import org.json.JSONObject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import android.content.Context
+import androidx.core.net.toUri
+import okhttp3.Request
+import okhttp3.OkHttpClient
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import com.winlator.cmod.runtime.content.Downloader
+
+class SteamArtworkScraper(private val context: Context) : ArtworkScraper() {
+
+    private val client = OkHttpClient()
+    private val baseSteamArtworkUrl = "https://shared.akamai.steamstatic.com/store_item_assets/steam/apps"
+    private suspend fun getGameId(gameName: String): Int? =
+        withContext(Dispatchers.IO) {
+            try {
+                val requestBody = String.format("""
+                    {
+                      "asset_type": "grid",
+                      "term": "%s",
+                      "offset": 0,
+                      "filters": {
+                        "styles": [
+                          "all"
+                        ],
+                        "dimensions": [
+                          "all"
+                        ],
+                        "type": [
+                          "all"
+                        ],
+                        "order": "score_desc"
+                      }
+                    }
+                """.trimIndent(), gameName)
+                val request = Request.Builder()
+                    .url("https://www.steamgriddb.com/api/public/search/main/games")
+                    .post(requestBody.toRequestBody("application/json".toMediaType()))
+                    .header("User-Agent", "WinNative/1.0")
+                    .header("Accept", "application/json, text/plain, */*")
+                    .header("Accept-Language", "en-US,en;q=0.9")
+                    .header("Content-Type", "application/json")
+                    .header("Referer", "https://www.steamgriddb.com/search/grids")
+                    .build()
+
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) throw IOException("Unexpected code $response")
+                    val json = JSONObject(response.body.string())
+                    if (!json.getBoolean("success"))
+                        throw IOException("Unexpected code $response")
+                    val gameId = json.optJSONObject("data")?.optJSONArray("games")?.optJSONObject(0)?.optJSONObject("game")?.getInt("id")
+                    gameId?.let {
+                        return@withContext gameId
+                    }
+                }
+            } catch (e: Exception) {
+                null
+            }
+        }
+    // Steam nests some filenames under image2x/image and stores others flat.
+    private fun steamAssetUrl(metadata: JSONObject?, assetKey: String, baseUrl: String?): String? {
+        if (metadata == null || baseUrl == null) return null
+        val asset = metadata.optJSONObject(assetKey) ?: return null
+        val filename = asset.optJSONObject("image2x")?.optString("english")?.ifBlank { null }
+            ?: asset.optJSONObject("image")?.optString("english")?.ifBlank { null }
+            ?: asset.optString("english").ifBlank { null }
+            ?: return null
+        return String.format("%s/%s", baseUrl, filename)
+    }
+
+    private fun uploadedAssetUrl(data: JSONObject?, key: String): String? =
+        data?.optJSONObject(key)?.optJSONObject("asset")?.optString("url")?.ifBlank { null }
+
+    // Community uploads, used when a title carries no official art of that shape.
+    private fun uploadedAssets(gameId: Int): JSONObject? =
+        try {
+            val request = Request.Builder()
+                .url(String.format("https://www.steamgriddb.com/api/public/game/%s/home", gameId.toString()))
+                .header("User-Agent", "WinNative/1.0")
+                .header("Accept", "application/json, text/plain, */*")
+                .header("Referer", "https://www.steamgriddb.com/game/")
+                .build()
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) null
+                else JSONObject(response.body.string()).optJSONObject("data")
+            }
+        } catch (e: Exception) {
+            null
+        }
+
+    private fun uploadedByShape(assets: JSONObject?, listKey: String, portrait: Boolean): String? {
+        val list = assets?.optJSONArray(listKey) ?: return null
+        for (i in 0 until list.length()) {
+            val asset = list.optJSONObject(i) ?: continue
+            if (asset.optBoolean("nsfw") || asset.optBoolean("humor")) continue
+            val width = asset.optInt("width")
+            val height = asset.optInt("height")
+            if (width <= 0 || height <= 0) continue
+            if (portrait != (height > width)) continue
+            val url = asset.optString("url").ifBlank { null } ?: continue
+            return url
+        }
+        return null
+    }
+
+    private suspend fun downloadGameAssets(gameName: String): MutableMap<String, File> =
+        withContext(Dispatchers.IO) {
+            val results = mutableMapOf<String, File>()
+            try {
+                val gameId = getGameId(gameName) ?: return@withContext results
+                val storageDir = File(context.cacheDir, "artwork_scrape").apply { if (!exists()) mkdirs() }
+                val storagePath = File(storageDir, gameId.toString()).absolutePath
+                val request = Request.Builder()
+                    .url(String.format("https://www.steamgriddb.com/api/public/game/%s", gameId.toString()))
+                    .header("User-Agent", "WinNative/1.0")
+                    .header("Accept", "application/json, text/plain, */*")
+                    .header("Accept-Language", "en-US,en;q=0.9")
+                    .header("Connection", "keep-alive")
+                    .header("Referer", "https://www.steamgriddb.com/game/")
+                    .header("Sec-Fetch-Dest", "empty")
+                    .header("Sec-Fetch-Mode", "cors")
+                    .header("Sec-Fetch-Site", "same-origin")
+                    .header("TE", "trailers")
+                    .build()
+
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) throw IOException("Unexpected code $response")
+                    val json = JSONObject(response.body.string())
+                    if (!json.getBoolean("success"))
+                        throw IOException("Status not successful $response")
+                    val data = json.optJSONObject("data")
+                    val steam = data?.optJSONObject("platforms")?.optJSONObject("steam")
+                    val steamGameId = steam?.optString("id")?.ifBlank { null }
+                    val metadata = steam?.optJSONObject("metadata")
+                    val steamArtworkUrl =
+                        steamGameId?.let { String.format("%s/%s", baseSteamArtworkUrl, it) }
+
+                    // Community uploads only cost a request when official art is missing.
+                    var uploadedCache: JSONObject? = null
+                    var uploadedFetched = false
+                    fun uploaded(): JSONObject? {
+                        if (!uploadedFetched) {
+                            uploadedFetched = true
+                            uploadedCache = uploadedAssets(gameId)
+                        }
+                        return uploadedCache
+                    }
+
+                    val urls = LinkedHashMap<String, String>()
+                    // Background: wide banner.
+                    val heroUrl = steamAssetUrl(metadata, "library_hero_full", steamArtworkUrl)
+                        ?: uploadedByShape(uploaded(), "heroes", portrait = false)
+                        ?: uploadedAssetUrl(data, "header")
+                    if (heroUrl != null) urls["hero"] = heroUrl
+                    // Carousel: tall capsule.
+                    val carouselUrl = steamAssetUrl(metadata, "library_capsule_full", steamArtworkUrl)
+                        ?: uploadedByShape(uploaded(), "grids", portrait = true)
+                    if (carouselUrl != null) urls["carousel"] = carouselUrl
+                    // Grid and list: wide header.
+                    val headerUrl = steamAssetUrl(metadata, "header_image_full", steamArtworkUrl)
+                        ?: uploadedByShape(uploaded(), "grids", portrait = false)
+                        ?: uploadedAssetUrl(data, "header")
+                    if (headerUrl != null) {
+                        urls["grid"] = headerUrl
+                        urls["list"] = headerUrl
+                    }
+
+                    urls.forEach { (key, url) ->
+                        val name = url.substringAfterLast('/').substringBefore('?')
+                        val fileHandle = File(String.format("%s_%s_%s", storagePath, key, name))
+                        if (Downloader.downloadFile(url, fileHandle, null))
+                            results[key] = fileHandle
+                    }
+                    return@withContext results
+                }
+            } catch (e: Exception) {
+                return@withContext results
+            }
+        }
+
+    override suspend fun getGameArtwork(gameName: String): MutableMap<String, File> =
+        withContext(Dispatchers.IO) {
+            return@withContext downloadGameAssets(gameName)
+        }
+    }
diff --git a/app/src/main/feature/leaderboard/HardwareDictionary.kt b/app/src/main/feature/leaderboard/HardwareDictionary.kt
new file mode 100644
index 000000000..cbffafa9f
--- /dev/null
+++ b/app/src/main/feature/leaderboard/HardwareDictionary.kt
@@ -0,0 +1,160 @@
+package com.winlator.cmod.feature.leaderboard
+
+import java.util.Locale
+
+/**
+ * Reverse lookup for the 4-byte SHA-256-prefix hashes stored inside a [PerfDigest].
+ *
+ * On submit, a device hashes its (normalized) GPU/SoC strings and embeds the prefix in
+ * the scoreTag. On display, the receiving client looks the hash up here to render a
+ * human-readable label ("Adreno 830", "Snapdragon 8 Gen 3") instead of raw hex.
+ *
+ * Devices whose hardware isn't in this dictionary still submit successfully — the row
+ * just renders as a short hex label until the dictionary is extended. Extending is
+ * additive: append a new entry, ship, no schema bump needed.
+ */
+object HardwareDictionary {
+    private val gpuModels: List<String> = listOf(
+        "Adreno 830",
+        "Adreno 750",
+        "Adreno 740",
+        "Adreno 735",
+        "Adreno 732",
+        "Adreno 730",
+        "Adreno 725",
+        "Adreno 720",
+        "Adreno 710",
+        "Adreno 660",
+        "Adreno 650",
+        "Adreno 644",
+        "Adreno 643",
+        "Adreno 642L",
+        "Adreno 642",
+        "Adreno 640",
+        "Adreno 630",
+        "Adreno 619",
+        "Adreno 618",
+        "Adreno 616",
+        "Adreno 615",
+        "Adreno 610",
+        "Mali-G925",
+        "Mali-G720",
+        "Mali-G715",
+        "Mali-G710",
+        "Mali-G78",
+        "Mali-G77",
+        "Mali-G76",
+        "Mali-G68",
+        "Mali-G57",
+        "Mali-G52",
+        "Mali-G51",
+        "Xclipse 940",
+        "Xclipse 920",
+        "PowerVR GE8320",
+        "PowerVR GE8300",
+        "PowerVR Rogue GE8320",
+        "Immortalis-G925",
+        "Immortalis-G720",
+        "Immortalis-G715",
+    )
+
+    private val socModels: List<String> = listOf(
+        "Snapdragon 8 Elite",
+        "Snapdragon 8 Gen 3",
+        "Snapdragon 8 Gen 2",
+        "Snapdragon 8 Gen 1",
+        "Snapdragon 8+ Gen 1",
+        "Snapdragon 888",
+        "Snapdragon 870",
+        "Snapdragon 865",
+        "Snapdragon 855",
+        "Snapdragon 845",
+        "Snapdragon 7 Gen 3",
+        "Snapdragon 7 Gen 1",
+        "Snapdragon 778G",
+        "Snapdragon 765G",
+        "Snapdragon 750G",
+        "Snapdragon 720G",
+        "Snapdragon 695",
+        "Snapdragon 680",
+        "Snapdragon 6 Gen 1",
+        "Tensor G4",
+        "Tensor G3",
+        "Tensor G2",
+        "Tensor G1",
+        "Exynos 2400",
+        "Exynos 2200",
+        "Exynos 2100",
+        "Exynos 990",
+        "Exynos 9825",
+        "Exynos 9820",
+        "Dimensity 9300",
+        "Dimensity 9200",
+        "Dimensity 9000",
+        "Dimensity 8300",
+        "Dimensity 8200",
+        "Dimensity 8100",
+        "Dimensity 1300",
+        "Dimensity 1200",
+        "Dimensity 1100",
+        "Dimensity 1000",
+        "Dimensity 920",
+        "Dimensity 900",
+        "Dimensity 810",
+        "Dimensity 800",
+    )
+
+    private val gpuLookup: Map<HashKey, String> = gpuModels.associate {
+        HashKey(PerfDigest.shortHash(canonicalize(it))) to it
+    }
+
+    private val socLookup: Map<HashKey, String> = socModels.associate {
+        HashKey(PerfDigest.shortHash(canonicalize(it))) to it
+    }
+
+    /** Hash a raw GPU renderer string (e.g., `GLES20.glGetString(GL_RENDERER)`). */
+    fun gpuHashOf(rendererString: String): ByteArray =
+        PerfDigest.shortHash(canonicalize(rendererString))
+
+    /** Hash a raw SoC model string (e.g., `Build.SOC_MODEL`). */
+    fun socHashOf(socModelString: String): ByteArray =
+        PerfDigest.shortHash(canonicalize(socModelString))
+
+    /** Look up a friendly label for a stored GPU hash; null if the hash isn't known. */
+    fun gpuLabelForHash(hash: ByteArray): String? = gpuLookup[HashKey(hash)]
+
+    /** Look up a friendly label for a stored SoC hash; null if the hash isn't known. */
+    fun socLabelForHash(hash: ByteArray): String? = socLookup[HashKey(hash)]
+
+    /**
+     * Renders a hash as a short hex label ("ab12cd34") when the dictionary has no match.
+     * Used as the visible fallback in the leaderboard UI so unknown hardware still shows
+     * something useful instead of a blank cell.
+     */
+    fun hexLabel(hash: ByteArray): String =
+        hash.joinToString("") { "%02x".format(it) }
+
+    /**
+     * Canonicalize free-form vendor strings so visually-equivalent variants hash to the
+     * same prefix. Drops "(TM)", "(R)", whitespace runs collapse to a single space,
+     * lowercase, and trim. Conservative on purpose — collapsing too aggressively risks
+     * collapsing distinct SKUs (e.g., "Adreno 642" vs "Adreno 642L").
+     */
+    private fun canonicalize(raw: String): String =
+        raw
+            .replace("(TM)", "", ignoreCase = true)
+            .replace("(R)", "", ignoreCase = true)
+            .replace("\u2122", "")
+            .replace("\u00AE", "")
+            .replace(Regex("\\s+"), " ")
+            .trim()
+            .lowercase(Locale.ROOT)
+
+    /** ByteArray wrapper that supports proper hashCode/equals for use as a Map key. */
+    private data class HashKey(val bytes: ByteArray) {
+        override fun equals(other: Any?): Boolean =
+            this === other || (other is HashKey && bytes.contentEquals(other.bytes))
+
+        override fun hashCode(): Int = bytes.contentHashCode()
+    }
+}
diff --git a/app/src/main/feature/leaderboard/PerfDigest.kt b/app/src/main/feature/leaderboard/PerfDigest.kt
new file mode 100644
index 000000000..d6f578590
--- /dev/null
+++ b/app/src/main/feature/leaderboard/PerfDigest.kt
@@ -0,0 +1,259 @@
+package com.winlator.cmod.feature.leaderboard
+
+import android.util.Base64
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.security.MessageDigest
+
+/**
+ * Compact 48-byte performance digest packed into a Play Games Services scoreTag.
+ *
+ * The scoreTag field is constrained by RFC 3986 §2.3 to 64 URI-safe characters, which is
+ * exactly 48 raw bytes when base64url-encoded with no padding (48 × 8 / 6 = 64). Each game
+ * session that submits to the global "performance_v1" leaderboard packs its summary stats
+ * plus four short content-addressed hashes (game id, gpu, soc, container config) plus a
+ * truncated android id hash into this fixed layout.
+ *
+ * No HMAC is included: the secret would ship inside the APK and is trivially extractable.
+ * Identity verification is provided by PGS (Google account auth on submit). Stats-recompute
+ * anti-cheat lives server-side in the future Tier 1 backend.
+ */
+data class PerfDigest(
+    val schemaVersion: Byte = SCHEMA_VERSION,
+    val flags: Int,
+    val sessionDurationSeconds: Long,
+    val avgFps: Float,
+    val p1LowFps: Float,
+    val avgFrametimeMs: Float,
+    val p99FrametimeMs: Float,
+    val medianFrametimeMs: Float,
+    /** Self-process CPU usage 0..100. Values above 127 are clipped on encode (u8 / 2 storage). */
+    val avgCpuPct: Int,
+    /** GPU busy percentage 0..100, or 0 when sysfs is unreadable. Same 0..127 storage limit. */
+    val avgGpuPct: Int,
+    val peakSocTempC: Float,
+    val avgSocTempC: Float,
+    val batteryDropPct: Int,
+    /**
+     * Average battery current magnitude in milliamps. The caller is responsible for
+     * converting microamps → milliamps and taking absolute value (sign of
+     * BATTERY_PROPERTY_CURRENT_NOW is OEM-dependent). u16 caps at 65,535 mA.
+     */
+    val avgBatteryCurrentMa: Int,
+    val thermalThrottleSeconds: Int,
+    val gameIdHash: ByteArray,
+    val gpuModelHash: ByteArray,
+    val socModelHash: ByteArray,
+    val containerConfigHash: ByteArray,
+    val androidIdShortHash: ByteArray,
+) {
+    init {
+        // Internal invariants — all hash producers in this codebase return exactly HASH_SIZE
+        // bytes via PerfDigest.shortHash / HardwareDictionary.*HashOf. A violation here
+        // indicates a programming bug, not user input, so check (not require).
+        check(gameIdHash.size == HASH_SIZE) { "gameIdHash must be $HASH_SIZE bytes" }
+        check(gpuModelHash.size == HASH_SIZE) { "gpuModelHash must be $HASH_SIZE bytes" }
+        check(socModelHash.size == HASH_SIZE) { "socModelHash must be $HASH_SIZE bytes" }
+        check(containerConfigHash.size == HASH_SIZE) { "containerConfigHash must be $HASH_SIZE bytes" }
+        check(androidIdShortHash.size == HASH_SIZE) { "androidIdShortHash must be $HASH_SIZE bytes" }
+    }
+
+    fun isThermalThrottled(): Boolean = (flags and FLAG_THERMAL_THROTTLED) != 0
+
+    /** True when the submitter opted into display-anonymity for this run. */
+    fun isAnonymous(): Boolean = (flags and FLAG_ANONYMOUS) != 0
+
+    fun encode(): String {
+        val buf = ByteBuffer.allocate(BYTE_LENGTH).order(ByteOrder.BIG_ENDIAN)
+        buf.put(schemaVersion)
+        buf.put((flags and 0xFF).toByte())
+        buf.putInt(sessionDurationSeconds.coerceIn(0L, 0xFFFFFFFFL).toInt())
+        buf.putShort(encodeU16(avgFps * 10f))
+        buf.putShort(encodeU16(p1LowFps * 10f))
+        buf.putShort(encodeU16(avgFrametimeMs * 100f))
+        buf.putShort(encodeU16(p99FrametimeMs * 100f))
+        buf.putShort(encodeU16(medianFrametimeMs * 100f))
+        buf.put(encodeU8((avgCpuPct * 2).toFloat()))
+        buf.put(encodeU8((avgGpuPct * 2).toFloat()))
+        buf.putShort(encodeU16(peakSocTempC * 10f))
+        buf.putShort(encodeU16(avgSocTempC * 10f))
+        buf.put(encodeU8(batteryDropPct.toFloat()))
+        buf.putShort(encodeU16(avgBatteryCurrentMa.toFloat()))
+        buf.putShort(encodeU16(thermalThrottleSeconds.toFloat()))
+        buf.put(gameIdHash)
+        buf.put(gpuModelHash)
+        buf.put(socModelHash)
+        buf.put(containerConfigHash)
+        buf.put(androidIdShortHash)
+        buf.put(0.toByte())
+        check(!buf.hasRemaining()) { "PerfDigest layout mismatch: ${buf.remaining()} bytes unused" }
+        val out = Base64.encodeToString(buf.array(), BASE64_FLAGS)
+        check(out.length == ENCODED_LENGTH) { "encoded tag length=${out.length}, expected=$ENCODED_LENGTH" }
+        return out
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is PerfDigest) return false
+        return schemaVersion == other.schemaVersion &&
+            flags == other.flags &&
+            sessionDurationSeconds == other.sessionDurationSeconds &&
+            avgFps == other.avgFps &&
+            p1LowFps == other.p1LowFps &&
+            avgFrametimeMs == other.avgFrametimeMs &&
+            p99FrametimeMs == other.p99FrametimeMs &&
+            medianFrametimeMs == other.medianFrametimeMs &&
+            avgCpuPct == other.avgCpuPct &&
+            avgGpuPct == other.avgGpuPct &&
+            peakSocTempC == other.peakSocTempC &&
+            avgSocTempC == other.avgSocTempC &&
+            batteryDropPct == other.batteryDropPct &&
+            avgBatteryCurrentMa == other.avgBatteryCurrentMa &&
+            thermalThrottleSeconds == other.thermalThrottleSeconds &&
+            gameIdHash.contentEquals(other.gameIdHash) &&
+            gpuModelHash.contentEquals(other.gpuModelHash) &&
+            socModelHash.contentEquals(other.socModelHash) &&
+            containerConfigHash.contentEquals(other.containerConfigHash) &&
+            androidIdShortHash.contentEquals(other.androidIdShortHash)
+    }
+
+    override fun hashCode(): Int {
+        var result = schemaVersion.toInt()
+        result = 31 * result + flags
+        result = 31 * result + sessionDurationSeconds.hashCode()
+        result = 31 * result + avgFps.hashCode()
+        result = 31 * result + p1LowFps.hashCode()
+        result = 31 * result + avgFrametimeMs.hashCode()
+        result = 31 * result + p99FrametimeMs.hashCode()
+        result = 31 * result + medianFrametimeMs.hashCode()
+        result = 31 * result + avgCpuPct
+        result = 31 * result + avgGpuPct
+        result = 31 * result + peakSocTempC.hashCode()
+        result = 31 * result + avgSocTempC.hashCode()
+        result = 31 * result + batteryDropPct
+        result = 31 * result + avgBatteryCurrentMa
+        result = 31 * result + thermalThrottleSeconds
+        result = 31 * result + gameIdHash.contentHashCode()
+        result = 31 * result + gpuModelHash.contentHashCode()
+        result = 31 * result + socModelHash.contentHashCode()
+        result = 31 * result + containerConfigHash.contentHashCode()
+        result = 31 * result + androidIdShortHash.contentHashCode()
+        return result
+    }
+
+    companion object {
+        const val SCHEMA_VERSION: Byte = 1
+        const val BYTE_LENGTH: Int = 48
+        const val ENCODED_LENGTH: Int = 64
+        const val HASH_SIZE: Int = 4
+
+        const val FLAG_THERMAL_THROTTLED: Int = 0x01
+        const val FLAG_DXVK_ENABLED: Int = 0x02
+        const val FLAG_FSR_ENABLED: Int = 0x04
+        const val FLAG_VKD3D_ENABLED: Int = 0x08
+        const val FLAG_ESYNC_ENABLED: Int = 0x10
+        const val FLAG_GYRO_ENABLED: Int = 0x20
+
+        /**
+         * When set, our in-app leaderboard renders other players' rows as "Anonymous"
+         * instead of the PGS gamertag. Note: this is display-only anonymity inside
+         * this app. The native Google Play Games UI and the raw PGS REST API still
+         * show the underlying player. Real cryptographic anonymity belongs to Tier 1.
+         */
+        const val FLAG_ANONYMOUS: Int = 0x40
+
+        private const val BASE64_FLAGS: Int = Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP
+        private val URL_SAFE_64 = Regex("^[A-Za-z0-9_-]{${ENCODED_LENGTH}}$")
+
+        /**
+         * Returns null if the tag has the wrong length, fails to decode, or carries an
+         * unsupported schema version. Forward-compat: a future v2 digest will be decoded
+         * by [decodeV2], leaving this v1 path stable.
+         */
+        fun decode(scoreTag: String?): PerfDigest? {
+            if (scoreTag.isNullOrEmpty() || scoreTag.length != ENCODED_LENGTH) return null
+            if (!URL_SAFE_64.matches(scoreTag)) return null
+            val bytes = runCatching { Base64.decode(scoreTag, BASE64_FLAGS) }.getOrNull() ?: return null
+            if (bytes.size != BYTE_LENGTH) return null
+            if (bytes[0] != SCHEMA_VERSION) return null
+            val buf = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN)
+            val version = buf.get()
+            val flags = buf.get().toInt() and 0xFF
+            val duration = buf.int.toLong() and 0xFFFFFFFFL
+            val avgFps = decodeU16(buf.short) / 10f
+            val p1Low = decodeU16(buf.short) / 10f
+            val avgFt = decodeU16(buf.short) / 100f
+            val p99Ft = decodeU16(buf.short) / 100f
+            val medFt = decodeU16(buf.short) / 100f
+            val avgCpu = (decodeU8(buf.get()) / 2)
+            val avgGpu = (decodeU8(buf.get()) / 2)
+            val peakTemp = decodeU16(buf.short) / 10f
+            val avgTemp = decodeU16(buf.short) / 10f
+            val battDrop = decodeU8(buf.get())
+            val battCurrent = decodeU16(buf.short)
+            val throttle = decodeU16(buf.short)
+            val gameHash = ByteArray(HASH_SIZE).also { buf.get(it) }
+            val gpuHash = ByteArray(HASH_SIZE).also { buf.get(it) }
+            val socHash = ByteArray(HASH_SIZE).also { buf.get(it) }
+            val configHash = ByteArray(HASH_SIZE).also { buf.get(it) }
+            val deviceHash = ByteArray(HASH_SIZE).also { buf.get(it) }
+            // Skip reserved byte (read but unused).
+            buf.get()
+            return PerfDigest(
+                schemaVersion = version,
+                flags = flags,
+                sessionDurationSeconds = duration,
+                avgFps = avgFps,
+                p1LowFps = p1Low,
+                avgFrametimeMs = avgFt,
+                p99FrametimeMs = p99Ft,
+                medianFrametimeMs = medFt,
+                avgCpuPct = avgCpu,
+                avgGpuPct = avgGpu,
+                peakSocTempC = peakTemp,
+                avgSocTempC = avgTemp,
+                batteryDropPct = battDrop,
+                avgBatteryCurrentMa = battCurrent,
+                thermalThrottleSeconds = throttle,
+                gameIdHash = gameHash,
+                gpuModelHash = gpuHash,
+                socModelHash = socHash,
+                containerConfigHash = configHash,
+                androidIdShortHash = deviceHash,
+            )
+        }
+
+        /**
+         * Computes a 4-byte SHA-256 prefix used as a short content-addressed identifier
+         * for game ids, GPU/SoC model strings, container configs, and device ids.
+         */
+        fun shortHash(input: String): ByteArray {
+            val full = MessageDigest.getInstance("SHA-256").digest(input.toByteArray(Charsets.UTF_8))
+            return full.copyOf(HASH_SIZE)
+        }
+
+        /**
+         * Encodes the game source + game id into the canonical 4-byte hash used by the
+         * client-side leaderboard filter. Format: "STEAM:1091500", "EPIC:Fortnite",
+         * "GOG:1207658886", "CUSTOM:<exePath>".
+         */
+        fun gameIdHashOf(gameSource: String, gameId: String): ByteArray =
+            shortHash("$gameSource:$gameId")
+
+        private fun encodeU16(value: Float): Short {
+            if (value.isNaN()) return 0
+            val rounded = Math.round(value.coerceIn(0f, 65535f))
+            return (rounded and 0xFFFF).toShort()
+        }
+
+        private fun encodeU8(value: Float): Byte {
+            if (value.isNaN()) return 0
+            val rounded = Math.round(value.coerceIn(0f, 255f))
+            return (rounded and 0xFF).toByte()
+        }
+
+        private fun decodeU16(value: Short): Int = value.toInt() and 0xFFFF
+
+        private fun decodeU8(value: Byte): Int = value.toInt() and 0xFF
+    }
+}
diff --git a/app/src/main/feature/leaderboard/SessionRecordingController.kt b/app/src/main/feature/leaderboard/SessionRecordingController.kt
new file mode 100644
index 000000000..29e1b0fe0
--- /dev/null
+++ b/app/src/main/feature/leaderboard/SessionRecordingController.kt
@@ -0,0 +1,197 @@
+package com.winlator.cmod.feature.leaderboard
+
+import android.app.Activity
+import android.content.Context
+import android.opengl.GLES20
+import android.os.Build
+import android.provider.Settings
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.ui.FrameRating
+import com.winlator.cmod.runtime.system.PerformanceRecorder
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Activity-scoped owner of the per-session perf-stats collector and leaderboard submit.
+ *
+ * Lifecycle:
+ *  1. [start] when the game session is ready (after window/container setup).
+ *  2. [attachToFrameRating] each time a [FrameRating] view is constructed (HUD can be
+ *     toggled on/off mid-session — re-attaching is idempotent).
+ *  3. [stop] in the session-cleanup path. Submits to PGS if the user opted in.
+ *
+ * Single instance per Activity. Re-calling [start] after [stop] is treated as a new
+ * session and resets state.
+ */
+class SessionRecordingController(
+    activity: Activity,
+) : FrameRating.FrameObserver {
+
+    // Application context is what we actually need for long-lived work.
+    private val appContext: Context = activity.applicationContext
+
+    private val active = AtomicBoolean(false)
+    @Volatile private var collector: SessionStatsCollector? = null
+    @Volatile private var recorder: PerformanceRecorder? = null
+
+    @JvmOverloads
+    fun start(
+        shortcut: Shortcut?,
+        container: Container?,
+        recordToFile: Boolean = false,
+    ) {
+        if (!active.compareAndSet(false, true)) return
+        val ctx = appContext
+        val gameSource = shortcut?.getExtra("game_source")?.takeIf { it.isNotBlank() } ?: "CUSTOM_GAME"
+        val gameId = resolveGameId(shortcut, gameSource)
+        val configFingerprint = buildContainerFingerprint(container, shortcut)
+        val gpuRenderer = runCatching { GLES20.glGetString(GLES20.GL_RENDERER) }.getOrNull() ?: "unknown"
+        val socModel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) Build.SOC_MODEL else Build.HARDWARE
+        val androidId = runCatching {
+            Settings.Secure.getString(ctx.contentResolver, Settings.Secure.ANDROID_ID)
+        }.getOrNull() ?: ""
+        val flagsAtStart = buildStartFlags(container, shortcut)
+        val c = SessionStatsCollector(
+            context = ctx,
+            gameSource = gameSource,
+            gameId = gameId,
+            containerConfigFingerprint = configFingerprint,
+            gpuRendererString = gpuRenderer,
+            socModelString = socModel,
+            androidId = androidId,
+            flagsAtStart = flagsAtStart,
+        )
+        c.start()
+        collector = c
+
+        if (recordToFile) {
+            val gameName = shortcut?.name ?: shortcut?.path ?: "Untitled"
+            val appVersion = runCatching {
+                ctx.packageManager.getPackageInfo(ctx.packageName, 0).versionName ?: ""
+            }.getOrDefault("")
+            val effective = buildEffectiveSettings(container, shortcut)
+            val metadata = PerformanceRecorder.SessionMetadata(
+                gameName = gameName,
+                gameSource = gameSource,
+                gameId = gameId,
+                exePath = shortcut?.path,
+                androidId = androidId,
+                gpuRenderer = gpuRenderer,
+                containerFingerprint = configFingerprint,
+                effectiveSettings = effective,
+                appVersion = appVersion,
+            )
+            val r = PerformanceRecorder(ctx, metadata)
+            if (r.start()) recorder = r
+        }
+    }
+
+    private fun buildEffectiveSettings(container: Container?, shortcut: Shortcut?): Map<String, String> {
+        if (container == null) return emptyMap()
+        return linkedMapOf(
+            "screenSize" to container.screenSize.orEmpty(),
+            "graphicsDriver" to container.graphicsDriver.orEmpty(),
+            "graphicsDriverConfig" to container.graphicsDriverConfig.orEmpty(),
+            "dxwrapper" to container.getExtra("dxwrapper"),
+            "dxwrapperConfig" to container.getExtra("dxwrapperConfig"),
+            "audioDriver" to container.audioDriver.orEmpty(),
+            "wincomponents" to container.getExtra("wincomponents"),
+            "emulator" to container.emulator.orEmpty(),
+            "emulator64" to container.emulator64.orEmpty(),
+            "box64Preset" to container.box64Preset.orEmpty(),
+            "fexcorePreset" to container.getExtra("fexcorePreset"),
+            "inputType" to container.inputType.toString(),
+            "envVars" to container.envVars.orEmpty(),
+        )
+    }
+
+    /**
+     * Attach to a FrameRating instance — safe to call multiple times. Each call replaces
+     * the observer slot in FrameRating; the previous observer is silently superseded.
+     */
+    fun attachToFrameRating(frameRating: FrameRating) {
+        if (!active.get()) return
+        frameRating.setFrameObserver(this)
+    }
+
+    /** True while a recording session is running (record-to-file on). */
+    fun isActive(): Boolean = active.get()
+
+    override fun onFramePresent(nanoTime: Long) {
+        collector?.onFramePresent(nanoTime)
+        recorder?.recordFramePresent(nanoTime)
+    }
+
+    /**
+     * Stop sampling. Idempotent.
+     *
+     * Note: this controller does not submit to PGS. The collector and recorder still
+     * run because the local CSV recording feature ("Record performance to file")
+     * remains independent.
+     */
+    fun stop() {
+        if (!active.compareAndSet(true, false)) return
+        recorder?.stop()
+        recorder = null
+        val c = collector ?: return
+        c.stop()
+        collector = null
+    }
+
+    private fun resolveGameId(shortcut: Shortcut?, gameSource: String): String {
+        if (shortcut == null) return ""
+        val storeId = when (gameSource) {
+            "STEAM", "EPIC" -> shortcut.getExtra("app_id")?.takeIf { it.isNotBlank() }
+            "GOG" -> shortcut.getExtra("gog_id")?.takeIf { it.isNotBlank() }
+                ?: shortcut.getExtra("app_id")?.takeIf { it.isNotBlank() }
+            else -> shortcut.path?.takeIf { it.isNotBlank() }
+        }
+        return storeId ?: shortcut.name ?: ""
+    }
+
+    /**
+     * Build a stable, content-addressed fingerprint of the runtime config so that two
+     * sessions on the same machine with identical settings produce the same hash. The
+     * caller hashes this string into a 4-byte prefix via [PerfDigest.shortHash].
+     */
+    private fun buildContainerFingerprint(container: Container?, shortcut: Shortcut?): String {
+        if (container == null) return shortcut?.path ?: ""
+        // Uses only public getters / getExtra(key) — fields without dedicated accessors
+        // come through the extras map. The exact set of keys is locked once shipped:
+        // changing it would mean two installs with identical settings produce different
+        // hashes, breaking leaderboard config-grouping. Append, never remove or rename.
+        val parts = mutableListOf<String>()
+        parts += "screen=${container.screenSize.orEmpty()}"
+        parts += "gfx=${container.graphicsDriver.orEmpty()}"
+        parts += "gfxcfg=${container.graphicsDriverConfig.orEmpty()}"
+        parts += "dx=${container.getExtra("dxwrapper")}"
+        parts += "dxcfg=${container.getExtra("dxwrapperConfig")}"
+        parts += "audio=${container.audioDriver.orEmpty()}"
+        parts += "wcomp=${container.getExtra("wincomponents")}"
+        parts += "emu=${container.emulator.orEmpty()}"
+        parts += "emu64=${container.emulator64.orEmpty()}"
+        parts += "box64=${container.box64Preset.orEmpty()}"
+        parts += "fex=${container.getExtra("fexcorePreset")}"
+        parts += "input=${container.inputType}"
+        return parts.joinToString("|")
+    }
+
+    private fun buildStartFlags(container: Container?, shortcut: Shortcut?): Int {
+        var flags = 0
+        val dxwrapper = container?.getExtra("dxwrapper")?.lowercase().orEmpty()
+        if (dxwrapper.contains("dxvk")) flags = flags or PerfDigest.FLAG_DXVK_ENABLED
+        if (dxwrapper.contains("vkd3d")) flags = flags or PerfDigest.FLAG_VKD3D_ENABLED
+        val gfxConfig = container?.graphicsDriverConfig?.lowercase().orEmpty()
+        if (gfxConfig.contains("fsr")) flags = flags or PerfDigest.FLAG_FSR_ENABLED
+        val env = container?.envVars?.lowercase().orEmpty()
+        if (env.contains("wineesync=1") || env.contains("wineesync_winlator=1")) {
+            flags = flags or PerfDigest.FLAG_ESYNC_ENABLED
+        }
+        return flags
+    }
+
+    companion object {
+        private const val TAG = "PerfController"
+    }
+}
diff --git a/app/src/main/feature/leaderboard/SessionStatsCollector.kt b/app/src/main/feature/leaderboard/SessionStatsCollector.kt
new file mode 100644
index 000000000..6ab6eac6a
--- /dev/null
+++ b/app/src/main/feature/leaderboard/SessionStatsCollector.kt
@@ -0,0 +1,343 @@
+package com.winlator.cmod.feature.leaderboard
+
+import android.content.Context
+import android.os.BatteryManager
+import android.os.Build
+import android.os.PowerManager
+import android.os.SystemClock
+import androidx.annotation.RequiresApi
+import timber.log.Timber
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicLong
+import java.util.concurrent.atomic.LongAdder
+
+/**
+ * Per-session accumulator that records the metrics needed to produce a [PerfDigest] at
+ * the end of a game session. Runs a single 1 Hz sampler on its own thread; the rest of
+ * the work happens lock-free (LongAdder for frame counts, synchronized list for the
+ * frametime stream).
+ *
+ * Lifecycle: [start] when the game session begins, [recordFrame] from the X server
+ * render thread on every present, [stop] when the session ends. After [stop] the
+ * accumulator can be queried via [finalizeDigest].
+ *
+ * This collector deliberately does its own sysfs / system-service polling instead of
+ * piggy-backing on the perf HUD. That way recording works even when the HUD is hidden
+ * (the user might want a clean screen but still want their session logged). Cost: an
+ * extra few sysfs reads per second, which is negligible.
+ */
+class SessionStatsCollector(
+    private val context: Context,
+    private val gameSource: String,
+    private val gameId: String,
+    private val containerConfigFingerprint: String,
+    private val gpuRendererString: String,
+    private val socModelString: String,
+    private val androidId: String,
+    private val flagsAtStart: Int,
+) {
+    private val started = AtomicBoolean(false)
+    private val stopped = AtomicBoolean(false)
+    private val frameCounter = LongAdder()
+    // Primitive ring buffer of frametimes for p50/p99 — bounded so 4-hour sessions
+    // don't allocate megabytes of boxed Longs. When the session is longer than the
+    // buffer (capacity / typical_fps seconds), we keep the most-recent window. That's
+    // a reasonable trade for Tier 0; Tier 1 will use a server-side stat with the full
+    // CSV.
+    private val frametimesBuffer = LongArray(FRAMETIMES_CAPACITY)
+    private val frametimesWriteIndex = java.util.concurrent.atomic.AtomicLong(0)
+
+    @Volatile private var sessionStartElapsedRealtimeMs: Long = 0
+    @Volatile private var sessionStopElapsedRealtimeMs: Long = 0
+
+    private val batteryPctAtStart = AtomicLong(-1)
+    private val batteryPctLatest = AtomicLong(-1)
+    private val batteryCurrentSumUa = AtomicLong(0)
+    private val batterySampleCount = AtomicLong(0)
+
+    private val cpuPctRunningSum = AtomicLong(0)
+    private val cpuPctSampleCount = AtomicLong(0)
+    private val gpuPctRunningSum = AtomicLong(0)
+    private val gpuPctSampleCount = AtomicLong(0)
+
+    private val socTempCx10Running = AtomicLong(0)
+    private val socTempSamples = AtomicLong(0)
+    private val socTempPeakCx10 = AtomicLong(0)
+
+    private val thermalThrottleTicks = AtomicLong(0)
+    private val flags = AtomicLong(flagsAtStart.toLong())
+
+    private var sampler: ScheduledExecutorService? = null
+    private val sampleSource: SampleSource = SampleSource(context)
+    private var lastCpuTimeNs: Long = 0
+    private var lastWallNs: Long = 0
+
+    /** Begin sampling. Idempotent. */
+    fun start() {
+        if (!started.compareAndSet(false, true)) return
+        sessionStartElapsedRealtimeMs = SystemClock.elapsedRealtime()
+        batteryPctAtStart.set(sampleSource.readBatteryPct().toLong())
+        batteryPctLatest.set(batteryPctAtStart.get())
+        lastCpuTimeNs = sampleSource.readSelfCpuTimeNs()
+        lastWallNs = System.nanoTime()
+        val exec = Executors.newSingleThreadScheduledExecutor { runnable ->
+            Thread(runnable, "PerfSessionStats").apply {
+                priority = Thread.MIN_PRIORITY + 1
+                isDaemon = true
+            }
+        }
+        sampler = exec
+        exec.scheduleAtFixedRate({ tick() }, SAMPLE_INTERVAL_MS, SAMPLE_INTERVAL_MS, TimeUnit.MILLISECONDS)
+    }
+
+    /**
+     * Called from the X server render thread on every present. Must be cheap — just two
+     * atomic ops and an arraylist add under a tiny synchronized block.
+     */
+    fun recordFrame(frametimeNs: Long) {
+        if (!started.get() || stopped.get()) return
+        frameCounter.increment()
+        if (frametimeNs > 0L && frametimeNs < MAX_PLAUSIBLE_FRAMETIME_NS) {
+            val pos = frametimesWriteIndex.getAndIncrement()
+            frametimesBuffer[(pos and FRAMETIMES_MASK).toInt()] = frametimeNs
+        }
+    }
+
+    /**
+     * Convenience wrapper used by [FrameRating.FrameObserver]: compute the frametime
+     * delta from the last present and forward to [recordFrame]. Internally tracks the
+     * previous nanoTime; first call seeds the baseline and emits no frametime.
+     */
+    fun onFramePresent(nanoTime: Long) {
+        if (!started.get() || stopped.get()) return
+        val prev = lastFrameNanoForObserver
+        lastFrameNanoForObserver = nanoTime
+        if (prev == 0L) {
+            frameCounter.increment()
+        } else {
+            recordFrame(nanoTime - prev)
+        }
+    }
+
+    @Volatile private var lastFrameNanoForObserver: Long = 0
+
+    fun raiseFlag(bit: Int) {
+        flags.updateAndGet { it or bit.toLong() }
+    }
+
+    /** Stops sampling and freezes final state. Idempotent. */
+    fun stop() {
+        if (!stopped.compareAndSet(false, true)) return
+        sessionStopElapsedRealtimeMs = SystemClock.elapsedRealtime()
+        batteryPctLatest.set(sampleSource.readBatteryPct().toLong())
+        sampler?.shutdown()
+        try {
+            sampler?.awaitTermination(SHUTDOWN_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+        } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
+        }
+        sampler = null
+    }
+
+    /** Builds the final [PerfDigest]. Safe to call after [stop]. */
+    fun finalizeDigest(): PerfDigest {
+        val durationMs = sessionStopElapsedRealtimeMs - sessionStartElapsedRealtimeMs
+        val durationSeconds = (durationMs / 1000L).coerceAtLeast(1L)
+        val frames = frameCounter.sum()
+        val avgFps = if (durationSeconds > 0) frames.toFloat() / durationSeconds.toFloat() else 0f
+
+        val totalWritten = frametimesWriteIndex.get()
+        val (medianFt, p99Ft) = if (totalWritten <= 0) {
+            0f to 0f
+        } else {
+            val n = minOf(totalWritten, FRAMETIMES_CAPACITY.toLong()).toInt()
+            val snapshot = LongArray(n)
+            System.arraycopy(frametimesBuffer, 0, snapshot, 0, n)
+            snapshot.sort()
+            val medianNs = snapshot[n / 2]
+            val p99Ns = snapshot[((n - 1) * 99) / 100]
+            (medianNs / 1_000_000f) to (p99Ns / 1_000_000f)
+        }
+        val p1Low = if (p99Ft > 0f) 1000f / p99Ft else 0f
+        val avgFt = if (avgFps > 0f) 1000f / avgFps else 0f
+
+        val avgCpu = avgFromAtomic(cpuPctRunningSum, cpuPctSampleCount)
+        val avgGpu = avgFromAtomic(gpuPctRunningSum, gpuPctSampleCount)
+        val avgTemp = if (socTempSamples.get() > 0) socTempCx10Running.get().toFloat() / socTempSamples.get() / 10f else 0f
+        val peakTemp = socTempPeakCx10.get().toFloat() / 10f
+        val avgBatteryCurrent = if (batterySampleCount.get() > 0) (batteryCurrentSumUa.get() / batterySampleCount.get()).toInt() else 0
+        val avgBatteryCurrentMa = (avgBatteryCurrent / 1000).coerceIn(0, 65535)
+        val battStart = batteryPctAtStart.get()
+        val battEnd = batteryPctLatest.get()
+        val battDrop = if (battStart > 0 && battEnd in 0..battStart) (battStart - battEnd).toInt() else 0
+
+        val finalFlags = flags.get().toInt() or
+            if (thermalThrottleTicks.get() > 0) PerfDigest.FLAG_THERMAL_THROTTLED else 0
+
+        return PerfDigest(
+            schemaVersion = PerfDigest.SCHEMA_VERSION,
+            flags = finalFlags,
+            sessionDurationSeconds = durationSeconds,
+            avgFps = avgFps,
+            p1LowFps = p1Low,
+            avgFrametimeMs = avgFt,
+            p99FrametimeMs = p99Ft,
+            medianFrametimeMs = medianFt,
+            avgCpuPct = avgCpu.toInt().coerceIn(0, 100),
+            avgGpuPct = avgGpu.toInt().coerceIn(0, 100),
+            peakSocTempC = peakTemp,
+            avgSocTempC = avgTemp,
+            batteryDropPct = battDrop.coerceIn(0, 255),
+            avgBatteryCurrentMa = avgBatteryCurrentMa,
+            thermalThrottleSeconds = thermalThrottleTicks.get().toInt().coerceIn(0, 65535),
+            gameIdHash = PerfDigest.gameIdHashOf(gameSource, gameId),
+            gpuModelHash = HardwareDictionary.gpuHashOf(gpuRendererString),
+            socModelHash = HardwareDictionary.socHashOf(socModelString),
+            containerConfigHash = PerfDigest.shortHash(containerConfigFingerprint),
+            androidIdShortHash = PerfDigest.shortHash(androidId),
+        )
+    }
+
+    /** Per-second sampler. Runs on PerfSessionStats thread. */
+    private fun tick() {
+        try {
+            val nowCpu = sampleSource.readSelfCpuTimeNs()
+            val nowWall = System.nanoTime()
+            val cpuDelta = nowCpu - lastCpuTimeNs
+            val wallDelta = nowWall - lastWallNs
+            lastCpuTimeNs = nowCpu
+            lastWallNs = nowWall
+            if (wallDelta > 0L) {
+                val cpuPct = (cpuDelta.toDouble() / wallDelta.toDouble() * 100.0).coerceIn(0.0, 100.0)
+                cpuPctRunningSum.addAndGet((cpuPct * 100).toLong())
+                cpuPctSampleCount.incrementAndGet()
+            }
+
+            val gpuPct = sampleSource.readGpuLoadPct()
+            if (gpuPct >= 0f) {
+                gpuPctRunningSum.addAndGet((gpuPct * 100).toLong())
+                gpuPctSampleCount.incrementAndGet()
+            }
+
+            val socTempC = sampleSource.readSocTempC()
+            if (socTempC > 0f) {
+                val x10 = (socTempC * 10f).toLong()
+                socTempCx10Running.addAndGet(x10)
+                socTempSamples.incrementAndGet()
+                while (true) {
+                    val prev = socTempPeakCx10.get()
+                    if (x10 <= prev || socTempPeakCx10.compareAndSet(prev, x10)) break
+                }
+            }
+
+            val battCurrentUa = sampleSource.readBatteryCurrentUa()
+            if (battCurrentUa != Long.MIN_VALUE) {
+                batteryCurrentSumUa.addAndGet(kotlin.math.abs(battCurrentUa))
+                batterySampleCount.incrementAndGet()
+            }
+            batteryPctLatest.set(sampleSource.readBatteryPct().toLong())
+
+            if (sampleSource.isThrottling()) thermalThrottleTicks.incrementAndGet()
+        } catch (t: Throwable) {
+            Timber.tag(TAG).w(t, "Stats tick failed")
+        }
+    }
+
+    private fun avgFromAtomic(sumX100: AtomicLong, count: AtomicLong): Float {
+        val c = count.get()
+        return if (c == 0L) 0f else sumX100.get().toFloat() / c / 100f
+    }
+
+    companion object {
+        private const val TAG = "PerfSessionStats"
+        private const val SAMPLE_INTERVAL_MS: Long = 1_000L
+        private const val SHUTDOWN_TIMEOUT_MS: Long = 1_000L
+        // Power of 2 — required for ring buffer mask math.
+        // 65,536 entries × 8 bytes/long = 512 KB. At 60 FPS that's ~18 minutes of
+        // history, beyond which the oldest entries are overwritten. Long enough for
+        // representative p50/p99 quantiles on any realistic session.
+        private const val FRAMETIMES_CAPACITY: Int = 65_536
+        private const val FRAMETIMES_MASK: Long = (FRAMETIMES_CAPACITY - 1).toLong()
+        private const val MAX_PLAUSIBLE_FRAMETIME_NS: Long = 1_000_000_000L // 1 second
+    }
+
+    /**
+     * Polls the system for raw metric values. Centralized here so sysfs + Android API
+     * access lives in one place — easier to add fallbacks or mock for testing later.
+     */
+    private class SampleSource(private val context: Context) {
+        private val batteryManager: BatteryManager? =
+            context.getSystemService(Context.BATTERY_SERVICE) as? BatteryManager
+        private val powerManager: PowerManager? =
+            context.getSystemService(Context.POWER_SERVICE) as? PowerManager
+
+        fun readSelfCpuTimeNs(): Long = android.os.Debug.threadCpuTimeNanos()
+
+        /**
+         * Returns GPU busy percentage from the Adreno KGSL sysfs node, or -1 if unreadable
+         * (SELinux denial on some OEMs, Mali GPU, etc.). Caller decides whether to log it.
+         */
+        fun readGpuLoadPct(): Float {
+            return runCatching {
+                java.io.File("/sys/class/kgsl/kgsl-3d0/gpu_busy_percentage").takeIf { it.canRead() }
+                    ?.readText()
+                    ?.trim()
+                    ?.removeSuffix("%")
+                    ?.toFloatOrNull()
+                    ?: -1f
+            }.getOrDefault(-1f)
+        }
+
+        /**
+         * Reads the highest active CPU/SoC thermal zone temperature in Celsius from sysfs.
+         * Returns 0 if no zone is readable. This is best-effort — sysfs thermal access is
+         * OEM-dependent and may be restricted on hardened devices.
+         */
+        fun readSocTempC(): Float {
+            return runCatching {
+                val zonesDir = java.io.File("/sys/class/thermal").takeIf { it.isDirectory } ?: return@runCatching 0f
+                var maxTemp = 0f
+                zonesDir.listFiles { f -> f.name.startsWith("thermal_zone") }?.forEach { zone ->
+                    val typeFile = java.io.File(zone, "type")
+                    val tempFile = java.io.File(zone, "temp")
+                    if (typeFile.canRead() && tempFile.canRead()) {
+                        val type = runCatching { typeFile.readText().trim().lowercase() }.getOrNull() ?: return@forEach
+                        if (type.contains("cpu") || type.contains("soc") || type.contains("tsens")) {
+                            val rawMilli = tempFile.readText().trim().toFloatOrNull() ?: return@forEach
+                            val celsius = rawMilli / 1000f
+                            if (celsius in 1f..150f && celsius > maxTemp) maxTemp = celsius
+                        }
+                    }
+                }
+                maxTemp
+            }.getOrDefault(0f)
+        }
+
+        fun readBatteryPct(): Int =
+            batteryManager?.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) ?: -1
+
+        /** Microamps (negative = discharging). [Long.MIN_VALUE] means unavailable. */
+        fun readBatteryCurrentUa(): Long {
+            val bm = batteryManager ?: return Long.MIN_VALUE
+            return runCatching {
+                bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)
+            }.getOrDefault(Long.MIN_VALUE)
+        }
+
+        @RequiresApi(Build.VERSION_CODES.Q)
+        private fun thermalStatus(): Int = powerManager?.currentThermalStatus ?: 0
+
+        /**
+         * True when the platform reports any thermal mitigation in effect. API 29+ uses
+         * the official thermal status API; older devices return false (we don't pretend
+         * to detect throttling without it).
+         */
+        fun isThrottling(): Boolean {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return false
+            return thermalStatus() >= PowerManager.THERMAL_STATUS_MODERATE
+        }
+    }
+}
diff --git a/app/src/main/feature/library/GameSettings.kt b/app/src/main/feature/library/GameSettings.kt
index 902188f7f..56b796376 100644
--- a/app/src/main/feature/library/GameSettings.kt
+++ b/app/src/main/feature/library/GameSettings.kt
@@ -1,7 +1,6 @@
 package com.winlator.cmod.feature.library
 import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -34,53 +33,91 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.automirrored.outlined.OpenInNew
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.Extension
+import androidx.compose.material.icons.outlined.AutoAwesome
 import androidx.compose.material.icons.outlined.Monitor
 import androidx.compose.material.icons.outlined.Science
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Storage
 import androidx.compose.material.icons.outlined.Tune
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.Home
+import androidx.compose.material.icons.outlined.Inventory
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
+import androidx.compose.material.icons.outlined.CloudOff
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.Upload
 import androidx.compose.material3.Checkbox
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.SliderState
+import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.PopupProperties
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
@@ -94,33 +131,152 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.draw.scale
 import com.winlator.cmod.R
+import com.winlator.cmod.runtime.reshade.ReshadeCatalog
+import com.winlator.cmod.runtime.reshade.ReshadeCatalogEntry
+import com.winlator.cmod.runtime.reshade.ReshadeDownloader
+import com.winlator.cmod.runtime.reshade.ReshadeLoadout
+import com.winlator.cmod.runtime.reshade.ReshadeManager
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+import com.winlator.cmod.runtime.wine.WineThemeManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import androidx.compose.foundation.focusable
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.input.key.type
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.controllerSliderEscape
+import com.winlator.cmod.shared.ui.focus.controllerTextFieldEscape
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.paneHighlight
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 import com.winlator.cmod.shared.ui.widget.EnvVarsView
 import com.winlator.cmod.shared.ui.widget.chasingBorder
 import kotlin.math.roundToInt
 
-// ---------------------------------------------------------------------------
-// Black / gray color scheme
-// ---------------------------------------------------------------------------
-private val BgDeep = Color(0xFF18181D)
-private val SidebarBg = Color(0xFF18181D)
-private val ContentBg = Color(0xFF18181D)
-private val CardSurface = Color(0xFF1C1C2A)
-private val CardBorder = Color(0xFF2A2A3A)
-private val InputSurface = Color(0xFF171722)
-private val InputBorder = Color(0xFF2A2A3A)
-private val AccentBlue = Color(0xFF1A9FFF)
-private val TextPrimary = Color(0xFFF0F4FF)
-private val TextSecondary = Color(0xFF7A8FA8)
-private val TextDim = Color(0xFF6E7681)
-private val DividerColor = Color(0xFF2A2A3A)
-private val CheckBorder = Color(0xFF2A2A3A)
-private val TrackInactive = Color(0xFF1C1C2A)
-private val ChipSurface = Color(0xFF171722)
-private val ChipBorder = Color(0xFF2A2A3A)
-private val DangerRed = Color(0xFFFF6B6B)
-private val WarningAmber = Color(0xFFFFB74D)
+private val BgDeep = GameSettingsStyle.BgDeep
+private val SidebarBg = GameSettingsStyle.SidebarBg
+private val ContentBg = GameSettingsStyle.ContentBg
+private val CardSurface = GameSettingsStyle.CardSurface
+private val CardBorder = GameSettingsStyle.CardBorder
+private val InputSurface = GameSettingsStyle.InputSurface
+private val InputBorder = GameSettingsStyle.InputBorder
+private val AccentBlue = GameSettingsStyle.AccentBlue
+private val TextPrimary = GameSettingsStyle.TextPrimary
+private val TextSecondary = GameSettingsStyle.TextSecondary
+private val TextDim = GameSettingsStyle.TextDim
+private val DividerColor = GameSettingsStyle.Divider
+private val CheckBorder = GameSettingsStyle.CheckBorder
+private val SliderInactive = GameSettingsStyle.SliderInactive
+private val ChipSurface = GameSettingsStyle.ChipSurface
+private val ChipBorder = GameSettingsStyle.ChipBorder
+private val DangerRed = GameSettingsStyle.DangerRed
+private val WarningAmber = GameSettingsStyle.WarningAmber
 private val SelectableDriveLetters = ('D'..'Y').filter { it != 'E' }.map { "$it" }
+private val NavHighlight = GameSettingsStyle.NavHighlight
+
+@Stable
+class GameSettingsNav {
+    var active by mutableStateOf(false)
+    var inContent by mutableStateOf(false)
+    var sidebarIndex by mutableStateOf(0)
+    var sidebarCount by mutableStateOf(0)
+    var actionCol by mutableStateOf(0)
+    var contentSignal by mutableStateOf(0)
+        private set
+    var contentDir by mutableStateOf(0)
+        private set
+    var contentResetSignal by mutableStateOf(0)
+        private set
+    var onSelectSection: ((Int) -> Unit)? = null
+    var onSave: (() -> Unit)? = null
+    var onCancel: (() -> Unit)? = null
+    var onContentBack: (() -> Boolean)? = null
+
+    val onActionRow: Boolean get() = sidebarIndex >= sidebarCount
+
+    private fun pushContent(dir: Int) {
+        contentDir = dir
+        contentSignal++
+    }
+
+    fun dpad(dir: Int) {
+        if (!active) {
+            active = true
+            return
+        }
+        if (inContent) {
+            pushContent(dir)
+            return
+        }
+        when (dir) {
+            PANE_DIR_UP -> moveSidebar(-1)
+            PANE_DIR_DOWN -> moveSidebar(1)
+            PANE_DIR_LEFT -> if (onActionRow && actionCol == 1) actionCol = 0
+            PANE_DIR_RIGHT ->
+                if (onActionRow) {
+                    if (actionCol == 0) actionCol = 1
+                } else {
+                    enterContent()
+                }
+            PANE_DIR_ACTIVATE ->
+                if (onActionRow) {
+                    if (actionCol == 0) onCancel?.invoke() else onSave?.invoke()
+                } else {
+                    enterContent()
+                }
+        }
+    }
+
+    private fun moveSidebar(delta: Int) {
+        val next = (sidebarIndex + delta).coerceIn(0, sidebarCount)
+        sidebarIndex = next
+        if (next < sidebarCount) onSelectSection?.invoke(next)
+    }
+
+    fun enterContent() {
+        inContent = true
+        contentResetSignal++
+    }
+
+    fun exitToSidebar() {
+        inContent = false
+    }
+
+    fun tapSection(index: Int) {
+        active = false
+        inContent = false
+        sidebarIndex = index
+        onSelectSection?.invoke(index)
+    }
+
+    fun tapAction(col: Int) {
+        active = false
+        inContent = false
+        sidebarIndex = sidebarCount
+        actionCol = col
+    }
+
+    fun tapContent() {
+        active = false
+        inContent = true
+    }
+}
 
 private val SettingGroupCorner = 12.dp
 private val SettingGroupPadding = 12.dp
@@ -133,8 +289,24 @@ private val SettingSectionGap = 12.dp
 private val SettingTightGap = 4.dp
 private val SettingIconSize = 18.dp
 private val SettingControlIconSize = 16.dp
+private val SettingSliderHeight = 24.dp
+
+private fun graphicsCardExpandEnter() =
+    fadeIn(tween(200)) +
+        expandVertically(
+            animationSpec = tween(durationMillis = 280, easing = FastOutSlowInEasing)
+        )
+
+private fun graphicsCardExpandExit() =
+    fadeOut(tween(140)) +
+        shrinkVertically(
+            animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing)
+        )
+private val SettingSliderThumbSize = 18.dp
+private const val SettingSliderTrackScaleY = 0.5f
 private val SettingLabelSize = 11.sp
-private val SettingValueSize = 13.sp
+private val SettingLabelRowHeight = 22.dp
+private val SettingValueSize = 12.sp
 private val SettingSectionLabelSize = 12.sp
 private val SmartDropdownPressStartInset = 28.dp
 
@@ -150,26 +322,53 @@ private fun Modifier.smartDropdownAnchor(
 ): Modifier {
     if (!enabled) return this
     val density = LocalDensity.current
-    return pointerInput(enabled, density, onOpen) {
-        detectTapGestures { tapOffset ->
-            offset.value =
-                with(density) {
-                    val tapX = tapOffset.x.toDp()
-                    DpOffset(
-                        if (tapX > SmartDropdownPressStartInset) tapX - SmartDropdownPressStartInset else 0.dp,
-                        0.dp,
-                    )
-                }
-            onOpen()
+    val interactionSource = remember { MutableInteractionSource() }
+    return this
+        .onKeyEvent { e ->
+            if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN &&
+                (
+                    e.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_DPAD_CENTER ||
+                        e.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_ENTER ||
+                        e.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_NUMPAD_ENTER
+                )
+            ) {
+                offset.value = DpOffset.Zero
+                onOpen()
+                true
+            } else {
+                false
+            }
+        }.focusable(interactionSource = interactionSource)
+        .pointerInput(enabled, density, onOpen) {
+            detectTapGestures { tapOffset ->
+                offset.value =
+                    with(density) {
+                        val tapX = tapOffset.x.toDp()
+                        DpOffset(
+                            if (tapX > SmartDropdownPressStartInset) tapX - SmartDropdownPressStartInset else 0.dp,
+                            0.dp,
+                        )
+                    }
+                onOpen()
+            }
         }
-    }
+        .paneNavItem(
+            cornerRadius = SettingFieldCorner,
+            onActivate = { offset.value = DpOffset.Zero; onOpen() },
+            highlightColor = NavHighlight,
+            tapToSelect = true,
+        )
 }
 
-// ---------------------------------------------------------------------------
-// Data classes
-// ---------------------------------------------------------------------------
 data class WinComponentItem(val key: String, val label: String, val selectedIndex: Int)
 data class EnvVarItem(val key: String, val value: String)
+
+// Row-preserving parse: duplicate names stay as separate rows (EnvVars would collapse them into a map).
+fun parseEnvVarItems(envVarsStr: String?): List<EnvVarItem> =
+    envVarsStr.orEmpty().split(" ").mapNotNull { part ->
+        val index = part.indexOf('=')
+        if (index <= 0) null else EnvVarItem(part.substring(0, index), part.substring(index + 1))
+    }
 data class ExtraArgGroup(val header: String, val args: List<String>)
 data class DriveItem(
     val letter: String,
@@ -177,21 +376,16 @@ data class DriveItem(
     val canChangeLetter: Boolean = false,
 )
 
-// ---------------------------------------------------------------------------
-// State holder
-// ---------------------------------------------------------------------------
 class GameSettingsStateHolder {
     val currentSection = mutableIntStateOf(0)
 
-    // True when editing a Container directly; hides shortcut-only fields
-    // and exposes wine version / mouse warp / drives / desktop background.
+    // Container edits expose container-only fields and hide shortcut fields.
     val isContainerEditMode = mutableStateOf(false)
-    // Wine version dropdown is editable only when creating a new container.
     val wineVersionEditable = mutableStateOf(false)
 
-    // General
     val name = mutableStateOf("")
     val launchExePath = mutableStateOf("")
+    val launchExeDisplayPath = mutableStateOf("")
     val containerEntries = mutableStateOf<List<String>>(emptyList())
     val selectedContainer = mutableIntStateOf(0)
     val screenSizeEntries = mutableStateOf<List<String>>(emptyList())
@@ -200,12 +394,8 @@ class GameSettingsStateHolder {
     val customHeight = mutableStateOf("")
     val gameCardArtworkSelected = mutableStateOf(false)
     val gameCardArtworkSummary = mutableStateOf("")
-    val gridArtworkSelected = mutableStateOf(false)
-    val gridArtworkSummary = mutableStateOf("")
-    val carouselArtworkSelected = mutableStateOf(false)
-    val carouselArtworkSummary = mutableStateOf("")
-    val listArtworkSelected = mutableStateOf(false)
-    val listArtworkSummary = mutableStateOf("")
+    val iconArtworkSelected = mutableStateOf(false)
+    val iconArtworkSummary = mutableStateOf("")
     val refreshRateEntries = mutableStateOf<List<String>>(emptyList())
     val selectedRefreshRate = mutableIntStateOf(0)
     val fpsLimit = mutableIntStateOf(0)
@@ -213,17 +403,21 @@ class GameSettingsStateHolder {
     // Display
     val graphicsDriverEntries = mutableStateOf<List<String>>(emptyList())
     val selectedGraphicsDriver = mutableIntStateOf(0)
+    val isArm64EC = mutableStateOf(false)
+    val zinkModeEntries = mutableStateOf<List<String>>(emptyList())
+    val selectedZinkMode = mutableIntStateOf(0)
     val graphicsDriverVersion = mutableStateOf("")
     val dxWrapperEntries = mutableStateOf<List<String>>(emptyList())
     val selectedDxWrapper = mutableIntStateOf(0)
+    val surfaceEffectEntries = mutableStateOf<List<String>>(emptyList())
+    val selectedSurfaceEffect = mutableIntStateOf(0)
+    val sgsrEnabled = mutableStateOf(false)
+    val sgsrUpscaleMode = mutableIntStateOf(1)
+    val sgsrSharpness = mutableIntStateOf(100)
 
-    // Per-container "Direct Composition" toggle. When true and the device exposes
-    // SurfaceControl (API 29+, see SurfaceCompositor.isAvailable()), fullscreen
-    // direct-scanout drawables are routed to a sibling Android SurfaceControl
-    // layer (HWC/DPU overlay plane) instead of being composited by the in-process
-    // GLRenderer. The toggle is sampled at activity startup and held for the
-    // session — only takes effect on the next launch of the container.
-    val directComposition = mutableStateOf(false)
+    // scanned drop-in pool + ordered loadout; saved as a reshadeLoadout array plus nested reshadeParams object.
+    val reshadeEffects = mutableStateOf<List<ReshadeManager.ReshadeEffect>>(emptyList())
+    val reshadeLoadout = ReshadeLoadoutState()
 
     // Graphics Driver Configuration (inline card)
     val gfxConfigExpanded = mutableStateOf(false)
@@ -239,6 +433,8 @@ class GameSettingsStateHolder {
     val gfxSelectedMaxDeviceMemory = mutableIntStateOf(0)
     val gfxPresentModeEntries = mutableStateOf<List<String>>(emptyList())
     val gfxSelectedPresentMode = mutableIntStateOf(0)
+    val gfxCompositorPresentModeEntries = mutableStateOf<List<String>>(emptyList())
+    val gfxSelectedCompositorPresentMode = mutableIntStateOf(0)
     val gfxResourceTypeEntries = mutableStateOf<List<String>>(emptyList())
     val gfxSelectedResourceType = mutableIntStateOf(0)
     val gfxBcnEmulationEntries = mutableStateOf<List<String>>(emptyList())
@@ -247,6 +443,10 @@ class GameSettingsStateHolder {
     val gfxSelectedBcnEmulationType = mutableIntStateOf(0)
     val gfxBcnEmulationCacheEntries = mutableStateOf<List<String>>(emptyList())
     val gfxSelectedBcnEmulationCache = mutableIntStateOf(0)
+    val gfxTranscoderEntries = mutableStateOf<List<String>>(emptyList())
+    val gfxSelectedTranscoder = mutableIntStateOf(0)
+    val gfxQualityEntries = mutableStateOf<List<String>>(emptyList())
+    val gfxSelectedQuality = mutableIntStateOf(0)
     val gfxSyncFrame = mutableStateOf(false)
     val gfxDisablePresentWait = mutableStateOf(false)
 
@@ -284,9 +484,7 @@ class GameSettingsStateHolder {
     val midiSoundFontEntries = mutableStateOf<List<String>>(emptyList())
     val selectedMidiSoundFont = mutableIntStateOf(0)
 
-    // Wine — emulator32/64Entries are wine-arch-filtered views of emulatorEntries
-    // used by the 32/64-bit dropdowns; selectedEmulator indexes into
-    // emulator32Entries, selectedEmulator64 into emulator64Entries.
+    // Wine — emulator32/64Entries are arch-filtered views of emulatorEntries; selectedEmulator/selectedEmulator64 index into them.
     val emulatorEntries = mutableStateOf<List<String>>(emptyList())
     val emulator32Entries = mutableStateOf<List<String>>(emptyList())
     val emulator64Entries = mutableStateOf<List<String>>(emptyList())
@@ -309,21 +507,17 @@ class GameSettingsStateHolder {
     val desktopBackgroundColor = mutableStateOf("#0277bd")
     val desktopWallpaperSelected = mutableStateOf(false)
     val drivesList = mutableStateOf<List<DriveItem>>(emptyList())
-    // Exclusive Input is a global SharedPreferences flag ("xinput_toggle"),
-    // not per-container — tracked here so InputSection can reuse its layout.
     val containerExclusiveInput = mutableStateOf(false)
+    val shortcutExclusiveXInput = mutableStateOf(true)
 
     // Steam (visible only for Steam games)
     val isSteamGame = mutableStateOf(false)
-    val useColdClient = mutableStateOf(false)
+    val steamLauncher = mutableStateOf(true)
+    // Single toggle driving the ColdClient launcher + SteamStub DRM unpacking (persisted as "useColdClient" + "unpackFiles").
+    val useLegacyLauncher = mutableStateOf(false)
     val useSteamInput = mutableStateOf(false)
-    val forceDlc = mutableStateOf(false)
     val steamOfflineMode = mutableStateOf(false)
-    val unpackFiles = mutableStateOf(false)
     val runtimePatcher = mutableStateOf(false)
-    val launchRealSteam = mutableStateOf(false)
-    val steamTypeEntries = mutableStateOf<List<String>>(emptyList())
-    val selectedSteamType = mutableIntStateOf(0)
 
     // Components
     val winComponentEntries = mutableStateOf<List<String>>(emptyList())
@@ -333,13 +527,16 @@ class GameSettingsStateHolder {
     // Variables
     val envVars = mutableStateOf<List<EnvVarItem>>(emptyList())
 
-    // Input
     val controlsProfileEntries = mutableStateOf<List<String>>(emptyList())
     val selectedControlsProfile = mutableIntStateOf(0)
     val numControllersEntries = mutableStateOf<List<String>>(emptyList())
     val selectedNumControllers = mutableIntStateOf(0)
     val disableXInput = mutableStateOf(false)
     val simTouchScreen = mutableStateOf(false)
+    val screenTouchMode = mutableIntStateOf(0)
+    val gestureProfileEntries = mutableStateOf<List<String>>(emptyList())
+    val gestureProfileIds = mutableStateOf<List<Int>>(emptyList())
+    val selectedGestureProfile = mutableIntStateOf(0)
     val sdl2Compatibility = mutableStateOf(false)
     val enableXInput = mutableStateOf(false)
     val enableDInput = mutableStateOf(false)
@@ -359,12 +556,16 @@ class GameSettingsStateHolder {
     val selectedFexcoreVersion = mutableIntStateOf(0)
     val fexcorePresetEntries = mutableStateOf<List<String>>(emptyList())
     val selectedFexcorePreset = mutableIntStateOf(0)
+    val useUnixLibs = mutableStateOf(true)
 
     // Advanced - System
     val startupSelectionEntries = mutableStateOf<List<String>>(emptyList())
     val selectedStartupSelection = mutableIntStateOf(0)
     val execArgs = mutableStateOf("")
     val fullscreenStretched = mutableStateOf(false)
+    // Direct Composition (zero-copy AHB → SurfaceControl + HWC overlay).
+    // Per-container toggle; read once at activity startup. See Container.EXTRA_DIRECT_COMPOSITION.
+    val directComposition = mutableStateOf(false)
 
     // Advanced - CPU
     val cpuCount = mutableIntStateOf(Runtime.getRuntime().availableProcessors())
@@ -378,26 +579,20 @@ class GameSettingsStateHolder {
     // Advanced - Drives
     val drives = mutableStateOf("")
 
-    // Loading state
     val isLoaded = mutableStateOf(false)
 }
 
-// ---------------------------------------------------------------------------
-// Callbacks
-// ---------------------------------------------------------------------------
 interface GameSettingsCallbacks {
     fun onConfirm()
     fun onDismiss()
     fun onAddToHomeScreen()
+
+    fun onScrapeGameArtwork(gameName: String) {}
     fun onPickGameCardArtwork() {}
     fun onRemoveGameCardArtwork() {}
-    fun onPickGridArtwork() {}
-    fun onRemoveGridArtwork() {}
-    fun onPickCarouselArtwork() {}
-    fun onRemoveCarouselArtwork() {}
-    fun onPickListArtwork() {}
-    fun onRemoveListArtwork() {}
-    fun onOpenArtworkSource() {}
+    fun onPickIconArtwork() {}
+    fun onRemoveIconArtwork() {}
+    fun onOpenArtworkSource(gameName: String) {}
     fun onRemoveEnvVar(index: Int)
     fun onUpdateWinComponent(isDirectX: Boolean, index: Int, newValue: Int)
     fun onSelectExe() {}
@@ -412,11 +607,10 @@ interface GameSettingsCallbacks {
     fun onRemoveDrive(index: Int) {}
     fun onPickDrivePath(index: Int) {}
     fun onPickWallpaper() {}
+    fun onExportSaves() {}
+    fun onImportSaves() {}
 }
 
-// ---------------------------------------------------------------------------
-// Preset exec args
-// ---------------------------------------------------------------------------
 private val ExtraArgPresets = listOf(
     ExtraArgGroup(
         "Unity", listOf(
@@ -440,54 +634,74 @@ private val ExtraArgPresets = listOf(
         "General", listOf(
             "-windowed", "-fullscreen", "-nointro", "-skipvideos", "-novsync", "/d3d9"
         )
+    ),
+    // Steam-style launch options: KEY=VALUE before %command% become env vars; args after go to the game.
+    ExtraArgGroup(
+        "Steam (%command%)", listOf(
+            "%command%", "%command% -windowed", "DXVK_HUD=fps %command%", "WINEDEBUG=-all %command%"
+        )
     )
 )
 
-// ---------------------------------------------------------------------------
-// Sidebar section definitions
-// ---------------------------------------------------------------------------
 private data class SidebarSection(
     val icon: ImageVector,
     val labelResId: Int
 )
 
-// Section IDs (stable across dynamic lists)
 private const val SEC_GENERAL = 0
 private const val SEC_STEAM = 1
 private const val SEC_DISPLAY = 2
+private const val SEC_RESHADE = 3
 private const val SEC_WINE = 4
 private const val SEC_COMPONENTS = 5
 private const val SEC_VARIABLES = 6
 private const val SEC_INPUT = 7
 private const val SEC_ADVANCED = 8
+private const val SEC_DRIVES = 9
+private const val SEC_SAVES = 10
 
-private fun buildSections(isSteam: Boolean): List<Pair<Int, SidebarSection>> {
+private fun buildSections(isSteam: Boolean, isContainer: Boolean): List<Pair<Int, SidebarSection>> {
     val list = mutableListOf<Pair<Int, SidebarSection>>()
     list += SEC_GENERAL to SidebarSection(Icons.Outlined.Tune, R.string.settings_general_title)
     if (isSteam) list += SEC_STEAM to SidebarSection(Icons.Outlined.Science, R.string.steam_section_title)
     list += SEC_DISPLAY to SidebarSection(Icons.Outlined.Monitor, R.string.common_ui_graphics)
     list += SEC_ADVANCED to SidebarSection(Icons.Outlined.Settings, R.string.common_ui_advanced)
-    list += SEC_INPUT to SidebarSection(Icons.Outlined.SportsEsports, R.string.common_ui_input_controls)
+    list += SEC_RESHADE to SidebarSection(Icons.Outlined.AutoAwesome, R.string.reshade_section_title)
     list += SEC_VARIABLES to SidebarSection(Icons.Outlined.Code, R.string.container_config_variables)
-    list += SEC_WINE to SidebarSection(Icons.Outlined.Science, R.string.container_wine_title)
+    list += SEC_INPUT to SidebarSection(Icons.Outlined.SportsEsports, R.string.common_ui_input_controls)
     list += SEC_COMPONENTS to SidebarSection(Icons.Outlined.Extension, R.string.settings_content_components)
+    if (isContainer) {
+        list += SEC_DRIVES to SidebarSection(Icons.Outlined.Storage, R.string.container_config_drives)
+    }
+    list += SEC_WINE to SidebarSection(Icons.Outlined.Science, R.string.container_wine_title)
+    if (isContainer) {
+        list += SEC_SAVES to SidebarSection(Icons.Outlined.Inventory, R.string.saves_import_export_title)
+    }
     return list
 }
 
-// ===================================================================
-// Main Content Composable
-// ===================================================================
 @Composable
 fun GameSettingsContent(
     state: GameSettingsStateHolder,
-    callbacks: GameSettingsCallbacks
+    callbacks: GameSettingsCallbacks,
+    nav: GameSettingsNav? = null
 ) {
     val isSteam by state.isSteamGame
-    val sections = remember(isSteam) { buildSections(isSteam) }
+    val isContainer by state.isContainerEditMode
+    val sections = remember(isSteam, isContainer) { buildSections(isSteam, isContainer) }
     val selectedIdx by state.currentSection
     val currentSectionId = sections.getOrNull(selectedIdx)?.first ?: SEC_GENERAL
     val saveEnabled by state.isLoaded
 
+    if (nav != null) {
+        SideEffect {
+            nav.sidebarCount = sections.size
+            nav.onSelectSection = { state.currentSection.intValue = it }
+            nav.onSave = { if (saveEnabled) callbacks.onConfirm() }
+            nav.onCancel = { callbacks.onDismiss() }
+        }
+    }
+
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -503,6 +717,7 @@ fun GameSettingsContent(
                 saveEnabled = saveEnabled,
                 onSave = { callbacks.onConfirm() },
                 onCancel = { callbacks.onDismiss() },
+                nav = nav,
                 modifier = Modifier
                     .width(220.dp)
                     .fillMaxHeight()
@@ -520,8 +735,22 @@ fun GameSettingsContent(
                     .weight(1f)
                     .fillMaxHeight()
                     .background(ContentBg)
+                    .then(
+                        if (nav != null) {
+                            Modifier.pointerInput(Unit) {
+                                awaitPointerEventScope {
+                                    while (true) {
+                                        val ev = awaitPointerEvent(PointerEventPass.Initial)
+                                        if (ev.type == PointerEventType.Press) nav.tapContent()
+                                    }
+                                }
+                            }
+                        } else {
+                            Modifier
+                        }
+                    )
             ) {
-                SectionContent(currentSectionId, state, callbacks)
+                SectionContent(currentSectionId, state, callbacks, nav)
             }
         }
     }
@@ -531,7 +760,8 @@ fun GameSettingsContent(
 private fun SectionContent(
     sectionId: Int,
     state: GameSettingsStateHolder,
-    callbacks: GameSettingsCallbacks
+    callbacks: GameSettingsCallbacks,
+    nav: GameSettingsNav? = null
 ) {
     AnimatedContent(
         targetState = sectionId,
@@ -549,30 +779,91 @@ private fun SectionContent(
         label = "SectionTransition"
     ) { id ->
         val scrollState = rememberScrollState()
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .verticalScroll(scrollState)
-                .padding(horizontal = 20.dp, vertical = 14.dp)
-        ) {
-            when (id) {
-                SEC_GENERAL -> GeneralSection(state, callbacks)
-                SEC_STEAM -> SteamSection(state)
-                SEC_DISPLAY -> DisplaySection(state, callbacks)
-                SEC_WINE -> WineSection(state, callbacks)
-                SEC_COMPONENTS -> ComponentsSection(state, callbacks)
-                SEC_VARIABLES -> VariablesSection(state, callbacks)
-                SEC_INPUT -> InputSection(state)
-                SEC_ADVANCED -> AdvancedSection(state, callbacks)
+        val contentNav = remember(nav) {
+            nav?.let { PaneNavRegistry(initialSignal = it.contentSignal) }
+        }
+        val isCurrent = id == sectionId
+        if (nav != null && contentNav != null) {
+            contentNav.controllerActive = nav.active && nav.inContent && isCurrent
+            contentNav.onEdgeLeft = { nav.exitToSidebar() }
+            if (isCurrent) {
+                nav.onContentBack = {
+                    if (contentNav.overlay != null) {
+                        contentNav.overlayClose?.invoke()
+                        true
+                    } else {
+                        false
+                    }
+                }
+            }
+            LaunchedEffect(nav.contentSignal) {
+                if (isCurrent) contentNav.processNav(nav.contentSignal, nav.contentDir)
+            }
+            LaunchedEffect(nav.contentResetSignal) {
+                if (isCurrent) contentNav.reset()
+            }
+        }
+        val density = LocalDensity.current
+        var viewportTop by remember { mutableStateOf(0f) }
+        var viewportHeight by remember { mutableIntStateOf(0) }
+        if (contentNav != null) {
+            LaunchedEffect(contentNav.activeRow, contentNav.activeCol, viewportHeight) {
+                if (!contentNav.controllerActive) return@LaunchedEffect
+                if (viewportHeight == 0) return@LaunchedEffect
+                val bounds = contentNav.activeItemBounds() ?: return@LaunchedEffect
+                if (bounds.second <= bounds.first) return@LaunchedEffect
+                val margin = with(density) { 16.dp.toPx() }
+                val vpTop = viewportTop
+                val vpBottom = viewportTop + viewportHeight
+                val delta = when {
+                    bounds.second + margin > vpBottom -> bounds.second + margin - vpBottom
+                    bounds.first - margin < vpTop -> bounds.first - margin - vpTop
+                    else -> 0f
+                }
+                if (delta != 0f) runCatching { scrollState.animateScrollBy(delta) }
+            }
+        }
+        val sectionBody: @Composable () -> Unit = {
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .then(
+                        if (contentNav != null) {
+                            Modifier.onGloballyPositioned {
+                                viewportTop = it.positionInWindow().y
+                                viewportHeight = it.size.height
+                            }
+                        } else {
+                            Modifier
+                        }
+                    )
+                    .verticalScroll(scrollState)
+                    .padding(horizontal = 20.dp, vertical = 14.dp)
+            ) {
+                when (id) {
+                    SEC_GENERAL -> GeneralSection(state, callbacks)
+                    SEC_STEAM -> SteamSection(state)
+                    SEC_DISPLAY -> DisplaySection(state, callbacks)
+                    SEC_RESHADE -> ReshadeSection(state)
+                    SEC_WINE -> WineSection(state, callbacks)
+                    SEC_COMPONENTS -> ComponentsSection(state, callbacks)
+                    SEC_VARIABLES -> VariablesSection(state, callbacks)
+                    SEC_INPUT -> InputSection(state)
+                    SEC_ADVANCED -> AdvancedSection(state, callbacks)
+                    SEC_DRIVES -> DrivesSection(state, callbacks)
+                    SEC_SAVES -> SavesSection(state, callbacks)
+                }
+                Spacer(Modifier.height(SettingSectionGap))
             }
-            Spacer(Modifier.height(SettingSectionGap))
+        }
+        if (contentNav != null) {
+            CompositionLocalProvider(LocalPaneNav provides contentNav) { sectionBody() }
+        } else {
+            sectionBody()
         }
     }
 }
 
-// ===================================================================
-// Sidebar
-// ===================================================================
 @Composable
 private fun Sidebar(
     title: String,
@@ -582,14 +873,16 @@ private fun Sidebar(
     saveEnabled: Boolean,
     onSave: () -> Unit,
     onCancel: () -> Unit,
+    nav: GameSettingsNav? = null,
     modifier: Modifier = Modifier
 ) {
+    val cancelHighlighted = nav != null && nav.active && !nav.inContent && nav.onActionRow && nav.actionCol == 0
+    val saveHighlighted = nav != null && nav.active && !nav.inContent && nav.onActionRow && nav.actionCol == 1
     Column(
         modifier = modifier
             .background(SidebarBg)
             .padding(top = 14.dp, bottom = 12.dp)
     ) {
-        // Header: shortcut/game title being edited
         if (title.isNotBlank()) {
             Text(
                 text = title,
@@ -615,7 +908,6 @@ private fun Sidebar(
             Spacer(Modifier.height(8.dp))
         }
 
-        // Sidebar items
         Column(
             modifier = Modifier
                 .weight(1f)
@@ -628,12 +920,14 @@ private fun Sidebar(
                     icon = section.icon,
                     label = stringResource(section.labelResId),
                     isSelected = currentIndex == index,
-                    onClick = { onSectionSelected(index) }
+                    navHighlighted = nav != null && nav.active && !nav.inContent && !nav.onActionRow && nav.sidebarIndex == index,
+                    onClick = {
+                        if (nav != null) nav.tapSection(index) else onSectionSelected(index)
+                    }
                 )
             }
         }
 
-        // Divider above the action buttons (matches the one under the title)
         Box(
             modifier = Modifier
                 .padding(horizontal = 12.dp)
@@ -643,7 +937,6 @@ private fun Sidebar(
         )
         Spacer(Modifier.height(8.dp))
 
-        // Cancel + Save buttons
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -657,7 +950,8 @@ private fun Sidebar(
                     .clip(RoundedCornerShape(8.dp))
                     .border(1.dp, CardBorder, RoundedCornerShape(8.dp))
                     .background(CardSurface)
-                    .clickable { onCancel() },
+                    .paneHighlight(cancelHighlighted, cornerRadius = 8.dp, highlightColor = NavHighlight)
+                    .clickable { nav?.tapAction(0); onCancel() },
                 contentAlignment = Alignment.Center
             ) {
                 Text(
@@ -669,10 +963,11 @@ private fun Sidebar(
             }
             SaveButton(
                 enabled = saveEnabled,
-                onClick = onSave,
+                onClick = { nav?.tapAction(1); onSave() },
                 height = 30.dp,
                 corner = 8.dp,
                 fontSize = SettingLabelSize,
+                navHighlighted = saveHighlighted,
                 modifier = Modifier.weight(1f)
             )
         }
@@ -686,6 +981,7 @@ private fun SaveButton(
     height: Dp,
     corner: Dp,
     fontSize: TextUnit,
+    navHighlighted: Boolean = false,
     modifier: Modifier = Modifier
 ) {
     Box(
@@ -700,6 +996,7 @@ private fun SaveButton(
             .background(
                 if (enabled) AccentBlue.copy(alpha = 0.1f) else CardSurface
             )
+            .paneHighlight(navHighlighted, cornerRadius = corner, highlightColor = NavHighlight)
             .clickable(enabled = enabled) { onClick() }
             .padding(horizontal = 14.dp),
         contentAlignment = Alignment.Center
@@ -713,19 +1010,27 @@ private fun SaveButton(
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun SidebarItem(
     icon: ImageVector,
     label: String,
     isSelected: Boolean,
+    navHighlighted: Boolean = false,
     onClick: () -> Unit
 ) {
+    val bringIntoView = remember { BringIntoViewRequester() }
+    LaunchedEffect(navHighlighted) {
+        if (navHighlighted) runCatching { bringIntoView.bringIntoView() }
+    }
     Box(
         modifier = Modifier
             .fillMaxWidth()
+            .bringIntoViewRequester(bringIntoView)
             .padding(horizontal = 8.dp)
             .clip(RoundedCornerShape(8.dp))
             .chasingBorder(isFocused = isSelected, cornerRadius = 8.dp, borderWidth = 2.dp)
+            .paneHighlight(navHighlighted, cornerRadius = 8.dp, highlightColor = NavHighlight)
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = null,
@@ -752,9 +1057,6 @@ private fun SidebarItem(
     }
 }
 
-// ===================================================================
-// Section 0: General
-// ===================================================================
 @Composable
 private fun GeneralSection(
     state: GameSettingsStateHolder,
@@ -781,6 +1083,7 @@ private fun GeneralSection(
                     .clip(RoundedCornerShape(9.dp))
                     .background(tint.copy(alpha = 0.08f))
                     .border(1.dp, tint.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
+                    .paneNavItem(cornerRadius = 9.dp, onActivate = { onClick() }, highlightColor = NavHighlight)
                     .clickable { onClick() }
                     .padding(horizontal = 10.dp, vertical = 6.dp)
             ) {
@@ -816,7 +1119,7 @@ private fun GeneralSection(
                         fontWeight = FontWeight.SemiBold
                     )
 
-                    if (summary.isNotBlank()) {
+                    if (!selected && summary.isNotBlank()) {
                         Spacer(Modifier.height(2.dp))
 
                         Text(
@@ -833,18 +1136,13 @@ private fun GeneralSection(
                     horizontalArrangement = Arrangement.spacedBy(6.dp),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    ActionButton(
-                        text =
-                            stringResource(
-                                if (selected) {
-                                    R.string.shortcuts_library_artwork_change
-                                } else {
-                                    R.string.shortcuts_library_artwork_set
-                                }
-                            ),
-                        tint = AccentBlue,
-                        onClick = onPick
-                    )
+                    if (!selected) {
+                        ActionButton(
+                            text = stringResource(R.string.shortcuts_library_artwork_set),
+                            tint = AccentBlue,
+                            onClick = onPick
+                        )
+                    }
 
                     if (selected) {
                         ActionButton(
@@ -859,7 +1157,6 @@ private fun GeneralSection(
     }
 
     SettingGroup {
-        // Name
         SettingTextField(
             label = stringResource(R.string.common_ui_name),
             value = state.name.value,
@@ -867,6 +1164,8 @@ private fun GeneralSection(
         )
 
         if (!isContainer) {
+            val launchExeDisplayText = state.launchExeDisplayPath.value.ifBlank { state.launchExePath.value }
+            val hasLaunchExePath = launchExeDisplayText.isNotEmpty()
             Spacer(Modifier.height(SettingItemGap))
             Text(
                 stringResource(R.string.common_ui_select_exe),
@@ -881,14 +1180,16 @@ private fun GeneralSection(
                     .clip(RoundedCornerShape(SettingFieldCorner))
                     .border(1.dp, InputBorder, RoundedCornerShape(SettingFieldCorner))
                     .background(InputSurface)
+                    .paneNavItem(cornerRadius = SettingFieldCorner, onActivate = { callbacks.onSelectExe() }, highlightColor = NavHighlight)
                     .clickable { callbacks.onSelectExe() }
                     .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding)
             ) {
                 Text(
-                    text = state.launchExePath.value.ifEmpty { stringResource(R.string.common_ui_select_exe) },
-                    color = if (state.launchExePath.value.isEmpty()) TextDim else TextPrimary,
-                    fontSize = SettingValueSize,
-                    maxLines = 1
+                    text = launchExeDisplayText.ifEmpty { stringResource(R.string.common_ui_select_exe) },
+                    color = if (hasLaunchExePath) TextPrimary else TextDim,
+                    fontSize = if (hasLaunchExePath) 10.sp else SettingValueSize,
+                    maxLines = if (hasLaunchExePath) Int.MAX_VALUE else 1,
+                    overflow = if (hasLaunchExePath) TextOverflow.Visible else TextOverflow.Ellipsis
                 )
             }
         }
@@ -927,6 +1228,7 @@ private fun GeneralSection(
                     .clip(RoundedCornerShape(10.dp))
                     .background(AccentBlue.copy(alpha = 0.08f))
                     .border(1.dp, AccentBlue.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
+                    .paneNavItem(cornerRadius = 10.dp, onActivate = { callbacks.onAddToHomeScreen() }, highlightColor = NavHighlight)
                     .clickable { callbacks.onAddToHomeScreen() }
                     .padding(horizontal = 12.dp, vertical = 8.dp)
             ) {
@@ -965,13 +1267,32 @@ private fun GeneralSection(
                     fontWeight = FontWeight.SemiBold,
                     letterSpacing = 0.8.sp
                 )
+                Box(
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(10.dp))
+                        .background(AccentBlue.copy(alpha = 0.08f))
+                        .border(1.dp, AccentBlue.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
+                        .paneNavItem(cornerRadius = 10.dp, onActivate = { callbacks.onScrapeGameArtwork(state.name.value) }, highlightColor = NavHighlight)
+                        .clickable { callbacks.onScrapeGameArtwork(state.name.value) }
+                        .padding(horizontal = 10.dp, vertical = 6.dp)
+                ) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            text = stringResource(R.string.library_games_scrape_artwork),
+                            color = AccentBlue,
+                            fontSize = SettingValueSize,
+                            fontWeight = FontWeight.Medium
+                        )
+                    }
+                }
 
                 Box(
                     modifier = Modifier
                         .clip(RoundedCornerShape(10.dp))
                         .background(AccentBlue.copy(alpha = 0.08f))
                         .border(1.dp, AccentBlue.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
-                        .clickable { callbacks.onOpenArtworkSource() }
+                        .paneNavItem(cornerRadius = 10.dp, onActivate = { callbacks.onOpenArtworkSource(state.name.value) }, highlightColor = NavHighlight)
+                        .clickable { callbacks.onOpenArtworkSource(state.name.value) }
                         .padding(horizontal = 10.dp, vertical = 6.dp)
                 ) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
@@ -994,56 +1315,50 @@ private fun GeneralSection(
 
             Spacer(Modifier.height(SettingItemGap))
 
-            ArtworkPickerRow(
-                title = stringResource(R.string.shortcuts_library_artwork_game_card_title),
-                summary = state.gameCardArtworkSummary.value,
-                selected = state.gameCardArtworkSelected.value,
-                onPick = callbacks::onPickGameCardArtwork,
-                onRemove = callbacks::onRemoveGameCardArtwork
-            )
-
-            Spacer(Modifier.height(SettingItemGap))
-
-            ArtworkPickerRow(
-                title = stringResource(R.string.shortcuts_library_artwork_grid_title),
-                summary = state.gridArtworkSummary.value,
-                selected = state.gridArtworkSelected.value,
-                onPick = callbacks::onPickGridArtwork,
-                onRemove = callbacks::onRemoveGridArtwork
-            )
-
-            Spacer(Modifier.height(SettingItemGap))
-
-            ArtworkPickerRow(
-                title = stringResource(R.string.shortcuts_library_artwork_carousel_title),
-                summary = state.carouselArtworkSummary.value,
-                selected = state.carouselArtworkSelected.value,
-                onPick = callbacks::onPickCarouselArtwork,
-                onRemove = callbacks::onRemoveCarouselArtwork
-            )
-
-            Spacer(Modifier.height(SettingItemGap))
-
-            ArtworkPickerRow(
-                title = stringResource(R.string.shortcuts_library_artwork_list_title),
-                summary = state.listArtworkSummary.value,
-                selected = state.listArtworkSelected.value,
-                onPick = callbacks::onPickListArtwork,
-                onRemove = callbacks::onRemoveListArtwork
-            )
+            Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                Box(Modifier.weight(1f)) {
+                    ArtworkPickerRow(
+                        title = stringResource(R.string.shortcuts_library_artwork_icon_title),
+                        summary = state.iconArtworkSummary.value,
+                        selected = state.iconArtworkSelected.value,
+                        onPick = callbacks::onPickIconArtwork,
+                        onRemove = callbacks::onRemoveIconArtwork
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    ArtworkPickerRow(
+                        title = stringResource(R.string.shortcuts_library_artwork_hero_title),
+                        summary = state.gameCardArtworkSummary.value,
+                        selected = state.gameCardArtworkSelected.value,
+                        onPick = callbacks::onPickGameCardArtwork,
+                        onRemove = callbacks::onRemoveGameCardArtwork
+                    )
+                }
+            }
         }
     }
 
     Spacer(Modifier.height(SettingSectionGap))
 
     SettingGroup {
-        // Screen Size
-        SettingDropdown(
-            label = stringResource(R.string.container_config_screen_size),
-            entries = state.screenSizeEntries.value,
-            selectedIndex = state.selectedScreenSize.intValue,
-            onSelected = { state.selectedScreenSize.intValue = it }
-        )
+        Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_config_screen_size),
+                    entries = state.screenSizeEntries.value,
+                    selectedIndex = state.selectedScreenSize.intValue,
+                    onSelected = { state.selectedScreenSize.intValue = it }
+                )
+            }
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.settings_general_refresh_rate),
+                    entries = state.refreshRateEntries.value,
+                    selectedIndex = state.selectedRefreshRate.intValue,
+                    onSelected = { state.selectedRefreshRate.intValue = it }
+                )
+            }
+        }
 
         // Custom resolution fields when "Custom" is selected (index 0)
         if (state.selectedScreenSize.intValue == 0) {
@@ -1070,120 +1385,157 @@ private fun GeneralSection(
                 }
             }
         }
-
-        if (!isContainer) {
-            Spacer(Modifier.height(SettingItemGap))
-            SettingDropdown(
-                label = stringResource(R.string.settings_general_refresh_rate),
-                entries = state.refreshRateEntries.value,
-                selectedIndex = state.selectedRefreshRate.intValue,
-                onSelected = { state.selectedRefreshRate.intValue = it }
-            )
-        }
     }
 
     Spacer(Modifier.height(SettingSectionGap))
 
-    // Sound
     SettingGroup {
-        SettingDropdown(
-            label = stringResource(R.string.container_config_audio_driver),
-            entries = state.audioDriverEntries.value,
-            selectedIndex = state.selectedAudioDriver.intValue,
-            onSelected = { state.selectedAudioDriver.intValue = it }
-        )
-
-        Spacer(Modifier.height(SettingItemGap))
-
-        SettingDropdown(
-            label = stringResource(R.string.settings_audio_midi_sound_font),
-            entries = state.midiSoundFontEntries.value,
-            selectedIndex = state.selectedMidiSoundFont.intValue,
-            onSelected = { state.selectedMidiSoundFont.intValue = it }
-        )
+        Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_config_audio_driver),
+                    entries = state.audioDriverEntries.value,
+                    selectedIndex = state.selectedAudioDriver.intValue,
+                    onSelected = { state.selectedAudioDriver.intValue = it }
+                )
+            }
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.settings_audio_midi_sound_font),
+                    entries = state.midiSoundFontEntries.value,
+                    selectedIndex = state.selectedMidiSoundFont.intValue,
+                    onSelected = { state.selectedMidiSoundFont.intValue = it }
+                )
+            }
+        }
     }
 
     if (!isContainer) {
         Spacer(Modifier.height(SettingSectionGap))
-        SettingGroup {
+        SettingGroup(verticalPadding = SettingTightGap) {
+            val fpsMin = 30
+            // Cap the slider at the panel's highest supported refresh rate (parsed from entries like "120 Hz"); fall back to 60.
+            val supportedMax = state.refreshRateEntries.value
+                .mapNotNull { it.trim().substringBefore(" ").toIntOrNull() }
+                .maxOrNull() ?: 60
+            val maxFps = supportedMax.coerceAtLeast(fpsMin)
+            val enabled = state.fpsLimit.intValue > 0
+            // Remember the last enabled value so off→on restores it; re-seed when the supported max changes.
+            var lastFps by remember(maxFps) {
+                mutableStateOf(
+                    (if (state.fpsLimit.intValue > 0) state.fpsLimit.intValue else 60)
+                        .coerceIn(fpsMin, maxFps)
+                )
+            }
+
             Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
-                Text(
-                    text = "FPS Limiter",
-                    color = TextPrimary,
-                    fontSize = SettingValueSize,
-                    fontWeight = FontWeight.SemiBold
+                SettingSwitch(
+                    label = "FPS Limiter",
+                    checked = enabled,
+                    onCheckedChange = { on -> state.fpsLimit.intValue = if (on) lastFps else 0 }
                 )
-                val limits = listOf(0, 30, 45, 60, 90, 120)
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .horizontalScroll(rememberScrollState()),
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                AnimatedVisibility(
+                    visible = enabled,
+                    enter = graphicsCardExpandEnter(),
+                    exit = graphicsCardExpandExit()
                 ) {
-                    limits.forEach { limit ->
-                        val isChecked = state.fpsLimit.intValue == limit
-                        val bgColor = if (isChecked) AccentBlue.copy(alpha = 0.15f) else ChipSurface
-                        val borderColor = if (isChecked) AccentBlue.copy(alpha = 0.4f) else ChipBorder
-                        val textColor = if (isChecked) AccentBlue else TextDim
-
-                        Box(
-                            modifier = Modifier
-                                .clip(RoundedCornerShape(8.dp))
-                                .background(bgColor)
-                                .border(1.dp, borderColor, RoundedCornerShape(8.dp))
-                                .clickable { state.fpsLimit.intValue = limit }
-                                .padding(horizontal = 12.dp, vertical = 6.dp),
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Text(
-                                if (limit == 0) "None" else "$limit",
-                                color = textColor,
-                                fontSize = SettingLabelSize,
-                                fontWeight = if (isChecked) FontWeight.SemiBold else FontWeight.Normal
-                            )
+                    SettingSlider(
+                        label = "Limit",
+                        value = lastFps,
+                        range = fpsMin..maxFps,
+                        valueText = "$lastFps FPS",
+                        steps = (maxFps - fpsMin - 1).coerceAtLeast(0),
+                        onValueChange = {
+                            val v = it.coerceIn(fpsMin, maxFps)
+                            lastFps = v
+                            state.fpsLimit.intValue = v
                         }
-                    }
+                    )
                 }
             }
         }
     }
 }
 
-// ===================================================================
-// Section 1: Display
-// ===================================================================
 @Composable
 private fun DisplaySection(
     state: GameSettingsStateHolder,
     callbacks: GameSettingsCallbacks
 ) {
 
+    // Direct Composition needs API 29+ and the ASurfaceControl symbols; the chip
+    // stays inert on devices without them rather than offering a toggle that
+    // could never engage.
+    val dcSupported = remember {
+        runCatching {
+            com.winlator.cmod.runtime.display.composition.SurfaceCompositor.isAvailable()
+        }.getOrDefault(false)
+    }
+
     SettingGroup {
-        SettingDropdown(
-            label = stringResource(R.string.container_graphics_driver),
-            entries = state.graphicsDriverEntries.value,
-            selectedIndex = state.selectedGraphicsDriver.intValue,
-            onSelected = { state.selectedGraphicsDriver.intValue = it }
-        )
+        Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_graphics_driver),
+                    entries = state.graphicsDriverEntries.value,
+                    selectedIndex = state.selectedGraphicsDriver.intValue,
+                    onSelected = { state.selectedGraphicsDriver.intValue = it },
+                    labelTrailing = {
+                        DirectCompositionChip(
+                            supported = dcSupported,
+                            on = state.directComposition.value,
+                            onClick = {
+                                state.directComposition.value = !state.directComposition.value
+                            }
+                        )
+                    }
+                )
+            }
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_surface_effect),
+                    entries = state.surfaceEffectEntries.value,
+                    selectedIndex = state.selectedSurfaceEffect.intValue,
+                    onSelected = { state.selectedSurfaceEffect.intValue = it }
+                )
+            }
+        }
 
         Spacer(Modifier.height(SettingSectionGap))
 
-        SettingDropdown(
-            label = stringResource(R.string.container_wine_dxwrapper),
-            entries = state.dxWrapperEntries.value,
-            selectedIndex = state.selectedDxWrapper.intValue,
-            onSelected = { state.selectedDxWrapper.intValue = it }
-        )
+        Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_wine_dxwrapper),
+                    entries = state.dxWrapperEntries.value,
+                    selectedIndex = state.selectedDxWrapper.intValue,
+                    onSelected = { state.selectedDxWrapper.intValue = it }
+                )
+            }
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_graphics_compositor_present_mode),
+                    entries = state.gfxCompositorPresentModeEntries.value.map { mode ->
+                        when (mode.lowercase()) {
+                            "fifo" -> "FIFO"
+                            "mailbox" -> "Mailbox"
+                            "immediate" -> "Immediate"
+                            else -> mode.replaceFirstChar { it.uppercase() }
+                        }
+                    },
+                    selectedIndex = state.gfxSelectedCompositorPresentMode.intValue,
+                    onSelected = { state.gfxSelectedCompositorPresentMode.intValue = it }
+                )
+            }
+        }
     }
 
     Spacer(Modifier.height(SettingItemGap))
 
-    // Graphics Driver Configuration - expandable inline card
     GraphicsDriverConfigCard(state, callbacks)
 
     Spacer(Modifier.height(SettingItemGap))
 
-    // Show DXVK or WineD3D config card based on selected DX wrapper
     val dxWrapperEntries = state.dxWrapperEntries.value
     val dxWrapperIdx = state.selectedDxWrapper.intValue
     val selectedDxWrapper = if (dxWrapperIdx in dxWrapperEntries.indices)
@@ -1198,9 +1550,6 @@ private fun DisplaySection(
 
 }
 
-// ===================================================================
-// Graphics Driver Configuration Card
-// ===================================================================
 @Composable
 private fun GraphicsDriverConfigCard(
     state: GameSettingsStateHolder,
@@ -1215,11 +1564,17 @@ private fun GraphicsDriverConfigCard(
             .background(CardSurface)
             .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
     ) {
-        // Header row - always visible, acts as expand/collapse toggle
+        // Header row — tap to expand/collapse.
         Row(
             modifier = Modifier
                 .fillMaxWidth()
                 .clickable { state.gfxConfigExpanded.value = !expanded }
+                .paneNavItem(
+                    cornerRadius = SettingGroupCorner,
+                    onActivate = { state.gfxConfigExpanded.value = !expanded },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(SettingGroupPadding),
             verticalAlignment = Alignment.CenterVertically
         ) {
@@ -1237,7 +1592,6 @@ private fun GraphicsDriverConfigCard(
                 fontWeight = FontWeight.Medium,
                 modifier = Modifier.weight(1f)
             )
-            // Version badge
             if (state.graphicsDriverVersion.value.isNotEmpty()) {
                 Box(
                     modifier = Modifier
@@ -1262,11 +1616,10 @@ private fun GraphicsDriverConfigCard(
             )
         }
 
-        // Expandable content
         AnimatedVisibility(
             visible = expanded,
-            enter = expandVertically(),
-            exit = shrinkVertically()
+            enter = graphicsCardExpandEnter(),
+            exit = graphicsCardExpandExit()
         ) {
             Column(
                 modifier = Modifier
@@ -1276,117 +1629,161 @@ private fun GraphicsDriverConfigCard(
                 Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
                 Spacer(Modifier.height(SettingItemGap))
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_vulkan_version),
-                    entries = state.gfxVulkanVersionEntries.value,
-                    selectedIndex = state.gfxSelectedVulkanVersion.intValue,
-                    onSelected = { state.gfxSelectedVulkanVersion.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_version),
-                    entries = state.gfxDriverVersionEntries.value,
-                    selectedIndex = state.gfxSelectedDriverVersion.intValue,
-                    onSelected = {
-                        state.gfxSelectedDriverVersion.intValue = it
-                        callbacks.onGfxDriverVersionChanged(it)
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_graphics_vulkan_version),
+                            entries = state.gfxVulkanVersionEntries.value,
+                            selectedIndex = state.gfxSelectedVulkanVersion.intValue,
+                            onSelected = { state.gfxSelectedVulkanVersion.intValue = it }
+                        )
                     }
-                )
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_graphics_version),
+                            entries = state.gfxDriverVersionEntries.value,
+                            selectedIndex = state.gfxSelectedDriverVersion.intValue,
+                            onSelected = {
+                                state.gfxSelectedDriverVersion.intValue = it
+                                callbacks.onGfxDriverVersionChanged(it)
+                            }
+                        )
+                    }
+                }
 
                 Spacer(Modifier.height(SettingItemGap))
 
-                // Available Extensions (multi-select)
-                ExtensionsMultiSelect(state)
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        ExtensionsMultiSelect(state)
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_gpu_name),
+                            entries = state.gfxGpuNameEntries.value,
+                            selectedIndex = state.gfxSelectedGpuName.intValue,
+                            onSelected = { state.gfxSelectedGpuName.intValue = it }
+                        )
+                    }
+                }
 
                 Spacer(Modifier.height(SettingItemGap))
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_gpu_name),
-                    entries = state.gfxGpuNameEntries.value,
-                    selectedIndex = state.gfxSelectedGpuName.intValue,
-                    onSelected = { state.gfxSelectedGpuName.intValue = it }
-                )
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_graphics_max_device_memory),
+                            entries = state.gfxMaxDeviceMemoryEntries.value,
+                            selectedIndex = state.gfxSelectedMaxDeviceMemory.intValue,
+                            onSelected = { state.gfxSelectedMaxDeviceMemory.intValue = it }
+                        )
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_graphics_present_modes),
+                            entries = state.gfxPresentModeEntries.value,
+                            selectedIndex = state.gfxSelectedPresentMode.intValue,
+                            onSelected = { state.gfxSelectedPresentMode.intValue = it }
+                        )
+                    }
+                }
 
                 Spacer(Modifier.height(SettingItemGap))
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_max_device_memory),
-                    entries = state.gfxMaxDeviceMemoryEntries.value,
-                    selectedIndex = state.gfxSelectedMaxDeviceMemory.intValue,
-                    onSelected = { state.gfxSelectedMaxDeviceMemory.intValue = it }
-                )
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_graphics_resource_type),
+                            entries = state.gfxResourceTypeEntries.value,
+                            selectedIndex = state.gfxSelectedResourceType.intValue,
+                            onSelected = { state.gfxSelectedResourceType.intValue = it }
+                        )
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_graphics_bcn_emulation),
+                            entries = state.gfxBcnEmulationEntries.value,
+                            selectedIndex = state.gfxSelectedBcnEmulation.intValue,
+                            onSelected = { state.gfxSelectedBcnEmulation.intValue = it }
+                        )
+                    }
+                }
 
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_present_modes),
-                    entries = state.gfxPresentModeEntries.value,
-                    selectedIndex = state.gfxSelectedPresentMode.intValue,
-                    onSelected = { state.gfxSelectedPresentMode.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_resource_type),
-                    entries = state.gfxResourceTypeEntries.value,
-                    selectedIndex = state.gfxSelectedResourceType.intValue,
-                    onSelected = { state.gfxSelectedResourceType.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_bcn_emulation),
-                    entries = state.gfxBcnEmulationEntries.value,
-                    selectedIndex = state.gfxSelectedBcnEmulation.intValue,
-                    onSelected = { state.gfxSelectedBcnEmulation.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_bcn_emulation_type),
-                    entries = state.gfxBcnEmulationTypeEntries.value,
-                    selectedIndex = state.gfxSelectedBcnEmulationType.intValue,
-                    onSelected = { state.gfxSelectedBcnEmulationType.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
+                val bcnEmulationActive = !state.gfxBcnEmulationEntries.value
+                    .getOrElse(state.gfxSelectedBcnEmulation.intValue) { "" }
+                    .equals("none", ignoreCase = true)
+                if (bcnEmulationActive) {
+                    Spacer(Modifier.height(SettingItemGap))
+
+                    Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                        Box(Modifier.weight(1f)) {
+                            SettingDropdown(
+                                label = stringResource(R.string.container_graphics_bcn_emulation_type),
+                                entries = state.gfxBcnEmulationTypeEntries.value,
+                                selectedIndex = state.gfxSelectedBcnEmulationType.intValue,
+                                onSelected = { state.gfxSelectedBcnEmulationType.intValue = it }
+                            )
+                        }
+                        Box(Modifier.weight(1f)) {
+                            SettingDropdown(
+                                label = stringResource(R.string.container_graphics_bcn_emulation_cache),
+                                entries = state.gfxBcnEmulationCacheEntries.value,
+                                selectedIndex = state.gfxSelectedBcnEmulationCache.intValue,
+                                onSelected = { state.gfxSelectedBcnEmulationCache.intValue = it }
+                            )
+                        }
+                    }
+                }
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_graphics_bcn_emulation_cache),
-                    entries = state.gfxBcnEmulationCacheEntries.value,
-                    selectedIndex = state.gfxSelectedBcnEmulationCache.intValue,
-                    onSelected = { state.gfxSelectedBcnEmulationCache.intValue = it }
-                )
+                val gamenativeWrapperActive = state.graphicsDriverEntries.value
+                    .getOrElse(state.selectedGraphicsDriver.intValue) { "" }
+                    .equals("Wrapper-Gamenative", ignoreCase = true)
+                if (gamenativeWrapperActive) {
+                    Spacer(Modifier.height(SettingItemGap))
+
+                    Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                        Box(Modifier.weight(1f)) {
+                            SettingDropdown(
+                                label = stringResource(R.string.container_graphics_transcoder),
+                                entries = state.gfxTranscoderEntries.value,
+                                selectedIndex = state.gfxSelectedTranscoder.intValue,
+                                onSelected = { state.gfxSelectedTranscoder.intValue = it }
+                            )
+                        }
+                        Box(Modifier.weight(1f)) {
+                            SettingDropdown(
+                                label = stringResource(R.string.container_graphics_quality),
+                                entries = state.gfxQualityEntries.value,
+                                selectedIndex = state.gfxSelectedQuality.intValue,
+                                onSelected = { state.gfxSelectedQuality.intValue = it }
+                            )
+                        }
+                    }
+                }
 
                 Spacer(Modifier.height(SettingItemGap))
 
-                // Toggles
-                SettingCheckbox(
-                    label = stringResource(R.string.container_graphics_sync_frame),
-                    checked = state.gfxSyncFrame.value,
-                    onCheckedChange = { state.gfxSyncFrame.value = it }
-                )
-
-                Spacer(Modifier.height(SettingTightGap))
-
-                SettingCheckbox(
-                    label = stringResource(R.string.container_graphics_disable_present_wait),
-                    checked = state.gfxDisablePresentWait.value,
-                    onCheckedChange = { state.gfxDisablePresentWait.value = it }
-                )
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingCheckbox(
+                            label = stringResource(R.string.container_graphics_sync_frame),
+                            checked = state.gfxSyncFrame.value,
+                            onCheckedChange = { state.gfxSyncFrame.value = it }
+                        )
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingCheckbox(
+                            label = stringResource(R.string.container_graphics_disable_present_wait),
+                            checked = state.gfxDisablePresentWait.value,
+                            onCheckedChange = { state.gfxDisablePresentWait.value = it }
+                        )
+                    }
+                }
             }
         }
     }
 }
 
-// ===================================================================
-// Extensions multi-select
-// ===================================================================
 @Composable
 private fun ExtensionsMultiSelect(state: GameSettingsStateHolder) {
     val extensions = state.gfxAvailableExtensions.value
@@ -1404,7 +1801,6 @@ private fun ExtensionsMultiSelect(state: GameSettingsStateHolder) {
             modifier = Modifier.padding(bottom = SettingTightGap)
         )
 
-        // Summary button — opens popup
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -1412,6 +1808,18 @@ private fun ExtensionsMultiSelect(state: GameSettingsStateHolder) {
                 .background(InputSurface)
                 .border(1.dp, InputBorder, RoundedCornerShape(SettingFieldCorner))
                 .clickable(enabled = extensions.isNotEmpty()) { showDialog = true }
+                .then(
+                    if (extensions.isNotEmpty()) {
+                        Modifier.paneNavItem(
+                            cornerRadius = SettingFieldCorner,
+                            onActivate = { showDialog = true },
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
+                    } else {
+                        Modifier
+                    }
+                )
                 .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding),
             verticalAlignment = Alignment.CenterVertically
         ) {
@@ -1468,7 +1876,6 @@ private fun ExtensionsPickerDialog(
                 .background(BgDeep)
                 .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
         ) {
-            // Header
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -1500,7 +1907,6 @@ private fun ExtensionsPickerDialog(
 
             Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
 
-            // Scrollable list — takes remaining space between header and button
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -1514,6 +1920,7 @@ private fun ExtensionsPickerDialog(
                         modifier = Modifier
                             .fillMaxWidth()
                             .clip(RoundedCornerShape(8.dp))
+                            .paneNavItem(cornerRadius = 8.dp, onActivate = { onToggle(ext, !isEnabled) }, highlightColor = NavHighlight)
                             .clickable { onToggle(ext, !isEnabled) }
                             .padding(horizontal = 8.dp, vertical = 5.dp),
                         verticalAlignment = Alignment.CenterVertically
@@ -1541,10 +1948,10 @@ private fun ExtensionsPickerDialog(
 
             Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
 
-            // Close button
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
+                    .paneNavItem(cornerRadius = 8.dp, onActivate = { onDismiss() }, highlightColor = NavHighlight)
                     .clickable { onDismiss() }
                     .padding(vertical = 10.dp),
                 contentAlignment = Alignment.Center
@@ -1560,9 +1967,6 @@ private fun ExtensionsPickerDialog(
     }
 }
 
-// ===================================================================
-// DXVK Configuration Card
-// ===================================================================
 @Composable
 private fun DXVKConfigCard(
     state: GameSettingsStateHolder,
@@ -1570,7 +1974,6 @@ private fun DXVKConfigCard(
 ) {
     val expanded by state.dxvkConfigExpanded
 
-    // Determine DXVK async support based on currently selected version
     val dxvkVersions = state.dxvkVersionEntries.value
     val selectedIdx = state.dxvkSelectedVersion.intValue
     val selectedVersion = if (selectedIdx in dxvkVersions.indices) dxvkVersions[selectedIdx] else ""
@@ -1586,11 +1989,16 @@ private fun DXVKConfigCard(
             .background(CardSurface)
             .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
     ) {
-        // Header row
         Row(
             modifier = Modifier
                 .fillMaxWidth()
                 .clickable { state.dxvkConfigExpanded.value = !expanded }
+                .paneNavItem(
+                    cornerRadius = SettingGroupCorner,
+                    onActivate = { state.dxvkConfigExpanded.value = !expanded },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(SettingGroupPadding),
             verticalAlignment = Alignment.CenterVertically
         ) {
@@ -1616,11 +2024,10 @@ private fun DXVKConfigCard(
             )
         }
 
-        // Expandable content
         AnimatedVisibility(
             visible = expanded,
-            enter = expandVertically(),
-            exit = shrinkVertically()
+            enter = graphicsCardExpandEnter(),
+            exit = graphicsCardExpandExit()
         ) {
             Column(
                 modifier = Modifier
@@ -1630,256 +2037,1257 @@ private fun DXVKConfigCard(
                 Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
                 Spacer(Modifier.height(SettingItemGap))
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_vkd3d_version),
-                    entries = state.dxvkVkd3dVersionEntries.value,
-                    selectedIndex = state.dxvkSelectedVkd3dVersion.intValue,
-                    onSelected = {
-                        state.dxvkSelectedVkd3dVersion.intValue = it
-                        callbacks.onDxvkVkd3dVersionChanged(it)
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_vkd3d_version),
+                            entries = state.dxvkVkd3dVersionEntries.value,
+                            selectedIndex = state.dxvkSelectedVkd3dVersion.intValue,
+                            onSelected = {
+                                state.dxvkSelectedVkd3dVersion.intValue = it
+                                callbacks.onDxvkVkd3dVersionChanged(it)
+                            }
+                        )
                     }
-                )
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_vkd3d_feature_level),
+                            entries = state.dxvkVkd3dFeatureLevelEntries.value,
+                            selectedIndex = state.dxvkSelectedVkd3dFeatureLevel.intValue,
+                            onSelected = { state.dxvkSelectedVkd3dFeatureLevel.intValue = it }
+                        )
+                    }
+                }
 
                 Spacer(Modifier.height(SettingItemGap))
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_vkd3d_feature_level),
-                    entries = state.dxvkVkd3dFeatureLevelEntries.value,
-                    selectedIndex = state.dxvkSelectedVkd3dFeatureLevel.intValue,
-                    onSelected = { state.dxvkSelectedVkd3dFeatureLevel.intValue = it }
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_dxvk_version),
+                            entries = state.dxvkVersionEntries.value,
+                            selectedIndex = state.dxvkSelectedVersion.intValue,
+                            onSelected = {
+                                state.dxvkSelectedVersion.intValue = it
+                                callbacks.onDxvkVersionChanged(it)
+                            }
+                        )
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_ddraw_wrapper),
+                            entries = state.dxvkDdrawWrapperEntries.value,
+                            selectedIndex = state.dxvkSelectedDdrawWrapper.intValue,
+                            onSelected = { state.dxvkSelectedDdrawWrapper.intValue = it }
+                        )
+                    }
+                }
+
+                Spacer(Modifier.height(SettingItemGap))
+
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f).alpha(if (asyncEnabled) 1f else 0.35f)) {
+                        SettingCheckbox(
+                            label = stringResource(R.string.container_wine_enabled_async),
+                            checked = state.dxvkAsync.value && asyncEnabled,
+                            onCheckedChange = { if (asyncEnabled) state.dxvkAsync.value = it }
+                        )
+                    }
+                    Box(Modifier.weight(1f).alpha(if (asyncCacheEnabled) 1f else 0.35f)) {
+                        SettingCheckbox(
+                            label = stringResource(R.string.container_wine_enabled_async_cache),
+                            checked = state.dxvkAsyncCache.value && asyncCacheEnabled,
+                            onCheckedChange = { if (asyncCacheEnabled) state.dxvkAsyncCache.value = it }
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun WineD3DConfigCard(state: GameSettingsStateHolder) {
+    val expanded by state.wined3dConfigExpanded
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(SettingGroupCorner))
+            .background(CardSurface)
+            .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable { state.wined3dConfigExpanded.value = !expanded }
+                .paneNavItem(
+                    cornerRadius = SettingGroupCorner,
+                    onActivate = { state.wined3dConfigExpanded.value = !expanded },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
                 )
+                .padding(SettingGroupPadding),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                Icons.Outlined.Tune,
+                contentDescription = null,
+                tint = AccentBlue,
+                modifier = Modifier.size(SettingIconSize)
+            )
+            Spacer(Modifier.width(8.dp))
+            Text(
+                stringResource(R.string.container_wine_wined3d_config_title),
+                color = TextPrimary,
+                fontSize = SettingValueSize,
+                fontWeight = FontWeight.Medium,
+                modifier = Modifier.weight(1f)
+            )
+            Icon(
+                if (expanded) Icons.Outlined.KeyboardArrowUp else Icons.Outlined.KeyboardArrowDown,
+                contentDescription = null,
+                tint = TextDim,
+                modifier = Modifier.size(SettingIconSize)
+            )
+        }
 
+        AnimatedVisibility(
+            visible = expanded,
+            enter = graphicsCardExpandEnter(),
+            exit = graphicsCardExpandExit()
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 12.dp, end = 12.dp, bottom = 12.dp)
+            ) {
+                Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
                 Spacer(Modifier.height(SettingItemGap))
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_dxvk_version),
-                    entries = state.dxvkVersionEntries.value,
-                    selectedIndex = state.dxvkSelectedVersion.intValue,
-                    onSelected = {
-                        state.dxvkSelectedVersion.intValue = it
-                        callbacks.onDxvkVersionChanged(it)
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_csmt),
+                            entries = state.wined3dCsmtEntries.value,
+                            selectedIndex = state.wined3dSelectedCsmt.intValue,
+                            onSelected = { state.wined3dSelectedCsmt.intValue = it }
+                        )
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_gpu_name),
+                            entries = state.wined3dGpuNameEntries.value,
+                            selectedIndex = state.wined3dSelectedGpuName.intValue,
+                            onSelected = { state.wined3dSelectedGpuName.intValue = it }
+                        )
+                    }
+                }
+
+                Spacer(Modifier.height(SettingItemGap))
+
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_video_memory_size),
+                            entries = state.wined3dVideoMemorySizeEntries.value,
+                            selectedIndex = state.wined3dSelectedVideoMemorySize.intValue,
+                            onSelected = { state.wined3dSelectedVideoMemorySize.intValue = it }
+                        )
                     }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_strict_shader_math),
+                            entries = state.wined3dStrictShaderMathEntries.value,
+                            selectedIndex = state.wined3dSelectedStrictShaderMath.intValue,
+                            onSelected = { state.wined3dSelectedStrictShaderMath.intValue = it }
+                        )
+                    }
+                }
+
+                Spacer(Modifier.height(SettingItemGap))
+
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_wine_offscreen_rendering_mode),
+                            entries = state.wined3dOffscreenRenderingModeEntries.value,
+                            selectedIndex = state.wined3dSelectedOffscreenRenderingMode.intValue,
+                            onSelected = { state.wined3dSelectedOffscreenRenderingMode.intValue = it }
+                        )
+                    }
+                    Box(Modifier.weight(1f)) {
+                        SettingDropdown(
+                            label = stringResource(R.string.container_config_renderer),
+                            entries = state.wined3dRendererEntries.value,
+                            selectedIndex = state.wined3dSelectedRenderer.intValue,
+                            onSelected = { state.wined3dSelectedRenderer.intValue = it }
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ReshadeSection(state: GameSettingsStateHolder) {
+    val loadout = state.reshadeLoadout
+    var showCatalog by remember { mutableStateOf(false) }
+
+    SubsectionLabel(stringResource(R.string.reshade_section_title))
+    Spacer(Modifier.height(8.dp))
+    Text(
+        text = stringResource(R.string.reshade_section_hint),
+        color = TextSecondary
+    )
+    Spacer(Modifier.height(SettingSectionGap))
+
+    SettingGroup {
+        if (loadout.order.isEmpty()) {
+            Text(
+                text = stringResource(R.string.reshade_loadout_empty),
+                color = TextSecondary
+            )
+            Spacer(Modifier.height(SettingItemGap))
+        } else {
+            // chain order = apply order; every listed effect is compiled into the vkBasalt chain at launch.
+            loadout.order.forEachIndexed { index, name ->
+                val effect = state.reshadeEffects.value.firstOrNull { it.name == name }
+                ReshadeEffectEditorRow(
+                    state = state,
+                    index = index,
+                    name = name,
+                    params = effect?.params ?: emptyList(),
+                    isFirst = index == 0,
+                    isLast = index == loadout.order.lastIndex,
+                )
+                Spacer(Modifier.height(SettingItemGap))
+            }
+        }
+
+        val full = loadout.isFull()
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(SettingFieldCorner))
+                .then(
+                    if (full) Modifier
+                    else Modifier
+                        .paneNavItem(
+                            cornerRadius = SettingFieldCorner,
+                            onActivate = { showCatalog = true },
+                            highlightColor = NavHighlight,
+                        )
+                        .clickable { showCatalog = true }
                 )
+                .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                Icons.Outlined.Add,
+                contentDescription = null,
+                tint = if (full) TextSecondary else AccentBlue,
+                modifier = Modifier.size(SettingIconSize)
+            )
+            Spacer(Modifier.width(8.dp))
+            Text(
+                stringResource(if (full) R.string.reshade_loadout_full else R.string.reshade_loadout_add),
+                color = if (full) TextSecondary else AccentBlue,
+                fontSize = SettingValueSize,
+                fontWeight = FontWeight.Medium
+            )
+        }
+    }
+
+    if (loadout.order.isNotEmpty()) {
+        Spacer(Modifier.height(SettingSectionGap))
+        SettingGroup {
+            ReshadeModeSelector(loadout.mode) { loadout.changeMode(it) }
+        }
+    }
 
-                // Async toggle - greyed out when version doesn't support it
+    if (showCatalog) {
+        ReshadeCatalogDialog(state = state, onDismiss = { showCatalog = false })
+    }
+}
+
+// in solo mode enabling one effect bypasses the rest; ReshadeLoadoutState enforces the exclusivity.
+@Composable
+private fun ReshadeEffectEditorRow(
+    state: GameSettingsStateHolder,
+    index: Int,
+    name: String,
+    params: List<ReshadeManager.ReshadeParam>,
+    isFirst: Boolean,
+    isLast: Boolean,
+) {
+    val loadout = state.reshadeLoadout
+    val enabled = loadout.isEnabled(name)
+    var expanded by remember(name) { mutableStateOf(false) }
+
+    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+        Box(
+            modifier = Modifier
+                .clip(RoundedCornerShape(6.dp))
+                .paneNavItem(cornerRadius = 6.dp, onActivate = { loadout.setEnabled(name, !enabled) }, highlightColor = NavHighlight, tapToSelect = true)
+        ) {
+            Switch(
+                checked = enabled,
+                onCheckedChange = { loadout.setEnabled(name, it) },
+                colors = outlinedSwitchColors(accentColor = AccentBlue, textSecondaryColor = TextSecondary),
+            )
+        }
+        Spacer(Modifier.width(8.dp))
+        Text(
+            text = name,
+            color = TextPrimary,
+            fontSize = SettingLabelSize,
+            fontWeight = if (enabled) FontWeight.SemiBold else FontWeight.Normal,
+            modifier = Modifier
+                .weight(1f)
+                .clip(RoundedCornerShape(6.dp))
+                .paneNavItem(cornerRadius = 6.dp, onActivate = { expanded = !expanded }, highlightColor = NavHighlight, tapToSelect = true)
+                .clickable { expanded = !expanded }
+                .padding(vertical = 4.dp)
+        )
+        if (loadout.mode == ReshadeLoadout.MODE_SOLO && enabled) {
+            Text(
+                text = stringResource(R.string.reshade_effect_active),
+                color = AccentBlue,
+                fontSize = SettingLabelSize,
+                modifier = Modifier.padding(end = 6.dp)
+            )
+        }
+        ReshadeRowIcon(Icons.Outlined.KeyboardArrowUp, enabled = !isFirst) { loadout.move(index, index - 1) }
+        ReshadeRowIcon(Icons.Outlined.KeyboardArrowDown, enabled = !isLast) { loadout.move(index, index + 1) }
+        ReshadeRowIcon(Icons.Outlined.Close, enabled = true) { loadout.remove(name) }
+    }
+
+    if (expanded) {
+        if (params.isEmpty()) {
+            Text(
+                text = stringResource(R.string.reshade_drawer_no_params),
+                color = TextSecondary,
+                fontSize = SettingLabelSize,
+                modifier = Modifier.padding(start = 12.dp, top = 4.dp)
+            )
+        } else {
+            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 4.dp)) {
+                Spacer(Modifier.weight(1f))
+                Text(
+                    text = stringResource(R.string.reshade_params_reset),
+                    color = AccentBlue,
+                    fontSize = SettingLabelSize,
+                    fontWeight = FontWeight.Medium,
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(6.dp))
+                        .paneNavItem(cornerRadius = 6.dp, onActivate = { resetReshadeEffectParams(loadout, name, params) }, highlightColor = NavHighlight, tapToSelect = true)
+                        .clickable { resetReshadeEffectParams(loadout, name, params) }
+                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                )
+            }
+            for (p in params) {
                 Spacer(Modifier.height(SettingItemGap))
-                Box(modifier = Modifier.alpha(if (asyncEnabled) 1f else 0.35f)) {
-                    SettingCheckbox(
-                        label = stringResource(R.string.container_wine_enabled_async),
-                        checked = state.dxvkAsync.value && asyncEnabled,
-                        onCheckedChange = { if (asyncEnabled) state.dxvkAsync.value = it }
+                ReshadeEffectParamControl(loadout, name, p)
+            }
+        }
+    }
+}
+
+@Composable
+private fun ReshadeRowIcon(
+    icon: androidx.compose.ui.graphics.vector.ImageVector,
+    enabled: Boolean,
+    onClick: () -> Unit,
+) {
+    Box(
+        modifier = Modifier
+            .size(30.dp)
+            .clip(RoundedCornerShape(6.dp))
+            .then(
+                if (!enabled) Modifier
+                else Modifier
+                    .paneNavItem(cornerRadius = 6.dp, onActivate = onClick, highlightColor = NavHighlight, tapToSelect = true)
+                    .clickable { onClick() }
+            ),
+        contentAlignment = Alignment.Center
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = if (enabled) TextSecondary else TextSecondary.copy(alpha = 0.3f),
+            modifier = Modifier.size(SettingIconSize)
+        )
+    }
+}
+
+@Composable
+private fun ReshadeModeSelector(mode: String, onChange: (String) -> Unit) {
+    Column {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            listOf(
+                ReshadeLoadout.MODE_SOLO to stringResource(R.string.reshade_mode_solo),
+                ReshadeLoadout.MODE_STACK to stringResource(R.string.reshade_mode_stack),
+            ).forEach { (value, label) ->
+                val selected = mode == value
+                Box(
+                    modifier = Modifier
+                        .weight(1f)
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(if (selected) AccentBlue.copy(alpha = 0.16f) else Color.Transparent)
+                        .border(1.dp, if (selected) AccentBlue else CardBorder, RoundedCornerShape(8.dp))
+                        .paneNavItem(cornerRadius = 8.dp, onActivate = { onChange(value) }, highlightColor = NavHighlight, tapToSelect = true)
+                        .clickable { onChange(value) }
+                        .padding(vertical = 8.dp),
+                    contentAlignment = Alignment.Center
+                ) {
+                    Text(
+                        text = label,
+                        color = if (selected) AccentBlue else TextPrimary,
+                        fontSize = SettingLabelSize,
+                        fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Normal
                     )
                 }
+            }
+        }
+        Spacer(Modifier.height(SettingTightGap))
+        Text(
+            text = if (mode == ReshadeLoadout.MODE_SOLO) stringResource(R.string.reshade_mode_solo_hint)
+            else stringResource(R.string.reshade_mode_stack_hint),
+            color = TextSecondary,
+            fontSize = SettingLabelSize
+        )
+    }
+}
 
-                // Async Cache toggle - greyed out when version doesn't support it
-                Spacer(Modifier.height(SettingTightGap))
-                Box(modifier = Modifier.alpha(if (asyncCacheEnabled) 1f else 0.35f)) {
-                    SettingCheckbox(
-                        label = stringResource(R.string.container_wine_enabled_async_cache),
-                        checked = state.dxvkAsyncCache.value && asyncCacheEnabled,
-                        onCheckedChange = { if (asyncCacheEnabled) state.dxvkAsyncCache.value = it }
-                    )
+// call on the main thread with an already-scanned list; do the disk scan off-thread.
+private fun rescanReshadeEffects(
+    state: GameSettingsStateHolder,
+    effects: List<ReshadeManager.ReshadeEffect>,
+) {
+    state.reshadeEffects.value = effects
+    state.reshadeLoadout.reconcile(effects)
+}
+
+// Restore one effect's params to its .fx defaults (re-seed with no saved overrides).
+private fun resetReshadeEffectParams(
+    loadout: ReshadeLoadoutState,
+    name: String,
+    params: List<ReshadeManager.ReshadeParam>,
+) {
+    val tmp = LinkedHashMap<String, Float>()
+    for (p in params) ReshadeManager.seedValues(p, null, tmp)
+    for ((k, v) in tmp) loadout.setParam(name, k, v)
+}
+
+private fun reshadeColorComponentLabel(c: Int, components: Int): String = when {
+    components >= 4 && c == 3 -> "A"
+    c == 0 -> "R"
+    c == 1 -> "G"
+    c == 2 -> "B"
+    else -> (c + 1).toString()
+}
+
+// values are keyed "<effect>::<uniform>" so effects sharing a uniform name never collide.
+@Composable
+private fun ReshadeEffectParamControl(
+    loadout: ReshadeLoadoutState,
+    effect: String,
+    p: ReshadeManager.ReshadeParam,
+) {
+    when (p.type) {
+        ReshadeManager.ParamType.BOOL -> {
+            val v = loadout.paramValue(effect, p.name, p.defaultValue)
+            SettingCheckbox(
+                label = p.label,
+                checked = v != 0f,
+                onCheckedChange = { loadout.setParam(effect, p.name, if (it) 1f else 0f) }
+            )
+        }
+        ReshadeManager.ParamType.COMBO -> {
+            val options = p.options ?: emptyList()
+            val v = loadout.paramValue(effect, p.name, p.defaultValue).roundToInt()
+            SettingDropdown(
+                label = p.label,
+                entries = options,
+                selectedIndex = v.coerceIn(0, (options.size - 1).coerceAtLeast(0)),
+                onSelected = { loadout.setParam(effect, p.name, it.toFloat()) }
+            )
+        }
+        ReshadeManager.ParamType.COLOR -> ReshadeEffectColorControl(loadout, effect, p)
+        ReshadeManager.ParamType.INT ->
+            ReshadeFloatSlider(
+                label = p.label,
+                value = loadout.paramValue(effect, p.name, p.defaultValue),
+                min = p.min,
+                max = p.max,
+                step = if (p.step > 0f) p.step else 1f,
+                whole = true,
+                onValueChange = { loadout.setParam(effect, p.name, it) }
+            )
+        else -> // FLOAT
+            ReshadeFloatSlider(
+                label = p.label,
+                value = loadout.paramValue(effect, p.name, p.defaultValue),
+                min = p.min,
+                max = p.max,
+                step = p.step,
+                whole = false,
+                onValueChange = { loadout.setParam(effect, p.name, it) }
+            )
+    }
+}
+
+// swatch collapses the per-channel sliders, keeping color-grading effects (many float3s) readable.
+@Composable
+private fun ReshadeEffectColorControl(
+    loadout: ReshadeLoadoutState,
+    effect: String,
+    p: ReshadeManager.ReshadeParam,
+) {
+    val expanded = remember(effect, p.name) { mutableStateOf(false) }
+
+    fun comp(c: Int): Float =
+        loadout.paramValue(effect, p.name + "_" + c, p.componentDefaults?.getOrNull(c) ?: 0f)
+    val r = comp(0)
+    val g = if (p.components > 1) comp(1) else r
+    val b = if (p.components > 2) comp(2) else r
+    val swatch = Color(r.coerceIn(0f, 1f), g.coerceIn(0f, 1f), b.coerceIn(0f, 1f))
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(8.dp))
+            .paneNavItem(
+                cornerRadius = 8.dp,
+                onActivate = { expanded.value = !expanded.value },
+                highlightColor = NavHighlight,
+                tapToSelect = true,
+            )
+            .clickable { expanded.value = !expanded.value }
+            .padding(vertical = 4.dp)
+    ) {
+        Box(
+            Modifier
+                .size(22.dp)
+                .clip(RoundedCornerShape(5.dp))
+                .background(swatch)
+                .border(1.dp, CardBorder, RoundedCornerShape(5.dp))
+        )
+        Spacer(Modifier.width(10.dp))
+        Text(
+            text = p.label,
+            color = TextPrimary,
+            fontSize = SettingLabelSize,
+            modifier = Modifier.weight(1f)
+        )
+        Icon(
+            imageVector = if (expanded.value) Icons.Outlined.KeyboardArrowUp else Icons.Outlined.KeyboardArrowDown,
+            contentDescription = null,
+            tint = TextSecondary
+        )
+    }
+    if (expanded.value) {
+        for (c in 0 until p.components) {
+            val key = p.name + "_" + c
+            Spacer(Modifier.height(SettingTightGap))
+            ReshadeFloatSlider(
+                label = reshadeColorComponentLabel(c, p.components),
+                value = loadout.paramValue(effect, key, p.componentDefaults?.getOrNull(c) ?: 0f),
+                min = 0f,
+                max = 1f,
+                step = 0.01f,
+                whole = false,
+                onValueChange = { loadout.setParam(effect, key, it) }
+            )
+        }
+    }
+}
+
+// [whole] snaps to integers (INT), otherwise snaps to [step].
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun ReshadeFloatSlider(
+    label: String,
+    value: Float,
+    min: Float,
+    max: Float,
+    step: Float,
+    whole: Boolean,
+    onValueChange: (Float) -> Unit
+) {
+    val lo = min
+    val hi = if (max > min) max else min + 1f
+    val inc = if (whole) 1f else (if (step > 0f) step else (hi - lo) / 100f)
+    val valueText = if (whole) value.roundToInt().toString()
+        else String.format(java.util.Locale.US, "%.2f", value)
+
+    fun snap(raw: Float): Float {
+        val v = when {
+            whole -> raw.roundToInt().toFloat()
+            step > 0f -> lo + Math.round((raw - lo) / step) * step
+            else -> raw
+        }
+        return v.coerceIn(lo, hi)
+    }
+
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                label,
+                color = TextSecondary,
+                fontSize = SettingLabelSize,
+                fontWeight = FontWeight.Medium,
+                letterSpacing = 0.3.sp
+            )
+            Spacer(Modifier.weight(1f))
+            Box(
+                modifier = Modifier
+                    .clip(RoundedCornerShape(6.dp))
+                    .background(AccentBlue.copy(alpha = 0.1f))
+                    .padding(horizontal = 7.dp, vertical = 2.dp)
+            ) {
+                Text(
+                    valueText,
+                    color = AccentBlue,
+                    fontSize = SettingLabelSize,
+                    fontWeight = FontWeight.SemiBold
+                )
+            }
+        }
+        Spacer(Modifier.height(SettingTightGap))
+        Slider(
+            value = value.coerceIn(lo, hi),
+            onValueChange = { onValueChange(snap(it)) },
+            valueRange = lo..hi,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(SettingSliderHeight)
+                .controllerSliderEscape()
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onAdjust = { d -> onValueChange((value + d * inc).coerceIn(lo, hi)) },
+                    highlightColor = NavHighlight,
+                ),
+            colors = settingSliderColors(),
+            track = { SettingSliderTrack(it) },
+            thumb = {
+                Box(
+                    modifier = Modifier
+                        .size(SettingSliderThumbSize)
+                        .clip(RoundedCornerShape(50))
+                        .background(AccentBlue)
+                        .border(2.dp, CardSurface, RoundedCornerShape(50))
+                )
+            }
+        )
+    }
+}
+
+
+// top-level Dialog because the settings screen is itself inside a dialog.
+@Composable
+private fun ReshadeCatalogDialog(
+    state: GameSettingsStateHolder,
+    onDismiss: () -> Unit,
+) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val mainHandler = remember { android.os.Handler(android.os.Looper.getMainLooper()) }
+
+    // own registry, registered as the parent's overlay, else items pile into the settings pane registry.
+    val parentNav = LocalPaneNav.current
+    val catalogNav = remember { PaneNavRegistry().apply { stableCursor = true } }
+    catalogNav.controllerActive = parentNav?.controllerActive == true
+    DisposableEffect(Unit) {
+        catalogNav.reset()
+        parentNav?.overlay = catalogNav
+        parentNav?.overlayClose = onDismiss
+        onDispose {
+            if (parentNav?.overlay === catalogNav) {
+                parentNav.overlay = null
+                parentNav.overlayClose = null
+            }
+        }
+    }
+
+    var catalog by remember { mutableStateOf<List<ReshadeCatalogEntry>>(emptyList()) }
+    var installed by remember { mutableStateOf(setOf<String>()) }
+    var source by remember { mutableStateOf(ReshadeCatalog.Source.NONE) }
+    var loading by remember { mutableStateOf(true) }
+    var query by remember { mutableStateOf("") }
+    var downloadingId by remember { mutableStateOf<String?>(null) }
+    var phaseLabel by remember { mutableStateOf("") }
+    var progress by remember { mutableStateOf(0f) }
+    var errorMsg by remember { mutableStateOf<String?>(null) }
+    var pendingDelete by remember { mutableStateOf<ReshadeCatalogEntry?>(null) }
+    // id of the just-downloaded row; it must be the sole nav entry (it also gates Done's isEntry) or two
+    // entries fight over the cursor.
+    var refocusId by remember { mutableStateOf<String?>(null) }
+    var reseatPending by remember { mutableStateOf(false) }
+
+    // separate window, so UnifiedActivity.dispatchKeyEvent never sees its D-pad events; the root holds
+    // focus and previews them into catalogNav instead of letting default focus traversal take them.
+    val rootFocus = remember { FocusRequester() }
+    // hoisted out of ReshadeCatalogSearchField so the preview handler can stand down while typing.
+    var searchEditing by remember { mutableStateOf(false) }
+
+    LaunchedEffect(searchEditing) {
+        if (!searchEditing) runCatching { rootFocus.requestFocus() }
+    }
+
+    val downloadingLabel = stringResource(R.string.reshade_catalog_downloading)
+    val installingLabel = stringResource(R.string.reshade_catalog_installing)
+
+    LaunchedEffect(Unit) {
+        val result = withContext(Dispatchers.IO) { ReshadeCatalog.loadCached(context) }
+        catalog = result.entries
+        source = result.source
+        installed = withContext(Dispatchers.IO) { ReshadeManager.scanEffectNames(context).toSet() }
+        loading = false
+    }
+
+    // Only a live NETWORK load can fetch not-yet-installed effects; CACHE/NONE = offline.
+    val offline = source != ReshadeCatalog.Source.NETWORK
+
+    val inLoadout = state.reshadeLoadout.order.toSet()
+
+    // catalog entries plus locally-installed effects absent from the catalog (user-dropped).
+    val groups = remember(catalog, installed, query) {
+        val q = query.trim()
+        val catIds = catalog.map { it.id }.toSet()
+        val extras = installed.filter { it !in catIds }
+            .map { ReshadeCatalogEntry(it, it, "", "Installed", "", "", "", 0L, "", 1) }
+        val all = (catalog + extras).filter { e ->
+            q.isEmpty() || e.name.contains(q, true) || e.author.contains(q, true) || e.category.contains(q, true)
+        }
+        val byName = compareBy<ReshadeCatalogEntry> { it.name.lowercase() }
+        Pair(
+            all.filter { it.id in installed }.sortedWith(byName),
+            all.filter { it.id !in installed }.sortedWith(byName),
+        )
+    }
+    val installedRows = groups.first
+    val availableRows = groups.second
+
+    // one-shot re-seat of the nav cursor onto the downloaded row after it re-composes under Installed;
+    // refocusId is deliberately kept so that row stays the entry until the next download.
+    LaunchedEffect(reseatPending, installedRows) {
+        val id = refocusId ?: return@LaunchedEffect
+        if (reseatPending && installedRows.any { it.id == id }) {
+            catalogNav.reset()
+            reseatPending = false
+        }
+    }
+
+    fun startDownload(entry: ReshadeCatalogEntry) {
+        downloadingId = entry.id
+        phaseLabel = downloadingLabel; progress = 0f; errorMsg = null
+        scope.launch {
+            val ok = ReshadeDownloader.install(context, entry) { phase, f ->
+                mainHandler.post {
+                    phaseLabel = if (phase == ReshadeDownloader.Phase.EXTRACT) installingLabel else downloadingLabel
+                    progress = f
                 }
+            }
+            downloadingId = null
+            if (ok) {
+                installed = installed + entry.id
+                val effects = withContext(Dispatchers.IO) { ReshadeManager.scanEffects(context) }
+                rescanReshadeEffects(state, effects)
+                effects.firstOrNull { it.name.equals(entry.id, ignoreCase = true) || it.name.equals(entry.name, ignoreCase = true) }
+                    ?.let { state.reshadeLoadout.add(it, null) }
+                refocusId = entry.id
+                reseatPending = true
+            } else {
+                errorMsg = context.getString(R.string.reshade_catalog_download_failed, entry.name)
+            }
+        }
+    }
 
-                Spacer(Modifier.height(SettingItemGap))
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false)
+    ) {
+      CompositionLocalProvider(LocalPaneNav provides catalogNav) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth(0.92f)
+                .fillMaxHeight(0.86f)
+                .clip(RoundedCornerShape(SettingGroupCorner))
+                .background(ContentBg)
+                .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
+                // onPreviewKeyEvent must sit before focusRequester/focusable or the keys go elsewhere.
+                .onPreviewKeyEvent { ev ->
+                    if (ev.type != KeyEventType.KeyDown) return@onPreviewKeyEvent false
+                    // while editing, let the field consume typing + directions; only B/Back exits editing.
+                    if (searchEditing) {
+                        return@onPreviewKeyEvent when (ev.key) {
+                            Key.ButtonB, Key.Back -> { searchEditing = false; true }
+                            else -> false
+                        }
+                    }
+                    when (ev.key) {
+                        Key.DirectionUp -> { catalogNav.navDir(PANE_DIR_UP); true }
+                        Key.DirectionDown -> { catalogNav.navDir(PANE_DIR_DOWN); true }
+                        Key.DirectionLeft -> { catalogNav.navDir(PANE_DIR_LEFT); true }
+                        Key.DirectionRight -> { catalogNav.navDir(PANE_DIR_RIGHT); true }
+                        Key.ButtonA, Key.Enter, Key.NumPadEnter, Key.DirectionCenter -> {
+                            catalogNav.navDir(PANE_DIR_ACTIVATE); true
+                        }
+                        Key.ButtonB, Key.Back -> { onDismiss(); true }
+                        else -> false
+                    }
+                }
+                .focusRequester(rootFocus)
+                .focusable()
+                .padding(16.dp)
+        ) {
+            Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    stringResource(R.string.reshade_catalog_title),
+                    color = TextPrimary,
+                    fontSize = 15.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    modifier = Modifier.weight(1f)
+                )
+                Box(
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(8.dp))
+                        .clickable(onClick = onDismiss)
+                        .padding(6.dp),
+                    contentAlignment = Alignment.Center
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Close,
+                        contentDescription = stringResource(R.string.reshade_catalog_done),
+                        tint = TextSecondary,
+                        modifier = Modifier.size(20.dp)
+                    )
+                }
+            }
 
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_ddraw_wrapper),
-                    entries = state.dxvkDdrawWrapperEntries.value,
-                    selectedIndex = state.dxvkSelectedDdrawWrapper.intValue,
-                    onSelected = { state.dxvkSelectedDdrawWrapper.intValue = it }
+            if (offline && !loading) {
+                Spacer(Modifier.height(6.dp))
+                Text(
+                    stringResource(
+                        if (source == ReshadeCatalog.Source.CACHE) R.string.reshade_catalog_offline_cache
+                        else R.string.reshade_catalog_offline_none
+                    ),
+                    color = WarningAmber,
+                    fontSize = SettingLabelSize
                 )
             }
+
+            Spacer(Modifier.height(10.dp))
+            ReshadeCatalogSearchField(
+                query = query,
+                onQueryChange = { query = it },
+                editing = searchEditing,
+                onEditingChange = { searchEditing = it },
+            )
+            Spacer(Modifier.height(8.dp))
+
+            errorMsg?.let {
+                Text(it, color = DangerRed, fontSize = SettingLabelSize, modifier = Modifier.padding(vertical = 4.dp))
+            }
+
+            if (loading) {
+                Box(Modifier.fillMaxWidth().weight(1f), contentAlignment = Alignment.Center) {
+                    Text(stringResource(R.string.reshade_catalog_downloading), color = TextSecondary, fontSize = SettingValueSize)
+                }
+            } else {
+                // NOT LazyColumn: it only composes visible rows, so paneNav can't register past them.
+                Column(
+                    Modifier
+                        .fillMaxWidth()
+                        .weight(1f)
+                        .verticalScroll(rememberScrollState())
+                ) {
+                    if (installedRows.isNotEmpty()) {
+                        ReshadeGroupHeader(stringResource(R.string.reshade_catalog_installed, installedRows.size))
+                        installedRows.forEach { entry ->
+                            key("i_${entry.id}") {
+                                val effect = state.reshadeEffects.value.firstOrNull {
+                                    it.name.equals(entry.id, ignoreCase = true) || it.name.equals(entry.name, ignoreCase = true)
+                                }
+                                val member = effect != null && state.reshadeLoadout.contains(effect.name)
+                                ReshadeCatalogRow(
+                                    entry = entry,
+                                    isInstalled = true,
+                                    isSelected = member,
+                                    isBusy = downloadingId == entry.id,
+                                    offline = offline,
+                                    phaseLabel = if (downloadingId == entry.id) phaseLabel else "",
+                                    progress = if (downloadingId == entry.id) progress else null,
+                                    installingLabel = installingLabel,
+                                    isEntry = entry.id == refocusId,
+                                    onClick = {
+                                        // stays open so several effects can be added in one pass.
+                                        if (effect != null) {
+                                            when {
+                                                member -> state.reshadeLoadout.remove(effect.name)
+                                                state.reshadeLoadout.isFull() ->
+                                                    errorMsg = context.getString(R.string.reshade_loadout_full)
+                                                else -> state.reshadeLoadout.add(effect, null)
+                                            }
+                                        }
+                                    },
+                                    onDelete = { pendingDelete = entry }
+                                )
+                            }
+                        }
+                    }
+                    if (availableRows.isNotEmpty()) {
+                        ReshadeGroupHeader(stringResource(R.string.reshade_catalog_available, availableRows.size))
+                        availableRows.forEach { entry ->
+                            key("a_${entry.id}") {
+                                ReshadeCatalogRow(
+                                    entry = entry,
+                                    isInstalled = false,
+                                    isSelected = false,
+                                    isBusy = downloadingId == entry.id,
+                                    offline = offline,
+                                    phaseLabel = if (downloadingId == entry.id) phaseLabel else "",
+                                    progress = if (downloadingId == entry.id) progress else null,
+                                    installingLabel = installingLabel,
+                                    onClick = {
+                                        when {
+                                            downloadingId != null -> {}                 // one at a time
+                                            offline -> errorMsg = context.getString(R.string.reshade_catalog_needs_connection)
+                                            else -> startDownload(entry)
+                                        }
+                                    }
+                                )
+                            }
+                        }
+                    }
+                    if (installedRows.isEmpty() && availableRows.isEmpty()) {
+                        Text(
+                            if (query.isNotBlank()) stringResource(R.string.reshade_catalog_empty_query, query)
+                            else stringResource(R.string.reshade_catalog_empty),
+                            color = TextSecondary,
+                            fontSize = SettingValueSize,
+                            modifier = Modifier.padding(24.dp)
+                        )
+                    }
+                }
+            }
+        }
+      }
+    }
+
+    pendingDelete?.let { entry ->
+        AlertDialog(
+            onDismissRequest = { pendingDelete = null },
+            title = { Text(stringResource(R.string.reshade_catalog_delete_title, entry.name)) },
+            text = { Text(stringResource(R.string.reshade_catalog_delete_body)) },
+            confirmButton = {
+                TextButton(onClick = {
+                    val id = entry.id
+                    pendingDelete = null
+                    scope.launch {
+                        val ok = withContext(Dispatchers.IO) { ReshadeManager.deleteEffect(context, id) }
+                        if (ok) {
+                            installed = installed - id                 // row drops back to "Available"
+                            val effects = withContext(Dispatchers.IO) { ReshadeManager.scanEffects(context) }
+                            state.reshadeLoadout.order
+                                .filter { it.equals(id, ignoreCase = true) || it.equals(entry.name, ignoreCase = true) }
+                                .toList()
+                                .forEach { state.reshadeLoadout.remove(it) }
+                            rescanReshadeEffects(state, effects)
+                        } else {
+                            errorMsg = context.getString(R.string.reshade_catalog_delete_failed, entry.name)
+                        }
+                    }
+                }) {
+                    Text(stringResource(R.string.reshade_catalog_delete_confirm), color = DangerRed)
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { pendingDelete = null }) {
+                    Text(stringResource(R.string.reshade_catalog_delete_cancel))
+                }
+            },
+        )
+    }
+}
+
+@Composable
+private fun ReshadeCatalogSearchField(
+    query: String,
+    onQueryChange: (String) -> Unit,
+    editing: Boolean,
+    onEditingChange: (Boolean) -> Unit,
+) {
+    val keyboard = LocalSoftwareKeyboardController.current
+    val focusRequester = remember { FocusRequester() }
+    val tapInteraction = remember { MutableInteractionSource() }
+    // focusable only while explicitly editing; otherwise a recompose that disposes the focused node
+    // hands IME focus here and pops the keyboard.
+    LaunchedEffect(editing) {
+        if (editing) {
+            runCatching { focusRequester.requestFocus() }
+            keyboard?.show()
+        }
+    }
+    BasicTextField(
+        value = query,
+        onValueChange = onQueryChange,
+        textStyle = TextStyle(color = TextPrimary, fontSize = SettingValueSize),
+        cursorBrush = SolidColor(AccentBlue),
+        singleLine = true,
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(EnvVarControlHeight)
+            .paneNavItem(cornerRadius = 8.dp, onActivate = { onEditingChange(true) }, highlightColor = NavHighlight)
+            .focusRequester(focusRequester)
+            .focusProperties { canFocus = editing }
+            .onFocusChanged { if (!it.isFocused) onEditingChange(false) }
+            .controllerTextFieldEscape(),
+        decorationBox = { innerTextField ->
+            Row(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .clip(RoundedCornerShape(8.dp))
+                    .background(InputSurface)
+                    .border(1.dp, InputBorder, RoundedCornerShape(8.dp))
+                    // tap must arm editing first, since canFocus is gated off until then.
+                    .clickable(interactionSource = tapInteraction, indication = null) { onEditingChange(true) }
+                    .padding(horizontal = SettingFieldHorizontalPadding),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Icon(Icons.Outlined.Search, contentDescription = null, tint = TextDim, modifier = Modifier.size(SettingIconSize))
+                Spacer(Modifier.width(8.dp))
+                Box(Modifier.weight(1f)) {
+                    if (query.isEmpty()) {
+                        Text(stringResource(R.string.reshade_catalog_search), color = TextDim, fontSize = SettingValueSize)
+                    }
+                    innerTextField()
+                }
+                if (query.isNotEmpty()) {
+                    Icon(
+                        Icons.Outlined.Close, contentDescription = null, tint = TextDim,
+                        modifier = Modifier
+                            .size(SettingIconSize)
+                            .paneNavItem(cornerRadius = 6.dp, onActivate = { onQueryChange("") }, highlightColor = NavHighlight)
+                            .clickable { onQueryChange("") }
+                    )
+                }
+            }
         }
-    }
+    )
 }
 
-// ===================================================================
-// WineD3D Configuration Card
-// ===================================================================
 @Composable
-private fun WineD3DConfigCard(state: GameSettingsStateHolder) {
-    val expanded by state.wined3dConfigExpanded
+private fun ReshadeGroupHeader(text: String) {
+    Text(
+        text,
+        color = TextSecondary,
+        fontSize = SettingSectionLabelSize,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = 0.5.sp,
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 8.dp)
+    )
+}
 
+@Composable
+private fun ReshadeCatalogRow(
+    entry: ReshadeCatalogEntry,
+    isInstalled: Boolean,
+    isSelected: Boolean,
+    isBusy: Boolean,
+    offline: Boolean,
+    phaseLabel: String,
+    progress: Float?,
+    installingLabel: String,
+    isEntry: Boolean = false,
+    onClick: () -> Unit,
+    onDelete: (() -> Unit)? = null,
+) {
     Column(
-        modifier = Modifier
+        Modifier
             .fillMaxWidth()
-            .clip(RoundedCornerShape(SettingGroupCorner))
+            .padding(bottom = 8.dp)
+            .clip(RoundedCornerShape(12.dp))
             .background(CardSurface)
-            .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
+            .border(1.dp, CardBorder, RoundedCornerShape(12.dp))
+            .paneNavItem(cornerRadius = 12.dp, onActivate = { if (!isBusy) onClick() }, isEntry = isEntry, highlightColor = NavHighlight)
+            .clickable(enabled = !isBusy, onClick = onClick)
+            .padding(horizontal = 14.dp, vertical = 11.dp)
     ) {
-        // Header row
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable { state.wined3dConfigExpanded.value = !expanded }
-                .padding(SettingGroupPadding),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Icon(
-                Icons.Outlined.Tune,
-                contentDescription = null,
-                tint = AccentBlue,
-                modifier = Modifier.size(SettingIconSize)
-            )
-            Spacer(Modifier.width(8.dp))
-            Text(
-                stringResource(R.string.container_wine_wined3d_config_title),
-                color = TextPrimary,
-                fontSize = SettingValueSize,
-                fontWeight = FontWeight.Medium,
-                modifier = Modifier.weight(1f)
-            )
-            Icon(
-                if (expanded) Icons.Outlined.KeyboardArrowUp else Icons.Outlined.KeyboardArrowDown,
-                contentDescription = null,
-                tint = TextDim,
-                modifier = Modifier.size(SettingIconSize)
-            )
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+            Column(Modifier.weight(1f)) {
+                Text(entry.name, color = TextPrimary, fontSize = SettingValueSize, fontWeight = FontWeight.Medium, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                val sub = buildString {
+                    if (entry.category.isNotBlank()) append(entry.category)
+                    if (entry.author.isNotBlank()) { if (isNotEmpty()) append(" · "); append(entry.author) }
+                    if (entry.license.isNotBlank()) { if (isNotEmpty()) append(" · "); append(entry.license) }
+                }
+                if (sub.isNotBlank()) {
+                    Text(sub, color = TextSecondary, fontSize = SettingLabelSize, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                }
+                if (entry.description.isNotBlank()) {
+                    Text(entry.description, color = TextDim, fontSize = SettingLabelSize, maxLines = 2, overflow = TextOverflow.Ellipsis)
+                }
+            }
+            if (!isBusy) {
+                Spacer(Modifier.width(10.dp))
+                when {
+                    isInstalled && onDelete != null -> {
+                        if (isSelected) {
+                            Icon(Icons.Outlined.Check, contentDescription = null, tint = AccentBlue, modifier = Modifier.size(18.dp))
+                            Spacer(Modifier.width(8.dp))
+                        }
+                        Box(
+                            modifier = Modifier
+                                .size(30.dp)
+                                .clip(RoundedCornerShape(8.dp))
+                                .background(DangerRed.copy(alpha = 0.14f))
+                                .border(1.dp, DangerRed.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                                .paneNavItem(cornerRadius = 8.dp, onActivate = onDelete, highlightColor = NavHighlight, tapToSelect = true)
+                                .clickable(onClick = onDelete),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            Icon(
+                                Icons.Filled.Delete,
+                                contentDescription = stringResource(R.string.reshade_catalog_delete_cd, entry.name),
+                                tint = DangerRed,
+                                modifier = Modifier.size(16.dp)
+                            )
+                        }
+                    }
+                    offline -> Icon(Icons.Outlined.CloudOff, contentDescription = null, tint = TextDim, modifier = Modifier.size(18.dp))
+                    else -> {
+                        Row(
+                            modifier = Modifier
+                                .clip(RoundedCornerShape(8.dp))
+                                .background(AccentBlue.copy(alpha = 0.14f))
+                                .border(1.dp, AccentBlue.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                                .padding(horizontal = 8.dp, vertical = 4.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Icon(Icons.Outlined.Download, contentDescription = null, tint = AccentBlue, modifier = Modifier.size(12.dp))
+                            Spacer(Modifier.width(4.dp))
+                            Text(stringResource(R.string.common_ui_download), color = AccentBlue, fontSize = 10.sp, fontWeight = FontWeight.Medium)
+                        }
+                    }
+                }
+            }
         }
-
-        // Expandable content
-        AnimatedVisibility(
-            visible = expanded,
-            enter = expandVertically(),
-            exit = shrinkVertically()
-        ) {
-            Column(
-                modifier = Modifier
+        if (isBusy) {
+            Spacer(Modifier.height(6.dp))
+            val frac = progress?.coerceIn(0f, 1f) ?: 0f
+            val barColor = if (phaseLabel == installingLabel) Color(0xFF4CAF50) else AccentBlue
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(phaseLabel, color = TextSecondary, fontSize = SettingLabelSize)
+                Text("${(frac * 100).toInt()}%", color = TextSecondary, fontSize = SettingLabelSize)
+            }
+            Spacer(Modifier.height(3.dp))
+            Box(
+                Modifier
                     .fillMaxWidth()
-                    .padding(start = 12.dp, end = 12.dp, bottom = 12.dp)
+                    .height(4.dp)
+                    .clip(RoundedCornerShape(2.dp))
+                    .background(SliderInactive)
             ) {
-                Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_csmt),
-                    entries = state.wined3dCsmtEntries.value,
-                    selectedIndex = state.wined3dSelectedCsmt.intValue,
-                    onSelected = { state.wined3dSelectedCsmt.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_gpu_name),
-                    entries = state.wined3dGpuNameEntries.value,
-                    selectedIndex = state.wined3dSelectedGpuName.intValue,
-                    onSelected = { state.wined3dSelectedGpuName.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_video_memory_size),
-                    entries = state.wined3dVideoMemorySizeEntries.value,
-                    selectedIndex = state.wined3dSelectedVideoMemorySize.intValue,
-                    onSelected = { state.wined3dSelectedVideoMemorySize.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_strict_shader_math),
-                    entries = state.wined3dStrictShaderMathEntries.value,
-                    selectedIndex = state.wined3dSelectedStrictShaderMath.intValue,
-                    onSelected = { state.wined3dSelectedStrictShaderMath.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_wine_offscreen_rendering_mode),
-                    entries = state.wined3dOffscreenRenderingModeEntries.value,
-                    selectedIndex = state.wined3dSelectedOffscreenRenderingMode.intValue,
-                    onSelected = { state.wined3dSelectedOffscreenRenderingMode.intValue = it }
-                )
-
-                Spacer(Modifier.height(SettingItemGap))
-
-                SettingDropdown(
-                    label = stringResource(R.string.container_config_renderer),
-                    entries = state.wined3dRendererEntries.value,
-                    selectedIndex = state.wined3dSelectedRenderer.intValue,
-                    onSelected = { state.wined3dSelectedRenderer.intValue = it }
+                Box(
+                    Modifier
+                        .fillMaxWidth(frac)
+                        .height(4.dp)
+                        .clip(RoundedCornerShape(2.dp))
+                        .background(barColor)
                 )
             }
         }
     }
 }
 
-// ===================================================================
-// Section: Steam (conditional)
-// ===================================================================
 @Composable
 private fun SteamSection(state: GameSettingsStateHolder) {
 
-    SubsectionLabel(stringResource(R.string.steam_section_emulator))
+    // Steam Launcher is the default path; enabling it unchecks every other Steam mode (mutually exclusive launch paths).
+    val onSteamLauncherChange: (Boolean) -> Unit = { enabled ->
+        state.steamLauncher.value = enabled
+        if (enabled) {
+            state.useLegacyLauncher.value = false
+            state.runtimePatcher.value = false
+            state.steamOfflineMode.value = false
+        }
+    }
+
+    SubsectionLabel(stringResource(R.string.steam_section_real_client))
     Spacer(Modifier.height(8.dp))
     SettingGroup {
         SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_use_cold_client),
-            checked = state.useColdClient.value,
-            onCheckedChange = {
-                state.useColdClient.value = it
-                // Cold Client and Launch Steam Client are mutually exclusive —
-                // they use different Steam DLL setups that can't coexist at runtime.
-                if (it) state.launchRealSteam.value = false
-            }
+            label = "Steam Launcher",
+            checked = state.steamLauncher.value,
+            onCheckedChange = onSteamLauncherChange
         )
         Spacer(Modifier.height(4.dp))
         Text(
-            stringResource(R.string.shortcuts_properties_use_cold_client_description),
+            "Run the game through the in-Wine Steam Launcher (recommended). Disables other Steam launch modes.",
             color = TextDim,
             fontSize = 11.sp,
             lineHeight = 16.sp
         )
-        Spacer(Modifier.height(SettingItemGap))
+    }
 
-        SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_use_steam_input),
-            checked = state.useSteamInput.value,
-            onCheckedChange = { state.useSteamInput.value = it }
-        )
-        Spacer(Modifier.height(SettingItemGap))
+    Spacer(Modifier.height(SettingItemGap))
 
+    SubsectionLabel(stringResource(R.string.steam_section_emulator))
+    Spacer(Modifier.height(8.dp))
+    SettingGroup {
         SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_force_dlc),
-            checked = state.forceDlc.value,
-            onCheckedChange = { state.forceDlc.value = it }
+            label = stringResource(R.string.shortcuts_properties_use_legacy_launcher),
+            checked = state.useLegacyLauncher.value,
+            onCheckedChange = {
+                state.useLegacyLauncher.value = it
+                if (it) {
+                    state.steamLauncher.value = false
+                }
+            }
         )
         Spacer(Modifier.height(4.dp))
         Text(
-            stringResource(R.string.shortcuts_properties_force_dlc_description),
+            stringResource(R.string.shortcuts_properties_use_legacy_launcher_description),
             color = TextDim,
             fontSize = 11.sp,
             lineHeight = 16.sp
         )
         Spacer(Modifier.height(SettingItemGap))
 
+        // Use Steam Input — hidden in the UI for now (state/persistence kept intact).
+        /*
         SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_steam_offline_mode),
-            checked = state.steamOfflineMode.value,
-            onCheckedChange = { state.steamOfflineMode.value = it }
+            label = stringResource(R.string.shortcuts_properties_use_steam_input),
+            checked = state.useSteamInput.value,
+            onCheckedChange = {
+                state.useSteamInput.value = it
+                if (it) state.steamLauncher.value = false
+            }
         )
         Spacer(Modifier.height(SettingItemGap))
+        */
 
         SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_unpack_files),
-            checked = state.unpackFiles.value,
+            label = stringResource(R.string.shortcuts_properties_steam_offline_mode),
+            checked = state.steamOfflineMode.value,
             onCheckedChange = {
-                state.unpackFiles.value = it
-                // Unpack Files swaps the on-disk exe with a Steamless-stripped copy —
-                // incompatible with the original-exe launch Real Steam does via -applaunch.
-                if (it) state.launchRealSteam.value = false
-            }
+                state.steamOfflineMode.value = it
+                if (it) state.steamLauncher.value = false
+            },
+            enabled = state.useLegacyLauncher.value
         )
         Spacer(Modifier.height(4.dp))
         Text(
-            stringResource(R.string.shortcuts_properties_unpack_files_description),
+            stringResource(R.string.shortcuts_properties_steam_offline_mode_description),
             color = TextDim,
             fontSize = 11.sp,
-            lineHeight = 16.sp
+            lineHeight = 16.sp,
+            modifier = Modifier.alpha(if (state.useLegacyLauncher.value) 1f else 0.4f)
         )
         Spacer(Modifier.height(SettingItemGap))
 
@@ -1888,64 +3296,24 @@ private fun SteamSection(state: GameSettingsStateHolder) {
             checked = state.runtimePatcher.value,
             onCheckedChange = {
                 state.runtimePatcher.value = it
-                // Runtime DRM Patcher injects Goldberg DLLs into the game at launch —
-                // Real Steam talks to the actual Steam client and doesn't want emulated
-                // steamclient DLLs poking around in its address space.
-                if (it) state.launchRealSteam.value = false
-            }
-        )
-        Spacer(Modifier.height(4.dp))
-        Text(
-            stringResource(R.string.shortcuts_properties_runtime_patcher_description),
-            color = TextDim,
-            fontSize = 11.sp,
-            lineHeight = 16.sp
-        )
-    }
-
-    Spacer(Modifier.height(SettingItemGap))
-
-    SubsectionLabel(stringResource(R.string.steam_section_real_client))
-    Spacer(Modifier.height(8.dp))
-    SettingGroup {
-        SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_launch_steam_client_beta),
-            checked = state.launchRealSteam.value,
-            onCheckedChange = {
-                state.launchRealSteam.value = it
-                // Launch Steam Client runs the game through the real Steam client's
-                // -applaunch pipeline. Cold Client, Unpack Files, and Runtime DRM
-                // Patcher all conflict with that path — disable when this one is on.
                 if (it) {
-                    state.useColdClient.value = false
-                    state.unpackFiles.value = false
-                    state.runtimePatcher.value = false
+                    state.steamLauncher.value = false
                 }
-            }
+            },
+            enabled = state.useLegacyLauncher.value
         )
         Spacer(Modifier.height(4.dp))
         Text(
-            stringResource(R.string.shortcuts_properties_launch_steam_client_description),
+            stringResource(R.string.shortcuts_properties_runtime_patcher_description),
             color = TextDim,
             fontSize = 11.sp,
-            lineHeight = 16.sp
+            lineHeight = 16.sp,
+            modifier = Modifier.alpha(if (state.useLegacyLauncher.value) 1f else 0.4f)
         )
-        Spacer(Modifier.height(SettingItemGap))
-
-        if (state.steamTypeEntries.value.isNotEmpty()) {
-            SettingDropdown(
-                label = stringResource(R.string.shortcuts_properties_steam_type),
-                entries = state.steamTypeEntries.value,
-                selectedIndex = state.selectedSteamType.intValue,
-                onSelected = { state.selectedSteamType.intValue = it }
-            )
-        }
     }
 }
 
-// ===================================================================
 // Section 3: Wine
-// ===================================================================
 @Composable
 private fun WineSection(
     state: GameSettingsStateHolder,
@@ -1978,6 +3346,7 @@ private fun WineSection(
                         .clip(RoundedCornerShape(8.dp))
                         .background(InputSurface)
                         .border(1.dp, InputBorder, RoundedCornerShape(8.dp))
+                        .paneNavItem(cornerRadius = 8.dp, onActivate = { showLocalePicker = true }, highlightColor = NavHighlight)
                         .smartDropdownAnchor(offset = localeMenuOffset) { showLocalePicker = true },
                     contentAlignment = Alignment.Center
                 ) {
@@ -2012,7 +3381,6 @@ private fun WineSection(
         }
     }
 
-    // Desktop Theme
     if (state.desktopThemeEntries.value.isNotEmpty()) {
         Spacer(Modifier.height(SettingItemGap))
         SettingGroup {
@@ -2032,11 +3400,10 @@ private fun WineSection(
                     onSelected = { state.selectedDesktopBackgroundType.intValue = it }
                 )
 
-                val typeEntries = state.desktopBackgroundTypeEntries.value
-                val selectedType = typeEntries.getOrNull(state.selectedDesktopBackgroundType.intValue)
-                    ?.lowercase() ?: ""
-                when (selectedType) {
-                    "color" -> {
+                val bgType = WineThemeManager.BackgroundType.values()
+                    .getOrNull(state.selectedDesktopBackgroundType.intValue)
+                when (bgType) {
+                    WineThemeManager.BackgroundType.COLOR -> {
                         Spacer(Modifier.height(SettingItemGap))
                         Row(
                             modifier = Modifier.fillMaxWidth(),
@@ -2064,7 +3431,7 @@ private fun WineSection(
                             )
                         }
                     }
-                    "image" -> {
+                    WineThemeManager.BackgroundType.IMAGE -> {
                         Spacer(Modifier.height(SettingItemGap))
                         Row(
                             modifier = Modifier
@@ -2073,6 +3440,12 @@ private fun WineSection(
                                 .border(1.dp, InputBorder, RoundedCornerShape(SettingFieldCorner))
                                 .background(InputSurface)
                                 .clickable { callbacks.onPickWallpaper() }
+                                .paneNavItem(
+                                    cornerRadius = SettingFieldCorner,
+                                    onActivate = { callbacks.onPickWallpaper() },
+                                    highlightColor = NavHighlight,
+                                    tapToSelect = true,
+                                )
                                 .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
@@ -2096,6 +3469,7 @@ private fun WineSection(
                             }
                         }
                     }
+                    else -> {}
                 }
             }
         }
@@ -2114,61 +3488,88 @@ private fun WineSection(
     }
 }
 
-// ===================================================================
-// Section 4: Components
-// ===================================================================
 @Composable
 private fun ComponentsSection(
     state: GameSettingsStateHolder,
     callbacks: GameSettingsCallbacks
 ) {
 
-    // DirectX components
     if (state.directXComponents.value.isNotEmpty()) {
         SubsectionLabel(stringResource(R.string.container_wine_directx))
         Spacer(Modifier.height(8.dp))
         SettingGroup {
-            state.directXComponents.value.forEachIndexed { index, component ->
-                if (index > 0) Spacer(Modifier.height(SettingItemGap))
-                SettingDropdown(
-                    label = component.label,
-                    entries = state.winComponentEntries.value,
-                    selectedIndex = component.selectedIndex,
-                    onSelected = { newVal ->
-                        callbacks.onUpdateWinComponent(true, index, newVal)
+            val items = state.directXComponents.value
+            items.chunked(2).forEachIndexed { rowIndex, pair ->
+                if (rowIndex > 0) Spacer(Modifier.height(SettingItemGap))
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    pair.forEachIndexed { colIndex, component ->
+                        val index = rowIndex * 2 + colIndex
+                        Box(Modifier.weight(1f)) {
+                            SettingDropdown(
+                                label = component.label,
+                                entries = state.winComponentEntries.value,
+                                selectedIndex = component.selectedIndex,
+                                onSelected = { newVal ->
+                                    callbacks.onUpdateWinComponent(true, index, newVal)
+                                }
+                            )
+                        }
                     }
-                )
+                    if (pair.size == 1) Box(Modifier.weight(1f))
+                }
             }
         }
         Spacer(Modifier.height(SettingSectionGap))
     }
 
-    // General components
     if (state.generalComponents.value.isNotEmpty()) {
         SubsectionLabel(stringResource(R.string.settings_general_title))
         Spacer(Modifier.height(8.dp))
         SettingGroup {
-            state.generalComponents.value.forEachIndexed { index, component ->
-                if (index > 0) Spacer(Modifier.height(SettingItemGap))
-                SettingDropdown(
-                    label = component.label,
-                    entries = state.winComponentEntries.value,
-                    selectedIndex = component.selectedIndex,
-                    onSelected = { newVal ->
-                        callbacks.onUpdateWinComponent(false, index, newVal)
+            val items = state.generalComponents.value
+            val showZink = state.isArm64EC.value
+            val totalCells = items.size + if (showZink) 1 else 0
+            val rowCount = (totalCells + 1) / 2
+            for (rowIndex in 0 until rowCount) {
+                if (rowIndex > 0) Spacer(Modifier.height(SettingItemGap))
+                Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                    for (colIndex in 0..1) {
+                        val cell = rowIndex * 2 + colIndex
+                        Box(Modifier.weight(1f)) {
+                            if (cell < items.size) {
+                                val component = items[cell]
+                                SettingDropdown(
+                                    label = component.label,
+                                    entries = state.winComponentEntries.value,
+                                    selectedIndex = component.selectedIndex,
+                                    onSelected = { newVal ->
+                                        callbacks.onUpdateWinComponent(false, cell, newVal)
+                                    }
+                                )
+                            } else if (cell == items.size && showZink) {
+                                SettingDropdown(
+                                    label = stringResource(R.string.container_zink_mode),
+                                    entries = state.zinkModeEntries.value,
+                                    selectedIndex = state.selectedZinkMode.intValue,
+                                    onSelected = { state.selectedZinkMode.intValue = it }
+                                )
+                            }
+                        }
                     }
-                )
+                }
             }
         }
     }
 }
 
-// ===================================================================
-// Section 5: Variables
-// ===================================================================
 private fun findKnownEnvVar(name: String): Array<String>? =
     EnvVarsView.knownEnvVars.firstOrNull { it[0] == name }
 
+private fun defaultValueForEnvVar(name: String): String? {
+    val known = findKnownEnvVar(name) ?: return null
+    return if (known.getOrNull(1) == "TEXT") known.getOrNull(2) else null
+}
+
 @Composable
 private fun VariablesSection(
     state: GameSettingsStateHolder,
@@ -2177,6 +3578,23 @@ private fun VariablesSection(
     val isContainer = state.isContainerEditMode.value
     val hasDraftEnvVar = state.envVars.value.any { it.key.isBlank() }
 
+    // Ensure the required toggles exist upon entering the variables section
+    LaunchedEffect(Unit) {
+        val current = state.envVars.value.toMutableList()
+        var changed = false
+        if (current.none { it.key == "WINEESYNC" }) {
+            current.add(EnvVarItem("WINEESYNC", "1"))
+            changed = true
+        }
+        if (current.none { it.key == "WINENTSYNC" }) {
+            current.add(EnvVarItem("WINENTSYNC", "0"))
+            changed = true
+        }
+        if (changed) {
+            state.envVars.value = current
+        }
+    }
+
     if (isContainer) {
         SubsectionLabel(stringResource(R.string.container_config_variables))
         Spacer(Modifier.height(8.dp))
@@ -2205,17 +3623,14 @@ private fun VariablesSection(
                 EnvVarRow(
                     name = envVar.key,
                     value = envVar.value,
-                    excludeOtherNames = state.envVars.value
-                        .filterIndexed { i, _ -> i != index }
-                        .map { it.key }
-                        .toSet(),
                     onNameChange = { newKey ->
                         val normalizedKey = newKey.trim()
                         val list = state.envVars.value.toMutableList()
-                        val isUnique = normalizedKey.isEmpty() ||
-                            state.envVars.value.none { it.key == normalizedKey }
-                        if (index in list.indices && isUnique) {
-                            list[index] = EnvVarItem(normalizedKey, envVar.value)
+                        if (index in list.indices) {
+                            val newValue = envVar.value.ifBlank {
+                                defaultValueForEnvVar(normalizedKey) ?: ""
+                            }
+                            list[index] = EnvVarItem(normalizedKey, newValue)
                             state.envVars.value = list
                         }
                     },
@@ -2231,7 +3646,6 @@ private fun VariablesSection(
 
         Spacer(Modifier.height(SettingItemGap))
 
-        // Add button
         if (!hasDraftEnvVar) {
             Box(
                 modifier = Modifier
@@ -2241,6 +3655,14 @@ private fun VariablesSection(
                     .clickable {
                         state.envVars.value = state.envVars.value + EnvVarItem("", "")
                     }
+                    .paneNavItem(
+                        cornerRadius = 8.dp,
+                        onActivate = {
+                            state.envVars.value = state.envVars.value + EnvVarItem("", "")
+                        },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    )
                     .padding(horizontal = 12.dp, vertical = 8.dp)
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
@@ -2262,111 +3684,131 @@ private fun VariablesSection(
         }
     }
 
-    if (isContainer) {
-        Spacer(Modifier.height(SettingSectionGap))
-        SubsectionLabel(stringResource(R.string.container_config_drives))
-        Spacer(Modifier.height(8.dp))
-        SettingGroup {
-            val drives = state.drivesList.value
-            if (drives.isEmpty()) {
-                Text(
+}
+
+@Composable
+private fun DrivesSection(
+    state: GameSettingsStateHolder,
+    callbacks: GameSettingsCallbacks
+) {
+    SettingGroup {
+        val drives = state.drivesList.value
+        if (drives.isEmpty()) {
+            Text(
                 stringResource(R.string.common_ui_none),
                 color = TextDim,
                 fontSize = SettingValueSize,
                 modifier = Modifier.padding(vertical = 6.dp)
-                )
-            } else {
-                drives.forEachIndexed { index, drive ->
-                    val otherLetters =
-                        drives
-                            .mapIndexedNotNull { otherIndex, otherDrive ->
-                                otherDrive.letter.takeUnless { otherIndex == index }?.uppercase()
-                            }.toSet()
-                    val availableLetters =
-                        SelectableDriveLetters.filter { letter ->
-                            letter.equals(drive.letter, ignoreCase = true) || letter !in otherLetters
-                        }
-
-                    if (index > 0) {
-                        Spacer(Modifier.height(1.dp))
-                        Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
-                        Spacer(Modifier.height(1.dp))
+            )
+        } else {
+            drives.forEachIndexed { index, drive ->
+                val otherLetters =
+                    drives
+                        .mapIndexedNotNull { otherIndex, otherDrive ->
+                            otherDrive.letter.takeUnless { otherIndex == index }?.uppercase()
+                        }.toSet()
+                val availableLetters =
+                    SelectableDriveLetters.filter { letter ->
+                        letter.equals(drive.letter, ignoreCase = true) || letter !in otherLetters
                     }
-                    Row(
+
+                if (index > 0) {
+                    Spacer(Modifier.height(1.dp))
+                    Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
+                    Spacer(Modifier.height(1.dp))
+                }
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 4.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    DriveLetterSelector(
+                        selectedLetter = drive.letter.uppercase(),
+                        canChangeLetter = drive.canChangeLetter,
+                        availableLetters = availableLetters,
+                        onSelected = { callbacks.onDriveLetterChanged(index, it) },
+                    )
+                    Spacer(Modifier.width(8.dp))
+                    Box(
                         modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 4.dp),
-                        verticalAlignment = Alignment.CenterVertically
+                            .weight(1f)
+                            .clip(RoundedCornerShape(8.dp))
+                            .background(InputSurface)
+                            .border(1.dp, InputBorder, RoundedCornerShape(8.dp))
+                            .clickable { callbacks.onPickDrivePath(index) }
+                            .paneNavItem(
+                                cornerRadius = 8.dp,
+                                onActivate = { callbacks.onPickDrivePath(index) },
+                                highlightColor = NavHighlight,
+                                tapToSelect = true,
+                            )
+                            .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding)
                     ) {
-                        DriveLetterSelector(
-                            selectedLetter = drive.letter.uppercase(),
-                            canChangeLetter = drive.canChangeLetter,
-                            availableLetters = availableLetters,
-                            onSelected = { callbacks.onDriveLetterChanged(index, it) },
+                        Text(
+                            drive.path.ifEmpty { stringResource(R.string.common_ui_select_folder) },
+                            color = if (drive.path.isEmpty()) TextDim else TextPrimary,
+                            fontSize = SettingLabelSize,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                    }
+                    Spacer(Modifier.width(6.dp))
+                    Box(
+                        modifier = Modifier
+                            .size(30.dp)
+                            .clip(RoundedCornerShape(6.dp))
+                            .background(DangerRed.copy(alpha = 0.1f))
+                            .clickable { callbacks.onRemoveDrive(index) }
+                            .paneNavItem(
+                                cornerRadius = 6.dp,
+                                onActivate = { callbacks.onRemoveDrive(index) },
+                                highlightColor = NavHighlight,
+                                tapToSelect = true,
+                            ),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Icon(
+                            Icons.Outlined.Close,
+                            contentDescription = null,
+                            tint = DangerRed,
+                            modifier = Modifier.size(SettingControlIconSize)
                         )
-                        Spacer(Modifier.width(8.dp))
-                        Box(
-                            modifier = Modifier
-                                .weight(1f)
-                                .clip(RoundedCornerShape(8.dp))
-                                .background(InputSurface)
-                                .border(1.dp, InputBorder, RoundedCornerShape(8.dp))
-                                .clickable { callbacks.onPickDrivePath(index) }
-                                .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding)
-                        ) {
-                            Text(
-                                drive.path.ifEmpty { stringResource(R.string.common_ui_select_folder) },
-                                color = if (drive.path.isEmpty()) TextDim else TextPrimary,
-                                fontSize = SettingLabelSize,
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                        }
-                        Spacer(Modifier.width(6.dp))
-                        Box(
-                            modifier = Modifier
-                                .size(30.dp)
-                                .clip(RoundedCornerShape(6.dp))
-                                .background(DangerRed.copy(alpha = 0.1f))
-                                .clickable { callbacks.onRemoveDrive(index) },
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Icon(
-                                Icons.Outlined.Close,
-                                contentDescription = null,
-                                tint = DangerRed,
-                                modifier = Modifier.size(SettingControlIconSize)
-                            )
-                        }
                     }
                 }
             }
+        }
 
-            Spacer(Modifier.height(SettingItemGap))
+        Spacer(Modifier.height(SettingItemGap))
 
-            Box(
-                modifier = Modifier
-                    .clip(RoundedCornerShape(8.dp))
-                    .background(AccentBlue.copy(alpha = 0.08f))
-                    .border(1.dp, AccentBlue.copy(alpha = 0.2f), RoundedCornerShape(8.dp))
-                    .clickable { callbacks.onAddDrive() }
-                    .padding(horizontal = 12.dp, vertical = 8.dp)
-            ) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Icon(
-                        Icons.Outlined.Add,
-                        contentDescription = null,
-                        tint = AccentBlue,
-                        modifier = Modifier.size(SettingIconSize)
-                    )
-                    Spacer(Modifier.width(6.dp))
-                    Text(
-                        stringResource(R.string.common_ui_add),
-                        color = AccentBlue,
-                        fontSize = SettingValueSize,
-                        fontWeight = FontWeight.Medium
-                    )
-                }
+        Box(
+            modifier = Modifier
+                .clip(RoundedCornerShape(8.dp))
+                .background(AccentBlue.copy(alpha = 0.08f))
+                .border(1.dp, AccentBlue.copy(alpha = 0.2f), RoundedCornerShape(8.dp))
+                .clickable { callbacks.onAddDrive() }
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { callbacks.onAddDrive() },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
+                .padding(horizontal = 12.dp, vertical = 8.dp)
+        ) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Icon(
+                    Icons.Outlined.Add,
+                    contentDescription = null,
+                    tint = AccentBlue,
+                    modifier = Modifier.size(SettingIconSize)
+                )
+                Spacer(Modifier.width(6.dp))
+                Text(
+                    stringResource(R.string.common_ui_add),
+                    color = AccentBlue,
+                    fontSize = SettingValueSize,
+                    fontWeight = FontWeight.Medium
+                )
             }
         }
     }
@@ -2392,6 +3834,7 @@ private fun DriveLetterSelector(
                     .clip(RoundedCornerShape(6.dp))
                     .background(AccentBlue.copy(alpha = 0.1f))
                     .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(6.dp))
+                    .paneNavItem(cornerRadius = 6.dp, onActivate = { expanded = true }, highlightColor = NavHighlight)
                     .smartDropdownAnchor(enabled = showDropdown, offset = menuOffset) { expanded = true }
                     .padding(horizontal = 8.dp),
             verticalAlignment = Alignment.CenterVertically,
@@ -2451,14 +3894,10 @@ private fun DriveLetterSelector(
     }
 }
 
-// ===================================================================
-// Env Var row: name dropdown + type-aware value editor
-// ===================================================================
 @Composable
 private fun EnvVarRow(
     name: String,
     value: String,
-    excludeOtherNames: Set<String>,
     onNameChange: (String) -> Unit,
     onValueChange: (String) -> Unit,
     onRemove: (() -> Unit)?,
@@ -2480,7 +3919,6 @@ private fun EnvVarRow(
         // Name dropdown or custom text field
         Box(modifier = Modifier.weight(1.6f)) {
             if (isCustomMode) {
-                // Custom mode: show editable text field for variable name
                 BasicTextField(
                     value = customText,
                     onValueChange = { newText ->
@@ -2496,6 +3934,7 @@ private fun EnvVarRow(
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(EnvVarControlHeight)
+                        .controllerTextFieldEscape()
                         .clip(RoundedCornerShape(8.dp))
                         .background(InputSurface)
                         .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
@@ -2521,6 +3960,7 @@ private fun EnvVarRow(
                         .clip(RoundedCornerShape(8.dp))
                         .background(InputSurface)
                         .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
+                        .paneNavItem(cornerRadius = 8.dp, onActivate = { nameMenuExpanded = true }, highlightColor = NavHighlight)
                         .smartDropdownAnchor(offset = nameMenuOffset) { nameMenuExpanded = true }
                         .padding(horizontal = SettingFieldHorizontalPadding),
                     contentAlignment = Alignment.CenterStart
@@ -2553,7 +3993,6 @@ private fun EnvVarRow(
                     .height(360.dp)
                     .width(260.dp)
             ) {
-                // "Custom" option at top — allows typing a variable name
                 DropdownMenuItem(
                     text = {
                         Text(
@@ -2570,41 +4009,27 @@ private fun EnvVarRow(
                         nameMenuExpanded = false
                     }
                 )
-                // Divider after Custom
                 Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
 
-                // Sort: unselected vars in ABC order, then selected vars in ABC order
-                val allKnown = EnvVarsView.knownEnvVars.map { it[0] }
-                val unselected = allKnown
-                    .filter { it !in excludeOtherNames && it != name }
-                    .sortedBy { it.uppercase() }
-                val selected = allKnown
-                    .filter { it in excludeOtherNames }
+                EnvVarsView.knownEnvVars
+                    .map { it[0] }
                     .sortedBy { it.uppercase() }
-
-                (unselected + selected).forEach { knownName ->
-                    val disabled = knownName != name && knownName in excludeOtherNames
-                    DropdownMenuItem(
-                        enabled = !disabled,
-                        text = {
-                            Text(
-                                knownName,
-                                color = if (disabled) TextDim else TextPrimary,
-                                fontSize = SettingValueSize
-                            )
-                        },
-                        onClick = {
-                            isCustomMode = false
-                            customText = ""
-                            onNameChange(knownName)
-                            nameMenuExpanded = false
-                        }
-                    )
-                }
+                    .forEach { knownName ->
+                        DropdownMenuItem(
+                            text = {
+                                Text(knownName, color = TextPrimary, fontSize = SettingValueSize)
+                            },
+                            onClick = {
+                                isCustomMode = false
+                                customText = ""
+                                onNameChange(knownName)
+                                nameMenuExpanded = false
+                            }
+                        )
+                    }
             }
         }
         Spacer(Modifier.width(6.dp))
-        // Value editor (type-aware)
         Box(modifier = Modifier.weight(1f)) {
             EnvVarValueEditor(
                 name = name,
@@ -2619,7 +4044,13 @@ private fun EnvVarRow(
                     .size(26.dp)
                     .clip(RoundedCornerShape(6.dp))
                     .background(DangerRed.copy(alpha = 0.1f))
-                    .clickable { onRemove() },
+                    .clickable { onRemove() }
+                    .paneNavItem(
+                        cornerRadius = 6.dp,
+                        onActivate = { onRemove() },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    ),
                 contentAlignment = Alignment.Center
             ) {
                 Icon(
@@ -2646,12 +4077,21 @@ private fun EnvVarValueEditor(
         "CHECKBOX" -> {
             val off = known!![2]
             val on = known[3]
-            val isOn = value == on || value == "1" || value == "true"
-            EnvValueDropdown(
-                current = if (isOn) on else off,
-                options = listOf(off, on),
-                onSelected = onValueChange
-            )
+            val isOn = value == on || value == "1" || value.equals("true", ignoreCase = true)
+            Box(
+                modifier = Modifier.fillMaxWidth(),
+                contentAlignment = Alignment.CenterEnd
+            ) {
+                Switch(
+                    checked = isOn,
+                    onCheckedChange = { onValueChange(if (it) on else off) },
+                    modifier = Modifier.scale(0.78f),
+                    colors = outlinedSwitchColors(
+                        accentColor = AccentBlue,
+                        textSecondaryColor = TextSecondary
+                    )
+                )
+            }
         }
         "SELECT" -> {
             val options = known!!.drop(2)
@@ -2661,6 +4101,14 @@ private fun EnvVarValueEditor(
                 onSelected = onValueChange
             )
         }
+        "SELECT_CUSTOM" -> {
+            val options = known!!.drop(2)
+            EnvValueDropdownWithCustom(
+                current = value,
+                options = options,
+                onChanged = onValueChange
+            )
+        }
         "SELECT_MULTIPLE" -> {
             val options = known!!.drop(2)
             EnvValueMultiDropdown(
@@ -2691,6 +4139,7 @@ private fun EnvValueDropdown(
                 .clip(RoundedCornerShape(8.dp))
                 .background(InputSurface)
                 .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { expanded = true }, highlightColor = NavHighlight)
                 .smartDropdownAnchor(offset = menuOffset) { expanded = true }
                 .padding(horizontal = SettingFieldHorizontalPadding),
             contentAlignment = Alignment.CenterStart
@@ -2735,6 +4184,109 @@ private fun EnvValueDropdown(
     }
 }
 
+@Composable
+private fun EnvValueDropdownWithCustom(
+    current: String,
+    options: List<String>,
+    onChanged: (String) -> Unit
+) {
+    var expanded by remember { mutableStateOf(false) }
+    val menuOffset = rememberSmartDropdownOffset()
+    var customMode by remember { mutableStateOf(current.isNotEmpty() && current !in options) }
+    Box {
+        if (customMode) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Box(Modifier.weight(1f)) {
+                    EnvValueTextField(current, onChanged)
+                }
+                Spacer(Modifier.width(4.dp))
+                Box(
+                    modifier = Modifier
+                        .size(EnvVarControlHeight)
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(InputSurface)
+                        .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
+                        .paneNavItem(cornerRadius = 8.dp, onActivate = { expanded = true }, highlightColor = NavHighlight)
+                        .smartDropdownAnchor(offset = menuOffset) { expanded = true },
+                    contentAlignment = Alignment.Center
+                ) {
+                    Icon(
+                        Icons.Outlined.KeyboardArrowDown,
+                        contentDescription = null,
+                        tint = TextSecondary,
+                        modifier = Modifier.size(16.dp)
+                    )
+                }
+            }
+        } else {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(EnvVarControlHeight)
+                    .clip(RoundedCornerShape(8.dp))
+                    .background(InputSurface)
+                    .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
+                    .paneNavItem(cornerRadius = 8.dp, onActivate = { expanded = true }, highlightColor = NavHighlight)
+                    .smartDropdownAnchor(offset = menuOffset) { expanded = true }
+                    .padding(horizontal = SettingFieldHorizontalPadding),
+                contentAlignment = Alignment.CenterStart
+            ) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text(
+                        if (current.isEmpty()) options.firstOrNull().orEmpty() else current,
+                        color = TextPrimary,
+                        fontSize = SettingValueSize,
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                    Icon(
+                        Icons.Outlined.KeyboardArrowDown,
+                        contentDescription = null,
+                        tint = TextSecondary,
+                        modifier = Modifier.size(16.dp)
+                    )
+                }
+            }
+        }
+        DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false },
+            offset = menuOffset.value,
+            shape = RoundedCornerShape(8.dp),
+            containerColor = CardSurface,
+            modifier = Modifier.width(220.dp)
+        ) {
+            options.forEach { opt ->
+                DropdownMenuItem(
+                    text = { Text(opt, color = TextPrimary, fontSize = SettingValueSize) },
+                    onClick = {
+                        customMode = false
+                        onChanged(opt)
+                        expanded = false
+                    }
+                )
+            }
+            Box(Modifier.fillMaxWidth().height(1.dp).background(DividerColor))
+            DropdownMenuItem(
+                text = {
+                    Text(
+                        stringResource(R.string.common_ui_custom),
+                        color = AccentBlue,
+                        fontSize = SettingValueSize,
+                        fontWeight = FontWeight.Medium
+                    )
+                },
+                onClick = {
+                    customMode = true
+                    onChanged("")
+                    expanded = false
+                }
+            )
+        }
+    }
+}
+
 @Composable
 private fun EnvValueMultiDropdown(
     current: String,
@@ -2754,6 +4306,7 @@ private fun EnvValueMultiDropdown(
                 .clip(RoundedCornerShape(8.dp))
                 .background(InputSurface)
                 .border(1.dp, AccentBlue.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { expanded = true }, highlightColor = NavHighlight)
                 .smartDropdownAnchor(offset = menuOffset) { expanded = true }
                 .padding(horizontal = SettingFieldHorizontalPadding),
             contentAlignment = Alignment.CenterStart
@@ -2820,6 +4373,14 @@ private fun EnvValueTextField(
     numeric: Boolean = false,
     decimal: Boolean = false
 ) {
+    val keyboard = LocalSoftwareKeyboardController.current
+    var isEditing by remember { mutableStateOf(false) }
+    LaunchedEffect(isEditing) {
+        if (isEditing) {
+            keyboard?.show()
+            isEditing = false
+        }
+    }
     BasicTextField(
         value = value,
         onValueChange = onValueChange,
@@ -2833,7 +4394,13 @@ private fun EnvValueTextField(
         },
         modifier = Modifier
             .fillMaxWidth()
-            .height(EnvVarControlHeight),
+            .height(EnvVarControlHeight)
+            .paneNavItem(
+                cornerRadius = 8.dp,
+                onActivate = { isEditing = true },
+                highlightColor = NavHighlight,
+            )
+            .controllerTextFieldEscape(),
         decorationBox = { innerTextField ->
             Box(
                 modifier = Modifier
@@ -2853,79 +4420,128 @@ private fun EnvValueTextField(
     )
 }
 
-// ===================================================================
-// Section 6: Input
-// ===================================================================
 @Composable
 private fun InputSection(state: GameSettingsStateHolder) {
     val isContainer = state.isContainerEditMode.value
 
-    // Input Controls group
     SubsectionLabel(stringResource(R.string.common_ui_input_controls))
     Spacer(Modifier.height(8.dp))
     SettingGroup {
         if (!isContainer) {
-            SettingDropdown(
-                label = stringResource(R.string.common_ui_profile),
-                entries = state.controlsProfileEntries.value,
-                selectedIndex = state.selectedControlsProfile.intValue,
-                onSelected = { state.selectedControlsProfile.intValue = it }
-            )
-
-            Spacer(Modifier.height(SettingItemGap))
-
-            SettingDropdown(
-                label = stringResource(R.string.num_controllers),
-                entries = state.numControllersEntries.value,
-                selectedIndex = state.selectedNumControllers.intValue,
-                onSelected = { state.selectedNumControllers.intValue = it }
-            )
+            Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                Box(Modifier.weight(1f)) {
+                    SettingDropdown(
+                        label = stringResource(R.string.common_ui_profile),
+                        entries = state.controlsProfileEntries.value,
+                        selectedIndex = state.selectedControlsProfile.intValue,
+                        onSelected = { state.selectedControlsProfile.intValue = it }
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    SettingDropdown(
+                        label = stringResource(R.string.num_controllers),
+                        entries = state.numControllersEntries.value,
+                        selectedIndex = state.selectedNumControllers.intValue,
+                        onSelected = { state.selectedNumControllers.intValue = it }
+                    )
+                }
+            }
 
             Spacer(Modifier.height(SettingItemGap))
         }
 
-        // Exclusive Input — when off, XInput + DInput are both forced on and locked below.
-        // Container mode backs it with the global "xinput_toggle" pref.
         val exclusiveChecked = if (isContainer) state.containerExclusiveInput.value
-        else state.disableXInput.value
-        SettingCheckbox(
-            label = stringResource(R.string.shortcuts_properties_exclusive_input),
-            checked = exclusiveChecked,
-            onCheckedChange = { enabled ->
-                if (isContainer) {
-                    state.containerExclusiveInput.value = enabled
-                } else {
-                    state.disableXInput.value = enabled
-                }
-                if (!enabled) {
-                    state.enableXInput.value = true
-                    state.enableDInput.value = true
-                }
+        else state.shortcutExclusiveXInput.value
+        Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+            Box(Modifier.weight(1f)) {
+                SettingCheckbox(
+                    label = stringResource(R.string.shortcuts_properties_exclusive_input),
+                    checked = exclusiveChecked,
+                    onCheckedChange = { enabled ->
+                        if (isContainer) {
+                            state.containerExclusiveInput.value = enabled
+                        } else {
+                            state.shortcutExclusiveXInput.value = enabled
+                        }
+                        if (!enabled) {
+                            state.enableXInput.value = true
+                            state.enableDInput.value = true
+                        } else if (state.enableXInput.value && state.enableDInput.value) {
+                            state.enableDInput.value = false
+                        }
+                    }
+                )
             }
-        )
+            Box(Modifier.weight(1f)) {
+                SettingCheckbox(
+                    label = stringResource(R.string.container_config_sdl2_compatibility),
+                    checked = state.sdl2Compatibility.value,
+                    onCheckedChange = { state.sdl2Compatibility.value = it }
+                )
+            }
+        }
 
-        Spacer(Modifier.height(4.dp))
+        if (!isContainer) {
+            Spacer(Modifier.height(4.dp))
 
-        SettingCheckbox(
-            label = stringResource(R.string.container_config_sdl2_compatibility),
-            checked = state.sdl2Compatibility.value,
-            onCheckedChange = { state.sdl2Compatibility.value = it }
-        )
+            SettingCheckbox(
+                label = stringResource(R.string.shortcuts_properties_disable_xinput),
+                checked = state.disableXInput.value,
+                onCheckedChange = { state.disableXInput.value = it }
+            )
 
-        if (!isContainer) {
             Spacer(Modifier.height(4.dp))
 
+            // Touch input mode (Trackpad / Touchscreen / Map to Right Stick)
+            val gesturesOff = state.selectedGestureProfile.intValue == 0
+            val onSelectMode: (Int) -> Unit = { mode ->
+                state.screenTouchMode.intValue = mode
+                state.simTouchScreen.value = (mode == 1)
+                state.selectedGestureProfile.intValue = 0
+            }
+            Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                Box(Modifier.weight(1f)) {
+                    SettingCheckbox(
+                        label = stringResource(R.string.session_drawer_touch_trackpad),
+                        checked = state.screenTouchMode.intValue == 0 && gesturesOff,
+                        onCheckedChange = { if (it) onSelectMode(0) }
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    SettingCheckbox(
+                        label = stringResource(R.string.session_drawer_touch_touchscreen),
+                        checked = state.screenTouchMode.intValue == 1 && gesturesOff,
+                        onCheckedChange = { onSelectMode(if (it) 1 else 0) }
+                    )
+                }
+            }
+            Spacer(Modifier.height(4.dp))
             SettingCheckbox(
-                label = stringResource(R.string.session_xserver_simulate_touch_screen),
-                checked = state.simTouchScreen.value,
-                onCheckedChange = { state.simTouchScreen.value = it }
+                label = stringResource(R.string.session_drawer_touch_map_right_stick),
+                checked = state.screenTouchMode.intValue == 2 && gesturesOff,
+                onCheckedChange = { onSelectMode(if (it) 2 else 0) }
             )
+
+            if (state.gestureProfileEntries.value.isNotEmpty()) {
+                Spacer(Modifier.height(SettingItemGap))
+                SettingDropdown(
+                    label = stringResource(R.string.session_gesture_profile_section),
+                    entries = state.gestureProfileEntries.value,
+                    selectedIndex = state.selectedGestureProfile.intValue,
+                    onSelected = {
+                        state.selectedGestureProfile.intValue = it
+                        if (it != 0) {
+                            state.screenTouchMode.intValue = 0
+                            state.simTouchScreen.value = false
+                        }
+                    }
+                )
+            }
         }
     }
 
     Spacer(Modifier.height(SettingSectionGap))
 
-    // Game Controller group
     SubsectionLabel(stringResource(R.string.session_gamepad_game_controller))
     Spacer(Modifier.height(8.dp))
     SettingGroup {
@@ -2942,7 +4558,7 @@ private fun InputSection(state: GameSettingsStateHolder) {
 
         // Enable XInput with help — only toggleable when Exclusive Input is on.
         val inputApisLocked = if (isContainer) !state.containerExclusiveInput.value
-        else !state.disableXInput.value
+        else !state.shortcutExclusiveXInput.value
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically
@@ -2951,7 +4567,10 @@ private fun InputSection(state: GameSettingsStateHolder) {
                 SettingCheckbox(
                     label = stringResource(R.string.container_config_enable_xinput),
                     checked = state.enableXInput.value,
-                    onCheckedChange = { state.enableXInput.value = it },
+                    onCheckedChange = {
+                        state.enableXInput.value = it
+                        if (!inputApisLocked && it && state.enableDInput.value) state.enableDInput.value = false
+                    },
                     enabled = !inputApisLocked
                 )
             }
@@ -2964,6 +4583,7 @@ private fun InputSection(state: GameSettingsStateHolder) {
                         .clip(RoundedCornerShape(6.dp))
                         .background(InputSurface)
                         .border(1.dp, InputBorder, RoundedCornerShape(6.dp))
+                        .paneNavItem(cornerRadius = 6.dp, onActivate = { showXInputHelp = !showXInputHelp }, highlightColor = NavHighlight)
                         .smartDropdownAnchor(offset = xInputHelpOffset) { showXInputHelp = !showXInputHelp },
                     contentAlignment = Alignment.Center
                 ) {
@@ -2996,7 +4616,6 @@ private fun InputSection(state: GameSettingsStateHolder) {
 
         Spacer(Modifier.height(4.dp))
 
-        // Enable DInput with help
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically
@@ -3005,7 +4624,10 @@ private fun InputSection(state: GameSettingsStateHolder) {
                 SettingCheckbox(
                     label = stringResource(R.string.container_config_enable_dinput),
                     checked = state.enableDInput.value,
-                    onCheckedChange = { state.enableDInput.value = it },
+                    onCheckedChange = {
+                        state.enableDInput.value = it
+                        if (!inputApisLocked && it && state.enableXInput.value) state.enableXInput.value = false
+                    },
                     enabled = !inputApisLocked
                 )
             }
@@ -3018,6 +4640,7 @@ private fun InputSection(state: GameSettingsStateHolder) {
                         .clip(RoundedCornerShape(6.dp))
                         .background(InputSurface)
                         .border(1.dp, InputBorder, RoundedCornerShape(6.dp))
+                        .paneNavItem(cornerRadius = 6.dp, onActivate = { showDInputHelp = !showDInputHelp }, highlightColor = NavHighlight)
                         .smartDropdownAnchor(offset = dInputHelpOffset) { showDInputHelp = !showDInputHelp },
                     contentAlignment = Alignment.Center
                 ) {
@@ -3048,31 +4671,9 @@ private fun InputSection(state: GameSettingsStateHolder) {
             }
         }
 
-        // Warning when both XInput and DInput enabled
-        if (state.enableXInput.value && state.enableDInput.value) {
-            Spacer(Modifier.height(10.dp))
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(8.dp))
-                    .background(WarningAmber.copy(alpha = 0.08f))
-                    .border(1.dp, WarningAmber.copy(alpha = 0.2f), RoundedCornerShape(8.dp))
-                    .padding(10.dp)
-            ) {
-                Text(
-                    stringResource(R.string.container_config_xinput_dinput_warning),
-                    color = WarningAmber,
-                    fontSize = SettingLabelSize,
-                    lineHeight = 16.sp
-                )
-            }
-        }
     }
 }
 
-// ===================================================================
-// Section 7: Advanced
-// ===================================================================
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun AdvancedSection(
@@ -3080,9 +4681,7 @@ private fun AdvancedSection(
     callbacks: GameSettingsCallbacks
 ) {
 
-    // Wine / Proton version (read-only) — only show on existing containers
-    // where it's not editable. When creating a new container the user already
-    // selects the Wine Version in the General tab.
+    // Wine/Proton version (read-only); shown only on existing containers where it isn't editable (new ones pick it in General).
     val wineVersionDisplay = state.wineVersionDisplay.value
     if (wineVersionDisplay.isNotEmpty() && !state.wineVersionEditable.value) {
         SubsectionLabel(stringResource(R.string.container_wine_version))
@@ -3095,56 +4694,81 @@ private fun AdvancedSection(
                 fontWeight = FontWeight.Medium
             )
         }
-        Spacer(Modifier.height(SettingSectionGap))
-    }
-
-    // Emulator selection (mirrors the Wine tab dropdowns)
-    SubsectionLabel(stringResource(R.string.container_config_emulator_section))
-    Spacer(Modifier.height(8.dp))
-    SettingGroup {
-        SettingDropdown(
-            label = stringResource(R.string.container_config_emulator_64bit),
-            entries = state.emulator64Entries.value,
-            selectedIndex = state.selectedEmulator64.intValue,
-            onSelected = {
-                state.selectedEmulator64.intValue = it
-                callbacks.onEmulatorChanged()
-            },
-            enabled = state.emulator64Entries.value.isNotEmpty()
-        )
-        Spacer(Modifier.height(SettingItemGap))
-        SettingDropdown(
-            label = stringResource(R.string.container_config_dll_emulator),
-            entries = state.emulator32Entries.value,
-            selectedIndex = state.selectedEmulator.intValue,
-            onSelected = {
-                state.selectedEmulator.intValue = it
-                callbacks.onEmulatorChanged()
-            },
-            enabled = state.emulator32Entries.value.isNotEmpty()
-        )
+        Spacer(Modifier.height(SettingSectionGap))
+    }
+
+    // Emulator selection (mirrors the Wine tab dropdowns)
+    SubsectionLabel(stringResource(R.string.container_config_emulator_section))
+    Spacer(Modifier.height(8.dp))
+    SettingGroup {
+        Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_config_emulator_64bit),
+                    entries = state.emulator64Entries.value,
+                    selectedIndex = state.selectedEmulator64.intValue,
+                    onSelected = {
+                        state.selectedEmulator64.intValue = it
+                        callbacks.onEmulatorChanged()
+                    },
+                    enabled = state.emulator64Entries.value.isNotEmpty()
+                )
+            }
+            Box(Modifier.weight(1f)) {
+                SettingDropdown(
+                    label = stringResource(R.string.container_config_dll_emulator),
+                    entries = state.emulator32Entries.value,
+                    selectedIndex = state.selectedEmulator.intValue,
+                    onSelected = {
+                        state.selectedEmulator.intValue = it
+                        callbacks.onEmulatorChanged()
+                    },
+                    enabled = state.emulator32Entries.value.isNotEmpty()
+                )
+            }
+        }
     }
     Spacer(Modifier.height(SettingSectionGap))
 
     // FEXCore — hidden when FEXCore isn't explicitly in either slot.
     if (state.showFexcoreFrame.value) {
+        val fexVersionUnix = state.fexcoreVersionEntries.value
+            .getOrNull(state.selectedFexcoreVersion.intValue)
+            ?.contains("unix", ignoreCase = true) == true
+        val protonUnix = state.wineVersionDisplay.value.contains("unix", ignoreCase = true) ||
+            state.wineVersionEntries.value.getOrNull(state.selectedWineVersion.intValue)
+                ?.contains("unix", ignoreCase = true) == true
+        val unixCompatible = fexVersionUnix && protonUnix
+
         val fexcoreUsage = emulatorUsageLabel(state, setOf("fexcore"))
         EmulatorSectionHeader(stringResource(R.string.container_fexcore_config), fexcoreUsage)
         Spacer(Modifier.height(8.dp))
         SettingGroup {
-            SettingDropdown(
-                label = stringResource(R.string.container_fexcore_version),
-                entries = state.fexcoreVersionEntries.value,
-                selectedIndex = state.selectedFexcoreVersion.intValue,
-                onSelected = { state.selectedFexcoreVersion.intValue = it }
-            )
-            Spacer(Modifier.height(SettingItemGap))
-            SettingDropdown(
-                label = stringResource(R.string.container_fexcore_preset),
-                entries = state.fexcorePresetEntries.value,
-                selectedIndex = state.selectedFexcorePreset.intValue,
-                onSelected = { state.selectedFexcorePreset.intValue = it }
-            )
+            Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                Box(Modifier.weight(1f)) {
+                    SettingDropdown(
+                        label = stringResource(R.string.container_fexcore_version),
+                        entries = state.fexcoreVersionEntries.value,
+                        selectedIndex = state.selectedFexcoreVersion.intValue,
+                        onSelected = { state.selectedFexcoreVersion.intValue = it },
+                        labelTrailing = {
+                            UnixLibsChip(
+                                compatible = unixCompatible,
+                                on = state.useUnixLibs.value,
+                                onClick = { state.useUnixLibs.value = !state.useUnixLibs.value }
+                            )
+                        }
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    SettingDropdown(
+                        label = stringResource(R.string.container_fexcore_preset),
+                        entries = state.fexcorePresetEntries.value,
+                        selectedIndex = state.selectedFexcorePreset.intValue,
+                        onSelected = { state.selectedFexcorePreset.intValue = it }
+                    )
+                }
+            }
         }
         Spacer(Modifier.height(SettingSectionGap))
     }
@@ -3168,24 +4792,28 @@ private fun AdvancedSection(
         EmulatorSectionHeader(box64Title, box64Usage)
         Spacer(Modifier.height(8.dp))
         SettingGroup {
-            SettingDropdown(
-                label = stringResource(R.string.container_box64_version),
-                entries = state.box64VersionEntries.value,
-                selectedIndex = state.selectedBox64Version.intValue,
-                onSelected = { state.selectedBox64Version.intValue = it }
-            )
-            Spacer(Modifier.height(SettingItemGap))
-            SettingDropdown(
-                label = stringResource(R.string.container_box64_preset),
-                entries = state.box64PresetEntries.value,
-                selectedIndex = state.selectedBox64Preset.intValue,
-                onSelected = { state.selectedBox64Preset.intValue = it }
-            )
+            Row(horizontalArrangement = Arrangement.spacedBy(SettingItemGap)) {
+                Box(Modifier.weight(1f)) {
+                    SettingDropdown(
+                        label = stringResource(R.string.container_box64_version),
+                        entries = state.box64VersionEntries.value,
+                        selectedIndex = state.selectedBox64Version.intValue,
+                        onSelected = { state.selectedBox64Version.intValue = it }
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    SettingDropdown(
+                        label = stringResource(R.string.container_box64_preset),
+                        entries = state.box64PresetEntries.value,
+                        selectedIndex = state.selectedBox64Preset.intValue,
+                        onSelected = { state.selectedBox64Preset.intValue = it }
+                    )
+                }
+            }
         }
         Spacer(Modifier.height(SettingSectionGap))
     }
 
-    // System
     SubsectionLabel(stringResource(R.string.common_ui_system))
     Spacer(Modifier.height(8.dp))
     SettingGroup {
@@ -3198,7 +4826,6 @@ private fun AdvancedSection(
 
         Spacer(Modifier.height(SettingItemGap))
 
-        // Exec Arguments with helper dropdown
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.Top
@@ -3227,23 +4854,10 @@ private fun AdvancedSection(
             checked = state.fullscreenStretched.value,
             onCheckedChange = { state.fullscreenStretched.value = it }
         )
-
-        // Direct Composition is currently a container-level toggle (sampled at
-        // activity startup, held for the session). Hide from shortcut-edit
-        // sheets to avoid suggesting it can be flipped per-launch.
-        if (state.isContainerEditMode.value) {
-            Spacer(Modifier.height(SettingItemGap))
-            SettingCheckbox(
-                label = stringResource(R.string.session_display_direct_composition),
-                checked = state.directComposition.value,
-                onCheckedChange = { state.directComposition.value = it }
-            )
-        }
     }
 
     Spacer(Modifier.height(SettingSectionGap))
 
-    // CPU Affinity
     SubsectionLabel(stringResource(R.string.container_config_processor_affinity))
     Spacer(Modifier.height(8.dp))
     SettingGroup {
@@ -3259,9 +4873,7 @@ private fun AdvancedSection(
                     index = i,
                     isChecked = isChecked,
                     onClick = {
-                        // Block unchecking the last remaining core: zero-selected
-                        // and all-selected would otherwise serialize identically,
-                        // and runtime skips affinity for a zero mask.
+                        // Block unchecking the last core: zero-selected and all-selected serialize identically, and runtime skips affinity for a zero mask.
                         val wouldLeaveNone = isChecked && checkedList.count { it } <= 1
                         if (!wouldLeaveNone) {
                             val mutable = checkedList.toMutableList()
@@ -3276,7 +4888,6 @@ private fun AdvancedSection(
 
     Spacer(Modifier.height(SettingSectionGap))
 
-    // CPU Affinity (32-bit apps)
     SubsectionLabel(stringResource(R.string.container_config_processor_affinity_32bit))
     Spacer(Modifier.height(8.dp))
     SettingGroup {
@@ -3305,9 +4916,6 @@ private fun AdvancedSection(
     }
 }
 
-// ===================================================================
-// Exec Args Helper Dropdown
-// ===================================================================
 @Composable
 private fun ExecArgsHelper(onArgSelected: (String) -> Unit) {
     var expanded by remember { mutableStateOf(false) }
@@ -3320,6 +4928,7 @@ private fun ExecArgsHelper(onArgSelected: (String) -> Unit) {
                 .clip(RoundedCornerShape(8.dp))
                 .background(InputSurface)
                 .border(1.dp, InputBorder, RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { expanded = true }, highlightColor = NavHighlight)
                 .smartDropdownAnchor(offset = menuOffset) { expanded = true },
             contentAlignment = Alignment.Center
         ) {
@@ -3342,7 +4951,6 @@ private fun ExecArgsHelper(onArgSelected: (String) -> Unit) {
                 .width(240.dp)
         ) {
             ExtraArgPresets.forEach { group ->
-                // Group header
                 DropdownMenuItem(
                     text = {
                         Text(
@@ -3376,9 +4984,6 @@ private fun ExecArgsHelper(onArgSelected: (String) -> Unit) {
     }
 }
 
-// ===================================================================
-// CPU Chip
-// ===================================================================
 @Composable
 private fun CpuChip(
     index: Int,
@@ -3395,6 +5000,12 @@ private fun CpuChip(
             .background(bgColor)
             .border(1.dp, borderColor, RoundedCornerShape(8.dp))
             .clickable(onClick = onClick)
+            .paneNavItem(
+                cornerRadius = 8.dp,
+                onActivate = onClick,
+                highlightColor = NavHighlight,
+                tapToSelect = true,
+            )
             .padding(horizontal = 12.dp, vertical = 6.dp),
         contentAlignment = Alignment.Center
     ) {
@@ -3407,9 +5018,98 @@ private fun CpuChip(
     }
 }
 
-// ===================================================================
-// Reusable Components
-// ===================================================================
+/**
+ * Direct Composition toggle. Same geometry as [UnixLibsChip] so the two read as
+ * one family of controls; grayed and inert when the device can't do DC.
+ */
+@Composable
+private fun DirectCompositionChip(
+    supported: Boolean,
+    on: Boolean,
+    onClick: () -> Unit
+) {
+    val active = supported && on
+    // "DC" alone is meaningless to a screen reader; reuse the translated
+    // Direct Composition label as the accessible name.
+    val label = stringResource(R.string.session_display_direct_composition)
+    val bgColor = if (active) AccentBlue.copy(alpha = 0.15f) else ChipSurface
+    val borderColor = if (active) AccentBlue.copy(alpha = 0.4f) else ChipBorder
+    val textColor = if (active) AccentBlue else TextDim
+
+    Box(
+        modifier = Modifier
+            .clip(RoundedCornerShape(6.dp))
+            .background(bgColor)
+            .border(1.dp, borderColor, RoundedCornerShape(6.dp))
+            .then(
+                if (supported) {
+                    Modifier
+                        .clickable(onClick = onClick)
+                        .paneNavItem(
+                            cornerRadius = 6.dp,
+                            onActivate = onClick,
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
+                } else {
+                    Modifier
+                }
+            )
+            .padding(horizontal = 10.dp, vertical = 2.dp)
+            .semantics { contentDescription = label },
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            "DC",
+            color = textColor,
+            fontSize = SettingLabelSize,
+            fontWeight = if (active) FontWeight.SemiBold else FontWeight.Normal
+        )
+    }
+}
+
+@Composable
+private fun UnixLibsChip(
+    compatible: Boolean,
+    on: Boolean,
+    onClick: () -> Unit
+) {
+    val active = compatible && on
+    val bgColor = if (active) AccentBlue.copy(alpha = 0.15f) else ChipSurface
+    val borderColor = if (active) AccentBlue.copy(alpha = 0.4f) else ChipBorder
+    val textColor = if (active) AccentBlue else TextDim
+
+    Box(
+        modifier = Modifier
+            .clip(RoundedCornerShape(6.dp))
+            .background(bgColor)
+            .border(1.dp, borderColor, RoundedCornerShape(6.dp))
+            .then(
+                if (compatible) {
+                    Modifier
+                        .clickable(onClick = onClick)
+                        .paneNavItem(
+                            cornerRadius = 6.dp,
+                            onActivate = onClick,
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
+                } else {
+                    Modifier
+                }
+            )
+            .padding(horizontal = 10.dp, vertical = 2.dp),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            "UnixLibs",
+            color = textColor,
+            fontSize = SettingLabelSize,
+            fontWeight = if (active) FontWeight.SemiBold else FontWeight.Normal
+        )
+    }
+}
+
 
 @Composable
 private fun HtmlText(
@@ -3519,15 +5219,17 @@ private fun EmulatorSectionHeader(title: String, usage: String?) {
 
 @Composable
 private fun SettingGroup(
+    modifier: Modifier = Modifier,
+    verticalPadding: Dp = SettingGroupPadding,
     content: @Composable () -> Unit
 ) {
     Column(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(SettingGroupCorner))
             .background(CardSurface)
             .border(1.dp, CardBorder, RoundedCornerShape(SettingGroupCorner))
-            .padding(SettingGroupPadding)
+            .padding(horizontal = SettingGroupPadding, vertical = verticalPadding)
     ) {
         content()
     }
@@ -3539,22 +5241,50 @@ private fun SettingDropdown(
     entries: List<String>,
     selectedIndex: Int,
     onSelected: (Int) -> Unit,
-    enabled: Boolean = true
+    enabled: Boolean = true,
+    disabledAlpha: Float = 0.4f,
+    labelTrailing: (@Composable () -> Unit)? = null
 ) {
     var expanded by remember { mutableStateOf(false) }
     val menuOffset = rememberSmartDropdownOffset()
     val selectedText = entries.getOrElse(selectedIndex) { "" }
-    val alpha = if (enabled) 1f else 0.4f
+    val alpha = if (enabled) 1f else disabledAlpha
+    val parentNav = LocalPaneNav.current
+    val optionRegistry = remember { PaneNavRegistry() }
+    LaunchedEffect(expanded) {
+        if (expanded) {
+            optionRegistry.reset()
+            optionRegistry.controllerActive = true
+            parentNav?.overlay = optionRegistry
+            parentNav?.overlayClose = { expanded = false }
+        } else if (parentNav?.overlay === optionRegistry) {
+            parentNav.overlay = null
+            parentNav.overlayClose = null
+        }
+    }
 
     Column(modifier = Modifier.fillMaxWidth().alpha(alpha)) {
-        Text(
-            label,
-            color = TextSecondary,
-            fontSize = SettingLabelSize,
-            fontWeight = FontWeight.Medium,
-            letterSpacing = 0.3.sp,
-            modifier = Modifier.padding(bottom = SettingTightGap)
-        )
+        // Fixed height keeps side-by-side dropdown fields on the same controller nav row.
+        Row(
+            modifier = Modifier.fillMaxWidth().height(SettingLabelRowHeight),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                label,
+                color = TextSecondary,
+                fontSize = SettingLabelSize,
+                fontWeight = FontWeight.Medium,
+                letterSpacing = 0.3.sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f, fill = false)
+            )
+            if (labelTrailing != null) {
+                Spacer(Modifier.weight(1f))
+                labelTrailing()
+            }
+        }
+        Spacer(Modifier.height(SettingTightGap))
         Box {
             Row(
                 modifier = Modifier
@@ -3562,6 +5292,11 @@ private fun SettingDropdown(
                     .clip(RoundedCornerShape(SettingFieldCorner))
                     .background(InputSurface)
                     .border(1.dp, InputBorder, RoundedCornerShape(SettingFieldCorner))
+                    .paneNavItem(
+                        cornerRadius = SettingFieldCorner,
+                        onActivate = { if (enabled) expanded = true },
+                        highlightColor = NavHighlight,
+                    )
                     .smartDropdownAnchor(enabled = enabled, offset = menuOffset) { expanded = true }
                     .padding(horizontal = SettingFieldHorizontalPadding, vertical = SettingFieldVerticalPadding),
                 verticalAlignment = Alignment.CenterVertically
@@ -3586,27 +5321,35 @@ private fun SettingDropdown(
                 offset = menuOffset.value,
                 shape = RoundedCornerShape(8.dp),
                 containerColor = CardSurface,
+                properties = PopupProperties(focusable = false),
             ) {
-                entries.forEachIndexed { index, entry ->
-                    DropdownMenuItem(
-                        text = {
-                            Text(
-                                entry,
-                                color = if (index == selectedIndex) AccentBlue else TextPrimary,
-                                fontSize = SettingValueSize,
-                                fontWeight = if (index == selectedIndex) FontWeight.Medium else FontWeight.Normal
-                            )
-                        },
-                        onClick = {
-                            onSelected(index)
-                            expanded = false
-                        },
-                        modifier = if (index == selectedIndex) {
-                            Modifier.background(AccentBlue.copy(alpha = 0.06f))
-                        } else {
-                            Modifier
-                        }
-                    )
+                CompositionLocalProvider(LocalPaneNav provides optionRegistry) {
+                    entries.forEachIndexed { index, entry ->
+                        DropdownMenuItem(
+                            text = {
+                                Text(
+                                    entry,
+                                    color = if (index == selectedIndex) AccentBlue else TextPrimary,
+                                    fontSize = SettingValueSize,
+                                    fontWeight = if (index == selectedIndex) FontWeight.Medium else FontWeight.Normal
+                                )
+                            },
+                            onClick = {
+                                onSelected(index)
+                                expanded = false
+                            },
+                            modifier = (if (index == selectedIndex) Modifier.background(AccentBlue.copy(alpha = 0.06f)) else Modifier)
+                                .paneNavItem(
+                                    cornerRadius = 6.dp,
+                                    onActivate = {
+                                        onSelected(index)
+                                        expanded = false
+                                    },
+                                    isEntry = index == selectedIndex,
+                                    highlightColor = NavHighlight,
+                                )
+                        )
+                    }
                 }
             }
         }
@@ -3618,8 +5361,17 @@ private fun SettingTextField(
     label: String,
     value: String,
     onValueChange: (String) -> Unit,
-    keyboardType: KeyboardType = KeyboardType.Text
+    keyboardType: KeyboardType = KeyboardType.Text,
+    enabled: Boolean = true
 ) {
+    val keyboard = LocalSoftwareKeyboardController.current
+    var isEditing by remember { mutableStateOf(false) }
+    LaunchedEffect(isEditing) {
+        if (isEditing) {
+            keyboard?.show()
+            isEditing = false
+        }
+    }
     Column(modifier = Modifier.fillMaxWidth()) {
         Text(
             label,
@@ -3632,6 +5384,7 @@ private fun SettingTextField(
         BasicTextField(
             value = value,
             onValueChange = onValueChange,
+            enabled = enabled,
             textStyle = TextStyle(
                 color = TextPrimary,
                 fontSize = SettingValueSize
@@ -3641,6 +5394,12 @@ private fun SettingTextField(
             keyboardOptions = KeyboardOptions(keyboardType = keyboardType),
             modifier = Modifier
                 .fillMaxWidth()
+                .paneNavItem(
+                    cornerRadius = SettingFieldCorner,
+                    onActivate = { if (enabled) isEditing = true },
+                    highlightColor = NavHighlight,
+                )
+                .controllerTextFieldEscape()
                 .clip(RoundedCornerShape(SettingFieldCorner))
                 .background(InputSurface)
                 .border(1.dp, InputBorder, RoundedCornerShape(SettingFieldCorner))
@@ -3663,6 +5422,18 @@ private fun SettingCheckbox(
             .alpha(alpha)
             .clip(RoundedCornerShape(8.dp))
             .then(if (enabled) Modifier.clickable { onCheckedChange(!checked) } else Modifier)
+            .then(
+                if (enabled) {
+                    Modifier.paneNavItem(
+                        cornerRadius = 8.dp,
+                        onActivate = { onCheckedChange(!checked) },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    )
+                } else {
+                    Modifier
+                }
+            )
             .padding(vertical = SettingTightGap),
         verticalAlignment = Alignment.CenterVertically
     ) {
@@ -3687,10 +5458,95 @@ private fun SettingCheckbox(
 }
 
 @Composable
+private fun settingSliderColors() =
+    SliderDefaults.colors(
+        thumbColor = AccentBlue,
+        activeTrackColor = AccentBlue,
+        inactiveTrackColor = SliderInactive,
+        activeTickColor = Color.Transparent,
+        inactiveTickColor = Color.Transparent,
+    )
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun SettingSliderTrack(sliderState: SliderState) {
+    SliderDefaults.Track(
+        sliderState = sliderState,
+        colors = settingSliderColors(),
+        modifier = Modifier.scale(scaleX = 1f, scaleY = SettingSliderTrackScaleY),
+        drawStopIndicator = null,
+        drawTick = { _, _ -> },
+        thumbTrackGapSize = 0.dp,
+        trackInsideCornerSize = 0.dp,
+    )
+}
+
+@Composable
+private fun SettingSwitch(
+    label: String,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    enabled: Boolean = true
+) {
+    val alpha = if (enabled) 1f else 0.4f
+    val interactionSource = remember { MutableInteractionSource() }
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .alpha(alpha)
+            .clip(RoundedCornerShape(8.dp))
+            .then(
+                if (enabled) {
+                    Modifier.clickable(
+                        interactionSource = interactionSource,
+                        indication = null,
+                    ) { onCheckedChange(!checked) }
+                } else {
+                    Modifier
+                }
+            )
+            .then(
+                if (enabled) {
+                    Modifier.paneNavItem(
+                        cornerRadius = 8.dp,
+                        onActivate = { onCheckedChange(!checked) },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    )
+                } else {
+                    Modifier
+                }
+            )
+            .padding(vertical = SettingTightGap),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            label,
+            color = TextPrimary,
+            fontSize = SettingValueSize,
+            modifier = Modifier.weight(1f)
+        )
+        Switch(
+            checked = checked,
+            onCheckedChange = if (enabled) onCheckedChange else null,
+            enabled = enabled,
+            colors = outlinedSwitchColors(
+                accentColor = AccentBlue,
+                textSecondaryColor = TextSecondary
+            )
+        )
+    }
+}
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
 private fun SettingSlider(
     label: String,
     value: Int,
     range: IntRange,
+    valueText: String = "$value%",
+    steps: Int = 0,
+    enabled: Boolean = true,
     onValueChange: (Int) -> Unit
 ) {
     Column(modifier = Modifier.fillMaxWidth()) {
@@ -3703,7 +5559,6 @@ private fun SettingSlider(
                 letterSpacing = 0.3.sp
             )
             Spacer(Modifier.weight(1f))
-            // Value badge
             Box(
                 modifier = Modifier
                     .clip(RoundedCornerShape(6.dp))
@@ -3711,7 +5566,7 @@ private fun SettingSlider(
                     .padding(horizontal = 7.dp, vertical = 2.dp)
             ) {
                 Text(
-                    "$value%",
+                    valueText,
                     color = AccentBlue,
                     fontSize = SettingLabelSize,
                     fontWeight = FontWeight.SemiBold
@@ -3723,14 +5578,115 @@ private fun SettingSlider(
             value = value.toFloat(),
             onValueChange = { onValueChange(it.roundToInt()) },
             valueRange = range.first.toFloat()..range.last.toFloat(),
+            steps = steps,
+            enabled = enabled,
             modifier = Modifier
                 .fillMaxWidth()
-                .height(24.dp),
-            colors = SliderDefaults.colors(
-                thumbColor = Color.White,
-                activeTrackColor = AccentBlue,
-                inactiveTrackColor = TrackInactive
-            )
+                .height(SettingSliderHeight)
+                .controllerSliderEscape()
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onAdjust = { d -> onValueChange((value + d).coerceIn(range.first, range.last)) },
+                    highlightColor = NavHighlight,
+                ),
+            colors = settingSliderColors(),
+            track = { SettingSliderTrack(it) },
+            thumb = {
+                Box(
+                    modifier = Modifier
+                        .size(SettingSliderThumbSize)
+                        .clip(RoundedCornerShape(50))
+                        .background(AccentBlue)
+                        .border(2.dp, CardSurface, RoundedCornerShape(50))
+                )
+            }
+        )
+    }
+}
+
+@Composable
+private fun SavesSection(
+    state: GameSettingsStateHolder,
+    callbacks: GameSettingsCallbacks
+) {
+    Column {
+        SavesActionCard(
+            title = stringResource(R.string.common_ui_export),
+            description = stringResource(R.string.saves_export_path_summary),
+            icon = Icons.Outlined.Upload,
+            accentColor = AccentBlue,
+            onClick = { callbacks.onExportSaves() }
+        )
+
+        Spacer(Modifier.height(SettingItemGap))
+
+        SavesActionCard(
+            title = stringResource(R.string.common_ui_import),
+            description = stringResource(R.string.saves_import_warning_title),
+            icon = Icons.Outlined.Download,
+            accentColor = WarningAmber,
+            onClick = { callbacks.onImportSaves() }
         )
     }
 }
+
+@Composable
+private fun SavesActionCard(
+    title: String,
+    description: String,
+    icon: ImageVector,
+    accentColor: Color,
+    onClick: () -> Unit
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(SettingGroupCorner))
+            .background(InputSurface)
+            .border(1.dp, InputBorder, RoundedCornerShape(SettingGroupCorner))
+            .clickable { onClick() }
+            .paneNavItem(
+                cornerRadius = SettingGroupCorner,
+                onActivate = onClick,
+                highlightColor = NavHighlight,
+                tapToSelect = true,
+            )
+            .padding(horizontal = 14.dp, vertical = 12.dp)
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Box(
+                modifier = Modifier
+                    .size(40.dp)
+                    .clip(RoundedCornerShape(10.dp))
+                    .background(accentColor.copy(alpha = 0.1f))
+                    .border(1.dp, accentColor.copy(alpha = 0.2f), RoundedCornerShape(10.dp)),
+                contentAlignment = Alignment.Center
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    tint = accentColor,
+                    modifier = Modifier.size(24.dp)
+                )
+            }
+
+            Spacer(Modifier.width(14.dp))
+
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = title,
+                    color = TextPrimary,
+                    fontSize = SettingValueSize,
+                    fontWeight = FontWeight.SemiBold
+                )
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    text = description,
+                    color = TextSecondary,
+                    fontSize = 11.sp,
+                    lineHeight = 16.sp
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/library/ReshadeLoadoutState.kt b/app/src/main/feature/library/ReshadeLoadoutState.kt
new file mode 100644
index 000000000..f21606a87
--- /dev/null
+++ b/app/src/main/feature/library/ReshadeLoadoutState.kt
@@ -0,0 +1,131 @@
+package com.winlator.cmod.feature.library
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.winlator.cmod.runtime.reshade.ReshadeLoadout
+import com.winlator.cmod.runtime.reshade.ReshadeManager
+import org.json.JSONObject
+
+// serializes to the reshadeLoadout array + nested reshadeParams object; migrates legacy single-effect saves.
+class ReshadeLoadoutState {
+    var mode by mutableStateOf(ReshadeLoadout.MODE_SOLO)
+        private set
+    val order = mutableStateListOf<String>()
+    private val enabledMap = mutableStateMapOf<String, Boolean>()
+    private val paramValues = mutableStateMapOf<String, Float>()    // "<effect>::<uniformKey>"
+
+    fun isEnabled(name: String): Boolean = enabledMap[name] ?: true
+
+    fun setEnabled(name: String, on: Boolean) {
+        if (mode == ReshadeLoadout.MODE_SOLO && on) order.forEach { enabledMap[it] = (it == name) }
+        else enabledMap[name] = on
+    }
+
+    fun changeMode(m: String) {
+        mode = ReshadeLoadout.normalizeMode(m)
+        if (mode == ReshadeLoadout.MODE_SOLO) {
+            var seen = false
+            order.forEach { n ->
+                val on = enabledMap[n] ?: false
+                if (on && !seen) seen = true else enabledMap[n] = false
+            }
+        }
+    }
+
+    fun contains(name: String): Boolean = order.contains(name)
+
+    fun isFull(): Boolean = order.size >= ReshadeLoadout.MAX_EFFECTS
+
+    // capped at MAX_EFFECTS so a launch can't balloon into an unbounded compile.
+    fun add(effect: ReshadeManager.ReshadeEffect, saved: JSONObject?) {
+        if (order.contains(effect.name) || isFull()) return
+        order.add(effect.name)
+        seed(effect, saved)
+        setEnabled(effect.name, true)
+    }
+
+    fun remove(name: String) {
+        order.remove(name)
+        enabledMap.remove(name)
+        val prefix = "$name::"
+        paramValues.keys.filter { it.startsWith(prefix) }.toList().forEach { paramValues.remove(it) }
+        if (mode == ReshadeLoadout.MODE_SOLO && order.isNotEmpty() && order.none { isEnabled(it) })
+            setEnabled(order.first(), true)
+    }
+
+    // chain order = apply order.
+    fun move(from: Int, to: Int) {
+        if (from !in order.indices || to !in order.indices || from == to) return
+        val name = order.removeAt(from)
+        order.add(to, name)
+    }
+
+    private fun seed(effect: ReshadeManager.ReshadeEffect, saved: JSONObject?) {
+        val tmp = HashMap<String, Float>()
+        for (p in effect.params) ReshadeManager.seedValues(p, saved, tmp)
+        for ((k, v) in tmp) paramValues["${effect.name}::$k"] = v
+    }
+
+    fun paramValue(effect: String, key: String, fallback: Float): Float = paramValues["$effect::$key"] ?: fallback
+    fun setParam(effect: String, key: String, value: Float) { paramValues["$effect::$key"] = value }
+
+    fun loadoutJsonOrNull(): String? {
+        if (order.isEmpty()) return null
+        return ReshadeLoadout.serialize(order.map { ReshadeLoadout.Entry(it, isEnabled(it)) })
+    }
+
+    fun paramsJsonOrNull(): String? {
+        if (order.isEmpty()) return null
+        val root = JSONObject()
+        for (name in order) {
+            val eff = JSONObject()
+            val prefix = "$name::"
+            for ((k, v) in paramValues) if (k.startsWith(prefix)) eff.put(k.removePrefix(prefix), v.toDouble())
+            if (eff.length() > 0) root.put(name, eff)
+        }
+        return if (root.length() == 0) null else root.toString()
+    }
+
+    fun firstEffectName(): String = order.firstOrNull() ?: "None"
+
+    fun isEmpty(): Boolean = order.isEmpty()
+
+    // effects no longer present in the drop-in folder are dropped; migrates a legacy single effect + flat params.
+    fun init(
+        effects: List<ReshadeManager.ReshadeEffect>,
+        loadoutJson: String?,
+        modeStr: String?,
+        paramsJson: String?,
+        legacyEffect: String?,
+    ) {
+        order.clear(); enabledMap.clear(); paramValues.clear()
+        mode = ReshadeLoadout.normalizeMode(modeStr)
+        val nested = !loadoutJson.isNullOrEmpty()
+        for (e in ReshadeLoadout.parse(loadoutJson, legacyEffect)) {
+            val effect = effects.firstOrNull { it.name.equals(e.name, true) } ?: continue
+            if (order.size >= ReshadeLoadout.MAX_EFFECTS) break
+            order.add(effect.name)
+            enabledMap[effect.name] = e.enabled
+            seed(effect, ReshadeLoadout.paramsForEffect(paramsJson, effect.name, nested, legacyEffect))
+        }
+        changeMode(mode) // enforce the solo invariant
+    }
+
+    // re-seed after a rescan, preserving current values; only drops effects whose folder vanished.
+    fun reconcile(effects: List<ReshadeManager.ReshadeEffect>) {
+        val present = effects.associateBy { it.name }
+        order.filter { it !in present }.toList().forEach { remove(it) }
+        for (name in order) {
+            val effect = present[name] ?: continue
+            val tmp = HashMap<String, Float>()
+            for (p in effect.params) ReshadeManager.seedValues(p, null, tmp)
+            for ((k, v) in tmp) {
+                val full = "$name::$k"
+                if (!paramValues.containsKey(full)) paramValues[full] = v
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/DolphinCloudSync.kt b/app/src/main/feature/retro/DolphinCloudSync.kt
new file mode 100644
index 000000000..9ef05973f
--- /dev/null
+++ b/app/src/main/feature/retro/DolphinCloudSync.kt
@@ -0,0 +1,144 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import org.dolphinemu.dolphinemu.wn.DolphinEmulationActivity
+import java.io.File
+
+object DolphinCloudSync {
+    private fun userDir(context: Context) = File(context.filesDir, "dolphin-embed/User")
+
+    fun stagingDir(context: Context, cloudId: String): File =
+        File(context.filesDir, "dolphin-embed/cloud/$cloudId")
+
+    private fun pendingFile(context: Context) = File(context.filesDir, "dolphin-embed/.pending_cloud")
+
+    fun stage(context: Context, stageKey: String, gameId: String?): Boolean =
+        runCatching {
+            val user = userDir(context)
+            val staging = stagingDir(context, stageKey)
+            staging.deleteRecursively()
+            var any = false
+            fun copy(f: File) {
+                f.copyTo(File(staging, f.relativeTo(user).path).apply { parentFile?.mkdirs() }, overwrite = true)
+                any = true
+            }
+            fun copyTree(root: File, accept: (File) -> Boolean) {
+                if (!root.isDirectory) return
+                root.walkTopDown().filter { it.isFile && accept(it) }.forEach(::copy)
+            }
+            copyTree(File(user, "GC")) { it.extension.equals("gci", true) || it.name.equals("SRAM.raw", true) }
+            copyTree(File(user, "Wii/title")) { true }
+            if (!gameId.isNullOrBlank()) {
+                File(user, "StateSaves").listFiles()
+                    ?.filter { it.isFile && it.name.startsWith(gameId) }
+                    ?.forEach(::copy)
+            }
+            any
+        }.getOrDefault(false)
+
+    fun stagedFingerprint(context: Context, stageKey: String): String {
+        val staging = stagingDir(context, stageKey)
+        if (!staging.isDirectory) return ""
+        val md = java.security.MessageDigest.getInstance("SHA-256")
+        staging.walkTopDown().filter { it.isFile }.sortedBy { it.path }.forEach { f ->
+            md.update("${f.relativeTo(staging).path}:${f.length()}:${f.lastModified()}".toByteArray())
+        }
+        return md.digest().joinToString("") { "%02x".format(it) }
+    }
+
+    fun refreshForBackup(context: Context, systemId: String, gameName: String) {
+        val system = RetroSystems.fromId(systemId) ?: return
+        if (!RetroCoreManager.usesDolphinCore(system)) return
+        val stageKey = RetroSaveStates.cloudGameId(system.id, gameName)
+        val gameId =
+            androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+                .getString("retro_gc_gameid_$stageKey", "")
+        stage(context, stageKey, gameId)
+    }
+
+    fun applyStaged(context: Context, cloudId: String) {
+        runCatching {
+            val user = userDir(context)
+            val staging = stagingDir(context, cloudId)
+            if (!staging.isDirectory) return
+            staging.walkTopDown().filter { it.isFile }.forEach { f ->
+                val rel = f.relativeTo(staging).path
+                f.copyTo(File(user, rel).apply { parentFile?.mkdirs() }, overwrite = true)
+            }
+        }
+    }
+
+    fun localTimestamp(context: Context, cloudId: String): Long {
+        val staging = stagingDir(context, cloudId)
+        if (!staging.isDirectory) return 0L
+        return staging.walkTopDown().filter { it.isFile }.maxOfOrNull { it.lastModified() } ?: 0L
+    }
+
+    fun writePending(context: Context, cloudId: String, gameName: String, fingerprint: String) {
+        runCatching { pendingFile(context).writeText("$cloudId\n$gameName\n$fingerprint") }
+    }
+
+    fun stageAndQueue(activity: android.app.Activity) {
+        val intent = activity.intent
+        val systemId = intent.getStringExtra(DolphinEmulationActivity.EXTRA_SYSTEM_ID)
+        val system = RetroSystems.fromId(systemId) ?: return
+        val gameName = intent.getStringExtra(DolphinEmulationActivity.EXTRA_GAME_NAME) ?: return
+        val shortcutPath = intent.getStringExtra(DolphinEmulationActivity.EXTRA_SHORTCUT_PATH) ?: return
+        val enabled =
+            runCatching {
+                val cm = com.winlator.cmod.runtime.container.ContainerManager(activity)
+                val cid = intent.getIntExtra(DolphinEmulationActivity.EXTRA_CONTAINER_ID, 0)
+                val container =
+                    if (cid == com.winlator.cmod.runtime.container.ContainerManager.RETRO_CONTAINER_ID) {
+                        cm.retroContainer
+                    } else {
+                        cm.getContainerById(cid)
+                    }
+                container?.let { com.winlator.cmod.runtime.container.Shortcut(it, java.io.File(shortcutPath)) }
+                    ?.getExtra("cloud_sync_enabled", "1") != "0"
+            }.getOrDefault(true)
+        if (!enabled) {
+            android.util.Log.i("WnDolphin", "cloud stage skipped (sync disabled)")
+            return
+        }
+        val stageKey = RetroSaveStates.cloudGameId(system.id, gameName)
+        val cloudId =
+            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.customGameId(
+                intent.getIntExtra(DolphinEmulationActivity.EXTRA_CONTAINER_ID, 0),
+                java.io.File(shortcutPath).name,
+            )
+        val gameId = DolphinEmulationActivity.currentGameId
+        androidx.preference.PreferenceManager.getDefaultSharedPreferences(activity)
+            .edit().putString("retro_gc_gameid_$stageKey", gameId).apply()
+        if (!stage(activity, stageKey, gameId)) {
+            android.util.Log.i("WnDolphin", "cloud stage found no save files (gameId=$gameId)")
+            return
+        }
+        val fingerprint = stagedFingerprint(activity, stageKey)
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(activity)
+        if (fingerprint == prefs.getString("retro_cloud_fp_$cloudId", null)) {
+            android.util.Log.i("WnDolphin", "cloud stage unchanged, skip upload id=$cloudId")
+            return
+        }
+        writePending(activity, cloudId, gameName, fingerprint)
+        android.util.Log.i("WnDolphin", "cloud staged id=$cloudId gameId=$gameId")
+    }
+
+    data class Pending(val cloudId: String, val gameName: String, val fingerprint: String)
+
+    fun peekPending(context: Context): Pending? =
+        runCatching {
+            val f = pendingFile(context)
+            if (!f.isFile) return null
+            val lines = f.readText().split('\n')
+            if (lines.size >= 2 && lines[0].isNotBlank()) {
+                Pending(lines[0], lines[1], lines.getOrElse(2) { "" })
+            } else {
+                null
+            }
+        }.getOrNull()
+
+    fun clearPending(context: Context) {
+        runCatching { pendingFile(context).delete() }
+    }
+}
diff --git a/app/src/main/feature/retro/DolphinEmbedLaunch.kt b/app/src/main/feature/retro/DolphinEmbedLaunch.kt
new file mode 100644
index 000000000..d7b97227c
--- /dev/null
+++ b/app/src/main/feature/retro/DolphinEmbedLaunch.kt
@@ -0,0 +1,193 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.content.Intent
+import com.winlator.cmod.R
+import com.winlator.cmod.runtime.container.Shortcut
+import org.dolphinemu.dolphinemu.wn.DolphinEmulationActivity
+import org.dolphinemu.dolphinemu.wn.DolphinNetplay
+
+object DolphinEmbedLaunch {
+    const val DRIVER_PREF = "wn.gc.driver"
+
+    private fun syncCloudSaves(context: Context, shortcut: Shortcut) {
+        if (context !is android.app.Activity) return
+        if (shortcut.getExtra("cloud_sync_enabled", "1") == "0") return
+        val system = RetroShortcuts.systemForShortcut(shortcut) ?: return
+        val gameName = shortcut.getExtra("custom_name", shortcut.name)
+        val stageKey = RetroSaveStates.cloudGameId(system.id, gameName)
+        val cloudId =
+            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.customGameId(
+                shortcut.container.id,
+                shortcut.file.name,
+            )
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        runCatching {
+            kotlinx.coroutines.runBlocking {
+                kotlinx.coroutines.withTimeout(12_000L) {
+                    val entries =
+                        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.listGoogleHistory(
+                            context,
+                            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.CUSTOM,
+                            cloudId,
+                            com.winlator.cmod.feature.sync.google.GoogleAuthMode.RESUME,
+                        )
+                    val latest = entries.maxByOrNull { it.timestampMs } ?: return@withTimeout
+                    val localTs = DolphinCloudSync.localTimestamp(context, stageKey)
+                    val mark = prefs.getLong("retro_cloud_mark_$cloudId", 0L)
+                    val restore: suspend () -> Unit = {
+                        val result =
+                            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.restoreFromGoogle(
+                                context,
+                                latest,
+                                com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.CUSTOM,
+                                cloudId,
+                                com.winlator.cmod.feature.sync.google.GoogleAuthMode.RESUME,
+                                customSaveDir = DolphinCloudSync.stagingDir(context, stageKey),
+                            )
+                        if (result.success) {
+                            DolphinCloudSync.applyStaged(context, stageKey)
+                            prefs.edit().putLong("retro_cloud_mark_$cloudId", latest.timestampMs).apply()
+                        }
+                    }
+                    if (localTs == 0L) {
+                        restore()
+                    } else if (latest.timestampMs > localTs + 120_000L && latest.timestampMs > mark) {
+                        val useCloud = askCloudConflict(context, gameName)
+                        if (useCloud) {
+                            restore()
+                        } else {
+                            prefs.edit().putLong("retro_cloud_mark_$cloudId", latest.timestampMs).apply()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun askCloudConflict(activity: android.app.Activity, gameName: String): Boolean {
+        val latch = java.util.concurrent.CountDownLatch(1)
+        val useCloud = java.util.concurrent.atomic.AtomicBoolean(false)
+        activity.runOnUiThread {
+            androidx.appcompat.app.AlertDialog.Builder(activity)
+                .setTitle(activity.getString(R.string.retro_lr_cloud_save))
+                .setMessage(activity.getString(R.string.retro_lr_cloud_conflict_message, gameName))
+                .setCancelable(false)
+                .setPositiveButton(activity.getString(R.string.retro_lr_use_cloud_save)) { _, _ ->
+                    useCloud.set(true)
+                    latch.countDown()
+                }
+                .setNegativeButton(activity.getString(R.string.retro_scr_keep_local_save)) { _, _ ->
+                    latch.countDown()
+                }
+                .show()
+        }
+        latch.await()
+        return useCloud.get()
+    }
+
+    private fun gcProcess(context: Context): android.app.ActivityManager.RunningAppProcessInfo? =
+        runCatching {
+            val am = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager
+            am.runningAppProcesses?.firstOrNull { it.processName.endsWith(":gc") }
+        }.getOrNull()
+
+    fun launch(context: Context, shortcut: Shortcut) {
+        val romPath = RetroShortcuts.romPath(shortcut)
+        val newTask = context !is android.app.Activity
+        kotlin.concurrent.thread(name = "WnDolphinLaunch") {
+            syncCloudSaves(context, shortcut)
+            val intent = launchIntent(context, shortcut)
+            if (newTask) intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+            val proc = gcProcess(context)
+            if (proc != null) {
+                val marker = java.io.File(context.filesDir, "dolphin-embed/.running_rom")
+                val running = runCatching { marker.takeIf { it.isFile }?.readText() }.getOrNull()
+                if (running != romPath) {
+                    if (running != null) {
+                        android.util.Log.i("WnDolphin", "killing running :gc pid=" + proc.pid)
+                        android.os.Process.killProcess(proc.pid)
+                    }
+                    val deadline = android.os.SystemClock.uptimeMillis() + 12000
+                    while (android.os.SystemClock.uptimeMillis() < deadline && gcProcess(context) != null) {
+                        Thread.sleep(150)
+                    }
+                }
+            }
+            android.os.Handler(android.os.Looper.getMainLooper()).post {
+                runCatching { context.startActivity(intent) }
+            }
+        }
+    }
+
+    fun launchIntent(
+        context: Context,
+        shortcut: Shortcut,
+    ): Intent {
+        val system = RetroShortcuts.systemForShortcut(shortcut)
+        val sysId = system?.id ?: RetroSystems.GAMECUBE.id
+        val vars = RetroShortcuts.resolvedCoreVariables(context, shortcut)
+        applyGpuDriver(context, vars)
+        vars["wn_touch"] =
+            shortcut.getExtra(RetroShortcuts.KEY_TOUCH_CONTROLS).ifEmpty {
+                if (RetroDefaults.touchControls(context, sysId)) "1" else "0"
+            }
+        vars["wn_audio"] =
+            shortcut.getExtra(RetroShortcuts.KEY_AUDIO).ifEmpty {
+                if (RetroDefaults.audio(context, sysId)) "1" else "0"
+            }
+        vars["wn_hud"] = if (RetroHudSupport.hudEnabled(context, shortcut, sysId)) "1" else "0"
+        vars["wn_adaptive"] =
+            shortcut.getExtra(RetroShortcuts.KEY_ADAPTIVE_STICKS).ifEmpty {
+                if (RetroDefaults.adaptiveSticks(context, sysId)) "1" else "0"
+            }
+        val netplayArmed = RetroDefaults.netplayEnabled(context, sysId)
+        val netplayHost = RetroDefaults.netplayHostMode(context, sysId)
+        val netplayTraversal = RetroDefaults.netplayTraversal(context, sysId)
+        val netplayAddress = RetroDefaults.netplayHost(context, sysId)
+        val netplayHostCode = RetroDefaults.netplayHostCode(context, sysId)
+        val netplayPort = RetroDefaults.netplayPort(context, sysId)
+        val netplayNick = RetroDefaults.netplayPlayerName(context)
+        if (netplayArmed) RetroDefaults.setNetplayEnabled(context, sysId, false)
+        return Intent(context, DolphinEmulationActivity::class.java).apply {
+            putExtra(DolphinEmulationActivity.EXTRA_ROM_PATH, RetroShortcuts.romPath(shortcut))
+            putExtra(DolphinEmulationActivity.EXTRA_SYSTEM_ID, system?.id)
+            putExtra(
+                DolphinEmulationActivity.EXTRA_GAME_NAME,
+                shortcut.getExtra("custom_name", shortcut.name),
+            )
+            putExtra(DolphinEmulationActivity.EXTRA_SHORTCUT_PATH, shortcut.file.absolutePath)
+            putExtra(DolphinEmulationActivity.EXTRA_CONTAINER_ID, shortcut.container.id)
+            putExtra(DolphinEmulationActivity.EXTRA_VARIABLES, vars)
+            if (netplayArmed) {
+                putExtra(DolphinNetplay.EXTRA_ENABLE, true)
+                putExtra(DolphinNetplay.EXTRA_HOST, netplayHost)
+                putExtra(DolphinNetplay.EXTRA_TRAVERSAL, netplayTraversal)
+                putExtra(DolphinNetplay.EXTRA_ADDRESS, netplayAddress)
+                putExtra(DolphinNetplay.EXTRA_HOST_CODE, netplayHostCode)
+                putExtra(DolphinNetplay.EXTRA_PORT, netplayPort)
+                putExtra(DolphinNetplay.EXTRA_NICKNAME, netplayNick)
+            }
+            if (RetroAchievementsManager.isEnabled(context) && RetroAchievementsManager.isLoggedIn(context)) {
+                putExtra(DolphinEmulationActivity.EXTRA_RA_ENABLED, true)
+                putExtra(DolphinEmulationActivity.EXTRA_RA_USER, RetroAchievementsManager.username(context) ?: "")
+                putExtra(DolphinEmulationActivity.EXTRA_RA_TOKEN, RetroAchievementsManager.apiToken(context) ?: "")
+                putExtra(DolphinEmulationActivity.EXTRA_RA_HARDCORE, RetroAchievementsManager.isHardcorePreferred(context))
+            }
+        }
+    }
+
+    private fun applyGpuDriver(
+        context: Context,
+        vars: HashMap<String, String>,
+    ) {
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        val driverId = (prefs.getString(DRIVER_PREF, "") ?: "").trim()
+        if (driverId.isEmpty() || driverId.equals("system", ignoreCase = true)) return
+        val driver =
+            com.armsx2.CustomDriver.listInstalled(context).firstOrNull { it.id == driverId }
+                ?: return
+        vars["dolphin_gpu_driver"] = driver.driverDir.absolutePath
+        vars["dolphin_gpu_driver_lib"] = driver.libraryName
+    }
+}
diff --git a/app/src/main/feature/retro/DolphinGameOverlay.kt b/app/src/main/feature/retro/DolphinGameOverlay.kt
new file mode 100644
index 000000000..5d25a101a
--- /dev/null
+++ b/app/src/main/feature/retro/DolphinGameOverlay.kt
@@ -0,0 +1,628 @@
+package com.winlator.cmod.feature.retro
+
+import android.widget.FrameLayout
+import android.widget.Toast
+import androidx.activity.addCallback
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Home
+import androidx.compose.material.icons.outlined.Person
+import androidx.compose.material.icons.outlined.Wifi
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.ui.FrameRating
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import org.dolphinemu.dolphinemu.wn.DolphinEmulationActivity
+import org.dolphinemu.dolphinemu.wn.DolphinHost
+import org.dolphinemu.dolphinemu.wn.DolphinNetplay
+import java.io.File
+
+object DolphinGameOverlay {
+    private const val SLOT_COUNT = 4
+
+    private fun dolphinAnyController(): Boolean =
+        android.view.InputDevice.getDeviceIds().any {
+            com.winlator.cmod.runtime.input.controls.ExternalController.isGameController(
+                android.view.InputDevice.getDevice(it),
+            )
+        }
+
+    private fun buildDolphinNetplay(activity: DolphinEmulationActivity): List<RetroMenuEntry> =
+        buildList {
+            add(
+                RetroMenuEntry.Action(
+                    label =
+                        activity.getString(
+                            if (DolphinNetplayHud.hosting) {
+                                R.string.retro_netplay_hosting_room
+                            } else {
+                                R.string.retro_netplay_in_room
+                            },
+                        ),
+                    icon = Icons.Outlined.Wifi,
+                    active = true,
+                    onClick = {},
+                ),
+            )
+            DolphinNetplayHud.hostCode?.let { code ->
+                add(
+                    RetroMenuEntry.Action(
+                        label = "${activity.getString(R.string.retro_netplay_host_code)}: $code",
+                        icon = Icons.Outlined.Wifi,
+                        onClick = {},
+                    ),
+                )
+            }
+            val members = DolphinNetplayHud.members
+            if (members.isEmpty()) {
+                add(
+                    RetroMenuEntry.Action(
+                        label = activity.getString(R.string.retro_netplay_waiting_players),
+                        icon = Icons.Outlined.Person,
+                        onClick = {},
+                    ),
+                )
+            } else {
+                members.forEach { name ->
+                    add(RetroMenuEntry.Action(label = name, icon = Icons.Outlined.Person, onClick = {}))
+                }
+            }
+        }
+
+    @Composable
+    private fun DolphinNetplayBanner(hosting: Boolean, hostCode: String?, members: List<String>) {
+        AnimatedVisibility(
+            visible = hosting && members.size < 2,
+            enter = fadeIn(),
+            exit = fadeOut(),
+        ) {
+            Box(
+                Modifier.fillMaxSize().padding(top = 56.dp),
+                contentAlignment = Alignment.TopCenter,
+            ) {
+                val parts =
+                    buildList {
+                        add(stringResource(R.string.retro_netplay_hosting_room))
+                        if (hostCode != null) {
+                            add("${stringResource(R.string.retro_netplay_host_code)}: $hostCode")
+                        }
+                        add(stringResource(R.string.retro_netplay_waiting_players))
+                    }
+                Text(
+                    parts.joinToString("  ·  "),
+                    color = GameSettingsStyle.TextPrimary,
+                    fontSize = 13.sp,
+                    modifier =
+                        Modifier
+                            .background(Color(0xF0121824), RoundedCornerShape(10.dp))
+                            .padding(horizontal = 16.dp, vertical = 10.dp),
+                )
+            }
+        }
+    }
+
+    fun install() {
+        DolphinHost.attachOverlay = { activity ->
+            if (activity is DolphinEmulationActivity) attach(activity)
+        }
+        DolphinHost.onStageSaves = { activity -> DolphinCloudSync.stageAndQueue(activity) }
+        val main = android.os.Handler(android.os.Looper.getMainLooper())
+        DolphinHost.onNetplayStatus = { hosting, code, members ->
+            main.post { DolphinNetplayHud.update(hosting, code, members) }
+        }
+    }
+
+    private fun loadShortcut(activity: DolphinEmulationActivity): Shortcut? {
+        val containerId = activity.intent.getIntExtra(DolphinEmulationActivity.EXTRA_CONTAINER_ID, -1)
+        val path = activity.intent.getStringExtra(DolphinEmulationActivity.EXTRA_SHORTCUT_PATH)
+        if (containerId < 0 || path.isNullOrBlank()) return null
+        val file = File(path)
+        if (!file.isFile) return null
+        return runCatching {
+            val cm = ContainerManager(activity)
+            val container =
+                if (containerId == ContainerManager.RETRO_CONTAINER_ID) cm.retroContainer else cm.getContainerById(containerId)
+            container?.let { Shortcut(it, file) }
+        }.getOrNull()
+    }
+
+    private fun attach(activity: DolphinEmulationActivity) {
+        val root = activity.findViewById<FrameLayout>(android.R.id.content) ?: return
+        val system =
+            RetroSystems.fromId(activity.intent.getStringExtra(DolphinEmulationActivity.EXTRA_SYSTEM_ID))
+                ?: RetroSystems.GAMECUBE
+        var shortcut: Shortcut? = null
+        val pendingExtras = linkedMapOf<String, String>()
+        val menu = RetroMenuController()
+        val dolphinScreen = mutableStateOf<String?>(null)
+        lateinit var input: RetroInputView
+        val vars = DolphinEmulationActivity.currentVariables
+        var touchControls = vars["wn_touch"] != "0"
+        var adaptiveSticks = vars["wn_adaptive"] == "1"
+        var audioOn = vars["wn_audio"] != "0"
+        var hudOn = vars["wn_hud"] == "1"
+        var savesLoadMode = false
+        var frameRating: FrameRating? = null
+        var hudStyle = RetroHudSupport.loadGlobalHudStyle(activity)
+        var hudElements = RetroHudSupport.loadGlobalHudElements(activity)
+        @Suppress("OPT_IN_USAGE")
+        GlobalScope.launch(Dispatchers.IO) {
+            val sc = loadShortcut(activity)
+            activity.runOnUiThread {
+                shortcut = sc
+                if (sc != null && pendingExtras.isNotEmpty()) {
+                    val queued = pendingExtras.toMap()
+                    pendingExtras.clear()
+                    GlobalScope.launch(Dispatchers.IO) {
+                        runCatching {
+                            queued.forEach { (k, v) -> sc.putExtra(k, v) }
+                            sc.saveData()
+                        }
+                    }
+                }
+            }
+        }
+
+        val gameName =
+            activity.intent.getStringExtra(DolphinEmulationActivity.EXTRA_GAME_NAME) ?: "game"
+        val stageKey = RetroSaveStates.cloudGameId(system.id, gameName)
+        val cloudId =
+            activity.intent.getStringExtra(DolphinEmulationActivity.EXTRA_SHORTCUT_PATH)?.let { path ->
+                com.winlator.cmod.feature.sync.google.GameSaveBackupManager.customGameId(
+                    activity.intent.getIntExtra(DolphinEmulationActivity.EXTRA_CONTAINER_ID, 0),
+                    java.io.File(path).name,
+                )
+            } ?: stageKey
+
+        fun cloudSyncEnabled(): Boolean = shortcut?.getExtra("cloud_sync_enabled", "1") != "0"
+
+        fun stageCloudBackup(onDone: (() -> Unit)? = null) {
+            if (!cloudSyncEnabled()) {
+                onDone?.let { activity.runOnUiThread(it) }
+                return
+            }
+            val gameId = DolphinEmulationActivity.currentGameId
+            @Suppress("OPT_IN_USAGE")
+            GlobalScope.launch(Dispatchers.IO) {
+                if (DolphinCloudSync.stage(activity, stageKey, gameId)) {
+                    val fp = DolphinCloudSync.stagedFingerprint(activity, stageKey)
+                    val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(activity)
+                    if (fp != prefs.getString("retro_cloud_fp_$cloudId", null)) {
+                        DolphinCloudSync.writePending(activity, cloudId, gameName, fp)
+                    }
+                }
+                onDone?.let { activity.runOnUiThread(it) }
+            }
+        }
+
+        fun persistExtra(key: String, value: String) {
+            val sc = shortcut
+            if (sc == null) {
+                pendingExtras[key] = value
+                return
+            }
+            @Suppress("OPT_IN_USAGE")
+            GlobalScope.launch(Dispatchers.IO) {
+                runCatching {
+                    sc.putExtra(key, value)
+                    sc.saveData()
+                }
+            }
+        }
+
+        fun applyVar(key: String, value: String) {
+            activity.applyVariable(key, value)
+            persistExtra(RetroShortcuts.VAR_PREFIX + key, value)
+        }
+
+        fun showHud() {
+            var rating = frameRating
+            if (rating == null) {
+                rating = RetroHudSupport.createFrameRating(activity, "Vulkan")
+                frameRating = rating
+                RetroHudSupport.attachFrameRating(root, rating)
+                RetroHudSupport.applyStyle(rating, hudStyle, hudElements)
+                org.dolphinemu.dolphinemu.NativeLibrary.frameListener =
+                    Runnable { frameRating?.recordGameFrame() }
+            }
+            rating.visibility = android.view.View.VISIBLE
+            rating.reset()
+        }
+
+        fun setHudVisible(value: Boolean) {
+            hudOn = value
+            activity.applyVariable("wn_hud", if (value) "1" else "0")
+            persistExtra(RetroShortcuts.KEY_HUD, if (value) "1" else "0")
+            if (value) showHud() else frameRating?.visibility = android.view.View.GONE
+        }
+
+        val listener =
+            object : RetroInputView.Listener {
+                override fun onButton(keyCode: Int, down: Boolean) {
+                    if (!menu.visible) activity.sendOverlayButton(keyCode, down)
+                }
+
+                override fun onDpad(x: Float, y: Float) {
+                    if (!menu.visible) activity.sendOverlayDpad(x, y)
+                }
+
+                override fun onStick(x: Float, y: Float) {
+                    if (!menu.visible) activity.sendOverlayLeftStick(x, y)
+                }
+
+                override fun onRightStick(x: Float, y: Float) {
+                    if (!menu.visible) activity.sendOverlayRightStick(x, y)
+                }
+
+                override fun onMenu() {
+                    activity.runOnUiThread {
+                        input.releaseAll()
+                        menu.open()
+                    }
+                }
+            }
+
+        input = RetroInputView(activity, listener, system)
+        input.hapticStrength =
+            androidx.preference.PreferenceManager
+                .getDefaultSharedPreferences(activity)
+                .getFloat("retro_haptic_strength", 0.4f)
+        input.adaptiveSticks = adaptiveSticks
+        input.showL3R3 =
+            androidx.preference.PreferenceManager
+                .getDefaultSharedPreferences(activity)
+                .getBoolean(RetroControlsMenu.l3r3PrefKey(system.id), true)
+        input.setCustomColors(RetroControlLayouts.loadColors(activity, system.id))
+        input.loadStickInversion()
+        var controllerConnected = dolphinAnyController()
+        var manualTouchOverride = false
+        fun touchEffective() = touchControls && (!controllerConnected || manualTouchOverride)
+        input.visibility = if (touchEffective()) android.view.View.VISIBLE else android.view.View.GONE
+        fun updateGameArea() {
+            val w = root.width.toFloat()
+            val h = root.height.toFloat()
+            if (w <= 0f || h <= 0f) return
+            val gameWidth = (h * 4f / 3f).coerceAtMost(w)
+            val left = (w - gameWidth) * 0.5f
+            val box = android.graphics.RectF(left, 0f, left + gameWidth, h)
+            input.setGameArea(box)
+            activity.setSurfaceBounds(if (touchEffective()) box else null)
+        }
+        root.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> updateGameArea() }
+        root.post { updateGameArea() }
+        fun refreshDolphinController() {
+            val was = controllerConnected
+            controllerConnected = dolphinAnyController()
+            if (controllerConnected != was) manualTouchOverride = false
+            val show = touchEffective()
+            input.visibility = if (show) android.view.View.VISIBLE else android.view.View.GONE
+            updateGameArea()
+            if (show) input.post { updateGameArea(); input.relayout() }
+        }
+        activity.getSystemService(android.hardware.input.InputManager::class.java)
+            ?.registerInputDeviceListener(
+                object : android.hardware.input.InputManager.InputDeviceListener {
+                    override fun onInputDeviceAdded(deviceId: Int) = refreshDolphinController()
+
+                    override fun onInputDeviceRemoved(deviceId: Int) = refreshDolphinController()
+
+                    override fun onInputDeviceChanged(deviceId: Int) = refreshDolphinController()
+                },
+                null,
+            )
+        root.addView(
+            input,
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT,
+            ),
+        )
+
+        menu.tabs = RetroDrawerTabs.build(activity, includeNetplay = DolphinNetplay.active)
+        menu.entriesProvider = { pane ->
+            when (pane) {
+                null ->
+                    buildMain(
+                        activity,
+                        menu,
+                        hudOn,
+                        system.id == RetroSystems.WII.id,
+                        onAchievements = {
+                            dolphinScreen.value = "achievements"
+                            menu.close()
+                        },
+                        onHud = ::setHudVisible,
+                    ) { load ->
+                        savesLoadMode = load
+                        menu.showPane(RetroPane.SAVES)
+                    }
+                RetroPane.SAVES -> buildMemoryCards(activity, menu, savesLoadMode) { stageCloudBackup() }
+                RetroPane.NETWORK -> buildDolphinNetplay(activity)
+                RetroPane.DISPLAY -> buildDisplay(activity, menu, system, ::applyVar)
+                RetroPane.HUD ->
+                    RetroHudSupport.buildHudEntries(
+                        context = activity,
+                        hudVisible = hudOn,
+                        style = hudStyle,
+                        elements = hudElements,
+                        onMaster = { setHudVisible(it) },
+                        onStyle = { next ->
+                            hudStyle = next
+                            frameRating?.let { RetroHudSupport.applyStyle(it, next, hudElements) }
+                            RetroHudSupport.saveGlobalHudStyle(activity, next)
+                        },
+                        onElements = { next ->
+                            hudElements = next
+                            frameRating?.let { RetroHudSupport.applyStyle(it, hudStyle, next) }
+                            RetroHudSupport.saveGlobalHudElements(activity, next)
+                        },
+                        onRebuild = { menu.rebuild() },
+                    )
+                RetroPane.SOUND ->
+                    listOf(
+                        RetroMenuEntry.Toggle(activity.getString(R.string.retro_lr_sound), checked = audioOn) { value ->
+                            audioOn = value
+                            applyVar("wn_audio", if (value) "1" else "0")
+                            persistExtra(RetroShortcuts.KEY_AUDIO, if (value) "1" else "0")
+                            menu.rebuild()
+                        },
+                    )
+                RetroPane.CONTROLS ->
+                    RetroControlsMenu.build(
+                        RetroControlsMenu.Host(
+                            context = activity,
+                            overlay = input,
+                            menu = menu,
+                            systemId = system.id,
+                            touchControls = { touchControls },
+                            onTouchControls = { value ->
+                                touchControls = value
+                                if (controllerConnected) manualTouchOverride = true
+                                input.visibility =
+                                    if (touchEffective()) android.view.View.VISIBLE else android.view.View.GONE
+                                updateGameArea()
+                                persistExtra(RetroShortcuts.KEY_TOUCH_CONTROLS, if (value) "1" else "0")
+                            },
+                            adaptiveSticks = { adaptiveSticks },
+                            onAdaptiveSticks = { value ->
+                                adaptiveSticks = value
+                                persistExtra(RetroShortcuts.KEY_ADAPTIVE_STICKS, if (value) "1" else "0")
+                            },
+                            orientationLabel = { activity.getString(R.string.retro_lr_landscape) },
+                            onCloseMenu = { menu.close() },
+                            showStickInversion = true,
+                        ),
+                    )
+                else -> emptyList()
+            }
+        }
+        menu.bottomProvider = { buildBottom(activity, menu) { activity.stopGame() } }
+
+        val compose =
+            ComposeView(activity).apply {
+                elevation = 2000f
+                setContent {
+                    WinNativeTheme {
+                        Box(Modifier.fillMaxSize()) {
+                            val screen by dolphinScreen
+                            if (screen == "achievements") {
+                                val dismiss = { dolphinScreen.value = null }
+                                androidx.activity.compose.BackHandler(enabled = true) { dismiss() }
+                                RetroAchievementsScreen(
+                                    systemId = system.id,
+                                    gameName = activity.intent.getStringExtra(
+                                        DolphinEmulationActivity.EXTRA_GAME_NAME,
+                                    ) ?: system.displayName,
+                                    romPath = activity.intent.getStringExtra(
+                                        DolphinEmulationActivity.EXTRA_ROM_PATH,
+                                    ).orEmpty(),
+                                    inSession = true,
+                                    onClose = dismiss,
+                                    floatingOverGame = true,
+                                    nativeJson = {
+                                        org.dolphinemu.dolphinemu.features.settings.model.AchievementModel
+                                            .getAchievementsJSON()
+                                    },
+                                )
+                            } else {
+                                val hosting = DolphinNetplayHud.hosting
+                                val code = DolphinNetplayHud.hostCode
+                                val members = DolphinNetplayHud.members
+                                LaunchedEffect(hosting, code, members) {
+                                    if (menu.visible && menu.pane == RetroPane.NETWORK) menu.rebuild()
+                                }
+                                DolphinNetplayBanner(hosting, code, members)
+                                RetroDrawerMenu(menu)
+                            }
+                        }
+                    }
+                }
+            }
+        root.addView(
+            compose,
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT,
+            ),
+        )
+
+        if (hudOn) root.post { showHud() }
+
+        activity.onBackPressedDispatcher.addCallback(activity) {
+            when {
+                input.editMode -> input.finishEdit()
+                menu.visible -> menu.close()
+                else -> menu.open()
+            }
+        }
+        activity.menuButtonHandler = { if (menu.visible) menu.close() else menu.open() }
+    }
+
+    private fun buildMain(
+        activity: DolphinEmulationActivity,
+        menu: RetroMenuController,
+        hudOn: Boolean,
+        isWii: Boolean,
+        onAchievements: () -> Unit,
+        onHud: (Boolean) -> Unit,
+        openMemoryCards: (load: Boolean) -> Unit,
+    ): List<RetroMenuEntry> =
+        buildList {
+            if (isWii) {
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_dolphin_wii_home), Icons.Outlined.Home) {
+                        activity.pressWiiHome()
+                        menu.close()
+                    },
+                )
+            }
+            add(
+                RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_achievements), RetroDrawerIcons.Achievements) {
+                    onAchievements()
+                },
+            )
+            add(
+                RetroMenuEntry.Action(activity.getString(R.string.retro_lr_save_state), RetroDrawerIcons.Save) {
+                    openMemoryCards(false)
+                },
+            )
+            add(
+                RetroMenuEntry.Action(activity.getString(R.string.retro_lr_load_save_state), RetroDrawerIcons.Load) {
+                    openMemoryCards(true)
+                },
+            )
+            add(
+                RetroMenuEntry.Action(activity.getString(R.string.retro_lr_screenshot), RetroDrawerIcons.Hud) {
+                    runCatching { org.dolphinemu.dolphinemu.NativeLibrary.SaveScreenShot() }
+                    menu.close()
+                },
+            )
+            add(
+                RetroMenuEntry.Toggle(activity.getString(R.string.retro_lr_hud), checked = hudOn) { value ->
+                    onHud(value)
+                    menu.rebuild()
+                },
+            )
+        }
+
+    private fun buildMemoryCards(
+        activity: DolphinEmulationActivity,
+        menu: RetroMenuController,
+        loadMode: Boolean,
+        onSaved: () -> Unit,
+    ): List<RetroMenuEntry> =
+        (1..SLOT_COUNT).map { slot ->
+            val ts = activity.stateSlotTime(slot)
+            RetroMenuEntry.SaveSlot(
+                slot = slot,
+                title = activity.getString(R.string.retro_lr_memory_card_slot, slot),
+                subtitle = RetroSaveStates.relativeTime(ts * 1000),
+                filled = ts > 0L,
+                onClick = {
+                    if (loadMode) {
+                        if (ts > 0L) {
+                            activity.loadStateSlot(slot)
+                            menu.close()
+                            Toast
+                                .makeText(activity, activity.getString(R.string.retro_lr_loaded_slot, slot), Toast.LENGTH_SHORT)
+                                .show()
+                        }
+                    } else {
+                        activity.saveStateSlot(slot)
+                        onSaved()
+                        Toast
+                            .makeText(activity, activity.getString(R.string.retro_lr_saved_to_slot, slot), Toast.LENGTH_SHORT)
+                            .show()
+                        menu.rebuild()
+                    }
+                },
+                onRename = {},
+            )
+        }
+
+    private fun buildDisplay(
+        activity: DolphinEmulationActivity,
+        menu: RetroMenuController,
+        system: RetroSystem,
+        applyVar: (String, String) -> Unit,
+    ): List<RetroMenuEntry> =
+        buildList {
+            val vars = DolphinEmulationActivity.currentVariables
+            RetroCoreOptions.forSystem(system).forEach { option ->
+                val current = vars[option.key] ?: option.defaultValue
+                val index = option.values.indexOf(current).coerceAtLeast(0)
+                add(
+                    RetroMenuEntry.Choice(
+                        option.labelText(activity),
+                        option.valueLabels,
+                        index,
+                    ) { next ->
+                        applyVar(option.key, option.values[next])
+                        menu.rebuild()
+                    },
+                )
+            }
+        }
+
+    private fun buildBottom(
+        activity: DolphinEmulationActivity,
+        menu: RetroMenuController,
+        onExit: () -> Unit,
+    ): List<RetroMenuEntry.Action> =
+        listOf(
+            if (activity.gamePaused) {
+                RetroMenuEntry.Action(activity.getString(R.string.retro_lr_resume), RetroDrawerIcons.Resume, active = true) {
+                    activity.resumeGame()
+                    menu.close()
+                }
+            } else {
+                RetroMenuEntry.Action(activity.getString(R.string.retro_lr_pause), RetroDrawerIcons.Pause) {
+                    activity.pauseGame()
+                    menu.close()
+                }
+            },
+            RetroMenuEntry.Action(activity.getString(R.string.retro_lr_exit), RetroDrawerIcons.Exit, danger = true) {
+                onExit()
+            },
+        )
+}
+
+object DolphinNetplayHud {
+    var hosting by mutableStateOf(false)
+        private set
+    var hostCode by mutableStateOf<String?>(null)
+        private set
+    var members by mutableStateOf<List<String>>(emptyList())
+        private set
+
+    fun update(hosting: Boolean, hostCode: String?, members: List<String>) {
+        this.hosting = hosting
+        this.hostCode = hostCode
+        this.members = members
+    }
+}
diff --git a/app/src/main/feature/retro/DolphinNetplayUi.kt b/app/src/main/feature/retro/DolphinNetplayUi.kt
new file mode 100644
index 000000000..963aa0d42
--- /dev/null
+++ b/app/src/main/feature/retro/DolphinNetplayUi.kt
@@ -0,0 +1,135 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.material3.Text
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+import org.dolphinemu.dolphinemu.wn.DolphinNetplay
+
+@Composable
+fun DolphinNetplaySettingsSection(
+    systemId: String,
+    version: Int,
+    onChanged: () -> Unit,
+) {
+    val context = LocalContext.current
+    @Suppress("UNUSED_EXPRESSION")
+    version
+
+    val enabled = RetroDefaults.netplayEnabled(context, systemId)
+    val isHost = RetroDefaults.netplayHostMode(context, systemId)
+    val traversal = RetroDefaults.netplayTraversal(context, systemId)
+    val player = RetroDefaults.netplayPlayerName(context)
+    val host = RetroDefaults.netplayHost(context, systemId)
+    val hostCode = RetroDefaults.netplayHostCode(context, systemId)
+    val port = RetroDefaults.netplayPort(context, systemId)
+
+    RetroSettingGroup {
+        RetroSettingSwitch(
+            stringResource(R.string.retro_gs_netplay_enable),
+            enabled,
+            subtitle = stringResource(R.string.retro_gs_netplay_enable_subtitle),
+        ) {
+            RetroDefaults.setNetplayEnabled(context, systemId, it)
+            onChanged()
+        }
+
+        if (enabled) {
+            RetroSettingTextField(
+                stringResource(R.string.retro_netplay_player_name),
+                player,
+                stringResource(R.string.retro_netplay_player_name_hint),
+            ) {
+                RetroDefaults.setNetplayPlayerName(context, it)
+                onChanged()
+            }
+
+            RetroSettingDropdown(
+                stringResource(R.string.retro_netplay_launch_mode),
+                listOf(
+                    stringResource(R.string.retro_netplay_mode_host),
+                    stringResource(R.string.retro_netplay_mode_join),
+                ),
+                if (isHost) 0 else 1,
+            ) { index ->
+                RetroDefaults.setNetplayHostMode(context, systemId, index == 0)
+                onChanged()
+            }
+
+            RetroSettingDropdown(
+                stringResource(R.string.retro_netplay_connection),
+                listOf(
+                    stringResource(R.string.retro_netplay_conn_direct),
+                    stringResource(R.string.retro_netplay_conn_traversal),
+                ),
+                if (traversal) 1 else 0,
+            ) { index ->
+                RetroDefaults.setNetplayTraversal(context, systemId, index == 1)
+                onChanged()
+            }
+
+            if (!isHost && traversal) {
+                RetroNetplayEditField(
+                    label = stringResource(R.string.retro_netplay_host_code),
+                    value = hostCode,
+                    placeholder = stringResource(R.string.retro_netplay_host_code_hint),
+                ) {
+                    RetroDefaults.setNetplayHostCode(context, systemId, it)
+                    onChanged()
+                }
+            } else if (!isHost) {
+                RetroNetplayEditField(
+                    label = stringResource(R.string.retro_gs_netplay_host),
+                    value = host,
+                    placeholder = stringResource(R.string.retro_gs_netplay_host_hint),
+                ) {
+                    RetroDefaults.setNetplayHost(context, systemId, it)
+                    onChanged()
+                }
+            }
+
+            if (!traversal) {
+                RetroNetplayEditField(
+                    label = stringResource(R.string.retro_gs_netplay_port),
+                    value = port.toString(),
+                    placeholder = DolphinNetplay.DEFAULT_PORT.toString(),
+                    numeric = true,
+                ) { entered ->
+                    val p = entered.toIntOrNull() ?: DolphinNetplay.DEFAULT_PORT
+                    RetroDefaults.setNetplayPort(context, systemId, p)
+                    onChanged()
+                }
+            }
+
+            val hint =
+                when {
+                    isHost && traversal -> R.string.retro_netplay_dolphin_host_online_hint
+                    isHost -> R.string.retro_netplay_dolphin_host_lan_hint
+                    traversal -> R.string.retro_netplay_dolphin_join_online_hint
+                    else -> R.string.retro_netplay_dolphin_join_lan_hint
+                }
+            Spacer(Modifier.height(8.dp))
+            Text(
+                stringResource(hint),
+                color = GameSettingsStyle.TextDim,
+                fontSize = 11.sp,
+                lineHeight = 15.sp,
+            )
+            Text(
+                stringResource(R.string.retro_netplay_dolphin_help),
+                color = GameSettingsStyle.TextDim,
+                fontSize = 11.sp,
+                lineHeight = 15.sp,
+                modifier = Modifier.padding(top = 6.dp),
+            )
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/Gen1CloudSync.kt b/app/src/main/feature/retro/Gen1CloudSync.kt
new file mode 100644
index 000000000..0615554e3
--- /dev/null
+++ b/app/src/main/feature/retro/Gen1CloudSync.kt
@@ -0,0 +1,168 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.util.Log
+import androidx.preference.PreferenceManager
+import com.winlator.cmod.runtime.container.Shortcut
+import java.io.File
+
+object Gen1CloudSync {
+    private const val TAG = "WnGen1Cloud"
+
+    private const val STAGE_MARKER = ".winnative-staged"
+
+    private fun saveRoot(context: Context): File =
+        File(context.getExternalFilesDir(null), "save/pokemon-love2d")
+
+    fun stagingDir(context: Context, cloudId: String): File =
+        File(context.filesDir, "gen1-engine/cloud/$cloudId")
+
+    private fun versionKey(cloudId: String) = "gen1_cloud_version_$cloudId"
+
+    fun rememberVersion(context: Context, cloudId: String, version: String) {
+        if (version.isBlank()) return
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .edit().putString(versionKey(cloudId), version).apply()
+    }
+
+    private fun rememberedVersion(context: Context, cloudId: String): String? =
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .getString(versionKey(cloudId), null)
+            ?.takeIf { it.isNotBlank() }
+
+    fun cloudId(shortcut: Shortcut): String =
+        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.engineGameId(
+            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.customGameId(
+                shortcut.container.id,
+                shortcut.file.name,
+            ),
+        )
+
+    fun isEngineShortcut(shortcut: Shortcut?): Boolean =
+        shortcut != null && Gen1EmbedLaunch.isEnabled(shortcut)
+
+    fun stage(context: Context, cloudId: String): Boolean =
+        runCatching {
+            val root = saveRoot(context)
+            if (!root.isDirectory) return false
+            val staging = stagingDir(context, cloudId)
+            staging.deleteRecursively()
+
+            var any = false
+            fun copy(file: File) {
+                if (!file.isFile) return
+                val target = File(staging, file.relativeTo(root).path)
+                target.parentFile?.mkdirs()
+                file.copyTo(target, overwrite = true)
+                any = true
+            }
+
+            copy(File(root, "options.lua"))
+
+            val version = rememberedVersion(context, cloudId)
+            val slotRoots =
+                if (version != null) {
+                    listOf(File(root, "saves/$version"))
+                } else {
+                    File(root, "saves").listFiles()?.filter { it.isDirectory }.orEmpty()
+                }
+            slotRoots.forEach { dir ->
+                dir.listFiles()?.forEach(::copy)
+            }
+
+            copy(File(root, if (version == null) "save.lua" else legacyName(version)))
+
+            if (any) markStaged(context, cloudId)
+            any
+        }.onFailure { Log.w(TAG, "stage failed: ${it.message}") }.getOrDefault(false)
+
+    private fun markerFile(context: Context, cloudId: String) =
+        File(stagingDir(context, cloudId), STAGE_MARKER)
+
+    private fun markStaged(context: Context, cloudId: String) {
+        runCatching { markerFile(context, cloudId).writeText(stagedFingerprint(context, cloudId)) }
+    }
+
+    fun hasRestoredContent(context: Context, cloudId: String): Boolean {
+        val staging = stagingDir(context, cloudId)
+        if (!staging.isDirectory) return false
+        if (staging.walkTopDown().none { it.isFile && it.name != STAGE_MARKER }) return false
+        val marker = markerFile(context, cloudId)
+        val recorded = runCatching { marker.takeIf { it.isFile }?.readText() }.getOrNull()
+        return recorded != stagedFingerprint(context, cloudId)
+    }
+
+    fun applyRestoreIfPending(context: Context, cloudId: String) {
+        if (!hasRestoredContent(context, cloudId)) return
+        applyStaged(context, cloudId)
+        markStaged(context, cloudId)
+    }
+
+    private fun legacyName(version: String): String =
+        if (version == "red") "save.lua" else "save_$version.lua"
+
+    fun applyStaged(context: Context, cloudId: String) {
+        runCatching {
+            val staging = stagingDir(context, cloudId)
+            if (!staging.isDirectory) return
+            val root = saveRoot(context)
+            root.mkdirs()
+            staging.walkTopDown().filter { it.isFile }.forEach { file ->
+                val target = File(root, file.relativeTo(staging).path)
+                target.parentFile?.mkdirs()
+                file.copyTo(target, overwrite = true)
+            }
+            Log.i(TAG, "restored engine saves for $cloudId")
+        }.onFailure { Log.w(TAG, "applyStaged failed: ${it.message}") }
+    }
+
+    fun stagedFingerprint(context: Context, cloudId: String): String {
+        val staging = stagingDir(context, cloudId)
+        if (!staging.isDirectory) return ""
+        val digest = java.security.MessageDigest.getInstance("SHA-256")
+        staging.walkTopDown()
+            .filter { it.isFile && it.name != STAGE_MARKER }
+            .sortedBy { it.path }
+            .forEach { f -> digest.update("${f.relativeTo(staging).path}:${f.length()}".toByteArray()) }
+        return digest.digest().joinToString("") { "%02x".format(it) }
+    }
+
+    fun localTimestamp(context: Context, cloudId: String): Long {
+        val root = saveRoot(context)
+        if (!root.isDirectory) return 0L
+        val version = rememberedVersion(context, cloudId)
+        val dirs =
+            if (version != null) {
+                listOf(File(root, "saves/$version"))
+            } else {
+                File(root, "saves").listFiles()?.filter { it.isDirectory }.orEmpty()
+            }
+        return dirs.flatMap { it.listFiles()?.toList().orEmpty() }
+            .filter { it.isFile }
+            .maxOfOrNull { it.lastModified() } ?: 0L
+    }
+
+    fun refreshForBackup(context: Context, shortcut: Shortcut) {
+        if (!isEngineShortcut(shortcut)) return
+        stage(context, cloudId(shortcut))
+    }
+
+    fun queueBackup(context: Context, cloudId: String, gameName: String) {
+        if (!stage(context, cloudId)) {
+            Log.i(TAG, "nothing to back up for $cloudId")
+            return
+        }
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        val fingerprint = stagedFingerprint(context, cloudId)
+        if (fingerprint.isNotEmpty() && fingerprint == prefs.getString("retro_cloud_fp_$cloudId", null)) {
+            Log.i(TAG, "engine saves unchanged, skipping upload for $cloudId")
+            return
+        }
+        prefs.edit()
+            .putString("retro_pending_backup_id", cloudId)
+            .putString("retro_pending_backup_name", gameName)
+            .putString("retro_cloud_fp_$cloudId", fingerprint)
+            .apply()
+        Log.i(TAG, "queued engine save backup for $cloudId")
+    }
+}
diff --git a/app/src/main/feature/retro/Gen1EmbedLaunch.kt b/app/src/main/feature/retro/Gen1EmbedLaunch.kt
new file mode 100644
index 000000000..6e3688f0d
--- /dev/null
+++ b/app/src/main/feature/retro/Gen1EmbedLaunch.kt
@@ -0,0 +1,156 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.winlator.cmod.runtime.container.Shortcut
+import java.io.File
+import java.security.MessageDigest
+
+object Gen1EmbedLaunch {
+    const val KEY_ENGINE_3D = "retro_engine_3d"
+
+    const val VOXEL_MOD_ID = "DRAMATIC_SHAPE"
+
+    private val COMPATIBLE = mapOf(
+        "ea9bcae617fdf159b045185467ae58b2e4a48b9a" to "red",
+        "d7037c83e1ae5b39bde3c30787637ba1d4c48ce2" to "blue",
+        "cc7d03262ebfaf2f06772c1a480c7d9d5f4a38e1" to "yellow",
+    )
+
+    fun versionForRom(rom: File): String? {
+        if (!rom.isFile || rom.length() != 1024L * 1024L) return null
+        val digest = MessageDigest.getInstance("SHA-1")
+        rom.inputStream().use { input ->
+            val buf = ByteArray(64 * 1024)
+            while (true) {
+                val n = input.read(buf)
+                if (n <= 0) break
+                digest.update(buf, 0, n)
+            }
+        }
+        val sha1 = digest.digest().joinToString("") { "%02x".format(it) }
+        return COMPATIBLE[sha1]
+    }
+
+    fun isCompatible(context: Context, shortcut: Shortcut): Boolean =
+        Gen1EngineActivity.isInstalled(context) &&
+            versionForRom(File(RetroShortcuts.romPath(shortcut))) != null
+
+    fun isEnabled(shortcut: Shortcut): Boolean =
+        shortcut.getExtra(KEY_ENGINE_3D) == "1"
+
+    fun shouldLaunch(context: Context, shortcut: Shortcut): Boolean =
+        isEnabled(shortcut) && isCompatible(context, shortcut)
+
+    fun launch(context: Context, shortcut: Shortcut) {
+        val intent = launchIntent(context, shortcut) ?: return
+        if (context !is android.app.Activity) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        context.startActivity(intent)
+    }
+
+    fun launchIntentIfSupported(context: Context, shortcut: Shortcut): Intent? {
+        if (!Gen1EngineActivity.isInstalled(context)) return null
+        val intent = launchIntent(context, shortcut) ?: return null
+        prepareLaunch(context, shortcut, intent.getStringExtra(Gen1EngineActivity.EXTRA_VERSION).orEmpty())
+        return intent
+    }
+
+    private fun syncCloudSaves(context: Context, shortcut: Shortcut) {
+        if (context !is android.app.Activity) return
+        if (shortcut.getExtra("cloud_sync_enabled", "1") == "0") return
+        val gameName = shortcut.getExtra("custom_name", shortcut.name)
+        val cloudId = Gen1CloudSync.cloudId(shortcut)
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        runCatching {
+            kotlinx.coroutines.runBlocking {
+                kotlinx.coroutines.withTimeout(12_000L) {
+                    val entries =
+                        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.listGoogleHistory(
+                            context,
+                            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.CUSTOM,
+                            cloudId,
+                            com.winlator.cmod.feature.sync.google.GoogleAuthMode.RESUME,
+                        )
+                    val latest = entries.maxByOrNull { it.timestampMs } ?: return@withTimeout
+                    val localTs = Gen1CloudSync.localTimestamp(context, cloudId)
+                    val mark = prefs.getLong("retro_cloud_mark_$cloudId", 0L)
+                    val restore: suspend () -> Unit = {
+                        val result =
+                            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.restoreFromGoogle(
+                                context,
+                                latest,
+                                com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.CUSTOM,
+                                cloudId,
+                                com.winlator.cmod.feature.sync.google.GoogleAuthMode.RESUME,
+                                customSaveDir = Gen1CloudSync.stagingDir(context, cloudId),
+                            )
+                        if (result.success) {
+                            Gen1CloudSync.applyStaged(context, cloudId)
+                            prefs.edit().putLong("retro_cloud_mark_$cloudId", latest.timestampMs).apply()
+                        }
+                    }
+                    if (localTs == 0L) {
+                        restore()
+                    } else if (latest.timestampMs > localTs + 120_000L && latest.timestampMs > mark) {
+                        if (askCloudConflict(context, gameName)) {
+                            restore()
+                        } else {
+                            prefs.edit().putLong("retro_cloud_mark_$cloudId", latest.timestampMs).apply()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun askCloudConflict(activity: android.app.Activity, gameName: String): Boolean {
+        val latch = java.util.concurrent.CountDownLatch(1)
+        val useCloud = java.util.concurrent.atomic.AtomicBoolean(false)
+        activity.runOnUiThread {
+            androidx.appcompat.app.AlertDialog.Builder(activity)
+                .setTitle(activity.getString(com.winlator.cmod.R.string.retro_lr_cloud_save))
+                .setMessage(
+                    activity.getString(com.winlator.cmod.R.string.retro_lr_cloud_conflict_message, gameName),
+                )
+                .setCancelable(false)
+                .setPositiveButton(activity.getString(com.winlator.cmod.R.string.retro_lr_use_cloud_save)) { _, _ ->
+                    useCloud.set(true)
+                    latch.countDown()
+                }
+                .setNegativeButton(activity.getString(com.winlator.cmod.R.string.retro_scr_keep_local_save)) { _, _ ->
+                    latch.countDown()
+                }
+                .show()
+        }
+        latch.await()
+        return useCloud.get()
+    }
+
+    fun prepareLaunch(context: Context, shortcut: Shortcut, version: String) {
+        val cloudId = Gen1CloudSync.cloudId(shortcut)
+        Gen1CloudSync.rememberVersion(context, cloudId, version)
+        Gen1CloudSync.applyRestoreIfPending(context, cloudId)
+        syncCloudSaves(context, shortcut)
+    }
+
+    fun launchIntent(context: Context, shortcut: Shortcut): Intent? {
+        val rom = File(RetroShortcuts.romPath(shortcut))
+        val version = versionForRom(rom) ?: return null
+
+        return Intent(context, Gen1EngineActivity::class.java).apply {
+            data = Uri.fromFile(Gen1EngineActivity.gameArchive(context))
+            putExtra(Gen1EngineActivity.EXTRA_ROM_PATH, rom.absolutePath)
+            putExtra(Gen1EngineActivity.EXTRA_VERSION, version)
+            putExtra(
+                Gen1EngineActivity.EXTRA_GAME_NAME,
+                shortcut.getExtra("custom_name", shortcut.name),
+            )
+            putExtra(Gen1EngineActivity.EXTRA_SHORTCUT_PATH, shortcut.file.absolutePath)
+            putExtra(
+                Gen1EngineActivity.EXTRA_ARTWORK_PATH,
+                shortcut.getExtra("customCoverArtPath"),
+            )
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/Gen1EngineActivity.kt b/app/src/main/feature/retro/Gen1EngineActivity.kt
new file mode 100644
index 000000000..f4a71f844
--- /dev/null
+++ b/app/src/main/feature/retro/Gen1EngineActivity.kt
@@ -0,0 +1,911 @@
+package com.winlator.cmod.feature.retro
+
+import android.os.Bundle
+import android.system.Os
+import android.util.Log
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.VolumeUp
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
+import androidx.savedstate.SavedStateRegistry
+import androidx.savedstate.SavedStateRegistryController
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.ui.FrameRating
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import org.love2d.sdl.SDLActivity
+import java.io.File
+
+class Gen1EngineActivity :
+    org.love2d.android.GameActivity(),
+    RetroInputView.Listener,
+    LifecycleOwner,
+    ViewModelStoreOwner,
+    SavedStateRegistryOwner {
+    private var pad: RetroInputView? = null
+    private var menuView: ComposeView? = null
+    private lateinit var bridge: Gen1EngineBridge
+
+    private var touchControls = true
+
+    private var persistShortcut: Shortcut? = null
+
+    private var loadingVisible by androidx.compose.runtime.mutableStateOf(true)
+    private var importState by
+        androidx.compose.runtime.mutableStateOf<Gen1EngineBridge.Import?>(null)
+    private var artwork by
+        androidx.compose.runtime.mutableStateOf<android.graphics.Bitmap?>(null)
+
+    private enum class SlotAction { SAVE, LOAD }
+
+    private var slotAction = SlotAction.LOAD
+    private val menu = RetroMenuController()
+    private val handler = android.os.Handler(android.os.Looper.getMainLooper())
+
+    private val lifecycleRegistry = LifecycleRegistry(this)
+    private val savedStateController = SavedStateRegistryController.create(this)
+    private val store = ViewModelStore()
+
+    override val lifecycle: Lifecycle get() = lifecycleRegistry
+    override val viewModelStore: ViewModelStore get() = store
+    override val savedStateRegistry: SavedStateRegistry get() = savedStateController.savedStateRegistry
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        savedStateController.performSave(outState)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+        bridge.startPolling(::onEngineState)
+    }
+
+    override fun onStop() {
+        queueCloudBackup()
+        bridge.stopPolling()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+        super.onStop()
+    }
+
+    override fun onDestroy() {
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        handler.removeCallbacksAndMessages(null)
+        bridge.shutdown()
+        store.clear()
+        super.onDestroy()
+    }
+
+    private val heldDirections = HashSet<Int>()
+
+    private fun sendKey(keyCode: Int, down: Boolean) {
+        runCatching {
+            if (down) SDLActivity.onNativeKeyDown(keyCode) else SDLActivity.onNativeKeyUp(keyCode)
+        }.onFailure { Log.w(TAG, "key inject failed: ${it.message}") }
+    }
+
+    override fun onButton(keyCode: Int, down: Boolean) {
+        if (menu.visible) {
+            menu.handleKey(
+                keyCode,
+                if (down) android.view.KeyEvent.ACTION_DOWN else android.view.KeyEvent.ACTION_UP,
+            )
+            return
+        }
+        val mapped = when (keyCode) {
+            android.view.KeyEvent.KEYCODE_BUTTON_A -> android.view.KeyEvent.KEYCODE_Z
+            android.view.KeyEvent.KEYCODE_BUTTON_B -> android.view.KeyEvent.KEYCODE_X
+            android.view.KeyEvent.KEYCODE_BUTTON_START -> android.view.KeyEvent.KEYCODE_ESCAPE
+            android.view.KeyEvent.KEYCODE_BUTTON_SELECT -> android.view.KeyEvent.KEYCODE_TAB
+            else -> return
+        }
+        sendKey(mapped, down)
+    }
+
+    override fun onDpad(x: Float, y: Float) {
+        if (menu.visible) {
+            menu.handleAxis(x, y)
+            return
+        }
+        val wanted = HashSet<Int>(4)
+        if (x <= -DPAD_DEADZONE) wanted.add(android.view.KeyEvent.KEYCODE_DPAD_LEFT)
+        if (x >= DPAD_DEADZONE) wanted.add(android.view.KeyEvent.KEYCODE_DPAD_RIGHT)
+        if (y <= -DPAD_DEADZONE) wanted.add(android.view.KeyEvent.KEYCODE_DPAD_UP)
+        if (y >= DPAD_DEADZONE) wanted.add(android.view.KeyEvent.KEYCODE_DPAD_DOWN)
+
+        for (k in heldDirections - wanted) sendKey(k, false)
+        for (k in wanted - heldDirections) sendKey(k, true)
+        heldDirections.clear()
+        heldDirections.addAll(wanted)
+    }
+
+    override fun onStick(x: Float, y: Float) = Unit
+
+    override fun onRightStick(x: Float, y: Float) = Unit
+
+    override fun onMenu() {
+        runOnUiThread { openMenu() }
+    }
+
+    private fun openMenu() {
+        releaseAllKeys()
+        menu.open()
+        pollFaster()
+    }
+
+    private fun releaseAllKeys() {
+        for (k in heldDirections) sendKey(k, false)
+        heldDirections.clear()
+    }
+
+    override fun dispatchKeyEvent(event: android.view.KeyEvent): Boolean {
+        val keyCode = event.keyCode
+        if (keyCode == android.view.KeyEvent.KEYCODE_BACK) {
+            if (event.action == android.view.KeyEvent.ACTION_UP) {
+                if (menu.visible) {
+                    menu.handleKey(keyCode, android.view.KeyEvent.ACTION_UP)
+                } else {
+                    openMenu()
+                }
+            }
+            return true
+        }
+        if (menu.visible) {
+            menu.handleKey(keyCode, event.action)
+            return true
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
+    private fun buildTabs(): List<RetroTabSpec> =
+        listOf(
+            RetroTabSpec(null, RetroDrawerIcons.Play, getString(R.string.retro_tab_menu)),
+            RetroTabSpec(
+                RetroPane.DISPLAY,
+                Icons.Outlined.Monitor,
+                getString(R.string.retro_tab_display),
+            ),
+            RetroTabSpec(
+                RetroPane.SOUND,
+                Icons.AutoMirrored.Outlined.VolumeUp,
+                getString(R.string.retro_tab_sound),
+            ),
+            RetroTabSpec(
+                RetroPane.PERFORMANCE,
+                Icons.Outlined.Bolt,
+                getString(R.string.retro_ps2_tab_performance),
+            ),
+            RetroTabSpec(
+                RetroPane.HUD,
+                RetroDrawerIcons.Hud,
+                getString(R.string.retro_tab_hud),
+            ),
+            RetroTabSpec(
+                RetroPane.CONTROLS,
+                Icons.Outlined.SportsEsports,
+                getString(R.string.retro_tab_controls),
+            ),
+            RetroTabSpec(
+                RetroPane.SYSTEM,
+                Icons.Outlined.Tune,
+                getString(R.string.retro_tab_system),
+            ),
+        )
+
+    private fun paneForRow(id: String): RetroPane =
+        when {
+            Gen1EngineBridge.isModRow(id) -> RetroPane.DISPLAY
+            id in SOUND_ROWS -> RetroPane.SOUND
+            id in DISPLAY_ROWS -> RetroPane.DISPLAY
+            id in PERFORMANCE_ROWS -> RetroPane.PERFORMANCE
+            id in CONTROL_ROWS -> RetroPane.CONTROLS
+            else -> RetroPane.SYSTEM
+        }
+
+    private fun rowEntry(row: Gen1EngineBridge.Row): RetroMenuEntry =
+        when {
+            row.values.isNotEmpty() ->
+                RetroMenuEntry.Choice(row.label, row.values, row.selectedIndex) { index ->
+                    bridge.setRow(row.id, index)
+                    pollFaster()
+                }
+            row.steppable ->
+                RetroMenuEntry.Stepper(row.label, row.value) { direction ->
+                    bridge.step(row.id, direction)
+                    pollFaster()
+                }
+            else ->
+                RetroMenuEntry.Action(row.label, RetroDrawerIcons.EditLayout, subtitle = row.value) {
+                    bridge.activate(row.id)
+                    menu.close()
+                }
+        }
+
+    private fun toggleHalf(
+        row: Gen1EngineBridge.Row,
+        label: String,
+        onIndex: Int,
+    ): RetroMenuEntry.Toggle {
+        val offIndex = if (onIndex == 0) 1 else 0
+        return RetroMenuEntry.Toggle(
+            label = label,
+            subtitle = row.values.getOrNull(row.selectedIndex) ?: row.value,
+            checked = row.selectedIndex == onIndex,
+        ) { wanted ->
+            bridge.setRow(row.id, if (wanted) onIndex else offIndex)
+            pollFaster()
+        }
+    }
+
+    private fun engineRows(pane: RetroPane): List<RetroMenuEntry> {
+        val rows =
+            bridge.state.rows.filter { paneForRow(it.id) == pane && it.id !in HIDDEN_ROWS }
+        val ordered =
+            if (pane == RetroPane.DISPLAY) {
+                rows.filter { Gen1EngineBridge.isModRow(it.id) } +
+                    rows.filterNot { Gen1EngineBridge.isModRow(it.id) }
+            } else {
+                rows
+            }
+
+        val animations = ordered.firstOrNull { it.id == ANIMATIONS_ROW }?.takeIf { it.values.size == 2 }
+        val videoMode = ordered.firstOrNull { it.id == VIDEO_MODE_ROW }?.takeIf { it.values.size == 2 }
+        val pair =
+            if (animations != null && videoMode != null) {
+                RetroMenuEntry.TogglePair(
+                    left = toggleHalf(animations, animations.label, onIndex = 0),
+                    right = toggleHalf(videoMode, getString(R.string.retro_engine_fullscreen), onIndex = 1),
+                )
+            } else {
+                null
+            }
+
+        return buildList {
+            for (row in ordered) {
+                when {
+                    pair != null && row.id == ANIMATIONS_ROW -> add(pair)
+                    pair != null && row.id == VIDEO_MODE_ROW -> Unit
+                    else -> add(rowEntry(row))
+                }
+            }
+        }
+    }
+
+    private fun buildEntriesFor(pane: RetroPane?): List<RetroMenuEntry> =
+        when (pane) {
+            null -> buildMainEntries()
+            RetroPane.SAVES -> buildSaveEntries()
+            RetroPane.CONTROLS -> buildControlEntries() + engineRows(RetroPane.CONTROLS)
+            RetroPane.HUD -> buildHudEntries()
+            else -> engineRows(pane)
+        }
+
+    private fun buildMainEntries(): List<RetroMenuEntry> =
+        buildList {
+            val activeSlot = bridge.state.slots.firstOrNull { it.active }?.name
+            add(
+                RetroMenuEntry.Action(
+                    getString(R.string.retro_engine_save),
+                    RetroDrawerIcons.Save,
+                    subtitle = activeSlot,
+                ) {
+                    slotAction = SlotAction.SAVE
+                    menu.showPane(RetroPane.SAVES)
+                },
+            )
+            add(
+                RetroMenuEntry.Action(
+                    getString(R.string.retro_engine_load),
+                    RetroDrawerIcons.Load,
+                    subtitle = activeSlot,
+                ) {
+                    slotAction = SlotAction.LOAD
+                    menu.showPane(RetroPane.SAVES)
+                },
+            )
+            add(
+                RetroMenuEntry.Action(
+                    getString(R.string.retro_lr_fast_forward),
+                    RetroDrawerIcons.FastForward,
+                    active = bridge.state.fastForward,
+                ) {
+                    bridge.setFastForward(!bridge.state.fastForward)
+                    pollFaster()
+                },
+            )
+            add(
+                RetroMenuEntry.Action(
+                    getString(R.string.retro_lr_hud),
+                    RetroDrawerIcons.Hud,
+                    active = hudVisible,
+                ) { setHudVisible(!hudVisible) },
+            )
+            add(
+                RetroMenuEntry.Action(getString(R.string.retro_lr_reset), RetroDrawerIcons.Reset) {
+                    bridge.reset()
+                    menu.close()
+                },
+            )
+            add(
+                RetroMenuEntry.Action(
+                    getString(R.string.retro_lr_achievements),
+                    RetroDrawerIcons.Achievements,
+                    subtitle = getString(R.string.retro_engine_achievements_unavailable),
+                ) {
+                    toast(getString(R.string.retro_engine_achievements_unavailable))
+                },
+            )
+        }
+
+    private fun slotSubtitle(slot: Gen1EngineBridge.Slot): String {
+        val parts = mutableListOf<String>()
+        if (slot.exists) {
+            if (slot.playTime.isNotEmpty()) parts += slot.playTime
+            if (slot.badges > 0) parts += resources.getQuantityString(R.plurals.retro_engine_badges, slot.badges, slot.badges)
+            if (slot.caught > 0) parts += getString(R.string.retro_engine_caught, slot.caught)
+        }
+        if (slot.active) parts += getString(R.string.retro_engine_slot_active_only)
+        return parts.joinToString(SUBTITLE_SEPARATOR)
+    }
+
+    private fun buildSaveEntries(): List<RetroMenuEntry> =
+        buildList {
+            val slots = bridge.state.slots
+            slots.forEachIndexed { index, slot ->
+                add(
+                    RetroMenuEntry.SaveSlot(
+                        slot = index,
+                        title = slot.name,
+                        subtitle = slotSubtitle(slot),
+                        filled = slot.exists,
+                        onClick = {
+                            when (slotAction) {
+                                SlotAction.SAVE -> {
+                                    bridge.saveToSlot(slot.id)
+                                    toast(getString(R.string.retro_engine_saved_to, slot.name))
+                                    queueCloudBackupAfterSave()
+                                    pollFaster()
+                                    menu.close()
+                                }
+                                SlotAction.LOAD ->
+                                    if (!slot.exists) {
+                                        toast(getString(R.string.retro_engine_slot_empty))
+                                    } else {
+                                        bridge.loadSlot(slot.id)
+                                        toast(getString(R.string.retro_engine_loaded_from, slot.name))
+                                        pollFaster()
+                                        menu.close()
+                                    }
+                            }
+                        },
+                        onRename = {
+                            menu.renamePrompt =
+                                RetroRenamePrompt(
+                                    title = getString(R.string.retro_engine_rename_slot),
+                                    initial = slot.name,
+                                ) { entered ->
+                                    val name = entered?.trim().orEmpty()
+                                    if (name.isNotEmpty() && name != slot.name) {
+                                        bridge.renameSlot(slot.id, name)
+                                        pollFaster()
+                                    }
+                                }
+                        },
+                    ),
+                )
+            }
+            if (slots.isEmpty()) {
+                add(
+                    RetroMenuEntry.Action(
+                        getString(R.string.retro_engine_no_slots),
+                        RetroDrawerIcons.Save,
+                    ) {},
+                )
+            }
+            if (slotAction == SlotAction.SAVE) {
+                add(
+                    RetroMenuEntry.Action(getString(R.string.retro_engine_new_slot), RetroDrawerIcons.Add) {
+                        bridge.newSlot()
+                        queueCloudBackupAfterSave()
+                        pollFaster()
+                        menu.close()
+                    },
+                )
+            }
+        }
+
+    private fun buildControlEntries(): List<RetroMenuEntry> =
+        RetroControlsMenu.build(
+            RetroControlsMenu.Host(
+                context = this,
+                overlay = pad,
+                menu = menu,
+                systemId = RetroSystems.GAMEBOY.id,
+                touchControls = { touchControls },
+                onTouchControls = { value ->
+                    touchControls = value
+                    applyTouchControls()
+                    persistExtra(RetroShortcuts.KEY_TOUCH_CONTROLS, if (value) "1" else "0")
+                },
+                adaptiveSticks = { false },
+                onAdaptiveSticks = { },
+                orientationLabel = {
+                    val host = mLayout
+                    if ((host?.height ?: 0) > (host?.width ?: 0)) {
+                        getString(R.string.retro_lr_portrait)
+                    } else {
+                        getString(R.string.retro_lr_landscape)
+                    }
+                },
+                onCloseMenu = { menu.close() },
+                showStickInversion = false,
+            ),
+        )
+
+    private var hudVisible = false
+    private var hudStyle = HudStyle()
+    private var hudElements = RetroHudSupport.defaultElements()
+    private var frameRating: FrameRating? = null
+
+    private fun buildHudEntries(): List<RetroMenuEntry> =
+        RetroHudSupport.buildHudEntries(
+            context = this,
+            hudVisible = hudVisible,
+            style = hudStyle,
+            elements = hudElements,
+            onMaster = { setHudVisible(it) },
+            onStyle = { next ->
+                hudStyle = next
+                frameRating?.let { RetroHudSupport.applyStyle(it, next, hudElements) }
+                RetroHudSupport.saveGlobalHudStyle(this, next)
+            },
+            onElements = { next ->
+                hudElements = next
+                frameRating?.let { RetroHudSupport.applyStyle(it, hudStyle, next) }
+                RetroHudSupport.saveGlobalHudElements(this, next)
+            },
+            onRebuild = { menu.rebuild() },
+        )
+
+    private fun setHudVisible(value: Boolean) {
+        hudVisible = value
+        if (value) {
+            showHud()
+        } else {
+            frameRating?.visibility = android.view.View.GONE
+            handler.removeCallbacks(hudTick)
+        }
+        persistExtra(RetroShortcuts.KEY_HUD, if (value) "1" else "0")
+        menu.rebuild()
+    }
+
+    private val hudTick =
+        object : Runnable {
+            override fun run() {
+                val rating = frameRating ?: return
+                val fps = bridge.state.fps
+                if (!hudVisible || bridge.state.paused || fps <= 0) {
+                    handler.postDelayed(this, HUD_IDLE_TICK_MS)
+                    return
+                }
+                rating.recordGameFrame()
+                handler.postDelayed(this, (1000L / fps).coerceAtLeast(1L))
+            }
+        }
+
+    private fun showHud() {
+        val host = mLayout ?: return
+        var rating = frameRating
+        if (rating == null) {
+            rating = RetroHudSupport.createFrameRating(this, ENGINE_RENDERER_LABEL)
+            frameRating = rating
+            host.addView(rating, host.indexOfChild(menuView).coerceAtLeast(0))
+            RetroHudSupport.applyStyle(rating, hudStyle, hudElements)
+        }
+        rating.visibility = android.view.View.VISIBLE
+        rating.reset()
+        handler.removeCallbacks(hudTick)
+        handler.post(hudTick)
+    }
+
+    private fun buildBottomEntries(): List<RetroMenuEntry.Action> =
+        buildList {
+            if (bridge.state.paused) {
+                add(
+                    RetroMenuEntry.Action(
+                        getString(R.string.retro_lr_resume),
+                        RetroDrawerIcons.Resume,
+                        active = true,
+                    ) {
+                        bridge.setPaused(false)
+                        pollFaster()
+                        menu.close()
+                    },
+                )
+            } else {
+                add(
+                    RetroMenuEntry.Action(getString(R.string.retro_lr_pause), RetroDrawerIcons.Pause) {
+                        bridge.setPaused(true)
+                        pollFaster()
+                    },
+                )
+            }
+            add(
+                RetroMenuEntry.Action(getString(R.string.retro_lr_exit), RetroDrawerIcons.Exit, danger = true) {
+                    bridge.saveGame()
+                    queueCloudBackupAfterSave()
+                    menu.close()
+                    handler.postDelayed({ finish() }, EXIT_SAVE_GRACE_MS)
+                },
+            )
+        }
+
+    private fun applyTouchControls() {
+        pad?.visibility = if (touchControls) android.view.View.VISIBLE else android.view.View.GONE
+        val host = mLayout ?: return
+        pad?.let { view -> host.post { updateGameArea(host, view) } }
+    }
+
+    private fun persistExtra(key: String, value: String) {
+        val path = intent.getStringExtra(EXTRA_SHORTCUT_PATH) ?: return
+        Thread {
+            runCatching {
+                val shortcut =
+                    persistShortcut ?: run {
+                        val file = File(path)
+                        if (!file.isFile) return@runCatching
+                        val cm = ContainerManager(this)
+                        Shortcut(cm.retroContainer, file)
+                            .also { persistShortcut = it }
+                    }
+                shortcut.putExtra(key, value)
+                shortcut.saveData()
+            }.onFailure { Log.w(TAG, "could not persist $key: ${it.message}") }
+        }.start()
+    }
+
+    private fun loadPersistedSettings() {
+        val path = intent.getStringExtra(EXTRA_SHORTCUT_PATH)
+        val shortcut =
+            runCatching {
+                path?.let { File(it) }?.takeIf { it.isFile }?.let { file ->
+                    Shortcut(
+                        ContainerManager(this).retroContainer,
+                        file,
+                    )
+                }
+            }.getOrNull()
+        persistShortcut = shortcut
+
+        touchControls =
+            shortcut?.getExtra(RetroShortcuts.KEY_TOUCH_CONTROLS)?.takeIf { it.isNotEmpty() }?.let { it != "0" }
+                ?: RetroDefaults.touchControls(this, RetroSystems.GAMEBOY.id)
+        hudVisible = shortcut?.getExtra(RetroShortcuts.KEY_HUD)?.takeIf { it.isNotEmpty() }?.let { it != "0" } ?: false
+        hudStyle = RetroHudSupport.loadGlobalHudStyle(this)
+        hudElements = RetroHudSupport.loadGlobalHudElements(this)
+    }
+
+    private fun queueCloudBackup() {
+        val shortcut = persistShortcut ?: return
+        if (shortcut.getExtra("cloud_sync_enabled", "1") == "0") return
+        val gameName = intent.getStringExtra(EXTRA_GAME_NAME).orEmpty()
+            .ifBlank { shortcut.getExtra("custom_name", shortcut.name) }
+        val app = applicationContext
+        Thread {
+            runCatching { Gen1CloudSync.queueBackup(app, Gen1CloudSync.cloudId(shortcut), gameName) }
+                .onFailure { Log.w(TAG, "could not queue cloud backup: ${it.message}") }
+        }.apply { name = "gen1-cloud-queue"; start() }
+    }
+
+    private fun queueCloudBackupAfterSave() {
+        handler.postDelayed({ queueCloudBackup() }, SAVE_SETTLE_MS)
+    }
+
+    private fun toast(text: String) {
+        android.widget.Toast.makeText(this, text, android.widget.Toast.LENGTH_SHORT).show()
+    }
+
+    private fun onEngineState(state: Gen1EngineBridge.State, menuChanged: Boolean) {
+        importState = state.import
+        if (loadingVisible && state.booted) loadingVisible = false
+        if (menuChanged && menu.visible) menu.rebuild()
+    }
+
+    private fun pollFaster() = bridge.pollNow()
+
+    override fun loadLibraries() {
+        val dir = engineLibDir(this)
+        for (lib in ENGINE_LIBS) {
+            val so = File(dir, "lib$lib.so")
+            if (!so.isFile) {
+                throw UnsatisfiedLinkError("engine library missing from bundle: ${so.absolutePath}")
+            }
+            System.load(so.absolutePath)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        savedStateController.performRestore(savedInstanceState)
+
+        val rom = intent.getStringExtra(EXTRA_ROM_PATH)
+        val version = intent.getStringExtra(EXTRA_VERSION)
+        Log.i(TAG, "onCreate rom=$rom version=$version")
+
+        val prefetch = startSettingsPrefetch()
+
+        Gen1ModInstaller.ensureInstalled(this)
+
+        bridge = Gen1EngineBridge(this)
+        bridge.clearStale()
+
+        runCatching {
+            if (!rom.isNullOrEmpty()) Os.setenv("POKEPORT_IMPORT_ROM", rom, true)
+            if (!version.isNullOrEmpty()) Os.setenv("POKEPORT_VERSION", version, true)
+        }.onFailure { Log.w(TAG, "could not set engine environment: ${it.message}") }
+
+        super.onCreate(savedInstanceState)
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+
+        menu.entriesProvider = { pane -> buildEntriesFor(pane) }
+        menu.bottomProvider = { buildBottomEntries() }
+        menu.tabs = buildTabs()
+
+        window.decorView.let { root ->
+            root.setViewTreeLifecycleOwner(this)
+            root.setViewTreeViewModelStoreOwner(this)
+            root.setViewTreeSavedStateRegistryOwner(this)
+        }
+
+        val host = mLayout
+        if (host == null) {
+            Log.w(TAG, "SDL layout missing; pad and menu not attached")
+            return
+        }
+
+        pad = RetroInputView(this, this, RetroSystems.GAMEBOY).also { view ->
+            view.loadStickInversion()
+            view.hapticStrength =
+                androidx.preference.PreferenceManager
+                    .getDefaultSharedPreferences(this)
+                    .getFloat(PREF_HAPTIC, DEFAULT_HAPTIC)
+            view.setCustomColors(RetroControlLayouts.loadColors(this, RetroSystems.GAMEBOY.id))
+
+            host.addView(
+                view,
+                android.widget.RelativeLayout.LayoutParams(
+                    android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+                    android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+                ),
+            )
+            host.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                updateGameArea(host, view)
+            }
+            host.post { updateGameArea(host, view) }
+        }
+
+        val menuComposeView =
+            ComposeView(this).apply {
+                elevation = MENU_ELEVATION
+                setViewTreeLifecycleOwner(this@Gen1EngineActivity)
+                setViewTreeViewModelStoreOwner(this@Gen1EngineActivity)
+                setViewTreeSavedStateRegistryOwner(this@Gen1EngineActivity)
+                setContent {
+                    WinNativeTheme {
+                        androidx.compose.runtime.LaunchedEffect(menu.visible, loadingVisible) {
+                            bridge.setPollFast(menu.visible || loadingVisible)
+                        }
+                        Box(Modifier.fillMaxSize()) {
+                            RetroDrawerMenu(menu)
+                            Gen1LoadingScreen(
+                                gameName = intent.getStringExtra(EXTRA_GAME_NAME).orEmpty(),
+                                artwork = artwork,
+                                state = importState,
+                                visible = loadingVisible,
+                            )
+                        }
+                    }
+                }
+            }
+        menuView = menuComposeView
+        host.addView(
+            menuComposeView,
+            android.widget.RelativeLayout.LayoutParams(
+                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+            ),
+        )
+
+        prefetch.join()
+
+        applyTouchControls()
+        if (hudVisible) host.post { showHud() }
+    }
+
+    private fun startSettingsPrefetch(): Thread =
+        Thread {
+            runCatching { loadPersistedSettings() }
+                .onFailure { Log.w(TAG, "could not read saved settings: ${it.message}") }
+
+            runCatching {
+                androidx.preference.PreferenceManager.getDefaultSharedPreferences(this)
+            }
+
+            val decoded =
+                intent.getStringExtra(EXTRA_ARTWORK_PATH)
+                    ?.takeIf { it.isNotBlank() }
+                    ?.let { path -> decodeArtwork(path) }
+            if (decoded != null) handler.post { artwork = decoded }
+        }.apply {
+            name = "gen1-settings"
+            priority = Thread.NORM_PRIORITY - 1
+            start()
+        }
+
+    private fun decodeArtwork(path: String): android.graphics.Bitmap? =
+        runCatching {
+            val bounds =
+                android.graphics.BitmapFactory.Options().apply { inJustDecodeBounds = true }
+            android.graphics.BitmapFactory.decodeFile(path, bounds)
+            val longest = maxOf(bounds.outWidth, bounds.outHeight)
+            if (longest <= 0) return@runCatching null
+            val target = (ARTWORK_MAX_DP * resources.displayMetrics.density).toInt().coerceAtLeast(1)
+            var sample = 1
+            while (longest / (sample * 2) >= target) sample *= 2
+            android.graphics.BitmapFactory.decodeFile(
+                path,
+                android.graphics.BitmapFactory.Options().apply { inSampleSize = sample },
+            )
+        }.getOrNull()
+
+    private fun updateGameArea(host: android.view.ViewGroup, view: RetroInputView) {
+        val w = host.width
+        val h = host.height
+        if (w <= 0 || h <= 0) return
+        val portrait = h >= w
+
+        val budgetHeight = if (portrait && touchControls) (h * PORTRAIT_GAME_HEIGHT_FRACTION).toInt() else h
+        val scale = minOf(w / GB_WIDTH, budgetHeight / GB_HEIGHT).coerceAtLeast(1)
+        val gameWidth = (GB_WIDTH * scale).toFloat()
+        val gameHeight = (GB_HEIGHT * scale).toFloat()
+
+        val left = (w - gameWidth) * 0.5f
+        val top = if (portrait && touchControls) 0f else (h - gameHeight) * 0.5f
+        val area = android.graphics.RectF(left, top, left + gameWidth, top + gameHeight)
+
+        view.setGameArea(area)
+        applySurfaceBounds(area)
+        applyFillScale(area, w, h)
+    }
+
+    private fun applyFillScale(area: android.graphics.RectF, hostWidth: Int, hostHeight: Int) {
+        val surface = mSurface ?: return
+        if (touchControls || area.width() <= 0f || area.height() <= 0f) {
+            surface.scaleX = 1f
+            surface.scaleY = 1f
+            return
+        }
+        surface.pivotX = area.width() * 0.5f
+        surface.pivotY = area.height() * 0.5f
+        surface.scaleX = hostWidth / area.width()
+        surface.scaleY = hostHeight / area.height()
+    }
+
+    private fun applySurfaceBounds(area: android.graphics.RectF) {
+        val want =
+            android.graphics.Rect(
+                area.left.toInt(),
+                area.top.toInt(),
+                area.right.toInt(),
+                area.bottom.toInt(),
+            )
+        if (want.isEmpty || want == surfaceBounds) return
+        val surface = mSurface ?: return
+        surfaceBounds = want
+        surface.layoutParams =
+            android.widget.RelativeLayout.LayoutParams(want.width(), want.height()).apply {
+                leftMargin = want.left
+                topMargin = want.top
+            }
+    }
+
+    private var surfaceBounds: android.graphics.Rect? = null
+
+    override fun onPause() {
+        releaseAllKeys()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+        super.onPause()
+    }
+
+    override fun getArguments(): Array<String> {
+        val rom = intent?.getStringExtra(EXTRA_ROM_PATH)
+        val version = intent?.getStringExtra(EXTRA_VERSION)
+        val args = ArrayList<String>(4)
+        if (!rom.isNullOrEmpty()) { args.add("--import-rom"); args.add(rom) }
+        if (!version.isNullOrEmpty()) { args.add("--game-version"); args.add(version) }
+        Log.i(TAG, "engine argv: $args")
+        return args.toTypedArray()
+    }
+
+    companion object {
+        private const val TAG = "WnGen1Engine"
+
+        const val EXTRA_ROM_PATH = "wn.engine.rom"
+        const val EXTRA_VERSION = "wn.engine.version"
+        const val EXTRA_GAME_NAME = "wn.engine.game_name"
+        const val EXTRA_SHORTCUT_PATH = "wn.engine.shortcut"
+        const val EXTRA_ARTWORK_PATH = "wn.engine.artwork"
+
+        private const val DPAD_DEADZONE = 0.35f
+
+        private const val PREF_HAPTIC = "retro_haptic_strength"
+        private const val DEFAULT_HAPTIC = 0.4f
+
+        private const val ENGINE_RENDERER_LABEL = "LOVE / GLES"
+
+        private const val MENU_ELEVATION = 2000f
+
+        private const val SUBTITLE_SEPARATOR = "  \u00b7  "
+
+        private const val HUD_IDLE_TICK_MS = 250L
+
+        private const val ARTWORK_MAX_DP = 240f
+
+        private const val EXIT_SAVE_GRACE_MS = 400L
+
+        private const val SAVE_SETTLE_MS = 700L
+
+        private const val ANIMATIONS_ROW = "animations"
+        private const val VIDEO_MODE_ROW = "videoMode"
+
+        private val HIDDEN_ROWS = setOf("touchControls")
+
+        private val SOUND_ROWS = setOf("musicVol", "sfxVol", "pikaVol", "musicFilter")
+        private val DISPLAY_ROWS =
+            setOf("colors", "tilt", "gbcfx", "zoom", "voidFill", "videoMode", "animations")
+        private val PERFORMANCE_ROWS = setOf("fpsCap", "speed")
+        private val CONTROL_ROWS = setOf("controls")
+
+        private const val GB_WIDTH = 160
+        private const val GB_HEIGHT = 144
+
+        private const val PORTRAIT_GAME_HEIGHT_FRACTION = 0.6f
+
+        private val ENGINE_LIBS = listOf("c++_shared", "mpg123", "openal", "love")
+
+        fun engineDir(context: android.content.Context): File =
+            File(RetroBundle.root(context), "data/gen1recomp")
+
+        fun engineLibDir(context: android.content.Context): File =
+            File(engineDir(context), "lib")
+
+        fun gameArchive(context: android.content.Context): File =
+            File(engineDir(context), "game.love")
+
+        fun isInstalled(context: android.content.Context): Boolean =
+            gameArchive(context).isFile &&
+                ENGINE_LIBS.all { File(engineLibDir(context), "lib$it.so").isFile }
+    }
+}
diff --git a/app/src/main/feature/retro/Gen1EngineBridge.kt b/app/src/main/feature/retro/Gen1EngineBridge.kt
new file mode 100644
index 000000000..5db6dd460
--- /dev/null
+++ b/app/src/main/feature/retro/Gen1EngineBridge.kt
@@ -0,0 +1,272 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.util.Log
+import java.io.File
+
+class Gen1EngineBridge(context: Context) {
+    private val dir = File(context.getExternalFilesDir(null), "$SAVE_SUBDIR/$BRIDGE_SUBDIR")
+    private val statePath = File(dir, "state.txt")
+    private val commandPath = File(dir, "cmd.txt")
+    private val commandTmp = File(dir, "cmd.host.tmp")
+
+    private val ioThread =
+        android.os.HandlerThread(THREAD_NAME, android.os.Process.THREAD_PRIORITY_BACKGROUND)
+            .apply { start() }
+    private val io = android.os.Handler(ioThread.looper)
+    private val main = android.os.Handler(android.os.Looper.getMainLooper())
+
+    private var listener: ((State, Boolean) -> Unit)? = null
+
+    @Volatile
+    private var polling = false
+
+    @Volatile
+    private var pollFast = false
+
+    data class Row(
+        val id: String,
+        val label: String,
+        val value: String,
+        val steppable: Boolean,
+        val values: List<String> = emptyList(),
+        val selectedIndex: Int = -1,
+    )
+
+    data class Slot(
+        val id: String,
+        val name: String,
+        val playTime: String,
+        val badges: Int,
+        val caught: Int,
+        val active: Boolean,
+        val exists: Boolean,
+    )
+
+    data class Import(val stage: String, val progress: Float)
+
+    data class State(
+        val seq: Long,
+        val booted: Boolean,
+        val paused: Boolean,
+        val fastForward: Boolean,
+        val fps: Int,
+        val import: Import?,
+        val version: String,
+        val rows: List<Row>,
+        val slots: List<Slot>,
+    )
+
+    @Volatile
+    var state: State = EMPTY
+        private set
+
+    private val pollTask =
+        object : Runnable {
+            override fun run() {
+                if (!polling) return
+                val before = state
+                val moved = refresh()
+                val now = state
+                if (moved || now.import != before.import || now.booted != before.booted) {
+                    val callback = listener
+                    if (callback != null) main.post { callback(now, moved) }
+                }
+                io.postDelayed(this, if (pollFast) POLL_ACTIVE_MS else POLL_IDLE_MS)
+            }
+        }
+
+    fun startPolling(onChanged: (State, Boolean) -> Unit) {
+        listener = onChanged
+        polling = true
+        io.removeCallbacks(pollTask)
+        io.post(pollTask)
+    }
+
+    fun stopPolling() {
+        polling = false
+        io.removeCallbacks(pollTask)
+    }
+
+    fun setPollFast(fast: Boolean) {
+        if (pollFast == fast) return
+        pollFast = fast
+        if (polling) pollNow()
+    }
+
+    fun pollNow() {
+        if (!polling) return
+        io.removeCallbacks(pollTask)
+        io.post(pollTask)
+    }
+
+    fun shutdown() {
+        polling = false
+        listener = null
+        io.removeCallbacksAndMessages(null)
+        ioThread.quitSafely()
+    }
+
+    private fun refresh(): Boolean {
+        val text =
+            runCatching { if (statePath.isFile) statePath.readText() else null }
+                .getOrNull() ?: return false
+        val parsed = runCatching { parse(text) }.getOrNull() ?: return false
+        val moved = parsed.seq != state.seq
+        state = parsed
+        return moved
+    }
+
+    private fun parse(text: String): State {
+        var seq = 0L
+        var booted = false
+        var paused = false
+        var fastForward = false
+        var fps = 0
+        var import: Import? = null
+        var version = ""
+        val rows = ArrayList<Row>()
+        val slots = ArrayList<Slot>()
+        val ladders = HashMap<String, Pair<Int, List<String>>>()
+
+        for (line in text.lineSequence()) {
+            if (line.isEmpty()) continue
+            val f = line.split('\t')
+            when (f.getOrNull(0)) {
+                "seq" -> seq = f.getOrNull(1)?.toLongOrNull() ?: 0L
+                "booted" -> booted = f.getOrNull(1) == "1"
+                "paused" -> paused = f.getOrNull(1) == "1"
+                "ff" -> fastForward = f.getOrNull(1) == "1"
+                "fps" -> fps = f.getOrNull(1)?.toIntOrNull() ?: 0
+                "import" ->
+                    if (f.size >= 3) {
+                        import =
+                            Import(
+                                stage = f[1],
+                                progress = ((f[2].toIntOrNull() ?: 0) / 1000f).coerceIn(0f, 1f),
+                            )
+                    }
+                "version" -> version = f.getOrNull(1).orEmpty()
+                "row" ->
+                    if (f.size >= 5) {
+                        rows.add(Row(f[1], f[2], f[3], f[4] == "step"))
+                    }
+                "vals" ->
+                    if (f.size >= 4) {
+                        ladders[f[1]] = (f[2].toIntOrNull() ?: 0) to f.subList(3, f.size).toList()
+                    }
+                "save" ->
+                    if (f.size >= 8) {
+                        slots.add(
+                            Slot(
+                                id = f[1],
+                                name = f[2],
+                                playTime = f[3],
+                                badges = f[4].toIntOrNull() ?: 0,
+                                caught = f[5].toIntOrNull() ?: 0,
+                                active = f[6] == "1",
+                                exists = f[7] == "1",
+                            ),
+                        )
+                    }
+            }
+        }
+        val withLadders =
+            rows.map { row ->
+                val (index, values) = ladders[row.id] ?: return@map row
+                row.copy(values = values, selectedIndex = index.coerceIn(0, values.size - 1))
+            }
+        return State(seq, booted, paused, fastForward, fps, import, version, withLadders, slots)
+    }
+
+    fun row(id: String): Row? = state.rows.firstOrNull { it.id == id }
+
+    fun send(vararg commands: String) {
+        if (commands.isEmpty()) return
+        io.post { writeCommands(commands) }
+    }
+
+    private fun writeCommands(commands: Array<out String>) {
+        runCatching {
+            dir.mkdirs()
+            val pending = if (commandPath.isFile) commandPath.readText() else ""
+            val body = buildString {
+                append(pending)
+                if (pending.isNotEmpty() && !pending.endsWith("\n")) append('\n')
+                for (c in commands) {
+                    append(c)
+                    append('\n')
+                }
+            }
+            commandTmp.writeText(body)
+            if (!commandTmp.renameTo(commandPath)) {
+                commandPath.writeText(body)
+                commandTmp.delete()
+            }
+        }.onFailure { Log.w(TAG, "could not queue engine command: ${it.message}") }
+    }
+
+    fun step(
+        id: String,
+        direction: Int,
+    ) = send("step\t$id\t${if (direction < 0) -1 else 1}")
+
+    fun setRow(
+        id: String,
+        index: Int,
+    ) = send("set\t$id\t$index")
+
+    fun activate(id: String) = send("activate\t$id")
+
+    fun saveGame() = send("save")
+
+    fun loadSlot(id: String) = send("loadslot\t$id")
+
+    fun saveToSlot(id: String) = send("saveslot\t$id")
+
+    fun newSlot() = send("newslot")
+
+    fun renameSlot(
+        id: String,
+        name: String,
+    ) = send("renameslot\t$id\t${name.replace('\t', ' ').replace('\n', ' ').trim()}")
+
+    fun reset() = send("reset")
+
+    fun setPaused(paused: Boolean) = send("pause\t${if (paused) 1 else 0}")
+
+    fun setFastForward(on: Boolean) = send("ff\t${if (on) 1 else 0}")
+
+    fun clearStale() {
+        io.post {
+            runCatching {
+                statePath.delete()
+                commandPath.delete()
+                commandTmp.delete()
+            }
+        }
+    }
+
+    companion object {
+        private const val TAG = "WnGen1Bridge"
+        private const val THREAD_NAME = "gen1-bridge-io"
+
+        private const val POLL_ACTIVE_MS = 200L
+        private const val POLL_IDLE_MS = 700L
+
+        private const val SAVE_SUBDIR = "save/pokemon-love2d"
+        private const val BRIDGE_SUBDIR = "winnative"
+
+        val EMPTY =
+            State(
+                seq = -1L, booted = false, paused = false, fastForward = false, fps = 0,
+                import = null, version = "", rows = emptyList(), slots = emptyList(),
+            )
+
+        private val MOD_ROW_PREFIXES = listOf("pipeline:", "$VOXEL_MOD_ROW_OWNER:")
+
+        fun isModRow(id: String): Boolean = MOD_ROW_PREFIXES.any { id.startsWith(it) }
+
+        private const val VOXEL_MOD_ROW_OWNER = "DRAMATIC_SHAPE"
+    }
+}
diff --git a/app/src/main/feature/retro/Gen1LoadingScreen.kt b/app/src/main/feature/retro/Gen1LoadingScreen.kt
new file mode 100644
index 000000000..7ccec38b8
--- /dev/null
+++ b/app/src/main/feature/retro/Gen1LoadingScreen.kt
@@ -0,0 +1,41 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeOut
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.dialog.PreloaderDialogContent
+import com.winlator.cmod.shared.ui.dialog.PreloaderDialogState
+
+@Composable
+fun Gen1LoadingScreen(
+    gameName: String,
+    artwork: android.graphics.Bitmap?,
+    state: Gen1EngineBridge.Import?,
+    visible: Boolean,
+) {
+    AnimatedVisibility(
+        visible = visible,
+        enter = androidx.compose.animation.EnterTransition.None,
+        exit = fadeOut(tween(320)),
+    ) {
+        val context = LocalContext.current
+        val preloader = remember { PreloaderDialogState() }
+
+        preloader.title.value = gameName.ifBlank { stringResource(R.string.preloader_default_name) }
+        preloader.subtitle.value = stringResource(R.string.retro_engine_loading_subtitle)
+        preloader.artwork.value = artwork
+        preloader.bottomProgressBar.value = true
+        preloader.text.value =
+            state?.stage?.takeIf { it.isNotBlank() }
+                ?: context.getString(R.string.retro_engine_loading)
+        preloader.isIndeterminate.value = state == null
+        preloader.progress.intValue = ((state?.progress ?: 0f) * 100f).toInt().coerceIn(0, 100)
+
+        PreloaderDialogContent(preloader)
+    }
+}
diff --git a/app/src/main/feature/retro/Gen1ModInstaller.kt b/app/src/main/feature/retro/Gen1ModInstaller.kt
new file mode 100644
index 000000000..9bf3d8e6f
--- /dev/null
+++ b/app/src/main/feature/retro/Gen1ModInstaller.kt
@@ -0,0 +1,81 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.util.Log
+import java.io.File
+import java.util.zip.ZipFile
+
+object Gen1ModInstaller {
+    private const val TAG = "WnGen1Mod"
+
+    const val MOD_ID = "DRAMATIC_SHAPE"
+
+    private const val SAVE_SUBDIR = "save/pokemon-love2d"
+
+    private const val STAMP = ".winnative-installed"
+
+    fun modsDir(context: Context): File =
+        File(context.getExternalFilesDir(null), "$SAVE_SUBDIR/mods")
+
+    fun installedDir(context: Context): File = File(modsDir(context), MOD_ID)
+
+    fun sourceZip(context: Context): File =
+        File(RetroBundle.root(context), "data/gen1recomp-mods/$MOD_ID.zip")
+
+    fun isInstalled(context: Context): Boolean =
+        File(installedDir(context), "manifest.json").isFile
+
+    fun ensureInstalled(context: Context): Boolean {
+        val zip = sourceZip(context)
+        if (!zip.isFile) {
+            Log.i(TAG, "no mod in bundle at ${zip.absolutePath}")
+            return isInstalled(context)
+        }
+
+        val target = installedDir(context)
+        val stamp = File(target, STAMP)
+        val want = "${zip.length()}:${zip.lastModified()}"
+        if (isInstalled(context) && runCatching { stamp.readText() }.getOrNull() == want) {
+            return true
+        }
+
+        Log.i(TAG, "installing $MOD_ID from ${zip.name}")
+        return runCatching {
+            target.deleteRecursively()
+            target.mkdirs()
+            unzipInto(zip, target)
+            stamp.writeText(want)
+            val ok = isInstalled(context)
+            if (!ok) Log.w(TAG, "unpacked $MOD_ID but no manifest.json in it")
+            ok
+        }.getOrElse {
+            Log.w(TAG, "could not install $MOD_ID: ${it.message}")
+            runCatching { target.deleteRecursively() }
+            false
+        }
+    }
+
+    private fun unzipInto(zip: File, target: File) {
+        val root = target.canonicalPath
+        ZipFile(zip).use { archive ->
+            val entries = archive.entries()
+            while (entries.hasMoreElements()) {
+                val entry = entries.nextElement()
+                val out = File(target, entry.name)
+                if (!out.canonicalPath.startsWith(root + File.separator) &&
+                    out.canonicalPath != root
+                ) {
+                    throw SecurityException("zip entry escapes mod directory: ${entry.name}")
+                }
+                if (entry.isDirectory) {
+                    out.mkdirs()
+                    continue
+                }
+                out.parentFile?.mkdirs()
+                archive.getInputStream(entry).use { input ->
+                    out.outputStream().use { input.copyTo(it) }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/Ps2CheatStaging.kt b/app/src/main/feature/retro/Ps2CheatStaging.kt
new file mode 100644
index 000000000..70785faf1
--- /dev/null
+++ b/app/src/main/feature/retro/Ps2CheatStaging.kt
@@ -0,0 +1,71 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import com.armsx2.PatchRepo
+import com.armsx2.runtime.MainActivityRuntime
+import kr.co.iefriends.pcsx2.NativeApp
+import java.io.File
+
+object Ps2CheatStaging {
+    private fun dir(ctx: Context, isPatch: Boolean): File =
+        File(MainActivityRuntime.assetCopyRoot(ctx), if (isPatch) "patches" else "cheats").apply { mkdirs() }
+
+    private fun stagingFile(ctx: Context, serial: String, isPatch: Boolean): File =
+        File(dir(ctx, isPatch), "$serial.pnach")
+
+    fun read(ctx: Context, serial: String, isPatch: Boolean): List<PatchRepo.Entry> {
+        val f = stagingFile(ctx, serial, isPatch)
+        if (!f.isFile) return emptyList()
+        val src = if (isPatch) "patches" else "custom"
+        return runCatching {
+            PatchRepo.parseInstalled(f.readText(), if (isPatch) "patches" else "cheats").second
+                .map { PatchRepo.Entry(it.name, it.description, it.body, src) }
+        }.getOrDefault(emptyList())
+    }
+
+    fun write(ctx: Context, serial: String, isPatch: Boolean, title: String, entries: List<PatchRepo.Entry>) {
+        val f = stagingFile(ctx, serial, isPatch)
+        if (entries.isEmpty()) {
+            f.delete()
+            return
+        }
+        runCatching { f.writeText(PatchRepo.buildPnach(title.ifBlank { serial }, entries)) }
+    }
+
+    fun applyAll(ctx: Context, serialRaw: String, crcRaw: String) {
+        val serial = serialRaw.trim().uppercase()
+        val crc = crcRaw.trim().uppercase()
+        if (serial.isBlank() || crc.length != 8) return
+        val suffix = "_$crc"
+
+        val stagedPatches = read(ctx, serial, true)
+        val dnas = Ps2DnasBypass.sectionsFor(ctx, serial, crc)
+        val patchByName = LinkedHashMap<String, PatchRepo.Entry>()
+        stagedPatches.forEach { patchByName[it.name] = it }
+        dnas.forEach { s -> if (s.name !in patchByName) patchByName[s.name] = PatchRepo.Entry(s.name, "", s.body, "patches") }
+        val patchFile = File(dir(ctx, true), "$serial$suffix.pnach")
+        if (patchByName.isEmpty()) {
+            runCatching { patchFile.delete() }
+        } else {
+            runCatching { patchFile.writeText(PatchRepo.buildPnach(serial, patchByName.values.toList())) }
+        }
+        val enabledPatches = (stagedPatches.map { it.name } + dnas.filter { it.enabledByDefault }.map { it.name }).distinct()
+        runCatching { NativeApp.setEnabledPatches(false, patchByName.keys.toTypedArray(), enabledPatches.toTypedArray()) }
+
+        val stagedCheats = read(ctx, serial, false)
+        val cheatFile = File(dir(ctx, false), "$serial$suffix.pnach")
+        if (stagedCheats.isEmpty()) {
+            runCatching { cheatFile.delete() }
+        } else {
+            runCatching { cheatFile.writeText(PatchRepo.buildPnach(serial, stagedCheats)) }
+            runCatching {
+                NativeApp.setSetting("EmuCore", "EnableCheats", "bool", "true")
+                NativeApp.commitSettings()
+            }
+        }
+        val cheatNames = stagedCheats.map { it.name }.toTypedArray()
+        runCatching { NativeApp.setEnabledPatches(true, cheatNames, cheatNames) }
+
+        runCatching { NativeApp.reloadPatches() }
+    }
+}
diff --git a/app/src/main/feature/retro/Ps2DnasBypass.kt b/app/src/main/feature/retro/Ps2DnasBypass.kt
new file mode 100644
index 000000000..386f571b1
--- /dev/null
+++ b/app/src/main/feature/retro/Ps2DnasBypass.kt
@@ -0,0 +1,174 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import com.armsx2.runtime.MainActivityRuntime
+import kr.co.iefriends.pcsx2.NativeApp
+import org.json.JSONObject
+import java.io.File
+
+object Ps2DnasBypass {
+    const val PREF = "wn.ps2.net.dnasbypass"
+
+    @Volatile
+    private var db: Map<String, Game>? = null
+
+    private data class Variant(val name: String, val codes: List<String>, val crc: String?, val auto: Boolean)
+
+    private data class Game(val title: String, val variants: List<Variant>)
+
+    private fun loadDb(ctx: Context): Map<String, Game> {
+        db?.let { return it }
+        val parsed =
+            runCatching {
+                val text = ctx.assets.open("dnas/dnas_bypass.json").bufferedReader().use { it.readText() }
+                val root = JSONObject(text)
+                val map = HashMap<String, Game>()
+                val keys = root.keys()
+                while (keys.hasNext()) {
+                    val serial = keys.next()
+                    val g = root.getJSONObject(serial)
+                    val vs = g.getJSONArray("cheats")
+                    val variants = ArrayList<Variant>()
+                    for (i in 0 until vs.length()) {
+                        val v = vs.getJSONObject(i)
+                        val codesArr = v.getJSONArray("codes")
+                        val codes = (0 until codesArr.length()).map { codesArr.getString(it) }
+                        variants.add(
+                            Variant(
+                                v.getString("name"),
+                                codes,
+                                v.optString("crc").takeIf { it.isNotBlank() },
+                                v.optBoolean("auto", false),
+                            ),
+                        )
+                    }
+                    map[serial.uppercase()] = Game(g.getString("title"), variants)
+                }
+                map
+            }.getOrDefault(emptyMap())
+        db = parsed
+        return parsed
+    }
+
+    fun hasBypass(ctx: Context, serial: String?): Boolean =
+        serial != null && loadDb(ctx).containsKey(serial.trim().uppercase())
+
+    fun isEnabled(ctx: Context): Boolean =
+        ctx.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE).getBoolean(PREF, true)
+
+    fun setEnabled(ctx: Context, on: Boolean) {
+        ctx.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE).edit().putBoolean(PREF, on).apply()
+    }
+
+    data class BypassEntry(val name: String, val body: String, val auto: Boolean)
+
+    private fun disabledKey(serial: String) = "wn.ps2.dnas.disabled.${serial.trim().uppercase()}"
+
+    fun disabledNames(ctx: Context, serial: String): Set<String> {
+        val raw = ctx.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE).getString(disabledKey(serial), "") ?: ""
+        if (raw.isBlank()) return emptySet()
+        return runCatching {
+            val arr = org.json.JSONArray(raw)
+            (0 until arr.length()).map { arr.getString(it) }.toSet()
+        }.getOrDefault(emptySet())
+    }
+
+    fun setDisabledNames(ctx: Context, serial: String, names: Set<String>) {
+        val arr = org.json.JSONArray()
+        names.forEach { arr.put(it) }
+        ctx.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE).edit()
+            .putString(disabledKey(serial), arr.toString()).apply()
+    }
+
+    fun ensureSingleDnasEnabled(ctx: Context, serial: String, allNames: Set<String>): Set<String> {
+        if (allNames.isEmpty()) return emptySet()
+        val disabled = disabledNames(ctx, serial).toMutableSet()
+        val enabled = allNames.filter { it !in disabled }
+        if (enabled.size <= 1) return disabled
+        val keep = enabled.first()
+        val next = allNames - keep
+        setDisabledNames(ctx, serial, next)
+        return next
+    }
+
+    fun bypassEntries(ctx: Context, serial: String?): List<BypassEntry> {
+        val game = loadDb(ctx)[serial?.trim()?.uppercase()] ?: return emptyList()
+        val used = HashMap<String, Int>()
+        return game.variants.mapNotNull { v ->
+            val base = v.name
+            val n = (used[base] ?: 0) + 1
+            used[base] = n
+            val nm = if (n > 1) "$base ($n)" else base
+            val lines = v.codes.mapNotNull { toPatchLine(it) }
+            if (lines.isEmpty()) {
+                null
+            } else {
+                val body = buildString {
+                    append("[").append(nm).append("]\n")
+                    lines.forEach { append(it).append('\n') }
+                }
+                BypassEntry(nm, body, v.auto)
+            }
+        }
+    }
+
+    private fun toPatchLine(raw: String): String? {
+        val parts = raw.trim().split(Regex("\\s+"))
+        if (parts.size != 2) return null
+        val a = parts[0].uppercase()
+        val v = parts[1].uppercase()
+        if (a.length != 8 || v.length != 8) return null
+        if (!a.all { it.isDigit() || it in 'A'..'F' } || !v.all { it.isDigit() || it in 'A'..'F' }) return null
+        return "patch=1,EE,$a,extended,$v"
+    }
+
+    data class Section(val name: String, val body: String, val enabledByDefault: Boolean)
+
+    fun sectionsFor(ctx: Context, serialRaw: String, crcRaw: String): List<Section> {
+        val serial = serialRaw.trim().uppercase()
+        val crc = crcRaw.trim().uppercase()
+        val game = loadDb(ctx)[serial] ?: return emptyList()
+        val globalOn = isEnabled(ctx)
+        val disabled = disabledNames(ctx, serial)
+        val used = HashMap<String, Int>()
+        val out = ArrayList<Section>()
+        for (v in game.variants) {
+            val base = v.name
+            val n = (used[base] ?: 0) + 1
+            used[base] = n
+            val nm = if (n > 1) "$base ($n)" else base
+            val lines = v.codes.mapNotNull { toPatchLine(it) }
+            if (lines.isEmpty()) continue
+            val body = buildString {
+                append("[").append(nm).append("]\n")
+                lines.forEach { append(it).append('\n') }
+            }
+            val crcOk = v.crc == null || v.crc.equals(crc, ignoreCase = true)
+            val on = globalOn && v.auto && nm !in disabled && crcOk
+            out.add(Section(nm, body, on))
+        }
+        val enabled = out.filter { it.enabledByDefault }
+        if (enabled.size <= 1) return out
+        val keep = enabled.first().name
+        return out.map { if (it.enabledByDefault && it.name != keep) it.copy(enabledByDefault = false) else it }
+    }
+
+    fun applyWhenReady(ctx: Context) {
+        var tries = 0
+        while (tries < 60) {
+            val s = runCatching { NativeApp.getGameSerial() }.getOrNull()?.takeIf { it.isNotBlank() }
+            val c = runCatching { NativeApp.getGameCRC() }.getOrNull()?.takeIf { it.length == 8 && it != "00000000" }
+            if (s != null && c != null) {
+                runCatching { Ps2CheatStaging.applyAll(ctx, s, c) }
+                    .onFailure { android.util.Log.w("Ps2DnasBypass", "applyAll failed for $s/$c", it) }
+                return
+            }
+            try {
+                Thread.sleep(500)
+            } catch (e: InterruptedException) {
+                return
+            }
+            tries++
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/Ps2GameOverlay.kt b/app/src/main/feature/retro/Ps2GameOverlay.kt
new file mode 100644
index 000000000..e3ed277d6
--- /dev/null
+++ b/app/src/main/feature/retro/Ps2GameOverlay.kt
@@ -0,0 +1,1320 @@
+package com.winlator.cmod.feature.retro
+
+import android.view.KeyEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.viewinterop.AndroidView
+import com.armsx2.WinNativeHost
+import com.winlator.cmod.R
+import com.armsx2.runtime.MainActivityRuntime
+import com.armsx2.ui.WindowImpl
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.ui.FrameRating
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kr.co.iefriends.pcsx2.NativeApp
+
+const val PS2_DEFAULT_DNS = "45.7.228.197"
+
+data class Ps2NetHost(val url: String, val ip: String)
+
+object Ps2GameOverlay {
+    private const val FULL = 32767
+
+    @Volatile
+    private var overlayAttached = false
+
+    fun install() {
+        overlayAttached = false
+        WinNativeHost.attachOverlay = attach@{ activity ->
+            if (overlayAttached) return@attach
+            overlayAttached = true
+            attach(activity)
+        }
+        WinNativeHost.applyBootSettings = { ctx -> applyBootConfig(ctx) }
+    }
+
+    private fun loadShortcut(activity: android.app.Activity): Shortcut? {
+        val containerId = activity.intent?.getIntExtra(RetroShortcuts.EXTRA_PS2_CONTAINER_ID, -1) ?: -1
+        val path = activity.intent?.getStringExtra(RetroShortcuts.EXTRA_PS2_SHORTCUT_PATH)
+        if (containerId < 0 || path.isNullOrBlank()) return null
+        val file = java.io.File(path)
+        if (!file.isFile) return null
+        return runCatching {
+            val cm = ContainerManager(activity)
+            val container =
+                if (containerId == ContainerManager.RETRO_CONTAINER_ID) cm.retroContainer else cm.getContainerById(containerId)
+            container?.let { Shortcut(it, file) }
+        }.getOrNull()
+    }
+
+    private fun ps2Prefs(ctx: android.content.Context) =
+        ctx.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE)
+
+    private fun fmvAspectName(value: Int): String =
+        when (value) {
+            1 -> "Auto 4:3/3:2"
+            2 -> "4:3"
+            3 -> "16:9"
+            else -> "Off"
+        }
+
+    private fun writePatchSettings(ctx: android.content.Context) {
+        val prefs = ps2Prefs(ctx)
+        NativeApp.setSetting("EmuCore", "EnableWideScreenPatches", "bool", prefs.getBoolean("wn.ps2.widescreen", false).toString())
+        NativeApp.setSetting("EmuCore", "EnableNoInterlacingPatches", "bool", prefs.getBoolean("wn.ps2.nointerlace", false).toString())
+        NativeApp.setSetting("EmuCore", "EnableFastBoot", "bool", prefs.getBoolean("wn.ps2.fastboot", true).toString())
+    }
+
+    private fun blankHddFile(ctx: android.content.Context): java.io.File =
+        java.io.File(ctx.filesDir, "hdd/DEV9hdd.raw")
+
+    private fun resolveHdd(ctx: android.content.Context): Pair<java.io.File?, Boolean> {
+        val prefs = ps2Prefs(ctx)
+        val image = RetroHddImport.imageFile(ctx, prefs.getString("wn.ps2.hddimage", ""))
+        if (image != null) return image to true
+        if (prefs.getBoolean("wn.ps2.hdd", false)) return blankHddFile(ctx) to true
+        return null to false
+    }
+
+    private fun ensureHddImage(ctx: android.content.Context) {
+        val prefs = ps2Prefs(ctx)
+        if (RetroHddImport.imageFile(ctx, prefs.getString("wn.ps2.hddimage", "")) != null) return
+        if (!prefs.getBoolean("wn.ps2.hdd", false)) return
+        val img = blankHddFile(ctx)
+        if (img.exists() && img.length() > 0L) return
+        runCatching {
+            img.parentFile?.mkdirs()
+            java.io.RandomAccessFile(img, "rw").use { it.setLength(8L * 1024 * 1024 * 1024) }
+        }
+    }
+
+    private fun readHosts(prefs: android.content.SharedPreferences): List<Ps2NetHost> {
+        val raw = prefs.getString("wn.ps2.net.hosts", "") ?: ""
+        if (raw.isBlank()) return emptyList()
+        return runCatching {
+            val arr = org.json.JSONArray(raw)
+            (0 until arr.length()).map { i ->
+                val o = arr.getJSONObject(i)
+                Ps2NetHost(o.optString("url"), o.optString("ip", "0.0.0.0"))
+            }.filter { it.url.isNotBlank() }
+        }.getOrDefault(emptyList())
+    }
+
+    private fun writeDev9Settings(ctx: android.content.Context) {
+        val prefs = ps2Prefs(ctx)
+        val on = prefs.getBoolean("wn.ps2.net.enable", true)
+        NativeApp.setSetting("DEV9/Eth", "EthEnable", "bool", on.toString())
+        NativeApp.setSetting("DEV9/Eth", "EthApi", "string", "Sockets")
+        NativeApp.setSetting("DEV9/Eth", "EthDevice", "string", (prefs.getString("wn.ps2.net.ethdevice", "Auto") ?: "Auto").ifBlank { "Auto" })
+        NativeApp.setSetting("DEV9/Eth", "InterceptDHCP", "bool", prefs.getBoolean("wn.ps2.net.dhcp", true).toString())
+        NativeApp.setSetting("DEV9/Eth", "AutoMask", "bool", "true")
+        NativeApp.setSetting("DEV9/Eth", "AutoGateway", "bool", "true")
+        val hosts = readHosts(prefs)
+        val chosen = prefs.getString("wn.ps2.net.dnsmode", "Manual") ?: "Manual"
+        val mode =
+            when {
+                hosts.isNotEmpty() -> "Internal"
+                chosen.equals("Manual", ignoreCase = true) -> "Manual"
+                else -> "Internal"
+            }
+        NativeApp.setSetting("DEV9/Eth", "ModeDNS1", "string", mode)
+        NativeApp.setSetting("DEV9/Eth", "ModeDNS2", "string", "Auto")
+        NativeApp.setSetting("DEV9/Eth", "DNS1", "string", (prefs.getString("wn.ps2.net.dns1", PS2_DEFAULT_DNS) ?: PS2_DEFAULT_DNS).ifBlank { PS2_DEFAULT_DNS })
+        NativeApp.setSetting("DEV9/Eth", "DNS2", "string", (prefs.getString("wn.ps2.net.dns2", "") ?: "").ifBlank { "0.0.0.0" })
+        NativeApp.setSetting("DEV9/Eth/Hosts", "Count", "int", hosts.size.toString())
+        hosts.forEachIndexed { i, h ->
+            NativeApp.setSetting("DEV9/Eth/Hosts/Host$i", "Url", "string", h.url)
+            NativeApp.setSetting("DEV9/Eth/Hosts/Host$i", "Desc", "string", "WinNative")
+            NativeApp.setSetting("DEV9/Eth/Hosts/Host$i", "Address", "string", h.ip.ifBlank { "0.0.0.0" })
+            NativeApp.setSetting("DEV9/Eth/Hosts/Host$i", "Enabled", "bool", "true")
+        }
+        val (hddFile, hddOn) = resolveHdd(ctx)
+        NativeApp.setSetting("DEV9/Hdd", "HddEnable", "bool", hddOn.toString())
+        NativeApp.setSetting("DEV9/Hdd", "HddFile", "string", (hddFile ?: blankHddFile(ctx)).absolutePath)
+    }
+
+    fun applyBootConfig(ctx: android.content.Context) {
+        runCatching {
+            applyTurnipDebug(ctx)
+            ensureHddImage(ctx)
+            writeDev9Settings(ctx)
+            writePatchSettings(ctx)
+            RetroHudSupport.suppressNativePs2Osd()
+            applyDisplayAspect(ctx, live = false)
+        }
+    }
+
+    private fun applyDisplayAspect(
+        ctx: android.content.Context,
+        live: Boolean,
+    ) {
+        val prefs = ps2Prefs(ctx)
+        val aspect = resolveBootAspect(prefs)
+        val name =
+            when (aspect) {
+                3 -> "16:9"
+                else -> "4:3"
+            }
+        runCatching {
+            NativeApp.setSetting("EmuCore/GS", "AspectRatio", "string", name)
+            NativeApp.setAspectRatio(aspect)
+            if (!live) {
+                NativeApp.commitSettings()
+            }
+        }
+    }
+
+    private fun resolveBootAspect(prefs: android.content.SharedPreferences): Int {
+        val aspect = prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3)
+        return when (aspect) {
+            3 -> 3
+            2 -> 2
+            else -> 2
+        }
+    }
+
+    private fun applyTurnipDebug(ctx: android.content.Context) {
+        val prefs = ps2Prefs(ctx)
+        val driver = (prefs.getString("wn.ps2.driver", "") ?: "").trim()
+        val usingTurnip = driver.isNotEmpty() && !driver.equals("system", ignoreCase = true)
+        val flags = (prefs.getString("wn.ps2.turnipflags", "") ?: "").trim()
+        runCatching {
+            if (usingTurnip && flags.isNotEmpty()) {
+                android.system.Os.setenv("TU_DEBUG", flags, true)
+            } else {
+                android.system.Os.unsetenv("TU_DEBUG")
+            }
+        }
+    }
+
+    private fun mapFace(keyCode: Int): Int =
+        when (keyCode) {
+            KeyEvent.KEYCODE_BUTTON_X -> KeyEvent.KEYCODE_BUTTON_Y
+            KeyEvent.KEYCODE_BUTTON_B -> KeyEvent.KEYCODE_BUTTON_A
+            KeyEvent.KEYCODE_BUTTON_Y -> KeyEvent.KEYCODE_BUTTON_X
+            KeyEvent.KEYCODE_BUTTON_A -> KeyEvent.KEYCODE_BUTTON_B
+            else -> keyCode
+        }
+
+    private fun emitAxis(pos: Int, neg: Int, v: Float) {
+        val mag = (kotlin.math.abs(v) * FULL).toInt().coerceAtMost(FULL)
+        NativeApp.setPadButton(pos, if (v > 0f) mag else 0, v > 0f)
+        NativeApp.setPadButton(neg, if (v < 0f) mag else 0, v < 0f)
+    }
+
+    private fun attach(activity: ComponentActivity) {
+        val menu = RetroMenuController()
+        val ps2Screen = mutableStateOf<String?>(null)
+        var savesLoadMode = false
+        var pad: RetroInputView? = null
+        val touchVisible =
+            mutableStateOf(
+                ps2Prefs(activity).getBoolean("wn.ps2.touchcontrols", RetroDefaults.touchControls(activity, RetroSystems.PS2.id)),
+            )
+        fun anyGameController(): Boolean =
+            android.view.InputDevice.getDeviceIds().any {
+                com.winlator.cmod.runtime.input.controls.ExternalController.isGameController(android.view.InputDevice.getDevice(it))
+            }
+        val controllerConnected = mutableStateOf(anyGameController())
+        val manualTouchOverride = mutableStateOf(false)
+        val launchRomPath = activity.intent?.getStringExtra(RetroShortcuts.EXTRA_PS2_ROM_PATH).orEmpty()
+        val launchGameName = activity.intent?.getStringExtra(RetroShortcuts.EXTRA_PS2_GAME_NAME).orEmpty()
+        val inputManager = activity.getSystemService(android.hardware.input.InputManager::class.java)
+        inputManager?.registerInputDeviceListener(
+            object : android.hardware.input.InputManager.InputDeviceListener {
+                private fun refreshPadPresence() {
+                    val was = controllerConnected.value
+                    controllerConnected.value = anyGameController()
+                    if (controllerConnected.value != was) manualTouchOverride.value = false
+                    val showPad = touchVisible.value && (!controllerConnected.value || manualTouchOverride.value)
+                    RetroAchievementOverlayState.syncPlacement(showPad, controllerConnected.value)
+                    MainActivityRuntime.runWhenNativeReady {
+                        runCatching { RetroPs2OsdPlacement.apply(showPad, controllerConnected.value) }
+                    }
+                }
+
+                override fun onInputDeviceAdded(deviceId: Int) = refreshPadPresence()
+
+                override fun onInputDeviceRemoved(deviceId: Int) = refreshPadPresence()
+
+                override fun onInputDeviceChanged(deviceId: Int) = refreshPadPresence()
+            },
+            null,
+        )
+        var customColors = RetroControlLayouts.loadColors(activity, RetroSystems.PS2.id)
+        var wnPaused = false
+        val prefs = activity.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE)
+        var frameRating: FrameRating? = null
+        var shortcut: Shortcut? = null
+        val pendingExtras = LinkedHashMap<String, String>()
+        fun persistExtra(key: String, value: String) {
+            val target = shortcut
+            if (target == null) {
+                pendingExtras[key] = value
+                return
+            }
+            @Suppress("OPT_IN_USAGE")
+            GlobalScope.launch(Dispatchers.IO) {
+                runCatching {
+                    target.putExtra(key, value)
+                    target.saveData()
+                }
+            }
+        }
+        var hudVisible = RetroHudSupport.consoleHudDefault(activity, RetroSystems.PS2.id)
+        var hudStyle = RetroHudSupport.loadPs2HudStyle(activity)
+        var hudElements = RetroHudSupport.loadPs2Elements(activity)
+        val menuToggleGate = RetroHudSupport.MenuToggleGate()
+        val frameSource =
+            RetroHudSupport.Ps2FrameSource(
+                ratingProvider = { frameRating },
+                enabledProvider = { hudVisible },
+            )
+
+        fun persistColors() {
+            RetroControlLayouts.saveColors(activity, RetroSystems.PS2.id, customColors)
+            pad?.setCustomColors(customColors)
+            menu.rebuild()
+        }
+
+        fun applyHudToRating() {
+            val rating = frameRating ?: return
+            RetroHudSupport.applyStyle(rating, hudStyle, hudElements)
+        }
+
+        fun showHud() {
+            var rating = frameRating
+            if (rating == null) {
+                val root = activity.findViewById<ViewGroup>(android.R.id.content) ?: return
+                val renderer =
+                    when (prefs.getString("wn.ps2.renderer", "vulkan")) {
+                        "opengl" -> "OpenGL"
+                        "software" -> "Software"
+                        else -> "Vulkan"
+                    }
+                rating = RetroHudSupport.createFrameRating(activity, renderer)
+                frameRating = rating
+                RetroHudSupport.attachFrameRating(root, rating)
+                applyHudToRating()
+            }
+            rating.visibility = View.VISIBLE
+            rating.reset()
+            frameSource.start()
+        }
+
+        fun hideHud() {
+            frameRating?.visibility = View.GONE
+        }
+
+        fun setHudVisible(value: Boolean) {
+            hudVisible = value
+            persistExtra(RetroShortcuts.KEY_HUD, if (value) "1" else "0")
+            if (value) showHud() else hideHud()
+            menu.rebuild()
+        }
+
+        @Suppress("OPT_IN_USAGE")
+        GlobalScope.launch(Dispatchers.IO) {
+            val loaded = loadShortcut(activity)
+            activity.runOnUiThread {
+                shortcut = loaded
+                if (loaded != null) {
+                    val perGame = loaded.getExtra(RetroShortcuts.KEY_HUD)
+                    if (perGame.isNotEmpty() && (perGame == "1") != hudVisible) {
+                        setHudVisible(perGame == "1")
+                    }
+                    if (pendingExtras.isNotEmpty()) {
+                        val queued = pendingExtras.toMap()
+                        pendingExtras.clear()
+                        @Suppress("OPT_IN_USAGE")
+                        GlobalScope.launch(Dispatchers.IO) {
+                            runCatching {
+                                queued.forEach { (k, v) -> loaded.putExtra(k, v) }
+                                loaded.saveData()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        fun gsSet(key: String, type: String, value: String) {
+            runCatching {
+                NativeApp.setSetting("EmuCore/GS", key, type, value)
+                NativeApp.commitSettings()
+                NativeApp.applyGSSettingsLive()
+            }
+        }
+
+        fun bg(block: () -> Unit) {
+            MainActivityRuntime.runWhenNativeReady { runCatching { block() } }
+        }
+
+        fun nativeUp(): Boolean = MainActivityRuntime.isNativeReady()
+
+        fun gsSetAsync(key: String, type: String, value: String) = bg { gsSet(key, type, value) }
+
+        fun spSet(key: String, type: String, value: String) {
+            bg {
+                NativeApp.setSetting("EmuCore/Speedhacks", key, type, value)
+                NativeApp.commitSettings()
+            }
+        }
+
+        fun spu2Set(key: String, type: String, value: String) {
+            bg {
+                NativeApp.setSetting("SPU2/Output", key, type, value)
+                NativeApp.commitSettings()
+            }
+        }
+
+        fun ensureHddImage() = ensureHddImage(activity)
+
+        fun writeNetworkSettings() = writeDev9Settings(activity)
+
+        MainActivityRuntime.runWhenNativeReady {
+            kotlin.concurrent.thread(name = "ps2-dnas-bypass") {
+                Ps2DnasBypass.applyWhenReady(activity)
+            }
+        }
+
+        bg {
+            NativeApp.setAudioVolume(prefs.getInt("wn.ps2.volume", 100))
+            NativeApp.setAudioMuted(prefs.getBoolean("wn.ps2.muted", false))
+            NativeApp.setAudioSwapChannels(prefs.getBoolean("wn.ps2.swap", false))
+            val customDriver = (prefs.getString("wn.ps2.driver", "") ?: "").trim()
+                .let { it.isNotEmpty() && !it.equals("system", ignoreCase = true) }
+            when {
+                customDriver -> NativeApp.renderVulkan()
+                prefs.getString("wn.ps2.renderer", "vulkan") == "opengl" -> NativeApp.renderOpenGL()
+                prefs.getString("wn.ps2.renderer", "vulkan") == "software" -> NativeApp.renderSoftware()
+                else -> NativeApp.renderVulkan()
+            }
+            NativeApp.renderUpscalemultiplier(prefs.getFloat("wn.ps2.upscale", 1f))
+            RetroHudSupport.suppressNativePs2Osd()
+            val touchOn = prefs.getBoolean("wn.ps2.touchcontrols", RetroDefaults.touchControls(activity, RetroSystems.PS2.id))
+            RetroPs2OsdPlacement.apply(touchOn, false)
+            applyDisplayAspect(activity, live = true)
+            NativeApp.setFrameSkip(prefs.getInt("wn.ps2.frameskip", 0).coerceIn(0, 3))
+            NativeApp.speedhackEecyclerate(prefs.getInt("wn.ps2.eeRate", 0).coerceIn(-3, 3))
+            NativeApp.speedhackEecycleskip(prefs.getInt("wn.ps2.eeSkip", 0).coerceIn(0, 3))
+            NativeApp.setInstantVU1(prefs.getBoolean("wn.ps2.instantVu1", true))
+            NativeApp.renderTvShader(prefs.getInt("wn.ps2.tvshader", 0).coerceIn(0, 7))
+            NativeApp.setSetting("EmuCore/GS", "linear_present_mode", "int", prefs.getInt("wn.ps2.displayfilter", 1).coerceIn(0, 2).toString())
+            NativeApp.setSetting("EmuCore/GS", "filter", "int", prefs.getInt("wn.ps2.filter", 2).coerceIn(0, 3).toString())
+            NativeApp.setSetting("EmuCore/GS", "accurate_blending_unit", "int", prefs.getInt("wn.ps2.blend", 1).coerceIn(0, 5).toString())
+            NativeApp.setSetting("EmuCore/GS", "hw_mipmap", "bool", prefs.getBoolean("wn.ps2.mipmap", true).toString())
+            NativeApp.setSetting("EmuCore/Speedhacks", "vuThread", "bool", prefs.getBoolean("wn.ps2.mtvu", true).toString())
+            NativeApp.setSetting("EmuCore/Speedhacks", "fastCDVD", "bool", prefs.getBoolean("wn.ps2.fastCdvd", false).toString())
+            NativeApp.setSetting("EmuCore/GS", "deinterlace_mode", "int", prefs.getInt("wn.ps2.deinterlace", 0).coerceIn(0, 9).toString())
+            NativeApp.setSetting("EmuCore/GS", "FMVAspectRatioSwitch", "string", fmvAspectName(prefs.getInt("wn.ps2.fmvaspect", 0)))
+            NativeApp.setSetting("EmuCore/GS", "pcrtc_antiblur", "bool", prefs.getBoolean("wn.ps2.antiblur", true).toString())
+            NativeApp.setSetting("EmuCore/Speedhacks", "vuFlagHack", "bool", prefs.getBoolean("wn.ps2.vuFlagHack", true).toString())
+            NativeApp.setSetting("EmuCore/Speedhacks", "IntcStat", "bool", prefs.getBoolean("wn.ps2.intc", true).toString())
+            NativeApp.setSetting("EmuCore/Speedhacks", "WaitLoop", "bool", prefs.getBoolean("wn.ps2.waitloop", true).toString())
+            NativeApp.setSetting("SPU2/Output", "SyncMode", "string", if (prefs.getBoolean("wn.ps2.timestretch", true)) "TimeStretch" else "Disabled")
+            NativeApp.setSetting("SPU2/Output", "BufferMS", "int", prefs.getInt("wn.ps2.audiobuffer", 50).coerceIn(10, 200).toString())
+            NativeApp.setSetting("SPU2/Output", "OutputLatencyMS", "int", prefs.getInt("wn.ps2.audiolatency", 20).coerceIn(5, 200).toString())
+            prefs.getString("wn.ps2.mc.slot1", null)?.takeIf { it.isNotBlank() }?.let { name ->
+                NativeApp.setSetting("MemoryCards", "Slot1_Filename", "string", name)
+                NativeApp.setSetting("MemoryCards", "Slot1_Enable", "bool", "true")
+            }
+            prefs.getString("wn.ps2.mc.slot2", null)?.takeIf { it.isNotBlank() }?.let { name ->
+                NativeApp.setSetting("MemoryCards", "Slot2_Filename", "string", name)
+                NativeApp.setSetting("MemoryCards", "Slot2_Enable", "bool", "true")
+            }
+            ensureHddImage()
+            writeNetworkSettings()
+            runCatching { NativeApp.applyGSSettingsLive() }
+            applyDisplayAspect(activity, live = true)
+        }
+
+        fun openWinNativeScreen(screen: String) {
+            menu.close()
+            ps2Screen.value = screen
+        }
+
+        fun mainEntries(): List<RetroMenuEntry> =
+            buildList {
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_save_state), RetroDrawerIcons.Save) {
+                        savesLoadMode = false
+                        menu.showPane(RetroPane.SAVES)
+                    },
+                )
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_load_save_state), RetroDrawerIcons.Load) {
+                        savesLoadMode = true
+                        menu.showPane(RetroPane.SAVES)
+                    },
+                )
+                add(RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_achievements), RetroDrawerIcons.Achievements) { openWinNativeScreen("achievements") })
+                add(RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_cheats), RetroDrawerIcons.Cheats) { openWinNativeScreen("cheats") })
+                add(RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_memory_cards), RetroDrawerIcons.Save) { menu.showPane(RetroPane.MEMCARDS) })
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_fast_forward), checked = MainActivityRuntime.fastForwardToggleActive) {
+                        (activity as? MainActivityRuntime)?.toggleFastForward()
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_reset), RetroDrawerIcons.Reset) {
+                        menu.close()
+                        MainActivityRuntime.restart()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_swap_disc), RetroDrawerIcons.Disc) {
+                        menu.close()
+                        MainActivityRuntime.promptSwapDisc()
+                    },
+                )
+            }
+
+        fun saveSlotEntries(): List<RetroMenuEntry> =
+            (1..8).map { ui ->
+                val slot = ui - 1
+                val filled = runCatching {
+                    NativeApp.getGamePathSlot(slot)?.takeIf { it.isNotBlank() }?.let { java.io.File(it).exists() }
+                }.getOrNull() == true
+                RetroMenuEntry.SaveSlot(
+                    slot = ui,
+                    title = activity.getString(R.string.retro_ps2_slot, ui),
+                    subtitle =
+                        when {
+                            savesLoadMode && filled -> activity.getString(R.string.retro_ps2_slot_tap_to_load)
+                            savesLoadMode -> activity.getString(R.string.retro_ps2_slot_empty)
+                            filled -> activity.getString(R.string.retro_ps2_slot_tap_to_overwrite)
+                            else -> activity.getString(R.string.retro_ps2_slot_empty_tap_to_save)
+                        },
+                    filled = filled,
+                    onClick = {
+                        if (savesLoadMode) {
+                            if (!filled) {
+                                Toast.makeText(activity, activity.getString(R.string.retro_ps2_slot_is_empty, ui), Toast.LENGTH_SHORT).show()
+                            } else {
+                                menu.close()
+                                Thread {
+                                    val ok = runCatching { NativeApp.loadStateFromSlot(slot) }.getOrDefault(false)
+                                    activity.runOnUiThread {
+                                        Toast.makeText(activity, if (ok) activity.getString(R.string.retro_ps2_loaded_slot, ui) else activity.getString(R.string.retro_ps2_could_not_load_slot, ui), Toast.LENGTH_SHORT).show()
+                                        if (ok) { wnPaused = false; MainActivityRuntime.resume() }
+                                    }
+                                }.start()
+                            }
+                        } else {
+                            Thread {
+                                val ok = runCatching { NativeApp.saveStateToSlot(slot) }.getOrDefault(false)
+                                activity.runOnUiThread {
+                                    Toast.makeText(activity, if (ok) activity.getString(R.string.retro_ps2_saved_to_slot, ui) else activity.getString(R.string.retro_ps2_save_failed), Toast.LENGTH_SHORT).show()
+                                    menu.rebuild()
+                                }
+                            }.start()
+                        }
+                    },
+                    onRename = {},
+                )
+            }
+
+        var launchMemcardImport: (() -> Unit)? = null
+
+        fun applyMemSlot(slot: Int, name: String?) {
+            prefs.edit().apply {
+                if (name == null) remove("wn.ps2.mc.slot$slot") else putString("wn.ps2.mc.slot$slot", name)
+            }.apply()
+            bg {
+                NativeApp.setSetting("MemoryCards", "Slot${slot}_Enable", "bool", "false")
+                if (name != null) {
+                    NativeApp.setSetting("MemoryCards", "Slot${slot}_Filename", "string", name)
+                    NativeApp.setSetting("MemoryCards", "Slot${slot}_Enable", "bool", "true")
+                }
+                NativeApp.commitSettings()
+            }
+        }
+
+        fun memcardEntries(): List<RetroMenuEntry> =
+            buildList {
+                val cards = runCatching { listMemcards(activity) }.getOrDefault(emptyList())
+                val slot1 = prefs.getString("wn.ps2.mc.slot1", "").orEmpty()
+                val slot2 = prefs.getString("wn.ps2.mc.slot2", "").orEmpty()
+                cards.forEach { card ->
+                    val assigned = when (card.name) { slot1 -> 1; slot2 -> 2; else -> 0 }
+                    add(
+                        RetroMenuEntry.SaveSlot(
+                            slot = assigned,
+                            title = card.name.removeSuffix(".ps2"),
+                            subtitle = humanSize(card.length()) +
+                                when (assigned) { 1 -> activity.getString(R.string.retro_ps2_slot_1_suffix); 2 -> activity.getString(R.string.retro_ps2_slot_2_suffix); else -> activity.getString(R.string.retro_ps2_tap_to_use_suffix) },
+                            filled = assigned != 0,
+                            onClick = {
+                                when (assigned) {
+                                    0 -> applyMemSlot(1, card.name)
+                                    1 -> { applyMemSlot(1, null); applyMemSlot(2, card.name) }
+                                    else -> applyMemSlot(2, null)
+                                }
+                                menu.rebuild()
+                            },
+                            onRename = {},
+                        ),
+                    )
+                }
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_new_memory_card), RetroDrawerIcons.Save) {
+                        bg {
+                            val existing = runCatching { listMemcards(activity).map { it.name }.toHashSet() }.getOrDefault(hashSetOf())
+                            var n = 1
+                            var name = "Mcd%03d.ps2".format(n)
+                            while (name in existing) { n++; name = "Mcd%03d.ps2".format(n) }
+                            runCatching { NativeApp.createMemoryCard(name, 1, 1) }
+                            activity.runOnUiThread { menu.rebuild() }
+                        }
+                    },
+                )
+                add(RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_import_card), RetroDrawerIcons.Load) { launchMemcardImport?.invoke() })
+            }
+
+        fun controlsEntries(): List<RetroMenuEntry> =
+            buildList {
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_onscreen_controls), checked = touchVisible.value) { value ->
+                        touchVisible.value = value
+                        if (controllerConnected.value) manualTouchOverride.value = true
+                        ps2Prefs(activity).edit().putBoolean("wn.ps2.touchcontrols", value).apply()
+                        persistExtra(RetroShortcuts.KEY_TOUCH_CONTROLS, if (value) "1" else "0")
+                        val showPad = value && (!controllerConnected.value || manualTouchOverride.value)
+                        RetroAchievementOverlayState.syncPlacement(showPad, controllerConnected.value)
+                        bg {
+                            RetroPs2OsdPlacement.apply(showPad, controllerConnected.value)
+                        }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(
+                        activity.getString(R.string.retro_ps2_adaptive_sticks),
+                        subtitle = activity.getString(R.string.retro_ps2_adaptive_sticks_subtitle),
+                        checked = ps2Prefs(activity).getBoolean("wn.ps2.adaptivesticks", false),
+                    ) { value ->
+                        ps2Prefs(activity).edit().putBoolean("wn.ps2.adaptivesticks", value).apply()
+                        persistExtra(RetroShortcuts.KEY_ADAPTIVE_STICKS, if (value) "1" else "0")
+                        pad?.adaptiveSticks = value
+                        pad?.invalidate()
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(
+                        activity.getString(R.string.retro_ps2_show_l3r3),
+                        subtitle = activity.getString(R.string.retro_ps2_show_l3r3_subtitle),
+                        checked = ps2Prefs(activity).getBoolean("wn.ps2.showl3r3", true),
+                    ) { value ->
+                        ps2Prefs(activity).edit().putBoolean("wn.ps2.showl3r3", value).apply()
+                        pad?.showL3R3 = value
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_edit_layout), RetroDrawerIcons.EditLayout) {
+                        menu.close()
+                        touchVisible.value = true
+                        pad?.enterEdit()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_reset_layout), RetroDrawerIcons.Reset) {
+                        pad?.resetLayout()
+                        Toast.makeText(activity, activity.getString(R.string.retro_ps2_layout_reset), Toast.LENGTH_SHORT).show()
+                    },
+                )
+                val invPrefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(activity)
+                fun invToggle(label: String, key: String) =
+                    RetroMenuEntry.Toggle(label, checked = invPrefs.getBoolean(key, false)) { value ->
+                        invPrefs.edit().putBoolean(key, value).apply()
+                        pad?.loadStickInversion()
+                        menu.rebuild()
+                    }
+                add(invToggle(activity.getString(R.string.retro_ps2_left_stick_invert_x), "retro_inv_lx_ps2"))
+                add(invToggle(activity.getString(R.string.retro_ps2_left_stick_invert_y), "retro_inv_ly_ps2"))
+                add(invToggle(activity.getString(R.string.retro_ps2_right_stick_invert_x), "retro_inv_rx_ps2"))
+                add(invToggle(activity.getString(R.string.retro_ps2_right_stick_invert_y), "retro_inv_ry_ps2"))
+                add(
+                    RetroMenuEntry.ColorPick(activity.getString(R.string.retro_ps2_button_color), customColors.button) { value ->
+                        customColors = customColors.copy(button = value)
+                        persistColors()
+                    },
+                )
+                add(
+                    RetroMenuEntry.ColorPick(activity.getString(R.string.retro_ps2_letter_color), customColors.text) { value ->
+                        customColors = customColors.copy(text = value)
+                        persistColors()
+                    },
+                )
+                add(
+                    RetroMenuEntry.ColorPick(activity.getString(R.string.retro_ps2_shadow_color), customColors.shadow) { value ->
+                        customColors = customColors.copy(shadow = value)
+                        persistColors()
+                    },
+                )
+                add(
+                    RetroMenuEntry.ColorPick(activity.getString(R.string.retro_ps2_background_color), customColors.body) { value ->
+                        customColors = customColors.copy(body = value)
+                        persistColors()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_reset_colors), RetroDrawerIcons.Reset) {
+                        customColors = RetroCustomColors()
+                        persistColors()
+                    },
+                )
+            }
+
+        fun displayEntries(): List<RetroMenuEntry> =
+            buildList {
+                val scales = listOf(1f, 1.5f, 2f, 3f, 4f)
+                val scaleLabels = listOf(
+                    activity.getString(R.string.retro_ps2_scale_1x_native),
+                    activity.getString(R.string.retro_ps2_scale_1_5x),
+                    activity.getString(R.string.retro_ps2_scale_2x),
+                    activity.getString(R.string.retro_ps2_scale_3x),
+                    activity.getString(R.string.retro_ps2_scale_4x),
+                )
+                val scaleIdx = scales.indexOfFirst { kotlin.math.abs(it - prefs.getFloat("wn.ps2.upscale", 1f)) < 0.01f }.coerceAtLeast(0)
+                add(
+                    RetroMenuEntry.Choice(activity.getString(R.string.retro_ps2_resolution_scale), scaleLabels, scaleIdx) { next ->
+                        prefs.edit().putFloat("wn.ps2.upscale", scales[next]).apply()
+                        bg { NativeApp.renderUpscalemultiplier(scales[next]) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_aspect_ratio),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_aspect_stretch),
+                            activity.getString(R.string.retro_ps2_aspect_auto_standard),
+                            activity.getString(R.string.retro_ps2_aspect_4_3),
+                            activity.getString(R.string.retro_ps2_aspect_16_9),
+                        ),
+                        prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.aspect", next).apply()
+                        bg { NativeApp.setAspectRatio(next) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_fmv_aspect_ratio),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_shader_off),
+                            activity.getString(R.string.retro_ps2_aspect_auto_standard),
+                            activity.getString(R.string.retro_ps2_aspect_4_3),
+                            activity.getString(R.string.retro_ps2_aspect_16_9),
+                        ),
+                        prefs.getInt("wn.ps2.fmvaspect", 0).coerceIn(0, 3),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.fmvaspect", next).apply()
+                        gsSetAsync("FMVAspectRatioSwitch", "string", fmvAspectName(next))
+                        menu.rebuild()
+                    },
+                )
+                val deintLabels = listOf(
+                    activity.getString(R.string.retro_ps2_deint_auto),
+                    activity.getString(R.string.retro_ps2_deint_off),
+                    activity.getString(R.string.retro_ps2_deint_weave_tff),
+                    activity.getString(R.string.retro_ps2_deint_weave_bff),
+                    activity.getString(R.string.retro_ps2_deint_bob_tff),
+                    activity.getString(R.string.retro_ps2_deint_bob_bff),
+                    activity.getString(R.string.retro_ps2_deint_blend_tff),
+                    activity.getString(R.string.retro_ps2_deint_blend_bff),
+                    activity.getString(R.string.retro_ps2_deint_adaptive_tff),
+                    activity.getString(R.string.retro_ps2_deint_adaptive_bff),
+                )
+                add(
+                    RetroMenuEntry.Choice(activity.getString(R.string.retro_ps2_deinterlace_mode), deintLabels, prefs.getInt("wn.ps2.deinterlace", 0).coerceIn(0, 9)) { next ->
+                        prefs.edit().putInt("wn.ps2.deinterlace", next).apply()
+                        gsSetAsync("deinterlace_mode", "int", next.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_display_filter),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_filter_nearest),
+                            activity.getString(R.string.retro_ps2_filter_bilinear_smooth),
+                            activity.getString(R.string.retro_ps2_filter_bilinear_sharp),
+                        ),
+                        prefs.getInt("wn.ps2.displayfilter", 1).coerceIn(0, 2),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.displayfilter", next).apply()
+                        gsSetAsync("linear_present_mode", "int", next.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_texture_filter),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_filter_nearest),
+                            activity.getString(R.string.retro_ps2_filter_bilinear_forced),
+                            activity.getString(R.string.retro_ps2_filter_bilinear_ps2),
+                            activity.getString(R.string.retro_ps2_filter_bilinear_sprites),
+                        ),
+                        prefs.getInt("wn.ps2.filter", 2).coerceIn(0, 3),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.filter", next).apply()
+                        gsSetAsync("filter", "int", next.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_mipmapping), checked = prefs.getBoolean("wn.ps2.mipmap", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.mipmap", value).apply()
+                        gsSetAsync("hw_mipmap", "bool", value.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_blending_accuracy),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_blend_minimum),
+                            activity.getString(R.string.retro_ps2_blend_basic),
+                            activity.getString(R.string.retro_ps2_blend_medium),
+                            activity.getString(R.string.retro_ps2_blend_high),
+                            activity.getString(R.string.retro_ps2_blend_full),
+                            activity.getString(R.string.retro_ps2_blend_maximum),
+                        ),
+                        prefs.getInt("wn.ps2.blend", 1).coerceIn(0, 5),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.blend", next).apply()
+                        gsSetAsync("accurate_blending_unit", "int", next.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_anti_blur), checked = prefs.getBoolean("wn.ps2.antiblur", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.antiblur", value).apply()
+                        gsSetAsync("pcrtc_antiblur", "bool", value.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_crt_tv_shader),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_shader_off),
+                            activity.getString(R.string.retro_ps2_shader_scanline),
+                            activity.getString(R.string.retro_ps2_shader_diagonal),
+                            activity.getString(R.string.retro_ps2_shader_triangular),
+                            activity.getString(R.string.retro_ps2_shader_wave),
+                            activity.getString(R.string.retro_ps2_shader_lottes),
+                            activity.getString(R.string.retro_ps2_shader_4xrgss),
+                            activity.getString(R.string.retro_ps2_shader_nxagss),
+                        ),
+                        prefs.getInt("wn.ps2.tvshader", 0).coerceIn(0, 7),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.tvshader", next).apply()
+                        bg { NativeApp.renderTvShader(next) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Choice(
+                        activity.getString(R.string.retro_ps2_frame_skip),
+                        listOf(
+                            activity.getString(R.string.retro_ps2_frameskip_off),
+                            activity.getString(R.string.retro_ps2_frameskip_1),
+                            activity.getString(R.string.retro_ps2_frameskip_2),
+                            activity.getString(R.string.retro_ps2_frameskip_3),
+                        ),
+                        prefs.getInt("wn.ps2.frameskip", 0).coerceIn(0, 3),
+                    ) { next ->
+                        prefs.edit().putInt("wn.ps2.frameskip", next).apply()
+                        bg { NativeApp.setFrameSkip(next) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_widescreen_patches), checked = prefs.getBoolean("wn.ps2.widescreen", false)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.widescreen", value).apply()
+                        bg {
+                            NativeApp.setSetting("EmuCore", "EnableWideScreenPatches", "bool", value.toString())
+                            NativeApp.commitSettings()
+                            NativeApp.reloadPatches()
+                        }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_no_interlace_patches), checked = prefs.getBoolean("wn.ps2.nointerlace", false)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.nointerlace", value).apply()
+                        bg {
+                            NativeApp.setSetting("EmuCore", "EnableNoInterlacingPatches", "bool", value.toString())
+                            NativeApp.commitSettings()
+                            NativeApp.reloadPatches()
+                        }
+                        menu.rebuild()
+                    },
+                )
+            }
+
+        fun soundEntries(): List<RetroMenuEntry> =
+            buildList {
+                val muted = prefs.getBoolean("wn.ps2.muted", false)
+                val volume = prefs.getInt("wn.ps2.volume", 100)
+                val swap = prefs.getBoolean("wn.ps2.swap", false)
+                add(
+                    RetroMenuEntry.Slider(
+                        label = activity.getString(R.string.retro_ps2_volume),
+                        valueText = activity.getString(R.string.retro_ps2_volume_percent, volume),
+                        value = volume.toFloat(),
+                        min = 0f,
+                        max = 200f,
+                        step = 5f,
+                    ) { value ->
+                        val v = value.toInt()
+                        prefs.edit().putInt("wn.ps2.volume", v).apply()
+                        bg { NativeApp.setAudioVolume(v) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_mute), checked = muted) { value ->
+                        prefs.edit().putBoolean("wn.ps2.muted", value).apply()
+                        bg { NativeApp.setAudioMuted(value) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_time_stretch), checked = prefs.getBoolean("wn.ps2.timestretch", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.timestretch", value).apply()
+                        spu2Set("SyncMode", "string", if (value) "TimeStretch" else "Disabled")
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_swap_stereo_channels), checked = swap) { value ->
+                        prefs.edit().putBoolean("wn.ps2.swap", value).apply()
+                        bg { NativeApp.setAudioSwapChannels(value) }
+                        menu.rebuild()
+                    },
+                )
+            }
+
+        fun performanceEntries(): List<RetroMenuEntry> =
+            buildList {
+                val rateValues = listOf(-3, -2, -1, 0, 1, 2, 3)
+                val rateLabels = listOf(
+                    activity.getString(R.string.retro_ps2_rate_50),
+                    activity.getString(R.string.retro_ps2_rate_60),
+                    activity.getString(R.string.retro_ps2_rate_75),
+                    activity.getString(R.string.retro_ps2_rate_100_default),
+                    activity.getString(R.string.retro_ps2_rate_130),
+                    activity.getString(R.string.retro_ps2_rate_180),
+                    activity.getString(R.string.retro_ps2_rate_300),
+                )
+                val curRate = prefs.getInt("wn.ps2.eeRate", 0).coerceIn(-3, 3)
+                add(
+                    RetroMenuEntry.Choice(activity.getString(R.string.retro_ps2_ee_cycle_rate), rateLabels, rateValues.indexOf(curRate).coerceAtLeast(0)) { next ->
+                        prefs.edit().putInt("wn.ps2.eeRate", rateValues[next]).apply()
+                        bg { NativeApp.speedhackEecyclerate(rateValues[next]) }
+                        spSet("EECycleRate", "int", rateValues[next].toString())
+                        menu.rebuild()
+                    },
+                )
+                val skipLabels = listOf(
+                    activity.getString(R.string.retro_ps2_skip_off),
+                    activity.getString(R.string.retro_ps2_skip_1),
+                    activity.getString(R.string.retro_ps2_skip_2),
+                    activity.getString(R.string.retro_ps2_skip_3),
+                )
+                add(
+                    RetroMenuEntry.Choice(activity.getString(R.string.retro_ps2_ee_cycle_skip), skipLabels, prefs.getInt("wn.ps2.eeSkip", 0).coerceIn(0, 3)) { next ->
+                        prefs.edit().putInt("wn.ps2.eeSkip", next).apply()
+                        bg { NativeApp.speedhackEecycleskip(next) }
+                        spSet("EECycleSkip", "int", next.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_instant_vu1), checked = prefs.getBoolean("wn.ps2.instantVu1", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.instantVu1", value).apply()
+                        bg { NativeApp.setInstantVU1(value) }
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_vu_flag_hack), checked = prefs.getBoolean("wn.ps2.vuFlagHack", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.vuFlagHack", value).apply()
+                        spSet("vuFlagHack", "bool", value.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_intc_spin), checked = prefs.getBoolean("wn.ps2.intc", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.intc", value).apply()
+                        spSet("IntcStat", "bool", value.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_wait_loop), checked = prefs.getBoolean("wn.ps2.waitloop", true)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.waitloop", value).apply()
+                        spSet("WaitLoop", "bool", value.toString())
+                        menu.rebuild()
+                    },
+                )
+                add(
+                    RetroMenuEntry.Toggle(activity.getString(R.string.retro_ps2_fast_cdvd), checked = prefs.getBoolean("wn.ps2.fastCdvd", false)) { value ->
+                        prefs.edit().putBoolean("wn.ps2.fastCdvd", value).apply()
+                        spSet("fastCDVD", "bool", value.toString())
+                        menu.rebuild()
+                    },
+                )
+            }
+
+        fun hudEntries(): List<RetroMenuEntry> =
+            RetroHudSupport.buildHudEntries(
+                context = activity,
+                hudVisible = hudVisible,
+                style = hudStyle,
+                elements = hudElements,
+                onMaster = { setHudVisible(it) },
+                onStyle = { next ->
+                    hudStyle = next
+                    RetroHudSupport.savePs2HudStyle(activity, next)
+                    applyHudToRating()
+                },
+                onElements = { next ->
+                    hudElements = next
+                    RetroHudSupport.savePs2Elements(activity, next)
+                    applyHudToRating()
+                },
+                onRebuild = { menu.rebuild() },
+            )
+
+        menu.tabs = RetroDrawerTabs.build(activity, includePerformance = true)
+        menu.entriesProvider = { pane ->
+            when (pane) {
+                null -> mainEntries()
+                RetroPane.DISPLAY -> displayEntries()
+                RetroPane.PERFORMANCE -> performanceEntries()
+                RetroPane.SOUND -> soundEntries()
+                RetroPane.SAVES -> saveSlotEntries()
+                RetroPane.MEMCARDS -> memcardEntries()
+                RetroPane.CONTROLS -> controlsEntries()
+                RetroPane.HUD -> hudEntries()
+                RetroPane.NETWORK -> emptyList()
+                RetroPane.SYSTEM -> emptyList()
+            }
+        }
+        menu.bottomProvider = {
+            listOf(
+                if (wnPaused) {
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_resume), RetroDrawerIcons.Resume, active = true) {
+                        wnPaused = false
+                        MainActivityRuntime.resume()
+                        menu.close()
+                    }
+                } else {
+                    RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_pause), RetroDrawerIcons.Pause) {
+                        wnPaused = true
+                        menu.rebuild()
+                    }
+                },
+                RetroMenuEntry.Action(activity.getString(R.string.retro_ps2_exit), RetroDrawerIcons.Exit, danger = true) {
+                    menu.close()
+                    runCatching { NativeApp.shutdown() }
+                    activity.finish()
+                },
+            )
+        }
+
+        val listener =
+            object : RetroInputView.Listener {
+                override fun onButton(keyCode: Int, down: Boolean) {
+                    if (!nativeUp()) return
+                    NativeApp.setPadButton(mapFace(keyCode), if (down) FULL else 0, down)
+                }
+
+                override fun onDpad(x: Float, y: Float) {
+                    if (!nativeUp()) return
+                    NativeApp.setPadButton(KeyEvent.KEYCODE_DPAD_LEFT, if (x < -0.3f) FULL else 0, x < -0.3f)
+                    NativeApp.setPadButton(KeyEvent.KEYCODE_DPAD_RIGHT, if (x > 0.3f) FULL else 0, x > 0.3f)
+                    NativeApp.setPadButton(KeyEvent.KEYCODE_DPAD_UP, if (y < -0.3f) FULL else 0, y < -0.3f)
+                    NativeApp.setPadButton(KeyEvent.KEYCODE_DPAD_DOWN, if (y > 0.3f) FULL else 0, y > 0.3f)
+                }
+
+                override fun onStick(x: Float, y: Float) {
+                    if (!nativeUp()) return
+                    emitAxis(111, 113, x)
+                    emitAxis(112, 110, y)
+                }
+
+                override fun onRightStick(x: Float, y: Float) {
+                    if (!nativeUp()) return
+                    emitAxis(121, 123, x)
+                    emitAxis(122, 120, y)
+                }
+
+                override fun onMenu() {
+                    if (!nativeUp()) return
+                    activity.runOnUiThread {
+                        pad?.releaseAll()
+                        menu.rebuild()
+                        menu.open()
+                    }
+                }
+            }
+
+        WinNativeHost.openMenu = {
+            activity.runOnUiThread {
+                if (activity.isFinishing || activity.isDestroyed) return@runOnUiThread
+                if (!nativeUp()) return@runOnUiThread
+                if (menu.visible) {
+                    if (!menuToggleGate.allow()) return@runOnUiThread
+                    menu.close()
+                } else {
+                    pad?.releaseAll()
+                    menu.rebuild()
+                    menu.open()
+                }
+            }
+        }
+        WinNativeHost.isMenuOpen = { menu.visible && ps2Screen.value == null }
+        WinNativeHost.menuKeyHandler = handler@{ event ->
+            if (!menu.visible || ps2Screen.value != null) return@handler false
+            if (event.keyCode == KeyEvent.KEYCODE_BACK) return@handler false
+            menu.handleKey(event.keyCode, event.action)
+        }
+        WinNativeHost.menuAxisHandler = { x, y ->
+            if (!menu.visible || ps2Screen.value != null) false
+            else menu.handleAxis(x, y)
+        }
+
+        if (hudVisible) {
+            activity.window.decorView.post {
+                if (!activity.isFinishing && !activity.isDestroyed && hudVisible) showHud()
+            }
+        }
+
+        bg {
+            Ps2RaBridge.pushSharedLogin(activity)
+            NativeApp.setAchievementsOption("notifications", false)
+            NativeApp.setAchievementsOption("leaderboardNotifications", false)
+            NativeApp.setSetting("Achievements", "Notifications", "bool", "false")
+            NativeApp.setSetting("Achievements", "LeaderboardNotifications", "bool", "false")
+            NativeApp.commitSettings()
+        }
+
+        val achievementPollHandler = android.os.Handler(android.os.Looper.getMainLooper())
+        var knownUnlocked = emptySet<Int>()
+        var achievementsSeeded = false
+        val achievementPoll =
+            object : Runnable {
+                override fun run() {
+                    if (activity.isFinishing || activity.isDestroyed) return
+                    if (!nativeUp()) {
+                        achievementPollHandler.postDelayed(this, 1500L)
+                        return
+                    }
+                    if (ps2Screen.value == null) {
+                        runCatching {
+                            val json = NativeApp.getAchievementsJSON() ?: return@runCatching
+                            val items = com.armsx2.ui.achievements.parseAchievementItems(json)
+                            val unlocked = items.filter { it.unlocked }.map { it.id }.toSet()
+                            if (!achievementsSeeded) {
+                                knownUnlocked = unlocked
+                                achievementsSeeded = true
+                            } else {
+                                val newly = unlocked - knownUnlocked
+                                if (newly.isNotEmpty()) {
+                                    knownUnlocked = unlocked
+                                    items.filter { it.id in newly }.forEach { item ->
+                                        val showPad =
+                                            touchVisible.value &&
+                                                (pad?.editMode == true || (!controllerConnected.value || manualTouchOverride.value))
+                                        RetroAchievementOverlayState.syncPlacement(showPad, controllerConnected.value)
+                                        RetroAchievementOverlayState.show(item.title, item.points, item.description)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    achievementPollHandler.postDelayed(this, 1500L)
+                }
+            }
+        achievementPollHandler.postDelayed(achievementPoll, 3000L)
+
+        val overlayView =
+            ComposeView(activity).apply {
+                elevation = 2000f
+                setContent {
+                    WinNativeTheme {
+                        androidx.compose.foundation.layout.Box(
+                            modifier = Modifier.fillMaxSize(),
+                        ) {
+                        val memImport = androidx.activity.compose.rememberLauncherForActivityResult(
+                            androidx.activity.result.contract.ActivityResultContracts.OpenDocument(),
+                        ) { uri ->
+                            if (uri != null) {
+                                Thread {
+                                    runCatching {
+                                        val name = queryName(activity, uri) ?: "Imported.ps2"
+                                        val fileName = if (name.endsWith(".ps2", true)) name else "$name.ps2"
+                                        val target = uniqueMemcard(memcardDir(activity), fileName)
+                                        activity.contentResolver.openInputStream(uri)?.use { input -> target.outputStream().use(input::copyTo) }
+                                    }
+                                    activity.runOnUiThread { menu.rebuild() }
+                                }.start()
+                            }
+                        }
+                        androidx.compose.runtime.LaunchedEffect(Unit) {
+                            launchMemcardImport = { memImport.launch(arrayOf("*/*")) }
+                        }
+                        val menuVisible = menu.visible
+                        androidx.compose.runtime.LaunchedEffect(menuVisible) {
+                            if (!menuVisible && !wnPaused && ps2Screen.value == null) {
+                                MainActivityRuntime.resume()
+                            }
+                        }
+                        val screen by ps2Screen
+                        BackHandler(enabled = screen == null) {
+                            when {
+                                pad?.editMode == true -> pad?.finishEdit()
+                                menu.visible -> menu.handleKey(KeyEvent.KEYCODE_BACK, KeyEvent.ACTION_UP)
+                                else -> {
+                                    pad?.releaseAll()
+                                    menu.rebuild()
+                                    menu.open()
+                                }
+                            }
+                        }
+                        if (screen != null) {
+                            val dismiss = {
+                                ps2Screen.value = null
+                                wnPaused = false
+                                MainActivityRuntime.resume()
+                            }
+                            BackHandler(enabled = true) { dismiss() }
+                            when (screen) {
+                                "cheats" -> Ps2CheatsScreen(activity, dismiss)
+                                "achievements" ->
+                                    Ps2AchievementsScreen(
+                                        activity,
+                                        romPath = launchRomPath,
+                                        launchGameName = launchGameName,
+                                        onBack = dismiss,
+                                    )
+                            }
+                            return@WinNativeTheme
+                        }
+                        val covered = WindowImpl.frontendCovers
+                        val showPad = touchVisible.value && (pad?.editMode == true || (!controllerConnected.value || manualTouchOverride.value))
+                        if (!covered && showPad) {
+                            AndroidView(
+                                modifier = Modifier.fillMaxSize(),
+                                factory = { ctx ->
+                                    RetroInputView(ctx, listener, RetroSystems.PS2).also { view ->
+                                        view.loadStickInversion()
+                                        view.adaptiveSticks = ps2Prefs(ctx).getBoolean("wn.ps2.adaptivesticks", false)
+                                        view.showL3R3 = ps2Prefs(ctx).getBoolean("wn.ps2.showl3r3", true)
+                                        view.hapticStrength =
+                                            androidx.preference.PreferenceManager
+                                                .getDefaultSharedPreferences(ctx)
+                                                .getFloat("retro_haptic_strength", 0.4f)
+                                        view.setCustomColors(customColors)
+                                        view.addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ ->
+                                            val w = v.width.toFloat()
+                                            val h = v.height.toFloat()
+                                            if (w > 0f && h > 0f) {
+                                                val aspect = 4f / 3f
+                                                val gw = (h * aspect).coerceAtMost(w)
+                                                val gh = gw / aspect
+                                                val left = (w - gw) * 0.5f
+                                                val top = (h - gh) * 0.5f
+                                                view.setGameArea(android.graphics.RectF(left, top, left + gw, top + gh))
+                                            }
+                                        }
+                                        pad = view
+                                    }
+                                },
+                            )
+                        }
+                        if (!covered) {
+                            val showPadForHud = touchVisible.value && (pad?.editMode == true || (!controllerConnected.value || manualTouchOverride.value))
+                            RetroAchievementOverlayState.syncPlacement(showPadForHud, controllerConnected.value)
+                            RetroAchievementOverlayBanner()
+                            RetroDrawerMenu(menu)
+                        }
+                        }
+                    }
+                }
+            }
+        activity.addContentView(
+            overlayView,
+            ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT),
+        )
+
+        val aspectPinHandler = android.os.Handler(android.os.Looper.getMainLooper())
+        var aspectPinTicks = 0
+        val aspectPin =
+            object : Runnable {
+                override fun run() {
+                    if (activity.isFinishing || activity.isDestroyed) return
+                    applyDisplayAspect(activity, live = true)
+                    aspectPinTicks++
+                    if (aspectPinTicks < 20) {
+                        aspectPinHandler.postDelayed(this, 100L)
+                    }
+                }
+            }
+        aspectPinHandler.post(aspectPin)
+
+        val prevCallback = activity.window.callback
+        if (prevCallback != null) {
+            activity.window.callback =
+                object : android.view.Window.Callback by prevCallback {
+                    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+                        if (ps2Screen.value == null && menu.visible &&
+                            event.keyCode != KeyEvent.KEYCODE_BACK &&
+                            menu.handleKey(event.keyCode, event.action)
+                        ) {
+                            return true
+                        }
+                        return prevCallback.dispatchKeyEvent(event)
+                    }
+
+                    override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean {
+                        if (ps2Screen.value == null && menu.visible &&
+                            event.source and android.view.InputDevice.SOURCE_JOYSTICK == android.view.InputDevice.SOURCE_JOYSTICK
+                        ) {
+                            val x = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_X).takeIf { kotlin.math.abs(it) > 0.5f }
+                                ?: event.getAxisValue(android.view.MotionEvent.AXIS_X)
+                            val y = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_Y).takeIf { kotlin.math.abs(it) > 0.5f }
+                                ?: event.getAxisValue(android.view.MotionEvent.AXIS_Y)
+                            activity.runOnUiThread { menu.handleAxis(x, y) }
+                            return true
+                        }
+                        return prevCallback.dispatchGenericMotionEvent(event)
+                    }
+                }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/Ps2IsoSerial.kt b/app/src/main/feature/retro/Ps2IsoSerial.kt
new file mode 100644
index 000000000..29d64d6a0
--- /dev/null
+++ b/app/src/main/feature/retro/Ps2IsoSerial.kt
@@ -0,0 +1,108 @@
+package com.winlator.cmod.feature.retro
+
+import java.io.File
+import java.io.RandomAccessFile
+
+object Ps2IsoSerial {
+    private const val LOGICAL = 2048
+
+    private data class Layout(val sectorSize: Int, val dataOffset: Int)
+
+    fun serialOf(file: File): String? {
+        if (!file.isFile || file.length() < 17L * LOGICAL) return null
+        return runCatching {
+            RandomAccessFile(file, "r").use { raf ->
+                val layout = detectLayout(raf) ?: return null
+                val pvd = readLogical(raf, layout, 16)
+                val rootLba = le32(pvd, 156 + 2)
+                val rootSize = le32(pvd, 156 + 10)
+                if (rootLba <= 0 || rootSize <= 0) return null
+                val cnf = findFile(raf, layout, rootLba, rootSize, "SYSTEM.CNF") ?: return null
+                val text = readExtent(raf, layout, cnf.first, cnf.second.coerceAtMost(64 * 1024))
+                    .toString(Charsets.US_ASCII)
+                parseBoot(text)
+            }
+        }.getOrNull()
+    }
+
+    private fun detectLayout(raf: RandomAccessFile): Layout? {
+        for (layout in listOf(Layout(2048, 0), Layout(2352, 16), Layout(2352, 24))) {
+            val sec = runCatching { readLogical(raf, layout, 16) }.getOrNull() ?: continue
+            if (sec[0].toInt() == 1 &&
+                sec[1] == 'C'.code.toByte() && sec[2] == 'D'.code.toByte() &&
+                sec[3] == '0'.code.toByte() && sec[4] == '0'.code.toByte() && sec[5] == '1'.code.toByte()
+            ) {
+                return layout
+            }
+        }
+        return null
+    }
+
+    private fun readLogical(raf: RandomAccessFile, layout: Layout, lba: Int): ByteArray {
+        val buf = ByteArray(LOGICAL)
+        raf.seek(lba.toLong() * layout.sectorSize + layout.dataOffset)
+        raf.readFully(buf)
+        return buf
+    }
+
+    private fun readExtent(raf: RandomAccessFile, layout: Layout, lba: Int, size: Int): ByteArray {
+        val out = ByteArray(size)
+        var done = 0
+        var sector = lba
+        while (done < size) {
+            val sec = readLogical(raf, layout, sector)
+            val n = minOf(LOGICAL, size - done)
+            System.arraycopy(sec, 0, out, done, n)
+            done += n
+            sector++
+        }
+        return out
+    }
+
+    private fun findFile(
+        raf: RandomAccessFile,
+        layout: Layout,
+        dirLba: Int,
+        dirSize: Int,
+        target: String,
+    ): Pair<Int, Int>? {
+        var remaining = dirSize
+        var sector = dirLba
+        while (remaining > 0) {
+            val sec = readLogical(raf, layout, sector)
+            var off = 0
+            while (off < LOGICAL) {
+                val recLen = sec[off].toInt() and 0xFF
+                if (recLen == 0) break
+                val nameLen = sec[off + 32].toInt() and 0xFF
+                if (nameLen > 0 && off + 33 + nameLen <= LOGICAL) {
+                    val rawName = String(sec, off + 33, nameLen, Charsets.US_ASCII)
+                    val name = rawName.substringBefore(';').trim()
+                    if (name.equals(target, ignoreCase = true)) {
+                        return le32(sec, off + 2) to le32(sec, off + 10)
+                    }
+                }
+                off += recLen
+            }
+            remaining -= LOGICAL
+            sector++
+        }
+        return null
+    }
+
+    private fun le32(b: ByteArray, off: Int): Int =
+        (b[off].toInt() and 0xFF) or
+            ((b[off + 1].toInt() and 0xFF) shl 8) or
+            ((b[off + 2].toInt() and 0xFF) shl 16) or
+            ((b[off + 3].toInt() and 0xFF) shl 24)
+
+    private fun parseBoot(text: String): String? {
+        val line = text.lineSequence().firstOrNull { it.trimStart().startsWith("BOOT", ignoreCase = true) && it.contains("cdrom", ignoreCase = true) }
+            ?: return null
+        val afterColon = line.substringAfter("cdrom0:", "").trimStart('\\', '/', ' ')
+        val token = afterColon.substringBefore(';').substringBefore(' ').trim()
+        if (token.isBlank()) return null
+        val serial = token.replace("_", "-").replace(".", "").uppercase()
+        return serial.takeIf { it.length in 8..12 && it.contains('-') }
+    }
+}
diff --git a/app/src/main/feature/retro/Ps2MenuScreens.kt b/app/src/main/feature/retro/Ps2MenuScreens.kt
new file mode 100644
index 000000000..dbf776d77
--- /dev/null
+++ b/app/src/main/feature/retro/Ps2MenuScreens.kt
@@ -0,0 +1,637 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.armsx2.runtime.MainActivityRuntime
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import java.io.File
+import kotlinx.coroutines.launch
+import kr.co.iefriends.pcsx2.NativeApp
+
+internal fun memcardDir(context: Context): File =
+    File(MainActivityRuntime.assetCopyRoot(context), "memcards").apply { mkdirs() }
+
+internal fun listMemcards(context: Context): List<File> =
+    memcardDir(context).listFiles().orEmpty()
+        .filter { it.isFile && it.extension.equals("ps2", true) }
+        .sortedBy { it.name.lowercase() }
+
+internal fun humanSize(bytes: Long): String =
+    when {
+        bytes >= 1_048_576 -> "${bytes / 1_048_576} MB"
+        bytes >= 1024 -> "${bytes / 1024} KB"
+        else -> "$bytes B"
+    }
+
+internal fun queryName(context: Context, uri: android.net.Uri): String? =
+    runCatching {
+        context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
+            if (it.moveToFirst()) it.getString(0) else null
+        }
+    }.getOrNull()
+
+internal fun uniqueMemcard(dir: File, name: String): File {
+    dir.mkdirs()
+    val base = name.substringBeforeLast('.', name)
+    val ext = name.substringAfterLast('.', "").let { if (it.isEmpty()) "" else ".$it" }
+    var target = File(dir, name)
+    var i = 2
+    while (target.exists()) target = File(dir, "$base-$i$ext").also { i++ }
+    return target
+}
+
+@Composable
+fun Ps2CheatsScreen(
+    context: Context,
+    onBack: () -> Unit,
+) {
+    val scope = androidx.compose.runtime.rememberCoroutineScope()
+    var loading by remember { mutableStateOf(true) }
+    var status by remember { mutableStateOf("") }
+    var title by remember { mutableStateOf("") }
+    var serial by remember { mutableStateOf("") }
+    var crc by remember { mutableStateOf("") }
+    var entries by remember { mutableStateOf<List<com.armsx2.PatchRepo.Entry>>(emptyList()) }
+    var selected by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var patchEntries by remember { mutableStateOf<List<com.armsx2.PatchRepo.Entry>>(emptyList()) }
+    var selectedPatches by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var repoCheatNames by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var repoPatchNames by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var dnasEntries by remember { mutableStateOf<List<Ps2DnasBypass.BypassEntry>>(emptyList()) }
+    var dnasGlobalOn by remember { mutableStateOf(true) }
+    var dnasDisabled by remember { mutableStateOf<Set<String>>(emptySet()) }
+
+    androidx.compose.runtime.LaunchedEffect(Unit) {
+        data class LocalCheats(
+            val s: String,
+            val c: String?,
+            val stagedC: List<com.armsx2.PatchRepo.Entry>,
+            val stagedP: List<com.armsx2.PatchRepo.Entry>,
+            val dnas: List<Ps2DnasBypass.BypassEntry>,
+            val globalOn: Boolean,
+            val disabled: Set<String>,
+        )
+        val local = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+            val s = runCatching { NativeApp.getGameSerial() }.getOrNull()?.takeIf { it.isNotBlank() }
+            val c = runCatching { NativeApp.getGameCRC() }.getOrNull()?.takeIf { it.length == 8 }
+            if (s == null) null
+            else {
+                val stagedC = Ps2CheatStaging.read(context, s, false)
+                val stagedP = Ps2CheatStaging.read(context, s, true)
+                val dnas = Ps2DnasBypass.bypassEntries(context, s).filter { it.auto }
+                val globalOn = context.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE).getBoolean(Ps2DnasBypass.PREF, true)
+                val disabled = Ps2DnasBypass.ensureSingleDnasEnabled(context, s, dnas.map { it.name }.toSet())
+                LocalCheats(s, c, stagedC, stagedP, dnas, globalOn, disabled)
+            }
+        }
+        if (local == null) {
+            status = context.getString(R.string.retro_scr_no_game_serial)
+            loading = false
+        } else {
+            serial = local.s
+            crc = local.c.orEmpty()
+            title = local.s
+            entries = local.stagedC
+            patchEntries = local.stagedP
+            selected = local.stagedC.map { it.name }.toSet()
+            selectedPatches = local.stagedP.map { it.name }.toSet()
+            dnasEntries = local.dnas
+            dnasGlobalOn = local.globalOn
+            dnasDisabled = local.disabled
+            loading = false
+            val remote = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+                runCatching {
+                    if (local.c != null) com.armsx2.PatchRepo.fetchForGame(local.s, local.c)
+                    else com.armsx2.PatchRepo.fetchForSerial(local.s)
+                }.getOrNull()
+            }
+            if (remote != null) {
+                title = remote.gametitle.takeIf { it.isNotBlank() } ?: local.s
+                status = remote.error.orEmpty()
+                val repoCheats = remote.entries.filter { it.source != "patches" }
+                val repoPatches = remote.entries.filter { it.source == "patches" }
+                repoCheatNames = repoCheats.map { it.name }.toSet()
+                repoPatchNames = repoPatches.map { it.name }.toSet()
+                entries = repoCheats + local.stagedC.filter { st -> repoCheats.none { it.name == st.name } }
+                patchEntries = repoPatches + local.stagedP.filter { st -> repoPatches.none { it.name == st.name } }
+            }
+        }
+    }
+
+    fun persist() {
+        if (serial.isBlank()) return
+        Ps2CheatStaging.write(context, serial, false, serial, entries.filter { it.name in selected })
+        Ps2CheatStaging.write(context, serial, true, serial, patchEntries.filter { it.name in selectedPatches })
+    }
+
+    fun apply() {
+        persist()
+        val s = serial
+        val c = crc
+        scope.launch {
+            val ok = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+                runCatching { Ps2CheatStaging.applyAll(context, s, c); true }.getOrDefault(false)
+            }
+            status = if (ok) {
+                context.getString(R.string.retro_scr_applied_both, selected.size, selectedPatches.size + dnasEntries.count { dnasGlobalOn && it.name !in dnasDisabled })
+            } else {
+                context.getString(R.string.retro_scr_couldnt_apply_cheats)
+            }
+        }
+    }
+
+    fun toggleDnas(name: String, currentlyOn: Boolean) {
+        if (serial.isBlank()) return
+        if (currentlyOn) {
+            dnasDisabled = dnasDisabled + name
+        } else {
+            if (!dnasGlobalOn) { Ps2DnasBypass.setEnabled(context, true); dnasGlobalOn = true }
+            val all = dnasEntries.map { it.name }.toSet()
+            dnasDisabled = all - name
+        }
+        Ps2DnasBypass.setDisabledNames(context, serial, dnasDisabled)
+    }
+
+    var showAdd by remember { mutableStateOf(false) }
+    var newName by remember { mutableStateOf("") }
+    var newCodes by remember { mutableStateOf("") }
+    var newIsPatch by remember { mutableStateOf(false) }
+
+    val importLauncher = androidx.activity.compose.rememberLauncherForActivityResult(
+        androidx.activity.result.contract.ActivityResultContracts.OpenDocument(),
+    ) { uri ->
+        if (uri != null) {
+            scope.launch {
+                val text = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+                    runCatching { context.contentResolver.openInputStream(uri)?.bufferedReader()?.use { it.readText() } }.getOrNull()
+                }
+                val imported = if (text != null) parsePnachFile(text, if (newIsPatch) "patches" else "custom") else emptyList()
+                if (imported.isNotEmpty()) {
+                    if (newIsPatch) {
+                        patchEntries = patchEntries.filterNot { e -> imported.any { it.name == e.name } } + imported
+                        selectedPatches = selectedPatches + imported.map { it.name }
+                    } else {
+                        entries = entries.filterNot { e -> imported.any { it.name == e.name } } + imported
+                        selected = selected + imported.map { it.name }
+                    }
+                    persist()
+                    status = ""
+                    showAdd = false
+                } else {
+                    status = context.getString(R.string.retro_scr_cheat_invalid)
+                }
+            }
+        }
+    }
+
+    Ps2WindowedScaffold(title = stringResource(R.string.retro_scr_cheats), onBack = onBack, header = {
+        Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            val openAdd = { newName = ""; newCodes = ""; newIsPatch = false; showAdd = true }
+            OutlinedButton(
+                onClick = openAdd,
+                modifier = Modifier.paneNavItem(onActivate = openAdd),
+                contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 12.dp),
+            ) {
+                Icon(Icons.Filled.Add, contentDescription = null, modifier = Modifier.width(18.dp).height(18.dp))
+                Spacer(Modifier.width(6.dp))
+                Text(stringResource(R.string.retro_scr_add))
+            }
+            if (!loading && (entries.isNotEmpty() || patchEntries.isNotEmpty() || serial.isNotBlank())) {
+                OutlinedButton(onClick = { apply() }, modifier = Modifier.paneNavItem(onActivate = { apply() })) {
+                    Text(stringResource(R.string.retro_scr_apply))
+                }
+            }
+        }
+    }) {
+        when {
+            loading -> Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                androidx.compose.material3.CircularProgressIndicator()
+            }
+            entries.isEmpty() && patchEntries.isEmpty() && dnasEntries.isEmpty() -> Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
+                Text(status.ifBlank { stringResource(R.string.retro_scr_no_cheats_or_patches) }, color = MaterialTheme.colorScheme.onSurfaceVariant)
+            }
+            else -> Column(Modifier.fillMaxSize()) {
+                if (status.isNotBlank()) {
+                    Text(status, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary, modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp))
+                }
+                LazyColumn(
+                    Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 4.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    if (dnasEntries.isNotEmpty()) {
+                        item(key = "hdr_dnas") { Ps2SectionHeader(stringResource(R.string.retro_gs_dnas_group)) }
+                        items(dnasEntries, key = { "dnas_" + it.name }) { e ->
+                            val on = dnasGlobalOn && e.name !in dnasDisabled
+                            Ps2CheatRow(
+                                com.armsx2.PatchRepo.Entry(e.name, stringResource(R.string.retro_gs_dnas_entry_desc), e.body, "dnas"),
+                                on, isPatch = true, onToggle = { toggleDnas(e.name, on) },
+                            )
+                        }
+                    }
+                    if (entries.isNotEmpty()) {
+                        item(key = "hdr_cheats") { Ps2SectionHeader(stringResource(R.string.retro_scr_cheats_section)) }
+                        items(entries, key = { "cheat_" + it.name }) { entry ->
+                            val checked = entry.name in selected
+                            val toggle = {
+                                selected = if (entry.name in selected) selected - entry.name else selected + entry.name
+                                persist()
+                            }
+                            val isCustom = entry.name !in repoCheatNames
+                            Ps2CheatRow(
+                                entry, checked, isPatch = false, onToggle = toggle,
+                                onDelete = if (isCustom) {
+                                    {
+                                        entries = entries.filterNot { it.name == entry.name }
+                                        selected = selected - entry.name
+                                        persist()
+                                    }
+                                } else null,
+                            )
+                        }
+                    }
+                    if (patchEntries.isNotEmpty()) {
+                        item(key = "hdr_patches") { Ps2SectionHeader(stringResource(R.string.retro_scr_patches_section)) }
+                        items(patchEntries, key = { "patch_" + it.name }) { entry ->
+                            val checked = entry.name in selectedPatches
+                            val toggle = {
+                                selectedPatches = if (entry.name in selectedPatches) selectedPatches - entry.name else selectedPatches + entry.name
+                                persist()
+                            }
+                            val isCustom = entry.name !in repoPatchNames
+                            Ps2CheatRow(
+                                entry, checked, isPatch = true, onToggle = toggle,
+                                onDelete = if (isCustom) {
+                                    {
+                                        patchEntries = patchEntries.filterNot { it.name == entry.name }
+                                        selectedPatches = selectedPatches - entry.name
+                                        persist()
+                                    }
+                                } else null,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (showAdd) {
+        AlertDialog(
+            onDismissRequest = { showAdd = false },
+            title = { Text(stringResource(R.string.retro_scr_add_cheat)) },
+            text = {
+                Column {
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) {
+                        val selCheat = { newIsPatch = false }
+                        val selPatch = { newIsPatch = true }
+                        OutlinedButton(
+                            onClick = selCheat,
+                            modifier = Modifier.weight(1f).paneNavItem(onActivate = selCheat),
+                            colors = if (!newIsPatch)
+                                androidx.compose.material3.ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.secondaryContainer, contentColor = MaterialTheme.colorScheme.onSecondaryContainer)
+                            else androidx.compose.material3.ButtonDefaults.outlinedButtonColors(),
+                        ) { Text(stringResource(R.string.retro_scr_target_cheat)) }
+                        OutlinedButton(
+                            onClick = selPatch,
+                            modifier = Modifier.weight(1f).paneNavItem(onActivate = selPatch),
+                            colors = if (newIsPatch)
+                                androidx.compose.material3.ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.secondaryContainer, contentColor = MaterialTheme.colorScheme.onSecondaryContainer)
+                            else androidx.compose.material3.ButtonDefaults.outlinedButtonColors(),
+                        ) { Text(stringResource(R.string.retro_scr_target_patch)) }
+                    }
+                    androidx.compose.foundation.layout.Spacer(Modifier.padding(4.dp))
+                    OutlinedTextField(
+                        value = newName,
+                        onValueChange = { newName = it },
+                        label = { Text(stringResource(R.string.retro_scr_cheat_name)) },
+                        singleLine = true,
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                    androidx.compose.foundation.layout.Spacer(Modifier.padding(4.dp))
+                    OutlinedTextField(
+                        value = newCodes,
+                        onValueChange = { newCodes = it },
+                        label = { Text(stringResource(R.string.retro_scr_cheat_codes)) },
+                        placeholder = { Text("2021A268 00000000") },
+                        modifier = Modifier.fillMaxWidth(),
+                        minLines = 3,
+                    )
+                    androidx.compose.foundation.layout.Spacer(Modifier.padding(4.dp))
+                    OutlinedButton(
+                        onClick = { importLauncher.launch(arrayOf("*/*")) },
+                        modifier = Modifier.fillMaxWidth().paneNavItem(onActivate = { importLauncher.launch(arrayOf("*/*")) }),
+                    ) { Text(stringResource(R.string.retro_scr_import_from_file)) }
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    val entry = buildCustomPnachEntry(context, newName, newCodes, if (newIsPatch) "patches" else "custom")
+                    if (entry != null) {
+                        if (newIsPatch) {
+                            patchEntries = patchEntries.filterNot { it.name == entry.name } + entry
+                            selectedPatches = selectedPatches + entry.name
+                        } else {
+                            entries = entries.filterNot { it.name == entry.name } + entry
+                            selected = selected + entry.name
+                        }
+                        persist()
+                        status = ""
+                        showAdd = false
+                    } else {
+                        status = context.getString(R.string.retro_scr_cheat_invalid)
+                    }
+                }) { Text(stringResource(R.string.retro_scr_add)) }
+            },
+            dismissButton = {
+                TextButton(onClick = { showAdd = false }) { Text(stringResource(R.string.retro_scr_cancel)) }
+            },
+        )
+    }
+}
+
+internal fun buildCustomPnachEntry(context: Context, name: String, codes: String, source: String): com.armsx2.PatchRepo.Entry? {
+    val lines =
+        codes.lineSequence().mapNotNull { raw ->
+            val t = raw.trim()
+            when {
+                t.isEmpty() || t.startsWith("//") -> null
+                t.startsWith("patch=") -> t
+                else -> {
+                    val parts = t.split(Regex("\\s+"))
+                    if (parts.size == 2 && parts[0].length == 8 && parts[1].length == 8 &&
+                        parts[0].all { it.isDigit() || it.uppercaseChar() in 'A'..'F' } &&
+                        parts[1].all { it.isDigit() || it.uppercaseChar() in 'A'..'F' }
+                    ) {
+                        "patch=1,EE,${parts[0].uppercase()},extended,${parts[1].uppercase()}"
+                    } else {
+                        null
+                    }
+                }
+            }
+        }.toList()
+    if (name.isBlank() || lines.isEmpty()) return null
+    val body = buildString {
+        append("[").append(name.trim()).append("]\n")
+        lines.forEach { append(it).append("\n") }
+    }
+    val desc = context.getString(if (source == "patches") R.string.retro_scr_custom_patch else R.string.retro_scr_custom_cheat)
+    return com.armsx2.PatchRepo.Entry(name.trim(), desc, body, source)
+}
+
+internal fun parsePnachFile(text: String, source: String): List<com.armsx2.PatchRepo.Entry> =
+    runCatching {
+        com.armsx2.PatchRepo.parseInstalled(text, if (source == "patches") "patches" else "cheats").second
+            .map { com.armsx2.PatchRepo.Entry(it.name, it.description, it.body, source) }
+    }.getOrDefault(emptyList())
+
+@Composable
+internal fun Ps2SectionHeader(text: String) {
+    Text(
+        text,
+        style = MaterialTheme.typography.labelLarge,
+        fontWeight = FontWeight.SemiBold,
+        color = MaterialTheme.colorScheme.primary,
+        modifier = Modifier.padding(top = 4.dp, bottom = 2.dp),
+    )
+}
+
+@Composable
+internal fun Ps2CheatRow(
+    entry: com.armsx2.PatchRepo.Entry,
+    checked: Boolean,
+    isPatch: Boolean,
+    onToggle: () -> Unit,
+    onDelete: (() -> Unit)? = null,
+) {
+    Surface(
+        onClick = onToggle,
+        modifier = Modifier.fillMaxWidth().paneNavItem(cornerRadius = 12.dp, onActivate = onToggle),
+        shape = RoundedCornerShape(12.dp),
+        color = if (checked) MaterialTheme.colorScheme.secondaryContainer else MaterialTheme.colorScheme.surfaceVariant,
+        border = if (checked) null else BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant),
+    ) {
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Column(Modifier.weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+                    if (isPatch) {
+                        Surface(
+                            shape = RoundedCornerShape(4.dp),
+                            color = if (checked) MaterialTheme.colorScheme.onSecondaryContainer.copy(alpha = 0.15f) else MaterialTheme.colorScheme.primary.copy(alpha = 0.15f),
+                        ) {
+                            Text(
+                                stringResource(R.string.retro_scr_patch_badge),
+                                style = MaterialTheme.typography.labelSmall,
+                                fontWeight = FontWeight.Bold,
+                                color = if (checked) MaterialTheme.colorScheme.onSecondaryContainer else MaterialTheme.colorScheme.primary,
+                                modifier = Modifier.padding(horizontal = 6.dp, vertical = 1.dp),
+                            )
+                        }
+                    }
+                    Text(
+                        entry.name,
+                        fontWeight = FontWeight.SemiBold,
+                        color = if (checked) MaterialTheme.colorScheme.onSecondaryContainer else MaterialTheme.colorScheme.onSurface,
+                    )
+                }
+                if (entry.description.isNotBlank()) {
+                    Text(
+                        entry.description,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = if (checked) MaterialTheme.colorScheme.onSecondaryContainer.copy(alpha = 0.75f) else MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+            if (checked) {
+                Spacer(Modifier.width(12.dp))
+                Icon(
+                    Icons.Filled.Check,
+                    contentDescription = null,
+                    tint = if (checked) MaterialTheme.colorScheme.onSecondaryContainer else MaterialTheme.colorScheme.onSurface,
+                )
+            }
+            if (onDelete != null) {
+                Spacer(Modifier.width(4.dp))
+                IconButton(onClick = onDelete, modifier = Modifier.paneNavItem(onActivate = onDelete)) {
+                    Icon(
+                        Icons.Outlined.Delete,
+                        contentDescription = stringResource(R.string.retro_scr_delete),
+                        tint = if (checked) MaterialTheme.colorScheme.onSecondaryContainer else MaterialTheme.colorScheme.error,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Ps2AchievementsScreen(
+    context: Context,
+    romPath: String,
+    launchGameName: String,
+    onBack: () -> Unit,
+) {
+    val gameName =
+        remember(romPath, launchGameName) {
+            launchGameName.takeIf { it.isNotBlank() }
+                ?: romPath.takeIf { it.isNotBlank() }?.let { java.io.File(it).nameWithoutExtension }
+                ?: context.getString(R.string.retro_ps2_tab_menu)
+        }
+    RetroAchievementsScreen(
+        systemId = RetroSystems.PS2.id,
+        gameName = gameName,
+        romPath = romPath,
+        inSession = true,
+        onClose = onBack,
+        useNativePs2 = true,
+        floatingOverGame = true,
+    )
+}
+
+@Composable
+fun Ps2WindowedScaffold(
+    title: String,
+    onBack: () -> Unit,
+    header: @Composable (() -> Unit)? = null,
+    content: @Composable () -> Unit,
+) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val registry = remember { PaneNavRegistry() }
+    androidx.compose.runtime.DisposableEffect(Unit) {
+        val activity = context as? android.app.Activity
+        val restore = activity?.window?.bindPaneNav(registry, onDismiss = onBack)
+        onDispose { restore?.invoke() }
+    }
+    androidx.compose.runtime.CompositionLocalProvider(LocalPaneNav provides registry) {
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(androidx.compose.ui.graphics.Color.Transparent)
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onBack,
+                ),
+            contentAlignment = Alignment.Center,
+        ) {
+            Surface(
+                modifier = Modifier
+                    .padding(24.dp)
+                    .widthIn(max = 560.dp)
+                    .fillMaxWidth()
+                    .fillMaxHeight(0.8f)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = {},
+                    ),
+                shape = RoundedCornerShape(20.dp),
+                color = MaterialTheme.colorScheme.surface,
+                tonalElevation = 3.dp,
+                shadowElevation = 8.dp,
+                border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant),
+            ) {
+                Column(Modifier.fillMaxSize()) {
+                    Row(
+                        Modifier.fillMaxWidth().height(56.dp).padding(start = 8.dp, end = 12.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        IconButton(onClick = onBack, modifier = Modifier.paneNavItem(onActivate = onBack)) {
+                            Icon(Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = stringResource(R.string.retro_scr_back), tint = MaterialTheme.colorScheme.onSurface)
+                        }
+                        Text(title, style = MaterialTheme.typography.titleLarge, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(start = 4.dp))
+                        Spacer(Modifier.weight(1f))
+                        header?.invoke()
+                    }
+                    Box(Modifier.fillMaxSize()) { content() }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Ps2OverlayScaffold(
+    title: String,
+    onBack: () -> Unit,
+    action: @Composable (() -> Unit)? = null,
+    content: @Composable () -> Unit,
+) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val registry = remember { PaneNavRegistry() }
+    androidx.compose.runtime.DisposableEffect(Unit) {
+        val activity = context as? android.app.Activity
+        val restore = activity?.window?.bindPaneNav(registry, onDismiss = onBack)
+        onDispose { restore?.invoke() }
+    }
+    androidx.compose.runtime.CompositionLocalProvider(LocalPaneNav provides registry) {
+        Column(
+            Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.surface),
+        ) {
+            Row(
+                Modifier.fillMaxWidth().height(56.dp).padding(horizontal = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                IconButton(onClick = onBack, modifier = Modifier.paneNavItem(onActivate = onBack)) {
+                    Icon(Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = stringResource(R.string.retro_scr_back), tint = MaterialTheme.colorScheme.onSurface)
+                }
+                Text(title, style = MaterialTheme.typography.titleLarge, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(start = 4.dp))
+                Spacer(Modifier.width(0.dp).weight(1f))
+                action?.invoke()
+            }
+            Box(Modifier.fillMaxSize()) { content() }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/Ps2RaBridge.kt b/app/src/main/feature/retro/Ps2RaBridge.kt
new file mode 100644
index 000000000..14448615c
--- /dev/null
+++ b/app/src/main/feature/retro/Ps2RaBridge.kt
@@ -0,0 +1,28 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import kr.co.iefriends.pcsx2.NativeApp
+
+object Ps2RaBridge {
+    private const val EMUCORE_HARDCORE_REGISTERED = false
+
+    fun pushSharedLogin(context: Context): Boolean {
+        if (!RetroAchievementsManager.isLoggedIn(context)) return false
+        val ra = context.getSharedPreferences("retro_achievements", Context.MODE_PRIVATE)
+        val user = ra.getString("username", null)?.takeIf { it.isNotBlank() } ?: return false
+        val token = ra.getString("token", null)?.takeIf { it.isNotBlank() } ?: return false
+        val hardcore =
+            EMUCORE_HARDCORE_REGISTERED && RetroAchievementsManager.isHardcorePreferred(context)
+        return runCatching {
+            NativeApp.setSetting("Achievements", "Enabled", "bool", "true")
+            NativeApp.setSetting("Achievements", "Username", "string", user)
+            NativeApp.setSetting("Achievements", "Token", "string", token)
+            NativeApp.setSetting("Achievements", "ChallengeMode", "bool", hardcore.toString())
+            NativeApp.setSetting("Achievements", "HardcoreMode", "bool", hardcore.toString())
+            NativeApp.commitSettings()
+            runCatching { NativeApp.setHardcoreMode(hardcore) }
+            NativeApp.clearAchievementsHostOverride()
+            true
+        }.getOrDefault(false)
+    }
+}
diff --git a/app/src/main/feature/retro/RetroAchievementOverlay.kt b/app/src/main/feature/retro/RetroAchievementOverlay.kt
new file mode 100644
index 000000000..267b094c2
--- /dev/null
+++ b/app/src/main/feature/retro/RetroAchievementOverlay.kt
@@ -0,0 +1,200 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.zIndex
+import kotlinx.coroutines.delay
+
+object RetroAchievementOverlayState {
+    data class Banner(
+        val title: String,
+        val points: Int,
+        val description: String = "",
+    )
+
+    var banner by mutableStateOf<Banner?>(null)
+        private set
+    var sessionMessage by mutableStateOf<String?>(null)
+        private set
+    var useDisplayArea by mutableStateOf(false)
+
+    fun syncPlacement(
+        touchControlsVisible: Boolean,
+        controllerConnected: Boolean,
+    ) {
+        useDisplayArea = touchControlsVisible && !controllerConnected
+    }
+
+    fun show(
+        title: String,
+        points: Int,
+        description: String = "",
+    ) {
+        if (title.contains("Unknown Emulator", ignoreCase = true)) return
+        banner = Banner(title, points, description)
+    }
+
+    fun showMessage(message: String) {
+        val trimmed = message.trim()
+        if (trimmed.isEmpty()) return
+        sessionMessage = trimmed
+    }
+
+    fun clear() {
+        banner = null
+    }
+
+    fun clearMessage() {
+        sessionMessage = null
+    }
+}
+
+object RetroPs2OsdPlacement {
+    const val TOP_LEFT = 1
+    const val TOP_CENTER = 2
+
+    fun messagePos(touchControlsVisible: Boolean, controllerConnected: Boolean): Int =
+        if (touchControlsVisible && !controllerConnected) TOP_CENTER else TOP_LEFT
+
+    fun apply(
+        touchControlsVisible: Boolean,
+        controllerConnected: Boolean,
+    ) {
+        val pos = messagePos(touchControlsVisible, controllerConnected)
+        runCatching {
+            kr.co.iefriends.pcsx2.NativeApp.setSetting("EmuCore/GS", "OsdMessagesPos", "int", pos.toString())
+            kr.co.iefriends.pcsx2.NativeApp.commitSettings()
+            kr.co.iefriends.pcsx2.NativeApp.applyGSSettingsLive()
+        }
+    }
+}
+
+@Composable
+fun BoxScope.RetroAchievementOverlayBanner() {
+    val banner = RetroAchievementOverlayState.banner
+    val message = RetroAchievementOverlayState.sessionMessage
+    val displayArea = RetroAchievementOverlayState.useDisplayArea
+
+    LaunchedEffect(banner) {
+        if (banner != null) {
+            delay(4500)
+            if (RetroAchievementOverlayState.banner == banner) {
+                RetroAchievementOverlayState.clear()
+            }
+        }
+    }
+    LaunchedEffect(message) {
+        if (message != null) {
+            delay(2800)
+            if (RetroAchievementOverlayState.sessionMessage == message) {
+                RetroAchievementOverlayState.clearMessage()
+            }
+        }
+    }
+
+    val align = if (displayArea) Alignment.TopCenter else Alignment.TopStart
+    val hPad = if (displayArea) 60.dp else 10.dp
+    val tPad = if (displayArea) 18.dp else 10.dp
+
+    Column(
+        modifier =
+            Modifier
+                .align(align)
+                .zIndex(1000f)
+                .padding(start = hPad, end = hPad, top = tPad)
+                .widthIn(max = 285.dp),
+        horizontalAlignment = if (displayArea) Alignment.CenterHorizontally else Alignment.Start,
+    ) {
+        AnimatedVisibility(
+            visible = banner != null,
+            enter = fadeIn() + slideInVertically { -it / 2 },
+            exit = fadeOut() + slideOutVertically { -it / 2 },
+        ) {
+            val b = banner
+            if (b != null) {
+                Column(
+                    modifier =
+                        Modifier
+                            .background(Color(0xF0121824), RoundedCornerShape(9.dp))
+                            .border(1.dp, Color(0xFF1A9FFF).copy(alpha = 0.55f), RoundedCornerShape(9.dp))
+                            .padding(horizontal = 10.dp, vertical = 7.dp),
+                ) {
+                    Text(
+                        "ACHIEVEMENT UNLOCKED",
+                        color = Color(0xFF1A9FFF),
+                        fontSize = 8.sp,
+                        fontWeight = FontWeight.Bold,
+                        letterSpacing = 1.sp,
+                    )
+                    Text(
+                        b.title,
+                        color = Color(0xFFF0F4FF),
+                        fontSize = 11.sp,
+                        fontWeight = FontWeight.SemiBold,
+                        modifier = Modifier.padding(top = 2.dp),
+                    )
+                    if (b.description.isNotBlank()) {
+                        Text(
+                            b.description,
+                            color = Color(0xFF93A6BC),
+                            fontSize = 9.sp,
+                            modifier = Modifier.padding(top = 2.dp),
+                        )
+                    }
+                    Text(
+                        "+${b.points}",
+                        color = Color(0xFF35D0BA),
+                        fontSize = 9.sp,
+                        fontWeight = FontWeight.Bold,
+                        modifier = Modifier.padding(top = 3.dp),
+                    )
+                }
+            }
+        }
+        AnimatedVisibility(
+            visible = message != null,
+            enter = fadeIn() + slideInVertically { -it / 2 },
+            exit = fadeOut() + slideOutVertically { -it / 2 },
+            modifier = Modifier.padding(top = if (banner != null) 8.dp else 0.dp),
+        ) {
+            val text = message
+            if (text != null) {
+                Text(
+                    text = text,
+                    color = Color(0xFFF0F4FF),
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.Medium,
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .background(Color(0xE0121824), RoundedCornerShape(10.dp))
+                            .border(1.dp, Color.White.copy(alpha = 0.12f), RoundedCornerShape(10.dp))
+                            .padding(horizontal = 12.dp, vertical = 8.dp),
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroAchievementsActivity.kt b/app/src/main/feature/retro/RetroAchievementsActivity.kt
new file mode 100644
index 000000000..82735eff8
--- /dev/null
+++ b/app/src/main/feature/retro/RetroAchievementsActivity.kt
@@ -0,0 +1,718 @@
+package com.winlator.cmod.feature.retro
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.EmojiEvents
+import androidx.compose.material.icons.outlined.Lock
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import coil.compose.AsyncImage
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+private val BgDark = Color(0xFF12121B)
+private val SurfaceDark = Color(0xFF171722)
+private val CardBorder = Color(0xFF2A2A3A)
+private val Accent = Color(0xFF1A9FFF)
+private val AccentGlow = Color(0xFF58A6FF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF93A6BC)
+private val Gold = Color(0xFFF2C14E)
+private val Scrim = Color(0xFF000000)
+private val StatusOnline = Color(0xFF3FB950)
+
+class RetroAchievementsActivity : ComponentActivity() {
+    companion object {
+        const val EXTRA_SYSTEM_ID = "system_id"
+        const val EXTRA_GAME_NAME = "game_name"
+        const val EXTRA_ROM_PATH = "rom_path"
+        const val EXTRA_IN_SESSION = "in_session"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        androidx.core.view.WindowCompat.setDecorFitsSystemWindows(window, false)
+        val controller = androidx.core.view.WindowInsetsControllerCompat(window, window.decorView)
+        controller.hide(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+        controller.systemBarsBehavior =
+            androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        val systemId = intent.getStringExtra(EXTRA_SYSTEM_ID)
+        val gameName = intent.getStringExtra(EXTRA_GAME_NAME) ?: "Retro Game"
+        val romPath = intent.getStringExtra(EXTRA_ROM_PATH) ?: ""
+        val inSession = intent.getBooleanExtra(EXTRA_IN_SESSION, false)
+        setContent {
+            com.winlator.cmod.shared.theme.WinNativeTheme {
+                androidx.compose.runtime.CompositionLocalProvider(
+                    com.winlator.cmod.shared.ui.nav.LocalPaneNav provides navRegistry,
+                ) {
+                    RetroAchievementsScreen(
+                        systemId = systemId,
+                        gameName = gameName,
+                        romPath = romPath,
+                        inSession = inSession,
+                        onClose = { finish() },
+                    )
+                }
+            }
+        }
+    }
+
+    private val navRegistry = com.winlator.cmod.shared.ui.nav.PaneNavRegistry()
+    private var restoreNav: (() -> Unit)? = null
+
+    override fun onResume() {
+        super.onResume()
+        restoreNav = window.bindPaneNav(navRegistry, onDismiss = { finish() })
+    }
+
+    override fun onPause() {
+        restoreNav?.invoke()
+        restoreNav = null
+        super.onPause()
+    }
+}
+
+@Composable
+internal fun RetroAchievementsScreen(
+    systemId: String?,
+    gameName: String,
+    romPath: String,
+    inSession: Boolean,
+    onClose: () -> Unit,
+    useNativePs2: Boolean = false,
+    floatingOverGame: Boolean = false,
+    nativeJson: (() -> String)? = null,
+) {
+    val context = LocalContext.current
+    val refreshScope = rememberCoroutineScope()
+    val nativeMode = useNativePs2 || nativeJson != null
+    fun nativeAchievementsJson(): String =
+        nativeJson?.invoke() ?: kr.co.iefriends.pcsx2.NativeApp.getAchievementsJSON().orEmpty()
+    var loggedIn by remember {
+        mutableStateOf(
+            RetroAchievementsManager.isLoggedIn(context) ||
+                (useNativePs2 &&
+                    runCatching {
+                        val raw = kr.co.iefriends.pcsx2.NativeApp.getAchievementsJSON().orEmpty()
+                        if (raw.isBlank()) false else org.json.JSONObject(raw).optBoolean("loggedIn")
+                    }.getOrDefault(false)),
+        )
+    }
+    var enabled by remember { mutableStateOf(RetroAchievementsManager.isEnabled(context)) }
+    var hardcore by remember { mutableStateOf(RetroAchievementsManager.isHardcorePreferred(context)) }
+    var confirmHardcore by remember { mutableStateOf(false) }
+    var loading by remember { mutableStateOf(loggedIn) }
+    var summary by remember { mutableStateOf<RetroGameSummary?>(null) }
+    var achievements by remember { mutableStateOf<List<RetroAchievement>>(emptyList()) }
+
+    fun refreshFromManager() {
+        refreshScope.launch {
+            val s = withContext(Dispatchers.IO) { RetroAchievementsManager.getSummary() }
+            val a = withContext(Dispatchers.IO) { RetroAchievementsManager.getAchievements() }
+            if (s != null) summary = s
+            if (a.isNotEmpty()) achievements = a
+        }
+    }
+
+    fun refreshFromPs2Native() {
+        refreshScope.launch {
+            val pair =
+                withContext(Dispatchers.IO) {
+                    runCatching {
+                        val raw = nativeAchievementsJson()
+                        if (raw.isBlank()) return@runCatching null
+                        val root = org.json.JSONObject(raw)
+                        val items =
+                            runCatching { com.armsx2.ui.achievements.parseAchievementItems(raw) }
+                                .getOrDefault(emptyList())
+                        val mapped =
+                            items.map { a ->
+                                RetroAchievement(
+                                    id = a.id.toLong(),
+                                    title = a.title,
+                                    description = a.description,
+                                    unlocked = a.unlocked,
+                                    points = a.points,
+                                    progress = a.progress,
+                                    badgeUrl = a.iconUrl,
+                                    badgeLockedUrl = a.iconUrl,
+                                    bucket = a.subsetId,
+                                )
+                            }
+                        val unlocked = mapped.count { it.unlocked }
+                        val pointsUnlocked = mapped.filter { it.unlocked }.sumOf { it.points }
+                        val pointsTotal = mapped.sumOf { it.points }
+                        val s =
+                            RetroGameSummary(
+                                gameId = 0,
+                                title = root.optString("gameTitle").ifBlank { gameName },
+                                badgeUrl = root.optString("gameIconUrl"),
+                                total = mapped.size,
+                                unlocked = unlocked,
+                                pointsTotal = pointsTotal,
+                                pointsUnlocked = pointsUnlocked,
+                            )
+                        Triple(root.optBoolean("loggedIn"), s, mapped)
+                    }.getOrNull()
+                }
+            if (pair != null) {
+                if (pair.first || RetroAchievementsManager.isLoggedIn(context)) {
+                    loggedIn = true
+                }
+                summary = pair.second
+                if (pair.third.isNotEmpty()) achievements = pair.third
+            } else if (RetroAchievementsManager.isLoggedIn(context)) {
+                loggedIn = true
+            }
+        }
+    }
+
+    fun refresh() {
+        if (nativeMode) refreshFromPs2Native() else refreshFromManager()
+    }
+
+    DisposableEffect(Unit) {
+        if (!nativeMode) {
+            RetroAchievementsManager.stateListener = { refresh() }
+        }
+        onDispose { RetroAchievementsManager.stateListener = null }
+    }
+
+    LaunchedEffect(Unit) {
+        if (useNativePs2 && RetroAchievementsManager.isLoggedIn(context)) {
+            loggedIn = true
+            if (!inSession) withContext(Dispatchers.IO) { Ps2RaBridge.pushSharedLogin(context) }
+        }
+    }
+
+    LaunchedEffect(loggedIn) {
+        if (!loggedIn) {
+            loading = false
+            return@LaunchedEffect
+        }
+        if (nativeMode) {
+            loading = true
+            if (useNativePs2 && !inSession) withContext(Dispatchers.IO) { Ps2RaBridge.pushSharedLogin(context) }
+            var attempts = 0
+            var last: List<RetroAchievement> = emptyList()
+            while (attempts < 24) {
+                last =
+                    withContext(Dispatchers.IO) {
+                        runCatching {
+                            val raw = nativeAchievementsJson()
+                            com.armsx2.ui.achievements.parseAchievementItems(raw).map { a ->
+                                RetroAchievement(
+                                    id = a.id.toLong(),
+                                    title = a.title,
+                                    description = a.description,
+                                    unlocked = a.unlocked,
+                                    points = a.points,
+                                    progress = a.progress,
+                                    badgeUrl = a.iconUrl,
+                                    badgeLockedUrl = a.iconUrl,
+                                    bucket = a.subsetId,
+                                )
+                            }
+                        }.getOrDefault(emptyList())
+                    }
+                if (last.isNotEmpty()) break
+                delay(400)
+                attempts++
+            }
+            achievements = last
+            if (last.isNotEmpty()) {
+                val unlocked = last.count { it.unlocked }
+                summary =
+                    RetroGameSummary(
+                        gameId = 0,
+                        title = gameName,
+                        badgeUrl = "",
+                        total = last.size,
+                        unlocked = unlocked,
+                        pointsTotal = last.sumOf { it.points },
+                        pointsUnlocked = last.filter { it.unlocked }.sumOf { it.points },
+                    )
+                loading = false
+                return@LaunchedEffect
+            }
+            if (romPath.isNotBlank()) {
+                RetroAchievementsManager.loadGameForBrowsing(context, systemId, romPath)
+                var browseAttempts = 0
+                while (RetroAchievementsManager.loadState == RetroAchievementsManager.LOAD_LOADING &&
+                    browseAttempts < 80
+                ) {
+                    delay(250)
+                    browseAttempts++
+                }
+                withContext(Dispatchers.IO) { RetroAchievementsManager.getSummary() }
+                    ?.let { summary = it }
+                withContext(Dispatchers.IO) { RetroAchievementsManager.getAchievements() }
+                    .takeIf { it.isNotEmpty() }
+                    ?.let { achievements = it }
+            }
+            loading = false
+            return@LaunchedEffect
+        }
+        if (!inSession) {
+            RetroAchievementsManager.loadGameForBrowsing(context, systemId, romPath)
+        }
+        loading = RetroAchievementsManager.loadState == RetroAchievementsManager.LOAD_LOADING
+        var attempts = 0
+        while (RetroAchievementsManager.loadState == RetroAchievementsManager.LOAD_LOADING && attempts < 80) {
+            delay(250)
+            attempts++
+        }
+        summary = withContext(Dispatchers.IO) { RetroAchievementsManager.getSummary() }
+        achievements = withContext(Dispatchers.IO) { RetroAchievementsManager.getAchievements() }
+        loading = false
+    }
+
+    if (confirmHardcore) {
+        RetroHardcoreConfirmDialog(
+            onConfirm = {
+                confirmHardcore = false
+                hardcore = true
+                RetroAchievementsManager.setHardcorePreferred(context, true)
+            },
+            onDismiss = { confirmHardcore = false },
+        )
+    }
+
+    BoxWithConstraints(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .then(
+                    if (floatingOverGame) {
+                        Modifier.background(Color.Transparent)
+                    } else {
+                        Modifier
+                            .background(Scrim.copy(alpha = 0.62f))
+                            .windowInsetsPadding(WindowInsets.systemBars)
+                    },
+                )
+                .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) { onClose() },
+        contentAlignment = Alignment.Center,
+    ) {
+        val dialogWidth = (maxWidth - if (floatingOverGame) 48.dp else 32.dp).coerceAtMost(560.dp)
+        val dialogHeight =
+            if (floatingOverGame) {
+                maxHeight * 0.8f
+            } else {
+                (maxHeight - 40.dp).coerceIn(340.dp, 680.dp)
+            }
+        Surface(
+            modifier =
+                Modifier
+                    .then(if (floatingOverGame) Modifier.padding(24.dp) else Modifier)
+                    .widthIn(min = 320.dp, max = dialogWidth)
+                    .fillMaxWidth()
+                    .then(
+                        if (floatingOverGame) {
+                            Modifier.fillMaxHeight(0.8f)
+                        } else {
+                            Modifier.height(dialogHeight)
+                        },
+                    )
+                    .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) {},
+            shape = RoundedCornerShape(if (floatingOverGame) 20.dp else 16.dp),
+            color = BgDark,
+            border = BorderStroke(1.dp, CardBorder),
+            tonalElevation = if (floatingOverGame) 3.dp else 8.dp,
+            shadowElevation = if (floatingOverGame) 8.dp else 0.dp,
+        ) {
+            Column(Modifier.fillMaxSize()) {
+                Header(gameName, summary, onClose)
+                HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                Box(Modifier.fillMaxWidth().weight(1f)) {
+                    when {
+                        !loggedIn ->
+                            LoginPane { user, pass, onResult ->
+                                RetroAchievementsManager.login(context, user, pass) { ok, msg ->
+                                    if (ok && useNativePs2) {
+                                        refreshScope.launch(Dispatchers.IO) {
+                                            runCatching { Ps2RaBridge.pushSharedLogin(context) }
+                                        }
+                                    }
+                                    onResult(ok, msg)
+                                    if (ok) loggedIn = true
+                                }
+                            }
+                        loading ->
+                            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                                CircularProgressIndicator(color = Accent, modifier = Modifier.size(32.dp))
+                            }
+                        else ->
+                            AchievementsList(
+                                achievements = achievements,
+                                summary = summary,
+                                enabled = enabled,
+                                hardcore = hardcore,
+                                onEnabledChange = {
+                                    enabled = it
+                                    RetroAchievementsManager.setEnabled(context, it)
+                                },
+                                onHardcoreChange = {
+                                    if (it) {
+                                        confirmHardcore = true
+                                    } else {
+                                        hardcore = false
+                                        RetroAchievementsManager.setHardcorePreferred(context, false)
+                                    }
+                                },
+                                onLogout = {
+                                    RetroAchievementsManager.logout(context)
+                                    loggedIn = false
+                                    summary = null
+                                    achievements = emptyList()
+                                },
+                            )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun Header(gameName: String, summary: RetroGameSummary?, onClose: () -> Unit) {
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = 12.dp, bottom = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Box(
+            Modifier.size(38.dp).clip(RoundedCornerShape(10.dp)).background(Gold.copy(alpha = 0.16f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(Icons.Outlined.EmojiEvents, contentDescription = null, tint = Gold, modifier = Modifier.size(22.dp))
+        }
+        Column(Modifier.weight(1f)) {
+            Text(
+                stringResource(R.string.retro_ach_brand),
+                color = TextSecondary,
+                fontSize = 9.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 1.sp,
+            )
+            Text(
+                gameName,
+                style = MaterialTheme.typography.titleMedium,
+                color = TextPrimary,
+                fontWeight = FontWeight.Bold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        if (summary != null && summary.total > 0) {
+            Surface(color = Gold.copy(alpha = 0.14f), shape = RoundedCornerShape(8.dp)) {
+                Text(
+                    "${summary.unlocked} / ${summary.total}",
+                    color = Gold,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),
+                )
+            }
+        }
+        IconButton(onClick = onClose, modifier = Modifier.size(40.dp).paneNavItem(onActivate = onClose)) {
+            Icon(Icons.Outlined.Close, contentDescription = "Close", tint = TextSecondary, modifier = Modifier.size(22.dp))
+        }
+    }
+}
+
+@Composable
+private fun LoginPane(onLogin: (String, String, (Boolean, String?) -> Unit) -> Unit) {
+    val context = LocalContext.current
+    var username by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
+    var busy by remember { mutableStateOf(false) }
+    var error by remember { mutableStateOf<String?>(null) }
+    Column(
+        Modifier.fillMaxSize().padding(24.dp).verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(14.dp),
+    ) {
+        Text(
+            stringResource(R.string.retro_ach_login_intro),
+            color = TextSecondary,
+            style = MaterialTheme.typography.bodyMedium,
+        )
+        val fieldColors =
+            OutlinedTextFieldDefaults.colors(
+                focusedTextColor = TextPrimary,
+                unfocusedTextColor = TextPrimary,
+                disabledTextColor = TextSecondary,
+                cursorColor = AccentGlow,
+                focusedBorderColor = AccentGlow,
+                unfocusedBorderColor = CardBorder,
+                focusedLabelColor = AccentGlow,
+                unfocusedLabelColor = TextSecondary,
+                focusedContainerColor = SurfaceDark,
+                unfocusedContainerColor = SurfaceDark,
+            )
+        OutlinedTextField(
+            value = username,
+            onValueChange = { username = it },
+            label = { Text(stringResource(R.string.retro_ach_username)) },
+            singleLine = true,
+            colors = fieldColors,
+            modifier = Modifier.fillMaxWidth(),
+        )
+        OutlinedTextField(
+            value = password,
+            onValueChange = { password = it },
+            label = { Text(stringResource(R.string.retro_ach_password)) },
+            singleLine = true,
+            visualTransformation = PasswordVisualTransformation(),
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
+            colors = fieldColors,
+            modifier = Modifier.fillMaxWidth(),
+        )
+        error?.let { Text(it, color = Color(0xFFE07B6B), style = MaterialTheme.typography.labelMedium) }
+        val submit = {
+            if (username.isBlank() || password.isBlank()) {
+                error = context.getString(R.string.retro_ach_enter_credentials)
+            } else {
+                busy = true
+                error = null
+                onLogin(username.trim(), password) { ok, msg ->
+                    busy = false
+                    if (!ok) error = msg ?: context.getString(R.string.retro_ach_login_failed)
+                }
+            }
+        }
+        Button(
+            onClick = submit,
+            enabled = !busy,
+            colors = androidx.compose.material3.ButtonDefaults.buttonColors(containerColor = Accent, contentColor = Color.White),
+            modifier = Modifier.fillMaxWidth().paneNavItem(isEntry = true, onActivate = { submit() }),
+        ) {
+            if (busy) {
+                CircularProgressIndicator(color = Color.White, modifier = Modifier.size(18.dp))
+            } else {
+                Text(stringResource(R.string.retro_ach_sign_in))
+            }
+        }
+        Text(
+            stringResource(R.string.retro_ach_password_disclaimer),
+            color = TextSecondary,
+            style = MaterialTheme.typography.labelSmall,
+        )
+    }
+}
+
+@Composable
+private fun AchievementsList(
+    achievements: List<RetroAchievement>,
+    summary: RetroGameSummary?,
+    enabled: Boolean,
+    hardcore: Boolean,
+    onEnabledChange: (Boolean) -> Unit,
+    onHardcoreChange: (Boolean) -> Unit,
+    onLogout: () -> Unit,
+) {
+    val ordered = achievements.sortedWith(
+        compareByDescending<RetroAchievement> { it.unlocked }.thenBy { it.title },
+    )
+    Column(Modifier.fillMaxSize()) {
+        if (summary != null && summary.total > 0) {
+            LinearProgressIndicator(
+                progress = { summary.unlocked.toFloat() / summary.total },
+                color = Gold,
+                trackColor = SurfaceDark,
+                modifier = Modifier.fillMaxWidth().height(4.dp),
+            )
+        }
+        Column(
+            Modifier.fillMaxWidth().weight(1f).verticalScroll(rememberScrollState()).padding(12.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            SettingsRow(stringResource(R.string.retro_ach_achievements_enabled), enabled, onEnabledChange)
+            if (RetroAchievementsManager.HARDCORE_SUPPORTED) {
+                SettingsRow(stringResource(R.string.retro_ach_hardcore_mode), hardcore, onHardcoreChange)
+            }
+            if (summary != null) {
+                Text(
+                    stringResource(R.string.retro_ach_points, summary.pointsUnlocked, summary.pointsTotal),
+                    color = TextSecondary,
+                    style = MaterialTheme.typography.labelMedium,
+                    modifier = Modifier.padding(top = 2.dp, start = 4.dp),
+                )
+            }
+            if (achievements.isEmpty()) {
+                Text(
+                    stringResource(R.string.retro_ach_none_found),
+                    color = TextSecondary,
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier.padding(24.dp),
+                )
+            } else {
+                ordered.forEach { AchievementRow(it) }
+            }
+            Spacer(Modifier.height(8.dp))
+            TextButton(onClick = onLogout, modifier = Modifier.fillMaxWidth().paneNavItem(onActivate = onLogout)) {
+                Text(stringResource(R.string.retro_ach_sign_out), color = TextSecondary)
+            }
+        }
+    }
+}
+
+@Composable
+private fun SettingsRow(label: String, checked: Boolean, onChange: (Boolean) -> Unit) {
+    Surface(
+        shape = RoundedCornerShape(12.dp),
+        color = SurfaceDark.copy(alpha = 0.5f),
+        border = BorderStroke(1.dp, CardBorder),
+        modifier = Modifier.fillMaxWidth().paneNavItem(cornerRadius = 12.dp, onActivate = { onChange(!checked) }),
+    ) {
+        Row(
+            Modifier.padding(horizontal = 14.dp, vertical = 6.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(label, color = TextPrimary, style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f))
+            Switch(
+                checked = checked,
+                onCheckedChange = onChange,
+                colors =
+                    androidx.compose.material3.SwitchDefaults.colors(
+                        checkedThumbColor = Color.White,
+                        checkedTrackColor = Accent,
+                        uncheckedTrackColor = SurfaceDark,
+                        uncheckedBorderColor = CardBorder,
+                    ),
+            )
+        }
+    }
+}
+
+@Composable
+private fun AchievementRow(ach: RetroAchievement) {
+    val url = if (ach.unlocked) ach.badgeUrl else ach.badgeLockedUrl.ifBlank { ach.badgeUrl }
+    Surface(
+        shape = RoundedCornerShape(12.dp),
+        color = if (ach.unlocked) Gold.copy(alpha = 0.07f) else SurfaceDark.copy(alpha = 0.5f),
+        border = BorderStroke(1.dp, if (ach.unlocked) Gold.copy(alpha = 0.25f) else CardBorder),
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Row(Modifier.padding(10.dp), verticalAlignment = Alignment.CenterVertically) {
+            Box(
+                Modifier.size(52.dp).clip(RoundedCornerShape(8.dp)).background(BgDark),
+                contentAlignment = Alignment.Center,
+            ) {
+                if (url.isNotBlank()) {
+                    AsyncImage(
+                        model = url,
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier.size(52.dp).clip(RoundedCornerShape(8.dp)),
+                        alpha = if (ach.unlocked) 1f else 0.5f,
+                    )
+                } else {
+                    Icon(Icons.Outlined.Lock, contentDescription = null, tint = TextSecondary, modifier = Modifier.size(24.dp))
+                }
+            }
+            Spacer(Modifier.width(12.dp))
+            Column(Modifier.weight(1f)) {
+                Text(
+                    ach.title,
+                    color = if (ach.unlocked) TextPrimary else TextSecondary,
+                    fontWeight = FontWeight.SemiBold,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (ach.description.isNotBlank()) {
+                    Text(
+                        ach.description,
+                        color = TextSecondary,
+                        style = MaterialTheme.typography.labelMedium,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                if (ach.progress.isNotBlank() && !ach.unlocked) {
+                    Text(
+                        ach.progress,
+                        color = AccentGlow,
+                        style = MaterialTheme.typography.labelSmall,
+                        modifier = Modifier.padding(top = 2.dp),
+                    )
+                }
+            }
+            Text(
+                "${ach.points}",
+                color = if (ach.unlocked) Gold else TextSecondary,
+                fontWeight = FontWeight.Bold,
+                style = MaterialTheme.typography.labelLarge,
+                modifier = Modifier.padding(start = 8.dp),
+            )
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroAchievementsManager.kt b/app/src/main/feature/retro/RetroAchievementsManager.kt
new file mode 100644
index 000000000..161e0ea45
--- /dev/null
+++ b/app/src/main/feature/retro/RetroAchievementsManager.kt
@@ -0,0 +1,401 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import com.swordfish.libretrodroid.RetroAchievements
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.ByteArrayOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
+
+data class RetroAchievement(
+    val id: Long,
+    val title: String,
+    val description: String,
+    val unlocked: Boolean,
+    val points: Int,
+    val progress: String,
+    val badgeUrl: String,
+    val badgeLockedUrl: String,
+    val bucket: Int,
+)
+
+data class RetroGameSummary(
+    val gameId: Long,
+    val title: String,
+    val badgeUrl: String,
+    val total: Int,
+    val unlocked: Int,
+    val pointsTotal: Int,
+    val pointsUnlocked: Int,
+)
+
+data class RetroUnlock(
+    val id: Long,
+    val title: String,
+    val description: String,
+    val points: Int,
+    val badgeUrl: String,
+)
+
+object RetroAchievementsManager {
+    private const val PREFS_NAME = "retro_achievements"
+    private const val KEY_USERNAME = "username"
+    private const val KEY_TOKEN = "token"
+    private const val KEY_DISPLAY = "display_name"
+    private const val KEY_ENABLED = "enabled"
+    private const val KEY_HARDCORE = "hardcore"
+
+    private const val CLIENT_VERSION = "1.0.0"
+    private const val RCHEEVOS_VERSION = "12.3.0"
+
+    @Volatile private var userAgent = "WinNative/$CLIENT_VERSION rcheevos/$RCHEEVOS_VERSION"
+
+    private fun coreTag(systemId: String?): String {
+        val core = RetroSystems.fromId(systemId)?.coreFileName ?: return "unknown"
+        return core.removePrefix("lib").removeSuffix(".so").removeSuffix("_libretro_android")
+    }
+
+    private fun buildUserAgent(systemId: String?): String =
+        "WinNative/$CLIENT_VERSION (Android ${android.os.Build.VERSION.RELEASE}) ${coreTag(systemId)} rcheevos/$RCHEEVOS_VERSION"
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private var pumpJob: Job? = null
+
+    private fun postMain(block: () -> Unit) = mainHandler.post(block)
+
+    const val LOAD_IDLE = 0
+    const val LOAD_LOADING = 1
+    const val LOAD_LOADED = 2
+    const val LOAD_EMPTY = 3
+
+    @Volatile private var clientReady = false
+    @Volatile private var loadedRomPath: String? = null
+    @Volatile var loadState = LOAD_IDLE
+        private set
+    @Volatile var connected = true
+        private set
+
+    var unlockListener: ((RetroUnlock) -> Unit)? = null
+    var stateListener: (() -> Unit)? = null
+    var resetListener: (() -> Unit)? = null
+    var hardcoreNoticeListener: ((String) -> Unit)? = null
+
+    private var loginCallback: ((Boolean, String?) -> Unit)? = null
+    private var appContext: Context? = null
+
+    private fun prefs(context: Context) =
+        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+
+    fun isEnabled(context: Context): Boolean = prefs(context).getBoolean(KEY_ENABLED, true)
+
+    fun setEnabled(context: Context, value: Boolean) {
+        prefs(context).edit().putBoolean(KEY_ENABLED, value).apply()
+    }
+
+    const val HARDCORE_SUPPORTED = false
+
+    fun isHardcorePreferred(context: Context): Boolean =
+        HARDCORE_SUPPORTED && prefs(context).getBoolean(KEY_HARDCORE, false)
+
+    fun setHardcorePreferred(context: Context, value: Boolean) {
+        prefs(context).edit().putBoolean(KEY_HARDCORE, value).apply()
+        if (clientReady) RetroAchievements.INSTANCE.nativeSetHardcore(value)
+    }
+
+    fun isLoggedIn(context: Context): Boolean =
+        prefs(context).getString(KEY_TOKEN, null).isNullOrBlank().not()
+
+    fun displayName(context: Context): String? = prefs(context).getString(KEY_DISPLAY, null)
+        ?: prefs(context).getString(KEY_USERNAME, null)
+
+    fun username(context: Context): String? = prefs(context).getString(KEY_USERNAME, null)
+
+    fun apiToken(context: Context): String? = prefs(context).getString(KEY_TOKEN, null)
+
+    fun consoleId(systemId: String?): Int =
+        when (systemId) {
+            RetroSystems.NES.id -> 7
+            RetroSystems.SNES.id -> 3
+            RetroSystems.GAMEBOY.id -> 4
+            RetroSystems.GAMEBOY_COLOR.id -> 6
+            RetroSystems.GBA.id -> 5
+            RetroSystems.GENESIS.id -> 1
+            RetroSystems.MASTER_SYSTEM.id -> 11
+            RetroSystems.GAME_GEAR.id -> 15
+            RetroSystems.N64.id -> 2
+            RetroSystems.PSX.id -> 12
+            RetroSystems.PS2.id -> 21
+            RetroSystems.GAMECUBE.id -> 16
+            RetroSystems.WII.id -> 19
+            else -> 0
+        }
+
+    private fun ensureClient(context: Context) {
+        appContext = context.applicationContext
+        if (!clientReady) {
+            RetroAchievements.INSTANCE.nativeInit(isHardcorePreferred(context))
+            clientReady = true
+        }
+        startPumps()
+    }
+
+    fun login(context: Context, username: String, password: String, onResult: (Boolean, String?) -> Unit) {
+        ensureClient(context)
+        prefs(context).edit().putString(KEY_USERNAME, username).apply()
+        loginCallback = onResult
+        RetroAchievements.INSTANCE.nativeLoginPassword(username, password)
+    }
+
+    fun logout(context: Context) {
+        prefs(context).edit()
+            .remove(KEY_TOKEN)
+            .remove(KEY_DISPLAY)
+            .apply()
+        loadedRomPath = null
+        loadState = LOAD_IDLE
+        endSession()
+    }
+
+    fun prefetch(context: Context, systemId: String?, romPath: String) {
+        if (!isEnabled(context) || !isLoggedIn(context)) return
+        if (consoleId(systemId) == 0) return
+        loadGameForBrowsing(context, systemId, romPath)
+    }
+
+    fun startSession(context: Context, systemId: String?, romPath: String) {
+        if (!isEnabled(context) || !isLoggedIn(context)) return
+        val console = consoleId(systemId)
+        if (console == 0) return
+        ensureClient(context)
+        val username = prefs(context).getString(KEY_USERNAME, null) ?: return
+        val token = prefs(context).getString(KEY_TOKEN, null) ?: return
+        RetroAchievements.active = true
+        userAgent = buildUserAgent(systemId)
+        if (loadedRomPath == romPath && loadState != LOAD_LOADING) return
+        loadedRomPath = romPath
+        loadState = LOAD_LOADING
+        scope.launch {
+            RetroAchievements.INSTANCE.nativeLoginToken(username, token)
+            RetroAchievements.INSTANCE.nativeLoadGame(console, romPath)
+        }
+    }
+
+    fun loadGameForBrowsing(context: Context, systemId: String?, romPath: String) {
+        if (!isLoggedIn(context)) return
+        val console = consoleId(systemId)
+        if (console == 0) return
+        ensureClient(context)
+        val username = prefs(context).getString(KEY_USERNAME, null) ?: return
+        val token = prefs(context).getString(KEY_TOKEN, null) ?: return
+        userAgent = buildUserAgent(systemId)
+        if (loadedRomPath == romPath && loadState != LOAD_LOADING) return
+        loadedRomPath = romPath
+        loadState = LOAD_LOADING
+        scope.launch {
+            RetroAchievements.INSTANCE.nativeLoginToken(username, token)
+            RetroAchievements.INSTANCE.nativeLoadGame(console, romPath)
+        }
+    }
+
+    fun endSession() {
+        RetroAchievements.active = false
+        loadedRomPath = null
+        loadState = LOAD_IDLE
+        stopPumps()
+        if (clientReady) RetroAchievements.INSTANCE.nativeUnloadGame()
+    }
+
+    fun idle() {
+        if (clientReady) RetroAchievements.INSTANCE.nativeIdle()
+    }
+
+    fun onEmulatorReset() {
+        if (clientReady) RetroAchievements.INSTANCE.nativeReset()
+    }
+
+    fun isHardcoreActive(): Boolean =
+        HARDCORE_SUPPORTED && clientReady && RetroAchievements.INSTANCE.nativeGetHardcore()
+
+    fun getAchievements(): List<RetroAchievement> {
+        if (!clientReady) return emptyList()
+        return RetroAchievements.INSTANCE.nativeGetAchievements().mapNotNull { row ->
+            val parts = row.split('\t')
+            if (parts.size < 9) return@mapNotNull null
+            RetroAchievement(
+                id = parts[0].toLongOrNull() ?: 0L,
+                title = parts[1],
+                description = parts[2],
+                unlocked = parts[3] == "1",
+                points = parts[4].toIntOrNull() ?: 0,
+                progress = parts[5],
+                badgeUrl = parts[6],
+                badgeLockedUrl = parts[7],
+                bucket = parts[8].toIntOrNull() ?: 0,
+            )
+        }
+    }
+
+    fun getSummary(): RetroGameSummary? {
+        if (!clientReady) return null
+        val text = RetroAchievements.INSTANCE.nativeGetGameSummary()
+        if (text.isBlank()) return null
+        val parts = text.split('\t')
+        if (parts.size < 7) return null
+        return RetroGameSummary(
+            gameId = parts[0].toLongOrNull() ?: 0L,
+            title = parts[1],
+            badgeUrl = parts[2],
+            total = parts[3].toIntOrNull() ?: 0,
+            unlocked = parts[4].toIntOrNull() ?: 0,
+            pointsTotal = parts[5].toIntOrNull() ?: 0,
+            pointsUnlocked = parts[6].toIntOrNull() ?: 0,
+        )
+    }
+
+    private fun startPumps() {
+        if (pumpJob?.isActive == true) return
+        pumpJob = scope.launch {
+            while (isActive && clientReady) {
+                pumpHttp()
+                pumpEvents()
+                delay(50)
+            }
+        }
+    }
+
+    private fun stopPumps() {
+        pumpJob?.cancel()
+        pumpJob = null
+    }
+
+    fun stopPolling() = stopPumps()
+
+    private suspend fun CoroutineScope.pumpHttp() {
+        while (isActive) {
+            val request = RetroAchievements.INSTANCE.nativePollHttpRequest() ?: break
+            val id = request[0].toIntOrNull() ?: continue
+            val url = request[1]
+            val postData = request[2]
+            val contentType = request[3]
+            launch { performHttp(id, url, postData, contentType) }
+        }
+    }
+
+    private suspend fun performHttp(id: Int, url: String, postData: String, contentType: String) {
+        var status = 0
+        var body: ByteArray? = null
+        try {
+            val connection = (URL(url).openConnection() as HttpURLConnection).apply {
+                connectTimeout = 30000
+                readTimeout = 30000
+                setRequestProperty("User-Agent", userAgent)
+                if (postData.isNotEmpty()) {
+                    doOutput = true
+                    requestMethod = "POST"
+                    if (contentType.isNotEmpty()) setRequestProperty("Content-Type", contentType)
+                    outputStream.use { it.write(postData.toByteArray(Charsets.UTF_8)) }
+                } else {
+                    requestMethod = "GET"
+                }
+            }
+            status = connection.responseCode
+            val stream = if (status in 200..299) connection.inputStream else connection.errorStream
+            body = stream?.use { input ->
+                val buffer = ByteArrayOutputStream()
+                val chunk = ByteArray(8192)
+                while (true) {
+                    val read = input.read(chunk)
+                    if (read < 0) break
+                    buffer.write(chunk, 0, read)
+                }
+                buffer.toByteArray()
+            }
+            connection.disconnect()
+        } catch (e: Exception) {
+            status = 0
+            body = null
+        }
+        withContext(Dispatchers.IO) {
+            RetroAchievements.INSTANCE.nativeProvideResponse(id, status, body)
+        }
+    }
+
+    private fun pumpEvents() {
+        val events = RetroAchievements.INSTANCE.nativePollEvents()
+        for (event in events) {
+            val parts = event.split('\t')
+            when (parts.getOrNull(0)) {
+                "unlock" -> {
+                    val unlock = RetroUnlock(
+                        id = parts.getOrNull(1)?.toLongOrNull() ?: 0L,
+                        title = parts.getOrNull(2) ?: "",
+                        description = parts.getOrNull(3) ?: "",
+                        points = parts.getOrNull(4)?.toIntOrNull() ?: 0,
+                        badgeUrl = parts.getOrNull(5) ?: "",
+                    )
+                    postMain {
+                        unlockListener?.invoke(unlock)
+                        stateListener?.invoke()
+                    }
+                }
+                "login_ok" -> {
+                    val display = parts.getOrNull(1) ?: ""
+                    val token = parts.getOrNull(2) ?: ""
+                    appContext?.let { ctx ->
+                        prefs(ctx).edit()
+                            .putString(KEY_DISPLAY, display)
+                            .putString(KEY_TOKEN, token)
+                            .apply()
+                    }
+                    val callback = loginCallback
+                    loginCallback = null
+                    postMain { callback?.invoke(true, display) }
+                }
+                "login_failed" -> {
+                    val message = parts.getOrNull(2) ?: "Login failed"
+                    val callback = loginCallback
+                    loginCallback = null
+                    postMain { callback?.invoke(false, message) }
+                }
+                "game_loaded" -> {
+                    loadState = LOAD_LOADED
+                    if (RetroAchievements.INSTANCE.nativeGetHardcore() &&
+                        !RetroAchievements.INSTANCE.nativeHardcoreCompatible()
+                    ) {
+                        RetroAchievements.INSTANCE.nativeSetHardcore(false)
+                        postMain {
+                            hardcoreNoticeListener?.invoke(
+                                "Hardcore disabled: a core option is not allowed in hardcore mode",
+                            )
+                        }
+                    }
+                    postMain { stateListener?.invoke() }
+                }
+                "game_unidentified", "game_load_failed" -> {
+                    loadState = LOAD_EMPTY
+                    postMain { stateListener?.invoke() }
+                }
+                "game_completed" -> postMain { stateListener?.invoke() }
+                "reset" -> postMain { resetListener?.invoke() }
+                "disconnected" -> {
+                    connected = false
+                    postMain { stateListener?.invoke() }
+                }
+                "reconnected" -> {
+                    connected = true
+                    postMain { stateListener?.invoke() }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroActivity.kt b/app/src/main/feature/retro/RetroActivity.kt
new file mode 100644
index 000000000..a80bf925f
--- /dev/null
+++ b/app/src/main/feature/retro/RetroActivity.kt
@@ -0,0 +1,1900 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.SharedPreferences
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.graphics.RectF
+import android.hardware.input.InputManager
+import android.os.Bundle
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.unit.dp
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.lifecycle.lifecycleScope
+import com.swordfish.libretrodroid.GLRetroView
+import com.swordfish.libretrodroid.GLRetroViewData
+import com.swordfish.libretrodroid.LibretroDroid
+import com.swordfish.libretrodroid.ShaderConfig
+import com.swordfish.libretrodroid.Variable
+import com.swordfish.libretrodroid.ViewportAlignment
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.google.GoogleAuthMode
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.runtime.display.ui.FrameRating
+import com.winlator.cmod.runtime.input.controls.ExternalController
+import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeout
+import java.io.File
+import kotlin.math.abs
+
+class RetroActivity : FixedFontScaleAppCompatActivity(), RetroInputView.Listener {
+    companion object {
+        const val EXTRA_ROM_PATH = "retro_rom_path"
+        const val EXTRA_SYSTEM_ID = "retro_system_id"
+        const val EXTRA_GAME_NAME = "retro_game_name"
+        const val EXTRA_SHORTCUT_PATH = "retro_shortcut_path"
+        const val EXTRA_CONTAINER_ID = "retro_container_id"
+        const val EXTRA_SHADER = "retro_shader"
+        const val EXTRA_TOUCH_CONTROLS = "retro_touch_controls"
+        const val EXTRA_ADAPTIVE_STICKS = "retro_adaptive_sticks"
+        const val EXTRA_AUDIO = "retro_audio"
+        const val EXTRA_HUD = "retro_hud"
+        const val EXTRA_VARIABLES = "retro_variables"
+
+        const val EXTRA_UPSCALE = "retro_upscale"
+        const val EXTRA_SGSR = "retro_sgsr"
+
+        private val SHADER_KEYS = listOf("default", "crt", "lcd", "sharp")
+        private val SHADER_LABEL_RES =
+            listOf(R.string.retro_lr_shader_default, R.string.retro_lr_shader_crt, R.string.retro_lr_shader_lcd, R.string.retro_lr_shader_sharp)
+        private val UPSCALE_KEYS = listOf("2x", "4x", "native")
+    }
+
+    private lateinit var retroView: GLRetroView
+    private var overlay: RetroInputView? = null
+    private val menu = RetroMenuController()
+    private var retroReady = false
+    private var gameName = "game"
+    private var fastForward = false
+    private var audioEnabledSetting = true
+    private var touchControlsSetting = true
+    private var adaptiveSticksSetting = false
+    private var currentShaderKey = "default"
+    private var sgsrEnabled = false
+    private var coreVars = HashMap<String, String>()
+    private var diskCount = 0
+    private var currentDisk = 0
+    private var system: RetroSystem? = null
+    private var persistShortcut: Shortcut? = null
+    private var playtimePrefs: SharedPreferences? = null
+    private var sessionStart = 0L
+    private var emulationPaused = false
+    private var controllerConnected = false
+    private var manualTouchOverride = false
+    private var inputManager: InputManager? = null
+    private var hudVisible = false
+    private var currentUpscaleKey = "native"
+    private var hudAlpha = 1f
+    private var hudBgDecoupled = false
+    private var hudBgAlpha = 1f
+    private var hudScale = 1f
+    private var hudElements = booleanArrayOf(true, true, true, true, true, true, true, true, false)
+    private var hudFrametimeNumeric = false
+    private var hudDualBattery = false
+    private var frameRating: FrameRating? = null
+    private val biosPicker =
+        registerForActivityResult(androidx.activity.result.contract.ActivityResultContracts.OpenDocument()) { uri ->
+            if (uri != null) {
+                RetroBiosImport.importFromUri(this, uri)
+                    .onSuccess {
+                        Toast.makeText(this, getString(R.string.retro_lr_bios_imported, it), Toast.LENGTH_SHORT).show()
+                        recreate()
+                    }
+                    .onFailure {
+                        Toast.makeText(this, it.message ?: getString(R.string.retro_lr_invalid_bios_file), Toast.LENGTH_LONG).show()
+                    }
+            } else {
+                finish()
+            }
+        }
+    private var rootLayout: FrameLayout? = null
+    private var menuComposeView: ComposeView? = null
+    private var surfaceReady = false
+    private var customColors = RetroCustomColors()
+    private var savesLoadMode = false
+    private var achievementsSessionStarted = false
+    private var cloudSyncEnabled = false
+    private var conflictChecked = false
+    private var retroCloudId = ""
+    private var netplayLocalPort = 0
+    private var netplayArmedThisSession = false
+
+    private val isPortrait: Boolean
+        get() = resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+
+    private val gameAspect: Float
+        get() =
+            when (system?.id) {
+                RetroSystems.GAMEBOY.id, RetroSystems.GAMEBOY_COLOR.id -> 10f / 9f
+                RetroSystems.GBA.id -> 3f / 2f
+                else -> 4f / 3f
+            }
+
+    private fun overlayPush(): Float = 0f
+
+    private fun updateOverlayArea() {
+        val rootWidth = rootLayout?.width ?: 0
+        val rootHeight = rootLayout?.height ?: 0
+        if (rootWidth <= 0 || rootHeight <= 0) return
+        val push = overlayPush()
+        val area =
+            if (isPortrait) {
+                val top = push * rootHeight
+                val gameHeight = rootWidth / gameAspect
+                RectF(0f, top, rootWidth.toFloat(), (top + gameHeight).coerceAtMost(rootHeight.toFloat()))
+            } else {
+                val availHeight = rootHeight * (1f - push)
+                val gameWidth = (availHeight * gameAspect).coerceAtMost(rootWidth.toFloat())
+                val left = (rootWidth - gameWidth) * 0.5f
+                val gameHeight = gameWidth / gameAspect
+                val top = push * rootHeight + (availHeight - gameHeight) * 0.5f
+                RectF(left, top, left + gameWidth, top + gameHeight)
+            }
+        overlay?.setGameArea(area)
+    }
+
+    private fun applyDisplayGeometry() {
+        updateOverlayArea()
+        if (!surfaceReady || !retroReady) return
+        retroView.viewportAlignment = if (isPortrait) ViewportAlignment.TOP else ViewportAlignment.CENTER
+        retroView.viewport = RectF(0f, overlayPush(), 1f, 1f)
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        overlay?.releaseAll()
+        rootLayout?.post {
+            overlay?.relayout()
+            applyDisplayGeometry()
+        }
+    }
+
+    private val inputDeviceListener =
+        object : InputManager.InputDeviceListener {
+            override fun onInputDeviceAdded(deviceId: Int) = refreshControllerPresence()
+
+            override fun onInputDeviceRemoved(deviceId: Int) = refreshControllerPresence()
+
+            override fun onInputDeviceChanged(deviceId: Int) = refreshControllerPresence()
+        }
+
+    private val stickIsAnalog: Boolean
+        get() = system?.id == RetroSystems.N64.id || RetroCoreManager.usesDolphinCore(system)
+
+    private fun anyGameControllerConnected(): Boolean =
+        InputDevice.getDeviceIds().any { id ->
+            ExternalController.isGameController(InputDevice.getDevice(id))
+        }
+
+    private fun refreshControllerPresence() {
+        val wasConnected = controllerConnected
+        controllerConnected = anyGameControllerConnected()
+        if (controllerConnected != wasConnected) manualTouchOverride = false
+        updateOverlayVisibility()
+        syncInGameOverlayPlacement()
+    }
+
+    private val touchControlsEffective: Boolean
+        get() = touchControlsSetting && (!controllerConnected || manualTouchOverride)
+
+    private fun updateOverlayVisibility() {
+        overlay?.visibility =
+            if (overlay?.editMode == true || touchControlsEffective) View.VISIBLE else View.GONE
+    }
+
+    private fun pauseEmulation() {
+        if (emulationPaused || !retroReady) return
+        emulationPaused = true
+        retroView.onPause()
+        LibretroDroid.pause()
+        RetroAchievementsManager.idle()
+    }
+
+    private fun resumeEmulation() {
+        if (!emulationPaused || !retroReady) return
+        emulationPaused = false
+        LibretroDroid.resume()
+        retroView.onResume()
+    }
+
+    private fun startAchievementsSession() {
+        if (achievementsSessionStarted) return
+        val sys = system ?: return
+        val rom = intent.getStringExtra(EXTRA_ROM_PATH) ?: return
+        if (!RetroAchievementsManager.isEnabled(this) || !RetroAchievementsManager.isLoggedIn(this)) return
+        achievementsSessionStarted = true
+        RetroAchievementsManager.unlockListener = { unlock ->
+            runOnUiThread { showAchievementUnlock(unlock) }
+        }
+        syncInGameOverlayPlacement()
+        RetroAchievementsManager.resetListener = {
+            runOnUiThread {
+                if (retroReady) retroView.reset()
+                RetroAchievementsManager.onEmulatorReset()
+            }
+        }
+        RetroAchievementsManager.hardcoreNoticeListener = { message ->
+            runOnUiThread { showInGameMessage(message) }
+        }
+        RetroAchievementsManager.startSession(this, sys.id, rom)
+    }
+
+    private fun syncInGameOverlayPlacement() {
+        RetroAchievementOverlayState.syncPlacement(
+            touchControlsVisible = touchControlsEffective,
+            controllerConnected = controllerConnected,
+        )
+    }
+
+    private fun showInGameMessage(message: String) {
+        syncInGameOverlayPlacement()
+        if (RetroAchievementOverlayState.useDisplayArea) {
+            RetroAchievementOverlayState.showMessage(message)
+        } else {
+            Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun showAchievementUnlock(unlock: RetroUnlock) {
+        syncInGameOverlayPlacement()
+        RetroAchievementOverlayState.show(unlock.title, unlock.points, unlock.description)
+    }
+
+    fun cheatsAllowed(): Boolean = !(achievementsSessionStarted && RetroAchievementsManager.isHardcoreActive())
+
+    private fun applyCheats() {
+        if (!retroReady) return
+        runCatching { retroView.resetCheat() }
+        if (!cheatsAllowed()) return
+        val enabled = RetroCheats.load(this, gameName).filter { it.enabled }
+        if (enabled.isEmpty()) return
+        enabled.forEachIndexed { index, cheat ->
+            runCatching { retroView.setCheat(index, true, cheat.code) }
+        }
+        if (achievementsSessionStarted) {
+            RetroAchievementsManager.endSession()
+            achievementsSessionStarted = false
+            Toast.makeText(this, getString(R.string.retro_lr_cheats_enabled_achievements_disabled), Toast.LENGTH_LONG).show()
+        }
+    }
+
+    private fun openCheatsScreen() {
+        val sys = system ?: return
+        startActivity(
+            android.content.Intent(this, RetroCheatsActivity::class.java).apply {
+                putExtra(RetroCheatsActivity.EXTRA_SYSTEM_ID, sys.id)
+                putExtra(RetroCheatsActivity.EXTRA_GAME_NAME, gameName)
+            },
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        hideSystemBars()
+
+        val romPath = intent.getStringExtra(EXTRA_ROM_PATH)
+        val systemId = intent.getStringExtra(EXTRA_SYSTEM_ID)
+        gameName = intent.getStringExtra(EXTRA_GAME_NAME) ?: "game"
+        val resolvedSystem = RetroSystems.fromId(systemId)
+        system = resolvedSystem
+
+        if (romPath.isNullOrBlank() || resolvedSystem == null) {
+            Toast.makeText(this, getString(R.string.retro_lr_invalid_retro_game), Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        val sourceFile = File(romPath)
+        if (!sourceFile.isFile) {
+            Toast.makeText(this, getString(R.string.retro_lr_rom_not_found, romPath), Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+        val romFile =
+            if (RetroRomArchive.isArchive(romPath)) {
+                RetroRomArchive.extractTo(this, romPath) ?: run {
+                    Toast.makeText(this, getString(R.string.retro_lr_could_not_read_rom_archive), Toast.LENGTH_LONG).show()
+                    finish()
+                    return
+                }
+            } else {
+                sourceFile
+            }
+
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_FULL_USER
+
+        netplayArmedThisSession = RetroDefaults.netplayEnabled(this, resolvedSystem.id)
+        if (!netplayArmedThisSession && RetroNetplayLobby.isInRoomSession()) {
+            RetroNetplayLobby.leave(silent = true)
+        }
+        val wantGbaMulti =
+            resolvedSystem.id == RetroSystems.GBA.id &&
+                netplayArmedThisSession &&
+                (
+                    RetroDefaults.netplayLaunchMode(this, resolvedSystem.id) == "host" ||
+                        RetroDefaults.netplayLaunchMode(this, resolvedSystem.id) == "join" ||
+                        RetroNetplayLobby.isGameLink ||
+                        RetroNetplayLobby.isInRoomSession()
+                )
+        val coreFile =
+            if (wantGbaMulti) {
+                RetroCoreManager.multiplayerCoreFile(this, resolvedSystem)
+            } else {
+                RetroCoreManager.coreFile(this, resolvedSystem)
+            }
+        if (!coreFile.isFile) {
+            val name =
+                if (wantGbaMulti) RetroSystems.GBA_MULTIPLAYER_CORE else resolvedSystem.coreFileName
+            val message =
+                if (RetroBundle.isInstalled(this)) {
+                    getString(R.string.retro_lr_core_not_installed, name)
+                } else {
+                    getString(R.string.retro_bundle_required)
+                }
+            Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        if (RetroCoreManager.missingBios(this, resolvedSystem)) {
+            showBiosRequiredDialog(resolvedSystem)
+            return
+        }
+
+        if (resolvedSystem.id == RetroSystems.N64.id) RetroCoreManager.ensureGlideN64Ini(this)
+        if (RetroCoreManager.usesDolphinCore(resolvedSystem)) {
+            RetroCoreManager.ensureDolphinSys(this)
+            RetroCoreManager.ensureDolphinUser(this)
+        }
+        val savesDir = RetroCoreManager.savesDir(this)
+        RetroSaveStates.migrateLegacy(this, gameName)
+        RetroSaveStates.recordIdentity(this, gameName, resolvedSystem.id)
+        val sramFile = RetroSaveStates.sramFile(this, gameName)
+        currentShaderKey = intent.getStringExtra(EXTRA_SHADER)?.lowercase() ?: "default"
+        sgsrEnabled = intent.getBooleanExtra(EXTRA_SGSR, false)
+        if (currentShaderKey == "sgsr") {
+            currentShaderKey = "default"
+            sgsrEnabled = true
+        }
+        if (currentShaderKey !in SHADER_KEYS) currentShaderKey = "default"
+        currentUpscaleKey = intent.getStringExtra(EXTRA_UPSCALE)?.lowercase() ?: "native"
+        if (currentUpscaleKey !in UPSCALE_KEYS) currentUpscaleKey = "native"
+        audioEnabledSetting = intent.getBooleanExtra(EXTRA_AUDIO, true)
+        touchControlsSetting = intent.getBooleanExtra(EXTRA_TOUCH_CONTROLS, true)
+        adaptiveSticksSetting = intent.getBooleanExtra(EXTRA_ADAPTIVE_STICKS, false)
+        @Suppress("UNCHECKED_CAST", "DEPRECATION")
+        coreVars = (intent.getSerializableExtra(EXTRA_VARIABLES) as? HashMap<String, String>) ?: HashMap()
+        RetroCoreOptions.defaultVariables(resolvedSystem).forEach { (key, value) ->
+            if (!coreVars.containsKey(key)) coreVars[key] = value
+        }
+        if (RetroCoreManager.usesDolphinCore(resolvedSystem)) {
+            RetroCoreOptions.sanitizeDolphinVariables(coreVars)
+        }
+
+        val root = FrameLayout(this)
+        rootLayout = root
+
+        val callback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (retroReady) {
+                    if (menu.visible) {
+                        menu.close()
+                        return
+                    }
+                    overlay?.releaseAll()
+                    menu.open()
+                }
+            }
+        }
+
+        onBackPressedDispatcher.addCallback(this, callback)
+
+        val inputView = RetroInputView(this, this, resolvedSystem)
+        inputView.loadStickInversion()
+        inputView.hapticStrength =
+            androidx.preference.PreferenceManager
+                .getDefaultSharedPreferences(this)
+                .getFloat("retro_haptic_strength", 0.4f)
+        inputView.adaptiveSticks = adaptiveSticksSetting
+        inputView.showL3R3 =
+            androidx.preference.PreferenceManager
+                .getDefaultSharedPreferences(this)
+                .getBoolean(RetroControlsMenu.l3r3PrefKey(resolvedSystem.id), true)
+        customColors = RetroControlLayouts.loadColors(this, resolvedSystem.id)
+        inputView.setCustomColors(customColors)
+        inputView.onEditStateChanged = { editing ->
+            runOnUiThread {
+                frameRating?.visibility =
+                    if (!editing && hudVisible) View.VISIBLE else View.GONE
+                updateOverlayVisibility()
+                menu.rebuild()
+            }
+        }
+        overlay = inputView
+        root.addView(
+            inputView,
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT,
+            ),
+        )
+        root.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> updateOverlayArea() }
+
+        menu.entriesProvider = { pane -> buildEntriesFor(pane) }
+        menu.bottomProvider = { buildBottomEntries() }
+        val coreOpts = RetroCoreOptions.forSystem(system)
+        menu.tabs =
+            RetroDrawerTabs.build(
+                this,
+                includePerformance = coreOpts.any { it.category == RetroOptionCategory.PERFORMANCE },
+                includeNetplay = RetroOnlineSupport.supportsMultiplayerUi(system?.id),
+                includeSystem = coreOpts.any { it.category == RetroOptionCategory.SYSTEM },
+            )
+        hudVisible = intent.getBooleanExtra(EXTRA_HUD, false)
+        RetroNetplayLobby.bindLocalName(this)
+        val menuView =
+            ComposeView(this).apply {
+                elevation = 2000f
+                setContent {
+                    WinNativeTheme {
+                        Box(Modifier.fillMaxSize()) {
+                            syncInGameOverlayPlacement()
+                            RetroAchievementOverlayBanner()
+                            val netPhase = RetroNetplayLobby.phase
+                            val netMembers = RetroNetplayLobby.members
+                            val netDiscovered = RetroNetplayLobby.discovered
+                            val netStatus = RetroNetplayLobby.statusText
+                            LaunchedEffect(netPhase, netMembers, netDiscovered, netStatus) {
+                                if (menu.visible && menu.pane == RetroPane.NETWORK) {
+                                    menu.rebuild()
+                                }
+                            }
+                            Box(
+                                Modifier
+                                    .fillMaxSize()
+                                    .padding(top = 56.dp),
+                                contentAlignment = Alignment.TopCenter,
+                            ) {
+                                RetroNetplayRoomBanner(
+                                    onLeave = { leaveNetplayRoom() },
+                                    onJoinRoom = { room -> joinDiscoveredRoom(room) },
+                                )
+                            }
+                            Box(
+                                Modifier.fillMaxSize(),
+                                contentAlignment = Alignment.BottomCenter,
+                            ) {
+                                RetroNetplayEventToast(
+                                    Modifier.padding(bottom = 72.dp),
+                                )
+                            }
+                            RetroDrawerMenu(menu)
+                        }
+                    }
+                }
+            }
+        menuComposeView = menuView
+        root.addView(
+            menuView,
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT,
+            ),
+        )
+
+        setContentView(root)
+        inputManager = getSystemService(InputManager::class.java)
+        inputManager?.registerInputDeviceListener(inputDeviceListener, null)
+        refreshControllerPresence()
+        retroReady = false
+        if (hudVisible) {
+            root.post {
+                if (!isFinishing && !isDestroyed && hudVisible) showHud()
+            }
+        }
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : androidx.activity.OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    if (overlay?.editMode == true) {
+                        overlay?.finishEdit()
+                    } else if (menu.visible) {
+                        menu.handleKey(KeyEvent.KEYCODE_BACK, KeyEvent.ACTION_UP)
+                    } else {
+                        openMenu()
+                    }
+                }
+            },
+        )
+        loadHudSettings()
+        recordLaunchStats()
+
+        val sixtyRequested = requestSixtyHzDisplayMode()
+        var waitAttempts = 0
+        lateinit var startWhenReady: Runnable
+        startWhenReady =
+            Runnable {
+                if (isFinishing || isDestroyed) return@Runnable
+                val rate =
+                    runCatching { windowManager.defaultDisplay.refreshRate }.getOrDefault(60f)
+                if (sixtyRequested && abs(rate - 60f) > 2f && waitAttempts < 12) {
+                    waitAttempts++
+                    root.postDelayed(startWhenReady, 100)
+                    return@Runnable
+                }
+                val data =
+                    GLRetroViewData(this).apply {
+                        coreFilePath = coreFile.absolutePath
+                        gameFilePath = romFile.absolutePath
+                        systemDirectory = RetroCoreManager.systemDir(this@RetroActivity).absolutePath
+                        savesDirectory = savesDir.absolutePath
+                        shader = effectiveShader()
+                        variables = coreVars.map { Variable(it.key, it.value) }.toTypedArray()
+                        rumbleEventsEnabled = true
+                        preferLowLatencyAudio = !RetroCoreManager.usesDolphinCore(resolvedSystem)
+                        skipDuplicateFrames = false
+                        viewportAlignment =
+                            if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                                ViewportAlignment.TOP
+                            } else {
+                                ViewportAlignment.CENTER
+                            }
+                        if (sramFile.isFile) saveRAMState = runCatching { sramFile.readBytes() }.getOrNull()
+                    }
+                val view = GLRetroView(this, data)
+                if (android.os.Build.VERSION.SDK_INT >= 30) {
+                    view.holder.addCallback(
+                        object : android.view.SurfaceHolder.Callback {
+                            override fun surfaceCreated(holder: android.view.SurfaceHolder) {
+                                runCatching {
+                                    holder.surface.setFrameRate(
+                                        60f,
+                                        android.view.Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
+                                    )
+                                }
+                            }
+
+                            override fun surfaceChanged(
+                                holder: android.view.SurfaceHolder,
+                                format: Int,
+                                width: Int,
+                                height: Int,
+                            ) {}
+
+                            override fun surfaceDestroyed(holder: android.view.SurfaceHolder) {}
+                        },
+                    )
+                }
+                retroView = view
+                root.addView(
+                    view,
+                    0,
+                    FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                    ),
+                )
+                lifecycle.addObserver(view)
+                retroReady = true
+                refreshControllerPresence()
+                observeErrors()
+                observeEvents()
+                scheduleCloudConflictCheck()
+            }
+        retroCloudId =
+            intent.getStringExtra(EXTRA_SHORTCUT_PATH)?.let { path ->
+                GameSaveBackupManager.customGameId(intent.getIntExtra(EXTRA_CONTAINER_ID, 0), File(path).name)
+            } ?: RetroSaveStates.cloudGameId(resolvedSystem.id, gameName)
+        lifecycleScope.launch(Dispatchers.IO) {
+            cloudSyncEnabled =
+                runCatching { loadShortcut()?.getExtra("cloud_sync_enabled", "1") != "0" }.getOrDefault(true)
+            if (cloudSyncEnabled && !RetroSaveStates.sramFile(this@RetroActivity, gameName).isFile) {
+                runCatching {
+                    withTimeout(12_000L) {
+                        val entries =
+                            GameSaveBackupManager.listGoogleHistory(
+                                this@RetroActivity,
+                                GameSaveBackupManager.GameSource.CUSTOM,
+                                retroCloudId,
+                                GoogleAuthMode.RESUME,
+                            )
+                        val latest = entries.maxByOrNull { it.timestampMs }
+                        if (latest != null) {
+                            val result =
+                                GameSaveBackupManager.restoreFromGoogle(
+                                    this@RetroActivity,
+                                    latest,
+                                    GameSaveBackupManager.GameSource.CUSTOM,
+                                    retroCloudId,
+                                    GoogleAuthMode.RESUME,
+                                    customSaveDir = RetroSaveStates.gameDir(this@RetroActivity, gameName),
+                                )
+                            if (result.success) {
+                                RetroSaveStates.migrateLegacyCloudLayout(this@RetroActivity, gameName)
+                                setCloudMark(latest.timestampMs)
+                                runOnUiThread {
+                                    Toast
+                                        .makeText(this@RetroActivity, getString(R.string.retro_lr_cloud_save_restored), Toast.LENGTH_SHORT)
+                                        .show()
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            runOnUiThread {
+                if (!isFinishing && !isDestroyed) root.post(startWhenReady)
+            }
+        }
+    }
+
+    private fun scheduleCloudConflictCheck() {
+        if (!cloudSyncEnabled || conflictChecked) return
+        conflictChecked = true
+        lifecycleScope.launch(Dispatchers.IO) {
+            runCatching {
+                val sram = RetroSaveStates.sramFile(this@RetroActivity, gameName)
+                val localTs = if (sram.isFile) sram.lastModified() else 0L
+                if (localTs <= 0L) return@runCatching
+                val entries =
+                    GameSaveBackupManager.listGoogleHistory(
+                        this@RetroActivity,
+                        GameSaveBackupManager.GameSource.CUSTOM,
+                        retroCloudId,
+                        GoogleAuthMode.RESUME,
+                    )
+                val mark = cloudMark()
+                val newer =
+                    entries
+                        .filter { it.timestampMs > localTs + 120_000L && it.timestampMs > mark }
+                        .sortedByDescending { it.timestampMs }
+                if (newer.isEmpty()) return@runCatching
+                val top = newer.take(5)
+                runOnUiThread {
+                    if (isFinishing || isDestroyed) return@runOnUiThread
+                    pauseEmulation()
+                    menu.conflictPrompt =
+                        RetroConflictPrompt(
+                            message = getString(R.string.retro_lr_cloud_conflict_message, gameName),
+                            options =
+                                top.map { entry ->
+                                    (entry.label ?: getString(R.string.retro_lr_cloud_save)) + " — " +
+                                        RetroSaveStates.relativeTime(entry.timestampMs)
+                                },
+                            onKeepLocal = {
+                                setCloudMark(top.first().timestampMs)
+                                menu.conflictPrompt = null
+                                resumeEmulation()
+                            },
+                            onPick = { index ->
+                                menu.conflictPrompt = null
+                                restoreCloudEntry(top[index])
+                            },
+                        )
+                }
+            }
+        }
+    }
+
+    private fun restoreCloudEntry(entry: GameSaveBackupManager.BackupHistoryEntry) {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val result =
+                runCatching {
+                    GameSaveBackupManager.restoreFromGoogle(
+                        this@RetroActivity,
+                        entry,
+                        GameSaveBackupManager.GameSource.CUSTOM,
+                        retroCloudId,
+                        GoogleAuthMode.INTERACTIVE,
+                        customSaveDir = RetroSaveStates.gameDir(this@RetroActivity, gameName),
+                    )
+                }.getOrNull()
+            runOnUiThread {
+                if (isFinishing || isDestroyed) return@runOnUiThread
+                if (result?.success == true) {
+                    RetroSaveStates.migrateLegacyCloudLayout(this@RetroActivity, gameName)
+                    setCloudMark(entry.timestampMs)
+                    runCatching {
+                        val sram = RetroSaveStates.sramFile(this@RetroActivity, gameName)
+                        if (sram.isFile) retroView.unserializeSRAM(sram.readBytes())
+                    }
+                    Toast.makeText(this@RetroActivity, getString(R.string.retro_lr_cloud_save_restored), Toast.LENGTH_SHORT).show()
+                } else {
+                    Toast
+                        .makeText(this@RetroActivity, result?.message ?: getString(R.string.retro_lr_restore_failed), Toast.LENGTH_SHORT)
+                        .show()
+                }
+                resumeEmulation()
+                menu.rebuild()
+            }
+        }
+    }
+
+    private fun cloudMark(): Long =
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(this)
+            .getLong("retro_cloud_mark_$retroCloudId", 0L)
+
+    private fun setCloudMark(value: Long) {
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(this)
+            .edit()
+            .putLong("retro_cloud_mark_$retroCloudId", value)
+            .apply()
+    }
+
+    private fun launchExitCloudBackup() {
+        if (!cloudSyncEnabled) return
+        val hasSaves =
+            RetroSaveStates.gameDir(this, gameName).walkTopDown().any { it.isFile }
+        if (!hasSaves) return
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(this)
+            .edit()
+            .putString("retro_pending_backup_id", retroCloudId)
+            .putString("retro_pending_backup_name", gameName)
+            .apply()
+    }
+
+    override fun onDestroy() {
+        inputManager?.unregisterInputDeviceListener(inputDeviceListener)
+        shutdownNetplaySession(callNativeStop = false)
+        RetroAchievementsManager.stopPolling()
+        if (achievementsSessionStarted) {
+            RetroAchievementsManager.unlockListener = null
+            RetroAchievementsManager.resetListener = null
+            RetroAchievementsManager.hardcoreNoticeListener = null
+            RetroAchievementsManager.endSession()
+        }
+        super.onDestroy()
+    }
+
+    private fun shutdownNetplaySession(callNativeStop: Boolean = true) {
+        val sysId = system?.id
+        val view =
+            if (callNativeStop && ::retroView.isInitialized && retroReady) retroView else null
+        runCatching {
+            RetroNetplayLobby.leave(silent = true, retroView = view)
+        }
+        netplayLocalPort = 0
+        netplayArmedThisSession = false
+        if (sysId != null) {
+            RetroDefaults.clearNetplayArm(this, sysId)
+        }
+    }
+
+    private fun showHud() {
+        var rating = frameRating
+        if (rating == null) {
+            val root = rootLayout ?: return
+            rating =
+                RetroHudSupport.createFrameRating(
+                    this,
+                    RetroHudSupport.libretroRendererLabel(),
+                )
+            frameRating = rating
+            val menuIndex = menuComposeView?.let { root.indexOfChild(it) } ?: -1
+            if (menuIndex >= 0) root.addView(rating, menuIndex) else root.addView(rating)
+            rating.addOnLayoutChangeListener { _, _, top, _, bottom, _, oldTop, _, oldBottom ->
+                if (bottom - top != oldBottom - oldTop) rootLayout?.post { applyDisplayGeometry() }
+            }
+            applyRetroHudSettings(rating)
+        }
+        rating.visibility = View.VISIBLE
+        rating.reset()
+        rating.post { applyDisplayGeometry() }
+    }
+
+    private fun applyRetroHudSettings(rating: FrameRating) {
+        rating.setHudAlpha(hudAlpha)
+        rating.setBackgroundAlphaDecoupled(hudBgDecoupled)
+        rating.setHudBackgroundAlpha(hudBgAlpha)
+        rating.setHudScale(hudScale)
+        rating.setFrametimeNumericMode(hudFrametimeNumeric)
+        rating.setDualSeriesBattery(hudDualBattery)
+        hudElements.forEachIndexed { index, enabled -> rating.toggleElement(index, enabled) }
+    }
+
+    private fun loadHudSettings() {
+        val style = RetroHudSupport.loadGlobalHudStyle(this)
+        hudAlpha = style.alpha
+        hudBgDecoupled = style.bgDecoupled
+        hudBgAlpha = style.bgAlpha
+        hudScale = style.scale
+        hudFrametimeNumeric = style.frametimeNumeric
+        hudDualBattery = style.dualBattery
+        hudElements = RetroHudSupport.loadGlobalHudElements(this)
+    }
+
+    private fun saveHudSettings() {
+        RetroHudSupport.saveGlobalHudStyle(
+            this,
+            HudStyle(hudAlpha, hudBgDecoupled, hudBgAlpha, hudScale, hudFrametimeNumeric, hudDualBattery),
+        )
+        RetroHudSupport.saveGlobalHudElements(this, hudElements)
+    }
+
+    private fun recordLaunchStats() {
+        val prefs = getSharedPreferences("playtime_stats", MODE_PRIVATE)
+        playtimePrefs = prefs
+        sessionStart = System.currentTimeMillis()
+        prefs
+            .edit()
+            .putInt("${gameName}_play_count", prefs.getInt("${gameName}_play_count", 0) + 1)
+            .putLong("${gameName}_last_played", sessionStart)
+            .apply()
+    }
+
+    private fun accumulatePlaytime() {
+        val prefs = playtimePrefs ?: return
+        val now = System.currentTimeMillis()
+        val delta = now - sessionStart
+        if (delta > 0) {
+            prefs
+                .edit()
+                .putLong("${gameName}_playtime", prefs.getLong("${gameName}_playtime", 0L) + delta)
+                .apply()
+        }
+        sessionStart = now
+    }
+
+    private fun observeEvents() {
+        retroView
+            .getGLRetroEvents()
+            .onEach { event ->
+                when (event) {
+                    is GLRetroView.GLRetroEvents.FrameRendered -> {
+                        if (hudVisible) frameRating?.recordGameFrame()
+                        RetroNetplayLobby.onFrameRendered()
+                    }
+                    is GLRetroView.GLRetroEvents.SurfaceCreated -> {
+                        if (!audioEnabledSetting) retroView.audioEnabled = false
+                        surfaceReady = true
+                        applyDisplayGeometry()
+                        if (RetroCoreManager.usesDolphinCore(system)) {
+                            runCatching {
+                                val joypad = 1
+                                retroView.setControllerType(0, joypad)
+                                retroView.setControllerType(1, joypad)
+                                retroView.setControllerType(2, joypad)
+                                retroView.setControllerType(3, joypad)
+                            }
+                        }
+                        lifecycleScope.launch(Dispatchers.Default) {
+                            runCatching {
+                                diskCount = retroView.getAvailableDisks()
+                                currentDisk = retroView.getCurrentDisk()
+                            }
+                        }
+                        startAchievementsSession()
+                        applyCheats()
+                        startNetplayIfNeeded()
+                    }
+                }
+            }.launchIn(lifecycleScope)
+    }
+
+    private fun startNetplayIfNeeded() {
+        val sysId = system?.id ?: return
+        if (!RetroOnlineSupport.supportsMultiplayerUi(sysId)) return
+
+        if (!netplayArmedThisSession && !RetroDefaults.netplayEnabled(this, sysId)) {
+            if (RetroNetplayLobby.isInRoomSession() ||
+                RetroNetplayLobby.phase == RetroNetplayPhase.SCANNING ||
+                RetroNetplayLobby.phase == RetroNetplayPhase.SCAN_RESULTS
+            ) {
+                RetroNetplayLobby.leave(silent = true, retroView = retroView)
+            }
+            return
+        }
+        netplayArmedThisSession = true
+
+        if (RetroNetplayLobby.attachEmulator(retroView)) {
+            if (!RetroNetplayLobby.isGameLink) {
+                RetroNetplayLobby.prepareMultiplayerPads(retroView)
+            }
+            netplayLocalPort =
+                when {
+                    RetroNetplayLobby.isGameLink -> 0
+                    RetroNetplayLobby.isHost -> 0
+                    else -> 1
+                }
+            menu.rebuild()
+            return
+        }
+
+        if (!RetroNetplayLobby.canStartSession() ||
+            RetroNetplayLobby.phase == RetroNetplayPhase.SCANNING
+        ) {
+            return
+        }
+        val mode = RetroDefaults.netplayLaunchMode(this, sysId)
+        if (mode != "host" && mode != "join") return
+
+        val port =
+            if (RetroOnlineSupport.supportsGameLink(sysId)) {
+                RetroGameLink.clampPort(RetroDefaults.netplayPort(this, sysId))
+            } else {
+                RetroDefaults.netplayPort(this, sysId)
+            }
+        val name = RetroNetplayLobby.defaultPlayerName(this)
+        if (!RetroOnlineSupport.supportsGameLink(sysId)) {
+            RetroNetplayLobby.prepareMultiplayerPads(retroView)
+        }
+        when (mode) {
+            "host" -> {
+                netplayLocalPort = 0
+                RetroNetplayLobby.host(
+                    systemId = sysId,
+                    gameName = gameName,
+                    playerName = name,
+                    port = port,
+                    context = this,
+                    retroView = retroView,
+                )
+            }
+            "join" -> {
+                val host = RetroDefaults.netplayHost(this, sysId).trim()
+                if (host.isBlank()) return
+                netplayLocalPort = if (RetroOnlineSupport.supportsGameLink(sysId)) 0 else 1
+                RetroNetplayLobby.join(
+                    host = host,
+                    port = port,
+                    playerName = name,
+                    gameName = gameName,
+                    systemId = sysId,
+                    retroView = retroView,
+                )
+            }
+        }
+        menu.rebuild()
+    }
+
+    private fun leaveNetplayRoom() {
+        when (RetroNetplayLobby.phase) {
+            RetroNetplayPhase.SCANNING -> RetroNetplayLobby.stopScan()
+            RetroNetplayPhase.SCAN_RESULTS -> RetroNetplayLobby.dismissScanResults()
+            RetroNetplayPhase.IDLE -> {
+                if (RetroNetplayLobby.discovered.isNotEmpty() ||
+                    RetroNetplayLobby.statusText.isNotBlank()
+                ) {
+                    RetroNetplayLobby.dismissScanResults()
+                }
+            }
+            else -> {
+                RetroNetplayLobby.leave(
+                    silent = false,
+                    retroView = if (retroReady) retroView else null,
+                )
+                netplayLocalPort = 0
+            }
+        }
+        menu.rebuild()
+    }
+
+    private fun joinDiscoveredRoom(room: RetroNetplayDiscoveredRoom) {
+        if (!retroReady) return
+        val sysId = system?.id
+        val name = RetroNetplayLobby.defaultPlayerName(this)
+        netplayLocalPort = if (RetroOnlineSupport.supportsGameLink(sysId)) 0 else 1
+        RetroNetplayLobby.join(
+            host = room.hostAddress,
+            port = room.port,
+            playerName = name,
+            gameName = room.gameName.ifBlank { gameName },
+            systemId = sysId,
+            retroView = retroView,
+        )
+        menu.close()
+        menu.rebuild()
+    }
+
+    private fun localNetplayPort(): Int {
+        if (RetroNetplayLobby.isGameLink) return 0
+        return when (RetroNetplayLobby.phase) {
+            RetroNetplayPhase.HOSTING, RetroNetplayPhase.IN_ROOM, RetroNetplayPhase.CONNECTING ->
+                if (RetroNetplayLobby.isHost) 0 else 1
+            else -> netplayLocalPort
+        }
+    }
+
+    private fun observeErrors() {
+        retroView
+            .getGLRetroErrors()
+            .onEach { error ->
+                val message =
+                    when (error) {
+                        GLRetroView.ERROR_LOAD_LIBRARY -> getString(R.string.retro_lr_failed_load_core)
+                        GLRetroView.ERROR_LOAD_GAME -> getString(R.string.retro_lr_failed_load_rom)
+                        GLRetroView.ERROR_GL_NOT_COMPATIBLE -> getString(R.string.retro_lr_graphics_not_supported)
+                        else -> getString(R.string.retro_lr_emulator_error)
+                    }
+                Toast.makeText(this@RetroActivity, message, Toast.LENGTH_LONG).show()
+                finish()
+            }.launchIn(lifecycleScope)
+    }
+
+    private fun sgsrPrePasses(): Int =
+        when (currentUpscaleKey) {
+            "4x" -> 2
+            "native" -> 3
+            else -> 1
+        }
+
+    private fun effectiveShader(): ShaderConfig =
+        if (sgsrEnabled) {
+            ShaderConfig.SGSR(sgsrPrePasses(), currentShaderKey)
+        } else {
+            when (currentShaderKey) {
+                "crt" -> ShaderConfig.CRT
+                "lcd" -> ShaderConfig.LCD
+                "sharp" -> ShaderConfig.Sharp
+                else -> ShaderConfig.Default
+            }
+        }
+
+    private fun loadShortcut(): Shortcut? {
+        persistShortcut?.let { return it }
+        val containerId = intent.getIntExtra(EXTRA_CONTAINER_ID, 0)
+        val path = intent.getStringExtra(EXTRA_SHORTCUT_PATH)
+        if (containerId < 0 || path.isNullOrBlank()) return null
+        val file = File(path)
+        if (!file.isFile) return null
+        return runCatching {
+            val cm = ContainerManager(this)
+            val container =
+                if (containerId == ContainerManager.RETRO_CONTAINER_ID) cm.retroContainer else cm.getContainerById(containerId)
+            container?.let { Shortcut(it, file) }
+        }.getOrNull()?.also { persistShortcut = it }
+    }
+
+    private fun persistExtra(
+        key: String,
+        value: String,
+    ) {
+        lifecycleScope.launch(Dispatchers.IO) {
+            runCatching {
+                val shortcut = loadShortcut()
+                shortcut?.putExtra(key, value)
+                shortcut?.saveData()
+            }
+        }
+    }
+
+    private fun buildEntriesFor(pane: RetroPane?): List<RetroMenuEntry> =
+        when (pane) {
+            null -> buildMainEntries()
+            RetroPane.DISPLAY ->
+                buildList {
+                    SHADER_KEYS.forEachIndexed { index, key ->
+                        add(
+                            RetroMenuEntry.Radio(
+                                label = getString(SHADER_LABEL_RES[index]),
+                                selected = currentShaderKey == key,
+                            ) {
+                                currentShaderKey = key
+                                retroView.shader = effectiveShader()
+                                persistExtra(RetroShortcuts.KEY_SHADER, key)
+                                menu.rebuild()
+                            },
+                        )
+                    }
+                    add(
+                        RetroMenuEntry.Toggle(getString(R.string.retro_lr_sgsr), checked = sgsrEnabled) { value ->
+                            sgsrEnabled = value
+                            retroView.shader = effectiveShader()
+                            persistExtra(RetroShortcuts.KEY_SGSR, if (value) "1" else "0")
+                            menu.rebuild()
+                        },
+                    )
+                    val upscaleIndex = UPSCALE_KEYS.indexOf(currentUpscaleKey).coerceAtLeast(0)
+                    add(
+                        RetroMenuEntry.Choice(
+                            getString(R.string.retro_lr_sgsr_upscale),
+                            listOf("2x", "4x", getString(R.string.retro_lr_upscale_native)),
+                            upscaleIndex,
+                            visible = sgsrEnabled,
+                        ) { next ->
+                            currentUpscaleKey = UPSCALE_KEYS[next]
+                            persistExtra(RetroShortcuts.KEY_UPSCALE, currentUpscaleKey)
+                            if (sgsrEnabled) retroView.shader = effectiveShader()
+                            menu.rebuild()
+                        },
+                    )
+                    addAll(coreOptionEntries(RetroOptionCategory.DISPLAY))
+                }
+            RetroPane.SOUND ->
+                buildList {
+                    add(
+                        RetroMenuEntry.Toggle(getString(R.string.retro_lr_sound), checked = audioEnabledSetting) { value ->
+                            audioEnabledSetting = value
+                            retroView.audioEnabled = value
+                            persistExtra(RetroShortcuts.KEY_AUDIO, if (value) "1" else "0")
+                            menu.rebuild()
+                        },
+                    )
+                    addAll(coreOptionEntries(RetroOptionCategory.SOUND))
+                }
+            RetroPane.CONTROLS -> buildControlsEntries() + coreOptionEntries(RetroOptionCategory.CONTROLS)
+            RetroPane.HUD -> buildHudEntries()
+            RetroPane.SAVES -> buildSaveSlotEntries()
+            RetroPane.PERFORMANCE -> coreOptionEntries(RetroOptionCategory.PERFORMANCE)
+            RetroPane.SYSTEM -> coreOptionEntries(RetroOptionCategory.SYSTEM)
+            RetroPane.MEMCARDS -> emptyList()
+            RetroPane.NETWORK -> buildNetplayEntries()
+        }
+
+    private fun coreOptionEntries(category: RetroOptionCategory): List<RetroMenuEntry> {
+        val options =
+            RetroCoreOptions.forSystem(system)
+                .filter { it.category == category }
+                .filter { opt -> opt.isApplicable { key -> coreVars[key] ?: optionDefault(key) } }
+        if (options.isEmpty()) return emptyList()
+
+        fun entryFor(option: RetroCoreOption): RetroMenuEntry {
+            val current = coreVars[option.key] ?: option.defaultValue
+            val index = option.values.indexOf(current).coerceAtLeast(0)
+            return RetroMenuEntry.Choice(option.labelText(this), option.valueLabels, index) { next ->
+                val newValue = option.values[next]
+                coreVars[option.key] = newValue
+                retroView.updateVariables(Variable(option.key, newValue))
+                persistExtra(RetroShortcuts.VAR_PREFIX + option.key, newValue)
+                menu.rebuild()
+            }
+        }
+
+        return (options.filterNot { it.advanced } + options.filter { it.advanced })
+            .map(::entryFor)
+    }
+
+    private fun optionDefault(key: String): String? =
+        RetroCoreOptions.forSystem(system).firstOrNull { it.key == key }?.defaultValue
+
+    private fun buildNetplayEntries(): List<RetroMenuEntry> {
+        val sysId = system?.id ?: return emptyList()
+        if (!RetroOnlineSupport.supportsMultiplayerUi(sysId)) return emptyList()
+        val phase = RetroNetplayLobby.phase
+        val port =
+            if (RetroOnlineSupport.supportsGameLink(sysId)) {
+                RetroGameLink.clampPort(RetroDefaults.netplayPort(this, sysId))
+            } else {
+                RetroDefaults.netplayPort(this, sysId)
+            }
+        val name = RetroNetplayLobby.defaultPlayerName(this)
+        val savedHost = RetroDefaults.netplayHost(this, sysId)
+        val entries = mutableListOf<RetroMenuEntry>()
+
+        when (phase) {
+            RetroNetplayPhase.HOSTING, RetroNetplayPhase.CONNECTING, RetroNetplayPhase.IN_ROOM -> {
+                val localIp = RetroNetplayLobby.localIpv4Addresses().firstOrNull()
+                entries +=
+                    RetroMenuEntry.Action(
+                        label =
+                            when (phase) {
+                                RetroNetplayPhase.HOSTING -> getString(R.string.retro_netplay_hosting_room)
+                                RetroNetplayPhase.CONNECTING -> getString(R.string.retro_netplay_connecting)
+                                else -> getString(R.string.retro_netplay_in_room)
+                            },
+                        icon = RetroDrawerIcons.Group,
+                        active = true,
+                        subtitle =
+                            when (phase) {
+                                RetroNetplayPhase.HOSTING ->
+                                    if (localIp != null) {
+                                        "$localIp:$port"
+                                    } else {
+                                        getString(R.string.retro_netplay_waiting_players)
+                                    }
+                                else ->
+                                    RetroNetplayLobby.roomTitle.ifBlank { gameName }
+                            },
+                    ) {}
+                val members =
+                    RetroNetplayLobby.members.ifEmpty {
+                        listOf(RetroNetplayMember(name, isHost = RetroNetplayLobby.isHost, isLocal = true))
+                    }
+                members.forEach { member ->
+                    val title =
+                        buildString {
+                            append(member.name)
+                            if (member.isHost) append(" · Host")
+                            if (member.isLocal) append(" · You")
+                            if (!member.isHost && !member.isLocal) append(" · Joined")
+                        }
+                    entries +=
+                        RetroMenuEntry.Action(
+                            label = title,
+                            icon = RetroDrawerIcons.Group,
+                            active = member.isLocal,
+                        ) {}
+                }
+                entries +=
+                    RetroMenuEntry.Action(
+                        label = getString(R.string.retro_netplay_leave),
+                        icon = RetroDrawerIcons.Exit,
+                        danger = true,
+                    ) {
+                        leaveNetplayRoom()
+                    }
+            }
+
+            RetroNetplayPhase.IDLE, RetroNetplayPhase.SCANNING, RetroNetplayPhase.SCAN_RESULTS -> {
+                if (!netplayArmedThisSession) {
+                    entries +=
+                        RetroMenuEntry.Action(
+                            label = getString(R.string.retro_netplay_title),
+                            icon = RetroDrawerIcons.Group,
+                            subtitle = getString(R.string.retro_netplay_enable_before_launch),
+                        ) {}
+                    return entries
+                }
+                entries +=
+                    RetroMenuEntry.Action(
+                        label = getString(R.string.retro_netplay_title),
+                        icon = RetroDrawerIcons.Group,
+                        active = phase != RetroNetplayPhase.IDLE,
+                        subtitle =
+                            when (phase) {
+                                RetroNetplayPhase.SCANNING -> getString(R.string.retro_netplay_scanning)
+                                RetroNetplayPhase.SCAN_RESULTS ->
+                                    RetroNetplayLobby.statusText.ifBlank {
+                                        getString(R.string.retro_netplay_scan_results)
+                                    }
+                                else ->
+                                    if (RetroOnlineSupport.supportsGameLink(sysId)) {
+                                        getString(R.string.retro_netplay_game_link_hint)
+                                    } else {
+                                        getString(R.string.retro_netplay_menu_hint)
+                                    }
+                            },
+                    ) {}
+                if (phase != RetroNetplayPhase.SCANNING) {
+                    val hostIp = RetroNetplayLobby.localIpv4Addresses().firstOrNull()
+                    entries +=
+                        RetroMenuEntry.Action(
+                            label = getString(R.string.retro_netplay_host_action),
+                            icon = RetroDrawerIcons.Add,
+                            subtitle =
+                                if (hostIp != null) {
+                                    "${getString(R.string.retro_gs_netplay_port)} $port\n$hostIp"
+                                } else {
+                                    "${getString(R.string.retro_gs_netplay_port)} $port"
+                                },
+                        ) {
+                            netplayLocalPort = 0
+                            RetroNetplayLobby.host(
+                                systemId = sysId,
+                                gameName = gameName,
+                                playerName = name,
+                                port = port,
+                                context = this,
+                                retroView = retroView,
+                            )
+                            menu.rebuild()
+                        }
+                }
+                entries +=
+                    RetroMenuEntry.Action(
+                        label =
+                            when (phase) {
+                                RetroNetplayPhase.SCANNING -> getString(R.string.retro_netplay_stop_scan)
+                                RetroNetplayPhase.SCAN_RESULTS -> getString(R.string.retro_netplay_scan_again)
+                                else -> getString(R.string.retro_netplay_scan_action)
+                            },
+                        icon = RetroDrawerIcons.Search,
+                        active = phase == RetroNetplayPhase.SCANNING || phase == RetroNetplayPhase.SCAN_RESULTS,
+                        subtitle =
+                            when (phase) {
+                                RetroNetplayPhase.SCANNING ->
+                                    RetroNetplayLobby.statusText.ifBlank {
+                                        getString(R.string.retro_netplay_scanning)
+                                    }
+                                RetroNetplayPhase.SCAN_RESULTS ->
+                                    RetroNetplayLobby.statusText.ifBlank {
+                                        getString(R.string.retro_netplay_scan_results)
+                                    }
+                                else -> getString(R.string.retro_netplay_scan_hint)
+                            },
+                    ) {
+                        if (phase == RetroNetplayPhase.SCANNING) {
+                            RetroNetplayLobby.stopScan()
+                            menu.rebuild()
+                        } else {
+                            menu.close()
+                            RetroNetplayLobby.scan(this, sysId)
+                        }
+                    }
+                if (phase == RetroNetplayPhase.SCAN_RESULTS) {
+                    entries +=
+                        RetroMenuEntry.Action(
+                            label = getString(R.string.retro_netplay_dismiss),
+                            icon = RetroDrawerIcons.Exit,
+                        ) {
+                            RetroNetplayLobby.dismissScanResults()
+                            menu.rebuild()
+                        }
+                }
+                RetroNetplayLobby.discovered.forEach { room ->
+                    entries +=
+                        RetroMenuEntry.Action(
+                            label = "${room.gameName} · ${room.hostPlayerName}",
+                            icon = RetroDrawerIcons.Play,
+                            subtitle = "${room.hostAddress}:${room.port} · ${getString(R.string.retro_netplay_join_room)}",
+                        ) {
+                            joinDiscoveredRoom(room)
+                        }
+                }
+                if (phase != RetroNetplayPhase.SCANNING) {
+                    entries +=
+                        RetroMenuEntry.Action(
+                            label = getString(R.string.retro_netplay_join_action),
+                            icon = RetroDrawerIcons.Link,
+                            subtitle =
+                                if (savedHost.isNotBlank()) {
+                                    "$savedHost:$port"
+                                } else {
+                                    getString(R.string.retro_gs_netplay_host_hint)
+                                },
+                        ) {
+                            promptJoinByAddress(sysId, port, name, savedHost)
+                        }
+                }
+            }
+        }
+        return entries
+    }
+
+    private fun promptJoinByAddress(
+        sysId: String,
+        port: Int,
+        playerName: String,
+        initialHost: String,
+    ) {
+        menu.renamePrompt =
+            RetroRenamePrompt(
+                title = getString(R.string.retro_gs_netplay_host),
+                initial = initialHost,
+            ) { entered ->
+                val host = entered?.trim().orEmpty()
+                if (host.isBlank()) return@RetroRenamePrompt
+                netplayLocalPort = 1
+                RetroNetplayLobby.join(
+                    host = host,
+                    port = port,
+                    playerName = playerName,
+                    gameName = gameName,
+                    systemId = sysId,
+                    retroView = retroView,
+                )
+                menu.close()
+                menu.rebuild()
+            }
+    }
+
+    private fun buildControlsEntries(): List<RetroMenuEntry> =
+        RetroControlsMenu.build(
+            RetroControlsMenu.Host(
+                context = this,
+                overlay = overlay,
+                menu = menu,
+                systemId = system?.id,
+                touchControls = { touchControlsSetting },
+                onTouchControls = { value ->
+                    touchControlsSetting = value
+                    if (controllerConnected) manualTouchOverride = true
+                    updateOverlayVisibility()
+                    syncInGameOverlayPlacement()
+                    persistExtra(RetroShortcuts.KEY_TOUCH_CONTROLS, if (value) "1" else "0")
+                },
+                adaptiveSticks = { adaptiveSticksSetting },
+                onAdaptiveSticks = { value ->
+                    adaptiveSticksSetting = value
+                    persistExtra(RetroShortcuts.KEY_ADAPTIVE_STICKS, if (value) "1" else "0")
+                },
+                orientationLabel = {
+                    if ((rootLayout?.height ?: 0) > (rootLayout?.width ?: 0)) {
+                        getString(R.string.retro_lr_portrait)
+                    } else {
+                        getString(R.string.retro_lr_landscape)
+                    }
+                },
+                onCloseMenu = { menu.close() },
+                showStickInversion = system?.id == RetroSystems.PSX.id || RetroCoreManager.usesDolphinCore(system),
+            ),
+        )
+
+    private fun setHudVisible(value: Boolean) {
+        hudVisible = value
+        if (value) {
+            showHud()
+        } else {
+            frameRating?.visibility = View.GONE
+            applyDisplayGeometry()
+        }
+        persistExtra(RetroShortcuts.KEY_HUD, if (value) "1" else "0")
+        menu.rebuild()
+    }
+
+    private fun buildHudEntries(): List<RetroMenuEntry> {
+        val style =
+            HudStyle(
+                alpha = hudAlpha,
+                bgDecoupled = hudBgDecoupled,
+                bgAlpha = hudBgAlpha,
+                scale = hudScale,
+                frametimeNumeric = hudFrametimeNumeric,
+                dualBattery = hudDualBattery,
+            )
+        return RetroHudSupport.buildHudEntries(
+            context = this,
+            hudVisible = hudVisible,
+            style = style,
+            elements = hudElements,
+            onMaster = { setHudVisible(it) },
+            onStyle = { next ->
+                hudAlpha = next.alpha
+                hudBgDecoupled = next.bgDecoupled
+                hudBgAlpha = next.bgAlpha
+                hudScale = next.scale
+                hudFrametimeNumeric = next.frametimeNumeric
+                hudDualBattery = next.dualBattery
+                frameRating?.let { RetroHudSupport.applyStyle(it, next, hudElements) }
+                saveHudSettings()
+            },
+            onElements = { next ->
+                hudElements = next
+                frameRating?.let { RetroHudSupport.applyStyle(it, style, next) }
+                saveHudSettings()
+            },
+            onRebuild = { menu.rebuild() },
+        )
+    }
+
+    private fun buildMainEntries(): List<RetroMenuEntry> {
+        val entries = mutableListOf<RetroMenuEntry>()
+        val hardcoreActive = achievementsSessionStarted && RetroAchievementsManager.isHardcoreActive()
+        entries +=
+            RetroMenuEntry.Action(getString(R.string.retro_lr_save_state), RetroDrawerIcons.Save) {
+                savesLoadMode = false
+                menu.showPane(RetroPane.SAVES)
+            }
+        entries +=
+            RetroMenuEntry.Action(getString(R.string.retro_lr_load_save_state), RetroDrawerIcons.Load) {
+                if (hardcoreActive) {
+                    Toast.makeText(this, getString(R.string.retro_lr_loading_states_disabled_hardcore), Toast.LENGTH_SHORT).show()
+                } else {
+                    savesLoadMode = true
+                    menu.showPane(RetroPane.SAVES)
+                }
+            }
+        if (RetroAchievementsManager.isLoggedIn(this) && RetroAchievementsManager.consoleId(system?.id) != 0) {
+            entries +=
+                RetroMenuEntry.Action(getString(R.string.retro_lr_achievements), RetroDrawerIcons.Achievements) {
+                    menu.close()
+                    openAchievementsScreen()
+                }
+        }
+        entries +=
+            RetroMenuEntry.Action(getString(R.string.retro_lr_cheats), RetroDrawerIcons.Cheats, active = !cheatsAllowed()) {
+                if (!cheatsAllowed()) {
+                    Toast.makeText(this, getString(R.string.retro_lr_cheats_disabled_hardcore), Toast.LENGTH_SHORT).show()
+                } else {
+                    menu.close()
+                    openCheatsScreen()
+                }
+            }
+        entries +=
+            RetroMenuEntry.Action(getString(R.string.retro_lr_reset), RetroDrawerIcons.Reset) {
+                menu.close()
+                retroView.reset()
+                RetroAchievementsManager.onEmulatorReset()
+            }
+        entries +=
+            RetroMenuEntry.Action(getString(R.string.retro_lr_fast_forward), RetroDrawerIcons.FastForward, active = fastForward) {
+                if (hardcoreActive) {
+                    Toast.makeText(this, getString(R.string.retro_lr_fast_forward_disabled_hardcore), Toast.LENGTH_SHORT).show()
+                } else {
+                    fastForward = !fastForward
+                    retroView.frameSpeed = if (fastForward) 2 else 1
+                    menu.rebuild()
+                }
+            }
+        entries +=
+            RetroMenuEntry.Action(getString(R.string.retro_lr_hud), RetroDrawerIcons.Hud, active = hudVisible) {
+                setHudVisible(!hudVisible)
+            }
+        if (diskCount > 1) {
+            entries +=
+                RetroMenuEntry.Action(getString(R.string.retro_lr_disc, currentDisk + 1, diskCount), RetroDrawerIcons.Disc) {
+                    val next = (currentDisk + 1) % diskCount
+                    lifecycleScope.launch(Dispatchers.Default) {
+                        runCatching { retroView.changeDisk(next) }
+                        currentDisk = next
+                        runOnUiThread { menu.rebuild() }
+                    }
+                }
+        }
+        return entries
+    }
+
+    private fun buildBottomEntries(): List<RetroMenuEntry.Action> =
+        listOf(
+            if (emulationPaused) {
+                RetroMenuEntry.Action(getString(R.string.retro_lr_resume), RetroDrawerIcons.Resume, active = true) {
+                    resumeEmulation()
+                    menu.close()
+                }
+            } else {
+                RetroMenuEntry.Action(getString(R.string.retro_lr_pause), RetroDrawerIcons.Pause) {
+                    pauseEmulation()
+                    menu.close()
+                }
+            },
+            RetroMenuEntry.Action(getString(R.string.retro_lr_exit), RetroDrawerIcons.Exit, danger = true) { finish() },
+        )
+
+    private fun requestSixtyHzDisplayMode(): Boolean {
+        val display = runCatching { windowManager.defaultDisplay }.getOrNull() ?: return false
+        val current = runCatching { display.mode }.getOrNull() ?: return false
+        val rate = display.refreshRate
+        val multiple = Math.round(rate / 60f)
+        if (multiple >= 1 && kotlin.math.abs(rate - multiple * 60f) < 2f) return false
+        val sixtyModes = display.supportedModes.filter { abs(it.refreshRate - 60f) < 1f }
+        val target =
+            sixtyModes.firstOrNull {
+                it.physicalWidth == current.physicalWidth && it.physicalHeight == current.physicalHeight
+            } ?: sixtyModes.firstOrNull() ?: return false
+        val attributes = window.attributes
+        attributes.preferredDisplayModeId = target.modeId
+        window.attributes = attributes
+        return true
+    }
+
+    private fun openMenu() {
+        if (!retroReady) {
+            return
+        }
+        overlay?.releaseAll()
+        menu.open()
+    }
+
+    private fun mapPhysicalKey(keyCode: Int): Int =
+        when (keyCode) {
+            KeyEvent.KEYCODE_BUTTON_A -> KeyEvent.KEYCODE_BUTTON_B
+            KeyEvent.KEYCODE_BUTTON_B -> KeyEvent.KEYCODE_BUTTON_A
+            KeyEvent.KEYCODE_BUTTON_X -> KeyEvent.KEYCODE_BUTTON_Y
+            KeyEvent.KEYCODE_BUTTON_Y -> KeyEvent.KEYCODE_BUTTON_X
+            else -> keyCode
+        }
+
+    private fun isGamepadSource(event: KeyEvent): Boolean {
+        val source = event.device?.sources ?: return false
+        return source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD ||
+            source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK
+    }
+
+    private val forwardedKeys =
+        setOf(
+            KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_BUTTON_B,
+            KeyEvent.KEYCODE_BUTTON_X,
+            KeyEvent.KEYCODE_BUTTON_Y,
+            KeyEvent.KEYCODE_BUTTON_L1,
+            KeyEvent.KEYCODE_BUTTON_R1,
+            KeyEvent.KEYCODE_BUTTON_L2,
+            KeyEvent.KEYCODE_BUTTON_R2,
+            KeyEvent.KEYCODE_BUTTON_THUMBL,
+            KeyEvent.KEYCODE_BUTTON_THUMBR,
+            KeyEvent.KEYCODE_BUTTON_START,
+            KeyEvent.KEYCODE_BUTTON_SELECT,
+            KeyEvent.KEYCODE_DPAD_UP,
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_LEFT,
+            KeyEvent.KEYCODE_DPAD_RIGHT,
+        )
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        val keyCode = event.keyCode
+        if (keyCode == KeyEvent.KEYCODE_BUTTON_MODE && isGamepadSource(event)) {
+            if (event.action == KeyEvent.ACTION_UP) {
+                if (menu.visible) menu.close() else if (retroReady) openMenu()
+            }
+            return true
+        }
+        if (menu.visible && isGamepadSource(event)) {
+            menu.handleKey(keyCode, event.action)
+            return true
+        }
+        if (retroReady && isGamepadSource(event)) {
+            if (keyCode in forwardedKeys) {
+                val mapped = mapPhysicalKey(keyCode)
+                val port = localNetplayPort()
+                retroView.sendKeyEvent(event.action, mapped, port)
+                if (RetroNetplayLobby.activeSession()?.isRunning == true) {
+                    RetroNetplayLobby.sendLocalKey(mapped, event.action)
+                }
+                return true
+            }
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
+    override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
+        if (menu.visible && event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK) {
+            val x = event.getAxisValue(MotionEvent.AXIS_HAT_X).takeIf { abs(it) > 0.5f } ?: event.getAxisValue(MotionEvent.AXIS_X)
+            val y = event.getAxisValue(MotionEvent.AXIS_HAT_Y).takeIf { abs(it) > 0.5f } ?: event.getAxisValue(MotionEvent.AXIS_Y)
+            menu.handleAxis(x, y)
+            return true
+        }
+        if (retroReady &&
+            event.action == MotionEvent.ACTION_MOVE &&
+            event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK
+        ) {
+            val hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X)
+            val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y)
+            val stickX = if (overlay?.invertLX == true) -event.getAxisValue(MotionEvent.AXIS_X) else event.getAxisValue(MotionEvent.AXIS_X)
+            val stickY = if (overlay?.invertLY == true) -event.getAxisValue(MotionEvent.AXIS_Y) else event.getAxisValue(MotionEvent.AXIS_Y)
+            val port = localNetplayPort()
+            val netActive = RetroNetplayLobby.activeSession()?.isRunning == true
+            if (stickIsAnalog) {
+                retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_DPAD, hatX, hatY, port)
+                retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_ANALOG_LEFT, stickX, stickY, port)
+                if (netActive) {
+                    RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_DPAD, hatX, hatY)
+                    RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_ANALOG_LEFT, stickX, stickY)
+                }
+            } else {
+                val deadzone = 0.45f
+                val dpadX =
+                    when {
+                        abs(hatX) > 0.5f -> hatX
+                        stickX > deadzone -> 1f
+                        stickX < -deadzone -> -1f
+                        else -> 0f
+                    }
+                val dpadY =
+                    when {
+                        abs(hatY) > 0.5f -> hatY
+                        stickY > deadzone -> 1f
+                        stickY < -deadzone -> -1f
+                        else -> 0f
+                    }
+                retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_DPAD, dpadX, dpadY, port)
+                retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_ANALOG_LEFT, stickX, stickY, port)
+                if (netActive) {
+                    RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_DPAD, dpadX, dpadY)
+                    RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_ANALOG_LEFT, stickX, stickY)
+                }
+            }
+            val rx = if (overlay?.invertRX == true) -event.getAxisValue(MotionEvent.AXIS_Z) else event.getAxisValue(MotionEvent.AXIS_Z)
+            val ry = if (overlay?.invertRY == true) -event.getAxisValue(MotionEvent.AXIS_RZ) else event.getAxisValue(MotionEvent.AXIS_RZ)
+            retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_ANALOG_RIGHT, rx, ry, port)
+            if (netActive) {
+                RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_ANALOG_RIGHT, rx, ry)
+            }
+            return true
+        }
+        return super.dispatchGenericMotionEvent(event)
+    }
+
+    override fun onButton(
+        keyCode: Int,
+        down: Boolean,
+    ) {
+        if (!retroReady || menu.visible) return
+        val action = if (down) KeyEvent.ACTION_DOWN else KeyEvent.ACTION_UP
+        val port = localNetplayPort()
+        retroView.sendKeyEvent(action, keyCode, port)
+        if (RetroNetplayLobby.activeSession()?.isRunning == true) {
+            RetroNetplayLobby.sendLocalKey(keyCode, action)
+        }
+    }
+
+    override fun onDpad(
+        x: Float,
+        y: Float,
+    ) {
+        if (!retroReady || menu.visible) return
+        val port = localNetplayPort()
+        retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_DPAD, x, y, port)
+        if (RetroNetplayLobby.activeSession()?.isRunning == true) {
+            RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_DPAD, x, y)
+        }
+    }
+
+    override fun onStick(
+        x: Float,
+        y: Float,
+    ) {
+        if (!retroReady || menu.visible) return
+        val port = localNetplayPort()
+        retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_ANALOG_LEFT, x, y, port)
+        if (RetroNetplayLobby.activeSession()?.isRunning == true) {
+            RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_ANALOG_LEFT, x, y)
+        }
+    }
+
+    override fun onRightStick(
+        x: Float,
+        y: Float,
+    ) {
+        if (!retroReady || menu.visible) return
+        val port = localNetplayPort()
+        retroView.sendMotionEvent(GLRetroView.MOTION_SOURCE_ANALOG_RIGHT, x, y, port)
+        if (RetroNetplayLobby.activeSession()?.isRunning == true) {
+            RetroNetplayLobby.sendLocalMotion(GLRetroView.MOTION_SOURCE_ANALOG_RIGHT, x, y)
+        }
+    }
+
+    override fun onMenu() {
+        runOnUiThread { openMenu() }
+    }
+
+    private fun saveState(slot: Int) {
+        runCatching {
+            val bytes = retroView.serializeState()
+            check(RetroSaveStates.writeSlot(this, gameName, slot, bytes))
+        }.onSuccess {
+            showInGameMessage(getString(R.string.retro_lr_saved_to_slot, slot))
+            launchExitCloudBackup()
+        }.onFailure {
+            showInGameMessage(getString(R.string.retro_lr_could_not_save_state))
+        }
+    }
+
+    private fun showBiosRequiredDialog(system: RetroSystem) {
+        androidx.appcompat.app.AlertDialog.Builder(this)
+            .setTitle(getString(R.string.retro_lr_bios_required_title, system.shortName))
+            .setMessage(getString(R.string.retro_lr_bios_required_message))
+            .setCancelable(false)
+            .setPositiveButton(getString(R.string.retro_lr_import_bios)) { _, _ ->
+                runCatching { biosPicker.launch(arrayOf("*/*")) }
+                    .onFailure { finish() }
+            }
+            .setNegativeButton(getString(R.string.retro_lr_cancel)) { _, _ -> finish() }
+            .show()
+    }
+
+    private fun openAchievementsScreen() {
+        val sys = system ?: return
+        val rom = intent.getStringExtra(EXTRA_ROM_PATH) ?: return
+        startActivity(
+            android.content.Intent(this, RetroAchievementsActivity::class.java).apply {
+                putExtra(RetroAchievementsActivity.EXTRA_SYSTEM_ID, sys.id)
+                putExtra(RetroAchievementsActivity.EXTRA_GAME_NAME, gameName)
+                putExtra(RetroAchievementsActivity.EXTRA_ROM_PATH, rom)
+                putExtra(RetroAchievementsActivity.EXTRA_IN_SESSION, true)
+            },
+        )
+    }
+
+    private fun loadState(slot: Int) {
+        if (achievementsSessionStarted && RetroAchievementsManager.isHardcoreActive()) {
+            showInGameMessage(getString(R.string.retro_lr_loading_states_disabled_hardcore))
+            return
+        }
+        val bytes = RetroSaveStates.readSlot(this, gameName, slot)
+        if (bytes == null) {
+            showInGameMessage(getString(R.string.retro_lr_slot_empty, slot))
+            return
+        }
+        runCatching { check(retroView.unserializeState(bytes)) }
+            .onSuccess { showInGameMessage(getString(R.string.retro_lr_loaded_slot, slot)) }
+            .onFailure { showInGameMessage(getString(R.string.retro_lr_could_not_load_state)) }
+    }
+
+    private fun buildSaveSlotEntries(): List<RetroMenuEntry> =
+        RetroSaveStates.listSlots(this, gameName).map { info ->
+            RetroMenuEntry.SaveSlot(
+                slot = info.slot,
+                title = info.customName ?: getString(R.string.retro_lr_slot_title, info.slot),
+                subtitle = RetroSaveStates.relativeTime(info.timestampMs),
+                filled = info.exists,
+                onClick = {
+                    if (savesLoadMode) {
+                        if (info.exists) {
+                            menu.close()
+                            loadState(info.slot)
+                        }
+                    } else {
+                        saveState(info.slot)
+                        menu.rebuild()
+                    }
+                },
+                onRename = {
+                    menu.renamePrompt =
+                        RetroRenamePrompt(
+                            title = getString(R.string.retro_lr_rename_slot, info.slot),
+                            initial = info.customName ?: "",
+                        ) { newName ->
+                            RetroSaveStates.renameSlot(this, gameName, info.slot, newName)
+                            menu.rebuild()
+                        }
+                },
+            )
+        }
+
+    private fun persistSram() {
+        if (!retroReady) return
+        runCatching {
+            val sram = retroView.serializeSRAM()
+            if (sram.isNotEmpty()) {
+                RetroSaveStates.sramFile(this, gameName).writeBytes(sram)
+            }
+        }
+    }
+
+    override fun onPause() {
+        persistSram()
+        accumulatePlaytime()
+        if (isFinishing) launchExitCloudBackup()
+        super.onPause()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (retroReady && surfaceReady) applyCheats()
+        if (emulationPaused && retroReady) {
+            window.decorView.post {
+                if (emulationPaused && retroReady) {
+                    retroView.onPause()
+                    LibretroDroid.pause()
+                }
+            }
+        }
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) hideSystemBars()
+    }
+
+    private fun hideSystemBars() {
+        val controller = WindowInsetsControllerCompat(window, window.decorView)
+        controller.hide(WindowInsetsCompat.Type.systemBars())
+        controller.systemBarsBehavior =
+            WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        window.decorView.systemUiVisibility =
+            View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY or
+            View.SYSTEM_UI_FLAG_FULLSCREEN or
+            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+            View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+    }
+}
diff --git a/app/src/main/feature/retro/RetroBiosImport.kt b/app/src/main/feature/retro/RetroBiosImport.kt
new file mode 100644
index 000000000..730b753a2
--- /dev/null
+++ b/app/src/main/feature/retro/RetroBiosImport.kt
@@ -0,0 +1,95 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.net.Uri
+import java.io.File
+import java.security.MessageDigest
+
+object RetroBiosImport {
+    private val KNOWN_BIOS: Map<String, String> =
+        mapOf(
+            "8dd7d5296a650fac7319bce665a6a53c" to "scph5500.bin",
+            "490f666e1afb15b7362b406ed1cea246" to "scph5501.bin",
+            "32736f17079d0b2b7024407c39bd3050" to "scph5502.bin",
+            "924e392ed05558ffdb115408c263dccf" to "scph1001.bin",
+            "1e68c231d0896b7eadcad1d7d8e76129" to "scph7001.bin",
+        )
+
+    fun importFromUri(
+        context: Context,
+        uri: Uri,
+    ): Result<String> =
+        runCatching {
+            val bytes =
+                context.contentResolver.openInputStream(uri)?.use { it.readBytes() }
+                    ?: throw IllegalStateException("Could not read file")
+            val md5 = MessageDigest.getInstance("MD5").digest(bytes).joinToString("") { "%02x".format(it) }
+            val canonical =
+                KNOWN_BIOS[md5]
+                    ?: throw IllegalArgumentException("Not a recognized PlayStation BIOS")
+            val dir = RetroCoreManager.systemDir(context)
+            val target = File(dir, canonical)
+            val tmp = File(dir, "$canonical.tmp")
+            tmp.writeBytes(bytes)
+            if (!tmp.renameTo(target)) {
+                target.writeBytes(bytes)
+                tmp.delete()
+            }
+            canonical
+        }
+
+    fun ps2BiosDir(context: Context): File =
+        File(context.getExternalFilesDir(null) ?: context.filesDir, "bios").apply { mkdirs() }
+
+    fun installedPs2Bios(context: Context): List<String> =
+        ps2BiosDir(context).listFiles().orEmpty()
+            .filter { it.isFile && it.length() >= 3L * 1024 * 1024 }
+            .map { it.name }
+            .sorted()
+
+    fun deletePs1Bios(context: Context): Int {
+        val dir = RetroCoreManager.systemDir(context)
+        var removed = 0
+        RetroSystems.PSX.biosFiles.forEach { val f = File(dir, it); if (f.isFile && f.delete()) removed++ }
+        return removed
+    }
+
+    fun deletePs2Bios(context: Context): Int {
+        var removed = 0
+        ps2BiosDir(context).listFiles().orEmpty().forEach { if (it.isFile && it.delete()) removed++ }
+        context.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE).edit().remove("bios").apply()
+        return removed
+    }
+
+    fun importPs2FromUri(
+        context: Context,
+        uri: Uri,
+    ): Result<String> =
+        runCatching {
+            val name =
+                context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
+                    if (it.moveToFirst()) it.getString(0) else null
+                } ?: "ps2-bios.bin"
+            val bytes =
+                context.contentResolver.openInputStream(uri)?.use { it.readBytes() }
+                    ?: throw IllegalStateException("Could not read file")
+            if (bytes.size !in (3 * 1024 * 1024)..(8 * 1024 * 1024)) {
+                throw IllegalArgumentException("Not a PS2 BIOS — expected a single merged .bin dump (3–8MB), not a split ROM0/MEC/NVM set.")
+            }
+            val head = String(bytes, 0, minOf(bytes.size, 4096), Charsets.ISO_8859_1)
+            if (!head.contains("PS2", true) && !head.contains("Sony", true) && !head.contains("ROMDIR", true)) {
+                throw IllegalArgumentException("This file doesn't look like a PS2 BIOS dump.")
+            }
+            val safe = name.ifBlank { "ps2-bios.bin" }.let { if (it.endsWith(".bin", true)) it else "$it.bin" }
+            val target = File(ps2BiosDir(context), safe)
+            val tmp = File(ps2BiosDir(context), "$safe.tmp")
+            tmp.writeBytes(bytes)
+            if (!tmp.renameTo(target)) {
+                target.writeBytes(bytes)
+                tmp.delete()
+            }
+            context.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE)
+                .edit().putString("bios", target.absolutePath).apply()
+            safe
+        }
+}
diff --git a/app/src/main/feature/retro/RetroBoxart.kt b/app/src/main/feature/retro/RetroBoxart.kt
new file mode 100644
index 000000000..fe3283282
--- /dev/null
+++ b/app/src/main/feature/retro/RetroBoxart.kt
@@ -0,0 +1,357 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RadialGradient
+import android.graphics.RectF
+import android.graphics.Shader
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+import java.net.URLDecoder
+import java.net.URLEncoder
+import java.util.Locale
+
+object RetroBoxart {
+    private const val BASE = "https://thumbnails.libretro.com"
+    private const val OUT_W = 920
+    private const val OUT_H = 430
+    private const val INDEX_TTL_MS = 7L * 24 * 3600 * 1000
+
+    private val FOLDERS =
+        mapOf(
+            "nes" to "Nintendo - Nintendo Entertainment System",
+            "snes" to "Nintendo - Super Nintendo Entertainment System",
+            "gb" to "Nintendo - Game Boy",
+            "gbc" to "Nintendo - Game Boy Color",
+            "gba" to "Nintendo - Game Boy Advance",
+            "genesis" to "Sega - Mega Drive - Genesis",
+            "sms" to "Sega - Master System - Mark III",
+            "gg" to "Sega - Game Gear",
+            "n64" to "Nintendo - Nintendo 64",
+            "psx" to "Sony - PlayStation",
+            "ps2" to "Sony - PlayStation 2",
+            "gc" to "Nintendo - GameCube",
+            "wii" to "Nintendo - Wii",
+        )
+
+    private data class CaseStyle(
+        val body: Int,
+        val accent: Int,
+        val cartAspect: Float,
+        val isDisc: Boolean,
+        val labelPortrait: Boolean,
+    )
+
+    private val STYLES =
+        mapOf(
+            "nes" to CaseStyle(0xFF9A9AA2.toInt(), 0xFF3B3B42.toInt(), 0.80f, false, true),
+            "snes" to CaseStyle(0xFFB6B1AB.toInt(), 0xFF8A5BA5.toInt(), 1.45f, false, false),
+            "gb" to CaseStyle(0xFFB9B8C2.toInt(), 0xFF4A4A55.toInt(), 1.0f, false, true),
+            "gbc" to CaseStyle(0xFF6E5FD8.toInt(), 0xFF2F2A66.toInt(), 1.0f, false, true),
+            "gba" to CaseStyle(0xFF5F58C7.toInt(), 0xFF29255C.toInt(), 1.5f, false, false),
+            "genesis" to CaseStyle(0xFF232329.toInt(), 0xFFC9A24A.toInt(), 0.82f, false, true),
+            "sms" to CaseStyle(0xFF24242C.toInt(), 0xFFD03A3A.toInt(), 0.82f, false, true),
+            "gg" to CaseStyle(0xFF1C1C22.toInt(), 0xFF3E7BD6.toInt(), 0.95f, false, true),
+            "n64" to CaseStyle(0xFF515158.toInt(), 0xFFCF3B3B.toInt(), 1.28f, false, false),
+            "psx" to CaseStyle(0xFFE8E8EC.toInt(), 0xFF2F2F36.toInt(), 1.0f, true, false),
+            "ps2" to CaseStyle(0xFF1E2C6E.toInt(), 0xFF0E1436.toInt(), 0.74f, true, true),
+            "gc" to CaseStyle(0xFF4A4E57.toInt(), 0xFF6B3FA0.toInt(), 0.74f, true, true),
+            "wii" to CaseStyle(0xFFE8E8EC.toInt(), 0xFF1BA0D8.toInt(), 0.74f, true, true),
+        )
+
+    val artVersion = androidx.compose.runtime.mutableStateOf(0)
+    private val working = java.util.concurrent.atomic.AtomicBoolean(false)
+
+    fun ensureArtworkAsync(context: Context) {
+        if (!working.compareAndSet(false, true)) return
+        val app = context.applicationContext
+        Thread {
+            try {
+                val retro =
+                    runCatching {
+                        com.winlator.cmod.runtime.container.ContainerManager(app)
+                            .loadShortcuts()
+                            .filter { RetroShortcuts.isRetroShortcut(it) }
+                    }.getOrDefault(emptyList())
+                retro.forEach { shortcut ->
+                    if (com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork.findIconArtworkPath(shortcut) != null) return@forEach
+                    val existing = shortcut.getExtra("customCoverArtPath")
+                    if (existing.isNotBlank() && File(existing).isFile) return@forEach
+                    val system = RetroShortcuts.systemForShortcut(shortcut) ?: return@forEach
+                    val name = shortcut.getExtra("custom_name", shortcut.name)
+                    val uuid = com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork.ensureShortcutUuid(shortcut)
+                    val artFile = com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork.buildManagedCustomGameArtworkFile(app, uuid)
+                    if (fetchAndCompose(app, system, name, artFile)) {
+                        shortcut.putExtra("customCoverArtPath", artFile.absolutePath)
+                        shortcut.saveData()
+                        artVersion.value++
+                    }
+                }
+            } finally {
+                working.set(false)
+            }
+        }.start()
+    }
+
+    fun caseArtEnabled(context: Context): Boolean =
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .getBoolean("retro_case_art", true)
+
+    fun setCaseArtEnabled(context: Context, enabled: Boolean) {
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .edit().putBoolean("retro_case_art", enabled).apply()
+    }
+
+    fun fetchAndCompose(context: Context, system: RetroSystem, gameName: String, outFile: File): Boolean =
+        runCatching {
+            val boxart = fetchBoxart(context, system, gameName)
+            val bmp = compose(context, system, gameName, boxart)
+            outFile.parentFile?.mkdirs()
+            outFile.outputStream().use { bmp.compress(Bitmap.CompressFormat.PNG, 95, it) }
+            bmp.recycle()
+            boxart?.recycle()
+            outFile.isFile
+        }.getOrDefault(false)
+
+    fun composeCustom(context: Context, system: RetroSystem, gameName: String, source: Bitmap, outFile: File): Boolean =
+        runCatching {
+            val bmp = compose(context, system, gameName, source)
+            outFile.parentFile?.mkdirs()
+            outFile.outputStream().use { bmp.compress(Bitmap.CompressFormat.PNG, 95, it) }
+            bmp.recycle()
+            outFile.isFile
+        }.getOrDefault(false)
+
+    private fun fetchBoxart(context: Context, system: RetroSystem, gameName: String): Bitmap? {
+        val folder = FOLDERS[system.id] ?: return null
+        val names = index(context, system.id, folder) ?: return null
+        val match = bestMatch(gameName, names) ?: return null
+        val url = "$BASE/${encodePath(folder)}/Named_Boxarts/${encodePath(match)}"
+        return download(url)
+    }
+
+    private fun index(context: Context, sysId: String, folder: String): List<String>? {
+        val cache = File(File(context.filesDir, "retro/boxart_index"), "$sysId.txt")
+        if (cache.isFile && System.currentTimeMillis() - cache.lastModified() < INDEX_TTL_MS) {
+            return cache.readLines().filter { it.isNotBlank() }
+        }
+        val html =
+            runCatching {
+                val conn = URL("$BASE/${encodePath(folder)}/Named_Boxarts/").openConnection() as HttpURLConnection
+                conn.connectTimeout = 12000
+                conn.readTimeout = 30000
+                conn.inputStream.bufferedReader().use { it.readText() }
+            }.getOrNull() ?: return if (cache.isFile) cache.readLines().filter { it.isNotBlank() } else null
+        val names =
+            Regex("href=\"([^\"?]+\\.png)\"").findAll(html)
+                .map { URLDecoder.decode(it.groupValues[1], "UTF-8") }
+                .filter { !it.startsWith("/") }
+                .toList()
+        if (names.isEmpty()) return null
+        cache.parentFile?.mkdirs()
+        cache.writeText(names.joinToString("\n"))
+        return names
+    }
+
+    private fun normalize(name: String): String =
+        name.substringBeforeLast('.')
+            .replace(Regex("[\\(\\[][^\\)\\]]*[\\)\\]]"), " ")
+            .lowercase(Locale.US)
+            .replace(Regex("[^a-z0-9]+"), " ")
+            .trim()
+
+    private fun bestMatch(gameName: String, names: List<String>): String? {
+        val target = normalize(gameName)
+        if (target.isBlank()) return null
+        val byNorm = LinkedHashMap<String, MutableList<String>>()
+        names.forEach { byNorm.getOrPut(normalize(it)) { ArrayList() }.add(it) }
+        val exact = byNorm[target]
+        if (exact != null) return preferRegion(exact)
+        val targetTokens = target.split(' ').toSet()
+        var best: String? = null
+        var bestScore = 0f
+        byNorm.forEach { (norm, files) ->
+            val tokens = norm.split(' ').toSet()
+            val overlap = (targetTokens intersect tokens).size.toFloat()
+            if (overlap == 0f) return@forEach
+            val score = overlap * 2f / (targetTokens.size + tokens.size)
+            val boosted = if (norm.startsWith(target) || target.startsWith(norm)) score + 0.3f else score
+            if (boosted > bestScore) {
+                bestScore = boosted
+                best = preferRegion(files)
+            }
+        }
+        return if (bestScore >= 0.6f) best else null
+    }
+
+    private fun preferRegion(files: List<String>): String =
+        files.firstOrNull { it.contains("(USA", true) }
+            ?: files.firstOrNull { it.contains("(World", true) }
+            ?: files.firstOrNull { it.contains("(Europe", true) }
+            ?: files.first()
+
+    private fun download(url: String): Bitmap? =
+        runCatching {
+            val conn = URL(url).openConnection() as HttpURLConnection
+            conn.connectTimeout = 12000
+            conn.readTimeout = 30000
+            conn.inputStream.use { BitmapFactory.decodeStream(it) }
+        }.getOrNull()
+
+    private fun encodePath(segment: String): String =
+        URLEncoder.encode(segment, "UTF-8").replace("+", "%20")
+
+    private fun compose(context: Context, system: RetroSystem, gameName: String, boxart: Bitmap?): Bitmap {
+        val style = STYLES[system.id] ?: STYLES.getValue("nes")
+        val out = Bitmap.createBitmap(OUT_W, OUT_H, Bitmap.Config.ARGB_8888)
+        val c = Canvas(out)
+        val p = Paint(Paint.ANTI_ALIAS_FLAG)
+
+        p.shader = LinearGradient(0f, 0f, 0f, OUT_H.toFloat(), 0xFF16161E.toInt(), 0xFF0B0B10.toInt(), Shader.TileMode.CLAMP)
+        c.drawRect(0f, 0f, OUT_W.toFloat(), OUT_H.toFloat(), p)
+        p.shader = RadialGradient(OUT_W * 0.5f, OUT_H * 0.42f, OUT_W * 0.5f, 0x2AFFFFFF, 0x00000000, Shader.TileMode.CLAMP)
+        c.drawRect(0f, 0f, OUT_W.toFloat(), OUT_H.toFloat(), p)
+        p.shader = null
+
+        if (!caseArtEnabled(context) && boxart != null) {
+            drawFitted(c, boxart, RectF(0f, 0f, OUT_W.toFloat(), OUT_H.toFloat()), 24f, 0.94f)
+            return out
+        }
+
+        val caseH = OUT_H * 0.86f
+        val caseW = (caseH * style.cartAspect).coerceAtMost(OUT_W * 0.62f)
+        val cx = OUT_W * 0.5f
+        val top = (OUT_H - caseH) * 0.5f
+        val body = RectF(cx - caseW / 2f, top, cx + caseW / 2f, top + caseH)
+        val corner = if (style.isDisc) 14f else 22f
+
+        p.color = 0x66000000
+        c.drawRoundRect(RectF(body.left + 8f, body.top + 12f, body.right + 8f, body.bottom + 12f), corner, corner, p)
+
+        p.shader = LinearGradient(body.left, body.top, body.left, body.bottom, lighten(style.body, 0.14f), darken(style.body, 0.18f), Shader.TileMode.CLAMP)
+        c.drawRoundRect(body, corner, corner, p)
+        p.shader = null
+        p.style = Paint.Style.STROKE
+        p.strokeWidth = 3f
+        p.color = darken(style.body, 0.4f)
+        c.drawRoundRect(body, corner, corner, p)
+        p.style = Paint.Style.FILL
+
+        val label: RectF
+        if (style.isDisc) {
+            val spineW = body.width() * 0.085f
+            p.color = style.accent
+            c.drawRoundRect(RectF(body.left, body.top, body.left + spineW + corner, body.bottom), corner, corner, p)
+            c.drawRect(RectF(body.left + spineW, body.top, body.left + spineW + corner, body.bottom), p)
+            label = RectF(body.left + spineW + 10f, body.top + 10f, body.right - 10f, body.bottom - 10f)
+            p.color = 0x30FFFFFF
+            c.drawRect(RectF(body.left + spineW + 4f, body.top, body.left + spineW + 8f, body.bottom), p)
+        } else {
+            p.color = darken(style.body, 0.28f)
+            val grooveTop = body.top + body.height() * 0.055f
+            for (i in 0 until 3) {
+                val y = grooveTop + i * body.height() * 0.028f
+                c.drawRoundRect(RectF(body.left + body.width() * 0.12f, y, body.right - body.width() * 0.12f, y + body.height() * 0.012f), 4f, 4f, p)
+            }
+            val inset = body.width() * 0.10f
+            val labelTop = body.top + body.height() * 0.17f
+            val labelBottom = body.bottom - body.height() * 0.09f
+            label = RectF(body.left + inset, labelTop, body.right - inset, labelBottom)
+            p.color = darken(style.body, 0.35f)
+            c.drawRoundRect(RectF(label.left - 5f, label.top - 5f, label.right + 5f, label.bottom + 5f), 10f, 10f, p)
+        }
+
+        if (boxart != null) {
+            drawFitted(c, boxart, label, 8f, 1f)
+        } else {
+            p.shader = LinearGradient(label.left, label.top, label.left, label.bottom, lighten(style.accent, 0.18f), darken(style.accent, 0.25f), Shader.TileMode.CLAMP)
+            c.drawRoundRect(label, 8f, 8f, p)
+            p.shader = null
+            drawTitle(c, gameName, system.shortName, label)
+        }
+
+        p.shader = LinearGradient(body.left, body.top, body.left, body.top + body.height() * 0.20f, 0x33FFFFFF, 0x00FFFFFF, Shader.TileMode.CLAMP)
+        c.drawRoundRect(RectF(body.left, body.top, body.right, body.top + body.height() * 0.22f), corner, corner, p)
+        p.shader = null
+        return out
+    }
+
+    private fun drawFitted(c: Canvas, bmp: Bitmap, area: RectF, radius: Float, maxFill: Float) {
+        val scale = minOf(area.width() * maxFill / bmp.width, area.height() * maxFill / bmp.height)
+        val w = bmp.width * scale
+        val h = bmp.height * scale
+        val dst = RectF(area.centerX() - w / 2f, area.centerY() - h / 2f, area.centerX() + w / 2f, area.centerY() + h / 2f)
+        val p = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG)
+        val path = Path().apply { addRoundRect(dst, radius, radius, Path.Direction.CW) }
+        c.save()
+        c.clipPath(path)
+        c.drawBitmap(bmp, null, dst, p)
+        c.restore()
+    }
+
+    private fun drawTitle(c: Canvas, gameName: String, shortName: String, area: RectF) {
+        val p = Paint(Paint.ANTI_ALIAS_FLAG)
+        p.color = Color.WHITE
+        p.textAlign = Paint.Align.CENTER
+        p.isFakeBoldText = true
+        var size = area.height() * 0.16f
+        p.textSize = size
+        val words = gameName.trim().split(Regex("\\s+"))
+        var lines = wrap(words, p, area.width() * 0.88f)
+        while (lines.size > 3 && size > area.height() * 0.09f) {
+            size *= 0.88f
+            p.textSize = size
+            lines = wrap(words, p, area.width() * 0.88f)
+        }
+        if (lines.size > 3) lines = lines.take(3)
+        val lineH = p.textSize * 1.18f
+        var y = area.centerY() - (lines.size - 1) * lineH / 2f + p.textSize * 0.35f
+        lines.forEach {
+            c.drawText(it, area.centerX(), y, p)
+            y += lineH
+        }
+        p.isFakeBoldText = false
+        p.textSize = area.height() * 0.08f
+        p.color = 0xB3FFFFFF.toInt()
+        c.drawText(shortName.uppercase(Locale.US), area.centerX(), area.bottom - area.height() * 0.06f, p)
+    }
+
+    private fun wrap(words: List<String>, p: Paint, maxW: Float): List<String> {
+        val lines = ArrayList<String>()
+        var line = StringBuilder()
+        words.forEach { w ->
+            val candidate = if (line.isEmpty()) w else "$line $w"
+            if (p.measureText(candidate) <= maxW || line.isEmpty()) {
+                line = StringBuilder(candidate)
+            } else {
+                lines.add(line.toString())
+                line = StringBuilder(w)
+            }
+        }
+        if (line.isNotEmpty()) lines.add(line.toString())
+        return lines
+    }
+
+    private fun mix(a: Int, b: Int, f: Float): Int {
+        val inv = 1f - f
+        return Color.argb(
+            255,
+            (Color.red(a) * inv + Color.red(b) * f).toInt(),
+            (Color.green(a) * inv + Color.green(b) * f).toInt(),
+            (Color.blue(a) * inv + Color.blue(b) * f).toInt(),
+        )
+    }
+
+    private fun lighten(color: Int, f: Float) = mix(color, Color.WHITE, f)
+
+    private fun darken(color: Int, f: Float) = mix(color, Color.BLACK, f)
+}
diff --git a/app/src/main/feature/retro/RetroBundle.kt b/app/src/main/feature/retro/RetroBundle.kt
new file mode 100644
index 000000000..50ffad661
--- /dev/null
+++ b/app/src/main/feature/retro/RetroBundle.kt
@@ -0,0 +1,179 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.widget.Toast
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.io.TarCompressorUtils
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+import java.security.MessageDigest
+import org.json.JSONObject
+
+object RetroBundle {
+    private const val BASE = "https://github.com/WinNative-Emu/Retro-Consoles/releases/download/latest"
+    private const val ARCHIVE = "retro-consoles.tzst"
+    private const val INFO = "bundle-info.json"
+
+    fun root(context: Context): File = File(context.filesDir, "retro/bundle")
+
+    fun coresDir(context: Context): File = File(root(context), "cores")
+
+    fun dataDir(context: Context): File = File(root(context), "data")
+
+    data class Version(
+        val tag: String,
+        val buildDate: String,
+        val sha256: String,
+        val size: Long,
+    ) {
+        val day: String get() = buildDate.substringBefore('T')
+
+        fun toJson(): String =
+            JSONObject()
+                .put("tag", tag)
+                .put("buildDate", buildDate)
+                .put("sha256", sha256)
+                .put("size", size)
+                .toString()
+
+        companion object {
+            fun parse(json: String): Version {
+                val o = JSONObject(json)
+                return Version(
+                    tag = o.getString("tag"),
+                    buildDate = o.getString("buildDate"),
+                    sha256 = o.getString("sha256").lowercase(),
+                    size = o.getLong("size"),
+                )
+            }
+        }
+    }
+
+    private fun marker(context: Context): File = File(root(context), ".installed")
+
+    fun isInstalled(context: Context): Boolean = installed(context) != null
+
+    fun requireInstalled(context: Context): Boolean {
+        if (isInstalled(context)) return true
+        Toast.makeText(context, context.getString(R.string.retro_bundle_required), Toast.LENGTH_LONG).show()
+        return false
+    }
+
+    fun installed(context: Context): Version? =
+        runCatching { Version.parse(marker(context).readText()) }.getOrNull()
+
+    fun published(): Result<Version> = runCatching { Version.parse(fetchText("$BASE/$INFO")) }
+
+    sealed class Progress {
+        data class Downloading(val bytes: Long, val total: Long) : Progress()
+
+        data object Verifying : Progress()
+
+        data object Extracting : Progress()
+    }
+
+    fun install(
+        context: Context,
+        version: Version,
+        onProgress: (Progress) -> Unit = {},
+    ): Result<Version> =
+        runCatching {
+            val work = File(context.cacheDir, "retro-bundle").apply { deleteRecursively(); mkdirs() }
+            val archive = File(work, ARCHIVE)
+
+            download("$BASE/$ARCHIVE", archive) { got, total ->
+                onProgress(Progress.Downloading(got, if (total > 0) total else version.size))
+            }
+
+            onProgress(Progress.Verifying)
+            val actual = sha256(archive)
+            if (!actual.equals(version.sha256, ignoreCase = true)) {
+                throw IllegalStateException("Bundle checksum mismatch: expected ${version.sha256}, got $actual")
+            }
+
+            onProgress(Progress.Extracting)
+            val staging = File(work, "stage").apply { mkdirs() }
+            val ok =
+                TarCompressorUtils
+                    .extractAsync(TarCompressorUtils.Type.ZSTD, archive, staging)
+                    .get()
+            if (ok != true) throw IllegalStateException("Bundle extraction failed")
+
+            val destination = root(context)
+            destination.deleteRecursively()
+            destination.parentFile?.mkdirs()
+            if (!staging.renameTo(destination)) {
+                staging.copyRecursively(destination, overwrite = true)
+                staging.deleteRecursively()
+            }
+            marker(context).writeText(version.toJson())
+            work.deleteRecursively()
+            version
+        }
+
+    fun uninstall(context: Context) {
+        root(context).deleteRecursively()
+    }
+
+    private fun open(url: String): HttpURLConnection =
+        (URL(url).openConnection() as HttpURLConnection).apply {
+            connectTimeout = 15000
+            readTimeout = 60000
+            instanceFollowRedirects = true
+        }
+
+    private fun fetchText(url: String): String =
+        open(url).let { c ->
+            try {
+                c.inputStream.bufferedReader().use { it.readText() }
+            } finally {
+                c.disconnect()
+            }
+        }
+
+    private fun download(
+        url: String,
+        target: File,
+        onProgress: (Long, Long) -> Unit,
+    ) {
+        val connection = open(url)
+        try {
+            val total = connection.contentLengthLong
+            target.parentFile?.mkdirs()
+            connection.inputStream.use { input ->
+                target.outputStream().use { output ->
+                    val buffer = ByteArray(1 shl 16)
+                    var got = 0L
+                    var lastReport = 0L
+                    while (true) {
+                        val read = input.read(buffer)
+                        if (read < 0) break
+                        output.write(buffer, 0, read)
+                        got += read
+                        if (got - lastReport >= 1L shl 20) {
+                            lastReport = got
+                            onProgress(got, total)
+                        }
+                    }
+                    onProgress(got, total)
+                }
+            }
+        } finally {
+            connection.disconnect()
+        }
+    }
+
+    private fun sha256(file: File): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+        file.inputStream().use { input ->
+            val buffer = ByteArray(1 shl 16)
+            while (true) {
+                val read = input.read(buffer)
+                if (read < 0) break
+                digest.update(buffer, 0, read)
+            }
+        }
+        return digest.digest().joinToString("") { "%02x".format(it) }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroCheats.kt b/app/src/main/feature/retro/RetroCheats.kt
new file mode 100644
index 000000000..97e15e8e6
--- /dev/null
+++ b/app/src/main/feature/retro/RetroCheats.kt
@@ -0,0 +1,72 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import org.json.JSONArray
+import org.json.JSONObject
+
+data class RetroCheat(
+    val name: String,
+    val code: String,
+    val enabled: Boolean,
+)
+
+object RetroCheats {
+    private fun prefs(context: Context) = PreferenceManager.getDefaultSharedPreferences(context)
+
+    private fun safeName(gameName: String): String = gameName.replace(Regex("[^A-Za-z0-9._-]"), "_")
+
+    private fun key(gameName: String) = "retro_cheats_${safeName(gameName)}"
+
+    fun load(
+        context: Context,
+        gameName: String,
+    ): List<RetroCheat> {
+        val raw = prefs(context).getString(key(gameName), null) ?: return emptyList()
+        return runCatching {
+            val arr = JSONArray(raw)
+            (0 until arr.length()).map { i ->
+                val o = arr.getJSONObject(i)
+                RetroCheat(
+                    name = o.optString("name"),
+                    code = o.optString("code"),
+                    enabled = o.optBoolean("enabled", false),
+                )
+            }
+        }.getOrDefault(emptyList())
+    }
+
+    fun save(
+        context: Context,
+        gameName: String,
+        cheats: List<RetroCheat>,
+    ) {
+        val arr = JSONArray()
+        cheats.forEach { c ->
+            arr.put(
+                JSONObject()
+                    .put("name", c.name)
+                    .put("code", c.code)
+                    .put("enabled", c.enabled),
+            )
+        }
+        prefs(context).edit().putString(key(gameName), arr.toString()).apply()
+    }
+
+    fun hasEnabled(
+        context: Context,
+        gameName: String,
+    ): Boolean = load(context, gameName).any { it.enabled }
+
+    fun formatHint(systemId: String?): String =
+        when (systemId) {
+            RetroSystems.NES.id -> "Game Genie or raw codes (e.g. SXIOPO)"
+            RetroSystems.SNES.id -> "Game Genie or Pro Action Replay codes"
+            RetroSystems.GAMEBOY.id, RetroSystems.GAMEBOY_COLOR.id -> "Game Genie or GameShark codes"
+            RetroSystems.GBA.id -> "GameShark, Action Replay or Code Breaker codes"
+            RetroSystems.GENESIS.id, RetroSystems.MASTER_SYSTEM.id, RetroSystems.GAME_GEAR.id -> "Game Genie or raw codes"
+            RetroSystems.N64.id -> "GameShark codes (8-digit address + value)"
+            RetroSystems.PSX.id -> "GameShark codes (8-digit address + value)"
+            else -> "Cheat code"
+        }
+}
diff --git a/app/src/main/feature/retro/RetroCheatsActivity.kt b/app/src/main/feature/retro/RetroCheatsActivity.kt
new file mode 100644
index 000000000..489de1ded
--- /dev/null
+++ b/app/src/main/feature/retro/RetroCheatsActivity.kt
@@ -0,0 +1,359 @@
+package com.winlator.cmod.feature.retro
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.VideogameAsset
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val BgDark = Color(0xFF12121B)
+private val SurfaceDark = Color(0xFF171722)
+private val CardBorder = Color(0xFF2A2A3A)
+private val Accent = Color(0xFF1A9FFF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF93A6BC)
+private val Danger = Color(0xFFE07B6B)
+private val ScrimColor = Color(0xFF000000)
+
+class RetroCheatsActivity : ComponentActivity() {
+    companion object {
+        const val EXTRA_SYSTEM_ID = "system_id"
+        const val EXTRA_GAME_NAME = "game_name"
+    }
+
+    private val navRegistry = PaneNavRegistry()
+    private var restoreNav: (() -> Unit)? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        androidx.core.view.WindowCompat.setDecorFitsSystemWindows(window, false)
+        val controller = androidx.core.view.WindowInsetsControllerCompat(window, window.decorView)
+        controller.hide(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+        controller.systemBarsBehavior =
+            androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        val systemId = intent.getStringExtra(EXTRA_SYSTEM_ID)
+        val gameName = intent.getStringExtra(EXTRA_GAME_NAME) ?: "Retro Game"
+        setContent {
+            com.winlator.cmod.shared.theme.WinNativeTheme {
+                CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+                    RetroCheatsScreen(systemId, gameName) { finish() }
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        restoreNav = window.bindPaneNav(navRegistry, onDismiss = { finish() })
+    }
+
+    override fun onPause() {
+        restoreNav?.invoke()
+        restoreNav = null
+        super.onPause()
+    }
+}
+
+@Composable
+private fun RetroCheatsScreen(
+    systemId: String?,
+    gameName: String,
+    onClose: () -> Unit,
+) {
+    val context = LocalContext.current
+    var cheats by remember { mutableStateOf(RetroCheats.load(context, gameName)) }
+    var editing by remember { mutableStateOf(false) }
+    var editIndex by remember { mutableStateOf(-1) }
+    var draftName by remember { mutableStateOf("") }
+    var draftCode by remember { mutableStateOf("") }
+
+    fun persist(next: List<RetroCheat>) {
+        cheats = next
+        RetroCheats.save(context, gameName, next)
+    }
+
+    BoxWithConstraints(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(ScrimColor.copy(alpha = 0.62f))
+                .windowInsetsPadding(WindowInsets.systemBars),
+        contentAlignment = Alignment.Center,
+    ) {
+        val dialogWidth = (maxWidth - 32.dp).coerceAtMost(560.dp)
+        val dialogHeight = (maxHeight - 40.dp).coerceIn(340.dp, 680.dp)
+        Surface(
+            modifier = Modifier.widthIn(min = 320.dp, max = dialogWidth).fillMaxWidth().height(dialogHeight),
+            shape = RoundedCornerShape(16.dp),
+            color = BgDark,
+            border = BorderStroke(1.dp, CardBorder),
+            tonalElevation = 8.dp,
+        ) {
+            Column(Modifier.fillMaxSize()) {
+                Row(
+                    modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = 12.dp, bottom = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
+                ) {
+                    Box(
+                        Modifier.size(38.dp).background(Accent.copy(alpha = 0.16f), RoundedCornerShape(10.dp)),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(Icons.Outlined.VideogameAsset, contentDescription = null, tint = Accent, modifier = Modifier.size(22.dp))
+                    }
+                    Column(Modifier.weight(1f)) {
+                        Text(stringResource(R.string.retro_che_brand), color = TextSecondary, fontSize = 9.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.sp)
+                        Text(
+                            gameName,
+                            style = MaterialTheme.typography.titleMedium,
+                            color = TextPrimary,
+                            fontWeight = FontWeight.Bold,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                    IconButton(onClick = onClose, modifier = Modifier.size(40.dp).paneNavItem(onActivate = onClose)) {
+                        Icon(Icons.Outlined.Close, contentDescription = "Close", tint = TextSecondary, modifier = Modifier.size(22.dp))
+                    }
+                }
+                Box(Modifier.fillMaxWidth().height(1.dp).background(CardBorder))
+
+                Column(
+                    Modifier.fillMaxWidth().weight(1f).verticalScroll(rememberScrollState()).padding(16.dp),
+                    verticalArrangement = Arrangement.spacedBy(10.dp),
+                ) {
+                    if (editing) {
+                        val fieldColors =
+                            OutlinedTextFieldDefaults.colors(
+                                focusedTextColor = TextPrimary,
+                                unfocusedTextColor = TextPrimary,
+                                cursorColor = Accent,
+                                focusedBorderColor = Accent,
+                                unfocusedBorderColor = CardBorder,
+                                focusedLabelColor = Accent,
+                                unfocusedLabelColor = TextSecondary,
+                                focusedContainerColor = SurfaceDark,
+                                unfocusedContainerColor = SurfaceDark,
+                            )
+                        OutlinedTextField(
+                            value = draftName,
+                            onValueChange = { draftName = it },
+                            label = { Text(stringResource(R.string.retro_che_name)) },
+                            singleLine = true,
+                            colors = fieldColors,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        OutlinedTextField(
+                            value = draftCode,
+                            onValueChange = { draftCode = it },
+                            label = { Text(stringResource(R.string.retro_che_code)) },
+                            colors = fieldColors,
+                            keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.Characters),
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        Text(
+                            RetroCheats.formatHint(systemId),
+                            color = TextSecondary,
+                            style = MaterialTheme.typography.labelSmall,
+                        )
+                        Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth()) {
+                            Button(
+                                onClick = { editing = false },
+                                colors = ButtonDefaults.buttonColors(containerColor = SurfaceDark, contentColor = TextPrimary),
+                                modifier = Modifier.weight(1f).paneNavItem(onActivate = { editing = false }),
+                            ) { Text(stringResource(R.string.retro_che_cancel)) }
+                            Button(
+                                onClick = {
+                                    val name = draftName.ifBlank { context.getString(R.string.retro_che_default_name, cheats.size + 1) }
+                                    val code = draftCode.trim()
+                                    if (code.isNotEmpty()) {
+                                        val entry = RetroCheat(name, code, true)
+                                        val next =
+                                            if (editIndex >= 0 && editIndex < cheats.size) {
+                                                cheats.toMutableList().also { it[editIndex] = entry }
+                                            } else {
+                                                cheats + entry
+                                            }
+                                        persist(next)
+                                    }
+                                    editing = false
+                                },
+                                colors = ButtonDefaults.buttonColors(containerColor = Accent, contentColor = Color.White),
+                                modifier =
+                                    Modifier.weight(1f).paneNavItem(onActivate = {
+                                        val code = draftCode.trim()
+                                        if (code.isNotEmpty()) {
+                                            val entry = RetroCheat(draftName.ifBlank { context.getString(R.string.retro_che_default_name, cheats.size + 1) }, code, true)
+                                            val next =
+                                                if (editIndex >= 0 && editIndex < cheats.size) {
+                                                    cheats.toMutableList().also { it[editIndex] = entry }
+                                                } else {
+                                                    cheats + entry
+                                                }
+                                            persist(next)
+                                        }
+                                        editing = false
+                                    }),
+                            ) { Text(stringResource(R.string.retro_che_save)) }
+                        }
+                    } else {
+                        if (cheats.isEmpty()) {
+                            Text(
+                                stringResource(R.string.retro_che_empty),
+                                color = TextSecondary,
+                                style = MaterialTheme.typography.bodyMedium,
+                                modifier = Modifier.padding(vertical = 8.dp),
+                            )
+                        }
+                        cheats.forEachIndexed { index, cheat ->
+                            CheatRow(
+                                cheat = cheat,
+                                onToggle = {
+                                    persist(cheats.toMutableList().also { it[index] = cheat.copy(enabled = !cheat.enabled) })
+                                },
+                                onEdit = {
+                                    editIndex = index
+                                    draftName = cheat.name
+                                    draftCode = cheat.code
+                                    editing = true
+                                },
+                                onDelete = {
+                                    persist(cheats.toMutableList().also { it.removeAt(index) })
+                                },
+                            )
+                        }
+                        Button(
+                            onClick = {
+                                editIndex = -1
+                                draftName = ""
+                                draftCode = ""
+                                editing = true
+                            },
+                            colors = ButtonDefaults.buttonColors(containerColor = Accent, contentColor = Color.White),
+                            modifier =
+                                Modifier.fillMaxWidth().padding(top = 4.dp).paneNavItem(isEntry = true, onActivate = {
+                                    editIndex = -1
+                                    draftName = ""
+                                    draftCode = ""
+                                    editing = true
+                                }),
+                        ) {
+                            Icon(Icons.Outlined.Add, contentDescription = null, modifier = Modifier.size(18.dp))
+                            Spacer(Modifier.width(8.dp))
+                            Text(stringResource(R.string.retro_che_add))
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun CheatRow(
+    cheat: RetroCheat,
+    onToggle: () -> Unit,
+    onEdit: () -> Unit,
+    onDelete: () -> Unit,
+) {
+    Surface(
+        shape = RoundedCornerShape(12.dp),
+        color = SurfaceDark.copy(alpha = 0.5f),
+        border = BorderStroke(1.dp, CardBorder),
+        modifier = Modifier.fillMaxWidth().paneNavItem(cornerRadius = 12.dp, onActivate = onToggle, onSecondary = onDelete),
+    ) {
+        Row(Modifier.padding(horizontal = 12.dp, vertical = 8.dp), verticalAlignment = Alignment.CenterVertically) {
+            Column(Modifier.weight(1f)) {
+                Text(
+                    cheat.name,
+                    color = TextPrimary,
+                    fontWeight = FontWeight.SemiBold,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Text(
+                    cheat.code,
+                    color = TextSecondary,
+                    style = MaterialTheme.typography.labelSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+            IconButton(onClick = onEdit, modifier = Modifier.size(36.dp)) {
+                Icon(Icons.Outlined.VideogameAsset, contentDescription = "Edit", tint = TextSecondary, modifier = Modifier.size(16.dp))
+            }
+            IconButton(onClick = onDelete, modifier = Modifier.size(36.dp).paneNavItem(onActivate = onDelete)) {
+                Icon(Icons.Outlined.Delete, contentDescription = "Delete", tint = Danger, modifier = Modifier.size(18.dp))
+            }
+            Switch(
+                checked = cheat.enabled,
+                onCheckedChange = { onToggle() },
+                colors =
+                    SwitchDefaults.colors(
+                        checkedThumbColor = Color.White,
+                        checkedTrackColor = Accent,
+                        uncheckedTrackColor = SurfaceDark,
+                        uncheckedBorderColor = CardBorder,
+                    ),
+            )
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroControlLayouts.kt b/app/src/main/feature/retro/RetroControlLayouts.kt
new file mode 100644
index 000000000..b24209f46
--- /dev/null
+++ b/app/src/main/feature/retro/RetroControlLayouts.kt
@@ -0,0 +1,133 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import org.json.JSONObject
+
+data class RetroControlOverride(
+    var x: Float,
+    var y: Float,
+    var scale: Float = 1f,
+    var visible: Boolean = true,
+)
+
+data class RetroCustomColors(
+    var body: Int? = null,
+    var button: Int? = null,
+    var text: Int? = null,
+    var shadow: Int? = null,
+)
+
+object RetroControlLayouts {
+    private fun layoutKey(
+        systemId: String,
+        portrait: Boolean,
+    ) = "retro_layout_v1_${systemId}_${if (portrait) "port" else "land"}"
+
+    private fun colorsKey(systemId: String) = "retro_colors_v1_$systemId"
+
+    fun load(
+        context: Context,
+        systemId: String?,
+        portrait: Boolean,
+    ): MutableMap<String, RetroControlOverride> {
+        val result = mutableMapOf<String, RetroControlOverride>()
+        if (systemId == null) return result
+        val json =
+            PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getString(layoutKey(systemId, portrait), null) ?: return result
+        runCatching {
+            val obj = JSONObject(json)
+            obj.keys().forEach { id ->
+                val c = obj.getJSONObject(id)
+                result[id] =
+                    RetroControlOverride(
+                        c.optDouble("x", 0.5).toFloat(),
+                        c.optDouble("y", 0.5).toFloat(),
+                        c.optDouble("s", 1.0).toFloat(),
+                        c.optBoolean("v", true),
+                    )
+            }
+        }
+        return result
+    }
+
+    fun save(
+        context: Context,
+        systemId: String?,
+        portrait: Boolean,
+        map: Map<String, RetroControlOverride>,
+    ) {
+        if (systemId == null) return
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        if (map.isEmpty()) {
+            prefs.edit().remove(layoutKey(systemId, portrait)).apply()
+            return
+        }
+        val obj = JSONObject()
+        map.forEach { (id, o) ->
+            obj.put(
+                id,
+                JSONObject()
+                    .put("x", o.x.toDouble())
+                    .put("y", o.y.toDouble())
+                    .put("s", o.scale.toDouble())
+                    .put("v", o.visible),
+            )
+        }
+        prefs.edit().putString(layoutKey(systemId, portrait), obj.toString()).apply()
+    }
+
+    fun reset(
+        context: Context,
+        systemId: String?,
+        portrait: Boolean,
+    ) {
+        if (systemId == null) return
+        PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .edit()
+            .remove(layoutKey(systemId, portrait))
+            .apply()
+    }
+
+    fun loadColors(
+        context: Context,
+        systemId: String?,
+    ): RetroCustomColors {
+        val colors = RetroCustomColors()
+        if (systemId == null) return colors
+        val json =
+            PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getString(colorsKey(systemId), null) ?: return colors
+        runCatching {
+            val obj = JSONObject(json)
+            if (obj.has("body")) colors.body = obj.getInt("body")
+            if (obj.has("button")) colors.button = obj.getInt("button")
+            if (obj.has("text")) colors.text = obj.getInt("text")
+            if (obj.has("shadow")) colors.shadow = obj.getInt("shadow")
+        }
+        return colors
+    }
+
+    fun saveColors(
+        context: Context,
+        systemId: String?,
+        colors: RetroCustomColors,
+    ) {
+        if (systemId == null) return
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        if (colors.body == null && colors.button == null && colors.text == null && colors.shadow == null) {
+            prefs.edit().remove(colorsKey(systemId)).apply()
+            return
+        }
+        val obj = JSONObject()
+        colors.body?.let { obj.put("body", it) }
+        colors.button?.let { obj.put("button", it) }
+        colors.text?.let { obj.put("text", it) }
+        colors.shadow?.let { obj.put("shadow", it) }
+        prefs.edit().putString(colorsKey(systemId), obj.toString()).apply()
+    }
+}
diff --git a/app/src/main/feature/retro/RetroControlsMenu.kt b/app/src/main/feature/retro/RetroControlsMenu.kt
new file mode 100644
index 000000000..697e15c55
--- /dev/null
+++ b/app/src/main/feature/retro/RetroControlsMenu.kt
@@ -0,0 +1,153 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.widget.Toast
+import com.winlator.cmod.R
+
+object RetroControlsMenu {
+    class Host(
+        val context: Context,
+        val overlay: RetroInputView?,
+        val menu: RetroMenuController,
+        val systemId: String?,
+        val touchControls: () -> Boolean,
+        val onTouchControls: (Boolean) -> Unit,
+        val adaptiveSticks: () -> Boolean,
+        val onAdaptiveSticks: (Boolean) -> Unit,
+        val orientationLabel: () -> String,
+        val onCloseMenu: () -> Unit,
+        val showStickInversion: Boolean = false,
+    )
+
+    fun l3r3PrefKey(systemId: String?) = "retro_show_l3r3_" + (systemId ?: "default")
+
+    fun build(host: Host): List<RetroMenuEntry> =
+        buildList {
+            val context = host.context
+            add(
+                RetroMenuEntry.Toggle(
+                    context.getString(R.string.retro_lr_on_screen_controls),
+                    checked = host.touchControls(),
+                ) { value ->
+                    host.onTouchControls(value)
+                    host.menu.rebuild()
+                },
+            )
+            if (host.showStickInversion) {
+                val invPrefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+                val sys = host.systemId ?: "default"
+                fun invToggle(label: String, key: String) =
+                    RetroMenuEntry.Toggle(label, checked = invPrefs.getBoolean(key, false)) { value ->
+                        invPrefs.edit().putBoolean(key, value).apply()
+                        host.overlay?.loadStickInversion()
+                        host.menu.rebuild()
+                    }
+                add(invToggle(context.getString(R.string.retro_lr_left_stick_invert_x), "retro_inv_lx_$sys"))
+                add(invToggle(context.getString(R.string.retro_lr_left_stick_invert_y), "retro_inv_ly_$sys"))
+                add(invToggle(context.getString(R.string.retro_lr_right_stick_invert_x), "retro_inv_rx_$sys"))
+                add(invToggle(context.getString(R.string.retro_lr_right_stick_invert_y), "retro_inv_ry_$sys"))
+            }
+            add(
+                RetroMenuEntry.Toggle(
+                    context.getString(R.string.retro_lr_adaptive_sticks),
+                    checked = host.adaptiveSticks(),
+                ) { value ->
+                    host.onAdaptiveSticks(value)
+                    host.overlay?.adaptiveSticks = value
+                    host.menu.rebuild()
+                },
+            )
+            if (host.overlay?.supportsStickButtons == true) {
+                val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+                val key = l3r3PrefKey(host.systemId)
+                add(
+                    RetroMenuEntry.Toggle(
+                        context.getString(R.string.retro_ps2_show_l3r3),
+                        checked = prefs.getBoolean(key, true),
+                    ) { value ->
+                        prefs.edit().putBoolean(key, value).apply()
+                        host.overlay.showL3R3 = value
+                        host.menu.rebuild()
+                    },
+                )
+            }
+            add(
+                RetroMenuEntry.Slider(
+                    label = context.getString(R.string.retro_lr_haptic_feedback),
+                    valueText = host.overlay?.hapticStrength?.let { "${(it * 100).toInt()}%" } ?: "0%",
+                    value = host.overlay?.hapticStrength ?: 0f,
+                    min = 0f,
+                    max = 1f,
+                    step = 0.05f,
+                ) { value ->
+                    host.overlay?.hapticStrength = value
+                    androidx.preference.PreferenceManager
+                        .getDefaultSharedPreferences(context)
+                        .edit()
+                        .putFloat("retro_haptic_strength", value)
+                        .apply()
+                    host.menu.rebuild()
+                },
+            )
+            val orientationLabel = host.orientationLabel()
+            add(
+                RetroMenuEntry.Action(
+                    context.getString(R.string.retro_lr_edit_layout, orientationLabel),
+                    RetroDrawerIcons.EditLayout,
+                ) {
+                    host.onCloseMenu()
+                    host.overlay?.let {
+                        it.visibility = android.view.View.VISIBLE
+                        it.enterEdit()
+                    }
+                },
+            )
+            add(
+                RetroMenuEntry.Action(
+                    context.getString(R.string.retro_lr_reset_layout, orientationLabel),
+                    RetroDrawerIcons.Reset,
+                ) {
+                    host.overlay?.resetLayout()
+                    Toast
+                        .makeText(context, context.getString(R.string.retro_lr_layout_reset, orientationLabel), Toast.LENGTH_SHORT)
+                        .show()
+                },
+            )
+            val colors = RetroControlLayouts.loadColors(context, host.systemId)
+            fun persistColors(mutate: (RetroCustomColors) -> Unit) {
+                mutate(colors)
+                RetroControlLayouts.saveColors(context, host.systemId, colors)
+                host.overlay?.setCustomColors(colors)
+                host.menu.rebuild()
+            }
+            add(
+                RetroMenuEntry.ColorPick(context.getString(R.string.retro_lr_button_color), colors.button) { value ->
+                    persistColors { it.button = value }
+                },
+            )
+            add(
+                RetroMenuEntry.ColorPick(context.getString(R.string.retro_lr_letter_color), colors.text) { value ->
+                    persistColors { it.text = value }
+                },
+            )
+            add(
+                RetroMenuEntry.ColorPick(context.getString(R.string.retro_lr_shadow_color), colors.shadow) { value ->
+                    persistColors { it.shadow = value }
+                },
+            )
+            add(
+                RetroMenuEntry.ColorPick(context.getString(R.string.retro_lr_background_color), colors.body) { value ->
+                    persistColors { it.body = value }
+                },
+            )
+            add(
+                RetroMenuEntry.Action(context.getString(R.string.retro_lr_reset_colors), RetroDrawerIcons.Reset) {
+                    val fresh = RetroCustomColors()
+                    RetroControlLayouts.saveColors(context, host.systemId, fresh)
+                    host.overlay?.setCustomColors(fresh)
+                    host.menu.rebuild()
+                    Toast.makeText(context, context.getString(R.string.retro_lr_colors_reset), Toast.LENGTH_SHORT).show()
+                },
+            )
+        }
+}
diff --git a/app/src/main/feature/retro/RetroCoreCatalog.kt b/app/src/main/feature/retro/RetroCoreCatalog.kt
new file mode 100644
index 000000000..bdb6d7978
--- /dev/null
+++ b/app/src/main/feature/retro/RetroCoreCatalog.kt
@@ -0,0 +1,3228 @@
+package com.winlator.cmod.feature.retro
+
+import com.winlator.cmod.R
+
+internal object RetroCoreCatalog {
+    val FCEUMM: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "fceumm_arkanoid_mode",
+            label = "Arkanoid Mode",
+            values = listOf("abs_mouse", "mouse", "stelladaptor", "touchscreen"),
+            valueLabels = listOf("Absolute mouse", "Mouse", "Stelladaptor", "Touchscreen"),
+            defaultValue = "mouse",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_mouse_sensitivity",
+            label = "Mouse Sensitivity",
+            values = listOf("20", "30", "40", "50", "60", "70", "80", "90", "100", "110", "120", "130", "140", "150", "160", "170", "180", "190", "200"),
+            valueLabels = listOf("20", "30", "40", "50", "60", "70", "80", "90", "100", "110", "120", "130", "140", "150", "160", "170", "180", "190", "200"),
+            defaultValue = "100",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_show_crosshair",
+            label = "Show Zapper Crosshair",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_turbo_delay",
+            label = "Turbo Delay (in frames)",
+            values = listOf("1", "2", "3", "5", "10", "15", "30", "60"),
+            valueLabels = listOf("1", "2", "3", "5", "10", "15", "30", "60"),
+            defaultValue = "3",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_turbo_enable",
+            label = "Turbo Enable",
+            values = listOf("None", "Player 1", "Player 2", "Both"),
+            valueLabels = listOf("None", "Player 1", "Player 2", "Both"),
+            defaultValue = "None",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_up_down_allowed",
+            label = "Allow Opposing Directions",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_zapper_mode",
+            label = "Zapper Mode",
+            values = listOf("clightgun", "stlightgun", "touchscreen", "mouse"),
+            valueLabels = listOf("Crosshair light gun", "Sequential Targets light gun", "Touchscreen", "Mouse"),
+            defaultValue = "clightgun",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_zapper_sensor",
+            label = "Invert Zapper Sensor Signal",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_zapper_tolerance",
+            label = "Zapper Tolerance",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20"),
+            defaultValue = "6",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_zapper_trigger",
+            label = "Invert Zapper Trigger Signal",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_aspect",
+            label = "Aspect Ratio",
+            values = listOf("8:7 PAR", "4:3", "PP"),
+            valueLabels = listOf("8:7 PAR", "4:3", "Pixel Perfect"),
+            defaultValue = "8:7 PAR",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_aspect_ratio,
+        ),
+        RetroCoreOption(
+            key = "fceumm_ntsc_filter",
+            label = "NTSC Filter",
+            values = listOf("disabled", "composite", "svideo", "rgb", "monochrome"),
+            valueLabels = listOf("disabled", "Composite", "S-Video", "RGB", "Monochrome"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_overscan_h_left",
+            label = "Crop Horizontal Left Overscan",
+            values = listOf("0", "4", "8", "12", "16"),
+            valueLabels = listOf("0", "4", "8", "12", "16"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_overscan_h_right",
+            label = "Crop Horizontal Right Overscan",
+            values = listOf("0", "4", "8", "12", "16"),
+            valueLabels = listOf("0", "4", "8", "12", "16"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_overscan_v_bottom",
+            label = "Crop Vertical Bottom Overscan",
+            values = listOf("0", "4", "8", "12", "16", "20", "24"),
+            valueLabels = listOf("0", "4", "8", "12", "16", "20", "24"),
+            defaultValue = "8",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_overscan_v_top",
+            label = "Crop Vertical Top Overscan",
+            values = listOf("0", "4", "8", "12", "16", "20", "24"),
+            valueLabels = listOf("0", "4", "8", "12", "16", "20", "24"),
+            defaultValue = "8",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_palette",
+            label = "Color Palette",
+            values = listOf("default", "asqrealc", "restored-wii-vc", "wii-vc", "rgb", "yuv-v3", "unsaturated-final", "sony-cxa2025as-us", "pal", "bmf-final2", "bmf-final3", "smooth-fbx", "composite-direct-fbx", "pvm-style-d93-fbx", "ntsc-hardware-fbx", "nes-classic-fbx-fs", "nescap", "wavebeam", "digital-prime-fbx", "magnum-fbx", "smooth-v2-fbx", "nes-classic-fbx", "royaltea", "mugicha", "raw", "custom"),
+            valueLabels = listOf("Default", "AspiringSquire's Real", "Restored Wii VC", "Wii Virtual Console", "Nintendo RGB PPU", "FBX's YUV-V3", "FBX's Unsaturated-Final", "Sony CXA2025AS US", "PAL", "BMF's Final 2", "BMF's Final 3", "FBX's Smooth", "FBX's Composite Direct", "FBX's PVM Style D93", "FBX's NTSC Hardware", "FBX's NES Classic (fixed)", "RGBSource's NESCAP", "nakedarthur's Wavebeam", "FBX's Digital Prime", "FBX's Magnum", "FBX's Smooth V2", "FBX's NES Classic", "Royaltea (PVM-2530)", "Mugicha", "Raw", "Custom"),
+            defaultValue = "default",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_nospritelimit",
+            label = "No Sprite Limit",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_overclocking",
+            label = "Overclock",
+            values = listOf("disabled", "2x-Postrender", "2x-VBlank"),
+            valueLabels = listOf("disabled", "2x-Postrender", "2x-VBlank"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_ramstate",
+            label = "RAM Power-On Fill (Restart Required)",
+            values = listOf("fill \$ff", "fill \$00", "random"),
+            valueLabels = listOf("\$FF", "\$00", "Random"),
+            defaultValue = "fill \$ff",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_1",
+            label = "Audio Channel 1 (Square 1)",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_2",
+            label = "Audio Channel 2 (Square 2)",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_3",
+            label = "Audio Channel 3 (Triangle)",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_4",
+            label = "Audio Channel 4 (Noise)",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_5",
+            label = "Audio Channel 5 (PCM)",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_fds",
+            label = "Channel Volume (FDS)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_mmc5",
+            label = "Channel Volume (MMC5)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_n163",
+            label = "Channel Volume (N163)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_s5b",
+            label = "Channel Volume (S5B)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_vrc6",
+            label = "Channel Volume (VRC6)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_apu_vrc7",
+            label = "Channel Volume (VRC7)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_reducedmcpopping",
+            label = "Reduce DMC Channel Popping",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_removetrianglenoise",
+            label = "Reduce Triangle Channel Popping",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_sndlowpass",
+            label = "Audio RF Filter",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_sndquality",
+            label = "Sound Quality",
+            values = listOf("Low", "High", "Very High"),
+            valueLabels = listOf("Low", "High", "Very High"),
+            defaultValue = "Low",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_sndrate_hint",
+            label = "Sound Samplerate (Hint)",
+            values = listOf("Auto", "32KHz", "44KHz", "48KHz", "96KHz"),
+            valueLabels = listOf("Auto", "32KHz", "44KHz", "48KHz", "96KHz"),
+            defaultValue = "Auto",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_sndstereodelay",
+            label = "Stereo Sound Effect",
+            values = listOf("disabled", "01_ms_delay", "02_ms_delay", "03_ms_delay", "04_ms_delay", "05_ms_delay", "06_ms_delay", "07_ms_delay", "08_ms_delay", "09_ms_delay", "10_ms_delay", "11_ms_delay", "12_ms_delay", "13_ms_delay", "14_ms_delay", "15_ms_delay", "16_ms_delay", "17_ms_delay", "18_ms_delay", "19_ms_delay", "20_ms_delay", "21_ms_delay", "22_ms_delay", "23_ms_delay", "24_ms_delay", "25_ms_delay", "26_ms_delay", "27_ms_delay", "28_ms_delay", "29_ms_delay", "30_ms_delay", "31_ms_delay", "32_ms_delay"),
+            valueLabels = listOf("disabled", "1ms Delay", "2ms Delay", "3ms Delay", "4ms Delay", "5ms Delay", "6ms Delay", "7ms Delay", "8ms Delay", "9ms Delay", "10ms Delay", "11ms Delay", "12ms Delay", "13ms Delay", "14ms Delay", "15ms Delay (Default)", "16ms Delay", "17ms Delay", "18ms Delay", "19ms Delay", "20ms Delay", "21ms Delay", "22ms Delay", "23ms Delay", "24ms Delay", "25ms Delay", "26ms Delay", "27ms Delay", "28ms Delay", "29ms Delay", "30ms Delay", "31ms Delay", "32ms Delay"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_sndvolume",
+            label = "Master Volume",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            valueLabels = listOf("0%", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%"),
+            defaultValue = "7",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "fceumm_swapduty",
+            label = "Swap Audio Duty Cycles",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_game_genie",
+            label = "Game Genie Add-On (Restart Required)",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "fceumm_region",
+            label = "Region",
+            values = listOf("Auto", "NTSC", "PAL", "Dendy"),
+            valueLabels = listOf("Auto", "NTSC", "PAL", "Dendy"),
+            defaultValue = "Auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+    )
+
+    val SNES9X: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "snes9x_justifier1_color",
+            label = "Justifier 1 Color",
+            values = listOf("Blue", "Blue (blend)", "Violet", "Violet (blend)", "Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)", "White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)"),
+            valueLabels = listOf("Blue", "Blue (blend)", "Violet", "Violet (blend)", "Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)", "White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)"),
+            defaultValue = "Blue",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_justifier1_crosshair",
+            label = "Justifier 1 Crosshair",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            defaultValue = "4",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_justifier2_color",
+            label = "Justifier 2 Color",
+            values = listOf("Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)", "White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)", "Blue", "Blue (blend)", "Violet", "Violet (blend)"),
+            valueLabels = listOf("Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)", "White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)", "Blue", "Blue (blend)", "Violet", "Violet (blend)"),
+            defaultValue = "Pink",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_justifier2_crosshair",
+            label = "Justifier 2 Crosshair",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            defaultValue = "4",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_lightgun_mode",
+            label = "Light Gun Mode",
+            values = listOf("Lightgun", "Touchscreen"),
+            valueLabels = listOf("Light Gun", "Touchscreen"),
+            defaultValue = "Lightgun",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_rifle_color",
+            label = "M.A.C.S. Rifle Color",
+            values = listOf("White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)", "Blue", "Blue (blend)", "Violet", "Violet (blend)", "Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)"),
+            valueLabels = listOf("White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)", "Blue", "Blue (blend)", "Violet", "Violet (blend)", "Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)"),
+            defaultValue = "White",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_rifle_crosshair",
+            label = "M.A.C.S. Rifle Crosshair",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            defaultValue = "2",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_superscope_color",
+            label = "Super Scope Color",
+            values = listOf("White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)", "Blue", "Blue (blend)", "Violet", "Violet (blend)", "Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)"),
+            valueLabels = listOf("White", "White (blend)", "Red", "Red (blend)", "Orange", "Orange (blend)", "Yellow", "Yellow (blend)", "Green", "Green (blend)", "Cyan", "Cyan (blend)", "Sky", "Sky (blend)", "Blue", "Blue (blend)", "Violet", "Violet (blend)", "Pink", "Pink (blend)", "Purple", "Purple (blend)", "Black", "Black (blend)", "25% Grey", "25% Grey (blend)", "50% Grey", "50% Grey (blend)", "75% Grey", "75% Grey (blend)"),
+            defaultValue = "White",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_superscope_crosshair",
+            label = "Super Scope Crosshair",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            defaultValue = "2",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_superscope_reverse_buttons",
+            label = "Super Scope Reverse Trigger Buttons",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_up_down_allowed",
+            label = "Allow Opposing Directions",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_aspect",
+            label = "Preferred Aspect Ratio",
+            values = listOf("4:3", "4:3 scaled", "uncorrected", "auto", "ntsc", "pal"),
+            valueLabels = listOf("4:3", "4:3 (Preserved)", "Uncorrected", "Auto", "NTSC", "PAL"),
+            defaultValue = "4:3",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_hires_blend",
+            label = "Hi-Res Blending",
+            values = listOf("disabled", "merge", "blur"),
+            valueLabels = listOf("disabled", "Merge", "Blur"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_overscan",
+            label = "Crop Overscan",
+            values = listOf("enabled", "12_pixels", "16_pixels", "auto", "disabled"),
+            valueLabels = listOf("~8 Pixels", "12 Pixels", "16 Pixels", "Auto (~8 Pixels)", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_block_invalid_vram_access",
+            label = "Block Invalid VRAM Access",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_echo_buffer_hack",
+            label = "Echo Buffer Hack (Unsafe, only enable for old addmusic hacks)",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_overclock_cycles",
+            label = "Reduce Slowdown (Hack, Unsafe)",
+            values = listOf("disabled", "light", "compatible", "max"),
+            valueLabels = listOf("disabled", "Light", "Compatible", "Max"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_overclock_superfx",
+            label = "SuperFX Overclocking",
+            values = listOf("50%", "60%", "70%", "80%", "90%", "100%", "150%", "200%", "250%", "300%", "350%", "400%", "450%", "500%"),
+            valueLabels = listOf("50%", "60%", "70%", "80%", "90%", "100%", "150%", "200%", "250%", "300%", "350%", "400%", "450%", "500%"),
+            defaultValue = "100%",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_randomize_memory",
+            label = "Randomize Memory (Unsafe)",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_reduce_sprite_flicker",
+            label = "Reduce Flickering (Hack, Unsafe)",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_audio_interpolation",
+            label = "Audio Interpolation",
+            values = listOf("gaussian", "cubic", "sinc", "none", "linear"),
+            valueLabels = listOf("Gaussian", "Cubic", "Sinc", "None", "Linear"),
+            defaultValue = "gaussian",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "snes9x_gfx_clip",
+            label = "Enable Graphic Clip Windows",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_gfx_transp",
+            label = "Enable Transparency Effects",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_layer_1",
+            label = "Show Layer 1",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_layer_2",
+            label = "Show Layer 2",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_layer_3",
+            label = "Show Layer 3",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_layer_4",
+            label = "Show Layer 4",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_layer_5",
+            label = "Show Sprite Layer",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_1",
+            label = "Volume % for Sound Channel 1",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_2",
+            label = "Volume % for Sound Channel 2",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_3",
+            label = "Volume % for Sound Channel 3",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_4",
+            label = "Volume % for Sound Channel 4",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_5",
+            label = "Volume % for Sound Channel 5",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_6",
+            label = "Volume % for Sound Channel 6",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_7",
+            label = "Volume % for Sound Channel 7",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_sndchan_volume_8",
+            label = "Volume % for Sound Channel 8",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "snes9x_blargg",
+            label = "Blargg NTSC Filter",
+            values = listOf("disabled", "monochrome", "rf", "composite", "s-video", "rgb"),
+            valueLabels = listOf("disabled", "Monochrome", "RF", "Composite", "S-Video", "RGB"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+            labelRes = R.string.retro_co_ntsc_filter,
+        ),
+        RetroCoreOption(
+            key = "snes9x_region",
+            label = "Console Region (Reload Core)",
+            values = listOf("auto", "ntsc", "pal"),
+            valueLabels = listOf("Auto", "NTSC", "PAL"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+    )
+
+    val GAMBATTE: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "gambatte_gb_link_mode",
+            label = "Game Link Mode",
+            values = listOf("Not Connected", "Network Server", "Network Client"),
+            valueLabels = listOf("Not Connected", "Network Server", "Network Client"),
+            defaultValue = "Not Connected",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_link_network_port",
+            label = "Network Link Port",
+            values = listOf("56400", "56401", "56402", "56403", "56404", "56405", "56406", "56407", "56408", "56409", "56410", "56411", "56412", "56413", "56414", "56415", "56416", "56417", "56418", "56419", "56420"),
+            valueLabels = listOf("56400", "56401", "56402", "56403", "56404", "56405", "56406", "56407", "56408", "56409", "56410", "56411", "56412", "56413", "56414", "56415", "56416", "56417", "56418", "56419", "56420"),
+            defaultValue = "56400",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_rumble_level",
+            label = "Controller Rumble Strength",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            defaultValue = "10",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_turbo_period",
+            label = "Turbo Button Period",
+            values = listOf("4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120"),
+            valueLabels = listOf("4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120"),
+            defaultValue = "4",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_up_down_allowed",
+            label = "Allow Opposing Directions",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_dark_filter_level",
+            label = "Dark Filter Level (%)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_colorization",
+            label = "GB Colorization",
+            values = listOf("disabled", "auto", "GBC", "SGB", "internal", "custom"),
+            valueLabels = listOf("disabled", "Auto", "GBC", "SGB", "Internal", "Custom"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_colorization,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_internal_palette",
+            label = "Internal Palette",
+            values = listOf("GB - DMG", "GB - Pocket", "GB - Light", "GBC - Blue", "GBC - Brown", "GBC - Dark Blue", "GBC - Dark Brown", "GBC - Dark Green", "GBC - Grayscale", "GBC - Green", "GBC - Inverted", "GBC - Orange", "GBC - Pastel Mix", "GBC - Red", "GBC - Yellow", "SGB - 1A", "SGB - 1B", "SGB - 1C", "SGB - 1D", "SGB - 1E", "SGB - 1F", "SGB - 1G", "SGB - 1H", "SGB - 2A", "SGB - 2B", "SGB - 2C", "SGB - 2D", "SGB - 2E", "SGB - 2F", "SGB - 2G", "SGB - 2H", "SGB - 3A", "SGB - 3B", "SGB - 3C", "SGB - 3D", "SGB - 3E", "SGB - 3F", "SGB - 3G", "SGB - 3H", "SGB - 4A", "SGB - 4B", "SGB - 4C", "SGB - 4D", "SGB - 4E", "SGB - 4F", "SGB - 4G", "SGB - 4H", "Special 1", "Special 2", "Special 3", "Special 4 (TI-83 Legacy)", "TWB64 - Pack 1", "TWB64 - Pack 2", "TWB64 - Pack 3", "PixelShift - Pack 1"),
+            valueLabels = listOf("GB - DMG", "GB - Pocket", "GB - Light", "GBC - Blue", "GBC - Brown", "GBC - Dark Blue", "GBC - Dark Brown", "GBC - Dark Green", "GBC - Grayscale", "GBC - Green", "GBC - Inverted", "GBC - Orange", "GBC - Pastel Mix", "GBC - Red", "GBC - Yellow", "SGB - 1A", "SGB - 1B", "SGB - 1C", "SGB - 1D", "SGB - 1E", "SGB - 1F", "SGB - 1G", "SGB - 1H", "SGB - 2A", "SGB - 2B", "SGB - 2C", "SGB - 2D", "SGB - 2E", "SGB - 2F", "SGB - 2G", "SGB - 2H", "SGB - 3A", "SGB - 3B", "SGB - 3C", "SGB - 3D", "SGB - 3E", "SGB - 3F", "SGB - 3G", "SGB - 3H", "SGB - 4A", "SGB - 4B", "SGB - 4C", "SGB - 4D", "SGB - 4E", "SGB - 4F", "SGB - 4G", "SGB - 4H", "Special 1", "Special 2", "Special 3", "Special 4 (TI-83 Legacy)", "TWB64 - Pack 1", "TWB64 - Pack 2", "TWB64 - Pack 3", "PixelShift - Pack 1"),
+            defaultValue = "GB - DMG",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_palette_pixelshift_1",
+            label = "> PixelShift - Pack 1 Palette",
+            values = listOf("PixelShift 01 - Arctic Green", "PixelShift 02 - Arduboy", "PixelShift 03 - BGB 0.3 Emulator", "PixelShift 04 - Camouflage", "PixelShift 05 - Chocolate Bar", "PixelShift 06 - CMYK", "PixelShift 07 - Cotton Candy", "PixelShift 08 - Easy Greens", "PixelShift 09 - Gamate", "PixelShift 10 - Game Boy Light", "PixelShift 11 - Game Boy Pocket", "PixelShift 12 - Game Boy Pocket Alt", "PixelShift 13 - Game Pocket Computer", "PixelShift 14 - Game & Watch Ball", "PixelShift 15 - GB Backlight Blue", "PixelShift 16 - GB Backlight Faded", "PixelShift 17 - GB Backlight Orange", "PixelShift 18 - GB Backlight White", "PixelShift 19 - GB Backlight Yellow Dark", "PixelShift 20 - GB Bootleg", "PixelShift 21 - GB Hunter", "PixelShift 22 - GB Kiosk", "PixelShift 23 - GB Kiosk 2", "PixelShift 24 - GB New", "PixelShift 25 - GB Nuked", "PixelShift 26 - GB Old", "PixelShift 27 - GBP Bivert", "PixelShift 28 - GB Washed Yellow Backlight", "PixelShift 29 - Ghost", "PixelShift 30 - Glow In The Dark", "PixelShift 31 - Gold Bar", "PixelShift 32 - Grapefruit", "PixelShift 33 - Gray Green Mix", "PixelShift 34 - Missingno", "PixelShift 35 - MS-Dos", "PixelShift 36 - Newspaper", "PixelShift 37 - Pip-Boy", "PixelShift 38 - Pocket Girl", "PixelShift 39 - Silhouette", "PixelShift 40 - Sunburst", "PixelShift 41 - Technicolor", "PixelShift 42 - Tron", "PixelShift 43 - Vaporwave", "PixelShift 44 - Virtual Boy", "PixelShift 45 - Wish"),
+            valueLabels = listOf("PixelShift 01 - Arctic Green", "PixelShift 02 - Arduboy", "PixelShift 03 - BGB 0.3 Emulator", "PixelShift 04 - Camouflage", "PixelShift 05 - Chocolate Bar", "PixelShift 06 - CMYK", "PixelShift 07 - Cotton Candy", "PixelShift 08 - Easy Greens", "PixelShift 09 - Gamate", "PixelShift 10 - Game Boy Light", "PixelShift 11 - Game Boy Pocket", "PixelShift 12 - Game Boy Pocket Alt", "PixelShift 13 - Game Pocket Computer", "PixelShift 14 - Game & Watch Ball", "PixelShift 15 - GB Backlight Blue", "PixelShift 16 - GB Backlight Faded", "PixelShift 17 - GB Backlight Orange", "PixelShift 18 - GB Backlight White", "PixelShift 19 - GB Backlight Yellow Dark", "PixelShift 20 - GB Bootleg", "PixelShift 21 - GB Hunter", "PixelShift 22 - GB Kiosk", "PixelShift 23 - GB Kiosk 2", "PixelShift 24 - GB New", "PixelShift 25 - GB Nuked", "PixelShift 26 - GB Old", "PixelShift 27 - GBP Bivert", "PixelShift 28 - GB Washed Yellow Backlight", "PixelShift 29 - Ghost", "PixelShift 30 - Glow In The Dark", "PixelShift 31 - Gold Bar", "PixelShift 32 - Grapefruit", "PixelShift 33 - Gray Green Mix", "PixelShift 34 - Missingno", "PixelShift 35 - MS-Dos", "PixelShift 36 - Newspaper", "PixelShift 37 - Pip-Boy", "PixelShift 38 - Pocket Girl", "PixelShift 39 - Silhouette", "PixelShift 40 - Sunburst", "PixelShift 41 - Technicolor", "PixelShift 42 - Tron", "PixelShift 43 - Vaporwave", "PixelShift 44 - Virtual Boy", "PixelShift 45 - Wish"),
+            defaultValue = "PixelShift 01 - Arctic Green",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_palette_twb64_1",
+            label = "> TWB64 - Pack 1 Palette",
+            values = listOf("TWB64 001 - Aqours Blue", "TWB64 002 - Anime Expo Ver.", "TWB64 003 - SpongeBob Yellow", "TWB64 004 - Patrick Star Pink", "TWB64 005 - Neon Red", "TWB64 006 - Neon Blue", "TWB64 007 - Neon Yellow", "TWB64 008 - Neon Green", "TWB64 009 - Neon Pink", "TWB64 010 - Mario Red", "TWB64 011 - Nick Orange", "TWB64 012 - Virtual Vision", "TWB64 013 - Golden Wild", "TWB64 014 - DMG-099", "TWB64 015 - Classic Blurple", "TWB64 016 - 765 Production Ver.", "TWB64 017 - Superball Ivory", "TWB64 018 - Crunchyroll Orange", "TWB64 019 - Muse Pink", "TWB64 020 - School Idol Blue", "TWB64 021 - Gamate Ver.", "TWB64 022 - Greenscale Ver.", "TWB64 023 - Odyssey Gold", "TWB64 024 - Super Saiyan God", "TWB64 025 - Super Saiyan Blue", "TWB64 026 - ANIMAX BLUE", "TWB64 027 - BMO Ver.", "TWB64 028 - Game.com Ver.", "TWB64 029 - Sanrio Pink", "TWB64 030 - Timmy Turner Pink", "TWB64 031 - Fairly OddPalette", "TWB64 032 - Danny Phantom Silver", "TWB64 033 - Link's Awakening DX Ver.", "TWB64 034 - Travel Wood", "TWB64 035 - Pokemon Ver.", "TWB64 036 - Game Grump Orange", "TWB64 037 - Scooby-Doo Mystery Ver.", "TWB64 038 - Pokemon mini Ver.", "TWB64 039 - Supervision Ver.", "TWB64 040 - DMG Ver.", "TWB64 041 - Pocket Ver.", "TWB64 042 - Light Ver.", "TWB64 043 - All Might Hero Palette", "TWB64 044 - U.A. High School Uniform", "TWB64 045 - Pikachu Yellow", "TWB64 046 - Eevee Brown", "TWB64 047 - Microvision Ver.", "TWB64 048 - TI-83 Ver.", "TWB64 049 - Aegis Cherry", "TWB64 050 - Labo Fawn", "TWB64 051 - MILLION LIVE GOLD!", "TWB64 052 - Squidward Sea Foam Green", "TWB64 053 - VMU Ver.", "TWB64 054 - Game Master Ver.", "TWB64 055 - Android Green", "TWB64 056 - Amazon Vision", "TWB64 057 - Google Red", "TWB64 058 - Google Blue", "TWB64 059 - Google Yellow", "TWB64 060 - Google Green", "TWB64 061 - WonderSwan Ver.", "TWB64 062 - Neo Geo Pocket Ver.", "TWB64 063 - Dew Green", "TWB64 064 - Coca-Cola Vision", "TWB64 065 - GameKing Ver.", "TWB64 066 - Do The Dew Ver.", "TWB64 067 - Digivice Ver.", "TWB64 068 - Bikini Bottom Ver.", "TWB64 069 - Blossom Pink", "TWB64 070 - Bubbles Blue", "TWB64 071 - Buttercup Green", "TWB64 072 - NASCAR Ver.", "TWB64 073 - Lemon-Lime Green", "TWB64 074 - Mega Man V Ver.", "TWB64 075 - Tamagotchi Ver.", "TWB64 076 - Phantom Red", "TWB64 077 - Halloween Ver.", "TWB64 078 - Christmas Ver.", "TWB64 079 - Cardcaptor Pink", "TWB64 080 - Pretty Guardian Gold", "TWB64 081 - Camouflage Ver.", "TWB64 082 - Legendary Super Saiyan", "TWB64 083 - Super Saiyan Rose", "TWB64 084 - Super Saiyan", "TWB64 085 - Perfected Ultra Instinct", "TWB64 086 - Saint Snow Red", "TWB64 087 - Yellow Banana", "TWB64 088 - Green Banana", "TWB64 089 - Super Saiyan 3", "TWB64 090 - Super Saiyan Blue Evolved", "TWB64 091 - Pocket Tales Ver.", "TWB64 092 - Investigation Yellow", "TWB64 093 - S.E.E.S. Blue", "TWB64 094 - Ultra Instinct Sign", "TWB64 095 - Hokage Orange", "TWB64 096 - Straw Hat Red", "TWB64 097 - Sword Art Cyan", "TWB64 098 - Deku Alpha Emerald", "TWB64 099 - Blue Stripes Ver.", "TWB64 100 - Precure Marble Raspberry"),
+            valueLabels = listOf("TWB64 001 - Aqours Blue", "TWB64 002 - Anime Expo Ver.", "TWB64 003 - SpongeBob Yellow", "TWB64 004 - Patrick Star Pink", "TWB64 005 - Neon Red", "TWB64 006 - Neon Blue", "TWB64 007 - Neon Yellow", "TWB64 008 - Neon Green", "TWB64 009 - Neon Pink", "TWB64 010 - Mario Red", "TWB64 011 - Nick Orange", "TWB64 012 - Virtual Vision", "TWB64 013 - Golden Wild", "TWB64 014 - DMG-099", "TWB64 015 - Classic Blurple", "TWB64 016 - 765 Production Ver.", "TWB64 017 - Superball Ivory", "TWB64 018 - Crunchyroll Orange", "TWB64 019 - Muse Pink", "TWB64 020 - School Idol Blue", "TWB64 021 - Gamate Ver.", "TWB64 022 - Greenscale Ver.", "TWB64 023 - Odyssey Gold", "TWB64 024 - Super Saiyan God", "TWB64 025 - Super Saiyan Blue", "TWB64 026 - ANIMAX BLUE", "TWB64 027 - BMO Ver.", "TWB64 028 - Game.com Ver.", "TWB64 029 - Sanrio Pink", "TWB64 030 - Timmy Turner Pink", "TWB64 031 - Fairly OddPalette", "TWB64 032 - Danny Phantom Silver", "TWB64 033 - Link's Awakening DX Ver.", "TWB64 034 - Travel Wood", "TWB64 035 - Pokemon Ver.", "TWB64 036 - Game Grump Orange", "TWB64 037 - Scooby-Doo Mystery Ver.", "TWB64 038 - Pokemon mini Ver.", "TWB64 039 - Supervision Ver.", "TWB64 040 - DMG Ver.", "TWB64 041 - Pocket Ver.", "TWB64 042 - Light Ver.", "TWB64 043 - All Might Hero Palette", "TWB64 044 - U.A. High School Uniform", "TWB64 045 - Pikachu Yellow", "TWB64 046 - Eevee Brown", "TWB64 047 - Microvision Ver.", "TWB64 048 - TI-83 Ver.", "TWB64 049 - Aegis Cherry", "TWB64 050 - Labo Fawn", "TWB64 051 - MILLION LIVE GOLD!", "TWB64 052 - Squidward Sea Foam Green", "TWB64 053 - VMU Ver.", "TWB64 054 - Game Master Ver.", "TWB64 055 - Android Green", "TWB64 056 - Amazon Vision", "TWB64 057 - Google Red", "TWB64 058 - Google Blue", "TWB64 059 - Google Yellow", "TWB64 060 - Google Green", "TWB64 061 - WonderSwan Ver.", "TWB64 062 - Neo Geo Pocket Ver.", "TWB64 063 - Dew Green", "TWB64 064 - Coca-Cola Vision", "TWB64 065 - GameKing Ver.", "TWB64 066 - Do The Dew Ver.", "TWB64 067 - Digivice Ver.", "TWB64 068 - Bikini Bottom Ver.", "TWB64 069 - Blossom Pink", "TWB64 070 - Bubbles Blue", "TWB64 071 - Buttercup Green", "TWB64 072 - NASCAR Ver.", "TWB64 073 - Lemon-Lime Green", "TWB64 074 - Mega Man V Ver.", "TWB64 075 - Tamagotchi Ver.", "TWB64 076 - Phantom Red", "TWB64 077 - Halloween Ver.", "TWB64 078 - Christmas Ver.", "TWB64 079 - Cardcaptor Pink", "TWB64 080 - Pretty Guardian Gold", "TWB64 081 - Camouflage Ver.", "TWB64 082 - Legendary Super Saiyan", "TWB64 083 - Super Saiyan Rose", "TWB64 084 - Super Saiyan", "TWB64 085 - Perfected Ultra Instinct", "TWB64 086 - Saint Snow Red", "TWB64 087 - Yellow Banana", "TWB64 088 - Green Banana", "TWB64 089 - Super Saiyan 3", "TWB64 090 - Super Saiyan Blue Evolved", "TWB64 091 - Pocket Tales Ver.", "TWB64 092 - Investigation Yellow", "TWB64 093 - S.E.E.S. Blue", "TWB64 094 - Ultra Instinct Sign", "TWB64 095 - Hokage Orange", "TWB64 096 - Straw Hat Red", "TWB64 097 - Sword Art Cyan", "TWB64 098 - Deku Alpha Emerald", "TWB64 099 - Blue Stripes Ver.", "TWB64 100 - Precure Marble Raspberry"),
+            defaultValue = "TWB64 001 - Aqours Blue",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_palette_twb64_2",
+            label = "> TWB64 - Pack 2 Palette",
+            values = listOf("TWB64 101 - 765PRO Pink", "TWB64 102 - CINDERELLA Blue", "TWB64 103 - MILLION Yellow!", "TWB64 104 - SideM Green", "TWB64 105 - SHINY Sky Blue", "TWB64 106 - Angry Volcano Ver.", "TWB64 107 - NBA Vision", "TWB64 108 - NFL Vision", "TWB64 109 - MLB Vision", "TWB64 110 - Anime Digivice Ver.", "TWB64 111 - Aquatic Iro", "TWB64 112 - Tea Midori", "TWB64 113 - Sakura Pink", "TWB64 114 - Wisteria Murasaki", "TWB64 115 - Oni Aka", "TWB64 116 - Golden Kiiro", "TWB64 117 - Silver Shiro", "TWB64 118 - Fruity Orange", "TWB64 119 - AKB48 Pink", "TWB64 120 - Miku Blue", "TWB64 121 - Tri Digivice Ver.", "TWB64 122 - Survey Corps Uniform", "TWB64 123 - Island Green", "TWB64 124 - Nogizaka46 Purple", "TWB64 125 - Ninja Turtle Green", "TWB64 126 - Slime Blue", "TWB64 127 - Lime Midori", "TWB64 128 - Ghostly Aoi", "TWB64 129 - Retro Bogeda", "TWB64 130 - Royal Blue", "TWB64 131 - Neon Purple", "TWB64 132 - Neon Orange", "TWB64 133 - Moonlight Vision", "TWB64 134 - Rising Sun Red", "TWB64 135 - Burger King Color Combo", "TWB64 136 - Grand Zeno Coat", "TWB64 137 - Pac-Man Yellow", "TWB64 138 - Irish Green", "TWB64 139 - Goku Gi", "TWB64 140 - Dragon Ball Orange", "TWB64 141 - Christmas Gold", "TWB64 142 - Pepsi Vision", "TWB64 143 - Bubblun Green", "TWB64 144 - Bobblun Blue", "TWB64 145 - Baja Blast Storm", "TWB64 146 - Olympic Gold", "TWB64 147 - LisAni Orange!", "TWB64 148 - Liella Purple!", "TWB64 149 - Olympic Silver", "TWB64 150 - Olympic Bronze", "TWB64 151 - ANA Flight Blue", "TWB64 152 - Nijigasaki Orange", "TWB64 153 - Holoblue", "TWB64 154 - WWE White and Red", "TWB64 155 - Yoshi Egg Green", "TWB64 156 - Pokedex Red", "TWB64 157 - FamilyMart Vision", "TWB64 158 - Xbox Green", "TWB64 159 - Sonic Mega Blue", "TWB64 160 - Sprite Green", "TWB64 161 - Scarlett Green", "TWB64 162 - Glitchy Blue", "TWB64 163 - Classic LCD", "TWB64 164 - 3DS Virtual Console Ver.", "TWB64 165 - PocketStation Ver.", "TWB64 166 - Timeless Gold and Red", "TWB64 167 - Smurfy Blue", "TWB64 168 - Swampy Ogre Green", "TWB64 169 - Sailor Spinach Green", "TWB64 170 - Shenron Green", "TWB64 171 - Berserk Blood", "TWB64 172 - Super Star Pink", "TWB64 173 - Gamebuino Classic Ver.", "TWB64 174 - Barbie Pink", "TWB64 175 - YOASOBI AMARANTH", "TWB64 176 - Nokia 3310 Ver.", "TWB64 177 - Clover Green", "TWB64 178 - Goku GT Gi", "TWB64 179 - Famicom Disk Yellow", "TWB64 180 - Team Rocket Uniform", "TWB64 181 - SEIKO Timely Vision", "TWB64 182 - PASTEL109", "TWB64 183 - Doraemon Tricolor", "TWB64 184 - Fury Blue", "TWB64 185 - GOOD SMILE VISION", "TWB64 186 - Puyo Puyo Green", "TWB64 187 - Circle K Color Combo", "TWB64 188 - Pizza Hut Red", "TWB64 189 - Emerald Green", "TWB64 190 - Grand Ivory", "TWB64 191 - Demon's Gold", "TWB64 192 - SEGA Tokyo Blue", "TWB64 193 - Champion's Tunic", "TWB64 194 - DK Barrel Brown", "TWB64 195 - EVA-01", "TWB64 196 - Wild West Vision", "TWB64 197 - Optimus Prime Palette", "TWB64 198 - Niconico Sea Green", "TWB64 199 - Duracell Copper", "TWB64 200 - TOKYO SKYTREE CLOUDY BLUE"),
+            valueLabels = listOf("TWB64 101 - 765PRO Pink", "TWB64 102 - CINDERELLA Blue", "TWB64 103 - MILLION Yellow!", "TWB64 104 - SideM Green", "TWB64 105 - SHINY Sky Blue", "TWB64 106 - Angry Volcano Ver.", "TWB64 107 - NBA Vision", "TWB64 108 - NFL Vision", "TWB64 109 - MLB Vision", "TWB64 110 - Anime Digivice Ver.", "TWB64 111 - Aquatic Iro", "TWB64 112 - Tea Midori", "TWB64 113 - Sakura Pink", "TWB64 114 - Wisteria Murasaki", "TWB64 115 - Oni Aka", "TWB64 116 - Golden Kiiro", "TWB64 117 - Silver Shiro", "TWB64 118 - Fruity Orange", "TWB64 119 - AKB48 Pink", "TWB64 120 - Miku Blue", "TWB64 121 - Tri Digivice Ver.", "TWB64 122 - Survey Corps Uniform", "TWB64 123 - Island Green", "TWB64 124 - Nogizaka46 Purple", "TWB64 125 - Ninja Turtle Green", "TWB64 126 - Slime Blue", "TWB64 127 - Lime Midori", "TWB64 128 - Ghostly Aoi", "TWB64 129 - Retro Bogeda", "TWB64 130 - Royal Blue", "TWB64 131 - Neon Purple", "TWB64 132 - Neon Orange", "TWB64 133 - Moonlight Vision", "TWB64 134 - Rising Sun Red", "TWB64 135 - Burger King Color Combo", "TWB64 136 - Grand Zeno Coat", "TWB64 137 - Pac-Man Yellow", "TWB64 138 - Irish Green", "TWB64 139 - Goku Gi", "TWB64 140 - Dragon Ball Orange", "TWB64 141 - Christmas Gold", "TWB64 142 - Pepsi Vision", "TWB64 143 - Bubblun Green", "TWB64 144 - Bobblun Blue", "TWB64 145 - Baja Blast Storm", "TWB64 146 - Olympic Gold", "TWB64 147 - LisAni Orange!", "TWB64 148 - Liella Purple!", "TWB64 149 - Olympic Silver", "TWB64 150 - Olympic Bronze", "TWB64 151 - ANA Flight Blue", "TWB64 152 - Nijigasaki Orange", "TWB64 153 - Holoblue", "TWB64 154 - WWE White and Red", "TWB64 155 - Yoshi Egg Green", "TWB64 156 - Pokedex Red", "TWB64 157 - FamilyMart Vision", "TWB64 158 - Xbox Green", "TWB64 159 - Sonic Mega Blue", "TWB64 160 - Sprite Green", "TWB64 161 - Scarlett Green", "TWB64 162 - Glitchy Blue", "TWB64 163 - Classic LCD", "TWB64 164 - 3DS Virtual Console Ver.", "TWB64 165 - PocketStation Ver.", "TWB64 166 - Timeless Gold and Red", "TWB64 167 - Smurfy Blue", "TWB64 168 - Swampy Ogre Green", "TWB64 169 - Sailor Spinach Green", "TWB64 170 - Shenron Green", "TWB64 171 - Berserk Blood", "TWB64 172 - Super Star Pink", "TWB64 173 - Gamebuino Classic Ver.", "TWB64 174 - Barbie Pink", "TWB64 175 - YOASOBI AMARANTH", "TWB64 176 - Nokia 3310 Ver.", "TWB64 177 - Clover Green", "TWB64 178 - Goku GT Gi", "TWB64 179 - Famicom Disk Yellow", "TWB64 180 - Team Rocket Uniform", "TWB64 181 - SEIKO Timely Vision", "TWB64 182 - PASTEL109", "TWB64 183 - Doraemon Tricolor", "TWB64 184 - Fury Blue", "TWB64 185 - GOOD SMILE VISION", "TWB64 186 - Puyo Puyo Green", "TWB64 187 - Circle K Color Combo", "TWB64 188 - Pizza Hut Red", "TWB64 189 - Emerald Green", "TWB64 190 - Grand Ivory", "TWB64 191 - Demon's Gold", "TWB64 192 - SEGA Tokyo Blue", "TWB64 193 - Champion's Tunic", "TWB64 194 - DK Barrel Brown", "TWB64 195 - EVA-01", "TWB64 196 - Wild West Vision", "TWB64 197 - Optimus Prime Palette", "TWB64 198 - Niconico Sea Green", "TWB64 199 - Duracell Copper", "TWB64 200 - TOKYO SKYTREE CLOUDY BLUE"),
+            defaultValue = "TWB64 101 - 765PRO Pink",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_palette_twb64_3",
+            label = "> TWB64 - Pack 3 Palette",
+            values = listOf("TWB64 201 - DMG-GOLD", "TWB64 202 - LCD Clock Green", "TWB64 203 - Famicom Frenzy", "TWB64 204 - DK Arcade Blue", "TWB64 205 - Advanced Indigo", "TWB64 206 - Ultra Black", "TWB64 207 - Chaos Emerald Green", "TWB64 208 - Blue Bomber Vision", "TWB64 209 - Krispy Kreme Vision", "TWB64 210 - Steam Gray", "TWB64 211 - Dream Land GB Ver.", "TWB64 212 - Pokemon Pinball Ver.", "TWB64 213 - Poketch Ver.", "TWB64 214 - COLLECTION of SaGa Ver.", "TWB64 215 - Rocky-Valley Holiday", "TWB64 216 - Giga Kiwi DMG", "TWB64 217 - DMG Pea Green", "TWB64 218 - Timing Hero Ver.", "TWB64 219 - Invincible Yellow and Blue", "TWB64 220 - Grinchy Green", "TWB64 221 - Animate Vision", "TWB64 222 - School Idol Mix", "TWB64 223 - Green Awakening", "TWB64 224 - Goomba Brown", "TWB64 225 - WarioWare MicroBlue", "TWB64 226 - KonoSuba Sherbet", "TWB64 227 - Spooky Purple", "TWB64 228 - Treasure Gold", "TWB64 229 - Cherry Blossom Pink", "TWB64 230 - Golden Trophy", "TWB64 231 - Glacial Winter Blue", "TWB64 232 - Leprechaun Green", "TWB64 233 - SAITAMA SUPER BLUE", "TWB64 234 - SAITAMA SUPER GREEN", "TWB64 235 - Duolingo Green", "TWB64 236 - Super Mushroom Vision", "TWB64 237 - Ancient Hisuian Brown", "TWB64 238 - Sky Pop Ivory", "TWB64 239 - LAWSON BLUE", "TWB64 240 - Anime Expo Red", "TWB64 241 - Brilliant Diamond Blue", "TWB64 242 - Shining Pearl Pink", "TWB64 243 - Funimation Melon", "TWB64 244 - Teyvat Brown", "TWB64 245 - Chozo Blue", "TWB64 246 - Spotify Green", "TWB64 247 - Dr Pepper Red", "TWB64 248 - NHK Silver Gray", "TWB64 249 - Dunkin' Vision", "TWB64 250 - Deku Gamma Palette", "TWB64 251 - Universal Studios Blue", "TWB64 252 - Hogwarts Goldius", "TWB64 253 - Kentucky Fried Red", "TWB64 254 - Cheeto Orange", "TWB64 255 - Namco Idol Pink", "TWB64 256 - Domino's Pizza Vision", "TWB64 257 - Pac-Man Vision", "TWB64 258 - Bill's PC Screen", "TWB64 259 - Ebott Prolouge", "TWB64 260 - Fool's Gold and Silver", "TWB64 261 - UTA VISION", "TWB64 262 - Metallic Paldea Brass", "TWB64 263 - Classy Christmas", "TWB64 264 - Winter Christmas", "TWB64 265 - IDOL WORLD TRICOLOR!!!", "TWB64 266 - Inkling Tricolor", "TWB64 267 - 7-Eleven Color Combo", "TWB64 268 - PAC-PALETTE", "TWB64 269 - Vulnerable Blue", "TWB64 270 - Nightvision Green", "TWB64 271 - Bandai Namco Tricolor", "TWB64 272 - Gold, Silver, and Bronze", "TWB64 273 - Deku Vigilante Palette", "TWB64 274 - Super Famicom Supreme", "TWB64 275 - Absorbent and Yellow", "TWB64 276 - 765PRO TRICOLOR", "TWB64 277 - GameCube Glimmer", "TWB64 278 - 1st Vision Pastel", "TWB64 279 - Perfect Majin Emperor", "TWB64 280 - J-Pop Idol Sherbet", "TWB64 281 - Ryuuguu Sunset", "TWB64 282 - Tropical Starfall", "TWB64 283 - Colorful Horizons", "TWB64 284 - BLACKPINK BLINK PINK", "TWB64 285 - DMG-SWITCH", "TWB64 286 - POCKET SWITCH", "TWB64 287 - Sunny Passion Paradise", "TWB64 288 - Saiyan Beast Silver", "TWB64 289 - RADIANT SMILE RAMP", "TWB64 290 - A-RISE BLUE", "TWB64 291 - TROPICAL TWICE APRICOT", "TWB64 292 - Odyssey Boy", "TWB64 293 - Frog Coin Green", "TWB64 294 - Garfield Vision", "TWB64 295 - Bedrock Caveman Vision", "TWB64 296 - BANGTAN ARMY PURPLE", "TWB64 297 - LE SSERAFIM FEARLESS BLUE", "TWB64 298 - Baja Blast Beach", "TWB64 299 - 3DS Virtual Console Green", "TWB64 300 - Wonder Purple"),
+            valueLabels = listOf("TWB64 201 - DMG-GOLD", "TWB64 202 - LCD Clock Green", "TWB64 203 - Famicom Frenzy", "TWB64 204 - DK Arcade Blue", "TWB64 205 - Advanced Indigo", "TWB64 206 - Ultra Black", "TWB64 207 - Chaos Emerald Green", "TWB64 208 - Blue Bomber Vision", "TWB64 209 - Krispy Kreme Vision", "TWB64 210 - Steam Gray", "TWB64 211 - Dream Land GB Ver.", "TWB64 212 - Pokemon Pinball Ver.", "TWB64 213 - Poketch Ver.", "TWB64 214 - COLLECTION of SaGa Ver.", "TWB64 215 - Rocky-Valley Holiday", "TWB64 216 - Giga Kiwi DMG", "TWB64 217 - DMG Pea Green", "TWB64 218 - Timing Hero Ver.", "TWB64 219 - Invincible Yellow and Blue", "TWB64 220 - Grinchy Green", "TWB64 221 - Animate Vision", "TWB64 222 - School Idol Mix", "TWB64 223 - Green Awakening", "TWB64 224 - Goomba Brown", "TWB64 225 - WarioWare MicroBlue", "TWB64 226 - KonoSuba Sherbet", "TWB64 227 - Spooky Purple", "TWB64 228 - Treasure Gold", "TWB64 229 - Cherry Blossom Pink", "TWB64 230 - Golden Trophy", "TWB64 231 - Glacial Winter Blue", "TWB64 232 - Leprechaun Green", "TWB64 233 - SAITAMA SUPER BLUE", "TWB64 234 - SAITAMA SUPER GREEN", "TWB64 235 - Duolingo Green", "TWB64 236 - Super Mushroom Vision", "TWB64 237 - Ancient Hisuian Brown", "TWB64 238 - Sky Pop Ivory", "TWB64 239 - LAWSON BLUE", "TWB64 240 - Anime Expo Red", "TWB64 241 - Brilliant Diamond Blue", "TWB64 242 - Shining Pearl Pink", "TWB64 243 - Funimation Melon", "TWB64 244 - Teyvat Brown", "TWB64 245 - Chozo Blue", "TWB64 246 - Spotify Green", "TWB64 247 - Dr Pepper Red", "TWB64 248 - NHK Silver Gray", "TWB64 249 - Dunkin' Vision", "TWB64 250 - Deku Gamma Palette", "TWB64 251 - Universal Studios Blue", "TWB64 252 - Hogwarts Goldius", "TWB64 253 - Kentucky Fried Red", "TWB64 254 - Cheeto Orange", "TWB64 255 - Namco Idol Pink", "TWB64 256 - Domino's Pizza Vision", "TWB64 257 - Pac-Man Vision", "TWB64 258 - Bill's PC Screen", "TWB64 259 - Ebott Prolouge", "TWB64 260 - Fool's Gold and Silver", "TWB64 261 - UTA VISION", "TWB64 262 - Metallic Paldea Brass", "TWB64 263 - Classy Christmas", "TWB64 264 - Winter Christmas", "TWB64 265 - IDOL WORLD TRICOLOR!!!", "TWB64 266 - Inkling Tricolor", "TWB64 267 - 7-Eleven Color Combo", "TWB64 268 - PAC-PALETTE", "TWB64 269 - Vulnerable Blue", "TWB64 270 - Nightvision Green", "TWB64 271 - Bandai Namco Tricolor", "TWB64 272 - Gold, Silver, and Bronze", "TWB64 273 - Deku Vigilante Palette", "TWB64 274 - Super Famicom Supreme", "TWB64 275 - Absorbent and Yellow", "TWB64 276 - 765PRO TRICOLOR", "TWB64 277 - GameCube Glimmer", "TWB64 278 - 1st Vision Pastel", "TWB64 279 - Perfect Majin Emperor", "TWB64 280 - J-Pop Idol Sherbet", "TWB64 281 - Ryuuguu Sunset", "TWB64 282 - Tropical Starfall", "TWB64 283 - Colorful Horizons", "TWB64 284 - BLACKPINK BLINK PINK", "TWB64 285 - DMG-SWITCH", "TWB64 286 - POCKET SWITCH", "TWB64 287 - Sunny Passion Paradise", "TWB64 288 - Saiyan Beast Silver", "TWB64 289 - RADIANT SMILE RAMP", "TWB64 290 - A-RISE BLUE", "TWB64 291 - TROPICAL TWICE APRICOT", "TWB64 292 - Odyssey Boy", "TWB64 293 - Frog Coin Green", "TWB64 294 - Garfield Vision", "TWB64 295 - Bedrock Caveman Vision", "TWB64 296 - BANGTAN ARMY PURPLE", "TWB64 297 - LE SSERAFIM FEARLESS BLUE", "TWB64 298 - Baja Blast Beach", "TWB64 299 - 3DS Virtual Console Green", "TWB64 300 - Wonder Purple"),
+            defaultValue = "TWB64 201 - DMG-GOLD",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gbc_color_correction",
+            label = "Color Correction",
+            values = listOf("GBC only", "always", "disabled"),
+            valueLabels = listOf("GBC Only", "Always", "disabled"),
+            defaultValue = "GBC only",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gbc_color_correction_mode",
+            label = "Color Correction Mode",
+            values = listOf("accurate", "fast"),
+            valueLabels = listOf("Accurate", "Fast"),
+            defaultValue = "accurate",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_audio_resampler",
+            label = "Audio Resampler",
+            values = listOf("sinc", "cc"),
+            valueLabels = listOf("Sinc", "Cosine"),
+            defaultValue = "cc",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_bootloader",
+            label = "Use Official Bootloader (Restart Required)",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gb_hwmode",
+            label = "Emulated Hardware (Restart Required)",
+            values = listOf("Auto", "GB", "GBC", "GBA"),
+            valueLabels = listOf("Auto", "GB", "GBC", "GBA"),
+            defaultValue = "Auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gambatte_gbc_frontlight_position",
+            label = "Color Correction - Frontlight Position",
+            values = listOf("central", "above screen", "below screen"),
+            valueLabels = listOf("Central", "Above Screen", "Below Screen"),
+            defaultValue = "central",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "gambatte_mix_frames",
+            label = "Interframe Blending",
+            values = listOf("disabled", "mix", "lcd_ghosting", "lcd_ghosting_fast"),
+            valueLabels = listOf("disabled", "Simple", "LCD Ghosting (Accurate)", "LCD Ghosting (Fast)"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+    )
+
+    val MGBA: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "mgba_allow_opposing_directions",
+            label = "Allow Opposing Directional Input",
+            values = listOf("no", "yes"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "no",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_force_gbp",
+            label = "Game Boy Player Rumble (Restart)",
+            values = listOf("OFF", "ON"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "OFF",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_solar_sensor_level",
+            label = "Solar Sensor Level",
+            values = listOf("sensor", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            valueLabels = listOf("Use device sensor if available", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            defaultValue = "0",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_color_correction",
+            label = "Color Correction",
+            values = listOf("OFF", "GBA", "GBC", "Auto"),
+            valueLabels = listOf("disabled", "Game Boy Advance", "Game Boy Color", "Auto"),
+            defaultValue = "OFF",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_color_correction,
+        ),
+        RetroCoreOption(
+            key = "mgba_gb_colors",
+            label = "Default Game Boy Palette",
+            values = listOf("Grayscale"),
+            valueLabels = listOf("Grayscale"),
+            defaultValue = "Grayscale",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_gb_colors_preset",
+            label = "Hardware Preset Game Boy Palettes (Restart)",
+            values = listOf("0", "1", "2", "3"),
+            valueLabels = listOf("Default Game Boy preset", "Game Boy Color presets only", "Super Game Boy presets only", "Any available presets"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_interframe_blending",
+            label = "Interframe Blending",
+            values = listOf("OFF", "mix", "mix_smart", "lcd_ghosting", "lcd_ghosting_fast"),
+            valueLabels = listOf("disabled", "Simple", "Smart", "LCD Ghosting (Accurate)", "LCD Ghosting (Fast)"),
+            defaultValue = "OFF",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_sgb_borders",
+            label = "Use Super Game Boy Borders (Restart)",
+            values = listOf("ON", "OFF"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "ON",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_frameskip",
+            label = "Frameskip",
+            values = listOf("disabled", "auto", "auto_threshold", "fixed_interval"),
+            valueLabels = listOf("disabled", "Auto", "Auto (Threshold)", "Fixed Interval"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_frameskip_interval",
+            label = "Frameskip Interval",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            defaultValue = "0",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_frameskip_threshold",
+            label = "Frameskip Threshold (%)",
+            values = listOf("15", "18", "21", "24", "27", "30", "33", "36", "39", "42", "45", "48", "51", "54", "57", "60"),
+            valueLabels = listOf("15", "18", "21", "24", "27", "30", "33", "36", "39", "42", "45", "48", "51", "54", "57", "60"),
+            defaultValue = "33",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_idle_optimization",
+            label = "Idle Loop Removal",
+            values = listOf("Remove Known", "Detect and Remove", "Don't Remove"),
+            valueLabels = listOf("Remove Known", "Detect and Remove", "Don't Remove"),
+            defaultValue = "Remove Known",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_audio_low_pass_filter",
+            label = "Audio Filter",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_audio_low_pass_range",
+            label = "Audio Filter Level",
+            values = listOf("5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95"),
+            valueLabels = listOf("5%", "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%"),
+            defaultValue = "60",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_gb_model",
+            label = "Game Boy Model (Restart)",
+            values = listOf("Autodetect", "Game Boy", "Super Game Boy", "Game Boy Color", "Super Game Boy Color", "Game Boy Advance"),
+            valueLabels = listOf("Autodetect", "Game Boy", "Super Game Boy", "Game Boy Color", "Super Game Boy Color", "Game Boy Advance"),
+            defaultValue = "Autodetect",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_skip_bios",
+            label = "Skip BIOS Intro (Restart)",
+            values = listOf("OFF", "ON"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "OFF",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mgba_use_bios",
+            label = "Use BIOS File if Found (Restart)",
+            values = listOf("ON", "OFF"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "ON",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+    )
+
+    val GENESIS_PLUS_GX: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "genesis_plus_gx_gun_cursor",
+            label = "Show Light Gun Crosshair",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_gun_input",
+            label = "Light Gun Input",
+            values = listOf("lightgun", "touchscreen"),
+            valueLabels = listOf("Light Gun", "Touchscreen"),
+            defaultValue = "lightgun",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_invert_mouse",
+            label = "Invert Mouse Y-Axis",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_aspect_ratio",
+            label = "Core-Provided Aspect Ratio",
+            values = listOf("auto", "NTSC PAR", "PAL PAR", "4:3", "Uncorrected"),
+            valueLabels = listOf("Auto", "NTSC PAR", "PAL PAR", "4:3", "Uncorrected"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_blargg_ntsc_filter",
+            label = "Blargg NTSC Filter",
+            values = listOf("disabled", "monochrome", "composite", "svideo", "rgb"),
+            valueLabels = listOf("disabled", "Monochrome", "Composite", "S-Video", "RGB"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_ntsc_filter,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_frameskip",
+            label = "Frameskip",
+            values = listOf("disabled", "auto", "manual"),
+            valueLabels = listOf("disabled", "Auto", "Manual"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_frameskip_threshold",
+            label = "Frameskip Threshold (%)",
+            values = listOf("15", "18", "21", "24", "27", "30", "33", "36", "39", "42", "45", "48", "51", "54", "57", "60"),
+            valueLabels = listOf("15", "18", "21", "24", "27", "30", "33", "36", "39", "42", "45", "48", "51", "54", "57", "60"),
+            defaultValue = "33",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_gg_extra",
+            label = "Game Gear Extended Screen",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_lcd_filter",
+            label = "LCD Ghosting Filter",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_left_border",
+            label = "Hide Master System Side Borders",
+            values = listOf("disabled", "left border", "left & right borders"),
+            valueLabels = listOf("disabled", "Left Border Only", "Left & Right Borders"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_overscan",
+            label = "Borders",
+            values = listOf("disabled", "top/bottom", "left/right", "full"),
+            valueLabels = listOf("disabled", "Top/Bottom", "Left/Right", "Full"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_render",
+            label = "Interlaced Mode 2 Output",
+            values = listOf("single field", "double field"),
+            valueLabels = listOf("Single Field", "Double Field"),
+            defaultValue = "single field",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_addr_error",
+            label = "68K Address Error",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_cd_latency",
+            label = "CD Access Time",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_cd_precache",
+            label = "CD Image Cache",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_enhanced_vscroll",
+            label = "Enhanced per-tile vertical scroll",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_enhanced_vscroll_limit",
+            label = "Enhanced per-tile vertical scroll limit",
+            values = listOf("2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            valueLabels = listOf("2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"),
+            defaultValue = "8",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_force_dtack",
+            label = "System Lock-Ups",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_no_sprite_limit",
+            label = "Remove Per-Line Sprite Limit",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+            labelRes = R.string.retro_co_remove_sprite_limit,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_overclock",
+            label = "CPU Speed",
+            values = listOf("100", "125", "150", "175", "200", "225", "250", "275", "300", "325", "350", "375", "400", "425", "450", "475", "500"),
+            valueLabels = listOf("100%", "125%", "150%", "175%", "200%", "225%", "250%", "275%", "300%", "325%", "350%", "375%", "400%", "425%", "450%", "475%", "500%"),
+            defaultValue = "100%",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_audio_eq_high",
+            label = "EQ High",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_audio_eq_low",
+            label = "EQ Low",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_audio_eq_mid",
+            label = "EQ Mid",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_audio_filter",
+            label = "Audio Filter",
+            values = listOf("disabled", "low-pass", "EQ"),
+            valueLabels = listOf("disabled", "Low-Pass", "EQ"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_cdda_volume",
+            label = "CD-DA Volume",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_fm_preamp",
+            label = "FM Preamp Level",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", "105", "110", "115", "120", "125", "130", "135", "140", "145", "150", "155", "160", "165", "170", "175", "180", "185", "190", "195", "200"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", "105", "110", "115", "120", "125", "130", "135", "140", "145", "150", "155", "160", "165", "170", "175", "180", "185", "190", "195", "200"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_lowpass_range",
+            label = "Low-Pass Filter %",
+            values = listOf("5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95"),
+            valueLabels = listOf("5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95"),
+            defaultValue = "60",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_md_channel_0_volume",
+            label = "Mega Drive/Genesis FM Channel 0 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_md_channel_1_volume",
+            label = "Mega Drive/Genesis FM Channel 1 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_md_channel_2_volume",
+            label = "Mega Drive/Genesis FM Channel 2 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_md_channel_3_volume",
+            label = "Mega Drive/Genesis FM Channel 3 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_md_channel_4_volume",
+            label = "Mega Drive/Genesis FM Channel 4 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_md_channel_5_volume",
+            label = "Mega Drive/Genesis FM Channel 5 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_pcm_volume",
+            label = "PCM Volume",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_psg_channel_0_volume",
+            label = "PSG Tone Channel 0 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_psg_channel_1_volume",
+            label = "PSG Tone Channel 1 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_psg_channel_2_volume",
+            label = "PSG Tone Channel 2 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_psg_channel_3_volume",
+            label = "PSG Noise Channel 3 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_psg_preamp",
+            label = "PSG Preamp Level",
+            values = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", "105", "110", "115", "120", "125", "130", "135", "140", "145", "150", "155", "160", "165", "170", "175", "180", "185", "190", "195", "200"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", "105", "110", "115", "120", "125", "130", "135", "140", "145", "150", "155", "160", "165", "170", "175", "180", "185", "190", "195", "200"),
+            defaultValue = "150",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_0_volume",
+            label = "Master System FM (YM2413) Channel 0 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_1_volume",
+            label = "Master System FM (YM2413) Channel 1 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_2_volume",
+            label = "Master System FM (YM2413) Channel 2 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_3_volume",
+            label = "Master System FM (YM2413) Channel 3 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_4_volume",
+            label = "Master System FM (YM2413) Channel 4 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_5_volume",
+            label = "Master System FM (YM2413) Channel 5 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_6_volume",
+            label = "Master System FM (YM2413) Channel 6 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_7_volume",
+            label = "Master System FM (YM2413) Channel 7 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sms_fm_channel_8_volume",
+            label = "Master System FM (YM2413) Channel 8 Volume %",
+            values = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            valueLabels = listOf("0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"),
+            defaultValue = "100",
+            category = RetroOptionCategory.SOUND,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_sound_output",
+            label = "Sound Output",
+            values = listOf("stereo", "mono"),
+            valueLabels = listOf("Stereo", "Mono"),
+            defaultValue = "stereo",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_ym2413",
+            label = "Master System FM (YM2413)",
+            values = listOf("auto", "disabled", "enabled"),
+            valueLabels = listOf("Auto", "disabled", "enabled"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_ym2413_core",
+            label = "Master System FM (YM2413) Core",
+            values = listOf("mame", "nuked"),
+            valueLabels = listOf("MAME", "Nuked"),
+            defaultValue = "mame",
+            category = RetroOptionCategory.SOUND,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_add_on",
+            label = "CD add-on (MD mode) (Requires Restart)",
+            values = listOf("auto", "sega/mega cd", "megasd", "none"),
+            valueLabels = listOf("Auto", "Sega/Mega CD", "MegaSD", "None"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_bios",
+            label = "System Boot ROM",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_cart_bram",
+            label = "CD Backup Cart BRAM (Requires Restart)",
+            values = listOf("per cart", "per game"),
+            valueLabels = listOf("Per-Cart", "Per-Game"),
+            defaultValue = "per cart",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_cart_size",
+            label = "CD Backup Cart BRAM Size (Requires Restart)",
+            values = listOf("disabled", "128k", "256k", "512k", "1meg", "2meg", "4meg"),
+            valueLabels = listOf("Disabled", "128Kbit", "256Kbit", "512Kbit", "1Mbit", "2Mbit", "4Mbit"),
+            defaultValue = "4meg",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_lock_on",
+            label = "Cartridge Lock-On",
+            values = listOf("disabled", "game genie", "action replay (pro)", "sonic & knuckles"),
+            valueLabels = listOf("disabled", "Game Genie", "Action Replay (Pro)", "Sonic & Knuckles"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_region_detect",
+            label = "System Region",
+            values = listOf("auto", "ntsc-u", "pal", "ntsc-j"),
+            valueLabels = listOf("Auto", "NTSC-U", "PAL", "NTSC-J"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_system_bram",
+            label = "CD System BRAM (Requires Restart)",
+            values = listOf("per bios", "per game"),
+            valueLabels = listOf("Per-BIOS", "Per-Game"),
+            defaultValue = "per bios",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_system_hw",
+            label = "System Hardware",
+            values = listOf("auto", "sg-1000", "sg-1000 II", "sg-1000 II + ram ext.", "mark-III", "master system", "master system II", "game gear", "mega drive / genesis"),
+            valueLabels = listOf("Auto", "SG-1000", "SG-1000 II", "SG-1000 II + RAM Ext.", "Mark III", "Master System", "Master System II", "Game Gear", "Mega Drive/Genesis"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_vdp_mode",
+            label = "Force VDP Mode",
+            values = listOf("auto", "60hz", "50hz"),
+            valueLabels = listOf("Disabled", "NTSC (60Hz)", "PAL (50Hz)"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "genesis_plus_gx_ym2612",
+            label = "Mega Drive/Genesis FM",
+            values = listOf("mame (ym2612)", "mame (asic ym3438)", "mame (enhanced ym3438)", "nuked (ym2612)", "nuked (ym3438)"),
+            valueLabels = listOf("MAME (YM2612)", "MAME (ASIC YM3438)", "MAME (Enhanced YM3438)", "Nuked (YM2612)", "Nuked (YM3438)"),
+            defaultValue = "mame (ym2612)",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+    )
+
+    val BEETLE_PSX: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "beetle_psx_analog_calibration",
+            label = "Analog Self-Calibration",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_analog_toggle",
+            label = "DualShock Analog Mode Toggle",
+            values = listOf("disabled", "enabled", "enabled-analog"),
+            valueLabels = listOf("disabled", "enabled", "Default-Analog"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_analog_toggle_combo",
+            label = "DualShock Analog Mode Combo",
+            values = listOf("l1+l2+r1+r2+start+select", "l1+r1+select", "l1+r1+start", "l1+r1+l3", "l1+r1+r3", "l2+r2+select", "l2+r2+start", "l2+r2+l3", "l2+r2+r3", "l3+r3"),
+            valueLabels = listOf("L1 + L2 + R1 + R2 + Start + Select", "L1 + R1 + Select", "L1 + R1 + Start", "L1 + R1 + L3", "L1 + R1 + R3", "L2 + R2 + Select", "L2 + R2 + Start", "L2 + R2 + L3", "L2 + R2 + R3", "L3 + R3"),
+            defaultValue = "l1+r1+select",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_analog_toggle_hold",
+            label = "DualShock Analog Mode Combo Hold Delay",
+            values = listOf("0", "1", "2", "3", "4", "5"),
+            valueLabels = listOf("0 Second Delay", "1 Second Delay", "2 Second Delay", "3 Second Delay", "4 Second Delay", "5 Second Delay"),
+            defaultValue = "1",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_crosshair_color_p1",
+            label = "Gun Crosshair Color: Port 1",
+            values = listOf("red", "blue", "green", "orange", "yellow", "cyan", "pink", "purple", "black", "white"),
+            valueLabels = listOf("Red", "Blue", "Green", "Orange", "Yellow", "Cyan", "Pink", "Purple", "Black", "White"),
+            defaultValue = "red",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_crosshair_color_p2",
+            label = "Gun Crosshair Color: Port 2",
+            values = listOf("blue", "red", "green", "orange", "yellow", "cyan", "pink", "purple", "black", "white"),
+            valueLabels = listOf("Blue", "Red", "Green", "Orange", "Yellow", "Cyan", "Pink", "Purple", "Black", "White"),
+            defaultValue = "blue",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_enable_multitap_port1",
+            label = "Multitap on Port 1",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_enable_multitap_port2",
+            label = "Multitap on Port 2",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_gun_cursor",
+            label = "Gun Cursor",
+            values = listOf("off", "cross", "dot"),
+            valueLabels = listOf("disabled", "Cross", "Dot"),
+            defaultValue = "cross",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_gun_input_mode",
+            label = "Gun Input Mode",
+            values = listOf("lightgun", "touchscreen"),
+            valueLabels = listOf("Light Gun", "Touchscreen"),
+            defaultValue = "lightgun",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_mouse_sensitivity",
+            label = "Mouse Sensitivity",
+            values = listOf("5%", "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "105%", "110%", "115%", "120%", "125%", "130%", "135%", "140%", "145%", "150%", "155%", "160%", "165%", "170%", "175%", "180%", "185%", "190%", "195%", "200%"),
+            valueLabels = listOf("5%", "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "105%", "110%", "115%", "120%", "125%", "130%", "135%", "140%", "145%", "150%", "155%", "160%", "165%", "170%", "175%", "180%", "185%", "190%", "195%", "200%"),
+            defaultValue = "100%",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_negcon_deadzone",
+            label = "neGcon Twist Deadzone",
+            values = listOf("0%", "5%", "10%", "15%", "20%", "25%", "30%"),
+            valueLabels = listOf("0%", "5%", "10%", "15%", "20%", "25%", "30%"),
+            defaultValue = "0%",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_negcon_response",
+            label = "neGcon Twist Response",
+            values = listOf("linear", "quadratic", "cubic"),
+            valueLabels = listOf("Linear", "Quadratic", "Cubic"),
+            defaultValue = "linear",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_adaptive_smoothing",
+            label = "Adaptive Smoothing",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_aspect_ratio",
+            label = "Core Aspect Ratio",
+            values = listOf("corrected", "uncorrected", "4:3", "ntsc", "16:9"),
+            valueLabels = listOf("Corrected", "Uncorrected", "Force 4:3", "Force NTSC", "Force 16:9"),
+            defaultValue = "corrected",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_core_timing_fps",
+            label = "Core-Reported FPS Timing",
+            values = listOf("auto_toggle", "force_progressive", "force_interlaced"),
+            valueLabels = listOf("Automatic Toggling", "Force Progressive Rate", "Force Interlaced Rate"),
+            defaultValue = "auto_toggle",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_crop_overscan",
+            label = "Crop Overscan",
+            values = listOf("disabled", "static", "smart"),
+            valueLabels = listOf("Disabled", "Horizontal", "Horizontal + Vertical"),
+            defaultValue = "smart",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_deinterlacer",
+            label = "Deinterlace Method",
+            values = listOf("weave", "bob", "bob_offset", "fastmad", "off"),
+            valueLabels = listOf("Weave", "Bob", "Bob (Offset)", "FastMAD (Motion Adaptive)", "Off"),
+            defaultValue = "weave",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_depth",
+            label = "Internal Color Depth",
+            values = listOf("16bpp(native)", "32bpp"),
+            valueLabels = listOf("16 bpp (Native)", "32 bpp"),
+            defaultValue = "16bpp(native)",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dither_mode",
+            label = "Dithering Pattern",
+            values = listOf("1x(native)", "internal resolution", "disabled"),
+            valueLabels = listOf("1x (Native)", "Internal Resolution", "disabled"),
+            defaultValue = "1x(native)",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_dithering,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dump_textures",
+            label = "Dump Textures",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_filter",
+            label = "Texture Filtering",
+            values = listOf("nearest", "SABR", "xBR", "bilinear", "3-point", "JINC2"),
+            valueLabels = listOf("Nearest", "SABR", "xBR", "Bilinear", "3-Point", "JINC2"),
+            defaultValue = "nearest",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_filter_exclude_2d_polygon",
+            label = "Exclude 2D Polygons from Filtering",
+            values = listOf("disabled", "opaque", "all"),
+            valueLabels = listOf("disabled", "Opaque Only", "Opaque and Semi-Transparent"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_filter_exclude_sprite",
+            label = "Exclude Sprites from Filtering",
+            values = listOf("disabled", "opaque", "all"),
+            valueLabels = listOf("disabled", "Opaque Only", "Opaque and Semi-Transparent"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_frame_duping",
+            label = "Frame Duping",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_image_crop",
+            label = "Additional Cropping",
+            values = listOf("disabled", "1px", "2px", "3px", "4px", "5px", "6px", "7px", "8px", "9px", "10px", "11px", "12px", "13px", "14px", "15px", "16px", "17px", "18px", "19px", "20px"),
+            valueLabels = listOf("0", "1px", "2px", "3px", "4px", "5px", "6px", "7px", "8px", "9px", "10px", "11px", "12px", "13px", "14px", "15px", "16px", "17px", "18px", "19px", "20px"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_image_offset",
+            label = "Offset Cropped Image",
+            values = listOf("-12px", "-11px", "-10px", "-9px", "-8px", "-7px", "-6px", "-5px", "-4px", "-3px", "-2px", "-1px", "disabled", "+1px", "+2px", "+3px", "+4px", "+5px", "+6px", "+7px", "+8px", "+9px", "+10px", "+11px", "+12px"),
+            valueLabels = listOf("-12px", "-11px", "-10px", "-9px", "-8px", "-7px", "-6px", "-5px", "-4px", "-3px", "-2px", "-1px", "0", "+1px", "+2px", "+3px", "+4px", "+5px", "+6px", "+7px", "+8px", "+9px", "+10px", "+11px", "+12px"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_image_offset_cycles",
+            label = "Horizontal Image Offset (GPU Cycles)",
+            values = listOf("-40", "-39", "-38", "-37", "-36", "-35", "-34", "-33", "-32", "-31", "-30", "-29", "-28", "-27", "-26", "-25", "-24", "-23", "-22", "-21", "-20", "-19", "-18", "-17", "-16", "-15", "-14", "-13", "-12", "-11", "-10", "-9", "-8", "-7", "-6", "-5", "-4", "-3", "-2", "-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12", "+13", "+14", "+15", "+16", "+17", "+18", "+19", "+20", "+21", "+22", "+23", "+24", "+25", "+26", "+27", "+28", "+29", "+30", "+31", "+32", "+33", "+34", "+35", "+36", "+37", "+38", "+39", "+40"),
+            valueLabels = listOf("-40", "-39", "-38", "-37", "-36", "-35", "-34", "-33", "-32", "-31", "-30", "-29", "-28", "-27", "-26", "-25", "-24", "-23", "-22", "-21", "-20", "-19", "-18", "-17", "-16", "-15", "-14", "-13", "-12", "-11", "-10", "-9", "-8", "-7", "-6", "-5", "-4", "-3", "-2", "-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12", "+13", "+14", "+15", "+16", "+17", "+18", "+19", "+20", "+21", "+22", "+23", "+24", "+25", "+26", "+27", "+28", "+29", "+30", "+31", "+32", "+33", "+34", "+35", "+36", "+37", "+38", "+39", "+40"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_initial_scanline",
+            label = "Initial Scan Line - NTSC",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40"),
+            valueLabels = listOf("0 (Default)", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_initial_scanline_pal",
+            label = "Initial Scan Line - PAL",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40"),
+            valueLabels = listOf("0 (Default)", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_internal_resolution",
+            label = "Internal GPU Resolution",
+            values = listOf("1x(native)", "2x", "4x", "8x", "16x"),
+            valueLabels = listOf("1x (Native)", "2x", "4x", "8x", "16x"),
+            defaultValue = "1x(native)",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_last_scanline",
+            label = "Last Scan Line - NTSC",
+            values = listOf("210", "211", "212", "213", "214", "215", "216", "217", "218", "219", "220", "221", "222", "223", "224", "225", "226", "227", "228", "229", "230", "231", "232", "233", "234", "235", "236", "237", "238", "239"),
+            valueLabels = listOf("210", "211", "212", "213", "214", "215", "216", "217", "218", "219", "220", "221", "222", "223", "224", "225", "226", "227", "228", "229", "230", "231", "232", "233", "234", "235", "236", "237", "238", "239 (Default)"),
+            defaultValue = "239",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_last_scanline_pal",
+            label = "Last Scan Line - PAL",
+            values = listOf("230", "231", "232", "233", "234", "235", "236", "237", "238", "239", "240", "241", "242", "243", "244", "245", "246", "247", "248", "249", "250", "251", "252", "253", "254", "255", "256", "257", "258", "259", "260", "261", "262", "263", "264", "265", "266", "267", "268", "269", "270", "271", "272", "273", "274", "275", "276", "277", "278", "279", "280", "281", "282", "283", "284", "285", "286", "287"),
+            valueLabels = listOf("230", "231", "232", "233", "234", "235", "236", "237", "238", "239", "240", "241", "242", "243", "244", "245", "246", "247", "248", "249", "250", "251", "252", "253", "254", "255", "256", "257", "258", "259", "260", "261", "262", "263", "264", "265", "266", "267", "268", "269", "270", "271", "272", "273", "274", "275", "276", "277", "278", "279", "280", "281", "282", "283", "284", "285", "286", "287 (Default)"),
+            defaultValue = "287",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_mdec_yuv",
+            label = "MDEC YUV Chroma Filter",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_msaa",
+            label = "Multi-Sampled Anti Aliasing",
+            values = listOf("1x", "2x", "4x", "8x", "16x"),
+            valueLabels = listOf("1x", "2x", "4x", "8x", "16x"),
+            defaultValue = "1x",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_pal_video_timing_override",
+            label = "PAL Video Timing Override",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_renderer_software_fb",
+            label = "Software Framebuffer",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_replace_textures",
+            label = "Replace Textures",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_scaled_uv_offset",
+            label = "Texture UV Offset",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_super_sampling",
+            label = "Supersampling (Downsample to Native Resolution)",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_track_textures",
+            label = "Track Textures",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_cpu_dynarec",
+            label = "CPU Dynarec",
+            values = listOf("disabled", "execute", "run_interpreter"),
+            valueLabels = listOf("Disabled (Beetle Interpreter)", "Max Performance", "Lightrec Interpreter"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dynarec_eventcycles",
+            label = "Dynarec DMA/GPU/MDEC/Timer Event Cycles",
+            values = listOf("128", "256", "384", "512", "640", "768", "896", "1024", "1152", "1280", "1408", "1536", "1664", "1792", "1920", "2048"),
+            valueLabels = listOf("128 (Default)", "256", "384", "512", "640", "768", "896", "1024", "1152", "1280", "1408", "1536", "1664", "1792", "1920", "2048"),
+            defaultValue = "128",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dynarec_invalidate",
+            label = "Dynarec Code Invalidation",
+            values = listOf("full", "dma"),
+            valueLabels = listOf("Full", "DMA Only (Slightly Faster)"),
+            defaultValue = "full",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dynarec_op_cycles",
+            label = "Dynarec Cycles Per Instruction",
+            values = listOf("2", "1"),
+            valueLabels = listOf("2 (Default)", "1 (Accurate, Fixes Parasite Eve 2 etc.)"),
+            defaultValue = "2",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dynarec_spgp_opt",
+            label = "Dynarec SP GP Hit RAM Optimization",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_dynarec_spu_samples",
+            label = "Dynarec SPU Samples",
+            values = listOf("1", "4", "16"),
+            valueLabels = listOf("1 (Default)", "4", "16"),
+            defaultValue = "1",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_line_render",
+            label = "Line-to-Quad Hack",
+            values = listOf("default", "aggressive", "disabled"),
+            valueLabels = listOf("Default", "Aggressive", "disabled"),
+            defaultValue = "default",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_pgxp_2d_tol",
+            label = "PGXP 2D Geometry Tolerance",
+            values = listOf("disabled", "0px", "1px", "2px", "3px", "4px", "5px", "6px", "7px", "8px"),
+            valueLabels = listOf("disabled", "0px", "1px", "2px", "3px", "4px", "5px", "6px", "7px", "8px"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_pgxp_mode",
+            label = "PGXP Operation Mode",
+            values = listOf("disabled", "memory only", "memory + CPU"),
+            valueLabels = listOf("disabled", "Memory Only", "Memory + CPU (Buggy)"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_pgxp_nclip",
+            label = "PGXP Primitive Culling",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_pgxp_texture",
+            label = "PGXP Perspective Correct Texturing",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_pgxp_vertex",
+            label = "PGXP Vertex Cache",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_spu_silent_voice",
+            label = "SPU Silent Voice Optimization",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_widescreen_hack",
+            label = "Widescreen Mode Hack",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+            labelRes = R.string.retro_co_widescreen_hack,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_widescreen_hack_aspect_ratio",
+            label = "Widescreen Mode Hack Aspect Ratio",
+            values = listOf("16:9", "16:10", "18:9", "19:9", "20:9", "21:9", "32:9"),
+            valueLabels = listOf("16:9", "16:10", "18:9", "19:9", "20:9", "21:9", "32:9"),
+            defaultValue = "16:9",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_cd_access_method",
+            label = "CD Access Method",
+            values = listOf("sync", "async", "precache"),
+            valueLabels = listOf("Synchronous", "Asynchronous", "Pre-Cache"),
+            defaultValue = "sync",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_cd_fastload",
+            label = "CD Loading Speed",
+            values = listOf("2x(native)", "4x", "6x", "8x", "10x", "12x", "14x"),
+            valueLabels = listOf("2x (Native)", "4x", "6x", "8x", "10x", "12x", "14x"),
+            defaultValue = "2x(native)",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_cpu_freq_scale",
+            label = "CPU Frequency Scaling (Overclock)",
+            values = listOf("50%", "60%", "70%", "80%", "90%", "100%", "110%", "120%", "130%", "140%", "150%", "160%", "170%", "180%", "190%", "200%", "210%", "220%", "230%", "240%", "250%", "260%", "270%", "280%", "290%", "300%", "310%", "320%", "330%", "340%", "350%", "360%", "370%", "380%", "390%", "400%", "410%", "420%", "430%", "440%", "450%", "460%", "470%", "480%", "490%", "500%", "510%", "520%", "530%", "540%", "550%", "560%", "570%", "580%", "590%", "600%", "610%", "620%", "630%", "640%", "650%", "660%", "670%", "680%", "690%", "700%", "710%", "720%", "730%", "740%", "750%"),
+            valueLabels = listOf("50%", "60%", "70%", "80%", "90%", "100% (Native)", "110%", "120%", "130%", "140%", "150%", "160%", "170%", "180%", "190%", "200%", "210%", "220%", "230%", "240%", "250%", "260%", "270%", "280%", "290%", "300%", "310%", "320%", "330%", "340%", "350%", "360%", "370%", "380%", "390%", "400%", "410%", "420%", "430%", "440%", "450%", "460%", "470%", "480%", "490%", "500%", "510%", "520%", "530%", "540%", "550%", "560%", "570%", "580%", "590%", "600%", "610%", "620%", "630%", "640%", "650%", "660%", "670%", "680%", "690%", "700%", "710%", "720%", "730%", "740%", "750%"),
+            defaultValue = "100%",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_display_internal_fps",
+            label = "Display Internal FPS",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_display_osd",
+            label = "Display OSD Messages",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_display_vram",
+            label = "Display Full VRAM (Debug)",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_enable_memcard1",
+            label = "Memory Card Slot 2",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_gpu_overclock",
+            label = "GPU Rasterizer Overclock",
+            values = listOf("1x(native)", "2x", "4x", "8x", "16x", "32x"),
+            valueLabels = listOf("1x (Native)", "2x", "4x", "8x", "16x", "32x"),
+            defaultValue = "1x(native)",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_gte_overclock",
+            label = "GTE Overclock",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_memcard_left_index",
+            label = "Memory Card Slot 1 Index",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63"),
+            valueLabels = listOf("0 (Default)", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63"),
+            defaultValue = "0",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_memcard_right_index",
+            label = "Memory Card Slot 2 Index",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63"),
+            valueLabels = listOf("0", "1 (Default)", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63"),
+            defaultValue = "1",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_override_bios",
+            label = "Override BIOS",
+            values = listOf("disabled", "psxonpsp", "ps1_rom", "openbios"),
+            valueLabels = listOf("disabled", "PSP PS1 BIOS", "PS3 PS1 BIOS", "OpenBIOS"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_region",
+            label = "System Region",
+            values = listOf("auto", "ntsc-j", "ntsc-u", "pal"),
+            valueLabels = listOf("Auto", "NTSC-J (Japan)", "NTSC-U (North America)", "PAL (Europe)"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_shared_memory_cards",
+            label = "Shared Memory Cards",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_skip_bios",
+            label = "Skip BIOS",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "beetle_psx_use_mednafen_memcard0_method",
+            label = "Memory Card Method",
+            values = listOf("libretro", "mednafen"),
+            valueLabels = listOf("Libretro", "Mednafen"),
+            defaultValue = "libretro",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+    )
+
+    val MUPEN64PLUS_NEXT: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "mupen64plus-alt-map",
+            label = "Independent C-button Controls",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-astick-deadzone",
+            label = "Analog Deadzone (percent)",
+            values = listOf("0", "5", "10", "15", "20", "25", "30"),
+            valueLabels = listOf("0", "5", "10", "15", "20", "25", "30"),
+            defaultValue = "15",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-astick-sensitivity",
+            label = "Analog Sensitivity (percent)",
+            values = listOf("50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", "105", "110", "115", "120", "125", "130", "135", "140", "145", "150"),
+            valueLabels = listOf("50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100", "105", "110", "115", "120", "125", "130", "135", "140", "145", "150"),
+            defaultValue = "100",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-d-cbutton",
+            label = "Down C Button",
+            values = listOf("C1", "C2", "C3", "C4"),
+            valueLabels = listOf("C1", "C2", "C3", "C4"),
+            defaultValue = "C3",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-l-cbutton",
+            label = "Left C Button",
+            values = listOf("C1", "C2", "C3", "C4"),
+            valueLabels = listOf("C1", "C2", "C3", "C4"),
+            defaultValue = "C2",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-pak1",
+            label = "Player 1 Pak",
+            values = listOf("none", "memory", "rumble", "transfer"),
+            valueLabels = listOf("none", "memory", "rumble", "transfer"),
+            defaultValue = "memory",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-pak2",
+            label = "Player 2 Pak",
+            values = listOf("none", "memory", "rumble", "transfer"),
+            valueLabels = listOf("none", "memory", "rumble", "transfer"),
+            defaultValue = "none",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-pak3",
+            label = "Player 3 Pak",
+            values = listOf("none", "memory", "rumble", "transfer"),
+            valueLabels = listOf("none", "memory", "rumble", "transfer"),
+            defaultValue = "none",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-pak4",
+            label = "Player 4 Pak",
+            values = listOf("none", "memory", "rumble", "transfer"),
+            valueLabels = listOf("none", "memory", "rumble", "transfer"),
+            defaultValue = "none",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-r-cbutton",
+            label = "Right C Button",
+            values = listOf("C1", "C2", "C3", "C4"),
+            valueLabels = listOf("C1", "C2", "C3", "C4"),
+            defaultValue = "C1",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-u-cbutton",
+            label = "Up C Button",
+            values = listOf("C1", "C2", "C3", "C4"),
+            valueLabels = listOf("C1", "C2", "C3", "C4"),
+            defaultValue = "C4",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-169screensize",
+            label = "Wide Resolution",
+            values = listOf("640x360", "960x540", "1280x720", "1706x720", "1366x768", "1920x810", "1920x1080", "2560x1080", "2560x1440", "3414x1440", "3840x2160", "4096x2160", "5120x2160", "7680x3240", "7680x4320", "10240x4320"),
+            valueLabels = listOf("640x360 (16:9)", "960x540 (16:9)", "1280x720 (16:9)", "1706x720 (64:27)", "1366x768 (16:9)", "1920x810 (64:27)", "1920x1080 (16:9)", "2560x1080 (64:27)", "2560x1440 (16:9)", "3414x1440 (64:27)", "3840x2160 (16:9)", "4096x2160 (17:9)", "5120x2160 (64:27)", "7680x3240 (64:27)", "7680x4320 (16:9)", "10240x4320 (64:27)"),
+            defaultValue = "960x540",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-43screensize",
+            label = "4:3 Resolution",
+            values = listOf("320x240", "640x480", "960x720", "1280x960", "1440x1080", "1600x1200", "1920x1440", "2240x1680", "2560x1920", "2880x2160", "3200x2400", "3520x2640", "3840x2880"),
+            valueLabels = listOf("320x240", "640x480", "960x720", "1280x960", "1440x1080", "1600x1200", "1920x1440", "2240x1680", "2560x1920", "2880x2160", "3200x2400", "3520x2640", "3840x2880"),
+            defaultValue = "640x480",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_resolution,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-BackgroundMode",
+            label = "Background Mode",
+            values = listOf("Stripped", "OnePiece"),
+            valueLabels = listOf("Stripped", "OnePiece"),
+            defaultValue = "OnePiece",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-BilinearMode",
+            label = "Bilinear filtering mode",
+            values = listOf("3point", "standard"),
+            valueLabels = listOf("3point", "standard"),
+            defaultValue = "standard",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-CorrectTexrectCoords",
+            label = "Continuous texrect coords",
+            values = listOf("Off", "Auto", "Force"),
+            valueLabels = listOf("Off", "Auto", "Force"),
+            defaultValue = "Off",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-DitheringPattern",
+            label = "Dithering",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-DitheringQuantization",
+            label = "Dithering Quantization",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableCopyAuxToRDRAM",
+            label = "Copy auxiliary buffers to RDRAM",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableCopyColorFromRDRAM",
+            label = "Enable color buffer copy from RDRAM",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableCopyColorToRDRAM",
+            label = "Color buffer to RDRAM",
+            values = listOf("Off", "Sync", "Async", "TripleBuffer"),
+            valueLabels = listOf("Off", "Sync", "DoubleBuffer", "TripleBuffer"),
+            defaultValue = "Async",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableCopyDepthToRDRAM",
+            label = "Depth buffer to RDRAM",
+            values = listOf("Off", "Software", "FromMem"),
+            valueLabels = listOf("Off", "Software", "FromMem"),
+            defaultValue = "Software",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableEnhancedHighResStorage",
+            label = "Use enhanced Hi-Res Storage",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableEnhancedTextureStorage",
+            label = "Use enhanced Texture Storage",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableFBEmulation",
+            label = "Framebuffer Emulation",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_framebuffer_emulation,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableFragmentDepthWrite",
+            label = "GPU shader depth write",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableHWLighting",
+            label = "Hardware per-pixel lighting",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableHiResAltCRC",
+            label = "Use alternative method for High-Res Checksums",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableInaccurateTextureCoordinates",
+            label = "Enable inaccurate texture coordinates",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableLODEmulation",
+            label = "LOD Emulation",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableLegacyBlending",
+            label = "Less accurate blending mode",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableN64DepthCompare",
+            label = "N64 Depth Compare",
+            values = listOf("False", "True", "Compatible"),
+            valueLabels = listOf("Off", "Fast", "Compatible"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableNativeResFactor",
+            label = "Native Resolution Factor",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8"),
+            valueLabels = listOf("Disabled", "1x", "2x", "3x", "4x", "5x", "6x", "7x", "8x"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableNativeResTexrects",
+            label = "Native res. 2D texrects",
+            values = listOf("Disabled", "Unoptimized", "Optimized"),
+            valueLabels = listOf("Disabled", "Unoptimized", "Optimized"),
+            defaultValue = "Disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableOverscan",
+            label = "Overscan",
+            values = listOf("Disabled", "Enabled"),
+            valueLabels = listOf("Disabled", "Enabled"),
+            defaultValue = "Enabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableShadersStorage",
+            label = "Cache GPU Shaders",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableTexCoordBounds",
+            label = "Enable native-res boundaries for texture coordinates",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-EnableTextureCache",
+            label = "Cache Textures",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-FXAA",
+            label = "FXAA",
+            values = listOf("0", "1"),
+            valueLabels = listOf("0", "1"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-GLideN64IniBehaviour",
+            label = "INI Behaviour",
+            values = listOf("late", "early", "disabled"),
+            valueLabels = listOf("Prioritize INI over Core Options", "Prioritize Core Options over INI", "Disable INI"),
+            defaultValue = "late",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-HybridFilter",
+            label = "Hybrid Filter",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-MaxHiResTxVramLimit",
+            label = "Max High-Res VRAM Limit",
+            values = listOf("0", "500", "1000", "1500", "2000", "2500", "3000", "3500", "4000"),
+            valueLabels = listOf("0", "500", "1000", "1500", "2000", "2500", "3000", "3500", "4000"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-MaxTxCacheSize",
+            label = "Max texture cache size",
+            values = listOf("1500", "4000", "8000"),
+            valueLabels = listOf("1500", "4000", "8000"),
+            defaultValue = "1500",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-MultiSampling",
+            label = "MSAA level",
+            values = listOf("0", "2", "4", "8", "16"),
+            valueLabels = listOf("0", "2", "4", "8", "16"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-OverscanBottom",
+            label = "Overscan Offset (Bottom)",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-OverscanLeft",
+            label = "Overscan Offset (Left)",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-OverscanRight",
+            label = "Overscan Offset (Right)",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-OverscanTop",
+            label = "Overscan Offset (Top)",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-RDRAMImageDitheringMode",
+            label = "Image Dithering Mode",
+            values = listOf("False", "Bayer", "MagicSquare", "BlueNoise"),
+            valueLabels = listOf("Disabled", "Bayer", "Magic Square", "Blue Noise"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-ThreadedRenderer",
+            label = "Threaded Renderer",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-angrylion-multithread",
+            label = "Multi-threading",
+            values = listOf("all threads", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "75"),
+            valueLabels = listOf("all threads", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "75"),
+            defaultValue = "all threads",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "angrylion",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-angrylion-overscan",
+            label = "Hide overscan",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "angrylion",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-angrylion-sync",
+            label = "Thread sync level",
+            values = listOf("Low", "Medium", "High"),
+            valueLabels = listOf("Low", "Medium", "High"),
+            defaultValue = "Low",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "angrylion",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-angrylion-vioverlay",
+            label = "VI Overlay",
+            values = listOf("Filtered", "AA+Blur", "AA+Dedither", "AA only", "Unfiltered", "Depth", "Coverage"),
+            valueLabels = listOf("Filtered", "AA+Blur", "AA+Dedither", "AA only", "Unfiltered", "Depth", "Coverage"),
+            defaultValue = "Filtered",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "angrylion",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-aspect",
+            label = "Aspect Ratio",
+            values = listOf("4:3", "16:9", "16:9 adjusted"),
+            valueLabels = listOf("Original (4:3)", "Wide (Stretched)", "Wide (Adjusted)"),
+            defaultValue = "4:3",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            labelRes = R.string.retro_co_aspect_ratio,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-deinterlace-method",
+            label = "(ParaLLEl-RDP) Deinterlacing method",
+            values = listOf("Bob", "Weave"),
+            valueLabels = listOf("Bob", "Weave"),
+            defaultValue = "Bob",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-dither-filter",
+            label = "(ParaLLEl-RDP) VI dither filter",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-divot-filter",
+            label = "(ParaLLEl-RDP) VI Divot filter",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-downscaling",
+            label = "(ParaLLEl-RDP) Downsampling factor",
+            values = listOf("disable", "1/2", "1/4", "1/8"),
+            valueLabels = listOf("disable", "1/2", "1/4", "1/8"),
+            defaultValue = "disable",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-gamma-dither",
+            label = "(ParaLLEl-RDP) VI Gamma dither",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-native-tex-rect",
+            label = "(ParaLLEl-RDP) Native resolution TEX_RECT",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-native-texture-lod",
+            label = "(ParaLLEl-RDP) Native texture LOD",
+            values = listOf("False", "True"),
+            valueLabels = listOf("Disabled", "Enabled"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-overscan",
+            label = "(ParaLLEl-RDP) Crop overscan",
+            values = listOf("0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24", "26", "28", "30", "32", "34", "36", "38", "40", "42", "44", "46", "48", "50", "52", "54", "56", "58", "60", "62", "64"),
+            valueLabels = listOf("0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24", "26", "28", "30", "32", "34", "36", "38", "40", "42", "44", "46", "48", "50", "52", "54", "56", "58", "60", "62", "64"),
+            defaultValue = "0",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-super-sampled-read-back",
+            label = "(ParaLLEl-RDP) SSAA framebuffer effects (restart)",
+            values = listOf("False", "True"),
+            valueLabels = listOf("Disabled", "Enabled"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-super-sampled-read-back-dither",
+            label = "(ParaLLEl-RDP) Dither SSAA framebuffer effects (restart)",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-synchronous",
+            label = "(ParaLLEl-RDP) Synchronous RDP",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-upscaling",
+            label = "(ParaLLEl-RDP) Upscaling factor (restart)",
+            values = listOf("1x", "2x", "4x", "8x"),
+            valueLabels = listOf("1x", "2x", "4x", "8x"),
+            defaultValue = "1x",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-vi-aa",
+            label = "(ParaLLEl-RDP) VI anti-aliasing",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-parallel-rdp-vi-bilinear",
+            label = "(ParaLLEl-RDP) VI bilinear",
+            values = listOf("True", "False"),
+            valueLabels = listOf("Enabled", "Disabled"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "parallel",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-rdp-plugin",
+            label = "RDP Plugin",
+            values = listOf("angrylion", "parallel", "gliden64"),
+            valueLabels = listOf("Angrylion", "ParaLLEl-RDP", "GLideN64"),
+            defaultValue = "gliden64",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-txCacheCompression",
+            label = "Use High-Res Texture Cache Compression",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-txEnhancementMode",
+            label = "Texture Enhancement",
+            values = listOf("None", "As Is", "X2", "X2SAI", "HQ2X", "HQ2XS", "LQ2X", "LQ2XS", "HQ4X", "2xBRZ", "3xBRZ", "4xBRZ", "5xBRZ", "6xBRZ"),
+            valueLabels = listOf("None", "As Is", "X2", "X2SAI", "HQ2X", "HQ2XS", "LQ2X", "LQ2XS", "HQ4X", "2xBRZ", "3xBRZ", "4xBRZ", "5xBRZ", "6xBRZ"),
+            defaultValue = "None",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-txFilterIgnoreBG",
+            label = "Don't filter background textures",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-txFilterMode",
+            label = "Texture filter",
+            values = listOf("None", "Smooth filtering 1", "Smooth filtering 2", "Smooth filtering 3", "Smooth filtering 4", "Sharp filtering 1", "Sharp filtering 2"),
+            valueLabels = listOf("None", "Smooth filtering 1", "Smooth filtering 2", "Smooth filtering 3", "Smooth filtering 4", "Sharp filtering 1", "Sharp filtering 2"),
+            defaultValue = "None",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-txHiresEnable",
+            label = "Use High-Res textures",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-txHiresFullAlphaChannel",
+            label = "Use High-Res Full Alpha Channel",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = true,
+            visibleWhen = "mupen64plus-rdp-plugin" to "gliden64",
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-CountPerOp",
+            label = "Count Per Op",
+            values = listOf("0", "1", "2", "3", "4", "5"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5"),
+            defaultValue = "0",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-CountPerOpDenomPot",
+            label = "Count Per Op Divider (Overclock)",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"),
+            defaultValue = "0",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-FrameDuping",
+            label = "Frame Duplication",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "True",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-Framerate",
+            label = "Framerate",
+            values = listOf("Original", "Fullspeed"),
+            valueLabels = listOf("Original", "Fullspeed"),
+            defaultValue = "Original",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-IgnoreTLBExceptions",
+            label = "Ignore emulated TLB Exceptions",
+            values = listOf("False", "OnlyNotEnabled", "AlwaysIgnoreTLB"),
+            valueLabels = listOf("Don't Ignore", "Ignore TLB Exceptions if not using TLB", "Always Ignore TLB Exceptions"),
+            defaultValue = "False",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = true,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-cpucore",
+            label = "CPU Core",
+            values = listOf("pure_interpreter", "cached_interpreter", "dynamic_recompiler"),
+            valueLabels = listOf("Pure Interpreter", "Cached Interpreter", "Dynarec"),
+            defaultValue = "dynamic_recompiler",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-rsp-plugin",
+            label = "RSP Plugin",
+            values = listOf("cxd4", "parallel", "hle"),
+            valueLabels = listOf("CXD4", "ParaLLEl", "HLE"),
+            defaultValue = "hle",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-virefresh",
+            label = "VI Refresh (Overclock)",
+            values = listOf("Auto", "1500", "2200"),
+            valueLabels = listOf("Auto", "1500", "2200"),
+            defaultValue = "Auto",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "mupen64plus-ForceDisableExtraMem",
+            label = "Disable Expansion Pak",
+            values = listOf("False", "True"),
+            valueLabels = listOf("False", "True"),
+            defaultValue = "False",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = true,
+        ),
+    )
+
+    val GPSP: List<RetroCoreOption> = listOf(
+        RetroCoreOption(
+            key = "gpsp_rumble",
+            label = "Rumble support",
+            values = listOf("auto", "enabled", "disabled"),
+            valueLabels = listOf("auto", "enabled", "disabled"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_turbo_period",
+            label = "Turbo Button Period",
+            values = listOf("4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120"),
+            valueLabels = listOf("4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120"),
+            defaultValue = "4",
+            category = RetroOptionCategory.CONTROLS,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_color_correction",
+            label = "Color Correction",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.DISPLAY,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_frameskip",
+            label = "Frameskip",
+            values = listOf("disabled", "auto", "auto_threshold", "fixed_interval"),
+            valueLabels = listOf("disabled", "Auto", "Auto (Threshold)", "Fixed Interval"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_frameskip_interval",
+            label = "Frameskip Interval",
+            values = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            valueLabels = listOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"),
+            defaultValue = "1",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_frameskip_threshold",
+            label = "Frameskip Threshold (%)",
+            values = listOf("15", "18", "21", "24", "27", "30", "33", "36", "39", "42", "45", "48", "51", "54", "57", "60"),
+            valueLabels = listOf("15", "18", "21", "24", "27", "30", "33", "36", "39", "42", "45", "48", "51", "54", "57", "60"),
+            defaultValue = "33",
+            category = RetroOptionCategory.PERFORMANCE,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_bios",
+            label = "BIOS",
+            values = listOf("auto", "builtin", "official"),
+            valueLabels = listOf("Auto select", "Builtin BIOS", "Original BIOS"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_boot_mode",
+            label = "Boot mode",
+            values = listOf("game", "bios"),
+            valueLabels = listOf("Boot to game", "Boot to BIOS"),
+            defaultValue = "game",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_drc",
+            label = "Dynamic Recompiler",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_frame_mixing",
+            label = "Interframe Blending",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("enabled", "disabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_rtc",
+            label = "RTC support",
+            values = listOf("auto", "enabled", "disabled"),
+            valueLabels = listOf("auto", "enabled", "disabled"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_serial",
+            label = "Link Cable Connectivity",
+            values = listOf("auto", "disabled", "rfu", "mul_poke", "mul_aw1", "mul_aw2"),
+            valueLabels = listOf("Automatic", "Disabled", "GBA Wireless Adapter", "Link Cable - Pokemon Gen3 mode", "Link Cable - Advance Wars 1 mode", "Link Cable - Advance Wars 2 mode"),
+            defaultValue = "auto",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_sound_rate",
+            label = "Sound Output Rate (Hz)",
+            values = listOf("65536", "32768"),
+            valueLabels = listOf("65536", "32768"),
+            defaultValue = "65536",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+        RetroCoreOption(
+            key = "gpsp_sprlim",
+            label = "No Sprite Limit",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("disabled", "enabled"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            advanced = false,
+        ),
+    )
+
+}
diff --git a/app/src/main/feature/retro/RetroCoreManager.kt b/app/src/main/feature/retro/RetroCoreManager.kt
new file mode 100644
index 000000000..129dd3ab8
--- /dev/null
+++ b/app/src/main/feature/retro/RetroCoreManager.kt
@@ -0,0 +1,169 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import java.io.File
+
+object RetroCoreManager {
+    private fun resolveCore(
+        context: Context,
+        fileName: String,
+    ): File = File(RetroBundle.coresDir(context), fileName)
+
+    fun coreFile(
+        context: Context,
+        system: RetroSystem,
+    ): File = resolveCore(context, system.coreFileName)
+
+    fun multiplayerCoreFile(
+        context: Context,
+        system: RetroSystem,
+    ): File =
+        if (system.id == RetroSystems.GBA.id) {
+            resolveCore(context, RetroSystems.GBA_MULTIPLAYER_CORE)
+        } else {
+            coreFile(context, system)
+        }
+
+    fun isCoreAvailable(
+        context: Context,
+        system: RetroSystem,
+    ): Boolean = coreFile(context, system).isFile
+
+    fun isMultiplayerCoreAvailable(
+        context: Context,
+        system: RetroSystem,
+    ): Boolean = multiplayerCoreFile(context, system).isFile
+
+    fun systemDir(context: Context): File = File(context.filesDir, "retro/system").also { it.mkdirs() }
+
+    fun savesDir(context: Context): File = File(context.filesDir, "retro/saves").also { it.mkdirs() }
+
+    fun statesDir(context: Context): File = File(context.filesDir, "retro/states").also { it.mkdirs() }
+
+    fun stateFile(
+        context: Context,
+        gameName: String,
+        slot: Int,
+    ): File {
+        val safe = gameName.replace(Regex("[^A-Za-z0-9._-]"), "_")
+        val suffix = if (slot <= 0) "state" else "state$slot"
+        return File(statesDir(context), "$safe.$suffix")
+    }
+
+    fun ensureGlideN64Ini(context: Context) {
+        val target = File(File(systemDir(context), "Mupen64plus").also { it.mkdirs() }, "GLideN64.custom.ini")
+        runCatching {
+            context.assets.open("retro/GLideN64.custom.ini").use { input ->
+                val bytes = input.readBytes()
+                if (!target.isFile || target.length() != bytes.size.toLong()) {
+                    target.writeBytes(bytes)
+                }
+            }
+        }
+    }
+
+    fun ensureDolphinSys(context: Context) {
+        val marker = File(systemDir(context), "dolphin-emu/.wn_sys_ready")
+        if (marker.isFile) return
+        val destRoot = File(systemDir(context), "dolphin-emu").also { it.mkdirs() }
+        runCatching {
+            val fromBundle = File(RetroBundle.dataDir(context), "dolphin-emu")
+            if (!fromBundle.isDirectory) return
+            fromBundle.copyRecursively(destRoot, overwrite = true)
+            marker.parentFile?.mkdirs()
+            marker.writeText("1")
+        }
+    }
+
+    fun ensureDolphinUser(context: Context) {
+        val userRoot = File(savesDir(context), "User")
+        val gcRoot = File(userRoot, "GC").also { it.mkdirs() }
+        for (region in listOf("USA", "EUR", "JAP")) {
+            File(gcRoot, "$region/Card A").mkdirs()
+            File(gcRoot, "$region/Card B").mkdirs()
+        }
+        File(userRoot, "Config").mkdirs()
+        File(userRoot, "Wii").mkdirs()
+        File(userRoot, "GBA/Saves").mkdirs()
+        ensureDolphinIni(File(userRoot, "Config/Dolphin.ini"))
+    }
+
+    private fun ensureDolphinIni(ini: File) {
+        runCatching {
+            val existing = if (ini.isFile) ini.readText() else ""
+            val desired =
+                mapOf(
+                    "SlotA" to "8",
+                    "SlotB" to "255",
+                    "MemcardAPath" to "",
+                    "MemcardBPath" to "",
+                    "GCIFolderAPath" to "",
+                    "GCIFolderBPath" to "",
+                    "MemoryCardSize" to "-1",
+                    "CPUThread" to "False",
+                    "Fastmem" to "False",
+                    "FastmemArena" to "False",
+                )
+            val merged = mergeIniSection(existing, "Core", desired)
+            if (merged != existing) {
+                ini.parentFile?.mkdirs()
+                ini.writeText(merged)
+            }
+        }
+    }
+
+    private fun mergeIniSection(
+        source: String,
+        section: String,
+        keys: Map<String, String>,
+    ): String {
+        if (keys.isEmpty()) return source
+        val lines = source.replace("\r\n", "\n").split('\n').toMutableList()
+        val header = "[$section]"
+        var sectionStart = lines.indexOfFirst { it.trim().equals(header, ignoreCase = true) }
+        if (sectionStart < 0) {
+            val builder = StringBuilder(source.trimEnd())
+            if (builder.isNotEmpty()) builder.append("\n\n")
+            builder.append(header).append('\n')
+            for ((k, v) in keys) builder.append(k).append(" = ").append(v).append('\n')
+            return builder.toString()
+        }
+        var sectionEnd = lines.size
+        for (i in (sectionStart + 1) until lines.size) {
+            val t = lines[i].trim()
+            if (t.startsWith("[") && t.endsWith("]")) {
+                sectionEnd = i
+                break
+            }
+        }
+        val remaining = keys.toMutableMap()
+        for (i in (sectionStart + 1) until sectionEnd) {
+            val raw = lines[i]
+            val trimmed = raw.trim()
+            if (trimmed.isEmpty() || trimmed.startsWith("#") || trimmed.startsWith(";")) continue
+            val eq = trimmed.indexOf('=')
+            if (eq <= 0) continue
+            val key = trimmed.substring(0, eq).trim()
+            val wanted = remaining.remove(key) ?: continue
+            lines[i] = "$key = $wanted"
+        }
+        if (remaining.isNotEmpty()) {
+            val insertAt = sectionEnd
+            val block = remaining.map { (k, v) -> "$k = $v" }
+            lines.addAll(insertAt, block)
+        }
+        return lines.joinToString("\n").let { if (it.endsWith("\n")) it else "$it\n" }
+    }
+
+    fun usesDolphinCore(system: RetroSystem?): Boolean =
+        system?.id == RetroSystems.GAMECUBE.id || system?.id == RetroSystems.WII.id
+
+    fun missingBios(
+        context: Context,
+        system: RetroSystem,
+    ): Boolean {
+        if (!system.needsBios) return false
+        val dir = systemDir(context)
+        return system.biosFiles.none { File(dir, it).isFile }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroCoreOptions.kt b/app/src/main/feature/retro/RetroCoreOptions.kt
new file mode 100644
index 000000000..75c5fd69a
--- /dev/null
+++ b/app/src/main/feature/retro/RetroCoreOptions.kt
@@ -0,0 +1,284 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import com.winlator.cmod.R
+
+enum class RetroOptionCategory {
+    DISPLAY,
+    SOUND,
+    PERFORMANCE,
+    CONTROLS,
+    SYSTEM,
+}
+
+data class RetroCoreOption(
+    val key: String,
+    val label: String,
+    val values: List<String>,
+    val valueLabels: List<String>,
+    val defaultValue: String,
+    val category: RetroOptionCategory = RetroOptionCategory.SYSTEM,
+    val advanced: Boolean = false,
+    @androidx.annotation.StringRes val labelRes: Int? = null,
+    val visibleWhen: Pair<String, String>? = null,
+) {
+    fun labelText(context: Context): String = labelRes?.let { context.getString(it) } ?: label
+
+    fun isApplicable(current: (String) -> String?): Boolean {
+        val (key, value) = visibleWhen ?: return true
+        return (current(key) ?: return true) == value
+    }
+}
+
+object RetroCoreOptions {
+    private val DOLPHIN_COMMON_OPTIONS =
+        listOf(
+            RetroCoreOption(
+                key = "dolphin_renderer",
+                label = "Renderer",
+                values = listOf("Hardware", "Software"),
+                valueLabels = listOf("Hardware", "Software"),
+                defaultValue = "Hardware",
+                category = RetroOptionCategory.DISPLAY,
+                labelRes = R.string.retro_co_renderer,
+            ),
+            RetroCoreOption(
+                key = "dolphin_efb_scale",
+                label = "Internal Resolution",
+                values = listOf("1", "2", "3", "4", "5", "6"),
+                valueLabels = listOf("1x", "2x", "3x", "4x", "5x", "6x"),
+                defaultValue = "1",
+                category = RetroOptionCategory.DISPLAY,
+                labelRes = R.string.retro_co_internal_resolution,
+            ),
+        )
+
+    private fun dolphinAspectOption(defaultValue: String) =
+        RetroCoreOption(
+            key = "dolphin_aspect_ratio",
+            label = "Aspect Ratio",
+            values = listOf("0", "1", "2", "3"),
+            valueLabels = listOf("Auto", "16:9", "4:3", "Stretch"),
+            defaultValue = defaultValue,
+            category = RetroOptionCategory.DISPLAY,
+            labelRes = R.string.retro_co_aspect_ratio,
+        )
+
+    private val DOLPHIN_CPU_OPTIONS =
+        listOf(
+            RetroCoreOption(
+                key = "dolphin_cpu_core",
+                label = "CPU Core",
+                values = listOf("4", "5", "0"),
+                valueLabels = listOf("JIT", "Cached Interpreter", "Interpreter"),
+                defaultValue = "4",
+                category = RetroOptionCategory.PERFORMANCE,
+                labelRes = R.string.retro_co_cpu_core,
+            ),
+            RetroCoreOption(
+                key = "dolphin_main_cpu_thread",
+                label = "Dual Core",
+                values = listOf("disabled", "enabled"),
+                valueLabels = listOf("Off", "On"),
+                defaultValue = "disabled",
+                category = RetroOptionCategory.PERFORMANCE,
+                labelRes = R.string.retro_co_dual_core,
+            ),
+        )
+
+    private val DOLPHIN_CHEATS_OPTION =
+        RetroCoreOption(
+            key = "dolphin_cheats_enabled",
+            label = "Internal Cheats",
+            values = listOf("disabled", "enabled"),
+            valueLabels = listOf("Off", "On"),
+            defaultValue = "disabled",
+            category = RetroOptionCategory.SYSTEM,
+            labelRes = R.string.retro_co_internal_cheats,
+        )
+
+    private val DOLPHIN_VI_SKIP_OPTION =
+        RetroCoreOption(
+            key = "dolphin_vi_skip",
+            label = "VBI Skip",
+            values = listOf("enabled", "disabled"),
+            valueLabels = listOf("On", "Off"),
+            defaultValue = "enabled",
+            category = RetroOptionCategory.PERFORMANCE,
+            labelRes = R.string.retro_co_vbi_skip,
+        )
+
+    private val GAMECUBE_OPTIONS =
+        DOLPHIN_COMMON_OPTIONS +
+            dolphinAspectOption("2") +
+            listOf(
+                RetroCoreOption(
+                    key = "dolphin_widescreen_hack",
+                    label = "Widescreen Hack",
+                    values = listOf("disabled", "enabled"),
+                    valueLabels = listOf("Off", "On (16:9)"),
+                    defaultValue = "disabled",
+                    category = RetroOptionCategory.DISPLAY,
+                    labelRes = R.string.retro_co_widescreen_hack,
+                ),
+            ) +
+            DOLPHIN_CPU_OPTIONS +
+            listOf(
+                RetroCoreOption(
+                    key = "dolphin_skip_gc_bios",
+                    label = "Skip GameCube BIOS",
+                    values = listOf("enabled", "disabled"),
+                    valueLabels = listOf("On", "Off"),
+                    defaultValue = "enabled",
+                    category = RetroOptionCategory.SYSTEM,
+                    labelRes = R.string.retro_co_skip_gc_bios,
+                ),
+                DOLPHIN_VI_SKIP_OPTION,
+                DOLPHIN_CHEATS_OPTION,
+            )
+
+    private val WII_OPTIONS =
+        DOLPHIN_COMMON_OPTIONS +
+            dolphinAspectOption("1") +
+            listOf(
+                RetroCoreOption(
+                    key = "dolphin_widescreen",
+                    label = "Widescreen",
+                    values = listOf("enabled", "disabled"),
+                    valueLabels = listOf("On", "Off"),
+                    defaultValue = "enabled",
+                    category = RetroOptionCategory.DISPLAY,
+                    labelRes = R.string.retro_co_widescreen,
+                ),
+            ) +
+            DOLPHIN_CPU_OPTIONS +
+            listOf(
+                RetroCoreOption(
+                    key = "dolphin_sensor_bar_position",
+                    label = "Sensor Bar Position",
+                    values = listOf("0", "1"),
+                    valueLabels = listOf("Bottom", "Top"),
+                    defaultValue = "0",
+                    category = RetroOptionCategory.CONTROLS,
+                    labelRes = R.string.retro_co_sensor_bar,
+                ),
+                DOLPHIN_VI_SKIP_OPTION,
+                DOLPHIN_CHEATS_OPTION,
+            )
+
+    fun sanitizeDolphinVariables(vars: MutableMap<String, String>) {
+        when (vars["dolphin_cpu_core"]?.trim()) {
+            "JITARM64", "JIT", "JIT64" -> vars["dolphin_cpu_core"] = "4"
+            "Cached Interpreter", "CachedInterpreter" -> vars["dolphin_cpu_core"] = "5"
+            "Interpreter" -> vars["dolphin_cpu_core"] = "0"
+        }
+        vars["dolphin_efb_scale"]?.let { raw ->
+            val t = raw.trim()
+            if (t.length == 1 && t[0].isDigit()) return@let
+            val digit =
+                Regex("""^x?(\d+)""", RegexOption.IGNORE_CASE).find(t)?.groupValues?.getOrNull(1)
+            if (digit != null) vars["dolphin_efb_scale"] = digit
+        }
+        DOLPHIN_PERF_DEFAULTS.forEach { (k, v) ->
+            if (vars[k].isNullOrBlank()) vars[k] = v
+        }
+        if (vars["dolphin_skip_dupe_frames"] == "enabled") {
+            vars["dolphin_skip_dupe_frames"] = "disabled"
+        }
+    }
+
+    private val DOLPHIN_PERF_DEFAULTS: Map<String, String> =
+        mapOf(
+            "dolphin_renderer" to "Hardware",
+            "dolphin_efb_scale" to "1",
+            "dolphin_cpu_core" to "4",
+            "dolphin_main_cpu_thread" to "disabled",
+            "dolphin_dsp_hle" to "enabled",
+            "dolphin_fast_disc_speed" to "enabled",
+            "dolphin_vi_skip" to "disabled",
+            "dolphin_skip_dupe_frames" to "disabled",
+            "dolphin_cheats_enabled" to "disabled",
+        )
+
+    fun defaultVariables(system: RetroSystem?): Map<String, String> =
+        when (system?.id) {
+            RetroSystems.N64.id ->
+                mapOf(
+                    "mupen64plus-43screensize" to "640x480",
+                    "mupen64plus-EnableFBEmulation" to "True",
+                    "mupen64plus-aspect" to "4:3",
+                )
+            RetroSystems.PSX.id ->
+                mapOf(
+                    "beetle_psx_skip_bios" to "enabled",
+                )
+            RetroSystems.GAMECUBE.id ->
+                DOLPHIN_PERF_DEFAULTS +
+                    mapOf(
+                        "dolphin_widescreen" to "disabled",
+                        "dolphin_widescreen_hack" to "disabled",
+                        "dolphin_aspect_ratio" to "2",
+                        "dolphin_skip_gc_bios" to "enabled",
+                    )
+            RetroSystems.WII.id ->
+                DOLPHIN_PERF_DEFAULTS +
+                    mapOf(
+                        "dolphin_widescreen" to "enabled",
+                        "dolphin_aspect_ratio" to "1",
+                        "dolphin_sensor_bar_position" to "0",
+                    )
+            else -> emptyMap()
+        }
+
+    fun forSystem(system: RetroSystem?): List<RetroCoreOption> =
+        when (system?.id) {
+            RetroSystems.NES.id -> RetroCoreCatalog.FCEUMM
+            RetroSystems.SNES.id -> RetroCoreCatalog.SNES9X
+            RetroSystems.GAMEBOY.id, RetroSystems.GAMEBOY_COLOR.id -> RetroCoreCatalog.GAMBATTE
+            RetroSystems.GBA.id -> RetroCoreCatalog.MGBA
+            RetroSystems.GENESIS.id -> forGenesisFamily(RetroSystems.GENESIS.id)
+            RetroSystems.MASTER_SYSTEM.id -> forGenesisFamily(RetroSystems.MASTER_SYSTEM.id)
+            RetroSystems.GAME_GEAR.id -> forGenesisFamily(RetroSystems.GAME_GEAR.id)
+            RetroSystems.N64.id -> RetroCoreCatalog.MUPEN64PLUS_NEXT
+            RetroSystems.PSX.id -> RetroCoreCatalog.BEETLE_PSX
+            RetroSystems.GAMECUBE.id -> GAMECUBE_OPTIONS
+            RetroSystems.WII.id -> WII_OPTIONS
+            else -> emptyList()
+        }
+
+    private fun forGenesisFamily(systemId: String): List<RetroCoreOption> {
+        val promote =
+            when (systemId) {
+                RetroSystems.MASTER_SYSTEM.id ->
+                    setOf(
+                        "genesis_plus_gx_ym2413",
+                        "genesis_plus_gx_ym2413_core",
+                        "genesis_plus_gx_left_border",
+                    )
+                RetroSystems.GAME_GEAR.id ->
+                    setOf(
+                        "genesis_plus_gx_gg_extra",
+                        "genesis_plus_gx_lcd_filter",
+                    )
+                else -> emptySet()
+            }
+        val demote =
+            when (systemId) {
+                RetroSystems.GENESIS.id ->
+                    setOf(
+                        "genesis_plus_gx_ym2413",
+                        "genesis_plus_gx_ym2413_core",
+                        "genesis_plus_gx_left_border",
+                        "genesis_plus_gx_gg_extra",
+                    )
+                else -> emptySet()
+            }
+        return RetroCoreCatalog.GENESIS_PLUS_GX.map { option ->
+            when (option.key) {
+                in promote -> option.copy(advanced = false)
+                in demote -> option.copy(advanced = true)
+                else -> option
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroCreditsScreen.kt b/app/src/main/feature/retro/RetroCreditsScreen.kt
new file mode 100644
index 000000000..d9ab0aeeb
--- /dev/null
+++ b/app/src/main/feature/retro/RetroCreditsScreen.kt
@@ -0,0 +1,130 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val CreditsBg = Color(0xFF101018)
+private val CreditsText = Color(0xFFF0F4FF)
+private val CreditsSub = Color(0xFF93A6BC)
+
+@Composable
+fun RetroCreditsScreen(bridge: SettingsNavBridge? = null) {
+    val context = LocalContext.current
+    val contentNav = rememberSettingsContentNav(bridge)
+
+    fun open(url: String) {
+        runCatching {
+            context.startActivity(
+                android.content.Intent(
+                    android.content.Intent.ACTION_VIEW,
+                    android.net.Uri.parse(url),
+                ),
+            )
+        }
+    }
+
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(CreditsBg)
+                    .verticalScroll(rememberScrollState())
+                    .windowInsetsPadding(WindowInsets.navigationBars)
+                    .padding(16.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Text(
+                stringResource(R.string.retro_scr_credits_licenses),
+                color = CreditsSub,
+                fontSize = 11.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 1.sp,
+                modifier = Modifier.padding(top = 4.dp),
+            )
+            Text(
+                stringResource(R.string.retro_scr_credits_desc),
+                color = CreditsSub,
+                style = MaterialTheme.typography.labelMedium,
+            )
+            RetroSettingGroup {
+                RETRO_CREDITS.forEach { credit ->
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .clickable { open(credit.url) }
+                                .paneNavItem(
+                                    cornerRadius = 8.dp,
+                                    onActivate = { open(credit.url) },
+                                    highlightColor = Color(0xFF4FC3F7),
+                                    tapToSelect = true,
+                                )
+                                .padding(vertical = 8.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Column(Modifier.weight(1f)) {
+                            Text(credit.name, color = CreditsText, style = MaterialTheme.typography.bodyMedium)
+                            Text(credit.detail, color = CreditsSub, fontSize = 11.sp)
+                        }
+                        Text(credit.license, color = CreditsSub, fontSize = 11.sp)
+                    }
+                }
+            }
+        }
+    }
+}
+
+internal data class RetroCredit(
+    val name: String,
+    val detail: String,
+    val license: String,
+    val url: String,
+)
+
+internal val RETRO_CREDITS =
+    listOf(
+        RetroCredit("ARMSX2", "PlayStation 2", "GPL-3.0", "https://github.com/ARMSX2/ARMSX2"),
+        RetroCredit("Beetle PSX", "PlayStation", "GPL-2.0", "https://github.com/libretro/beetle-psx-libretro"),
+        RetroCredit("Dolphin", "GameCube / Wii", "GPL-2.0", "https://github.com/dolphin-emu/dolphin"),
+        RetroCredit("FCEUmm", "NES", "GPL-2.0", "https://github.com/libretro/libretro-fceumm"),
+        RetroCredit("Gambatte", "Game Boy / Color", "GPL-2.0", "https://github.com/libretro/gambatte-libretro"),
+        RetroCredit("Genesis Plus GX", "Genesis / SMS / GG", "GPX", "https://github.com/libretro/Genesis-Plus-GX"),
+        RetroCredit("LibretroDroid", "libretro frontend", "GPL-3.0", "https://github.com/Swordfish90/LibretroDroid"),
+        RetroCredit("mGBA", "Game Boy Advance", "MPL-2.0", "https://github.com/libretro/mgba"),
+        RetroCredit("ParaLLEl N64", "Nintendo 64", "GPL-2.0", "https://github.com/libretro/parallel-n64"),
+        RetroCredit("PCSX2", "PS2 upstream of ARMSX2", "GPL-3.0", "https://github.com/pcsx2/pcsx2"),
+        RetroCredit("rcheevos", "RetroAchievements", "MIT", "https://github.com/RetroAchievements/rcheevos"),
+        RetroCredit("Snapdragon GSR", "Upscaling", "BSD-3", "https://github.com/quic/snapdragon-gsr"),
+        RetroCredit("Snes9x", "SNES", "Snes9x", "https://github.com/libretro/snes9x"),
+        RetroCredit("SwanStation", "PlayStation", "GPL-3.0", "https://github.com/libretro/swanstation"),
+        RetroCredit("Winlator", "Windows-on-Android base", "GPL-3.0", "https://github.com/brunodev85/winlator"),
+    )
diff --git a/app/src/main/feature/retro/RetroDefaults.kt b/app/src/main/feature/retro/RetroDefaults.kt
new file mode 100644
index 000000000..2fc1863d9
--- /dev/null
+++ b/app/src/main/feature/retro/RetroDefaults.kt
@@ -0,0 +1,165 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+
+object RetroDefaults {
+    private fun prefs(context: Context) = PreferenceManager.getDefaultSharedPreferences(context)
+
+    private fun key(
+        setting: String,
+        systemId: String,
+    ) = "retro_def_${setting}_$systemId"
+
+    private fun varKey(
+        systemId: String,
+        optionKey: String,
+    ) = "retro_def_var_${systemId}_$optionKey"
+
+    fun romsDir(context: Context): String? =
+        prefs(context).getString("retro_roms_dir", null)?.takeIf { it.isNotBlank() }
+
+    fun setRomsDir(context: Context, value: String?) =
+        prefs(context).edit().putString("retro_roms_dir", value).apply()
+
+    fun shader(context: Context, systemId: String): String =
+        prefs(context).getString(key("shader", systemId), "default") ?: "default"
+
+    fun setShader(context: Context, systemId: String, value: String) =
+        prefs(context).edit().putString(key("shader", systemId), value).apply()
+
+    fun sgsr(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("sgsr", systemId), false)
+
+    fun setSgsr(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("sgsr", systemId), value).apply()
+
+    fun upscale(context: Context, systemId: String): String =
+        prefs(context).getString(key("upscale", systemId), "native") ?: "native"
+
+    fun setUpscale(context: Context, systemId: String, value: String) =
+        prefs(context).edit().putString(key("upscale", systemId), value).apply()
+
+    fun audio(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("audio", systemId), true)
+
+    fun setAudio(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("audio", systemId), value).apply()
+
+    fun touchControls(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("touch", systemId), true)
+
+    fun setTouchControls(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("touch", systemId), value).apply()
+
+    fun adaptiveSticks(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("adaptive", systemId), false)
+
+    fun setAdaptiveSticks(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("adaptive", systemId), value).apply()
+
+    fun hud(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean("retro_def_hud_global", false)
+
+    fun setHud(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean("retro_def_hud_global", value).apply()
+
+    fun netplayEnabled(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("netplay", systemId), false)
+
+    fun setNetplayEnabled(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("netplay", systemId), value).apply()
+
+    fun clearNetplayArm(
+        context: Context,
+        systemId: String,
+    ) {
+        prefs(context)
+            .edit()
+            .putBoolean(key("netplay", systemId), false)
+            .putString(key("netplay_mode", systemId), "off")
+            .putBoolean(key("netplay_host_mode", systemId), false)
+            .apply()
+    }
+
+    fun netplayHost(context: Context, systemId: String): String =
+        prefs(context).getString(key("netplay_host", systemId), "") ?: ""
+
+    fun setNetplayHost(context: Context, systemId: String, value: String) =
+        prefs(context).edit().putString(key("netplay_host", systemId), value).apply()
+
+    fun netplayPort(context: Context, systemId: String): Int {
+        val fallback =
+            when {
+                RetroOnlineSupport.supportsGameLink(systemId) -> RetroGameLink.DEFAULT_PORT
+                RetroOnlineSupport.supportsDolphinNetplay(systemId) -> 2626
+                else -> 55435
+            }
+        return prefs(context).getInt(key("netplay_port", systemId), fallback)
+    }
+
+    fun setNetplayPort(context: Context, systemId: String, value: Int) =
+        prefs(context).edit().putInt(key("netplay_port", systemId), value.coerceIn(1, 65535)).apply()
+
+    fun netplayHostMode(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("netplay_host_mode", systemId), true)
+
+    fun setNetplayHostMode(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("netplay_host_mode", systemId), value).apply()
+
+    fun netplayTraversal(context: Context, systemId: String): Boolean =
+        prefs(context).getBoolean(key("netplay_traversal", systemId), false)
+
+    fun setNetplayTraversal(context: Context, systemId: String, value: Boolean) =
+        prefs(context).edit().putBoolean(key("netplay_traversal", systemId), value).apply()
+
+    fun netplayHostCode(context: Context, systemId: String): String =
+        prefs(context).getString(key("netplay_host_code", systemId), "") ?: ""
+
+    fun setNetplayHostCode(context: Context, systemId: String, value: String) =
+        prefs(context).edit().putString(key("netplay_host_code", systemId), value.trim()).apply()
+
+    fun netplayPlayerName(context: Context): String =
+        prefs(context).getString("retro_netplay_player_name", "") ?: ""
+
+    fun setNetplayPlayerName(context: Context, value: String) =
+        prefs(context).edit().putString("retro_netplay_player_name", value.trim().take(24)).apply()
+
+    fun netplayLaunchMode(context: Context, systemId: String): String {
+        val raw = prefs(context).getString(key("netplay_mode", systemId), null)
+        return when (raw?.lowercase()) {
+            "join" -> "join"
+            "host" -> "host"
+            "off", "manual", null -> "off"
+            else -> "off"
+        }
+    }
+
+    fun setNetplayLaunchMode(context: Context, systemId: String, value: String) {
+        val mode =
+            when (value.lowercase()) {
+                "join" -> "join"
+                "host" -> "host"
+                else -> "off"
+            }
+        prefs(context)
+            .edit()
+            .putString(key("netplay_mode", systemId), mode)
+            .putBoolean(key("netplay_host_mode", systemId), mode == "host")
+            .apply()
+    }
+
+    fun coreOption(
+        context: Context,
+        systemId: String,
+        optionKey: String,
+        fallback: String,
+    ): String = prefs(context).getString(varKey(systemId, optionKey), fallback) ?: fallback
+
+    fun setCoreOption(
+        context: Context,
+        systemId: String,
+        optionKey: String,
+        value: String,
+    ) = prefs(context).edit().putString(varKey(systemId, optionKey), value).apply()
+}
diff --git a/app/src/main/feature/retro/RetroDefaultsScreen.kt b/app/src/main/feature/retro/RetroDefaultsScreen.kt
new file mode 100644
index 000000000..1e56f3c6a
--- /dev/null
+++ b/app/src/main/feature/retro/RetroDefaultsScreen.kt
@@ -0,0 +1,1013 @@
+package com.winlator.cmod.feature.retro
+
+import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.sp
+import androidx.compose.runtime.CompositionLocalProvider
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import java.io.File
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+private val PageBg = Color(0xFF101018)
+private val PageText = Color(0xFFF0F4FF)
+private val PageSub = Color(0xFF93A6BC)
+
+private val SHADER_KEYS = listOf("default", "crt", "lcd", "sharp")
+private val UPSCALE_KEYS = listOf("2x", "4x", "native")
+
+@Composable
+fun RetroDefaultsScreen(bridge: SettingsNavBridge? = null) {
+    val context = LocalContext.current
+    val scope = androidx.compose.runtime.rememberCoroutineScope()
+    var expandedConsole by remember { mutableStateOf<String?>(null) }
+    var refresh by remember { mutableIntStateOf(0) }
+    var confirmHardcore by remember { mutableStateOf(false) }
+    val contentNav = rememberSettingsContentNav(bridge)
+
+    if (confirmHardcore) {
+        RetroHardcoreConfirmDialog(
+            onConfirm = {
+                confirmHardcore = false
+                RetroAchievementsManager.setHardcorePreferred(context, true)
+                refresh++
+            },
+            onDismiss = { confirmHardcore = false },
+        )
+    }
+
+    val biosPicker =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            if (uri != null) {
+                scope.launch {
+                    val result = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+                        RetroBiosImport.importFromUri(context, uri)
+                    }
+                    result
+                        .onSuccess { Toast.makeText(context, context.getString(R.string.retro_scr_bios_imported, it), Toast.LENGTH_SHORT).show() }
+                        .onFailure { Toast.makeText(context, it.message ?: context.getString(R.string.retro_scr_invalid_bios_file), Toast.LENGTH_LONG).show() }
+                    refresh++
+                }
+            }
+        }
+
+    val ps2BiosPicker =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            if (uri != null) {
+                scope.launch {
+                    val result = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+                        RetroBiosImport.importPs2FromUri(context, uri)
+                    }
+                    result
+                        .onSuccess { Toast.makeText(context, context.getString(R.string.retro_scr_ps2_bios_imported, it), Toast.LENGTH_SHORT).show() }
+                        .onFailure { Toast.makeText(context, it.message ?: context.getString(R.string.retro_scr_invalid_ps2_bios_file), Toast.LENGTH_LONG).show() }
+                    refresh++
+                }
+            }
+        }
+
+    @Suppress("UNUSED_EXPRESSION") refresh
+
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(PageBg)
+                .verticalScroll(rememberScrollState())
+                .windowInsetsPadding(WindowInsets.navigationBars)
+                .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(14.dp),
+    ) {
+        Text(
+            stringResource(R.string.retro_scr_retro_defaults),
+            color = PageSub,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.Bold,
+            letterSpacing = 1.sp,
+        )
+        Text(
+            stringResource(R.string.retro_scr_retro_defaults_desc),
+            color = PageSub,
+            style = MaterialTheme.typography.bodySmall,
+        )
+
+        RetroConsoleBundleGroup(refreshKey = refresh, onChanged = { refresh++ })
+
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_scr_retroachievements))
+            RetroInfoRow(
+                stringResource(R.string.retro_scr_account),
+                if (RetroAchievementsManager.isLoggedIn(context)) {
+                    RetroAchievementsManager.displayName(context) ?: stringResource(R.string.retro_scr_signed_in)
+                } else {
+                    stringResource(R.string.retro_scr_not_signed_in_hint)
+                },
+            )
+            RetroSettingSwitch(
+                stringResource(R.string.retro_scr_achievements_enabled),
+                RetroAchievementsManager.isEnabled(context),
+            ) {
+                RetroAchievementsManager.setEnabled(context, it)
+                refresh++
+            }
+            if (RetroAchievementsManager.HARDCORE_SUPPORTED) {
+                RetroSettingSwitch(
+                    stringResource(R.string.retro_scr_hardcore_default),
+                    RetroAchievementsManager.isHardcorePreferred(context),
+                ) {
+                    if (it) {
+                        confirmHardcore = true
+                    } else {
+                        RetroAchievementsManager.setHardcorePreferred(context, false)
+                        refresh++
+                    }
+                }
+            }
+            if (RetroAchievementsManager.isLoggedIn(context)) {
+                OutlinedButton(
+                    onClick = {
+                        RetroAchievementsManager.logout(context)
+                        refresh++
+                    },
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 4.dp)
+                            .paneNavItem(
+                                cornerRadius = 8.dp,
+                                onActivate = {
+                                    RetroAchievementsManager.logout(context)
+                                    refresh++
+                                },
+                                highlightColor = Color(0xFF4FC3F7),
+                                tapToSelect = true,
+                            ),
+                ) {
+                    Text(stringResource(R.string.retro_scr_sign_out))
+                }
+            }
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            verticalAlignment = Alignment.Top,
+        ) {
+            Box(Modifier.weight(1f)) {
+                RetroSettingGroup {
+                    RetroGroupTitle(stringResource(R.string.retro_scr_playstation_bios))
+                    val dir = RetroCoreManager.systemDir(context)
+                    val installed = RetroSystems.PSX.biosFiles.filter { File(dir, it).isFile }
+                    RetroInfoRow(
+                        stringResource(R.string.retro_scr_installed),
+                        if (installed.isEmpty()) {
+                            stringResource(R.string.retro_scr_none_ps1_bios)
+                        } else {
+                            installed.joinToString(", ")
+                        },
+                    )
+                    Button(
+                        onClick = { runCatching { biosPicker.launch(arrayOf("*/*")) } },
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(top = 4.dp)
+                                .paneNavItem(
+                                    cornerRadius = 8.dp,
+                                    onActivate = { runCatching { biosPicker.launch(arrayOf("*/*")) } },
+                                    highlightColor = Color(0xFF4FC3F7),
+                                    tapToSelect = true,
+                                ),
+                    ) {
+                        Text(stringResource(R.string.retro_scr_import_ps1_bios))
+                    }
+                    if (installed.isNotEmpty()) {
+                        OutlinedButton(
+                            onClick = {
+                                val n = RetroBiosImport.deletePs1Bios(context)
+                                Toast.makeText(
+                                    context,
+                                    if (n > 0) {
+                                        context.getString(R.string.retro_scr_ps1_bios_removed)
+                                    } else {
+                                        context.getString(R.string.retro_scr_no_bios_to_remove)
+                                    },
+                                    Toast.LENGTH_SHORT,
+                                ).show()
+                                refresh++
+                            },
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .padding(top = 4.dp)
+                                    .paneNavItem(
+                                        cornerRadius = 8.dp,
+                                        onActivate = {
+                                            val n = RetroBiosImport.deletePs1Bios(context)
+                                            Toast.makeText(
+                                                context,
+                                                if (n > 0) {
+                                                    context.getString(R.string.retro_scr_ps1_bios_removed)
+                                                } else {
+                                                    context.getString(R.string.retro_scr_no_bios_to_remove)
+                                                },
+                                                Toast.LENGTH_SHORT,
+                                            ).show()
+                                            refresh++
+                                        },
+                                        highlightColor = Color(0xFF4FC3F7),
+                                        tapToSelect = true,
+                                    ),
+                        ) {
+                            Text(stringResource(R.string.retro_scr_remove_ps1_bios))
+                        }
+                    }
+                }
+            }
+            Box(Modifier.weight(1f)) {
+                RetroSettingGroup {
+                    RetroGroupTitle(stringResource(R.string.retro_scr_playstation_2_bios))
+                    val ps2Installed = RetroBiosImport.installedPs2Bios(context)
+                    RetroInfoRow(
+                        stringResource(R.string.retro_scr_installed),
+                        if (ps2Installed.isEmpty()) {
+                            stringResource(R.string.retro_scr_none_ps2_bios)
+                        } else {
+                            ps2Installed.joinToString(", ")
+                        },
+                    )
+                    Button(
+                        onClick = { runCatching { ps2BiosPicker.launch(arrayOf("*/*")) } },
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(top = 4.dp)
+                                .paneNavItem(
+                                    cornerRadius = 8.dp,
+                                    onActivate = { runCatching { ps2BiosPicker.launch(arrayOf("*/*")) } },
+                                    highlightColor = Color(0xFF4FC3F7),
+                                    tapToSelect = true,
+                                ),
+                    ) {
+                        Text(stringResource(R.string.retro_scr_import_ps2_bios))
+                    }
+                    if (ps2Installed.isNotEmpty()) {
+                        OutlinedButton(
+                            onClick = {
+                                val n = RetroBiosImport.deletePs2Bios(context)
+                                Toast.makeText(
+                                    context,
+                                    if (n > 0) {
+                                        context.getString(R.string.retro_scr_ps2_bios_removed)
+                                    } else {
+                                        context.getString(R.string.retro_scr_no_bios_to_remove)
+                                    },
+                                    Toast.LENGTH_SHORT,
+                                ).show()
+                                refresh++
+                            },
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .padding(top = 4.dp)
+                                    .paneNavItem(
+                                        cornerRadius = 8.dp,
+                                        onActivate = {
+                                            val n = RetroBiosImport.deletePs2Bios(context)
+                                            Toast.makeText(
+                                                context,
+                                                if (n > 0) {
+                                                    context.getString(R.string.retro_scr_ps2_bios_removed)
+                                                } else {
+                                                    context.getString(R.string.retro_scr_no_bios_to_remove)
+                                                },
+                                                Toast.LENGTH_SHORT,
+                                            ).show()
+                                            refresh++
+                                        },
+                                        highlightColor = Color(0xFF4FC3F7),
+                                        tapToSelect = true,
+                                    ),
+                        ) {
+                            Text(stringResource(R.string.retro_scr_remove_ps2_bios))
+                        }
+                    }
+                }
+            }
+        }
+
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_scr_library_artwork))
+            RetroSettingSwitch(
+                stringResource(R.string.retro_scr_retro_case_art),
+                RetroBoxart.caseArtEnabled(context),
+            ) { RetroBoxart.setCaseArtEnabled(context, it); refresh++ }
+            RetroInfoRow(
+                stringResource(R.string.retro_scr_box_art),
+                stringResource(R.string.retro_scr_box_art_desc),
+            )
+        }
+
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_scr_roms_folder))
+            val romsDir = RetroDefaults.romsDir(context)
+            RetroInfoRow(
+                stringResource(R.string.retro_scr_folder),
+                romsDir ?: stringResource(R.string.retro_scr_roms_not_set),
+            )
+            RetroInfoRow(
+                stringResource(R.string.retro_scr_auto_import),
+                stringResource(R.string.retro_scr_auto_import_desc),
+            )
+            val pickRomsFolder = {
+                val activity = context as? android.app.Activity
+                if (activity != null) {
+                    com.winlator.cmod.shared.android.DirectoryPickerDialog.show(
+                        activity = activity,
+                        initialPath = romsDir
+                            ?: android.os.Environment.getExternalStoragePublicDirectory(
+                                android.os.Environment.DIRECTORY_DOWNLOADS,
+                            ).absolutePath,
+                        title = context.getString(R.string.retro_scr_select_roms_folder_title),
+                    ) { path ->
+                        RetroDefaults.setRomsDir(context, path)
+                        Thread {
+                            val result = RetroRomScanner.scan(context, File(path))
+                            activity.runOnUiThread {
+                                Toast.makeText(context, scanMessage(context, result), Toast.LENGTH_SHORT).show()
+                                refresh++
+                            }
+                        }.start()
+                    }
+                }
+            }
+            Button(
+                onClick = { pickRomsFolder() },
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(top = 4.dp)
+                        .paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = { pickRomsFolder() },
+                            highlightColor = Color(0xFF4FC3F7),
+                            tapToSelect = true,
+                        ),
+            ) {
+                Text(if (romsDir == null) stringResource(R.string.retro_scr_select_roms_folder_button) else stringResource(R.string.retro_scr_change_roms_folder_button))
+            }
+            if (romsDir != null) {
+                val scanNow = {
+                    val activity = context as? android.app.Activity
+                    Thread {
+                        val result = RetroRomScanner.scanConfiguredFolder(context)
+                        activity?.runOnUiThread {
+                            Toast.makeText(context, scanMessage(context, result), Toast.LENGTH_SHORT).show()
+                            refresh++
+                        }
+                    }.start()
+                }
+                OutlinedButton(
+                    onClick = { scanNow() },
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 4.dp)
+                            .paneNavItem(
+                                cornerRadius = 8.dp,
+                                onActivate = { scanNow() },
+                                highlightColor = Color(0xFF4FC3F7),
+                                tapToSelect = true,
+                            ),
+                ) {
+                    Text(stringResource(R.string.retro_scr_scan_now))
+                }
+            }
+        }
+
+        RetroLibretroHudSection(RetroDefaults.hud(context, "")) {
+            RetroDefaults.setHud(context, "", it)
+            refresh++
+        }
+
+        Text(
+            stringResource(R.string.retro_scr_console_defaults),
+            color = PageSub,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.Bold,
+            letterSpacing = 1.sp,
+            modifier = Modifier.padding(top = 4.dp),
+        )
+        Text(
+            stringResource(R.string.retro_scr_console_defaults_desc),
+            color = PageSub,
+            style = MaterialTheme.typography.labelMedium,
+        )
+
+        RetroSystems.ALL.sortedBy { it.displayName }.forEach { console ->
+            val sys = console.id
+            val expanded = expandedConsole == sys
+            RetroSettingGroup {
+                Row(
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .clickable { expandedConsole = if (expanded) null else sys }
+                            .paneNavItem(
+                                cornerRadius = 8.dp,
+                                onActivate = { expandedConsole = if (expanded) null else sys },
+                                highlightColor = Color(0xFF4FC3F7),
+                                tapToSelect = true,
+                            )
+                            .padding(vertical = 4.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        console.displayName,
+                        color = PageText,
+                        fontWeight = FontWeight.SemiBold,
+                        modifier = Modifier.weight(1f),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                    Text(
+                        if (expanded) "▲" else "▼",
+                        color = PageSub,
+                    )
+                }
+                if (expanded && console.isExternal) {
+                    val ps2Prefs = context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE)
+                    val rendererKeys = listOf("vulkan", "opengl", "software")
+                    val rendererLabels = listOf(
+                        stringResource(R.string.retro_ps2_renderer_vulkan),
+                        stringResource(R.string.retro_ps2_renderer_opengl),
+                        stringResource(R.string.retro_ps2_renderer_software),
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_renderer),
+                        entries = rendererLabels,
+                        selectedIndex = rendererKeys.indexOf(ps2Prefs.getString("wn.ps2.renderer", "vulkan")).coerceAtLeast(0),
+                        onSelected = { ps2Prefs.edit().putString("wn.ps2.renderer", rendererKeys[it]).apply(); refresh++ },
+                    )
+                    val ps2Drivers = remember { com.armsx2.CustomDriver.listInstalled(context) }
+                    val driverIds = listOf("") + ps2Drivers.map { it.id }
+                    val driverLabels = listOf(stringResource(R.string.retro_gpu_driver_system)) + ps2Drivers.map { it.name }
+                    val curDriver = (ps2Prefs.getString("wn.ps2.driver", "") ?: "").let { if (it.equals("system", true)) "" else it }
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_gpu_driver),
+                        entries = driverLabels,
+                        selectedIndex = driverIds.indexOf(curDriver).coerceAtLeast(0),
+                        onSelected = { ps2Prefs.edit().putString("wn.ps2.driver", driverIds[it]).apply(); refresh++ },
+                    )
+                    if (ps2Drivers.isEmpty()) {
+                        Text(
+                            stringResource(R.string.retro_gpu_driver_hint),
+                            color = PageSub,
+                            fontSize = 11.sp,
+                            modifier = Modifier.padding(top = 2.dp),
+                        )
+                    }
+                    com.winlator.cmod.feature.retro.Ps2TurnipFlags(ps2Prefs, refresh) { refresh++ }
+                    val ps2Scales = listOf(1f, 1.5f, 2f, 3f, 4f)
+                    val ps2ScaleLabels = listOf(
+                        stringResource(R.string.retro_gs_scale_1x_native),
+                        stringResource(R.string.retro_gs_scale_1_5x),
+                        stringResource(R.string.retro_gs_scale_2x),
+                        stringResource(R.string.retro_gs_scale_3x),
+                        stringResource(R.string.retro_gs_scale_4x),
+                    )
+                    val curScale = ps2Prefs.getFloat("wn.ps2.upscale", 1f)
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_upscale_resolution),
+                        entries = ps2ScaleLabels,
+                        selectedIndex = ps2Scales.indexOfFirst { kotlin.math.abs(it - curScale) < 0.01f }.coerceAtLeast(0),
+                        onSelected = { ps2Prefs.edit().putFloat("wn.ps2.upscale", ps2Scales[it]).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_aspect_ratio),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_aspect_stretch),
+                            stringResource(R.string.retro_scr_aspect_auto_standard),
+                            stringResource(R.string.retro_scr_aspect_4_3),
+                            stringResource(R.string.retro_scr_aspect_16_9),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.aspect", it).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_gs_fmv_aspect_ratio),
+                        entries = listOf(
+                            stringResource(R.string.retro_gs_off),
+                            stringResource(R.string.retro_gs_aspect_auto_standard),
+                            stringResource(R.string.retro_gs_aspect_4_3),
+                            stringResource(R.string.retro_gs_aspect_16_9),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.fmvaspect", 0).coerceIn(0, 3),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.fmvaspect", it).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_gs_deinterlace_mode),
+                        entries = listOf(
+                            stringResource(R.string.retro_gs_deint_auto),
+                            stringResource(R.string.retro_gs_deint_off),
+                            stringResource(R.string.retro_gs_deint_weave_tff),
+                            stringResource(R.string.retro_gs_deint_weave_bff),
+                            stringResource(R.string.retro_gs_deint_bob_tff),
+                            stringResource(R.string.retro_gs_deint_bob_bff),
+                            stringResource(R.string.retro_gs_deint_blend_tff),
+                            stringResource(R.string.retro_gs_deint_blend_bff),
+                            stringResource(R.string.retro_gs_deint_adaptive_tff),
+                            stringResource(R.string.retro_gs_deint_adaptive_bff),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.deinterlace", 0).coerceIn(0, 9),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.deinterlace", it).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_display_filter),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_filter_nearest),
+                            stringResource(R.string.retro_scr_filter_bilinear_smooth),
+                            stringResource(R.string.retro_scr_filter_bilinear_sharp),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.displayfilter", 1).coerceIn(0, 2),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.displayfilter", it).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_texture_filter),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_filter_nearest),
+                            stringResource(R.string.retro_scr_filter_bilinear_forced),
+                            stringResource(R.string.retro_scr_filter_bilinear_ps2),
+                            stringResource(R.string.retro_scr_filter_bilinear_sprites),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.filter", 2).coerceIn(0, 3),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.filter", it).apply(); refresh++ },
+                    )
+                    RetroSettingSwitch(stringResource(R.string.retro_scr_mipmapping), ps2Prefs.getBoolean("wn.ps2.mipmap", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.mipmap", it).apply(); refresh++
+                    }
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_blending_accuracy),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_blend_minimum),
+                            stringResource(R.string.retro_scr_blend_basic),
+                            stringResource(R.string.retro_scr_blend_medium),
+                            stringResource(R.string.retro_scr_blend_high),
+                            stringResource(R.string.retro_scr_blend_full),
+                            stringResource(R.string.retro_scr_blend_maximum),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.blend", 1).coerceIn(0, 5),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.blend", it).apply(); refresh++ },
+                    )
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_anti_blur), ps2Prefs.getBoolean("wn.ps2.antiblur", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.antiblur", it).apply(); refresh++
+                    }
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_crt_tv_shader),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_shader_off),
+                            stringResource(R.string.retro_scr_shader_scanline),
+                            stringResource(R.string.retro_scr_shader_diagonal),
+                            stringResource(R.string.retro_scr_shader_triangular),
+                            stringResource(R.string.retro_scr_shader_wave),
+                            stringResource(R.string.retro_scr_shader_lottes),
+                            stringResource(R.string.retro_scr_shader_4xrgss),
+                            stringResource(R.string.retro_scr_shader_nxagss),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.tvshader", 0).coerceIn(0, 7),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.tvshader", it).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_frame_skip),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_skip_off),
+                            stringResource(R.string.retro_scr_skip_1),
+                            stringResource(R.string.retro_scr_skip_2),
+                            stringResource(R.string.retro_scr_skip_3),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.frameskip", 0).coerceIn(0, 3),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.frameskip", it).apply(); refresh++ },
+                    )
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_widescreen_patches), ps2Prefs.getBoolean("wn.ps2.widescreen", false)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.widescreen", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_no_interlace_patches), ps2Prefs.getBoolean("wn.ps2.nointerlace", false)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.nointerlace", it).apply(); refresh++
+                    }
+                    val eeRates = listOf(-3, -2, -1, 0, 1, 2, 3)
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_ee_cycle_rate),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_ee_rate_50),
+                            stringResource(R.string.retro_scr_ee_rate_60),
+                            stringResource(R.string.retro_scr_ee_rate_75),
+                            stringResource(R.string.retro_scr_ee_rate_100_default),
+                            stringResource(R.string.retro_scr_ee_rate_130),
+                            stringResource(R.string.retro_scr_ee_rate_180),
+                            stringResource(R.string.retro_scr_ee_rate_300),
+                        ),
+                        selectedIndex = eeRates.indexOf(ps2Prefs.getInt("wn.ps2.eeRate", 0).coerceIn(-3, 3)).coerceAtLeast(0),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.eeRate", eeRates[it]).apply(); refresh++ },
+                    )
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_scr_ee_cycle_skip),
+                        entries = listOf(
+                            stringResource(R.string.retro_scr_skip_off),
+                            stringResource(R.string.retro_scr_skip_num_1),
+                            stringResource(R.string.retro_scr_skip_num_2),
+                            stringResource(R.string.retro_scr_skip_num_3),
+                        ),
+                        selectedIndex = ps2Prefs.getInt("wn.ps2.eeSkip", 0).coerceIn(0, 3),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.eeSkip", it).apply(); refresh++ },
+                    )
+                    RetroSettingSwitch(stringResource(R.string.retro_scr_mtvu), ps2Prefs.getBoolean("wn.ps2.mtvu", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.mtvu", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_scr_instant_vu1), ps2Prefs.getBoolean("wn.ps2.instantVu1", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.instantVu1", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_vu_flag_hack), ps2Prefs.getBoolean("wn.ps2.vuFlagHack", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.vuFlagHack", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_intc_spin), ps2Prefs.getBoolean("wn.ps2.intc", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.intc", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_wait_loop), ps2Prefs.getBoolean("wn.ps2.waitloop", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.waitloop", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_scr_fast_cdvd), ps2Prefs.getBoolean("wn.ps2.fastCdvd", false)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.fastCdvd", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(stringResource(R.string.retro_gs_fast_boot), ps2Prefs.getBoolean("wn.ps2.fastboot", true)) {
+                        ps2Prefs.edit().putBoolean("wn.ps2.fastboot", it).apply(); refresh++
+                    }
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_touch_controls),
+                        RetroDefaults.touchControls(context, sys),
+                    ) { RetroDefaults.setTouchControls(context, sys, it); refresh++ }
+                        RetroSettingSwitch(
+                            stringResource(R.string.retro_gs_adaptive_sticks),
+                            RetroDefaults.adaptiveSticks(context, sys),
+                            subtitle = stringResource(R.string.retro_gs_adaptive_sticks_subtitle),
+                        ) { RetroDefaults.setAdaptiveSticks(context, sys, it); refresh++ }
+                        RetroSettingSwitch(
+                            stringResource(R.string.retro_ps2_show_l3r3),
+                            ps2Prefs.getBoolean("wn.ps2.showl3r3", true),
+                            subtitle = stringResource(R.string.retro_ps2_show_l3r3_subtitle),
+                        ) { ps2Prefs.edit().putBoolean("wn.ps2.showl3r3", it).apply(); refresh++ }
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_sound),
+                        !ps2Prefs.getBoolean("wn.ps2.muted", false),
+                    ) { ps2Prefs.edit().putBoolean("wn.ps2.muted", !it).apply(); refresh++ }
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_swap_stereo),
+                        ps2Prefs.getBoolean("wn.ps2.swap", false),
+                    ) { ps2Prefs.edit().putBoolean("wn.ps2.swap", it).apply(); refresh++ }
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_gs_time_stretch),
+                        ps2Prefs.getBoolean("wn.ps2.timestretch", true),
+                    ) { ps2Prefs.edit().putBoolean("wn.ps2.timestretch", it).apply(); refresh++ }
+                    val bufferValues = listOf(40, 50, 60, 80, 100, 120, 160, 200)
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_gs_audio_buffer),
+                        entries = bufferValues.map { context.getString(R.string.retro_gs_ms, it) },
+                        selectedIndex = bufferValues.indexOf(ps2Prefs.getInt("wn.ps2.audiobuffer", 50)).coerceAtLeast(0),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.audiobuffer", bufferValues[it]).apply(); refresh++ },
+                    )
+                    val latencyValues = listOf(10, 15, 20, 30, 40, 60, 80, 100)
+                    RetroSettingDropdown(
+                        label = stringResource(R.string.retro_gs_audio_latency),
+                        entries = latencyValues.map { context.getString(R.string.retro_gs_ms, it) },
+                        selectedIndex = latencyValues.indexOf(ps2Prefs.getInt("wn.ps2.audiolatency", 20)).coerceAtLeast(0),
+                        onSelected = { ps2Prefs.edit().putInt("wn.ps2.audiolatency", latencyValues[it]).apply(); refresh++ },
+                    )
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_performance_hud),
+                        RetroHudSupport.resolvePs2HudEnabled(context),
+                    ) {
+                        RetroHudSupport.setPs2HudEnabled(context, it)
+                        RetroDefaults.setHud(context, sys, it)
+                        refresh++
+                    }
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_enable_online_dev9),
+                        ps2Prefs.getBoolean("wn.ps2.net.enable", true),
+                    ) { ps2Prefs.edit().putBoolean("wn.ps2.net.enable", it).apply(); refresh++ }
+                    if (ps2Prefs.getBoolean("wn.ps2.net.enable", true)) {
+                        val devices = listOf("Auto", "Wi-Fi")
+                        RetroSettingDropdown(
+                            label = stringResource(R.string.retro_scr_ethernet_device),
+                            entries = listOf(
+                                stringResource(R.string.retro_scr_net_auto),
+                                stringResource(R.string.retro_scr_net_wifi),
+                            ),
+                            selectedIndex = devices.indexOf(ps2Prefs.getString("wn.ps2.net.ethdevice", "Auto")).coerceAtLeast(0),
+                            onSelected = { ps2Prefs.edit().putString("wn.ps2.net.ethdevice", devices[it]).apply(); refresh++ },
+                        )
+                        val dnsModes = listOf("Manual", "Auto", "Internal")
+                        RetroSettingDropdown(
+                            label = stringResource(R.string.retro_scr_dns_mode),
+                            entries = listOf(
+                                stringResource(R.string.retro_scr_dns_manual),
+                                stringResource(R.string.retro_scr_net_auto),
+                                stringResource(R.string.retro_scr_dns_internal),
+                            ),
+                            selectedIndex = dnsModes.indexOf(ps2Prefs.getString("wn.ps2.net.dnsmode", "Manual")).coerceAtLeast(0),
+                            onSelected = { ps2Prefs.edit().putString("wn.ps2.net.dnsmode", dnsModes[it]).apply(); refresh++ },
+                        )
+                        RetroSettingTextField(stringResource(R.string.retro_scr_primary_dns), ps2Prefs.getString("wn.ps2.net.dns1", PS2_DEFAULT_DNS).orEmpty(), PS2_DEFAULT_DNS) { ps2Prefs.edit().putString("wn.ps2.net.dns1", it).apply(); refresh++ }
+                        RetroSettingTextField(stringResource(R.string.retro_scr_secondary_dns), ps2Prefs.getString("wn.ps2.net.dns2", "").orEmpty(), stringResource(R.string.retro_scr_optional)) { ps2Prefs.edit().putString("wn.ps2.net.dns2", it).apply(); refresh++ }
+                        RetroSettingSwitch(stringResource(R.string.retro_gs_dnas_bypass), ps2Prefs.getBoolean(com.winlator.cmod.feature.retro.Ps2DnasBypass.PREF, true), subtitle = stringResource(R.string.retro_gs_dnas_bypass_subtitle)) { ps2Prefs.edit().putBoolean(com.winlator.cmod.feature.retro.Ps2DnasBypass.PREF, it).apply(); refresh++ }
+                        RetroSettingSwitch(stringResource(R.string.retro_scr_auto_ip_dhcp), ps2Prefs.getBoolean("wn.ps2.net.dhcp", true)) { ps2Prefs.edit().putBoolean("wn.ps2.net.dhcp", it).apply(); refresh++ }
+                    }
+                }
+                if (expanded && !console.isExternal) {
+                    if (RetroCoreManager.usesDolphinCore(console)) {
+                        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+                        val gcDrivers = remember { com.armsx2.CustomDriver.listInstalled(context) }
+                        val gcDriverIds = remember(gcDrivers) { listOf("") + gcDrivers.map { it.id } }
+                        val gcDriverLabels = listOf(stringResource(R.string.retro_gpu_driver_system)) + gcDrivers.map { it.name }
+                        val curGcDriver = (prefs.getString(DolphinEmbedLaunch.DRIVER_PREF, "") ?: "").let { if (it.equals("system", true)) "" else it }
+                        RetroSettingDropdown(
+                            label = stringResource(R.string.retro_gpu_driver),
+                            entries = gcDriverLabels,
+                            selectedIndex = gcDriverIds.indexOf(curGcDriver).coerceAtLeast(0),
+                            onSelected = { prefs.edit().putString(DolphinEmbedLaunch.DRIVER_PREF, gcDriverIds[it]).apply(); refresh++ },
+                        )
+                    }
+                    val embeddedDolphin =
+                        RetroCoreManager.usesDolphinCore(console) &&
+                            RetroShortcuts.embeddedDolphinEnabled(context)
+                    if (!embeddedDolphin) {
+                        RetroSettingDropdown(
+                            label = stringResource(R.string.retro_scr_shader),
+                            entries = listOf(
+                                stringResource(R.string.retro_scr_shader_default),
+                                stringResource(R.string.retro_scr_shader_crt),
+                                stringResource(R.string.retro_scr_shader_lcd),
+                                stringResource(R.string.retro_scr_shader_sharp),
+                            ),
+                            selectedIndex = SHADER_KEYS.indexOf(RetroDefaults.shader(context, sys)).coerceAtLeast(0),
+                            onSelected = { RetroDefaults.setShader(context, sys, SHADER_KEYS[it]); refresh++ },
+                        )
+                        RetroSettingSwitch(
+                            stringResource(R.string.retro_scr_sgsr_upscaling),
+                            RetroDefaults.sgsr(context, sys),
+                        ) { RetroDefaults.setSgsr(context, sys, it); refresh++ }
+                        RetroSettingDropdown(
+                            label = stringResource(R.string.retro_scr_upscale_resolution),
+                            entries = listOf("2x", "4x", stringResource(R.string.retro_scr_upscale_native)),
+                            selectedIndex = UPSCALE_KEYS.indexOf(RetroDefaults.upscale(context, sys)).coerceAtLeast(0),
+                            onSelected = { RetroDefaults.setUpscale(context, sys, UPSCALE_KEYS[it]); refresh++ },
+                        )
+                    }
+                    val consoleOptions = RetroCoreOptions.forSystem(console)
+                    (consoleOptions.filterNot { it.advanced } + consoleOptions.filter { it.advanced })
+                        .forEach { option ->
+                            val current = RetroDefaults.coreOption(context, sys, option.key, option.defaultValue)
+                            RetroSettingDropdown(
+                                label = option.labelText(context),
+                                entries = option.valueLabels,
+                                selectedIndex = option.values.indexOf(current).coerceAtLeast(0),
+                                onSelected = { RetroDefaults.setCoreOption(context, sys, option.key, option.values[it]); refresh++ },
+                            )
+                        }
+
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_touch_controls),
+                        RetroDefaults.touchControls(context, sys),
+                    ) { RetroDefaults.setTouchControls(context, sys, it); refresh++ }
+                        RetroSettingSwitch(
+                            stringResource(R.string.retro_gs_adaptive_sticks),
+                            RetroDefaults.adaptiveSticks(context, sys),
+                            subtitle = stringResource(R.string.retro_gs_adaptive_sticks_subtitle),
+                        ) { RetroDefaults.setAdaptiveSticks(context, sys, it); refresh++ }
+                    RetroSettingSwitch(
+                        stringResource(R.string.retro_scr_sound),
+                        RetroDefaults.audio(context, sys),
+                    ) { RetroDefaults.setAudio(context, sys, it); refresh++ }
+                    if (RetroOnlineSupport.supportsMultiplayerUi(sys)) {
+                        RetroNetplaySettingsSection(
+                            systemId = sys,
+                            version = refresh,
+                            onChanged = { refresh++ },
+                        )
+                    } else if (RetroOnlineSupport.supportsDolphinNetplay(sys)) {
+                        DolphinNetplaySettingsSection(
+                            systemId = sys,
+                            version = refresh,
+                            onChanged = { refresh++ },
+                        )
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+private fun scanMessage(context: android.content.Context, result: RetroRomScanner.Result): String {
+    val parts = buildList {
+        if (result.added > 0) add(context.getString(R.string.retro_scan_added, result.added))
+        if (result.removed > 0) add(context.getString(R.string.retro_scan_removed, result.removed))
+    }
+    return if (parts.isEmpty()) {
+        context.getString(R.string.retro_scan_up_to_date)
+    } else {
+        context.getString(R.string.retro_scan_roms, parts.joinToString(", "))
+    }
+}
+
+@Composable
+fun RetroHardcoreConfirmDialog(
+    onConfirm: () -> Unit,
+    onDismiss: () -> Unit,
+) {
+    val accent = Color(0xFF1A9FFF)
+    com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell(
+        onDismiss = onDismiss,
+        title = stringResource(R.string.retro_scr_enable_hardcore_title),
+    ) {
+        Text(
+            stringResource(R.string.retro_scr_enable_hardcore_body),
+            color = com.winlator.cmod.shared.theme.WinNativeTextSecondary,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+        )
+        Spacer(Modifier.height(16.dp))
+        Box(Modifier.fillMaxWidth().height(1.dp).background(com.winlator.cmod.shared.theme.WinNativeOutline))
+        Spacer(Modifier.height(16.dp))
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End)) {
+            com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton(
+                label = stringResource(R.string.retro_scr_cancel),
+                textColor = com.winlator.cmod.shared.theme.WinNativeTextPrimary,
+                onClick = onDismiss,
+            )
+            com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton(
+                label = stringResource(R.string.retro_scr_enable),
+                textColor = accent,
+                backgroundColor = accent.copy(alpha = 0.12f),
+                borderColor = accent.copy(alpha = 0.3f),
+                onClick = onConfirm,
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroConsoleBundleGroup(
+    refreshKey: Int,
+    onChanged: () -> Unit,
+) {
+    val context = LocalContext.current
+    val scope = androidx.compose.runtime.rememberCoroutineScope()
+    var busy by remember { mutableStateOf(false) }
+    var checking by remember { mutableStateOf(false) }
+    var step by remember { mutableStateOf<String?>(null) }
+    var downloaded by remember { mutableStateOf(0L to 0L) }
+    var checkFailed by remember { mutableStateOf(false) }
+    var installError by remember { mutableStateOf<String?>(null) }
+    var progress by remember { mutableStateOf(0f) }
+    var published by remember { mutableStateOf<RetroBundle.Version?>(null) }
+    val installed = remember(refreshKey, busy) { RetroBundle.installed(context) }
+    val updatable = published != null && published!!.sha256 != installed?.sha256
+
+    val verifyingText = stringResource(R.string.retro_scr_consoles_verifying)
+    val installingText = stringResource(R.string.retro_scr_consoles_installing)
+
+    suspend fun check(): RetroBundle.Version? {
+        checking = true
+        val result = withContext(Dispatchers.IO) { RetroBundle.published() }
+        checking = false
+        published = result.getOrNull() ?: published
+        checkFailed = result.isFailure
+        return result.getOrNull()
+    }
+
+    suspend fun install(version: RetroBundle.Version) {
+        busy = true
+        progress = 0f
+        step = null
+        downloaded = 0L to 0L
+        installError = null
+        val result =
+            withContext(Dispatchers.IO) {
+                RetroBundle.install(context, version) { p ->
+                    when (p) {
+                        is RetroBundle.Progress.Downloading -> {
+                            downloaded = p.bytes to p.total
+                            if (p.total > 0) progress = p.bytes.toFloat() / p.total
+                        }
+                        RetroBundle.Progress.Verifying -> step = verifyingText
+                        RetroBundle.Progress.Extracting -> step = installingText
+                    }
+                }
+            }
+        busy = false
+        step = null
+        installError = result.exceptionOrNull()?.let { it.message ?: it.toString() }
+        onChanged()
+    }
+
+    androidx.compose.runtime.LaunchedEffect(Unit) { check() }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_scr_consoles_group))
+        RetroInfoRow(
+            stringResource(R.string.retro_scr_consoles_state),
+            when {
+                busy && step != null -> step!!
+                busy && downloaded.second > 0 ->
+                    stringResource(
+                        R.string.retro_scr_consoles_downloading,
+                        downloaded.first / (1024 * 1024),
+                        downloaded.second / (1024 * 1024),
+                    )
+                busy -> stringResource(R.string.retro_scr_consoles_working)
+                installError != null -> installError!!
+                checking -> stringResource(R.string.retro_scr_consoles_checking)
+                installed == null -> stringResource(R.string.retro_scr_consoles_missing)
+                updatable ->
+                    stringResource(
+                        R.string.retro_scr_consoles_update_available,
+                        published!!.day,
+                        published!!.size / (1024 * 1024),
+                    )
+                checkFailed -> stringResource(R.string.retro_scr_consoles_installed_no_check, installed.day)
+                else -> stringResource(R.string.retro_scr_consoles_installed, installed.day)
+            },
+        )
+        if (busy && progress > 0f) {
+            LinearProgressIndicator(
+                progress = { progress },
+                modifier = Modifier.fillMaxWidth().padding(top = 6.dp),
+            )
+        }
+        OutlinedButton(
+            enabled = !busy && !checking,
+            onClick = {
+                scope.launch {
+                    if (installed == null || updatable) {
+                        (published ?: check())?.let { install(it) }
+                    } else {
+                        check()
+                    }
+                }
+            },
+            modifier = Modifier.fillMaxWidth().padding(top = 4.dp),
+        ) {
+            Text(
+                stringResource(
+                    when {
+                        installed == null -> R.string.retro_scr_consoles_download
+                        updatable -> R.string.retro_scr_consoles_update
+                        else -> R.string.retro_scr_consoles_check
+                    },
+                ),
+            )
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroDrawerMenu.kt b/app/src/main/feature/retro/RetroDrawerMenu.kt
new file mode 100644
index 000000000..e951a6394
--- /dev/null
+++ b/app/src/main/feature/retro/RetroDrawerMenu.kt
@@ -0,0 +1,1936 @@
+package com.winlator.cmod.feature.retro
+
+import android.view.KeyEvent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.VolumeUp
+import androidx.compose.material.icons.outlined.Album
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.EmojiEvents
+import androidx.compose.material.icons.outlined.FastForward
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.Wifi
+import androidx.compose.material.icons.outlined.RestartAlt
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material.icons.outlined.Speed
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Group
+import androidx.compose.material.icons.outlined.Link
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.SessionDrawerStyle
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+
+private const val DrawerGradientLift = SessionDrawerStyle.GradientLift
+
+private val DrawerAccent = SessionDrawerStyle.Accent
+private val DrawerActiveAccent = SessionDrawerStyle.ActiveAccent
+private val DrawerFocusFill = SessionDrawerStyle.FocusFill
+private val DrawerTextPrimary = SessionDrawerStyle.TextPrimary
+private val DrawerTextSecondary = SessionDrawerStyle.TextSecondary
+private val RetroSheetColor = SessionDrawerStyle.Background
+private val TopRailSurfaceColor = SessionDrawerStyle.TopRailSurface
+private val PaneSurfacePressed = SessionDrawerStyle.PaneSurfacePressed
+private val PaneInnerResting = SessionDrawerStyle.PaneInnerResting
+private val PaneInnerPressed = SessionDrawerStyle.PaneInnerPressed
+private val TileExitResting = SessionDrawerStyle.TileExitResting
+private val TileExitPressed = SessionDrawerStyle.TileExitPressed
+private val RestingCardBorder = SessionDrawerStyle.RestingCardBorder
+private val ActiveCardBorder = SessionDrawerStyle.ActiveCardBorder
+private val GlassExitTint = SessionDrawerStyle.GlassExitTint
+private val DividerColor = SessionDrawerStyle.Divider
+
+private val DrawerWidth = SessionDrawerStyle.Width
+private val DrawerStartPadding = SessionDrawerStyle.StartPadding
+private val DrawerVerticalPadding = SessionDrawerStyle.VerticalPadding
+
+enum class RetroPane { DISPLAY, SOUND, CONTROLS, HUD, SAVES, PERFORMANCE, MEMCARDS, NETWORK, SYSTEM }
+
+class RetroRenamePrompt(
+    val title: String,
+    val initial: String,
+    val onConfirm: (String?) -> Unit,
+)
+
+class RetroConflictPrompt(
+    val message: String,
+    val options: List<String>,
+    val onKeepLocal: () -> Unit,
+    val onPick: (Int) -> Unit,
+)
+
+data class RetroTabSpec(
+    val pane: RetroPane?,
+    val icon: ImageVector,
+    val label: String,
+)
+
+sealed class RetroMenuEntry {
+    class Action(
+        val label: String,
+        val icon: ImageVector,
+        val active: Boolean = false,
+        val danger: Boolean = false,
+        val subtitle: String? = null,
+        val onClick: () -> Unit,
+    ) : RetroMenuEntry()
+
+    class Toggle(
+        val label: String,
+        val subtitle: String? = null,
+        val checked: Boolean,
+        val onChange: (Boolean) -> Unit,
+    ) : RetroMenuEntry()
+
+    class Choice(
+        val label: String,
+        val values: List<String>,
+        val selectedIndex: Int,
+        val visible: Boolean = true,
+        val onSelected: (Int) -> Unit,
+    ) : RetroMenuEntry()
+
+    class Radio(
+        val label: String,
+        val selected: Boolean,
+        val onSelect: () -> Unit,
+    ) : RetroMenuEntry()
+
+    class Stepper(
+        val label: String,
+        val valueText: String,
+        val onStep: (Int) -> Unit,
+    ) : RetroMenuEntry()
+
+    class TogglePair(
+        val left: Toggle,
+        val right: Toggle,
+    ) : RetroMenuEntry()
+
+    class Slider(
+        val label: String,
+        val valueText: String,
+        val value: Float,
+        val min: Float,
+        val max: Float,
+        val step: Float,
+        val onChange: (Float) -> Unit,
+    ) : RetroMenuEntry()
+
+    class Chips(
+        val label: String,
+        val items: List<String>,
+        val states: List<Boolean>,
+        val onToggle: (Int) -> Unit,
+    ) : RetroMenuEntry()
+
+    class ColorPick(
+        val label: String,
+        val color: Int?,
+        val onPick: (Int?) -> Unit,
+    ) : RetroMenuEntry()
+
+    class SaveSlot(
+        val slot: Int,
+        val title: String,
+        val subtitle: String,
+        val filled: Boolean,
+        val onClick: () -> Unit,
+        val onRename: () -> Unit,
+    ) : RetroMenuEntry()
+
+    class TextInput(
+        val label: String,
+        val value: String,
+        val placeholder: String = "",
+        val onOpen: () -> Unit,
+    ) : RetroMenuEntry()
+}
+
+val RetroColorPalette: List<Int> =
+    listOf(
+        0xFFFFFFFF, 0xFFB0B4BC, 0xFF6B7280, 0xFF2A2A30, 0xFF000000,
+        0xFFE53935, 0xFFFF7043, 0xFFFFB300, 0xFFFFF176, 0xFF7CB342,
+        0xFF2F9E44, 0xFF26A69A, 0xFF29B6F6, 0xFF2E63C9, 0xFF5E35B1,
+        0xFF8E24AA, 0xFFD81B60, 0xFF8D6E63,
+    ).map { it.toInt() }
+
+class RetroMenuController {
+    var visible by mutableStateOf(false)
+        private set
+    var pane by mutableStateOf<RetroPane?>(null)
+        private set
+    var region by mutableIntStateOf(1)
+    var railIndex by mutableIntStateOf(0)
+    var contentIndex by mutableIntStateOf(0)
+    var chipIndex by mutableIntStateOf(0)
+    var bottomIndex by mutableIntStateOf(0)
+    var controllerActive by mutableStateOf(false)
+    var tabs by mutableStateOf<List<RetroTabSpec>>(emptyList())
+    var entries by mutableStateOf<List<RetroMenuEntry>>(emptyList())
+        private set
+    var bottomEntries by mutableStateOf<List<RetroMenuEntry.Action>>(emptyList())
+        private set
+    var entriesProvider: ((RetroPane?) -> List<RetroMenuEntry>)? = null
+    var bottomProvider: (() -> List<RetroMenuEntry.Action>)? = null
+    var renamePrompt by mutableStateOf<RetroRenamePrompt?>(null)
+    var conflictPrompt by mutableStateOf<RetroConflictPrompt?>(null)
+
+    val gridColumns: Int
+        get() = if (pane == null) 3 else 1
+
+    fun open() {
+        pane = null
+        railIndex = 0
+        region = 1
+        contentIndex = 0
+        bottomIndex = 0
+        controllerActive = false
+        rebuild()
+        visible = true
+    }
+
+    fun close() {
+        visible = false
+    }
+
+    fun showPane(target: RetroPane?) {
+        pane = target
+        rebuild()
+        region = 1
+        contentIndex = 0
+        railIndex = tabs.indexOfFirst { it.pane == target }.coerceAtLeast(0)
+    }
+
+    fun rebuild() {
+        entries = entriesProvider?.invoke(pane) ?: emptyList()
+        bottomEntries = bottomProvider?.invoke() ?: emptyList()
+        if (contentIndex >= entries.size) contentIndex = (entries.size - 1).coerceAtLeast(0)
+        if (bottomIndex >= bottomEntries.size) bottomIndex = (bottomEntries.size - 1).coerceAtLeast(0)
+    }
+
+    private fun activate(direction: Int) {
+        when (val entry = entries.getOrNull(contentIndex)) {
+            is RetroMenuEntry.Action -> if (direction == 0) entry.onClick()
+            is RetroMenuEntry.Toggle -> entry.onChange(!entry.checked)
+            is RetroMenuEntry.TogglePair -> {
+                val half = if (direction > 0) entry.right else entry.left
+                half.onChange(!half.checked)
+            }
+            is RetroMenuEntry.Choice -> {
+                val size = entry.values.size
+                if (size > 0) {
+                    val step = if (direction < 0) -1 else 1
+                    entry.onSelected((entry.selectedIndex + step + size) % size)
+                }
+            }
+            is RetroMenuEntry.Radio -> if (direction == 0) entry.onSelect()
+            is RetroMenuEntry.Stepper -> entry.onStep(if (direction < 0) -1 else 1)
+            is RetroMenuEntry.Slider ->
+                if (direction != 0) {
+                    entry.onChange((entry.value + direction * entry.step).coerceIn(entry.min, entry.max))
+                }
+            is RetroMenuEntry.Chips ->
+                if (direction == 0) {
+                    entry.onToggle(chipIndex.coerceIn(0, entry.items.size - 1))
+                } else {
+                    chipIndex = (chipIndex + direction + entry.items.size) % entry.items.size
+                }
+            is RetroMenuEntry.ColorPick -> {
+                val step = if (direction < 0) -1 else 1
+                val palette = RetroColorPalette
+                val current = entry.color?.let { palette.indexOf(it) } ?: -1
+                val span = palette.size + 1
+                val next = ((current + 1 + step + span) % span) - 1
+                entry.onPick(if (next < 0) null else palette[next])
+            }
+            is RetroMenuEntry.SaveSlot -> if (direction == 0) entry.onClick()
+            is RetroMenuEntry.TextInput -> if (direction == 0) entry.onOpen()
+            else -> {}
+        }
+    }
+
+    private fun moveContent(delta: Int) {
+        if (entries.isEmpty()) return
+        val next = contentIndex + delta
+        when {
+            next < 0 -> region = 0
+            next >= entries.size && pane == null -> region = 2
+            next in entries.indices -> contentIndex = next
+        }
+    }
+
+    private var axisLatched = false
+
+    fun handleAxis(x: Float, y: Float): Boolean {
+        if (!visible) return false
+        val dz = 0.5f
+        val dir =
+            when {
+                y < -dz -> KeyEvent.KEYCODE_DPAD_UP
+                y > dz -> KeyEvent.KEYCODE_DPAD_DOWN
+                x < -dz -> KeyEvent.KEYCODE_DPAD_LEFT
+                x > dz -> KeyEvent.KEYCODE_DPAD_RIGHT
+                else -> 0
+            }
+        if (dir == 0) {
+            axisLatched = false
+            return true
+        }
+        if (axisLatched) return true
+        axisLatched = true
+        handleKey(dir, KeyEvent.ACTION_DOWN)
+        handleKey(dir, KeyEvent.ACTION_UP)
+        return true
+    }
+
+    fun handleKey(
+        keyCode: Int,
+        action: Int,
+    ): Boolean {
+        if (!visible) return false
+        val navKeys =
+            setOf(
+                KeyEvent.KEYCODE_DPAD_UP,
+                KeyEvent.KEYCODE_DPAD_DOWN,
+                KeyEvent.KEYCODE_DPAD_LEFT,
+                KeyEvent.KEYCODE_DPAD_RIGHT,
+                KeyEvent.KEYCODE_DPAD_CENTER,
+                KeyEvent.KEYCODE_BUTTON_A,
+                KeyEvent.KEYCODE_BUTTON_B,
+                KeyEvent.KEYCODE_BACK,
+                KeyEvent.KEYCODE_BUTTON_MODE,
+                KeyEvent.KEYCODE_BUTTON_START,
+            )
+        if (keyCode !in navKeys) return true
+        if (action == KeyEvent.ACTION_DOWN) {
+            controllerActive = true
+            when (keyCode) {
+                KeyEvent.KEYCODE_DPAD_UP ->
+                    when (region) {
+                        1 -> moveContent(-gridColumns)
+                        2 -> region = 1
+                    }
+                KeyEvent.KEYCODE_DPAD_DOWN ->
+                    when (region) {
+                        0 -> if (entries.isNotEmpty()) region = 1
+                        1 -> moveContent(gridColumns)
+                    }
+                KeyEvent.KEYCODE_DPAD_LEFT ->
+                    when (region) {
+                        0 -> railIndex = (railIndex - 1 + tabs.size) % tabs.size
+                        1 -> if (gridColumns > 1) moveContent(-1) else activate(-1)
+                        2 -> if (bottomEntries.isNotEmpty()) {
+                            bottomIndex = (bottomIndex - 1 + bottomEntries.size) % bottomEntries.size
+                        }
+                    }
+                KeyEvent.KEYCODE_DPAD_RIGHT ->
+                    when (region) {
+                        0 -> railIndex = (railIndex + 1) % tabs.size
+                        1 -> if (gridColumns > 1) moveContent(1) else activate(1)
+                        2 -> if (bottomEntries.isNotEmpty()) {
+                            bottomIndex = (bottomIndex + 1) % bottomEntries.size
+                        }
+                    }
+                KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_BUTTON_A ->
+                    when (region) {
+                        0 -> tabs.getOrNull(railIndex)?.let { showPane(it.pane) }
+                        1 -> activate(0)
+                        2 -> bottomEntries.getOrNull(bottomIndex)?.onClick?.invoke()
+                    }
+            }
+        } else if (action == KeyEvent.ACTION_UP) {
+            when (keyCode) {
+                KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK,
+                -> if (pane != null) showPane(null) else close()
+            }
+        }
+        return true
+    }
+}
+
+@Composable
+fun RetroDrawerMenu(controller: RetroMenuController) {
+    val density = LocalDensity.current
+    BoxWithConstraints(Modifier.fillMaxSize()) {
+        val portrait = maxHeight > maxWidth
+        val sheetHeight =
+            if (portrait) {
+                minOf(maxWidth, maxHeight - DrawerVerticalPadding * 2)
+            } else {
+                maxHeight - DrawerVerticalPadding * 2
+            }
+        val paneScale =
+            (sheetHeight.value / SessionDrawerStyle.PaneScaleReferenceHeightDp)
+                .coerceIn(SessionDrawerStyle.PaneScaleMin, 1f)
+        if (controller.visible) {
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                    ) { controller.close() },
+            )
+        }
+
+        val closedOffset = -(DrawerWidth + DrawerStartPadding + 8.dp)
+        val sheetOffset by animateDpAsState(
+            targetValue = if (controller.visible) 0.dp else closedOffset,
+            animationSpec = tween(durationMillis = 200, easing = LinearEasing),
+            label = "retroDrawerOffset",
+        )
+        if (sheetOffset > closedOffset) {
+            Box(
+                Modifier
+                    .padding(start = DrawerStartPadding, top = DrawerVerticalPadding, bottom = DrawerVerticalPadding)
+                    .height(sheetHeight)
+                    .width(DrawerWidth)
+                    .offset { androidx.compose.ui.unit.IntOffset(with(density) { sheetOffset.roundToPx() }, 0) }
+                    .clip(RoundedCornerShape(20.dp))
+                    .background(RetroSheetColor)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                    ) {},
+            ) {
+                Column(Modifier.fillMaxSize()) {
+                    RetroTopRail(controller, paneScale)
+                    ThinDivider()
+                    Box(Modifier.weight(1f).fillMaxWidth()) {
+                        if (controller.pane == null) {
+                            RetroActionGrid(controller, paneScale)
+                        } else {
+                            RetroPaneList(controller, paneScale)
+                        }
+                    }
+                    if (controller.pane == null && controller.bottomEntries.isNotEmpty()) {
+                        Column {
+                            ThinDivider()
+                            RetroBottomActions(controller, paneScale)
+                        }
+                    }
+                }
+            }
+        }
+        controller.renamePrompt?.let { prompt ->
+            RetroRenameDialog(prompt) { controller.renamePrompt = null }
+        }
+        controller.conflictPrompt?.let { prompt ->
+            RetroConflictDialog(prompt)
+        }
+    }
+}
+
+private data class RailTileBounds(
+    val offsetX: Float,
+    val width: Float,
+    val height: Float,
+)
+
+@Composable
+private fun RetroTopRail(
+    controller: RetroMenuController,
+    paneScale: Float,
+) {
+    val density = LocalDensity.current
+    val tileBounds = remember { mutableStateMapOf<Int, RailTileBounds>() }
+    val railScroll = rememberScrollState()
+
+    val selectedIndex =
+        if (controller.controllerActive && controller.region == 0) {
+            controller.railIndex
+        } else {
+            controller.tabs.indexOfFirst { it.pane == controller.pane }.coerceAtLeast(0)
+        }
+    val selectedBounds = tileBounds[selectedIndex]
+
+    val indicatorX = selectedBounds?.let { with(density) { it.offsetX.toDp() } } ?: 0.dp
+    val indicatorWidth = selectedBounds?.let { with(density) { it.width.toDp() } } ?: 0.dp
+    val indicatorTileHeight = selectedBounds?.let { with(density) { it.height.toDp() } } ?: 0.dp
+    val indicatorAlpha = if (selectedBounds != null) 1f else 0f
+
+    Box(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .background(TopRailSurfaceColor)
+                .padding(
+                    start = (10f * paneScale).dp,
+                    end = (10f * paneScale).dp,
+                    top = (5f * paneScale).dp,
+                    bottom = (2f * paneScale).dp,
+                ),
+    ) {
+        if (selectedBounds != null) {
+            Box(
+                modifier =
+                    Modifier
+                        .offset(
+                            x = indicatorX - with(density) { railScroll.value.toDp() } + (6f * paneScale).dp,
+                            y = indicatorTileHeight - (2f * paneScale).dp,
+                        )
+                        .width((indicatorWidth - (12f * paneScale).dp).coerceAtLeast(0.dp))
+                        .height((2f * paneScale).dp)
+                        .graphicsLayer { alpha = indicatorAlpha }
+                        .clip(RoundedCornerShape(1.dp))
+                        .background(DrawerAccent),
+            )
+        }
+        Row(
+            modifier = Modifier.horizontalScroll(railScroll),
+            horizontalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            controller.tabs.forEachIndexed { index, tab ->
+                RetroRailTile(
+                    icon = tab.icon,
+                    label = tab.label,
+                    selected =
+                        if (controller.controllerActive && controller.region == 0) {
+                            controller.railIndex == index
+                        } else {
+                            controller.pane == tab.pane
+                        },
+                    highlighted = controller.controllerActive && controller.region == 0 && controller.railIndex == index,
+                    paneScale = paneScale,
+                    onBoundsChanged = { tileBounds[index] = it },
+                    onClick = {
+                        controller.railIndex = index
+                        controller.showPane(tab.pane)
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroRailTile(
+    icon: ImageVector,
+    label: String,
+    selected: Boolean,
+    highlighted: Boolean,
+    paneScale: Float,
+    onBoundsChanged: (RailTileBounds) -> Unit,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val scale by animateFloatAsState(
+        targetValue = if (pressed) 0.94f else 1f,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy, stiffness = Spring.StiffnessMedium),
+        label = "retroTileScale",
+    )
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                highlighted -> DrawerFocusFill
+                pressed && !selected -> PaneSurfacePressed
+                else -> Color.Transparent
+            },
+        animationSpec = tween(120),
+        label = "retroTileBg",
+    )
+    val tint by animateColorAsState(
+        targetValue = if (selected) DrawerAccent else DrawerTextPrimary,
+        animationSpec = tween(120),
+        label = "retroTileTint",
+    )
+    val cornerRadius = (12f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    Column(
+        modifier =
+            Modifier
+                .defaultMinSize(minWidth = (60f * paneScale).dp)
+                .onGloballyPositioned { coords ->
+                    val bounds = coords.boundsInParent()
+                    onBoundsChanged(RailTileBounds(bounds.left, bounds.width, bounds.height))
+                }
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }
+                .clip(shape)
+                .background(bgColor)
+                .then(
+                    if (highlighted) {
+                        Modifier.chasingBorder(cornerRadius = cornerRadius, borderWidth = 1.5.dp, animationDurationMs = 8200)
+                    } else {
+                        Modifier
+                    },
+                )
+                .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+                .padding(
+                    start = (10f * paneScale).dp,
+                    end = (10f * paneScale).dp,
+                    top = (10f * paneScale).dp,
+                    bottom = (7f * paneScale).dp,
+                ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Icon(imageVector = icon, contentDescription = label, tint = tint, modifier = Modifier.size((22f * paneScale).dp))
+        Spacer(Modifier.height((2f * paneScale).dp))
+        Text(
+            text = label,
+            color = DrawerTextPrimary,
+            fontSize = (12f * paneScale).sp,
+            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
+            letterSpacing = 0.2.sp,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+private fun RetroActionGrid(
+    controller: RetroMenuController,
+    paneScale: Float,
+) {
+    val actions = controller.entries
+    val spacing = (8f * paneScale).dp
+    Column(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = (10f * paneScale).dp, vertical = (10f * paneScale).dp),
+        verticalArrangement = Arrangement.spacedBy(spacing),
+    ) {
+        actions.chunked(controller.gridColumns).forEachIndexed { rowIndex, row ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(spacing),
+            ) {
+                row.forEachIndexed { colIndex, entry ->
+                    val flatIndex = rowIndex * controller.gridColumns + colIndex
+                    if (entry is RetroMenuEntry.Action) {
+                        RetroActionCard(
+                            entry = entry,
+                            highlighted =
+                                controller.controllerActive &&
+                                    controller.region == 1 &&
+                                    controller.contentIndex == flatIndex,
+                            paneScale = paneScale,
+                            modifier = Modifier.weight(1f).aspectRatio(1f),
+                            onClick = {
+                                controller.contentIndex = flatIndex
+                                entry.onClick()
+                            },
+                        )
+                    }
+                }
+                repeat(controller.gridColumns - row.size) {
+                    Spacer(Modifier.weight(1f))
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroActionCard(
+    entry: RetroMenuEntry.Action,
+    highlighted: Boolean,
+    paneScale: Float,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val scale by animateFloatAsState(
+        targetValue = if (pressed) 0.96f else 1f,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy, stiffness = Spring.StiffnessMedium),
+        label = "retroCardScale",
+    )
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                highlighted -> DrawerFocusFill
+                pressed -> PaneInnerPressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(120),
+        label = "retroCardBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (entry.active) ActiveCardBorder else RestingCardBorder,
+        animationSpec = tween(120),
+        label = "retroCardBorder",
+    )
+    val tint =
+        when {
+            entry.danger -> GlassExitTint
+            entry.active -> DrawerActiveAccent
+            else -> DrawerTextPrimary
+        }
+    val cornerRadius = (12f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    val topColor =
+        Color(
+            red = (bgColor.red + (1f - bgColor.red) * DrawerGradientLift).coerceIn(0f, 1f),
+            green = (bgColor.green + (1f - bgColor.green) * DrawerGradientLift).coerceIn(0f, 1f),
+            blue = (bgColor.blue + (1f - bgColor.blue) * DrawerGradientLift).coerceIn(0f, 1f),
+            alpha = bgColor.alpha,
+        )
+    val shell =
+        modifier
+            .graphicsLayer {
+                scaleX = scale
+                scaleY = scale
+            }
+            .clip(shape)
+            .background(Brush.verticalGradient(listOf(topColor, bgColor)))
+            .border(1.dp, borderColor, shape)
+            .then(
+                if (highlighted) {
+                    Modifier.chasingBorder(cornerRadius = cornerRadius, borderWidth = 1.5.dp, animationDurationMs = 8200)
+                } else {
+                    Modifier
+                },
+            )
+            .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+    if (entry.subtitle != null) {
+        Row(
+            modifier =
+                shell
+                    .defaultMinSize(minHeight = (72f * paneScale).dp)
+                    .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                imageVector = entry.icon,
+                contentDescription = entry.label,
+                tint = tint,
+                modifier = Modifier.size((22f * paneScale).dp),
+            )
+            Spacer(Modifier.width((10f * paneScale).dp))
+            Column(Modifier.weight(1f, fill = true)) {
+                Text(
+                    text = entry.label,
+                    color = DrawerTextPrimary,
+                    fontSize = (13f * paneScale).sp,
+                    fontWeight = if (entry.active) FontWeight.SemiBold else FontWeight.Medium,
+                    maxLines = 3,
+                    softWrap = true,
+                    overflow = TextOverflow.Clip,
+                    lineHeight = (16f * paneScale).sp,
+                )
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    text = entry.subtitle,
+                    color = DrawerTextSecondary,
+                    fontSize = (11f * paneScale).sp,
+                    maxLines = 3,
+                    softWrap = true,
+                    overflow = TextOverflow.Clip,
+                    lineHeight = (14f * paneScale).sp,
+                )
+            }
+        }
+    } else {
+        Column(
+            modifier = shell,
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+        ) {
+            Icon(
+                imageVector = entry.icon,
+                contentDescription = entry.label,
+                tint = tint,
+                modifier = Modifier.size((24f * paneScale).dp),
+            )
+            Spacer(Modifier.height((4f * paneScale).dp))
+            Text(
+                text = entry.label,
+                color = DrawerTextPrimary,
+                fontSize = (12f * paneScale).sp,
+                fontWeight = if (entry.active) FontWeight.SemiBold else FontWeight.Medium,
+                letterSpacing = 0.2.sp,
+                textAlign = TextAlign.Center,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroPaneList(
+    controller: RetroMenuController,
+    paneScale: Float,
+) {
+    val columns = controller.gridColumns.coerceAtLeast(1)
+    Column(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = (10f * paneScale).dp, vertical = (10f * paneScale).dp),
+        verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+    ) {
+        controller.entries.chunked(columns).forEachIndexed { rowIndex, rowEntries ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+            ) {
+                rowEntries.forEachIndexed { colIndex, entry ->
+                    val index = rowIndex * columns + colIndex
+                    val highlighted =
+                        controller.controllerActive &&
+                            controller.region == 1 &&
+                            controller.contentIndex == index
+                    Box(Modifier.weight(1f)) {
+                        when (entry) {
+                            is RetroMenuEntry.Toggle ->
+                                RetroBooleanRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onClick = {
+                                        controller.contentIndex = index
+                                        entry.onChange(!entry.checked)
+                                    },
+                                )
+                            is RetroMenuEntry.Choice ->
+                                if (entry.visible) {
+                                    RetroChoiceRow(
+                                        entry = entry,
+                                        highlighted = highlighted,
+                                        paneScale = paneScale,
+                                        onFocus = { controller.contentIndex = index },
+                                    )
+                                }
+                            is RetroMenuEntry.TogglePair ->
+                                RetroTogglePairRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onFocus = { controller.contentIndex = index },
+                                )
+                            is RetroMenuEntry.Radio ->
+                                RetroRadioRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onClick = {
+                                        controller.contentIndex = index
+                                        entry.onSelect()
+                                    },
+                                )
+                            is RetroMenuEntry.Stepper ->
+                                RetroStepperRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onFocus = { controller.contentIndex = index },
+                                )
+                            is RetroMenuEntry.Action ->
+                                RetroActionCard(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    modifier =
+                                        Modifier
+                                            .fillMaxWidth()
+                                            .defaultMinSize(
+                                                minHeight =
+                                                    if (entry.subtitle != null) {
+                                                        (68f * paneScale).dp
+                                                    } else {
+                                                        (56f * paneScale).dp
+                                                    },
+                                            ),
+                                    onClick = {
+                                        controller.contentIndex = index
+                                        entry.onClick()
+                                    },
+                                )
+                            is RetroMenuEntry.Slider ->
+                                RetroSliderRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onClick = { controller.contentIndex = index },
+                                )
+                            is RetroMenuEntry.Chips ->
+                                RetroChipsGroup(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    chipFocus = if (highlighted) controller.chipIndex else -1,
+                                    paneScale = paneScale,
+                                    onChipClick = { chip ->
+                                        controller.contentIndex = index
+                                        controller.chipIndex = chip
+                                        entry.onToggle(chip)
+                                    },
+                                )
+                            is RetroMenuEntry.ColorPick ->
+                                RetroColorRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onFocus = { controller.contentIndex = index },
+                                )
+                            is RetroMenuEntry.SaveSlot ->
+                                RetroSaveSlotRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onClick = {
+                                        controller.contentIndex = index
+                                        entry.onClick()
+                                    },
+                                )
+                            is RetroMenuEntry.TextInput ->
+                                RetroTextInputRow(
+                                    entry = entry,
+                                    highlighted = highlighted,
+                                    paneScale = paneScale,
+                                    onClick = {
+                                        controller.contentIndex = index
+                                        entry.onOpen()
+                                    },
+                                )
+                        }
+                    }
+                }
+                repeat(columns - rowEntries.size) {
+                    Spacer(Modifier.weight(1f))
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroRowShell(
+    highlighted: Boolean,
+    activeBorder: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+    content: @Composable androidx.compose.foundation.layout.RowScope.() -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                highlighted -> DrawerFocusFill
+                pressed -> PaneInnerPressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(140),
+        label = "retroRowBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (activeBorder) ActiveCardBorder else RestingCardBorder,
+        animationSpec = tween(140),
+        label = "retroRowBorder",
+    )
+    val cornerRadius = (14f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, borderColor, shape)
+                .then(
+                    if (highlighted) {
+                        Modifier.chasingBorder(cornerRadius = cornerRadius, borderWidth = 1.5.dp, animationDurationMs = 8200)
+                    } else {
+                        Modifier
+                    },
+                )
+                .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+                .padding(horizontal = (12f * paneScale).dp, vertical = (8f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        content()
+    }
+}
+
+@Composable
+private fun RetroBooleanRow(
+    entry: RetroMenuEntry.Toggle,
+    highlighted: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    RetroRowShell(highlighted = highlighted, activeBorder = entry.checked, paneScale = paneScale, onClick = onClick) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = entry.label,
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+            )
+            Spacer(Modifier.height(2.dp))
+            Text(
+                text = entry.subtitle ?: if (entry.checked) stringResource(R.string.retro_scr_enabled) else stringResource(R.string.retro_scr_disabled),
+                color = DrawerTextSecondary,
+                fontSize = (12f * paneScale).sp,
+            )
+        }
+        Switch(
+            checked = entry.checked,
+            onCheckedChange = entry.onChange,
+            colors = outlinedSwitchColors(DrawerAccent, DrawerTextSecondary),
+        )
+    }
+}
+
+@Composable
+private fun RetroTogglePairRow(
+    entry: RetroMenuEntry.TogglePair,
+    highlighted: Boolean,
+    paneScale: Float,
+    onFocus: () -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+    ) {
+        listOf(entry.left, entry.right).forEach { half ->
+            Box(Modifier.weight(1f)) {
+                RetroRowShell(
+                    highlighted = highlighted,
+                    activeBorder = half.checked,
+                    paneScale = paneScale,
+                    onClick = {
+                        onFocus()
+                        half.onChange(!half.checked)
+                    },
+                ) {
+                    Column(modifier = Modifier.weight(1f)) {
+                        Text(
+                            text = half.label,
+                            color = DrawerTextPrimary,
+                            fontSize = (14f * paneScale).sp,
+                            fontWeight = FontWeight.Medium,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                        Spacer(Modifier.height(2.dp))
+                        Text(
+                            text =
+                                half.subtitle ?: if (half.checked) {
+                                    stringResource(R.string.retro_scr_enabled)
+                                } else {
+                                    stringResource(R.string.retro_scr_disabled)
+                                },
+                            color = if (half.checked) DrawerActiveAccent else DrawerTextSecondary,
+                            fontSize = (12f * paneScale).sp,
+                            fontWeight = FontWeight.SemiBold,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroTextInputRow(
+    entry: RetroMenuEntry.TextInput,
+    highlighted: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    RetroRowShell(highlighted = highlighted, activeBorder = entry.value.isNotBlank(), paneScale = paneScale, onClick = onClick) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = entry.label,
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+            )
+            Spacer(Modifier.height(2.dp))
+            Text(
+                text = entry.value.ifBlank { entry.placeholder },
+                color = if (entry.value.isBlank()) DrawerTextSecondary else DrawerActiveAccent,
+                fontSize = (12f * paneScale).sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroChoiceRow(
+    entry: RetroMenuEntry.Choice,
+    highlighted: Boolean,
+    paneScale: Float,
+    onFocus: () -> Unit,
+) {
+    var expanded by remember { mutableStateOf(false) }
+    Box {
+        RetroRowShell(
+            highlighted = highlighted,
+            activeBorder = false,
+            paneScale = paneScale,
+            onClick = {
+                onFocus()
+                expanded = true
+            },
+        ) {
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = entry.label,
+                    color = DrawerTextPrimary,
+                    fontSize = (14f * paneScale).sp,
+                    fontWeight = FontWeight.Medium,
+                )
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    text = entry.values.getOrNull(entry.selectedIndex) ?: "",
+                    color = DrawerActiveAccent,
+                    fontSize = (12f * paneScale).sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+            }
+            Text(
+                text = "▾",
+                color = DrawerTextSecondary,
+                fontSize = (16f * paneScale).sp,
+            )
+        }
+        DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false },
+            containerColor = WinNativeSurface,
+        ) {
+            entry.values.forEachIndexed { index, value ->
+                DropdownMenuItem(
+                    text = {
+                        Text(
+                            text = value,
+                            color = if (index == entry.selectedIndex) DrawerActiveAccent else DrawerTextPrimary,
+                            fontSize = (13f * paneScale).sp,
+                            fontWeight = if (index == entry.selectedIndex) FontWeight.SemiBold else FontWeight.Medium,
+                        )
+                    },
+                    onClick = {
+                        expanded = false
+                        entry.onSelected(index)
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroStepperRow(
+    entry: RetroMenuEntry.Stepper,
+    highlighted: Boolean,
+    paneScale: Float,
+    onFocus: () -> Unit,
+) {
+    RetroRowShell(
+        highlighted = highlighted,
+        activeBorder = false,
+        paneScale = paneScale,
+        onClick = {
+            onFocus()
+            entry.onStep(1)
+        },
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = entry.label,
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+            )
+            Spacer(Modifier.height(2.dp))
+            Text(
+                text = entry.valueText,
+                color = DrawerActiveAccent,
+                fontSize = (12f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        }
+        Text(
+            text = "◂",
+            color = DrawerTextSecondary,
+            fontSize = (16f * paneScale).sp,
+            modifier =
+                Modifier
+                    .clickable {
+                        onFocus()
+                        entry.onStep(-1)
+                    }
+                    .padding(horizontal = 6.dp),
+        )
+        Text(
+            text = "▸",
+            color = DrawerTextSecondary,
+            fontSize = (16f * paneScale).sp,
+            modifier =
+                Modifier
+                    .clickable {
+                        onFocus()
+                        entry.onStep(1)
+                    }
+                    .padding(horizontal = 6.dp),
+        )
+    }
+}
+
+@Composable
+private fun RetroRadioRow(
+    entry: RetroMenuEntry.Radio,
+    highlighted: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    RetroRowShell(highlighted = highlighted, activeBorder = entry.selected, paneScale = paneScale, onClick = onClick) {
+        Text(
+            text = entry.label,
+            color = if (entry.selected) DrawerActiveAccent else DrawerTextPrimary,
+            fontSize = (14f * paneScale).sp,
+            fontWeight = if (entry.selected) FontWeight.SemiBold else FontWeight.Medium,
+            modifier = Modifier.weight(1f),
+        )
+        if (entry.selected) {
+            Text(
+                text = "✓",
+                color = DrawerActiveAccent,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroChipsGroup(
+    entry: RetroMenuEntry.Chips,
+    highlighted: Boolean,
+    chipFocus: Int,
+    paneScale: Float,
+    onChipClick: (Int) -> Unit,
+) {
+    Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+        Text(
+            text = entry.label,
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+            letterSpacing = 0.8.sp,
+        )
+        FlowRow(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+            verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+        ) {
+            entry.items.forEachIndexed { index, item ->
+                RetroHudChip(
+                    label = item,
+                    checked = entry.states.getOrElse(index) { false },
+                    focused = highlighted && chipFocus == index,
+                    paneScale = paneScale,
+                    onClick = { onChipClick(index) },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroHudChip(
+    label: String,
+    checked: Boolean,
+    focused: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                focused -> DrawerFocusFill
+                pressed -> PaneInnerPressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(140),
+        label = "retroChipBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (checked) DrawerAccent else RestingCardBorder,
+        animationSpec = tween(140),
+        label = "retroChipBorder",
+    )
+    val cornerRadius = (12f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    Row(
+        modifier =
+            Modifier
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, borderColor, shape)
+                .then(
+                    if (focused) {
+                        Modifier.chasingBorder(cornerRadius = cornerRadius, borderWidth = 1.5.dp, animationDurationMs = 8200)
+                    } else {
+                        Modifier
+                    },
+                )
+                .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+                .padding(horizontal = (10f * paneScale).dp, vertical = (9f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size((10f * paneScale).dp)
+                    .clip(androidx.compose.foundation.shape.CircleShape)
+                    .background(if (checked) DrawerAccent else Color(0x14FFFFFF)),
+        )
+        Spacer(Modifier.width((8f * paneScale).dp))
+        Text(
+            text = label,
+            color = DrawerTextPrimary,
+            fontSize = (13f * paneScale).sp,
+            fontWeight = if (checked) FontWeight.SemiBold else FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+private fun RetroSaveSlotRow(
+    entry: RetroMenuEntry.SaveSlot,
+    highlighted: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    RetroRowShell(
+        highlighted = highlighted,
+        activeBorder = entry.filled,
+        paneScale = paneScale,
+        onClick = onClick,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size((28f * paneScale).dp)
+                    .clip(androidx.compose.foundation.shape.CircleShape)
+                    .background(if (entry.filled) DrawerAccent.copy(alpha = 0.24f) else Color(0x14FFFFFF)),
+        ) {
+            Text(
+                text = entry.slot.toString(),
+                color = if (entry.filled) DrawerActiveAccent else DrawerTextSecondary,
+                fontSize = (12f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+                modifier = Modifier.align(Alignment.Center),
+            )
+        }
+        Spacer(Modifier.width((10f * paneScale).dp))
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = entry.title,
+                color = DrawerTextPrimary,
+                fontSize = (13f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Spacer(Modifier.height(2.dp))
+            Text(
+                text = entry.subtitle,
+                color = if (entry.filled) DrawerActiveAccent else DrawerTextSecondary,
+                fontSize = (11f * paneScale).sp,
+            )
+        }
+        if (entry.filled) {
+            Icon(
+                imageVector = Icons.Outlined.Edit,
+                contentDescription = stringResource(R.string.retro_scr_rename),
+                tint = DrawerTextSecondary,
+                modifier =
+                    Modifier
+                        .size((18f * paneScale).dp)
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                        ) { entry.onRename() },
+            )
+        }
+    }
+}
+
+@Composable
+internal fun RetroRenameDialog(
+    prompt: RetroRenamePrompt,
+    onDismiss: () -> Unit,
+) {
+    var text by remember(prompt) { mutableStateOf(prompt.initial) }
+    Box(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(Color(0x99000000))
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                ) { onDismiss() },
+        contentAlignment = Alignment.Center,
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .width(320.dp)
+                    .clip(RoundedCornerShape(16.dp))
+                    .background(WinNativeSurface)
+                    .border(1.dp, WinNativeOutline, RoundedCornerShape(16.dp))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                    ) {}
+                    .padding(16.dp),
+        ) {
+            Text(
+                text = prompt.title,
+                color = DrawerTextPrimary,
+                fontSize = 15.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+            Spacer(Modifier.height(10.dp))
+            OutlinedTextField(
+                value = text,
+                onValueChange = { if (it.length <= 48) text = it },
+                singleLine = true,
+                textStyle = androidx.compose.ui.text.TextStyle(color = DrawerTextPrimary, fontSize = 14.sp),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            Spacer(Modifier.height(12.dp))
+            Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                Spacer(Modifier.weight(1f))
+                Text(
+                    text = stringResource(R.string.retro_scr_cancel),
+                    color = DrawerTextSecondary,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    modifier =
+                        Modifier
+                            .clip(RoundedCornerShape(8.dp))
+                            .clickable { onDismiss() }
+                            .padding(horizontal = 12.dp, vertical = 8.dp),
+                )
+                Text(
+                    text = stringResource(R.string.retro_scr_save),
+                    color = DrawerActiveAccent,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    modifier =
+                        Modifier
+                            .clip(RoundedCornerShape(8.dp))
+                            .clickable {
+                                prompt.onConfirm(text.trim().ifEmpty { null })
+                                onDismiss()
+                            }
+                            .padding(horizontal = 12.dp, vertical = 8.dp),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun RetroConflictDialog(prompt: RetroConflictPrompt) {
+    Box(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(Color(0xCC000000))
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                ) {},
+        contentAlignment = Alignment.Center,
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .width(340.dp)
+                    .clip(RoundedCornerShape(16.dp))
+                    .background(WinNativeSurface)
+                    .border(1.dp, WinNativeOutline, RoundedCornerShape(16.dp))
+                    .padding(16.dp),
+        ) {
+            Text(
+                text = stringResource(R.string.retro_scr_cloud_save_conflict),
+                color = DrawerTextPrimary,
+                fontSize = 15.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+            Spacer(Modifier.height(6.dp))
+            Text(
+                text = prompt.message,
+                color = DrawerTextSecondary,
+                fontSize = 12.sp,
+            )
+            Spacer(Modifier.height(12.dp))
+            Column(
+                modifier = Modifier.verticalScroll(rememberScrollState()).weight(1f, fill = false),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                prompt.options.forEachIndexed { index, label ->
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .clip(RoundedCornerShape(10.dp))
+                                .background(PaneInnerResting)
+                                .border(1.dp, RestingCardBorder, RoundedCornerShape(10.dp))
+                                .clickable { prompt.onPick(index) }
+                                .padding(horizontal = 12.dp, vertical = 10.dp),
+                    ) {
+                        Text(
+                            text = label,
+                            color = DrawerTextPrimary,
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Medium,
+                        )
+                    }
+                }
+            }
+            Spacer(Modifier.height(12.dp))
+            Row(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(10.dp))
+                        .background(DrawerFocusFill)
+                        .border(1.dp, DrawerAccent, RoundedCornerShape(10.dp))
+                        .clickable { prompt.onKeepLocal() }
+                        .padding(horizontal = 12.dp, vertical = 10.dp),
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Text(
+                    text = stringResource(R.string.retro_scr_keep_local_save),
+                    color = DrawerActiveAccent,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroColorRow(
+    entry: RetroMenuEntry.ColorPick,
+    highlighted: Boolean,
+    paneScale: Float,
+    onFocus: () -> Unit,
+) {
+    var expanded by remember { mutableStateOf(false) }
+    Column {
+        RetroRowShell(
+            highlighted = highlighted,
+            activeBorder = entry.color != null,
+            paneScale = paneScale,
+            onClick = {
+                onFocus()
+                expanded = !expanded
+            },
+        ) {
+            Text(
+                text = entry.label,
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+                modifier = Modifier.weight(1f),
+            )
+            Box(
+                modifier =
+                    Modifier
+                        .size((20f * paneScale).dp)
+                        .clip(androidx.compose.foundation.shape.CircleShape)
+                        .background(entry.color?.let { Color(it) } ?: Color(0x14FFFFFF))
+                        .border(
+                            1.dp,
+                            if (entry.color != null) DrawerAccent else RestingCardBorder,
+                            androidx.compose.foundation.shape.CircleShape,
+                        ),
+            ) {
+                if (entry.color == null) {
+                    Text(
+                        text = stringResource(R.string.retro_scr_auto_color_abbrev),
+                        color = DrawerTextSecondary,
+                        fontSize = (10f * paneScale).sp,
+                        fontWeight = FontWeight.SemiBold,
+                        modifier = Modifier.align(Alignment.Center),
+                    )
+                }
+            }
+            Spacer(Modifier.width((8f * paneScale).dp))
+            Text(
+                text = if (expanded) "▴" else "▾",
+                color = DrawerTextSecondary,
+                fontSize = (16f * paneScale).sp,
+            )
+        }
+        AnimatedVisibility(visible = expanded) {
+            FlowRow(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = (6f * paneScale).dp, vertical = (8f * paneScale).dp),
+                horizontalArrangement = Arrangement.spacedBy((7f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((7f * paneScale).dp),
+            ) {
+                RetroColorSwatch(
+                    color = null,
+                    selected = entry.color == null,
+                    paneScale = paneScale,
+                ) {
+                    entry.onPick(null)
+                }
+                RetroColorPalette.forEach { swatch ->
+                    RetroColorSwatch(
+                        color = swatch,
+                        selected = entry.color == swatch,
+                        paneScale = paneScale,
+                    ) {
+                        entry.onPick(swatch)
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroColorSwatch(
+    color: Int?,
+    selected: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    val shape = androidx.compose.foundation.shape.CircleShape
+    Box(
+        modifier =
+            Modifier
+                .size((26f * paneScale).dp)
+                .clip(shape)
+                .background(color?.let { Color(it) } ?: Color(0x14FFFFFF))
+                .border(
+                    if (selected) 2.dp else 1.dp,
+                    if (selected) DrawerActiveAccent else RestingCardBorder,
+                    shape,
+                )
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onClick,
+                ),
+    ) {
+        if (color == null) {
+            Text(
+                text = stringResource(R.string.retro_scr_auto_color_abbrev),
+                color = DrawerTextSecondary,
+                fontSize = (11f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+                modifier = Modifier.align(Alignment.Center),
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroSliderRow(
+    entry: RetroMenuEntry.Slider,
+    highlighted: Boolean,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    RetroRowShell(highlighted = highlighted, activeBorder = false, paneScale = paneScale, onClick = onClick) {
+        Column(modifier = Modifier.weight(1f)) {
+            Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = entry.label,
+                    color = DrawerTextPrimary,
+                    fontSize = (14f * paneScale).sp,
+                    fontWeight = FontWeight.Medium,
+                    modifier = Modifier.weight(1f),
+                )
+                Text(
+                    text = entry.valueText,
+                    color = DrawerActiveAccent,
+                    fontSize = (12f * paneScale).sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+            }
+            val stepCount = (((entry.max - entry.min) / entry.step).toInt() - 1).coerceAtLeast(0)
+            Slider(
+                value = entry.value,
+                onValueChange = { raw ->
+                    val snapped =
+                        (kotlin.math.round((raw - entry.min) / entry.step) * entry.step + entry.min)
+                            .coerceIn(entry.min, entry.max)
+                    if (snapped != entry.value) entry.onChange(snapped)
+                },
+                valueRange = entry.min..entry.max,
+                steps = stepCount,
+                colors =
+                    SliderDefaults.colors(
+                        thumbColor = DrawerAccent,
+                        activeTrackColor = DrawerAccent,
+                        inactiveTrackColor = WinNativeOutline.copy(alpha = 0.5f),
+                        activeTickColor = Color.Transparent,
+                        inactiveTickColor = Color.Transparent,
+                    ),
+                modifier = Modifier.fillMaxWidth().height((26f * paneScale).dp),
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroBottomActions(
+    controller: RetroMenuController,
+    paneScale: Float,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = (10f * paneScale).dp, vertical = (8f * paneScale).dp),
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        controller.bottomEntries.forEachIndexed { index, entry ->
+            RetroBottomActionButton(
+                entry = entry,
+                highlighted =
+                    controller.controllerActive &&
+                        controller.region == 2 &&
+                        controller.bottomIndex == index,
+                paneScale = paneScale,
+                modifier = Modifier.weight(1f),
+                onClick = {
+                    controller.bottomIndex = index
+                    entry.onClick()
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun RetroBottomActionButton(
+    entry: RetroMenuEntry.Action,
+    highlighted: Boolean,
+    paneScale: Float,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                highlighted -> DrawerFocusFill
+                entry.danger && pressed -> TileExitPressed
+                entry.danger -> TileExitResting
+                pressed -> PaneSurfacePressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(120),
+        label = "retroBottomBg",
+    )
+    val borderColor =
+        when {
+            entry.danger -> GlassExitTint.copy(alpha = 0.34f)
+            entry.active -> ActiveCardBorder
+            else -> RestingCardBorder
+        }
+    val tint =
+        when {
+            entry.danger -> GlassExitTint
+            entry.active -> DrawerActiveAccent
+            else -> DrawerTextPrimary
+        }
+    val cornerRadius = (14f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    Row(
+        modifier =
+            modifier
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, borderColor, shape)
+                .then(
+                    if (highlighted) {
+                        Modifier.chasingBorder(cornerRadius = cornerRadius, borderWidth = 1.5.dp, animationDurationMs = 8200)
+                    } else {
+                        Modifier
+                    },
+                )
+                .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+                .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+    ) {
+        Icon(
+            imageVector = entry.icon,
+            contentDescription = entry.label,
+            tint = tint,
+            modifier = Modifier.size((18f * paneScale).dp),
+        )
+        Spacer(Modifier.width((8f * paneScale).dp))
+        Text(
+            text = entry.label,
+            color = tint,
+            fontSize = (13f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+private fun ThinDivider() {
+    Box(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .height(1.dp)
+                .background(DividerColor),
+    )
+}
+
+object RetroDrawerTabs {
+    fun build(
+        context: android.content.Context,
+        includePerformance: Boolean = false,
+        includeNetplay: Boolean = false,
+        includeSystem: Boolean = false,
+    ): List<RetroTabSpec> {
+        val tabs = mutableListOf<RetroTabSpec>()
+        tabs += RetroTabSpec(null, Icons.Outlined.Apps, context.getString(R.string.retro_tab_menu))
+        tabs += RetroTabSpec(RetroPane.DISPLAY, Icons.Outlined.Monitor, context.getString(R.string.retro_tab_display))
+        if (includePerformance) {
+            tabs += RetroTabSpec(RetroPane.PERFORMANCE, Icons.Outlined.Bolt, context.getString(R.string.retro_ps2_tab_performance))
+        }
+        tabs += RetroTabSpec(RetroPane.HUD, Icons.Outlined.Speed, context.getString(R.string.retro_tab_hud))
+        tabs += RetroTabSpec(RetroPane.SOUND, Icons.AutoMirrored.Outlined.VolumeUp, context.getString(R.string.retro_tab_sound))
+        tabs += RetroTabSpec(RetroPane.CONTROLS, Icons.Outlined.SportsEsports, context.getString(R.string.retro_tab_controls))
+        if (includeSystem) {
+            tabs += RetroTabSpec(RetroPane.SYSTEM, Icons.Outlined.Tune, context.getString(R.string.retro_tab_system))
+        }
+        if (includeNetplay) {
+            tabs += RetroTabSpec(RetroPane.NETWORK, Icons.Outlined.Wifi, context.getString(R.string.retro_tab_netplay))
+        }
+        return tabs
+    }
+}
+
+object RetroDrawerIcons {
+    val EditLayout = Icons.Outlined.Tune
+    val Resume = Icons.Outlined.PlayArrow
+    val Pause = Icons.Outlined.Pause
+    val Save = Icons.Outlined.Save
+    val Load = Icons.Outlined.Download
+    val Reset = Icons.Outlined.RestartAlt
+    val FastForward = Icons.Outlined.FastForward
+    val Disc = Icons.Outlined.Album
+    val Hud = Icons.Outlined.Speed
+    val Achievements = Icons.Outlined.EmojiEvents
+    val Cheats = Icons.Outlined.Bolt
+    val Add = Icons.Outlined.Add
+    val Play = Icons.Outlined.PlayArrow
+    val Group = Icons.Outlined.Group
+    val Link = Icons.Outlined.Link
+    val Search = Icons.Outlined.Search
+    val Exit = Icons.AutoMirrored.Outlined.ExitToApp
+}
diff --git a/app/src/main/feature/retro/RetroGameLink.kt b/app/src/main/feature/retro/RetroGameLink.kt
new file mode 100644
index 000000000..d32074f12
--- /dev/null
+++ b/app/src/main/feature/retro/RetroGameLink.kt
@@ -0,0 +1,142 @@
+package com.winlator.cmod.feature.retro
+
+import com.swordfish.libretrodroid.GLRetroView
+import com.swordfish.libretrodroid.Variable
+
+object RetroGameLink {
+    const val DEFAULT_PORT = 56400
+
+    const val MODE_KEY = "gambatte_gb_link_mode"
+    const val PORT_KEY = "gambatte_gb_link_network_port"
+    private const val IP_KEY_PREFIX = "gambatte_gb_link_network_server_ip_"
+
+    const val MODE_OFF = "Not Connected"
+    const val MODE_SERVER = "Network Server"
+    const val MODE_CLIENT = "Network Client"
+
+    fun isSupported(systemId: String?): Boolean =
+        systemId == RetroSystems.GAMEBOY.id ||
+            systemId == RetroSystems.GAMEBOY_COLOR.id ||
+            systemId == RetroSystems.GBA.id
+
+    const val GPSP_SERIAL_KEY = "gpsp_serial"
+    const val GPSP_SERIAL_RFU = "rfu"
+    const val GBA_NETPACKET_PORT = 55437
+
+    fun clampPort(port: Int): Int =
+        when {
+            port in 56400..56420 -> port
+            else -> DEFAULT_PORT
+        }
+
+    fun ipv4ToDigits(ip: String): List<String> {
+        val parts =
+            ip.trim()
+                .split('.')
+                .mapNotNull { it.toIntOrNull()?.coerceIn(0, 255) }
+        if (parts.size != 4) return List(12) { "0" }
+        return parts.flatMap { octet ->
+            val s = "%03d".format(octet)
+            listOf(s[0].toString(), s[1].toString(), s[2].toString())
+        }
+    }
+
+    fun digitsToIpv4(digits: List<String>): String {
+        if (digits.size < 12) return "0.0.0.0"
+        fun octet(a: Int) =
+            ((digits.getOrNull(a)?.toIntOrNull() ?: 0) * 100 +
+                (digits.getOrNull(a + 1)?.toIntOrNull() ?: 0) * 10 +
+                (digits.getOrNull(a + 2)?.toIntOrNull() ?: 0))
+                .coerceIn(0, 255)
+        return "${octet(0)}.${octet(3)}.${octet(6)}.${octet(9)}"
+    }
+
+    fun buildHostVariables(port: Int): List<Variable> {
+        val p = clampPort(port)
+        return listOf(
+            Variable(MODE_KEY, MODE_SERVER),
+            Variable(PORT_KEY, p.toString()),
+        )
+    }
+
+    fun buildClientVariables(
+        hostIp: String,
+        port: Int,
+    ): List<Variable> {
+        val p = clampPort(port)
+        val digits = ipv4ToDigits(hostIp)
+        val vars = mutableListOf(
+            Variable(MODE_KEY, MODE_CLIENT),
+            Variable(PORT_KEY, p.toString()),
+        )
+        digits.forEachIndexed { i, d ->
+            vars += Variable("$IP_KEY_PREFIX${i + 1}", d)
+        }
+        return vars
+    }
+
+    fun buildDisconnectVariables(): List<Variable> =
+        listOf(Variable(MODE_KEY, MODE_OFF))
+
+    fun applyToCore(
+        retroView: GLRetroView,
+        variables: List<Variable>,
+    ) {
+        if (variables.isEmpty()) return
+        runCatching {
+            retroView.updateVariables(*variables.toTypedArray())
+        }
+    }
+
+    fun startHost(
+        retroView: GLRetroView?,
+        port: Int,
+    ) {
+        val vars = buildHostVariables(port)
+        if (retroView != null) applyToCore(retroView, vars)
+    }
+
+    fun startClient(
+        retroView: GLRetroView?,
+        hostIp: String,
+        port: Int,
+    ) {
+        val vars = buildClientVariables(hostIp, port)
+        if (retroView != null) applyToCore(retroView, vars)
+    }
+
+    fun stop(retroView: GLRetroView?) {
+        runCatching { retroView?.netpacketStop() }
+        if (retroView != null) {
+            runCatching { applyToCore(retroView, buildDisconnectVariables()) }
+            runCatching {
+                retroView.updateVariables(Variable(GPSP_SERIAL_KEY, "disabled"))
+            }
+        }
+    }
+
+    fun startGbaHost(
+        retroView: GLRetroView,
+        port: Int = GBA_NETPACKET_PORT,
+    ): Boolean {
+        applyToCore(
+            retroView,
+            listOf(Variable(GPSP_SERIAL_KEY, GPSP_SERIAL_RFU)),
+        )
+        if (!retroView.netpacketHasCore()) return false
+        return retroView.netpacketStartHost(port)
+    }
+
+    fun startGbaClient(
+        retroView: GLRetroView,
+        hostIp: String,
+        port: Int = GBA_NETPACKET_PORT,
+    ): Boolean {
+        applyToCore(
+            retroView,
+            listOf(Variable(GPSP_SERIAL_KEY, GPSP_SERIAL_RFU)),
+        )
+        if (!retroView.netpacketHasCore()) return false
+        return retroView.netpacketStartClient(hostIp, port)
+    }
+}
diff --git a/app/src/main/feature/retro/RetroGameSettings.kt b/app/src/main/feature/retro/RetroGameSettings.kt
new file mode 100644
index 000000000..bf1bae663
--- /dev/null
+++ b/app/src/main/feature/retro/RetroGameSettings.kt
@@ -0,0 +1,2015 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.VolumeUp
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.KeyboardArrowDown
+import androidx.compose.material.icons.outlined.Memory
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.Code
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Public
+import androidx.compose.material.icons.outlined.Speed
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+import com.winlator.cmod.shared.ui.settings.SharedGroupTitle
+import com.winlator.cmod.shared.ui.settings.SharedInfoRow
+import com.winlator.cmod.shared.ui.settings.SharedSettingGroup
+import com.winlator.cmod.shared.ui.settings.SharedSettingSwitch
+import com.winlator.cmod.feature.library.GameSettingsNav
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.runtime.container.Shortcut
+import java.io.File
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneHighlight
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+
+private val BgDeep = GameSettingsStyle.BgDeep
+private val SidebarBg = GameSettingsStyle.SidebarBg
+private val ContentBg = GameSettingsStyle.ContentBg
+private val CardSurface = GameSettingsStyle.CardSurface
+private val CardBorder = GameSettingsStyle.CardBorder
+private val InputSurface = GameSettingsStyle.InputSurface
+private val InputBorder = GameSettingsStyle.InputBorder
+private val AccentBlue = GameSettingsStyle.AccentBlue
+private val TextPrimary = GameSettingsStyle.TextPrimary
+private val TextSecondary = GameSettingsStyle.TextSecondary
+private val TextDim = GameSettingsStyle.TextDim
+private val DividerColor = GameSettingsStyle.Divider
+private val NavHighlight = GameSettingsStyle.NavHighlight
+private val DangerRed = GameSettingsStyle.DangerRed
+
+private val LabelSize = 11.sp
+private val ValueSize = 12.sp
+private val GroupCorner = 12.dp
+private val GroupPadding = 12.dp
+private val FieldCorner = 8.dp
+private val ItemGap = 10.dp
+private val TightGap = 4.dp
+
+private val SHADER_KEYS = listOf("default", "crt", "lcd", "sharp")
+private val UPSCALE_KEYS = listOf("2x", "4x", "native")
+
+class RetroSettingsState(
+    val shortcut: Shortcut,
+    private val context: android.content.Context? = null,
+) {
+    val system: RetroSystem? = RetroShortcuts.systemForShortcut(shortcut)
+    val coreOptions: List<RetroCoreOption> = RetroCoreOptions.forSystem(system)
+    val name: String = shortcut.getExtra("custom_name", shortcut.name)
+    val romPath: String = shortcut.getExtra(RetroShortcuts.KEY_ROM)
+
+    private val sysId: String? = system?.id
+
+    var shader by mutableStateOf(
+        shortcut.getExtra(RetroShortcuts.KEY_SHADER)
+            .ifEmpty { if (context != null && sysId != null) RetroDefaults.shader(context, sysId) else "default" }
+            .lowercase().let { if (it in SHADER_KEYS) it else "default" },
+    )
+    var sgsr by mutableStateOf(
+        when {
+            shortcut.getExtra(RetroShortcuts.KEY_SGSR).isNotEmpty() -> shortcut.getExtra(RetroShortcuts.KEY_SGSR) == "1"
+            shortcut.getExtra(RetroShortcuts.KEY_SHADER, "default").lowercase() == "sgsr" -> true
+            context != null && sysId != null -> RetroDefaults.sgsr(context, sysId)
+            else -> false
+        },
+    )
+    var upscale by mutableStateOf(
+        shortcut.getExtra(RetroShortcuts.KEY_UPSCALE)
+            .ifEmpty { if (context != null && sysId != null) RetroDefaults.upscale(context, sysId) else "native" }
+            .lowercase().let { if (it in UPSCALE_KEYS) it else "native" },
+    )
+    var engine3d by mutableStateOf(shortcut.getExtra(Gen1EmbedLaunch.KEY_ENGINE_3D) == "1")
+    var touchControls by mutableStateOf(
+        shortcut.getExtra(RetroShortcuts.KEY_TOUCH_CONTROLS)
+            .ifEmpty { if (context != null && sysId != null) (if (RetroDefaults.touchControls(context, sysId)) "1" else "0") else "1" } != "0",
+    )
+    var adaptiveSticks by mutableStateOf(
+        shortcut.getExtra(RetroShortcuts.KEY_ADAPTIVE_STICKS)
+            .ifEmpty { if (context != null && sysId != null) (if (RetroDefaults.adaptiveSticks(context, sysId)) "1" else "0") else "0" } == "1",
+    )
+    var hddImage by mutableStateOf(shortcut.getExtra(RetroShortcuts.KEY_HDD_IMAGE))
+    var hddEnable by mutableStateOf(shortcut.getExtra(RetroShortcuts.KEY_HDD_ENABLE) == "1")
+    var audio by mutableStateOf(
+        shortcut.getExtra(RetroShortcuts.KEY_AUDIO)
+            .ifEmpty { if (context != null && sysId != null) (if (RetroDefaults.audio(context, sysId)) "1" else "0") else "1" } != "0",
+    )
+    var hud by mutableStateOf(
+        shortcut.getExtra(RetroShortcuts.KEY_HUD)
+            .ifEmpty {
+                if (context != null && sysId != null) {
+                    if (RetroHudSupport.consoleHudDefault(context, sysId)) "1" else "0"
+                } else {
+                    "0"
+                }
+            } == "1",
+    )
+
+    val optionValues =
+        mutableStateMapOf<String, String>().apply {
+            coreOptions.forEach { option ->
+                put(
+                    option.key,
+                    shortcut.getExtra(RetroShortcuts.VAR_PREFIX + option.key).ifEmpty {
+                        if (context != null && sysId != null) {
+                            RetroDefaults.coreOption(context, sysId, option.key, option.defaultValue)
+                        } else {
+                            option.defaultValue
+                        }
+                    },
+                )
+            }
+        }
+    val artworkSelected = mutableStateMapOf<LibraryShortcutArtwork.LibraryArtworkSlot, Boolean>()
+    var currentSection by mutableIntStateOf(0)
+    var biosRefresh by mutableIntStateOf(0)
+
+    var hddRefresh by mutableIntStateOf(0)
+    var hddImporting by mutableStateOf(false)
+    var requestImportHdd: (() -> Unit)? = null
+
+    val gameSerial: String? by lazy {
+        if (context != null && system?.id == RetroSystems.PS2.id) Ps2IsoSerial.serialOf(File(romPath)) else null
+    }
+    var cheatsRefresh by mutableIntStateOf(0)
+    var pendingImportIsPatch = false
+    var requestImportCheatFile: ((isPatch: Boolean) -> Unit)? = null
+
+    init {
+        syncArtwork()
+    }
+
+    fun syncArtwork() {
+        LibraryShortcutArtwork.LibraryArtworkSlot.entries.forEach { slot ->
+            val path = shortcut.getExtra(slot.extraKey)
+            artworkSelected[slot] = path.isNotBlank() && File(path).isFile
+        }
+    }
+
+    fun save() {
+        shortcut.putExtra(RetroShortcuts.KEY_SHADER, shader)
+        shortcut.putExtra(RetroShortcuts.KEY_SGSR, if (sgsr) "1" else "0")
+        shortcut.putExtra(RetroShortcuts.KEY_UPSCALE, upscale)
+        shortcut.putExtra(Gen1EmbedLaunch.KEY_ENGINE_3D, if (engine3d) "1" else "0")
+        shortcut.putExtra(RetroShortcuts.KEY_TOUCH_CONTROLS, if (touchControls) "1" else "0")
+        shortcut.putExtra(RetroShortcuts.KEY_ADAPTIVE_STICKS, if (adaptiveSticks) "1" else "0")
+        shortcut.putExtra(RetroShortcuts.KEY_HDD_IMAGE, hddImage)
+        shortcut.putExtra(RetroShortcuts.KEY_HDD_ENABLE, if (hddEnable) "1" else "0")
+        shortcut.putExtra(RetroShortcuts.KEY_AUDIO, if (audio) "1" else "0")
+        shortcut.putExtra(RetroShortcuts.KEY_HUD, if (hud) "1" else "0")
+        coreOptions.forEach { option ->
+            val consoleDefault =
+                if (context != null && sysId != null) {
+                    RetroDefaults.coreOption(context, sysId, option.key, option.defaultValue)
+                } else {
+                    option.defaultValue
+                }
+            val chosen = optionValues[option.key] ?: consoleDefault
+            shortcut.putExtra(
+                RetroShortcuts.VAR_PREFIX + option.key,
+                if (chosen == consoleDefault) null else chosen,
+            )
+        }
+        shortcut.saveData()
+    }
+}
+
+private enum class RetroSectionId {
+    GENERAL,
+    GRAPHICS,
+    PERFORMANCE,
+    HUD,
+    INPUT,
+    AUDIO,
+    ONLINE,
+    CHEATS,
+}
+
+private data class RetroSection(
+    val id: RetroSectionId,
+    val icon: ImageVector,
+    val labelRes: Int,
+)
+
+private fun buildRetroSections(state: RetroSettingsState): List<RetroSection> {
+    val sections = mutableListOf<RetroSection>()
+    val systemId = state.system?.id
+    sections += RetroSection(RetroSectionId.GENERAL, Icons.Outlined.Tune, R.string.retro_gs_section_general)
+    sections += RetroSection(RetroSectionId.GRAPHICS, Icons.Outlined.Monitor, R.string.retro_gs_section_graphics)
+    if (state.system?.isExternal == true) {
+        sections += RetroSection(RetroSectionId.PERFORMANCE, Icons.Outlined.Bolt, R.string.retro_gs_section_performance)
+    }
+    sections += RetroSection(RetroSectionId.HUD, Icons.Outlined.Speed, R.string.retro_gs_section_hud)
+    sections += RetroSection(RetroSectionId.INPUT, Icons.Outlined.SportsEsports, R.string.retro_gs_section_input)
+    sections += RetroSection(RetroSectionId.AUDIO, Icons.AutoMirrored.Outlined.VolumeUp, R.string.retro_gs_section_audio)
+    if (RetroOnlineSupport.supportsDev9(systemId) ||
+        RetroOnlineSupport.supportsMultiplayerUi(systemId) ||
+        RetroOnlineSupport.supportsDolphinNetplay(systemId)
+    ) {
+        sections += RetroSection(RetroSectionId.ONLINE, Icons.Outlined.Public, R.string.retro_gs_section_online)
+    }
+    if (state.system?.isExternal == true) {
+        sections += RetroSection(RetroSectionId.CHEATS, Icons.Outlined.Code, R.string.retro_gs_group_cheats)
+    }
+    return sections
+}
+
+@Composable
+fun RetroGameSettingsContent(
+    state: RetroSettingsState,
+    nav: GameSettingsNav? = null,
+    onPickArtwork: ((LibraryShortcutArtwork.LibraryArtworkSlot) -> Unit)? = null,
+    onRemoveArtwork: ((LibraryShortcutArtwork.LibraryArtworkSlot) -> Unit)? = null,
+    onImportBios: (() -> Unit)? = null,
+    onSave: () -> Unit,
+    onCancel: () -> Unit,
+) {
+    val sections = remember(state) { buildRetroSections(state) }
+    val selectedIdx = state.currentSection
+
+    if (nav != null) {
+        SideEffect {
+            nav.sidebarCount = sections.size
+            nav.onSelectSection = { state.currentSection = it }
+            nav.onSave = onSave
+            nav.onCancel = onCancel
+        }
+    }
+
+    Box(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .clip(RoundedCornerShape(16.dp))
+                .background(BgDeep),
+    ) {
+        Row(modifier = Modifier.fillMaxSize()) {
+            RetroSidebar(
+                title = state.name,
+                subtitle = state.system?.displayName ?: "",
+                sections = sections,
+                currentIndex = selectedIdx,
+                onSectionSelected = { state.currentSection = it },
+                onSave = onSave,
+                onCancel = onCancel,
+                nav = nav,
+                modifier = Modifier.width(220.dp).fillMaxHeight(),
+            )
+            Box(Modifier.width(1.dp).fillMaxHeight().background(DividerColor))
+            Box(
+                modifier =
+                    Modifier
+                        .weight(1f)
+                        .fillMaxHeight()
+                        .background(ContentBg),
+            ) {
+                RetroSectionContent(
+                    sectionIndex = selectedIdx,
+                    state = state,
+                    nav = nav,
+                    onPickArtwork = onPickArtwork,
+                    onRemoveArtwork = onRemoveArtwork,
+                    onImportBios = onImportBios,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroSectionContent(
+    sectionIndex: Int,
+    state: RetroSettingsState,
+    nav: GameSettingsNav? = null,
+    onPickArtwork: ((LibraryShortcutArtwork.LibraryArtworkSlot) -> Unit)? = null,
+    onRemoveArtwork: ((LibraryShortcutArtwork.LibraryArtworkSlot) -> Unit)? = null,
+    onImportBios: (() -> Unit)? = null,
+) {
+    run {
+        val idx = sectionIndex
+        val contentNav = remember(nav) { nav?.let { PaneNavRegistry(initialSignal = it.contentSignal) } }
+        val isCurrent = true
+        if (nav != null && contentNav != null) {
+            contentNav.controllerActive = nav.active && nav.inContent && isCurrent
+            contentNav.onEdgeLeft = { nav.exitToSidebar() }
+            if (isCurrent) {
+                nav.onContentBack = {
+                    if (contentNav.overlay != null) {
+                        contentNav.overlayClose?.invoke()
+                        true
+                    } else {
+                        false
+                    }
+                }
+            }
+            LaunchedEffect(nav.contentSignal) {
+                if (isCurrent) contentNav.processNav(nav.contentSignal, nav.contentDir)
+            }
+            LaunchedEffect(nav.contentResetSignal) {
+                if (isCurrent) contentNav.reset()
+            }
+        }
+        val sections = remember(state) { buildRetroSections(state) }
+        val sectionBody: @Composable () -> Unit = {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = 20.dp, vertical = 14.dp),
+            ) {
+                when (sections.getOrNull(idx)?.id) {
+                    RetroSectionId.GENERAL -> RetroGeneralSection(state, onPickArtwork, onRemoveArtwork, onImportBios)
+                    RetroSectionId.GRAPHICS -> RetroGraphicsSection(state)
+                    RetroSectionId.PERFORMANCE -> RetroPs2PerformanceSection()
+                    RetroSectionId.HUD ->
+                        if (state.system?.isExternal == true) {
+                            RetroPs2HudSection(state)
+                        } else {
+                            RetroLibretroHudSection(state.hud) { state.hud = it }
+                        }
+                    RetroSectionId.INPUT -> RetroInputSection(state)
+                    RetroSectionId.AUDIO -> RetroAudioSection(state)
+                    RetroSectionId.ONLINE -> {
+                        when {
+                            RetroOnlineSupport.supportsDev9(state.system?.id) ->
+                                RetroPs2OnlineSection(state)
+                            RetroOnlineSupport.supportsDolphinNetplay(state.system?.id) ->
+                                RetroDolphinNetplaySection(state)
+                            else -> RetroNetplaySection(state)
+                        }
+                    }
+                    RetroSectionId.CHEATS -> RetroPs2CheatsSection(state)
+                    null -> Unit
+                }
+                Spacer(Modifier.height(12.dp))
+            }
+        }
+        if (contentNav != null) {
+            CompositionLocalProvider(LocalPaneNav provides contentNav) { sectionBody() }
+        } else {
+            sectionBody()
+        }
+    }
+}
+
+@Composable
+private fun RetroSidebar(
+    title: String,
+    subtitle: String,
+    sections: List<RetroSection>,
+    currentIndex: Int,
+    onSectionSelected: (Int) -> Unit,
+    onSave: () -> Unit,
+    onCancel: () -> Unit,
+    nav: GameSettingsNav? = null,
+    modifier: Modifier = Modifier,
+) {
+    val cancelHighlighted = nav != null && nav.active && !nav.inContent && nav.onActionRow && nav.actionCol == 0
+    val saveHighlighted = nav != null && nav.active && !nav.inContent && nav.onActionRow && nav.actionCol == 1
+    Column(
+        modifier =
+            modifier
+                .background(SidebarBg)
+                .padding(top = 14.dp, bottom = 12.dp),
+    ) {
+        Text(
+            text = title,
+            color = TextPrimary,
+            fontSize = LabelSize,
+            fontWeight = FontWeight.SemiBold,
+            letterSpacing = 0.2.sp,
+            lineHeight = 15.sp,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis,
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+                    .padding(bottom = 2.dp),
+        )
+        if (subtitle.isNotBlank()) {
+            Text(
+                text = subtitle,
+                color = TextSecondary,
+                fontSize = 10.sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp)
+                        .padding(bottom = 10.dp),
+            )
+        }
+        Box(
+            modifier =
+                Modifier
+                    .padding(horizontal = 12.dp)
+                    .fillMaxWidth()
+                    .height(1.dp)
+                    .background(DividerColor),
+        )
+        Spacer(Modifier.height(8.dp))
+
+        Column(
+            modifier =
+                Modifier
+                    .weight(1f)
+                    .verticalScroll(rememberScrollState())
+                    .padding(bottom = 8.dp),
+            verticalArrangement = Arrangement.spacedBy(1.dp),
+        ) {
+            sections.forEachIndexed { index, section ->
+                RetroSidebarItem(
+                    icon = section.icon,
+                    label = stringResource(section.labelRes),
+                    isSelected = currentIndex == index,
+                    navHighlighted =
+                        nav != null && nav.active && !nav.inContent && !nav.onActionRow &&
+                            nav.sidebarIndex == index,
+                    onClick = {
+                        if (nav != null) nav.tapSection(index) else onSectionSelected(index)
+                    },
+                )
+            }
+        }
+
+        Box(
+            modifier =
+                Modifier
+                    .padding(horizontal = 12.dp)
+                    .fillMaxWidth()
+                    .height(1.dp)
+                    .background(DividerColor),
+        )
+        Spacer(Modifier.height(8.dp))
+
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 12.dp),
+            horizontalArrangement = Arrangement.spacedBy(6.dp),
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .weight(1f)
+                        .height(30.dp)
+                        .clip(RoundedCornerShape(8.dp))
+                        .border(1.dp, CardBorder, RoundedCornerShape(8.dp))
+                        .background(CardSurface)
+                        .paneHighlight(cancelHighlighted, cornerRadius = 8.dp, highlightColor = NavHighlight)
+                        .clickable {
+                            nav?.tapAction(0)
+                            onCancel()
+                        },
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(stringResource(R.string.retro_gs_cancel), color = TextSecondary, fontSize = LabelSize, fontWeight = FontWeight.Medium)
+            }
+            Box(
+                modifier =
+                    Modifier
+                        .weight(1f)
+                        .height(30.dp)
+                        .clip(RoundedCornerShape(8.dp))
+                        .border(1.dp, AccentBlue.copy(alpha = 0.5f), RoundedCornerShape(8.dp))
+                        .background(AccentBlue.copy(alpha = 0.1f))
+                        .paneHighlight(saveHighlighted, cornerRadius = 8.dp, highlightColor = NavHighlight)
+                        .clickable {
+                            nav?.tapAction(1)
+                            onSave()
+                        },
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(stringResource(R.string.retro_gs_save), color = AccentBlue, fontSize = LabelSize, fontWeight = FontWeight.Medium)
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroSidebarItem(
+    icon: ImageVector,
+    label: String,
+    isSelected: Boolean,
+    navHighlighted: Boolean = false,
+    onClick: () -> Unit,
+) {
+    Box(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp)
+                .clip(RoundedCornerShape(8.dp))
+                .chasingBorder(isFocused = isSelected, cornerRadius = 8.dp, borderWidth = 2.dp)
+                .paneHighlight(navHighlighted, cornerRadius = 8.dp, highlightColor = NavHighlight)
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = 12.dp, vertical = 8.dp),
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Icon(
+                icon,
+                contentDescription = null,
+                tint = if (isSelected) AccentBlue else TextDim,
+                modifier = Modifier.size(18.dp),
+            )
+            Spacer(Modifier.width(10.dp))
+            Text(
+                label,
+                color = if (isSelected) TextPrimary else TextSecondary,
+                fontSize = ValueSize,
+                fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal,
+                maxLines = 1,
+            )
+        }
+    }
+}
+
+@Composable
+internal fun RetroSettingGroup(content: @Composable () -> Unit) {
+    SharedSettingGroup(content)
+}
+
+@Composable
+internal fun RetroGroupTitle(text: String) {
+    SharedGroupTitle(text)
+}
+
+@Composable
+internal fun RetroInfoRow(
+    label: String,
+    value: String,
+    singleLineValue: Boolean = false,
+) {
+    SharedInfoRow(label, value, singleLineValue = singleLineValue)
+}
+
+@Composable
+internal fun RetroSettingDropdown(
+    label: String,
+    entries: List<String>,
+    selectedIndex: Int,
+    onSelected: (Int) -> Unit,
+) {
+    var expanded by remember { mutableStateOf(false) }
+    val selectedText = entries.getOrElse(selectedIndex) { "" }
+    val parentNav = LocalPaneNav.current
+    val optionRegistry = remember { PaneNavRegistry() }
+    LaunchedEffect(expanded) {
+        if (expanded) {
+            optionRegistry.reset()
+            optionRegistry.controllerActive = true
+            parentNav?.overlay = optionRegistry
+            parentNav?.overlayClose = { expanded = false }
+        } else if (parentNav?.overlay === optionRegistry) {
+            parentNav.overlay = null
+            parentNav.overlayClose = null
+        }
+    }
+
+    Column(modifier = Modifier.fillMaxWidth().padding(bottom = ItemGap)) {
+        Text(
+            label,
+            color = TextSecondary,
+            fontSize = LabelSize,
+            fontWeight = FontWeight.Medium,
+            letterSpacing = 0.3.sp,
+            modifier = Modifier.padding(bottom = TightGap),
+        )
+        Box {
+            Row(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(FieldCorner))
+                        .background(InputSurface)
+                        .border(1.dp, InputBorder, RoundedCornerShape(FieldCorner))
+                        .paneNavItem(
+                            cornerRadius = FieldCorner,
+                            onActivate = { expanded = true },
+                            highlightColor = NavHighlight,
+                        )
+                        .clickable { expanded = true }
+                        .padding(horizontal = 12.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    selectedText,
+                    color = TextPrimary,
+                    fontSize = ValueSize,
+                    modifier = Modifier.weight(1f),
+                    maxLines = 1,
+                )
+                Icon(
+                    Icons.Outlined.KeyboardArrowDown,
+                    contentDescription = null,
+                    tint = TextDim,
+                    modifier = Modifier.size(18.dp),
+                )
+            }
+            DropdownMenu(
+                expanded = expanded,
+                onDismissRequest = { expanded = false },
+                shape = RoundedCornerShape(8.dp),
+                containerColor = CardSurface,
+                properties = PopupProperties(focusable = false),
+            ) {
+                CompositionLocalProvider(LocalPaneNav provides optionRegistry) {
+                    entries.forEachIndexed { index, entry ->
+                        DropdownMenuItem(
+                            text = {
+                                Text(
+                                    entry,
+                                    color = if (index == selectedIndex) AccentBlue else TextPrimary,
+                                    fontSize = ValueSize,
+                                    fontWeight = if (index == selectedIndex) FontWeight.Medium else FontWeight.Normal,
+                                )
+                            },
+                            onClick = {
+                                onSelected(index)
+                                expanded = false
+                            },
+                            modifier =
+                                (
+                                    if (index == selectedIndex) {
+                                        Modifier.background(AccentBlue.copy(alpha = 0.06f))
+                                    } else {
+                                        Modifier
+                                    }
+                                ).paneNavItem(
+                                    cornerRadius = 6.dp,
+                                    onActivate = {
+                                        onSelected(index)
+                                        expanded = false
+                                    },
+                                    isEntry = index == selectedIndex,
+                                    highlightColor = NavHighlight,
+                                ),
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun RetroSettingSwitch(
+    label: String,
+    checked: Boolean,
+    subtitle: String? = null,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    SharedSettingSwitch(label, checked, subtitle, onCheckedChange)
+}
+
+@Composable
+internal fun RetroSettingTextField(
+    label: String,
+    value: String,
+    placeholder: String,
+    onChange: (String) -> Unit,
+) {
+    var editing by remember { mutableStateOf(false) }
+    var draft by remember(value) { mutableStateOf(value) }
+    if (editing) {
+        androidx.compose.material3.AlertDialog(
+            onDismissRequest = { editing = false },
+            title = { Text(label) },
+            text = {
+                androidx.compose.material3.OutlinedTextField(
+                    value = draft,
+                    onValueChange = { draft = it },
+                    singleLine = true,
+                    placeholder = { Text(placeholder) },
+                )
+            },
+            confirmButton = {
+                androidx.compose.material3.TextButton(onClick = {
+                    onChange(draft.trim())
+                    editing = false
+                }) { Text(stringResource(R.string.retro_gs_save)) }
+            },
+            dismissButton = {
+                androidx.compose.material3.TextButton(onClick = { editing = false }) { Text(stringResource(R.string.retro_gs_cancel)) }
+            },
+        )
+    }
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(8.dp))
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                ) { draft = value; editing = true }
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { draft = value; editing = true },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
+                .padding(vertical = TightGap + 2.dp),
+    ) {
+        Text(
+            label,
+            color = TextSecondary,
+            fontSize = LabelSize,
+            fontWeight = FontWeight.Medium,
+            maxLines = 2,
+            softWrap = true,
+            overflow = androidx.compose.ui.text.style.TextOverflow.Clip,
+        )
+        Spacer(Modifier.height(2.dp))
+        Text(
+            value.ifBlank { placeholder },
+            color = if (value.isBlank()) TextSecondary else AccentBlue,
+            fontSize = ValueSize,
+            fontWeight = FontWeight.Medium,
+            maxLines = 3,
+            softWrap = true,
+            overflow = androidx.compose.ui.text.style.TextOverflow.Clip,
+        )
+    }
+}
+
+private fun coreDisplayName(system: RetroSystem?): String =
+    when {
+        system == null -> ""
+        system.id == RetroSystems.PS2.id -> "ARMSX2"
+        RetroCoreManager.usesDolphinCore(system) -> "Dolphin"
+        else -> system.coreFileName
+    }
+
+@Composable
+private fun RetroConsoleEditPen(onClick: () -> Unit) {
+    val green = Color(0xFF3FB950)
+    Box(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(9.dp))
+                .background(green.copy(alpha = 0.12f))
+                .border(1.dp, green.copy(alpha = 0.55f), RoundedCornerShape(9.dp))
+                .clickable { onClick() }
+                .padding(horizontal = 10.dp, vertical = 6.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            Icons.Outlined.Edit,
+            contentDescription = stringResource(R.string.retro_gs_change_console),
+            tint = green,
+            modifier = Modifier.size(16.dp),
+        )
+    }
+}
+
+@Composable
+private fun RetroConsolePickerDialog(
+    current: RetroSystem?,
+    onDismiss: () -> Unit,
+    onPick: (RetroSystem) -> Unit,
+) {
+    androidx.compose.material3.AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text(stringResource(R.string.retro_gs_identify_as)) },
+        text = {
+            Column(Modifier.verticalScroll(rememberScrollState())) {
+                RetroSystems.ALL.sortedBy { it.displayName }.forEach { sys ->
+                    val selected = sys.id == current?.id
+                    Text(
+                        sys.displayName,
+                        color = if (selected) GameSettingsStyle.AccentBlue else GameSettingsStyle.TextPrimary,
+                        fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal,
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .clickable { onPick(sys) }
+                                .padding(vertical = 12.dp),
+                    )
+                }
+            }
+        },
+        confirmButton = {},
+        dismissButton = {
+            androidx.compose.material3.TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.retro_gs_cancel))
+            }
+        },
+    )
+}
+
+@Composable
+private fun RetroGeneralSection(
+    state: RetroSettingsState,
+    onPickArtwork: ((LibraryShortcutArtwork.LibraryArtworkSlot) -> Unit)? = null,
+    onRemoveArtwork: ((LibraryShortcutArtwork.LibraryArtworkSlot) -> Unit)? = null,
+    onImportBios: (() -> Unit)? = null,
+) {
+    val ctx = androidx.compose.ui.platform.LocalContext.current
+    var currentSystem by remember { mutableStateOf(state.system) }
+    var showConsolePicker by remember { mutableStateOf(false) }
+    SharedSettingGroup {
+        SharedGroupTitle(stringResource(R.string.retro_gs_group_game))
+        SharedInfoRow(stringResource(R.string.retro_gs_label_name), state.name)
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Box(Modifier.weight(1f)) {
+                SharedInfoRow(stringResource(R.string.retro_gs_label_system), currentSystem?.displayName ?: "")
+            }
+            RetroConsoleEditPen { showConsolePicker = true }
+        }
+        SharedInfoRow(
+            stringResource(R.string.retro_gs_label_emulator_core),
+            coreDisplayName(currentSystem),
+            singleLineValue = true,
+        )
+        SharedInfoRow(
+            stringResource(R.string.retro_gs_label_rom_path),
+            state.romPath,
+            singleLineValue = true,
+        )
+        if (currentSystem?.isExternal == true) {
+            val ps2Prefs = remember(ctx) { ctx.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE) }
+            var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+            @Suppress("UNUSED_EXPRESSION") version
+            SharedSettingSwitch(stringResource(R.string.retro_gs_fast_boot), ps2Prefs.getBoolean("wn.ps2.fastboot", true)) {
+                ps2Prefs.edit().putBoolean("wn.ps2.fastboot", it).apply(); version++
+            }
+        }
+    }
+    if (showConsolePicker) {
+        RetroConsolePickerDialog(
+            current = currentSystem,
+            onDismiss = { showConsolePicker = false },
+        ) { picked ->
+            showConsolePicker = false
+            if (picked.id != currentSystem?.id) {
+                currentSystem = picked
+                kotlin.concurrent.thread {
+                    runCatching {
+                        state.shortcut.putExtra(RetroShortcuts.KEY_SYSTEM, picked.id)
+                        state.shortcut.saveData()
+                    }
+                }
+                android.widget.Toast.makeText(
+                    ctx,
+                    ctx.getString(R.string.retro_gs_console_changed, picked.displayName),
+                    android.widget.Toast.LENGTH_SHORT,
+                ).show()
+            }
+        }
+    }
+    val biosSystem = currentSystem
+    if (biosSystem?.needsBios == true && onImportBios != null) {
+        val context = ctx
+        Spacer(Modifier.height(ItemGap))
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_gs_group_bios, biosSystem.shortName.uppercase()))
+            state.biosRefresh
+            val dir = RetroCoreManager.systemDir(context)
+            val installed = biosSystem.biosFiles.filter { java.io.File(dir, it).isFile }
+            RetroInfoRow(
+                stringResource(R.string.retro_gs_label_installed),
+                if (installed.isEmpty()) stringResource(R.string.retro_gs_bios_none, biosSystem.shortName) else installed.joinToString(", "),
+            )
+            androidx.compose.material3.Button(
+                onClick = { onImportBios() },
+                modifier = Modifier.fillMaxWidth().padding(top = ItemGap),
+            ) {
+                androidx.compose.material3.Text(stringResource(R.string.retro_gs_import_bios))
+            }
+            if (installed.isNotEmpty()) {
+                androidx.compose.material3.OutlinedButton(
+                    onClick = {
+                        installed.forEach { java.io.File(dir, it).delete() }
+                        state.biosRefresh++
+                    },
+                    modifier = Modifier.fillMaxWidth().padding(top = ItemGap),
+                ) {
+                    androidx.compose.material3.Text(stringResource(R.string.retro_gs_remove_bios))
+                }
+            }
+        }
+    }
+    if (onPickArtwork != null && onRemoveArtwork != null) {
+        Spacer(Modifier.height(ItemGap))
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_gs_group_library_artwork))
+            Row(horizontalArrangement = Arrangement.spacedBy(ItemGap)) {
+                Box(Modifier.weight(1f)) {
+                    RetroArtworkRow(
+                        title = stringResource(R.string.retro_gs_artwork_game_card),
+                        selected = state.artworkSelected[LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD] == true,
+                        onPick = { onPickArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD) },
+                        onRemove = { onRemoveArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD) },
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    RetroArtworkRow(
+                        title = stringResource(R.string.retro_gs_artwork_grid),
+                        selected = state.artworkSelected[LibraryShortcutArtwork.LibraryArtworkSlot.GRID] == true,
+                        onPick = { onPickArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.GRID) },
+                        onRemove = { onRemoveArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.GRID) },
+                    )
+                }
+            }
+            Spacer(Modifier.height(ItemGap))
+            Row(horizontalArrangement = Arrangement.spacedBy(ItemGap)) {
+                Box(Modifier.weight(1f)) {
+                    RetroArtworkRow(
+                        title = stringResource(R.string.retro_gs_artwork_carousel),
+                        selected = state.artworkSelected[LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL] == true,
+                        onPick = { onPickArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL) },
+                        onRemove = { onRemoveArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL) },
+                    )
+                }
+                Box(Modifier.weight(1f)) {
+                    RetroArtworkRow(
+                        title = stringResource(R.string.retro_gs_artwork_list),
+                        selected = state.artworkSelected[LibraryShortcutArtwork.LibraryArtworkSlot.LIST] == true,
+                        onPick = { onPickArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.LIST) },
+                        onRemove = { onRemoveArtwork(LibraryShortcutArtwork.LibraryArtworkSlot.LIST) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroArtworkRow(
+    title: String,
+    selected: Boolean,
+    onPick: () -> Unit,
+    onRemove: () -> Unit,
+) {
+    Box(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(GroupCorner))
+                .background(InputSurface)
+                .border(1.dp, InputBorder, RoundedCornerShape(GroupCorner))
+                .padding(horizontal = 10.dp, vertical = 8.dp),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+        ) {
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = title,
+                    color = TextPrimary,
+                    fontSize = ValueSize,
+                    fontWeight = FontWeight.SemiBold,
+                )
+                if (selected) {
+                    Spacer(Modifier.height(2.dp))
+                    Text(
+                        text = stringResource(R.string.retro_gs_artwork_custom_set),
+                        color = TextSecondary,
+                        fontSize = LabelSize,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(6.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                if (!selected) {
+                    RetroArtworkActionButton(stringResource(R.string.retro_gs_artwork_set_image), AccentBlue, onPick)
+                } else {
+                    RetroArtworkActionButton(stringResource(R.string.retro_gs_artwork_remove), DangerRed, onRemove)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroArtworkActionButton(
+    text: String,
+    tint: Color,
+    onClick: () -> Unit,
+) {
+    Box(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(9.dp))
+                .background(tint.copy(alpha = 0.08f))
+                .border(1.dp, tint.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
+                .paneNavItem(cornerRadius = 9.dp, onActivate = { onClick() }, highlightColor = NavHighlight)
+                .clickable { onClick() }
+                .padding(horizontal = 10.dp, vertical = 6.dp),
+    ) {
+        Text(
+            text = text,
+            color = tint,
+            fontSize = LabelSize,
+            fontWeight = FontWeight.Medium,
+        )
+    }
+}
+
+@Composable
+private fun RetroGraphicsSection(state: RetroSettingsState) {
+    if (state.system?.isExternal == true) {
+        RetroPs2GraphicsSection()
+        return
+    }
+    val engineCtx = androidx.compose.ui.platform.LocalContext.current
+    var engine3dSupported by remember { mutableStateOf(false) }
+    LaunchedEffect(state.shortcut.file.absolutePath) {
+        engine3dSupported =
+            kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+                runCatching { Gen1EmbedLaunch.isCompatible(engineCtx, state.shortcut) }
+                    .getOrDefault(false)
+            }
+    }
+    if (engine3dSupported) {
+        RetroSettingSwitch(
+            label = stringResource(R.string.retro_gs_engine_3d),
+            checked = state.engine3d,
+            subtitle = stringResource(R.string.retro_gs_engine_3d_subtitle),
+            onCheckedChange = { state.engine3d = it },
+        )
+    }
+    val shaderLabels = listOf(
+        stringResource(R.string.retro_gs_shader_default),
+        stringResource(R.string.retro_gs_shader_crt),
+        stringResource(R.string.retro_gs_shader_lcd),
+        stringResource(R.string.retro_gs_shader_sharp),
+    )
+    val upscaleLabels = listOf(
+        stringResource(R.string.retro_gs_upscale_2x),
+        stringResource(R.string.retro_gs_upscale_4x),
+        stringResource(R.string.retro_gs_upscale_native),
+    )
+    val embeddedDolphinContext = androidx.compose.ui.platform.LocalContext.current
+    val embeddedDolphin =
+        RetroCoreManager.usesDolphinCore(state.system) &&
+            RetroShortcuts.embeddedDolphinEnabled(embeddedDolphinContext)
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_video))
+        if (embeddedDolphin) {
+            DolphinGpuDriverDropdown()
+        }
+        if (!embeddedDolphin) {
+            RetroSettingDropdown(
+                label = stringResource(R.string.retro_gs_video_filter),
+                entries = shaderLabels,
+                selectedIndex = SHADER_KEYS.indexOf(state.shader).coerceAtLeast(0),
+                onSelected = { state.shader = SHADER_KEYS[it] },
+            )
+            RetroSettingSwitch(
+                label = stringResource(R.string.retro_gs_sgsr),
+                checked = state.sgsr,
+                onCheckedChange = { state.sgsr = it },
+            )
+            if (state.sgsr) {
+                RetroSettingDropdown(
+                    label = stringResource(R.string.retro_gs_sgsr_upscale),
+                    entries = upscaleLabels,
+                    selectedIndex = UPSCALE_KEYS.indexOf(state.upscale).coerceAtLeast(0),
+                    onSelected = { state.upscale = UPSCALE_KEYS[it] },
+                )
+            }
+        }
+    }
+    if (state.coreOptions.isNotEmpty()) {
+        Spacer(Modifier.height(12.dp))
+        RetroSettingGroup {
+            RetroGroupTitle((state.system?.shortName ?: stringResource(R.string.retro_gs_group_core)).uppercase())
+            val ctx = androidx.compose.ui.platform.LocalContext.current
+            val ordered =
+                state.coreOptions.filterNot { it.advanced } + state.coreOptions.filter { it.advanced }
+            ordered.forEach { option ->
+                val current = state.optionValues[option.key] ?: option.defaultValue
+                RetroSettingDropdown(
+                    label = option.labelText(ctx),
+                    entries = option.valueLabels,
+                    selectedIndex = option.values.indexOf(current).coerceAtLeast(0),
+                    onSelected = { state.optionValues[option.key] = option.values[it] },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun DolphinGpuDriverDropdown() {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val prefs = remember(context) { androidx.preference.PreferenceManager.getDefaultSharedPreferences(context) }
+    var driverVersion by remember { mutableIntStateOf(0) }
+    @Suppress("UNUSED_EXPRESSION") driverVersion
+    val gcDrivers = remember { com.armsx2.CustomDriver.listInstalled(context) }
+    val gcDriverIds = remember(gcDrivers) { listOf("") + gcDrivers.map { it.id } }
+    val gcDriverLabels = listOf(stringResource(R.string.retro_gpu_driver_system)) + gcDrivers.map { it.name }
+    val curGcDriver = (prefs.getString(DolphinEmbedLaunch.DRIVER_PREF, "") ?: "").let { if (it.equals("system", true)) "" else it }
+    RetroSettingDropdown(
+        label = stringResource(R.string.retro_gpu_driver),
+        entries = gcDriverLabels,
+        selectedIndex = gcDriverIds.indexOf(curGcDriver).coerceAtLeast(0),
+        onSelected = {
+            prefs.edit().putString(DolphinEmbedLaunch.DRIVER_PREF, gcDriverIds[it]).apply()
+            driverVersion++
+        },
+    )
+}
+
+@Composable
+internal fun RetroLibretroHudSection(
+    hudOn: Boolean,
+    onHud: (Boolean) -> Unit,
+) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+    @Suppress("UNUSED_EXPRESSION") version
+    val elements = remember(version) { RetroHudSupport.loadGlobalHudElements(context) }
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_performance_hud))
+        RetroSettingSwitch(stringResource(R.string.retro_lr_performance_hud), hudOn) {
+            onHud(it)
+            version++
+        }
+        if (hudOn) {
+            RetroHudElementButtons(elements) { index, on ->
+                val next = elements.copyOf()
+                next[index] = on
+                RetroHudSupport.saveGlobalHudElements(context, next)
+                version++
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroHudElementButtons(
+    elements: BooleanArray,
+    onToggle: (index: Int, on: Boolean) -> Unit,
+) {
+    RetroHudSupport.ELEMENT_ORDER.toList().chunked(3).forEach { rowIndices ->
+        Row(
+            Modifier.fillMaxWidth().padding(top = 6.dp),
+            horizontalArrangement = Arrangement.spacedBy(6.dp),
+        ) {
+            rowIndices.forEach { index ->
+                val on = elements[index]
+                HudToggleButton(
+                    label = stringResource(RetroHudSupport.ELEMENT_LABEL_RES[index]),
+                    on = on,
+                    modifier = Modifier.weight(1f),
+                ) { onToggle(index, !on) }
+            }
+            repeat(3 - rowIndices.size) { Spacer(Modifier.weight(1f)) }
+        }
+    }
+}
+
+@Composable
+private fun HudToggleButton(
+    label: String,
+    on: Boolean,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        modifier = modifier.height(40.dp),
+        shape = RoundedCornerShape(8.dp),
+        contentPadding = PaddingValues(horizontal = 6.dp, vertical = 4.dp),
+        border =
+            BorderStroke(
+                1.dp,
+                if (on) GameSettingsStyle.AccentBlue else GameSettingsStyle.CardBorder,
+            ),
+        colors =
+            ButtonDefaults.outlinedButtonColors(
+                containerColor =
+                    if (on) GameSettingsStyle.AccentBlue.copy(alpha = 0.15f) else Color.Transparent,
+                contentColor =
+                    if (on) GameSettingsStyle.AccentBlue else GameSettingsStyle.TextSecondary,
+            ),
+    ) {
+        Text(
+            label,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+internal val PS2_TURNIP_FLAGS: List<Pair<String, String>> = listOf(
+    "sysmem" to "Force system-memory rendering",
+    "gmem" to "Force GMEM (tiled GPU memory) rendering",
+    "flushall" to "Flush all caches every draw",
+    "nolrz" to "Disable low-resolution Z (LRZ)",
+    "nolrzfc" to "Disable LRZ fast-clear",
+    "noubwc" to "Disable bandwidth compression (UBWC)",
+    "noconform" to "Skip non-conformant fast paths",
+    "syncdraw" to "Synchronise every draw",
+    "forcebin" to "Force binning (tiled) mode",
+)
+
+@Composable
+internal fun Ps2TurnipFlags(prefs: android.content.SharedPreferences, refreshKey: Int, bump: () -> Unit) {
+    Text(
+        stringResource(R.string.retro_ps2_turnip_flags),
+        color = TextSecondary,
+        fontSize = LabelSize,
+        fontWeight = FontWeight.SemiBold,
+        modifier = Modifier.padding(top = ItemGap, bottom = TightGap),
+    )
+    val usingTurnip = remember(refreshKey) {
+        val driver = (prefs.getString("wn.ps2.driver", "") ?: "").trim()
+        driver.isNotEmpty() && !driver.equals("system", ignoreCase = true)
+    }
+    if (!usingTurnip) {
+        Text(
+            stringResource(R.string.retro_ps2_turnip_flags_note),
+            color = TextDim,
+            fontSize = LabelSize,
+            modifier = Modifier.padding(bottom = TightGap),
+        )
+    }
+    val active = remember(refreshKey) {
+        (prefs.getString("wn.ps2.turnipflags", "") ?: "")
+            .split(",").map { it.trim() }.filter { it.isNotEmpty() }.toSet()
+    }
+    PS2_TURNIP_FLAGS.forEach { (flag, hint) ->
+        RetroSettingSwitch(flag, flag in active, subtitle = hint) { on ->
+            val next = if (on) active + flag else active - flag
+            prefs.edit().putString("wn.ps2.turnipflags", next.joinToString(",")).apply()
+            bump()
+        }
+    }
+}
+
+@Composable
+private fun RetroPs2GraphicsSection() {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val prefs = remember(context) { context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE) }
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+
+    @Suppress("UNUSED_EXPRESSION") version
+
+    fun putInt(key: String, value: Int) { prefs.edit().putInt(key, value).apply(); version++ }
+    fun putBool(key: String, value: Boolean) { prefs.edit().putBoolean(key, value).apply(); version++ }
+    fun putStr(key: String, value: String) { prefs.edit().putString(key, value).apply(); version++ }
+    fun putFloat(key: String, value: Float) { prefs.edit().putFloat(key, value).apply(); version++ }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_video))
+        val rendererKeys = listOf("vulkan", "opengl", "software")
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_renderer),
+            listOf(
+                stringResource(R.string.retro_gs_renderer_vulkan),
+                stringResource(R.string.retro_gs_renderer_opengl),
+                stringResource(R.string.retro_gs_renderer_software),
+            ),
+            rendererKeys.indexOf(prefs.getString("wn.ps2.renderer", "vulkan")).coerceAtLeast(0),
+        ) { putStr("wn.ps2.renderer", rendererKeys[it]) }
+        val ps2Drivers = remember { com.armsx2.CustomDriver.listInstalled(context) }
+        val driverIds = remember(ps2Drivers) { listOf("") + ps2Drivers.map { it.id } }
+        val driverLabels = listOf(stringResource(R.string.retro_gpu_driver_system)) + ps2Drivers.map { it.name }
+        val curDriver = (prefs.getString("wn.ps2.driver", "") ?: "").let { if (it.equals("system", true)) "" else it }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gpu_driver),
+            driverLabels,
+            driverIds.indexOf(curDriver).coerceAtLeast(0),
+        ) { putStr("wn.ps2.driver", driverIds[it]) }
+        if (ps2Drivers.isEmpty()) {
+            Text(
+                stringResource(R.string.retro_gpu_driver_hint),
+                color = TextDim,
+                fontSize = LabelSize,
+                modifier = Modifier.padding(top = TightGap),
+            )
+        }
+        Ps2TurnipFlags(prefs, version) { version++ }
+        val scales = listOf(1f, 1.5f, 2f, 3f, 4f)
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_resolution_scale),
+            listOf(
+                stringResource(R.string.retro_gs_scale_1x_native),
+                stringResource(R.string.retro_gs_scale_1_5x),
+                stringResource(R.string.retro_gs_scale_2x),
+                stringResource(R.string.retro_gs_scale_3x),
+                stringResource(R.string.retro_gs_scale_4x),
+            ),
+            scales.indexOfFirst { kotlin.math.abs(it - prefs.getFloat("wn.ps2.upscale", 1f)) < 0.01f }.coerceAtLeast(0),
+        ) { putFloat("wn.ps2.upscale", scales[it]) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_aspect_ratio),
+            listOf(
+                stringResource(R.string.retro_gs_aspect_stretch),
+                stringResource(R.string.retro_gs_aspect_auto_standard),
+                stringResource(R.string.retro_gs_aspect_4_3),
+                stringResource(R.string.retro_gs_aspect_16_9),
+            ),
+            prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3),
+        ) { putInt("wn.ps2.aspect", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_fmv_aspect_ratio),
+            listOf(
+                stringResource(R.string.retro_gs_off),
+                stringResource(R.string.retro_gs_aspect_auto_standard),
+                stringResource(R.string.retro_gs_aspect_4_3),
+                stringResource(R.string.retro_gs_aspect_16_9),
+            ),
+            prefs.getInt("wn.ps2.fmvaspect", 0).coerceIn(0, 3),
+        ) { putInt("wn.ps2.fmvaspect", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_deinterlace_mode),
+            listOf(
+                stringResource(R.string.retro_gs_deint_auto),
+                stringResource(R.string.retro_gs_deint_off),
+                stringResource(R.string.retro_gs_deint_weave_tff),
+                stringResource(R.string.retro_gs_deint_weave_bff),
+                stringResource(R.string.retro_gs_deint_bob_tff),
+                stringResource(R.string.retro_gs_deint_bob_bff),
+                stringResource(R.string.retro_gs_deint_blend_tff),
+                stringResource(R.string.retro_gs_deint_blend_bff),
+                stringResource(R.string.retro_gs_deint_adaptive_tff),
+                stringResource(R.string.retro_gs_deint_adaptive_bff),
+            ),
+            prefs.getInt("wn.ps2.deinterlace", 0).coerceIn(0, 9),
+        ) { putInt("wn.ps2.deinterlace", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_display_filter),
+            listOf(
+                stringResource(R.string.retro_gs_filter_nearest),
+                stringResource(R.string.retro_gs_filter_bilinear_smooth),
+                stringResource(R.string.retro_gs_filter_bilinear_sharp),
+            ),
+            prefs.getInt("wn.ps2.displayfilter", 1).coerceIn(0, 2),
+        ) { putInt("wn.ps2.displayfilter", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_texture_filter),
+            listOf(
+                stringResource(R.string.retro_gs_filter_nearest),
+                stringResource(R.string.retro_gs_filter_bilinear_forced),
+                stringResource(R.string.retro_gs_filter_bilinear_ps2),
+                stringResource(R.string.retro_gs_filter_bilinear_sprites),
+            ),
+            prefs.getInt("wn.ps2.filter", 2).coerceIn(0, 3),
+        ) { putInt("wn.ps2.filter", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_mipmapping), prefs.getBoolean("wn.ps2.mipmap", true)) { putBool("wn.ps2.mipmap", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_blending_accuracy),
+            listOf(
+                stringResource(R.string.retro_gs_blend_minimum),
+                stringResource(R.string.retro_gs_blend_basic),
+                stringResource(R.string.retro_gs_blend_medium),
+                stringResource(R.string.retro_gs_blend_high),
+                stringResource(R.string.retro_gs_blend_full),
+                stringResource(R.string.retro_gs_blend_maximum),
+            ),
+            prefs.getInt("wn.ps2.blend", 1).coerceIn(0, 5),
+        ) { putInt("wn.ps2.blend", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_anti_blur), prefs.getBoolean("wn.ps2.antiblur", true)) { putBool("wn.ps2.antiblur", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_crt_tv_shader),
+            listOf(
+                stringResource(R.string.retro_gs_off),
+                stringResource(R.string.retro_gs_tvshader_scanline),
+                stringResource(R.string.retro_gs_tvshader_diagonal),
+                stringResource(R.string.retro_gs_tvshader_triangular),
+                stringResource(R.string.retro_gs_tvshader_wave),
+                stringResource(R.string.retro_gs_tvshader_lottes),
+                stringResource(R.string.retro_gs_tvshader_4xrgss),
+                stringResource(R.string.retro_gs_tvshader_nxagss),
+            ),
+            prefs.getInt("wn.ps2.tvshader", 0).coerceIn(0, 7),
+        ) { putInt("wn.ps2.tvshader", it) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_frame_skip),
+            listOf(
+                stringResource(R.string.retro_gs_off),
+                stringResource(R.string.retro_gs_frameskip_1),
+                stringResource(R.string.retro_gs_frameskip_2),
+                stringResource(R.string.retro_gs_frameskip_3),
+            ),
+            prefs.getInt("wn.ps2.frameskip", 0).coerceIn(0, 3),
+        ) { putInt("wn.ps2.frameskip", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_widescreen_patches), prefs.getBoolean("wn.ps2.widescreen", false)) { putBool("wn.ps2.widescreen", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_no_interlace_patches), prefs.getBoolean("wn.ps2.nointerlace", false)) { putBool("wn.ps2.nointerlace", it) }
+    }
+}
+
+@Composable
+private fun RetroPs2PerformanceSection() {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val prefs = remember(context) { context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE) }
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+
+    @Suppress("UNUSED_EXPRESSION") version
+
+    fun putInt(key: String, value: Int) { prefs.edit().putInt(key, value).apply(); version++ }
+    fun putBool(key: String, value: Boolean) { prefs.edit().putBoolean(key, value).apply(); version++ }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_performance))
+        val rateValues = listOf(-3, -2, -1, 0, 1, 2, 3)
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_ee_cycle_rate),
+            listOf(
+                stringResource(R.string.retro_gs_rate_50),
+                stringResource(R.string.retro_gs_rate_60),
+                stringResource(R.string.retro_gs_rate_75),
+                stringResource(R.string.retro_gs_rate_100_default),
+                stringResource(R.string.retro_gs_rate_130),
+                stringResource(R.string.retro_gs_rate_180),
+                stringResource(R.string.retro_gs_rate_300),
+            ),
+            rateValues.indexOf(prefs.getInt("wn.ps2.eeRate", 0).coerceIn(-3, 3)).coerceAtLeast(0),
+        ) { putInt("wn.ps2.eeRate", rateValues[it]) }
+        RetroSettingDropdown(
+            stringResource(R.string.retro_gs_ee_cycle_skip),
+            listOf(
+                stringResource(R.string.retro_gs_off),
+                stringResource(R.string.retro_gs_num_1),
+                stringResource(R.string.retro_gs_num_2),
+                stringResource(R.string.retro_gs_num_3),
+            ),
+            prefs.getInt("wn.ps2.eeSkip", 0).coerceIn(0, 3),
+        ) { putInt("wn.ps2.eeSkip", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_mtvu), prefs.getBoolean("wn.ps2.mtvu", true)) { putBool("wn.ps2.mtvu", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_instant_vu1), prefs.getBoolean("wn.ps2.instantVu1", true)) { putBool("wn.ps2.instantVu1", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_vu_flag_hack), prefs.getBoolean("wn.ps2.vuFlagHack", true)) { putBool("wn.ps2.vuFlagHack", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_intc_spin), prefs.getBoolean("wn.ps2.intc", true)) { putBool("wn.ps2.intc", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_wait_loop), prefs.getBoolean("wn.ps2.waitloop", true)) { putBool("wn.ps2.waitloop", it) }
+        RetroSettingSwitch(stringResource(R.string.retro_gs_fast_cdvd), prefs.getBoolean("wn.ps2.fastCdvd", false)) { putBool("wn.ps2.fastCdvd", it) }
+    }
+}
+
+@Composable
+private fun RetroPs2HudSection(state: RetroSettingsState) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+
+    @Suppress("UNUSED_EXPRESSION") version
+
+    val hudOn = state.hud
+    val elements = remember(version) { RetroHudSupport.loadPs2Elements(context) }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_performance_hud))
+        RetroSettingSwitch(stringResource(R.string.retro_lr_performance_hud), hudOn) {
+            state.hud = it
+            version++
+        }
+        if (hudOn) {
+            RetroHudElementButtons(elements) { index, on ->
+                val next = elements.copyOf()
+                next[index] = on
+                RetroHudSupport.savePs2Elements(context, next)
+                version++
+            }
+        }
+    }
+}
+
+@Composable
+private fun RetroNetplaySection(state: RetroSettingsState) {
+    val systemId = state.system?.id ?: return
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+    RetroNetplaySettingsSection(
+        systemId = systemId,
+        version = version,
+        onChanged = { version++ },
+    )
+}
+
+@Composable
+private fun RetroDolphinNetplaySection(state: RetroSettingsState) {
+    val systemId = state.system?.id ?: return
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+    DolphinNetplaySettingsSection(
+        systemId = systemId,
+        version = version,
+        onChanged = { version++ },
+    )
+}
+
+@Composable
+private fun RetroPs2OnlineSection(state: RetroSettingsState) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val prefs = remember(context) { context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE) }
+    var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+
+    @Suppress("UNUSED_EXPRESSION") version
+
+    fun putBool(key: String, value: Boolean) { prefs.edit().putBoolean(key, value).apply(); version++ }
+    fun putStr(key: String, value: String) { prefs.edit().putString(key, value).apply(); version++ }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_online_dev9))
+        val onlineEnabled = prefs.getBoolean("wn.ps2.net.enable", true)
+        RetroSettingSwitch(stringResource(R.string.retro_gs_enable_online), onlineEnabled) { putBool("wn.ps2.net.enable", it) }
+        val hddImages = remember(version, state.hddRefresh) { RetroHddImport.installed(context).map { it.name } }
+        val hddOptions = listOf(stringResource(R.string.retro_scr_none)) + hddImages
+        val hddSelected = (hddImages.indexOf(state.hddImage) + 1).coerceAtLeast(0)
+        RetroSettingDropdown(stringResource(R.string.retro_gs_hdd_image), hddOptions, hddSelected) { idx ->
+            state.hddImage = if (idx <= 0) "" else hddImages[idx - 1]
+            version++
+        }
+        remember(state.hddImage, state.hddRefresh) { RetroHddImport.imageFile(context, state.hddImage) }?.let { f ->
+            Text(
+                stringResource(R.string.retro_gs_hdd_image_size, humanSize(f.length())),
+                color = TextDim,
+                fontSize = LabelSize,
+                modifier = Modifier.padding(top = TightGap),
+            )
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(top = ItemGap),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            androidx.compose.material3.OutlinedButton(
+                onClick = { if (!state.hddImporting) state.requestImportHdd?.invoke() },
+                enabled = !state.hddImporting,
+                contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 14.dp, vertical = 6.dp),
+            ) {
+                Text(
+                    if (state.hddImporting) stringResource(R.string.retro_scr_importing) else stringResource(R.string.retro_scr_import_hdd_image),
+                    fontSize = ValueSize,
+                )
+            }
+            if (state.hddImage.isNotBlank()) {
+                androidx.compose.material3.OutlinedButton(
+                    onClick = {
+                        val name = state.hddImage
+                        RetroHddImport.delete(context, name)
+                        state.hddImage = ""
+                        state.hddRefresh++
+                        version++
+                    },
+                    contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 14.dp, vertical = 6.dp),
+                    colors = androidx.compose.material3.ButtonDefaults.outlinedButtonColors(contentColor = DangerRed),
+                ) { Text(stringResource(R.string.retro_gs_hdd_remove_short), fontSize = ValueSize) }
+            }
+        }
+        RetroSettingSwitch(stringResource(R.string.retro_ps2_hdd), state.hddEnable) { state.hddEnable = it; version++ }
+        Text(
+            stringResource(R.string.retro_ps2_hdd_desc),
+            color = TextDim,
+            fontSize = LabelSize,
+            modifier = Modifier.padding(top = TightGap),
+        )
+        if (onlineEnabled) {
+            val deviceKeys = listOf("Auto", "Wi-Fi")
+            val deviceLabels = listOf(
+                stringResource(R.string.retro_gs_net_auto),
+                stringResource(R.string.retro_gs_net_wifi),
+            )
+            RetroSettingDropdown(
+                stringResource(R.string.retro_gs_ethernet_device), deviceLabels,
+                deviceKeys.indexOf(prefs.getString("wn.ps2.net.ethdevice", "Auto")).coerceAtLeast(0),
+            ) { putStr("wn.ps2.net.ethdevice", deviceKeys[it]) }
+            val dnsModeKeys = listOf("Manual", "Auto", "Internal")
+            val dnsModeLabels = listOf(
+                stringResource(R.string.retro_gs_dns_manual),
+                stringResource(R.string.retro_gs_net_auto),
+                stringResource(R.string.retro_gs_dns_internal),
+            )
+            RetroSettingDropdown(
+                stringResource(R.string.retro_gs_dns_mode), dnsModeLabels,
+                dnsModeKeys.indexOf(prefs.getString("wn.ps2.net.dnsmode", "Manual")).coerceAtLeast(0),
+            ) { putStr("wn.ps2.net.dnsmode", dnsModeKeys[it]) }
+            RetroSettingTextField(stringResource(R.string.retro_gs_primary_dns), prefs.getString("wn.ps2.net.dns1", PS2_DEFAULT_DNS).orEmpty(), PS2_DEFAULT_DNS) { putStr("wn.ps2.net.dns1", it) }
+            RetroSettingTextField(stringResource(R.string.retro_gs_secondary_dns), prefs.getString("wn.ps2.net.dns2", "").orEmpty(), stringResource(R.string.retro_gs_dns_optional)) { putStr("wn.ps2.net.dns2", it) }
+            RetroSettingSwitch(stringResource(R.string.retro_gs_dnas_bypass), prefs.getBoolean(Ps2DnasBypass.PREF, true), subtitle = stringResource(R.string.retro_gs_dnas_bypass_subtitle)) { putBool(Ps2DnasBypass.PREF, it) }
+            RetroSettingSwitch(stringResource(R.string.retro_gs_auto_ip_dhcp), prefs.getBoolean("wn.ps2.net.dhcp", true)) { putBool("wn.ps2.net.dhcp", it) }
+        }
+    }
+}
+
+@Composable
+private fun RetroPs2CheatsSection(state: RetroSettingsState) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val serial = remember(state) { state.gameSerial }
+
+    if (serial == null) {
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_gs_group_cheats))
+            Text(
+                stringResource(R.string.retro_gs_cheats_detect_hint),
+                color = TextSecondary,
+                fontSize = ValueSize,
+                modifier = Modifier.padding(vertical = TightGap),
+            )
+        }
+        return
+    }
+
+    var loading by remember { mutableStateOf(true) }
+    var cheats by remember { mutableStateOf<List<com.armsx2.PatchRepo.Entry>>(emptyList()) }
+    var patches by remember { mutableStateOf<List<com.armsx2.PatchRepo.Entry>>(emptyList()) }
+    var selCheats by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var selPatches by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var repoCheatNames by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var repoPatchNames by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var dnasEntries by remember { mutableStateOf<List<Ps2DnasBypass.BypassEntry>>(emptyList()) }
+    var dnasGlobalOn by remember { mutableStateOf(true) }
+    var dnasDisabled by remember { mutableStateOf<Set<String>>(emptySet()) }
+
+    LaunchedEffect(serial, state.cheatsRefresh) {
+        val stagedC = Ps2CheatStaging.read(context, serial, false)
+        val stagedP = Ps2CheatStaging.read(context, serial, true)
+        cheats = stagedC
+        patches = stagedP
+        selCheats = stagedC.map { it.name }.toSet()
+        selPatches = stagedP.map { it.name }.toSet()
+        dnasEntries = Ps2DnasBypass.bypassEntries(context, serial).filter { it.auto }
+        dnasGlobalOn = context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE).getBoolean(Ps2DnasBypass.PREF, true)
+        dnasDisabled = Ps2DnasBypass.ensureSingleDnasEnabled(context, serial, dnasEntries.map { it.name }.toSet())
+        loading = false
+        val repo = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
+            runCatching { com.armsx2.PatchRepo.fetchForSerial(serial) }.getOrNull()
+        }
+        if (repo != null) {
+            val repoCheats = repo.entries.filter { it.source != "patches" }
+            val repoPatches = repo.entries.filter { it.source == "patches" }
+            repoCheatNames = repoCheats.map { it.name }.toSet()
+            repoPatchNames = repoPatches.map { it.name }.toSet()
+            cheats = repoCheats + stagedC.filter { s -> repoCheats.none { it.name == s.name } }
+            patches = repoPatches + stagedP.filter { s -> repoPatches.none { it.name == s.name } }
+        }
+    }
+
+    fun toggleDnas(name: String, currentlyOn: Boolean) {
+        if (currentlyOn) {
+            dnasDisabled = dnasDisabled + name
+        } else {
+            if (!dnasGlobalOn) { Ps2DnasBypass.setEnabled(context, true); dnasGlobalOn = true }
+            val all = dnasEntries.map { it.name }.toSet()
+            dnasDisabled = all - name
+        }
+        Ps2DnasBypass.setDisabledNames(context, serial, dnasDisabled)
+    }
+
+    fun persist() {
+        Ps2CheatStaging.write(context, serial, false, serial, cheats.filter { it.name in selCheats })
+        Ps2CheatStaging.write(context, serial, true, serial, patches.filter { it.name in selPatches })
+    }
+
+    var showAdd by remember { mutableStateOf(false) }
+    var newName by remember { mutableStateOf("") }
+    var newCodes by remember { mutableStateOf("") }
+    var newIsPatch by remember { mutableStateOf(false) }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_cheats))
+        Text(
+            stringResource(R.string.retro_gs_cheats_apply_note),
+            color = TextDim,
+            fontSize = LabelSize,
+            modifier = Modifier.padding(bottom = TightGap),
+        )
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(bottom = ItemGap)) {
+            androidx.compose.material3.OutlinedButton(
+                onClick = { newName = ""; newCodes = ""; newIsPatch = false; showAdd = true },
+                contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 14.dp, vertical = 6.dp),
+            ) { Text(stringResource(R.string.retro_scr_add), fontSize = ValueSize) }
+            androidx.compose.material3.OutlinedButton(
+                onClick = { state.requestImportCheatFile?.invoke(true) },
+                contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 14.dp, vertical = 6.dp),
+            ) { Text(stringResource(R.string.retro_scr_import_from_file), fontSize = ValueSize) }
+        }
+        when {
+            loading -> Text(stringResource(R.string.retro_scr_loading), color = TextSecondary, fontSize = ValueSize)
+            cheats.isEmpty() && patches.isEmpty() && dnasEntries.isEmpty() ->
+                Text(stringResource(R.string.retro_scr_no_cheats_or_patches), color = TextSecondary, fontSize = ValueSize)
+            else -> Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                if (dnasEntries.isNotEmpty()) {
+                    Ps2SectionHeader(stringResource(R.string.retro_gs_dnas_group))
+                    dnasEntries.forEach { e ->
+                        val on = dnasGlobalOn && e.name !in dnasDisabled
+                        Ps2CheatRow(
+                            com.armsx2.PatchRepo.Entry(e.name, stringResource(R.string.retro_gs_dnas_entry_desc), e.body, "dnas"),
+                            on, isPatch = true,
+                            onToggle = { toggleDnas(e.name, on) },
+                        )
+                    }
+                }
+                if (cheats.isNotEmpty()) {
+                    Ps2SectionHeader(stringResource(R.string.retro_scr_cheats_section))
+                    cheats.forEach { entry ->
+                        val isCustom = entry.name !in repoCheatNames
+                        Ps2CheatRow(
+                            entry, entry.name in selCheats, isPatch = false,
+                            onToggle = {
+                                selCheats = if (entry.name in selCheats) selCheats - entry.name else selCheats + entry.name
+                                persist()
+                            },
+                            onDelete = if (isCustom) {
+                                {
+                                    cheats = cheats.filterNot { it.name == entry.name }
+                                    selCheats = selCheats - entry.name
+                                    persist()
+                                }
+                            } else null,
+                        )
+                    }
+                }
+                if (patches.isNotEmpty()) {
+                    Ps2SectionHeader(stringResource(R.string.retro_scr_patches_section))
+                    patches.forEach { entry ->
+                        val isCustom = entry.name !in repoPatchNames
+                        Ps2CheatRow(
+                            entry, entry.name in selPatches, isPatch = true,
+                            onToggle = {
+                                selPatches = if (entry.name in selPatches) selPatches - entry.name else selPatches + entry.name
+                                persist()
+                            },
+                            onDelete = if (isCustom) {
+                                {
+                                    patches = patches.filterNot { it.name == entry.name }
+                                    selPatches = selPatches - entry.name
+                                    persist()
+                                }
+                            } else null,
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    if (showAdd) {
+        androidx.compose.material3.AlertDialog(
+            onDismissRequest = { showAdd = false },
+            title = { Text(stringResource(R.string.retro_scr_add_cheat)) },
+            text = {
+                Column {
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) {
+                        androidx.compose.material3.OutlinedButton(
+                            onClick = { newIsPatch = false }, modifier = Modifier.weight(1f),
+                            colors = if (!newIsPatch)
+                                androidx.compose.material3.ButtonDefaults.buttonColors()
+                            else androidx.compose.material3.ButtonDefaults.outlinedButtonColors(),
+                        ) { Text(stringResource(R.string.retro_scr_target_cheat)) }
+                        androidx.compose.material3.OutlinedButton(
+                            onClick = { newIsPatch = true }, modifier = Modifier.weight(1f),
+                            colors = if (newIsPatch)
+                                androidx.compose.material3.ButtonDefaults.buttonColors()
+                            else androidx.compose.material3.ButtonDefaults.outlinedButtonColors(),
+                        ) { Text(stringResource(R.string.retro_scr_target_patch)) }
+                    }
+                    Spacer(Modifier.height(8.dp))
+                    androidx.compose.material3.OutlinedTextField(
+                        value = newName, onValueChange = { newName = it },
+                        label = { Text(stringResource(R.string.retro_scr_cheat_name)) },
+                        singleLine = true, modifier = Modifier.fillMaxWidth(),
+                    )
+                    Spacer(Modifier.height(8.dp))
+                    androidx.compose.material3.OutlinedTextField(
+                        value = newCodes, onValueChange = { newCodes = it },
+                        label = { Text(stringResource(R.string.retro_scr_cheat_codes)) },
+                        placeholder = { Text("2021A268 00000000") },
+                        modifier = Modifier.fillMaxWidth(), minLines = 3,
+                    )
+                }
+            },
+            confirmButton = {
+                androidx.compose.material3.TextButton(onClick = {
+                    val entry = buildCustomPnachEntry(context, newName, newCodes, if (newIsPatch) "patches" else "custom")
+                    if (entry != null) {
+                        if (newIsPatch) {
+                            patches = patches.filterNot { it.name == entry.name } + entry
+                            selPatches = selPatches + entry.name
+                        } else {
+                            cheats = cheats.filterNot { it.name == entry.name } + entry
+                            selCheats = selCheats + entry.name
+                        }
+                        persist()
+                        showAdd = false
+                    }
+                }) { Text(stringResource(R.string.retro_scr_add)) }
+            },
+            dismissButton = {
+                androidx.compose.material3.TextButton(onClick = { showAdd = false }) { Text(stringResource(R.string.retro_scr_cancel)) }
+            },
+        )
+    }
+}
+
+@Composable
+private fun RetroInputSection(state: RetroSettingsState) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val prefs =
+        remember(context) {
+            androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        }
+    var haptic by remember { mutableStateOf(prefs.getFloat("retro_haptic_strength", 0.4f)) }
+    val ps2 = state.system?.isExternal == true
+    val ps2Prefs = if (ps2) remember(context) { context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE) } else null
+    var ps2Ver by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+    @Suppress("UNUSED_EXPRESSION") ps2Ver
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_input))
+        if (ps2 && ps2Prefs != null) {
+            RetroSettingSwitch(
+                label = stringResource(R.string.retro_gs_on_screen_controls),
+                checked = ps2Prefs.getBoolean("wn.ps2.touchcontrols", true),
+                onCheckedChange = { ps2Prefs.edit().putBoolean("wn.ps2.touchcontrols", it).apply(); ps2Ver++ },
+            )
+            RetroSettingSwitch(
+                label = stringResource(R.string.retro_gs_adaptive_sticks),
+                checked = ps2Prefs.getBoolean("wn.ps2.adaptivesticks", false),
+                subtitle = stringResource(R.string.retro_gs_adaptive_sticks_subtitle),
+                onCheckedChange = { ps2Prefs.edit().putBoolean("wn.ps2.adaptivesticks", it).apply(); ps2Ver++ },
+            )
+            RetroSettingSwitch(
+                label = stringResource(R.string.retro_ps2_show_l3r3),
+                checked = ps2Prefs.getBoolean("wn.ps2.showl3r3", true),
+                subtitle = stringResource(R.string.retro_ps2_show_l3r3_subtitle),
+                onCheckedChange = { ps2Prefs.edit().putBoolean("wn.ps2.showl3r3", it).apply(); ps2Ver++ },
+            )
+        } else {
+            RetroSettingSwitch(
+                label = stringResource(R.string.retro_gs_on_screen_controls),
+                checked = state.touchControls,
+                onCheckedChange = { state.touchControls = it },
+            )
+            RetroSettingSwitch(
+                label = stringResource(R.string.retro_gs_adaptive_sticks),
+                checked = state.adaptiveSticks,
+                subtitle = stringResource(R.string.retro_gs_adaptive_sticks_subtitle),
+                onCheckedChange = { state.adaptiveSticks = it },
+            )
+            val sysId = state.system?.id
+            if (sysId == RetroSystems.PSX.id || RetroCoreManager.usesDolphinCore(state.system)) {
+                var invVer by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+                @Suppress("UNUSED_EXPRESSION") invVer
+                listOf(
+                    R.string.retro_lr_left_stick_invert_x to "retro_inv_lx_$sysId",
+                    R.string.retro_lr_left_stick_invert_y to "retro_inv_ly_$sysId",
+                    R.string.retro_lr_right_stick_invert_x to "retro_inv_rx_$sysId",
+                    R.string.retro_lr_right_stick_invert_y to "retro_inv_ry_$sysId",
+                ).forEach { (labelRes, key) ->
+                    RetroSettingSwitch(
+                        label = stringResource(labelRes),
+                        checked = prefs.getBoolean(key, false),
+                        onCheckedChange = { prefs.edit().putBoolean(key, it).apply(); invVer++ },
+                    )
+                }
+            }
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = TightGap),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                stringResource(R.string.retro_gs_haptic_feedback),
+                color = TextPrimary,
+                fontSize = ValueSize,
+                modifier = Modifier.weight(1f),
+            )
+            Text(
+                "${(haptic * 100).toInt()}%",
+                color = TextSecondary,
+                fontSize = ValueSize,
+            )
+        }
+        androidx.compose.material3.Slider(
+            value = haptic,
+            onValueChange = { value ->
+                haptic = value
+                prefs.edit().putFloat("retro_haptic_strength", value).apply()
+            },
+            valueRange = 0f..1f,
+            modifier = Modifier.fillMaxWidth().height(26.dp),
+        )
+    }
+}
+
+@Composable
+private fun RetroAudioSection(state: RetroSettingsState) {
+    if (state.system?.isExternal == true) {
+        val context = androidx.compose.ui.platform.LocalContext.current
+        val prefs = remember(context) { context.getSharedPreferences("ARMSX2", android.content.Context.MODE_PRIVATE) }
+        var version by remember { androidx.compose.runtime.mutableIntStateOf(0) }
+        @Suppress("UNUSED_EXPRESSION") version
+        var vol by remember { mutableStateOf(prefs.getInt("wn.ps2.volume", 100)) }
+        RetroSettingGroup {
+            RetroGroupTitle(stringResource(R.string.retro_gs_group_audio))
+            Row(
+                modifier = Modifier.fillMaxWidth().padding(vertical = TightGap),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(stringResource(R.string.retro_gs_volume), color = TextPrimary, fontSize = ValueSize, modifier = Modifier.weight(1f))
+                Text("$vol%", color = TextSecondary, fontSize = ValueSize)
+            }
+            androidx.compose.material3.Slider(
+                value = vol.toFloat(),
+                onValueChange = { vol = it.toInt() },
+                onValueChangeFinished = { prefs.edit().putInt("wn.ps2.volume", vol).apply() },
+                valueRange = 0f..200f,
+                modifier = Modifier.fillMaxWidth().height(26.dp),
+            )
+            RetroSettingSwitch(stringResource(R.string.retro_gs_mute), prefs.getBoolean("wn.ps2.muted", false)) {
+                prefs.edit().putBoolean("wn.ps2.muted", it).apply(); version++
+            }
+            RetroSettingSwitch(stringResource(R.string.retro_gs_time_stretch), prefs.getBoolean("wn.ps2.timestretch", true)) {
+                prefs.edit().putBoolean("wn.ps2.timestretch", it).apply(); version++
+            }
+            val bufferValues = listOf(40, 50, 60, 80, 100, 120, 160, 200)
+            RetroSettingDropdown(
+                stringResource(R.string.retro_gs_audio_buffer),
+                bufferValues.map { context.getString(R.string.retro_gs_ms, it) },
+                bufferValues.indexOf(prefs.getInt("wn.ps2.audiobuffer", 50)).coerceAtLeast(0),
+            ) {
+                prefs.edit().putInt("wn.ps2.audiobuffer", bufferValues[it]).apply(); version++
+            }
+            val latencyValues = listOf(10, 15, 20, 30, 40, 60, 80, 100)
+            RetroSettingDropdown(
+                stringResource(R.string.retro_gs_audio_latency),
+                latencyValues.map { context.getString(R.string.retro_gs_ms, it) },
+                latencyValues.indexOf(prefs.getInt("wn.ps2.audiolatency", 20)).coerceAtLeast(0),
+            ) {
+                prefs.edit().putInt("wn.ps2.audiolatency", latencyValues[it]).apply(); version++
+            }
+            RetroSettingSwitch(stringResource(R.string.retro_gs_swap_stereo), prefs.getBoolean("wn.ps2.swap", false)) {
+                prefs.edit().putBoolean("wn.ps2.swap", it).apply(); version++
+            }
+        }
+        return
+    }
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_group_audio))
+        RetroSettingSwitch(
+            label = stringResource(R.string.retro_gs_sound),
+            checked = state.audio,
+            onCheckedChange = { state.audio = it },
+        )
+    }
+}
diff --git a/app/src/main/feature/retro/RetroHddImport.kt b/app/src/main/feature/retro/RetroHddImport.kt
new file mode 100644
index 000000000..227df33dd
--- /dev/null
+++ b/app/src/main/feature/retro/RetroHddImport.kt
@@ -0,0 +1,64 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.net.Uri
+import java.io.File
+import java.util.zip.ZipInputStream
+
+object RetroHddImport {
+    const val BLANK_IMAGE = "DEV9hdd.raw"
+
+    fun hddDir(context: Context): File =
+        File(context.getExternalFilesDir(null) ?: context.filesDir, "hdd").apply { mkdirs() }
+
+    fun installed(context: Context): List<File> =
+        hddDir(context).listFiles().orEmpty()
+            .filter { it.isFile && it.extension.equals("raw", true) && it.name != BLANK_IMAGE }
+            .sortedBy { it.name.lowercase() }
+
+    fun imageFile(context: Context, name: String?): File? {
+        if (name.isNullOrBlank()) return null
+        val f = File(hddDir(context), name)
+        return f.takeIf { it.isFile }
+    }
+
+    fun delete(context: Context, name: String): Boolean =
+        File(hddDir(context), name).let { it.isFile && it.delete() }
+
+    private fun displayName(context: Context, uri: Uri): String? =
+        runCatching {
+            context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
+                if (it.moveToFirst()) it.getString(0) else null
+            }
+        }.getOrNull()
+
+    fun importFromUri(context: Context, uri: Uri): Result<String> =
+        runCatching {
+            val name = displayName(context, uri) ?: "hdd.raw"
+            val dir = hddDir(context)
+            if (name.endsWith(".zip", ignoreCase = true)) {
+                var extracted: String? = null
+                context.contentResolver.openInputStream(uri)?.use { input ->
+                    ZipInputStream(input.buffered()).use { zin ->
+                        var entry = zin.nextEntry
+                        while (entry != null && extracted == null) {
+                            val entryName = entry.name.substringAfterLast('/')
+                            if (!entry.isDirectory && entryName.endsWith(".raw", ignoreCase = true)) {
+                                File(dir, entryName).outputStream().buffered().use { out -> zin.copyTo(out, 1 shl 20) }
+                                extracted = entryName
+                            }
+                            zin.closeEntry()
+                            entry = zin.nextEntry
+                        }
+                    }
+                } ?: throw IllegalStateException("Could not read file")
+                extracted ?: throw IllegalArgumentException("No .raw HDD image found inside the ZIP")
+            } else {
+                val outName = if (name.endsWith(".raw", ignoreCase = true)) name else "$name.raw"
+                context.contentResolver.openInputStream(uri)?.use { input ->
+                    File(dir, outName).outputStream().buffered().use { out -> input.copyTo(out, 1 shl 20) }
+                } ?: throw IllegalStateException("Could not read file")
+                outName
+            }
+        }
+}
diff --git a/app/src/main/feature/retro/RetroHudSupport.kt b/app/src/main/feature/retro/RetroHudSupport.kt
new file mode 100644
index 000000000..803134ae7
--- /dev/null
+++ b/app/src/main/feature/retro/RetroHudSupport.kt
@@ -0,0 +1,474 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.preference.PreferenceManager
+import com.winlator.cmod.R
+import com.winlator.cmod.runtime.display.ui.FrameRating
+import java.util.HashMap
+
+object RetroHudSupport {
+    const val HUD_ELEVATION = 2500f
+
+    val ELEMENT_LABEL_RES =
+        intArrayOf(
+            R.string.retro_lr_hud_fps,
+            R.string.retro_lr_hud_console,
+            R.string.retro_lr_hud_gpu,
+            R.string.retro_lr_hud_cpu,
+            R.string.retro_lr_hud_ram,
+            R.string.retro_lr_hud_battery,
+            R.string.retro_lr_hud_temp,
+            R.string.retro_lr_hud_graph,
+            R.string.retro_lr_hud_cpu_temp,
+        )
+
+    val ELEMENT_ORDER = intArrayOf(1, 2, 3, 8, 4, 5, 6, 0, 7)
+
+    const val PS2_HUD_PREF = "wn.ps2.hud"
+    private const val PS2_ELEMENTS_PREF = "wn.ps2.hud.elements"
+    private const val PS2_ALPHA_PREF = "wn.ps2.hud.alpha"
+    private const val PS2_BG_DECOUPLED_PREF = "wn.ps2.hud.bg_decoupled"
+    private const val PS2_BG_ALPHA_PREF = "wn.ps2.hud.bg_alpha"
+    private const val PS2_SCALE_PREF = "wn.ps2.hud.scale"
+
+    fun consoleHudDefault(
+        context: Context,
+        systemId: String,
+    ): Boolean =
+        if (systemId == RetroSystems.PS2.id) resolvePs2HudEnabled(context) else RetroDefaults.hud(context, systemId)
+
+    fun hudEnabled(
+        context: Context,
+        shortcut: com.winlator.cmod.runtime.container.Shortcut?,
+        systemId: String,
+    ): Boolean {
+        val perGame = shortcut?.getExtra(RetroShortcuts.KEY_HUD).orEmpty()
+        return if (perGame.isEmpty()) consoleHudDefault(context, systemId) else perGame == "1"
+    }
+
+    fun defaultElements(): BooleanArray = booleanArrayOf(true, true, true, true, true, true, true, true, false)
+
+    fun ps2Prefs(context: Context) =
+        context.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE)
+
+    fun resolvePs2HudEnabled(context: Context): Boolean {
+        val prefs = ps2Prefs(context)
+        if (prefs.contains(PS2_HUD_PREF)) {
+            return prefs.getBoolean(PS2_HUD_PREF, false)
+        }
+        val legacy =
+            listOf("fps", "speed", "res", "cpu", "gpu", "frametimes", "gsstats", "inputs", "hwinfo", "version")
+                .any { prefs.getBoolean("wn.osd.$it", false) }
+        if (legacy) {
+            prefs.edit().putBoolean(PS2_HUD_PREF, true).apply()
+            return true
+        }
+        return RetroDefaults.hud(context, RetroSystems.PS2.id)
+    }
+
+    fun setPs2HudEnabled(context: Context, enabled: Boolean) {
+        ps2Prefs(context).edit().putBoolean(PS2_HUD_PREF, enabled).apply()
+    }
+
+    fun loadPs2Elements(context: Context): BooleanArray {
+        val prefs = ps2Prefs(context)
+        val raw = prefs.getString(PS2_ELEMENTS_PREF, null)
+        if (!raw.isNullOrBlank()) {
+            val parts = raw.split(',')
+            val out = defaultElements()
+            for (i in out.indices) {
+                if (i < parts.size) out[i] = parts[i] == "1" || parts[i].equals("true", true)
+            }
+            return out
+        }
+        if (listOf("fps", "cpu", "gpu", "frametimes").any { prefs.contains("wn.osd.$it") }) {
+            val out = defaultElements()
+            out[0] = prefs.getBoolean("wn.osd.fps", true)
+            out[2] = prefs.getBoolean("wn.osd.gpu", true)
+            out[3] = prefs.getBoolean("wn.osd.cpu", true)
+            out[7] = prefs.getBoolean("wn.osd.frametimes", true)
+            savePs2Elements(context, out)
+            return out
+        }
+        return defaultElements()
+    }
+
+    fun savePs2Elements(context: Context, elements: BooleanArray) {
+        val raw = elements.joinToString(",") { if (it) "1" else "0" }
+        ps2Prefs(context).edit().putString(PS2_ELEMENTS_PREF, raw).apply()
+    }
+
+    fun loadPs2HudStyle(context: Context): HudStyle {
+        val prefs = ps2Prefs(context)
+        val pm = PreferenceManager.getDefaultSharedPreferences(context)
+        val alpha = prefs.getFloat(PS2_ALPHA_PREF, pm.getFloat(FrameRating.PREF_HUD_ALPHA, 1f))
+        val scale = prefs.getFloat(PS2_SCALE_PREF, pm.getFloat(FrameRating.PREF_HUD_SCALE, 1f))
+        val bgDecoupled = prefs.getBoolean(PS2_BG_DECOUPLED_PREF, false)
+        val bgAlpha =
+            prefs.getFloat(
+                PS2_BG_ALPHA_PREF,
+                (alpha * FrameRating.BACKDROP_BASE_ALPHA).coerceIn(0.1f, 1f),
+            )
+        val frametimeNumeric = pm.getBoolean(FrameRating.PREF_HUD_FRAMETIME_NUMERIC, false)
+        val dualBattery = pm.getBoolean(FrameRating.PREF_HUD_DUAL_SERIES_BATTERY, false)
+        return HudStyle(alpha, bgDecoupled, bgAlpha, scale, frametimeNumeric, dualBattery)
+    }
+
+    fun savePs2HudStyle(context: Context, style: HudStyle) {
+        ps2Prefs(context)
+            .edit()
+            .putFloat(PS2_ALPHA_PREF, style.alpha)
+            .putBoolean(PS2_BG_DECOUPLED_PREF, style.bgDecoupled)
+            .putFloat(PS2_BG_ALPHA_PREF, style.bgAlpha)
+            .putFloat(PS2_SCALE_PREF, style.scale)
+            .apply()
+        PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .edit()
+            .putBoolean(FrameRating.PREF_HUD_FRAMETIME_NUMERIC, style.frametimeNumeric)
+            .putBoolean(FrameRating.PREF_HUD_DUAL_SERIES_BATTERY, style.dualBattery)
+            .apply()
+    }
+
+    fun applyStyle(
+        rating: FrameRating,
+        style: HudStyle,
+        elements: BooleanArray,
+    ) {
+        rating.setHudAlpha(style.alpha)
+        rating.setBackgroundAlphaDecoupled(style.bgDecoupled)
+        rating.setHudBackgroundAlpha(style.bgAlpha)
+        rating.setHudScale(style.scale)
+        rating.setFrametimeNumericMode(style.frametimeNumeric)
+        rating.setDualSeriesBattery(style.dualBattery)
+        elements.forEachIndexed { index, enabled -> rating.toggleElement(index, enabled) }
+    }
+
+    fun loadGlobalHudElements(context: Context): BooleanArray {
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        val csv = prefs.getString("retro_hud_elements", null) ?: return defaultElements()
+        val parts = csv.split(',')
+        val defaults = defaultElements()
+        return BooleanArray(defaults.size) { i -> parts.getOrNull(i)?.toBoolean() ?: defaults[i] }
+    }
+
+    fun saveGlobalHudElements(context: Context, elements: BooleanArray) {
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .edit()
+            .putString("retro_hud_elements", elements.joinToString(","))
+            .apply()
+    }
+
+    fun loadGlobalHudStyle(context: Context): HudStyle {
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        return HudStyle(
+            alpha = prefs.getFloat("retro_hud_alpha", 1f),
+            bgDecoupled = prefs.getBoolean("retro_hud_bg_decoupled", false),
+            bgAlpha = prefs.getFloat("retro_hud_bg_alpha", FrameRating.BACKDROP_BASE_ALPHA),
+            scale = prefs.getFloat("retro_hud_scale", 1f),
+            frametimeNumeric = prefs.getBoolean(FrameRating.PREF_HUD_FRAMETIME_NUMERIC, false),
+            dualBattery = prefs.getBoolean(FrameRating.PREF_HUD_DUAL_SERIES_BATTERY, false),
+        )
+    }
+
+    fun saveGlobalHudStyle(context: Context, style: HudStyle) {
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .edit()
+            .putFloat("retro_hud_alpha", style.alpha)
+            .putBoolean("retro_hud_bg_decoupled", style.bgDecoupled)
+            .putFloat("retro_hud_bg_alpha", style.bgAlpha)
+            .putFloat("retro_hud_scale", style.scale)
+            .putBoolean(FrameRating.PREF_HUD_FRAMETIME_NUMERIC, style.frametimeNumeric)
+            .putBoolean(FrameRating.PREF_HUD_DUAL_SERIES_BATTERY, style.dualBattery)
+            .apply()
+    }
+
+    fun loadContainerHudSettings(
+        context: Context,
+        containerId: Int,
+    ): Pair<HudStyle, BooleanArray>? {
+        if (containerId <= 0) return null
+        return runCatching {
+            val json =
+                com.winlator.cmod.runtime.container.ContainerManager(context)
+                    .getContainerById(containerId)
+                    ?.getExtra("hudSettings")
+            if (json.isNullOrEmpty()) return null
+            val obj = org.json.JSONObject(json)
+            val transparency = obj.optDouble("transparency", 1.0).toFloat()
+            val style =
+                HudStyle(
+                    alpha = transparency,
+                    bgDecoupled = obj.optBoolean("backgroundAlphaDecoupled", false),
+                    bgAlpha =
+                        obj
+                            .optDouble(
+                                "backgroundTransparency",
+                                (transparency * FrameRating.BACKDROP_BASE_ALPHA).toDouble(),
+                            ).toFloat(),
+                    scale = obj.optDouble("scale", 1.0).toFloat(),
+                )
+            val legacyCpuRam = obj.optBoolean("showCpuRam", true)
+            val legacyBattTemp = obj.optBoolean("showBattTemp", true)
+            val elements =
+                booleanArrayOf(
+                    obj.optBoolean("showFPS", true),
+                    obj.optBoolean("showRenderer", true),
+                    obj.optBoolean("showGPU", true),
+                    obj.optBoolean("showCPU", legacyCpuRam),
+                    obj.optBoolean("showRAM", legacyCpuRam),
+                    obj.optBoolean("showBattery", legacyBattTemp),
+                    obj.optBoolean("showTemp", legacyBattTemp),
+                    obj.optBoolean("showGraph", true),
+                    obj.optBoolean("showCpuTemp", false),
+                )
+            style to elements
+        }.getOrNull()
+    }
+
+    fun saveContainerHudSettings(
+        context: Context,
+        containerId: Int,
+        style: HudStyle,
+        elements: BooleanArray,
+    ) {
+        if (containerId <= 0) return
+        runCatching {
+            val container =
+                com.winlator.cmod.runtime.container.ContainerManager(context)
+                    .getContainerById(containerId) ?: return
+            val obj = org.json.JSONObject()
+            obj.put("transparency", style.alpha.toDouble())
+            obj.put("backgroundAlphaDecoupled", style.bgDecoupled)
+            obj.put("backgroundTransparency", style.bgAlpha.toDouble())
+            obj.put("scale", style.scale.toDouble())
+            obj.put("showFPS", elements.getOrElse(0) { true })
+            obj.put("showRenderer", elements.getOrElse(1) { true })
+            obj.put("showGPU", elements.getOrElse(2) { true })
+            obj.put("showCPU", elements.getOrElse(3) { true })
+            obj.put("showRAM", elements.getOrElse(4) { true })
+            obj.put("showBattery", elements.getOrElse(5) { true })
+            obj.put("showTemp", elements.getOrElse(6) { true })
+            obj.put("showGraph", elements.getOrElse(7) { true })
+            obj.put("showCpuTemp", elements.getOrElse(8) { false })
+            container.putExtra("hudSettings", obj.toString())
+            container.saveData()
+        }
+    }
+
+    fun libretroRendererLabel(): String = "OpenGL"
+
+    fun createFrameRating(
+        context: Context,
+        rendererLabel: String,
+    ): FrameRating {
+        val rating = FrameRating(context, HashMap<String, String>())
+        rating.setRenderer(rendererLabel)
+        rating.setHudElevation(HUD_ELEVATION)
+        rating.visibility = View.GONE
+        return rating
+    }
+
+    fun attachFrameRating(
+        parent: ViewGroup,
+        rating: FrameRating,
+        below: View? = null,
+    ) {
+        if (rating.parent != null) return
+        val lp =
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+            )
+        val index = below?.let { parent.indexOfChild(it) } ?: -1
+        if (index >= 0) parent.addView(rating, index, lp) else parent.addView(rating, lp)
+    }
+
+    fun buildHudEntries(
+        context: Context,
+        hudVisible: Boolean,
+        style: HudStyle,
+        elements: BooleanArray,
+        onMaster: (Boolean) -> Unit,
+        onStyle: (HudStyle) -> Unit,
+        onElements: (BooleanArray) -> Unit,
+        onRebuild: () -> Unit,
+    ): List<RetroMenuEntry> {
+        val entries = mutableListOf<RetroMenuEntry>()
+        entries +=
+            RetroMenuEntry.Toggle(context.getString(R.string.retro_lr_performance_hud), checked = hudVisible) { value ->
+                onMaster(value)
+                onRebuild()
+            }
+        if (!hudVisible) return entries
+        entries +=
+            RetroMenuEntry.Slider(
+                label = context.getString(R.string.retro_lr_alpha),
+                valueText = "${(style.alpha * 100).toInt()}%",
+                value = style.alpha,
+                min = 0.1f,
+                max = 1f,
+                step = 0.05f,
+            ) { value ->
+                val next =
+                    if (!style.bgDecoupled) {
+                        style.copy(
+                            alpha = value,
+                            bgAlpha = (value * FrameRating.BACKDROP_BASE_ALPHA).coerceIn(0.1f, 1f),
+                        )
+                    } else {
+                        style.copy(alpha = value)
+                    }
+                onStyle(next)
+                onRebuild()
+            }
+        entries +=
+            RetroMenuEntry.Toggle(context.getString(R.string.retro_lr_background_alpha), checked = style.bgDecoupled) { value ->
+                val next =
+                    if (!value) {
+                        style.copy(
+                            bgDecoupled = false,
+                            bgAlpha = (style.alpha * FrameRating.BACKDROP_BASE_ALPHA).coerceIn(0.1f, 1f),
+                        )
+                    } else {
+                        style.copy(bgDecoupled = true)
+                    }
+                onStyle(next)
+                onRebuild()
+            }
+        if (style.bgDecoupled) {
+            entries +=
+                RetroMenuEntry.Slider(
+                    label = context.getString(R.string.retro_lr_background),
+                    valueText = "${(style.bgAlpha * 100).toInt()}%",
+                    value = style.bgAlpha,
+                    min = 0.1f,
+                    max = 1f,
+                    step = 0.05f,
+                ) { value ->
+                    onStyle(style.copy(bgAlpha = value))
+                    onRebuild()
+                }
+        }
+        entries +=
+            RetroMenuEntry.Slider(
+                label = context.getString(R.string.retro_lr_scale),
+                valueText = "${(style.scale * 100).toInt()}%",
+                value = style.scale,
+                min = 0.3f,
+                max = 2f,
+                step = 0.05f,
+            ) { value ->
+                onStyle(style.copy(scale = value))
+                onRebuild()
+            }
+        entries +=
+            RetroMenuEntry.Toggle(context.getString(R.string.retro_lr_numeric_frametime), checked = style.frametimeNumeric) { value ->
+                onStyle(style.copy(frametimeNumeric = value))
+                onRebuild()
+            }
+        entries +=
+            RetroMenuEntry.Toggle(context.getString(R.string.retro_lr_dual_series_battery), checked = style.dualBattery) { value ->
+                onStyle(style.copy(dualBattery = value))
+                onRebuild()
+            }
+        entries +=
+            RetroMenuEntry.Chips(
+                label = context.getString(R.string.retro_lr_hud_elements),
+                items = ELEMENT_ORDER.map { context.getString(ELEMENT_LABEL_RES[it]) },
+                states = ELEMENT_ORDER.map { elements[it] },
+            ) { position ->
+                val index = ELEMENT_ORDER[position]
+                val next = elements.copyOf()
+                next[index] = !next[index]
+                onElements(next)
+                onRebuild()
+            }
+        return entries
+    }
+
+    fun suppressNativePs2Osd() {
+        runCatching {
+            kr.co.iefriends.pcsx2.NativeApp.osdShowFPS(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowVPS(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowSpeed(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowCPU(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowGPU(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowResolution(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowGSStats(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowFrameTimes(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowHardwareInfo(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowVersion(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowSettings(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowInputs(false)
+            kr.co.iefriends.pcsx2.NativeApp.osdShowGpuStats(false)
+        }
+    }
+
+    class Ps2FrameSource(
+        private val ratingProvider: () -> FrameRating?,
+        private val enabledProvider: () -> Boolean,
+    ) {
+        private val handler = Handler(Looper.getMainLooper())
+        private var lastCount = -1
+        private var running = false
+        private val tick =
+            object : Runnable {
+                override fun run() {
+                    if (!running) return
+                    val rating = ratingProvider()
+                    if (enabledProvider() && rating != null &&
+                        com.armsx2.runtime.MainActivityRuntime.isNativeReady()
+                    ) {
+                        val count = runCatching { kr.co.iefriends.pcsx2.NativeApp.getPresentedFrameCount() }.getOrDefault(0)
+                        if (lastCount >= 0 && count >= lastCount) {
+                            val delta = (count - lastCount).coerceAtMost(8)
+                            repeat(delta) { rating.recordGameFrame() }
+                        }
+                        lastCount = count
+                    }
+                    handler.postDelayed(this, 16L)
+                }
+            }
+
+        fun start() {
+            if (running) return
+            running = true
+            lastCount = -1
+            handler.post(tick)
+        }
+
+        fun stop() {
+            running = false
+            handler.removeCallbacks(tick)
+        }
+    }
+
+    class MenuToggleGate(private val minIntervalMs: Long = 350L) {
+        private var lastToggleMs = 0L
+
+        fun allow(): Boolean {
+            val now = SystemClock.uptimeMillis()
+            if (now - lastToggleMs < minIntervalMs) return false
+            lastToggleMs = now
+            return true
+        }
+    }
+}
+
+data class HudStyle(
+    val alpha: Float = 1f,
+    val bgDecoupled: Boolean = false,
+    val bgAlpha: Float = FrameRating.BACKDROP_BASE_ALPHA,
+    val scale: Float = 1f,
+    val frametimeNumeric: Boolean = false,
+    val dualBattery: Boolean = false,
+)
diff --git a/app/src/main/feature/retro/RetroInputView.kt b/app/src/main/feature/retro/RetroInputView.kt
new file mode 100644
index 000000000..d61101af4
--- /dev/null
+++ b/app/src/main/feature/retro/RetroInputView.kt
@@ -0,0 +1,2536 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.DashPathEffect
+import android.graphics.LinearGradient
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RadialGradient
+import android.graphics.RectF
+import android.graphics.Shader
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.View
+import com.winlator.cmod.runtime.input.controls.GameHubLayout
+import kotlin.math.abs
+import kotlin.math.hypot
+import kotlin.math.max
+import kotlin.math.min
+
+class RetroInputView(
+    context: Context,
+    private val listener: Listener,
+    private val system: RetroSystem? = null,
+) : View(context) {
+    interface Listener {
+        fun onButton(
+            keyCode: Int,
+            down: Boolean,
+        )
+
+        fun onDpad(
+            x: Float,
+            y: Float,
+        )
+
+        fun onStick(
+            x: Float,
+            y: Float,
+        )
+
+        fun onRightStick(
+            x: Float,
+            y: Float,
+        )
+
+        fun onMenu()
+    }
+
+    private enum class GlassShape { CIRCLE, PILL, TRIGGER_LT, TRIGGER_LB, TRIGGER_RT, TRIGGER_RB }
+
+    private class GlassButton(
+        val keyCode: Int,
+        val label: String,
+        val shape: GlassShape,
+        val textScale: Float = 1f,
+        val bounds: RectF = RectF(),
+    )
+
+    private class CButton(
+        val dx: Float,
+        val dy: Float,
+        val glyph: String,
+        val bounds: RectF = RectF(),
+    )
+
+    private data class OverlayConfig(
+        val hasXY: Boolean,
+        val hasShoulders: Boolean,
+        val hasTriggers: Boolean,
+        val hasStick: Boolean,
+        val leftTriggerLabel: String = "L2",
+        val rightTriggerLabel: String = "R2",
+        val leftShoulderLabel: String = "L",
+        val rightShoulderLabel: String = "R",
+        val showLeftShoulder: Boolean = true,
+        val showRightTrigger: Boolean = true,
+        val flatFaces: Boolean = false,
+        val hasDualSticks: Boolean = false,
+        val faceTop: String = "X",
+        val faceBottom: String = "B",
+        val faceLeft: String = "Y",
+        val faceRight: String = "A",
+    )
+
+    private val config =
+        when (system?.id) {
+            RetroSystems.NES.id ->
+                OverlayConfig(
+                    hasXY = false,
+                    hasShoulders = false,
+                    hasTriggers = false,
+                    hasStick = false,
+                    flatFaces = true,
+                )
+            RetroSystems.SNES.id -> OverlayConfig(hasXY = true, hasShoulders = true, hasTriggers = false, hasStick = false)
+            RetroSystems.GBA.id -> OverlayConfig(hasXY = false, hasShoulders = true, hasTriggers = false, hasStick = false)
+            RetroSystems.GENESIS.id -> OverlayConfig(hasXY = true, hasShoulders = true, hasTriggers = false, hasStick = false)
+            RetroSystems.N64.id ->
+                OverlayConfig(
+                    hasXY = false,
+                    hasShoulders = true,
+                    hasTriggers = true,
+                    hasStick = true,
+                    leftTriggerLabel = "Z",
+                    showRightTrigger = false,
+                )
+            RetroSystems.GAMECUBE.id ->
+                OverlayConfig(
+                    hasXY = true,
+                    hasShoulders = true,
+                    hasTriggers = true,
+                    hasStick = false,
+                    hasDualSticks = true,
+                    leftTriggerLabel = "L",
+                    rightTriggerLabel = "R",
+                    leftShoulderLabel = "Z",
+                    rightShoulderLabel = "Z",
+                    showLeftShoulder = false,
+                    faceTop = "X",
+                    faceBottom = "B",
+                    faceLeft = "Y",
+                    faceRight = "A",
+                )
+            RetroSystems.WII.id ->
+                OverlayConfig(
+                    hasXY = true,
+                    hasShoulders = true,
+                    hasTriggers = true,
+                    hasStick = false,
+                    hasDualSticks = true,
+                    leftTriggerLabel = "ZL",
+                    rightTriggerLabel = "ZR",
+                    leftShoulderLabel = "L",
+                    rightShoulderLabel = "R",
+                    faceTop = "X",
+                    faceBottom = "B",
+                    faceLeft = "Y",
+                    faceRight = "A",
+                )
+            RetroSystems.PS2.id ->
+                OverlayConfig(
+                    hasXY = true,
+                    hasShoulders = true,
+                    hasTriggers = true,
+                    hasStick = false,
+                    hasDualSticks = true,
+                    faceTop = "\u25b3",
+                    faceBottom = "\u2715",
+                    faceLeft = "\u25a1",
+                    faceRight = "\u25cb",
+                )
+            RetroSystems.PSX.id ->
+                OverlayConfig(
+                    hasXY = true,
+                    hasShoulders = true,
+                    hasTriggers = true,
+                    hasStick = false,
+                    faceTop = "△",
+                    faceBottom = "✕",
+                    faceLeft = "□",
+                    faceRight = "○",
+                )
+            else -> OverlayConfig(hasXY = false, hasShoulders = false, hasTriggers = false, hasStick = false)
+        }
+
+    private fun faceGlyphScale(label: String): Float =
+        when (label) {
+            "\u25cb" -> 1.85f
+            "\u25b3" -> 1.55f
+            "\u25a1" -> 1.45f
+            "\u2715" -> 1f
+            else -> 1f
+        }
+
+    private val buttons = mutableListOf<GlassButton>()
+    private val cButtons = mutableListOf<CButton>()
+    private val menuButton = GlassButton(0, "MENU", GlassShape.PILL, textScale = 0.75f)
+    private var snap = 0f
+    private var cStickX = 0f
+    private var cStickY = 0f
+
+    private class RetroTheme(
+        val body: Int,
+        val dpad: Int,
+        val pill: Int,
+        val pillText: Int,
+        val button: Int,
+        val buttonText: Int,
+        val buttonColors: Map<String, Int> = emptyMap(),
+        val buttonTextColors: Map<String, Int> = emptyMap(),
+        val backplate: Int = 0,
+        val clusterPlate: Int = 0,
+        val stickCap: Int = 0xFFB4B4BA.toInt(),
+        val cButton: Int = 0xFFE3BE2A.toInt(),
+        val cText: Int = 0xFF4A3B08.toInt(),
+    )
+
+    private val theme: RetroTheme =
+        when (system?.id) {
+            RetroSystems.NES.id ->
+                RetroTheme(
+                    body = 0xFFD8D5CD.toInt(),
+                    dpad = 0xFF26262A.toInt(),
+                    pill = 0xFF303034.toInt(),
+                    pillText = 0xFFD8D5CD.toInt(),
+                    button = 0xFFC03A30.toInt(),
+                    buttonText = 0xFFF6EAE8.toInt(),
+                    backplate = 0xFFEDEBE6.toInt(),
+                )
+            RetroSystems.SNES.id ->
+                RetroTheme(
+                    body = 0xFFCBCBD3.toInt(),
+                    dpad = 0xFF3E3E46.toInt(),
+                    pill = 0xFF8F8F98.toInt(),
+                    pillText = 0xFF2F2F36.toInt(),
+                    button = 0xFF564A9E.toInt(),
+                    buttonText = 0xFFEDEBFA.toInt(),
+                    buttonColors =
+                        mapOf(
+                            "X" to 0xFFBCB6DF.toInt(),
+                            "Y" to 0xFFBCB6DF.toInt(),
+                        ),
+                    buttonTextColors =
+                        mapOf(
+                            "X" to 0xFF423D66.toInt(),
+                            "Y" to 0xFF423D66.toInt(),
+                        ),
+                    clusterPlate = 0xFFB2B1BB.toInt(),
+                )
+            RetroSystems.GAMEBOY.id ->
+                RetroTheme(
+                    body = 0xFFC9C6C1.toInt(),
+                    dpad = 0xFF2E2E33.toInt(),
+                    pill = 0xFF8A8A86.toInt(),
+                    pillText = 0xFF33333A.toInt(),
+                    button = 0xFF8E3162.toInt(),
+                    buttonText = 0xFFF2DEE8.toInt(),
+                )
+            RetroSystems.GAMEBOY_COLOR.id ->
+                RetroTheme(
+                    body = 0xFF5F45AC.toInt(),
+                    dpad = 0xFF26262B.toInt(),
+                    pill = 0xFF453D78.toInt(),
+                    pillText = 0xFFD9D3F2.toInt(),
+                    button = 0xFF37305E.toInt(),
+                    buttonText = 0xFFCFC8EE.toInt(),
+                )
+            RetroSystems.GBA.id ->
+                RetroTheme(
+                    body = 0xFF7C74C6.toInt(),
+                    dpad = 0xFF33333A.toInt(),
+                    pill = 0xFF9C96CC.toInt(),
+                    pillText = 0xFF3C3866.toInt(),
+                    button = 0xFFD3CFEA.toInt(),
+                    buttonText = 0xFF4A4670.toInt(),
+                )
+            RetroSystems.N64.id ->
+                RetroTheme(
+                    body = 0xFFA7A7AD.toInt(),
+                    dpad = 0xFF4C4C54.toInt(),
+                    pill = 0xFF77777F.toInt(),
+                    pillText = 0xFFEFEFF4.toInt(),
+                    button = 0xFF77777F.toInt(),
+                    buttonText = 0xFFEFEFF4.toInt(),
+                    buttonColors =
+                        mapOf(
+                            "A" to 0xFF2E63C9.toInt(),
+                            "B" to 0xFF2F9E44.toInt(),
+                            "START" to 0xFFC8362E.toInt(),
+                        ),
+                    stickCap = 0xFF9EA0A6.toInt(),
+                )
+            RetroSystems.GAMECUBE.id ->
+                RetroTheme(
+                    body = 0xFF6B6F78.toInt(),
+                    dpad = 0xFF3A3D44.toInt(),
+                    pill = 0xFF555861.toInt(),
+                    pillText = 0xFFEDEFF4.toInt(),
+                    button = 0xFF555861.toInt(),
+                    buttonText = 0xFFEDEFF4.toInt(),
+                    buttonColors =
+                        mapOf(
+                            "A" to 0xFF2F8F4E.toInt(),
+                            "B" to 0xFFC8362E.toInt(),
+                            "X" to 0xFFE8E8EC.toInt(),
+                            "Y" to 0xFFE8E8EC.toInt(),
+                            "START" to 0xFF3A3D44.toInt(),
+                            "Z" to 0xFF5B3FA0.toInt(),
+                        ),
+                    buttonTextColors =
+                        mapOf(
+                            "X" to 0xFF3A3D44.toInt(),
+                            "Y" to 0xFF3A3D44.toInt(),
+                        ),
+                    stickCap = 0xFF8A8E98.toInt(),
+                )
+            RetroSystems.WII.id ->
+                RetroTheme(
+                    body = 0xFFE4E6EA.toInt(),
+                    dpad = 0xFF2C2E34.toInt(),
+                    pill = 0xFFB8BCC4.toInt(),
+                    pillText = 0xFF2C2E34.toInt(),
+                    button = 0xFF2C2E34.toInt(),
+                    buttonText = 0xFFF2F4F8.toInt(),
+                    buttonColors =
+                        mapOf(
+                            "A" to 0xFF1BA0D8.toInt(),
+                            "B" to 0xFF2C2E34.toInt(),
+                            "X" to 0xFFD8DCE4.toInt(),
+                            "Y" to 0xFFD8DCE4.toInt(),
+                            "+" to 0xFF1BA0D8.toInt(),
+                            "START" to 0xFF1BA0D8.toInt(),
+                        ),
+                    buttonTextColors =
+                        mapOf(
+                            "X" to 0xFF2C2E34.toInt(),
+                            "Y" to 0xFF2C2E34.toInt(),
+                        ),
+                    stickCap = 0xFFC8CCD4.toInt(),
+                )
+            RetroSystems.GENESIS.id, RetroSystems.MASTER_SYSTEM.id, RetroSystems.GAME_GEAR.id ->
+                RetroTheme(
+                    body = 0xFF1D1D21.toInt(),
+                    dpad = 0xFF0E0E11.toInt(),
+                    pill = 0xFF2C2C33.toInt(),
+                    pillText = 0xFFB9B9C2.toInt(),
+                    button = 0xFF303038.toInt(),
+                    buttonText = 0xFFB9B9C2.toInt(),
+                )
+            RetroSystems.PSX.id, RetroSystems.PS2.id ->
+                RetroTheme(
+                    body = 0xFFB7B7C0.toInt(),
+                    dpad = 0xFF50505A.toInt(),
+                    pill = 0xFF5A5A64.toInt(),
+                    pillText = 0xFFE9E9F0.toInt(),
+                    button = 0xFF3D3D45.toInt(),
+                    buttonText = 0xFFE9E9F0.toInt(),
+                    buttonTextColors =
+                        mapOf(
+                            "△" to 0xFF43B26A.toInt(),
+                            "○" to 0xFFD64B45.toInt(),
+                            "✕" to 0xFF8FA9DF.toInt(),
+                            "□" to 0xFFD387BE.toInt(),
+                        ),
+                )
+            else ->
+                RetroTheme(
+                    body = 0xFFC9C6C1.toInt(),
+                    dpad = 0xFF2E2E33.toInt(),
+                    pill = 0xFF8A8A86.toInt(),
+                    pillText = 0xFF33333A.toInt(),
+                    button = 0xFF55555C.toInt(),
+                    buttonText = 0xFFEFEFF4.toInt(),
+                )
+        }
+
+    private var gameArea: RectF? = null
+    var hapticStrength = 0f
+    var adaptiveSticks: Boolean = false
+        set(value) {
+            if (field != value) {
+                field = value
+                stickActive = false
+                stick2Active = false
+                invalidate()
+            }
+        }
+    val supportsStickButtons: Boolean get() = config.hasDualSticks
+    var showL3R3: Boolean = true
+        set(value) {
+            if (field != value) {
+                field = value
+                if (width > 0 && height > 0) {
+                    relayout()
+                    invalidate()
+                }
+            }
+        }
+    var invertLX = false
+    var invertLY = false
+    var invertRX = false
+    var invertRY = false
+
+    fun loadStickInversion() {
+        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
+        val sys = system?.id ?: return
+        invertLX = prefs.getBoolean("retro_inv_lx_$sys", false)
+        invertLY = prefs.getBoolean("retro_inv_ly_$sys", false)
+        invertRX = prefs.getBoolean("retro_inv_rx_$sys", false)
+        invertRY = prefs.getBoolean("retro_inv_ry_$sys", false)
+    }
+
+    private fun ix(v: Float, inv: Boolean) = if (inv) -v else v
+    private val vibrator: Vibrator? = context.getSystemService(Vibrator::class.java)
+
+    var editMode = false
+        private set
+    var onEditStateChanged: ((Boolean) -> Unit)? = null
+    private var customColors = RetroCustomColors()
+    private var overrides: MutableMap<String, RetroControlOverride> = mutableMapOf()
+    private var overridesLoaded = false
+    private var overridesPortrait = false
+    private var selectedId: String? = null
+    private var dragId: String? = null
+    private var dragPointerId = -1
+    private var dragOffsetX = 0f
+    private var dragOffsetY = 0f
+    private var dragActive = false
+    private var dragDownX = 0f
+    private var dragDownY = 0f
+    private var swallowInput = false
+    private var dpadVisible = true
+    private var stickVisible = true
+    private var stick2Visible = true
+    private val hiddenControls = mutableListOf<Pair<String, String>>()
+    private val toolbarPills = mutableListOf<Triple<String, String, RectF>>()
+    private val trayPills = mutableListOf<Triple<String, String, RectF>>()
+
+    private val editUnit: Float
+        get() = snap * (if (height > width) 2f else 1f)
+
+    fun setCustomColors(colors: RetroCustomColors) {
+        customColors = colors
+        invalidate()
+    }
+
+    private fun cancelDrag() {
+        dragId = null
+        dragPointerId = -1
+        dragActive = false
+    }
+
+    fun enterEdit() {
+        if (editMode) return
+        releaseAll()
+        editMode = true
+        selectedId = null
+        cancelDrag()
+        onEditStateChanged?.invoke(true)
+        relayout()
+    }
+
+    fun finishEdit() {
+        if (!editMode) return
+        editMode = false
+        selectedId = null
+        cancelDrag()
+        swallowInput = true
+        saveOverrides()
+        onEditStateChanged?.invoke(false)
+        relayout()
+    }
+
+    fun resetLayout() {
+        overrides.clear()
+        RetroControlLayouts.reset(context, system?.id, height > width)
+        selectedId = null
+        relayout()
+    }
+
+    private fun saveOverrides() {
+        RetroControlLayouts.save(context, system?.id, height > width, overrides)
+    }
+
+    fun setGameArea(area: RectF?) {
+        if (area == gameArea) return
+        gameArea = area
+        relayout()
+    }
+
+    private fun hapticTick() {
+        if (hapticStrength <= 0.01f) return
+        val amplitude = (hapticStrength * 255f).toInt().coerceIn(1, 255)
+        runCatching { vibrator?.vibrate(VibrationEffect.createOneShot(15, amplitude.toInt())) }
+    }
+
+    private fun mix(
+        a: Int,
+        b: Int,
+        f: Float,
+    ): Int {
+        val inv = 1f - f
+        return Color.argb(
+            255,
+            (Color.red(a) * inv + Color.red(b) * f).toInt(),
+            (Color.green(a) * inv + Color.green(b) * f).toInt(),
+            (Color.blue(a) * inv + Color.blue(b) * f).toInt(),
+        )
+    }
+
+    private fun lighten(
+        color: Int,
+        f: Float,
+    ) = mix(color, Color.WHITE, f)
+
+    private fun darken(
+        color: Int,
+        f: Float,
+    ) = mix(color, Color.BLACK, f)
+
+    private var dpadCx = 0f
+    private var dpadCy = 0f
+    private var dpadRadius = 0f
+
+    private var stickCx = 0f
+    private var stickCy = 0f
+    private var stickRadius = 0f
+    private var stickPointerId = -1
+    private var stickX = 0f
+    private var stickY = 0f
+    private var stick2Cx = 0f
+    private var stick2Cy = 0f
+    private var stick2Radius = 0f
+    private var stick2PointerId = -1
+    private var stick2X = 0f
+    private var stick2Y = 0f
+
+    private var stickActive = false
+    private var stickOriginX = 0f
+    private var stickOriginY = 0f
+    private var stick2Active = false
+    private var stick2OriginX = 0f
+    private var stick2OriginY = 0f
+
+    private val DOUBLE_TAP_MS = 500L
+    private val TAP_MAX_MS = 300L
+    private val TAP_MAX_MAG = 0.35f
+    private val DEAD_ZONE_PX = 10f
+
+    private val DPAD_AXIS_SWAP_BIAS = 1.35f
+    private val FACE_KEYCODES = setOf(
+        KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_BUTTON_B,
+        KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_Y,
+    )
+    private var stickDownTime = 0L
+    private var stickMaxMag = 0f
+    private var stickLastTapTime = 0L
+    private var stickL3Held = false
+    private var stick2DownTime = 0L
+    private var stick2MaxMag = 0f
+    private var stick2LastTapTime = 0L
+    private var stickR3Held = false
+
+    private val pressedButtons = HashSet<Int>()
+    private var dpadX = 0f
+    private var dpadY = 0f
+    private var menuLatched = false
+
+    private val pointerButton = HashMap<Int, Int>()
+    private val pointerCButton = HashMap<Int, CButton>()
+    private var dpadPointerId = -1
+    private var menuPointerId = -1
+
+    private var strokeWidth = 4f
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val path = Path()
+    private val arrowCenter = FloatArray(2)
+
+    init {
+        isFocusable = false
+        isFocusableInTouchMode = false
+    }
+
+    override fun onSizeChanged(
+        w: Int,
+        h: Int,
+        oldw: Int,
+        oldh: Int,
+    ) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        relayout()
+    }
+
+    fun relayout() {
+        val width = width.toFloat()
+        val height = height.toFloat()
+        if (width <= 0f || height <= 0f) return
+        val portrait = height > width
+        if (!overridesLoaded || overridesPortrait != portrait) {
+            overrides = RetroControlLayouts.load(context, system?.id, portrait)
+            overridesLoaded = true
+            overridesPortrait = portrait
+            cancelDrag()
+        }
+        buttons.clear()
+        cButtons.clear()
+        if (portrait) {
+            layoutPortrait(width, height)
+        } else {
+            layoutLandscape(width, height)
+        }
+        applyOverrides(width, height)
+        if (editMode) layoutEditChrome(width, height)
+        invalidate()
+    }
+
+    private fun idFor(button: GlassButton): String =
+        if (button === menuButton) {
+            "menu"
+        } else {
+            when (button.keyCode) {
+                KeyEvent.KEYCODE_BUTTON_A -> "btn_a"
+                KeyEvent.KEYCODE_BUTTON_B -> "btn_b"
+                KeyEvent.KEYCODE_BUTTON_X -> "btn_x"
+                KeyEvent.KEYCODE_BUTTON_Y -> "btn_y"
+                KeyEvent.KEYCODE_BUTTON_L1 -> "l1"
+                KeyEvent.KEYCODE_BUTTON_R1 -> "r1"
+                KeyEvent.KEYCODE_BUTTON_L2 -> "l2"
+                KeyEvent.KEYCODE_BUTTON_R2 -> "r2"
+                KeyEvent.KEYCODE_BUTTON_THUMBL -> "l3"
+                KeyEvent.KEYCODE_BUTTON_THUMBR -> "r3"
+                KeyEvent.KEYCODE_BUTTON_START -> "start"
+                KeyEvent.KEYCODE_BUTTON_SELECT -> "select"
+                else -> "btn_${button.keyCode}"
+            }
+        }
+
+    private fun reposition(
+        button: GlassButton,
+        o: RetroControlOverride,
+        w: Float,
+        h: Float,
+    ) {
+        val hw = button.bounds.width() * 0.5f * o.scale
+        val hh = button.bounds.height() * 0.5f * o.scale
+        button.bounds.set(o.x * w - hw, o.y * h - hh, o.x * w + hw, o.y * h + hh)
+    }
+
+    private fun applyOverrides(
+        w: Float,
+        h: Float,
+    ) {
+        dpadVisible = true
+        stickVisible = true
+        stick2Visible = true
+        hiddenControls.clear()
+        var hideCpad = false
+        overrides.forEach { (id, o) ->
+            when (id) {
+                "dpad" ->
+                    if (!o.visible) {
+                        dpadVisible = false
+                        hiddenControls += id to "DPAD"
+                    } else {
+                        dpadCx = o.x * w
+                        dpadCy = o.y * h
+                        dpadRadius *= o.scale
+                    }
+                "stick" ->
+                    if (config.hasStick || config.hasDualSticks) {
+                        if (!o.visible) {
+                            stickVisible = false
+                            hiddenControls += id to if (config.hasDualSticks) "L-STICK" else "STICK"
+                        } else {
+                            stickCx = o.x * w
+                            stickCy = o.y * h
+                            stickRadius *= o.scale
+                        }
+                    }
+                "stick2" ->
+                    if (config.hasDualSticks) {
+                        if (!o.visible) {
+                            stick2Visible = false
+                            hiddenControls += id to "R-STICK"
+                        } else {
+                            stick2Cx = o.x * w
+                            stick2Cy = o.y * h
+                            stick2Radius *= o.scale
+                        }
+                    }
+                "cpad" ->
+                    if (cButtons.isNotEmpty()) {
+                        if (!o.visible) {
+                            hideCpad = true
+                            hiddenControls += id to "C-PAD"
+                        } else {
+                            val cx = cButtons.map { it.bounds.centerX() }.average().toFloat()
+                            val cy = cButtons.map { it.bounds.centerY() }.average().toFloat()
+                            val nx = o.x * w
+                            val ny = o.y * h
+                            cButtons.forEach { c ->
+                                val rx = (c.bounds.centerX() - cx) * o.scale
+                                val ry = (c.bounds.centerY() - cy) * o.scale
+                                val half = c.bounds.width() * 0.5f * o.scale
+                                c.bounds.set(nx + rx - half, ny + ry - half, nx + rx + half, ny + ry + half)
+                            }
+                        }
+                    }
+                "menu" -> reposition(menuButton, o, w, h)
+                else -> {
+                    val target = buttons.firstOrNull { idFor(it) == id } ?: return@forEach
+                    if (!o.visible) {
+                        buttons.remove(target)
+                        hiddenControls += id to target.label
+                    } else {
+                        reposition(target, o, w, h)
+                    }
+                }
+            }
+        }
+        if (hideCpad) cButtons.clear()
+        if (selectedId != null && controlRect(selectedId!!) == null) selectedId = null
+    }
+
+    private fun controlRect(id: String): RectF? =
+        when (id) {
+            "dpad" ->
+                if (dpadVisible && dpadRadius > 0f) {
+                    RectF(dpadCx - dpadRadius, dpadCy - dpadRadius, dpadCx + dpadRadius, dpadCy + dpadRadius)
+                } else {
+                    null
+                }
+            "stick" ->
+                if ((config.hasStick || config.hasDualSticks) && stickVisible && stickRadius > 0f) {
+                    RectF(stickCx - stickRadius, stickCy - stickRadius, stickCx + stickRadius, stickCy + stickRadius)
+                } else {
+                    null
+                }
+            "stick2" ->
+                if (config.hasDualSticks && stick2Visible && stick2Radius > 0f) {
+                    RectF(
+                        stick2Cx - stick2Radius,
+                        stick2Cy - stick2Radius,
+                        stick2Cx + stick2Radius,
+                        stick2Cy + stick2Radius,
+                    )
+                } else {
+                    null
+                }
+            "cpad" ->
+                if (cButtons.isNotEmpty()) {
+                    RectF(
+                        cButtons.minOf { it.bounds.left },
+                        cButtons.minOf { it.bounds.top },
+                        cButtons.maxOf { it.bounds.right },
+                        cButtons.maxOf { it.bounds.bottom },
+                    )
+                } else {
+                    null
+                }
+            "menu" -> menuButton.bounds
+            else -> buttons.firstOrNull { idFor(it) == id }?.bounds
+        }
+
+    private fun allControlIds(): List<String> =
+        buildList {
+            addAll(buttons.map { idFor(it) })
+            add("menu")
+            add("dpad")
+            if (config.hasStick || config.hasDualSticks) add("stick")
+            if (config.hasDualSticks) add("stick2")
+            add("cpad")
+        }
+
+    private fun ensureOverride(id: String): RetroControlOverride {
+        overrides[id]?.let { return it }
+        val r = controlRect(id)
+        val o =
+            RetroControlOverride(
+                (r?.centerX() ?: width * 0.5f) / width,
+                (r?.centerY() ?: height * 0.5f) / height,
+            )
+        overrides[id] = o
+        return o
+    }
+
+    private fun moveControl(
+        id: String,
+        cx: Float,
+        cy: Float,
+    ) {
+        val o = ensureOverride(id)
+        o.x = (cx / width).coerceIn(0.02f, 0.98f)
+        o.y = (cy / height).coerceIn(0.02f, 0.98f)
+        relayout()
+    }
+
+    private fun scaleControl(
+        id: String,
+        delta: Float,
+    ) {
+        val o = ensureOverride(id)
+        o.scale = (o.scale + delta).coerceIn(0.6f, 1.8f)
+        saveOverrides()
+        relayout()
+    }
+
+    private fun setControlVisible(
+        id: String,
+        visible: Boolean,
+    ) {
+        val o = ensureOverride(id)
+        o.visible = visible
+        saveOverrides()
+        relayout()
+    }
+
+    private fun layoutLandscape(
+        width: Float,
+        height: Float,
+    ) {
+        if (config.hasStick) {
+            layoutN64(width, height)
+            return
+        }
+        snap = width / 100f
+        val margin = snap * 2.5f
+        val bottomGap = snap * 9f
+        var faceRadius = snap * 3f
+        strokeWidth = max(2f, snap * 0.18f)
+
+        val trigW = snap * 10.4f
+        val trigH = snap * 5.2f
+        val trigGap = snap * 1.5f
+
+        var leftCursor = margin
+        var rightCursor = margin
+        if (config.hasTriggers) {
+            val lt =
+                GlassButton(KeyEvent.KEYCODE_BUTTON_L2, config.leftTriggerLabel, GlassShape.TRIGGER_LT, textScale = 1.3f)
+            lt.bounds.set(margin, leftCursor, margin + trigW, leftCursor + trigH)
+            buttons += lt
+            leftCursor += trigH + trigGap
+            if (config.showRightTrigger) {
+                val rt =
+                    GlassButton(
+                        KeyEvent.KEYCODE_BUTTON_R2,
+                        config.rightTriggerLabel,
+                        GlassShape.TRIGGER_RT,
+                        textScale = 1.3f,
+                    )
+                rt.bounds.set(width - margin - trigW, rightCursor, width - margin, rightCursor + trigH)
+                buttons += rt
+                rightCursor += trigH + trigGap
+            }
+        }
+        if (config.hasShoulders) {
+            val leftShape = if (config.hasTriggers) GlassShape.TRIGGER_LB else GlassShape.TRIGGER_LT
+            val rightShape = if (config.hasTriggers) GlassShape.TRIGGER_RB else GlassShape.TRIGGER_RT
+            if (config.showLeftShoulder) {
+                val lb =
+                    GlassButton(
+                        KeyEvent.KEYCODE_BUTTON_L1,
+                        config.leftShoulderLabel,
+                        leftShape,
+                        textScale = 1.3f,
+                    )
+                lb.bounds.set(margin, leftCursor, margin + trigW, leftCursor + trigH)
+                buttons += lb
+            }
+            val rb =
+                GlassButton(
+                    KeyEvent.KEYCODE_BUTTON_R1,
+                    config.rightShoulderLabel,
+                    rightShape,
+                    textScale = 1.3f,
+                )
+            rb.bounds.set(width - margin - trigW, rightCursor, width - margin, rightCursor + trigH)
+            buttons += rb
+            leftCursor += trigH + trigGap
+        }
+
+        var spread = snap * 5.5f
+        var clusterCx = width - margin - faceRadius - spread
+        val rightBarWidth = gameArea?.let { width - it.right } ?: 0f
+        if (rightBarWidth > snap * 8f) {
+            val clusterHalf = if (config.hasXY) faceRadius + spread else faceRadius * 2.45f
+            val avail = rightBarWidth * 0.5f - snap
+            if (clusterHalf > avail) {
+                val fit = (avail / clusterHalf).coerceAtLeast(0.62f)
+                faceRadius *= fit
+                spread *= fit
+            }
+            clusterCx = width - rightBarWidth * 0.5f
+        }
+        val clusterCy =
+            if (config.hasDualSticks) {
+                dpadCy - dpadRadius + spread + faceRadius
+            } else {
+                height - bottomGap - faceRadius - spread
+            }
+        var clusterTop = height
+        fun addFace(
+            keyCode: Int,
+            label: String,
+            cx: Float,
+            cy: Float,
+        ) {
+            val button = GlassButton(keyCode, label, GlassShape.CIRCLE, textScale = faceGlyphScale(label))
+            button.bounds.set(cx - faceRadius, cy - faceRadius, cx + faceRadius, cy + faceRadius)
+            buttons += button
+            clusterTop = min(clusterTop, button.bounds.top)
+        }
+        if (config.hasXY) {
+            addFace(KeyEvent.KEYCODE_BUTTON_X, config.faceTop, clusterCx, clusterCy - spread)
+            addFace(KeyEvent.KEYCODE_BUTTON_B, config.faceBottom, clusterCx, clusterCy + spread)
+            addFace(KeyEvent.KEYCODE_BUTTON_Y, config.faceLeft, clusterCx - spread, clusterCy)
+            addFace(KeyEvent.KEYCODE_BUTTON_A, config.faceRight, clusterCx + spread, clusterCy)
+        } else if (config.flatFaces) {
+            addFace(KeyEvent.KEYCODE_BUTTON_B, "B", clusterCx - faceRadius * 1.35f, clusterCy + spread * 0.5f)
+            addFace(KeyEvent.KEYCODE_BUTTON_A, "A", clusterCx + faceRadius * 1.35f, clusterCy + spread * 0.5f)
+        } else {
+            addFace(KeyEvent.KEYCODE_BUTTON_B, "B", clusterCx - faceRadius * 1.1f, clusterCy + spread * 0.5f + faceRadius * 0.5f)
+            addFace(KeyEvent.KEYCODE_BUTTON_A, "A", clusterCx + faceRadius * 1.1f, clusterCy + spread * 0.5f - faceRadius * 1.1f)
+        }
+
+        val pillW = snap * 6f
+        val pillH = snap * 3f
+        val pillGap = snap * 1.2f
+        stickRadius = 0f
+        dpadRadius = snap * 7.5f
+        dpadCx = margin + dpadRadius
+        val leftBarWidth = gameArea?.left ?: 0f
+        if (leftBarWidth > snap * 8f) {
+            val avail = leftBarWidth - snap * 2f
+            if (dpadRadius * 2f > avail) dpadRadius = (avail * 0.5f).coerceAtLeast(snap * 5f)
+            dpadCx = leftBarWidth * 0.5f
+        }
+        dpadCy = height - bottomGap - dpadRadius
+
+        if (config.hasDualSticks) {
+            stickRadius = snap * 5.5f
+            stick2Radius = stickRadius
+            dpadCy -= stickRadius * 0.9f
+            stickCx = dpadCx + dpadRadius + snap * 0.8f + stickRadius
+            stickCy = height - snap * 4.5f - stickRadius
+            stick2Cx = width - stickCx
+            stick2Cy = stickCy
+
+            if (showL3R3) {
+            val l3r = faceRadius * 0.82f
+            val l3cy = height - snap * 3.2f - l3r
+            val l3cx = margin + l3r + snap * 0.5f
+            val r3cx = width - margin - l3r - snap * 0.5f
+            val l3 = GlassButton(KeyEvent.KEYCODE_BUTTON_THUMBL, "L3", GlassShape.CIRCLE, textScale = 0.8f)
+            l3.bounds.set(l3cx - l3r, l3cy - l3r, l3cx + l3r, l3cy + l3r)
+            buttons += l3
+            val r3 = GlassButton(KeyEvent.KEYCODE_BUTTON_THUMBR, "R3", GlassShape.CIRCLE, textScale = 0.8f)
+            r3.bounds.set(r3cx - l3r, l3cy - l3r, r3cx + l3r, l3cy + l3r)
+            buttons += r3
+            }
+        }
+
+        if (config.hasTriggers && config.hasXY) {
+            val rowY = height - snap * 2.5f - pillH
+            var pillX = (width - pillW * 3f - pillGap * 2f) * 0.5f
+            menuButton.bounds.set(pillX, rowY, pillX + pillW, rowY + pillH)
+            pillX += pillW + pillGap
+            val select = GlassButton(KeyEvent.KEYCODE_BUTTON_SELECT, "SELECT", GlassShape.PILL, textScale = 0.75f)
+            select.bounds.set(pillX, rowY, pillX + pillW, rowY + pillH)
+            buttons += select
+            pillX += pillW + pillGap
+            val start = GlassButton(KeyEvent.KEYCODE_BUTTON_START, "START", GlassShape.PILL, textScale = 0.75f)
+            start.bounds.set(pillX, rowY, pillX + pillW, rowY + pillH)
+            buttons += start
+            return
+        }
+
+        val pillY = clusterTop - pillH - snap * 3.5f
+        val start = GlassButton(KeyEvent.KEYCODE_BUTTON_START, "START", GlassShape.PILL, textScale = 0.75f)
+        start.bounds.set(width - margin - pillW, pillY, width - margin, pillY + pillH)
+        buttons += start
+        val select = GlassButton(KeyEvent.KEYCODE_BUTTON_SELECT, "SELECT", GlassShape.PILL, textScale = 0.75f)
+        select.bounds.set(
+            width - margin - pillW * 2 - pillGap,
+            pillY,
+            width - margin - pillW - pillGap,
+            pillY + pillH,
+        )
+        buttons += select
+
+        val menuW = snap * 6f
+        val menuY =
+            min(
+                max(pillY, leftCursor),
+                dpadCy - dpadRadius - pillH - snap * 3f,
+            )
+        menuButton.bounds.set(dpadCx - menuW * 0.5f, menuY, dpadCx + menuW * 0.5f, menuY + pillH)
+    }
+
+    private fun layoutN64(
+        width: Float,
+        height: Float,
+    ) {
+        snap = width / 100f
+        strokeWidth = max(2f, snap * 0.18f)
+        val margin = snap * 2.5f
+        val trigW = snap * 10.4f
+        val trigH = snap * 5.2f
+        val trigGap = snap * 1.5f
+
+        val lb = GlassButton(KeyEvent.KEYCODE_BUTTON_L1, "L", GlassShape.TRIGGER_LT, textScale = 1.3f)
+        lb.bounds.set(margin, margin, margin + trigW, margin + trigH)
+        buttons += lb
+        val rb = GlassButton(KeyEvent.KEYCODE_BUTTON_R1, "R", GlassShape.TRIGGER_RT, textScale = 1.3f)
+        rb.bounds.set(width - margin - trigW, margin, width - margin, margin + trigH)
+        buttons += rb
+        val z =
+            GlassButton(KeyEvent.KEYCODE_BUTTON_L2, config.leftTriggerLabel, GlassShape.TRIGGER_RB, textScale = 1.3f)
+        z.bounds.set(
+            width - margin - trigW,
+            margin + trigH + trigGap,
+            width - margin,
+            margin + trigH * 2 + trigGap,
+        )
+        buttons += z
+
+        val faceRadius = snap * 3f
+        val spread = snap * 5.5f
+        var clusterCx = width - margin - faceRadius - spread
+        val rightBarWidth = gameArea?.let { width - it.right } ?: 0f
+        if (rightBarWidth >= (faceRadius + spread) * 2f + snap * 2f) {
+            clusterCx = width - rightBarWidth * 0.5f
+        }
+        val clusterCy = height - snap * 4.5f - faceRadius - spread
+        val bCx = clusterCx - faceRadius * 0.9f
+        val bCy = clusterCy + spread * 0.5f - faceRadius * 0.9f
+        val bButton = GlassButton(KeyEvent.KEYCODE_BUTTON_Y, "B", GlassShape.CIRCLE)
+        bButton.bounds.set(bCx - faceRadius, bCy - faceRadius, bCx + faceRadius, bCy + faceRadius)
+        buttons += bButton
+        val aCx = clusterCx + faceRadius * 0.9f
+        val aCy = clusterCy + spread * 0.5f + faceRadius * 0.9f
+        val aButton = GlassButton(KeyEvent.KEYCODE_BUTTON_B, "A", GlassShape.CIRCLE)
+        aButton.bounds.set(aCx - faceRadius, aCy - faceRadius, aCx + faceRadius, aCy + faceRadius)
+        buttons += aButton
+
+        val pillW = snap * 6f
+        val pillH = snap * 3f
+        val pillGap = snap * 1.2f
+        val pillY = height - snap * 2.5f - pillH
+        var pillX = (width - pillW * 3f - pillGap * 2f) * 0.5f
+        menuButton.bounds.set(pillX, pillY, pillX + pillW, pillY + pillH)
+        pillX += pillW + pillGap
+        val select = GlassButton(KeyEvent.KEYCODE_BUTTON_SELECT, "SELECT", GlassShape.PILL, textScale = 0.75f)
+        select.bounds.set(pillX, pillY, pillX + pillW, pillY + pillH)
+        buttons += select
+        pillX += pillW + pillGap
+        val start = GlassButton(KeyEvent.KEYCODE_BUTTON_START, "START", GlassShape.PILL, textScale = 0.75f)
+        start.bounds.set(pillX, pillY, pillX + pillW, pillY + pillH)
+        buttons += start
+
+        stickRadius = snap * 7f
+        stickCx = margin + stickRadius + snap * 1f
+        val leftBarWidth = gameArea?.left ?: 0f
+        if (leftBarWidth >= stickRadius * 2f + snap * 2f) {
+            stickCx = leftBarWidth * 0.5f
+        }
+        stickCy = height - snap * 5.5f - stickRadius
+        dpadRadius = snap * 6.5f
+        dpadCx = stickCx
+        dpadCy = stickCy - stickRadius - snap * 2f - dpadRadius
+
+        val cRadius = snap * 2.4f
+        val cSpread = snap * 3.6f
+        val cCx = clusterCx + snap * 2f
+        val topOfFaces = bCy - faceRadius
+        val bottomOfTriggers = margin + trigH * 2 + trigGap
+        val cCy =
+            min(
+                (bottomOfTriggers + topOfFaces) * 0.5f + snap * 2f,
+                topOfFaces - snap * 1.5f - cSpread - cRadius,
+            )
+        fun addC(
+            dx: Float,
+            dy: Float,
+            glyph: String,
+            x: Float,
+            y: Float,
+        ) {
+            val c = CButton(dx, dy, glyph)
+            c.bounds.set(x - cRadius, y - cRadius, x + cRadius, y + cRadius)
+            cButtons += c
+        }
+        addC(0f, -1f, "▲", cCx, cCy - cSpread)
+        addC(0f, 1f, "▼", cCx, cCy + cSpread)
+        addC(-1f, 0f, "◀", cCx - cSpread, cCy)
+        addC(1f, 0f, "▶", cCx + cSpread, cCy)
+    }
+
+    private val portraitGameAspect: Float
+        get() =
+            when (system?.id) {
+                RetroSystems.GAMEBOY.id, RetroSystems.GAMEBOY_COLOR.id -> 0.9f
+                RetroSystems.GBA.id -> 2f / 3f
+                else -> 0.75f
+            }
+
+    private fun portraitZoneTop(
+        width: Float,
+        height: Float,
+    ): Float = max(width * portraitGameAspect + snap * 8f, height * 0.42f)
+
+    private fun layoutPortrait(
+        width: Float,
+        height: Float,
+    ) {
+        if (config.hasStick) {
+            layoutPortraitN64(width, height)
+            return
+        }
+        snap = width / 100f
+        strokeWidth = max(2f, snap * 0.4f)
+        stickRadius = 0f
+        val zoneTop = portraitZoneTop(width, height)
+        val zoneH = height - zoneTop
+        val margin = snap * 5f
+        val trigW = snap * 24f
+        val trigH = snap * 8f
+        val trigGap = snap * 1.5f
+
+        var sideCursor = zoneTop + snap * 2f
+        if (config.hasTriggers) {
+            val lt = GlassButton(KeyEvent.KEYCODE_BUTTON_L2, config.leftTriggerLabel, GlassShape.TRIGGER_LT, textScale = 1.3f)
+            lt.bounds.set(margin, sideCursor, margin + trigW, sideCursor + trigH)
+            buttons += lt
+            if (config.showRightTrigger) {
+                val rt =
+                    GlassButton(
+                        KeyEvent.KEYCODE_BUTTON_R2,
+                        config.rightTriggerLabel,
+                        GlassShape.TRIGGER_RT,
+                        textScale = 1.3f,
+                    )
+                rt.bounds.set(width - margin - trigW, sideCursor, width - margin, sideCursor + trigH)
+                buttons += rt
+            }
+            sideCursor += trigH + trigGap
+        }
+        if (config.hasShoulders) {
+            val leftShape = if (config.hasTriggers) GlassShape.TRIGGER_LB else GlassShape.TRIGGER_LT
+            val rightShape = if (config.hasTriggers) GlassShape.TRIGGER_RB else GlassShape.TRIGGER_RT
+            if (config.showLeftShoulder) {
+                val lb =
+                    GlassButton(
+                        KeyEvent.KEYCODE_BUTTON_L1,
+                        config.leftShoulderLabel,
+                        leftShape,
+                        textScale = 1.3f,
+                    )
+                lb.bounds.set(margin, sideCursor, margin + trigW, sideCursor + trigH)
+                buttons += lb
+            }
+            val rb =
+                GlassButton(
+                    KeyEvent.KEYCODE_BUTTON_R1,
+                    config.rightShoulderLabel,
+                    rightShape,
+                    textScale = 1.3f,
+                )
+            rb.bounds.set(width - margin - trigW, sideCursor, width - margin, sideCursor + trigH)
+            buttons += rb
+            sideCursor += trigH + trigGap
+        }
+
+        val rowCy = max(zoneTop + zoneH * 0.45f, sideCursor + snap * 18f)
+        dpadRadius = snap * 15f
+        dpadCx = margin + dpadRadius
+        dpadCy = rowCy
+
+        fun addFace(
+            keyCode: Int,
+            label: String,
+            cx: Float,
+            cy: Float,
+            radius: Float,
+        ) {
+            val button = GlassButton(keyCode, label, GlassShape.CIRCLE, textScale = faceGlyphScale(label))
+            button.bounds.set(cx - radius, cy - radius, cx + radius, cy + radius)
+            buttons += button
+        }
+        if (config.hasXY) {
+            val faceRadius = snap * 6.5f
+            val spread = snap * 12f
+            val clusterCx = width - margin - faceRadius - spread
+            addFace(KeyEvent.KEYCODE_BUTTON_X, config.faceTop, clusterCx, rowCy - spread, faceRadius)
+            addFace(KeyEvent.KEYCODE_BUTTON_B, config.faceBottom, clusterCx, rowCy + spread, faceRadius)
+            addFace(KeyEvent.KEYCODE_BUTTON_Y, config.faceLeft, clusterCx - spread, rowCy, faceRadius)
+            addFace(KeyEvent.KEYCODE_BUTTON_A, config.faceRight, clusterCx + spread, rowCy, faceRadius)
+        } else if (config.flatFaces) {
+            val faceRadius = snap * 8.5f
+            addFace(KeyEvent.KEYCODE_BUTTON_A, "A", width - margin - faceRadius, rowCy, faceRadius)
+            addFace(
+                KeyEvent.KEYCODE_BUTTON_B,
+                "B",
+                width - margin - faceRadius * 3.7f,
+                rowCy,
+                faceRadius,
+            )
+        } else {
+            val faceRadius = snap * 8.5f
+            addFace(KeyEvent.KEYCODE_BUTTON_A, "A", width - margin - faceRadius, rowCy - faceRadius * 0.9f, faceRadius)
+            addFace(
+                KeyEvent.KEYCODE_BUTTON_B,
+                "B",
+                width - margin - faceRadius * 3f - snap * 2f,
+                rowCy + faceRadius * 0.9f,
+                faceRadius,
+            )
+        }
+
+        val pillW = snap * 13f
+        val pillH = snap * 5.5f
+        val pillGap = snap * 2f
+        val pillY = height - margin - pillH
+        val select = GlassButton(KeyEvent.KEYCODE_BUTTON_SELECT, "SELECT", GlassShape.PILL, textScale = 0.75f)
+        select.bounds.set(width * 0.5f - pillGap * 0.5f - pillW, pillY, width * 0.5f - pillGap * 0.5f, pillY + pillH)
+        buttons += select
+        val start = GlassButton(KeyEvent.KEYCODE_BUTTON_START, "START", GlassShape.PILL, textScale = 0.75f)
+        start.bounds.set(width * 0.5f + pillGap * 0.5f, pillY, width * 0.5f + pillGap * 0.5f + pillW, pillY + pillH)
+        buttons += start
+
+        val menuW = snap * 13f
+        menuButton.bounds.set(
+            width * 0.5f - menuW * 0.5f,
+            zoneTop + snap * 1.5f,
+            width * 0.5f + menuW * 0.5f,
+            zoneTop + snap * 1.5f + pillH,
+        )
+    }
+
+    private fun layoutPortraitN64(
+        width: Float,
+        height: Float,
+    ) {
+        snap = width / 100f
+        strokeWidth = max(2f, snap * 0.4f)
+        val zoneTop = portraitZoneTop(width, height)
+        val margin = snap * 5f
+        val trigW = snap * 24f
+        val trigH = snap * 8f
+        val trigGap = snap * 1.5f
+
+        val lb = GlassButton(KeyEvent.KEYCODE_BUTTON_L1, "L", GlassShape.TRIGGER_LT, textScale = 1.3f)
+        lb.bounds.set(margin, zoneTop + snap * 2f, margin + trigW, zoneTop + snap * 2f + trigH)
+        buttons += lb
+        val rb = GlassButton(KeyEvent.KEYCODE_BUTTON_R1, "R", GlassShape.TRIGGER_RT, textScale = 1.3f)
+        rb.bounds.set(width - margin - trigW, zoneTop + snap * 2f, width - margin, zoneTop + snap * 2f + trigH)
+        buttons += rb
+        val z = GlassButton(KeyEvent.KEYCODE_BUTTON_L2, config.leftTriggerLabel, GlassShape.TRIGGER_RB, textScale = 1.3f)
+        z.bounds.set(
+            width - margin - trigW,
+            zoneTop + snap * 2f + trigH + trigGap,
+            width - margin,
+            zoneTop + snap * 2f + trigH * 2 + trigGap,
+        )
+        buttons += z
+
+        val pillW = snap * 13f
+        val pillH = snap * 5.5f
+        val pillGap = snap * 2f
+        val pillY = height - margin - pillH
+        val select = GlassButton(KeyEvent.KEYCODE_BUTTON_SELECT, "SELECT", GlassShape.PILL, textScale = 0.75f)
+        select.bounds.set(width * 0.5f - pillGap * 0.5f - pillW, pillY, width * 0.5f - pillGap * 0.5f, pillY + pillH)
+        buttons += select
+        val start = GlassButton(KeyEvent.KEYCODE_BUTTON_START, "START", GlassShape.PILL, textScale = 0.75f)
+        start.bounds.set(width * 0.5f + pillGap * 0.5f, pillY, width * 0.5f + pillGap * 0.5f + pillW, pillY + pillH)
+        buttons += start
+
+        val menuW = snap * 13f
+        menuButton.bounds.set(
+            width * 0.5f - menuW * 0.5f,
+            zoneTop + snap * 1.5f,
+            width * 0.5f + menuW * 0.5f,
+            zoneTop + snap * 1.5f + pillH,
+        )
+
+        stickRadius = snap * 12f
+        stickCx = margin + stickRadius
+        stickCy = pillY - snap * 2f - stickRadius
+        dpadRadius = snap * 10f
+        dpadCx = stickCx
+        dpadCy = stickCy - stickRadius - snap * 2f - dpadRadius
+
+        val faceRadius = snap * 7.5f
+        val clusterCx = width - margin - faceRadius - snap * 9f
+        val aCy = stickCy
+        val aCx = clusterCx + faceRadius * 0.9f
+        val bCx = clusterCx - faceRadius * 0.9f
+        val bCy = aCy - faceRadius * 1.8f
+        val bButton = GlassButton(KeyEvent.KEYCODE_BUTTON_Y, "B", GlassShape.CIRCLE)
+        bButton.bounds.set(bCx - faceRadius, bCy - faceRadius, bCx + faceRadius, bCy + faceRadius)
+        buttons += bButton
+        val aButton = GlassButton(KeyEvent.KEYCODE_BUTTON_B, "A", GlassShape.CIRCLE)
+        aButton.bounds.set(aCx - faceRadius, aCy - faceRadius, aCx + faceRadius, aCy + faceRadius)
+        buttons += aButton
+
+        val cRadius = snap * 4.5f
+        val cSpread = snap * 6.5f
+        val cCx = clusterCx + snap * 1f
+        val shouldersBottom = zoneTop + snap * 2f + trigH * 2 + trigGap
+        val facesTop = bCy - faceRadius
+        val cCy = (shouldersBottom + facesTop) * 0.5f
+        fun addC(
+            dx: Float,
+            dy: Float,
+            glyph: String,
+            x: Float,
+            y: Float,
+        ) {
+            val c = CButton(dx, dy, glyph)
+            c.bounds.set(x - cRadius, y - cRadius, x + cRadius, y + cRadius)
+            cButtons += c
+        }
+        addC(0f, -1f, "▲", cCx, cCy - cSpread)
+        addC(0f, 1f, "▼", cCx, cCy + cSpread)
+        addC(-1f, 0f, "◀", cCx - cSpread, cCy)
+        addC(1f, 0f, "▶", cCx + cSpread, cCy)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        if (gameArea == null && !editMode) return
+        paint.strokeJoin = Paint.Join.ROUND
+        paint.strokeCap = Paint.Cap.ROUND
+        drawShellBackground(canvas)
+        if (editMode) canvas.drawColor(0x2E000000)
+        drawClusterPlate(canvas)
+        drawFacePlate(canvas)
+        if (dpadVisible) drawDpad(canvas)
+        val adaptive = adaptiveSticks && !editMode
+        if ((config.hasStick || config.hasDualSticks) && stickVisible && (!adaptive || stickActive)) {
+            drawStick(canvas, if (adaptive) stickOriginX else stickCx, if (adaptive) stickOriginY else stickCy)
+        }
+        if (config.hasDualSticks && stick2Visible && (!adaptive || stick2Active)) {
+            drawStick2(canvas, adaptive)
+        }
+        buttons.forEach { drawThemedButton(canvas, it, pressedButtons.contains(it.keyCode)) }
+        cButtons.forEach { drawCButton(canvas, it) }
+        drawThemedButton(canvas, menuButton, menuLatched)
+        if (editMode) drawEditChrome(canvas)
+    }
+
+    private fun shadowTint(alpha: Int): Int {
+        val c = customColors.shadow ?: return Color.argb(alpha, 0, 0, 0)
+        return Color.argb(alpha, Color.red(c), Color.green(c), Color.blue(c))
+    }
+
+    private fun luminance(color: Int): Float =
+        (0.299f * Color.red(color) + 0.587f * Color.green(color) + 0.114f * Color.blue(color)) / 255f
+
+    private fun drawShellBackground(canvas: Canvas) {
+        val area = gameArea ?: return
+        val w = width.toFloat()
+        val h = height.toFloat()
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+        paint.color = customColors.body ?: theme.body
+        if (area.top > 0f) canvas.drawRect(0f, 0f, w, area.top, paint)
+        if (area.bottom < h) canvas.drawRect(0f, area.bottom, w, h, paint)
+        if (area.left > 0f) canvas.drawRect(0f, area.top, area.left, area.bottom, paint)
+        if (area.right < w) canvas.drawRect(area.right, area.top, w, area.bottom, paint)
+    }
+
+    private fun drawFacePlate(canvas: Canvas) {
+        if (theme.backplate == 0) return
+        val faces = buttons.filter { it.shape == GlassShape.CIRCLE }
+        if (faces.isEmpty()) return
+        val pad = faces.first().bounds.width() * 0.28f
+        val left = faces.minOf { it.bounds.left } - pad
+        val top = faces.minOf { it.bounds.top } - pad
+        val right = faces.maxOf { it.bounds.right } + pad
+        val bottom = faces.maxOf { it.bounds.bottom } + pad
+        if (right - left > faces.first().bounds.width() * 3.6f ||
+            bottom - top > faces.first().bounds.height() * 3.6f
+        ) {
+            return
+        }
+        val corner = (bottom - top) * 0.24f
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+        paint.color = theme.backplate
+        canvas.drawRoundRect(left, top, right, bottom, corner, corner, paint)
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(theme.backplate, 0.16f)
+        canvas.drawRoundRect(left, top, right, bottom, corner, corner, paint)
+    }
+
+    private fun drawClusterPlate(canvas: Canvas) {
+        if (theme.clusterPlate == 0 || !config.hasXY) return
+        val faces = buttons.filter { it.shape == GlassShape.CIRCLE }
+        if (faces.size < 3) return
+        val cx = faces.map { it.bounds.centerX() }.average().toFloat()
+        val cy = faces.map { it.bounds.centerY() }.average().toFloat()
+        val reach =
+            faces.maxOf {
+                hypot(it.bounds.centerX() - cx, it.bounds.centerY() - cy) + it.bounds.width() * 0.5f
+            }
+        if (reach > faces.first().bounds.width() * 2.2f) return
+        val radius = reach + snap * 1.4f
+        paint.shader =
+            RadialGradient(
+                cx,
+                cy,
+                radius,
+                intArrayOf(theme.clusterPlate, theme.clusterPlate, darken(theme.clusterPlate, 0.12f)),
+                floatArrayOf(0f, 0.8f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        paint.style = Paint.Style.FILL
+        canvas.drawCircle(cx, cy, radius, paint)
+        paint.shader = null
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(theme.clusterPlate, 0.22f)
+        canvas.drawCircle(cx, cy, radius, paint)
+    }
+
+    private fun buttonFill(button: GlassButton): Int =
+        customColors.button
+            ?: theme.buttonColors[button.label]
+            ?: if (button.shape == GlassShape.CIRCLE) theme.button else theme.pill
+
+    private fun buttonTextColor(button: GlassButton): Int =
+        customColors.text
+            ?: theme.buttonTextColors[button.label]
+            ?: if (button.shape == GlassShape.CIRCLE) theme.buttonText else theme.pillText
+
+    private fun drawThemedButton(
+        canvas: Canvas,
+        button: GlassButton,
+        pressed: Boolean,
+    ) {
+        val b = button.bounds
+        val color = buttonFill(button)
+        if (button.shape == GlassShape.CIRCLE) {
+            drawRoundButton(
+                canvas,
+                b.centerX(),
+                b.centerY(),
+                b.width() * 0.5f,
+                color,
+                buttonTextColor(button),
+                button.label,
+                pressed,
+                if (button.label.length > 1) 0.62f else 0.92f * button.textScale,
+            )
+            return
+        }
+        val depth = b.height() * 0.08f
+        val dy = if (pressed) depth * 0.7f else 0f
+        buildShapePath(button)
+        path.offset(0f, depth)
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+        paint.color = shadowTint(if (pressed) 40 else 70)
+        canvas.drawPath(path, paint)
+        buildShapePath(button)
+        path.offset(0f, dy)
+        paint.alpha = 255
+        paint.shader =
+            LinearGradient(
+                b.left,
+                b.top + dy,
+                b.left,
+                b.bottom + dy,
+                intArrayOf(
+                    lighten(color, if (pressed) 0.06f else 0.24f),
+                    color,
+                    darken(color, if (pressed) 0.24f else 0.14f),
+                ),
+                floatArrayOf(0f, 0.5f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawPath(path, paint)
+        paint.shader = null
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(color, 0.38f)
+        canvas.drawPath(path, paint)
+        paint.style = Paint.Style.FILL
+        paint.color = buttonTextColor(button)
+        paint.textAlign = Paint.Align.CENTER
+        paint.isFakeBoldText = true
+        paint.textSize = b.height() * (if (button.shape == GlassShape.PILL) 0.44f else 0.5f) * button.textScale / 0.75f * 0.75f
+        val maxTextWidth = b.width() - b.height() * 0.5f
+        if (button.label.isNotEmpty() && paint.measureText(button.label) > maxTextWidth) {
+            paint.textSize = paint.textSize * maxTextWidth / paint.measureText(button.label)
+        }
+        val textY = b.centerY() + dy - (paint.descent() + paint.ascent()) * 0.5f
+        canvas.drawText(button.label, b.centerX(), textY, paint)
+        paint.isFakeBoldText = false
+    }
+
+    private fun drawRoundButton(
+        canvas: Canvas,
+        cx: Float,
+        cy: Float,
+        radius: Float,
+        color: Int,
+        textColor: Int,
+        label: String,
+        pressed: Boolean,
+        textScale: Float,
+    ) {
+        val depth = radius * 0.12f
+        val dy = if (pressed) depth * 0.7f else 0f
+        val bodyCy = cy + dy
+
+        paint.style = Paint.Style.FILL
+        paint.alpha = 255
+        paint.shader =
+            RadialGradient(
+                cx,
+                cy + depth,
+                radius * 1.18f,
+                shadowTint(if (pressed) 55 else 95),
+                Color.TRANSPARENT,
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(cx, cy + depth, radius * 1.18f, paint)
+
+        paint.shader =
+            RadialGradient(
+                cx - radius * 0.35f,
+                bodyCy - radius * 0.45f,
+                radius * 1.9f,
+                intArrayOf(
+                    lighten(color, if (pressed) 0.08f else 0.3f),
+                    color,
+                    darken(color, if (pressed) 0.28f else 0.16f),
+                ),
+                floatArrayOf(0f, 0.55f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(cx, bodyCy, radius, paint)
+        paint.shader = null
+
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(color, 0.4f)
+        canvas.drawCircle(cx, bodyCy, radius - strokeWidth * 0.5f, paint)
+
+        if (!pressed) {
+            paint.style = Paint.Style.FILL
+            paint.shader =
+                RadialGradient(
+                    cx - radius * 0.34f,
+                    bodyCy - radius * 0.4f,
+                    radius * 0.62f,
+                    Color.argb(70, 255, 255, 255),
+                    Color.TRANSPARENT,
+                    Shader.TileMode.CLAMP,
+                )
+            canvas.drawCircle(cx - radius * 0.34f, bodyCy - radius * 0.4f, radius * 0.62f, paint)
+            paint.shader = null
+        }
+
+        if (label.isNotEmpty()) {
+            paint.style = Paint.Style.FILL
+            paint.color = textColor
+            paint.textAlign = Paint.Align.CENTER
+            paint.isFakeBoldText = true
+            paint.textSize = radius * textScale * 1.05f
+            val maxTextWidth = radius * (if (label.length == 1) 2.4f else 1.7f)
+            if (paint.measureText(label) > maxTextWidth) {
+                paint.textSize = paint.textSize * maxTextWidth / paint.measureText(label)
+            }
+            val textY = bodyCy - (paint.descent() + paint.ascent()) * 0.5f
+            canvas.drawText(label, cx, textY, paint)
+            paint.isFakeBoldText = false
+        }
+    }
+
+    private fun drawCButton(
+        canvas: Canvas,
+        button: CButton,
+    ) {
+        val b = button.bounds
+        val pressed =
+            (button.dx != 0f && cStickX == button.dx) || (button.dy != 0f && cStickY == button.dy)
+        drawRoundButton(
+            canvas,
+            b.centerX(),
+            b.centerY(),
+            b.width() * 0.5f,
+            customColors.button ?: theme.cButton,
+            customColors.text ?: theme.cText,
+            button.glyph,
+            pressed,
+            0.8f,
+        )
+    }
+
+    private fun buildShapePath(button: GlassButton) {
+        val b = button.bounds
+        when (button.shape) {
+            GlassShape.CIRCLE -> {
+                path.reset()
+                path.addCircle(b.centerX(), b.centerY(), b.width() * 0.5f, Path.Direction.CW)
+            }
+            GlassShape.PILL -> {
+                path.reset()
+                val r = b.height() * 0.5f
+                path.addRoundRect(b.left, b.top, b.right, b.bottom, r, r, Path.Direction.CW)
+            }
+            GlassShape.TRIGGER_LT ->
+                GameHubLayout.buildTriggerPath(path, GameHubLayout.RenderShape.TRIGGER_LT, b.left, b.top, b.right, b.bottom)
+            GlassShape.TRIGGER_LB ->
+                GameHubLayout.buildTriggerPath(path, GameHubLayout.RenderShape.TRIGGER_LB, b.left, b.top, b.right, b.bottom)
+            GlassShape.TRIGGER_RT ->
+                GameHubLayout.buildTriggerPath(path, GameHubLayout.RenderShape.TRIGGER_RT, b.left, b.top, b.right, b.bottom)
+            GlassShape.TRIGGER_RB ->
+                GameHubLayout.buildTriggerPath(path, GameHubLayout.RenderShape.TRIGGER_RB, b.left, b.top, b.right, b.bottom)
+        }
+    }
+
+    private fun drawDpad(canvas: Canvas) {
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+        val path = Path()
+        val color = customColors.button ?: theme.dpad
+        val arm = dpadRadius * 0.36f
+        val corner = arm * 0.5f
+        val cx = dpadCx
+        val cy = dpadCy
+        val r = dpadRadius
+        val depth = r * 0.05f
+        val pressedUp = dpadY < -0.1f
+        val pressedDown = dpadY > 0.1f
+        val pressedLeft = dpadX < -0.1f
+        val pressedRight = dpadX > 0.1f
+
+        path.reset()
+        path.addRoundRect(cx - r, cy - arm + depth, cx + r, cy + arm + depth, corner, corner, Path.Direction.CW)
+        path.addRoundRect(cx - arm, cy - r + depth, cx + arm, cy + r + depth, corner, corner, Path.Direction.CW)
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+        paint.color = shadowTint(80)
+        canvas.drawPath(path, paint)
+
+        path.reset()
+        path.addRoundRect(cx - r, cy - arm, cx + r, cy + arm, corner, corner, Path.Direction.CW)
+        path.addRoundRect(cx - arm, cy - r, cx + arm, cy + r, corner, corner, Path.Direction.CW)
+        paint.alpha = 255
+        paint.shader =
+            LinearGradient(
+                cx,
+                cy - r,
+                cx,
+                cy + r,
+                intArrayOf(lighten(color, 0.2f), color, darken(color, 0.2f)),
+                floatArrayOf(0f, 0.5f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawPath(path, paint)
+        paint.shader = null
+
+        fun pressArm(
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ) {
+            paint.style = Paint.Style.FILL
+            paint.color = Color.argb(90, 0, 0, 0)
+            canvas.drawRoundRect(left, top, right, bottom, corner, corner, paint)
+        }
+        if (pressedUp) pressArm(cx - arm, cy - r, cx + arm, cy - arm * 0.4f)
+        if (pressedDown) pressArm(cx - arm, cy + arm * 0.4f, cx + arm, cy + r)
+        if (pressedLeft) pressArm(cx - r, cy - arm, cx - arm * 0.4f, cy + arm)
+        if (pressedRight) pressArm(cx + arm * 0.4f, cy - arm, cx + r, cy + arm)
+
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(color, 0.45f)
+        path.reset()
+        path.addRoundRect(cx - r, cy - arm, cx + r, cy + arm, corner, corner, Path.Direction.CW)
+        val vertical = Path()
+        vertical.addRoundRect(cx - arm, cy - r, cx + arm, cy + r, corner, corner, Path.Direction.CW)
+        path.op(vertical, Path.Op.UNION)
+        canvas.drawPath(path, paint)
+
+        paint.style = Paint.Style.FILL
+        paint.shader =
+            RadialGradient(
+                cx,
+                cy,
+                arm * 0.85f,
+                darken(color, 0.3f),
+                color,
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(cx, cy, arm * 0.85f, paint)
+        paint.shader = null
+
+        val tip = arm * 0.5f
+        val arrowBase =
+            customColors.text
+                ?: if (luminance(color) < 0.55f) 0xFFF3F4F7.toInt() else 0xFF17181C.toInt()
+        fun arrowPath(
+            tx: Float,
+            ty: Float,
+            dxu: Float,
+            dyu: Float,
+        ) {
+            path.reset()
+            path.moveTo(tx + dxu * tip, ty + dyu * tip)
+            path.lineTo(tx - dyu * tip * 0.8f - dxu * tip * 0.5f, ty + dxu * tip * 0.8f - dyu * tip * 0.5f)
+            path.lineTo(tx + dyu * tip * 0.8f - dxu * tip * 0.5f, ty - dxu * tip * 0.8f - dyu * tip * 0.5f)
+            path.close()
+        }
+        fun arrow(
+            tx: Float,
+            ty: Float,
+            dxu: Float,
+            dyu: Float,
+        ) {
+            arrowPath(tx, ty + tip * 0.14f, dxu, dyu)
+            paint.color = shadowTint(120)
+            canvas.drawPath(path, paint)
+            arrowPath(tx, ty, dxu, dyu)
+            paint.color = arrowBase
+            canvas.drawPath(path, paint)
+        }
+        val arrowDist = r * 0.66f
+        arrow(cx, cy - arrowDist, 0f, -1f)
+        arrow(cx, cy + arrowDist, 0f, 1f)
+        arrow(cx - arrowDist, cy, -1f, 0f)
+        arrow(cx + arrowDist, cy, 1f, 0f)
+    }
+
+    private fun drawStick2(
+        canvas: Canvas,
+        adaptive: Boolean = false,
+    ) {
+        val ocx = stickCx
+        val ocy = stickCy
+        val orad = stickRadius
+        val ox = stickX
+        val oy = stickY
+        val op = stickPointerId
+        stickCx = stick2Cx
+        stickCy = stick2Cy
+        stickRadius = stick2Radius
+        stickX = stick2X
+        stickY = stick2Y
+        stickPointerId = stick2PointerId
+        if (adaptive) {
+            drawStick(canvas, stick2OriginX, stick2OriginY)
+        } else {
+            drawStick(canvas)
+        }
+        stickCx = ocx
+        stickCy = ocy
+        stickRadius = orad
+        stickX = ox
+        stickY = oy
+        stickPointerId = op
+    }
+
+    private fun drawPsStick(
+        canvas: Canvas,
+        cx: Float = stickCx,
+        cy: Float = stickCy,
+    ) {
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+        val engaged = stickPointerId != -1
+        val wellColor = darken(customColors.body ?: theme.body, 0.16f)
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+        paint.alpha = 255
+        paint.shader =
+            RadialGradient(
+                cx,
+                cy,
+                stickRadius,
+                intArrayOf(darken(wellColor, 0.32f), wellColor, lighten(wellColor, 0.1f)),
+                floatArrayOf(0f, 0.78f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(cx, cy, stickRadius, paint)
+        paint.shader = null
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(wellColor, 0.4f)
+        canvas.drawCircle(cx, cy, stickRadius, paint)
+
+        val thumbX = cx + stickX * stickRadius * 0.5f
+        val thumbY = cy + stickY * stickRadius * 0.5f
+        val thumbRadius = stickRadius * 0.6f
+        val capColor = customColors.button ?: 0xFF33333A.toInt()
+        paint.style = Paint.Style.FILL
+        paint.shader =
+            RadialGradient(
+                thumbX,
+                thumbY + thumbRadius * 0.2f,
+                thumbRadius * 1.3f,
+                shadowTint(100),
+                Color.TRANSPARENT,
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(thumbX, thumbY + thumbRadius * 0.18f, thumbRadius * 1.3f, paint)
+        paint.alpha = 255
+        paint.shader =
+            RadialGradient(
+                thumbX - thumbRadius * 0.28f,
+                thumbY - thumbRadius * 0.32f,
+                thumbRadius * 1.9f,
+                intArrayOf(
+                    lighten(capColor, if (engaged) 0.12f else 0.28f),
+                    capColor,
+                    darken(capColor, 0.3f),
+                ),
+                floatArrayOf(0f, 0.5f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(thumbX, thumbY, thumbRadius, paint)
+        paint.shader =
+            RadialGradient(
+                thumbX,
+                thumbY + thumbRadius * 0.08f,
+                thumbRadius * 0.72f,
+                intArrayOf(
+                    darken(capColor, if (engaged) 0.34f else 0.24f),
+                    darken(capColor, 0.12f),
+                    lighten(capColor, 0.18f),
+                ),
+                floatArrayOf(0f, 0.75f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(thumbX, thumbY, thumbRadius * 0.72f, paint)
+        paint.shader = null
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(capColor, 0.42f)
+        canvas.drawCircle(thumbX, thumbY, thumbRadius, paint)
+        paint.strokeWidth = strokeWidth * 0.7f
+        paint.color = lighten(capColor, 0.08f)
+        canvas.drawCircle(thumbX, thumbY, thumbRadius * 0.72f, paint)
+    }
+
+    private fun drawStick(
+        canvas: Canvas,
+        cx: Float = stickCx,
+        cy: Float = stickCy,
+    ) {
+        if (config.hasDualSticks) {
+            drawPsStick(canvas, cx, cy)
+            return
+        }
+        val engaged = stickPointerId != -1
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+        val wellColor = darken(customColors.button ?: theme.dpad, 0.1f)
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+
+        path.reset()
+        for (i in 0 until 8) {
+            val angle = Math.toRadians((i * 45 - 22.5).toDouble())
+            val px = cx + stickRadius * Math.cos(angle).toFloat()
+            val py = cy + stickRadius * Math.sin(angle).toFloat()
+            if (i == 0) path.moveTo(px, py) else path.lineTo(px, py)
+        }
+        path.close()
+        paint.shader =
+            RadialGradient(
+                cx,
+                cy,
+                stickRadius,
+                intArrayOf(darken(wellColor, 0.35f), wellColor, lighten(wellColor, 0.08f)),
+                floatArrayOf(0f, 0.75f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawPath(path, paint)
+        paint.shader = null
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(wellColor, 0.4f)
+        canvas.drawPath(path, paint)
+
+        val thumbX = cx + stickX * stickRadius * 0.5f
+        val thumbY = cy + stickY * stickRadius * 0.5f
+        val thumbRadius = stickRadius * 0.5f
+        val capColor = customColors.button ?: theme.stickCap
+        paint.style = Paint.Style.FILL
+        paint.shader =
+            RadialGradient(
+                thumbX,
+                thumbY + thumbRadius * 0.18f,
+                thumbRadius * 1.25f,
+                shadowTint(90),
+                Color.TRANSPARENT,
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(thumbX, thumbY + thumbRadius * 0.18f, thumbRadius * 1.25f, paint)
+        paint.shader =
+            RadialGradient(
+                thumbX - thumbRadius * 0.3f,
+                thumbY - thumbRadius * 0.35f,
+                thumbRadius * 1.8f,
+                intArrayOf(
+                    lighten(capColor, if (engaged) 0.1f else 0.3f),
+                    capColor,
+                    darken(capColor, 0.22f),
+                ),
+                floatArrayOf(0f, 0.55f, 1f),
+                Shader.TileMode.CLAMP,
+            )
+        canvas.drawCircle(thumbX, thumbY, thumbRadius, paint)
+        paint.shader = null
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = darken(capColor, 0.35f)
+        canvas.drawCircle(thumbX, thumbY, thumbRadius - strokeWidth * 0.5f, paint)
+        canvas.drawCircle(thumbX, thumbY, thumbRadius * 0.55f, paint)
+    }
+
+    private fun layoutEditChrome(
+        width: Float,
+        height: Float,
+    ) {
+        toolbarPills.clear()
+        trayPills.clear()
+        val u = editUnit
+        val pillH = u * 3.4f
+        val gap = u * 0.9f
+        val textPaint = paint
+        textPaint.textSize = pillH * 0.42f
+        textPaint.isFakeBoldText = true
+        val actions =
+            listOf(
+                "done" to "DONE",
+                "reset" to "RESET",
+                "minus" to "−",
+                "plus" to "+",
+                "hide" to "HIDE",
+            )
+        val widths =
+            actions.map { (_, label) ->
+                max(textPaint.measureText(label) + pillH * 1.1f, pillH * 1.4f)
+            }
+        textPaint.isFakeBoldText = false
+        val totalW = widths.sum() + gap * (actions.size - 1)
+        var x = (width - totalW) * 0.5f
+        val y = u * 1.2f
+        actions.forEachIndexed { index, (action, label) ->
+            toolbarPills += Triple(action, label, RectF(x, y, x + widths[index], y + pillH))
+            x += widths[index] + gap
+        }
+        if (hiddenControls.isNotEmpty()) {
+            textPaint.textSize = pillH * 0.38f
+            val trayY = y + pillH + gap
+            val trayWidths =
+                hiddenControls.map { (_, label) ->
+                    max(textPaint.measureText("+ $label") + pillH * 1.0f, pillH * 1.3f)
+                }
+            var trayX = (width - trayWidths.sum() - gap * (hiddenControls.size - 1)) * 0.5f
+            hiddenControls.forEachIndexed { index, (id, label) ->
+                trayPills += Triple(id, "+ $label", RectF(trayX, trayY, trayX + trayWidths[index], trayY + pillH))
+                trayX += trayWidths[index] + gap
+            }
+        }
+    }
+
+    private fun drawChromePill(
+        canvas: Canvas,
+        rect: RectF,
+        label: String,
+        accent: Boolean,
+        enabled: Boolean = true,
+    ) {
+        val r = rect.height() * 0.5f
+        paint.shader = null
+        paint.style = Paint.Style.FILL
+        paint.color = if (accent) 0xF22196F3.toInt() else 0xF21C222C.toInt()
+        canvas.drawRoundRect(rect, r, r, paint)
+        paint.style = Paint.Style.STROKE
+        paint.strokeWidth = strokeWidth
+        paint.color = if (accent) 0xFF64B5F6.toInt() else 0xFF3A4354.toInt()
+        canvas.drawRoundRect(rect, r, r, paint)
+        paint.style = Paint.Style.FILL
+        paint.color = if (enabled) 0xFFF2F5FA.toInt() else 0x66F2F5FA
+        paint.textAlign = Paint.Align.CENTER
+        paint.isFakeBoldText = true
+        paint.textSize = rect.height() * (if (label.startsWith("+ ")) 0.38f else 0.42f)
+        val textY = rect.centerY() - (paint.descent() + paint.ascent()) * 0.5f
+        canvas.drawText(label, rect.centerX(), textY, paint)
+        paint.isFakeBoldText = false
+    }
+
+    private fun drawEditChrome(canvas: Canvas) {
+        val u = editUnit
+        selectedId?.let { id ->
+            controlRect(id)?.let { rect ->
+                val pad = u * 0.7f
+                paint.shader = null
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = max(2f, u * 0.22f)
+                paint.color = 0xFF29B6F6.toInt()
+                paint.pathEffect = DashPathEffect(floatArrayOf(u * 0.9f, u * 0.6f), 0f)
+                canvas.drawRoundRect(
+                    rect.left - pad,
+                    rect.top - pad,
+                    rect.right + pad,
+                    rect.bottom + pad,
+                    u,
+                    u,
+                    paint,
+                )
+                paint.pathEffect = null
+            }
+        }
+        val hideEnabled = selectedId != null && selectedId != "menu"
+        val sizeEnabled = selectedId != null
+        toolbarPills.forEach { (action, label, rect) ->
+            val enabled =
+                when (action) {
+                    "hide" -> hideEnabled
+                    "minus", "plus" -> sizeEnabled
+                    else -> true
+                }
+            drawChromePill(canvas, rect, label, accent = action == "done", enabled = enabled)
+        }
+        trayPills.forEach { (_, label, rect) ->
+            drawChromePill(canvas, rect, label, accent = false)
+        }
+        val hintY = (toolbarPills.firstOrNull()?.third?.bottom ?: 0f) +
+            (if (trayPills.isEmpty()) u * 2.2f else u * 6.2f)
+        paint.style = Paint.Style.FILL
+        paint.color = 0xCCFFFFFF.toInt()
+        paint.textAlign = Paint.Align.CENTER
+        paint.textSize = u * 1.4f
+        canvas.drawText(
+            if (selectedId == null) "Tap a control to select, drag to move" else "Drag to move · +/− to resize",
+            width * 0.5f,
+            hintY,
+            paint,
+        )
+    }
+
+    private fun controlAt(
+        x: Float,
+        y: Float,
+    ): String? {
+        val u = editUnit
+        var best: String? = null
+        var bestArea = Float.MAX_VALUE
+        allControlIds().forEach { id ->
+            val rect = controlRect(id) ?: return@forEach
+            if (x >= rect.left - u && x <= rect.right + u && y >= rect.top - u && y <= rect.bottom + u) {
+                val area = rect.width() * rect.height()
+                if (area < bestArea) {
+                    bestArea = area
+                    best = id
+                }
+            }
+        }
+        return best
+    }
+
+    private fun editTouch(event: MotionEvent) {
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
+                val index = event.actionIndex
+                val x = event.getX(index)
+                val y = event.getY(index)
+                toolbarPills.firstOrNull { it.third.contains(x, y) }?.let { (action, _, _) ->
+                    hapticTick()
+                    cancelDrag()
+                    when (action) {
+                        "done" -> finishEdit()
+                        "reset" -> resetLayout()
+                        "minus" -> selectedId?.let { scaleControl(it, -0.1f) }
+                        "plus" -> selectedId?.let { scaleControl(it, 0.1f) }
+                        "hide" ->
+                            selectedId?.takeIf { it != "menu" }?.let {
+                                setControlVisible(it, false)
+                                selectedId = null
+                            }
+                    }
+                    return
+                }
+                trayPills.firstOrNull { it.third.contains(x, y) }?.let { (id, _, _) ->
+                    hapticTick()
+                    cancelDrag()
+                    setControlVisible(id, true)
+                    selectedId = id
+                    return
+                }
+                if (dragId == null) {
+                    val hit = controlAt(x, y)
+                    selectedId = hit
+                    if (hit != null) {
+                        val rect = controlRect(hit)
+                        dragId = hit
+                        dragPointerId = event.getPointerId(index)
+                        dragActive = false
+                        dragDownX = x
+                        dragDownY = y
+                        dragOffsetX = (rect?.centerX() ?: x) - x
+                        dragOffsetY = (rect?.centerY() ?: y) - y
+                        hapticTick()
+                    }
+                }
+            }
+            MotionEvent.ACTION_MOVE -> {
+                val id = dragId ?: return
+                val pointerIndex = event.findPointerIndex(dragPointerId)
+                if (pointerIndex < 0) return
+                val x = event.getX(pointerIndex)
+                val y = event.getY(pointerIndex)
+                if (!dragActive && hypot(x - dragDownX, y - dragDownY) < editUnit * 0.6f) return
+                dragActive = true
+                moveControl(id, x + dragOffsetX, y + dragOffsetY)
+            }
+            MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                val ended =
+                    event.actionMasked == MotionEvent.ACTION_UP ||
+                        event.actionMasked == MotionEvent.ACTION_CANCEL ||
+                        event.getPointerId(event.actionIndex) == dragPointerId
+                if (ended && dragId != null) {
+                    val moved = dragActive
+                    cancelDrag()
+                    if (moved) saveOverrides()
+                }
+            }
+        }
+    }
+
+    fun releaseAll() {
+        for (keyCode in pressedButtons) listener.onButton(keyCode, false)
+        pressedButtons.clear()
+        pointerButton.clear()
+        pointerCButton.clear()
+        dpadPointerId = -1
+        menuPointerId = -1
+        if (dpadX != 0f || dpadY != 0f) {
+            dpadX = 0f
+            dpadY = 0f
+            listener.onDpad(0f, 0f)
+        }
+        if (stickPointerId != -1 || stickX != 0f || stickY != 0f) {
+            stickPointerId = -1
+            stickX = 0f
+            stickY = 0f
+            listener.onStick(0f, 0f)
+        }
+        stickActive = false
+        if (stickL3Held) {
+            stickL3Held = false
+            listener.onButton(KeyEvent.KEYCODE_BUTTON_THUMBL, false)
+        }
+        if (cStickX != 0f || cStickY != 0f) {
+            cStickX = 0f
+            cStickY = 0f
+            listener.onRightStick(0f, 0f)
+        }
+        if (stick2PointerId != -1 || stick2X != 0f || stick2Y != 0f) {
+            stick2PointerId = -1
+            stick2X = 0f
+            stick2Y = 0f
+            listener.onRightStick(0f, 0f)
+        }
+        stick2Active = false
+        if (stickR3Held) {
+            stickR3Held = false
+            listener.onButton(KeyEvent.KEYCODE_BUTTON_THUMBR, false)
+        }
+        menuLatched = false
+        invalidate()
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN,
+            MotionEvent.ACTION_POINTER_DOWN,
+            MotionEvent.ACTION_MOVE,
+            MotionEvent.ACTION_POINTER_UP,
+            MotionEvent.ACTION_UP,
+            MotionEvent.ACTION_CANCEL,
+            ->
+                if (editMode) {
+                    editTouch(event)
+                } else if (swallowInput) {
+                    if (event.actionMasked == MotionEvent.ACTION_UP ||
+                        event.actionMasked == MotionEvent.ACTION_CANCEL
+                    ) {
+                        swallowInput = false
+                    }
+                } else {
+                    recompute(event)
+                }
+            else -> return false
+        }
+        invalidate()
+        return true
+    }
+
+    private fun hitButton(
+        button: GlassButton,
+        x: Float,
+        y: Float,
+    ): Boolean {
+        val b = button.bounds
+        val inflate = snap * 1.2f
+        return if (button.shape == GlassShape.CIRCLE) {
+            val r = b.width() * 0.5f + inflate
+            hypot(x - b.centerX(), y - b.centerY()) <= r
+        } else {
+            x >= b.left - inflate && x <= b.right + inflate &&
+                y >= b.top - inflate && y <= b.bottom + inflate
+        }
+    }
+
+    private fun inStickHomeZone(
+        x: Float,
+        y: Float,
+        rightHalf: Boolean,
+    ): Boolean {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        if (w <= 0f || h <= 0f) return false
+        val top = h * 0.42f
+        val midX = w * 0.5f
+        val inHalf = if (rightHalf) x >= midX else x < midX
+        return inHalf && y >= top
+    }
+
+    private fun hitsOtherControl(
+        x: Float,
+        y: Float,
+    ): Boolean {
+        val pad = DEAD_ZONE_PX
+        fun inPadded(b: RectF): Boolean =
+            x >= b.left - pad && x <= b.right + pad && y >= b.top - pad && y <= b.bottom + pad
+        if (menuPointerId == -1 && inPadded(menuButton.bounds)) return true
+        for (button in buttons) {
+            if (inPadded(button.bounds)) return true
+        }
+        val face = buttons.filter { it.keyCode in FACE_KEYCODES }
+        if (face.size >= 3) {
+            val l = face.minOf { it.bounds.left } - pad
+            val t = face.minOf { it.bounds.top } - pad
+            val r = face.maxOf { it.bounds.right } + pad
+            val b = face.maxOf { it.bounds.bottom } + pad
+            if (x in l..r && y in t..b) return true
+        }
+        for (c in cButtons) {
+            val reach = c.bounds.width() * 0.5f + snap * 1.2f + pad
+            if (hypot(x - c.bounds.centerX(), y - c.bounds.centerY()) <= reach) return true
+        }
+        if (dpadVisible && hypot(x - dpadCx, y - dpadCy) <= dpadRadius * 1.4f + pad) return true
+        return false
+    }
+
+    private fun recompute(event: MotionEvent) {
+        val adaptive = adaptiveSticks
+        val now = event.eventTime
+        val released =
+            event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL
+        val liftedPointer =
+            if (event.actionMasked == MotionEvent.ACTION_POINTER_UP) event.actionIndex else -1
+        val downId =
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN ->
+                    event.getPointerId(event.actionIndex)
+                else -> -1
+            }
+
+        val activeIds = HashSet<Int>()
+        if (!released) {
+            for (i in 0 until event.pointerCount) {
+                if (i == liftedPointer) continue
+                activeIds.add(event.getPointerId(i))
+            }
+        }
+        pointerButton.keys.retainAll(activeIds)
+        pointerCButton.keys.retainAll(activeIds)
+        if (dpadPointerId != -1 && dpadPointerId !in activeIds) dpadPointerId = -1
+        if (menuPointerId != -1 && menuPointerId !in activeIds) menuPointerId = -1
+
+        val newPressed = HashSet<Int>()
+        var newDpadX = 0f
+        var newDpadY = 0f
+        var newCX = 0f
+        var newCY = 0f
+        var menuTouched = false
+        var stickSeen = false
+        var newStickX = stickX
+        var newStickY = stickY
+        var stick2Seen = false
+        var newStick2X = stick2X
+        var newStick2Y = stick2Y
+
+        if (!released) {
+            for (i in 0 until event.pointerCount) {
+                if (i == liftedPointer) continue
+                val x = event.getX(i)
+                val y = event.getY(i)
+                val pointerId = event.getPointerId(i)
+                val isNewDown = pointerId == downId
+
+                if (config.hasDualSticks && stick2Visible) {
+                    if (pointerId == stick2PointerId) {
+                        stick2Seen = true
+                        val ocx = if (stick2Active) stick2OriginX else stick2Cx
+                        val ocy = if (stick2Active) stick2OriginY else stick2Cy
+                        newStick2X = ((x - ocx) / stick2Radius).coerceIn(-1f, 1f)
+                        newStick2Y = ((y - ocy) / stick2Radius).coerceIn(-1f, 1f)
+                        stick2MaxMag = max(stick2MaxMag, hypot(newStick2X, newStick2Y))
+                        continue
+                    }
+                    if (isNewDown && stick2PointerId == -1) {
+                        var grabbed = false
+                        if (adaptive) {
+                            if (inStickHomeZone(x, y, rightHalf = true) && !hitsOtherControl(x, y)) {
+                                stick2PointerId = pointerId
+                                stick2Seen = true
+                                stick2Active = true
+                                stick2OriginX = x
+                                stick2OriginY = y
+                                hapticTick()
+                                newStick2X = 0f
+                                newStick2Y = 0f
+                                grabbed = true
+                            }
+                        } else if (hypot(x - stick2Cx, y - stick2Cy) <= stick2Radius * 1.3f) {
+                            stick2PointerId = pointerId
+                            stick2Seen = true
+                            hapticTick()
+                            newStick2X = ((x - stick2Cx) / stick2Radius).coerceIn(-1f, 1f)
+                            newStick2Y = ((y - stick2Cy) / stick2Radius).coerceIn(-1f, 1f)
+                            grabbed = true
+                        }
+                        if (grabbed) {
+                            stick2DownTime = now
+                            stick2MaxMag = 0f
+                            if (!showL3R3 && stick2LastTapTime != 0L && now - stick2LastTapTime <= DOUBLE_TAP_MS) {
+                                stickR3Held = true
+                                stick2LastTapTime = 0L
+                                listener.onButton(KeyEvent.KEYCODE_BUTTON_THUMBR, true)
+                                hapticTick()
+                            }
+                            continue
+                        }
+                    }
+                }
+
+                if ((config.hasStick || config.hasDualSticks) && stickVisible) {
+                    if (pointerId == stickPointerId) {
+                        stickSeen = true
+                        val ocx = if (stickActive) stickOriginX else stickCx
+                        val ocy = if (stickActive) stickOriginY else stickCy
+                        newStickX = ((x - ocx) / stickRadius).coerceIn(-1f, 1f)
+                        newStickY = ((y - ocy) / stickRadius).coerceIn(-1f, 1f)
+                        stickMaxMag = max(stickMaxMag, hypot(newStickX, newStickY))
+                        continue
+                    }
+                    if (isNewDown && stickPointerId == -1) {
+                        var grabbed = false
+                        if (adaptive) {
+                            if (inStickHomeZone(x, y, rightHalf = false) && !hitsOtherControl(x, y)) {
+                                stickPointerId = pointerId
+                                stickSeen = true
+                                stickActive = true
+                                stickOriginX = x
+                                stickOriginY = y
+                                hapticTick()
+                                newStickX = 0f
+                                newStickY = 0f
+                                grabbed = true
+                            }
+                        } else if (hypot(x - stickCx, y - stickCy) <= stickRadius * 1.3f) {
+                            stickPointerId = pointerId
+                            stickSeen = true
+                            hapticTick()
+                            newStickX = ((x - stickCx) / stickRadius).coerceIn(-1f, 1f)
+                            newStickY = ((y - stickCy) / stickRadius).coerceIn(-1f, 1f)
+                            grabbed = true
+                        }
+                        if (grabbed) {
+                            stickDownTime = now
+                            stickMaxMag = 0f
+                            if (!showL3R3 && stickLastTapTime != 0L && now - stickLastTapTime <= DOUBLE_TAP_MS) {
+                                stickL3Held = true
+                                stickLastTapTime = 0L
+                                listener.onButton(KeyEvent.KEYCODE_BUTTON_THUMBL, true)
+                                hapticTick()
+                            }
+                            continue
+                        }
+                    }
+                }
+
+                if (pointerId == menuPointerId) {
+                    menuTouched = true
+                    continue
+                }
+                if (isNewDown && menuPointerId == -1 && hitButton(menuButton, x, y)) {
+                    menuPointerId = pointerId
+                    menuTouched = true
+                    continue
+                }
+
+                val ownedC = pointerCButton[pointerId]
+                if (ownedC != null) {
+                    if (ownedC.dx != 0f) newCX = ownedC.dx
+                    if (ownedC.dy != 0f) newCY = ownedC.dy
+                    continue
+                }
+                if (isNewDown) {
+                    var cHit = false
+                    for (c in cButtons) {
+                        val reach = c.bounds.width() * 0.5f + snap * 1.2f
+                        if (hypot(x - c.bounds.centerX(), y - c.bounds.centerY()) <= reach) {
+                            pointerCButton[pointerId] = c
+                            if (c.dx != 0f) newCX = c.dx
+                            if (c.dy != 0f) newCY = c.dy
+                            cHit = true
+                            break
+                        }
+                    }
+                    if (cHit) continue
+                }
+
+                val ownedB = pointerButton[pointerId]
+                if (ownedB != null) {
+                    newPressed.add(ownedB)
+                    continue
+                }
+                if (isNewDown) {
+                    var buttonHit = false
+                    for (button in buttons) {
+                        if (hitButton(button, x, y)) {
+                            pointerButton[pointerId] = button.keyCode
+                            newPressed.add(button.keyCode)
+                            buttonHit = true
+                            break
+                        }
+                    }
+                    if (buttonHit) continue
+                }
+
+                if (dpadVisible && (pointerId == dpadPointerId ||
+                        (isNewDown && dpadPointerId == -1 &&
+                            hypot(x - dpadCx, y - dpadCy) <= dpadRadius * 1.4f))
+                ) {
+                    dpadPointerId = pointerId
+                    val dxToPad = x - dpadCx
+                    val dyToPad = y - dpadCy
+                    val dz = dpadRadius * 0.24f
+                    var wantX = if (dxToPad > dz) 1f else if (dxToPad < -dz) -1f else 0f
+                    var wantY = if (dyToPad > dz) 1f else if (dyToPad < -dz) -1f else 0f
+
+                    if (wantX != 0f && wantY != 0f) {
+                        val alongX = abs(dxToPad)
+                        val alongY = abs(dyToPad)
+                        val holdingX = dpadX != 0f && dpadY == 0f
+                        val holdingY = dpadY != 0f && dpadX == 0f
+                        val takeX =
+                            when {
+                                holdingX -> alongX * DPAD_AXIS_SWAP_BIAS >= alongY
+                                holdingY -> alongX >= alongY * DPAD_AXIS_SWAP_BIAS
+                                else -> alongX >= alongY
+                            }
+                        if (takeX) wantY = 0f else wantX = 0f
+                    }
+                    newDpadX = wantX
+                    newDpadY = wantY
+                }
+            }
+        }
+
+        if (newCX != cStickX || newCY != cStickY) {
+            if (newCX != 0f || newCY != 0f) hapticTick()
+            cStickX = newCX
+            cStickY = newCY
+            listener.onRightStick(ix(cStickX, invertRX), ix(cStickY, invertRY))
+        }
+
+        if (!stickSeen && stickPointerId != -1) {
+            stickPointerId = -1
+            stickActive = false
+            newStickX = 0f
+            newStickY = 0f
+            stickLastTapTime = if (now - stickDownTime < TAP_MAX_MS && stickMaxMag < TAP_MAX_MAG) now else 0L
+            if (stickL3Held) {
+                stickL3Held = false
+                listener.onButton(KeyEvent.KEYCODE_BUTTON_THUMBL, false)
+            }
+        }
+        if (newStickX != stickX || newStickY != stickY) {
+            stickX = newStickX
+            stickY = newStickY
+            listener.onStick(ix(stickX, invertLX), ix(stickY, invertLY))
+        }
+
+        if (!stick2Seen && stick2PointerId != -1) {
+            stick2PointerId = -1
+            stick2Active = false
+            newStick2X = 0f
+            newStick2Y = 0f
+            stick2LastTapTime = if (now - stick2DownTime < TAP_MAX_MS && stick2MaxMag < TAP_MAX_MAG) now else 0L
+            if (stickR3Held) {
+                stickR3Held = false
+                listener.onButton(KeyEvent.KEYCODE_BUTTON_THUMBR, false)
+            }
+        }
+        if (newStick2X != stick2X || newStick2Y != stick2Y) {
+            stick2X = newStick2X
+            stick2Y = newStick2Y
+            listener.onRightStick(ix(stick2X, invertRX), ix(stick2Y, invertRY))
+        }
+
+        for (keyCode in pressedButtons) {
+            if (!newPressed.contains(keyCode)) listener.onButton(keyCode, false)
+        }
+        for (keyCode in newPressed) {
+            if (!pressedButtons.contains(keyCode)) {
+                hapticTick()
+                listener.onButton(keyCode, true)
+            }
+        }
+        pressedButtons.clear()
+        pressedButtons.addAll(newPressed)
+
+        if (newDpadX != dpadX || newDpadY != dpadY) {
+            if (newDpadX != 0f || newDpadY != 0f) hapticTick()
+            dpadX = newDpadX
+            dpadY = newDpadY
+            listener.onDpad(dpadX, dpadY)
+        }
+
+        if (menuTouched && !menuLatched) {
+            menuLatched = true
+            hapticTick()
+            listener.onMenu()
+        } else if (!menuTouched) {
+            menuLatched = false
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroNetplay.kt b/app/src/main/feature/retro/RetroNetplay.kt
new file mode 100644
index 000000000..3e808ffd9
--- /dev/null
+++ b/app/src/main/feature/retro/RetroNetplay.kt
@@ -0,0 +1,1198 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.net.wifi.WifiManager
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import android.view.KeyEvent
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.swordfish.libretrodroid.GLRetroView
+import java.io.BufferedInputStream
+import java.io.BufferedOutputStream
+import java.io.DataInputStream
+import java.io.DataOutputStream
+import java.net.DatagramPacket
+import java.net.DatagramSocket
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.NetworkInterface
+import java.net.ServerSocket
+import java.net.Socket
+import java.net.SocketTimeoutException
+import java.nio.charset.StandardCharsets
+import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.concurrent.thread
+
+enum class RetroNetplayPhase {
+    IDLE,
+    HOSTING,
+    SCANNING,
+    SCAN_RESULTS,
+    CONNECTING,
+    IN_ROOM,
+}
+
+data class RetroNetplayDiscoveredRoom(
+    val hostAddress: String,
+    val port: Int,
+    val systemId: String,
+    val gameName: String,
+    val hostPlayerName: String,
+    val roomId: String,
+    val lastSeenMs: Long = System.currentTimeMillis(),
+)
+
+data class RetroNetplayMember(
+    val name: String,
+    val isHost: Boolean,
+    val isLocal: Boolean,
+)
+
+object RetroNetplayLobby {
+    const val DEFAULT_TCP_PORT = 55435
+    const val DISCOVERY_PORT = 55436
+    internal const val DISCOVERY_MAGIC = "WNNP1"
+
+    var phase by mutableStateOf(RetroNetplayPhase.IDLE)
+        private set
+    var statusText by mutableStateOf("")
+        private set
+    var members by mutableStateOf<List<RetroNetplayMember>>(emptyList())
+        private set
+    var discovered by mutableStateOf<List<RetroNetplayDiscoveredRoom>>(emptyList())
+        private set
+    var roomTitle by mutableStateOf("")
+        private set
+    var isHost by mutableStateOf(false)
+        private set
+    var localPlayerName by mutableStateOf("Player")
+        private set
+
+    var isGameLink by mutableStateOf(false)
+        private set
+
+    private var pendingGameLinkHost: Boolean? = null
+    private var pendingGameLinkPort: Int = RetroGameLink.DEFAULT_PORT
+    private var pendingGameLinkPeerIp: String = ""
+
+    var eventToast by mutableStateOf<String?>(null)
+        private set
+
+    private var session: RetroNetplaySession? = null
+    private var advertiser: NetplayAdvertiser? = null
+    private var scanner: NetplayScanner? = null
+    private val main = Handler(Looper.getMainLooper())
+    private var toastClearToken = 0
+
+    fun canStartSession(): Boolean =
+        phase == RetroNetplayPhase.IDLE ||
+            phase == RetroNetplayPhase.SCANNING ||
+            phase == RetroNetplayPhase.SCAN_RESULTS
+
+    fun isInRoomSession(): Boolean =
+        phase == RetroNetplayPhase.HOSTING ||
+            phase == RetroNetplayPhase.CONNECTING ||
+            phase == RetroNetplayPhase.IN_ROOM
+
+    private fun pushToast(message: String) {
+        main.post {
+            val token = ++toastClearToken
+            eventToast = message
+            main.postDelayed({
+                if (toastClearToken == token) eventToast = null
+            }, 2_800L)
+        }
+    }
+
+    fun notifyPeerJoined(peerName: String) {
+        val peer = peerName.ifBlank { "Player 2" }
+        main.post {
+            discovered = emptyList()
+            phase = RetroNetplayPhase.IN_ROOM
+            statusText = "Ready"
+            val local =
+                members.firstOrNull { it.isLocal }
+                    ?: RetroNetplayMember(localPlayerName, isHost = isHost, isLocal = true)
+            members =
+                if (isHost) {
+                    listOf(
+                        local.copy(isHost = true, isLocal = true),
+                        RetroNetplayMember(peer, isHost = false, isLocal = false),
+                    )
+                } else {
+                    listOf(
+                        RetroNetplayMember(peer, isHost = true, isLocal = false),
+                        local.copy(isHost = false, isLocal = true),
+                    )
+                }
+            pushToast("$peer connected")
+        }
+    }
+
+    fun notifyPeerLeft(peerName: String = "Player") {
+        val left = peerName.ifBlank { "Player" }
+        main.post {
+            if (isHost) {
+                phase = RetroNetplayPhase.HOSTING
+                statusText = "Waiting for a player…"
+                members =
+                    listOf(
+                        RetroNetplayMember(localPlayerName, isHost = true, isLocal = true),
+                    )
+            }
+            pushToast("$left disconnected")
+        }
+    }
+
+    fun clearToast() {
+        toastClearToken++
+        eventToast = null
+    }
+
+    fun defaultPlayerName(context: Context): String {
+        val saved = RetroDefaults.netplayPlayerName(context).trim()
+        if (saved.isNotEmpty()) return saved
+        val device =
+            runCatching {
+                Settings.Global.getString(context.contentResolver, Settings.Global.DEVICE_NAME)
+            }.getOrNull()?.trim().orEmpty()
+        return device.ifBlank { "Player" }
+    }
+
+    fun bindLocalName(context: Context) {
+        localPlayerName = defaultPlayerName(context)
+    }
+
+    fun localIpv4Addresses(): List<String> {
+        val out = mutableListOf<String>()
+        runCatching {
+            NetworkInterface.getNetworkInterfaces()?.toList().orEmpty().forEach { nif ->
+                if (!nif.isUp || nif.isLoopback) return@forEach
+                nif.inetAddresses.toList().forEach { addr ->
+                    if (addr.isLoopbackAddress || addr.hostAddress?.contains(':') == true) return@forEach
+                    val ip = addr.hostAddress ?: return@forEach
+                    if (ip.isNotBlank()) out += ip
+                }
+            }
+        }
+        return out.distinct()
+    }
+
+    fun host(
+        systemId: String,
+        gameName: String,
+        playerName: String,
+        port: Int,
+        context: Context? = null,
+        retroView: GLRetroView? = null,
+    ) {
+        leave(silent = true)
+        isHost = true
+        localPlayerName = playerName.ifBlank { "Host" }
+        roomTitle = gameName
+        discovered = emptyList()
+        isGameLink = RetroOnlineSupport.supportsGameLink(systemId)
+        phase = RetroNetplayPhase.HOSTING
+        val usePort =
+            if (isGameLink) RetroGameLink.clampPort(port) else port
+        val localIp = localIpv4Addresses().firstOrNull()
+        statusText =
+            if (isGameLink) {
+                if (localIp != null) {
+                    "Game Link host · $localIp:$usePort"
+                } else {
+                    "Game Link host · port $usePort"
+                }
+            } else if (localIp != null) {
+                "Waiting on $localIp:$usePort…"
+            } else {
+                "Waiting for a player on port $usePort…"
+            }
+        members =
+            listOf(
+                RetroNetplayMember(localPlayerName, isHost = true, isLocal = true),
+            )
+        val roomId = UUID.randomUUID().toString().take(8)
+        advertiser =
+            NetplayAdvertiser(
+                appContext = context?.applicationContext,
+                tcpPort = usePort,
+                systemId = systemId,
+                gameName = gameName,
+                hostPlayerName = localPlayerName,
+                roomId = roomId,
+            ).also { it.start() }
+
+        if (isGameLink) {
+            pendingGameLinkHost = true
+            pendingGameLinkPort =
+                if (RetroOnlineSupport.isGbaNetpacket(systemId)) {
+                    RetroGameLink.GBA_NETPACKET_PORT
+                } else {
+                    usePort
+                }
+            pendingGameLinkPeerIp = ""
+            startPresenceListener()
+            bindNetpacketPeerListener()
+            if (retroView != null) {
+                val ok =
+                    if (RetroOnlineSupport.isGbaNetpacket(systemId)) {
+                        RetroGameLink.startGbaHost(retroView, pendingGameLinkPort)
+                    } else {
+                        RetroGameLink.startHost(retroView, pendingGameLinkPort)
+                        true
+                    }
+                phase = RetroNetplayPhase.HOSTING
+                statusText =
+                    if (ok) {
+                        "Game Link host · waiting for player on $pendingGameLinkPort"
+                    } else {
+                        "Game Link host failed (need gpSP / netpacket)"
+                    }
+                pushToast(if (ok) "Hosting — waiting for player" else "Game Link host failed")
+            }
+            return
+        }
+
+        val s =
+            RetroNetplaySession(
+                retroView = retroView,
+                localPort = 0,
+                remotePort = 1,
+                isHost = true,
+                onStatus = { msg -> main.post { statusText = msg } },
+                onPeerJoined = { peerName ->
+                    notifyPeerJoined(peerName.ifBlank { "Player 2" })
+                },
+                onPeerLeft = {
+                    val left = members.firstOrNull { !it.isLocal }?.name ?: "Player"
+                    if (phase == RetroNetplayPhase.IN_ROOM || phase == RetroNetplayPhase.HOSTING) {
+                        notifyPeerLeft(left)
+                    }
+                },
+                onEnded = { ended ->
+                    main.post {
+                        if (session === ended && phase != RetroNetplayPhase.IDLE) {
+                            leave(silent = false, message = "Room closed")
+                        }
+                    }
+                },
+            )
+        startPresenceListener()
+        session = s
+        s.startHost(usePort)
+    }
+
+    fun join(
+        host: String,
+        port: Int,
+        playerName: String,
+        gameName: String,
+        systemId: String? = null,
+        retroView: GLRetroView? = null,
+    ) {
+        leave(silent = true)
+        isHost = false
+        localPlayerName = playerName.ifBlank { "Player 2" }
+        roomTitle = gameName
+        discovered = emptyList()
+        isGameLink =
+            systemId != null && RetroOnlineSupport.supportsGameLink(systemId)
+        phase = RetroNetplayPhase.CONNECTING
+        val usePort =
+            if (isGameLink) RetroGameLink.clampPort(port) else port
+        statusText = "Connecting to $host:$usePort…"
+        members = emptyList()
+
+        if (isGameLink) {
+            pendingGameLinkHost = false
+            pendingGameLinkPort =
+                if (RetroOnlineSupport.isGbaNetpacket(systemId)) {
+                    RetroGameLink.GBA_NETPACKET_PORT
+                } else {
+                    usePort
+                }
+            pendingGameLinkPeerIp = host
+            members =
+                listOf(
+                    RetroNetplayMember(host, isHost = true, isLocal = false),
+                    RetroNetplayMember(localPlayerName, isHost = false, isLocal = true),
+                )
+            if (retroView != null) {
+                val ok =
+                    if (RetroOnlineSupport.isGbaNetpacket(systemId)) {
+                        RetroGameLink.startGbaClient(retroView, host, pendingGameLinkPort)
+                    } else {
+                        RetroGameLink.startClient(retroView, host, pendingGameLinkPort)
+                        true
+                    }
+                phase = RetroNetplayPhase.IN_ROOM
+                statusText =
+                    if (ok) {
+                        "Game Link client · $host:$pendingGameLinkPort"
+                    } else {
+                        "Game Link join failed (need gpSP / netpacket)"
+                    }
+                if (ok) {
+                    pushToast("Connected to host")
+                    sendPresenceJoin(host, pendingGameLinkPort, localPlayerName)
+                } else {
+                    pushToast("Game Link join failed")
+                }
+            } else {
+                phase = RetroNetplayPhase.IN_ROOM
+                statusText = "Game Link ready · launch game to link $host"
+                sendPresenceJoin(host, pendingGameLinkPort, localPlayerName)
+            }
+            return
+        }
+
+        val s =
+            RetroNetplaySession(
+                retroView = retroView,
+                localPort = 1,
+                remotePort = 0,
+                isHost = false,
+                onStatus = { msg -> main.post { statusText = msg } },
+                onPeerJoined = { peerName ->
+                    val peer = peerName.ifBlank { "Host" }
+                    main.post {
+                        discovered = emptyList()
+                        phase = RetroNetplayPhase.IN_ROOM
+                        statusText = "Ready"
+                        members =
+                            listOf(
+                                RetroNetplayMember(peer, isHost = true, isLocal = false),
+                                RetroNetplayMember(localPlayerName, isHost = false, isLocal = true),
+                            )
+                        pushToast("Connected to $peer")
+                    }
+                    sendPresenceJoin(host, usePort, localPlayerName)
+                },
+                onPeerLeft = {
+                    main.post {
+                        pushToast("Host disconnected")
+                        leave(silent = false, message = "Host disconnected")
+                    }
+                },
+                onEnded = { ended ->
+                    main.post {
+                        if (session === ended && phase != RetroNetplayPhase.IDLE) {
+                            leave(silent = false, message = "Disconnected")
+                        }
+                    }
+                },
+            )
+        session = s
+        s.startClient(host, usePort, localPlayerName)
+    }
+
+    fun attachEmulator(retroView: GLRetroView): Boolean {
+        if (isGameLink && pendingGameLinkHost != null) {
+            val hasNetpacket = runCatching { retroView.netpacketHasCore() }.getOrDefault(false)
+            val ok =
+                if (pendingGameLinkHost == true) {
+                    if (hasNetpacket) {
+                        RetroGameLink.startGbaHost(retroView, pendingGameLinkPort)
+                    } else {
+                        RetroGameLink.startHost(retroView, pendingGameLinkPort)
+                        true
+                    }
+                } else if (hasNetpacket) {
+                    RetroGameLink.startGbaClient(
+                        retroView,
+                        pendingGameLinkPeerIp,
+                        pendingGameLinkPort,
+                    )
+                } else {
+                    RetroGameLink.startClient(
+                        retroView,
+                        pendingGameLinkPeerIp,
+                        pendingGameLinkPort,
+                    )
+                    true
+                }
+            phase = RetroNetplayPhase.IN_ROOM
+            statusText =
+                if (ok) {
+                    if (pendingGameLinkHost == true) {
+                        "Game Link host active · port $pendingGameLinkPort"
+                    } else {
+                        "Game Link client · ${pendingGameLinkPeerIp}:$pendingGameLinkPort"
+                    }
+                } else {
+                    "Game Link attach failed"
+                }
+            if (ok) {
+                if (pendingGameLinkHost == true) {
+                    startPresenceListener()
+                    bindNetpacketPeerListener()
+                    pushToast("Hosting — waiting for player")
+                } else {
+                    pushToast("Connected to host")
+                    sendPresenceJoin(
+                        pendingGameLinkPeerIp,
+                        pendingGameLinkPort,
+                        localPlayerName,
+                    )
+                }
+            } else {
+                pushToast("Game Link failed")
+            }
+            return true
+        }
+        val s = session ?: return false
+        if (!isInRoomSession()) return false
+        s.attachRetroView(retroView)
+        if (isHost) {
+            startPresenceListener()
+        } else {
+        }
+        return true
+    }
+
+    fun prepareMultiplayerPads(retroView: GLRetroView) {
+        runCatching {
+            retroView.setControllerType(0, 1)
+            retroView.setControllerType(1, 1)
+        }
+    }
+
+    fun scan(
+        context: Context,
+        systemId: String?,
+        durationMs: Long = 6_500L,
+    ) {
+        if (phase == RetroNetplayPhase.HOSTING || phase == RetroNetplayPhase.IN_ROOM ||
+            phase == RetroNetplayPhase.CONNECTING
+        ) {
+            return
+        }
+        scanner?.stop()
+        scanner = null
+        phase = RetroNetplayPhase.SCANNING
+        statusText = "Scanning local network…"
+        discovered = emptyList()
+        val app = context.applicationContext
+        scanner =
+            NetplayScanner(appContext = app, systemIdFilter = systemId) { rooms ->
+                main.post {
+                    discovered = rooms
+                    if (phase == RetroNetplayPhase.SCANNING) {
+                        statusText =
+                            if (rooms.isEmpty()) {
+                                "Looking for rooms…"
+                            } else {
+                                "Found ${rooms.size} room${if (rooms.size == 1) "" else "s"}…"
+                            }
+                    }
+                }
+            }.also {
+                it.start(durationMs) {
+                    main.post {
+                        if (phase == RetroNetplayPhase.SCANNING) {
+                            phase = RetroNetplayPhase.SCAN_RESULTS
+                            statusText =
+                                if (discovered.isEmpty()) {
+                                    "No rooms found on Wi‑Fi"
+                                } else {
+                                    "Found ${discovered.size} room${if (discovered.size == 1) "" else "s"}"
+                                }
+                        }
+                    }
+                }
+            }
+    }
+
+    fun stopScan() {
+        scanner?.stop()
+        scanner = null
+        if (phase == RetroNetplayPhase.SCANNING) {
+            phase = RetroNetplayPhase.SCAN_RESULTS
+            statusText =
+                if (discovered.isEmpty()) {
+                    "Scan stopped"
+                } else {
+                    "Found ${discovered.size} room${if (discovered.size == 1) "" else "s"}"
+                }
+        }
+    }
+
+    fun dismissScanResults() {
+        if (phase == RetroNetplayPhase.SCANNING) {
+            scanner?.stop()
+            scanner = null
+        }
+        if (phase == RetroNetplayPhase.SCANNING || phase == RetroNetplayPhase.SCAN_RESULTS) {
+            phase = RetroNetplayPhase.IDLE
+            discovered = emptyList()
+            statusText = ""
+        }
+    }
+
+    fun leave(
+        silent: Boolean = false,
+        message: String = "Left room",
+        retroView: GLRetroView? = null,
+    ) {
+        if (!isHost && pendingGameLinkPeerIp.isNotBlank()) {
+            sendPresenceLeave(pendingGameLinkPeerIp, pendingGameLinkPort, localPlayerName)
+        }
+        scanner?.stop()
+        scanner = null
+        advertiser?.stop()
+        advertiser = null
+        stopPresenceListener()
+        unbindNetpacketPeerListener()
+        val s = session
+        session = null
+        s?.stop()
+        if (isGameLink) {
+            RetroGameLink.stop(retroView)
+        }
+        pendingGameLinkHost = null
+        pendingGameLinkPeerIp = ""
+        isGameLink = false
+        phase = RetroNetplayPhase.IDLE
+        members = emptyList()
+        roomTitle = ""
+        discovered = emptyList()
+        isHost = false
+        if (!silent) {
+            statusText = message
+            main.postDelayed({
+                if (phase == RetroNetplayPhase.IDLE && statusText == message) {
+                    statusText = ""
+                }
+            }, 2_500L)
+        } else {
+            statusText = ""
+        }
+    }
+
+    private const val PRESENCE_JOIN = "WNNPJ"
+    private const val PRESENCE_LEAVE = "WNNPL"
+    private var presenceSocket: DatagramSocket? = null
+    private val presenceRunning = AtomicBoolean(false)
+
+    private fun startPresenceListener() {
+        stopPresenceListener()
+        if (!presenceRunning.compareAndSet(false, true)) return
+        thread(name = "retro-netplay-presence", isDaemon = true) {
+            try {
+                val sock = DatagramSocket(null)
+                presenceSocket = sock
+                sock.reuseAddress = true
+                sock.broadcast = true
+                sock.soTimeout = 500
+                sock.bind(InetSocketAddress(DISCOVERY_PORT))
+                val buf = ByteArray(256)
+                while (presenceRunning.get()) {
+                    val packet = DatagramPacket(buf, buf.size)
+                    try {
+                        sock.receive(packet)
+                    } catch (_: SocketTimeoutException) {
+                        continue
+                    } catch (_: Throwable) {
+                        break
+                    }
+                    val text =
+                        String(packet.data, packet.offset, packet.length, StandardCharsets.UTF_8)
+                    val parts = text.split('|')
+                    if (parts.size < 2) continue
+                    val name = parts[1].ifBlank { "Player" }
+                    when (parts[0]) {
+                        PRESENCE_JOIN -> {
+                            if (isHost &&
+                                (phase == RetroNetplayPhase.HOSTING || phase == RetroNetplayPhase.IN_ROOM)
+                            ) {
+                                notifyPeerJoined(name)
+                            }
+                        }
+                        PRESENCE_LEAVE -> {
+                            if (isHost && phase == RetroNetplayPhase.IN_ROOM) {
+                                notifyPeerLeft(name)
+                            }
+                        }
+                    }
+                }
+            } catch (_: Throwable) {
+            } finally {
+                runCatching { presenceSocket?.close() }
+                presenceSocket = null
+                presenceRunning.set(false)
+            }
+        }
+    }
+
+    private fun stopPresenceListener() {
+        presenceRunning.set(false)
+        runCatching { presenceSocket?.close() }
+        presenceSocket = null
+    }
+
+    private fun sendPresenceJoin(
+        host: String,
+        port: Int,
+        name: String,
+    ) {
+        thread(name = "retro-netplay-presence-send", isDaemon = true) {
+            runCatching {
+                val payload =
+                    "$PRESENCE_JOIN|${name.replace('|', '/').take(24)}|$port"
+                        .toByteArray(StandardCharsets.UTF_8)
+                DatagramSocket().use { sock ->
+                    sock.broadcast = true
+                    val addr = InetAddress.getByName(host)
+                    sock.send(
+                        DatagramPacket(payload, payload.size, addr, DISCOVERY_PORT),
+                    )
+                    runCatching {
+                        sock.send(
+                            DatagramPacket(
+                                payload,
+                                payload.size,
+                                InetAddress.getByName("255.255.255.255"),
+                                DISCOVERY_PORT,
+                            ),
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    private fun sendPresenceLeave(
+        host: String,
+        port: Int,
+        name: String,
+    ) {
+        thread(name = "retro-netplay-presence-leave", isDaemon = true) {
+            runCatching {
+                val payload =
+                    "$PRESENCE_LEAVE|${name.replace('|', '/').take(24)}|$port"
+                        .toByteArray(StandardCharsets.UTF_8)
+                DatagramSocket().use { sock ->
+                    sock.send(
+                        DatagramPacket(
+                            payload,
+                            payload.size,
+                            InetAddress.getByName(host),
+                            DISCOVERY_PORT,
+                        ),
+                    )
+                }
+            }
+        }
+    }
+
+    private fun bindNetpacketPeerListener() {
+        runCatching {
+            com.swordfish.libretrodroid.LibretroDroid.setNetpacketPeerListener { joined, _ ->
+                if (joined) {
+                    notifyPeerJoined("Player 2")
+                } else {
+                    notifyPeerLeft("Player 2")
+                }
+            }
+        }
+    }
+
+    private fun unbindNetpacketPeerListener() {
+        runCatching {
+            com.swordfish.libretrodroid.LibretroDroid.setNetpacketPeerListener(null)
+        }
+    }
+
+    fun activeSession(): RetroNetplaySession? = session
+
+    fun sendLocalKey(keyCode: Int, action: Int) {
+        session?.sendLocalKey(keyCode, action)
+    }
+
+    fun sendLocalMotion(source: Int, x: Float, y: Float) {
+        session?.sendLocalMotion(source, x, y)
+    }
+
+    fun onFrameRendered() {
+        session?.onFrameRendered()
+    }
+}
+
+private fun acquireMulticastLock(appContext: Context?): WifiManager.MulticastLock? {
+    if (appContext == null) return null
+    return runCatching {
+        val wifi = appContext.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
+            ?: return null
+        wifi.createMulticastLock("winnative-netplay").apply {
+            setReferenceCounted(false)
+            acquire()
+        }
+    }.getOrNull()
+}
+
+private class NetplayAdvertiser(
+    private val appContext: Context?,
+    private val tcpPort: Int,
+    private val systemId: String,
+    private val gameName: String,
+    private val hostPlayerName: String,
+    private val roomId: String,
+) {
+    private val running = AtomicBoolean(false)
+    private var socket: DatagramSocket? = null
+    private var multicastLock: WifiManager.MulticastLock? = null
+
+    fun start() {
+        if (!running.compareAndSet(false, true)) return
+        thread(name = "retro-netplay-advertise", isDaemon = true) {
+            try {
+                multicastLock = acquireMulticastLock(appContext)
+                val sock = DatagramSocket()
+                socket = sock
+                sock.broadcast = true
+                val payload =
+                    buildString {
+                        append(RetroNetplayLobby.DISCOVERY_MAGIC)
+                        append('|')
+                        append(systemId.replace('|', '/'))
+                        append('|')
+                        append(tcpPort)
+                        append('|')
+                        append(gameName.replace('|', '/').take(48))
+                        append('|')
+                        append(hostPlayerName.replace('|', '/').take(24))
+                        append('|')
+                        append(roomId)
+                    }.toByteArray(StandardCharsets.UTF_8)
+                val broadcast = InetAddress.getByName("255.255.255.255")
+                while (running.get()) {
+                    val packet =
+                        DatagramPacket(
+                            payload,
+                            payload.size,
+                            broadcast,
+                            RetroNetplayLobby.DISCOVERY_PORT,
+                        )
+                    runCatching { sock.send(packet) }
+                    runCatching {
+                        NetworkInterface.getNetworkInterfaces()?.toList().orEmpty().forEach { nif ->
+                            if (!nif.isUp || nif.isLoopback) return@forEach
+                            nif.interfaceAddresses.forEach { addr ->
+                                val b = addr.broadcast ?: return@forEach
+                                sock.send(
+                                    DatagramPacket(payload, payload.size, b, RetroNetplayLobby.DISCOVERY_PORT),
+                                )
+                            }
+                        }
+                    }
+                    Thread.sleep(800L)
+                }
+            } catch (_: Throwable) {
+            } finally {
+                runCatching { socket?.close() }
+                socket = null
+                runCatching { if (multicastLock?.isHeld == true) multicastLock?.release() }
+                multicastLock = null
+                running.set(false)
+            }
+        }
+    }
+
+    fun stop() {
+        running.set(false)
+        runCatching { socket?.close() }
+        socket = null
+        runCatching { if (multicastLock?.isHeld == true) multicastLock?.release() }
+        multicastLock = null
+    }
+}
+
+private class NetplayScanner(
+    private val appContext: Context?,
+    private val systemIdFilter: String?,
+    private val onUpdate: (List<RetroNetplayDiscoveredRoom>) -> Unit,
+) {
+    private val running = AtomicBoolean(false)
+    private var socket: DatagramSocket? = null
+    private var multicastLock: WifiManager.MulticastLock? = null
+    private val rooms = ConcurrentHashMap<String, RetroNetplayDiscoveredRoom>()
+
+    fun start(
+        durationMs: Long,
+        onFinished: () -> Unit,
+    ) {
+        if (!running.compareAndSet(false, true)) return
+        thread(name = "retro-netplay-scan", isDaemon = true) {
+            try {
+                multicastLock = acquireMulticastLock(appContext)
+                val sock = DatagramSocket(null)
+                socket = sock
+                sock.reuseAddress = true
+                sock.broadcast = true
+                sock.soTimeout = 350
+                sock.bind(InetSocketAddress(RetroNetplayLobby.DISCOVERY_PORT))
+                val buf = ByteArray(512)
+                val deadline = System.currentTimeMillis() + durationMs
+                while (running.get() && System.currentTimeMillis() < deadline) {
+                    val packet = DatagramPacket(buf, buf.size)
+                    try {
+                        sock.receive(packet)
+                    } catch (_: SocketTimeoutException) {
+                        continue
+                    } catch (_: Throwable) {
+                        break
+                    }
+                    val text =
+                        String(packet.data, packet.offset, packet.length, StandardCharsets.UTF_8)
+                    val hostAddr = packet.address?.hostAddress ?: continue
+                    val room = parse(text, hostAddr) ?: continue
+                    if (systemIdFilter != null && room.systemId != systemIdFilter) continue
+                    rooms[room.roomId + "@" + room.hostAddress] = room
+                    onUpdate(rooms.values.sortedBy { it.gameName.lowercase() })
+                }
+            } catch (_: Throwable) {
+            } finally {
+                runCatching { socket?.close() }
+                socket = null
+                runCatching { if (multicastLock?.isHeld == true) multicastLock?.release() }
+                multicastLock = null
+                running.set(false)
+                onFinished()
+            }
+        }
+    }
+
+    fun stop() {
+        running.set(false)
+        runCatching { socket?.close() }
+        socket = null
+    }
+
+    private fun parse(
+        text: String,
+        address: String,
+    ): RetroNetplayDiscoveredRoom? {
+        val parts = text.split('|')
+        if (parts.size < 6) return null
+        if (parts[0] != RetroNetplayLobby.DISCOVERY_MAGIC) return null
+        val port = parts[2].toIntOrNull() ?: return null
+        return RetroNetplayDiscoveredRoom(
+            hostAddress = address,
+            port = port.coerceIn(1, 65535),
+            systemId = parts[1],
+            gameName = parts[3],
+            hostPlayerName = parts[4],
+            roomId = parts[5],
+        )
+    }
+}
+
+class RetroNetplaySession(
+    retroView: GLRetroView?,
+    private val localPort: Int,
+    private val remotePort: Int,
+    private val isHost: Boolean,
+    private val onStatus: (String) -> Unit,
+    private val onPeerJoined: (peerName: String) -> Unit = {},
+    private val onPeerLeft: () -> Unit = {},
+    private val onEnded: (RetroNetplaySession) -> Unit = {},
+) {
+    private val running = AtomicBoolean(false)
+    private val main = Handler(Looper.getMainLooper())
+    private val remoteKeys = ConcurrentHashMap.newKeySet<Int>()
+    private var socket: Socket? = null
+    private var server: ServerSocket? = null
+    private var out: DataOutputStream? = null
+    private var frameCounter = 0
+    private var peerName: String = ""
+
+    @Volatile
+    private var retroView: GLRetroView? = retroView
+
+    fun attachRetroView(view: GLRetroView) {
+        retroView = view
+        RetroNetplayLobby.prepareMultiplayerPads(view)
+        if (isHost) {
+            pushStateNow()
+        } else {
+            requestState()
+        }
+    }
+
+    companion object {
+        private const val MSG_KEY = 1
+        private const val MSG_STATE = 2
+        private const val MSG_HELLO = 3
+        private const val MSG_MOTION = 4
+        private const val MSG_STATE_REQUEST = 5
+        private const val STATE_EVERY_FRAMES = 600
+        private const val RETRO_DEVICE_JOYPAD = 1
+    }
+
+    val isRunning: Boolean get() = running.get()
+
+    fun startHost(listenPort: Int) {
+        if (!running.compareAndSet(false, true)) return
+        retroView?.let { RetroNetplayLobby.prepareMultiplayerPads(it) }
+        thread(name = "retro-netplay-host", isDaemon = true) {
+            try {
+                onStatus("Waiting for a player…")
+                val ss = ServerSocket()
+                server = ss
+                ss.reuseAddress = true
+                ss.bind(InetSocketAddress(listenPort))
+                while (running.get()) {
+                    val client =
+                        try {
+                            ss.accept()
+                        } catch (_: Throwable) {
+                            break
+                        }
+                    socket = client
+                    wire(client)
+                    handshakeAsHost(client)
+                    val joinedName = peerName.ifBlank { "Player 2" }
+                    onStatus("$joinedName joined")
+                    onPeerJoined(joinedName)
+                    pushStateNow()
+                    readLoop(client)
+                    cleanupSocketOnly()
+                    onPeerLeft()
+                    if (!running.get()) break
+                    onStatus("Waiting for a player…")
+                }
+            } catch (t: Throwable) {
+                if (running.get()) onStatus(t.message ?: "Host failed")
+            } finally {
+                val wasRunning = running.get()
+                stopInternal()
+                if (wasRunning) onEnded(this)
+            }
+        }
+    }
+
+    fun startClient(
+        host: String,
+        port: Int,
+        localName: String,
+    ) {
+        if (!running.compareAndSet(false, true)) return
+        retroView?.let { RetroNetplayLobby.prepareMultiplayerPads(it) }
+        thread(name = "retro-netplay-client", isDaemon = true) {
+            try {
+                onStatus("Connecting…")
+                val s = Socket()
+                socket = s
+                s.tcpNoDelay = true
+                s.connect(InetSocketAddress(host, port), 12_000)
+                wire(s)
+                handshakeAsClient(s, localName)
+                onStatus("Connected")
+                onPeerJoined(peerName)
+                requestState()
+                readLoop(s)
+            } catch (t: Throwable) {
+                if (running.get()) onStatus(t.message ?: "Connect failed")
+            } finally {
+                val wasRunning = running.get()
+                stopInternal()
+                if (wasRunning) onEnded(this)
+            }
+        }
+    }
+
+    private fun requestState() {
+        val stream = out ?: return
+        thread(name = "retro-netplay-state-req", isDaemon = true) {
+            runCatching {
+                synchronized(stream) {
+                    stream.writeInt(MSG_STATE_REQUEST)
+                    stream.flush()
+                }
+            }
+        }
+    }
+
+    private fun pushStateNow() {
+        val view = retroView ?: return
+        val stream = out ?: return
+        if (!isHost || !running.get()) return
+        thread(name = "retro-netplay-state-push", isDaemon = true) {
+            runCatching {
+                val state = view.serializeState()
+                synchronized(stream) {
+                    stream.writeInt(MSG_STATE)
+                    stream.writeInt(state.size)
+                    stream.write(state)
+                    stream.flush()
+                }
+            }
+        }
+    }
+
+    private fun handshakeAsHost(s: Socket) {
+        val input = DataInputStream(BufferedInputStream(s.getInputStream()))
+        val stream = out ?: return
+        val type = input.readInt()
+        if (type != MSG_HELLO) throw IllegalStateException("Bad handshake")
+        peerName = input.readUTF().ifBlank { "Player 2" }
+        synchronized(stream) {
+            stream.writeInt(MSG_HELLO)
+            stream.writeUTF(RetroNetplayLobby.localPlayerName.ifBlank { "Host" })
+            stream.flush()
+        }
+    }
+
+    private fun handshakeAsClient(
+        s: Socket,
+        localName: String,
+    ) {
+        val stream = out ?: return
+        synchronized(stream) {
+            stream.writeInt(MSG_HELLO)
+            stream.writeUTF(localName)
+            stream.flush()
+        }
+        val input = DataInputStream(BufferedInputStream(s.getInputStream()))
+        val type = input.readInt()
+        if (type != MSG_HELLO) throw IllegalStateException("Bad handshake")
+        peerName = input.readUTF().ifBlank { "Host" }
+    }
+
+    private fun wire(s: Socket) {
+        s.tcpNoDelay = true
+        out = DataOutputStream(BufferedOutputStream(s.getOutputStream()))
+    }
+
+    private fun readLoop(s: Socket) {
+        val input = DataInputStream(BufferedInputStream(s.getInputStream()))
+        while (running.get() && !s.isClosed) {
+            val type =
+                try {
+                    input.readInt()
+                } catch (_: Throwable) {
+                    break
+                }
+            when (type) {
+                MSG_KEY -> {
+                    val keyCode = input.readInt()
+                    val action = input.readInt()
+                    main.post {
+                        if (!running.get()) return@post
+                        if (action == KeyEvent.ACTION_DOWN) remoteKeys.add(keyCode) else remoteKeys.remove(keyCode)
+                        retroView?.sendKeyEvent(action, keyCode, remotePort)
+                    }
+                }
+                MSG_MOTION -> {
+                    val source = input.readInt()
+                    val x = input.readFloat()
+                    val y = input.readFloat()
+                    main.post {
+                        if (!running.get()) return@post
+                        retroView?.sendMotionEvent(source, x, y, remotePort)
+                    }
+                }
+                MSG_STATE -> {
+                    val len = input.readInt().coerceIn(0, 8 * 1024 * 1024)
+                    val bytes = ByteArray(len)
+                    input.readFully(bytes)
+                    if (!isHost) {
+                        main.post {
+                            val view = retroView ?: return@post
+                            runCatching { view.unserializeState(bytes) }
+                            remoteKeys.forEach { code ->
+                                view.sendKeyEvent(KeyEvent.ACTION_DOWN, code, remotePort)
+                            }
+                        }
+                    }
+                }
+                MSG_STATE_REQUEST -> {
+                    if (isHost) pushStateNow()
+                }
+                MSG_HELLO -> {
+                    runCatching { input.readUTF() }
+                }
+                else -> break
+            }
+        }
+    }
+
+    fun sendLocalKey(
+        keyCode: Int,
+        action: Int,
+    ) {
+        val stream = out ?: return
+        if (!running.get()) return
+        thread(name = "retro-netplay-send", isDaemon = true) {
+            runCatching {
+                synchronized(stream) {
+                    stream.writeInt(MSG_KEY)
+                    stream.writeInt(keyCode)
+                    stream.writeInt(action)
+                    stream.flush()
+                }
+            }
+        }
+    }
+
+    fun sendLocalMotion(
+        source: Int,
+        x: Float,
+        y: Float,
+    ) {
+        val stream = out ?: return
+        if (!running.get()) return
+        thread(name = "retro-netplay-motion", isDaemon = true) {
+            runCatching {
+                synchronized(stream) {
+                    stream.writeInt(MSG_MOTION)
+                    stream.writeInt(source)
+                    stream.writeFloat(x)
+                    stream.writeFloat(y)
+                    stream.flush()
+                }
+            }
+        }
+    }
+
+    fun onFrameRendered() {
+        if (!isHost || !running.get() || out == null || retroView == null) return
+        frameCounter++
+        if (frameCounter % STATE_EVERY_FRAMES != 0) return
+        pushStateNow()
+    }
+
+    fun stop() {
+        stopInternal()
+    }
+
+    private fun cleanupSocketOnly() {
+        runCatching { out?.close() }
+        runCatching { socket?.close() }
+        out = null
+        socket = null
+        val view = retroView
+        remoteKeys.forEach { code ->
+            main.post { view?.sendKeyEvent(KeyEvent.ACTION_UP, code, remotePort) }
+        }
+        remoteKeys.clear()
+    }
+
+    private fun stopInternal() {
+        if (!running.getAndSet(false)) {
+            cleanupSocketOnly()
+            runCatching { server?.close() }
+            server = null
+            return
+        }
+        cleanupSocketOnly()
+        runCatching { server?.close() }
+        server = null
+    }
+}
diff --git a/app/src/main/feature/retro/RetroNetplayEditField.kt b/app/src/main/feature/retro/RetroNetplayEditField.kt
new file mode 100644
index 000000000..962677c57
--- /dev/null
+++ b/app/src/main/feature/retro/RetroNetplayEditField.kt
@@ -0,0 +1,175 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+
+@Composable
+fun RetroNetplayEditField(
+    label: String,
+    value: String,
+    placeholder: String,
+    numeric: Boolean = false,
+    onChange: (String) -> Unit,
+) {
+    var editing by remember { mutableStateOf(false) }
+    var draft by remember(value) { mutableStateOf(value) }
+
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(vertical = 6.dp),
+    ) {
+        Text(
+            label,
+            color = GameSettingsStyle.TextSecondary,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.Medium,
+        )
+        Spacer(Modifier.height(4.dp))
+
+        if (editing) {
+            Row(
+                Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                OutlinedTextField(
+                    value = draft,
+                    onValueChange = { draft = it },
+                    singleLine = true,
+                    placeholder = { Text(placeholder, fontSize = 12.sp) },
+                    keyboardOptions =
+                        if (numeric) {
+                            KeyboardOptions(keyboardType = KeyboardType.Number)
+                        } else {
+                            KeyboardOptions.Default
+                        },
+                    colors =
+                        OutlinedTextFieldDefaults.colors(
+                            focusedBorderColor = GameSettingsStyle.AccentBlue,
+                            unfocusedBorderColor = GameSettingsStyle.CardBorder,
+                            focusedTextColor = GameSettingsStyle.TextPrimary,
+                            unfocusedTextColor = GameSettingsStyle.TextPrimary,
+                        ),
+                    modifier = Modifier.weight(1f),
+                )
+                NetplayPillButton(
+                    text = stringResource(R.string.retro_gs_save),
+                    color = GameSettingsStyle.AccentBlue,
+                ) {
+                    onChange(draft.trim())
+                    editing = false
+                }
+            }
+        } else {
+            Row(
+                Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    value.ifBlank { placeholder },
+                    color =
+                        if (value.isBlank()) {
+                            GameSettingsStyle.TextDim
+                        } else {
+                            GameSettingsStyle.TextPrimary
+                        },
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f),
+                )
+                NetplayPillButton(
+                    text = stringResource(R.string.common_ui_edit),
+                    color = GameSettingsStyle.AccentBlue,
+                ) {
+                    draft = value
+                    editing = true
+                }
+                if (value.isNotBlank()) {
+                    NetplayIconPillButton(
+                        icon = Icons.Outlined.Delete,
+                        color = GameSettingsStyle.DangerRed,
+                        contentDescription = stringResource(R.string.retro_scr_delete),
+                    ) {
+                        draft = ""
+                        onChange("")
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun NetplayPillButton(
+    text: String,
+    color: Color,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        border = BorderStroke(1.dp, color),
+        colors = ButtonDefaults.outlinedButtonColors(contentColor = color),
+        contentPadding = PaddingValues(horizontal = 14.dp, vertical = 4.dp),
+        modifier = Modifier.height(38.dp),
+    ) {
+        Text(text, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1)
+    }
+}
+
+@Composable
+private fun NetplayIconPillButton(
+    icon: ImageVector,
+    color: Color,
+    contentDescription: String,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        border = BorderStroke(1.dp, color),
+        colors = ButtonDefaults.outlinedButtonColors(contentColor = color),
+        contentPadding = PaddingValues(0.dp),
+        modifier = Modifier.height(38.dp).width(46.dp),
+    ) {
+        Icon(icon, contentDescription = contentDescription, modifier = Modifier.size(18.dp))
+    }
+}
diff --git a/app/src/main/feature/retro/RetroNetplayUi.kt b/app/src/main/feature/retro/RetroNetplayUi.kt
new file mode 100644
index 000000000..d50da7de9
--- /dev/null
+++ b/app/src/main/feature/retro/RetroNetplayUi.kt
@@ -0,0 +1,683 @@
+package com.winlator.cmod.feature.retro
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Group
+import androidx.compose.material.icons.outlined.Link
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.outlined.Wifi
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+
+private val RoomBg = Color(0xF0121824)
+private val RoomBorder = Color(0xFF1A9FFF).copy(alpha = 0.45f)
+private val OnlineDot = Color(0xFF3FB950)
+private val RoomCardBg = Color(0xFF141C28)
+private val RoomCardBorder = Color(0xFF2A3A4E)
+
+@Composable
+fun RetroNetplayRoomBanner(
+    onLeave: () -> Unit,
+    onJoinRoom: ((RetroNetplayDiscoveredRoom) -> Unit)? = null,
+    modifier: Modifier = Modifier,
+) {
+    val phase = RetroNetplayLobby.phase
+    val status = RetroNetplayLobby.statusText
+    val discovered = RetroNetplayLobby.discovered
+    val showResults =
+        phase == RetroNetplayPhase.SCAN_RESULTS ||
+            phase == RetroNetplayPhase.SCANNING ||
+            (phase == RetroNetplayPhase.IDLE && discovered.isNotEmpty())
+    if (!showResults) return
+
+    Column(
+        modifier =
+            modifier
+                .fillMaxWidth(0.78f)
+                .background(RoomBg, RoundedCornerShape(12.dp))
+                .border(1.dp, RoomBorder, RoundedCornerShape(12.dp))
+                .padding(horizontal = 12.dp, vertical = 10.dp),
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Icon(
+                imageVector =
+                    when (phase) {
+                        RetroNetplayPhase.SCANNING, RetroNetplayPhase.SCAN_RESULTS -> Icons.Outlined.Search
+                        else -> Icons.Outlined.Wifi
+                    },
+                contentDescription = null,
+                tint = GameSettingsStyle.AccentBlue,
+                modifier = Modifier.size(18.dp),
+            )
+            Spacer(Modifier.width(8.dp))
+            Column(Modifier.weight(1f)) {
+                Text(
+                    text =
+                        when (phase) {
+                            RetroNetplayPhase.SCANNING -> stringResource(R.string.retro_netplay_scanning)
+                            RetroNetplayPhase.SCAN_RESULTS -> stringResource(R.string.retro_netplay_scan_results)
+                            else -> stringResource(R.string.retro_netplay_title)
+                        },
+                    color = Color(0xFFF0F4FF),
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (status.isNotBlank()) {
+                    Text(
+                        status,
+                        color = Color(0xFF93A6BC),
+                        fontSize = 11.sp,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+            if (phase == RetroNetplayPhase.SCANNING) {
+                CircularProgressIndicator(
+                    modifier = Modifier.size(16.dp).padding(end = 4.dp),
+                    strokeWidth = 2.dp,
+                    color = GameSettingsStyle.AccentBlue,
+                )
+            }
+            TextButton(onClick = onLeave) {
+                Text(
+                    text =
+                        when (phase) {
+                            RetroNetplayPhase.SCANNING -> stringResource(R.string.retro_netplay_stop_scan)
+                            else -> stringResource(R.string.retro_netplay_dismiss)
+                        },
+                    color = GameSettingsStyle.DangerRed,
+                    fontSize = 12.sp,
+                )
+            }
+        }
+
+        if (discovered.isNotEmpty()) {
+            Spacer(Modifier.height(8.dp))
+            discovered.forEach { room ->
+                RoomResultRow(
+                    room = room,
+                    onClick =
+                        if (onJoinRoom != null) {
+                            { onJoinRoom(room) }
+                        } else {
+                            null
+                        },
+                )
+                Spacer(Modifier.height(4.dp))
+            }
+        }
+    }
+}
+
+@Composable
+private fun RoomResultRow(
+    room: RetroNetplayDiscoveredRoom,
+    onClick: (() -> Unit)?,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(8.dp))
+                .background(RoomCardBg)
+                .border(1.dp, RoomCardBorder, RoundedCornerShape(8.dp))
+                .then(
+                    if (onClick != null) {
+                        Modifier.clickable(onClick = onClick)
+                    } else {
+                        Modifier
+                    },
+                )
+                .padding(horizontal = 10.dp, vertical = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            Icons.Outlined.Link,
+            contentDescription = null,
+            tint = GameSettingsStyle.AccentBlue,
+            modifier = Modifier.size(16.dp),
+        )
+        Spacer(Modifier.width(8.dp))
+        Column(Modifier.weight(1f)) {
+            Text(
+                "${room.gameName} · ${room.hostPlayerName}",
+                color = Color(0xFFF0F4FF),
+                fontSize = 12.sp,
+                fontWeight = FontWeight.Medium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                "${room.hostAddress}:${room.port}",
+                color = Color(0xFF93A6BC),
+                fontSize = 11.sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        if (onClick != null) {
+            Text(
+                stringResource(R.string.retro_netplay_join_room),
+                color = GameSettingsStyle.AccentBlue,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        }
+    }
+}
+
+@Composable
+fun RetroNetplayEventToast(modifier: Modifier = Modifier) {
+    val message = RetroNetplayLobby.eventToast
+    AnimatedVisibility(
+        visible = !message.isNullOrBlank(),
+        enter = fadeIn() + slideInVertically { it / 2 },
+        exit = fadeOut() + slideOutVertically { it / 2 },
+        modifier = modifier,
+    ) {
+        Text(
+            text = message.orEmpty(),
+            color = Color(0xFFF0F4FF),
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium,
+            textAlign = TextAlign.Center,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis,
+            modifier =
+                Modifier
+                    .clip(RoundedCornerShape(20.dp))
+                    .background(Color(0xE0121824))
+                    .border(1.dp, RoomBorder, RoundedCornerShape(20.dp))
+                    .padding(horizontal = 14.dp, vertical = 8.dp),
+        )
+    }
+}
+
+@Composable
+fun RetroNetplaySettingsSection(
+    systemId: String,
+    version: Int,
+    onChanged: () -> Unit,
+) {
+    val context = LocalContext.current
+    @Suppress("UNUSED_EXPRESSION")
+    version
+    val enabled = RetroDefaults.netplayEnabled(context, systemId)
+    val mode = RetroDefaults.netplayLaunchMode(context, systemId)
+    val host = RetroDefaults.netplayHost(context, systemId)
+    val port = RetroDefaults.netplayPort(context, systemId)
+    val player = RetroDefaults.netplayPlayerName(context)
+    val roomLabel =
+        RetroSystems.fromId(systemId)?.displayName
+            ?: stringResource(R.string.retro_netplay_title)
+
+    val phase = RetroNetplayLobby.phase
+    val status = RetroNetplayLobby.statusText
+    val discovered = RetroNetplayLobby.discovered
+    val members = RetroNetplayLobby.members
+    val scanning = phase == RetroNetplayPhase.SCANNING
+    val inSession =
+        phase == RetroNetplayPhase.HOSTING ||
+            phase == RetroNetplayPhase.IN_ROOM ||
+            phase == RetroNetplayPhase.CONNECTING
+
+    val isGameLink = RetroOnlineSupport.supportsGameLink(systemId)
+    val effectivePort =
+        if (isGameLink) RetroGameLink.clampPort(port) else port
+
+    fun startHostNow() {
+        RetroNetplayLobby.bindLocalName(context)
+        RetroNetplayLobby.host(
+            systemId = systemId,
+            gameName = roomLabel,
+            playerName = RetroNetplayLobby.defaultPlayerName(context),
+            port = effectivePort,
+            context = context,
+            retroView = null,
+        )
+        onChanged()
+    }
+
+    fun joinNow(address: String, joinPort: Int = effectivePort, game: String = roomLabel) {
+        val target = address.trim()
+        if (target.isBlank()) return
+        RetroNetplayLobby.bindLocalName(context)
+        RetroNetplayLobby.join(
+            host = target,
+            port = joinPort,
+            playerName = RetroNetplayLobby.defaultPlayerName(context),
+            gameName = game,
+            systemId = systemId,
+            retroView = null,
+        )
+        onChanged()
+    }
+
+    RetroSettingGroup {
+        RetroGroupTitle(stringResource(R.string.retro_gs_section_online))
+        Text(
+            stringResource(
+                if (isGameLink) {
+                    R.string.retro_netplay_help_game_link
+                } else {
+                    R.string.retro_netplay_help
+                },
+            ),
+            color = GameSettingsStyle.TextSecondary,
+            fontSize = 12.sp,
+            softWrap = true,
+            maxLines = 8,
+            lineHeight = 16.sp,
+            overflow = TextOverflow.Clip,
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 8.dp),
+        )
+        RetroSettingSwitch(
+            stringResource(R.string.retro_gs_netplay_enable),
+            enabled,
+            subtitle = stringResource(R.string.retro_gs_netplay_enable_subtitle),
+        ) {
+            if (it) {
+                RetroDefaults.setNetplayEnabled(context, systemId, true)
+                if (RetroDefaults.netplayLaunchMode(context, systemId) !in setOf("host", "join")) {
+                    RetroDefaults.setNetplayLaunchMode(context, systemId, "off")
+                }
+            } else {
+                RetroDefaults.clearNetplayArm(context, systemId)
+                if (inSession ||
+                    phase == RetroNetplayPhase.SCANNING ||
+                    phase == RetroNetplayPhase.SCAN_RESULTS
+                ) {
+                    RetroNetplayLobby.leave(silent = true)
+                }
+            }
+            onChanged()
+        }
+        if (enabled) {
+            RetroSettingTextField(
+                stringResource(R.string.retro_netplay_player_name),
+                player,
+                stringResource(R.string.retro_netplay_player_name_hint),
+            ) {
+                RetroDefaults.setNetplayPlayerName(context, it)
+                onChanged()
+            }
+            Text(
+                stringResource(R.string.retro_netplay_launch_mode),
+                color = GameSettingsStyle.TextSecondary,
+                fontSize = 11.sp,
+                fontWeight = FontWeight.Medium,
+                modifier = Modifier.padding(top = 8.dp, bottom = 4.dp),
+            )
+            Row(
+                Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                listOf(
+                    "host" to R.string.retro_netplay_mode_host,
+                    "join" to R.string.retro_netplay_mode_join,
+                ).forEach { (id, labelRes) ->
+                    val selected = mode == id
+                    OutlinedButton(
+                        onClick = {
+                            RetroDefaults.setNetplayLaunchMode(context, systemId, id)
+                            if (id == "host") {
+                                startHostNow()
+                            } else if (RetroNetplayLobby.isHost && inSession) {
+                                RetroNetplayLobby.leave(silent = true)
+                            }
+                            onChanged()
+                        },
+                        modifier = Modifier.weight(1f),
+                        border =
+                            BorderStroke(
+                                1.dp,
+                                if (selected) {
+                                    GameSettingsStyle.AccentBlue
+                                } else {
+                                    GameSettingsStyle.CardBorder
+                                },
+                            ),
+                        colors =
+                            ButtonDefaults.outlinedButtonColors(
+                                contentColor =
+                                    if (selected) {
+                                        GameSettingsStyle.AccentBlue
+                                    } else {
+                                        GameSettingsStyle.TextPrimary
+                                    },
+                            ),
+                    ) {
+                        Text(stringResource(labelRes), fontSize = 12.sp, maxLines = 1)
+                    }
+                }
+            }
+
+            RetroNetplayEditField(
+                label = stringResource(R.string.retro_gs_netplay_port),
+                value = port.toString(),
+                placeholder = RetroNetplayLobby.DEFAULT_TCP_PORT.toString(),
+                numeric = true,
+            ) { entered ->
+                val p = entered.toIntOrNull() ?: RetroNetplayLobby.DEFAULT_TCP_PORT
+                RetroDefaults.setNetplayPort(context, systemId, p)
+                onChanged()
+            }
+
+            if (inSession) {
+                Spacer(Modifier.height(10.dp))
+                Text(
+                    when {
+                        RetroNetplayLobby.isHost && phase == RetroNetplayPhase.HOSTING ->
+                            stringResource(R.string.retro_netplay_hosting_room)
+                        phase == RetroNetplayPhase.CONNECTING ->
+                            stringResource(R.string.retro_netplay_connecting)
+                        else -> stringResource(R.string.retro_netplay_in_room)
+                    },
+                    color = GameSettingsStyle.AccentBlue,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+                if (status.isNotBlank()) {
+                    Text(
+                        status,
+                        color = GameSettingsStyle.TextSecondary,
+                        fontSize = 11.sp,
+                        softWrap = true,
+                        maxLines = 3,
+                        lineHeight = 15.sp,
+                        overflow = TextOverflow.Clip,
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(top = 2.dp, bottom = 6.dp),
+                    )
+                }
+                members.forEach { member ->
+                    val line =
+                        buildString {
+                            append(member.name)
+                            if (member.isHost) append(" · Host")
+                            if (member.isLocal) append(" · You")
+                            if (!member.isHost && !member.isLocal) append(" · Joined")
+                        }
+                    Row(
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 3.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Icon(
+                            Icons.Outlined.Group,
+                            contentDescription = null,
+                            tint = GameSettingsStyle.AccentBlue,
+                            modifier = Modifier.size(16.dp),
+                        )
+                        Spacer(Modifier.width(8.dp))
+                        Text(
+                            line,
+                            color = GameSettingsStyle.TextPrimary,
+                            fontSize = 13.sp,
+                            softWrap = true,
+                            maxLines = 2,
+                            overflow = TextOverflow.Clip,
+                            modifier = Modifier.weight(1f),
+                        )
+                    }
+                }
+                TextButton(
+                    onClick = {
+                        RetroNetplayLobby.leave(silent = false)
+                        onChanged()
+                    },
+                    modifier = Modifier.padding(top = 4.dp),
+                ) {
+                    Text(
+                        stringResource(R.string.retro_netplay_leave),
+                        color = GameSettingsStyle.DangerRed,
+                        fontSize = 12.sp,
+                    )
+                }
+                Text(
+                    stringResource(R.string.retro_netplay_prelaunch_hint),
+                    color = GameSettingsStyle.TextDim,
+                    fontSize = 11.sp,
+                    softWrap = true,
+                    maxLines = 4,
+                    lineHeight = 15.sp,
+                    overflow = TextOverflow.Clip,
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 4.dp),
+                )
+            } else if (mode == "host") {
+                Text(
+                    stringResource(R.string.retro_netplay_host_mode_hint),
+                    color = GameSettingsStyle.TextDim,
+                    fontSize = 11.sp,
+                    softWrap = true,
+                    maxLines = 5,
+                    lineHeight = 15.sp,
+                    overflow = TextOverflow.Clip,
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 8.dp),
+                )
+                OutlinedButton(
+                    onClick = { startHostNow() },
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 8.dp),
+                    border = BorderStroke(1.dp, GameSettingsStyle.AccentBlue),
+                    colors =
+                        ButtonDefaults.outlinedButtonColors(
+                            contentColor = GameSettingsStyle.AccentBlue,
+                        ),
+                ) {
+                    Icon(Icons.Outlined.Group, contentDescription = null, modifier = Modifier.size(16.dp))
+                    Spacer(Modifier.width(8.dp))
+                    Text(stringResource(R.string.retro_netplay_host_action), fontSize = 12.sp)
+                }
+            }
+
+            if (mode == "join" && !inSession) {
+                RetroNetplayEditField(
+                    label = stringResource(R.string.retro_gs_netplay_host),
+                    value = host,
+                    placeholder = stringResource(R.string.retro_gs_netplay_host_hint),
+                ) {
+                    RetroDefaults.setNetplayHost(context, systemId, it)
+                    onChanged()
+                }
+
+                Spacer(Modifier.height(10.dp))
+                Text(
+                    stringResource(R.string.retro_netplay_find_rooms),
+                    color = GameSettingsStyle.TextSecondary,
+                    fontSize = 11.sp,
+                    fontWeight = FontWeight.Medium,
+                    modifier = Modifier.padding(bottom = 6.dp),
+                )
+                if (discovered.isNotEmpty()) {
+                    discovered.forEach { room ->
+                        RoomResultRow(
+                            room = room,
+                            onClick = {
+                                joinNow(
+                                    address = room.hostAddress,
+                                    joinPort = room.port,
+                                    game = room.gameName.ifBlank { roomLabel },
+                                )
+                            },
+                        )
+                        Spacer(Modifier.height(6.dp))
+                    }
+                    Text(
+                        stringResource(R.string.retro_netplay_select_room_hint),
+                        color = GameSettingsStyle.TextDim,
+                        fontSize = 11.sp,
+                        softWrap = true,
+                        maxLines = 3,
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                    Spacer(Modifier.height(10.dp))
+                } else if (phase == RetroNetplayPhase.SCAN_RESULTS) {
+                    Text(
+                        stringResource(R.string.retro_netplay_no_rooms),
+                        color = GameSettingsStyle.TextDim,
+                        fontSize = 12.sp,
+                        modifier = Modifier.padding(bottom = 8.dp),
+                    )
+                }
+                Row(
+                    Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    OutlinedButton(
+                        onClick = {
+                            if (scanning) {
+                                RetroNetplayLobby.stopScan()
+                            } else {
+                                RetroNetplayLobby.scan(context, systemId)
+                            }
+                            onChanged()
+                        },
+                        border =
+                            BorderStroke(
+                                1.dp,
+                                if (scanning) GameSettingsStyle.AccentBlue else GameSettingsStyle.CardBorder,
+                            ),
+                        colors =
+                            ButtonDefaults.outlinedButtonColors(
+                                contentColor =
+                                    if (scanning) {
+                                        GameSettingsStyle.AccentBlue
+                                    } else {
+                                        GameSettingsStyle.TextPrimary
+                                    },
+                            ),
+                        modifier = Modifier.weight(1f),
+                    ) {
+                        if (scanning) {
+                            CircularProgressIndicator(
+                                modifier = Modifier.size(14.dp),
+                                strokeWidth = 2.dp,
+                                color = GameSettingsStyle.AccentBlue,
+                            )
+                            Spacer(Modifier.width(8.dp))
+                            Text(stringResource(R.string.retro_netplay_stop_scan), fontSize = 12.sp)
+                        } else {
+                            Icon(
+                                Icons.Outlined.Search,
+                                contentDescription = null,
+                                modifier = Modifier.size(16.dp),
+                            )
+                            Spacer(Modifier.width(6.dp))
+                            Text(stringResource(R.string.retro_netplay_scan_action), fontSize = 12.sp)
+                        }
+                    }
+                    if (scanning || phase == RetroNetplayPhase.SCAN_RESULTS || discovered.isNotEmpty()) {
+                        TextButton(
+                            onClick = {
+                                RetroNetplayLobby.dismissScanResults()
+                                onChanged()
+                            },
+                        ) {
+                            Text(
+                                stringResource(R.string.retro_netplay_dismiss),
+                                color = GameSettingsStyle.TextSecondary,
+                                fontSize = 12.sp,
+                            )
+                        }
+                    }
+                }
+
+                if (host.isNotBlank()) {
+                    OutlinedButton(
+                        onClick = { joinNow(host) },
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(top = 8.dp),
+                        border = BorderStroke(1.dp, GameSettingsStyle.AccentBlue),
+                        colors =
+                            ButtonDefaults.outlinedButtonColors(
+                                contentColor = GameSettingsStyle.AccentBlue,
+                            ),
+                    ) {
+                        Icon(Icons.Outlined.Link, contentDescription = null, modifier = Modifier.size(16.dp))
+                        Spacer(Modifier.width(8.dp))
+                        Text(stringResource(R.string.retro_netplay_join_action), fontSize = 12.sp)
+                    }
+                }
+
+                if (status.isNotBlank() &&
+                    (scanning || phase == RetroNetplayPhase.SCAN_RESULTS || discovered.isNotEmpty())
+                ) {
+                    Text(
+                        status,
+                        color =
+                            if (discovered.isEmpty() && phase == RetroNetplayPhase.SCAN_RESULTS) {
+                                GameSettingsStyle.TextDim
+                            } else {
+                                GameSettingsStyle.AccentBlue
+                            },
+                        fontSize = 12.sp,
+                        modifier = Modifier.padding(top = 8.dp),
+                    )
+                }
+            }
+
+            Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+                RetroNetplayEventToast(Modifier.padding(top = 10.dp))
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroOnlineSupport.kt b/app/src/main/feature/retro/RetroOnlineSupport.kt
new file mode 100644
index 000000000..05f44fe8b
--- /dev/null
+++ b/app/src/main/feature/retro/RetroOnlineSupport.kt
@@ -0,0 +1,59 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+
+enum class RetroOnlineMode {
+    NONE,
+    DEV9_ONLINE,
+    LIBRETRO_NETPLAY,
+    GAME_LINK,
+    DOLPHIN_NETPLAY,
+}
+
+object RetroOnlineSupport {
+    fun modeFor(systemId: String?): RetroOnlineMode =
+        when (systemId) {
+            RetroSystems.PS2.id -> RetroOnlineMode.DEV9_ONLINE
+            RetroSystems.NES.id,
+            RetroSystems.SNES.id,
+            RetroSystems.GENESIS.id,
+            RetroSystems.MASTER_SYSTEM.id,
+            RetroSystems.GAME_GEAR.id,
+            RetroSystems.N64.id,
+            RetroSystems.PSX.id,
+            -> RetroOnlineMode.LIBRETRO_NETPLAY
+            RetroSystems.GAMEBOY.id,
+            RetroSystems.GAMEBOY_COLOR.id,
+            RetroSystems.GBA.id,
+            -> RetroOnlineMode.GAME_LINK
+            RetroSystems.GAMECUBE.id,
+            RetroSystems.WII.id,
+            -> RetroOnlineMode.DOLPHIN_NETPLAY
+            else -> RetroOnlineMode.NONE
+        }
+
+    fun isGbaNetpacket(systemId: String?): Boolean = systemId == RetroSystems.GBA.id
+
+    fun supportsDev9(systemId: String?): Boolean = modeFor(systemId) == RetroOnlineMode.DEV9_ONLINE
+
+    fun supportsNetplayCore(systemId: String?): Boolean =
+        modeFor(systemId) == RetroOnlineMode.LIBRETRO_NETPLAY
+
+    fun supportsGameLink(systemId: String?): Boolean =
+        modeFor(systemId) == RetroOnlineMode.GAME_LINK
+
+    fun supportsDolphinNetplay(systemId: String?): Boolean =
+        modeFor(systemId) == RetroOnlineMode.DOLPHIN_NETPLAY
+
+    fun supportsMultiplayerUi(systemId: String?): Boolean =
+        supportsNetplayCore(systemId) || supportsGameLink(systemId)
+
+    fun supportsNetplay(context: Context, systemId: String?): Boolean {
+        if (!supportsNetplayCore(systemId) && !supportsGameLink(systemId)) return false
+        val system = RetroSystems.fromId(systemId) ?: return false
+        if (system.isExternal || system.coreFileName.isBlank()) return false
+        return RetroCoreManager.isCoreAvailable(context, system)
+    }
+
+    fun netplayFrontendReady(): Boolean = true
+}
diff --git a/app/src/main/feature/retro/RetroRomArchive.kt b/app/src/main/feature/retro/RetroRomArchive.kt
new file mode 100644
index 000000000..800f143b1
--- /dev/null
+++ b/app/src/main/feature/retro/RetroRomArchive.kt
@@ -0,0 +1,117 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import java.io.File
+import java.util.zip.ZipFile
+import java.util.zip.ZipInputStream
+import org.apache.commons.compress.archivers.sevenz.SevenZFile
+
+object RetroRomArchive {
+    private val ARCHIVE_EXTS = setOf("zip", "7z")
+    private const val MAX_INNER_BYTES = 96L * 1024 * 1024
+
+    data class Inner(val name: String, val size: Long)
+
+    fun isArchive(path: String?): Boolean =
+        path != null && path.substringAfterLast('.', "").lowercase() in ARCHIVE_EXTS
+
+    fun detect(path: String): RetroSystem? {
+        val inner = innerRom(path) ?: return null
+        return RetroSystems.fromExtension(inner.name.substringAfterLast('.', ""))
+    }
+
+    fun innerRom(path: String): Inner? {
+        val f = File(path)
+        if (!f.isFile) return null
+        val entries =
+            runCatching {
+                when (path.substringAfterLast('.', "").lowercase()) {
+                    "zip" -> zipNames(f)
+                    "7z" -> sevenZNames(f)
+                    else -> emptyList()
+                }
+            }.getOrDefault(emptyList())
+        return entries.firstOrNull { playableRom(it.name, it.size) }
+    }
+
+    fun extractTo(context: Context, path: String): File? {
+        val inner = innerRom(path) ?: return null
+        val outDir = File(context.cacheDir, "retro_extracted").apply { mkdirs() }
+        val target = File(outDir, File(inner.name).name)
+        if (target.isFile && target.length() == inner.size) return target
+        val ok =
+            runCatching {
+                when (path.substringAfterLast('.', "").lowercase()) {
+                    "zip" -> extractZip(File(path), inner.name, target)
+                    "7z" -> extractSevenZ(context, File(path), inner.name, target)
+                    else -> false
+                }
+            }.getOrDefault(false)
+        return if (ok && target.isFile) target else null
+    }
+
+    private fun playableRom(name: String, size: Long): Boolean {
+        if (size <= 0L || size > MAX_INNER_BYTES) return false
+        val sys = RetroSystems.fromExtension(name.substringAfterLast('.', "")) ?: return false
+        return sys.id != RetroSystems.PS2.id && sys.id != RetroSystems.PSX.id
+    }
+
+    private fun zipNames(f: File): List<Inner> {
+        val out = ArrayList<Inner>()
+        ZipFile(f).use { zip ->
+            val e = zip.entries()
+            while (e.hasMoreElements()) {
+                val entry = e.nextElement()
+                if (!entry.isDirectory) out.add(Inner(entry.name, entry.size))
+            }
+        }
+        return out
+    }
+
+    private fun sevenZNames(f: File): List<Inner> {
+        val out = ArrayList<Inner>()
+        SevenZFile(f).use { z ->
+            var entry = z.nextEntry
+            while (entry != null) {
+                if (!entry.isDirectory) out.add(Inner(entry.name, entry.size))
+                entry = z.nextEntry
+            }
+        }
+        return out
+    }
+
+    private fun extractZip(f: File, entryName: String, target: File): Boolean {
+        ZipInputStream(f.inputStream().buffered()).use { zin ->
+            var e = zin.nextEntry
+            while (e != null) {
+                if (e.name == entryName) {
+                    target.outputStream().use { zin.copyTo(it) }
+                    return true
+                }
+                e = zin.nextEntry
+            }
+        }
+        return false
+    }
+
+    private fun extractSevenZ(context: Context, f: File, entryName: String, target: File): Boolean {
+        SevenZFile(f).use { z ->
+            var entry = z.nextEntry
+            while (entry != null) {
+                if (entry.name == entryName) {
+                    target.outputStream().use { out ->
+                        val buf = ByteArray(64 * 1024)
+                        while (true) {
+                            val n = z.read(buf)
+                            if (n < 0) break
+                            out.write(buf, 0, n)
+                        }
+                    }
+                    return true
+                }
+                entry = z.nextEntry
+            }
+        }
+        return false
+    }
+}
diff --git a/app/src/main/feature/retro/RetroRomScanner.kt b/app/src/main/feature/retro/RetroRomScanner.kt
new file mode 100644
index 000000000..7487dcd6c
--- /dev/null
+++ b/app/src/main/feature/retro/RetroRomScanner.kt
@@ -0,0 +1,55 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.runtime.container.ContainerManager
+import java.io.File
+
+object RetroRomScanner {
+    data class Result(val added: Int, val removed: Int)
+
+    fun scanConfiguredFolder(context: Context): Result {
+        val dir = RetroDefaults.romsDir(context)?.let(::File) ?: return Result(0, 0)
+        if (!dir.isDirectory) return Result(0, 0)
+        return scan(context, dir)
+    }
+
+    fun scan(context: Context, dir: File): Result {
+        val dirPath = dir.absolutePath
+        val retro =
+            runCatching {
+                ContainerManager(context).loadShortcuts().filter { RetroShortcuts.isRetroShortcut(it) }
+            }.getOrDefault(emptyList())
+
+        var removed = 0
+        retro.forEach { shortcut ->
+            val rom = RetroShortcuts.romPath(shortcut)
+            if (rom.isNotBlank() && isUnder(rom, dirPath) && !File(rom).isFile) {
+                if (LibraryShortcutUtils.deleteShortcutArtifacts(context, shortcut)) removed++
+            }
+        }
+
+        val existing =
+            retro.mapNotNull { RetroShortcuts.romPath(it).takeIf { p -> p.isNotBlank() && File(p).isFile } }.toHashSet()
+        val roms =
+            dir.walkTopDown()
+                .maxDepth(4)
+                .filter { it.isFile && RetroSystems.isRetroRom(it.absolutePath) }
+                .filter { it.absolutePath !in existing }
+                .toList()
+        var added = 0
+        for (rom in roms) {
+            val system = RetroSystems.detectForFile(rom.absolutePath) ?: continue
+            val name = rom.nameWithoutExtension.trim().ifBlank { rom.name }
+            if (RetroShortcuts.create(context, name, rom.absolutePath, system)) added++
+        }
+
+        RetroBoxart.ensureArtworkAsync(context)
+        return Result(added, removed)
+    }
+
+    private fun isUnder(path: String, dir: String): Boolean {
+        val d = if (dir.endsWith("/")) dir else "$dir/"
+        return path == dir || path.startsWith(d)
+    }
+}
diff --git a/app/src/main/feature/retro/RetroSaveImport.kt b/app/src/main/feature/retro/RetroSaveImport.kt
new file mode 100644
index 000000000..a62fecbb4
--- /dev/null
+++ b/app/src/main/feature/retro/RetroSaveImport.kt
@@ -0,0 +1,108 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import java.io.ByteArrayInputStream
+import java.io.File
+import java.util.zip.ZipInputStream
+import org.apache.commons.compress.archivers.sevenz.SevenZFile
+
+object RetroSaveImport {
+    private val SAVE_EXTS = setOf("srm", "sav", "eep", "sra", "fla", "mpk", "bkr", "dsv", "mcr", "sms", "state", "st0", "ss0")
+    private const val MAX_SAVE_BYTES = 16 * 1024 * 1024
+
+    sealed class Result {
+        data class Success(val name: String, val bytes: Int) : Result()
+        data class Invalid(val reason: String) : Result()
+    }
+
+    private data class Entry(val name: String, val bytes: ByteArray)
+
+    fun import(context: Context, gameName: String, sourceName: String, raw: ByteArray): Result {
+        if (raw.isEmpty()) return Result.Invalid("The file is empty.")
+
+        val entries =
+            when (archiveKind(raw)) {
+                "zip" -> runCatching { unzip(raw) }.getOrNull()
+                    ?: return Result.Invalid("This archive could not be read.")
+                "7z" -> runCatching { un7z(context, raw) }.getOrNull()
+                    ?: return Result.Invalid("This 7z archive could not be read.")
+                "rar" -> return Result.Invalid("RAR archives aren't supported — extract the save first, then import it.")
+                else -> listOf(Entry(sourceName, raw))
+            }
+
+        val candidates = entries.filter { it.bytes.isNotEmpty() && !isRom(it.name) && it.bytes.size <= MAX_SAVE_BYTES }
+        if (candidates.isEmpty()) {
+            return if (entries.any { isRom(it.name) }) {
+                Result.Invalid("That looks like a ROM, not a save file.")
+            } else {
+                Result.Invalid("No valid save file was found inside.")
+            }
+        }
+
+        val chosen =
+            candidates.firstOrNull { ext(it.name) in SAVE_EXTS }
+                ?: candidates.maxByOrNull { it.bytes.size }!!
+
+        return runCatching {
+            RetroSaveStates.sramFile(context, gameName).writeBytes(chosen.bytes)
+            Result.Success(chosen.name, chosen.bytes.size)
+        }.getOrElse { Result.Invalid("Could not write the save to storage.") }
+    }
+
+    private fun archiveKind(b: ByteArray): String? {
+        if (b.size >= 4 && b[0] == 0x50.toByte() && b[1] == 0x4B.toByte() &&
+            (b[2] == 0x03.toByte() || b[2] == 0x05.toByte() || b[2] == 0x07.toByte())
+        ) {
+            return "zip"
+        }
+        if (b.size >= 6 && b[0] == 0x37.toByte() && b[1] == 0x7A.toByte() &&
+            b[2] == 0xBC.toByte() && b[3] == 0xAF.toByte() && b[4] == 0x27.toByte() && b[5] == 0x1C.toByte()
+        ) {
+            return "7z"
+        }
+        if (b.size >= 4 && b[0] == 0x52.toByte() && b[1] == 0x61.toByte() &&
+            b[2] == 0x72.toByte() && b[3] == 0x21.toByte()
+        ) {
+            return "rar"
+        }
+        return null
+    }
+
+    private fun unzip(raw: ByteArray): List<Entry> {
+        val out = ArrayList<Entry>()
+        ZipInputStream(ByteArrayInputStream(raw)).use { zin ->
+            var e = zin.nextEntry
+            while (e != null) {
+                if (!e.isDirectory) out.add(Entry(File(e.name).name, zin.readBytes()))
+                e = zin.nextEntry
+            }
+        }
+        return out
+    }
+
+    private fun un7z(context: Context, raw: ByteArray): List<Entry> {
+        val tmp = File.createTempFile("import", ".7z", context.cacheDir)
+        return try {
+            tmp.writeBytes(raw)
+            val out = ArrayList<Entry>()
+            SevenZFile(tmp).use { z ->
+                var e = z.nextEntry
+                while (e != null) {
+                    if (!e.isDirectory) {
+                        val buf = ByteArray(e.size.toInt().coerceAtLeast(0))
+                        z.read(buf)
+                        out.add(Entry(File(e.name).name, buf))
+                    }
+                    e = z.nextEntry
+                }
+            }
+            out
+        } finally {
+            tmp.delete()
+        }
+    }
+
+    private fun ext(name: String): String = name.substringAfterLast('.', "").lowercase()
+
+    private fun isRom(name: String): Boolean = ext(name) in RetroSystems.allExtensions
+}
diff --git a/app/src/main/feature/retro/RetroSaveStates.kt b/app/src/main/feature/retro/RetroSaveStates.kt
new file mode 100644
index 000000000..883c950e0
--- /dev/null
+++ b/app/src/main/feature/retro/RetroSaveStates.kt
@@ -0,0 +1,227 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import org.json.JSONObject
+import java.io.File
+
+object RetroSaveStates {
+    const val SLOT_COUNT = 10
+
+    data class SlotInfo(
+        val slot: Int,
+        val customName: String?,
+        val timestampMs: Long,
+        val exists: Boolean,
+        val sizeBytes: Long,
+    )
+
+    fun safeName(gameName: String): String = gameName.replace(Regex("[^A-Za-z0-9._-]"), "_")
+
+    fun cloudGameId(
+        systemId: String?,
+        gameName: String,
+    ): String = "retro_${systemId ?: "unknown"}_${safeName(gameName)}"
+
+    fun gameDir(
+        context: Context,
+        gameName: String,
+    ): File {
+        val dir = File(context.filesDir, "retro/games/${safeName(gameName)}")
+        dir.mkdirs()
+        return dir
+    }
+
+    fun slotFile(
+        context: Context,
+        gameName: String,
+        slot: Int,
+    ): File = File(gameDir(context, gameName), "slot$slot.state")
+
+    fun cloudDir(
+        context: Context,
+        gameName: String,
+    ): File {
+        val dir = File(gameDir(context, gameName), "sram")
+        dir.mkdirs()
+        return dir
+    }
+
+    fun sramFile(
+        context: Context,
+        gameName: String,
+    ): File = File(cloudDir(context, gameName), "${safeName(gameName)}.srm")
+
+    fun migrateLegacyCloudLayout(context: Context, gameName: String) {
+        runCatching {
+            val game = gameDir(context, gameName)
+            val sram = cloudDir(context, gameName)
+            game.listFiles()?.forEach { f ->
+                if (f.isFile && f.name.endsWith(".srm")) {
+                    f.copyTo(File(sram, f.name), overwrite = true)
+                    f.delete()
+                }
+            }
+        }
+    }
+
+    private fun metaFile(dir: File): File = File(dir, "slots.json")
+
+    private fun readMeta(dir: File): JSONObject =
+        runCatching { JSONObject(metaFile(dir).readText()) }.getOrDefault(JSONObject())
+
+    private fun writeMetaAtomic(
+        dir: File,
+        meta: JSONObject,
+    ) {
+        runCatching {
+            val tmp = File(dir, "slots.json.tmp")
+            tmp.writeText(meta.toString())
+            if (!tmp.renameTo(metaFile(dir))) {
+                metaFile(dir).writeText(meta.toString())
+                tmp.delete()
+            }
+        }
+    }
+
+    fun recordIdentity(
+        context: Context,
+        gameName: String,
+        systemId: String?,
+    ) {
+        val dir = gameDir(context, gameName)
+        val meta = readMeta(dir)
+        if (meta.optString("game") == gameName && meta.optString("system") == (systemId ?: "")) return
+        meta.put("game", gameName)
+        meta.put("system", systemId ?: "")
+        writeMetaAtomic(dir, meta)
+    }
+
+    fun migrateLegacy(
+        context: Context,
+        gameName: String,
+    ) {
+        runCatching {
+            val dir = gameDir(context, gameName)
+            val safe = safeName(gameName)
+            val legacyState = File(File(context.filesDir, "retro/states"), "$safe.state")
+            val slot1 = File(dir, "slot1.state")
+            if (legacyState.isFile && !slot1.exists()) legacyState.renameTo(slot1)
+            val legacySram = File(File(context.filesDir, "retro/saves"), "$safe.srm")
+            val sram = sramFile(context, gameName)
+            if (legacySram.isFile && !sram.exists()) legacySram.renameTo(sram)
+            val flatSram = File(dir, "$safe.srm")
+            if (flatSram.isFile && !sram.exists()) flatSram.renameTo(sram)
+        }
+    }
+
+    fun listSlots(
+        context: Context,
+        gameName: String,
+    ): List<SlotInfo> {
+        val dir = gameDir(context, gameName)
+        val names = readMeta(dir).optJSONObject("names") ?: JSONObject()
+        return (1..SLOT_COUNT).map { slot ->
+            val file = File(dir, "slot$slot.state")
+            SlotInfo(
+                slot = slot,
+                customName = names.optString(slot.toString()).ifEmpty { null },
+                timestampMs = if (file.isFile) file.lastModified() else 0L,
+                exists = file.isFile,
+                sizeBytes = if (file.isFile) file.length() else 0L,
+            )
+        }
+    }
+
+    fun writeSlot(
+        context: Context,
+        gameName: String,
+        slot: Int,
+        bytes: ByteArray,
+    ): Boolean =
+        runCatching {
+            require(bytes.isNotEmpty())
+            val target = slotFile(context, gameName, slot)
+            val tmp = File(target.parentFile, "slot$slot.state.tmp")
+            tmp.writeBytes(bytes)
+            if (tmp.length() != bytes.size.toLong()) {
+                tmp.delete()
+                return false
+            }
+            if (!tmp.renameTo(target)) {
+                target.writeBytes(bytes)
+                tmp.delete()
+            }
+            true
+        }.getOrDefault(false)
+
+    fun readSlot(
+        context: Context,
+        gameName: String,
+        slot: Int,
+    ): ByteArray? =
+        runCatching {
+            val file = slotFile(context, gameName, slot)
+            if (!file.isFile || file.length() == 0L) return null
+            file.readBytes()
+        }.getOrNull()
+
+    fun renameSlot(
+        context: Context,
+        gameName: String,
+        slot: Int,
+        name: String?,
+    ) {
+        val dir = gameDir(context, gameName)
+        val meta = readMeta(dir)
+        val names = meta.optJSONObject("names") ?: JSONObject()
+        if (name.isNullOrBlank()) names.remove(slot.toString()) else names.put(slot.toString(), name.take(48))
+        meta.put("names", names)
+        writeMetaAtomic(dir, meta)
+    }
+
+    fun hasAnySave(
+        context: Context,
+        gameName: String,
+    ): Boolean {
+        if (sramFile(context, gameName).isFile) return true
+        return (1..SLOT_COUNT).any { slotFile(context, gameName, it).isFile }
+    }
+
+    fun latestLocalTimestamp(
+        context: Context,
+        gameName: String,
+    ): Long {
+        var latest = 0L
+        val sram = sramFile(context, gameName)
+        if (sram.isFile) latest = maxOf(latest, sram.lastModified())
+        (1..SLOT_COUNT).forEach { slot ->
+            val file = slotFile(context, gameName, slot)
+            if (file.isFile) latest = maxOf(latest, file.lastModified())
+        }
+        return latest
+    }
+
+    fun relativeTime(timestampMs: Long): String {
+        if (timestampMs <= 0L) return "Empty"
+        val delta = System.currentTimeMillis() - timestampMs
+        if (delta < 60_000L) return "just now"
+        val minutes = delta / 60_000L
+        if (minutes < 60) return "$minutes minute${if (minutes == 1L) "" else "s"} ago"
+        val hours = minutes / 60
+        val remMinutes = minutes % 60
+        if (hours < 24) {
+            return if (remMinutes > 0) {
+                "$hours hour${if (hours == 1L) "" else "s"} $remMinutes minute${if (remMinutes == 1L) "" else "s"} ago"
+            } else {
+                "$hours hour${if (hours == 1L) "" else "s"} ago"
+            }
+        }
+        val days = hours / 24
+        val remHours = hours % 24
+        return if (remHours > 0) {
+            "$days day${if (days == 1L) "" else "s"} $remHours hour${if (remHours == 1L) "" else "s"} ago"
+        } else {
+            "$days day${if (days == 1L) "" else "s"} ago"
+        }
+    }
+}
diff --git a/app/src/main/feature/retro/RetroSettingsDialog.kt b/app/src/main/feature/retro/RetroSettingsDialog.kt
new file mode 100644
index 000000000..0768aaa14
--- /dev/null
+++ b/app/src/main/feature/retro/RetroSettingsDialog.kt
@@ -0,0 +1,269 @@
+package com.winlator.cmod.feature.retro
+
+import android.app.Activity
+import android.app.Dialog
+import android.net.Uri
+import android.os.Build
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import android.widget.Toast
+import androidx.activity.ComponentActivity
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Density
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.library.GameSettingsNav
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutArtwork
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.shared.android.ImageUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PaneNavWindowHandlers
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.toast.WinToast
+
+class RetroSettingsDialog(
+    private val activity: Activity,
+    private val shortcut: Shortcut,
+) {
+    private val state = RetroSettingsState(shortcut, activity)
+    private val nav = GameSettingsNav()
+    private var restorePaneNav: (() -> Unit)? = null
+    private var pendingArtworkSlot = LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD
+
+    private val artworkPickerLauncher: ActivityResultLauncher<Array<String>>? =
+        (activity as? ComponentActivity)?.activityResultRegistry?.register(
+            "retro_artwork_picker",
+            ActivityResultContracts.OpenDocument(),
+        ) { uri: Uri? ->
+            if (uri != null) saveSelectedArtwork(uri)
+        }
+
+    private val biosPickerLauncher: ActivityResultLauncher<Array<String>>? =
+        (activity as? ComponentActivity)?.activityResultRegistry?.register(
+            "retro_bios_picker",
+            ActivityResultContracts.OpenDocument(),
+        ) { uri: Uri? ->
+            if (uri != null) {
+                RetroBiosImport.importFromUri(activity, uri)
+                    .onSuccess {
+                        Toast.makeText(activity, activity.getString(R.string.retro_scr_bios_imported, it), Toast.LENGTH_SHORT).show()
+                        state.biosRefresh++
+                    }
+                    .onFailure {
+                        Toast.makeText(activity, it.message ?: activity.getString(R.string.retro_scr_invalid_bios_file), Toast.LENGTH_LONG).show()
+                    }
+            }
+        }
+
+    private val hddPickerLauncher: ActivityResultLauncher<Array<String>>? =
+        (activity as? ComponentActivity)?.activityResultRegistry?.register(
+            "retro_hdd_picker",
+            ActivityResultContracts.OpenDocument(),
+        ) { uri: Uri? ->
+            if (uri != null) {
+                state.hddImporting = true
+                Toast.makeText(activity, activity.getString(R.string.retro_scr_importing), Toast.LENGTH_SHORT).show()
+                Thread {
+                    val result = RetroHddImport.importFromUri(activity, uri)
+                    activity.runOnUiThread {
+                        state.hddImporting = false
+                        result
+                            .onSuccess { name ->
+                                state.hddImage = name
+                                state.hddRefresh++
+                                Toast.makeText(activity, activity.getString(R.string.retro_scr_hdd_imported, name), Toast.LENGTH_LONG).show()
+                            }
+                            .onFailure {
+                                Toast.makeText(activity, it.message ?: activity.getString(R.string.retro_scr_invalid_hdd_file), Toast.LENGTH_LONG).show()
+                            }
+                    }
+                }.start()
+            }
+        }
+
+    private val cheatFilePickerLauncher: ActivityResultLauncher<Array<String>>? =
+        (activity as? ComponentActivity)?.activityResultRegistry?.register(
+            "retro_cheat_file_picker",
+            ActivityResultContracts.OpenDocument(),
+        ) { uri: Uri? ->
+            val serial = state.gameSerial
+            if (uri != null && serial != null) {
+                val isPatch = state.pendingImportIsPatch
+                Thread {
+                    val text = runCatching { activity.contentResolver.openInputStream(uri)?.bufferedReader()?.use { it.readText() } }.getOrNull()
+                    val imported = if (text != null) parsePnachFile(text, if (isPatch) "patches" else "custom") else emptyList()
+                    activity.runOnUiThread {
+                        if (imported.isNotEmpty()) {
+                            val existing = Ps2CheatStaging.read(activity, serial, isPatch)
+                            val merged = existing.filterNot { e -> imported.any { it.name == e.name } } + imported
+                            Ps2CheatStaging.write(activity, serial, isPatch, serial, merged)
+                            state.cheatsRefresh++
+                            Toast.makeText(activity, activity.getString(R.string.retro_scr_hdd_imported, imported.first().name), Toast.LENGTH_SHORT).show()
+                        } else {
+                            Toast.makeText(activity, activity.getString(R.string.retro_scr_cheat_invalid), Toast.LENGTH_LONG).show()
+                        }
+                    }
+                }.start()
+            }
+        }
+
+    init {
+        state.requestImportHdd = { hddPickerLauncher?.launch(arrayOf("*/*")) }
+        state.requestImportCheatFile = { isPatch ->
+            state.pendingImportIsPatch = isPatch
+            cheatFilePickerLauncher?.launch(arrayOf("*/*"))
+        }
+    }
+
+    private fun saveSelectedArtwork(uri: Uri) {
+        val bitmap = ImageUtils.getBitmapFromUri(activity, uri, 1024)
+        if (bitmap == null) {
+            WinToast.show(activity, R.string.shortcuts_library_artwork_failed, Toast.LENGTH_SHORT)
+            return
+        }
+        val slot = pendingArtworkSlot
+        val previousPath = shortcut.getExtra(slot.extraKey)
+        val outputFile = LibraryShortcutArtwork.buildManagedViewArtworkFile(activity, shortcut, slot)
+        val system = RetroShortcuts.systemForShortcut(shortcut)
+        val saved =
+            if (system != null && RetroBoxart.caseArtEnabled(activity) && slot != LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD) {
+                RetroBoxart.composeCustom(activity, system, shortcut.getExtra("custom_name", shortcut.name), bitmap, outputFile)
+            } else {
+                FileUtils.saveBitmapToFile(bitmap, outputFile)
+            }
+        if (!saved) {
+            WinToast.show(activity, R.string.shortcuts_library_artwork_failed, Toast.LENGTH_SHORT)
+            return
+        }
+        if (previousPath.isNotBlank() && previousPath != outputFile.absolutePath) {
+            LibraryShortcutArtwork.deleteManagedArtwork(activity, previousPath)
+        }
+        shortcut.putExtra(slot.extraKey, outputFile.absolutePath)
+        shortcut.saveData()
+        state.syncArtwork()
+    }
+
+    private fun clearArtwork(slot: LibraryShortcutArtwork.LibraryArtworkSlot) {
+        LibraryShortcutArtwork.deleteManagedArtwork(activity, shortcut.getExtra(slot.extraKey))
+        shortcut.putExtra(slot.extraKey, null)
+        shortcut.saveData()
+        state.syncArtwork()
+    }
+
+    private val dialog: Dialog =
+        Dialog(activity, R.style.ContentDialog).apply {
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            setCancelable(true)
+            setCanceledOnTouchOutside(false)
+            setOwnerActivity(activity)
+            window?.apply {
+                setBackgroundDrawableResource(android.R.color.transparent)
+                setLayout(
+                    WindowManager.LayoutParams.MATCH_PARENT,
+                    WindowManager.LayoutParams.MATCH_PARENT,
+                )
+                setDimAmount(0.5f)
+                addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+                setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    isNavigationBarContrastEnforced = false
+                }
+            }
+            setOnDismissListener {
+                restorePaneNav?.invoke()
+                restorePaneNav = null
+            }
+        }
+
+    init {
+        val composeView =
+            ComposeView(activity).apply {
+                layoutParams =
+                    ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                    )
+                setViewTreeLifecycleOwner(activity as LifecycleOwner)
+                setViewTreeSavedStateRegistryOwner(activity as SavedStateRegistryOwner)
+                setContent {
+                    WinNativeTheme {
+                        val defaultDensity = LocalDensity.current
+                        CompositionLocalProvider(
+                            LocalDensity provides Density(defaultDensity.density, fontScale = 1f),
+                        ) {
+                            RetroGameSettingsContent(
+                                state = state,
+                                nav = nav,
+                                onPickArtwork = { slot ->
+                                    pendingArtworkSlot = slot
+                                    artworkPickerLauncher?.launch(arrayOf("image/*"))
+                                },
+                                onRemoveArtwork = { slot -> clearArtwork(slot) },
+                                onImportBios = { biosPickerLauncher?.launch(arrayOf("*/*")) },
+                                onSave = {
+                                    state.save()
+                                    dialog.dismiss()
+                                },
+                                onCancel = { dialog.dismiss() },
+                            )
+                        }
+                    }
+                }
+            }
+        dialog.setContentView(composeView)
+        (activity as LifecycleOwner).lifecycle.addObserver(
+            object : DefaultLifecycleObserver {
+                override fun onDestroy(owner: LifecycleOwner) {
+                    if (dialog.isShowing) dialog.dismiss()
+                }
+            },
+        )
+    }
+
+    fun show() {
+        dialog.show()
+        restorePaneNav?.invoke()
+        restorePaneNav =
+            dialog.window?.bindPaneNav(
+                PaneNavWindowHandlers(
+                    onDir = { nav.dpad(it) },
+                    onActivate = { nav.dpad(PANE_DIR_ACTIVATE) },
+                    onDismiss = { if (nav.onContentBack?.invoke() != true) dialog.dismiss() },
+                    onStart = { nav.onSave?.invoke() },
+                ),
+            )
+        dialog.window?.apply {
+            applyDialogLayout()
+            decorView.post { applyDialogLayout() }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                val params = attributes
+                params.flags = params.flags or WindowManager.LayoutParams.FLAG_BLUR_BEHIND
+                params.blurBehindRadius = 10
+                attributes = params
+            }
+        }
+    }
+
+    private fun Window.applyDialogLayout() {
+        val dm = activity.resources.displayMetrics
+        val hostView = activity.window?.decorView
+        val hostWidth = hostView?.width?.takeIf { it > 0 } ?: dm.widthPixels
+        val hostHeight = hostView?.height?.takeIf { it > 0 } ?: dm.heightPixels
+        val screenWidthDp = hostWidth / dm.density
+        val needsNearFullWidth = screenWidthDp < 820f
+        val widthFactor = if (needsNearFullWidth) 0.96f else 0.88f
+        val heightFactor = if (needsNearFullWidth) 0.90f else 0.88f
+        setLayout((hostWidth * widthFactor).toInt(), (hostHeight * heightFactor).toInt())
+    }
+}
diff --git a/app/src/main/feature/retro/RetroShortcuts.kt b/app/src/main/feature/retro/RetroShortcuts.kt
new file mode 100644
index 000000000..a13dd3c0d
--- /dev/null
+++ b/app/src/main/feature/retro/RetroShortcuts.kt
@@ -0,0 +1,354 @@
+package com.winlator.cmod.feature.retro
+
+import android.content.Context
+import android.content.Intent
+import android.widget.Toast
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.shared.io.FileUtils
+import java.io.File
+import java.util.UUID
+
+object RetroShortcuts {
+    const val KEY_SYSTEM = "retro_system"
+    const val KEY_ROM = "rom_path"
+    const val KEY_CORE = "retro_core"
+    const val KEY_SHADER = "retro_shader"
+    const val KEY_UPSCALE = "retro_upscale"
+    const val KEY_SGSR = "retro_sgsr"
+    const val KEY_TOUCH_CONTROLS = "retro_touch_controls"
+    const val KEY_ADAPTIVE_STICKS = "retro_adaptive_sticks"
+    const val KEY_HDD_IMAGE = "retro_ps2_hdd_image"
+    const val KEY_HDD_ENABLE = "retro_ps2_hdd_enable"
+    const val KEY_AUDIO = "retro_audio"
+    const val KEY_HUD = "retro_hud"
+
+    const val EXTRA_PS2_ROM_PATH = "wn_ps2_rom_path"
+    const val EXTRA_PS2_GAME_NAME = "wn_ps2_game_name"
+    const val EXTRA_PS2_SHORTCUT_PATH = "wn_ps2_shortcut_path"
+    const val EXTRA_PS2_CONTAINER_ID = "wn_ps2_container_id"
+    const val VAR_PREFIX = "retro_var_"
+
+    fun coreVariables(shortcut: Shortcut): HashMap<String, String> {
+        val vars = HashMap<String, String>()
+        val extras = shortcut.extraData
+        val keys = extras.keys()
+        while (keys.hasNext()) {
+            val key = keys.next()
+            if (key.startsWith(VAR_PREFIX)) {
+                val value = shortcut.getExtra(key)
+                if (value.isNotEmpty()) vars[key.removePrefix(VAR_PREFIX)] = value
+            }
+        }
+        return vars
+    }
+
+    fun resolvedCoreVariables(
+        context: Context,
+        shortcut: Shortcut,
+    ): HashMap<String, String> {
+        val vars = coreVariables(shortcut)
+        val system = systemForShortcut(shortcut) ?: return vars
+        RetroCoreOptions.forSystem(system).forEach { option ->
+            if (!vars.containsKey(option.key)) {
+                vars[option.key] = RetroDefaults.coreOption(context, system.id, option.key, option.defaultValue)
+            }
+        }
+        if (RetroCoreManager.usesDolphinCore(system)) {
+            RetroCoreOptions.sanitizeDolphinVariables(vars)
+        }
+        return vars
+    }
+
+    @JvmStatic
+    fun isRetroShortcut(shortcut: Shortcut): Boolean = shortcut.getExtra(KEY_SYSTEM).isNotEmpty()
+
+    fun systemForShortcut(shortcut: Shortcut): RetroSystem? = RetroSystems.fromId(shortcut.getExtra(KEY_SYSTEM))
+
+    fun romPath(shortcut: Shortcut): String = shortcut.getExtra(KEY_ROM)
+
+    data class LibraryCapabilities(
+        val systemId: String? = null,
+        val romPath: String? = null,
+        val system: RetroSystem? = null,
+    ) {
+        val isRetro: Boolean get() = system != null
+        val isExternal: Boolean get() = system?.isExternal == true
+        val showBootToDesktop: Boolean get() = !isRetro
+        val showSaveTransfer: Boolean get() = isRetro && !isExternal
+        val showCheats: Boolean get() = isRetro && !isExternal
+        val showAchievements: Boolean
+            get() = system != null && RetroAchievementsManager.consoleId(system.id) != 0
+        val sourceLabel: String?
+            get() = system?.badgeLabel
+    }
+
+    fun libraryCapabilities(shortcut: Shortcut?): LibraryCapabilities {
+        if (shortcut == null || !isRetroShortcut(shortcut)) return LibraryCapabilities()
+        val system = systemForShortcut(shortcut)
+        return LibraryCapabilities(
+            systemId = system?.id,
+            romPath = romPath(shortcut).takeIf { it.isNotEmpty() },
+            system = system,
+        )
+    }
+
+    fun libraryCapabilitiesForSystemId(
+        systemId: String?,
+        romPath: String? = null,
+    ): LibraryCapabilities {
+        val system = RetroSystems.fromId(systemId) ?: return LibraryCapabilities()
+        return LibraryCapabilities(
+            systemId = system.id,
+            romPath = romPath?.takeIf { it.isNotEmpty() },
+            system = system,
+        )
+    }
+
+    fun create(
+        context: Context,
+        name: String,
+        romPath: String,
+        system: RetroSystem,
+    ): Boolean {
+        val container = ContainerManager(context).retroContainer
+
+        val desktopDir = container.desktopDir
+        if (!desktopDir.exists()) desktopDir.mkdirs()
+
+        val safeName = name.replace("/", "_").replace("\\", "_")
+        val shortcutFile = File(desktopDir, "$safeName.desktop")
+        val shortcutUuid = UUID.randomUUID().toString()
+
+        val content =
+            buildString {
+                append("[Desktop Entry]\n")
+                append("Type=Application\n")
+                append("Name=$name\n")
+                append("Exec=retro:${system.id}\n")
+                append("Icon=custom_game\n")
+                append("\n[Extra Data]\n")
+                append("game_source=CUSTOM\n")
+                append("custom_name=$name\n")
+                append("$KEY_SYSTEM=${system.id}\n")
+                append("$KEY_ROM=$romPath\n")
+                append("$KEY_CORE=${system.coreFileName}\n")
+                append("uuid=$shortcutUuid\n")
+                append("container_id=${container.id}\n")
+                append("use_container_defaults=1\n")
+            }
+
+        FileUtils.writeString(shortcutFile, content)
+        RetroBoxart.ensureArtworkAsync(context)
+        return true
+    }
+
+    @JvmStatic
+    fun launch(
+        context: Context,
+        shortcut: Shortcut,
+    ) {
+        val system = systemForShortcut(shortcut)
+        if (!RetroBundle.requireInstalled(context)) return
+
+        if (system != null && system.isExternal) {
+            recordLaunchStats(context, shortcut.getExtra("custom_name", shortcut.name))
+            launchEmbeddedPs2(context, shortcut)
+            return
+        }
+        if (Gen1EmbedLaunch.isEnabled(shortcut)) {
+            recordLaunchStats(context, shortcut.getExtra("custom_name", shortcut.name))
+            kotlin.concurrent.thread(name = "WnEngine3DLaunch") {
+                val intent =
+                    Gen1EmbedLaunch.launchIntentIfSupported(context, shortcut)
+                        ?: launchIntent(context, shortcut)
+                android.os.Handler(android.os.Looper.getMainLooper()).post {
+                    if (context !is android.app.Activity) {
+                        intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+                    }
+                    context.startActivity(intent)
+                }
+            }
+            return
+        }
+        if (RetroCoreManager.usesDolphinCore(system) && embeddedDolphinEnabled(context)) {
+            recordLaunchStats(context, shortcut.getExtra("custom_name", shortcut.name))
+            DolphinEmbedLaunch.launch(context, shortcut)
+            return
+        }
+        context.startActivity(launchIntent(context, shortcut))
+    }
+
+    fun usesEmbeddedLauncher(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        val system = systemForShortcut(shortcut)
+        if (system != null && system.isExternal) return true
+        if (RetroCoreManager.usesDolphinCore(system) && embeddedDolphinEnabled(context)) return true
+        return Gen1EmbedLaunch.isEnabled(shortcut)
+    }
+
+    fun embeddedDolphinEnabled(context: Context): Boolean =
+        androidx.preference.PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .getBoolean("wn.gc.embedded", true)
+
+    private fun recordLaunchStats(
+        context: Context,
+        gameName: String,
+    ) {
+        val prefs = context.getSharedPreferences("playtime_stats", Context.MODE_PRIVATE)
+        prefs.edit()
+            .putInt("${gameName}_play_count", prefs.getInt("${gameName}_play_count", 0) + 1)
+            .putLong("${gameName}_last_played", System.currentTimeMillis())
+            .apply()
+    }
+
+    private fun launchEmbeddedPs2(
+        context: Context,
+        shortcut: Shortcut,
+    ) {
+        val rom = File(romPath(shortcut))
+        if (!rom.isFile) {
+            Toast.makeText(context, context.getString(com.winlator.cmod.R.string.retro_rom_missing), Toast.LENGTH_LONG).show()
+            return
+        }
+        if (!ps2GpuSupported(context)) {
+            Toast.makeText(
+                context,
+                context.getString(com.winlator.cmod.R.string.retro_ps2_device_unsupported),
+                Toast.LENGTH_LONG,
+            ).show()
+            return
+        }
+        Ps2GameOverlay.install()
+        kotlin.concurrent.thread(name = "WnPs2Launch") {
+            val biosPath = ensurePs2Bios(context)
+            if (biosPath == null) {
+                android.os.Handler(android.os.Looper.getMainLooper()).post {
+                    Toast.makeText(
+                        context,
+                        context.getString(
+                            com.winlator.cmod.R.string.retro_lr_bios_required_title,
+                            RetroSystems.PS2.shortName,
+                        ) + "\n" + context.getString(com.winlator.cmod.R.string.retro_scr_ps2_bios_format),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+                return@thread
+            }
+            val prefs = context.getSharedPreferences("ARMSX2", Context.MODE_PRIVATE)
+            val touchControls =
+                shortcut.getExtra(KEY_TOUCH_CONTROLS)
+                    .ifEmpty { if (RetroDefaults.touchControls(context, RetroSystems.PS2.id)) "1" else "0" } != "0"
+            val adaptiveSticks =
+                shortcut.getExtra(KEY_ADAPTIVE_STICKS)
+                    .ifEmpty { if (RetroDefaults.adaptiveSticks(context, RetroSystems.PS2.id)) "1" else "0" } == "1"
+            val driverPref = (prefs.getString("wn.ps2.driver", "") ?: "").trim()
+            val customDriverId =
+                if (driverPref.isEmpty() || driverPref.equals("system", ignoreCase = true)) "" else driverPref
+            prefs.edit().apply {
+                putBoolean("setupComplete", true)
+                putBoolean("wn.controls", true)
+                putBoolean("wn.ps2.touchcontrols", touchControls)
+                putBoolean("wn.ps2.adaptivesticks", adaptiveSticks)
+                putString("wn.ps2.hddimage", shortcut.getExtra(KEY_HDD_IMAGE))
+                putBoolean("wn.ps2.hdd", shortcut.getExtra(KEY_HDD_ENABLE) == "1")
+                putString("romsDirs", org.json.JSONArray().put(rom.parent ?: "").toString())
+                putString("bios", biosPath)
+                putString("customDriverId", customDriverId)
+                commit()
+            }
+            val uri =
+                try {
+                    androidx.core.content.FileProvider.getUriForFile(context, "${context.packageName}.tileprovider", rom)
+                } catch (e: IllegalArgumentException) {
+                    android.net.Uri.fromFile(rom)
+                }
+            val intent =
+                Intent(Intent.ACTION_VIEW).apply {
+                    setClassName(context, "com.armsx2.Main")
+                    setDataAndType(uri, "application/octet-stream")
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    putExtra(EXTRA_PS2_ROM_PATH, rom.absolutePath)
+                    putExtra(EXTRA_PS2_GAME_NAME, shortcut.getExtra("custom_name", shortcut.name))
+                    putExtra(EXTRA_PS2_SHORTCUT_PATH, shortcut.file.absolutePath)
+                    putExtra(EXTRA_PS2_CONTAINER_ID, shortcut.container.id)
+                }
+            android.os.Handler(android.os.Looper.getMainLooper()).post {
+                runCatching { context.startActivity(intent) }
+            }
+        }
+    }
+
+    private fun ps2GpuSupported(context: Context): Boolean =
+        runCatching {
+            val am = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager
+            am.deviceConfigurationInfo.glEsVersion.toDouble()
+        }.getOrDefault(Double.MAX_VALUE) >= 3.1
+
+    private fun ensurePs2Bios(context: Context): String? {
+        val biosDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "bios")
+        if (!biosDir.exists()) biosDir.mkdirs()
+        val existing = biosDir.listFiles()?.firstOrNull { it.isFile && it.length() >= 3L * 1024 * 1024 }
+        if (existing != null) return existing.absolutePath
+        val sources =
+            listOf(
+                File("/storage/emulated/0/Download/bios"),
+                File(RetroCoreManager.systemDir(context), "bios"),
+                File("/storage/emulated/0/Download"),
+            )
+        for (dir in sources) {
+            val candidate =
+                dir.listFiles()?.firstOrNull {
+                    it.isFile && it.length() in (3L * 1024 * 1024)..(8L * 1024 * 1024) &&
+                        (it.name.endsWith(".bin", true) || it.name.endsWith(".BIN") || it.name.contains("ROM0"))
+                } ?: continue
+            val target = File(biosDir, candidate.name)
+            runCatching { candidate.copyTo(target, overwrite = true) }
+            if (target.isFile) return target.absolutePath
+        }
+        return null
+    }
+
+    @JvmStatic
+    fun launchIntent(
+        context: Context,
+        shortcut: Shortcut,
+    ): Intent =
+        Intent(context, RetroActivity::class.java).apply {
+            val sysId = shortcut.getExtra(KEY_SYSTEM)
+            putExtra(RetroActivity.EXTRA_ROM_PATH, shortcut.getExtra(KEY_ROM))
+            putExtra(RetroActivity.EXTRA_SYSTEM_ID, sysId)
+            putExtra(RetroActivity.EXTRA_GAME_NAME, shortcut.getExtra("custom_name", shortcut.name))
+            putExtra(RetroActivity.EXTRA_SHORTCUT_PATH, shortcut.file.absolutePath)
+            putExtra(RetroActivity.EXTRA_CONTAINER_ID, shortcut.container.id)
+            putExtra(
+                RetroActivity.EXTRA_SHADER,
+                shortcut.getExtra(KEY_SHADER).ifEmpty { RetroDefaults.shader(context, sysId) },
+            )
+            putExtra(
+                RetroActivity.EXTRA_UPSCALE,
+                shortcut.getExtra(KEY_UPSCALE).ifEmpty { RetroDefaults.upscale(context, sysId) },
+            )
+            putExtra(
+                RetroActivity.EXTRA_SGSR,
+                shortcut.getExtra(KEY_SGSR).ifEmpty { if (RetroDefaults.sgsr(context, sysId)) "1" else "0" } == "1",
+            )
+            putExtra(
+                RetroActivity.EXTRA_TOUCH_CONTROLS,
+                shortcut.getExtra(KEY_TOUCH_CONTROLS).ifEmpty { if (RetroDefaults.touchControls(context, sysId)) "1" else "0" } != "0",
+            )
+            putExtra(
+                RetroActivity.EXTRA_ADAPTIVE_STICKS,
+                shortcut.getExtra(KEY_ADAPTIVE_STICKS).ifEmpty { if (RetroDefaults.adaptiveSticks(context, sysId)) "1" else "0" } == "1",
+            )
+            putExtra(
+                RetroActivity.EXTRA_AUDIO,
+                shortcut.getExtra(KEY_AUDIO).ifEmpty { if (RetroDefaults.audio(context, sysId)) "1" else "0" } != "0",
+            )
+            putExtra(RetroActivity.EXTRA_HUD, RetroHudSupport.hudEnabled(context, shortcut, sysId))
+            putExtra(RetroActivity.EXTRA_VARIABLES, resolvedCoreVariables(context, shortcut))
+        }
+}
diff --git a/app/src/main/feature/retro/RetroSystem.kt b/app/src/main/feature/retro/RetroSystem.kt
new file mode 100644
index 000000000..7e10c85f6
--- /dev/null
+++ b/app/src/main/feature/retro/RetroSystem.kt
@@ -0,0 +1,201 @@
+package com.winlator.cmod.feature.retro
+
+import java.util.Locale
+
+data class RetroSystem(
+    val id: String,
+    val displayName: String,
+    val shortName: String,
+    val coreFileName: String,
+    val extensions: Set<String>,
+    val needsBios: Boolean = false,
+    val biosFiles: List<String> = emptyList(),
+    val badgeLabel: String = shortName,
+) {
+    val isExternal: Boolean get() = coreFileName.isBlank()
+}
+
+object RetroSystems {
+    val NES =
+        RetroSystem(
+            id = "nes",
+            displayName = "Nintendo Entertainment System",
+            shortName = "NES",
+            coreFileName = "libfceumm_libretro_android.so",
+            extensions = setOf("nes", "unf", "unif"),
+        )
+    val SNES =
+        RetroSystem(
+            id = "snes",
+            displayName = "Super Nintendo",
+            shortName = "SNES",
+            coreFileName = "libsnes9x_libretro_android.so",
+            extensions = setOf("smc", "sfc", "swc", "fig", "bs"),
+        )
+    val GAMEBOY =
+        RetroSystem(
+            id = "gb",
+            displayName = "Game Boy",
+            shortName = "GB",
+            coreFileName = "libgambatte_libretro_android.so",
+            extensions = setOf("gb"),
+        )
+    val GAMEBOY_COLOR =
+        RetroSystem(
+            id = "gbc",
+            displayName = "Game Boy Color",
+            shortName = "GBC",
+            coreFileName = "libgambatte_libretro_android.so",
+            extensions = setOf("gbc"),
+        )
+    val GBA =
+        RetroSystem(
+            id = "gba",
+            displayName = "Game Boy Advance",
+            shortName = "GBA",
+            coreFileName = "libmgba_libretro_android.so",
+            extensions = setOf("gba"),
+        )
+
+    const val GBA_MULTIPLAYER_CORE = "libgpsp_libretro_android.so"
+    const val DOLPHIN_LIBRETRO_CORE = "libdolphin_libretro_android.so"
+    val GENESIS =
+        RetroSystem(
+            id = "genesis",
+            displayName = "Sega Genesis / Mega Drive",
+            shortName = "Genesis",
+            coreFileName = "libgenesis_plus_gx_libretro_android.so",
+            extensions = setOf("gen", "md", "smd", "bin"),
+            badgeLabel = "SEGA",
+        )
+    val MASTER_SYSTEM =
+        RetroSystem(
+            id = "sms",
+            displayName = "Sega Master System",
+            shortName = "Master System",
+            coreFileName = "libgenesis_plus_gx_libretro_android.so",
+            extensions = setOf("sms"),
+            badgeLabel = "SMS",
+        )
+    val GAME_GEAR =
+        RetroSystem(
+            id = "gg",
+            displayName = "Sega Game Gear",
+            shortName = "Game Gear",
+            coreFileName = "libgenesis_plus_gx_libretro_android.so",
+            extensions = setOf("gg"),
+            badgeLabel = "GG",
+        )
+    val N64 =
+        RetroSystem(
+            id = "n64",
+            displayName = "Nintendo 64",
+            shortName = "N64",
+            coreFileName = "libmupen64plus_next_gles3_libretro_android.so",
+            extensions = setOf("n64", "z64", "v64"),
+        )
+    val PSX =
+        RetroSystem(
+            id = "psx",
+            displayName = "Sony PlayStation",
+            shortName = "PS1",
+            coreFileName = "libmednafen_psx_libretro_android.so",
+            extensions = setOf("cue", "chd", "pbp", "m3u", "iso"),
+            needsBios = true,
+            biosFiles = listOf("scph5501.bin", "scph5500.bin", "scph5502.bin", "scph1001.bin", "scph7001.bin"),
+        )
+
+    val PS2 =
+        RetroSystem(
+            id = "ps2",
+            displayName = "Sony PlayStation 2",
+            shortName = "PS2",
+            coreFileName = "",
+            extensions = setOf("iso", "bin", "chd", "cso", "zso", "mdf", "nrg", "img"),
+            badgeLabel = "PS2",
+        )
+
+    val GAMECUBE =
+        RetroSystem(
+            id = "gc",
+            displayName = "Nintendo GameCube",
+            shortName = "GameCube",
+            coreFileName = DOLPHIN_LIBRETRO_CORE,
+            extensions = setOf("gcm", "tgc", "gcz", "ciso", "dol", "elf", "rvz", "iso", "m3u"),
+            badgeLabel = "GameCube",
+        )
+
+    val WII =
+        RetroSystem(
+            id = "wii",
+            displayName = "Nintendo Wii",
+            shortName = "Wii",
+            coreFileName = DOLPHIN_LIBRETRO_CORE,
+            extensions = setOf("wbfs", "wad", "rvz", "gcz", "ciso", "iso", "dol", "elf", "m3u"),
+            badgeLabel = "Wii",
+        )
+
+    val ALL =
+        listOf(
+            NES, SNES, GAMEBOY, GAMEBOY_COLOR, GBA, GENESIS, MASTER_SYSTEM, GAME_GEAR,
+            N64, PSX, PS2, GAMECUBE, WII,
+        )
+
+    private val PSX_ONLY_EXTENSIONS = setOf("cue", "chd", "pbp", "m3u")
+    private val PS2_ONLY_EXTENSIONS = setOf("cso", "zso", "mdf", "nrg", "img")
+    private val GC_ONLY_EXTENSIONS = setOf("gcm", "tgc")
+    private val WII_ONLY_EXTENSIONS = setOf("wbfs", "wad")
+    private val DOLPHIN_SHARED_EXTENSIONS = setOf("rvz", "gcz", "ciso", "dol", "elf")
+    private const val PS2_SIZE_THRESHOLD = 900L * 1024 * 1024
+    private const val WII_SIZE_THRESHOLD = 1500L * 1024 * 1024
+
+    val allExtensions: Set<String> = ALL.flatMap { it.extensions }.toSet() - "exe"
+
+    fun fromId(id: String?): RetroSystem? {
+        if (id.isNullOrBlank()) return null
+        val normalized = id.trim().lowercase(Locale.US)
+        return ALL.firstOrNull { it.id == normalized }
+    }
+
+    fun fromExtension(extension: String?): RetroSystem? {
+        if (extension.isNullOrBlank()) return null
+        val ext = extension.trim().lowercase(Locale.US).removePrefix(".")
+        if (ext == "exe") return null
+        if (ext in WII_ONLY_EXTENSIONS) return WII
+        if (ext in GC_ONLY_EXTENSIONS) return GAMECUBE
+        if (ext in DOLPHIN_SHARED_EXTENSIONS) return GAMECUBE
+        if (ext in PS2_ONLY_EXTENSIONS) return PS2
+        if (ext in PSX_ONLY_EXTENSIONS || ext == "iso") return PSX
+        return ALL.firstOrNull { ext in it.extensions }
+    }
+
+    fun fromRomPath(path: String?): RetroSystem? {
+        if (path.isNullOrBlank()) return null
+        val ext = path.substringAfterLast('.', "")
+        return fromExtension(ext)
+    }
+
+    fun detectForFile(path: String): RetroSystem? {
+        val ext = path.substringAfterLast('.', "").lowercase(Locale.US)
+        if (RetroRomArchive.isArchive(path)) return RetroRomArchive.detect(path)
+        if (ext in WII_ONLY_EXTENSIONS) return WII
+        if (ext in GC_ONLY_EXTENSIONS) return GAMECUBE
+        val size = runCatching { java.io.File(path).length() }.getOrDefault(0L)
+        if (ext in DOLPHIN_SHARED_EXTENSIONS) {
+            return if (size > WII_SIZE_THRESHOLD) WII else GAMECUBE
+        }
+        val detected = fromExtension(ext) ?: return null
+        if (ext == "bin" && size > 16L * 1024 * 1024) return PSX
+        if (detected.id == PSX.id && ext in setOf("iso", "chd", "bin") && size > PS2_SIZE_THRESHOLD) {
+            return PS2
+        }
+        return detected
+    }
+
+    fun isRetroRom(path: String?): Boolean {
+        if (path.isNullOrBlank()) return false
+        val ext = path.substringAfterLast('.', "").lowercase(Locale.US)
+        if (RetroRomArchive.isArchive(path)) return RetroRomArchive.detect(path) != null
+        return ext in allExtensions
+    }
+}
diff --git a/app/src/main/feature/settings/ExpandableCardHelper.kt b/app/src/main/feature/settings/ExpandableCardHelper.kt
deleted file mode 100644
index 87f129c3c..000000000
--- a/app/src/main/feature/settings/ExpandableCardHelper.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.winlator.cmod.feature.settings
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.widget.ImageView
-import androidx.transition.ChangeBounds
-import androidx.transition.Fade
-import androidx.transition.TransitionManager
-import androidx.transition.TransitionSet
-import com.winlator.cmod.R
-
-object ExpandableCardHelper {
-    fun applyTransition(
-        itemRoot: View,
-        chevron: ImageView,
-        contentView: View,
-        expanded: Boolean,
-        fadeTarget: View = contentView,
-        sceneRoot: ViewGroup? = null,
-    ) {
-        val previousTag = chevron.tag as? Boolean
-
-        if (previousTag != null && previousTag != expanded) {
-            val transition =
-                TransitionSet().apply {
-                    ordering = TransitionSet.ORDERING_TOGETHER
-                    addTransition(ChangeBounds())
-                    addTransition(Fade().apply { addTarget(fadeTarget) })
-                    duration = 250L
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            TransitionManager.beginDelayedTransition(
-                sceneRoot ?: itemRoot as ViewGroup,
-                transition,
-            )
-        }
-
-        updateChevronRotation(chevron, expanded, previousTag)
-        contentView.visibility = if (expanded) View.VISIBLE else View.GONE
-    }
-
-    fun setupClickListeners(
-        vararg views: View,
-        onClick: () -> Unit,
-    ) {
-        val listener = View.OnClickListener { onClick() }
-        views.forEach { it.setOnClickListener(listener) }
-    }
-
-    private fun updateChevronRotation(
-        chevron: ImageView,
-        expanded: Boolean,
-        previousExpanded: Boolean?,
-    ) {
-        val targetRotation = if (expanded) 90f else 0f
-
-        if (previousExpanded == expanded) return
-
-        chevron.animate().cancel()
-
-        if (previousExpanded == null) {
-            chevron.rotation = targetRotation
-        } else {
-            chevron
-                .animate()
-                .rotation(targetRotation)
-                .setDuration(250L)
-                .setInterpolator(AccelerateDecelerateInterpolator())
-                .start()
-        }
-
-        chevron.tag = expanded
-    }
-}
diff --git a/app/src/main/feature/settings/containers/ComponentIcon.kt b/app/src/main/feature/settings/containers/ComponentIcon.kt
new file mode 100644
index 000000000..77d414bf6
--- /dev/null
+++ b/app/src/main/feature/settings/containers/ComponentIcon.kt
@@ -0,0 +1,51 @@
+package com.winlator.cmod.feature.settings
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+
+/**
+ * A simple, tintable shipping-container glyph designed to match the outlined Material icons
+ * used on the container card (corrugated cargo box: outer frame + vertical ribs). Filled with
+ * black so Compose's [androidx.compose.material3.Icon] tint recolors it (e.g. the blue accent).
+ */
+val ComponentContainerIcon: ImageVector by lazy(LazyThreadSafetyMode.NONE) {
+    ImageVector
+        .Builder(
+            name = "ComponentContainerIcon",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 24f,
+            viewportHeight = 24f,
+        ).apply {
+            // Outer body frame (ring via even-odd: outer rect minus inner rect).
+            path(fill = SolidColor(Color.Black), pathFillType = PathFillType.EvenOdd) {
+                moveTo(2.5f, 7.5f)
+                lineTo(21.5f, 7.5f)
+                lineTo(21.5f, 16.5f)
+                lineTo(2.5f, 16.5f)
+                close()
+                moveTo(4.3f, 9.3f)
+                lineTo(19.7f, 9.3f)
+                lineTo(19.7f, 14.7f)
+                lineTo(4.3f, 14.7f)
+                close()
+            }
+            // Vertical corrugation ribs.
+            path(fill = SolidColor(Color.Black)) {
+                val ribTop = 9.3f
+                val ribBottom = 14.7f
+                val ribW = 1.0f
+                for (x in floatArrayOf(7.0f, 10.2f, 13.4f, 16.6f)) {
+                    moveTo(x, ribTop)
+                    lineTo(x + ribW, ribTop)
+                    lineTo(x + ribW, ribBottom)
+                    lineTo(x, ribBottom)
+                    close()
+                }
+            }
+        }.build()
+}
diff --git a/app/src/main/feature/settings/containers/ComponentInstallerSheet.kt b/app/src/main/feature/settings/containers/ComponentInstallerSheet.kt
new file mode 100644
index 000000000..dc2140872
--- /dev/null
+++ b/app/src/main/feature/settings/containers/ComponentInstallerSheet.kt
@@ -0,0 +1,582 @@
+package com.winlator.cmod.feature.settings
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.content.Downloader
+import com.winlator.cmod.runtime.content.component.ComponentInstaller
+import com.winlator.cmod.shared.util.StringUtils
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+
+private const val DATASET_BASE = "https://huggingface.co/datasets/Xnick417x/WN-Components/resolve/main"
+private const val INDEX_URL = "$DATASET_BASE/index.json"
+
+// One install at a time across the app (the boot session + result bridge are single-instance).
+private val installMutex = Mutex()
+
+private val SheetRoot = Color(0xFF18181D)
+private val SheetCard = Color(0xFF1C1C2A)
+private val SheetSubcard = Color(0xFF161622)
+private val SheetOutline = Color(0xFF2A2A3A)
+private val SheetAccent = Color(0xFF1A9FFF)
+private val SheetTextPrimary = Color(0xFFF0F4FF)
+private val SheetTextSecondary = Color(0xFF7A8FA8)
+private val SheetDanger = Color(0xFFFF7A88)
+private val SheetGood = Color(0xFF6BD08A)
+
+private sealed interface InstallUi {
+    data class Running(
+        val text: String,
+    ) : InstallUi
+
+    data object Done : InstallUi
+
+    data class Failed(
+        val message: String,
+    ) : InstallUi
+}
+
+data class CatalogComponent(
+    val name: String,
+    val description: String,
+    val provider: String,
+    val category: String,
+    val species: String,
+    val size: Long,
+    val manifest: String,
+    val dependencies: List<String>,
+)
+
+private sealed interface CatalogUiState {
+    data object Loading : CatalogUiState
+
+    data class Error(
+        val message: String,
+    ) : CatalogUiState
+
+    data class Loaded(
+        val items: List<CatalogComponent>,
+    ) : CatalogUiState
+}
+
+private fun parseCatalog(json: String): List<CatalogComponent> {
+    val arr = JSONObject(json).getJSONArray("components")
+    val out = ArrayList<CatalogComponent>(arr.length())
+    for (i in 0 until arr.length()) {
+        val o = arr.getJSONObject(i)
+        val depsArr = o.optJSONArray("dependencies")
+        val deps =
+            if (depsArr != null) {
+                (0 until depsArr.length()).map { depsArr.getString(it) }
+            } else {
+                emptyList()
+            }
+        out.add(
+            CatalogComponent(
+                name = o.getString("name"),
+                description = o.optString("description"),
+                provider = o.optString("provider"),
+                category = o.optString("category", "Other"),
+                species = o.optString("species", "installer"),
+                size = o.optLong("size"),
+                manifest = o.optString("manifest"),
+                dependencies = deps,
+            ),
+        )
+    }
+    return out
+}
+
+private val CATEGORY_ORDER =
+    listOf(
+        "Wine Mono / Gecko",
+        "Visual C++ / VB",
+        "OS Update",
+        "Graphics",
+        "DirectX",
+        ".NET",
+        "Media / Codecs",
+        "System / Web",
+    )
+
+private fun categoryRank(category: String): Int =
+    when {
+        category == "Other" -> Int.MAX_VALUE
+        else -> CATEGORY_ORDER.indexOf(category).let { if (it >= 0) it else CATEGORY_ORDER.size }
+    }
+
+@Composable
+fun ComponentInstallerSheet(
+    container: Container,
+    onDismiss: () -> Unit,
+) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val installStates = remember { mutableStateMapOf<String, InstallUi>() }
+    var ui by remember { mutableStateOf<CatalogUiState>(CatalogUiState.Loading) }
+    val registry = remember { PaneNavRegistry() }
+
+    LaunchedEffect(Unit) {
+        ui =
+            withContext(Dispatchers.IO) {
+                val json = Downloader.downloadString(INDEX_URL)
+                if (json == null) {
+                    CatalogUiState.Error("Couldn't reach the component catalog.")
+                } else {
+                    try {
+                        CatalogUiState.Loaded(
+                            parseCatalog(json)
+                                .sortedWith(
+                                    compareBy(
+                                        { categoryRank(it.category) },
+                                        { it.category },
+                                        { it.name.lowercase() },
+                                    ),
+                                ),
+                        )
+                    } catch (e: Exception) {
+                        CatalogUiState.Error("The component catalog is malformed.")
+                    }
+                }
+            }
+    }
+
+    LaunchedEffect(container.id) {
+        val installed =
+            withContext(Dispatchers.IO) {
+                ComponentInstaller.installedComponents(container)
+            }
+        installed.forEach { installStates[it] = InstallUi.Done }
+    }
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        DialogPaneNav(registry, onDismiss = onDismiss, onStart = onDismiss)
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+        BoxWithConstraints(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .safeDrawingPadding()
+                    .padding(horizontal = 20.dp, vertical = 16.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            val popupWidth = if (maxWidth < 420.dp) maxWidth else 420.dp
+            val popupHeight = if (maxHeight < 500.dp) maxHeight else 500.dp
+            Column(
+                modifier =
+                    Modifier
+                        .width(popupWidth)
+                        .height(popupHeight)
+                        .clip(RoundedCornerShape(18.dp))
+                        .background(SheetRoot)
+                        .border(1.dp, SheetOutline, RoundedCornerShape(18.dp)),
+            ) {
+                SheetHeader(containerName = container.name, onClose = onDismiss)
+                Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
+                    when (val state = ui) {
+                        CatalogUiState.Loading -> SheetCentered { Spinner() }
+                        is CatalogUiState.Error -> SheetCentered { ErrorText(state.message) }
+                        is CatalogUiState.Loaded ->
+                            ComponentList(
+                                items = state.items,
+                                installStates = installStates,
+                                onInstall = { item ->
+                                    installStates[item.name] = InstallUi.Running("Queued…")
+                                    scope.launch(Dispatchers.IO) {
+                                        installMutex.withLock {
+                                            try {
+                                                installStates[item.name] = InstallUi.Running("Starting…")
+                                                runInterruptible {
+                                                    val yaml =
+                                                        Downloader.downloadString("$DATASET_BASE/${item.manifest}")
+                                                            ?: throw Exception("Couldn't fetch the manifest.")
+                                                    ComponentInstaller(
+                                                        context = context,
+                                                        container = container,
+                                                        componentName = item.name,
+                                                        manifestYaml = yaml,
+                                                        listener =
+                                                            object : ComponentInstaller.Listener {
+                                                                override fun onStatus(text: String) {
+                                                                    installStates[item.name] = InstallUi.Running(text)
+                                                                }
+
+                                                                override fun onProgress(fraction: Float) {}
+                                                            },
+                                                    ).run()
+                                                }
+                                                installStates[item.name] = InstallUi.Done
+                                            } catch (e: CancellationException) {
+                                                throw e
+                                            } catch (e: Exception) {
+                                                installStates[item.name] =
+                                                    InstallUi.Failed(e.message ?: "Install failed.")
+                                            }
+                                        }
+                                    }
+                                },
+                            )
+                    }
+                }
+            }
+        }
+        }
+    }
+}
+
+@Composable
+private fun SheetHeader(
+    containerName: String,
+    onClose: () -> Unit,
+) {
+    Column(modifier = Modifier.fillMaxWidth().padding(start = 18.dp, end = 12.dp, top = 14.dp, bottom = 10.dp)) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = "Install components",
+                    color = SheetTextPrimary,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.Bold,
+                )
+                Text(
+                    text = containerName,
+                    color = SheetTextSecondary,
+                    fontSize = 12.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+            Box(
+                modifier =
+                    Modifier
+                        .size(34.dp)
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(SheetSubcard)
+                        .border(1.dp, SheetOutline, RoundedCornerShape(8.dp))
+                        .paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = onClose,
+                            tapToSelect = true,
+                            isEntry = true,
+                        ),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Close,
+                    contentDescription = "Close",
+                    tint = SheetTextSecondary,
+                    modifier = Modifier.size(18.dp),
+                )
+            }
+        }
+        Spacer(Modifier.height(10.dp))
+        Box(modifier = Modifier.fillMaxWidth().height(1.dp).background(SheetOutline))
+    }
+}
+
+@Composable
+private fun ComponentList(
+    items: List<CatalogComponent>,
+    installStates: Map<String, InstallUi>,
+    onInstall: (CatalogComponent) -> Unit,
+) {
+    val grouped = items.groupBy { it.category }
+    val nav = LocalPaneNav.current
+    val scrollState = rememberScrollState()
+    val density = LocalDensity.current
+    var viewportTop by remember { mutableStateOf(0f) }
+    var viewportHeight by remember { mutableIntStateOf(0) }
+    if (nav != null) {
+        LaunchedEffect(nav.activeRow, nav.activeCol, viewportHeight) {
+            if (!nav.controllerActive || nav.manualSelection) return@LaunchedEffect
+            val bounds = nav.activeItemBounds() ?: return@LaunchedEffect
+            val margin = with(density) { 16.dp.toPx() }
+            val vpTop = viewportTop
+            val vpBottom = viewportTop + viewportHeight
+            val delta = when {
+                bounds.second + margin > vpBottom -> bounds.second + margin - vpBottom
+                bounds.first - margin < vpTop -> bounds.first - margin - vpTop
+                else -> 0f
+            }
+            if (delta != 0f) runCatching { scrollState.animateScrollBy(delta) }
+        }
+    }
+    Box(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .then(
+                    if (nav != null) {
+                        Modifier.onGloballyPositioned {
+                            viewportTop = it.positionInWindow().y
+                            viewportHeight = it.size.height
+                        }
+                    } else {
+                        Modifier
+                    },
+                ),
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .verticalScroll(scrollState)
+                    .padding(start = 16.dp, end = 16.dp, top = 6.dp, bottom = 20.dp),
+            verticalArrangement = Arrangement.spacedBy(6.dp),
+        ) {
+            grouped.forEach { (category, group) ->
+                Text(
+                    text = category.uppercase(),
+                    color = SheetTextSecondary,
+                    fontSize = 11.sp,
+                    fontWeight = FontWeight.Bold,
+                    letterSpacing = 1.2.sp,
+                    modifier = Modifier.padding(start = 4.dp, top = 8.dp, bottom = 2.dp),
+                )
+                group.forEachIndexed { idx, component ->
+                    ComponentRow(
+                        item = component,
+                        status = installStates[component.name],
+                        onInstall = onInstall,
+                        isEntry = category == grouped.keys.first() && idx == 0,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ComponentRow(
+    item: CatalogComponent,
+    status: InstallUi?,
+    onInstall: (CatalogComponent) -> Unit,
+    isEntry: Boolean = false,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(10.dp))
+                .background(SheetCard)
+                .border(1.dp, SheetOutline, RoundedCornerShape(10.dp))
+                .paneNavItem(
+                    cornerRadius = 10.dp,
+                    onActivate = { if (status == null || status is InstallUi.Failed) onInstall(item) },
+                    isEntry = isEntry,
+                )
+                .padding(horizontal = 12.dp, vertical = 7.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = item.name,
+                    color = SheetTextPrimary,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f, fill = false),
+                )
+                Spacer(Modifier.width(6.dp))
+                SpeciesBadge(item.species)
+            }
+            val (secondLine, secondColor) =
+                when (status) {
+                    is InstallUi.Running -> status.text to SheetAccent
+                    is InstallUi.Failed -> status.message to SheetDanger
+                    else -> item.description to SheetTextSecondary
+                }
+            if (secondLine.isNotEmpty()) {
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    text = secondLine,
+                    color = secondColor,
+                    fontSize = 11.sp,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+        Spacer(Modifier.width(10.dp))
+        Column(horizontalAlignment = Alignment.End) {
+            when (status) {
+                null -> {
+                    if (item.size > 0L) {
+                        Text(
+                            text = StringUtils.formatBytes(item.size),
+                            color = SheetTextSecondary,
+                            fontSize = 10.sp,
+                        )
+                        Spacer(Modifier.height(5.dp))
+                    }
+                    InstallButton(label = "Install", onClick = { onInstall(item) })
+                }
+
+                is InstallUi.Running ->
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(22.dp),
+                        color = SheetAccent,
+                        strokeWidth = 2.5.dp,
+                    )
+
+                InstallUi.Done ->
+                    Text(
+                        text = "Installed",
+                        color = SheetGood,
+                        fontSize = 12.sp,
+                        fontWeight = FontWeight.Bold,
+                    )
+
+                is InstallUi.Failed -> InstallButton(label = "Retry", onClick = { onInstall(item) })
+            }
+        }
+    }
+}
+
+@Composable
+private fun SpeciesBadge(species: String) {
+    val label = if (species == "installer") "INSTALLER" else "LIBRARY"
+    val color = if (species == "installer") SheetAccent else SheetTextSecondary
+    Box(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(4.dp))
+                .background(color.copy(alpha = 0.12f))
+                .border(1.dp, color.copy(alpha = 0.3f), RoundedCornerShape(4.dp))
+                .padding(horizontal = 5.dp, vertical = 1.dp),
+    ) {
+        Text(
+            text = label,
+            color = color,
+            fontSize = 7.sp,
+            fontWeight = FontWeight.Bold,
+            letterSpacing = 0.5.sp,
+        )
+    }
+}
+
+@Composable
+private fun InstallButton(
+    label: String = "Install",
+    onClick: () -> Unit,
+) {
+    Box(
+        modifier =
+            Modifier
+                .height(30.dp)
+                .clip(RoundedCornerShape(8.dp))
+                .background(SheetAccent.copy(alpha = 0.14f))
+                .border(1.dp, SheetAccent.copy(alpha = 0.35f), RoundedCornerShape(8.dp))
+                .clickable(onClick = onClick)
+                .padding(horizontal = 14.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = SheetAccent,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Bold,
+        )
+    }
+}
+
+@Composable
+private fun SheetCentered(content: @Composable () -> Unit) {
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center,
+    ) { content() }
+}
+
+@Composable
+private fun Spinner() {
+    CircularProgressIndicator(
+        modifier = Modifier.size(40.dp),
+        color = SheetAccent,
+        strokeWidth = 3.dp,
+    )
+}
+
+@Composable
+private fun ErrorText(message: String) {
+    Text(
+        text = message,
+        color = SheetTextSecondary,
+        fontSize = 13.sp,
+        modifier = Modifier.padding(24.dp),
+    )
+}
diff --git a/app/src/main/feature/settings/containers/ContainerSettingsComposeDialog.kt b/app/src/main/feature/settings/containers/ContainerSettingsComposeDialog.kt
index 7ffd9400d..f2e826915 100644
--- a/app/src/main/feature/settings/containers/ContainerSettingsComposeDialog.kt
+++ b/app/src/main/feature/settings/containers/ContainerSettingsComposeDialog.kt
@@ -1,7 +1,6 @@
 package com.winlator.cmod.feature.settings
 import android.app.Activity
 import android.app.Dialog
-import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.view.ViewGroup
@@ -9,13 +8,18 @@ import android.view.Window
 import android.view.WindowInsets
 import android.view.WindowManager
 import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatDialog
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PaneNavWindowHandlers
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.setViewTreeLifecycleOwner
@@ -27,26 +31,31 @@ import com.winlator.cmod.feature.library.DriveItem
 import com.winlator.cmod.feature.library.EnvVarItem
 import com.winlator.cmod.feature.library.GameSettingsCallbacks
 import com.winlator.cmod.feature.library.GameSettingsContent
+import com.winlator.cmod.feature.library.GameSettingsNav
 import com.winlator.cmod.feature.library.GameSettingsStateHolder
 import com.winlator.cmod.feature.library.WinComponentItem
+import com.winlator.cmod.feature.library.parseEnvVarItems
 import com.winlator.cmod.runtime.compat.box64.Box64Preset
 import com.winlator.cmod.runtime.compat.box64.Box64PresetManager
 import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerCreation
 import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.content.ContentProfile
 import com.winlator.cmod.runtime.content.ContentsManager
 import com.winlator.cmod.feature.settings.DXVKConfigUtils
 import com.winlator.cmod.feature.settings.GraphicsDriverConfigUtils
+import com.winlator.cmod.feature.settings.OtherSettingsFragment
 import com.winlator.cmod.feature.settings.WineD3DConfigUtils
 import com.winlator.cmod.shared.android.AppUtils
 import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.android.RefreshRateUtils
 import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.io.AssetPaths
 import com.winlator.cmod.runtime.wine.EnvVars
+import com.winlator.cmod.runtime.wine.LocaleEnv
 import com.winlator.cmod.shared.io.FileUtils
 import com.winlator.cmod.shared.util.KeyValueSet
 import com.winlator.cmod.shared.theme.WinNativeTheme
-import com.winlator.cmod.shared.ui.dialog.PreloaderDialog
 import com.winlator.cmod.shared.util.StringUtils
 import com.winlator.cmod.runtime.wine.WineInfo
 import com.winlator.cmod.runtime.wine.WineRegistryEditor
@@ -56,10 +65,16 @@ import com.winlator.cmod.runtime.compat.fexcore.FEXCorePresetManager
 import com.winlator.cmod.runtime.audio.midi.MidiManager
 import com.winlator.cmod.runtime.display.winhandler.WinHandler
 import com.winlator.cmod.runtime.display.environment.ImageFs
-import org.json.JSONObject
 import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
 import java.util.Locale
 import java.util.concurrent.Executors
+import kotlinx.coroutines.*
+import com.winlator.cmod.shared.ui.dialog.ContainerProgressPopup
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.WinNativeComposeDialogs
+import android.os.Environment
 
 /**
  * Compose replacement for the legacy `ContainerDetailFragment`. Reuses
@@ -81,11 +96,14 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
 
     private val context = activity
     private val dialog: Dialog
+    private val nav = GameSettingsNav()
+    private var restorePaneNav: (() -> Unit)? = null
     private val state = GameSettingsStateHolder()
     private val manager = ContainerManager(context)
     private val contentsManager = ContentsManager(context)
     private var isArm64EC = false
-    private val preloaderDialog: PreloaderDialog = PreloaderDialog(activity)
+    private val creatingPopup: ContainerProgressPopup =
+        ContainerProgressPopup(activity, R.string.containers_list_creating)
 
     // Parallel id/display lists for presets and wine versions.
     private var box64PresetIds = mutableListOf<String>()
@@ -96,28 +114,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
     // Drives working copy, mirrored into state.drivesList via syncDrivesState.
     private val drivesWorking = mutableListOf<DriveDraft>()
     private var pendingDriveIndex: Int = -1
-
-    private val wallpaperPickerLauncher: ActivityResultLauncher<Array<String>>? =
-        (activity as? ComponentActivity)?.activityResultRegistry?.register(
-            "container_wallpaper_picker",
-            ActivityResultContracts.OpenDocument()
-        ) { uri: Uri? ->
-            if (uri == null) return@register
-            try {
-                val destFile = WineThemeManager.getUserWallpaperFile(context)
-                context.contentResolver.openInputStream(uri)?.use { input ->
-                    destFile.outputStream().use { output -> input.copyTo(output) }
-                }
-                state.desktopWallpaperSelected.value = true
-            } catch (e: Throwable) {
-                Log.e(TAG, "Error copying wallpaper", e)
-                WinToast.show(
-                    context,
-                    context.getString(R.string.settings_containers_error_saving_wallpaper),
-                    Toast.LENGTH_SHORT,
-                )
-            }
-        }
+    private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
 
     init {
         state.wined3dCsmtEntries.value =
@@ -138,13 +135,18 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                 setDimAmount(0.5f)
                 addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
                 setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+                    isNavigationBarContrastEnforced = false
+                }
             }
             // Centralize cleanup so back-button dismissal follows the same
             // path as Save/Cancel and still fires onFinished (important for
             // the setup wizard launcher that blocks on UnifiedActivity finishing).
             setOnDismissListener {
+                restorePaneNav?.invoke()
+                restorePaneNav = null
                 AppUtils.hideKeyboard(activity)
-                wallpaperPickerLauncher?.unregister()
+                scope.cancel()
                 onFinished?.run()
             }
         }
@@ -168,7 +170,8 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                     CompositionLocalProvider(
                         LocalDensity provides Density(defaultDensity.density, fontScale = 1f)
                     ) {
-                        GameSettingsContent(state = state, callbacks = createCallbacks())
+                        val callbacks = createCallbacks()
+                        GameSettingsContent(state = state, callbacks = callbacks, nav = nav)
                     }
                 }
             }
@@ -245,8 +248,9 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                 val identifier = wineVersionIdentifiers.getOrNull(versionIndex) ?: return
                 val wineInfo = WineInfo.fromIdentifier(context, contentsManager, identifier)
                 isArm64EC = wineInfo.isArm64EC()
+                state.isArm64EC.value = isArm64EC
                 state.wineVersionDisplay.value = formatWineVersionDisplay(wineInfo)
-                applyDefaultContainerName(wineInfo)
+                applyDefaultContainerName(wineInfo, identifier)
                 // Box64 list depends on arch (box64 vs wowbox64 entries).
                 rebuildEmulatorLists()
                 loadBox64Versions()
@@ -282,7 +286,15 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             }
 
             override fun onPickWallpaper() {
-                wallpaperPickerLauncher?.launch(arrayOf("image/*"))
+                openWallpaperFilePicker()
+            }
+
+            override fun onExportSaves() {
+                showExportSavesConfirmation()
+            }
+
+            override fun onImportSaves() {
+                showImportSavesConfirmation()
             }
         }
     }
@@ -326,15 +338,53 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         syncDrivesState()
     }
 
+    private fun openWallpaperFilePicker() {
+        DirectoryPickerDialog.showFile(
+            activity,
+            title = context.getString(R.string.settings_general_select_wallpaper),
+            allowedExtensions = setOf("png", "jpg", "jpeg", "webp", "bmp", "gif", "heic", "heif"),
+            dimAmount = 0.5f,
+            preserveBackdropBlur = true,
+        ) { pickedPath ->
+            try {
+                val destFile = WineThemeManager.getUserWallpaperFile(context)
+                File(pickedPath).inputStream().use { input ->
+                    destFile.outputStream().use { output -> input.copyTo(output) }
+                }
+                state.desktopWallpaperSelected.value = true
+            } catch (e: Throwable) {
+                Log.e(TAG, "Error copying wallpaper", e)
+                WinToast.show(
+                    context,
+                    context.getString(R.string.settings_containers_error_saving_wallpaper),
+                    dialog.window?.decorView,
+                )
+            }
+        }
+    }
+
     private fun openDriveDirectoryPicker() {
         val idx = pendingDriveIndex
         if (idx !in drivesWorking.indices) return
 
+        val imagefsRoot = ImageFs.find(context).getRootDir()
+        val driveRoots =
+            listOf(
+                DirectoryPickerDialog.ManagedRoot("C:", File(imagefsRoot, "home").absolutePath),
+                DirectoryPickerDialog.ManagedRoot("Z:", imagefsRoot.absolutePath),
+                DirectoryPickerDialog.ManagedRoot(
+                    "D:",
+                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath,
+                ),
+                DirectoryPickerDialog.ManagedRoot("Internal", Environment.getExternalStorageDirectory().absolutePath),
+            )
+
         DirectoryPickerDialog.show(
             activity = activity,
             initialPath = drivesWorking[idx].path.ifBlank { null },
             dimAmount = 0.5f,
             preserveBackdropBlur = true,
+            extraRoots = driveRoots,
         ) { path ->
             val currentIndex = pendingDriveIndex
             if (currentIndex in drivesWorking.indices) {
@@ -347,7 +397,6 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
 
     private fun loadInitialData() {
         val c = container
-        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 
         if (c != null) {
             state.name.value = c.getName()
@@ -370,8 +419,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         state.selectedDInputMapperType.intValue =
             if ((inputType and WinHandler.FLAG_DINPUT_MAPPER_STANDARD.toInt()) == WinHandler.FLAG_DINPUT_MAPPER_STANDARD.toInt()) 0 else 1
 
-        // Exclusive Input is a global pref, not stored on the container.
-        state.containerExclusiveInput.value = prefs.getBoolean("xinput_toggle", false)
+        state.containerExclusiveInput.value = c?.isExclusiveXInput() ?: true
         if (!state.containerExclusiveInput.value) {
             state.enableXInput.value = true
             state.enableDInput.value = true
@@ -379,15 +427,15 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
 
         state.fullscreenStretched.value = c?.isFullscreenStretched() ?: false
         state.directComposition.value = c?.isDirectCompositionEnabled() ?: false
+        state.useUnixLibs.value = c?.isUseUnixLibs() ?: true
 
         // Steam fields are shortcut-only in the UI; leave any existing steam
         // state on the container untouched — saveSettings() skips them.
         state.isSteamGame.value = false
 
         state.execArgs.value = c?.getExecArgs() ?: ""
-        state.lcAll.value = c?.getLC_ALL() ?: (
-            Locale.getDefault().language + "_" + Locale.getDefault().country + ".UTF-8"
-            )
+        state.lcAll.value = c?.getLC_ALL().takeUnless { it.isNullOrEmpty() }
+            ?: LocaleEnv.deriveFromDevice()
 
         val cpuCount = Runtime.getRuntime().availableProcessors()
         state.cpuCount.intValue = cpuCount
@@ -409,16 +457,17 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         state.generalComponents.value = general
 
         val envVarsStr = c?.getEnvVars() ?: Container.DEFAULT_ENV_VARS
-        val envVars = EnvVars(envVarsStr)
-        val items = mutableListOf<EnvVarItem>()
-        for (key in envVars) items.add(EnvVarItem(key, envVars.get(key)))
-        state.sdl2Compatibility.value = envVars.get("SDL_XINPUT_ENABLED") == "1"
+        val items = parseEnvVarItems(envVarsStr)
+        state.sdl2Compatibility.value = EnvVars(envVarsStr).get("SDL_XINPUT_ENABLED") == "1"
         state.envVars.value = if (state.sdl2Compatibility.value) {
             items.filterNot { it.key in SDL2_KEYS }
         } else items
 
         drivesWorking.clear()
-        val drivesStr = c?.getDrives() ?: Container.DEFAULT_DRIVES
+        val drivesStr = c?.let {
+            com.winlator.cmod.runtime.wine.WineUtils.readDrivesFromPrefix(it)
+                .ifEmpty { it.getDrives() }
+        } ?: Container.DEFAULT_DRIVES
         for (drive in Container.drivesIterator(drivesStr)) {
             drivesWorking.add(
                 DriveDraft(
@@ -465,6 +514,20 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         state.screenSizeEntries.value = screenSizeArr
         selectScreenSize(c?.getScreenSize() ?: Container.DEFAULT_SCREEN_SIZE)
 
+        try {
+            val refreshEntries = OtherSettingsFragment.buildRefreshRateEntries(activity)
+            state.refreshRateEntries.value = refreshEntries
+            val savedRate = c?.getExtra("refreshRate", "0")
+            if (savedRate.isNullOrEmpty() || savedRate == "0") {
+                state.selectedRefreshRate.intValue = 0
+            } else {
+                val idx = refreshEntries.indexOfFirst { it == "$savedRate Hz" }
+                state.selectedRefreshRate.intValue = if (idx >= 0) idx else 0
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error loading refresh rate entries", e)
+        }
+
         val graphicsDriverArr = context.resources.getStringArray(R.array.graphics_driver_entries).toList()
         state.graphicsDriverEntries.value = graphicsDriverArr
         selectByIdentifier(
@@ -473,6 +536,10 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             state.selectedGraphicsDriver
         )
 
+        state.zinkModeEntries.value = context.resources.getStringArray(R.array.zink_mode_entries).toList()
+        state.selectedZinkMode.intValue =
+            if ((c?.getZinkMode() ?: Container.DEFAULT_ZINK_MODE) == "windows") 1 else 0
+
         val dxWrapperArr = context.resources.getStringArray(R.array.dxwrapper_entries).toList()
         state.dxWrapperEntries.value = dxWrapperArr
         selectByIdentifier(
@@ -481,6 +548,21 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             state.selectedDxWrapper
         )
 
+        val surfaceEffectArr = context.resources.getStringArray(R.array.surface_effect_entries).toList()
+        state.surfaceEffectEntries.value = surfaceEffectArr
+        state.selectedSurfaceEffect.intValue = if (c?.getExtra("swapRB", "0") == "1") 1 else 0
+
+        // init() migrates a legacy single reshadeEffect / flat reshadeParams into the loadout model
+        val reshadeEffects = com.winlator.cmod.runtime.reshade.ReshadeManager.scanEffects(context)
+        state.reshadeEffects.value = reshadeEffects
+        state.reshadeLoadout.init(
+            reshadeEffects,
+            c?.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_LOADOUT, null),
+            c?.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_MODE, null),
+            c?.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_PARAMS, null),
+            c?.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_EFFECT, null),
+        )
+
         val audioDriverArr = context.resources.getStringArray(R.array.audio_driver_entries).toList()
         state.audioDriverEntries.value = audioDriverArr
         selectByIdentifier(
@@ -502,6 +584,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         if (c != null) {
             val wineInfo = WineInfo.fromIdentifier(context, contentsManager, c.getWineVersion())
             isArm64EC = wineInfo.isArm64EC()
+            state.isArm64EC.value = isArm64EC
             state.wineVersionDisplay.value = formatWineVersionDisplay(wineInfo)
 
             rebuildEmulatorLists()
@@ -633,8 +716,9 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         val wineInfo = WineInfo.fromIdentifier(context, contentsManager, selectedIdentifier)
         val archChanged = isArm64EC != wineInfo.isArm64EC()
         isArm64EC = wineInfo.isArm64EC()
+        state.isArm64EC.value = isArm64EC
         state.wineVersionDisplay.value = formatWineVersionDisplay(wineInfo)
-        applyDefaultContainerName(wineInfo)
+        applyDefaultContainerName(wineInfo, selectedIdentifier)
 
         rebuildEmulatorLists()
         // Always reset emulator selections when populating for the first time
@@ -665,13 +749,10 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         val c = container
         val name = state.name.value.trim()
         if (name.isEmpty()) {
-            WinToast.show(context, context.getString(R.string.common_ui_name_cannot_be_empty), Toast.LENGTH_SHORT)
+            WinToast.show(context, context.getString(R.string.common_ui_name_cannot_be_empty), dialog.window?.decorView)
             return
         }
 
-        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        prefs.edit().putBoolean("xinput_toggle", state.containerExclusiveInput.value).apply()
-
         val screenSize = getScreenSizeFromState()
         val graphicsDriver = getIdentifierFromEntries(
             state.graphicsDriverEntries.value, state.selectedGraphicsDriver.intValue
@@ -707,7 +788,8 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         val wincomponents = buildWinComponentsString()
         val drivesString = com.winlator.cmod.runtime.wine.WineUtils.normalizePersistentDrives(
             context,
-            buildDrivesString()
+            buildDrivesString(),
+            false
         )
 
         val cpuList = buildCpuListString(state.cpuChecked.value)
@@ -745,17 +827,40 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             c.setCPUList(cpuList)
             c.setCPUListWoW64(cpuListWoW64)
             c.setGraphicsDriver(graphicsDriver)
+            c.setZinkMode(if (state.selectedZinkMode.intValue == 1) "windows" else "unix")
             c.setGraphicsDriverConfig(graphicsDriverConfig)
             c.setDXWrapper(dxwrapper)
             c.setDXWrapperConfig(dxwrapperConfig)
+            c.putExtra("swapRB", if (state.selectedSurfaceEffect.intValue == 1) "1" else "0")
+            c.putExtra("refreshRate", getRefreshRateFromState())
+            run {
+                // reshadeEffect stays coherent (= first effect) for legacy readers; all null when empty
+                val loadoutJson = state.reshadeLoadout.loadoutJsonOrNull()
+                c.putExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_LOADOUT, loadoutJson)
+                c.putExtra(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_MODE,
+                    if (loadoutJson == null) null else state.reshadeLoadout.mode)
+                c.putExtra(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_PARAMS,
+                    if (loadoutJson == null) null else state.reshadeLoadout.paramsJsonOrNull())
+                c.putExtra(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_EFFECT,
+                    if (loadoutJson == null) null else state.reshadeLoadout.firstEffectName())
+            }
             c.setAudioDriver(audioDriver)
             c.setEmulator(emulator)
             c.setEmulator64(emulator64)
             c.setWinComponents(wincomponents)
             c.setDrives(drivesString)
+            // an existing prefix owns the drive list, so write it there too
+            if (java.io.File(c.rootDir, ".wine/dosdevices").isDirectory) {
+                com.winlator.cmod.runtime.wine.WineUtils.applyDrivesToPrefix(c, drivesString)
+            }
             c.setFullscreenStretched(state.fullscreenStretched.value)
             c.setDirectCompositionEnabled(state.directComposition.value)
+            c.setUseUnixLibs(state.useUnixLibs.value)
             c.setInputType(finalInputType)
+            c.setExclusiveXInput(state.containerExclusiveInput.value)
             c.setStartupSelection(startupSelection)
             c.setBox64Version(box64Version)
             c.setBox64Preset(box64Preset)
@@ -773,7 +878,12 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             dismiss()
         } else {
             try {
-                val data = JSONObject()
+                val data = ContainerCreation.buildLaunchReadyData(
+                    context,
+                    contentsManager,
+                    name,
+                    selectedWineStr,
+                )
                 data.put("name", name)
                 data.put("screenSize", screenSize)
                 data.put("envVars", envVarsStr)
@@ -789,7 +899,13 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                 data.put("wincomponents", wincomponents)
                 data.put("drives", drivesString)
                 data.put("fullscreenStretched", state.fullscreenStretched.value)
+                val extraDataObj = data.optJSONObject("extraData") ?: org.json.JSONObject()
+                extraDataObj.put(Container.EXTRA_DIRECT_COMPOSITION, if (state.directComposition.value) "1" else "0")
+                extraDataObj.put("swapRB", if (state.selectedSurfaceEffect.intValue == 1) "1" else "0")
+                data.put("extraData", extraDataObj)
+                data.put("useUnixLibs", state.useUnixLibs.value)
                 data.put("inputType", finalInputType)
+                data.put("exclusiveXInput", state.containerExclusiveInput.value)
                 data.put("startupSelection", startupSelection.toInt())
                 data.put("box64Version", box64Version)
                 data.put("box64Preset", box64Preset)
@@ -801,11 +917,19 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                 data.put("lc_all", state.lcAll.value)
                 data.put("execArgs", state.execArgs.value)
 
-                preloaderDialog.show(R.string.containers_list_creating)
+                creatingPopup.show()
                 ImageFs.find(File(context.filesDir, "imagefs"))
 
-                manager.createContainerAsync(data, contentsManager) { newContainer ->
+                ContainerCreation.createContainerAsync(manager, contentsManager, data) { newContainer ->
                     if (newContainer != null) {
+                        // Container.loadData() ignores unknown top-level keys, so extras must be set post-creation.
+                        newContainer.putExtra(
+                            "swapRB",
+                            if (state.selectedSurfaceEffect.intValue == 1) "1" else "0"
+                        )
+                        getRefreshRateFromState()?.let { newContainer.putExtra("refreshRate", it) }
+                        newContainer.setZinkMode(if (state.selectedZinkMode.intValue == 1) "windows" else "unix")
+                        newContainer.saveData()
                         saveMouseWarpOverride(newContainer)
                         // Persist Direct Composition on the new container — it's stored as
                         // an extraData entry, not a top-level JSON field, so it doesn't
@@ -817,12 +941,12 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                     } else {
                         WinToast.show(context, R.string.setup_wizard_unable_to_install_system_files)
                     }
-                    preloaderDialog.close()
+                    creatingPopup.close()
                     dismiss()
                 }
             } catch (e: Throwable) {
                 Log.e(TAG, "Error creating container", e)
-                preloaderDialog.close()
+                creatingPopup.close()
                 WinToast.show(
                     context,
                     context.getString(R.string.common_ui_error_with_message, e.message ?: ""),
@@ -910,7 +1034,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         fexcorePresetIds = ids
         val saved = container?.getFEXCorePreset()
             ?: PreferenceManager.getDefaultSharedPreferences(context)
-                .getString("fexcore_preset", FEXCorePreset.PERFORMANCE)
+                .getString("fexcore_preset", FEXCorePreset.PERFORMANCE_TSO)
         val idx = ids.indexOfFirst { it == saved }
         state.selectedFexcorePreset.intValue = if (idx >= 0) idx else 0
     }
@@ -971,14 +1095,22 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         return if (archLabel.isNotEmpty()) "$base ($archLabel)" else base
     }
 
-    private fun applyDefaultContainerName(wineInfo: WineInfo, force: Boolean = false) {
+    private fun applyDefaultContainerName(
+        wineInfo: WineInfo,
+        wineVersionIdentifier: String? = null,
+        force: Boolean = false,
+    ) {
         if (container != null) return
 
         val currentName = state.name.value.trim()
-        val defaultName = wineInfo.toString()
+        val defaultName =
+            wineVersionIdentifier
+                ?.let { ContainerCreation.displayNameForWineVersion(context, contentsManager, it) }
+                ?: wineInfo.toString()
+        val uniqueDefault = ContainerCreation.uniqueName(manager, defaultName)
         if (force || currentName.isEmpty() || currentName == autogeneratedContainerName) {
-            state.name.value = defaultName
-            autogeneratedContainerName = defaultName
+            state.name.value = uniqueDefault
+            autogeneratedContainerName = uniqueDefault
         }
     }
 
@@ -1036,6 +1168,8 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             context.resources.getStringArray(R.array.device_memory_entries).toList()
         state.gfxPresentModeEntries.value =
             context.resources.getStringArray(R.array.present_mode_entries).toList()
+        state.gfxCompositorPresentModeEntries.value =
+            context.resources.getStringArray(R.array.compositor_present_mode_entries).toList()
         state.gfxResourceTypeEntries.value =
             context.resources.getStringArray(R.array.resource_type_entries).toList()
         state.gfxBcnEmulationEntries.value =
@@ -1044,6 +1178,10 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             context.resources.getStringArray(R.array.bcn_emulation_type_entries).toList()
         state.gfxBcnEmulationCacheEntries.value =
             context.resources.getStringArray(R.array.bcn_emulation_cache_entries).toList()
+        state.gfxTranscoderEntries.value =
+            context.resources.getStringArray(R.array.wrapper_transcoder_entries).toList()
+        state.gfxQualityEntries.value =
+            context.resources.getStringArray(R.array.wrapper_quality_entries).toList()
 
         val gpuNames = mutableListOf("Device")
         try {
@@ -1061,14 +1199,17 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
 
         loadGraphicsDriverVersions()
 
-        selectByValue(state.gfxVulkanVersionEntries.value, config.get("vulkanVersion") ?: "1.3", state.gfxSelectedVulkanVersion)
+        selectByValue(state.gfxVulkanVersionEntries.value, config.get("vulkanVersion") ?: "1.4", state.gfxSelectedVulkanVersion)
         selectByValue(state.gfxGpuNameEntries.value, config.get("gpuName") ?: "Device", state.gfxSelectedGpuName)
         selectByNumber(state.gfxMaxDeviceMemoryEntries.value, config.get("maxDeviceMemory") ?: "0", state.gfxSelectedMaxDeviceMemory)
         selectByValue(state.gfxPresentModeEntries.value, config.get("presentMode") ?: "mailbox", state.gfxSelectedPresentMode)
+        selectByValue(state.gfxCompositorPresentModeEntries.value, config.get("compositorPresentMode") ?: "fifo", state.gfxSelectedCompositorPresentMode)
         selectByValue(state.gfxResourceTypeEntries.value, config.get("resourceType") ?: "auto", state.gfxSelectedResourceType)
         selectByValue(state.gfxBcnEmulationEntries.value, config.get("bcnEmulation") ?: "none", state.gfxSelectedBcnEmulation)
         selectByValue(state.gfxBcnEmulationTypeEntries.value, config.get("bcnEmulationType") ?: "compute", state.gfxSelectedBcnEmulationType)
         selectByValue(state.gfxBcnEmulationCacheEntries.value, config.get("bcnEmulationCache") ?: "0", state.gfxSelectedBcnEmulationCache)
+        selectByValue(state.gfxTranscoderEntries.value, config.get("transcoder") ?: "cpu", state.gfxSelectedTranscoder)
+        selectByValue(state.gfxQualityEntries.value, config.get("quality") ?: "low", state.gfxSelectedQuality)
         state.gfxSyncFrame.value = config.get("syncFrame") == "1"
         state.gfxDisablePresentWait.value = config.get("disablePresentWait") == "1"
         state.graphicsDriverVersion.value = config.get("version") ?: ""
@@ -1137,12 +1278,21 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         }
     }
 
+    private fun initialDxWrapperConfig(): String =
+        container?.getDXWrapperConfig()
+            ?: ContainerCreation.defaultDxWrapperConfig(contentsManager, isArm64EC)
+
     private fun loadDxvkConfigState() {
-        val configStr = container?.getDXWrapperConfig() ?: Container.DEFAULT_DXWRAPPERCONFIG
+        val configStr = initialDxWrapperConfig()
         val config = DXVKConfigUtils.parseConfig(configStr)
         state.dxvkVkd3dFeatureLevelEntries.value = DXVKConfigUtils.VKD3D_FEATURE_LEVEL.toList()
-        state.dxvkDdrawWrapperEntries.value =
-            context.resources.getStringArray(R.array.ddrawrapper_entries).toList()
+        val ddrawWrapperItems =
+            context.resources.getStringArray(R.array.ddrawrapper_entries).toMutableList()
+        for (profile in contentsManager.getProfiles(ContentProfile.ContentType.CONTENT_TYPE_D7VK)) {
+            ddrawWrapperItems.add(ContentsManager.getEntryName(profile))
+        }
+        if (!isArm64EC) ddrawWrapperItems.removeAll { it.contains("arm64ec") }
+        state.dxvkDdrawWrapperEntries.value = ddrawWrapperItems
         loadDxvkVersions()
         loadVkd3dVersions()
         selectByIdentifier(state.dxvkVkd3dFeatureLevelEntries.value, config.get("vkd3dLevel"), state.dxvkSelectedVkd3dFeatureLevel)
@@ -1160,7 +1310,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         }
         if (!isArm64EC) originalItems.removeAll { it.contains("arm64ec") }
         state.dxvkVersionEntries.value = originalItems
-        val configStr = container?.getDXWrapperConfig() ?: Container.DEFAULT_DXWRAPPERCONFIG
+        val configStr = initialDxWrapperConfig()
         val config = DXVKConfigUtils.parseConfig(configStr)
         selectByIdentifier(originalItems, config.get("version"), state.dxvkSelectedVersion)
     }
@@ -1172,7 +1322,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             items.add(profile.verName + "-" + profile.verCode)
         }
         state.dxvkVkd3dVersionEntries.value = items
-        val configStr = container?.getDXWrapperConfig() ?: Container.DEFAULT_DXWRAPPERCONFIG
+        val configStr = initialDxWrapperConfig()
         val config = DXVKConfigUtils.parseConfig(configStr)
         selectByIdentifier(items, config.get("vkd3dVersion"), state.dxvkSelectedVkd3dVersion)
     }
@@ -1206,7 +1356,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
     }
 
     private fun buildGraphicsDriverConfigFromState(): String {
-        val vulkanVersion = state.gfxVulkanVersionEntries.value.getOrElse(state.gfxSelectedVulkanVersion.intValue) { "1.3" }
+        val vulkanVersion = state.gfxVulkanVersionEntries.value.getOrElse(state.gfxSelectedVulkanVersion.intValue) { "1.4" }
         val version = state.gfxDriverVersionEntries.value.getOrElse(state.gfxSelectedDriverVersion.intValue) { "" }
         val blacklisted = state.gfxBlacklistedExtensions.value.joinToString(",")
         val gpuName = state.gfxGpuNameEntries.value.getOrElse(state.gfxSelectedGpuName.intValue) { "Device" }
@@ -1214,17 +1364,22 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             state.gfxMaxDeviceMemoryEntries.value.getOrElse(state.gfxSelectedMaxDeviceMemory.intValue) { "0" }
         )
         val presentMode = state.gfxPresentModeEntries.value.getOrElse(state.gfxSelectedPresentMode.intValue) { "mailbox" }
+        val compositorPresentMode = state.gfxCompositorPresentModeEntries.value.getOrElse(state.gfxSelectedCompositorPresentMode.intValue) { "fifo" }
         val syncFrame = if (state.gfxSyncFrame.value) "1" else "0"
         val disablePresentWait = if (state.gfxDisablePresentWait.value) "1" else "0"
         val resourceType = state.gfxResourceTypeEntries.value.getOrElse(state.gfxSelectedResourceType.intValue) { "auto" }
         val bcnEmulation = state.gfxBcnEmulationEntries.value.getOrElse(state.gfxSelectedBcnEmulation.intValue) { "none" }
         val bcnEmulationType = state.gfxBcnEmulationTypeEntries.value.getOrElse(state.gfxSelectedBcnEmulationType.intValue) { "compute" }
         val bcnEmulationCache = state.gfxBcnEmulationCacheEntries.value.getOrElse(state.gfxSelectedBcnEmulationCache.intValue) { "0" }
+        val transcoder = state.gfxTranscoderEntries.value.getOrElse(state.gfxSelectedTranscoder.intValue) { "cpu" }
+        val quality = state.gfxQualityEntries.value.getOrElse(state.gfxSelectedQuality.intValue) { "low" }
         return "vulkanVersion=$vulkanVersion;version=$version;blacklistedExtensions=$blacklisted;" +
             "maxDeviceMemory=$maxDeviceMemory;presentMode=$presentMode;syncFrame=$syncFrame;" +
             "disablePresentWait=$disablePresentWait;resourceType=$resourceType;" +
             "bcnEmulation=$bcnEmulation;bcnEmulationType=$bcnEmulationType;" +
-            "bcnEmulationCache=$bcnEmulationCache;gpuName=$gpuName"
+            "bcnEmulationCache=$bcnEmulationCache;gpuName=$gpuName;" +
+            "compositorPresentMode=$compositorPresentMode;" +
+            "transcoder=$transcoder;quality=$quality"
     }
 
     private fun buildDxvkConfigFromState(): String {
@@ -1313,6 +1468,15 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         }
     }
 
+    /** Selected rate, or null for "Default" — stored as key absence so it falls through to the phone's auto rate. */
+    private fun getRefreshRateFromState(): String? {
+        val entries = state.refreshRateEntries.value
+        val idx = state.selectedRefreshRate.intValue
+        if (idx !in entries.indices) return null
+        val rate = RefreshRateUtils.parseRefreshRateLabel(entries[idx])
+        return if (rate > 0) rate.toString() else null
+    }
+
     private fun getScreenSizeFromState(): String {
         val entries = state.screenSizeEntries.value
         val idx = state.selectedScreenSize.intValue
@@ -1367,9 +1531,8 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         val themeIdx = state.selectedDesktopTheme.intValue
         val theme = if (themeIdx in themeEntries.indices) themeEntries[themeIdx].uppercase() else "LIGHT"
 
-        val typeEntries = state.desktopBackgroundTypeEntries.value
         val typeIdx = state.selectedDesktopBackgroundType.intValue
-        val type = if (typeIdx in typeEntries.indices) typeEntries[typeIdx].uppercase() else "COLOR"
+        val type = WineThemeManager.BackgroundType.values().getOrNull(typeIdx)?.name ?: "IMAGE"
 
         val color = state.desktopBackgroundColor.value
         val base = "$theme,$type,$color"
@@ -1434,6 +1597,15 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
 
     fun show() {
         dialog.show()
+        restorePaneNav?.invoke()
+        restorePaneNav = dialog.window?.bindPaneNav(
+            PaneNavWindowHandlers(
+                onDir = { nav.dpad(it) },
+                onActivate = { nav.dpad(PANE_DIR_ACTIVATE) },
+                onDismiss = { if (nav.onContentBack?.invoke() != true) dialog.dismiss() },
+                onStart = { if (state.isLoaded.value) saveSettings() },
+            )
+        )
         dialog.window?.apply {
             applyDialogLayout()
             decorView.post { applyDialogLayout() }
@@ -1499,12 +1671,224 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
     }
 
     fun dismiss() {
-        // Cleanup (launcher unregister, keyboard hide, onFinished) runs in
         // the Dialog.OnDismissListener so back-button dismissal takes the
         // same path as Save/Cancel.
         dialog.dismiss()
     }
 
+    private fun exportSaves(onComplete: () -> Unit) {
+        val container = this.container ?: run {
+            onComplete()
+            return
+        }
+        val sanitizedName = container.name.replace(" ", "_")
+        val date = SimpleDateFormat("MMddyyyy_HHmmss", Locale.US).format(Date())
+        val zipName = "${sanitizedName}_${date}.zip"
+        val exportDir = File(Environment.getExternalStorageDirectory(), "WinNative/saves")
+        if (!exportDir.exists()) exportDir.mkdirs()
+        val zipFile = File(exportDir, zipName)
+
+        scope.launch(Dispatchers.IO) {
+            try {
+                zipFile.outputStream().use { os ->
+                    java.util.zip.ZipOutputStream(java.io.BufferedOutputStream(os)).use { zos ->
+                        val usersDir = File(container.getRootDir(), ".wine/drive_c/users")
+                        if (usersDir.exists()) {
+                            zos.putNextEntry(java.util.zip.ZipEntry("${usersDir.name}/"))
+                            zos.closeEntry()
+                            zipDir(usersDir, usersDir.name, zos)
+                        }
+
+                        val programDataDir = File(container.getRootDir(), ".wine/drive_c/ProgramData")
+                        if (programDataDir.exists()) {
+                            zos.putNextEntry(java.util.zip.ZipEntry("${programDataDir.name}/"))
+                            zos.closeEntry()
+                            zipDir(programDataDir, programDataDir.name, zos)
+                        }
+                    }
+                }
+
+                withContext(Dispatchers.Main) {
+                    onComplete()
+                    WinToast.show(context, context.getString(R.string.saves_export_success_path, "/WinNative/saves"), dialog.window?.decorView)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                withContext(Dispatchers.Main) {
+                    onComplete()
+                    WinToast.show(context, context.getString(R.string.saves_import_export_exported_failed, e.message), dialog.window?.decorView)
+                }
+            }
+        }
+    }
+
+    private fun isExcluded(name: String): Boolean {
+        if (name.isEmpty()) return false
+        val excludedFolders = setOf(
+            "Contacts", "Desktop", "Downloads", "Favorites", "Links",
+            "Music", "Pictures", "Searches", "Temp", "Videos", "Package Cache", "Templates"
+        )
+        if (excludedFolders.any { it.equals(name, ignoreCase = true) }) return true
+        if (name.contains("Microsoft", ignoreCase = true)) return true
+        if (name.contains("Windows", ignoreCase = true)) return true
+        return false
+    }
+
+    private fun isPathExcluded(path: String): Boolean {
+        return path.split('/').any { isExcluded(it) }
+    }
+
+    private fun zipDir(
+        dir: File,
+        baseName: String,
+        zos: java.util.zip.ZipOutputStream,
+    ) {
+        val children = dir.listFiles() ?: return
+        for (child in children) {
+            if (isExcluded(child.name)) continue
+            val name = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
+            if (child.isDirectory) {
+                zos.putNextEntry(java.util.zip.ZipEntry("$name/"))
+                zos.closeEntry()
+                zipDir(child, name, zos)
+            } else {
+                zos.putNextEntry(java.util.zip.ZipEntry(name))
+                child.inputStream().use { it.copyTo(zos) }
+                zos.closeEntry()
+            }
+        }
+    }
+
+    private fun showExportSavesConfirmation() {
+        showSavesPopupConfirmation(
+            title = context.getString(R.string.saves_export_warning_title),
+            message = context.getString(R.string.saves_export_warning_body),
+            confirmLabel = context.getString(R.string.common_ui_export),
+            progressLabel = context.getString(R.string.common_ui_exporting),
+        ) { dismiss ->
+            exportSaves(onComplete = dismiss)
+        }
+    }
+
+    private fun showImportSavesConfirmation() {
+        showSavesPopupConfirmation(
+            title = context.getString(R.string.saves_import_warning_title),
+            message = context.getString(R.string.saves_import_warning_body),
+            confirmLabel = context.getString(R.string.common_ui_import),
+        ) { dismiss ->
+            dismiss()
+            val imagefsRoot = ImageFs.find(context).getRootDir()
+            val driveRoots =
+                listOf(
+                    DirectoryPickerDialog.ManagedRoot("C:", File(imagefsRoot, "home").absolutePath),
+                    DirectoryPickerDialog.ManagedRoot("Z:", imagefsRoot.absolutePath),
+                    DirectoryPickerDialog.ManagedRoot(
+                        "D:",
+                        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath,
+                    ),
+                    DirectoryPickerDialog.ManagedRoot("Internal", Environment.getExternalStorageDirectory().absolutePath),
+                )
+            DirectoryPickerDialog.showFile(
+                activity,
+                title = context.getString(R.string.common_ui_import),
+                allowedExtensions = setOf("zip"),
+                extraRoots = driveRoots,
+            ) { pickedPath ->
+                importSaves(File(pickedPath))
+            }
+        }
+    }
+
+    private fun showSavesPopupConfirmation(
+        title: String,
+        message: String,
+        confirmLabel: String,
+        progressLabel: String? = null,
+        onConfirm: (dismiss: () -> Unit) -> Unit,
+    ) {
+        val dialog = AppCompatDialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
+            setCancelable(true)
+            setCanceledOnTouchOutside(true)
+            window?.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.TRANSPARENT))
+        }
+        val dismiss = { dialog.dismiss() }
+        val composeView = ComposeView(activity).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+            setContent {
+                WinNativeTheme {
+                    PopupDialog(
+                        title = title,
+                        message = message,
+                        confirmLabel = confirmLabel,
+                        progressLabel = progressLabel,
+                        modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                        onConfirm = { onConfirm(dismiss) },
+                        onCancel = dismiss,
+                    )
+                }
+            }
+        }
+        dialog.setContentView(composeView)
+        dialog.show()
+    }
+
+    private fun importSaves(zipFile: File) {
+        val container = this.container ?: return
+        scope.launch(Dispatchers.IO) {
+            val loadingDialog = withContext(Dispatchers.Main) {
+                WinNativeComposeDialogs.showLoading(context, context.getString(R.string.common_ui_loading))
+            }
+            try {
+                java.util.zip.ZipFile(zipFile).use { zf ->
+                    val usersDir = File(container.getRootDir(), ".wine/drive_c/users")
+                    val xuserDir = File(usersDir, "xuser")
+
+                    val entries = zf.entries()
+                    while (entries.hasMoreElements()) {
+                        val entry = entries.nextElement()
+                        val name = entry.name
+
+                        if (isPathExcluded(name)) continue
+
+                        var destFile: File? = null
+
+                        if (name.startsWith("users/")) {
+                            destFile = File(usersDir.parentFile, name)
+                        } else if (name.startsWith("ProgramData/")) {
+                            destFile = File(usersDir.parentFile, name)
+                        } else if (name.startsWith("xuser/")) {
+                            destFile = File(usersDir, name)
+                        } else if (name.startsWith("Documents/") || name.startsWith("Saved Games/") || name.startsWith("AppData/")) {
+                            destFile = File(xuserDir, name)
+                        }
+
+                        if (destFile != null) {
+                            if (entry.isDirectory) {
+                                destFile.mkdirs()
+                            } else {
+                                destFile.parentFile?.mkdirs()
+                                zf.getInputStream(entry).use { input ->
+                                    destFile.outputStream().use { input.copyTo(it) }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                withContext(Dispatchers.Main) {
+                    loadingDialog?.dismiss()
+                    WinToast.show(context, R.string.saves_import_export_imported, dialog.window?.decorView)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                withContext(Dispatchers.Main) {
+                    loadingDialog?.dismiss()
+                    WinToast.show(context, context.getString(R.string.saves_import_export_imported_failed, e.message), dialog.window?.decorView)
+                }
+            }
+        }
+    }
+
     companion object {
         private const val TAG = "ContainerSettingsCompose"
 
diff --git a/app/src/main/feature/settings/containers/ContainersFragment.kt b/app/src/main/feature/settings/containers/ContainersFragment.kt
index 1fbf45e7a..9e92fb692 100644
--- a/app/src/main/feature/settings/containers/ContainersFragment.kt
+++ b/app/src/main/feature/settings/containers/ContainersFragment.kt
@@ -18,9 +18,9 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import com.winlator.cmod.R
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.feature.settings.ContainerSettingsComposeDialog
 import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
-import com.winlator.cmod.feature.sync.google.ContainerBackupManager
 import com.winlator.cmod.runtime.container.Container
 import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.content.ContentsManager
@@ -28,24 +28,18 @@ import com.winlator.cmod.runtime.display.XServerDisplayActivity
 import com.winlator.cmod.runtime.display.environment.ImageFs
 import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.io.FileUtils
-import com.winlator.cmod.shared.ui.dialog.PreloaderDialog
+import com.winlator.cmod.shared.ui.dialog.ContainerProgressPopup
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import java.io.File
+import java.nio.file.Files
 import kotlin.math.roundToInt
 
 class ContainersFragment : Fragment() {
     private lateinit var manager: ContainerManager
-    private lateinit var preloaderDialog: PreloaderDialog
 
     private var screenState by mutableStateOf(ContainersScreenState())
-    private var pendingBackups = emptyList<ContainerBackupManager.DriveBackupFile>()
     private var storageScanToken = 0L
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        preloaderDialog = PreloaderDialog(requireActivity())
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -68,16 +62,14 @@ class ContainersFragment : Fragment() {
                         onRunContainer = ::runContainer,
                         onEditContainer = ::editContainer,
                         onDuplicateContainer = ::duplicateContainer,
-                        onShowBackups = ::showContainerBackupsDialog,
+                        onInstallComponents = ::openComponentInstaller,
                         onRemoveContainer = ::removeContainer,
                         onShowInfo = ::showContainerInfo,
                         onDismissDialog = ::dismissDialog,
                         onConfirmDuplicateDialog = ::performDuplicateContainer,
                         onConfirmRemoveDialog = ::performRemoveContainer,
-                        onConfirmBackupDialog = ::startContainerBackup,
-                        onConfirmRestoreDialog = ::startContainerRestore,
                         onClearCacheDialog = ::clearContainerCache,
-                        onBackupSelectionChosen = ::restoreBackupByIndex,
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                     )
                 }
             }
@@ -105,7 +97,7 @@ class ContainersFragment : Fragment() {
 
     private fun openAddContainer() {
         val context = context ?: return
-        if (!ImageFs.find(context).isValid) {
+        if (!ImageFs.find(context).isUpToDate) {
             WinToast.show(context, R.string.setup_wizard_system_image_not_installed, Toast.LENGTH_LONG)
             return
         }
@@ -143,6 +135,10 @@ class ContainersFragment : Fragment() {
         screenState = screenState.copy(dialog = ContainersDialogUiState.ConfirmDuplicate(container))
     }
 
+    private fun openComponentInstaller(container: Container) {
+        screenState = screenState.copy(dialog = ContainersDialogUiState.ComponentInstaller(container))
+    }
+
     private fun removeContainer(container: Container) {
         screenState = screenState.copy(dialog = ContainersDialogUiState.ConfirmRemove(container))
     }
@@ -158,129 +154,45 @@ class ContainersFragment : Fragment() {
         startStorageScan(container)
     }
 
-    private fun showContainerBackupsDialog(container: Container) {
-        screenState = screenState.copy(dialog = ContainersDialogUiState.Backups(container))
-    }
-
-    private fun startContainerBackup(container: Container) {
-        dismissDialog()
-        preloaderDialog.show(R.string.container_backups_backing_up)
-        ContainerBackupManager.backupContainer(requireActivity(), container) { result ->
-            preloaderDialog.close()
-            screenState =
-                screenState.copy(
-                    dialog =
-                        ContainersDialogUiState.Message(
-                            title = getString(R.string.container_backups_title),
-                            message = result.message,
-                        ),
-                )
-        }
-    }
-
-    private fun startContainerRestore(container: Container) {
-        dismissDialog()
-        preloaderDialog.show(R.string.container_backups_checking)
-        ContainerBackupManager.prepareRestore(requireActivity(), container) { preparation ->
-            if (!isAdded) {
-                preloaderDialog.close()
-                return@prepareRestore
-            }
-
-            if (!preparation.success) {
-                preloaderDialog.close()
-                screenState =
-                    screenState.copy(
-                        dialog =
-                            ContainersDialogUiState.Message(
-                                title = getString(R.string.container_backups_title),
-                                message = preparation.message,
-                            ),
-                    )
-                return@prepareRestore
-            }
-
-            if (preparation.matchedFile != null) {
-                executeContainerRestore(container, preparation.matchedFile)
-                return@prepareRestore
-            }
-
-            preloaderDialog.close()
-            showBackupSelectionDialog(container, preparation.candidates)
-        }
-    }
-
-    private fun showBackupSelectionDialog(
-        container: Container,
-        backups: List<ContainerBackupManager.DriveBackupFile>?,
-    ) {
-        if (backups.isNullOrEmpty()) {
-            screenState =
-                screenState.copy(
-                    dialog =
-                        ContainersDialogUiState.Message(
-                            title = getString(R.string.container_backups_title),
-                            message = getString(R.string.container_backups_no_files),
-                        ),
-                )
-            return
-        }
-
-        pendingBackups = backups
-        screenState =
-            screenState.copy(
-                dialog =
-                    ContainersDialogUiState.BackupSelection(
-                        container = container,
-                        backupNames = backups.map { it.name },
-                    ),
-            )
-    }
-
-    private fun executeContainerRestore(
-        container: Container,
-        driveFile: ContainerBackupManager.DriveBackupFile,
-    ) {
-        dismissDialog()
-        preloaderDialog.show(R.string.container_backups_restoring)
-        ContainerBackupManager.restoreContainerFromDriveFile(requireActivity(), container, driveFile) { result ->
-            preloaderDialog.close()
-            screenState =
-                screenState.copy(
-                    dialog =
-                        ContainersDialogUiState.Message(
-                            title = getString(R.string.container_backups_title),
-                            message = result.message,
-                        ),
-                )
-        }
-    }
-
     private fun performDuplicateContainer(container: Container) {
         dismissDialog()
-        preloaderDialog.show(R.string.containers_list_duplicating, false)
+        val duplicatingPopup = ContainerProgressPopup(
+            requireActivity(),
+            R.string.containers_list_duplicating,
+            indeterminate = false,
+        )
+        duplicatingPopup.show()
         manager.duplicateContainerAsync(container, { progress ->
-            preloaderDialog.setProgress(progress)
-        }) {
-            preloaderDialog.setProgress(100)
-            preloaderDialog.closeWithDelay(600)
-            Handler(Looper.getMainLooper()).postDelayed({
-                loadContainersList()
-            }, 600)
+            duplicatingPopup.setProgress(progress)
+        }) { success ->
+            if (success) {
+                duplicatingPopup.setProgress(100)
+                duplicatingPopup.closeWithDelay(600)
+                Handler(Looper.getMainLooper()).postDelayed({
+                    loadContainersList()
+                }, 600)
+            } else {
+                duplicatingPopup.close()
+                context?.let {
+                    WinToast.show(it, R.string.containers_list_duplicate_failed, Toast.LENGTH_LONG)
+                }
+            }
         }
     }
 
     private fun performRemoveContainer(container: Container) {
         val ctx = context ?: return
         dismissDialog()
-        preloaderDialog.show(R.string.containers_list_removing)
+        val removingPopup =
+            ContainerProgressPopup(requireActivity(), R.string.containers_list_removing)
+        removingPopup.show()
         for (shortcut in manager.loadShortcuts()) {
             if (shortcut.container == container) {
                 ShortcutsFragment.disableShortcutOnScreen(ctx, shortcut)
             }
         }
         manager.removeContainerAsync(container) {
-            preloaderDialog.close()
+            removingPopup.close()
             loadContainersList()
         }
     }
@@ -299,12 +211,6 @@ class ContainersFragment : Fragment() {
         }.start()
     }
 
-    private fun restoreBackupByIndex(index: Int) {
-        val dialog = screenState.dialog as? ContainersDialogUiState.BackupSelection ?: return
-        val backup = pendingBackups.getOrNull(index) ?: return
-        executeContainerRestore(dialog.container, backup)
-    }
-
     private fun dismissDialog() {
         storageScanToken += 1L
         screenState = screenState.copy(dialog = ContainersDialogUiState.None)
@@ -357,6 +263,7 @@ class ContainersFragment : Fragment() {
             val current = stack.removeLast()
             val files = current.listFiles() ?: continue
             for (file in files) {
+                if (Files.isSymbolicLink(file.toPath())) continue
                 if (file.isDirectory) {
                     stack.add(file)
                 } else {
diff --git a/app/src/main/feature/settings/containers/ContainersScreen.kt b/app/src/main/feature/settings/containers/ContainersScreen.kt
index 08f67e029..caa2a3e40 100644
--- a/app/src/main/feature/settings/containers/ContainersScreen.kt
+++ b/app/src/main/feature/settings/containers/ContainersScreen.kt
@@ -7,10 +7,10 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
@@ -25,16 +25,12 @@ import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material.icons.outlined.Inbox
 import androidx.compose.material.icons.outlined.Info
@@ -47,6 +43,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -66,18 +63,30 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
 import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.dialog.PopupTextAction
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import androidx.compose.runtime.CompositionLocalProvider
 import java.util.Locale
 
-private val ContainersBg = Color(0xFF18181D)
+private val ContainersBg = Color(0xFF11111C)
 private val ContainersCard = Color(0xFF1C1C2A)
 private val ContainersSubcard = Color(0xFF161622)
 private val ContainersOutline = Color(0xFF2A2A3A)
 private val ContainersIconBox = Color(0xFF242434)
 private val ContainersAccent = Color(0xFF1A9FFF)
+private val ContainersNavHighlight = Color(0xFF4FC3F7)
 private val ContainersTextPrimary = Color(0xFFF0F4FF)
 private val ContainersTextSecondary = Color(0xFF7A8FA8)
 private val ContainersDanger = Color(0xFFFF7A88)
 
+// Card shape knob: width : height. Lower = squarer (1f = perfect square), higher = wider/shorter.
+private const val ContainerCardAspect = 1.2f
+
 data class ContainersScreenState(
     val containers: List<Container> = emptyList(),
     val dialog: ContainersDialogUiState = ContainersDialogUiState.None,
@@ -90,17 +99,12 @@ sealed interface ContainersDialogUiState {
         val container: Container,
     ) : ContainersDialogUiState
 
-    data class ConfirmRemove(
-        val container: Container,
-    ) : ContainersDialogUiState
-
-    data class Backups(
+    data class ComponentInstaller(
         val container: Container,
     ) : ContainersDialogUiState
 
-    data class BackupSelection(
+    data class ConfirmRemove(
         val container: Container,
-        val backupNames: List<String>,
     ) : ContainersDialogUiState
 
     data class StorageInfo(
@@ -129,60 +133,92 @@ fun ContainersScreen(
     onRunContainer: (Container) -> Unit,
     onEditContainer: (Container) -> Unit,
     onDuplicateContainer: (Container) -> Unit,
-    onShowBackups: (Container) -> Unit,
+    onInstallComponents: (Container) -> Unit,
     onRemoveContainer: (Container) -> Unit,
     onShowInfo: (Container) -> Unit,
     onDismissDialog: () -> Unit,
     onConfirmDuplicateDialog: (Container) -> Unit,
     onConfirmRemoveDialog: (Container) -> Unit,
-    onConfirmBackupDialog: (Container) -> Unit,
-    onConfirmRestoreDialog: (Container) -> Unit,
     onClearCacheDialog: (Container) -> Unit,
-    onBackupSelectionChosen: (Int) -> Unit,
+    bridge: SettingsNavBridge? = null,
 ) {
     val layoutDirection = LocalLayoutDirection.current
     val navBarPadding = WindowInsets.navigationBars.asPaddingValues()
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
+    val contentNav = rememberSettingsContentNav(bridge)
 
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(ContainersBg)
-                .padding(
-                    start = 16.dp + navBarStartPadding,
-                    top = 16.dp,
-                    end = 16.dp + navBarEndPadding,
-                ),
-    ) {
-        SectionLabel(text = stringResource(R.string.common_ui_containers))
-        Spacer(Modifier.height(6.dp))
-
-        LazyVerticalGrid(
-            columns = GridCells.Fixed(3),
-            modifier = Modifier.fillMaxSize(),
-            contentPadding = PaddingValues(bottom = 4.dp + navBarBottomPadding),
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp),
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(ContainersBg)
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        top = 16.dp,
+                        end = 16.dp + navBarEndPadding,
+                    ),
         ) {
-            item(key = "add") {
-                AddContainerCard(onClick = onAddContainer)
-            }
-            items(
-                items = state.containers,
-                key = { container -> container.id },
-            ) { container ->
-                ContainerCard(
-                    container = container,
-                    onRun = { onRunContainer(container) },
-                    onEdit = { onEditContainer(container) },
-                    onDuplicate = { onDuplicateContainer(container) },
-                    onShowBackups = { onShowBackups(container) },
-                    onRemove = { onRemoveContainer(container) },
-                    onShowInfo = { onShowInfo(container) },
-                )
+            SectionLabel(text = stringResource(R.string.common_ui_containers))
+            Spacer(Modifier.height(6.dp))
+
+            val cardSpacing = 8.dp
+            val minCardWidth = 140.dp
+            BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+                val columns =
+                    maxOf(1, ((maxWidth + cardSpacing) / (minCardWidth + cardSpacing)).toInt())
+                val totalCells = state.containers.size + 1
+                val rowCount = (totalCells + columns - 1) / columns
+
+                Column(
+                    modifier =
+                        Modifier
+                            .fillMaxSize()
+                            .verticalScroll(rememberScrollState()),
+                    verticalArrangement = Arrangement.spacedBy(cardSpacing),
+                ) {
+                    for (rowIndex in 0 until rowCount) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(cardSpacing),
+                        ) {
+                            for (colIndex in 0 until columns) {
+                                val cellIndex = rowIndex * columns + colIndex
+                                val gxBase = colIndex * 2
+                                val gyBase = rowIndex * 2
+                                Box(modifier = Modifier.weight(1f)) {
+                                    when {
+                                        cellIndex == 0 ->
+                                            AddContainerCard(
+                                                onClick = onAddContainer,
+                                                navRow = gyBase,
+                                                navCol = gxBase,
+                                            )
+                                        cellIndex <= state.containers.size -> {
+                                            val container = state.containers[cellIndex - 1]
+                                            key(container.id) {
+                                                ContainerCard(
+                                                    container = container,
+                                                    navRow = gyBase,
+                                                    navCol = gxBase,
+                                                    onRun = { onRunContainer(container) },
+                                                    onEdit = { onEditContainer(container) },
+                                                    onDuplicate = { onDuplicateContainer(container) },
+                                                    onInstallComponents = { onInstallComponents(container) },
+                                                    onRemove = { onRemoveContainer(container) },
+                                                    onShowInfo = { onShowInfo(container) },
+                                                )
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    Spacer(Modifier.height(4.dp + navBarBottomPadding))
+                }
             }
         }
     }
@@ -193,40 +229,73 @@ fun ContainersScreen(
         }
 
         is ContainersDialogUiState.ConfirmDuplicate -> {
-            ContainersConfirmDialog(
-                message = stringResource(R.string.containers_list_confirm_duplicate),
-                confirmLabel = stringResource(R.string.common_ui_duplicate),
-                confirmColor = ContainersAccent,
-                onDismiss = onDismissDialog,
-                onConfirm = { onConfirmDuplicateDialog(dialog.container) },
-            )
+            val nav = remember { PaneNavRegistry() }
+            Dialog(
+                onDismissRequest = onDismissDialog,
+                properties = DialogProperties(usePlatformDefaultWidth = false),
+            ) {
+                DialogPaneNav(nav, onDismiss = onDismissDialog)
+                CompositionLocalProvider(LocalPaneNav provides nav) {
+                    Box(
+                        modifier =
+                            Modifier
+                                .fillMaxSize()
+                                .safeDrawingPadding()
+                                .padding(horizontal = 16.dp),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        PopupDialog(
+                            title = stringResource(R.string.containers_list_duplicate_title),
+                            message = stringResource(R.string.containers_list_confirm_duplicate),
+                            accentColor = ContainersAccent,
+                            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                            footer = {
+                                ConfirmDialogFooter(
+                                    confirmLabel = stringResource(R.string.common_ui_duplicate),
+                                    confirmColor = ContainersAccent,
+                                    onConfirm = { onConfirmDuplicateDialog(dialog.container) },
+                                    onCancel = onDismissDialog,
+                                )
+                            },
+                        )
+                    }
+                }
+            }
         }
 
         is ContainersDialogUiState.ConfirmRemove -> {
-            ContainersConfirmDialog(
-                message = stringResource(R.string.containers_list_confirm_remove),
-                confirmLabel = stringResource(R.string.common_ui_remove),
-                confirmColor = ContainersDanger,
-                onDismiss = onDismissDialog,
-                onConfirm = { onConfirmRemoveDialog(dialog.container) },
-            )
-        }
-
-        is ContainersDialogUiState.Backups -> {
-            ContainersBackupsDialog(
-                onDismiss = onDismissDialog,
-                onBackup = { onConfirmBackupDialog(dialog.container) },
-                onRestore = { onConfirmRestoreDialog(dialog.container) },
-            )
-        }
-
-        is ContainersDialogUiState.BackupSelection -> {
-            ContainersSelectionDialog(
-                title = stringResource(R.string.container_backups_select_title),
-                options = dialog.backupNames,
-                onDismiss = onDismissDialog,
-                onSelected = onBackupSelectionChosen,
-            )
+            val nav = remember { PaneNavRegistry() }
+            Dialog(
+                onDismissRequest = onDismissDialog,
+                properties = DialogProperties(usePlatformDefaultWidth = false),
+            ) {
+                DialogPaneNav(nav, onDismiss = onDismissDialog)
+                CompositionLocalProvider(LocalPaneNav provides nav) {
+                    Box(
+                        modifier =
+                            Modifier
+                                .fillMaxSize()
+                                .safeDrawingPadding()
+                                .padding(horizontal = 16.dp),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        PopupDialog(
+                            title = stringResource(R.string.containers_list_remove_title),
+                            message = stringResource(R.string.containers_list_confirm_remove),
+                            accentColor = ContainersDanger,
+                            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                            footer = {
+                                ConfirmDialogFooter(
+                                    confirmLabel = stringResource(R.string.common_ui_remove),
+                                    confirmColor = ContainersDanger,
+                                    onConfirm = { onConfirmRemoveDialog(dialog.container) },
+                                    onCancel = onDismissDialog,
+                                )
+                            },
+                        )
+                    }
+                }
+            }
         }
 
         is ContainersDialogUiState.StorageInfo -> {
@@ -237,6 +306,13 @@ fun ContainersScreen(
             )
         }
 
+        is ContainersDialogUiState.ComponentInstaller -> {
+            ComponentInstallerSheet(
+                container = dialog.container,
+                onDismiss = onDismissDialog,
+            )
+        }
+
         is ContainersDialogUiState.Message -> {
             ContainersMessageDialog(
                 title = dialog.title,
@@ -260,12 +336,16 @@ private fun SectionLabel(text: String) {
 }
 
 @Composable
-private fun AddContainerCard(onClick: () -> Unit) {
+private fun AddContainerCard(
+    onClick: () -> Unit,
+    navRow: Int,
+    navCol: Int,
+) {
     Column(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .height(138.dp)
+                .aspectRatio(ContainerCardAspect)
                 .clip(RoundedCornerShape(12.dp))
                 .background(ContainersCard)
                 .border(1.dp, ContainersOutline, RoundedCornerShape(12.dp))
@@ -282,7 +362,16 @@ private fun AddContainerCard(onClick: () -> Unit) {
                 Modifier
                     .size(56.dp)
                     .clip(CircleShape)
-                    .background(ContainersIconBox),
+                    .background(ContainersIconBox)
+                    .paneNavItem(
+                        cornerRadius = 28.dp,
+                        onActivate = onClick,
+                        highlightColor = ContainersNavHighlight,
+                        tapToSelect = true,
+                        isEntry = true,
+                        navRow = navRow,
+                        navCol = navCol,
+                    ),
             contentAlignment = Alignment.Center,
         ) {
             Icon(
@@ -306,20 +395,29 @@ private fun AddContainerCard(onClick: () -> Unit) {
 @Composable
 private fun ContainerCard(
     container: Container,
+    navRow: Int,
+    navCol: Int,
     onRun: () -> Unit,
     onEdit: () -> Unit,
     onDuplicate: () -> Unit,
-    onShowBackups: () -> Unit,
+    onInstallComponents: () -> Unit,
     onRemove: () -> Unit,
     onShowInfo: () -> Unit,
 ) {
     var menuExpanded by remember { mutableStateOf(false) }
+    val nameFontSize =
+        when {
+            container.name.length > 44 -> 9.sp
+            container.name.length > 34 -> 10.sp
+            container.name.length > 26 -> 11.sp
+            else -> 13.sp
+        }
 
     Column(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .height(138.dp)
+                .aspectRatio(ContainerCardAspect)
                 .clip(RoundedCornerShape(12.dp))
                 .background(ContainersCard)
                 .border(1.dp, ContainersOutline, RoundedCornerShape(12.dp))
@@ -335,10 +433,12 @@ private fun ContainerCard(
             )
             Spacer(Modifier.weight(1f))
             SmallVectorIconButton(
-                image = Icons.Outlined.ContentCopy,
-                contentDescription = stringResource(R.string.common_ui_duplicate),
-                tint = ContainersTextSecondary,
-                onClick = onDuplicate,
+                image = ComponentContainerIcon,
+                contentDescription = "Install components",
+                tint = ContainersAccent,
+                onClick = onInstallComponents,
+                navRow = navRow,
+                navCol = navCol,
             )
             Spacer(Modifier.width(8.dp))
             Box {
@@ -347,6 +447,8 @@ private fun ContainerCard(
                     contentDescription = stringResource(R.string.common_ui_edit),
                     tint = ContainersTextSecondary,
                     onClick = { menuExpanded = true },
+                    navRow = navRow,
+                    navCol = navCol + 1,
                 )
                 DropdownMenu(
                     expanded = menuExpanded,
@@ -354,10 +456,10 @@ private fun ContainerCard(
                     containerColor = ContainersCard,
                 ) {
                     DropdownMenuItem(
-                        text = { Text(stringResource(R.string.container_backups_title), color = ContainersTextPrimary) },
+                        text = { Text(stringResource(R.string.common_ui_duplicate), color = ContainersTextPrimary) },
                         onClick = {
                             menuExpanded = false
-                            onShowBackups()
+                            onDuplicate()
                         },
                     )
                     DropdownMenuItem(
@@ -388,9 +490,10 @@ private fun ContainerCard(
             Text(
                 text = container.name,
                 color = ContainersTextPrimary,
-                fontSize = 13.sp,
+                fontSize = nameFontSize,
                 fontWeight = FontWeight.Bold,
-                maxLines = 2,
+                maxLines = 1,
+                softWrap = false,
                 overflow = TextOverflow.Ellipsis,
                 textAlign = TextAlign.Center,
                 modifier = Modifier.fillMaxWidth(),
@@ -407,13 +510,17 @@ private fun ContainerCard(
                 contentDescription = stringResource(R.string.common_ui_run),
                 tint = ContainersAccent,
                 onClick = onRun,
+                navRow = navRow + 1,
+                navCol = navCol,
             )
             ActionButton(
                 modifier = Modifier.weight(1f),
                 image = Icons.Outlined.Edit,
                 contentDescription = stringResource(R.string.common_ui_edit),
-                tint = ContainersTextSecondary,
+                tint = ContainersAccent,
                 onClick = onEdit,
+                navRow = navRow + 1,
+                navCol = navCol + 1,
             )
         }
     }
@@ -558,174 +665,58 @@ private fun ContainersDialogButton(
 }
 
 @Composable
-private fun ContainersConfirmDialog(
-    message: String,
+private fun ConfirmDialogFooter(
     confirmLabel: String,
     confirmColor: Color,
-    onDismiss: () -> Unit,
     onConfirm: () -> Unit,
+    onCancel: () -> Unit,
 ) {
-    ContainersDialogShell(
-        onDismiss = onDismiss,
-        maxWidth = 420.dp,
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
-        Text(
-            text = message,
-            color = ContainersTextSecondary,
-            fontSize = 14.sp,
-            lineHeight = 20.sp,
+        ConfirmFooterAction(
+            label = stringResource(R.string.common_ui_cancel),
+            textColor = ContainersTextSecondary,
+            onClick = onCancel,
+            isEntry = true,
         )
-        Spacer(Modifier.height(16.dp))
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(ContainersOutline),
+        ConfirmFooterAction(
+            label = confirmLabel,
+            textColor = confirmColor,
+            onClick = onConfirm,
         )
-        Spacer(Modifier.height(16.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-        ) {
-            ContainersDialogButton(
-                label = stringResource(R.string.common_ui_cancel),
-                primary = false,
-                textColor = ContainersTextPrimary,
-                onClick = onDismiss,
-            )
-            ContainersDialogButton(
-                label = confirmLabel,
-                primary = false,
-                textColor = confirmColor,
-                backgroundColor = confirmColor.copy(alpha = 0.12f),
-                borderColor = confirmColor.copy(alpha = 0.3f),
-                onClick = onConfirm,
-            )
-        }
     }
 }
 
 @Composable
-private fun ContainersBackupsDialog(
-    onDismiss: () -> Unit,
-    onBackup: () -> Unit,
-    onRestore: () -> Unit,
+private fun ConfirmFooterAction(
+    label: String,
+    textColor: Color,
+    onClick: () -> Unit,
+    isEntry: Boolean = false,
 ) {
-    ContainersDialogShell(
-        onDismiss = onDismiss,
-        title = stringResource(R.string.container_backups_title),
-        maxWidth = 420.dp,
+    Box(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(8.dp))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = ContainersNavHighlight,
+                    tapToSelect = true,
+                    isEntry = isEntry,
+                ).padding(horizontal = 10.dp, vertical = 7.dp),
+        contentAlignment = Alignment.Center,
     ) {
         Text(
-            text = stringResource(R.string.container_backups_prompt),
-            color = ContainersTextSecondary,
-            fontSize = 14.sp,
-            lineHeight = 20.sp,
-        )
-        Spacer(Modifier.height(16.dp))
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(ContainersOutline),
+            text = label,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
         )
-        Spacer(Modifier.height(16.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-        ) {
-            ContainersDialogButton(
-                label = stringResource(R.string.common_ui_cancel),
-                primary = false,
-                textColor = ContainersTextPrimary,
-                onClick = onDismiss,
-            )
-            ContainersDialogButton(
-                label = stringResource(R.string.google_cloud_restore),
-                primary = false,
-                textColor = ContainersTextPrimary,
-                onClick = onRestore,
-            )
-            ContainersDialogButton(
-                label = stringResource(R.string.google_cloud_backup),
-                primary = false,
-                textColor = ContainersAccent,
-                backgroundColor = ContainersAccent.copy(alpha = 0.12f),
-                borderColor = ContainersAccent.copy(alpha = 0.3f),
-                onClick = onBackup,
-            )
-        }
-    }
-}
-
-@Composable
-private fun ContainersSelectionDialog(
-    title: String,
-    options: List<String>,
-    onDismiss: () -> Unit,
-    onSelected: (Int) -> Unit,
-) {
-    ContainersDialogShell(
-        onDismiss = onDismiss,
-        title = title,
-        maxWidth = 420.dp,
-    ) {
-        Column {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .heightIn(max = 300.dp)
-                        .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                options.forEachIndexed { index, option ->
-                    Box(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .clip(RoundedCornerShape(12.dp))
-                                .background(ContainersSubcard)
-                                .border(1.dp, ContainersOutline, RoundedCornerShape(12.dp))
-                                .clickable(
-                                    interactionSource = remember { MutableInteractionSource() },
-                                    indication = null,
-                                    onClick = { onSelected(index) },
-                                ).padding(horizontal = 14.dp, vertical = 10.dp),
-                    ) {
-                        Text(
-                            text = option,
-                            color = ContainersTextPrimary,
-                            fontSize = 13.sp,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                    }
-                }
-            }
-            Spacer(Modifier.height(14.dp))
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .height(1.dp)
-                        .background(ContainersOutline),
-            )
-            Spacer(Modifier.height(14.dp))
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.End,
-            ) {
-                ContainersDialogButton(
-                    label = stringResource(R.string.common_ui_cancel),
-                    primary = false,
-                    textColor = ContainersTextPrimary,
-                    onClick = onDismiss,
-                )
-            }
-        }
     }
 }
 
@@ -777,89 +768,93 @@ private fun ContainerStorageInfoDialog(
     onDismiss: () -> Unit,
     onClearCache: () -> Unit,
 ) {
-    ContainersDialogShell(
-        onDismiss = onDismiss,
-        title = stringResource(R.string.container_config_storage_info),
-        iconImage = Icons.Outlined.Info,
-        maxWidth = 500.dp,
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
     ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(18.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Column(
-                modifier = Modifier.weight(1f),
-                verticalArrangement = Arrangement.spacedBy(14.dp),
-            ) {
-                StorageMetric(
-                    label = stringResource(R.string.container_config_drive_c),
-                    value = formatBytes(state.driveCBytes),
-                )
-                StorageMetric(
-                    label = stringResource(R.string.container_config_cache),
-                    value = formatBytes(state.cacheBytes),
-                )
-                StorageMetric(
-                    label = stringResource(R.string.container_config_total),
-                    value = formatBytes(state.totalBytes),
-                )
-            }
-            Column(
-                modifier = Modifier.widthIn(min = 180.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center,
-            ) {
-                Box(contentAlignment = Alignment.Center) {
-                    CircularProgressIndicator(
-                        progress = { state.usedPercent.coerceIn(0f, 100f) / 100f },
-                        modifier = Modifier.size(132.dp),
-                        color = ContainersAccent.copy(alpha = 0.38f),
-                        trackColor = ContainersAccent.copy(alpha = 0.12f),
-                        strokeWidth = 18.dp,
-                    )
-                    Text(
-                        text = formatUsedPercent(state.usedPercent),
-                        color = ContainersTextPrimary,
-                        fontSize = 18.sp,
-                        fontWeight = FontWeight.Bold,
-                    )
-                }
-                Spacer(Modifier.height(12.dp))
-                Text(
-                    text = stringResource(R.string.container_config_estimated_used_space),
-                    color = ContainersTextSecondary,
-                    fontSize = 12.sp,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-        Spacer(Modifier.height(18.dp))
         Box(
             modifier =
                 Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(ContainersOutline),
-        )
-        Spacer(Modifier.height(16.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
+                    .fillMaxSize()
+                    .safeDrawingPadding()
+                    .padding(horizontal = 16.dp),
+            contentAlignment = Alignment.Center,
         ) {
-            ContainersDialogButton(
-                label = stringResource(R.string.container_config_clear_cache),
-                primary = false,
-                textColor = ContainersTextPrimary,
-                onClick = onClearCache,
-            )
-            ContainersDialogButton(
-                label = stringResource(R.string.common_ui_ok),
-                primary = true,
-                textColor = ContainersAccent,
-                backgroundColor = ContainersAccent.copy(alpha = 0.12f),
-                borderColor = ContainersAccent.copy(alpha = 0.3f),
-                onClick = onDismiss,
+            PopupDialog(
+                title = stringResource(R.string.container_config_storage_info),
+                icon = Icons.Outlined.Info,
+                accentColor = ContainersAccent,
+                modifier = Modifier.widthIn(min = 320.dp, max = 500.dp),
+                content = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(18.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Column(
+                            modifier = Modifier.weight(1f),
+                            verticalArrangement = Arrangement.spacedBy(14.dp),
+                        ) {
+                            StorageMetric(
+                                label = stringResource(R.string.container_config_drive_c),
+                                value = formatBytes(state.driveCBytes),
+                            )
+                            StorageMetric(
+                                label = stringResource(R.string.container_config_cache),
+                                value = formatBytes(state.cacheBytes),
+                            )
+                            StorageMetric(
+                                label = stringResource(R.string.container_config_total),
+                                value = formatBytes(state.totalBytes),
+                            )
+                        }
+                        Column(
+                            modifier = Modifier.widthIn(min = 180.dp),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            verticalArrangement = Arrangement.Center,
+                        ) {
+                            Box(contentAlignment = Alignment.Center) {
+                                CircularProgressIndicator(
+                                    progress = { state.usedPercent.coerceIn(0f, 100f) / 100f },
+                                    modifier = Modifier.size(132.dp),
+                                    color = ContainersAccent.copy(alpha = 0.38f),
+                                    trackColor = ContainersAccent.copy(alpha = 0.12f),
+                                    strokeWidth = 18.dp,
+                                )
+                                Text(
+                                    text = formatUsedPercent(state.usedPercent),
+                                    color = ContainersTextPrimary,
+                                    fontSize = 18.sp,
+                                    fontWeight = FontWeight.Bold,
+                                )
+                            }
+                            Spacer(Modifier.height(12.dp))
+                            Text(
+                                text = stringResource(R.string.container_config_estimated_used_space),
+                                color = ContainersTextSecondary,
+                                fontSize = 12.sp,
+                                textAlign = TextAlign.Center,
+                            )
+                        }
+                    }
+                },
+                footer = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                    ) {
+                        PopupTextAction(
+                            label = stringResource(R.string.container_config_clear_cache),
+                            textColor = ContainersTextSecondary,
+                            onClick = onClearCache,
+                        )
+                        PopupTextAction(
+                            label = stringResource(R.string.common_ui_ok),
+                            textColor = ContainersAccent,
+                            onClick = onDismiss,
+                        )
+                    }
+                },
             )
         }
     }
@@ -907,6 +902,8 @@ private fun SmallVectorIconButton(
     contentDescription: String,
     tint: Color,
     onClick: () -> Unit,
+    navRow: Int? = null,
+    navCol: Int? = null,
 ) {
     Box(
         modifier =
@@ -915,10 +912,13 @@ private fun SmallVectorIconButton(
                 .clip(RoundedCornerShape(8.dp))
                 .background(ContainersSubcard)
                 .border(1.dp, ContainersOutline, RoundedCornerShape(8.dp))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = ContainersNavHighlight,
+                    tapToSelect = true,
+                    navRow = navRow,
+                    navCol = navCol,
                 ),
         contentAlignment = Alignment.Center,
     ) {
@@ -938,6 +938,8 @@ private fun ActionButton(
     contentDescription: String,
     tint: Color,
     onClick: () -> Unit,
+    navRow: Int? = null,
+    navCol: Int? = null,
 ) {
     Box(
         modifier =
@@ -946,10 +948,13 @@ private fun ActionButton(
                 .clip(RoundedCornerShape(9.dp))
                 .background(ContainersSubcard)
                 .border(1.dp, ContainersOutline, RoundedCornerShape(9.dp))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = 9.dp,
+                    onActivate = onClick,
+                    highlightColor = ContainersNavHighlight,
+                    tapToSelect = true,
+                    navRow = navRow,
+                    navCol = navCol,
                 ),
         contentAlignment = Alignment.Center,
     ) {
diff --git a/app/src/main/feature/settings/contents/ComponentsScreen.kt b/app/src/main/feature/settings/contents/ComponentsScreen.kt
index 56a830de2..0321ec326 100644
--- a/app/src/main/feature/settings/contents/ComponentsScreen.kt
+++ b/app/src/main/feature/settings/contents/ComponentsScreen.kt
@@ -1,32 +1,31 @@
-/* Settings > Components screen — Jetpack Compose / Material3.
- * Uses a LazyColumn for the main content. */
 package com.winlator.cmod.feature.settings
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.SizeTransform
 import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.MarqueeSpacing
 import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -37,6 +36,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.CloudDownload
 import androidx.compose.material.icons.outlined.Delete
@@ -44,13 +44,18 @@ import androidx.compose.material.icons.outlined.DeveloperBoard
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.Inbox
 import androidx.compose.material.icons.outlined.Memory
+import androidx.compose.material.icons.outlined.Refresh
 import androidx.compose.material.icons.outlined.Science
 import androidx.compose.material.icons.outlined.Upload
+import androidx.compose.material.icons.outlined.Warning
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
-import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -60,6 +65,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -70,11 +76,15 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
 import com.winlator.cmod.runtime.content.ContentProfile
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 
-// ============================================================================
 // Palette (unified with Drivers / Stores / Other / Debug)
-// ============================================================================
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardDarker = Color(0xFF15151E)
 private val CardBorder = Color(0xFF2A2A3A)
@@ -83,26 +93,12 @@ private val SurfaceDark = Color(0xFF21212A)
 private val Accent = Color(0xFF1A9FFF)
 private val SuccessGreen = Color(0xFF5BD68F)
 private val DangerRed = Color(0xFFFF7A88)
+private val WarningAmber = Color(0xFFFFB454)
 private val TextPrimary = Color(0xFFD6DAE0)
 private val TextSecondary = Color(0xFF7A8FA8)
+private val NavHighlight = Color(0xFF4FC3F7)
 
-@Composable
-private fun Modifier.noRippleClickable(
-    enabled: Boolean = true,
-    onClick: () -> Unit,
-): Modifier {
-    val interactionSource = remember { MutableInteractionSource() }
-    return clickable(
-        interactionSource = interactionSource,
-        indication = null,
-        enabled = enabled,
-        onClick = onClick,
-    )
-}
-
-// ============================================================================
 // State
-// ============================================================================
 
 data class ComponentItem(
     val key: String,
@@ -111,6 +107,7 @@ data class ComponentItem(
     val isInstalled: Boolean,
     val hasRemote: Boolean,
     val sizeBytes: Long? = null,
+    val isOfficial: Boolean = false,
 )
 
 data class ComponentsDownloadProgress(
@@ -120,26 +117,34 @@ data class ComponentsDownloadProgress(
     val indeterminate: Boolean = false,
 )
 
+data class ComponentsConflict(
+    val path: String,
+)
+
 data class ComponentsState(
     val currentType: ContentProfile.ContentType = ContentProfile.ContentType.CONTENT_TYPE_WINE,
     val installed: List<ComponentItem> = emptyList(),
     val available: List<ComponentItem> = emptyList(),
     val downloadProgress: ComponentsDownloadProgress? = null,
+    val conflict: ComponentsConflict? = null,
     val autoCreateContainer: Boolean = true,
+    val isRefreshing: Boolean = false,
+    val loadFailed: Boolean = false,
 )
 
-// ============================================================================
 // Root
-// ============================================================================
 
 @Composable
 fun ComponentsScreen(
+    bridge: SettingsNavBridge? = null,
     state: ComponentsState,
     onTypeSelected: (ContentProfile.ContentType) -> Unit,
     onInstallFromFile: () -> Unit,
     onDownloadItem: (ComponentItem) -> Unit,
     onRemoveItem: (ComponentItem) -> Unit,
+    onDismissConflict: () -> Unit,
     onToggleAutoCreateContainer: (Boolean) -> Unit,
+    onRefresh: () -> Unit,
 ) {
     var itemPendingRemoval by remember { mutableStateOf<ComponentItem?>(null) }
     val layoutDirection = LocalLayoutDirection.current
@@ -147,106 +152,137 @@ fun ComponentsScreen(
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
+    val contentNav = rememberSettingsContentNav(bridge)
+
+    // L1/R1 cycle the component type (Wine -> Proton -> DXVK …) while navigating the list.
+    val sectionSignal = bridge?.contentSectionSignal ?: 0
+    var lastSectionSignal by remember { mutableStateOf(sectionSignal) }
+    LaunchedEffect(sectionSignal) {
+        if (sectionSignal != lastSectionSignal) {
+            lastSectionSignal = sectionSignal
+            val dir = bridge?.contentSectionDir ?: 0
+            if (dir != 0) {
+                val types = ContentProfile.ContentType.values()
+                val idx = types.indexOf(state.currentType).coerceAtLeast(0)
+                onTypeSelected(types[((idx + dir) % types.size + types.size) % types.size])
+            }
+        }
+    }
 
     itemPendingRemoval?.let { item ->
-        ConfirmDialog(
-            title = stringResource(R.string.settings_content_remove_title),
-            message = stringResource(R.string.settings_content_confirm_remove),
-            confirmLabel = stringResource(R.string.common_ui_remove),
-            confirmColor = DangerRed,
-            onDismiss = { itemPendingRemoval = null },
-            onConfirm = {
-                onRemoveItem(item)
-                itemPendingRemoval = null
-            },
-        )
+        val nav = remember { PaneNavRegistry() }
+        Dialog(onDismissRequest = { itemPendingRemoval = null }) {
+            DialogPaneNav(nav, onDismiss = { itemPendingRemoval = null })
+            CompositionLocalProvider(LocalPaneNav provides nav) {
+                PopupDialog(
+                    title = stringResource(R.string.settings_content_remove_title),
+                    message = stringResource(R.string.settings_content_confirm_remove),
+                    confirmLabel = stringResource(R.string.common_ui_remove),
+                    modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                    icon = Icons.Outlined.Delete,
+                    accentColor = DangerRed,
+                    onCancel = { itemPendingRemoval = null },
+                    onConfirm = {
+                        onRemoveItem(item)
+                        itemPendingRemoval = null
+                    },
+                )
+            }
+        }
     }
 
     state.downloadProgress?.let { progress ->
         DownloadProgressDialog(progress = progress)
     }
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                end = 16.dp + navBarEndPadding,
-                top = 16.dp,
-                bottom = 4.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item(key = "hero_header") {
+    state.conflict?.let { conflict ->
+        val nav = remember { PaneNavRegistry() }
+        Dialog(onDismissRequest = onDismissConflict) {
+            DialogPaneNav(nav, onDismiss = onDismissConflict)
+            CompositionLocalProvider(LocalPaneNav provides nav) {
+                PopupDialog(
+                    title = stringResource(R.string.settings_content_already_installed_title),
+                    message = stringResource(R.string.settings_content_already_installed_message, conflict.path),
+                    confirmLabel = stringResource(R.string.common_ui_ok),
+                    modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                    icon = Icons.Outlined.Warning,
+                    accentColor = WarningAmber,
+                    onConfirm = onDismissConflict,
+                )
+            }
+        }
+    }
+
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        end = 16.dp + navBarEndPadding,
+                        top = 16.dp,
+                        bottom = 4.dp + navBarBottomPadding,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
             HeroHeader(
                 installedCount = state.installed.size,
                 availableCount = state.available.size,
                 currentType = state.currentType,
                 autoCreateContainer = state.autoCreateContainer,
+                isRefreshing = state.isRefreshing,
+                loadFailed = state.loadFailed,
                 onTypeSelected = onTypeSelected,
                 onInstallFromFile = onInstallFromFile,
                 onToggleAutoCreateContainer = onToggleAutoCreateContainer,
+                onRefresh = onRefresh,
             )
-        }
 
-        if (state.installed.isEmpty() && state.available.isEmpty()) {
-            item(key = "empty_${state.currentType.name}") {
+            if (state.installed.isEmpty() && state.available.isEmpty() && !state.isRefreshing) {
                 EmptyState()
             }
-        }
 
-        if (state.installed.isNotEmpty()) {
-            item(key = "installed_section_${state.currentType.name}") {
+            if (state.installed.isNotEmpty()) {
                 SectionLabel(
                     text = stringResource(R.string.common_ui_installed),
                     modifier = Modifier.padding(top = 8.dp),
                 )
+                state.installed.forEach { item ->
+                    key("installed_${state.currentType.name}_${item.key}") {
+                        ComponentItemCard(
+                            item = item,
+                            onDownload = { onDownloadItem(item) },
+                            onRemove = { itemPendingRemoval = item },
+                        )
+                    }
+                }
             }
-            items(
-                items = state.installed,
-                key = { item -> "installed_${state.currentType.name}_${item.key}" },
-                contentType = { "installedComponentCard" },
-            ) { item ->
-                ComponentItemCard(
-                    item = item,
-                    onDownload = { onDownloadItem(item) },
-                    onRemove = { itemPendingRemoval = item },
-                )
-            }
-        }
 
-        if (state.available.isNotEmpty()) {
-            item(key = "available_section_${state.currentType.name}") {
+            if (state.available.isNotEmpty()) {
                 SectionLabel(
                     text = stringResource(R.string.common_ui_available),
                     modifier = Modifier.padding(top = 6.dp),
                 )
+                state.available.forEach { item ->
+                    key("available_${state.currentType.name}_${item.key}") {
+                        ComponentItemCard(
+                            item = item,
+                            onDownload = { onDownloadItem(item) },
+                            onRemove = { itemPendingRemoval = item },
+                        )
+                    }
+                }
             }
-            items(
-                items = state.available,
-                key = { item -> "available_${state.currentType.name}_${item.key}" },
-                contentType = { "availableComponentCard" },
-            ) { item ->
-                ComponentItemCard(
-                    item = item,
-                    onDownload = { onDownloadItem(item) },
-                    onRemove = { itemPendingRemoval = item },
-                )
-            }
-        }
 
-        item(key = "bottom_spacer") {
             Spacer(Modifier.height(24.dp))
         }
     }
 }
 
-// ============================================================================
 // Hero header
-// ============================================================================
 
 @Composable
 private fun HeroHeader(
@@ -254,9 +290,12 @@ private fun HeroHeader(
     availableCount: Int,
     currentType: ContentProfile.ContentType,
     autoCreateContainer: Boolean,
+    isRefreshing: Boolean,
+    loadFailed: Boolean,
     onTypeSelected: (ContentProfile.ContentType) -> Unit,
     onInstallFromFile: () -> Unit,
     onToggleAutoCreateContainer: (Boolean) -> Unit,
+    onRefresh: () -> Unit,
 ) {
     Box(
         modifier =
@@ -287,6 +326,12 @@ private fun HeroHeader(
                     compact = true,
                     onToggle = { onToggleAutoCreateContainer(!autoCreateContainer) },
                 )
+                Spacer(Modifier.width(6.dp))
+                RefreshChip(
+                    isRefreshing = isRefreshing,
+                    loadFailed = loadFailed,
+                    onRefresh = onRefresh,
+                )
                 Spacer(Modifier.width(8.dp))
                 SmallPillButton(
                     label = stringResource(R.string.settings_content_install),
@@ -326,7 +371,12 @@ private fun ToggleChip(
                 .clip(RoundedCornerShape(8.dp))
                 .background(background)
                 .border(1.dp, borderColor, RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onToggle)
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onToggle,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = horizontalPadding, vertical = verticalPadding),
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -347,6 +397,52 @@ private fun ToggleChip(
     }
 }
 
+@Composable
+private fun RefreshChip(
+    isRefreshing: Boolean,
+    loadFailed: Boolean,
+    onRefresh: () -> Unit,
+) {
+    val tint = if (loadFailed) WarningAmber else Accent
+    Row(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(8.dp))
+                .background(tint.copy(alpha = 0.14f))
+                .border(1.dp, tint.copy(alpha = 0.45f), RoundedCornerShape(8.dp))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (!isRefreshing) onRefresh() },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
+                .padding(horizontal = 8.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (isRefreshing) {
+            CircularProgressIndicator(
+                modifier = Modifier.size(11.dp),
+                strokeWidth = 1.5.dp,
+                color = tint,
+            )
+        } else {
+            Icon(
+                imageVector = Icons.Outlined.Refresh,
+                contentDescription = null,
+                tint = tint,
+                modifier = Modifier.size(11.dp),
+            )
+            Spacer(Modifier.width(5.dp))
+            Text(
+                text = stringResource(R.string.settings_content_refresh),
+                color = tint,
+                fontSize = 10.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        }
+    }
+}
+
 @Composable
 private fun CountPill(
     label: String,
@@ -379,9 +475,7 @@ private fun CountPill(
     }
 }
 
-// ============================================================================
 // Content type tabs
-// ============================================================================
 
 @Composable
 private fun TypeTabsContent(
@@ -438,6 +532,7 @@ private fun descriptionResFor(type: ContentProfile.ContentType): Int =
         ContentProfile.ContentType.CONTENT_TYPE_BOX64 -> R.string.settings_content_desc_box64
         ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64 -> R.string.settings_content_desc_wowbox64
         ContentProfile.ContentType.CONTENT_TYPE_FEXCORE -> R.string.settings_content_desc_fexcore
+        ContentProfile.ContentType.CONTENT_TYPE_D7VK -> R.string.settings_content_desc_d7vk
     }
 
 @Composable
@@ -456,7 +551,12 @@ private fun TypeTabChip(
                 .clip(RoundedCornerShape(16.dp))
                 .background(background)
                 .border(1.dp, borderColor, RoundedCornerShape(16.dp))
-                .noRippleClickable(onClick = onClick)
+                .paneNavItem(
+                    cornerRadius = 16.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = 14.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -469,9 +569,7 @@ private fun TypeTabChip(
     }
 }
 
-// ============================================================================
 // Section label
-// ============================================================================
 
 @Composable
 private fun SectionLabel(
@@ -488,10 +586,9 @@ private fun SectionLabel(
     )
 }
 
-// ============================================================================
 // Component item card
-// ============================================================================
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun ComponentItemCard(
     item: ComponentItem,
@@ -537,6 +634,13 @@ private fun ComponentItemCard(
                     fontWeight = FontWeight.Medium,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.basicMarquee(
+                        iterations = Int.MAX_VALUE,
+                        initialDelayMillis = 5000,
+                        repeatDelayMillis = 5000,
+                        velocity = 25.dp,
+                        spacing = MarqueeSpacing(40.dp),
+                    ),
                 )
                 val sizeLabel = formatSizeLabel(item)
                 if (sizeLabel != null) {
@@ -550,35 +654,49 @@ private fun ComponentItemCard(
                 }
             }
             Spacer(Modifier.width(8.dp))
-            if (item.isInstalled) {
-                IconTapButton(
-                    icon = Icons.Outlined.Delete,
-                    tint = DangerRed,
-                    onClick = onRemove,
-                )
-            } else if (item.hasRemote) {
-                SmallPillButton(
-                    label = stringResource(R.string.common_ui_download),
-                    icon = Icons.Outlined.Download,
-                    tint = Accent,
-                    onClick = onDownload,
-                )
-            } else {
-                // Locally extracted profile with no remote URL — non-interactive placeholder.
-                Icon(
-                    imageVector = Icons.Outlined.CloudDownload,
-                    contentDescription = null,
-                    tint = TextSecondary.copy(alpha = 0.5f),
-                    modifier = Modifier.size(18.dp),
-                )
+            // The trailing action (Download / Delete / placeholder) drives the
+            // height; the badges fillMaxHeight() so they always match it exactly.
+            Row(
+                modifier = Modifier.height(IntrinsicSize.Min),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                if (item.isOfficial) {
+                    OfficialBadge(Modifier.fillMaxHeight())
+                    Spacer(Modifier.width(8.dp))
+                }
+                if (isSteamCompatible(item)) {
+                    SteamCompatBadge(Modifier.fillMaxHeight())
+                    Spacer(Modifier.width(8.dp))
+                }
+                if (item.isInstalled) {
+                    IconTapButton(
+                        icon = Icons.Outlined.Delete,
+                        tint = DangerRed,
+                        onClick = onRemove,
+                    )
+                } else if (item.hasRemote) {
+                    SmallPillButton(
+                        label = stringResource(R.string.common_ui_download),
+                        icon = Icons.Outlined.Download,
+                        tint = Accent,
+                        compact = true,
+                        onClick = onDownload,
+                    )
+                } else {
+                    // Locally extracted profile with no remote URL — non-interactive placeholder.
+                    Icon(
+                        imageVector = Icons.Outlined.CloudDownload,
+                        contentDescription = null,
+                        tint = TextSecondary.copy(alpha = 0.5f),
+                        modifier = Modifier.size(18.dp),
+                    )
+                }
             }
         }
     }
 }
 
-// ============================================================================
 // Generic small controls
-// ============================================================================
 
 @Composable
 private fun IconTapButton(
@@ -591,7 +709,14 @@ private fun IconTapButton(
             Modifier
                 .size(30.dp)
                 .clip(RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onClick),
+                .background(tint.copy(alpha = 0.14f))
+                .border(1.dp, tint.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                ),
         contentAlignment = Alignment.Center,
     ) {
         Icon(
@@ -603,6 +728,50 @@ private fun IconTapButton(
     }
 }
 
+private fun isSteamCompatible(item: ComponentItem): Boolean =
+    item.verName.contains("steam", ignoreCase = true) ||
+        item.key.contains("steam", ignoreCase = true)
+
+// Badge marking first-party "WinNative" builds. A perfect square (width follows
+// the filled height) in WinNative blue, carrying only the WinNative logo for
+// "WN" branding. Pass Modifier.fillMaxHeight() to match the row's action height.
+@Composable
+private fun OfficialBadge(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .aspectRatio(1f)
+            .clip(RoundedCornerShape(8.dp))
+            .background(Accent.copy(alpha = 0.14f))
+            .border(1.dp, Accent.copy(alpha = 0.30f), RoundedCornerShape(8.dp)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Image(
+            painter = painterResource(R.drawable.ic_winnative_badge),
+            contentDescription = "Official WinNative build",
+            modifier = Modifier.fillMaxSize(0.8f),
+        )
+    }
+}
+
+@Composable
+private fun SteamCompatBadge(modifier: Modifier = Modifier) {
+    Row(
+        modifier = modifier
+            .clip(RoundedCornerShape(8.dp))
+            .background(SuccessGreen.copy(alpha = 0.14f))
+            .border(1.dp, SuccessGreen.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+            .padding(horizontal = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = "Steam",
+            color = SuccessGreen,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
 @Composable
 private fun SmallPillButton(
     label: String,
@@ -621,7 +790,12 @@ private fun SmallPillButton(
                 .clip(RoundedCornerShape(8.dp))
                 .background(tint.copy(alpha = 0.14f))
                 .border(1.dp, tint.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onClick)
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = horizontalPadding, vertical = verticalPadding),
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -643,34 +817,7 @@ private fun SmallPillButton(
     }
 }
 
-@Composable
-private fun DialogActionButton(
-    label: String,
-    textColor: Color,
-    onClick: () -> Unit,
-) {
-    Box(
-        modifier =
-            Modifier
-                .clip(RoundedCornerShape(8.dp))
-                .background(CardDarker)
-                .border(1.dp, textColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onClick)
-                .padding(horizontal = 14.dp, vertical = 8.dp),
-        contentAlignment = Alignment.Center,
-    ) {
-        Text(
-            text = label,
-            color = textColor,
-            fontSize = 12.sp,
-            fontWeight = FontWeight.SemiBold,
-        )
-    }
-}
-
-// ============================================================================
 // Empty state
-// ============================================================================
 
 @Composable
 private fun EmptyState() {
@@ -708,9 +855,7 @@ private fun EmptyState() {
     }
 }
 
-// ============================================================================
 // Confirm dialog
-// ============================================================================
 
 @Composable
 private fun DownloadProgressDialog(progress: ComponentsDownloadProgress) {
@@ -723,148 +868,30 @@ private fun DownloadProgressDialog(progress: ComponentsDownloadProgress) {
                 usePlatformDefaultWidth = false,
             ),
     ) {
-        Box(
-            modifier =
-                Modifier
-                    .widthIn(max = 360.dp)
-                    .fillMaxWidth(0.88f)
-                    .clip(RoundedCornerShape(16.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
-                    .padding(horizontal = 18.dp, vertical = 16.dp),
-        ) {
-            Column(modifier = Modifier.fillMaxWidth()) {
-                Text(
-                    text = progress.title.uppercase(),
-                    color = TextSecondary,
-                    fontSize = 10.sp,
-                    fontWeight = FontWeight.Bold,
-                    letterSpacing = 1.2.sp,
-                )
-                Spacer(Modifier.height(6.dp))
-                Text(
-                    text = progress.message,
-                    color = TextPrimary,
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                )
-                Spacer(Modifier.height(14.dp))
-
-                val barHeight = 5.dp
-                val barShape = RoundedCornerShape(3.dp)
-                if (progress.indeterminate) {
-                    LinearProgressIndicator(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .height(barHeight)
-                                .clip(barShape),
-                        color = Accent,
-                        trackColor = CardDarker,
-                    )
-                } else {
-                    val smoothed by animateFloatAsState(
-                        targetValue = progress.progress.coerceIn(0f, 1f),
-                        animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
-                        label = "dlProgress",
-                    )
-                    LinearProgressIndicator(
-                        progress = { smoothed },
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .height(barHeight)
-                                .clip(barShape),
-                        color = Accent,
-                        trackColor = CardDarker,
-                        drawStopIndicator = {},
-                        gapSize = 0.dp,
-                    )
-                }
-
-                Spacer(Modifier.height(8.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.End,
-                ) {
-                    val percentText =
-                        if (progress.indeterminate) {
-                            stringResource(R.string.common_ui_working)
-                        } else {
-                            "${(progress.progress * 100).toInt().coerceIn(0, 100)}%"
-                        }
-                    Text(
-                        text = percentText,
-                        color = TextSecondary,
-                        fontSize = 11.sp,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun ConfirmDialog(
-    title: String,
-    message: String,
-    confirmLabel: String,
-    confirmColor: Color,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-) {
-    Dialog(onDismissRequest = onDismiss) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(18.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(18.dp))
-                    .padding(22.dp),
-        ) {
-            Column {
-                Text(
-                    text = title,
-                    color = TextPrimary,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.SemiBold,
-                )
-                Spacer(Modifier.height(6.dp))
-                Text(
-                    text = message,
-                    color = TextSecondary,
-                    fontSize = 13.sp,
-                )
-                Spacer(Modifier.height(22.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-                ) {
-                    DialogActionButton(label = stringResource(R.string.common_ui_cancel), textColor = TextSecondary, onClick = onDismiss)
-                    DialogActionButton(label = confirmLabel, textColor = confirmColor, onClick = onConfirm)
-                }
-            }
-        }
+        PopupDialog(
+            title = progress.title,
+            message = progress.message,
+            modifier = Modifier
+                .widthIn(max = 360.dp)
+                .fillMaxWidth(0.88f),
+            icon = Icons.Outlined.Download,
+            accentColor = Accent,
+            progress = if (progress.indeterminate) Float.NaN else progress.progress,
+        )
     }
 }
 
-// ============================================================================
 // Helpers
-// ============================================================================
 
 @Composable
 private fun formatSizeLabel(item: ComponentItem): String? {
     if (item.isInstalled) {
-        val bytes = item.sizeBytes ?: return "${stringResource(R.string.common_ui_size)}: …"
+        val bytes = item.sizeBytes ?: return "${stringResource(R.string.common_ui_size)}: --"
         if (bytes <= 0L) return null
         return "${stringResource(R.string.common_ui_size)}: ${formatBytes(bytes)}"
     }
     if (!item.hasRemote) return null
-    val bytes = item.sizeBytes ?: return "${stringResource(R.string.common_ui_size)}: …"
+    val bytes = item.sizeBytes ?: return "${stringResource(R.string.common_ui_size)}: --"
     if (bytes <= 0L) return null
     return "${stringResource(R.string.common_ui_size)}: ${formatBytes(bytes)}"
 }
@@ -892,6 +919,7 @@ private fun iconFor(type: ContentProfile.ContentType): ImageVector =
 
         ContentProfile.ContentType.CONTENT_TYPE_DXVK,
         ContentProfile.ContentType.CONTENT_TYPE_VKD3D,
+        ContentProfile.ContentType.CONTENT_TYPE_D7VK,
         -> Icons.Outlined.DeveloperBoard
 
         ContentProfile.ContentType.CONTENT_TYPE_BOX64,
diff --git a/app/src/main/feature/settings/contents/ContentsFragment.kt b/app/src/main/feature/settings/contents/ContentsFragment.kt
index 28e8c4e2a..c07efd7c5 100644
--- a/app/src/main/feature/settings/contents/ContentsFragment.kt
+++ b/app/src/main/feature/settings/contents/ContentsFragment.kt
@@ -16,11 +16,12 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
+import com.winlator.cmod.app.shell.UnifiedActivity
+import com.winlator.cmod.runtime.container.ContainerCreation
 import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.content.ContentProfile
 import com.winlator.cmod.runtime.content.ContentsManager
@@ -32,6 +33,8 @@ import com.winlator.cmod.shared.io.StorageUtils
 import com.winlator.cmod.shared.ui.dialog.ContentDialog
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -50,13 +53,15 @@ class ContentsFragment : Fragment() {
     private val installedSizeFetchesInFlight = mutableSetOf<String>()
 
     private var downloadProgress: ComponentsDownloadProgress? = null
+    private var conflictingContentPath: String? = null
+    private var isRefreshing = false
+    private var loadFailed = false
 
     private var autoCreateContainer = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         manager = ContentsManager(requireContext())
-        manager.syncContents()
 
         savedInstanceState
             ?.getString(STATE_CONTENT_TYPE)
@@ -89,6 +94,7 @@ class ContentsFragment : Fragment() {
                         ),
                 ) {
                     ComponentsScreen(
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                         state = componentsState,
                         onTypeSelected = { type -> selectContentType(type) },
                         onInstallFromFile = { promptInstallFromFile() },
@@ -98,6 +104,10 @@ class ContentsFragment : Fragment() {
                         onRemoveItem = { item ->
                             profilesByKey[item.key]?.let { onRemoveRequested(it) }
                         },
+                        onDismissConflict = {
+                            conflictingContentPath = null
+                            publishState()
+                        },
                         onToggleAutoCreateContainer = { enabled ->
                             autoCreateContainer = enabled
                             PreferenceManager
@@ -107,6 +117,7 @@ class ContentsFragment : Fragment() {
                                 .apply()
                             publishState()
                         },
+                        onRefresh = { refreshRemoteProfiles() },
                     )
                 }
             }
@@ -119,6 +130,15 @@ class ContentsFragment : Fragment() {
     ) {
         super.onViewCreated(view, savedInstanceState)
         (activity as? AppCompatActivity)?.supportActionBar?.setTitle(R.string.settings_content_components)
+        syncAndPublish()
+    }
+
+    private fun syncAndPublish() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            withContext(Dispatchers.IO) { manager.syncContents() }
+            if (!isAdded || view == null) return@launch
+            publishState()
+        }
     }
 
     override fun onResume() {
@@ -136,9 +156,7 @@ class ContentsFragment : Fragment() {
         super.onDestroy()
     }
 
-    // ------------------------------------------------------------------
     // State management
-    // ------------------------------------------------------------------
 
     private fun selectContentType(type: ContentProfile.ContentType) {
         if (type == currentContentType) return
@@ -153,7 +171,7 @@ class ContentsFragment : Fragment() {
             profiles
                 .filter { it.isInstalled }
                 .sortedWith(
-                    compareByDescending<ContentProfile> { it.isInstalled }
+                    compareByDescending<ContentProfile> { it.isOfficial }
                         .thenBy { it.verName.lowercase() }
                         .thenByDescending { it.verCode },
                 )
@@ -161,7 +179,8 @@ class ContentsFragment : Fragment() {
             profiles
                 .filterNot { it.isInstalled }
                 .sortedWith(
-                    compareBy<ContentProfile> { it.verName.lowercase() }
+                    compareByDescending<ContentProfile> { it.isOfficial }
+                        .thenBy { it.verName.lowercase() }
                         .thenByDescending { it.verCode },
                 )
 
@@ -186,7 +205,10 @@ class ContentsFragment : Fragment() {
                 installed = installedItems,
                 available = availableItems,
                 downloadProgress = downloadProgress,
+                conflict = conflictingContentPath?.let(::ComponentsConflict),
                 autoCreateContainer = autoCreateContainer,
+                isRefreshing = isRefreshing,
+                loadFailed = loadFailed,
             )
 
         scheduleRemoteSizeFetches(availableItems)
@@ -243,6 +265,7 @@ class ContentsFragment : Fragment() {
             isInstalled = isInstalled,
             hasRemote = remoteUrl != null,
             sizeBytes = cachedSize,
+            isOfficial = isOfficial,
         )
     }
 
@@ -258,16 +281,16 @@ class ContentsFragment : Fragment() {
         remoteSizeFetchesInFlight.addAll(urlsToFetch)
 
         viewLifecycleOwner.lifecycleScope.launch {
-            urlsToFetch.forEach { url ->
-                val size =
-                    withContext(Dispatchers.IO) {
-                        Downloader.fetchContentLength(url)
-                    }
-                if (!isAdded || view == null) return@launch
+            val sizes =
+                urlsToFetch
+                    .map { url -> async(Dispatchers.IO) { url to Downloader.fetchContentLength(url) } }
+                    .awaitAll()
+            if (!isAdded || view == null) return@launch
+            sizes.forEach { (url, size) ->
                 remoteSizeCache[url] = size
                 remoteSizeFetchesInFlight.remove(url)
-                publishState()
             }
+            publishState()
         }
     }
 
@@ -284,22 +307,20 @@ class ContentsFragment : Fragment() {
         installedSizeFetchesInFlight.addAll(installDirsToFetch)
 
         viewLifecycleOwner.lifecycleScope.launch {
-            installDirsToFetch.forEach { installDir ->
-                val size =
-                    withContext(Dispatchers.IO) {
-                        StorageUtils.getFolderSize(installDir)
-                    }
-                if (!isAdded || view == null) return@launch
+            val sizes =
+                installDirsToFetch
+                    .map { installDir -> async(Dispatchers.IO) { installDir to StorageUtils.getFolderSize(installDir) } }
+                    .awaitAll()
+            if (!isAdded || view == null) return@launch
+            sizes.forEach { (installDir, size) ->
                 installedSizeCache[installDir] = size
                 installedSizeFetchesInFlight.remove(installDir)
-                publishState()
             }
+            publishState()
         }
     }
 
-    // ------------------------------------------------------------------
     // Actions
-    // ------------------------------------------------------------------
 
     private fun promptInstallFromFile() {
         val activity = activity ?: return
@@ -346,37 +367,54 @@ class ContentsFragment : Fragment() {
             return
         }
 
-        manager.removeContent(profile)
-        manager.syncContents()
-        publishState()
+        viewLifecycleOwner.lifecycleScope.launch {
+            withContext(Dispatchers.IO) { manager.removeContent(profile) }
+            if (!isAdded || view == null) return@launch
+            publishState()
+        }
     }
 
     private fun refreshRemoteProfiles() {
+        if (isRefreshing) return
+        isRefreshing = true
+        loadFailed = false
+        remoteSizeCache.entries.removeAll { it.value <= 0L }
+        installedSizeCache.entries.removeAll { it.value <= 0L }
+        publishState()
+
         viewLifecycleOwner.lifecycleScope.launch {
+            var failed = false
             try {
-                val context = context ?: return@launch
-                val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+                val context = context
                 val contentsUrl =
-                    preferences.getString(
-                        "downloadable_contents_url",
-                        ContentsManager.REMOTE_PROFILES,
-                    ) ?: ContentsManager.REMOTE_PROFILES
+                    if (context != null) {
+                        PreferenceManager
+                            .getDefaultSharedPreferences(context)
+                            .getString("downloadable_contents_url", ContentsManager.REMOTE_PROFILES)
+                            ?: ContentsManager.REMOTE_PROFILES
+                    } else {
+                        ContentsManager.REMOTE_PROFILES
+                    }
 
                 val json =
                     withContext(Dispatchers.IO) {
                         Downloader.downloadString(contentsUrl)
-                    } ?: return@launch
-
-                withContext(Dispatchers.IO) {
-                    manager.setRemoteProfiles(json)
-                }
+                    }
 
-                if (isAdded && view != null) {
-                    publishState()
+                if (json != null) {
+                    withContext(Dispatchers.IO) { manager.setRemoteProfiles(json) }
+                } else {
+                    failed = true
                 }
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to refresh remote profiles.", e)
+                failed = true
+            } finally {
+                isRefreshing = false
             }
+
+            loadFailed = failed
+            if (isAdded && view != null) publishState()
         }
     }
 
@@ -441,109 +479,150 @@ class ContentsFragment : Fragment() {
                         return
                     }
 
-                    clearDownloadProgress()
+                    if (sourceRemoteUrl != null) {
+                        manager.registerRemoteProfileAlias(sourceRemoteUrl, profile)
+                    }
+                    manager.syncContents()
+
                     runOnMain {
-                        if (sourceRemoteUrl != null) {
-                            manager.registerRemoteProfileAlias(sourceRemoteUrl, profile)
-                        }
                         WinToast.show(requireContext(), completionMessage)
-                        manager.syncContents()
                         currentContentType = profile.type
                         publishState()
 
-                        if (autoCreateContainer &&
-                            (
-                                profile.type == ContentProfile.ContentType.CONTENT_TYPE_WINE ||
-                                    profile.type == ContentProfile.ContentType.CONTENT_TYPE_PROTON
+                        val willAutoCreate = autoCreateContainer && (
+                            profile.type == ContentProfile.ContentType.CONTENT_TYPE_WINE ||
+                                profile.type == ContentProfile.ContentType.CONTENT_TYPE_PROTON
+                        )
+
+                        if (willAutoCreate) {
+                            // Keep the download/install popup open and swap
+                            // its title — avoids a flash between dialogs.
+                            updateDownloadProgress(
+                                title = getString(R.string.containers_list_creating),
+                                message = profile.verName,
+                                indeterminate = true,
                             )
-                        ) {
                             val containerManager = ContainerManager(requireContext())
-
-                            var desiredName =
-                                profile.verName
-                                    .replace("winlator", "", ignoreCase = true)
-                                    .replace("wine", "", ignoreCase = true)
-                                    .replace(Regex("[^a-zA-Z0-9.\\-]"), " ")
-                                    .trim()
-                                    .replace(Regex("\\s+"), " ")
-
-                            if (desiredName.isEmpty()) desiredName = getString(R.string.common_ui_container)
-
-                            var uniqueName = desiredName
-                            var counter = 2
-                            while (containerManager.containers.any { it.name.equals(uniqueName, ignoreCase = true) }) {
-                                uniqueName = "$desiredName $counter"
-                                counter++
-                            }
-
-                            val data =
-                                org.json.JSONObject().apply {
-                                    put("name", uniqueName)
-                                    put("wineVersion", ContentsManager.getEntryName(profile))
-                                }
-
-                            val preloaderDialog =
-                                com.winlator.cmod.shared.ui.dialog
-                                    .PreloaderDialog(activity)
-                            preloaderDialog.show(R.string.containers_list_creating)
-
-                            containerManager.createContainerAsync(data, manager) { newContainer ->
-                                preloaderDialog.close()
+                            ContainerCreation.createContainerForProfileAsync(
+                                requireContext(),
+                                containerManager,
+                                manager,
+                                profile,
+                            ) { newContainer ->
+                                clearDownloadProgress()
                                 if (newContainer != null) {
                                     WinToast.show(
                                         requireContext(),
-                                        getString(R.string.settings_content_container_created, uniqueName),
+                                        getString(R.string.settings_content_container_created, newContainer.name),
                                     )
                                 }
                             }
+                        } else {
+                            clearDownloadProgress()
                         }
                     }
                 }
             }
 
         val extractionProgress =
-            ContentsManager.OnExtractionProgressListener { filesExtracted, _ ->
-                updateDownloadProgress(
-                    title = getString(R.string.settings_content_extracting_title),
-                    message = getString(R.string.settings_content_extracting_detail, filesExtracted),
-                    indeterminate = true,
-                )
+            object : ContentsManager.OnExtractionProgressListener {
+                override fun onProgress(
+                    filesExtracted: Int,
+                    currentFileName: String,
+                ) {
+                    updateDownloadProgress(
+                        title = getString(R.string.settings_content_extracting_title),
+                        message = getString(R.string.settings_content_extracting_detail, filesExtracted),
+                        indeterminate = true,
+                    )
+                }
+
+                override fun prefersByteProgress(): Boolean = true
+
+                override fun onByteProgress(bytesExtracted: Long) {
+                    val ctx = context ?: return
+                    updateDownloadProgress(
+                        title = getString(R.string.settings_content_extracting_title),
+                        message = android.text.format.Formatter.formatFileSize(ctx, bytesExtracted),
+                        indeterminate = true,
+                    )
+                }
             }
 
+        // Hold the keep-alive across the extraction/install so screen lock
+        // doesn't kill the process mid-extract. The callback above can chain
+        // into finishInstallContent() asynchronously; we release after the
+        // install pipeline finishes (success, failure, or terminal callback).
+        val installKeepAliveTag = "components_install_${uri}_${System.currentTimeMillis()}"
+        val appCtx = requireContext().applicationContext
+        com.winlator.cmod.runtime.system.SessionKeepAliveService.startDownload(appCtx, installKeepAliveTag)
         viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
-            runCatching { manager.extraContentFile(uri, callback, extractionProgress) }
-                .onFailure {
-                    runOnMain {
-                        clearDownloadProgress()
-                        WinToast.show(requireContext(), R.string.input_controls_editor_unable_to_import)
+            try {
+                runCatching { manager.extraContentFile(uri, callback, extractionProgress) }
+                    .onFailure {
+                        runOnMain {
+                            clearDownloadProgress()
+                            WinToast.show(requireContext(), R.string.input_controls_editor_unable_to_import)
+                        }
                     }
-                }
+            } finally {
+                com.winlator.cmod.runtime.system.SessionKeepAliveService.stopDownload(appCtx, installKeepAliveTag)
+            }
         }
     }
 
     private fun showConflictingContentDialog(profile: ContentProfile) {
-        val conflictingPath = ContentsManager.getInstallDir(requireContext(), profile).absolutePath
-        val dialog = ContentDialog(requireContext())
-        dialog.setTitle(R.string.settings_content_conflicting_title)
-        dialog.setMessage(
-            getString(
-                R.string.settings_content_conflicting_message,
-                conflictingPath,
-            ),
-        )
-        dialog.findViewById<View>(R.id.BTCancel).isVisible = false
-        dialog.show()
+        conflictingContentPath = ContentsManager.getInstallDir(requireContext(), profile).absolutePath
+        publishState()
+    }
+
+    private fun findInstalledProfileFor(profile: ContentProfile): ContentProfile? {
+        manager.syncContents()
+
+        val context = requireContext()
+        val remoteUrl = profile.remoteUrl
+        val installedProfile =
+            manager
+                .getProfiles(profile.type)
+                .orEmpty()
+                .firstOrNull { candidate ->
+                    val sameVersion =
+                        candidate.verName == profile.verName &&
+                            candidate.verCode == profile.verCode
+                    val sameRemote = remoteUrl != null && candidate.remoteUrl == remoteUrl
+
+                    candidate.isInstalled &&
+                        ContentsManager.isInstalled(context, candidate) &&
+                        (sameVersion || sameRemote)
+                }
+
+        return installedProfile
+            ?: profile.takeIf { ContentsManager.isInstalled(context, it) }
     }
 
     private fun downloadRemoteContent(profile: ContentProfile) {
         val remoteUrl = profile.remoteUrl ?: return
-        updateDownloadProgress(
-            title = getString(R.string.settings_content_downloading_title),
-            message = profile.verName,
-            indeterminate = true,
-        )
-
         viewLifecycleOwner.lifecycleScope.launch {
+            val installedProfile = withContext(Dispatchers.IO) { findInstalledProfileFor(profile) }
+            if (!isAdded || view == null) return@launch
+            if (installedProfile != null) {
+                publishState()
+                showConflictingContentDialog(installedProfile)
+                return@launch
+            }
+
+            updateDownloadProgress(
+                title = getString(R.string.settings_content_downloading_title),
+                message = profile.verName,
+                indeterminate = true,
+            )
+
+            // Keep the app process alive while the download/install runs so screen
+            // lock doesn't tear it down. installSelectedContent() owns its own
+            // keep-alive scope; this one covers the download step alone.
+            val keepAliveTag = "components_download_${remoteUrl}"
+            val appCtx = requireContext().applicationContext
+            com.winlator.cmod.runtime.system.SessionKeepAliveService.startDownload(appCtx, keepAliveTag)
             val output = File(requireContext().cacheDir, "temp_${System.currentTimeMillis()}")
             val success =
                 withContext(Dispatchers.IO) {
@@ -567,26 +646,30 @@ class ContentsFragment : Fragment() {
                     }
                 }
 
-            if (!isAdded || view == null) {
-                output.delete()
-                clearDownloadProgress()
-                return@launch
-            }
+            try {
+                if (!isAdded || view == null) {
+                    output.delete()
+                    clearDownloadProgress()
+                    return@launch
+                }
 
-            if (success) {
-                updateDownloadProgress(
-                    title = getString(R.string.settings_content_extracting_title),
-                    message = profile.verName,
-                    indeterminate = true,
-                )
-                installSelectedContent(
-                    Uri.parse(output.absolutePath),
-                    getString(R.string.settings_content_download_complete),
-                    remoteUrl,
-                )
-            } else if (isAdded) {
-                clearDownloadProgress()
-                WinToast.show(requireContext(), R.string.settings_content_download_failed)
+                if (success) {
+                    updateDownloadProgress(
+                        title = getString(R.string.settings_content_extracting_title),
+                        message = profile.verName,
+                        indeterminate = true,
+                    )
+                    installSelectedContent(
+                        Uri.parse(output.absolutePath),
+                        getString(R.string.settings_content_download_complete),
+                        remoteUrl,
+                    )
+                } else if (isAdded) {
+                    clearDownloadProgress()
+                    WinToast.show(requireContext(), R.string.settings_content_download_failed)
+                }
+            } finally {
+                com.winlator.cmod.runtime.system.SessionKeepAliveService.stopDownload(appCtx, keepAliveTag)
             }
         }
     }
diff --git a/app/src/main/feature/settings/debug/DebugFragment.kt b/app/src/main/feature/settings/debug/DebugFragment.kt
index 37966e012..9d94a673b 100644
--- a/app/src/main/feature/settings/debug/DebugFragment.kt
+++ b/app/src/main/feature/settings/debug/DebugFragment.kt
@@ -10,22 +10,27 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.unit.Density
 import androidx.core.content.FileProvider
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
 import com.winlator.cmod.app.config.SettingsConfig
-import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.shared.io.AssetPaths
 import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.io.StorageUtils
 import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.util.ArrayUtils
 import org.json.JSONArray
 import java.io.File
@@ -59,84 +64,120 @@ class DebugFragment : Fragment() {
                             surface = Color(0xFF1E252E),
                         ),
                 ) {
-                    DebugScreen(
-                        state = debugState,
-                        wineChannelOptions = wineChannelOptions,
-                        onAppDebugChanged = { checked ->
-                            preferences.edit { putBoolean("enable_app_debug", checked) }
-                            if (checked) {
+                    val fixedDensity = Density(LocalDensity.current.density, fontScale = 1f)
+                    CompositionLocalProvider(LocalDensity provides fixedDensity) {
+                        DebugScreen(
+                            state = debugState,
+                            wineChannelOptions = wineChannelOptions,
+                            wineClassOptions = SettingsConfig.WINE_DEBUG_CLASSES,
+                            onAppDebugChanged = { checked ->
+                                preferences.edit { putBoolean("enable_app_debug", checked) }
+                                com.winlator.cmod.runtime.system.ApplicationLogGate
+                                    .setEnabled(checked)
+                                if (checked) {
+                                    com.winlator.cmod.runtime.system.LogManager
+                                        .startAppLogging(ctx, reset = true)
+                                } else {
+                                    com.winlator.cmod.runtime.system.LogManager
+                                        .stopAppLogging()
+                                    com.winlator.cmod.runtime.system.LogManager
+                                        .updateLoggingState(ctx)
+                                }
+                                refresh()
+                            },
+                            onWineDebugChanged = { checked ->
+                                preferences.edit { putBoolean("enable_wine_debug", checked) }
                                 com.winlator.cmod.runtime.system.LogManager
-                                    .startAppLogging(ctx)
-                            } else {
+                                    .updateLoggingState(ctx)
+                                refresh()
+                            },
+                            onWineChannelsChanged = { channels ->
+                                preferences.edit { putString("wine_debug_channels", channels.joinToString(",")) }
+                                refresh()
+                            },
+                            onWineClassesChanged = { classes ->
+                                preferences.edit { putString("wine_debug_classes", classes.joinToString(",")) }
+                                refresh()
+                            },
+                            onResetWineChannels = {
+                                val defaults =
+                                    SettingsConfig.DEFAULT_WINE_DEBUG_CHANNELS
+                                        .split(",")
+                                        .filter { it.isNotBlank() }
+                                preferences.edit { putString("wine_debug_channels", defaults.joinToString(",")) }
+                                refresh()
+                            },
+                            onRemoveWineChannel = { channel ->
+                                val remaining = debugState.wineChannels.filterNot { it == channel }
+                                preferences.edit { putString("wine_debug_channels", remaining.joinToString(",")) }
+                                refresh()
+                            },
+                            onEmulatorLogsChanged = { checked ->
+                                preferences.edit { putBoolean("enable_emulator_logs", checked) }
                                 com.winlator.cmod.runtime.system.LogManager
-                                    .stopAppLogging()
+                                    .updateLoggingState(ctx)
+                                refresh()
+                            },
+                            onSteamLogsChanged = { checked ->
+                                com.winlator.cmod.feature.stores.steam.utils.PrefManager.enableSteamLogs = checked
+                                if (checked &&
+                                    timber.log.Timber
+                                        .forest()
+                                        .isEmpty()
+                                ) {
+                                    timber.log.Timber.plant(timber.log.Timber.DebugTree())
+                                }
                                 com.winlator.cmod.runtime.system.LogManager
                                     .updateLoggingState(ctx)
-                            }
-                            refresh()
-                        },
-                        onWineDebugChanged = { checked ->
-                            preferences.edit { putBoolean("enable_wine_debug", checked) }
-                            com.winlator.cmod.runtime.system.LogManager
-                                .updateLoggingState(ctx)
-                            refresh()
-                        },
-                        onWineChannelsChanged = { channels ->
-                            preferences.edit { putString("wine_debug_channels", channels.joinToString(",")) }
-                            refresh()
-                        },
-                        onResetWineChannels = {
-                            val defaults =
-                                SettingsConfig.DEFAULT_WINE_DEBUG_CHANNELS
-                                    .split(",")
-                                    .filter { it.isNotBlank() }
-                            preferences.edit { putString("wine_debug_channels", defaults.joinToString(",")) }
-                            refresh()
-                        },
-                        onRemoveWineChannel = { channel ->
-                            val remaining = debugState.wineChannels.filterNot { it == channel }
-                            preferences.edit { putString("wine_debug_channels", remaining.joinToString(",")) }
-                            refresh()
-                        },
-                        onBox64LogsChanged = { checked ->
-                            preferences.edit { putBoolean("enable_box64_logs", checked) }
-                            com.winlator.cmod.runtime.system.LogManager
-                                .updateLoggingState(ctx)
-                            refresh()
-                        },
-                        onFexcoreLogsChanged = { checked ->
-                            preferences.edit { putBoolean("enable_fexcore_logs", checked) }
-                            com.winlator.cmod.runtime.system.LogManager
-                                .updateLoggingState(ctx)
-                            refresh()
-                        },
-                        onSteamLogsChanged = { checked ->
-                            com.winlator.cmod.feature.stores.steam.utils.PrefManager.enableSteamLogs = checked
-                            if (checked &&
-                                timber.log.Timber
-                                    .forest()
-                                    .isEmpty()
-                            ) {
-                                timber.log.Timber.plant(timber.log.Timber.DebugTree())
-                            }
-                            com.winlator.cmod.runtime.system.LogManager
-                                .updateLoggingState(ctx)
-                            refresh()
-                        },
-                        onInputLogsChanged = { checked ->
-                            preferences.edit { putBoolean("enable_input_logs", checked) }
-                            com.winlator.cmod.runtime.system.LogManager
-                                .updateLoggingState(ctx)
-                            refresh()
-                        },
-                        onDownloadLogsChanged = { checked ->
-                            preferences.edit { putBoolean("enable_download_logs", checked) }
-                            com.winlator.cmod.runtime.system.LogManager
-                                .updateLoggingState(ctx)
-                            refresh()
-                        },
-                        onShareLogs = { shareLogs() },
-                    )
+                                refresh()
+                            },
+                            onInputLogsChanged = { checked ->
+                                preferences.edit { putBoolean("enable_input_logs", checked) }
+                                com.winlator.cmod.runtime.system.LogManager
+                                    .updateLoggingState(ctx)
+                                refresh()
+                            },
+                            onDownloadLogsChanged = { checked ->
+                                preferences.edit { putBoolean("enable_download_logs", checked) }
+                                com.winlator.cmod.runtime.system.LogManager
+                                    .updateLoggingState(ctx)
+                                refresh()
+                            },
+                            onRecordPerformanceToFileChanged = { checked ->
+                                preferences.edit { putBoolean("hud_record_to_file", checked) }
+                                refresh()
+                            },
+                            onVulkanValidationLayersChanged = { checked ->
+                                preferences.edit { putBoolean("enable_vulkan_validation_layers", checked) }
+                                refresh()
+                            },
+                            onWnHybridModeChanged = { checked ->
+                                com.winlator.cmod.feature.stores.steam.utils.PrefManager
+                                    .wnHybridMode = checked
+                                com.winlator.cmod.feature.stores.steam.service
+                                    .SteamService
+                                    .setHybridModeRuntime(checked)
+                                WinToast.show(
+                                    ctx,
+                                    if (checked) {
+                                        "WN Hybrid mode ON — libsteamclient.so is now the Steam session"
+                                    } else {
+                                        "WN Hybrid mode OFF — wn-steam-client resumed"
+                                    },
+                                )
+                                refresh()
+                            },
+                            onShareLogs = { shareLogs() },
+                            onDownloadLogs = { downloadLogs() },
+                            onDeleteLogs = { deleteLogs() },
+                            onListLogFiles = { listLogFiles() },
+                            onReadLogFile = { entry -> readLogFile(entry) },
+                            onShareLogFile = { entry -> shareLogFile(entry) },
+                            onDownloadLogFile = { entry -> downloadLogFile(entry) },
+                            onDeleteLogFile = { entry -> deleteLogFile(entry) },
+                            bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
+                        )
+                    }
                 }
             }
         }
@@ -155,16 +196,31 @@ class DebugFragment : Fragment() {
                     SettingsConfig.DEFAULT_WINE_DEBUG_CHANNELS,
                 )?.split(",")
                 ?.filter { it.isNotBlank() } ?: emptyList()
+        val classes =
+            preferences
+                .getString(
+                    "wine_debug_classes",
+                    SettingsConfig.DEFAULT_WINE_DEBUG_CLASSES,
+                )?.split(",")
+                ?.filter { it.isNotBlank() } ?: emptyList()
         debugState =
             DebugState(
                 appDebug = preferences.getBoolean("enable_app_debug", false),
                 wineDebug = preferences.getBoolean("enable_wine_debug", false),
                 wineChannels = channels,
-                box64Logs = preferences.getBoolean("enable_box64_logs", false),
-                fexcoreLogs = preferences.getBoolean("enable_fexcore_logs", false),
+                wineClasses = classes,
+                emulatorLogs = preferences.getBoolean("enable_emulator_logs", false),
                 steamLogs = com.winlator.cmod.feature.stores.steam.utils.PrefManager.enableSteamLogs,
                 inputLogs = preferences.getBoolean("enable_input_logs", false),
                 downloadLogs = preferences.getBoolean("enable_download_logs", false),
+                recordPerformanceToFile = preferences.getBoolean("hud_record_to_file", false),
+                vulkanValidationLayers = preferences.getBoolean("enable_vulkan_validation_layers", false),
+                wnHybridMode = com.winlator.cmod.feature.stores.steam.utils.PrefManager.wnHybridMode,
+                logsSize =
+                    StorageUtils.formatDecimalSize(
+                        com.winlator.cmod.runtime.system.LogManager
+                            .getShareableLogsSize(requireContext()),
+                    ),
             )
     }
 
@@ -190,15 +246,7 @@ class DebugFragment : Fragment() {
         try {
             val timestamp = java.text.SimpleDateFormat("yyyyMMdd_HHmmss", java.util.Locale.US).format(java.util.Date())
             val zipFile = File(ctx.cacheDir, "winnative_logs_$timestamp.zip")
-            ZipOutputStream(FileOutputStream(zipFile)).use { zos ->
-                files.forEach { file ->
-                    if (file.isFile) {
-                        zos.putNextEntry(ZipEntry(file.name))
-                        file.inputStream().use { it.copyTo(zos) }
-                        zos.closeEntry()
-                    }
-                }
-            }
+            writeLogsZip(zipFile, files)
 
             lastSharedLogFile = zipFile
 
@@ -226,7 +274,190 @@ class DebugFragment : Fragment() {
         }
     }
 
+    private fun logsDownloadDir(): File {
+        val dir = File(android.os.Environment.getExternalStorageDirectory(), "WinNative/logs")
+        dir.mkdirs()
+        return dir
+    }
+
+    private fun logDownloadKey(file: File): String = "${file.name}@${file.lastModified()}"
+
+    private fun downloadedLogKeys(): Set<String> =
+        preferences.getStringSet(KEY_DOWNLOADED_LOGS, emptySet()) ?: emptySet()
+
+    private fun markLogDownloaded(file: File) {
+        val set = HashSet(downloadedLogKeys())
+        if (set.add(logDownloadKey(file))) {
+            preferences.edit { putStringSet(KEY_DOWNLOADED_LOGS, set) }
+        }
+    }
+
+    private fun writeLogsZip(
+        dest: File,
+        files: Array<File>,
+    ) {
+        ZipOutputStream(FileOutputStream(dest)).use { zos ->
+            files.forEach { file ->
+                if (file.isFile) {
+                    zos.putNextEntry(ZipEntry(file.name))
+                    file.inputStream().use { it.copyTo(zos) }
+                    zos.closeEntry()
+                }
+            }
+        }
+    }
+
+    private fun downloadLogs(): String? {
+        val ctx = requireContext()
+        val files =
+            com.winlator.cmod.runtime.system.LogManager
+                .getShareableLogFiles(ctx)
+
+        if (files.isEmpty()) {
+            WinToast.show(ctx, R.string.settings_debug_no_logs_available)
+            return null
+        }
+
+        return try {
+            val timestamp = java.text.SimpleDateFormat("yyyyMMdd_HHmmss", java.util.Locale.US).format(java.util.Date())
+            val dest = File(logsDownloadDir(), "winnative_logs_$timestamp.zip")
+            writeLogsZip(dest, files)
+            "/WinNative/logs/${dest.name}"
+        } catch (e: Exception) {
+            WinToast.show(ctx, getString(R.string.settings_debug_capture_failed, e.message ?: ""))
+            null
+        }
+    }
+
+    private fun deleteLogs() {
+        val ctx = requireContext()
+        val files =
+            com.winlator.cmod.runtime.system.LogManager
+                .getShareableLogFiles(ctx)
+
+        if (files.isEmpty()) {
+            WinToast.show(ctx, R.string.settings_debug_no_logs_available)
+            return
+        }
+
+        com.winlator.cmod.runtime.system.LogManager
+            .deleteShareableLogs(ctx)
+        preferences.edit { remove(KEY_DOWNLOADED_LOGS) }
+        WinToast.show(ctx, R.string.settings_debug_logs_deleted)
+        refresh()
+    }
+
+    /** Log files, newest first. */
+    private fun listLogFiles(): List<LogFileEntry> {
+        val dateFormat = java.text.SimpleDateFormat("yyyy-MM-dd HH:mm", java.util.Locale.US)
+        val downloadedKeys = downloadedLogKeys()
+        return com.winlator.cmod.runtime.system.LogManager
+            .getShareableLogFiles(requireContext())
+            .filter { it.isFile }
+            .sortedByDescending { it.lastModified() }
+            .map { file ->
+                LogFileEntry(
+                    name = file.name,
+                    sizeText = StorageUtils.formatDecimalSize(file.length()),
+                    dateText = dateFormat.format(java.util.Date(file.lastModified())),
+                    absolutePath = file.absolutePath,
+                    downloaded = downloadedKeys.contains(logDownloadKey(file)),
+                )
+            }
+    }
+
+    /** Reads a log file, capped at the last 512 KB (the tail). */
+    private fun readLogFile(entry: LogFileEntry): String {
+        val file = File(entry.absolutePath)
+        if (!file.isFile) return ""
+        val cap = 512L * 1024
+        return try {
+            if (file.length() <= cap) {
+                file.readText()
+            } else {
+                java.io.RandomAccessFile(file, "r").use { raf ->
+                    raf.seek(file.length() - cap)
+                    val bytes = ByteArray(cap.toInt())
+                    raf.readFully(bytes)
+                    getString(R.string.settings_debug_log_truncated, StorageUtils.formatDecimalSize(cap)) +
+                        "\n\n" + String(bytes)
+                }
+            }
+        } catch (e: Exception) {
+            getString(R.string.settings_debug_capture_failed, e.message ?: "")
+        }
+    }
+
+    /** Shares one log file. */
+    private fun shareLogFile(entry: LogFileEntry) {
+        val ctx = requireContext()
+        val file = File(entry.absolutePath)
+        if (!file.isFile) {
+            WinToast.show(ctx, R.string.settings_debug_no_logs_available)
+            return
+        }
+        try {
+            val authority = "${ctx.packageName}.tileprovider"
+            val uri = FileProvider.getUriForFile(ctx, authority, file)
+            val shareIntent =
+                Intent(Intent.ACTION_SEND).apply {
+                    type = "text/plain"
+                    putExtra(Intent.EXTRA_STREAM, uri)
+                    putExtra(Intent.EXTRA_SUBJECT, file.name)
+                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                }
+            startActivity(Intent.createChooser(shareIntent, getString(R.string.settings_debug_share_logs)))
+        } catch (e: Exception) {
+            WinToast.show(ctx, getString(R.string.settings_debug_capture_failed, e.message ?: ""))
+        }
+    }
+
+    /** Application logs carry their capture time in the saved name so re-saving after a new
+     *  session doesn't overwrite the previous copy. */
+    private fun exportFileName(file: File): String {
+        if (!file.name.startsWith("application")) return file.name
+        val stamp =
+            java.text.SimpleDateFormat("MMdd_HHmmss", java.util.Locale.US)
+                .format(java.util.Date(file.lastModified()))
+        val dot = file.name.lastIndexOf('.')
+        return if (dot <= 0) {
+            "${file.name}_$stamp"
+        } else {
+            "${file.name.substring(0, dot)}_$stamp${file.name.substring(dot)}"
+        }
+    }
+
+    private fun downloadLogFile(entry: LogFileEntry): String? {
+        val ctx = requireContext()
+        val file = File(entry.absolutePath)
+        if (!file.isFile) {
+            WinToast.show(ctx, R.string.settings_debug_no_logs_available)
+            return null
+        }
+        return try {
+            val dest = File(logsDownloadDir(), exportFileName(file))
+            file.inputStream().use { input -> FileOutputStream(dest).use { input.copyTo(it) } }
+            markLogDownloaded(file)
+            "/WinNative/logs/${dest.name}"
+        } catch (e: Exception) {
+            WinToast.show(ctx, getString(R.string.settings_debug_capture_failed, e.message ?: ""))
+            null
+        }
+    }
+
+    /** Deletes one log file. */
+    private fun deleteLogFile(entry: LogFileEntry) {
+        val file = File(entry.absolutePath)
+        val key = logDownloadKey(file)
+        file.delete()
+        val set = HashSet(downloadedLogKeys())
+        if (set.remove(key)) preferences.edit { putStringSet(KEY_DOWNLOADED_LOGS, set) }
+        refresh()
+    }
+
     companion object {
+        private const val KEY_DOWNLOADED_LOGS = "downloaded_log_keys"
+
         @Volatile
         var lastSharedLogFile: File? = null
 
diff --git a/app/src/main/feature/settings/debug/DebugScreen.kt b/app/src/main/feature/settings/debug/DebugScreen.kt
index cdc7b75bb..28062eba8 100644
--- a/app/src/main/feature/settings/debug/DebugScreen.kt
+++ b/app/src/main/feature/settings/debug/DebugScreen.kt
@@ -1,26 +1,35 @@
-/* Settings > Debug screen — Jetpack Compose / Material3.
- * Uses a LazyColumn for the main content. */
 package com.winlator.cmod.feature.settings
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -36,53 +45,103 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.withFrameNanos
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import kotlinx.coroutines.launch
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.BugReport
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.CloudDownload
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.FolderOpen
 import androidx.compose.material.icons.outlined.Gamepad
 import androidx.compose.material.icons.outlined.Memory
 import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.Speed
 import androidx.compose.material.icons.outlined.SportsEsports
 import androidx.compose.material.icons.outlined.Terminal
 import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Switch
 import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavHandlers
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.SideEffect
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 // Palette (mirrors StoresScreen)
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardBorder = Color(0xFF2A2A3A)
 private val IconBoxBg = Color(0xFF242434)
 private val SurfaceDark = Color(0xFF21212A)
 private val Accent = Color(0xFF1A9FFF)
+private val NavHighlight = Color(0xFF4FC3F7)
 private val Warning = Color(0xFFFF4444)
+private val Success = Color(0xFF7CC142)
 private val TextPrimary = Color(0xFFF0F4FF)
 private val TextSecondary = Color(0xFF7A8FA8)
 
@@ -91,11 +150,23 @@ data class DebugState(
     val appDebug: Boolean = false,
     val wineDebug: Boolean = false,
     val wineChannels: List<String> = emptyList(),
-    val box64Logs: Boolean = false,
-    val fexcoreLogs: Boolean = false,
+    val wineClasses: List<String> = emptyList(),
+    val emulatorLogs: Boolean = false,
     val steamLogs: Boolean = false,
     val inputLogs: Boolean = false,
     val downloadLogs: Boolean = false,
+    val recordPerformanceToFile: Boolean = false,
+    val vulkanValidationLayers: Boolean = false,
+    val wnHybridMode: Boolean = false,
+    val logsSize: String = "0 B",
+)
+
+data class LogFileEntry(
+    val name: String,
+    val sizeText: String,
+    val dateText: String,
+    val absolutePath: String,
+    val downloaded: Boolean = false,
 )
 
 // Root
@@ -103,19 +174,32 @@ data class DebugState(
 fun DebugScreen(
     state: DebugState,
     wineChannelOptions: List<String>,
+    wineClassOptions: List<String>,
     onAppDebugChanged: (Boolean) -> Unit,
     onWineDebugChanged: (Boolean) -> Unit,
     onWineChannelsChanged: (List<String>) -> Unit,
+    onWineClassesChanged: (List<String>) -> Unit,
     onResetWineChannels: () -> Unit,
     onRemoveWineChannel: (String) -> Unit,
-    onBox64LogsChanged: (Boolean) -> Unit,
-    onFexcoreLogsChanged: (Boolean) -> Unit,
+    onEmulatorLogsChanged: (Boolean) -> Unit,
     onSteamLogsChanged: (Boolean) -> Unit,
     onInputLogsChanged: (Boolean) -> Unit,
     onDownloadLogsChanged: (Boolean) -> Unit,
+    onRecordPerformanceToFileChanged: (Boolean) -> Unit,
+    onVulkanValidationLayersChanged: (Boolean) -> Unit,
+    onWnHybridModeChanged: (Boolean) -> Unit,
     onShareLogs: () -> Unit,
+    onDownloadLogs: () -> String?,
+    onDeleteLogs: () -> Unit,
+    onListLogFiles: () -> List<LogFileEntry>,
+    onReadLogFile: (LogFileEntry) -> String,
+    onShareLogFile: (LogFileEntry) -> Unit,
+    onDownloadLogFile: (LogFileEntry) -> String?,
+    onDeleteLogFile: (LogFileEntry) -> Unit,
+    bridge: SettingsNavBridge? = null,
 ) {
     var showChannelsDialog by remember { mutableStateOf(false) }
+    var showLogsBrowser by remember { mutableStateOf(false) }
     val layoutDirection = LocalLayoutDirection.current
     val navBarPadding = WindowInsets.navigationBars.asPaddingValues()
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
@@ -134,25 +218,41 @@ fun DebugScreen(
         )
     }
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                end = 16.dp + navBarEndPadding,
-                top = 16.dp,
-                bottom = 4.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item(key = "application_section") {
+    if (showLogsBrowser) {
+        val initialFiles = remember { onListLogFiles() }
+        LogsBrowserDialog(
+            initialFiles = initialFiles,
+            logsSize = state.logsSize,
+            onReadLogFile = onReadLogFile,
+            onShareAllLogs = onShareLogs,
+            onDownloadAllLogs = onDownloadLogs,
+            onDeleteAllLogs = onDeleteLogs,
+            onShareLogFile = onShareLogFile,
+            onDownloadLogFile = onDownloadLogFile,
+            onDeleteLogFile = onDeleteLogFile,
+            onDismiss = { showLogsBrowser = false },
+        )
+    }
+
+    val contentNav = rememberSettingsContentNav(bridge)
+
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        end = 16.dp + navBarEndPadding,
+                        top = 16.dp,
+                        bottom = 4.dp + navBarBottomPadding,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
             SectionLabel(stringResource(R.string.common_ui_application))
-        }
 
-        item(key = "app_debug_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.common_ui_application),
                 subtitle = stringResource(R.string.settings_debug_log_to_file_desc),
@@ -161,13 +261,9 @@ fun DebugScreen(
                 checked = state.appDebug,
                 onCheckedChange = onAppDebugChanged,
             )
-        }
 
-        item(key = "emulation_section") {
             SectionLabel(stringResource(R.string.settings_debug_section_emulation), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "wine_logs_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_debug_wine_logs_title),
                 subtitle = stringResource(R.string.settings_debug_wine_logs_subtitle),
@@ -175,9 +271,7 @@ fun DebugScreen(
                 checked = state.wineDebug,
                 onCheckedChange = onWineDebugChanged,
             )
-        }
 
-        item(key = "wine_channels_card") {
             WineChannelsCard(
                 channels = state.wineChannels,
                 enabled = state.wineDebug,
@@ -185,33 +279,43 @@ fun DebugScreen(
                 onReset = onResetWineChannels,
                 onRemoveChannel = onRemoveWineChannel,
             )
-        }
 
-        item(key = "box64_logs_card") {
-            SettingsToggleCard(
-                title = stringResource(R.string.settings_debug_box_logs_title),
-                subtitle = stringResource(R.string.settings_debug_box_logs_subtitle),
-                icon = Icons.Outlined.Memory,
-                checked = state.box64Logs,
-                onCheckedChange = onBox64LogsChanged,
+            WineClassesCard(
+                options = wineClassOptions,
+                selected = state.wineClasses,
+                enabled = state.wineDebug,
+                onToggle = { cls ->
+                    val updated =
+                        if (cls in state.wineClasses) {
+                            state.wineClasses - cls
+                        } else {
+                            state.wineClasses + cls
+                        }
+                    onWineClassesChanged(wineClassOptions.filter { it in updated })
+                },
             )
-        }
 
-        item(key = "fexcore_logs_card") {
             SettingsToggleCard(
-                title = stringResource(R.string.settings_debug_fex_logs_title),
-                subtitle = stringResource(R.string.settings_debug_fex_logs_subtitle),
+                title = stringResource(R.string.settings_debug_emulator_logs_title),
+                subtitle = stringResource(R.string.settings_debug_emulator_logs_subtitle),
                 icon = Icons.Outlined.Memory,
-                checked = state.fexcoreLogs,
-                onCheckedChange = onFexcoreLogsChanged,
+                checked = state.emulatorLogs,
+                onCheckedChange = onEmulatorLogsChanged,
             )
-        }
 
-        item(key = "subsystems_section") {
             SectionLabel(stringResource(R.string.settings_debug_section_subsystems), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "steam_logs_card") {
+/*
+            SettingsToggleCard(
+                title = stringResource(R.string.settings_debug_vulkan_validation_layers_title),
+                subtitle = stringResource(R.string.settings_debug_vulkan_validation_layers_subtitle),
+                icon = Icons.Outlined.BugReport,
+                accentColor = Warning,
+                checked = state.vulkanValidationLayers,
+                onCheckedChange = onVulkanValidationLayersChanged,
+            )
+*/
+
             SettingsToggleCard(
                 title = stringResource(R.string.settings_debug_steam_logs_title),
                 subtitle = stringResource(R.string.settings_debug_steam_logs_subtitle),
@@ -219,9 +323,7 @@ fun DebugScreen(
                 checked = state.steamLogs,
                 onCheckedChange = onSteamLogsChanged,
             )
-        }
 
-        item(key = "input_logs_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_debug_input_logs),
                 subtitle = stringResource(R.string.settings_debug_input_logs_description),
@@ -229,9 +331,7 @@ fun DebugScreen(
                 checked = state.inputLogs,
                 onCheckedChange = onInputLogsChanged,
             )
-        }
 
-        item(key = "download_logs_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_debug_download_logs),
                 subtitle = stringResource(R.string.settings_debug_download_logs_description),
@@ -239,17 +339,27 @@ fun DebugScreen(
                 checked = state.downloadLogs,
                 onCheckedChange = onDownloadLogsChanged,
             )
-        }
 
-        item(key = "tools_section") {
-            SectionLabel(stringResource(R.string.settings_debug_section_tools), modifier = Modifier.padding(top = 8.dp))
-        }
+            SettingsToggleCard(
+                title = stringResource(R.string.settings_hud_record_to_file_title),
+                subtitle = stringResource(R.string.settings_hud_record_to_file_summary),
+                icon = Icons.Outlined.Speed,
+                checked = state.recordPerformanceToFile,
+                onCheckedChange = onRecordPerformanceToFileChanged,
+            )
 
-        item(key = "share_logs_button") {
-            ShareLogsButton(onClick = onShareLogs)
-        }
+            Row(
+                modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(IntrinsicSize.Min),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                LogActionButton(
+                    icon = Icons.Outlined.FolderOpen,
+                    label = stringResource(R.string.settings_debug_open_logs_folder_short),
+                    accentColor = Accent,
+                    onClick = { showLogsBrowser = true },
+                )
+            }
 
-        item(key = "bottom_spacer") {
             Spacer(Modifier.height(24.dp))
         }
     }
@@ -293,7 +403,12 @@ private fun SettingsToggleCard(
             modifier =
                 Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = 14.dp, vertical = 11.dp),
+                    .paneNavItem(
+                        cornerRadius = 12.dp,
+                        onActivate = { onCheckedChange(!checked) },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    ).padding(horizontal = 14.dp, vertical = 11.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Box(
@@ -320,7 +435,7 @@ private fun SettingsToggleCard(
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
-                modifier = Modifier.scale(0.78f),
+                modifier = Modifier.scale(0.78f).focusProperties { canFocus = false },
                 colors =
                     outlinedSwitchColors(
                         accentColor = accentColor,
@@ -355,7 +470,9 @@ private fun WineChannelsCard(
                     .fillMaxWidth()
                     .padding(horizontal = 14.dp, vertical = 12.dp),
         ) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
                 Box(
                     modifier =
                         Modifier
@@ -386,17 +503,35 @@ private fun WineChannelsCard(
                     )
                 }
                 Spacer(Modifier.width(8.dp))
-                SmallActionButton(
-                    label = stringResource(R.string.common_ui_select),
-                    textColor = Accent,
-                    onClick = { if (enabled) onEdit() },
-                )
+                Box(
+                    modifier =
+                        Modifier.paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = { if (enabled) onEdit() },
+                            highlightColor = NavHighlight,
+                        ),
+                ) {
+                    SmallActionButton(
+                        label = stringResource(R.string.common_ui_select),
+                        textColor = Accent,
+                        onClick = { if (enabled) onEdit() },
+                    )
+                }
                 Spacer(Modifier.width(6.dp))
-                SmallActionButton(
-                    label = stringResource(R.string.common_ui_reset),
-                    textColor = TextSecondary,
-                    onClick = { if (enabled) onReset() },
-                )
+                Box(
+                    modifier =
+                        Modifier.paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = { if (enabled) onReset() },
+                            highlightColor = NavHighlight,
+                        ),
+                ) {
+                    SmallActionButton(
+                        label = stringResource(R.string.common_ui_reset),
+                        textColor = TextSecondary,
+                        onClick = { if (enabled) onReset() },
+                    )
+                }
             }
             Spacer(Modifier.height(10.dp))
             Row(
@@ -415,10 +550,12 @@ private fun WineChannelsCard(
                     )
                 } else {
                     channels.forEach { channel ->
-                        ChannelChip(
-                            label = channel,
-                            onRemove = { if (enabled) onRemoveChannel(channel) },
-                        )
+                        key(channel) {
+                            ChannelChip(
+                                label = channel,
+                                onRemove = { if (enabled) onRemoveChannel(channel) },
+                            )
+                        }
                     }
                 }
             }
@@ -426,6 +563,115 @@ private fun WineChannelsCard(
     }
 }
 
+// Wine debug message-class card (err / warn / fixme / trace)
+@Composable
+private fun WineClassesCard(
+    options: List<String>,
+    selected: List<String>,
+    enabled: Boolean,
+    onToggle: (String) -> Unit,
+) {
+    Box(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .alpha(if (enabled) 1f else 0.48f)
+                .clip(RoundedCornerShape(12.dp))
+                .background(CardDark)
+                .border(1.dp, CardBorder, RoundedCornerShape(12.dp)),
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 14.dp, vertical = 12.dp),
+        ) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Box(
+                    modifier =
+                        Modifier
+                            .size(34.dp)
+                            .clip(RoundedCornerShape(9.dp))
+                            .background(IconBoxBg),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Tune,
+                        contentDescription = null,
+                        tint = Accent,
+                        modifier = Modifier.size(17.dp),
+                    )
+                }
+                Spacer(Modifier.width(13.dp))
+                Column(modifier = Modifier.weight(1f)) {
+                    Text(
+                        text = stringResource(R.string.settings_debug_wine_classes_title),
+                        color = TextPrimary,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.Medium,
+                    )
+                    Text(
+                        text = stringResource(R.string.settings_debug_wine_classes_summary),
+                        color = TextSecondary,
+                        fontSize = 11.sp,
+                    )
+                }
+            }
+            Spacer(Modifier.height(10.dp))
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(6.dp),
+            ) {
+                options.forEach { cls ->
+                    ClassChip(
+                        label = cls,
+                        isSelected = cls in selected,
+                        enabled = enabled,
+                        onToggle = { onToggle(cls) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RowScope.ClassChip(
+    label: String,
+    isSelected: Boolean,
+    enabled: Boolean,
+    onToggle: () -> Unit,
+) {
+    // pointerInput keys never change, so capture the latest callback to avoid acting
+    // on a stale selection snapshot.
+    val action = rememberUpdatedState { if (enabled) onToggle() }
+    val bg = if (isSelected) Accent.copy(alpha = 0.18f) else IconBoxBg
+    val borderColor = if (isSelected) Accent.copy(alpha = 0.55f) else CardBorder
+    val textColor = if (isSelected) Accent else TextPrimary
+    Box(
+        modifier =
+            Modifier
+                .weight(1f)
+                .height(34.dp)
+                .clip(RoundedCornerShape(8.dp))
+                .background(bg)
+                .border(1.dp, borderColor, RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { if (enabled) onToggle() })
+                .pointerInput(Unit) {
+                    detectTapGestures(onTap = { action.value() })
+                },
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
 @Composable
 private fun ChannelChip(
     label: String,
@@ -452,9 +698,12 @@ private fun ChannelChip(
                 Modifier
                     .size(18.dp)
                     .clip(RoundedCornerShape(5.dp))
-                    .pointerInput(onRemove) {
-                        detectTapGestures(onTap = { onRemove() })
-                    },
+                    .paneNavItem(
+                        cornerRadius = 5.dp,
+                        onActivate = { onRemove() },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    ),
             contentAlignment = Alignment.Center,
         ) {
             Icon(
@@ -471,6 +720,7 @@ private fun ChannelChip(
 private fun SmallActionButton(
     label: String,
     textColor: Color,
+    isEntry: Boolean = false,
     onClick: () -> Unit,
 ) {
     var isPressed by remember { mutableStateOf(false) }
@@ -486,6 +736,7 @@ private fun SmallActionButton(
                 .clip(RoundedCornerShape(8.dp))
                 .background(Color(0xFF222232))
                 .border(1.dp, textColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, isEntry = isEntry)
                 .pointerInput(onClick) {
                     detectTapGestures(
                         onPress = {
@@ -519,20 +770,73 @@ private fun WineChannelsDialog(
         remember(initiallySelected) {
             mutableStateOf(initiallySelected.toSet())
         }
+    val contentRegistry = remember { PaneNavRegistry().apply { stableCursor = true } }
+    val footerRegistry = remember { PaneNavRegistry().apply { singleRow = true } }
+    var footerZone by remember { mutableStateOf(false) }
+    val gridState = rememberLazyGridState()
+    val scope = rememberCoroutineScope()
+    val density = LocalDensity.current
+    var viewportTop by remember { mutableStateOf(0f) }
+    var viewportHeight by remember { mutableIntStateOf(0) }
+
+    LaunchedEffect(contentRegistry.activeRow, contentRegistry.activeCol, viewportHeight, footerZone) {
+        if (footerZone || !contentRegistry.controllerActive || contentRegistry.manualSelection) return@LaunchedEffect
+        val bounds = contentRegistry.activeItemBounds() ?: return@LaunchedEffect
+        val margin = (bounds.second - bounds.first) + with(density) { 10.dp.toPx() }
+        val vpBottom = viewportTop + viewportHeight
+        val delta = when {
+            bounds.second + margin > vpBottom -> bounds.second + margin - vpBottom
+            bounds.first - margin < viewportTop -> bounds.first - margin - viewportTop
+            else -> 0f
+        }
+        if (delta != 0f) runCatching { gridState.animateScrollBy(delta) }
+    }
+    val toFooter: () -> Unit = {
+        footerZone = true
+        contentRegistry.controllerActive = false
+        footerRegistry.controllerActive = true
+        footerRegistry.reset()
+    }
+    SideEffect {
+        contentRegistry.onEdgeDown = {
+            if (gridState.canScrollForward) {
+                val b = contentRegistry.activeItemBounds()
+                val step = if (b != null) (b.second - b.first) + with(density) { 8.dp.toPx() } else viewportHeight * 0.3f
+                scope.launch { runCatching { gridState.animateScrollBy(step) } }
+            } else {
+                toFooter()
+            }
+        }
+        contentRegistry.onEdgeLeft = toFooter
+        contentRegistry.onEdgeRight = toFooter
+        footerRegistry.onEdgeUp = {
+            footerZone = false
+            footerRegistry.controllerActive = false
+            contentRegistry.controllerActive = true
+        }
+    }
+    val handlers =
+        remember {
+            paneNavHandlers(
+                onDismiss = onDismiss,
+                onStart = {
+                    val ordered = options.filter { it in selected.value }
+                    onConfirm(ordered)
+                },
+                registry = { if (footerZone) footerRegistry else contentRegistry },
+            )
+        }
 
     Dialog(
         onDismissRequest = onDismiss,
         properties =
             DialogProperties(
                 usePlatformDefaultWidth = false,
-                // Parent activity runs edge-to-edge (WindowCompat.setDecorFitsSystemWindows(window, false)),
-                // so we also take the dialog window edge-to-edge and pad for insets manually below.
-                // This gives predictable behavior regardless of platform defaults.
                 decorFitsSystemWindows = false,
             ),
     ) {
-        // fillMaxSize + safeDrawing inset padding keeps the dialog clear of the
-        // system status/nav bars and any display cutout on every device.
+        DialogPaneNav(handlers)
+        CompositionLocalProvider(LocalPaneNav provides contentRegistry) {
         BoxWithConstraints(
             modifier =
                 Modifier
@@ -571,6 +875,11 @@ private fun WineChannelsDialog(
                     ChannelGrid(
                         options = options,
                         selected = selected.value,
+                        gridState = gridState,
+                        onViewport = { top, h ->
+                            viewportTop = top
+                            viewportHeight = h
+                        },
                         onToggle = { channel ->
                             selected.value =
                                 if (channel in selected.value) {
@@ -582,27 +891,29 @@ private fun WineChannelsDialog(
                     )
 
                     Spacer(Modifier.height(14.dp))
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-                    ) {
-                        SmallActionButton(
-                            label = stringResource(R.string.common_ui_cancel),
-                            textColor = TextSecondary,
-                            onClick = onDismiss,
-                        )
-                        SmallActionButton(
-                            label = stringResource(R.string.common_ui_confirm),
-                            textColor = Accent,
-                            onClick = {
-                                val ordered = options.filter { it in selected.value }
-                                onConfirm(ordered)
-                            },
-                        )
+                    CompositionLocalProvider(LocalPaneNav provides footerRegistry) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
+                        ) {
+                            SmallActionButton(
+                                label = stringResource(R.string.common_ui_cancel),
+                                textColor = TextSecondary,                                onClick = onDismiss,
+                            )
+                            SmallActionButton(
+                                label = stringResource(R.string.common_ui_confirm),
+                                textColor = Accent,                                isEntry = true,
+                                onClick = {
+                                    val ordered = options.filter { it in selected.value }
+                                    onConfirm(ordered)
+                                },
+                            )
+                        }
                     }
                 }
             }
         }
+        }
     }
 }
 
@@ -610,6 +921,8 @@ private fun WineChannelsDialog(
 private fun ColumnScope.ChannelGrid(
     options: List<String>,
     selected: Set<String>,
+    gridState: androidx.compose.foundation.lazy.grid.LazyGridState,
+    onViewport: (Float, Int) -> Unit,
     onToggle: (String) -> Unit,
 ) {
     if (options.isEmpty()) {
@@ -621,22 +934,24 @@ private fun ColumnScope.ChannelGrid(
         )
         return
     }
-    // Adaptive grid reflows columns on smaller screens (3 cols on ~300dp+ wide,
-    // 2 cols on narrow ~200dp wide). weight(1f, fill = false) lets the grid
-    // shrink on short landscape screens without pushing buttons off-screen.
     LazyVerticalGrid(
+        state = gridState,
         columns = GridCells.Adaptive(minSize = 92.dp),
         modifier =
             Modifier
                 .fillMaxWidth()
-                .weight(1f, fill = false),
+                .weight(1f, fill = false)
+                .onGloballyPositioned {
+                    onViewport(it.positionInWindow().y, it.size.height)
+                },
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
-        items(options) { channel ->
+        itemsIndexed(options) { index, channel ->
             SelectableChannelChip(
                 label = channel,
                 isSelected = channel in selected,
+                isEntry = index == 0,
                 onToggle = { onToggle(channel) },
             )
         }
@@ -647,6 +962,7 @@ private fun ColumnScope.ChannelGrid(
 private fun SelectableChannelChip(
     label: String,
     isSelected: Boolean,
+    isEntry: Boolean,
     onToggle: () -> Unit,
 ) {
     val bg = if (isSelected) Accent.copy(alpha = 0.18f) else IconBoxBg
@@ -660,6 +976,7 @@ private fun SelectableChannelChip(
                 .clip(RoundedCornerShape(8.dp))
                 .background(bg)
                 .border(1.dp, borderColor, RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onToggle, isEntry = isEntry)
                 .pointerInput(label) {
                     detectTapGestures(onTap = { onToggle() })
                 },
@@ -675,23 +992,30 @@ private fun SelectableChannelChip(
     }
 }
 
-// Share logs button
 @Composable
-private fun ShareLogsButton(onClick: () -> Unit) {
+private fun RowScope.LogActionButton(
+    icon: ImageVector,
+    label: String,
+    accentColor: Color,
+    onClick: () -> Unit,
+    sublabel: String? = null,
+) {
     var isPressed by remember { mutableStateOf(false) }
     val scale by animateFloatAsState(
-        targetValue = if (isPressed) 0.97f else 1f,
+        targetValue = if (isPressed) 0.96f else 1f,
         animationSpec = spring(stiffness = Spring.StiffnessHigh),
-        label = "shareScale",
+        label = "logActionScale",
     )
-    Box(
+    Row(
         modifier =
             Modifier
-                .fillMaxWidth()
+                .weight(1f)
+                .fillMaxHeight()
                 .scale(scale)
                 .clip(RoundedCornerShape(12.dp))
-                .background(Accent.copy(alpha = 0.12f))
-                .border(1.dp, Accent.copy(alpha = 0.35f), RoundedCornerShape(12.dp))
+                .background(CardDark)
+                .border(1.dp, accentColor.copy(alpha = 0.22f), RoundedCornerShape(12.dp))
+                .paneNavItem(cornerRadius = 12.dp, onActivate = { onClick() }, highlightColor = NavHighlight)
                 .pointerInput(onClick) {
                     detectTapGestures(
                         onPress = {
@@ -701,23 +1025,745 @@ private fun ShareLogsButton(onClick: () -> Unit) {
                         },
                         onTap = { onClick() },
                     )
-                }.padding(vertical = 14.dp),
-        contentAlignment = Alignment.Center,
+                }.padding(horizontal = 10.dp, vertical = 7.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
     ) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
+        Box(
+            modifier =
+                Modifier
+                    .size(28.dp)
+                    .clip(RoundedCornerShape(8.dp))
+                    .background(accentColor.copy(alpha = 0.14f)),
+            contentAlignment = Alignment.Center,
+        ) {
             Icon(
-                imageVector = Icons.Outlined.Share,
+                imageVector = icon,
                 contentDescription = null,
-                tint = Accent,
+                tint = accentColor,
                 modifier = Modifier.size(16.dp),
             )
+        }
+        Spacer(Modifier.width(9.dp))
+        Column {
+            Text(
+                text = label,
+                color = TextPrimary,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+            )
+            if (sublabel != null) {
+                Text(
+                    text = sublabel,
+                    color = TextSecondary,
+                    fontSize = 10.sp,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun LogsBrowserDialog(
+    initialFiles: List<LogFileEntry>,
+    logsSize: String,
+    onReadLogFile: (LogFileEntry) -> String,
+    onShareAllLogs: () -> Unit,
+    onDownloadAllLogs: () -> String?,
+    onDeleteAllLogs: () -> Unit,
+    onShareLogFile: (LogFileEntry) -> Unit,
+    onDownloadLogFile: (LogFileEntry) -> String?,
+    onDeleteLogFile: (LogFileEntry) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    var files by remember { mutableStateOf(initialFiles) }
+    var selected by remember { mutableStateOf<LogFileEntry?>(null) }
+    var showDeleteAllConfirm by remember { mutableStateOf(false) }
+    var downloaded by remember {
+        mutableStateOf(initialFiles.filter { it.downloaded }.map { it.absolutePath }.toSet())
+    }
+    val registry = remember { PaneNavRegistry().apply { stableCursor = true } }
+    var rightStick by remember { mutableFloatStateOf(0f) }
+    LaunchedEffect(selected) { registry.reset() }
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        val dialogView = LocalView.current
+        val context = LocalContext.current
+        val showSavedToast: (String) -> Unit = { path ->
+            WinToast.show(context, context.getString(R.string.settings_debug_logs_saved, path), dialogView)
+        }
+        val logNavHandlers =
+            remember {
+                paneNavHandlers(
+                    onDismiss = { if (selected != null) selected = null else onDismiss() },
+                    onScroll = { rightStick = it },
+                ) { registry }
+            }
+        DialogPaneNav(logNavHandlers)
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+        BoxWithConstraints(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
+                    .padding(horizontal = 16.dp, vertical = 12.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            val availableHeight = maxHeight
+            Box(
+                modifier =
+                    Modifier
+                        .widthIn(max = 560.dp)
+                        .fillMaxWidth()
+                        .heightIn(max = availableHeight)
+                        .clip(RoundedCornerShape(18.dp))
+                        .background(CardDark)
+                        .border(1.dp, CardBorder, RoundedCornerShape(18.dp))
+                        .padding(horizontal = 16.dp, vertical = 14.dp),
+            ) {
+                Column(modifier = Modifier.fillMaxHeight()) {
+                    AnimatedContent(
+                        targetState = selected,
+                        transitionSpec = {
+                            val forward = targetState != null
+                            val direction =
+                                if (forward) {
+                                    AnimatedContentTransitionScope.SlideDirection.Left
+                                } else {
+                                    AnimatedContentTransitionScope.SlideDirection.Right
+                                }
+                            (slideIntoContainer(direction, tween(280)) + fadeIn(tween(280)))
+                                .togetherWith(
+                                    slideOutOfContainer(direction, tween(280)) + fadeOut(tween(280)),
+                                )
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        label = "logsBrowserNav",
+                    ) { target ->
+                        if (target == null) {
+                            LogFileListView(
+                                files = files,
+                                onOpen = { selected = it },
+                                onShareAllLogs = onShareAllLogs,
+                                onDownloadAllLogs = { onDownloadAllLogs()?.let(showSavedToast) },
+                                onDeleteAllLogs = { showDeleteAllConfirm = true },
+                                onShareLogFile = onShareLogFile,
+                                downloadedPaths = downloaded,
+                                onDownloadLogFile = { entry ->
+                                    onDownloadLogFile(entry)?.let { path ->
+                                        downloaded = downloaded + entry.absolutePath
+                                        showSavedToast(path)
+                                    }
+                                },
+                                onDeleteLogFile = { entry ->
+                                    onDeleteLogFile(entry)
+                                    files = files.filterNot { it.absolutePath == entry.absolutePath }
+                                },
+                                onClose = onDismiss,
+                            )
+                        } else {
+                            LogDetailView(
+                                entry = target,
+                                onBack = { selected = null },
+                                onClose = onDismiss,
+                                onReadLogFile = onReadLogFile,
+                                rightStick = rightStick,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+        }
+    }
+
+    if (showDeleteAllConfirm) {
+        Dialog(onDismissRequest = { showDeleteAllConfirm = false }) {
+            PopupDialog(
+                title = stringResource(R.string.settings_debug_delete_logs_confirm_title),
+                message = stringResource(R.string.settings_debug_delete_logs_confirm_message, logsSize),
+                confirmLabel = stringResource(R.string.settings_debug_delete_logs_short),
+                modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                icon = Icons.Outlined.Delete,
+                accentColor = Warning,
+                onCancel = { showDeleteAllConfirm = false },
+                onConfirm = {
+                    showDeleteAllConfirm = false
+                    onDeleteAllLogs()
+                    files = emptyList()
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun LogsHeaderShareAll(onClick: () -> Unit) {
+    var isPressed by remember { mutableStateOf(false) }
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.93f else 1f,
+        animationSpec = spring(stiffness = Spring.StiffnessHigh),
+        label = "shareAllScale",
+    )
+    Row(
+        modifier =
+            Modifier
+                .scale(scale)
+                .clip(RoundedCornerShape(8.dp))
+                .background(Color(0xFF222232))
+                .border(1.dp, Accent.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { onClick() })
+                .pointerInput(onClick) {
+                    detectTapGestures(
+                        onPress = {
+                            isPressed = true
+                            tryAwaitRelease()
+                            isPressed = false
+                        },
+                        onTap = { onClick() },
+                    )
+                }.padding(horizontal = 10.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Share,
+            contentDescription = null,
+            tint = Accent,
+            modifier = Modifier.size(14.dp),
+        )
+        Spacer(Modifier.width(6.dp))
+        Text(
+            text = stringResource(R.string.settings_debug_share_all_logs_short),
+            color = Accent,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun LogsHeaderDownloadAll(onClick: () -> Unit) {
+    var isPressed by remember { mutableStateOf(false) }
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.93f else 1f,
+        animationSpec = spring(stiffness = Spring.StiffnessHigh),
+        label = "downloadAllScale",
+    )
+    Row(
+        modifier =
+            Modifier
+                .scale(scale)
+                .clip(RoundedCornerShape(8.dp))
+                .background(Color(0xFF222232))
+                .border(1.dp, Success.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { onClick() })
+                .pointerInput(onClick) {
+                    detectTapGestures(
+                        onPress = {
+                            isPressed = true
+                            tryAwaitRelease()
+                            isPressed = false
+                        },
+                        onTap = { onClick() },
+                    )
+                }.padding(horizontal = 10.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Download,
+            contentDescription = null,
+            tint = Success,
+            modifier = Modifier.size(14.dp),
+        )
+        Spacer(Modifier.width(6.dp))
+        Text(
+            text = stringResource(R.string.settings_debug_download_all_logs_short),
+            color = Success,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun LogsHeaderDeleteAll(onClick: () -> Unit) {
+    var isPressed by remember { mutableStateOf(false) }
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.93f else 1f,
+        animationSpec = spring(stiffness = Spring.StiffnessHigh),
+        label = "deleteAllScale",
+    )
+    Row(
+        modifier =
+            Modifier
+                .scale(scale)
+                .clip(RoundedCornerShape(8.dp))
+                .background(Color(0xFF222232))
+                .border(1.dp, Warning.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { onClick() })
+                .pointerInput(onClick) {
+                    detectTapGestures(
+                        onPress = {
+                            isPressed = true
+                            tryAwaitRelease()
+                            isPressed = false
+                        },
+                        onTap = { onClick() },
+                    )
+                }.padding(horizontal = 10.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.DeleteSweep,
+            contentDescription = null,
+            tint = Warning,
+            modifier = Modifier.size(14.dp),
+        )
+        Spacer(Modifier.width(6.dp))
+        Text(
+            text = stringResource(R.string.settings_debug_delete_all_logs_short),
+            color = Warning,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun LogsHeaderIcon(
+    icon: ImageVector,
+    contentDescription: String,
+    onClick: () -> Unit,
+    tint: Color = TextSecondary,
+    iconSize: Dp = 18.dp,
+) {
+    Box(
+        modifier =
+            Modifier
+                .size(30.dp)
+                .clip(RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { onClick() })
+                .pointerInput(onClick) {
+                    detectTapGestures(onTap = { onClick() })
+                },
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = contentDescription,
+            tint = tint,
+            modifier = Modifier.size(iconSize),
+        )
+    }
+}
+
+@Composable
+private fun ColumnScope.LogFileList(
+    files: List<LogFileEntry>,
+    onOpen: (LogFileEntry) -> Unit,
+    onShare: (LogFileEntry) -> Unit,
+    downloadedPaths: Set<String>,
+    onDownload: (LogFileEntry) -> Unit,
+    onDelete: (LogFileEntry) -> Unit,
+) {
+    if (files.isEmpty()) {
+        Text(
+            text = stringResource(R.string.settings_debug_no_logs_available),
+            color = TextSecondary,
+            fontSize = 13.sp,
+            modifier = Modifier.padding(vertical = 24.dp),
+        )
+        return
+    }
+    val listState = rememberLazyListState()
+    val scope = rememberCoroutineScope()
+    val density = LocalDensity.current
+    val nav = LocalPaneNav.current
+    var viewportTop by remember { mutableStateOf(0f) }
+    var viewportHeight by remember { mutableIntStateOf(0) }
+    if (nav != null) {
+        LaunchedEffect(nav.activeRow, nav.activeCol, viewportHeight) {
+            if (!nav.controllerActive || nav.manualSelection) return@LaunchedEffect
+            val bounds = nav.activeItemBounds() ?: return@LaunchedEffect
+            val rowH = bounds.second - bounds.first
+            val margin = (rowH * 2f + with(density) { 12.dp.toPx() }).coerceAtMost(viewportHeight * 0.4f)
+            val vpBottom = viewportTop + viewportHeight
+            val delta = when {
+                bounds.second + margin > vpBottom -> bounds.second + margin - vpBottom
+                bounds.first - margin < viewportTop -> bounds.first - margin - viewportTop
+                else -> 0f
+            }
+            if (delta != 0f) runCatching { listState.animateScrollBy(delta) }
+        }
+        SideEffect {
+            val rowStep: () -> Float = {
+                val b = nav.activeItemBounds()
+                if (b != null) (b.second - b.first) + with(density) { 8.dp.toPx() } else viewportHeight * 0.3f
+            }
+            nav.onEdgeDown = {
+                if (listState.canScrollForward) scope.launch { runCatching { listState.animateScrollBy(rowStep()) } }
+            }
+            nav.onEdgeUp = {
+                if (listState.canScrollBackward) scope.launch { runCatching { listState.animateScrollBy(-rowStep()) } }
+            }
+        }
+    }
+    LazyColumn(
+        state = listState,
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .weight(1f, fill = false)
+                .onGloballyPositioned {
+                    viewportTop = it.positionInWindow().y
+                    viewportHeight = it.size.height
+                },
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        items(files, key = { it.absolutePath }) { entry ->
+            LogFileRow(
+                entry = entry,
+                onOpen = { onOpen(entry) },
+                onShare = { onShare(entry) },
+                isDownloaded = entry.absolutePath in downloadedPaths,
+                onDownload = { onDownload(entry) },
+                onDelete = { onDelete(entry) },
+            )
+        }
+    }
+}
+
+@Composable
+private fun LogFileRow(
+    entry: LogFileEntry,
+    onOpen: () -> Unit,
+    onShare: () -> Unit,
+    isDownloaded: Boolean,
+    onDownload: () -> Unit,
+    onDelete: () -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(10.dp))
+                .background(IconBoxBg)
+                .border(1.dp, CardBorder, RoundedCornerShape(10.dp))
+                .padding(horizontal = 12.dp, vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .weight(1f)
+                    .clip(RoundedCornerShape(8.dp))
+                    .paneNavItem(cornerRadius = 8.dp, onActivate = { onOpen() })
+                    .pointerInput(entry.absolutePath) {
+                        detectTapGestures(onTap = { onOpen() })
+                    }.padding(horizontal = 4.dp, vertical = 2.dp),
+        ) {
+            Text(
+                text = entry.name,
+                color = TextPrimary,
+                fontSize = 13.sp,
+                fontWeight = FontWeight.Medium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                text = "${entry.sizeText} · ${entry.dateText}",
+                color = TextSecondary,
+                fontSize = 11.sp,
+            )
+        }
+        Spacer(Modifier.width(10.dp))
+        LogRowIconButton(
+            icon = Icons.Outlined.Delete,
+            tint = Warning,
+            contentDescription = stringResource(R.string.settings_debug_delete_logs),
+            onClick = onDelete,
+        )
+        Spacer(Modifier.width(12.dp))
+        LogRowIconButton(
+            icon = Icons.Outlined.Share,
+            tint = Accent,
+            contentDescription = stringResource(R.string.settings_debug_share_logs),
+            onClick = onShare,
+        )
+        Spacer(Modifier.width(12.dp))
+        LogRowIconButton(
+            icon = Icons.Outlined.Download,
+            tint = Success,
+            contentDescription = stringResource(R.string.settings_debug_download_logs),
+            onClick = onDownload,
+            filled = isDownloaded,
+        )
+    }
+}
+
+@Composable
+private fun LogRowIconButton(
+    icon: ImageVector,
+    tint: Color,
+    contentDescription: String,
+    onClick: () -> Unit,
+    filled: Boolean = false,
+) {
+    val shape = RoundedCornerShape(10.dp)
+    val fillBrush =
+        if (filled) {
+            Brush.verticalGradient(listOf(tint.copy(alpha = 0.34f), tint.copy(alpha = 0.14f)))
+        } else {
+            SolidColor(Color(0xFF222232))
+        }
+    Box(
+        modifier =
+            Modifier
+                .size(40.dp)
+                .clip(shape)
+                .background(fillBrush, shape)
+                .border(1.dp, tint.copy(alpha = if (filled) 0.65f else 0.30f), shape)
+                .paneNavItem(cornerRadius = 8.dp, onActivate = { onClick() })
+                .pointerInput(onClick) {
+                    detectTapGestures(onTap = { onClick() })
+                },
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = contentDescription,
+            tint = tint,
+            modifier = Modifier.size(22.dp),
+        )
+    }
+}
+
+@Composable
+private fun LogFileListView(
+    files: List<LogFileEntry>,
+    onOpen: (LogFileEntry) -> Unit,
+    onShareAllLogs: () -> Unit,
+    onDownloadAllLogs: () -> Unit,
+    onDeleteAllLogs: () -> Unit,
+    onShareLogFile: (LogFileEntry) -> Unit,
+    downloadedPaths: Set<String>,
+    onDownloadLogFile: (LogFileEntry) -> Unit,
+    onDeleteLogFile: (LogFileEntry) -> Unit,
+    onClose: () -> Unit,
+) {
+    Column(modifier = Modifier.fillMaxSize()) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                text = stringResource(R.string.settings_debug_logs_browser_title),
+                color = TextPrimary,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f),
+            )
+            LogsHeaderDeleteAll(onClick = onDeleteAllLogs)
+            Spacer(Modifier.width(16.dp))
+            LogsHeaderShareAll(onClick = onShareAllLogs)
+            Spacer(Modifier.width(16.dp))
+            LogsHeaderDownloadAll(onClick = onDownloadAllLogs)
             Spacer(Modifier.width(8.dp))
+            LogsHeaderIcon(
+                icon = Icons.Outlined.Close,
+                contentDescription = stringResource(R.string.common_ui_close),
+                onClick = onClose,
+                tint = TextPrimary,
+                iconSize = 22.dp,
+            )
+        }
+        Spacer(Modifier.height(12.dp))
+        LogFileList(
+            files = files,
+            onOpen = onOpen,
+            onShare = onShareLogFile,
+            downloadedPaths = downloadedPaths,
+            onDownload = onDownloadLogFile,
+            onDelete = onDeleteLogFile,
+        )
+    }
+}
+
+@Composable
+private fun LogDetailView(
+    entry: LogFileEntry,
+    onBack: () -> Unit,
+    onClose: () -> Unit,
+    onReadLogFile: (LogFileEntry) -> String,
+    rightStick: Float,
+) {
+    var content by remember(entry.absolutePath) { mutableStateOf<String?>(null) }
+    LaunchedEffect(entry.absolutePath) {
+        content = withContext(Dispatchers.IO) { onReadLogFile(entry) }
+    }
+    val titleAlpha by animateFloatAsState(
+        targetValue = if (content != null) 1f else 0f,
+        animationSpec = tween(durationMillis = 320),
+        label = "logTitleFade",
+    )
+    Column(modifier = Modifier.fillMaxSize()) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            LogsHeaderIcon(
+                icon = Icons.AutoMirrored.Outlined.ArrowBack,
+                contentDescription = stringResource(R.string.common_ui_back),
+                onClick = onBack,
+            )
+            Spacer(Modifier.width(6.dp))
             Text(
-                text = stringResource(R.string.settings_debug_share_logs),
-                color = Accent,
-                fontSize = 14.sp,
+                text = entry.name,
+                color = TextPrimary,
+                fontSize = 16.sp,
                 fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier =
+                    Modifier
+                        .weight(1f)
+                        .alpha(titleAlpha),
+            )
+            Spacer(Modifier.width(6.dp))
+            LogsHeaderIcon(
+                icon = Icons.Outlined.Close,
+                contentDescription = stringResource(R.string.common_ui_close),
+                onClick = onClose,
+                tint = TextPrimary,
+                iconSize = 22.dp,
             )
         }
+        Spacer(Modifier.height(12.dp))
+        LogContentBody(
+            content = content,
+            entry = entry,
+            rightStick = rightStick,
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .weight(1f),
+        )
     }
 }
+
+@Composable
+private fun LogContentBody(
+    content: String?,
+    entry: LogFileEntry,
+    rightStick: Float,
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier) {
+        AnimatedVisibility(
+            visible = content == null,
+            enter = fadeIn(),
+            exit = fadeOut(),
+            modifier = Modifier.align(Alignment.Center),
+        ) {
+            CircularProgressIndicator(
+                color = Accent,
+                strokeWidth = 3.dp,
+                modifier = Modifier.size(40.dp),
+            )
+        }
+        AnimatedVisibility(
+            visible = content != null,
+            enter = fadeIn(animationSpec = tween(durationMillis = 320)),
+            exit = fadeOut(),
+            modifier = Modifier.fillMaxSize(),
+        ) {
+            Column(modifier = Modifier.fillMaxSize()) {
+                Text(
+                    text = "${entry.sizeText} · ${entry.dateText}",
+                    color = TextSecondary,
+                    fontSize = 11.sp,
+                    modifier = Modifier.padding(bottom = 8.dp),
+                )
+                val logScrollState = rememberScrollState()
+                LaunchedEffect(rightStick) {
+                    if (rightStick == 0f) return@LaunchedEffect
+                    while (true) {
+                        logScrollState.scrollBy(rightStick * 26f)
+                        withFrameNanos { }
+                    }
+                }
+                val scrollbarAlpha by animateFloatAsState(
+                    targetValue = if (logScrollState.isScrollInProgress) 1f else 0f,
+                    animationSpec =
+                        tween(
+                            durationMillis = if (logScrollState.isScrollInProgress) 150 else 500,
+                            delayMillis = if (logScrollState.isScrollInProgress) 0 else 300,
+                        ),
+                    label = "scrollbarAlpha",
+                )
+                Box(
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .weight(1f)
+                            .clip(RoundedCornerShape(10.dp))
+                            .background(SurfaceDark)
+                            .border(1.dp, CardBorder, RoundedCornerShape(10.dp))
+                            .verticalScrollbar(logScrollState, TextSecondary.copy(alpha = 0.6f)) { scrollbarAlpha }
+                            .padding(10.dp)
+                            .verticalScroll(logScrollState),
+                ) {
+                    SelectionContainer {
+                        Text(
+                            text = content.orEmpty(),
+                            color = TextPrimary,
+                            fontSize = 11.sp,
+                            fontFamily = FontFamily.Monospace,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private fun Modifier.verticalScrollbar(
+    scrollState: ScrollState,
+    thumbColor: Color,
+    width: Dp = 3.dp,
+    minThumbHeight: Dp = 24.dp,
+    edgePadding: Dp = 5.dp,
+    alpha: () -> Float = { 1f },
+): Modifier =
+    drawWithContent {
+        drawContent()
+        val thumbAlpha = alpha().coerceIn(0f, 1f)
+        val maxValue = scrollState.maxValue
+        if (maxValue <= 0 || thumbAlpha <= 0f) return@drawWithContent
+        val widthPx = width.toPx()
+        val padPx = edgePadding.toPx()
+        val viewportHeight = size.height
+        val trackHeight = (viewportHeight - 2 * padPx).coerceAtLeast(0f)
+        val contentHeight = viewportHeight + maxValue
+        val thumbHeight =
+            (trackHeight * (viewportHeight / contentHeight))
+                .coerceIn(minThumbHeight.toPx().coerceAtMost(trackHeight), trackHeight)
+        val thumbOffsetY = padPx + (scrollState.value.toFloat() / maxValue) * (trackHeight - thumbHeight)
+        drawRoundRect(
+            color = thumbColor,
+            topLeft = Offset(size.width - widthPx - padPx, thumbOffsetY),
+            size = Size(widthPx, thumbHeight),
+            cornerRadius = CornerRadius(widthPx / 2f, widthPx / 2f),
+            alpha = thumbAlpha,
+        )
+    }
diff --git a/app/src/main/feature/settings/drivers/DXVKConfigUtils.java b/app/src/main/feature/settings/drivers/DXVKConfigUtils.java
index 1df8367a2..3151c21d1 100644
--- a/app/src/main/feature/settings/drivers/DXVKConfigUtils.java
+++ b/app/src/main/feature/settings/drivers/DXVKConfigUtils.java
@@ -19,20 +19,6 @@ public static KeyValueSet parseConfig(Object config) {
     }
 
     public static void setEnvVars(Context context, KeyValueSet config, EnvVars envVars) {
-        setEnvVars(context, config, envVars, 0);
-    }
-
-    public static void setEnvVars(Context context, KeyValueSet config, EnvVars envVars, int refreshRateOverride) {
-        String content = "";
-
-        if (refreshRateOverride > 0) {
-            String rateStr = String.valueOf(refreshRateOverride);
-            content += "dxgi.syncInterval = 0; ";
-            content += "dxgi.maxFrameRate = " + rateStr + "; ";
-            content += "d3d9.maxFrameRate = " + rateStr;
-            envVars.put("DXVK_FRAME_RATE", rateStr);
-        }
-
         String async = config.get("async");
         if (!async.isEmpty() && !async.equals("0")) {
             envVars.put("DXVK_ASYNC", "1");
@@ -43,10 +29,6 @@ public static void setEnvVars(Context context, KeyValueSet config, EnvVars envVa
             envVars.put("DXVK_GPLASYNCCACHE", "1");
         }
 
-        if (!content.isEmpty()) {
-            envVars.put("DXVK_CONFIG", content);
-        }
-
         envVars.put("VKD3D_FEATURE_LEVEL", config.get("vkd3dLevel"));
         envVars.put("DXVK_STATE_CACHE_PATH", context.getFilesDir() + "/imagefs/" + ImageFs.CACHE_PATH);
     }
diff --git a/app/src/main/feature/settings/drivers/DriversFragment.kt b/app/src/main/feature/settings/drivers/DriversFragment.kt
index 5611f3f7c..03916cf00 100644
--- a/app/src/main/feature/settings/drivers/DriversFragment.kt
+++ b/app/src/main/feature/settings/drivers/DriversFragment.kt
@@ -18,6 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.feature.setup.SetupWizardActivity
 import com.winlator.cmod.runtime.content.AdrenotoolsManager
 import com.winlator.cmod.runtime.content.Downloader
@@ -127,6 +128,7 @@ class DriversFragment : Fragment() {
                             }
                         },
                         onRestoreDefaultRepos = { restoreDefaultRepos() },
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                     )
                 }
             }
@@ -187,19 +189,9 @@ class DriversFragment : Fragment() {
     private fun defaultRepoList(): List<DriverRepo> =
         listOf(
             DriverRepo(
-                name = WINNATIVE_DRIVERS_REPO_NAME,
-                repoUrl = WINNATIVE_DRIVERS_REPO_URL,
-                apiUrl = WINNATIVE_DRIVERS_API_URL,
-            ),
-            DriverRepo(
-                name = STEVEN_REPO_NAME,
-                repoUrl = STEVEN_REPO_URL,
-                apiUrl = STEVEN_API_URL,
-            ),
-            DriverRepo(
-                name = WHITEBELYASH_REPO_NAME,
-                repoUrl = WHITEBELYASH_REPO_URL,
-                apiUrl = WHITEBELYASH_API_URL,
+                name = WINNATIVE_COMPONENTS_REPO_NAME,
+                repoUrl = WINNATIVE_COMPONENTS_REPO_URL,
+                apiUrl = WINNATIVE_COMPONENTS_API_URL,
             ),
         )
 
@@ -322,8 +314,28 @@ class DriversFragment : Fragment() {
     }
 
     private fun fetchGithubReleases(source: DriverRepo): List<DriverReleaseItem> {
+        if (!source.apiUrl.contains("api.github.com")) {
+            return fetchReleasePage(source.apiUrl).second
+        }
+
+        val perPage = 100
+        val maxPages = 2
+        val items = mutableListOf<DriverReleaseItem>()
+        var page = 1
+        while (page <= maxPages) {
+            val separator = if (source.apiUrl.contains("?")) "&" else "?"
+            val pageUrl = "${source.apiUrl}${separator}per_page=$perPage&page=$page"
+            val (rawCount, pageItems) = fetchReleasePage(pageUrl)
+            items += pageItems
+            if (rawCount < perPage) break
+            page++
+        }
+        return items
+    }
+
+    private fun fetchReleasePage(apiUrl: String): Pair<Int, List<DriverReleaseItem>> {
         val connection =
-            (URL(source.apiUrl).openConnection() as HttpURLConnection).apply {
+            (URL(apiUrl).openConnection() as HttpURLConnection).apply {
                 requestMethod = "GET"
                 connectTimeout = 15000
                 readTimeout = 15000
@@ -333,7 +345,7 @@ class DriversFragment : Fragment() {
 
         return connection.useResponse { responseText ->
             val json = JSONArray(responseText)
-            buildList {
+            val parsed = buildList {
                 for (index in 0 until json.length()) {
                     val releaseObject = json.optJSONObject(index) ?: continue
                     val assets = releaseObject.optJSONArray("assets").toZipAssets()
@@ -355,6 +367,7 @@ class DriversFragment : Fragment() {
                     )
                 }
             }
+            json.length() to parsed
         }
     }
 
@@ -363,9 +376,9 @@ class DriversFragment : Fragment() {
         return buildList {
             for (index in 0 until length()) {
                 val assetObject = optJSONObject(index) ?: continue
-                val assetName = assetObject.optString("name")
+                val assetName = assetObject.optString("name").trim()
                 val downloadUrl = assetObject.optString("browser_download_url")
-                if (!assetName.lowercase(Locale.getDefault()).endsWith(".zip") || downloadUrl.isBlank()) continue
+                if (!assetName.lowercase(Locale.ROOT).endsWith(".zip") || downloadUrl.isBlank()) continue
 
                 add(
                     DriverAssetItem(
@@ -453,6 +466,11 @@ class DriversFragment : Fragment() {
             )
         publishState()
 
+        // Hold the app process alive across this download so screen lock can't
+        // interrupt it. installDriverPackage owns its own keep-alive scope.
+        val keepAliveTag = "drivers_download_${asset.downloadUrl}"
+        val appCtx = requireContext().applicationContext
+        com.winlator.cmod.runtime.system.SessionKeepAliveService.startDownload(appCtx, keepAliveTag)
         viewLifecycleOwner.lifecycleScope.launch {
             val output = File(requireContext().cacheDir, "driver_${System.currentTimeMillis()}.zip")
             val success =
@@ -482,24 +500,28 @@ class DriversFragment : Fragment() {
                     }
                 }
 
-            if (!isAdded || view == null) {
-                output.delete()
-                clearDownloadProgress()
-                return@launch
-            }
+            try {
+                if (!isAdded || view == null) {
+                    output.delete()
+                    clearDownloadProgress()
+                    return@launch
+                }
 
-            if (!success) {
-                output.delete()
-                clearDownloadProgress()
-                WinToast.show(requireContext(), R.string.settings_drivers_repo_download_failed)
-                return@launch
-            }
+                if (!success) {
+                    output.delete()
+                    clearDownloadProgress()
+                    WinToast.show(requireContext(), R.string.settings_drivers_repo_download_failed)
+                    return@launch
+                }
 
-            installDriverPackage(
-                uri = Uri.fromFile(output),
-                sourceAssetName = asset.name,
-                onComplete = { output.delete() },
-            )
+                installDriverPackage(
+                    uri = Uri.fromFile(output),
+                    sourceAssetName = asset.name,
+                    onComplete = { output.delete() },
+                )
+            } finally {
+                com.winlator.cmod.runtime.system.SessionKeepAliveService.stopDownload(appCtx, keepAliveTag)
+            }
         }
     }
 
@@ -518,31 +540,40 @@ class DriversFragment : Fragment() {
             ),
         )
 
+        // Keep the process alive across the install (driver extraction +
+        // move). Released after the lifecycleScope coroutine finishes.
+        val installKeepAliveTag = "drivers_install_${sourceAssetName ?: uri}"
+        val appCtx = requireContext().applicationContext
+        com.winlator.cmod.runtime.system.SessionKeepAliveService.startDownload(appCtx, installKeepAliveTag)
         viewLifecycleOwner.lifecycleScope.launch {
-            val installedDriverId =
-                withContext(Dispatchers.IO) {
-                    runCatching {
-                        adrenotoolsManager.installDriver(uri, sourceAssetName)
-                    }.getOrDefault("")
+            try {
+                val installedDriverId =
+                    withContext(Dispatchers.IO) {
+                        runCatching {
+                            adrenotoolsManager.installDriver(uri, sourceAssetName)
+                        }.getOrDefault("")
+                    }
+
+                if (!isAdded || view == null) {
+                    clearDownloadProgress()
+                    onComplete?.invoke()
+                    return@launch
                 }
 
-            if (!isAdded || view == null) {
                 clearDownloadProgress()
                 onComplete?.invoke()
-                return@launch
-            }
 
-            clearDownloadProgress()
-            onComplete?.invoke()
+                if (installedDriverId.isBlank()) {
+                    WinToast.show(requireContext(), R.string.settings_drivers_install_failed)
+                    return@launch
+                }
 
-            if (installedDriverId.isBlank()) {
-                WinToast.show(requireContext(), R.string.settings_drivers_install_failed)
-                return@launch
+                SetupWizardActivity.recordInstalledDriver(requireContext(), installedDriverId)
+                refreshInstalledDrivers()
+                publishState()
+            } finally {
+                com.winlator.cmod.runtime.system.SessionKeepAliveService.stopDownload(appCtx, installKeepAliveTag)
             }
-
-            SetupWizardActivity.recordInstalledDriver(requireContext(), installedDriverId)
-            refreshInstalledDrivers()
-            publishState()
         }
     }
 
@@ -557,17 +588,9 @@ class DriversFragment : Fragment() {
     }
 
     companion object {
-        private const val WINNATIVE_DRIVERS_REPO_NAME = "WinNative Turnip Drivers"
-        private const val WINNATIVE_DRIVERS_REPO_URL = "https://github.com/WinNative-Emu/Drivers/releases"
-        private const val WINNATIVE_DRIVERS_API_URL = "https://api.github.com/repos/WinNative-Emu/Drivers/releases"
-
-        private const val STEVEN_REPO_NAME = "StevenMXZ/Adreno-Tools-Drivers"
-        private const val STEVEN_REPO_URL = "https://github.com/StevenMXZ/Adreno-Tools-Drivers/releases"
-        private const val STEVEN_API_URL = "https://api.github.com/repos/StevenMXZ/Adreno-Tools-Drivers/releases"
-
-        private const val WHITEBELYASH_REPO_NAME = "whitebelyash/freedreno_turnip-CI"
-        private const val WHITEBELYASH_REPO_URL = "https://github.com/whitebelyash/freedreno_turnip-CI/releases"
-        private const val WHITEBELYASH_API_URL = "https://api.github.com/repos/whitebelyash/freedreno_turnip-CI/releases"
+        private const val WINNATIVE_COMPONENTS_REPO_NAME = "WinNative Components"
+        private const val WINNATIVE_COMPONENTS_REPO_URL = "https://github.com/nicholasx417/WinNative-Components/releases"
+        private const val WINNATIVE_COMPONENTS_API_URL = "https://api.github.com/repos/nicholasx417/WinNative-Components/releases"
     }
 }
 
diff --git a/app/src/main/feature/settings/drivers/DriversScreen.kt b/app/src/main/feature/settings/drivers/DriversScreen.kt
index 17ae477ee..ebadf17d6 100644
--- a/app/src/main/feature/settings/drivers/DriversScreen.kt
+++ b/app/src/main/feature/settings/drivers/DriversScreen.kt
@@ -12,14 +12,10 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -64,10 +60,11 @@ import androidx.compose.material.icons.outlined.Upload
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
-import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -89,14 +86,23 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardDarker = Color(0xFF15151E)
 private val CardBorder = Color(0xFF2A2A3A)
 private val IconBoxBg = Color(0xFF242434)
-private val SurfaceDark = Color(0xFF21212A)
 private val Accent = Color(0xFF1A9FFF)
+private val NavHighlight = Color(0xFF4FC3F7)
 private val SuccessGreen = Color(0xFF5BD68F)
 private val DangerRed = Color(0xFFFF7A88)
 private val TextPrimary = Color(0xFFD6DAE0)
@@ -184,6 +190,7 @@ fun DriversScreen(
     onRepoUpdated: (index: Int, name: String, apiUrl: String) -> Unit,
     onRepoDeleted: (index: Int) -> Unit,
     onRestoreDefaultRepos: () -> Unit,
+    bridge: SettingsNavBridge? = null,
 ) {
     var showAddRepoDialog by remember { mutableStateOf(false) }
     var editingRepo by remember { mutableStateOf<Pair<Int, DriverRepo>?>(null) }
@@ -194,6 +201,7 @@ fun DriversScreen(
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
+    val contentNav = rememberSettingsContentNav(bridge)
 
     if (showAddRepoDialog || editingRepo != null) {
         val editing = editingRepo
@@ -216,86 +224,94 @@ fun DriversScreen(
     }
 
     driverPendingRemoval?.let { driver ->
-        ConfirmDialog(
-            title = "Remove driver?",
-            message = stringResource(R.string.settings_drivers_confirm_remove),
-            confirmLabel = "Remove",
-            confirmColor = DangerRed,
-            onDismiss = { driverPendingRemoval = null },
-            onConfirm = {
-                onRemoveDriver(driver)
-                driverPendingRemoval = null
-            },
-        )
+        val nav = remember { PaneNavRegistry() }
+        Dialog(onDismissRequest = { driverPendingRemoval = null }) {
+            DialogPaneNav(nav, onDismiss = { driverPendingRemoval = null })
+            CompositionLocalProvider(LocalPaneNav provides nav) {
+                PopupDialog(
+                    title = stringResource(R.string.settings_drivers_remove_title),
+                    message = stringResource(R.string.settings_drivers_confirm_remove),
+                    confirmLabel = stringResource(R.string.common_ui_remove),
+                    modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                    icon = Icons.Outlined.Delete,
+                    accentColor = DangerRed,
+                    onCancel = { driverPendingRemoval = null },
+                    onConfirm = {
+                        onRemoveDriver(driver)
+                        driverPendingRemoval = null
+                    },
+                )
+            }
+        }
     }
 
     repoPendingRemoval?.let { (index, repo) ->
-        ConfirmDialog(
-            title = "Remove repository?",
-            message = "Are you sure you want to remove ${repo.name}?",
-            confirmLabel = "Remove",
-            confirmColor = DangerRed,
-            onDismiss = { repoPendingRemoval = null },
-            onConfirm = {
-                onRepoDeleted(index)
-                repoPendingRemoval = null
-            },
-        )
+        val nav = remember { PaneNavRegistry() }
+        Dialog(onDismissRequest = { repoPendingRemoval = null }) {
+            DialogPaneNav(nav, onDismiss = { repoPendingRemoval = null })
+            CompositionLocalProvider(LocalPaneNav provides nav) {
+                PopupDialog(
+                    title = stringResource(R.string.settings_drivers_remove_repo_title),
+                    message = stringResource(R.string.settings_drivers_remove_repo_message, repo.name),
+                    confirmLabel = stringResource(R.string.common_ui_remove),
+                    modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                    icon = Icons.Outlined.Delete,
+                    accentColor = DangerRed,
+                    onCancel = { repoPendingRemoval = null },
+                    onConfirm = {
+                        onRepoDeleted(index)
+                        repoPendingRemoval = null
+                    },
+                )
+            }
+        }
     }
 
     state.downloadProgress?.let { progress ->
         DownloadProgressDialog(progress = progress)
     }
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                end = 16.dp + navBarEndPadding,
-                top = 16.dp,
-                bottom = 4.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item(key = "hero_header") {
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        end = 16.dp + navBarEndPadding,
+                        top = 16.dp,
+                        bottom = 4.dp + navBarBottomPadding,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
             HeroHeader(
                 installedCount = state.installedDrivers.size,
                 repoCount = state.sources.size,
                 onInstall = onInstallFromFile,
                 onAddRepo = { showAddRepoDialog = true },
             )
-        }
 
-        item(key = "empty_state") {
             if (state.installedDrivers.isEmpty() && state.sources.isEmpty()) {
                 EmptyState()
             }
-        }
 
-        if (state.installedDrivers.isNotEmpty()) {
-            item(key = "installed_section") {
+            if (state.installedDrivers.isNotEmpty()) {
                 SectionLabel(
                     text = stringResource(R.string.common_ui_installed),
                     modifier = Modifier.padding(top = 4.dp),
                 )
+                state.installedDrivers.forEach { driver ->
+                    key(driver.id) {
+                        InstalledDriverCard(
+                            driver = driver,
+                            onRemove = { driverPendingRemoval = driver },
+                        )
+                    }
+                }
             }
-            items(
-                items = state.installedDrivers,
-                key = { driver -> driver.id },
-                contentType = { "installedDriverCard" },
-            ) { driver ->
-                InstalledDriverCard(
-                    driver = driver,
-                    onRemove = { driverPendingRemoval = driver },
-                )
-            }
-        }
 
-        item(key = "repos_header") {
             Row(
                 modifier =
                     Modifier
@@ -316,46 +332,38 @@ fun DriversScreen(
                     )
                 }
             }
-        }
 
-        if (state.sources.isEmpty()) {
-            item(key = "repos_empty") {
+            if (state.sources.isEmpty()) {
                 EmptyRepoCard()
+            } else {
+                state.sources.forEachIndexed { index, source ->
+                    key(source.apiUrl) {
+                        val releases = state.releasesBySource[source.apiUrl].orEmpty()
+                        val isExpanded = state.expandedSourceApiUrl == source.apiUrl
+                        val isLoading = state.loadingSourceApiUrl == source.apiUrl
+                        RepoCard(
+                            source = source,
+                            isExpanded = isExpanded,
+                            isLoading = isLoading,
+                            releases = releases,
+                            expandedReleaseId = state.expandedReleaseId,
+                            installedAssetNames = state.installedAssetNames,
+                            onTap = { onSourceTapped(source) },
+                            onReleaseTap = onReleaseTapped,
+                            onDownloadAsset = onDownloadAsset,
+                            onEdit = { editingRepo = index to source },
+                            onDelete = { repoPendingRemoval = index to source },
+                        )
+                    }
+                }
             }
-        } else {
-            itemsIndexed(
-                items = state.sources,
-                key = { _, source -> source.apiUrl },
-                contentType = { _, _ -> "repoCard" },
-            ) { index, source ->
-                val releases = state.releasesBySource[source.apiUrl].orEmpty()
-                val isExpanded = state.expandedSourceApiUrl == source.apiUrl
-                val isLoading = state.loadingSourceApiUrl == source.apiUrl
-                RepoCard(
-                    source = source,
-                    isExpanded = isExpanded,
-                    isLoading = isLoading,
-                    releases = releases,
-                    expandedReleaseId = state.expandedReleaseId,
-                    installedAssetNames = state.installedAssetNames,
-                    onTap = { onSourceTapped(source) },
-                    onReleaseTap = onReleaseTapped,
-                    onDownloadAsset = onDownloadAsset,
-                    onEdit = { editingRepo = index to source },
-                    onDelete = { repoPendingRemoval = index to source },
-                )
-            }
-        }
 
-        item(key = "bottom_spacer") {
             Spacer(Modifier.height(24.dp))
         }
     }
 }
 
-// ============================================================================
 // Hero header
-// ============================================================================
 
 @Composable
 private fun HeroHeader(
@@ -522,7 +530,12 @@ private fun HeroButton(
                 .clip(RoundedCornerShape(9.dp))
                 .background(Accent.copy(alpha = 0.12f))
                 .border(1.dp, Accent.copy(alpha = 0.32f), RoundedCornerShape(9.dp))
-                .noRippleClickable(onClick = onClick)
+                .paneNavItem(
+                    cornerRadius = 9.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .height(30.dp)
                 .padding(horizontal = 8.dp),
         contentAlignment = Alignment.Center,
@@ -547,9 +560,7 @@ private fun HeroButton(
     }
 }
 
-// ============================================================================
 // Section label
-// ============================================================================
 
 @Composable
 private fun SectionLabel(
@@ -566,9 +577,7 @@ private fun SectionLabel(
     )
 }
 
-// ============================================================================
 // Installed driver card
-// ============================================================================
 
 @Composable
 private fun InstalledDriverCard(
@@ -666,9 +675,7 @@ private fun InstalledDriverCard(
     }
 }
 
-// ============================================================================
 // Repo card with inline expandable releases
-// ============================================================================
 
 @Composable
 private fun RepoCard(
@@ -706,7 +713,12 @@ private fun RepoCard(
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .noRippleClickable(enabled = !isLoading, onClick = onTap)
+                        .paneNavItem(
+                            cornerRadius = 12.dp,
+                            onActivate = { if (!isLoading) onTap() },
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
                         .padding(horizontal = 14.dp, vertical = 11.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
@@ -877,9 +889,7 @@ private fun LoadingPlaceholder() {
     )
 }
 
-// ============================================================================
 // Release card with expandable notes + assets
-// ============================================================================
 
 @Composable
 private fun ReleaseCard(
@@ -908,7 +918,12 @@ private fun ReleaseCard(
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .noRippleClickable(onClick = onTap)
+                        .paneNavItem(
+                            cornerRadius = 10.dp,
+                            onActivate = onTap,
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
                         .padding(horizontal = 12.dp, vertical = 10.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
@@ -1013,7 +1028,7 @@ private fun AssetRow(
             Modifier
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(8.dp))
-                .background(SurfaceDark)
+                .background(IconBoxBg)
                 .border(1.dp, CardBorder, RoundedCornerShape(8.dp))
                 .padding(horizontal = 12.dp, vertical = 9.dp),
         verticalAlignment = Alignment.CenterVertically,
@@ -1050,6 +1065,7 @@ private fun AssetRow(
                 label = "Download",
                 icon = Icons.Outlined.Download,
                 tint = Accent,
+                compact = true,
                 onClick = onDownload,
             )
         }
@@ -1067,28 +1083,26 @@ private fun InstalledPill() {
                 .clip(RoundedCornerShape(8.dp))
                 .background(SuccessGreen.copy(alpha = 0.14f))
                 .border(1.dp, SuccessGreen.copy(alpha = 0.35f), RoundedCornerShape(8.dp))
-                .padding(horizontal = 10.dp, vertical = 6.dp),
+                .padding(horizontal = 8.dp, vertical = 4.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
             imageVector = Icons.Outlined.Check,
             contentDescription = null,
             tint = SuccessGreen,
-            modifier = Modifier.size(12.dp),
+            modifier = Modifier.size(11.dp),
         )
         Spacer(Modifier.width(5.dp))
         Text(
             text = "Installed",
             color = SuccessGreen,
-            fontSize = 11.sp,
+            fontSize = 10.sp,
             fontWeight = FontWeight.SemiBold,
         )
     }
 }
 
-// ============================================================================
 // Generic small controls
-// ============================================================================
 
 @Composable
 private fun IconTapButton(
@@ -1101,7 +1115,12 @@ private fun IconTapButton(
             Modifier
                 .size(30.dp)
                 .clip(RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onClick),
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                ),
         contentAlignment = Alignment.Center,
     ) {
         Icon(
@@ -1120,20 +1139,36 @@ private fun SmallPillButton(
     tint: Color,
     onClick: () -> Unit,
     enabled: Boolean = true,
+    compact: Boolean = false,
 ) {
     // When disabled, swap the accent tint for the muted secondary color so the pill
     // visibly greys out, and drop the click target so taps are ignored.
     val effectiveTint = if (enabled) tint else TextSecondary.copy(alpha = 0.55f)
     val borderColor = if (enabled) tint.copy(alpha = 0.3f) else CardBorder
     val background = if (enabled) tint.copy(alpha = 0.14f) else CardDarker
+    val horizontalPadding = if (compact) 8.dp else 10.dp
+    val verticalPadding = if (compact) 4.dp else 6.dp
+    val iconSize = if (compact) 11.dp else 12.dp
+    val labelSize = if (compact) 10.sp else 11.sp
     Row(
         modifier =
             Modifier
                 .clip(RoundedCornerShape(8.dp))
                 .background(background)
                 .border(1.dp, borderColor, RoundedCornerShape(8.dp))
-                .then(if (enabled) Modifier.noRippleClickable(onClick = onClick) else Modifier)
-                .padding(horizontal = 10.dp, vertical = 6.dp),
+                .then(
+                    if (enabled) {
+                        Modifier.paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = onClick,
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
+                    } else {
+                        Modifier
+                    },
+                )
+                .padding(horizontal = horizontalPadding, vertical = verticalPadding),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         if (icon != null) {
@@ -1141,14 +1176,14 @@ private fun SmallPillButton(
                 imageVector = icon,
                 contentDescription = null,
                 tint = effectiveTint,
-                modifier = Modifier.size(12.dp),
+                modifier = Modifier.size(iconSize),
             )
             Spacer(Modifier.width(5.dp))
         }
         Text(
             text = label,
             color = effectiveTint,
-            fontSize = 11.sp,
+            fontSize = labelSize,
             fontWeight = FontWeight.SemiBold,
         )
     }
@@ -1160,13 +1195,27 @@ private fun DialogActionButton(
     textColor: Color,
     onClick: () -> Unit,
 ) {
+    val nav = LocalPaneNav.current
+    val clickModifier =
+        if (nav != null) {
+            Modifier.paneNavItem(
+                cornerRadius = 8.dp,
+                onActivate = onClick,
+                highlightColor = NavHighlight,
+                tapToSelect = true,
+            )
+        } else {
+            Modifier
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, highlightColor = NavHighlight)
+                .noRippleClickable(onClick = onClick)
+        }
     Box(
         modifier =
             Modifier
                 .clip(RoundedCornerShape(8.dp))
                 .background(CardDarker)
                 .border(1.dp, textColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onClick)
+                .then(clickModifier)
                 .padding(horizontal = 14.dp, vertical = 8.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -1179,9 +1228,7 @@ private fun DialogActionButton(
     }
 }
 
-// ============================================================================
 // Empty state
-// ============================================================================
 
 @Composable
 private fun EmptyRepoCard() {
@@ -1268,54 +1315,7 @@ private fun EmptyState() {
     }
 }
 
-// ============================================================================
 // Dialogs
-// ============================================================================
-
-@Composable
-private fun ConfirmDialog(
-    title: String,
-    message: String,
-    confirmLabel: String,
-    confirmColor: Color,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-) {
-    Dialog(onDismissRequest = onDismiss) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(18.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(18.dp))
-                    .padding(22.dp),
-        ) {
-            Column {
-                Text(
-                    text = title,
-                    color = TextPrimary,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.SemiBold,
-                )
-                Spacer(Modifier.height(6.dp))
-                Text(
-                    text = message,
-                    color = TextSecondary,
-                    fontSize = 13.sp,
-                )
-                Spacer(Modifier.height(22.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-                ) {
-                    DialogActionButton(label = "Cancel", textColor = TextSecondary, onClick = onDismiss)
-                    DialogActionButton(label = confirmLabel, textColor = confirmColor, onClick = onConfirm)
-                }
-            }
-        }
-    }
-}
 
 @Composable
 private fun RepoEditDialog(
@@ -1325,6 +1325,7 @@ private fun RepoEditDialog(
 ) {
     var name by remember { mutableStateOf(existing?.name.orEmpty()) }
     var url by remember { mutableStateOf(existing?.apiUrl.orEmpty()) }
+    val registry = remember { PaneNavRegistry() }
 
     Dialog(
         onDismissRequest = onDismiss,
@@ -1334,72 +1335,76 @@ private fun RepoEditDialog(
                 decorFitsSystemWindows = false,
             ),
     ) {
-        BoxWithConstraints(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .windowInsetsPadding(WindowInsets.safeDrawing)
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Box(
+        DialogPaneNav(registry, onDismiss = onDismiss)
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+            BoxWithConstraints(
                 modifier =
                     Modifier
-                        .widthIn(max = 440.dp)
-                        .fillMaxWidth()
-                        .heightIn(max = maxHeight)
-                        .clip(RoundedCornerShape(16.dp))
-                        .background(CardDark)
-                        .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
-                        .padding(horizontal = 10.dp, vertical = 8.dp),
+                        .fillMaxSize()
+                        .windowInsetsPadding(WindowInsets.safeDrawing)
+                        .padding(horizontal = 16.dp, vertical = 12.dp),
+                contentAlignment = Alignment.Center,
             ) {
-                Column(
+                Box(
                     modifier =
                         Modifier
-                            .wrapContentHeight()
-                            .verticalScroll(rememberScrollState()),
+                            .widthIn(max = 440.dp)
+                            .fillMaxWidth()
+                            .heightIn(max = maxHeight)
+                            .clip(RoundedCornerShape(16.dp))
+                            .background(CardDark)
+                            .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
+                            .padding(horizontal = 10.dp, vertical = 8.dp),
                 ) {
-                    Text(
-                        text = if (existing == null) "Add Repository" else "Edit Repository",
-                        color = TextPrimary,
-                        fontSize = 15.sp,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                    Spacer(Modifier.height(8.dp))
-
-                    LabeledField(
-                        label = "Name",
-                        value = name,
-                        onValueChange = { name = it },
-                        placeholder = "Display name",
-                    )
-                    Spacer(Modifier.height(6.dp))
-                    LabeledField(
-                        label = "GitHub URL",
-                        value = url,
-                        onValueChange = { url = it },
-                        placeholder = "https://github.com/owner/repo/releases",
-                        keyboardType = KeyboardType.Uri,
-                        imeAction = ImeAction.Done,
-                    )
-
-                    Spacer(Modifier.height(10.dp))
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                    Column(
+                        modifier =
+                            Modifier
+                                .wrapContentHeight()
+                                .verticalScroll(rememberScrollState()),
                     ) {
-                        DialogActionButton(label = "Cancel", textColor = TextSecondary, onClick = onDismiss)
-                        DialogActionButton(
-                            label = if (existing == null) "Add" else "Save",
-                            textColor = Accent,
-                            onClick = {
-                                val trimmedName = name.trim()
-                                val trimmedUrl = url.trim()
-                                if (trimmedName.isNotEmpty() && trimmedUrl.isNotEmpty()) {
-                                    onConfirm(trimmedName, trimmedUrl)
-                                }
-                            },
+                        Text(
+                            text = if (existing == null) "Add Repository" else "Edit Repository",
+                            color = TextPrimary,
+                            fontSize = 15.sp,
+                            fontWeight = FontWeight.SemiBold,
                         )
+                        Spacer(Modifier.height(8.dp))
+
+                        LabeledField(
+                            label = "Name",
+                            value = name,
+                            onValueChange = { name = it },
+                            placeholder = "Display name",
+                            isEntry = true,
+                        )
+                        Spacer(Modifier.height(6.dp))
+                        LabeledField(
+                            label = "GitHub URL",
+                            value = url,
+                            onValueChange = { url = it },
+                            placeholder = "https://github.com/owner/repo/releases",
+                            keyboardType = KeyboardType.Uri,
+                            imeAction = ImeAction.Done,
+                        )
+
+                        Spacer(Modifier.height(10.dp))
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                        ) {
+                            DialogActionButton(label = "Cancel", textColor = TextSecondary, onClick = onDismiss)
+                            DialogActionButton(
+                                label = if (existing == null) "Add" else "Save",
+                                textColor = Accent,
+                                onClick = {
+                                    val trimmedName = name.trim()
+                                    val trimmedUrl = url.trim()
+                                    if (trimmedName.isNotEmpty() && trimmedUrl.isNotEmpty()) {
+                                        onConfirm(trimmedName, trimmedUrl)
+                                    }
+                                },
+                            )
+                        }
                     }
                 }
             }
@@ -1407,9 +1412,7 @@ private fun RepoEditDialog(
     }
 }
 
-// ============================================================================
 // Download / install progress dialog
-// ============================================================================
 
 @Composable
 private fun DownloadProgressDialog(progress: DownloadProgress) {
@@ -1422,90 +1425,16 @@ private fun DownloadProgressDialog(progress: DownloadProgress) {
                 usePlatformDefaultWidth = false,
             ),
     ) {
-        Box(
-            modifier =
-                Modifier
-                    .widthIn(max = 360.dp)
-                    .fillMaxWidth(0.88f)
-                    .clip(RoundedCornerShape(16.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
-                    .padding(horizontal = 18.dp, vertical = 16.dp),
-        ) {
-            Column(modifier = Modifier.fillMaxWidth()) {
-                Text(
-                    text = progress.title.uppercase(),
-                    color = TextSecondary,
-                    fontSize = 10.sp,
-                    fontWeight = FontWeight.Bold,
-                    letterSpacing = 1.2.sp,
-                )
-                Spacer(Modifier.height(6.dp))
-                Text(
-                    text = progress.assetName,
-                    color = TextPrimary,
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                )
-                Spacer(Modifier.height(14.dp))
-
-                // Thin bar — determinate animates to the target fraction with a short
-                // tween to avoid jittery per-progress-callback repaints; indeterminate
-                // hands off to Material3's built-in slider animation.
-                val barHeight = 5.dp
-                val barShape = RoundedCornerShape(3.dp)
-                if (progress.indeterminate) {
-                    LinearProgressIndicator(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .height(barHeight)
-                                .clip(barShape),
-                        color = Accent,
-                        trackColor = CardDarker,
-                    )
-                } else {
-                    val smoothed by animateFloatAsState(
-                        targetValue = progress.progress.coerceIn(0f, 1f),
-                        animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
-                        label = "dlProgress",
-                    )
-                    LinearProgressIndicator(
-                        progress = { smoothed },
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .height(barHeight)
-                                .clip(barShape),
-                        color = Accent,
-                        trackColor = CardDarker,
-                        drawStopIndicator = {},
-                        gapSize = 0.dp,
-                    )
-                }
-
-                Spacer(Modifier.height(8.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.End,
-                ) {
-                    val percentText =
-                        if (progress.indeterminate) {
-                            "Working…"
-                        } else {
-                            "${(progress.progress * 100).toInt().coerceIn(0, 100)}%"
-                        }
-                    Text(
-                        text = percentText,
-                        color = TextSecondary,
-                        fontSize = 11.sp,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            }
-        }
+        PopupDialog(
+            title = progress.title,
+            message = progress.assetName,
+            modifier = Modifier
+                .widthIn(max = 360.dp)
+                .fillMaxWidth(0.88f),
+            icon = Icons.Outlined.Download,
+            accentColor = Accent,
+            progress = if (progress.indeterminate) Float.NaN else progress.progress,
+        )
     }
 }
 
@@ -1518,6 +1447,7 @@ private fun LabeledField(
     modifier: Modifier = Modifier,
     keyboardType: KeyboardType = KeyboardType.Text,
     imeAction: ImeAction = ImeAction.Next,
+    isEntry: Boolean = false,
 ) {
     Column(modifier = modifier.fillMaxWidth()) {
         Text(
@@ -1534,6 +1464,7 @@ private fun LabeledField(
         val isFocused by interactionSource.collectIsFocusedAsState()
         val borderColor = if (isFocused) Accent else CardBorder
         val borderWidth = if (isFocused) 1.5.dp else 1.dp
+        val fieldFocus = remember { FocusRequester() }
         // Fixed min height + CenterStart alignment so the field keeps a consistent
         // tappable bar instead of collapsing to the font's intrinsic line height
         // (which made typed text look squashed against the top of the box).
@@ -1545,6 +1476,12 @@ private fun LabeledField(
                     .clip(RoundedCornerShape(9.dp))
                     .background(CardDarker)
                     .border(borderWidth, borderColor, RoundedCornerShape(9.dp))
+                    .paneNavItem(
+                        cornerRadius = 9.dp,
+                        onActivate = { runCatching { fieldFocus.requestFocus() } },
+                        highlightColor = NavHighlight,
+                        isEntry = isEntry,
+                    )
                     .padding(horizontal = 11.dp, vertical = 8.dp),
             contentAlignment = Alignment.CenterStart,
         ) {
@@ -1558,7 +1495,7 @@ private fun LabeledField(
                         .SolidColor(Accent),
                 keyboardOptions = KeyboardOptions(keyboardType = keyboardType, imeAction = imeAction),
                 interactionSource = interactionSource,
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier.fillMaxWidth().focusRequester(fieldFocus),
                 decorationBox = { innerTextField ->
                     if (value.isEmpty()) {
                         Text(
diff --git a/app/src/main/feature/settings/input/InputControlsFragment.kt b/app/src/main/feature/settings/input/InputControlsFragment.kt
index 747cc0537..154f293f4 100644
--- a/app/src/main/feature/settings/input/InputControlsFragment.kt
+++ b/app/src/main/feature/settings/input/InputControlsFragment.kt
@@ -26,7 +26,9 @@ import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.R
+import com.winlator.cmod.runtime.display.winhandler.WinHandler
 import com.winlator.cmod.runtime.input.ControllerHelper
 import com.winlator.cmod.runtime.input.ControlsEditorActivity
 import com.winlator.cmod.runtime.input.controls.Binding
@@ -34,8 +36,10 @@ import com.winlator.cmod.runtime.input.controls.ControlElement
 import com.winlator.cmod.runtime.input.controls.ControlsProfile
 import com.winlator.cmod.runtime.input.controls.ExternalController
 import com.winlator.cmod.runtime.input.controls.ExternalControllerBinding
+import com.winlator.cmod.runtime.input.controls.GestureProfileManager
 import com.winlator.cmod.runtime.input.controls.InputControlsManager
 import com.winlator.cmod.runtime.input.ui.InputControlsView
+import com.winlator.cmod.runtime.input.ui.TouchGestureConfig
 import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.android.DirectoryPickerDialog
 import com.winlator.cmod.shared.io.FileUtils
@@ -53,6 +57,7 @@ import kotlinx.coroutines.launch
 
 class InputControlsFragment : Fragment() {
     private lateinit var manager: InputControlsManager
+    private lateinit var gestureProfileManager: GestureProfileManager
     private lateinit var preferences: SharedPreferences
 
     private var screenState by mutableStateOf(InputControlsScreenState())
@@ -63,6 +68,8 @@ class InputControlsFragment : Fragment() {
     private var pendingMultiChoiceAction: ((Set<Int>) -> Unit)? = null
 
     private var currentProfile: ControlsProfile? = null
+    private var selectedGestureProfileId = -1
+    private var gestureEditorExpanded = false
     private var triggerTypeExpanded = false
     private var gyroscopeExpanded = false
     private val expandedControllerIds = mutableSetOf<String>()
@@ -80,7 +87,12 @@ class InputControlsFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         manager = InputControlsManager(requireContext())
+        gestureProfileManager = GestureProfileManager(requireContext())
         preferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        val deepLink = activity?.intent?.getIntExtra("gesture_profile_id", -1) ?: -1
+        activity?.intent?.removeExtra("gesture_profile_id")
+        selectedGestureProfileId = deepLink
+        gestureEditorExpanded = deepLink >= 0
 
         val selectedProfileId = arguments?.getInt(ARG_SELECTED_PROFILE_ID, 0) ?: 0
         val profileId =
@@ -112,6 +124,7 @@ class InputControlsFragment : Fragment() {
                 ) {
                     InputControlsScreen(
                         state = screenState,
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                         actions =
                             InputControlsScreenActions(
                                 onSelectProfile = ::showProfilePicker,
@@ -119,6 +132,7 @@ class InputControlsFragment : Fragment() {
                                 onAddProfile = ::addProfile,
                                 onEditProfile = ::editProfile,
                                 onDuplicateProfile = ::duplicateProfile,
+                                onResetProfile = ::resetProfile,
                                 onRemoveProfile = ::removeProfile,
                                 onDismissDialog = ::dismissComposeDialog,
                                 onConfirmDialog = ::confirmComposeDialog,
@@ -126,6 +140,12 @@ class InputControlsFragment : Fragment() {
                                 onChoiceDialogSelect = ::selectChoiceDialog,
                                 onMultiChoiceDialogConfirm = ::confirmMultiChoiceDialog,
                                 onOverlayOpacityChanged = ::setOverlayOpacity,
+                                onAutoHideTouchOnControllerChanged = { enabled ->
+                                    preferences.edit()
+                                        .putBoolean("auto_hide_touch_on_controller", enabled)
+                                        .apply()
+                                    publishUiState()
+                                },
                                 onGyroscopeEnabledChanged = { enabled ->
                                     val editor = preferences.edit()
                                     editor.putBoolean("gyro_enabled", enabled)
@@ -136,6 +156,10 @@ class InputControlsFragment : Fragment() {
                                     preferences.edit().putInt("gyro_mode", mode).apply()
                                     publishUiState()
                                 },
+                                onGyroOrientationModeChanged = { enabled ->
+                                    preferences.edit().putBoolean("gyro_orientation_enabled", enabled).apply()
+                                    publishUiState()
+                                },
                                 onGyroscopeActivatorClick = ::showActivatorPicker,
                                 onRightStickGyroChanged = { enabled ->
                                     preferences.edit().putBoolean("process_gyro_with_left_trigger", enabled).apply()
@@ -172,6 +196,15 @@ class InputControlsFragment : Fragment() {
                                 },
                                 onAttachGyroPreview = ::attachGyroPreview,
                                 onDetachGyroPreview = ::detachGyroPreview,
+                                onSelectGestureProfile = ::showGestureProfilePicker,
+                                onToggleGestureEditor = ::toggleGestureEditor,
+                                onGestureConfigChanged = ::saveSelectedGestureConfig,
+                                onNewGestureProfile = ::addGestureProfile,
+                                onRenameGestureProfile = ::renameSelectedGestureProfile,
+                                onDuplicateGestureProfile = ::duplicateSelectedGestureProfile,
+                                onDeleteGestureProfile = ::removeSelectedGestureProfile,
+                                onImportGestureProfile = ::promptImportGestureProfile,
+                                onExportGestureProfile = ::exportSelectedGestureProfile,
                                 onTriggerTypeSelected = { index ->
                                     preferences.edit().putInt("trigger_type", index).apply()
                                     publishUiState()
@@ -286,9 +319,12 @@ class InputControlsFragment : Fragment() {
             InputControlsScreenState(
                 selectedProfileName = profile?.name,
                 selectedProfileElementCount = profile?.elementCountFromFile ?: 0,
+                selectedProfileCanReset = profile != null && manager.canResetProfile(profile),
                 overlayOpacity = (preferences.getFloat("overlay_opacity", InputControlsView.DEFAULT_OVERLAY_OPACITY) * 100).toInt(),
+                autoHideTouchOnController = preferences.getBoolean("auto_hide_touch_on_controller", false),
                 gyroscopeEnabled = preferences.getBoolean("gyro_enabled", false),
                 gyroscopeModeIndex = preferences.getInt("gyro_mode", 0),
+                gyroOrientationEnabled = preferences.getBoolean("gyro_orientation_enabled", false),
                 gyroscopeActivatorLabel = currentGyroActivatorLabel(),
                 rightStickGyroEnabled = preferences.getBoolean("process_gyro_with_left_trigger", false),
                 gyroMouseEnabled = preferences.getBoolean("mouse_gyro_enabled", false),
@@ -296,10 +332,13 @@ class InputControlsFragment : Fragment() {
                 gyroscopeExpanded = gyroscopeExpanded,
                 gyroXSensitivity = (preferences.getFloat("gyro_x_sensitivity", 1.0f) * 100).toInt(),
                 gyroYSensitivity = (preferences.getFloat("gyro_y_sensitivity", 1.0f) * 100).toInt(),
-                gyroSmoothing = (preferences.getFloat("gyro_smoothing", 0.9f) * 100).toInt(),
+                gyroSmoothing = (preferences.getFloat("gyro_smoothing", 0.5f) * 100).toInt(),
                 gyroDeadzone = (preferences.getFloat("gyro_deadzone", 0.05f) * 100).toInt(),
                 invertGyroX = preferences.getBoolean("invert_gyro_x", false),
                 invertGyroY = preferences.getBoolean("invert_gyro_y", false),
+                selectedGestureProfileName = selectedGestureProfile().name,
+                gestureEditorExpanded = gestureEditorExpanded,
+                selectedGestureConfig = TouchGestureConfig.fromJson(selectedGestureProfile().configJson),
                 triggerTypeIndex = preferences.getInt("trigger_type", ExternalController.TRIGGER_IS_AXIS.toInt()),
                 triggerCardExpanded = triggerTypeExpanded,
                 triggerDescription = triggerDescription,
@@ -492,6 +531,31 @@ class InputControlsFragment : Fragment() {
         }
     }
 
+    private fun resetProfile() {
+        val profile = currentProfile
+        if (profile == null) {
+            WinToast.show(requireContext(), R.string.input_controls_editor_no_profile_selected)
+            return
+        }
+        if (!manager.canResetProfile(profile)) {
+            WinToast.show(requireContext(), R.string.input_controls_editor_reset_unavailable)
+            return
+        }
+        showConfirmDialog(
+            message = getString(R.string.input_controls_editor_confirm_reset_profile),
+            confirmLabel = getString(R.string.common_ui_reset),
+            tone = InputDialogTone.Danger,
+        ) {
+            currentProfile = manager.resetProfile(profile)
+            persistSelectedProfileId()
+            expandedControllerIds.clear()
+            stopControllerInputCapture()
+            refreshVisibleControllers()
+            publishUiState()
+            WinToast.show(requireContext(), R.string.input_controls_editor_profile_reset)
+        }
+    }
+
     private fun removeProfile() {
         val profile = currentProfile
         if (profile != null) {
@@ -730,7 +794,142 @@ class InputControlsFragment : Fragment() {
         }
     }
 
+    private fun selectedGestureProfile() =
+        gestureProfileManager.getProfile(selectedGestureProfileId)
+            ?: gestureProfileManager.profiles.firstOrNull()
+            ?: gestureProfileManager.defaultProfile
+
+    private fun showGestureProfilePicker() {
+        val profiles =
+            gestureProfileManager.profiles.ifEmpty { listOf(gestureProfileManager.defaultProfile) }
+        val names = profiles.map { it.name }.toTypedArray()
+        val current = selectedGestureProfile().id
+        val checkedIndex = profiles.indexOfFirst { it.id == current }.let { if (it >= 0) it else 0 }
+        showChoiceDialog(
+            title = getString(R.string.input_controls_editor_select_profile),
+            items = names,
+            checkedIndex = checkedIndex,
+        ) { which ->
+            selectedGestureProfileId = profiles[which].id
+            publishUiState()
+        }
+    }
+
+    private fun toggleGestureEditor() {
+        gestureEditorExpanded = !gestureEditorExpanded
+        publishUiState()
+    }
+
+    private fun saveSelectedGestureConfig(config: TouchGestureConfig) {
+        val profile = selectedGestureProfile()
+        profile.configJson = config.toJson()
+        gestureProfileManager.saveProfile(profile)
+        selectedGestureProfileId = profile.id
+        publishUiState()
+    }
+
+    private fun addGestureProfile() {
+        showPromptDialog(
+            title = getString(R.string.input_controls_editor_profile_name),
+            initialValue = "",
+            confirmLabel = getString(R.string.common_ui_ok),
+        ) { name ->
+            val profile = gestureProfileManager.createProfile(name)
+            selectedGestureProfileId = profile.id
+            gestureEditorExpanded = true
+            publishUiState()
+        }
+    }
+
+    private fun renameSelectedGestureProfile() {
+        val profile = selectedGestureProfile()
+        showPromptDialog(
+            title = getString(R.string.input_controls_editor_profile_name),
+            initialValue = profile.name,
+            confirmLabel = getString(R.string.common_ui_ok),
+        ) { name ->
+            gestureProfileManager.renameProfile(profile, name)
+            publishUiState()
+        }
+    }
+
+    private fun duplicateSelectedGestureProfile() {
+        val duplicate = gestureProfileManager.duplicateProfile(selectedGestureProfile())
+        selectedGestureProfileId = duplicate.id
+        publishUiState()
+    }
+
+    private fun removeSelectedGestureProfile() {
+        val profile = selectedGestureProfile()
+        showConfirmDialog(
+            message = getString(R.string.input_controls_editor_confirm_remove_profile),
+            confirmLabel = getString(R.string.common_ui_remove),
+            tone = InputDialogTone.Danger,
+        ) {
+            gestureProfileManager.removeProfile(profile)
+            selectedGestureProfileId = gestureProfileManager.profiles.firstOrNull()?.id ?: -1
+            publishUiState()
+        }
+    }
+
+    private fun promptImportGestureProfile() {
+        val activity = activity ?: return
+        DirectoryPickerDialog.showFile(
+            activity = activity,
+            title = getString(R.string.gesture_profile_import),
+            allowedExtensions = setOf("gcp"),
+        ) { path ->
+            if (!isAdded) return@showFile
+            importGestureProfileFromJson(FileUtils.readString(File(path)))
+        }
+    }
+
+    private fun importGestureProfileFromJson(jsonString: String?) {
+        try {
+            if (jsonString.isNullOrBlank()) {
+                WinToast.show(
+                    requireContext(),
+                    getString(R.string.input_controls_editor_unable_to_import) + ": Empty file",
+                )
+                return
+            }
+            val imported =
+                runCatching {
+                    gestureProfileManager.importProfile(JSONObject(jsonString))
+                }.getOrNull()
+            if (imported != null) {
+                selectedGestureProfileId = imported.id
+                publishUiState()
+            } else {
+                publishUiState()
+                WinToast.show(
+                    requireContext(),
+                    getString(R.string.input_controls_editor_unable_to_import) + ": Invalid profile data",
+                )
+            }
+        } catch (e: Exception) {
+            WinToast.show(
+                requireContext(),
+                getString(R.string.input_controls_editor_unable_to_import) + ": " + e.message,
+            )
+        }
+    }
+
+    private fun exportSelectedGestureProfile() {
+        val profile = selectedGestureProfile()
+        val exportedFile = gestureProfileManager.exportProfile(profile)
+        if (exportedFile != null) {
+            WinToast.show(
+                requireContext(),
+                getString(R.string.input_controls_editor_profile_exported_to) + " " + exportedFile.path,
+            )
+        }
+    }
+
     private fun currentGyroActivatorLabel(): String {
+        if (preferences.getBoolean("mouse_gyro_enabled", false)) {
+            return WinHandler.getGyroMouseActivator(preferences).toString()
+        }
         val names = resources.getStringArray(R.array.button_options)
         val keycodes = resources.getIntArray(R.array.button_keycodes)
         val currentKeycode = preferences.getInt("gyro_trigger_button", KeyEvent.KEYCODE_BUTTON_L1)
@@ -739,6 +938,10 @@ class InputControlsFragment : Fragment() {
     }
 
     private fun showActivatorPicker() {
+        if (preferences.getBoolean("mouse_gyro_enabled", false)) {
+            showMouseGyroActivatorPicker()
+            return
+        }
         val names = resources.getStringArray(R.array.button_options)
         val keycodes = resources.getIntArray(R.array.button_keycodes)
         val currentKeycode = preferences.getInt("gyro_trigger_button", KeyEvent.KEYCODE_BUTTON_L1)
@@ -753,6 +956,19 @@ class InputControlsFragment : Fragment() {
         }
     }
 
+    private fun showMouseGyroActivatorPicker() {
+        val bindings = Binding.activatorBindingValues()
+        val current = WinHandler.getGyroMouseActivator(preferences)
+        showSingleChoiceDialog(
+            title = getString(R.string.session_gyroscope_activator_button),
+            items = bindings.map { it.toString() }.toTypedArray(),
+            checkedIndex = bindings.indexOf(current).coerceAtLeast(0),
+        ) { which ->
+            preferences.edit().putString("gyro_mouse_trigger_binding", bindings[which].name).apply()
+            publishUiState()
+        }
+    }
+
     private fun attachGyroPreview(view: InputControlsView) {
         if (gyroPreviewView === view) return
         gyroPreviewView = view
@@ -781,18 +997,18 @@ class InputControlsFragment : Fragment() {
         val sensorManager = requireContext().getSystemService(Activity.SENSOR_SERVICE) as SensorManager
         val gyroscopeSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE) ?: return
 
-        val smoothingFactor = preferences.getFloat("gyro_smoothing", 0.9f)
-        val gyroDeadzone = preferences.getFloat("gyro_deadzone", 0.05f)
-        val invertGyroX = preferences.getBoolean("invert_gyro_x", false)
-        val invertGyroY = preferences.getBoolean("invert_gyro_y", false)
-        val gyroSensitivityX = preferences.getFloat("gyro_x_sensitivity", 1.0f)
-        val gyroSensitivityY = preferences.getFloat("gyro_y_sensitivity", 1.0f)
         val smoothGyroX = floatArrayOf(0f)
         val smoothGyroY = floatArrayOf(0f)
 
         val listener =
             object : SensorEventListener {
                 override fun onSensorChanged(event: SensorEvent) {
+                    val smoothingFactor = preferences.getFloat("gyro_smoothing", 0.5f)
+                    val gyroDeadzone = preferences.getFloat("gyro_deadzone", 0.05f)
+                    val invertGyroX = preferences.getBoolean("invert_gyro_x", false)
+                    val invertGyroY = preferences.getBoolean("invert_gyro_y", false)
+                    val gyroSensitivityX = preferences.getFloat("gyro_x_sensitivity", 1.0f)
+                    val gyroSensitivityY = preferences.getFloat("gyro_y_sensitivity", 1.0f)
                     var rawGyroX = event.values[0]
                     var rawGyroY = event.values[1]
 
@@ -1147,7 +1363,7 @@ class InputControlsFragment : Fragment() {
     companion object {
         private const val ARG_SELECTED_PROFILE_ID = "selectedProfileId"
         private const val INPUT_CONTROLS_URL =
-            "https://raw.githubusercontent.com/Xnick417x/winlator-nightly-wcp/main/Profiles/%s"
+            "https://raw.githubusercontent.com/nicholasx417/WinNative-Components/main/Profiles/%s"
         private const val PREF_SELECTED_PROFILE_ID = "input_controls_selected_profile_id"
 
         fun newInstance(profileId: Int = 0): InputControlsFragment =
diff --git a/app/src/main/feature/settings/input/InputControlsScreen.kt b/app/src/main/feature/settings/input/InputControlsScreen.kt
index 072a4c5d9..a25818a64 100644
--- a/app/src/main/feature/settings/input/InputControlsScreen.kt
+++ b/app/src/main/feature/settings/input/InputControlsScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -38,8 +37,7 @@ import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.gestures.animateScrollBy
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
@@ -57,6 +55,7 @@ import androidx.compose.material.icons.outlined.ExpandMore
 import androidx.compose.material.icons.outlined.FileDownload
 import androidx.compose.material.icons.outlined.FileUpload
 import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material.icons.outlined.ScreenRotationAlt
 import androidx.compose.material.icons.outlined.SportsEsports
 import androidx.compose.material.icons.outlined.Tune
@@ -73,6 +72,7 @@ import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -82,9 +82,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
@@ -100,17 +106,32 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
+import com.winlator.cmod.runtime.input.controls.Binding
+import com.winlator.cmod.runtime.input.ui.DragAction
+import com.winlator.cmod.runtime.input.ui.HoldBehavior
 import com.winlator.cmod.runtime.input.ui.InputControlsView
+import com.winlator.cmod.runtime.input.ui.PanAction
+import com.winlator.cmod.runtime.input.ui.TouchGestureConfig
+import com.winlator.cmod.runtime.input.ui.ZoomAction
+import com.winlator.cmod.shared.ui.focus.controllerFocusGlow
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.key
 import com.winlator.cmod.shared.ui.outlinedSwitchColors
 import kotlin.math.roundToInt
 
-private val InputBg = Color(0xFF18181D)
+private val InputBg = Color(0xFF11111C)
 private val InputCard = Color(0xFF1C1C2A)
 private val InputSubcard = Color(0xFF161622)
 private val InputField = Color(0xFF14141E)
 private val InputOutline = Color(0xFF2A2A3A)
 private val InputIconBox = Color(0xFF242434)
 private val InputAccent = Color(0xFF1A9FFF)
+private val InputNavHighlight = Color(0xFF4FC3F7)
 private val InputTextPrimary = Color(0xFFF0F4FF)
 private val InputTextSecondary = Color(0xFF7A8FA8)
 private val InputDanger = Color(0xFFFF7A88)
@@ -138,9 +159,12 @@ private val InputSectionTextSize = 10.sp
 data class InputControlsScreenState(
     val selectedProfileName: String? = null,
     val selectedProfileElementCount: Int = 0,
+    val selectedProfileCanReset: Boolean = false,
     val overlayOpacity: Int = 40,
+    val autoHideTouchOnController: Boolean = false,
     val gyroscopeEnabled: Boolean = false,
     val gyroscopeModeIndex: Int = 0,
+    val gyroOrientationEnabled: Boolean = false,
     val gyroscopeActivatorLabel: String = "",
     val rightStickGyroEnabled: Boolean = false,
     val gyroMouseEnabled: Boolean = false,
@@ -148,10 +172,13 @@ data class InputControlsScreenState(
     val gyroscopeExpanded: Boolean = false,
     val gyroXSensitivity: Int = 100,
     val gyroYSensitivity: Int = 100,
-    val gyroSmoothing: Int = 90,
+    val gyroSmoothing: Int = 10,
     val gyroDeadzone: Int = 5,
     val invertGyroX: Boolean = false,
     val invertGyroY: Boolean = false,
+    val selectedGestureProfileName: String? = null,
+    val gestureEditorExpanded: Boolean = false,
+    val selectedGestureConfig: TouchGestureConfig = TouchGestureConfig(),
     val triggerTypeIndex: Int = 1,
     val triggerCardExpanded: Boolean = false,
     val triggerDescription: String = "",
@@ -217,6 +244,7 @@ data class InputControlsScreenActions(
     val onAddProfile: () -> Unit,
     val onEditProfile: () -> Unit,
     val onDuplicateProfile: () -> Unit,
+    val onResetProfile: () -> Unit,
     val onRemoveProfile: () -> Unit,
     val onDismissDialog: () -> Unit,
     val onConfirmDialog: () -> Unit,
@@ -224,8 +252,10 @@ data class InputControlsScreenActions(
     val onChoiceDialogSelect: (Int) -> Unit,
     val onMultiChoiceDialogConfirm: (Set<Int>) -> Unit,
     val onOverlayOpacityChanged: (Int) -> Unit,
+    val onAutoHideTouchOnControllerChanged: (Boolean) -> Unit,
     val onGyroscopeEnabledChanged: (Boolean) -> Unit,
     val onGyroscopeModeSelected: (Int) -> Unit,
+    val onGyroOrientationModeChanged: (Boolean) -> Unit,
     val onGyroscopeActivatorClick: () -> Unit,
     val onRightStickGyroChanged: (Boolean) -> Unit,
     val onGyroMouseEnabledChanged: (Boolean) -> Unit,
@@ -240,6 +270,15 @@ data class InputControlsScreenActions(
     val onResetGyroPreview: () -> Unit,
     val onAttachGyroPreview: (InputControlsView) -> Unit,
     val onDetachGyroPreview: () -> Unit,
+    val onSelectGestureProfile: () -> Unit,
+    val onToggleGestureEditor: () -> Unit,
+    val onGestureConfigChanged: (TouchGestureConfig) -> Unit,
+    val onNewGestureProfile: () -> Unit,
+    val onRenameGestureProfile: () -> Unit,
+    val onDuplicateGestureProfile: () -> Unit,
+    val onDeleteGestureProfile: () -> Unit,
+    val onImportGestureProfile: () -> Unit,
+    val onExportGestureProfile: () -> Unit,
     val onTriggerTypeSelected: (Int) -> Unit,
     val onTriggerCardExpandedChanged: (Boolean) -> Unit,
     val onImportProfile: () -> Unit,
@@ -256,12 +295,14 @@ data class InputControlsScreenActions(
 fun InputControlsScreen(
     state: InputControlsScreenState,
     actions: InputControlsScreenActions,
+    bridge: SettingsNavBridge? = null,
 ) {
     val layoutDirection = LocalLayoutDirection.current
     val navBarPadding = WindowInsets.navigationBars.asPaddingValues()
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
+    val contentNav = rememberSettingsContentNav(bridge)
 
     Box(
         modifier =
@@ -269,55 +310,72 @@ fun InputControlsScreen(
                 .fillMaxSize()
                 .background(InputBg),
     ) {
-        LazyColumn(
-            modifier = Modifier.fillMaxSize(),
-            contentPadding =
-                PaddingValues(
-                    start = 12.dp + navBarStartPadding,
-                    top = 12.dp,
-                    end = 12.dp + navBarEndPadding,
-                    bottom = 16.dp + navBarBottomPadding,
-                ),
-            verticalArrangement = Arrangement.spacedBy(InputCompactGap),
-        ) {
-            item("profile-card") { ProfileCard(state, actions) }
-            item("overlay-label") { SectionLabel(stringResource(R.string.input_controls_editor_overlay_opacity)) }
-            item("overlay-card") { OverlayOpacityCard(state, actions) }
-            item("gyro-label") { SectionLabel(stringResource(R.string.session_gyroscope_title)) }
-            item("gyro-card") { GyroscopeCard(state, actions) }
-            item("trigger-label") { SectionLabel(stringResource(R.string.session_gamepad_trigger_type)) }
-            item("trigger-card") { TriggerTypeCard(state, actions) }
-            item("actions-label") { SectionLabel(stringResource(R.string.common_ui_profile)) }
-            item("import-card") {
+        CompositionLocalProvider(LocalPaneNav provides contentNav) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .verticalScroll(rememberScrollState())
+                        .padding(
+                            start = 12.dp + navBarStartPadding,
+                            top = 12.dp,
+                            end = 12.dp + navBarEndPadding,
+                        ),
+                verticalArrangement = Arrangement.spacedBy(InputCompactGap),
+            ) {
+                SectionLabel(stringResource(R.string.input_controls_auto_hide_section))
+                AutoHideTouchCard(state, actions)
+                ProfileCard(state, actions)
+                SectionLabel(stringResource(R.string.input_controls_editor_input_profiles_section))
                 ActionCard(
                     icon = Icons.Outlined.FileDownload,
                     title = stringResource(R.string.input_controls_editor_import_profile),
                     onClick = actions.onImportProfile,
                 )
-            }
-            item("download-card") {
                 ActionCard(
                     icon = Icons.Outlined.Download,
                     title = stringResource(R.string.common_ui_download),
                     onClick = actions.onDownloadProfile,
                 )
-            }
-            item("export-card") {
                 ActionCard(
                     icon = Icons.Outlined.FileUpload,
                     title = stringResource(R.string.input_controls_editor_export_profile),
                     onClick = actions.onExportProfile,
                 )
-            }
-            item("controllers-label") { SectionLabel(stringResource(R.string.session_gamepad_external_controllers)) }
-            if (state.controllerCards.isEmpty()) {
-                item("controllers-empty") {
-                    EmptyStateCard(stringResource(R.string.common_ui_no_items_to_display))
+                SectionLabel(stringResource(R.string.input_controls_editor_overlay_opacity))
+                OverlayOpacityCard(state, actions)
+                SectionLabel(stringResource(R.string.session_gamepad_trigger_type))
+                TriggerTypeCard(state, actions)
+                SectionLabel(stringResource(R.string.session_gyroscope_title))
+                GyroscopeCard(state, actions)
+                SectionLabel(stringResource(R.string.session_gesture_profile_section))
+                GestureProfileCard(state, actions)
+                if (state.gestureEditorExpanded) {
+                    CardShell {
+                        GestureEditorBody(state.selectedGestureConfig) { actions.onGestureConfigChanged(it) }
+                    }
                 }
-            } else {
-                items(state.controllerCards, key = { it.controllerId }) { controller ->
-                    ControllerCard(controller, actions)
+                ActionCard(
+                    icon = Icons.Outlined.FileDownload,
+                    title = stringResource(R.string.gesture_profile_import),
+                    onClick = actions.onImportGestureProfile,
+                )
+                ActionCard(
+                    icon = Icons.Outlined.FileUpload,
+                    title = stringResource(R.string.gesture_profile_export),
+                    onClick = actions.onExportGestureProfile,
+                )
+                SectionLabel(stringResource(R.string.session_gamepad_external_controllers))
+                if (state.controllerCards.isEmpty()) {
+                    EmptyStateCard(stringResource(R.string.common_ui_no_items_to_display))
+                } else {
+                    state.controllerCards.forEach { controller ->
+                        key(controller.controllerId) {
+                            ControllerCard(controller, actions)
+                        }
+                    }
                 }
+                Spacer(Modifier.height(16.dp + navBarBottomPadding))
             }
         }
 
@@ -392,10 +450,11 @@ private fun CardShell(
 ) {
     val clickableModifier =
         if (onClick != null) {
-            Modifier.clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null,
-                onClick = onClick,
+            Modifier.paneNavItem(
+                cornerRadius = InputCardCorner,
+                onActivate = onClick,
+                highlightColor = InputNavHighlight,
+                tapToSelect = true,
             )
         } else {
             Modifier
@@ -453,10 +512,11 @@ private fun IconActionButton(
                 .clip(RoundedCornerShape(InputFieldCorner))
                 .background(InputSubcard)
                 .border(1.dp, InputOutline, RoundedCornerShape(InputFieldCorner))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ),
         contentAlignment = Alignment.Center,
     ) {
@@ -469,13 +529,34 @@ private fun IconActionButton(
     }
 }
 
+@Composable
+private fun DecorativeChevronBox() {
+    Box(
+        modifier =
+            Modifier
+                .size(InputActionSize)
+                .clip(RoundedCornerShape(InputFieldCorner))
+                .background(InputSubcard)
+                .border(1.dp, InputOutline, RoundedCornerShape(InputFieldCorner)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
+            contentDescription = null,
+            tint = InputTextSecondary,
+            modifier = Modifier.size(16.dp),
+        )
+    }
+}
+
 @Composable
 private fun AppSwitch(
     checked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Switch(
-        modifier = Modifier.scale(0.78f),
+        modifier = modifier.scale(0.78f).focusProperties { canFocus = false },
         checked = checked,
         onCheckedChange = onCheckedChange,
         colors =
@@ -519,10 +600,11 @@ private fun Chip(
                     1.dp,
                     if (selected) InputAccent.copy(alpha = 0.35f) else InputOutline,
                     RoundedCornerShape(InputFieldCorner),
-                ).clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                ).paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ).padding(horizontal = 12.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -547,10 +629,11 @@ private fun SelectionPill(
                 .clip(RoundedCornerShape(InputFieldCorner))
                 .background(InputField)
                 .border(1.dp, InputOutline, RoundedCornerShape(InputFieldCorner))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ).padding(start = 12.dp, end = 8.dp, top = 6.dp, bottom = 6.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -600,6 +683,7 @@ private fun InputDialogShell(
     maxWidth: Dp = 440.dp,
     content: @Composable () -> Unit,
 ) {
+    val registry = remember { PaneNavRegistry() }
     Dialog(
         onDismissRequest = onDismiss,
         properties =
@@ -608,50 +692,53 @@ private fun InputDialogShell(
                 decorFitsSystemWindows = false,
             ),
     ) {
-        BoxWithConstraints(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .safeDrawingPadding()
-                    .imePadding()
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Box(
+        DialogPaneNav(registry, onDismiss = onDismiss)
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+            BoxWithConstraints(
                 modifier =
                     Modifier
-                        .widthIn(max = maxWidth)
-                        .fillMaxWidth()
-                        .heightIn(max = maxHeight)
-                        .clip(RoundedCornerShape(16.dp))
-                        .background(InputCard)
-                        .border(1.dp, InputOutline, RoundedCornerShape(16.dp))
-                        .padding(horizontal = 18.dp, vertical = 16.dp),
+                        .fillMaxSize()
+                        .safeDrawingPadding()
+                        .imePadding()
+                        .padding(horizontal = 16.dp, vertical = 12.dp),
+                contentAlignment = Alignment.Center,
             ) {
-                Column(
+                Box(
                     modifier =
                         Modifier
+                            .widthIn(max = maxWidth)
                             .fillMaxWidth()
-                            .verticalScroll(rememberScrollState()),
+                            .heightIn(max = maxHeight)
+                            .clip(RoundedCornerShape(16.dp))
+                            .background(InputCard)
+                            .border(1.dp, InputOutline, RoundedCornerShape(16.dp))
+                            .padding(horizontal = 18.dp, vertical = 16.dp),
                 ) {
-                    if (title != null) {
-                        Text(
-                            text = title,
-                            color = InputTextPrimary,
-                            fontSize = 16.sp,
-                            fontWeight = FontWeight.Bold,
-                        )
-                        Spacer(Modifier.height(12.dp))
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .height(1.dp)
-                                    .background(InputOutline),
-                        )
-                        Spacer(Modifier.height(14.dp))
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        if (title != null) {
+                            Text(
+                                text = title,
+                                color = InputTextPrimary,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.Bold,
+                            )
+                            Spacer(Modifier.height(12.dp))
+                            Box(
+                                modifier =
+                                    Modifier
+                                        .fillMaxWidth()
+                                        .height(1.dp)
+                                        .background(InputOutline),
+                            )
+                            Spacer(Modifier.height(14.dp))
+                        }
+                        content()
                     }
-                    content()
                 }
             }
         }
@@ -706,6 +793,7 @@ private fun InputFixedFooterDialogShell(
     footer: @Composable () -> Unit,
     content: @Composable () -> Unit,
 ) {
+    val registry = remember { PaneNavRegistry() }
     Dialog(
         onDismissRequest = onDismiss,
         properties =
@@ -714,41 +802,85 @@ private fun InputFixedFooterDialogShell(
                 decorFitsSystemWindows = false,
             ),
     ) {
-        BoxWithConstraints(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .safeDrawingPadding()
-                    .imePadding()
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            val responsiveBodyMaxHeight =
-                minOf(
-                    maxBodyHeight,
-                    (maxHeight - 176.dp).coerceAtLeast(140.dp),
-                )
-
-            Box(
+        DialogPaneNav(registry, onDismiss = onDismiss)
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+            BoxWithConstraints(
                 modifier =
                     Modifier
-                        .widthIn(max = maxWidth)
-                        .fillMaxWidth()
-                        .heightIn(max = maxHeight)
-                        .clip(RoundedCornerShape(16.dp))
-                        .background(InputCard)
-                        .border(1.dp, InputOutline, RoundedCornerShape(16.dp))
-                        .padding(horizontal = 18.dp, vertical = 16.dp),
+                        .fillMaxSize()
+                        .safeDrawingPadding()
+                        .imePadding()
+                        .padding(horizontal = 16.dp, vertical = 12.dp),
+                contentAlignment = Alignment.Center,
             ) {
-                Column(modifier = Modifier.fillMaxWidth()) {
-                    if (title != null) {
-                        Text(
-                            text = title,
-                            color = InputTextPrimary,
-                            fontSize = 16.sp,
-                            fontWeight = FontWeight.Bold,
-                        )
-                        Spacer(Modifier.height(12.dp))
+                val responsiveBodyMaxHeight =
+                    minOf(
+                        maxBodyHeight,
+                        (maxHeight - 176.dp).coerceAtLeast(140.dp),
+                    )
+
+                Box(
+                    modifier =
+                        Modifier
+                            .widthIn(max = maxWidth)
+                            .fillMaxWidth()
+                            .heightIn(max = maxHeight)
+                            .clip(RoundedCornerShape(16.dp))
+                            .background(InputCard)
+                            .border(1.dp, InputOutline, RoundedCornerShape(16.dp))
+                            .padding(horizontal = 18.dp, vertical = 16.dp),
+                ) {
+                    Column(modifier = Modifier.fillMaxWidth()) {
+                        if (title != null) {
+                            Text(
+                                text = title,
+                                color = InputTextPrimary,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.Bold,
+                            )
+                            Spacer(Modifier.height(12.dp))
+                            Box(
+                                modifier =
+                                    Modifier
+                                        .fillMaxWidth()
+                                        .height(1.dp)
+                                        .background(InputOutline),
+                            )
+                            Spacer(Modifier.height(14.dp))
+                        }
+
+                        val scrollState = rememberScrollState()
+                        val density = LocalDensity.current
+                        var viewportTop by remember { mutableStateOf(0f) }
+                        var viewportHeight by remember { mutableStateOf(0) }
+                        LaunchedEffect(registry.activeRow, registry.activeCol, viewportHeight) {
+                            if (!registry.controllerActive) return@LaunchedEffect
+                            val bounds = registry.activeItemBounds() ?: return@LaunchedEffect
+                            val margin = with(density) { 16.dp.toPx() }
+                            val vpBottom = viewportTop + viewportHeight
+                            val delta =
+                                when {
+                                    bounds.second + margin > vpBottom -> bounds.second + margin - vpBottom
+                                    bounds.first - margin < viewportTop -> bounds.first - margin - viewportTop
+                                    else -> 0f
+                                }
+                            if (delta != 0f) runCatching { scrollState.animateScrollBy(delta) }
+                        }
+                        Column(
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .heightIn(max = responsiveBodyMaxHeight)
+                                    .onGloballyPositioned {
+                                        viewportTop = it.positionInWindow().y
+                                        viewportHeight = it.size.height
+                                    }
+                                    .verticalScroll(scrollState),
+                        ) {
+                            content()
+                        }
+
+                        Spacer(Modifier.height(14.dp))
                         Box(
                             modifier =
                                 Modifier
@@ -757,28 +889,8 @@ private fun InputFixedFooterDialogShell(
                                     .background(InputOutline),
                         )
                         Spacer(Modifier.height(14.dp))
+                        footer()
                     }
-
-                    Column(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .heightIn(max = responsiveBodyMaxHeight)
-                                .verticalScroll(rememberScrollState()),
-                    ) {
-                        content()
-                    }
-
-                    Spacer(Modifier.height(14.dp))
-                    Box(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(InputOutline),
-                    )
-                    Spacer(Modifier.height(14.dp))
-                    footer()
                 }
             }
         }
@@ -799,15 +911,25 @@ private fun InputDialogButton(
     val resolvedBorder = borderColor ?: if (primary) InputAccent.copy(alpha = 0.5f) else InputOutline
     val disabledBackground = InputSubcard.copy(alpha = 0.96f)
     val disabledBorder = InputOutline.copy(alpha = 0.9f)
+    val nav = LocalPaneNav.current
     val clickModifier =
-        if (enabled) {
-            Modifier.clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null,
-                onClick = onClick,
-            )
-        } else {
-            Modifier
+        when {
+            !enabled -> Modifier
+            nav != null ->
+                Modifier.paneNavItem(
+                    cornerRadius = 10.dp,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
+                )
+            else ->
+                Modifier
+                    .paneNavItem(cornerRadius = 10.dp, onActivate = onClick)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onClick,
+                    )
         }
 
     Box(
@@ -893,6 +1015,7 @@ private fun InputPromptDialog(
     val focusManager = LocalFocusManager.current
     val interactionSource = remember { MutableInteractionSource() }
     val focused by interactionSource.collectIsFocusedAsState()
+    val fieldFocus = remember { FocusRequester() }
 
     InputDialogShell(
         onDismiss = onDismiss,
@@ -910,6 +1033,11 @@ private fun InputPromptDialog(
                         if (focused) 1.5.dp else 1.dp,
                         if (focused) InputAccent else InputOutline,
                         RoundedCornerShape(12.dp),
+                    ).paneNavItem(
+                        cornerRadius = 12.dp,
+                        onActivate = { runCatching { fieldFocus.requestFocus() } },
+                        highlightColor = InputNavHighlight,
+                        isEntry = true,
                     ).padding(horizontal = 14.dp, vertical = 12.dp),
             contentAlignment = Alignment.CenterStart,
         ) {
@@ -928,7 +1056,7 @@ private fun InputPromptDialog(
                             onConfirm(text.trim())
                         },
                     ),
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier.fillMaxWidth().focusRequester(fieldFocus),
             )
         }
         Spacer(Modifier.height(16.dp))
@@ -988,6 +1116,7 @@ private fun InputChoiceDialog(
             }
         },
     ) {
+        val focusTarget = selectedIndex.coerceIn(0, (options.size - 1).coerceAtLeast(0))
         Column(
             modifier = Modifier.fillMaxWidth(),
             verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -999,15 +1128,17 @@ private fun InputChoiceDialog(
                         Modifier
                             .fillMaxWidth()
                             .clip(RoundedCornerShape(12.dp))
-                            .background(if (selected) InputAccent.copy(alpha = 0.08f) else InputField)
+                            .background(InputField)
                             .border(
                                 1.dp,
-                                if (selected) InputAccent.copy(alpha = 0.24f) else InputOutline,
+                                InputOutline,
                                 RoundedCornerShape(12.dp),
-                            ).clickable(
-                                interactionSource = remember { MutableInteractionSource() },
-                                indication = null,
-                                onClick = { onSelected(index) },
+                            ).paneNavItem(
+                                cornerRadius = 12.dp,
+                                onActivate = { onSelected(index) },
+                                highlightColor = InputNavHighlight,
+                                tapToSelect = true,
+                                isEntry = index == focusTarget,
                             ).padding(horizontal = 14.dp, vertical = 10.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
@@ -1098,6 +1229,7 @@ private fun InputMultiChoiceDialog(
             }
         },
     ) {
+        val focusTarget = options.indices.firstOrNull { it !in disabledIndices } ?: -1
         Column(
             modifier = Modifier.fillMaxWidth(),
             verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -1109,10 +1241,9 @@ private fun InputMultiChoiceDialog(
                     if (disabled) {
                         Modifier
                     } else {
-                        Modifier.clickable(
-                            interactionSource = remember { MutableInteractionSource() },
-                            indication = null,
-                            onClick = {
+                        Modifier.paneNavItem(
+                            cornerRadius = 12.dp,
+                            onActivate = {
                                 currentSelection =
                                     if (selected) {
                                         currentSelection - index
@@ -1120,6 +1251,9 @@ private fun InputMultiChoiceDialog(
                                         currentSelection + index
                                     }
                             },
+                            highlightColor = InputNavHighlight,
+                            tapToSelect = true,
+                            isEntry = index == focusTarget,
                         )
                     }
                 Row(
@@ -1272,6 +1406,7 @@ private fun ProfileCard(
                     modifier = Modifier.padding(start = InputProfileActionStartGap),
                 )
                 ProfileActionRow(
+                    state = state,
                     actions = actions,
                     modifier = Modifier.padding(start = InputProfileActionStartGap),
                 )
@@ -1310,6 +1445,11 @@ private fun ProfileSelectorRow(
                     ),
                     RoundedCornerShape(InputCardCorner),
                 )
+                .paneNavItem(
+                    cornerRadius = InputCardCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                )
                 .clickable(
                     interactionSource = selectionInteraction,
                     indication = null,
@@ -1362,6 +1502,7 @@ private fun ProfileSelectorRow(
 
 @Composable
 private fun ProfileActionRow(
+    state: InputControlsScreenState,
     actions: InputControlsScreenActions,
     modifier: Modifier = Modifier,
 ) {
@@ -1400,6 +1541,16 @@ private fun ProfileActionRow(
                     actions.onDuplicateProfile()
                 },
             )
+            if (state.selectedProfileCanReset) {
+                ProfileActionMenuItem(
+                    icon = Icons.Outlined.Restore,
+                    label = stringResource(R.string.common_ui_reset),
+                    onClick = {
+                        menuOpen = false
+                        actions.onResetProfile()
+                    },
+                )
+            }
             ProfileActionMenuItem(
                 icon = Icons.Outlined.Delete,
                 label = stringResource(R.string.common_ui_remove),
@@ -1424,10 +1575,11 @@ private fun ProfileEditButton(
             modifier
                 .size(InputProfileActionSize)
                 .clip(RoundedCornerShape(InputFieldCorner))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ),
         contentAlignment = Alignment.Center,
     ) {
@@ -1447,10 +1599,11 @@ private fun ProfileOverflowButton(onClick: () -> Unit) {
             Modifier
                 .size(InputProfileActionSize)
                 .clip(RoundedCornerShape(InputFieldCorner))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ),
         contentAlignment = Alignment.Center,
     ) {
@@ -1488,6 +1641,50 @@ private fun ProfileActionMenuItem(
     )
 }
 
+@Composable
+private fun AutoHideTouchCard(
+    state: InputControlsScreenState,
+    actions: InputControlsScreenActions,
+) {
+    CardShell {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .paneNavItem(
+                        cornerRadius = InputCardCorner,
+                        onActivate = {
+                            actions.onAutoHideTouchOnControllerChanged(!state.autoHideTouchOnController)
+                        },
+                        highlightColor = InputNavHighlight,
+                    ),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconBox(Icons.Outlined.SportsEsports, InputTextSecondary)
+            Spacer(Modifier.width(10.dp))
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = stringResource(R.string.input_controls_auto_hide_on_controller_title),
+                    color = InputTextPrimary,
+                    fontSize = InputPrimaryTextSize,
+                    fontWeight = FontWeight.Bold,
+                )
+                Spacer(Modifier.height(1.dp))
+                Text(
+                    text = stringResource(R.string.input_controls_auto_hide_on_controller_summary),
+                    color = InputTextSecondary,
+                    fontSize = InputSecondaryTextSize,
+                )
+            }
+            Spacer(Modifier.width(8.dp))
+            AppSwitch(
+                checked = state.autoHideTouchOnController,
+                onCheckedChange = actions.onAutoHideTouchOnControllerChanged,
+            )
+        }
+    }
+}
+
 @Composable
 private fun OverlayOpacityCard(
     state: InputControlsScreenState,
@@ -1524,7 +1721,16 @@ private fun OverlayOpacityCard(
                 },
                 valueRange = 10f..100f,
                 steps = 17,
-                modifier = Modifier.height(InputSliderHeight),
+                modifier =
+                    Modifier
+                        .height(InputSliderHeight)
+                        .paneNavItem(
+                            cornerRadius = InputFieldCorner,
+                            onAdjust = { dir ->
+                                actions.onOverlayOpacityChanged((state.overlayOpacity + dir * 5).coerceIn(10, 100))
+                            },
+                            highlightColor = InputNavHighlight,
+                        ),
                 colors = sliderColors(),
                 track = { InputSliderTrack(it) },
             )
@@ -1566,11 +1772,7 @@ private fun ActionCard(
                 fontWeight = FontWeight.Bold,
                 modifier = Modifier.weight(1f),
             )
-            IconActionButton(
-                image = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
-                contentDescription = title,
-                onClick = onClick,
-            )
+            DecorativeChevronBox()
         }
     }
 }
@@ -1601,10 +1803,11 @@ private fun Subcard(
             modifier =
                 Modifier
                     .fillMaxWidth()
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null,
-                        onClick = onToggleExpanded,
+                    .paneNavItem(
+                        cornerRadius = InputCardCorner,
+                        onActivate = onToggleExpanded,
+                        highlightColor = InputNavHighlight,
+                        tapToSelect = true,
                     )
                     .padding(horizontal = 12.dp, vertical = 10.dp),
             verticalAlignment = Alignment.CenterVertically,
@@ -1663,7 +1866,21 @@ private fun SliderField(
     steps: Int,
     onValueChange: (Float) -> Unit,
 ) {
-    Column(modifier = Modifier.fillMaxWidth()) {
+    val stepSize = if (steps > 0) (valueRange.endInclusive - valueRange.start) / (steps + 1) else 1f
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onAdjust = { dir ->
+                        onValueChange(
+                            (value + dir * stepSize).coerceIn(valueRange.start, valueRange.endInclusive),
+                        )
+                    },
+                    highlightColor = InputNavHighlight,
+                ),
+    ) {
         Text(
             text = label,
             color = InputTextSecondary,
@@ -1688,7 +1905,14 @@ private fun SwitchRow(
     onCheckedChange: (Boolean) -> Unit,
 ) {
     Row(
-        modifier = Modifier.fillMaxWidth(),
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = { onCheckedChange(!checked) },
+                    highlightColor = InputNavHighlight,
+                ),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
@@ -1714,10 +1938,11 @@ private fun CenteredPillButton(
                 .clip(RoundedCornerShape(InputFieldCorner))
                 .background(InputSubcard)
                 .border(1.dp, InputOutline, RoundedCornerShape(InputFieldCorner))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ).padding(horizontal = 12.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -1731,211 +1956,641 @@ private fun CenteredPillButton(
     }
 }
 
+private enum class BindingCategory { MOUSE, KEYBOARD, GAMEPAD }
+
+private val MOUSE_BINDING_OPTIONS: List<Binding> = buildList {
+    add(Binding.NONE)
+    add(Binding.MOUSE_LEFT_BUTTON); add(Binding.MOUSE_MIDDLE_BUTTON); add(Binding.MOUSE_RIGHT_BUTTON)
+    add(Binding.MOUSE_SCROLL_UP); add(Binding.MOUSE_SCROLL_DOWN)
+}
+private val KEYBOARD_BINDING_OPTIONS: List<Binding> = buildList {
+    add(Binding.NONE)
+    for (b in Binding.values()) if (b.isKeyboard) add(b)
+}
+private val GAMEPAD_BINDING_OPTIONS: List<Binding> = buildList {
+    add(Binding.NONE)
+    for (b in Binding.values()) if (b.isGamepad) add(b)
+}
+
+private fun categoryOf(b: Binding): BindingCategory = when {
+    b.isGamepad -> BindingCategory.GAMEPAD
+    b.isKeyboard -> BindingCategory.KEYBOARD
+    else -> BindingCategory.MOUSE
+}
+
+private fun optionsFor(category: BindingCategory): List<Binding> = when (category) {
+    BindingCategory.MOUSE -> MOUSE_BINDING_OPTIONS
+    BindingCategory.KEYBOARD -> KEYBOARD_BINDING_OPTIONS
+    BindingCategory.GAMEPAD -> GAMEPAD_BINDING_OPTIONS
+}
+
+private fun prettyEnum(name: String): String =
+    name.lowercase().replace('_', ' ').replaceFirstChar { it.uppercase() }
+
 @Composable
-private fun GyroscopeCard(
-    state: InputControlsScreenState,
-    actions: InputControlsScreenActions,
+private fun <T> OptionDropdown(
+    label: String,
+    current: T,
+    options: List<T>,
+    optionLabel: (T) -> String,
+    onSelect: (T) -> Unit,
 ) {
-    CardShell {
-        Column(modifier = Modifier.fillMaxWidth()) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                IconBox(Icons.Outlined.ScreenRotationAlt, InputTextSecondary)
-                Spacer(Modifier.width(10.dp))
-                Text(
-                    text = stringResource(R.string.session_gyroscope_title),
-                    color = InputTextPrimary,
-                    fontSize = InputPrimaryTextSize,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.weight(1f),
-                )
-                AppSwitch(
-                    checked = state.gyroscopeEnabled,
-                    onCheckedChange = actions.onGyroscopeEnabledChanged,
-                )
+    var expanded by remember { mutableStateOf(false) }
+    Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+        Text(label, color = InputTextSecondary, fontSize = InputPrimaryTextSize, modifier = Modifier.weight(1f))
+        Box {
+            SelectionPill(text = optionLabel(current), onClick = { expanded = true })
+            DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }, containerColor = InputCard) {
+                options.forEach { option ->
+                    DropdownMenuItem(text = { Text(optionLabel(option)) }, onClick = { onSelect(option); expanded = false })
+                }
             }
+        }
+    }
+}
 
-            Spacer(Modifier.height(InputItemGap))
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = stringResource(R.string.common_ui_mode),
-                    color = InputTextSecondary,
-                    fontSize = InputPrimaryTextSize,
-                )
-                Spacer(Modifier.width(InputItemGap))
-                ChipRow(
-                    options =
-                        listOf(
-                            stringResource(R.string.session_gyroscope_hold),
-                            stringResource(R.string.session_gyroscope_toggle),
-                        ),
-                    selectedIndex = state.gyroscopeModeIndex,
-                    onSelected = actions.onGyroscopeModeSelected,
-                )
+@Composable
+private fun <T> PillDropdown(
+    current: T,
+    options: List<T>,
+    optionLabel: (T) -> String,
+    modifier: Modifier = Modifier,
+    onSelect: (T) -> Unit,
+) {
+    var expanded by remember { mutableStateOf(false) }
+    Box(modifier) {
+        SelectionPill(text = optionLabel(current), onClick = { expanded = true })
+        DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }, containerColor = InputCard) {
+            options.forEach { option ->
+                DropdownMenuItem(text = { Text(optionLabel(option)) }, onClick = { onSelect(option); expanded = false })
             }
-
-            Spacer(Modifier.height(InputItemGap))
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = stringResource(R.string.session_gyroscope_activator_button),
-                    color = InputTextSecondary,
-                    fontSize = InputPrimaryTextSize,
-                    modifier = Modifier.weight(1f),
+        }
+    }
+}
+
+@Composable
+private fun BindingPicker(
+    label: String,
+    binding: Binding,
+    onBinding: (Binding) -> Unit,
+) {
+    var category by remember { mutableStateOf(categoryOf(binding)) }
+    Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+        Text(label, color = InputTextSecondary, fontSize = InputPrimaryTextSize, modifier = Modifier.weight(1f))
+        PillDropdown(category, BindingCategory.values().toList(), { prettyEnum(it.name) }) { newCategory ->
+            if (newCategory != category) {
+                category = newCategory
+                if (categoryOf(binding) != newCategory) onBinding(Binding.NONE)
+            }
+        }
+        Spacer(Modifier.width(8.dp))
+        PillDropdown(binding, optionsFor(category), { it.toString() }) { onBinding(it) }
+    }
+}
+
+@Composable
+private fun GestureBindingRow(
+    title: String,
+    enabled: Boolean,
+    binding: Binding,
+    onEnabled: (Boolean) -> Unit,
+    onBinding: (Binding) -> Unit,
+) {
+    Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(InputCompactGap)) {
+        SwitchRow(title = title, checked = enabled, onCheckedChange = onEnabled)
+        if (enabled) {
+            BindingPicker(stringResource(R.string.session_rts_action), binding, onBinding)
+        }
+    }
+}
+
+@Composable
+private fun HoldRow(
+    title: String,
+    enabled: Boolean,
+    binding: Binding,
+    behavior: HoldBehavior,
+    delay: Int,
+    delayLabel: String,
+    onEnabled: (Boolean) -> Unit,
+    onBinding: (Binding) -> Unit,
+    onBehavior: (HoldBehavior) -> Unit,
+    onDelay: (Int) -> Unit,
+) {
+    Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(InputCompactGap)) {
+        SwitchRow(title = title, checked = enabled, onCheckedChange = onEnabled)
+        if (enabled) {
+            BindingPicker(stringResource(R.string.session_rts_action), binding, onBinding)
+            OptionDropdown(stringResource(R.string.session_rts_behavior), behavior, HoldBehavior.values().toList(), { prettyEnum(it.name) }, onBehavior)
+            SliderField("$delayLabel: $delay", delay.toFloat(), 200f..1500f, 0) { onDelay(it.toInt()) }
+        }
+    }
+}
+
+@Composable
+private fun SwipeSet(
+    title: String,
+    enabled: Boolean,
+    up: Binding,
+    down: Binding,
+    left: Binding,
+    right: Binding,
+    threshold: Int,
+    onEnabled: (Boolean) -> Unit,
+    onUp: (Binding) -> Unit,
+    onDown: (Binding) -> Unit,
+    onLeft: (Binding) -> Unit,
+    onRight: (Binding) -> Unit,
+    onThreshold: (Int) -> Unit,
+) {
+    Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(InputCompactGap)) {
+        SwitchRow(title = title, checked = enabled, onCheckedChange = onEnabled)
+        if (enabled) {
+            BindingPicker(stringResource(R.string.session_rts_up), up, onUp)
+            BindingPicker(stringResource(R.string.session_rts_down), down, onDown)
+            BindingPicker(stringResource(R.string.session_rts_left), left, onLeft)
+            BindingPicker(stringResource(R.string.session_rts_right), right, onRight)
+            SliderField("${stringResource(R.string.session_rts_swipe_threshold)}: $threshold", threshold.toFloat(), 20f..200f, 0) { onThreshold(it.toInt()) }
+        }
+    }
+}
+
+@Composable
+private fun GestureProfileCard(
+    state: InputControlsScreenState,
+    actions: InputControlsScreenActions,
+) {
+    val selectionInteraction = remember { MutableInteractionSource() }
+    val selectorPressed by selectionInteraction.collectIsPressedAsState()
+    val selectorTint by animateFloatAsState(
+        targetValue = if (selectorPressed) 1f else 0f,
+        animationSpec = tween(durationMillis = 120, easing = FastOutSlowInEasing),
+        label = "gestureSelectorPressed",
+    )
+
+    CardShell(
+        horizontalPadding = 10.dp,
+        verticalPadding = 8.dp,
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            GestureSelectorRow(
+                state = state,
+                selectionInteraction = selectionInteraction,
+                selectorTint = selectorTint,
+                selectorPressed = selectorPressed,
+                onClick = actions.onSelectGestureProfile,
+                modifier =
+                    Modifier
+                        .weight(1f, fill = false)
+                        .widthIn(max = InputProfileSelectorMaxWidth),
+            )
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                ProfileEditButton(
+                    onClick = actions.onToggleGestureEditor,
+                    modifier = Modifier.padding(start = InputProfileActionStartGap),
                 )
-                SelectionPill(
-                    text = state.gyroscopeActivatorLabel,
-                    onClick = actions.onGyroscopeActivatorClick,
+                GestureActionRow(
+                    actions = actions,
+                    modifier = Modifier.padding(start = InputProfileActionStartGap),
                 )
             }
+        }
+    }
+}
 
-            Spacer(Modifier.height(InputItemGap))
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = stringResource(R.string.session_gyroscope_enable_right_stick),
-                    color = InputTextSecondary,
-                    fontSize = InputPrimaryTextSize,
-                    modifier = Modifier.weight(1f),
+@Composable
+private fun GestureSelectorRow(
+    state: InputControlsScreenState,
+    selectionInteraction: MutableInteractionSource,
+    selectorTint: Float,
+    selectorPressed: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier =
+            modifier
+                .clip(RoundedCornerShape(InputCardCorner))
+                .background(
+                    Color(
+                        red = InputField.red,
+                        green = InputField.green,
+                        blue = InputField.blue,
+                        alpha = 0.28f + (0.34f * selectorTint),
+                    ),
+                ).border(
+                    1.dp,
+                    Color(
+                        red = InputOutline.red + ((InputAccent.red - InputOutline.red) * selectorTint * 0.45f),
+                        green = InputOutline.green + ((InputAccent.green - InputOutline.green) * selectorTint * 0.45f),
+                        blue = InputOutline.blue + ((InputAccent.blue - InputOutline.blue) * selectorTint * 0.45f),
+                        alpha = 0.8f + (0.15f * selectorTint),
+                    ),
+                    RoundedCornerShape(InputCardCorner),
                 )
-                Text(
-                    text = stringResource(R.string.common_ui_experimental),
-                    color = InputAccent,
-                    fontSize = InputSecondaryTextSize,
-                    fontWeight = FontWeight.Medium,
+                .paneNavItem(
+                    cornerRadius = InputCardCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
                 )
-                Spacer(Modifier.width(8.dp))
-                AppSwitch(
-                    checked = state.rightStickGyroEnabled,
-                    onCheckedChange = actions.onRightStickGyroChanged,
+                .clickable(
+                    interactionSource = selectionInteraction,
+                    indication = null,
+                    onClick = onClick,
                 )
+                .padding(horizontal = 10.dp, vertical = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        ProfileSelectorIconBox(if (selectorPressed) InputTextPrimary else InputAccent)
+        Spacer(Modifier.width(10.dp))
+        Text(
+            text =
+                state.selectedGestureProfileName
+                    ?: stringResource(R.string.input_controls_editor_select_profile),
+            color = InputTextPrimary,
+            fontSize = InputPrimaryTextSize,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.weight(1f),
+        )
+        Spacer(Modifier.width(InputItemGap))
+        Icon(
+            imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
+            contentDescription = null,
+            tint =
+                if (selectorPressed) {
+                    InputTextPrimary
+                } else {
+                    InputAccent.copy(alpha = 0.9f)
+                },
+            modifier = Modifier.size(18.dp),
+        )
+    }
+}
+
+@Composable
+private fun GestureActionRow(
+    actions: InputControlsScreenActions,
+    modifier: Modifier = Modifier,
+) {
+    var menuOpen by remember { mutableStateOf(false) }
+
+    Box(modifier = modifier) {
+        ProfileOverflowButton(
+            onClick = { menuOpen = true },
+        )
+        DropdownMenu(
+            expanded = menuOpen,
+            onDismissRequest = { menuOpen = false },
+            containerColor = InputCard,
+        ) {
+            ProfileActionMenuItem(
+                icon = Icons.Outlined.Add,
+                label = stringResource(R.string.common_ui_new),
+                onClick = {
+                    menuOpen = false
+                    actions.onNewGestureProfile()
+                },
+            )
+            ProfileActionMenuItem(
+                icon = Icons.Outlined.Edit,
+                label = stringResource(R.string.common_ui_rename),
+                onClick = {
+                    menuOpen = false
+                    actions.onRenameGestureProfile()
+                },
+            )
+            ProfileActionMenuItem(
+                icon = Icons.Outlined.ContentCopy,
+                label = stringResource(R.string.common_ui_duplicate),
+                onClick = {
+                    menuOpen = false
+                    actions.onDuplicateGestureProfile()
+                },
+            )
+            ProfileActionMenuItem(
+                icon = Icons.Outlined.Delete,
+                label = stringResource(R.string.common_ui_remove),
+                iconTint = InputDanger,
+                textColor = InputDanger,
+                onClick = {
+                    menuOpen = false
+                    actions.onDeleteGestureProfile()
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun GestureEditorBody(
+    sourceConfig: TouchGestureConfig,
+    onConfigChanged: (TouchGestureConfig) -> Unit,
+) {
+    var config by remember(sourceConfig) { mutableStateOf(sourceConfig.clone()) }
+    fun mutate(block: TouchGestureConfig.() -> Unit) {
+        val next = config.clone(); next.block(); config = next; onConfigChanged(next)
+    }
+    Column(verticalArrangement = Arrangement.spacedBy(InputItemGap)) {
+        GestureBindingRow(stringResource(R.string.session_rts_tap1), config.tap1Enabled, config.tap1, { mutate { tap1Enabled = it } }, { mutate { tap1 = it } })
+            GestureBindingRow(stringResource(R.string.session_rts_tap2), config.tap2Enabled, config.tap2, { mutate { tap2Enabled = it } }, { mutate { tap2 = it } })
+            GestureBindingRow(stringResource(R.string.session_rts_tap3), config.tap3Enabled, config.tap3, { mutate { tap3Enabled = it } }, { mutate { tap3 = it } })
+            GestureBindingRow(stringResource(R.string.session_rts_tap4), config.tap4Enabled, config.tap4, { mutate { tap4Enabled = it } }, { mutate { tap4 = it } })
+            Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(InputCompactGap)) {
+                SwitchRow(stringResource(R.string.session_rts_double_tap), config.doubleTapEnabled) { mutate { doubleTapEnabled = it } }
+                if (config.doubleTapEnabled) {
+                    SliderField("${stringResource(R.string.session_rts_double_tap_delay)}: ${config.doubleTapDelay}", config.doubleTapDelay.toFloat(), 200f..1500f, 0) { mutate { doubleTapDelay = it.toInt() } }
+                }
+            }
+            HoldRow(stringResource(R.string.session_rts_long_press), config.longPressEnabled, config.longPress, config.longPressBehavior, config.longPressDelay, stringResource(R.string.session_rts_long_press_delay),
+                { mutate { longPressEnabled = it } }, { mutate { longPress = it } }, { mutate { longPressBehavior = it } }, { mutate { longPressDelay = it } })
+            HoldRow(stringResource(R.string.session_rts_hold2), config.hold2Enabled, config.hold2, config.hold2Behavior, config.hold2Delay, stringResource(R.string.session_rts_hold_delay),
+                { mutate { hold2Enabled = it } }, { mutate { hold2 = it } }, { mutate { hold2Behavior = it } }, { mutate { hold2Delay = it } })
+            HoldRow(stringResource(R.string.session_rts_hold3), config.hold3Enabled, config.hold3, config.hold3Behavior, config.hold3Delay, stringResource(R.string.session_rts_hold_delay),
+                { mutate { hold3Enabled = it } }, { mutate { hold3 = it } }, { mutate { hold3Behavior = it } }, { mutate { hold3Delay = it } })
+            HoldRow(stringResource(R.string.session_rts_hold4), config.hold4Enabled, config.hold4, config.hold4Behavior, config.hold4Delay, stringResource(R.string.session_rts_hold_delay),
+                { mutate { hold4Enabled = it } }, { mutate { hold4 = it } }, { mutate { hold4Behavior = it } }, { mutate { hold4Delay = it } })
+            SwipeSet(stringResource(R.string.session_rts_swipe3), config.swipe3Enabled, config.swipe3Up, config.swipe3Down, config.swipe3Left, config.swipe3Right, config.swipe3Threshold,
+                { mutate { swipe3Enabled = it } }, { mutate { swipe3Up = it } }, { mutate { swipe3Down = it } }, { mutate { swipe3Left = it } }, { mutate { swipe3Right = it } }, { mutate { swipe3Threshold = it } })
+            SwipeSet(stringResource(R.string.session_rts_swipe4), config.swipe4Enabled, config.swipe4Up, config.swipe4Down, config.swipe4Left, config.swipe4Right, config.swipe4Threshold,
+                { mutate { swipe4Enabled = it } }, { mutate { swipe4Up = it } }, { mutate { swipe4Down = it } }, { mutate { swipe4Left = it } }, { mutate { swipe4Right = it } }, { mutate { swipe4Threshold = it } })
+            if (config.drag2Action == DragAction.NONE) {
+                OptionDropdown(stringResource(R.string.session_rts_pan), config.panAction, PanAction.values().toList(), { prettyEnum(it.name) }) { mutate { panAction = it } }
+            }
+            if (config.panAction == PanAction.NONE) {
+                OptionDropdown(stringResource(R.string.session_rts_drag2), config.drag2Action, DragAction.values().toList(), { prettyEnum(it.name) }) { mutate { drag2Action = it } }
             }
+            if (config.pan1Action == PanAction.NONE) {
+                OptionDropdown(stringResource(R.string.session_rts_drag), config.dragAction, DragAction.values().toList(), { prettyEnum(it.name) }) { mutate { dragAction = it } }
+            }
+            if (config.dragAction == DragAction.NONE) {
+                OptionDropdown(stringResource(R.string.session_rts_pan1), config.pan1Action, PanAction.values().toList(), { prettyEnum(it.name) }) { mutate { pan1Action = it } }
+            }
+            OptionDropdown(stringResource(R.string.session_rts_zoom), config.zoomAction, ZoomAction.values().toList(), { prettyEnum(it.name) }) { mutate { zoomAction = it } }
+            if (config.dragAction != DragAction.NONE || config.drag2Action != DragAction.NONE) {
+                SliderField("${stringResource(R.string.session_rts_drag_threshold)}: ${config.dragThreshold}", config.dragThreshold.toFloat(), 10f..200f, 0) { mutate { dragThreshold = it.toInt() } }
+            }
+        SliderField("${stringResource(R.string.session_rts_pan_threshold)}: ${config.gestureThreshold}", config.gestureThreshold.toFloat(), 10f..120f, 0) { mutate { gestureThreshold = it.toInt() } }
+    }
+}
 
-            Spacer(Modifier.height(InputItemGap))
+@Composable
+private fun GyroscopeCard(
+    state: InputControlsScreenState,
+    actions: InputControlsScreenActions,
+) {
+    CardShell {
+        Column(modifier = Modifier.fillMaxWidth()) {
             Row(
-                modifier = Modifier.fillMaxWidth(),
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .paneNavItem(
+                            cornerRadius = InputFieldCorner,
+                            onActivate = { actions.onGyroscopeEnabledChanged(!state.gyroscopeEnabled) },
+                            highlightColor = InputNavHighlight,
+                        ),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
+                IconBox(Icons.Outlined.ScreenRotationAlt, InputTextSecondary)
+                Spacer(Modifier.width(10.dp))
                 Text(
-                    text = stringResource(R.string.session_gyroscope_experimental_mouse_movement),
-                    color = InputTextSecondary,
+                    text = stringResource(R.string.session_gyroscope_title),
+                    color = InputTextPrimary,
                     fontSize = InputPrimaryTextSize,
+                    fontWeight = FontWeight.Bold,
                     modifier = Modifier.weight(1f),
                 )
-                Text(
-                    text = stringResource(R.string.common_ui_experimental),
-                    color = InputAccent,
-                    fontSize = InputSecondaryTextSize,
-                    fontWeight = FontWeight.Medium,
-                )
-                Spacer(Modifier.width(8.dp))
                 AppSwitch(
-                    checked = state.gyroMouseEnabled,
-                    onCheckedChange = actions.onGyroMouseEnabledChanged,
+                    checked = state.gyroscopeEnabled,
+                    onCheckedChange = actions.onGyroscopeEnabledChanged,
                 )
             }
 
-            if (state.gyroMouseEnabled) {
-                Spacer(Modifier.height(InputCompactGap))
-                SliderField(
-                    label = stringResource(R.string.session_gyroscope_mouse_sensitivity_format, state.gyroMouseScale),
-                    value = state.gyroMouseScale.toFloat(),
-                    valueRange = 0f..200f,
-                    steps = 199,
-                    onValueChange = { actions.onGyroMouseScaleChanged(it.roundToInt().coerceIn(0, 200)) },
-                )
-            }
+            if (state.gyroscopeEnabled) {
+                Spacer(Modifier.height(InputItemGap))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        text = stringResource(R.string.common_ui_mode),
+                        color = InputTextSecondary,
+                        fontSize = InputPrimaryTextSize,
+                    )
+                    Spacer(Modifier.width(InputItemGap))
+                    ChipRow(
+                        options =
+                            listOf(
+                                stringResource(R.string.session_gyroscope_hold),
+                                stringResource(R.string.session_gyroscope_toggle),
+                            ),
+                        selectedIndex = state.gyroscopeModeIndex,
+                        onSelected = actions.onGyroscopeModeSelected,
+                    )
+                }
 
-            Spacer(Modifier.height(InputCompactGap))
-            Subcard(
-                title = stringResource(R.string.session_gyroscope_calibrate),
-                expanded = state.gyroscopeExpanded,
-                onToggleExpanded = {
-                    actions.onGyroscopeExpandedChanged(!state.gyroscopeExpanded)
-                },
-            ) {
                 Spacer(Modifier.height(InputItemGap))
-                SliderField(
-                    label = stringResource(R.string.session_gyroscope_x_sensitivity_format, state.gyroXSensitivity),
-                    value = state.gyroXSensitivity.toFloat(),
-                    valueRange = 0f..200f,
-                    steps = 199,
-                    onValueChange = { actions.onGyroXSensitivityChanged(it.roundToInt().coerceIn(0, 200)) },
-                )
-                Spacer(Modifier.height(InputCompactGap))
-                SliderField(
-                    label = stringResource(R.string.session_gyroscope_y_sensitivity_format, state.gyroYSensitivity),
-                    value = state.gyroYSensitivity.toFloat(),
-                    valueRange = 0f..200f,
-                    steps = 199,
-                    onValueChange = { actions.onGyroYSensitivityChanged(it.roundToInt().coerceIn(0, 200)) },
-                )
-                Spacer(Modifier.height(InputCompactGap))
-                SliderField(
-                    label = stringResource(R.string.session_gyroscope_smoothing_format, state.gyroSmoothing),
-                    value = state.gyroSmoothing.toFloat(),
-                    valueRange = 0f..100f,
-                    steps = 99,
-                    onValueChange = { actions.onGyroSmoothingChanged(it.roundToInt().coerceIn(0, 100)) },
-                )
-                Spacer(Modifier.height(InputCompactGap))
-                SliderField(
-                    label = stringResource(R.string.session_gyroscope_deadzone_format, state.gyroDeadzone),
-                    value = state.gyroDeadzone.toFloat(),
-                    valueRange = 0f..100f,
-                    steps = 99,
-                    onValueChange = { actions.onGyroDeadzoneChanged(it.roundToInt().coerceIn(0, 100)) },
-                )
+                Row(
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .paneNavItem(
+                                cornerRadius = InputFieldCorner,
+                                onActivate = { actions.onGyroOrientationModeChanged(!state.gyroOrientationEnabled) },
+                                highlightColor = InputNavHighlight,
+                            ),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        text = stringResource(R.string.session_gyroscope_orientation_mode),
+                        color = InputTextSecondary,
+                        fontSize = InputPrimaryTextSize,
+                        modifier = Modifier.weight(1f),
+                    )
+                    AppSwitch(
+                        checked = state.gyroOrientationEnabled,
+                        onCheckedChange = actions.onGyroOrientationModeChanged,
+                    )
+                }
+
                 Spacer(Modifier.height(InputItemGap))
-                SwitchRow(
-                    title = stringResource(R.string.session_gamepad_invert_x),
-                    checked = state.invertGyroX,
-                    onCheckedChange = actions.onInvertGyroXChanged,
-                )
-                Spacer(Modifier.height(4.dp))
-                SwitchRow(
-                    title = stringResource(R.string.session_gamepad_invert_y),
-                    checked = state.invertGyroY,
-                    onCheckedChange = actions.onInvertGyroYChanged,
-                )
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        text = stringResource(R.string.session_gyroscope_activator_button),
+                        color = InputTextSecondary,
+                        fontSize = InputPrimaryTextSize,
+                        modifier = Modifier.weight(1f),
+                    )
+                    SelectionPill(
+                        text = state.gyroscopeActivatorLabel,
+                        onClick = actions.onGyroscopeActivatorClick,
+                    )
+                }
+
                 Spacer(Modifier.height(InputItemGap))
-                Box(
+                Row(
                     modifier =
                         Modifier
                             .fillMaxWidth()
-                            .height(136.dp)
-                            .clip(RoundedCornerShape(10.dp))
-                            .background(Color.Black),
+                            .paneNavItem(
+                                cornerRadius = InputFieldCorner,
+                                onActivate = { actions.onRightStickGyroChanged(!state.rightStickGyroEnabled) },
+                                highlightColor = InputNavHighlight,
+                            ),
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
-                    AndroidView(
-                        factory = { context ->
-                            InputControlsView(context, true).apply {
-                                actions.onAttachGyroPreview(this)
-                            }
-                        },
-                        modifier = Modifier.fillMaxSize(),
-                        update = { view ->
-                            actions.onAttachGyroPreview(view)
-                        },
+                    Text(
+                        text = stringResource(R.string.session_gyroscope_enable_right_stick),
+                        color = InputTextSecondary,
+                        fontSize = InputPrimaryTextSize,
+                        modifier = Modifier.weight(1f),
+                    )
+                    Text(
+                        text = stringResource(R.string.common_ui_experimental),
+                        color = InputAccent,
+                        fontSize = InputSecondaryTextSize,
+                        fontWeight = FontWeight.Medium,
+                    )
+                    Spacer(Modifier.width(8.dp))
+                    AppSwitch(
+                        checked = state.rightStickGyroEnabled,
+                        onCheckedChange = actions.onRightStickGyroChanged,
                     )
-                    DisposableEffect(Unit) {
-                        onDispose { actions.onDetachGyroPreview() }
-                    }
                 }
+
                 Spacer(Modifier.height(InputItemGap))
-                CenteredPillButton(
-                    text = stringResource(R.string.session_gyroscope_reset_stick),
-                    onClick = actions.onResetGyroPreview,
-                )
+                Row(
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .paneNavItem(
+                                cornerRadius = InputFieldCorner,
+                                onActivate = { actions.onGyroMouseEnabledChanged(!state.gyroMouseEnabled) },
+                                highlightColor = InputNavHighlight,
+                            ),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        text = stringResource(R.string.session_gyroscope_experimental_mouse_movement),
+                        color = InputTextSecondary,
+                        fontSize = InputPrimaryTextSize,
+                        modifier = Modifier.weight(1f),
+                    )
+                    Text(
+                        text = stringResource(R.string.common_ui_experimental),
+                        color = InputAccent,
+                        fontSize = InputSecondaryTextSize,
+                        fontWeight = FontWeight.Medium,
+                    )
+                    Spacer(Modifier.width(8.dp))
+                    AppSwitch(
+                        checked = state.gyroMouseEnabled,
+                        onCheckedChange = actions.onGyroMouseEnabledChanged,
+                    )
+                }
+
+                if (state.gyroMouseEnabled) {
+                    Spacer(Modifier.height(InputCompactGap))
+                    SliderField(
+                        label = stringResource(R.string.session_gyroscope_mouse_sensitivity_format, state.gyroMouseScale),
+                        value = state.gyroMouseScale.toFloat(),
+                        valueRange = 0f..200f,
+                        steps = 199,
+                        onValueChange = { actions.onGyroMouseScaleChanged(it.roundToInt().coerceIn(0, 200)) },
+                    )
+                }
+
+                Spacer(Modifier.height(InputCompactGap))
+                Subcard(
+                    title = stringResource(R.string.session_gyroscope_calibrate),
+                    expanded = state.gyroscopeExpanded,
+                    onToggleExpanded = {
+                        actions.onGyroscopeExpandedChanged(!state.gyroscopeExpanded)
+                    },
+                ) {
+                    Spacer(Modifier.height(InputItemGap))
+                    SliderField(
+                        label = stringResource(R.string.session_gyroscope_x_sensitivity_format, state.gyroXSensitivity),
+                        value = state.gyroXSensitivity.toFloat(),
+                        valueRange = 1f..300f,
+                        steps = 0,
+                        onValueChange = { actions.onGyroXSensitivityChanged(it.roundToInt().coerceIn(1, 300)) },
+                    )
+                    Spacer(Modifier.height(InputCompactGap))
+                    SliderField(
+                        label = stringResource(R.string.session_gyroscope_y_sensitivity_format, state.gyroYSensitivity),
+                        value = state.gyroYSensitivity.toFloat(),
+                        valueRange = 1f..300f,
+                        steps = 0,
+                        onValueChange = { actions.onGyroYSensitivityChanged(it.roundToInt().coerceIn(1, 300)) },
+                    )
+                    Spacer(Modifier.height(InputCompactGap))
+                    SliderField(
+                        label = stringResource(R.string.session_gyroscope_smoothing_format, state.gyroSmoothing),
+                        value = state.gyroSmoothing.toFloat(),
+                        valueRange = 0f..100f,
+                        steps = 99,
+                        onValueChange = { actions.onGyroSmoothingChanged(it.roundToInt().coerceIn(0, 100)) },
+                    )
+                    Spacer(Modifier.height(InputCompactGap))
+                    SliderField(
+                        label = stringResource(R.string.session_gyroscope_deadzone_format, state.gyroDeadzone),
+                        value = state.gyroDeadzone.toFloat(),
+                        valueRange = 0f..100f,
+                        steps = 99,
+                        onValueChange = { actions.onGyroDeadzoneChanged(it.roundToInt().coerceIn(0, 100)) },
+                    )
+                    Spacer(Modifier.height(InputItemGap))
+                    SwitchRow(
+                        title = stringResource(R.string.session_gamepad_invert_x),
+                        checked = state.invertGyroX,
+                        onCheckedChange = actions.onInvertGyroXChanged,
+                    )
+                    Spacer(Modifier.height(4.dp))
+                    SwitchRow(
+                        title = stringResource(R.string.session_gamepad_invert_y),
+                        checked = state.invertGyroY,
+                        onCheckedChange = actions.onInvertGyroYChanged,
+                    )
+                    Spacer(Modifier.height(InputItemGap))
+                    Box(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .height(136.dp)
+                                .clip(RoundedCornerShape(10.dp))
+                                .background(Color.Black),
+                    ) {
+                        AndroidView(
+                            factory = { context ->
+                                InputControlsView(context, true).apply {
+                                    actions.onAttachGyroPreview(this)
+                                }
+                            },
+                            modifier = Modifier.fillMaxSize(),
+                            update = { view ->
+                                actions.onAttachGyroPreview(view)
+                            },
+                        )
+                        DisposableEffect(Unit) {
+                            onDispose { actions.onDetachGyroPreview() }
+                        }
+                    }
+                    Spacer(Modifier.height(InputItemGap))
+                    CenteredPillButton(
+                        text = stringResource(R.string.session_gyroscope_reset_stick),
+                        onClick = actions.onResetGyroPreview,
+                    )
+                }
             }
         }
     }
@@ -2134,10 +2789,11 @@ private fun BindingSelectionButton(
                 .clip(RoundedCornerShape(InputFieldCorner))
                 .background(InputField)
                 .border(1.dp, InputOutline, RoundedCornerShape(InputFieldCorner))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
+                .paneNavItem(
+                    cornerRadius = InputFieldCorner,
+                    onActivate = onClick,
+                    highlightColor = InputNavHighlight,
+                    tapToSelect = true,
                 ).padding(horizontal = 7.dp, vertical = 5.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
diff --git a/app/src/main/feature/settings/nav/SettingsNavGraph.kt b/app/src/main/feature/settings/nav/SettingsNavGraph.kt
index c29674368..adad043bb 100644
--- a/app/src/main/feature/settings/nav/SettingsNavGraph.kt
+++ b/app/src/main/feature/settings/nav/SettingsNavGraph.kt
@@ -9,27 +9,84 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.fragment.compose.AndroidFragment
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.winlator.cmod.R
 import com.winlator.cmod.feature.sync.google.GoogleFragment
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
 
 object SettingsRoutes {
     fun fromNavItem(item: SettingsNavItem): String = "settings/${item.name.lowercase()}"
 }
 
-private val SettingsBg = Color(0xFF1C1C1C)
+enum class SettingsFocusZone { SIDEBAR, CONTENT }
+
+class SettingsNavBridge {
+    var selectedItem by mutableStateOf(SettingsNavItem.CONTAINERS)
+    var zone by mutableStateOf(SettingsFocusZone.SIDEBAR)
+    var onSelectItem: ((SettingsNavItem) -> Unit)? = null
+
+    var contentControllerActive by mutableStateOf(false)
+    var contentNavSignal by mutableStateOf(0)
+        private set
+    var contentNavDir by mutableStateOf(0)
+        private set
+
+    private fun contentNav(dir: Int) {
+        contentNavDir = dir
+        contentNavSignal++
+    }
+
+    fun contentNavLeft() = contentNav(PANE_DIR_LEFT)
+
+    fun contentNavRight() = contentNav(PANE_DIR_RIGHT)
+
+    fun contentNavUp() = contentNav(PANE_DIR_UP)
+
+    fun contentNavDown() = contentNav(PANE_DIR_DOWN)
+
+    fun contentActivate() = contentNav(PANE_DIR_ACTIVATE)
+
+    fun contentSecondary() = contentNav(PANE_DIR_SECONDARY)
+
+    var contentSectionSignal by mutableStateOf(0)
+        private set
+    var contentSectionDir by mutableStateOf(0)
+        private set
+
+    private fun contentSection(dir: Int) {
+        contentSectionDir = dir
+        contentSectionSignal++
+    }
+
+    fun contentSectionPrev() = contentSection(-1)
+
+    fun contentSectionNext() = contentSection(1)
+}
+
+private val SettingsBg = Color(0xFF11111C)
 
 @Composable
 fun SettingsHost(
+    bridge: SettingsNavBridge,
     startItem: SettingsNavItem = SettingsNavItem.CONTAINERS,
     selectedProfileId: Int = 0,
     bordersPaused: Boolean = false,
@@ -38,6 +95,28 @@ fun SettingsHost(
     val settingsNavController = rememberNavController()
     var currentItem by rememberSaveable { mutableStateOf(startItem) }
 
+    val navigateTo: (SettingsNavItem) -> Unit = { item ->
+        if (item != currentItem) {
+            currentItem = item
+            settingsNavController.navigate(SettingsRoutes.fromNavItem(item)) {
+                popUpTo(SettingsRoutes.fromNavItem(startItem)) {
+                    inclusive = false
+                    saveState = true
+                }
+                launchSingleTop = true
+                restoreState = true
+            }
+        }
+    }
+
+    SideEffect { bridge.selectedItem = currentItem }
+
+    DisposableEffect(Unit) {
+        bridge.zone = SettingsFocusZone.SIDEBAR
+        bridge.onSelectItem = navigateTo
+        onDispose { bridge.onSelectItem = null }
+    }
+
     Box(
         modifier =
             Modifier
@@ -51,66 +130,79 @@ fun SettingsHost(
         ) {
             SettingsNavSidebar(
                 selectedItem = currentItem,
+                railActive = bridge.zone == SettingsFocusZone.SIDEBAR,
                 onItemSelected = { item ->
-                    if (item != currentItem) {
-                        currentItem = item
-                        settingsNavController.navigate(SettingsRoutes.fromNavItem(item)) {
-                            popUpTo(SettingsRoutes.fromNavItem(startItem)) {
-                                inclusive = false
-                                saveState = true
-                            }
-                            launchSingleTop = true
-                            restoreState = true
-                        }
-                    }
+                    bridge.zone = SettingsFocusZone.SIDEBAR
+                    navigateTo(item)
                 },
                 onBackPressed = onBack,
                 bordersPaused = bordersPaused,
             )
 
-            NavHost(
-                navController = settingsNavController,
-                startDestination = SettingsRoutes.fromNavItem(startItem),
-                enterTransition = { fadeIn(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
-                exitTransition = { fadeOut(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
-                popEnterTransition = { fadeIn(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
-                popExitTransition = { fadeOut(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
+            Box(
                 modifier =
                     Modifier
                         .weight(1f)
-                        .fillMaxHeight(),
+                        .fillMaxHeight()
+                        .pointerInput(Unit) {
+                            awaitPointerEventScope {
+                                while (true) {
+                                    val ev = awaitPointerEvent(PointerEventPass.Initial)
+                                    if (ev.type == PointerEventType.Press) {
+                                        bridge.zone = SettingsFocusZone.CONTENT
+                                        bridge.contentControllerActive = false
+                                    }
+                                }
+                            }
+                        },
             ) {
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.CONTAINERS)) {
-                    AndroidFragment<ContainersFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.INPUT_CONTROLS)) {
-                    AndroidFragment<InputControlsFragment>(
-                        arguments =
-                            Bundle().apply {
-                                putInt("selectedProfileId", selectedProfileId)
-                            },
-                    )
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.COMPONENTS)) {
-                    AndroidFragment<ContentsFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.DRIVERS)) {
-                    AndroidFragment<DriversFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.STORES)) {
-                    AndroidFragment<StoresFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.DEBUG)) {
-                    AndroidFragment<DebugFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.GOOGLE)) {
-                    AndroidFragment<GoogleFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.PRESETS)) {
-                    AndroidFragment<PresetsFragment>()
-                }
-                composable(SettingsRoutes.fromNavItem(SettingsNavItem.OTHER)) {
-                    AndroidFragment<OtherSettingsFragment>()
+                NavHost(
+                    navController = settingsNavController,
+                    startDestination = SettingsRoutes.fromNavItem(startItem),
+                    enterTransition = { fadeIn(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
+                    exitTransition = { fadeOut(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
+                    popEnterTransition = { fadeIn(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
+                    popExitTransition = { fadeOut(tween(250, easing = androidx.compose.animation.core.FastOutSlowInEasing)) },
+                    modifier = Modifier.fillMaxSize(),
+                ) {
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.CONTAINERS)) {
+                        AndroidFragment<ContainersFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.INPUT_CONTROLS)) {
+                        AndroidFragment<InputControlsFragment>(
+                            arguments =
+                                Bundle().apply {
+                                    putInt("selectedProfileId", selectedProfileId)
+                                },
+                        )
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.COMPONENTS)) {
+                        AndroidFragment<ContentsFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.DRIVERS)) {
+                        AndroidFragment<DriversFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.STORES)) {
+                        AndroidFragment<StoresFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.DEBUG)) {
+                        AndroidFragment<DebugFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.GOOGLE)) {
+                        AndroidFragment<GoogleFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.PRESETS)) {
+                        AndroidFragment<PresetsFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.OTHER)) {
+                        AndroidFragment<OtherSettingsFragment>()
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.RETRO)) {
+                        com.winlator.cmod.feature.retro.RetroDefaultsScreen(bridge = bridge)
+                    }
+                    composable(SettingsRoutes.fromNavItem(SettingsNavItem.CREDITS)) {
+                        com.winlator.cmod.feature.retro.RetroCreditsScreen(bridge = bridge)
+                    }
                 }
             }
         }
diff --git a/app/src/main/feature/settings/nav/SettingsNavSidebar.kt b/app/src/main/feature/settings/nav/SettingsNavSidebar.kt
index 4e3f1ac2c..bb5a05b37 100644
--- a/app/src/main/feature/settings/nav/SettingsNavSidebar.kt
+++ b/app/src/main/feature/settings/nav/SettingsNavSidebar.kt
@@ -2,15 +2,19 @@ package com.winlator.cmod.feature.settings
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.interaction.collectIsHoveredAsState
 import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -32,20 +36,24 @@ import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.AccountCircle
 import androidx.compose.material.icons.outlined.BugReport
 import androidx.compose.material.icons.outlined.Extension
+import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.Memory
 import androidx.compose.material.icons.outlined.ShoppingBag
 import androidx.compose.material.icons.outlined.SportsEsports
 import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.VideogameAsset
 import androidx.compose.material.icons.outlined.ViewInAr
 import androidx.compose.material.icons.outlined.Widgets
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
@@ -87,6 +95,7 @@ enum class NavSection {
     ACCOUNTS,
     SYSTEM,
     TOOLS,
+    CREDITS,
 }
 
 enum class SettingsNavItem(
@@ -102,8 +111,10 @@ enum class SettingsNavItem(
     COMPONENTS(R.id.main_menu_contents, Icons.Outlined.Extension, R.string.settings_content_components, NavSection.SYSTEM),
     DRIVERS(R.id.main_menu_adrenotools_gpu_drivers, Icons.Outlined.Memory, R.string.settings_drivers_title, NavSection.SYSTEM),
     INPUT_CONTROLS(R.id.main_menu_input_controls, Icons.Outlined.SportsEsports, R.string.common_ui_input_controls, NavSection.SYSTEM),
+    RETRO(R.id.main_menu_retro, Icons.Outlined.VideogameAsset, R.string.settings_retro_title, NavSection.SYSTEM),
     OTHER(R.id.main_menu_other, Icons.Outlined.Widgets, R.string.common_ui_other, NavSection.SYSTEM),
     DEBUG(R.id.main_menu_advanced, Icons.Outlined.BugReport, R.string.settings_debug_title, NavSection.TOOLS),
+    CREDITS(R.id.main_menu_credits, Icons.Outlined.Info, R.string.retro_scr_tab_credits, NavSection.CREDITS),
     ;
 
     companion object {
@@ -119,6 +130,7 @@ private val sectionedNavItems: Map<NavSection, List<SettingsNavItem>> =
 @Composable
 fun SettingsNavSidebar(
     selectedItem: SettingsNavItem,
+    railActive: Boolean = true,
     onItemSelected: (SettingsNavItem) -> Unit,
     onBackPressed: () -> Unit,
     bordersPaused: Boolean = false,
@@ -128,6 +140,32 @@ fun SettingsNavSidebar(
     val navStartInset = navBarPadding.calculateStartPadding(layoutDirection)
     val navBottomInset = navBarPadding.calculateBottomPadding()
 
+    val listState = rememberLazyListState()
+    val selectedLazyIndex =
+        remember(selectedItem) {
+            var idx = 0
+            var found = 0
+            NavSection.entries.forEachIndexed { sIdx, section ->
+                if (sIdx > 0) idx++
+                idx++
+                val secItems = sectionedNavItems[section].orEmpty()
+                val pos = secItems.indexOf(selectedItem)
+                if (pos >= 0) found = idx + pos
+                idx += secItems.size
+            }
+            found
+        }
+    LaunchedEffect(selectedLazyIndex) {
+        val info = listState.layoutInfo
+        if (info.visibleItemsInfo.isEmpty()) return@LaunchedEffect
+        val visible = info.visibleItemsInfo.firstOrNull { it.index == selectedLazyIndex }
+        val fullyVisible =
+            visible != null &&
+                visible.offset >= info.viewportStartOffset &&
+                visible.offset + visible.size <= info.viewportEndOffset
+        if (!fullyVisible) runCatching { listState.animateScrollToItem(selectedLazyIndex) }
+    }
+
     Row(
         modifier =
             Modifier
@@ -146,6 +184,7 @@ fun SettingsNavSidebar(
 
             // Scrollable nav items
             LazyColumn(
+                state = listState,
                 modifier =
                     Modifier
                         .weight(1f)
@@ -175,6 +214,7 @@ fun SettingsNavSidebar(
                         NavItemRow(
                             item = item,
                             isSelected = item == selectedItem,
+                            railActive = railActive,
                             borderPaused = bordersPaused,
                             onClick = { onItemSelected(item) },
                         )
@@ -253,16 +293,21 @@ private fun SectionHeader(label: String) {
 
 // ─── Navigation item row ────────────────────────────────────────────
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun NavItemRow(
     item: SettingsNavItem,
     isSelected: Boolean,
+    railActive: Boolean = true,
     borderPaused: Boolean = false,
     onClick: () -> Unit,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isHovered by interactionSource.collectIsHoveredAsState()
-    val isFocused by interactionSource.collectIsFocusedAsState()
+    val bringIntoView = remember { BringIntoViewRequester() }
+    LaunchedEffect(isSelected) {
+        if (isSelected) runCatching { bringIntoView.bringIntoView() }
+    }
 
     val iconTint by animateColorAsState(
         targetValue = if (isSelected) AccentSelected else IconMuted,
@@ -274,11 +319,12 @@ private fun NavItemRow(
         animationSpec = tween(280),
         label = "textColor",
     )
+    val showFill = isSelected && railActive
     val bgAlpha by animateFloatAsState(
         targetValue =
             when {
-                isSelected -> 1f
-                isHovered || isFocused -> 0.5f
+                showFill -> 1f
+                isHovered -> 0.5f
                 else -> 0f
             },
         animationSpec = tween(200),
@@ -290,6 +336,7 @@ private fun NavItemRow(
         modifier =
             Modifier
                 .fillMaxWidth()
+                .bringIntoViewRequester(bringIntoView)
                 .padding(vertical = 2.dp)
                 .background(
                     color = SelectedBg.copy(alpha = bgAlpha),
@@ -305,17 +352,15 @@ private fun NavItemRow(
                         Modifier
                     },
                 ).then(
-                    if (!isSelected && (isHovered || isFocused)) {
+                    if (!isSelected && isHovered) {
                         Modifier.staticBorder()
                     } else {
                         Modifier
                     },
                 ).hoverable(interactionSource)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                ).padding(horizontal = 12.dp, vertical = 10.dp),
+                .pointerInput(Unit) {
+                    detectTapGestures { onClick() }
+                }.padding(horizontal = 12.dp, vertical = 10.dp),
     ) {
         Icon(
             imageVector = item.icon,
diff --git a/app/src/main/feature/settings/other/OtherSettingsFragment.kt b/app/src/main/feature/settings/other/OtherSettingsFragment.kt
index 269a7e43c..79fa30188 100644
--- a/app/src/main/feature/settings/other/OtherSettingsFragment.kt
+++ b/app/src/main/feature/settings/other/OtherSettingsFragment.kt
@@ -26,7 +26,9 @@ import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
 import com.winlator.cmod.app.config.SettingsConfig
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.app.update.UpdateChecker
+import com.winlator.cmod.feature.shortcuts.FrontendExporter
 import com.winlator.cmod.feature.setup.SetupWizardActivity
 import com.winlator.cmod.runtime.audio.midi.MidiManager
 import com.winlator.cmod.runtime.display.environment.ImageFsInstaller
@@ -82,6 +84,7 @@ class OtherSettingsFragment : Fragment() {
                         ),
                 ) {
                     OtherSettingsScreen(
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                         state = uiState,
                         onCheckForUpdatesChanged = { checked ->
                             preferences.edit { putBoolean("check_for_updates", checked) }
@@ -135,14 +138,11 @@ class OtherSettingsFragment : Fragment() {
                                 SettingsConfig.DEFAULT_SHORTCUT_EXPORT_PATH,
                             )
                         },
+                        onExportAll = { exportAllShortcuts(ctx) },
                         onCursorSpeedChanged = { percent ->
                             preferences.edit { putFloat("cursor_speed", percent / 100f) }
                             refresh()
                         },
-                        onUseDRI3Changed = { checked ->
-                            preferences.edit { putBoolean("use_dri3", checked) }
-                            refresh()
-                        },
                         onCursorLockChanged = { checked ->
                             preferences.edit { putBoolean("cursor_lock", checked) }
                             refresh()
@@ -156,6 +156,11 @@ class OtherSettingsFragment : Fragment() {
                             WinToast.show(ctx, R.string.settings_general_take_effect_next_startup)
                             refresh()
                         },
+                        onAutoScrapingChanged = { checked ->
+                            preferences.edit { putBoolean("enable_auto_scraping", checked) }
+                            WinToast.show(ctx, R.string.settings_general_take_effect_next_startup)
+                            refresh()
+                        },
                         onOpenInBrowserChanged = { checked ->
                             preferences.edit { putBoolean("open_with_android_browser", checked) }
                             refresh()
@@ -164,6 +169,14 @@ class OtherSettingsFragment : Fragment() {
                             preferences.edit { putBoolean("share_android_clipboard", checked) }
                             refresh()
                         },
+                        onEnableBackgroundSessionChanged = { checked ->
+                            preferences.edit { putBoolean("enable_background_session", checked) }
+                            refresh()
+                        },
+                        onExternalDisplayOutputChanged = { checked ->
+                            preferences.edit { putBoolean("external_display_output", checked) }
+                            refresh()
+                        },
                         onRunSetupWizard = {
                             startActivity(SetupWizardActivity.createManualRerunIntent(ctx))
                         },
@@ -221,13 +234,16 @@ class OtherSettingsFragment : Fragment() {
                 cursorSpeedPercent =
                     (preferences.getFloat("cursor_speed", 1.0f) * 100)
                         .toInt()
-                        .coerceIn(10, 200),
-                useDRI3 = preferences.getBoolean("use_dri3", true),
+                        .coerceIn(10, 300),
+
                 cursorLock = preferences.getBoolean("cursor_lock", false),
                 xinputDisabled = preferences.getBoolean("xinput_toggle", false),
+                enableAutoScraping = preferences.getBoolean("enable_auto_scraping", false),
                 enableFileProvider = preferences.getBoolean("enable_file_provider", true),
                 openInBrowser = preferences.getBoolean("open_with_android_browser", false),
                 shareClipboard = preferences.getBoolean("share_android_clipboard", false),
+                enableBackgroundSession = preferences.getBoolean("enable_background_session", false),
+                externalDisplayOutput = preferences.getBoolean("external_display_output", false),
                 imagefsInstallProgress = uiState.imagefsInstallProgress,
             )
     }
@@ -272,7 +288,15 @@ class OtherSettingsFragment : Fragment() {
 
                 override fun onFinished(success: Boolean) {
                     main.post {
-                        uiState = uiState.copy(imagefsInstallProgress = null)
+                        if (success) {
+                            uiState = uiState.copy(imagefsInstallProgress = 100)
+                            main.postDelayed(
+                                { uiState = uiState.copy(imagefsInstallProgress = null) },
+                                500L,
+                            )
+                        } else {
+                            uiState = uiState.copy(imagefsInstallProgress = null)
+                        }
                     }
                 }
             },
@@ -296,6 +320,20 @@ class OtherSettingsFragment : Fragment() {
         }
     }
 
+    private fun exportAllShortcuts(ctx: Context) {
+        Thread {
+            val count = FrontendExporter.exportAll(ctx)
+            val dir = FrontendExporter.resolveExportDir(ctx)
+            activity?.runOnUiThread {
+                if (count > 0) {
+                    WinToast.show(ctx, getString(R.string.shortcuts_export_all_done, count, dir?.path ?: ""))
+                } else {
+                    WinToast.show(ctx, R.string.shortcuts_export_all_none)
+                }
+            }
+        }.start()
+    }
+
     private fun installSoundFont(uri: Uri) {
         val ctx = context ?: return
         val dialog = PreloaderDialog(requireActivity())
diff --git a/app/src/main/feature/settings/other/OtherSettingsScreen.kt b/app/src/main/feature/settings/other/OtherSettingsScreen.kt
index f1f3a701a..a98a38274 100644
--- a/app/src/main/feature/settings/other/OtherSettingsScreen.kt
+++ b/app/src/main/feature/settings/other/OtherSettingsScreen.kt
@@ -1,23 +1,12 @@
 @file:OptIn(ExperimentalMaterial3Api::class)
 
-/* Settings > Other screen — Jetpack Compose / Material3.
- * Uses a LazyColumn for the main content so the screen scrolls natively in Compose. */
 package com.winlator.cmod.feature.settings
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.animateIntAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -37,12 +26,14 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ArrowCircleDown
 import androidx.compose.material.icons.outlined.Autorenew
 import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
 import androidx.compose.material.icons.outlined.Language
 import androidx.compose.material.icons.outlined.LibraryMusic
+import androidx.compose.material.icons.outlined.Monitor
 import androidx.compose.material.icons.outlined.Mouse
 import androidx.compose.material.icons.outlined.OpenInBrowser
 import androidx.compose.material.icons.outlined.Settings
@@ -54,8 +45,6 @@ import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.ProgressIndicatorDefaults
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.material3.SliderState
@@ -73,7 +62,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -83,15 +71,24 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.focus.focusProperties
 import com.winlator.cmod.shared.ui.outlinedSwitchColors
 
 // Palette (mirrors DebugScreen / StoresScreen)
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardBorder = Color(0xFF2A2A3A)
 private val IconBoxBg = Color(0xFF242434)
 private val SurfaceDark = Color(0xFF21212A)
 private val Accent = Color(0xFF1A9FFF)
+private val NavHighlight = Color(0xFF4FC3F7)
 private val TextPrimary = Color(0xFFF0F4FF)
 private val TextSecondary = Color(0xFF7A8FA8)
 private val SettingsSliderHeight = 24.dp
@@ -107,12 +104,14 @@ data class OtherSettingsState(
     val winlatorPath: String = "",
     val shortcutExportPath: String = "",
     val cursorSpeedPercent: Int = 100,
-    val useDRI3: Boolean = true,
     val cursorLock: Boolean = false,
     val xinputDisabled: Boolean = false,
     val enableFileProvider: Boolean = true,
+    val enableAutoScraping: Boolean = false,
     val openInBrowser: Boolean = false,
     val shareClipboard: Boolean = false,
+    val enableBackgroundSession: Boolean = false,
+    val externalDisplayOutput: Boolean = false,
     val imagefsInstallProgress: Int? = null,
 )
 
@@ -147,15 +146,19 @@ fun OtherSettingsScreen(
     onRemoveSoundFont: () -> Unit,
     onPickWinlatorPath: () -> Unit,
     onPickShortcutExportPath: () -> Unit,
+    onExportAll: () -> Unit,
     onCursorSpeedChanged: (Int) -> Unit,
-    onUseDRI3Changed: (Boolean) -> Unit,
     onCursorLockChanged: (Boolean) -> Unit,
     onXinputDisabledChanged: (Boolean) -> Unit,
     onEnableFileProviderChanged: (Boolean) -> Unit,
+    onAutoScrapingChanged: (Boolean) -> Unit,
     onOpenInBrowserChanged: (Boolean) -> Unit,
     onShareClipboardChanged: (Boolean) -> Unit,
+    onEnableBackgroundSessionChanged: (Boolean) -> Unit,
+    onExternalDisplayOutputChanged: (Boolean) -> Unit,
     onRunSetupWizard: () -> Unit,
     onReinstallImagefs: () -> Unit,
+    bridge: SettingsNavBridge? = null,
 ) {
     var showReinstallDialog by remember { mutableStateOf(false) }
     val layoutDirection = LocalLayoutDirection.current
@@ -163,6 +166,7 @@ fun OtherSettingsScreen(
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
+    val contentNav = rememberSettingsContentNav(bridge)
 
     if (showReinstallDialog) {
         ReinstallImagefsConfirmDialog(
@@ -178,33 +182,28 @@ fun OtherSettingsScreen(
         ImagefsInstallProgressDialog(percent = percent)
     }
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                end = 16.dp + navBarEndPadding,
-                top = 16.dp,
-                bottom = 4.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item(key = "application_section") {
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        end = 16.dp + navBarEndPadding,
+                        top = 16.dp,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
             SectionLabel(stringResource(R.string.common_ui_application))
-        }
 
-        item(key = "updates_card") {
             UpdatesCard(
                 checked = state.checkForUpdates,
                 onCheckedChange = onCheckForUpdatesChanged,
                 onCheckNow = onCheckForUpdatesNow,
             )
-        }
 
-        item(key = "language_card") {
             SettingsDropdownCard(
                 title = stringResource(R.string.settings_other_language_title),
                 subtitle = stringResource(R.string.settings_other_language_summary),
@@ -213,13 +212,9 @@ fun OtherSettingsScreen(
                 selectedIndex = state.languageIndex,
                 onOptionSelected = onLanguageSelected,
             )
-        }
 
-        item(key = "audio_section") {
             SectionLabel(stringResource(R.string.settings_audio_sound), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "sound_font_card") {
             SoundFontCard(
                 files = state.soundFontFiles,
                 selectedIndex = state.soundFontIndex,
@@ -227,50 +222,30 @@ fun OtherSettingsScreen(
                 onInstall = onInstallSoundFont,
                 onRemove = onRemoveSoundFont,
             )
-        }
 
-        item(key = "paths_section") {
             SectionLabel(stringResource(R.string.settings_general_paths_title), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "winlator_path_card") {
             FolderPathCard(
                 label = stringResource(R.string.settings_general_winlator_path_title),
                 path = state.winlatorPath,
                 onBrowse = onPickWinlatorPath,
             )
-        }
 
-        item(key = "shortcut_export_path_card") {
             FolderPathCard(
                 label = stringResource(R.string.settings_general_shortcut_export_path_title),
                 path = state.shortcutExportPath,
                 onBrowse = onPickShortcutExportPath,
+                secondaryLabel = stringResource(R.string.shortcuts_export_all),
+                onSecondary = onExportAll,
             )
-        }
 
-        item(key = "xserver_section") {
             SectionLabel(stringResource(R.string.session_xserver_title), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "cursor_speed_card") {
             CursorSpeedCard(
                 percent = state.cursorSpeedPercent,
                 onPercentChanged = onCursorSpeedChanged,
             )
-        }
 
-        item(key = "use_dri3_card") {
-            SettingsToggleCard(
-                title = stringResource(R.string.session_xserver_use_dri3_extension),
-                subtitle = stringResource(R.string.session_xserver_use_dri3_description),
-                icon = Icons.Outlined.Visibility,
-                checked = state.useDRI3,
-                onCheckedChange = onUseDRI3Changed,
-            )
-        }
-
-        item(key = "cursor_lock_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_general_cursor_lock_title),
                 subtitle = stringResource(R.string.settings_general_cursor_lock_summary),
@@ -278,9 +253,7 @@ fun OtherSettingsScreen(
                 checked = state.cursorLock,
                 onCheckedChange = onCursorLockChanged,
             )
-        }
 
-        item(key = "xinput_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_general_xinput_toggle_title),
                 subtitle = stringResource(R.string.settings_general_xinput_toggle_summary),
@@ -288,13 +261,32 @@ fun OtherSettingsScreen(
                 checked = state.xinputDisabled,
                 onCheckedChange = onXinputDisabledChanged,
             )
-        }
 
-        item(key = "integration_section") {
+            SettingsToggleCard(
+                title = stringResource(R.string.session_drawer_output_to_display),
+                subtitle = stringResource(R.string.settings_external_display_output_summary),
+                icon = Icons.Outlined.Monitor,
+                checked = state.externalDisplayOutput,
+                onCheckedChange = onExternalDisplayOutputChanged,
+            )
+
             SectionLabel(stringResource(R.string.settings_other_section_integration), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "file_provider_card") {
+            SettingsToggleCard(
+                title = stringResource(R.string.settings_general_background),
+                subtitle = "Keep session alive while in background",
+                icon = Icons.Outlined.Visibility,
+                checked = state.enableBackgroundSession,
+                onCheckedChange = onEnableBackgroundSessionChanged,
+            )
+            SettingsToggleCard(
+                title = stringResource(R.string.settings_general_enable_auto_scraping),
+                subtitle = stringResource(R.string.settings_general_auto_scraping_summary),
+                icon = Icons.Outlined.ArrowCircleDown,
+                checked = state.enableAutoScraping,
+                onCheckedChange = onAutoScrapingChanged,
+            )
+
             SettingsToggleCard(
                 title = stringResource(R.string.settings_general_enable_file_provider),
                 subtitle = stringResource(R.string.settings_general_file_provider_summary),
@@ -302,9 +294,7 @@ fun OtherSettingsScreen(
                 checked = state.enableFileProvider,
                 onCheckedChange = onEnableFileProviderChanged,
             )
-        }
 
-        item(key = "browser_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_general_open_with_android_browser),
                 subtitle = stringResource(R.string.settings_general_open_browser_summary),
@@ -312,9 +302,7 @@ fun OtherSettingsScreen(
                 checked = state.openInBrowser,
                 onCheckedChange = onOpenInBrowserChanged,
             )
-        }
 
-        item(key = "clipboard_card") {
             SettingsToggleCard(
                 title = stringResource(R.string.settings_general_share_android_clipboard),
                 subtitle = stringResource(R.string.settings_general_clipboard_summary),
@@ -322,22 +310,14 @@ fun OtherSettingsScreen(
                 checked = state.shareClipboard,
                 onCheckedChange = onShareClipboardChanged,
             )
-        }
 
-        item(key = "imagefs_section") {
             SectionLabel(stringResource(R.string.settings_general_imagefs), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "reinstall_imagefs_card") {
             ReinstallImagefsCard(onClick = { showReinstallDialog = true })
-        }
 
-        item(key = "setup_wizard_card") {
             SetupWizardCard(onClick = onRunSetupWizard)
-        }
 
-        item(key = "bottom_spacer") {
-            Spacer(Modifier.height(24.dp))
+            Spacer(Modifier.height(24.dp + navBarBottomPadding))
         }
     }
 }
@@ -374,7 +354,13 @@ private fun SettingsToggleCard(
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(12.dp))
                 .background(CardDark)
-                .border(1.dp, CardBorder, RoundedCornerShape(12.dp)),
+                .border(1.dp, CardBorder, RoundedCornerShape(12.dp))
+                .paneNavItem(
+                    cornerRadius = 12.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                ),
     ) {
         Row(
             modifier =
@@ -407,7 +393,7 @@ private fun SettingsToggleCard(
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
-                modifier = Modifier.scale(0.78f),
+                modifier = Modifier.scale(0.78f).focusProperties { canFocus = false },
                 colors =
                     outlinedSwitchColors(
                         accentColor = accentColor,
@@ -418,7 +404,6 @@ private fun SettingsToggleCard(
     }
 }
 
-// Check for Updates card: switch + "Check Now" inline button
 @Composable
 private fun UpdatesCard(
     checked: Boolean,
@@ -431,7 +416,13 @@ private fun UpdatesCard(
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(12.dp))
                 .background(CardDark)
-                .border(1.dp, CardBorder, RoundedCornerShape(12.dp)),
+                .border(1.dp, CardBorder, RoundedCornerShape(12.dp))
+                .paneNavItem(
+                    cornerRadius = 12.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                ),
     ) {
         Row(
             modifier =
@@ -538,29 +529,18 @@ private fun SettingsDropdownCard(
             }
             Spacer(Modifier.width(8.dp))
             Box {
-                var isPressed by remember { mutableStateOf(false) }
-                val btnScale by animateFloatAsState(
-                    targetValue = if (isPressed) 0.93f else 1f,
-                    animationSpec = spring(stiffness = Spring.StiffnessHigh),
-                    label = "otherDropdownScale",
-                )
                 Row(
                     modifier =
                         Modifier
-                            .scale(btnScale)
                             .clip(RoundedCornerShape(8.dp))
                             .background(Color(0xFF222232))
                             .border(1.dp, accentColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
-                            .pointerInput(options) {
-                                detectTapGestures(
-                                    onPress = {
-                                        isPressed = true
-                                        tryAwaitRelease()
-                                        isPressed = false
-                                    },
-                                    onTap = { if (options.isNotEmpty()) expanded = true },
-                                )
-                            }.padding(horizontal = 10.dp, vertical = 7.dp)
+                            .paneNavItem(
+                                cornerRadius = 8.dp,
+                                onActivate = { if (options.isNotEmpty()) expanded = true },
+                                highlightColor = NavHighlight,
+                                tapToSelect = true,
+                            ).padding(horizontal = 10.dp, vertical = 7.dp)
                             .widthIn(max = 180.dp),
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.spacedBy(4.dp),
@@ -682,32 +662,23 @@ private fun SoundFontCard(
                 }
             }
             Spacer(Modifier.height(10.dp))
-            Row(verticalAlignment = Alignment.CenterVertically) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
                 Box(modifier = Modifier.weight(1f)) {
-                    var isPressed by remember { mutableStateOf(false) }
-                    val btnScale by animateFloatAsState(
-                        targetValue = if (isPressed) 0.97f else 1f,
-                        animationSpec = spring(stiffness = Spring.StiffnessHigh),
-                        label = "sfDropdownScale",
-                    )
                     Row(
                         modifier =
                             Modifier
                                 .fillMaxWidth()
-                                .scale(btnScale)
                                 .clip(RoundedCornerShape(8.dp))
                                 .background(Color(0xFF222232))
                                 .border(1.dp, Accent.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
-                                .pointerInput(files) {
-                                    detectTapGestures(
-                                        onPress = {
-                                            isPressed = true
-                                            tryAwaitRelease()
-                                            isPressed = false
-                                        },
-                                        onTap = { if (files.isNotEmpty()) expanded = true },
-                                    )
-                                }.padding(horizontal = 10.dp, vertical = 8.dp),
+                                .paneNavItem(
+                                    cornerRadius = 8.dp,
+                                    onActivate = { if (files.isNotEmpty()) expanded = true },
+                                    highlightColor = NavHighlight,
+                                    tapToSelect = true,
+                                ).padding(horizontal = 10.dp, vertical = 8.dp),
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.spacedBy(4.dp),
                     ) {
@@ -781,6 +752,8 @@ private fun FolderPathCard(
     label: String,
     path: String,
     onBrowse: () -> Unit,
+    secondaryLabel: String? = null,
+    onSecondary: (() -> Unit)? = null,
 ) {
     Box(
         modifier =
@@ -824,6 +797,14 @@ private fun FolderPathCard(
                 )
             }
             Spacer(Modifier.width(10.dp))
+            if (secondaryLabel != null && onSecondary != null) {
+                SmallActionButton(
+                    label = secondaryLabel,
+                    textColor = Accent,
+                    onClick = onSecondary,
+                )
+                Spacer(Modifier.width(8.dp))
+            }
             SmallActionButton(
                 label = stringResource(R.string.settings_general_choose_path),
                 textColor = Accent,
@@ -895,103 +876,51 @@ private fun CursorSpeedCard(
             Slider(
                 value = percent.toFloat(),
                 onValueChange = { onPercentChanged(it.toInt()) },
-                valueRange = 10f..200f,
+                valueRange = 10f..300f,
                 steps = 0,
                 colors = settingsSliderColors(),
                 track = { SettingsSliderTrack(it) },
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .height(SettingsSliderHeight),
+                        .height(SettingsSliderHeight)
+                        .paneNavItem(
+                            cornerRadius = 12.dp,
+                            onAdjust = { dir ->
+                                onPercentChanged((percent + dir * 5).coerceIn(10, 300))
+                            },
+                            highlightColor = NavHighlight,
+                        ),
             )
         }
     }
 }
 
-// Reinstall imagefs confirm dialog (Compose replacement for ContentDialog.confirm)
 @Composable
 private fun ReinstallImagefsConfirmDialog(
     onConfirm: () -> Unit,
     onDismiss: () -> Unit,
 ) {
+    val nav = remember { PaneNavRegistry() }
     Dialog(onDismissRequest = onDismiss) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(18.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(18.dp))
-                    .padding(24.dp),
-        ) {
-            Column {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(36.dp)
-                                .clip(RoundedCornerShape(10.dp))
-                                .background(IconBoxBg),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Icon(
-                            imageVector = Icons.Outlined.Autorenew,
-                            contentDescription = null,
-                            tint = Accent,
-                            modifier = Modifier.size(19.dp),
-                        )
-                    }
-                    Spacer(Modifier.width(12.dp))
-                    Text(
-                        text = stringResource(R.string.settings_general_reinstall_imagefs),
-                        color = TextPrimary,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                }
-                Spacer(Modifier.height(12.dp))
-                Text(
-                    text = stringResource(R.string.settings_general_confirm_reinstall_imagefs),
-                    color = TextSecondary,
-                    fontSize = 13.sp,
-                )
-                Spacer(Modifier.height(20.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-                ) {
-                    SmallActionButton(
-                        label = stringResource(R.string.common_ui_cancel),
-                        textColor = TextSecondary,
-                        onClick = onDismiss,
-                    )
-                    SmallActionButton(
-                        label = stringResource(R.string.common_ui_reinstall),
-                        textColor = Accent,
-                        onClick = onConfirm,
-                    )
-                }
-            }
+        DialogPaneNav(nav, onDismiss = onDismiss)
+        CompositionLocalProvider(LocalPaneNav provides nav) {
+            PopupDialog(
+                title = stringResource(R.string.settings_general_reinstall_imagefs),
+                message = stringResource(R.string.settings_general_confirm_reinstall_imagefs),
+                icon = Icons.Outlined.Autorenew,
+                confirmLabel = stringResource(R.string.common_ui_reinstall),
+                onConfirm = onConfirm,
+                onCancel = onDismiss,
+                accentColor = Accent,
+                modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+            )
         }
     }
 }
 
-// ImageFS install progress dialog (non-dismissable, shown while reinstall is running)
 @Composable
 private fun ImagefsInstallProgressDialog(percent: Int) {
-    val safePercent = percent.coerceIn(0, 100)
-    // Smoothly interpolate the bar between discrete progress updates from the install callback.
-    val animatedProgress by animateFloatAsState(
-        targetValue = safePercent / 100f,
-        animationSpec = tween(durationMillis = 400, easing = FastOutSlowInEasing),
-        label = "imagefsBarProgress",
-    )
-    // Animate the percent label alongside the bar so the number ticks smoothly too.
-    val animatedPercent by animateIntAsState(
-        targetValue = safePercent,
-        animationSpec = tween(durationMillis = 400, easing = FastOutSlowInEasing),
-        label = "imagefsPercentLabel",
-    )
     Dialog(
         onDismissRequest = { /* non-dismissable */ },
         properties =
@@ -1000,71 +929,14 @@ private fun ImagefsInstallProgressDialog(percent: Int) {
                 dismissOnClickOutside = false,
             ),
     ) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(18.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(18.dp))
-                    .padding(24.dp),
-        ) {
-            Column {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(36.dp)
-                                .clip(RoundedCornerShape(10.dp))
-                                .background(IconBoxBg),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Icon(
-                            imageVector = Icons.Outlined.Autorenew,
-                            contentDescription = null,
-                            tint = Accent,
-                            modifier = Modifier.size(19.dp),
-                        )
-                    }
-                    Spacer(Modifier.width(12.dp))
-                    Column(modifier = Modifier.weight(1f)) {
-                        Text(
-                            text = stringResource(R.string.setup_wizard_installing_system_files),
-                            color = TextPrimary,
-                            fontSize = 15.sp,
-                            fontWeight = FontWeight.SemiBold,
-                        )
-                        Spacer(Modifier.height(2.dp))
-                        Text(
-                            text = stringResource(R.string.settings_other_keep_app_open),
-                            color = TextSecondary,
-                            fontSize = 11.sp,
-                        )
-                    }
-                    Spacer(Modifier.width(12.dp))
-                    Text(
-                        text = "$animatedPercent%",
-                        color = Accent,
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                }
-                Spacer(Modifier.height(16.dp))
-                LinearProgressIndicator(
-                    progress = { animatedProgress },
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(6.dp)
-                            .clip(RoundedCornerShape(3.dp)),
-                    color = Accent,
-                    trackColor = SurfaceDark,
-                    strokeCap = ProgressIndicatorDefaults.LinearStrokeCap,
-                    gapSize = 0.dp,
-                    drawStopIndicator = {},
-                )
-            }
-        }
+        PopupDialog(
+            title = stringResource(R.string.setup_wizard_installing_system_files),
+            message = stringResource(R.string.settings_other_keep_app_open),
+            icon = Icons.Outlined.Autorenew,
+            accentColor = Accent,
+            modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+            progress = percent.coerceIn(0, 100) / 100f,
+        )
     }
 }
 
@@ -1160,30 +1032,19 @@ private fun SmallActionButton(
     textColor: Color,
     onClick: () -> Unit,
 ) {
-    var isPressed by remember { mutableStateOf(false) }
-    val scale by animateFloatAsState(
-        targetValue = if (isPressed) 0.93f else 1f,
-        animationSpec = spring(stiffness = Spring.StiffnessHigh),
-        label = "otherBtnScale",
-    )
     Box(
         modifier =
             Modifier
-                .scale(scale)
                 .width(104.dp)
                 .clip(RoundedCornerShape(8.dp))
                 .background(Color(0xFF222232))
                 .border(1.dp, textColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
-                .pointerInput(onClick) {
-                    detectTapGestures(
-                        onPress = {
-                            isPressed = true
-                            tryAwaitRelease()
-                            isPressed = false
-                        },
-                        onTap = { onClick() },
-                    )
-                }.padding(horizontal = 11.dp, vertical = 6.dp),
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                ).padding(horizontal = 11.dp, vertical = 6.dp),
         contentAlignment = Alignment.Center,
     ) {
         Text(
diff --git a/app/src/main/feature/settings/presets/PresetsFragment.kt b/app/src/main/feature/settings/presets/PresetsFragment.kt
index 5054721d0..9f64da7ea 100644
--- a/app/src/main/feature/settings/presets/PresetsFragment.kt
+++ b/app/src/main/feature/settings/presets/PresetsFragment.kt
@@ -18,6 +18,7 @@ import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.runtime.compat.box64.Box64Preset
 import com.winlator.cmod.runtime.compat.box64.Box64PresetManager
 import com.winlator.cmod.runtime.compat.fexcore.FEXCorePreset
@@ -213,6 +214,7 @@ class PresetsFragment : Fragment() {
                             refresh()
                         },
                         suggestedNewPresetName = { buildDefaultPresetName(currentEngine) },
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                     )
                 }
             }
@@ -261,9 +263,7 @@ class PresetsFragment : Fragment() {
         super.onSaveInstanceState(outState)
     }
 
-    // ========================================================================
     // State builders
-    // ========================================================================
 
     /**
      * Re-loads each engine's presets + resolved selection + env-var values from the
@@ -436,9 +436,7 @@ class PresetsFragment : Fragment() {
         return plainText.ifBlank { getString(R.string.container_presets_no_description) }
     }
 
-    // ========================================================================
     // Persistence helpers
-    // ========================================================================
 
     private fun setSelectedPreset(
         engine: PresetEngine,
@@ -532,9 +530,7 @@ class PresetsFragment : Fragment() {
 
     private fun sanitizePresetName(rawName: String): String = rawName.trim().replace(Regex("[,|]+"), "")
 
-    // ========================================================================
     // Engine metadata
-    // ========================================================================
 
     private val PresetEngine.preferenceKey: String
         get() =
@@ -547,7 +543,7 @@ class PresetsFragment : Fragment() {
         get() =
             when (this) {
                 PresetEngine.BOX64 -> Box64Preset.PERFORMANCE
-                PresetEngine.FEXCORE -> FEXCorePreset.PERFORMANCE
+                PresetEngine.FEXCORE -> FEXCorePreset.PERFORMANCE_TSO
             }
 
     private val PresetEngine.assetFile: String
diff --git a/app/src/main/feature/settings/presets/PresetsScreen.kt b/app/src/main/feature/settings/presets/PresetsScreen.kt
index db051c983..c0654c46a 100644
--- a/app/src/main/feature/settings/presets/PresetsScreen.kt
+++ b/app/src/main/feature/settings/presets/PresetsScreen.kt
@@ -1,5 +1,3 @@
-/* Settings > Presets screen — Jetpack Compose / Material3.
- * Uses a LazyColumn for the main content. */
 package com.winlator.cmod.feature.settings
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope
@@ -21,13 +19,10 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -67,7 +62,9 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -77,6 +74,8 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -94,13 +93,20 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.dialog.PopupDialog
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 import com.winlator.cmod.shared.ui.outlinedSwitchColors
 
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardDarker = Color(0xFF15151E)
 private val CardBorder = Color(0xFF2A2A3A)
 private val Accent = Color(0xFF1A9FFF)
+private val NavHighlight = Color(0xFF4FC3F7)
 private val DangerRed = Color(0xFFFF7A88)
 private val TextPrimary = Color(0xFFF0F4FF)
 private val TextSecondary = Color(0xFF7A8FA8)
@@ -119,9 +125,7 @@ private fun Modifier.noRippleClickable(
     )
 }
 
-// ============================================================================
 // State
-// ============================================================================
 
 /**
  * Which preset flavor is currently being edited. Matches the two [PresetEngine]
@@ -174,9 +178,7 @@ data class PresetsState(
         get() = engines[currentEngine] ?: PresetEngineData()
 }
 
-// ============================================================================
 // Root
-// ============================================================================
 
 @Composable
 fun PresetsScreen(
@@ -191,6 +193,7 @@ fun PresetsScreen(
     onImportPreset: () -> Unit,
     onRemovePreset: () -> Unit,
     suggestedNewPresetName: () -> String,
+    bridge: SettingsNavBridge? = null,
 ) {
     var showNewDialog by remember { mutableStateOf(false) }
     var showRenameDialog by remember { mutableStateOf(false) }
@@ -232,50 +235,83 @@ fun PresetsScreen(
     }
 
     if (showRemoveConfirm) {
-        ConfirmDialog(
-            title = stringResource(R.string.container_presets_title),
-            message = stringResource(R.string.container_presets_confirm_remove),
-            confirmLabel = stringResource(R.string.common_ui_remove),
-            confirmColor = DangerRed,
-            onDismiss = { showRemoveConfirm = false },
-            onConfirm = {
-                showRemoveConfirm = false
-                onRemovePreset()
-            },
-        )
+        Dialog(
+            onDismissRequest = { showRemoveConfirm = false },
+            properties = DialogProperties(usePlatformDefaultWidth = false),
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .windowInsetsPadding(WindowInsets.safeDrawing)
+                        .padding(horizontal = 16.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                PopupDialog(
+                    title = stringResource(R.string.container_presets_title),
+                    message = stringResource(R.string.container_presets_confirm_remove),
+                    icon = Icons.Outlined.Delete,
+                    confirmLabel = stringResource(R.string.common_ui_remove),
+                    onConfirm = {
+                        showRemoveConfirm = false
+                        onRemovePreset()
+                    },
+                    onCancel = { showRemoveConfirm = false },
+                    accentColor = DangerRed,
+                    modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                )
+            }
+        }
     }
 
     if (showDuplicateConfirm) {
-        ConfirmDialog(
-            title = stringResource(R.string.container_presets_title),
-            message = stringResource(R.string.container_presets_confirm_duplicate),
-            confirmLabel = stringResource(R.string.common_ui_duplicate),
-            confirmColor = Accent,
-            onDismiss = { showDuplicateConfirm = false },
-            onConfirm = {
-                showDuplicateConfirm = false
-                onDuplicatePreset()
-            },
-        )
+        Dialog(
+            onDismissRequest = { showDuplicateConfirm = false },
+            properties = DialogProperties(usePlatformDefaultWidth = false),
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .windowInsetsPadding(WindowInsets.safeDrawing)
+                        .padding(horizontal = 16.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                PopupDialog(
+                    title = stringResource(R.string.container_presets_title),
+                    message = stringResource(R.string.container_presets_confirm_duplicate),
+                    icon = Icons.Outlined.ContentCopy,
+                    confirmLabel = stringResource(R.string.common_ui_duplicate),
+                    onConfirm = {
+                        showDuplicateConfirm = false
+                        onDuplicatePreset()
+                    },
+                    onCancel = { showDuplicateConfirm = false },
+                    accentColor = Accent,
+                    modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                )
+            }
+        }
     }
 
     val currentData = state.current
+    val contentNav = rememberSettingsContentNav(bridge)
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                end = 16.dp + navBarEndPadding,
-                top = 16.dp,
-                bottom = 4.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item(key = "selector_card") {
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        end = 16.dp + navBarEndPadding,
+                        top = 16.dp,
+                        bottom = 4.dp + navBarBottomPadding,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
             // Combined engine-tabs + preset selector card. The tabs themselves stay
             // static; only the preset dropdown / badge / menu / hint are inside
             // AnimatedContent below, so tapping a tab doesn't make the tab flicker.
@@ -291,41 +327,27 @@ fun PresetsScreen(
                 onImport = onImportPreset,
                 onRemove = { showRemoveConfirm = true },
             )
-        }
 
-        item(key = "env_vars_section") {
             SectionLabel(
                 text = stringResource(R.string.container_config_env_vars),
                 modifier = Modifier.padding(top = 6.dp),
             )
-        }
 
-        if (currentData.envVarDefinitions.isEmpty()) {
-            item(key = "env_var_empty_${state.currentEngine}") {
+            if (currentData.envVarDefinitions.isEmpty()) {
                 EmptyEnvVarsCard()
+            } else {
+                currentData.envVarDefinitions.forEach { def ->
+                    key("${state.currentEngine.name}:${def.name}") {
+                        EnvVarCard(
+                            definition = def,
+                            value = currentData.currentValues[def.name] ?: def.defaultValue,
+                            editable = currentData.editable,
+                            onValueChanged = { onEnvVarValueChanged(def.name, it) },
+                        )
+                    }
+                }
             }
-        } else {
-            items(
-                items = currentData.envVarDefinitions,
-                key = { def -> "${state.currentEngine.name}:${def.name}" },
-                contentType = { def -> def.controlType },
-            ) { def ->
-                EnvVarCard(
-                    definition = def,
-                    value = currentData.currentValues[def.name] ?: def.defaultValue,
-                    editable = currentData.editable,
-                    modifier =
-                        Modifier.animateItem(
-                            fadeInSpec = tween(durationMillis = 160, easing = FastOutSlowInEasing),
-                            fadeOutSpec = tween(durationMillis = 100, easing = FastOutSlowInEasing),
-                            placementSpec = null,
-                        ),
-                    onValueChanged = { onEnvVarValueChanged(def.name, it) },
-                )
-            }
-        }
 
-        item(key = "bottom_spacer") {
             Spacer(Modifier.height(24.dp))
         }
     }
@@ -389,7 +411,12 @@ private fun PresetActionButton(
                 .clip(RoundedCornerShape(7.dp))
                 .background(Accent.copy(alpha = 0.12f))
                 .border(1.dp, Accent.copy(alpha = 0.32f), RoundedCornerShape(7.dp))
-                .noRippleClickable(onClick = onClick)
+                .paneNavItem(
+                    cornerRadius = 7.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = 10.dp, vertical = 5.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -419,7 +446,9 @@ private fun PresetSelectorHeader(
 ) {
     BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
         val actions: @Composable () -> Unit = {
-            Row(verticalAlignment = Alignment.CenterVertically) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
                 PresetActionButton(
                     label = stringResource(R.string.container_presets_new),
                     icon = Icons.Outlined.Add,
@@ -466,9 +495,7 @@ private fun PresetSelectorHeader(
     }
 }
 
-// ============================================================================
 // Engine tabs (Box64 / FEXCore)
-// ============================================================================
 
 @Composable
 private fun EngineTabs(
@@ -514,7 +541,12 @@ private fun EngineTab(
                 .clip(RoundedCornerShape(6.dp))
                 .background(bg)
                 .border(1.dp, borderColor, RoundedCornerShape(6.dp))
-                .noRippleClickable(onClick = onClick)
+                .paneNavItem(
+                    cornerRadius = 6.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = 14.dp, vertical = 5.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -527,9 +559,7 @@ private fun EngineTab(
     }
 }
 
-// ============================================================================
 // Combined engine-tabs + preset selector card
-// ============================================================================
 
 @Composable
 private fun PresetSelectorCard(
@@ -623,7 +653,20 @@ private fun PresetSelectorRowContent(
                         .clip(RoundedCornerShape(8.dp))
                         .background(CardDarker)
                         .border(1.dp, CardBorder, RoundedCornerShape(8.dp))
-                        .noRippleClickable(enabled = data.presets.isNotEmpty()) { dropdownOpen = true }
+                        .paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = { if (data.presets.isNotEmpty()) dropdownOpen = true },
+                            onAdjust = { dir ->
+                                if (data.presets.isNotEmpty()) {
+                                    val idx = data.presets.indexOfFirst { it.id == data.selectedPresetId }.coerceAtLeast(0)
+                                    val next = ((idx + dir) % data.presets.size + data.presets.size) % data.presets.size
+                                    val nextId = data.presets[next].id
+                                    if (nextId != data.selectedPresetId) onPresetSelected(nextId)
+                                }
+                            },
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
                         .padding(horizontal = 11.dp, vertical = 7.dp),
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
@@ -818,9 +861,7 @@ private fun MenuRow(
     )
 }
 
-// ============================================================================
 // Section label
-// ============================================================================
 
 @Composable
 private fun SectionLabel(
@@ -837,16 +878,13 @@ private fun SectionLabel(
     )
 }
 
-// ============================================================================
 // Env var list — compact cards with expandable help
-// ============================================================================
 
 @Composable
 private fun EnvVarCard(
     definition: EnvVarDefinition,
     value: String,
     editable: Boolean,
-    modifier: Modifier = Modifier,
     onValueChanged: (String) -> Unit,
 ) {
     var expanded by remember(definition.name) { mutableStateOf(false) }
@@ -865,7 +903,7 @@ private fun EnvVarCard(
 
     Box(
         modifier =
-            modifier
+            Modifier
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(12.dp))
                 .background(CardDark)
@@ -876,7 +914,12 @@ private fun EnvVarCard(
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .noRippleClickable { expanded = !expanded }
+                        .paneNavItem(
+                            cornerRadius = 8.dp,
+                            onActivate = { expanded = !expanded },
+                            highlightColor = NavHighlight,
+                            tapToSelect = true,
+                        )
                         .padding(horizontal = 12.dp, vertical = 8.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
@@ -1005,9 +1048,12 @@ private fun EnvVarToggleControl(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .noRippleClickable {
-                    if (editable) onValueChanged(if (checked) "0" else "1")
-                }
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (editable) onValueChanged(if (checked) "0" else "1") },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(start = 10.dp, end = 2.dp, top = 4.dp, bottom = 4.dp),
     ) {
         Row(
@@ -1054,7 +1100,19 @@ private fun EnvVarDropdownControl(
                 .clip(RoundedCornerShape(8.dp))
                 .background(CardDarker)
                 .border(1.dp, CardBorder, RoundedCornerShape(8.dp))
-                .noRippleClickable(enabled = editable && values.isNotEmpty()) { open = true }
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (editable && values.isNotEmpty()) open = true },
+                    onAdjust = { dir ->
+                        if (editable && values.isNotEmpty()) {
+                            val idx = values.indexOf(value).coerceAtLeast(0)
+                            val next = ((idx + dir) % values.size + values.size) % values.size
+                            if (values[next] != value) onValueChanged(values[next])
+                        }
+                    },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = 10.dp, vertical = 7.dp),
     ) {
         Row(verticalAlignment = Alignment.CenterVertically) {
@@ -1107,6 +1165,7 @@ private fun EnvVarTextControl(
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isFocused by interactionSource.collectIsFocusedAsState()
+    val focusRequester = remember { FocusRequester() }
     val borderColor = if (isFocused) Accent else CardBorder
     val borderWidth = if (isFocused) 1.5.dp else 1.dp
     Box(
@@ -1117,6 +1176,12 @@ private fun EnvVarTextControl(
                 .clip(RoundedCornerShape(8.dp))
                 .background(CardDarker)
                 .border(borderWidth, borderColor, RoundedCornerShape(8.dp))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (editable) runCatching { focusRequester.requestFocus() } },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
                 .padding(horizontal = 10.dp, vertical = 7.dp),
         contentAlignment = Alignment.CenterStart,
     ) {
@@ -1133,14 +1198,12 @@ private fun EnvVarTextControl(
                     imeAction = ImeAction.Done,
                 ),
             interactionSource = interactionSource,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
         )
     }
 }
 
-// ============================================================================
 // Empty state for env vars
-// ============================================================================
 
 @Composable
 private fun EmptyEnvVarsCard() {
@@ -1162,9 +1225,7 @@ private fun EmptyEnvVarsCard() {
     }
 }
 
-// ============================================================================
 // Small shared controls
-// ============================================================================
 
 @Composable
 private fun IconTapButton(
@@ -1178,7 +1239,12 @@ private fun IconTapButton(
                 .width(34.dp)
                 .height(38.dp)
                 .clip(RoundedCornerShape(8.dp))
-                .noRippleClickable(onClick = onClick),
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                ),
         contentAlignment = Alignment.Center,
     ) {
         Icon(
@@ -1195,11 +1261,13 @@ private fun DialogActionButton(
     label: String,
     textColor: Color,
     onClick: () -> Unit,
+    isEntry: Boolean = false,
 ) {
     Box(
         modifier =
             Modifier
                 .clip(RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, isEntry = isEntry)
                 .background(CardDarker)
                 .border(1.dp, textColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
                 .noRippleClickable(onClick = onClick)
@@ -1215,62 +1283,7 @@ private fun DialogActionButton(
     }
 }
 
-// ============================================================================
 // Dialogs
-// ============================================================================
-
-@Composable
-private fun ConfirmDialog(
-    title: String,
-    message: String,
-    confirmLabel: String,
-    confirmColor: Color,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-) {
-    Dialog(onDismissRequest = onDismiss) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(18.dp))
-                    .background(CardDark)
-                    .border(1.dp, CardBorder, RoundedCornerShape(18.dp))
-                    .padding(22.dp),
-        ) {
-            Column {
-                Text(
-                    text = title,
-                    color = TextPrimary,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.SemiBold,
-                )
-                Spacer(Modifier.height(6.dp))
-                Text(
-                    text = message,
-                    color = TextSecondary,
-                    fontSize = 13.sp,
-                )
-                Spacer(Modifier.height(22.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-                ) {
-                    DialogActionButton(
-                        label = stringResource(R.string.common_ui_cancel),
-                        textColor = TextSecondary,
-                        onClick = onDismiss,
-                    )
-                    DialogActionButton(
-                        label = confirmLabel,
-                        textColor = confirmColor,
-                        onClick = onConfirm,
-                    )
-                }
-            }
-        }
-    }
-}
 
 @Composable
 private fun PromptDialog(
@@ -1282,6 +1295,14 @@ private fun PromptDialog(
 ) {
     var text by remember { mutableStateOf(initialValue) }
     val focusManager = LocalFocusManager.current
+    val registry = remember { PaneNavRegistry() }
+    val doConfirm = {
+        val trimmed = text.trim()
+        if (trimmed.isNotEmpty()) {
+            focusManager.clearFocus()
+            onConfirm(trimmed)
+        }
+    }
 
     Dialog(
         onDismissRequest = onDismiss,
@@ -1291,6 +1312,8 @@ private fun PromptDialog(
                 decorFitsSystemWindows = false,
             ),
     ) {
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+        DialogPaneNav(registry, onDismiss = onDismiss, onStart = doConfirm)
         BoxWithConstraints(
             modifier =
                 Modifier
@@ -1375,17 +1398,13 @@ private fun PromptDialog(
                         DialogActionButton(
                             label = confirmLabel,
                             textColor = Accent,
-                            onClick = {
-                                val trimmed = text.trim()
-                                if (trimmed.isNotEmpty()) {
-                                    focusManager.clearFocus()
-                                    onConfirm(trimmed)
-                                }
-                            },
+                            onClick = doConfirm,
+                            isEntry = true,
                         )
                     }
                 }
             }
         }
+        }
     }
 }
diff --git a/app/src/main/feature/settings/stores/StoresFragment.kt b/app/src/main/feature/settings/stores/StoresFragment.kt
index 87673db6d..d4633c1d2 100644
--- a/app/src/main/feature/settings/stores/StoresFragment.kt
+++ b/app/src/main/feature/settings/stores/StoresFragment.kt
@@ -18,12 +18,14 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import com.winlator.cmod.R
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.feature.stores.epic.service.EpicAuthManager
 import com.winlator.cmod.feature.stores.epic.ui.auth.EpicOAuthActivity
 import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
 import com.winlator.cmod.feature.stores.gog.service.GOGService
 import com.winlator.cmod.feature.stores.gog.ui.auth.GOGOAuthActivity
 import com.winlator.cmod.feature.stores.steam.SteamLoginActivity
+import com.winlator.cmod.feature.stores.steam.enums.Language
 import com.winlator.cmod.feature.stores.steam.service.SteamService
 import com.winlator.cmod.feature.stores.steam.utils.PrefManager
 import com.winlator.cmod.shared.android.DirectoryPickerDialog
@@ -149,6 +151,12 @@ class StoresFragment : Fragment() {
                         onPickSteamFolder = { pickFolder(PrefManager.steamDownloadFolder) { PrefManager.steamDownloadFolder = it } },
                         onPickEpicFolder = { pickFolder(PrefManager.epicDownloadFolder) { PrefManager.epicDownloadFolder = it } },
                         onPickGogFolder = { pickFolder(PrefManager.gogDownloadFolder) { PrefManager.gogDownloadFolder = it } },
+                        onContainerLanguageSelected = { index ->
+                            val langName = Language.containerLangForIndex(index)
+                            PrefManager.containerLanguage = langName
+                            refresh()
+                        },
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
                     )
                 }
             }
@@ -163,6 +171,8 @@ class StoresFragment : Fragment() {
     // Helpers
     private fun refresh() {
         val ctx = context ?: return
+        val containerLanguageLabels = Language.displayLabels()
+        val containerLanguageIndex = Language.indexForContainerLang(PrefManager.containerLanguage)
         storeState =
             StoreState(
                 isSteamLoggedIn = SteamService.isLoggedIn,
@@ -176,6 +186,8 @@ class StoresFragment : Fragment() {
                 steamFolder = resolveUri(PrefManager.steamDownloadFolder, ctx),
                 epicFolder = resolveUri(PrefManager.epicDownloadFolder, ctx),
                 gogFolder = resolveUri(PrefManager.gogDownloadFolder, ctx),
+                containerLanguageLabels = containerLanguageLabels,
+                containerLanguageIndex = containerLanguageIndex,
             )
     }
 
diff --git a/app/src/main/feature/settings/stores/StoresScreen.kt b/app/src/main/feature/settings/stores/StoresScreen.kt
index 345282258..56e414afe 100644
--- a/app/src/main/feature/settings/stores/StoresScreen.kt
+++ b/app/src/main/feature/settings/stores/StoresScreen.kt
@@ -1,5 +1,3 @@
-/* Settings > Stores screen — Jetpack Compose / Material3.
- * Uses a LazyColumn for the main content. */
 package com.winlator.cmod.feature.settings
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.SizeTransform
@@ -19,11 +17,9 @@ import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -48,6 +44,7 @@ import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material.icons.outlined.FolderShared
 import androidx.compose.material.icons.outlined.Gamepad
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
+import androidx.compose.material.icons.outlined.Language
 import androidx.compose.material.icons.outlined.Public
 import androidx.compose.material.icons.outlined.Speed
 import androidx.compose.material.icons.outlined.Wifi
@@ -60,6 +57,7 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -68,6 +66,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.pointer.pointerInput
@@ -79,15 +78,19 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 import com.winlator.cmod.shared.ui.outlinedSwitchColors
 
 // Palette
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardBorder = Color(0xFF2A2A3A)
 private val IconBoxBg = Color(0xFF242434)
 private val SurfaceDark = Color(0xFF21212A)
 private val Accent = Color(0xFF1A9FFF)
+private val NavHighlight = Color(0xFF4FC3F7)
 private val TextPrimary = Color(0xFFF0F4FF)
 private val TextSecondary = Color(0xFF7A8FA8)
 private val Divider = Color(0xFF343434)
@@ -107,6 +110,8 @@ data class StoreState(
     val steamFolder: String = "",
     val epicFolder: String = "",
     val gogFolder: String = "",
+    val containerLanguageLabels: List<String> = emptyList(),
+    val containerLanguageIndex: Int = 0,
 )
 
 @Composable
@@ -126,12 +131,15 @@ fun StoresScreen(
     onPickSteamFolder: () -> Unit,
     onPickEpicFolder: () -> Unit,
     onPickGogFolder: () -> Unit,
+    onContainerLanguageSelected: (Int) -> Unit,
+    bridge: SettingsNavBridge? = null,
 ) {
     val layoutDirection = LocalLayoutDirection.current
     val navBarPadding = WindowInsets.navigationBars.asPaddingValues()
     val navBarStartPadding = navBarPadding.calculateStartPadding(layoutDirection)
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
+    val contentNav = rememberSettingsContentNav(bridge)
     val downloadSpeedOptions =
         listOf(
             8 to stringResource(R.string.stores_accounts_download_speed_conservative),
@@ -140,25 +148,22 @@ fun StoresScreen(
             32 to stringResource(R.string.stores_accounts_download_speed_performance),
         )
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                end = 16.dp + navBarEndPadding,
-                top = 16.dp,
-                bottom = 4.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item(key = "stores_section") {
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        end = 16.dp + navBarEndPadding,
+                        top = 16.dp,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
             SectionLabel(stringResource(R.string.stores_accounts_connected_stores))
-        }
 
-        item(key = "steam_card") {
             StoreCard(
                 name = stringResource(R.string.stores_accounts_steam_integration_title),
                 icon = Icons.Outlined.Gamepad,
@@ -167,8 +172,6 @@ fun StoresScreen(
                 onSignIn = onSteamSignIn,
                 onSignOut = onSteamSignOut,
             )
-        }
-        item(key = "epic_card") {
             StoreCard(
                 name = stringResource(R.string.preloader_platform_epic),
                 icon = Icons.Outlined.Gamepad,
@@ -177,8 +180,6 @@ fun StoresScreen(
                 onSignIn = onEpicSignIn,
                 onSignOut = onEpicSignOut,
             )
-        }
-        item(key = "gog_card") {
             StoreCard(
                 name = stringResource(R.string.preloader_platform_gog),
                 icon = Icons.Outlined.Gamepad,
@@ -187,13 +188,9 @@ fun StoresScreen(
                 onSignIn = onGogSignIn,
                 onSignOut = onGogSignOut,
             )
-        }
 
-        item(key = "download_section") {
             SectionLabel(stringResource(R.string.stores_accounts_download_settings), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "shared_folder_toggle") {
             SettingsToggleCard(
                 title = stringResource(R.string.stores_accounts_shared_downloads_folder),
                 subtitle = stringResource(R.string.stores_accounts_shared_downloads_subtitle),
@@ -201,9 +198,7 @@ fun StoresScreen(
                 checked = state.sharedFolder,
                 onCheckedChange = onSharedFolderChanged,
             )
-        }
 
-        item(key = "folder_paths") {
             AnimatedContent(
                 targetState = state.sharedFolder,
                 transitionSpec = {
@@ -238,13 +233,9 @@ fun StoresScreen(
                     }
                 }
             }
-        }
 
-        item(key = "steam_section") {
             SectionLabel(stringResource(R.string.steam_section_title), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item(key = "download_speed") {
             SettingsDropdownCard(
                 title = stringResource(R.string.stores_accounts_download_speed),
                 subtitle = stringResource(R.string.stores_accounts_download_speed_subtitle),
@@ -254,8 +245,7 @@ fun StoresScreen(
                 onOptionSelected = onDownloadSpeedChanged,
                 highlightMaxValue = true,
             )
-        }
-        item(key = "download_server") {
+
             val serverSubtitle =
                 if (!state.downloadServerManuallySet && state.downloadServer != 0) {
                     val name = serverOptions.firstOrNull { it.first == state.downloadServer }?.second ?: ""
@@ -271,10 +261,20 @@ fun StoresScreen(
                 options = serverOptions,
                 onOptionSelected = onDownloadServerChanged,
             )
-        }
 
-        item(key = "bottom_spacer") {
-            Spacer(Modifier.height(24.dp))
+            val gameLanguageOptions = remember(state.containerLanguageLabels) {
+                state.containerLanguageLabels.mapIndexed { index, label -> index to label }
+            }
+            SettingsDropdownCard(
+                title = stringResource(R.string.settings_other_game_language_title),
+                subtitle = stringResource(R.string.settings_other_game_language_summary),
+                icon = Icons.Outlined.Language,
+                selectedValue = state.containerLanguageIndex,
+                options = gameLanguageOptions,
+                onOptionSelected = onContainerLanguageSelected,
+            )
+
+            Spacer(Modifier.height(24.dp + navBarBottomPadding))
         }
     }
 }
@@ -502,6 +502,11 @@ private fun ActionButton(
                 .clip(RoundedCornerShape(8.dp))
                 .background(Color(0xFF222232))
                 .border(1.dp, textColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                )
                 .pointerInput(onClick) {
                     detectTapGestures(
                         onPress = {
@@ -546,6 +551,12 @@ private fun SettingsToggleCard(
             modifier =
                 Modifier
                     .fillMaxWidth()
+                    .paneNavItem(
+                        cornerRadius = 12.dp,
+                        onActivate = { onCheckedChange(!checked) },
+                        highlightColor = NavHighlight,
+                        tapToSelect = true,
+                    )
                     .padding(horizontal = 14.dp, vertical = 11.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
@@ -573,7 +584,7 @@ private fun SettingsToggleCard(
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
-                modifier = Modifier.scale(0.78f),
+                modifier = Modifier.scale(0.78f).focusProperties { canFocus = false },
                 colors =
                     outlinedSwitchColors(
                         accentColor = accentColor,
@@ -651,6 +662,16 @@ private fun SettingsDropdownCard(
                             .clip(RoundedCornerShape(8.dp))
                             .background(Color(0xFF222232))
                             .border(1.dp, selectedColor.copy(alpha = 0.30f), RoundedCornerShape(8.dp))
+                            .paneNavItem(
+                                cornerRadius = 8.dp,
+                                onActivate = { expanded = true },
+                                onAdjust = { dir ->
+                                    val curr = options.indexOfFirst { it.first == selectedValue }.coerceAtLeast(0)
+                                    val next = (curr + dir).coerceIn(0, options.size - 1)
+                                    if (next != curr) onOptionSelected(options[next].first)
+                                },
+                                highlightColor = NavHighlight,
+                            )
                             .pointerInput(Unit) {
                                 detectTapGestures(
                                     onPress = {
@@ -787,6 +808,11 @@ private fun BrowseButton(onClick: () -> Unit) {
                 .scale(scale)
                 .clip(RoundedCornerShape(8.dp))
                 .background(Accent.copy(alpha = 0.12f))
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = onClick,
+                    highlightColor = NavHighlight,
+                )
                 .pointerInput(onClick) {
                     detectTapGestures(
                         onPress = {
diff --git a/app/src/main/feature/setup/SetupWizardActivity.kt b/app/src/main/feature/setup/SetupWizardActivity.kt
index f095e1ca4..08592f8aa 100644
--- a/app/src/main/feature/setup/SetupWizardActivity.kt
+++ b/app/src/main/feature/setup/SetupWizardActivity.kt
@@ -11,8 +11,11 @@ import android.os.Bundle
 import android.os.Environment
 import android.provider.Settings
 import android.util.Log
+import android.view.WindowManager
 import android.widget.Toast
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.SizeTransform
@@ -57,9 +60,11 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items as gridItems
+import androidx.compose.foundation.lazy.grid.itemsIndexed as gridItemsIndexed
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -77,6 +82,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -97,6 +103,7 @@ import androidx.compose.ui.text.googlefonts.Font
 import androidx.compose.ui.text.googlefonts.GoogleFont
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -111,30 +118,24 @@ import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.feature.settings.DriversFragment
 import com.winlator.cmod.feature.settings.ContainerSettingsComposeDialog
 import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerCreation
 import com.winlator.cmod.runtime.container.ContainerManager
-import com.winlator.cmod.runtime.content.AdrenotoolsManager
 import com.winlator.cmod.runtime.content.ContentProfile
 import com.winlator.cmod.runtime.content.ContentsManager
+import com.winlator.cmod.runtime.content.AdrenotoolsManager
 import com.winlator.cmod.runtime.content.Downloader
 import com.winlator.cmod.runtime.display.environment.ImageFs
 import com.winlator.cmod.runtime.display.environment.ImageFsInstaller
 import com.winlator.cmod.runtime.wine.WineInfo
 import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.android.FixedFontScaleFragmentActivity
-import com.winlator.cmod.shared.io.FileUtils
-import com.winlator.cmod.shared.io.TarCompressorUtils
-import com.winlator.cmod.shared.io.TarCompressorUtils.Type
 import com.winlator.cmod.shared.ui.widget.chasingBorder
 import com.winlator.cmod.shared.theme.WinNativeTheme
-import com.winlator.cmod.shared.util.OnExtractFileListener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONArray
-import org.json.JSONObject
 import java.io.File
-import java.util.concurrent.Executors
-import java.util.concurrent.atomic.AtomicLong
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
@@ -174,6 +175,40 @@ private data class TabInfo(
     val highlight: Boolean = false,
 )
 
+private val NavHighlightAccent = Color(0xFF57CBDE)
+
+private fun Modifier.navHighlight(highlighted: Boolean, cornerRadius: Dp): Modifier =
+    drawBehind {
+        if (highlighted) {
+            val cr = cornerRadius.toPx()
+            drawRoundRect(
+                color = NavHighlightAccent.copy(alpha = 0.18f),
+                cornerRadius = androidx.compose.ui.geometry.CornerRadius(cr, cr),
+            )
+            drawRoundRect(
+                color = NavHighlightAccent,
+                cornerRadius = androidx.compose.ui.geometry.CornerRadius(cr, cr),
+                style = androidx.compose.ui.graphics.drawscope.Stroke(width = 1.5.dp.toPx()),
+            )
+        }
+    }
+
+private const val REGION_TABS = 0
+private const val REGION_CONTENT = 1
+private const val REGION_NAV = 2
+
+private suspend fun LazyListState.scrollToSelected(index: Int) {
+    if (index < 0) return
+    val info = layoutInfo
+    if (info.visibleItemsInfo.isEmpty()) return
+    val visible = info.visibleItemsInfo.firstOrNull { it.index == index }
+    val fullyVisible =
+        visible != null &&
+            visible.offset >= info.viewportStartOffset &&
+            visible.offset + visible.size <= info.viewportEndOffset
+    if (!fullyVisible) runCatching { animateScrollToItem(index) }
+}
+
 class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     companion object {
         private const val PREFS_NAME = "winnative_setup"
@@ -190,7 +225,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         private const val KEY_LAST_CONTENT_PREFIX = "last_content_"
         private const val KEY_DEFAULT_JSON_CACHE = "default_json_cache"
         private const val DEFAULT_JSON_URL =
-            "https://github.com/Xnick417x/winlator-nightly-wcp/blob/main/default.json"
+            "https://github.com/nicholasx417/WinNative-Components/blob/main/default.json"
 
         @JvmStatic
         fun isSetupComplete(context: Context): Boolean = prefs(context).getBoolean(KEY_SETUP_COMPLETE, false)
@@ -253,7 +288,23 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         }
 
         @JvmStatic
-        fun getLastInstalledDriverId(context: Context): String = prefs(context).getString(KEY_LAST_DRIVER_ID, "") ?: ""
+        fun getLastInstalledDriverId(context: Context): String {
+            val lastId = prefs(context).getString(KEY_LAST_DRIVER_ID, "") ?: ""
+            if (lastId.isBlank() || lastId == "System") return ""
+
+            val manager = AdrenotoolsManager(context)
+            val installed = manager.enumarateInstalledDrivers()
+            if (installed.contains(lastId)) return lastId
+
+            return if (installed.isNotEmpty()) {
+                val first = installed[0]
+                recordInstalledDriver(context, first)
+                first
+            } else {
+                recordInstalledDriver(context, "")
+                ""
+            }
+        }
 
         @JvmStatic
         fun recordInstalledContent(
@@ -383,17 +434,12 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         val label: String,
         val type: ContentProfile.ContentType,
         val url: String,
-        val nameHint: String,
     )
 
     private data class RuntimeSpec(
         val label: String,
-        val archToken: String,
         val fallbackType: ContentProfile.ContentType,
         val fallbackUrl: String,
-        val fallbackNameHint: String,
-        val containerDisplayName: (ContentProfile) -> String,
-        val persistContainerId: (Context, Int) -> Unit,
     )
 
     private data class RemotePackageSpec(
@@ -415,64 +461,50 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
             PackageSpec(
                 label = "DXVK 2.7.1 GPLAsync",
                 type = ContentProfile.ContentType.CONTENT_TYPE_DXVK,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-Dxvk/Dxvk-2.7.1-gplasync.wcp",
-                nameHint = "dxvk-2.7.1-gplasync",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-Dxvk/Dxvk-2.7.1-gplasync.wcp",
             ),
             PackageSpec(
                 label = "DXVK 2.7.1 ARM64EC GPLAsync",
                 type = ContentProfile.ContentType.CONTENT_TYPE_DXVK,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-Arm64ec-Dxvk/Dxvk-2.7.1-arm64ec-gplasync.wcp",
-                nameHint = "Dxvk-2.7.1-arm64ec-gplasync",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-Arm64ec-Dxvk/Dxvk-2.7.1-arm64ec-gplasync.wcp",
             ),
             PackageSpec(
-                label = "VKD3D Proton 3.0b",
+                label = "VKD3D Proton 3.0.1",
                 type = ContentProfile.ContentType.CONTENT_TYPE_VKD3D,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-Vk3dk/Vk3dk-proton-3.0b.wcp",
-                nameHint = "Vk3dk-proton-3.0b",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-VKD3D/Vkd3d-proton-3.0.1.wcp",
             ),
             PackageSpec(
-                label = "VKD3D ARM64EC 3.0b",
+                label = "VKD3D ARM64EC 3.0.1",
                 type = ContentProfile.ContentType.CONTENT_TYPE_VKD3D,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-Arm64ec-Vk3dk/Vk3dk-arm64ec-3.0b.wcp",
-                nameHint = "Vk3dk-arm64ec-3.0b",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-arm64ec-VKD3D/Vkd3d-arm64ec-3.0.1.wcp",
             ),
             PackageSpec(
                 label = "DXVK 2.4.1 pre-reg",
                 type = ContentProfile.ContentType.CONTENT_TYPE_DXVK,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-Dxvk/Dxvk-2.4.1-pre-reg.wcp",
-                nameHint = "Dxvk-2.4.1-pre-reg",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-Dxvk/Dxvk-2.4.1-pre-reg.wcp",
             ),
             PackageSpec(
-                label = "FEX 2604",
+                label = "FEX 2605",
                 type = ContentProfile.ContentType.CONTENT_TYPE_FEXCORE,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-FEX/FEX-2604.wcp",
-                nameHint = "FEX-2604",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-FEX/FEX-2605.wcp",
             ),
             PackageSpec(
-                label = "Box64 0.4.1 fix",
+                label = "Box64 0.4.2",
                 type = ContentProfile.ContentType.CONTENT_TYPE_BOX64,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-Box64/Box64-0.4.1-fix.wcp",
-                nameHint = "Box64-0.4.1-fix",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-Box64/Box64-0.4.2.wcp",
             ),
             PackageSpec(
-                label = "Wowbox64 0.4.1",
+                label = "Wowbox64 0.4.2",
                 type = ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64,
-                url = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Stable-wowbox64/Wowbox64-0.4.1.wcp",
-                nameHint = "Wowbox64-0.4.1",
+                url = "https://github.com/nicholasx417/WinNative-Components/releases/download/Stable-wowbox64/Wowbox64-0.4.2.wcp",
             ),
         )
 
     private val x86ProtonSpec =
         RuntimeSpec(
             label = "Recommended x86-64",
-            archToken = "x86_64",
             fallbackType = ContentProfile.ContentType.CONTENT_TYPE_WINE,
-            fallbackUrl = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/Wine/wine-9.20-x86_64.wcp",
-            fallbackNameHint = "wine-9.20-x86_64",
-            containerDisplayName = { profile ->
-                "${runtimeDisplayLabel(profile)} x86-64"
-            },
-            persistContainerId = ::saveDefaultX86ContainerId,
+            fallbackUrl = "https://github.com/nicholasx417/WinNative-Components/releases/download/Wine/wine-9.20-x86_64.wcp",
         )
 
     private val recommendedUrlsState = mutableStateOf<Set<String>>(emptySet())
@@ -497,21 +529,28 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     private val arm64ProtonSpec =
         RuntimeSpec(
             label = "Recommended ARM64EC",
-            archToken = "arm64ec",
             fallbackType = ContentProfile.ContentType.CONTENT_TYPE_PROTON,
-            fallbackUrl = "https://github.com/Xnick417x/winlator-nightly-wcp/releases/download/GameNative/Proton-10-arm64ec-coffincolors.wcp",
-            fallbackNameHint = "Proton-10-arm64ec-coffincolors",
-            containerDisplayName = { profile ->
-                "${runtimeDisplayLabel(profile)} ARM64EC"
-            },
-            persistContainerId = ::saveDefaultArm64ContainerId,
+            fallbackUrl = "https://github.com/nicholasx417/WinNative-Components/releases/download/Proton/Proton-10-arm64ec-coffincolors.wcp",
         )
 
     private val storageGranted = mutableStateOf(false)
     private val notifGranted = mutableStateOf(false)
     private val notifDenied = mutableStateOf(false)
+    private val backgroundSessionEnabled = mutableStateOf(false)
 
     private val pageIndex = mutableIntStateOf(0)
+    private val navRegion = mutableIntStateOf(REGION_CONTENT)
+    private val navIndex = mutableIntStateOf(0)
+    private val activateSignal = mutableIntStateOf(0)
+    private val controllerConnected = mutableStateOf(false)
+    private var tabCount = 0
+    private var contentCount = 0
+    private var contentColumns = 1
+    private var navCount = 2
+    private var wideLayout = false
+    private var lastTabIndex = 0
+    private var lastContentIndex = 0
+    private var onTabIndexChange: ((Int) -> Unit)? = null
     private val imageFsInstalling = mutableStateOf(false)
     private val imageFsProgress = mutableIntStateOf(0)
     private val imageFsDone = mutableStateOf(false)
@@ -526,6 +565,16 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     private val advancedProfiles = mutableStateListOf<RemotePackageSpec>()
     private val advancedInstalledSet = mutableStateListOf<String>()
     private val advancedContainerNames = mutableStateListOf<String>()
+    private val advancedSizeCache = mutableStateMapOf<String, Long>()
+    private val advancedSizeFetchesInFlight = mutableSetOf<String>()
+
+    private enum class QueueItemStatus { QUEUED, ACTIVE, FAILED }
+
+    private val installQueue = mutableStateListOf<RemotePackageSpec>()
+    private val queueStatus = mutableStateMapOf<String, QueueItemStatus>()
+    private var queueWorkerRunning = false
+    private var queueTotal = 0
+    private var queueCompleted = 0
 
     private var returnToCaller = false
     private var recommendedPackageRefreshInFlight = false
@@ -536,14 +585,16 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         ) {
             storageGranted.value = hasStoragePermission()
         }
-
     private val notifPermLauncher =
         registerForActivityResult(
             ActivityResultContracts.RequestPermission(),
         ) { granted ->
             notifGranted.value = granted
             notifDenied.value = !granted
-            if (!granted && Build.VERSION.SDK_INT >= 33 &&
+            if (granted) {
+                backgroundSessionEnabled.value = true
+                prefs(this).edit().putBoolean("enable_background_session", true).apply()
+            } else if (Build.VERSION.SDK_INT >= 33 &&
                 !shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)
             ) {
                 openNotificationSettings()
@@ -559,8 +610,268 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 permissions[Manifest.permission.READ_EXTERNAL_STORAGE] == true
         }
 
+    private var stickEngaged = 0
+
+    private fun advanceWizardPage() {
+        val page = pageIndex.intValue
+        if (page < 2) {
+            val canGoNext = if (page == 0) storageGranted.value && imageFsDone.value else true
+            if (canGoNext) pageIndex.intValue += 1
+        } else if (!creatingContainer.value && transferState.value == null) {
+            finishWizard()
+        }
+    }
+
+    private fun resetNav(region: Int = REGION_CONTENT) {
+        navRegion.intValue = if (region == REGION_TABS && tabCount == 0) REGION_CONTENT else region
+        navIndex.intValue = 0
+        lastTabIndex = 0
+        lastContentIndex = 0
+    }
+
+    private fun regionSize(r: Int) =
+        when (r) {
+            REGION_TABS -> tabCount
+            REGION_CONTENT -> contentCount
+            REGION_NAV -> navCount
+            else -> 0
+        }
+
+    private fun clampNav() {
+        val max = (regionSize(navRegion.intValue) - 1).coerceAtLeast(0)
+        if (navIndex.intValue > max) navIndex.intValue = max
+    }
+
+    private fun setNav(region: Int, index: Int) {
+        navRegion.intValue = region
+        navIndex.intValue = index.coerceAtLeast(0)
+        clampNav()
+        if (region == REGION_TABS) onTabIndexChange?.invoke(navIndex.intValue)
+    }
+
+    fun setTabCount(n: Int) {
+        tabCount = n.coerceAtLeast(0)
+        clampNav()
+    }
+
+    fun setContentLayout(count: Int, columns: Int) {
+        contentCount = count.coerceAtLeast(0)
+        contentColumns = columns.coerceAtLeast(1)
+        clampNav()
+    }
+
+    private fun navLeft() {
+        if (wideLayout) {
+            when (navRegion.intValue) {
+                REGION_CONTENT ->
+                    if (contentColumns > 1 && navIndex.intValue % contentColumns != 0) {
+                        navIndex.intValue -= 1
+                    } else if (tabCount > 0) {
+                        lastContentIndex = navIndex.intValue
+                        setNav(REGION_TABS, lastTabIndex.coerceAtMost(tabCount - 1))
+                    }
+                REGION_NAV ->
+                    when {
+                        navIndex.intValue > 0 -> navIndex.intValue -= 1
+                        contentCount > 0 -> { navRegion.intValue = REGION_CONTENT; navIndex.intValue = lastContentIndex.coerceAtMost(contentCount - 1) }
+                        tabCount > 0 -> setNav(REGION_TABS, lastTabIndex.coerceAtMost(tabCount - 1))
+                    }
+            }
+            return
+        }
+        when (navRegion.intValue) {
+            REGION_TABS -> if (navIndex.intValue > 0) setNav(REGION_TABS, navIndex.intValue - 1)
+            else -> if (navIndex.intValue > 0) navIndex.intValue -= 1
+        }
+    }
+
+    private fun navRight() {
+        if (wideLayout) {
+            when (navRegion.intValue) {
+                REGION_TABS ->
+                    when {
+                        contentCount > 0 -> { lastTabIndex = navIndex.intValue; navRegion.intValue = REGION_CONTENT; navIndex.intValue = lastContentIndex.coerceAtMost(contentCount - 1) }
+                        navCount > 0 -> { navRegion.intValue = REGION_NAV; navIndex.intValue = navCount - 1 }
+                    }
+                REGION_CONTENT ->
+                    if (navIndex.intValue % contentColumns != contentColumns - 1 && navIndex.intValue < contentCount - 1) {
+                        navIndex.intValue += 1
+                    } else if (navCount > 0) {
+                        lastContentIndex = navIndex.intValue
+                        navRegion.intValue = REGION_NAV
+                        navIndex.intValue = navCount - 1
+                    }
+                REGION_NAV -> if (navIndex.intValue < navCount - 1) navIndex.intValue += 1
+            }
+            return
+        }
+        val size = regionSize(navRegion.intValue)
+        if (navRegion.intValue == REGION_TABS) {
+            if (navIndex.intValue < size - 1) setNav(REGION_TABS, navIndex.intValue + 1)
+        } else if (navIndex.intValue < size - 1) {
+            navIndex.intValue += 1
+        }
+    }
+
+    private fun navUp() {
+        if (wideLayout) {
+            when (navRegion.intValue) {
+                REGION_TABS -> if (navIndex.intValue > 0) setNav(REGION_TABS, navIndex.intValue - 1)
+                REGION_CONTENT -> if (navIndex.intValue >= contentColumns) navIndex.intValue -= contentColumns
+                REGION_NAV ->
+                    when {
+                        contentCount > 0 -> { navRegion.intValue = REGION_CONTENT; navIndex.intValue = lastContentIndex.coerceAtMost(contentCount - 1) }
+                        tabCount > 0 -> setNav(REGION_TABS, lastTabIndex.coerceAtMost(tabCount - 1))
+                    }
+            }
+            return
+        }
+        when (navRegion.intValue) {
+            REGION_CONTENT ->
+                if (navIndex.intValue < contentColumns) {
+                    if (tabCount > 0) setNav(REGION_TABS, navIndex.intValue.coerceAtMost(tabCount - 1))
+                } else {
+                    navIndex.intValue -= contentColumns
+                }
+            REGION_NAV ->
+                when {
+                    contentCount > 0 -> { navRegion.intValue = REGION_CONTENT; navIndex.intValue = contentCount - 1 }
+                    tabCount > 0 -> setNav(REGION_TABS, 0)
+                }
+        }
+    }
+
+    private fun navDown() {
+        if (wideLayout) {
+            when (navRegion.intValue) {
+                REGION_TABS -> if (navIndex.intValue < tabCount - 1) setNav(REGION_TABS, navIndex.intValue + 1)
+                REGION_CONTENT -> {
+                    val below = navIndex.intValue + contentColumns
+                    if (below < contentCount) navIndex.intValue = below
+                    else if (navCount > 0) { lastContentIndex = navIndex.intValue; navRegion.intValue = REGION_NAV; navIndex.intValue = navCount - 1 }
+                }
+            }
+            return
+        }
+        when (navRegion.intValue) {
+            REGION_TABS ->
+                when {
+                    contentCount > 0 -> { navRegion.intValue = REGION_CONTENT; navIndex.intValue = lastContentIndex.coerceAtMost(contentCount - 1) }
+                    navCount > 0 -> { navRegion.intValue = REGION_NAV; navIndex.intValue = 0 }
+                }
+            REGION_CONTENT -> {
+                val below = navIndex.intValue + contentColumns
+                if (below < contentCount) {
+                    navIndex.intValue = below
+                } else if (navCount > 0) {
+                    navRegion.intValue = REGION_NAV
+                    navIndex.intValue = 0
+                }
+            }
+        }
+    }
+
+    private fun navActivate() { activateSignal.intValue++ }
+
+    private fun applyNavDir(code: Int) {
+        when (code) {
+            android.view.KeyEvent.KEYCODE_DPAD_LEFT -> navLeft()
+            android.view.KeyEvent.KEYCODE_DPAD_RIGHT -> navRight()
+            android.view.KeyEvent.KEYCODE_DPAD_UP -> navUp()
+            android.view.KeyEvent.KEYCODE_DPAD_DOWN -> navDown()
+        }
+    }
+
+    override fun dispatchKeyEvent(event: android.view.KeyEvent): Boolean {
+        if (com.winlator.cmod.runtime.input.controls.ExternalController.isGameController(event.device)) {
+            controllerConnected.value = true
+        }
+        val down = event.action == android.view.KeyEvent.ACTION_DOWN
+        when (event.keyCode) {
+            android.view.KeyEvent.KEYCODE_DPAD_LEFT,
+            android.view.KeyEvent.KEYCODE_DPAD_RIGHT,
+            android.view.KeyEvent.KEYCODE_DPAD_UP,
+            android.view.KeyEvent.KEYCODE_DPAD_DOWN,
+            -> {
+                if (down) applyNavDir(event.keyCode)
+                return true
+            }
+
+            android.view.KeyEvent.KEYCODE_BUTTON_A,
+            android.view.KeyEvent.KEYCODE_DPAD_CENTER,
+            -> {
+                if (down) navActivate()
+                return true
+            }
+
+            android.view.KeyEvent.KEYCODE_BUTTON_B -> {
+                if (down && pageIndex.intValue > 0) {
+                    pageIndex.intValue -= 1
+                }
+                return true
+            }
+
+            android.view.KeyEvent.KEYCODE_BUTTON_START -> {
+                if (down) advanceWizardPage()
+                return true
+            }
+
+            android.view.KeyEvent.KEYCODE_BUTTON_X,
+            android.view.KeyEvent.KEYCODE_BUTTON_Y,
+            android.view.KeyEvent.KEYCODE_BUTTON_L1,
+            android.view.KeyEvent.KEYCODE_BUTTON_R1,
+            -> return true
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
+    override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean {
+        if ((event.source and android.view.InputDevice.SOURCE_JOYSTICK) == android.view.InputDevice.SOURCE_JOYSTICK &&
+            event.action == android.view.MotionEvent.ACTION_MOVE
+        ) {
+            controllerConnected.value = true
+            val x = event.getAxisValue(android.view.MotionEvent.AXIS_X)
+            val y = event.getAxisValue(android.view.MotionEvent.AXIS_Y)
+            val hx = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_X)
+            val hy = event.getAxisValue(android.view.MotionEvent.AXIS_HAT_Y)
+            val code =
+                when {
+                    x < -0.5f || hx < -0.5f -> android.view.KeyEvent.KEYCODE_DPAD_LEFT
+                    x > 0.5f || hx > 0.5f -> android.view.KeyEvent.KEYCODE_DPAD_RIGHT
+                    y < -0.5f || hy < -0.5f -> android.view.KeyEvent.KEYCODE_DPAD_UP
+                    y > 0.5f || hy > 0.5f -> android.view.KeyEvent.KEYCODE_DPAD_DOWN
+                    else -> 0
+                }
+            if (code != 0) {
+                if (stickEngaged == 0) {
+                    stickEngaged = code
+                    applyNavDir(code)
+                }
+                return true
+            }
+            if (kotlin.math.abs(x) < 0.35f && kotlin.math.abs(y) < 0.35f &&
+                kotlin.math.abs(hx) < 0.35f && kotlin.math.abs(hy) < 0.35f
+            ) {
+                stickEngaged = 0
+            }
+            return true
+        }
+        return super.dispatchGenericMotionEvent(event)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        window.clearFlags(
+            WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION or
+                WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+        )
+        enableEdgeToEdge(
+            navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT),
+            statusBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT),
+        )
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.isNavigationBarContrastEnforced = false
+        }
         returnToCaller = intent?.getBooleanExtra(EXTRA_RETURN_TO_CALLER, false) == true
         val forceShow = intent?.getBooleanExtra(EXTRA_FORCE_SHOW, false) == true
 
@@ -572,13 +883,14 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
             refreshWizardState()
         }
 
-        if (!forceShow && isSetupComplete(this) && ImageFs.find(this).isValid) {
+        if (!forceShow && isSetupComplete(this) && ImageFs.find(this).isUpToDate) {
             launchApp()
             return
         }
 
         storageGranted.value = hasStoragePermission()
         notifGranted.value = hasNotificationPermissionSilently()
+        backgroundSessionEnabled.value = prefs(this).getBoolean("enable_background_session", false)
         refreshWizardState()
         loadAdvancedProfiles()
 
@@ -592,24 +904,42 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                         surface = Color(0xFF1E252E),
                     ),
             ) {
-                SetupWizardScreen()
+                androidx.compose.runtime.CompositionLocalProvider(
+                    androidx.compose.material3.LocalMinimumInteractiveComponentSize provides androidx.compose.ui.unit.Dp.Unspecified,
+                ) {
+                    SetupWizardScreen()
+                }
             }
         }
     }
 
+    private fun isAnyControllerConnected(): Boolean {
+        for (id in android.view.InputDevice.getDeviceIds()) {
+            val dev = android.view.InputDevice.getDevice(id)
+            if (dev != null && com.winlator.cmod.runtime.input.controls.ExternalController.isGameController(dev)) {
+                return true
+            }
+        }
+        return false
+    }
+
     override fun onResume() {
         super.onResume()
+        controllerConnected.value = isAnyControllerConnected()
         storageGranted.value = hasStoragePermission()
         val notificationsEnabled = hasNotificationPermissionSilently()
         notifGranted.value = notificationsEnabled
-        if (notificationsEnabled) notifDenied.value = false
+        if (notificationsEnabled) {
+            notifDenied.value = false
+        }
+        backgroundSessionEnabled.value = prefs(this).getBoolean("enable_background_session", false)
         refreshWizardState()
         refreshRecommendedPackageCache()
     }
 
     private fun refreshWizardState() {
         val imageFs = ImageFs.find(this)
-        imageFsDone.value = imageFs.isValid && imageFs.version >= ImageFsInstaller.LATEST_VERSION.toInt()
+        imageFsDone.value = imageFs.isUpToDate
 
         val preferences = prefs(this)
         val containerManager = ContainerManager(this)
@@ -677,6 +1007,12 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     }
 
     private fun requestNotifications() {
+        if (hasNotificationPermissionSilently()) {
+            backgroundSessionEnabled.value = true
+            prefs(this).edit().putBoolean("enable_background_session", true).apply()
+            return
+        }
+
         if (Build.VERSION.SDK_INT >= 33 && applicationInfo.targetSdkVersion >= 33) {
             if (notifDenied.value) {
                 openNotificationSettings()
@@ -712,143 +1048,43 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         wizardError.value = null
         imageFsInstalling.value = true
         imageFsProgress.intValue = 0
-        val imageFs = ImageFs.find(this)
-        val rootDir = imageFs.rootDir
-
-        Executors.newSingleThreadExecutor().execute {
-            try {
-                clearRootDir(rootDir)
-
-                val compressionRatio = 22
-                var contentLength = 0L
-                val assetSize = FileUtils.getSize(this, "imagefs.txz")
-                contentLength +=
-                    if (assetSize > 0) {
-                        (assetSize * (100.0f / compressionRatio)).toLong()
-                    } else {
-                        800_000_000L
-                    }
-
-                try {
-                    val versions = resources.getStringArray(R.array.wine_entries)
-                    versions.forEach { version ->
-                        val versionSize = FileUtils.getSize(this, "$version.txz")
-                        contentLength +=
-                            if (versionSize > 0) {
-                                (versionSize * (100.0f / compressionRatio)).toLong()
-                            } else {
-                                100_000_000L
-                            }
-                    }
-                } catch (_: Exception) {
-                }
-
-                val totalSize = AtomicLong()
-                val listener =
-                    OnExtractFileListener { file, size ->
-                        if (size > 0) {
-                            val total = totalSize.addAndGet(size)
-                            val percent = ((total.toFloat() / contentLength) * 100f).toInt().coerceIn(0, 100)
-                            runOnUiThread { imageFsProgress.intValue = percent }
-                        }
-                        file
-                    }
 
-                val success =
-                    TarCompressorUtils.extract(
-                        Type.XZ,
-                        this,
-                        "imagefs.txz",
-                        rootDir,
-                        listener,
-                    )
+        val keepAliveTag = "imagefs_install"
+        com.winlator.cmod.runtime.system.SessionKeepAliveService.startDownload(this, keepAliveTag)
 
-                if (!success) {
+        ImageFsInstaller.installFromAssets(
+            this,
+            object : ImageFsInstaller.ProgressListener {
+                override fun onProgress(percent: Int) {
                     runOnUiThread {
-                        imageFsInstalling.value = false
-                        wizardError.value = "ImageFS extraction failed. Check available storage and try again."
+                        imageFsProgress.intValue = percent.coerceIn(0, 100)
                     }
-                    return@execute
                 }
 
-                try {
-                    resources.getStringArray(R.array.wine_entries).forEach { version ->
-                        val outFile = File(rootDir, "/opt/$version")
-                        outFile.mkdirs()
-                        TarCompressorUtils.extract(Type.XZ, this, "$version.txz", outFile, listener)
-                    }
-                } catch (_: Exception) {
-                }
-
-                try {
-                    val manager = AdrenotoolsManager(this)
-                    resources.getStringArray(R.array.wrapper_graphics_driver_version_entries).forEach { driver ->
-                        manager.extractDriverFromResources(driver)
+                override fun onFinished(success: Boolean) {
+                    runOnUiThread {
+                        imageFsProgress.intValue = if (success) 100 else imageFsProgress.intValue
+                        if (success) {
+                            window.decorView.postDelayed(
+                                {
+                                    imageFsInstalling.value = false
+                                    imageFsDone.value = true
+                                    refreshWizardState()
+                                },
+                                500L,
+                            )
+                        } else {
+                            imageFsInstalling.value = false
+                            wizardError.value = "ImageFS install failed. Check available storage and try again."
+                        }
+                        com.winlator.cmod.runtime.system.SessionKeepAliveService.stopDownload(
+                            applicationContext,
+                            keepAliveTag,
+                        )
                     }
-                } catch (_: Exception) {
-                }
-
-                imageFs.createImgVersionFile(ImageFsInstaller.LATEST_VERSION.toInt())
-                runOnUiThread {
-                    imageFsProgress.intValue = 100
-                    imageFsInstalling.value = false
-                    imageFsDone.value = true
-                    refreshWizardState()
                 }
-            } catch (e: Exception) {
-                runOnUiThread {
-                    imageFsInstalling.value = false
-                    wizardError.value = "ImageFS install failed: ${e.message}"
-                }
-            }
-        }
-    }
-
-    private suspend fun downloadAndInstallPackage(
-        spec: PackageSpec,
-        index: Int,
-        total: Int,
-    ): ContentProfile? {
-        transferState.value =
-            TransferState(
-                title = getString(R.string.setup_wizard_recommended_components),
-                detail = getString(R.string.setup_wizard_downloading, spec.label),
-                currentIndex = index + 1,
-                total = total,
-                progress = 0f,
-            )
-
-        val downloaded =
-            downloadFileToCache(
-                label = spec.label,
-                url = spec.url,
-                currentIndex = index + 1,
-                total = total,
-            ) ?: return null
-
-        // Show 100% briefly so the bar visually completes before switching
-        transferState.value =
-            TransferState(
-                title = getString(R.string.setup_wizard_recommended_components),
-                detail = getString(R.string.setup_wizard_downloading, spec.label),
-                currentIndex = index + 1,
-                total = total,
-                progress = 1f,
-            )
-        kotlinx.coroutines.delay(500)
-
-        transferState.value =
-            TransferState(
-                title = getString(R.string.setup_wizard_recommended_components),
-                detail = getString(R.string.setup_wizard_installing_package, spec.label),
-                currentIndex = index + 1,
-                total = total,
-                progress = null,
-            )
-
-        val profile = installDownloadedPackage(downloaded, spec.url)
-        downloaded.delete()
-        return profile
+            },
+        )
     }
 
     private suspend fun downloadFileToCache(
@@ -856,15 +1092,16 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         url: String,
         currentIndex: Int,
         total: Int,
+        title: String = label,
     ): File? =
         withContext(Dispatchers.IO) {
             val sanitized = label.lowercase().replace(Regex("[^a-z0-9]+"), "_")
             val output = File(cacheDir, "wizard_${System.currentTimeMillis()}_$sanitized.wcp")
             val listener =
                 Downloader.DownloadListener { downloadedBytes, totalBytes ->
-                    transferState.value =
+                    updateTransferState(
                         TransferState(
-                            title = transferState.value?.title ?: label,
+                            title = title,
                             detail = getString(R.string.setup_wizard_downloading, label),
                             currentIndex = currentIndex,
                             total = total,
@@ -874,12 +1111,37 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                                 } else {
                                     null
                                 },
-                        )
+                        ),
+                    )
                 }
             val success = Downloader.downloadFileWinNativeFirst(url, output, listener)
             if (success) output else null
         }
 
+    private fun updateTransferState(next: TransferState?) {
+        if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+            transferState.value = next
+        } else {
+            runOnUiThread { transferState.value = next }
+        }
+    }
+
+    private fun updateWizardError(message: String?) {
+        if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+            wizardError.value = message
+        } else {
+            runOnUiThread { wizardError.value = message }
+        }
+    }
+
+    private fun updateRecommendedUrls(urls: Set<String>) {
+        if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+            recommendedUrlsState.value = urls
+        } else {
+            runOnUiThread { recommendedUrlsState.value = urls }
+        }
+    }
+
     private fun installDownloadedPackage(
         file: File,
         sourceUrl: String,
@@ -943,69 +1205,84 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         return if (failed) null else installedProfile
     }
 
-    private fun resolveRecommendedComponentSpecs(): List<PackageSpec> {
-        val componentTypes =
-            setOf(
-                ContentProfile.ContentType.CONTENT_TYPE_DXVK,
-                ContentProfile.ContentType.CONTENT_TYPE_VKD3D,
-                ContentProfile.ContentType.CONTENT_TYPE_FEXCORE,
-                ContentProfile.ContentType.CONTENT_TYPE_BOX64,
-                ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64,
-            )
-        val remoteSpecs =
-            fetchRecommendedPackages()
-                .filter { it.type in componentTypes }
-                .map {
-                    PackageSpec(
-                        label = it.verName,
-                        type = it.type,
-                        url = it.remoteUrl,
-                        nameHint = it.verName,
-                    )
+    private fun loadAdvancedProfiles() {
+        if (advancedProfiles.isNotEmpty()) return
+        lifecycleScope.launch {
+            val profiles =
+                withContext(Dispatchers.IO) {
+                    // 1. Fetch recommended (default.json)
+                    val recommended = fetchRecommendedPackages()
+
+                    // 2. Fetch full catalog (content.json)
+                    val fullCatalog =
+                        parseRecommendedPackages(
+                            Downloader.downloadString(ContentsManager.REMOTE_PROFILES),
+                        )
+
+                    // 3. Merge: start with recommended, then add any full catalog entries not already present
+                    val seen = recommended.map { it.remoteUrl }.toMutableSet()
+                    val merged = recommended.toMutableList()
+                    for (spec in fullCatalog) {
+                        if (spec.remoteUrl !in seen) {
+                            seen.add(spec.remoteUrl)
+                            merged.add(spec)
+                        }
+                    }
+
+                    // 4. Emergency Fallback: If everything failed and we have no profiles, use hardcoded ones
+                    if (merged.isEmpty()) {
+                        merged.addAll(getFallbackRemoteSpecs())
+                    }
+                    merged
                 }
-        return remoteSpecs.ifEmpty { recommendedComponents }
+            advancedProfiles.clear()
+            advancedProfiles.addAll(profiles)
+            refreshAdvancedInstalledSet()
+        }
     }
 
-    private fun resolveRecommendedRuntimeSpec(spec: RuntimeSpec): PackageSpec {
-        val resolved =
-            fetchRecommendedPackages().firstOrNull {
-                (
-                    it.type == ContentProfile.ContentType.CONTENT_TYPE_WINE ||
-                        it.type == ContentProfile.ContentType.CONTENT_TYPE_PROTON
-                ) &&
-                    it.verName.contains(spec.archToken, ignoreCase = true)
-            }
-
-        if (resolved != null) {
-            return PackageSpec(
-                label = spec.label,
-                type = resolved.type,
-                url = resolved.remoteUrl,
-                nameHint = resolved.verName,
-            )
+    private fun fetchAdvancedSizes(specs: List<RemotePackageSpec>) {
+        val urls =
+            specs
+                .map { it.remoteUrl }
+                .filter { it.isNotEmpty() && it !in advancedSizeCache && it !in advancedSizeFetchesInFlight }
+                .distinct()
+        if (urls.isEmpty()) return
+        advancedSizeFetchesInFlight.addAll(urls)
+        urls.forEach { url ->
+            lifecycleScope.launch {
+                val size = withContext(Dispatchers.IO) { Downloader.fetchContentLength(url) }
+                advancedSizeFetchesInFlight.remove(url)
+                if (size > 0L) advancedSizeCache[url] = size
+            }
         }
-
-        return PackageSpec(
-            label = spec.label,
-            type = spec.fallbackType,
-            url = spec.fallbackUrl,
-            nameHint = spec.fallbackNameHint,
-        )
     }
 
+    private fun formatSizeMb(bytes: Long): String =
+        String.format(java.util.Locale.US, "%.1f MB", bytes.toDouble() / (1024.0 * 1024.0))
+
+    private fun getFallbackRemoteSpecs(): List<RemotePackageSpec> =
+        buildList {
+            recommendedComponents.forEach {
+                add(RemotePackageSpec(it.type, it.label, it.url))
+            }
+            add(RemotePackageSpec(x86ProtonSpec.fallbackType, x86ProtonSpec.label, x86ProtonSpec.fallbackUrl))
+            add(RemotePackageSpec(arm64ProtonSpec.fallbackType, arm64ProtonSpec.label, arm64ProtonSpec.fallbackUrl))
+        }
+
     private fun fetchRecommendedPackages(): List<RemotePackageSpec> {
         val json = Downloader.downloadString(resolveJsonDownloadUrl(DEFAULT_JSON_URL))
         if (!json.isNullOrBlank()) {
             prefs(this).edit().putString(KEY_DEFAULT_JSON_CACHE, json).apply()
             val specs = parseRecommendedPackages(json)
             if (specs.isNotEmpty()) {
-                recommendedUrlsState.value = specs.map { it.remoteUrl }.toSet()
+                updateRecommendedUrls(specs.map { it.remoteUrl }.toSet())
             }
             return specs
         }
         val cached = getCachedRecommendedPackages()
         if (cached.isNotEmpty()) {
-            recommendedUrlsState.value = cached.map { it.remoteUrl }.toSet()
+            updateRecommendedUrls(cached.map { it.remoteUrl }.toSet())
         }
         return cached
     }
@@ -1031,20 +1308,6 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         return parseRecommendedPackages(cachedJson)
     }
 
-    private fun getCachedRecommendedComponentSpecs(): List<PackageSpec> =
-        getCachedRecommendedPackages()
-            .filter {
-                it.type != ContentProfile.ContentType.CONTENT_TYPE_WINE &&
-                    it.type != ContentProfile.ContentType.CONTENT_TYPE_PROTON
-            }.map {
-                PackageSpec(
-                    label = it.verName,
-                    type = it.type,
-                    url = it.remoteUrl,
-                    nameHint = it.verName,
-                )
-            }
-
     private fun parseRecommendedPackages(json: String?): List<RemotePackageSpec> {
         if (json.isNullOrBlank()) return emptyList()
 
@@ -1068,188 +1331,22 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         desiredName: String,
     ): Container {
         val containerManager = ContainerManager(this)
-        containerManager.containers.firstOrNull { it.name == desiredName }?.let {
-            val resolvedWineVersion = ContentsManager.getEntryName(profile)
-            if (it.wineVersion != resolvedWineVersion) {
-                it.setWineVersion(resolvedWineVersion)
-                it.putExtra("wineprefixNeedsUpdate", "t")
-                it.saveData()
-            }
-            applyRecommendedContainerDefaults(it)
-            return it
-        }
-
         val contentsManager = ContentsManager(this)
         contentsManager.syncContents()
-        val data =
-            JSONObject().apply {
-                put("name", desiredName)
-                put("wineVersion", ContentsManager.getEntryName(profile))
-            }
 
-        return requireNotNull(containerManager.createContainer(data, contentsManager)) {
-            "Unable to create container for ${profile.verName}"
-        }.also {
-            applyRecommendedContainerDefaults(it)
-        }
-    }
-
-    private fun applyRecommendedContainerDefaults(container: Container) {
-        val contentsManager = ContentsManager(this)
-        contentsManager.syncContents()
-        val wineInfo = WineInfo.fromIdentifier(this, contentsManager, container.wineVersion)
-        val isArm64 = wineInfo.isArm64EC
-        val normalizedDrives =
-            com.winlator.cmod.runtime.wine.WineUtils.normalizePersistentDrives(
+        return requireNotNull(
+            ContainerCreation.getOrCreateContainerForProfile(
                 this,
-                container.drives ?: Container.DEFAULT_DRIVES,
-            )
-
-        container.setGraphicsDriver(Container.DEFAULT_GRAPHICS_DRIVER)
-        container.setCPUList(Container.getFallbackCPUList())
-        container.setCPUListWoW64(Container.getFallbackCPUListWoW64())
-        container.setDrives(normalizedDrives)
-        container.setGraphicsDriverConfig(
-            replaceDelimitedConfigValue(
-                Container.DEFAULT_GRAPHICSDRIVERCONFIG,
-                ';',
-                "version",
-                resolvePreferredDriverVersion(),
-            ),
-        )
-        container.setDXWrapper(Container.DEFAULT_DXWRAPPER)
-        container.setDXWrapperConfig(
-            replaceDelimitedConfigValue(
-                replaceDelimitedConfigValue(
-                    Container.DEFAULT_DXWRAPPERCONFIG,
-                    ',',
-                    "version",
-                    resolvePreferredContentVersion(
-                        contentsManager,
-                        ContentProfile.ContentType.CONTENT_TYPE_DXVK,
-                        "",
-                        if (isArm64) Regex("arm64ec", RegexOption.IGNORE_CASE) else null,
-                        if (isArm64) null else Regex("arm64ec", RegexOption.IGNORE_CASE),
-                    ),
-                ),
-                ',',
-                "vkd3dVersion",
-                resolvePreferredContentVersion(
-                    contentsManager,
-                    ContentProfile.ContentType.CONTENT_TYPE_VKD3D,
-                    "None",
-                    if (isArm64) Regex("arm64ec", RegexOption.IGNORE_CASE) else null,
-                    if (isArm64) null else Regex("arm64ec", RegexOption.IGNORE_CASE),
-                ),
+                containerManager,
+                contentsManager,
+                profile,
+                desiredName,
             ),
-        )
-
-        if (isArm64) {
-            container.setEmulator("fexcore")
-            container.setEmulator64("fexcore")
-            container.setBox64Version(
-                resolvePreferredContentVersion(
-                    contentsManager,
-                    ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64,
-                    "",
-                ),
-            )
-            container.setFEXCoreVersion(
-                resolvePreferredContentVersion(
-                    contentsManager,
-                    ContentProfile.ContentType.CONTENT_TYPE_FEXCORE,
-                    "",
-                ),
-            )
-        } else {
-            container.setEmulator("box64")
-            container.setEmulator64("box64")
-            container.setBox64Version(
-                resolvePreferredContentVersion(
-                    contentsManager,
-                    ContentProfile.ContentType.CONTENT_TYPE_BOX64,
-                    "",
-                ),
-            )
-            container.setFEXCoreVersion(
-                resolvePreferredContentVersion(
-                    contentsManager,
-                    ContentProfile.ContentType.CONTENT_TYPE_FEXCORE,
-                    "",
-                ),
-            )
-        }
-
-        container.saveData()
-    }
-
-    private fun resolvePreferredDriverVersion(): String {
-        val adrenotoolsManager = AdrenotoolsManager(this)
-        val installedDrivers = adrenotoolsManager.enumarateInstalledDrivers()
-        val preferredDriver = getLastInstalledDriverId(this)
-        if (preferredDriver.isNotBlank() && installedDrivers.contains(preferredDriver)) {
-            return preferredDriver
-        }
-        return "System"
-    }
-
-    private fun resolvePreferredContentVersion(
-        manager: ContentsManager,
-        type: ContentProfile.ContentType,
-        fallback: String,
-        includePattern: Regex? = null,
-        excludePattern: Regex? = null,
-    ): String {
-        val preferenceKey = "last_content_${type.toString().lowercase()}"
-        val preferred = prefs(this).getString(preferenceKey, "") ?: ""
-        val installedProfiles = manager.getProfiles(type).orEmpty().filter { it.isInstalled }
-        val matchingProfiles =
-            installedProfiles
-                .filter { profile ->
-                    val versionName = profile.verName
-                    (includePattern == null || includePattern.containsMatchIn(versionName)) &&
-                        (excludePattern == null || !excludePattern.containsMatchIn(versionName))
-                }.ifEmpty { installedProfiles }
-
-        if (preferred.isNotBlank() && matchingProfiles.any { contentVersionIdentifier(it) == preferred }) {
-            return preferred
-        }
-
-        val newestInstalled =
-            matchingProfiles.maxWithOrNull(
-                compareBy<ContentProfile> { it.verCode }.thenBy { it.verName.lowercase() },
-            )
-        return newestInstalled?.let(::contentVersionIdentifier) ?: fallback
-    }
-
-    private fun replaceDelimitedConfigValue(
-        config: String,
-        delimiter: Char,
-        key: String,
-        value: String,
-    ): String {
-        val parts = config.split(delimiter).toMutableList()
-        var replaced = false
-        for (index in parts.indices) {
-            if (parts[index].startsWith("$key=")) {
-                parts[index] = "$key=$value"
-                replaced = true
-            }
-        }
-        if (!replaced) {
-            parts += "$key=$value"
+        ) {
+            "Unable to create container for ${profile.verName}"
         }
-        return parts.joinToString(delimiter.toString())
     }
 
-    private fun isPackageInstalled(
-        manager: ContentsManager,
-        spec: PackageSpec,
-    ): Boolean =
-        manager.getProfiles(spec.type).orEmpty().any { profile ->
-            profile.isInstalled && profile.verName.contains(spec.nameHint, ignoreCase = true)
-        }
-
     private fun openDrivers() {
         if (supportFragmentManager.findFragmentByTag(SetupWizardDriversDialogFragment.TAG) == null) {
             SetupWizardDriversDialogFragment().show(
@@ -1259,35 +1356,6 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         }
     }
 
-    private fun loadAdvancedProfiles() {
-        if (advancedProfiles.isNotEmpty()) return
-        lifecycleScope.launch {
-            val profiles =
-                withContext(Dispatchers.IO) {
-                    // Fetch recommended (default.json) for marking recommendations
-                    val recommended = fetchRecommendedPackages()
-                    // Fetch full catalog (content.json) for all categories
-                    val fullCatalog =
-                        parseRecommendedPackages(
-                            Downloader.downloadString(ContentsManager.REMOTE_PROFILES),
-                        )
-                    // Merge: start with recommended, then add any full catalog entries not already present
-                    val seen = recommended.map { it.remoteUrl }.toMutableSet()
-                    val merged = recommended.toMutableList()
-                    for (spec in fullCatalog) {
-                        if (spec.remoteUrl !in seen) {
-                            seen.add(spec.remoteUrl)
-                            merged.add(spec)
-                        }
-                    }
-                    merged
-                }
-            advancedProfiles.clear()
-            advancedProfiles.addAll(profiles)
-            refreshAdvancedInstalledSet()
-        }
-    }
-
     private fun refreshAdvancedInstalledSet() {
         val manager = ContentsManager(this)
         manager.syncContents()
@@ -1295,11 +1363,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         advancedProfiles.forEach { spec ->
             val installedByName =
                 manager.getProfiles(spec.type).orEmpty().any {
-                    it.isInstalled && (
-                        it.verName.equals(spec.verName, ignoreCase = true) ||
-                            it.verName.contains(spec.verName, ignoreCase = true) ||
-                            spec.verName.contains(it.verName, ignoreCase = true)
-                    )
+                    it.isInstalled && it.verName.equals(spec.verName, ignoreCase = true)
                 }
             val installedByUrl = manager.isRemoteUrlInstalled(spec.remoteUrl)
             if (installedByName || installedByUrl) advancedInstalledSet.add(spec.verName)
@@ -1312,159 +1376,129 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         }
     }
 
-    private fun installAllRecommended() {
-        if (transferState.value != null) return
-        val pending =
-            advancedProfiles
-                .filter { isRecommendedSpec(it) && it.verName !in advancedInstalledSet }
-        if (pending.isEmpty()) return
+    private fun enqueueAllRecommended() {
+        advancedProfiles
+            .filter { isRecommendedSpec(it) && it.verName !in advancedInstalledSet }
+            .forEach { enqueueAdvancedComponent(it) }
+    }
 
+    private fun startInstallQueue() {
+        if (queueWorkerRunning) return
+        queueWorkerRunning = true
+        val keepAliveTag = "install_queue_${System.currentTimeMillis()}"
+        com.winlator.cmod.runtime.system.SessionKeepAliveService.startDownload(this, keepAliveTag)
         lifecycleScope.launch {
-            wizardError.value = null
-            for ((index, spec) in pending.withIndex()) {
-                val profile =
-                    withContext(Dispatchers.IO) {
-                        try {
-                            transferState.value =
-                                TransferState(
-                                    title = getString(R.string.setup_wizard_recommended_components),
-                                    detail = getString(R.string.setup_wizard_downloading, spec.verName),
-                                    currentIndex = index + 1,
-                                    total = pending.size,
-                                    progress = 0f,
-                                )
-                            val downloaded =
-                                downloadFileToCache(
-                                    label = spec.verName,
-                                    url = spec.remoteUrl,
-                                    currentIndex = index + 1,
-                                    total = pending.size,
+            updateWizardError(null)
+            try {
+                while (installQueue.isNotEmpty()) {
+                    val spec = installQueue.removeAt(0)
+                    val key = spec.remoteUrl
+                    if (spec.verName in advancedInstalledSet) {
+                        queueStatus.remove(key)
+                        queueCompleted += 1
+                        continue
+                    }
+                    queueStatus[key] = QueueItemStatus.ACTIVE
+                    val position = queueCompleted + 1
+                    val total = queueTotal
+                    val title = spec.verName
+                    val profile =
+                        withContext(Dispatchers.IO) {
+                            try {
+                                updateTransferState(
+                                    TransferState(
+                                        title = title,
+                                        detail = getString(R.string.downloads_queue_preparing_download),
+                                        currentIndex = position,
+                                        total = total,
+                                        progress = 0f,
+                                    ),
                                 )
-                            if (downloaded == null) return@withContext null
-
-                            transferState.value =
-                                TransferState(
-                                    title = getString(R.string.setup_wizard_recommended_components),
-                                    detail = getString(R.string.setup_wizard_downloading, spec.verName),
-                                    currentIndex = index + 1,
-                                    total = pending.size,
-                                    progress = 1f,
+                                val downloaded =
+                                    downloadFileToCache(
+                                        label = spec.verName,
+                                        url = spec.remoteUrl,
+                                        currentIndex = position,
+                                        total = total,
+                                        title = title,
+                                    ) ?: return@withContext null
+
+                                updateTransferState(
+                                    TransferState(
+                                        title = title,
+                                        detail = getString(R.string.setup_wizard_downloading, spec.verName),
+                                        currentIndex = position,
+                                        total = total,
+                                        progress = 1f,
+                                    ),
                                 )
-                            kotlinx.coroutines.delay(500)
-
-                            transferState.value =
-                                TransferState(
-                                    title = getString(R.string.setup_wizard_recommended_components),
-                                    detail = getString(R.string.setup_wizard_installing_package, spec.verName),
-                                    currentIndex = index + 1,
-                                    total = pending.size,
-                                    progress = null,
+                                kotlinx.coroutines.delay(500)
+
+                                updateTransferState(
+                                    TransferState(
+                                        title = title,
+                                        detail = getString(R.string.setup_wizard_installing),
+                                        currentIndex = position,
+                                        total = total,
+                                        progress = null,
+                                    ),
                                 )
 
-                            val installed = installDownloadedPackage(downloaded, spec.remoteUrl)
-                            downloaded.delete()
-                            if (installed == null) {
-                                wizardError.value =
-                                    lastInstallFailureMessage
-                                        ?: getString(R.string.setup_wizard_install_failed_reason, spec.verName)
-                            }
-                            installed
-                        } catch (e: Exception) {
-                            wizardError.value =
-                                getString(
-                                    R.string.setup_wizard_install_failed_reason,
-                                    e.message ?: getString(R.string.common_ui_unknown_error),
+                                val installed = installDownloadedPackage(downloaded, spec.remoteUrl)
+                                downloaded.delete()
+                                if (installed == null) {
+                                    updateWizardError(
+                                        lastInstallFailureMessage
+                                            ?: getString(R.string.setup_wizard_install_failed_reason, spec.verName),
+                                    )
+                                }
+                                installed
+                            } catch (e: Exception) {
+                                updateWizardError(
+                                    getString(
+                                        R.string.setup_wizard_install_failed_reason,
+                                        e.message ?: getString(R.string.common_ui_unknown_error),
+                                    ),
                                 )
-                            null
+                                null
+                            }
                         }
-                    }
-                if (profile != null) {
-                    if (spec.verName !in advancedInstalledSet) {
-                        advancedInstalledSet.add(spec.verName)
-                    }
-                } else {
-                    break
-                }
-            }
-            transferState.value = null
-            refreshAdvancedInstalledSet()
-            refreshWizardState()
-        }
-    }
-
-    private fun installAdvancedComponent(spec: RemotePackageSpec) {
-        if (transferState.value != null) return
-        lifecycleScope.launch {
-            wizardError.value = null
-            val profile =
-                withContext(Dispatchers.IO) {
-                    try {
-                        transferState.value =
-                            TransferState(
-                                title = spec.verName,
-                                detail = getString(R.string.downloads_queue_preparing_download),
-                                currentIndex = 1,
-                                total = 1,
-                            )
-                        val downloaded =
-                            downloadFileToCache(
-                                label = spec.verName,
-                                url = spec.remoteUrl,
-                                currentIndex = 1,
-                                total = 1,
-                            )
-                        if (downloaded == null) return@withContext null
-
-                        // Show 100% briefly so the bar visually completes
-                        transferState.value =
-                            TransferState(
-                                title = spec.verName,
-                                detail = getString(R.string.setup_wizard_downloading, spec.verName),
-                                currentIndex = 1,
-                                total = 1,
-                                progress = 1f,
-                            )
-                        kotlinx.coroutines.delay(500)
-
-                        transferState.value =
-                            TransferState(
-                                title = spec.verName,
-                                detail = getString(R.string.setup_wizard_installing),
-                                currentIndex = 1,
-                                total = 1,
-                                progress = null,
-                            )
-
-                        val installed = installDownloadedPackage(downloaded, spec.remoteUrl)
-                        downloaded.delete()
-                        if (installed == null) {
-                            wizardError.value =
-                                lastInstallFailureMessage
-                                    ?: getString(R.string.setup_wizard_install_failed_reason, spec.verName)
+                    queueCompleted += 1
+                    if (profile != null) {
+                        queueStatus.remove(key)
+                        if (spec.verName !in advancedInstalledSet) {
+                            advancedInstalledSet.add(spec.verName)
                         }
-                        installed
-                    } catch (e: Exception) {
-                        wizardError.value =
-                            getString(
-                                R.string.setup_wizard_install_failed_reason,
-                                e.message ?: getString(R.string.common_ui_unknown_error),
-                            )
-                        null
-                    } finally {
-                        transferState.value = null
+                    } else {
+                        queueStatus[key] = QueueItemStatus.FAILED
                     }
                 }
-            if (profile != null) {
-                // Eagerly mark as installed so UI updates immediately
-                if (spec.verName !in advancedInstalledSet) {
-                    advancedInstalledSet.add(spec.verName)
-                }
                 refreshAdvancedInstalledSet()
                 refreshWizardState()
+            } finally {
+                updateTransferState(null)
+                queueWorkerRunning = false
+                queueTotal = 0
+                queueCompleted = 0
+                com.winlator.cmod.runtime.system.SessionKeepAliveService.stopDownload(
+                    applicationContext,
+                    keepAliveTag,
+                )
             }
         }
     }
 
+    private fun enqueueAdvancedComponent(spec: RemotePackageSpec) {
+        if (spec.verName in advancedInstalledSet) return
+        val key = spec.remoteUrl
+        val status = queueStatus[key]
+        if (status == QueueItemStatus.QUEUED || status == QueueItemStatus.ACTIVE) return
+        queueStatus[key] = QueueItemStatus.QUEUED
+        installQueue.add(spec)
+        queueTotal += 1
+        startInstallQueue()
+    }
+
     private fun openContainerDefaultSettings(
         containerId: Int,
         type: String,
@@ -1494,17 +1528,6 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         }
     }
 
-    private fun clearRootDir(rootDir: File) {
-        if (rootDir.isDirectory) {
-            rootDir.listFiles()?.forEach { file ->
-                if (file.isDirectory && file.name == "home") return@forEach
-                FileUtils.delete(file)
-            }
-        } else {
-            rootDir.mkdirs()
-        }
-    }
-
     private fun launchApp() {
         startActivity(
             Intent(this, UnifiedActivity::class.java)
@@ -1533,6 +1556,26 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
             }
         val lastPage = totalPages - 1
 
+        LaunchedEffect(page) {
+            onTabIndexChange = null
+            resetNav(REGION_CONTENT)
+        }
+
+        val region by navRegion
+        val navIdx by navIndex
+        val activate by activateSignal
+        val controller by controllerConnected
+
+        LaunchedEffect(activate) {
+            if (activate == 0) return@LaunchedEffect
+            if (region == REGION_NAV) {
+                when (navIdx) {
+                    0 -> if (page > 0) pageIndex.intValue -= 1
+                    1 -> advanceWizardPage()
+                }
+            }
+        }
+
         // Particle seeds — stable across recomposition
         val particles =
             remember {
@@ -1728,7 +1771,6 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                         .windowInsetsPadding(WindowInsets.safeDrawing)
                         .padding(horizontal = 18.dp, vertical = 12.dp),
             ) {
-                // ---- Header ----
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically,
@@ -1784,7 +1826,6 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 )
                 Spacer(Modifier.height(12.dp))
 
-                // ---- Content ----
                 BoxWithConstraints(
                     modifier =
                         Modifier
@@ -1793,6 +1834,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                     contentAlignment = Alignment.Center,
                 ) {
                     val isCompact = maxWidth < 500.dp
+                    wideLayout = !isCompact
                     AnimatedContent(
                         targetState = page,
                         transitionSpec = {
@@ -1842,34 +1884,35 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                     }
                 }
 
-                if (transferState.value == null) {
-                    Spacer(Modifier.height(10.dp))
+                val transferActive = transferState.value != null
+                Spacer(Modifier.height(10.dp))
 
-                    // ---- Action bar ----
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                    ) {
-                        GhostPillButton(
-                            label = stringResource(R.string.common_ui_back),
-                            enabled = page > 0,
-                            onClick = { if (page > 0) pageIndex.intValue -= 1 },
-                        )
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                ) {
+                    GhostPillButton(
+                        label = stringResource(R.string.common_ui_back),
+                        enabled = page > 0,
+                        highlighted = controller && region == REGION_NAV && navIdx == 0,
+                        onClick = { setNav(REGION_NAV, 0); if (page > 0) pageIndex.intValue -= 1 },
+                    )
 
-                        if (page < lastPage) {
-                            AccentPillButton(
-                                label = stringResource(R.string.setup_wizard_next),
-                                enabled = canGoNext,
-                                onClick = { if (canGoNext) pageIndex.intValue += 1 },
-                            )
-                        } else {
-                            AccentPillButton(
-                                label = stringResource(R.string.setup_wizard_finish),
-                                enabled = !creatingContainer.value,
-                                onClick = { finishWizard() },
-                            )
-                        }
+                    if (page < lastPage) {
+                        AccentPillButton(
+                            label = stringResource(R.string.setup_wizard_next),
+                            enabled = canGoNext,
+                            highlighted = controller && region == REGION_NAV && navIdx == 1,
+                            onClick = { setNav(REGION_NAV, 1); if (canGoNext) pageIndex.intValue += 1 },
+                        )
+                    } else {
+                        AccentPillButton(
+                            label = stringResource(R.string.setup_wizard_finish),
+                            enabled = !creatingContainer.value && !transferActive,
+                            highlighted = controller && region == REGION_NAV && navIdx == 1,
+                            onClick = { setNav(REGION_NAV, 1); finishWizard() },
+                        )
                     }
                 }
             }
@@ -2104,11 +2147,13 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     private fun GhostPillButton(
         label: String,
         enabled: Boolean = true,
+        highlighted: Boolean = false,
         onClick: () -> Unit,
     ) {
         OutlinedButton(
             onClick = onClick,
             enabled = enabled,
+            modifier = Modifier.navHighlight(highlighted, cornerRadius = 12.dp),
             shape = RoundedCornerShape(12.dp),
             border = BorderStroke(1.dp, if (enabled) Color(0xFF434D5C) else Color(0xFF222D3D)),
             colors =
@@ -2125,6 +2170,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     private fun AccentPillButton(
         label: String,
         enabled: Boolean,
+        highlighted: Boolean = false,
         onClick: () -> Unit,
     ) {
         val borderColor by animateColorAsState(
@@ -2135,6 +2181,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         OutlinedButton(
             onClick = onClick,
             enabled = enabled,
+            modifier = Modifier.navHighlight(highlighted, cornerRadius = 12.dp),
             shape = RoundedCornerShape(12.dp),
             border = BorderStroke(1.5.dp, borderColor),
             colors =
@@ -2149,6 +2196,27 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
 
     @Composable
     private fun PagePermissions(isCompact: Boolean) {
+        val region by navRegion
+        val navIdx by navIndex
+        val activate by activateSignal
+        val controller by controllerConnected
+
+        LaunchedEffect(isCompact) {
+            setTabCount(0)
+            setContentLayout(3, if (isCompact) 1 else 3)
+        }
+        val lastActivate = remember { mutableStateOf(activate) }
+        LaunchedEffect(activate) {
+            if (activate == lastActivate.value) return@LaunchedEffect
+            lastActivate.value = activate
+            if (region != REGION_CONTENT) return@LaunchedEffect
+            when (navIdx) {
+                0 -> requestFileAccess()
+                1 -> requestNotifications()
+                2 -> if (!imageFsInstalling.value) installImageFs()
+            }
+        }
+
         val fileAccessCard: @Composable (Modifier) -> Unit = { mod ->
             WizardActionCard(
                 modifier = mod,
@@ -2156,7 +2224,8 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 subtitle = stringResource(R.string.common_ui_required),
                 completed = storageGranted.value,
                 buttonLabel = stringResource(if (storageGranted.value) R.string.setup_wizard_granted else R.string.setup_wizard_grant),
-                onClick = { requestFileAccess() },
+                highlighted = controller && region == REGION_CONTENT && navIdx == 0,
+                onClick = { setNav(REGION_CONTENT, 0); requestFileAccess() },
             )
         }
         val notifCard: @Composable (Modifier) -> Unit = { mod ->
@@ -2164,14 +2233,15 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 modifier = mod,
                 title = stringResource(R.string.common_ui_notifications),
                 subtitle = stringResource(R.string.common_ui_optional),
-                completed = notifGranted.value,
+                completed = backgroundSessionEnabled.value,
                 buttonLabel =
                     when {
-                        notifGranted.value -> stringResource(R.string.setup_wizard_granted)
+                        backgroundSessionEnabled.value -> stringResource(R.string.setup_wizard_granted)
                         notifDenied.value -> stringResource(R.string.setup_wizard_denied)
                         else -> stringResource(R.string.setup_wizard_allow)
                     },
-                onClick = { requestNotifications() },
+                highlighted = controller && region == REGION_CONTENT && navIdx == 1,
+                onClick = { setNav(REGION_CONTENT, 1); requestNotifications() },
             )
         }
         val systemCard: @Composable (Modifier) -> Unit = { mod ->
@@ -2186,7 +2256,8 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                         imageFsInstalling.value -> "${imageFsProgress.intValue}%"
                         else -> stringResource(R.string.setup_wizard_install_system_files)
                     },
-                onClick = { installImageFs() },
+                highlighted = controller && region == REGION_CONTENT && navIdx == 2,
+                onClick = { setNav(REGION_CONTENT, 2); installImageFs() },
                 enabled = !imageFsInstalling.value,
                 progress = if (imageFsInstalling.value) imageFsProgress.intValue / 100f else null,
             )
@@ -2250,7 +2321,6 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         val glassBorder = Color.White.copy(alpha = SetupGlassBorderAlpha)
         val mutedDot = Color(0xFF4A5568)
 
-        // Build tab keys/labels
         val tabs =
             buildList {
                 add(TabInfo("recommended", recommendedLabel, turquoise, highlight = true))
@@ -2274,6 +2344,24 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 }
             }
 
+        val region by navRegion
+        val navIdx by navIndex
+        val activate by activateSignal
+        val controller by controllerConnected
+
+        LaunchedEffect(tabs.size) {
+            setTabCount(tabs.size)
+            onTabIndexChange = { i -> tabs.getOrNull(i)?.let { selectedTab = it.key } }
+        }
+        LaunchedEffect(selectedTab) {
+            lastContentIndex = 0
+            if (navRegion.intValue == REGION_CONTENT) navIndex.intValue = 0
+            val i = tabs.indexOfFirst { it.key == selectedTab }
+            if (i >= 0 && navRegion.intValue == REGION_TABS && navIndex.intValue != i) {
+                navIndex.intValue = i
+            }
+        }
+
         // Content panel (shared between layouts)
         @Composable
         fun ContentPanel(modifier: Modifier) {
@@ -2286,6 +2374,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
             ) {
                 when (selectedTab) {
                     "drivers" -> {
+                        LaunchedEffect(selectedTab) { setContentLayout(0, 1) }
                         if (!imageFsDone.value) {
                             Column(
                                 modifier = Modifier.fillMaxSize(),
@@ -2339,6 +2428,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                             }
                         when {
                             advancedProfiles.isEmpty() -> {
+                                LaunchedEffect(selectedTab) { setContentLayout(0, 1) }
                                 Row(
                                     modifier = Modifier.align(Alignment.Center),
                                     verticalAlignment = Alignment.CenterVertically,
@@ -2359,6 +2449,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                             }
 
                             tabProfiles.isEmpty() -> {
+                                LaunchedEffect(selectedTab) { setContentLayout(0, 1) }
                                 Text(
                                     text = stringResource(R.string.setup_wizard_no_components_available),
                                     color = Color(0xFF8B949E),
@@ -2377,14 +2468,39 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                                     isRecommendedTab &&
                                         transferState.value == null &&
                                         !allRecommendedInstalled
+                                val installAllSlots = if (isRecommendedTab) 1 else 0
+                                val listState = rememberLazyListState()
+
+                                LaunchedEffect(selectedTab, tabProfiles.size, installAllSlots) {
+                                    setContentLayout(tabProfiles.size + installAllSlots, 1)
+                                }
+                                LaunchedEffect(tabProfiles) { fetchAdvancedSizes(tabProfiles) }
+                                LaunchedEffect(region, navIdx) {
+                                    if (region == REGION_CONTENT) runCatching { listState.scrollToSelected(navIdx) }
+                                }
+                                val lastActivate = remember { mutableStateOf(activate) }
+                                LaunchedEffect(activate) {
+                                    if (activate == lastActivate.value) return@LaunchedEffect
+                                    lastActivate.value = activate
+                                    if (region != REGION_CONTENT) return@LaunchedEffect
+                                    if (isRecommendedTab && navIdx == 0) {
+                                        if (!allRecommendedInstalled) enqueueAllRecommended()
+                                    } else {
+                                        tabProfiles.getOrNull(navIdx - installAllSlots)?.let { spec ->
+                                            if (spec.verName !in advancedInstalledSet) enqueueAdvancedComponent(spec)
+                                        }
+                                    }
+                                }
 
                                 LazyColumn(
+                                    state = listState,
                                     modifier = Modifier.fillMaxSize(),
                                     verticalArrangement = Arrangement.spacedBy(6.dp),
                                 ) {
                                     if (isRecommendedTab) {
                                         item {
-                                            val installAllEnabled = transferState.value == null && !allRecommendedInstalled
+                                            val installAllEnabled = !allRecommendedInstalled
+                                            val navHere = controller && region == REGION_CONTENT && navIdx == 0
                                             val installAllShape = RoundedCornerShape(8.dp)
                                             Box(
                                                 modifier = Modifier.fillMaxWidth(),
@@ -2423,11 +2539,12 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                                                                         shape = installAllShape,
                                                                     )
                                                                 },
-                                                            ).clickable(
+                                                            ).navHighlight(navHere, cornerRadius = 8.dp)
+                                                            .clickable(
                                                                 enabled = installAllEnabled,
                                                                 interactionSource = remember { MutableInteractionSource() },
                                                                 indication = null,
-                                                            ) { installAllRecommended() }
+                                                            ) { setNav(REGION_CONTENT, 0); enqueueAllRecommended() }
                                                             .padding(horizontal = 14.dp, vertical = 8.dp),
                                                     contentAlignment = Alignment.Center,
                                                 ) {
@@ -2458,14 +2575,18 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                                             }
                                         }
                                     }
-                                    items(tabProfiles) { spec ->
+                                    itemsIndexed(tabProfiles) { i, spec ->
                                         val installed = spec.verName in advancedInstalledSet
+                                        val navHere = controller && region == REGION_CONTENT && navIdx == i + installAllSlots
                                         AdvancedComponentCard(
                                             name = spec.verName,
                                             installed = installed,
-                                            onClick = { installAdvancedComponent(spec) },
-                                            enabled = transferState.value == null && !installed,
+                                            highlighted = navHere,
+                                            onClick = { setNav(REGION_CONTENT, i + installAllSlots); enqueueAdvancedComponent(spec) },
+                                            enabled = !installed,
                                             recommended = isRecommendedSpec(spec),
+                                            status = queueStatus[spec.remoteUrl],
+                                            sizeBytes = advancedSizeCache[spec.remoteUrl],
                                         )
                                     }
                                 }
@@ -2479,10 +2600,12 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         @Composable
         fun TabItem(
             tab: TabInfo,
+            index: Int,
             fillWidth: Boolean,
             fontSize: TextUnit,
         ) {
             val isSelected = selectedTab == tab.key
+            val highlighted = controller && region == REGION_TABS && navIdx == index
             val interactionSource = remember { MutableInteractionSource() }
             val bgColor = if (isSelected) glassSurfaceActive else Color.Transparent
             val labelColor =
@@ -2496,10 +2619,11 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                     Modifier
                         .then(if (fillWidth) Modifier.fillMaxWidth() else Modifier)
                         .background(bgColor, RoundedCornerShape(8.dp))
+                        .navHighlight(highlighted, cornerRadius = 8.dp)
                         .clickable(
                             interactionSource = interactionSource,
                             indication = null,
-                        ) { selectedTab = tab.key }
+                        ) { setNav(REGION_TABS, index) }
                         .padding(horizontal = 10.dp, vertical = 7.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
@@ -2537,7 +2661,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                             .padding(horizontal = 6.dp, vertical = 6.dp),
                     horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
-                    tabs.forEach { tab -> TabItem(tab, fillWidth = false, fontSize = 12.sp) }
+                    tabs.forEachIndexed { i, tab -> TabItem(tab, i, fillWidth = false, fontSize = 12.sp) }
                 }
 
                 ContentPanel(
@@ -2554,18 +2678,22 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 horizontalArrangement = Arrangement.spacedBy(10.dp),
             ) {
                 // Left rail
-                Column(
+                val tabListState = rememberLazyListState()
+                LaunchedEffect(region, navIdx) {
+                    if (region == REGION_TABS) runCatching { tabListState.scrollToSelected(navIdx) }
+                }
+                LazyColumn(
+                    state = tabListState,
                     modifier =
                         Modifier
                             .weight(0.38f)
                             .fillMaxHeight()
                             .background(glassSurface, glassShape)
                             .border(1.dp, glassBorder, glassShape)
-                            .verticalScroll(rememberScrollState())
                             .padding(6.dp),
                     verticalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
-                    tabs.forEach { tab -> TabItem(tab, fillWidth = true, fontSize = 13.sp) }
+                    itemsIndexed(tabs) { i, tab -> TabItem(tab, i, fillWidth = true, fontSize = 13.sp) }
                 }
 
                 ContentPanel(
@@ -2585,6 +2713,9 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         onClick: () -> Unit,
         enabled: Boolean = true,
         recommended: Boolean = false,
+        status: QueueItemStatus? = null,
+        highlighted: Boolean = false,
+        sizeBytes: Long? = null,
     ) {
         val turquoise = Color(0xFF57CBDE)
         val completedTurquoise = Color(0xFF3FAFBE)
@@ -2607,6 +2738,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                     .fillMaxWidth()
                     .background(bgColor, cardShape)
                     .border(1.dp, outlineColor, cardShape)
+                    .navHighlight(highlighted, cornerRadius = 12.dp)
                     .padding(horizontal = 12.dp, vertical = 10.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
@@ -2628,6 +2760,16 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                             fontSize = 9.sp,
                             letterSpacing = 0.5.sp,
                         )
+                        sizeBytes?.takeIf { it > 0L }?.let { bytes ->
+                            Spacer(Modifier.width(6.dp))
+                            Text(
+                                text = formatSizeMb(bytes),
+                                color = Color(0xFF8B949E),
+                                fontFamily = InterFont,
+                                fontSize = 9.sp,
+                                maxLines = 1,
+                            )
+                        }
                     }
                     Spacer(Modifier.height(3.dp))
                 }
@@ -2637,32 +2779,73 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                     fontFamily = InterFont,
                     fontWeight = FontWeight.Medium,
                     fontSize = 12.sp,
+                    lineHeight = 14.sp,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                 )
+                if (!recommended) {
+                    sizeBytes?.takeIf { it > 0L }?.let { bytes ->
+                        Text(
+                            text = formatSizeMb(bytes),
+                            color = Color(0xFF8B949E),
+                            fontFamily = InterFont,
+                            fontSize = 9.sp,
+                            lineHeight = 10.sp,
+                            maxLines = 1,
+                        )
+                    }
+                }
             }
             Spacer(Modifier.width(8.dp))
-            Button(
-                onClick = onClick,
-                enabled = enabled && !installed,
-                shape = RoundedCornerShape(8.dp),
-                modifier = Modifier.height(28.dp),
-                contentPadding = PaddingValues(horizontal = 12.dp, vertical = 0.dp),
-                colors =
-                    ButtonDefaults.buttonColors(
-                        containerColor =
-                            if (installed) completedTurquoise.copy(alpha = 0.14f) else turquoise.copy(alpha = 0.14f),
-                        contentColor = if (installed) completedTurquoise else turquoise,
-                        disabledContainerColor = if (installed) completedTurquoise.copy(alpha = 0.14f) else turquoise.copy(alpha = 0.16f),
-                        disabledContentColor = if (installed) completedTurquoise else turquoise,
-                    ),
-            ) {
-                Text(
-                    text = stringResource(if (installed) R.string.common_ui_installed else R.string.common_ui_install),
-                    fontFamily = InterFont,
-                    fontWeight = FontWeight.Bold,
-                    fontSize = 10.sp,
-                )
+            when {
+                !installed && status == QueueItemStatus.ACTIVE ->
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(20.dp),
+                        color = turquoise,
+                        strokeWidth = 2.dp,
+                    )
+
+                !installed && status == QueueItemStatus.QUEUED ->
+                    Text(
+                        text = stringResource(R.string.downloads_queue_phase_queued),
+                        color = turquoise,
+                        fontFamily = InterFont,
+                        fontWeight = FontWeight.SemiBold,
+                        fontSize = 10.sp,
+                    )
+
+                else -> {
+                    val isRetry = !installed && status == QueueItemStatus.FAILED
+                    Button(
+                        onClick = onClick,
+                        enabled = enabled && !installed,
+                        shape = RoundedCornerShape(8.dp),
+                        modifier = Modifier.height(28.dp),
+                        contentPadding = PaddingValues(horizontal = 12.dp, vertical = 0.dp),
+                        colors =
+                            ButtonDefaults.buttonColors(
+                                containerColor =
+                                    if (installed) completedTurquoise.copy(alpha = 0.14f) else turquoise.copy(alpha = 0.14f),
+                                contentColor = if (installed) completedTurquoise else turquoise,
+                                disabledContainerColor = if (installed) completedTurquoise.copy(alpha = 0.14f) else turquoise.copy(alpha = 0.16f),
+                                disabledContentColor = if (installed) completedTurquoise else turquoise,
+                            ),
+                    ) {
+                        Text(
+                            text =
+                                stringResource(
+                                    when {
+                                        installed -> R.string.common_ui_installed
+                                        isRetry -> R.string.session_drawer_retry
+                                        else -> R.string.common_ui_install
+                                    },
+                                ),
+                            fontFamily = InterFont,
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 10.sp,
+                        )
+                    }
+                }
             }
         }
     }
@@ -2722,6 +2905,14 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
             ) {
                 val gridColumns = 3
                 val compactGrid = maxWidth < 720.dp || maxHeight < 280.dp
+                val region by navRegion
+                val navIdx by navIndex
+                val activate by activateSignal
+                val controller by controllerConnected
+                LaunchedEffect(installedRuntimes.size, gridColumns) {
+                    setTabCount(0)
+                    setContentLayout(installedRuntimes.size, gridColumns)
+                }
                 LazyVerticalGrid(
                     columns = GridCells.Fixed(gridColumns),
                     modifier =
@@ -2733,8 +2924,14 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                     verticalArrangement = Arrangement.spacedBy(if (compactGrid) 6.dp else 10.dp),
                     contentPadding = PaddingValues(bottom = if (compactGrid) 4.dp else 12.dp),
                 ) {
-                    gridItems(installedRuntimes) { profile ->
-                        RuntimeContainerCard(profile, compact = compactGrid)
+                    gridItemsIndexed(installedRuntimes) { i, profile ->
+                        RuntimeContainerCard(
+                            profile,
+                            compact = compactGrid,
+                            highlighted = controller && region == REGION_CONTENT && navIdx == i,
+                            activate = activate,
+                            onTap = { setNav(REGION_CONTENT, i) },
+                        )
                     }
                 }
             }
@@ -2745,9 +2942,12 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
     private fun RuntimeContainerCard(
         profile: ContentProfile,
         compact: Boolean = false,
+        highlighted: Boolean = false,
+        activate: Int = 0,
+        onTap: () -> Unit = {},
     ) {
         val entryName = ContentsManager.getEntryName(profile)
-        val displayName = runtimeDisplayLabel(profile)
+        val displayName = ContainerCreation.displayNameForProfile(profile)
         val isArm64 = profile.verName.contains("arm64ec", ignoreCase = true)
         val archLabel = if (isArm64) "ARM64EC" else "x86-64"
 
@@ -2772,12 +2972,59 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 Color.White.copy(alpha = SetupGlassBorderAlpha)
             }
 
+        val createContainer = {
+            if (!creating && transferState.value == null) {
+                creatingContainer.value = true
+                lifecycleScope.launch {
+                    wizardError.value = null
+                    val container =
+                        withContext(Dispatchers.IO) {
+                            try {
+                                val c = ensureContainerForProfile(profile, displayName)
+                                if (isArm64) {
+                                    saveDefaultArm64ContainerId(this@SetupWizardActivity, c.id)
+                                } else {
+                                    saveDefaultX86ContainerId(this@SetupWizardActivity, c.id)
+                                }
+                                c
+                            } catch (e: Exception) {
+                                updateWizardError("Container creation failed: ${e.message}")
+                                null
+                            }
+                        }
+                    existingContainer = container
+                    creatingContainer.value = false
+                    refreshAdvancedInstalledSet()
+                    refreshWizardState()
+                }
+            }
+        }
+        val openSettings = {
+            existingContainer?.let { openContainerDefaultSettings(it.id, if (isArm64) "arm64" else "x86") }
+            Unit
+        }
+
+        val lastActivate = remember { mutableStateOf(activate) }
+        LaunchedEffect(activate) {
+            if (activate != lastActivate.value) {
+                lastActivate.value = activate
+                if (highlighted) {
+                    if (existingContainer == null) createContainer() else openSettings()
+                }
+            }
+        }
+
         Row(
             modifier =
                 Modifier
                     .fillMaxWidth()
                     .background(bgColor, cardShape)
                     .border(1.dp, outlineColor, cardShape)
+                    .navHighlight(highlighted, cornerRadius = 12.dp)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                    ) { onTap() }
                     .padding(horizontal = if (compact) 10.dp else 12.dp, vertical = if (compact) 6.dp else 10.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
@@ -2816,32 +3063,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
             Spacer(Modifier.width(if (compact) 6.dp else 8.dp))
             if (existingContainer == null) {
                 Button(
-                    onClick = {
-                        if (creating) return@Button
-                        creatingContainer.value = true
-                        lifecycleScope.launch {
-                            wizardError.value = null
-                            val container =
-                                withContext(Dispatchers.IO) {
-                                    try {
-                                        val c = ensureContainerForProfile(profile, displayName)
-                                        if (isArm64) {
-                                            saveDefaultArm64ContainerId(this@SetupWizardActivity, c.id)
-                                        } else {
-                                            saveDefaultX86ContainerId(this@SetupWizardActivity, c.id)
-                                        }
-                                        c
-                                    } catch (e: Exception) {
-                                        wizardError.value = "Container creation failed: ${e.message}"
-                                        null
-                                    }
-                                }
-                            existingContainer = container
-                            creatingContainer.value = false
-                            refreshAdvancedInstalledSet()
-                            refreshWizardState()
-                        }
-                    },
+                    onClick = { onTap(); createContainer() },
                     enabled = !creating && transferState.value == null,
                     shape = RoundedCornerShape(8.dp),
                     modifier = Modifier.height(if (compact) 24.dp else 28.dp),
@@ -2875,11 +3097,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 }
             } else {
                 Button(
-                    onClick = {
-                        val id = existingContainer!!.id
-                        val type = if (isArm64) "arm64" else "x86"
-                        openContainerDefaultSettings(id, type)
-                    },
+                    onClick = { onTap(); openSettings() },
                     shape = RoundedCornerShape(8.dp),
                     modifier = Modifier.height(if (compact) 24.dp else 28.dp),
                     contentPadding = PaddingValues(horizontal = if (compact) 9.dp else 12.dp, vertical = 0.dp),
@@ -2910,6 +3128,7 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
         onClick: () -> Unit,
         enabled: Boolean = true,
         progress: Float? = null,
+        highlighted: Boolean = false,
     ) {
         val turquoise = Color(0xFF57CBDE)
         val completedTurquoise = Color(0xFF3FAFBE)
@@ -2926,11 +3145,18 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 progress != null -> turquoise
                 else -> Color.White.copy(alpha = SetupGlassBorderAlpha)
             }
+        val buttonFocused = highlighted && enabled && !completed
         Column(
             modifier =
                 modifier
                     .background(glassSurface, glassShape)
                     .border(1.dp, borderColor, glassShape)
+                    .navHighlight(highlighted, cornerRadius = 12.dp)
+                    .clickable(
+                        enabled = enabled && !completed,
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                    ) { onClick() }
                     .padding(horizontal = 12.dp, vertical = 11.dp),
         ) {
             // Status chip
@@ -2994,12 +3220,33 @@ class SetupWizardActivity : FixedFontScaleFragmentActivity() {
                 modifier =
                     Modifier
                         .fillMaxWidth()
-                        .height(32.dp),
+                        .height(32.dp)
+                        .then(
+                            if (buttonFocused) {
+                                Modifier.chasingBorder(
+                                    cornerRadius = 8.dp,
+                                    borderWidth = 1.5.dp,
+                                    animationDurationMs = 8200,
+                                )
+                            } else {
+                                Modifier
+                            },
+                        ),
                 contentPadding = PaddingValues(horizontal = 8.dp, vertical = 0.dp),
                 colors =
                     ButtonDefaults.buttonColors(
-                        containerColor = if (completed) completedTurquoise.copy(alpha = 0.16f) else turquoise,
-                        contentColor = if (completed) completedTurquoise else Color(0xFF111822),
+                        containerColor =
+                            when {
+                                completed -> completedTurquoise.copy(alpha = 0.16f)
+                                buttonFocused -> Color(0xFF0E2A38)
+                                else -> turquoise
+                            },
+                        contentColor =
+                            when {
+                                completed -> completedTurquoise
+                                buttonFocused -> Color(0xFFE6EDF3)
+                                else -> Color(0xFF111822)
+                            },
                         disabledContainerColor =
                             when {
                                 completed -> completedTurquoise.copy(alpha = 0.16f)
@@ -3046,19 +3293,3 @@ private fun resolveJsonDownloadUrl(url: String): String {
 
     return "https://raw.githubusercontent.com/$ownerRepo/$branch/$filePath"
 }
-
-private fun runtimeDisplayLabel(profile: ContentProfile): String {
-    val prefix =
-        when (profile.type) {
-            ContentProfile.ContentType.CONTENT_TYPE_WINE -> "Wine"
-            ContentProfile.ContentType.CONTENT_TYPE_PROTON -> "Proton"
-            else -> profile.type.toString()
-        }
-    val version =
-        Regex("(?i)(?:wine|proton)-([0-9]+(?:\\.[0-9]+)?)")
-            .find(profile.verName)
-            ?.groupValues
-            ?.getOrNull(1)
-            ?: profile.verName
-    return "$prefix $version"
-}
diff --git a/app/src/main/feature/shortcuts/FrontendExporter.java b/app/src/main/feature/shortcuts/FrontendExporter.java
new file mode 100644
index 000000000..bc948ab55
--- /dev/null
+++ b/app/src/main/feature/shortcuts/FrontendExporter.java
@@ -0,0 +1,207 @@
+package com.winlator.cmod.feature.shortcuts;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.util.Log;
+import androidx.preference.PreferenceManager;
+import com.winlator.cmod.app.config.SettingsConfig;
+import com.winlator.cmod.runtime.container.ContainerManager;
+import com.winlator.cmod.runtime.container.Shortcut;
+import com.winlator.cmod.shared.io.FileUtils;
+import java.io.File;
+import java.util.ArrayList;
+
+/** Writes shortcuts as standalone .desktop files (plus icon) into the configured export folder. */
+public final class FrontendExporter {
+  private static final String TAG = "FrontendExporter";
+
+  private FrontendExporter() {}
+
+  public static File resolveExportDir(Context context) {
+    if (context == null) return null;
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    String uriString = prefs.getString("shortcuts_export_path_uri", null);
+    File dir;
+    if (uriString != null) {
+      String resolved = FileUtils.getFilePathFromUri(context, Uri.parse(uriString));
+      if (resolved == null || resolved.isEmpty()) return null;
+      dir = new File(resolved);
+    } else {
+      dir = new File(SettingsConfig.DEFAULT_SHORTCUT_EXPORT_PATH);
+    }
+    if (!dir.exists() && !dir.mkdirs()) return null;
+    return dir;
+  }
+
+  public static File exportOne(Context context, Shortcut shortcut) {
+    return exportOne(context, shortcut, (String) null);
+  }
+
+  public static File exportOne(Context context, Shortcut shortcut, String displayName) {
+    File dir = resolveExportDir(context);
+    if (dir == null) return null;
+    return exportOne(context, shortcut, dir, displayName);
+  }
+
+  public static File exportOne(Context context, Shortcut shortcut, File dir, String displayName) {
+    if (dir == null || shortcut == null || shortcut.file == null || !shortcut.file.isFile()) {
+      return null;
+    }
+    try {
+      // Persist uuid / container_id so the launch can resolve this game.
+      shortcut.genUUID();
+      if (shortcut.getExtra("container_id").isEmpty()) {
+        shortcut.putExtra("container_id", String.valueOf(shortcut.container.id));
+        shortcut.saveData();
+      }
+
+      String resolvedName =
+          (displayName != null && !displayName.trim().isEmpty()) ? displayName.trim() : null;
+      if (resolvedName != null && !resolvedName.equals(shortcut.getExtra("frontend_export_name"))) {
+        shortcut.putExtra("frontend_export_name", resolvedName);
+        shortcut.saveData();
+      }
+      String baseName =
+          sanitizeFileName(resolvedName != null ? resolvedName : FileUtils.getBasename(shortcut.file.getPath()));
+
+      String iconPath = null;
+      File iconDst = new File(dir, baseName + ".png");
+      File iconSrc = resolveIconFile(context, shortcut);
+      if (iconSrc != null && iconSrc.isFile()) {
+        FileUtils.copy(iconSrc, iconDst);
+        iconPath = iconDst.getAbsolutePath();
+      } else {
+        android.graphics.Bitmap art = shortcut.getCoverArt();
+        if (art != null && FileUtils.saveBitmapToFile(art, iconDst)) {
+          iconPath = iconDst.getAbsolutePath();
+        }
+      }
+      if (iconPath == null) Log.w(TAG, "No icon source resolved for: " + shortcut.name);
+
+      File out = new File(dir, baseName + ".desktop");
+      FileUtils.writeString(out, buildDesktopContent(shortcut.file, iconPath, resolvedName));
+      return out;
+    } catch (Exception e) {
+      Log.e(TAG, "Failed to export shortcut: " + shortcut.name, e);
+      return null;
+    }
+  }
+
+  public static int exportAll(Context context) {
+    File dir = resolveExportDir(context);
+    if (dir == null) return 0;
+    ArrayList<Shortcut> shortcuts;
+    try {
+      shortcuts = new ContainerManager(context).loadShortcuts();
+    } catch (Exception e) {
+      Log.e(TAG, "Failed to load shortcuts for export", e);
+      return 0;
+    }
+    int count = 0;
+    for (Shortcut shortcut : shortcuts) {
+      String exportName = shortcut.getExtra("frontend_export_name");
+      if (exportName == null || exportName.isEmpty()) exportName = shortcut.getExtra("custom_name");
+      String displayName = (exportName != null && !exportName.isEmpty()) ? exportName : null;
+      if (exportOne(context, shortcut, dir, displayName) != null) count++;
+    }
+    return count;
+  }
+
+  private static String sanitizeFileName(String name) {
+    String safe = name.replaceAll("[\\\\/:*?\"<>|]", "_").replaceAll("[\\x00-\\x1F]", "");
+    safe = safe.replaceAll("[ .]+$", "");
+    return safe.isEmpty() ? "game" : safe;
+  }
+
+  private static File resolveIconFile(Context context, Shortcut shortcut) {
+    String[] candidates = {
+      shortcut.getExtra("customLibraryIconPath"),
+      shortcut.getExtra("customLibraryGridArtPath"),
+      shortcut.getExtra("customLibraryCarouselArtPath"),
+      shortcut.getExtra("customLibraryHeroArtPath"),
+      shortcut.getExtra("customLibraryListArtPath"),
+      shortcut.getCustomCoverArtPath(),
+      shortcut.getExtra("customCoverArtPath"),
+    };
+    for (String candidate : candidates) {
+      if (candidate != null && !candidate.isEmpty()) {
+        File file = new File(candidate);
+        if (file.isFile()) return file;
+      }
+    }
+    File storeArt = resolveStoreArtFile(context, shortcut);
+    if (storeArt != null) return storeArt;
+    if (shortcut.iconFile != null && shortcut.iconFile.isFile()) return shortcut.iconFile;
+    return null;
+  }
+
+  private static File resolveStoreArtFile(Context context, Shortcut shortcut) {
+    String source = shortcut.getExtra("game_source");
+    String store;
+    String gameId;
+    if ("STEAM".equalsIgnoreCase(source)) {
+      store = "steam";
+      gameId = shortcut.getExtra("app_id");
+    } else if ("EPIC".equalsIgnoreCase(source)) {
+      store = "epic";
+      gameId = shortcut.getExtra("app_id");
+    } else if ("GOG".equalsIgnoreCase(source)) {
+      store = "gog";
+      gameId = shortcut.getExtra("gog_id");
+    } else {
+      return null;
+    }
+    if (gameId == null || gameId.isEmpty()) return null;
+
+    File dir =
+        new File(context.getFilesDir(), "library_artwork_cache/" + store + "/" + safeName(gameId));
+    File[] files = dir.listFiles();
+    if (files == null) return null;
+
+    String[] preferred = {"library_capsule_", "capsule_", "cover_", "header_", "small_capsule_", "hero_"};
+    for (String prefix : preferred) {
+      for (File file : files) {
+        if (file.isFile() && file.getName().startsWith(prefix) && isImageFile(file)) return file;
+      }
+    }
+    for (File file : files) {
+      if (file.isFile() && isImageFile(file)) return file;
+    }
+    return null;
+  }
+
+  private static boolean isImageFile(File file) {
+    String name = file.getName().toLowerCase();
+    return name.endsWith(".jpg")
+        || name.endsWith(".jpeg")
+        || name.endsWith(".png")
+        || name.endsWith(".webp")
+        || name.endsWith(".gif");
+  }
+
+  private static String safeName(String value) {
+    return value.replaceAll("[^A-Za-z0-9._-]", "_");
+  }
+
+  private static String buildDesktopContent(File source, String iconPath, String displayName) {
+    StringBuilder out = new StringBuilder();
+    boolean inExtra = false;
+    for (String line : FileUtils.readLines(source)) {
+      String trimmed = line.trim();
+      if (trimmed.startsWith("[")) {
+        inExtra = trimmed.equals("[Extra Data]");
+        out.append(line).append("\n");
+        if (!inExtra && trimmed.equals("[Desktop Entry]")) {
+          if (displayName != null) out.append("Name=").append(displayName).append("\n");
+          if (iconPath != null) out.append("Icon=").append(iconPath).append("\n");
+        }
+        continue;
+      }
+      if (!inExtra && displayName != null && trimmed.startsWith("Name=")) continue;
+      if (!inExtra && iconPath != null && trimmed.startsWith("Icon=")) continue;
+      out.append(line).append("\n");
+    }
+    return out.toString();
+  }
+}
diff --git a/app/src/main/feature/shortcuts/LibraryShortcutArtwork.kt b/app/src/main/feature/shortcuts/LibraryShortcutArtwork.kt
index 6e6866ca6..afb5bb97c 100644
--- a/app/src/main/feature/shortcuts/LibraryShortcutArtwork.kt
+++ b/app/src/main/feature/shortcuts/LibraryShortcutArtwork.kt
@@ -20,6 +20,16 @@ object LibraryShortcutArtwork {
         LIST("customLibraryListArtPath", "list"),
     }
 
+    // GRID holds the shared image; the others are read only so pre-merge images survive.
+    private val ICON_ART_SLOTS =
+        listOf(LibraryArtworkSlot.GRID, LibraryArtworkSlot.CAROUSEL, LibraryArtworkSlot.LIST)
+
+    @JvmStatic
+    fun findIconArtworkPath(shortcut: Shortcut): String? =
+        ICON_ART_SLOTS
+            .map { shortcut.getExtra(it.extraKey) }
+            .firstOrNull { it.isNotBlank() && File(it).isFile }
+
     @JvmStatic
     fun ensureShortcutUuid(shortcut: Shortcut): String {
         if (shortcut.getExtra("uuid").isEmpty()) {
diff --git a/app/src/main/feature/shortcuts/ShortcutSettingsComposeDialog.kt b/app/src/main/feature/shortcuts/ShortcutSettingsComposeDialog.kt
index b5404b135..6375ff647 100644
--- a/app/src/main/feature/shortcuts/ShortcutSettingsComposeDialog.kt
+++ b/app/src/main/feature/shortcuts/ShortcutSettingsComposeDialog.kt
@@ -15,9 +15,6 @@ import android.view.Window
 import android.view.WindowInsets
 import android.view.WindowManager
 import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalDensity
@@ -27,13 +24,27 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.setViewTreeLifecycleOwner
 import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.CoroutineScope
 import com.winlator.cmod.BuildConfig
 import com.winlator.cmod.R
 import com.winlator.cmod.app.PluviaApp
 import com.winlator.cmod.feature.library.DriveItem
 import com.winlator.cmod.feature.library.EnvVarItem
+import com.winlator.cmod.feature.library.parseEnvVarItems
+import androidx.compose.runtime.getValue
 import com.winlator.cmod.feature.library.GameSettingsCallbacks
 import com.winlator.cmod.feature.library.GameSettingsContent
+import com.winlator.cmod.feature.library.GameSettingsNav
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PaneNavWindowHandlers
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import androidx.compose.foundation.layout.Box
+import androidx.compose.ui.Modifier
+import androidx.core.net.toUri
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
 import com.winlator.cmod.feature.library.GameSettingsStateHolder
 import com.winlator.cmod.feature.library.WinComponentItem
 import com.winlator.cmod.feature.settings.DXVKConfigUtils
@@ -67,9 +78,11 @@ import com.winlator.cmod.runtime.compat.fexcore.FEXCorePresetManager
 import com.winlator.cmod.feature.settings.OtherSettingsFragment
 import com.winlator.cmod.feature.shortcuts.ShortcutsFragment
 import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.input.controls.GestureProfileManager
 import com.winlator.cmod.runtime.input.controls.InputControlsManager
 import com.winlator.cmod.runtime.audio.midi.MidiManager
 import com.winlator.cmod.runtime.display.winhandler.WinHandler
+import com.winlator.cmod.feature.artwork.SteamArtworkScraper
 import java.io.File
 import java.lang.reflect.Field
 import java.util.Arrays
@@ -78,11 +91,12 @@ import java.util.concurrent.Executors
 
 private enum class LibraryArtworkTarget {
     GAME_CARD,
-    GRID,
-    CAROUSEL,
-    LIST,
+    ICON_ART,
 }
 
+// Only what BitmapFactory can decode.
+private val ARTWORK_EXTENSIONS = setOf("png", "jpg", "jpeg", "webp", "bmp", "gif", "heic", "heif", "ico")
+
 class ShortcutSettingsComposeDialog private constructor(
     private val activity: Activity,
     private val shortcut: Shortcut,
@@ -97,9 +111,12 @@ class ShortcutSettingsComposeDialog private constructor(
         this(activity, shortcut, null)
     private val dialog: Dialog
     private val state = GameSettingsStateHolder()
+    private val nav = GameSettingsNav()
+    private var restorePaneNav: (() -> Unit)? = null
 
     // Java interop references
     private var inputControlsManager: InputControlsManager = InputControlsManager(context)
+    private var gestureProfileManager: GestureProfileManager = GestureProfileManager(context)
     private var contentsManager: ContentsManager = ContentsManager(context)
     private var isArm64EC = false
 
@@ -108,7 +125,6 @@ class ShortcutSettingsComposeDialog private constructor(
     private var box64PresetIds = mutableListOf<String>()
     private var fexcorePresetIds = mutableListOf<String>()
     private var shouldRefreshLibraryOnSave = false
-    private var pendingArtworkTarget = LibraryArtworkTarget.GAME_CARD
 
     // SDL2 Compatibility env vars — must match ContainerDetailFragment.SDL2_ENV_VARS.
     private val sdl2EnvVars = listOf(
@@ -127,15 +143,6 @@ class ShortcutSettingsComposeDialog private constructor(
     // Container list for container selection
     private var containerList = mutableListOf<Container>()
 
-    private val artworkPickerLauncher: ActivityResultLauncher<Array<String>>? =
-        (activity as? ComponentActivity)?.activityResultRegistry?.register(
-            "shortcut_artwork_picker",
-            ActivityResultContracts.OpenDocument()
-        ) { uri: Uri? ->
-            if (uri == null) return@register
-            saveSelectedArtwork(uri)
-        }
-
     init {
         state.wined3dCsmtEntries.value =
             listOf(context.getString(R.string.common_ui_enabled), context.getString(R.string.common_ui_disabled))
@@ -155,8 +162,15 @@ class ShortcutSettingsComposeDialog private constructor(
                 setDimAmount(0.5f)
                 addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
                 setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+                    isNavigationBarContrastEnforced = false
+                }
                 // Blur-behind is applied in show() post-attach to avoid flicker.
             }
+            setOnDismissListener {
+                restorePaneNav?.invoke()
+                restorePaneNav = null
+            }
         }
 
         loadInitialData()
@@ -175,24 +189,21 @@ class ShortcutSettingsComposeDialog private constructor(
                     CompositionLocalProvider(
                         LocalDensity provides Density(defaultDensity.density, fontScale = 1f)
                     ) {
-                        GameSettingsContent(
-                            state = state,
-                            callbacks = createCallbacks()
-                        )
+                        val callbacks = createCallbacks()
+                        GameSettingsContent(state = state, callbacks = callbacks, nav = nav)
                     }
                 }
             }
         }
         dialog.setContentView(composeView)
 
-        // Auto-dismiss when activity is destroyed
+        // Auto-dismiss when activity is destroyed.
         (activity as LifecycleOwner).lifecycle.addObserver(object : DefaultLifecycleObserver {
             override fun onDestroy(owner: LifecycleOwner) {
                 if (dialog.isShowing) dialog.dismiss()
             }
         })
 
-        // Load content-dependent data on background thread
         loadContentsAsync()
     }
 
@@ -215,60 +226,72 @@ class ShortcutSettingsComposeDialog private constructor(
                     addShortcutToScreen(shortcut)
                 }
                 if (result == ShortcutsFragment.PinShortcutResult.REUSED_EXISTING) {
-                    WinToast.show(context, R.string.shortcuts_list_readded_existing, shortcut.icon)
+                    WinToast.show(context, R.string.shortcuts_list_readded_existing, shortcut.icon, dialog.window?.decorView)
                 } else if (result == ShortcutsFragment.PinShortcutResult.FAILED) {
                     WinToast.show(
                         context,
                         context.getString(
                             R.string.library_games_failed_to_create_shortcut,
                             shortcut.name
-                        )
+                        ),
+                        dialog.window?.decorView,
                     )
                 }
             }
 
+            override fun onScrapeGameArtwork(gameName: String) {
+                WinToast.show(context, context.getString(R.string.library_games_scraping_artwork), Toast.LENGTH_LONG, dialog.window?.decorView)
+                CoroutineScope(Dispatchers.IO).launch {
+                    val artworkInfo = SteamArtworkScraper(context).getGameArtwork(gameName)
+                    withContext(Dispatchers.Main) {
+                        var saved = false
+                        artworkInfo.forEach { (slotSuffix, file) ->
+                            val slot =
+                                LibraryShortcutArtwork.LibraryArtworkSlot.entries
+                                    .find { it.fileSuffix == slotSuffix }
+                            if (slot != null && saveScrapedLibraryArtwork(file.toUri(), slot)) {
+                                saved = true
+                            }
+                            file.delete()
+                        }
+                        if (saved) {
+                            shortcut.saveData()
+                            shouldRefreshLibraryOnSave = true
+                            syncLibraryArtworkState()
+                            emitLibraryRefreshIfNeeded()
+                        }
+                        WinToast.show(
+                            context,
+                            context.getString(if (saved) R.string.common_ui_done else R.string.common_ui_failed),
+                            Toast.LENGTH_LONG,
+                            dialog.window?.decorView,
+                        )
+                    }
+                }
+            }
+
             override fun onPickGameCardArtwork() {
-                pendingArtworkTarget = LibraryArtworkTarget.GAME_CARD
-                artworkPickerLauncher?.launch(arrayOf("image/*"))
+                pickLibraryArtwork(LibraryArtworkTarget.GAME_CARD)
             }
 
             override fun onRemoveGameCardArtwork() {
                 clearLibraryArtwork(LibraryArtworkTarget.GAME_CARD)
             }
 
-            override fun onPickGridArtwork() {
-                pendingArtworkTarget = LibraryArtworkTarget.GRID
-                artworkPickerLauncher?.launch(arrayOf("image/*"))
-            }
-
-            override fun onRemoveGridArtwork() {
-                clearLibraryArtwork(LibraryArtworkTarget.GRID)
-            }
-
-            override fun onPickCarouselArtwork() {
-                pendingArtworkTarget = LibraryArtworkTarget.CAROUSEL
-                artworkPickerLauncher?.launch(arrayOf("image/*"))
-            }
-
-            override fun onRemoveCarouselArtwork() {
-                clearLibraryArtwork(LibraryArtworkTarget.CAROUSEL)
-            }
-
-            override fun onPickListArtwork() {
-                pendingArtworkTarget = LibraryArtworkTarget.LIST
-                artworkPickerLauncher?.launch(arrayOf("image/*"))
+            override fun onPickIconArtwork() {
+                pickLibraryArtwork(LibraryArtworkTarget.ICON_ART)
             }
 
-            override fun onRemoveListArtwork() {
-                clearLibraryArtwork(LibraryArtworkTarget.LIST)
+            override fun onRemoveIconArtwork() {
+                clearLibraryArtwork(LibraryArtworkTarget.ICON_ART)
             }
 
-            override fun onOpenArtworkSource() {
+            override fun onOpenArtworkSource(gameName: String) {
                 runCatching {
                     context.startActivity(
                         Intent(
                             Intent.ACTION_VIEW,
-                            Uri.parse("https://www.steamgriddb.com/"),
+                            String.format("https://www.steamgriddb.com/search/grids?term=%s", Uri.encode(gameName)).toUri()
                         ),
                     )
                 }
@@ -284,7 +307,6 @@ class ShortcutSettingsComposeDialog private constructor(
 
             override fun onGfxDriverVersionChanged(versionIndex: Int) {
                 loadExtensionsForVersion(versionIndex)
-                // Update version display
                 val versions = state.gfxDriverVersionEntries.value
                 state.graphicsDriverVersion.value = versions.getOrElse(versionIndex) { "" }
             }
@@ -310,7 +332,7 @@ class ShortcutSettingsComposeDialog private constructor(
                     activity = activity,
                     initialPath = resolveExePickerInitialPath(),
                     title = context.getString(R.string.common_ui_select_exe),
-                    allowedExtensions = setOf("exe"),
+                    allowedExtensions = DirectoryPickerDialog.ExecutableExtensions,
                     dimAmount = 0.5f,
                     preserveBackdropBlur = true,
                 ) { path ->
@@ -336,19 +358,14 @@ class ShortcutSettingsComposeDialog private constructor(
         }
     }
 
-    // ------------------------------------------------------------------
-    // Data Loading
-    // ------------------------------------------------------------------
-
     private fun loadInitialData() {
         val container = shortcut.container
 
-        // General
-        state.name.value = shortcut.name
+        state.name.value = shortcut.getExtra("custom_name", shortcut.name).ifBlank { shortcut.name }
         state.launchExePath.value = resolveInitialLaunchExePath()
+        state.launchExeDisplayPath.value = resolveLaunchExeDisplayPath(state.launchExePath.value)
         syncLibraryArtworkState()
 
-        // Input
         val inputType = Integer.parseInt(
             getShortcutSetting("inputType", container.getInputType().toString())
         )
@@ -359,23 +376,35 @@ class ShortcutSettingsComposeDialog private constructor(
         state.selectedDInputMapperType.intValue =
             if ((inputType and WinHandler.FLAG_DINPUT_MAPPER_STANDARD.toInt()) == WinHandler.FLAG_DINPUT_MAPPER_STANDARD.toInt()) 0 else 1
         state.disableXInput.value = shortcut.getExtra("disableXinput", "0") == "1"
+        state.shortcutExclusiveXInput.value = shortcut.getExtra("exclusiveXInput", "").let {
+            if (it.isEmpty()) container.isExclusiveXInput() else it == "1"
+        }
         state.simTouchScreen.value = shortcut.getExtra("simTouchScreen", "0") == "1"
+        state.screenTouchMode.intValue = shortcut.getExtra(
+            "screenTouchMode",
+            if (shortcut.getExtra("simTouchScreen", "0") == "1") "1" else "0"
+        ).toIntOrNull() ?: 0
+        val gestureProfiles = gestureProfileManager.profiles
+        state.gestureProfileEntries.value =
+            listOf(context.getString(R.string.common_ui_none)) + gestureProfiles.map { it.name }
+        state.gestureProfileIds.value = listOf(0) + gestureProfiles.map { it.id }
+        val gid = shortcut.getExtra("gestureProfileId", "0").toIntOrNull() ?: 0
+        state.selectedGestureProfile.intValue =
+            state.gestureProfileIds.value.indexOf(gid).let { if (it >= 0) it else 0 }
 
         // Steam options
         val gameSource = shortcut.getExtra("game_source", "")
         state.isSteamGame.value = gameSource == "STEAM" || gameSource == "steam"
         if (state.isSteamGame.value) {
-            state.useColdClient.value = getShortcutSetting(
-                "useColdClient", if (container.isUseColdClient) "1" else "0") == "1"
-            state.launchRealSteam.value = getShortcutSetting(
-                "launchRealSteam", if (container.isLaunchRealSteam) "1" else "0") == "1"
+            state.steamLauncher.value =
+                com.winlator.cmod.feature.stores.steam.utils.PrefManager.wnPlanW
+            // Legacy Launcher is on if either underlying setting was previously on.
+            state.useLegacyLauncher.value =
+                getShortcutSetting("useColdClient", if (container.isUseColdClient) "1" else "0") == "1" ||
+                getShortcutSetting("unpackFiles", if (container.isUnpackFiles) "1" else "0") == "1"
             state.useSteamInput.value = shortcut.getExtra("useSteamInput", "0") == "1"
-            state.forceDlc.value = getShortcutSetting(
-                "forceDlc", if (container.isForceDlc) "1" else "0") == "1"
             state.steamOfflineMode.value = getShortcutSetting(
                 "steamOfflineMode", if (container.isSteamOfflineMode) "1" else "0") == "1"
-            state.unpackFiles.value = getShortcutSetting(
-                "unpackFiles", if (container.isUnpackFiles) "1" else "0") == "1"
             state.runtimePatcher.value = getShortcutSetting(
                 "runtimePatcher", if (container.isRuntimePatcher) "1" else "0") == "1"
         }
@@ -391,6 +420,18 @@ class ShortcutSettingsComposeDialog private constructor(
             if (container.isFullscreenStretched) "1" else "0"
         )
         state.fullscreenStretched.value = fullscreenStretched == "1"
+        state.useUnixLibs.value = getShortcutSetting(
+            "useUnixLibs",
+            if (container.isUseUnixLibs) "1" else "0"
+        ) == "1"
+
+        // Direct Composition (per-shortcut override of the container setting).
+        // Falls back to the container's value when the shortcut doesn't override.
+        val directComposition = getShortcutSetting(
+            Container.EXTRA_DIRECT_COMPOSITION,
+            if (container.isDirectCompositionEnabled()) "1" else "0"
+        )
+        state.directComposition.value = directComposition == "1"
 
         // LC_ALL
         state.lcAll.value = getShortcutSetting("lc_all", container.getLC_ALL())
@@ -462,6 +503,42 @@ class ShortcutSettingsComposeDialog private constructor(
         val savedFpsLimit = shortcut.getExtra("fpsLimit", "0")
         state.fpsLimit.intValue = savedFpsLimit.toIntOrNull() ?: 0
 
+        // SGSR 1 per-game shortcut settings
+        state.sgsrEnabled.value = shortcut.getExtra("sgsrEnabled", "0") == "1"
+        state.sgsrUpscaleMode.intValue =
+            shortcut.getExtra("sgsrUpscaleMode", shortcut.getExtra("sgsr_upscale_mode", "1"))
+                .toIntOrNull()
+                ?.coerceIn(1, 6)
+                ?: 1
+        state.sgsrSharpness.intValue =
+            shortcut.getExtra("sgsrSharpness", shortcut.getExtra("sgsr_sharpness", "100"))
+                .toIntOrNull()
+                ?.coerceIn(0, 100)
+                ?: 100
+
+        // shortcut override else container value; legacy single reshadeEffect/flat params migrated in parse
+        val reshadeEffects = com.winlator.cmod.runtime.reshade.ReshadeManager.scanEffects(context)
+        state.reshadeEffects.value = reshadeEffects
+        state.reshadeLoadout.init(
+            reshadeEffects,
+            getShortcutSetting(
+                com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_LOADOUT,
+                container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_LOADOUT, "")
+            ).ifEmpty { null },
+            getShortcutSetting(
+                com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_MODE,
+                container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_MODE, "solo")
+            ),
+            getShortcutSetting(
+                com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_PARAMS,
+                container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_PARAMS, "")
+            ).ifEmpty { null },
+            getShortcutSetting(
+                com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_EFFECT,
+                container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_EFFECT, "None")
+            ),
+        )
+
         // Graphics driver (basic entries - will be updated after contents sync)
         val graphicsDriverArr =
             context.resources.getStringArray(R.array.graphics_driver_entries).toList()
@@ -472,6 +549,10 @@ class ShortcutSettingsComposeDialog private constructor(
             state.selectedGraphicsDriver
         )
 
+        state.zinkModeEntries.value = context.resources.getStringArray(R.array.zink_mode_entries).toList()
+        state.selectedZinkMode.intValue =
+            if (getShortcutSetting("zinkMode", container.getZinkMode()) == "windows") 1 else 0
+
         // DX Wrapper
         val dxWrapperArr =
             context.resources.getStringArray(R.array.dxwrapper_entries).toList()
@@ -482,6 +563,11 @@ class ShortcutSettingsComposeDialog private constructor(
             state.selectedDxWrapper
         )
 
+        // Surface Effect
+        val surfaceEffectArr = context.resources.getStringArray(R.array.surface_effect_entries).toList()
+        state.surfaceEffectEntries.value = surfaceEffectArr
+        state.selectedSurfaceEffect.intValue = if (getShortcutSetting("swapRB", container.getExtra("swapRB", "0")) == "1") 1 else 0
+
         // Audio driver
         val audioDriverArr =
             context.resources.getStringArray(R.array.audio_driver_entries).toList()
@@ -506,6 +592,7 @@ class ShortcutSettingsComposeDialog private constructor(
         else shortcut.getExtra("wineVersion", container.getWineVersion())
         val wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersionStr)
         isArm64EC = wineInfo.isArm64EC
+        state.isArm64EC.value = isArm64EC
         state.wineVersionDisplay.value = formatWineVersionDisplay(wineInfo)
 
         rebuildEmulatorLists()
@@ -575,15 +662,6 @@ class ShortcutSettingsComposeDialog private constructor(
         val themeIdx = desktopThemeArr.indexOfFirst { it.equals(themePart, ignoreCase = true) }
         state.selectedDesktopTheme.intValue = if (themeIdx >= 0) themeIdx else 0
 
-        // Steam type entries
-        if (state.isSteamGame.value) {
-            val steamTypeArr =
-                context.resources.getStringArray(R.array.steam_type_entries).toList()
-            state.steamTypeEntries.value = steamTypeArr
-            val savedSteamType = getShortcutSetting("steamType", container.getSteamType())
-            selectByValue(steamTypeArr, savedSteamType, state.selectedSteamType)
-        }
-
         // Show Box64/FEXCore frames based on saved emulator selection immediately,
         // before the async content sync runs
         updateEmulatorFrameVisibility()
@@ -618,6 +696,7 @@ class ShortcutSettingsComposeDialog private constructor(
         val wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersionStr)
         val archChanged = isArm64EC != wineInfo.isArm64EC
         isArm64EC = wineInfo.isArm64EC
+        state.isArm64EC.value = isArm64EC
         state.wineVersionDisplay.value = formatWineVersionDisplay(wineInfo)
 
         rebuildEmulatorLists()
@@ -645,9 +724,7 @@ class ShortcutSettingsComposeDialog private constructor(
         loadWineD3DConfigState()
     }
 
-    // ------------------------------------------------------------------
     // Helper load methods
-    // ------------------------------------------------------------------
 
     private fun loadMidiSoundFonts() {
         // Use a temporary Spinner to leverage MidiManager.loadSFSpinner
@@ -909,23 +986,18 @@ class ShortcutSettingsComposeDialog private constructor(
             "envVars",
             container?.getEnvVars() ?: Container.DEFAULT_ENV_VARS
         )
-        val envVars = EnvVars(envVarsStr)
-        val items = mutableListOf<EnvVarItem>()
-        for (key in envVars) {
-            items.add(EnvVarItem(key, envVars.get(key)))
-        }
+        val items = parseEnvVarItems(envVarsStr)
         state.envVars.value = items
 
         // Hide SDL2 keys from the user-visible list when the toggle is on.
-        state.sdl2Compatibility.value = envVars.get("SDL_XINPUT_ENABLED") == "1"
+        state.sdl2Compatibility.value = EnvVars(envVarsStr).get("SDL_XINPUT_ENABLED") == "1"
         if (state.sdl2Compatibility.value) {
             state.envVars.value = items.filterNot { item ->
                 sdl2EnvVars.any { it.first == item.key }
             }
         }
 
-        // Exclusive Input off → force both APIs on and lock them.
-        if (!state.disableXInput.value) {
+        if (!state.shortcutExclusiveXInput.value) {
             state.enableXInput.value = true
             state.enableDInput.value = true
         }
@@ -950,9 +1022,6 @@ class ShortcutSettingsComposeDialog private constructor(
         }
     }
 
-    // ------------------------------------------------------------------
-    // Save Settings
-    // ------------------------------------------------------------------
 
     private fun saveSettings() {
         // Compare against the target container (post-switch) so unchanged
@@ -967,6 +1036,7 @@ class ShortcutSettingsComposeDialog private constructor(
 
         if (nameChanged) {
             shortcut.putExtra("custom_name", name)
+            shouldRefreshLibraryOnSave = true
         }
 
         if (true) {
@@ -984,6 +1054,10 @@ class ShortcutSettingsComposeDialog private constructor(
             hasContainerOverride =
                 hasContainerOverride or saveOverride("graphicsDriver", graphicsDriver, container.getGraphicsDriver())
 
+            val zinkMode = if (state.selectedZinkMode.intValue == 1) "windows" else "unix"
+            hasContainerOverride =
+                hasContainerOverride or saveOverride("zinkMode", zinkMode, container.getZinkMode())
+
             val graphicsDriverConfig = buildGraphicsDriverConfigFromState()
             hasContainerOverride = hasContainerOverride or saveOverride(
                 "graphicsDriverConfig", graphicsDriverConfig, container.getGraphicsDriverConfig()
@@ -1002,6 +1076,10 @@ class ShortcutSettingsComposeDialog private constructor(
                 "dxwrapperConfig", dxwrapperConfig, container.getDXWrapperConfig()
             )
 
+            // Surface Effect
+            val swapRBStr = if (state.selectedSurfaceEffect.intValue == 1) "1" else "0"
+            hasContainerOverride = hasContainerOverride or saveOverride("swapRB", swapRBStr, container.getExtra("swapRB", "0"))
+
             // Audio
             val audioDriver = getIdentifierFromEntries(
                 state.audioDriverEntries.value, state.selectedAudioDriver.intValue
@@ -1041,6 +1119,20 @@ class ShortcutSettingsComposeDialog private constructor(
                 if (container.isFullscreenStretched) "1" else "0"
             )
 
+            // Direct Composition (per-shortcut override)
+            hasContainerOverride = hasContainerOverride or saveOverride(
+                Container.EXTRA_DIRECT_COMPOSITION,
+                if (state.directComposition.value) "1" else "0",
+                if (container.isDirectCompositionEnabled()) "1" else "0"
+            )
+
+            // Use UnixLibs
+            hasContainerOverride = hasContainerOverride or saveOverride(
+                "useUnixLibs",
+                if (state.useUnixLibs.value) "1" else "0",
+                if (container.isUseUnixLibs) "1" else "0"
+            )
+
             // Win components
             val wincomponents = buildWinComponentsString()
             hasContainerOverride =
@@ -1147,11 +1239,17 @@ class ShortcutSettingsComposeDialog private constructor(
             shortcut.putExtra("disableXinput", disableXinputValue)
             if (disableXinputValue != null) hasContainerOverride = true
 
+            shortcut.putExtra("exclusiveXInput", if (state.shortcutExclusiveXInput.value) "1" else "0")
+            if (state.shortcutExclusiveXInput.value != container.isExclusiveXInput()) hasContainerOverride = true
+
             // Touchscreen mode
-            shortcut.putExtra(
-                "simTouchScreen",
-                if (state.simTouchScreen.value) "1" else "0"
-            )
+            val mode = state.screenTouchMode.intValue
+            shortcut.putExtra("simTouchScreen", if (mode == 1) "1" else "0")
+            shortcut.putExtra("screenTouchMode", mode.toString())
+            if (state.gestureProfileIds.value.isNotEmpty()) {
+                val gpid = state.gestureProfileIds.value.getOrNull(state.selectedGestureProfile.intValue) ?: 0
+                shortcut.putExtra("gestureProfileId", if (gpid > 0) gpid.toString() else null)
+            }
 
             // Launch EXE path
             val launchExePath = normalizeLaunchExeForShortcut(state.launchExePath.value)
@@ -1163,10 +1261,10 @@ class ShortcutSettingsComposeDialog private constructor(
                     resolveLaunchExeFile(launchExePath)?.takeIf { it.isFile }?.let { exeFile ->
                         val gameFolder = LibraryShortcutUtils.detectCustomGameFolder(exeFile)
                         shortcut.putExtra("custom_game_folder", gameFolder.absolutePath)
-                        updateCustomShortcutExecLine(gameFolder, exeFile)
+                        updateCustomShortcutExecLine(container, gameFolder, exeFile)
                     }
                 } else if (gameSource == "EPIC" || gameSource == "GOG") {
-                    updateStoreShortcutExecLine(gameSource, launchExePath)
+                    updateStoreShortcutExecLine(container, gameSource, launchExePath)
                 }
             }
 
@@ -1193,6 +1291,43 @@ class ShortcutSettingsComposeDialog private constructor(
             val fpsLimit = state.fpsLimit.intValue
             shortcut.putExtra("fpsLimit", if (fpsLimit > 0) fpsLimit.toString() else null)
 
+            // SGSR 1 is a shortcut-only setting, not a container override.
+            if (state.sgsrEnabled.value) {
+                shortcut.putExtra("sgsrEnabled", "1")
+                shortcut.putExtra("sgsrUpscaleMode", state.sgsrUpscaleMode.intValue.coerceIn(1, 6).toString())
+                shortcut.putExtra("sgsrSharpness", state.sgsrSharpness.intValue.coerceIn(0, 100).toString())
+            } else {
+                shortcut.putExtra("sgsrEnabled", null)
+                shortcut.putExtra("sgsrUpscaleMode", null)
+                shortcut.putExtra("sgsrSharpness", null)
+            }
+
+            // saveOverride not putExtra: putExtra leaves hasContainerOverride false, so a reshade-only shortcut gets use_container_defaults=1 and reads back the container's extras
+            run {
+                val loadoutJson = state.reshadeLoadout.loadoutJsonOrNull() ?: ""
+                hasContainerOverride = hasContainerOverride or saveOverride(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_LOADOUT,
+                    loadoutJson,
+                    container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_LOADOUT, "")
+                )
+                hasContainerOverride = hasContainerOverride or saveOverride(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_MODE,
+                    if (loadoutJson.isEmpty()) "" else state.reshadeLoadout.mode,
+                    // "solo" is how launch resolves an unset mode; matching it avoids a spurious reshadeMode override
+                    if (loadoutJson.isEmpty()) "" else container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_MODE, "solo")
+                )
+                hasContainerOverride = hasContainerOverride or saveOverride(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_PARAMS,
+                    if (loadoutJson.isEmpty()) "" else (state.reshadeLoadout.paramsJsonOrNull() ?: ""),
+                    container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_PARAMS, "")
+                )
+                hasContainerOverride = hasContainerOverride or saveOverride(
+                    com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_EFFECT,
+                    if (loadoutJson.isEmpty()) "" else state.reshadeLoadout.firstEffectName(),
+                    container.getExtra(com.winlator.cmod.runtime.reshade.ReshadeConfigWriter.EXTRA_EFFECT, "")
+                )
+            }
+
             // Desktop Theme — stored as compound "THEME,TYPE,COLOR" string
             if (state.desktopThemeEntries.value.isNotEmpty()) {
                 val desktopThemeEntries = state.desktopThemeEntries.value
@@ -1211,26 +1346,22 @@ class ShortcutSettingsComposeDialog private constructor(
 
             // Steam options
             if (state.isSteamGame.value) {
+                com.winlator.cmod.feature.stores.steam.utils.PrefManager.wnPlanW =
+                    state.steamLauncher.value
+                shortcut.putExtra("launchRealSteam", null)
+                shortcut.putExtra("steamType", null)
+                // "Use Legacy Launcher" drives both the ColdClient launcher and
+                // SteamStub DRM unpacking; persist both keys from the one toggle.
                 hasContainerOverride = hasContainerOverride or saveOverride(
                     "useColdClient",
-                    if (state.useColdClient.value) "1" else "0",
+                    if (state.useLegacyLauncher.value) "1" else "0",
                     if (container.isUseColdClient) "1" else "0"
                 )
-                hasContainerOverride = hasContainerOverride or saveOverride(
-                    "launchRealSteam",
-                    if (state.launchRealSteam.value) "1" else "0",
-                    if (container.isLaunchRealSteam) "1" else "0"
-                )
                 hasContainerOverride = hasContainerOverride or saveOverride(
                     "useSteamInput",
                     if (state.useSteamInput.value) "1" else "0",
                     container.getExtra("useSteamInput", "0")
                 )
-                hasContainerOverride = hasContainerOverride or saveOverride(
-                    "forceDlc",
-                    if (state.forceDlc.value) "1" else "0",
-                    if (container.isForceDlc) "1" else "0"
-                )
                 hasContainerOverride = hasContainerOverride or saveOverride(
                     "steamOfflineMode",
                     if (state.steamOfflineMode.value) "1" else "0",
@@ -1238,7 +1369,7 @@ class ShortcutSettingsComposeDialog private constructor(
                 )
                 hasContainerOverride = hasContainerOverride or saveOverride(
                     "unpackFiles",
-                    if (state.unpackFiles.value) "1" else "0",
+                    if (state.useLegacyLauncher.value) "1" else "0",
                     if (container.isUnpackFiles) "1" else "0"
                 )
                 hasContainerOverride = hasContainerOverride or saveOverride(
@@ -1246,16 +1377,6 @@ class ShortcutSettingsComposeDialog private constructor(
                     if (state.runtimePatcher.value) "1" else "0",
                     if (container.isRuntimePatcher) "1" else "0"
                 )
-
-                val steamTypeEntries = state.steamTypeEntries.value
-                val stIdx = state.selectedSteamType.intValue
-                if (stIdx in steamTypeEntries.indices) {
-                    hasContainerOverride = hasContainerOverride or saveOverride(
-                        "steamType",
-                        steamTypeEntries[stIdx],
-                        container.getSteamType()
-                    )
-                }
             }
 
             // Container defaults flag
@@ -1268,6 +1389,7 @@ class ShortcutSettingsComposeDialog private constructor(
                 TAG,
                 "Saving shortcut name='${shortcut.name}' path='${shortcut.path}'" +
                     " usesContainerDefaults=${if (hasContainerOverride) "0" else "1"}" +
+                    " swapRB='${shortcut.getExtra("swapRB")}'" +
                     " box64Preset='${shortcut.getExtra("box64Preset")}'" +
                     " fexcorePreset='${shortcut.getExtra("fexcorePreset")}'" +
                     " wineVersion='${shortcut.getExtra("wineVersion")}'" +
@@ -1312,9 +1434,7 @@ class ShortcutSettingsComposeDialog private constructor(
         }
     }
 
-    // ------------------------------------------------------------------
     // Helper methods
-    // ------------------------------------------------------------------
 
     private fun addShortcutToScreen(shortcut: Shortcut): ShortcutsFragment.PinShortcutResult {
         if (shortcut.getExtra("uuid").isEmpty()) shortcut.genUUID()
@@ -1353,20 +1473,27 @@ class ShortcutSettingsComposeDialog private constructor(
     }
 
     private fun resolveInitialLaunchExePath(): String {
-        val storedPath = shortcut.getExtra("launch_exe_path")
-        if (storedPath.isNotEmpty()) return storedPath
-
         val gameSource = shortcut.getExtra("game_source", "")
         if (gameSource == "CUSTOM") {
             val customExe = shortcut.getExtra("custom_exe")
             if (customExe.isNotEmpty()) return customExe
         }
 
+        val storedPath = shortcut.getExtra("launch_exe_path")
+        if (storedPath.isNotEmpty()) return storedPath
+
         return ""
     }
 
     private fun resolveExePickerInitialPath(): String? {
-        val currentPath = state.launchExePath.value.ifBlank { shortcut.getExtra("launch_exe_path") }
+        val currentPath =
+            state.launchExePath.value.ifBlank {
+                if (shortcut.getExtra("game_source", "") == "CUSTOM") {
+                    shortcut.getExtra("custom_exe").ifBlank { shortcut.getExtra("launch_exe_path") }
+                } else {
+                    shortcut.getExtra("launch_exe_path")
+                }
+            }
         if (currentPath.isBlank()) {
             return shortcut.getExtra("game_install_path")
                 .takeIf { it.isNotBlank() && File(it).isDirectory }
@@ -1383,8 +1510,8 @@ class ShortcutSettingsComposeDialog private constructor(
 
     private fun applySelectedExePath(path: String) {
         val exeFile = File(path)
-        if (!exeFile.isFile || !exeFile.name.endsWith(".exe", ignoreCase = true)) {
-            WinToast.show(context, R.string.common_ui_select_valid_exe_file, Toast.LENGTH_SHORT)
+        if (!exeFile.isFile || exeFile.extension.lowercase() !in DirectoryPickerDialog.ExecutableExtensions) {
+            WinToast.show(context, context.getString(R.string.common_ui_select_valid_exe_file), Toast.LENGTH_SHORT, dialog.window?.decorView)
             return
         }
 
@@ -1394,6 +1521,7 @@ class ShortcutSettingsComposeDialog private constructor(
             } else {
                 exeFile.absolutePath
             }
+        state.launchExeDisplayPath.value = exeFile.absolutePath
     }
 
     private fun normalizeLaunchExeForShortcut(path: String): String {
@@ -1425,6 +1553,20 @@ class ShortcutSettingsComposeDialog private constructor(
         return directFile
     }
 
+    private fun resolveLaunchExeDisplayPath(path: String): String {
+        if (path.isBlank()) return ""
+
+        val directFile = File(path)
+        if (directFile.isAbsolute) return directFile.absolutePath
+
+        val installPath = shortcut.getExtra("game_install_path")
+        if (installPath.isNotBlank()) {
+            return File(installPath, path.replace("\\", File.separator)).absolutePath
+        }
+
+        return path
+    }
+
     private fun relativePathWithinGameInstall(file: File): String? {
         val installPath = shortcut.getExtra("game_install_path")
         if (installPath.isBlank()) return null
@@ -1440,15 +1582,19 @@ class ShortcutSettingsComposeDialog private constructor(
             .replace(File.separatorChar, '/')
     }
 
-    private fun updateStoreShortcutExecLine(gameSource: String, launchExePath: String) {
+    private fun updateStoreShortcutExecLine(
+        targetContainer: Container,
+        gameSource: String,
+        launchExePath: String,
+    ) {
         val exeFile = File(launchExePath).takeIf { it.isFile } ?: return
         val gameInstallPath = shortcut.getExtra("game_install_path")
         val mappedPath =
             gameInstallPath
                 .takeIf { it.isNotBlank() && File(it).isDirectory }
-                ?.let { WineUtils.getDriveCGameWindowsPath(shortcut.container, gameSource, it, exeFile.absolutePath) }
+                ?.let { WineUtils.getDriveCGameWindowsPath(targetContainer, gameSource, it, exeFile.absolutePath) }
                 ?.takeIf { it.isNotBlank() }
-                ?: WineUtils.hostPathToRootWinePath(shortcut.container, exeFile.absolutePath)
+                ?: WineUtils.hostPathToRootWinePath(targetContainer, exeFile.absolutePath)
                     .takeIf { it.isNotBlank() }
                 ?: return
 
@@ -1468,15 +1614,19 @@ class ShortcutSettingsComposeDialog private constructor(
         FileUtils.writeString(shortcut.file, content.toString())
     }
 
-    private fun updateCustomShortcutExecLine(gameFolder: File, exeFile: File) {
+    private fun updateCustomShortcutExecLine(
+        targetContainer: Container,
+        gameFolder: File,
+        exeFile: File,
+    ) {
         val mappedPath =
             WineUtils.getDriveCGameWindowsPath(
-                shortcut.container,
+                targetContainer,
                 "CUSTOM",
                 gameFolder.absolutePath,
                 exeFile.absolutePath,
             )?.takeIf { it.isNotBlank() }
-                ?: WineUtils.hostPathToRootWinePath(shortcut.container, exeFile.absolutePath)
+                ?: WineUtils.hostPathToRootWinePath(targetContainer, exeFile.absolutePath)
                     .takeIf { it.isNotBlank() }
                 ?: return
 
@@ -1512,86 +1662,82 @@ class ShortcutSettingsComposeDialog private constructor(
             target = LibraryArtworkTarget.GAME_CARD,
         )
         syncLibraryArtworkSlotState(
-            target = LibraryArtworkTarget.GRID,
-        )
-        syncLibraryArtworkSlotState(
-            target = LibraryArtworkTarget.CAROUSEL,
-        )
-        syncLibraryArtworkSlotState(
-            target = LibraryArtworkTarget.LIST,
+            target = LibraryArtworkTarget.ICON_ART,
         )
     }
 
     private fun syncLibraryArtworkSlotState(
         target: LibraryArtworkTarget,
     ) {
-        val file =
-            getLibraryArtworkExtraKey(target)
-                ?.let { shortcut.getExtra(it) }
-                ?.takeIf { it.isNotBlank() }
-                ?.let(::File)
-                ?.takeIf { it.isFile() }
+        val hasArtwork =
+            when (target) {
+                LibraryArtworkTarget.ICON_ART -> LibraryShortcutArtwork.findIconArtworkPath(shortcut) != null
+                LibraryArtworkTarget.GAME_CARD ->
+                    getLibraryArtworkExtraKey(target)
+                        ?.let { shortcut.getExtra(it) }
+                        ?.takeIf { it.isNotBlank() }
+                        ?.let(::File)
+                        ?.isFile() == true
+            }
 
         when (target) {
             LibraryArtworkTarget.GAME_CARD -> {
-                state.gameCardArtworkSelected.value = file != null
-                state.gameCardArtworkSummary.value =
-                    if (file != null) {
-                        context.getString(R.string.shortcuts_library_artwork_selected, file.name)
-                    } else {
-                        ""
-                    }
-            }
-            LibraryArtworkTarget.GRID -> {
-                state.gridArtworkSelected.value = file != null
-                state.gridArtworkSummary.value =
-                    if (file != null) {
-                        context.getString(R.string.shortcuts_library_artwork_selected, file.name)
-                    } else {
-                        ""
-                    }
-            }
-            LibraryArtworkTarget.CAROUSEL -> {
-                state.carouselArtworkSelected.value = file != null
-                state.carouselArtworkSummary.value =
-                    if (file != null) {
-                        context.getString(R.string.shortcuts_library_artwork_selected, file.name)
-                    } else {
-                        ""
-                    }
+                state.gameCardArtworkSelected.value = hasArtwork
+                state.gameCardArtworkSummary.value = ""
             }
-            LibraryArtworkTarget.LIST -> {
-                state.listArtworkSelected.value = file != null
-                state.listArtworkSummary.value =
-                    if (file != null) {
-                        context.getString(R.string.shortcuts_library_artwork_selected, file.name)
-                    } else {
-                        ""
-                    }
+            LibraryArtworkTarget.ICON_ART -> {
+                state.iconArtworkSelected.value = hasArtwork
+                state.iconArtworkSummary.value = ""
             }
         }
     }
 
-    private fun saveSelectedArtwork(uri: Uri) =
-        saveSelectedLibraryArtwork(uri, pendingArtworkTarget)
+    private fun pickLibraryArtwork(target: LibraryArtworkTarget) {
+        DirectoryPickerDialog.showFile(
+            activity = activity,
+            title = context.getString(R.string.shortcuts_library_artwork_set),
+            allowedExtensions = ARTWORK_EXTENSIONS,
+            dimAmount = 0.5f,
+            preserveBackdropBlur = true,
+        ) { path ->
+            saveSelectedLibraryArtwork(Uri.fromFile(File(path)), target)
+        }
+    }
+
+    // Each view gets its own shape, so slots are written individually and only
+    // replaced when the new image lands.
+    private fun saveScrapedLibraryArtwork(
+        uri: Uri,
+        slot: LibraryShortcutArtwork.LibraryArtworkSlot,
+    ): Boolean {
+        val bitmap = ImageUtils.getBitmapFromUri(context, uri, 1024) ?: return false
+        val previousPath = shortcut.getExtra(slot.extraKey)
+        val outputFile = LibraryShortcutArtwork.buildManagedViewArtworkFile(context, shortcut, slot)
+        if (!FileUtils.saveBitmapToFile(bitmap, outputFile)) return false
+        if (previousPath.isNotBlank() && previousPath != outputFile.absolutePath) {
+            LibraryShortcutArtwork.deleteManagedArtwork(context, previousPath)
+        }
+        shortcut.putExtra(slot.extraKey, outputFile.absolutePath)
+        return true
+    }
 
     private fun saveSelectedLibraryArtwork(
         uri: Uri,
         target: LibraryArtworkTarget,
-    ) {
+    ): Boolean {
         val bitmap = ImageUtils.getBitmapFromUri(context, uri, 1024)
         if (bitmap == null) {
-            WinToast.show(context, R.string.shortcuts_library_artwork_failed, Toast.LENGTH_SHORT)
-            return
+            WinToast.show(context, context.getString(R.string.shortcuts_library_artwork_failed), Toast.LENGTH_SHORT, dialog.window?.decorView)
+            return false
         }
 
-        val extraKey = getLibraryArtworkExtraKey(target) ?: return
+        val extraKey = getLibraryArtworkExtraKey(target) ?: return false
         val previousPath = shortcut.getExtra(extraKey)
-        val slot = getLibraryArtworkSlot(target) ?: return
+        val slot = getLibraryArtworkSlot(target) ?: return false
         val outputFile = LibraryShortcutArtwork.buildManagedViewArtworkFile(context, shortcut, slot)
         if (!FileUtils.saveBitmapToFile(bitmap, outputFile)) {
-            WinToast.show(context, R.string.shortcuts_library_artwork_failed, Toast.LENGTH_SHORT)
-            return
+            WinToast.show(context, context.getString(R.string.shortcuts_library_artwork_failed), Toast.LENGTH_SHORT, dialog.window?.decorView)
+            return false
         }
 
         if (previousPath.isNotBlank() && previousPath != outputFile.absolutePath) {
@@ -1599,34 +1745,46 @@ class ShortcutSettingsComposeDialog private constructor(
         }
 
         shortcut.putExtra(extraKey, outputFile.absolutePath)
+        clearLibraryArtworkSlots(getLibraryArtworkSlots(target).filter { it.extraKey != extraKey })
         shortcut.saveData()
         shouldRefreshLibraryOnSave = true
         syncLibraryArtworkState()
+        // Artwork lands on disk at pick time, so refresh now instead of at confirm.
+        emitLibraryRefreshIfNeeded()
+        return true
     }
 
     private fun clearLibraryArtwork(target: LibraryArtworkTarget) {
-        val extraKey = getLibraryArtworkExtraKey(target) ?: return
-        LibraryShortcutArtwork.deleteManagedArtwork(context, shortcut.getExtra(extraKey))
-        shortcut.putExtra(extraKey, null)
+        clearLibraryArtworkSlots(getLibraryArtworkSlots(target))
         shortcut.saveData()
         shouldRefreshLibraryOnSave = true
         syncLibraryArtworkState()
+        // Artwork lands on disk at pick time, so refresh now instead of at confirm.
+        emitLibraryRefreshIfNeeded()
     }
 
-    private fun getLibraryArtworkExtraKey(target: LibraryArtworkTarget): String? =
-        when (target) {
-            LibraryArtworkTarget.GAME_CARD -> LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD.extraKey
-            LibraryArtworkTarget.GRID -> LibraryShortcutArtwork.LibraryArtworkSlot.GRID.extraKey
-            LibraryArtworkTarget.CAROUSEL -> LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL.extraKey
-            LibraryArtworkTarget.LIST -> LibraryShortcutArtwork.LibraryArtworkSlot.LIST.extraKey
+    private fun clearLibraryArtworkSlots(slots: List<LibraryShortcutArtwork.LibraryArtworkSlot>) {
+        slots.forEach { slot ->
+            LibraryShortcutArtwork.deleteManagedArtwork(context, shortcut.getExtra(slot.extraKey))
+            shortcut.putExtra(slot.extraKey, null)
         }
+    }
+
+    private fun getLibraryArtworkExtraKey(target: LibraryArtworkTarget): String? = getLibraryArtworkSlot(target)?.extraKey
 
     private fun getLibraryArtworkSlot(target: LibraryArtworkTarget): LibraryShortcutArtwork.LibraryArtworkSlot? =
+        getLibraryArtworkSlots(target).firstOrNull()
+
+    // Icon art writes GRID; the trailing slots only exist to clear images saved before the merge.
+    private fun getLibraryArtworkSlots(target: LibraryArtworkTarget): List<LibraryShortcutArtwork.LibraryArtworkSlot> =
         when (target) {
-            LibraryArtworkTarget.GAME_CARD -> LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD
-            LibraryArtworkTarget.GRID -> LibraryShortcutArtwork.LibraryArtworkSlot.GRID
-            LibraryArtworkTarget.CAROUSEL -> LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL
-            LibraryArtworkTarget.LIST -> LibraryShortcutArtwork.LibraryArtworkSlot.LIST
+            LibraryArtworkTarget.GAME_CARD -> listOf(LibraryShortcutArtwork.LibraryArtworkSlot.GAME_CARD)
+            LibraryArtworkTarget.ICON_ART ->
+                listOf(
+                    LibraryShortcutArtwork.LibraryArtworkSlot.GRID,
+                    LibraryShortcutArtwork.LibraryArtworkSlot.CAROUSEL,
+                    LibraryShortcutArtwork.LibraryArtworkSlot.LIST,
+                )
         }
 
     private fun emitLibraryRefreshIfNeeded() {
@@ -1758,7 +1916,7 @@ class ShortcutSettingsComposeDialog private constructor(
     }
 
     private fun buildGraphicsDriverConfigFromState(): String {
-        val vulkanVersion = state.gfxVulkanVersionEntries.value.getOrElse(state.gfxSelectedVulkanVersion.intValue) { "1.3" }
+        val vulkanVersion = state.gfxVulkanVersionEntries.value.getOrElse(state.gfxSelectedVulkanVersion.intValue) { "1.4" }
         val version = state.gfxDriverVersionEntries.value.getOrElse(state.gfxSelectedDriverVersion.intValue) { "" }
         val blacklisted = state.gfxBlacklistedExtensions.value.joinToString(",")
         val gpuName = state.gfxGpuNameEntries.value.getOrElse(state.gfxSelectedGpuName.intValue) { "Device" }
@@ -1766,18 +1924,23 @@ class ShortcutSettingsComposeDialog private constructor(
             state.gfxMaxDeviceMemoryEntries.value.getOrElse(state.gfxSelectedMaxDeviceMemory.intValue) { "0" }
         )
         val presentMode = state.gfxPresentModeEntries.value.getOrElse(state.gfxSelectedPresentMode.intValue) { "mailbox" }
+        val compositorPresentMode = state.gfxCompositorPresentModeEntries.value.getOrElse(state.gfxSelectedCompositorPresentMode.intValue) { "fifo" }
         val syncFrame = if (state.gfxSyncFrame.value) "1" else "0"
         val disablePresentWait = if (state.gfxDisablePresentWait.value) "1" else "0"
         val resourceType = state.gfxResourceTypeEntries.value.getOrElse(state.gfxSelectedResourceType.intValue) { "auto" }
         val bcnEmulation = state.gfxBcnEmulationEntries.value.getOrElse(state.gfxSelectedBcnEmulation.intValue) { "auto" }
         val bcnEmulationType = state.gfxBcnEmulationTypeEntries.value.getOrElse(state.gfxSelectedBcnEmulationType.intValue) { "compute" }
         val bcnEmulationCache = state.gfxBcnEmulationCacheEntries.value.getOrElse(state.gfxSelectedBcnEmulationCache.intValue) { "0" }
+        val transcoder = state.gfxTranscoderEntries.value.getOrElse(state.gfxSelectedTranscoder.intValue) { "cpu" }
+        val quality = state.gfxQualityEntries.value.getOrElse(state.gfxSelectedQuality.intValue) { "low" }
 
         return "vulkanVersion=$vulkanVersion;version=$version;blacklistedExtensions=$blacklisted;" +
                 "maxDeviceMemory=$maxDeviceMemory;presentMode=$presentMode;syncFrame=$syncFrame;" +
                 "disablePresentWait=$disablePresentWait;resourceType=$resourceType;" +
                 "bcnEmulation=$bcnEmulation;bcnEmulationType=$bcnEmulationType;" +
-                "bcnEmulationCache=$bcnEmulationCache;gpuName=$gpuName"
+                "bcnEmulationCache=$bcnEmulationCache;gpuName=$gpuName;" +
+                "compositorPresentMode=$compositorPresentMode;" +
+                "transcoder=$transcoder;quality=$quality"
     }
 
     private fun buildDxvkConfigFromState(): String {
@@ -1809,16 +1972,17 @@ class ShortcutSettingsComposeDialog private constructor(
             container.getGraphicsDriverConfig()
         val config = GraphicsDriverConfigUtils.parseGraphicsDriverConfig(configStr)
 
-        // Load dropdown entries from resource arrays
         state.gfxVulkanVersionEntries.value = context.resources.getStringArray(R.array.vulkan_version_entries).toList()
         state.gfxMaxDeviceMemoryEntries.value = context.resources.getStringArray(R.array.device_memory_entries).toList()
         state.gfxPresentModeEntries.value = context.resources.getStringArray(R.array.present_mode_entries).toList()
+        state.gfxCompositorPresentModeEntries.value = context.resources.getStringArray(R.array.compositor_present_mode_entries).toList()
         state.gfxResourceTypeEntries.value = context.resources.getStringArray(R.array.resource_type_entries).toList()
         state.gfxBcnEmulationEntries.value = context.resources.getStringArray(R.array.bcn_emulation_entries).toList()
         state.gfxBcnEmulationTypeEntries.value = context.resources.getStringArray(R.array.bcn_emulation_type_entries).toList()
         state.gfxBcnEmulationCacheEntries.value = context.resources.getStringArray(R.array.bcn_emulation_cache_entries).toList()
+        state.gfxTranscoderEntries.value = context.resources.getStringArray(R.array.wrapper_transcoder_entries).toList()
+        state.gfxQualityEntries.value = context.resources.getStringArray(R.array.wrapper_quality_entries).toList()
 
-        // Load GPU names
         val gpuNames = mutableListOf("Device")
         try {
             val gpuNameList = FileUtils.readString(context, AssetPaths.GPU_CARDS)
@@ -1836,20 +2000,21 @@ class ShortcutSettingsComposeDialog private constructor(
         // Load driver versions (will be populated after contents sync)
         loadGraphicsDriverVersions(container)
 
-        // Set selections from config
-        selectByValue(state.gfxVulkanVersionEntries.value, config["vulkanVersion"] ?: "1.3", state.gfxSelectedVulkanVersion)
+        selectByValue(state.gfxVulkanVersionEntries.value, config["vulkanVersion"] ?: "1.4", state.gfxSelectedVulkanVersion)
         selectByValue(state.gfxGpuNameEntries.value, config["gpuName"] ?: "Device", state.gfxSelectedGpuName)
         selectByNumber(state.gfxMaxDeviceMemoryEntries.value, config["maxDeviceMemory"] ?: "0", state.gfxSelectedMaxDeviceMemory)
         selectByValue(state.gfxPresentModeEntries.value, config["presentMode"] ?: "mailbox", state.gfxSelectedPresentMode)
+        selectByValue(state.gfxCompositorPresentModeEntries.value, config["compositorPresentMode"] ?: "fifo", state.gfxSelectedCompositorPresentMode)
         selectByValue(state.gfxResourceTypeEntries.value, config["resourceType"] ?: "auto", state.gfxSelectedResourceType)
         selectByValue(state.gfxBcnEmulationEntries.value, config["bcnEmulation"] ?: "none", state.gfxSelectedBcnEmulation)
         selectByValue(state.gfxBcnEmulationTypeEntries.value, config["bcnEmulationType"] ?: "compute", state.gfxSelectedBcnEmulationType)
         selectByValue(state.gfxBcnEmulationCacheEntries.value, config["bcnEmulationCache"] ?: "0", state.gfxSelectedBcnEmulationCache)
+        selectByValue(state.gfxTranscoderEntries.value, config["transcoder"] ?: "cpu", state.gfxSelectedTranscoder)
+        selectByValue(state.gfxQualityEntries.value, config["quality"] ?: "low", state.gfxSelectedQuality)
 
         state.gfxSyncFrame.value = config["syncFrame"] == "1"
         state.gfxDisablePresentWait.value = config["disablePresentWait"] == "1"
 
-        // Update version display
         state.graphicsDriverVersion.value = config["version"] ?: ""
     }
 
@@ -1879,7 +2044,6 @@ class ShortcutSettingsComposeDialog private constructor(
 
         state.gfxDriverVersionEntries.value = versions
 
-        // Set initial selection from config
         val configStr = if (shouldUseShortcutOverrides(container))
             getShortcutSetting("graphicsDriverConfig", container.getGraphicsDriverConfig())
         else
@@ -1891,7 +2055,6 @@ class ShortcutSettingsComposeDialog private constructor(
             if (idx >= 0) state.gfxSelectedDriverVersion.intValue = idx
         }
 
-        // Load extensions for the currently selected version
         loadExtensionsForVersion(state.gfxSelectedDriverVersion.intValue)
     }
 
@@ -1935,15 +2098,17 @@ class ShortcutSettingsComposeDialog private constructor(
         state.dxvkVkd3dFeatureLevelEntries.value = DXVKConfigUtils.VKD3D_FEATURE_LEVEL.toList()
 
         // DDraw wrapper from resources
-        state.dxvkDdrawWrapperEntries.value = context.resources.getStringArray(R.array.ddrawrapper_entries).toList()
+        val ddrawWrapperItems = context.resources.getStringArray(R.array.ddrawrapper_entries).toMutableList()
+        for (profile in contentsManager.getProfiles(ContentProfile.ContentType.CONTENT_TYPE_D7VK)) {
+            ddrawWrapperItems.add(ContentsManager.getEntryName(profile))
+        }
+        if (!isArm64EC) ddrawWrapperItems.removeAll { it.contains("arm64ec") }
+        state.dxvkDdrawWrapperEntries.value = ddrawWrapperItems
 
-        // Load DXVK versions
         loadDxvkVersions(container)
 
-        // Load VKD3D versions
         loadVkd3dVersions(container)
 
-        // Set selections from config
         selectByIdentifier(state.dxvkVkd3dFeatureLevelEntries.value, config.get("vkd3dLevel"), state.dxvkSelectedVkd3dFeatureLevel)
         selectByIdentifier(state.dxvkDdrawWrapperEntries.value, config.get("ddrawrapper"), state.dxvkSelectedDdrawWrapper)
 
@@ -1960,14 +2125,12 @@ class ShortcutSettingsComposeDialog private constructor(
             originalItems.add(entryName.substring(firstDash + 1))
         }
 
-        // Remove arm64ec items if not applicable
         if (!isArm64EC) {
             originalItems.removeAll { it.contains("arm64ec") }
         }
 
         state.dxvkVersionEntries.value = originalItems
 
-        // Set selection from config
         val configStr = if (shouldUseShortcutOverrides(container))
             getShortcutSetting("dxwrapperConfig", container.getDXWrapperConfig())
         else
@@ -1989,7 +2152,6 @@ class ShortcutSettingsComposeDialog private constructor(
 
         state.dxvkVkd3dVersionEntries.value = items
 
-        // Set selection from config
         val configStr = if (shouldUseShortcutOverrides(container))
             getShortcutSetting("dxwrapperConfig", container.getDXWrapperConfig())
         else
@@ -2014,7 +2176,6 @@ class ShortcutSettingsComposeDialog private constructor(
         val selectedVkd3d = if (versionIndex in vkd3dEntries.indices) vkd3dEntries[versionIndex] else "None"
 
         if (selectedVkd3d != "None") {
-            // Filter DXVK versions to major >= 2
             val allVersions = state.dxvkVersionEntries.value
             val semver = Regex("(\\d+)\\.(\\d+)(?:\\.(\\d+))?")
             val filtered = allVersions.filter { v ->
@@ -2058,6 +2219,7 @@ class ShortcutSettingsComposeDialog private constructor(
         val wineVersionStr = newContainer.getWineVersion()
         val wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersionStr)
         isArm64EC = wineInfo.isArm64EC
+        state.isArm64EC.value = isArm64EC
         state.wineVersionDisplay.value = formatWineVersionDisplay(wineInfo)
         rebuildEmulatorLists()
 
@@ -2109,6 +2271,8 @@ class ShortcutSettingsComposeDialog private constructor(
             state.selectedAudioDriver
         )
 
+        state.selectedSurfaceEffect.intValue = if (container.getExtra("swapRB", "0") == "1") 1 else 0
+
         val midiFont = container.getMIDISoundFont()
         val midiEntries = state.midiSoundFontEntries.value
         if (midiFont.isEmpty()) {
@@ -2120,6 +2284,8 @@ class ShortcutSettingsComposeDialog private constructor(
 
         state.lcAll.value = container.getLC_ALL()
         state.fullscreenStretched.value = container.isFullscreenStretched
+        state.directComposition.value = container.isDirectCompositionEnabled()
+        state.useUnixLibs.value = container.isUseUnixLibs
 
         val startupEntries = state.startupSelectionEntries.value
         state.selectedStartupSelection.intValue = container.getStartupSelection().toInt()
@@ -2146,10 +2312,9 @@ class ShortcutSettingsComposeDialog private constructor(
         state.directXComponents.value = directX
         state.generalComponents.value = general
 
-        val envVars = EnvVars(container.getEnvVars() ?: Container.DEFAULT_ENV_VARS)
-        val items = mutableListOf<EnvVarItem>()
-        for (key in envVars) items.add(EnvVarItem(key, envVars.get(key)))
-        state.sdl2Compatibility.value = envVars.get("SDL_XINPUT_ENABLED") == "1"
+        val containerEnvVarsStr = container.getEnvVars() ?: Container.DEFAULT_ENV_VARS
+        val items = parseEnvVarItems(containerEnvVarsStr)
+        state.sdl2Compatibility.value = EnvVars(containerEnvVarsStr).get("SDL_XINPUT_ENABLED") == "1"
         state.envVars.value = if (state.sdl2Compatibility.value) {
             items.filterNot { item -> sdl2EnvVars.any { it.first == item.key } }
         } else items
@@ -2165,24 +2330,19 @@ class ShortcutSettingsComposeDialog private constructor(
             (inputType and WinHandler.FLAG_INPUT_TYPE_DINPUT.toInt()) == WinHandler.FLAG_INPUT_TYPE_DINPUT.toInt()
         state.selectedDInputMapperType.intValue =
             if ((inputType and WinHandler.FLAG_DINPUT_MAPPER_STANDARD.toInt()) == WinHandler.FLAG_DINPUT_MAPPER_STANDARD.toInt()) 0 else 1
-        // Exclusive Input off forces both APIs on.
-        if (!state.disableXInput.value) {
+        state.shortcutExclusiveXInput.value = container.isExclusiveXInput()
+        if (!state.shortcutExclusiveXInput.value) {
             state.enableXInput.value = true
             state.enableDInput.value = true
         }
 
         if (state.isSteamGame.value) {
-            state.useColdClient.value = container.isUseColdClient
-            state.launchRealSteam.value = container.isLaunchRealSteam
-            state.forceDlc.value = container.isForceDlc
+            state.steamLauncher.value =
+                com.winlator.cmod.feature.stores.steam.utils.PrefManager.wnPlanW
+            state.useLegacyLauncher.value = container.isUseColdClient || container.isUnpackFiles
             state.steamOfflineMode.value = container.isSteamOfflineMode
-            state.unpackFiles.value = container.isUnpackFiles
             state.runtimePatcher.value = container.isRuntimePatcher
             state.useSteamInput.value = container.getExtra("useSteamInput", "0") == "1"
-            val steamTypeArr = state.steamTypeEntries.value
-            if (steamTypeArr.isNotEmpty()) {
-                selectByValue(steamTypeArr, container.getSteamType(), state.selectedSteamType)
-            }
         }
     }
 
@@ -2224,7 +2384,6 @@ class ShortcutSettingsComposeDialog private constructor(
         }
         state.wined3dGpuNameEntries.value = gpuNames
 
-        // Set selections from config
         state.wined3dSelectedCsmt.intValue = if (config.get("csmt") == "3") 0 else 1
         state.wined3dSelectedStrictShaderMath.intValue = if (config.get("strict_shader_math") == "1") 0 else 1
         selectByValue(state.wined3dOffscreenRenderingModeEntries.value, config.get("OffscreenRenderingMode"), state.wined3dSelectedOffscreenRenderingMode)
@@ -2251,12 +2410,25 @@ class ShortcutSettingsComposeDialog private constructor(
     }
 
 
-    // ------------------------------------------------------------------
     // Show / Dismiss
-    // ------------------------------------------------------------------
 
     fun show() {
+        if (com.winlator.cmod.feature.retro.RetroShortcuts.isRetroShortcut(shortcut)) {
+            com.winlator.cmod.feature.retro
+                .RetroSettingsDialog(activity, shortcut)
+                .show()
+            return
+        }
         dialog.show()
+        restorePaneNav?.invoke()
+        restorePaneNav = dialog.window?.bindPaneNav(
+            PaneNavWindowHandlers(
+                onDir = { nav.dpad(it) },
+                onActivate = { nav.dpad(PANE_DIR_ACTIVATE) },
+                onDismiss = { if (nav.onContentBack?.invoke() != true) dialog.dismiss() },
+                onStart = { nav.onSave?.invoke() },
+            )
+        )
         dialog.window?.apply {
             applyDialogLayout()
             decorView.post { applyDialogLayout() }
diff --git a/app/src/main/feature/shortcuts/ShortcutsFragment.java b/app/src/main/feature/shortcuts/ShortcutsFragment.java
index 59cedfc85..46bd533fa 100644
--- a/app/src/main/feature/shortcuts/ShortcutsFragment.java
+++ b/app/src/main/feature/shortcuts/ShortcutsFragment.java
@@ -221,6 +221,11 @@ private void runFromShortcut(Shortcut shortcut) {
     Activity activity = getActivity();
     if (activity == null) return;
 
+    if (com.winlator.cmod.feature.retro.RetroShortcuts.isRetroShortcut(shortcut)) {
+      com.winlator.cmod.feature.retro.RetroShortcuts.launch(activity, shortcut);
+      return;
+    }
+
     Intent intent = new Intent(activity, XServerDisplayActivity.class);
     intent.putExtra("container_id", shortcut.container.id);
     intent.putExtra("shortcut_path", shortcut.file.getPath());
@@ -230,64 +235,11 @@ private void runFromShortcut(Shortcut shortcut) {
   }
 
   private void exportShortcut(Shortcut shortcut) {
-    SharedPreferences sharedPreferences =
-        PreferenceManager.getDefaultSharedPreferences(getContext());
-    String uriString = sharedPreferences.getString("shortcuts_export_path_uri", null);
-
-    File shortcutsDir;
-    if (uriString != null) {
-      String resolvedPath = FileUtils.getFilePathFromUri(getContext(), Uri.parse(uriString));
-      if (resolvedPath == null || resolvedPath.isEmpty()) {
-        WinToast.show(getContext(), R.string.common_ui_cannot_write_folder);
-        return;
-      }
-      shortcutsDir = new File(resolvedPath);
+    File exportFile = FrontendExporter.exportOne(getContext(), shortcut);
+    if (exportFile != null) {
+      WinToast.show(
+          getContext(), getString(R.string.shortcuts_list_exported_to, exportFile.getPath()));
     } else {
-      shortcutsDir = new File(SettingsConfig.DEFAULT_SHORTCUT_EXPORT_PATH);
-    }
-
-    if (!shortcutsDir.exists() && !shortcutsDir.mkdirs()) {
-      WinToast.show(getContext(), R.string.common_ui_failed_create_directory);
-      return;
-    }
-
-    File exportFile = new File(shortcutsDir, shortcut.file.getName());
-    boolean fileExists = exportFile.exists();
-    boolean containerIdFound = false;
-
-    try {
-      List<String> lines = new ArrayList<>();
-      try (BufferedReader reader = new BufferedReader(new FileReader(shortcut.file))) {
-        String line;
-        while ((line = reader.readLine()) != null) {
-          if (line.startsWith("container_id:")) {
-            lines.add("container_id:" + shortcut.container.id);
-            containerIdFound = true;
-          } else {
-            lines.add(line);
-          }
-        }
-      }
-
-      if (!containerIdFound) {
-        lines.add("container_id:" + shortcut.container.id);
-      }
-
-      try (FileWriter writer = new FileWriter(exportFile, false)) {
-        for (String line : lines) {
-          writer.write(line + "\n");
-        }
-        writer.flush();
-      }
-
-      Log.d("ShortcutsFragment", "Shortcut exported successfully to " + exportFile.getPath());
-      String message =
-          fileExists
-              ? getString(R.string.shortcuts_properties_updated_at, exportFile.getPath())
-              : getString(R.string.shortcuts_list_exported_to, exportFile.getPath());
-      WinToast.show(getContext(), message);
-    } catch (IOException e) {
-      Log.e("ShortcutsFragment", "Failed to export shortcut", e);
       WinToast.show(getContext(), R.string.shortcuts_list_failed_export);
     }
   }
diff --git a/app/src/main/feature/steamcloudsync/SteamAutoCloud.kt b/app/src/main/feature/steamcloudsync/SteamAutoCloud.kt
new file mode 100644
index 000000000..55521d26f
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamAutoCloud.kt
@@ -0,0 +1,1551 @@
+package com.winlator.cmod.feature.steamcloudsync
+import androidx.room.withTransaction
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SaveFilePattern
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.data.UserFilesDownloadResult
+import com.winlator.cmod.feature.stores.steam.data.UserFilesUploadResult
+import com.winlator.cmod.feature.stores.steam.enums.PathType
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.FileUtils
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.FileOutputStream
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.nio.file.StandardCopyOption
+import java.security.MessageDigest
+import java.util.stream.Collectors
+import kotlin.io.path.pathString
+import kotlin.time.measureTime
+
+/** Steam Auto Cloud: file list, downloads and uploads all flow through the in-house WN-Steam-Client session. */
+object SteamAutoCloud {
+    private const val MAX_CLOUD_FILE_SIZE_BYTES = 100L * 1024L * 1024L
+    private const val DOWNLOAD_TMP_SUFFIX = ".steamtmp"
+
+    // CCloud_AppFileInfo persist_state values (ECloudStoragePersistState).
+    private const val PERSIST_STATE_PERSISTED = 0
+    private const val PERSIST_STATE_DELETED = 2
+
+    /** Group persisted cloud files by resolved local path, deduping Steam's stale/duplicate entries (unresolvable ones dropped). */
+    private fun groupPersistedCloudFilesByLocalPath(
+        response: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        cloudRouting: CloudPathRouting?,
+    ): LinkedHashMap<Path, MutableList<CloudFileInfo>> {
+        val groups = LinkedHashMap<Path, MutableList<CloudFileInfo>>()
+        response.files
+            .asSequence()
+            .filter { it.persistState == PERSIST_STATE_PERSISTED }
+            .forEach { cloudFile ->
+                val local =
+                    resolveCloudFileLocalPath(cloudFile, response, prefixToPath, cloudRouting)
+                        ?.toAbsolutePath()
+                        ?.normalize()
+                if (local == null) {
+                    Timber.d("ConflictProbe: cloud file %s has no resolvable local path → ignoring", cloudFile.filename)
+                    return@forEach
+                }
+                groups.getOrPut(local) { mutableListOf() }.add(cloudFile)
+            }
+        return groups
+    }
+
+    /** True if a local file matches ANY of the cloud variants mapped to its path (size + SHA-1). */
+    private fun localMatchesAnyVariant(localPath: Path, variants: List<CloudFileInfo>): Boolean {
+        if (!Files.exists(localPath)) return false
+        val localSize = runCatching { Files.size(localPath) }.getOrNull() ?: return false
+        val localSha = runCatching { streamingSha(localPath) }.getOrNull() ?: return false
+        return variants.any { it.rawFileSize == localSize && localSha.contentEquals(it.shaFile) }
+    }
+
+    /** True if any cloud file diverges from local content (missing, or no matching size/SHA variant). */
+    fun cloudContentDiffersFromLocal(
+        response: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        appInfo: SteamApp? = null,
+    ): Boolean {
+        val cloudRouting = appInfo?.let { buildCloudPathRouting(it, prefixToPath) }
+        val groups = groupPersistedCloudFilesByLocalPath(response, prefixToPath, cloudRouting)
+        return groups.any { (localPath, variants) ->
+            val matches = localMatchesAnyVariant(localPath, variants)
+            if (!matches) {
+                Timber.d("ConflictProbe: %s does not match any cloud variant → diverges", localPath)
+            }
+            !matches
+        }
+    }
+
+    // Delegates to the canonical resolver so every consumer resolves to the path the downloader writes.
+    private fun resolveLocalPathForCloudFile(
+        cloudFile: CloudFileInfo,
+        response: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        cloudRouting: CloudPathRouting?,
+    ): Path? = resolveCloudFileLocalPath(cloudFile, response, prefixToPath, cloudRouting)
+
+    private fun steamUserDataSubpath(prefix: String): String? {
+        val normalized = prefix.replace('\\', '/').trimStart('/')
+        if (normalized.equals("remote", ignoreCase = true) || normalized.equals("remote/", ignoreCase = true)) {
+            return ""
+        }
+        if (normalized.startsWith("remote/", ignoreCase = true)) {
+            return normalized.substring("remote/".length).trimStart('/')
+        }
+        return null
+    }
+
+    private fun steamUserDataCacheName(
+        cloudFile: CloudFileInfo,
+        response: CloudFileChangeList,
+    ): String? {
+        val prefix =
+            if (cloudFile.pathPrefixIndex >= 0 && cloudFile.pathPrefixIndex < response.pathPrefixes.size) {
+                response.pathPrefixes[cloudFile.pathPrefixIndex]
+            } else {
+                ""
+            }
+
+        val token = "%${PathType.SteamUserData.name}%"
+        val filename =
+            if (cloudFile.filename.startsWith(token)) {
+                cloudFile.filename.removePrefix(token).trimStart('/', '\\')
+            } else {
+                cloudFile.filename
+            }.replace('\\', '/').trimStart('/')
+
+        val subpath =
+            steamUserDataSubpath(prefix)
+                ?: if (prefix.contains(token, ignoreCase = true)) {
+                    prefix.substringAfter(token).trimStart('/', '\\')
+                } else if (prefix.isBlank()) {
+                    ""
+                } else {
+                    return null
+                }
+
+        val normalizedSubpath = subpath.replace('\\', '/').trim('/', '\\')
+        val cacheName =
+            if (normalizedSubpath.isEmpty()) {
+                filename
+            } else {
+                "$normalizedSubpath/$filename"
+            }.trimStart('/')
+
+        if (cacheName.isBlank() || cacheName.contains("..")) return null
+        return cacheName
+    }
+
+    private data class FileChanges(
+        val filesDeleted: List<UserFileInfo>,
+        val filesModified: List<UserFileInfo>,
+        val filesCreated: List<UserFileInfo>,
+    )
+
+    private data class RemotePath(
+        val root: PathType,
+        val path: String,
+    )
+
+    private data class CloudPathRouting(
+        val localRootByCloudToken: Map<String, String>,
+        val localPathByCloudPrefix: Map<String, String>,
+    )
+
+    data class CloudFileInfo(
+        val filename: String,
+        val shaFile: ByteArray,
+        val timestamp: Long,
+        val rawFileSize: Long,
+        val persistState: Int,
+        val pathPrefixIndex: Int,
+        val machineNameIndex: Int,
+    ) {
+        /** True for a live file (persistState 0); false for forgotten/deleted. */
+        val isPersisted: Boolean get() = persistState == PERSIST_STATE_PERSISTED
+    }
+
+    data class CloudFileChangeList(
+        val currentChangeNumber: Long,
+        val pathPrefixes: List<String>,
+        val machineNames: List<String>,
+        val files: List<CloudFileInfo>,
+    ) {
+        val isOnlyDelta: Boolean = false
+    }
+
+    private fun hexToBytes(hex: String): ByteArray {
+        if (hex.isEmpty()) return ByteArray(0)
+        if (hex.length % 2 != 0 || !hex.all { it in '0'..'9' || it in 'a'..'f' || it in 'A'..'F' }) {
+            Timber.w("hexToBytes: malformed input (len=%d, sample='%s') — returning empty array",
+                hex.length, hex.take(16))
+            return ByteArray(0)
+        }
+        return ByteArray(hex.length / 2) { i ->
+            ((Character.digit(hex[i * 2], 16) shl 4) + Character.digit(hex[i * 2 + 1], 16)).toByte()
+        }
+    }
+
+    fun parseCloudFileChangeList(json: String): CloudFileChangeList {
+        val obj = JSONObject(json)
+        val prefixes =
+            obj.optJSONArray("pathPrefixes")?.let { arr ->
+                List(arr.length()) { arr.getString(it) }
+            } ?: emptyList()
+        val machineNames =
+            obj.optJSONArray("machineNames")?.let { arr ->
+                List(arr.length()) { arr.getString(it) }
+            } ?: emptyList()
+        val filesArr = obj.optJSONArray("files")
+        val files =
+            if (filesArr == null) {
+                emptyList()
+            } else {
+                List(filesArr.length()) { i ->
+                    val f = filesArr.getJSONObject(i)
+                    CloudFileInfo(
+                        filename = f.optString("fileName"),
+                        shaFile = hexToBytes(f.optString("sha")),
+                        timestamp = f.optLong("timestamp", 0L) * 1000L,
+                        rawFileSize = f.optLong("size", 0L),
+                        persistState = f.optInt("persistState", 0),
+                        pathPrefixIndex = f.optInt("pathPrefixIndex", 0),
+                        machineNameIndex = f.optInt("machineNameIndex", 0),
+                    )
+                }
+            }
+        return CloudFileChangeList(
+            currentChangeNumber = obj.optLong("currentChangeNumber", 0L),
+            pathPrefixes = prefixes,
+            machineNames = machineNames,
+            files = files,
+        )
+    }
+
+    private fun findPlaceholderWithin(aString: String): Sequence<MatchResult> = Regex("%\\w+%").findAll(aString)
+
+    private fun cloudToken(root: PathType): String = "%${root.name}%"
+
+    private fun substituteSteamIds(value: String): String =
+        value
+            .replace("{64BitSteamID}", SteamUtils.getSteamId64().toString())
+            .replace("{Steam3AccountID}", SteamUtils.getSteam3AccountId().toString())
+
+    private fun buildCloudPathRouting(
+        appInfo: SteamApp,
+        prefixToPath: (String) -> String,
+    ): CloudPathRouting {
+        val rootAliases =
+            appInfo.ufs.saveFilePatterns
+                .filter { it.uploadRoot != it.root }
+                .associate { cloudToken(it.uploadRoot) to it.root.name }
+
+        val exactPrefixTargets =
+            appInfo.ufs.saveFilePatterns
+                .filter { it.uploadPath != it.path }
+                .associate { pattern ->
+                    val cloudPrefix = substituteSteamIds("${cloudToken(pattern.uploadRoot)}${pattern.uploadPath}").trimEnd('/', '\\')
+                    cloudPrefix to Paths.get(prefixToPath(pattern.root.name), pattern.substitutedPath).pathString
+                }
+
+        return CloudPathRouting(rootAliases, exactPrefixTargets)
+    }
+
+    // ── Canonical cloud-file → local-path resolution (single source of truth for all consumers) ──
+
+    private fun pathTypePairsFor(
+        fileList: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        cloudRouting: CloudPathRouting,
+    ): List<Pair<String, String>> =
+        fileList.pathPrefixes
+            .map { prefix ->
+                var matchResults = findPlaceholderWithin(prefix).map { it.value }.toList()
+                val bare = if (prefix.startsWith("ROOT_MOD")) listOf("ROOT_MOD") else emptyList()
+                if (matchResults.isEmpty()) {
+                    matchResults = List(1) { PathType.DEFAULT.name }
+                }
+                matchResults + bare
+            }.flatten()
+            .distinct()
+            .map { placeholder ->
+                val localRootName = cloudRouting.localRootByCloudToken[placeholder] ?: placeholder
+                val root = PathType.from(localRootName)
+                val effectiveLocalRoot = if (root.isSupportedSteamCloudRoot) localRootName else PathType.DEFAULT.name
+                if (!root.isSupportedSteamCloudRoot) {
+                    Timber.w(
+                        "Unrecognized Steam cloud root '%s' in prefix mapping — defaulting to %s so files still resolve",
+                        placeholder,
+                        PathType.DEFAULT.name,
+                    )
+                }
+                placeholder to prefixToPath(effectiveLocalRoot)
+            }
+
+    private fun parseRemotePath(prefix: String): RemotePath {
+        val steamUserDataSubpath = steamUserDataSubpath(prefix)
+        if (steamUserDataSubpath != null) {
+            return RemotePath(PathType.SteamUserData, steamUserDataSubpath)
+        }
+        val token =
+            when {
+                prefix.startsWith("ROOT_MOD", ignoreCase = true) -> "ROOT_MOD"
+                else -> findPlaceholderWithin(prefix).firstOrNull()?.value
+            }
+        val root = token?.let { PathType.from(it) } ?: PathType.DEFAULT
+        val withoutRoot =
+            when {
+                token == null -> prefix
+                prefix.startsWith("ROOT_MOD", ignoreCase = true) -> prefix.substring("ROOT_MOD".length)
+                else -> prefix.removePrefix(token)
+            }.trimStart('/', '\\')
+        return RemotePath(root, if (withoutRoot == ".") "" else withoutRoot)
+    }
+
+    private fun convertPrefixes(
+        fileList: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        cloudRouting: CloudPathRouting,
+    ): List<String> {
+        val pathTypePairs = pathTypePairsFor(fileList, prefixToPath, cloudRouting)
+        return fileList.pathPrefixes.map { prefix ->
+            steamUserDataSubpath(prefix)?.let { subpath ->
+                return@map if (subpath.isEmpty()) {
+                    prefixToPath(PathType.SteamUserData.name)
+                } else {
+                    Paths.get(prefixToPath(PathType.SteamUserData.name), subpath).toString()
+                }
+            }
+
+            var modified = prefix
+            val prefixContainsNoPlaceholder = findPlaceholderWithin(prefix).none()
+            if (prefixContainsNoPlaceholder) {
+                modified = Paths.get(PathType.DEFAULT.name, prefix).pathString
+            }
+            pathTypePairs.forEach {
+                modified = modified.replace(it.first, it.second)
+            }
+            if (modified == prefix) {
+                modified = Paths.get(prefixToPath(PathType.DEFAULT.name), modified).toString()
+            }
+            modified
+        }
+    }
+
+    /** Resolve a cloud file to the absolute local path the downloader writes to (the canonical mapping). */
+    private fun resolveCloudFileLocalPath(
+        file: CloudFileInfo,
+        fileList: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        cloudRouting: CloudPathRouting?,
+    ): Path? {
+        val routing = cloudRouting ?: CloudPathRouting(emptyMap(), emptyMap())
+
+        // Steam sometimes embeds the %GameInstall% token in the filename with an empty prefix; route it like the downloader.
+        val gameInstallPrefix = "%${PathType.GameInstall.name}%"
+        if (file.filename.startsWith(gameInstallPrefix)) {
+            val stripped = file.filename.removePrefix(gameInstallPrefix).trimStart('/', '\\')
+            return runCatching {
+                routing.localPathByCloudPrefix[gameInstallPrefix]?.let { Paths.get(it, stripped) }
+                    ?: Paths.get(prefixToPath(PathType.GameInstall.name), stripped)
+            }.getOrNull()
+        }
+
+        val defaultConvertedPrefixes = convertPrefixes(fileList, prefixToPath, routing)
+        val convertedPrefixes =
+            fileList.pathPrefixes.mapIndexed { index, prefix ->
+                routing.localPathByCloudPrefix[prefix.trimEnd('/')]
+                    ?: defaultConvertedPrefixes.getOrElse(index) { prefixToPath(PathType.DEFAULT.name) }
+            }
+
+        return runCatching {
+            if (file.pathPrefixIndex in fileList.pathPrefixes.indices) {
+                Paths.get(convertedPrefixes[file.pathPrefixIndex], file.filename)
+            } else {
+                // No referenced prefix → default path.
+                Paths.get(prefixToPath(PathType.DEFAULT.name), file.filename)
+            }
+        }.getOrNull()
+    }
+
+    /** A persisted cloud file mapped to where it lives locally, plus the name used to download it. */
+    data class CloudFileTarget(
+        val downloadName: String,
+        val localPath: Path,
+    )
+
+    /** Resolve every persisted cloud file to its local path via the downloader's canonical mapping. Pure, side-effect-free — used to enumerate cloud state without touching the live save dir. */
+    fun resolvePersistedCloudFiles(
+        appInfo: SteamApp,
+        fileList: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+    ): List<CloudFileTarget> {
+        val routing = buildCloudPathRouting(appInfo, prefixToPath)
+        return fileList.files
+            .filter { it.isPersisted }
+            .mapNotNull { file ->
+                val local = resolveCloudFileLocalPath(file, fileList, prefixToPath, routing) ?: return@mapNotNull null
+                val prefix = fileList.pathPrefixes.getOrNull(file.pathPrefixIndex) ?: ""
+                CloudFileTarget(
+                    downloadName = Paths.get(prefix, file.filename).toString(),
+                    localPath = local,
+                )
+            }
+    }
+
+    private fun uploadNameFor(
+        file: UserFileInfo,
+        hasUfsPatterns: Boolean,
+    ): String =
+        if (file.root == PathType.SteamUserData || !hasUfsPatterns) {
+            file.path + file.filename
+        } else {
+            file.prefixPath
+        }
+
+    private fun isCloudCandidateWithinLimit(
+        path: Path,
+        scanName: String,
+    ): Boolean {
+        val size =
+            try {
+                Files.size(path)
+            } catch (_: Exception) {
+                return false
+            }
+
+        if (size <= MAX_CLOUD_FILE_SIZE_BYTES) return true
+
+        Timber.w(
+            "Skipping oversize file in %s: %s (%d bytes > %d)",
+            scanName,
+            path,
+            size,
+            MAX_CLOUD_FILE_SIZE_BYTES,
+        )
+        return false
+    }
+
+    private fun scanCloudCandidates(
+        basePath: Path,
+        pattern: String,
+        maxDepth: Int,
+        scanName: String,
+    ): List<Path> =
+        FileUtils
+            .findFilesRecursive(
+                rootPath = basePath,
+                pattern = pattern,
+                maxDepth = maxDepth,
+            ).use { stream ->
+                stream
+                    .filter { isCloudCandidateWithinLimit(it, scanName) }
+                    .collect(Collectors.toList())
+            }
+
+    private fun pathToUserFile(
+        root: PathType,
+        basePath: Path,
+        pathPrefix: String,
+        file: Path,
+        cloudRoot: PathType = root,
+        cloudPath: String = pathPrefix,
+    ): UserFileInfo {
+        val sha = streamingSha(file)
+        val relativePath = basePath.relativize(file).pathString
+
+        Timber.i("Found ${file.pathString}\n\tin %${root.name}%$pathPrefix\n\twith sha [${sha.joinToString(", ")}]")
+
+        return UserFileInfo(
+            root,
+            pathPrefix,
+            relativePath,
+            Files.getLastModifiedTime(file).toMillis(),
+            sha,
+            cloudRoot,
+            cloudPath,
+        )
+    }
+
+    private fun collectUfsPatternFiles(
+        savePattern: SaveFilePattern,
+        prefixToPath: (String) -> String,
+    ): Pair<String, List<UserFileInfo>> {
+        val basePath = Paths.get(prefixToPath(savePattern.root.toString()), savePattern.substitutedPath)
+
+        Timber.i("Looking for saves in $basePath with pattern ${savePattern.pattern} (prefix ${savePattern.prefix})")
+
+        val files =
+            scanCloudCandidates(
+                basePath = basePath,
+                pattern = savePattern.pattern,
+                maxDepth = if (savePattern.recursive != 0) -1 else 0,
+                scanName = "UFS scan",
+            ).map { file ->
+                pathToUserFile(
+                    root = savePattern.root,
+                    basePath = basePath,
+                    pathPrefix = savePattern.substitutedPath,
+                    file = file,
+                    cloudRoot = savePattern.uploadRoot,
+                    cloudPath = savePattern.uploadPath,
+                )
+            }
+
+        Timber.i("Found ${files.size} file(s) in $basePath for pattern ${savePattern.pattern}")
+
+        return Paths.get(savePattern.prefix).pathString to files
+    }
+
+    private fun collectSteamUserDataFiles(prefixToPath: (String) -> String): Pair<String, List<UserFileInfo>> {
+        val rootType = PathType.SteamUserData
+        val basePath = Paths.get(prefixToPath(rootType.toString()))
+
+        Timber.i("Scanning $basePath recursively (depth 5) under ${rootType.name}")
+
+        val files =
+            scanCloudCandidates(
+                basePath = basePath,
+                pattern = "*",
+                maxDepth = 5,
+                scanName = "SteamUserData scan",
+            ).map { file ->
+                pathToUserFile(
+                    root = rootType,
+                    basePath = basePath,
+                    pathPrefix = "",
+                    file = file,
+                )
+            }
+
+        Timber.i("Found ${files.size} file(s) in $basePath for SteamUserData scan")
+
+        return Paths.get("%${rootType.name}%").pathString to files
+    }
+
+    /**
+     * Stream a SHA-1 hash without loading the whole file into memory. Saves can be up
+     * to 100 MB each and we hash every save twice per sync; readAllBytes blew up on
+     * low-RAM Android devices.
+     */
+    private fun streamingSha(path: Path): ByteArray {
+        val digest = MessageDigest.getInstance("SHA-1")
+        Files.newInputStream(path).use { input ->
+            val buf = ByteArray(64 * 1024)
+            while (true) {
+                val n = input.read(buf)
+                if (n < 0) break
+                if (n > 0) digest.update(buf, 0, n)
+            }
+        }
+        return digest.digest()
+    }
+
+    private fun ByteArray.toLowerHex(): String = joinToString("") { "%02x".format(it.toInt() and 0xFF) }
+
+    private fun vdfEscape(value: String): String =
+        value
+            .replace("\\", "\\\\")
+            .replace("\"", "\\\"")
+            .replace("\n", "\\n")
+            .replace("\r", "\\r")
+
+    private fun writeSteamRemoteCacheVdf(
+        appInfo: SteamApp,
+        response: CloudFileChangeList,
+        prefixToPath: (String) -> String,
+        cloudRouting: CloudPathRouting?,
+    ) {
+        val steamUserDataRemoteRoot =
+            runCatching {
+                Paths.get(prefixToPath(PathType.SteamUserData.name)).toAbsolutePath().normalize()
+            }.getOrNull() ?: return
+        val appUserDataDir = steamUserDataRemoteRoot.parent ?: return
+
+        val entries =
+            response.files
+                .asSequence()
+                .filter { it.persistState == PERSIST_STATE_PERSISTED }
+                .mapNotNull { cloudFile ->
+                    val cacheName = steamUserDataCacheName(cloudFile, response) ?: return@mapNotNull null
+                    val localPath =
+                        resolveLocalPathForCloudFile(cloudFile, response, prefixToPath, cloudRouting)
+                            ?.toAbsolutePath()
+                            ?.normalize()
+                            ?: return@mapNotNull null
+                    if (!localPath.startsWith(steamUserDataRemoteRoot) || !Files.exists(localPath)) {
+                        return@mapNotNull null
+                    }
+                    val size = runCatching { Files.size(localPath) }.getOrNull() ?: return@mapNotNull null
+                    val timestampSeconds =
+                        if (cloudFile.timestamp > 0L) {
+                            cloudFile.timestamp / 1000L
+                        } else {
+                            runCatching { Files.getLastModifiedTime(localPath).toMillis() / 1000L }
+                                .getOrDefault(0L)
+                        }
+                    val sha =
+                        if (cloudFile.shaFile.isNotEmpty()) {
+                            cloudFile.shaFile.toLowerHex()
+                        } else {
+                            runCatching { streamingSha(localPath).toLowerHex() }.getOrDefault("")
+                        }
+                    RemoteCacheEntry(cacheName, size, timestampSeconds, sha)
+                }
+                .toList()
+
+        if (entries.isEmpty()) return
+
+        writeSteamRemoteCacheVdfEntries(appInfo.id, response.currentChangeNumber, appUserDataDir, entries)
+    }
+
+    private data class RemoteCacheEntry(
+        val name: String,
+        val size: Long,
+        val timestampSeconds: Long,
+        val sha: String,
+    )
+
+    private fun writeSteamRemoteCacheVdfFromLocalFiles(
+        appInfo: SteamApp,
+        changeNumber: Long,
+        userFiles: List<UserFileInfo>,
+        prefixToPath: (String) -> String,
+    ) {
+        val steamUserDataRemoteRoot =
+            runCatching {
+                Paths.get(prefixToPath(PathType.SteamUserData.name)).toAbsolutePath().normalize()
+            }.getOrNull() ?: return
+        val appUserDataDir = steamUserDataRemoteRoot.parent ?: return
+
+        val entries =
+            userFiles
+                .asSequence()
+                .filter { it.cloudRoot == PathType.SteamUserData }
+                .mapNotNull { file ->
+                    val localPath =
+                        runCatching { file.getAbsPath(prefixToPath).toAbsolutePath().normalize() }
+                            .getOrNull()
+                            ?: return@mapNotNull null
+                    if (!localPath.startsWith(steamUserDataRemoteRoot) || !Files.exists(localPath)) {
+                        return@mapNotNull null
+                    }
+                    val cloudSubdir =
+                        file.cloudPath
+                            .takeUnless { it.isBlank() || it == "." }
+                            ?.replace('\\', '/')
+                            ?.trim('/', '\\')
+                            .orEmpty()
+                    val cacheName =
+                        if (cloudSubdir.isEmpty()) {
+                            file.filename
+                        } else {
+                            "$cloudSubdir/${file.filename}"
+                        }.replace('\\', '/').trimStart('/')
+                    if (cacheName.isBlank() || cacheName.contains("..")) return@mapNotNull null
+                    val size = runCatching { Files.size(localPath) }.getOrNull() ?: return@mapNotNull null
+                    RemoteCacheEntry(
+                        name = cacheName,
+                        size = size,
+                        timestampSeconds = file.timestamp / 1000L,
+                        sha = file.sha.toLowerHex(),
+                    )
+                }
+                .toList()
+
+        if (entries.isEmpty()) return
+
+        writeSteamRemoteCacheVdfEntries(appInfo.id, changeNumber, appUserDataDir, entries)
+    }
+
+    private fun writeSteamRemoteCacheVdfEntries(
+        appId: Int,
+        changeNumber: Long,
+        appUserDataDir: Path,
+        entries: List<RemoteCacheEntry>,
+    ) {
+        val content =
+            buildString {
+                append('"').append(appId).append('"').append('\n')
+                append("{\n")
+                append("\t\"ChangeNumber\"\t\t\"").append(changeNumber).append("\"\n")
+                append("\t\"OSType\"\t\t\"0\"\n")
+                entries.forEach { entry ->
+                    append("\t\"").append(vdfEscape(entry.name)).append("\"\n")
+                    append("\t{\n")
+                    append("\t\t\"root\"\t\t\"0\"\n")
+                    append("\t\t\"size\"\t\t\"").append(entry.size).append("\"\n")
+                    append("\t\t\"localtime\"\t\t\"").append(entry.timestampSeconds).append("\"\n")
+                    append("\t\t\"time\"\t\t\"").append(entry.timestampSeconds).append("\"\n")
+                    append("\t\t\"remotetime\"\t\t\"").append(entry.timestampSeconds).append("\"\n")
+                    append("\t\t\"sha\"\t\t\"").append(entry.sha).append("\"\n")
+                    append("\t\t\"syncstate\"\t\t\"1\"\n")
+                    append("\t\t\"persiststate\"\t\t\"0\"\n")
+                    append("\t\t\"platformstosync2\"\t\t\"-1\"\n")
+                    append("\t}\n")
+                }
+                append("}\n")
+            }
+
+        val remoteCacheFile = appUserDataDir.resolve("remotecache.vdf")
+        val tmp = appUserDataDir.resolve("remotecache.vdf.tmp")
+        runCatching {
+            Files.createDirectories(appUserDataDir)
+            Files.write(tmp, content.toByteArray(Charsets.UTF_8))
+            try {
+                Files.move(tmp, remoteCacheFile, StandardCopyOption.ATOMIC_MOVE)
+            } catch (_: Exception) {
+                Files.move(tmp, remoteCacheFile, StandardCopyOption.REPLACE_EXISTING)
+            }
+            Timber.i(
+                "Wrote Steam remotecache.vdf for app $appId: ${entries.size} file(s) at $remoteCacheFile",
+            )
+        }.onFailure { e ->
+            runCatching { Files.deleteIfExists(tmp) }
+            Timber.w(e, "Failed writing Steam remotecache.vdf for app $appId")
+        }
+    }
+
+    fun syncUserFiles(
+        appInfo: SteamApp,
+        clientId: Long,
+        steamInstance: SteamService,
+        preferredSave: SaveLocation = SaveLocation.None,
+        parentScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
+        prefixToPath: (String) -> String,
+        overrideLocalChangeNumber: Long? = null,
+        onProgress: ((message: String, progress: Float) -> Unit)? = null,
+    ): Deferred<PostSyncInfo?> =
+        parentScope.async {
+            val postSyncInfo: PostSyncInfo?
+
+            Timber.i("Retrieving save files of ${appInfo.name}")
+
+            val cloudRouting = buildCloudPathRouting(appInfo, prefixToPath)
+
+            val getFilePrefix: (CloudFileInfo, CloudFileChangeList) -> String = { file, fileList ->
+                if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
+                    Paths.get(fileList.pathPrefixes[file.pathPrefixIndex]).pathString
+                } else {
+                    ""
+                }
+            }
+
+            val getFileRemotePath: (CloudFileInfo, CloudFileChangeList) -> RemotePath = { file, fileList ->
+                if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
+                    parseRemotePath(fileList.pathPrefixes[file.pathPrefixIndex])
+                } else if (file.filename.startsWith("%${PathType.GameInstall.name}%")) {
+                    RemotePath(PathType.GameInstall, "")
+                } else {
+                    RemotePath(PathType.DEFAULT, "")
+                }
+            }
+
+            val getFilePrefixPath: (CloudFileInfo, CloudFileChangeList) -> String = { file, fileList ->
+                Paths.get(getFilePrefix(file, fileList), file.filename).pathString
+            }
+
+            val getFullFilePath: (CloudFileInfo, CloudFileChangeList) -> Path? = { file, fileList ->
+                val remotePath = getFileRemotePath(file, fileList)
+                if (!remotePath.root.isSupportedSteamCloudRoot) {
+                    Timber.w(
+                        "Unrecognized Steam cloud file root %s: %s — resolving via canonical path mapping",
+                        remotePath.root,
+                        getFilePrefixPath(file, fileList),
+                    )
+                }
+                // Single source of truth — identical to the conflict check / remotecache writer.
+                resolveCloudFileLocalPath(file, fileList, prefixToPath, cloudRouting)
+            }
+
+            val getDownloadSafetyRoot: (CloudFileInfo, CloudFileChangeList) -> Path = { file, fileList ->
+                val gameInstallPrefix = "%${PathType.GameInstall.name}%"
+                if (file.filename.startsWith(gameInstallPrefix)) {
+                    val mapped = cloudRouting.localPathByCloudPrefix[gameInstallPrefix]
+                    Paths.get(mapped ?: prefixToPath(PathType.GameInstall.name))
+                } else if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
+                    val prefix = fileList.pathPrefixes[file.pathPrefixIndex]
+                    val mapped = cloudRouting.localPathByCloudPrefix[prefix.trimEnd('/', '\\')]
+                    Paths.get(mapped ?: convertPrefixes(fileList, prefixToPath, cloudRouting)[file.pathPrefixIndex])
+                } else {
+                    Paths.get(prefixToPath(PathType.DEFAULT.name))
+                }
+            }
+
+            val getFilesDiff: (List<UserFileInfo>, List<UserFileInfo>) -> Pair<Boolean, FileChanges> = { currentFiles, oldFiles ->
+                val oldByPath = oldFiles.associateBy { it.prefixPath }
+                val currentByPath = currentFiles.associateBy { it.prefixPath }
+
+                val newFiles = currentFiles.filter { it.prefixPath !in oldByPath }
+                val deletedFiles = oldFiles.filter { it.prefixPath !in currentByPath }
+                val modifiedFiles =
+                    currentFiles.mapNotNull { current ->
+                        val old = oldByPath[current.prefixPath] ?: return@mapNotNull null
+                        Timber.i("Comparing SHA of ${old.prefixPath} and ${current.prefixPath}")
+                        Timber.i("[${old.sha.joinToString(", ")}]\n[${current.sha.joinToString(", ")}]")
+                        current.takeUnless { old.sha.contentEquals(current.sha) }
+                    }
+
+                val changesExist = newFiles.isNotEmpty() || deletedFiles.isNotEmpty() || modifiedFiles.isNotEmpty()
+
+                changesExist to FileChanges(deletedFiles, modifiedFiles, newFiles)
+            }
+
+            // Post-download verification: each resolved local path must match ANY of its cloud variants.
+            val hasHashConflicts: (Map<String, List<UserFileInfo>>, CloudFileChangeList) -> Boolean =
+                { _, fileList ->
+                    groupPersistedCloudFilesByLocalPath(fileList, prefixToPath, cloudRouting)
+                        .any { (localPath, variants) -> !localMatchesAnyVariant(localPath, variants) }
+                }
+
+            val getLocalUserFilesAsPrefixMap: () -> Map<String, List<UserFileInfo>> = {
+                val result = mutableMapOf<String, MutableList<UserFileInfo>>()
+
+                appInfo.ufs.saveFilePatterns
+                    .asSequence()
+                    .filter { it.root.isWindows }
+                    .filter { it.root != PathType.SteamUserData }
+                    .map { collectUfsPatternFiles(it, prefixToPath) }
+                    .forEach { (prefixKey, files) ->
+                        result.getOrPut(prefixKey) { mutableListOf() }.addAll(files)
+                    }
+
+                val (userDataPrefix, userDataFiles) = collectSteamUserDataFiles(prefixToPath)
+                if (userDataFiles.isNotEmpty()) {
+                    result.getOrPut(userDataPrefix) { mutableListOf() }.addAll(userDataFiles)
+                }
+
+                result
+            }
+
+            val fileChangeListToUserFiles: (CloudFileChangeList, Boolean) -> List<UserFileInfo> = { appFileListChange, includeDeleted ->
+                appFileListChange.files
+                    .filter {
+                        if (includeDeleted) {
+                            it.persistState == PERSIST_STATE_DELETED
+                        } else {
+                            it.persistState == PERSIST_STATE_PERSISTED
+                        }
+                    }.mapNotNull {
+                        val remotePath = getFileRemotePath(it, appFileListChange)
+                        if (!remotePath.root.isSupportedSteamCloudRoot) {
+                            Timber.w(
+                                "Including baseline cloud file with unrecognized root %s: %s",
+                                remotePath.root,
+                                it.filename,
+                            )
+                        }
+                        val gameInstallPrefix = "%${PathType.GameInstall.name}%"
+                        val filename =
+                            if (remotePath.root == PathType.GameInstall && it.filename.startsWith(gameInstallPrefix)) {
+                                it.filename.removePrefix(gameInstallPrefix)
+                            } else {
+                                it.filename
+                            }
+                        UserFileInfo(
+                            root = remotePath.root,
+                            path = remotePath.path,
+                            filename = filename,
+                            timestamp = it.timestamp,
+                            sha = it.shaFile,
+                        )
+                    }
+            }
+
+            val downloadFiles: (CloudFileChangeList, CoroutineScope) -> Deferred<UserFilesDownloadResult> = { fileList, parentScope ->
+                parentScope.async {
+                    var filesDownloaded = 0
+                    var bytesDownloaded = 0L
+                    // Download each unique local path once, trying each cloud variant until one fetches; count unique paths written.
+                    val groups = groupPersistedCloudFilesByLocalPath(fileList, prefixToPath, cloudRouting)
+                    val totalFiles = groups.size
+
+                    groups.forEach { (targetPath, variants) ->
+                        var wrote = false
+                        for (file in variants) {
+                            if (wrote) break
+                            val prefixedPath = getFilePrefixPath(file, fileList)
+                            val rootBase =
+                                getDownloadSafetyRoot(file, fileList)
+                                    .toAbsolutePath()
+                                    .normalize()
+                            if (!targetPath.startsWith(rootBase)) {
+                                Timber.e(
+                                    "Refusing path-traversal target outside save root: %s (root=%s, prefixedPath=%s)",
+                                    targetPath,
+                                    rootBase,
+                                    prefixedPath,
+                                )
+                                continue
+                            }
+
+                            onProgress?.invoke("Downloading ${file.filename}", -1f)
+                            val wnBytes =
+                                SteamService.withWnSession {
+                                    it.downloadCloudFile(appInfo.id, prefixedPath)
+                                }
+                            if (wnBytes == null) {
+                                Timber.w(
+                                    "Cloud download failed for ${file.filename} ($prefixedPath); trying next variant",
+                                )
+                                continue
+                            }
+
+                            val tmpPath =
+                                targetPath.resolveSibling(
+                                    targetPath.fileName.toString() + DOWNLOAD_TMP_SUFFIX,
+                                )
+                            try {
+                                targetPath.parent?.let { Files.createDirectories(it) }
+                                Files.deleteIfExists(tmpPath)
+                                FileOutputStream(tmpPath.toString()).use { fs ->
+                                    fs.write(wnBytes)
+                                    try {
+                                        fs.fd.sync()
+                                    } catch (e: Exception) {
+                                        // MD-3: failed fsync = bytes maybe not durable; abort so a non-durable save isn't committed or counted (sync reports a download failure and retries next launch).
+                                        Timber.w(e, "fsync failed for %s; treating as a download failure", tmpPath)
+                                        throw e
+                                    }
+                                }
+                                try {
+                                    Files.move(tmpPath, targetPath, StandardCopyOption.ATOMIC_MOVE)
+                                } catch (_: Exception) {
+                                    Files.move(tmpPath, targetPath, StandardCopyOption.REPLACE_EXISTING)
+                                }
+                                try {
+                                    val mtimeMs = if (file.timestamp > 0) file.timestamp else 0L
+                                    java.nio.file.Files.setLastModifiedTime(
+                                        targetPath,
+                                        java.nio.file.attribute.FileTime.fromMillis(mtimeMs),
+                                    )
+                                } catch (e: Exception) {
+                                    Timber.d(e, "cloud download: failed to set mtime for ${file.filename}")
+                                }
+                                filesDownloaded++
+                                bytesDownloaded += wnBytes.size.toLong()
+                                wrote = true
+                                onProgress?.invoke("Downloading ${file.filename}", 1f)
+                                Timber.i(
+                                    "cloud restore via wn-steam-client: ${file.filename} (${wnBytes.size} bytes) -> $targetPath",
+                                )
+                            } catch (e: Exception) {
+                                Timber.w(e, "Could not write $targetPath; preserving existing local file")
+                                try {
+                                    Files.deleteIfExists(tmpPath)
+                                } catch (_: Exception) {
+                                    // best-effort
+                                }
+                            }
+                        }
+                        if (!wrote) {
+                            Timber.w("No cloud variant could be downloaded for %s; preserving existing local file", targetPath)
+                        }
+                    }
+
+                    if (totalFiles > 0) {
+                        onProgress?.invoke("Download complete", 1.0f)
+                    }
+
+                    UserFilesDownloadResult(filesDownloaded, bytesDownloaded)
+                }
+            }
+
+            val uploadFiles: (FileChanges, List<UserFileInfo>, CoroutineScope) -> Deferred<UserFilesUploadResult> = { fileChanges, managedFiles, parentScope ->
+                parentScope.async {
+                    val hasUfsPatterns = appInfo.ufs.saveFilePatterns.isNotEmpty()
+                    val cloudUploadName: (UserFileInfo) -> String = { uploadNameFor(it, hasUfsPatterns) }
+
+                    val filesToDelete = fileChanges.filesDeleted.map(cloudUploadName)
+
+                    val filesToUpload =
+                        fileChanges.filesCreated
+                            .union(fileChanges.filesModified)
+                            .map { cloudUploadName(it) to it }
+                            .filter { Files.exists(it.second.getAbsPath(prefixToPath)) }
+
+                    val totalFiles = filesToUpload.size
+                    val finalFileCount = managedFiles.size
+
+                    // Guard against an empty/transient local scan wiping the whole cloud copy.
+                    if (filesToUpload.isEmpty() && filesToDelete.isNotEmpty() && managedFiles.isEmpty()) {
+                        Timber.e(
+                            "Refusing to delete all ${filesToDelete.size} cloud file(s) for ${appInfo.id}: " +
+                                "no local save files found; preserving cloud saves",
+                        )
+                        return@async UserFilesUploadResult(false, 0, 0, 0)
+                    }
+
+                    if (appInfo.ufs.maxNumFiles > 0 && finalFileCount > appInfo.ufs.maxNumFiles) {
+                        Timber.e(
+                            "Steam cloud upload would exceed file count quota for ${appInfo.id}: " +
+                                "$finalFileCount > ${appInfo.ufs.maxNumFiles}",
+                        )
+                        return@async UserFilesUploadResult(false, 0, 0, 0)
+                    }
+
+                    var totalManagedBytes = 0L
+                    for (file in managedFiles) {
+                        val absPath = file.getAbsPath(prefixToPath)
+                        if (!Files.exists(absPath)) continue
+                        val size = Files.size(absPath)
+                        if (size > MAX_CLOUD_FILE_SIZE_BYTES) {
+                            Timber.e(
+                                "Steam cloud upload would exceed per-file limit for ${file.prefixPath}: " +
+                                    "$size > $MAX_CLOUD_FILE_SIZE_BYTES",
+                            )
+                            return@async UserFilesUploadResult(false, 0, 0, 0)
+                        }
+                        totalManagedBytes += size
+                    }
+
+                    if (appInfo.ufs.quota > 0 && totalManagedBytes > appInfo.ufs.quota.toLong()) {
+                        Timber.e(
+                            "Steam cloud upload would exceed byte quota for ${appInfo.id}: " +
+                                "$totalManagedBytes > ${appInfo.ufs.quota}",
+                        )
+                        return@async UserFilesUploadResult(false, 0, 0, 0)
+                    }
+
+                    Timber.i(
+                        "Beginning app upload batch with ${filesToDelete.size} file(s) to delete " +
+                            "and ${filesToUpload.size} file(s) to upload",
+                    )
+
+                    val wnUploadResult =
+                        SteamService.withWnSession { session ->
+                            val batch =
+                                session.beginCloudUploadBatch(
+                                    appInfo.id,
+                                    filesToUpload.map { it.first },
+                                    filesToDelete,
+                                    clientId,
+                                ) ?: return@withWnSession null
+                            var allOk = true
+                            var uploaded = 0
+                            var bytes = 0L
+                            val skippedFiles = mutableListOf<String>()
+                            filesToUpload.forEach { (cloudName, file) ->
+                                val absPath = file.getAbsPath(prefixToPath)
+                                // MD-4: refuse to load an oversize save into memory — guard so one big file can't OOM the whole upload.
+                                val fileSize = runCatching { Files.size(absPath) }.getOrDefault(-1L)
+                                if (fileSize > MAX_CLOUD_FILE_SIZE_BYTES) {
+                                    Timber.e(
+                                        "wn cloud upload: %s is too large to upload (%d > %d bytes); skipping",
+                                        file.prefixPath,
+                                        fileSize,
+                                        MAX_CLOUD_FILE_SIZE_BYTES,
+                                    )
+                                    skippedFiles += file.filename
+                                    allOk = false
+                                    return@forEach
+                                }
+                                val data =
+                                    try {
+                                        Files.readAllBytes(absPath)
+                                    } catch (e: Throwable) {
+                                        // MD-4: catch Throwable so an OOM reading one large file degrades to a skipped file instead of aborting the whole sync.
+                                        Timber.e(e, "wn cloud upload: cannot read ${file.prefixPath}; skipping")
+                                        skippedFiles += file.filename
+                                        allOk = false
+                                        return@forEach
+                                    }
+                                onProgress?.invoke("Uploading ${file.filename}", 0f)
+                                val shaHex = file.sha.joinToString("") { "%02x".format(it) }
+                                val ok =
+                                    session.uploadCloudFile(
+                                        appInfo.id,
+                                        cloudName,
+                                        data,
+                                        shaHex,
+                                        file.timestamp / 1000L, // millis → unix seconds
+                                        batch.batchId,
+                                    )
+                                if (ok) {
+                                    uploaded++
+                                    bytes += data.size.toLong()
+                                    onProgress?.invoke("Uploading ${file.filename}", 1f)
+                                } else {
+                                    allOk = false
+                                }
+                            }
+                            if (skippedFiles.isNotEmpty()) {
+                                Timber.e(
+                                    "wn cloud upload: %d file(s) skipped and NOT uploaded: %s",
+                                    skippedFiles.size,
+                                    skippedFiles.joinToString(", "),
+                                )
+                            }
+                            val completed =
+                                session.completeCloudUploadBatch(
+                                    appInfo.id,
+                                    batch.batchId,
+                                    if (allOk) 1 else 2, // 1 = EResult.OK, 2 = Fail
+                                )
+                            Timber.i(
+                                "cloud upload via wn-steam-client: batch=${batch.batchId} " +
+                                    "uploaded=$uploaded/${filesToUpload.size} ok=$allOk completed=$completed",
+                            )
+                            UserFilesUploadResult(allOk && completed, batch.appChangeNumber, uploaded, bytes)
+                        }
+
+                    if (wnUploadResult != null) {
+                        if (totalFiles > 0) {
+                            onProgress?.invoke("Upload complete", 1.0f)
+                        }
+                        return@async wnUploadResult
+                    }
+
+                    Timber.e("Steam cloud upload failed: no logged-on session for app ${appInfo.id}")
+                    UserFilesUploadResult(false, 0, 0, 0)
+                }
+            }
+
+            var syncResult = SyncResult.Success
+            var remoteTimestamp = 0L
+            var localTimestamp = 0L
+            var uploadsRequired = false
+            var uploadsCompleted = true
+
+            // sync metrics
+            var filesUploaded = 0
+            var filesDownloaded = 0
+            var filesDeleted = 0
+            var filesManaged = 0
+            var bytesUploaded = 0L
+            var bytesDownloaded = 0L
+            var microsecTotal = 0L
+            var microsecInitCaches = 0L
+            var microsecValidateState = 0L
+            var microsecAcLaunch = 0L
+            var microsecAcPrepUserFiles = 0L
+            var microsecAcExit = 0L
+            var microsecDeleteFiles = 0L
+            var microsecDownloadFiles = 0L
+            var microsecUploadFiles = 0L
+
+            microsecTotal =
+                measureTime {
+                    val localAppChangeNumber =
+                        overrideLocalChangeNumber ?: steamInstance.changeNumbersDao.getByAppId(appInfo.id)?.changeNumber ?: -1
+
+                    // retrieve existing user files from local storage first so we can detect missing saves
+                    val localUserFilesMap: Map<String, List<UserFileInfo>>
+                    val allLocalUserFiles: List<UserFileInfo>
+
+                    microsecInitCaches =
+                        measureTime {
+                            localUserFilesMap = getLocalUserFilesAsPrefixMap()
+                            allLocalUserFiles = localUserFilesMap.map { it.value }.flatten()
+                        }.inWholeMicroseconds
+                    val wnFileListJson =
+                        SteamService.withWnSession {
+                            withContext(Dispatchers.IO) { it.getCloudFileList(appInfo.id) }
+                        }
+                    if (wnFileListJson == null) {
+                        Timber.e("wn-steam-client: could not fetch cloud file list for app ${appInfo.id}")
+                        syncResult = SyncResult.UnknownFail
+                        return@async PostSyncInfo(syncResult)
+                    }
+
+                    val appFileListChange =
+                        try {
+                            parseCloudFileChangeList(wnFileListJson)
+                        } catch (e: Exception) {
+                            Timber.e(e, "wn-steam-client: malformed cloud file list for app ${appInfo.id}")
+                            syncResult = SyncResult.UnknownFail
+                            return@async PostSyncInfo(syncResult)
+                        }
+
+                    val cloudAppChangeNumber = appFileListChange.currentChangeNumber
+
+                    Timber.i("AppChangeNumber: $localAppChangeNumber -> $cloudAppChangeNumber")
+
+                    appFileListChange.printFileChangeList(appInfo)
+                    writeSteamRemoteCacheVdf(appInfo, appFileListChange, prefixToPath, cloudRouting)
+
+                    val downloadUserFiles: (CoroutineScope) -> Deferred<PostSyncInfo?> = { parentScope ->
+                        parentScope.async {
+                            Timber.i("Downloading cloud user files")
+
+                            val remoteUserFiles = fileChangeListToUserFiles(appFileListChange, false)
+                            val deletedRemoteUserFiles = fileChangeListToUserFiles(appFileListChange, true)
+                            val filesDeletedByCloud =
+                                if (appFileListChange.isOnlyDelta) {
+                                    deletedRemoteUserFiles
+                                } else {
+                                    getFilesDiff(remoteUserFiles, allLocalUserFiles).second.filesDeleted
+                                }
+
+                            // Count UNIQUE local paths so duplicate/stale cloud entries can't inflate the target into permanent DownloadFail.
+                            val cloudTargetPaths =
+                                groupPersistedCloudFilesByLocalPath(appFileListChange, prefixToPath, cloudRouting).keys
+                            val expectedDownloads = cloudTargetPaths.size
+                            microsecDownloadFiles =
+                                measureTime {
+                                    val downloadInfo = downloadFiles(appFileListChange, parentScope).await()
+                                    filesDownloaded = downloadInfo.filesDownloaded
+                                    bytesDownloaded = downloadInfo.bytesDownloaded
+                                }.inWholeMicroseconds
+
+                            val downloadsAllSucceeded = filesDownloaded >= expectedDownloads
+
+                            if (!downloadsAllSucceeded) {
+                                Timber.w(
+                                    "Skipping ${filesDeletedByCloud.size} local delete(s): only " +
+                                        "$filesDownloaded/$expectedDownloads cloud files downloaded successfully. " +
+                                        "Local saves will be preserved until the next sync.",
+                                )
+                                filesDeleted = 0
+                                microsecDeleteFiles = 0
+                                syncResult = SyncResult.DownloadFail
+                                return@async PostSyncInfo(syncResult)
+                            }
+
+                            // C-2: verify downloads against cloud hashes BEFORE applying cloud-side deletions, so a corrupt/truncated download can't strand cloud-removed local files with no rollback.
+                            val hasLocalChanges: Boolean
+                            microsecValidateState =
+                                measureTime {
+                                    hasLocalChanges =
+                                        hasHashConflicts(emptyMap<String, List<UserFileInfo>>(), appFileListChange)
+                                }.inWholeMicroseconds
+
+                            if (hasLocalChanges) {
+                                Timber.e(
+                                    "Local hashes still differ from cloud after download " +
+                                        "(downloaded=$filesDownloaded, expected=$expectedDownloads); " +
+                                        "aborting before applying deletions",
+                                )
+                                // Deletions deliberately NOT applied — leave local intact so a bad download can't also strand cloud-removed files.
+                                syncResult = SyncResult.DownloadFail
+                                return@async PostSyncInfo(syncResult)
+                            }
+
+                            // Downloads verified — only now safe to apply cloud-side deletions locally.
+                            microsecDeleteFiles =
+                                measureTime {
+                                    var totalFilesDeleted = 0
+                                    filesDeletedByCloud.forEach {
+                                        // Never delete a local file the cloud still has under some variant name.
+                                        val abs =
+                                            runCatching { it.getAbsPath(prefixToPath).toAbsolutePath().normalize() }
+                                                .getOrNull()
+                                        if (abs != null && abs in cloudTargetPaths) return@forEach
+                                        val deleted = Files.deleteIfExists(it.getAbsPath(prefixToPath))
+                                        if (deleted) totalFilesDeleted++
+                                    }
+                                    filesDeleted = totalFilesDeleted
+                                }.inWholeMicroseconds
+
+                            val updatedLocalFiles = getLocalUserFilesAsPrefixMap()
+                            filesManaged = updatedLocalFiles.size
+
+                            writeSteamRemoteCacheVdf(appInfo, appFileListChange, prefixToPath, cloudRouting)
+
+                            with(steamInstance) {
+                                db.withTransaction {
+                                    fileChangeListsDao.insert(appInfo.id, updatedLocalFiles.map { it.value }.flatten())
+                                    changeNumbersDao.insert(appInfo.id, cloudAppChangeNumber)
+                                }
+                            }
+
+                            return@async null
+                        }
+                    }
+
+                    val uploadUserFiles: (CoroutineScope) -> Deferred<Unit> = { parentScope ->
+                        parentScope.async {
+                            Timber.i("Uploading local user files")
+
+                            val fileChanges =
+                                steamInstance.fileChangeListsDao.getByAppId(appInfo.id).let {
+                                    val baseline =
+                                        it?.userFileInfo
+                                            ?: if (localAppChangeNumber < 0) {
+                                                fileChangeListToUserFiles(appFileListChange, false)
+                                            } else {
+                                                emptyList()
+                                            }
+                                    val result = getFilesDiff(allLocalUserFiles, baseline)
+
+                                    result.second
+                                }
+
+                            uploadsRequired =
+                                fileChanges.filesCreated.isNotEmpty() ||
+                                    fileChanges.filesModified.isNotEmpty() ||
+                                    fileChanges.filesDeleted.isNotEmpty()
+
+                            val uploadResult: UserFilesUploadResult
+
+                            microsecUploadFiles =
+                                measureTime {
+                                    uploadResult = uploadFiles(fileChanges, allLocalUserFiles, parentScope).await()
+                                    filesUploaded = uploadResult.filesUploaded
+                                    bytesUploaded = uploadResult.bytesUploaded
+                                    uploadsCompleted = !uploadsRequired || uploadResult.uploadBatchSuccess
+                                }.inWholeMicroseconds
+
+                            filesManaged = allLocalUserFiles.size
+
+                            if (uploadResult.uploadBatchSuccess) {
+                                writeSteamRemoteCacheVdfFromLocalFiles(
+                                    appInfo,
+                                    uploadResult.appChangeNumber,
+                                    allLocalUserFiles,
+                                    prefixToPath,
+                                )
+                                with(steamInstance) {
+                                    db.withTransaction {
+                                        fileChangeListsDao.insert(appInfo.id, allLocalUserFiles)
+                                        changeNumbersDao.insert(appInfo.id, uploadResult.appChangeNumber)
+                                    }
+                                }
+                            } else {
+                                syncResult = SyncResult.UpdateFail
+                            }
+                        }
+                    }
+
+                    val remoteHasFiles =
+                        appFileListChange.files.any { it.persistState == PERSIST_STATE_PERSISTED }
+                    val localHasFiles = allLocalUserFiles.isNotEmpty()
+                    val forcingDownloadMissingLocal = remoteHasFiles && !localHasFiles && cloudAppChangeNumber >= 0
+                    val effectiveLocalAppChangeNumber =
+                        if (forcingDownloadMissingLocal) {
+                            Timber.w(
+                                "Cloud has ${appFileListChange.files.size} file(s) but no local saves; forcing download (changeNumber=$cloudAppChangeNumber)",
+                            )
+                            -1
+                        } else {
+                            localAppChangeNumber
+                        }
+
+                    if (localAppChangeNumber < 0 && localHasFiles && !remoteHasFiles && preferredSave != SaveLocation.Remote) {
+                        if (cloudAppChangeNumber > 0) {
+                            Timber.w(
+                                "Refusing blind upload: cloud changeNumber=$cloudAppChangeNumber but " +
+                                    "returned no files. Treating as conflict so launcher can prompt the user.",
+                            )
+                            when (preferredSave) {
+                                SaveLocation.Local -> {
+                                    // MD-6: empty list + non-zero change number is suspicious; re-fetch once before an explicit local push so a transient empty-list glitch becomes a conflict instead of clobbering the cloud.
+                                    val retryHasFiles =
+                                        runCatching {
+                                            val json =
+                                                SteamService.withWnSession {
+                                                    withContext(Dispatchers.IO) { it.getCloudFileList(appInfo.id) }
+                                                }
+                                            json != null &&
+                                                parseCloudFileChangeList(json)
+                                                    .files
+                                                    .any { it.persistState == PERSIST_STATE_PERSISTED }
+                                        }.getOrDefault(false)
+                                    if (retryHasFiles) {
+                                        Timber.w(
+                                            "Empty cloud list was transient (retry returned files); treating as " +
+                                                "conflict instead of a blind upload (changeNumber=$cloudAppChangeNumber)",
+                                        )
+                                        syncResult = SyncResult.Conflict
+                                        remoteTimestamp = 0L
+                                        localTimestamp =
+                                            allLocalUserFiles.map { it.timestamp }.maxOrNull() ?: 0L
+                                    } else {
+                                        Timber.w(
+                                            "Cloud list still empty on retry (changeNumber=$cloudAppChangeNumber); " +
+                                                "honoring explicit local push",
+                                        )
+                                        microsecAcExit =
+                                            measureTime {
+                                                uploadUserFiles(parentScope).await()
+                                            }.inWholeMicroseconds
+                                    }
+                                }
+                                else -> {
+                                    syncResult = SyncResult.Conflict
+                                    remoteTimestamp = 0L
+                                    localTimestamp =
+                                        allLocalUserFiles.map { it.timestamp }.maxOrNull() ?: 0L
+                                }
+                            }
+                        } else {
+                            Timber.i("No previous Steam cloud baseline and no remote files; uploading existing local saves")
+                            microsecAcExit =
+                                measureTime {
+                                    uploadUserFiles(parentScope).await()
+                                }.inWholeMicroseconds
+                        }
+                    } else if (effectiveLocalAppChangeNumber < cloudAppChangeNumber) {
+                        microsecAcLaunch =
+                            measureTime {
+                                var hasLocalChanges: Boolean
+
+                                microsecAcPrepUserFiles =
+                                    measureTime {
+                                        hasLocalChanges =
+                                            if (forcingDownloadMissingLocal) {
+                                                false
+                                            } else {
+                                                val trackedFiles = steamInstance.fileChangeListsDao.getByAppId(appInfo.id)?.userFileInfo
+                                                if (trackedFiles != null) {
+                                                    getFilesDiff(allLocalUserFiles, trackedFiles).first
+                                                } else {
+                                                    localHasFiles
+                                                }
+                                            }
+                                    }.inWholeMicroseconds
+
+                                if (!hasLocalChanges) {
+                                    Timber.i("No local changes but new cloud user files")
+
+                                    downloadUserFiles(parentScope).await()?.let {
+                                        return@async it
+                                    }
+                                } else {
+                                    Timber.i("Found local changes and new cloud user files, conflict resolution...")
+
+                                    when (preferredSave) {
+                                        SaveLocation.Local -> {
+                                            uploadUserFiles(parentScope).await()
+                                        }
+
+                                        SaveLocation.Remote -> {
+                                            downloadUserFiles(parentScope).await()?.let {
+                                                return@async it
+                                            }
+                                        }
+
+                                        SaveLocation.None -> {
+                                            // Only a real content divergence is a conflict; a bare change-number drift reconciles the baseline silently.
+                                            val contentDiffers =
+                                                cloudContentDiffersFromLocal(appFileListChange, prefixToPath, appInfo)
+                                            // cloudContentDiffersFromLocal only walks cloud files, so local-only files (new this session) are invisible to it; upload them instead of baselining them away.
+                                            val cloudLocalPaths =
+                                                groupPersistedCloudFilesByLocalPath(appFileListChange, prefixToPath, cloudRouting).keys
+                                            val hasLocalOnlyFiles =
+                                                allLocalUserFiles.any { file ->
+                                                    runCatching {
+                                                        file.getAbsPath(prefixToPath).toAbsolutePath().normalize()
+                                                    }.getOrNull() !in cloudLocalPaths
+                                                }
+                                            if (contentDiffers) {
+                                                syncResult = SyncResult.Conflict
+                                                remoteTimestamp = appFileListChange.files.map { it.timestamp }.maxOrNull() ?: 0L
+                                                localTimestamp = allLocalUserFiles.map { it.timestamp }.maxOrNull() ?: 0L
+                                            } else if (hasLocalOnlyFiles) {
+                                                Timber.i(
+                                                    "Change number differs ($effectiveLocalAppChangeNumber -> $cloudAppChangeNumber) " +
+                                                        "with identical shared content but new local-only file(s); uploading",
+                                                )
+                                                uploadUserFiles(parentScope).await()
+                                            } else {
+                                                Timber.i(
+                                                    "Change number differs ($effectiveLocalAppChangeNumber -> $cloudAppChangeNumber) " +
+                                                        "but local and cloud content are identical; reconciling baseline (no real conflict)",
+                                                )
+                                                writeSteamRemoteCacheVdf(appInfo, appFileListChange, prefixToPath, cloudRouting)
+                                                with(steamInstance) {
+                                                    db.withTransaction {
+                                                        fileChangeListsDao.insert(appInfo.id, allLocalUserFiles)
+                                                        changeNumbersDao.insert(appInfo.id, cloudAppChangeNumber)
+                                                    }
+                                                }
+                                                syncResult = SyncResult.UpToDate
+                                            }
+                                        }
+                                    }
+                                }
+                            }.inWholeMicroseconds
+                    } else if (effectiveLocalAppChangeNumber == cloudAppChangeNumber) {
+                        microsecAcExit =
+                            measureTime {
+                                val hasLocalChanges =
+                                    steamInstance.fileChangeListsDao
+                                        .getByAppId(appInfo.id)
+                                        ?.let {
+                                            val result = getFilesDiff(allLocalUserFiles, it.userFileInfo)
+                                            result.first
+                                        } ?: localHasFiles
+
+                                if (hasLocalChanges) {
+                                    Timber.i("Found local changes and no new cloud user files")
+
+                                    uploadUserFiles(parentScope).await()
+                                } else {
+                                    Timber.i("No local changes and no new cloud user files, doing nothing...")
+
+                                    syncResult = SyncResult.UpToDate
+                                }
+                            }.inWholeMicroseconds
+                    } else {
+                        Timber.e("Local change number greater than cloud $localAppChangeNumber > $cloudAppChangeNumber")
+
+                        syncResult = SyncResult.UnknownFail
+                    }
+                }.inWholeMicroseconds
+
+            val microsecBuildSyncList =
+                (microsecTotal - (microsecInitCaches + microsecValidateState + microsecAcLaunch + microsecAcExit))
+                    .coerceAtLeast(
+                        0L,
+                    )
+
+            postSyncInfo =
+                PostSyncInfo(
+                    syncResult = syncResult,
+                    remoteTimestamp = remoteTimestamp,
+                    localTimestamp = localTimestamp,
+                    uploadsRequired = uploadsRequired,
+                    uploadsCompleted = uploadsCompleted,
+                    filesUploaded = filesUploaded,
+                    filesDownloaded = filesDownloaded,
+                    filesDeleted = filesDeleted,
+                    filesManaged = filesManaged,
+                    bytesUploaded = bytesUploaded,
+                    bytesDownloaded = bytesDownloaded,
+                    microsecTotal = microsecTotal,
+                    microsecInitCaches = microsecInitCaches,
+                    microsecValidateState = microsecValidateState,
+                    microsecAcLaunch = microsecAcLaunch,
+                    microsecAcPrepUserFiles = microsecAcPrepUserFiles,
+                    microsecAcExit = microsecAcExit,
+                    microsecBuildSyncList = microsecBuildSyncList,
+                    microsecDeleteFiles = microsecDeleteFiles,
+                    microsecDownloadFiles = microsecDownloadFiles,
+                    microsecUploadFiles = microsecUploadFiles,
+                )
+
+            postSyncInfo
+        }
+
+    private fun CloudFileChangeList.printFileChangeList(appInfo: SteamApp) {
+        Timber.i(
+            "GetAppFileListChange(${appInfo.id}):" +
+                "\n\tTotal Files: ${files.size}" +
+                "\n\tCurrent Change Number: $currentChangeNumber" +
+                "\n\tIs Only Delta: $isOnlyDelta" +
+                "\n\tPath Prefixes: \n\t\t${pathPrefixes.joinToString("\n\t\t")}" +
+                "\n\tMachine Names: \n\t\t${machineNames.joinToString("\n\t\t")}" +
+                files.joinToString {
+                    "\n\t${it.filename}:" +
+                        "\n\t\tshaFile: ${it.shaFile.joinToString(", ")}" +
+                        "\n\t\ttimestamp: ${it.timestamp}" +
+                        "\n\t\trawFileSize: ${it.rawFileSize}" +
+                        "\n\t\tpersistState: ${it.persistState}" +
+                        "\n\t\tpathPrefixIndex: ${it.pathPrefixIndex}" +
+                        "\n\t\tmachineNameIndex: ${it.machineNameIndex}"
+                },
+        )
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamCloudConflictDialog.kt b/app/src/main/feature/steamcloudsync/SteamCloudConflictDialog.kt
new file mode 100644
index 000000000..b21dc04b7
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamCloudConflictDialog.kt
@@ -0,0 +1,100 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import android.app.Activity
+import android.app.Dialog
+import android.util.TypedValue
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+
+object SteamCloudConflictDialog {
+    @JvmStatic
+    fun show(
+        activity: Activity,
+        timestamps: SteamCloudConflictTimestamps,
+        onUseCloud: (keepBackup: Boolean) -> Unit,
+        onUseLocal: (keepBackup: Boolean) -> Unit,
+    ) {
+        val dialog =
+            Dialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
+                requestWindowFeature(Window.FEATURE_NO_TITLE)
+                setCancelable(false)
+                window?.apply {
+                    setLayout(
+                        WindowManager.LayoutParams.MATCH_PARENT,
+                        WindowManager.LayoutParams.WRAP_CONTENT,
+                    )
+                    setBackgroundDrawableResource(android.R.color.transparent)
+                }
+            }
+
+        val navRegistry = PaneNavRegistry()
+
+        val composeView =
+            ComposeView(activity).apply {
+                layoutParams =
+                    ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                    )
+                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+                (activity as? ComponentActivity)?.let {
+                    setViewTreeLifecycleOwner(it)
+                    setViewTreeSavedStateRegistryOwner(it)
+                }
+                setContent {
+                    WinNativeTheme(
+                        colorScheme =
+                            darkColorScheme(
+                                primary = SteamCloudConflictBlue,
+                                surface = SteamCloudConflictPanel,
+                                background = SteamCloudConflictWindow,
+                                onSurface = SteamCloudConflictText,
+                                onBackground = SteamCloudConflictText,
+                            ),
+                    ) {
+                        SteamCloudConflictDialogContent(
+                            navRegistry = navRegistry,
+                            timestamps = timestamps,
+                            initialKeepBackup = GameSaveBackupManager.isKeepReplacedBackupEnabled(activity),
+                            onKeepBackupChanged = { enabled ->
+                                GameSaveBackupManager.setKeepReplacedBackupEnabled(activity, enabled)
+                            },
+                            onUseCloud = { keepBackup ->
+                                dialog.dismiss()
+                                onUseCloud(keepBackup)
+                            },
+                            onUseLocal = { keepBackup ->
+                                dialog.dismiss()
+                                onUseLocal(keepBackup)
+                            },
+                        )
+                    }
+                }
+            }
+
+        dialog.setContentView(composeView)
+        dialog.show()
+        val restoreNav = dialog.window?.bindPaneNav(navRegistry, onDismiss = {})
+        dialog.setOnDismissListener { restoreNav?.invoke() }
+        dialog.window?.apply {
+            val dm = activity.resources.displayMetrics
+            val horizontalMarginPx =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, dm).toInt()
+            val maxDialogWidthPx =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 520f, dm).toInt()
+            val targetWidth = (dm.widthPixels - (horizontalMarginPx * 2)).coerceAtMost(maxDialogWidthPx)
+            setLayout(targetWidth, WindowManager.LayoutParams.WRAP_CONTENT)
+        }
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamCloudConflictUi.kt b/app/src/main/feature/steamcloudsync/SteamCloudConflictUi.kt
new file mode 100644
index 000000000..5c8737369
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamCloudConflictUi.kt
@@ -0,0 +1,324 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+data class SteamCloudConflictTimestamps(
+    val localTimestampLabel: String,
+    val cloudTimestampLabel: String,
+)
+
+internal val SteamCloudConflictWindow = Color(0xFF171A21)
+internal val SteamCloudConflictPanel = Color(0xFF1B2838)
+internal val SteamCloudConflictText = Color(0xFFD6D7D9)
+internal val SteamCloudConflictBlue = Color(0xFF66C0F4)
+
+private val SteamPanelAlt = Color(0xFF101822)
+private val SteamBorder = Color(0xFF2A475E)
+private val SteamButton = Color(0xFF2A9FD6)
+private val SteamButtonText = Color(0xFFE5F3FF)
+private val SteamMuted = Color(0xFF8F98A0)
+
+@Composable
+internal fun SteamCloudConflictDialogContent(
+    navRegistry: PaneNavRegistry,
+    timestamps: SteamCloudConflictTimestamps,
+    initialKeepBackup: Boolean,
+    onKeepBackupChanged: (Boolean) -> Unit,
+    onUseCloud: (keepBackup: Boolean) -> Unit,
+    onUseLocal: (keepBackup: Boolean) -> Unit,
+) {
+    val scrollState = rememberScrollState()
+    var keepBackup by remember { mutableStateOf(initialKeepBackup) }
+
+    CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+    Surface(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(10.dp)
+                .widthIn(max = 520.dp),
+        shape = RoundedCornerShape(3.dp),
+        color = SteamCloudConflictWindow,
+        border = BorderStroke(1.dp, SteamBorder),
+        tonalElevation = 0.dp,
+    ) {
+        BoxWithConstraints {
+            val compactActions = maxWidth < 380.dp
+
+            Column(
+                modifier =
+                    Modifier
+                        .background(SteamCloudConflictWindow)
+                        .heightIn(max = 430.dp),
+            ) {
+                Text(
+                    text = "Steam Cloud Sync Conflict",
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .background(SteamCloudConflictPanel)
+                            .border(BorderStroke(0.dp, SteamCloudConflictPanel))
+                            .padding(horizontal = 14.dp, vertical = 9.dp),
+                    color = SteamCloudConflictBlue,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+
+                Column(
+                    modifier =
+                        Modifier
+                            .weight(1f, fill = false)
+                            .verticalScroll(scrollState)
+                            .padding(horizontal = 14.dp, vertical = 12.dp),
+                    verticalArrangement = Arrangement.spacedBy(10.dp),
+                ) {
+                    Text(
+                        text = "Your local save data does not match Steam Cloud.",
+                        color = SteamCloudConflictText,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.SemiBold,
+                    )
+                    Text(
+                        text = "Choose which version to use before launching. The other version will be replaced.",
+                        color = SteamMuted,
+                        fontSize = 12.sp,
+                        lineHeight = 16.sp,
+                    )
+
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(SteamPanelAlt)
+                                .border(1.dp, SteamBorder, RoundedCornerShape(2.dp))
+                                .padding(horizontal = 12.dp, vertical = 10.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        VersionLine("Local files", timestamps.localTimestampLabel)
+                        VersionLine("Cloud files", timestamps.cloudTimestampLabel)
+                    }
+
+                    KeepBackupCheckbox(
+                        checked = keepBackup,
+                        onCheckedChange = { v ->
+                            keepBackup = v
+                            onKeepBackupChanged(v)
+                        },
+                    )
+                }
+
+                if (compactActions) {
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(SteamCloudConflictPanel)
+                                .padding(10.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        SteamOutlinedButton(
+                            "Use Local Files",
+                            Modifier.fillMaxWidth().paneNavItem(onActivate = { onUseLocal(keepBackup) }),
+                        ) {
+                            onUseLocal(keepBackup)
+                        }
+                        SteamPrimaryButton(
+                            "Use Cloud Files",
+                            Modifier.fillMaxWidth()
+                                .paneNavItem(onActivate = { onUseCloud(keepBackup) }, isEntry = true),
+                        ) {
+                            onUseCloud(keepBackup)
+                        }
+                    }
+                } else {
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(SteamCloudConflictPanel)
+                                .padding(10.dp),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        Spacer(modifier = Modifier.weight(1f))
+                        SteamOutlinedButton(
+                            "Use Local Files",
+                            Modifier.widthIn(min = 132.dp).paneNavItem(onActivate = { onUseLocal(keepBackup) }),
+                        ) {
+                            onUseLocal(keepBackup)
+                        }
+                        SteamPrimaryButton(
+                            "Use Cloud Files",
+                            Modifier.widthIn(min = 132.dp)
+                                .paneNavItem(onActivate = { onUseCloud(keepBackup) }, isEntry = true),
+                        ) {
+                            onUseCloud(keepBackup)
+                        }
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun VersionLine(
+    label: String,
+    timestamp: String,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = label,
+            modifier = Modifier.widthIn(min = 86.dp),
+            color = SteamMuted,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium,
+        )
+        Text(
+            text = timestamp,
+            color = SteamCloudConflictText,
+            fontSize = 12.sp,
+        )
+    }
+}
+
+@Composable
+private fun SteamPrimaryButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.height(34.dp),
+        shape = RoundedCornerShape(2.dp),
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor = SteamButton,
+                contentColor = SteamButtonText,
+            ),
+        contentPadding = ButtonDefaults.ContentPadding,
+    ) {
+        Text(text = text, fontSize = 12.sp, fontWeight = FontWeight.SemiBold)
+    }
+}
+
+@Composable
+private fun SteamOutlinedButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        modifier = modifier.height(34.dp),
+        shape = RoundedCornerShape(2.dp),
+        colors =
+            ButtonDefaults.outlinedButtonColors(
+                contentColor = SteamCloudConflictText,
+                containerColor = Color.Transparent,
+            ),
+        border = BorderStroke(1.dp, SteamBorder),
+        contentPadding = ButtonDefaults.ContentPadding,
+    ) {
+        Text(text = text, fontSize = 12.sp, fontWeight = FontWeight.Medium)
+    }
+}
+
+@Composable
+private fun KeepBackupCheckbox(
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Surface(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .paneNavItem(
+                    cornerRadius = 2.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    onAdjust = { onCheckedChange(!checked) },
+                    tapToSelect = true,
+                ),
+        shape = RoundedCornerShape(2.dp),
+        color = SteamPanelAlt,
+        border = BorderStroke(1.dp, SteamBorder),
+    ) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp, vertical = 4.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Checkbox(
+                checked = checked,
+                onCheckedChange = onCheckedChange,
+                colors =
+                    CheckboxDefaults.colors(
+                        checkedColor = SteamCloudConflictBlue,
+                        uncheckedColor = SteamMuted,
+                        checkmarkColor = SteamCloudConflictWindow,
+                    ),
+            )
+            Spacer(Modifier.widthIn(min = 2.dp))
+            Column(modifier = Modifier.padding(start = 4.dp)) {
+                Text(
+                    text = stringResource(R.string.cloud_saves_keep_replaced_backup),
+                    color = SteamCloudConflictText,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Medium,
+                )
+                Text(
+                    text = stringResource(R.string.cloud_saves_keep_replaced_backup_summary),
+                    color = SteamMuted,
+                    fontSize = 11.sp,
+                    lineHeight = 14.sp,
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamCloudHistoryProvider.kt b/app/src/main/feature/steamcloudsync/SteamCloudHistoryProvider.kt
new file mode 100644
index 000000000..f4153b6a9
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamCloudHistoryProvider.kt
@@ -0,0 +1,181 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import android.app.Activity
+import android.content.Context
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupHistoryEntry
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupOrigin
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupStorage
+import com.winlator.cmod.runtime.container.Container
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+/**
+ * Provides Steam Cloud entries for the save-history UI.
+ *
+ * Steam Cloud stores only the current version of each filename — no server-side version
+ * history — so, like Steam's own remote-storage website, this lists one entry per file
+ * currently in the cloud, each individually downloadable.
+ *
+ * Restoring syncs the full current cloud state through
+ * [SteamCloudSyncHelper.forceDownloadById].
+ *
+ * Labels are stored locally in SharedPrefs. Delete is unsupported because Steam manages cloud
+ * retention.
+ *
+ * Cloud file listings come from the C++ WN-Steam-Client through
+ * [SteamService.fetchCloudFileList] and [SteamAutoCloud.CloudFileChangeList].
+ */
+object SteamCloudHistoryProvider {
+    private const val TAG = "SteamCloudHistory"
+
+    /** Maximum number of files shown in the history UI. */
+    private const val MAX_FILES = 200
+
+    private const val FILE_ID_SEPARATOR = ":file:"
+
+    /** SharedPrefs file for user-set group labels. */
+    private const val LABEL_PREFS = "steam_cloud_history_labels"
+
+    sealed class HistoryResult {
+        data class Entries(val list: List<BackupHistoryEntry>) : HistoryResult()
+        object Empty : HistoryResult()
+        object Unreachable : HistoryResult()
+    }
+
+    /**
+     */
+    suspend fun listCloudSaveGroupsDetailed(
+        context: Context,
+        appId: Int,
+    ): HistoryResult =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = SteamService.fetchCloudFileList(appId, 0L)
+                    ?: return@withContext HistoryResult.Unreachable
+                val list = buildEntries(context, appId, response)
+                if (list.isEmpty()) HistoryResult.Empty else HistoryResult.Entries(list)
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "listCloudSaveGroupsDetailed failed for appId=%d", appId)
+                HistoryResult.Unreachable
+            }
+        }
+
+    suspend fun listCloudSaveGroups(
+        context: Context,
+        appId: Int,
+    ): List<BackupHistoryEntry> =
+        when (val r = listCloudSaveGroupsDetailed(context, appId)) {
+            is HistoryResult.Entries -> r.list
+            HistoryResult.Empty, HistoryResult.Unreachable -> emptyList()
+        }
+
+    private fun toMillis(v: Long): Long {
+        val ms = when {
+            v <= 0L -> 0L
+            v < 100_000_000_000L -> v * 1000L
+            v > 100_000_000_000_000L -> v / 1000L
+            else -> v
+        }
+        return if (ms > 4_102_444_800_000L) 0L else ms
+    }
+
+    /** The prefixed path used to download [file] from Steam Cloud (pathPrefix/filename). */
+    private fun downloadPathFor(
+        file: SteamAutoCloud.CloudFileInfo,
+        response: SteamAutoCloud.CloudFileChangeList,
+    ): String {
+        val prefix = response.pathPrefixes.getOrNull(file.pathPrefixIndex).orEmpty()
+        return if (prefix.isEmpty()) file.filename else "${prefix.trimEnd('/', '\\')}/${file.filename}"
+    }
+
+    /** Human-readable file path: root placeholders stripped, separators normalized. */
+    private fun displayNameFor(downloadPath: String): String =
+        downloadPath
+            .replace(Regex("%\\w+%"), "")
+            .replace('\\', '/')
+            .trimStart('/')
+            .ifEmpty { downloadPath }
+
+    private fun buildEntries(
+        context: Context,
+        appId: Int,
+        response: SteamAutoCloud.CloudFileChangeList,
+    ): List<BackupHistoryEntry> {
+        val persistedFiles: List<SteamAutoCloud.CloudFileInfo> =
+            response.files
+                .filter { it.isPersisted }
+                .sortedByDescending { toMillis(it.timestamp) }
+
+        if (persistedFiles.isEmpty()) return emptyList()
+
+        val labelPrefs = context.getSharedPreferences(LABEL_PREFS, Context.MODE_PRIVATE)
+
+        return persistedFiles
+            .take(MAX_FILES)
+            .map { file ->
+                val downloadPath = downloadPathFor(file, response)
+                val fileId = "$appId$FILE_ID_SEPARATOR$downloadPath"
+                BackupHistoryEntry(
+                    fileId = fileId,
+                    fileName = displayNameFor(downloadPath),
+                    timestampMs = toMillis(file.timestamp),
+                    origin = BackupOrigin.CLOUD,
+                    sizeBytes = file.rawFileSize,
+                    label = labelPrefs.getString(fileId, null),
+                    storage = BackupStorage.STEAM_CLOUD,
+                )
+            }
+    }
+
+    /** Fetch the current cloud bytes for a [BackupHistoryEntry.fileId] produced by [buildEntries]. Null on failure. */
+    suspend fun downloadFileBytes(
+        appId: Int,
+        fileId: String,
+    ): ByteArray? =
+        withContext(Dispatchers.IO) {
+            val downloadPath = fileId.substringAfter(FILE_ID_SEPARATOR, "").ifEmpty { return@withContext null }
+            try {
+                SteamService.downloadCloudFileBytes(appId, downloadPath)
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "downloadFileBytes failed for appId=%d path=%s", appId, downloadPath)
+                null
+            }
+        }
+
+    /**
+     * Restores by syncing the full current Steam Cloud file set to local.
+     *
+     * Steam Cloud does not expose per-group snapshots, so every history group restores the
+     * same current cloud state.
+     */
+    suspend fun restoreSaveGroup(
+        activity: Activity,
+        appId: Int,
+        @Suppress("UNUSED_PARAMETER") groupFileId: String,
+        containerHint: Container? = null,
+    ): BackupResult =
+        withContext(Dispatchers.IO) {
+            try {
+                val ok = SteamCloudSyncHelper.forceDownloadById(activity, appId, containerHint)
+                if (ok) {
+                    BackupResult(true, "Synced current Steam Cloud state.")
+                } else {
+                    BackupResult(false, "Steam Cloud sync failed.")
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "restoreSaveGroup failed for appId=%d", appId)
+                BackupResult(false, "Restore failed: ${e.message}")
+            }
+        }
+
+    /** Persists the user-set label for [groupFileId]. */
+    fun setLabel(context: Context, groupFileId: String, label: String?) {
+        val prefs = context.getSharedPreferences(LABEL_PREFS, Context.MODE_PRIVATE)
+        val edit = prefs.edit()
+        if (label.isNullOrEmpty()) edit.remove(groupFileId) else edit.putString(groupFileId, label)
+        edit.apply()
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamCloudSyncHelper.kt b/app/src/main/feature/steamcloudsync/SteamCloudSyncHelper.kt
new file mode 100644
index 000000000..240367243
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamCloudSyncHelper.kt
@@ -0,0 +1,523 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import android.content.Context
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.enums.PathType
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.FileUtils
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.concurrent.ConcurrentHashMap
+
+object SteamCloudSyncHelper {
+    private const val LABEL_NO_LOCAL_SAVES = "No local saves"
+    private const val LABEL_NO_CLOUD_SAVES = "No cloud saves"
+    private const val LABEL_CLOUD_UNREACHABLE = "Cloud unreachable"
+
+    private fun formatTimestamp(
+        timestampMs: Long?,
+        emptyLabel: String,
+    ): String {
+        if (timestampMs == null || timestampMs <= 0L) return emptyLabel
+        return SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date(timestampMs))
+    }
+
+    @JvmStatic
+    fun isOfflineMode(shortcut: Shortcut?): Boolean =
+        shortcut != null && shortcut.getExtra("offline_mode", "0") == "1"
+
+    @JvmStatic
+    fun forceDownloadOnContainerSwap(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        if (shortcut.getExtra("game_source") != "STEAM") return false
+        if (shortcut.getExtra("cloud_force_download").isEmpty()) return false
+
+        val result = runBlocking { forceDownload(context, shortcut) }
+        if (result) {
+            shortcut.putExtra("cloud_force_download", null)
+            shortcut.saveData()
+        }
+
+        Timber.i("Force Steam cloud download for %s: %s", shortcut.name, result)
+        return result
+    }
+
+    suspend fun forceDownload(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return false
+        return forceDownloadById(context, appId, resolveShortcutContainer(context, shortcut))
+    }
+
+    suspend fun forceDownloadById(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): Boolean =
+        try {
+            // MD-5: abort if container activation fails — proceeding would resolve paths against the wrong wineprefix and overwrite another game's saves.
+            if (!activateContainerForCloudOp(context, appId, containerHint)) {
+                Timber.e("forceDownloadById: aborting — container activation failed for appId=%d", appId)
+                false
+            } else {
+                val prefixToPath = steamPrefixResolver(context, appId, containerHint)
+                // Snapshot the local save BEFORE the forced cloud-wins download (no rollback of its own) so the pre-download state is recoverable from Save History. Best-effort.
+                if (hasActualLocalSaves(context, appId, containerHint)) {
+                    runCatching {
+                        SteamSaveSnapshotManager.recordSnapshot(
+                            context,
+                            appId,
+                            GameSaveBackupManager.BackupOrigin.AUTO,
+                            containerHint,
+                        )
+                    }.onFailure { Timber.w(it, "Pre-download snapshot failed for appId=%d", appId) }
+                }
+                val syncInfo =
+                    SteamService
+                        .forceSyncUserFiles(
+                            appId = appId,
+                            prefixToPath = prefixToPath,
+                            preferredSave = SaveLocation.Remote,
+                            overrideLocalChangeNumber = -1,
+                        ).await()
+
+                val ok = syncInfo?.syncResult == SyncResult.Success || syncInfo?.syncResult == SyncResult.UpToDate
+                if (ok) {
+                    probeCache.remove(appId)
+                    runCatching {
+                        SteamService.pushCloudStateToLibSteamClient(appId)
+                    }.onFailure { e ->
+                        Timber.w(e, "forceDownloadById: libsteamclient mirror refresh failed for app=%d", appId)
+                    }
+                }
+                ok
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to force Steam cloud download for appId=%d", appId)
+            false
+        }
+
+    @JvmStatic
+    fun hasLocalCloudSaves(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        if (shortcut.getExtra("game_source") != "STEAM") return false
+        val appId = shortcut.getExtra("app_id")
+        if (appId.isEmpty()) return false
+        val appIdInt = appId.toIntOrNull() ?: return false
+
+        return hasActualLocalSaves(context, appIdInt, resolveShortcutContainer(context, shortcut))
+    }
+
+    fun hasActualLocalSaves(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): Boolean {
+        val appInfo = SteamService.getAppInfoOf(appId) ?: return false
+        val prefixToPath = steamPrefixResolver(context, appId, containerHint)
+
+        val userDataPath = Paths.get(prefixToPath(PathType.SteamUserData.name))
+        if (FileUtils.anyFileMatches(userDataPath, "*", maxDepth = 5)) return true
+
+        val savePatterns =
+            appInfo.ufs.saveFilePatterns
+                .filter { it.root.isWindows && it.root != PathType.SteamUserData }
+
+        return savePatterns.any { pattern ->
+            val basePath = Paths.get(prefixToPath(pattern.root.name), pattern.substitutedPath)
+            FileUtils.anyFileMatches(
+                rootPath = basePath,
+                pattern = pattern.pattern,
+                maxDepth = if (pattern.recursive != 0) -1 else 0,
+            )
+        }
+    }
+
+    private fun newestTimestampInFiles(
+        rootPath: Path,
+        pattern: String,
+        maxDepth: Int,
+    ): Long? {
+        val stream = FileUtils.findFilesRecursive(rootPath, pattern, maxDepth = maxDepth)
+        return try {
+            var newest = 0L
+            stream.forEach { path ->
+                val modified =
+                    runCatching {
+                        if (Files.isRegularFile(path)) Files.getLastModifiedTime(path).toMillis() else 0L
+                    }.getOrDefault(0L)
+                if (modified > newest) {
+                    newest = modified
+                }
+            }
+            newest.takeIf { it > 0L }
+        } finally {
+            stream.close()
+        }
+    }
+
+    private fun getNewestActualLocalCloudSaveTimestamp(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): Long? {
+        val appInfo = SteamService.getAppInfoOf(appId) ?: return null
+        val prefixToPath = steamPrefixResolver(context, appId, containerHint)
+
+        val userDataNewest =
+            newestTimestampInFiles(
+                Paths.get(prefixToPath(PathType.SteamUserData.name)),
+                "*",
+                maxDepth = 5,
+            )
+
+        val patternNewest =
+            appInfo.ufs.saveFilePatterns
+                .filter { it.root.isWindows && it.root != PathType.SteamUserData }
+            .mapNotNull { pattern ->
+                val basePath = Paths.get(prefixToPath(pattern.root.name), pattern.substitutedPath)
+                newestTimestampInFiles(
+                    rootPath = basePath,
+                    pattern = pattern.pattern,
+                    maxDepth = if (pattern.recursive != 0) -1 else 0,
+                )
+            }.maxOrNull()
+
+        return listOfNotNull(userDataNewest, patternNewest).maxOrNull()
+    }
+
+    @JvmStatic
+    fun cloudSavesDiffer(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        if (!hasLocalCloudSaves(context, shortcut)) return false
+        val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return false
+        return runBlocking {
+            try {
+                SteamService.cloudSavesDiffer(appId) ?: true
+            } catch (e: Exception) {
+                Timber.e(e, "Steam cloud save diff check failed for %s", shortcut.name)
+                true
+            }
+        }
+    }
+
+    /** Result of one conflict probe for the launch-time sync prompt. */
+    data class CloudConflictProbe(
+        val differs: Boolean,
+        val timestamps: SteamCloudConflictTimestamps,
+    )
+
+    private const val PROBE_CACHE_TTL_MS = 60_000L
+    private val probeCache = ConcurrentHashMap<Int, Pair<Long, CloudConflictProbe>>()
+
+    @JvmStatic
+    fun probeCloudConflict(
+        context: Context,
+        shortcut: Shortcut,
+    ): CloudConflictProbe {
+        val appId = shortcut.getExtra("app_id").toIntOrNull()
+        if (appId == null || !hasLocalCloudSaves(context, shortcut)) {
+            return CloudConflictProbe(
+                differs = false,
+                timestamps = SteamCloudConflictTimestamps(LABEL_NO_LOCAL_SAVES, LABEL_NO_CLOUD_SAVES),
+            )
+        }
+        probeCache[appId]?.let { (ts, cached) ->
+            if (System.currentTimeMillis() - ts < PROBE_CACHE_TTL_MS) return cached
+        }
+        activateContainer(context, resolveShortcutContainer(context, shortcut) ?: shortcut.container)
+        return runBlocking {
+            try {
+                val snapshot = SteamService.fetchCloudConflictSnapshot(appId, context)
+                val localActual = getNewestActualLocalCloudSaveTimestamp(context, appId, resolveShortcutContainer(context, shortcut))
+                val localTracked =
+                    SteamService.getTrackedCloudSaveFiles(appId)?.maxOfOrNull { it.timestamp }
+                val localTs = localActual ?: localTracked
+                val cloudLabel =
+                    when {
+                        snapshot == null -> LABEL_CLOUD_UNREACHABLE
+                        else -> formatTimestamp(snapshot.newestRemoteTimestamp, LABEL_NO_CLOUD_SAVES)
+                    }
+                val probe = CloudConflictProbe(
+                    differs = snapshot?.differs ?: false,
+                    timestamps =
+                        SteamCloudConflictTimestamps(
+                            localTimestampLabel = formatTimestamp(localTs, LABEL_NO_LOCAL_SAVES),
+                            cloudTimestampLabel = cloudLabel,
+                        ),
+                )
+                if (snapshot != null) probeCache[appId] = System.currentTimeMillis() to probe
+                probe
+            } catch (e: Exception) {
+                Timber.e(e, "Steam cloud conflict probe failed for %s", shortcut.name)
+                CloudConflictProbe(
+                    differs = false,
+                    timestamps = SteamCloudConflictTimestamps(LABEL_NO_LOCAL_SAVES, LABEL_CLOUD_UNREACHABLE),
+                )
+            }
+        }
+    }
+
+    fun timestampsFromSyncInfo(
+        context: Context,
+        shortcut: Shortcut,
+        syncInfo: PostSyncInfo?,
+    ): SteamCloudConflictTimestamps {
+        if (syncInfo == null || (syncInfo.localTimestamp <= 0L && syncInfo.remoteTimestamp <= 0L)) {
+            return getConflictTimestamps(context, shortcut)
+        }
+        return SteamCloudConflictTimestamps(
+            localTimestampLabel = formatTimestamp(syncInfo.localTimestamp, LABEL_NO_LOCAL_SAVES),
+            cloudTimestampLabel = formatTimestamp(syncInfo.remoteTimestamp, LABEL_NO_CLOUD_SAVES),
+        )
+    }
+
+    @JvmStatic
+    fun getConflictTimestamps(
+        context: Context,
+        shortcut: Shortcut,
+    ): SteamCloudConflictTimestamps {
+        val appId = shortcut.getExtra("app_id").toIntOrNull()
+        return runBlocking {
+            try {
+                val localActual = appId?.let { getNewestActualLocalCloudSaveTimestamp(context, it, resolveShortcutContainer(context, shortcut)) }
+                val localTracked =
+                    appId
+                        ?.let { SteamService.getTrackedCloudSaveFiles(it) }
+                        ?.maxOfOrNull { it.timestamp }
+                val snapshot = appId?.let { SteamService.fetchCloudConflictSnapshot(it, context) }
+                val cloudLabel =
+                    when {
+                        appId == null -> LABEL_NO_CLOUD_SAVES
+                        snapshot == null -> LABEL_CLOUD_UNREACHABLE
+                        else -> formatTimestamp(snapshot.newestRemoteTimestamp, LABEL_NO_CLOUD_SAVES)
+                    }
+                SteamCloudConflictTimestamps(
+                    localTimestampLabel = formatTimestamp(localActual ?: localTracked, LABEL_NO_LOCAL_SAVES),
+                    cloudTimestampLabel = cloudLabel,
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to build Steam cloud conflict timestamps for %s", shortcut.name)
+                SteamCloudConflictTimestamps(LABEL_NO_LOCAL_SAVES, LABEL_CLOUD_UNREACHABLE)
+            }
+        }
+    }
+
+    @JvmStatic
+    fun downloadCloudSaves(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        if (shortcut.getExtra("game_source") != "STEAM") return false
+        val result = runBlocking { forceDownload(context, shortcut) }
+        if (result) {
+            markCloudSaveSynced(context, shortcut.getExtra("app_id"), resolveShortcutContainer(context, shortcut))
+        }
+        Timber.i("Steam cloud save download for %s: %s", shortcut.name, result)
+        return result
+    }
+
+    suspend fun syncBeforeLaunch(
+        context: Context,
+        shortcut: Shortcut,
+        preferredSave: SaveLocation = SaveLocation.None,
+        ignorePendingOperations: Boolean = false,
+    ): PostSyncInfo? {
+        if (shortcut.getExtra("game_source") != "STEAM") return null
+        val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return null
+        val prefixToPath = steamPrefixResolver(context, appId, resolveShortcutContainer(context, shortcut))
+        val syncInfo =
+            SteamService
+                .beginLaunchApp(
+                    appId = appId,
+                    preferredSave = preferredSave,
+                    ignorePendingOperations = ignorePendingOperations,
+                    prefixToPath = prefixToPath,
+                    isOffline = isOfflineMode(shortcut),
+                ).await()
+
+        if (syncInfo.syncResult == SyncResult.Success || syncInfo.syncResult == SyncResult.UpToDate) {
+            probeCache.remove(appId)
+            runCatching {
+                SteamService.pushCloudStateToLibSteamClient(appId)
+            }.onFailure { e ->
+                Timber.w(e, "syncBeforeLaunch: libsteamclient cloud refresh failed for app=%d", appId)
+            }
+        }
+        return syncInfo
+    }
+
+    fun syncBeforeLaunchBlocking(
+        context: Context,
+        shortcut: Shortcut,
+        preferredSave: SaveLocation = SaveLocation.None,
+        ignorePendingOperations: Boolean = false,
+    ): PostSyncInfo? =
+        runBlocking(Dispatchers.IO) {
+            syncBeforeLaunch(context, shortcut, preferredSave, ignorePendingOperations)
+        }
+
+    /** Upload local Steam saves over Steam Cloud (after "Use Local"); bumps the local change number so the conflict doesn't recur. */
+    suspend fun uploadLocalSaves(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): Boolean =
+        try {
+            // MD-5: abort if container activation fails — otherwise we'd upload the wrong game's wineprefix over this game's Steam Cloud.
+            if (!activateContainerForCloudOp(context, appId, containerHint)) {
+                Timber.e("uploadLocalSaves: aborting — container activation failed for appId=%d", appId)
+                false
+            } else {
+                val prefixToPath = steamPrefixResolver(context, appId, containerHint)
+                val syncInfo =
+                    SteamService
+                        .forceSyncUserFiles(
+                            appId = appId,
+                            prefixToPath = prefixToPath,
+                            preferredSave = SaveLocation.Local,
+                            overrideLocalChangeNumber = -1,
+                        ).await()
+                val ok = syncInfo?.syncResult == SyncResult.Success || syncInfo?.syncResult == SyncResult.UpToDate
+                if (ok) {
+                    probeCache.remove(appId)
+                    CoroutineScope(Dispatchers.IO).launch {
+                        runCatching {
+                            SteamSaveSnapshotManager.recordSnapshot(
+                                context,
+                                appId,
+                                GameSaveBackupManager.BackupOrigin.LOCAL,
+                                containerHint,
+                            )
+                        }.onFailure { Timber.w(it, "Snapshot after Use-Local upload failed for appId=%d", appId) }
+                    }
+                }
+                ok
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to upload local Steam saves for appId=%d", appId)
+            false
+        }
+
+    @JvmStatic
+    fun uploadLocalSavesBlocking(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        if (shortcut.getExtra("game_source") != "STEAM") return false
+        val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return false
+        return runBlocking { uploadLocalSaves(context, appId, resolveShortcutContainer(context, shortcut)) }
+    }
+
+    /** Resolve the container a shortcut actually runs/saves in: the `container_id` override wins over shortcut.container (which goes stale once a game is reassigned). */
+    fun resolveShortcutContainer(
+        context: Context,
+        shortcut: Shortcut,
+    ): Container? {
+        val overrideId = shortcut.getExtra("container_id").toIntOrNull()?.takeIf { it > 0 }
+        return overrideId?.let { ContainerManager(context).getContainerById(it) } ?: shortcut.container
+    }
+
+    @JvmStatic
+    fun downloadCloudSaves(
+        context: Context,
+        gameId: String,
+    ): Boolean {
+        val appId = gameId.toIntOrNull() ?: return false
+        val result = runBlocking { forceDownloadById(context, appId) }
+        if (result) markCloudSaveSynced(context, gameId, ContainerUtils.getUsableContainerOrNull(context, gameId))
+        Timber.i("Steam cloud save download for %s: %s", gameId, result)
+        return result
+    }
+
+    private fun markCloudSaveSynced(
+        context: Context,
+        appId: String,
+        container: Container?,
+    ) {
+        if (appId.isEmpty()) return
+        val prefs = context.getSharedPreferences("cloud_sync_state", Context.MODE_PRIVATE)
+        prefs.edit().putString("synced_STEAM_$appId", containerFingerprint(container)).apply()
+    }
+
+    private fun containerFingerprint(container: Container?): String {
+        if (container == null) return "none"
+        val root = container.rootDir ?: return "id-${container.id}"
+        val wineDir = File(root, ".wine")
+        val sig = if (wineDir.exists()) wineDir.lastModified() else 0L
+        return "${container.id}:$sig"
+    }
+
+    private fun steamPrefixResolver(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): (String) -> String {
+        // PathType resolves save roots through the active `home/xuser` symlink, so activate the game's container first or paths read/write another game's wineprefix. (appId fallback is only for callers without shortcut context.)
+        activateContainerForCloudOp(context, appId, containerHint)
+
+        val accountId =
+            SteamService.userSteamId?.accountID?.toLong()
+                ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }?.let { it and 0xFFFFFFFFL }
+                ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
+                ?: 0L
+        return { prefix -> PathType.from(prefix).toAbsPath(context, appId, accountId) }
+    }
+
+    private fun activateContainerForCloudOp(
+        context: Context,
+        appId: Int,
+        containerHint: Container?,
+    ): Boolean {
+        val target =
+            containerHint
+                ?: ContainerUtils.getUsableContainerOrNull(context, appId.toString())
+                ?: return true // no container to activate — nothing to point at the wrong prefix
+        return activateContainer(context, target)
+    }
+
+    private fun activateContainer(
+        context: Context,
+        container: Container,
+    ): Boolean {
+        // MD-5: activateContainer returns false (no throw) when it can't re-point the `home/xuser` symlink; honor the boolean or every later path read/writes the previously-active container's saves.
+        val ok =
+            runCatching {
+                ContainerManager(context).activateContainer(container)
+            }.onFailure { Timber.e(it, "Failed to activate container id=%d (threw)", container.id) }
+                .getOrDefault(false)
+        if (!ok) {
+            Timber.e(
+                "activateContainer: could not activate container id=%d; the xuser symlink may point " +
+                    "at the wrong wineprefix",
+                container.id,
+            )
+        }
+        return ok
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamExitCloudSync.kt b/app/src/main/feature/steamcloudsync/SteamExitCloudSync.kt
new file mode 100644
index 000000000..6ccf56dfd
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamExitCloudSync.kt
@@ -0,0 +1,138 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import android.app.Activity
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.Shortcut
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+object SteamExitCloudSync {
+    fun interface StatusSink {
+        fun show(text: String)
+    }
+
+    fun interface ResultCallback {
+        fun onComplete(result: Result)
+    }
+
+    data class Result(
+        val success: Boolean,
+        val message: String,
+        val retryable: Boolean,
+    )
+
+    @JvmStatic
+    fun syncOnExit(
+        activity: Activity,
+        shortcut: Shortcut?,
+        sessionContainer: Container?,
+        statusSink: StatusSink,
+        callback: ResultCallback,
+    ) {
+        if (shortcut?.getExtra("game_source") != "STEAM") {
+            callback.onComplete(Result(success = true, message = "", retryable = false))
+            return
+        }
+
+        // Sync the wineprefix the session actually ran in; shortcut.container goes stale after a container reassignment.
+        val syncContainer =
+            sessionContainer ?: SteamCloudSyncHelper.resolveShortcutContainer(activity, shortcut)
+
+        val appId = shortcut.getExtra("app_id").toIntOrNull()
+        if (appId == null) {
+            callback.onComplete(Result(success = false, message = "Invalid Steam app id.", retryable = false))
+            return
+        }
+
+        Timber.tag("SteamExitCloudSync").d("Syncing Steam cloud saves for appId=%d", appId)
+        statusSink.show(activity.getString(R.string.preloader_uploading_cloud))
+
+        try {
+            SteamService.syncCloudOnExit(
+                activity,
+                appId,
+                object : SteamService.Companion.CloudSyncCallback {
+                    override fun onProgress(
+                        message: String,
+                        progress: Float,
+                    ) {
+                        val percent = (progress * 100).toInt()
+                        activity.runOnUiThread {
+                            statusSink.show("$message ($percent%)")
+                        }
+                    }
+
+                    override fun onComplete(
+                        success: Boolean,
+                        message: String,
+                    ) {
+                        if (success) {
+                            // Capture a rollback snapshot of the just-uploaded state. Best-effort —
+                            // fires on a detached IO scope so we don't delay the exit dialog.
+                            CoroutineScope(Dispatchers.IO).launch {
+                                runCatching {
+                                    SteamSaveSnapshotManager.recordSnapshot(
+                                        activity.applicationContext,
+                                        appId,
+                                        GameSaveBackupManager.BackupOrigin.AUTO,
+                                        syncContainer,
+                                    )
+                                }.onFailure {
+                                    Timber.tag("SteamExitCloudSync").w(
+                                        it,
+                                        "recordSnapshot failed for appId=%d",
+                                        appId,
+                                    )
+                                }
+                            }
+                        }
+                        callback.onComplete(
+                            Result(
+                                success = success,
+                                message = message,
+                                retryable = isRetryable(message),
+                            ),
+                        )
+                    }
+                },
+                syncContainer,
+            )
+        } catch (e: Exception) {
+            Timber.tag("SteamExitCloudSync").w(e, "Failed to initiate Steam cloud sync")
+            callback.onComplete(Result(success = false, message = e.message ?: "Steam cloud sync failed.", retryable = true))
+        }
+    }
+
+    /**
+     * A failure is retryable only when re-running the sync stands a chance of succeeding.
+     *
+     * Steam protocol (per `steammessages_cloud.steamclient.proto` + EResult conventions):
+     *  - `RemoteFileConflict` (Conflict)    — needs user intervention via the launch-time
+     *                                          dialog. Retry will keep hitting the same Conflict.
+     *  - `Busy` / `InProgress` / pending    — transient lock; we let the outer retry handle it.
+     *  - `AccessDenied` / auth issues       — need re-auth; pointless to retry the same call.
+     *  - `Offline` / no connection          — bounded retry won't help on a tap-out cycle.
+     *  - `UpdateFail` / `DownloadFail`      — transient network/server issue; worth retrying.
+     *  - Any other transient (Timeout, etc) — retry with backoff.
+     *
+     * Match strings produced by [SteamService.closeApp]'s discriminating `lastErrorMessage`.
+     */
+    private fun isRetryable(message: String?): Boolean {
+        if (message.isNullOrEmpty()) return true
+        val lower = message.lowercase()
+        return when {
+            lower.contains("conflict") -> false
+            lower.contains("pending") -> false
+            lower.contains("access denied") -> false
+            lower.contains("not signed in") -> false
+            lower.contains("logged in elsewhere") -> false
+            lower.contains("offline") -> false
+            else -> true
+        }
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamLaunchCloudSync.kt b/app/src/main/feature/steamcloudsync/SteamLaunchCloudSync.kt
new file mode 100644
index 000000000..81a99a326
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamLaunchCloudSync.kt
@@ -0,0 +1,208 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import android.app.Activity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.google.GoogleAuthMode
+import com.winlator.cmod.runtime.container.Shortcut
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+object SteamLaunchCloudSync {
+    fun interface StatusSink {
+        fun show(text: String)
+    }
+
+    /** Launch-time Steam cloud reconciliation. Steam-only — never starts Google Play Games or Drive consent. */
+    @JvmStatic
+    fun syncBeforeLaunch(
+        activity: Activity,
+        shortcut: Shortcut?,
+        cloudSyncEnabled: Boolean,
+        statusSink: StatusSink,
+    ) {
+        if (shortcut == null) return
+        if (shortcut.getExtra("game_source") != "STEAM") return
+        if (!cloudSyncEnabled || SteamCloudSyncHelper.isOfflineMode(shortcut)) return
+
+        SteamCloudSyncHelper.forceDownloadOnContainerSwap(activity, shortcut)
+
+        statusSink.show(activity.getString(R.string.preloader_checking_cloud))
+        val initialSync =
+            runCatching {
+                SteamCloudSyncHelper.syncBeforeLaunchBlocking(activity, shortcut, SaveLocation.None)
+            }.onFailure { e ->
+                Timber.tag("SteamLaunchCloudSync").w(e, "Steam launch cloud sync failed")
+            }.getOrNull()
+
+        when (initialSync?.syncResult) {
+            SyncResult.Success,
+            SyncResult.UpToDate,
+            null,
+            -> {
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+                return
+            }
+            SyncResult.Conflict -> {
+                showConflictAndResolve(activity, shortcut, statusSink, initialSync)
+                return
+            }
+            SyncResult.PendingOperations -> {
+                Timber.tag("SteamLaunchCloudSync").w(
+                    "Steam launch cloud sync has pending remote operations for %s: %s",
+                    shortcut.name,
+                    initialSync.pendingRemoteOperations,
+                )
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+                return
+            }
+            else -> {
+                Timber.tag("SteamLaunchCloudSync").w(
+                    "Steam launch cloud sync returned %s for %s",
+                    initialSync.syncResult,
+                    shortcut.name,
+                )
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+                return
+            }
+        }
+    }
+
+    private fun showConflictAndResolve(
+        activity: Activity,
+        shortcut: Shortcut,
+        statusSink: StatusSink,
+        initialSync: PostSyncInfo,
+    ) {
+        val dialogLatch = CountDownLatch(1)
+        var useCloud = false
+        var keepBackup = false
+        val timestamps = SteamCloudSyncHelper.timestampsFromSyncInfo(activity, shortcut, initialSync)
+
+        // If the activity is destroyed while the dialog is up, release the latch on ON_DESTROY or this thread blocks forever; default useCloud=false falls back to "keep local".
+        val lifecycle = (activity as? LifecycleOwner)?.lifecycle
+        val cancelObserver =
+            LifecycleEventObserver { _, event ->
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    Timber.tag("SteamLaunchCloudSync").w(
+                        "Activity destroyed while cloud-conflict dialog was up; releasing latch",
+                    )
+                    dialogLatch.countDown()
+                }
+            }
+
+        activity.runOnUiThread {
+            lifecycle?.addObserver(cancelObserver)
+            SteamCloudConflictDialog.show(
+                activity,
+                timestamps,
+                onUseCloud = { keep ->
+                    useCloud = true
+                    keepBackup = keep
+                    dialogLatch.countDown()
+                },
+                onUseLocal = { keep ->
+                    useCloud = false
+                    keepBackup = keep
+                    dialogLatch.countDown()
+                },
+            )
+        }
+
+        try {
+            // Timeout in case the dialog and lifecycle observer both fail to fire — bounds the worst case.
+            if (!dialogLatch.await(10, TimeUnit.MINUTES)) {
+                Timber.tag("SteamLaunchCloudSync").w(
+                    "Cloud-conflict dialog timed out after 10 minutes; treating as 'keep local'",
+                )
+            }
+        } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
+            activity.runOnUiThread { lifecycle?.removeObserver(cancelObserver) }
+            return
+        }
+
+        activity.runOnUiThread { lifecycle?.removeObserver(cancelObserver) }
+
+        if (keepBackup && useCloud) {
+            // "Use Cloud" overwrites the LOCAL save — snapshot it first.
+            backupDiscardedSave(activity, shortcut, GameSaveBackupManager.BackupOrigin.LOCAL)
+        }
+        if (keepBackup && !useCloud) {
+            // "Use Local" overwrites the CLOUD save (maybe newer progress from another device); Steam keeps no server-side history, so capture the cloud copy first.
+            backupDiscardedCloudSave(activity, shortcut)
+        }
+        val preferredSave = if (useCloud) SaveLocation.Remote else SaveLocation.Local
+        statusSink.show(
+            activity.getString(
+                if (useCloud) R.string.preloader_downloading_cloud else R.string.preloader_uploading_cloud,
+            ),
+        )
+        runCatching {
+            SteamCloudSyncHelper.syncBeforeLaunchBlocking(activity, shortcut, preferredSave)
+        }.onFailure { e ->
+            Timber.tag("SteamLaunchCloudSync").w(e, "Steam conflict resolution sync failed")
+        }
+        statusSink.show(activity.getString(R.string.preloader_initializing))
+    }
+
+    private fun backupDiscardedSave(
+        activity: Activity,
+        shortcut: Shortcut,
+        origin: GameSaveBackupManager.BackupOrigin,
+    ) {
+        val gameId = shortcut.getExtra("app_id").takeIf { it.isNotEmpty() } ?: return
+        val gameName = shortcut.name ?: "Unknown"
+        try {
+            val result =
+                runBlocking(Dispatchers.IO) {
+                    GameSaveBackupManager.backupDiscardedSave(
+                        activity = activity,
+                        gameSource = GameSaveBackupManager.GameSource.STEAM,
+                        gameId = gameId,
+                        gameName = gameName,
+                        origin = origin,
+                        authMode = GoogleAuthMode.RESUME,
+                        containerHint = SteamCloudSyncHelper.resolveShortcutContainer(activity, shortcut),
+                    )
+                }
+            Timber.tag("SteamLaunchCloudSync").i("Discarded Steam save backup: %s", result.message)
+        } catch (e: Exception) {
+            Timber.tag("SteamLaunchCloudSync").w(e, "Failed to back up discarded Steam save")
+        }
+    }
+
+    /** Capture the Steam Cloud save before "Use Local" overwrites it — non-destructive pre-capture (never touches the live local save). Best-effort. */
+    private fun backupDiscardedCloudSave(
+        activity: Activity,
+        shortcut: Shortcut,
+    ) {
+        val appId = shortcut.getExtra("app_id").takeIf { it.isNotEmpty() }?.toIntOrNull() ?: return
+        try {
+            val captured =
+                runBlocking(Dispatchers.IO) {
+                    SteamSaveSnapshotManager.captureCloudSnapshot(
+                        activity.applicationContext,
+                        appId,
+                        SteamCloudSyncHelper.resolveShortcutContainer(activity, shortcut),
+                    )
+                }
+            Timber.tag("SteamLaunchCloudSync").i(
+                "Cloud save pre-capture before Use-Local for appId=%d: %s",
+                appId,
+                captured,
+            )
+        } catch (e: Exception) {
+            Timber.tag("SteamLaunchCloudSync").w(e, "Failed to capture cloud save before Use-Local")
+        }
+    }
+}
diff --git a/app/src/main/feature/steamcloudsync/SteamSaveSnapshotManager.kt b/app/src/main/feature/steamcloudsync/SteamSaveSnapshotManager.kt
new file mode 100644
index 000000000..45ba13ab0
--- /dev/null
+++ b/app/src/main/feature/steamcloudsync/SteamSaveSnapshotManager.kt
@@ -0,0 +1,1004 @@
+package com.winlator.cmod.feature.steamcloudsync
+
+import android.app.Activity
+import android.content.Context
+import com.winlator.cmod.feature.stores.steam.enums.PathType
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupHistoryEntry
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupOrigin
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupStorage
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.MAX_HISTORY_ENTRIES
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.HISTORY_MAX_AGE_DAYS
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.MAX_HISTORY_LABEL_LENGTH
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.sanitizeHistoryLabel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.nio.file.StandardCopyOption
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+import java.util.concurrent.ConcurrentHashMap
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+/** Local rolling-snapshot history for Steam Cloud saves (which has no server-side version history): a zip of the live save dirs per sync, keyed by appId under filesDir/save_history/steam. metadata.json is the commit marker, written after save.zip; entries with unparseable metadata are skipped. */
+object SteamSaveSnapshotManager {
+    private const val TAG = "SteamSaveSnapshot"
+    private const val ROOT_DIR_NAME = "save_history"
+    private const val STEAM_SUBDIR = "steam"
+    private const val SAVE_FILE_NAME = "save.zip"
+    private const val SAVE_TMP_NAME = "save.zip.tmp"
+    private const val META_FILE_NAME = "metadata.json"
+    private const val SCHEMA_VERSION = 1
+
+    /** Per-game cap on total compressed bytes across all snapshots — bounds disk usage. */
+    private const val MAX_TOTAL_BYTES_PER_GAME: Long = 500L * 1024L * 1024L
+
+    private val saveIdRandom = SecureRandom()
+    private val mutexes = ConcurrentHashMap<Int, Mutex>()
+
+    private fun mutexFor(appId: Int): Mutex = mutexes.getOrPut(appId) { Mutex() }
+
+    private fun rootDir(context: Context): File = File(context.filesDir, "$ROOT_DIR_NAME/$STEAM_SUBDIR")
+
+    private fun appDir(context: Context, appId: Int): File = File(rootDir(context), appId.toString())
+
+    private fun entryDir(context: Context, appId: Int, entryId: String): File = File(appDir(context, appId), entryId)
+
+    /** Snapshot the on-disk save for [appId] into a new history entry. SHA-256-deduped against the newest snapshot to skip idempotent re-syncs. Best-effort; returns true on a successful write. */
+    suspend fun recordSnapshot(
+        context: Context,
+        appId: Int,
+        origin: BackupOrigin,
+        containerHint: Container? = null,
+    ): Boolean =
+        withContext(Dispatchers.IO) {
+            try {
+                mutexFor(appId).withLock {
+                    captureSnapshotLocked(context, appId, origin, containerHint)
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "recordSnapshot: outer failure for appId=%d", appId)
+                false
+            }
+        }
+
+    /** Capture the current Steam Cloud save into a local snapshot WITHOUT touching the live save dir — non-destructive, used before "Use Local" overwrites the cloud. Commits only a COMPLETE snapshot (partial download aborts). Best-effort. */
+    suspend fun captureCloudSnapshot(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): Boolean =
+        withContext(Dispatchers.IO) {
+            try {
+                mutexFor(appId).withLock {
+                    captureCloudSnapshotLocked(context, appId, containerHint)
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "captureCloudSnapshot: outer failure for appId=%d", appId)
+                false
+            }
+        }
+
+    /** Cloud-capture core; caller MUST already hold `mutexFor(appId)`. */
+    private suspend fun captureCloudSnapshotLocked(
+        context: Context,
+        appId: Int,
+        containerHint: Container?,
+    ): Boolean {
+        if (resolveAccountId() == 0L) {
+            Timber.tag(TAG).w("captureCloudSnapshot: not signed in to Steam; skipping appId=%d", appId)
+            return false
+        }
+        val appInfo = SteamService.getAppInfoOf(appId)
+        if (appInfo == null) {
+            Timber.tag(TAG).w("captureCloudSnapshot: no app info for appId=%d", appId)
+            return false
+        }
+        val fileList = SteamService.fetchCloudFileList(appId)
+        if (fileList == null) {
+            Timber.tag(TAG).w("captureCloudSnapshot: cloud file list unavailable for appId=%d", appId)
+            return false
+        }
+
+        // MD-5: abort if the container can't be activated — path resolution below would target the wrong game's wineprefix.
+        if (!activateContainerForCloudOp(context, appId, containerHint)) {
+            Timber.tag(TAG).e("captureCloudSnapshot: container activation failed for appId=%d; aborting", appId)
+            return false
+        }
+        // Resolve cloud files to canonical local paths + (zipRoot -> live dir) sources so the snapshot is restorable through restoreFromEntry.
+        val prefixResolver = steamPrefixResolver(context, appId, containerHint)
+        val targets = SteamAutoCloud.resolvePersistedCloudFiles(appInfo, fileList, prefixResolver)
+        if (targets.isEmpty()) {
+            Timber.tag(TAG).i("captureCloudSnapshot: no persisted cloud files for appId=%d", appId)
+            return false
+        }
+        val saveSources = enumerateSaveSources(context, appId, forRestore = true, containerHint = containerHint)
+        if (saveSources.isEmpty()) {
+            Timber.tag(TAG).w("captureCloudSnapshot: cannot resolve save dirs for appId=%d", appId)
+            return false
+        }
+        // Match most-specific (longest) dir first so a file under a nested source isn't mis-attributed to a parent source.
+        val sourceRoots =
+            saveSources
+                .map { it.zipRoot to it.localDir.toPath().toAbsolutePath().normalize() }
+                .sortedByDescending { it.second.toString().length }
+
+        cleanupPartialEntries(context, appId)
+        val staging = File(context.cacheDir, "wn_cloud_capture_${appId}_${buildEntryId(System.currentTimeMillis())}")
+        if (!staging.mkdirs() && !staging.isDirectory) {
+            Timber.tag(TAG).e("captureCloudSnapshot: failed to create staging dir for appId=%d", appId)
+            return false
+        }
+        try {
+            val usedZipRoots = linkedSetOf<String>()
+            var captured = 0
+            for (target in targets) {
+                val localNorm = target.localPath.toAbsolutePath().normalize()
+                val match = sourceRoots.firstOrNull { (_, dir) -> localNorm.startsWith(dir) } ?: continue
+                val (zipRoot, dir) = match
+                val rel = dir.relativize(localNorm).toString()
+                if (rel.isEmpty() || rel.startsWith("..")) continue
+
+                val bytes = SteamService.downloadCloudFileBytes(appId, target.downloadName)
+                if (bytes == null) {
+                    // A persisted, in-scope cloud file we couldn't download — refuse to commit a partial backup that would look complete.
+                    Timber.tag(TAG).e(
+                        "captureCloudSnapshot: download failed for %s (appId=%d); aborting capture",
+                        target.downloadName,
+                        appId,
+                    )
+                    return false
+                }
+
+                val zipRootDir = File(staging, zipRoot)
+                val outFile = File(zipRootDir, rel)
+                // Defensive containment — never write outside staging/<zipRoot>.
+                if (!outFile.canonicalPath.startsWith(zipRootDir.canonicalPath + File.separator)) {
+                    Timber.tag(TAG).w("captureCloudSnapshot: skipping out-of-bounds entry %s", rel)
+                    continue
+                }
+                outFile.parentFile?.mkdirs()
+                FileOutputStream(outFile).use { it.write(bytes) }
+                usedZipRoots += zipRoot
+                captured++
+            }
+            if (captured == 0) {
+                Timber.tag(TAG).i("captureCloudSnapshot: no in-scope cloud files captured for appId=%d", appId)
+                return false
+            }
+            val stagingSources = usedZipRoots.map { SaveSource(it, File(staging, it)) }
+            return writeSnapshotEntry(context, appId, stagingSources, BackupOrigin.CLOUD, dedup = false)
+        } finally {
+            runCatching { staging.deleteRecursively() }
+        }
+    }
+
+    /** Capture-snapshot core; caller MUST already hold `mutexFor(appId)`. Returns true on a successful write; false on dedup-skip or write failure. */
+    private fun captureSnapshotLocked(
+        context: Context,
+        appId: Int,
+        origin: BackupOrigin,
+        containerHint: Container? = null,
+    ): Boolean {
+        if (!activateContainerForCloudOp(context, appId, containerHint)) {
+            Timber.tag(TAG).e("captureSnapshotLocked: container activation failed for appId=%d; skipping snapshot", appId)
+            return false
+        }
+        cleanupPartialEntries(context, appId)
+        val sources = enumerateSaveSources(context, appId, containerHint = containerHint)
+        if (sources.isEmpty()) {
+            Timber.tag(TAG).i("captureSnapshotLocked: no save sources for appId=%d", appId)
+            return false
+        }
+
+        return writeSnapshotEntry(context, appId, sources, origin)
+    }
+
+    /** Commit a snapshot entry from resolved [sources] (zipRoot -> dir). [dedup]=true skips a snapshot matching the newest entry's hash; cloud pre-capture passes false so a cloud backup is always materialized. */
+    private fun writeSnapshotEntry(
+        context: Context,
+        appId: Int,
+        sources: List<SaveSource>,
+        origin: BackupOrigin,
+        dedup: Boolean = true,
+    ): Boolean {
+        val liveHash = sha256OfSources(sources)
+        if (dedup) {
+            val newest = listEntriesInternal(context, appId).firstOrNull()
+            if (newest != null && newest.sha256 == liveHash) {
+                Timber.tag(TAG).d(
+                    "writeSnapshotEntry: content SHA matches newest (entry=%s); skipping",
+                    newest.entryId,
+                )
+                return false
+            }
+        }
+
+        val createdAtMs = System.currentTimeMillis()
+        val entryId = buildEntryId(createdAtMs)
+        val target = entryDir(context, appId, entryId)
+        if (!target.mkdirs() && !target.isDirectory) {
+            Timber.tag(TAG).e("writeSnapshotEntry: failed to create %s", target)
+            return false
+        }
+
+        val tmpZip = File(target, SAVE_TMP_NAME)
+        val finalZip = File(target, SAVE_FILE_NAME)
+        val metaFile = File(target, META_FILE_NAME)
+        return try {
+            val totalUncompressed = zipSourcesToFile(sources, tmpZip)
+            Files.move(
+                tmpZip.toPath(),
+                finalZip.toPath(),
+                StandardCopyOption.ATOMIC_MOVE,
+                StandardCopyOption.REPLACE_EXISTING,
+            )
+            val compressed = finalZip.length()
+            val meta =
+                SnapshotMeta(
+                    schema = SCHEMA_VERSION,
+                    entryId = entryId,
+                    appId = appId,
+                    timestampMs = createdAtMs,
+                    origin = origin,
+                    uncompressedSize = totalUncompressed,
+                    compressedSize = compressed,
+                    sha256 = liveHash,
+                    label = null,
+                    sources = sources.map { it.zipRoot },
+                    storage = BackupStorage.STEAM_LOCAL.name,
+                )
+            writeMetadataAtomic(metaFile, meta)
+            Timber.tag(TAG).i(
+                "writeSnapshotEntry: wrote %s (%d bytes compressed, origin=%s) for appId=%d",
+                entryId,
+                compressed,
+                origin.tag,
+                appId,
+            )
+            pruneSnapshotsInternal(context, appId, pinEntryId = entryId)
+            true
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "writeSnapshotEntry: write failed; cleaning up partial entry")
+            runCatching { target.deleteRecursively() }
+            false
+        }
+    }
+
+    /** Return the up-to-[MAX_HISTORY_ENTRIES] newest snapshots for [appId], newest-first. */
+    suspend fun listHistory(context: Context, appId: Int): List<BackupHistoryEntry> =
+        withContext(Dispatchers.IO) {
+            try {
+                mutexFor(appId).withLock {
+                    cleanupPartialEntries(context, appId)
+                    pruneSnapshotsInternal(context, appId, pinEntryId = null)
+                    listEntriesInternal(context, appId).map { it.toBackupHistoryEntry() }
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "listHistory failed for appId=%d", appId)
+                emptyList()
+            }
+        }
+
+    /** Restore [entryId]: unzip into the live save dirs, then upload to Steam Cloud so the rolled-back state becomes canonical. Caller should ensure the game is NOT running (warn-only). */
+    suspend fun restoreFromEntry(
+        activity: Activity,
+        appId: Int,
+        entryId: String,
+        containerHint: Container? = null,
+    ): BackupResult =
+        withContext(Dispatchers.IO) {
+            try {
+                mutexFor(appId).withLock {
+                    val context = activity.applicationContext
+                    val entryDir = entryDir(context, appId, entryId)
+                    val zipFile = File(entryDir, SAVE_FILE_NAME)
+                    val metaFile = File(entryDir, META_FILE_NAME)
+                    if (!zipFile.exists() || !metaFile.exists()) {
+                        return@withLock BackupResult(false, "Snapshot is missing.")
+                    }
+                    val meta = readMetadata(metaFile)
+                        ?: return@withLock BackupResult(false, "Snapshot metadata is unreadable.")
+                    if (resolveAccountId() == 0L) {
+                        return@withLock BackupResult(false, "Sign in to Steam before restoring.")
+                    }
+                    // MD-5: abort if the container can't be activated — restore writes into the resolved dirs and re-uploads, so a wrong prefix would corrupt another game's saves.
+                    if (!activateContainerForCloudOp(context, appId, containerHint)) {
+                        return@withLock BackupResult(
+                            false,
+                            "Could not prepare this game's container; restore aborted to avoid writing to the wrong save directory.",
+                        )
+                    }
+                    // forRestore=true so we get resolved target paths even when the live dir is empty/missing — restore must mkdir + extract into those.
+                    val sources = enumerateSaveSources(context, appId, forRestore = true, containerHint = containerHint)
+                    if (sources.isEmpty()) {
+                        return@withLock BackupResult(false, "Cannot determine save directory for this game.")
+                    }
+                    // Restrict the destructive restore to exactly the sources this snapshot captured, so we never clear unrelated save dirs.
+                    val snapshotRoots = meta.sources.toSet()
+                    val targetSources =
+                        if (snapshotRoots.isEmpty()) sources else sources.filter { it.zipRoot in snapshotRoots }
+                    if (targetSources.isEmpty()) {
+                        return@withLock BackupResult(false, "Snapshot does not match this game's save layout.")
+                    }
+
+                    // M-3: verify snapshot integrity BEFORE touching the live save — sha256 is over the source FILES, so extract to a temp tree and recompute; a corrupt snapshot is rejected with the live save untouched.
+                    if (meta.sha256.isNotEmpty()) {
+                        val verifyDir = File(context.cacheDir, "wn_restore_verify_${appId}_$entryId")
+                        val integrityOk =
+                            try {
+                                verifyDir.deleteRecursively()
+                                verifyDir.mkdirs()
+                                val verifySources =
+                                    targetSources.map { SaveSource(it.zipRoot, File(verifyDir, it.zipRoot)) }
+                                verifySources.forEach { it.localDir.mkdirs() }
+                                extractZipToSources(zipFile, verifySources)
+                                sha256OfSources(verifySources) == meta.sha256
+                            } catch (e: Exception) {
+                                Timber.tag(TAG).e(e, "restoreFromEntry: integrity verify threw for entry=%s", entryId)
+                                false
+                            } finally {
+                                runCatching { verifyDir.deleteRecursively() }
+                            }
+                        if (!integrityOk) {
+                            Timber.tag(TAG).e(
+                                "restoreFromEntry: integrity check FAILED for entry=%s; refusing restore",
+                                entryId,
+                            )
+                            return@withLock BackupResult(
+                                false,
+                                "Snapshot failed its integrity check and was not restored.",
+                            )
+                        }
+                    }
+
+                    // Rollback safety: snapshot the current live save before overwriting it, so a regretted/failed restore is recoverable.
+                    runCatching { captureSnapshotLocked(context, appId, BackupOrigin.AUTO, containerHint) }
+                        .onFailure { Timber.tag(TAG).w(it, "restoreFromEntry: pre-restore snapshot failed") }
+
+                    // M-4: move each target dir aside, extract into a fresh dir, delete the aside-backup only on full success; on failure restore the aside dirs (the real rollback guarantee). Fresh dir keeps the restore an exact mirror.
+                    val asideDirs = mutableListOf<Triple<File, File?, Boolean>>() // (live, bak, hadLive)
+                    fun rollbackAside() {
+                        for ((live, bak, hadLive) in asideDirs.asReversed()) {
+                            runCatching { live.deleteRecursively() }
+                            if (hadLive && bak != null) runCatching { bak.renameTo(live) }
+                        }
+                    }
+                    try {
+                        for (src in targetSources) {
+                            val live = src.localDir
+                            val parent = live.parentFile
+                            if (parent == null || (!parent.exists() && !parent.mkdirs())) {
+                                rollbackAside()
+                                return@withLock BackupResult(false, "Restore failed; your existing save was left unchanged.")
+                            }
+                            val hadLive = live.exists()
+                            var bak: File? = null
+                            if (hadLive) {
+                                bak = File(parent, "${live.name}.wnrestorebak")
+                                runCatching { bak.deleteRecursively() }
+                                if (!live.renameTo(bak)) { // same-parent rename = atomic move-aside
+                                    rollbackAside()
+                                    return@withLock BackupResult(false, "Restore failed; your existing save was left unchanged.")
+                                }
+                            }
+                            live.mkdirs()
+                            asideDirs += Triple(live, bak, hadLive)
+                        }
+                        extractZipToSources(zipFile, targetSources)
+                    } catch (e: Exception) {
+                        Timber.tag(TAG).e(e, "restoreFromEntry: extraction failed; rolling back")
+                        rollbackAside()
+                        return@withLock BackupResult(false, "Restore failed; your existing save was left unchanged.")
+                    }
+                    // Extraction succeeded — drop the move-aside backups (commit).
+                    asideDirs.forEach { (_, bak, _) -> bak?.let { runCatching { it.deleteRecursively() } } }
+
+                    // Push the restored state to Steam Cloud so the next launch is consistent.
+                    val uploadOk = uploadLocalToSteam(context, appId, containerHint)
+                    if (uploadOk) {
+                        BackupResult(true, "Save restored and pushed to Steam Cloud.")
+                    } else {
+                        BackupResult(true, "Save restored locally; Steam Cloud upload deferred.")
+                    }
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "restoreFromEntry failed for appId=%d entry=%s", appId, entryId)
+                BackupResult(false, "Restore failed: ${e.message}")
+            }
+        }
+
+    /** Import user-supplied save files into the live Steam save dir. Downloaded files lose their relative path (browser strips it), so match each basename against the cloud file list to reconstruct the canonical subdir; no match → SteamUserData root, ambiguous → skip. Then snapshot and push to cloud. */
+    suspend fun importSnapshotFromFiles(
+        activity: Activity,
+        appId: Int,
+        uris: List<android.net.Uri>,
+        containerHint: Container? = null,
+    ): BackupResult =
+        withContext(Dispatchers.IO) {
+            try {
+                if (uris.isEmpty()) return@withContext BackupResult(false, "No files selected.")
+                mutexFor(appId).withLock {
+                    val context = activity.applicationContext
+                    val accountId = resolveAccountId()
+                    if (accountId == 0L) {
+                        return@withLock BackupResult(false, "Sign in to Steam before importing.")
+                    }
+                    val resolver = context.contentResolver
+                    val prefixResolver = steamPrefixResolver(context, appId, containerHint)
+
+                    // Cloud listing for basename → path reconstruction. If empty (never synced), refuse rather than flatten multi-file saves to the SteamUserData root, which would corrupt them.
+                    val cloudFiles = SteamService.getTrackedCloudSaveFiles(appId).orEmpty()
+                    if (cloudFiles.isEmpty()) {
+                        return@withLock BackupResult(
+                            false,
+                            "No cloud file list available yet — tap 'Sync from Steam Cloud' first so path reconstruction can work.",
+                        )
+                    }
+                    val byBasename = cloudFiles.groupBy { it.filename }
+
+                    val fallbackDir = File(PathType.SteamUserData.toAbsPath(context, appId, accountId))
+                    fallbackDir.mkdirs()
+                    // Containment root to sanity-check reconstructed paths — SteamUserData's drive_c parent is the tightest bound without knowing every game's UFS paths.
+                    val containmentRoot = runCatching {
+                        File(prefixResolver("SteamUserData")).canonicalFile.parentFile?.parentFile?.canonicalPath
+                            ?: File(prefixResolver("SteamUserData")).canonicalPath
+                    }.getOrNull()
+
+                    var written = 0
+                    var pathReconstructed = 0
+                    var fallback = 0
+                    var skippedAmbiguous = 0
+                    var skippedEscape = 0
+                    val skipNotes = mutableListOf<String>()
+
+                    for (uri in uris) {
+                        val displayName = queryDisplayName(resolver, uri)
+                        if (displayName == null) {
+                            skipNotes += "Skipped a file with no resolvable name."
+                            continue
+                        }
+                        val sanitizedBase = displayName.substringAfterLast('/').substringAfterLast('\\')
+                        if (sanitizedBase.isEmpty() || sanitizedBase.contains("..")) {
+                            skipNotes += "Skipped suspicious name: $sanitizedBase"
+                            continue
+                        }
+                        val matches = byBasename[sanitizedBase].orEmpty()
+                        val targetFile: File
+                        val isReconstructed: Boolean
+                        when {
+                            matches.size == 1 -> {
+                                targetFile = matches.first().getAbsPath(prefixResolver).toFile()
+                                isReconstructed = true
+                            }
+                            matches.size > 1 -> {
+                                skippedAmbiguous++
+                                skipNotes += "Skipped ambiguous file: $sanitizedBase"
+                                continue
+                            }
+                            else -> {
+                                targetFile = File(fallbackDir, sanitizedBase)
+                                isReconstructed = false
+                            }
+                        }
+                        // Defensive containment — refuse to write outside the wine prefix even if the cloud listing is malformed.
+                        val canonicalTarget = runCatching { targetFile.canonicalPath }.getOrNull()
+                        if (containmentRoot != null && canonicalTarget != null &&
+                            !canonicalTarget.startsWith(containmentRoot + File.separator) &&
+                            canonicalTarget != containmentRoot
+                        ) {
+                            skippedEscape++
+                            skipNotes += "Refused (outside prefix): $sanitizedBase"
+                            continue
+                        }
+                        targetFile.parentFile?.mkdirs()
+                        try {
+                            val input = resolver.openInputStream(uri)
+                            if (input == null) {
+                                skipNotes += "Could not open: $sanitizedBase"
+                                continue
+                            }
+                            input.use { src ->
+                                FileOutputStream(targetFile).use { output ->
+                                    val buf = ByteArray(8192)
+                                    var len: Int
+                                    while (src.read(buf).also { len = it } > 0) {
+                                        output.write(buf, 0, len)
+                                    }
+                                }
+                            }
+                            written++
+                            if (isReconstructed) pathReconstructed++ else fallback++
+                        } catch (e: Exception) {
+                            Timber.tag(TAG).w(e, "importSnapshotFromFiles: failed to copy %s", sanitizedBase)
+                            skipNotes += "Failed to write $sanitizedBase"
+                        }
+                    }
+
+                    if (written == 0) {
+                        val detail =
+                            if (skipNotes.isEmpty()) "No files were written." else skipNotes.joinToString("; ").take(200)
+                        return@withLock BackupResult(false, detail)
+                    }
+
+                    captureSnapshotLocked(context, appId, BackupOrigin.MANUAL, containerHint)
+                    // Retry the upload once after a delay so a concurrent background sync doesn't strand the imported state out of cloud.
+                    var uploadOk = uploadLocalToSteam(context, appId, containerHint)
+                    if (!uploadOk) {
+                        kotlinx.coroutines.delay(1_500)
+                        uploadOk = uploadLocalToSteam(context, appId, containerHint)
+                    }
+
+                    val parts = mutableListOf("Imported $written file(s)")
+                    if (pathReconstructed > 0) parts += "$pathReconstructed restored to original location"
+                    if (fallback > 0) parts += "$fallback placed at SteamUserData root (path unknown)"
+                    if (skippedAmbiguous > 0) parts += "$skippedAmbiguous ambiguous and skipped"
+                    if (skippedEscape > 0) parts += "$skippedEscape refused (outside prefix)"
+                    parts += if (uploadOk) "pushed to Steam Cloud" else "Steam Cloud upload deferred (tap Sync from Steam Cloud to retry)"
+                    BackupResult(true, parts.joinToString(", ") + ".")
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "importSnapshotFromFiles failed for appId=%d", appId)
+                BackupResult(false, "Import failed: ${e.message}")
+            }
+        }
+
+    /** Pull the SAF display name (basename) for [uri]. Returns null if not resolvable. */
+    private fun queryDisplayName(resolver: android.content.ContentResolver, uri: android.net.Uri): String? {
+        val cursor = runCatching {
+            resolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)
+        }.getOrNull() ?: return uri.lastPathSegment
+        return cursor.use {
+            if (it.moveToFirst()) {
+                val idx = it.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
+                if (idx >= 0) it.getString(idx) else null
+            } else {
+                null
+            }
+        } ?: uri.lastPathSegment
+    }
+
+    /** Update the user-visible label on a snapshot. */
+    suspend fun renameEntry(
+        context: Context,
+        appId: Int,
+        entryId: String,
+        newLabel: String?,
+    ): BackupResult =
+        withContext(Dispatchers.IO) {
+            try {
+                mutexFor(appId).withLock {
+                    val metaFile = File(entryDir(context, appId, entryId), META_FILE_NAME)
+                    val meta = readMetadata(metaFile)
+                        ?: return@withLock BackupResult(false, "Snapshot metadata is missing.")
+                    val cleanLabel = sanitizeHistoryLabel(newLabel)
+                    val updated = meta.copy(label = cleanLabel)
+                    writeMetadataAtomic(metaFile, updated)
+                    BackupResult(true, if (cleanLabel.isNullOrEmpty()) "Label cleared." else "Renamed.")
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "renameEntry failed for appId=%d entry=%s", appId, entryId)
+                BackupResult(false, "Rename failed: ${e.message}")
+            }
+        }
+
+    // ── Internal: enumeration / metadata ──
+
+    /** Live snapshot sources for [appId] — SteamUserData plus UFS Windows patterns. [forRestore]=false includes only existing non-empty dirs (capture); true returns all resolved paths so restore can mkdir+extract. */
+    private fun enumerateSaveSources(
+        context: Context,
+        appId: Int,
+        forRestore: Boolean = false,
+        containerHint: Container? = null,
+    ): List<SaveSource> {
+        // PathType.toAbsPath resolves through the `home/xuser` symlink, so activate this game's container first or a restore writes into the last-active container's prefix. Prefer the caller's container; the appId fallback returns the default when an x86 default is set.
+        activateContainerForCloudOp(context, appId, containerHint)
+
+        val accountId = resolveAccountId()
+        val sources = linkedMapOf<String, SaveSource>()
+
+        val userDataPath = PathType.SteamUserData.toAbsPath(context, appId, accountId)
+        val userDataDir = File(userDataPath)
+        if (forRestore || (userDataDir.exists() && (userDataDir.listFiles()?.isNotEmpty() == true))) {
+            sources[PathType.SteamUserData.name] = SaveSource(PathType.SteamUserData.name, userDataDir)
+        }
+
+        val appInfo = SteamService.getAppInfoOf(appId)
+        appInfo
+            ?.ufs
+            ?.saveFilePatterns
+            .orEmpty()
+            .filter { it.root.isWindows && it.root != PathType.SteamUserData }
+            .forEach { pattern ->
+                val baseAbs = pattern.root.toAbsPath(context, appId, accountId)
+                val candidate = File(Paths.get(baseAbs, pattern.substitutedPath).toString())
+                if (forRestore || (candidate.exists() && (candidate.listFiles()?.isNotEmpty() == true))) {
+                    val zipRoot = "${pattern.root.name}/${pattern.substitutedPath.trim('/').replace('/', '_')}"
+                        .ifEmpty { pattern.root.name }
+                    sources.putIfAbsent(zipRoot, SaveSource(zipRoot, candidate))
+                }
+            }
+
+        return sources.values.toList()
+    }
+
+    /** Public view of [enumerateSaveSources] (zipRoot -> live dir) so [GameSaveBackupManager] mirrors Steam saves to/from Google. */
+    fun enumerateGoogleSaveSources(
+        context: Context,
+        appId: Int,
+        forRestore: Boolean,
+        containerHint: Container? = null,
+    ): List<Pair<String, File>> =
+        enumerateSaveSources(context, appId, forRestore, containerHint).map { it.zipRoot to it.localDir }
+
+    private fun resolveAccountId(): Long =
+        SteamService.userSteamId?.accountID?.toLong()
+            ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }?.let { it and 0xFFFFFFFFL }
+            ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
+            ?: 0L
+
+    /** Push the local save up to Steam Cloud; forces overwrite (overrideLocalChangeNumber = -1) so the rollback isn't rejected as stale. */
+    private suspend fun uploadLocalToSteam(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): Boolean {
+        return try {
+            val resolver = steamPrefixResolver(context, appId, containerHint)
+            val info =
+                SteamService
+                    .forceSyncUserFiles(
+                        appId = appId,
+                        prefixToPath = resolver,
+                        preferredSave = SaveLocation.Local,
+                        overrideLocalChangeNumber = -1,
+                    ).await()
+            val result = info?.syncResult?.name
+            Timber.tag(TAG).i("uploadLocalToSteam appId=%d result=%s", appId, result)
+            result == "Success" || result == "UpToDate"
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "uploadLocalToSteam failed for appId=%d", appId)
+            false
+        }
+    }
+
+    private fun steamPrefixResolver(
+        context: Context,
+        appId: Int,
+        containerHint: Container? = null,
+    ): (String) -> String {
+        // See enumerateSaveSources — activate this game's container before paths resolve or upload/download lands in the wrong wineprefix.
+        activateContainerForCloudOp(context, appId, containerHint)
+
+        val accountId = resolveAccountId()
+        return { pathTypeName ->
+            val type = runCatching { PathType.valueOf(pathTypeName) }.getOrNull() ?: PathType.SteamUserData
+            type.toAbsPath(context, appId, accountId)
+        }
+    }
+
+    private fun activateContainerForCloudOp(
+        context: Context,
+        appId: Int,
+        containerHint: Container?,
+    ): Boolean {
+        val target =
+            containerHint
+                ?: ContainerUtils.getUsableContainerOrNull(context, appId.toString())
+                ?: return true // no container to activate — nothing to point at the wrong prefix
+        // MD-5: honor activateContainer's boolean — a swallowed false (symlink not re-pointed) left snapshot reads/writes on the wrong game's wineprefix.
+        val ok =
+            runCatching {
+                ContainerManager(context).activateContainer(target)
+            }.onFailure { Timber.tag(TAG).e(it, "Failed to activate container id=%d (threw)", target.id) }
+                .getOrDefault(false)
+        if (!ok) {
+            Timber.tag(TAG).e(
+                "activateContainerForCloudOp: container id=%d not activated; xuser may point at the wrong wineprefix",
+                target.id,
+            )
+        }
+        return ok
+    }
+
+    private fun listEntriesInternal(context: Context, appId: Int): List<SnapshotMeta> {
+        val dir = appDir(context, appId)
+        if (!dir.isDirectory) return emptyList()
+        return dir
+            .listFiles()
+            ?.filter { it.isDirectory }
+            ?.mapNotNull { sub ->
+                val meta = readMetadata(File(sub, META_FILE_NAME)) ?: return@mapNotNull null
+                if (!File(sub, SAVE_FILE_NAME).exists()) return@mapNotNull null
+                meta
+            }
+            ?.sortedByDescending { it.timestampMs }
+            ?: emptyList()
+    }
+
+    /** Apply count, age, and total-bytes caps. Pinned entry (just-written) survives this pass. */
+    private fun pruneSnapshotsInternal(context: Context, appId: Int, pinEntryId: String?) {
+        val entries = listEntriesInternal(context, appId).toMutableList()
+        val now = System.currentTimeMillis()
+        val ageCutoff = now - HISTORY_MAX_AGE_DAYS * 24L * 60L * 60L * 1000L
+        val toDelete = linkedSetOf<String>()
+
+        // Age cap.
+        entries.filter { it.timestampMs in 1L..ageCutoff && it.entryId != pinEntryId }
+            .forEach { toDelete += it.entryId }
+
+        val survivors = entries.filter { it.entryId !in toDelete }
+        // Count cap (oldest beyond MAX_HISTORY_ENTRIES drop).
+        survivors
+            .drop(MAX_HISTORY_ENTRIES)
+            .filter { it.entryId != pinEntryId }
+            .forEach { toDelete += it.entryId }
+
+        // Size cap: drop oldest until total bytes <= MAX_TOTAL_BYTES_PER_GAME (excluding pin).
+        val survivorsAfterCount = survivors.filter { it.entryId !in toDelete }
+        var total = survivorsAfterCount.sumOf { it.compressedSize }
+        survivorsAfterCount
+            .reversed() // oldest first
+            .forEach { entry ->
+                if (total <= MAX_TOTAL_BYTES_PER_GAME) return@forEach
+                if (entry.entryId == pinEntryId) return@forEach
+                toDelete += entry.entryId
+                total -= entry.compressedSize
+            }
+
+        toDelete.forEach { id ->
+            val target = entryDir(context, appId, id)
+            runCatching { target.deleteRecursively() }
+                .onFailure { Timber.tag(TAG).w(it, "Failed to prune %s", target) }
+        }
+    }
+
+    /** Sweep any leftover `.tmp` files from a previous interrupted write. */
+    private fun cleanupPartialEntries(context: Context, appId: Int) {
+        val dir = appDir(context, appId)
+        if (!dir.isDirectory) return
+        dir.listFiles()?.forEach { sub ->
+            if (!sub.isDirectory) return@forEach
+            val tmp = File(sub, SAVE_TMP_NAME)
+            if (tmp.exists()) {
+                runCatching { tmp.delete() }
+            }
+            val finalZip = File(sub, SAVE_FILE_NAME)
+            val meta = File(sub, META_FILE_NAME)
+            // If the metadata is missing/unreadable, the entry never committed — purge.
+            if (!meta.exists() || readMetadata(meta) == null || !finalZip.exists()) {
+                runCatching { sub.deleteRecursively() }
+            }
+        }
+    }
+
+    private fun readMetadata(metaFile: File): SnapshotMeta? {
+        if (!metaFile.isFile) return null
+        return try {
+            val o = JSONObject(metaFile.readText(Charsets.UTF_8))
+            val sourcesArr = o.optJSONArray("sources") ?: JSONArray()
+            val sources = (0 until sourcesArr.length()).map { sourcesArr.getString(it) }
+            SnapshotMeta(
+                schema = o.optInt("schema", 1),
+                entryId = o.getString("entryId"),
+                appId = o.getInt("appId"),
+                timestampMs = o.getLong("timestampMs"),
+                origin = BackupOrigin.fromTag(o.optString("origin")) ?: BackupOrigin.AUTO,
+                uncompressedSize = o.optLong("uncompressedSize", 0L),
+                compressedSize = o.optLong("compressedSize", 0L),
+                sha256 = o.optString("sha256", ""),
+                label = if (o.has("label") && !o.isNull("label")) o.getString("label").takeIf { it.isNotEmpty() } else null,
+                sources = sources,
+                storage = o.optString("storage", BackupStorage.STEAM_LOCAL.name),
+            )
+        } catch (e: Exception) {
+            Timber.tag(TAG).w(e, "Failed to parse %s", metaFile)
+            null
+        }
+    }
+
+    private fun writeMetadataAtomic(metaFile: File, meta: SnapshotMeta) {
+        val tmp = File(metaFile.parentFile, "${metaFile.name}.tmp")
+        val payload =
+            JSONObject().apply {
+                put("schema", meta.schema)
+                put("entryId", meta.entryId)
+                put("appId", meta.appId)
+                put("timestampMs", meta.timestampMs)
+                put("origin", meta.origin.tag)
+                put("uncompressedSize", meta.uncompressedSize)
+                put("compressedSize", meta.compressedSize)
+                put("sha256", meta.sha256)
+                if (!meta.label.isNullOrEmpty()) put("label", meta.label)
+                put("sources", JSONArray(meta.sources))
+                put("storage", meta.storage)
+            }.toString()
+        tmp.writeText(payload, Charsets.UTF_8)
+        Files.move(
+            tmp.toPath(),
+            metaFile.toPath(),
+            StandardCopyOption.ATOMIC_MOVE,
+            StandardCopyOption.REPLACE_EXISTING,
+        )
+    }
+
+    // ── Zip helpers ──
+
+    private fun zipSourcesToFile(sources: List<SaveSource>, outFile: File): Long {
+        var bytes = 0L
+        FileOutputStream(outFile).use { fos ->
+            ZipOutputStream(fos).use { zos ->
+                sources.forEach { src ->
+                    val zipRoot = src.zipRoot.trimEnd('/')
+                    if (zipRoot.isEmpty()) return@forEach
+                    zos.putNextEntry(ZipEntry("$zipRoot/"))
+                    zos.closeEntry()
+                    bytes += zipDirRecursive(zos, src.localDir, zipRoot)
+                }
+            }
+        }
+        return bytes
+    }
+
+    private fun zipDirRecursive(zos: ZipOutputStream, dir: File, baseName: String): Long {
+        if (!dir.exists() || !dir.isDirectory) return 0L
+        var written = 0L
+        val children = dir.listFiles() ?: return 0L
+        for (child in children) {
+            val entryName = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
+            if (child.isDirectory) {
+                zos.putNextEntry(ZipEntry("$entryName/"))
+                zos.closeEntry()
+                written += zipDirRecursive(zos, child, entryName)
+            } else {
+                zos.putNextEntry(ZipEntry(entryName))
+                FileInputStream(child).use { fis ->
+                    val buf = ByteArray(8192)
+                    var len: Int
+                    while (fis.read(buf).also { len = it } > 0) {
+                        zos.write(buf, 0, len)
+                        written += len
+                    }
+                }
+                zos.closeEntry()
+            }
+        }
+        return written
+    }
+
+    private fun extractZipToSources(zipFile: File, sources: List<SaveSource>) {
+        val sortedSources = sources.sortedByDescending { it.zipRoot.length }
+        ZipInputStream(FileInputStream(zipFile)).use { zis ->
+            var entry: ZipEntry?
+            while (zis.nextEntry.also { entry = it } != null) {
+                val name = entry!!.name
+                val source =
+                    sortedSources.firstOrNull {
+                        name == "${it.zipRoot}/" || name.startsWith("${it.zipRoot}/")
+                    }
+                if (source == null) {
+                    zis.closeEntry()
+                    continue
+                }
+                val rel = name.removePrefix(source.zipRoot).removePrefix("/")
+                if (rel.isEmpty()) {
+                    source.localDir.mkdirs()
+                    zis.closeEntry()
+                    continue
+                }
+                val out = File(source.localDir, rel)
+                if (!out.canonicalPath.startsWith(source.localDir.canonicalPath + File.separator) &&
+                    out.canonicalPath != source.localDir.canonicalPath
+                ) {
+                    throw SecurityException("Zip entry tries to escape target directory")
+                }
+                if (entry!!.isDirectory) {
+                    out.mkdirs()
+                } else {
+                    out.parentFile?.mkdirs()
+                    FileOutputStream(out).use { fos ->
+                        val buf = ByteArray(8192)
+                        var len: Int
+                        while (zis.read(buf).also { len = it } > 0) {
+                            fos.write(buf, 0, len)
+                        }
+                    }
+                }
+                zis.closeEntry()
+            }
+        }
+    }
+
+    // ── Hashing ──
+
+    /** SHA-256 over sources' files, sorted by zipRoot then relative path. Stable across runs. */
+    private fun sha256OfSources(sources: List<SaveSource>): String {
+        val md = MessageDigest.getInstance("SHA-256")
+        sources
+            .sortedBy { it.zipRoot }
+            .forEach { src -> hashDir(md, src.localDir, src.zipRoot) }
+        return md.digest().joinToString("") { "%02x".format(it) }
+    }
+
+    private fun hashDir(md: MessageDigest, dir: File, baseName: String) {
+        if (!dir.exists() || !dir.isDirectory) return
+        val children = dir.listFiles()?.sortedBy { it.name } ?: return
+        for (child in children) {
+            val name = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
+            if (child.isDirectory) {
+                md.update(("D:$name\n").toByteArray(Charsets.UTF_8))
+                hashDir(md, child, name)
+            } else {
+                md.update(("F:$name:${child.length()}\n").toByteArray(Charsets.UTF_8))
+                FileInputStream(child).use { fis ->
+                    val buf = ByteArray(8192)
+                    var len: Int
+                    while (fis.read(buf).also { len = it } > 0) {
+                        md.update(buf, 0, len)
+                    }
+                }
+            }
+        }
+    }
+
+
+    // ── Naming ──
+
+    private fun buildEntryId(timestampMs: Long): String {
+        val fmt = SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
+        val ts = fmt.format(Date(timestampMs))
+        val rand = StringBuilder(6)
+        repeat(6) { rand.append(('a' + saveIdRandom.nextInt(26))) }
+        return "${ts}_$rand"
+    }
+
+    // ── Data model (private) ──
+
+    private data class SaveSource(val zipRoot: String, val localDir: File)
+
+    private data class SnapshotMeta(
+        val schema: Int,
+        val entryId: String,
+        val appId: Int,
+        val timestampMs: Long,
+        val origin: BackupOrigin,
+        val uncompressedSize: Long,
+        val compressedSize: Long,
+        val sha256: String,
+        val label: String?,
+        val sources: List<String>,
+        val storage: String,
+    ) {
+        fun toBackupHistoryEntry(): BackupHistoryEntry =
+            BackupHistoryEntry(
+                fileId = entryId,
+                fileName = entryId,
+                timestampMs = timestampMs,
+                origin = origin,
+                sizeBytes = uncompressedSize.coerceAtLeast(0L),
+                label = label?.take(MAX_HISTORY_LABEL_LENGTH),
+                storage = BackupStorage.STEAM_LOCAL,
+            )
+    }
+}
diff --git a/app/src/main/feature/stores/common/StoreArtworkCache.kt b/app/src/main/feature/stores/common/StoreArtworkCache.kt
new file mode 100644
index 000000000..14075b4d6
--- /dev/null
+++ b/app/src/main/feature/stores/common/StoreArtworkCache.kt
@@ -0,0 +1,294 @@
+package com.winlator.cmod.feature.stores.common
+
+import android.content.Context
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.gog.data.GOGGame
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import timber.log.Timber
+import java.io.File
+import java.security.MessageDigest
+import java.util.concurrent.TimeUnit
+
+object StoreArtworkCache {
+    private const val ROOT_DIR = "library_artwork_cache"
+    private const val TAG = "StoreArtworkCache"
+    private const val MAX_CONCURRENT_DOWNLOADS = 12
+
+    private val client: OkHttpClient by lazy {
+        OkHttpClient
+            .Builder()
+            .connectTimeout(15, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .connectionPool(okhttp3.ConnectionPool(MAX_CONCURRENT_DOWNLOADS, 5, TimeUnit.MINUTES))
+            .retryOnConnectionFailure(true)
+            .build()
+    }
+
+    data class ArtworkRef(
+        val store: String,
+        val gameId: String,
+        val slot: String,
+        val url: String,
+    )
+
+    fun imageModel(
+        context: Context,
+        ref: ArtworkRef?,
+    ): Any? {
+        if (ref == null || ref.url.isBlank()) return null
+        val file = cacheFile(context, ref)
+        return if (file.exists() && file.length() > 0L) file else ref.url
+    }
+
+    suspend fun cacheAll(
+        context: Context,
+        refs: Collection<ArtworkRef>,
+    ): Boolean {
+        val distinctRefs =
+            refs
+                .filter { it.url.isNotBlank() && it.url.startsWith("http", ignoreCase = true) }
+                .distinctBy { "${it.store}:${it.gameId}:${it.slot}:${it.url}" }
+        if (distinctRefs.isEmpty()) return false
+
+        val semaphore = Semaphore(permits = MAX_CONCURRENT_DOWNLOADS)
+        return coroutineScope {
+            distinctRefs
+                .map { ref ->
+                    async {
+                        semaphore.withPermit {
+                            cache(context, ref)
+                        }
+                    }
+                }.awaitAll()
+                .any { it }
+        }
+    }
+
+    fun deleteGame(
+        context: Context,
+        store: String,
+        gameId: String,
+    ): Boolean {
+        val dir = gameDir(context, store, gameId)
+        if (!dir.exists()) return true
+        return runCatching { dir.deleteRecursively() }
+            .onFailure { Timber.tag(TAG).w(it, "Failed to delete artwork cache for %s/%s", store, gameId) }
+            .getOrDefault(false)
+    }
+
+    fun deleteSlots(
+        context: Context,
+        store: String,
+        gameId: String,
+        slots: Collection<String>,
+    ): Boolean {
+        if (slots.isEmpty()) return false
+        val dir = gameDir(context, store, gameId)
+        if (!dir.exists()) return false
+
+        val prefixes = slots.map { "${safeName(it)}_" }.toSet()
+        return runCatching {
+            val files =
+                dir.listFiles()
+                ?.filter { file -> file.isFile && prefixes.any { prefix -> file.name.startsWith(prefix) } }
+                .orEmpty()
+            files.isNotEmpty() && files.all { it.delete() || !it.exists() }
+        }.onFailure {
+            Timber.tag(TAG).w(it, "Failed to delete artwork cache slots for %s/%s", store, gameId)
+        }.getOrDefault(false)
+    }
+
+    fun steamRefs(app: SteamApp): List<ArtworkRef> {
+        val refs =
+            mutableListOf(
+                ArtworkRef("steam", app.id.toString(), "small_capsule", app.getSmallCapsuleUrl()),
+                ArtworkRef("steam", app.id.toString(), "header", app.getHeaderImageUrl()),
+                ArtworkRef("steam", app.id.toString(), "capsule", app.getCapsuleUrl()),
+                ArtworkRef("steam", app.id.toString(), "library_capsule", app.getLibraryCapsuleUrl()),
+                ArtworkRef("steam", app.id.toString(), "hero", app.getHeroUrl()),
+                ArtworkRef("steam", app.id.toString(), "logo", app.getLogoUrl()),
+            )
+        if (app.iconHash.isNotBlank()) refs += ArtworkRef("steam", app.id.toString(), "icon", app.iconUrl)
+        if (app.logoHash.isNotBlank()) refs += ArtworkRef("steam", app.id.toString(), "legacy_logo", app.logoUrl)
+        if (app.logoSmallHash.isNotBlank()) refs += ArtworkRef("steam", app.id.toString(), "legacy_logo_small", app.logoSmallUrl)
+        return refs.distinctBy { "${it.slot}:${it.url}" }
+    }
+
+    fun steamRef(
+        app: SteamApp,
+        slot: String,
+        url: String,
+    ): ArtworkRef = ArtworkRef("steam", app.id.toString(), slot, url)
+
+    fun libraryRefs(
+        app: SteamApp,
+        gogGame: GOGGame?,
+        epicGame: EpicGame?,
+    ): List<ArtworkRef> =
+        when {
+            gogGame != null -> gogRefs(gogGame)
+            epicGame != null -> epicRefs(epicGame)
+            app.id < 0 -> emptyList()
+            else -> steamRefs(app)
+        }
+
+    fun primaryRef(
+        app: SteamApp,
+        gogGame: GOGGame?,
+        epicGame: EpicGame?,
+        useLibraryCapsule: Boolean,
+        listMode: Boolean,
+    ): ArtworkRef? =
+        when {
+            gogGame != null -> gogPrimaryRef(gogGame)
+            epicGame != null -> epicPrimaryRef(epicGame)
+            app.id < 0 -> null
+            else -> {
+                val slot: String
+                val url: String
+                when {
+                    listMode -> {
+                        slot = "small_capsule"
+                        url = app.getSmallCapsuleUrl()
+                    }
+                    useLibraryCapsule -> {
+                        slot = "library_capsule"
+                        url = app.getLibraryCapsuleUrl()
+                    }
+                    else -> {
+                        slot = "capsule"
+                        url = app.getCapsuleUrl()
+                    }
+                }
+                steamRef(app, slot, url)
+            }
+        }
+
+    fun heroRef(
+        app: SteamApp,
+        gogGame: GOGGame?,
+        epicGame: EpicGame?,
+    ): ArtworkRef? =
+        when {
+            gogGame != null -> gogHeroRef(gogGame)
+            epicGame != null -> epicHeroRef(epicGame)
+            app.id < 0 -> null
+            else -> steamRef(app, "hero", app.getHeroUrl())
+        }
+
+    fun epicRefs(game: EpicGame): List<ArtworkRef> =
+        listOf(
+            ArtworkRef("epic", game.id.toString(), "cover", game.artCover),
+            ArtworkRef("epic", game.id.toString(), "square", game.artSquare),
+            ArtworkRef("epic", game.id.toString(), "logo", game.artLogo),
+            ArtworkRef("epic", game.id.toString(), "hero", game.artPortrait),
+        ).filter { it.url.isNotBlank() }
+
+    fun epicPrimaryRef(game: EpicGame): ArtworkRef? =
+        when {
+            game.artCover.isNotBlank() -> ArtworkRef("epic", game.id.toString(), "cover", game.artCover)
+            game.artSquare.isNotBlank() -> ArtworkRef("epic", game.id.toString(), "square", game.artSquare)
+            game.artLogo.isNotBlank() -> ArtworkRef("epic", game.id.toString(), "logo", game.artLogo)
+            game.artPortrait.isNotBlank() -> ArtworkRef("epic", game.id.toString(), "hero", game.artPortrait)
+            else -> null
+        }
+
+    fun epicHeroRef(game: EpicGame): ArtworkRef? =
+        when {
+            game.artPortrait.isNotBlank() -> ArtworkRef("epic", game.id.toString(), "hero", game.artPortrait)
+            else -> epicPrimaryRef(game)
+        }
+
+    fun gogRefs(game: GOGGame): List<ArtworkRef> =
+        listOf(
+            ArtworkRef("gog", game.id, "cover", game.imageUrl),
+            ArtworkRef("gog", game.id, "hero", game.heroImageUrl),
+            ArtworkRef("gog", game.id, "icon", game.iconUrl),
+        ).filter { it.url.isNotBlank() }
+
+    fun gogPrimaryRef(game: GOGGame): ArtworkRef? =
+        when {
+            game.imageUrl.isNotBlank() -> ArtworkRef("gog", game.id, "cover", game.imageUrl)
+            game.iconUrl.isNotBlank() -> ArtworkRef("gog", game.id, "icon", game.iconUrl)
+            else -> null
+        }
+
+    fun gogHeroRef(game: GOGGame): ArtworkRef? =
+        when {
+            game.heroImageUrl.isNotBlank() -> ArtworkRef("gog", game.id, "hero", game.heroImageUrl)
+            else -> gogPrimaryRef(game)
+        }
+
+    private fun cache(
+        context: Context,
+        ref: ArtworkRef,
+    ): Boolean {
+        val target = cacheFile(context, ref)
+        if (target.exists() && target.length() > 0L) return false
+
+        return runCatching {
+            target.parentFile?.mkdirs()
+            val request = Request.Builder().url(ref.url).build()
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    Timber.tag(TAG).d("Artwork request failed %s for %s", response.code, ref.url)
+                    return false
+                }
+                val body = response.body ?: return false
+                val temp = File(target.parentFile, "${target.name}.tmp")
+                body.byteStream().use { input ->
+                    temp.outputStream().use { output -> input.copyTo(output) }
+                }
+                if (temp.length() == 0L) {
+                    temp.delete()
+                    return false
+                }
+                if (target.exists()) target.delete()
+                if (!temp.renameTo(target)) {
+                    temp.copyTo(target, overwrite = true)
+                    temp.delete()
+                }
+                true
+            }
+        }.onFailure {
+            Timber.tag(TAG).d(it, "Failed to cache artwork %s", ref.url)
+        }.getOrDefault(false)
+    }
+
+    private fun cacheFile(
+        context: Context,
+        ref: ArtworkRef,
+    ): File {
+        val ext = extensionFromUrl(ref.url)
+        return File(gameDir(context, ref.store, ref.gameId), "${safeName(ref.slot)}_${sha256(ref.url)}$ext")
+    }
+
+    private fun gameDir(
+        context: Context,
+        store: String,
+        gameId: String,
+    ): File = File(File(File(context.filesDir, ROOT_DIR), safeName(store)), safeName(gameId))
+
+    private fun extensionFromUrl(url: String): String {
+        val path = url.substringBefore('?').substringBefore('#')
+        val ext = path.substringAfterLast('.', missingDelimiterValue = "").lowercase()
+        return when (ext) {
+            "jpg", "jpeg", "png", "webp", "gif", "ico" -> ".$ext"
+            else -> ".img"
+        }
+    }
+
+    private fun safeName(value: String): String = value.replace(Regex("[^A-Za-z0-9._-]"), "_")
+
+    private fun sha256(value: String): String {
+        val digest = MessageDigest.getInstance("SHA-256").digest(value.toByteArray())
+        return digest.joinToString("") { "%02x".format(it) }.take(24)
+    }
+}
diff --git a/app/src/main/feature/stores/epic/data/EpicGame.kt b/app/src/main/feature/stores/epic/data/EpicGame.kt
index a0967edba..388654569 100644
--- a/app/src/main/feature/stores/epic/data/EpicGame.kt
+++ b/app/src/main/feature/stores/epic/data/EpicGame.kt
@@ -60,6 +60,10 @@ data class EpicGame(
     val cloudSaveEnabled: Boolean = false,
     @ColumnInfo("save_folder")
     val saveFolder: String = "",
+    @ColumnInfo("cloud_include_list")
+    val cloudIncludeList: String = "",
+    @ColumnInfo("cloud_exclude_list")
+    val cloudExcludeList: String = "",
     // Third-party platform management (EA, Ubisoft)
     @ColumnInfo("third_party_managed_app")
     val thirdPartyManagedApp: String = "",
diff --git a/app/src/main/feature/stores/epic/db/dao/EpicGameDao.kt b/app/src/main/feature/stores/epic/db/dao/EpicGameDao.kt
index 12bc4c00c..dd7e25d36 100644
--- a/app/src/main/feature/stores/epic/db/dao/EpicGameDao.kt
+++ b/app/src/main/feature/stores/epic/db/dao/EpicGameDao.kt
@@ -99,7 +99,9 @@ interface EpicGameDao {
                         id = existingGame.id,
                         isInstalled = existingGame.isInstalled,
                         installPath = existingGame.installPath,
-                        installSize = existingGame.installSize,
+                        installSize = existingGame.installSize.takeIf { it > 0L } ?: newGame.installSize,
+                        downloadSize = existingGame.downloadSize.takeIf { it > 0L } ?: newGame.downloadSize,
+                        version = existingGame.version.ifBlank { newGame.version },
                         lastPlayed = existingGame.lastPlayed,
                         playTime = existingGame.playTime,
                     )
diff --git a/app/src/main/feature/stores/epic/service/EpicAuthManager.kt b/app/src/main/feature/stores/epic/service/EpicAuthManager.kt
index 86bdaa31e..730cf6f29 100644
--- a/app/src/main/feature/stores/epic/service/EpicAuthManager.kt
+++ b/app/src/main/feature/stores/epic/service/EpicAuthManager.kt
@@ -12,16 +12,13 @@ import org.json.JSONObject
 import timber.log.Timber
 import java.io.File
 
-/**
- * Manages Epic Games authentication and account operations.
- */
+/** Manages Epic Games authentication and account operations. */
 object EpicAuthManager {
     private val _isLoggedInFlow = MutableStateFlow(false)
     val isLoggedInFlow = _isLoggedInFlow.asStateFlow()
 
-    // Denuvo ownership tokens are server-side valid ~30 minutes and the endpoint is
-    // rate-limited (~5 requests / 24h / game). Cache to disk and re-use a few minutes
-    // under the validity window to avoid burning the quota on relaunches.
+    // Ownership tokens are valid for about 30 minutes and the endpoint is rate-limited.
+    // Cache slightly below that window to avoid burning quota on relaunches.
     private const val OWNERSHIP_TOKEN_CACHE_TTL_MS = 25L * 60L * 1000L
 
     fun updateLoginStatus(context: Context) {
@@ -66,11 +63,9 @@ object EpicAuthManager {
     }
 
     /**
-     * Classify the current on-disk Epic credentials. If the refresh token's known expiry is
-     * already in the past, the credentials file is cleared and a [StoreSessionEvent.SessionExpired]
-     * is emitted on [StoreSessionBus].
+     * Classifies the stored Epic credentials and clears them when the refresh token is expired.
      *
-     * Safe to call from any thread — touches only local disk.
+     * Safe to call from any thread; this only touches local disk.
      */
     fun getAuthStatus(context: Context): StoreAuthStatus {
         if (!hasStoredCredentials(context)) return StoreAuthStatus.LOGGED_OUT
@@ -87,9 +82,8 @@ object EpicAuthManager {
         if (credentials.refreshExpiresAt > 0 && now >= credentials.refreshExpiresAt - refreshBuffer) {
             Timber.i("Epic refresh token expired (refreshExpiresAt=${credentials.refreshExpiresAt}), clearing credentials")
             clearStoredCredentials(context)
-            // No SessionExpired emit here — getAuthStatus is called during startup before the
-            // bus collector is active. The UI already transitions to "logged out" via
-            // isLoggedInFlow. The emit-on-refresh-failure path covers mid-session death.
+            // Startup can call getAuthStatus before bus collectors are active. The login flow
+            // handles startup state; refresh failures emit mid-session expiry events.
             return StoreAuthStatus.EXPIRED
         }
 
@@ -99,7 +93,7 @@ object EpicAuthManager {
             credentials.refreshExpiresAt > 0 ->
                 StoreAuthStatus.REFRESHABLE
             else ->
-                // Legacy on-disk format without refresh_expires_at — probe on next use.
+                // Legacy credentials without refresh_expires_at are probed on next use.
                 StoreAuthStatus.UNKNOWN
         }
     }
@@ -107,9 +101,7 @@ object EpicAuthManager {
     @JvmStatic
     fun isLoggedIn(context: Context): Boolean = getAuthStatus(context).isLoggedInForUi
 
-    /**
-     * Clear stored credentials (logout)
-     */
+    /** Clears stored credentials for logout. */
     fun clearStoredCredentials(context: Context): Boolean =
         try {
             clearOwnershipTokenCache(context)
@@ -120,7 +112,7 @@ object EpicAuthManager {
                 } else {
                     true
                 }
-            // Session is gone — no point running the periodic refresh worker.
+            // The session is gone, so the periodic refresh worker can stop.
             EpicTokenRefreshWorker.cancel(context)
             updateLoginStatus(context)
             result
@@ -129,29 +121,19 @@ object EpicAuthManager {
             false
         }
 
-    /**
-     * Extract authorization code from various input formats:
-     * - Full URL: https://www.epicgames.com/id/api/redirect?code=abc123
-     * - Just code: abc123
-     */
+    /** Extracts an authorization code from a redirect URL or raw code input. */
     private fun extractCodeFromInput(input: String): String {
         val trimmed = input.trim()
-        // Check if it's a URL with code parameter
         if (trimmed.startsWith("http")) {
             val codeMatch = Regex("[?&]code=([^&]+)").find(trimmed)
             return codeMatch?.groupValues?.get(1) ?: ""
         }
-        // Otherwise assume it's already the code
+        // Raw codes are accepted as-is.
         return trimmed
     }
 
     /**
-     * Authenticate with Epic Games using authorization code from OAuth2 flow
-     * Users must visit Epic login page, authenticate, and copy the authorization code
-     *
-     * @param context Android context
-     * @param authorizationCode OAuth authorization code from Epic redirect
-     * @return Result containing EpicCredentials on success, exception on failure
+     * Authenticates with an Epic OAuth authorization code and stores the resulting credentials.
      */
     suspend fun authenticateWithCode(
         context: Context,
@@ -160,13 +142,11 @@ object EpicAuthManager {
         return try {
             Timber.i("Starting Epic authentication with authorization code...")
 
-            // Extract the actual authorization code from URL if needed
             val actualCode = extractCodeFromInput(authorizationCode)
             if (actualCode.isEmpty()) {
                 return Result.failure(Exception("Invalid authorization URL: no code parameter found"))
             }
 
-            // Use native API client for authentication
             Timber.d("Authenticating via EpicAuthClient...")
 
             val authResult = EpicAuthClient.authenticateWithCode(actualCode)
@@ -179,7 +159,6 @@ object EpicAuthManager {
 
             val authResponse = authResult.getOrNull()!!
 
-            // Save credentials to file
             val credentials =
                 EpicCredentials(
                     accessToken = authResponse.accessToken,
@@ -211,7 +190,6 @@ object EpicAuthManager {
                 return Result.failure(Exception("Failed to load credentials"))
             }
 
-            // Check if token is expired (with 5 minute buffer)
             val now = System.currentTimeMillis()
             val expiresAt = credentials.expiresAt
             val bufferMs = 5 * 60 * 1000 // 5 minutes
@@ -256,11 +234,7 @@ object EpicAuthManager {
         }
     }
 
-    /**
-     * Get game launch token for authenticating with Epic Games Services
-     * This should be called immediately before launching a game that requires online authentication
-     *
-     */
+    /** Gets a launch token immediately before starting a game that uses Epic services. */
     suspend fun getGameLaunchToken(
         context: Context,
         namespace: String? = null,
@@ -268,7 +242,6 @@ object EpicAuthManager {
         requiresOwnershipToken: Boolean = false,
     ): Result<EpicGameToken> {
         return try {
-            // Get current valid credentials (will refresh if expired)
             val credentialsResult = getStoredCredentials(context)
             if (credentialsResult.isFailure) {
                 return Result.failure(credentialsResult.exceptionOrNull() ?: Exception("Not authenticated"))
@@ -276,7 +249,6 @@ object EpicAuthManager {
 
             val credentials = credentialsResult.getOrNull()!!
 
-            // Get game exchange token (required for all games)
             Timber.d("Getting game exchange token for launch...")
             val exchangeTokenResult = EpicAuthClient.getGameExchangeToken(credentials.accessToken)
             if (exchangeTokenResult.isFailure) {
@@ -284,7 +256,6 @@ object EpicAuthManager {
             }
             val exchangeCode = exchangeTokenResult.getOrNull()!!
 
-            // Get ownership token if required (for DRM-protected games)
             var ownershipTokenHex: String? = null
             if (requiresOwnershipToken) {
                 if (namespace.isNullOrEmpty() || catalogItemId.isNullOrEmpty()) {
@@ -312,8 +283,7 @@ object EpicAuthManager {
                             Exception("Failed to get ownership token for DRM-protected game: $error"),
                         )
                     } else {
-                        // Convert binary token to hex string for easier handling
-                        // Use toInt() and 0xFF to prevent sign extension of negative bytes
+                        // Mask bytes before hex encoding to avoid sign extension.
                         val tokenBytes = ownershipResult.getOrNull()!!
                         ownershipTokenHex = tokenBytes.joinToString("") { "%02x".format(it.toInt() and 0xFF) }
                         writeOwnershipTokenHex(context, namespace, catalogItemId, ownershipTokenHex)
@@ -354,7 +324,7 @@ object EpicAuthManager {
             Timber.e(e, "Failed to clear Epic credentials")
             Result.failure(e)
         } finally {
-            updateLoginStatus(context) // Always update status after logout attempt
+            updateLoginStatus(context)
         }
 
     private fun saveCredentials(
@@ -373,12 +343,8 @@ object EpicAuthManager {
 
             authFile.writeText(json.toString())
             updateLoginStatus(context)
-            // Ensure the periodic refresh worker is running whenever creds exist on disk.
-            // Uses KEEP policy so this is a no-op when already scheduled.
+            // Keep the periodic refresh worker scheduled while credentials exist.
             EpicTokenRefreshWorker.schedule(context)
-            // Push the fresh token to Google Play Games so the cloud backup never holds a stale
-            // refresh token. Fires silently; no-op when sync is disabled or debounced.
-            com.winlator.cmod.feature.sync.google.CloudSyncManager.scheduleAutoBackup(context)
             Timber.d("Credentials saved to ${authFile.absolutePath}")
         } catch (e: Exception) {
             Timber.e(e, "Failed to save Epic credentials")
@@ -395,8 +361,7 @@ object EpicAuthManager {
                 accessToken = json.getString("access_token"),
                 refreshToken = json.getString("refresh_token"),
                 accountId = json.getString("account_id"),
-                // Use optString so we don't kick existing users out on first run of a build that
-                // started persisting display_name — older credentials.json files don't have it.
+                // Older credentials files may not include display_name.
                 displayName = json.optString("display_name", ""),
                 expiresAt = json.getLong("expires_at"),
                 refreshExpiresAt = json.optLong("refresh_expires_at", 0L),
diff --git a/app/src/main/feature/stores/epic/service/EpicCloudHistoryProvider.kt b/app/src/main/feature/stores/epic/service/EpicCloudHistoryProvider.kt
new file mode 100644
index 000000000..eb2d202b2
--- /dev/null
+++ b/app/src/main/feature/stores/epic/service/EpicCloudHistoryProvider.kt
@@ -0,0 +1,95 @@
+package com.winlator.cmod.feature.stores.epic.service
+
+import android.content.Context
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupHistoryEntry
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupOrigin
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupStorage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+/**
+ * Provider for the Epic game "Save History" UI rows backed by Epic savesync manifests.
+ *
+ * Epic cloud saves store timestamped manifest files plus chunks. The manifest list is
+ * the closest thing Epic exposes to save history, and each row can restore that specific
+ * manifest instead of only syncing the latest cloud state.
+ */
+object EpicCloudHistoryProvider {
+    private const val TAG = "EpicCloudHistory"
+    private const val LABEL_PREFS = "epic_cloud_history_labels"
+
+    suspend fun listCloudSaveGroups(
+        context: Context,
+        appId: Int,
+    ): List<BackupHistoryEntry> =
+        withContext(Dispatchers.IO) {
+            try {
+                val labelPrefs = context.getSharedPreferences(LABEL_PREFS, Context.MODE_PRIVATE)
+                EpicCloudSavesManager
+                    .listCloudSaveHistory(context, appId)
+                    .map { entry ->
+                        val fileId = encodeFileId(appId, entry.manifestPath)
+                        val fileCountLabel =
+                            when (entry.fileCount) {
+                                0 -> entry.manifestPath.substringAfterLast("/")
+                                1 -> "1 file"
+                                else -> "${entry.fileCount} files"
+                            }
+                        BackupHistoryEntry(
+                            fileId = fileId,
+                            fileName = fileCountLabel,
+                            timestampMs = entry.timestampMs,
+                            origin = BackupOrigin.CLOUD,
+                            sizeBytes = entry.sizeBytes,
+                            label = labelPrefs.getString(fileId, null),
+                            storage = BackupStorage.EPIC_CLOUD,
+                        )
+                    }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "listCloudSaveGroups failed for appId=%d", appId)
+                emptyList()
+            }
+        }
+
+    suspend fun restoreSaveGroup(
+        context: Context,
+        appId: Int,
+        groupFileId: String,
+    ): BackupResult =
+        withContext(Dispatchers.IO) {
+            try {
+                val manifestPath = decodeManifestPath(groupFileId)
+                if (manifestPath.isBlank()) return@withContext BackupResult(false, "Invalid Epic cloud save entry.")
+                val ok = EpicCloudSavesManager.restoreCloudSaveHistoryEntry(context, appId, manifestPath)
+                if (ok) {
+                    BackupResult(true, "Restored Epic cloud save.")
+                } else {
+                    BackupResult(false, "Epic cloud restore failed.")
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "restoreSaveGroup failed for appId=%d", appId)
+                BackupResult(false, "Restore failed: ${e.message}")
+            }
+        }
+
+    fun setLabel(
+        context: Context,
+        groupFileId: String,
+        label: String?,
+    ) {
+        val prefs = context.getSharedPreferences(LABEL_PREFS, Context.MODE_PRIVATE)
+        val edit = prefs.edit()
+        if (label.isNullOrEmpty()) edit.remove(groupFileId) else edit.putString(groupFileId, label)
+        edit.apply()
+    }
+
+    private fun encodeFileId(
+        appId: Int,
+        manifestPath: String,
+    ): String = "$appId:$manifestPath"
+
+    private fun decodeManifestPath(groupFileId: String): String =
+        groupFileId.substringAfter(":", missingDelimiterValue = groupFileId)
+}
diff --git a/app/src/main/feature/stores/epic/service/EpicCloudSavesManager.kt b/app/src/main/feature/stores/epic/service/EpicCloudSavesManager.kt
index fe8d2d070..aa36fb819 100644
--- a/app/src/main/feature/stores/epic/service/EpicCloudSavesManager.kt
+++ b/app/src/main/feature/stores/epic/service/EpicCloudSavesManager.kt
@@ -1,5 +1,7 @@
 package com.winlator.cmod.feature.stores.epic.service
 import android.content.Context
+import android.util.Log
+import com.winlator.cmod.app.db.PluviaDatabase
 import com.winlator.cmod.feature.stores.epic.data.EpicGame
 import com.winlator.cmod.feature.stores.epic.service.manifest.EpicManifest
 import com.winlator.cmod.feature.stores.steam.utils.Net
@@ -17,20 +19,20 @@ import java.io.File
 import java.time.Instant
 import java.util.zip.GZIPInputStream
 
-/**
- * Manages Epic Cloud Saves - downloading and uploading save files
- *
- * Epic uses a manifest-based chunked format (similar to game downloads):
- * - Manifest files contain metadata and chunk references
- * - Save files are split into compressed chunks
- * - Chunks are deduplicated via GUID/hash
- */
+// Manages Epic Cloud Saves using Epic's chunked manifest format.
 object EpicCloudSavesManager {
-    // Synchronization to prevent duplicate concurrent syncs
     private val syncMutex = Mutex()
+    private data class SyncScope(
+        val appId: Int,
+        val containerId: Int?,
+    )
+
     private val activeSyncs = mutableSetOf<Int>()
+    private val recentSuccessfulUploads = mutableMapOf<SyncScope, Long>()
+    private const val SAVE_TIMESTAMP_EQUAL_TOLERANCE_MS = 60_000L
+    private const val DUPLICATE_UPLOAD_SUPPRESSION_MS = 120_000L
+    private const val ANDROID_LOG_TAG = "EpicCloudSaves"
 
-    // Data classes for API responses
     data class CloudSaveFiles(
         val files: Map<String, CloudFileInfo>,
     )
@@ -46,6 +48,13 @@ object EpicCloudSavesManager {
         val writeLink: String?,
     )
 
+    data class CloudSaveHistoryEntry(
+        val manifestPath: String,
+        val timestampMs: Long,
+        val fileCount: Int,
+        val sizeBytes: Long,
+    )
+
     enum class SyncAction {
         UPLOAD,
         DOWNLOAD,
@@ -53,36 +62,153 @@ object EpicCloudSavesManager {
         NONE,
     }
 
-    /**
-     * Lightweight probe: checks whether cloud saves need syncing for [appId]
-     * without downloading or uploading any files.
-     *
-     * @return `true` if a sync (download, upload, or conflict resolution) is
-     *         needed, `false` if saves are already up-to-date.
-     */
+    // Checks whether cloud saves need syncing without transferring files.
     suspend fun needsSync(
         context: Context,
         appId: Int,
-    ): Boolean {
-        val game = EpicService.getEpicGameOf(appId) ?: return false
-        if (!game.cloudSaveEnabled) return false
+    ): Boolean = needsSync(context, appId, null)
+
+    suspend fun needsSync(
+        context: Context,
+        appId: Int,
+        targetContainerId: Int?,
+    ): Boolean = getPendingSyncAction(context, appId, targetContainerId) != SyncAction.NONE
+
+    suspend fun getPendingSyncAction(
+        context: Context,
+        appId: Int,
+    ): SyncAction = getPendingSyncAction(context, appId, null)
+
+    suspend fun getPendingSyncAction(
+        context: Context,
+        appId: Int,
+        targetContainerId: Int?,
+    ): SyncAction {
+        val game = getEpicGame(context, appId) ?: return SyncAction.NONE
+        if (!game.cloudSaveEnabled) return SyncAction.NONE
+        val credentials = EpicAuthManager.getStoredCredentials(context)
+        if (credentials.isFailure) return SyncAction.NONE
+        val creds = credentials.getOrNull() ?: return SyncAction.NONE
+        return determineSyncAction(context, creds.accountId, game, "probe", targetContainerId)
+    }
+
+    suspend fun getPendingExitSyncAction(
+        context: Context,
+        appId: Int,
+    ): SyncAction = getPendingExitSyncAction(context, appId, null)
+
+    suspend fun getPendingExitSyncAction(
+        context: Context,
+        appId: Int,
+        targetContainerId: Int?,
+    ): SyncAction {
+        val game = getEpicGame(context, appId) ?: return SyncAction.NONE
+        if (!game.cloudSaveEnabled) return SyncAction.NONE
         val credentials = EpicAuthManager.getStoredCredentials(context)
-        if (credentials.isFailure) return false
-        val creds = credentials.getOrNull()!!
-        return determineSyncAction(context, creds.accountId, game, "auto") != SyncAction.NONE
+        if (credentials.isFailure) return SyncAction.NONE
+        val creds = credentials.getOrNull() ?: return SyncAction.NONE
+        return determineSyncAction(context, creds.accountId, game, "exit_upload", targetContainerId)
     }
 
     suspend fun getResolvedSaveDirectory(
         context: Context,
         appId: Int,
+    ): File? = getResolvedSaveDirectory(context, appId, null)
+
+    suspend fun getResolvedSaveDirectory(
+        context: Context,
+        appId: Int,
+        targetContainerId: Int?,
     ): File? =
         withContext(Dispatchers.IO) {
-            val game = EpicService.getEpicGameOf(appId) ?: return@withContext null
+            val game = getEpicGame(context, appId) ?: return@withContext null
             if (!game.cloudSaveEnabled) return@withContext null
             val credentials = EpicAuthManager.getStoredCredentials(context)
             if (credentials.isFailure) return@withContext null
             val creds = credentials.getOrNull() ?: return@withContext null
-            resolveSaveDirectory(context, game, creds.accountId)
+            resolveSaveDirectory(context, game, creds.accountId, targetContainerId)
+        }
+
+    // Restores the latest cloud save when no local save files exist.
+    suspend fun restoreCloudSavesIfLocalMissing(
+        context: Context,
+        appId: Int,
+    ): Boolean =
+        withContext(Dispatchers.IO) {
+            val game = getEpicGame(context, appId) ?: return@withContext false
+            if (!game.cloudSaveEnabled) return@withContext false
+            val credentials = EpicAuthManager.getStoredCredentials(context).getOrNull() ?: return@withContext false
+            val saveDir = resolveSaveDirectory(context, game, credentials.accountId)
+            if (saveDir.hasAnySaveFile()) {
+                Timber.tag("Epic").d("[Cloud Saves] Startup restore skipped for ${game.title}: local saves already exist")
+                return@withContext true
+            }
+
+            val cloudSaves =
+                listCloudSaves(game.appName, context)
+                    .getOrElse {
+                        Timber.tag("Epic").w(it, "[Cloud Saves] Startup restore failed to list saves for ${game.title}")
+                        return@withContext false
+                    }
+            if (findLatestManifest(cloudSaves.files) == null) {
+                Timber.tag("Epic").d("[Cloud Saves] Startup restore found no cloud manifest for ${game.title}")
+                return@withContext false
+            }
+
+            Timber.tag("Epic").i("[Cloud Saves] Startup restore downloading Epic cloud saves for ${game.title}")
+            syncCloudSaves(context, appId, "download")
+        }
+
+    suspend fun listCloudSaveHistory(
+        context: Context,
+        appId: Int,
+    ): List<CloudSaveHistoryEntry> =
+        withContext(Dispatchers.IO) {
+            val game = getEpicGame(context, appId) ?: return@withContext emptyList()
+            if (!game.cloudSaveEnabled) return@withContext emptyList()
+
+            val cloudSaves =
+                listCloudSaves(game.appName, context)
+                    .getOrElse {
+                        Timber.tag("Epic").w(it, "[Cloud Saves] Failed to list history for ${game.title}")
+                        return@withContext emptyList()
+                    }
+
+            val manifests =
+                cloudSaves.files.entries
+                    .filter { it.key.endsWith(".manifest") }
+                    .sortedByDescending { parseManifestTimestamp(it.key, it.value) }
+                    .take(30)
+
+            manifests.map { (manifestPath, manifestInfo) ->
+                val manifest =
+                    manifestInfo.readLink
+                        ?.let { downloadFile(it).getOrNull() }
+                        ?.takeIf { it.isNotEmpty() }
+                        ?.let { bytes ->
+                            runCatching { EpicManifest.readAll(bytes) }
+                                .onFailure {
+                                    Timber.tag("Epic").w(it, "[Cloud Saves] Failed to parse history manifest $manifestPath")
+                                }.getOrNull()
+                        }
+                val files = manifest?.fileManifestList?.elements.orEmpty()
+                CloudSaveHistoryEntry(
+                    manifestPath = manifestPath,
+                    timestampMs = parseManifestTimestamp(manifestPath, manifestInfo),
+                    fileCount = files.size,
+                    sizeBytes = files.sumOf { it.fileSize },
+                )
+            }
+        }
+
+    suspend fun restoreCloudSaveHistoryEntry(
+        context: Context,
+        appId: Int,
+        manifestPath: String,
+    ): Boolean =
+        withContext(Dispatchers.IO) {
+            val credentials = EpicAuthManager.getStoredCredentials(context).getOrNull() ?: return@withContext false
+            downloadSaves(context, appId, credentials.accountId, manifestPath)
         }
 
     /**
@@ -96,7 +222,7 @@ object EpicCloudSavesManager {
      * an immediate `false` from [syncCloudSaves] for any Epic game that doesn't
      * support cloud saves (most don't — it's an opt-in catalog flag) or for any
      * fresh install with no saves yet, and then runs the full retry-with-backoff
-     * loop showing the user "Cloud Sync Uploading… Retry 3/3" for a permanent
+     * loop showing the user "Cloud Sync Checking Retry 3/3" for a permanent
      * no-op.
      *
      * Non-suspend so Java callers (the activity is .java) can call it directly.
@@ -105,10 +231,17 @@ object EpicCloudSavesManager {
     fun canAttemptExitUpload(
         context: Context,
         appId: Int,
+    ): Boolean = canAttemptExitUpload(context, appId, null)
+
+    @JvmStatic
+    fun canAttemptExitUpload(
+        context: Context,
+        appId: Int,
+        targetContainerId: Int?,
     ): Boolean =
         kotlinx.coroutines.runBlocking(Dispatchers.IO) {
             try {
-                val game = EpicService.getEpicGameOf(appId) ?: return@runBlocking false
+                val game = getEpicGame(context, appId) ?: return@runBlocking false
                 if (!game.cloudSaveEnabled) {
                     Timber.tag("Epic").i("[Cloud Saves] Skip exit upload: ${game.title} does not opt into Epic cloud saves")
                     return@runBlocking false
@@ -119,13 +252,12 @@ object EpicCloudSavesManager {
                     return@runBlocking false
                 }
                 val creds = credentialsResult.getOrNull() ?: return@runBlocking false
-                val saveDir = resolveSaveDirectory(context, game, creds.accountId)
+                val saveDir = resolveSaveDirectory(context, game, creds.accountId, targetContainerId)
                 if (saveDir == null || !saveDir.exists()) {
                     Timber.tag("Epic").i("[Cloud Saves] Skip exit upload: no save directory yet for ${game.title}")
                     return@runBlocking false
                 }
-                val hasAnyFile = saveDir.walkTopDown().any { it.isFile }
-                if (!hasAnyFile) {
+                if (!saveDir.hasAnySaveFile()) {
                     Timber.tag("Epic").i("[Cloud Saves] Skip exit upload: save directory empty for ${game.title}")
                     return@runBlocking false
                 }
@@ -140,41 +272,53 @@ object EpicCloudSavesManager {
      * Sync cloud saves for a game (bidirectional sync with conflict detection)
      * preferredAction = download -> Force downloads all files and overwrites current files
      * preferredAction = upload -> Force uploads all files
+     * preferredAction = exit_upload -> Timestamp check and upload only if local saves are newer
      * preferredAction = "auto" -> Timestamp check and uploads/downloads the files pending on the timestamp resolution
-     * @param preferredAction "download", "upload", or "auto" (default)
+     * @param preferredAction "download", "upload", "exit_upload", or "auto" (default)
      */
     suspend fun syncCloudSaves(
         context: Context,
         appId: Int,
         preferredAction: String = "auto",
+    ): Boolean = syncCloudSaves(context, appId, preferredAction, null)
+
+    suspend fun syncCloudSaves(
+        context: Context,
+        appId: Int,
+        preferredAction: String,
+        targetContainerId: Int?,
     ): Boolean =
         withContext(Dispatchers.IO) {
-            // Check if sync is already in progress for this appId
+            val forceUpload = preferredAction.equals("upload", ignoreCase = true)
+            val uploadRequest =
+                forceUpload || preferredAction.equals("exit_upload", ignoreCase = true)
+            val syncScope = syncScope(appId, targetContainerId)
             syncMutex.withLock {
+                if (forceUpload && wasUploadRecentlyCompletedLocked(syncScope)) {
+                    Timber.tag("Epic").i("[Cloud Saves] Recent upload already completed for $syncScope, skipping duplicate upload")
+                    return@withContext true
+                }
                 if (activeSyncs.contains(appId)) {
                     Timber.tag("Epic").w("[Cloud Saves] Sync already in progress for $appId, skipping duplicate request")
-                    return@withContext false
+                    return@withContext uploadRequest
                 }
                 activeSyncs.add(appId)
             }
 
             try {
-                Timber.tag("Epic").i("[Cloud Saves] Starting sync for $appId (action: $preferredAction)")
+                Timber.tag("Epic").i("[Cloud Saves] Starting sync for $appId (action: $preferredAction, container: ${syncScope.containerId ?: "auto"})")
 
-                // Get game info to retrieve appName
-                val game = EpicService.getEpicGameOf(appId)
+                val game = getEpicGame(context, appId)
                 if (game == null) {
                     Timber.tag("Epic").e("[Cloud Saves] Game not found: $appId")
                     return@withContext false
                 }
 
-                // Check if game supports cloud saves
                 if (!game.cloudSaveEnabled) {
                     Timber.tag("Epic").w("[Cloud Saves] Game does not support cloud saves: ${game.title}")
                     return@withContext false
                 }
 
-                // Get credentials and validate.
                 val credentials = EpicAuthManager.getStoredCredentials(context)
                 if (credentials.isFailure) {
                     Timber.tag("Epic").e("[Cloud Saves] Not logged in to Epic: ${credentials.exceptionOrNull()?.message}")
@@ -184,8 +328,7 @@ object EpicCloudSavesManager {
                 val creds = credentials.getOrNull()!!
                 Timber.tag("Epic").d("[Cloud Saves] Using account: ${creds.accountId} (${creds.displayName})")
 
-                //  Determine sync action - Upload,Download, Conflict or none
-                val action = determineSyncAction(context, creds.accountId, game, preferredAction)
+                val action = determineSyncAction(context, creds.accountId, game, preferredAction, targetContainerId)
 
                 Timber.tag("Epic").i("[Cloud Saves] Sync action determined: $action")
 
@@ -193,16 +336,16 @@ object EpicCloudSavesManager {
                 val result =
                     when (action) {
                         SyncAction.DOWNLOAD -> {
-                            downloadSaves(context, appId, creds.accountId)
+                            downloadSaves(context, appId, creds.accountId, targetContainerId = targetContainerId)
                         }
 
                         SyncAction.UPLOAD -> {
-                            uploadSaves(context, creds.accountId, game)
+                            uploadSaves(context, creds.accountId, game, targetContainerId = targetContainerId)
                         }
 
                         SyncAction.CONFLICT -> {
                             Timber.tag("Epic").w("[Cloud Saves] Conflict detected - resolving via timestamp comparison")
-                            resolveConflict(context, creds.accountId, game)
+                            resolveConflict(context, creds.accountId, game, targetContainerId)
                         }
 
                         SyncAction.NONE -> {
@@ -235,21 +378,25 @@ object EpicCloudSavesManager {
         accountId: String,
         game: com.winlator.cmod.feature.stores.epic.data.EpicGame,
         preferredAction: String,
+        targetContainerId: Int?,
     ): SyncAction =
         withContext(Dispatchers.IO) {
             try {
+                val uploadOnly = preferredAction.equals("exit_upload", ignoreCase = true)
+                val probeOnly = preferredAction.equals("probe", ignoreCase = true)
+
                 // Force action if requested
-                if (preferredAction == "download") return@withContext SyncAction.DOWNLOAD
-                if (preferredAction == "upload") return@withContext SyncAction.UPLOAD
+                if (preferredAction.equals("download", ignoreCase = true)) return@withContext SyncAction.DOWNLOAD
+                if (preferredAction.equals("upload", ignoreCase = true)) return@withContext SyncAction.UPLOAD
 
-                // Check local save directory
-                val saveDir = resolveSaveDirectory(context, game, accountId)
-                val hasLocalFiles = saveDir?.exists() == true && (saveDir.listFiles()?.isNotEmpty() == true)
+                val saveDir = resolveSaveDirectory(context, game, accountId, targetContainerId)
+                val hasLocalFiles = saveDir.hasAnySaveFile()
 
                 // Check cloud saves
                 val cloudSavesResult = listCloudSaves(game.appName, context)
                 if (cloudSavesResult.isFailure) {
-                    Timber.tag("Epic").w("[Cloud Saves] Failed to list cloud saves, will try upload if local files exist")
+                    Timber.tag("Epic").w("[Cloud Saves] Failed to list cloud saves")
+                    if (probeOnly) return@withContext SyncAction.NONE
                     return@withContext if (hasLocalFiles) SyncAction.UPLOAD else SyncAction.NONE
                 }
 
@@ -259,51 +406,60 @@ object EpicCloudSavesManager {
                 // Simple cases
                 when {
                     hasLocalFiles && !hasCloudFiles -> return@withContext SyncAction.UPLOAD
-                    !hasLocalFiles && hasCloudFiles -> return@withContext SyncAction.DOWNLOAD
+                    !hasLocalFiles && hasCloudFiles -> return@withContext if (uploadOnly) SyncAction.NONE else SyncAction.DOWNLOAD
                     !hasLocalFiles && !hasCloudFiles -> return@withContext SyncAction.NONE
                 }
 
                 // Both local and cloud have files - compare timestamps
-                val (_, manifestInfo) =
+                val (manifestPath, manifestInfo) =
                     findLatestManifest(cloudSaves.files) ?: run {
                         Timber.tag("Epic").w("[Cloud Saves] No manifest in cloud, will upload")
                         return@withContext SyncAction.UPLOAD
                     }
 
-                val lastSync = getSyncTimestamp(context, game.id)
                 val cloudTimestamp = manifestInfo.lastModified
+                val cloudTimestampMillis = parseManifestTimestamp(manifestPath, manifestInfo)
+                val lastSyncTimestamp = getSyncTimestamp(context, game.id)
+                val lastSyncTimestampMillis = lastSyncTimestamp?.let { parseTimestamp(it) }?.takeIf { it > 0L }
 
-                // Get local newest file timestamp
                 val localNewestTimestamp =
-                    saveDir?.let { dir ->
-                        dir
-                            .walkTopDown()
-                            .filter { it.isFile }
-                            .maxOfOrNull { it.lastModified() }
-                    }
-
-                Timber.tag("Epic").d("[Cloud Saves] Cloud timestamp: $cloudTimestamp, Last sync: $lastSync")
-                Timber.tag("Epic").d("[Cloud Saves] Local newest file: $localNewestTimestamp")
-
-                // If we have a last sync timestamp, use it for conflict detection
-                if (lastSync != null) {
-                    val cloudNewer = cloudTimestamp > lastSync
-                    val localNewer = localNewestTimestamp != null && localNewestTimestamp > parseTimestamp(lastSync)
-
+                    newestLocalSaveTimestamp(saveDir)
+
+                Timber
+                    .tag("Epic")
+                    .d(
+                        "[Cloud Saves] Timestamp compare: " +
+                            "local=${formatTimestampForLog(localNewestTimestamp)}, " +
+                            "cloud=${formatTimestampForLog(cloudTimestampMillis)} ($cloudTimestamp), " +
+                            "lastSync=${formatTimestampForLog(lastSyncTimestampMillis)}",
+                    )
+                Log.i(
+                    ANDROID_LOG_TAG,
+                    "Timestamp compare appId=${game.id} local=${formatTimestampForLog(localNewestTimestamp)} " +
+                        "cloud=${formatTimestampForLog(cloudTimestampMillis)} remoteLastModified=$cloudTimestamp " +
+                        "lastSync=${formatTimestampForLog(lastSyncTimestampMillis)} " +
+                        "newestLocalFile=${newestLocalSaveFile(saveDir)?.absolutePath}",
+                )
+
+                val action =
                     when {
-                        cloudNewer && !localNewer -> return@withContext SyncAction.DOWNLOAD
-                        localNewer && !cloudNewer -> return@withContext SyncAction.UPLOAD
-                        cloudNewer && localNewer -> return@withContext SyncAction.CONFLICT
-                        else -> return@withContext SyncAction.NONE
+                        localNewestTimestamp == null -> SyncAction.DOWNLOAD
+                        timestampsAreClose(localNewestTimestamp, cloudTimestampMillis) -> SyncAction.NONE
+                        lastSyncTimestampMillis == null -> SyncAction.CONFLICT
+                        timestampChangedSince(localNewestTimestamp, lastSyncTimestampMillis) &&
+                            timestampChangedSince(cloudTimestampMillis, lastSyncTimestampMillis) -> SyncAction.CONFLICT
+                        timestampChangedSince(localNewestTimestamp, lastSyncTimestampMillis) -> SyncAction.UPLOAD
+                        timestampChangedSince(cloudTimestampMillis, lastSyncTimestampMillis) -> SyncAction.DOWNLOAD
+                        else -> SyncAction.NONE
                     }
-                }
-
-                // No sync timestamp - just compare cloud vs local
-                if (cloudTimestamp >= (lastSync ?: "")) {
-                    SyncAction.DOWNLOAD
-                } else {
-                    SyncAction.NONE
-                }
+                val resolvedAction =
+                    if (uploadOnly && action != SyncAction.UPLOAD) {
+                        SyncAction.NONE
+                    } else {
+                        action
+                    }
+                Log.i(ANDROID_LOG_TAG, "Sync action appId=${game.id}: $resolvedAction")
+                resolvedAction
             } catch (e: Exception) {
                 Timber.tag("Epic").e(e, "[Cloud Saves] Error determining sync action")
                 SyncAction.NONE
@@ -322,6 +478,70 @@ object EpicCloudSavesManager {
             0L
         }
 
+    private fun formatTimestampForLog(timestampMs: Long?): String =
+        if (timestampMs == null || timestampMs <= 0L) {
+            "none"
+        } else {
+            "${Instant.ofEpochMilli(timestampMs)} [$timestampMs]"
+        }
+
+    private fun timestampsAreClose(
+        firstTimestampMs: Long,
+        secondTimestampMs: Long,
+    ): Boolean =
+        kotlin.math.abs(firstTimestampMs - secondTimestampMs) < SAVE_TIMESTAMP_EQUAL_TOLERANCE_MS
+
+    private fun timestampChangedSince(
+        timestampMs: Long,
+        baselineTimestampMs: Long,
+    ): Boolean = timestampMs - baselineTimestampMs > SAVE_TIMESTAMP_EQUAL_TOLERANCE_MS
+
+    private suspend fun getEpicGame(
+        context: Context,
+        appId: Int,
+    ): EpicGame? =
+        withContext(Dispatchers.IO) {
+            EpicService.getEpicGameOf(appId)
+                ?: runCatching {
+                    PluviaDatabase
+                        .getInstance(context.applicationContext)
+                        .epicGameDao()
+                        .getById(appId)
+                }.onFailure {
+                    Timber.tag("Epic").w(it, "[Cloud Saves] Failed to load Epic game $appId from database")
+                }.getOrNull()
+        }
+
+    private fun File?.hasAnySaveFile(): Boolean = this?.exists() == true && walkTopDown().any { it.isFile }
+
+    private fun newestLocalSaveTimestamp(saveDir: File?): Long? =
+        newestLocalSaveFile(saveDir)?.lastModified()
+
+    private fun newestLocalSaveFile(saveDir: File?): File? =
+        saveDir
+            ?.takeIf { it.exists() }
+            ?.walkTopDown()
+            ?.filter { it.isFile }
+            ?.maxByOrNull { it.lastModified() }
+
+    private fun parseManifestTimestamp(
+        manifestPath: String,
+        manifestInfo: CloudFileInfo,
+    ): Long {
+        val manifestName = manifestPath.substringAfterLast("/")
+        val fromName =
+            runCatching {
+                java.time.LocalDateTime
+                    .parse(
+                        manifestName.removeSuffix(".manifest"),
+                        java.time.format.DateTimeFormatter.ofPattern("yyyy.MM.dd-HH.mm.ss"),
+                    ).toInstant(java.time.ZoneOffset.UTC)
+                    .toEpochMilli()
+            }.getOrNull()
+        if (fromName != null) return fromName
+        return parseTimestamp(manifestInfo.lastModified)
+    }
+
     // List available cloud saves
     private suspend fun listCloudSaves(
         appName: String,
@@ -417,7 +637,7 @@ object EpicCloudSavesManager {
     private fun findLatestManifest(files: Map<String, CloudFileInfo>): Pair<String, CloudFileInfo>? =
         files.entries
             .filter { it.key.endsWith(".manifest") }
-            .maxByOrNull { it.value.lastModified }
+            .maxByOrNull { parseManifestTimestamp(it.key, it.value) }
             ?.toPair()
 
     /**
@@ -427,6 +647,7 @@ object EpicCloudSavesManager {
         context: Context,
         accountId: String,
         game: EpicGame,
+        targetContainerId: Int?,
     ): Boolean =
         withContext(Dispatchers.IO) {
             try {
@@ -434,7 +655,7 @@ object EpicCloudSavesManager {
 
                 // 1. Get local save directory and files
                 val saveDir =
-                    resolveSaveDirectory(context, game, accountId) ?: run {
+                    resolveSaveDirectory(context, game, accountId, targetContainerId) ?: run {
                         Timber.tag("Epic").e("[Cloud Saves] Failed to resolve save directory")
                         return@withContext false
                     }
@@ -463,7 +684,7 @@ object EpicCloudSavesManager {
                 val (manifestPath, manifestInfo) =
                     findLatestManifest(cloudSaves.files) ?: run {
                         Timber.tag("Epic").w("[Cloud Saves] No manifest in cloud, uploading all local files")
-                        return@withContext uploadSaves(context, accountId, game)
+                        return@withContext uploadSaves(context, accountId, game, targetContainerId = targetContainerId)
                     }
 
                 // 3. Download and parse manifest to get cloud file list with timestamps
@@ -478,7 +699,7 @@ object EpicCloudSavesManager {
                 // Validate manifest is not empty
                 if (manifestBytes.isEmpty()) {
                     Timber.tag("Epic").w("[Cloud Saves] Cloud manifest is empty, uploading all local files")
-                    return@withContext uploadSaves(context, accountId, game)
+                    return@withContext uploadSaves(context, accountId, game, targetContainerId = targetContainerId)
                 }
 
                 val manifest =
@@ -488,7 +709,7 @@ object EpicCloudSavesManager {
                         Timber.tag("Epic").e(e, "[Cloud Saves] Failed to parse manifest (size: ${manifestBytes.size} bytes)")
                         // If manifest is corrupt, upload our local version
                         Timber.tag("Epic").w("[Cloud Saves] Manifest parse failed, uploading local files")
-                        return@withContext uploadSaves(context, accountId, game)
+                        return@withContext uploadSaves(context, accountId, game, targetContainerId = targetContainerId)
                     }
 
                 // Epic's savesync manifests carry only a single manifest-level `lastModified`
@@ -625,7 +846,7 @@ object EpicCloudSavesManager {
                 if (toUpload.isNotEmpty()) {
                     Timber.tag("Epic").i("[Cloud Saves] Uploading ${toUpload.size} files based on timestamp comparison")
                     // ! Upload ALL local files, to ensure the manifest is correct with save-state
-                    uploadSuccess = uploadSaves(context, accountId, game)
+                    uploadSuccess = uploadSaves(context, accountId, game, targetContainerId = targetContainerId)
                 }
 
                 // 7. Update sync timestamp if both operations succeeded
@@ -651,13 +872,15 @@ object EpicCloudSavesManager {
         context: Context,
         appId: Int,
         accountId: String,
+        requestedManifestPath: String? = null,
+        targetContainerId: Int? = null,
     ): Boolean =
         withContext(Dispatchers.IO) {
             try {
                 Timber.tag("Epic").i("[Cloud Saves] Starting download for $appId")
 
                 // 1. Get game info
-                val game = EpicService.getEpicGameOf(appId)
+                val game = getEpicGame(context, appId)
                 if (game?.cloudSaveEnabled != true) {
                     Timber.tag("Epic").w("[Cloud Saves] Game does not support cloud saves")
                     return@withContext false
@@ -676,9 +899,19 @@ object EpicCloudSavesManager {
                     return@withContext false
                 }
 
-                // 3. Find latest manifest
+                // 3. Find the requested manifest, or fall back to latest.
+                val selectedManifest =
+                    requestedManifestPath
+                        ?.takeIf { it.endsWith(".manifest") }
+                        ?.let { path ->
+                            cloudSaves.files[path]?.let { path to it } ?: run {
+                                Timber.tag("Epic").w("[Cloud Saves] Requested manifest not found in cloud saves: $path")
+                                return@withContext false
+                            }
+                        }
+                        ?: findLatestManifest(cloudSaves.files)
                 val (manifestPath, manifestInfo) =
-                    findLatestManifest(cloudSaves.files) ?: run {
+                    selectedManifest ?: run {
                         Timber.tag("Epic").w("[Cloud Saves] No manifest found in cloud saves")
                         return@withContext false
                     }
@@ -724,7 +957,6 @@ object EpicCloudSavesManager {
                 var missingChunks = 0
                 manifest.chunkDataList?.elements?.forEach { chunkInfo ->
                     try {
-                        // Get chunk path using ChunkInfo's getPath method
                         val chunkPath = "$pathPrefix/${chunkInfo.getPath()}"
                         val chunkFile = cloudSaves.files[chunkPath]
 
@@ -764,7 +996,7 @@ object EpicCloudSavesManager {
 
                 // 8. Reconstruct files from chunks
                 val saveDir =
-                    resolveSaveDirectory(context, game, accountId) ?: run {
+                    resolveSaveDirectory(context, game, accountId, targetContainerId) ?: run {
                         Timber.tag("Epic").e("[Cloud Saves] Failed to resolve save directory")
                         return@withContext false
                     }
@@ -774,6 +1006,7 @@ object EpicCloudSavesManager {
                 var downloadedFiles = 0
                 var failedFiles = 0
                 val expectedFiles = manifest.fileManifestList?.elements?.size ?: 0
+                val manifestTimestamp = parseManifestTimestamp(manifestPath, manifestInfo)
 
                 val saveDirCanonical = saveDir.canonicalPath
                 manifest.fileManifestList?.elements?.forEach { fileManifest ->
@@ -826,6 +1059,7 @@ object EpicCloudSavesManager {
                         }
 
                         if (fileOk && tempFile.renameTo(outputFile)) {
+                            if (manifestTimestamp > 0L) outputFile.setLastModified(manifestTimestamp)
                             downloadedFiles++
                             Timber.tag("Epic").i("[Cloud Saves] Reconstructed: ${fileManifest.filename} (${outputFile.length()} bytes)")
                         } else {
@@ -864,19 +1098,27 @@ object EpicCloudSavesManager {
         accountId: String,
         game: EpicGame,
         fileList: List<String>? = null, // Optional: only upload specific files
+        targetContainerId: Int? = null,
     ): Boolean =
         withContext(Dispatchers.IO) {
             try {
+                val syncScope = syncScope(game.id, targetContainerId)
+                if (wasUploadRecentlyCompleted(syncScope)) {
+                    Timber.tag("Epic").i("[Cloud Saves] Recent upload already completed for $syncScope, skipping duplicate upload")
+                    return@withContext true
+                }
+
                 Timber.tag("Epic").i("[Cloud Saves] Starting upload for ${game.id}")
+                Log.i(ANDROID_LOG_TAG, "Starting upload appId=${game.id}")
 
                 // 1. Get local save directory
                 val saveDir =
-                    resolveSaveDirectory(context, game, accountId) ?: run {
+                    resolveSaveDirectory(context, game, accountId, targetContainerId) ?: run {
                         Timber.tag("Epic").e("[Cloud Saves] Failed to resolve save directory")
                         return@withContext false
                     }
 
-                if (!saveDir.exists() || saveDir.listFiles()?.isEmpty() == true) {
+                if (!saveDir.hasAnySaveFile()) {
                     Timber.tag("Epic").w("[Cloud Saves] No local saves to upload")
                     return@withContext false
                 }
@@ -893,7 +1135,6 @@ object EpicCloudSavesManager {
                     return@withContext false
                 }
 
-                // Filter out empty files (just log them, don't fail the upload)
                 val emptyFiles = packagedFiles.filter { it.value.isEmpty() }
                 if (emptyFiles.isNotEmpty()) {
                     Timber
@@ -909,6 +1150,12 @@ object EpicCloudSavesManager {
                     return@withContext false
                 }
 
+                val manifestEntry = nonEmptyFiles.entries.find { it.key.endsWith(".manifest") }
+                if (manifestEntry == null) {
+                    Timber.tag("Epic").e("[Cloud Saves] No manifest was packaged for upload")
+                    return@withContext false
+                }
+
                 // 3. Request write links for all files
                 val fileNames = nonEmptyFiles.keys.toList()
                 val writeLinks = requestWriteLinks(context, game.appName, fileNames)
@@ -919,6 +1166,7 @@ object EpicCloudSavesManager {
 
                 // 4. Upload chunks
                 var uploadedChunks = 0
+                var failedUploads = 0
                 nonEmptyFiles.forEach { (fileName, fileData) ->
                     if (!fileName.endsWith(".manifest")) {
                         val writeLink = writeLinks[fileName]
@@ -929,41 +1177,50 @@ object EpicCloudSavesManager {
                                 uploadedChunks++
                                 Timber.tag("Epic").i("[Cloud Saves] Uploaded chunk: $fileName (${fileData.size} bytes)")
                             } else {
+                                failedUploads++
                                 Timber
                                     .tag(
                                         "Epic",
                                     ).e("[Cloud Saves] Failed to upload chunk: $fileName - ${result.exceptionOrNull()?.message}")
                             }
+                        } else {
+                            failedUploads++
+                            Timber.tag("Epic").e("[Cloud Saves] Missing write link for chunk: $fileName")
                         }
                     }
                 }
 
+                if (failedUploads > 0) {
+                    Timber.tag("Epic").e("[Cloud Saves] Aborting upload: $failedUploads chunk(s) failed before manifest upload")
+                    return@withContext false
+                }
+
                 // 5. Upload manifest last
-                val manifestEntry = nonEmptyFiles.entries.find { it.key.endsWith(".manifest") }
-                if (manifestEntry != null) {
-                    val writeLink = writeLinks[manifestEntry.key]
-                    if (writeLink != null) {
-                        Timber.tag("Epic").d("[Cloud Saves] Uploading manifest: ${manifestEntry.key} (${manifestEntry.value.size} bytes)")
-                        val result = uploadFile(writeLink, manifestEntry.value)
-                        if (result.isSuccess) {
-                            Timber
-                                .tag(
-                                    "Epic",
-                                ).i("[Cloud Saves] Uploaded manifest: ${manifestEntry.key} (${manifestEntry.value.size} bytes)")
-
-                            // Update sync timestamp
-                            val timestamp =
-                                java.time.Instant
-                                    .now()
-                                    .toString()
-                            setSyncTimestamp(context, game.id, timestamp)
-
-                            Timber.tag("Epic").i("[Cloud Saves] Upload complete: $uploadedChunks chunks uploaded")
-                            return@withContext true
-                        } else {
-                            Timber.tag("Epic").e("[Cloud Saves] Failed to upload manifest: ${result.exceptionOrNull()?.message}")
-                        }
+                val writeLink = writeLinks[manifestEntry.key]
+                if (writeLink != null) {
+                    Timber.tag("Epic").d("[Cloud Saves] Uploading manifest: ${manifestEntry.key} (${manifestEntry.value.size} bytes)")
+                    val result = uploadFile(writeLink, manifestEntry.value)
+                    if (result.isSuccess) {
+                        Timber
+                            .tag(
+                                "Epic",
+                            ).i("[Cloud Saves] Uploaded manifest: ${manifestEntry.key} (${manifestEntry.value.size} bytes)")
+
+                        val timestamp =
+                            java.time.Instant
+                                .now()
+                                .toString()
+                        setSyncTimestamp(context, game.id, timestamp)
+                        markUploadCompleted(syncScope)
+
+                        Timber.tag("Epic").i("[Cloud Saves] Upload complete: $uploadedChunks chunks uploaded")
+                        Log.i(ANDROID_LOG_TAG, "Upload complete appId=${game.id} manifest=${manifestEntry.key} chunks=$uploadedChunks")
+                        return@withContext true
+                    } else {
+                        Timber.tag("Epic").e("[Cloud Saves] Failed to upload manifest: ${result.exceptionOrNull()?.message}")
                     }
+                } else {
+                    Timber.tag("Epic").e("[Cloud Saves] Missing write link for manifest: ${manifestEntry.key}")
                 }
 
                 false
@@ -973,6 +1230,29 @@ object EpicCloudSavesManager {
             }
         }
 
+    private fun syncScope(
+        appId: Int,
+        targetContainerId: Int?,
+    ): SyncScope = SyncScope(appId, targetContainerId?.takeIf { it > 0 })
+
+    private suspend fun wasUploadRecentlyCompleted(syncScope: SyncScope): Boolean =
+        syncMutex.withLock {
+            wasUploadRecentlyCompletedLocked(syncScope)
+        }
+
+    private fun wasUploadRecentlyCompletedLocked(syncScope: SyncScope): Boolean {
+        val now = System.currentTimeMillis()
+        recentSuccessfulUploads.entries.removeAll { now - it.value > DUPLICATE_UPLOAD_SUPPRESSION_MS }
+        val lastUploadAt = recentSuccessfulUploads[syncScope] ?: return false
+        return now - lastUploadAt <= DUPLICATE_UPLOAD_SUPPRESSION_MS
+    }
+
+    private suspend fun markUploadCompleted(syncScope: SyncScope) {
+        syncMutex.withLock {
+            recentSuccessfulUploads[syncScope] = System.currentTimeMillis()
+        }
+    }
+
     // Request write links for files
     private suspend fun requestWriteLinks(
         context: Context,
@@ -1103,26 +1383,43 @@ object EpicCloudSavesManager {
         try {
             Timber.tag("Epic").i("[Cloud Saves] Packaging files from: ${saveDir.absolutePath}")
 
+            val includeFilters = parseCloudFilterList(game.cloudIncludeList)
+            val excludeFilters = parseCloudFilterList(game.cloudExcludeList)
+
             val allFiles =
                 saveDir
                     .walkTopDown()
                     .filter { it.isFile }
                     .toList()
+            Timber.tag("Epic").i("[Cloud Saves] Found ${allFiles.size} file(s) under resolved save root before filters")
 
-            // Filter to only requested files if fileList is provided
-            val files =
-                if (fileList != null) {
-                    allFiles.filter { file ->
+            val filteredFiles =
+                allFiles.filter { file ->
                         val relativePath = file.relativeTo(saveDir).path.replace("\\", "/")
-                        val included = fileList.contains(relativePath)
-                        if (included) {
-                            Timber.tag("Epic").d("[Cloud Saves] Including file: $relativePath")
+                        if (fileList != null && !fileList.contains(relativePath)) {
+                            return@filter false
                         }
-                        included
-                    }
+                        if (includeFilters.isNotEmpty() && !filenameMatchesAny(relativePath, includeFilters)) {
+                            Timber.tag("Epic").d("[Cloud Saves] Excluding $relativePath (does not match include filter)")
+                            return@filter false
+                        }
+                        if (excludeFilters.isNotEmpty() && filenameMatchesAny(relativePath, excludeFilters)) {
+                            Timber.tag("Epic").d("[Cloud Saves] Excluding $relativePath (matches exclude filter)")
+                            return@filter false
+                        }
+                        Timber.tag("Epic").d("[Cloud Saves] Including file: $relativePath")
+                        true
+                    }.sortedBy { it.relativeTo(saveDir).path.lowercase() }
+
+            val files =
+                if (filteredFiles.isEmpty() && fileList == null && allFiles.isNotEmpty() && (includeFilters.isNotEmpty() || excludeFilters.isNotEmpty())) {
+                    Timber
+                        .tag("Epic")
+                        .w("[Cloud Saves] Epic filters matched no files; falling back to all files under resolved save root")
+                    allFiles.sortedBy { it.relativeTo(saveDir).path.lowercase() }
                 } else {
-                    allFiles
-                }.sortedBy { it.name.lowercase() }
+                    filteredFiles
+                }
 
             if (files.isEmpty()) {
                 Timber.tag("Epic").w("[Cloud Saves] No files found to package")
@@ -1142,7 +1439,6 @@ object EpicCloudSavesManager {
             var currentChunkGuid = generateGuid()
             val chunkSize = 1024 * 1024 // 1 MB chunks
 
-            // Process each file
             files.forEach { file ->
                 try {
                     val relativePath = file.relativeTo(saveDir).path.replace("\\", "/")
@@ -1172,7 +1468,6 @@ object EpicCloudSavesManager {
 
                     // Split file into chunk parts
                     while (fileOffset < fileData.size) {
-                        // Check if we need to finalize current chunk
                         if (currentChunkData.size >= chunkSize) {
                             val chunk = finalizeChunk(currentChunkData.toByteArray(), currentChunkGuid, chunkNum++, packagedFiles)
                             chunks.add(chunk)
@@ -1187,7 +1482,6 @@ object EpicCloudSavesManager {
                         val remainingInChunk = (chunkSize - currentChunkData.size).coerceAtMost((fileData.size - fileOffset).toInt())
                         val size = remainingInChunk
 
-                        // Add data to current chunk
                         currentChunkData.addAll(
                             fileData.sliceArray(fileOffset.toInt() until (fileOffset + remainingInChunk).toInt()).toList(),
                         )
@@ -1367,6 +1661,40 @@ object EpicCloudSavesManager {
         return IntArray(4) { random.nextInt() }
     }
 
+    private fun parseCloudFilterList(raw: String): List<String> =
+        raw
+            .split(",")
+            .map { it.trim().replace("\\", "/") }
+            .filter { it.isNotEmpty() }
+
+    private fun filenameMatchesAny(
+        filename: String,
+        patterns: List<String>,
+    ): Boolean = patterns.any { pattern -> filenameMatchesPattern(filename, pattern) }
+
+    private fun filenameMatchesPattern(
+        filename: String,
+        pattern: String,
+    ): Boolean {
+        if (pattern.endsWith("/") && filename.startsWith(pattern)) return true
+        if (filename.endsWith(pattern)) return true
+        if (!pattern.contains("*") && !pattern.contains("?")) return false
+
+        val regex =
+            buildString {
+                append("^")
+                pattern.forEach { ch ->
+                    when (ch) {
+                        '*' -> append(".*")
+                        '?' -> append(".")
+                        else -> append(Regex.escape(ch.toString()))
+                    }
+                }
+                append("$")
+            }.toRegex()
+        return regex.matches(filename)
+    }
+
     /**
      * CRC-64-ECMA variant lookup table
      * Polynomial: 0xC96C5795D7870F42
@@ -1445,19 +1773,15 @@ object EpicCloudSavesManager {
         context: Context,
         game: EpicGame,
         accountId: String,
+        targetContainerId: Int? = null,
     ): File? {
         val cloudSaveFolder = game.saveFolder.ifEmpty { return null }
 
-        // Get the container's Wine prefix path (similar to GOG)
-        val appId = "EPIC_${game.id}"
-        val container =
-            com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
-                .getUsableContainerOrNull(context, appId)
-                ?: return null
+        val container = resolveEpicContainer(context, game.id, targetContainerId) ?: return null
         val winePrefix = File(container.rootDir, ".wine").absolutePath
         val user = "xuser"
 
-        Timber.tag("Epic").d("[Cloud Saves] Using Wine prefix: $winePrefix")
+        Timber.tag("Epic").d("[Cloud Saves] Using Wine prefix: $winePrefix (container ${container.id})")
 
         // Resolve path variables used by Epic Games (case-insensitive)
         val pathVars =
@@ -1481,9 +1805,11 @@ object EpicCloudSavesManager {
         Timber.tag("Epic").d("[Cloud Saves] Using AppData directory name: $appDataDir")
 
         val localAppDataPath = File(winePrefix, "drive_c/users/$user/$appDataDir/Local").absolutePath
+        val localLowAppDataPath = File(winePrefix, "drive_c/users/$user/$appDataDir/LocalLow").absolutePath
         val roamingAppDataPath = File(winePrefix, "drive_c/users/$user/$appDataDir/Roaming").absolutePath
         val documentsPath = File(winePrefix, "drive_c/users/$user/Documents").absolutePath
         val savedGamesPath = File(winePrefix, "drive_c/users/$user/Saved Games").absolutePath
+        val userProfilePath = File(winePrefix, "drive_c/users/$user").absolutePath
 
         // Counter-intuitive but matches the canonical Legendary mapping at `core.py:892`
         // and `core.py:961` (`'{appdata}': '%LOCALAPPDATA%'` and `wine_folders['Local AppData']`).
@@ -1491,14 +1817,34 @@ object EpicCloudSavesManager {
         // Windows's `%APPDATA%` (Roaming) which the name might suggest.
         pathVars["{appdata}"] = localAppDataPath
         pathVars["{localappdata}"] = localAppDataPath
+        pathVars["{locallow}"] = localLowAppDataPath
         pathVars["{roamingappdata}"] = roamingAppDataPath
+        pathVars["{roaming}"] = roamingAppDataPath
         pathVars["{userdir}"] = documentsPath
         pathVars["{usersavedgames}"] = savedGamesPath
-        pathVars["{userprofile}"] = File(winePrefix, "drive_c/users/$user").absolutePath
+        pathVars["{userprofile}"] = userProfilePath
+        pathVars["%localappdata%"] = localAppDataPath
+        pathVars["%appdata%"] = roamingAppDataPath
+        pathVars["%userprofile%"] = userProfilePath
+        pathVars["%homepath%"] = userProfilePath
 
         // Normalize path separators first
         var resolvedPath = cloudSaveFolder.replace("\\", "/")
 
+        val legacyPathLower = resolvedPath.lowercase()
+        resolvedPath =
+            when {
+                "locallow/" in legacyPathLower -> {
+                    val suffix = resolvedPath.substring(legacyPathLower.indexOf("locallow/") + "locallow/".length)
+                    "{locallow}/$suffix"
+                }
+                "roaming/" in legacyPathLower -> {
+                    val suffix = resolvedPath.substring(legacyPathLower.indexOf("roaming/") + "roaming/".length)
+                    "{roaming}/$suffix"
+                }
+                else -> resolvedPath
+            }
+
         Timber.tag("Epic").d("[Cloud Saves] Before variable replacement: $resolvedPath")
 
         // Replace variables (case-insensitive)
@@ -1512,6 +1858,12 @@ object EpicCloudSavesManager {
 
         Timber.tag("Epic").d("[Cloud Saves] After variable replacement: $resolvedPath")
 
+        val windowsUserPathPattern = Regex("^[A-Za-z]:/Users/[^/]+/", RegexOption.IGNORE_CASE)
+        if (windowsUserPathPattern.containsMatchIn(resolvedPath)) {
+            resolvedPath = resolvedPath.replace(windowsUserPathPattern, userProfilePath.replace("\\", "/") + "/")
+            Timber.tag("Epic").d("[Cloud Saves] Rebased Windows user path to Wine prefix: $resolvedPath")
+        }
+
         // Manually resolve ../ and ./ in the path (don't use canonicalPath as it can fail/change paths)
         val pathParts = resolvedPath.split("/").toMutableList()
         val normalizedParts = mutableListOf<String>()
@@ -1531,54 +1883,100 @@ object EpicCloudSavesManager {
             }
         }
 
-        val finalPath = File(normalizedParts.joinToString("/"))
+        val finalPath = resolveExistingPathCaseInsensitive(File(normalizedParts.joinToString("/")))
 
-        // Check subdirectories for save files
-        // Some games store saves in user-specific subdirectories (e.g., "0/", "1/", etc.)
-        // even if there are other files in the parent directory
         Timber.tag("Epic").d("[Cloud Saves] Scanning path: ${finalPath.absolutePath}")
         Timber.tag("Epic").d("[Cloud Saves] Path exists: ${finalPath.exists()}")
 
-        val actualPath =
-            if (finalPath.exists()) {
-                // Log all contents
-                val allContents = finalPath.listFiles() ?: emptyArray()
-                Timber.tag("Epic").d("[Cloud Saves] Total items in path: ${allContents.size}")
-
-                allContents.forEach { item ->
-                    if (item.isDirectory) {
-                        val filesInSubdir = item.listFiles()?.filter { it.isFile } ?: emptyList()
-                        Timber.tag("Epic").d("[Cloud Saves]   DIR: ${item.name}/ (${filesInSubdir.size} files)")
-                        filesInSubdir.take(5).forEach { file ->
-                            Timber.tag("Epic").d("[Cloud Saves]     - ${file.name} (${file.length()} bytes)")
-                        }
-                    } else {
-                        Timber.tag("Epic").d("[Cloud Saves]   FILE: ${item.name} (${item.length()} bytes)")
-                    }
-                }
+        if (finalPath.exists()) {
+            val allContents = finalPath.listFiles() ?: emptyArray()
+            Timber.tag("Epic").d("[Cloud Saves] Total items in path: ${allContents.size}")
 
-                // Always check for subdirectories with files
-                val subDirs = finalPath.listFiles { it -> it.isDirectory } ?: emptyArray()
-                val dirWithFiles =
-                    subDirs.firstOrNull { subDir ->
-                        subDir.listFiles()?.any { it.isFile } == true
-                    }
-                if (dirWithFiles != null) {
-                    Timber.tag("Epic").d("[Cloud Saves] Found saves in subdirectory: ${dirWithFiles.name}")
-                    dirWithFiles
+            allContents.forEach { item ->
+                if (item.isDirectory) {
+                    val filesInSubdir = item.walkTopDown().count { it.isFile }
+                    Timber.tag("Epic").d("[Cloud Saves]   DIR: ${item.name}/ ($filesInSubdir files recursively)")
                 } else {
-                    finalPath
+                    Timber.tag("Epic").d("[Cloud Saves]   FILE: ${item.name} (${item.length()} bytes)")
                 }
-            } else {
-                Timber.tag("Epic").w("[Cloud Saves] Path does not exist!")
-                finalPath
             }
+        } else {
+            Timber.tag("Epic").w("[Cloud Saves] Path does not exist!")
+        }
 
         Timber.tag("Epic").d("[Cloud Saves] Path resolution:")
         Timber.tag("Epic").d("[Cloud Saves]   Original: $cloudSaveFolder")
-        Timber.tag("Epic").d("[Cloud Saves]   Resolved: ${actualPath.absolutePath}")
+        Timber.tag("Epic").d("[Cloud Saves]   Resolved: ${finalPath.absolutePath}")
+
+        return finalPath
+    }
+
+    private fun resolveEpicContainer(
+        context: Context,
+        appId: Int,
+        targetContainerId: Int? = null,
+    ) = runCatching {
+        val containerManager = com.winlator.cmod.runtime.container.ContainerManager(context)
+        val explicitContainerId = targetContainerId?.takeIf { it > 0 }
+        if (explicitContainerId != null) {
+            val explicitContainer = containerManager.getContainerById(explicitContainerId)
+            if (explicitContainer == null) {
+                Timber.tag("Epic").w("[Cloud Saves] Explicit container $explicitContainerId not found for Epic appId=$appId")
+                return@runCatching null
+            }
+            if (!com.winlator.cmod.feature.setup.SetupWizardActivity.isContainerUsable(context, explicitContainer)) {
+                Timber.tag("Epic").w("[Cloud Saves] Explicit container $explicitContainerId is not usable for Epic appId=$appId")
+                return@runCatching null
+            }
+            return@runCatching explicitContainer
+        }
+
+        // Prefer a real Epic shortcut, but only fall back to the default preferred
+        // container when no explicit launch container was supplied.
+        containerManager
+            .loadShortcuts()
+            .firstOrNull {
+                it.getExtra("game_source") == "EPIC" && it.getExtra("app_id") == appId.toString()
+            }?.container
+            ?.takeIf {
+                com.winlator.cmod.feature.setup.SetupWizardActivity.isContainerUsable(context, it)
+            }
+            ?: com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+                .getUsableContainerOrNull(context, "EPIC_$appId")
+    }.onFailure {
+        Timber.tag("Epic").w(it, "[Cloud Saves] Failed to resolve shortcut container for Epic appId=$appId")
+    }.getOrNull()
+
+    private fun resolveExistingPathCaseInsensitive(path: File): File {
+        if (path.exists()) return path
+
+        val absolute = path.absoluteFile
+        val parts = absolute.path.split(File.separatorChar, '/', '\\').filter { it.isNotEmpty() }
+        if (parts.isEmpty()) return path
+
+        var current =
+            if (absolute.path.startsWith(File.separator)) {
+                File(File.separator)
+            } else {
+                File(parts.first()).also {
+                    if (it.exists()) return@also
+                }
+            }
+        val startIndex = if (absolute.path.startsWith(File.separator)) 0 else 1
+
+        for (index in startIndex until parts.size) {
+            val part = parts[index]
+            val direct = File(current, part)
+            current =
+                if (direct.exists()) {
+                    direct
+                } else {
+                    current.listFiles()?.firstOrNull { it.name.equals(part, ignoreCase = true) }
+                        ?: direct
+                }
+        }
 
-        return actualPath
+        return current
     }
 
     private fun getSyncTimestamp(
diff --git a/app/src/main/feature/stores/epic/service/EpicConstants.kt b/app/src/main/feature/stores/epic/service/EpicConstants.kt
index 61dbbedab..fe36d4567 100644
--- a/app/src/main/feature/stores/epic/service/EpicConstants.kt
+++ b/app/src/main/feature/stores/epic/service/EpicConstants.kt
@@ -6,6 +6,10 @@ import java.io.File
 import java.nio.file.Paths
 import java.security.SecureRandom
 
+private val REGEX_FILENAME_UNSAFE = Regex("[^a-zA-Z0-9_-]")
+
+internal fun String.sanitizeForFilename(): String = REGEX_FILENAME_UNSAFE.replace(this, "_")
+
 /**
  * Constants for Epic Games Store integration
  */
@@ -178,10 +182,7 @@ object EpicConstants {
         return Paths.get(defaultEpicGamesPath(context), sanitizedTitle).toString()
     }
 
-    /**
-     * Get build version for user agent
-     */
     private fun getBuildVersion(): String {
-        return "0.1.0" // TODO: Pull from BuildConfig
+        return "0.1.0"
     }
 }
diff --git a/app/src/main/feature/stores/epic/service/EpicDownloadManager.kt b/app/src/main/feature/stores/epic/service/EpicDownloadManager.kt
index fb4fb960c..3ea82886b 100644
--- a/app/src/main/feature/stores/epic/service/EpicDownloadManager.kt
+++ b/app/src/main/feature/stores/epic/service/EpicDownloadManager.kt
@@ -1,15 +1,23 @@
 package com.winlator.cmod.feature.stores.epic.service
 import android.content.Context
 import android.util.Log
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.download.DownloadCoordinator
 import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.service.manifest.ChunkInfo
+import com.winlator.cmod.feature.stores.epic.service.manifest.ChunkPart
 import com.winlator.cmod.feature.stores.epic.service.manifest.EpicManifest
+import com.winlator.cmod.feature.stores.epic.service.manifest.FileManifest
 import com.winlator.cmod.feature.stores.epic.service.manifest.ManifestUtils
 import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
 import com.winlator.cmod.feature.stores.steam.enums.Marker
 import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -17,22 +25,17 @@ import org.json.JSONObject
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.File
+import java.io.RandomAccessFile
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.security.MessageDigest
+import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.TimeUnit
 import java.util.zip.Inflater
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/**
- * EpicDownloadManager handles downloading Epic games
- *
- * Manifest structure (from legendary.models.manifest):
- * - meta: App metadata (app_name, build_version, etc.)
- * - chunk_data_list: List of chunks to download
- * - file_manifest_list: List of files and their chunk composition
- */
+// Downloads Epic games from chunked Epic manifests.
 @Singleton
 class EpicDownloadManager
     @Inject
@@ -45,29 +48,18 @@ class EpicDownloadManager
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
-                // Connection pool optimization for parallel downloads
                 .connectionPool(okhttp3.ConnectionPool(32, 5, TimeUnit.MINUTES))
                 .build()
 
         companion object {
-            private const val MAX_PARALLEL_DOWNLOADS = 6
-            private const val CHUNK_BUFFER_SIZE = 1024 * 1024 // 1MB buffer for decompression
-            private const val MAX_CHUNK_RETRIES = 3 // Maximum retries per chunk
-            private const val RETRY_DELAY_MS = 1000L // Initial retry delay in milliseconds
+            private const val MAX_PARALLEL_DOWNLOADS = 12
+            private const val CHUNK_BUFFER_SIZE = 1024 * 1024
+            private const val MAX_CHUNK_RETRIES = 5
+            private const val RETRY_DELAY_MS = 1000L
+            private const val RESUME_STATE_FILE = "epic_applied_chunks.txt"
         }
 
-        /**
-         * Download and install an Epic game
-         *
-         * @param context Android context
-         * @param game Epic game to download
-         * @param installPath Directory where game will be installed
-         * @param downloadInfo Progress tracker
-         * @param containerLanguage Container language (e.g. "english", "german"). Same as GOG/Steam; used to select install tags so the correct language files are downloaded.
-         * @param dlcIds Optional DLC game IDs to include
-         * @param commonRedistDir Optional directory for common redistributables
-         * @return Result indicating success or failure
-         */
+        // Downloads and installs an Epic game.
         suspend fun downloadGame(
             context: Context,
             game: EpicGame,
@@ -84,14 +76,12 @@ class EpicDownloadManager
                     File(installPath).mkdirs()
                     MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
 
-                    // Emit download started event so UI can attach progress listeners
                     val gameId = game.id
                     com.winlator.cmod.app.PluviaApp.events.emitJava(
                         com.winlator.cmod.feature.stores.steam.events.AndroidEvent
                             .DownloadStatusChanged(gameId, true),
                     )
 
-                    // Check for DLCs early to calculate total download size
                     val dlcsToDownload =
                         if (dlcIds.size > 0) {
                             try {
@@ -111,7 +101,6 @@ class EpicDownloadManager
 
                     Timber.tag("Epic").i("Filtered to ${dlcsToDownload.size} DLC(s) for ${game.title}")
 
-                    // Fetch manifest binary and CDN URLs from Epic
                     val manifestResult =
                         epicManager.fetchManifestFromEpic(
                             context,
@@ -127,15 +116,15 @@ class EpicDownloadManager
 
                     val manifestData = manifestResult.getOrNull()!!
 
-                    // ! Avoiding Cloudflare as it causes issues with some downloads and is inconsistent.
-                    val cdnUrls = manifestData.cdnUrls.filter { !it.baseUrl.startsWith("https://cloudflare.epicgamescdn.com") }
+                    val cdnUrls = selectCdnUrls(manifestData.cdnUrls)
+                    if (cdnUrls.isEmpty()) {
+                        return@withContext Result.failure(Exception("No usable CDN URLs in manifest"))
+                    }
 
                     Timber.tag("Epic").d("Manifest fetched with ${cdnUrls.size} CDN URLs, parsing...")
 
-                    // Parse manifest binary to get chunks and files
                     val manifest = EpicManifest.readAll(manifestData.manifestBytes)
 
-                    // Use container language (same as GOG) to select install tags: required + optional language files.
                     val selectedTags = EpicConstants.containerLanguageToEpicInstallTags(containerLanguage)
                     val files = ManifestUtils.getFilesForSelectedInstallTags(manifest, selectedTags)
                     val chunks = ManifestUtils.getRequiredChunksForFileList(manifest, files)
@@ -159,12 +148,11 @@ class EpicDownloadManager
                         return@withContext Result.failure(Exception(msg))
                     }
 
-                    // Calculate total download size including DLCs
                     var totalDownloadSize = chunks.sumOf { it.fileSize }
-                    var totalInstalledSize = chunks.sumOf { it.windowSize.toLong() }
+                    var totalInstalledSize = files.sumOf { it.fileSize }
                     val baseGameSize = totalDownloadSize
+                    val baseGameInstalledSize = totalInstalledSize
 
-                    // Fetch DLC manifests to get their sizes for accurate progress tracking
                     val dlcManifestData = mutableListOf<Pair<EpicGame, EpicManager.ManifestResult>>()
                     if (dlcsToDownload.isNotEmpty()) {
                         downloadInfo.updateStatusMessage("Calculating DLC sizes...")
@@ -180,8 +168,10 @@ class EpicDownloadManager
                                 if (dlcManifestResult.isSuccess) {
                                     val dlcManifest = dlcManifestResult.getOrNull()!!
                                     val dlcParsed = EpicManifest.readAll(dlcManifest.manifestBytes)
-                                    val dlcDownloadSize = dlcParsed.chunkDataList?.elements?.sumOf { it.fileSize } ?: 0L
-                                    val dlcInstalledSize = dlcParsed.chunkDataList?.elements?.sumOf { it.windowSize.toLong() } ?: 0L
+                                    val dlcFiles = ManifestUtils.getFilesForSelectedInstallTags(dlcParsed, selectedTags)
+                                    val dlcChunks = ManifestUtils.getRequiredChunksForFileList(dlcParsed, dlcFiles)
+                                    val dlcDownloadSize = dlcChunks.sumOf { it.fileSize }
+                                    val dlcInstalledSize = dlcFiles.sumOf { it.fileSize }
                                     totalDownloadSize += dlcDownloadSize
                                     totalInstalledSize += dlcInstalledSize
                                     dlcManifestData.add(dlc to dlcManifest)
@@ -202,8 +192,9 @@ class EpicDownloadManager
                         """
                 |Download prepared:
                 |  Base game download size: ${baseGameSize / 1_000_000_000.0} GB
-                |  Base game installed size: ${totalInstalledSize / 1_000_000_000.0} GB
+                |  Base game installed size: ${baseGameInstalledSize / 1_000_000_000.0} GB
                 |  DLCs: ${dlcManifestData.size}
+                |  Total installed size (including DLCs): ${totalInstalledSize / 1_000_000_000.0} GB
                 |  Total download size (including DLCs): ${totalDownloadSize / 1_000_000_000.0} GB
                 |  Chunks: $chunkCount
                 |  Files: $fileCount
@@ -212,7 +203,9 @@ class EpicDownloadManager
                     )
 
                     downloadInfo.setTotalExpectedBytes(totalDownloadSize)
+                    downloadInfo.setDisplayTotalExpectedBytes(totalDownloadSize)
                     downloadInfo.updateStatusMessage("Downloading base game...")
+                    syncCoordinatorProgress(gameId, downloadInfo)
 
                     // Download chunks in parallel
                     val chunkCacheDir = File(installPath, ".chunks")
@@ -229,85 +222,45 @@ class EpicDownloadManager
                         """.trimMargin(),
                     )
 
-                    // Download chunks in batches to avoid overwhelming the system
-                    var downloadedChunks = 0
-                    val totalChunks = chunks.size
-
-                    // Initialize progress tracking
                     downloadInfo.setProgress(0.0f)
                     downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(gameId, downloadInfo)
 
-                    chunks.chunked(MAX_PARALLEL_DOWNLOADS).forEach { chunkBatch ->
-                        if (!downloadInfo.isActive()) {
-                            Timber.tag("Epic").w("Download cancelled by user")
-                            return@withContext Result.failure(Exception("Download cancelled"))
-                        }
-
-                        // Download batch in parallel
-                        val results =
-                            chunkBatch
-                                .map { chunk ->
-                                    async {
-                                        downloadChunkWithRetry(chunk, chunkCacheDir, chunkDir, cdnUrls, downloadInfo)
-                                    }
-                                }.awaitAll()
-
-                        // Check if any download failed
-                        results.firstOrNull { it.isFailure }?.let { failedResult ->
-                            return@withContext Result.failure(
-                                failedResult.exceptionOrNull() ?: Exception("Failed to download chunk"),
-                            )
-                        }
-
-                        // Update progress after each batch completes
-                        downloadedChunks += chunkBatch.size
-                        val progress = downloadedChunks.toFloat() / totalChunks
-                        downloadInfo.setProgress(progress)
-                        val statusMsg =
-                            if (dlcManifestData.isNotEmpty()) {
-                                "Downloading base game ($downloadedChunks/$totalChunks chunks)"
-                            } else {
-                                "Downloading chunks ($downloadedChunks/$totalChunks)"
-                            }
-                        downloadInfo.updateStatusMessage(statusMsg)
-                        downloadInfo.emitProgressChange()
-
-                        Timber.tag("Epic").d("Download progress: $downloadedChunks/$totalChunks chunks (${(progress * 100).toInt()}%)")
-                    }
-
-                    downloadInfo.updateStatusMessage("Assembling files...")
-
-                    // Assemble files from chunks in parallel batches
                     val installDir = File(installPath)
                     installDir.mkdirs()
 
-                    var assembledFiles = 0
-                    val totalFiles = files.size
-
-                    // Process files in batches for better parallelism
-                    files.chunked(4).forEach { fileBatch ->
-                        val assembleResults =
-                            fileBatch
-                                .map { fileManifest ->
-                                    async {
-                                        assembleFile(fileManifest, chunkCacheDir, installDir)
-                                    }
-                                }.awaitAll()
+                    val installResult =
+                        downloadChunksIntoFiles(
+                            chunks = chunks,
+                            files = files,
+                            chunkCacheDir = chunkCacheDir,
+                            chunkDir = chunkDir,
+                            cdnUrls = cdnUrls,
+                            installDir = installDir,
+                            downloadInfo = downloadInfo,
+                        ) { downloadedChunks, totalChunks ->
+                            val progress = downloadedChunks.toFloat() / totalChunks
+                            downloadInfo.setProgress(progress)
+                            val statusMsg =
+                                if (dlcManifestData.isNotEmpty()) {
+                                    "Downloading base game ($downloadedChunks/$totalChunks chunks)"
+                                } else {
+                                    "Downloading chunks ($downloadedChunks/$totalChunks)"
+                                }
+                            downloadInfo.updateStatus(DownloadPhase.DOWNLOADING, statusMsg)
+                            downloadInfo.emitProgressChange()
+                            syncCoordinatorProgress(gameId, downloadInfo)
 
-                        // Check if any assembly failed
-                        assembleResults.firstOrNull { it.isFailure }?.let { failedResult ->
-                            return@withContext Result.failure(
-                                failedResult.exceptionOrNull() ?: Exception("Failed to assemble file"),
-                            )
+                            Timber.tag("Epic").d("Download progress: $downloadedChunks/$totalChunks chunks (${(progress * 100).toInt()}%)")
                         }
 
-                        assembledFiles += fileBatch.size
-                        val assemblyProgress = assembledFiles.toFloat() / totalFiles
-                        downloadInfo.updateStatusMessage("Assembling files ($assembledFiles/$totalFiles)")
-                        Timber.tag("Epic").d("File assembly progress: $assembledFiles/$totalFiles (${(assemblyProgress * 100).toInt()}%)")
+                    if (installResult.isFailure) {
+                        return@withContext Result.failure(
+                            installResult.exceptionOrNull() ?: Exception("Failed to install chunks"),
+                        )
                     }
+                    EpicInstalledManifestStore.saveManifest(installDir, game.appName, manifestData.manifestBytes)
 
-                    // Cleanup chunk directory
                     chunkCacheDir.deleteRecursively()
 
                     // Log final directory structure
@@ -332,6 +285,7 @@ class EpicDownloadManager
                                             manifestData = manifestData,
                                             installPath = installPath,
                                             downloadInfo = downloadInfo,
+                                            selectedTags = selectedTags,
                                         )
 
                                     if (dlcResult.isFailure) {
@@ -353,7 +307,10 @@ class EpicDownloadManager
                             // Don't fail the base game download if DLC fails
                         }
                     }
-                    // Update database with install info
+                    MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+
+                    // Update database with install info after the completion marker exists.
                     try {
                         val updatedGame =
                             game.copy(
@@ -361,6 +318,7 @@ class EpicDownloadManager
                                 installPath = installPath,
                                 installSize = totalInstalledSize,
                                 executable = manifest.meta?.launchExe ?: "",
+                                version = manifest.meta?.buildVersion.orEmpty().ifBlank { game.version },
                             )
                         epicManager.updateGame(updatedGame)
                         Timber.tag("Epic").i("Updated database: game marked as installed with executable: ${updatedGame.executable}")
@@ -369,18 +327,14 @@ class EpicDownloadManager
                         // Don't fail the entire download for DB issues
                     }
 
-                    MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                    MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
-
-                    // Clean up and update UI
                     downloadInfo.updateStatusMessage("Complete")
                     // Ensure bytes-based progress shows 100% completion
                     downloadInfo.updateBytesDownloaded(downloadInfo.getTotalExpectedBytes() - downloadInfo.getBytesDownloaded())
                     downloadInfo.setProgress(1.0f)
                     downloadInfo.setActive(false)
                     downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(gameId, downloadInfo)
 
-                    // Notify UI that installation status changed
                     com.winlator.cmod.app.PluviaApp.events.emitJava(
                         com.winlator.cmod.feature.stores.steam.events.AndroidEvent
                             .LibraryInstallStatusChanged(gameId),
@@ -414,82 +368,66 @@ class EpicDownloadManager
             manifestData: EpicManager.ManifestResult,
             installPath: String,
             downloadInfo: DownloadInfo,
+            selectedTags: List<String> = emptyList(),
         ): Result<Unit> =
             withContext(Dispatchers.IO) {
                 try {
                     Timber.tag("Epic").i("Starting download for ${game.title} using pre-fetched manifest")
 
                     // Parse manifest
-                    val cdnUrls = manifestData.cdnUrls.filter { !it.baseUrl.startsWith("https://cloudflare.epicgamescdn.com") }
+                    val cdnUrls = selectCdnUrls(manifestData.cdnUrls)
+                    if (cdnUrls.isEmpty()) {
+                        return@withContext Result.failure(Exception("No usable CDN URLs in manifest"))
+                    }
                     val manifest = EpicManifest.readAll(manifestData.manifestBytes)
 
-                    val chunkDataList =
-                        manifest.chunkDataList
-                            ?: return@withContext Result.failure(Exception("No chunk data in manifest"))
-                    val fileManifestList =
-                        manifest.fileManifestList
-                            ?: return@withContext Result.failure(Exception("No file manifest in manifest"))
-
-                    val chunks = chunkDataList.elements
-                    val files = fileManifestList.elements
+                    val files = ManifestUtils.getFilesForSelectedInstallTags(manifest, selectedTags)
+                    val chunks = ManifestUtils.getRequiredChunksForFileList(manifest, files)
                     val chunkDir = manifest.getChunkDir()
 
+                    if (chunks.isEmpty()) {
+                        return@withContext Result.failure(Exception("No chunk data in manifest"))
+                    }
+                    if (files.isEmpty()) {
+                        return@withContext Result.failure(Exception("No file manifest in manifest"))
+                    }
+
                     // Download chunks
                     val chunkCacheDir = File(installPath, ".chunks")
                     chunkCacheDir.mkdirs()
 
-                    var downloadedChunks = 0
-                    val totalChunks = chunks.size
-
-                    chunks.chunked(MAX_PARALLEL_DOWNLOADS).forEach { chunkBatch ->
-                        if (!downloadInfo.isActive()) {
-                            Timber.tag("Epic").w("Download cancelled by user")
-                            return@withContext Result.failure(Exception("Download cancelled"))
-                        }
-
-                        val results =
-                            chunkBatch
-                                .map { chunk ->
-                                    async {
-                                        downloadChunkWithRetry(chunk, chunkCacheDir, chunkDir, cdnUrls, downloadInfo)
-                                    }
-                                }.awaitAll()
-
-                        results.firstOrNull { it.isFailure }?.let { failedResult ->
-                            return@withContext Result.failure(
-                                failedResult.exceptionOrNull() ?: Exception("Failed to download chunk"),
-                            )
-                        }
-
-                        downloadedChunks += chunkBatch.size
-                    }
-
-                    // Assemble files
                     val installDir = File(installPath)
                     installDir.mkdirs()
 
-                    files.chunked(4).forEach { fileBatch ->
-                        val assembleResults =
-                            fileBatch
-                                .map { fileManifest ->
-                                    async {
-                                        assembleFile(fileManifest, chunkCacheDir, installDir)
-                                    }
-                                }.awaitAll()
-
-                        assembleResults.firstOrNull { it.isFailure }?.let { failedResult ->
-                            return@withContext Result.failure(
-                                failedResult.exceptionOrNull() ?: Exception("Failed to assemble file"),
-                            )
-                        }
+                    val installResult =
+                        downloadChunksIntoFiles(
+                            chunks = chunks,
+                            files = files,
+                            chunkCacheDir = chunkCacheDir,
+                            chunkDir = chunkDir,
+                            cdnUrls = cdnUrls,
+                            installDir = installDir,
+                            downloadInfo = downloadInfo,
+                        )
+                    if (installResult.isFailure) {
+                        return@withContext Result.failure(
+                            installResult.exceptionOrNull() ?: Exception("Failed to install chunks"),
+                        )
                     }
+                    EpicInstalledManifestStore.saveManifest(installDir, game.appName, manifestData.manifestBytes)
 
-                    // Cleanup
                     chunkCacheDir.deleteRecursively()
 
-                    // Update database
                     try {
-                        epicManager.updateGame(game.copy(isInstalled = true, installPath = installPath))
+                        epicManager.updateGame(
+                            game.copy(
+                                isInstalled = true,
+                                installPath = installPath,
+                                installSize = files.sumOf { it.fileSize }.takeIf { it > 0L } ?: game.installSize,
+                                executable = manifest.meta?.launchExe.orEmpty().ifBlank { game.executable },
+                                version = manifest.meta?.buildVersion.orEmpty().ifBlank { game.version },
+                            ),
+                        )
                         Timber.tag("Epic").i("Updated database: DLC ${game.title} marked as installed")
                     } catch (e: Exception) {
                         Timber.tag("Epic").e(e, "Failed to update database for DLC ${game.id}")
@@ -516,14 +454,7 @@ class EpicDownloadManager
         ): Result<Unit> =
             withContext(Dispatchers.IO) {
                 try {
-                    // Avoid the Cloudflare CDN when alternatives exist — same rationale as
-                    // [downloadGame]. Fall back to it if it is the only mirror Epic offered so we
-                    // don't hard-fail on overlays that are exclusively hosted on Cloudflare.
-                    val nonCfCdnUrls =
-                        manifestResult.cdnUrls.filter {
-                            !it.baseUrl.startsWith("https://cloudflare.epicgamescdn.com")
-                        }
-                    val cdnUrls = nonCfCdnUrls.ifEmpty { manifestResult.cdnUrls }
+                    val cdnUrls = selectCdnUrls(manifestResult.cdnUrls)
                     if (cdnUrls.isEmpty()) {
                         return@withContext Result.failure(Exception("No usable CDN URLs in manifest"))
                     }
@@ -596,11 +527,489 @@ class EpicDownloadManager
                 }
             }
 
+        private data class ChunkWriteTarget(
+            val fileManifest: FileManifest,
+            val chunkPart: ChunkPart,
+        )
+
+        private data class DownloadedChunk(
+            val chunk: ChunkInfo,
+            val chunkFile: File,
+        )
+
+        private fun selectCdnUrls(cdnUrls: List<EpicManager.CdnUrl>): List<EpicManager.CdnUrl> = cdnUrls
+
+        // Spread chunks across CDNs by GUID hash; full list still iterated on failure.
+        private fun orderedCdnUrlsForChunk(
+            chunk: ChunkInfo,
+            cdnUrls: List<EpicManager.CdnUrl>,
+        ): List<EpicManager.CdnUrl> {
+            if (cdnUrls.size <= 1) return cdnUrls
+            val startIndex = ((chunk.guidStr.hashCode().toLong() and 0x7FFFFFFFL) % cdnUrls.size).toInt()
+            if (startIndex == 0) return cdnUrls
+            return cdnUrls.subList(startIndex, cdnUrls.size) + cdnUrls.subList(0, startIndex)
+        }
+
+        private fun buildChunkDownloadUrl(
+            cdnUrl: EpicManager.CdnUrl,
+            chunkPath: String,
+        ): String = "${cdnUrl.baseUrl}${cdnUrl.cloudDir}/$chunkPath${cdnUrl.authQueryParams}"
+
+        private fun loadCompletedChunkGuids(stateFile: File): MutableSet<String> {
+            if (!stateFile.exists()) return mutableSetOf()
+            return runCatching {
+                stateFile
+                    .readLines()
+                    .asSequence()
+                    .map { it.trim() }
+                    .filter { it.isNotEmpty() }
+                    .toMutableSet()
+            }.getOrElse { error ->
+                Timber.tag("Epic").w(error, "Failed to read Epic resume state; restarting chunk application")
+                mutableSetOf()
+            }
+        }
+
+        private fun appendCompletedChunkGuid(
+            stateFile: File,
+            guid: String,
+        ) {
+            stateFile.parentFile?.mkdirs()
+            stateFile.appendText("$guid\n")
+        }
+
+        private data class ExistingFileInspection(
+            val validCompleteFiles: Set<String>,
+            val invalidCompleteFiles: Set<String>,
+        )
+
+        private fun inspectExistingFiles(
+            files: List<FileManifest>,
+            installDir: File,
+            downloadInfo: DownloadInfo,
+        ): ExistingFileInspection {
+            val validCompleteFiles = mutableSetOf<String>()
+            val invalidCompleteFiles = mutableSetOf<String>()
+            val existingCandidates =
+                files.filter { fileManifest ->
+                    File(installDir, fileManifest.filename).exists()
+                }
+
+            if (existingCandidates.isNotEmpty()) {
+                downloadInfo.updateStatus(DownloadPhase.VERIFYING, "Verifying existing files...")
+            }
+
+            existingCandidates.forEachIndexed { index, fileManifest ->
+                if (index % 25 == 0) {
+                    downloadInfo.updateStatus(
+                        DownloadPhase.VERIFYING,
+                        "Verifying existing files (${index + 1}/${existingCandidates.size})",
+                    )
+                }
+
+                val outputFile = File(installDir, fileManifest.filename)
+                if (outputFile.length() != fileManifest.fileSize) return@forEachIndexed
+
+                val valid =
+                    if (hasExpectedHash(fileManifest.hash)) {
+                        verifyFileHash(outputFile, fileManifest.hash)
+                    } else {
+                        true
+                    }
+
+                if (valid) {
+                    validCompleteFiles.add(fileManifest.filename)
+                } else {
+                    invalidCompleteFiles.add(fileManifest.filename)
+                }
+            }
+
+            return ExistingFileInspection(
+                validCompleteFiles = validCompleteFiles,
+                invalidCompleteFiles = invalidCompleteFiles,
+            )
+        }
+
+        private fun hasExpectedHash(hash: ByteArray): Boolean = hash.any { it != 0.toByte() }
+
+        private fun isChunkPartRangePresent(
+            installDir: File,
+            target: ChunkWriteTarget,
+        ): Boolean {
+            val outputFile = File(installDir, target.fileManifest.filename)
+            if (!outputFile.exists()) return false
+
+            val partEnd = target.chunkPart.fileOffset + target.chunkPart.size.toLong()
+            return outputFile.length() >= partEnd
+        }
+
+        /**
+         * Download chunks with a bounded worker pool, apply each verified chunk to the final
+         * files, then record it in a resume ledger. A pause, failed chunk, or process death only
+         * replays the current in-flight chunks instead of starting the whole game over.
+         */
+        internal suspend fun repairManifestFiles(
+            chunks: List<ChunkInfo>,
+            files: List<FileManifest>,
+            chunkCacheDir: File,
+            chunkDir: String,
+            cdnUrls: List<EpicManager.CdnUrl>,
+            installDir: File,
+            downloadInfo: DownloadInfo,
+            onBatchInstalled: (Int, Int) -> Unit = { _, _ -> },
+        ): Result<Unit> =
+            downloadChunksIntoFiles(
+                chunks = chunks,
+                files = files,
+                chunkCacheDir = chunkCacheDir,
+                chunkDir = chunkDir,
+                cdnUrls = cdnUrls,
+                installDir = installDir,
+                downloadInfo = downloadInfo,
+                allowExistingFileResume = false,
+                onBatchInstalled = onBatchInstalled,
+            )
+
+        internal suspend fun downloadManifestFiles(
+            chunks: List<ChunkInfo>,
+            files: List<FileManifest>,
+            chunkCacheDir: File,
+            chunkDir: String,
+            cdnUrls: List<EpicManager.CdnUrl>,
+            installDir: File,
+            downloadInfo: DownloadInfo,
+            onBatchInstalled: (Int, Int) -> Unit = { _, _ -> },
+        ): Result<Unit> =
+            downloadChunksIntoFiles(
+                chunks = chunks,
+                files = files,
+                chunkCacheDir = chunkCacheDir,
+                chunkDir = chunkDir,
+                cdnUrls = cdnUrls,
+                installDir = installDir,
+                downloadInfo = downloadInfo,
+                allowExistingFileResume = true,
+                onBatchInstalled = onBatchInstalled,
+            )
+
+        private suspend fun downloadChunksIntoFiles(
+            chunks: List<ChunkInfo>,
+            files: List<FileManifest>,
+            chunkCacheDir: File,
+            chunkDir: String,
+            cdnUrls: List<EpicManager.CdnUrl>,
+            installDir: File,
+            downloadInfo: DownloadInfo,
+            allowExistingFileResume: Boolean = true,
+            onBatchInstalled: (Int, Int) -> Unit = { _, _ -> },
+        ): Result<Unit> =
+            withContext(Dispatchers.IO) {
+                try {
+                    val chunkTargets = buildChunkTargets(files)
+                    val existingFileInspection =
+                        if (allowExistingFileResume) {
+                            inspectExistingFiles(
+                                files = files,
+                                installDir = installDir,
+                                downloadInfo = downloadInfo,
+                            )
+                        } else {
+                            ExistingFileInspection(emptySet(), emptySet())
+                        }
+                    val resumeStateFile = File(chunkCacheDir, RESUME_STATE_FILE)
+                    val chunkIds = chunks.mapTo(mutableSetOf()) { it.guidStr }
+                    val ledgerChunks =
+                        if (allowExistingFileResume) {
+                            loadCompletedChunkGuids(resumeStateFile)
+                                .filterTo(mutableSetOf()) { it in chunkIds }
+                                .filterTo(mutableSetOf()) { guid ->
+                                    val targets = chunkTargets[guid].orEmpty()
+                                    targets.isNotEmpty() &&
+                                        targets.none {
+                                            it.fileManifest.filename in existingFileInspection.invalidCompleteFiles
+                                        } &&
+                                        targets.all { target ->
+                                            target.fileManifest.filename in existingFileInspection.validCompleteFiles ||
+                                                isChunkPartRangePresent(installDir, target)
+                                        }
+                                }
+                        } else {
+                            mutableSetOf()
+                        }
+                    val validExistingFileChunks =
+                        if (allowExistingFileResume) {
+                            chunks
+                                .asSequence()
+                                .filter { chunk ->
+                                    chunkTargets[chunk.guidStr]
+                                        .orEmpty()
+                                        .all { it.fileManifest.filename in existingFileInspection.validCompleteFiles }
+                                }.mapTo(mutableSetOf()) { it.guidStr }
+                        } else {
+                            mutableSetOf()
+                        }
+                    val completedChunks = (ledgerChunks + validExistingFileChunks).toMutableSet()
+
+                    prepareOutputFiles(
+                        files = files,
+                        installDir = installDir,
+                        resumeChunkCount = completedChunks.size,
+                    )
+
+                    val completedBytes =
+                        chunks
+                            .asSequence()
+                            .filter { it.guidStr in completedChunks }
+                            .sumOf { it.fileSize }
+                    // maxOf, not +: bytes may already cover completedBytes from a Resume pre-seed
+                    // or prior DLC accumulation.
+                    downloadInfo.initializeBytesDownloaded(
+                        maxOf(downloadInfo.getBytesDownloaded(), completedBytes),
+                    )
+
+                    var installedChunks = completedChunks.size
+                    val totalChunks = chunks.size
+                    if (installedChunks > 0) {
+                        Timber.tag("Epic").i("Resuming Epic download with $installedChunks/$totalChunks chunks already applied")
+                        onBatchInstalled(installedChunks, totalChunks)
+                        syncCoordinatorProgress(downloadInfo)
+                    }
+
+                    val pendingChunks = chunks.filter { it.guidStr !in completedChunks }
+                    val nextIndex = AtomicInteger(0)
+                    val workers = minOf(MAX_PARALLEL_DOWNLOADS, pendingChunks.size).coerceAtLeast(1)
+                    val prefetchCapacity = (workers * 2).coerceAtLeast(1)
+
+                    coroutineScope {
+                        val downloadedChunks = Channel<DownloadedChunk>(capacity = prefetchCapacity)
+                        val downloaders =
+                            (0 until workers)
+                                .map {
+                                    async {
+                                        while (true) {
+                                            if (!downloadInfo.isActive() || downloadInfo.isCancelling) {
+                                                throw kotlinx.coroutines.CancellationException("Download cancelled")
+                                            }
+
+                                            val index = nextIndex.getAndIncrement()
+                                            if (index >= pendingChunks.size) break
+
+                                            val chunk = pendingChunks[index]
+                                            val downloadResult =
+                                                downloadChunkWithRetry(
+                                                    chunk,
+                                                    chunkCacheDir,
+                                                    chunkDir,
+                                                    cdnUrls,
+                                                    downloadInfo,
+                                                )
+                                            if (downloadResult.isFailure) {
+                                                throw downloadResult.exceptionOrNull() ?: Exception("Failed to download chunk ${chunk.guidStr}")
+                                            }
+
+                                            downloadedChunks.send(
+                                                DownloadedChunk(
+                                                    chunk = chunk,
+                                                    chunkFile = downloadResult.getOrThrow(),
+                                                ),
+                                            )
+                                        }
+                                    }
+                                }
+
+                        val applier =
+                            async {
+                                for (downloaded in downloadedChunks) {
+                                    if (!downloadInfo.isActive() || downloadInfo.isCancelling) {
+                                        throw kotlinx.coroutines.CancellationException("Download cancelled")
+                                    }
+
+                                    val chunk = downloaded.chunk
+                                    val chunkFile = downloaded.chunkFile
+
+                                    if (chunk.guidStr !in completedChunks) {
+                                        val applyResult =
+                                            applyChunkToFiles(
+                                                chunk = chunk,
+                                                chunkFile = chunkFile,
+                                                targets = chunkTargets[chunk.guidStr].orEmpty(),
+                                                installDir = installDir,
+                                            )
+                                        if (applyResult.isFailure) {
+                                            throw applyResult.exceptionOrNull()
+                                                ?: Exception("Failed to apply chunk ${chunk.guidStr}")
+                                        }
+
+                                        appendCompletedChunkGuid(resumeStateFile, chunk.guidStr)
+                                        completedChunks.add(chunk.guidStr)
+                                    }
+
+                                    if (!chunkFile.delete()) {
+                                        Timber.tag("Epic").w("Failed to delete temporary chunk ${chunkFile.absolutePath}")
+                                    }
+
+                                    installedChunks += 1
+                                    onBatchInstalled(installedChunks, totalChunks)
+                                    syncCoordinatorProgress(downloadInfo)
+                                }
+                            }
+
+                        try {
+                            downloaders.awaitAll()
+                        } finally {
+                            downloadedChunks.close()
+                        }
+                        applier.await()
+                    }
+
+                    verifyInstalledFiles(files, installDir, downloadInfo)
+                    syncCoordinatorProgress(downloadInfo)
+                    Result.success(Unit)
+                } catch (e: Exception) {
+                    Timber.tag("Epic").e(e, "Failed to download/install chunk batch")
+                    Result.failure<Unit>(e)
+                }
+            }
+
+        private fun buildChunkTargets(files: List<FileManifest>): Map<String, List<ChunkWriteTarget>> {
+            val targets = mutableMapOf<String, MutableList<ChunkWriteTarget>>()
+            files.forEach { fileManifest ->
+                fileManifest.chunkParts.forEach { chunkPart ->
+                    targets
+                        .getOrPut(chunkPart.guidStr) { mutableListOf() }
+                        .add(ChunkWriteTarget(fileManifest, chunkPart))
+                }
+            }
+            return targets
+        }
+
+        private fun prepareOutputFiles(
+            files: List<FileManifest>,
+            installDir: File,
+            resumeChunkCount: Int,
+        ) {
+            val canResume = resumeChunkCount > 0
+            files.forEach { fileManifest ->
+                val outputFile = File(installDir, fileManifest.filename)
+                outputFile.parentFile?.mkdirs()
+                if (!canResume && outputFile.exists() && !outputFile.delete()) {
+                    throw Exception("Failed to replace existing file: ${outputFile.absolutePath}")
+                }
+                if (fileManifest.fileSize == 0L) {
+                    outputFile.createNewFile()
+                }
+            }
+        }
+
+        private fun applyChunkToFiles(
+            chunk: ChunkInfo,
+            chunkFile: File,
+            targets: List<ChunkWriteTarget>,
+            installDir: File,
+        ): Result<Unit> {
+            return try {
+                if (targets.isEmpty()) {
+                    Timber.tag("Epic").w("Downloaded chunk ${chunk.guidStr} is not referenced by selected files")
+                    return Result.success(Unit)
+                }
+
+                val chunkLength = chunkFile.length()
+                val buffer = ByteArray(65536)
+
+                targets.forEach { target ->
+                    val part = target.chunkPart
+                    val partOffset = part.offset.toLong()
+                    val partSize = part.size.toLong()
+                    val partEnd = partOffset + partSize
+                    if (partOffset < 0L || partSize < 0L || partEnd > chunkLength) {
+                        throw Exception(
+                            "Chunk part out of bounds for ${target.fileManifest.filename}: " +
+                                "offset=$partOffset size=$partSize chunkSize=$chunkLength",
+                        )
+                    }
+
+                    val outputFile = File(installDir, target.fileManifest.filename)
+                    outputFile.parentFile?.mkdirs()
+                    RandomAccessFile(chunkFile, "r").use { input ->
+                        RandomAccessFile(outputFile, "rw").use { output ->
+                            input.seek(partOffset)
+                            output.seek(part.fileOffset)
+
+                            var remaining = partSize
+                            while (remaining > 0L) {
+                                val toRead = minOf(remaining, buffer.size.toLong()).toInt()
+                                val bytesRead = input.read(buffer, 0, toRead)
+                                if (bytesRead < 0) {
+                                    throw Exception("Unexpected EOF reading chunk ${chunk.guidStr}")
+                                }
+                                output.write(buffer, 0, bytesRead)
+                                remaining -= bytesRead.toLong()
+                            }
+                        }
+                    }
+                }
+
+                Result.success(Unit)
+            } catch (e: Exception) {
+                Timber.tag("Epic").e(e, "Failed to apply chunk ${chunk.guidStr}")
+                Result.failure(e)
+            }
+        }
+
+        private fun verifyInstalledFiles(
+            files: List<FileManifest>,
+            installDir: File,
+            downloadInfo: DownloadInfo,
+        ): Result<Unit> {
+            downloadInfo.updateStatus(DownloadPhase.VERIFYING, "Verifying installed files...")
+            files.forEachIndexed { index, fileManifest ->
+                if (index % 25 == 0) {
+                    downloadInfo.updateStatus(
+                        DownloadPhase.VERIFYING,
+                        "Verifying installed files (${index + 1}/${files.size})",
+                    )
+                }
+                val outputFile = File(installDir, fileManifest.filename)
+                if (!outputFile.exists()) {
+                    return Result.failure(Exception("Installed file missing: ${fileManifest.filename}"))
+                }
+                if (outputFile.length() != fileManifest.fileSize) {
+                    return Result.failure(
+                        Exception(
+                            "Installed file size mismatch for ${fileManifest.filename}: " +
+                                "expected ${fileManifest.fileSize}, got ${outputFile.length()}",
+                        ),
+                    )
+                }
+                if (hasExpectedHash(fileManifest.hash) && !verifyFileHash(outputFile, fileManifest.hash)) {
+                    return Result.failure(Exception("Installed file hash mismatch: ${fileManifest.filename}"))
+                }
+            }
+            return Result.success(Unit)
+        }
+
+        private fun syncCoordinatorProgress(downloadInfo: DownloadInfo) {
+            if (downloadInfo.gameId <= 0) return
+            syncCoordinatorProgress(downloadInfo.gameId, downloadInfo)
+        }
+
+        private fun syncCoordinatorProgress(
+            gameId: Int,
+            downloadInfo: DownloadInfo,
+        ) {
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_EPIC,
+                gameId.toString(),
+                downloadInfo.getBytesDownloaded(),
+                downloadInfo.getTotalExpectedBytes(),
+            )
+        }
+
         /**
          * Download a single chunk with retry logic
          */
         private suspend fun downloadChunkWithRetry(
-            chunk: com.winlator.cmod.feature.stores.epic.service.manifest.ChunkInfo,
+            chunk: ChunkInfo,
             chunkCacheDir: File,
             chunkDir: String,
             cdnUrls: List<EpicManager.CdnUrl>,
@@ -610,6 +1019,10 @@ class EpicDownloadManager
                 var lastException: Exception? = null
 
                 repeat(MAX_CHUNK_RETRIES) { attempt ->
+                    if (!downloadInfo.isActive() || downloadInfo.isCancelling) {
+                        return@withContext Result.failure(kotlinx.coroutines.CancellationException("Download cancelled"))
+                    }
+
                     val result = downloadChunk(chunk, chunkCacheDir, chunkDir, cdnUrls, downloadInfo)
 
                     if (result.isSuccess) {
@@ -620,6 +1033,9 @@ class EpicDownloadManager
                     }
 
                     lastException = result.exceptionOrNull() as? Exception
+                    if (lastException is kotlinx.coroutines.CancellationException) {
+                        return@withContext Result.failure(lastException)
+                    }
 
                     if (attempt < MAX_CHUNK_RETRIES - 1) {
                         val delay = RETRY_DELAY_MS * (1 shl attempt) // Exponential backoff: 1s, 2s, 4s
@@ -641,7 +1057,7 @@ class EpicDownloadManager
          * Download a single chunk from Epic CDN with decompression
          */
         private suspend fun downloadChunk(
-            chunk: com.winlator.cmod.feature.stores.epic.service.manifest.ChunkInfo,
+            chunk: ChunkInfo,
             chunkCacheDir: File,
             chunkDir: String,
             cdnUrls: List<EpicManager.CdnUrl>,
@@ -655,7 +1071,7 @@ class EpicDownloadManager
                     // Skip if already downloaded and decompressed
                     if (decompressedFile.exists() && decompressedFile.length() == chunk.windowSize.toLong()) {
                         // Quick verification - only verify if size matches
-                        if (verifyChunkHashBytes(decompressedFile.readBytes(), chunk.shaHash)) {
+                        if (verifyChunkHashFile(decompressedFile, chunk.shaHash)) {
                             Timber.tag("Epic").d("Chunk ${chunk.guidStr} already exists and verified, skipping")
                             downloadInfo.updateBytesDownloaded(chunk.fileSize)
                             return@withContext Result.success(decompressedFile)
@@ -665,15 +1081,19 @@ class EpicDownloadManager
                         }
                     }
 
-                    // Get chunk path for downloading
                     val chunkPath = chunk.getPath(chunkDir)
 
                     // Try each CDN base URL until one succeeds
                     var lastException: Exception? = null
-                    for ((cdnIndex, cdnUrl) in cdnUrls.withIndex()) {
+                    val orderedCdnUrls = orderedCdnUrlsForChunk(chunk, cdnUrls)
+                    for ((cdnIndex, cdnUrl) in orderedCdnUrls.withIndex()) {
                         try {
-                            // Build full URL: baseUrl + cloudDir + chunkPath
-                            val url = "${cdnUrl.baseUrl}${cdnUrl.cloudDir}/$chunkPath"
+                            if (!downloadInfo.isActive() || downloadInfo.isCancelling) {
+                                throw kotlinx.coroutines.CancellationException("Download cancelled")
+                            }
+
+                            // Build full URL with the CDN auth params returned by Epic's launcher API.
+                            val url = buildChunkDownloadUrl(cdnUrl, chunkPath)
 
                             val request =
                                 Request
@@ -692,12 +1112,16 @@ class EpicDownloadManager
                                 // Download and decompress Epic chunk file using streaming to avoid OOM exceptions
                                 val responseBody = response.body!!
                                 val tempChunkFile = File(chunkCacheDir, "${chunk.guidStr}.tmp")
+                                val tempDecompressedFile = File(chunkCacheDir, "${chunk.guidStr}.decompressed.tmp")
 
                                 try {
+                                    tempChunkFile.delete()
+                                    tempDecompressedFile.delete()
+
                                     // Stream download to temp file
                                     responseBody.byteStream().use { input ->
                                         tempChunkFile.outputStream().use { output ->
-                                            val buffer = ByteArray(8192)
+                                            val buffer = ByteArray(65536)
                                             var bytesRead: Int
                                             while (input.read(buffer).also { bytesRead = it } != -1) {
                                                 // Cooperative cancellation: bail out of the byte
@@ -718,12 +1142,17 @@ class EpicDownloadManager
                                     // This avoids allocating 1.5GB in memory
                                     decompressStreamingChunkToFile(
                                         tempChunkFile,
-                                        decompressedFile,
+                                        tempDecompressedFile,
                                         chunk.windowSize.toLong(),
                                         chunk.shaHash,
                                     )
+                                    decompressedFile.delete()
+                                    if (!tempDecompressedFile.renameTo(decompressedFile)) {
+                                        throw Exception("Failed to finalize chunk ${chunk.guidStr}")
+                                    }
                                 } finally {
                                     tempChunkFile.delete()
+                                    tempDecompressedFile.delete()
                                 }
 
                                 return@withContext Result.success(decompressedFile)
@@ -734,7 +1163,10 @@ class EpicDownloadManager
                                 continue
                             }
                         } catch (e: Exception) {
-                            if (cdnIndex < cdnUrls.size - 1) {
+                            if (e is kotlinx.coroutines.CancellationException) {
+                                throw e
+                            }
+                            if (cdnIndex < orderedCdnUrls.size - 1) {
                                 Timber.tag("Epic").w(e, "Failed to download from ${cdnUrl.baseUrl}, trying next...")
                             }
                             lastException = e
@@ -782,14 +1214,12 @@ class EpicDownloadManager
             // Skip GUID (16 bytes), hash (8 bytes)
             buffer.position(buffer.position() + 24)
 
-            // Read stored_as flag
             val storedAs = buffer.get().toInt() and 0xFF
             val isCompressed = (storedAs and 0x1) == 0x1
 
             // Skip SHA hash (20 bytes), hash type (1 byte)
             buffer.position(buffer.position() + 21)
 
-            // Read uncompressed size (4 bytes)
             val uncompressedSize = buffer.int
 
             // Read chunk data starting from header end
@@ -1043,14 +1473,12 @@ class EpicDownloadManager
                 // Skip GUID (16 bytes), hash (8 bytes)
                 buffer.position(buffer.position() + 24)
 
-                // Read stored_as flag
                 val storedAs = buffer.get().toInt() and 0xFF
                 val isCompressed = (storedAs and 0x1) == 0x1
 
                 // Skip SHA hash (20 bytes), hash type (1 byte)
                 buffer.position(buffer.position() + 21)
 
-                // Read uncompressed size (4 bytes)
                 val uncompressedSize = buffer.int
 
                 // Skip to data start if header is larger than 66 bytes
@@ -1100,6 +1528,38 @@ class EpicDownloadManager
             }
         }
 
+        private fun verifyFileHash(
+            file: File,
+            expectedHash: ByteArray,
+        ): Boolean =
+            try {
+                val digest = MessageDigest.getInstance("SHA-1")
+                file.inputStream().buffered().use { input ->
+                    val buffer = ByteArray(256 * 1024)
+                    while (true) {
+                        val bytesRead = input.read(buffer)
+                        if (bytesRead < 0) break
+                        digest.update(buffer, 0, bytesRead)
+                    }
+                }
+                val actualHash = digest.digest()
+                val matches = actualHash.contentEquals(expectedHash)
+                if (!matches) {
+                    val expectedHex = expectedHash.joinToString("") { "%02x".format(it) }
+                    val actualHex = actualHash.joinToString("") { "%02x".format(it) }
+                    Timber.tag("Epic").e("Hash mismatch for ${file.name}: expected $expectedHex, got $actualHex")
+                }
+                matches
+            } catch (e: Exception) {
+                Timber.tag("Epic").e(e, "Hash verification failed for ${file.absolutePath}")
+                false
+            }
+
+        private fun verifyChunkHashFile(
+            file: File,
+            expectedHash: ByteArray,
+        ): Boolean = verifyFileHash(file, expectedHash)
+
         /**
          * Verify chunk SHA-1 hash from byte array
          */
@@ -1146,7 +1606,6 @@ class EpicDownloadManager
                                 return@withContext Result.failure(Exception("Chunk file missing: ${chunkPart.guidStr}"))
                             }
 
-                            // Read chunk data at specified offset
                             chunkFile.inputStream().use { input ->
                                 input.skip(chunkPart.offset.toLong())
 
diff --git a/app/src/main/feature/stores/epic/service/EpicFilenameUtils.kt b/app/src/main/feature/stores/epic/service/EpicFilenameUtils.kt
deleted file mode 100644
index eeee2b6fa..000000000
--- a/app/src/main/feature/stores/epic/service/EpicFilenameUtils.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.winlator.cmod.feature.stores.epic.service
-
-private val REGEX_FILENAME_UNSAFE = Regex("[^a-zA-Z0-9_-]")
-
-/**
- * Replaces any character that isn't ASCII alphanumeric, underscore, or hyphen with an
- * underscore. Intended for turning identifiers (app names, namespaces, catalog ids)
- * into safe filename components.
- */
-internal fun String.sanitizeForFilename(): String = REGEX_FILENAME_UNSAFE.replace(this, "_")
diff --git a/app/src/main/feature/stores/epic/service/EpicGameLauncher.kt b/app/src/main/feature/stores/epic/service/EpicGameLauncher.kt
index 7ae5f3947..3523fbf1a 100644
--- a/app/src/main/feature/stores/epic/service/EpicGameLauncher.kt
+++ b/app/src/main/feature/stores/epic/service/EpicGameLauncher.kt
@@ -110,7 +110,6 @@ object EpicGameLauncher {
 
         Timber.tag("EPIC").i("Game launch token obtained for ${game.appName}")
 
-        // Authentication parameters
         params.add("-AUTH_LOGIN=unused")
         params.add("-AUTH_PASSWORD=${gameToken.authCode}")
         params.add("-AUTH_TYPE=exchangecode")
@@ -118,7 +117,6 @@ object EpicGameLauncher {
         params.add("-epicenv=Prod")
         params.add("-EpicPortal")
 
-        // User identity parameters
         val displayName = gameToken.displayName.takeIf { it.isNotBlank() } ?: "EpicUser"
         val accountId = gameToken.accountId.ifBlank { "0" }
         params.add("-epicusername=$displayName")
@@ -141,7 +139,6 @@ object EpicGameLauncher {
             Timber.tag("EPIC").d("Added deployment id for ${game.appName}")
         }
 
-        // Ownership token for DRM-protected games
         if (ownershipTokenPath != null) {
             params.add("-epicovt=$ownershipTokenPath")
             Timber.tag("EPIC").d("Added ownership token path: $ownershipTokenPath")
diff --git a/app/src/main/feature/stores/epic/service/EpicManager.kt b/app/src/main/feature/stores/epic/service/EpicManager.kt
index 71282d82b..467f4d806 100644
--- a/app/src/main/feature/stores/epic/service/EpicManager.kt
+++ b/app/src/main/feature/stores/epic/service/EpicManager.kt
@@ -15,6 +15,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import timber.log.Timber
 import java.io.File
+import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -123,6 +124,7 @@ class EpicManager
             val ownershipToken: Boolean = false,
             val cloudSaveFolder: String? = null,
             val cloudIncludeList: String? = null,
+            val cloudExcludeList: String? = null,
             val neverUpdate: Boolean = false,
             val folderName: String? = null,
             val presenceId: String? = null,
@@ -198,7 +200,6 @@ class EpicManager
 
                     Timber.tag("Epic").i("Refreshing Epic library from Epic API...")
 
-                    // Get a list of basic info for each game.
                     val listResult = fetchLibrary(context)
 
                     if (listResult.isFailure) {
@@ -215,16 +216,6 @@ class EpicManager
                         return@withContext Result.success(0)
                     }
 
-                    // Re-fetch catalog metadata for every game in the library so
-                    // customAttributes-derived fields (`requiresOT`, `canRunOffline`,
-                    // `additionalCommandline`, `executableName`, etc.) backfill onto rows that
-                    // existed before those fields were parsed correctly. Without this, a user
-                    // whose DB was synced under an older build keeps `requiresOT=false` for
-                    // every Epic title and DRM games (Hogwarts Legacy, etc.) launch with no
-                    // ownership token → "must launch from Epic Launcher / must be online".
-                    //
-                    // upsertPreservingInstallStatus keeps install/play-state intact while
-                    // overwriting every other column from the fresh catalog response.
                     val epicGames = mutableListOf<EpicGame>()
                     var processedCount = 0
                     for ((index, game) in gamesList.withIndex()) {
@@ -269,7 +260,13 @@ class EpicManager
                 val allGames = epicGameDao.getAllAsList()
 
                 for (game in allGames) {
-                    if (game.isInstalled && game.installPath.isNotEmpty() && File(game.installPath).exists()) {
+                    if (
+                        game.isInstalled &&
+                        game.installPath.isNotEmpty() &&
+                        File(game.installPath).exists() &&
+                        MarkerUtils.hasMarker(game.installPath, Marker.DOWNLOAD_COMPLETE_MARKER) &&
+                        !MarkerUtils.hasMarker(game.installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    ) {
                         continue
                     }
 
@@ -330,7 +327,6 @@ class EpicManager
         suspend fun fetchLibrary(context: Context): Result<List<ParsedLibraryItem>> =
             withContext(Dispatchers.IO) {
                 try {
-                    // Get Credentials and restore them
                     val credentials = EpicAuthManager.getStoredCredentials(context)
                     if (credentials.isFailure) {
                         return@withContext Result.failure(credentials.exceptionOrNull() ?: Exception("No credentials"))
@@ -384,7 +380,6 @@ class EpicManager
 
                         Timber.tag("Epic").d("Received ${records.length()} library items in this page")
 
-                        // Process records and fetch game info for each
                         for (i in 0 until records.length()) {
                             val record = records.getJSONObject(i)
 
@@ -423,7 +418,6 @@ class EpicManager
                                 continue
                             }
 
-                            // Add the basic game to the gameList.
                             val gameInfo = ParsedLibraryItem(appName, namespace, catalogItemId, sandboxType, country)
                             gameList.add(gameInfo)
                         }
@@ -506,7 +500,6 @@ class EpicManager
         ): Result<EpicGame> =
             withContext(Dispatchers.IO) {
                 try {
-                    // Get Credentials and restore them
                     val credentials = EpicAuthManager.getStoredCredentials(context)
                     if (credentials.isFailure) {
                         return@withContext Result.failure(credentials.exceptionOrNull() ?: Exception("No credentials"))
@@ -595,6 +588,7 @@ class EpicManager
                 ownershipToken = getBooleanAttribute("OwnershipToken", false),
                 cloudSaveFolder = getAttribute("CloudSaveFolder"),
                 cloudIncludeList = getAttribute("CloudIncludeList"),
+                cloudExcludeList = getAttribute("CloudExcludeList"),
                 folderName = getAttribute("FolderName"),
                 presenceId = getAttribute("PresenceId"),
                 monitorPresence = getBooleanAttribute("MonitorPresence", false),
@@ -647,7 +641,6 @@ class EpicManager
                 }
             }
 
-            // Check if this is DLC
             val isDLC = data.has("mainGameItem")
             val baseGameAppName =
                 if (isDLC) {
@@ -656,10 +649,8 @@ class EpicManager
                     ""
                 }
 
-            // Get developer/publisher
             val developer = data.optString("developer", "")
 
-            // Get categories to check for mods
             val categories = data.optJSONArray("categories")
             var isMod = false
             if (categories != null) {
@@ -679,7 +670,6 @@ class EpicManager
                 val release = releaseInfo.getJSONObject(0)
                 releaseDate = release.optString("dateAdded", "")
             }
-            // Parse genres/tags from categories
             val genresList = mutableListOf<String>()
             val tagsList = mutableListOf<String>()
             if (categories != null) {
@@ -704,6 +694,8 @@ class EpicManager
             val requiresOwnershipToken = parsedAttributes.ownershipToken
             val cloudSaveEnabled = !parsedAttributes.cloudSaveFolder.isNullOrEmpty()
             val saveFolder = parsedAttributes.cloudSaveFolder ?: ""
+            val cloudIncludeList = parsedAttributes.cloudIncludeList ?: ""
+            val cloudExcludeList = parsedAttributes.cloudExcludeList ?: ""
             val executable = parsedAttributes.executableName ?: ""
             val thirdPartyApp =
                 listOfNotNull(
@@ -722,7 +714,7 @@ class EpicManager
                 }
 
             Timber.d(
-                "Game $appName - CloudSaveFolder: $saveFolder, CloudIncludeList: ${parsedAttributes.cloudIncludeList}, CanRunOffline: $canRunOffline",
+                "Game $appName - CloudSaveFolder: $saveFolder, CloudIncludeList: ${parsedAttributes.cloudIncludeList}, CloudExcludeList: ${parsedAttributes.cloudExcludeList}, CanRunOffline: $canRunOffline",
             )
 
             return EpicGame(
@@ -754,6 +746,8 @@ class EpicManager
                 requiresOT = requiresOwnershipToken,
                 cloudSaveEnabled = cloudSaveEnabled,
                 saveFolder = saveFolder,
+                cloudIncludeList = cloudIncludeList,
+                cloudExcludeList = cloudExcludeList,
                 thirdPartyManagedApp = thirdPartyApp,
                 isEAManaged = isEaManaged,
                 lastPlayed = 0,
@@ -839,6 +833,11 @@ class EpicManager
             }
         }
 
+        suspend fun getAllGames(): List<EpicGame> =
+            withContext(Dispatchers.IO) {
+                epicGameDao.getAllAsList()
+            }
+
         suspend fun uninstall(appId: Int) {
             withContext(Dispatchers.IO) {
                 epicGameDao.uninstall(appId)
@@ -899,7 +898,6 @@ class EpicManager
         ): Result<ManifestResult> =
             withContext(Dispatchers.IO) {
                 try {
-                    // Get credentials
                     val credentials = EpicAuthManager.getStoredCredentials(context)
                     if (credentials.isFailure) {
                         return@withContext Result.failure(credentials.exceptionOrNull() ?: Exception("No credentials"))
@@ -960,13 +958,11 @@ class EpicManager
                         val manifest = manifests.getJSONObject(i)
                         val uri = manifest.getString("uri")
 
-                        // Extract base URL (e.g., "https://fastly-download.epicgames.com")
                         val baseUrl = uri.substringBefore("/Builds")
                         if (baseUrl.isEmpty() || !baseUrl.startsWith("http")) {
                             continue
                         }
 
-                        // Extract CloudDir (build path) from URI
                         // Example: https://fastly-download.epicgames.com/Builds/Org/{org}/{build}/default/...
                         // CloudDir: /Builds/Org/{org}/{build}/default
                         val cloudDir =
@@ -1005,61 +1001,92 @@ class EpicManager
 
                     Timber.tag("Epic").d("Found ${cdnUrls.size} CDN mirrors")
 
-                    // Use the first manifest to download the manifest file
-                    val manifestObj = manifests.getJSONObject(0)
-                    var manifestUri = manifestObj.getString("uri")
-
-                    // Append query parameters (CDN authentication tokens) for manifest download
-                    val manifestQueryParams = manifestObj.optJSONArray("queryParams")
-                    if (manifestQueryParams != null && manifestQueryParams.length() > 0) {
-                        val params = StringBuilder()
-                        for (i in 0 until manifestQueryParams.length()) {
-                            val param = manifestQueryParams.getJSONObject(i)
-                            val name = param.getString("name")
-                            val value = param.getString("value")
-                            if (i == 0) {
-                                params.append("?")
-                            } else {
-                                params.append("&")
+                    val expectedManifestHash = element.optString("hash", "")
+                    var manifestBytes: ByteArray? = null
+                    var lastManifestError: Exception? = null
+
+                    for (i in 0 until manifests.length()) {
+                        val manifestObj = manifests.getJSONObject(i)
+                        var manifestUri = manifestObj.getString("uri")
+
+                        // Append query parameters (CDN authentication tokens) for manifest download.
+                        val manifestQueryParams = manifestObj.optJSONArray("queryParams")
+                        if (manifestQueryParams != null && manifestQueryParams.length() > 0) {
+                            val params = StringBuilder()
+                            for (j in 0 until manifestQueryParams.length()) {
+                                val param = manifestQueryParams.getJSONObject(j)
+                                val name = param.getString("name")
+                                val value = param.getString("value")
+                                if (j == 0) {
+                                    params.append("?")
+                                } else {
+                                    params.append("&")
+                                }
+                                params.append("$name=$value")
                             }
-                            params.append("$name=$value")
+                            manifestUri += params.toString()
                         }
-                        manifestUri += params.toString()
-                    }
 
-                    Timber.tag("Epic").d("Downloading manifest binary from: $manifestUri")
+                        Timber.tag("Epic").d("Downloading manifest binary from: $manifestUri")
 
-                    // Manifest downloads from CDN don't need/accept Epic auth tokens
-                    val manifestRequest =
-                        Request
-                            .Builder()
-                            .url(manifestUri)
-                            .header("User-Agent", EpicConstants.EPIC_USER_AGENT)
-                            .get()
-                            .build()
+                        // Manifest downloads from CDN don't need/accept Epic auth tokens.
+                        val manifestRequest =
+                            Request
+                                .Builder()
+                                .url(manifestUri)
+                                .header("User-Agent", EpicConstants.EPIC_USER_AGENT)
+                                .get()
+                                .build()
 
-                    val manifestBytes =
-                        cdnClient.newCall(manifestRequest).execute().use { manifestResponse ->
-                            if (!manifestResponse.isSuccessful) {
-                                return@withContext Result.failure(Exception("Failed to download manifest binary: ${manifestResponse.code}"))
-                            }
+                        try {
+                            val bytes =
+                                cdnClient.newCall(manifestRequest).execute().use { manifestResponse ->
+                                    if (!manifestResponse.isSuccessful) {
+                                        throw Exception("Failed to download manifest binary: ${manifestResponse.code}")
+                                    }
+
+                                    manifestResponse.body?.bytes()
+                                        ?: throw Exception("Empty manifest bytes from CDN")
+                                }
 
-                            val bytes = manifestResponse.body?.bytes()
-                            if (bytes == null) {
-                                return@withContext Result.failure(Exception("Empty manifest bytes from CDN"))
+                            if (expectedManifestHash.isNotEmpty() && !verifyManifestHash(bytes, expectedManifestHash)) {
+                                throw Exception("Manifest SHA-1 mismatch")
                             }
 
-                            bytes
+                            manifestBytes = bytes
+                            break
+                        } catch (e: Exception) {
+                            Timber.tag("Epic").w(e, "Unable to download manifest from ${manifestObj.getString("uri")}, trying next URL")
+                            lastManifestError = e
                         }
+                    }
+
+                    val finalManifestBytes =
+                        manifestBytes
+                            ?: return@withContext Result.failure(
+                                lastManifestError ?: Exception("Unable to download manifest from any CDN URL"),
+                            )
 
                     Timber.tag("Epic").d("Manifest fetched with ${cdnUrls.size} CDN URLs")
-                    Result.success(ManifestResult(manifestBytes, cdnUrls))
+                    Result.success(ManifestResult(finalManifestBytes, cdnUrls))
                 } catch (e: Exception) {
                     Timber.tag("Epic").e(e, "Exception fetching manifest")
                     Result.failure(e)
                 }
             }
 
+        private fun verifyManifestHash(
+            manifestBytes: ByteArray,
+            expectedHash: String,
+        ): Boolean {
+            val actualHash =
+                MessageDigest
+                    .getInstance("SHA-1")
+                    .digest(manifestBytes)
+                    .joinToString("") { "%02x".format(it) }
+            return actualHash.equals(expectedHash, ignoreCase = true)
+        }
+
         /**
          * Fetch install size for a game by downloading its manifest
          * Manifest is small (~500KB-1MB) and contains all file metadata
@@ -1071,7 +1098,6 @@ class EpicManager
         ): ManifestSizes =
             withContext(Dispatchers.IO) {
                 try {
-                    // Get the game info to get namespace and catalogItemId
                     val game = getGameById(appId)
 
                     if (game == null) {
@@ -1090,7 +1116,6 @@ class EpicManager
 
                     val manifestData = manifestResult.getOrNull()!!
 
-                    // Parse with Kotlin parser
                     val manifest =
                         com.winlator.cmod.feature.stores.epic.service.manifest.EpicManifest
                             .readAll(manifestData.manifestBytes)
@@ -1113,6 +1138,19 @@ class EpicManager
                     Timber.tag("Epic").d("Install size for $appName: $installSize bytes")
                     Timber.tag("Epic").d("Download size for $appName: $downloadSize bytes")
 
+                    if (installSize > 0L || downloadSize > 0L) {
+                        try {
+                            epicGameDao.update(
+                                game.copy(
+                                    installSize = installSize.takeIf { it > 0L } ?: game.installSize,
+                                    downloadSize = downloadSize.takeIf { it > 0L } ?: game.downloadSize,
+                                ),
+                            )
+                        } catch (e: Exception) {
+                            Timber.tag("Epic").w(e, "Failed to cache manifest sizes for $appName")
+                        }
+                    }
+
                     return@withContext ManifestSizes(installSize = installSize, downloadSize = downloadSize)
                 } catch (e: Exception) {
                     Timber.tag("Epic").e(e, "Exception fetching install size for appId: $appId")
@@ -1120,21 +1158,7 @@ class EpicManager
                 }
             }
 
-        /**
-         * Fetch the EOS deployment id for a game from the launcher manifest API.
-         *
-         * Mirrors Legendary's sidecar handling (legendary/core.py, _update_assets_and_meta and
-         * get_launch_parameters): the manifest API response contains
-         * `elements[0].sidecar.config` as a JSON-encoded string, which carries the game's
-         * `deploymentId`. Passing `-epicdeploymentid=<id>` on the command line is required by
-         * modern EOS-integrated games — without it, titles such as "Deliver At All Costs"
-         * refuse to start with "Failed to connect to the Epic Launcher".
-         *
-         * Cached per app-name under [Context.filesDir]/epic/deployment_ids/.
-         *
-         * @return the deployment id if the game exposes one, otherwise null. Null is a valid
-         *         result – most titles do not have a sidecar.
-         */
+        // Fetch the EOS deployment id for a game from the launcher manifest API.
         suspend fun fetchDeploymentId(
             context: Context,
             namespace: String,
diff --git a/app/src/main/feature/stores/epic/service/EpicService.kt b/app/src/main/feature/stores/epic/service/EpicService.kt
index 68e82725a..20b9b230e 100644
--- a/app/src/main/feature/stores/epic/service/EpicService.kt
+++ b/app/src/main/feature/stores/epic/service/EpicService.kt
@@ -10,6 +10,7 @@ import com.winlator.cmod.app.db.download.DownloadRecord
 import com.winlator.cmod.app.service.DownloadService
 import com.winlator.cmod.app.service.download.DownloadCoordinator
 import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
 import com.winlator.cmod.feature.stores.epic.data.EpicCredentials
 import com.winlator.cmod.feature.stores.epic.data.EpicGame
 import com.winlator.cmod.feature.stores.epic.data.EpicGameToken
@@ -23,6 +24,7 @@ import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
 import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
 import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
 import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
 import com.winlator.cmod.shared.android.AppTerminationHelper
 import com.winlator.cmod.shared.android.NotificationHelper
 import dagger.hilt.android.AndroidEntryPoint
@@ -33,9 +35,7 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 import javax.inject.Inject
 
-/**
- * Epic Games Service - thin coordinator that delegates to other Epic managers.
- */
+// Foreground service facade for Epic auth, library sync, downloads, and cloud saves.
 @AndroidEntryPoint
 class EpicService : Service() {
     companion object {
@@ -45,24 +45,22 @@ class EpicService : Service() {
         private const val ACTION_MANUAL_SYNC = BuildConfig.APPLICATION_ID + ".EPIC_MANUAL_SYNC"
         private const val SYNC_THROTTLE_MILLIS = 15 * 60 * 1000L // 15 minutes
 
-        // Sync tracking variables
         private var syncInProgress: Boolean = false
         private var backgroundSyncJob: Job? = null
         private var lastSyncTimestamp: Long = 0L
         private var hasPerformedInitialSync: Boolean = false
+        private var hasPerformedInitialCloudSaveCheck: Boolean = false
 
         val isRunning: Boolean
             get() = instance != null
 
         fun start(context: Context) {
             Timber.tag("EPIC").d("Starting service...")
-            // If already running, do nothing
             if (isRunning) {
                 Timber.tag("EPIC").d("[EpicService] Service already running, skipping start")
                 return
             }
 
-            // First-time start: always sync without throttle
             if (!hasPerformedInitialSync) {
                 Timber.tag("EPIC").i("[EpicService] First-time start - starting service with initial sync")
                 val intent = Intent(context, EpicService::class.java)
@@ -71,7 +69,6 @@ class EpicService : Service() {
                 return
             }
 
-            // Subsequent starts: always start service, but check throttle for sync
             val now = System.currentTimeMillis()
             val timeSinceLastSync = now - lastSyncTimestamp
 
@@ -82,7 +79,6 @@ class EpicService : Service() {
             } else {
                 val remainingMinutes = (SYNC_THROTTLE_MILLIS - timeSinceLastSync) / 1000 / 60
                 Timber.tag("EPIC").i("Starting service without sync - throttled (${remainingMinutes}min remaining)")
-                // Start service without sync action
             }
             context.startForegroundService(intent)
         }
@@ -106,9 +102,6 @@ class EpicService : Service() {
             }
         }
 
-        // ==========================================================================
-        // AUTHENTICATION - Delegate to EpicAuthManager
-        // ==========================================================================
 
         suspend fun authenticateWithCode(
             context: Context,
@@ -119,29 +112,23 @@ class EpicService : Service() {
 
         suspend fun getStoredCredentials(context: Context): Result<EpicCredentials> = EpicAuthManager.getStoredCredentials(context)
 
-        /**
-         * Logout from Epic - clears credentials, database, and stops service
-         */
+        // Clears credentials, removes non-installed games, and stops the service.
         suspend fun logout(context: Context): Result<Unit> {
             return withContext(Dispatchers.IO) {
                 try {
                     Timber.tag("EPIC").i("Logging out from Epic...")
 
-                    // Clear stored credentials first, regardless of service state
                     val credentialsCleared = EpicAuthManager.clearStoredCredentials(context)
                     if (!credentialsCleared) {
                         Timber.tag("Epic").e("Failed to clear credentials during logout")
                         return@withContext Result.failure(Exception("Failed to clear stored credentials"))
                     }
 
-                    // Get instance to clean up service-specific data
                     val instance = getInstance()
                     if (instance != null) {
-                        // Clear all nonInstalled Epic games from database
                         instance.epicManager.deleteAllNonInstalledGames()
                         Timber.tag("Epic").i("All Non-installed Epic games removed from database")
 
-                        // Stop the service
                         stop()
                     } else {
                         Timber.tag("Epic").w("Service not running during logout, but credentials were cleared")
@@ -156,9 +143,6 @@ class EpicService : Service() {
             }
         }
 
-        // ==========================================================================
-        // SYNC & OPERATIONS
-        // ==========================================================================
 
         fun hasActiveOperations(): Boolean = syncInProgress || backgroundSyncJob?.isActive == true || hasActiveDownload()
 
@@ -170,9 +154,6 @@ class EpicService : Service() {
 
         fun getInstance(): EpicService? = instance
 
-        // ==========================================================================
-        // DOWNLOAD OPERATIONS - Delegate to instance EpicManager
-        // ==========================================================================
 
         fun hasActiveDownload(): Boolean = getInstance()?.activeDownloads?.isNotEmpty() ?: false
 
@@ -191,7 +172,6 @@ class EpicService : Service() {
                 Timber.tag("Epic").i("deleteGame: Service not running, attempting to start...")
                 start(context)
 
-                // Wait up to 2 seconds for service to start
                 for (i in 0..20) {
                     kotlinx.coroutines.delay(100)
                     instance = getInstance()
@@ -212,18 +192,15 @@ class EpicService : Service() {
                     Timber.tag("Epic").d("Terminating Wine processes...")
                     com.winlator.cmod.runtime.system.ProcessHelper
                         .terminateAllWineProcesses()
-                    // Wait a moment for processes to exit
                     kotlinx.coroutines.delay(1000)
                 }
 
-                // Get the game to find its install path
                 val game = instance.epicManager.getGameById(appId)
                 if (game == null) {
                     Timber.tag("Epic").e("deleteGame: Game not found in DB: $appId")
                     return Result.failure(Exception("Game not found: $appId"))
                 }
 
-                // Delete game folder
                 val path = if (game.installPath.isNotEmpty()) game.installPath else EpicConstants.getGameInstallPath(context, game.appName)
                 val gameDir = File(path)
 
@@ -252,7 +229,6 @@ class EpicService : Service() {
                         return Result.failure(e)
                     }
 
-                    // Cleanup markers
                     MarkerUtils.removeMarker(path, Marker.DOWNLOAD_COMPLETE_MARKER)
                     MarkerUtils.removeMarker(path, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
                 } else {
@@ -262,6 +238,7 @@ class EpicService : Service() {
                 // Uninstall from database (keeps the entry but marks as not installed)
                 Timber.tag("Epic").d("Updating database: marking game $appId as uninstalled")
                 instance.epicManager.uninstall(appId)
+                StoreArtworkCache.deleteGame(context, "epic", appId.toString())
 
                 // Delete game shortcuts but preserve the created containers
                 withContext(Dispatchers.IO) {
@@ -269,7 +246,6 @@ class EpicService : Service() {
                     Timber.tag("Epic").d("Deleted $deletedCount Epic shortcuts for appId=$appId")
                 }
 
-                // Trigger library refresh event
                 Timber.tag("Epic").d("Emitting LibraryInstallStatusChanged event")
                 com.winlator.cmod.app.PluviaApp.events.emitJava(
                     com.winlator.cmod.feature.stores.steam.events.AndroidEvent
@@ -299,7 +275,6 @@ class EpicService : Service() {
 
         fun cancelDownload(appId: Int): Boolean {
             // Route through the coordinator: it persists CANCELLED and asks our dispatcher to
-            // stop the running job and delete the partial install directory.
             DownloadCoordinator.runOnScope {
                 DownloadCoordinator.cancel(DownloadRecord.STORE_EPIC, appId.toString())
             }
@@ -352,9 +327,6 @@ class EpicService : Service() {
             }
         }
 
-        // ==========================================================================
-        // GAME & LIBRARY OPERATIONS
-        // ==========================================================================
 
         fun getEpicGameOf(appId: Int): EpicGame? =
             runBlocking(Dispatchers.IO) {
@@ -381,7 +353,8 @@ class EpicService : Service() {
             val game = getEpicGameOf(appId) ?: return false
 
             if (game.isInstalled && game.installPath.isNotEmpty()) {
-                return MarkerUtils.hasMarker(game.installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                return MarkerUtils.hasMarker(game.installPath, Marker.DOWNLOAD_COMPLETE_MARKER) &&
+                    !MarkerUtils.hasMarker(game.installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
             }
 
             val installPath =
@@ -446,6 +419,26 @@ class EpicService : Service() {
             getInstance()?.epicManager?.fetchManifestSizes(context, appId)
                 ?: EpicManager.ManifestSizes(installSize = 0L, downloadSize = 0L)
 
+        suspend fun checkForGameUpdate(
+            context: Context,
+            appId: Int,
+        ): EpicUpdateInfo {
+            val instance = getInstance()
+                ?: return EpicUpdateInfo(message = "Service not available")
+            val game = instance.epicManager.getGameById(appId)
+                ?: return EpicUpdateInfo(message = "Game not found: $appId")
+            val installPath =
+                game.installPath.ifEmpty {
+                    EpicConstants.getGameInstallPath(context, game.appName)
+                }
+            return instance.epicUpdateManager.checkForGameUpdate(
+                context = context,
+                game = game,
+                installPath = installPath,
+                containerLanguage = PrefManager.containerLanguage,
+            )
+        }
+
         fun downloadGame(
             context: Context,
             appId: Int,
@@ -477,7 +470,6 @@ class EpicService : Service() {
                 }
             }
 
-            // Check if already downloading
             val existingDownload = instance.activeDownloads[appId]
             if (existingDownload != null) {
                 if (existingDownload.isActive()) {
@@ -505,6 +497,17 @@ class EpicService : Service() {
 
             instance.activeDownloads[appId] = downloadInfo
 
+            // Pre-seed from the persisted record so Resume doesn't flash 0% during re-verify.
+            val priorRecord =
+                runBlocking {
+                    DownloadCoordinator.findRecord(DownloadRecord.STORE_EPIC, appId.toString())
+                }
+            if (priorRecord != null && priorRecord.bytesTotal > 0L) {
+                downloadInfo.setTotalExpectedBytes(priorRecord.bytesTotal)
+                downloadInfo.setDisplayTotalExpectedBytes(priorRecord.bytesTotal)
+                downloadInfo.initializeBytesDownloaded(priorRecord.bytesDownloaded)
+            }
+
             // Ask the global coordinator whether we can start now or must wait. The coordinator
             // persists a DownloadRecord either way, so the download survives an app restart.
             val decision =
@@ -538,9 +541,15 @@ class EpicService : Service() {
             downloadInfo.isCancelling = false
             downloadInfo.updateStatus(DownloadPhase.DOWNLOADING)
 
-            // Start download in background
             val job =
                 instance.scope.launch {
+                    val keepAliveTag = "epic-download-$appId"
+                    val keepAliveCtx = instance.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for Epic download $appId")
+                    }
                     try {
                         val commonRedistDir = File(effectiveInstallPath, "_CommonRedist")
                         Timber.tag("Epic").i("Starting download for game: ${game.title}, gameId: ${game.id}")
@@ -577,6 +586,12 @@ class EpicService : Service() {
                                     downloadInfo.updateStatus(DownloadPhase.CANCELLED)
                                 }
 
+                                downloadInfo.getStatusFlow().value == DownloadPhase.FAILED -> {
+                                    Timber.e(error, "[Download] Failed for game $gameId")
+                                    downloadInfo.setActive(false)
+                                    SnackbarManager.show("Download failed: ${error?.message ?: "Unknown error"}")
+                                }
+
                                 !downloadInfo.isActive() -> {
                                     Timber.i("[Download] Paused for game $gameId")
                                     downloadInfo.setActive(false)
@@ -600,6 +615,12 @@ class EpicService : Service() {
                                 downloadInfo.updateStatus(DownloadPhase.CANCELLED)
                             }
 
+                            downloadInfo.getStatusFlow().value == DownloadPhase.FAILED -> {
+                                Timber.e(e, "[Download] Exception for game $gameId")
+                                downloadInfo.setActive(false)
+                                SnackbarManager.show("Download error: ${e.message ?: "Unknown error"}")
+                            }
+
                             !downloadInfo.isActive() -> {
                                 Timber.i("[Download] Paused for game $gameId")
                                 downloadInfo.setActive(false)
@@ -617,6 +638,7 @@ class EpicService : Service() {
                     } finally {
                         // Notify coordinator of the terminal status so the global queue can
                         // advance and the persisted DownloadRecord stays in sync.
+                        updateCoordinatorDownloadProgress(appId, downloadInfo)
                         val finalCoordStatus =
                             when (downloadInfo.getStatusFlow().value) {
                                 DownloadPhase.COMPLETE -> DownloadRecord.STATUS_COMPLETE
@@ -636,6 +658,11 @@ class EpicService : Service() {
                         Timber.d(
                             "[Download] Finished for game $gameId, progress: ${downloadInfo.getProgress()}, active: ${downloadInfo.isActive()}",
                         )
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for Epic download $appId")
+                        }
                     }
                 }
             downloadInfo.setDownloadJob(job)
@@ -644,13 +671,372 @@ class EpicService : Service() {
             return Result.success(downloadInfo)
         }
 
+        fun verifyGameFiles(
+            context: Context,
+            appId: Int,
+        ): DownloadInfo? {
+            val instance = getInstance() ?: return null
+
+            val game =
+                runBlocking(Dispatchers.IO) { instance.epicManager.getGameById(appId) }
+                    ?: return null
+            val installPath =
+                game.installPath.ifEmpty {
+                    EpicConstants.getGameInstallPath(context, game.appName)
+                }
+            if (installPath.isEmpty() || !File(installPath).isDirectory) {
+                return null
+            }
+
+            val activeCoordinatorRecords =
+                DownloadCoordinator.snapshotRecords()
+                    .filter {
+                        it.status == DownloadRecord.STATUS_DOWNLOADING ||
+                            it.status == DownloadRecord.STATUS_QUEUED
+                    }
+            if (activeCoordinatorRecords.any {
+                    it.store != DownloadRecord.STORE_EPIC || it.storeGameId != appId.toString()
+                }
+            ) {
+                return null
+            }
+
+            val existingDownload = instance.activeDownloads[appId]
+            if (existingDownload?.isActive() == true) {
+                return null
+            }
+            instance.activeDownloads.remove(appId)
+
+            val downloadInfo =
+                DownloadInfo(
+                    jobCount = 1,
+                    gameId = appId,
+                    downloadingAppIds = CopyOnWriteArrayList<Int>(),
+                )
+            instance.activeDownloads[appId] = downloadInfo
+
+            val decision =
+                runBlocking {
+                    DownloadCoordinator.requestSlot(
+                        store = DownloadRecord.STORE_EPIC,
+                        storeGameId = appId.toString(),
+                        title = game.title,
+                        artUrl = game.iconUrl,
+                        installPath = installPath,
+                        language = PrefManager.containerLanguage,
+                        taskType = DownloadRecord.TASK_VERIFY,
+                    )
+                }
+
+            if (decision is DownloadCoordinator.Decision.Queue) {
+                downloadInfo.setActive(false)
+                downloadInfo.isCancelling = false
+                downloadInfo.updateStatus(DownloadPhase.QUEUED, "Queued...")
+                PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, true))
+                return downloadInfo
+            }
+
+            downloadInfo.setActive(true)
+            downloadInfo.isCancelling = false
+            downloadInfo.updateStatus(DownloadPhase.VERIFYING)
+
+            val job =
+                instance.scope.launch {
+                    val keepAliveTag = "epic-verify-$appId"
+                    val keepAliveCtx = instance.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for Epic verify $appId")
+                    }
+                    try {
+                        val result =
+                            instance.epicVerifyManager.verifyGameFiles(
+                                context = context,
+                                game = game,
+                                installPath = installPath,
+                                downloadInfo = downloadInfo,
+                                containerLanguage = PrefManager.containerLanguage,
+                            )
+
+                        if (result.isSuccess) {
+                            downloadInfo.setProgress(1.0f)
+                            downloadInfo.setActive(false)
+                            downloadInfo.updateStatus(DownloadPhase.COMPLETE)
+                            SnackbarManager.show("Verify files complete")
+                        } else {
+                            val error = result.exceptionOrNull()
+                            when {
+                                downloadInfo.isCancelling -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.CANCELLED)
+                                }
+                                downloadInfo.getStatusFlow().value == DownloadPhase.FAILED -> {
+                                    Timber.e(error, "[Verify] Failed for Epic game $appId")
+                                    downloadInfo.setActive(false)
+                                    SnackbarManager.show("Verify files failed: ${error?.message ?: "Unknown error"}")
+                                }
+                                !downloadInfo.isActive() -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.PAUSED)
+                                }
+                                else -> {
+                                    Timber.e(error, "[Verify] Failed for Epic game $appId")
+                                    downloadInfo.setProgress(-1.0f)
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.FAILED, error?.message ?: "Unknown error")
+                                    SnackbarManager.show("Verify files failed: ${error?.message ?: "Unknown error"}")
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        when {
+                            downloadInfo.isCancelling -> {
+                                downloadInfo.setActive(false)
+                                downloadInfo.updateStatus(DownloadPhase.CANCELLED)
+                            }
+                            downloadInfo.getStatusFlow().value == DownloadPhase.FAILED -> {
+                                Timber.e(e, "[Verify] Exception for Epic game $appId")
+                                downloadInfo.setActive(false)
+                                SnackbarManager.show("Verify files failed: ${e.message ?: "Unknown error"}")
+                            }
+                            !downloadInfo.isActive() -> {
+                                downloadInfo.setActive(false)
+                                downloadInfo.updateStatus(DownloadPhase.PAUSED)
+                            }
+                            else -> {
+                                Timber.e(e, "[Verify] Exception for Epic game $appId")
+                                downloadInfo.setProgress(-1.0f)
+                                downloadInfo.setActive(false)
+                                downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Unknown error")
+                                SnackbarManager.show("Verify files failed: ${e.message ?: "Unknown error"}")
+                            }
+                        }
+                    } finally {
+                        updateCoordinatorDownloadProgress(appId, downloadInfo)
+                        val finalCoordStatus =
+                            when (downloadInfo.getStatusFlow().value) {
+                                DownloadPhase.COMPLETE -> DownloadRecord.STATUS_COMPLETE
+                                DownloadPhase.PAUSED -> DownloadRecord.STATUS_PAUSED
+                                DownloadPhase.CANCELLED -> DownloadRecord.STATUS_CANCELLED
+                                DownloadPhase.FAILED -> DownloadRecord.STATUS_FAILED
+                                else -> DownloadRecord.STATUS_FAILED
+                            }
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_EPIC,
+                            appId.toString(),
+                            finalCoordStatus,
+                        )
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for Epic verify $appId")
+                        }
+                    }
+                }
+            downloadInfo.setDownloadJob(job)
+            return downloadInfo
+        }
+
+        fun updateGameFiles(
+            context: Context,
+            appId: Int,
+        ): DownloadInfo? {
+            val instance = getInstance() ?: return null
+
+            val game =
+                runBlocking(Dispatchers.IO) { instance.epicManager.getGameById(appId) }
+                    ?: return null
+            val installPath =
+                game.installPath.ifEmpty {
+                    EpicConstants.getGameInstallPath(context, game.appName)
+                }
+            if (installPath.isEmpty() || !File(installPath).isDirectory) {
+                return null
+            }
+
+            val activeCoordinatorRecords =
+                DownloadCoordinator.snapshotRecords()
+                    .filter {
+                        it.status == DownloadRecord.STATUS_DOWNLOADING ||
+                            it.status == DownloadRecord.STATUS_QUEUED
+                    }
+            if (activeCoordinatorRecords.any {
+                    it.store != DownloadRecord.STORE_EPIC || it.storeGameId != appId.toString()
+                }
+            ) {
+                return null
+            }
+
+            val existingDownload = instance.activeDownloads[appId]
+            if (existingDownload?.isActive() == true) {
+                return null
+            }
+            instance.activeDownloads.remove(appId)
+
+            val downloadInfo =
+                DownloadInfo(
+                    jobCount = 1,
+                    gameId = appId,
+                    downloadingAppIds = CopyOnWriteArrayList<Int>(),
+                )
+            instance.activeDownloads[appId] = downloadInfo
+
+            val decision =
+                runBlocking {
+                    DownloadCoordinator.requestSlot(
+                        store = DownloadRecord.STORE_EPIC,
+                        storeGameId = appId.toString(),
+                        title = game.title,
+                        artUrl = game.iconUrl,
+                        installPath = installPath,
+                        language = PrefManager.containerLanguage,
+                        taskType = DownloadRecord.TASK_UPDATE,
+                    )
+                }
+
+            if (decision is DownloadCoordinator.Decision.Queue) {
+                downloadInfo.setActive(false)
+                downloadInfo.isCancelling = false
+                downloadInfo.updateStatus(DownloadPhase.QUEUED, "Queued...")
+                PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, true))
+                return downloadInfo
+            }
+
+            downloadInfo.setActive(true)
+            downloadInfo.isCancelling = false
+            downloadInfo.updateStatus(DownloadPhase.DOWNLOADING)
+
+            val job =
+                instance.scope.launch {
+                    val keepAliveTag = "epic-update-$appId"
+                    val keepAliveCtx = instance.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for Epic update $appId")
+                    }
+                    try {
+                        val result =
+                            instance.epicUpdateManager.updateGameFiles(
+                                context = context,
+                                game = game,
+                                installPath = installPath,
+                                downloadInfo = downloadInfo,
+                                containerLanguage = PrefManager.containerLanguage,
+                            )
+
+                        if (result.isSuccess) {
+                            downloadInfo.setProgress(1.0f)
+                            downloadInfo.setActive(false)
+                            downloadInfo.updateStatus(DownloadPhase.COMPLETE)
+                            SnackbarManager.show("Update complete")
+                        } else {
+                            val error = result.exceptionOrNull()
+                            when {
+                                downloadInfo.isCancelling -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.CANCELLED)
+                                }
+                                downloadInfo.getStatusFlow().value == DownloadPhase.FAILED -> {
+                                    Timber.e(error, "[Update] Failed for Epic game $appId")
+                                    downloadInfo.setActive(false)
+                                    SnackbarManager.show("Update failed: ${error?.message ?: "Unknown error"}")
+                                }
+                                !downloadInfo.isActive() -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.PAUSED)
+                                }
+                                else -> {
+                                    Timber.e(error, "[Update] Failed for Epic game $appId")
+                                    downloadInfo.setProgress(-1.0f)
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.FAILED, error?.message ?: "Unknown error")
+                                    SnackbarManager.show("Update failed: ${error?.message ?: "Unknown error"}")
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        when {
+                            downloadInfo.isCancelling -> {
+                                downloadInfo.setActive(false)
+                                downloadInfo.updateStatus(DownloadPhase.CANCELLED)
+                            }
+                            downloadInfo.getStatusFlow().value == DownloadPhase.FAILED -> {
+                                Timber.e(e, "[Update] Exception for Epic game $appId")
+                                downloadInfo.setActive(false)
+                                SnackbarManager.show("Update failed: ${e.message ?: "Unknown error"}")
+                            }
+                            !downloadInfo.isActive() -> {
+                                downloadInfo.setActive(false)
+                                downloadInfo.updateStatus(DownloadPhase.PAUSED)
+                            }
+                            else -> {
+                                Timber.e(e, "[Update] Exception for Epic game $appId")
+                                downloadInfo.setProgress(-1.0f)
+                                downloadInfo.setActive(false)
+                                downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Unknown error")
+                                SnackbarManager.show("Update failed: ${e.message ?: "Unknown error"}")
+                            }
+                        }
+                    } finally {
+                        updateCoordinatorDownloadProgress(appId, downloadInfo)
+                        val finalCoordStatus =
+                            when (downloadInfo.getStatusFlow().value) {
+                                DownloadPhase.COMPLETE -> DownloadRecord.STATUS_COMPLETE
+                                DownloadPhase.PAUSED -> DownloadRecord.STATUS_PAUSED
+                                DownloadPhase.CANCELLED -> DownloadRecord.STATUS_CANCELLED
+                                DownloadPhase.FAILED -> DownloadRecord.STATUS_FAILED
+                                else -> DownloadRecord.STATUS_FAILED
+                            }
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_EPIC,
+                            appId.toString(),
+                            finalCoordStatus,
+                        )
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for Epic update $appId")
+                        }
+                    }
+                }
+            downloadInfo.setDownloadJob(job)
+            return downloadInfo
+        }
+
+        private fun updateCoordinatorDownloadProgress(
+            appId: Int,
+            downloadInfo: DownloadInfo,
+        ) {
+            val (displayDownloadedBytes, displayTotalBytes) = downloadInfo.getDisplayBytesProgress()
+            val downloadedBytes =
+                if (displayTotalBytes > 0L) {
+                    displayDownloadedBytes
+                } else {
+                    downloadInfo.getBytesDownloaded()
+                }
+            val totalBytes =
+                if (displayTotalBytes > 0L) {
+                    displayTotalBytes
+                } else {
+                    downloadInfo.getTotalExpectedBytes()
+                }
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_EPIC,
+                appId.toString(),
+                downloadedBytes,
+                totalBytes,
+            )
+        }
+
         suspend fun refreshSingleGame(
             appId: Int,
             context: Context,
         ): Result<EpicGame?> {
-            // For now, just get from database
             val game = getInstance()?.epicManager?.getGameById(appId)
-            // TODO: Fix this up.
             return if (game != null) {
                 Result.success(game)
             } else {
@@ -658,9 +1044,6 @@ class EpicService : Service() {
             }
         }
 
-        // ==========================================================================
-        // Game Launcher Helpers
-        // ==========================================================================
 
         suspend fun getGameLaunchToken(
             context: Context,
@@ -684,9 +1067,6 @@ class EpicService : Service() {
             EpicGameLauncher.cleanupOwnershipTokens(context, container)
         }
 
-        // ==========================================================================
-        // EOS OVERLAY (DRM/Denuvo support helper) - Delegate to instance EpicOverlayManager
-        // ==========================================================================
 
         /**
          * Install the EOS overlay into [container]'s Wine prefix. Idempotent.
@@ -730,13 +1110,7 @@ class EpicService : Service() {
             return instance.epicOverlayManager.removeOverlay(container)
         }
 
-        // ==========================================================================
-        // CLOUD SAVES HELPERS
-        // ==========================================================================
 
-        /**
-         * Get the Epic account ID from stored credentials
-         */
         fun getAccountId(): String? {
             return try {
                 val context = getInstance()?.applicationContext ?: return null
@@ -760,17 +1134,21 @@ class EpicService : Service() {
     @Inject
     lateinit var epicDownloadManager: EpicDownloadManager
 
+    @Inject
+    lateinit var epicVerifyManager: EpicVerifyManager
+
+    @Inject
+    lateinit var epicUpdateManager: EpicUpdateManager
+
     @Inject
     lateinit var epicOverlayManager: EpicOverlayManager
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    // Track active downloads by internal Int id
     private val activeDownloads = ConcurrentHashMap<Int, DownloadInfo>()
 
     // Original download parameters per appId so resume can restore DLC selection,
     // language, and install path instead of falling back to defaults.
-    // (Phase 2 will move this into a persistent record.)
     data class DownloadParams(
         val dlcGameIds: List<Int>,
         val containerLanguage: String,
@@ -786,8 +1164,6 @@ class EpicService : Service() {
             override fun startQueued(record: DownloadRecord) {
                 val context = DownloadService.appContext ?: return
                 val appId = record.storeGameId.toIntOrNull() ?: return
-                // Restore params from the in-memory cache, falling back to the persisted record
-                // (covers the post-restart case where memory was cleared).
                 val params = downloadParams[appId]
                 val dlcGameIds =
                     params?.dlcGameIds
@@ -797,16 +1173,27 @@ class EpicService : Service() {
                 val containerLanguage = params?.containerLanguage ?: record.language
                 val installPath = params?.installPath ?: record.installPath
 
-                // Drop the queued in-memory entry so downloadGame() doesn't short-circuit on
                 // "already downloading" — it will recreate the DownloadInfo and launch.
                 activeDownloads.remove(appId)
 
-                downloadGame(context, appId, dlcGameIds, installPath, containerLanguage)
+                if (record.taskType == DownloadRecord.TASK_UPDATE) {
+                    updateGameFiles(context, appId)
+                } else if (record.taskType == DownloadRecord.TASK_VERIFY) {
+                    verifyGameFiles(context, appId)
+                } else {
+                    downloadGame(context, appId, dlcGameIds, installPath, containerLanguage)
+                }
             }
 
             override fun pauseRunning(record: DownloadRecord) {
                 val appId = record.storeGameId.toIntOrNull() ?: return
                 val info = activeDownloads[appId] ?: return
+                DownloadCoordinator.updateProgress(
+                    DownloadRecord.STORE_EPIC,
+                    appId.toString(),
+                    info.getBytesDownloaded(),
+                    info.getTotalExpectedBytes(),
+                )
                 if (info.isActive()) {
                     info.isCancelling = false
                     info.updateStatus(DownloadPhase.PAUSED)
@@ -834,6 +1221,15 @@ class EpicService : Service() {
                                 EpicConstants.getGameInstallPath(applicationContext, game.appName)
                             } ?: ""
                         }
+                    if (record.taskType == DownloadRecord.TASK_UPDATE || record.taskType == DownloadRecord.TASK_VERIFY) {
+                        if (pathToDelete.isNotEmpty()) {
+                            MarkerUtils.removeMarker(pathToDelete, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                            MarkerUtils.addMarker(pathToDelete, Marker.DOWNLOAD_COMPLETE_MARKER)
+                        }
+                        info?.updateStatus(DownloadPhase.CANCELLED)
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
+                        return@launch
+                    }
                     if (pathToDelete.isNotEmpty()) {
                         val dirFile = File(pathToDelete)
                         if (dirFile.exists() && dirFile.isDirectory) {
@@ -863,7 +1259,6 @@ class EpicService : Service() {
         instance = this
         Timber.tag("Epic").i("[EpicService] Service created")
 
-        // Initialize notification helper for foreground service
         notificationHelper = NotificationHelper(applicationContext)
         PluviaApp.events.on<AndroidEvent.EndProcess, Unit>(onEndProcess)
 
@@ -878,11 +1273,9 @@ class EpicService : Service() {
         Timber.tag("EPIC").d("onStartCommand() - action: ${intent?.action}")
 
         val instance = getInstance()
-        // Start as foreground service
         val notification = notificationHelper.createForegroundNotification("Connected")
         startForeground(1, notification)
 
-        // Determine if we should sync based on the action
         val shouldSync =
             when (intent?.action) {
                 ACTION_MANUAL_SYNC -> {
@@ -896,8 +1289,7 @@ class EpicService : Service() {
                 }
 
                 null -> {
-                    // Service restarted by Android with null intent (START_STICKY behavior)
-                    // Only sync if we haven't done initial sync yet, or if it's been a while
+                    // START_STICKY restart: sync only if initial sync is missing or throttle elapsed.
                     val timeSinceLastSync = System.currentTimeMillis() - lastSyncTimestamp
                     val shouldResync = !hasPerformedInitialSync || timeSinceLastSync >= SYNC_THROTTLE_MILLIS
 
@@ -916,17 +1308,15 @@ class EpicService : Service() {
                 }
 
                 else -> {
-                    // Service started without sync action (e.g., just to keep it alive)
                     Timber.tag("EPIC").d(" Service started without sync action")
                     false
                 }
             }
 
-        // Start background library sync if requested
         if (shouldSync && (backgroundSyncJob == null || backgroundSyncJob?.isActive != true)) {
             Timber.tag("EPIC").i("Starting background library sync")
 
-            backgroundSyncJob?.cancel() // Cancel any existing job
+            backgroundSyncJob?.cancel()
             backgroundSyncJob =
                 scope.launch {
                     try {
@@ -937,10 +1327,9 @@ class EpicService : Service() {
                             Timber.w("Failed to start background sync: ${syncResult.exceptionOrNull()?.message}")
                         } else {
                             Timber.tag("EPIC").i("Background library sync completed successfully")
-                            // Update last sync timestamp on successful sync
                             lastSyncTimestamp = System.currentTimeMillis()
-                            // Mark that initial sync has been performed
                             hasPerformedInitialSync = true
+                            performInitialCloudSaveCheck(applicationContext)
                         }
                     } catch (e: Exception) {
                         Timber.e(e, "Exception starting background sync")
@@ -950,22 +1339,84 @@ class EpicService : Service() {
                 }
         } else if (shouldSync) {
             Timber.tag("EPIC").d("Background sync already in progress, skipping")
+        } else if (!hasPerformedInitialCloudSaveCheck) {
+            scope.launch {
+                performInitialCloudSaveCheck(applicationContext)
+            }
         }
 
         return START_STICKY
     }
 
+    private suspend fun performInitialCloudSaveCheck(context: Context) {
+        if (hasPerformedInitialCloudSaveCheck) return
+        hasPerformedInitialCloudSaveCheck = true
+
+        val games =
+            try {
+                epicManager
+                    .getAllGames()
+                    .filter { it.isInstalled && it.cloudSaveEnabled && !it.isDLC }
+            } catch (e: Exception) {
+                Timber.tag("Epic").w(e, "[Cloud Saves] Startup check could not load installed Epic games")
+                return
+            }
+        if (games.isEmpty()) return
+
+        val shortcuts: List<com.winlator.cmod.runtime.container.Shortcut> =
+            runCatching<List<com.winlator.cmod.runtime.container.Shortcut>> {
+                com.winlator.cmod.runtime.container.ContainerManager(context).loadShortcuts()
+            }.getOrElse {
+                Timber.tag("Epic").w(it, "[Cloud Saves] Startup check could not load shortcuts; using default cloud-sync state")
+                emptyList()
+            }
+        val shortcutsByAppId =
+            shortcuts
+                .filter { it.getExtra("game_source") == "EPIC" }
+                .associateBy { it.getExtra("app_id") }
+
+        Timber.tag("Epic").i("[Cloud Saves] Startup checking ${games.size} installed Epic cloud-save title(s)")
+        games.forEach { game ->
+            val shortcut = shortcutsByAppId[game.id.toString()]
+            if (shortcut != null &&
+                (shortcut.getExtra("cloud_sync_disabled", "0") == "1" ||
+                    shortcut.getExtra("offline_mode", "0") == "1")
+            ) {
+                Timber.tag("Epic").d("[Cloud Saves] Startup check skipped for ${game.title}: shortcut cloud sync disabled")
+                return@forEach
+            }
+
+            runCatching {
+                EpicCloudSavesManager.restoreCloudSavesIfLocalMissing(context, game.id)
+            }.onFailure {
+                Timber.tag("Epic").w(it, "[Cloud Saves] Startup restore failed for ${game.title}")
+            }
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         Timber.tag("Epic").i("[EpicService] Service destroyed")
         PluviaApp.events.off<AndroidEvent.EndProcess, Unit>(onEndProcess)
         DownloadCoordinator.unregisterDispatcher(DownloadRecord.STORE_EPIC)
 
-        // Cancel sync operations
         backgroundSyncJob?.cancel()
         setSyncInProgress(false)
+        hasPerformedInitialCloudSaveCheck = false
+
+        // Safety net for service/process teardown: persist the latest visible
+        // progress into the coordinator before cancelling workers.
+        activeDownloads.forEach { (appId, info) ->
+            val (displayDownloadedBytes, displayTotalBytes) = info.getDisplayBytesProgress()
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_EPIC,
+                appId.toString(),
+                if (displayTotalBytes > 0L) displayDownloadedBytes else info.getBytesDownloaded(),
+                if (displayTotalBytes > 0L) displayTotalBytes else info.getTotalExpectedBytes(),
+            )
+        }
 
-        scope.cancel() // Cancel any ongoing operations
+        scope.cancel()
         stopForeground(STOP_FOREGROUND_REMOVE)
         notificationHelper.cancel()
         instance = null
diff --git a/app/src/main/feature/stores/epic/service/EpicUpdateManager.kt b/app/src/main/feature/stores/epic/service/EpicUpdateManager.kt
new file mode 100644
index 000000000..91a091b52
--- /dev/null
+++ b/app/src/main/feature/stores/epic/service/EpicUpdateManager.kt
@@ -0,0 +1,493 @@
+package com.winlator.cmod.feature.stores.epic.service
+
+import android.content.Context
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.service.manifest.ChunkInfo
+import com.winlator.cmod.feature.stores.epic.service.manifest.EpicManifest
+import com.winlator.cmod.feature.stores.epic.service.manifest.FileManifest
+import com.winlator.cmod.feature.stores.epic.service.manifest.ManifestUtils
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.security.MessageDigest
+import javax.inject.Inject
+import javax.inject.Singleton
+
+data class EpicUpdateInfo(
+    val hasUpdate: Boolean = false,
+    val downloadSize: Long = 0L,
+    val changedFileCount: Int = 0,
+    val removedFileCount: Int = 0,
+    val message: String? = null,
+)
+
+internal object EpicInstalledManifestStore {
+    private const val MANIFEST_DIR = ".winnative/epic/manifests"
+    private val unsafeNameChars = Regex("[^A-Za-z0-9._-]")
+
+    fun saveManifest(
+        installDir: File,
+        appName: String,
+        manifestBytes: ByteArray,
+    ) {
+        val file = manifestFile(installDir, appName)
+        file.parentFile?.mkdirs()
+        file.writeBytes(manifestBytes)
+    }
+
+    fun loadManifest(
+        installDir: File,
+        appName: String,
+    ): EpicManifest? =
+        runCatching {
+            val file = manifestFile(installDir, appName)
+            if (!file.isFile || !file.canRead()) return@runCatching null
+            EpicManifest.readAll(file.readBytes())
+        }.onFailure {
+            Timber.tag("Epic").w(it, "Failed to read installed Epic manifest for $appName")
+        }.getOrNull()
+
+    private fun manifestFile(
+        installDir: File,
+        appName: String,
+    ): File = File(File(installDir, MANIFEST_DIR), "${sanitize(appName)}.manifest")
+
+    private fun sanitize(value: String): String =
+        value
+            .ifBlank { "unknown" }
+            .replace(unsafeNameChars, "_")
+}
+
+@Singleton
+class EpicUpdateManager
+    @Inject
+    constructor(
+        private val epicManager: EpicManager,
+        private val epicDownloadManager: EpicDownloadManager,
+    ) {
+        suspend fun checkForGameUpdate(
+            context: Context,
+            game: EpicGame,
+            installPath: String,
+            containerLanguage: String = EpicConstants.EPIC_FALLBACK_CONTAINER_LANGUAGE,
+        ): EpicUpdateInfo =
+            withContext(Dispatchers.IO) {
+                runCatching {
+                    val plan =
+                        buildPlan(
+                            context = context,
+                            game = game,
+                            installPath = installPath,
+                            containerLanguage = containerLanguage,
+                            verifyWithoutInstalledManifest = false,
+                            downloadInfo = null,
+                        )
+                    EpicUpdateInfo(
+                        hasUpdate = plan.hasUpdate,
+                        downloadSize = plan.downloadSize,
+                        changedFileCount = plan.changedFileCount,
+                        removedFileCount = plan.removedFileCount,
+                    )
+                }.getOrElse { error ->
+                    Timber.tag("Epic").w(error, "Epic update check failed for ${game.title}")
+                    EpicUpdateInfo(message = error.message ?: "Epic update check failed")
+                }
+            }
+
+        suspend fun updateGameFiles(
+            context: Context,
+            game: EpicGame,
+            installPath: String,
+            downloadInfo: DownloadInfo,
+            containerLanguage: String = EpicConstants.EPIC_FALLBACK_CONTAINER_LANGUAGE,
+        ): Result<Unit> =
+            withContext(Dispatchers.IO) {
+                val installDir = File(installPath)
+                try {
+                    if (!installDir.isDirectory) {
+                        return@withContext Result.failure(Exception("Install directory not found: $installPath"))
+                    }
+
+                    MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                    downloadInfo.setActive(true)
+                    downloadInfo.updateStatus(DownloadPhase.DOWNLOADING, "Checking for update")
+
+                    val plan =
+                        buildPlan(
+                            context = context,
+                            game = game,
+                            installPath = installPath,
+                            containerLanguage = containerLanguage,
+                            verifyWithoutInstalledManifest = true,
+                            downloadInfo = downloadInfo,
+                        )
+
+                    downloadInfo.setTotalExpectedBytes(plan.downloadSize)
+                    downloadInfo.setDisplayTotalExpectedBytes(plan.downloadSize)
+                    downloadInfo.initializeBytesDownloaded(0L)
+                    downloadInfo.setProgress(0.0f)
+                    downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(game.id, downloadInfo)
+
+                    if (!plan.hasUpdate) {
+                        finalizeUpdate(game, installPath, installDir, plan)
+                        downloadInfo.updateStatus(DownloadPhase.COMPLETE, "Already up to date")
+                        downloadInfo.setProgress(1.0f)
+                        downloadInfo.setActive(false)
+                        downloadInfo.emitProgressChange()
+                        syncCoordinatorProgress(game.id, downloadInfo)
+                        return@withContext Result.success(Unit)
+                    }
+
+                    val chunkCacheDir = File(installDir, ".chunks").also { it.mkdirs() }
+                    plan.scopes.forEachIndexed { index, scope ->
+                        if (scope.updateFiles.isNotEmpty()) {
+                            downloadInfo.updateStatus(
+                                DownloadPhase.DOWNLOADING,
+                                if (plan.scopes.size > 1) {
+                                    "Updating ${scope.game.title} (${index + 1}/${plan.scopes.size})"
+                                } else {
+                                    "Updating files"
+                                },
+                            )
+                            val result =
+                                epicDownloadManager.downloadManifestFiles(
+                                    chunks = scope.updateChunks,
+                                    files = scope.updateFiles,
+                                    chunkCacheDir = chunkCacheDir,
+                                    chunkDir = scope.chunkDir,
+                                    cdnUrls = scope.cdnUrls,
+                                    installDir = installDir,
+                                    downloadInfo = downloadInfo,
+                                ) { completed, total ->
+                                    downloadInfo.updateStatus(
+                                        DownloadPhase.DOWNLOADING,
+                                        if (plan.scopes.size > 1) {
+                                            "Updating ${scope.game.title} ($completed/$total chunks)"
+                                        } else {
+                                            "Updating files ($completed/$total chunks)"
+                                        },
+                                    )
+                                    downloadInfo.emitProgressChange()
+                                    syncCoordinatorProgress(game.id, downloadInfo)
+                            }
+                            if (result.isFailure) {
+                                restoreInstalledMarker(installPath)
+                                return@withContext Result.failure(result.exceptionOrNull() ?: Exception("Epic update failed"))
+                            }
+                        }
+                    }
+
+                    chunkCacheDir.deleteRecursively()
+                    downloadInfo.updateStatus(DownloadPhase.FINALIZING, "Finalizing update")
+                    finalizeUpdate(game, installPath, installDir, plan)
+                    downloadInfo.updateStatus(DownloadPhase.COMPLETE, "Update complete")
+                    downloadInfo.updateBytesDownloaded(downloadInfo.getTotalExpectedBytes() - downloadInfo.getBytesDownloaded())
+                    downloadInfo.setProgress(1.0f)
+                    downloadInfo.setActive(false)
+                    downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(game.id, downloadInfo)
+                    Result.success(Unit)
+                } catch (e: Exception) {
+                    Timber.tag("Epic").e(e, "Epic update failed for ${game.title}")
+                    restoreInstalledMarker(installPath)
+                    downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Epic update failed")
+                    downloadInfo.setProgress(-1.0f)
+                    downloadInfo.setActive(false)
+                    Result.failure(e)
+                }
+            }
+
+        private suspend fun buildPlan(
+            context: Context,
+            game: EpicGame,
+            installPath: String,
+            containerLanguage: String,
+            verifyWithoutInstalledManifest: Boolean,
+            downloadInfo: DownloadInfo?,
+        ): EpicUpdatePlan {
+            val installDir = File(installPath)
+            if (!installDir.isDirectory) {
+                throw Exception("Install directory not found: $installPath")
+            }
+
+            val selectedTags = EpicConstants.containerLanguageToEpicInstallTags(containerLanguage)
+            val scopes = mutableListOf<EpicUpdateScope>()
+
+            scopes.add(
+                buildScope(
+                    context = context,
+                    game = game,
+                    installDir = installDir,
+                    selectedTags = selectedTags,
+                    verifyWithoutInstalledManifest = verifyWithoutInstalledManifest,
+                    downloadInfo = downloadInfo,
+                ),
+            )
+
+            val installedDlcs =
+                epicManager
+                    .getDLCForTitle(game.id)
+                    .filter { it.isInstalled && it.installPath == installPath }
+            installedDlcs.forEach { dlc ->
+                scopes.add(
+                    buildScope(
+                        context = context,
+                        game = dlc,
+                        installDir = installDir,
+                        selectedTags = selectedTags,
+                        verifyWithoutInstalledManifest = verifyWithoutInstalledManifest,
+                        downloadInfo = downloadInfo,
+                    ),
+                )
+            }
+
+            return EpicUpdatePlan(scopes)
+        }
+
+        private suspend fun buildScope(
+            context: Context,
+            game: EpicGame,
+            installDir: File,
+            selectedTags: List<String>,
+            verifyWithoutInstalledManifest: Boolean,
+            downloadInfo: DownloadInfo?,
+        ): EpicUpdateScope {
+            downloadInfo?.updateStatusMessage("Fetching manifest: ${game.title}")
+            val manifestResult =
+                epicManager.fetchManifestFromEpic(
+                    context,
+                    game.namespace,
+                    game.catalogId,
+                    game.appName,
+                )
+            if (manifestResult.isFailure) {
+                throw manifestResult.exceptionOrNull() ?: Exception("Failed to fetch manifest")
+            }
+
+            val manifestData = manifestResult.getOrThrow()
+            val newManifest = EpicManifest.readAll(manifestData.manifestBytes)
+            val newFiles = ManifestUtils.getFilesForSelectedInstallTags(newManifest, selectedTags)
+            val oldManifest = EpicInstalledManifestStore.loadManifest(installDir, game.appName)
+            val oldFiles =
+                oldManifest?.let { ManifestUtils.getFilesForSelectedInstallTags(it, selectedTags) }
+                    ?: emptyList()
+            val comparison = compareFiles(oldFiles, newFiles)
+            val versionChanged = game.version.isBlank() || game.version != newManifest.meta?.buildVersion.orEmpty()
+
+            val updateFiles =
+                when {
+                    oldManifest != null -> {
+                        val missingUnchanged =
+                            comparison.unchanged.filterNot { isInstalledFilePresent(it, installDir) }
+                        (comparison.added + comparison.modified.map { it.second } + missingUnchanged)
+                            .distinctBy { it.filename }
+                    }
+                    verifyWithoutInstalledManifest -> {
+                        downloadInfo?.updateStatusMessage("Scanning existing files: ${game.title}")
+                        newFiles.filterNot { isInstalledFileValid(it, installDir) }
+                    }
+                    versionChanged -> newFiles
+                    else -> emptyList()
+                }
+
+            val chunks = ManifestUtils.getRequiredChunksForFileList(newManifest, updateFiles)
+            val cdnUrls = selectCdnUrls(manifestData.cdnUrls)
+            if (cdnUrls.isEmpty()) {
+                throw Exception("No usable CDN URLs in manifest")
+            }
+
+            return EpicUpdateScope(
+                game = game,
+                manifestBytes = manifestData.manifestBytes,
+                manifest = newManifest,
+                updateFiles = updateFiles,
+                updateChunks = chunks,
+                removedFiles = comparison.removed,
+                versionChanged = versionChanged,
+                chunkDir = newManifest.getChunkDir(),
+                cdnUrls = cdnUrls,
+            )
+        }
+
+        private suspend fun finalizeUpdate(
+            baseGame: EpicGame,
+            installPath: String,
+            installDir: File,
+            plan: EpicUpdatePlan,
+        ) {
+            plan.scopes.forEach { scope ->
+                scope.removedFiles.forEach { fileManifest ->
+                    val file = File(installDir, fileManifest.filename)
+                    if (file.exists() && file.isFile && !file.delete()) {
+                        Timber.tag("Epic").w("Failed to delete removed Epic file ${file.absolutePath}")
+                    }
+                }
+                EpicInstalledManifestStore.saveManifest(installDir, scope.game.appName, scope.manifestBytes)
+                val installSize = ManifestUtils.getTotalInstalledSize(scope.manifest)
+                val updated =
+                    scope.game.copy(
+                        isInstalled = true,
+                        installPath = installPath,
+                        installSize = installSize.takeIf { it > 0L } ?: scope.game.installSize,
+                        version = scope.manifest.meta?.buildVersion.orEmpty().ifBlank { scope.game.version },
+                        executable = scope.manifest.meta?.launchExe.orEmpty().ifBlank { scope.game.executable },
+                    )
+                epicManager.updateGame(updated)
+            }
+
+            MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+            com.winlator.cmod.app.PluviaApp.events.emitJava(
+                com.winlator.cmod.feature.stores.steam.events.AndroidEvent.LibraryInstallStatusChanged(baseGame.id),
+            )
+        }
+
+        private fun restoreInstalledMarker(installPath: String) {
+            MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+        }
+
+        private fun compareFiles(
+            oldFiles: List<FileManifest>,
+            newFiles: List<FileManifest>,
+        ): EpicFileComparison {
+            val oldByName = oldFiles.associateBy { it.filename }
+            val newByName = newFiles.associateBy { it.filename }
+            val added = mutableListOf<FileManifest>()
+            val modified = mutableListOf<Pair<FileManifest, FileManifest>>()
+            val unchanged = mutableListOf<FileManifest>()
+            val removed = mutableListOf<FileManifest>()
+
+            newByName.forEach { (filename, newFile) ->
+                val oldFile = oldByName[filename]
+                when {
+                    oldFile == null -> added.add(newFile)
+                    filesEqual(oldFile, newFile) -> unchanged.add(newFile)
+                    else -> modified.add(oldFile to newFile)
+                }
+            }
+            oldByName.forEach { (filename, oldFile) ->
+                if (filename !in newByName) removed.add(oldFile)
+            }
+            return EpicFileComparison(added, modified, unchanged, removed)
+        }
+
+        private fun filesEqual(
+            oldFile: FileManifest,
+            newFile: FileManifest,
+        ): Boolean {
+            if (oldFile.fileSize != newFile.fileSize) return false
+            val oldHash = expectedHash(oldFile)
+            val newHash = expectedHash(newFile)
+            return if (oldHash != null && newHash != null) {
+                oldHash.contentEquals(newHash)
+            } else {
+                oldHash == null && newHash == null
+            }
+        }
+
+        private fun isInstalledFilePresent(
+            fileManifest: FileManifest,
+            installDir: File,
+        ): Boolean {
+            val file = File(installDir, fileManifest.filename)
+            return file.isFile && file.length() == fileManifest.fileSize
+        }
+
+        private fun isInstalledFileValid(
+            fileManifest: FileManifest,
+            installDir: File,
+        ): Boolean {
+            val file = File(installDir, fileManifest.filename)
+            if (!file.isFile || file.length() != fileManifest.fileSize) return false
+            val expected = expectedHash(fileManifest) ?: return true
+            val algorithm =
+                when (expected.size) {
+                    32 -> "SHA-256"
+                    20 -> "SHA-1"
+                    16 -> "MD5"
+                    else -> return true
+                }
+            return runCatching {
+                val digest = MessageDigest.getInstance(algorithm)
+                file.inputStream().buffered().use { input ->
+                    val buffer = ByteArray(256 * 1024)
+                    while (true) {
+                        val read = input.read(buffer)
+                        if (read < 0) break
+                        digest.update(buffer, 0, read)
+                    }
+                }
+                digest.digest().contentEquals(expected)
+            }.getOrElse {
+                Timber.tag("Epic").w(it, "Failed to verify ${file.absolutePath}")
+                false
+            }
+        }
+
+        private fun expectedHash(fileManifest: FileManifest): ByteArray? =
+            when {
+                fileManifest.hashSha256.any { it != 0.toByte() } -> fileManifest.hashSha256
+                fileManifest.hash.any { it != 0.toByte() } -> fileManifest.hash
+                fileManifest.hashMd5.any { it != 0.toByte() } -> fileManifest.hashMd5
+                else -> null
+            }
+
+        private fun syncCoordinatorProgress(
+            gameId: Int,
+            downloadInfo: DownloadInfo,
+        ) {
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_EPIC,
+                gameId.toString(),
+                downloadInfo.getBytesDownloaded(),
+                downloadInfo.getTotalExpectedBytes(),
+            )
+        }
+
+        private fun selectCdnUrls(cdnUrls: List<EpicManager.CdnUrl>): List<EpicManager.CdnUrl> {
+            val nonCloudflare =
+                cdnUrls.filter {
+                    !it.baseUrl.startsWith("https://cloudflare.epicgamescdn.com")
+                }
+            return nonCloudflare.ifEmpty { cdnUrls }
+        }
+
+        private data class EpicUpdatePlan(
+            val scopes: List<EpicUpdateScope>,
+        ) {
+            val downloadSize: Long get() = scopes.sumOf { scope -> scope.updateChunks.sumOf { it.fileSize } }
+            val changedFileCount: Int get() = scopes.sumOf { it.updateFiles.size }
+            val removedFileCount: Int get() = scopes.sumOf { it.removedFiles.size }
+            val hasUpdate: Boolean
+                get() = scopes.any { it.versionChanged || it.updateFiles.isNotEmpty() || it.removedFiles.isNotEmpty() }
+        }
+
+        private data class EpicUpdateScope(
+            val game: EpicGame,
+            val manifestBytes: ByteArray,
+            val manifest: EpicManifest,
+            val updateFiles: List<FileManifest>,
+            val updateChunks: List<ChunkInfo>,
+            val removedFiles: List<FileManifest>,
+            val versionChanged: Boolean,
+            val chunkDir: String,
+            val cdnUrls: List<EpicManager.CdnUrl>,
+        )
+
+        private data class EpicFileComparison(
+            val added: List<FileManifest>,
+            val modified: List<Pair<FileManifest, FileManifest>>,
+            val unchanged: List<FileManifest>,
+            val removed: List<FileManifest>,
+        )
+    }
diff --git a/app/src/main/feature/stores/epic/service/EpicVerifyManager.kt b/app/src/main/feature/stores/epic/service/EpicVerifyManager.kt
new file mode 100644
index 000000000..73167413d
--- /dev/null
+++ b/app/src/main/feature/stores/epic/service/EpicVerifyManager.kt
@@ -0,0 +1,367 @@
+package com.winlator.cmod.feature.stores.epic.service
+
+import android.content.Context
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.stores.epic.data.EpicGame
+import com.winlator.cmod.feature.stores.epic.service.manifest.ChunkInfo
+import com.winlator.cmod.feature.stores.epic.service.manifest.EpicManifest
+import com.winlator.cmod.feature.stores.epic.service.manifest.FileManifest
+import com.winlator.cmod.feature.stores.epic.service.manifest.ManifestUtils
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.security.MessageDigest
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class EpicVerifyManager
+    @Inject
+    constructor(
+        private val epicManager: EpicManager,
+        private val epicDownloadManager: EpicDownloadManager,
+    ) {
+        suspend fun verifyGameFiles(
+            context: Context,
+            game: EpicGame,
+            installPath: String,
+            downloadInfo: DownloadInfo,
+            containerLanguage: String = EpicConstants.EPIC_FALLBACK_CONTAINER_LANGUAGE,
+        ): Result<Unit> =
+            withContext(Dispatchers.IO) {
+                val gameId = game.id
+                try {
+                    val installDir = File(installPath)
+                    if (!installDir.isDirectory) {
+                        return@withContext Result.failure(Exception("Install directory not found: $installPath"))
+                    }
+
+                    PluviaApp.events.emitJava(AndroidEvent.DownloadStatusChanged(gameId, true))
+                    downloadInfo.setActive(true)
+                    downloadInfo.updateStatus(DownloadPhase.VERIFYING, "Fetching manifest")
+
+                    val selectedTags = EpicConstants.containerLanguageToEpicInstallTags(containerLanguage)
+                    val scopes = mutableListOf<VerifyManifestScope>()
+
+                    val baseManifestResult =
+                        epicManager.fetchManifestFromEpic(
+                            context,
+                            game.namespace,
+                            game.catalogId,
+                            game.appName,
+                        )
+                    if (baseManifestResult.isFailure) {
+                        return@withContext Result.failure(
+                            baseManifestResult.exceptionOrNull() ?: Exception("Failed to fetch manifest"),
+                        )
+                    }
+                    scopes.add(buildScope(game.title, game.appName, baseManifestResult.getOrThrow(), selectedTags))
+
+                    val installedDlcs =
+                        epicManager
+                            .getDLCForTitle(game.id)
+                            .filter { it.isInstalled && it.installPath == installPath }
+                    installedDlcs.forEach { dlc ->
+                        downloadInfo.updateStatus(DownloadPhase.VERIFYING, "Fetching DLC manifest: ${dlc.title}")
+                        val dlcManifestResult =
+                            epicManager.fetchManifestFromEpic(
+                                context,
+                                dlc.namespace,
+                                dlc.catalogId,
+                                dlc.appName,
+                            )
+                        if (dlcManifestResult.isSuccess) {
+                            scopes.add(buildScope(dlc.title, dlc.appName, dlcManifestResult.getOrThrow(), selectedTags))
+                        } else {
+                            Timber.tag("Epic").w(
+                                dlcManifestResult.exceptionOrNull(),
+                                "Failed to fetch DLC manifest while verifying ${dlc.title}",
+                            )
+                        }
+                    }
+
+                    val scanBytes = scopes.sumOf { scope -> scope.files.sumOf { it.fileSize } }
+                    downloadInfo.setTotalExpectedBytes(scanBytes)
+                    downloadInfo.setDisplayTotalExpectedBytes(scanBytes)
+                    downloadInfo.initializeBytesDownloaded(0L)
+                    downloadInfo.setProgress(0.0f)
+                    downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(gameId, downloadInfo)
+
+                    var scannedBytes = 0L
+                    val repairPlans =
+                        scopes.mapIndexed { index, scope ->
+                            downloadInfo.updateStatus(
+                                DownloadPhase.VERIFYING,
+                                if (scopes.size > 1) {
+                                    "Verifying ${scope.title} (${index + 1}/${scopes.size})"
+                                } else {
+                                    "Verifying files"
+                                },
+                            )
+                            scope to
+                                buildRepairPlan(scope, installDir, downloadInfo) { delta ->
+                                    scannedBytes = (scannedBytes + delta).coerceAtMost(scanBytes)
+                                    downloadInfo.setBytesDownloaded(scannedBytes)
+                                    downloadInfo.emitProgressChange()
+                                    syncCoordinatorProgress(gameId, downloadInfo)
+                                }
+                        }
+                    val repairBytes = repairPlans.sumOf { (_, plan) -> plan.repairChunks.sumOf { it.fileSize } }
+                    if (repairBytes > 0L) {
+                        val totalWorkBytes = scanBytes + repairBytes
+                        downloadInfo.setTotalExpectedBytes(totalWorkBytes)
+                        downloadInfo.setDisplayTotalExpectedBytes(totalWorkBytes)
+                        downloadInfo.setBytesDownloaded(scannedBytes)
+                        downloadInfo.emitProgressChange()
+                        syncCoordinatorProgress(gameId, downloadInfo)
+                    }
+
+                    val chunkCacheDir = File(installDir, ".chunks").also { it.mkdirs() }
+                    repairPlans.forEachIndexed { index, (scope, plan) ->
+                        if (plan.repairFiles.isEmpty()) {
+                            Timber.tag("Epic").i("Verify found no missing or corrupt files for ${scope.title}")
+                            return@forEachIndexed
+                        }
+
+                        downloadInfo.updateStatus(
+                            DownloadPhase.DOWNLOADING,
+                            if (scopes.size > 1) {
+                                "Repairing ${scope.title}: ${plan.repairFiles.size} files"
+                            } else {
+                                "Repairing ${plan.repairFiles.size} files"
+                            },
+                        )
+                        val result =
+                            epicDownloadManager.repairManifestFiles(
+                                chunks = plan.repairChunks,
+                                files = plan.repairFiles,
+                                chunkCacheDir = chunkCacheDir,
+                                chunkDir = scope.chunkDir,
+                                cdnUrls = scope.cdnUrls,
+                                installDir = installDir,
+                                downloadInfo = downloadInfo,
+                            ) { completed, total ->
+                                downloadInfo.updateStatus(
+                                    DownloadPhase.DOWNLOADING,
+                                    if (scopes.size > 1) {
+                                        "Repairing ${scope.title} ($completed/$total chunks)"
+                                    } else {
+                                        "Repairing files ($completed/$total chunks)"
+                                    },
+                                )
+                                downloadInfo.emitProgressChange()
+                                syncCoordinatorProgress(gameId, downloadInfo)
+                            }
+                        if (result.isFailure) {
+                            return@withContext Result.failure(result.exceptionOrNull() ?: Exception("Verify repair failed"))
+                        }
+
+                        Timber.tag("Epic").i(
+                            "Verify repaired ${plan.repairFiles.size} files for ${scope.title} (${index + 1}/${repairPlans.size})",
+                        )
+                    }
+
+                    downloadInfo.updateStatus(DownloadPhase.FINALIZING, "Finalizing verify")
+                    chunkCacheDir.deleteRecursively()
+                    scopes.forEach { scope ->
+                        EpicInstalledManifestStore.saveManifest(installDir, scope.appName, scope.manifestBytes)
+                    }
+                    MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                    downloadInfo.updateStatus(DownloadPhase.COMPLETE, "Verify complete")
+                    downloadInfo.updateBytesDownloaded(downloadInfo.getTotalExpectedBytes() - downloadInfo.getBytesDownloaded())
+                    downloadInfo.setProgress(1.0f)
+                    downloadInfo.setActive(false)
+                    downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(gameId, downloadInfo)
+                    PluviaApp.events.emitJava(AndroidEvent.LibraryInstallStatusChanged(gameId))
+                    Result.success(Unit)
+                } catch (e: Exception) {
+                    Timber.tag("Epic").e(e, "Verify failed for ${game.title}")
+                    downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Verify failed")
+                    downloadInfo.setProgress(-1.0f)
+                    downloadInfo.setActive(false)
+                    Result.failure(e)
+                } finally {
+                    PluviaApp.events.emitJava(AndroidEvent.DownloadStatusChanged(gameId, false))
+                }
+            }
+
+        private fun buildScope(
+            title: String,
+            appName: String,
+            manifestData: EpicManager.ManifestResult,
+            selectedTags: List<String>,
+        ): VerifyManifestScope {
+            val cdnUrls = selectCdnUrls(manifestData.cdnUrls)
+            if (cdnUrls.isEmpty()) {
+                throw Exception("No usable CDN URLs in manifest")
+            }
+
+            val manifest = EpicManifest.readAll(manifestData.manifestBytes)
+            val files = ManifestUtils.getFilesForSelectedInstallTags(manifest, selectedTags)
+            val chunks = ManifestUtils.getRequiredChunksForFileList(manifest, files)
+            if (files.isEmpty()) throw Exception("No file manifest in manifest")
+            if (chunks.isEmpty()) throw Exception("No chunk data in manifest")
+
+            return VerifyManifestScope(
+                title = title,
+                appName = appName,
+                manifestBytes = manifestData.manifestBytes,
+                files = files,
+                chunks = chunks,
+                chunkDir = manifest.getChunkDir(),
+                cdnUrls = cdnUrls,
+            )
+        }
+
+        private fun buildRepairPlan(
+            scope: VerifyManifestScope,
+            installDir: File,
+            downloadInfo: DownloadInfo,
+            onScannedBytes: (Long) -> Unit,
+        ): VerifyRepairPlan {
+            val repairFiles = mutableListOf<FileManifest>()
+            scope.files.forEachIndexed { index, fileManifest ->
+                if (index % 25 == 0) {
+                    downloadInfo.updateStatusMessage("Verifying ${scope.title} (${index + 1}/${scope.files.size})")
+                    downloadInfo.updateCurrentFileName(fileManifest.displayName)
+                }
+                if (!isInstalledFileValid(fileManifest, installDir, onScannedBytes)) {
+                    repairFiles.add(fileManifest)
+                }
+            }
+            downloadInfo.updateCurrentFileName(null)
+
+            if (repairFiles.isEmpty()) {
+                return VerifyRepairPlan(emptyList(), emptyList())
+            }
+
+            val chunksByGuid = scope.chunks.associateBy { it.guidStr }
+            val repairChunkGuids =
+                repairFiles
+                    .asSequence()
+                    .flatMap { file -> file.chunkParts.asSequence().map { it.guidStr } }
+                    .toSet()
+            val repairChunks = repairChunkGuids.mapNotNull { chunksByGuid[it] }
+
+            Timber.tag("Epic").i(
+                "Verify repair plan for ${scope.title}: ${repairFiles.size}/${scope.files.size} files, " +
+                    "${repairChunks.size}/${scope.chunks.size} chunks",
+            )
+            return VerifyRepairPlan(repairFiles, repairChunks)
+        }
+
+        private fun isInstalledFileValid(
+            fileManifest: FileManifest,
+            installDir: File,
+            onScannedBytes: ((Long) -> Unit)?,
+        ): Boolean {
+            val outputFile = File(installDir, fileManifest.filename)
+            if (!outputFile.exists()) {
+                onScannedBytes?.invoke(fileManifest.fileSize)
+                return false
+            }
+            if (outputFile.length() != fileManifest.fileSize) {
+                onScannedBytes?.invoke(fileManifest.fileSize)
+                return false
+            }
+            val expectedHash =
+                expectedFileHash(fileManifest)
+                    ?: run {
+                        onScannedBytes?.invoke(fileManifest.fileSize)
+                        return true
+                    }
+            return verifyFileHash(outputFile, expectedHash.bytes, expectedHash.algorithm, onScannedBytes)
+        }
+
+        private fun expectedFileHash(fileManifest: FileManifest): ExpectedFileHash? =
+            when {
+                hasExpectedHash(fileManifest.hashSha256) -> ExpectedFileHash("SHA-256", fileManifest.hashSha256)
+                hasExpectedHash(fileManifest.hash) -> ExpectedFileHash("SHA-1", fileManifest.hash)
+                hasExpectedHash(fileManifest.hashMd5) -> ExpectedFileHash("MD5", fileManifest.hashMd5)
+                else -> null
+            }
+
+        private fun verifyFileHash(
+            file: File,
+            expectedHash: ByteArray,
+            algorithm: String,
+            onScannedBytes: ((Long) -> Unit)?,
+        ): Boolean =
+            try {
+                val digest = MessageDigest.getInstance(algorithm)
+                file.inputStream().buffered().use { input ->
+                    val buffer = ByteArray(256 * 1024)
+                    while (true) {
+                        val bytesRead = input.read(buffer)
+                        if (bytesRead < 0) break
+                        digest.update(buffer, 0, bytesRead)
+                        onScannedBytes?.invoke(bytesRead.toLong())
+                    }
+                }
+                val actualHash = digest.digest()
+                val matches = actualHash.contentEquals(expectedHash)
+                if (!matches) {
+                    Timber.tag("Epic").w("Hash mismatch for ${file.name} using $algorithm")
+                }
+                matches
+            } catch (e: Exception) {
+                Timber.tag("Epic").e(e, "Hash verification failed for ${file.absolutePath}")
+                false
+            }
+
+        private fun hasExpectedHash(hash: ByteArray): Boolean = hash.any { it != 0.toByte() }
+
+        private val FileManifest.displayName: String
+            get() = filename.substringAfterLast('/').substringAfterLast('\\')
+
+        private fun syncCoordinatorProgress(
+            gameId: Int,
+            downloadInfo: DownloadInfo,
+        ) {
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_EPIC,
+                gameId.toString(),
+                downloadInfo.getBytesDownloaded(),
+                downloadInfo.getTotalExpectedBytes(),
+            )
+        }
+
+        private fun selectCdnUrls(cdnUrls: List<EpicManager.CdnUrl>): List<EpicManager.CdnUrl> {
+            val nonCloudflare =
+                cdnUrls.filter {
+                    !it.baseUrl.startsWith("https://cloudflare.epicgamescdn.com")
+                }
+            return nonCloudflare.ifEmpty { cdnUrls }
+        }
+
+        private data class VerifyManifestScope(
+            val title: String,
+            val appName: String,
+            val manifestBytes: ByteArray,
+            val files: List<FileManifest>,
+            val chunks: List<ChunkInfo>,
+            val chunkDir: String,
+            val cdnUrls: List<EpicManager.CdnUrl>,
+        )
+
+        private data class VerifyRepairPlan(
+            val repairFiles: List<FileManifest>,
+            val repairChunks: List<ChunkInfo>,
+        )
+
+        private data class ExpectedFileHash(
+            val algorithm: String,
+            val bytes: ByteArray,
+        )
+    }
diff --git a/app/src/main/feature/stores/epic/service/manifest/EpicManifest.kt b/app/src/main/feature/stores/epic/service/manifest/EpicManifest.kt
index 7ce9f94e9..2305f8433 100644
--- a/app/src/main/feature/stores/epic/service/manifest/EpicManifest.kt
+++ b/app/src/main/feature/stores/epic/service/manifest/EpicManifest.kt
@@ -6,10 +6,7 @@ import java.nio.ByteOrder
 import java.security.MessageDigest
 import java.util.zip.Inflater
 
-/**
- * Base class for Epic Games manifest parsing.
- * Supports both binary and JSON manifest formats.
- */
+// Base class for Epic Games binary and JSON manifests.
 sealed class EpicManifest {
     var headerSize: Int = 41
     var sizeCompressed: Int = 0
@@ -19,7 +16,6 @@ sealed class EpicManifest {
     var version: Int = 18
     var data: ByteArray = ByteArray(0)
 
-    // Parsed components
     var meta: ManifestMeta? = null
     var chunkDataList: ChunkDataList? = null
     var fileManifestList: FileManifestList? = null
@@ -32,9 +28,7 @@ sealed class EpicManifest {
         const val HEADER_MAGIC: UInt = 0x44BEC00Cu
         const val DEFAULT_SERIALIZATION_VERSION = 17
 
-        /**
-         * Detects manifest format and returns appropriate parser
-         */
+        // Detects the manifest format and returns its parser.
         fun detect(data: ByteArray): EpicManifest =
             if (data.size >= 4) {
                 val buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN)
@@ -47,14 +41,11 @@ sealed class EpicManifest {
                     JsonManifest()
                 }
             } else {
-                // Try JSON by default for small files
                 Timber.tag("Epic").i("Defaulting to JSON Manifest...")
                 JsonManifest()
             }
 
-        /**
-         * Read and parse complete manifest from bytes
-         */
+        // Reads and parses a complete manifest from bytes.
         fun readAll(data: ByteArray): EpicManifest {
             val manifest = detect(data)
             manifest.read(data)
@@ -69,9 +60,7 @@ sealed class EpicManifest {
 
     abstract fun serialize(): ByteArray
 
-    /**
-     * Get chunk directory based on manifest version
-     */
+    // Returns the chunk directory for the manifest version.
     fun getChunkDir(): String =
         when {
             version >= 15 -> "ChunksV4"
@@ -81,9 +70,7 @@ sealed class EpicManifest {
         }
 }
 
-/**
- * Binary format manifest parser (most common format)
- */
+// Binary format manifest parser.
 class BinaryManifest : EpicManifest() {
     /**
      * Binary manifest parse flow (high-level):
@@ -104,7 +91,6 @@ class BinaryManifest : EpicManifest() {
         buffer.put(data)
         buffer.flip()
 
-        // Read header
         val magic = buffer.int.toUInt()
         if (magic != HEADER_MAGIC) {
             throw IllegalArgumentException("Invalid manifest header magic: 0x${magic.toString(16)}")
@@ -117,16 +103,13 @@ class BinaryManifest : EpicManifest() {
         storedAs = buffer.get()
         version = buffer.int
 
-        // Seek to end of header if we didn't read it all
         if (buffer.position() != headerSize) {
             buffer.position(headerSize)
         }
 
-        // Read body data
         val bodyData = ByteArray(buffer.remaining())
         buffer.get(bodyData)
 
-        // Decompress if necessary
         this.data =
             if (isCompressed) {
                 val inflater = Inflater()
@@ -135,12 +118,10 @@ class BinaryManifest : EpicManifest() {
                 val resultLength = inflater.inflate(decompressed)
                 inflater.end()
 
-                // Validate decompressed length matches expected size
                 if (resultLength != sizeUncompressed) {
                     throw IllegalStateException("Manifest decompression size mismatch: expected $sizeUncompressed, got $resultLength")
                 }
 
-                // Verify hash
                 val md = MessageDigest.getInstance("SHA-1")
                 val computedHash = md.digest(decompressed)
                 if (!computedHash.contentEquals(shaHash)) {
@@ -156,23 +137,18 @@ class BinaryManifest : EpicManifest() {
     override fun parseContents() {
         val buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN)
 
-        // Parse in order: Meta, CDL, FML, CustomFields
         meta = ManifestMeta.read(buffer)
         chunkDataList = ChunkDataList.read(buffer, meta?.featureLevel ?: version)
         fileManifestList = FileManifestList.read(buffer)
         customFields = CustomFields.read(buffer)
 
-        // Clear raw data to save memory
         data = ByteArray(0)
     }
 
     private fun estimateBodySize(): Int {
         var size = 0
-        // Meta section estimate
         meta?.let { size += 10000 }
-        // Chunk data list estimate (~57 bytes per chunk)
         chunkDataList?.let { size += it.elements.size * 57 + 1000 }
-        // File manifest list estimate
         fileManifestList?.let { fml ->
             size +=
                 fml.elements.sumOf { fm ->
@@ -181,22 +157,18 @@ class BinaryManifest : EpicManifest() {
                         fm.chunkParts.size * 28
                 }
         }
-        // Custom fields estimate
         customFields?.let { size += 1000 }
-        return maxOf(size, 256 * 1024) // At least 256KB
+        return maxOf(size, 256 * 1024)
     }
 
     override fun serialize(): ByteArray {
         val bodyStream = java.io.ByteArrayOutputStream()
 
-        // Determine target version
-        // max(default=17, featureLevel), clamped to known range.
-        // For cloud saves we always use 18 (dataVersion=0, no MD5/SHA256 in FML).
+        // Cloud saves use version 18: dataVersion=0, no MD5/SHA256 in FML.
         val targetVersion =
             maxOf(DEFAULT_SERIALIZATION_VERSION, meta?.featureLevel ?: version)
                 .coerceAtMost(21)
 
-        // Ensure metadata reflects the version we'll write into the header
         meta?.featureLevel = targetVersion
 
         // Each section's `write()` does placeholder-then-back-fill of its size field, so it
@@ -429,7 +401,6 @@ data class ManifestMeta(
             writeFString(buffer, uninstallActionArgs)
         }
 
-        // Update size
         val endPos = buffer.position()
         val size = endPos - startPos
         buffer.putInt(sizePos, size)
@@ -491,7 +462,6 @@ data class ChunkDataList(
                 buffer.get(chunk.shaHash)
             }
 
-            // Group numbers (8-bit each)
             cdl.elements.forEach { chunk ->
                 chunk.groupNum = buffer.get().toInt() and 0xFF
             }
@@ -545,7 +515,6 @@ data class ChunkDataList(
             buffer.put(chunk.shaHash)
         }
 
-        // Group numbers (8-bit each)
         elements.forEach { chunk ->
             buffer.put(chunk.groupNum.toByte())
         }
@@ -560,7 +529,6 @@ data class ChunkDataList(
             buffer.putLong(chunk.fileSize)
         }
 
-        // Update size
         val endPos = buffer.position()
         val size = endPos - startPos
         buffer.putInt(sizePos, size)
@@ -798,12 +766,10 @@ data class FileManifestList(
                 val partSizePos = buffer.position()
                 buffer.putInt(0)
 
-                // Write part data
                 part.guid.forEach { buffer.putInt(it) }
                 buffer.putInt(part.offset)
                 buffer.putInt(part.size)
 
-                // Update part size
                 val partEndPos = buffer.position()
                 val partSize = partEndPos - partStartPos
                 buffer.putInt(partSizePos, partSize)
@@ -832,7 +798,6 @@ data class FileManifestList(
             }
         }
 
-        // Update size
         val endPos = buffer.position()
         val size = endPos - startPos
         buffer.putInt(sizePos, size)
@@ -931,7 +896,6 @@ data class CustomFields(
                 val version = buffer.get() // version byte — must be read to match write() layout
                 val count = buffer.int
 
-                // write all keys first, then all values (not interleaved key/value pairs)
                 val keys = Array(count) { readFString(buffer) }
                 val values = Array(count) { readFString(buffer) }
                 keys.forEachIndexed { i, key -> cf[key] = values[i] }
@@ -953,11 +917,9 @@ data class CustomFields(
         buffer.put(0) // version byte — omitting it shifts all subsequent reads by 1 byte
         buffer.putInt(fields.size)
 
-        // write all keys first, then all values (not interleaved key/value pairs)
         fields.keys.forEach { key -> writeFString(buffer, key) }
         fields.values.forEach { value -> writeFString(buffer, value) }
 
-        // Update size
         val endPos = buffer.position()
         val size = endPos - startPos
         buffer.putInt(startPos, size)
@@ -1006,7 +968,6 @@ private fun writeFString(
         return
     }
 
-    // Check if ASCII is sufficient
     val isAscii = str.all { it.code < 128 }
 
     if (isAscii) {
diff --git a/app/src/main/feature/stores/epic/service/manifest/JsonManifestParser.kt b/app/src/main/feature/stores/epic/service/manifest/JsonManifestParser.kt
index 7ac1226cf..b88723b4e 100644
--- a/app/src/main/feature/stores/epic/service/manifest/JsonManifestParser.kt
+++ b/app/src/main/feature/stores/epic/service/manifest/JsonManifestParser.kt
@@ -28,7 +28,6 @@ class JsonManifestParser {
             manifest.version = blobToNum(json.optString("ManifestFileVersion", "013000000000"))
             manifest.storedAs = 0 // JSON manifests are never compressed
 
-            // Parse components
             manifest.meta = parseManifestMeta(json)
             manifest.chunkDataList = parseChunkDataList(json, manifest.version)
             manifest.fileManifestList = parseFileManifestList(json)
@@ -105,17 +104,14 @@ class JsonManifestParser {
                 // Parse file hash - each 3 digits represents a byte
                 fm.hash = blobToByteArray(fileJson.optString("FileHash", "0"), 20) // 160-bit SHA1
 
-                // Parse flags
                 var flags = 0
                 if (fileJson.optBoolean("bIsReadOnly", false)) flags = flags or 0x1
                 if (fileJson.optBoolean("bIsCompressed", false)) flags = flags or 0x2
                 if (fileJson.optBoolean("bIsUnixExecutable", false)) flags = flags or 0x4
                 fm.flags = flags
 
-                // Parse install tags
                 fm.installTags = jsonArrayToStringList(fileJson.optJSONArray("InstallTags"))
 
-                // Parse chunk parts
                 val chunkParts = fileJson.optJSONArray("FileChunkParts") ?: JSONArray()
                 var fileOffset = 0L
 
@@ -252,11 +248,9 @@ class JsonManifestParser {
          * Convert GUID hex string to int array
          */
         private fun guidFromJson(guidHex: String): IntArray {
-            // Remove any dashes and ensure it's 32 hex chars
             val cleanHex = guidHex.replace("-", "")
             val bytes = hexStringToByteArray(cleanHex)
 
-            // Convert to big-endian int array (4 ints)
             val buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN)
             return IntArray(4) { buffer.int }
         }
diff --git a/app/src/main/feature/stores/epic/service/manifest/ManifestUtils.kt b/app/src/main/feature/stores/epic/service/manifest/ManifestUtils.kt
index ea8b036b7..831b4a0dd 100644
--- a/app/src/main/feature/stores/epic/service/manifest/ManifestUtils.kt
+++ b/app/src/main/feature/stores/epic/service/manifest/ManifestUtils.kt
@@ -199,7 +199,6 @@ object ManifestUtils {
         val modified = mutableListOf<Pair<FileManifest, FileManifest>>()
         val unchanged = mutableListOf<FileManifest>()
 
-        // Find added and modified files
         newFiles.forEach { (filename, newFile) ->
             val oldFile = oldFiles[filename]
             when {
@@ -209,7 +208,6 @@ object ManifestUtils {
             }
         }
 
-        // Find removed files
         oldFiles.forEach { (filename, oldFile) ->
             if (!newFiles.containsKey(filename)) {
                 removed.add(oldFile)
diff --git a/app/src/main/feature/stores/epic/ui/auth/EpicOAuthActivity.kt b/app/src/main/feature/stores/epic/ui/auth/EpicOAuthActivity.kt
index 74f47b98a..0c5620357 100644
--- a/app/src/main/feature/stores/epic/ui/auth/EpicOAuthActivity.kt
+++ b/app/src/main/feature/stores/epic/ui/auth/EpicOAuthActivity.kt
@@ -1,4 +1,5 @@
 package com.winlator.cmod.feature.stores.epic.ui.auth
+
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
@@ -14,12 +15,7 @@ import com.winlator.cmod.shared.android.FixedFontScaleComponentActivity
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import timber.log.Timber
 
-/**
- * Epic OAuth Activity that hosts a WebView and automatically captures
- * the authorization code. Epic returns the code in the redirect page body as JSON
- * ({"authorizationCode":"...", ...}), not in the URL – so we read the body via JS.
- * Uses a per-session state parameter for CSRF protection.
- */
+// Captures Epic OAuth codes from redirect URLs or the JSON redirect body.
 class EpicOAuthActivity : FixedFontScaleComponentActivity() {
     companion object {
         const val EXTRA_AUTH_CODE = "auth_code"
@@ -42,7 +38,6 @@ class EpicOAuthActivity : FixedFontScaleComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // Check if URL was passed from intent (e.g., from WineRequestComponent)
         val gameAuthUrl = intent.getStringExtra(EXTRA_GAME_AUTH_URL)
 
         val (authUrl, state) =
@@ -55,7 +50,6 @@ class EpicOAuthActivity : FixedFontScaleComponentActivity() {
                     EpicConstants.LoginUrlWithState()
                 }
             } else if (gameAuthUrl != null) {
-                // Use the URL passed from intent (e.g., from WineRequestComponent)
                 gameAuthUrl to ""
             } else {
                 EpicConstants.LoginUrlWithState()
@@ -80,7 +74,6 @@ class EpicOAuthActivity : FixedFontScaleComponentActivity() {
                             }
                             val code = extractAuthCode(currentUrl)
                             if (code != null) finishWithCode(code)
-                            // else: URL has no code param; we'll get it from page body in onPageFinished
                         }
                     },
                     onPageFinished = { url, webView ->
@@ -138,7 +131,7 @@ class EpicOAuthActivity : FixedFontScaleComponentActivity() {
             null
         }
 
-    /** evaluateJavascript returns a JSON-encoded string (e.g. "\"ef444d3a...\""). Strip quotes and unescape. */
+    // evaluateJavascript returns a JSON-encoded string.
     private fun unquoteJsonString(jsResult: String?): String? {
         if (jsResult.isNullOrBlank()) return null
         val raw = jsResult.trim()
diff --git a/app/src/main/feature/stores/epic/ui/component/dialog/AuthWebViewDialog.kt b/app/src/main/feature/stores/epic/ui/component/dialog/AuthWebViewDialog.kt
index 322c19f48..51bdfccca 100644
--- a/app/src/main/feature/stores/epic/ui/component/dialog/AuthWebViewDialog.kt
+++ b/app/src/main/feature/stores/epic/ui/component/dialog/AuthWebViewDialog.kt
@@ -106,7 +106,6 @@ fun AuthWebViewDialog(
                                         ViewGroup.LayoutParams.MATCH_PARENT,
                                     )
 
-                                // OAuth WebView settings (secure defaults for GOG/Epic etc.)
                                 settings.apply {
                                     javaScriptEnabled = true
                                     domStorageEnabled = true
@@ -115,13 +114,11 @@ fun AuthWebViewDialog(
                                     builtInZoomControls = true
                                     displayZoomControls = false
                                     setSupportZoom(true)
-                                    // Secure defaults: no file/content access to limit OAuth surface
                                     allowFileAccess = false
                                     allowContentAccess = false
                                     mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW
                                 }
 
-                                // Use custom WebViewClient if provided, otherwise use default
                                 webViewClient = customWebViewClient ?: object : WebViewClient() {
                                     private fun handleUrl(url: String?) {
                                         Timber.d("Auth WebView navigating to: ${redactUrlForLogging(url)}")
diff --git a/app/src/main/feature/stores/gog/api/GOGApiClient.kt b/app/src/main/feature/stores/gog/api/GOGApiClient.kt
index 89dad3bbb..ae7ec96a2 100644
--- a/app/src/main/feature/stores/gog/api/GOGApiClient.kt
+++ b/app/src/main/feature/stores/gog/api/GOGApiClient.kt
@@ -1,4 +1,5 @@
 package com.winlator.cmod.feature.stores.gog.api
+
 import android.content.Context
 import com.winlator.cmod.feature.stores.gog.service.GOGAuthManager
 import com.winlator.cmod.feature.stores.steam.utils.Net
@@ -11,11 +12,7 @@ import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/**
- * Native Kotlin API client for GOG Content System
- *
- * Replaces Python GOGDL API calls with direct HTTP requests
- */
+// Native HTTP client for the GOG content system.
 @Singleton
 class GOGApiClient
     @Inject
@@ -30,8 +27,6 @@ class GOGApiClient
 
         private val httpClient = Net.http
 
-        // TODO: Compose any functions to reduce DRYNESS.
-
         /**
          * Get available builds for a game.
          *
@@ -462,7 +457,6 @@ class GOGApiClient
                         return@withContext Result.failure(Exception("Not authenticated"))
                     }
 
-                    // Build secure link URL based on generation
                     var url =
                         if (generation == 2) {
                             "$GOG_CONTENT_SYSTEM/products/$productId/secure_link?_version=2&generation=2&path=$path"
@@ -470,7 +464,6 @@ class GOGApiClient
                             "$GOG_CONTENT_SYSTEM/products/$productId/secure_link?_version=2&type=depot&path=$path"
                         }
 
-                    // Add root parameter if provided (for patches)
                     if (root != null) {
                         url += "&root=$root"
                     }
diff --git a/app/src/main/feature/stores/gog/api/GOGDataModels.kt b/app/src/main/feature/stores/gog/api/GOGDataModels.kt
index b5fc0962b..deaac8533 100644
--- a/app/src/main/feature/stores/gog/api/GOGDataModels.kt
+++ b/app/src/main/feature/stores/gog/api/GOGDataModels.kt
@@ -97,8 +97,7 @@ data class DependencyDepot(
     val size: Long,
 )
 
-// repository Manifest is a URL that will give back a compressed zlib JSON
-// generation is always 2 since we always use Generation 2 in the URL
+// GOG dependency manifests are zlib-compressed JSON from the generation 2 repository.
 data class GOGDependencyManifestMeta(
     val depots: List<DependencyDepot>,
 ) {
@@ -111,7 +110,6 @@ data class GOGDependencyManifestMeta(
                 for (i in 0 until depotsArray.length()) {
                     val depotObj = depotsArray.getJSONObject(i)
 
-                    // Parse Languages for this depot
                     val languagesArray = depotObj.optJSONArray("languages")
                     val languages = mutableListOf<String>()
                     if (languagesArray != null) {
@@ -120,7 +118,6 @@ data class GOGDependencyManifestMeta(
                         }
                     }
 
-                    // Parse bitness for this depot
                     val bitnessArray = depotObj.optJSONArray("osBitness")
                     val osBitness =
                         if (bitnessArray != null) {
@@ -133,7 +130,6 @@ data class GOGDependencyManifestMeta(
                             null
                         }
 
-                    // Parse executable for this depot
                     val executableObj = depotObj.optJSONObject("executable")
                     val executable =
                         if (executableObj != null) {
@@ -479,13 +475,10 @@ data class SecureLinksResponse(
                 for (i in 0 until urlsArray.length()) {
                     val urlObj = urlsArray.optJSONObject(i)
                     if (urlObj != null) {
-                        // GOG returns URL objects with url_format template and parameters
-                        // We need to merge them: {base_url}/token=nva={expires_at}... etc.
                         val urlFormat = urlObj.optString("url_format", "")
                         val paramsObj = urlObj.optJSONObject("parameters")
 
                         if (urlFormat.isNotEmpty() && paramsObj != null) {
-                            // Replace all {param} placeholders with actual values
                             var constructedUrl = urlFormat
                             val keys = paramsObj.keys()
                             while (keys.hasNext()) {
@@ -494,7 +487,6 @@ data class SecureLinksResponse(
                                 constructedUrl = constructedUrl.replace("{$key}", value)
                             }
 
-                            // Clean up escaped slashes from JSON
                             constructedUrl = constructedUrl.replace("\\/", "/")
 
                             if (constructedUrl.isNotEmpty()) {
diff --git a/app/src/main/feature/stores/gog/api/GOGManifestParser.kt b/app/src/main/feature/stores/gog/api/GOGManifestParser.kt
index 76bd3a924..31d237ce8 100644
--- a/app/src/main/feature/stores/gog/api/GOGManifestParser.kt
+++ b/app/src/main/feature/stores/gog/api/GOGManifestParser.kt
@@ -185,14 +185,20 @@ class GOGManifestParser
          * Calculate total download size across multiple depot files
          *
          * @param files List of depot files
-         * @return Total compressed size in bytes
+         * @return Total compressed size in bytes, counting shared chunks once
          */
-        fun calculateTotalSize(files: List<DepotFile>): Long =
-            files.sumOf { file ->
-                file.chunks.sumOf { chunk ->
-                    chunk.compressedSize ?: chunk.size
+        fun calculateTotalSize(files: List<DepotFile>): Long {
+            val seen = mutableSetOf<String>()
+            var total = 0L
+            files.forEach { file ->
+                file.chunks.forEach { chunk ->
+                    if (seen.add(chunk.compressedMd5)) {
+                        total += (chunk.compressedSize ?: chunk.size).coerceAtLeast(0L)
+                    }
                 }
             }
+            return total
+        }
 
         /**
          * Calculate total uncompressed size
@@ -240,7 +246,6 @@ class GOGManifestParser
             // Use the first (highest priority) CDN URL as base
             val baseCdnUrl = baseUrls.first()
 
-            // Build full URL for each chunk: baseUrl/aa/bb/aabbccdd...
             // Where aa/bb are first 4 chars of MD5 hash
             return chunks.associateWith { chunkMd5 ->
                 if (chunkMd5.length >= 4) {
@@ -285,15 +290,21 @@ class GOGManifestParser
                 // Use the first (highest priority) CDN URL for this product
                 val baseCdnUrl = productUrls.first()
 
-                // Build full URL for chunk: baseUrl/aa/bb/aabbccdd...
                 // Where aa/bb are first 4 chars of MD5 hash
-                val chunkUrl =
+                val chunkSuffix =
                     if (chunkMd5.length >= 4) {
                         val first2 = chunkMd5.substring(0, 2)
                         val next2 = chunkMd5.substring(2, 4)
-                        "$baseCdnUrl/$first2/$next2/$chunkMd5"
+                        "/$first2/$next2/$chunkMd5"
+                    } else {
+                        "/$chunkMd5"
+                    }
+                val queryIndex = baseCdnUrl.indexOf('?')
+                val chunkUrl =
+                    if (queryIndex >= 0) {
+                        baseCdnUrl.substring(0, queryIndex) + chunkSuffix + baseCdnUrl.substring(queryIndex)
                     } else {
-                        "$baseCdnUrl/$chunkMd5"
+                        baseCdnUrl + chunkSuffix
                     }
 
                 chunkUrlMap[chunkMd5] = chunkUrl
diff --git a/app/src/main/feature/stores/gog/data/GOGGame.kt b/app/src/main/feature/stores/gog/data/GOGGame.kt
index 3f3d70a2e..e262a7a0a 100644
--- a/app/src/main/feature/stores/gog/data/GOGGame.kt
+++ b/app/src/main/feature/stores/gog/data/GOGGame.kt
@@ -27,6 +27,8 @@ data class GOGGame(
     val installPath: String = "",
     @ColumnInfo("image_url")
     val imageUrl: String = "",
+    @ColumnInfo("hero_image_url")
+    val heroImageUrl: String = "",
     @ColumnInfo("icon_url")
     val iconUrl: String = "",
     @ColumnInfo("description")
@@ -71,3 +73,11 @@ data class GOGDownloadInfo(
     val isPaused: Boolean = false,
     val error: String? = null,
 )
+
+data class GOGDlcInfo(
+    val id: String,
+    val title: String,
+    val downloadSize: Long = 0,
+    val installSize: Long = 0,
+    val isInstalled: Boolean = false,
+)
diff --git a/app/src/main/feature/stores/gog/service/GOGApiClient.kt b/app/src/main/feature/stores/gog/service/GOGApiClient.kt
index 00904e25c..fe47d5f1e 100644
--- a/app/src/main/feature/stores/gog/service/GOGApiClient.kt
+++ b/app/src/main/feature/stores/gog/service/GOGApiClient.kt
@@ -1,4 +1,5 @@
 package com.winlator.cmod.feature.stores.gog.service
+
 import android.content.Context
 import com.winlator.cmod.feature.stores.gog.data.GOGGame
 import kotlinx.coroutines.Dispatchers
@@ -10,14 +11,13 @@ import org.json.JSONObject
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
-/**
- * Parsed/Formartted details returned by GOGApiClient.
- */
+// Parsed game details returned by GOGApiClient.
 data class ParsedGogGame(
     val id: String,
     val title: String,
     val slug: String,
     val imageUrl: String,
+    val heroImageUrl: String,
     val iconUrl: String,
     val developer: String,
     val publisher: String,
@@ -30,9 +30,7 @@ data class ParsedGogGame(
     val isDlc: Boolean,
 )
 
-/**
- * Raw API Response details from gameDetails endpoint (Used for reference)
- */
+// Raw gameDetails API response shape.
 data class RawGogApiResponse(
     val id: String?,
     val title: String?,
@@ -47,6 +45,7 @@ data class RawGogApiResponse(
     val downloads: Downloads?,
 ) {
     data class Images(
+        val background: String?,
         val logo2x: String?,
         val logo: String?,
         val icon: String?,
@@ -77,6 +76,11 @@ data class RawGogApiResponse(
     )
 }
 
+data class GOGCloudCredentials(
+    val clientId: String,
+    val clientSecret: String,
+)
+
 /**
  * Direct HTTP client for GOG API operations.
  * Uses GOGAuthManager for authentication tokens.
@@ -104,7 +108,6 @@ object GOGApiClient {
             try {
                 Timber.tag("GOG").d("Fetching GOG game IDs...")
 
-                // Get credentials from AuthManager
                 val credentialsResult = GOGAuthManager.getStoredCredentials(context)
                 if (credentialsResult.isFailure) {
                     val error = credentialsResult.exceptionOrNull()
@@ -145,7 +148,6 @@ object GOGApiClient {
                         return@withContext Result.failure(Exception("Empty response from GOG"))
                     }
 
-                    // Parse JSON response
                     val userData = JSONObject(responseBody)
                     val ownedGames = userData.optJSONArray("owned") ?: JSONArray()
 
@@ -185,7 +187,6 @@ object GOGApiClient {
             try {
                 Timber.tag("GOG").d("Fetching game details for gameId: $gameId")
 
-                // Get credentials from AuthManager
                 val credentialsResult = GOGAuthManager.getStoredCredentials(context)
                 if (credentialsResult.isFailure) {
                     val error = credentialsResult.exceptionOrNull()
@@ -199,7 +200,6 @@ object GOGApiClient {
                     return@withContext Result.failure(Exception("No valid credentials found"))
                 }
 
-                // Build URL with expanded fields
                 val expandedParam =
                     if (expanded.isNotEmpty()) {
                         "?expand=${expanded.joinToString(",")}"
@@ -250,24 +250,23 @@ object GOGApiClient {
         }
 
     /**
-     * Fetch client secret from GOG build metadata API
-     * @param gameId GOG game ID
-     * @param installPath Game install path (for platform detection, defaults to "windows")
-     * @return Client secret string, or null if not found
+     * Fetch Galaxy cloud-save credentials from GOG build metadata.
+     *
+     * Newer game info files can omit clientId, so both clientId and clientSecret
+     * are read from the content-system manifest when available.
      */
-    suspend fun getClientSecret(
+    suspend fun getCloudCredentials(
         context: Context,
         gameId: String,
         installPath: String?,
-    ): String? =
+    ): GOGCloudCredentials? =
         withContext(Dispatchers.IO) {
             try {
-                val platform = "windows" // For now, assume Windows (proton)
+                val platform = "windows"
                 val buildsUrl = "https://content-system.gog.com/products/$gameId/os/$platform/builds?generation=2"
 
                 Timber.tag("GOG").d("[Cloud Saves] Fetching build metadata from: $buildsUrl")
 
-                // Get credentials for API authentication
                 val credentials = GOGAuthManager.getStoredCredentials(context).getOrNull()
                 if (credentials == null) {
                     Timber.tag("GOG").w("[Cloud Saves] No credentials available for build metadata fetch")
@@ -292,7 +291,6 @@ object GOGApiClient {
                         val jsonStr = response.body?.string() ?: ""
                         val buildsJson = JSONObject(jsonStr)
 
-                        // Get first build
                         val items = buildsJson.optJSONArray("items")
                         if (items == null || items.length() == 0) {
                             Timber.tag("GOG").w("[Cloud Saves] No builds found for game $gameId")
@@ -389,22 +387,64 @@ object GOGApiClient {
                     Timber.tag("GOG").d("[Cloud Saves] Parsing manifest JSON (${manifestStr.take(100)}...)")
                     val manifestJson = JSONObject(manifestStr)
 
-                    // Extract clientSecret from manifest
-                    val clientSecret = manifestJson.optString("clientSecret", "")
+                    val clientId = manifestJson.findStringValue("clientId", "client_id")
+                    val clientSecret = manifestJson.findStringValue("clientSecret", "client_secret")
+                    if (clientId.isEmpty()) {
+                        Timber.tag("GOG").w("[Cloud Saves] No clientId in manifest for game $gameId")
+                    }
                     if (clientSecret.isEmpty()) {
                         Timber.tag("GOG").w("[Cloud Saves] No clientSecret in manifest for game $gameId")
+                    }
+                    if (clientId.isEmpty() && clientSecret.isEmpty()) {
                         return@withContext null
                     }
 
-                    Timber.tag("GOG").d("[Cloud Saves] Successfully retrieved clientSecret for game $gameId")
-                    return@withContext clientSecret
+                    Timber.tag("GOG").d("[Cloud Saves] Successfully retrieved cloud credentials for game $gameId")
+                    return@withContext GOGCloudCredentials(clientId, clientSecret)
                 }
             } catch (e: Exception) {
-                Timber.tag("GOG").e(e, "[Cloud Saves] Failed to get clientSecret for game $gameId")
+                Timber.tag("GOG").e(e, "[Cloud Saves] Failed to get cloud credentials for game $gameId")
                 return@withContext null
             }
         }
 
+    /**
+     * Fetch client secret from GOG build metadata API.
+     */
+    suspend fun getClientSecret(
+        context: Context,
+        gameId: String,
+        installPath: String?,
+    ): String? =
+        getCloudCredentials(context, gameId, installPath)
+            ?.clientSecret
+            ?.takeIf { it.isNotEmpty() }
+
+    private fun JSONObject.findStringValue(vararg names: String): String {
+        for (name in names) {
+            optString(name, "").takeIf { it.isNotEmpty() }?.let { return it }
+        }
+
+        val iterator = keys()
+        while (iterator.hasNext()) {
+            when (val value = opt(iterator.next())) {
+                is JSONObject -> value.findStringValue(*names).takeIf { it.isNotEmpty() }?.let { return it }
+                is JSONArray -> value.findStringValue(*names).takeIf { it.isNotEmpty() }?.let { return it }
+            }
+        }
+        return ""
+    }
+
+    private fun JSONArray.findStringValue(vararg names: String): String {
+        for (i in 0 until length()) {
+            when (val value = opt(i)) {
+                is JSONObject -> value.findStringValue(*names).takeIf { it.isNotEmpty() }?.let { return it }
+                is JSONArray -> value.findStringValue(*names).takeIf { it.isNotEmpty() }?.let { return it }
+            }
+        }
+        return ""
+    }
+
     /**
      * Transform raw GOG API response into better format. Based on GOGDL implementation
      *
@@ -416,19 +456,15 @@ object GOGApiClient {
         rawResponse: JSONObject,
         gameId: String,
     ): ParsedGogGame {
-        // Extract image URLs and add https: protocol if missing
         val images = rawResponse.optJSONObject("images")
-        var logo2x = images?.optString("logo2x", "") ?: ""
-        var logo = images?.optString("logo", "") ?: ""
-        var icon = images?.optString("icon", "") ?: ""
-
-        if (logo2x.startsWith("//")) logo2x = "https:$logo2x"
-        if (logo.startsWith("//")) logo = "https:$logo"
-        if (icon.startsWith("//")) icon = "https:$icon"
+        val background = normalizeImageUrl(images?.optString("background", "") ?: "")
+        val logo2x = normalizeImageUrl(images?.optString("logo2x", "") ?: "")
+        val logo = normalizeImageUrl(images?.optString("logo", "") ?: "")
+        val icon = normalizeImageUrl(images?.optString("icon", "") ?: "")
 
         val imageUrl = logo2x.ifEmpty { logo }
+        val heroImageUrl = background.ifEmpty { getScreenshotHeroUrl(rawResponse) }
 
-        // Extract developer (first from array)
         val developers = rawResponse.optJSONArray("developers")
         val developer =
             if (developers != null && developers.length() > 0) {
@@ -437,7 +473,6 @@ object GOGApiClient {
                 ""
             }
 
-        // Extract publisher (can be object or string)
         val publisherObj = rawResponse.opt("publisher")
         val publisher =
             when (publisherObj) {
@@ -446,7 +481,6 @@ object GOGApiClient {
                 else -> ""
             }
 
-        // Extract genres (array of objects with name field)
         val genresArray = rawResponse.optJSONArray("genres")
         val genres = mutableListOf<String>()
         if (genresArray != null) {
@@ -464,7 +498,6 @@ object GOGApiClient {
             }
         }
 
-        // Extract language codes (keys from object)
         val languages = mutableListOf<String>()
         val langObj = rawResponse.optJSONObject("languages")
         if (langObj != null) {
@@ -474,7 +507,6 @@ object GOGApiClient {
             }
         }
 
-        // Extract description from nested structure
         val descriptionObj = rawResponse.opt("description")
         val description =
             when (descriptionObj) {
@@ -483,7 +515,6 @@ object GOGApiClient {
                 else -> ""
             }
 
-        // Extract download size from first installer
         val downloads = rawResponse.optJSONObject("downloads")
         // Used in GOG Galaxy to hide specific entitlements
         val isSecret = rawResponse.optBoolean("is_secret", false)
@@ -504,6 +535,7 @@ object GOGApiClient {
             title = rawResponse.optString("title", "Unknown"),
             slug = rawResponse.optString("slug", ""),
             imageUrl = imageUrl,
+            heroImageUrl = heroImageUrl,
             iconUrl = icon,
             developer = developer,
             publisher = publisher,
@@ -516,4 +548,28 @@ object GOGApiClient {
             isDlc = isDlc,
         )
     }
+
+    private fun normalizeImageUrl(url: String): String =
+        when {
+            url.startsWith("//") -> "https:$url"
+            else -> url
+        }
+
+    private fun getScreenshotHeroUrl(rawResponse: JSONObject): String {
+        val screenshots = rawResponse.optJSONArray("screenshots") ?: return ""
+        for (i in 0 until screenshots.length()) {
+            val screenshot = screenshots.optJSONObject(i) ?: continue
+            val formattedImages = screenshot.optJSONArray("formatted_images") ?: continue
+            val preferredNames = listOf("ggvgl_2x", "ggvgl", "ggvgm_2x", "ggvgm")
+            for (preferredName in preferredNames) {
+                for (j in 0 until formattedImages.length()) {
+                    val image = formattedImages.optJSONObject(j) ?: continue
+                    if (image.optString("formatter_name") == preferredName) {
+                        return normalizeImageUrl(image.optString("image_url", ""))
+                    }
+                }
+            }
+        }
+        return ""
+    }
 }
diff --git a/app/src/main/feature/stores/gog/service/GOGAuthManager.kt b/app/src/main/feature/stores/gog/service/GOGAuthManager.kt
index feaedf045..96d227017 100644
--- a/app/src/main/feature/stores/gog/service/GOGAuthManager.kt
+++ b/app/src/main/feature/stores/gog/service/GOGAuthManager.kt
@@ -56,7 +56,6 @@ object GOGAuthManager {
         return try {
             Timber.tag("GOG").i("Starting GOG authentication with authorization code...")
 
-            // Extract the actual authorization code from URL if needed
             val actualCode = extractCodeFromInput(authorizationCode)
             if (actualCode.isEmpty()) {
                 return Result.failure(Exception("Invalid authorization URL: no code parameter found"))
@@ -110,14 +109,12 @@ object GOGAuthManager {
                     JSONObject(responseBody)
                 }
 
-            // Check for error in response
             if (tokenJson.has("error")) {
                 val errorMsg = tokenJson.optString("error_description", "Authentication failed")
                 Timber.tag("GOG").e("GOG authentication failed: $errorMsg")
                 return Result.failure(Exception("Authentication failed: $errorMsg"))
             }
 
-            // Extract credentials from response
             val accessToken = tokenJson.optString("access_token", "")
             val refreshToken = tokenJson.optString("refresh_token", "")
             val userId = tokenJson.optString("user_id", "")
@@ -128,7 +125,6 @@ object GOGAuthManager {
                 return Result.failure(Exception("Authentication incomplete: missing required data"))
             }
 
-            // Create credentials object
             val credentials =
                 GOGCredentials(
                     accessToken = accessToken,
@@ -178,19 +174,16 @@ object GOGAuthManager {
                 return Result.failure(Exception("No stored credentials found"))
             }
 
-            // Read credentials from file (IO dispatcher)
             val authFile = File(authConfigPath)
             val authContent = withContext(Dispatchers.IO) { authFile.readText() }
             val authJson = JSONObject(authContent)
 
-            // Get Galaxy app credentials
             if (!authJson.has(GOGConstants.GOG_CLIENT_ID)) {
                 return Result.failure(Exception("No Galaxy credentials found"))
             }
 
             val credentialsJson = authJson.getJSONObject(GOGConstants.GOG_CLIENT_ID)
 
-            // Check if expired
             val loginTime = credentialsJson.optDouble("loginTime", 0.0)
             val expiresIn = credentialsJson.optInt("expires_in", 0)
             val isExpired = System.currentTimeMillis() / 1000.0 >= loginTime + expiresIn
@@ -206,7 +199,6 @@ object GOGAuthManager {
                 return getStoredCredentials(context)
             }
 
-            // Return valid credentials
             val credentials =
                 GOGCredentials(
                     accessToken = credentialsJson.getString("access_token"),
@@ -247,17 +239,14 @@ object GOGAuthManager {
             val authContent = withContext(Dispatchers.IO) { authFile.readText() }
             val authJson = JSONObject(authContent)
 
-            // Check if we already have credentials for this game
             if (authJson.has(clientId)) {
                 val gameCredentials = authJson.getJSONObject(clientId)
 
-                // Check if expired
                 val loginTime = gameCredentials.optDouble("loginTime", 0.0)
                 val expiresIn = gameCredentials.optInt("expires_in", 0)
                 val isExpired = System.currentTimeMillis() / 1000.0 >= loginTime + expiresIn
 
                 if (!isExpired) {
-                    // Return existing valid credentials
                     return Result.success(
                         GOGCredentials(
                             accessToken = gameCredentials.getString("access_token"),
@@ -401,7 +390,6 @@ object GOGAuthManager {
                 return Result.failure(Exception("No stored credentials found"))
             }
 
-            // Read current credentials
             val authContent = withContext(Dispatchers.IO) { authFile.readText() }
             val authJson = JSONObject(authContent)
 
@@ -472,7 +460,6 @@ object GOGAuthManager {
      */
     fun extractCodeFromInput(input: String): String =
         if (input.startsWith("http")) {
-            // Extract code parameter from URL
             val codeParam = input.substringAfter("code=", "")
             if (codeParam.isEmpty()) {
                 ""
diff --git a/app/src/main/feature/stores/gog/service/GOGCloudHistoryProvider.kt b/app/src/main/feature/stores/gog/service/GOGCloudHistoryProvider.kt
new file mode 100644
index 000000000..3c2e95d7a
--- /dev/null
+++ b/app/src/main/feature/stores/gog/service/GOGCloudHistoryProvider.kt
@@ -0,0 +1,90 @@
+package com.winlator.cmod.feature.stores.gog.service
+
+import android.content.Context
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupHistoryEntry
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupOrigin
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupStorage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+// GOG cloud storage has no per-snapshot history — entries mirror live cloud files
+// and "restore" pulls the full current cloud state into the local save dir.
+object GOGCloudHistoryProvider {
+    private const val TAG = "GOGCloudHistory"
+    private const val LABEL_PREFS = "gog_cloud_history_labels"
+
+    suspend fun listCloudSaveGroups(
+        context: Context,
+        gameId: String,
+        targetContainerId: Int? = null,
+    ): List<BackupHistoryEntry> =
+        withContext(Dispatchers.IO) {
+            try {
+                val labelPrefs = context.getSharedPreferences(LABEL_PREFS, Context.MODE_PRIVATE)
+                val normalizedAppId = if (gameId.startsWith("GOG_", ignoreCase = true)) gameId else "GOG_$gameId"
+                GOGService
+                    .listCloudSaveHistory(context, normalizedAppId, targetContainerId)
+                    .map { entry ->
+                        val fileId = encodeFileId(normalizedAppId, entry.locationName, entry.relativePath)
+                        val displayName =
+                            if (entry.locationName == "__default") {
+                                entry.relativePath
+                            } else {
+                                "${entry.locationName}/${entry.relativePath}"
+                            }
+                        BackupHistoryEntry(
+                            fileId = fileId,
+                            fileName = displayName,
+                            timestampMs = entry.timestampMs,
+                            origin = BackupOrigin.CLOUD,
+                            // GOG's listing API doesn't return file size; HEAD per object is too expensive.
+                            sizeBytes = 0L,
+                            label = labelPrefs.getString(fileId, null),
+                            storage = BackupStorage.GOG_CLOUD,
+                        )
+                    }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "listCloudSaveGroups failed for gameId=%s", gameId)
+                emptyList()
+            }
+        }
+
+    suspend fun restoreSaveGroup(
+        context: Context,
+        gameId: String,
+        targetContainerId: Int? = null,
+    ): BackupResult =
+        withContext(Dispatchers.IO) {
+            try {
+                val normalizedAppId = if (gameId.startsWith("GOG_", ignoreCase = true)) gameId else "GOG_$gameId"
+                val ok = GOGService.syncCloudSaves(context, normalizedAppId, "download", targetContainerId)
+                if (ok) {
+                    BackupResult(true, "Restored GOG cloud saves.")
+                } else {
+                    BackupResult(false, "GOG cloud restore failed.")
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "restoreSaveGroup failed for gameId=%s", gameId)
+                BackupResult(false, "Restore failed: ${e.message}")
+            }
+        }
+
+    fun setLabel(
+        context: Context,
+        groupFileId: String,
+        label: String?,
+    ) {
+        val prefs = context.getSharedPreferences(LABEL_PREFS, Context.MODE_PRIVATE)
+        val edit = prefs.edit()
+        if (label.isNullOrEmpty()) edit.remove(groupFileId) else edit.putString(groupFileId, label)
+        edit.apply()
+    }
+
+    private fun encodeFileId(
+        appId: String,
+        locationName: String,
+        relativePath: String,
+    ): String = "$appId|$locationName|$relativePath"
+}
diff --git a/app/src/main/feature/stores/gog/service/GOGCloudSavesManager.kt b/app/src/main/feature/stores/gog/service/GOGCloudSavesManager.kt
index 755571205..686d99fed 100644
--- a/app/src/main/feature/stores/gog/service/GOGCloudSavesManager.kt
+++ b/app/src/main/feature/stores/gog/service/GOGCloudSavesManager.kt
@@ -2,20 +2,26 @@ package com.winlator.cmod.feature.stores.gog.service
 import android.content.Context
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONArray
 import timber.log.Timber
+import java.io.ByteArrayInputStream
 import java.io.File
-import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.security.MessageDigest
 import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.concurrent.TimeUnit
+import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 
 class GOGCloudSavesManager(
     private val context: Context,
@@ -32,6 +38,7 @@ class GOGCloudSavesManager(
         private const val USER_AGENT =
             "GOGGalaxyCommunicationService/2.0.13.27 (Windows_32bit) dont_sync_marker/true installation_source/gog"
         private const val DELETION_MD5 = "aadd86936a80ee8a369579c3926f1b3c"
+        private val GOG_TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
     }
 
     enum class SyncAction {
@@ -58,24 +65,18 @@ class GOGCloudSavesManager(
                     }
 
                     val timestamp = file.lastModified()
-                    val instant = Instant.ofEpochMilli(timestamp)
-                    updateTime = DateTimeFormatter.ISO_INSTANT.format(instant)
                     updateTimestamp = timestamp / 1000
-
-                    FileInputStream(file).use { fis ->
-                        val digest = MessageDigest.getInstance("MD5")
-                        val buffer = java.io.ByteArrayOutputStream()
-
-                        GZIPOutputStream(buffer).use { gzipOut ->
-                            val fileBuffer = ByteArray(8192)
-                            var bytesRead: Int
-                            while (fis.read(fileBuffer).also { bytesRead = it } != -1) {
-                                gzipOut.write(fileBuffer, 0, bytesRead)
-                            }
-                        }
-
-                        md5Hash = digest.digest(buffer.toByteArray()).joinToString("") { "%02x".format(it) }
-                    }
+                    updateTime =
+                        Instant
+                            .ofEpochSecond(updateTimestamp ?: 0L)
+                            .atOffset(ZoneOffset.UTC)
+                            .format(GOG_TIMESTAMP_FORMATTER)
+
+                    // Hash matches the Etag GOG stores: md5 of gzip(raw, level=6, mtime=0).
+                    val gzipped = gzipWithZeroMtime(file.readBytes())
+                    md5Hash = MessageDigest.getInstance("MD5")
+                        .digest(gzipped)
+                        .joinToString("") { "%02x".format(it) }
 
                     Timber.d("Calculated metadata for $relativePath: md5=$md5Hash, timestamp=$updateTimestamp")
                 } catch (e: Exception) {
@@ -94,21 +95,150 @@ class GOGCloudSavesManager(
             get() = md5Hash == DELETION_MD5
     }
 
+    private data class DownloadedObject(
+        val bytes: ByteArray,
+        val localLastModifiedMs: Long?,
+    )
+
     data class SyncClassifier(
         val updatedLocal: List<SyncFile> = emptyList(),
         val updatedCloud: List<CloudFile> = emptyList(),
         val notExistingLocally: List<CloudFile> = emptyList(),
         val notExistingRemotely: List<SyncFile> = emptyList(),
     ) {
-        fun determineAction(): SyncAction =
-            when {
-                updatedLocal.isEmpty() && updatedCloud.isNotEmpty() -> SyncAction.DOWNLOAD
-                updatedLocal.isNotEmpty() && updatedCloud.isEmpty() -> SyncAction.UPLOAD
-                updatedLocal.isEmpty() && updatedCloud.isEmpty() -> SyncAction.NONE
+        fun determineAction(): SyncAction {
+            val hasLocalChanges = updatedLocal.isNotEmpty() || notExistingRemotely.isNotEmpty()
+            val hasCloudChanges = updatedCloud.isNotEmpty() || notExistingLocally.isNotEmpty()
+            return when {
+                !hasLocalChanges && hasCloudChanges -> SyncAction.DOWNLOAD
+                hasLocalChanges && !hasCloudChanges -> SyncAction.UPLOAD
+                !hasLocalChanges && !hasCloudChanges -> SyncAction.NONE
                 else -> SyncAction.CONFLICT
             }
+        }
     }
 
+    suspend fun listCloudSaveFiles(
+        dirname: String,
+        clientId: String,
+        clientSecret: String,
+    ): List<CloudFile> =
+        withContext(Dispatchers.IO) {
+            if (clientSecret.isEmpty()) {
+                Timber.tag("GOG-CloudSaves").w("Cannot list cloud files for '$dirname': missing clientSecret")
+                return@withContext emptyList()
+            }
+            val credentials =
+                GOGAuthManager.getGameCredentials(context, clientId, clientSecret).getOrNull() ?: run {
+                    Timber.tag("GOG-CloudSaves").e("Failed to get game-specific credentials for cloud listing")
+                    return@withContext emptyList()
+                }
+            getCloudFiles(credentials.userId, clientId, dirname, credentials.accessToken)
+                .filter { !it.isDeleted }
+        }
+
+    suspend fun addCloudSaveFilesToZip(
+        zip: ZipOutputStream,
+        zipPrefix: String,
+        dirname: String,
+        clientId: String,
+        clientSecret: String,
+    ): Int =
+        withContext(Dispatchers.IO) {
+            if (clientSecret.isEmpty()) {
+                Timber.tag("GOG-CloudSaves").w("Cannot export cloud files for '$dirname': missing clientSecret")
+                return@withContext 0
+            }
+            val credentials =
+                GOGAuthManager.getGameCredentials(context, clientId, clientSecret).getOrNull() ?: run {
+                    Timber.tag("GOG-CloudSaves").e("Failed to get game-specific credentials for cloud export")
+                    return@withContext 0
+                }
+            val cloudFiles = getCloudFiles(credentials.userId, clientId, dirname, credentials.accessToken).filter { !it.isDeleted }
+            var exported = 0
+            for (file in cloudFiles) {
+                val downloaded = downloadObject(credentials.userId, clientId, dirname, file, credentials.accessToken) ?: continue
+                val entryName = safeZipEntryName(zipPrefix, file.relativePath) ?: continue
+                val entry =
+                    ZipEntry(entryName).apply {
+                        time = downloaded.localLastModifiedMs ?: file.updateTimestamp?.times(1000L) ?: System.currentTimeMillis()
+                    }
+                zip.putNextEntry(entry)
+                zip.write(downloaded.bytes)
+                zip.closeEntry()
+                exported++
+            }
+            exported
+        }
+
+    suspend fun needsSync(
+        localPath: String,
+        dirname: String,
+        clientId: String,
+        clientSecret: String,
+        lastSyncTimestamp: Long = 0,
+    ): Boolean = determineSyncAction(localPath, dirname, clientId, clientSecret, lastSyncTimestamp) != SyncAction.NONE
+
+    suspend fun determineSyncAction(
+        localPath: String,
+        dirname: String,
+        clientId: String,
+        clientSecret: String,
+        lastSyncTimestamp: Long = 0,
+        preferredAction: String = "auto",
+    ): SyncAction =
+        withContext(Dispatchers.IO) {
+            if (clientSecret.isEmpty()) {
+                Timber.tag("GOG-CloudSaves").w("Cannot probe cloud sync for '$dirname': missing clientSecret")
+                return@withContext SyncAction.NONE
+            }
+
+            val syncDir = File(localPath)
+            val localFiles = if (syncDir.exists()) scanLocalFiles(syncDir) else emptyList()
+            val credentials =
+                GOGAuthManager.getGameCredentials(context, clientId, clientSecret).getOrNull() ?: run {
+                    Timber.tag("GOG-CloudSaves").e("Failed to get game-specific credentials for sync probe")
+                    return@withContext SyncAction.NONE
+                }
+            val cloudFiles = getCloudFiles(credentials.userId, clientId, dirname, credentials.accessToken)
+            val downloadableCloud = cloudFiles.filter { !it.isDeleted }
+
+            if (preferredAction.equals("exit_upload", ignoreCase = true)) {
+                if (localFiles.isEmpty()) return@withContext SyncAction.NONE
+                if (cloudFiles.isEmpty()) return@withContext SyncAction.UPLOAD
+                val cloudByPath = cloudFiles.associateBy { it.relativePath }
+                val localPaths = localFiles.map { it.relativePath }.toSet()
+                val staleCloudFilesMissingLocally =
+                    cloudFiles.filter {
+                        !it.isDeleted &&
+                            it.relativePath !in localPaths &&
+                            (it.updateTimestamp ?: Long.MAX_VALUE) <= lastSyncTimestamp
+                    }
+                val anyLocalNewer =
+                        localFiles.any { local ->
+                            val cloud = cloudByPath[local.relativePath]
+                            val localTimestamp = local.updateTimestamp ?: 0L
+                            when {
+                                cloud == null -> localTimestamp > lastSyncTimestamp
+                                cloud.isDeleted -> localTimestamp > (cloud.updateTimestamp ?: lastSyncTimestamp)
+                                else -> localTimestamp > (cloud.updateTimestamp ?: 0L)
+                            }
+                        }
+                return@withContext if (anyLocalNewer || staleCloudFilesMissingLocally.isNotEmpty()) {
+                    SyncAction.UPLOAD
+                } else {
+                    SyncAction.NONE
+                }
+            }
+
+            when {
+                localFiles.isNotEmpty() && cloudFiles.isEmpty() -> SyncAction.UPLOAD
+                localFiles.isEmpty() && downloadableCloud.isNotEmpty() -> SyncAction.DOWNLOAD
+                localFiles.isEmpty() && cloudFiles.isEmpty() -> SyncAction.NONE
+                else -> classifyFiles(localFiles, cloudFiles, lastSyncTimestamp).determineAction()
+            }
+        }
+
     suspend fun syncSaves(
         localPath: String,
         dirname: String,
@@ -158,6 +288,58 @@ class GOGCloudSavesManager(
                     }
                 }
 
+                // Exit-time upload: never download — must not overwrite a newer cloud save
+                // made on another device with stale local data from this session.
+                if (preferredAction.equals("exit_upload", ignoreCase = true)) {
+                    if (localFiles.isEmpty()) {
+                        Timber.tag("GOG-CloudSaves").i("[exit_upload] No local files for '$dirname'; skipping")
+                        return@withContext currentTimestamp()
+                    }
+                    if (cloudFiles.isEmpty()) {
+                        Timber.tag("GOG-CloudSaves").i(
+                            "[exit_upload] Cloud empty for '$dirname'; uploading ${localFiles.size} file(s)",
+                        )
+                        localFiles.forEach { file ->
+                            uploadFile(credentials.userId, clientId, dirname, file, credentials.accessToken)
+                        }
+                        return@withContext currentTimestamp()
+                    }
+                    val cloudByPath = cloudFiles.associateBy { it.relativePath }
+                    val localPaths = localFiles.map { it.relativePath }.toSet()
+                    val toUpload =
+                        localFiles.filter { local ->
+                            val cloud = cloudByPath[local.relativePath]
+                            val localTimestamp = local.updateTimestamp ?: 0L
+                            when {
+                                cloud == null -> localTimestamp > lastSyncTimestamp
+                                cloud.isDeleted -> localTimestamp > (cloud.updateTimestamp ?: lastSyncTimestamp)
+                                else -> localTimestamp > (cloud.updateTimestamp ?: 0L)
+                            }
+                        }
+                    val toDelete =
+                        cloudFiles.filter {
+                            !it.isDeleted &&
+                                it.relativePath !in localPaths &&
+                                (it.updateTimestamp ?: Long.MAX_VALUE) <= lastSyncTimestamp
+                        }
+                    if (toUpload.isEmpty() && toDelete.isEmpty()) {
+                        Timber.tag("GOG-CloudSaves").i(
+                            "[exit_upload] Nothing local is newer; preserving last sync timestamp so newer cloud data is still detected",
+                        )
+                        return@withContext lastSyncTimestamp.coerceAtLeast(1L)
+                    }
+                    Timber.tag("GOG-CloudSaves").i(
+                        "[exit_upload] Uploading ${toUpload.size} newer/new local file(s) and deleting ${toDelete.size} stale cloud file(s) for '$dirname'",
+                    )
+                    toUpload.forEach { file ->
+                        uploadFile(credentials.userId, clientId, dirname, file, credentials.accessToken)
+                    }
+                    toDelete.forEach { file ->
+                        deleteCloudFile(credentials.userId, clientId, dirname, file, credentials.accessToken)
+                    }
+                    return@withContext currentTimestamp()
+                }
+
                 when {
                     localFiles.isNotEmpty() && cloudFiles.isEmpty() -> {
                         Timber.tag("GOG-CloudSaves").i("No files in cloud, uploading ${localFiles.size} file(s)")
@@ -188,6 +370,8 @@ class GOGCloudSavesManager(
                     downloadableCloud.forEach { file ->
                         downloadFile(credentials.userId, clientId, dirname, file, syncDir, credentials.accessToken)
                     }
+                    deleteLocalFilesMissingFromCloud(localFiles, downloadableCloud)
+                    pruneEmptyDirectories(syncDir)
                     return@withContext currentTimestamp()
                 }
 
@@ -196,6 +380,9 @@ class GOGCloudSavesManager(
                     localFiles.forEach { file ->
                         uploadFile(credentials.userId, clientId, dirname, file, credentials.accessToken)
                     }
+                    cloudFiles
+                        .filter { !it.isDeleted && localFiles.none { local -> local.relativePath == it.relativePath } }
+                        .forEach { file -> deleteCloudFile(credentials.userId, clientId, dirname, file, credentials.accessToken) }
                     return@withContext currentTimestamp()
                 }
 
@@ -206,13 +393,17 @@ class GOGCloudSavesManager(
                             "Downloading ${classifier.updatedCloud.size} updated cloud file(s)",
                         )
                         classifier.updatedCloud.forEach { file ->
-                            downloadFile(credentials.userId, clientId, dirname, file, syncDir, credentials.accessToken)
+                            if (!file.isDeleted) {
+                                downloadFile(credentials.userId, clientId, dirname, file, syncDir, credentials.accessToken)
+                            }
                         }
                         classifier.notExistingLocally.forEach { file ->
                             if (!file.isDeleted) {
                                 downloadFile(credentials.userId, clientId, dirname, file, syncDir, credentials.accessToken)
                             }
                         }
+                        deleteLocalFilesMissingFromCloud(classifier.notExistingRemotely, downloadableCloud)
+                        pruneEmptyDirectories(syncDir)
                     }
 
                     SyncAction.UPLOAD -> {
@@ -225,6 +416,11 @@ class GOGCloudSavesManager(
                         classifier.notExistingRemotely.forEach { file ->
                             uploadFile(credentials.userId, clientId, dirname, file, credentials.accessToken)
                         }
+                        classifier.notExistingLocally.forEach { file ->
+                            if (!file.isDeleted) {
+                                deleteCloudFile(credentials.userId, clientId, dirname, file, credentials.accessToken)
+                            }
+                        }
                     }
 
                     SyncAction.CONFLICT -> {
@@ -392,15 +588,8 @@ class GOGCloudSavesManager(
                         Timber.tag("GOG").d("[Cloud Saves]   Examining item $i: name='$name', dirname='$dirname'")
 
                         if (name.isNotEmpty() && hash.isNotEmpty() && name.startsWith("$dirname/")) {
-                            val timestamp =
-                                try {
-                                    Instant.parse(lastModified).epochSecond
-                                } catch (_: Exception) {
-                                    null
-                                }
-
                             val relativePath = name.removePrefix("$dirname/")
-                            files.add(CloudFile(relativePath, hash, lastModified, timestamp))
+                            files.add(CloudFile(relativePath, hash, lastModified, parseGogTimestampMillis(lastModified)?.div(1000L)))
                             Timber.tag("GOG").d("[Cloud Saves]     Matched: relativePath='$relativePath'")
                         } else {
                             Timber.tag("GOG").d("[Cloud Saves]     Skipped (doesn't match dirname or missing data)")
@@ -429,9 +618,15 @@ class GOGCloudSavesManager(
 
             Timber.tag("GOG-CloudSaves").i("Uploading: ${file.relativePath} ($fileSize bytes)")
 
-            val url = "$CLOUD_STORAGE_BASE_URL/v1/$userId/$clientId/$dirname/${file.relativePath}"
-            val requestBody = localFile.readBytes().toRequestBody("application/octet-stream".toMediaType())
+            // GOG/Heroic wire format: gzip body (mtime=0), Etag = md5(gzipped), Content-Encoding: gzip.
+            val gzipped = gzipWithZeroMtime(localFile.readBytes())
+            val etag =
+                MessageDigest.getInstance("MD5")
+                    .digest(gzipped)
+                    .joinToString("") { "%02x".format(it) }
+            val requestBody = gzipped.toRequestBody("application/octet-stream".toMediaType())
 
+            val url = buildObjectUrl(userId, clientId, dirname, file.relativePath)
             val requestBuilder =
                 Request
                     .Builder()
@@ -441,6 +636,8 @@ class GOGCloudSavesManager(
                     .header("User-Agent", USER_AGENT)
                     .header("X-Object-Meta-User-Agent", USER_AGENT)
                     .header("Content-Type", "application/octet-stream")
+                    .header("Content-Encoding", "gzip")
+                    .header("Etag", etag)
 
             file.updateTime?.let { timestamp ->
                 requestBuilder.header("X-Object-Meta-LocalLastModified", timestamp)
@@ -449,7 +646,9 @@ class GOGCloudSavesManager(
             val response = httpClient.newCall(requestBuilder.build()).execute()
             response.use {
                 if (response.isSuccessful) {
-                    Timber.tag("GOG-CloudSaves").i("Successfully uploaded: ${file.relativePath}")
+                    Timber.tag("GOG-CloudSaves").i(
+                        "Successfully uploaded: ${file.relativePath} (gzipped ${gzipped.size}B, etag=$etag)",
+                    )
                 } else {
                     val errorBody = response.body?.string() ?: "No response body"
                     Timber.tag("GOG-CloudSaves").e("Failed to upload ${file.relativePath}: HTTP ${response.code}")
@@ -472,42 +671,18 @@ class GOGCloudSavesManager(
         try {
             Timber.tag("GOG-CloudSaves").i("Downloading: ${file.relativePath}")
 
-            val url = "$CLOUD_STORAGE_BASE_URL/v1/$userId/$clientId/$dirname/${file.relativePath}"
+            val downloaded = downloadObject(userId, clientId, dirname, file, authToken) ?: return@withContext
 
-            val request =
-                Request
-                    .Builder()
-                    .url(url)
-                    .header("Authorization", "Bearer $authToken")
-                    .header("User-Agent", USER_AGENT)
-                    .header("X-Object-Meta-User-Agent", USER_AGENT)
-                    .build()
+            val localFile = File(syncDir, file.relativePath)
+            localFile.parentFile?.mkdirs()
 
-            val response = httpClient.newCall(request).execute()
-            response.use {
-                if (!response.isSuccessful) {
-                    val errorBody = response.body?.string() ?: "No response body"
-                    Timber.tag("GOG-CloudSaves").e("Failed to download ${file.relativePath}: HTTP ${response.code}")
-                    Timber.tag("GOG-CloudSaves").e("Download error body: $errorBody")
-                    return@withContext
-                }
-
-                val bytes = response.body?.bytes() ?: return@withContext
-                Timber.tag("GOG-CloudSaves").d("Downloaded ${bytes.size} bytes for ${file.relativePath}")
-
-                val localFile = File(syncDir, file.relativePath)
-                localFile.parentFile?.mkdirs()
-
-                FileOutputStream(localFile).use { fos ->
-                    fos.write(bytes)
-                }
+            FileOutputStream(localFile).use { fos ->
+                fos.write(downloaded.bytes)
+            }
 
-                file.updateTimestamp?.let { timestamp ->
-                    localFile.setLastModified(timestamp * 1000)
-                }
+            localFile.setLastModified(downloaded.localLastModifiedMs ?: file.updateTimestamp?.times(1000L) ?: localFile.lastModified())
 
-                Timber.tag("GOG-CloudSaves").i("Successfully downloaded: ${file.relativePath}")
-            }
+            Timber.tag("GOG-CloudSaves").i("Successfully downloaded: ${file.relativePath}")
         } catch (e: Exception) {
             Timber.tag("GOG-CloudSaves").e(e, "Failed to download ${file.relativePath}")
         }
@@ -523,10 +698,40 @@ class GOGCloudSavesManager(
         val notExistingLocally = mutableListOf<CloudFile>()
         val notExistingRemotely = mutableListOf<SyncFile>()
 
-        val localPaths = localFiles.map { it.relativePath }.toSet()
-        val cloudPaths = cloudFiles.map { it.relativePath }.toSet()
+        val localByPath = localFiles.associateBy { it.relativePath }
+        val cloudByPath = cloudFiles.associateBy { it.relativePath }
+        val localPaths = localByPath.keys
+        val cloudPaths = cloudByPath.keys
 
         localFiles.forEach { file ->
+            val cloudFile = cloudByPath[file.relativePath]
+
+            if (cloudFile != null) {
+                val localTimestamp = file.updateTimestamp ?: 0L
+                val cloudTimestamp = cloudFile.updateTimestamp ?: 0L
+
+                if (cloudFile.isDeleted) {
+                    if (localTimestamp > cloudTimestamp) {
+                        notExistingRemotely.add(file)
+                    } else {
+                        updatedCloud.add(cloudFile)
+                    }
+                    return@forEach
+                }
+
+                if (cloudFile.md5Hash.equals(file.md5Hash.orEmpty(), ignoreCase = true)) return@forEach
+
+                when {
+                    localTimestamp > cloudTimestamp -> updatedLocal.add(file)
+                    cloudTimestamp > localTimestamp -> updatedCloud.add(cloudFile)
+                    else -> {
+                        updatedLocal.add(file)
+                        updatedCloud.add(cloudFile)
+                    }
+                }
+                return@forEach
+            }
+
             if (file.relativePath !in cloudPaths) {
                 notExistingRemotely.add(file)
             }
@@ -537,7 +742,17 @@ class GOGCloudSavesManager(
         }
 
         cloudFiles.forEach { file ->
-            if (file.isDeleted) return@forEach
+            if (file.isDeleted) {
+                val fileTimestamp = file.updateTimestamp
+                if (file.relativePath in localPaths && fileTimestamp != null && fileTimestamp > timestamp) {
+                    updatedCloud.add(file)
+                }
+                return@forEach
+            }
+
+            val localFile = localByPath[file.relativePath]
+            val hashesMatch = localFile != null && file.md5Hash.equals(localFile.md5Hash.orEmpty(), ignoreCase = true)
+            if (localFile != null || hashesMatch) return@forEach
 
             if (file.relativePath !in localPaths) {
                 notExistingLocally.add(file)
@@ -552,4 +767,170 @@ class GOGCloudSavesManager(
     }
 
     private fun currentTimestamp(): Long = System.currentTimeMillis() / 1000
+
+    private fun buildObjectUrl(
+        userId: String,
+        clientId: String,
+        dirname: String,
+        relativePath: String,
+    ): okhttp3.HttpUrl {
+        val builder =
+            "$CLOUD_STORAGE_BASE_URL/v1"
+                .toHttpUrl()
+                .newBuilder()
+                .addPathSegment(userId)
+                .addPathSegment(clientId)
+        // Split on "/" so addPathSegment percent-encodes each segment; passing the whole
+        // relativePath would encode the "/" itself and the server returns 404.
+        dirname.split('/').filter { it.isNotEmpty() }.forEach { builder.addPathSegment(it) }
+        relativePath.replace('\\', '/').split('/').filter { it.isNotEmpty() }.forEach {
+            builder.addPathSegment(it)
+        }
+        return builder.build()
+    }
+
+    private suspend fun downloadObject(
+        userId: String,
+        clientId: String,
+        dirname: String,
+        file: CloudFile,
+        authToken: String,
+    ): DownloadedObject? =
+        withContext(Dispatchers.IO) {
+            try {
+                val url = buildObjectUrl(userId, clientId, dirname, file.relativePath)
+
+                val request =
+                    Request
+                        .Builder()
+                        .url(url)
+                        .header("Authorization", "Bearer $authToken")
+                        .header("User-Agent", USER_AGENT)
+                        .header("X-Object-Meta-User-Agent", USER_AGENT)
+                        .build()
+
+                httpClient.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) {
+                        val errorBody = response.body?.string() ?: "No response body"
+                        Timber.tag("GOG-CloudSaves").e("Failed to download ${file.relativePath}: HTTP ${response.code}")
+                        Timber.tag("GOG-CloudSaves").e("Download error body: $errorBody")
+                        return@withContext null
+                    }
+
+                    val bytes = response.body?.bytes() ?: return@withContext null
+                    Timber.tag("GOG-CloudSaves").d("Downloaded ${bytes.size} bytes for ${file.relativePath}")
+                    DownloadedObject(
+                        bytes = gunzipIfNeeded(bytes),
+                        localLastModifiedMs = parseGogTimestampMillis(response.header("X-Object-Meta-LocalLastModified")),
+                    )
+                }
+            } catch (e: Exception) {
+                Timber.tag("GOG-CloudSaves").e(e, "Failed to download ${file.relativePath}")
+                null
+            }
+        }
+
+    private suspend fun deleteCloudFile(
+        userId: String,
+        clientId: String,
+        dirname: String,
+        file: CloudFile,
+        authToken: String,
+    ) = withContext(Dispatchers.IO) {
+        try {
+            Timber.tag("GOG-CloudSaves").i("Deleting cloud file: ${file.relativePath}")
+            val request =
+                Request
+                    .Builder()
+                    .url(buildObjectUrl(userId, clientId, dirname, file.relativePath))
+                    .delete()
+                    .header("Authorization", "Bearer $authToken")
+                    .header("User-Agent", USER_AGENT)
+                    .header("X-Object-Meta-User-Agent", USER_AGENT)
+                    .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    val errorBody = response.body?.string() ?: "No response body"
+                    Timber.tag("GOG-CloudSaves").e("Failed to delete cloud file ${file.relativePath}: HTTP ${response.code}")
+                    Timber.tag("GOG-CloudSaves").e("Delete error body: $errorBody")
+                }
+            }
+        } catch (e: Exception) {
+            Timber.tag("GOG-CloudSaves").e(e, "Failed to delete cloud file ${file.relativePath}")
+        }
+    }
+
+    private fun deleteLocalFilesMissingFromCloud(
+        localFiles: List<SyncFile>,
+        downloadableCloud: List<CloudFile>,
+    ) {
+        val cloudPaths = downloadableCloud.map { it.relativePath }.toSet()
+        localFiles
+            .filter { it.relativePath !in cloudPaths }
+            .forEach { file ->
+                runCatching {
+                    val localFile = File(file.absolutePath)
+                    if (localFile.exists() && localFile.isFile) {
+                        Timber.tag("GOG-CloudSaves").i("Deleting local file missing from cloud: ${file.relativePath}")
+                        localFile.delete()
+                    }
+                }.onFailure {
+                    Timber.tag("GOG-CloudSaves").e(it, "Failed to delete local file ${file.relativePath}")
+                }
+            }
+    }
+
+    private fun pruneEmptyDirectories(root: File) {
+        if (!root.exists() || !root.isDirectory) return
+        root
+            .walkBottomUp()
+            .filter { it != root && it.isDirectory && it.listFiles()?.isEmpty() == true }
+            .forEach { directory ->
+                runCatching {
+                    Timber.tag("GOG-CloudSaves").i("Deleting empty local cloud-save directory: ${directory.absolutePath}")
+                    directory.delete()
+                }.onFailure {
+                    Timber.tag("GOG-CloudSaves").e(it, "Failed to delete empty directory ${directory.absolutePath}")
+                }
+            }
+    }
+
+    private fun safeZipEntryName(
+        prefix: String,
+        relativePath: String,
+    ): String? {
+        val parts =
+            "$prefix/$relativePath"
+                .replace('\\', '/')
+                .split('/')
+                .filter { it.isNotBlank() && it != "." && it != ".." }
+        return parts.takeIf { it.isNotEmpty() }?.joinToString("/")
+    }
+}
+
+// Zero the gzip mtime bytes so the digest matches gogdl's `gzip.compress(raw, 6, mtime=0)`.
+private fun gzipWithZeroMtime(raw: ByteArray): ByteArray {
+    val sink = java.io.ByteArrayOutputStream()
+    GZIPOutputStream(sink).use { it.write(raw) }
+    val out = sink.toByteArray()
+    if (out.size >= 8) {
+        out[4] = 0; out[5] = 0; out[6] = 0; out[7] = 0
+    }
+    return out
+}
+
+private fun gunzipIfNeeded(bytes: ByteArray): ByteArray {
+    val isGzipped =
+        bytes.size >= 2 &&
+            bytes[0] == 0x1f.toByte() &&
+            bytes[1] == 0x8b.toByte()
+    if (!isGzipped) return bytes
+    return GZIPInputStream(ByteArrayInputStream(bytes)).use { it.readBytes() }
+}
+
+private fun parseGogTimestampMillis(value: String?): Long? {
+    if (value.isNullOrBlank()) return null
+    return runCatching { Instant.parse(value).toEpochMilli() }
+        .recoverCatching { OffsetDateTime.parse(value).toInstant().toEpochMilli() }
+        .getOrNull()
 }
diff --git a/app/src/main/feature/stores/gog/service/GOGDownloadManager.kt b/app/src/main/feature/stores/gog/service/GOGDownloadManager.kt
index 88e039a8b..a868cfc83 100644
--- a/app/src/main/feature/stores/gog/service/GOGDownloadManager.kt
+++ b/app/src/main/feature/stores/gog/service/GOGDownloadManager.kt
@@ -1,5 +1,6 @@
 package com.winlator.cmod.feature.stores.gog.service
 import android.content.Context
+import com.winlator.cmod.R
 import com.winlator.cmod.feature.stores.gog.api.DepotFile
 import com.winlator.cmod.feature.stores.gog.api.FileChunk
 import com.winlator.cmod.feature.stores.gog.api.GOGApiClient
@@ -14,48 +15,36 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import okhttp3.Request
 import org.json.JSONArray
 import org.json.JSONObject
 import timber.log.Timber
+import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
-import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
+import java.io.InputStream
+import java.security.DigestInputStream
 import java.security.DigestOutputStream
 import java.security.MessageDigest
 import java.util.concurrent.CopyOnWriteArrayList
-import java.util.zip.Inflater
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicReference
+import java.util.zip.InflaterInputStream
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/**
- * Custom exception for HTTP status errors with typed status code
- */
+// HTTP status failure with its typed status code.
 class HttpStatusException(
     val statusCode: Int,
     message: String,
 ) : Exception(message)
 
-/**
- * GOGDownloadManager handles downloading GOG games
- *
- * GOG's CDN structure (Gen 2):
- * 1. Fetch build manifest (contains depots and product metadata)
- * 2. Fetch depot manifests (contains file lists with chunks)
- * 3. Get secure CDN links (time-limited URLs for chunks) -> We have issues here
- * 4. Download chunks from CDN (zlib compressed data) -> We have issues here
- * 5. Decompress and verify chunks (MD5)
- * 6. Assemble files from chunks
- *
- * GOG Chunk Format (Gen 2):
- * - Chunks are identified by compressedMd5 hash
- * - Downloaded from secure CDN URLs (time-limited)
- * - Compressed using zlib
- * - Verified using MD5 hash after decompression
- * - Multiple chunks assemble into single files
- */
+// Downloads GOG games from Gen 1/Gen 2 CDN manifests.
 @Singleton
 class GOGDownloadManager
     @Inject
@@ -68,9 +57,7 @@ class GOGDownloadManager
         private val WINDOWS_OS_VERSION = "windows"
         private val httpClient = Net.http
 
-        /**
-         * Context needed to refresh secure CDN links when they expire
-         */
+        // Context needed to refresh secure CDN links when they expire.
         private data class SecureLinkContext(
             val gameId: String,
             val generation: Int,
@@ -79,24 +66,18 @@ class GOGDownloadManager
         )
 
         companion object {
-            private const val MAX_PARALLEL_DOWNLOADS = 4
-            private const val CHUNK_BUFFER_SIZE = 1024 * 1024 // 1MB buffer
-            private const val MAX_CHUNK_RETRIES = 3 // Maximum retries per chunk
-            private const val RETRY_DELAY_MS = 1000L // Initial retry delay in milliseconds
+            private const val MAX_PARALLEL_DOWNLOADS = 10
+            private const val MAX_PARALLEL_MANIFEST_FETCHES = 8
+            private val EXPIRED_LINK_STATUS_CODES = setOf(401, 403, 404)
+            private const val CHUNK_BUFFER_SIZE = 1024 * 1024
+            private const val STREAM_BUFFER_SIZE = 64 * 1024
+            private const val PROGRESS_EMIT_INTERVAL_MS = 250L
+            private const val MAX_CHUNK_RETRIES = 3
+            private const val RETRY_DELAY_MS = 1000L
             private const val DEPENDENCY_URL = "https://content-system.gog.com/dependencies/repository?generation=2"
         }
 
-        /**
-         * Download and install a GOG game
-         *
-         * @param gameId GOG game ID (numeric)
-         * @param installPath Directory where game will be installed
-         * @param downloadInfo Progress tracker
-         * @param language Container language name (e.g. "english", "german"). Used to resolve GOG manifest language codes when filtering depots. See [GOGConstants.containerLanguageToGogCodes].
-         * @param withDlcs Whether to include DLC content
-         * @param supportDir Optional directory for support files (redistributables)
-         * @return Result indicating success or failure
-         */
+        // Downloads, verifies, or updates a GOG game.
         suspend fun downloadGame(
             gameId: String,
             installPath: File,
@@ -104,6 +85,10 @@ class GOGDownloadManager
             language: String = GOGConstants.GOG_FALLBACK_DOWNLOAD_LANGUAGE,
             withDlcs: Boolean = false,
             supportDir: File? = null,
+            selectedDlcIds: Set<String> = emptySet(),
+            buildIdOverride: String? = null,
+            verifyMode: Boolean = false,
+            verifyProgressSink: ((bytesDone: Long, total: Long) -> Unit)? = null,
         ): Result<Unit> =
             withContext(Dispatchers.IO) {
                 try {
@@ -113,7 +98,6 @@ class GOGDownloadManager
                         Timber.tag("GOG").i("Will also put dependencies into ${supportDir.absolutePath}")
                     }
 
-                    // Get the actual game from database to check what ID we have stored
                     val dbGame = gogManager.getGameFromDbById(gameId)
 
                     if (dbGame == null) {
@@ -124,15 +108,14 @@ class GOGDownloadManager
 
                     Timber.tag("GOG").d("Database game ID: ${dbGame.id}, title: ${dbGame.title}")
 
-                    // Emit download started event so UI can attach progress listeners
                     com.winlator.cmod.app.PluviaApp.events.emitJava(
                         com.winlator.cmod.feature.stores.steam.events.AndroidEvent
                             .DownloadStatusChanged(gameId.toIntOrNull() ?: 0, true),
                     )
 
-                    downloadInfo.updateStatusMessage("Fetching builds...")
+                    downloadInfo.updateStatusMessage("Fetching builds")
 
-                    // Step 1: Get available builds — prefer Gen 2, fall back to Gen 1 (legacy)
+                    // Prefer Gen 2 builds, falling back to Gen 1 legacy builds.
                     val selectedBuild =
                         run {
                             val gen2Result = apiClient.getBuildsForGame(gameId, WINDOWS_OS_VERSION, generation = 2)
@@ -141,8 +124,13 @@ class GOGDownloadManager
                                     gen2Result.exceptionOrNull() ?: Exception("Failed to fetch Gen 2 builds"),
                                 )
                             }
+                            val gen2Items = gen2Result.getOrThrow().items
+                            if (buildIdOverride != null) {
+                                gen2Items.firstOrNull { it.buildId == buildIdOverride && it.platform.equals(WINDOWS_OS_VERSION, ignoreCase = true) }
+                                    ?.let { return@run it }
+                            }
                             parser
-                                .selectBuild(gen2Result.getOrThrow().items, preferredGeneration = 2, platform = WINDOWS_OS_VERSION)
+                                .selectBuild(gen2Items, preferredGeneration = 2, platform = WINDOWS_OS_VERSION)
                                 ?.let { return@run it }
                             val gen1Result = apiClient.getBuildsForGame(gameId, WINDOWS_OS_VERSION, generation = 1)
                             if (gen1Result.isFailure) {
@@ -151,6 +139,10 @@ class GOGDownloadManager
                                 )
                             }
                             val builds = gen1Result.getOrThrow()
+                            if (buildIdOverride != null) {
+                                builds.items.firstOrNull { it.buildId == buildIdOverride && it.platform.equals(WINDOWS_OS_VERSION, ignoreCase = true) }
+                                    ?.let { return@run it }
+                            }
                             parser.selectBuild(builds.items, preferredGeneration = 1, platform = WINDOWS_OS_VERSION)
                                 ?: run {
                                     val hint =
@@ -181,9 +173,8 @@ class GOGDownloadManager
 
                     val realGameId = gameId
 
-                    downloadInfo.updateStatusMessage("Fetching manifest...")
+                    downloadInfo.updateStatusMessage("Fetching manifest")
 
-                    // Step 2: Fetch main manifest
                     val gameManifestResult = apiClient.fetchManifest(selectedBuild.link)
                     if (gameManifestResult.isFailure) {
                         return@withContext Result.failure(
@@ -199,7 +190,6 @@ class GOGDownloadManager
                         Timber.tag("GOG").d("Manifest products: ${products.joinToString { "name=${it.name}, id=${it.productId}" }}")
                     }
 
-                    // Gen 1 (legacy): different manifest format and download flow (direct file URLs, no chunks)
                     if (selectedBuild.generation == 1 && gameManifest.productTimestamp != null) {
                         Timber.tag("GOG").i("Using Gen 1 (legacy) downloader for game $gameId")
                         return@withContext downloadGameGen1(
@@ -211,17 +201,17 @@ class GOGDownloadManager
                             language = language,
                             withDlcs = withDlcs,
                             supportDir = supportDir,
+                            selectedDlcIds = selectedDlcIds,
+                            verifyMode = verifyMode,
                         )
                     }
 
                     Timber.tag("GOG").i("Using Gen 2 downloader for game $gameId")
 
-                    // Grab Dependencies from the gameManifest for later.
                     val dependencies = gameManifest.dependencies
 
-                    downloadInfo.updateStatusMessage("Filtering depots...")
+                    downloadInfo.updateStatusMessage("Filtering depots")
 
-                    // Step 3: Filter depots by container language (parser resolves to GOG codes and tries English fallback)
                     val (languageDepots, effectiveLang) = parser.filterDepotsByLanguage(gameManifest, language)
                     if (languageDepots.isEmpty()) {
                         return@withContext Result.failure(
@@ -231,7 +221,15 @@ class GOGDownloadManager
 
                     // Filter by ownership to exclude unowned DLC depots
                     val ownedGameIds = gogManager.getAllGameIds()
-                    val depots = parser.filterDepotsByOwnership(languageDepots, ownedGameIds)
+                    val requestedProductIds =
+                        buildSet {
+                            add(gameManifest.baseProductId)
+                            if (withDlcs) addAll(selectedDlcIds)
+                        }
+                    val depots =
+                        parser
+                            .filterDepotsByOwnership(languageDepots, ownedGameIds)
+                            .filter { it.productId in requestedProductIds }
                     if (depots.isEmpty()) {
                         return@withContext Result.failure(Exception("No owned depots found for language: $effectiveLang"))
                     }
@@ -246,52 +244,129 @@ class GOGDownloadManager
                             )
                     }
 
-                    downloadInfo.updateStatusMessage("Fetching depot manifests...")
-
-                    // Step 4: Fetch depot manifests to get file lists
-                    // Track which depot each file came from for proper productId mapping
+                    // Retain source depot IDs so shared files inherit the correct product ownership.
                     data class FileWithDepot(
                         val file: DepotFile,
                         val depotProductId: String,
                     )
-                    val allFilesWithDepots = mutableListOf<FileWithDepot>()
+                    fun effectiveProductId(
+                        fileProductId: String?,
+                        depotProductId: String,
+                    ): String =
+                        when (fileProductId) {
+                            null, "", "2147483047" -> depotProductId
+                            else -> fileProductId
+                        }
 
-                    for ((index, depot) in depots.withIndex()) {
-                        downloadInfo.updateStatusMessage("Fetching depot ${index + 1}/${depots.size}...")
+                    downloadInfo.updateStatusMessage("Fetching depot manifests (${depots.size})")
+
+                    val depotCompleted = AtomicInteger(0)
+                    val depotManifestResults =
+                        coroutineScope {
+                            val limit = minOf(MAX_PARALLEL_MANIFEST_FETCHES, depots.size).coerceAtLeast(1)
+                            val nextIndex = AtomicInteger(0)
+                            val perDepot = arrayOfNulls<Result<com.winlator.cmod.feature.stores.gog.api.DepotManifest>>(depots.size)
+                            (0 until limit)
+                                .map {
+                                    async {
+                                        while (true) {
+                                            val i = nextIndex.getAndIncrement()
+                                            if (i >= depots.size) break
+                                            perDepot[i] = apiClient.fetchDepotManifest(depots[i].manifest)
+                                            val done = depotCompleted.incrementAndGet()
+                                            downloadInfo.updateStatusMessage("Fetching depot $done/${depots.size}")
+                                        }
+                                    }
+                                }.awaitAll()
+                            perDepot.toList()
+                        }
 
-                        val depotResult = apiClient.fetchDepotManifest(depot.manifest)
+                    val allFilesWithDepots = mutableListOf<FileWithDepot>()
+                    for ((index, depot) in depots.withIndex()) {
+                        val depotResult = depotManifestResults[index]
+                            ?: return@withContext Result.failure(Exception("Missing depot manifest result for ${depot.manifest}"))
                         if (depotResult.isFailure) {
                             return@withContext Result.failure(
                                 depotResult.exceptionOrNull() ?: Exception("Failed to fetch depot manifest"),
                             )
                         }
-
-                        val files = depotResult.getOrThrow().files
-                        files.forEach { file ->
+                        depotResult.getOrThrow().files.forEach { file ->
                             allFilesWithDepots.add(FileWithDepot(file, depot.productId))
                         }
                     }
 
-                    val allFiles = allFilesWithDepots.map { it.file }
-                    Timber.tag("GOG").d("Total files from all depots: ${allFiles.size}")
-
-                    // Step 5: Separate base game, DLC, and support files
-                    val (baseFiles, dlcFiles) = parser.separateBaseDLC(allFiles, gameManifest.baseProductId)
-                    val filesToDownload = if (withDlcs) baseFiles + dlcFiles else baseFiles
-                    var (gameFiles, supportFiles) = parser.separateSupportFiles(filesToDownload)
+                    val requestedFilesWithDepots =
+                        allFilesWithDepots.filter { (file, depotProductId) ->
+                            effectiveProductId(file.productId, depotProductId) in requestedProductIds
+                        }
+                    Timber.tag("GOG").d("Total files from all depots: ${allFilesWithDepots.size}")
+
+                    val baseFiles =
+                        requestedFilesWithDepots
+                            .filter { (file, depotProductId) ->
+                                effectiveProductId(file.productId, depotProductId) == gameManifest.baseProductId
+                            }.map { it.file }
+                    val dlcFiles =
+                        requestedFilesWithDepots
+                            .filter { (file, depotProductId) ->
+                                effectiveProductId(file.productId, depotProductId) != gameManifest.baseProductId
+                            }.map { it.file }
+                    var (gameFiles, supportFiles) = parser.separateSupportFiles(requestedFilesWithDepots.map { it.file })
 
-                    // Filter out files that already exist with correct size (incremental download)
                     val gameInstallDir = installPath
                     val beforeCount = gameFiles.size
-                    gameFiles =
-                        gameFiles.filter { file ->
+                    val originalGameFiles = gameFiles
+                    var verifyScannedBytes = 0L
+                    var verifyScanTotalBytes = 0L
+                    if (verifyMode) {
+                        verifyScanTotalBytes = gameFiles.sumOf { f -> f.chunks.sumOf { it.size } }
+                        downloadInfo.updateStatus(
+                            com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.VERIFYING,
+                            "Verifying installed files (0/$beforeCount)",
+                        )
+                        downloadInfo.setTotalExpectedBytes(verifyScanTotalBytes)
+                        downloadInfo.setDisplayTotalExpectedBytes(verifyScanTotalBytes)
+                        downloadInfo.initializeBytesDownloaded(0L)
+                        downloadInfo.emitProgressChange()
+                        verifyProgressSink?.invoke(0L, verifyScanTotalBytes)
+
+                        val verified = mutableListOf<DepotFile>()
+                        var lastEmitMs = 0L
+                        gameFiles.forEachIndexed { idx, file ->
+                            if (!downloadInfo.isActive()) {
+                                return@withContext Result.failure(
+                                    kotlinx.coroutines.CancellationException("Verify cancelled"),
+                                )
+                            }
                             val outputFile = File(gameInstallDir, file.path)
-                            val expectedSize = file.chunks.sumOf { it.size }
-                            !fileExistsWithCorrectSize(outputFile, expectedSize, file.md5)
+                            if (!isInstalledFileValidByChunkMd5(outputFile, file)) {
+                                verified.add(file)
+                            }
+                            verifyScannedBytes += file.chunks.sumOf { it.size }
+                            downloadInfo.setBytesDownloaded(verifyScannedBytes)
+
+                            val now = System.currentTimeMillis()
+                            val isLastFile = idx == beforeCount - 1
+                            if (isLastFile || now - lastEmitMs >= PROGRESS_EMIT_INTERVAL_MS) {
+                                lastEmitMs = now
+                                downloadInfo.updateStatusMessage("Verifying installed files (${idx + 1}/$beforeCount)")
+                                downloadInfo.emitProgressChange()
+                                verifyProgressSink?.invoke(verifyScannedBytes, verifyScanTotalBytes)
+                            }
                         }
-                    Timber.tag("GOG").d("Skipping ${beforeCount - gameFiles.size} existing file(s), downloading ${gameFiles.size}")
+                        gameFiles = verified
+                    } else {
+                        gameFiles =
+                            gameFiles.filter { file ->
+                                val outputFile = File(gameInstallDir, file.path)
+                                val expectedSize = file.chunks.sumOf { it.size }
+                                !fileExistsWithCorrectSize(outputFile, expectedSize)
+                            }
+                    }
+                    Timber.tag("GOG").d(
+                        "${if (verifyMode) "Verify" else "Size"} check kept ${gameFiles.size}/$beforeCount file(s) for (re)download",
+                    )
 
-                    // Calculate sizes separately for transparency
                     val (baseGameFiles, _) = parser.separateSupportFiles(baseFiles)
                     val baseGameSize = parser.calculateTotalSize(baseGameFiles)
                     val dlcSize =
@@ -315,7 +390,6 @@ class GOGDownloadManager
                         """.trimMargin(),
                     )
 
-                    // Step 6: Calculate sizes and extract chunk hashes
                     val totalSize = parser.calculateTotalSize(gameFiles)
                     val chunkHashes = parser.extractChunkHashes(gameFiles)
 
@@ -328,12 +402,52 @@ class GOGDownloadManager
                         """.trimMargin(),
                     )
 
-                    downloadInfo.setTotalExpectedBytes(totalSize)
+                    val fullCompressedSize = parser.calculateTotalSize(originalGameFiles)
+
+                    val combinedWorkTotal =
+                        if (verifyMode) verifyScanTotalBytes + totalSize else fullCompressedSize
+                    downloadInfo.setTotalExpectedBytes(combinedWorkTotal)
+                    if (verifyMode) {
+                        downloadInfo.setDisplayTotalExpectedBytes(combinedWorkTotal)
+                        downloadInfo.setBytesDownloaded(verifyScannedBytes)
+                        downloadInfo.updateStatus(
+                            com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.DOWNLOADING,
+                            if (gameFiles.isEmpty()) "All files verified" else "Re-downloading ${gameFiles.size} changed file(s)",
+                        )
+                        downloadInfo.emitProgressChange()
+                        verifyProgressSink?.invoke(verifyScannedBytes, combinedWorkTotal)
+                    } else {
+                        val skippedCompressedSize = (fullCompressedSize - totalSize).coerceAtLeast(0L)
+                        val cacheDirForBookkeeping = File(installPath, ".gog_chunks")
+                        val cachedCompressedSize =
+                            if (cacheDirForBookkeeping.exists()) {
+                                val sizeByHash = HashMap<String, Long>(chunkHashes.size)
+                                for (file in gameFiles) {
+                                    for (chunk in file.chunks) {
+                                        sizeByHash.putIfAbsent(
+                                            chunk.compressedMd5,
+                                            (chunk.compressedSize ?: chunk.size).coerceAtLeast(0L),
+                                        )
+                                    }
+                                }
+                                sizeByHash.entries.sumOf { (hash, size) ->
+                                    if (File(cacheDirForBookkeeping, "$hash.chunk").exists()) size else 0L
+                                }
+                            } else {
+                                0L
+                            }
+                        val alreadyDoneBytes = skippedCompressedSize + cachedCompressedSize
+                        downloadInfo.setDisplayTotalExpectedBytes(fullCompressedSize)
+                        downloadInfo.initializeBytesDownloaded(alreadyDoneBytes)
+                        // No statusMessage tweak here on purpose — the chip text comes from the
+                        // DownloadPhase enum (existing downloads_queue_phase_* strings), and the
+                        // bar already reflects alreadyDoneBytes/fullCompressedSize.
+                        downloadInfo.emitProgressChange()
+                        verifyProgressSink?.invoke(alreadyDoneBytes, fullCompressedSize)
+                    }
 
-                    // Step 7: Get secure CDN links for chunks
-                    downloadInfo.updateStatusMessage("Getting secure download links...")
+                    downloadInfo.updateStatusMessage("Getting secure download links")
 
-                    // Build mapping of product ID to secure URLs and chunk to product ID
                     val productUrlMap = mutableMapOf<String, List<String>>()
                     val chunkToProductMap = mutableMapOf<String, String>()
 
@@ -345,35 +459,12 @@ class GOGDownloadManager
                         )
 
                     val filesToDownloadPaths = gameFiles.map { it.path }.toSet()
-                    // Map each chunk to its product ID using depot info
                     allFilesWithDepots.forEach { (file, depotProductId) ->
                         if (file.path !in filesToDownloadPaths) return@forEach
-                        // Use depot's productId as fallback when file has null/placeholder productId
-
-                        // TODO: Remove this logic and always use the depotProductId.
-                        val productId =
-                            when {
-                                file.productId == null -> {
-                                    Timber.tag("GOG").d("File ${file.path} has null productId, using depotProductId: $depotProductId")
-                                    depotProductId
-                                }
 
-                                file.productId == "2147483047" -> {
-                                    Timber
-                                        .tag(
-                                            "GOG",
-                                        ).d("File ${file.path} has placeholder productId, using depotProductId: $depotProductId")
-                                    depotProductId
-                                }
+                        val productId = effectiveProductId(file.productId, depotProductId)
 
-                                else -> {
-                                    Timber.tag("GOG").d("File ${file.path} has productId: ${file.productId}")
-                                    file.productId
-                                }
-                            }
-
-                        // Only include files from products the user owns
-                        if (productId in ownedGameIds) {
+                        if (productId in ownedGameIds && productId in requestedProductIds) {
                             file.chunks.forEach { chunk ->
                                 chunkToProductMap[chunk.compressedMd5] = productId
                             }
@@ -382,22 +473,28 @@ class GOGDownloadManager
                         }
                     }
 
-                    // Get unique product IDs we need to fetch secure links for
                     val productIds = chunkToProductMap.values.toSet()
                     Timber.tag("GOG").d("Need secure links for ${productIds.size} owned product(s): ${productIds.joinToString()}")
                     Timber.tag("GOG").d("Mapped ${chunkToProductMap.size} chunks to products")
 
-                    // Fetch secure links for each product
-                    for (productId in productIds) {
-                        val linksResult =
-                            apiClient.getSecureLink(
-                                productId = productId,
-                                path = "/",
-                                generation = selectedBuild.generation,
-                            )
+                    // Fetch secure links for each product in parallel.
+                    val linkResults =
+                        coroutineScope {
+                            productIds
+                                .map { productId ->
+                                    async {
+                                        productId to
+                                            apiClient.getSecureLink(
+                                                productId = productId,
+                                                path = "/",
+                                                generation = selectedBuild.generation,
+                                            )
+                                    }
+                                }.awaitAll()
+                        }
+                    for ((productId, linksResult) in linkResults) {
                         if (linksResult.isSuccess) {
-                            val urls = linksResult.getOrThrow().urls
-                            productUrlMap[productId] = urls
+                            productUrlMap[productId] = linksResult.getOrThrow().urls
                         } else {
                             return@withContext Result.failure(
                                 linksResult.exceptionOrNull() ?: Exception("Failed to get secure links for product $productId"),
@@ -405,10 +502,8 @@ class GOGDownloadManager
                         }
                     }
 
-                    // Build chunk URL map using the correct product URL for each chunk
                     val chunkUrlMap = parser.buildChunkUrlMapWithProducts(chunkHashes, chunkToProductMap, productUrlMap)
 
-                    // Store context for refreshing secure links if they expire
                     val secureLinkContext =
                         SecureLinkContext(
                             gameId = realGameId,
@@ -417,14 +512,12 @@ class GOGDownloadManager
                             chunkToProductMap = chunkToProductMap,
                         )
 
-                    // Step 8: Download chunks
-                    Timber.tag("GOG").i("Downoading Chunks for game $gameId")
+                    Timber.tag("GOG").i("Downloading chunks for game $gameId")
 
-                    // Mark download as in-progress so UI and install checks can detect partial installs
                     installPath.mkdirs()
                     MarkerUtils.addMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
 
-                    downloadInfo.updateStatusMessage("Downloading chunks...")
+                    downloadInfo.updateStatusMessage("Downloading chunks")
 
                     val chunkCacheDir = File(installPath, ".gog_chunks")
                     chunkCacheDir.mkdirs()
@@ -437,6 +530,7 @@ class GOGDownloadManager
                             chunkHashes = chunkHashes,
                             secureLinkContext = secureLinkContext,
                             chunkToProductMap = chunkToProductMap,
+                            progressSink = verifyProgressSink,
                         )
 
                     if (downloadResult.isFailure) {
@@ -444,10 +538,12 @@ class GOGDownloadManager
                         return@withContext downloadResult
                     }
 
-                    // Step 9: Assemble game files
-                    downloadInfo.updateStatusMessage("Assembling files...")
+                    downloadInfo.updateStatus(
+                        com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.UNPACKING,
+                        context.getString(R.string.downloads_queue_phase_unpacking),
+                    )
+                    downloadInfo.emitProgressChange()
 
-                    // Use installPath directly since it already includes the game-specific folder
                     gameInstallDir.mkdirs()
 
                     val assembleResult = assembleFiles(gameFiles, chunkCacheDir, gameInstallDir, downloadInfo)
@@ -456,9 +552,11 @@ class GOGDownloadManager
                         return@withContext assembleResult
                     }
 
-                    // Download Dependencies (They will either go to root or supportDir depending on )
                     if (supportDir != null && dependencies.isNotEmpty()) {
-                        downloadInfo.updateStatusMessage("Downloading dependencies...")
+                        downloadInfo.updateStatus(
+                            com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.DOWNLOADING,
+                            context.getString(R.string.downloads_queue_phase_downloading),
+                        )
                         supportDir.mkdirs()
 
                         val dependencyResult = downloadDependencies(gameId, dependencies, installPath, supportDir, downloadInfo)
@@ -467,10 +565,21 @@ class GOGDownloadManager
                         }
                     }
 
-                    // Step 11: Cleanup
+                    downloadInfo.updateStatus(
+                        com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.FINALIZING,
+                        context.getString(R.string.downloads_queue_phase_finalizing),
+                    )
+                    downloadInfo.emitProgressChange()
                     chunkCacheDir.deleteRecursively()
 
-                    saveManifestToGameDir(installPath, gameManifest, selectedBuild.buildId, selectedBuild.versionName, effectiveLang)
+                    saveManifestToGameDir(
+                        installPath,
+                        gameManifest,
+                        selectedBuild.buildId,
+                        selectedBuild.versionName,
+                        effectiveLang,
+                        selectedDlcIds,
+                    )
 
                     finalizeInstallSuccess(gameId, installPath, downloadInfo)
                     Timber.tag("GOG").i("Download completed successfully for game $gameId")
@@ -495,21 +604,19 @@ class GOGDownloadManager
                 }
             }
 
-        /**
-         * Saves manifest data needed for post-install setup (scriptinterpreter or temp_executable) to
-         * installPath/_gog_manifest.json. Used on first launch to create registry keys etc.
-         * @param language Language used for the download (from the selected language depots).
-         */
         private fun saveManifestToGameDir(
             installPath: File,
             gameManifest: GOGManifestMeta,
             buildId: String,
             versionName: String,
             language: String,
+            selectedDlcIds: Set<String> = emptySet(),
         ) {
             try {
+                val installedDlcIds = GOGManifestUtils.getInstalledDlcIds(installPath) + selectedDlcIds
+                val installedProductIds = installedDlcIds + gameManifest.baseProductId
                 val productsArray = JSONArray()
-                gameManifest.products.forEach { p ->
+                gameManifest.products.filter { it.productId in installedProductIds }.forEach { p ->
                     productsArray.put(
                         JSONObject().apply {
                             put("productId", p.productId)
@@ -525,6 +632,12 @@ class GOGDownloadManager
                         put("baseProductId", gameManifest.baseProductId)
                         put("scriptInterpreter", gameManifest.scriptInterpreter)
                         put("products", productsArray)
+                        put(
+                            "installedDlcIds",
+                            JSONArray().apply {
+                                installedDlcIds.sorted().forEach { put(it) }
+                            },
+                        )
                         put("buildId", buildId)
                         put("versionName", versionName)
                         put("language", language)
@@ -537,16 +650,15 @@ class GOGDownloadManager
             }
         }
 
-        /**
-         * Shared finalization after a successful install: update DB, set download complete, emit events.
-         * Used by both Gen 2 and Gen 1 success paths.
-         */
         private suspend fun finalizeInstallSuccess(
             gameId: String,
             installPath: File,
             downloadInfo: DownloadInfo,
         ) {
-            downloadInfo.updateStatusMessage("Updating database...")
+            MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(installPath.absolutePath, Marker.DOWNLOAD_COMPLETE_MARKER)
+
+            downloadInfo.updateStatusMessage("Updating database")
             try {
                 val game = gogManager.getGameFromDbById(gameId)
                 if (game != null) {
@@ -563,8 +675,6 @@ class GOGDownloadManager
             downloadInfo.setProgress(1.0f)
             downloadInfo.setActive(false)
             downloadInfo.emitProgressChange()
-            MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-            MarkerUtils.addMarker(installPath.absolutePath, Marker.DOWNLOAD_COMPLETE_MARKER)
             com.winlator.cmod.app.PluviaApp.events.emitJava(
                 com.winlator.cmod.feature.stores.steam.events.AndroidEvent
                     .DownloadStatusChanged(gameId.toIntOrNull() ?: 0, false),
@@ -588,10 +698,13 @@ class GOGDownloadManager
             language: String,
             withDlcs: Boolean,
             supportDir: File?,
+            selectedDlcIds: Set<String>,
+            verifyMode: Boolean = false,
         ): Result<Unit> =
             withContext(Dispatchers.IO) {
                 try {
                     Timber.tag("GOG").i("Starting Gen 1 (legacy) download for game $gameId")
+
                     val timestamp =
                         gameManifest.productTimestamp
                             ?: return@withContext Result.failure(Exception("Gen 1 manifest missing productTimestamp"))
@@ -599,7 +712,7 @@ class GOGDownloadManager
                     val ownedGameIds = gogManager.getAllGameIds()
 
                     // Filter depots by selected language (same logic as Gen 2), then by ownership
-                    downloadInfo.updateStatusMessage("Filtering depots...")
+                    downloadInfo.updateStatusMessage("Filtering depots")
                     val (languageDepots, effectiveLang) = parser.filterDepotsByLanguage(gameManifest, language)
                     if (languageDepots.isEmpty()) {
                         return@withContext Result.failure(
@@ -612,7 +725,12 @@ class GOGDownloadManager
                     }
 
                     val baseProductId = gameManifest.baseProductId
-                    val filesToDownload = if (withDlcs) depots else depots.filter { it.productId == baseProductId }
+                    val requestedProductIds =
+                        buildSet {
+                            add(baseProductId)
+                            if (withDlcs) addAll(selectedDlcIds)
+                        }
+                    val filesToDownload = depots.filter { it.productId in requestedProductIds }
                     if (filesToDownload.isEmpty()) {
                         return@withContext Result.failure(Exception("No depots to download"))
                     }
@@ -620,8 +738,16 @@ class GOGDownloadManager
                     val productIds = filesToDownload.map { it.productId }.toSet()
                     val securePath = "/$platform/$timestamp/"
                     val productUrlMap = mutableMapOf<String, List<String>>()
-                    for (productId in productIds) {
-                        val linksResult = apiClient.getSecureLink(productId = productId, path = securePath, generation = 1)
+                    val gen1LinkResults =
+                        coroutineScope {
+                            productIds
+                                .map { productId ->
+                                    async {
+                                        productId to apiClient.getSecureLink(productId = productId, path = securePath, generation = 1)
+                                    }
+                                }.awaitAll()
+                        }
+                    for ((productId, linksResult) in gen1LinkResults) {
                         if (linksResult.isFailure) {
                             return@withContext Result.failure(
                                 linksResult.exceptionOrNull() ?: Exception("Failed to get secure link for product $productId"),
@@ -636,10 +762,32 @@ class GOGDownloadManager
                     )
                     val allV1Files = mutableListOf<FileWithProduct>()
 
-                    downloadInfo.updateStatusMessage("Fetching depot manifests...")
+                    downloadInfo.updateStatusMessage("Fetching depot manifests (${filesToDownload.size})")
+                    val gen1DepotJsonResults =
+                        coroutineScope {
+                            val limit = minOf(MAX_PARALLEL_MANIFEST_FETCHES, filesToDownload.size).coerceAtLeast(1)
+                            val nextIndex = AtomicInteger(0)
+                            val perDepot = arrayOfNulls<Result<String>>(filesToDownload.size)
+                            val completed = AtomicInteger(0)
+                            (0 until limit)
+                                .map {
+                                    async {
+                                        while (true) {
+                                            val i = nextIndex.getAndIncrement()
+                                            if (i >= filesToDownload.size) break
+                                            val d = filesToDownload[i]
+                                            perDepot[i] =
+                                                apiClient.fetchDepotManifestV1(d.productId, platform, timestamp, d.manifest)
+                                            val done = completed.incrementAndGet()
+                                            downloadInfo.updateStatusMessage("Fetching depot $done/${filesToDownload.size}")
+                                        }
+                                    }
+                                }.awaitAll()
+                            perDepot.toList()
+                        }
                     for ((idx, depot) in filesToDownload.withIndex()) {
-                        downloadInfo.updateStatusMessage("Fetching depot ${idx + 1}/${filesToDownload.size}...")
-                        val depotJsonResult = apiClient.fetchDepotManifestV1(depot.productId, platform, timestamp, depot.manifest)
+                        val depotJsonResult = gen1DepotJsonResults[idx]
+                            ?: return@withContext Result.failure(Exception("Missing Gen 1 depot result for ${depot.manifest}"))
                         if (depotJsonResult.isFailure) {
                             return@withContext Result.failure(
                                 depotJsonResult.exceptionOrNull() ?: Exception("Failed to fetch depot manifest"),
@@ -651,26 +799,32 @@ class GOGDownloadManager
 
                     var gameFiles = allV1Files.filter { !it.file.isSupport }
                     var supportFiles = allV1Files.filter { it.file.isSupport }
-                    gameFiles =
-                        gameFiles.filter { f ->
-                            val outFile = File(installPath, f.file.path)
-                            !fileExistsWithCorrectSize(outFile, f.file.size, f.file.hash.takeIf { it.isNotEmpty() })
+                    // Resume check — size-only by default. In verify mode, use the file's full MD5
+                    // (Gen 1 manifests store a per-file hash, not per-chunk hashes like Gen 2).
+                    fun v1IsValid(f: FileWithProduct, baseDir: File): Boolean {
+                        val outFile = File(baseDir, f.file.path)
+                        return if (verifyMode) {
+                            val expectedHash = f.file.hash.takeIf { it.isNotBlank() }
+                            fileExistsWithCorrectSize(outFile, f.file.size, expectedHash)
+                        } else {
+                            fileExistsWithCorrectSize(outFile, f.file.size)
                         }
+                    }
+                    if (verifyMode) downloadInfo.updateStatusMessage("Verifying installed files")
+                    gameFiles = gameFiles.filterNot { v1IsValid(it, installPath) }
                     if (supportDir != null) {
-                        supportFiles =
-                            supportFiles.filter { f ->
-                                val outFile = File(supportDir, f.file.path)
-                                !fileExistsWithCorrectSize(outFile, f.file.size, f.file.hash.takeIf { it.isNotEmpty() })
-                            }
+                        supportFiles = supportFiles.filterNot { v1IsValid(it, supportDir) }
                     }
                     val totalSize =
                         gameFiles.sumOf { it.file.size } +
                             if (supportDir != null) supportFiles.sumOf { it.file.size } else 0L
                     downloadInfo.setTotalExpectedBytes(totalSize)
-                    downloadInfo.updateStatusMessage("Downloading files...")
+                    downloadInfo.updateStatusMessage("Downloading files")
                     downloadInfo.setProgress(0f)
                     downloadInfo.setActive(true)
                     downloadInfo.emitProgressChange()
+                    installPath.mkdirs()
+                    MarkerUtils.addMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
 
                     val totalFiles = gameFiles.size + if (supportDir != null) supportFiles.size else 0
                     var doneFiles = 0
@@ -717,9 +871,8 @@ class GOGDownloadManager
                                 if (!response.isSuccessful) return Result.failure(Exception("HTTP ${response.code} for ${file.path}"))
                                 val body = response.body ?: return Result.failure(Exception("Empty response"))
                                 val md = MessageDigest.getInstance("MD5")
-                                val buffer = ByteArray(256 * 1024) // 256KB
-                                val progressInterval = 512L * 1024 // emit progress every 512KB
-                                var copiedInFile = 0L
+                                val buffer = ByteArray(1024 * 1024) // 1MB
+                                var lastEmitMs = 0L
                                 DigestOutputStream(
                                     BufferedOutputStream(FileOutputStream(outFile)),
                                     md,
@@ -732,10 +885,10 @@ class GOGDownloadManager
                                                 return Result.failure(Exception("Download cancelled"))
                                             }
                                             out.write(buffer, 0, n)
-                                            copiedInFile += n
                                             downloadInfo.updateBytesDownloaded(n.toLong())
-                                            if (copiedInFile >= progressInterval || downloadInfo.getBytesDownloaded() >= totalSize) {
-                                                copiedInFile = 0L
+                                            val now = System.currentTimeMillis()
+                                            if (now - lastEmitMs >= PROGRESS_EMIT_INTERVAL_MS) {
+                                                lastEmitMs = now
                                                 downloadInfo.setProgress(
                                                     (downloadInfo.getBytesDownloaded().toFloat() / totalSize).coerceIn(0f, 1f),
                                                 )
@@ -765,24 +918,48 @@ class GOGDownloadManager
                     }
 
                     for (f in gameFiles) {
-                        if (!downloadInfo.isActive()) return@withContext Result.failure(Exception("Download cancelled"))
+                        if (!downloadInfo.isActive()) {
+                            MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                            return@withContext Result.failure(Exception("Download cancelled"))
+                        }
                         downloadInfo.updateStatusMessage("Downloading ${f.file.path}")
                         val res = downloadOneFile(f, installPath)
-                        if (res.isFailure) return@withContext res
+                        if (res.isFailure) {
+                            MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                            return@withContext res
+                        }
                         doneFiles++
                     }
                     if (supportDir != null) {
                         supportDir.mkdirs()
                         for (f in supportFiles) {
-                            if (!downloadInfo.isActive()) return@withContext Result.failure(Exception("Download cancelled"))
+                            if (!downloadInfo.isActive()) {
+                                MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                                return@withContext Result.failure(Exception("Download cancelled"))
+                            }
                             downloadInfo.updateStatusMessage("Downloading support ${f.file.path}")
                             val res = downloadOneFile(f, supportDir)
-                            if (res.isFailure) return@withContext res
+                            if (res.isFailure) {
+                                MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                                return@withContext res
+                            }
                             doneFiles++
                         }
                     }
 
-                    saveManifestToGameDir(installPath, gameManifest, selectedBuild.buildId, selectedBuild.versionName, effectiveLang)
+                    downloadInfo.updateStatus(
+                        com.winlator.cmod.feature.stores.steam.enums.DownloadPhase.FINALIZING,
+                        context.getString(R.string.downloads_queue_phase_finalizing),
+                    )
+                    downloadInfo.emitProgressChange()
+                    saveManifestToGameDir(
+                        installPath,
+                        gameManifest,
+                        selectedBuild.buildId,
+                        selectedBuild.versionName,
+                        effectiveLang,
+                        selectedDlcIds,
+                    )
 
                     finalizeInstallSuccess(gameId, installPath, downloadInfo)
                     Timber.tag("GOG").i("Gen 1 download completed for game $gameId")
@@ -793,6 +970,7 @@ class GOGDownloadManager
                     downloadInfo.setProgress(-1.0f)
                     downloadInfo.setActive(false)
                     downloadInfo.emitProgressChange()
+                    MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
                     com.winlator.cmod.app.PluviaApp.events.emitJava(
                         com.winlator.cmod.feature.stores.steam.events.AndroidEvent
                             .DownloadStatusChanged(gameId.toIntOrNull() ?: 0, false),
@@ -818,108 +996,94 @@ class GOGDownloadManager
             chunkHashes: List<String>,
             secureLinkContext: SecureLinkContext,
             chunkToProductMap: Map<String, String>,
+            progressSink: ((bytesDone: Long, total: Long) -> Unit)? = null,
         ): Result<Unit> =
             withContext(Dispatchers.IO) {
                 try {
-                    var currentChunkUrlMap = chunkUrlMap
-                    val chunks = chunkUrlMap.entries.toList()
+                    val currentChunkUrlMap = AtomicReference(chunkUrlMap)
+                    val chunks = chunkHashes.distinct()
                     val totalChunks = chunks.size
-                    var downloadedChunks = 0
+                    val nextChunkIndex = AtomicInteger(0)
+                    val downloadedChunks = AtomicInteger(0)
+                    val refreshMutex = Mutex()
 
-                    Timber.tag("GOG").d("Downloading $totalChunks chunks...")
+                    Timber.tag("GOG").d("Downloading $totalChunks chunks")
+
+                    if (totalChunks == 0) {
+                        return@withContext Result.success(Unit)
+                    }
 
-                    // Initialize download progress
                     downloadInfo.setProgress(0.0f)
                     downloadInfo.setActive(true)
                     downloadInfo.emitProgressChange()
 
-                    // Download in batches to avoid overwhelming the system
-                    chunks.chunked(MAX_PARALLEL_DOWNLOADS).forEach { chunkBatch ->
-                        if (!downloadInfo.isActive()) {
-                            Timber.tag("GOG").w("Download cancelled by user")
-                            return@withContext Result.failure(Exception("Download cancelled"))
-                        }
-
-                        // Download batch in parallel with retry logic
-                        val results =
-                            chunkBatch
-                                .map { (chunkMd5, _) ->
-                                    async {
-                                        // Use current URL map in case it was refreshed
-                                        val url =
-                                            currentChunkUrlMap[chunkMd5] ?: return@async Result.failure<File>(
-                                                Exception("No URL found for chunk $chunkMd5"),
-                                            )
-                                        downloadChunkWithRetry(chunkMd5, url, chunkCacheDir, downloadInfo)
+                    suspend fun downloadOneChunk(chunkMd5: String): File {
+                        var refreshAttempts = 0
+                        while (true) {
+                            val url =
+                                currentChunkUrlMap.get()[chunkMd5]
+                                    ?: throw Exception("No URL found for chunk $chunkMd5")
+                            val result = downloadChunkWithRetry(chunkMd5, url, chunkCacheDir, downloadInfo)
+                            if (result.isSuccess) return result.getOrThrow()
+
+                            val exception = result.exceptionOrNull()
+                            if (exception is HttpStatusException &&
+                                exception.statusCode in EXPIRED_LINK_STATUS_CODES &&
+                                refreshAttempts < MAX_CHUNK_RETRIES
+                            ) {
+                                refreshMutex.withLock {
+                                    if (currentChunkUrlMap.get()[chunkMd5] == url) {
+                                        val productId = chunkToProductMap[chunkMd5]
+                                        Timber
+                                            .tag("GOG")
+                                            .w("Chunk $chunkMd5 belongs to product $productId: ${exception.message}; refreshing secure links")
+                                        val refreshResult = refreshSecureLinks(secureLinkContext, chunkHashes)
+                                        if (refreshResult.isFailure) {
+                                            throw refreshResult.exceptionOrNull()
+                                                ?: Exception("Failed to refresh secure links")
+                                        }
+                                        currentChunkUrlMap.set(refreshResult.getOrThrow())
+                                        Timber.tag("GOG").i("Secure links refreshed successfully")
                                     }
-                                }.awaitAll()
-
-                        // Check if any download failed due to expired links (401/403/404)
-                        val expiredLinkFailures =
-                            results.zip(chunkBatch).filter { (result, _) ->
-                                val exception = result.exceptionOrNull()
-                                exception is HttpStatusException && exception.statusCode in listOf(401, 403, 404)
+                                }
+                                refreshAttempts++
+                                continue
                             }
 
-                        if (expiredLinkFailures.isNotEmpty()) {
-                            Timber.tag("GOG").w("Detected ${expiredLinkFailures.size} expired secure link(s), refreshing...")
-
-                            // Log which products the failing chunks belong to
-                            expiredLinkFailures.forEach { (result, chunk) ->
-                                val chunkMd5 = chunk.key
-                                val productId = chunkToProductMap[chunkMd5]
-                                Timber.tag("GOG").w("Chunk $chunkMd5 belongs to product $productId: ${result.exceptionOrNull()?.message}")
-                            }
+                            throw exception ?: Exception("Failed to download chunk $chunkMd5")
+                        }
+                    }
 
-                            // Refresh secure links
-                            val refreshResult = refreshSecureLinks(secureLinkContext, chunkHashes)
-                            if (refreshResult.isSuccess) {
-                                currentChunkUrlMap = refreshResult.getOrThrow()
-                                Timber.tag("GOG").i("Secure links refreshed successfully, retrying failed chunks")
-
-                                // Retry the failed chunks with new URLs
-                                val retryResults =
-                                    chunkBatch
-                                        .map { (chunkMd5, _) ->
-                                            async {
-                                                val url =
-                                                    currentChunkUrlMap[chunkMd5] ?: return@async Result.failure<File>(
-                                                        Exception("No URL found for chunk $chunkMd5 after refresh"),
-                                                    )
-                                                downloadChunkWithRetry(chunkMd5, url, chunkCacheDir, downloadInfo)
-                                            }
-                                        }.awaitAll()
+                    val workers = minOf(MAX_PARALLEL_DOWNLOADS, totalChunks).coerceAtLeast(1)
+                    coroutineScope {
+                        (0 until workers)
+                            .map {
+                                async {
+                                    while (true) {
+                                        if (!downloadInfo.isActive()) {
+                                            throw kotlinx.coroutines.CancellationException("Download cancelled")
+                                        }
 
-                                // Check retry results
-                                retryResults.firstOrNull { it.isFailure }?.let { failedResult ->
-                                    return@withContext Result.failure(
-                                        failedResult.exceptionOrNull() ?: Exception("Failed to download chunk after link refresh"),
-                                    )
-                                }
-                            } else {
-                                Timber.tag("GOG").e("Failed to refresh secure links: ${refreshResult.exceptionOrNull()?.message}")
-                                return@withContext Result.failure(
-                                    refreshResult.exceptionOrNull() ?: Exception("Failed to refresh secure links"),
-                                )
-                            }
-                        } else {
-                            // Check if any download failed for other reasons
-                            results.firstOrNull { it.isFailure }?.let { failedResult ->
-                                return@withContext Result.failure(
-                                    failedResult.exceptionOrNull() ?: Exception("Failed to download chunk"),
-                                )
-                            }
-                        }
+                                        val index = nextChunkIndex.getAndIncrement()
+                                        if (index >= totalChunks) break
 
-                        downloadedChunks += chunkBatch.size
+                                        val chunkMd5 = chunks[index]
+                                        downloadOneChunk(chunkMd5)
 
-                        // Update progress with smooth interpolation
-                        val progress = downloadedChunks.toFloat() / totalChunks
-                        downloadInfo.setProgress(progress)
-                        downloadInfo.updateStatusMessage("Downloading chunks ($downloadedChunks/$totalChunks)")
-                        downloadInfo.emitProgressChange()
+                                        val completed = downloadedChunks.incrementAndGet()
+                                        val progress = completed.toFloat() / totalChunks
+                                        downloadInfo.setProgress(progress)
+                                        downloadInfo.updateStatusMessage("Downloading chunks ($completed/$totalChunks)")
+                                        downloadInfo.emitProgressChange()
+                                        progressSink?.invoke(
+                                            downloadInfo.getBytesDownloaded(),
+                                            downloadInfo.getTotalExpectedBytes(),
+                                        )
 
-                        Timber.tag("GOG").d("Progress: ${(progress * 100).toInt()}% ($downloadedChunks/$totalChunks chunks)")
+                                        Timber.tag("GOG").d("Progress: ${(progress * 100).toInt()}% ($completed/$totalChunks chunks)")
+                                    }
+                                }
+                            }.awaitAll()
                     }
 
                     Timber.tag("GOG").i("All $totalChunks chunks downloaded successfully")
@@ -951,7 +1115,6 @@ class GOGDownloadManager
 
                     Timber.tag("GOG").i("Downloading ${dependencies.size} dependencies: ${dependencies.joinToString()}")
 
-                    // Get dependency repository
                     val dependencyRepositoryResult = apiClient.fetchDependencyRepository(DEPENDENCY_URL)
                     if (dependencyRepositoryResult.isFailure) {
                         return@withContext Result.failure(
@@ -987,7 +1150,6 @@ class GOGDownloadManager
 
                     Timber.tag("GOG").d("Found ${filteredDepots.size} dependency depot(s) to download")
 
-                    // Get open link URLs for dependencies
                     val openLinkResult = apiClient.getDependencyOpenLink()
                     if (openLinkResult.isFailure) {
                         return@withContext Result.failure(
@@ -1010,7 +1172,6 @@ class GOGDownloadManager
 
                         Timber.tag("GOG").i("Downloading dependency: ${depot.readableName} (${depot.dependencyId})")
 
-                        // Determine install directory based on executable path
                         // If path starts with __redist, install to supportDir, otherwise install to gameDir
                         val installBaseDir =
                             if (depot.executable?.path?.startsWith("__redist") == true) {
@@ -1041,10 +1202,8 @@ class GOGDownloadManager
                             continue
                         }
 
-                        // Extract chunk hashes
                         val chunkHashes = parser.extractChunkHashes(depotFiles)
 
-                        // Build chunk URL map using dependency base URLs
                         val chunkUrlMap = buildChunkUrlMap(chunkHashes, dependencyBaseUrls)
 
                         // Create cache directory for this dependency
@@ -1173,32 +1332,42 @@ class GOGDownloadManager
                 try {
                     val chunks = chunkUrlMap.entries.toList()
                     val totalChunks = chunks.size
-                    var downloadedChunks = 0
+                    val nextChunkIndex = AtomicInteger(0)
+                    val downloadedChunks = AtomicInteger(0)
 
                     downloadInfo.setProgress(0f)
                     downloadInfo.setActive(true)
                     downloadInfo.emitProgressChange()
 
-                    // Download in batches
-                    chunks.chunked(MAX_PARALLEL_DOWNLOADS).forEach { chunkBatch ->
-                        val results =
-                            chunkBatch
-                                .map { (chunkMd5, url) ->
-                                    async {
-                                        downloadChunk(chunkMd5, url, chunkCacheDir, downloadInfo)
-                                    }
-                                }.awaitAll()
+                    if (totalChunks == 0) {
+                        return@withContext Result.success(Unit)
+                    }
 
-                        // Check if any download failed
-                        results.firstOrNull { it.isFailure }?.let { failedResult ->
-                            return@withContext Result.failure(
-                                failedResult.exceptionOrNull() ?: Exception("Failed to download chunk"),
-                            )
-                        }
+                    val workers = minOf(MAX_PARALLEL_DOWNLOADS, totalChunks).coerceAtLeast(1)
+                    coroutineScope {
+                        (0 until workers)
+                            .map {
+                                async {
+                                    while (true) {
+                                        if (!downloadInfo.isActive()) {
+                                            throw kotlinx.coroutines.CancellationException("Download cancelled")
+                                        }
 
-                        downloadedChunks += chunkBatch.size
-                        downloadInfo.setProgress(downloadedChunks.toFloat() / totalChunks)
-                        downloadInfo.emitProgressChange()
+                                        val index = nextChunkIndex.getAndIncrement()
+                                        if (index >= totalChunks) break
+
+                                        val (chunkMd5, url) = chunks[index]
+                                        val result = downloadChunk(chunkMd5, url, chunkCacheDir, downloadInfo)
+                                        if (result.isFailure) {
+                                            throw result.exceptionOrNull() ?: Exception("Failed to download chunk $chunkMd5")
+                                        }
+
+                                        val completed = downloadedChunks.incrementAndGet()
+                                        downloadInfo.setProgress(completed.toFloat() / totalChunks)
+                                        downloadInfo.emitProgressChange()
+                                    }
+                                }
+                            }.awaitAll()
                     }
 
                     Result.success(Unit)
@@ -1223,14 +1392,22 @@ class GOGDownloadManager
                 try {
                     val productUrlMap = mutableMapOf<String, List<String>>()
 
-                    // Get secure links for each product
-                    for (productId in context.productIds) {
-                        val linksResult =
-                            apiClient.getSecureLink(
-                                productId = productId,
-                                path = "/",
-                                generation = context.generation,
-                            )
+                    // Get secure links for each product in parallel.
+                    val refreshed =
+                        coroutineScope {
+                            context.productIds
+                                .map { productId ->
+                                    async {
+                                        productId to
+                                            apiClient.getSecureLink(
+                                                productId = productId,
+                                                path = "/",
+                                                generation = context.generation,
+                                            )
+                                    }
+                                }.awaitAll()
+                        }
+                    for ((productId, linksResult) in refreshed) {
                         if (linksResult.isSuccess) {
                             productUrlMap[productId] = linksResult.getOrThrow().urls
                         } else {
@@ -1286,7 +1463,7 @@ class GOGDownloadManager
                             .tag(
                                 "GOG",
                             ).w(
-                                "Chunk $chunkMd5 download failed (attempt ${attempt + 1}/$MAX_CHUNK_RETRIES): ${lastException?.message}. Retrying in ${delay}ms...",
+                                "Chunk $chunkMd5 download failed (attempt ${attempt + 1}/$MAX_CHUNK_RETRIES): ${lastException?.message}. Retrying in ${delay}ms",
                             )
                         kotlinx.coroutines.delay(delay)
                     }
@@ -1311,22 +1488,18 @@ class GOGDownloadManager
             downloadInfo: DownloadInfo,
         ): Result<File> =
             withContext(Dispatchers.IO) {
-                try {
-                    val chunkFile = File(chunkCacheDir, "$chunkMd5.chunk")
-
-                    // Skip if already downloaded and verified
-                    if (chunkFile.exists()) {
-                        val existingMd5 = calculateMd5(chunkFile.readBytes())
-                        if (existingMd5 == chunkMd5) {
-                            Timber.tag("GOG").d("Chunk $chunkMd5 already exists and verified, skipping")
-                            return@withContext Result.success(chunkFile)
-                        } else {
-                            Timber.tag("GOG").w("Chunk $chunkMd5 exists but failed verification, re-downloading")
-                            chunkFile.delete()
-                        }
-                    }
+                val chunkFile = File(chunkCacheDir, "$chunkMd5.chunk")
+
+                // Cache hit: chunk files are only renamed to the final name after the streamed MD5
+                // matched, so existence implies verification — no need to re-hash.
+                if (chunkFile.exists()) {
+                    return@withContext Result.success(chunkFile)
+                }
+
+                val tempFile = File(chunkCacheDir, "$chunkMd5.chunk.tmp")
+                tempFile.delete()
 
-                    // Download compressed chunk
+                try {
                     Timber.tag("GOG").d("Downloading chunk $chunkMd5 from: $url")
 
                     val request =
@@ -1344,44 +1517,60 @@ class GOGDownloadManager
                             )
                         }
 
-                        // Stream the chunk body so pause/cancel takes effect mid-chunk instead
-                        // of waiting for body.bytes() to complete.
                         val body = response.body
                             ?: return@withContext Result.failure(Exception("Empty response for chunk $chunkMd5"))
-                        val compressedBytes =
-                            java.io.ByteArrayOutputStream().use { buffer ->
-                                body.byteStream().use { input ->
-                                    val chunkBuffer = ByteArray(64 * 1024)
-                                    var bytesRead: Int
-                                    while (input.read(chunkBuffer).also { bytesRead = it } != -1) {
-                                        if (!downloadInfo.isActive() || downloadInfo.isCancelling) {
-                                            return@withContext Result.failure(
-                                                kotlinx.coroutines.CancellationException(
-                                                    "Download cancelled mid-chunk",
-                                                ),
-                                            )
-                                        }
-                                        buffer.write(chunkBuffer, 0, bytesRead)
+
+                        val digest = MessageDigest.getInstance("MD5")
+                        var cancelled = false
+
+                        DigestOutputStream(BufferedOutputStream(FileOutputStream(tempFile)), digest).use { out ->
+                            body.byteStream().use { input ->
+                                val buffer = ByteArray(STREAM_BUFFER_SIZE)
+                                var bytesRead: Int
+                                while (input.read(buffer).also { bytesRead = it } != -1) {
+                                    if (!downloadInfo.isActive() || downloadInfo.isCancelling) {
+                                        cancelled = true
+                                        break
                                     }
+                                    out.write(buffer, 0, bytesRead)
+                                    downloadInfo.updateBytesDownloaded(bytesRead.toLong())
                                 }
-                                buffer.toByteArray()
                             }
+                        }
 
-                        // Verify compressed MD5
-                        val actualMd5 = calculateMd5(compressedBytes)
+                        if (cancelled) {
+                            tempFile.delete()
+                            return@withContext Result.failure(
+                                kotlinx.coroutines.CancellationException("Download cancelled mid-chunk"),
+                            )
+                        }
+
+                        val actualMd5 = digest.digest().joinToString("") { "%02x".format(it) }
                         if (actualMd5 != chunkMd5) {
+                            tempFile.delete()
                             return@withContext Result.failure(
                                 Exception("Compressed MD5 mismatch for chunk: expected $chunkMd5, got $actualMd5"),
                             )
                         }
 
-                        // Save compressed chunk (will decompress during assembly)
-                        chunkFile.writeBytes(compressedBytes)
-                        downloadInfo.updateBytesDownloaded(compressedBytes.size.toLong())
+                        if (!tempFile.renameTo(chunkFile)) {
+                            // Fall back: copy then delete. Rare; usually only happens across filesystems.
+                            try {
+                                tempFile.inputStream().use { input ->
+                                    FileOutputStream(chunkFile).use { output -> input.copyTo(output) }
+                                }
+                                tempFile.delete()
+                            } catch (e: Exception) {
+                                tempFile.delete()
+                                chunkFile.delete()
+                                return@withContext Result.failure(Exception("Failed to finalize chunk $chunkMd5", e))
+                            }
+                        }
 
                         Result.success(chunkFile)
                     }
                 } catch (e: Exception) {
+                    tempFile.delete()
                     Timber.tag("GOG").e(e, "Failed to download chunk $chunkMd5")
                     Result.failure(e)
                 }
@@ -1409,8 +1598,11 @@ class GOGDownloadManager
                         if (!downloadInfo.isActive()) {
                             return@withContext Result.failure(Exception("Download cancelled"))
                         }
-
-                        downloadInfo.updateStatusMessage("Assembling ${index + 1}/$totalFiles: ${file.path}")
+                      
+                        downloadInfo.updateStatusMessage(
+                            context.getString(R.string.downloads_queue_phase_unpacking) +
+                                " ${index + 1}/$totalFiles: ${file.path}",
+                        )
 
                         val assembleResult = assembleFile(file, chunkCacheDir, installDir)
                         if (assembleResult.isFailure) {
@@ -1445,41 +1637,54 @@ class GOGDownloadManager
                     val outputFile = File(installDir, file.path)
                     outputFile.parentFile?.mkdirs()
 
-                    outputFile.outputStream().use { output ->
+                    BufferedOutputStream(FileOutputStream(outputFile)).use { output ->
+                        val buffer = ByteArray(STREAM_BUFFER_SIZE)
                         for (chunk in file.chunks) {
-                            // Get compressed chunk file
                             val chunkFile = File(chunkCacheDir, "${chunk.compressedMd5}.chunk")
-
                             if (!chunkFile.exists()) {
                                 return@withContext Result.failure(
                                     Exception("Chunk file missing: ${chunk.compressedMd5}"),
                                 )
                             }
 
-                            // Read compressed data
-                            val compressedBytes = chunkFile.readBytes()
-
-                            // Decompress chunk
-                            val decompressedBytes = decompressChunk(compressedBytes, chunk)
-                            if (decompressedBytes.isFailure) {
+                            val digest = MessageDigest.getInstance("MD5")
+                            var bytesEmitted = 0L
+
+                            try {
+                                BufferedInputStream(chunkFile.inputStream()).use { rawIn ->
+                                    val decompressedStream: InputStream =
+                                        if (chunk.compressedSize == null) rawIn else InflaterInputStream(rawIn)
+                                    DigestInputStream(decompressedStream, digest).use { input ->
+                                        var bytesRead: Int
+                                        while (input.read(buffer).also { bytesRead = it } != -1) {
+                                            output.write(buffer, 0, bytesRead)
+                                            bytesEmitted += bytesRead
+                                        }
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                // Treat decode failures as a poisoned cache entry and let the next
+                                // install attempt re-download the chunk fresh.
+                                chunkFile.delete()
                                 return@withContext Result.failure(
-                                    decompressedBytes.exceptionOrNull()
-                                        ?: Exception("Failed to decompress chunk ${chunk.compressedMd5}"),
+                                    Exception("Failed to decompress chunk ${chunk.compressedMd5}", e),
                                 )
                             }
 
-                            val data = decompressedBytes.getOrThrow()
+                            if (bytesEmitted != chunk.size) {
+                                chunkFile.delete()
+                                return@withContext Result.failure(
+                                    Exception("Decompressed size mismatch for chunk ${chunk.compressedMd5}: expected ${chunk.size}, got $bytesEmitted"),
+                                )
+                            }
 
-                            // Verify decompressed MD5
-                            val actualMd5 = calculateMd5(data)
+                            val actualMd5 = digest.digest().joinToString("") { "%02x".format(it) }
                             if (actualMd5 != chunk.md5) {
+                                chunkFile.delete()
                                 return@withContext Result.failure(
                                     Exception("Decompressed MD5 mismatch for chunk: expected ${chunk.md5}, got $actualMd5"),
                                 )
                             }
-
-                            // Write to output file
-                            output.write(data)
                         }
                     }
 
@@ -1500,81 +1705,6 @@ class GOGDownloadManager
                 }
             }
 
-        /**
-         * Decompress a GOG chunk using zlib
-         *
-         * GOG chunks are compressed with zlib
-         * If chunk.compressedSize is null, data is uncompressed
-         *
-         * @param compressedBytes Compressed chunk data
-         * @param chunk Chunk metadata
-         * @return Decompressed data
-         */
-        private fun decompressChunk(
-            compressedBytes: ByteArray,
-            chunk: FileChunk,
-        ): Result<ByteArray> {
-            return try {
-                // If no compressed size specified, data is already uncompressed
-                if (chunk.compressedSize == null) {
-                    return Result.success(compressedBytes)
-                }
-
-                // Decompress using zlib
-                val inflater = Inflater()
-                try {
-                    inflater.setInput(compressedBytes)
-                    val outputStream = ByteArrayOutputStream(chunk.size.toInt())
-                    val buffer = ByteArray(8192)
-
-                    while (!inflater.finished()) {
-                        val count = inflater.inflate(buffer)
-                        if (count > 0) {
-                            outputStream.write(buffer, 0, count)
-                        } else {
-                            // No bytes produced - check if we need more input or a dictionary
-                            if (inflater.needsInput()) {
-                                throw java.io.IOException(
-                                    "Incomplete zlib data: decompression requires more input but none available",
-                                )
-                            } else if (inflater.needsDictionary()) {
-                                throw java.io.IOException(
-                                    "Zlib data requires a preset dictionary which is not supported",
-                                )
-                            }
-                            // If neither condition is true, inflater is still processing internally
-                            // Continue loop, but this should be rare
-                        }
-                    }
-
-                    val decompressed = outputStream.toByteArray()
-
-                    // Verify size matches expected
-                    if (decompressed.size.toLong() != chunk.size) {
-                        return Result.failure(
-                            Exception("Decompressed size mismatch: expected ${chunk.size}, got ${decompressed.size}"),
-                        )
-                    }
-
-                    Result.success(decompressed)
-                } finally {
-                    inflater.end()
-                }
-            } catch (e: Exception) {
-                Timber.tag("GOG").e(e, "Failed to decompress chunk ${chunk.compressedMd5}")
-                Result.failure(e)
-            }
-        }
-
-        /**
-         * Calculate MD5 hash of byte array
-         */
-        private fun calculateMd5(data: ByteArray): String {
-            val digest = MessageDigest.getInstance("MD5")
-            digest.update(data)
-            return digest.digest().joinToString("") { "%02x".format(it) }
-        }
-
         /**
          * Check if file exists and has the expected size. When [expectedMd5] is non-null/non-blank,
          * also verifies content MD5 to reject corrupted files; short-circuits on size mismatch before hashing.
@@ -1589,6 +1719,55 @@ class GOGDownloadManager
             return expectedMd5.isNullOrBlank() || calculateMd5File(outputFile).equals(expectedMd5, ignoreCase = true)
         }
 
+        internal fun isInstalledFileValidByChunkMd5(
+            outputFile: File,
+            file: DepotFile,
+        ): Boolean {
+            if (!outputFile.exists() || !outputFile.isFile) return false
+            val expectedSize = file.chunks.sumOf { it.size }
+            if (outputFile.length() != expectedSize) return false
+            if (file.chunks.isEmpty()) return true
+
+            return try {
+                BufferedInputStream(outputFile.inputStream()).use { input ->
+                    for (chunk in file.chunks) {
+                        val expectedMd5 = chunk.md5
+                        if (expectedMd5.isBlank()) {
+                            // No chunk hash to compare — skip past this chunk's bytes and trust size.
+                            var remaining = chunk.size
+                            val skipBuffer = ByteArray(STREAM_BUFFER_SIZE)
+                            while (remaining > 0) {
+                                val toRead = minOf(skipBuffer.size.toLong(), remaining).toInt()
+                                val read = input.read(skipBuffer, 0, toRead)
+                                if (read < 0) return false
+                                remaining -= read
+                            }
+                            continue
+                        }
+                        val digest = MessageDigest.getInstance("MD5")
+                        var remaining = chunk.size
+                        val buffer = ByteArray(STREAM_BUFFER_SIZE)
+                        while (remaining > 0) {
+                            val toRead = minOf(buffer.size.toLong(), remaining).toInt()
+                            val read = input.read(buffer, 0, toRead)
+                            if (read < 0) return false
+                            digest.update(buffer, 0, read)
+                            remaining -= read
+                        }
+                        val actual = digest.digest().joinToString("") { "%02x".format(it) }
+                        if (!actual.equals(expectedMd5, ignoreCase = true)) {
+                            Timber.tag("GOG").d("Chunk MD5 mismatch for ${file.path}: expected $expectedMd5, got $actual")
+                            return false
+                        }
+                    }
+                }
+                true
+            } catch (e: Exception) {
+                Timber.tag("GOG").w(e, "Error verifying chunks for ${outputFile.absolutePath}")
+                false
+            }
+        }
+
         /**
          * Calculate MD5 hash of file
          */
@@ -1604,12 +1783,6 @@ class GOGDownloadManager
             return digest.digest().joinToString("") { "%02x".format(it) }
         }
 
-        /**
-         * Calculate the total size of a directory recursively
-         *
-         * @param directory The directory to calculate size for
-         * @return Total size in bytes
-         */
         private fun calculateDirectorySize(directory: File): Long {
             var size = 0L
             try {
diff --git a/app/src/main/feature/stores/gog/service/GOGManager.kt b/app/src/main/feature/stores/gog/service/GOGManager.kt
index ef925da11..4a1b7dee5 100644
--- a/app/src/main/feature/stores/gog/service/GOGManager.kt
+++ b/app/src/main/feature/stores/gog/service/GOGManager.kt
@@ -4,9 +4,11 @@ import android.net.Uri
 import androidx.core.net.toUri
 import com.winlator.cmod.app.PluviaApp
 import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
 import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
 import com.winlator.cmod.feature.stores.gog.data.GOGCloudSavesLocation
 import com.winlator.cmod.feature.stores.gog.data.GOGCloudSavesLocationTemplate
+import com.winlator.cmod.feature.stores.gog.data.GOGDlcInfo
 import com.winlator.cmod.feature.stores.gog.data.GOGGame
 import com.winlator.cmod.feature.stores.gog.data.LibraryItem
 import com.winlator.cmod.feature.stores.gog.db.dao.GOGGameDao
@@ -52,56 +54,44 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
+import com.winlator.cmod.feature.stores.gog.api.GOGApiClient as GOGContentApiClient
+import com.winlator.cmod.feature.stores.gog.api.GOGManifestParser as GOGContentManifestParser
 import com.winlator.cmod.shared.io.FileUtils as WinlatorFileUtils
 
-/**
- * Data class to hold size information from gogdl info command
- */
-data class GameSizeInfo(
-    val downloadSize: Long,
-    val diskSize: Long,
+data class GOGManifestSizes(
+    val installSize: Long = 0L,
+    val downloadSize: Long = 0L,
 )
 
-/**
- * Unified manager for GOG game and library operations.
- *
- * Responsibilities:
- * - Database CRUD for GOG games
- * - Library syncing from GOG API
- * - Game downloads and installation
- * - Installation verification
- * - Executable discovery
- * - Wine launch commands
- * - File system operations
- *
- * Uses GOGPythonBridge for all GOGDL command execution.
- * Uses GOGAuthManager for authentication checks.
- */
+data class GOGSaveSyncConfig(
+    val clientId: String,
+    val clientSecret: String,
+    val locations: List<GOGCloudSavesLocationTemplate>,
+)
+
+// Coordinates GOG library, install, verification, launch, and sync operations.
 @Singleton
 class GOGManager
     @Inject
     constructor(
         private val gogGameDao: GOGGameDao,
         @ApplicationContext private val context: Context,
+        private val gogContentApiClient: GOGContentApiClient,
+        private val gogContentManifestParser: GOGContentManifestParser,
     ) {
-        // Thread-safe cache for download sizes
         private val downloadSizeCache = ConcurrentHashMap<String, String>()
         private val REFRESH_BATCH_SIZE = 10
+        private val GOG_PLACEHOLDER_PRODUCT_ID = "2147483047"
 
-        // Cache for remote config API responses (clientId -> save locations)
-        // This avoids fetching the same config multiple times
         private val remoteConfigCache = ConcurrentHashMap<String, List<GOGCloudSavesLocationTemplate>>()
 
-        // Timestamp storage for sync state (gameId_locationName -> timestamp)
-        // Persisted to disk to survive app restarts
+        // Persisted cloud-save sync state.
         private val syncTimestamps = ConcurrentHashMap<String, String>()
         private val timestampFile = File(context.filesDir, "gog_sync_timestamps.json")
 
-        // Track active sync operations to prevent concurrent syncs
         private val activeSyncs = ConcurrentHashMap.newKeySet<String>()
 
         init {
-            // Load persisted cloudsave timestamps on initialization
             loadCloudSaveTimestampsFromDisk()
         }
 
@@ -143,6 +133,384 @@ class GOGManager
                 }
             }
 
+        suspend fun getOwnedDlcsForGame(
+            gameId: String,
+            language: String,
+        ): List<GOGDlcInfo> =
+            withContext(Dispatchers.IO) {
+                try {
+                    val selectedBuild =
+                        selectPreferredBuild(gameId)
+                            ?: return@withContext emptyList()
+                    val manifestResult = gogContentApiClient.fetchManifest(selectedBuild.link)
+                    if (manifestResult.isFailure) {
+                        Timber.tag("GOG").w(manifestResult.exceptionOrNull(), "Failed to fetch manifest for DLC list: $gameId")
+                        return@withContext emptyList()
+                    }
+
+                    val manifest = manifestResult.getOrThrow()
+                    val ownedProductIds = getAllGameIds()
+                    val installedDlcIds = getInstalledDlcIds(gameId)
+
+                    coroutineScope {
+                        val dlcProductIds =
+                            gogContentManifestParser
+                                .findDLCProducts(manifest)
+                                .filter { it.productId in ownedProductIds }
+                                .map { it.productId }
+                                .toSet()
+                        val manifestSizesByProduct =
+                            calculateManifestSizesByProduct(
+                                selectedBuild = selectedBuild,
+                                manifest = manifest,
+                                language = language,
+                                productIds = dlcProductIds,
+                                ownedProductIds = ownedProductIds,
+                            )
+
+                        gogContentManifestParser
+                            .findDLCProducts(manifest)
+                            .filter { it.productId in ownedProductIds }
+                            .map { product ->
+                                async {
+                                    val sizeInfo = manifestSizesByProduct[product.productId] ?: GOGManifestSizes()
+                                    val productDetailsSize =
+                                        GOGApiClient
+                                            .getGameById(context, product.productId, expanded = listOf("downloads"))
+                                            .getOrNull()
+                                            ?.downloadSize
+                                            ?: 0L
+                                    val resolvedSizeInfo = sizeInfo.withProductDetailsFallback(productDetailsSize)
+                                    GOGDlcInfo(
+                                        id = product.productId,
+                                        title = product.name,
+                                        downloadSize = maxOf(resolvedSizeInfo.downloadSize, productDetailsSize),
+                                        installSize = maxOf(resolvedSizeInfo.installSize, productDetailsSize),
+                                        isInstalled = product.productId in installedDlcIds,
+                                    )
+                                }
+                            }.map { it.await() }
+                            .sortedBy { it.title.lowercase(Locale.ROOT) }
+                    }
+                } catch (e: Exception) {
+                    Timber.tag("GOG").w(e, "Failed to get owned DLC for game $gameId")
+                    emptyList()
+                }
+            }
+
+        suspend fun getInstallableSelectedManifestSizes(
+            gameId: String,
+            language: String,
+            selectedDlcIds: Collection<Int> = emptyList(),
+        ): GOGManifestSizes =
+            withContext(Dispatchers.IO) {
+                try {
+                    val selectedBuild = selectPreferredBuild(gameId) ?: return@withContext GOGManifestSizes()
+                    val manifest =
+                        gogContentApiClient
+                            .fetchManifest(selectedBuild.link)
+                            .getOrNull()
+                            ?: return@withContext fallbackGameManifestSizes(gameId)
+                    val baseProductId = manifest.baseProductId.ifBlank { gameId }
+                    val requestedProductIds =
+                        buildSet {
+                            add(baseProductId)
+                            selectedDlcIds.mapTo(this) { it.toString() }
+                        }
+                    val selectedManifestSizes =
+                        calculateSelectedManifestSizes(
+                            selectedBuild = selectedBuild,
+                            manifest = manifest,
+                            language = language,
+                            productIds = requestedProductIds,
+                            ownedProductIds = getAllGameIds(),
+                        )
+                    val productDetailsSizes =
+                        getProductDetailsDownloadSizes(
+                            gameId = gameId,
+                            productIds = requestedProductIds,
+                        )
+                    selectedManifestSizes
+                        .withProductDetailsFallback(productDetailsSizes.values.sum())
+                        .takeIf { it.installSize > 0L || it.downloadSize > 0L }
+                        ?: fallbackGameManifestSizes(gameId)
+                } catch (e: Exception) {
+                    Timber.tag("GOG").w(e, "Failed to calculate selected manifest sizes for game $gameId")
+                    fallbackGameManifestSizes(gameId)
+                }
+            }
+
+        suspend fun getDlcOnlyManifestSizes(
+            gameId: String,
+            dlcId: Int,
+            language: String,
+        ): GOGManifestSizes =
+            withContext(Dispatchers.IO) {
+                try {
+                    val selectedBuild = selectPreferredBuild(gameId) ?: return@withContext GOGManifestSizes()
+                    val manifest =
+                        gogContentApiClient
+                            .fetchManifest(selectedBuild.link)
+                            .getOrNull()
+                            ?: return@withContext GOGManifestSizes()
+                    val manifestSize =
+                        calculateManifestSizesByProduct(
+                            selectedBuild = selectedBuild,
+                            manifest = manifest,
+                            language = language,
+                            productIds = setOf(dlcId.toString()),
+                            ownedProductIds = getAllGameIds(),
+                        )[dlcId.toString()] ?: GOGManifestSizes()
+                    val productDetailsSize =
+                        GOGApiClient
+                            .getGameById(context, dlcId.toString(), expanded = listOf("downloads"))
+                            .getOrNull()
+                            ?.downloadSize
+                            ?: 0L
+                    GOGManifestSizes(
+                        downloadSize = maxOf(manifestSize.withProductDetailsFallback(productDetailsSize).downloadSize, productDetailsSize),
+                        installSize = maxOf(manifestSize.withProductDetailsFallback(productDetailsSize).installSize, productDetailsSize),
+                    )
+                } catch (e: Exception) {
+                    Timber.tag("GOG").w(e, "Failed to calculate DLC manifest size for game $gameId DLC $dlcId")
+                    GOGManifestSizes()
+                }
+            }
+
+        private suspend fun getProductDetailsDownloadSizes(
+            gameId: String,
+            productIds: Set<String>,
+        ): Map<String, Long> =
+            coroutineScope {
+                productIds
+                    .map { productId ->
+                        async {
+                            val size =
+                                if (productId == gameId) {
+                                    getGameFromDbById(gameId)?.downloadSize ?: 0L
+                                } else {
+                                    GOGApiClient
+                                        .getGameById(context, productId, expanded = listOf("downloads"))
+                                        .getOrNull()
+                                        ?.downloadSize
+                                        ?: 0L
+                                }
+                            productId to size
+                        }
+                    }.map { it.await() }
+                    .filter { it.second > 0L }
+                    .toMap()
+            }
+
+        private suspend fun fallbackGameManifestSizes(gameId: String): GOGManifestSizes {
+            val game = getGameFromDbById(gameId)
+            return GOGManifestSizes(
+                downloadSize = game?.downloadSize ?: 0L,
+                installSize = game?.installSize ?: 0L,
+            )
+        }
+
+        private suspend fun calculateManifestSizesByProduct(
+            selectedBuild: com.winlator.cmod.feature.stores.gog.api.GOGBuild,
+            manifest: com.winlator.cmod.feature.stores.gog.api.GOGManifestMeta,
+            language: String,
+            productIds: Set<String>,
+            ownedProductIds: Set<String>,
+        ): Map<String, GOGManifestSizes> {
+            if (productIds.isEmpty()) return emptyMap()
+
+            val (languageDepots, effectiveLanguage) = gogContentManifestParser.filterDepotsByLanguage(manifest, language)
+            val candidateDepots =
+                gogContentManifestParser
+                    .filterDepotsByOwnership(languageDepots, ownedProductIds)
+
+            if (candidateDepots.isEmpty()) return emptyMap()
+
+            val sizes = productIds.associateWith { GOGManifestSizes() }.toMutableMap()
+            if (selectedBuild.generation == 1 && manifest.productTimestamp != null) {
+                for (depot in candidateDepots) {
+                    val productId = depot.productId
+                    if (productId !in productIds) continue
+                    val depotJson =
+                        gogContentApiClient
+                            .fetchDepotManifestV1(
+                                productId = depot.productId,
+                                platform = selectedBuild.platform,
+                                timestamp = manifest.productTimestamp,
+                                manifestHash = depot.manifest,
+                            ).getOrNull()
+                            ?: continue
+                    val size =
+                        gogContentManifestParser
+                            .parseV1DepotManifest(depotJson)
+                            .filterNot { it.isSupport }
+                            .sumOf { it.size.coerceAtLeast(0L) }
+                    sizes[productId] =
+                        sizes.getValue(productId).let {
+                            GOGManifestSizes(
+                                downloadSize = it.downloadSize + size,
+                                installSize = it.installSize + size,
+                            )
+                        }
+                }
+                return sizes
+            }
+
+            val seenDownloadChunksByProduct = productIds.associateWith { mutableSetOf<String>() }
+            for (depot in candidateDepots) {
+                val depotManifest =
+                    gogContentApiClient
+                        .fetchDepotManifest(depot.manifest)
+                        .getOrNull()
+                        ?: continue
+                depotManifest.files.forEach { file ->
+                    if (file.isSupportFile()) return@forEach
+                    val productId = effectiveProductId(file.productId, depot.productId)
+                    if (productId !in productIds) return@forEach
+
+                    val seenDownloadChunks = seenDownloadChunksByProduct.getValue(productId)
+                    val downloadSize =
+                        file.chunks.sumOf {
+                            if (seenDownloadChunks.add(it.compressedMd5)) {
+                                (it.compressedSize ?: it.size).coerceAtLeast(0L)
+                            } else {
+                                0L
+                            }
+                        }
+                    val installSize = file.chunks.sumOf { it.size }
+                    sizes[productId] =
+                        sizes.getValue(productId).let {
+                            GOGManifestSizes(
+                                downloadSize = it.downloadSize + downloadSize,
+                                installSize = it.installSize + installSize,
+                            )
+                        }
+                }
+            }
+
+            Timber.tag("GOG").d("Calculated manifest sizes for ${sizes.size} product(s) using $effectiveLanguage")
+            return sizes
+        }
+
+        private suspend fun calculateSelectedManifestSizes(
+            selectedBuild: com.winlator.cmod.feature.stores.gog.api.GOGBuild,
+            manifest: com.winlator.cmod.feature.stores.gog.api.GOGManifestMeta,
+            language: String,
+            productIds: Set<String>,
+            ownedProductIds: Set<String>,
+        ): GOGManifestSizes {
+            if (productIds.isEmpty()) return GOGManifestSizes()
+
+            val (languageDepots, effectiveLanguage) = gogContentManifestParser.filterDepotsByLanguage(manifest, language)
+            val candidateDepots =
+                gogContentManifestParser
+                    .filterDepotsByOwnership(languageDepots, ownedProductIds)
+                    .filter { it.productId in productIds }
+
+            if (candidateDepots.isEmpty()) return GOGManifestSizes()
+
+            var downloadSize = 0L
+            var installSize = 0L
+
+            if (selectedBuild.generation == 1 && manifest.productTimestamp != null) {
+                for (depot in candidateDepots) {
+                    val depotJson =
+                        gogContentApiClient
+                            .fetchDepotManifestV1(
+                                productId = depot.productId,
+                                platform = selectedBuild.platform,
+                                timestamp = manifest.productTimestamp,
+                                manifestHash = depot.manifest,
+                            ).getOrNull()
+                            ?: continue
+                    val size =
+                        gogContentManifestParser
+                            .parseV1DepotManifest(depotJson)
+                            .filterNot { it.isSupport }
+                            .sumOf { it.size.coerceAtLeast(0L) }
+                    downloadSize += size
+                    installSize += size
+                }
+                return GOGManifestSizes(downloadSize = downloadSize, installSize = installSize)
+            }
+
+            val seenDownloadChunks = mutableSetOf<String>()
+            for (depot in candidateDepots) {
+                val depotManifest =
+                    gogContentApiClient
+                        .fetchDepotManifest(depot.manifest)
+                        .getOrNull()
+                        ?: continue
+                depotManifest.files.forEach { file ->
+                    if (file.isSupportFile()) return@forEach
+                    val productId = effectiveProductId(file.productId, depot.productId)
+                    if (productId !in productIds) return@forEach
+
+                    file.chunks.forEach { chunk ->
+                        if (seenDownloadChunks.add(chunk.compressedMd5)) {
+                            downloadSize += (chunk.compressedSize ?: chunk.size).coerceAtLeast(0L)
+                        }
+                        installSize += chunk.size.coerceAtLeast(0L)
+                    }
+                }
+            }
+
+            Timber.tag("GOG").d("Calculated selected manifest size using $effectiveLanguage")
+            return GOGManifestSizes(downloadSize = downloadSize, installSize = installSize)
+        }
+
+        private fun effectiveProductId(
+            fileProductId: String?,
+            depotProductId: String,
+        ): String =
+            when (fileProductId) {
+                null, "", GOG_PLACEHOLDER_PRODUCT_ID -> depotProductId
+                else -> fileProductId
+            }
+
+        private fun GOGManifestSizes.withProductDetailsFallback(productDetailsDownloadSize: Long): GOGManifestSizes {
+            val fallbackSize = productDetailsDownloadSize.coerceAtLeast(0L)
+            val resolvedDownloadSize = downloadSize.takeIf { it > 0L } ?: fallbackSize
+            val resolvedInstallSize = installSize.takeIf { it > 0L } ?: resolvedDownloadSize
+            return GOGManifestSizes(
+                downloadSize = resolvedDownloadSize,
+                installSize = resolvedInstallSize,
+            )
+        }
+
+        suspend fun getInstalledDlcIds(gameId: String): Set<String> =
+            withContext(Dispatchers.IO) {
+                val game = getGameFromDbById(gameId) ?: return@withContext emptySet()
+                val installPath =
+                    when {
+                        game.installPath.isNotBlank() -> game.installPath
+                        game.title.isNotBlank() -> getGameInstallPath(gameId, game.title)
+                        else -> ""
+                    }
+                if (installPath.isBlank()) emptySet() else GOGManifestUtils.getInstalledDlcIds(File(installPath))
+            }
+
+        private suspend fun selectPreferredBuild(gameId: String): com.winlator.cmod.feature.stores.gog.api.GOGBuild? {
+            val platform = "windows"
+            val gen2Result = gogContentApiClient.getBuildsForGame(gameId, platform, generation = 2)
+            if (gen2Result.isSuccess) {
+                gogContentManifestParser
+                    .selectBuild(gen2Result.getOrThrow().items, preferredGeneration = 2, platform = platform)
+                    ?.let { return it }
+            }
+
+            val gen1Result = gogContentApiClient.getBuildsForGame(gameId, platform, generation = 1)
+            if (gen1Result.isSuccess) {
+                return gogContentManifestParser.selectBuild(
+                    gen1Result.getOrThrow().items,
+                    preferredGeneration = 1,
+                    platform = platform,
+                )
+            }
+
+            return null
+        }
+
         suspend fun startBackgroundSync(context: Context): Result<Unit> =
             withContext(Dispatchers.IO) {
                 try {
@@ -206,15 +574,25 @@ class GOGManager
 
                     val ignoredGameId = "1801418160" // Hidden ID for GOG Galaxy that we should ignore.
 
-                    // Get existing game IDs from database to avoid re-fetching
+                    // Get existing game IDs from database to avoid re-fetching, except when
+                    // older rows are missing the dedicated hero artwork added in DB v7.
+                    val existingGamesMissingHero =
+                        gogGameDao
+                            .getAllAsList()
+                            .filter { it.heroImageUrl.isBlank() }
+                            .map { it.id }
+                            .toSet()
                     val existingGameIds = gogGameDao.getAllGameIdsIncludingExcluded().toMutableSet()
                     existingGameIds.add(ignoredGameId)
 
                     Timber.tag("GOG").d("Found ${existingGameIds.size} games already in database")
 
-                    // Filter to only new games that need details fetched
-                    val newGameIds = gameIds.filter { it !in existingGameIds }
-                    Timber.tag("GOG").d("${newGameIds.size} new games need details fetched")
+                    val newGameIds =
+                        (
+                            gameIds.filter { it !in existingGameIds } +
+                                gameIds.filter { it in existingGamesMissingHero }
+                        ).distinct()
+                    Timber.tag("GOG").d("${newGameIds.size} games need details fetched")
 
                     if (newGameIds.isEmpty()) {
                         val detectedCount = detectAndUpdateExistingInstallations()
@@ -291,6 +669,7 @@ class GOGManager
                 exclude = exclude,
                 slug = parsedGame.slug,
                 imageUrl = parsedGame.imageUrl,
+                heroImageUrl = parsedGame.heroImageUrl,
                 iconUrl = parsedGame.iconUrl,
                 description = parsedGame.description,
                 releaseDate = parsedGame.releaseDate,
@@ -318,7 +697,6 @@ class GOGManager
                 var detectedCount = 0
 
                 try {
-                    // Check both internal and external storage paths
                     val pathsToCheck =
                         listOf(
                             GOGConstants.internalGOGGamesPath,
@@ -339,7 +717,6 @@ class GOGManager
                             try {
                                 val detectedGame = detectGameFromDirectory(installDir)
                                 if (detectedGame != null) {
-                                    // Update database with installation info
                                     val existingGame = getGameFromDbById(detectedGame.id)
                                     if (existingGame != null && !existingGame.isInstalled) {
                                         val updatedGame =
@@ -516,7 +893,6 @@ class GOGManager
                         )
                     Timber.i("Deleted $deletedShortcuts GOG shortcuts for game $gameId")
 
-                    // Delete game files
                     if (installDir.exists()) {
                         val success = installDir.deleteRecursively()
                         if (success) {
@@ -539,8 +915,8 @@ class GOGManager
                             Timber.d("Updated database: game marked as not installed")
                         }
                     }
+                    StoreArtworkCache.deleteGame(context, "gog", gameId)
 
-                    // Trigger library refresh event
                     com.winlator.cmod.app.PluviaApp.events.emitJava(
                         com.winlator.cmod.feature.stores.steam.events.AndroidEvent
                             .LibraryInstallStatusChanged(libraryItem.gameId),
@@ -559,7 +935,18 @@ class GOGManager
             libraryItem: LibraryItem,
         ): Boolean {
             try {
-                val appDirPath = getAppDirPath(libraryItem.appId)
+                val gameId = libraryItem.gameId.toString()
+                val game = runBlocking { getGameFromDbById(gameId) }
+                val appDirPath =
+                    game?.installPath?.takeIf { it.isNotBlank() }
+                        ?: getGameInstallPath(gameId, libraryItem.name)
+
+                // Trust DB.isInstalled when set, only verify the install directory still exists.
+                // Avoids flipping isInstalled=false during verify/update when DOWNLOAD_IN_PROGRESS
+                // is temporarily set on an already-installed game.
+                if (game != null && game.isInstalled && game.installPath.isNotBlank()) {
+                    return File(game.installPath).isDirectory
+                }
 
                 // Use marker-based approach
                 val isDownloadComplete = MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
@@ -567,11 +954,8 @@ class GOGManager
 
                 val isInstalled = isDownloadComplete && !isDownloadInProgress
 
-                // Update database if status changed
-                val gameId = libraryItem.gameId.toString()
-                val game = runBlocking { getGameFromDbById(gameId) }
-                if (game != null && isInstalled != game.isInstalled) {
-                    val installPath = if (isInstalled) getGameInstallPath(gameId, libraryItem.name) else ""
+                if (game != null && (isInstalled != game.isInstalled || (isInstalled && game.installPath != appDirPath))) {
+                    val installPath = if (isInstalled) appDirPath else ""
                     val updatedGame = game.copy(isInstalled = isInstalled, installPath = installPath)
                     runBlocking { gogGameDao.update(updatedGame) }
                 }
@@ -600,6 +984,14 @@ class GOGManager
                 return Pair(false, "Install path is not a directory")
             }
 
+            if (!MarkerUtils.hasMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)) {
+                return Pair(false, "Download is not marked complete")
+            }
+
+            if (MarkerUtils.hasMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)) {
+                return Pair(false, "Download is still in progress")
+            }
+
             val contents = installDir.listFiles()
             if (contents == null || contents.isEmpty()) {
                 return Pair(false, "Install directory is empty")
@@ -609,7 +1001,6 @@ class GOGManager
             return Pair(true, null)
         }
 
-        // Get the exe. There is a v1 and v2 depending on the age of the game.
         suspend fun getInstalledExe(libraryItem: LibraryItem): String =
             withContext(Dispatchers.IO) {
                 val gameId = libraryItem.gameId.toString()
@@ -682,7 +1073,6 @@ class GOGManager
                 return null
             }
 
-            // Check current directory first
             val infoFile =
                 directory.listFiles()?.find {
                     it.isFile &&
@@ -814,7 +1204,6 @@ class GOGManager
                     execFile.absolutePath,
                 ) ?: WineUtils.getWindowsPath(container, execFile.absolutePath)
 
-            // Set working directory
             val execWorkingDir = execFile.parentFile
             if (execWorkingDir != null) {
                 guestProgramLauncherComponent.setWorkingDir(execWorkingDir)
@@ -897,10 +1286,7 @@ class GOGManager
                 if (productId.isEmpty()) continue
 
                 val exePathWin = "$gameDriveLetter:\\$isiRelativePathWin"
-                // HACK: /DIR and /supportDir point to a \"rootdir\" folder inside ISI, which is a symlink
-                // to the actual game install root (created during redist download). This gives
-                // scriptinterpreter a full path with drive + folder name while still resolving
-                // to the game directory that the drive letter is mapped to.
+                // scriptinterpreter needs a drive-qualified folder; rootdir resolves to the game root.
                 val dirAndSupport = "$gameDriveLetter:\\_CommonRedist\\ISI\\rootdir"
                 val args =
                     listOf(
@@ -924,9 +1310,6 @@ class GOGManager
             return parts
         }
 
-        // ==========================================================================
-        // CLOUD SAVES
-        // ==========================================================================
 
         /**
          * Read GOG game info file and extract clientId
@@ -983,13 +1366,13 @@ class GOGManager
          * @param context Android context
          * @param appId Game app ID
          * @param installPath Game install path
-         * @return Pair of (clientSecret, List of save location templates), or null if cloud saves not enabled or API call fails
+         * @return Cloud save configuration, or null if the game cannot be mapped to a Galaxy client
          */
         suspend fun getSaveSyncLocation(
             context: Context,
             appId: String,
             installPath: String,
-        ): Pair<String, List<GOGCloudSavesLocationTemplate>>? =
+        ): GOGSaveSyncConfig? =
             withContext(Dispatchers.IO) {
                 try {
                     Timber.tag("GOG").d("[Cloud Saves] Getting save sync location for $appId")
@@ -997,20 +1380,19 @@ class GOGManager
                     val infoJson = readInfoFile(appId, installPath)
 
                     if (infoJson == null) {
-                        Timber.tag("GOG").w("[Cloud Saves] Cannot get save sync location: info file not found")
-                        return@withContext null
+                        Timber.tag("GOG").w("[Cloud Saves] Info file not found for game $gameId; trying build metadata")
                     }
 
-                    // Extract clientId from info file
-                    val clientId = infoJson.optString("clientId", "")
+                    val cloudCredentials = GOGApiClient.getCloudCredentials(context, gameId.toString(), installPath)
+                    val clientId = infoJson?.optString("clientId", "")?.ifEmpty { cloudCredentials?.clientId.orEmpty() }
+                        ?: cloudCredentials?.clientId.orEmpty()
                     if (clientId.isEmpty()) {
-                        Timber.tag("GOG").w("[Cloud Saves] No clientId found in info file for game $gameId")
+                        Timber.tag("GOG").w("[Cloud Saves] No clientId found for game $gameId")
                         return@withContext null
                     }
                     Timber.tag("GOG").d("[Cloud Saves] Client ID: $clientId")
 
-                    // Get clientSecret from build metadata
-                    val clientSecret = GOGApiClient.getClientSecret(context, gameId.toString(), installPath) ?: ""
+                    val clientSecret = cloudCredentials?.clientSecret.orEmpty()
                     if (clientSecret.isEmpty()) {
                         Timber.tag("GOG").w("[Cloud Saves] No clientSecret available for game $gameId")
                     } else {
@@ -1024,7 +1406,7 @@ class GOGManager
                                 "GOG",
                             ).d("[Cloud Saves] Using cached save locations for clientId $clientId (${cachedLocations.size} locations)")
                         // Cache only contains locations, we still need to fetch clientSecret fresh
-                        return@withContext Pair(clientSecret, cachedLocations)
+                        return@withContext GOGSaveSyncConfig(clientId, clientSecret, cachedLocations)
                     }
 
                     // Android runs games through Wine, so always use Windows platform
@@ -1044,47 +1426,46 @@ class GOGManager
                     response.use {
                         if (!response.isSuccessful) {
                             Timber.tag("GOG").w("[Cloud Saves] Failed to fetch remote config: HTTP ${response.code}")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
                         Timber.tag("GOG").d("[Cloud Saves] Successfully fetched remote config")
 
                         val responseBody = response.body?.string()
                         if (responseBody == null) {
                             Timber.tag("GOG").w("[Cloud Saves] Empty response body from remote config")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
                         val configJson = JSONObject(responseBody)
 
-                        // Parse response: content.Windows.cloudStorage.locations
                         val content = configJson.optJSONObject("content")
                         if (content == null) {
                             Timber.tag("GOG").w("[Cloud Saves] No 'content' field in remote config response")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
 
                         val platformContent = content.optJSONObject(syncPlatform)
                         if (platformContent == null) {
                             Timber.tag("GOG").d("[Cloud Saves] No cloud storage config for platform $syncPlatform")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
 
                         val cloudStorage = platformContent.optJSONObject("cloudStorage")
                         if (cloudStorage == null) {
                             Timber.tag("GOG").d("[Cloud Saves] No cloudStorage field for platform $syncPlatform")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
 
                         val enabled = cloudStorage.optBoolean("enabled", false)
                         if (!enabled) {
                             Timber.tag("GOG").d("[Cloud Saves] Cloud saves not enabled for game $gameId")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
                         Timber.tag("GOG").d("[Cloud Saves] Cloud saves are enabled for game $gameId")
 
                         val locationsArray = cloudStorage.optJSONArray("locations")
                         if (locationsArray == null || locationsArray.length() == 0) {
                             Timber.tag("GOG").d("[Cloud Saves] No save locations configured for game $gameId")
-                            return@withContext null
+                            return@withContext GOGSaveSyncConfig(clientId, clientSecret, emptyList())
                         }
                         Timber.tag("GOG").d("[Cloud Saves] Found ${locationsArray.length()} location(s) in config")
 
@@ -1108,7 +1489,7 @@ class GOGManager
                         }
 
                         Timber.tag("GOG").i("[Cloud Saves] Found ${locations.size} save location(s) for game $gameId")
-                        return@withContext Pair(clientSecret, locations)
+                        return@withContext GOGSaveSyncConfig(clientId, clientSecret, locations)
                     }
                 } catch (e: Exception) {
                     Timber.tag("GOG").e(e, "[Cloud Saves] Failed to get save sync location for appId $appId")
@@ -1127,6 +1508,7 @@ class GOGManager
             context: Context,
             appId: String,
             gameTitle: String,
+            targetContainerId: Int? = null,
         ): List<GOGCloudSavesLocation>? =
             withContext(Dispatchers.IO) {
                 try {
@@ -1146,32 +1528,34 @@ class GOGManager
                     }
                     Timber.tag("GOG").d("[Cloud Saves] Game install path: $installPath")
 
-                    // Get clientId from info file
-                    val infoJson = readInfoFile(appId, installPath)
-                    val clientId = infoJson?.optString("clientId", "") ?: ""
+                    // Fetch save locations from API (Android runs games through Wine, so always Windows)
+                    Timber.tag("GOG").d("[Cloud Saves] Fetching save locations from API")
+                    val result = getSaveSyncLocation(context, appId, installPath)
+                    if (result == null) {
+                        Timber.tag("GOG").w("[Cloud Saves] Could not resolve cloud save config for game $gameId")
+                        return@withContext null
+                    }
+
+                    val clientId = result.clientId
                     if (clientId.isEmpty()) {
-                        Timber.tag("GOG").w("[Cloud Saves] No clientId found in info file for game $gameId")
+                        Timber.tag("GOG").w("[Cloud Saves] No clientId found for game $gameId")
                         return@withContext null
                     }
                     Timber.tag("GOG").d("[Cloud Saves] Client ID: $clientId")
 
-                    // Fetch save locations from API (Android runs games through Wine, so always Windows)
-                    Timber.tag("GOG").d("[Cloud Saves] Fetching save locations from API")
-                    val result = getSaveSyncLocation(context, appId, installPath)
-
                     val clientSecret: String
                     val locations: List<GOGCloudSavesLocationTemplate>
 
                     // If no locations from API, use default Windows path
-                    if (result == null || result.second.isEmpty()) {
-                        clientSecret = ""
+                    if (result.locations.isEmpty()) {
+                        clientSecret = result.clientSecret
                         Timber.tag("GOG").d("[Cloud Saves] No save locations from API, using default for game $gameId")
                         val defaultLocation = "%LOCALAPPDATA%/GOG.com/Galaxy/Applications/$clientId/Storage/Shared/Files"
                         Timber.tag("GOG").d("[Cloud Saves] Using default location: $defaultLocation")
                         locations = listOf(GOGCloudSavesLocationTemplate("__default", defaultLocation))
                     } else {
-                        clientSecret = result.first
-                        locations = result.second
+                        clientSecret = result.clientSecret
+                        locations = result.locations
                         Timber.tag("GOG").i("[Cloud Saves] Retrieved ${locations.size} save location(s) from API")
                     }
 
@@ -1188,20 +1572,15 @@ class GOGManager
                         var resolvedPath = PathType.resolveGOGPathVariables(locationTemplate.location, installPath)
                         Timber.tag("GOG").d("[Cloud Saves] After GOG variable resolution: $resolvedPath")
 
-                        // Map GOG Windows path to device path using PathType
-                        // Pass appId to ensure we use the correct container-specific wine prefix
-                        resolvedPath = PathType.toAbsPathForGOG(context, resolvedPath, appId)
+                        resolvedPath = PathType.toAbsPathForGOG(context, resolvedPath, appId, targetContainerId)
                         Timber.tag("GOG").d("[Cloud Saves] After path mapping to Wine prefix: $resolvedPath")
 
-                        // Normalize path to resolve any '..' or '.' components
-                        try {
-                            val normalizedPath = File(resolvedPath).canonicalPath
-                            // Ensure trailing slash for directories
-                            resolvedPath = if (!normalizedPath.endsWith("/")) "$normalizedPath/" else normalizedPath
-                            Timber.tag("GOG").d("[Cloud Saves] After normalization: $resolvedPath")
-                        } catch (e: Exception) {
-                            Timber.tag("GOG").w(e, "[Cloud Saves] Failed to normalize path, using as-is: $resolvedPath")
-                        }
+                        // Manual normalization — File.canonicalPath would follow symlinks
+                        // and bail on missing intermediates.
+                        resolvedPath = normalizeGogPathSegments(resolvedPath)
+                        resolvedPath = resolveExistingPathCaseInsensitive(File(resolvedPath)).absolutePath
+                        if (!resolvedPath.endsWith("/")) resolvedPath = "$resolvedPath/"
+                        Timber.tag("GOG").d("[Cloud Saves] After normalization: $resolvedPath")
 
                         resolvedLocations.add(
                             GOGCloudSavesLocation(
@@ -1307,9 +1686,7 @@ class GOGManager
             }
         }
 
-        // ==========================================================================
-        // FILE SYSTEM & PATHS
-        // ==========================================================================
+        // File system and paths
 
         fun getAppDirPath(appId: String): String {
             val gameId = ContainerUtils.extractGameIdFromContainerId(appId)
@@ -1327,4 +1704,51 @@ class GOGManager
             gameId: String,
             gameTitle: String,
         ): String = GOGConstants.getGameInstallPath(gameTitle)
+
+        private fun normalizeGogPathSegments(path: String): String {
+            val unified = path.replace('\\', '/')
+            val absolute = unified.startsWith('/')
+            val parts = unified.split('/').filter { it.isNotEmpty() }
+            val stack = ArrayDeque<String>()
+            for (part in parts) {
+                when (part) {
+                    "." -> Unit
+                    ".." ->
+                        if (stack.isNotEmpty() && stack.last() != "..") {
+                            stack.removeLast()
+                        } else if (!absolute) {
+                            stack.addLast("..")
+                        }
+                    else -> stack.addLast(part)
+                }
+            }
+            val joined = stack.joinToString("/")
+            return if (absolute) "/$joined" else joined
+        }
+
+        private fun resolveExistingPathCaseInsensitive(path: File): File {
+            if (path.exists()) return path
+            val absolute = path.absoluteFile
+            val parts = absolute.path.split(File.separatorChar, '/', '\\').filter { it.isNotEmpty() }
+            if (parts.isEmpty()) return path
+            var current =
+                if (absolute.path.startsWith(File.separator)) {
+                    File(File.separator)
+                } else {
+                    File(parts.first()).also { if (it.exists()) return@also }
+                }
+            val startIndex = if (absolute.path.startsWith(File.separator)) 0 else 1
+            for (index in startIndex until parts.size) {
+                val part = parts[index]
+                val direct = File(current, part)
+                current =
+                    if (direct.exists()) {
+                        direct
+                    } else {
+                        current.listFiles()?.firstOrNull { it.name.equals(part, ignoreCase = true) }
+                            ?: direct
+                    }
+            }
+            return current
+        }
     }
diff --git a/app/src/main/feature/stores/gog/service/GOGManifestUtils.kt b/app/src/main/feature/stores/gog/service/GOGManifestUtils.kt
index 2d7e06b1b..32b37c610 100644
--- a/app/src/main/feature/stores/gog/service/GOGManifestUtils.kt
+++ b/app/src/main/feature/stores/gog/service/GOGManifestUtils.kt
@@ -6,6 +6,7 @@ import java.io.File
 object GOGManifestUtils {
     const val MANIFEST_FILE_NAME = "_gog_manifest.json"
     private const val KEY_SCRIPT_INTERPRETER = "scriptInterpreter"
+    private const val KEY_INSTALLED_DLC_IDS = "installedDlcIds"
 
     fun readLocalManifest(installDir: File): JSONObject? {
         val manifestFile = File(installDir, MANIFEST_FILE_NAME)
@@ -22,4 +23,14 @@ object GOGManifestUtils {
         val root = readLocalManifest(installDir) ?: return false
         return root.optBoolean(KEY_SCRIPT_INTERPRETER, false)
     }
+
+    fun getInstalledDlcIds(installDir: File): Set<String> {
+        val root = readLocalManifest(installDir) ?: return emptySet()
+        val idsArray = root.optJSONArray(KEY_INSTALLED_DLC_IDS) ?: return emptySet()
+        val ids = mutableSetOf<String>()
+        for (i in 0 until idsArray.length()) {
+            idsArray.optString(i, "").takeIf { it.isNotBlank() }?.let(ids::add)
+        }
+        return ids
+    }
 }
diff --git a/app/src/main/feature/stores/gog/service/GOGService.kt b/app/src/main/feature/stores/gog/service/GOGService.kt
index ad07a9932..b903a73d5 100644
--- a/app/src/main/feature/stores/gog/service/GOGService.kt
+++ b/app/src/main/feature/stores/gog/service/GOGService.kt
@@ -18,31 +18,23 @@ import com.winlator.cmod.feature.stores.steam.enums.Marker
 import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
 import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
 import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult
 import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
 import com.winlator.cmod.shared.android.AppTerminationHelper
 import com.winlator.cmod.shared.android.NotificationHelper
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.*
 import timber.log.Timber
+import java.io.BufferedOutputStream
 import java.io.File
+import java.io.OutputStream
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
+import java.util.zip.ZipOutputStream
 import javax.inject.Inject
 
-/**
- * GOG Service - thin abstraction layer that delegates to managers.
- *
- * Architecture:
- * - GOGApiClient: Api Layer for interacting with GOG's APIs
- * - GOGDownloadManager: Handles Download Logic for Games
- * - GOGConstants: Shared Constants for our GOG-related data
- * - GOGCloudSavesManager: Handler for Cloud Saves
- * - GOGAuthManager: Authentication and account management
- * - GOGManager: Game library, downloads, and installation
- * - GOGManifestParser: Parses and has utils for parsing/extracting/decompressing manifests.
- * - GOGDataMdoels: Data Models for GOG-related Data types such as API responses
- *
- */
+// Foreground service facade for GOG auth, library sync, downloads, and cloud saves.
 @AndroidEntryPoint
 class GOGService : Service() {
     companion object {
@@ -52,7 +44,6 @@ class GOGService : Service() {
 
         private var instance: GOGService? = null
 
-        // Sync tracking variables
         private var syncInProgress: Boolean = false
         private var backgroundSyncJob: Job? = null
         private var lastSyncTimestamp: Long = 0L
@@ -62,13 +53,11 @@ class GOGService : Service() {
             get() = instance != null
 
         fun start(context: Context) {
-            // If already running, do nothing
             if (isRunning) {
                 Timber.d("[GOGService] Service already running, skipping start")
                 return
             }
 
-            // First-time start: always sync without throttle
             if (!hasPerformedInitialSync) {
                 Timber.i("[GOGService] First-time start - starting service with initial sync")
                 val intent = Intent(context, GOGService::class.java)
@@ -77,7 +66,6 @@ class GOGService : Service() {
                 return
             }
 
-            // Subsequent starts: always start service, but check throttle for sync
             val now = System.currentTimeMillis()
             val timeSinceLastSync = now - lastSyncTimestamp
 
@@ -88,7 +76,6 @@ class GOGService : Service() {
             } else {
                 val remainingMinutes = (SYNC_THROTTLE_MILLIS - timeSinceLastSync) / 1000 / 60
                 Timber.d("[GOGService] Starting service without sync - throttled (${remainingMinutes}min remaining)")
-                // Start service without sync action
             }
             context.startForegroundService(intent)
         }
@@ -112,9 +99,6 @@ class GOGService : Service() {
             }
         }
 
-        // ==========================================================================
-        // AUTHENTICATION - Delegate to GOGAuthManager
-        // ==========================================================================
 
         suspend fun authenticateWithCode(
             context: Context,
@@ -128,30 +112,330 @@ class GOGService : Service() {
         suspend fun getResolvedSaveDirectories(
             context: Context,
             appId: String,
+        ): List<File> = getResolvedSaveDirectories(context, appId, null)
+
+        suspend fun getResolvedSaveDirectories(
+            context: Context,
+            appId: String,
+            targetContainerId: Int?,
         ): List<File> {
             val activeInstance = getInstance() ?: return emptyList()
             val gameId = ContainerUtils.extractGameIdFromContainerId(appId).toString()
             val game = activeInstance.gogManager.getGameFromDbById(gameId) ?: return emptyList()
             return activeInstance.gogManager
-                .getSaveDirectoryPath(context, appId, game.title)
+                .getSaveDirectoryPath(context, appId, game.title, targetContainerId)
                 ?.map { File(it.location) }
                 ?.filter { it.exists() || !it.path.isNullOrEmpty() }
                 ?: emptyList()
         }
 
+        suspend fun hasActualLocalCloudSaves(
+            context: Context,
+            appId: String,
+        ): Boolean = hasActualLocalCloudSaves(context, appId, null)
+
+        suspend fun hasActualLocalCloudSaves(
+            context: Context,
+            appId: String,
+            targetContainerId: Int?,
+        ): Boolean =
+            getResolvedSaveDirectories(context, appId, targetContainerId).any { dir ->
+                dir.exists() && dir.walkTopDown().any { it.isFile }
+            }
+
+        // Non-suspend so the Java exit-path (XServerDisplayActivity) can call it directly.
+        @JvmStatic
+        @JvmOverloads
+        fun canAttemptExitUpload(
+            context: Context,
+            appId: String,
+            targetContainerId: Int? = null,
+        ): Boolean =
+            runBlocking(Dispatchers.IO) {
+                try {
+                    val activeInstance = getInstance() ?: return@runBlocking false
+                    if (!GOGAuthManager.hasStoredCredentials(context)) {
+                        Timber.tag("GOG").i("[Cloud Saves] Skip exit upload: not signed in to GOG")
+                        return@runBlocking false
+                    }
+                    val normalizedAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(normalizedAppId).toString()
+                    val game = activeInstance.gogManager.getGameFromDbById(gameId) ?: run {
+                        Timber.tag("GOG").i("[Cloud Saves] Skip exit upload: game $appId not in DB")
+                        return@runBlocking false
+                    }
+                    val saveLocations =
+                        activeInstance.gogManager.getSaveDirectoryPath(context, normalizedAppId, game.title, targetContainerId)
+                    if (saveLocations.isNullOrEmpty()) {
+                        Timber.tag("GOG").i("[Cloud Saves] Skip exit upload: no cloud-save locations for ${game.title}")
+                        return@runBlocking false
+                    }
+                    val hasLocalFile =
+                        saveLocations.any { loc ->
+                            val dir = File(loc.location)
+                            dir.exists() && dir.walkTopDown().any { it.isFile }
+                        }
+                    if (!hasLocalFile) {
+                        Timber.tag("GOG").i("[Cloud Saves] Skip exit upload: save directory empty for ${game.title}")
+                        return@runBlocking false
+                    }
+                    true
+                } catch (e: Exception) {
+                    Timber.tag("GOG").w(e, "[Cloud Saves] canAttemptExitUpload threw, skipping")
+                    false
+                }
+            }
+
+        suspend fun getPendingSyncAction(
+            context: Context,
+            appId: String,
+            targetContainerId: Int? = null,
+        ): GOGCloudSavesManager.SyncAction =
+            determinePendingAction(context, appId, "auto", targetContainerId)
+
+        suspend fun getPendingExitSyncAction(
+            context: Context,
+            appId: String,
+            targetContainerId: Int? = null,
+        ): GOGCloudSavesManager.SyncAction =
+            determinePendingAction(context, appId, "exit_upload", targetContainerId)
+
+        // Conflict-wins precedence across multiple save locations.
+        private suspend fun determinePendingAction(
+            context: Context,
+            appId: String,
+            preferredAction: String,
+            targetContainerId: Int?,
+        ): GOGCloudSavesManager.SyncAction =
+            withContext(Dispatchers.IO) {
+                try {
+                    val activeInstance = getInstance() ?: return@withContext GOGCloudSavesManager.SyncAction.NONE
+                    if (!GOGAuthManager.hasStoredCredentials(context)) return@withContext GOGCloudSavesManager.SyncAction.NONE
+                    val normalizedAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(normalizedAppId).toString()
+                    val game =
+                        activeInstance.gogManager.getGameFromDbById(gameId)
+                            ?: return@withContext GOGCloudSavesManager.SyncAction.NONE
+                    val saveLocations =
+                        activeInstance.gogManager.getSaveDirectoryPath(context, normalizedAppId, game.title, targetContainerId)
+                            ?: return@withContext GOGCloudSavesManager.SyncAction.NONE
+                    val cloudSavesManager = GOGCloudSavesManager(context)
+                    val perLocationActions =
+                        saveLocations.map { location ->
+                            val timestamp =
+                                activeInstance.gogManager
+                                    .getCloudSaveSyncTimestamp(normalizedAppId, location.name)
+                                    .toLongOrNull()
+                                    ?: 0L
+                            cloudSavesManager.determineSyncAction(
+                                localPath = location.location,
+                                dirname = location.name,
+                                clientId = location.clientId,
+                                clientSecret = location.clientSecret,
+                                lastSyncTimestamp = timestamp,
+                                preferredAction = preferredAction,
+                            )
+                        }
+                    when {
+                        perLocationActions.any { it == GOGCloudSavesManager.SyncAction.CONFLICT } ->
+                            GOGCloudSavesManager.SyncAction.CONFLICT
+                        perLocationActions.any { it == GOGCloudSavesManager.SyncAction.UPLOAD } ->
+                            GOGCloudSavesManager.SyncAction.UPLOAD
+                        perLocationActions.any { it == GOGCloudSavesManager.SyncAction.DOWNLOAD } ->
+                            GOGCloudSavesManager.SyncAction.DOWNLOAD
+                        else -> GOGCloudSavesManager.SyncAction.NONE
+                    }
+                } catch (e: Exception) {
+                    Timber.tag("GOG").w(e, "[Cloud Saves] determinePendingAction failed for $appId")
+                    GOGCloudSavesManager.SyncAction.NONE
+                }
+            }
+
+        suspend fun cloudSavesDiffer(
+            context: Context,
+            appId: String,
+        ): Boolean? = cloudSavesDiffer(context, appId, null)
+
+        suspend fun cloudSavesDiffer(
+            context: Context,
+            appId: String,
+            targetContainerId: Int?,
+        ): Boolean? =
+            withContext(Dispatchers.IO) {
+                try {
+                    val activeInstance = getInstance() ?: return@withContext null
+                    if (!GOGAuthManager.hasStoredCredentials(context)) return@withContext false
+                    val normalizedAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(normalizedAppId).toString()
+                    val game = activeInstance.gogManager.getGameFromDbById(gameId) ?: return@withContext false
+                    val saveLocations =
+                        activeInstance.gogManager.getSaveDirectoryPath(context, normalizedAppId, game.title, targetContainerId)
+                            ?: return@withContext false
+                    val cloudSavesManager = GOGCloudSavesManager(context)
+                    saveLocations.any { location ->
+                        val timestamp =
+                            activeInstance.gogManager
+                                .getCloudSaveSyncTimestamp(normalizedAppId, location.name)
+                                .toLongOrNull()
+                                ?: 0L
+                        cloudSavesManager.needsSync(
+                            localPath = location.location,
+                            dirname = location.name,
+                            clientId = location.clientId,
+                            clientSecret = location.clientSecret,
+                            lastSyncTimestamp = timestamp,
+                        )
+                    }
+                } catch (e: Exception) {
+                    Timber.tag("GOG").e(e, "[Cloud Saves] Failed to probe cloud save diff for $appId")
+                    null
+                }
+            }
+
+        suspend fun getNewestCloudSaveSyncTimestamp(
+            context: Context,
+            appId: String,
+        ): Long? = getNewestCloudSaveSyncTimestamp(context, appId, null)
+
+        suspend fun getNewestCloudSaveSyncTimestamp(
+            context: Context,
+            appId: String,
+            targetContainerId: Int?,
+        ): Long? =
+            withContext(Dispatchers.IO) {
+                try {
+                    val activeInstance = getInstance() ?: return@withContext null
+                    val normalizedAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(normalizedAppId).toString()
+                    val game = activeInstance.gogManager.getGameFromDbById(gameId) ?: return@withContext null
+                    val saveLocations =
+                        activeInstance.gogManager.getSaveDirectoryPath(context, normalizedAppId, game.title, targetContainerId)
+                            ?: return@withContext null
+                    saveLocations
+                        .mapNotNull { location ->
+                            activeInstance.gogManager
+                                .getCloudSaveSyncTimestamp(normalizedAppId, location.name)
+                                .toLongOrNull()
+                        }.maxOrNull()
+                        ?.times(1000)
+                } catch (e: Exception) {
+                    Timber.tag("GOG").e(e, "[Cloud Saves] Failed to read newest cloud timestamp for $appId")
+                    null
+                }
+            }
+
+        suspend fun listCloudSaveHistory(
+            context: Context,
+            appId: String,
+            targetContainerId: Int? = null,
+        ): List<CloudSaveEntry> =
+            withContext(Dispatchers.IO) {
+                try {
+                    val activeInstance = getInstance() ?: return@withContext emptyList()
+                    if (!GOGAuthManager.hasStoredCredentials(context)) return@withContext emptyList()
+                    val normalizedAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(normalizedAppId).toString()
+                    val game = activeInstance.gogManager.getGameFromDbById(gameId) ?: return@withContext emptyList()
+                    val saveLocations =
+                        activeInstance.gogManager.getSaveDirectoryPath(context, normalizedAppId, game.title, targetContainerId)
+                            ?: return@withContext emptyList()
+                    val cloudSavesManager = GOGCloudSavesManager(context)
+                    saveLocations.flatMap { location ->
+                        if (location.clientSecret.isEmpty()) {
+                            Timber.tag("GOG").w("[Cloud Saves] Skipping history list for '${location.name}': missing clientSecret")
+                            emptyList()
+                        } else {
+                            cloudSavesManager
+                                .listCloudSaveFiles(
+                                    dirname = location.name,
+                                    clientId = location.clientId,
+                                    clientSecret = location.clientSecret,
+                                )
+                                .map { file ->
+                                    CloudSaveEntry(
+                                        locationName = location.name,
+                                        relativePath = file.relativePath,
+                                        md5Hash = file.md5Hash,
+                                        timestampMs = (file.updateTimestamp ?: 0L) * 1000L,
+                                    )
+                                }
+                        }
+                    }.sortedByDescending { it.timestampMs }
+                } catch (e: Exception) {
+                    Timber.tag("GOG").e(e, "[Cloud Saves] Failed to list cloud save history for $appId")
+                    emptyList()
+                }
+            }
+
+        suspend fun exportCloudSavesZip(
+            context: Context,
+            appId: String,
+            outputStream: OutputStream,
+            targetContainerId: Int? = null,
+        ): BackupResult =
+            withContext(Dispatchers.IO) {
+                try {
+                    val activeInstance = getInstance() ?: return@withContext BackupResult(false, "GOG service is not running.")
+                    if (!GOGAuthManager.hasStoredCredentials(context)) {
+                        return@withContext BackupResult(false, "Sign in to GOG before exporting cloud saves.")
+                    }
+                    val normalizedAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(normalizedAppId).toString()
+                    val game =
+                        activeInstance.gogManager.getGameFromDbById(gameId)
+                            ?: return@withContext BackupResult(false, "GOG game not found.")
+                    val saveLocations =
+                        activeInstance.gogManager.getSaveDirectoryPath(context, normalizedAppId, game.title, targetContainerId)
+                            ?: return@withContext BackupResult(false, "No GOG cloud-save locations found.")
+
+                    val cloudSavesManager = GOGCloudSavesManager(context)
+                    var exportedFiles = 0
+                    ZipOutputStream(BufferedOutputStream(outputStream)).use { zip ->
+                        for (location in saveLocations) {
+                            if (location.clientSecret.isEmpty()) {
+                                Timber.tag("GOG").w("[Cloud Saves] Skipping zip export for '${location.name}': missing clientSecret")
+                                continue
+                            }
+                            val prefix = location.name.ifBlank { "__default" }
+                            exportedFiles +=
+                                cloudSavesManager.addCloudSaveFilesToZip(
+                                    zip = zip,
+                                    zipPrefix = prefix,
+                                    dirname = location.name,
+                                    clientId = location.clientId,
+                                    clientSecret = location.clientSecret,
+                                )
+                        }
+                    }
+
+                    if (exportedFiles == 0) {
+                        BackupResult(false, "No GOG cloud save files found.")
+                    } else {
+                        BackupResult(true, "Exported $exportedFiles GOG cloud save file(s).")
+                    }
+                } catch (e: Exception) {
+                    Timber.tag("GOG").e(e, "[Cloud Saves] Failed to export cloud saves zip for $appId")
+                    BackupResult(false, "Export failed: ${e.message}")
+                }
+            }
+
+        data class CloudSaveEntry(
+            val locationName: String,
+            val relativePath: String,
+            val md5Hash: String,
+            val timestampMs: Long,
+        )
+
         suspend fun validateCredentials(context: Context): Result<Boolean> = GOGAuthManager.validateCredentials(context)
 
         fun clearStoredCredentials(context: Context): Boolean = GOGAuthManager.clearStoredCredentials(context)
 
-        /**
-         * Logout from GOG - clears credentials, database, and stops service
-         */
+        // Clears credentials, removes non-installed games, and stops the service.
         suspend fun logout(context: Context): Result<Unit> {
             return withContext(Dispatchers.IO) {
                 try {
-                    Timber.i("[GOGService] Logging out from GOG...")
+                    Timber.i("[GOGService] Logging out from GOG")
 
-                    // Get instance first before stopping the service
                     val instance = getInstance()
                     if (instance == null) {
                         clearStoredCredentials(context)
@@ -159,17 +443,14 @@ class GOGService : Service() {
                         return@withContext Result.success(Unit)
                     }
 
-                    // Clear stored credentials
                     val credentialsCleared = clearStoredCredentials(context)
                     if (!credentialsCleared) {
                         Timber.w("[GOGService] Failed to clear credentials during logout")
                     }
 
-                    // Clear all non-installed GOG games from database
                     instance.gogManager.deleteAllNonInstalledGames()
                     Timber.i("[GOGService] All non-installed GOG games removed from database")
 
-                    // Stop the service
                     stop()
 
                     Timber.i("[GOGService] Logout completed successfully")
@@ -181,9 +462,6 @@ class GOGService : Service() {
             }
         }
 
-        // ==========================================================================
-        // SYNC & OPERATIONS
-        // ==========================================================================
 
         fun hasActiveOperations(): Boolean = syncInProgress || backgroundSyncJob?.isActive == true || hasActiveDownload()
 
@@ -195,9 +473,6 @@ class GOGService : Service() {
 
         fun getInstance(): GOGService? = instance
 
-        // ==========================================================================
-        // DOWNLOAD OPERATIONS - Delegate to instance GOGManager
-        // ==========================================================================
 
         fun hasActiveDownload(): Boolean = getInstance()?.activeDownloads?.isNotEmpty() ?: false
 
@@ -213,7 +488,6 @@ class GOGService : Service() {
 
         fun cancelDownload(gameId: String): Boolean {
             // Route through the coordinator: it persists CANCELLED and asks our dispatcher to
-            // stop the running job and delete the partial install directory.
             DownloadCoordinator.runOnScope {
                 DownloadCoordinator.cancel(DownloadRecord.STORE_GOG, gameId)
             }
@@ -264,9 +538,6 @@ class GOGService : Service() {
             }
         }
 
-        // ==========================================================================
-        // GAME & LIBRARY OPERATIONS - Delegate to instance GOGManager
-        // ==========================================================================
 
         fun getGOGGameOf(gameId: String): GOGGame? =
             runBlocking(Dispatchers.IO) {
@@ -280,25 +551,52 @@ class GOGService : Service() {
         fun isGameInstalled(gameId: String): Boolean {
             return runBlocking(Dispatchers.IO) {
                 val game = getInstance()?.gogManager?.getGameFromDbById(gameId)
-                if (game?.isInstalled != true) {
-                    return@runBlocking false
+                    ?: return@runBlocking false
+
+                // If the DB already says the game is installed, trust it and just verify the
+                // install dir still exists. Avoids the verify/update race where the IN_PROGRESS
+                // marker is briefly present and this method would otherwise flip isInstalled=false
+                // and clear installPath in the DB — making the game vanish from the library.
+                // Mirrors EpicService.isGameInstalled's early-return.
+                if (game.isInstalled && game.installPath.isNotBlank()) {
+                    return@runBlocking File(game.installPath).isDirectory
                 }
 
-                // Verify the installation is actually valid
-                val (isValid, errorMessage) =
-                    getInstance()?.gogManager?.verifyInstallation(gameId)
-                        ?: Pair(false, "Service not available")
-                if (!isValid) {
-                    Timber.w("Game $gameId marked as installed but verification failed: $errorMessage")
+                val candidatePaths =
+                    linkedSetOf<String>().apply {
+                        if (game.installPath.isNotBlank()) add(game.installPath)
+                        if (game.title.isNotBlank()) add(GOGConstants.getGameInstallPath(game.title))
+                    }
+                val installedPath =
+                    candidatePaths.firstOrNull { path ->
+                        path.isNotBlank() &&
+                            File(path).isDirectory &&
+                            MarkerUtils.hasMarker(path, Marker.DOWNLOAD_COMPLETE_MARKER) &&
+                            !MarkerUtils.hasMarker(path, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    }
+                val isInstalled = installedPath != null
+
+                if (game.isInstalled != isInstalled || (isInstalled && game.installPath != installedPath)) {
+                    getInstance()?.gogManager?.updateGame(
+                        game.copy(
+                            isInstalled = isInstalled,
+                            installPath = installedPath.orEmpty(),
+                        ),
+                    )
                 }
-                isValid
+
+                isInstalled
             }
         }
 
         fun getInstallPath(gameId: String): String? =
             runBlocking(Dispatchers.IO) {
                 val game = getInstance()?.gogManager?.getGameFromDbById(gameId)
-                if (game?.isInstalled == true) game.installPath else null
+                if (game != null && isGameInstalled(gameId)) {
+                    game.installPath.ifBlank { GOGConstants.getGameInstallPath(game.title) }
+                } else {
+                    null
+                }
             }
 
         fun verifyInstallation(gameId: String): Pair<Boolean, String?> =
@@ -341,11 +639,36 @@ class GOGService : Service() {
             getInstance()?.gogManager?.refreshLibrary(context)
                 ?: Result.failure(Exception("Service not available"))
 
+        suspend fun getDLCForGameSuspend(
+            gameId: String,
+            containerLanguage: String,
+        ) = getInstance()?.gogManager?.getOwnedDlcsForGame(gameId, containerLanguage) ?: emptyList()
+
+        suspend fun getInstallableSelectedManifestSizes(
+            gameId: String,
+            containerLanguage: String,
+            dlcGameIds: Collection<Int> = emptyList(),
+        ): GOGManifestSizes =
+            getInstance()?.gogManager?.getInstallableSelectedManifestSizes(gameId, containerLanguage, dlcGameIds)
+                ?: GOGManifestSizes()
+
+        suspend fun getDlcOnlyManifestSizes(
+            gameId: String,
+            dlcGameId: Int,
+            containerLanguage: String,
+        ): GOGManifestSizes =
+            getInstance()?.gogManager?.getDlcOnlyManifestSizes(gameId, dlcGameId, containerLanguage)
+                ?: GOGManifestSizes()
+
+        suspend fun getInstalledDlcIds(gameId: String): Set<String> =
+            getInstance()?.gogManager?.getInstalledDlcIds(gameId) ?: emptySet()
+
         fun downloadGame(
             context: Context,
             gameId: String,
             installPath: String,
             containerLanguage: String,
+            dlcGameIds: List<Int> = emptyList(),
         ): Result<DownloadInfo?> {
             val activeInstance =
                 getInstance() ?: run {
@@ -384,7 +707,6 @@ class GOGService : Service() {
                 activeInstance.activeDownloads.remove(gameId)
             }
 
-            // Create DownloadInfo for progress tracking
             val downloadInfo =
                 DownloadInfo(
                     jobCount = 1,
@@ -395,6 +717,7 @@ class GOGService : Service() {
             // Stash the original parameters so resume() can restore them after pause.
             activeInstance.downloadParams[gameId] =
                 DownloadParams(
+                    dlcGameIds = dlcGameIds,
                     containerLanguage = containerLanguage,
                     installPath = effectiveInstallPath,
                 )
@@ -402,6 +725,18 @@ class GOGService : Service() {
             // Track in activeDownloads first
             activeInstance.activeDownloads[gameId] = downloadInfo
 
+            // Pre-seed from the persisted record so a resumed download shows its prior
+            // byte/percent immediately instead of flashing 0% while manifests refetch.
+            val priorRecord =
+                runBlocking {
+                    DownloadCoordinator.findRecord(DownloadRecord.STORE_GOG, gameId)
+                }
+            if (priorRecord != null && priorRecord.bytesTotal > 0L) {
+                downloadInfo.setTotalExpectedBytes(priorRecord.bytesTotal)
+                downloadInfo.setDisplayTotalExpectedBytes(priorRecord.bytesTotal)
+                downloadInfo.initializeBytesDownloaded(priorRecord.bytesDownloaded)
+            }
+
             // Ask the global coordinator whether to start now or queue. The coordinator
             // persists a DownloadRecord either way so the download survives an app restart.
             val decision =
@@ -412,6 +747,7 @@ class GOGService : Service() {
                         title = game.title,
                         artUrl = game.iconUrl,
                         installPath = effectiveInstallPath,
+                        selectedDlcs = dlcGameIds.joinToString(","),
                         language = containerLanguage,
                     )
                 }
@@ -419,7 +755,7 @@ class GOGService : Service() {
                 is DownloadCoordinator.Decision.Queue -> {
                     downloadInfo.setActive(false)
                     downloadInfo.isCancelling = false
-                    downloadInfo.updateStatus(DownloadPhase.QUEUED, "Queued...")
+                    downloadInfo.updateStatus(DownloadPhase.QUEUED, "Queued")
                     val numericId = gameId.toIntOrNull() ?: 0
                     PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(numericId, true))
                     return Result.success(downloadInfo)
@@ -436,6 +772,13 @@ class GOGService : Service() {
             // Launch download in service scope so it runs independently
             val job =
                 activeInstance.scope.launch {
+                    val keepAliveTag = "gog-download-$gameId"
+                    val keepAliveCtx = activeInstance.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for GOG download $gameId")
+                    }
                     try {
                         Timber.d("[Download] Starting download for game $gameId")
                         val commonRedistDir = File(effectiveInstallPath, "_CommonRedist")
@@ -447,8 +790,18 @@ class GOGService : Service() {
                                 File(effectiveInstallPath),
                                 downloadInfo,
                                 containerLanguage,
-                                true,
-                                commonRedistDir,
+                                withDlcs = dlcGameIds.isNotEmpty(),
+                                supportDir = commonRedistDir,
+                                selectedDlcIds = dlcGameIds.map { it.toString() }.toSet(),
+
+                                verifyProgressSink = { bytesDone, total ->
+                                    DownloadCoordinator.updateProgress(
+                                        DownloadRecord.STORE_GOG,
+                                        gameId,
+                                        bytesDone,
+                                        total,
+                                    )
+                                },
                             )
 
                         if (result.isFailure) {
@@ -525,6 +878,11 @@ class GOGService : Service() {
                         Timber.d(
                             "[Download] Finished for game $gameId, progress: ${downloadInfo.getProgress()}, active: ${downloadInfo.isActive()}",
                         )
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for GOG download $gameId")
+                        }
                     }
                 }
             downloadInfo.setDownloadJob(job)
@@ -540,9 +898,324 @@ class GOGService : Service() {
                 ?: Result.failure(Exception("Service not available"))
 
         /**
-         * Delete/uninstall a GOG game
-         * Delegates to GOGManager.deleteGame
+         * Probe GOG for whether a newer build for [gameId] is available than what's installed.
+         * Returns a populated [GOGUpdateInfo] (with [GOGUpdateInfo.message] set on failure) so
+         * callers can render a status string without surfacing exceptions.
          */
+        suspend fun checkForGameUpdate(
+            context: Context,
+            gameId: String,
+        ): GOGUpdateInfo {
+            val instance = getInstance()
+                ?: return GOGUpdateInfo(message = "GOG service is not active")
+            val game =
+                runBlocking(Dispatchers.IO) { instance.gogManager.getGameFromDbById(gameId) }
+                    ?: return GOGUpdateInfo(message = "Game not found: $gameId")
+            val installPath =
+                game.installPath.ifEmpty { GOGConstants.getGameInstallPath(game.title) }
+            if (installPath.isBlank() || !File(installPath).isDirectory) {
+                return GOGUpdateInfo(message = "Game is not installed")
+            }
+            return instance.gogUpdateManager.checkForGameUpdate(
+                gameId = gameId,
+                installPath = File(installPath),
+                language = com.winlator.cmod.feature.stores.steam.utils.PrefManager.containerLanguage,
+            )
+        }
+
+        /**
+         * Kick off a Heroic-style verify (repair) of [gameId]'s installed files. Returns the
+         * [DownloadInfo] tracking progress, or null if the verify cannot start (game missing,
+         * another download already active, etc).
+         */
+        fun verifyGameFiles(
+            context: Context,
+            gameId: String,
+        ): DownloadInfo? {
+            val instance = getInstance() ?: return null
+            val game =
+                runBlocking(Dispatchers.IO) { instance.gogManager.getGameFromDbById(gameId) }
+                    ?: return null
+            val installPath =
+                game.installPath.ifEmpty { GOGConstants.getGameInstallPath(game.title) }
+            if (installPath.isBlank() || !File(installPath).isDirectory) return null
+
+            val activeOther =
+                DownloadCoordinator
+                    .snapshotRecords()
+                    .filter {
+                        it.status == DownloadRecord.STATUS_DOWNLOADING ||
+                            it.status == DownloadRecord.STATUS_QUEUED
+                    }.any {
+                        it.store != DownloadRecord.STORE_GOG || it.storeGameId != gameId
+                    }
+            if (activeOther) return null
+
+            val existing = instance.activeDownloads[gameId]
+            if (existing?.isActive() == true) return null
+            instance.activeDownloads.remove(gameId)
+
+            val downloadInfo =
+                DownloadInfo(
+                    jobCount = 1,
+                    gameId = gameId.toIntOrNull() ?: 0,
+                    downloadingAppIds = CopyOnWriteArrayList<Int>(),
+                )
+            instance.activeDownloads[gameId] = downloadInfo
+
+            val priorVerifyRecord =
+                runBlocking { DownloadCoordinator.findRecord(DownloadRecord.STORE_GOG, gameId) }
+            if (priorVerifyRecord != null && priorVerifyRecord.bytesTotal > 0L) {
+                downloadInfo.setTotalExpectedBytes(priorVerifyRecord.bytesTotal)
+                downloadInfo.setDisplayTotalExpectedBytes(priorVerifyRecord.bytesTotal)
+                downloadInfo.initializeBytesDownloaded(priorVerifyRecord.bytesDownloaded)
+            }
+
+            val decision =
+                runBlocking {
+                    DownloadCoordinator.requestSlot(
+                        store = DownloadRecord.STORE_GOG,
+                        storeGameId = gameId,
+                        title = game.title,
+                        artUrl = game.iconUrl,
+                        installPath = installPath,
+                        language = com.winlator.cmod.feature.stores.steam.utils.PrefManager.containerLanguage,
+                        taskType = DownloadRecord.TASK_VERIFY,
+                    )
+                }
+            if (decision is DownloadCoordinator.Decision.Queue) {
+                downloadInfo.setActive(false)
+                downloadInfo.isCancelling = false
+                downloadInfo.updateStatus(DownloadPhase.QUEUED, "Queued")
+                PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(gameId.toIntOrNull() ?: 0, true))
+                return downloadInfo
+            }
+
+            downloadInfo.setActive(true)
+            downloadInfo.isCancelling = false
+            downloadInfo.updateStatus(DownloadPhase.VERIFYING)
+
+            val job =
+                instance.scope.launch {
+                    val keepAliveTag = "gog-verify-$gameId"
+                    val keepAliveCtx = instance.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for GOG verify $gameId")
+                    }
+                    try {
+                        val result =
+                            instance.gogVerifyManager.verifyGameFiles(
+                                gameId = gameId,
+                                installPath = File(installPath),
+                                downloadInfo = downloadInfo,
+                                language = com.winlator.cmod.feature.stores.steam.utils.PrefManager.containerLanguage,
+                            )
+                        if (result.isFailure) {
+                            val error = result.exceptionOrNull()
+                            when {
+                                downloadInfo.isCancelling -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.CANCELLED)
+                                }
+                                !downloadInfo.isActive() -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.PAUSED)
+                                }
+                                else -> {
+                                    Timber.tag("GOG").e(error, "[Verify] Failed for GOG game $gameId")
+                                    downloadInfo.setProgress(-1.0f)
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(
+                                        DownloadPhase.FAILED,
+                                        error?.message ?: "Unknown error",
+                                    )
+                                    SnackbarManager.show("Verify failed: ${error?.message ?: "Unknown error"}")
+                                }
+                            }
+                        } else {
+                            downloadInfo.setProgress(1.0f)
+                            downloadInfo.setActive(false)
+                            downloadInfo.updateStatus(DownloadPhase.COMPLETE)
+                            SnackbarManager.show("Verify files complete")
+                        }
+                    } catch (e: Exception) {
+                        Timber.tag("GOG").e(e, "[Verify] Exception for GOG game $gameId")
+                        downloadInfo.setProgress(-1.0f)
+                        downloadInfo.setActive(false)
+                        downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Unknown error")
+                        SnackbarManager.show("Verify failed: ${e.message ?: "Unknown error"}")
+                    } finally {
+                        val finalCoordStatus =
+                            when (downloadInfo.getStatusFlow().value) {
+                                DownloadPhase.COMPLETE -> DownloadRecord.STATUS_COMPLETE
+                                DownloadPhase.PAUSED -> DownloadRecord.STATUS_PAUSED
+                                DownloadPhase.CANCELLED -> DownloadRecord.STATUS_CANCELLED
+                                DownloadPhase.FAILED -> DownloadRecord.STATUS_FAILED
+                                else -> DownloadRecord.STATUS_FAILED
+                            }
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_GOG,
+                            gameId,
+                            finalCoordStatus,
+                        )
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(gameId.toIntOrNull() ?: 0, false))
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for GOG verify $gameId")
+                        }
+                    }
+                }
+            downloadInfo.setDownloadJob(job)
+            return downloadInfo
+        }
+
+        fun updateGameFiles(
+            context: Context,
+            gameId: String,
+        ): DownloadInfo? {
+            val instance = getInstance() ?: return null
+            val game =
+                runBlocking(Dispatchers.IO) { instance.gogManager.getGameFromDbById(gameId) }
+                    ?: return null
+            val installPath =
+                game.installPath.ifEmpty { GOGConstants.getGameInstallPath(game.title) }
+            if (installPath.isBlank() || !File(installPath).isDirectory) return null
+
+            val activeOther =
+                DownloadCoordinator
+                    .snapshotRecords()
+                    .filter {
+                        it.status == DownloadRecord.STATUS_DOWNLOADING ||
+                            it.status == DownloadRecord.STATUS_QUEUED
+                    }.any {
+                        it.store != DownloadRecord.STORE_GOG || it.storeGameId != gameId
+                    }
+            if (activeOther) return null
+
+            val existing = instance.activeDownloads[gameId]
+            if (existing?.isActive() == true) return null
+            instance.activeDownloads.remove(gameId)
+
+            val downloadInfo =
+                DownloadInfo(
+                    jobCount = 1,
+                    gameId = gameId.toIntOrNull() ?: 0,
+                    downloadingAppIds = CopyOnWriteArrayList<Int>(),
+                )
+            instance.activeDownloads[gameId] = downloadInfo
+
+            val priorUpdateRecord =
+                runBlocking { DownloadCoordinator.findRecord(DownloadRecord.STORE_GOG, gameId) }
+            if (priorUpdateRecord != null && priorUpdateRecord.bytesTotal > 0L) {
+                downloadInfo.setTotalExpectedBytes(priorUpdateRecord.bytesTotal)
+                downloadInfo.setDisplayTotalExpectedBytes(priorUpdateRecord.bytesTotal)
+                downloadInfo.initializeBytesDownloaded(priorUpdateRecord.bytesDownloaded)
+            }
+
+            val decision =
+                runBlocking {
+                    DownloadCoordinator.requestSlot(
+                        store = DownloadRecord.STORE_GOG,
+                        storeGameId = gameId,
+                        title = game.title,
+                        artUrl = game.iconUrl,
+                        installPath = installPath,
+                        language = com.winlator.cmod.feature.stores.steam.utils.PrefManager.containerLanguage,
+                        taskType = DownloadRecord.TASK_UPDATE,
+                    )
+                }
+            if (decision is DownloadCoordinator.Decision.Queue) {
+                downloadInfo.setActive(false)
+                downloadInfo.isCancelling = false
+                downloadInfo.updateStatus(DownloadPhase.QUEUED, "Queued")
+                PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(gameId.toIntOrNull() ?: 0, true))
+                return downloadInfo
+            }
+
+            downloadInfo.setActive(true)
+            downloadInfo.isCancelling = false
+            downloadInfo.updateStatus(DownloadPhase.DOWNLOADING)
+
+            val job =
+                instance.scope.launch {
+                    val keepAliveTag = "gog-update-$gameId"
+                    val keepAliveCtx = instance.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for GOG update $gameId")
+                    }
+                    try {
+                        val result =
+                            instance.gogUpdateManager.updateGameFiles(
+                                gameId = gameId,
+                                installPath = File(installPath),
+                                downloadInfo = downloadInfo,
+                                language = com.winlator.cmod.feature.stores.steam.utils.PrefManager.containerLanguage,
+                            )
+                        if (result.isFailure) {
+                            val error = result.exceptionOrNull()
+                            when {
+                                downloadInfo.isCancelling -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.CANCELLED)
+                                }
+                                !downloadInfo.isActive() -> {
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(DownloadPhase.PAUSED)
+                                }
+                                else -> {
+                                    Timber.tag("GOG").e(error, "[Update] Failed for GOG game $gameId")
+                                    downloadInfo.setProgress(-1.0f)
+                                    downloadInfo.setActive(false)
+                                    downloadInfo.updateStatus(
+                                        DownloadPhase.FAILED,
+                                        error?.message ?: "Unknown error",
+                                    )
+                                    SnackbarManager.show("Update failed: ${error?.message ?: "Unknown error"}")
+                                }
+                            }
+                        } else {
+                            downloadInfo.setProgress(1.0f)
+                            downloadInfo.setActive(false)
+                            downloadInfo.updateStatus(DownloadPhase.COMPLETE)
+                            SnackbarManager.show("Update complete")
+                        }
+                    } catch (e: Exception) {
+                        Timber.tag("GOG").e(e, "[Update] Exception for GOG game $gameId")
+                        downloadInfo.setProgress(-1.0f)
+                        downloadInfo.setActive(false)
+                        downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Unknown error")
+                        SnackbarManager.show("Update failed: ${e.message ?: "Unknown error"}")
+                    } finally {
+                        val finalCoordStatus =
+                            when (downloadInfo.getStatusFlow().value) {
+                                DownloadPhase.COMPLETE -> DownloadRecord.STATUS_COMPLETE
+                                DownloadPhase.PAUSED -> DownloadRecord.STATUS_PAUSED
+                                DownloadPhase.CANCELLED -> DownloadRecord.STATUS_CANCELLED
+                                DownloadPhase.FAILED -> DownloadRecord.STATUS_FAILED
+                                else -> DownloadRecord.STATUS_FAILED
+                            }
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_GOG,
+                            gameId,
+                            finalCoordStatus,
+                        )
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(gameId.toIntOrNull() ?: 0, false))
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for GOG update $gameId")
+                        }
+                    }
+                }
+            downloadInfo.setDownloadJob(job)
+            return downloadInfo
+        }
+
         suspend fun deleteGame(
             context: Context,
             libraryItem: LibraryItem,
@@ -561,12 +1234,18 @@ class GOGService : Service() {
             context: Context,
             appId: String,
             preferredAction: String = "none",
+        ): Boolean = syncCloudSaves(context, appId, preferredAction, null)
+
+        suspend fun syncCloudSaves(
+            context: Context,
+            appId: String,
+            preferredAction: String,
+            targetContainerId: Int?,
         ): Boolean =
             withContext(Dispatchers.IO) {
                 try {
                     Timber.tag("GOG").d("[Cloud Saves] syncCloudSaves called for $appId with action: $preferredAction")
 
-                    // Check if there's already a sync in progress for this appId
                     val serviceInstance = getInstance()
                     if (serviceInstance == null) {
                         Timber.tag("GOG").e("[Cloud Saves] Service instance not available for sync start")
@@ -593,7 +1272,6 @@ class GOGService : Service() {
                         val authConfigPath = GOGAuthManager.getAuthConfigPath(context)
                         Timber.tag("GOG").d("[Cloud Saves] Using auth config path: $authConfigPath")
 
-                        // Get game info
                         val gameId = ContainerUtils.extractGameIdFromContainerId(appId)
                         Timber.tag("GOG").d("[Cloud Saves] Extracted game ID: $gameId from appId: $appId")
                         val game = instance.gogManager.getGameFromDbById(gameId.toString())
@@ -604,9 +1282,11 @@ class GOGService : Service() {
                         }
                         Timber.tag("GOG").d("[Cloud Saves] Found game: ${game.title}")
 
-                        // Get save directory paths (Android runs games through Wine, so always Windows)
-                        Timber.tag("GOG").d("[Cloud Saves] Resolving save directory paths for $appId")
-                        val saveLocations = instance.gogManager.getSaveDirectoryPath(context, appId, game.title)
+                        Timber.tag("GOG").d(
+                            "[Cloud Saves] Resolving save directory paths for $appId (container: ${targetContainerId ?: "auto"})",
+                        )
+                        val saveLocations =
+                            instance.gogManager.getSaveDirectoryPath(context, appId, game.title, targetContainerId)
 
                         if (saveLocations == null || saveLocations.isEmpty()) {
                             Timber.tag("GOG").w("[Cloud Saves] No save locations found for game $appId (cloud saves may not be enabled)")
@@ -654,7 +1334,6 @@ class GOGService : Service() {
                                     Timber.tag("GOG").e(e, "[Cloud Saves] [BEFORE] Failed to check directory")
                                 }
 
-                                // Get stored timestamp for this location
                                 val timestampStr = instance.gogManager.getCloudSaveSyncTimestamp(appId, location.name)
                                 val timestamp = timestampStr.toLongOrNull() ?: 0L
 
@@ -665,7 +1344,6 @@ class GOGService : Service() {
                                         "[Cloud Saves] Syncing '${location.name}' for game $gameId (clientId: ${location.clientId}, path: ${location.location}, timestamp: $timestamp, action: $preferredAction)",
                                     )
 
-                                // Validate clientSecret is available
                                 if (location.clientSecret.isEmpty()) {
                                     Timber.tag("GOG").e("[Cloud Saves] Missing clientSecret for '${location.name}', skipping sync")
                                     continue
@@ -770,15 +1448,20 @@ class GOGService : Service() {
     @Inject
     lateinit var gogDownloadManager: GOGDownloadManager
 
+    @Inject
+    lateinit var gogVerifyManager: GOGVerifyManager
+
+    @Inject
+    lateinit var gogUpdateManager: GOGUpdateManager
+
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    // Track active downloads by game ID
     private val activeDownloads = ConcurrentHashMap<String, DownloadInfo>()
 
-    // Original download parameters per gameId so resume can restore container language and
+    // Download parameters per gameId so resume can restore container language and
     // install path instead of falling back to defaults.
-    // (Phase 2 will move this into a persistent record.)
     data class DownloadParams(
+        val dlcGameIds: List<Int>,
         val containerLanguage: String,
         val installPath: String,
     )
@@ -793,14 +1476,22 @@ class GOGService : Service() {
                 val context = com.winlator.cmod.app.service.DownloadService.appContext ?: return
                 val gameId = record.storeGameId
                 val params = downloadParams[gameId]
+                val dlcGameIds =
+                    params?.dlcGameIds
+                        ?: record.selectedDlcs
+                            .split(',')
+                            .mapNotNull { it.trim().toIntOrNull() }
                 val installPath = params?.installPath ?: record.installPath
                 val containerLanguage = params?.containerLanguage ?: record.language
 
-                // Drop the queued in-memory entry so downloadGame() doesn't short-circuit on
                 // "already downloading" — it will recreate the DownloadInfo and launch.
                 activeDownloads.remove(gameId)
 
-                downloadGame(context, gameId, installPath, containerLanguage)
+                when (record.taskType) {
+                    DownloadRecord.TASK_VERIFY -> verifyGameFiles(context, gameId)
+                    DownloadRecord.TASK_UPDATE -> updateGameFiles(context, gameId)
+                    else -> downloadGame(context, gameId, installPath, containerLanguage, dlcGameIds)
+                }
             }
 
             override fun pauseRunning(record: DownloadRecord) {
@@ -838,6 +1529,22 @@ class GOGService : Service() {
                                 ""
                             }
                         }
+                    // VERIFY/UPDATE operate in-place on an already-installed game. Cancelling them
+                    // must NEVER wipe the install dir — only the fresh-install task gets the rollback
+                    // delete. Restore the COMPLETE marker so the library and launcher still treat
+                    // the game as installed (any half-written files will be caught on next verify).
+                    if (record.taskType == DownloadRecord.TASK_UPDATE ||
+                        record.taskType == DownloadRecord.TASK_VERIFY
+                    ) {
+                        if (pathToDelete.isNotEmpty()) {
+                            MarkerUtils.removeMarker(pathToDelete, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                            MarkerUtils.addMarker(pathToDelete, Marker.DOWNLOAD_COMPLETE_MARKER)
+                        }
+                        info?.updateStatus(DownloadPhase.CANCELLED)
+                        val numericIdEarly = gameId.toIntOrNull() ?: 0
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(numericIdEarly, false))
+                        return@launch
+                    }
                     if (pathToDelete.isNotEmpty()) {
                         val dirFile = File(pathToDelete)
                         if (dirFile.exists() && dirFile.isDirectory) {
@@ -863,12 +1570,10 @@ class GOGService : Service() {
             }
         }
 
-    // GOGManager is injected by Hilt
     override fun onCreate() {
         super.onCreate()
         instance = this
 
-        // Initialize notification helper for foreground service
         notificationHelper = NotificationHelper(applicationContext)
         PluviaApp.events.on<AndroidEvent.EndProcess, Unit>(onEndProcess)
 
@@ -882,11 +1587,9 @@ class GOGService : Service() {
     ): Int {
         Timber.d("[GOGService] onStartCommand() - action: ${intent?.action}")
 
-        // Start as foreground service
         val notification = notificationHelper.createForegroundNotification("Connected")
         startForeground(1, notification)
 
-        // Determine if we should sync based on the action
         val shouldSync =
             when (intent?.action) {
                 ACTION_MANUAL_SYNC -> {
@@ -900,8 +1603,7 @@ class GOGService : Service() {
                 }
 
                 null -> {
-                    // Service restarted by Android with null intent (START_STICKY behavior)
-                    // Only sync if we haven't done initial sync yet, or if it's been a while
+                    // START_STICKY restart: sync only if initial sync is missing or throttle elapsed.
                     val timeSinceLastSync = System.currentTimeMillis() - lastSyncTimestamp
                     val shouldResync = !hasPerformedInitialSync || timeSinceLastSync >= SYNC_THROTTLE_MILLIS
 
@@ -917,16 +1619,14 @@ class GOGService : Service() {
                 }
 
                 else -> {
-                    // Service started without sync action (e.g., just to keep it alive)
                     Timber.d("[GOGService] Service started without sync action")
                     false
                 }
             }
 
-        // Start background library sync if requested
         if (shouldSync && (backgroundSyncJob == null || backgroundSyncJob?.isActive != true)) {
             Timber.i("[GOGService] Starting background library sync")
-            backgroundSyncJob?.cancel() // Cancel any existing job
+            backgroundSyncJob?.cancel()
             backgroundSyncJob =
                 scope.launch {
                     try {
@@ -938,9 +1638,7 @@ class GOGService : Service() {
                             Timber.w("[GOGService]: Failed to start background sync: ${syncResult.exceptionOrNull()?.message}")
                         } else {
                             Timber.i("[GOGService]: Background library sync completed successfully")
-                            // Update last sync timestamp on successful sync
                             lastSyncTimestamp = System.currentTimeMillis()
-                            // Mark that initial sync has been performed
                             hasPerformedInitialSync = true
                         }
                     } catch (e: Exception) {
@@ -961,11 +1659,10 @@ class GOGService : Service() {
         PluviaApp.events.off<AndroidEvent.EndProcess, Unit>(onEndProcess)
         DownloadCoordinator.unregisterDispatcher(DownloadRecord.STORE_GOG)
 
-        // Cancel sync operations
         backgroundSyncJob?.cancel()
         setSyncInProgress(false)
 
-        scope.cancel() // Cancel any ongoing operations
+        scope.cancel()
         stopForeground(STOP_FOREGROUND_REMOVE)
         notificationHelper.cancel()
         instance = null
diff --git a/app/src/main/feature/stores/gog/service/GOGUpdateManager.kt b/app/src/main/feature/stores/gog/service/GOGUpdateManager.kt
new file mode 100644
index 000000000..6f08cc1b2
--- /dev/null
+++ b/app/src/main/feature/stores/gog/service/GOGUpdateManager.kt
@@ -0,0 +1,281 @@
+package com.winlator.cmod.feature.stores.gog.service
+
+import android.content.Context
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.stores.gog.api.DepotFile
+import com.winlator.cmod.feature.stores.gog.api.GOGApiClient
+import com.winlator.cmod.feature.stores.gog.api.GOGBuild
+import com.winlator.cmod.feature.stores.gog.api.GOGManifestParser
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Result of a "check for update" probe against the GOG content system.
+ */
+data class GOGUpdateInfo(
+    val hasUpdate: Boolean = false,
+    val currentBuildId: String? = null,
+    val latestBuildId: String? = null,
+    val latestVersionName: String? = null,
+    val downloadSize: Long = 0L,
+    val changedFileCount: Int = 0,
+    val message: String? = null,
+)
+
+@Singleton
+class GOGUpdateManager
+    @Inject
+    constructor(
+        private val gogDownloadManager: GOGDownloadManager,
+        private val gogManager: GOGManager,
+        private val apiClient: GOGApiClient,
+        private val parser: GOGManifestParser,
+        @ApplicationContext private val context: Context,
+    ) {
+        private val WINDOWS_OS_VERSION = "windows"
+
+        suspend fun checkForGameUpdate(
+            gameId: String,
+            installPath: File,
+            language: String = GOGConstants.GOG_FALLBACK_DOWNLOAD_LANGUAGE,
+        ): GOGUpdateInfo =
+            withContext(Dispatchers.IO) {
+                try {
+                    if (!installPath.isDirectory) {
+                        return@withContext GOGUpdateInfo(
+                            message = "Install directory not found: ${installPath.absolutePath}",
+                        )
+                    }
+
+                    val localManifest = GOGManifestUtils.readLocalManifest(installPath)
+                    val installedBuildId = localManifest?.optString("buildId", "")?.takeIf { it.isNotBlank() }
+                    val effectiveLanguage =
+                        localManifest?.optString("language", "")?.takeIf { it.isNotBlank() } ?: language
+
+                    val latestBuild = selectPreferredBuild(gameId)
+                        ?: return@withContext GOGUpdateInfo(
+                            currentBuildId = installedBuildId,
+                            message = "No Windows builds available for this game",
+                        )
+
+                    if (installedBuildId == null) {
+                        return@withContext GOGUpdateInfo(
+                            currentBuildId = null,
+                            latestBuildId = latestBuild.buildId,
+                            latestVersionName = latestBuild.versionName,
+                            message = "No installed build id recorded — run Verify Files first",
+                        )
+                    }
+
+                    if (installedBuildId == latestBuild.buildId) {
+                        return@withContext GOGUpdateInfo(
+                            hasUpdate = false,
+                            currentBuildId = installedBuildId,
+                            latestBuildId = latestBuild.buildId,
+                            latestVersionName = latestBuild.versionName,
+                        )
+                    }
+
+                    val plan = computeUpdatePlan(gameId, installPath, latestBuild, effectiveLanguage)
+
+                    GOGUpdateInfo(
+                        hasUpdate = plan.changedFiles.isNotEmpty() || installedBuildId != latestBuild.buildId,
+                        currentBuildId = installedBuildId,
+                        latestBuildId = latestBuild.buildId,
+                        latestVersionName = latestBuild.versionName,
+                        downloadSize = plan.downloadSize,
+                        changedFileCount = plan.changedFiles.size,
+                    )
+                } catch (e: Exception) {
+                    Timber.tag("GOG").w(e, "GOG update check failed for $gameId")
+                    GOGUpdateInfo(message = e.message ?: "Update check failed")
+                }
+            }
+
+        suspend fun updateGameFiles(
+            gameId: String,
+            installPath: File,
+            downloadInfo: DownloadInfo,
+            language: String = GOGConstants.GOG_FALLBACK_DOWNLOAD_LANGUAGE,
+        ): Result<Unit> =
+            withContext(Dispatchers.IO) {
+                val gameIdInt = gameId.toIntOrNull() ?: 0
+                try {
+                    if (!installPath.isDirectory) {
+                        return@withContext Result.failure(
+                            Exception("Install directory not found: ${installPath.absolutePath}"),
+                        )
+                    }
+
+                    val localManifest = GOGManifestUtils.readLocalManifest(installPath)
+                    val storedLanguage = localManifest?.optString("language", "")?.takeIf { it.isNotBlank() }
+                    val installedDlcIds = GOGManifestUtils.getInstalledDlcIds(installPath)
+                    val effectiveLanguage = storedLanguage ?: language
+
+                    PluviaApp.events.emitJava(AndroidEvent.DownloadStatusChanged(gameIdInt, true))
+                    downloadInfo.setActive(true)
+                    downloadInfo.isCancelling = false
+                    downloadInfo.updateStatus(DownloadPhase.DOWNLOADING, "Preparing update")
+
+                    MarkerUtils.addMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_COMPLETE_MARKER)
+
+                    val supportDir = File(installPath, "_CommonRedist")
+
+                    val result =
+                        gogDownloadManager.downloadGame(
+                            gameId = gameId,
+                            installPath = installPath,
+                            downloadInfo = downloadInfo,
+                            language = effectiveLanguage,
+                            withDlcs = installedDlcIds.isNotEmpty(),
+                            supportDir = supportDir,
+                            selectedDlcIds = installedDlcIds,
+                            buildIdOverride = null, // use latest build
+                            verifyMode = true,
+                            verifyProgressSink = { bytesDone, total ->
+                                DownloadCoordinator.updateProgress(
+                                    DownloadRecord.STORE_GOG,
+                                    gameId,
+                                    bytesDone,
+                                    total,
+                                )
+                            },
+                        )
+
+                    if (result.isFailure) {
+                        restoreInstalledMarker(installPath.absolutePath)
+                        return@withContext result
+                    }
+
+                    downloadInfo.updateStatus(DownloadPhase.COMPLETE, "Update complete")
+                    downloadInfo.setProgress(1.0f)
+                    downloadInfo.setActive(false)
+                    downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(gameId, downloadInfo)
+                    PluviaApp.events.emitJava(AndroidEvent.LibraryInstallStatusChanged(gameIdInt))
+                    Result.success(Unit)
+                } catch (e: Exception) {
+                    Timber.tag("GOG").e(e, "Update failed for game $gameId")
+                    restoreInstalledMarker(installPath.absolutePath)
+                    downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Update failed")
+                    downloadInfo.setProgress(-1.0f)
+                    downloadInfo.setActive(false)
+                    Result.failure(e)
+                } finally {
+                    PluviaApp.events.emitJava(AndroidEvent.DownloadStatusChanged(gameIdInt, false))
+                }
+            }
+
+        private suspend fun selectPreferredBuild(gameId: String): GOGBuild? {
+            val gen2 = apiClient.getBuildsForGame(gameId, WINDOWS_OS_VERSION, generation = 2)
+            if (gen2.isSuccess) {
+                parser
+                    .selectBuild(gen2.getOrThrow().items, preferredGeneration = 2, platform = WINDOWS_OS_VERSION)
+                    ?.let { return it }
+            }
+            val gen1 = apiClient.getBuildsForGame(gameId, WINDOWS_OS_VERSION, generation = 1)
+            if (gen1.isSuccess) {
+                return parser.selectBuild(gen1.getOrThrow().items, preferredGeneration = 1, platform = WINDOWS_OS_VERSION)
+            }
+            return null
+        }
+
+        private data class UpdatePlan(
+            val changedFiles: List<DepotFile>,
+            val downloadSize: Long,
+        )
+
+        private suspend fun computeUpdatePlan(
+            gameId: String,
+            installPath: File,
+            latestBuild: GOGBuild,
+            language: String,
+        ): UpdatePlan {
+            val manifestResult = apiClient.fetchManifest(latestBuild.link)
+            if (manifestResult.isFailure) {
+                Timber.tag("GOG").w(
+                    manifestResult.exceptionOrNull(),
+                    "Failed to fetch latest manifest for $gameId during update check",
+                )
+                return UpdatePlan(emptyList(), 0L)
+            }
+            val manifest = manifestResult.getOrThrow()
+
+            if (latestBuild.generation == 1) {
+                return UpdatePlan(changedFiles = emptyList(), downloadSize = 0L)
+            }
+
+            val ownedGameIds = gogManager.getAllGameIds()
+            val installedDlcIds = GOGManifestUtils.getInstalledDlcIds(installPath)
+            val requestedProductIds = buildSet {
+                add(manifest.baseProductId)
+                addAll(installedDlcIds)
+            }
+
+            val (languageDepots, _) = parser.filterDepotsByLanguage(manifest, language)
+            val depots =
+                parser
+                    .filterDepotsByOwnership(languageDepots, ownedGameIds)
+                    .filter { it.productId in requestedProductIds }
+            if (depots.isEmpty()) return UpdatePlan(emptyList(), 0L)
+
+            val allFiles = mutableListOf<DepotFile>()
+            for (depot in depots) {
+                val depotManifestResult = apiClient.fetchDepotManifest(depot.manifest)
+                if (depotManifestResult.isFailure) {
+                    Timber.tag("GOG").w(
+                        depotManifestResult.exceptionOrNull(),
+                        "Failed to fetch depot manifest ${depot.manifest} during update check",
+                    )
+                    continue
+                }
+                allFiles += depotManifestResult.getOrThrow().files.filterNot { it.isSupportFile() }
+            }
+
+            val changed = mutableListOf<DepotFile>()
+            val seenCompressedChunks = HashSet<String>()
+            var downloadSize = 0L
+            for (file in allFiles) {
+                val outputFile = File(installPath, file.path)
+                if (!gogDownloadManager.isInstalledFileValidByChunkMd5(outputFile, file)) {
+                    changed += file
+                    for (chunk in file.chunks) {
+                        if (seenCompressedChunks.add(chunk.compressedMd5)) {
+                            downloadSize += (chunk.compressedSize ?: chunk.size).coerceAtLeast(0L)
+                        }
+                    }
+                }
+            }
+            return UpdatePlan(changed, downloadSize)
+        }
+
+        private fun restoreInstalledMarker(installPath: String) {
+            MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+        }
+
+        private fun syncCoordinatorProgress(
+            gameId: String,
+            downloadInfo: DownloadInfo,
+        ) {
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_GOG,
+                gameId,
+                downloadInfo.getBytesDownloaded(),
+                downloadInfo.getTotalExpectedBytes(),
+            )
+        }
+    }
diff --git a/app/src/main/feature/stores/gog/service/GOGVerifyManager.kt b/app/src/main/feature/stores/gog/service/GOGVerifyManager.kt
new file mode 100644
index 000000000..0aee04a6c
--- /dev/null
+++ b/app/src/main/feature/stores/gog/service/GOGVerifyManager.kt
@@ -0,0 +1,129 @@
+package com.winlator.cmod.feature.stores.gog.service
+
+import android.content.Context
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GOGVerifyManager
+    @Inject
+    constructor(
+        private val gogDownloadManager: GOGDownloadManager,
+        private val gogManager: GOGManager,
+        @ApplicationContext private val context: Context,
+    ) {
+
+        suspend fun verifyGameFiles(
+            gameId: String,
+            installPath: File,
+            downloadInfo: DownloadInfo,
+            language: String = GOGConstants.GOG_FALLBACK_DOWNLOAD_LANGUAGE,
+        ): Result<Unit> =
+            withContext(Dispatchers.IO) {
+                val gameIdInt = gameId.toIntOrNull() ?: 0
+                try {
+                    if (!installPath.isDirectory) {
+                        return@withContext Result.failure(
+                            Exception("Install directory not found: ${installPath.absolutePath}"),
+                        )
+                    }
+
+                    PluviaApp.events.emitJava(AndroidEvent.DownloadStatusChanged(gameIdInt, true))
+                    downloadInfo.setActive(true)
+                    downloadInfo.isCancelling = false
+                    downloadInfo.updateStatus(DownloadPhase.VERIFYING, "Preparing verification")
+
+                    // Read locally-persisted manifest metadata to pin verification to the installed build.
+                    val localManifest = GOGManifestUtils.readLocalManifest(installPath)
+                    val installedBuildId = localManifest?.optString("buildId", "")?.takeIf { it.isNotBlank() }
+                    val storedLanguage = localManifest?.optString("language", "")?.takeIf { it.isNotBlank() }
+                    val installedDlcIds = GOGManifestUtils.getInstalledDlcIds(installPath)
+                    val effectiveLanguage = storedLanguage ?: language
+
+                    if (installedBuildId == null) {
+                        Timber.tag("GOG").w(
+                            "No local manifest with buildId found for game $gameId at ${installPath.absolutePath}; " +
+                                "verifying against latest build instead",
+                        )
+                    }
+
+                    val supportDir = File(installPath, "_CommonRedist")
+
+                    // Mark in-progress so concurrent installs/launches see this as active work.
+                    MarkerUtils.addMarker(installPath.absolutePath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                    MarkerUtils.removeMarker(installPath.absolutePath, Marker.DOWNLOAD_COMPLETE_MARKER)
+
+                    val result =
+                        gogDownloadManager.downloadGame(
+                            gameId = gameId,
+                            installPath = installPath,
+                            downloadInfo = downloadInfo,
+                            language = effectiveLanguage,
+                            withDlcs = installedDlcIds.isNotEmpty(),
+                            supportDir = supportDir,
+                            selectedDlcIds = installedDlcIds,
+                            buildIdOverride = installedBuildId,
+                            verifyMode = true,
+                            verifyProgressSink = { bytesDone, total ->
+                                DownloadCoordinator.updateProgress(
+                                    DownloadRecord.STORE_GOG,
+                                    gameId,
+                                    bytesDone,
+                                    total,
+                                )
+                            },
+                        )
+
+                    if (result.isFailure) {
+                        restoreInstalledMarker(installPath.absolutePath)
+                        return@withContext result
+                    }
+                    downloadInfo.updateStatus(DownloadPhase.COMPLETE, "Verify complete")
+                    downloadInfo.setProgress(1.0f)
+                    downloadInfo.setActive(false)
+                    downloadInfo.emitProgressChange()
+                    syncCoordinatorProgress(gameId, downloadInfo)
+                    PluviaApp.events.emitJava(AndroidEvent.LibraryInstallStatusChanged(gameIdInt))
+                    Result.success(Unit)
+                } catch (e: Exception) {
+                    Timber.tag("GOG").e(e, "Verify failed for game $gameId")
+                    restoreInstalledMarker(installPath.absolutePath)
+                    downloadInfo.updateStatus(DownloadPhase.FAILED, e.message ?: "Verify failed")
+                    downloadInfo.setProgress(-1.0f)
+                    downloadInfo.setActive(false)
+                    Result.failure(e)
+                } finally {
+                    PluviaApp.events.emitJava(AndroidEvent.DownloadStatusChanged(gameIdInt, false))
+                }
+            }
+
+        private fun restoreInstalledMarker(installPath: String) {
+            MarkerUtils.removeMarker(installPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(installPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+        }
+
+        private fun syncCoordinatorProgress(
+            gameId: String,
+            downloadInfo: DownloadInfo,
+        ) {
+            DownloadCoordinator.updateProgress(
+                DownloadRecord.STORE_GOG,
+                gameId,
+                downloadInfo.getBytesDownloaded(),
+                downloadInfo.getTotalExpectedBytes(),
+            )
+        }
+    }
diff --git a/app/src/main/feature/stores/steam/SteamClientManager.kt b/app/src/main/feature/stores/steam/SteamClientManager.kt
index ced22c07c..53042afcf 100644
--- a/app/src/main/feature/stores/steam/SteamClientManager.kt
+++ b/app/src/main/feature/stores/steam/SteamClientManager.kt
@@ -4,6 +4,7 @@ import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.widget.Toast
+import com.winlator.cmod.BuildConfig
 import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.display.environment.ImageFs
 import com.winlator.cmod.runtime.wine.WineUtils
@@ -16,103 +17,27 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
-import kotlin.concurrent.thread
 
-/**
- * Manages Steam client download, extraction, and Steamless DRM patching.
- */
+// Manages ColdClient and Steamless support assets.
 object SteamClientManager {
     private const val TAG = "SteamClientManager"
     private const val COMPONENTS_BASE_URL = "https://github.com/maxjivi05/Components/releases/download/Components"
 
-    interface DownloadProgressListener {
-        fun onProgress(progress: Float)
-
-        fun onComplete(
-            success: Boolean,
-            error: String?,
-        )
-    }
-
     interface ShellCommandRunner {
         fun exec(command: String): String
     }
 
-    @JvmStatic
-    fun isSteamDownloaded(context: Context): Boolean {
-        val steamFile = File(context.filesDir, "steam.tzst")
-        return steamFile.exists() && steamFile.length() > 0
-    }
-
-    @JvmStatic
-    fun isSteamInstalled(context: Context): Boolean {
-        val imageFs = ImageFs.find(context)
-        val steamExe = File(imageFs.rootDir, "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/steam.exe")
-        val steamClient = File(imageFs.rootDir, "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/steamclient.dll")
-        val steamClient64 = File(imageFs.rootDir, "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/steamclient64.dll")
-        return steamExe.exists() && steamClient.exists() && steamClient64.exists()
-    }
-
     @JvmStatic
     fun isColdClientInstalled(context: Context): Boolean {
         val imageFs = ImageFs.find(context)
         val loaderExe = File(imageFs.rootDir, "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/steamclient_loader_x64.exe")
-        val extraDll = File(imageFs.rootDir, "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/extra_dlls/steamclient_extra_x64.dll")
+        val extraDll = File(imageFs.rootDir, "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/extra_dlls/StubDRM64.dll")
         return loaderExe.exists() && loaderExe.length() > 0 && extraDll.exists() && extraDll.length() > 0
     }
 
-    @JvmStatic
-    fun downloadSteam(
-        context: Context,
-        listener: DownloadProgressListener?,
-    ) {
-        thread(name = "SteamDownloader") {
-            val dest = File(context.filesDir, "steam.tzst")
-            val tmp = File("${dest.absolutePath}.part")
-            var success = false
-            var error: String? = null
-
-            val urls = downloadUrlsFor("steam.tzst")
-            for (urlStr in urls) {
-                try {
-                    Log.d(TAG, "Attempting download from: $urlStr")
-                    downloadFile(urlStr, tmp, listener)
-
-                    if (tmp.exists() && tmp.length() > 0) {
-                        if (!tmp.renameTo(dest)) {
-                            Files.copy(tmp.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING)
-                            tmp.delete()
-                        }
-                        success = true
-                        Log.d(TAG, "Steam download completed: ${dest.length()} bytes")
-                        break
-                    }
-                } catch (e: Exception) {
-                    Log.w(TAG, "Download failed from $urlStr: ${e.message}")
-                    error = e.message
-                    tmp.delete()
-                }
-            }
-
-            if (!success) {
-                val finalError = error ?: "All download sources failed"
-                Handler(Looper.getMainLooper()).post {
-                    WinToast.show(context, "Steam download failed: $finalError. Try disabling VPN.", Toast.LENGTH_LONG)
-                }
-            }
-
-            listener?.let { l ->
-                Handler(Looper.getMainLooper()).post {
-                    l.onComplete(success, error)
-                }
-            }
-        }
-    }
-
     private fun downloadFile(
         urlStr: String,
         dest: File,
-        listener: DownloadProgressListener?,
     ) {
         var conn: HttpURLConnection? = null
         try {
@@ -126,24 +51,17 @@ object SteamClientManager {
                 throw Exception("HTTP $responseCode")
             }
 
-            val total = conn.contentLength.toLong()
-            var downloaded = 0L
-
             conn.inputStream.use { input ->
                 FileOutputStream(dest).use { output ->
                     val buf = ByteArray(8192)
                     var bytesRead: Int
                     while (input.read(buf).also { bytesRead = it } >= 0) {
                         output.write(buf, 0, bytesRead)
-                        downloaded += bytesRead
-                        if (listener != null && total > 0) {
-                            val progress = downloaded.toFloat() / total
-                            Handler(Looper.getMainLooper()).post { listener.onProgress(progress) }
-                        }
                     }
                 }
             }
 
+            val total = conn.contentLength.toLong()
             if (total > 0 && dest.length() != total) {
                 dest.delete()
                 throw Exception("Incomplete download: ${dest.length()}/$total")
@@ -181,7 +99,7 @@ object SteamClientManager {
         for (urlStr in downloadUrlsFor(fileName)) {
             try {
                 Log.d(TAG, "Downloading $fileName from: $urlStr")
-                downloadFile(urlStr, tmp, null)
+                downloadFile(urlStr, tmp)
                 if (tmp.exists() && tmp.length() > 0) {
                     if (!tmp.renameTo(dest)) {
                         Files.copy(tmp.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING)
@@ -203,54 +121,31 @@ object SteamClientManager {
         return false
     }
 
-    @JvmStatic
-    fun extractSteam(context: Context): Boolean {
-        if (isSteamInstalled(context)) return true
-
-        val steamFile = File(context.filesDir, "steam.tzst")
-        if (!steamFile.exists()) return false
-
-        val imageFs = ImageFs.find(context)
-        return try {
-            TarCompressorUtils.extract(
-                TarCompressorUtils.Type.ZSTD,
-                steamFile,
-                imageFs.rootDir,
-                null,
-            )
-            true
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to extract steam archive: ${e.message}")
-            false
-        }
-    }
-
-    @JvmStatic
-    fun forceExtractSteam(context: Context): Boolean {
-        val steamFile = File(context.filesDir, "steam.tzst")
-        if (!steamFile.exists()) return false
-
-        val imageFs = ImageFs.find(context)
-        return try {
-            TarCompressorUtils.extract(
-                TarCompressorUtils.Type.ZSTD,
-                steamFile,
-                imageFs.rootDir,
-                null,
-            )
-            true
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to force extract steam archive: ${e.message}")
-            false
-        }
-    }
-
     @JvmStatic
     fun extractColdClientSupport(context: Context): Boolean {
-        if (isColdClientInstalled(context)) return true
-
         val imageFs = ImageFs.find(context)
         val expFile = File(context.filesDir, "experimental-drm.tzst")
+        val stampFile = File(context.filesDir, "experimental-drm.version")
+
+        // Refresh extracted ColdClient only when the bundled version changes.
+        val bundledVersion = BuildConfig.COLD_CLIENT_VERSION
+        val installedVersion = runCatching { stampFile.readText().trim() }.getOrNull()
+        val outdated = installedVersion != bundledVersion
+
+        if (isColdClientInstalled(context) && !outdated) return true
+
+        if (outdated) {
+            Log.i(TAG, "ColdClient version changed ($installedVersion -> $bundledVersion); refreshing")
+            expFile.delete()
+            // Remove stale injected DLLs before re-extraction.
+            runCatching {
+                File(
+                    imageFs.rootDir,
+                    "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/extra_dlls",
+                ).deleteRecursively()
+            }
+        }
+
         if (!expFile.exists()) {
             try {
                 context.assets.open("experimental-drm.tzst").use { input ->
@@ -258,7 +153,7 @@ object SteamClientManager {
                         input.copyTo(output)
                     }
                 }
-                Log.d(TAG, "Copied bundled experimental-drm.tzst to filesDir")
+                Log.d(TAG, "Copied bundled experimental-drm.tzst to filesDir ($bundledVersion)")
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to copy bundled experimental-drm.tzst: ${e.message}")
                 return false
@@ -272,6 +167,7 @@ object SteamClientManager {
                 imageFs.rootDir,
                 null,
             )
+            runCatching { stampFile.writeText(bundledVersion) }
             true
         } catch (e: Exception) {
             Log.e(TAG, "Failed to extract ColdClient support archive: ${e.message}")
@@ -279,49 +175,6 @@ object SteamClientManager {
         }
     }
 
-    /**
-     * Ensures Steam client files are ready: downloads steam.tzst if missing,
-     * then extracts it. This is a blocking call and should be run from a worker thread.
-     * @return true if Steam client is ready to use
-     */
-    @JvmStatic
-    fun ensureSteamReady(context: Context): Boolean {
-        // Already installed?
-        if (isSteamInstalled(context)) {
-            Log.d(TAG, "Steam client already installed")
-            return true
-        }
-
-        // Need to download?
-        if (!isSteamDownloaded(context)) {
-            Log.d(TAG, "Steam files not found, downloading...")
-            Handler(Looper.getMainLooper()).post {
-                WinToast.show(context, "Downloading Steam client...", Toast.LENGTH_SHORT)
-            }
-
-            if (!ensureArchiveReady(context, "steam.tzst", "Failed to download Steam client")) {
-                return false
-            }
-        }
-
-        // Extract
-        Log.d(TAG, "Extracting steam files...")
-        val success = extractSteam(context)
-        if (success) {
-            Log.d(TAG, "Steam client extracted successfully")
-            Handler(Looper.getMainLooper()).post {
-                WinToast.show(context, "Steam client ready", Toast.LENGTH_SHORT)
-            }
-        } else {
-            Log.e(TAG, "Failed to extract steam.tzst")
-        }
-        return success
-    }
-
-    @JvmStatic
-    fun ensureRealSteamSupportReady(context: Context): Boolean =
-        ensureArchiveReady(context, "steam-token.tzst", "Failed to download Steam token helper")
-
     @JvmStatic
     fun ensureColdClientSupportReady(context: Context): Boolean = extractColdClientSupport(context)
 
@@ -347,7 +200,6 @@ object SteamClientManager {
             }
         }
 
-        // Ensure the correct Mono MSI is available (downloads if needed)
         val monoMsi = ensureMonoMsi(context)
         if (monoMsi == null) {
             Log.w(TAG, "Mono MSI not available; Steamless may fail if .NET is needed")
@@ -408,7 +260,6 @@ object SteamClientManager {
             val output = shellRunner.exec(command)
             Log.d(TAG, "Steamless CLI output: $output")
 
-            // Validate CLI reported success before swapping files
             val steamlessSuccess = output.lowercase().contains("successfully unpacked")
 
             val unixPath = exePath.replace('\\', '/')
@@ -434,7 +285,7 @@ object SteamClientManager {
                 Log.d(TAG, "Swapped exe with unpacked version")
                 return true
             } else if (!steamlessSuccess && unpackedExe.exists()) {
-                // Existing .unpacked.exe from prior run — use it even if CLI failed this time
+                // Reuse a prior unpack when the CLI fails this run.
                 if (!originalExe.exists() && hostExe.exists()) {
                     Files.copy(hostExe.toPath(), originalExe.toPath(), StandardCopyOption.REPLACE_EXISTING)
                 }
@@ -458,14 +309,7 @@ object SteamClientManager {
         }
     }
 
-    /**
-     * Detects the Mono version expected by the current Wine build by scanning
-     * mscoree.dll for the version string pattern (e.g. "9.3.0", "10.4.1").
-     *
-     * @param containerWinePath The Wine/Proton install path for the container's active build.
-     *                          If provided, this build is checked first before falling back to others.
-     * Returns null if the version cannot be determined.
-     */
+    // Detect the Mono version expected by the current Wine build.
     @JvmStatic
     @JvmOverloads
     fun detectRequiredMonoVersion(
@@ -475,28 +319,31 @@ object SteamClientManager {
         val imageFs = ImageFs.find(context)
         val contentsDir = File(context.filesDir, "contents")
 
-        // Build candidate list, prioritizing the container's active Wine build
         val candidates = mutableListOf<File>()
 
-        // Priority 1: Container's own Wine/Proton build
+        // Proton-style trees nest the wine root under files/.
+        val mscoreeSubPaths =
+            listOf(
+                "lib/wine/aarch64-windows/mscoree.dll",
+                "lib/wine/x86_64-windows/mscoree.dll",
+                "lib/wine/i386-windows/mscoree.dll",
+                "files/lib/wine/aarch64-windows/mscoree.dll",
+                "files/lib/wine/x86_64-windows/mscoree.dll",
+                "files/lib/wine/i386-windows/mscoree.dll",
+            )
+
         if (containerWinePath != null) {
             val wineDir = File(containerWinePath)
-            candidates.add(File(wineDir, "lib/wine/aarch64-windows/mscoree.dll"))
-            candidates.add(File(wineDir, "lib/wine/x86_64-windows/mscoree.dll"))
-            candidates.add(File(wineDir, "lib/wine/i386-windows/mscoree.dll"))
+            mscoreeSubPaths.forEach { candidates.add(File(wineDir, it)) }
             Log.d(TAG, "Mono detection: prioritizing container Wine path: $containerWinePath")
         }
 
-        // Priority 2: All installed Wine and Proton builds under files/contents/
         for (typeDir in listOf(File(contentsDir, "Wine"), File(contentsDir, "Proton"))) {
             typeDir.listFiles()?.forEach { buildDir ->
-                candidates.add(File(buildDir, "lib/wine/aarch64-windows/mscoree.dll"))
-                candidates.add(File(buildDir, "lib/wine/x86_64-windows/mscoree.dll"))
-                candidates.add(File(buildDir, "lib/wine/i386-windows/mscoree.dll"))
+                mscoreeSubPaths.forEach { candidates.add(File(buildDir, it)) }
             }
         }
 
-        // Priority 3: Legacy fallback via imageFs.winePath (imagefs/opt/...)
         val winePath = imageFs.winePath
         if (winePath != null) {
             candidates.add(File(winePath, "lib/wine/x86_64-windows/mscoree.dll"))
@@ -519,14 +366,10 @@ object SteamClientManager {
         return extractMonoVersionFromDll(mscoree)
     }
 
-    /**
-     * Extracts the Mono version string from an mscoree.dll file.
-     */
     private fun extractMonoVersionFromDll(mscoree: File): String? =
         try {
             val bytes = mscoree.readBytes()
 
-            // Strategy 1: Search ISO-8859-1 for "wine-mono-X.Y.Z" (ASCII strings in DLL)
             val content = String(bytes, Charsets.ISO_8859_1)
             val pattern = Regex("wine-mono-(\\d+\\.\\d+\\.\\d+)")
             var match = pattern.find(content)
@@ -534,7 +377,6 @@ object SteamClientManager {
                 Log.d(TAG, "Mono version found via ISO-8859-1 wine-mono pattern")
             }
 
-            // Strategy 2: Search UTF-16LE for "wine-mono-X.Y.Z" (wide strings in DLL)
             if (match == null) {
                 val content16 = String(bytes, Charsets.UTF_16LE)
                 match = pattern.find(content16)
@@ -543,8 +385,7 @@ object SteamClientManager {
                 }
             }
 
-            // Strategy 3: Bare version after "found installed support package" marker
-            // The format varies: "%s\x00X.Y.Z" or "%s\n\x00X.Y.Z"
+            // Some builds store a bare version after this marker.
             if (match == null) {
                 val barePattern = Regex("found installed support package %s[\\n\\r]*\\x00(\\d+\\.\\d+\\.\\d+)\\x00")
                 match = barePattern.find(content)
@@ -566,11 +407,7 @@ object SteamClientManager {
             null
         }
 
-    /**
-     * Returns the path to the correct Mono MSI for the current Wine build.
-     * Downloads it from dl.winehq.org if not already present.
-     * Returns null if version detection fails or download fails.
-     */
+    // Return or download the Mono MSI for the current Wine build.
     @JvmStatic
     @JvmOverloads
     fun ensureMonoMsi(
@@ -590,7 +427,6 @@ object SteamClientManager {
 
         Log.i(TAG, "Required Mono version: $version (expected MSI: $msiName)")
 
-        // Log what's currently in the mono directory
         val existingFiles = monoDir.listFiles()
         if (existingFiles.isNullOrEmpty()) {
             Log.i(TAG, "Mono directory is empty, need to download $msiName")
@@ -599,9 +435,8 @@ object SteamClientManager {
             existingFiles.forEach { f -> Log.i(TAG, "  ${f.name} (${f.length()} bytes)") }
         }
 
-        // Clean up leftover .tmp files and MSIs no longer used by any container
         val containerManager = ContainerManager(context)
-        val usedVersions = mutableSetOf(version) // always keep the version we're about to install
+        val usedVersions = mutableSetOf(version)
         for (c in containerManager.containers) {
             val v = c.getExtra("mono_version", null)
             if (v != null) usedVersions.add(v)
@@ -626,51 +461,71 @@ object SteamClientManager {
             return msiFile
         }
 
-        // Download the correct version
-        val downloadUrl = "https://dl.winehq.org/wine/wine-mono/$version/$msiName"
-        Log.i(TAG, "Downloading Mono $version from $downloadUrl")
-
-        return try {
-            val tmpFile = File(monoDir, "$msiName.tmp")
-            val url = URL(downloadUrl)
-            val connection = url.openConnection() as HttpURLConnection
-            connection.connectTimeout = 30_000
-            connection.readTimeout = 60_000
-            connection.instanceFollowRedirects = true
-
-            if (connection.responseCode != 200) {
-                Log.e(TAG, "Failed to download Mono MSI: HTTP ${connection.responseCode}")
-                connection.disconnect()
-                return null
+        val (major, minor, patch) = version.split('.').map { it.toInt() }
+        val candidates = mutableListOf<String>()
+        candidates.add(version)
+        for (p in (patch - 1) downTo 0) candidates.add("$major.$minor.$p")
+        for (m in (minor - 1) downTo 0) candidates.add("$major.$m.0")
+
+        var downloaded: File? = null
+        for (candidate in candidates) {
+            val candidateMsiName = "wine-mono-$candidate-x86.msi"
+            val candidateMsiFile = File(monoDir, candidateMsiName)
+            if (candidateMsiFile.exists() && candidateMsiFile.length() > 0) {
+                Log.i(TAG, "Mono MSI v$candidate already on disk (substitute for v$version): ${candidateMsiFile.length()} B")
+                chmodIfExists(candidateMsiFile)
+                downloaded = candidateMsiFile
+                break
             }
-
-            connection.inputStream.use { input ->
-                FileOutputStream(tmpFile).use { output ->
-                    input.copyTo(output, bufferSize = 65536)
+            val downloadUrl = "https://dl.winehq.org/wine/wine-mono/$candidate/$candidateMsiName"
+            Log.i(TAG, "Trying Mono $candidate from $downloadUrl")
+            try {
+                val tmpFile = File(monoDir, "$candidateMsiName.tmp")
+                val url = URL(downloadUrl)
+                val connection = url.openConnection() as HttpURLConnection
+                connection.connectTimeout = 30_000
+                connection.readTimeout = 60_000
+                connection.instanceFollowRedirects = true
+                val code = connection.responseCode
+                if (code != 200) {
+                    Log.w(TAG, "Mono $candidate -> HTTP $code, trying next candidate")
+                    connection.disconnect()
+                    continue
+                }
+                connection.inputStream.use { input ->
+                    FileOutputStream(tmpFile).use { output ->
+                        input.copyTo(output, bufferSize = 65536)
+                    }
                 }
+                connection.disconnect()
+                if (tmpFile.renameTo(candidateMsiFile)) {
+                    chmodIfExists(candidateMsiFile)
+                    Log.i(TAG, "Mono $candidate downloaded (${candidateMsiFile.length()} B)")
+                    downloaded = candidateMsiFile
+                    break
+                } else {
+                    Log.e(TAG, "Rename failed for $candidateMsiName.tmp")
+                    tmpFile.delete()
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "Mono $candidate download error, trying next: ${e.message}")
             }
-            connection.disconnect()
+        }
+        if (downloaded != null) return downloaded
 
-            // Rename tmp to final
-            if (tmpFile.renameTo(msiFile)) {
-                chmodIfExists(msiFile)
-                Log.i(TAG, "Mono $version downloaded successfully (${msiFile.length()} bytes)")
-                msiFile
-            } else {
-                Log.e(TAG, "Failed to rename tmp file to $msiName")
-                tmpFile.delete()
-                null
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to download Mono $version", e)
-            null
+        val anyExistingMsi = monoDir.listFiles()?.firstOrNull {
+            it.name.matches(monoMsiPattern) && it.length() > 0
+        }
+        if (anyExistingMsi != null) {
+            Log.w(TAG, "Mono $version not downloadable; falling back to existing ${anyExistingMsi.name}")
+            chmodIfExists(anyExistingMsi)
+            return anyExistingMsi
         }
+        Log.e(TAG, "Mono $version download failed and no fallback MSI exists; game launch will lack .NET runtime")
+        return null
     }
 
-    /**
-     * Returns the Wine Z:\ path to the Mono MSI for use in msiexec commands.
-     * Ensures the correct version is downloaded first.
-     */
+    // Return the Wine Z:\ path to the Mono MSI, downloading it if needed.
     @JvmStatic
     @JvmOverloads
     fun getMonoMsiWinePath(
@@ -681,12 +536,60 @@ object SteamClientManager {
         return "Z:\\opt\\mono-gecko-offline\\${msiFile.name}"
     }
 
-    /**
-     * Get encrypted app ticket as base64, blocking wrapper for Java callers.
-     * Returns null if not logged in or ticket unavailable.
-     */
+    const val GECKO_VERSION = "2.47.4"
+
+    // Return the Wine Z:\ paths to the Gecko MSIs (x86 + x86_64), downloading them if needed.
+    @JvmStatic
+    fun getGeckoMsiWinePaths(context: Context): List<String> {
+        val geckoDir = File(ImageFs.find(context).rootDir, "opt/mono-gecko-offline")
+        geckoDir.mkdirs()
+        val out = mutableListOf<String>()
+        for (name in listOf("wine_gecko-$GECKO_VERSION-x86.msi", "wine_gecko-$GECKO_VERSION-x86_64.msi")) {
+            val msiFile = File(geckoDir, name)
+            if (!msiFile.exists() || msiFile.length() == 0L) {
+                val downloadUrl = "https://dl.winehq.org/wine/wine-gecko/$GECKO_VERSION/$name"
+                Log.i(TAG, "Downloading Gecko from $downloadUrl")
+                try {
+                    val tmpFile = File(geckoDir, "$name.tmp")
+                    val connection = URL(downloadUrl).openConnection() as HttpURLConnection
+                    connection.connectTimeout = 30_000
+                    connection.readTimeout = 60_000
+                    connection.instanceFollowRedirects = true
+                    val code = connection.responseCode
+                    if (code != 200) {
+                        Log.w(TAG, "Gecko $name -> HTTP $code")
+                        connection.disconnect()
+                        continue
+                    }
+                    connection.inputStream.use { input ->
+                        FileOutputStream(tmpFile).use { output -> input.copyTo(output, bufferSize = 65536) }
+                    }
+                    connection.disconnect()
+                    if (!tmpFile.renameTo(msiFile)) {
+                        Log.e(TAG, "Rename failed for $name.tmp")
+                        tmpFile.delete()
+                        continue
+                    }
+                    Log.i(TAG, "Gecko $name downloaded (${msiFile.length()} B)")
+                } catch (e: Exception) {
+                    Log.w(TAG, "Gecko $name download error: ${e.message}")
+                    continue
+                }
+            }
+            chmodIfExists(msiFile)
+            out.add("Z:\\opt\\mono-gecko-offline\\$name")
+        }
+        return out
+    }
+
+    // Blocking Java wrapper for encrypted app tickets.
     @JvmStatic
     fun getEncryptedAppTicketBase64Blocking(appId: Int): String? {
+        // CM round-trips can take tens of seconds; never block the main thread.
+        if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+            Log.e(TAG, "getEncryptedAppTicketBase64Blocking called on the main thread — refusing")
+            return null
+        }
         return try {
             val service = com.winlator.cmod.feature.stores.steam.service.SteamService.instance ?: return null
             kotlinx.coroutines.runBlocking {
@@ -698,9 +601,6 @@ object SteamClientManager {
         }
     }
 
-    /**
-     * Check if user is currently logged into Steam.
-     */
     @JvmStatic
     fun isSteamLoggedIn(): Boolean =
         try {
diff --git a/app/src/main/feature/stores/steam/SteamLoginActivity.kt b/app/src/main/feature/stores/steam/SteamLoginActivity.kt
index d1dc9176a..d278c5766 100644
--- a/app/src/main/feature/stores/steam/SteamLoginActivity.kt
+++ b/app/src/main/feature/stores/steam/SteamLoginActivity.kt
@@ -215,7 +215,7 @@ class SteamLoginActivity : FixedFontScaleComponentActivity() {
                         )
                         Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                             Text(stringResource(R.string.steam_login_sign_in_to_your_account), color = TextSecondary, fontSize = 11.sp)
-                            if (!state.isSteamConnected) {
+                            if (state.isLoggingIn) {
                                 CircularProgressIndicator(modifier = Modifier.size(10.dp), color = Accent, strokeWidth = 1.5.dp)
                             }
                         }
@@ -260,9 +260,10 @@ class SteamLoginActivity : FixedFontScaleComponentActivity() {
         val showLoginError = hasAttemptedLogin && !state.isLoggingIn && state.loginResult == LoginResult.Failed
         val spacing = if (compact) 10.dp else 14.dp
         val passwordFocus = remember { FocusRequester() }
+        // Credentials login connects on demand; no pre-login connection is needed.
         val canSubmit =
             state.username.isNotEmpty() && state.password.isNotEmpty() &&
-                !state.isLoggingIn && state.isSteamConnected
+                !state.isLoggingIn
 
         Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(spacing)) {
             OutlinedTextField(
diff --git a/app/src/main/feature/stores/steam/achievements/SteamAchievementsScreen.kt b/app/src/main/feature/stores/steam/achievements/SteamAchievementsScreen.kt
new file mode 100644
index 000000000..bb177925e
--- /dev/null
+++ b/app/src/main/feature/stores/steam/achievements/SteamAchievementsScreen.kt
@@ -0,0 +1,317 @@
+package com.winlator.cmod.feature.stores.steam.achievements
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.EmojiEvents
+import androidx.compose.material.icons.outlined.Lock
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.winlator.cmod.R
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.statsgen.Achievement
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.text.DateFormat
+import java.util.Date
+
+private val BgDark = Color(0xFF12121B)
+private val SurfaceDark = Color(0xFF171722)
+private val CardBorder = Color(0xFF2A2A3A)
+private val Accent = Color(0xFF1A9FFF)
+private val AccentGlow = Color(0xFF58A6FF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF93A6BC)
+private val StatusOnline = Color(0xFF3FB950)
+private val Scrim = Color(0xFF000000)
+
+private fun iconUrl(appId: Int, icon: String?): String? {
+    val raw = icon?.trim().orEmpty()
+    if (raw.isEmpty() || raw.contains("steam_default_icon")) return null
+    if (raw.startsWith("http")) return raw
+    return "https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/apps/$appId/$raw"
+}
+
+private fun Achievement.title(): String =
+    displayName?.get("english") ?: displayName?.values?.firstOrNull() ?: name
+
+private fun Achievement.desc(): String =
+    description?.get("english") ?: description?.values?.firstOrNull() ?: ""
+
+@Composable
+fun SteamAchievementsScreen(
+    appId: Int,
+    appName: String,
+    onClose: () -> Unit,
+) {
+    val context = LocalContext.current
+    var loading by remember { mutableStateOf(true) }
+    var achievements by remember { mutableStateOf<List<Achievement>>(emptyList()) }
+    val registry = remember { PaneNavRegistry() }
+
+    LaunchedEffect(appId) {
+        loading = true
+        achievements = withContext(Dispatchers.IO) {
+            val dir = File(context.cacheDir, "achievements_$appId").apply { mkdirs() }
+            SteamService.loadAchievements(appId, dir.absolutePath)
+        }
+        loading = false
+    }
+
+    val unlockedCount = achievements.count { it.unlocked == true }
+    val total = achievements.size
+    val ordered = achievements.sortedWith(
+        compareByDescending<Achievement> { it.unlocked == true }
+            .thenByDescending { it.unlockTimestamp ?: 0 },
+    )
+
+    CompositionLocalProvider(LocalPaneNav provides registry) {
+    DialogPaneNav(registry, onDismiss = onClose)
+    BoxWithConstraints(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(Scrim.copy(alpha = 0.6f))
+                .windowInsetsPadding(WindowInsets.navigationBars),
+        contentAlignment = Alignment.Center,
+    ) {
+        val dialogWidth = (maxWidth - 32.dp).coerceAtMost(560.dp)
+        val dialogHeight = (maxHeight - 48.dp).coerceIn(360.dp, 640.dp)
+        Surface(
+            modifier =
+                Modifier
+                    .widthIn(min = 320.dp, max = dialogWidth)
+                    .fillMaxWidth()
+                    .height(dialogHeight),
+            shape = RoundedCornerShape(14.dp),
+            color = BgDark,
+            border = BorderStroke(1.dp, CardBorder),
+            tonalElevation = 8.dp,
+        ) {
+            Column(Modifier.fillMaxSize()) {
+                AchievementsHeader(appName = appName, unlocked = unlockedCount, total = total, onClose = onClose)
+                HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                if (total > 0) {
+                    LinearProgressIndicator(
+                        progress = { unlockedCount.toFloat() / total },
+                        color = StatusOnline,
+                        trackColor = SurfaceDark,
+                        modifier = Modifier.fillMaxWidth().height(4.dp),
+                    )
+                }
+                Box(Modifier.fillMaxWidth().weight(1f)) {
+                    when {
+                        loading -> CircularProgressIndicator(
+                            color = Accent,
+                            modifier = Modifier.size(30.dp).align(Alignment.Center),
+                        )
+                        achievements.isEmpty() -> Text(
+                            stringResource(R.string.steam_achievements_empty),
+                            color = TextSecondary,
+                            style = MaterialTheme.typography.bodyMedium,
+                            modifier = Modifier.align(Alignment.Center).padding(24.dp),
+                        )
+                        else -> Column(
+                            Modifier
+                                .fillMaxSize()
+                                .verticalScroll(rememberScrollState())
+                                .padding(horizontal = 12.dp, vertical = 12.dp),
+                            verticalArrangement = Arrangement.spacedBy(8.dp),
+                        ) {
+                            ordered.forEach { ach -> AchievementRow(appId, ach) }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun AchievementsHeader(
+    appName: String,
+    unlocked: Int,
+    total: Int,
+    onClose: () -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = 10.dp, bottom = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        Box(
+            Modifier
+                .size(34.dp)
+                .clip(RoundedCornerShape(9.dp))
+                .background(Accent.copy(alpha = 0.16f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                Icons.Outlined.EmojiEvents,
+                contentDescription = null,
+                tint = AccentGlow,
+                modifier = Modifier.size(19.dp),
+            )
+        }
+        Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(1.dp)) {
+            Text(
+                stringResource(R.string.steam_achievements_title).uppercase(),
+                color = TextSecondary,
+                fontSize = 9.sp,
+                fontWeight = FontWeight.Bold,
+                letterSpacing = 0.9.sp,
+            )
+            Text(
+                appName,
+                style = MaterialTheme.typography.titleSmall,
+                color = TextPrimary,
+                fontWeight = FontWeight.Bold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        if (total > 0) {
+            Surface(color = Accent.copy(alpha = 0.14f), shape = RoundedCornerShape(7.dp)) {
+                Text(
+                    "$unlocked / $total",
+                    color = AccentGlow,
+                    fontSize = 11.sp,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(horizontal = 9.dp, vertical = 3.dp),
+                )
+            }
+        }
+        IconButton(onClick = onClose, modifier = Modifier.size(36.dp).paneNavItem(onActivate = onClose)) {
+            Icon(
+                Icons.Outlined.Close,
+                contentDescription = stringResource(R.string.steam_common_back),
+                tint = TextSecondary,
+                modifier = Modifier.size(20.dp),
+            )
+        }
+    }
+}
+
+@Composable
+private fun AchievementRow(appId: Int, ach: Achievement) {
+    val unlocked = ach.unlocked == true
+    val hiddenLocked = ach.hidden == 1 && !unlocked
+    val url = iconUrl(appId, if (unlocked) ach.icon ?: ach.iconGray else ach.iconGray ?: ach.icon)
+    Surface(
+        shape = RoundedCornerShape(12.dp),
+        color = if (unlocked) Accent.copy(alpha = 0.06f) else SurfaceDark.copy(alpha = 0.5f),
+        border = androidx.compose.foundation.BorderStroke(1.dp, if (unlocked) Accent.copy(alpha = 0.25f) else CardBorder),
+        modifier = Modifier.fillMaxWidth().paneNavItem(cornerRadius = 12.dp, onActivate = {}),
+    ) {
+        Row(
+            Modifier.padding(10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Box(
+                Modifier.size(52.dp).clip(RoundedCornerShape(8.dp)).background(BgDark),
+                contentAlignment = Alignment.Center,
+            ) {
+                if (url != null) {
+                    AsyncImage(
+                        model = url,
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier.size(52.dp).clip(RoundedCornerShape(8.dp)),
+                        alpha = if (unlocked) 1f else 0.55f,
+                    )
+                } else {
+                    Icon(
+                        Icons.Outlined.Lock,
+                        contentDescription = null,
+                        tint = TextSecondary,
+                        modifier = Modifier.size(24.dp),
+                    )
+                }
+            }
+            Spacer(Modifier.width(12.dp))
+            Column(Modifier.weight(1f)) {
+                Text(
+                    if (hiddenLocked) stringResource(R.string.steam_achievements_hidden) else ach.title(),
+                    color = if (unlocked) TextPrimary else TextSecondary,
+                    fontWeight = FontWeight.SemiBold,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                val sub = if (hiddenLocked) stringResource(R.string.steam_achievements_hidden_desc) else ach.desc()
+                if (sub.isNotBlank()) {
+                    Text(
+                        sub,
+                        color = TextSecondary,
+                        style = MaterialTheme.typography.labelMedium,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                if (unlocked) {
+                    val ts = ach.unlockTimestamp ?: 0
+                    val when_ = if (ts > 0) {
+                        stringResource(R.string.steam_achievements_unlocked_on, DateFormat.getDateInstance(DateFormat.MEDIUM).format(Date(ts.toLong() * 1000L)))
+                    } else stringResource(R.string.steam_achievements_unlocked)
+                    Text(
+                        when_,
+                        color = StatusOnline,
+                        style = MaterialTheme.typography.labelSmall,
+                        modifier = Modifier.padding(top = 2.dp),
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/chat/ChatImagePickerActivity.kt b/app/src/main/feature/stores/steam/chat/ChatImagePickerActivity.kt
new file mode 100644
index 000000000..f40e43369
--- /dev/null
+++ b/app/src/main/feature/stores/steam/chat/ChatImagePickerActivity.kt
@@ -0,0 +1,48 @@
+package com.winlator.cmod.feature.stores.steam.chat
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+
+class ChatImagePickerActivity : ComponentActivity() {
+    private val pick =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+            val friendId = intent.getLongExtra(EXTRA_FRIEND_ID, 0L)
+            if (uri != null && friendId != 0L) {
+                val cr = contentResolver
+                val mime = cr.getType(uri) ?: "image/png"
+                val ext = when {
+                    mime.contains("jpeg") || mime.contains("jpg") -> "jpeg"
+                    mime.contains("gif") -> "gif"
+                    mime.contains("webp") -> "webp"
+                    else -> "png"
+                }
+                Thread {
+                    runCatching {
+                        val bytes = cr.openInputStream(uri)?.use { it.readBytes() }
+                        if (bytes != null && bytes.isNotEmpty()) {
+                            SteamService.instance?.sendChatImageAsync(friendId, bytes, "image.$ext")
+                        }
+                    }
+                }.start()
+            }
+            finish()
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState != null) {
+            finish()
+            return
+        }
+        runCatching {
+            pick.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        }.onFailure { finish() }
+    }
+
+    companion object {
+        const val EXTRA_FRIEND_ID = "friendId"
+    }
+}
diff --git a/app/src/main/feature/stores/steam/chat/ChatOverlayService.kt b/app/src/main/feature/stores/steam/chat/ChatOverlayService.kt
new file mode 100644
index 000000000..194b49447
--- /dev/null
+++ b/app/src/main/feature/stores/steam/chat/ChatOverlayService.kt
@@ -0,0 +1,1013 @@
+package com.winlator.cmod.feature.stores.steam.chat
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.res.Configuration
+import android.graphics.PixelFormat
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.provider.Settings
+import android.view.Gravity
+import android.view.HapticFeedbackConstants
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
+import android.widget.FrameLayout
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.scaleIn
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.Chat
+import androidx.compose.material.icons.automirrored.outlined.Send
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.Image
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.platform.ComposeView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
+import androidx.savedstate.SavedStateRegistry
+import androidx.savedstate.SavedStateRegistryController
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import coil.compose.AsyncImage
+import coil.request.ImageRequest
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.stores.steam.data.SteamChatMessage
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import kotlin.math.hypot
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.inputmethod.InputMethodManager
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_ACTIVATE
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_DOWN
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_LEFT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_RIGHT
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_SECONDARY
+import com.winlator.cmod.shared.ui.nav.PANE_DIR_UP
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val IMG_BBCODE = Regex("\\[img\\](.*?)\\[/img\\]", RegexOption.IGNORE_CASE)
+private val IMG_SRC = Regex("\\[img\\s+src=[\"']?(.*?)[\"']?\\s*\\]", RegexOption.IGNORE_CASE)
+private val STEAM_IMG_URL = Regex("https://images\\.steamusercontent\\.com/ugc/\\S+")
+private val BARE_IMG_URL = Regex("https?://\\S+\\.(?:png|jpe?g|gif|webp)", RegexOption.IGNORE_CASE)
+
+private fun overlayImageUrlOf(text: String): String? {
+    val t = text.trim()
+    return IMG_BBCODE.find(t)?.groupValues?.getOrNull(1)
+        ?: IMG_SRC.find(t)?.groupValues?.getOrNull(1)
+        ?: STEAM_IMG_URL.find(t)?.value
+        ?: BARE_IMG_URL.find(t)?.value
+}
+
+@Composable
+private fun overlayImage(data: Any?): ImageRequest {
+    val ctx = LocalContext.current
+    return remember(data) { ImageRequest.Builder(ctx).data(data).allowHardware(false).build() }
+}
+
+private val WsBg = Color(0xFF12121B)
+private val BgDark = Color(0xFF171722)
+private val SurfaceDark = Color(0xFF1B1B27)
+private val CardBorder = Color(0xFF2A2A3A)
+private val Accent = Color(0xFF1A9FFF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF93A6BC)
+private val Danger = Color(0xFFFF5A5A)
+
+/** Floating chat heads rendered as a system overlay so they work over games. */
+class ChatOverlayService : Service() {
+    private lateinit var windowManager: WindowManager
+    private val lifecycleOwner = OverlayLifecycleOwner()
+
+    private var bubbleView: View? = null
+    private var panelView: View? = null
+    private var targetView: ComposeView? = null
+
+    private val bubbleParams by lazy { buildBubbleParams() }
+    private val panelParams by lazy { buildPanelParams() }
+    private val targetParams by lazy { buildTargetParams() }
+
+    private val headFriendId = mutableLongStateOf(0L)
+    private val expanded = mutableStateOf(false)
+    private val conversationId = mutableLongStateOf(0L)
+    private val dragging = mutableStateOf(false)
+    private val bubbleDimmed = mutableStateOf(false)
+
+    private val panelNav = PaneNavRegistry()
+    private var panelStickEngaged = 0
+
+    private val bubbleX = mutableIntStateOf(0)
+    private val bubbleY = mutableIntStateOf(0)
+
+    private val uiScope = CoroutineScope(Dispatchers.Main.immediate + SupervisorJob())
+    private var idleLoopJob: Job? = null
+    @Volatile private var lastInteractionMs = 0L
+    private val touchHandler = Handler(Looper.getMainLooper())
+
+    private val density by lazy { resources.displayMetrics.density }
+    // Collapsed chat-head footprint; the bubble window is pinned to this exact size.
+    private val bubbleSizePx by lazy { (56 * density).toInt() }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onCreate() {
+        super.onCreate()
+        windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+        lifecycleOwner.create()
+        showBubble()
+        startIdleLoop()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (!Settings.canDrawOverlays(this)) {
+            stopSelf()
+            return START_NOT_STICKY
+        }
+        val fid = intent?.getLongExtra(EXTRA_FRIEND_ID, 0L) ?: 0L
+        if (fid != 0L) {
+            headFriendId.longValue = fid
+            if (!expanded.value) showBubble()
+        }
+        pokeAutoHide()
+        startIdleLoop()
+        return START_NOT_STICKY
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        touchHandler.postDelayed({
+            if (expanded.value) collapse()
+            snapToEdge()
+            applyBubblePosition()
+        }, 150L)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        idleLoopJob?.cancel()
+        uiScope.cancel()
+        touchHandler.removeCallbacksAndMessages(null)
+        removeView(panelView); panelView = null
+        removeView(targetView); targetView = null
+        removeView(bubbleView); bubbleView = null
+        lifecycleOwner.destroy()
+    }
+
+    private fun pokeAutoHide() {
+        lastInteractionMs = System.currentTimeMillis()
+        if (bubbleDimmed.value) bubbleDimmed.value = false
+    }
+
+    private fun startIdleLoop() {
+        if (idleLoopJob?.isActive == true) return
+        idleLoopJob = uiScope.launch {
+            while (true) {
+                delay(1000L)
+                val dim = PrefManager.chatHeadsAutoHide &&
+                    bubbleView?.parent != null &&
+                    System.currentTimeMillis() - lastInteractionMs >= 5000L
+                if (bubbleDimmed.value != dim) bubbleDimmed.value = dim
+            }
+        }
+    }
+
+    private fun openConversation(friendId: Long) {
+        conversationId.longValue = friendId
+        if (friendId != 0L) headFriendId.longValue = friendId
+    }
+
+    private fun prepare(view: View) {
+        view.setViewTreeLifecycleOwner(lifecycleOwner)
+        view.setViewTreeViewModelStoreOwner(lifecycleOwner)
+        view.setViewTreeSavedStateRegistryOwner(lifecycleOwner)
+    }
+
+    private fun removeView(view: View?) {
+        if (view?.parent != null) runCatching { windowManager.removeView(view) }
+    }
+
+    private fun showBubble() {
+        if (bubbleView?.parent != null) return
+        if (bubbleX.intValue == 0 && bubbleY.intValue == 0) {
+            val m = resources.displayMetrics
+            bubbleX.intValue = m.widthPixels - bubbleSizePx - (12 * density).toInt()
+            bubbleY.intValue = (140 * density).toInt()
+        }
+        bubbleParams.x = bubbleX.intValue
+        bubbleParams.y = bubbleY.intValue
+        val composeView = ComposeView(this).apply {
+            setContent {
+                WinNativeTheme {
+                    val svc = remember { SteamService.instance }
+                    val friends by svc?.friendsList?.collectAsState() ?: remember { mutableStateOf(emptyList<SteamFriendEntry>()) }
+                    val unread by svc?.unreadCounts?.collectAsState() ?: remember { mutableStateOf(emptyMap<Long, Int>()) }
+                    val head = friends.firstOrNull { it.steamId == headFriendId.longValue }
+                    val alpha by animateFloatAsState(if (bubbleDimmed.value) 0.2f else 1f, label = "bubbleAlpha")
+                    Box(Modifier.alpha(alpha)) {
+                        BubbleContent(head, unread.values.sum())
+                    }
+                }
+            }
+        }
+        val container = object : FrameLayout(this) {
+            override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean = true
+        }
+        container.addView(composeView)
+        prepare(container)
+        attachBubbleTouch(container)
+        bubbleView = container
+        runCatching { windowManager.addView(container, bubbleParams) }
+        pokeAutoHide()
+    }
+
+    private fun applyBubblePosition() {
+        bubbleParams.x = bubbleX.intValue
+        bubbleParams.y = bubbleY.intValue
+        bubbleView?.let { runCatching { windowManager.updateViewLayout(it, bubbleParams) } }
+    }
+
+    private fun hideBubble() {
+        touchHandler.removeCallbacksAndMessages(null)
+        removeView(bubbleView)
+        bubbleView = null
+    }
+
+    private fun showPanel() {
+        if (panelView?.parent != null) return
+        val compose = ComposeView(this).apply {
+            setContent {
+                WinNativeTheme {
+                    PanelContent()
+                }
+            }
+        }
+        val container = object : FrameLayout(this) {
+            override fun dispatchKeyEvent(event: KeyEvent): Boolean =
+                if (handlePanelKey(event)) true else super.dispatchKeyEvent(event)
+
+            override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean =
+                if (handlePanelMotion(event)) true else super.dispatchGenericMotionEvent(event)
+        }
+        container.addView(compose)
+        prepare(container)
+        panelView = container
+        runCatching { windowManager.addView(container, panelParams) }
+    }
+
+    private fun handlePanelKey(event: KeyEvent): Boolean {
+        if (!expanded.value) return false
+        val owned = when (event.keyCode) {
+            KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT,
+            KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK,
+            KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_Y,
+            -> true
+            else -> false
+        }
+        if (!owned) return false
+        if (event.action != KeyEvent.ACTION_DOWN) return true
+        when (event.keyCode) {
+            KeyEvent.KEYCODE_DPAD_LEFT -> panelNav.navDir(PANE_DIR_LEFT)
+            KeyEvent.KEYCODE_DPAD_RIGHT -> panelNav.navDir(PANE_DIR_RIGHT)
+            KeyEvent.KEYCODE_DPAD_UP -> panelNav.navDir(PANE_DIR_UP)
+            KeyEvent.KEYCODE_DPAD_DOWN -> panelNav.navDir(PANE_DIR_DOWN)
+            KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_BUTTON_A -> panelNav.navDir(PANE_DIR_ACTIVATE)
+            KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_Y -> panelNav.navDir(PANE_DIR_SECONDARY)
+            KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK -> if (!hidePanelImeIfVisible()) collapse()
+        }
+        return true
+    }
+
+    private fun handlePanelMotion(event: MotionEvent): Boolean {
+        if (!expanded.value) return false
+        if ((event.source and InputDevice.SOURCE_JOYSTICK) != InputDevice.SOURCE_JOYSTICK ||
+            event.action != MotionEvent.ACTION_MOVE
+        ) {
+            return false
+        }
+        val sx = event.getAxisValue(MotionEvent.AXIS_X)
+        val sy = event.getAxisValue(MotionEvent.AXIS_Y)
+        val hx = event.getAxisValue(MotionEvent.AXIS_HAT_X)
+        val hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y)
+        val dir = when {
+            sx < -0.5f || hx < -0.5f -> PANE_DIR_LEFT
+            sx > 0.5f || hx > 0.5f -> PANE_DIR_RIGHT
+            sy < -0.5f || hy < -0.5f -> PANE_DIR_UP
+            sy > 0.5f || hy > 0.5f -> PANE_DIR_DOWN
+            else -> 0
+        }
+        if (dir != 0) {
+            if (panelStickEngaged == 0) {
+                panelStickEngaged = dir
+                panelNav.navDir(dir)
+            }
+            return true
+        }
+        if (kotlin.math.abs(sx) < 0.35f && kotlin.math.abs(sy) < 0.35f &&
+            kotlin.math.abs(hx) < 0.35f && kotlin.math.abs(hy) < 0.35f
+        ) {
+            panelStickEngaged = 0
+        }
+        return true
+    }
+
+    private fun hidePanelImeIfVisible(): Boolean {
+        val view = panelView ?: return false
+        val insets = androidx.core.view.ViewCompat.getRootWindowInsets(view) ?: return false
+        if (!insets.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime())) return false
+        getSystemService(InputMethodManager::class.java)?.hideSoftInputFromWindow(view.windowToken, 0)
+        return true
+    }
+
+    private fun hidePanel() {
+        removeView(panelView)
+        panelView = null
+    }
+
+    private fun showTarget() {
+        if (targetView?.parent != null) return
+        val view = ComposeView(this).apply {
+            setContent { WinNativeTheme { DismissTarget(dragging.value) } }
+        }
+        prepare(view)
+        targetView = view
+        runCatching { windowManager.addView(view, targetParams) }
+    }
+
+    private fun hideTarget() {
+        removeView(targetView)
+        targetView = null
+    }
+
+    private fun expand() {
+        if (expanded.value) return
+        conversationId.longValue = headFriendId.longValue
+        expanded.value = true
+        showPanel()
+        hideBubble()
+    }
+
+    private fun collapse() {
+        if (!expanded.value) return
+        if (conversationId.longValue == 0L) headFriendId.longValue = 0L
+        expanded.value = false
+        hidePanel()
+        showBubble()
+    }
+
+    private fun attachBubbleTouch(view: View) {
+        var startX = 0
+        var startY = 0
+        var downRawX = 0f
+        var downRawY = 0f
+        var dragAllowed = false
+        var gestureDone = false
+        val tapSlop = 14 * density
+        val longPress = Runnable {
+            if (bubbleView?.parent == null || gestureDone) return@Runnable
+            dragAllowed = true
+            dragging.value = true
+            showTarget()
+            runCatching { view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) }
+        }
+        view.setOnTouchListener { _, event ->
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    startX = bubbleX.intValue
+                    startY = bubbleY.intValue
+                    downRawX = event.rawX
+                    downRawY = event.rawY
+                    dragAllowed = false
+                    gestureDone = false
+                    pokeAutoHide()
+                    touchHandler.postDelayed(longPress, 400L)
+                    true
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    if (dragAllowed) {
+                        bubbleX.intValue = startX + (event.rawX - downRawX).toInt()
+                        bubbleY.intValue = startY + (event.rawY - downRawY).toInt()
+                        applyBubblePosition()
+                    }
+                    true
+                }
+                MotionEvent.ACTION_UP -> {
+                    gestureDone = true
+                    touchHandler.removeCallbacks(longPress)
+                    if (dragAllowed) {
+                        dragging.value = false
+                        hideTarget()
+                        if (overDismissTarget()) stopSelf() else { snapToEdge(); applyBubblePosition() }
+                    } else if (hypot(event.rawX - downRawX, event.rawY - downRawY) <= tapSlop) {
+                        view.performClick()
+                        expand()
+                    }
+                    true
+                }
+                MotionEvent.ACTION_CANCEL -> {
+                    gestureDone = true
+                    touchHandler.removeCallbacks(longPress)
+                    if (dragAllowed) {
+                        dragging.value = false
+                        hideTarget()
+                        snapToEdge()
+                        applyBubblePosition()
+                    }
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+
+    private fun overDismissTarget(): Boolean {
+        val m = resources.displayMetrics
+        val bubbleCx = bubbleX.intValue + bubbleSizePx / 2f
+        val bubbleCy = bubbleY.intValue + bubbleSizePx / 2f
+        val targetCx = m.widthPixels / 2f
+        val targetCy = m.heightPixels - (96 * density)
+        return hypot(bubbleCx - targetCx, bubbleCy - targetCy) < (80 * density)
+    }
+
+    private fun snapToEdge() {
+        val m = resources.displayMetrics
+        val w = m.widthPixels
+        val h = m.heightPixels
+        val maxX = w - bubbleSizePx
+        val maxY = h - bubbleSizePx
+        val x = bubbleX.intValue.coerceIn(0, maxX)
+        val y = bubbleY.intValue.coerceIn(0, maxY)
+        val cx = x + bubbleSizePx / 2
+        val cy = y + bubbleSizePx / 2
+        when (minOf(cx, w - cx, cy, h - cy)) {
+            cx -> { bubbleX.intValue = 0; bubbleY.intValue = y }
+            w - cx -> { bubbleX.intValue = maxX; bubbleY.intValue = y }
+            cy -> { bubbleX.intValue = x; bubbleY.intValue = 0 }
+            else -> { bubbleX.intValue = x; bubbleY.intValue = maxY }
+        }
+    }
+
+    @Composable
+    private fun BubbleContent(head: SteamFriendEntry?, unread: Int) {
+        Box(contentAlignment = Alignment.TopEnd) {
+            Surface(
+                shape = CircleShape,
+                color = SurfaceDark,
+                border = androidx.compose.foundation.BorderStroke(2.dp, Accent.copy(alpha = 0.6f)),
+                shadowElevation = 8.dp,
+                modifier = Modifier.size(56.dp),
+            ) {
+                Box(contentAlignment = Alignment.Center) {
+                    val url = head?.avatarUrl
+                    if (url != null) {
+                        AsyncImage(
+                            model = overlayImage(url),
+                            contentDescription = null,
+                            contentScale = ContentScale.Crop,
+                            modifier = Modifier.size(56.dp).clip(CircleShape),
+                        )
+                    } else {
+                        Icon(Icons.AutoMirrored.Outlined.Chat, contentDescription = null, tint = Accent, modifier = Modifier.size(26.dp))
+                    }
+                }
+            }
+            if (unread > 0) {
+                Box(
+                    Modifier.size(20.dp).clip(CircleShape).background(Danger),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Text(
+                        if (unread > 9) "9+" else unread.toString(),
+                        color = Color.White,
+                        fontWeight = FontWeight.Bold,
+                        style = MaterialTheme.typography.labelSmall,
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun DismissTarget(active: Boolean) {
+        Box(
+            Modifier.size(64.dp).clip(CircleShape).background(if (active) Danger else Color(0xCC000000)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(Icons.Outlined.Close, contentDescription = null, tint = Color.White, modifier = Modifier.size(30.dp))
+        }
+    }
+
+    @Composable
+    private fun PanelContent() {
+        val svc = remember { SteamService.instance }
+        val friends by svc?.friendsList?.collectAsState() ?: remember { mutableStateOf(emptyList<SteamFriendEntry>()) }
+        val unread by svc?.unreadCounts?.collectAsState() ?: remember { mutableStateOf(emptyMap<Long, Int>()) }
+        val recent by svc?.recentChats?.collectAsState() ?: remember { mutableStateOf(emptyMap<Long, Long>()) }
+        val convId = conversationId.longValue
+        val current = friends.firstOrNull { it.steamId == convId }
+        val head = if (convId != 0L) current else null
+
+        val ordered = remember(friends, unread, recent) {
+            friends.sortedWith(
+                compareByDescending<SteamFriendEntry> { (unread[it.steamId] ?: 0) > 0 }
+                    .thenByDescending { recent[it.steamId] ?: 0L }
+                    .thenByDescending { it.isPlayingGame }
+                    .thenByDescending { it.isOnline }
+                    .thenBy { it.name.lowercase() },
+            )
+        }
+
+        var visible by remember { mutableStateOf(false) }
+        LaunchedEffect(Unit) { visible = true }
+
+        val screenW = resources.displayMetrics.widthPixels
+        val screenH = resources.displayMetrics.heightPixels
+        val marginPx = (8 * density).toInt()
+        val rightSide = bubbleX.intValue + bubbleSizePx / 2 >= screenW / 2
+        val panelWpx = (screenW * 0.4f).toInt().coerceIn((280 * density).toInt(), screenW - 2 * marginPx)
+        val panelHpx = (screenH * 0.82f).toInt().coerceAtLeast((320 * density).toInt())
+        val gapPx = (10 * density).toInt()
+        val panelXpx = if (rightSide) {
+            (bubbleX.intValue - panelWpx - gapPx).coerceAtLeast(marginPx)
+        } else {
+            (bubbleX.intValue + bubbleSizePx + gapPx).coerceAtMost((screenW - panelWpx - marginPx).coerceAtLeast(marginPx))
+        }
+        val panelYpx = bubbleY.intValue.coerceIn(marginPx, (screenH - panelHpx - marginPx).coerceAtLeast(marginPx))
+        val originY = if (panelHpx > 0) ((bubbleY.intValue - panelYpx).toFloat() / panelHpx).coerceIn(0f, 1f) else 0f
+        val origin = TransformOrigin(if (rightSide) 1f else 0f, originY)
+
+        LaunchedEffect(convId) { panelNav.reset() }
+        CompositionLocalProvider(LocalPaneNav provides panelNav) {
+        Box(Modifier.fillMaxSize()) {
+            Box(
+                Modifier.fillMaxSize().clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                ) { collapse() },
+            )
+            AnimatedVisibility(
+                visible = visible,
+                enter = scaleIn(transformOrigin = origin) + fadeIn(),
+                modifier = Modifier.offset { IntOffset(panelXpx, panelYpx) },
+            ) {
+                Surface(
+                    color = WsBg,
+                    shape = RoundedCornerShape(18.dp),
+                    border = androidx.compose.foundation.BorderStroke(1.dp, CardBorder),
+                    shadowElevation = 12.dp,
+                    modifier = Modifier.width((panelWpx / density).dp).height((panelHpx / density).dp),
+                ) {
+                    Column(Modifier.fillMaxSize().imePadding()) {
+                        Box(
+                            Modifier.fillMaxWidth().background(SurfaceDark).padding(horizontal = 4.dp, vertical = 8.dp),
+                        ) {
+                            val title = current?.let { it.name.ifBlank { it.steamId.toString() } }
+                                ?: stringResource(R.string.steam_chat_heads_friends_title)
+                            Text(
+                                title,
+                                color = TextPrimary,
+                                fontWeight = FontWeight.Bold,
+                                style = MaterialTheme.typography.titleSmall,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                textAlign = TextAlign.Center,
+                                modifier = Modifier.align(Alignment.Center).fillMaxWidth().padding(horizontal = 96.dp),
+                            )
+                            if (convId != 0L) {
+                                IconButton(
+                                    onClick = { conversationId.longValue = 0L },
+                                    modifier = Modifier.align(Alignment.CenterStart).paneNavItem(
+                                        onActivate = { conversationId.longValue = 0L },
+                                        tapToSelect = true,
+                                        navRow = 0,
+                                        navCol = 0,
+                                    ),
+                                ) {
+                                    Icon(Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = stringResource(R.string.steam_common_back), tint = TextPrimary)
+                                }
+                            }
+                            IconButton(
+                                onClick = { collapse() },
+                                modifier = Modifier.align(Alignment.CenterEnd).paneNavItem(
+                                    onActivate = { collapse() },
+                                    tapToSelect = true,
+                                    navRow = 0,
+                                    navCol = if (convId != 0L) 1 else 0,
+                                ),
+                            ) {
+                                Icon(Icons.Outlined.Close, contentDescription = stringResource(R.string.steam_common_back), tint = TextSecondary)
+                            }
+                        }
+                        Crossfade(targetState = convId, label = "panelBody", modifier = Modifier.weight(1f)) { id ->
+                            val conv = friends.firstOrNull { it.steamId == id }
+                            if (id != 0L && conv != null) {
+                                ConversationView(conv, Modifier.fillMaxSize())
+                            } else {
+                                ConversationListView(ordered, unread, Modifier.fillMaxSize()) { picked ->
+                                    openConversation(picked)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            Box(
+                modifier = Modifier
+                    .offset { IntOffset(bubbleX.intValue, bubbleY.intValue) }
+                    .clickable { collapse() },
+            ) {
+                BubbleContent(head, unread.values.sum())
+            }
+        }
+        }
+    }
+
+    @Composable
+    private fun ConversationListView(
+        list: List<SteamFriendEntry>,
+        unread: Map<Long, Int>,
+        modifier: Modifier,
+        onPick: (Long) -> Unit,
+    ) {
+        val nav = LocalPaneNav.current
+        SideEffect { nav?.onEdgeUp = null; nav?.onEdgeDown = null }
+        if (list.isEmpty()) {
+            Box(modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+                Text(stringResource(R.string.steam_friends_none_loaded), color = TextSecondary, style = MaterialTheme.typography.bodyMedium)
+            }
+            return
+        }
+        Column(modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(vertical = 6.dp)) {
+            list.forEachIndexed { i, f ->
+                FriendRow(f, unread[f.steamId] ?: 0, navRow = i + 1, isEntry = i == 0) { onPick(f.steamId) }
+            }
+        }
+    }
+
+    @Composable
+    private fun FriendRow(f: SteamFriendEntry, unread: Int, navRow: Int, isEntry: Boolean, onClick: () -> Unit) {
+        Row(
+            Modifier.fillMaxWidth()
+                .paneNavItem(onActivate = onClick, tapToSelect = true, navRow = navRow, navCol = 0, isEntry = isEntry)
+                .clickable(onClick = onClick).padding(horizontal = 12.dp, vertical = 8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Box(Modifier.size(40.dp).clip(CircleShape).background(SurfaceDark), contentAlignment = Alignment.Center) {
+                if (f.avatarUrl != null) {
+                    AsyncImage(model = overlayImage(f.avatarUrl), contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.size(40.dp).clip(CircleShape))
+                }
+            }
+            Spacer(Modifier.width(10.dp))
+            Column(Modifier.weight(1f)) {
+                Text(
+                    f.name.ifBlank { f.steamId.toString() },
+                    color = if (f.isOnline) TextPrimary else TextSecondary,
+                    fontWeight = FontWeight.SemiBold,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Text(
+                    if (f.isPlayingGame) f.gameName.ifBlank { stringResource(R.string.steam_friends_in_game) }
+                    else if (f.isOnline) stringResource(R.string.stores_accounts_status_online)
+                    else stringResource(R.string.stores_accounts_status_offline),
+                    color = if (f.isPlayingGame) Accent else TextSecondary,
+                    style = MaterialTheme.typography.labelSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+            if (f.isPlayingGame && f.gameCapsuleUrl != null) {
+                Spacer(Modifier.width(8.dp))
+                AsyncImage(
+                    model = overlayImage(f.gameCapsuleUrl),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier.width(56.dp).height(21.dp).clip(RoundedCornerShape(3.dp)).background(BgDark),
+                )
+            }
+            if (unread > 0) {
+                Box(Modifier.size(20.dp).clip(CircleShape).background(Danger), contentAlignment = Alignment.Center) {
+                    Text(if (unread > 9) "9+" else unread.toString(), color = Color.White, fontWeight = FontWeight.Bold, style = MaterialTheme.typography.labelSmall)
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun ConversationView(friend: SteamFriendEntry, modifier: Modifier) {
+        val messages = remember(friend.steamId) { SnapshotStateList<SteamChatMessage>() }
+        var input by remember(friend.steamId) { mutableStateOf("") }
+        var sending by remember(friend.steamId) { mutableStateOf(false) }
+        val listState = rememberLazyListState()
+        val scope = androidx.compose.runtime.rememberCoroutineScope()
+        val fieldFocus = remember { FocusRequester() }
+        val nav = LocalPaneNav.current
+        SideEffect {
+            nav?.onEdgeUp = { scope.launch { runCatching { listState.animateScrollBy(-280f) } } }
+            nav?.onEdgeDown = { scope.launch { runCatching { listState.animateScrollBy(280f) } } }
+        }
+        val openImagePicker = {
+            headFriendId.longValue = friend.steamId
+            collapse()
+            runCatching {
+                startActivity(
+                    Intent(this@ChatOverlayService, ChatImagePickerActivity::class.java)
+                        .putExtra(ChatImagePickerActivity.EXTRA_FRIEND_ID, friend.steamId)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+                )
+            }
+            Unit
+        }
+
+        DisposableEffect(friend.steamId) {
+            SteamService.instance?.setActiveConversation(friend.steamId)
+            onDispose { SteamService.instance?.clearActiveConversation(friend.steamId) }
+        }
+        LaunchedEffect(friend.steamId) {
+            messages.clear()
+            messages.addAll(SteamService.instance?.loadChatHistory(friend.steamId) ?: emptyList())
+            if (messages.isNotEmpty()) listState.scrollToItem(messages.size - 1)
+            SteamService.instance?.incomingChat?.collect { (fid, m) ->
+                if (fid != friend.steamId) return@collect
+                val known = messages.map { it.timestamp to it.ordinal }.toHashSet()
+                if (m.timestamp != 0 && (m.timestamp to m.ordinal) in known) return@collect
+                val optIdx = if (m.fromSelf) messages.indexOfFirst { it.fromSelf && it.timestamp == 0 && it.text == m.text } else -1
+                if (optIdx >= 0) messages[optIdx] = m else {
+                    messages.add(m)
+                    listState.animateScrollToItem(messages.size - 1)
+                }
+            }
+        }
+
+        fun send() {
+            val text = input.trim()
+            if (text.isEmpty() || sending) return
+            sending = true
+            input = ""
+            val optimistic = SteamChatMessage(fromSelf = true, text = text, timestamp = 0, ordinal = 0)
+            messages.add(optimistic)
+            scope.launch {
+                listState.animateScrollToItem(messages.size - 1)
+                val ok = SteamService.instance?.sendChatMessage(friend.steamId, text) ?: false
+                if (!ok) {
+                    val idx = messages.indexOf(optimistic)
+                    if (idx >= 0) messages[idx] = optimistic.copy(text = "$text  " + getString(R.string.steam_chat_not_sent))
+                }
+                sending = false
+            }
+        }
+
+        Column(modifier.fillMaxWidth()) {
+            LazyColumn(
+                Modifier.weight(1f).fillMaxWidth().padding(horizontal = 10.dp),
+                state = listState,
+                verticalArrangement = Arrangement.spacedBy(6.dp),
+                contentPadding = PaddingValues(vertical = 8.dp),
+            ) {
+                items(messages.size) { i -> OverlayMessageBubble(messages[i]) }
+            }
+            Row(
+                Modifier.fillMaxWidth().background(SurfaceDark).padding(horizontal = 8.dp, vertical = 6.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                IconButton(
+                    onClick = openImagePicker,
+                    modifier = Modifier.paneNavItem(onActivate = openImagePicker, tapToSelect = true, navRow = 1, navCol = 0),
+                ) {
+                    Icon(Icons.Outlined.Image, contentDescription = stringResource(R.string.steam_chat_send_image), tint = Accent)
+                }
+                OutlinedTextField(
+                    value = input,
+                    onValueChange = { input = it },
+                    placeholder = { Text(stringResource(R.string.steam_chat_message_hint), color = TextSecondary) },
+                    singleLine = true,
+                    modifier = Modifier
+                        .weight(1f)
+                        .focusRequester(fieldFocus)
+                        .paneNavItem(onActivate = { runCatching { fieldFocus.requestFocus() } }, navRow = 1, navCol = 1, isEntry = true),
+                    keyboardOptions = KeyboardOptions(imeAction = androidx.compose.ui.text.input.ImeAction.Send),
+                    keyboardActions = KeyboardActions(onSend = { send() }),
+                    colors = TextFieldDefaults.colors(
+                        focusedContainerColor = BgDark,
+                        unfocusedContainerColor = BgDark,
+                        focusedTextColor = TextPrimary,
+                        unfocusedTextColor = TextPrimary,
+                        cursorColor = Accent,
+                        focusedIndicatorColor = Accent,
+                        unfocusedIndicatorColor = CardBorder,
+                    ),
+                )
+                Spacer(Modifier.width(6.dp))
+                IconButton(
+                    onClick = { send() },
+                    enabled = input.isNotBlank() && !sending,
+                    modifier = Modifier.paneNavItem(onActivate = { send() }, tapToSelect = true, navRow = 1, navCol = 2),
+                ) {
+                    Icon(
+                        Icons.AutoMirrored.Outlined.Send,
+                        contentDescription = stringResource(R.string.steam_chat_send),
+                        tint = if (input.isNotBlank() && !sending) Accent else TextSecondary,
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun OverlayMessageBubble(message: SteamChatMessage) {
+        val url = overlayImageUrlOf(message.text)
+        Row(
+            Modifier.fillMaxWidth(),
+            horizontalArrangement = if (message.fromSelf) Arrangement.End else Arrangement.Start,
+        ) {
+            Surface(
+                shape = RoundedCornerShape(12.dp),
+                color = if (message.fromSelf) Accent.copy(alpha = 0.18f) else SurfaceDark,
+                modifier = Modifier.widthIn(max = 260.dp),
+            ) {
+                if (url != null) {
+                    AsyncImage(
+                        model = overlayImage(url),
+                        contentDescription = stringResource(R.string.steam_chat_image),
+                        contentScale = ContentScale.Fit,
+                        modifier = Modifier.padding(4.dp).width(220.dp).heightIn(min = 100.dp, max = 220.dp).clip(RoundedCornerShape(10.dp)).background(BgDark),
+                    )
+                } else {
+                    Text(message.text, color = TextPrimary, style = MaterialTheme.typography.bodyMedium, modifier = Modifier.padding(horizontal = 10.dp, vertical = 7.dp))
+                }
+            }
+        }
+    }
+
+    private fun buildBubbleParams(): WindowManager.LayoutParams =
+        WindowManager.LayoutParams(
+            // Fixed size, not WRAP_CONTENT, so the overlay can't mis-measure to full screen.
+            bubbleSizePx,
+            bubbleSizePx,
+            WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+            PixelFormat.TRANSLUCENT,
+        ).apply {
+            gravity = Gravity.TOP or Gravity.START
+        }
+
+    private fun buildPanelParams(): WindowManager.LayoutParams =
+        WindowManager.LayoutParams(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+            WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+            PixelFormat.TRANSLUCENT,
+        ).apply {
+            gravity = Gravity.TOP or Gravity.START
+            softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+        }
+
+    private fun buildTargetParams(): WindowManager.LayoutParams =
+        WindowManager.LayoutParams(
+            WindowManager.LayoutParams.WRAP_CONTENT,
+            WindowManager.LayoutParams.WRAP_CONTENT,
+            WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+            PixelFormat.TRANSLUCENT,
+        ).apply {
+            gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
+            y = (64 * density).toInt()
+        }
+
+    private class OverlayLifecycleOwner : LifecycleOwner, ViewModelStoreOwner, SavedStateRegistryOwner {
+        private val lifecycleRegistry = LifecycleRegistry(this)
+        private val store = ViewModelStore()
+        private val savedStateController = SavedStateRegistryController.create(this)
+        override val lifecycle: Lifecycle get() = lifecycleRegistry
+        override val viewModelStore: ViewModelStore get() = store
+        override val savedStateRegistry: SavedStateRegistry get() = savedStateController.savedStateRegistry
+
+        fun create() {
+            savedStateController.performRestore(null)
+            lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+            lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+            lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+        }
+
+        fun destroy() {
+            lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            store.clear()
+        }
+    }
+
+    companion object {
+        private const val EXTRA_FRIEND_ID = "friendId"
+
+        fun onIncoming(context: Context, friendId: Long) {
+            if (!PrefManager.chatHeadsEnabled || !Settings.canDrawOverlays(context)) return
+            val intent = Intent(context, ChatOverlayService::class.java).putExtra(EXTRA_FRIEND_ID, friendId)
+            runCatching { context.startService(intent) }
+        }
+
+        fun start(context: Context) {
+            if (!PrefManager.chatHeadsEnabled || !Settings.canDrawOverlays(context)) return
+            runCatching { context.startService(Intent(context, ChatOverlayService::class.java)) }
+        }
+
+        fun openHead(context: Context, friendId: Long) {
+            if (!PrefManager.chatHeadsEnabled || !Settings.canDrawOverlays(context)) return
+            val intent = Intent(context, ChatOverlayService::class.java).putExtra(EXTRA_FRIEND_ID, friendId)
+            runCatching { context.startService(intent) }
+        }
+
+        fun stop(context: Context) {
+            runCatching { context.stopService(Intent(context, ChatOverlayService::class.java)) }
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/data/AppInfo.kt b/app/src/main/feature/stores/steam/data/AppInfo.kt
index f4d8b604e..66f4e09f8 100644
--- a/app/src/main/feature/stores/steam/data/AppInfo.kt
+++ b/app/src/main/feature/stores/steam/data/AppInfo.kt
@@ -12,4 +12,7 @@ data class AppInfo(
     val downloadedDepots: List<Int> = emptyList<Int>(),
     @ColumnInfo("dlc_depots")
     val dlcDepots: List<Int> = emptyList<Int>(),
+    // Durable install path so recognition survives PICS metadata eviction; null until known.
+    @ColumnInfo("install_path")
+    val installPath: String? = null,
 )
diff --git a/app/src/main/feature/stores/steam/data/CachedLicense.kt b/app/src/main/feature/stores/steam/data/CachedLicense.kt
index a0628aa12..bb7b91775 100644
--- a/app/src/main/feature/stores/steam/data/CachedLicense.kt
+++ b/app/src/main/feature/stores/steam/data/CachedLicense.kt
@@ -4,9 +4,8 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 /**
- * Entity to store raw License objects from JavaSteam.
+ * Entity to store a Steam license as serialized JSON.
  * Each license is stored in its own row.
- * Used by DepotDownloader which requires List<License>.
  */
 @Entity("cached_license")
 data class CachedLicense(
diff --git a/app/src/main/feature/stores/steam/data/ConfigInfo.kt b/app/src/main/feature/stores/steam/data/ConfigInfo.kt
index 03d07226f..4f68cbd42 100644
--- a/app/src/main/feature/stores/steam/data/ConfigInfo.kt
+++ b/app/src/main/feature/stores/steam/data/ConfigInfo.kt
@@ -1,4 +1,5 @@
 package com.winlator.cmod.feature.stores.steam.data
+
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -9,7 +10,6 @@ data class ConfigInfo(
     val steamControllerTouchTemplateIndex: Int = 0,
     val steamInputManifestPath: String = "",
     val steamControllerConfigDetails: List<SteamControllerConfigDetail> = emptyList(),
-    // val steamControllerTouchConfigDetails: TouchConfigDetails,
 )
 
 @Serializable
diff --git a/app/src/main/feature/stores/steam/data/DepotInfo.kt b/app/src/main/feature/stores/steam/data/DepotInfo.kt
index be2fb11e7..be8d0a8f0 100644
--- a/app/src/main/feature/stores/steam/data/DepotInfo.kt
+++ b/app/src/main/feature/stores/steam/data/DepotInfo.kt
@@ -19,5 +19,6 @@ data class DepotInfo(
     val encryptedManifests: Map<String, ManifestInfo> = emptyMap(),
     val language: String = "",
     val realm: String = "",
+    val lowViolence: Boolean = false,
     val optionalDlcId: Int = INVALID_APP_ID,
 )
diff --git a/app/src/main/feature/stores/steam/data/DownloadInfo.kt b/app/src/main/feature/stores/steam/data/DownloadInfo.kt
index 7d24c45a0..2330c0524 100644
--- a/app/src/main/feature/stores/steam/data/DownloadInfo.kt
+++ b/app/src/main/feature/stores/steam/data/DownloadInfo.kt
@@ -20,6 +20,13 @@ class DownloadFailedException(
     message: String,
 ) : CancellationException(message)
 
+/** Marker for transient WN-Steam-Client depot-transfer failures (network blip, edge
+ *  hiccup) that the dispatcher should retry. Distinct from setup/entitlement errors
+ *  which must fail fast. */
+class WnDownloadTransientException(
+    message: String,
+) : Exception(message)
+
 class DownloadInfo(
     val jobCount: Int = 1,
     val gameId: Int,
@@ -36,6 +43,7 @@ class DownloadInfo(
     private var weightSum = jobCount.toFloat()
 
     private var totalExpectedBytes = AtomicLong(0L)
+    private var displayTotalExpectedBytes = AtomicLong(0L)
     private var bytesDownloaded = AtomicLong(0L)
 
     @Volatile private var persistencePath: String? = null
@@ -133,6 +141,10 @@ class DownloadInfo(
         totalExpectedBytes.set(if (bytes < 0L) 0L else bytes)
     }
 
+    fun setDisplayTotalExpectedBytes(bytes: Long) {
+        displayTotalExpectedBytes.set(if (bytes < 0L) 0L else bytes)
+    }
+
     fun initializeBytesDownloaded(value: Long) {
         bytesDownloaded.set(if (value < 0L) 0L else value)
     }
@@ -222,6 +234,28 @@ class DownloadInfo(
         }
     }
 
+    /**
+     * Set the absolute downloaded-bytes total. Used by the native WN-Steam
+     * depot downloader: its per-depot cumulative counters are the source of
+     * truth, so the global is the *sum* of them, set directly. Adding a delta
+     * derived from the native counter (as [updateBytesDownloaded] would)
+     * double-counts on resume — the native counter restarts at 0 every
+     * write_depot call and re-counts already-verified bytes, which pushed the
+     * progress bar past 100% during the verify pass.
+     */
+    fun setBytesDownloaded(
+        totalBytes: Long,
+        timestampMs: Long = System.currentTimeMillis(),
+    ) {
+        if (!isActive) return
+        val clamped = if (totalBytes < 0L) 0L else totalBytes
+        bytesDownloaded.set(clamped)
+        if (timestampMs - lastSpeedSampleMs >= SPEED_SAMPLE_INTERVAL_MS) {
+            lastSpeedSampleMs = timestampMs
+            addSpeedSample(timestampMs, clamped)
+        }
+    }
+
     fun updateStatusMessage(message: String?) {
         statusMessage.value = message
     }
@@ -336,6 +370,20 @@ class DownloadInfo(
         }
     }
 
+    fun getDisplayBytesProgress(): Pair<Long, Long> {
+        val displayTotal = displayTotalExpectedBytes.get()
+        if (displayTotal <= 0L) return getBytesProgress()
+
+        // A finished download is fully downloaded by definition. The byte
+        // accumulator can legitimately be 0 here — e.g. a resumed download
+        // whose depots were all already on disk and skipped, firing no
+        // progress callbacks — so derive the display value from the phase.
+        if (status.value == DownloadPhase.COMPLETE) return displayTotal to displayTotal
+
+        val displayDownloaded = (getProgress().coerceIn(0f, 1f) * displayTotal.toFloat()).toLong()
+        return displayDownloaded.coerceIn(0L, displayTotal) to displayTotal
+    }
+
     private fun getSpeedOverWindow(windowMs: Long): Double? {
         val now = System.currentTimeMillis()
         val cutoff = now - windowMs
@@ -476,6 +524,39 @@ class DownloadInfo(
                 }
             }
 
+        /**
+         * Overwrite the snapshot from a plain map. Swallows IO errors —
+         * the in-memory state is the truth; the next progress tick rewrites.
+         */
+        fun persistDepotBytes(appDirPath: String, depotBytes: Map<Int, Long>) {
+            synchronized(PERSISTENCE_IO_LOCK) {
+                try {
+                    val dir = File(appDirPath, PERSISTENCE_DIR)
+                    if (!dir.exists()) dir.mkdirs()
+                    val file = File(dir, PERSISTENCE_FILE)
+                    val sb = java.lang.StringBuilder()
+                    sb.append('{')
+                    var first = true
+                    for ((depotId, bytes) in depotBytes) {
+                        if (!first) sb.append(',')
+                        sb.append('"').append(depotId).append("\":")
+                            .append(bytes.coerceAtLeast(0L))
+                        first = false
+                    }
+                    sb.append('}')
+                    val jsonText = sb.toString()
+                    val tempFile = File(dir, "$PERSISTENCE_FILE.tmp")
+                    tempFile.writeText(jsonText)
+                    if (!tempFile.renameTo(file)) {
+                        file.writeText(jsonText)
+                        tempFile.delete()
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to rewrite depot bytes snapshot at $appDirPath")
+                }
+            }
+        }
+
         fun loadPersistedDepotBytes(appDirPath: String): Map<Int, Long> {
             return try {
                 val file = File(File(appDirPath, PERSISTENCE_DIR), PERSISTENCE_FILE)
diff --git a/app/src/main/feature/stores/steam/data/EncryptedAppTicket.kt b/app/src/main/feature/stores/steam/data/EncryptedAppTicket.kt
index 6fc8c452d..4c6ce9c08 100644
--- a/app/src/main/feature/stores/steam/data/EncryptedAppTicket.kt
+++ b/app/src/main/feature/stores/steam/data/EncryptedAppTicket.kt
@@ -2,7 +2,7 @@ package com.winlator.cmod.feature.stores.steam.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import `in`.dragonbra.javasteam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.enums.EResult
 
 @Entity("encrypted_app_ticket")
 data class EncryptedAppTicket(
diff --git a/app/src/main/feature/stores/steam/data/GameProcessInfo.kt b/app/src/main/feature/stores/steam/data/GameProcessInfo.kt
index 43cfa7836..70d8ea296 100644
--- a/app/src/main/feature/stores/steam/data/GameProcessInfo.kt
+++ b/app/src/main/feature/stores/steam/data/GameProcessInfo.kt
@@ -1,5 +1,4 @@
 package com.winlator.cmod.feature.stores.steam.data
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.AppProcessInfo
 
 data class GameProcessInfo(
     val appId: Int,
diff --git a/app/src/main/feature/stores/steam/data/PostSyncInfo.kt b/app/src/main/feature/stores/steam/data/PostSyncInfo.kt
index 6404eed50..d1328fb2f 100644
--- a/app/src/main/feature/stores/steam/data/PostSyncInfo.kt
+++ b/app/src/main/feature/stores/steam/data/PostSyncInfo.kt
@@ -1,6 +1,5 @@
 package com.winlator.cmod.feature.stores.steam.data
 import com.winlator.cmod.feature.stores.steam.enums.SyncResult
-import `in`.dragonbra.javasteam.steam.handlers.steamcloud.PendingRemoteOperation
 
 data class PostSyncInfo(
     val syncResult: SyncResult,
@@ -24,5 +23,7 @@ data class PostSyncInfo(
     val microsecDeleteFiles: Long = 0L,
     val microsecDownloadFiles: Long = 0L,
     val microsecUploadFiles: Long = 0L,
-    val pendingRemoteOperations: List<PendingRemoteOperation> = emptyList(),
+    // ECloudPendingRemoteOperation codes (1 AppSessionActive, 2 UploadInProgress,
+    // 3 UploadPending, 4 AppSessionSuspended); empty = clear to launch.
+    val pendingRemoteOperations: List<Int> = emptyList(),
 )
diff --git a/app/src/main/feature/stores/steam/data/SaveFilePattern.kt b/app/src/main/feature/stores/steam/data/SaveFilePattern.kt
index fd2f2f548..a49c5b933 100644
--- a/app/src/main/feature/stores/steam/data/SaveFilePattern.kt
+++ b/app/src/main/feature/stores/steam/data/SaveFilePattern.kt
@@ -10,17 +10,27 @@ data class SaveFilePattern(
     val path: String,
     val pattern: String,
     val recursive: Int = 0,
+    val uploadRoot: PathType = root,
+    val uploadPath: String = path,
 ) {
     val prefix: String
-        get() =
-            "%${root.name}%$path"
+        get() {
+            val pathForPrefix =
+                when {
+                    path.isBlank() || path == "." -> ""
+                    else -> path
+                }
+            return "%${root.name}%$pathForPrefix"
                 .replace("{64BitSteamID}", SteamUtils.getSteamId64().toString())
                 .replace("{Steam3AccountID}", SteamUtils.getSteam3AccountId().toString())
+        }
 
     val substitutedPath: String
         get() =
-            path
-                .replace("{64BitSteamID}", SteamUtils.getSteamId64().toString())
+            when {
+                path.isBlank() || path == "." -> ""
+                else -> path
+            }.replace("{64BitSteamID}", SteamUtils.getSteamId64().toString())
                 .replace("{Steam3AccountID}", SteamUtils.getSteam3AccountId().toString())
                 .replace("\\", File.separator)
 }
diff --git a/app/src/main/feature/stores/steam/data/SteamApp.kt b/app/src/main/feature/stores/steam/data/SteamApp.kt
index c31f2993c..24076a7de 100644
--- a/app/src/main/feature/stores/steam/data/SteamApp.kt
+++ b/app/src/main/feature/stores/steam/data/SteamApp.kt
@@ -8,7 +8,7 @@ import com.winlator.cmod.feature.stores.steam.enums.Language
 import com.winlator.cmod.feature.stores.steam.enums.OS
 import com.winlator.cmod.feature.stores.steam.enums.ReleaseState
 import com.winlator.cmod.feature.stores.steam.service.SteamService
-import `in`.dragonbra.javasteam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
 import java.util.EnumSet
 
 @Entity("steam_app")
diff --git a/app/src/main/feature/stores/steam/data/SteamChatMessage.kt b/app/src/main/feature/stores/steam/data/SteamChatMessage.kt
new file mode 100644
index 000000000..0c8c278a2
--- /dev/null
+++ b/app/src/main/feature/stores/steam/data/SteamChatMessage.kt
@@ -0,0 +1,8 @@
+package com.winlator.cmod.feature.stores.steam.data
+
+data class SteamChatMessage(
+    val fromSelf: Boolean,
+    val text: String,
+    val timestamp: Int,
+    val ordinal: Int = 0,
+)
diff --git a/app/src/main/feature/stores/steam/data/SteamFriend.kt b/app/src/main/feature/stores/steam/data/SteamFriend.kt
index 6371ef147..ef794a479 100644
--- a/app/src/main/feature/stores/steam/data/SteamFriend.kt
+++ b/app/src/main/feature/stores/steam/data/SteamFriend.kt
@@ -1,5 +1,5 @@
 package com.winlator.cmod.feature.stores.steam.data
-import `in`.dragonbra.javasteam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
 
 /**
  * This class serves to update your steam's profile icon on the main library screen and settings dialog.
diff --git a/app/src/main/feature/stores/steam/data/SteamFriendEntry.kt b/app/src/main/feature/stores/steam/data/SteamFriendEntry.kt
new file mode 100644
index 000000000..fe06adcd3
--- /dev/null
+++ b/app/src/main/feature/stores/steam/data/SteamFriendEntry.kt
@@ -0,0 +1,35 @@
+package com.winlator.cmod.feature.stores.steam.data
+
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+
+data class SteamFriendEntry(
+    val steamId: Long,
+    val name: String,
+    val state: EPersonaState,
+    val gameAppId: Int = 0,
+    val gameName: String = "",
+    val avatarHash: String = "",
+    val connectString: String = "",
+) {
+    val isJoinable: Boolean
+        get() = isPlayingGame && gameAppId > 0 && connectString.isNotBlank()
+
+    val isOnline: Boolean
+        get() = state.code() in 1..6
+
+    val isPlayingGame: Boolean
+        get() = isOnline && (gameAppId > 0 || gameName.isNotBlank())
+
+    val avatarUrl: String?
+        get() = avatarHash.takeIf { it.isNotBlank() }
+            ?.let { "https://avatars.akamai.steamstatic.com/${it}_full.jpg" }
+
+    // Game artwork for the app the friend is playing (Steam apps only).
+    val gameCapsuleUrl: String?
+        get() = gameAppId.takeIf { it > 0 }
+            ?.let { "https://cdn.cloudflare.steamstatic.com/steam/apps/$it/capsule_231x87.jpg" }
+
+    val gameHeaderUrl: String?
+        get() = gameAppId.takeIf { it > 0 }
+            ?.let { "https://cdn.cloudflare.steamstatic.com/steam/apps/$it/header.jpg" }
+}
diff --git a/app/src/main/feature/stores/steam/data/SteamLicense.kt b/app/src/main/feature/stores/steam/data/SteamLicense.kt
index 9c4036fc4..f804bdd58 100644
--- a/app/src/main/feature/stores/steam/data/SteamLicense.kt
+++ b/app/src/main/feature/stores/steam/data/SteamLicense.kt
@@ -2,10 +2,10 @@ package com.winlator.cmod.feature.stores.steam.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import `in`.dragonbra.javasteam.enums.ELicenseFlags
-import `in`.dragonbra.javasteam.enums.ELicenseType
-import `in`.dragonbra.javasteam.enums.EPaymentMethod
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.License
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+// License is now an in-house plain type — no JavaSteam import
 import java.util.Date
 import java.util.EnumSet
 
diff --git a/app/src/main/feature/stores/steam/data/SteamValueTypes.kt b/app/src/main/feature/stores/steam/data/SteamValueTypes.kt
new file mode 100644
index 000000000..24a7de1a4
--- /dev/null
+++ b/app/src/main/feature/stores/steam/data/SteamValueTypes.kt
@@ -0,0 +1,81 @@
+package com.winlator.cmod.feature.stores.steam.data
+
+/**
+ * In-house replacements for the small JavaSteam value/data types the app
+ * still used.
+ * Each keeps the exact field/method names the call sites relied on so the
+ * migration is just an import swap.
+ */
+
+/**
+ * A Steam account identifier — the in-house replacement for
+ * `in.dragonbra.javasteam.types.SteamID`. Wraps the raw 64-bit SteamID; the
+ * low 32 bits are the account id.
+ */
+class SteamID(
+    private val value: Long,
+) {
+    /** The low 32 bits of the SteamID64 (the "account id"). */
+    val accountID: Long
+        get() = value and 0xFFFFFFFFL
+
+    /** Whether this looks like a real (non-zero) SteamID. */
+    val isValid: Boolean
+        get() = value != 0L
+
+    /** The raw 64-bit SteamID. */
+    fun convertToUInt64(): Long = value
+}
+
+/**
+ * A Steam game identifier — in-house replacement for
+ * `in.dragonbra.javasteam.types.GameID`. Wraps the raw 64-bit GameID.
+ */
+class GameID(
+    private val value: Long,
+) {
+    fun convertToUInt64(): Long = value
+}
+
+/**
+ * A PICS product-info request (app or package id + optional access token) —
+ * in-house replacement for `steamapps.PICSRequest`. Used as a data carrier
+ * for the C++ WN-Steam-Client PICS pipeline.
+ */
+data class PICSRequest(
+    val id: Int,
+    val accessToken: Long = 0L,
+)
+
+/**
+ * One OS process belonging to a running game — in-house replacement for
+ * `steamapps.AppProcessInfo`.
+ */
+data class AppProcessInfo(
+    val processId: Int,
+    val processIdParent: Int,
+    val parentIsSteam: Boolean,
+)
+
+/**
+ * A running game reported to Steam (CMsgClientGamesPlayed) — in-house
+ * replacement for `steamapps.GamePlayedInfo`, trimmed to the fields the app
+ * actually sets/reads.
+ */
+data class GamePlayedInfo(
+    val gameId: Long,
+    val processId: Int,
+    val ownerId: Int,
+    val launchSource: Int,
+    val gameBuildId: Int,
+    val processIdList: List<AppProcessInfo>,
+)
+
+/**
+ * In-house replacement for `steamclient.AsyncJobFailedException`. Retained so
+ * the (now dormant) retry `catch` blocks around cloud sync still compile;
+ * nothing in the C++ path throws it.
+ */
+class AsyncJobFailedException(
+    message: String? = null,
+) : Exception(message)
diff --git a/app/src/main/feature/stores/steam/data/UserFileInfo.kt b/app/src/main/feature/stores/steam/data/UserFileInfo.kt
index d88501686..b7deba3e7 100644
--- a/app/src/main/feature/stores/steam/data/UserFileInfo.kt
+++ b/app/src/main/feature/stores/steam/data/UserFileInfo.kt
@@ -18,17 +18,19 @@ data class UserFileInfo(
     val filename: String,
     val timestamp: Long,
     val sha: ByteArray,
+    val cloudRoot: PathType = root,
+    val cloudPath: String = path,
 ) {
     // "." and blank path both mean "root of path type" per Steam manifest.
     val prefix: String
         get() {
             val pathForPrefix =
                 when {
-                    path.isBlank() || path == "." -> ""
-                    else -> path
+                    cloudPath.isBlank() || cloudPath == "." -> ""
+                    else -> cloudPath
                 }
             return Paths
-                .get("%${root.name}%$pathForPrefix")
+                .get("%${cloudRoot.name}%$pathForPrefix")
                 .pathString
                 .replace("{64BitSteamID}", SteamUtils.getSteamId64().toString())
                 .replace("{Steam3AccountID}", SteamUtils.getSteam3AccountId().toString())
@@ -38,7 +40,7 @@ data class UserFileInfo(
     val prefixPath: String
         get() =
             when {
-                path.isBlank() || path == "." -> "$prefix$filename"
+                cloudPath.isBlank() || cloudPath == "." -> "$prefix$filename"
                 else -> Paths.get(prefix, filename).pathString
             }.replace("{64BitSteamID}", SteamUtils.getSteamId64().toString())
                 .replace("{Steam3AccountID}", SteamUtils.getSteam3AccountId().toString())
diff --git a/app/src/main/feature/stores/steam/db/converters/AppConverter.kt b/app/src/main/feature/stores/steam/db/converters/AppConverter.kt
index c1fe2a8c6..f22289682 100644
--- a/app/src/main/feature/stores/steam/db/converters/AppConverter.kt
+++ b/app/src/main/feature/stores/steam/db/converters/AppConverter.kt
@@ -13,6 +13,17 @@ import com.winlator.cmod.feature.stores.steam.enums.ReleaseState
 import kotlinx.serialization.json.Json
 import java.util.EnumSet
 
+// A cached row may have been written by a build whose schema differs (e.g. a field present
+// only in another branch). The strict default Json throws on such rows, which previously broke
+// app lookup and any download depending on it. ignoreUnknownKeys + coerceInputValues decode
+// drifted rows without data loss; the per-converter fallback below keeps a truly unreadable row
+// from aborting the read (the row is re-fetched from PICS instead). Encoding is left at the
+// kotlinx default (defaults omitted) so rows stay readable by other builds.
+private val json = Json {
+    ignoreUnknownKeys = true
+    coerceInputValues = true
+}
+
 class AppConverter {
     @TypeConverter
     fun toAppType(appType: Int): AppType = AppType.fromCode(appType)
@@ -39,38 +50,44 @@ class AppConverter {
     fun fromControllerSupport(controllerSupport: ControllerSupport): Int = controllerSupport.code
 
     @TypeConverter
-    fun toDepots(depots: String): Map<Int, DepotInfo> = Json.decodeFromString<Map<Int, DepotInfo>>(depots)
+    fun toDepots(depots: String): Map<Int, DepotInfo> =
+        runCatching { json.decodeFromString<Map<Int, DepotInfo>>(depots) }.getOrDefault(emptyMap())
 
     @TypeConverter
-    fun fromDepots(depots: Map<Int, DepotInfo>): String = Json.encodeToString(depots)
+    fun fromDepots(depots: Map<Int, DepotInfo>): String = json.encodeToString(depots)
 
     @TypeConverter
-    fun toBranches(branches: String): Map<String, BranchInfo> = Json.decodeFromString<Map<String, BranchInfo>>(branches)
+    fun toBranches(branches: String): Map<String, BranchInfo> =
+        runCatching { json.decodeFromString<Map<String, BranchInfo>>(branches) }.getOrDefault(emptyMap())
 
     @TypeConverter
-    fun fromBranches(branches: Map<String, BranchInfo>): String = Json.encodeToString(branches)
+    fun fromBranches(branches: Map<String, BranchInfo>): String = json.encodeToString(branches)
 
     @TypeConverter
-    fun toLangMap(langMap: String): Map<Language, String> = Json.decodeFromString<Map<Language, String>>(langMap)
+    fun toLangMap(langMap: String): Map<Language, String> =
+        runCatching { json.decodeFromString<Map<Language, String>>(langMap) }.getOrDefault(emptyMap())
 
     @TypeConverter
-    fun fromLangMap(langMap: Map<Language, String>): String = Json.encodeToString(langMap)
+    fun fromLangMap(langMap: Map<Language, String>): String = json.encodeToString(langMap)
 
     @TypeConverter
-    fun toLibraryAssetsInfo(langMap: String): LibraryAssetsInfo = Json.decodeFromString<LibraryAssetsInfo>(langMap)
+    fun toLibraryAssetsInfo(langMap: String): LibraryAssetsInfo =
+        runCatching { json.decodeFromString<LibraryAssetsInfo>(langMap) }.getOrDefault(LibraryAssetsInfo())
 
     @TypeConverter
-    fun fromLibraryAssetsInfo(langMap: LibraryAssetsInfo): String = Json.encodeToString(langMap)
+    fun fromLibraryAssetsInfo(langMap: LibraryAssetsInfo): String = json.encodeToString(langMap)
 
     @TypeConverter
-    fun toConfigInfo(configInfo: String): ConfigInfo = Json.decodeFromString<ConfigInfo>(configInfo)
+    fun toConfigInfo(configInfo: String): ConfigInfo =
+        runCatching { json.decodeFromString<ConfigInfo>(configInfo) }.getOrDefault(ConfigInfo())
 
     @TypeConverter
-    fun fromConfigInfo(configInfo: ConfigInfo): String = Json.encodeToString(configInfo)
+    fun fromConfigInfo(configInfo: ConfigInfo): String = json.encodeToString(configInfo)
 
     @TypeConverter
-    fun toUFS(ufs: String): UFS = Json.decodeFromString<UFS>(ufs)
+    fun toUFS(ufs: String): UFS =
+        runCatching { json.decodeFromString<UFS>(ufs) }.getOrDefault(UFS())
 
     @TypeConverter
-    fun fromUFS(ufs: UFS): String = Json.encodeToString(ufs)
+    fun fromUFS(ufs: UFS): String = json.encodeToString(ufs)
 }
diff --git a/app/src/main/feature/stores/steam/db/converters/FriendConverter.kt b/app/src/main/feature/stores/steam/db/converters/FriendConverter.kt
index d5b3f80b0..d66fdbce6 100644
--- a/app/src/main/feature/stores/steam/db/converters/FriendConverter.kt
+++ b/app/src/main/feature/stores/steam/db/converters/FriendConverter.kt
@@ -1,11 +1,11 @@
 package com.winlator.cmod.feature.stores.steam.db.converters
 import androidx.room.TypeConverter
-import `in`.dragonbra.javasteam.enums.EClientPersonaStateFlag
-import `in`.dragonbra.javasteam.enums.EFriendRelationship
-import `in`.dragonbra.javasteam.enums.EPersonaState
-import `in`.dragonbra.javasteam.enums.EPersonaStateFlag
-import `in`.dragonbra.javasteam.types.GameID
-import `in`.dragonbra.javasteam.types.SteamID
+import com.winlator.cmod.feature.stores.steam.enums.EClientPersonaStateFlag
+import com.winlator.cmod.feature.stores.steam.enums.EFriendRelationship
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaStateFlag
+import com.winlator.cmod.feature.stores.steam.data.GameID
+import com.winlator.cmod.feature.stores.steam.data.SteamID
 import java.util.Date
 import java.util.EnumSet
 
@@ -17,13 +17,14 @@ class FriendConverter {
     fun dateToTimestamp(date: Date): Long = date.time
 
     @TypeConverter
-    fun toEFriendRelationship(value: Int): EFriendRelationship = EFriendRelationship.from(value)
+    fun toEFriendRelationship(value: Int): EFriendRelationship =
+        EFriendRelationship.from(value) ?: EFriendRelationship.None
 
     @TypeConverter
     fun fromEFriendRelationship(type: EFriendRelationship): Int = type.code()
 
     @TypeConverter
-    fun toEPersonaState(value: Int): EPersonaState = EPersonaState.from(value)
+    fun toEPersonaState(value: Int): EPersonaState = EPersonaState.from(value) ?: EPersonaState.Offline
 
     @TypeConverter
     fun fromEPersonaState(state: EPersonaState): Int = state.code()
diff --git a/app/src/main/feature/stores/steam/db/converters/LicenseConverter.kt b/app/src/main/feature/stores/steam/db/converters/LicenseConverter.kt
index 4be2274d3..662448125 100644
--- a/app/src/main/feature/stores/steam/db/converters/LicenseConverter.kt
+++ b/app/src/main/feature/stores/steam/db/converters/LicenseConverter.kt
@@ -1,8 +1,8 @@
 package com.winlator.cmod.feature.stores.steam.db.converters
 import androidx.room.TypeConverter
-import `in`.dragonbra.javasteam.enums.ELicenseFlags
-import `in`.dragonbra.javasteam.enums.ELicenseType
-import `in`.dragonbra.javasteam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
 import kotlinx.serialization.json.Json
 import java.util.EnumSet
 
@@ -14,13 +14,15 @@ class LicenseConverter {
     fun fromLicenseFlags(licenseFlags: EnumSet<ELicenseFlags>): Int = ELicenseFlags.code(licenseFlags)
 
     @TypeConverter
-    fun toLicenseType(licenseType: Int): ELicenseType = ELicenseType.from(licenseType)
+    fun toLicenseType(licenseType: Int): ELicenseType =
+        ELicenseType.from(licenseType) ?: ELicenseType.NoLicense
 
     @TypeConverter
     fun fromLicenseType(licenseType: ELicenseType): Int = licenseType.code()
 
     @TypeConverter
-    fun toPaymentMethod(paymentMethod: Int): EPaymentMethod = EPaymentMethod.from(paymentMethod)
+    fun toPaymentMethod(paymentMethod: Int): EPaymentMethod =
+        EPaymentMethod.from(paymentMethod) ?: EPaymentMethod.None
 
     @TypeConverter
     fun fromPaymentMethod(paymentMethod: EPaymentMethod): Int = paymentMethod.code()
diff --git a/app/src/main/feature/stores/steam/db/converters/UserFileInfoListConverter.kt b/app/src/main/feature/stores/steam/db/converters/UserFileInfoListConverter.kt
index b286977ad..19c95ebf6 100644
--- a/app/src/main/feature/stores/steam/db/converters/UserFileInfoListConverter.kt
+++ b/app/src/main/feature/stores/steam/db/converters/UserFileInfoListConverter.kt
@@ -3,10 +3,18 @@ import androidx.room.TypeConverter
 import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
 import kotlinx.serialization.json.Json
 
+// Tolerant of rows written by a build with a different schema; an unreadable row decodes to
+// null rather than throwing and breaking the owning app lookup. See AppConverter for details.
+private val json = Json {
+    ignoreUnknownKeys = true
+    coerceInputValues = true
+}
+
 class UserFileInfoListConverter {
     @TypeConverter
-    fun fromUserFileInfoList(userFileInfoList: List<UserFileInfo>?): String? = userFileInfoList?.let { Json.encodeToString(it) }
+    fun fromUserFileInfoList(userFileInfoList: List<UserFileInfo>?): String? = userFileInfoList?.let { json.encodeToString(it) }
 
     @TypeConverter
-    fun toUserFileInfoList(value: String?): List<UserFileInfo>? = value?.let { Json.decodeFromString<List<UserFileInfo>>(it) }
+    fun toUserFileInfoList(value: String?): List<UserFileInfo>? =
+        value?.let { runCatching { json.decodeFromString<List<UserFileInfo>>(it) }.getOrNull() }
 }
diff --git a/app/src/main/feature/stores/steam/db/dao/SteamAppDao.kt b/app/src/main/feature/stores/steam/db/dao/SteamAppDao.kt
index aa4211a33..dc00a63df 100644
--- a/app/src/main/feature/stores/steam/db/dao/SteamAppDao.kt
+++ b/app/src/main/feature/stores/steam/db/dao/SteamAppDao.kt
@@ -3,9 +3,11 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Transaction
 import androidx.room.Update
 import com.winlator.cmod.feature.stores.steam.data.SteamApp
 import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.INVALID_PKG_ID
+import kotlin.math.min
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -42,6 +44,54 @@ interface SteamAppDao {
     @Query("SELECT * FROM steam_app WHERE id = :appId")
     suspend fun findApp(appId: Int): SteamApp?
 
+    /* ----------------------------------------------------------
+       INTERNAL bulk queries — keep abstract. Public wrappers
+       below chunk inputs so we never exceed SQLite's 999-bind
+       ceiling (SQLITE_MAX_VARS).
+       ---------------------------------------------------------- */
+
+    @Query("SELECT * FROM steam_app WHERE id IN (:appIds)")
+    suspend fun _findApps(appIds: List<Int>): List<SteamApp>
+
+    @Query("SELECT id FROM steam_app WHERE id IN (:appIds)")
+    suspend fun _findExistingIds(appIds: List<Int>): List<Int>
+
+    @Query("UPDATE steam_app SET package_id = :packageId WHERE id IN (:appIds)")
+    suspend fun _setPackageIdForApps(appIds: List<Int>, packageId: Int)
+
+    @Transaction
+    suspend fun findApps(appIds: List<Int>): List<SteamApp> {
+        if (appIds.isEmpty()) return emptyList()
+        val out = ArrayList<SteamApp>(appIds.size)
+        for (i in appIds.indices step SQLITE_MAX_VARS) {
+            val end = min(i + SQLITE_MAX_VARS, appIds.size)
+            out.addAll(_findApps(appIds.subList(i, end)))
+        }
+        return out
+    }
+
+    @Transaction
+    suspend fun findExistingIds(appIds: List<Int>): List<Int> {
+        if (appIds.isEmpty()) return emptyList()
+        val out = ArrayList<Int>(appIds.size)
+        for (i in appIds.indices step SQLITE_MAX_VARS) {
+            val end = min(i + SQLITE_MAX_VARS, appIds.size)
+            out.addAll(_findExistingIds(appIds.subList(i, end)))
+        }
+        return out
+    }
+
+    @Transaction
+    suspend fun setPackageIdForApps(appIds: List<Int>, packageId: Int) {
+        if (appIds.isEmpty()) return
+        // packageId consumes one bind slot, so chunk size is SQLITE_MAX_VARS - 1.
+        val chunk = SQLITE_MAX_VARS - 1
+        for (i in appIds.indices step chunk) {
+            val end = min(i + chunk, appIds.size)
+            _setPackageIdForApps(appIds.subList(i, end), packageId)
+        }
+    }
+
     @Query(
         "SELECT * FROM steam_app AS app WHERE dlc_for_app_id = :appId AND depots <> '{}' AND " +
             " EXISTS (" +
@@ -50,7 +100,7 @@ interface SteamAppDao {
             "       REPLACE(REPLACE(license.app_ids, '[', ','), ']', ',') LIKE ('%,' || app.id || ',%') " +
             ")",
     )
-    suspend fun findDownloadableDLCApps(appId: Int): List<SteamApp>?
+    suspend fun findDownloadableDLCApps(appId: Int): List<SteamApp>
 
     @Query(
         "SELECT * FROM steam_app AS app WHERE dlc_for_app_id = :appId AND depots = '{}' AND " +
@@ -60,7 +110,7 @@ interface SteamAppDao {
             "       REPLACE(REPLACE(license.app_ids, '[', ','), ']', ',') LIKE ('%,' || app.id || ',%') " +
             ")",
     )
-    suspend fun findHiddenDLCApps(appId: Int): List<SteamApp>?
+    suspend fun findHiddenDLCApps(appId: Int): List<SteamApp>
 
     @Query("DELETE from steam_app")
     suspend fun deleteAll()
diff --git a/app/src/main/feature/stores/steam/db/dao/SteamLicenseDao.kt b/app/src/main/feature/stores/steam/db/dao/SteamLicenseDao.kt
index 8cc3ae704..c3e9d54f0 100644
--- a/app/src/main/feature/stores/steam/db/dao/SteamLicenseDao.kt
+++ b/app/src/main/feature/stores/steam/db/dao/SteamLicenseDao.kt
@@ -36,6 +36,13 @@ interface SteamLicenseDao {
     @Query("SELECT * FROM steam_license WHERE packageId = :packageId")
     suspend fun findLicense(packageId: Int): SteamLicense?
 
+    @Query(
+        "SELECT COUNT(*) FROM steam_license AS license " +
+            "WHERE license.license_type <> 0 AND " +
+            "REPLACE(REPLACE(license.app_ids, '[', ','), ']', ',') LIKE ('%,' || :appId || ',%')",
+    )
+    suspend fun countLicensesForApp(appId: Int): Int
+
     /* ----------------------------------------------------------
        INTERNAL queries that Room generates.  Keep them abstract.
        ---------------------------------------------------------- */
diff --git a/app/src/main/feature/stores/steam/enums/GameSource.kt b/app/src/main/feature/stores/steam/enums/GameSource.kt
index 766765866..d7893601a 100644
--- a/app/src/main/feature/stores/steam/enums/GameSource.kt
+++ b/app/src/main/feature/stores/steam/enums/GameSource.kt
@@ -5,5 +5,4 @@ enum class GameSource {
     CUSTOM_GAME,
     GOG,
     EPIC,
-    // Add other platforms here..
 }
diff --git a/app/src/main/feature/stores/steam/enums/Language.kt b/app/src/main/feature/stores/steam/enums/Language.kt
index 64f8f77be..8477e0294 100644
--- a/app/src/main/feature/stores/steam/enums/Language.kt
+++ b/app/src/main/feature/stores/steam/enums/Language.kt
@@ -1,35 +1,53 @@
 package com.winlator.cmod.feature.stores.steam.enums
 import timber.log.Timber
 
-enum class Language {
-    english,
-    german,
-    french,
-    italian,
-    koreana,
-    spanish,
-    schinese,
-    sc_schinese,
-    tchinese,
-    russian,
-    japanese,
-    polish,
-    brazilian,
-    latam,
-    vietnamese,
-    portuguese,
-    danish,
-    dutch,
-    swedish,
-    norwegian,
-    finnish,
-    turkish,
-    thai,
-    czech,
-    unknown,
+enum class Language(val displayName: String) {
+    english("English"),
+    german("German"),
+    french("French"),
+    italian("Italian"),
+    koreana("Korean"),
+    spanish("Spanish"),
+    schinese("Simplified Chinese"),
+    sc_schinese("Simplified Chinese (SC)"),
+    tchinese("Traditional Chinese"),
+    russian("Russian"),
+    japanese("Japanese"),
+    polish("Polish"),
+    brazilian("Portuguese (Brazil)"),
+    latam("Spanish (Latin America)"),
+    vietnamese("Vietnamese"),
+    portuguese("Portuguese"),
+    danish("Danish"),
+    dutch("Dutch"),
+    swedish("Swedish"),
+    norwegian("Norwegian"),
+    finnish("Finnish"),
+    turkish("Turkish"),
+    thai("Thai"),
+    czech("Czech"),
+    unknown("Unknown"),
     ;
 
     companion object {
+        /** All display names in enum order, excluding [unknown] and the non-standard [sc_schinese] duplicate. */
+        fun displayLabels(): List<String> =
+            entries.filter { it != unknown && it != sc_schinese }.map { it.displayName }
+
+        /** Index of the entry whose [name] matches [containerLang], or the index of [english] as fallback. */
+        fun indexForContainerLang(containerLang: String?): Int {
+            val code = containerLang?.lowercase() ?: return 0
+            val filtered = entries.filter { it != unknown && it != sc_schinese }
+            val match = filtered.indexOfFirst { it.name == code }
+            return if (match >= 0) match else 0
+        }
+
+        /** Container language enum name for a given display-name [index] (0-based into the filtered list). */
+        fun containerLangForIndex(index: Int): String {
+            val filtered = entries.filter { it != unknown && it != sc_schinese }
+            return filtered.getOrNull(index)?.name ?: english.name
+        }
+
         fun from(keyValue: String?): Language =
             when (keyValue?.lowercase()) {
                 english.name -> {
diff --git a/app/src/main/feature/stores/steam/enums/PathType.kt b/app/src/main/feature/stores/steam/enums/PathType.kt
index 61467aa25..137bcb3e1 100644
--- a/app/src/main/feature/stores/steam/enums/PathType.kt
+++ b/app/src/main/feature/stores/steam/enums/PathType.kt
@@ -2,8 +2,10 @@ package com.winlator.cmod.feature.stores.steam.enums
 import android.content.Context
 import com.winlator.cmod.feature.stores.steam.service.SteamService
 import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.display.environment.ImageFs
 import timber.log.Timber
+import java.io.File
 import java.nio.file.Paths
 
 enum class PathType {
@@ -14,6 +16,7 @@ enum class PathType {
     WinAppDataLocalLow,
     WinAppDataRoaming,
     WinSavedGames,
+    WinProgramData,
     LinuxHome,
     LinuxXdgDataHome,
     LinuxXdgConfigHome,
@@ -103,6 +106,15 @@ enum class PathType {
                         ).toString()
                 }
 
+                WinProgramData -> {
+                    Paths
+                        .get(
+                            rootDir,
+                            winePrefix,
+                            "drive_c/ProgramData/",
+                        ).toString()
+                }
+
                 Root -> {
                     Paths
                         .get(
@@ -132,11 +144,16 @@ enum class PathType {
                 WinAppDataLocalLow,
                 WinAppDataRoaming,
                 WinSavedGames,
+                WinProgramData,
+                Root,
                 -> true
 
                 else -> false
             }
 
+    val isSupportedSteamCloudRoot: Boolean
+        get() = isWindows || this == Root
+
     companion object {
         val DEFAULT = SteamUserData
 
@@ -168,50 +185,79 @@ enum class PathType {
             context: Context,
             gogWindowsPath: String,
             appId: String? = null,
+            targetContainerId: Int? = null,
         ): String {
             val imageFs = ImageFs.find(context)
-            val user = ImageFs.USER
+            val explicitContainer =
+                targetContainerId
+                    ?.takeIf { it > 0 }
+                    ?.let { runCatching { ContainerManager(context).getContainerById(it) }.getOrNull() }
             val rootDir =
-                if (appId != null) {
-                    ContainerUtils.getUsableContainerOrNull(context, appId)?.rootDir?.absolutePath
-                        ?: imageFs.rootDir.absolutePath
-                } else {
-                    imageFs.rootDir.absolutePath
+                when {
+                    explicitContainer != null -> explicitContainer.rootDir.absolutePath
+                    appId != null ->
+                        ContainerUtils.getUsableContainerOrNull(context, appId)?.rootDir?.absolutePath
+                            ?: imageFs.rootDir.absolutePath
+                    else -> imageFs.rootDir.absolutePath
                 }
-            val winePrefix = if (appId != null) ".wine" else ImageFs.WINEPREFIX
-
+            val winePrefix = if (explicitContainer != null || appId != null) ".wine" else ImageFs.WINEPREFIX
+
+            // Walk the on-disk prefix case-insensitively — older Wine prefixes use
+            // lowercase `appdata`, and scripts can create non-`xuser` profile dirs.
+            val usersDir = resolveChildIgnoreCase(File(Paths.get(rootDir, winePrefix, "drive_c").toString()), "users")
+            val userDir = resolveUserProfileDir(usersDir)
+            val userProfile = userDir.absolutePath
+            val appDataDir = resolveChildIgnoreCase(userDir, "AppData").absolutePath
+            val savedGames = resolveChildIgnoreCase(userDir, "Saved Games").absolutePath
+            val documents = resolveChildIgnoreCase(userDir, "Documents").absolutePath
+            val localAppData = resolveChildIgnoreCase(File(appDataDir), "Local").absolutePath
+            val roamingAppData = resolveChildIgnoreCase(File(appDataDir), "Roaming").absolutePath
+            val publicDir = resolveChildIgnoreCase(usersDir, "Public").absolutePath
+
+            // Longer keys first so `%USERPROFILE%\Saved Games` isn't chopped by `%USERPROFILE%`.
             var mappedPath = gogWindowsPath
-            mappedPath =
-                mappedPath
-                    .replace(
-                        "%USERPROFILE%/Saved Games",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "Saved Games/").toString(),
-                    ).replace(
-                        "%USERPROFILE%\\Saved Games",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "Saved Games/").toString(),
-                    ).replace(
-                        "%USERPROFILE%/Documents",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "Documents/").toString(),
-                    ).replace(
-                        "%USERPROFILE%\\Documents",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "Documents/").toString(),
-                    )
-            mappedPath =
-                mappedPath
-                    .replace(
-                        "%LOCALAPPDATA%",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "AppData/Local/").toString(),
-                    ).replace(
-                        "%APPDATA%",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "AppData/Roaming/").toString(),
-                    ).replace(
-                        "%USERPROFILE%",
-                        Paths.get(rootDir, winePrefix, "drive_c/users/", user, "").toString(),
-                    )
+            val replacements =
+                listOf(
+                    "%USERPROFILE%/Saved Games" to "$savedGames/",
+                    "%USERPROFILE%\\Saved Games" to "$savedGames/",
+                    "%USERPROFILE%/Documents" to "$documents/",
+                    "%USERPROFILE%\\Documents" to "$documents/",
+                    "%PUBLIC%" to "$publicDir/",
+                    "%LOCALAPPDATA%" to "$localAppData/",
+                    "%APPDATA%" to "$roamingAppData/",
+                    "%USERPROFILE%" to "$userProfile/",
+                )
+            for ((token, value) in replacements) {
+                mappedPath = mappedPath.replace(token, value, ignoreCase = true)
+            }
 
             return mappedPath.replace("\\", "/")
         }
 
+        private fun resolveChildIgnoreCase(
+            parent: File,
+            name: String,
+        ): File =
+            parent
+                .listFiles()
+                ?.firstOrNull { it.name.equals(name, ignoreCase = true) }
+                ?: File(parent, name)
+
+        private fun resolveUserProfileDir(usersDir: File): File {
+            val direct = File(usersDir, ImageFs.USER)
+            if (direct.exists()) return direct
+            val caseInsensitive =
+                usersDir
+                    .listFiles { f -> f.isDirectory }
+                    ?.firstOrNull { it.name.equals(ImageFs.USER, ignoreCase = true) }
+            if (caseInsensitive != null) return caseInsensitive
+            val firstNonSystem =
+                usersDir
+                    .listFiles { f -> f.isDirectory }
+                    ?.firstOrNull { it.name.lowercase() !in setOf("public", "all users", "default", "default user") }
+            return firstNonSystem ?: direct
+        }
+
         fun from(keyValue: String?): PathType =
             when (keyValue?.lowercase()) {
                 "%${GameInstall.name.lowercase()}%",
@@ -222,12 +268,16 @@ enum class PathType {
 
                 "%${SteamUserData.name.lowercase()}%",
                 SteamUserData.name.lowercase(),
+                "steamuserbasestorage",
+                "%steamuserbasestorage%",
                 -> {
                     SteamUserData
                 }
 
                 "%${WinMyDocuments.name.lowercase()}%",
                 WinMyDocuments.name.lowercase(),
+                "steamclouddocuments",
+                "%steamclouddocuments%",
                 -> {
                     WinMyDocuments
                 }
@@ -256,6 +306,12 @@ enum class PathType {
                     WinSavedGames
                 }
 
+                "%${WinProgramData.name.lowercase()}%",
+                WinProgramData.name.lowercase(),
+                -> {
+                    WinProgramData
+                }
+
                 "%${LinuxHome.name.lowercase()}%",
                 LinuxHome.name.lowercase(),
                 -> {
@@ -286,8 +342,12 @@ enum class PathType {
                     MacAppSupport
                 }
 
-                "%ROOT_MOD%",
-                "ROOT_MOD",
+                "%root_mod%",
+                "root_mod",
+                "windowshome",
+                "%windowshome%",
+                "%${Root.name.lowercase()}%",
+                Root.name.lowercase(),
                 -> {
                     Root
                 }
diff --git a/app/src/main/feature/stores/steam/enums/SteamEnums.kt b/app/src/main/feature/stores/steam/enums/SteamEnums.kt
new file mode 100644
index 000000000..1bb113569
--- /dev/null
+++ b/app/src/main/feature/stores/steam/enums/SteamEnums.kt
@@ -0,0 +1,402 @@
+package com.winlator.cmod.feature.stores.steam.enums
+
+import java.util.EnumSet
+
+/**
+ * In-house replacements for the handful of `in.dragonbra.javasteam.enums.*`
+ * enums the app still depended on. Each mirrors JavaSteam's API exactly:
+ * `code()`, `from(Int)`, and for bitflag enums the `EnumSet`-based
+ * `from`/`code` pair. Integer codes are identical to Steam's wire/DB values,
+ * so persisted data is unaffected.
+ */
+
+enum class EPersonaState(private val codeValue: Int) {
+    Offline(0),
+    Online(1),
+    Busy(2),
+    Away(3),
+    Snooze(4),
+    LookingToTrade(5),
+    LookingToPlay(6),
+    Invisible(7),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EPersonaState? = entries.firstOrNull { it.codeValue == code }
+    }
+}
+
+enum class EFriendRelationship(private val codeValue: Int) {
+    None(0),
+    Blocked(1),
+    RequestRecipient(2),
+    Friend(3),
+    RequestInitiator(4),
+    Ignored(5),
+    IgnoredFriend(6),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EFriendRelationship? = entries.firstOrNull { it.codeValue == code }
+    }
+}
+
+enum class ELicenseType(private val codeValue: Int) {
+    NoLicense(0),
+    SinglePurchase(1),
+    SinglePurchaseLimitedUse(2),
+    RecurringCharge(3),
+    RecurringChargeLimitedUse(4),
+    RecurringChargeLimitedUseWithOverages(5),
+    RecurringOption(6),
+    LimitedUseDelayedActivation(7),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): ELicenseType? = entries.firstOrNull { it.codeValue == code }
+    }
+}
+
+/**
+ * Partial — only the [EResult] codes the app actually references. [from]
+ * returns null for any other code (callers fall back, e.g. `?: Fail`).
+ */
+enum class EResult(private val codeValue: Int) {
+    OK(1),
+    Fail(2),
+    NoConnection(3),
+    InvalidPassword(5),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EResult? = entries.firstOrNull { it.codeValue == code }
+    }
+}
+
+/** Partial — only the [EOSType] codes the app references. */
+enum class EOSType(private val codeValue: Int) {
+    Unknown(-1),
+    AndroidUnknown(-500),
+    WinUnknown(0),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EOSType? = entries.firstOrNull { it.codeValue == code }
+    }
+}
+
+enum class EPaymentMethod(private val codeValue: Int) {
+    None(0),
+    ActivationCode(1),
+    CreditCard(2),
+    Giropay(3),
+    PayPal(4),
+    Ideal(5),
+    PaySafeCard(6),
+    Sofort(7),
+    GuestPass(8),
+    WebMoney(9),
+    MoneyBookers(10),
+    AliPay(11),
+    Yandex(12),
+    Kiosk(13),
+    Qiwi(14),
+    GameStop(15),
+    HardwarePromo(16),
+    MoPay(17),
+    BoletoBancario(18),
+    BoaCompraGold(19),
+    BancoDoBrasilOnline(20),
+    ItauOnline(21),
+    BradescoOnline(22),
+    Pagseguro(23),
+    VisaBrazil(24),
+    AmexBrazil(25),
+    Aura(26),
+    Hipercard(27),
+    MastercardBrazil(28),
+    DinersCardBrazil(29),
+    AuthorizedDevice(30),
+    MOLPoints(31),
+    ClickAndBuy(32),
+    Beeline(33),
+    Konbini(34),
+    EClubPoints(35),
+    CreditCardJapan(36),
+    BankTransferJapan(37),
+    PayEasy(38),
+    Zong(39),
+    CultureVoucher(40),
+    BookVoucher(41),
+    HappymoneyVoucher(42),
+    ConvenientStoreVoucher(43),
+    GameVoucher(44),
+    Multibanco(45),
+    Payshop(46),
+    MaestroBoaCompra(47),
+    OXXO(48),
+    ToditoCash(49),
+    Carnet(50),
+    SPEI(51),
+    ThreePay(52),
+    IsBank(53),
+    Garanti(54),
+    Akbank(55),
+    YapiKredi(56),
+    Halkbank(57),
+    BankAsya(58),
+    Finansbank(59),
+    DenizBank(60),
+    PTT(61),
+    CashU(62),
+    SantanderRio(63),
+    AutoGrant(64),
+    WebMoneyJapan(65),
+    OneCard(66),
+    PSE(67),
+    Exito(68),
+    Efecty(69),
+    Paloto(70),
+    PinValidda(71),
+    MangirKart(72),
+    BancoCreditoDePeru(73),
+    BBVAContinental(74),
+    SafetyPay(75),
+    PagoEfectivo(76),
+    Trustly(77),
+    UnionPay(78),
+    BitCoin(79),
+    LicensedSite(80),
+    BitCash(81),
+    NetCash(82),
+    Nanaco(83),
+    Tenpay(84),
+    WeChat(85),
+    CashonDelivery(86),
+    CreditCardNodwin(87),
+    DebitCardNodwin(88),
+    NetBankingNodwin(89),
+    CashCardNodwin(90),
+    WalletNodwin(91),
+    MobileDegica(92),
+    Naranja(93),
+    Cencosud(94),
+    Cabal(95),
+    PagoFacil(96),
+    Rapipago(97),
+    BancoNacionaldeCostaRica(98),
+    BancoPoplar(99),
+    RedPagos(100),
+    SPE(101),
+    Multicaja(102),
+    RedCompra(103),
+    ZiraatBank(104),
+    VakiflarBank(105),
+    KuveytTurkBank(106),
+    EkonomiBank(107),
+    Pichincha(108),
+    PichinchaCash(109),
+    Przelewy24(110),
+    Trustpay(111),
+    POLi(112),
+    MercadoPago(113),
+    PayU(114),
+    VTCPayWallet(115),
+    MrCash(116),
+    EPS(117),
+    Interac(118),
+    VTCPayCards(119),
+    VTCPayOnlineBanking(120),
+    VisaElectronBoaCompra(121),
+    CafeFunded(122),
+    OCA(123),
+    Lider(124),
+    WebMoneySteamCardJapan(125),
+    WebMoneySteamCardTopUpJapan(126),
+    Toss(127),
+    Wallet(128),
+    Valve(129),
+    MasterComp(130),
+    Promotional(131),
+    MasterSubscription(134),
+    Payco(135),
+    MobileWalletJapan(136),
+    BoletoFlash(137),
+    PIX(138),
+    GCash(139),
+    KakaoPay(140),
+    Dana(141),
+    TrueMoney(142),
+    TouchnGo(143),
+    LinePay(144),
+    MerPay(145),
+    PayPay(146),
+    AlfaClick(147),
+    Sberbank(148),
+    YooMoney(149),
+    Tinkoff(150),
+    CashInCIS(151),
+    AuPAY(152),
+    AliPayHK(153),
+    NaverPay(154),
+    Linkaja(155),
+    ShopeePay(156),
+    GrabPay(157),
+    PayNow(158),
+    OnlineBankingThailand(159),
+    CashOptionsThailand(160),
+    OEMTicket(256),
+    Split(512),
+    Complimentary(1024),
+    FamilyGroup(1025),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EPaymentMethod? = entries.firstOrNull { it.codeValue == code }
+    }
+}
+
+enum class EDepotFileFlag(private val codeValue: Int) {
+    UserConfig(1),
+    VersionedUserConfig(2),
+    Encrypted(4),
+    ReadOnly(8),
+    Hidden(16),
+    Executable(32),
+    Directory(64),
+    CustomExecutable(128),
+    InstallScript(256),
+    Symlink(512),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EnumSet<EDepotFileFlag> {
+            val set = EnumSet.noneOf(EDepotFileFlag::class.java)
+            for (e in entries) if ((e.codeValue and code) == e.codeValue) set.add(e)
+            return set
+        }
+
+        fun code(flags: EnumSet<EDepotFileFlag>): Int {
+            var c = 0
+            for (f in flags) c = c or f.codeValue
+            return c
+        }
+    }
+}
+
+enum class ELicenseFlags(private val codeValue: Int) {
+    None(0),
+    Renew(0x01),
+    RenewalFailed(0x02),
+    Pending(0x04),
+    Expired(0x08),
+    CancelledByUser(0x10),
+    CancelledByAdmin(0x20),
+    LowViolenceContent(0x40),
+    ImportedFromSteam2(0x80),
+    ForceRunRestriction(0x100),
+    RegionRestrictionExpired(0x200),
+    CancelledByFriendlyFraudLock(0x400),
+    NotActivated(0x800),
+    PendingRefund(0x2000),
+    Borrowed(0x4000),
+    ReleaseStateOverride(0x8000),
+    CancelledByPartner(0x40000),
+    NonPermanent(0x80000),
+    PreferredOwner(0x100000),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EnumSet<ELicenseFlags> {
+            val set = EnumSet.noneOf(ELicenseFlags::class.java)
+            for (e in entries) if ((e.codeValue and code) == e.codeValue) set.add(e)
+            return set
+        }
+
+        fun code(flags: EnumSet<ELicenseFlags>): Int {
+            var c = 0
+            for (f in flags) c = c or f.codeValue
+            return c
+        }
+    }
+}
+
+enum class EClientPersonaStateFlag(private val codeValue: Int) {
+    Status(1),
+    PlayerName(2),
+    QueryPort(4),
+    SourceID(8),
+    Presence(16),
+    LastSeen(64),
+    UserClanRank(128),
+    GameExtraInfo(256),
+    GameDataBlob(512),
+    ClanData(1024),
+    Facebook(2048),
+    RichPresence(4096),
+    Broadcast(8192),
+    Watching(16384),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EnumSet<EClientPersonaStateFlag> {
+            val set = EnumSet.noneOf(EClientPersonaStateFlag::class.java)
+            for (e in entries) if ((e.codeValue and code) == e.codeValue) set.add(e)
+            return set
+        }
+
+        fun code(flags: EnumSet<EClientPersonaStateFlag>): Int {
+            var c = 0
+            for (f in flags) c = c or f.codeValue
+            return c
+        }
+    }
+}
+
+enum class EPersonaStateFlag(private val codeValue: Int) {
+    HasRichPresence(1),
+    InJoinableGame(2),
+    Golden(4),
+    RemotePlayTogether(8),
+    ClientTypeWeb(256),
+    ClientTypeMobile(512),
+    ClientTypeTenfoot(1024),
+    ClientTypeVR(2048),
+    LaunchTypeGamepad(4096),
+    LaunchTypeCompatTool(8192),
+    ;
+
+    fun code(): Int = codeValue
+
+    companion object {
+        fun from(code: Int): EnumSet<EPersonaStateFlag> {
+            val set = EnumSet.noneOf(EPersonaStateFlag::class.java)
+            for (e in entries) if ((e.codeValue and code) == e.codeValue) set.add(e)
+            return set
+        }
+
+        fun code(flags: EnumSet<EPersonaStateFlag>): Int {
+            var c = 0
+            for (f in flags) c = c or f.codeValue
+            return c
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/friends/FriendsDrawerContent.kt b/app/src/main/feature/stores/steam/friends/FriendsDrawerContent.kt
new file mode 100644
index 000000000..19037440b
--- /dev/null
+++ b/app/src/main/feature/stores/steam/friends/FriendsDrawerContent.kt
@@ -0,0 +1,696 @@
+package com.winlator.cmod.feature.stores.steam.friends
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import coil.compose.AsyncImage
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val BgDark = Color(0xFF18181D)
+private val SurfaceDark = Color(0xFF1E252E)
+private val CardBorder = Color(0xFF2A2A3A)
+private val Accent = Color(0xFF1A9FFF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF7A8FA8)
+private val StatusOnline = Color(0xFF3FB950)
+private val StatusAway = Color(0xFFF0C040)
+private val StatusOffline = Color(0xFF6E7681)
+private val WsBg = Color(0xFF12121B)
+private val AccentGlow = Color(0xFF58A6FF)
+
+private fun statusColor(state: EPersonaState): Color = when (state) {
+    EPersonaState.Online, EPersonaState.LookingToTrade, EPersonaState.LookingToPlay -> StatusOnline
+    EPersonaState.Away, EPersonaState.Snooze, EPersonaState.Busy -> StatusAway
+    else -> StatusOffline
+}
+
+@Composable
+private fun statusLabel(state: EPersonaState): String = when (state) {
+    EPersonaState.Online -> stringResource(R.string.stores_accounts_status_online)
+    EPersonaState.Away -> stringResource(R.string.stores_accounts_status_away)
+    EPersonaState.Snooze -> stringResource(R.string.steam_presence_snooze)
+    EPersonaState.Busy -> stringResource(R.string.steam_presence_busy)
+    EPersonaState.LookingToTrade -> stringResource(R.string.steam_presence_looking_to_trade)
+    EPersonaState.LookingToPlay -> stringResource(R.string.steam_presence_looking_to_play)
+    EPersonaState.Invisible -> stringResource(R.string.stores_accounts_status_invisible)
+    else -> stringResource(R.string.stores_accounts_status_offline)
+}
+
+@Composable
+fun FriendsDrawerContent(
+    isOpen: Boolean,
+    self: SteamFriend,
+    friends: List<SteamFriendEntry>,
+    installedGameIds: Set<Int>,
+    chatEnabled: Boolean,
+    onSetState: (EPersonaState) -> Unit,
+    onOpenChat: (SteamFriendEntry) -> Unit,
+    onJoinGame: (SteamFriendEntry) -> Unit,
+    onPlayGame: (SteamFriendEntry) -> Unit,
+) {
+    val inGame = friends.filter { it.isPlayingGame }.sortedBy { it.name.lowercase() }
+    val online = friends.filter { it.isOnline && !it.isPlayingGame }.sortedBy { it.name.lowercase() }
+    val offline = friends.filter { !it.isOnline }.sortedBy { it.name.lowercase() }
+
+    val context = LocalContext.current
+    val bridge = (context as? com.winlator.cmod.app.shell.UnifiedActivity)?.friendsDrawerNavBridge
+    val navRegistry = remember(bridge) { PaneNavRegistry(initialSignal = bridge?.navSignal ?: -1) }
+    navRegistry.controllerActive = bridge?.controllerActive ?: false
+    LaunchedEffect(navRegistry, bridge?.navSignal) {
+        navRegistry.processNav(bridge?.navSignal ?: 0, bridge?.navDir ?: 0)
+    }
+    LaunchedEffect(isOpen) { if (isOpen) navRegistry.reset() }
+
+    CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+        ModalDrawerSheet(
+            drawerShape = RectangleShape,
+            drawerContainerColor = WsBg,
+            drawerContentColor = TextPrimary,
+            windowInsets = WindowInsets(0, 0, 0, 0),
+            modifier = Modifier.width(332.dp),
+        ) {
+            Column(
+                Modifier
+                    .fillMaxHeight()
+                    .statusBarsPadding()
+                    .padding(horizontal = 14.dp, vertical = 16.dp),
+            ) {
+                SelfCard(self = self, chatEnabled = chatEnabled, onSetState = onSetState)
+                Spacer(Modifier.height(14.dp))
+                if (chatEnabled) {
+                    Text(
+                        text = stringResource(R.string.steam_friends_count, friends.count { it.isOnline }),
+                        style = androidx.compose.material3.MaterialTheme.typography.labelMedium,
+                        color = TextSecondary,
+                        modifier = Modifier.padding(start = 4.dp, bottom = 8.dp),
+                    )
+                }
+                Column(
+                    Modifier.fillMaxWidth().weight(1f).verticalScroll(rememberScrollState()),
+                    verticalArrangement = Arrangement.spacedBy(6.dp),
+                ) {
+                    if (!chatEnabled) {
+                        Text(
+                            stringResource(R.string.steam_friends_chat_off),
+                            color = TextSecondary,
+                            style = androidx.compose.material3.MaterialTheme.typography.bodySmall,
+                            modifier = Modifier.padding(12.dp),
+                        )
+                    } else {
+                        if (inGame.isNotEmpty()) {
+                            SectionHeader(stringResource(R.string.steam_friends_section_in_game, inGame.size))
+                            inGame.forEach {
+                                InGameFriendCard(it, it.gameAppId in installedGameIds, onOpenChat, onJoinGame, onPlayGame)
+                            }
+                        }
+                        if (online.isNotEmpty()) {
+                            SectionHeader(stringResource(R.string.steam_friends_section_online, online.size))
+                            online.forEach {
+                                FriendRow(it, it.gameAppId in installedGameIds, onOpenChat, onJoinGame, onPlayGame)
+                            }
+                        }
+                        if (offline.isNotEmpty()) {
+                            SectionHeader(stringResource(R.string.steam_friends_section_offline, offline.size))
+                            offline.forEach {
+                                FriendRow(it, it.gameAppId in installedGameIds, onOpenChat, onJoinGame, onPlayGame)
+                            }
+                        }
+                        if (friends.isEmpty()) {
+                            Text(
+                                stringResource(R.string.steam_friends_none_loaded),
+                                color = TextSecondary,
+                                style = androidx.compose.material3.MaterialTheme.typography.bodySmall,
+                                modifier = Modifier.padding(12.dp),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun SectionHeader(text: String) {
+    Text(
+        text = text,
+        style = androidx.compose.material3.MaterialTheme.typography.labelSmall,
+        color = TextSecondary,
+        fontWeight = FontWeight.SemiBold,
+        modifier = Modifier.padding(start = 4.dp, top = 8.dp, bottom = 2.dp),
+    )
+}
+
+@Composable
+private fun SelfCard(self: SteamFriend, chatEnabled: Boolean, onSetState: (EPersonaState) -> Unit) {
+    var expanded by remember { mutableStateOf(false) }
+    var showChatSettings by remember { mutableStateOf(false) }
+    // Chat off => you're offline; show that on the card and hide the status picker.
+    val displayState = if (chatEnabled) self.state else EPersonaState.Offline
+    Surface(
+        shape = RoundedCornerShape(16.dp),
+        color = SurfaceDark,
+        border = BorderStroke(1.dp, CardBorder),
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Column(Modifier.padding(14.dp)) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Avatar(self.avatarHashUrl(), 44.dp, statusColor(displayState))
+                Spacer(Modifier.width(12.dp))
+                Column(Modifier.weight(1f)) {
+                    Text(
+                        self.name.ifBlank { stringResource(R.string.steam_friends_self_you) },
+                        color = TextPrimary,
+                        fontWeight = FontWeight.Bold,
+                        style = androidx.compose.material3.MaterialTheme.typography.titleSmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Box(Modifier.size(8.dp).clip(CircleShape).background(statusColor(displayState)))
+                        Spacer(Modifier.width(6.dp))
+                        Text(
+                            statusLabel(displayState),
+                            color = TextSecondary,
+                            style = androidx.compose.material3.MaterialTheme.typography.bodySmall,
+                        )
+                    }
+                }
+                Icon(
+                    Icons.Outlined.Settings,
+                    contentDescription = stringResource(R.string.steam_friends_settings),
+                    tint = TextSecondary,
+                    modifier = Modifier
+                        .clip(CircleShape)
+                        .paneNavItem(onActivate = { showChatSettings = true }, tapToSelect = true)
+                        .clickable { showChatSettings = true }
+                        .padding(6.dp)
+                        .size(20.dp),
+                )
+                if (chatEnabled) {
+                    Spacer(Modifier.width(2.dp))
+                    Text(
+                        if (expanded) "▲" else "▼",
+                        color = TextSecondary,
+                        modifier = Modifier
+                            .clip(CircleShape)
+                            .paneNavItem(onActivate = { expanded = !expanded }, tapToSelect = true)
+                            .clickable { expanded = !expanded }
+                            .padding(6.dp),
+                    )
+                }
+            }
+            AnimatedVisibility(visible = expanded && chatEnabled) {
+                Column {
+                    Spacer(Modifier.height(8.dp))
+                    HorizontalDivider(color = TextSecondary.copy(alpha = 0.15f))
+                    StatusOption(stringResource(R.string.stores_accounts_status_online), StatusOnline) { onSetState(EPersonaState.Online); expanded = false }
+                    StatusOption(stringResource(R.string.stores_accounts_status_away), StatusAway) { onSetState(EPersonaState.Away); expanded = false }
+                    StatusOption(stringResource(R.string.stores_accounts_status_invisible), StatusOffline) { onSetState(EPersonaState.Invisible); expanded = false }
+                }
+            }
+        }
+    }
+    if (showChatSettings) {
+        ChatSettingsDialog { showChatSettings = false }
+    }
+}
+
+@Composable
+private fun ChatSettingsDialog(onDismiss: () -> Unit) {
+    val context = LocalContext.current
+    var master by remember { mutableStateOf(PrefManager.chatServiceEnabled) }
+    var notifications by remember { mutableStateOf(PrefManager.chatNotificationsEnabled) }
+    var heads by remember { mutableStateOf(PrefManager.chatHeadsEnabled) }
+    var autoHide by remember { mutableStateOf(PrefManager.chatHeadsAutoHide) }
+    var inGame by remember { mutableStateOf(PrefManager.chatInGameEnabled) }
+    var stayRunning by remember { mutableStateOf(PrefManager.chatStayRunningOnExit) }
+    val registry = remember { PaneNavRegistry() }
+    LaunchedEffect(stayRunning) {
+        if (!stayRunning && heads) {
+            heads = false
+            PrefManager.chatHeadsEnabled = false
+            ChatOverlayService.stop(context)
+        }
+    }
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+            DialogPaneNav(registry, onDismiss = onDismiss)
+            Surface(
+                shape = RoundedCornerShape(18.dp),
+                color = WsBg,
+                border = BorderStroke(1.dp, CardBorder),
+                modifier = Modifier.fillMaxWidth(0.94f),
+            ) {
+            Column(Modifier.fillMaxWidth()) {
+                Row(
+                    modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = 10.dp, bottom = 10.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(10.dp),
+                ) {
+                    Box(
+                        Modifier
+                            .size(34.dp)
+                            .clip(RoundedCornerShape(9.dp))
+                            .background(Accent.copy(alpha = 0.16f)),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            Icons.Outlined.Settings,
+                            contentDescription = null,
+                            tint = AccentGlow,
+                            modifier = Modifier.size(19.dp),
+                        )
+                    }
+                    Text(
+                        stringResource(R.string.steam_chat_settings_title),
+                        modifier = Modifier.weight(1f),
+                        color = TextPrimary,
+                        fontWeight = FontWeight.Bold,
+                        style = MaterialTheme.typography.titleSmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp).paneNavItem(onActivate = onDismiss, navRow = 0, navCol = 0)) {
+                        Icon(
+                            Icons.Outlined.Close,
+                            contentDescription = stringResource(R.string.steam_common_back),
+                            tint = TextSecondary,
+                            modifier = Modifier.size(20.dp),
+                        )
+                    }
+                }
+                HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                Row(
+                    modifier = Modifier.padding(18.dp).fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(20.dp),
+                ) {
+                    Column(Modifier.weight(1f)) {
+                        ChatSettingToggle(
+                            stringResource(R.string.steam_chat_setting_service),
+                            stringResource(R.string.steam_chat_setting_service_desc),
+                            master,
+                            navRow = 1,
+                            navCol = 0,
+                            isEntry = true,
+                        ) { v -> master = v; SteamService.setChatServiceEnabled(context, v) }
+                        ChatSettingToggle(
+                            stringResource(R.string.steam_chat_setting_notifications),
+                            stringResource(R.string.steam_chat_setting_notifications_desc),
+                            notifications,
+                            navRow = 2,
+                            navCol = 0,
+                            enabled = master,
+                        ) { v -> notifications = v; PrefManager.chatNotificationsEnabled = v }
+                        ChatSettingToggle(
+                            stringResource(R.string.steam_chat_setting_heads),
+                            stringResource(R.string.steam_chat_setting_heads_desc),
+                            heads,
+                            navRow = 3,
+                            navCol = 0,
+                            enabled = master && stayRunning,
+                        ) { v ->
+                            if (v) {
+                                if (android.provider.Settings.canDrawOverlays(context)) {
+                                    heads = true
+                                    PrefManager.chatHeadsEnabled = true
+                                    ChatOverlayService.start(context)
+                                } else {
+                                    runCatching {
+                                        context.startActivity(
+                                            android.content.Intent(
+                                                android.provider.Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                                                android.net.Uri.parse("package:" + context.packageName),
+                                            ).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK),
+                                        )
+                                    }
+                                }
+                            } else {
+                                heads = false
+                                PrefManager.chatHeadsEnabled = false
+                                ChatOverlayService.stop(context)
+                            }
+                        }
+                    }
+                    Column(Modifier.weight(1f)) {
+                        ChatSettingToggle(
+                            stringResource(R.string.steam_chat_setting_autohide),
+                            stringResource(R.string.steam_chat_setting_autohide_desc),
+                            autoHide,
+                            navRow = 1,
+                            navCol = 1,
+                            enabled = master,
+                        ) { v -> autoHide = v; PrefManager.chatHeadsAutoHide = v }
+                        ChatSettingToggle(
+                            stringResource(R.string.steam_chat_setting_ingame),
+                            stringResource(R.string.steam_chat_setting_ingame_desc),
+                            inGame,
+                            navRow = 2,
+                            navCol = 1,
+                            enabled = master,
+                        ) { v -> inGame = v; PrefManager.chatInGameEnabled = v }
+                        ChatSettingToggle(
+                            stringResource(R.string.steam_chat_setting_stay_running),
+                            stringResource(R.string.steam_chat_setting_stay_running_desc),
+                            stayRunning,
+                            navRow = 3,
+                            navCol = 1,
+                            enabled = master,
+                        ) { v -> stayRunning = v; PrefManager.chatStayRunningOnExit = v }
+                    }
+                }
+            }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ChatSettingToggle(
+    title: String,
+    desc: String,
+    checked: Boolean,
+    navRow: Int,
+    navCol: Int,
+    isEntry: Boolean = false,
+    enabled: Boolean = true,
+    onChange: (Boolean) -> Unit,
+) {
+    val contentAlpha = if (enabled) 1f else 0.4f
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .paneNavItem(
+                cornerRadius = 8.dp,
+                onActivate = { if (enabled) onChange(!checked) },
+                tapToSelect = true,
+                navRow = navRow,
+                navCol = navCol,
+                isEntry = isEntry,
+            )
+            .padding(vertical = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(Modifier.weight(1f)) {
+            Text(title, color = TextPrimary.copy(alpha = contentAlpha), fontWeight = FontWeight.SemiBold, style = MaterialTheme.typography.bodyMedium)
+            Text(desc, color = TextSecondary.copy(alpha = contentAlpha), style = MaterialTheme.typography.labelSmall)
+        }
+        Spacer(Modifier.width(12.dp))
+        Switch(
+            checked = checked,
+            // Keep the callback non-null so the switch keeps its 48dp minimum interactive size;
+            // `enabled = false` still blocks interaction. A null callback drops that min size and
+            // makes disabled switches shrink out of alignment.
+            onCheckedChange = onChange,
+            enabled = enabled,
+            colors = SwitchDefaults.colors(checkedTrackColor = Accent, checkedThumbColor = Color.White),
+        )
+    }
+}
+
+@Composable
+private fun StatusOption(label: String, dot: Color, onClick: () -> Unit) {
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(8.dp))
+            .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, tapToSelect = true)
+            .clickable(onClick = onClick)
+            .padding(vertical = 10.dp, horizontal = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(Modifier.size(8.dp).clip(CircleShape).background(dot))
+        Spacer(Modifier.width(10.dp))
+        Text(label, color = TextPrimary, style = androidx.compose.material3.MaterialTheme.typography.bodyMedium)
+    }
+}
+
+@Composable
+private fun FriendActionButton(label: String, icon: ImageVector, onClick: () -> Unit) {
+    Surface(
+        shape = RoundedCornerShape(8.dp),
+        color = Accent.copy(alpha = 0.18f),
+        border = BorderStroke(1.dp, Accent.copy(alpha = 0.6f)),
+        modifier = Modifier
+            .paneNavItem(cornerRadius = 8.dp, onActivate = onClick, tapToSelect = true)
+            .clickable(onClick = onClick),
+    ) {
+        Row(
+            Modifier.padding(horizontal = 10.dp, vertical = 6.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(icon, contentDescription = label, tint = Accent, modifier = Modifier.size(16.dp))
+            Spacer(Modifier.width(4.dp))
+            Text(label, color = Accent, style = MaterialTheme.typography.labelMedium)
+        }
+    }
+}
+
+@Composable
+private fun FriendActionButtons(
+    friend: SteamFriendEntry,
+    gameInstalled: Boolean,
+    onJoinGame: (SteamFriendEntry) -> Unit,
+    onPlayGame: (SteamFriendEntry) -> Unit,
+) {
+    when {
+        friend.isJoinable -> {
+            Spacer(Modifier.width(8.dp))
+            FriendActionButton(stringResource(R.string.steam_friends_join), Icons.Outlined.PlayArrow) { onJoinGame(friend) }
+        }
+        friend.isPlayingGame && gameInstalled -> {
+            Spacer(Modifier.width(8.dp))
+            FriendActionButton(stringResource(R.string.steam_friends_play), Icons.Outlined.SportsEsports) { onPlayGame(friend) }
+        }
+    }
+}
+
+private fun longPressFriend(
+    context: android.content.Context,
+    friend: SteamFriendEntry,
+    onOpenChat: (SteamFriendEntry) -> Unit,
+) {
+    if (PrefManager.chatHeadsEnabled && android.provider.Settings.canDrawOverlays(context)) {
+        ChatOverlayService.openHead(context, friend.steamId)
+    } else {
+        onOpenChat(friend)
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun InGameFriendCard(
+    friend: SteamFriendEntry,
+    gameInstalled: Boolean,
+    onOpenChat: (SteamFriendEntry) -> Unit,
+    onJoinGame: (SteamFriendEntry) -> Unit,
+    onPlayGame: (SteamFriendEntry) -> Unit,
+) {
+    val ctx = LocalContext.current
+    Surface(
+        shape = RoundedCornerShape(10.dp),
+        color = Accent.copy(alpha = 0.07f),
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(10.dp))
+            .paneNavItem(cornerRadius = 10.dp, onActivate = { onOpenChat(friend) })
+            .combinedClickable(
+                onClick = { onOpenChat(friend) },
+                onLongClick = { longPressFriend(ctx, friend, onOpenChat) },
+            ),
+    ) {
+        Row(
+            Modifier.padding(horizontal = 8.dp, vertical = 7.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Avatar(friend.avatarUrl, 40.dp, StatusOnline)
+            Spacer(Modifier.width(10.dp))
+            Column(Modifier.weight(1f)) {
+                Text(
+                    friend.name.ifBlank { friend.steamId.toString() },
+                    color = TextPrimary,
+                    fontWeight = FontWeight.Medium,
+                    style = androidx.compose.material3.MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Row(
+                    Modifier.padding(top = 3.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    if (friend.gameCapsuleUrl != null) {
+                        AsyncImage(
+                            model = friend.gameCapsuleUrl,
+                            contentDescription = null,
+                            contentScale = ContentScale.Crop,
+                            modifier = Modifier
+                                .width(56.dp)
+                                .height(21.dp)
+                                .clip(RoundedCornerShape(3.dp))
+                                .background(SurfaceDark),
+                        )
+                        Spacer(Modifier.width(7.dp))
+                    }
+                    Text(
+                        friend.gameName.ifBlank { stringResource(R.string.steam_friends_in_game) },
+                        color = StatusOnline,
+                        fontWeight = FontWeight.Medium,
+                        style = androidx.compose.material3.MaterialTheme.typography.labelMedium,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+            FriendActionButtons(friend, gameInstalled, onJoinGame, onPlayGame)
+        }
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun FriendRow(
+    friend: SteamFriendEntry,
+    gameInstalled: Boolean,
+    onOpenChat: (SteamFriendEntry) -> Unit,
+    onJoinGame: (SteamFriendEntry) -> Unit,
+    onPlayGame: (SteamFriendEntry) -> Unit,
+) {
+    val ctx = LocalContext.current
+    val scale by animateFloatAsState(1f, label = "row")
+    Surface(
+        shape = RoundedCornerShape(10.dp),
+        color = if (friend.isPlayingGame) Accent.copy(alpha = 0.07f) else Color.Transparent,
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(10.dp))
+            .paneNavItem(cornerRadius = 10.dp, onActivate = { onOpenChat(friend) })
+            .combinedClickable(
+                onClick = { onOpenChat(friend) },
+                onLongClick = { longPressFriend(ctx, friend, onOpenChat) },
+            ),
+    ) {
+        Row(
+            Modifier.padding(horizontal = 8.dp, vertical = 7.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Avatar(friend.avatarUrl, 40.dp, statusColor(friend.state), dim = !friend.isOnline)
+            Spacer(Modifier.width(10.dp))
+            Column(Modifier.weight(1f)) {
+                Text(
+                    friend.name.ifBlank { friend.steamId.toString() },
+                    color = if (friend.isOnline) TextPrimary else TextSecondary,
+                    fontWeight = FontWeight.Medium,
+                    style = androidx.compose.material3.MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                val sub = when {
+                    friend.isPlayingGame -> friend.gameName.ifBlank { stringResource(R.string.steam_friends_in_game) }
+                    else -> statusLabel(friend.state)
+                }
+                Text(
+                    sub,
+                    color = if (friend.isPlayingGame) StatusOnline else TextSecondary,
+                    style = androidx.compose.material3.MaterialTheme.typography.labelSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+            FriendActionButtons(friend, gameInstalled, onJoinGame, onPlayGame)
+        }
+    }
+}
+
+@Composable
+private fun Avatar(url: String?, size: androidx.compose.ui.unit.Dp, ring: Color, dim: Boolean = false) {
+    Box(
+        Modifier
+            .size(size)
+            .clip(CircleShape)
+            .background(SurfaceDark),
+        contentAlignment = Alignment.Center,
+    ) {
+        if (url != null) {
+            AsyncImage(
+                model = url,
+                contentDescription = null,
+                contentScale = ContentScale.Crop,
+                modifier = Modifier.size(size).clip(CircleShape),
+                alpha = if (dim) 0.55f else 1f,
+            )
+        }
+    }
+}
+
+private fun SteamFriend.avatarHashUrl(): String? =
+    avatarHash.takeIf { it.isNotBlank() }
+        ?.let { "https://avatars.akamai.steamstatic.com/${it}_full.jpg" }
diff --git a/app/src/main/feature/stores/steam/friends/SteamChatScreen.kt b/app/src/main/feature/stores/steam/friends/SteamChatScreen.kt
new file mode 100644
index 000000000..57c1dd4b1
--- /dev/null
+++ b/app/src/main/feature/stores/steam/friends/SteamChatScreen.kt
@@ -0,0 +1,411 @@
+package com.winlator.cmod.feature.stores.steam.friends
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.Send
+import androidx.compose.material.icons.outlined.Image
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.winlator.cmod.R
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.unit.dp
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import coil.compose.AsyncImage
+import com.winlator.cmod.feature.stores.steam.data.SteamChatMessage
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.service.SteamService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+private val WsBg = Color(0xFF12121B)
+private val CardBorder = Color(0xFF2A2A3A)
+private val BgDark = Color(0xFF171722)
+private val SurfaceDark = Color(0xFF1B1B27)
+private val Accent = Color(0xFF1A9FFF)
+private val AccentGlow = Color(0xFF58A6FF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF93A6BC)
+
+private val IMG_BBCODE = Regex("""\[img](.+?)\[/img]""", RegexOption.IGNORE_CASE)
+// Steam delivers chat images as [img src=URL] or as a bare UGC URL.
+private val IMG_SRC = Regex("""\[img\b[^]]*?\bsrc=["']?([^\s"'\]]+)""", RegexOption.IGNORE_CASE)
+private val BARE_IMG_URL = Regex("""https?://\S+\.(?:png|jpe?g|gif|webp|bmp)""", RegexOption.IGNORE_CASE)
+// Public displayable Steam UGC images (not /filedownload/ endpoints, which need auth).
+private val STEAM_IMG_URL = Regex("""https?://\S*images\.steamusercontent\.com/ugc/\S+""", RegexOption.IGNORE_CASE)
+
+private fun imageUrlOf(text: String): String? {
+    val t = text.trim()
+    return IMG_BBCODE.find(t)?.groupValues?.getOrNull(1)
+        ?: IMG_SRC.find(t)?.groupValues?.getOrNull(1)
+        ?: STEAM_IMG_URL.find(t)?.value
+        ?: BARE_IMG_URL.find(t)?.value
+}
+
+@Composable
+fun SteamChatScreen(
+    friend: SteamFriendEntry,
+    onClose: () -> Unit,
+) {
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
+    val messages = remember { mutableStateListOf<SteamChatMessage>() }
+    var input by remember { mutableStateOf("") }
+    var loading by remember { mutableStateOf(true) }
+    var sending by remember { mutableStateOf(false) }
+    var uploading by remember { mutableStateOf(false) }
+    val listState = rememberLazyListState()
+
+    val pickImage = rememberLauncherForActivityResult(
+        ActivityResultContracts.PickVisualMedia(),
+    ) { uri ->
+        if (uri != null && !uploading) {
+            uploading = true
+            scope.launch {
+                val bytes = withContext(Dispatchers.IO) {
+                    runCatching { context.contentResolver.openInputStream(uri)?.use { it.readBytes() } }
+                        .getOrNull()
+                }
+                if (bytes == null || bytes.isEmpty()) {
+                    uploading = false
+                    return@launch
+                }
+                val mime = context.contentResolver.getType(uri) ?: "image/png"
+                val ext = when {
+                    mime.contains("jpeg") || mime.contains("jpg") -> "jpeg"
+                    mime.contains("gif") -> "gif"
+                    mime.contains("webp") -> "webp"
+                    else -> "png"
+                }
+                val url = SteamService.instance?.sendChatImage(friend.steamId, bytes, "image.$ext")
+                if (url.isNullOrBlank()) {
+                    messages.add(SteamChatMessage(fromSelf = true, text = context.getString(R.string.steam_chat_image_failed), timestamp = 0))
+                    listState.animateScrollToItem(messages.size - 1)
+                }
+                uploading = false
+            }
+        }
+    }
+
+    LaunchedEffect(friend.steamId) {
+        loading = true
+        messages.clear()
+        SteamService.instance?.setActiveConversation(friend.steamId)
+        messages.addAll(SteamService.instance?.loadChatHistory(friend.steamId) ?: emptyList())
+        loading = false
+        if (messages.isNotEmpty()) listState.scrollToItem(messages.size - 1)
+        SteamService.instance?.incomingChat?.collect { (fid, m) ->
+            if (fid != friend.steamId) return@collect
+            val known = messages.map { it.timestamp to it.ordinal }.toHashSet()
+            if (m.timestamp != 0 && (m.timestamp to m.ordinal) in known) return@collect
+            val mImg = imageUrlOf(m.text)
+            val optIdx = if (m.fromSelf) {
+                messages.indexOfFirst {
+                    it.fromSelf && it.timestamp == 0 &&
+                        (it.text == m.text || (mImg != null && imageUrlOf(it.text) == mImg))
+                }
+            } else -1
+            if (optIdx >= 0) {
+                messages[optIdx] = m
+            } else {
+                messages.add(m)
+                listState.animateScrollToItem(messages.size - 1)
+            }
+        }
+    }
+    DisposableEffect(friend.steamId) {
+        onDispose { SteamService.instance?.clearActiveConversation(friend.steamId) }
+    }
+
+    fun send() {
+        val text = input.trim()
+        if (text.isEmpty() || sending) return
+        sending = true
+        input = ""
+        val optimistic = SteamChatMessage(fromSelf = true, text = text, timestamp = 0, ordinal = 0)
+        messages.add(optimistic)
+        scope.launch {
+            listState.animateScrollToItem(messages.size - 1)
+            val ok = SteamService.instance?.sendChatMessage(friend.steamId, text) ?: false
+            if (!ok) {
+                val idx = messages.indexOf(optimistic)
+                if (idx >= 0) messages[idx] = optimistic.copy(text = "$text  " + context.getString(R.string.steam_chat_not_sent))
+            }
+            sending = false
+        }
+    }
+
+    val registry = remember { PaneNavRegistry() }
+    val fieldFocus = remember { FocusRequester() }
+    registry.onEdgeUp = { scope.launch { runCatching { listState.animateScrollBy(-280f) } } }
+    registry.onEdgeDown = { scope.launch { runCatching { listState.animateScrollBy(280f) } } }
+
+    Dialog(
+        onDismissRequest = onClose,
+        properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
+    ) {
+        CompositionLocalProvider(LocalPaneNav provides registry) {
+            DialogPaneNav(registry, onDismiss = onClose)
+            Surface(
+                shape = RoundedCornerShape(18.dp),
+                color = WsBg,
+                border = BorderStroke(1.dp, CardBorder),
+                modifier = Modifier
+                    .fillMaxWidth(0.95f)
+                    .fillMaxHeight(0.95f)
+                    .imePadding(),
+            ) {
+                Column(Modifier.fillMaxSize()) {
+                    Row(
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(start = 14.dp, end = 8.dp, top = 10.dp, bottom = 10.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Box(
+                            Modifier.size(40.dp).clip(CircleShape).background(BgDark),
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            if (friend.avatarUrl != null) {
+                                AsyncImage(
+                                    model = friend.avatarUrl,
+                                    contentDescription = null,
+                                    contentScale = ContentScale.Crop,
+                                    modifier = Modifier.size(40.dp).clip(CircleShape),
+                                )
+                            }
+                        }
+                        Spacer(Modifier.width(12.dp))
+                        Column(Modifier.weight(1f)) {
+                            Text(
+                                friend.name.ifBlank { friend.steamId.toString() },
+                                color = TextPrimary,
+                                fontWeight = FontWeight.Bold,
+                                style = MaterialTheme.typography.titleMedium,
+                            )
+                            Text(
+                                if (friend.isPlayingGame) friend.gameName.ifBlank { stringResource(R.string.steam_friends_in_game) }
+                                else if (friend.isOnline) stringResource(R.string.stores_accounts_status_online) else stringResource(R.string.stores_accounts_status_offline),
+                                color = if (friend.isOnline) Accent else TextSecondary,
+                                style = MaterialTheme.typography.labelSmall,
+                            )
+                        }
+                        IconButton(
+                            onClick = onClose,
+                            modifier = Modifier.size(36.dp).paneNavItem(cornerRadius = 18.dp, onActivate = onClose, tapToSelect = true, navRow = 0, navCol = 0),
+                        ) {
+                            Icon(Icons.Outlined.Close, contentDescription = stringResource(R.string.steam_common_back), tint = TextSecondary)
+                        }
+                    }
+                    HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+
+                    Box(Modifier.weight(1f).fillMaxWidth()) {
+                        if (loading) {
+                            CircularProgressIndicator(
+                                color = Accent,
+                                modifier = Modifier.size(28.dp).align(Alignment.Center),
+                            )
+                        } else if (messages.isEmpty()) {
+                            Text(
+                                stringResource(R.string.steam_chat_empty),
+                                color = TextSecondary,
+                                style = MaterialTheme.typography.bodyMedium,
+                                modifier = Modifier.align(Alignment.Center),
+                            )
+                        } else {
+                            LazyColumn(
+                                state = listState,
+                                modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
+                                verticalArrangement = Arrangement.spacedBy(6.dp),
+                            ) {
+                                item { Spacer(Modifier.height(8.dp)) }
+                                items(messages) { msg -> MessageBubble(msg) }
+                                item { Spacer(Modifier.height(8.dp)) }
+                            }
+                        }
+                    }
+
+                    if (uploading) {
+                        Row(
+                            Modifier.fillMaxWidth().background(SurfaceDark).padding(horizontal = 16.dp, vertical = 6.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            CircularProgressIndicator(color = Accent, strokeWidth = 2.dp, modifier = Modifier.size(16.dp))
+                            Spacer(Modifier.width(10.dp))
+                            Text(stringResource(R.string.steam_chat_uploading_image), color = TextSecondary, style = MaterialTheme.typography.labelMedium)
+                        }
+                    }
+                    HorizontalDivider(color = CardBorder, thickness = 0.5.dp)
+                    Row(
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 8.dp, vertical = 8.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        IconButton(
+                            onClick = {
+                                pickImage.launch(
+                                    PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly),
+                                )
+                            },
+                            enabled = !uploading,
+                            modifier = Modifier.size(42.dp).paneNavItem(
+                                cornerRadius = 21.dp,
+                                onActivate = {
+                                    if (!uploading) pickImage.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+                                },
+                                tapToSelect = true,
+                                navRow = 1,
+                                navCol = 0,
+                            ),
+                        ) {
+                            Icon(
+                                Icons.Outlined.Image,
+                                contentDescription = stringResource(R.string.steam_chat_send_image),
+                                tint = if (uploading) TextSecondary else Accent,
+                            )
+                        }
+                        OutlinedTextField(
+                            value = input,
+                            onValueChange = { input = it },
+                            modifier = Modifier
+                                .weight(1f)
+                                .focusRequester(fieldFocus)
+                                .paneNavItem(cornerRadius = 22.dp, onActivate = { runCatching { fieldFocus.requestFocus() } }, navRow = 1, navCol = 1, isEntry = true),
+                            placeholder = { Text(stringResource(R.string.steam_chat_message_hint), color = TextSecondary) },
+                            maxLines = 4,
+                            shape = RoundedCornerShape(22.dp),
+                            keyboardActions = KeyboardActions(onSend = { send() }),
+                            colors = TextFieldDefaults.colors(
+                                focusedContainerColor = BgDark,
+                                unfocusedContainerColor = BgDark,
+                                focusedTextColor = TextPrimary,
+                                unfocusedTextColor = TextPrimary,
+                                cursorColor = Accent,
+                                focusedIndicatorColor = Color.Transparent,
+                                unfocusedIndicatorColor = Color.Transparent,
+                            ),
+                        )
+                        Spacer(Modifier.width(6.dp))
+                        IconButton(
+                            onClick = { send() },
+                            enabled = input.isNotBlank() && !sending,
+                            modifier = Modifier.size(42.dp).paneNavItem(cornerRadius = 21.dp, onActivate = { send() }, tapToSelect = true, navRow = 1, navCol = 2),
+                        ) {
+                            Icon(
+                                Icons.AutoMirrored.Outlined.Send,
+                                contentDescription = stringResource(R.string.steam_chat_send),
+                                tint = if (input.isNotBlank() && !sending) Accent else TextSecondary,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun MessageBubble(msg: SteamChatMessage) {
+    val imageUrl = imageUrlOf(msg.text)
+    val bubbleColor = if (msg.fromSelf) Accent.copy(alpha = 0.22f) else SurfaceDark
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = if (msg.fromSelf) Arrangement.End else Arrangement.Start,
+    ) {
+        Surface(
+            shape = RoundedCornerShape(
+                topStart = 14.dp,
+                topEnd = 14.dp,
+                bottomStart = if (msg.fromSelf) 14.dp else 4.dp,
+                bottomEnd = if (msg.fromSelf) 4.dp else 14.dp,
+            ),
+            color = bubbleColor,
+            modifier = Modifier.widthIn(max = 260.dp),
+        ) {
+            if (imageUrl != null) {
+                AsyncImage(
+                    model = imageUrl,
+                    contentDescription = stringResource(R.string.steam_chat_image),
+                    contentScale = ContentScale.Fit,
+                    modifier = Modifier
+                        .padding(4.dp)
+                        .width(236.dp)
+                        .heightIn(min = 120.dp, max = 240.dp)
+                        .clip(RoundedCornerShape(10.dp))
+                        .background(BgDark),
+                )
+            } else {
+                Text(
+                    msg.text,
+                    color = TextPrimary,
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/inventorygen/InventoryItemsGenerator.kt b/app/src/main/feature/stores/steam/inventorygen/InventoryItemsGenerator.kt
new file mode 100644
index 000000000..c005708b4
--- /dev/null
+++ b/app/src/main/feature/stores/steam/inventorygen/InventoryItemsGenerator.kt
@@ -0,0 +1,73 @@
+package com.winlator.cmod.feature.stores.steam.inventorygen
+
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+
+/**
+ * Converts a Steam Inventory item-definition archive — the JSON array returned
+ * by `IGameInventory/GetItemDefArchive` — into the two files gbe_fork's
+ * emulated steamclient consumes:
+ *
+ *  - `items.json`         — item definitions, a JSON object keyed by
+ *                           `itemdefid`. gbe_fork's `GetItemDefinitionProperty`
+ *                           reads every property VALUE with `.get<string>()`,
+ *                           so numbers and booleans from the archive are
+ *                           stringified here.
+ *  - `default_items.json` — the emulated account's starting inventory. Written
+ *                           as an empty object: a fresh inventory is correct
+ *                           for the vast majority of games (their own drop /
+ *                           grant logic populates it at runtime), and seeding
+ *                           every defined item would break economy/trading UIs.
+ */
+object InventoryItemsGenerator {
+    private const val TAG = "InventoryItemsGen"
+
+    /**
+     * Parse [archiveJson] (the raw `GetItemDefArchive` array) and write
+     * `items.json` + `default_items.json` into [configDir] (a `steam_settings`
+     * directory). Returns the number of item definitions written, 0 for an
+     * empty archive, or -1 on a parse failure.
+     */
+    fun generate(archiveJson: String, configDir: String): Int {
+        val trimmed = archiveJson.trim()
+        if (trimmed.isEmpty()) {
+            Timber.tag(TAG).i("Empty item-def archive — nothing to write")
+            return 0
+        }
+        val archive =
+            try {
+                JSONArray(trimmed)
+            } catch (e: Exception) {
+                Timber.tag(TAG).w(e, "Item-def archive is not a JSON array")
+                return -1
+            }
+
+        val items = JSONObject()
+        for (i in 0 until archive.length()) {
+            val def = archive.optJSONObject(i) ?: continue
+            // itemdefid becomes the object key; it may arrive as a number or
+            // a string on the wire.
+            val itemDefId = def.opt("itemdefid")?.toString()?.trim().orEmpty()
+            if (itemDefId.isEmpty()) continue
+
+            val value = JSONObject()
+            for (key in def.keys()) {
+                if (key == "itemdefid") continue
+                // gbe_fork requires string-valued properties — stringify all.
+                value.put(key, def.opt(key)?.toString() ?: "")
+            }
+            items.put(itemDefId, value)
+        }
+
+        val dir = File(configDir)
+        dir.mkdirs()
+        File(dir, "items.json").writeText(items.toString(2), Charsets.UTF_8)
+        // Empty starting inventory — see the class doc.
+        File(dir, "default_items.json").writeText("{}", Charsets.UTF_8)
+
+        Timber.tag(TAG).i("Wrote items.json with %d definitions to %s", items.length(), configDir)
+        return items.length()
+    }
+}
diff --git a/app/src/main/feature/stores/steam/linux/XvfbInstaller.kt b/app/src/main/feature/stores/steam/linux/XvfbInstaller.kt
new file mode 100644
index 000000000..b4ab84cf4
--- /dev/null
+++ b/app/src/main/feature/stores/steam/linux/XvfbInstaller.kt
@@ -0,0 +1,245 @@
+package com.winlator.cmod.feature.stores.steam.linux
+
+import android.content.Context
+import android.util.Log
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.shared.io.FileUtils
+import java.io.File
+import java.io.IOException
+import java.security.MessageDigest
+
+// Stages an Xvfb (X virtual framebuffer) X server inside the sniper-arm64
+// rootfs so Steam's chromehtml.so / CEF host can connect to a "real" X
+// server with all extensions Chromium probes (RENDER, GLX, XKEYBOARD,
+// XInputExtension, XFIXES, GenericEventExtension, DAMAGE, COMPOSITE).
+// Round-21 Path C (Codex round-20 ranked highest, ~80% likelihood): spawn
+// Xvfb inside proot before Steam exec; Steam connects to that display,
+// and the Proton wrapper resets DISPLAY=:0 for the GAME so the game
+// window surfaces to our Java X server. Display number is dynamic in
+// round-21d (Xvfb -displayfd picks the first free number).
+// Sniper-arm64 doesn't ship Xvfb. We bundle the Debian bullseye arm64
+// libXfont2, libfontenc, libxkbfile) plus xkbcomp (Xvfb fork+execs it on
+// every client XKB request). xkb data files (/usr/share/X11/xkb/...)
+// already exist in sniper. Total bundle: ~2.9 MB.
+// Sources: Debian 11 (bullseye) arm64:
+//   xvfb_1.20.11-1+deb11u13_arm64.deb
+//   x11-xkb-utils_7.7+5_arm64.deb
+//   libpixman-1-0_0.40.0-1.1~deb11u1_arm64.deb
+//   libXfont2_2.0.4-1_arm64.deb
+//   libfontenc1_1.1.4-1_arm64.deb
+//   libxkbfile1_1.1.0-1_arm64.deb
+object XvfbInstaller {
+
+    private const val TAG = "XvfbInstaller"
+    private const val ASSET_DIR = "xvfb-arm64"
+
+    // Sniper has merged-/usr (usr -> .). We write to files/bin and
+    // files/lib/aarch64-linux-gnu directly.
+    private const val BIN_DIR_REL = "opt/steam-runtime/files/bin"
+    private const val LIB_DIR_REL = "opt/steam-runtime/files/lib/aarch64-linux-gnu"
+    private const val DBUS_SHARE_DIR_REL = "opt/steam-runtime/files/share/dbus-1"
+
+    private val BINARIES = listOf("Xvfb", "xkbcomp")
+
+    // versioned filename to SONAME the dynamic linker resolves.
+    // libunwind.so.8 added in round-21b after Xvfb smoke-test failed with
+    // "libunwind.so.8: cannot open shared object file" (sniper doesn't ship
+    // it; codex round-21 flagged this as a likely missing dep).
+    private val LIBS = listOf(
+        "libpixman-1.so.0.40.0" to "libpixman-1.so.0",
+        "libXfont2.so.2.0.0" to "libXfont2.so.2",
+        "libfontenc.so.1.0.0" to "libfontenc.so.1",
+        "libxkbfile.so.1.0.2" to "libxkbfile.so.1",
+        "libunwind.so.8.0.1" to "libunwind.so.8",
+        "libapparmor.so.1.6.3" to "libapparmor.so.1",
+    )
+
+    private val EXTRA_LIBS = listOf(
+        "libwinnative-setxid-noop.so",
+        "libwinnative-steamwebhelper-preload.so",
+    )
+
+    private val EXTRA_EXECUTABLES = listOf(
+        "winnative-steamwebhelper-wrapper",
+        "winnative-driverquery-noop",
+    )
+
+    private val DBUS_BINARIES = listOf("dbus-daemon", "dbus-uuidgen")
+
+    private val EXPECTED_SHA256 = mapOf(
+        "Xvfb" to "1aaaefd376c73197460a7b1c62e0380657fa55bc7a7183fa821b5b27e6aaa1be",
+        "xkbcomp" to "bb001ddc4851935aad62d6ed15541c3d230d35e10f76548454640630843b7098",
+        "libpixman-1.so.0.40.0" to "e1dfb301bdc6b510d71a581f7cec1547def276fb3b50670147e89c1e42d3c0bc",
+        "libXfont2.so.2.0.0" to "9d75b5331f13968169ebc73e2b1c8ee8753142eb3524340e64afd8e4eedfbd06",
+        "libfontenc.so.1.0.0" to "70d9bc8d141ed7ce1ffbcb5f8e396a7173b8709ab5dbe96b4c584a06ad5448c1",
+        "libxkbfile.so.1.0.2" to "8d8462b7082bd7eaf1ac03e0ea195e81c2bcd52d16db7a7bcd1a258c7322ad58",
+        "libunwind.so.8.0.1" to "a6f1a0cb272655f942ae2f92334bd6b16469d0653ba533a91a7b2fe9005efe24",
+        "libapparmor.so.1.6.3" to "bedf95282b1fca7a40593d555b25bf73c335183c23f78a4286ca18e2ba496210",
+        "libwinnative-setxid-noop.so" to "7ad09849847abdfc25b249cd1795eff118d3b1f6d0a8509dea08d08ac5cecc72",
+        "libwinnative-steamwebhelper-preload.so" to "adc7371649d2bc27cf4872795400e3d049670fd8a089f6efba7023037b86e8d8",
+        "winnative-steamwebhelper-wrapper" to "654b9a4f2d8f3035d181f5f1f3787bf0af567e0698d9552ddb5bb4b0215019ed",
+        "winnative-driverquery-noop" to "bbedfe5e93b424025ad0b92351d172790a05354b0f878da8f962c7730154b7a5",
+        "dbus-daemon" to "2f50d490d9ce4e707b2253669e6f353da785a1b944bd9f10cbb98a6314dd8796",
+        "dbus-uuidgen" to "e35b5c45f75d58c0fe6d77981810858ca4988cc34d3726be893d5496b6ece45a",
+        "session.conf" to "5fd29a946587bc384d14859552bbdfd965ad1bdbc50db60b1b56b9ce8454711c",
+    )
+
+    fun binDir(context: Context): File =
+        File(ImageFs.find(context).rootDir, BIN_DIR_REL)
+
+    fun libDir(context: Context): File =
+        File(ImageFs.find(context).rootDir, LIB_DIR_REL)
+
+    private fun dbusShareDir(context: Context): File =
+        File(ImageFs.find(context).rootDir, DBUS_SHARE_DIR_REL)
+
+    fun xvfbBinary(context: Context): File =
+        File(binDir(context), "Xvfb")
+
+    @Throws(IOException::class)
+    fun ensureInstalled(context: Context) {
+        val bin = binDir(context)
+        val lib = libDir(context)
+
+        if (!bin.parentFile!!.exists()) {
+            throw IOException(
+                "sniper rootfs missing: " + bin.parentFile +
+                    " - was the runtime installed?",
+            )
+        }
+        if (!lib.exists()) {
+            throw IOException(
+                "sniper lib dir missing: " + lib + " - was the runtime installed?",
+            )
+        }
+        bin.mkdirs()
+
+        for (name in BINARIES) {
+            val asset = ASSET_DIR + "/" + name
+            val target = File(bin, name)
+            stageAsset(context, asset, target, executable = true)
+        }
+
+        for ((versioned, soname) in LIBS) {
+            val asset = ASSET_DIR + "/" + versioned
+            val targetVer = File(lib, versioned)
+            val targetSoname = File(lib, soname)
+            stageAsset(context, asset, targetVer, executable = false)
+            ensureSymlink(targetSoname, versioned)
+        }
+
+        for (name in EXTRA_LIBS) {
+            val asset = ASSET_DIR + "/" + name
+            val target = File(lib, name)
+            stageAsset(context, asset, target, executable = false)
+        }
+
+        for (name in EXTRA_EXECUTABLES) {
+            val asset = ASSET_DIR + "/" + name
+            val target = File(lib, name)
+            stageAsset(context, asset, target, executable = true)
+        }
+
+        for (name in DBUS_BINARIES) {
+            val asset = "$ASSET_DIR/dbus/$name"
+            val target = File(bin, name)
+            stageAsset(context, asset, target, executable = true)
+        }
+
+        stageAsset(
+            context,
+            "$ASSET_DIR/dbus/session.conf",
+            File(dbusShareDir(context), "session.conf"),
+            executable = false,
+        )
+
+        Log.i(TAG, "Xvfb/dbus arm64 staged: bin=" + bin + ", libs=" + lib)
+    }
+
+    private fun stageAsset(
+        context: Context,
+        asset: String,
+        dest: File,
+        executable: Boolean,
+    ) {
+        val expected = EXPECTED_SHA256[dest.name]
+            ?: throw IOException("no expected sha256 for " + dest.name)
+        val current = if (dest.exists()) sha256(dest) else null
+        if (current.equals(expected, ignoreCase = true)) {
+            applyMode(dest, executable)
+            return
+        }
+        copyAsset(context, asset, dest)
+        val got = sha256(dest)
+        if (!got.equals(expected, ignoreCase = true)) {
+            dest.delete()
+            throw IOException(
+                "asset sha256 mismatch for " + asset +
+                    ": expected " + expected + " got " + got,
+            )
+        }
+        applyMode(dest, executable)
+    }
+
+    private fun copyAsset(context: Context, asset: String, dest: File) {
+        dest.parentFile?.mkdirs()
+        val tmp = File(
+            dest.parentFile,
+            dest.name + "." + android.os.Process.myPid() + "." +
+                System.nanoTime() + ".part",
+        )
+        tmp.delete()
+        try {
+            context.assets.open(asset).use { input ->
+                tmp.outputStream().buffered().use { output ->
+                    input.copyTo(output, bufferSize = 64 * 1024)
+                }
+            }
+            if (dest.exists()) dest.delete()
+            if (!tmp.renameTo(dest)) {
+                throw IOException("Could not promote " + tmp + " -> " + dest)
+            }
+        } finally {
+            tmp.delete()
+        }
+    }
+
+    private fun ensureSymlink(link: File, target: String) {
+        val path = link.toPath()
+        if (java.nio.file.Files.isSymbolicLink(path)) {
+            val current = java.nio.file.Files.readSymbolicLink(path).toString()
+            if (current == target) return
+            link.delete()
+        } else if (link.exists()) {
+            link.delete()
+        }
+        FileUtils.symlink(target, link.absolutePath)
+        if (!java.nio.file.Files.isSymbolicLink(path) ||
+            java.nio.file.Files.readSymbolicLink(path).toString() != target
+        ) {
+            throw IOException("symlink " + link.absolutePath + " -> " + target + " failed")
+        }
+    }
+
+    private fun applyMode(file: File, executable: Boolean) {
+        if (!file.setReadable(true, false)) {
+            Log.w(TAG, "could not set readable: " + file)
+        }
+        if (executable && !file.setExecutable(true, false)) {
+            Log.w(TAG, "could not set executable: " + file)
+        }
+    }
+
+    private fun sha256(file: File): String {
+        val md = MessageDigest.getInstance("SHA-256")
+        file.inputStream().buffered().use { input ->
+            val buf = ByteArray(64 * 1024)
+            while (true) {
+                val n = input.read(buf)
+                if (n < 0) break
+                md.update(buf, 0, n)
+            }
+        }
+        return md.digest().joinToString("") { "%02x".format(it) }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/GameSessionState.kt b/app/src/main/feature/stores/steam/service/GameSessionState.kt
new file mode 100644
index 000000000..36fc548ae
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/GameSessionState.kt
@@ -0,0 +1,24 @@
+package com.winlator.cmod.feature.stores.steam.service
+
+import android.content.Context
+import com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+
+object GameSessionState {
+    @JvmStatic
+    @Volatile
+    var inGame: Boolean = false
+        private set
+
+    @JvmStatic
+    fun setInGame(context: Context, value: Boolean) {
+        inGame = value
+        runCatching {
+            if (value && !PrefManager.chatInGameEnabled) {
+                ChatOverlayService.stop(context)
+            } else {
+                ChatOverlayService.start(context)
+            }
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/HybridModeReceiver.kt b/app/src/main/feature/stores/steam/service/HybridModeReceiver.kt
new file mode 100644
index 000000000..e973faf99
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/HybridModeReceiver.kt
@@ -0,0 +1,1756 @@
+package com.winlator.cmod.feature.stores.steam.service
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamBootstrap
+
+class HybridModeReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action != ACTION) return
+        val op = intent.getStringExtra("op")?.lowercase() ?: "query"
+        val before = PrefManager.wnHybridMode
+        val bsInitialized = WnSteamBootstrap.isLoggedOn() ||
+            WnSteamBootstrap.steamId() != 0L
+
+        val after: Boolean = when (op) {
+            "enable"  -> true
+            "disable" -> false
+            "toggle"  -> !before
+            "query"   -> before
+            "state"   -> before    // verbose query, no mutation
+            "forceinit" -> before  // fires WnSteamBootstrap.prewarm directly,
+            "seedteststats" -> before  // pushes a synthetic schema into
+            "seedtestfriends" -> before  // pushes 2 synthetic friend
+            "seedtestrichpresence" -> before  // exercises ISteamFriends RP
+            "seedtestoverlay" -> before  // cycles setGameOverlayActive
+            "probebridge" -> before      // calls WnLibSteamClient.setPersonaState
+            "probebridgename" -> before  // calls ISteamFriends.SetPersonaName
+            "probebridgereq" -> before   // calls ISteamFriends.RequestUserInformation
+            "probebridgereqbulk" -> before  // drives cm_bridge bulk variant for an
+            "probebridgeticket" -> before   // probes cm_bridge's cached-
+            "probeauthwrap" -> before       // injects synthetic ownership bytes,
+            "probebridgeplayed" -> before   // toggles setAppId 0→N→0 to exercise
+            "probebridgerp" -> before       // calls ISteamFriends.RequestFriendRich
+            "probebridgeclearrp" -> before  // calls SetRichPresence then
+            "probebridgelogon" -> before    // synthetically dispatches the cm_
+            "probebridgefriends" -> before  // synthetically dispatches the cm_
+            "probebridgelicenses" -> before // injects 3 licenses (1 self-owned,
+            "probepurchasetime" -> before   // pushes synthetic licenses +
+            "probefamilyshare" -> before    // pushes self-owned + family-shared
+            "probeappowner" -> before       // verifies slot 20 GetAppOwner
+            "probeavgrate" -> before        // calls UpdateAvgRateStat (slot 5)
+            "probetimedtrial" -> before     // injects a trial license (90 min
+            "probedlcinstalled" -> before   // verifies slot 7 contract across
+            "probebetaname" -> before       // pushes a beta branch via
+            "probedlprogress" -> before     // pushes (1234, 5000) via
+            "probecloudio" -> before        // points the bound app's cloud
+            "probecloudasync" -> before     // FileWriteAsync (slot 2) +
+            "probecloudstream" -> before    // FileWriteStream{Open,WriteChunk,
+            "probeappsbool" -> before       // ISteamApps slots 0/1/2/3 vs
+            "probefilestate" -> before      // FileForget (5) + FilePersisted
+            "probeuserbool" -> before       // ISteamUser slots 26-29 (phone/
+            "probeaccountinfo" -> before    // cm_bridge account-info observer
+            "probeuserdata" -> before       // ISteamUser slot 6 GetUserData
+            "probefriendrel" -> before      // ISteamFriends slots 5 + 17:
+            "probewebapiticket" -> before   // ISteamUser slot 14: synthetic
+            "probelicense" -> before        // ISteamUser slot 18: HasLicense
+            "probecorrupt" -> before        // ISteamApps slot 16: marks the
+            "probefriendlevel" -> before    // ISteamFriends slot 10:
+            "probeplayerlevel" -> before    // ISteamUser slots 23/24/25/30/31
+            "probecloudshare" -> before     // ISteamRemoteStorage slot 7
+            "probenicksig" -> before        // ISteamFriends 11 GetPlayer
+            "probebridgepersona" -> before  // synthetically dispatches the cm_
+            "probebridgepersonaself" -> before  // same as probebridgepersona but
+            "seedtestavatar" -> before   // pushes a synthetic 4×4 RGBA8
+            "seedtestavatarhash" -> before  // pushes a synthetic 20-byte
+            "seedtestfetchavatar" -> before  // fetches a known-stable avatar
+            "seedtestselfavatar" -> before   // sets a synthetic self
+            "seedtestprefswarmup" -> before  // seeds PrefManager with a
+            "seedtestfriendsnapshot" -> before  // pushes a 2-friend JSON
+            "seedtestschemacache" -> before     // writes a synthetic per-app
+            "seedtestavatartiers" -> before     // calls enqueueAllTiers, polls
+            "togglelogon"   -> before    // cycles setLoggedOn(false)→
+            "seedtestquota" -> before    // pushes a synthetic 5 GB/5 GB
+            "seedtestcloud" -> before    // pushes 2 synthetic cloud
+            "probelocale"  -> before     // toggles pushed ui_language
+            "probeshutdown" -> before    // cycles the pipe (Create→
+            "probelogonfail" -> before   // reports a synthetic
+            "proberundispatch" -> before // registers a probe cb on
+            "probecallresult" -> before  // pushes a synthetic CCallResult
+            "probeauthticket" -> before  // calls ISteamUser.GetAuthSessionTicket
+            "probeencticket" -> before   // calls ISteamUser.RequestEncryptedApp
+            "probeutilsapicall" -> before // pushes a synthetic CallResult,
+            "probedlc"        -> before  // pushes 3 synthetic DLC entries
+            "probedepots"     -> before  // pushes 4 synthetic depot ids
+            "probebuildid"    -> before  // pushes a synthetic buildId,
+            "probepreparelaunch" -> before  // runs the full launch-time
+            "probelogongate" -> before  // engages the Kotlin-side rate-
+            "probelogongateclear" -> before  // clears the rate-limit
+            else      -> {
+                Log.w(TAG, "Unknown op=$op; valid: enable/disable/toggle/query/state/forceInit/seedTestStats")
+                return
+            }
+        }
+
+        if (op == "forceinit") {
+            try {
+                WnSteamBootstrap.prewarm(context.applicationContext)
+                Log.i(TAG, "forceInit: prewarm dispatched (will attempt logon w/ existing token)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "forceInit: prewarm threw", t)
+            }
+        } else if (op == "probebuildid") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val bs = WnSteamBootstrap
+                W.setAppId(440)
+                W.setAppBuildId(440, 0x12345678)
+                val got = bs.appBuildId()
+                Log.i(TAG, "probeBuildId: appBuildId(440)=$got " +
+                    "(expect 305419896 = 0x12345678)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBuildId threw", t)
+            }
+        } else if (op == "probelogongate") {
+            try {
+                val SS = com.winlator.cmod.feature.stores.steam.service.SteamService
+                val eresult = intent.getIntExtra("eresult", 84)
+                val beforeUntil = SS.logonGateUntilMs
+                val beforeFails = SS.consecutiveLogonFailures
+                SS.recordLogonFailure(eresult)
+                val afterUntil = SS.logonGateUntilMs
+                val afterFails = SS.consecutiveLogonFailures
+                val nowMs = System.currentTimeMillis()
+                val backoffS = ((afterUntil - nowMs).coerceAtLeast(0L) / 1000L)
+                Log.i(TAG, "probeLogonGate: synth EResult=$eresult — " +
+                    "gate before=$beforeUntil after=$afterUntil (in ${backoffS}s) " +
+                    "consecutive=$beforeFails→$afterFails")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeLogonGate threw", t)
+            }
+        } else if (op == "probelogongateclear") {
+            try {
+                val SS = com.winlator.cmod.feature.stores.steam.service.SteamService
+                val beforeUntil = SS.logonGateUntilMs
+                val beforeFails = SS.consecutiveLogonFailures
+                SS.recordLogonSuccess()
+                Log.i(TAG, "probeLogonGateClear: gate ${beforeUntil}→${SS.logonGateUntilMs} " +
+                    "consecutive=$beforeFails→${SS.consecutiveLogonFailures}")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeLogonGateClear threw", t)
+            }
+        } else if (op == "probepreparelaunch") {
+            try {
+                val appId = intent.getIntExtra("appid", 242760)
+                val bs = WnSteamBootstrap
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                Log.i(TAG, "probePrepareLaunch: starting chokepoint for app=$appId")
+                Thread({
+                    try {
+                        com.winlator.cmod.feature.stores.steam.service.SteamService
+                            .prepareLibSteamClientForLaunchBlocking(appId)
+                        val q = bs.cloudQuota()
+                        val total = if (q.isNotEmpty()) q[0] else 0L
+                        val avail = if (q.size >= 2) q[1] else 0L
+                        val etk = runCatching {
+                            W.nativeGetPushedEncryptedAppTicketSize(appId)
+                        }.getOrNull() ?: 0
+                        val pAppId    = runCatching { W.nativeGetPushedAppId() }.getOrNull() ?: 0
+                        val pCloudApp = runCatching { W.nativeGetPushedCloudEnabledApp() }.getOrNull() ?: false
+                        val pCFiles   = runCatching { W.nativeGetPushedCloudFileCount() }.getOrNull() ?: 0
+                        Log.i(TAG, "probePrepareLaunch: app=$appId DONE — " +
+                            "boundAppId=${bs.currentAppId()} " +
+                            "subscribed=${bs.isSubscribedApp(appId)} " +
+                            "cloudApp=${bs.cloudEnabledForApp()} " +
+                            "cloudFiles=${bs.cloudFileCount()} " +
+                            "cloudQuota=$total/$avail " +
+                            "encTicketBytes=$etk " +
+                            "(pushed: appId=$pAppId cloudApp=$pCloudApp cloudFiles=$pCFiles)")
+                    } catch (t: Throwable) {
+                        Log.e(TAG, "probePrepareLaunch: chokepoint threw", t)
+                    }
+                }, "probePrepareLaunch").start()
+            } catch (t: Throwable) {
+                Log.e(TAG, "probePrepareLaunch threw", t)
+            }
+        } else if (op == "probedepots") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val bs = WnSteamBootstrap
+                W.setAppInstalledDepots(440, intArrayOf(441, 442, 443, 444))
+                val got = bs.installedDepots(440)
+                Log.i(TAG, "probeDepots: installedDepots(440)=${got.toList()} " +
+                    "(expect [441, 442, 443, 444])")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeDepots threw", t)
+            }
+        } else if (op == "probedlc") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val bs = WnSteamBootstrap
+                W.setAppDlcs(
+                    parentAppId = 440,
+                    dlcAppIds   = intArrayOf(440001, 440002, 440003),
+                    dlcNames    = arrayOf("Demo Pack", "Heavy Pack", "Engineer Pack"),
+                    available   = booleanArrayOf(true, true, false),
+                )
+                val count = bs.dlcCount(440)
+                Log.i(TAG, "probeDlc: GetDLCCount(440)=$count (expect 3)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeDlc threw", t)
+            }
+        } else if (op == "probeutilsapicall") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val expected = 0xCAFEBABE.toInt()
+                val observed = try {
+                    W.nativeDiagnosticUtilsGetAPICallResult(callbackId = 1101, eresult = expected)
+                } catch (_: UnsatisfiedLinkError) { 0 }
+                Log.i(TAG, "probeUtilsAPICall: observed=0x" +
+                    Integer.toHexString(observed) +
+                    " (expect 0x" + Integer.toHexString(expected) + ")")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeUtilsAPICall threw", t)
+            }
+        } else if (op == "probeencticket") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val bs = WnSteamBootstrap
+                W.setAppId(440)
+                val (hCall, body) = bs.diagnosticRequestEncryptedAppTicket()
+                val magic = if (body.size >= 6) String(body, 0, 6, Charsets.US_ASCII) else "?"
+                val embeddedApp = if (body.size >= 20)
+                    (body[16].toInt() and 0xFF) or
+                    ((body[17].toInt() and 0xFF) shl 8) or
+                    ((body[18].toInt() and 0xFF) shl 16) or
+                    ((body[19].toInt() and 0xFF) shl 24) else -1
+                Log.i(TAG, "probeEncTicket: hCall=$hCall body=${body.size}B " +
+                    "magic='$magic' embeddedApp=$embeddedApp " +
+                    "(expect hCall>=1, magic='WNETKT', embeddedApp=440)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeEncTicket threw", t)
+            }
+        } else if (op == "probeauthticket") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val buf = ByteArray(64)
+                val pre = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val handle = try { W.nativeDiagnosticGetAuthTicket(buf) }
+                             catch (_: UnsatisfiedLinkError) { 0 }
+                val post = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val magic = String(buf, 0, 4, Charsets.US_ASCII)
+                val handleInBuf =
+                    (buf[4].toInt() and 0xFF) or
+                    ((buf[5].toInt() and 0xFF) shl 8) or
+                    ((buf[6].toInt() and 0xFF) shl 16) or
+                    ((buf[7].toInt() and 0xFF) shl 24)
+                Log.i(TAG, "probeAuthTicket: handle=$handle magic='$magic' " +
+                    "embeddedHandle=$handleInBuf cbDepth pre=$pre post=$post " +
+                    "(expect handle>=1 magic='WNAT' embeddedHandle==handle " +
+                    "post=pre+1 [GetAuthSessionTicketResponse_t emitted])")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeAuthTicket threw", t)
+            }
+        } else if (op == "probecallresult") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val expectedEresult = 0xABCD
+                val packed = try {
+                    W.nativeDiagnosticPushAndDrainCallResult(
+                        callbackId = 1101, eresult = expectedEresult)
+                } catch (_: UnsatisfiedLinkError) { 0L }
+                val runs   = (packed ushr 32).toInt()
+                val observed = (packed and 0xFFFFFFFFL).toInt()
+                Log.i(TAG, "probeCallResult: runs=$runs observedEresult=0x" +
+                    Integer.toHexString(observed) +
+                    " (expect runs=1 observedEresult=0x" +
+                    Integer.toHexString(expectedEresult) + ")")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeCallResult threw", t)
+            }
+        } else if (op == "proberundispatch") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setAchievementSchema(
+                    apiNames     = arrayOf("ACH_TEST_FIRST"),
+                    displayNames = arrayOf("First Blood"),
+                    descriptions = arrayOf("Score one kill."),
+                    icons        = arrayOf(""),
+                    hidden       = booleanArrayOf(false),
+                )
+                val pre = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val runs = try { W.nativeDiagnosticRegisterAndDrain(1101) }
+                           catch (_: UnsatisfiedLinkError) { -1 }
+                val post = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeRunDispatch: cb depth pre=$pre runs=$runs post=$post " +
+                    "(expect runs>=1 — UserStatsReceived_t emitted by schema push)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeRunDispatch threw", t)
+            }
+        } else if (op == "probelogonfail") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val pre = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.reportLogonFailure(eresult = 84, stillRetrying = true)
+                val post = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeLogonFail: cb depth pre=$pre post=$post " +
+                    "(expect +1 SteamServerConnectFailure_t eresult=84/RateLimit)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeLogonFail threw", t)
+            }
+        } else if (op == "probeshutdown") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setLoggedOn(true)
+                val pre = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.shutdownPipe()
+                val post = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeShutdown: cb depth pre=$pre post=$post " +
+                    "(expect +1 SteamShutdown_t, +1 SteamServersDisconnected_t)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeShutdown threw", t)
+            }
+        } else if (op == "probelocale") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val bs = WnSteamBootstrap
+                fun displayName(): String? =
+                    bs.listAchievementsFull()
+                        .firstOrNull { it.apiName == "ACH_TEST_FIRST" }
+                        ?.displayName
+                W.setUiLanguage("english")
+                val en = displayName()
+                W.setUiLanguage("spanish")
+                val es = displayName()
+                val gameLangEs = bs.currentGameLanguage()
+                W.setUiLanguage(PrefManager.containerLanguage.ifBlank { "english" })
+                val gameLangAfter = bs.currentGameLanguage()
+                Log.i(TAG, "probeLocale: ACH_TEST_FIRST en='$en' es='$es' " +
+                    "ISteamApps.lang(spanish)='$gameLangEs' " +
+                    "ISteamApps.lang(restored)='$gameLangAfter' " +
+                    "(expect en='First Blood' es='Primera Sangre' " +
+                    "ISteamApps.lang(spanish)='spanish')")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeLocale threw", t)
+            }
+        } else if (op == "seedtestcloud") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setAppId(440)  // TF2's appid as a stable test value
+                val pre = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setCloudFiles(
+                    names      = arrayOf("save0.dat", "config.cfg"),
+                    sizes      = intArrayOf(1024, 256),
+                    timestamps = longArrayOf(1700000000L, 1700001000L),
+                )
+                val post = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestCloud: pushed 2 cloud files for app 440 " +
+                    "(cb depth pre=$pre post=$post — expect +1 RemoteStorageAppSyncedClient_t)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestCloud threw", t)
+            }
+        } else if (op == "seedtestquota") {
+            try {
+                val totalBytes = 5L * 1024L * 1024L * 1024L
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setCloudQuota(totalBytes, totalBytes)
+                Log.i(TAG, "seedTestQuota: pushed 5 GiB / 5 GiB available to libsteamclient.so")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestQuota threw", t)
+            }
+        } else if (op == "togglelogon") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val pre = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setLoggedOn(true)
+                val sameValue = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setLoggedOn(false)
+                val afterOff = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setLoggedOn(true)
+                val afterOn = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "toggleLogon: pre=$pre sameValue=$sameValue " +
+                    "afterOff=$afterOff afterOn=$afterOn " +
+                    "(expect pre==sameValue, +1 disconnected, +1 connected)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "toggleLogon threw", t)
+            }
+        } else if (op == "seedtestfriends") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setPersonaName("Voyager-1986#2")
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setFriendsList(longArrayOf(76561197960287930L, 76561197960265728L))
+                W.setFriendPersonaName(76561197960287930L, "Alice (test)")
+                W.setFriendPersonaState(76561197960287930L, 1)         // Online
+                W.setFriendGamePlayed(76561197960287930L, 440)         // playing TF2
+                W.setFriendPersonaName(76561197960265728L, "Bob (test)")
+                W.setFriendPersonaState(76561197960265728L, 0)         // Offline
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val aliceState = try {
+                    W.nativeDiagnosticGetFriendPersonaState(76561197960287930L)
+                } catch (_: UnsatisfiedLinkError) { -2 }
+                val bobState = try {
+                    W.nativeDiagnosticGetFriendPersonaState(76561197960265728L)
+                } catch (_: UnsatisfiedLinkError) { -2 }
+                Log.i(TAG, "seedTestFriends: pushed self-name + 2 friend personas " +
+                    "(cb depth pre=$depth0 post=$depth1) " +
+                    "aliceState=$aliceState bobState=$bobState " +
+                    "(expect aliceState=1 bobState=0; cb depth Δ now includes " +
+                    "the ComeOnline state-transition emit for Alice)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestFriends threw", t)
+            }
+        } else if (op == "seedtestrichpresence") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val selfId = 0x110000100C123456L
+                W.setSteamId(selfId)
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val setOk = try {
+                    W.nativeDiagnosticSetRichPresence("status", "In Lobby")
+                } catch (_: UnsatisfiedLinkError) { false }
+                val setOk2 = try {
+                    W.nativeDiagnosticSetRichPresence("connect", "+lobby:42")
+                } catch (_: UnsatisfiedLinkError) { false }
+                val selfCount = try {
+                    W.nativeDiagnosticRichPresenceKeyCount(selfId)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val aliceId = 76561197960287930L
+                W.setFriendRichPresence(aliceId, "status", "Boss Battle")
+                W.setFriendRichPresence(aliceId, "connect", "+lobby:7")
+                val aliceCount = try {
+                    W.nativeDiagnosticRichPresenceKeyCount(aliceId)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestRichPresence: cb depth pre=$depth0 post=$depth1 " +
+                    "(expect post-pre=4: 1 self-Set*2 + 2 friend-pushes), " +
+                    "setOk=$setOk setOk2=$setOk2 selfKeyCount=$selfCount " +
+                    "aliceKeyCount=$aliceCount (expect selfKeyCount=2 aliceKeyCount=2)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestRichPresence threw", t)
+            }
+        } else if (op == "seedtestavatartiers") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val F = com.winlator.cmod.feature.stores.steam.wnsteam.AvatarFetcher
+                val aliceId = 76561197960287931L
+                val testHash = "fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb"
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                F.enqueueAllTiers(aliceId, testHash)
+                var h0 = 0; var w0 = 0; var t0 = 0
+                var h1 = 0; var w1 = 0; var t1 = 0
+                var h2 = 0; var w2 = 0; var t2 = 0
+                repeat(100) {
+                    val p0 = try { W.nativeDiagnosticGetTieredAvatarSize(aliceId, 0) } catch (_: UnsatisfiedLinkError) { 0L }
+                    val p1 = try { W.nativeDiagnosticGetTieredAvatarSize(aliceId, 1) } catch (_: UnsatisfiedLinkError) { 0L }
+                    val p2 = try { W.nativeDiagnosticGetTieredAvatarSize(aliceId, 2) } catch (_: UnsatisfiedLinkError) { 0L }
+                    h0 = (p0 shr 32).toInt(); w0 = ((p0 shr 16) and 0xFFFF).toInt(); t0 = (p0 and 0xFFFF).toInt()
+                    h1 = (p1 shr 32).toInt(); w1 = ((p1 shr 16) and 0xFFFF).toInt(); t1 = (p1 and 0xFFFF).toInt()
+                    h2 = (p2 shr 32).toInt(); w2 = ((p2 shr 16) and 0xFFFF).toInt(); t2 = (p2 and 0xFFFF).toInt()
+                    if (h0 > 0 && h1 > 0 && h2 > 0) return@repeat
+                    Thread.sleep(100)
+                }
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestAvatarTiers: " +
+                    "small(handle=$h0 size=${w0}x${t0}) " +
+                    "medium(handle=$h1 size=${w1}x${t1}) " +
+                    "large(handle=$h2 size=${w2}x${t2}) " +
+                    "cb depth pre=$depth0 post=$depth1 " +
+                    "(expect small=32x32 medium=64x64 large=184x184, post-pre=3)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestAvatarTiers threw", t)
+            }
+        } else if (op == "seedtestschemacache") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val testAppId = 99999  // unlikely to collide with a real app
+                val achievements = listOf(
+                    com.winlator.cmod.feature.stores.steam.statsgen.Achievement(
+                        name        = "ACH_CACHE_TEST_A",
+                        displayName = mapOf("english" to "Cached A"),
+                        description = mapOf("english" to "First cached achievement"),
+                        hidden      = 0,
+                        unlocked    = true,
+                        unlockTimestamp = 1700000000,
+                    ),
+                    com.winlator.cmod.feature.stores.steam.statsgen.Achievement(
+                        name        = "ACH_CACHE_TEST_B",
+                        displayName = mapOf("english" to "Cached B"),
+                        description = mapOf("english" to "Second cached achievement"),
+                        hidden      = 1,
+                    ),
+                )
+                val stats = listOf(
+                    com.winlator.cmod.feature.stores.steam.statsgen.Stat(
+                        id = "kills", name = "kills", type = "int", default = "0"),
+                )
+                SteamService.cacheAchievementSchemaJson(testAppId, achievements, stats)
+                val cacheFile = java.io.File(
+                    context.applicationContext.filesDir,
+                    "wn_lsteam_schemas/$testAppId.json",
+                )
+                val fileLen = if (cacheFile.exists()) cacheFile.length() else -1L
+                try {
+                    W.setAchievementSchema(emptyArray(), emptyArray(), emptyArray(),
+                                            emptyArray(), BooleanArray(0))
+                } catch (_: UnsatisfiedLinkError) {}
+                val countBefore = try { W.nativeDiagnosticAchievementCount() }
+                                  catch (_: UnsatisfiedLinkError) { -1 }
+                val warmed = SteamService.warmAchievementSchemaFromCache(testAppId)
+                val countAfter = try { W.nativeDiagnosticAchievementCount() }
+                                 catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestSchemaCache: testAppId=$testAppId cacheFileLen=$fileLen " +
+                    "warmed=$warmed achCount before=$countBefore after=$countAfter " +
+                    "(expect fileLen>0 warmed=true before=0 after=2)")
+                try { cacheFile.delete() } catch (_: Exception) {}
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestSchemaCache threw", t)
+            }
+        } else if (op == "seedtestfriendsnapshot") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val P = com.winlator.cmod.feature.stores.steam.utils.PrefManager
+                val prevSnap = P.friendsSnapshotJson
+                try {
+                    val json = """[
+                        {"sid":76561197960287930,"name":"Alice Snapshot","state":1,"app":440,
+                         "avatarHash":"fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb"},
+                        {"sid":76561197960265728,"name":"Bob Snapshot","state":0,"app":0,
+                         "avatarHash":""}
+                    ]"""
+                    val pushed = W.pushFriendPersonasJson(json, persistSnapshot = true)
+                    val persistedLen = P.friendsSnapshotJson.length
+                    val aliceState = try {
+                        W.nativeDiagnosticGetFriendPersonaState(76561197960287930L)
+                    } catch (_: UnsatisfiedLinkError) { -2 }
+                    val bobState = try {
+                        W.nativeDiagnosticGetFriendPersonaState(76561197960265728L)
+                    } catch (_: UnsatisfiedLinkError) { -2 }
+                    val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                    val replayed = W.pushFriendPersonasJson(P.friendsSnapshotJson, persistSnapshot = false)
+                    val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                    Log.i(TAG, "seedTestFriendSnapshot: pushed=$pushed " +
+                        "persistedJsonLen=$persistedLen aliceState=$aliceState bobState=$bobState " +
+                        "replayed=$replayed cb depth pre=$depth0 post=$depth1 " +
+                        "(expect pushed=2 persistedJsonLen>0 aliceState=1 bobState=0 " +
+                        "replayed=2 — replay reuses same map, dedup-aware setters)")
+                } finally {
+                    P.friendsSnapshotJson = prevSnap
+                }
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestFriendSnapshot threw", t)
+            }
+        } else if (op == "seedtestprefswarmup") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val P = com.winlator.cmod.feature.stores.steam.utils.PrefManager
+                val prevSid    = P.steamUserSteamId64
+                val prevName   = P.steamUserName
+                val prevHash   = P.steamUserAvatarHash
+                try {
+                    val testSid  = 0x110000100DEADBE0L
+                    val testName = "WarmupTester"
+                    val testHash = "fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb"
+                    P.steamUserSteamId64   = testSid
+                    P.steamUserName        = testName
+                    P.steamUserAvatarHash  = testHash
+                    val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                    W.seedFromPrefManager(context.applicationContext)
+                    var handle = 0
+                    var w = 0
+                    var h = 0
+                    repeat(60) {
+                        val packed = try {
+                            W.nativeDiagnosticGetSmallAvatarSize(testSid)
+                        } catch (_: UnsatisfiedLinkError) { 0L }
+                        handle = (packed shr 32).toInt()
+                        if (handle > 0) {
+                            w = ((packed shr 16) and 0xFFFF).toInt()
+                            h = (packed and 0xFFFF).toInt()
+                            return@repeat
+                        }
+                        Thread.sleep(100)
+                    }
+                    val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                    val storedHashHex = try {
+                        W.nativeDiagnosticGetFriendAvatarHashHex(testSid)
+                    } catch (_: UnsatisfiedLinkError) { "?" }
+                    Log.i(TAG, "seedTestPrefsWarmup: sid=$testSid handle=$handle " +
+                        "size=${w}x${h} storedHash='$storedHashHex' " +
+                        "cb depth pre=$depth0 post=$depth1 " +
+                        "(expect handle>0 size=32x32 storedHash=$testHash " +
+                        "post-pre≥2 — 1 PersonaStateChange + 1 AvatarImageLoaded)")
+                } finally {
+                    P.steamUserSteamId64  = prevSid
+                    P.steamUserName       = prevName
+                    P.steamUserAvatarHash = prevHash
+                }
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestPrefsWarmup threw", t)
+            }
+        } else if (op == "seedtestselfavatar") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val F = com.winlator.cmod.feature.stores.steam.wnsteam.AvatarFetcher
+                val selfId = 0x110000100C123456L
+                W.setSteamId(selfId)
+                val testHash = "fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb"
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val bytes = ByteArray(20)
+                for (k in bytes.indices) {
+                    val hi = Character.digit(testHash[k * 2], 16)
+                    val lo = Character.digit(testHash[k * 2 + 1], 16)
+                    bytes[k] = ((hi shl 4) or lo).toByte()
+                }
+                W.setFriendAvatarHash(selfId, bytes)
+                F.enqueue(selfId, testHash, tier = 0)
+                var handle = 0
+                var w = 0
+                var h = 0
+                repeat(60) {
+                    val packed = try {
+                        W.nativeDiagnosticGetSmallAvatarSize(selfId)
+                    } catch (_: UnsatisfiedLinkError) { 0L }
+                    handle = (packed shr 32).toInt()
+                    if (handle > 0) {
+                        w = ((packed shr 16) and 0xFFFF).toInt()
+                        h = (packed and 0xFFFF).toInt()
+                        return@repeat
+                    }
+                    Thread.sleep(100)
+                }
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestSelfAvatar: selfId=$selfId handle=$handle " +
+                    "size=${w}x${h} cb depth pre=$depth0 post=$depth1 " +
+                    "(expect handle>0, size=32x32, post-pre=2 — 1 PersonaStateChange + " +
+                    "1 AvatarImageLoaded — proves self uses same friend_avatars map)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestSelfAvatar threw", t)
+            }
+        } else if (op == "seedtestfetchavatar") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val F = com.winlator.cmod.feature.stores.steam.wnsteam.AvatarFetcher
+                val aliceId = 76561197960287930L
+                val testHash = "fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb"
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                F.enqueue(aliceId, testHash, tier = 0)
+                var handle = 0
+                var w = 0
+                var h = 0
+                repeat(60) {
+                    val packed = try {
+                        W.nativeDiagnosticGetSmallAvatarSize(aliceId)
+                    } catch (_: UnsatisfiedLinkError) { 0L }
+                    handle = (packed shr 32).toInt()
+                    if (handle > 0) {
+                        w = ((packed shr 16) and 0xFFFF).toInt()
+                        h = (packed and 0xFFFF).toInt()
+                        return@repeat
+                    }
+                    Thread.sleep(100)
+                }
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestFetchAvatar: hash=$testHash handle=$handle " +
+                    "size=${w}x${h} cb depth pre=$depth0 post=$depth1 " +
+                    "(expect handle>0, size=32x32 or similar, " +
+                    "post-pre=1 AvatarImageLoaded — assumes network reachable)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestFetchAvatar threw", t)
+            }
+        } else if (op == "seedtestavatarhash") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val aliceId = 76561197960287930L
+                val hashA = ByteArray(20) { (it * 13 + 7).toByte() }
+                val hashB = ByteArray(20) { (it * 17 + 3).toByte() }
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setFriendAvatarHash(aliceId, hashA)        // change → +1
+                W.setFriendAvatarHash(aliceId, hashA)        // dedup → +0
+                val depthMid = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setFriendAvatarHash(aliceId, hashB)        // change → +1
+                W.setFriendAvatarHash(aliceId, null)         // clear → +1
+                W.setFriendAvatarHash(aliceId, null)         // dedup → +0
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val finalHex = try {
+                    W.nativeDiagnosticGetFriendAvatarHashHex(aliceId)
+                } catch (_: UnsatisfiedLinkError) { "?" }
+                Log.i(TAG, "seedTestAvatarHash: cb depth pre=$depth0 mid=$depthMid post=$depth1 " +
+                    "finalHex='$finalHex' " +
+                    "(expect mid-pre=1 post-mid=2 finalHex='' — 3 transitions, 2 dedups)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestAvatarHash threw", t)
+            }
+        } else if (op == "seedtestavatar") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val aliceId = 76561197960287930L
+                val w = 4
+                val h = 4
+                val rgba = ByteArray(w * h * 4)
+                for (y in 0 until h) for (x in 0 until w) {
+                    val i = (y * w + x) * 4
+                    rgba[i + 0] = (x * 64).toByte()
+                    rgba[i + 1] = (y * 64).toByte()
+                    rgba[i + 2] = 0xAA.toByte()
+                    rgba[i + 3] = 0xFF.toByte()
+                }
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val handle = try {
+                    W.nativePushFriendAvatar(aliceId, tier = 0, width = w, height = h, rgba = rgba)
+                } catch (_: UnsatisfiedLinkError) { 0 }
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val packed = try {
+                    W.nativeDiagnosticGetSmallAvatarSize(aliceId)
+                } catch (_: UnsatisfiedLinkError) { 0L }
+                val rdHandle = (packed shr 32).toInt()
+                val rdW = ((packed shr 16) and 0xFFFF).toInt()
+                val rdH = (packed and 0xFFFF).toInt()
+                val readBuf = ByteArray(w * h * 4)
+                val copied = try {
+                    W.nativeDiagnosticGetImageRGBA(handle, readBuf)
+                } catch (_: UnsatisfiedLinkError) { 0 }
+                val px2_1 = (2 + 1 * w) * 4
+                val r = readBuf[px2_1 + 0].toInt() and 0xFF
+                val g = readBuf[px2_1 + 1].toInt() and 0xFF
+                val b = readBuf[px2_1 + 2].toInt() and 0xFF
+                val a = readBuf[px2_1 + 3].toInt() and 0xFF
+                Log.i(TAG, "seedTestAvatar: handle=$handle (cb depth pre=$depth0 post=$depth1) " +
+                    "rdHandle=$rdHandle rdW=$rdW rdH=$rdH copied=$copied " +
+                    "px(2,1) RGBA=($r,$g,$b,$a) " +
+                    "(expect post-pre=1 AvatarImageLoaded, rdW=4 rdH=4, RGBA=(128,64,170,255))")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestAvatar threw", t)
+            }
+        } else if (op == "probebridgepersonaself") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val selfSid = 0x110000100C123498L
+                W.setSteamId(selfSid)
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                try {
+                    W.nativeDiagnosticInjectPersonaEvent(
+                        steamId      = selfSid,         // matches setSteamId → observer takes self path
+                        personaState = 3,                // Away
+                        gameAppId    = 730,
+                        name         = "SelfPathProbe",
+                        avatarHash   = null,
+                        rpKeys       = null,
+                        rpValues     = null,
+                    )
+                } catch (_: UnsatisfiedLinkError) {}
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val friendStateAtSelfSid = try {
+                    W.nativeDiagnosticGetFriendPersonaState(selfSid)
+                } catch (_: UnsatisfiedLinkError) { -2 }
+                Log.i(TAG, "probeBridgePersonaSelf: cb depth pre=$depth0 post=$depth1 " +
+                    "friendStateAtSelfSid=$friendStateAtSelfSid " +
+                    "(expect cb Δ=+1 self PSC; friendStateAtSelfSid=-1 " +
+                    "[self path writes pushed.persona_state, NOT the friend map])")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgePersonaSelf threw", t)
+            }
+        } else if (op == "probebridgepersona") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val sid = 76561197960287936L
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val hash = ByteArray(20) { (it * 11 + 5).toByte() }
+                try {
+                    W.nativeDiagnosticInjectPersonaEvent(
+                        steamId      = sid,
+                        personaState = 1,
+                        gameAppId    = 440,
+                        name         = "PersonaProbe",
+                        avatarHash   = hash,
+                        rpKeys       = arrayOf("status", "connect"),
+                        rpValues     = arrayOf("In Lobby", "+lobby:42"),
+                    )
+                } catch (_: UnsatisfiedLinkError) {}
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val st = try { W.nativeDiagnosticGetFriendPersonaState(sid) } catch (_: UnsatisfiedLinkError) { -2 }
+                val hashHex = try { W.nativeDiagnosticGetFriendAvatarHashHex(sid) } catch (_: UnsatisfiedLinkError) { "?" }
+                val rpCount = try { W.nativeDiagnosticRichPresenceKeyCount(sid) } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeBridgePersona: cb depth pre=$depth0 post=$depth1 " +
+                    "state=$st hashLen=${hashHex.length / 2} rpCount=$rpCount " +
+                    "(expect cb Δ=+2 PSC[name|state|game|avatar|come-online] + " +
+                    "FriendRichPresenceUpdate_t; state=1, hashLen=20, rpCount=2)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgePersona threw", t)
+            }
+        } else if (op == "probenicksig") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val sid = 0x0110000100006666L
+                val nickBefore = W.nativeDiagnosticGetPlayerNickname(sid)
+                W.nativeSetPlayerNickname(sid, "Sniper42")
+                val nickAfter = W.nativeDiagnosticGetPlayerNickname(sid)
+                W.nativeSetPlayerNickname(sid, null)
+                val nickCleared = W.nativeDiagnosticGetPlayerNickname(sid)
+                val hSig1 = W.nativeDiagnosticCheckFileSignature("bin/game.exe")
+                val hSig2 = W.nativeDiagnosticCheckFileSignature(null)
+                Log.i(TAG, "probeNickSig: nickBefore=$nickBefore (null), " +
+                    "nickAfter=$nickAfter (Sniper42), nickCleared=$nickCleared (null), " +
+                    "hSig1=$hSig1 hSig2=$hSig2 (both non-zero+distinct: " +
+                    "${hSig1 != 0L && hSig2 != 0L && hSig1 != hSig2})")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeNickSig threw", t)
+            }
+        } else if (op == "probecloudshare") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9900
+                val dir = java.io.File(context.cacheDir, "probe-cloud-share-$appId")
+                dir.mkdirs()
+                W.nativeSetAppCloudRemoteDir(appId, dir.absolutePath)
+                W.setAppId(appId)
+                W.nativeDiagnosticCloudFileWrite("share.dat", "shareable".toByteArray())
+                val hShare1 = W.nativeDiagnosticCloudFileShare("share.dat")
+                val hShare2 = W.nativeDiagnosticCloudFileShare("share.dat")
+                val hShareMiss = W.nativeDiagnosticCloudFileShare("missing.dat")
+                W.setAppInstallDir(appId, dir.absolutePath)
+                java.io.File(dir, "binary.dat").writeBytes("xyz123".toByteArray())
+                val hDetails = W.nativeDiagnosticAppsGetFileDetails("binary.dat")
+                val hDetailsMiss = W.nativeDiagnosticAppsGetFileDetails("nope.dat")
+                val hDetailsTraversal = W.nativeDiagnosticAppsGetFileDetails("../escape")
+                W.nativeDiagnosticCloudFileDelete("share.dat")
+                W.setAppId(0)
+                W.nativeSetAppCloudRemoteDir(appId, null)
+                Log.i(TAG, "probeCloudShare: " +
+                    "share1=$hShare1 share2=$hShare2 (distinct hCalls), " +
+                    "shareMissing=$hShareMiss, " +
+                    "details=$hDetails detailsMissing=$hDetailsMiss " +
+                    "detailsTraversal=$hDetailsTraversal " +
+                    "(all non-zero: ${hShare1 != 0L && hShare2 != 0L && hShareMiss != 0L && hDetails != 0L && hDetailsMiss != 0L && hDetailsTraversal != 0L})")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeCloudShare threw", t)
+            }
+        } else if (op == "probeplayerlevel") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 6500
+                W.setAppId(appId)
+                W.nativeSetSelfPlayerLevel(73)
+                val plr = W.nativeDiagnosticGetPlayerSteamLevel()
+                W.nativeSetSelfGameBadge(appId, 1, false, 5)
+                W.nativeSetSelfGameBadge(appId, 1, true,  3)
+                val badgeBasic = W.nativeDiagnosticGetGameBadgeLevel(1, false)
+                val badgeFoil  = W.nativeDiagnosticGetGameBadgeLevel(1, true)
+                val badgeOther = W.nativeDiagnosticGetGameBadgeLevel(2, false)
+                val hStore   = W.nativeDiagnosticRequestStoreAuthURL("checkout/")
+                val hMarket  = W.nativeDiagnosticGetMarketEligibility()
+                val hDuration = W.nativeDiagnosticGetDurationControl()
+                W.setAppId(0)
+                W.nativeSetSelfPlayerLevel(-1)
+                W.nativeSetSelfGameBadge(appId, 1, false, -1)
+                W.nativeSetSelfGameBadge(appId, 1, true,  -1)
+                Log.i(TAG, "probePlayerLevel: " +
+                    "playerLevel=$plr (expect 73), " +
+                    "badgeBasic=$badgeBasic (5), badgeFoil=$badgeFoil (3), " +
+                    "badgeOther=$badgeOther (0), " +
+                    "hStoreUrl=$hStore hMarket=$hMarket hDuration=$hDuration " +
+                    "(all non-zero+distinct: ${hStore != 0L && hMarket != 0L && hDuration != 0L && hStore != hMarket && hMarket != hDuration})")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probePlayerLevel threw", t)
+            }
+        } else if (op == "probelicense") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val selfSid = 0x0110000100009999L
+                val otherSid = 0x0110000100008888L
+                val ownedApp = 7700
+                val unownedApp = 7800
+                W.setSteamId(selfSid)
+                W.setOwnedApps(intArrayOf(ownedApp))
+                val r1 = W.nativeDiagnosticUserHasLicense(selfSid, ownedApp)
+                val r2 = W.nativeDiagnosticUserHasLicense(selfSid, unownedApp)
+                val r3 = W.nativeDiagnosticUserHasLicense(otherSid, ownedApp)
+                val r4 = W.nativeDiagnosticUserHasLicense(0L, ownedApp)
+                val r5 = W.nativeDiagnosticUserHasLicense(selfSid, 0)
+                W.setOwnedApps(IntArray(0))
+                W.setSteamId(0)
+                Log.i(TAG, "probeLicense: self+owned=$r1 (expect 0/HasLicense), " +
+                    "self+unowned=$r2 (expect 1/DoesNotHave), " +
+                    "other+owned=$r3 (expect 2/NoAuth), " +
+                    "nullSid+owned=$r4 (expect 2/NoAuth), " +
+                    "self+nullApp=$r5 (expect 2/NoAuth)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeLicense threw", t)
+            }
+        } else if (op == "probecorrupt") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 7900
+                W.setAppId(appId)
+                val markedBefore = W.nativeIsAppMarkedCorrupt(appId)
+                val markOk = W.nativeDiagnosticMarkContentCorrupt(false)
+                val markedAfter = W.nativeIsAppMarkedCorrupt(appId)
+                W.nativeClearAppCorruptFlag(appId)
+                val markedCleared = W.nativeIsAppMarkedCorrupt(appId)
+                W.setAppId(0)
+                val markNoApp = W.nativeDiagnosticMarkContentCorrupt(true)
+                Log.i(TAG, "probeCorrupt: before=$markedBefore (false), " +
+                    "mark=$markOk (true), after=$markedAfter (true), " +
+                    "cleared=$markedCleared (false), markNoApp=$markNoApp (false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeCorrupt threw", t)
+            }
+        } else if (op == "probefriendlevel") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val sid = 0x0110000100007777L
+                val before = W.nativeDiagnosticGetFriendSteamLevel(sid)
+                W.nativeSetFriendSteamLevel(sid, 42)
+                val after = W.nativeDiagnosticGetFriendSteamLevel(sid)
+                W.nativeSetFriendSteamLevel(sid, -1)
+                val cleared = W.nativeDiagnosticGetFriendSteamLevel(sid)
+                Log.i(TAG, "probeFriendLevel: before=$before (0), " +
+                    "after=$after (42), cleared=$cleared (0)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeFriendLevel threw", t)
+            }
+        } else if (op == "probewebapiticket") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val h1 = W.nativeDiagnosticGetAuthTicketForWebApi("myWebApi")
+                val h2 = W.nativeDiagnosticGetAuthTicketForWebApi(null)
+                val h3 = W.nativeDiagnosticGetAuthTicketForWebApi("anotherDest")
+                Log.i(TAG, "probeWebApiTicket: h1=$h1 h2=$h2 h3=$h3 " +
+                    "(all non-zero, distinct: ${h1 != 0L && h2 != 0L && h3 != 0L && h1 != h2 && h2 != h3})")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeWebApiTicket threw", t)
+            }
+        } else if (op == "probefriendrel") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val friend1 = 0x0110000100000001L
+                val friend2 = 0x0110000100000002L
+                val stranger = 0x0110000100000099L
+                W.setFriendsList(longArrayOf(friend1, friend2))
+                val rel1   = W.nativeDiagnosticGetFriendRelationship(friend1)
+                val relStr = W.nativeDiagnosticGetFriendRelationship(stranger)
+                val rel0   = W.nativeDiagnosticGetFriendRelationship(0L)
+                val hasImmediate = W.nativeDiagnosticHasFriend(friend2, 0x10)
+                val hasAll       = W.nativeDiagnosticHasFriend(friend2, 0xFFFF)
+                val hasClanOnly  = W.nativeDiagnosticHasFriend(friend2, 0x20)
+                val hasStranger  = W.nativeDiagnosticHasFriend(stranger, 0xFFFF)
+                W.setFriendsList(LongArray(0))
+                Log.i(TAG, "probeFriendRel: friend=$rel1 (expect 3), " +
+                    "stranger=$relStr (expect 0), null=$rel0 (expect 0), " +
+                    "hasImmediate=$hasImmediate (true), hasAll=$hasAll (true), " +
+                    "hasClanOnly=$hasClanOnly (false), hasStranger=$hasStranger (false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeFriendRel threw", t)
+            }
+        } else if (op == "probeuserdata") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9800
+                val remoteDir = "/data/cache/.../userdata/123/$appId/remote"
+                W.nativeSetAppCloudRemoteDir(appId, remoteDir)
+                W.setAppId(appId)
+                val resolved = W.nativeDiagnosticGetUserDataFolder()
+                W.setAppId(0)
+                W.nativeSetAppCloudRemoteDir(appId, null)
+                val expected = "/data/cache/.../userdata/123/$appId"
+                Log.i(TAG, "probeUserData: resolved=\"$resolved\" expected=\"$expected\" " +
+                    "match=${resolved == expected}")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeUserData threw", t)
+            }
+        } else if (op == "probeaccountinfo") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.nativeDiagnosticInjectAccountInfo(false, false, false, false)
+                val cleared26 = W.nativeDiagnosticUserBool(26)
+                val cleared27 = W.nativeDiagnosticUserBool(27)
+                W.nativeDiagnosticInjectAccountInfo(true, false, true, false)
+                val v26 = W.nativeDiagnosticUserBool(26)  // phone-verified=false
+                val v27 = W.nativeDiagnosticUserBool(27)  // 2FA=true
+                val v28 = W.nativeDiagnosticUserBool(28)  // phone-identifying=true
+                val v29 = W.nativeDiagnosticUserBool(29)  // phone-needs-verify=false
+                Log.i(TAG, "probeAccountInfo: cleared(26=$cleared26, 27=$cleared27) " +
+                    "after-inject(26=$v26 expect false, 27=$v27 expect true, " +
+                    "28=$v28 expect true, 29=$v29 expect false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeAccountInfo threw", t)
+            }
+        } else if (op == "probeuserbool") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                for (k in 0..3) W.nativeSetAccountFlag(k, true)
+                val v26 = W.nativeDiagnosticUserBool(26)  // phone-verified
+                val v27 = W.nativeDiagnosticUserBool(27)  // 2FA
+                val v28 = W.nativeDiagnosticUserBool(28)  // phone-identifying
+                val v29 = W.nativeDiagnosticUserBool(29)  // phone-needs-verify
+                for (k in 0..3) W.nativeSetAccountFlag(k, false)
+                val o26 = W.nativeDiagnosticUserBool(26)
+                val o27 = W.nativeDiagnosticUserBool(27)
+                val o28 = W.nativeDiagnosticUserBool(28)
+                val o29 = W.nativeDiagnosticUserBool(29)
+                val dur = W.nativeDiagnosticSetDurationControl(1)
+                Log.i(TAG, "probeUserBool: " +
+                    "set→phoneV=$v26 2FA=$v27 phoneIdent=$v28 phoneNeedsV=$v29 (all true); " +
+                    "cleared→phoneV=$o26 2FA=$o27 phoneIdent=$o28 phoneNeedsV=$o29 (all false); " +
+                    "durationControl=$dur (always true)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeUserBool threw", t)
+            }
+        } else if (op == "probeappsbool") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9600
+                W.setOwnedApps(intArrayOf(appId))
+                W.nativeSetAppFlag(0, appId, true)   // low-violence
+                W.nativeSetAppFlag(1, appId, true)   // vac-banned
+                W.setAppId(appId)
+                val sub  = W.nativeDiagnosticAppsBool(0)
+                val lowV = W.nativeDiagnosticAppsBool(1)
+                val cyber = W.nativeDiagnosticAppsBool(2)
+                val vac  = W.nativeDiagnosticAppsBool(3)
+                W.setOwnedApps(IntArray(0))
+                W.nativeSetAppFlag(0, appId, false)
+                W.nativeSetAppFlag(1, appId, false)
+                val subOff  = W.nativeDiagnosticAppsBool(0)
+                val lowVOff = W.nativeDiagnosticAppsBool(1)
+                val vacOff  = W.nativeDiagnosticAppsBool(3)
+                val ctxOk = W.nativeDiagnosticSetDlcContext(appId)
+                W.setAppId(0)
+                Log.i(TAG, "probeAppsBool: " +
+                    "subscribed=$sub (true), lowV=$lowV (true), " +
+                    "cyber=$cyber (always false), vac=$vac (true); " +
+                    "cleared → subOff=$subOff lowVOff=$lowVOff vacOff=$vacOff (all false), " +
+                    "setDlcContext=$ctxOk (true)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeAppsBool threw", t)
+            }
+        } else if (op == "probefilestate") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9700
+                val dir = java.io.File(context.cacheDir, "probe-filestate-$appId")
+                dir.mkdirs()
+                W.nativeSetAppCloudRemoteDir(appId, dir.absolutePath)
+                W.setAppId(appId)
+                W.nativeDiagnosticCloudFileWrite("note.dat", "x".toByteArray())
+                val persistedBefore = W.nativeDiagnosticCloudFilePersisted("note.dat")
+                val forgotten = W.nativeDiagnosticCloudFileForget("note.dat")
+                val persistedAfter = W.nativeDiagnosticCloudFilePersisted("note.dat")
+                val forgottenAgain = W.nativeDiagnosticCloudFileForget("note.dat")
+                val onDisk = java.io.File(dir, "note.dat").exists()
+                W.nativeDiagnosticCloudFileDelete("note.dat")
+                W.setAppId(0)
+                W.nativeSetAppCloudRemoteDir(appId, null)
+                Log.i(TAG, "probeFileState: persistedBefore=$persistedBefore (true), " +
+                    "forgotten=$forgotten (true), persistedAfter=$persistedAfter (false), " +
+                    "forgottenAgain=$forgottenAgain (false), diskKept=$onDisk (true)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeFileState threw", t)
+            }
+        } else if (op == "probecloudstream") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9500
+                val dir = java.io.File(context.cacheDir, "probe-cloud-stream-$appId")
+                dir.mkdirs()
+                W.nativeSetAppCloudRemoteDir(appId, dir.absolutePath)
+                W.setAppId(appId)
+                val h1 = W.nativeDiagnosticCloudStreamOpen("stream.dat")
+                val c1 = W.nativeDiagnosticCloudStreamWriteChunk(h1, "AAA".toByteArray())
+                val c2 = W.nativeDiagnosticCloudStreamWriteChunk(h1, "BBBB".toByteArray())
+                val c3 = W.nativeDiagnosticCloudStreamWriteChunk(h1, "CC".toByteArray())
+                val closed = W.nativeDiagnosticCloudStreamClose(h1)
+                val readBack = W.nativeDiagnosticCloudFileRead("stream.dat", 64)
+                val match = readBack != null && readBack.contentEquals("AAABBBBCC".toByteArray())
+                val h2 = W.nativeDiagnosticCloudStreamOpen("cancelled.dat")
+                W.nativeDiagnosticCloudStreamWriteChunk(h2, "ZZZ".toByteArray())
+                val cancelled = W.nativeDiagnosticCloudStreamCancel(h2)
+                val missing = W.nativeDiagnosticCloudFileRead("cancelled.dat", 16)
+                val bogusClose  = W.nativeDiagnosticCloudStreamClose(0x999999L)
+                val bogusCancel = W.nativeDiagnosticCloudStreamCancel(0x999999L)
+                W.nativeDiagnosticCloudFileDelete("stream.dat")
+                W.setAppId(0)
+                W.nativeSetAppCloudRemoteDir(appId, null)
+                Log.i(TAG, "probeCloudStream: open1=$h1 c1=$c1 c2=$c2 c3=$c3 " +
+                    "close=$closed match=$match (expect AAABBBBCC), " +
+                    "cancel=$cancelled miss-after-cancel=${missing == null}, " +
+                    "bogusClose=$bogusClose bogusCancel=$bogusCancel (both false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeCloudStream threw", t)
+            }
+        } else if (op == "probecloudasync") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9400
+                val dir = java.io.File(context.cacheDir, "probe-cloud-async-$appId")
+                dir.mkdirs()
+                W.nativeSetAppCloudRemoteDir(appId, dir.absolutePath)
+                W.setAppId(appId)
+                val payload = "async-roundtrip-${System.currentTimeMillis()}".toByteArray()
+                val wH = W.nativeDiagnosticCloudFileWriteAsync("async.dat", payload)
+                val rH = W.nativeDiagnosticCloudFileReadAsync("async.dat", 0, payload.size)
+                val bytes = W.nativeDiagnosticCloudFileReadAsyncComplete(rH, payload.size)
+                val match = bytes != null && bytes.contentEquals(payload)
+                val bytes2 = W.nativeDiagnosticCloudFileReadAsyncComplete(rH, payload.size)
+                W.nativeDiagnosticCloudFileDelete("async.dat")
+                W.setAppId(0)
+                W.nativeSetAppCloudRemoteDir(appId, null)
+                Log.i(TAG, "probeCloudAsync: writeAsync-hCall=$wH (expect non-zero), " +
+                    "readAsync-hCall=$rH (expect non-zero), " +
+                    "roundtrip-match=$match (expect true), " +
+                    "second-complete-null=${bytes2 == null} (expect true)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeCloudAsync threw", t)
+            }
+        } else if (op == "probecloudio") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9300
+                val dir = java.io.File(context.cacheDir, "probe-cloud-$appId")
+                dir.mkdirs()
+                W.nativeSetAppCloudRemoteDir(appId, dir.absolutePath)
+                W.setAppId(appId)
+                val payload = "hello-steam-cloud-${System.currentTimeMillis()}".toByteArray()
+                val wOk  = W.nativeDiagnosticCloudFileWrite("save.dat", payload)
+                val read = W.nativeDiagnosticCloudFileRead("save.dat", 256)
+                val match = read != null && read.contentEquals(payload)
+                val rejectW = W.nativeDiagnosticCloudFileWrite("../escape", byteArrayOf(1))
+                val rejectR = W.nativeDiagnosticCloudFileRead("../escape", 8)
+                val dOk = W.nativeDiagnosticCloudFileDelete("save.dat")
+                val readAfter = W.nativeDiagnosticCloudFileRead("save.dat", 256)
+                W.setAppId(0)
+                W.nativeSetAppCloudRemoteDir(appId, null)
+                Log.i(TAG, "probeCloudIO: write=$wOk (expect true), " +
+                    "read-roundtrip=$match (expect true), " +
+                    "rejectTraversalW=$rejectW (expect false), " +
+                    "rejectTraversalR=${rejectR != null} (expect false), " +
+                    "delete=$dOk (expect true), " +
+                    "read-after-delete=${readAfter != null} (expect false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeCloudIO threw", t)
+            }
+        } else if (op == "probedlprogress") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9200
+                W.nativeSetAppDownloadProgress(appId, 1234L, 5000L)
+                val active = W.nativeDiagnosticGetDlcDownloadProgress(appId)
+                val dl = W.nativeDiagnosticGetDlcDownloadProgressBytes()
+                val tot = W.nativeDiagnosticGetDlcDownloadProgressTotal()
+                W.nativeSetAppDownloadProgress(appId, 0L, 0L)
+                val cleared = W.nativeDiagnosticGetDlcDownloadProgress(appId)
+                val unknown = W.nativeDiagnosticGetDlcDownloadProgress(99999)
+                Log.i(TAG, "probeDlProgress: active=$active (expect true) " +
+                    "dl=$dl (expect 1234) total=$tot (expect 5000), " +
+                    "cleared=$cleared (expect false), " +
+                    "unknown-app=$unknown (expect false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeDlProgress threw", t)
+            }
+        } else if (op == "probebetaname") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val appId = 9100
+                W.nativeSetAppCurrentBeta(appId, "experimental_branch")
+                W.setAppId(appId)
+                val name = W.nativeDiagnosticGetCurrentBetaName()
+                W.nativeSetAppCurrentBeta(appId, null)
+                val cleared = W.nativeDiagnosticGetCurrentBetaName()
+                W.setAppId(0)
+                Log.i(TAG, "probeBetaName: bound→\"$name\" (expect experimental_branch), " +
+                    "cleared→\"$cleared\" (expect null)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBetaName threw", t)
+            }
+        } else if (op == "probedlcinstalled") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val parent = 8100
+                val dlc1 = 8101; val dlc2 = 8102; val dlc3 = 8103; val dlc4 = 8104
+                W.setOwnedApps(intArrayOf(parent, dlc1, dlc2, dlc3))
+                W.setInstalledApps(intArrayOf(parent, dlc1))
+                W.setAppDlcs(
+                    parent,
+                    intArrayOf(dlc1, dlc2, dlc3, dlc4),
+                    arrayOf("dlc-one", "dlc-two", "dlc-three", "dlc-four"),
+                    booleanArrayOf(true, true, true, true))
+                val r1 = W.nativeDiagnosticBIsDlcInstalled(dlc1)
+                val r2 = W.nativeDiagnosticBIsDlcInstalled(dlc2)
+                val r3 = W.nativeDiagnosticBIsDlcInstalled(dlc3)
+                val r4 = W.nativeDiagnosticBIsDlcInstalled(dlc4)
+                Log.i(TAG, "probeDlcInstalled: " +
+                    "dlc1 owned+self-installed=$r1 (expect true), " +
+                    "dlc2 owned+parent-installed=$r2 (expect true), " +
+                    "dlc3 owned+parent-installed=$r3 (expect true, parent in set), " +
+                    "dlc4 unowned=$r4 (expect false)")
+                W.setInstalledApps(intArrayOf(dlc1))
+                val r3b = W.nativeDiagnosticBIsDlcInstalled(dlc3)
+                Log.i(TAG, "probeDlcInstalled: dlc3 with parent removed=$r3b (expect false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeDlcInstalled threw", t)
+            }
+        } else if (op == "probetimedtrial") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.nativeDiagnosticInjectTrialLicense(5001, 90, 12)
+                W.nativeSetAppSourcePackages(5500, intArrayOf(5001))
+                W.setAppId(5500)
+                val packed = try { W.nativeDiagnosticBIsTimedTrial() }
+                             catch (_: UnsatisfiedLinkError) { 0L }
+                val isTrial = packed != 0L
+                val allowed = ((packed shr 32) and 0x7FFFFFFFL).toInt()
+                val played  = (packed and 0xFFFFFFFFL).toInt()
+                W.setAppId(0)
+                W.nativeDiagnosticInjectTrialLicense(5002, 0, 0)
+                W.nativeSetAppSourcePackages(5600, intArrayOf(5002))
+                W.setAppId(5600)
+                val nonTrialPacked = try { W.nativeDiagnosticBIsTimedTrial() }
+                                     catch (_: UnsatisfiedLinkError) { 0L }
+                val isNonTrial = nonTrialPacked != 0L
+                W.setAppId(0)
+                Log.i(TAG, "probeTimedTrial: trial app: isTrial=$isTrial " +
+                    "allowed=$allowed seconds (expect 5400, =90*60), " +
+                    "played=$played seconds (expect 720, =12*60); " +
+                    "non-trial app: isTrial=$isNonTrial (expect false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeTimedTrial threw", t)
+            }
+        } else if (op == "probeavgrate") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val r1 = try { W.nativeDiagnosticUpdateAvgRateStat("kph_test", 30.0f, 60.0) }
+                         catch (_: UnsatisfiedLinkError) { 0.0f }
+                val r2 = try { W.nativeDiagnosticUpdateAvgRateStat("kph_test", 60.0f, 60.0) }
+                         catch (_: UnsatisfiedLinkError) { 0.0f }
+                val r3 = try { W.nativeDiagnosticUpdateAvgRateStat("kph_test", 30.0f, 60.0) }
+                         catch (_: UnsatisfiedLinkError) { 0.0f }
+                Log.i(TAG, "probeAvgRate: session1(30/60)=$r1 (expect 0.5), " +
+                    "session2(+60/+60)=$r2 (expect ~0.75), " +
+                    "session3(+30/+60)=$r3 (expect ~0.6667)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeAvgRate threw", t)
+            }
+        } else if (op == "probeappowner") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val selfSid = 0x0110000100000000L or 0xCAFE1234L
+                W.setSteamId(selfSid)
+                val selfAcct  = 0xCAFE1234.toInt()
+                val otherAcct = 0x11111111.toInt()
+                W.nativeDiagnosticInjectLicenseList(
+                    packageIds = intArrayOf(4001, 4002),
+                    ownerIds   = intArrayOf(selfAcct, otherAcct))
+                W.nativeSetAppSourcePackages(1100, intArrayOf(4001))
+                W.nativeSetAppSourcePackages(2200, intArrayOf(4002))
+                W.setOwnedApps(intArrayOf(1100, 2200))
+
+                W.setAppId(1100)
+                val ownerDirect = try { W.nativeDiagnosticGetAppOwner() }
+                                  catch (_: UnsatisfiedLinkError) { 0L }
+                W.setAppId(2200)
+                val ownerShared = try { W.nativeDiagnosticGetAppOwner() }
+                                  catch (_: UnsatisfiedLinkError) { 0L }
+                W.setAppId(0)
+
+                val expectedShared = 0x0110000100000000L or 0x11111111L
+                Log.i(TAG, "probeAppOwner: " +
+                    "direct(1100)=${java.lang.Long.toHexString(ownerDirect)} " +
+                    "shared(2200)=${java.lang.Long.toHexString(ownerShared)} " +
+                    "(expect direct=${java.lang.Long.toHexString(selfSid)}, " +
+                    "shared=${java.lang.Long.toHexString(expectedShared)})")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeAppOwner threw", t)
+            }
+        } else if (op == "probefamilyshare") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val selfSid = 0x0110000100000000L or 0xCAFE1234L
+                W.setSteamId(selfSid)
+                val selfAcct = 0xCAFE1234.toInt()  // ~ -889004492 as signed
+                W.nativeDiagnosticInjectLicenseList(
+                    packageIds = intArrayOf(3001, 3002),
+                    ownerIds   = intArrayOf(selfAcct, 0x11111111))
+                W.nativeSetAppSourcePackages(1000, intArrayOf(3001))
+                W.nativeSetAppSourcePackages(2000, intArrayOf(3002))
+                W.nativeSetAppSourcePackages(3000, intArrayOf(3001, 3002))
+                W.setAppId(1000)
+                val r1 = try { W.nativeDiagnosticBIsSubscribedFromFamilySharing() }
+                         catch (_: UnsatisfiedLinkError) { false }
+                W.setAppId(2000)
+                val r2 = try { W.nativeDiagnosticBIsSubscribedFromFamilySharing() }
+                         catch (_: UnsatisfiedLinkError) { false }
+                W.setAppId(3000)
+                val r3 = try { W.nativeDiagnosticBIsSubscribedFromFamilySharing() }
+                         catch (_: UnsatisfiedLinkError) { false }
+                W.setAppId(0)  // reset
+                Log.i(TAG, "probeFamilyShare: app1000_selfOnly=$r1 (expect false) " +
+                    "app2000_otherOnly=$r2 (expect true) " +
+                    "app3000_mixed=$r3 (expect false)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeFamilyShare threw", t)
+            }
+        } else if (op == "probepurchasetime") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val pkgs = intArrayOf(2001, 2002, 2003)
+                val owners = intArrayOf(0, 0, 0)
+                W.nativeDiagnosticInjectLicenseList(pkgs, owners)
+                val testAppId = 9999
+                W.nativeSetAppSourcePackages(testAppId, intArrayOf(2001, 2002))
+                val earliest = try {
+                    W.nativeDiagnosticGetEarliestPurchaseUnixTime(testAppId)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val now = (System.currentTimeMillis() / 1000).toInt()
+                val withinWindow = earliest > 0 && (now - earliest) < 60  // sanity: < 60s old
+                val unknownApp = try {
+                    W.nativeDiagnosticGetEarliestPurchaseUnixTime(99988)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probePurchaseTime: app=$testAppId earliest=$earliest " +
+                    "now=$now withinWindow=$withinWindow " +
+                    "unknownApp(99988)=$unknownApp " +
+                    "(expect earliest within 60s of now; unknownApp=0)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probePurchaseTime threw", t)
+            }
+        } else if (op == "probebridgelicenses") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val packageIds = intArrayOf(10001, 10002, 10003)
+                val ownerIds   = intArrayOf(0, 99999999, 77777777)
+                try { W.nativeDiagnosticInjectLicenseList(packageIds, ownerIds) }
+                catch (_: UnsatisfiedLinkError) {}
+                val o1 = try { W.nativeDiagnosticGetLicenseOwner(10001) } catch (_: UnsatisfiedLinkError) { -2 }
+                val o2 = try { W.nativeDiagnosticGetLicenseOwner(10002) } catch (_: UnsatisfiedLinkError) { -2 }
+                val o3 = try { W.nativeDiagnosticGetLicenseOwner(10003) } catch (_: UnsatisfiedLinkError) { -2 }
+                val miss = try { W.nativeDiagnosticGetLicenseOwner(99999) } catch (_: UnsatisfiedLinkError) { -2 }
+                Log.i(TAG, "probeBridgeLicenses: injected 3 licenses; " +
+                    "owner(10001)=$o1 (expect 0=self-owned), " +
+                    "owner(10002)=$o2 (expect 99999999=family-share-A), " +
+                    "owner(10003)=$o3 (expect 77777777=family-share-B), " +
+                    "owner(99999)=$miss (expect -1=absent); " +
+                    "look for 'license-list observer: 3 license(s) mirrored'")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeLicenses threw", t)
+            }
+        } else if (op == "probebridgefriends") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val sids = longArrayOf(
+                    76561197960287930L,
+                    76561197960265728L,
+                    76561197960123456L,
+                )
+                try { W.nativeDiagnosticInjectFriendsList(sids) }
+                catch (_: UnsatisfiedLinkError) {}
+                val bs = com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamBootstrap
+                val frCount = bs.friendCount()
+                Log.i(TAG, "probeBridgeFriends: injected 3 SIDs; bootstrap-side " +
+                    "friendCount()=$frCount (expect 3 when bootstrap alive — " +
+                    "look for 'friends-list observer: 3 mutual friend(s) mirrored' " +
+                    "log line for direct verification)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeFriends threw", t)
+            }
+        } else if (op == "probebridgelogon") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                try { W.nativeDiagnosticInjectLogonState(false) } catch (_: UnsatisfiedLinkError) {}
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                try { W.nativeDiagnosticInjectLogonState(true) } catch (_: UnsatisfiedLinkError) {}
+                val depth2 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                try { W.nativeDiagnosticInjectLogonState(true) } catch (_: UnsatisfiedLinkError) {}
+                val depth3 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                try { W.nativeDiagnosticInjectLogonState(false) } catch (_: UnsatisfiedLinkError) {}
+                val depth4 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeBridgeLogon: cb depth $depth0 → $depth1 → $depth2 → $depth3 → $depth4 " +
+                    "(expect Δ pattern: ? 0 +1 0 +1; the first transition is " +
+                    "implementation-dependent on prior cached state)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeLogon threw", t)
+            }
+        } else if (op == "probebridgeclearrp") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setSteamId(0x110000100C123456L)
+                val ok1 = try { W.nativeDiagnosticSetRichPresence("status", "Playing") }
+                          catch (_: UnsatisfiedLinkError) { false }
+                val ok2 = try { W.nativeDiagnosticSetRichPresence("connect", "+1.2.3.4:27015") }
+                          catch (_: UnsatisfiedLinkError) { false }
+                try { W.nativeDiagnosticClearRichPresence() }
+                catch (_: UnsatisfiedLinkError) {}
+                Log.i(TAG, "probeBridgeClearRp: setOk=$ok1+$ok2, then Clear — " +
+                    "look for 3 wn-cm-bridge 'set_rich_presence' lines: " +
+                    "1 key, 2 keys, 0 keys (the clear)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeClearRp threw", t)
+            }
+        } else if (op == "probebridgerp") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val aliceId = 76561197960287930L
+                try { W.nativeDiagnosticRequestFriendRichPresence(aliceId) }
+                catch (_: UnsatisfiedLinkError) {}
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeBridgeRp: cb depth pre=$depth0 post=$depth1 " +
+                    "(expect post-pre=1 synthetic FriendRichPresenceUpdate_t; " +
+                    "wn-cm-bridge log line: 'request_user_info(...alice, flags=0x800)')")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeRp threw", t)
+            }
+        } else if (op == "probebridgeplayed") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setAppId(0)        // baseline (already 0; no-op expected)
+                W.setAppId(440)      // → broadcast 440
+                W.setAppId(440)      // no-op (dedup)
+                W.setAppId(0)        // → clear
+                W.setAppId(570)      // → broadcast 570
+                W.setAppId(0)        // → clear
+                Log.i(TAG, "probeBridgePlayed: cycled setAppId 0→440→440→0→570→0 — " +
+                    "look for 4 wn-cm-bridge 'notify_games_played' lines " +
+                    "(440 broadcast, 0 clear, 570 broadcast, 0 clear)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgePlayed threw", t)
+            }
+        } else if (op == "probeauthwrap") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val testAppId = 99988  // avoid colliding with seedtestschemacache 99999
+                val ownership = ByteArray(100) { ((it * 7 + 3) and 0xFF).toByte() }
+                W.setAppId(testAppId)
+                val inj = try { W.nativeDiagnosticInjectOwnershipTicket(testAppId, ownership) }
+                          catch (_: UnsatisfiedLinkError) { false }
+                val cachedLen = try { W.nativeDiagnosticGetCachedOwnershipTicket(testAppId, null) }
+                                catch (_: UnsatisfiedLinkError) { -1 }
+                val buf = ByteArray(256)
+                val hCall = try { W.nativeDiagnosticGetAuthTicket(buf) }
+                            catch (_: UnsatisfiedLinkError) { -1 }
+                val sizePrefix = (buf[0].toInt() and 0xFF) or
+                                  ((buf[1].toInt() and 0xFF) shl 8) or
+                                  ((buf[2].toInt() and 0xFF) shl 16) or
+                                  ((buf[3].toInt() and 0xFF) shl 24)
+                val connId     = (buf[12].toInt() and 0xFF) or
+                                  ((buf[13].toInt() and 0xFF) shl 8) or
+                                  ((buf[14].toInt() and 0xFF) shl 16) or
+                                  ((buf[15].toInt() and 0xFF) shl 24)
+                val connCount  = (buf[20].toInt() and 0xFF) or
+                                  ((buf[21].toInt() and 0xFF) shl 8) or
+                                  ((buf[22].toInt() and 0xFF) shl 16) or
+                                  ((buf[23].toInt() and 0xFF) shl 24)
+                val firstOwnByte = buf[24].toInt() and 0xFF
+                Log.i(TAG, "probeAuthWrap: inj=$inj cachedLen=$cachedLen hCall=$hCall " +
+                    "sizePrefix=$sizePrefix connId=$connId connCount=$connCount " +
+                    "firstOwnByte=$firstOwnByte " +
+                    "(expect inj=true cachedLen=100 sizePrefix=20 connId=hCall " +
+                    "connCount=1 firstOwnByte=3)")
+                W.setAppId(0)
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeAuthWrap threw", t)
+            }
+        } else if (op == "probebridgeticket") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val sizeOnly = try {
+                    W.nativeDiagnosticGetCachedOwnershipTicket(440, null)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val tooSmall = ByteArray(8)
+                val sizeReport = try {
+                    W.nativeDiagnosticGetCachedOwnershipTicket(440, tooSmall)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val bigBuf = ByteArray(8192)
+                val filled = try {
+                    W.nativeDiagnosticGetCachedOwnershipTicket(440, bigBuf)
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeBridgeTicket: appId=440 sizeOnly=$sizeOnly " +
+                    "tooSmall=$sizeReport bigBuf=$filled " +
+                    "(expect all=0 until wn-session pre-fetches the ticket; " +
+                    "non-zero means cache hit + bytes copied or size-needed)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeTicket threw", t)
+            }
+        } else if (op == "probebridgereqbulk") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val sids = longArrayOf(
+                    76561197960287932L,
+                    76561197960287933L,
+                    0L,                       // filtered
+                    76561197960287934L,
+                )
+                val full = try {
+                    W.nativeDiagnosticRequestUserInfoBulk(sids, flags = 0)  // default 0x47
+                } catch (_: UnsatisfiedLinkError) { false }
+                val nameOnly = try {
+                    W.nativeDiagnosticRequestUserInfoBulk(sids, flags = 0x01)
+                } catch (_: UnsatisfiedLinkError) { false }
+                val empty = try {
+                    W.nativeDiagnosticRequestUserInfoBulk(longArrayOf(), flags = 0)
+                } catch (_: UnsatisfiedLinkError) { false }
+                val allZero = try {
+                    W.nativeDiagnosticRequestUserInfoBulk(longArrayOf(0L, 0L), flags = 0)
+                } catch (_: UnsatisfiedLinkError) { false }
+                Log.i(TAG, "probeBridgeReqBulk: full=$full nameOnly=$nameOnly " +
+                    "empty=$empty allZero=$allZero " +
+                    "(expect full=true nameOnly=true empty=false allZero=false; " +
+                    "wn-cm-bridge lines should show count=3 for full/nameOnly)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeReqBulk threw", t)
+            }
+        } else if (op == "probebridgereq") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val uncachedSid = 76561197960287932L
+                val cachedSid   = 76561197960287930L  // possibly seeded by earlier seedtestfriends
+                val r1 = try {
+                    W.nativeDiagnosticRequestUserInformation(uncachedSid, nameOnly = false)
+                } catch (_: UnsatisfiedLinkError) { false }
+                val r2 = try {
+                    W.nativeDiagnosticRequestUserInformation(uncachedSid, nameOnly = true)
+                } catch (_: UnsatisfiedLinkError) { false }
+                val r3 = try {
+                    W.nativeDiagnosticRequestUserInformation(cachedSid, nameOnly = false)
+                } catch (_: UnsatisfiedLinkError) { false }
+                Log.i(TAG, "probeBridgeReq: " +
+                    "uncached(fullSet)=$r1 uncached(nameOnly)=$r2 cached=$r3 " +
+                    "(expect uncached=true=true cached=$r3 — look for wn-cm-bridge " +
+                    "'request_user_info' log lines)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeReq threw", t)
+            }
+        } else if (op == "probebridgename") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val before = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                val unique = "BridgeProbe-${System.currentTimeMillis() % 100000}"
+                val hCall = try {
+                    W.nativeDiagnosticSetPersonaName(unique)
+                } catch (_: UnsatisfiedLinkError) { 0L }
+                val after = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "probeBridgeName: SetPersonaName('$unique') vtable[1] → " +
+                    "hCall=$hCall cb depth before=$before after=$after " +
+                    "(expect after-before=1 PersonaStateChange + check wn-cm-bridge " +
+                    "log line: 'set_persona_name→ live CMClient')")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridgeName threw", t)
+            }
+        } else if (op == "probebridge") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                W.setPersonaState(0)  // baseline
+                Thread.sleep(50)
+                W.setPersonaState(1)  // online — should hit bridge
+                Thread.sleep(50)
+                W.setPersonaState(3)  // away — should hit bridge
+                Log.i(TAG, "probeBridge: dispatched 3 setPersonaState calls — " +
+                    "look for 'wn-cm-bridge' log lines (each call either logs " +
+                    "'no active CMClient' or 'dispatched to live CMClient')")
+            } catch (t: Throwable) {
+                Log.e(TAG, "probeBridge threw", t)
+            }
+        } else if (op == "seedtestoverlay") {
+            try {
+                val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                val depth0 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setGameOverlayActive(true)            // false→true: +1
+                W.setGameOverlayActive(true)            // dedup: +0
+                val depthMid = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                W.setGameOverlayActive(false)           // true→false: +1
+                W.setGameOverlayActive(false)           // dedup: +0
+                W.setGameOverlayActive(true)            // false→true: +1
+                val depth1 = try { W.nativeDiagnosticCallbackDepth() } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestOverlay: cb depth pre=$depth0 mid=$depthMid post=$depth1 " +
+                    "(expect mid-pre=1, post-mid=2 — 3 transitions, 2 redundant sets de-duped)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestOverlay threw", t)
+            }
+        } else if (op == "seedteststats") {
+            try {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAchievementSchema(
+                        apiNames    = arrayOf("ACH_TEST_FIRST",  "ACH_TEST_SECOND", "ACH_HIDDEN"),
+                        displayNames = arrayOf("First Blood",    "Double Tap",      "???"),
+                        descriptions = arrayOf("Score one kill.", "Score two kills.", "Reach the hidden ending."),
+                        icons        = arrayOf("",                "",                ""),
+                        hidden       = booleanArrayOf(false, false, true),
+                    )
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAchievementProgress("ACH_TEST_FIRST", achieved = true, unlockTimeUnix = 1700000000)
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .addAchievementLocale("ACH_TEST_FIRST", "spanish",
+                        displayName = "Primera Sangre",
+                        description = "Consigue una eliminación.")
+                val cbDepthAfterSchema = try {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .nativeDiagnosticCallbackDepth()
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val setOk = try {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .nativeDiagnosticSetAchievement("ACH_TEST_SECOND")
+                } catch (_: UnsatisfiedLinkError) { false }
+                val storeOk = try {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .nativeDiagnosticStoreStats()
+                } catch (_: UnsatisfiedLinkError) { false }
+                val cbDepthAfterStore = try {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .nativeDiagnosticCallbackDepth()
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                val progressOk = try {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .nativeDiagnosticIndicateAchievementProgress(
+                            "ACH_HIDDEN", current = 50, max = 100)
+                } catch (_: UnsatisfiedLinkError) { false }
+                val cbDepthAfterProgress = try {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .nativeDiagnosticCallbackDepth()
+                } catch (_: UnsatisfiedLinkError) { -1 }
+                Log.i(TAG, "seedTestStats: pushed 3 synthetic achievements " +
+                    "(cb depth post-schema=$cbDepthAfterSchema, " +
+                    "setAch ok=$setOk, storeStats ok=$storeOk, " +
+                    "cb depth post-store=$cbDepthAfterStore, " +
+                    "indicateProgress ok=$progressOk, " +
+                    "cb depth post-progress=$cbDepthAfterProgress)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "seedTestStats threw", t)
+            }
+        } else if (op != "query" && op != "state" && after != before) {
+            PrefManager.wnHybridMode = after
+            try {
+                SteamService.setHybridModeRuntime(after)
+            } catch (t: Throwable) {
+                Log.e(TAG, "setHybridModeRuntime threw", t)
+            }
+        }
+
+        Log.i(
+            TAG,
+            "op=$op before=$before after=$after loggedIn=${SteamService.isLoggedIn}" +
+                " bootstrapAlive=$bsInitialized steamId=${WnSteamBootstrap.steamId()}" +
+                " persona='${WnSteamBootstrap.personaName() ?: ""}'",
+        )
+
+        if (op == "state") {
+            val bs = WnSteamBootstrap
+            val W = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            val pSid     = runCatching { W.nativeGetPushedSteamId() }.getOrNull() ?: 0L
+            val pName    = runCatching { W.nativeGetPushedPersonaName() }.getOrNull() ?: ""
+            val pPState  = runCatching { W.nativeGetPushedPersonaState() }.getOrNull() ?: 0
+            val pLoggedOn= runCatching { W.nativeGetPushedLoggedOn() }.getOrNull() ?: false
+            val pAppId   = runCatching { W.nativeGetPushedAppId() }.getOrNull() ?: 0
+            val pOwned   = runCatching { W.nativeGetPushedOwnedAppCount() }.getOrNull() ?: 0
+            val pInst    = runCatching { W.nativeGetPushedInstalledAppCount() }.getOrNull() ?: 0
+            val pFriends = runCatching { W.nativeGetPushedFriendCount() }.getOrNull() ?: 0
+            val pCFiles  = runCatching { W.nativeGetPushedCloudFileCount() }.getOrNull() ?: 0
+            val pCAcct   = runCatching { W.nativeGetPushedCloudEnabledAccount() }.getOrNull() ?: false
+            val pCApp    = runCatching { W.nativeGetPushedCloudEnabledApp() }.getOrNull() ?: false
+            val pETkt    = if (pAppId > 0) runCatching {
+                W.nativeGetPushedEncryptedAppTicketSize(pAppId)
+            }.getOrNull() ?: 0 else 0
+            val pIpCountry = runCatching { W.nativeGetPushedIpCountry() }.getOrNull() ?: ""
+            Log.i(TAG, "pushed: sid=$pSid pname='$pName' pstate=$pPState " +
+                "loggedOn=$pLoggedOn appId=$pAppId owned=$pOwned installed=$pInst " +
+                "friends=$pFriends cloudFiles=$pCFiles cloudAcct=$pCAcct cloudApp=$pCApp " +
+                "ip='$pIpCountry' encTicketBytes=$pETkt")
+            val sb = StringBuilder()
+            sb.append("user(bootstrap): liveSid=").append(bs.liveSteamId())
+                .append(" pname='").append(bs.personaName() ?: "").append('\'')
+                .append(" pstate=").append(bs.personaState())
+                .append(" loggedOnPub=").append(bs.loggedOnPublic())
+            Log.i(TAG, sb.toString())
+
+            val wnState = com.winlator.cmod.feature.stores.steam.service
+                .SteamService.wnSessionStateForDiag()
+            val wnStateLabel = when (wnState) {
+                -1 -> "noSession"
+                0 -> "Disconnected"
+                1 -> "Connecting"
+                2 -> "Connected"
+                3 -> "LoggedOn"
+                else -> "raw=$wnState"
+            }
+            val suspendReason = com.winlator.cmod.feature.stores.steam.service
+                .SteamService.wnSessionSuspensionReasonForDiag()
+            Log.i(TAG, "wn-session: state=$wnState ($wnStateLabel) " +
+                "logonGateUntilMs=${com.winlator.cmod.feature.stores.steam.service.SteamService.logonGateUntilMs} " +
+                "lastEResult=${com.winlator.cmod.feature.stores.steam.service.SteamService.lastLogonFailureEresult} " +
+                "consecutive=${com.winlator.cmod.feature.stores.steam.service.SteamService.consecutiveLogonFailures} " +
+                "suspend=[$suspendReason]")
+
+            val appId = bs.currentAppId()
+            sb.setLength(0)
+            sb.append("apps(bootstrap): boundAppId=").append(appId)
+                .append(" subscribed=").append(bs.isSubscribedApp(appId))
+                .append(" installed=").append(bs.isAppInstalled(appId))
+                .append(" lang=").append(bs.currentGameLanguage() ?: "")
+                .append(" dlcCount=").append(bs.dlcCount(appId))
+                .append(" owner=").append(bs.appOwner())
+                .append(" famShared=").append(bs.isSubscribedFromFamilySharing())
+            Log.i(TAG, sb.toString())
+
+            sb.setLength(0)
+            sb.append("cloud(bootstrap): account=").append(bs.cloudEnabledForAccount())
+                .append(" app=").append(bs.cloudEnabledForApp())
+                .append(" files=").append(bs.cloudFileCount())
+                .append(" quota=").append(bs.cloudQuota().joinToString("/"))
+            Log.i(TAG, sb.toString())
+
+            val achList = bs.listAchievements()
+            val directFromPushed = try {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .nativeDiagnosticAchievementCount()
+            } catch (_: UnsatisfiedLinkError) { -1 }
+            val cbDepth = try {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .nativeDiagnosticCallbackDepth()
+            } catch (_: UnsatisfiedLinkError) { -1 }
+            sb.setLength(0)
+            sb.append("stats: numAch=").append(bs.numAchievements())
+                .append(" listLen=").append(achList.size)
+                .append(" directPushed=").append(directFromPushed)
+                .append(" cbQueueDepth=").append(cbDepth)
+                .append(" firstAch=").append(achList.firstOrNull() ?: "")
+            Log.i(TAG, sb.toString())
+
+            val friends = bs.listFriends()
+            val pushedFriendCount = runCatching { W.nativeGetPushedFriendCount() }.getOrNull() ?: 0
+            val pushedFirstFriend = runCatching { W.nativeGetPushedFirstFriend() }.getOrNull() ?: 0L
+            sb.setLength(0)
+            sb.append("friends: immediateCount=")
+                .append(bs.friendCount(WnSteamBootstrap.FriendFlags.Immediate))
+                .append(" listLen=").append(friends.size)
+                .append(" firstId=").append(friends.firstOrNull() ?: 0)
+                .append(" (pushed=").append(pushedFriendCount)
+                .append(" firstSid=").append(pushedFirstFriend).append(")")
+            Log.i(TAG, sb.toString())
+
+            val pushedServerRealTime = runCatching { W.nativeGetPushedServerRealTime() }.getOrNull() ?: 0
+            val pushedIpCountryUtil  = runCatching { W.nativeGetPushedIpCountry() }.getOrNull() ?: ""
+            val pushedUiLang         = runCatching { W.nativeGetPushedUiLanguage() }.getOrNull() ?: ""
+            sb.setLength(0)
+            sb.append("utils: serverTime=").append(bs.serverRealTime())
+                .append(" ipCountry=").append(bs.ipCountry() ?: "")
+                .append(" uiLang=").append(bs.steamUiLanguage() ?: "")
+                .append(" battery=").append(bs.currentBatteryPower())
+                .append(" (pushed: time=").append(pushedServerRealTime)
+                .append(" ip='").append(pushedIpCountryUtil).append("'")
+                .append(" lang='").append(pushedUiLang).append("')")
+            Log.i(TAG, sb.toString())
+
+            val tcpAccepted = try {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .nativeDiagnosticTcpAccepted()
+            } catch (_: UnsatisfiedLinkError) { -1 }
+            Log.i(TAG, "tcp: accepted=$tcpAccepted")
+        }
+    }
+
+    companion object {
+        const val ACTION = "com.winnative.cmod.action.HYBRID_MODE"
+        private const val TAG = "HybridModeReceiver"
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamAutoCloud.kt b/app/src/main/feature/stores/steam/service/SteamAutoCloud.kt
deleted file mode 100644
index 84cdc1a30..000000000
--- a/app/src/main/feature/stores/steam/service/SteamAutoCloud.kt
+++ /dev/null
@@ -1,964 +0,0 @@
-package com.winlator.cmod.feature.stores.steam.service
-import androidx.room.withTransaction
-import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
-import com.winlator.cmod.feature.stores.steam.data.SaveFilePattern
-import com.winlator.cmod.feature.stores.steam.data.SteamApp
-import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
-import com.winlator.cmod.feature.stores.steam.data.UserFilesDownloadResult
-import com.winlator.cmod.feature.stores.steam.data.UserFilesUploadResult
-import com.winlator.cmod.feature.stores.steam.enums.PathType
-import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
-import com.winlator.cmod.feature.stores.steam.enums.SyncResult
-import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.FileChanges
-import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.getAppDirPath
-import com.winlator.cmod.feature.stores.steam.utils.FileUtils
-import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
-import `in`.dragonbra.javasteam.enums.EPlatformType
-import `in`.dragonbra.javasteam.enums.EResult
-import `in`.dragonbra.javasteam.steam.handlers.steamcloud.AppFileChangeList
-import `in`.dragonbra.javasteam.steam.handlers.steamcloud.AppFileInfo
-import `in`.dragonbra.javasteam.steam.handlers.steamcloud.SteamCloud
-import `in`.dragonbra.javasteam.util.crypto.CryptoHelper
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.future.await
-import kotlinx.coroutines.withTimeout
-import okhttp3.Headers
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import timber.log.Timber
-import java.io.FileOutputStream
-import java.io.InputStream
-import java.io.OutputStream
-import java.io.RandomAccessFile
-import java.net.SocketTimeoutException
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.util.Date
-import java.util.stream.Collectors
-import java.util.zip.ZipInputStream
-import kotlin.io.path.name
-import kotlin.io.path.pathString
-import kotlin.time.measureTime
-
-/**
- * [Steam Auto Cloud](https://partner.steamgames.com/doc/features/cloud#steam_auto-cloud)
- */
-object SteamAutoCloud {
-    private const val MAX_USER_FILE_RETRIES = 3
-
-    private fun findPlaceholderWithin(aString: String): Sequence<MatchResult> = Regex("%\\w+%").findAll(aString)
-
-    private inline fun InputStream.copyTo(
-        out: OutputStream,
-        bufferSize: Int = 8 * 1024,
-        progress: (Long) -> Unit,
-    ) {
-        val buf = ByteArray(bufferSize)
-        var bytesRead: Int
-        var total = 0L
-        while (read(buf).also { bytesRead = it } >= 0) {
-            if (bytesRead == 0) continue
-            out.write(buf, 0, bytesRead)
-            total += bytesRead
-            progress(total)
-        }
-    }
-
-    fun syncUserFiles(
-        appInfo: SteamApp,
-        clientId: Long,
-        steamInstance: SteamService,
-        steamCloud: SteamCloud,
-        preferredSave: SaveLocation = SaveLocation.None,
-        parentScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
-        prefixToPath: (String) -> String,
-        overrideLocalChangeNumber: Long? = null,
-        onProgress: ((message: String, progress: Float) -> Unit)? = null,
-    ): Deferred<PostSyncInfo?> =
-        parentScope.async {
-            val postSyncInfo: PostSyncInfo?
-
-            Timber.i("Retrieving save files of ${appInfo.name}")
-
-            val getPathTypePairs: (AppFileChangeList) -> List<Pair<String, String>> = { fileList ->
-                fileList.pathPrefixes
-                    .map {
-                        var matchResults = findPlaceholderWithin(it).map { it.value }.toList()
-                        val bare = if (it.startsWith("ROOT_MOD")) listOf("ROOT_MOD") else emptyList()
-
-                        Timber.i("Mapping prefix $it and found $matchResults")
-
-                        if (matchResults.isEmpty()) {
-                            matchResults = List(1) { PathType.DEFAULT.name }
-                        }
-
-                        matchResults + bare
-                    }.flatten()
-                    .distinct()
-                    .map { it to prefixToPath(it) }
-            }
-
-            val convertPrefixes: (AppFileChangeList) -> List<String> = { fileList ->
-                val pathTypePairs = getPathTypePairs(fileList)
-
-                fileList.pathPrefixes.map { prefix ->
-                    var modified = prefix
-
-                    val prefixContainsNoPlaceholder = findPlaceholderWithin(prefix).none()
-
-                    if (prefixContainsNoPlaceholder) {
-                        modified = Paths.get(PathType.DEFAULT.name, prefix).pathString
-                    }
-
-                    pathTypePairs.forEach {
-                        modified = modified.replace(it.first, it.second)
-                    }
-
-                    // if the prefix has not been modified then there were no placeholders in it
-                    // so we need to set it to point to the default path
-                    if (modified == prefix) {
-                        modified = Paths.get(prefixToPath(PathType.DEFAULT.name), modified).toString()
-                    }
-
-                    modified
-                }
-            }
-
-            val getFilePrefix: (AppFileInfo, AppFileChangeList) -> String = { file, fileList ->
-                if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
-                    Paths.get(fileList.pathPrefixes[file.pathPrefixIndex]).pathString
-                } else {
-                    ""
-                }
-            }
-
-            val getFilePrefixPath: (AppFileInfo, AppFileChangeList) -> String = { file, fileList ->
-                Paths.get(getFilePrefix(file, fileList), file.filename).pathString
-            }
-
-            val getFullFilePath: (AppFileInfo, AppFileChangeList) -> Path = getFullFilePath@{ file, fileList ->
-                val gameInstallPrefix = "%${PathType.GameInstall.name}%"
-                if (file.filename.startsWith(gameInstallPrefix)) {
-                    // Steam API sometimes returns prefix="" and filename="%GameInstall%save0.dat" instead of splitting correctly.
-                    return@getFullFilePath Paths.get(
-                        prefixToPath(PathType.GameInstall.name),
-                        file.filename.removePrefix(gameInstallPrefix),
-                    )
-                }
-
-                val convertedPrefixes = convertPrefixes(fileList)
-
-                if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
-                    Paths.get(convertedPrefixes[file.pathPrefixIndex], file.filename)
-                } else {
-                    // if the file does not reference any prefix then we need to set it to the default path
-                    Paths.get(prefixToPath(PathType.DEFAULT.name), file.filename)
-                }
-            }
-
-            val getFilesDiff: (List<UserFileInfo>, List<UserFileInfo>) -> Pair<Boolean, FileChanges> = { currentFiles, oldFiles ->
-                val overlappingFiles =
-                    currentFiles.filter { currentFile ->
-                        oldFiles.any { currentFile.prefixPath == it.prefixPath }
-                    }
-
-                val newFiles =
-                    currentFiles.filter { currentFile ->
-                        !oldFiles.any { currentFile.prefixPath == it.prefixPath }
-                    }
-
-                val deletedFiles =
-                    oldFiles.filter { oldFile ->
-                        !currentFiles.any { oldFile.prefixPath == it.prefixPath }
-                    }
-
-                val modifiedFiles =
-                    overlappingFiles.filter { file ->
-                        oldFiles
-                            .first {
-                                it.prefixPath == file.prefixPath
-                            }.let {
-                                Timber.i("Comparing SHA of ${it.prefixPath} and ${file.prefixPath}")
-                                Timber.i("[${it.sha.joinToString(", ")}]\n[${file.sha.joinToString(", ")}]")
-
-                                !it.sha.contentEquals(file.sha)
-                            }
-                    }
-
-                val changesExist = newFiles.isNotEmpty() || deletedFiles.isNotEmpty() || modifiedFiles.isNotEmpty()
-
-                changesExist to FileChanges(deletedFiles, modifiedFiles, newFiles)
-            }
-
-            val hasHashConflicts: (Map<String, List<UserFileInfo>>, AppFileChangeList) -> Boolean =
-                { localUserFiles, fileList ->
-                    fileList.files.any { file ->
-                        Timber.i("Checking for " + "${getFilePrefix(file, fileList)} in ${localUserFiles.keys}")
-
-                        localUserFiles[getFilePrefix(file, fileList)]?.let { localUserFile ->
-                            localUserFile
-                                .firstOrNull {
-                                    Timber.i("Comparing ${file.filename} and ${it.filename}")
-
-                                    it.filename == file.filename
-                                }?.let {
-                                    Timber.i("Comparing SHA of ${getFilePrefixPath(file, fileList)} and ${it.prefixPath}")
-                                    Timber.i("[${file.shaFile.joinToString(", ")}]\n[${it.sha.joinToString(", ")}]")
-
-                                    !file.shaFile.contentEquals(it.sha)
-                                }
-                        } == true
-                    }
-                }
-
-            val getLocalUserFilesAsPrefixMap: () -> Map<String, List<UserFileInfo>> = {
-                val savePatterns = appInfo.ufs.saveFilePatterns.filter { userFile -> userFile.root.isWindows }
-
-                if (savePatterns.isNotEmpty()) {
-                    val result = mutableMapOf<String, MutableList<UserFileInfo>>()
-
-                    savePatterns.forEach { userFile ->
-                        val basePath = Paths.get(prefixToPath(userFile.root.toString()), userFile.substitutedPath)
-
-                        Timber.i("Looking for saves in $basePath with pattern ${userFile.pattern} (prefix ${userFile.prefix})")
-
-                        val files =
-                            FileUtils
-                                .findFilesRecursive(
-                                    rootPath = basePath,
-                                    pattern = userFile.pattern,
-                                    maxDepth = 5,
-                                ).map {
-                                    val sha = CryptoHelper.shaHash(Files.readAllBytes(it))
-
-                                    Timber.i("Found ${it.pathString}\n\tin ${userFile.prefix}\n\twith sha [${sha.joinToString(", ")}]")
-
-                                    val relativePath = basePath.relativize(it).pathString
-
-                                    UserFileInfo(
-                                        userFile.root,
-                                        userFile.substitutedPath,
-                                        relativePath,
-                                        Files.getLastModifiedTime(it).toMillis(),
-                                        sha,
-                                    )
-                                }.collect(Collectors.toList())
-
-                        Timber.i("Found ${files.size} file(s) in $basePath for pattern ${userFile.pattern}")
-
-                        val prefixKey = Paths.get(userFile.prefix).pathString
-                        result.getOrPut(prefixKey) { mutableListOf() }.addAll(files)
-                    }
-
-                    result
-                } else {
-                    // Fallback: no UFS patterns; scan SteamUserData root recursively (depth 5)
-                    val rootType = PathType.SteamUserData
-                    val basePath = Paths.get(prefixToPath(rootType.toString()))
-
-                    Timber.i("No UFS patterns; scanning $basePath recursively (depth 5) under ${rootType.name}")
-
-                    val files =
-                        FileUtils
-                            .findFilesRecursive(
-                                rootPath = basePath,
-                                pattern = "*",
-                                maxDepth = 5,
-                            ).map {
-                                val sha = CryptoHelper.shaHash(Files.readAllBytes(it))
-
-                                val relativePath = basePath.relativize(it).pathString
-
-                                Timber.i("Found ${it.pathString}\n\tin %${rootType.name}%\n\twith sha [${sha.joinToString(", ")}]")
-
-                                // Store relative path in filename; empty path component
-                                UserFileInfo(rootType, "", relativePath, Files.getLastModifiedTime(it).toMillis(), sha)
-                            }.collect(Collectors.toList())
-
-                    Timber.i("Found ${files.size} file(s) in $basePath for fallback recursive scan")
-
-                    mapOf(Paths.get("%${rootType.name}%").pathString to files)
-                }
-            }
-
-            val fileChangeListToUserFiles: (AppFileChangeList) -> List<UserFileInfo> = { appFileListChange ->
-                val pathTypePairs = getPathTypePairs(appFileListChange)
-
-                appFileListChange.files.map {
-                    UserFileInfo(
-                        root =
-                            if (it.pathPrefixIndex < pathTypePairs.size) {
-                                PathType.from(pathTypePairs[it.pathPrefixIndex].first)
-                            } else {
-                                PathType.GameInstall
-                            },
-                        path =
-                            if (it.pathPrefixIndex < pathTypePairs.size) {
-                                appFileListChange.pathPrefixes[it.pathPrefixIndex]
-                            } else {
-                                ""
-                            },
-                        filename = it.filename,
-                        timestamp = it.timestamp.time,
-                        sha = it.shaFile,
-                    )
-                }
-            }
-
-            val buildUrl: (Boolean, String, String) -> String = { useHttps, urlHost, urlPath ->
-                val scheme = if (useHttps) "https://" else "http://"
-                "$scheme${urlHost}$urlPath"
-            }
-
-            val downloadFiles: (AppFileChangeList, CoroutineScope) -> Deferred<UserFilesDownloadResult> = { fileList, parentScope ->
-                parentScope.async {
-                    var filesDownloaded = 0
-                    var bytesDownloaded = 0L
-                    val totalFiles = fileList.files.size
-
-                    fileList.files.forEachIndexed { index, file ->
-                        val prefixedPath = getFilePrefixPath(file, fileList)
-                        val actualFilePath = getFullFilePath(file, fileList)
-
-                        Timber.i("$prefixedPath -> $actualFilePath")
-
-                        val fileDownloadInfo = steamCloud.clientFileDownload(appInfo.id, prefixedPath).await()
-
-                        if (fileDownloadInfo.urlHost.isNotEmpty()) {
-                            onProgress?.invoke("Downloading ${file.filename}", -1f)
-                            val httpUrl =
-                                with(fileDownloadInfo) {
-                                    buildUrl(useHttps, urlHost, urlPath)
-                                }
-
-                            Timber.i("Downloading $httpUrl")
-
-                            val headers =
-                                Headers.headersOf(
-                                    *fileDownloadInfo.requestHeaders
-                                        .map { listOf(it.name, it.value) }
-                                        .flatten()
-                                        .toTypedArray(),
-                                )
-
-                            val request =
-                                Request
-                                    .Builder()
-                                    .url(httpUrl)
-                                    .headers(headers)
-                                    .build()
-
-                            val httpClient = steamInstance.steamClient!!.configuration.httpClient
-
-                            val response =
-                                withTimeout(SteamService.requestTimeout) {
-                                    httpClient.newCall(request).execute()
-                                }
-
-                            if (!response.isSuccessful) {
-                                Timber.w("File download of $prefixedPath was unsuccessful")
-                                response.close()
-                                return@forEachIndexed
-                            }
-
-                            try {
-                                val totalFileSize = fileDownloadInfo.rawFileSize.toLong()
-                                var totalBytesRead = 0L
-                                var lastReportedProgress = -1f
-                                val progressThreshold = 0.01f // Update every 1%
-
-                                val copyToFile: (InputStream) -> Unit = { input ->
-                                    Files.createDirectories(actualFilePath.parent)
-
-                                    FileOutputStream(actualFilePath.toString()).use { fs ->
-                                        input.copyTo(fs, 8 * 1024) { bytesRead ->
-                                            totalBytesRead = bytesRead
-                                            if (totalFileSize > 0) {
-                                                val currentProgress = (totalBytesRead.toFloat() / totalFileSize).coerceIn(0f, 1f)
-                                                if (currentProgress - lastReportedProgress >= progressThreshold || currentProgress >= 1f) {
-                                                    onProgress?.invoke("Downloading ${file.filename}", currentProgress)
-                                                    lastReportedProgress = currentProgress
-                                                }
-                                            }
-                                        }
-
-                                        if (totalBytesRead != totalFileSize) {
-                                            Timber.w("Bytes read from stream of $prefixedPath does not match expected size")
-                                        }
-                                    }
-                                }
-
-                                withTimeout(SteamService.responseTimeout) {
-                                    if (fileDownloadInfo.fileSize != fileDownloadInfo.rawFileSize) {
-                                        response.body?.byteStream()?.use { inputStream ->
-                                            ZipInputStream(inputStream).use { zipInput ->
-                                                val entry = zipInput.nextEntry
-
-                                                if (entry == null) {
-                                                    Timber.w("Downloaded user file $prefixedPath has no zip entries")
-                                                    return@withTimeout
-                                                }
-
-                                                copyToFile(zipInput)
-
-                                                if (zipInput.nextEntry != null) {
-                                                    Timber.e("Downloaded user file $prefixedPath has more than one zip entry")
-                                                }
-                                            }
-                                        }
-                                    } else {
-                                        response.body?.byteStream()?.use { inputStream ->
-                                            copyToFile(inputStream)
-                                        }
-                                    }
-
-                                    filesDownloaded++
-
-                                    bytesDownloaded += fileDownloadInfo.fileSize
-                                }
-                            } catch (e: Exception) {
-                                Timber.w("Could not download $actualFilePath: %s", e.message)
-                            }
-
-                            response.close()
-                        } else {
-                            Timber.w("URL host of $prefixedPath was empty")
-                        }
-                    }
-
-                    if (totalFiles > 0) {
-                        onProgress?.invoke("Download complete", 1.0f)
-                    }
-
-                    UserFilesDownloadResult(filesDownloaded, bytesDownloaded)
-                }
-            }
-
-            val uploadFiles: (FileChanges, CoroutineScope) -> Deferred<UserFilesUploadResult> = { fileChanges, parentScope ->
-                parentScope.async {
-                    var filesUploaded = 0
-                    var bytesUploaded = 0L
-
-                    val filesToDelete = fileChanges.filesDeleted.map { it.prefixPath }
-
-                    val filesToUpload =
-                        fileChanges.filesCreated
-                            .union(fileChanges.filesModified)
-                            .map { it.prefixPath to it }
-                            // Filter out entries whose files no longer exist at upload time
-                            .filter { Files.exists(it.second.getAbsPath(prefixToPath)) }
-
-                    val totalFiles = filesToUpload.size
-
-                    Timber.i(
-                        "Beginning app upload batch with ${filesToDelete.size} file(s) to delete " +
-                            "and ${filesToUpload.size} file(s) to upload",
-                    )
-
-                    val uploadBatchResponse =
-                        steamCloud
-                            .beginAppUploadBatch(
-                                appId = appInfo.id,
-                                machineName = SteamUtils.getMachineName(steamInstance),
-                                clientId = clientId,
-                                filesToDelete = filesToDelete,
-                                filesToUpload = filesToUpload.map { it.first },
-                                // TODO: have branch be user selected and use that selection here
-                                appBuildId = appInfo.branches["public"]?.buildId ?: 0,
-                            ).await()
-
-                    var uploadBatchSuccess = true
-
-                    filesToUpload.map { it.second }.forEachIndexed { index, file ->
-                        val absFilePath = file.getAbsPath(prefixToPath)
-
-                        val fileSize =
-                            try {
-                                Files.size(absFilePath).toInt()
-                            } catch (e: Exception) {
-                                Timber.w("Skipping upload of ${file.prefixPath}: ${e.javaClass.simpleName}: ${e.message}")
-                                uploadBatchSuccess = false
-                                return@forEachIndexed
-                            }
-
-                        Timber.i("Beginning upload of ${file.prefixPath} whose timestamp is ${file.timestamp}")
-
-                        // Report start of upload
-                        onProgress?.invoke("Uploading ${file.filename}", 0f)
-
-                        val uploadInfo =
-                            steamCloud
-                                .beginFileUpload(
-                                    appId = appInfo.id,
-                                    filename =
-                                        if (appInfo.ufs.saveFilePatterns.isEmpty()) {
-                                            file.path + file.filename
-                                        } else {
-                                            file.prefixPath
-                                        },
-                                    fileSize = fileSize,
-                                    rawFileSize = fileSize,
-                                    fileSha = file.sha,
-                                    timestamp = Date(file.timestamp),
-                                    uploadBatchId = uploadBatchResponse.batchID,
-                                ).await()
-
-                        var uploadFileSuccess = true
-                        var bytesUploadedForFile = 0L
-                        var lastReportedProgress = -1f
-                        val progressThreshold = 0.01f // Update every 1% change
-
-                        RandomAccessFile(absFilePath.pathString, "r").use { fs ->
-                            uploadInfo.blockRequests.forEach { blockRequest ->
-                                val httpUrl =
-                                    buildUrl(
-                                        blockRequest.useHttps,
-                                        blockRequest.urlHost,
-                                        blockRequest.urlPath,
-                                    )
-
-                                Timber.i("Uploading to $httpUrl")
-
-                                val byteArray = ByteArray(blockRequest.blockLength)
-
-                                fs.seek(blockRequest.blockOffset)
-
-                                val bytesRead = fs.read(byteArray, 0, blockRequest.blockLength)
-
-                                Timber.i("Read $bytesRead byte(s) for block")
-
-                                val mediaType =
-                                    if (blockRequest.requestHeaders.any { it.name.equals("Content-Type", ignoreCase = true) }) {
-                                        blockRequest.requestHeaders
-                                            .first {
-                                                it.name.equals(
-                                                    "Content-Type",
-                                                    ignoreCase = true,
-                                                )
-                                            }.value
-                                            .toMediaTypeOrNull()
-                                    } else {
-                                        "application/octet-stream".toMediaTypeOrNull()
-                                    }
-
-                                val requestBody = byteArray.toRequestBody(mediaType)
-
-                                val headers =
-                                    Headers.headersOf(
-                                        *blockRequest.requestHeaders
-                                            .map { listOf(it.name, it.value) }
-                                            .flatten()
-                                            .toTypedArray(),
-                                    )
-
-                                val request =
-                                    Request
-                                        .Builder()
-                                        .url(httpUrl)
-                                        .put(requestBody)
-                                        .headers(headers)
-                                        .addHeader("Accept", "text/html,*/*;q=0.9")
-                                        .addHeader("accept-encoding", "gzip,identity,*;q=0")
-                                        .addHeader("accept-charset", "ISO-8859-1,utf-8,*;q=0.7")
-                                        .addHeader("user-agent", "Valve/Steam HTTP Client 1.0")
-                                        .build()
-
-                                val httpClient = steamInstance.steamClient!!.configuration.httpClient
-
-                                Timber.i("Sending request to ${request.url} using\n$request")
-
-                                try {
-                                    withTimeout(SteamService.requestTimeout) {
-                                        val response = httpClient.newCall(request).execute()
-
-                                        if (!response.isSuccessful) {
-                                            Timber.w(
-                                                "Failed to upload part of %s: %s, %s",
-                                                file.prefixPath,
-                                                response.message,
-                                                response?.body.toString(),
-                                            )
-
-                                            uploadFileSuccess = false
-                                            uploadBatchSuccess = false
-                                        } else {
-                                            // Update progress after successful block upload
-                                            bytesUploadedForFile += blockRequest.blockLength
-                                            if (fileSize > 0) {
-                                                val currentProgress = (bytesUploadedForFile.toFloat() / fileSize).coerceIn(0f, 1f)
-                                                // Only update if progress changed by at least 1% or we're at 100%
-                                                if (currentProgress - lastReportedProgress >= progressThreshold || currentProgress >= 1f) {
-                                                    onProgress?.invoke("Uploading ${file.filename}", currentProgress)
-                                                    lastReportedProgress = currentProgress
-                                                }
-                                            }
-                                        }
-                                        response.close()
-                                    }
-                                } catch (e: Exception) {
-                                    Timber.e(e, "Error uploading block")
-                                    uploadFileSuccess = false
-                                    uploadBatchSuccess = false
-                                }
-                            }
-                        }
-
-                        if (uploadFileSuccess) {
-                            filesUploaded++
-                            bytesUploaded += fileSize
-                        }
-
-                        val commitSuccess =
-                            steamCloud
-                                .commitFileUpload(
-                                    transferSucceeded = uploadFileSuccess,
-                                    appId = appInfo.id,
-                                    fileSha = file.sha,
-                                    filename =
-                                        if (appInfo.ufs.saveFilePatterns.isEmpty()) {
-                                            file.path + file.filename
-                                        } else {
-                                            file.prefixPath
-                                        },
-                                ).await()
-
-                        Timber.i("File ${file.prefixPath} commit success: $commitSuccess")
-                    }
-
-                    steamCloud
-                        .completeAppUploadBatch(
-                            appId = appInfo.id,
-                            batchId = uploadBatchResponse.batchID,
-                            batchEResult = if (uploadBatchSuccess) EResult.OK else EResult.Fail,
-                        ).await()
-
-                    if (totalFiles > 0) {
-                        onProgress?.invoke("Upload complete", 1.0f)
-                    }
-
-                    UserFilesUploadResult(uploadBatchSuccess, uploadBatchResponse.appChangeNumber, filesUploaded, bytesUploaded)
-                }
-            }
-
-            var syncResult = SyncResult.Success
-            var remoteTimestamp = 0L
-            var localTimestamp = 0L
-            var uploadsRequired = false
-            var uploadsCompleted = true
-
-            // sync metrics
-            var filesUploaded = 0
-            var filesDownloaded = 0
-            var filesDeleted = 0
-            var filesManaged = 0
-            var bytesUploaded = 0L
-            var bytesDownloaded = 0L
-            var microsecTotal = 0L
-            var microsecInitCaches = 0L
-            var microsecValidateState = 0L
-            var microsecAcLaunch = 0L
-            var microsecAcPrepUserFiles = 0L
-            var microsecAcExit = 0L
-            var microsecDeleteFiles = 0L
-            var microsecDownloadFiles = 0L
-            var microsecUploadFiles = 0L
-
-            microsecTotal =
-                measureTime {
-                    val localAppChangeNumber =
-                        overrideLocalChangeNumber ?: steamInstance.changeNumbersDao.getByAppId(appInfo.id)?.changeNumber ?: -1
-
-                    val changeNumber = if (localAppChangeNumber >= 0) localAppChangeNumber else 0
-
-                    // retrieve existing user files from local storage first so we can detect missing saves
-                    val localUserFilesMap: Map<String, List<UserFileInfo>>
-                    val allLocalUserFiles: List<UserFileInfo>
-
-                    microsecInitCaches =
-                        measureTime {
-                            localUserFilesMap = getLocalUserFilesAsPrefixMap()
-                            allLocalUserFiles = localUserFilesMap.map { it.value }.flatten()
-                        }.inWholeMicroseconds
-
-                    // If local saves are missing but we have a stored change number, request full file list
-                    // (change number 0) instead of a delta, so the cloud returns all files for download
-                    val effectiveChangeNumber =
-                        if (allLocalUserFiles.isEmpty() && changeNumber > 0) {
-                            Timber.w("No local saves found but stored changeNumber=$changeNumber; requesting full file list from cloud")
-                            0
-                        } else {
-                            changeNumber
-                        }
-
-                    val appFileListChange = steamCloud.getAppFileListChange(appInfo.id, effectiveChangeNumber).await()
-
-                    val cloudAppChangeNumber = appFileListChange.currentChangeNumber
-
-                    Timber.i(
-                        "AppChangeNumber: $localAppChangeNumber -> $cloudAppChangeNumber (requested with changeNumber=$effectiveChangeNumber)",
-                    )
-
-                    appFileListChange.printFileChangeList(appInfo)
-
-                    val downloadUserFiles: (CoroutineScope) -> Deferred<PostSyncInfo?> = { parentScope ->
-                        parentScope.async {
-                            Timber.i("Downloading cloud user files")
-
-                            val remoteUserFiles = fileChangeListToUserFiles(appFileListChange)
-                            val filesDiff = getFilesDiff(remoteUserFiles, allLocalUserFiles).second
-                            microsecDeleteFiles =
-                                measureTime {
-                                    var totalFilesDeleted = 0
-
-                                    filesDiff.filesDeleted.forEach {
-                                        val deleted = Files.deleteIfExists(it.getAbsPath(prefixToPath))
-                                        if (deleted) totalFilesDeleted++
-                                    }
-
-                                    filesDeleted = totalFilesDeleted
-                                }.inWholeMicroseconds
-
-                            microsecDownloadFiles =
-                                measureTime {
-                                    val downloadInfo = downloadFiles(appFileListChange, parentScope).await()
-                                    filesDownloaded = downloadInfo.filesDownloaded
-                                    bytesDownloaded = downloadInfo.bytesDownloaded
-                                }.inWholeMicroseconds
-
-                            val updatedLocalFiles: Map<String, List<UserFileInfo>>
-                            val hasLocalChanges: Boolean
-                            microsecValidateState =
-                                measureTime {
-                                    updatedLocalFiles = getLocalUserFilesAsPrefixMap()
-                                    hasLocalChanges = hasHashConflicts(updatedLocalFiles, appFileListChange)
-                                    filesManaged = updatedLocalFiles.size
-                                }.inWholeMicroseconds
-
-                            if (hasLocalChanges) {
-                                Timber.e("Failed to download latest user files after $MAX_USER_FILE_RETRIES tries")
-
-                                syncResult = SyncResult.DownloadFail
-
-                                return@async PostSyncInfo(syncResult)
-                            }
-
-                            with(steamInstance) {
-                                db.withTransaction {
-                                    fileChangeListsDao.insert(appInfo.id, updatedLocalFiles.map { it.value }.flatten())
-                                    changeNumbersDao.insert(appInfo.id, cloudAppChangeNumber)
-                                }
-                            }
-
-                            return@async null
-                        }
-                    }
-
-                    val uploadUserFiles: (CoroutineScope) -> Deferred<Unit> = { parentScope ->
-                        parentScope.async {
-                            Timber.i("Uploading local user files")
-
-                            val fileChanges =
-                                steamInstance.fileChangeListsDao.getByAppId(appInfo.id)!!.let {
-                                    val result = getFilesDiff(allLocalUserFiles, it.userFileInfo)
-
-                                    result.second
-                                }
-
-                            uploadsRequired = fileChanges.filesCreated.isNotEmpty() || fileChanges.filesModified.isNotEmpty()
-
-                            val uploadResult: UserFilesUploadResult
-
-                            microsecUploadFiles =
-                                measureTime {
-                                    uploadResult = uploadFiles(fileChanges, parentScope).await()
-                                    filesUploaded = uploadResult.filesUploaded
-                                    bytesUploaded = uploadResult.bytesUploaded
-                                    uploadsCompleted = uploadsRequired && uploadResult.uploadBatchSuccess
-                                }.inWholeMicroseconds
-
-                            filesManaged = allLocalUserFiles.size
-
-                            if (uploadResult.uploadBatchSuccess) {
-                                with(steamInstance) {
-                                    db.withTransaction {
-                                        fileChangeListsDao.insert(appInfo.id, allLocalUserFiles)
-                                        changeNumbersDao.insert(appInfo.id, uploadResult.appChangeNumber)
-                                    }
-                                }
-                            } else {
-                                syncResult = SyncResult.UpdateFail
-                            }
-                        }
-                    }
-
-                    val remoteHasFiles = appFileListChange.files.isNotEmpty()
-                    val localHasFiles = allLocalUserFiles.isNotEmpty()
-                    val forcingDownloadMissingLocal = remoteHasFiles && !localHasFiles && cloudAppChangeNumber >= 0
-                    val effectiveLocalAppChangeNumber =
-                        if (forcingDownloadMissingLocal) {
-                            Timber.w(
-                                "Cloud has ${appFileListChange.files.size} file(s) but no local saves; forcing download (changeNumber=$cloudAppChangeNumber)",
-                            )
-                            -1
-                        } else {
-                            localAppChangeNumber
-                        }
-
-                    if (effectiveLocalAppChangeNumber < cloudAppChangeNumber) {
-                        microsecAcLaunch =
-                            measureTime {
-                                var hasLocalChanges: Boolean
-
-                                microsecAcPrepUserFiles =
-                                    measureTime {
-                                        hasLocalChanges =
-                                            if (forcingDownloadMissingLocal) {
-                                                false
-                                            } else {
-                                                steamInstance.fileChangeListsDao.getByAppId(appInfo.id)?.let {
-                                                    getFilesDiff(allLocalUserFiles, it.userFileInfo).first
-                                                } == true
-                                            }
-                                    }.inWholeMicroseconds
-
-                                if (!hasLocalChanges) {
-                                    Timber.i("No local changes but new cloud user files")
-
-                                    downloadUserFiles(parentScope).await()?.let {
-                                        return@async it
-                                    }
-                                } else {
-                                    Timber.i("Found local changes and new cloud user files, conflict resolution...")
-
-                                    when (preferredSave) {
-                                        SaveLocation.Local -> {
-                                            uploadUserFiles(parentScope).await()
-                                        }
-
-                                        SaveLocation.Remote -> {
-                                            downloadUserFiles(parentScope).await()?.let {
-                                                return@async it
-                                            }
-                                        }
-
-                                        SaveLocation.None -> {
-                                            syncResult = SyncResult.Conflict
-                                            remoteTimestamp = appFileListChange.files.map { it.timestamp.time }.maxOrNull() ?: 0L
-                                            localTimestamp = allLocalUserFiles.map { it.timestamp }.maxOrNull() ?: 0L
-                                        }
-                                    }
-                                }
-                            }.inWholeMicroseconds
-                    } else if (effectiveLocalAppChangeNumber == cloudAppChangeNumber) {
-                        microsecAcExit =
-                            measureTime {
-                                val hasLocalChanges =
-                                    steamInstance.fileChangeListsDao
-                                        .getByAppId(appInfo.id)
-                                        ?.let {
-                                            val result = getFilesDiff(allLocalUserFiles, it.userFileInfo)
-                                            result.first
-                                        } == true
-
-                                if (hasLocalChanges) {
-                                    Timber.i("Found local changes and no new cloud user files")
-
-                                    uploadUserFiles(parentScope).await()
-                                } else {
-                                    Timber.i("No local changes and no new cloud user files, doing nothing...")
-
-                                    syncResult = SyncResult.UpToDate
-                                }
-                            }.inWholeMicroseconds
-                    } else {
-                        Timber.e("Local change number greater than cloud $localAppChangeNumber > $cloudAppChangeNumber")
-
-                        syncResult = SyncResult.UnknownFail
-                    }
-                }.inWholeMicroseconds
-
-            val microsecBuildSyncList =
-                (microsecTotal - (microsecInitCaches + microsecValidateState + microsecAcLaunch + microsecAcExit))
-                    .coerceAtLeast(
-                        0L,
-                    )
-
-            steamCloud.appCloudSyncStats(
-                appId = appInfo.id,
-                platformType = EPlatformType.Android64,
-                blockingAppLaunch = microsecAcLaunch > 0,
-                filesUploaded = filesUploaded,
-                filesDownloaded = filesDownloaded,
-                filesDeleted = filesDeleted,
-                bytesUploaded = bytesUploaded,
-                bytesDownloaded = bytesDownloaded,
-                microsecTotal = microsecTotal,
-                microsecInitCaches = microsecInitCaches,
-                microsecValidateState = microsecValidateState,
-                microsecAcLaunch = microsecAcLaunch,
-                microsecAcPrepUserFiles = microsecAcPrepUserFiles,
-                microsecAcExit = microsecAcExit,
-                microsecBuildSyncList = microsecBuildSyncList,
-                microsecDeleteFiles = microsecDeleteFiles,
-                microsecDownloadFiles = microsecDownloadFiles,
-                microsecUploadFiles = microsecUploadFiles,
-                filesManaged = filesManaged,
-            )
-
-            postSyncInfo =
-                PostSyncInfo(
-                    syncResult = syncResult,
-                    remoteTimestamp = remoteTimestamp,
-                    localTimestamp = localTimestamp,
-                    uploadsRequired = uploadsRequired,
-                    uploadsCompleted = uploadsCompleted,
-                    filesUploaded = filesUploaded,
-                    filesDownloaded = filesDownloaded,
-                    filesDeleted = filesDeleted,
-                    filesManaged = filesManaged,
-                    bytesUploaded = bytesUploaded,
-                    bytesDownloaded = bytesDownloaded,
-                    microsecTotal = microsecTotal,
-                    microsecInitCaches = microsecInitCaches,
-                    microsecValidateState = microsecValidateState,
-                    microsecAcLaunch = microsecAcLaunch,
-                    microsecAcPrepUserFiles = microsecAcPrepUserFiles,
-                    microsecAcExit = microsecAcExit,
-                    microsecBuildSyncList = microsecBuildSyncList,
-                    microsecDeleteFiles = microsecDeleteFiles,
-                    microsecDownloadFiles = microsecDownloadFiles,
-                    microsecUploadFiles = microsecUploadFiles,
-                )
-
-            postSyncInfo
-        }
-
-    private fun AppFileChangeList.printFileChangeList(appInfo: SteamApp) {
-        with(this) {
-            Timber.i(
-                "GetAppFileListChange(${appInfo.id}):" +
-                    "\n\tTotal Files: ${files.size}" +
-                    "\n\tCurrent Change Number: $currentChangeNumber" +
-                    "\n\tIs Only Delta: $isOnlyDelta" +
-                    "\n\tApp BuildID Hwm: $appBuildIDHwm" +
-                    "\n\tPath Prefixes: \n\t\t${pathPrefixes.joinToString("\n\t\t")}" +
-                    "\n\tMachine Names: \n\t\t${machineNames.joinToString("\n\t\t")}" +
-                    files.joinToString {
-                        "\n\t${it.filename}:" +
-                            "\n\t\tshaFile: ${it.shaFile}" +
-                            "\n\t\ttimestamp: ${it.timestamp}" +
-                            "\n\t\trawFileSize: ${it.rawFileSize}" +
-                            "\n\t\tpersistState: ${it.persistState}" +
-                            "\n\t\tplatformsToSync: ${it.platformsToSync}" +
-                            "\n\t\tpathPrefixIndex: ${it.pathPrefixIndex}" +
-                            "\n\t\tmachineNameIndex: ${it.machineNameIndex}"
-                    },
-            )
-        }
-    }
-}
diff --git a/app/src/main/feature/stores/steam/service/SteamService.kt b/app/src/main/feature/stores/steam/service/SteamService.kt
index 04301a24f..51d9325ac 100644
--- a/app/src/main/feature/stores/steam/service/SteamService.kt
+++ b/app/src/main/feature/stores/steam/service/SteamService.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import android.util.Base64
+import android.util.Log
 import android.widget.Toast
 import androidx.room.withTransaction
 import com.winlator.cmod.BuildConfig
@@ -20,6 +21,7 @@ import com.winlator.cmod.feature.stores.steam.data.CachedLicense
 import com.winlator.cmod.feature.stores.steam.data.DepotInfo
 import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
 import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
 import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
 import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
 import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
@@ -30,6 +32,7 @@ import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
 import com.winlator.cmod.feature.stores.steam.data.SteamApp
 import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
 import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
 import com.winlator.cmod.feature.stores.steam.data.SteamLicense
 import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
 import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
@@ -40,7 +43,6 @@ import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
 import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
 import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
 import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
-import com.winlator.cmod.feature.stores.steam.enums.AppType
 import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
 import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
 import com.winlator.cmod.feature.stores.steam.enums.GameSource
@@ -53,9 +55,25 @@ import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
 import com.winlator.cmod.feature.stores.steam.enums.SyncResult
 import com.auth0.android.jwt.JWT
 import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
 import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
 import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
 import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
 import com.winlator.cmod.feature.stores.steam.statsgen.StatType
 import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
 import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
@@ -65,78 +83,32 @@ import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
 import com.winlator.cmod.feature.stores.steam.utils.Net
 import com.winlator.cmod.feature.stores.steam.utils.PrefManager
 import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
 import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
 import com.winlator.cmod.feature.sync.google.CloudSyncManager
 import com.winlator.cmod.runtime.container.Container
 import com.winlator.cmod.runtime.container.ContainerManager
 import com.winlator.cmod.runtime.display.environment.ImageFs
 import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
 import com.winlator.cmod.shared.android.AppTerminationHelper
 import com.winlator.cmod.shared.ui.toast.WinToast
 import com.winlator.cmod.shared.android.NotificationHelper
 import com.winlator.cmod.shared.io.StorageUtils
 import dagger.hilt.android.AndroidEntryPoint
-import `in`.dragonbra.javasteam.base.ClientMsgProtobuf
-import `in`.dragonbra.javasteam.depotdownloader.DepotDownloader
-import `in`.dragonbra.javasteam.depotdownloader.IDownloadListener
-import `in`.dragonbra.javasteam.depotdownloader.Steam3Session
-import `in`.dragonbra.javasteam.depotdownloader.data.AppItem
-import `in`.dragonbra.javasteam.depotdownloader.data.DownloadItem
-import `in`.dragonbra.javasteam.enums.EDepotFileFlag
-import `in`.dragonbra.javasteam.enums.ELicenseFlags
-import `in`.dragonbra.javasteam.enums.EMsg
-import `in`.dragonbra.javasteam.enums.EOSType
-import `in`.dragonbra.javasteam.enums.EPersonaState
-import `in`.dragonbra.javasteam.enums.EResult
-import `in`.dragonbra.javasteam.networking.steam3.ProtocolTypes
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesAuthSteamclient.CAuthentication_PollAuthSessionStatus_Request
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientObjects.ECloudPendingRemoteOperation
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserverUserstats
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesFamilygroupsSteamclient
-import `in`.dragonbra.javasteam.rpc.service.Authentication
-import `in`.dragonbra.javasteam.rpc.service.FamilyGroups
-import `in`.dragonbra.javasteam.steam.authentication.AuthPollResult
-import `in`.dragonbra.javasteam.steam.authentication.AuthSessionDetails
-import `in`.dragonbra.javasteam.steam.authentication.AuthenticationException
-import `in`.dragonbra.javasteam.steam.authentication.IAuthenticator
-import `in`.dragonbra.javasteam.steam.authentication.IChallengeUrlChanged
-import `in`.dragonbra.javasteam.steam.authentication.QrAuthSession
-import `in`.dragonbra.javasteam.steam.discovery.FileServerListProvider
-import `in`.dragonbra.javasteam.steam.discovery.ServerQuality
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.GamePlayedInfo
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.License
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.PICSRequest
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.SteamApps
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.callback.LicenseListCallback
-import `in`.dragonbra.javasteam.steam.handlers.steamcloud.SteamCloud
-import `in`.dragonbra.javasteam.steam.handlers.steamfriends.SteamFriends
-import `in`.dragonbra.javasteam.steam.handlers.steamfriends.callback.PersonaStateCallback
-import `in`.dragonbra.javasteam.steam.handlers.steamgameserver.SteamGameServer
-import `in`.dragonbra.javasteam.steam.handlers.steammasterserver.SteamMasterServer
-import `in`.dragonbra.javasteam.steam.handlers.steamscreenshots.SteamScreenshots
-import `in`.dragonbra.javasteam.steam.handlers.steamunifiedmessages.SteamUnifiedMessages
-import `in`.dragonbra.javasteam.steam.handlers.steamuser.ChatMode
-import `in`.dragonbra.javasteam.steam.handlers.steamuser.LogOnDetails
-import `in`.dragonbra.javasteam.steam.handlers.steamuser.SteamUser
-import `in`.dragonbra.javasteam.steam.handlers.steamuser.callback.LoggedOffCallback
-import `in`.dragonbra.javasteam.steam.handlers.steamuser.callback.LoggedOnCallback
-import `in`.dragonbra.javasteam.steam.handlers.steamuser.callback.PlayingSessionStateCallback
-import `in`.dragonbra.javasteam.steam.handlers.steamuserstats.Stats
-import `in`.dragonbra.javasteam.steam.handlers.steamuserstats.SteamUserStats
-import `in`.dragonbra.javasteam.steam.handlers.steamworkshop.SteamWorkshop
-import `in`.dragonbra.javasteam.steam.steamclient.AsyncJobFailedException
-import `in`.dragonbra.javasteam.steam.steamclient.SteamClient
-import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackManager
-import `in`.dragonbra.javasteam.steam.steamclient.callbacks.ConnectedCallback
-import `in`.dragonbra.javasteam.steam.steamclient.callbacks.DisconnectedCallback
-import `in`.dragonbra.javasteam.steam.steamclient.configuration.SteamConfiguration
-import `in`.dragonbra.javasteam.types.DepotManifest
-import `in`.dragonbra.javasteam.types.FileData
-import `in`.dragonbra.javasteam.types.KeyValue
-import `in`.dragonbra.javasteam.types.PublishedFileID
-import `in`.dragonbra.javasteam.types.SteamID
-import `in`.dragonbra.javasteam.util.log.LogListener
-import `in`.dragonbra.javasteam.util.log.LogManager
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -151,7 +123,9 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
 import kotlin.coroutines.coroutineContext
 import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.filter
@@ -165,12 +139,10 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.json.JSONArray
 import org.json.JSONObject
 import timber.log.Timber
-import java.io.Closeable
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -181,41 +153,25 @@ import java.nio.ByteOrder
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.Collections
+import java.util.Date
 import java.util.EnumSet
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
-import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import kotlin.io.path.pathString
 import kotlin.time.Duration.Companion.seconds
 
-@AndroidEntryPoint
-class SteamService :
-    Service(),
-    IChallengeUrlChanged {
-    // To view log messages in android logcat properly
-    private val logger =
-        object : LogListener {
-            override fun onLog(
-                clazz: Class<*>,
-                message: String?,
-                throwable: Throwable?,
-            ) {
-                val logMessage = message ?: "No message given"
-                Timber.i(throwable, "[${clazz.simpleName}] -> $logMessage")
-            }
-
-            override fun onError(
-                clazz: Class<*>,
-                message: String?,
-                throwable: Throwable?,
-            ) {
-                val logMessage = message ?: "No message given"
-                Timber.e(throwable, "[${clazz.simpleName}] -> $logMessage")
-            }
-        }
+internal fun JSONArray?.toIntList(): List<Int> {
+    val len = this?.length() ?: 0
+    if (len == 0) return emptyList()
+    val out = ArrayList<Int>(len)
+    for (i in 0 until len) out.add(this!!.getInt(i))
+    return out
+}
 
+@AndroidEntryPoint
+class SteamService : Service() {
     @Inject
     lateinit var db: PluviaDatabase
 
@@ -243,27 +199,34 @@ class SteamService :
     @Inject
     lateinit var downloadingAppInfoDao: DownloadingAppInfoDao
 
-    private lateinit var notificationHelper: NotificationHelper
+    internal lateinit var notificationHelper: NotificationHelper
+
+    internal var _unifiedFriends: SteamUnifiedFriends? = null
+
+    internal var _loginResult: LoginResult = LoginResult.Failed
+
+    internal var retryAttempt = 0
 
-    internal var callbackManager: CallbackManager? = null
-    internal var steamClient: SteamClient? = null
-    internal val callbackSubscriptions: ArrayList<Closeable> = ArrayList()
+    // Auto-reconnect coroutine for the C++ WN-Steam-Client session.
+    @Volatile internal var connectJob: Job? = null
 
-    private var _unifiedFriends: SteamUnifiedFriends? = null
-    private var _steamUser: SteamUser? = null
-    private var _steamApps: SteamApps? = null
-    private var _steamFriends: SteamFriends? = null
-    private var _steamCloud: SteamCloud? = null
-    private var _steamUserStats: SteamUserStats? = null
-    private var _steamFamilyGroups: FamilyGroups? = null
+    // Pending backoff-delayed reconnect scheduled by onWnDisconnected.
+    @Volatile internal var reconnectJob: Job? = null
 
-    private var _loginResult: LoginResult = LoginResult.Failed
+    // Resets retryAttempt to 0 only after the session stays up STABLE_CONNECTION_MS; a flapping connection must not reset it (unbounded reconnect / battery drain).
+    @Volatile internal var stableConnectionJob: Job? = null
+    @Volatile internal var refreshTokenWatchdogJob: Job? = null
 
-    private var licenses: List<License> = emptyList()
+    // App-lifecycle gating: while backgrounded with nothing needing Steam (no download, no running game) the session is suspended — disconnected, reconnect/PICS loops cancelled — to draw no power; wakes on foreground. Driven from PluviaApp lifecycle callbacks.
+    @Volatile internal var appInForeground = true
+    @Volatile internal var suspendedForBackground = false
 
-    private var retryAttempt = 0
+    @Volatile internal var suspendedForBionic = false
 
-    private val appPicsChannel =
+    // Cancellable timer deferring the background suspend by BACKGROUND_IDLE_GRACE_MS — see scheduleBackgroundSuspendCheck.
+    @Volatile internal var backgroundIdleJob: Job? = null
+
+    internal val appPicsChannel =
         Channel<List<PICSRequest>>(
             capacity = 1_000,
             onBufferOverflow = BufferOverflow.SUSPEND,
@@ -272,7 +235,7 @@ class SteamService :
             },
         )
 
-    private val packagePicsChannel =
+    internal val packagePicsChannel =
         Channel<List<PICSRequest>>(
             capacity = 1_000,
             onBufferOverflow = BufferOverflow.SUSPEND,
@@ -281,9 +244,9 @@ class SteamService :
             },
         )
 
-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    internal val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    private val onEndProcess: (AndroidEvent.EndProcess) -> Unit = {
+    internal val onEndProcess: (AndroidEvent.EndProcess) -> Unit = {
         Companion.stop()
     }
 
@@ -292,9 +255,8 @@ class SteamService :
 
     private val appTokens: ConcurrentHashMap<Int, Long> = ConcurrentHashMap()
 
-    // Add these as class properties
-    private var picsGetProductInfoJob: Job? = null
-    private var picsChangesCheckerJob: Job? = null
+    internal var picsGetProductInfoJob: Job? = null
+    internal var picsChangesCheckerJob: Job? = null
     private var friendCheckerJob: Job? = null
 
     private val _isPlayingBlocked = MutableStateFlow(false)
@@ -307,37 +269,76 @@ class SteamService :
         )
     val localPersona = _localPersona.asStateFlow()
 
+    internal val _friendsList = MutableStateFlow<List<SteamFriendEntry>>(emptyList())
+    val friendsList = _friendsList.asStateFlow()
+
+    internal val _incomingChat =
+        MutableSharedFlow<Pair<Long, com.winlator.cmod.feature.stores.steam.data.SteamChatMessage>>(
+            replay = 32,
+            extraBufferCapacity = 256,
+        )
+    val incomingChat = _incomingChat.asSharedFlow()
+
+    internal val _unreadCounts = MutableStateFlow<Map<Long, Int>>(emptyMap())
+    val unreadCounts = _unreadCounts.asStateFlow()
+
+    internal val _recentChats = MutableStateFlow<Map<Long, Long>>(emptyMap())
+    val recentChats = _recentChats.asStateFlow()
+
+    internal val activeConversations = java.util.concurrent.ConcurrentHashMap<Long, Int>()
+    internal var messagePollerJob: Job? = null
+
     data class ManifestSizes(
         val installSize: Long = 0L,
         val downloadSize: Long = 0L,
     )
 
+    data class SteamUpdateInfo(
+        val hasUpdate: Boolean = false,
+        val downloadSize: Long = 0L,
+        val depotIds: List<Int> = emptyList(),
+        val message: String? = null,
+    )
+
     companion object {
         const val MAX_PICS_BUFFER = 256
 
         const val MAX_RETRY_ATTEMPTS = 20
 
+        // Session must stay logged on this long before its reconnect counts as successful and resets the retry budget.
+        private const val STABLE_CONNECTION_MS = 60_000L
+
+        // Reconnect backoff cap — even a permanently-flapping connection reconnects at most once per this interval.
+        internal const val RECONNECT_BACKOFF_CAP_MS = 5 * 60_000L
+
+        // connectAndLogon gives up after this many consecutive failed bring-up attempts (exponential backoff) instead of retrying a doomed logon forever.
+        internal const val CONNECT_LOGON_MAX_ATTEMPTS = 8
+
+        internal const val REFRESH_TOKEN_ROTATION_THRESHOLD_DAYS = 7
+        internal const val REFRESH_TOKEN_ROTATION_CHECK_INTERVAL_MS = 6 * 60 * 60 * 1000L
+
+        // Grace before a backgrounded session may suspend, so a brief app-switch doesn't thrash disconnect/reconnect (battery drain). While connection-critical work runs the check repeats once per interval.
+        internal const val BACKGROUND_IDLE_GRACE_MS = 60_000L
+
+        // Stay fully offline this long after a PlanW game closes so Steam reaps the launcher's games-played registration (else next launch hits AlreadyRunning 0x10).
+        internal const val WN_PLANW_REAP_OFFLINE_MS = 10_000L
+
         const val INVALID_APP_ID: Int = Int.MAX_VALUE
         const val INVALID_PKG_ID: Int = Int.MAX_VALUE
-        private const val STEAM_CONTROLLER_CONFIG_FILENAME = "steam_controller_config.vdf"
-        private const val DOWNLOAD_INFO_DIR = ".DownloadInfo"
-        private const val DOWNLOAD_INFO_FILE = "depot_bytes.json"
-        private const val LEGACY_DOWNLOAD_INFO_FILE = "bytes_downloaded.txt"
-        private const val COMPONENTS_BASE_URL = "https://github.com/maxjivi05/Components/releases/download/Components"
+        internal const val STEAM_CONTROLLER_CONFIG_FILENAME = "steam_controller_config.vdf"
+        internal const val DOWNLOAD_INFO_DIR = ".DownloadInfo"
+        internal const val DOWNLOAD_INFO_FILE = "depot_bytes.json"
+        internal const val LEGACY_DOWNLOAD_INFO_FILE = "bytes_downloaded.txt"
+        internal const val COMPONENTS_BASE_URL = "https://github.com/maxjivi05/Components/releases/download/Components"
         @Volatile
         private var startupMetadataRepairJob: Job? = null
 
-        /**
-         * Default timeout to use when making requests
-         */
+        /** Default timeout when making requests. */
         var requestTimeout = 30.seconds
 
-        /**
-         * Default timeout to use when reading the response body
-         */
+        /** Default timeout when reading the response body. */
         var responseTimeout = 120.seconds
 
-        private val PROTOCOL_TYPES = EnumSet.of(ProtocolTypes.WEB_SOCKET)
 
         internal var instance: SteamService? = null
 
@@ -351,20 +352,13 @@ class SteamService :
             cachedAchievementsAppId = null
         }
 
-        private fun downloadUrlsFor(fileName: String): List<String> {
-            val alternate =
-                when (fileName) {
-                    "steam-token.tzst" -> "steam-token-r2.tzst"
-                    else -> null
-                }
-            return if (alternate != null) {
-                listOf(
-                    "$COMPONENTS_BASE_URL/$fileName",
-                    "$COMPONENTS_BASE_URL/$alternate",
-                )
-            } else {
-                listOf("$COMPONENTS_BASE_URL/$fileName")
-            }
+        // Generate (CM schema + unlock state) and return achievements for a game.
+        suspend fun loadAchievements(
+            appId: Int,
+            configDirectory: String,
+        ): List<com.winlator.cmod.feature.stores.steam.statsgen.Achievement> {
+            runCatching { generateAchievements(appId, configDirectory) }
+            return if (cachedAchievementsAppId == appId) cachedAchievements ?: emptyList() else emptyList()
         }
 
         fun pauseAll() {
@@ -381,279 +375,111 @@ class SteamService :
             DownloadCoordinator.runOnScope { DownloadCoordinator.resumeAll() }
         }
 
-        fun resumeDownload(appId: Int) {
-            DownloadCoordinator.runOnScope {
-                DownloadCoordinator.resume(DownloadRecord.STORE_STEAM, appId.toString())
-            }
-        }
-
-        fun cancelAll() {
-            DownloadCoordinator.runOnScope { DownloadCoordinator.cancelAll() }
-        }
-
-        fun cancelDownload(appId: Int) {
-            DownloadCoordinator.runOnScope {
-                DownloadCoordinator.cancel(DownloadRecord.STORE_STEAM, appId.toString())
-            }
-        }
-
-        // The cross-store DownloadCoordinator now owns global queue draining. This legacy
-        // entry point is kept for binary compatibility with any callers that haven't been
-        // migrated; instead of running the old Steam-only queue logic (which would race the
-        // coordinator and double-start downloads) it just delegates to the coordinator.
-        fun checkQueue() {
-            DownloadCoordinator.blockingTick()
-        }
-
-        private val downloadJobs = ConcurrentHashMap<Int, DownloadInfo>()
-
-        private fun notifyDownloadStarted(appId: Int) {
-            PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, true))
-        }
-
-        private fun notifyDownloadStopped(appId: Int) {
-            PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
-        }
-
-        private fun removeDownloadJob(
-            appId: Int,
-            forceRemove: Boolean = false,
-        ) {
-            if (forceRemove) {
-                val removed = downloadJobs.remove(appId)
-                if (removed != null) {
-                    notifyDownloadStopped(appId)
-                }
-            } else {
-                notifyDownloadStopped(appId)
-            }
-            checkQueue()
-            Unit
+        fun bionicHandoffAcquire() {
+            instance?.bionicHandoffAcquireImpl()
         }
 
-        fun clearCompletedDownloads() {
-            clearCompletedDownloadsInternal(dispatchQueueAfterClear = true)
-            // Also remove finished records from the cross-store coordinator table.
-            DownloadCoordinator.runOnScope { DownloadCoordinator.clear() }
+        fun bionicHandoffRelease() {
+            instance?.bionicHandoffReleaseImpl()
         }
 
-        fun clearCompletedDownloadsForShutdown() {
-            clearCompletedDownloadsInternal(dispatchQueueAfterClear = false)
+        fun bionicHandoffReleaseAndKickPlayingSessionAsync(onlyGame: Boolean = true) {
+            instance?.bionicHandoffReleaseAndKickPlayingSessionAsyncImpl(onlyGame)
         }
 
-        private fun clearCompletedDownloadsInternal(dispatchQueueAfterClear: Boolean) {
-            val toRemove =
-                downloadJobs
-                    .filterValues {
-                        val status = it.getStatusFlow().value
-                        status == DownloadPhase.COMPLETE ||
-                            status == DownloadPhase.CANCELLED ||
-                            status == DownloadPhase.FAILED
-                    }.keys
-            toRemove.forEach { appId ->
-                val removed = downloadJobs.remove(appId)
-                if (removed != null) {
-                    notifyDownloadStopped(appId)
+        @JvmStatic
+        fun bionicHandoffReleaseAndKickPlayingSessionBlocking(
+            onlyGame: Boolean = true,
+            maxWaitMs: Long = 4_000L,
+        ): Boolean =
+            runBlocking(Dispatchers.IO) {
+                val svc = instance
+                if (svc == null) {
+                    runCatching {
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamBootstrap.stop()
+                    }
+                    return@runBlocking false
                 }
+                svc.bionicHandoffReleaseAndKickPlayingSessionBlockingImpl(
+                    onlyGame,
+                    maxWaitMs.coerceAtLeast(0L),
+                )
             }
-            if (dispatchQueueAfterClear && toRemove.isNotEmpty()) {
-                checkQueue()
-            }
-        }
 
-        /** Returns true if there is an incomplete download on disk (in-progress marker or actively downloading). */
-        private fun hasPartialDownloadFiles(appDirPath: String): Boolean {
-            val appDir = File(appDirPath)
-            if (!appDir.exists()) return false
-
-            val persistenceFile = File(File(appDirPath, DOWNLOAD_INFO_DIR), DOWNLOAD_INFO_FILE)
-            if (persistenceFile.exists() && persistenceFile.length() > 0L) {
-                return true
-            }
+        @JvmStatic
+        fun isBionicHandoffActive(): Boolean =
+            instance?.suspendedForBionic == true
 
-            // If a complete install marker exists and there is no persisted resume file,
-            // treat this as fully installed (not a resumable partial download).
-            if (MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)) {
-                return false
+        @JvmStatic
+        fun kickPlayingSessionIfReadyBlocking(onlyGame: Boolean = true): Boolean =
+            runBlocking(Dispatchers.IO) {
+                kickPlayingSessionIfReady(onlyGame)
             }
 
-            // Check for in-progress marker (this fork's convention)
-            if (MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)) {
-                return true
-            }
 
-            val rootFiles = appDir.listFiles() ?: return false
-            return rootFiles.any { file ->
-                if (file.name != DOWNLOAD_INFO_DIR) {
-                    true
-                } else {
-                    val nestedFiles = file.listFiles().orEmpty()
-                    nestedFiles.any { nested ->
-                        nested.name != DOWNLOAD_INFO_FILE && nested.name != LEGACY_DOWNLOAD_INFO_FILE
+        fun setHybridModeRuntime(enabled: Boolean) {
+            val svc = instance ?: return
+            if (enabled) {
+                if (!isLoggedIn) return                      // takeover fires from onWnLoggedOn on next sign-in
+                if (svc.suspendedForBionic) return           // bootstrap already owns the session
+                svc.scope.launch {
+                    Timber.i("Hybrid mode live-toggle ON — bootstrap takeover")
+                    val renewed = svc.renewRefreshTokenForHandoff()
+                    Timber.i("Hybrid mode live-toggle: token renewal " +
+                        if (renewed) "OK (fresh token saved)"
+                        else "skipped/failed — using existing token")
+                    svc.bionicHandoffAcquireImpl()
+                    delay(1800)
+                    try {
+                        com.winlator.cmod.feature.stores.steam.wnsteam
+                            .WnSteamBootstrap.prewarm(svc.applicationContext)
+                        Timber.i("Hybrid mode live-toggle: bootstrap prewarm dispatched")
+                    } catch (t: Throwable) {
+                        Timber.e(t, "Hybrid mode live-toggle: prewarm failed; reverting")
+                        svc.bionicHandoffReleaseImpl()
                     }
                 }
-            }
-        }
-
-        private fun inferResumeDlcAppIds(
-            appId: Int,
-            appDirPath: String,
-        ): List<Int> {
-            // Try to recover selected DLCs from persisted depot progress when metadata row is missing.
-            return runCatching {
-                val persistenceFile = File(File(appDirPath, DOWNLOAD_INFO_DIR), DOWNLOAD_INFO_FILE)
-                if (!persistenceFile.exists() || !persistenceFile.canRead()) return@runCatching emptyList()
-
-                val text = persistenceFile.readText().trim()
-                if (text.isEmpty()) return@runCatching emptyList()
-
-                val persistedDepotIds = mutableSetOf<Int>()
-                val json = JSONObject(text)
-                for (key in json.keys()) {
-                    val depotId = key.toIntOrNull() ?: continue
-                    persistedDepotIds.add(depotId)
+            } else {
+                if (!svc.suspendedForBionic) return           // wn-session already owns
+                svc.scope.launch {
+                    Timber.i("Hybrid mode live-toggle OFF — bringing wn-session back")
+                    svc.bionicHandoffReleaseImpl()
                 }
-                if (persistedDepotIds.isEmpty()) return@runCatching emptyList()
-
-                val context = instance!!.applicationContext
-                val container =
-                    if (ContainerUtils.hasContainer(context, "STEAM_$appId")) {
-                        ContainerUtils.getContainer(context, "STEAM_$appId")
-                    } else {
-                        null
-                    }
-                val containerLanguage = container?.language ?: PrefManager.containerLanguage
-                val depots = getDownloadableDepots(appId = appId, preferredLanguage = containerLanguage)
-                depots
-                    .asSequence()
-                    .filter { (depotId, _) -> depotId in persistedDepotIds }
-                    .map { (_, depot) -> depot.dlcAppId }
-                    .filter { it != INVALID_APP_ID }
-                    .distinct()
-                    .toList()
-            }.getOrElse {
-                emptyList()
-            }
-        }
-
-        private fun hasPersistedDepotResumeMetadata(appDirPath: String): Boolean {
-            return runCatching {
-                val persistenceFile = File(File(appDirPath, DOWNLOAD_INFO_DIR), DOWNLOAD_INFO_FILE)
-                if (!persistenceFile.exists() || !persistenceFile.canRead()) return@runCatching false
-
-                val text = persistenceFile.readText().trim()
-                if (text.isEmpty()) return@runCatching false
-
-                val json = JSONObject(text)
-                json.keys().asSequence().any { key -> key.toIntOrNull() != null }
-            }.getOrElse {
-                false
             }
         }
 
-        private fun clearPersistedProgressSnapshot(appDirPath: String) {
-            val persistenceDir = File(appDirPath, DOWNLOAD_INFO_DIR)
-            val persistenceFile = File(persistenceDir, DOWNLOAD_INFO_FILE)
-            if (persistenceFile.exists()) {
-                persistenceFile.delete()
-            }
-            val legacyFile = File(persistenceDir, LEGACY_DOWNLOAD_INFO_FILE)
-            if (legacyFile.exists()) {
-                legacyFile.delete()
-            }
-            if (persistenceDir.exists() && persistenceDir.list().isNullOrEmpty()) {
-                persistenceDir.delete()
+        fun resumeDownload(appId: Int) {
+            DownloadCoordinator.runOnScope {
+                DownloadCoordinator.resume(DownloadRecord.STORE_STEAM, appId.toString())
             }
         }
 
-        private fun clearFailedResumeState(appId: Int) {
-            val appDirPath = getAppDirPath(appId)
-            clearPersistedProgressSnapshot(appDirPath)
-            runBlocking(Dispatchers.IO) {
-                instance?.downloadingAppInfoDao?.deleteApp(appId)
-            }
+        fun cancelAll() {
+            DownloadCoordinator.runOnScope { DownloadCoordinator.cancelAll() }
         }
 
-        private fun deleteRecursivelyWithRetries(
-            target: File,
-            maxAttempts: Int = 5,
-            delayMs: Long = 250L,
-        ): Boolean {
-            if (!target.exists()) return true
-
-            repeat(maxAttempts) {
-                if (target.deleteRecursively()) return true
-                try {
-                    Thread.sleep(delayMs)
-                } catch (_: InterruptedException) {
-                    Thread.currentThread().interrupt()
-                    return !target.exists()
-                }
+        fun cancelDownload(appId: Int) {
+            DownloadCoordinator.runOnScope {
+                DownloadCoordinator.cancel(DownloadRecord.STORE_STEAM, appId.toString())
             }
-
-            return !target.exists()
         }
 
-        private fun cleanupSteamAppCacheDirs(appId: Int) {
-            steamAppCacheDirs(appId).forEach { dir ->
-                if (!dir.exists()) return@forEach
-                Timber.i("Deleting Steam cache folder for appId $appId: ${dir.absolutePath}")
-                if (!deleteRecursivelyWithRetries(dir)) {
-                    Timber.w("Failed to fully delete Steam cache folder for appId $appId: ${dir.absolutePath}")
-                }
-            }
+        // Legacy entry point kept for binary compat — delegates to the coordinator instead of the old Steam-only queue logic (which would race it and double-start downloads).
+        fun checkQueue() {
+            DownloadCoordinator.blockingTick()
         }
 
-        private fun steamAppCacheDirs(appId: Int): List<File> {
-            val appIdString = appId.toString()
-            val dirs = linkedMapOf<String, File>()
-
-            fun addDir(dir: File) {
-                val normalized =
-                    try {
-                        dir.canonicalFile
-                    } catch (_: IOException) {
-                        dir.absoluteFile
-                    }
-                dirs[normalized.path] = normalized
-            }
-
-            fun addSteamAppsRoot(root: File) {
-                addDir(File(root, "staging/$appIdString"))
-                addDir(File(root, "shadercache/$appIdString"))
-            }
-
-            fun addInstallRoot(installRoot: String) {
-                if (installRoot.isBlank()) return
-                val root = File(installRoot)
-                val steamAppsRoot =
-                    if (root.name.equals("common", ignoreCase = true)) {
-                        root.parentFile ?: root
-                    } else {
-                        root
-                    }
-                addSteamAppsRoot(steamAppsRoot)
-            }
-
-            addDir(File(defaultAppStagingPath, appIdString))
-            if (defaultStoragePath.isNotBlank()) {
-                addDir(File(defaultStoragePath, "Steam/steamapps/shadercache/$appIdString"))
-            }
-
-            addInstallRoot(internalAppInstallPath)
-            addInstallRoot(externalAppInstallPath)
-            addInstallRoot(defaultAppInstallPath)
-            allInstallPaths.forEach(::addInstallRoot)
+        internal val downloadJobs = ConcurrentHashMap<Int, DownloadInfo>()
 
-            return dirs.values.toList()
+        fun clearCompletedDownloads() {
+            clearCompletedDownloadsInternal(dispatchQueueAfterClear = true)
+            // Also remove finished records from the cross-store coordinator table.
+            DownloadCoordinator.runOnScope { DownloadCoordinator.clear() }
         }
 
-        private fun steamProtectedInstallRoots(): List<String> =
-            listOf(
-                internalAppInstallPath,
-                externalAppInstallPath,
-                defaultAppInstallPath,
-            ).filter { it.isNotBlank() }.distinct()
+        fun clearCompletedDownloadsForShutdown() {
+            clearCompletedDownloadsInternal(dispatchQueueAfterClear = false)
+        }
 
         fun hasPartialDownload(appId: Int): Boolean {
             if (isAppInstalled(appId)) return false
@@ -687,30 +513,7 @@ class SteamService :
             return false
         }
 
-        private val syncInProgressApps = ConcurrentHashMap<Int, AtomicBoolean>()
-
-        private fun getSyncFlag(appId: Int): AtomicBoolean {
-            val existing = syncInProgressApps[appId]
-            if (existing != null) {
-                return existing
-            }
-            val created = AtomicBoolean(false)
-            val prior = syncInProgressApps.putIfAbsent(appId, created)
-            return prior ?: created
-        }
-
-        private fun tryAcquireSync(appId: Int): Boolean {
-            val flag = getSyncFlag(appId)
-            return flag.compareAndSet(false, true)
-        }
-
-        private fun releaseSync(appId: Int) {
-            val flag = syncInProgressApps[appId]
-            flag?.set(false)
-            if (flag != null && !flag.get()) {
-                syncInProgressApps.remove(appId, flag)
-            }
-        }
+        internal val syncInProgressApps = ConcurrentHashMap<Int, AtomicBoolean>()
 
         // Track whether a game is currently running to prevent premature service stop
         @JvmStatic
@@ -730,75 +533,96 @@ class SteamService :
         var isImporting: Boolean = false
 
         var isStopping: Boolean = false
-            private set
+            internal set
         private val _isConnectedFlow = MutableStateFlow(false)
         val isConnectedFlow = _isConnectedFlow.asStateFlow()
 
-        /**
-         * Pure getter over [isConnectedFlow]. Do not read `steamClient.isConnected` here —
-         * concurrent readers were mutating the flow as a side-effect, producing UI flicker
-         * during CM reconnect gaps. Callbacks (`onConnected` / `onDisconnected` / `clearValues`)
-         * are the only authoritative writers of the flow.
-         */
+        /** Pure getter over [isConnectedFlow] — do not read the live socket here; only callbacks may write the flow, else concurrent reads flicker the UI during CM reconnect gaps. */
         var isConnected: Boolean
             get() = _isConnectedFlow.value
-            private set(value) {
+            internal set(value) {
                 _isConnectedFlow.value = value
             }
 
         var isRunning: Boolean = false
-            private set
+            internal set
         var isLoggingOut: Boolean = false
-            private set
+            internal set
 
-        private val _isLoggedInFlow = MutableStateFlow(false)
+        internal val _isLoggedInFlow = MutableStateFlow(false)
         val isLoggedInFlow = _isLoggedInFlow.asStateFlow()
 
-        /**
-         * Pure getter over [isLoggedInFlow]. Previously this read `steamClient.steamID.isValid`
-         * and wrote the flow as a side-effect, which caused UI flicker whenever any caller
-         * (StoresFragment.onResume, CloudSyncManager.rehydrateSteamSession, the 10s poll) read
-         * the value during a transient CM disconnect. The flow is now only mutated by
-         * authoritative sources: initLoginStatus(), onLoggedOn, onLoggedOff, logOut, clearValues.
-         */
+        // Master chat switch (default on). When off, the Steam session stays logged on for
+        // downloads/library, but the chat layer is killed: offline presence, no message
+        // poller, no friends refresh, no chat overlay/notifications.
+        private val _chatServiceEnabledFlow = MutableStateFlow(true)
+        val chatServiceEnabledFlow = _chatServiceEnabledFlow.asStateFlow()
+
+        /** Flip the master chat switch: persists, updates the reactive flag, and applies at once (presence, poller, overlay). */
+        fun setChatServiceEnabled(context: Context, enabled: Boolean) {
+            PrefManager.chatServiceEnabled = enabled
+            _chatServiceEnabledFlow.value = enabled
+            instance?.applyChatServiceState(enabled)
+            if (!enabled) {
+                com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService.stop(context)
+            } else if (PrefManager.chatHeadsEnabled) {
+                com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService.start(context)
+            }
+        }
+
+        /** Pure getter over [isLoggedInFlow] — never write the flow from a read (caused UI flicker on transient CM disconnect); only authoritative sources mutate it (initLoginStatus, onLoggedOn/Off, logOut, clearValues). */
+        // Invoked by name via reflection from SteamBridge/SteamClientManager — keep in the companion; do not move to an extension file.
         val isLoggedIn: Boolean
             get() = !isLoggingOut && _isLoggedInFlow.value
 
         var isWaitingForQRAuth: Boolean = false
-            private set
+            internal set
+
+        // In-flight credentials/QR auth session; held in the companion so stopLoginWithQr() can cancel anywhere; cleared on success (ownership → wnSession) or failure.
+        private var wnAuthSession: WnSteamSession? = null
+
+        // Long-lived session carrying the post-logon CM connection — the sole Steam connection, from refresh-token acquisition through logout. @Volatile: logOut() reads on UI thread while the auth flow writes on IO.
+        @Volatile internal var wnSession: WnSteamSession? = null
+
+        @JvmStatic
+        fun wnSessionStateForDiag(): Int = wnSession?.state() ?: -1
+
+        @JvmStatic
+        fun wnSessionSuspensionReasonForDiag(): String =
+            instance?.suspensionReasonForDiag() ?: "no-service"
+
+        // True once onWnLoggedOn ran for the current wnSession; reset on disconnect/teardown so reconnect re-runs it. Guards the state observer double-firing.
+        @Volatile internal var wnLoggedOnHandled = false
 
-        /**
-         * Keeps [isConnectedFlow] in sync with the live socket state. Previously also wrote
-         * [isLoggedInFlow] from `steamID.isValid`, which flipped the UI to "signed out"
-         * whenever Valve's CM load-balanced us. The login flow is now purely callback-driven
-         * (see [isLoggedIn] docs), so this method only touches the connected flow.
-         */
+        // Serializes session bring-up: concurrent callers racing into bringUpWnSession() spin up separate CM sessions that kick each other (ClientLoggedOff eresult=34) since Steam allows one per account-instance. Only bring-up is gated; reusing a logged-on session stays lock-free.
+        private val wnSessionBringUpMutex = kotlinx.coroutines.sync.Mutex()
+
+        @Volatile internal var logonGateUntilMs: Long = 0L
+            internal set
+        @Volatile internal var lastLogonFailureEresult: Int = 0
+            internal set
+        @Volatile internal var consecutiveLogonFailures: Int = 0
+            internal set
+
+        /** Live Kotlin facade over wnSession's native library store; created with the session, torn down by teardownPriorWnSession()/logOut(). Collect `snapshots` to observe library changes; `current` is the latest value. */
+        @Volatile var wnLibrary: WnLibraryStore? = null
+            internal set
+        @Volatile internal var wnLibraryMirrorJob: Job? = null
+
+        /** Keeps [isConnectedFlow] in sync with the live socket; only touches the connected flow (writing isLoggedInFlow from a read flipped the UI to "signed out" on CM load-balancing). */
         fun syncStates() {
-            val connected = instance?.steamClient?.isConnected == true
+            // Connected == the C++ WN-Steam-Client channel is up (state >= 2).
+            val connected = (wnSession?.state() ?: 0) >= 2
             if (connected != _isConnectedFlow.value) _isConnectedFlow.value = connected
         }
 
-        /**
-         * Checks if the user has stored Steam credentials (refresh token).
-         * Used to determine if auto-reconnection should be attempted on app start.
-         */
+        /** True if a stored refresh token exists — gates whether auto-reconnect is attempted on app start. */
         fun hasStoredCredentials(context: Context): Boolean {
             PrefManager.init(context)
             return PrefManager.refreshToken.isNotBlank()
         }
 
-        /**
-         * Classifies the current Steam session using the same [StoreAuthStatus] model Epic
-         * uses. Lets the UI distinguish "reconnecting" / "token expired" / "no login" rather
-         * than painting every non-ACTIVE state as "signed out."
-         *
-         * - LOGGED_OUT: no stored refresh token.
-         * - EXPIRED:    refresh-token JWT's `exp` claim is in the past (~200 days old).
-         * - ACTIVE:     [isLoggedInFlow] is true (JavaSteam callback confirmed login).
-         * - REFRESHABLE: have a valid-looking refresh token but not yet logged on — the
-         *                 service is still connecting, or we're mid-reconnect after a CM bounce.
-         * - UNKNOWN:    refresh token exists but can't be parsed as a JWT.
-         */
+        /** Classifies the session into [StoreAuthStatus] so the UI can show reconnecting / expired / no-login: LOGGED_OUT (no token), EXPIRED (JWT exp past), ACTIVE (logged in), REFRESHABLE (valid token, not yet logged on / mid-reconnect), UNKNOWN (token unparseable). */
         fun getAuthStatus(context: Context): StoreAuthStatus {
             PrefManager.init(context)
             val refreshToken = PrefManager.refreshToken
@@ -817,18 +641,13 @@ class SteamService :
             return if (jwtExpired == null) StoreAuthStatus.UNKNOWN else StoreAuthStatus.REFRESHABLE
         }
 
-        /**
-         * Pre-seeds the login flow with stored credential state so the UI
-         * doesn't flash a "sign in" prompt while the service is connecting.
-         */
+        /** Pre-seeds the login flow from stored credentials so the UI doesn't flash "sign in" while connecting. */
         fun initLoginStatus(context: Context) {
             if (!isLoggingOut) {
                 _isLoggedInFlow.value = hasStoredCredentials(context)
             }
         }
 
-        private val serverListPath: String
-            get() = Paths.get(DownloadService.baseCacheDirPath, "server_list.bin").pathString
 
         val internalAppInstallPath: String
             get() = Paths.get(DownloadService.baseDataDirPath, "Steam", "steamapps", "common").pathString
@@ -915,7 +734,12 @@ class SteamService :
             }
 
         val userSteamId: SteamID?
-            get() = instance?.steamClient?.steamID
+            get() {
+                // Prefer the live native session; fall back during reconnect gaps.
+                val live = wnSession?.steamId()?.takeIf { it != 0L }
+                val id = live ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }
+                return id?.let { SteamID(it) }
+            }
 
         val familyMembers: List<Int>
             get() = instance?.familyGroupMembers ?: emptyList()
@@ -926,13 +750,108 @@ class SteamService :
         suspend fun setPersonaState(state: EPersonaState) =
             withContext(Dispatchers.IO) {
                 PrefManager.personaState = state.code()
-                instance?._steamFriends?.setPersonaState(state)
+                if (!PrefManager.wnHybridMode) {
+                    withWnSession { session -> session.setPersonaState(state.code()) }
+                } else {
+                    Timber.d("Hybrid: setPersonaState($state) local-only; " +
+                        "Steam-side broadcast deferred until IClientFriends RE")
+                }
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setPersonaState(state.code())
+                // Reflect locally — Steam doesn't echo our own persona state back, so the UI would stay stale until the next requestUserPersona().
+                instance?._localPersona?.update { it.copy(state = state) }
+                instance?.localPersona?.value?.let {
+                    PluviaApp.events.emit(SteamEvent.PersonaStateReceived(it))
+                }
             }
 
         suspend fun requestUserPersona() =
             withContext(Dispatchers.IO) {
-                // in order to get user avatar url and other info
-                userSteamId?.let { instance?._steamFriends?.requestFriendInfo(it) }
+                val svc = instance ?: return@withContext
+
+                run {
+                    val bs = com.winlator.cmod.feature.stores.steam.wnsteam
+                        .WnSteamBootstrap
+                    val playerName = bs.personaName()
+                    if (!playerName.isNullOrEmpty()) {
+                        val stateCode = bs.personaState()
+                        svc._localPersona.update {
+                            it.copy(
+                                name = playerName,
+                                state = EPersonaState.from(stateCode) ?: EPersonaState.Offline,
+                            )
+                        }
+                        PrefManager.steamUserName = playerName
+                        PluviaApp.events.emit(
+                            SteamEvent.PersonaStateReceived(svc.localPersona.value),
+                        )
+                        Timber.i("user persona via libsteamclient.so: name='$playerName' state=$stateCode")
+                        return@withContext
+                    }
+                    Timber.d("libsteamclient.so persona empty; falling through to wn-session")
+                }
+
+                // Fetch local persona: CMsgClientRequestFriendData is sent; the CMsgClientPersonaState reply is server-pushed and cached — poll getSelfPersona() for it.
+                val json =
+                    withWnSession { session ->
+                        session.requestUserPersona()
+                        var j: String? = null
+                        for (i in 0 until 25) {
+                            j = session.getSelfPersona()
+                            if (j != null) break
+                            delay(200)
+                        }
+                        j
+                    } ?: return@withContext
+                try {
+                    val obj = JSONObject(json)
+                    val avatarHash = obj.optString("avatarHash")
+                    val playerName = obj.optString("playerName")
+                    val gameAppId = obj.optInt("gameAppId")
+                    svc._localPersona.update {
+                        it.copy(
+                            avatarHash = avatarHash.ifEmpty { it.avatarHash },
+                            name = playerName.ifEmpty { it.name },
+                            state = EPersonaState.from(obj.optInt("personaState")) ?: EPersonaState.Offline,
+                            gameAppID = gameAppId,
+                            gameName = svc.appDao.findApp(gameAppId)?.name
+                                ?: obj.optString("gameName"),
+                        )
+                    }
+                    if (avatarHash.isNotEmpty()) PrefManager.steamUserAvatarHash = avatarHash
+                    if (playerName.isNotEmpty()) PrefManager.steamUserName = playerName
+                    PluviaApp.events.emit(SteamEvent.PersonaStateReceived(svc.localPersona.value))
+                    Timber.i("user persona via wn-steam-client: name='$playerName'")
+
+                    if (playerName.isNotEmpty()) {
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                            .setPersonaName(playerName)
+                    }
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .setPersonaState(obj.optInt("personaState"))
+
+                    if (avatarHash.isNotEmpty() && avatarHash.length % 2 == 0) {
+                        val selfSid = withWnSession { it.steamId() } ?: 0L
+                        if (selfSid != 0L) {
+                            val bytes = ByteArray(avatarHash.length / 2)
+                            var ok = true
+                            for (k in bytes.indices) {
+                                val hi = Character.digit(avatarHash[k * 2], 16)
+                                val lo = Character.digit(avatarHash[k * 2 + 1], 16)
+                                if (hi < 0 || lo < 0) { ok = false; break }
+                                bytes[k] = ((hi shl 4) or lo).toByte()
+                            }
+                            if (ok) {
+                                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                                    .setFriendAvatarHash(selfSid, bytes)
+                                com.winlator.cmod.feature.stores.steam.wnsteam.AvatarFetcher
+                                    .enqueueAllTiers(selfSid, avatarHash)
+                            }
+                        }
+                    }
+                } catch (e: Exception) {
+                    Timber.w(e, "requestUserPersona: persona parse failed")
+                }
             }
 
         suspend fun getSelfCurrentlyPlayingAppId(): Int? =
@@ -943,34 +862,53 @@ class SteamService :
 
         suspend fun kickPlayingSession(onlyGame: Boolean = true): Boolean =
             withContext(Dispatchers.IO) {
-                val user = instance?._steamUser ?: return@withContext false
                 try {
                     instance?._isPlayingBlocked?.value = true
-                    user.kickPlayingSession(onlyStopGame = onlyGame)
-
-                    // Wait for PlayingSessionStateCallback to indicate unblocked
-                    val deadline = System.currentTimeMillis() + 5000
-                    while (System.currentTimeMillis() < deadline) {
-                        if (instance?._isPlayingBlocked?.value == false) return@withContext true
-                        delay(100)
-                    }
-                    false
+                    // Kick + wait: the server-pushed CMsgClientPlayingSessionState updates the playing-blocked cache; poll it for the unblock.
+                    val cleared = withWnSession { session ->
+                        // Invalidate the playing-blocked cache before the kick: the session is reused, so the loop must only observe a post-kick server push.
+                        session.markPlayingBlocked()
+                        session.kickPlayingSession(onlyGame)
+                        val deadline = System.currentTimeMillis() + 5000
+                        var ok = false
+                        while (System.currentTimeMillis() < deadline) {
+                            delay(100)
+                            if (!session.isPlayingBlocked()) { ok = true; break }
+                        }
+                        ok
+                    } == true
+                    instance?._isPlayingBlocked?.value = !cleared
+                    cleared
                 } catch (_: Exception) {
                     false
                 }
             }
 
-        /**
-         * Get licenses from database for use with DepotDownloader
-         */
-        suspend fun getLicensesFromDb(): List<License> =
+        // Fire-and-skip: use the already-logged-on wn-session if one exists, else return false without bringing one up — clears server-side "playing" state on game termination without blocking teardown 5-15s on a cold bring-up.
+        @JvmStatic
+        suspend fun kickPlayingSessionIfReady(onlyGame: Boolean = true): Boolean =
             withContext(Dispatchers.IO) {
-                val cached = instance?.cachedLicenseDao?.getAll() ?: return@withContext emptyList()
-                cached.mapNotNull { cachedLicense ->
-                    LicenseSerializer.deserializeLicense(cachedLicense.licenseJson)
+                try {
+                    val session = wnSession?.takeIf { it.state() == 3 } ?: return@withContext false
+                    session.markPlayingBlocked()
+                    session.kickPlayingSession(onlyGame)
+                    // kickPlayingSession clears only playing-BLOCKED, not the launcher's games-played registration — clear that too (empty CMsgClientGamesPlayed) or the next launch hits AlreadyRunning.
+                    session.notifyGamesPlayed("[]", EOSType.AndroidUnknown.code())
+                    instance?._isPlayingBlocked?.value = true
+                    Timber.i("kickPlayingSessionIfReady: dispatched (onlyGame=$onlyGame) + cleared games-played")
+                    true
+                } catch (e: Throwable) {
+                    Timber.w(e, "kickPlayingSessionIfReady failed")
+                    false
                 }
             }
 
+        // Single caller only needs whether any licenses exist — returns the raw cached rows.
+        suspend fun getLicensesFromDb(): List<CachedLicense> =
+            withContext(Dispatchers.IO) {
+                instance?.cachedLicenseDao?.getAll() ?: emptyList()
+            }
+
         fun getPkgInfoOf(appId: Int): SteamLicense? =
             runBlocking(Dispatchers.IO) {
                 instance?.licenseDao?.findLicense(
@@ -978,7 +916,11 @@ class SteamService :
                 )
             }
 
-        fun getAppInfoOf(appId: Int): SteamApp? = runBlocking(Dispatchers.IO) { instance?.appDao?.findApp(appId) }
+        fun getAppInfoOf(appId: Int): SteamApp? =
+            runBlocking(Dispatchers.IO) {
+                val dao = instance?.appDao ?: runCatching { PluviaDatabase.getInstance().steamAppDao() }.getOrNull()
+                dao?.findApp(appId)
+            }
 
         fun getDownloadingAppInfoOf(appId: Int): DownloadingAppInfo? =
             runBlocking(Dispatchers.IO) {
@@ -988,37 +930,74 @@ class SteamService :
         fun getDownloadableDlcAppsOf(appId: Int): List<SteamApp>? =
             runBlocking(Dispatchers.IO) { instance?.appDao?.findDownloadableDLCApps(appId) }
 
-        fun getHiddenDlcAppsOf(appId: Int): List<SteamApp>? = runBlocking(Dispatchers.IO) { instance?.appDao?.findHiddenDLCApps(appId) }
-
-        fun getInstalledApp(appId: Int): AppInfo? = runBlocking(Dispatchers.IO) { instance?.appInfoDao?.getInstalledApp(appId) }
+        fun getSelectableDlcAppsOf(appId: Int): List<SteamApp> =
+            runBlocking(Dispatchers.IO) {
+                val service = instance ?: return@runBlocking emptyList()
+                val appInfo = service.appDao.findApp(appId) ?: return@runBlocking emptyList()
+                val preferredLanguage = PrefManager.containerLanguage
+                val has64Bit =
+                    appInfo.depots.values.any {
+                        it.osArch == OSArch.Arch64 &&
+                            (it.osList.contains(OS.windows) || (it.osList.isEmpty() || it.osList.contains(OS.none)))
+                    }
 
-        fun getInstalledDepotsOf(appId: Int): List<Int>? = getInstalledApp(appId)?.downloadedDepots
+                val mainAppDlcIds =
+                    appInfo.depots.values
+                        .asSequence()
+                        .filter { depot ->
+                            depot.dlcAppId != INVALID_APP_ID &&
+                                filterForDownloadableDepots(depot, has64Bit, preferredLanguage, ownedDlc = null)
+                        }.map { it.dlcAppId }
+
+                val indirectDlcApps = service.appDao.findDownloadableDLCApps(appId).orEmpty()
+                val hiddenDlcApps = service.appDao.findHiddenDLCApps(appId).orEmpty()
+                val dlcAppsById = (indirectDlcApps + hiddenDlcApps).associateBy { it.id }
+                val indirectDlcIds = indirectDlcApps.map { it.id }.asSequence()
+                val hiddenDlcIds = hiddenDlcApps.map { it.id }.asSequence()
+                val groupedBaseDlcIds =
+                    getGroupedBaseAppDlcIds(
+                        appInfo = appInfo,
+                        preferredLanguage = preferredLanguage,
+                        has64Bit = has64Bit,
+                    ).asSequence()
+
+                val declaredDlcIds = appInfo.dlcAppIds.asSequence()
+
+                val selectableDlcIds = (mainAppDlcIds + groupedBaseDlcIds + indirectDlcIds + hiddenDlcIds + declaredDlcIds).distinct().toList()
+
+                if (selectableDlcIds.isEmpty()) return@runBlocking emptyList()
+
+                // Single bulk SELECT instead of N findApp() calls; keeps DB-first by overlaying dlcAppsById only for IDs not in the DB.
+                val dlcFromDb = service.appDao.findApps(selectableDlcIds).associateBy { it.id }
+                selectableDlcIds
+                    .mapNotNull { dlcAppId ->
+                        (dlcFromDb[dlcAppId] ?: dlcAppsById[dlcAppId])?.takeIf { it.name.isNotBlank() }
+                    }
+                    .sortedBy { it.name.lowercase() }
+            }
 
-        fun getInstalledDlcDepotsOf(appId: Int): List<Int>? = getInstalledApp(appId)?.dlcDepots
+        fun getHiddenDlcAppsOf(appId: Int): List<SteamApp>? = runBlocking(Dispatchers.IO) { instance?.appDao?.findHiddenDLCApps(appId) }
 
-        private fun tryRecoverInstalledAppInfo(appId: Int): AppInfo? {
-            val dirPath = getAppDirPath(appId)
-            val hasCompleteMarker = MarkerUtils.hasMarker(dirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
-            val hasInProgressMarker = MarkerUtils.hasMarker(dirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-            if (!hasCompleteMarker || hasInProgressMarker) return null
+        fun getInstalledApp(appId: Int): AppInfo? =
+            runBlocking(Dispatchers.IO) {
+                val dao = instance?.appInfoDao ?: runCatching { PluviaDatabase.getInstance().appInfoDao() }.getOrNull()
+                dao?.getInstalledApp(appId)
+            }
 
-            val dir = File(dirPath)
-            if (!dir.exists() || !dir.isDirectory) return null
+        fun getInstalledDepotsOf(appId: Int): List<Int>? = getTrustedInstalledAppInfo(appId)?.downloadedDepots
 
-            val downloadedDepotIds = runCatching { getMainAppDepots(appId).keys.sorted() }.getOrDefault(emptyList())
-            val recovered =
-                AppInfo(
-                    id = appId,
-                    isDownloaded = true,
-                    downloadedDepots = downloadedDepotIds,
-                    dlcDepots = emptyList(),
-                )
+        fun getInstalledDlcDepotsOf(appId: Int): List<Int>? {
+            val installedApp = getTrustedInstalledAppInfo(appId)
+            val installedDlcAppIds = installedApp?.dlcDepots.orEmpty().toMutableSet()
+            installedDlcAppIds.addAll(getInstalledSelectableDlcAppIds(appId))
 
-            runBlocking(Dispatchers.IO) {
-                PluviaDatabase.getInstance().appInfoDao().insert(recovered)
+            if (installedApp != null && installedDlcAppIds != installedApp.dlcDepots.toSet()) {
+                runBlocking(Dispatchers.IO) {
+                    instance?.appInfoDao?.update(installedApp.copy(dlcDepots = installedDlcAppIds.sorted()))
+                }
             }
-            Timber.i("Recovered Steam installed metadata from disk for appId=$appId at $dirPath")
-            return recovered
+
+            return installedDlcAppIds.sorted()
         }
 
         fun repairInstalledMetadataFromDisk(): Int {
@@ -1042,54 +1021,6 @@ class SteamService :
             }
         }
 
-        private fun countCompletedInstallMarkers(maxCount: Int = Int.MAX_VALUE): Int {
-            var count = 0
-            for (basePath in allInstallPaths) {
-                val baseDir = File(basePath)
-                val appDirs = baseDir.listFiles() ?: continue
-                for (appDir in appDirs) {
-                    if (!appDir.isDirectory) continue
-                    val hasCompleteMarker = File(appDir, Marker.DOWNLOAD_COMPLETE_MARKER.fileName).exists()
-                    if (!hasCompleteMarker) continue
-
-                    val hasInProgressMarker = File(appDir, Marker.DOWNLOAD_IN_PROGRESS_MARKER.fileName).exists()
-                    if (hasInProgressMarker) continue
-
-                    count++
-                    if (count >= maxCount) return count
-                }
-            }
-            return count
-        }
-
-        private fun shouldRepairInstalledMetadata(): Boolean {
-            val db =
-                runCatching { PluviaDatabase.getInstance() }.getOrElse {
-                    Timber.e(it, "Failed to access database for startup metadata repair gate")
-                    return false
-                }
-
-            val knownAppCount =
-                runBlocking(Dispatchers.IO) {
-                    runCatching { db.steamAppDao().getAllAppIds().size }.getOrElse {
-                        Timber.e(it, "Failed to load Steam app ids for startup metadata repair gate")
-                        return@runBlocking 0
-                    }
-                }
-            if (knownAppCount == 0) return false
-
-            val installedDbCount =
-                runBlocking(Dispatchers.IO) {
-                    runCatching { db.appInfoDao().getAllInstalledAppIds().size }.getOrElse {
-                        Timber.e(it, "Failed to load installed Steam app ids for startup metadata repair gate")
-                        return@runBlocking 0
-                    }
-                }
-
-            val diskInstallCount = countCompletedInstallMarkers(maxCount = installedDbCount + 1)
-            return diskInstallCount > installedDbCount
-        }
-
         fun maybeRepairInstalledMetadataOnStartup(context: Context) {
             val appContext = context.applicationContext
             if (!hasStoredCredentials(appContext)) return
@@ -1112,10 +1043,7 @@ class SteamService :
         fun getAppDownloadInfo(appId: Int): DownloadInfo? = downloadJobs[appId]
 
         fun isAppInstalled(appId: Int): Boolean {
-            val appInfo = getInstalledApp(appId) ?: tryRecoverInstalledAppInfo(appId)
-            if (appInfo?.isDownloaded != true) return false
-            val dirPath = getAppDirPath(appId)
-            return MarkerUtils.hasMarker(dirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+            return getTrustedInstalledAppInfo(appId) != null
         }
 
         fun uninstallApp(
@@ -1177,9 +1105,11 @@ class SteamService :
                 }.orEmpty()
 
         suspend fun getOwnedAppDlc(appId: Int): Map<Int, DepotInfo> {
-            val client = instance?.steamClient ?: return emptyMap()
-            val accountId = client.steamID?.accountID?.toInt() ?: return emptyMap()
-            val ownedGameIds = getOwnedGames(userSteamId!!.convertToUInt64()).map { it.appId }.toHashSet()
+            val ownedGameIds =
+                runCatching {
+                    val steamId = userSteamId ?: return@runCatching emptySet<Int>()
+                    getOwnedGames(steamId.convertToUInt64()).map { it.appId }.toHashSet()
+                }.getOrDefault(emptySet())
 
             return getAppDlc(appId)
                 .filter { (_, depot) ->
@@ -1187,8 +1117,10 @@ class SteamService :
                         // Base-game depots always download
                         depot.dlcAppId == INVALID_APP_ID -> true
 
-                        // ① licence cache
-                        instance?.licenseDao?.findLicense(depot.dlcAppId) != null -> true
+                        // ① licence cache — DLC app IDs live inside package rows, not as package IDs.
+                        runBlocking(Dispatchers.IO) {
+                            instance?.licenseDao?.countLicensesForApp(depot.dlcAppId) ?: 0
+                        } > 0 -> true
 
                         // ② PICS row
                         instance?.appDao?.findApp(depot.dlcAppId) != null -> true
@@ -1208,7 +1140,7 @@ class SteamService :
 
             val appInfo = getAppInfoOf(appId)
             if (appInfo != null) {
-                // for each of the dlcAppId found in main depots, filter the count = 1, add that dlcAppId to dlcAppIds
+                // Hidden DLC can be represented by a single placeholder depot.
                 val checkingAppDlcIds =
                     appInfo.depots
                         .filter { it.value.dlcAppId != INVALID_APP_ID }
@@ -1231,12 +1163,7 @@ class SteamService :
             return mainAppDlcIds
         }
 
-        /**
-         * Refresh the owned games list by querying Steam, diffing with the local DB, and
-         * queueing PICS requests for anything new so metadata gets populated.
-         *
-         * @return number of newly discovered appIds that were scheduled for PICS.
-         */
+        /** Refresh owned games: query Steam, diff the local DB, queue PICS for new apps; returns the count of newly discovered appIds scheduled for PICS. */
         suspend fun refreshOwnedGamesFromServer(): Int =
             withContext(Dispatchers.IO) {
                 val service = instance ?: return@withContext 0
@@ -1269,9 +1196,7 @@ class SteamService :
                 }.getOrDefault(0)
             }
 
-        /**
-         * Common Filter for downloadable depots
-         */
+        /** Common filter for downloadable depots. */
         fun filterForDownloadableDepots(
             depot: DepotInfo,
             has64Bit: Boolean,
@@ -1293,9 +1218,7 @@ class SteamService :
             ) {
                 return false
             }
-            // 3. 64-bit or indeterminate
-            // Arch selection: allow 64-bit and Unknown always.
-            // Allow 32-bit only when no 64-bit depot exists.
+            // 3. Arch: allow 64-bit and Unknown always; 32-bit only when no 64-bit depot exists.
             val archOk =
                 when (depot.osArch) {
                     OSArch.Arch64, OSArch.Unknown -> true
@@ -1335,10 +1258,7 @@ class SteamService :
                 }.associate { it.toPair() }
         }
 
-        /**
-         * Get downloadable depots for a given app, including all DLCs
-         * @return Map of app ID to depot ID to depot info
-         */
+        /** Downloadable depots for an app, including all DLCs. */
         fun getDownloadableDepots(
             appId: Int,
             preferredLanguage: String = PrefManager.containerLanguage,
@@ -1369,7 +1289,6 @@ class SteamService :
                     if (isDepotEntitled(depotId, depot, entitledDlcDepotIds) &&
                         filterForDownloadableDepots(depot, has64Bit, preferredLanguage, null)
                     ) {
-                        // Add DLC Depots with custom object
                         map[depotId] =
                             DepotInfo(
                                 depotId = depot.depotId,
@@ -1380,6 +1299,7 @@ class SteamService :
                                 osList = depot.osList,
                                 osArch = depot.osArch,
                                 language = depot.language,
+                                lowViolence = depot.lowViolence,
                                 manifests = depot.manifests,
                                 encryptedManifests = depot.encryptedManifests,
                             )
@@ -1390,138 +1310,126 @@ class SteamService :
             return map
         }
 
-        private fun getEntitledDepotIds(packageId: Int): Set<Int>? {
-            if (packageId == INVALID_PKG_ID) return null
-            val depotIds =
-                runBlocking(Dispatchers.IO) {
-                    instance
-                        ?.licenseDao
-                        ?.findLicense(packageId)
-                        ?.depotIds
-                        .orEmpty()
-                }
-            return depotIds.takeIf { it.isNotEmpty() }?.toSet()
-        }
+        internal data class GroupedBaseAppDlcDepot(
+            val depotId: Int,
+            val dlcAppId: Int,
+            val depot: DepotInfo,
+        )
 
-        private fun isDepotEntitled(
-            depotId: Int,
-            depot: DepotInfo,
-            entitledDepotIds: Set<Int>?,
-        ): Boolean {
-            if (entitledDepotIds == null) return true
-            if (depotId in entitledDepotIds) return true
-
-            // Shared/proxied depots may not be listed directly on the package even though
-            // they are required to resolve the owning depot's content.
-            return depot.sharedInstall || depot.depotFromApp != INVALID_APP_ID
-        }
-
-        private fun getSelectedDownloadDepots(
+        fun getSelectedManifestSizes(
             appId: Int,
-            userSelectedDlcAppIds: Collection<Int>,
+            userSelectedDlcAppIds: Collection<Int> = emptyList(),
             preferredLanguage: String = PrefManager.containerLanguage,
-        ): Map<Int, DepotInfo> {
-            val downloadableDepots = getDownloadableDepots(appId, preferredLanguage)
-            if (downloadableDepots.isEmpty()) return emptyMap()
-
-            val selectedDlcIds = userSelectedDlcAppIds.toSet()
-            val indirectDlcAppIds = getDownloadableDlcAppsOf(appId).orEmpty().map { it.id }.toSet()
-            val mainDepots = getMainAppDepots(appId)
-
-            val selectedMainDepots =
-                mainDepots.filter { (_, depot) ->
-                    depot.dlcAppId == INVALID_APP_ID ||
-                        (depot.dlcAppId in selectedDlcIds && depot.manifests.isNotEmpty())
-                }
-
-            val selectedDlcDepots =
-                downloadableDepots.filter { (depotId, depot) ->
-                    depotId !in selectedMainDepots &&
-                        depot.dlcAppId in selectedDlcIds &&
-                        depot.dlcAppId in indirectDlcAppIds &&
-                        depot.manifests.isNotEmpty()
-                }
+            branch: String = "public",
+        ): ManifestSizes {
+            ensureFreshDepotData(appId)
+            val selectedDepots = getSelectedDownloadDepots(appId, userSelectedDlcAppIds, preferredLanguage, branch)
+            if (selectedDepots.isEmpty()) return ManifestSizes()
 
-            return selectedMainDepots + selectedDlcDepots
+            return calculateManifestSizes(selectedDepots.values, branch)
         }
 
-        private fun resolveDepotManifestInfo(
-            depot: DepotInfo,
-            branch: String,
-            visitedApps: MutableSet<Int> = mutableSetOf(),
-        ): ManifestInfo? {
-            depot.manifests[branch]?.let { return it }
-            depot.encryptedManifests[branch]?.let { return it }
-
-            if (!branch.equals("public", ignoreCase = true)) {
-                depot.manifests["public"]?.let { return it }
-                depot.encryptedManifests["public"]?.let { return it }
-            }
-
-            val sourceAppId = depot.depotFromApp
-            if (sourceAppId == INVALID_APP_ID || !visitedApps.add(sourceAppId)) {
-                return null
-            }
+        fun getInstallableSelectedManifestSizes(
+            appId: Int,
+            userSelectedDlcAppIds: Collection<Int> = emptyList(),
+            preferredLanguage: String = PrefManager.containerLanguage,
+            branch: String = "public",
+        ): ManifestSizes {
+            ensureFreshDepotData(appId)
+            val selectedDepots = getSelectedDownloadDepots(appId, userSelectedDlcAppIds, preferredLanguage, branch)
+            val installableDepots =
+                filterAlreadyInstalledDepots(
+                    appId = appId,
+                    depots = selectedDepots,
+                    includeInstalledDepots = false,
+                )
+            if (installableDepots.isEmpty()) return ManifestSizes()
 
-            val sourceDepot = getAppInfoOf(sourceAppId)?.depots?.get(depot.depotId) ?: return null
-            return resolveDepotManifestInfo(sourceDepot, branch, visitedApps)
+            return calculateManifestSizes(installableDepots.values, branch)
         }
 
-        fun getSelectedManifestSizes(
+        fun getDlcOnlyManifestSizes(
             appId: Int,
-            userSelectedDlcAppIds: Collection<Int> = emptyList(),
+            dlcAppId: Int,
             preferredLanguage: String = PrefManager.containerLanguage,
             branch: String = "public",
         ): ManifestSizes {
-            val selectedDepots = getSelectedDownloadDepots(appId, userSelectedDlcAppIds, preferredLanguage)
-            if (selectedDepots.isEmpty()) return ManifestSizes()
+            val service = instance ?: return ManifestSizes()
+            ensureFreshDepotData(appId)
+            ensureFreshDepotData(dlcAppId)
+            val mainAppInfo =
+                runBlocking(Dispatchers.IO) { service.appDao.findApp(appId) } ?: return ManifestSizes()
+            val has64Bit =
+                mainAppInfo.depots.values.any {
+                    it.osArch == OSArch.Arch64 &&
+                        (it.osList.contains(OS.windows) || (it.osList.isEmpty() || it.osList.contains(OS.none)))
+                }
 
-            var totalInstallSize = 0L
-            var totalDownloadSize = 0L
+            val mainAppDlcDepots =
+                getSelectedBaseAppDlcContentDepots(appId, listOf(dlcAppId), preferredLanguage, branch).values
 
-            selectedDepots.values.forEach { depot ->
-                val manifest = resolveDepotManifestInfo(depot, branch)
-                totalInstallSize += manifest?.size ?: 0L
-                totalDownloadSize += manifest?.download ?: 0L
-            }
+            val dlcAppInfo = runBlocking(Dispatchers.IO) { service.appDao.findApp(dlcAppId) }
+            val dlcAppDepots =
+                dlcAppInfo?.depots?.values?.filter { depot ->
+                    filterForDownloadableDepots(depot, has64Bit, preferredLanguage, ownedDlc = null)
+                }.orEmpty()
 
-            return ManifestSizes(
-                installSize = totalInstallSize,
-                downloadSize = totalDownloadSize,
-            )
+            val combined = (mainAppDlcDepots + dlcAppDepots).associateBy { it.depotId }.values
+            if (combined.isEmpty()) return ManifestSizes()
+
+            return calculateManifestSizes(combined, branch)
         }
 
         fun getAppDirName(app: SteamApp?): String {
-            // The folder name, if it got made
-            var appName = app?.config?.installDir.orEmpty()
-            if (appName.isEmpty()) {
-                appName = app?.name.orEmpty()
-            }
-            return appName
-        }
+            val configuredInstallDir =
+                app?.config?.installDir
+                    .orEmpty()
+                    .trim()
+                    .takeUnless(::isSuspiciousSteamInstallDirLeaf)
 
-        private fun normalizeInstallPath(path: String): String {
-            if (path.isBlank()) return path
-            return try {
-                File(path).canonicalPath
-            } catch (_: IOException) {
-                File(path).absolutePath
-            }
+            return configuredInstallDir.takeUnless { it.isNullOrEmpty() }
+                ?: app?.name.orEmpty()
         }
 
+        // Invoked by name via reflection from SteamBridge — keep in the companion; do not move to an extension file.
         fun getAppDirPath(gameId: Int): String {
             val info = getAppInfoOf(gameId)
 
-            // Check custom install directory first (only if it's a full absolute path)
-            // installDir from PICS metadata is just a folder name, custom installs save full path
+            // Check custom install dir first (full absolute path only): installDir from PICS metadata is just a folder name, custom installs store the full path.
             val customDir = info?.installDir.orEmpty()
             if (customDir.isNotEmpty() && (customDir.startsWith("/") || customDir.contains(File.separator))) {
-                // It's a full path (custom install location)
-                return normalizeInstallPath(customDir)
+                val normalizedCustomDir = normalizeInstallPath(customDir)
+                if (!isSuspiciousSteamInstallPath(normalizedCustomDir)) {
+                    // It's a full path (custom install location)
+                    return normalizedCustomDir
+                }
+                Timber.w(
+                    "getAppDirPath: ignoring suspicious stored install path %s for appId=%d",
+                    normalizedCustomDir,
+                    gameId,
+                )
             }
 
             val appName = getAppDirName(info)
             val oldName = info?.name.orEmpty()
+            val candidateNames =
+                buildList {
+                    if (appName.isNotEmpty()) add(appName)
+                    if (oldName.isNotEmpty() && oldName != appName) add(oldName)
+                }
+
+            // No metadata: fall back to the durably-recorded install path (disk-validated, appId-specific; never a shared root).
+            if (candidateNames.isEmpty()) {
+                val recordedPath = getInstalledApp(gameId)?.installPath.orEmpty()
+                if (recordedPath.isNotEmpty()) {
+                    val normalizedRecorded = normalizeInstallPath(recordedPath)
+                    if (File(normalizedRecorded).isDirectory && !isSuspiciousSteamInstallPath(normalizedRecorded)) {
+                        return normalizedRecorded
+                    }
+                }
+                Timber.w("getAppDirPath: no metadata to resolve install dir for appId=%d", gameId)
+                return ""
+            }
 
             // Respect user-selected default download folder
             val context = PluviaApp.instance.applicationContext
@@ -1533,320 +1441,46 @@ class SteamService :
                             .getFilePathFromUri(context, android.net.Uri.parse(storeDefaultUri))
                     Timber.i("getAppDirPath: resolved baseDir $baseDir from URI $storeDefaultUri")
                     if (baseDir != null) {
-                        val path = Paths.get(baseDir, appName)
-                        if (Files.exists(path)) {
-                            Timber.i("getAppDirPath: found existing path $path")
-                            return normalizeInstallPath(path.pathString)
-                        }
-                        if (oldName.isNotEmpty()) {
-                            val oldPath = Paths.get(baseDir, oldName)
-                            if (Files.exists(oldPath)) {
-                                Timber.i("getAppDirPath: found existing oldPath $oldPath")
-                                return normalizeInstallPath(oldPath.pathString)
+                        for (candidateName in candidateNames) {
+                            val candidatePath = Paths.get(baseDir, candidateName)
+                            if (Files.exists(candidatePath)) {
+                                Timber.i("getAppDirPath: found existing path $candidatePath")
+                                return normalizeInstallPath(candidatePath.pathString)
                             }
                         }
+                        val targetName = candidateNames.firstOrNull().orEmpty()
+                        val targetPath = Paths.get(baseDir, targetName)
                         // If it doesn't exist yet, this is where we'll install it
-                        Timber.i("getAppDirPath: returning new path $path")
-                        return normalizeInstallPath(path.pathString)
+                        Timber.i("getAppDirPath: returning new path $targetPath")
+                        return normalizeInstallPath(targetPath.pathString)
                     }
                 }
             }
 
             for (basePath in allInstallPaths) {
-                val candidate = Paths.get(basePath, appName)
-                if (Files.exists(candidate)) return normalizeInstallPath(candidate.pathString)
-                if (oldName.isNotEmpty()) {
-                    val oldCandidate = Paths.get(basePath, oldName)
-                    if (Files.exists(oldCandidate)) return normalizeInstallPath(oldCandidate.pathString)
+                for (candidateName in candidateNames) {
+                    val candidate = Paths.get(basePath, candidateName)
+                    if (Files.exists(candidate)) return normalizeInstallPath(candidate.pathString)
                 }
             }
 
             // Nothing on disk yet – default to whatever location you want new installs to use
+            val targetName = candidateNames.firstOrNull().orEmpty()
             if (PrefManager.useExternalStorage) {
-                return normalizeInstallPath(Paths.get(externalAppInstallPath, appName).pathString)
-            }
-            return normalizeInstallPath(Paths.get(internalAppInstallPath, appName).pathString)
-        }
-
-        private fun createSteamShortcut(
-            context: Context,
-            appId: Int,
-        ) {
-            try {
-                val container = ContainerUtils.getOrCreateContainer(context, "STEAM_$appId")
-                val appInfo = getAppInfoOf(appId) ?: return
-                val installPath = getAppDirPath(appId)
-                val launchExecutable = getInstalledExe(appId)
-                val desktopDir = container.getDesktopDir()
-                if (!desktopDir.exists()) desktopDir.mkdirs()
-
-                val shortcutFile = File(desktopDir, "${appInfo.name}.desktop")
-                val content = StringBuilder()
-                content.append("[Desktop Entry]\n")
-                content.append("Type=Application\n")
-                content.append("Name=${appInfo.name}\n")
-                content.append("Exec=wine \"C:\\\\Program Files (x86)\\\\Steam\\\\steamclient_loader_x64.exe\"\n")
-                content.append("Icon=steam_icon_$appId\n")
-                content.append("\n[Extra Data]\n")
-                content.append("game_source=STEAM\n")
-                content.append("app_id=$appId\n")
-                content.append("container_id=${container.id}\n")
-                content.append("game_install_path=$installPath\n")
-                content.append("launch_exe_path=$launchExecutable\n")
-                content.append("use_container_defaults=1\n")
-
-                com.winlator.cmod.shared.io.FileUtils
-                    .writeString(shortcutFile, content.toString())
-                Timber.i("Created Steam shortcut for ${appInfo.name} in container ${container.id}")
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to create Steam shortcut for appId $appId")
-            }
-        }
-
-        private fun isExecutable(flags: Any): Boolean =
-            when (flags) {
-                // SteamKit-JVM (most forks) – flags is EnumSet<EDepotFileFlag>
-                is EnumSet<*> -> {
-                    flags.contains(EDepotFileFlag.Executable) ||
-                        flags.contains(EDepotFileFlag.CustomExecutable)
-                }
-
-                // SteamKit-C# protobuf port – flags is UInt / Int / Long
-                is Int -> {
-                    (flags and 0x20) != 0 || (flags and 0x80) != 0
-                }
-
-                is Long -> {
-                    ((flags and 0x20L) != 0L) || ((flags and 0x80L) != 0L)
-                }
-
-                else -> {
-                    false
-                }
+                return normalizeInstallPath(Paths.get(externalAppInstallPath, targetName).pathString)
             }
-
-        // --------------------------------------------------------------------------
-        // 1. Extra patterns & word lists
-        // --------------------------------------------------------------------------
-
-        // Unreal Engine "Shipping" binaries (e.g. Stray-Win64-Shipping.exe)
-        private val UE_SHIPPING =
-            Regex(
-                """.*-win(32|64)(-shipping)?\.exe$""",
-                RegexOption.IGNORE_CASE,
-            )
-
-        // UE folder hint …/Binaries/Win32|64/…
-        private val UE_BINARIES =
-            Regex(
-                """.*/binaries/win(32|64)/.*\.exe$""",
-                RegexOption.IGNORE_CASE,
-            )
-
-        // Tools / crash-dumpers to push down
-        private val NEGATIVE_KEYWORDS =
-            listOf(
-                "crash",
-                "handler",
-                "viewer",
-                "compiler",
-                "tool",
-                "setup",
-                "unins",
-                "eac",
-                "launcher",
-                "steam",
-            )
-
-        // add near-name helper
-        private fun fuzzyMatch(
-            a: String,
-            b: String,
-        ): Boolean {
-            // strip digits & punctuation, compare first 5 letters
-            val cleanA = a.replace(Regex("[^a-z]"), "")
-            val cleanB = b.replace(Regex("[^a-z]"), "")
-            return cleanA.take(5) == cleanB.take(5)
-        }
-
-        // add generic short-name detector: one letter + digits, ≤4 chars
-        private val GENERIC_NAME = Regex("^[a-z]\\d{1,3}\\.exe$", RegexOption.IGNORE_CASE)
-
-        // --------------------------------------------------------------------------
-        // 2. Heuristic score (same signature!)
-        // --------------------------------------------------------------------------
-
-        private fun scoreExe(
-            file: FileData,
-            gameName: String,
-            hasExeFlag: Boolean,
-        ): Int {
-            var s = 0
-            val path = file.fileName.lowercase()
-
-            // 1️⃣ UE shipping or binaries folder bonus
-            if (UE_SHIPPING.matches(path)) s += 300
-            if (UE_BINARIES.containsMatchIn(path)) s += 250
-
-            // 2️⃣ root-folder exe bonus
-            if (!path.contains('/')) s += 200
-
-            // 3️⃣ filename contains the game / installDir
-            if (path.contains(gameName) || fuzzyMatch(path, gameName)) s += 100
-
-            // 4️⃣ obvious tool / crash-dumper penalty
-            if (NEGATIVE_KEYWORDS.any { it in path }) s -= 150
-            if (GENERIC_NAME.matches(file.fileName)) s -= 200 // ← new
-
-            // 5️⃣ Executable | CustomExecutable flag
-            if (hasExeFlag) s += 50
-
-            Timber.i("Score for $path: $s")
-
-            return s
-        }
-
-        fun FileData.isStub(): Boolean {
-            // stub detector (same short rules)
-            val generic = Regex("^[a-z]\\d{1,3}\\.exe$", RegexOption.IGNORE_CASE)
-            val bad = listOf("launcher", "steam", "crash", "handler", "setup", "unins", "eac")
-            val n = fileName.lowercase()
-            val stub = generic.matches(n) || bad.any { it in n } || totalSize < 1_000_000
-            if (stub) Timber.d("Stub filtered: $fileName  size=$totalSize")
-            return stub
+            return normalizeInstallPath(Paths.get(internalAppInstallPath, targetName).pathString)
         }
 
-        /** select the primary binary */
-        fun choosePrimaryExe(
-            files: List<FileData>?,
-            gameName: String,
-        ): FileData? =
-            files?.maxWithOrNull { a, b ->
-                val sa = scoreExe(a, gameName, isExecutable(a.flags)) // <- fixed
-                val sb = scoreExe(b, gameName, isExecutable(b.flags))
-
-                when {
-                    sa != sb -> sa - sb
-
-                    // higher score wins
-                    else -> (a.totalSize - b.totalSize).toInt() // tie-break on size
-                }
-            }
-
-        /**
-         * Picks the real shipped EXE for a Steam app.
-         *
-         * ❶ try the dev-supplied launch entry (skip obvious stubs)
-         * ❷ else score all manifest-flagged EXEs and keep the best
-         * ❸ else fall back to the largest flagged EXE in the biggest depot
-         * If everything fails, return the game's install directory.
-         */
-        fun getInstalledExe(appId: Int): String {
-            val appInfo = getAppInfoOf(appId) ?: return ""
-
-            val installDir = appInfo.config.installDir.ifEmpty { appInfo.name }
-
-            val depots =
-                appInfo.depots.values.filter { d ->
-                    !d.sharedInstall && (
-                        d.osList.isEmpty() ||
-                            d.osList.any { it.name.equals("windows", true) || it.name.equals("none", true) }
-                    )
-                }
-            Timber.i("Depots considered: $depots")
-
-            // launch targets (lower-case)
-            val launchTargets =
-                appInfo.config.launch
-                    .mapNotNull { it.executable.lowercase() }
-                    .toSet() ?: emptySet()
-
-            Timber.i("Launch targets from appinfo: $launchTargets")
-
-            // ----------------------------------------------------------
-            val flagged = mutableListOf<Pair<FileData, Long>>() // (file, depotSize)
-            var largestDepotSize = 0L
-
-            // Use DepotDownloader to fetch manifests
-            val steamClient = instance?.steamClient
-            val licenses = runBlocking { getLicensesFromDb() }
-            if (steamClient == null || licenses.isEmpty()) {
-                Timber.w("Cannot fetch manifests: steamClient or licenses not available")
-                // Fallback to last resort
-                return (
-                    getAppInfoOf(appId)?.let { appInfo ->
-                        getWindowsLaunchInfos(appId).firstOrNull()
-                    }
-                )?.executable ?: ""
-            }
-
-            for (depot in depots) {
-                val mi = depot.manifests["public"] ?: continue
-                if (mi.size > largestDepotSize) largestDepotSize = mi.size
-
-                // Check cache first
-                val man = DepotManifest.loadFromFile("${getAppDirPath(appId)}/.DepotDownloader/${depot.depotId}_${mi.gid}.manifest")
-
-                Timber.d("Using manifest for depot ${depot.depotId}  size=${mi.size}")
-
-                // 1️⃣ exact launch entry that isn't a stub
-                man
-                    ?.files
-                    ?.firstOrNull { f ->
-                        f.fileName.lowercase() in launchTargets && !f.isStub()
-                    }?.let {
-                        Timber.i("Picked via launch entry: ${it.fileName}")
-                        return it.fileName.replace('\\', '/').toString()
-                    }
-
-                // collect for later
-                man
-                    ?.files
-                    ?.filter { isExecutable(it.flags) || it.fileName.endsWith(".exe", true) }
-                    ?.forEach { flagged += it to mi.size }
-            }
-
-            Timber.i("Flagged executable candidates: ${flagged.map { it.first.fileName }}")
-
-            // 2️⃣ scorer (unchanged)
-            choosePrimaryExe(
-                flagged
-                    .map { it.first }
-                    .let { pool ->
-                        val noStubs = pool.filterNot { it.isStub() }
-                        if (noStubs.isNotEmpty()) noStubs else pool
-                    },
-                installDir.lowercase(),
-            )?.let {
-                Timber.i("Picked via scorer: ${it.fileName}")
-                return it.fileName.replace('\\', '/')
-            }
-
-            // 3️⃣ fallback: biggest exe from the biggest depot
-            flagged
-                .filter { it.second == largestDepotSize }
-                .maxByOrNull { it.first.totalSize }
-                ?.let {
-                    Timber.i("Picked via largest-depot fallback: ${it.first.fileName}")
-                    return it.first.fileName
-                        .replace('\\', '/')
-                        .toString()
-                }
-
-            // 4️⃣ last resort
-            Timber.w("No executable found; falling back to install dir")
-            return (
-                getAppInfoOf(appId)?.let { appInfo ->
-                    getWindowsLaunchInfos(appId).firstOrNull()
-                }
-            )?.executable ?: ""
-        }
+        /** Resolves the executable for an installed Steam app from its appinfo `config.launch` entries — depot manifests store filenames AES-encrypted and are never decrypted, so scanning them is useless. */
+        // Invoked by name via reflection from SteamBridge — keep in the companion; do not move to an extension file.
+        fun getInstalledExe(appId: Int): String =
+            getWindowsLaunchInfos(appId).firstOrNull()?.executable ?: ""
 
         fun getLaunchExecutable(
             appId: String,
             container: Container,
         ): String {
-            if (container.isLaunchRealSteam) return "steam"
             val gameId = ContainerUtils.extractGameIdFromContainerId(appId)
             return container.executablePath.ifEmpty { getInstalledExe(gameId) }
         }
@@ -1875,7 +1509,6 @@ class SteamService :
                     removeDownloadJob(appId)
                 }
 
-                // Remove any download-complete marker
                 MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
                 MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
                 clearPersistedProgressSnapshot(appDirPath)
@@ -1890,7 +1523,6 @@ class SteamService :
                         fileChangeListsDao.deleteByAppId(appId)
                         downloadingAppInfoDao.deleteApp(appId)
 
-                        // Clear installDir in steam_app table
                         appDao.findApp(appId)?.let { steamApp ->
                             if (steamApp.installDir.isNotEmpty()) {
                                 appDao.update(steamApp.copy(installDir = ""))
@@ -1928,7 +1560,6 @@ class SteamService :
                     normalizeInstallPath(File(customInstallPath, safeFolderName).absolutePath)
                 }
 
-            // Update SteamApp in DB
             runBlocking(Dispatchers.IO) {
                 instance?.appDao?.findApp(appId)?.let { steamApp ->
                     instance?.appDao?.update(steamApp.copy(installDir = finalPath))
@@ -1940,17 +1571,7 @@ class SteamService :
 
         fun downloadApp(appId: Int): DownloadInfo? = downloadApp(appId, dlcAppIdsHint = null)
 
-        /**
-         * Resume / start entry point that accepts an authoritative DLC selection [dlcAppIdsHint]
-         * — typically supplied by the cross-store [DownloadCoordinator] from its persisted
-         * [DownloadRecord.selectedDlcs] field. When provided, this list takes precedence over
-         * the legacy fallback chain (DownloadingAppInfo → snapshot inference → installed DLCs)
-         * because the coordinator's record is the only source guaranteed to remember the user's
-         * original selection across pause/resume and across app restarts.
-         *
-         * Pass `null` (or call the no-arg overload) for legacy callers; we'll then look the
-         * record up ourselves so coordinator-aware behavior still applies.
-         */
+        /** Resume/start entry point; [dlcAppIdsHint] (the coordinator's persisted [DownloadRecord.selectedDlcs]) is authoritative and overrides the legacy fallback chain. Pass null for legacy callers — the record is then looked up here. */
         fun downloadApp(appId: Int, dlcAppIdsHint: List<Int>?): DownloadInfo? {
             val currentDownloadInfo = downloadJobs[appId]
             if (currentDownloadInfo != null) {
@@ -1961,10 +1582,7 @@ class SteamService :
                 }
             }
 
-            // If the caller didn't supply an authoritative DLC list, try to recover one from
-            // the DownloadCoordinator's persisted record. That record is store-agnostic but
-            // currently only populated for coordinator-managed downloads; if it's missing we
-            // fall through to the older DownloadingAppInfo-based recovery further down.
+            // No authoritative DLC list from the caller → recover from the coordinator's persisted record; if missing, fall through to the DownloadingAppInfo-based recovery below.
             val recordDlcIds: List<Int>? = dlcAppIdsHint
                 ?: runCatching {
                     runBlocking(Dispatchers.IO) {
@@ -1990,16 +1608,7 @@ class SteamService :
                     hasPartialFiles
                 }
             if (hasResumablePayload) {
-                // Strict trust order (per agreed fix plan with Codex):
-                //   1. Coordinator record (authoritative, store-agnostic, durable across
-                //      app restarts and DB migrations) — ALSO authoritative for an empty list
-                //      (= "user wants base game only").
-                //   2. DownloadingAppInfo DAO row (Steam-specific, written at first download).
-                //   3. inferResumeDlcAppIds (snapshot of which depots have bytes — may be a
-                //      subset, used only when no authoritative source exists).
-                //   4. resolveInstalledDlcIdsForUpdateOrVerify (DLCs already installed —
-                //      last-ditch legacy recovery).
-                // Do NOT union: an empty list from an authoritative source means "no DLCs".
+                // Trust order (do NOT union — an empty authoritative list means "no DLCs"): 1) coordinator record (authoritative, durable; empty = base game only), 2) DownloadingAppInfo row, 3) inferResumeDlcAppIds (depots with bytes), 4) resolveInstalledDlcIdsForUpdateOrVerify (installed DLCs).
                 val resumeDlcAppIds: List<Int> =
                     recordDlcIds
                         ?: downloadingAppInfo?.dlcAppIds
@@ -2041,13 +1650,18 @@ class SteamService :
             )
         }
 
-        fun downloadAppForUpdate(appId: Int): DownloadInfo? =
+        fun downloadAppForUpdate(
+            appId: Int,
+            targetDepotIds: Collection<Int> = emptyList(),
+        ): DownloadInfo? =
             downloadApp(
                 appId,
                 resolveInstalledDlcIdsForUpdateOrVerify(appId),
                 includeInstalledDepots = true,
                 enableVerify = false,
                 allowPersistedProgress = false,
+                downloadTaskType = DownloadRecord.TASK_UPDATE,
+                targetDepotIds = targetDepotIds.toSet().takeIf { it.isNotEmpty() },
             )
 
         fun downloadAppForVerify(appId: Int): DownloadInfo? =
@@ -2057,29 +1671,16 @@ class SteamService :
                 includeInstalledDepots = true,
                 enableVerify = true,
                 allowPersistedProgress = false,
+                downloadTaskType = DownloadRecord.TASK_VERIFY,
             )
 
-        private fun resolveInstalledDlcIdsForUpdateOrVerify(appId: Int): List<Int> {
-            val dlcAppIds = getInstalledDlcDepotsOf(appId).orEmpty().toMutableList()
-
-            getDownloadableDlcAppsOf(appId)?.forEach { dlcApp ->
-                val installedDlcApp = getInstalledApp(dlcApp.id)
-                if (installedDlcApp != null) {
-                    dlcAppIds.add(installedDlcApp.id)
-                }
-            }
-
-            return dlcAppIds.distinct()
-        }
-
         fun downloadApp(
             appId: Int,
             dlcAppIds: List<Int>,
             isUpdateOrVerify: Boolean,
             customInstallPath: String? = null,
         ): DownloadInfo? {
-            // Backward-compatible API:
-            // true => include already-downloaded depots (update scope), but do not force verify.
+            // Backward-compatible API: isUpdateOrVerify=true includes already-downloaded depots (update scope) but does not force verify.
             return downloadApp(
                 appId = appId,
                 dlcAppIds = dlcAppIds,
@@ -2090,63 +1691,8 @@ class SteamService :
             )
         }
 
-        private fun downloadApp(
-            appId: Int,
-            dlcAppIds: List<Int>,
-            includeInstalledDepots: Boolean,
-            enableVerify: Boolean,
-            allowPersistedProgress: Boolean = false,
-            hasPersistedResumeRow: Boolean = false,
-            customInstallPath: String? = null,
-        ): DownloadInfo? {
-            val appInfo = getAppInfoOf(appId)
-            if (appInfo == null) {
-                Timber.e("Download aborted: Could not find AppInfo for appId: $appId")
-                return null
-            }
-
-            val downloadableDepots = getDownloadableDepots(appId)
-            if (downloadableDepots.isEmpty()) {
-                Timber.w("Download aborted: No downloadable depots found for appId: $appId")
-                instance?.let { service ->
-                    service.scope.launch(Dispatchers.Main) {
-                        WinToast.show(service.applicationContext, "No downloadable content found for this game", Toast.LENGTH_LONG)
-                    }
-                }
-                return null
-            }
-
-            // Delegate to the full depot-level downloadApp overload
-            return downloadApp(
-                appId = appId,
-                downloadableDepots = downloadableDepots,
-                userSelectedDlcAppIds = dlcAppIds,
-                branch = "public",
-                includeInstalledDepots = includeInstalledDepots,
-                enableVerify = enableVerify,
-                allowPersistedProgress = allowPersistedProgress,
-                hasPersistedResumeRow = hasPersistedResumeRow,
-                customInstallPath = customInstallPath,
-            )
-        }
-
         fun isImageFsInstalled(context: Context): Boolean = ImageFs.find(context).isValid()
 
-        fun isImageFsInstallable(
-            context: Context,
-            variant: String,
-        ): Boolean {
-            if (variant.equals("BIONIC")) {
-                return File(context.filesDir, "imagefs_bionic.txz").exists() || context.assets
-                    .list("")
-                    ?.contains("imagefs_bionic.txz") == true
-            } else {
-                return File(context.filesDir, "imagefs_gamenative.txz").exists() || context.assets
-                    .list("")
-                    ?.contains("imagefs_gamenative.txz") == true
-            }
-        }
-
         fun isSteamInstallable(context: Context): Boolean = File(context.filesDir, "steam.tzst").exists()
 
         fun isFileInstallable(
@@ -2236,39 +1782,6 @@ class SteamService :
             }
         }
 
-        fun downloadImageFs(
-            onDownloadProgress: (Float) -> Unit,
-            parentScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
-            variant: String,
-            context: Context,
-        ) = parentScope.async {
-            Timber.i("imagefs will be downloaded")
-            if (variant == "BIONIC") {
-                val dest = File(context.filesDir, "imagefs_bionic.txz")
-                Timber.d("Downloading imagefs_bionic to " + dest.toString())
-                fetchFileWithFallback("imagefs_bionic.txz", dest, context, onDownloadProgress)
-            } else {
-                Timber.d("Downloading imagefs_gamenative to " + File(context.filesDir, "imagefs_gamenative.txz"))
-                fetchFileWithFallback(
-                    "imagefs_gamenative.txz",
-                    File(context.filesDir, "imagefs_gamenative.txz"),
-                    context,
-                    onDownloadProgress,
-                )
-            }
-        }
-
-        fun downloadImageFsPatches(
-            onDownloadProgress: (Float) -> Unit,
-            parentScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
-            context: Context,
-        ) = parentScope.async {
-            Timber.i("imagefs will be downloaded")
-            val dest = File(context.filesDir, "imagefs_patches_gamenative.tzst")
-            Timber.d("Downloading imagefs_patches_gamenative.tzst to " + dest.toString())
-            fetchFileWithFallback("imagefs_patches_gamenative.tzst", dest, context, onDownloadProgress)
-        }
-
         fun downloadFile(
             onDownloadProgress: (Float) -> Unit,
             parentScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
@@ -2281,173 +1794,6 @@ class SteamService :
             fetchFileWithFallback(fileName, dest, context, onDownloadProgress)
         }
 
-        fun downloadSteam(
-            onDownloadProgress: (Float) -> Unit,
-            parentScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
-            context: Context,
-        ) = parentScope.async {
-            Timber.i("imagefs will be downloaded")
-            val dest = File(context.filesDir, "steam.tzst")
-            Timber.d("Downloading steam.tzst to " + dest.toString())
-            fetchFileWithFallback("steam.tzst", dest, context, onDownloadProgress)
-        }
-
-        private fun selectSteamControllerConfig(details: List<SteamControllerConfigDetail>): SteamControllerConfigDetail? {
-            if (details.isEmpty()) return null
-
-            val branchPriority = listOf("default", "public")
-            val controllerPriority =
-                listOf(
-                    "controller_xbox360",
-                    "controller_xboxone",
-                    "controller_steamcontroller_gordon",
-                    "controller_generic",
-                )
-
-            for (branch in branchPriority) {
-                for (controllerType in controllerPriority) {
-                    val match =
-                        details.firstOrNull { detail ->
-                            detail.controllerType.equals(controllerType, ignoreCase = true) &&
-                                detail.enabledBranches.any { it.equals(branch, ignoreCase = true) }
-                        }
-                    if (match != null) return match
-                }
-            }
-
-            return null
-        }
-
-        private fun resolveSteamInputManifestFile(
-            appId: Int,
-            appDirPath: String,
-        ): File? {
-            val manifestPath =
-                getAppInfoOf(appId)
-                    ?.config
-                    ?.steamInputManifestPath
-                    ?.trim()
-                    .orEmpty()
-            if (manifestPath.isEmpty()) return null
-
-            return resolvePathCaseInsensitive(appDirPath, manifestPath)
-        }
-
-        private fun loadConfigFromManifest(manifestFile: File): String? {
-            if (!manifestFile.exists()) return null
-            val manifestDirPath = manifestFile.parentFile?.path ?: return null
-
-            val manifestText = manifestFile.readText(Charsets.UTF_8)
-            val configText =
-                try {
-                    parseManifestForConfig(manifestDirPath, manifestText)
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to parse Steam Input manifest config at ${manifestFile.path}")
-                    return null
-                }
-            return configText ?: manifestText
-        }
-
-        private fun parseManifestForConfig(
-            manifestDirPath: String,
-            manifestText: String,
-        ): String? {
-            return try {
-                val kv = KeyValue.loadFromString(manifestText) ?: return null
-                val actionManifest =
-                    if (kv.name?.equals("Action Manifest", ignoreCase = true) == true) {
-                        kv
-                    } else {
-                        kv["Action Manifest"]
-                    }
-                if (actionManifest === KeyValue.INVALID) return null
-
-                val configs = actionManifest["configurations"]
-                if (configs === KeyValue.INVALID || configs.children.isEmpty()) {
-                    throw IllegalStateException("No configurations found in Action Manifest")
-                }
-
-                val preferredControllers =
-                    listOf(
-                        "controller_xboxone",
-                        "controller_steamcontroller_gordon",
-                        "controller_generic",
-                        "controller_xbox360",
-                    )
-
-                for (controllerType in preferredControllers) {
-                    val controllerBlock = configs[controllerType]
-                    if (controllerBlock === KeyValue.INVALID) continue
-
-                    for (entry in controllerBlock.children) {
-                        val pathNode = entry["path"]
-                        val configPath = pathNode.asString().orEmpty()
-                        if (pathNode === KeyValue.INVALID || configPath.isEmpty()) continue
-
-                        val configFile =
-                            resolvePathCaseInsensitive(manifestDirPath, configPath)
-                                ?: continue
-                        return configFile.readText(Charsets.UTF_8)
-                    }
-                }
-
-                throw IllegalStateException("No valid controller configuration found in Action Manifest")
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to parse Steam Input manifest config")
-                null
-            }
-        }
-
-        private fun resolvePathCaseInsensitive(
-            baseDirPath: String,
-            relativePath: String,
-        ): File? {
-            val normalizedPath = relativePath.replace('\\', '/')
-            val directFile = File(baseDirPath, normalizedPath)
-            if (directFile.exists()) return directFile
-
-            var currentDir = File(baseDirPath)
-            if (!currentDir.exists() || !currentDir.isDirectory) return null
-
-            val segments = normalizedPath.split('/').filter { it.isNotEmpty() }
-            for ((index, segment) in segments.withIndex()) {
-                if (segment == ".") continue
-                if (segment == "..") {
-                    currentDir = currentDir.parentFile ?: return null
-                    continue
-                }
-                val entries = currentDir.listFiles() ?: return null
-                val matched =
-                    entries.firstOrNull {
-                        it.name.equals(segment, ignoreCase = true)
-                    } ?: return null
-
-                if (index == segments.lastIndex) {
-                    return matched
-                }
-
-                if (!matched.isDirectory) return null
-                currentDir = matched
-            }
-
-            return null
-        }
-
-        private fun readBuiltInSteamInputTemplate(fileName: String): String? {
-            val assets = instance?.assets ?: return null
-            return runCatching {
-                assets.open("steaminput/$fileName").use { stream ->
-                    stream.readBytes().toString(Charsets.UTF_8)
-                }
-            }.getOrNull()
-        }
-
-        private fun readDownloadedSteamInputTemplate(appId: Int): String? {
-            val configFile = File(getAppDirPath(appId), STEAM_CONTROLLER_CONFIG_FILENAME)
-            if (!configFile.exists()) return null
-            return configFile.readText(Charsets.UTF_8)
-        }
-
         fun resolveSteamControllerVdfText(appId: Int): String? {
             val config = getAppInfoOf(appId)?.config ?: return null
             return when (config.steamControllerTemplateIndex) {
@@ -2480,1529 +1826,30 @@ class SteamService :
             }
         }
 
-        fun downloadApp(
-            appId: Int,
-            downloadableDepots: Map<Int, DepotInfo>,
-            userSelectedDlcAppIds: List<Int>,
-            branch: String,
-            includeInstalledDepots: Boolean,
-            enableVerify: Boolean,
-            allowPersistedProgress: Boolean = false,
-            hasPersistedResumeRow: Boolean = false,
-            customInstallPath: String? = null,
-        ): DownloadInfo? {
-            var appDirPath = getAppDirPath(appId)
-            Timber.i("downloadApp called for appId: $appId, customInstallPath: $customInstallPath")
-
-            if (customInstallPath != null) {
-                // Determine if customInstallPath is the game folder itself or the parent
-                val appInfo = getAppInfoOf(appId)
-                val folderName = getAppDirName(appInfo)
-                val safeFolderName = if (folderName.isNotEmpty()) folderName else appId.toString()
-
-                val customFile = File(customInstallPath)
-                val finalPath =
-                    if (customFile.name.equals(safeFolderName, ignoreCase = true)) {
-                        // User selected the game folder itself
-                        normalizeInstallPath(customFile.absolutePath)
-                    } else {
-                        // User selected parent folder, create/use subfolder
-                        normalizeInstallPath(File(customInstallPath, safeFolderName).absolutePath)
-                    }
-
-                appDirPath = finalPath
-                Timber.i("Final custom appDirPath: $appDirPath")
-
-                // Update SteamApp in DB
-                runBlocking {
-                    if (appInfo != null) {
-                        val updatedApp = appInfo.copy(installDir = finalPath)
-                        instance?.appDao?.update(updatedApp)
-                        Timber.i("Updated SteamApp installDir in DB to: $finalPath")
-                    }
-                }
-            }
-
-            // Ensure the download directory exists
-            try {
-                val dir = File(appDirPath)
-                if (!dir.exists()) {
-                    if (dir.mkdirs()) {
-                        Timber.i("Created download directory: $appDirPath")
-                    } else {
-                        Timber.e("Failed to create download directory (mkdirs returned false): $appDirPath")
-                        instance?.let { service ->
-                            service.scope.launch(Dispatchers.Main) {
-                                WinToast.show(
-                                    service.applicationContext,
-                                    "Failed to create download directory. Check permissions.",
-                                    Toast.LENGTH_LONG,
-                                )
-                            }
-                        }
-                        return null
+        fun getWindowsLaunchInfos(appId: Int): List<LaunchInfo> =
+            getAppInfoOf(appId)
+                ?.let { appInfo ->
+                    appInfo.config.launch.filter { launchInfo ->
+                        // since configOS was unreliable and configArch was even more unreliable
+                        launchInfo.executable.endsWith(".exe")
                     }
-                }
+                }.orEmpty()
 
-                // Add in-progress marker
-                if (!MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)) {
-                    Timber.e("Failed to add DOWNLOAD_IN_PROGRESS_MARKER at $appDirPath")
-                }
-
-                // If this is not an update/verify, remove the complete marker to reset state
-                if (!includeInstalledDepots) {
-                    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
-                }
-            } catch (e: Exception) {
-                Timber.e(e, "Error preparing download directory or markers: $appDirPath")
-            }
-
-            // If a custom path is provided, we want to force a new download at that location
-            if (customInstallPath != null) {
-                Timber.i("Custom path provided, cancelling any existing job for appId: $appId")
-                downloadJobs[appId]?.cancel("Restarting download at custom path")
-                downloadJobs.remove(appId)
-            } else {
-                // Only return existing job if it's still active
-                val existingJob = downloadJobs[appId]
-                if (existingJob != null && existingJob.isActive()) {
-                    Timber.i("Returning existing active download job for appId: $appId")
-                    return existingJob
-                }
-            }
-
-            Timber.d("Checking depots for appId: $appId. downloadableDepots count: ${downloadableDepots.size}")
-            if (downloadableDepots.isEmpty()) {
-                Timber.w("Download aborted: downloadableDepots is empty for appId: $appId")
-                return null
-            }
-
-            val indirectDlcAppIds = getDownloadableDlcAppsOf(appId).orEmpty().map { it.id }
-            Timber.d("Indirect DLC app IDs for appId $appId: $indirectDlcAppIds")
-
-            // Depots from Main game
-            val mainDepots = getMainAppDepots(appId)
-            Timber.d("Main app depots count: ${mainDepots.size}")
-            val originalMainAppDepots =
-                mainDepots.filter { (_, depot) ->
-                    depot.dlcAppId == INVALID_APP_ID
-                } +
-                    mainDepots.filter { (_, depot) ->
-                        userSelectedDlcAppIds.contains(depot.dlcAppId) && depot.manifests.isNotEmpty()
-                    }
-            var mainAppDepots = originalMainAppDepots
-            Timber.d("Filtered main app depots count: ${mainAppDepots.size}")
-
-            // Depots from DLC App
-            val dlcAppDepots =
-                downloadableDepots.filter { (_, depot) ->
-                    !mainAppDepots.map { it.key }.contains(depot.depotId) &&
-                        userSelectedDlcAppIds.contains(depot.dlcAppId) && indirectDlcAppIds.contains(depot.dlcAppId) &&
-                        depot.manifests.isNotEmpty()
-                }
-            Timber.d("Filtered DLC app depots count: ${dlcAppDepots.size}")
-
-            // Remove depots that are already downloaded only when install metadata is trusted.
-            // But if a custom path is provided, we want to check/download everything at the new location
-            var installedApp = getInstalledApp(appId)
-            val hasCompleteMarker = MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
-            var hasTrustedInstalledState = installedApp?.isDownloaded == true && hasCompleteMarker
-            if (!includeInstalledDepots && installedApp != null && !hasTrustedInstalledState && customInstallPath == null) {
-                val hasStaleInstallMetadata =
-                    installedApp.isDownloaded ||
-                        installedApp.downloadedDepots.isNotEmpty() ||
-                        installedApp.dlcDepots.isNotEmpty()
-                if (hasStaleInstallMetadata) {
-                    Timber.w(
-                        "Clearing stale install metadata for appId=$appId " +
-                            "(isDownloaded=${installedApp.isDownloaded}, marker=$hasCompleteMarker)",
-                    )
-                    runBlocking(Dispatchers.IO) {
-                        instance?.appInfoDao?.deleteApp(appId)
-                    }
-                    installedApp = null
-                }
-                hasTrustedInstalledState = false
-            }
-            if (installedApp != null && !includeInstalledDepots && hasTrustedInstalledState && customInstallPath == null) {
-                val beforeCount = mainAppDepots.size
-                mainAppDepots = mainAppDepots.filter { it.key !in installedApp.downloadedDepots }
-                Timber.d("Removed already downloaded depots. Count before: $beforeCount, after: ${mainAppDepots.size}")
-            }
-
-            // CRITICAL: clear JavaSteam's DepotConfigStore (.DepotDownloader/depot.config)
-            // whenever this app does NOT have the COMPLETE marker. JavaSteam writes
-            // installedManifestIDs[depotId] = manifestId in processDepotManifestAndFiles
-            // BEFORE that depot's chunks have actually been downloaded. On the next resume
-            // it loads the config, sees the manifest ID matches, and SKIPS file checksum
-            // validation (DepotDownloader.kt:1298-1409) — trusting preallocated/sparse
-            // partial files as if they were fully downloaded. That's why pause→resume left
-            // depots looking "complete" while gigabytes of chunks were never written. Deleting
-            // depot.config forces JavaSteam to re-checksum every file on disk; correctly-present
-            // files are skipped (cheap), missing/partial files get re-downloaded.
-            if (!hasCompleteMarker) {
-                val depotConfigFile = File(File(appDirPath, ".DepotDownloader"), "depot.config")
-                if (depotConfigFile.exists()) {
-                    val deleted = depotConfigFile.delete()
-                    Timber.i(
-                        "Cleared JavaSteam DepotConfigStore at ${depotConfigFile.absolutePath} " +
-                            "(deleted=$deleted) — forces re-validation of all depot files for " +
-                            "appId=$appId because the COMPLETE marker is absent.",
-                    )
-                }
-            }
-
-            val allDepots = originalMainAppDepots + dlcAppDepots
-            // Use install (uncompressed) size for progress tracking
-            val depotSizeById =
-                allDepots.mapValues { (_, depot) ->
-                    val mInfo = depot.manifests[branch] ?: depot.encryptedManifests[branch]
-                    (mInfo?.size ?: 1L).coerceAtLeast(1L)
-                }
-
-            // Load persisted progress snapshot to skip fully downloaded depots.
-            // Mutable so the safety check below can drop suspicious entries before they
-            // poison di.depotCumulativeUncompressedBytes during resume init.
-            var persistedDepotBytes: Map<Int, Long> =
-                if (allowPersistedProgress) {
-                    DownloadInfo.loadPersistedDepotBytes(appDirPath)
-                } else {
-                    emptyMap()
-                }
-
-            // SAFETY CHECK (scope-mismatch detection): if the persisted snapshot remembers
-            // depots that aren't in the current resume scope, the userSelectedDlcAppIds we
-            // resolved is a SUBSET of what was originally downloading. Continuing would
-            // download only the subset and then incorrectly mark the game COMPLETE because
-            // selectedDepots would empty out before the missing DLCs ever get registered.
-            // Refuse to proceed — the user can cancel + redownload to recover.
-            if (allowPersistedProgress && persistedDepotBytes.isNotEmpty()) {
-                val depotsInScope = allDepots.keys
-                val orphanSnapshotDepots = persistedDepotBytes.keys - depotsInScope
-                if (orphanSnapshotDepots.isNotEmpty()) {
-                    Timber.e(
-                        "Resume scope mismatch for appId=$appId: snapshot has depot(s) " +
-                            "$orphanSnapshotDepots that are not in the current download scope " +
-                            "(scope depots: $depotsInScope). The DLC list used to resume is " +
-                            "incomplete; refusing to finalize to avoid a partial-COMPLETE.",
-                    )
-                    instance?.let { service ->
-                        service.scope.launch(Dispatchers.Main) {
-                            WinToast.show(
-                                service.applicationContext,
-                                "Resume failed: download scope changed. Please cancel and re-download.",
-                                Toast.LENGTH_LONG,
-                            )
-                        }
-                    }
-                    val info = DownloadInfo(1, appId, CopyOnWriteArrayList(listOf(appId)))
-                    info.updateStatus(DownloadPhase.FAILED, "Resume scope mismatch — cancel and re-download")
-                    info.setActive(false)
-                    downloadJobs[appId] = info
-                    notifyDownloadStarted(appId)
-                    runBlocking {
-                        DownloadCoordinator.notifyFinished(
-                            DownloadRecord.STORE_STEAM,
-                            appId.toString(),
-                            DownloadRecord.STATUS_FAILED,
-                            "Resume scope mismatch",
-                        )
-                    }
-                    return info
-                }
-            }
-
-            val fullyDownloadedDepotsFromSnapshot = mutableSetOf<Int>()
-            if (persistedDepotBytes.isNotEmpty()) {
-                for ((depotId, _) in allDepots) {
-                    val depotSize = depotSizeById[depotId] ?: 1L
-                    val downloadedBytes = persistedDepotBytes[depotId] ?: 0L
-                    Timber.d(
-                        "Resume snapshot for appId=$appId depot=$depotId: persisted=$downloadedBytes / size=$depotSize " +
-                            (if (downloadedBytes >= depotSize) "-> SKIP-CANDIDATE" else "-> include"),
-                    )
-                    if (downloadedBytes >= depotSize) {
-                        fullyDownloadedDepotsFromSnapshot.add(depotId)
-                    }
-                }
-                if (fullyDownloadedDepotsFromSnapshot.isNotEmpty()) {
-                    // CRITICAL safety: only TRUST the snapshot's "fully downloaded" claim
-                    // when the COMPLETE marker exists for the game. Without that marker the
-                    // game was a partial download — and we have a history of snapshot
-                    // corruption pushing depots to depotSize prematurely (e.g., race
-                    // attribution in older builds, or interrupted onDepotCompleted paths).
-                    // For partial downloads, let DepotDownloader's per-file checksum
-                    // validation handle resume: it'll skip files that already match on disk
-                    // (cheap), and re-download missing chunks.
-                    if (hasCompleteMarker) {
-                        Timber.i(
-                            "Skipping ${fullyDownloadedDepotsFromSnapshot.size} fully downloaded depots from snapshot " +
-                                "(COMPLETE marker present): $fullyDownloadedDepotsFromSnapshot",
-                        )
-                        mainAppDepots = mainAppDepots.filter { it.key !in fullyDownloadedDepotsFromSnapshot }
-                    } else {
-                        Timber.w(
-                            "REFUSING to skip ${fullyDownloadedDepotsFromSnapshot.size} depots claimed full by snapshot " +
-                                "for appId=$appId because COMPLETE marker is absent. Depots will be re-validated " +
-                                "by the downloader: $fullyDownloadedDepotsFromSnapshot",
-                        )
-                        // Drop the suspicious entries from persistedDepotBytes so they don't
-                        // get re-loaded into di.depotCumulativeUncompressedBytes (which would
-                        // re-persist them at depotSize on the next pause and re-trigger the
-                        // bug). The in-memory tracker for these depots will start at 0 and
-                        // grow with real download progress.
-                        persistedDepotBytes = persistedDepotBytes.filterKeys {
-                            it !in fullyDownloadedDepotsFromSnapshot
-                        }
-                        // Clear the on-disk snapshot file too. New persists will re-create
-                        // it with only the real, current per-depot bytes.
-                        clearPersistedProgressSnapshot(appDirPath)
-                        fullyDownloadedDepotsFromSnapshot.clear()
-                    }
-                }
-            }
-
-            // Combine main app and DLC depots
-            val filteredDlcAppDepots = dlcAppDepots.filter { it.key !in fullyDownloadedDepotsFromSnapshot }
-            val selectedDepots = mainAppDepots + filteredDlcAppDepots
-            Timber.i("Total selected depots for download: ${selectedDepots.size}")
-
-            if (selectedDepots.isEmpty()) {
-                // Check if it was empty even before snapshot filtering
-                var preSnapshotMainAppDepots = originalMainAppDepots
-                if (installedApp != null && !includeInstalledDepots && hasTrustedInstalledState) {
-                    preSnapshotMainAppDepots = preSnapshotMainAppDepots.filter { it.key !in installedApp.downloadedDepots }
-                }
-                val preSnapshotSelectedDepots = preSnapshotMainAppDepots + dlcAppDepots
-
-                if (preSnapshotSelectedDepots.isEmpty()) {
-                    Timber.i("selectedDepots is empty before snapshot filtering - App already installed.")
-
-                    // Instead of returning null, create a completed/verifying job so it shows in UI
-                    val info = DownloadInfo(1, appId, CopyOnWriteArrayList(listOf(appId)))
-                    info.updateStatus(DownloadPhase.COMPLETE)
-                    info.setProgress(1f)
-                    downloadJobs[appId] = info
-
-                    if (allowPersistedProgress) {
-                        Timber.i("Resume became a no-op; clearing stale persisted resume state")
-                        clearFailedResumeState(appId)
-                    }
-
-                    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                    MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
-
-                    // Show success message to user
-                    instance?.let { service ->
-                        service.scope.launch(Dispatchers.Main) {
-                            WinToast.show(service.applicationContext, "Download complete", Toast.LENGTH_SHORT)
-                        }
-                    }
-
-                    return info
-                }
-
-                // Snapshot says all depots are complete but marker is missing.
-                // Finalize metadata/markers directly instead of re-queuing depots.
-                val canFinalizeFromSnapshot =
-                    allowPersistedProgress &&
-                        fullyDownloadedDepotsFromSnapshot.isNotEmpty() &&
-                        (hasCompleteMarker || hasPersistedResumeRow)
-                if (canFinalizeFromSnapshot) {
-                    Timber.i("All resume depots appear complete from snapshot; finalizing without downloader")
-                    val info =
-                        finalizeSnapshotResumeAsComplete(
-                            appId = appId,
-                            appDirPath = appDirPath,
-                            mainAppDepots = preSnapshotMainAppDepots,
-                            dlcAppDepots = dlcAppDepots,
-                            userSelectedDlcAppIds = userSelectedDlcAppIds,
-                        )
-                    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                    return info
-                } else {
-                    if (allowPersistedProgress) {
-                        if (fullyDownloadedDepotsFromSnapshot.isNotEmpty()) {
-                            Timber.w(
-                                "Snapshot indicates completion for appId=$appId but state is untrusted " +
-                                    "(marker=$hasCompleteMarker, resumeRow=$hasPersistedResumeRow); clearing resume metadata",
-                            )
-                        } else {
-                            Timber.i("selectedDepots resolved empty on resume; clearing stale resume metadata")
-                        }
-                        clearFailedResumeState(appId)
-                    } else {
-                        Timber.i("selectedDepots resolved empty after filtering; skipping download start")
-                    }
-                }
-                MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                return null
-            }
-
-            val downloadingAppIds = CopyOnWriteArrayList<Int>()
-            val calculatedDlcAppIds = CopyOnWriteArrayList<Int>()
-            val allDepotIdsByDlcAppId =
-                dlcAppDepots.values
-                    .groupBy(keySelector = { it.dlcAppId }, valueTransform = { it.depotId })
-                    .mapValues { (_, depotIds) -> depotIds.sorted() }
-            val selectedDepotIdsByDlcAppId =
-                selectedDepots.values
-                    .groupBy(keySelector = { it.dlcAppId }, valueTransform = { it.depotId })
-                    .mapValues { (_, depotIds) -> depotIds.sorted() }
-
-            userSelectedDlcAppIds.forEach { dlcAppId ->
-                if (allDepotIdsByDlcAppId[dlcAppId]?.isNotEmpty() == true) {
-                    downloadingAppIds.add(dlcAppId)
-                    calculatedDlcAppIds.add(dlcAppId)
-                }
-            }
-
-            // Add main app ID if there are main app depots
-            if (mainAppDepots.isNotEmpty()) {
-                downloadingAppIds.add(appId)
-            }
-
-            // There are some apps, the dlc depots does not have dlcAppId in the data, need to set it back
-            val mainAppDlcIds = getMainAppDlcIdsWithoutProperDepotDlcIds(appId)
-
-            // If there are no DLC depots, download the main app only
-            if (dlcAppDepots.isEmpty()) {
-                // Because all dlcIDs are coming from main depots, need to add the dlcID to main app in order to save it to db after finish download
-                mainAppDlcIds.addAll(mainAppDepots.filter { it.value.dlcAppId != INVALID_APP_ID }.map { it.value.dlcAppId }.distinct())
-
-                // Refresh id List, so only main app is downloaded
-                calculatedDlcAppIds.clear()
-                downloadingAppIds.clear()
-                downloadingAppIds.add(appId)
-            }
-
-            Timber.i("Starting download for $appId")
-            Timber.i("App contains ${mainAppDepots.size} depot(s): ${mainAppDepots.keys}")
-            Timber.i("DLC contains ${dlcAppDepots.size} depot(s): ${dlcAppDepots.keys}")
-            Timber.i("downloadingAppIds: $downloadingAppIds")
-
-            val service =
-                instance ?: run {
-                    Timber.e("SteamService instance is null, cannot start download job.")
-                    return null
-                }
-
-            // Save downloading app info
-            runBlocking {
-                service.downloadingAppInfoDao.insert(
-                    DownloadingAppInfo(
-                        appId,
-                        dlcAppIds = userSelectedDlcAppIds,
-                    ),
-                )
-                Unit
-            }
-
-            // Ask the global coordinator whether this download can start now or must be queued
-            // behind downloads from other stores too. The coordinator persists the decision in
-            // its DownloadRecord table so the request survives an app restart.
-            val coordDecision =
-                runBlocking {
-                    val title = getAppInfoOf(appId)?.name.orEmpty()
-                    DownloadCoordinator.requestSlot(
-                        store = DownloadRecord.STORE_STEAM,
-                        storeGameId = appId.toString(),
-                        title = title,
-                        installPath = appDirPath,
-                        selectedDlcs = userSelectedDlcAppIds.joinToString(","),
-                    )
-                }
-            if (coordDecision is DownloadCoordinator.Decision.Queue) {
-                Timber.i("Coordinator queued appId: $appId")
-                val info =
-                    DownloadInfo(selectedDepots.size, appId, downloadingAppIds).also { di ->
-                        di.setPersistencePath(appDirPath)
-                        di.updateStatus(DownloadPhase.QUEUED, "Queued...")
-                        di.setActive(false)
-                    }
-                downloadJobs[appId] = info
-                notifyDownloadStarted(appId)
-                return info
-            }
-
-            val info =
-                DownloadInfo(selectedDepots.size, appId, downloadingAppIds).also { di ->
-                    di.setPersistencePath(appDirPath)
-
-                    // Set weights for each depot based on manifest sizes
-                    val selectedDepotSizes =
-                        selectedDepots.mapValues { (depotId, _) ->
-                            depotSizeById[depotId] ?: 1L
-                        }
-                    selectedDepots.keys.forEachIndexed { index, depotId ->
-                        di.setWeight(index, selectedDepotSizes[depotId] ?: 1L)
-                    }
-
-                    // Track progress only for depots in this active run so excluded/complete depots
-                    // (including DLC already marked complete) cannot pre-fill progress at startup.
-                    val selectedTotalBytes = selectedDepotSizes.values.sum()
-                    val totalBytes = selectedTotalBytes.coerceAtLeast(1L)
-
-                    // Total expected size (used for ETA based on recent download speed)
-                    di.setTotalExpectedBytes(totalBytes)
-
-                    var resumedBytes = 0L
-
-                    if (allowPersistedProgress) {
-                        for ((depotId, bytes) in persistedDepotBytes) {
-                            // If the depot was excluded because it's fully downloaded, we still need to track its bytes
-                            // so that future snapshots retain this progress.
-                            val depotSize = depotSizeById[depotId] ?: continue
-                            val safeBytes = bytes.coerceIn(0L, depotSize)
-                            di.depotCumulativeUncompressedBytes[depotId] =
-                                java.util.concurrent.atomic
-                                    .AtomicLong(safeBytes)
-                            // Count resumed bytes only for depots actively downloading in this run.
-                            if (depotId in selectedDepots) {
-                                resumedBytes += safeBytes
-                            }
-                            Timber.i(
-                                "RESUME-INIT depot=$depotId loaded=$safeBytes (snapshot=$bytes, max=$depotSize, " +
-                                    "inSelected=${depotId in selectedDepots}, inSession=${depotId in selectedDepotSizes.keys})",
-                            )
-                        }
-                    } else {
-                        // SYNC clear so a stale snapshot from a previous (possibly buggy)
-                        // session can't poison this fresh download. Async clear has a race
-                        // window where new persists can read or even overwrite with stale
-                        // depot byte counts.
-                        di.clearPersistedBytesDownloaded(appDirPath, sync = true)
-                        Timber.i("RESUME-INIT cleared persisted snapshot (sync) for fresh download appId=$appId")
-                    }
-                    resumedBytes = resumedBytes.coerceIn(0L, totalBytes)
-
-                    if (resumedBytes > 0L) {
-                        di.initializeBytesDownloaded(resumedBytes)
-                        Timber.i("Resumed download: initialized with $resumedBytes bytes")
-                    }
-
-                    val downloadJob =
-                        service.scope.launch {
-                            var depotDownloader: DepotDownloader? = null
-                            try {
-                                // Retry loop for transient Steam API failures (AsyncJobFailedException) or missing client
-                                val maxRetries = 3
-                                var lastException: Exception? = null
-
-                                for (attempt in 1..maxRetries) {
-                                    lastException = null
-                                    try {
-                                        if (attempt > 1) {
-                                            Timber.i("Retry attempt $attempt/$maxRetries for appId: $appId")
-                                            di.updateStatusMessage("Retrying download (attempt $attempt/$maxRetries)...")
-                                            withContext(Dispatchers.Main) {
-                                                WinToast.show(
-                                                    instance?.applicationContext ?: return@withContext,
-                                                    "Retrying download (attempt $attempt/$maxRetries)...",
-                                                    Toast.LENGTH_SHORT,
-                                                )
-                                            }
-                                            kotlinx.coroutines.delay(3000L * attempt) // Exponential backoff
-                                        }
-
-                                        // Wait for steamClient to be connected and logged in
-                                        var client = instance?.steamClient
-                                        var waitAttempts = 0
-                                        // Increased wait limit and robustness
-                                        while ((client == null || !isConnected || !isLoggedIn) && waitAttempts < 60) {
-                                            val reason =
-                                                when {
-                                                    client == null -> "initializing"
-                                                    !isConnected -> "connecting"
-                                                    !isLoggedIn -> "logging in"
-                                                    else -> "waiting"
-                                                }
-                                            Timber.i("Waiting for Steam client ($reason, attempt $waitAttempts)...")
-                                            di.updateStatusMessage("Waiting for connection ($reason)...")
-                                            delay(1000L)
-                                            client = instance?.steamClient
-                                            waitAttempts++
-                                        }
-
-                                        if (client == null || !isConnected || !isLoggedIn) {
-                                            throw Exception(
-                                                "Steam client not connected or logged in. Please check your connection and login status.",
-                                            )
-                                        }
-
-                                        // Get licenses from database
-                                        Timber.i("Retrieving licenses from database for appId: $appId")
-                                        di.updateStatusMessage("Retrieving licenses...")
-                                        var licenses = getLicensesFromDb()
-                                        waitAttempts = 0
-                                        while (licenses.isEmpty() && waitAttempts < 10) {
-                                            Timber.i("Waiting for licenses to be available (attempt $waitAttempts)...")
-                                            di.updateStatusMessage("Waiting for licenses...")
-                                            delay(1000L)
-                                            licenses = getLicensesFromDb()
-                                            waitAttempts++
-                                        }
-
-                                        if (licenses.isEmpty()) {
-                                            throw Exception("No Steam licenses found. Please ensure you are logged in.")
-                                        }
-                                        Timber.i("Retrieved ${licenses.size} licenses from database")
-
-                                        // Optimized ratios for 8-core mobile devices
-                                        val cpuCores = Runtime.getRuntime().availableProcessors()
-                                        var downloadRatio = 1.0
-                                        var decompressRatio = 0.5 // Start with balanced default
-
-                                        when (PrefManager.downloadSpeed.toInt()) {
-                                            8 -> {
-                                                downloadRatio = 0.6
-                                                decompressRatio = 0.2
-                                            }
-
-                                            16 -> {
-                                                downloadRatio = 1.2
-                                                decompressRatio = 0.4
-                                            }
-
-                                            24 -> {
-                                                downloadRatio = 1.5
-                                                decompressRatio = 0.5
-                                            }
-
-                                            32 -> {
-                                                downloadRatio = 2.4
-                                                decompressRatio = 0.8
-                                            }
-
-                                            else -> {
-                                                // Auto/Default optimization for 8 cores
-                                                if (cpuCores >= 8) {
-                                                    downloadRatio = 1.5 // Aggressive downloading
-                                                    decompressRatio = 0.5 // Moderate decompression to prevent UI stutter
-                                                } else {
-                                                    downloadRatio = 1.0
-                                                    decompressRatio = 0.4
-                                                }
-                                            }
-                                        }
-
-                                        val maxDownloads = (cpuCores * downloadRatio).toInt().coerceAtLeast(2)
-                                        val maxDecompress = (cpuCores * decompressRatio).toInt().coerceAtLeast(1)
-
-                                        Timber.i(
-                                            "Download Config - Cores: $cpuCores, DL Ratio: $downloadRatio, Decomp Ratio: $decompressRatio",
-                                        )
-                                        Timber.i("Threads - Max Downloads: $maxDownloads, Max Decompress: $maxDecompress")
-
-                                        // Create DepotDownloader instance
-                                        Timber.i("Initializing DepotDownloader for appId: $appId (attempt $attempt)")
-                                        di.updateStatusMessage("Initializing downloader...")
-                                        depotDownloader =
-                                            DepotDownloader(
-                                                client,
-                                                licenses,
-                                                debug = false,
-                                                androidEmulation = true,
-                                                maxDownloads = maxDownloads,
-                                                maxDecompress = maxDecompress,
-                                                maxFileWrites = 1,
-                                                parentJob = coroutineContext[Job],
-                                            )
-
-                                        // Create listeners for DLC apps
-                                        val depotIdToIndex = selectedDepots.keys.mapIndexed { index, depotId -> depotId to index }.toMap()
-                                        val listener =
-                                            AppDownloadListener(
-                                                di,
-                                                depotIdToIndex,
-                                                selectedDepotSizes,
-                                            )
-                                        depotDownloader!!.addListener(listener)
-
-                                        if (mainAppDepots.isNotEmpty()) {
-                                            val mainAppDepotIds = mainAppDepots.keys.sorted()
-                                            val mainAppItem =
-                                                AppItem(
-                                                    appId,
-                                                    installDirectory = appDirPath,
-                                                    depot = mainAppDepotIds,
-                                                    verify = enableVerify,
-                                                )
-                                            depotDownloader!!.add(mainAppItem)
-                                        }
-
-                                        calculatedDlcAppIds.forEach { dlcAppId ->
-                                            val dlcDepotIds = selectedDepotIdsByDlcAppId[dlcAppId].orEmpty()
-                                            if (dlcDepotIds.isEmpty()) return@forEach
-
-                                            val dlcAppItem =
-                                                AppItem(
-                                                    dlcAppId,
-                                                    installDirectory = appDirPath,
-                                                    depot = dlcDepotIds,
-                                                    verify = enableVerify,
-                                                )
-                                            depotDownloader!!.add(dlcAppItem)
-                                        }
-
-                                        // Steam Controller Config download
-                                        val appConfig = getAppInfoOf(appId)?.config
-                                        if (appConfig?.steamControllerTemplateIndex == 1) {
-                                            val controllerConfig =
-                                                appConfig.steamControllerConfigDetails
-                                                    .let { selectSteamControllerConfig(it) }
-
-                                            if (controllerConfig != null) {
-                                                val publishedFileId = controllerConfig.publishedFileId
-                                                runCatching {
-                                                    val requestBody =
-                                                        FormBody
-                                                            .Builder()
-                                                            .add(
-                                                                "itemcount",
-                                                                "1",
-                                                            ).add("publishedfileids[0]", publishedFileId.toString())
-                                                            .build()
-                                                    val request =
-                                                        Request
-                                                            .Builder()
-                                                            .url(
-                                                                "https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1",
-                                                            ).post(requestBody)
-                                                            .build()
-                                                    Net.http.newCall(request).execute().use { response ->
-                                                        if (response.isSuccessful) {
-                                                            val responseBody = response.body?.string()
-                                                            if (!responseBody.isNullOrEmpty()) {
-                                                                val responseJson = JSONObject(responseBody)
-                                                                val responseData = responseJson.optJSONObject("response")
-                                                                val fileUrl =
-                                                                    responseData
-                                                                        ?.optJSONArray(
-                                                                            "publishedfiledetails",
-                                                                        )?.optJSONObject(0)
-                                                                        ?.optString("file_url", "")
-                                                                        ?.trim()
-                                                                if (!fileUrl.isNullOrEmpty()) {
-                                                                    val configFile = File(appDirPath, STEAM_CONTROLLER_CONFIG_FILENAME)
-                                                                    val downloadRequest =
-                                                                        Request
-                                                                            .Builder()
-                                                                            .url(fileUrl)
-                                                                            .get()
-                                                                            .build()
-                                                                    Net.http.newCall(downloadRequest).execute().use { downloadResponse ->
-                                                                        if (downloadResponse.isSuccessful) {
-                                                                            downloadResponse.body?.byteStream()?.use { input ->
-                                                                                configFile.outputStream().use { output ->
-                                                                                    input.copyTo(output)
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                        // Signal that no more items will be added
-                                        depotDownloader!!.finishAdding()
-
-                                        Timber.i("Downloading game to $appDirPath (attempt $attempt)")
-
-                                        // Wait for completion. Use the kotlinx-coroutines `await()`
-                                        // extension on CompletableFuture so cancellation propagates
-                                        // (the previous .join() was uninterruptible and made the
-                                        // coroutine wait until JavaSteam's finishDepotDownload fired
-                                        // even after the user had paused — leading to the COMPLETE
-                                        // marker being set on partial installs when JavaSteam's
-                                        // pendingChunks loop drained on cancel).
-                                        try {
-                                            val completion = depotDownloader?.getCompletion()
-                                            if (completion is kotlinx.coroutines.Deferred<*>) {
-                                                Timber.i("Waiting for DepotDownloader Deferred completion...")
-                                                completion.await()
-                                            } else if (completion is java.util.concurrent.CompletableFuture<*>) {
-                                                Timber.i("Waiting for DepotDownloader CompletableFuture completion...")
-                                                @Suppress("UNCHECKED_CAST")
-                                                (completion as java.util.concurrent.CompletableFuture<Any?>).await()
-                                            } else if (completion != null) {
-                                                Timber.w(
-                                                    "Unknown completion type ${completion.javaClass.simpleName}; falling back to .toString()",
-                                                )
-                                            } else {
-                                                Timber.i("Downloader completion is null, assuming immediate success")
-                                            }
-                                        } catch (e: Exception) {
-                                            if (e is CancellationException) throw e
-                                            Timber.w(e, "DepotDownloader completion await encountered an error")
-                                        }
-
-                                        // Hard barrier: even if completion.await returned without
-                                        // throwing, re-check for cancellation. JavaSteam can complete
-                                        // its CompletableFuture as a side-effect of pending chunks
-                                        // being cancelled (pendingChunks drains to 0 → finishDepot
-                                        // Download fires) — in that race we must NOT proceed to
-                                        // completeAppDownload, which would set the COMPLETE marker
-                                        // for a paused/partial install.
-                                        coroutineContext.ensureActive()
-                                        if (!di.isActive() || di.isCancelling) {
-                                            Timber.i(
-                                                "DepotDownloader completion returned but DownloadInfo is no longer active " +
-                                                    "(isActive=${di.isActive()}, isCancelling=${di.isCancelling}). " +
-                                                    "Skipping completeAppDownload — the user paused or cancelled.",
-                                            )
-                                            throw CancellationException(
-                                                if (di.isCancelling) "Cancelled by user" else "Paused by user",
-                                            )
-                                        }
-
-                                        Timber.i("DepotDownloader finished for appId: $appId")
-
-                                        // If it was extremely fast (e.g. already downloaded), ensure some visibility in UI
-                                        if (di.getProgress() >= 1.0f) {
-                                            delay(1000)
-                                        }
-
-                                        // If we got here without exception, download succeeded
-                                        break
-                                    } catch (e: AsyncJobFailedException) {
-                                        lastException = e
-                                        Timber.w(e, "AsyncJobFailedException on attempt $attempt/$maxRetries for appId: $appId")
-                                        // Close the downloader from the failed attempt
-                                        runCatching { depotDownloader?.close() }.onFailure { closeError ->
-                                            Timber.w(closeError, "Failed to close downloader on retry for app $appId")
-                                        }
-                                        depotDownloader = null
-                                        if (attempt >= maxRetries) {
-                                            Timber.e("All $maxRetries retry attempts failed for appId: $appId")
-                                            throw e
-                                        }
-                                        di.setActive(true)
-                                        continue
-                                    }
-                                }
-
-                                // Complete app download - Wrap in try-catch to ensure we don't crash at the finish line
-                                try {
-                                    di.updateStatusMessage("Finalizing installation...")
-                                    Timber.i("Finalizing installation at path: $appDirPath")
-                                    if (originalMainAppDepots.isNotEmpty()) {
-                                        val mainAppDepotIds = originalMainAppDepots.keys.sorted()
-                                        completeAppDownload(di, appId, mainAppDepotIds, mainAppDlcIds, appDirPath)
-                                    }
-
-                                    calculatedDlcAppIds.forEach { dlcAppId ->
-                                        val dlcDepotIds = allDepotIdsByDlcAppId[dlcAppId].orEmpty()
-                                        completeAppDownload(di, dlcAppId, dlcDepotIds, emptyList(), appDirPath)
-                                    }
-                                    Timber.i("Installation finalized for appId: $appId")
-
-                                    // Show success message to user
-                                    instance?.let { service ->
-                                        service.scope.launch(Dispatchers.Main) {
-                                            WinToast.show(service.applicationContext, "Download complete", Toast.LENGTH_SHORT)
-                                            Unit
-                                        }
-                                    }
-                                } catch (e: Exception) {
-                                    Timber.e(e, "Error during finalize/database update for appId: $appId")
-                                    throw e
-                                }
-
-                                // Remove the job here
-                                removeDownloadJob(appId)
-
-                                // Remove the downloading app info
-                                runBlocking {
-                                    instance?.downloadingAppInfoDao?.deleteApp(appId)
-                                    Unit
-                                }
-                                Unit
-                            } catch (e: DownloadFailedException) {
-                                Timber.d(e, "Download failed for app $appId via cancellation")
-                                clearFailedResumeState(appId)
-                                di.updateStatus(DownloadPhase.FAILED)
-                                di.setActive(false)
-                                // Clean up markers
-                                MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                                runBlocking {
-                                    DownloadCoordinator.notifyFinished(
-                                        DownloadRecord.STORE_STEAM,
-                                        appId.toString(),
-                                        DownloadRecord.STATUS_FAILED,
-                                        e.message,
-                                    )
-                                }
-                                removeDownloadJob(appId)
-                                return@launch
-                            } catch (e: CancellationException) {
-                                if (di.isDeleting) {
-                                    Timber.d("Download cancelled for deletion for app $appId")
-                                    return@launch
-                                }
-
-                                if (di.isCancelling) {
-                                    Timber.d("Download cancelled by user for app $appId")
-                                    di.persistProgressSnapshot(force = true)
-                                    di.updateStatus(DownloadPhase.CANCELLED)
-                                    di.setActive(false)
-                                    runBlocking {
-                                        DownloadCoordinator.notifyFinished(
-                                            DownloadRecord.STORE_STEAM,
-                                            appId.toString(),
-                                            DownloadRecord.STATUS_CANCELLED,
-                                        )
-                                    }
-                                    throw e
-                                }
-
-                                Timber.d(e, "Download paused for app $appId")
-                                // Keep downloadingAppInfo on cancellation so resume does not fall into verify mode.
-                                di.persistProgressSnapshot(force = true)
-                                di.updateStatus(DownloadPhase.PAUSED)
-                                di.setActive(false)
-                                runBlocking {
-                                    DownloadCoordinator.notifyFinished(
-                                        DownloadRecord.STORE_STEAM,
-                                        appId.toString(),
-                                        DownloadRecord.STATUS_PAUSED,
-                                    )
-                                }
-                                throw e
-                            } catch (e: Exception) {
-                                Timber.e(e, "Download failed for app $appId")
-                                clearFailedResumeState(appId)
-
-                                val errorMsg =
-                                    when (e) {
-                                        is ClassCastException -> "Casting error: ${e.message}"
-                                        is NullPointerException -> "Null reference: ${e.message}"
-                                        else -> e.localizedMessage ?: e.message ?: e.javaClass.simpleName
-                                    }
-
-                                di.updateStatus(DownloadPhase.FAILED, errorMsg)
-                                di.setActive(false)
-                                // Clean up markers and DB state
-                                MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                                runBlocking {
-                                    instance?.downloadingAppInfoDao?.deleteApp(appId)
-                                    Unit
-                                }
-                                runBlocking {
-                                    DownloadCoordinator.notifyFinished(
-                                        DownloadRecord.STORE_STEAM,
-                                        appId.toString(),
-                                        DownloadRecord.STATUS_FAILED,
-                                        errorMsg,
-                                    )
-                                }
-                                removeDownloadJob(appId)
-                                // Show error to user
-                                instance?.let { service ->
-                                    service.scope.launch(Dispatchers.Main) {
-                                        WinToast.show(service.applicationContext, "Download failed: $errorMsg", Toast.LENGTH_LONG)
-                                        Unit
-                                    }
-                                }
-                                PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
-                                Unit
-                            } finally {
-                                runCatching {
-                                    depotDownloader?.close()
-                                    Unit
-                                }.onFailure { closeError ->
-                                    Timber.w(closeError, "Failed to close downloader for app $appId")
-                                }
-                                Unit
-                            }
-                            Unit
-                        }
-                    downloadJob.invokeOnCompletion { throwable ->
-                        if (throwable is CancellationException && throwable !is DownloadFailedException) {
-                            if (di.isDeleting) {
-                                // Deletion handled externally
-                            } else if (di.isCancelling) {
-                                // Keep in downloadJobs for UI visibility, but still check queue
-                                checkQueue()
-                            } else {
-                                Timber.d(throwable, "Download paused for app $appId")
-                                removeDownloadJob(appId)
-                            }
-                        }
-                    }
-                    di.setDownloadJob(downloadJob)
-                }
-
-            downloadJobs[appId] = info
-            info.updateStatus(DownloadPhase.PREPARING)
-            notifyDownloadStarted(appId)
-            return info
-        }
-
-        private fun finalizeSnapshotResumeAsComplete(
-            appId: Int,
-            appDirPath: String,
-            mainAppDepots: Map<Int, DepotInfo>,
-            dlcAppDepots: Map<Int, DepotInfo>,
-            userSelectedDlcAppIds: List<Int>,
-        ): DownloadInfo {
-            val downloadingAppIds = CopyOnWriteArrayList<Int>()
-            val calculatedDlcAppIds = CopyOnWriteArrayList<Int>()
-            val allDepotIdsByDlcAppId =
-                dlcAppDepots.values
-                    .groupBy(keySelector = { it.dlcAppId }, valueTransform = { it.depotId })
-                    .mapValues { (_, depotIds) -> depotIds.sorted() }
-
-            userSelectedDlcAppIds.forEach { dlcAppId ->
-                if (allDepotIdsByDlcAppId[dlcAppId]?.isNotEmpty() == true) {
-                    downloadingAppIds.add(dlcAppId)
-                    calculatedDlcAppIds.add(dlcAppId)
-                }
-            }
-
-            // Add main app ID if there are main app depots
-            if (mainAppDepots.isNotEmpty() && !downloadingAppIds.contains(appId)) {
-                downloadingAppIds.add(appId)
-            }
-
-            val info = DownloadInfo(1, appId, downloadingAppIds)
-            info.setPersistencePath(appDirPath)
-            info.updateStatus(DownloadPhase.COMPLETE)
-            info.setProgress(1f)
-            downloadJobs[appId] = info
-            notifyDownloadStarted(appId)
-
-            val mainAppDlcIds = getMainAppDlcIdsWithoutProperDepotDlcIds(appId)
-            if (dlcAppDepots.isEmpty()) {
-                mainAppDlcIds.addAll(mainAppDepots.filter { it.value.dlcAppId != INVALID_APP_ID }.map { it.value.dlcAppId }.distinct())
-            }
-
-            runBlocking(Dispatchers.IO) {
-                if (mainAppDepots.isNotEmpty()) {
-                    completeAppDownload(
-                        downloadInfo = info,
-                        downloadingAppId = appId,
-                        entitledDepotIds = mainAppDepots.keys.sorted(),
-                        selectedDlcAppIds = mainAppDlcIds,
-                        appDirPath = appDirPath,
-                    )
-                }
-
-                calculatedDlcAppIds.forEach { dlcAppId ->
-                    val dlcDepotIds = allDepotIdsByDlcAppId[dlcAppId].orEmpty()
-                    completeAppDownload(
-                        downloadInfo = info,
-                        downloadingAppId = dlcAppId,
-                        entitledDepotIds = dlcDepotIds,
-                        selectedDlcAppIds = emptyList(),
-                        appDirPath = appDirPath,
-                    )
-                }
-
-                instance?.downloadingAppInfoDao?.deleteApp(appId)
-                Unit
-            }
-
-            // Show success message to user for no-op/resume completion
-            instance?.let { service ->
-                service.scope.launch(Dispatchers.Main) {
-                    WinToast.show(service.applicationContext, "Download complete", Toast.LENGTH_SHORT)
-                    Unit
-                }
-            }
-            return info
-        }
-
-        private suspend fun completeAppDownload(
-            downloadInfo: DownloadInfo,
-            downloadingAppId: Int,
-            entitledDepotIds: List<Int>,
-            selectedDlcAppIds: List<Int>,
-            appDirPath: String,
-        ) {
-            Timber.i("Item $downloadingAppId download completed, saving database")
-
-            // Update database
-            val appInfo = instance?.appInfoDao?.getInstalledApp(downloadingAppId)
-
-            // Update Saved AppInfo
-            if (appInfo != null) {
-                val updatedDownloadedDepots = (appInfo.downloadedDepots + entitledDepotIds).distinct()
-                val updatedDlcDepots = (appInfo.dlcDepots + selectedDlcAppIds).distinct()
-
-                instance?.appInfoDao?.update(
-                    AppInfo(
-                        downloadingAppId,
-                        isDownloaded = true,
-                        downloadedDepots = updatedDownloadedDepots.sorted(),
-                        dlcDepots = updatedDlcDepots.sorted(),
-                    ),
-                )
-            } else {
-                instance?.appInfoDao?.insert(
-                    AppInfo(
-                        downloadingAppId,
-                        isDownloaded = true,
-                        downloadedDepots = entitledDepotIds.sorted(),
-                        dlcDepots = selectedDlcAppIds.sorted(),
-                    ),
-                )
-            }
-
-            // Remove completed appId from downloadInfo.dlcAppIds and check if it was actually removed
-            val wasRemoved = downloadInfo.downloadingAppIds.remove(downloadingAppId)
-            if (!wasRemoved) {
-                Timber.d("Item $downloadingAppId was already removed from downloading list, skipping redundant completion.")
-                return
-            }
-
-            // All downloading appIds are removed
-            if (downloadInfo.downloadingAppIds.isEmpty()) {
-                Timber.i("All items for game ${downloadInfo.gameId} completed, running final completion logic.")
-                // Settle the remaining bytes once at the end so the visible progress doesn't
-                // sit slightly under 100% when the game is actually complete (e.g. dedup
-                // skipped chunks that never reported via onChunkCompleted).
-                val totalExpectedBytes = downloadInfo.getTotalExpectedBytes()
-                if (totalExpectedBytes > 0L) {
-                    val downloadedBytes = downloadInfo.getBytesDownloaded()
-                    val remainingBytes = (totalExpectedBytes - downloadedBytes).coerceAtLeast(0L)
-                    if (remainingBytes > 0L) {
-                        downloadInfo.updateBytesDownloaded(remainingBytes, System.currentTimeMillis())
-                        downloadInfo.emitProgressChange()
-                    }
-                }
-
-                // Handle completion: add markers
-                withContext(Dispatchers.IO) {
-                    MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
-                    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
-                    MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DLL_REPLACED)
-                    MarkerUtils.removeMarker(appDirPath, Marker.STEAM_COLDCLIENT_USED)
-                    MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DRM_PATCHED)
-                    MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DRM_UNPACK_CHECKED)
-
-                    // Ensure the main app is marked as downloaded in the DB
-                    val mainAppId = downloadInfo.gameId
-                    val service = instance
-                    if (service != null) {
-                        val mainAppInfo = service.appInfoDao.getInstalledApp(mainAppId)
-                        if (mainAppInfo != null) {
-                            if (!mainAppInfo.isDownloaded) {
-                                service.appInfoDao.update(mainAppInfo.copy(isDownloaded = true))
-                                Timber.i("Marked main app $mainAppId as downloaded in DB")
-                            }
-                        } else {
-                            service.appInfoDao.insert(AppInfo(mainAppId, isDownloaded = true))
-                            Timber.i("Inserted main app $mainAppId as downloaded in DB")
-                        }
-                    }
-                    Unit
-                }
-
-                val service = instance
-                if (service != null) {
-                    createSteamShortcut(service, downloadInfo.gameId)
-                }
-
-                // Mark download inactive BEFORE updating status so checkQueue() correctly
-                // frees this slot for the next queued download. Without this, isActive() stays
-                // true and blocks the queue until the user manually clears the entry.
-                downloadInfo.setActive(false)
-                downloadInfo.updateStatus(DownloadPhase.COMPLETE)
-                PluviaApp.events.emit(AndroidEvent.LibraryInstallStatusChanged(downloadInfo.gameId))
-
-                downloadInfo.clearPersistedBytesDownloaded(appDirPath, sync = true)
-                // Notify the global coordinator so it can advance the cross-store queue and
-                // persist COMPLETE in the records table.
-                runBlocking {
-                    DownloadCoordinator.notifyFinished(
-                        DownloadRecord.STORE_STEAM,
-                        downloadInfo.gameId.toString(),
-                        DownloadRecord.STATUS_COMPLETE,
-                    )
-                }
-                checkQueue()
-            }
-            Unit
-        }
-
-        // CRITICAL: onChunkCompleted reports PER-DEPOT cumulative bytes, NOT global. The
-        // previous code treated the value as a global counter, which mis-attributed bytes
-        // between depots when downloads ran in parallel or sequentially across multiple
-        // depots. Sequential downloads after a large depot caused the next depot's tracker
-        // to stay at 0 (its per-depot count was below the global high-water mark) until its
-        // per-depot count exceeded the prior depot's size — corrupting depot_bytes.json.
-        // On resume, that snapshot can mark a depot as fully downloaded when its files are
-        // actually partial; the depot is filtered out of selectedDepots and the game is
-        // marked COMPLETE with missing files.
-        //
-        // The fix is per-depot session high-water marks. JavaSteam's depotBytesUncompressed
-        // counts only bytes downloaded during THIS downloader run (validated existing bytes
-        // bump sizeDownloaded but not depotBytesUncompressed), so we cannot use the value
-        // as an absolute "set depot to N" — we must diff against the per-depot session
-        // counter and apply the delta on top of the persisted bytes restored from snapshot.
-        private class AppDownloadListener(
-            private val downloadInfo: DownloadInfo,
-            private val depotIdToIndex: Map<Int, Int>,
-            private val depotMaxBytesById: Map<Int, Long>,
-        ) : IDownloadListener {
-            private var lastByteProgressAtMs: Long = 0L
-
-            // Per-depot session high-water mark of the cumulative uncompressedBytes value
-            // reported by JavaSteam for that depot. Diff'd to obtain a positive per-depot
-            // delta on each chunk callback.
-            private val lastReportedByDepot =
-                java.util.concurrent.ConcurrentHashMap<Int, java.util.concurrent.atomic.AtomicLong>()
-
-            // Returns the positive delta (newly downloaded bytes) for the given depot,
-            // updating the per-depot session high-water mark. Resilient to out-of-order
-            // callbacks from concurrent decompression workers because each depot has its
-            // own atomic and we use CAS to only ever advance forward.
-            private fun consumePerDepotUncompressedDelta(depotId: Int, currentBytes: Long): Long {
-                if (currentBytes <= 0L) return 0L
-                val tracker =
-                    lastReportedByDepot.computeIfAbsent(depotId) {
-                        java.util.concurrent.atomic.AtomicLong(0L)
-                    }
-                while (true) {
-                    val previous = tracker.get()
-                    if (currentBytes <= previous) return 0L
-                    if (tracker.compareAndSet(previous, currentBytes)) {
-                        val delta = currentBytes - previous
-                        // Diagnostic: warn when a per-depot session report jumps by an
-                        // implausibly large amount (e.g., > 100 MB in one chunk callback).
-                        // This would indicate JavaSteam reporting stale/global counters.
-                        if (delta > 100L * 1024L * 1024L) {
-                            Timber.w(
-                                "BIG-DELTA depot=$depotId prev=$previous current=$currentBytes delta=$delta maxBytes=${depotMaxBytesById[depotId]}",
-                            )
-                        }
-                        return delta
-                    }
-                }
-            }
-
-            // Diagnostic helper: log every change that would push a depot to >= depotSize
-            // along with the call stack, so we can pinpoint which path is corrupting the
-            // snapshot. Only emits at INFO level once per (depot,reason) to avoid spam.
-            private val depotMaxedReported = java.util.concurrent.ConcurrentHashMap<String, Boolean>()
-
-            private fun logDepotPushedToMax(reason: String, depotId: Int, prev: Long, next: Long) {
-                if (next < (depotMaxBytesById[depotId] ?: 0L)) return
-                val key = "$depotId:$reason"
-                if (depotMaxedReported.putIfAbsent(key, true) != null) return
-                Timber.w(
-                    Throwable("trace"),
-                    "DEPOT-MAXED reason=$reason depot=$depotId prev=$prev next=$next maxBytes=${depotMaxBytesById[depotId]}",
-                )
-            }
-
-            // Sets per depot cumulative value, returns delta
-            private fun updateDepotBytesAndGetDelta(
-                depotId: Int,
-                reportedBytes: Long,
-            ): Long {
-                if (!depotIdToIndex.containsKey(depotId)) {
-                    return 0L
-                }
-
-                var atomicBytes = downloadInfo.depotCumulativeUncompressedBytes[depotId]
-                if (atomicBytes == null) {
-                    atomicBytes =
-                        java.util.concurrent.atomic
-                            .AtomicLong(0L)
-                    val existing = downloadInfo.depotCumulativeUncompressedBytes.putIfAbsent(depotId, atomicBytes)
-                    if (existing != null) {
-                        atomicBytes = existing
-                    }
-                }
-
-                if (reportedBytes <= 0L) {
-                    return 0L
-                }
-
-                val maxBytes = depotMaxBytesById[depotId]?.coerceAtLeast(1L)
-                val clampedReportedBytes =
-                    if (maxBytes != null) {
-                        reportedBytes.coerceIn(0L, maxBytes)
-                    } else {
-                        reportedBytes
-                    }
-
-                var deltaBytes = 0L
-                while (true) {
-                    val prev = atomicBytes.get()
-                    val next = maxOf(prev, clampedReportedBytes)
-                    if (prev == next) {
-                        break
-                    }
-                    if (atomicBytes.compareAndSet(prev, next)) {
-                        deltaBytes = (next - prev).coerceAtLeast(0L)
-                        break
-                    }
-                }
-                return deltaBytes
-            }
-
-            // Adds delta to per depot cumulative bytes, clamped to depot max
-            private fun addDeltaToDepotBytes(
-                depotId: Int,
-                delta: Long,
-            ) {
-                if (delta <= 0L) return
-                if (!depotIdToIndex.containsKey(depotId)) return
-
-                var atomicBytes = downloadInfo.depotCumulativeUncompressedBytes[depotId]
-                if (atomicBytes == null) {
-                    atomicBytes =
-                        java.util.concurrent.atomic
-                            .AtomicLong(0L)
-                    val existing = downloadInfo.depotCumulativeUncompressedBytes.putIfAbsent(depotId, atomicBytes)
-                    if (existing != null) {
-                        atomicBytes = existing
-                    }
-                }
-
-                val maxBytes = depotMaxBytesById[depotId]?.coerceAtLeast(1L) ?: Long.MAX_VALUE
-                while (true) {
-                    val prev = atomicBytes.get()
-                    val next = (prev + delta).coerceIn(0L, maxBytes)
-                    if (prev == next) break
-                    if (atomicBytes.compareAndSet(prev, next)) {
-                        logDepotPushedToMax("addDelta(delta=$delta)", depotId, prev, next)
-                        break
-                    }
-                }
-            }
-
-            override fun onItemAdded(item: DownloadItem) {
-                Timber.d("Item ${item.appId} added to queue")
-                Unit
-            }
-
-            override fun onDownloadStarted(item: DownloadItem) {
-                Timber.i("Item ${item.appId} download started")
-                downloadInfo.updateStatus(DownloadPhase.DOWNLOADING)
-                Unit
-            }
-
-            override fun onDownloadCompleted(item: DownloadItem) {
-                Timber.i("Item ${item.appId} download completed")
-                Unit
-            }
-
-            override fun onFileCompleted(
-                depotId: Int,
-                fileName: String,
-                depotPercentComplete: Float,
-            ) {
-                Timber.d("File completed: $fileName (Depot $depotId: ${depotPercentComplete * 100}%)")
-
-                depotIdToIndex[depotId]?.let { index ->
-                    downloadInfo.setProgress(depotPercentComplete, index)
-                }
-
-                // If onChunkCompleted missed some updates or out-of-order, this ensures progress is emitted.
-                downloadInfo.emitProgressChange()
-                Unit
-            }
-
-            override fun onDownloadFailed(
-                item: DownloadItem,
-                error: Throwable,
-            ) {
-                if (error is CancellationException && error !is DownloadFailedException) {
-                    if (downloadInfo.isDeleting) {
-                        Timber.d("Item ${item.appId} download cancelled for deletion")
-                        return
-                    }
-                    if (downloadInfo.isCancelling) {
-                        Timber.d("Item ${item.appId} download cancelled by user")
-                        downloadInfo.persistProgressSnapshot(force = true)
-                        downloadInfo.updateStatus(DownloadPhase.CANCELLED)
-                        downloadInfo.setActive(false)
-                        return
-                    }
-                    // Treat cancellation as pause: preserve resume metadata/state.
-                    Timber.d(error, "Item ${item.appId} download paused")
-                    downloadInfo.persistProgressSnapshot(force = true)
-                    downloadInfo.updateStatus(DownloadPhase.PAUSED)
-                    downloadInfo.setActive(false)
-                    return
-                }
-
-                Timber.e(error, "Item ${item.appId} failed to download")
-                // Hard stop current session on item failure so we do not continue toward completion
-                // with missing/corrupt files. Resume metadata is preserved for retry.
-                downloadInfo.persistProgressSnapshot(force = true)
-                downloadInfo.updateStatus(DownloadPhase.FAILED)
-                downloadInfo.failedToDownload()
-
-                instance?.let { service ->
-                    service.scope.launch(Dispatchers.Main) {
-                        WinToast.show(
-                            service.applicationContext,
-                            "Download error for depot ${item.appId}: ${error.message}",
-                            Toast.LENGTH_LONG,
-                        )
-                    }
-                }
-                Unit
-            }
-
-            override fun onStatusUpdate(message: String) {
-                Timber.d("Download status: $message")
-
-                // Extract filename if present (usually "Downloading filename..." or "Verifying filename...")
-                if (message.startsWith("Downloading ", ignoreCase = true) ||
-                    message.startsWith("Verifying ", ignoreCase = true) ||
-                    message.startsWith("Patching ", ignoreCase = true)
-                ) {
-                    val parts = message.split(" ")
-                    if (parts.size > 1) {
-                        val fileName = parts[1].removeSuffix("...")
-                        downloadInfo.updateCurrentFileName(fileName)
-                    }
-                }
-
-                val mappedStatus = DownloadPhase.fromMessage(message)
-                if (mappedStatus != null) {
-                    if (
-                        mappedStatus == DownloadPhase.PREPARING ||
-                        mappedStatus == DownloadPhase.VERIFYING ||
-                        mappedStatus == DownloadPhase.PATCHING
-                    ) {
-                        val nowMs = System.currentTimeMillis()
-                        val recentlyMovedBytes = nowMs - lastByteProgressAtMs <= 5_000L
-                        if (recentlyMovedBytes && downloadInfo.getStatusFlow().value == DownloadPhase.DOWNLOADING) {
-                            return
-                        }
-                    }
-                    downloadInfo.updateStatus(mappedStatus, message)
-                } else {
-                    downloadInfo.updateStatusMessage(message)
-                }
-                Unit
-            }
-
-            override fun onChunkCompleted(
-                depotId: Int,
-                depotPercentComplete: Float,
-                compressedBytes: Long,
-                uncompressedBytes: Long,
-            ) {
-                // uncompressedBytes is per-depot cumulative for THIS depot (per the
-                // IDownloadListener contract). Diff against this depot's session high-water
-                // mark so we only count newly-downloaded bytes for THIS depot.
-                val deltaBytes = consumePerDepotUncompressedDelta(depotId, uncompressedBytes)
-
-                if (deltaBytes > 0L) {
-                    lastByteProgressAtMs = System.currentTimeMillis()
-
-                    addDeltaToDepotBytes(depotId, deltaBytes)
-                    downloadInfo.updateBytesDownloaded(deltaBytes, lastByteProgressAtMs)
-                    downloadInfo.markProgressSnapshotDirty()
-
-                    // If resume verification/prepare phases already ran and bytes are now moving again,
-                    // report active downloading.
-                    val currentPhase = downloadInfo.getStatusFlow().value
-                    if (
-                        currentPhase == DownloadPhase.UNKNOWN ||
-                        currentPhase == DownloadPhase.PREPARING ||
-                        currentPhase == DownloadPhase.VERIFYING ||
-                        currentPhase == DownloadPhase.PATCHING
-                    ) {
-                        downloadInfo.updateStatus(DownloadPhase.DOWNLOADING)
-                    }
-                }
-
-                depotIdToIndex[depotId]?.let { index ->
-                    downloadInfo.setProgress(depotPercentComplete, index)
-                }
-
-                // Emit progress change
-                downloadInfo.emitProgressChange()
-                Unit
-            }
-
-            override fun onDepotCompleted(
-                depotId: Int,
-                compressedBytes: Long,
-                uncompressedBytes: Long,
-            ) {
-                Timber.i("Depot $depotId completed (compressed: $compressedBytes, uncompressed: $uncompressedBytes)")
-
-                // Catch up any per-depot session bytes not yet credited via onChunkCompleted.
-                val sessionDelta = consumePerDepotUncompressedDelta(depotId, uncompressedBytes)
-                if (sessionDelta > 0L) {
-                    lastByteProgressAtMs = System.currentTimeMillis()
-                    addDeltaToDepotBytes(depotId, sessionDelta)
-                    downloadInfo.updateBytesDownloaded(sessionDelta, lastByteProgressAtMs)
-                    downloadInfo.markProgressSnapshotDirty()
-                }
-
-                // CRITICAL: do NOT credit the depot to manifest size here. JavaSteam fires
-                // onDepotCompleted at the END of processDepotManifestAndFiles, which runs
-                // even when many of the depot's chunks are still pending download. If
-                // Steam's validation pass marks some files as already-present (sizeDownloaded
-                // grows via file.totalSize) but other chunks are still queued, depotBytes
-                // Uncompressed can be 0 here while gigabytes of chunks haven't actually been
-                // downloaded. Topping up to manifestSize was the bug: it marked partially-
-                // downloaded depots as fully-on-disk in the snapshot, so future resumes
-                // skipped them and the game ended up flagged COMPLETE with most data missing.
-                //
-                // We now ONLY credit bytes that JavaSteam actually reported via session
-                // counters. Depots that finish naturally will still reach depotSize because
-                // every chunk callback reports cumulative per-depot bytes.
-
-                val currentPhase = downloadInfo.getStatusFlow().value
-                if (
-                    currentPhase == DownloadPhase.UNKNOWN ||
-                    currentPhase == DownloadPhase.PREPARING ||
-                    currentPhase == DownloadPhase.VERIFYING ||
-                    currentPhase == DownloadPhase.PATCHING
-                ) {
-                    downloadInfo.updateStatus(DownloadPhase.DOWNLOADING)
-                }
-
-                depotIdToIndex[depotId]?.let { index ->
-                    downloadInfo.setProgress(1f, index)
-                }
-
-                // Emit progress change
-                downloadInfo.emitProgressChange()
-                Unit
-            }
-        }
-
-        fun getWindowsLaunchInfos(appId: Int): List<LaunchInfo> =
-            getAppInfoOf(appId)
-                ?.let { appInfo ->
-                    appInfo.config.launch.filter { launchInfo ->
-                        // since configOS was unreliable and configArch was even more unreliable
-                        launchInfo.executable.endsWith(".exe")
-                    }
-                }.orEmpty()
-
-        suspend fun notifyRunningProcesses(vararg gameProcesses: GameProcessInfo) =
-            withContext(Dispatchers.IO) {
-                instance?.let { steamInstance ->
-                    if (isConnected) {
-                        val gamesPlayed =
-                            gameProcesses.mapNotNull { gameProcess ->
-                                getAppInfoOf(gameProcess.appId)?.let { appInfo ->
-                                    getPkgInfoOf(gameProcess.appId)?.let { pkgInfo ->
-                                        appInfo.branches[gameProcess.branch]?.let { branch ->
-                                            val processId =
-                                                gameProcess.processes
-                                                    .firstOrNull { it.parentIsSteam }
-                                                    ?.processId
-                                                    ?: gameProcess.processes.firstOrNull()?.processId
-                                                    ?: 0
+        suspend fun notifyRunningProcesses(vararg gameProcesses: GameProcessInfo) =
+            withContext(Dispatchers.IO) {
+                instance?.let { steamInstance ->
+                    if (isConnected) {
+                        val gamesPlayed =
+                            gameProcesses.mapNotNull { gameProcess ->
+                                getAppInfoOf(gameProcess.appId)?.let { appInfo ->
+                                    getPkgInfoOf(gameProcess.appId)?.let { pkgInfo ->
+                                        appInfo.branches[gameProcess.branch]?.let { branch ->
+                                            val processId =
+                                                gameProcess.processes
+                                                    .firstOrNull { it.parentIsSteam }
+                                                    ?.processId
+                                                    ?: gameProcess.processes.firstOrNull()?.processId
+                                                    ?: 0
 
                                             val userAccountId = userSteamId!!.accountID.toInt()
                                             GamePlayedInfo(
@@ -4014,7 +1861,7 @@ class SteamService :
                                                     } else {
                                                         pkgInfo.ownerAccountId.first()
                                                     },
-                                                // TODO: figure out what this is and un-hardcode
+                                                // Unknown Steam launch source; keep observed value.
                                                 launchSource = 100,
                                                 gameBuildId = branch.buildId.toInt(),
                                                 processIdList = gameProcess.processes,
@@ -4043,10 +1890,36 @@ class SteamService :
                             },
                         )
 
-                        steamInstance._steamApps?.notifyGamesPlayed(
-                            gamesPlayed = gamesPlayed,
-                            clientOsType = EOSType.AndroidUnknown,
-                        )
+                        // Report running games via the C++ WN-Steam-Client.
+                        val gamesJson = JSONArray()
+                        gamesPlayed.forEach { g ->
+                            val procs = JSONArray()
+                            g.processIdList.forEach { p ->
+                                procs.put(
+                                    JSONObject()
+                                        .put("pid", p.processId)
+                                        .put("ppid", p.processIdParent)
+                                        .put("isSteam", p.parentIsSteam),
+                                )
+                            }
+                            gamesJson.put(
+                                JSONObject()
+                                    .put("gameId", g.gameId)
+                                    .put("processId", g.processId)
+                                    .put("ownerId", g.ownerId)
+                                    .put("launchSource", g.launchSource)
+                                    .put("gameBuildId", g.gameBuildId)
+                                    .put("processes", procs),
+                            )
+                        }
+                        withWnSession { session ->
+                            withContext(Dispatchers.IO) {
+                                session.notifyGamesPlayed(
+                                    gamesJson.toString(),
+                                    EOSType.AndroidUnknown.code(),
+                                )
+                            }
+                        }
                     }
                 }
             }
@@ -4082,17 +1955,15 @@ class SteamService :
                             val clientId = PrefManager.clientId
                             val steamInstance = instance
                             val appInfo = getAppInfoOf(appId)
-                            val steamCloud = steamInstance?._steamCloud
 
-                            if (steamInstance != null && appInfo != null && steamCloud != null) {
-                                progressWrapper("Checking Cloud Saves...", 0f)
+                            if (steamInstance != null && appInfo != null) {
+                                progressWrapper("Checking Cloud Saves", 0f)
                                 val postSyncInfo =
                                     SteamAutoCloud
                                         .syncUserFiles(
                                             appInfo = appInfo,
                                             clientId = clientId,
                                             steamInstance = steamInstance,
-                                            steamCloud = steamCloud,
                                             preferredSave = preferredSave,
                                             parentScope = parentScope,
                                             prefixToPath = prefixToPath,
@@ -4110,28 +1981,40 @@ class SteamService :
                                             EOSType.AndroidUnknown,
                                         )
 
+                                        // Signal app-launch intent; returns pending-remote-operation codes (empty = clear), null = transport/auth failure.
                                         val pendingRemoteOperations =
-                                            steamCloud
-                                                .signalAppLaunchIntent(
-                                                    appId = appId,
-                                                    clientId = clientId,
-                                                    machineName = SteamUtils.getMachineName(steamInstance),
-                                                    ignorePendingOperations = ignorePendingOperations,
-                                                    osType = EOSType.AndroidUnknown,
-                                                ).await()
-
-                                        if (pendingRemoteOperations.isNotEmpty() && !ignorePendingOperations) {
+                                            withWnSession { session ->
+                                                withContext(Dispatchers.IO) {
+                                                    session.signalAppLaunchIntent(
+                                                        appId = appId,
+                                                        clientId = clientId,
+                                                        machineName = SteamUtils.getMachineName(steamInstance),
+                                                        ignorePending = ignorePendingOperations,
+                                                        osType = EOSType.AndroidUnknown.code(),
+                                                    )
+                                                }
+                                            }
+
+                                        if (pendingRemoteOperations == null) {
+                                            // Failure — do NOT treat as clear-to-launch (this RPC is the cloud-save conflict guard).
+                                            Timber.w("signalAppLaunchIntent failed for app $appId — not proceeding")
+                                            syncResult = PostSyncInfo(syncResult = SyncResult.UnknownFail)
+                                        } else if (pendingRemoteOperations.isNotEmpty() && !ignorePendingOperations) {
                                             syncResult =
                                                 PostSyncInfo(
                                                     syncResult = SyncResult.PendingOperations,
                                                     pendingRemoteOperations = pendingRemoteOperations,
                                                 )
                                         } else if (ignorePendingOperations &&
-                                            pendingRemoteOperations.any {
-                                                it.operation == ECloudPendingRemoteOperation.k_ECloudPendingRemoteOperationAppSessionActive
-                                            }
+                                            // 1 == ECloudPendingRemoteOperation AppSessionActive
+                                            pendingRemoteOperations.any { it == 1 }
                                         ) {
-                                            steamInstance._steamUser!!.kickPlayingSession()
+                                            // Kick the other playing session.
+                                            withWnSession { session ->
+                                                withContext(Dispatchers.IO) {
+                                                    session.kickPlayingSession()
+                                                }
+                                            }
                                         }
                                     }
                                 }
@@ -4142,7 +2025,7 @@ class SteamService :
                                 Timber.e(e, "Cloud sync failed after $maxAttempts attempts for app $appId")
                                 syncResult = PostSyncInfo(SyncResult.UnknownFail)
                             } else {
-                                Timber.w("Cloud sync attempt $attempt failed for app $appId, retrying...")
+                                Timber.w("Cloud sync attempt $attempt failed for app $appId, retrying")
                                 delay(1000L * attempt)
                             }
                         }
@@ -4155,21 +2038,18 @@ class SteamService :
                 }
             }
 
-        /**
-         * Lightweight probe: checks whether the cloud save change number for
-         * [appId] differs from the locally stored value.  No files are
-         * downloaded or uploaded – only a single metadata call is made.
-         *
-         * @return `true` if cloud differs, `false` if in sync, `null` if the
-         *         check could not be performed (service unavailable, etc.).
-         */
+        /** Lightweight probe: does [appId]'s cloud-save change number differ from the local value? Single metadata call, no file transfer. true = differs, false = in sync, null = couldn't check. */
         suspend fun cloudSavesDiffer(appId: Int): Boolean? {
             val steamInstance = instance ?: return null
-            val steamCloud = steamInstance._steamCloud ?: return null
             val localCN = steamInstance.changeNumbersDao.getByAppId(appId)?.changeNumber ?: return null
             return try {
-                val fileListChange = steamCloud.getAppFileListChange(appId, localCN).await()
-                fileListChange.currentChangeNumber != localCN
+                // Cloud.GetAppFileChangelist via the C++ WN-Steam-Client.
+                val json =
+                    withWnSession { session ->
+                        withContext(Dispatchers.IO) { session.getCloudFileList(appId) }
+                    } ?: return null
+                val currentCN = JSONObject(json).optLong("currentChangeNumber", 0L)
+                currentCN != localCN
             } catch (e: Exception) {
                 Timber.e(e, "Failed to probe Steam cloud change number for appId=$appId")
                 null
@@ -4181,6 +2061,108 @@ class SteamService :
                 instance?.fileChangeListsDao?.getByAppId(appId)?.userFileInfo
             }
 
+        // getCloudFileList returns the full snapshot, so the newest remote timestamp falls straight out of the conflict snapshot.
+        suspend fun getNewestRemoteCloudSaveTimestamp(appId: Int): Long? =
+            fetchCloudConflictSnapshot(appId)?.newestRemoteTimestamp
+
+        data class CloudConflictSnapshot(
+            val differs: Boolean,
+            val newestRemoteTimestamp: Long?,
+        )
+
+        /** Public wrapper around the cloud-file-list RPC (Cloud.GetAppFileChangelist); always returns the FULL listing — [changeNumber] is accepted but ignored. Null if not logged on. */
+        suspend fun fetchCloudFileList(
+            appId: Int,
+            @Suppress("UNUSED_PARAMETER") changeNumber: Long = 0L,
+        ): SteamAutoCloud.CloudFileChangeList? =
+            withContext(Dispatchers.IO) {
+                val json =
+                    withWnSession { session ->
+                        withContext(Dispatchers.IO) { session.getCloudFileList(appId) }
+                    } ?: return@withContext null
+                try {
+                    SteamAutoCloud.parseCloudFileChangeList(json)
+                } catch (e: Exception) {
+                    Timber.e(e, "fetchCloudFileList failed for appId=%d", appId)
+                    null
+                }
+            }
+
+        /** Download one cloud file's bytes by its prefixed path (pathPrefix/filename). Pure read — no local file, change-number DB, or tracked-files DB write; used by cloud-save pre-capture to back up the current save without mutating local state. Null if not logged on / on failure. */
+        suspend fun downloadCloudFileBytes(
+            appId: Int,
+            prefixedPath: String,
+        ): ByteArray? =
+            withContext(Dispatchers.IO) {
+                withWnSession { session ->
+                    withContext(Dispatchers.IO) { session.downloadCloudFile(appId, prefixedPath) }
+                }
+            }
+
+        /** Single-round-trip launch-time conflict probe: a real conflict needs BOTH a change-number mismatch AND per-file content divergence (CN-only produced spurious dialogs). Fast-paths on CN match; on mismatch content-checks via [SteamAutoCloud.cloudContentDiffersFromLocal]. Returns the conflict flag + newest remote timestamp. */
+        @JvmOverloads
+        suspend fun fetchCloudConflictSnapshot(
+            appId: Int,
+            context: android.content.Context? = null,
+        ): CloudConflictSnapshot? =
+            withContext(Dispatchers.IO) {
+                val localCN = instance?.changeNumbersDao?.getByAppId(appId)?.changeNumber
+
+                // Cloud.GetAppFileChangelist — full remote file list; the parser scales proto unix-second timestamps to the millis the rest of the code expects.
+                val deadlineMs = System.currentTimeMillis() + 5_000L
+                while (System.currentTimeMillis() < deadlineMs) {
+                    val s = withWnSession { it }
+                    if (s != null && _isLoggedInFlow.value) break
+                    kotlinx.coroutines.delay(250L)
+                }
+                val wnJson =
+                    withWnSession { session ->
+                        withContext(Dispatchers.IO) { session.getCloudFileList(appId) }
+                    } ?: return@withContext null
+                try {
+                    val response = SteamAutoCloud.parseCloudFileChangeList(wnJson)
+                    val cnMismatch = localCN == null || response.currentChangeNumber != localCN
+                    val newest =
+                        response.files
+                            .filter { it.isPersisted }
+                            .mapNotNull { it.timestamp.takeIf { ts -> ts > 0L } }
+                            .maxOrNull()
+
+                    // CN match → no divergence; skip the per-file hashing. Fast path.
+                    if (!cnMismatch) {
+                        return@withContext CloudConflictSnapshot(differs = false, newestRemoteTimestamp = newest)
+                    }
+
+                    // CN mismatch — real conflict only if file content diverges; conservative (differs=true) when no Context is available to resolve local paths.
+                    val ctx = context ?: PluviaApp.instance
+                    val contentDiffers =
+                        if (ctx != null) {
+                            val accountId =
+                                userSteamId?.accountID?.toLong()
+                                    ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
+                                    ?: 0L
+                            val prefixToPath: (String) -> String = { prefix ->
+                                com.winlator.cmod.feature.stores.steam.enums.PathType
+                                    .from(prefix)
+                                    .toAbsPath(ctx, appId, accountId)
+                            }
+                            val appInfo = getAppInfoOf(appId)
+                            com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+                                .cloudContentDiffersFromLocal(response, prefixToPath, appInfo)
+                        } else {
+                            true
+                        }
+                    Timber.i(
+                        "cloud conflict snapshot via wn-steam-client: app=$appId " +
+                            "cnMismatch=$cnMismatch contentDiffers=$contentDiffers files=${response.files.size}",
+                    )
+                    CloudConflictSnapshot(differs = contentDiffers, newestRemoteTimestamp = newest)
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to parse Steam cloud conflict snapshot for appId=$appId")
+                    null
+                }
+            }
+
         suspend fun forceSyncUserFiles(
             appId: Int,
             prefixToPath: (String) -> String,
@@ -4203,16 +2185,14 @@ class SteamService :
                             val clientId = PrefManager.clientId
                             val steamInstance = instance
                             val appInfo = getAppInfoOf(appId)
-                            val steamCloud = steamInstance?._steamCloud
 
-                            if (steamInstance != null && appInfo != null && steamCloud != null) {
+                            if (steamInstance != null && appInfo != null) {
                                 val postSyncInfo =
                                     SteamAutoCloud
                                         .syncUserFiles(
                                             appInfo = appInfo,
                                             clientId = clientId,
                                             steamInstance = steamInstance,
-                                            steamCloud = steamCloud,
                                             preferredSave = preferredSave,
                                             parentScope = parentScope,
                                             prefixToPath = prefixToPath,
@@ -4229,7 +2209,7 @@ class SteamService :
                             if (attempt == maxAttempts) {
                                 Timber.e(e, "Force cloud sync failed after $maxAttempts attempts for app $appId")
                             } else {
-                                Timber.w("Force cloud sync attempt $attempt failed for app $appId, retrying...")
+                                Timber.w("Force cloud sync attempt $attempt failed for app $appId, retrying")
                                 delay(1000L * attempt)
                             }
                         }
@@ -4245,15 +2225,49 @@ class SteamService :
             appId: Int,
             configDirectory: String,
         ) = runCatching {
-            val steamUser = instance?._steamUser ?: return@runCatching
-            val userStats = instance?._steamUserStats?.getUserStats(appId, steamUser.steamID!!)?.await() ?: return@runCatching
-            val schemaArray = userStats.schema.toByteArray()
+            run {
+                val bs = com.winlator.cmod.feature.stores.steam.wnsteam
+                    .WnSteamBootstrap
+                if (bs.currentAppId() == appId && bs.numAchievements() > 0) {
+                    val list = bs.listAchievementsFull()
+                    if (list.isNotEmpty()) {
+                        cachedAchievements = list.map { a ->
+                            com.winlator.cmod.feature.stores.steam.statsgen.Achievement(
+                                name        = a.apiName,
+                                displayName = a.displayName?.let { mapOf("english" to it) },
+                                description = a.description?.let { mapOf("english" to it) },
+                                hidden      = if (a.hidden) 1 else 0,
+                                unlocked    = a.achieved,
+                                unlockTimestamp = a.unlockTimeRtime32.takeIf { it > 0 },
+                            )
+                        }
+                        cachedAchievementsAppId = appId
+                        Timber.i("user-stats schema via libsteamclient.so: ${list.size} achievements (app $appId)")
+                        return@runCatching
+                    }
+                }
+                Timber.d("libsteamclient.so achievements not ready for app $appId — falling through to wn-session CM fetch")
+            }
+
+            warmAchievementSchemaFromCache(appId)
+
+            val schemaArray: ByteArray = run {
+                val wn = withWnSession { session ->
+                    withContext(Dispatchers.IO) { session.getUserStatsSchema(appId) }
+                }
+                if (wn != null && wn.isNotEmpty()) {
+                    Timber.i("user-stats schema via wn-steam-client: ${wn.size} bytes (app $appId)")
+                    wn
+                } else {
+                    Timber.w("wn-steam-client user-stats schema unavailable for app $appId")
+                    return@runCatching
+                }
+            }
             val generator = StatsAchievementsGenerator()
             val result = generator.generateStatsAchievements(schemaArray, configDirectory)
-            cachedAchievements = result.achievements
-            cachedAchievementsAppId = appId
-
             val nameToBlockBit = result.nameToBlockBit
+            cachedAchievements = mergeAchievementUnlockState(appId, result.achievements, nameToBlockBit)
+            cachedAchievementsAppId = appId
             if (nameToBlockBit.isNotEmpty()) {
                 val mappingJson = JSONObject()
                 nameToBlockBit.forEach { (name, pair) ->
@@ -4261,10 +2275,541 @@ class SteamService :
                 }
                 File(configDirectory, "achievement_name_to_block.json").writeText(mappingJson.toString(), Charsets.UTF_8)
             }
+
+            pushAchievementSchemaToLibSteamClient(appId, result.achievements, result.stats,
+                                                   result.nameToBlockBit)
         }.onFailure { e ->
             Timber.w(e, "Failed to generate achievements for appId=$appId")
         }
 
+        fun pushAppInstalledDepotsToLibSteamClient(appId: Int) = runCatching {
+            if (appId <= 0) return@runCatching
+            val depots = resolvePreferredLaunchDepotIds(
+                appId = appId,
+                branch = resolveSelectedBetaName(appId).ifBlank { "public" },
+            )
+            if (depots.isEmpty()) {
+                Timber.w(
+                    "pushAppInstalledDepotsToLibSteamClient: no depots resolved for appId=$appId; " +
+                        "leaving previous bridge state intact",
+                )
+                return@runCatching
+            }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAppInstalledDepots(appId, depots)
+            Timber.i("Pushed ${depots.size} installed depot(s) to libsteamclient.so (app $appId)")
+        }.onFailure { e ->
+            Timber.w(e, "pushAppInstalledDepotsToLibSteamClient failed (appId=$appId)")
+        }
+
+        suspend fun pushAppDlcsToLibSteamClient(appId: Int) = runCatching {
+            if (appId <= 0) return@runCatching
+            val selectedBranch = resolveSelectedBetaName(appId).ifBlank { "public" }
+            val localBuildId = resolvePreferredLaunchBuildId(getAppInfoOf(appId), selectedBranch)
+            if (localBuildId > 0) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppBuildId(appId, localBuildId)
+                Timber.i("Pushed local buildId=$localBuildId to libsteamclient.so (app $appId)")
+            }
+            val snapshotJson = withWnSession { s ->
+                withContext(Dispatchers.IO) { s.getLibrarySnapshotJson() }
+            } ?: return@runCatching
+            val ownedApps = try {
+                JSONObject(snapshotJson).optJSONArray("owned_apps") ?: return@runCatching
+            } catch (_: Exception) { return@runCatching }
+
+            val dlcIds = mutableListOf<Int>()
+            val byId   = mutableMapOf<Int, String>()
+            var parentBuildId = 0
+            for (i in 0 until ownedApps.length()) {
+                val obj = ownedApps.optJSONObject(i) ?: continue
+                val id  = obj.optInt("id")
+                byId[id] = obj.optString("name", "")
+                if (id != appId) continue
+                parentBuildId = obj.optInt("build_id", 0)
+                val arr = obj.optJSONArray("dlc") ?: continue
+                for (k in 0 until arr.length()) dlcIds.add(arr.optInt(k))
+            }
+            if (parentBuildId > 0) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppBuildId(appId, parentBuildId)
+                Timber.i("Pushed buildId=$parentBuildId to libsteamclient.so (app $appId)")
+            }
+            if (dlcIds.isEmpty()) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppDlcs(appId, IntArray(0), emptyArray(), BooleanArray(0))
+                Timber.d("Pushed empty DLC list to libsteamclient.so (app $appId)")
+                return@runCatching
+            }
+            val ids   = IntArray(dlcIds.size)  { dlcIds[it] }
+            val names = Array(dlcIds.size) { byId[dlcIds[it]] ?: "" }
+            val avail = BooleanArray(dlcIds.size) { true }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAppDlcs(appId, ids, names, avail)
+            Timber.i("Pushed ${dlcIds.size} DLC entries to libsteamclient.so (app $appId)")
+        }.onFailure { e ->
+            Timber.w(e, "pushAppDlcsToLibSteamClient failed (appId=$appId)")
+        }
+
+        fun pushAppWorkshopItemsToLibSteamClient(appId: Int) = runCatching {
+            if (appId <= 0) return@runCatching
+            val ctx = instance?.applicationContext ?: return@runCatching
+            val ids = com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                .installedItemIds(ctx, appId)
+            if (ids.isEmpty()) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppWorkshopItems(appId, LongArray(0), emptyArray(), LongArray(0), LongArray(0))
+                return@runCatching
+            }
+            val sorted = ids.toLongArray().also { it.sort() }
+            val installDirs = Array(sorted.size) { i ->
+                com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                    .contentDir(ctx, appId, sorted[i]).absolutePath
+            }
+            val sizes = LongArray(sorted.size) { i ->
+                runCatching {
+                    val dir = com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                        .contentDir(ctx, appId, sorted[i])
+                    var total = 0L
+                    dir.walkTopDown().forEach { if (it.isFile) total += it.length() }
+                    total
+                }.getOrDefault(0L)
+            }
+            val timestamps = LongArray(sorted.size) { i ->
+                runCatching {
+                    com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                        .contentDir(ctx, appId, sorted[i]).lastModified() / 1000L
+                }.getOrDefault(0L)
+            }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAppWorkshopItems(appId, sorted, installDirs, sizes, timestamps)
+            Timber.i("Pushed ${sorted.size} workshop item(s) to libsteamclient.so (app $appId)")
+        }.onFailure { e ->
+            Timber.w(e, "pushAppWorkshopItemsToLibSteamClient failed (appId=$appId)")
+        }
+
+        suspend fun pushInventoryItemDefsToLibSteamClient(appId: Int) = runCatching {
+            if (appId <= 0) return@runCatching
+            val ctx = instance?.applicationContext ?: return@runCatching
+            val caPath = CaBundleExtractor.ensureBundle(ctx)
+            val archive = withWnSession { session ->
+                withContext(Dispatchers.IO) { session.getItemDefArchive(appId, caPath) }
+            } ?: return@runCatching
+            val trimmed = archive.trim()
+            if (trimmed.isEmpty() || trimmed == "null") return@runCatching
+            val arr = try {
+                org.json.JSONArray(trimmed)
+            } catch (_: org.json.JSONException) {
+                try { org.json.JSONArray("[$trimmed]") } catch (_: Exception) { return@runCatching }
+            }
+            val defIds = mutableListOf<Int>()
+            val counts = mutableListOf<Int>()
+            val keys = mutableListOf<String>()
+            val vals = mutableListOf<String>()
+            for (i in 0 until arr.length()) {
+                val o = arr.optJSONObject(i) ?: continue
+                val defId = o.opt("itemdefid")?.toString()?.toIntOrNull() ?: continue
+                if (defId <= 0) continue
+                val names = o.keys()
+                var n = 0
+                while (names.hasNext()) {
+                    val k = names.next()
+                    if (k == "itemdefid") continue
+                    val v = o.opt(k)?.toString().orEmpty()
+                    keys.add(k)
+                    vals.add(v)
+                    n++
+                }
+                defIds.add(defId)
+                counts.add(n)
+            }
+            if (defIds.isEmpty()) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setInventoryItemDefs(appId, IntArray(0), IntArray(0), emptyArray(), emptyArray())
+                return@runCatching
+            }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient.setInventoryItemDefs(
+                appId,
+                defIds.toIntArray(),
+                counts.toIntArray(),
+                keys.toTypedArray(),
+                vals.toTypedArray(),
+            )
+            Timber.i("Pushed ${defIds.size} inventory item defs to libsteamclient.so (app $appId)")
+        }.onFailure { e ->
+            Timber.w(e, "pushInventoryItemDefsToLibSteamClient failed (appId=$appId)")
+        }
+
+        suspend fun pushCloudStateToLibSteamClient(appId: Int) = runCatching {
+            if (appId <= 0) return@runCatching
+            val response = fetchCloudFileList(appId) ?: run {
+                Timber.d("pushCloudStateToLibSteamClient: no cloud list (app $appId, not logged on?)")
+                return@runCatching
+            }
+            val live = response.files.filter { it.isPersisted }
+            val names      = Array(live.size) { i -> live[i].filename }
+            val sizes      = IntArray(live.size) { i -> live[i].rawFileSize.coerceAtMost(Int.MAX_VALUE.toLong()).toInt() }
+            val timestamps = LongArray(live.size) { i -> live[i].timestamp / 1000L }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAppId(appId)
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setCloudFiles(names, sizes, timestamps)
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setCloudEnabledForApp(true)
+            Timber.i("Pushed ${live.size} cloud file(s) to libsteamclient.so (app $appId, " +
+                "changeNumber=${response.currentChangeNumber})")
+
+            val quota = withWnSession { s ->
+                withContext(Dispatchers.IO) { s.getCloudUserQuota() }
+            }
+            if (quota != null && quota.size == 2 && quota[0] >= 0 && quota[1] >= 0) {
+                val total = quota[0]
+                val used  = quota[1]
+                val avail = (total - used).coerceAtLeast(0L)
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setCloudQuota(total, avail)
+                Timber.i("Pushed cloud quota to libsteamclient.so: total=$total used=$used avail=$avail")
+            } else {
+                Timber.d("Cloud quota fetch returned nothing (not logged on or transport error)")
+            }
+        }.onFailure { e ->
+            Timber.w(e, "pushCloudStateToLibSteamClient failed (appId=$appId)")
+        }
+
+        @JvmStatic
+        fun prepareLibSteamClientForLaunchBlocking(appId: Int) {
+            runBlocking { prepareLibSteamClientForLaunch(appId) }
+        }
+        suspend fun prepareLibSteamClientForLaunch(appId: Int) {
+            if (appId <= 0) return
+            startOverlayPollLoop()
+            val selectedBranch = resolveSelectedBetaName(appId)
+            val baseStatePrimed =
+                runCatching { primeLibSteamClientLaunchState(appId, selectedBranch) }
+                    .getOrElse { e ->
+                        Timber.w(e, "prepareLibSteamClientForLaunch: base-state prime failed for app $appId")
+                        false
+                    }
+            Timber.i(
+                "prepareLibSteamClientForLaunch: app=$appId beta='${selectedBranch.ifEmpty { "public" }}' " +
+                    "baseStatePrimed=$baseStatePrimed",
+            )
+            val deadlineMs = System.currentTimeMillis() + 15_000L
+            while (System.currentTimeMillis() < deadlineMs) {
+                val session = withWnSession { it }
+                if (session != null && _isLoggedInFlow.value) break
+                kotlinx.coroutines.delay(500L)
+            }
+            kotlinx.coroutines.coroutineScope {
+                val ticketJob = async {
+                    runCatching { refreshEncryptedAppTicketForLibSteamClient(appId) }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: encrypted-app-ticket failed for app $appId")
+                            false
+                        }
+                }
+                val ownerJob = async {
+                    runCatching { prefetchOwnershipTicketForLibSteamClient(appId) }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: ownership-ticket failed for app $appId")
+                            false
+                        }
+                }
+                val cloudJob = async {
+                    runCatching { pushCloudStateToLibSteamClient(appId); true }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: cloud state push failed for app $appId")
+                            false
+                        }
+                }
+                val dlcJob = async {
+                    runCatching { pushAppDlcsToLibSteamClient(appId); true }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: DLC push failed for app $appId")
+                            false
+                        }
+                }
+                val depotsJob = async {
+                    runCatching { pushAppInstalledDepotsToLibSteamClient(appId); true }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: depots push failed for app $appId")
+                            false
+                        }
+                }
+                val workshopJob = async {
+                    runCatching { pushAppWorkshopItemsToLibSteamClient(appId); true }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: workshop push failed for app $appId")
+                            false
+                        }
+                }
+                val inventoryJob = async {
+                    runCatching { pushInventoryItemDefsToLibSteamClient(appId); true }
+                        .getOrElse { e ->
+                            Timber.w(e, "prepareLibSteamClientForLaunch: inventory push failed for app $appId")
+                            false
+                        }
+                }
+                val ticketOk = ticketJob.await()
+                val ownerOk = ownerJob.await()
+                val cloudOk = cloudJob.await()
+                val dlcOk = dlcJob.await()
+                val depotsOk = depotsJob.await()
+                val workshopOk = workshopJob.await()
+                val inventoryOk = inventoryJob.await()
+                Timber.i(
+                    "prepareLibSteamClientForLaunch: app=$appId " +
+                        "baseStatePrimed=$baseStatePrimed " +
+                        "encrypted-app-ticket=$ticketOk ownership-ticket=$ownerOk " +
+                        "cloud=$cloudOk dlc=$dlcOk depots=$depotsOk " +
+                        "workshop=$workshopOk inventory=$inventoryOk",
+                )
+            }
+        }
+
+        @JvmStatic
+        fun resolveSelectedBetaName(appId: Int): String {
+            if (appId <= 0) return ""
+            val svc = instance ?: return ""
+            return runCatching {
+                for (sc in ContainerManager(svc).loadShortcuts()) {
+                    val scAppId = sc.getExtra("app_id").toIntOrNull() ?: continue
+                    if (scAppId != appId) continue
+                    val branch = sc.getExtra("selectedBranch").trim()
+                    if (branch.isNotEmpty()) return@runCatching branch
+                }
+                ""
+            }.getOrElse { "" }
+        }
+
+        suspend fun refreshEncryptedAppTicketForLibSteamClient(appId: Int): Boolean {
+            if (appId <= 0) return false
+            val instance = SteamService.instance ?: return false
+            val bytes = runCatching { instance.getEncryptedAppTicket(appId) }
+                .getOrElse { e ->
+                    Timber.w(e, "encrypted-app-ticket: getEncryptedAppTicket threw for app $appId")
+                    null
+                }
+            if (bytes == null || bytes.isEmpty()) {
+                Timber.d("encrypted-app-ticket: unavailable for app $appId (cache miss + " +
+                    "wn-session returned null/empty)")
+                return false
+            }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setEncryptedAppTicket(appId, bytes, eresult = 1)
+            Timber.i("Pushed encrypted app ticket to libsteamclient.so: app=$appId bytes=${bytes.size}")
+            return true
+        }
+
+        suspend fun prefetchOwnershipTicketForLibSteamClient(appId: Int): Boolean {
+            if (appId <= 0) return false
+            val dlcAppIds = getInstalledDlcDepotsOf(appId).orEmpty().toIntArray()
+            val ok = withContext(Dispatchers.IO) {
+                val deferred = kotlinx.coroutines.CompletableDeferred<Boolean>()
+                val s = withWnSession { it } ?: run {
+                    deferred.complete(false); null
+                }
+                if (s != null) {
+                    s.prepareApp(appId, dlcAppIds,
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnPrepareAppCallback { result, err ->
+                            if (!result) {
+                                Timber.d("prepareApp(app=$appId) → not ok: ${err ?: "no error"}")
+                            }
+                            deferred.complete(result)
+                        })
+                }
+                deferred.await()
+            }
+            if (ok) {
+                Timber.i("Prefetched ownership ticket for app=$appId " +
+                    "(+${dlcAppIds.size} DLC) — libsteamclient.so cache primed")
+            }
+            return ok
+        }
+
+        suspend fun refreshCloudQuotaForLibSteamClient() = runCatching {
+            val quota = withWnSession { s ->
+                withContext(Dispatchers.IO) { s.getCloudUserQuota() }
+            } ?: return@runCatching
+            if (quota.size != 2 || quota[0] < 0 || quota[1] < 0) return@runCatching
+            val total = quota[0]
+            val used  = quota[1]
+            val avail = (total - used).coerceAtLeast(0L)
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setCloudQuota(total, avail)
+            Timber.i("Refreshed cloud quota: total=$total used=$used avail=$avail")
+        }.onFailure { e ->
+            Timber.w(e, "refreshCloudQuotaForLibSteamClient failed")
+        }
+
+        internal fun warmAchievementSchemaFromCache(appId: Int): Boolean {
+            if (appId <= 0) return false
+            val ctx = instance?.applicationContext ?: return false
+            val file = File(ctx.filesDir, "wn_lsteam_schemas/$appId.json")
+            if (!file.exists()) return false
+            val root = try { JSONObject(file.readText(Charsets.UTF_8)) }
+                       catch (_: Exception) { return false }
+            if (root.optInt("v") != 1) return false
+            val achievements = mutableListOf<com.winlator.cmod.feature.stores.steam.statsgen.Achievement>()
+            val achArr = root.optJSONArray("achievements") ?: JSONArray()
+            for (i in 0 until achArr.length()) {
+                val o = achArr.optJSONObject(i) ?: continue
+                val name = o.optString("name", "")
+                if (name.isEmpty()) continue
+                val displayName = o.optJSONObject("displayName")?.let { mo ->
+                    val m = mutableMapOf<String, String>()
+                    mo.keys().forEach { k -> m[k] = mo.optString(k, "") }
+                    m.toMap()
+                }
+                val description = o.optJSONObject("description")?.let { mo ->
+                    val m = mutableMapOf<String, String>()
+                    mo.keys().forEach { k -> m[k] = mo.optString(k, "") }
+                    m.toMap()
+                }
+                achievements.add(
+                    com.winlator.cmod.feature.stores.steam.statsgen.Achievement(
+                        name = name,
+                        displayName = displayName,
+                        description = description,
+                        hidden = o.optInt("hidden", 0),
+                        icon = o.optString("icon", "").takeIf { it.isNotEmpty() },
+                        unlocked = if (o.has("unlocked")) o.optBoolean("unlocked") else null,
+                        unlockTimestamp = if (o.has("unlockTimestamp")) o.optInt("unlockTimestamp") else null,
+                    ),
+                )
+            }
+            val stats = mutableListOf<com.winlator.cmod.feature.stores.steam.statsgen.Stat>()
+            val statArr = root.optJSONArray("stats") ?: JSONArray()
+            for (i in 0 until statArr.length()) {
+                val o = statArr.optJSONObject(i) ?: continue
+                stats.add(
+                    com.winlator.cmod.feature.stores.steam.statsgen.Stat(
+                        id      = o.optString("id", ""),
+                        name    = o.optString("name", ""),
+                        type    = o.optString("type", "1"),
+                        default = o.optString("default", "0"),
+                    ),
+                )
+            }
+            if (achievements.isEmpty() && stats.isEmpty()) return false
+            val nameToBlockBit = mutableMapOf<String, Pair<Int, Int>>()
+            val bitsArr = root.optJSONArray("nameToBlockBit")
+            if (bitsArr != null) {
+                for (i in 0 until bitsArr.length()) {
+                    val o = bitsArr.optJSONObject(i) ?: continue
+                    val name = o.optString("name", "")
+                    if (name.isEmpty()) continue
+                    nameToBlockBit[name] = Pair(
+                        o.optInt("block", -1),
+                        o.optInt("bit", 0),
+                    )
+                }
+            }
+            pushAchievementSchemaToLibSteamClient(appId, achievements, stats, nameToBlockBit)
+            Timber.i("Warmed schema cache for app $appId: ${achievements.size} ach, " +
+                "${stats.size} stats, ${nameToBlockBit.size} bit-mappings " +
+                "(cached ts=${root.optLong("ts")})")
+            return true
+        }
+
+        /** Fetch the app's Steam Inventory item definitions and write `steam_settings/items.json` + `default_items.json` into [configDirectory]. Best-effort — no-ops when there's no inventory, not logged on, or the fetch fails. */
+        suspend fun generateInventoryItems(
+            appId: Int,
+            configDirectory: String,
+        ) = runCatching {
+            // The GetItemDefArchive HTTPS GET needs the same PEM trust bundle CaBundleExtractor provides for the CM session.
+            val ctx = instance?.applicationContext ?: return@runCatching
+            val caPath = CaBundleExtractor.ensureBundle(ctx)
+            val archive =
+                withWnSession { session ->
+                    withContext(Dispatchers.IO) { session.getItemDefArchive(appId, caPath) }
+                }
+            if (archive == null) {
+                Timber.i("Inventory item-def archive unavailable for app $appId")
+                return@runCatching
+            }
+            val count = InventoryItemsGenerator.generate(archive, configDirectory)
+            Timber.i("Inventory items generated for app $appId: $count definition(s)")
+        }.onFailure { e ->
+            Timber.w(e, "Failed to generate inventory items for appId=$appId")
+        }
+
+        /** Fetch the account's subscribed Steam Workshop items for [appId] as a JSON array string; brings up a CM session if needed. null = not logged on / transport failure, "[]" = no subscriptions. */
+        suspend fun getSubscribedWorkshopItems(appId: Int): String? =
+            withWnSession { session ->
+                withContext(Dispatchers.IO) { session.getSubscribedWorkshopItems(appId) }
+            }
+
+        // Published-file-ids with an install in flight — guards two concurrent installs of the same item from wiping each other's content dir.
+        private val workshopInstallsInFlight =
+            java.util.concurrent.ConcurrentHashMap.newKeySet<Long>()
+
+        /** Download and stage one subscribed Workshop item for [appId] into the staging area; the meta marker is written LAST so a partial download is never mistaken for installed. Returns true on success. BLOCKING — runs on Dispatchers.IO. */
+        suspend fun installWorkshopItem(
+            appId: Int,
+            publishedFileId: Long,
+            manifestId: Long,
+            title: String,
+            fileSizeBytes: Long,
+            timeUpdated: Long,
+            previewUrl: String,
+        ): Boolean =
+            withContext(Dispatchers.IO) {
+                if (manifestId == 0L) {
+                    Timber.w("Workshop item $publishedFileId has no content manifest — cannot install")
+                    return@withContext false
+                }
+                if (!workshopInstallsInFlight.add(publishedFileId)) {
+                    Timber.w("Workshop item $publishedFileId — install already in progress")
+                    return@withContext false
+                }
+                try {
+                    val ctx = instance?.applicationContext ?: return@withContext false
+                    val caPath = CaBundleExtractor.ensureBundle(ctx)
+                    val content = WorkshopModsGenerator.contentDir(ctx, appId, publishedFileId)
+                    val meta = WorkshopModsGenerator.metaFile(ctx, appId, publishedFileId)
+                    val preview = WorkshopModsGenerator.previewFile(ctx, appId, publishedFileId)
+                    // A (re)install starts clean: drop any stale marker / content / preview.
+                    meta.delete()
+                    preview.delete()
+                    content.deleteRecursively()
+                    content.mkdirs()
+
+                    val bytes =
+                        withWnSession { session ->
+                            session.downloadWorkshopItem(appId, manifestId, content.absolutePath, caPath)
+                        } ?: -1L
+                    if (bytes < 0L) {
+                        Timber.w("Workshop content download failed for item $publishedFileId (app $appId)")
+                        content.deleteRecursively()
+                        return@withContext false
+                    }
+                    // Drop the .DepotDownloader resume folder so it isn't exposed as mod content.
+                    File(content, ".DepotDownloader").deleteRecursively()
+
+                    // Preview image — best-effort; a missing preview must not fail the install.
+                    if (previewUrl.isNotBlank()) {
+                        runCatching { downloadWorkshopPreview(previewUrl, preview) }
+                            .onFailure { Timber.d(it, "Workshop preview download skipped for $publishedFileId") }
+                    }
+
+                    // Meta marker written LAST — its presence means "fully installed".
+                    meta.writeText(
+                        org.json.JSONObject()
+                            .put("title", title)
+                            .put("fileSize", fileSizeBytes)
+                            .put("timeUpdated", timeUpdated)
+                            .put("manifestId", manifestId)
+                            .toString(),
+                        Charsets.UTF_8,
+                    )
+                    Timber.i("Workshop item $publishedFileId installed for app $appId ($bytes bytes)")
+                    true
+                } finally {
+                    workshopInstallsInFlight.remove(publishedFileId)
+                }
+            }
+
         fun getGseSaveDirs(appId: Int): List<File> {
             val context = instance?.applicationContext ?: return emptyList()
             val imageFs = ImageFs.find(context)
@@ -4341,29 +2886,6 @@ class SteamService :
             }
         }
 
-        private fun findSteamSettingsDir(
-            context: Context,
-            appId: Int,
-        ): String? {
-            val appDirPath = getAppDirPath(appId)
-            val appDirSettings = File(appDirPath, "steam_settings")
-            if (appDirSettings.isDirectory) {
-                return appDirSettings.absolutePath
-            }
-
-            val container = ContainerUtils.getContainer(context, "STEAM_$appId") ?: return null
-            val coldclientSettings =
-                File(
-                    container.rootDir,
-                    ".wine/drive_c/Program Files (x86)/Steam/steam_settings",
-                )
-            if (coldclientSettings.isDirectory) {
-                return coldclientSettings.absolutePath
-            }
-
-            return null
-        }
-
         suspend fun storeAchievementUnlocks(
             appId: Int,
             configDirectory: String,
@@ -4371,11 +2893,20 @@ class SteamService :
             gseStatsDir: File,
         ): Result<Unit> =
             runCatching {
-                val steamUser = instance!!._steamUser!!
-                val userStats = instance?._steamUserStats!!.getUserStats(appId, steamUser.steamID!!).await()
-                if (userStats.result != EResult.OK) {
-                    throw IllegalStateException("getUserStats failed: ${userStats.result}")
+                val mySteamId = userSteamId
+                    ?: throw IllegalStateException("storeAchievementUnlocks: no SteamID")
+
+                // Fetch the app's user-stats (schema + crc + achievement blocks).
+                val statsJson = withWnSession { session -> session.getUserStatsFull(appId) }
+                    ?: throw IllegalStateException("getUserStats failed: no response")
+                val statsObj = JSONObject(statsJson)
+                val eresult = statsObj.optInt("eresult", 2)
+                if (eresult != EResult.OK.code()) {
+                    throw IllegalStateException("getUserStats failed: eresult=$eresult")
                 }
+                val crcStats = statsObj.optInt("crcStats")
+                val schemaBytes = hexToBytes(statsObj.optString("schema"))
+                val achievementBlocks = statsObj.optJSONArray("achievementBlocks")
 
                 val allStats = mutableMapOf<Int, Int>()
 
@@ -4394,13 +2925,14 @@ class SteamService :
                         }
                     }
 
-                    for (block in userStats.achievementBlocks ?: emptyList()) {
-                        val blockId = (block.achievementId as? Number)?.toInt() ?: continue
+                    for (i in 0 until (achievementBlocks?.length() ?: 0)) {
+                        val block = achievementBlocks!!.getJSONObject(i)
+                        val blockId = block.optInt("achievementId")
+                        val unlockTimes = block.optJSONArray("unlockTimes")
                         var bitmask = 0
-                        val unlockTimes = block.unlockTime ?: emptyList()
-                        for (i in unlockTimes.indices) {
-                            val t = unlockTimes[i]
-                            if ((t as? Number)?.toLong() != 0L) bitmask = bitmask or (1 shl i)
+                        for (j in 0 until (unlockTimes?.length() ?: 0)) {
+                            // unlock_time is a uint32 (can exceed Int range) — read as Long; non-zero means the bit is unlocked.
+                            if (unlockTimes!!.getLong(j) != 0L) bitmask = bitmask or (1 shl j)
                         }
                         allStats[blockId] = bitmask
                     }
@@ -4415,7 +2947,7 @@ class SteamService :
                 if (gseStatsDir.isDirectory) {
                     val statNameToId = mutableMapOf<String, Int>()
                     try {
-                        val parsedSchema = VdfParser().binaryLoads(userStats.schema.toByteArray())
+                        val parsedSchema = VdfParser().binaryLoads(schemaBytes)
                         for ((_, appData) in parsedSchema) {
                             if (appData !is Map<*, *>) continue
                             val statInfo = (appData as Map<String, Any>)["stats"] as? Map<String, Any> ?: continue
@@ -4444,53 +2976,17 @@ class SteamService :
                                 Timber.d("Read GSE stat: ${statFile.name} -> statId=$statId, value=$value")
                             }
                         }
-                    }
-                }
-
-                if (allStats.isEmpty()) {
-                    Timber.d("No stats or achievements to store for appId=$appId")
-                    return@runCatching
-                }
-
-                val statsToStore = allStats.map { (id, value) -> Stats(statId = id, statValue = value) }
-                val mySteamId = steamUser.steamID!!
-                Timber.d("storeUserStats: appId=$appId, crcStats=${userStats.crcStats}, stats=$statsToStore")
-                sendStoreUserStats(appId, statsToStore, mySteamId, userStats.crcStats)
-            }
-
-        private fun sendStoreUserStats(
-            appId: Int,
-            stats: List<Stats>,
-            steamId: SteamID,
-            crcStats: Int,
-        ) {
-            val client = instance?.steamClient ?: return
-            runCatching {
-                val msg: ClientMsgProtobuf<SteammessagesClientserverUserstats.CMsgClientStoreUserStats2.Builder> =
-                    ClientMsgProtobuf(
-                        SteammessagesClientserverUserstats.CMsgClientStoreUserStats2::class.java,
-                        EMsg.ClientStoreUserStats2,
-                    )
-                msg.sourceJobID = client.getNextJobID()
-                msg.protoHeader.setRoutingAppid(appId)
-                msg.body.setGameId(appId.toLong())
-                msg.body.setSettorSteamId(steamId.convertToUInt64())
-                msg.body.setSetteeSteamId(steamId.convertToUInt64())
-                msg.body.setCrcStats(crcStats)
-                stats.forEach { stat ->
-                    msg.body.addStats(
-                        SteammessagesClientserverUserstats.CMsgClientStoreUserStats2.Stats
-                            .newBuilder()
-                            .setStatId(stat.statId)
-                            .setStatValue(stat.statValue)
-                            .build(),
-                    )
+                    }
+                }
+
+                if (allStats.isEmpty()) {
+                    Timber.d("No stats or achievements to store for appId=$appId")
+                    return@runCatching
                 }
-                client.send(msg)
-            }.onFailure { e ->
-                Timber.e(e, "Failed to send storeUserStats for appId=$appId")
+
+                Timber.d("storeUserStats: appId=$appId, crcStats=$crcStats, stats=$allStats")
+                sendStoreUserStats(appId, allStats, mySteamId.convertToUInt64(), crcStats)
             }
-        }
 
         data class CloudSyncOutcome(
             val success: Boolean,
@@ -4505,6 +3001,11 @@ class SteamService :
         ): CloudSyncOutcome =
             withContext(Dispatchers.IO) {
                 async {
+                    // In-Wine Steam owns cloud saves during a hand-off; syncing here too would race it as a second writer.
+                    if (isBionicHandoffActive()) {
+                        Timber.i("closeApp: Bionic hand-off active for app %d — deferring exit cloud sync to in-Wine Steam", appId)
+                        return@async CloudSyncOutcome(true, "Steam Launcher handles cloud saves directly.")
+                    }
                     if (isOffline || !isConnected) {
                         return@async CloudSyncOutcome(false, "Steam is offline.")
                     }
@@ -4532,44 +3033,64 @@ class SteamService :
                                 val clientId = PrefManager.clientId
                                 val steamInstance = instance
                                 val appInfo = getAppInfoOf(appId)
-                                val steamCloud = steamInstance?._steamCloud
 
-                                if (steamInstance != null && appInfo != null && steamCloud != null) {
-                                    progressWrapper("Checking Local Saves...", 0f)
+                                if (steamInstance != null && appInfo != null) {
+                                    progressWrapper("Checking Local Saves", 0f)
+                                    // SaveLocation.None: unchanged content never uploads, and both-sides-changed surfaces as a Conflict instead of overwriting the newer cloud copy.
                                     val postSyncInfo =
                                         SteamAutoCloud
                                             .syncUserFiles(
                                                 appInfo = appInfo,
                                                 clientId = clientId,
                                                 steamInstance = steamInstance,
-                                                steamCloud = steamCloud,
+                                                preferredSave = SaveLocation.None,
                                                 parentScope = this@async,
                                                 prefixToPath = prefixToPath,
                                                 onProgress = progressWrapper,
                                             ).await()
 
                                     val syncResult = postSyncInfo?.syncResult ?: SyncResult.UnknownFail
-                                    steamCloud.signalAppExitSyncDone(
-                                        appId = appId,
-                                        clientId = clientId,
-                                        uploadsCompleted = postSyncInfo?.uploadsCompleted == true,
-                                        uploadsRequired = postSyncInfo?.uploadsRequired == false,
-                                    )
+                                    // Signal exit-sync-done via the C++ WN-Steam-Client.
+                                    withWnSession { session ->
+                                        withContext(Dispatchers.IO) {
+                                            session.signalAppExitSyncDone(
+                                                appId = appId,
+                                                clientId = clientId,
+                                                uploadsCompleted = postSyncInfo?.uploadsCompleted == true,
+                                                uploadsRequired = postSyncInfo?.uploadsRequired == true,
+                                            )
+                                        }
+                                    }
 
                                     if (syncResult == SyncResult.Success || syncResult == SyncResult.UpToDate) {
                                         return@async CloudSyncOutcome(true)
                                     }
 
-                                    lastErrorMessage = "Steam cloud save sync failed."
+                                    // Discriminate the failure message by SyncResult so callers (SteamExitCloudSync.isRetryable, the UI retry loop) can tell terminal failures (Conflict) from transient ones (UpdateFail/DownloadFail).
+                                    lastErrorMessage =
+                                        when (syncResult) {
+                                            SyncResult.Conflict ->
+                                                "Steam cloud save sync conflict — relaunch the game to resolve."
+                                            SyncResult.PendingOperations ->
+                                                "Steam cloud sync pending — another device may still be uploading."
+                                            SyncResult.InProgress ->
+                                                "Steam cloud sync already in progress."
+                                            SyncResult.UpdateFail ->
+                                                "Steam cloud save upload failed."
+                                            SyncResult.DownloadFail ->
+                                                "Steam cloud save download failed."
+                                            else -> "Steam cloud save sync failed."
+                                        }
                                 } else {
                                     lastErrorMessage = "Steam cloud service is unavailable."
                                 }
                             } catch (e: AsyncJobFailedException) {
+                                // e.message is often an EResult enum name (e.g. "Pending", "RemoteFileConflict"); SteamExitCloudSync's retry classifier matches substrings like "conflict"/"pending", so those short-circuit the retry loop without a SyncResult plumb-through here.
                                 lastErrorMessage = e.message ?: "Steam cloud save sync failed."
                                 if (attempt == maxAttempts) {
                                     Timber.e(e, "Close app sync failed after $maxAttempts attempts for app $appId")
                                 } else {
-                                    Timber.w("Close app sync attempt $attempt failed for app $appId, retrying...")
+                                    Timber.w("Close app sync attempt $attempt failed for app $appId, retrying")
                                     delay(1000L * attempt)
                                 }
                             }
@@ -4610,6 +3131,7 @@ class SteamService :
                 var completionSent = false
                 val accountId =
                     userSteamId?.accountID?.toLong()
+                        ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }?.let { it and 0xFFFFFFFFL }
                         ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
                         ?: 0L
                 val prefixToPath: (String) -> String = { prefix ->
@@ -4639,11 +3161,7 @@ class SteamService :
                 }
             }
 
-        /**
-         * Sync cloud saves for backup/restore purposes without closing the app.
-         * @param preferredAction "download" or "upload"
-         * @return true if sync succeeded
-         */
+        /** Sync cloud saves for backup/restore without closing the app; [preferredAction] is "download" or "upload". Returns true on success. */
         suspend fun syncCloudSavesForBackup(
             context: android.content.Context,
             appId: Int,
@@ -4653,6 +3171,7 @@ class SteamService :
                 try {
                     val accountId =
                         userSteamId?.accountID?.toLong()
+                            ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }?.let { it and 0xFFFFFFFFL }
                             ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
                             ?: 0L
                     val prefixToPath: (String) -> String = { prefix ->
@@ -4662,10 +3181,9 @@ class SteamService :
                     }
                     val steamInst = instance
                     val appInfo = getAppInfoOf(appId)
-                    val steamCloud = steamInst?._steamCloud
                     val clientId = PrefManager.clientId
 
-                    if (steamInst == null || appInfo == null || steamCloud == null) {
+                    if (steamInst == null || appInfo == null) {
                         return@withContext false
                     }
 
@@ -4674,7 +3192,6 @@ class SteamService :
                             appInfo = appInfo,
                             clientId = clientId,
                             steamInstance = steamInst,
-                            steamCloud = steamCloud,
                             prefixToPath = prefixToPath,
                             onProgress = { _, _ -> },
                         ).await()
@@ -4693,9 +3210,18 @@ class SteamService :
             context: android.content.Context,
             appId: Int,
             callback: CloudSyncCallback,
+            containerHint: Container? = null,
         ) {
+            runCatching {
+                val target = containerHint
+                    ?: com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+                        .getUsableContainerOrNull(context, appId.toString())
+                target?.let { com.winlator.cmod.runtime.container.ContainerManager(context).activateContainer(it) }
+            }.onFailure { Timber.w(it, "syncCloudOnExit: container activation failed for app=%d", appId) }
+
             val accountId =
                 userSteamId?.accountID?.toLong()
+                    ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }?.let { it and 0xFFFFFFFFL }
                     ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
                     ?: 0L
             val prefixToPath: (String) -> String = { prefix ->
@@ -4724,21 +3250,7 @@ class SteamService :
             }
         }
 
-        data class FileChanges(
-            val filesDeleted: List<UserFileInfo>,
-            val filesModified: List<UserFileInfo>,
-            val filesCreated: List<UserFileInfo>,
-        )
-
-        /**
-         * loginusers.vdf writer for the OAuth-style refresh-token flow introduced in 2024.
-         *
-         * @param steamId64    64-bit SteamID of the logged-in user
-         * @param account      AccountName (same as you passed to logOn / poll result)
-         * @param refreshToken Long-lived token you get from AuthSession / QR / credentials
-         * @param accessToken  Optional – short-lived access token, Steam ignores it if absent
-         * @param personaName  What the client shows in the drop-down; defaults to AccountName
-         */
+        /** loginusers.vdf writer for the OAuth-style refresh-token flow. accessToken is optional (Steam ignores it if absent); personaName defaults to the AccountName. */
         internal fun getLoginUsersVdfOauth(
             steamId64: String,
             account: String,
@@ -4769,309 +3281,329 @@ class SteamService :
             return vdf
         }
 
-        private fun login(
-            username: String,
-            accessToken: String? = null,
-            refreshToken: String? = null,
-            password: String? = null,
-            rememberSession: Boolean = false,
-            twoFactorAuth: String? = null,
-            emailAuth: String? = null,
-            clientId: Long? = null,
-        ) {
-            isLoggingOut = false
-            val steamUser = instance!!._steamUser!!
-
-            // Sensitive info, only print in DEBUG build.
-//            if (BuildConfig.DEBUG) {
-//                Timber.d(
-//                    """
-//                    Login Information:
-//                     Username: $username
-//                     AccessToken: $accessToken
-//                     RefreshToken: $refreshToken
-//                     Password: $password
-//                     Remember Session: $rememberSession
-//                     TwoFactorAuth: $twoFactorAuth
-//                     EmailAuth: $emailAuth
-//                    """.trimIndent(),
-//                )
-//            }
-
-            PrefManager.username = username
-
-            if ((password != null && rememberSession) || refreshToken != null) {
-                if (accessToken != null) {
-                    PrefManager.accessToken = accessToken
-                }
-
-                if (refreshToken != null) {
-                    PrefManager.refreshToken = refreshToken
-                }
-
-                if (clientId != null) {
-                    PrefManager.clientId = clientId
-                }
-            }
-
-            val event = SteamEvent.LogonStarted(username)
-            PluviaApp.events.emit(event)
-
-            steamUser.logOn(
-                LogOnDetails(
-                    username = SteamUtils.removeSpecialChars(username).trim(),
-                    password = password?.let { SteamUtils.removeSpecialChars(it).trim() },
-                    shouldRememberPassword = rememberSession,
-                    twoFactorCode = twoFactorAuth,
-                    authCode = emailAuth,
-                    accessToken = refreshToken,
-                    loginID = SteamUtils.getUniqueDeviceId(instance!!),
-                    machineName = SteamUtils.getMachineName(instance!!),
-                    chatMode = ChatMode.NEW_STEAM_CHAT,
-                ),
-            )
-        }
-
         suspend fun startLoginWithCredentials(
             username: String,
             password: String,
             rememberSession: Boolean,
-            authenticator: IAuthenticator,
+            authenticator: WnAuthenticator,
         ) = withContext(Dispatchers.IO) {
+            val svc = instance ?: run {
+                PluviaApp.events.emit(
+                    SteamEvent.LogonEnded(username, LoginResult.Failed,
+                        "SteamService not initialized"),
+                )
+                return@withContext
+            }
+
+            Timber.i("Logging in via credentials (wn-steam-client).")
+            svc._loginResult = LoginResult.InProgress
+            PluviaApp.events.emit(SteamEvent.LogonStarted(username))
+
+            teardownPriorWnSession()
+
+            val session = bringUpWnSession(svc) ?: run {
+                PluviaApp.events.emit(
+                    SteamEvent.LogonEnded(username, LoginResult.Failed,
+                        "Failed to connect to Steam CM"),
+                )
+                return@withContext
+            }
+            wnAuthSession = session
+            var keepSessionAlive = false
             try {
-                Timber.i("Logging in via credentials.")
-                instance!!._loginResult = LoginResult.InProgress
-                Timber.i("Set login result to InProgress.")
-                instance!!.steamClient?.let { steamClient ->
-                    val authDetails =
-                        AuthSessionDetails().apply {
-                            this.username = username.trim()
-                            this.password = password.trim()
-                            this.persistentSession = rememberSession
-                            this.authenticator = authenticator
-                            this.deviceFriendlyName = SteamUtils.getMachineName(instance!!)
-                            this.clientOSType = EOSType.WinUnknown
-                        }
+                val result = suspendCancellableCoroutine<WnAuthResult> { cont ->
+                    session.startLoginWithCredentials(
+                        username = username.trim(),
+                        password = password.trim(),
+                        persistentSession = rememberSession,
+                        authenticator = authenticator,
+                        callback = WnAuthCallback { r ->
+                            if (cont.isActive) cont.resume(r)
+                        },
+                    )
+                    cont.invokeOnCancellation { session.cancelLogin() }
+                }
 
-                    val event = SteamEvent.LogonStarted(username)
-                    PluviaApp.events.emit(event)
-
-                    // Outer loop: retries the entire auth session when the connection
-                    // drops (e.g. TryAnotherCM) during 2FA polling.
-                    var loginComplete = false
-                    while (isActive && !loginComplete) {
-                        val currentClient = instance!!.steamClient ?: break
-                        val authSession = currentClient.authentication.beginAuthSessionViaCredentials(authDetails).await()
-
-                        Timber.d("Waiting for authentication result (handles 2FA). Interval: ${authSession.pollingInterval}s")
-
-                        // pollingWaitForResult handles the full 2FA flow:
-                        // - Checks allowedConfirmations for the required guard type
-                        // - Calls IAuthenticator callbacks (acceptDeviceConfirmation, getDeviceCode, getEmailCode)
-                        // - Submits the guard code to Steam via sendSteamGuardCode
-                        // - Polls until authentication completes
-                        var pollResult: AuthPollResult? = null
-                        var disconnected = false
-                        while (isActive && pollResult == null && !disconnected) {
-                            try {
-                                pollResult = authSession.pollingWaitForResult().await()
-                            } catch (e: AuthenticationException) {
-                                if (e.result == EResult.Expired || e.result == EResult.FileNotFound) {
-                                    Timber.w("Auth session expired during 2FA wait, retrying...")
-                                    delay(authSession.pollingInterval.toLong() * 1000L)
-                                    continue
-                                }
-                                throw e
-                            } catch (e: java.util.concurrent.CancellationException) {
-                                // Connection dropped (TryAnotherCM) — all pending futures
-                                // are cancelled. Wait for reconnection and restart the
-                                // auth session so the user doesn't see a spurious failure.
-                                if (!isActive) throw CancellationException("Coroutine cancelled")
-                                Timber.w("Auth poll cancelled (likely TryAnotherCM), waiting for reconnection...")
-                                disconnected = true
-                            }
-                        }
+                if (!result.success || result.refreshToken.isEmpty()) {
+                    Timber.e("WnSteam auth failed: %s", result.errorMessage)
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .reportLogonFailure(
+                            eresult = result.errorCode.takeIf { it != 0 } ?: 2 /* Fail */,
+                            stillRetrying = false,
+                        )
+                    recordLogonFailure(result.errorCode.takeIf { it != 0 } ?: 2)
+                    PluviaApp.events.emit(
+                        SteamEvent.LogonEnded(username, LoginResult.Failed,
+                            if (result.errorMessage.isNotEmpty()) result.errorMessage
+                            else "auth failed (eresult=${result.errorCode})"),
+                    )
+                    return@withContext
+                }
 
-                        if (disconnected) {
-                            // Wait for the service to reconnect to a new CM server
-                            Timber.i("Waiting for Steam reconnection before retrying credential auth...")
-                            try {
-                                withTimeout(30_000L) {
-                                    isConnectedFlow.first { it }
-                                }
-                            } catch (e: kotlinx.coroutines.TimeoutCancellationException) {
-                                throw Exception("Timed out waiting for Steam reconnection")
-                            }
-                            Timber.i("Reconnected, restarting credential auth session...")
-                            delay(500L) // brief settle time after reconnect
-                            continue
-                        }
+                Timber.i("WnSteam auth OK for %s", result.accountName)
 
-                        if (pollResult == null) {
-                            throw CancellationException("Credential auth polling cancelled")
-                        }
+                // Persist the acquired tokens so a later cold start auto-logons.
+                persistLoginTokens(
+                    username = result.accountName,
+                    accessToken = result.accessToken,
+                    refreshToken = result.refreshToken,
+                )
 
-                        Timber.i("Authentication successful for ${pollResult.accountName}")
+                // Promote the auth session to the long-lived logon session. DO NOT insert a suspension point (withContext/delay/suspendCancellable) across the next four lines: cancellation mid-promotion leaves wnSession set while keepSessionAlive is false, so finally would close the live session (use-after-free).
+                installWnLogonObserver(session)
+                wnSession = session
+                wnAuthSession = null
+                keepSessionAlive = true
 
-                        if (pollResult.accountName.isEmpty() && pollResult.refreshToken.isEmpty()) {
-                            throw Exception("No account name or refresh token received.")
-                        }
+                if (!session.logonWithRefreshToken(result.refreshToken, result.accountName, result.steamId)) {
+                    Timber.w("WnSteam logon_with_refresh_token returned false (channel not Connected?)")
+                }
 
-                        login(
-                            clientId = authSession.clientID,
-                            username = pollResult.accountName,
-                            accessToken = pollResult.accessToken,
-                            refreshToken = pollResult.refreshToken,
-                            rememberSession = rememberSession,
+                // Watchdog: if the CM logon never reaches LoggedOn, surface a failure so the login UI doesn't hang on the spinner.
+                svc.scope.launch {
+                    var waited = 0
+                    while (waited < 35 && session.state() != 3) { delay(1000); waited++ }
+                    if (session.state() != 3 && wnSession === session) {
+                        Timber.w("WnSteam CM logon never reached LoggedOn")
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                            .reportLogonFailure(eresult = 6, stillRetrying = true)
+                        PluviaApp.events.emit(
+                            SteamEvent.LogonEnded(result.accountName, LoginResult.Failed,
+                                "Steam logon timed out"),
                         )
-                        loginComplete = true
                     }
-                } ?: run {
-                    Timber.e("Could not logon: Failed to connect to Steam")
-
-                    val event = SteamEvent.LogonEnded(username, LoginResult.Failed, "No connection to Steam")
-                    PluviaApp.events.emit(event)
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Login failed")
-
-                val message =
-                    when (e) {
-                        is CancellationException -> "Unknown cancellation"
-                        is AuthenticationException -> e.result?.name ?: e.message
-                        else -> e.message ?: e.javaClass.name
-                    }
-
-                val event = SteamEvent.LogonEnded(username, LoginResult.Failed, message)
-                PluviaApp.events.emit(event)
+                val message = when (e) {
+                    is CancellationException -> "Unknown cancellation"
+                    else -> e.message ?: e.javaClass.name
+                }
+                PluviaApp.events.emit(SteamEvent.LogonEnded(username, LoginResult.Failed, message))
+            } finally {
+                if (!keepSessionAlive) {
+                    try { session.disconnect() } catch (_: Throwable) {}
+                    try { session.close() } catch (_: Throwable) {}
+                    if (wnAuthSession === session) wnAuthSession = null
+                }
             }
         }
 
-        suspend fun startLoginWithQr() =
-            withContext(Dispatchers.IO) {
+        /** Creates a fresh [WnSteamSession], connects, and waits for the encrypted channel to reach Connected (state 2). Caller owns the returned session (disconnect/close); null on failure. */
+        /** Run [block] with a logged-on session: reuse the global [wnSession] if logged on (state 3), else bring up a temporary one, log on with the stored refresh token, run [block], and tear it down. Null if no logged-on session could be obtained. */
+        internal suspend fun <T> withWnSession(
+            block: suspend (WnSteamSession) -> T,
+        ): T? {
+            if (instance?.suspendedForBionic == true) {
+                Timber.i("withWnSession: suspended for Bionic hand-off — no CM session")
+                return null
+            }
+            wnSession?.takeIf { it.state() == 3 }?.let { return block(it) }
+            val gateUntil = logonGateUntilMs
+            if (gateUntil > 0L) {
+                val now = System.currentTimeMillis()
+                if (now < gateUntil) {
+                    Timber.w(
+                        "withWnSession: logon gated for ${(gateUntil - now) / 1000}s " +
+                            "more (last EResult=$lastLogonFailureEresult)",
+                    )
+                    return null
+                }
+            }
+            return wnSessionBringUpMutex.withLock {
+                wnSession?.takeIf { it.state() == 3 }?.let { return@withLock block(it) }
+                val svc = instance ?: return@withLock null
+                val refreshTok = PrefManager.refreshToken
+                if (refreshTok.isBlank()) {
+                    Timber.w("withWnSession: no stored refresh token")
+                    return@withLock null
+                }
+                run {
+                    val gu = logonGateUntilMs
+                    if (gu > 0L && System.currentTimeMillis() < gu) {
+                        Timber.w(
+                            "withWnSession (post-lock): logon gated, EResult=$lastLogonFailureEresult",
+                        )
+                        return@withLock null
+                    }
+                }
+                val brought = bringUpWnSession(svc) ?: run {
+                    Timber.w("withWnSession: could not connect a session")
+                    return@withLock null
+                }
+                var promoted = false
                 try {
-                    Timber.i("Logging in via QR.")
-
-                    instance!!.steamClient?.let { steamClient ->
-                        isWaitingForQRAuth = true
-
-                        val authDetails =
-                            AuthSessionDetails().apply {
-                                this.deviceFriendlyName = SteamUtils.getMachineName(instance!!)
-                                this.clientOSType = EOSType.WinUnknown
-                                this.persistentSession = true
-                            }
-
-                        val authSession = steamClient.authentication.beginAuthSessionViaQR(authDetails).await()
-
-                        // Steam will periodically refresh the challenge url, this callback allows you to draw a new qr code.
-                        authSession.challengeUrlChanged = instance
-
-                        val qrEvent = SteamEvent.QrChallengeReceived(authSession.challengeUrl)
-                        PluviaApp.events.emit(qrEvent)
-
-                        Timber.d("PollingInterval: ${authSession.pollingInterval.toLong()}")
-
-                        var authPollResult: AuthPollResult? = null
+                    if (!brought.logonWithRefreshToken(
+                            refreshTok,
+                            PrefManager.username,
+                            PrefManager.steamUserSteamId64,
+                        )
+                    ) {
+                        Timber.w("withWnSession: logon request failed")
+                        recordLogonFailure(2)
+                        return@withLock null
+                    }
+                    // 12s logon wait — enough for a slow CM round-trip but bounded so game-launch isn't blocked 30s on a session that won't recover.
+                    var wait = 0
+                    while (brought.state() != 3 && wait < 24) {
+                        delay(500L)
+                        wait++
+                    }
+                    if (brought.state() != 3) {
+                        Timber.w("withWnSession: session never reached LoggedOn after 12s")
+                        if (lastLogonFailureEresult == 0) recordLogonFailure(16)
+                        return@withLock null
+                    }
+                    installWnLogonObserver(brought)
+                    wnSession = brought
+                    promoted = true
+                    isConnected = true
+                    _isLoggedInFlow.value = true
+                    recordLogonSuccess()
+                    if (!wnLoggedOnHandled) {
+                        wnLoggedOnHandled = true
+                        instance?.onWnLoggedOn(brought)
+                    }
+                    block(brought)
+                } finally {
+                    if (!promoted) {
+                        runCatching { brought.disconnect() }
+                        runCatching { brought.close() }
+                    }
+                }
+            }
+        }
 
-                        // FIX: Poll via raw protobuf RPC instead of JavaSteam's pollAuthSessionStatus()
-                        // so we can read hadRemoteInteraction — true when QR is scanned but not yet
-                        // approved. This lets the UI show the 2FA screen while the user confirms.
-                        val authService =
-                            steamClient
-                                .getHandler<SteamUnifiedMessages>()!!
-                                .createService<Authentication>()
-                        var qrScannedEmitted = false
+        suspend fun startLoginWithQr() = withContext(Dispatchers.IO) {
+            val svc = instance ?: run {
+                PluviaApp.events.emit(
+                    SteamEvent.QrAuthEnded(success = false,
+                        message = "SteamService not initialized"),
+                )
+                return@withContext
+            }
 
-                        while (isWaitingForQRAuth && authPollResult == null) {
-                            try {
-                                val request =
-                                    CAuthentication_PollAuthSessionStatus_Request
-                                        .newBuilder()
-                                        .apply {
-                                            clientId = authSession.clientID
-                                            requestId =
-                                                com.google.protobuf.ByteString
-                                                    .copyFrom(authSession.requestID)
-                                        }.build()
-
-                                val result = authService.pollAuthSessionStatus(request).await()
-
-                                if (result.result != EResult.OK) {
-                                    throw AuthenticationException("Failed to poll status", result.result)
-                                }
+            Timber.i("Logging in via QR (wn-steam-client).")
+            isWaitingForQRAuth = true
 
-                                val response = result.body
+            teardownPriorWnSession()
 
-                                // Replicate handlePollAuthSessionStatusResponse behaviour
-                                if (response.newClientId != 0L) {
-                                    authSession.clientID = response.newClientId
-                                }
-                                if (response.newChallengeUrl.isNotEmpty()) {
-                                    val urlEvent = SteamEvent.QrChallengeReceived(response.newChallengeUrl)
-                                    PluviaApp.events.emit(urlEvent)
-                                }
+            val session = bringUpWnSession(svc) ?: run {
+                isWaitingForQRAuth = false
+                PluviaApp.events.emit(
+                    SteamEvent.QrAuthEnded(success = false,
+                        message = "Failed to connect to Steam"),
+                )
+                return@withContext
+            }
+            wnAuthSession = session
+            var keepSessionAlive = false
+            try {
+                var qrScannedEmitted = false
+                Log.i("WnSteamQr", "startLoginWithQr: session ready")
+                val result = suspendCancellableCoroutine<WnAuthResult> { cont ->
+                    session.startLoginWithQr(
+                        qrCallback = WnQrCallback { url ->
+                            Log.i("WnSteamQr", "qrCallback: challenge url len=${url.length}")
+                            PluviaApp.events.emit(SteamEvent.QrChallengeReceived(url))
+                        },
+                        resultCallback = WnAuthCallback { r ->
+                            Log.i(
+                                "WnSteamQr",
+                                "resultCallback: success=${r.success} errorCode=${r.errorCode} " +
+                                    "error='${r.errorMessage}' refreshLen=${r.refreshToken.length} " +
+                                    "account='${r.accountName}' remote=${r.hadRemoteInteraction} " +
+                                    "agreementLen=${r.agreementSessionUrl.length}",
+                            )
+                            if (!qrScannedEmitted && r.hadRemoteInteraction) {
+                                qrScannedEmitted = true
+                                Log.i("WnSteamQr", "resultCallback: emitting QrCodeScanned")
+                                PluviaApp.events.emit(SteamEvent.QrCodeScanned)
+                            }
+                            val isQrApprovalUpdate =
+                                !r.success &&
+                                    r.hadRemoteInteraction &&
+                                    r.refreshToken.isEmpty() &&
+                                    r.errorMessage.isEmpty()
+                            if (isQrApprovalUpdate) {
+                                Log.i("WnSteamQr", "resultCallback: intermediate approval update")
+                                return@WnAuthCallback
+                            }
+                            Log.i("WnSteamQr", "resultCallback: resuming QR coroutine")
+                            if (cont.isActive) cont.resume(r)
+                        },
+                    )
+                    cont.invokeOnCancellation { session.cancelLogin() }
+                }
 
-                                // Detect scan before approval
-                                if (!qrScannedEmitted && response.hadRemoteInteraction) {
-                                    qrScannedEmitted = true
-                                    PluviaApp.events.emit(SteamEvent.QrCodeScanned)
-                                }
+                isWaitingForQRAuth = false
+                Log.i(
+                    "WnSteamQr",
+                    "QR coroutine completed success=${result.success} refreshLen=${result.refreshToken.length} " +
+                        "account='${result.accountName}' steamId=${result.steamId}",
+                )
+                PluviaApp.events.emit(SteamEvent.QrAuthEnded(result.success))
 
-                                // Check for completion
-                                if (response.refreshToken.isNotEmpty()) {
-                                    authPollResult = AuthPollResult(response)
-                                } else {
-                                    delay(authSession.pollingInterval.toLong() * 1000L)
-                                }
-                            } catch (e: Exception) {
-                                Timber.e(e, "Poll auth session status error")
-                                throw e
-                            }
-                        }
+                if (!result.success || result.refreshToken.isEmpty()) {
+                    Timber.e("WnSteam QR auth failed: %s", result.errorMessage)
+                    return@withContext
+                }
 
-                        isWaitingForQRAuth = false
+                // Persist the acquired tokens so a later cold start auto-logons.
+                persistLoginTokens(
+                    username = result.accountName,
+                    accessToken = result.accessToken,
+                    refreshToken = result.refreshToken,
+                )
 
-                        val event = SteamEvent.QrAuthEnded(authPollResult != null)
-                        PluviaApp.events.emit(event)
+                // Promote the QR session to the long-lived logon session. DO NOT insert a suspension point across these four lines — see the note in startLoginWithCredentials.
+                installWnLogonObserver(session)
+                wnSession = session
+                wnAuthSession = null
+                keepSessionAlive = true
 
-                        // there is a chance qr got cancelled and there is no authPollResult
-                        if (authPollResult == null) {
-                            Timber.e("Got no auth poll result")
-                            throw Exception("Got no auth poll result")
-                        }
+                if (!session.logonWithRefreshToken(result.refreshToken, result.accountName, result.steamId)) {
+                    Timber.w("WnSteam QR logon_with_refresh_token returned false")
+                    Log.w("WnSteamQr", "logonWithRefreshToken returned false")
+                } else {
+                    Log.i("WnSteamQr", "logonWithRefreshToken queued")
+                }
 
-                        login(
-                            clientId = authSession.clientID,
-                            username = authPollResult.accountName,
-                            accessToken = authPollResult.accessToken,
-                            refreshToken = authPollResult.refreshToken,
+                // Watchdog: surface a failure if the CM logon hangs.
+                svc.scope.launch {
+                    var waited = 0
+                    while (waited < 35 && session.state() != 3) { delay(1000); waited++ }
+                    if (session.state() != 3 && wnSession === session) {
+                        Timber.w("WnSteam QR CM logon never reached LoggedOn")
+                        PluviaApp.events.emit(
+                            SteamEvent.LogonEnded(result.accountName, LoginResult.Failed,
+                                "Steam logon timed out"),
                         )
-                    } ?: run {
-                        Timber.e("Could not start QR logon: Failed to connect to Steam")
-
-                        val event = SteamEvent.QrAuthEnded(success = false, message = "No connection to Steam")
-                        PluviaApp.events.emit(event)
                     }
-                } catch (e: Exception) {
-                    Timber.e(e, "QR failed")
-
-                    val message =
-                        when (e) {
-                            is CancellationException -> "QR Session timed out"
-                            is AuthenticationException -> e.result?.name ?: e.message
-                            else -> e.message ?: e.javaClass.name
-                        }
-
-                    val event = SteamEvent.QrAuthEnded(success = false, message = message)
-                    PluviaApp.events.emit(event)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "QR failed")
+                isWaitingForQRAuth = false
+                val message = when (e) {
+                    is CancellationException -> "QR Session timed out"
+                    else -> e.message ?: e.javaClass.name
+                }
+                PluviaApp.events.emit(SteamEvent.QrAuthEnded(success = false, message = message))
+            } finally {
+                if (!keepSessionAlive) {
+                    try { session.disconnect() } catch (_: Throwable) {}
+                    try { session.close() } catch (_: Throwable) {}
+                    if (wnAuthSession === session) wnAuthSession = null
                 }
             }
+        }
 
         fun stopLoginWithQr() {
             Timber.i("Stopping QR polling")
-
             isWaitingForQRAuth = false
+            wnAuthSession?.let {
+                try { it.cancelLogin() } catch (_: Throwable) {}
+            }
         }
 
         fun start(context: Context) {
@@ -5083,6 +3615,28 @@ class SteamService :
             }
         }
 
+        /** App-lifecycle hooks from PluviaApp (last activity stops → onAppBackgrounded, first starts → onAppForegrounded) — let the Steam session sleep while the app is minimized and idle. See [handleAppBackgrounded]. */
+        fun onAppForegrounded() {
+            val service = instance
+            if (service == null) {
+                // Only activity creation starts the service, so without this a stopped session stays dead for the whole process.
+                if (PrefManager.refreshToken.isNotBlank()) {
+                    runCatching { PluviaApp.instance.applicationContext?.let { start(it) } }
+                }
+                return
+            }
+            service.handleAppForegrounded()
+        }
+
+        fun onAppBackgrounded() {
+            instance?.handleAppBackgrounded()
+        }
+
+        @JvmStatic
+        fun ensureHealthySession() {
+            instance?.ensureHealthySessionImpl()
+        }
+
         fun stop() {
             instance?.let { steamInstance ->
                 if (!isStopping) {
@@ -5092,6 +3646,7 @@ class SteamService :
                     }.onFailure { Timber.w(it, "Failed to remove SteamService foreground state during shutdown") }
                     runCatching {
                         steamInstance.notificationHelper.cancel()
+                        steamInstance.notificationHelper.cancelBackgroundRunning()
                     }.onFailure { Timber.w(it, "Failed to cancel SteamService notification during shutdown") }
                     steamInstance.stopSelf()
                 }
@@ -5109,26 +3664,63 @@ class SteamService :
             isLoggingOut = true
             _isLoggedInFlow.value = false
             PrefManager.clearAuthTokens()
+            instance?.let { svc ->
+                svc.scope.launch(Dispatchers.IO) {
+                    runCatching { svc.encryptedAppTicketDao.deleteAll() }
+                        .onFailure { Timber.w(it, "Failed to clear encrypted-app-ticket cache on logout") }
+                }
+            }
+            runCatching {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppId(0)
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setLoggedOn(false)
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setSteamId(0L)
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setPersonaName("")
+            }
+
+            wnLibraryMirrorJob?.cancel()
+            wnLibraryMirrorJob = null
+            wnLibrary?.stopObserving()
+            wnLibrary = null
+
+            // Tear down the logon session after observers are quiesced so delayed library refreshes can't touch a closing native handle.
+            wnSession?.let { s ->
+                try { s.disconnect() } catch (_: Throwable) {}
+                try { s.close()      } catch (_: Throwable) {}
+            }
+            wnSession = null
+
+            try {
+                com.winlator.cmod.feature.stores.steam.wnsteam
+                    .WnSteamBootstrap.stop()
+            } catch (_: Throwable) {}
+            instance?.bionicHandoffReleaseImpl()
 
             // Cancel background jobs immediately
             instance?.picsGetProductInfoJob?.cancel()
             instance?.picsChangesCheckerJob?.cancel()
             instance?.friendCheckerJob?.cancel()
+            instance?.messagePollerJob?.cancel()
 
             // Emit event synchronously so the UI can react in the same frame
             PluviaApp.events.emit(SteamEvent.LoggedOut(username))
 
-            // Tell Steam we're leaving (best-effort, service will stop in onLoggedOff)
+            // Session already disconnected above; just clear the local database (best-effort).
             instance?.let { svc ->
                 svc.scope.launch(Dispatchers.Default) {
                     try {
                         clearDatabase()
-                        svc._steamUser?.logOff()
                     } catch (e: Exception) {
                         Timber.e(e, "Error during async logOff")
                     }
                 }
             }
+            stopOverlayPollLoop()
+            // No logged-off callback stops the service any more — do it here.
+            stop()
         }
 
         fun requestSync() {
@@ -5139,62 +3731,51 @@ class SteamService :
             }
         }
 
-        private fun clearUserData() {
-            PrefManager.clearAuthTokens()
+        @Volatile private var overlayPollJob: kotlinx.coroutines.Job? = null
+
+        fun startOverlayPollLoop() {
+            if (overlayPollJob?.isActive == true) return
+            val svc = instance ?: return
+            overlayPollJob = svc.scope.launch(Dispatchers.IO) {
+                while (kotlinx.coroutines.currentCoroutineContext().isActive) {
+                    runCatching {
+                        val req = com.winlator.cmod.feature.stores.steam.wnsteam
+                            .WnLibSteamClient.pollOverlayRequest() ?: return@runCatching
+                        dispatchOverlayRequest(req)
+                    }.onFailure { e ->
+                        Timber.w(e, "overlayPollJob: dispatch failed")
+                    }
+                    kotlinx.coroutines.delay(250)
+                }
+            }
+        }
 
-            clearDatabase()
+        fun stopOverlayPollLoop() {
+            overlayPollJob?.cancel()
+            overlayPollJob = null
         }
 
         fun clearDatabase() {
             with(instance!!) {
                 scope.launch {
                     db.withTransaction {
-                        // We NO LONGER delete apps, change numbers, or file lists here.
-                        // This preserves the installed games and shortcuts.
-                        // appDao.deleteAll()
-                        // We keep app metadata, but cloud sync caches are cleared separately.
+                        // Don't delete apps / change numbers / file lists here — preserve installed games + shortcuts; cloud-sync caches are cleared separately.
 
                         licenseDao.deleteAll()
                         encryptedAppTicketDao.deleteAll()
                         downloadingAppInfoDao.deleteAll()
+                        db.steamAppDao().deleteAll()
                     }
                 }
             }
         }
 
-        private fun clearCloudSyncCaches() {
-            instance?.let { svc ->
-                svc.scope.launch {
-                    svc.db.withTransaction {
-                        svc.changeNumbersDao.deleteAll()
-                        svc.fileChangeListsDao.deleteAll()
-                    }
-                    Timber.i("Cleared cloud sync caches (change numbers + file lists)")
-                }
-            }
-        }
-
-        private fun performLogOffDuties() {
-            val username = PrefManager.username
-
-            clearUserData()
-            clearCloudSyncCaches()
-
-            val event = SteamEvent.LoggedOut(username)
-            PluviaApp.events.emit(event)
-
-            // Cancel previous continuous jobs or else they will continue to run even after logout
-            instance?.picsGetProductInfoJob?.cancel()
-            instance?.picsChangesCheckerJob?.cancel()
-            instance?.friendCheckerJob?.cancel()
-        }
-
         suspend fun getOwnedGames(friendID: Long): List<OwnedGames> =
             withContext(Dispatchers.IO) {
                 instance?._unifiedFriends!!.getOwnedGames(friendID)
             }
 
-        // Add helper to detect if any downloads or cloud sync are in progress
+        // True if any download or cloud sync is in progress.
         fun hasActiveOperations(): Boolean {
             val anySyncInProgress = syncInProgressApps.values.any { it.get() }
             return anySyncInProgress || downloadJobs.values.any { it.getProgress() < 1f }
@@ -5206,113 +3787,133 @@ class SteamService :
         suspend fun isUpdatePending(
             appId: Int,
             branch: String = "public",
-        ): Boolean =
-            withContext(Dispatchers.IO) {
-                // Don't try if there's no internet
-                if (!isConnected) return@withContext false
+        ): Boolean = checkForAppUpdate(appId, branch).hasUpdate
 
-                val steamApps = instance?._steamApps ?: return@withContext false
+        suspend fun checkForAppUpdate(
+            appId: Int,
+            branch: String = "public",
+        ): SteamUpdateInfo =
+            withContext(Dispatchers.IO) {
+                fun SteamUpdateInfo.logged(): SteamUpdateInfo {
+                    Timber.i(
+                        "Steam update check result: appId=$appId branch=$branch " +
+                            "hasUpdate=$hasUpdate downloadSize=$downloadSize depotIds=$depotIds message=$message",
+                    )
+                    return this
+                }
 
-                // ── 1. Fetch the latest app header from Steam (PICS).
-                val pics =
-                    steamApps
-                        .picsGetProductInfo(
-                            apps = listOf(PICSRequest(id = appId)),
-                            packages = emptyList(),
-                        ).await()
+                Timber.i("Steam update check started: appId=$appId branch=$branch")
+                if (!isConnected || !isLoggedIn) {
+                    return@withContext SteamUpdateInfo(message = "Steam is not connected").logged()
+                }
+                if (!isAppInstalled(appId)) {
+                    return@withContext SteamUpdateInfo(message = "Game is not installed").logged()
+                }
 
-                val remoteAppInfo =
-                    pics.results
-                        .firstOrNull()
-                        ?.apps
-                        ?.values
-                        ?.firstOrNull()
-                        ?: return@withContext false // nothing returned ⇒ treat as up-to-date
+                val remoteSteamApp = fetchLatestSteamAppInfo(appId)
+                    ?: return@withContext SteamUpdateInfo(message = "Could not fetch Steam metadata").logged()
+                persistLatestSteamAppInfo(appId, remoteSteamApp)
 
-                val remoteSteamApp = remoteAppInfo.keyValues.generateSteamApp()
-                val localSteamApp = getAppInfoOf(appId) ?: return@withContext true // not cached yet
+                val appDirPath = getAppDirPath(appId)
+                val selectedDepots =
+                    getSelectedDownloadDepots(
+                        appId = appId,
+                        userSelectedDlcAppIds = resolveInstalledDlcIdsForUpdateOrVerify(appId),
+                        preferredLanguage = PrefManager.containerLanguage,
+                        branch = branch,
+                    )
+                if (selectedDepots.isEmpty()) {
+                    return@withContext SteamUpdateInfo(message = "No installed depots to update").logged()
+                }
+
+                val installedManifestIds = readInstalledDepotManifestIds(appDirPath)
+                val cachedManifestFiles: Set<String> =
+                    File(appDirPath, ".DepotDownloader").list()?.toHashSet() ?: emptySet()
+                // Resolve manifests once per depot; the filter below picks which need updating and the size calc reuses these.
+                val depotManifests: Map<Int, Pair<DepotInfo, ManifestInfo>> =
+                    selectedDepots.mapNotNull { (depotId, depot) ->
+                        val manifest = resolveDepotManifestInfo(depot, branch) ?: return@mapNotNull null
+                        depotId to (depot to manifest)
+                    }.toMap()
+                val updateDepots =
+                    depotManifests.filter { (depotId, depotAndManifest) ->
+                        val manifest = depotAndManifest.second
+                        val installedManifestId = installedManifestIds[depotId]
+                        if (installedManifestId != null) {
+                            installedManifestId != manifest.gid
+                        } else {
+                            "${depotId}_${manifest.gid}.manifest" !in cachedManifestFiles
+                        }
+                    }
 
-                // ── 2. Compare manifest IDs of the depots we actually install.
-                getDownloadableDepots(appId).keys.any { depotId ->
-                    val remoteManifest = remoteSteamApp.depots[depotId]?.manifests?.get(branch)
-                    val localManifest = localSteamApp.depots[depotId]?.manifests?.get(branch)
-                    // If remote manifest is null, skip this depot (hack for Castle Crashers)
-                    if (remoteManifest == null) return@any false
-                    remoteManifest?.gid != localManifest?.gid
+                if (updateDepots.isEmpty()) {
+                    SteamUpdateInfo(hasUpdate = false).logged()
+                } else {
+                    SteamUpdateInfo(
+                        hasUpdate = true,
+                        downloadSize =
+                            updateDepots.values
+                                .sumOf { (_, manifest) -> manifestDownloadBytes(manifest) }
+                                .coerceAtLeast(0L),
+                        depotIds = updateDepots.keys.sorted(),
+                    ).logged()
                 }
             }
 
+        /** Transitional bridge: converts a [KeyValue] tree into the nested Map [WnKeyValue] consumes. */
+
+        internal val picsRefreshedAppsThisSession =
+            java.util.Collections.newSetFromMap(java.util.concurrent.ConcurrentHashMap<Int, Boolean>())
+
         suspend fun checkDlcOwnershipViaPICSBatch(dlcAppIds: Set<Int>): Set<Int> {
             if (dlcAppIds.isEmpty()) return emptySet()
 
-            val steamApps = instance?._steamApps ?: return emptySet()
-
             try {
-                // Step 1: Get access tokens for all DLC appIds at once
-                val tokens =
-                    steamApps
-                        .picsGetAccessTokens(
-                            appIds = dlcAppIds.toList(),
-                            packageIds = emptyList(),
-                        ).await()
-
-                Timber.d("Access tokens response:")
-                Timber.d("  - Granted tokens: ${tokens.appTokens.keys}")
-                Timber.d("  - Denied tokens: ${tokens.appTokensDenied}")
-
-                // Step 2: Filter to only appIds that have tokens (we own them)
-                val ownedAppIds =
-                    tokens.appTokens.keys
-                        .filter { it in dlcAppIds }
-                        .toSet()
-
-                Timber.d("Owned appIds (from tokens): $ownedAppIds")
-
-                if (ownedAppIds.isEmpty()) {
+                // Step 1: PICS access tokens — a granted token ⇒ candidate ownership.
+                val tokJson =
+                    withWnSession { session ->
+                        withContext(Dispatchers.IO) {
+                            session.getPicsAccessTokens(dlcAppIds.toList(), emptyList())
+                        }
+                    } ?: return emptySet()
+
+                val tokenMap = HashMap<Int, Long>()
+                JSONObject(tokJson).optJSONObject("appTokens")?.let { at ->
+                    for (k in at.keys()) {
+                        val id = k.toIntOrNull() ?: continue
+                        if (id in dlcAppIds) {
+                            tokenMap[id] = at.getString(k).toLongOrNull() ?: 0L
+                        }
+                    }
+                }
+                Timber.d("DLC ownership: ${tokenMap.size} candidate(s) from access tokens")
+                if (tokenMap.isEmpty()) {
                     Timber.w("No owned DLCs found via access tokens")
                     return emptySet()
                 }
 
-                // Step 3: Create PICSRequests for all owned appIds
-                val picsRequests =
-                    ownedAppIds
-                        .map { appId ->
-                            val token = tokens.appTokens[appId] ?: return@map null
-                            PICSRequest(id = appId, accessToken = token)
-                        }.filterNotNull()
-
-                Timber.d("Created ${picsRequests.size} PICS requests")
-
-                if (picsRequests.isEmpty()) return emptySet()
-
-                // Step 4: Query PICS for all apps at once (batch them)
-                // Note: Steam has limits, so you might need to chunk if > 100 apps
-                val chunkSize = 100
+                // Step 2: confirm via PICS product info — an app that returns a product-info entry is owned/accessible.
                 val allOwnedAppIds = mutableSetOf<Int>()
-
-                picsRequests.chunked(chunkSize).forEach { chunk ->
-                    Timber.d("Querying PICS chunk with ${chunk.size} apps")
-                    val callback =
-                        steamApps
-                            .picsGetProductInfo(
-                                apps = chunk,
-                                packages = emptyList(),
-                            ).await()
-
-                    // Collect all appIds that returned results
-                    callback.results.forEach { picsCallback ->
-                        val returnedAppIds = picsCallback.apps.keys
-                        Timber.d("  PICS result: ${returnedAppIds.size} apps returned")
-                        allOwnedAppIds.addAll(picsCallback.apps.keys)
+                tokenMap.keys.toList().chunked(100).forEach { chunk ->
+                    val infoJson =
+                        withWnSession { session ->
+                            withContext(Dispatchers.IO) {
+                                session.getPicsAppProductInfo(chunk, chunk.map { tokenMap[it] ?: 0L })
+                            }
+                        } ?: return@forEach
+                    val arr = JSONArray(infoJson)
+                    for (i in 0 until arr.length()) {
+                        allOwnedAppIds.add(arr.getJSONObject(i).optInt("appid"))
                     }
                 }
 
-                Timber.i("Final owned DLC appIds: $allOwnedAppIds")
-                Timber.i("Total owned: ${allOwnedAppIds.size} out of ${dlcAppIds.size} checked")
-
+                Timber.i(
+                    "Final owned DLC appIds (wn): $allOwnedAppIds " +
+                        "(${allOwnedAppIds.size} of ${dlcAppIds.size} checked)",
+                )
                 return allOwnedAppIds
             } catch (e: Exception) {
-                Timber.e(e, "Failed to check DLC ownership via PICS batch for ${dlcAppIds.size} appIds")
+                Timber.e(e, "checkDlcOwnershipViaPICSBatch (wn) failed for ${dlcAppIds.size} appIds")
                 return emptySet()
             }
         }
@@ -5321,24 +3922,68 @@ class SteamService :
     private val coordinatorDispatcher =
         object : DownloadCoordinator.Dispatcher {
             override fun startQueued(record: DownloadRecord) {
-                val appId = record.storeGameId.toIntOrNull() ?: return
-                // Drop any stale queued/paused DownloadInfo from the in-memory map BEFORE
-                // calling downloadApp(). Otherwise SteamService.downloadApp() finds the
-                // inactive entry, calls removeDownloadJob() (which fires the legacy
-                // checkQueue() and an extra notify event), and only then proceeds to build
-                // a fresh DownloadInfo. Removing here directly avoids that duplicate path.
+                val appId = record.storeGameId.toIntOrNull()
+                if (appId == null) {
+                    runBlocking {
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_STEAM,
+                            record.storeGameId,
+                            DownloadRecord.STATUS_FAILED,
+                            "Invalid Steam app id '${record.storeGameId}'",
+                        )
+                    }
+                    return
+                }
+                // No AppInfo yet (pre-login dispatch): requeue; the post-logon tick retries it.
+                if (getAppInfoOf(appId) == null) {
+                    Timber.w("startQueued: no AppInfo yet for appId=$appId — requeueing until Steam data is ready")
+                    runBlocking {
+                        DownloadCoordinator.requeue(DownloadRecord.STORE_STEAM, record.storeGameId)
+                    }
+                    return
+                }
+                // Drop any stale queued/paused DownloadInfo BEFORE downloadApp(), else it finds the inactive entry and calls removeDownloadJob() (firing the legacy checkQueue() + an extra notify) before building a fresh one.
                 downloadJobs.remove(appId)
-                // CRITICAL: pass record.selectedDlcs as the authoritative DLC list. The
-                // legacy no-arg downloadApp(appId) reconstructs DLCs from a fragile chain
-                // (DownloadingAppInfo -> snapshot inference -> installed). Snapshot inference
-                // only sees DLCs that already had bytes downloaded, so DLCs the user selected
-                // but never started would silently disappear and the game would be marked
-                // COMPLETE after only downloading a partial scope.
-                val dlcAppIdsHint =
+                // selectedDlcs carries authoritative DLC app IDs for installs; for updates it carries the changed depot IDs from checkForAppUpdate() so queued updates keep the narrowed scope.
+                val persistedIds =
                     record.selectedDlcs
                         .split(',')
                         .mapNotNull { it.trim().toIntOrNull() }
-                downloadApp(appId, dlcAppIdsHint)
+                val started =
+                    if (record.taskType == DownloadRecord.TASK_UPDATE) {
+                        downloadAppForUpdate(appId, persistedIds)
+                    } else if (record.taskType == DownloadRecord.TASK_VERIFY) {
+                        downloadAppForVerify(appId)
+                    } else {
+                        downloadApp(appId, persistedIds)
+                    }
+                if (started == null) {
+                    // Mark FAILED so the slot frees and Retry stays functional.
+                    Timber.e("startQueued: downloadApp returned null for appId=$appId (task=${record.taskType}) — marking record FAILED")
+                    runBlocking {
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_STEAM,
+                            record.storeGameId,
+                            DownloadRecord.STATUS_FAILED,
+                            "Could not start download — retry after Steam finishes loading",
+                        )
+                    }
+                } else if (started.getStatusFlow().value == DownloadPhase.COMPLETE) {
+                    // No downloader runs, so release the slot here; keyed on COMPLETE because a queued job is also inactive.
+                    Timber.i("startQueued: appId=$appId resolved as already complete — releasing coordinator slot")
+                    runBlocking {
+                        DownloadCoordinator.notifyFinished(
+                            DownloadRecord.STORE_STEAM,
+                            record.storeGameId,
+                            DownloadRecord.STATUS_COMPLETE,
+                        )
+                    }
+                }
+            }
+
+            override fun isTransferActive(record: DownloadRecord): Boolean {
+                val appId = record.storeGameId.toIntOrNull() ?: return false
+                return downloadJobs[appId]?.isActive() == true
             }
 
             override fun pauseRunning(record: DownloadRecord) {
@@ -5360,13 +4005,38 @@ class SteamService :
             override fun cancelRunning(record: DownloadRecord) {
                 val appId = record.storeGameId.toIntOrNull() ?: return
                 val info = downloadJobs[appId]
+                val statusAtCancel = info?.getStatusFlow()?.value
                 if (info != null) {
                     info.isCancelling = true
                     info.cancel("Cancelled by user")
                 }
                 kotlinx.coroutines.CoroutineScope(Dispatchers.IO).launch {
-                    info?.awaitCompletion(timeoutMs = 3000L)
+                    val isUpdateTask = record.taskType == DownloadRecord.TASK_UPDATE
+                    info?.awaitCompletion(timeoutMs = if (isUpdateTask) 10000L else 3000L)
                     val appDirPath = record.installPath.ifEmpty { getAppDirPath(appId) }
+                    if (isUpdateTask) {
+                        val updateNeverStarted =
+                            statusAtCancel == DownloadPhase.QUEUED ||
+                                (
+                                    statusAtCancel == DownloadPhase.PAUSED &&
+                                        MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER) &&
+                                        !MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                                )
+                        if (updateNeverStarted) {
+                            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                            MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                        } else {
+                            cleanupCancelledUpdate(appDirPath)
+                        }
+                        try {
+                            instance?.downloadingAppInfoDao?.deleteApp(appId)
+                        } catch (e: Exception) {
+                            Timber.w(e, "Failed to clear cancelled Steam update metadata for appId=$appId")
+                        }
+                        info?.updateStatus(DownloadPhase.CANCELLED)
+                        removeDownloadJob(appId, forceRemove = true)
+                        return@launch
+                    }
                     val dirFile = java.io.File(appDirPath)
                     if (dirFile.exists() && dirFile.isDirectory) {
                         val deleteCheck =
@@ -5393,32 +4063,82 @@ class SteamService :
         super.onCreate()
         instance = this
 
+        _chatServiceEnabledFlow.value = PrefManager.chatServiceEnabled
+
         notificationHelper = NotificationHelper(applicationContext)
         val notification = notificationHelper.createForegroundNotification("Steam Service is running")
         startForeground(1, notification)
 
-        _isConnectedFlow.value = steamClient?.isConnected ?: false
-        // Login flow is already pre-seeded by initLoginStatus() before start()
-        _isLoggedInFlow.value = steamClient?.steamID?.isValid ?: _isLoggedInFlow.value
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            .seedFromPrefManager(applicationContext)
 
-        // JavaSteam logger CME hot-fix
-        runCatching {
-            val clazz = Class.forName("in.dragonbra.javasteam.util.log.LogManager")
-            val field = clazz.getDeclaredField("LOGGERS").apply { isAccessible = true }
-            field.set(
-                // obj =
-                null,
-                java.util.concurrent.ConcurrentHashMap<Any, Any>(), // replaces the HashMap
-            )
+        scope.launch(Dispatchers.IO) {
+            try {
+                val ownedIds = appDao.getAllAppIds().toIntArray()
+                if (ownedIds.isNotEmpty()) {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .setOwnedApps(ownedIds)
+                }
+                val installed = ownedIds.filter { isAppInstalled(it) }.toIntArray()
+                if (installed.isNotEmpty()) {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .setInstalledApps(installed)
+                    installed.forEach { appId ->
+                        val dir = runCatching { getAppDirPath(appId) }.getOrNull()
+                        if (!dir.isNullOrEmpty()) {
+                            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                                .setAppInstallDir(appId, dir)
+                        }
+                        val acct = runCatching {
+                            com.winlator.cmod.feature.stores.steam.utils
+                                .SteamUtils.getSteam3AccountId().toLong()
+                        }.getOrNull() ?: 0L
+                        if (acct > 0L) {
+                            val remoteDir = runCatching {
+                                com.winlator.cmod.feature.stores.steam.enums
+                                    .PathType.SteamUserData.toAbsPath(
+                                        this@SteamService, appId, acct)
+                            }.getOrNull()
+                            if (!remoteDir.isNullOrEmpty()) {
+                                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                                    .setAppCloudRemoteDir(appId, remoteDir)
+                            }
+                        }
+                    }
+                }
+                val nameIds   = mutableListOf<Int>()
+                val nameStrs  = mutableListOf<String>()
+                for (id in ownedIds) {
+                    val nm = runCatching { appDao.findApp(id)?.name }.getOrNull().orEmpty()
+                    if (nm.isNotEmpty()) {
+                        nameIds.add(id)
+                        nameStrs.add(nm)
+                    }
+                }
+                if (nameIds.isNotEmpty()) {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .setAppNames(nameIds.toIntArray(), nameStrs.toTypedArray())
+                }
+                Timber.i("WnLibSteamClient seed: owned=${ownedIds.size} installed=${installed.size} names=${nameIds.size}")
+            } catch (t: Throwable) {
+                Timber.w(t, "WnLibSteamClient seed failed")
+            }
         }
 
+        // Connection/login flows are driven by the session observer; isLoggedInFlow is pre-seeded by initLoginStatus().
+        _isConnectedFlow.value = false
+
         PluviaApp.events.on<AndroidEvent.EndProcess, Unit>(onEndProcess)
 
         DownloadCoordinator.init(db)
         DownloadCoordinator.registerDispatcher(DownloadRecord.STORE_STEAM, coordinatorDispatcher)
 
-        // To view log messages in android logcat properly
-        LogManager.addListener(logger)
+        // Re-arm the background idle timer on any download state change — one that kept the session awake can finish/pause, so re-evaluate (and suspend once idle) without waiting on the running timer. Grace delay still applies.
+        scope.launch {
+            DownloadCoordinator.changes.collect {
+                if (!appInForeground) scheduleBackgroundSuspendCheck()
+            }
+        }
     }
 
     override fun onStartCommand(
@@ -5430,90 +4150,26 @@ class SteamService :
         when (intent?.action) {
             NotificationHelper.ACTION_EXIT -> {
                 Timber.d("Exiting app via notification intent")
-                AppTerminationHelper.stopManagedServices(applicationContext, "notification_exit")
-
+                AppTerminationHelper.stopManagedServices(applicationContext, "notification_exit", forceStopChat = true)
+                runCatching {
+                    getSystemService(android.app.ActivityManager::class.java)
+                        ?.appTasks?.forEach { it.finishAndRemoveTask() }
+                }
+                android.os.Process.killProcess(android.os.Process.myPid())
                 return START_NOT_STICKY
             }
         }
 
         if (!isRunning) {
-            Timber.i("Using server list path: $serverListPath")
-
-            // Ensure parent directory exists
-            File(serverListPath).parentFile?.mkdirs()
-
-            val configuration =
-                SteamConfiguration.create {
-                    it.withProtocolTypes(PROTOCOL_TYPES)
-                    it.withCellID(PrefManager.cellId)
-                    it.withServerListProvider(FileServerListProvider(File(serverListPath)))
-                    it.withConnectionTimeout(60000L)
-                    it.withHttpClient(
-                        OkHttpClient
-                            .Builder()
-                            .connectTimeout(10, TimeUnit.SECONDS) // Time to establish connection
-                            .readTimeout(60, TimeUnit.SECONDS) // Max inactivity between reads
-                            .writeTimeout(30, TimeUnit.SECONDS) // Time for writes
-                            .build(),
-                    )
-                }
-
-            // create our steam client instance
-            steamClient =
-                SteamClient(configuration).apply {
-                    // remove callbacks we're not using.
-                    removeHandler(SteamGameServer::class.java)
-                    removeHandler(SteamMasterServer::class.java)
-                    removeHandler(SteamWorkshop::class.java)
-                    removeHandler(SteamScreenshots::class.java)
-                }
-
-            // create the callback manager which will route callbacks to function calls
-            callbackManager = CallbackManager(steamClient!!)
-
-            // get the different handlers to be used throughout the service
-            _steamUser = steamClient!!.getHandler(SteamUser::class.java)
-            _steamApps = steamClient!!.getHandler(SteamApps::class.java)
-            _steamFriends = steamClient!!.getHandler(SteamFriends::class.java)
-            _steamCloud = steamClient!!.getHandler(SteamCloud::class.java)
-            _steamUserStats = steamClient!!.getHandler(SteamUserStats::class.java)
-
-            _unifiedFriends = SteamUnifiedFriends(this)
-            _steamFamilyGroups = steamClient!!.getHandler<SteamUnifiedMessages>()!!.createService<FamilyGroups>()
-
-            // subscribe to the callbacks we are interested in
-            with(callbackSubscriptions) {
-                with(callbackManager!!) {
-                    add(subscribe(ConnectedCallback::class.java, ::onConnected))
-                    add(subscribe(DisconnectedCallback::class.java, ::onDisconnected))
-                    add(subscribe(LoggedOnCallback::class.java, ::onLoggedOn))
-                    add(subscribe(LoggedOffCallback::class.java, ::onLoggedOff))
-                    add(subscribe(PersonaStateCallback::class.java, ::onPersonaStateReceived))
-                    add(subscribe(LicenseListCallback::class.java, ::onLicenseList))
-                    add(subscribe(PlayingSessionStateCallback::class.java, ::onPlayingSessionState))
-                }
-            }
-
             isRunning = true
 
-            // we should use Dispatchers.IO here since we are running a sleeping/blocking function
-            // "The idea is that the IO dispatcher spends a lot of time waiting (IO blocked),
-            // while the Default dispatcher is intended for CPU intensive tasks, where there
-            // is little or no sleep."
-            // source: https://stackoverflow.com/a/59040920
-            scope.launch {
-                while (isRunning) {
-                    // logD("runWaitCallbacks")
+            _unifiedFriends = SteamUnifiedFriends(this)
+            // Family groups and friends go through the native Steam client.
 
-                    try {
-                        callbackManager!!.runWaitCallbacks(1000L)
-                    } catch (e: Exception) {
-                        Timber.e("runWaitCallbacks failed: $e")
-                    }
-                }
+            // Stored credentials bootstrap the native session and its observer drives the rest of the lifecycle; a fresh login (no token yet) arrives later via startLoginWith{Credentials,Qr}.
+            if (PrefManager.refreshToken.isNotBlank()) {
+                connectAndLogon()
             }
-
-            connectToSteam()
         }
 
         return START_STICKY
@@ -5527,14 +4183,14 @@ class SteamService :
 
         DownloadCoordinator.unregisterDispatcher(DownloadRecord.STORE_STEAM)
 
-        // Persist download progress for all active downloads
-        // This is a safety net for OS kills (unlikely but possible)
+        // Persist progress for all active downloads — safety net for OS kills.
         downloadJobs.values.forEach { downloadInfo ->
             downloadInfo.persistProgressSnapshot(force = true)
         }
 
         stopForeground(STOP_FOREGROUND_REMOVE)
         notificationHelper.cancel()
+        notificationHelper.cancelBackgroundRunning()
 
         if (!isStopping) {
             scope.launch { stop() }
@@ -5549,685 +4205,424 @@ class SteamService :
 
     override fun onBind(intent: Intent?): IBinder? = null
 
-    private fun connectToSteam() {
-        scope.launch {
-            while (isRunning && !isConnected) {
-                Timber.d("connectToSteam: attempting connection...")
-                try {
-                    steamClient!!.connect()
-
-                    // Wait for connection for up to 10 seconds
-                    var waitAttempts = 0
-                    while (!isConnected && waitAttempts < 10) {
-                        delay(1000)
-                        waitAttempts++
-                    }
-
-                    if (!isConnected) {
-                        Timber.w("Failed to connect to Steam, marking endpoint bad and force disconnecting")
-                        try {
-                            steamClient!!.servers.tryMark(steamClient!!.currentEndpoint, PROTOCOL_TYPES, ServerQuality.BAD)
-                        } catch (e: Exception) {
-                        }
-
-                        try {
-                            steamClient!!.disconnect()
-                        } catch (e: Exception) {
-                        }
-
-                        // Wait before retrying
-                        delay(5000)
-                    }
-                } catch (e: Exception) {
-                    Timber.e(e, "Error during connectToSteam")
-                    delay(5000)
-                }
+    /** Applies the master chat switch to a live session: enable → restart the message poller, go online (stored persona), refresh friends; disable → stop the poller and go offline. No-op until logged on (onWnLoggedOn handles cold start). */
+    private fun applyChatServiceState(enabled: Boolean) {
+        if (!isLoggedIn) return
+        if (enabled) {
+            messagePollerJob?.cancel()
+            messagePollerJob = continuousIncomingMessagePoller()
+            scope.launch {
+                val effectiveState =
+                    (EPersonaState.from(PrefManager.personaState) ?: EPersonaState.Online).code()
+                withWnSession { s -> s.setPersonaState(effectiveState) }
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setPersonaState(effectiveState)
+            }
+            scope.launch { runCatching { refreshFriends() } }
+        } else {
+            messagePollerJob?.cancel()
+            messagePollerJob = null
+            scope.launch {
+                val offline = EPersonaState.Offline.code()
+                withWnSession { s -> s.setPersonaState(offline) }
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setPersonaState(offline)
             }
         }
     }
 
     private suspend fun stop() {
         Timber.i("Stopping Steam service")
-        if (steamClient != null && steamClient!!.isConnected) {
-            isStopping = true
-
-            steamClient!!.disconnect()
-
-            while (isStopping) {
-                delay(200L)
-            }
-
-            // the reason we don't clearValues() here is because the onDisconnect
-            // callback does it for us
-        } else {
-            clearValues()
-        }
-    }
-
-    private fun clearValues() {
-        if (instance === this) {
-            instance = null
-        }
-
-        _loginResult = LoginResult.Failed
-        isRunning = false
-        isConnected = false
-        isLoggingOut = false
-        isWaitingForQRAuth = false
-
-        steamClient = null
-        _steamUser = null
-        _steamApps = null
-        _steamFriends = null
-        _steamCloud = null
-
-        callbackSubscriptions.forEach { it.close() }
-        callbackSubscriptions.clear()
-        callbackManager = null
-
-        _unifiedFriends?.close()
-        _unifiedFriends = null
-
-        isStopping = false
-        retryAttempt = 0
-
-        PluviaApp.events.off<AndroidEvent.EndProcess, Unit>(onEndProcess)
-        PluviaApp.events.clearAllListenersOf<SteamEvent<Any>>()
-
-        LogManager.removeListener(logger)
-    }
-
-    private fun reconnect() {
-        notificationHelper.notify("Retrying...")
-
-        isConnected = false
-
-        val event = SteamEvent.Disconnected
-        PluviaApp.events.emit(event)
-
-        steamClient!!.disconnect()
+        isStopping = true
+        connectJob?.cancel()
+        reconnectJob?.cancel()
+        stableConnectionJob?.cancel()
+        refreshTokenWatchdogJob?.cancel()
+        wnLibraryMirrorJob?.cancel()
+        wnLibraryMirrorJob = null
+        wnLibrary?.stopObserving()
+        wnLibrary = null
+        wnSession?.let { s ->
+            runCatching { s.disconnect() }
+            runCatching { s.close() }
+        }
+        wnSession = null
+        clearValues()
     }
 
-    // region [REGION] callbacks
-    @Suppress("UNUSED_PARAMETER", "unused")
-    private fun onConnected(callback: ConnectedCallback) {
-        Timber.i("Connected to Steam")
-
-        retryAttempt = 0
-        isConnected = true
+    // region [REGION] WN-Steam-Client lifecycle
 
-        var isAutoLoggingIn = false
-
-        if (PrefManager.username.isNotEmpty() && PrefManager.refreshToken.isNotEmpty()) {
-            isAutoLoggingIn = true
-
-            login(
-                username = PrefManager.username,
-                refreshToken = PrefManager.refreshToken,
-                rememberSession = true,
-            )
+    fun onWnDisconnected() {
+        Timber.i("WN-Steam-Client channel disconnected")
+        if (isStopping || isLoggingOut) return
+        // A self-triggered disconnect to sleep the backgrounded app must NOT schedule a reconnect — that would defeat the suspend.
+        if (suspendedForBackground || suspendedForBionic) {
+            Timber.i("Channel disconnect was an intentional suspend " +
+                "(background=$suspendedForBackground bionic=$suspendedForBionic) — not reconnecting")
+            return
         }
-
-        val event = SteamEvent.Connected(isAutoLoggingIn)
-        PluviaApp.events.emit(event)
-    }
-
-    private fun onDisconnected(callback: DisconnectedCallback) {
-        Timber.i("Disconnected from Steam. User initiated: ${callback.isUserInitiated}")
-
-        isConnected = false
-
-        if (!isStopping && retryAttempt < MAX_RETRY_ATTEMPTS) {
+        // This drop means the just-ended session was NOT stable — cancel the stable-connection timer so the retry budget keeps climbing and the backoff grows.
+        stableConnectionJob?.cancel()
+        refreshTokenWatchdogJob?.cancel()
+        stableConnectionJob = null
+        if (retryAttempt < MAX_RETRY_ATTEMPTS && PrefManager.refreshToken.isNotBlank()) {
             retryAttempt++
-
-            Timber.w("Attempting to reconnect (retry $retryAttempt)")
-
-            // isLoggingOut = false
-            val event = SteamEvent.RemotelyDisconnected
-            PluviaApp.events.emit(event)
-
-            connectToSteam()
+            val backoffMs = reconnectBackoffMs(retryAttempt)
+            Timber.w("Reconnect scheduled in ${backoffMs}ms (retry $retryAttempt/$MAX_RETRY_ATTEMPTS)")
+            notificationHelper.notify("Retrying")
+            PluviaApp.events.emit(SteamEvent.RemotelyDisconnected)
+            reconnectJob?.cancel()
+            reconnectJob =
+                scope.launch {
+                    delay(backoffMs)
+                    if (!isStopping && !isLoggingOut) connectAndLogon()
+                }
         } else {
-            val event = SteamEvent.Disconnected
-            PluviaApp.events.emit(event)
-
+            PluviaApp.events.emit(SteamEvent.Disconnected)
             clearValues()
-
             stopSelf()
         }
     }
 
+    /** Post-logon orchestration (onLoggedOn): runs once per logged-on [WnSteamSession] (guarded by wnLoggedOnHandled), fired from the [installWnLogonObserver] observer or the [withWnSession] promotion path. */
     @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
-    private fun onLoggedOn(callback: LoggedOnCallback) {
-        Timber.i("Logged onto Steam: ${callback.result}")
-
-        if (callback.result == EResult.OK) {
-            isLoggingOut = false
-            _isLoggedInFlow.value = true
-        } else {
-            _isLoggedInFlow.value = false
-        }
+    fun onWnLoggedOn(session: WnSteamSession) {
+        Timber.i("Logged onto Steam (WN-Steam-Client)")
 
-        if (userSteamId?.isValid == true) {
-            if (PrefManager.steamUserAccountId != userSteamId!!.accountID.toInt()) {
-                PrefManager.steamUserAccountId = userSteamId!!.accountID.toInt()
-                Timber.d("Saving logged in Steam accountID ${userSteamId!!.accountID.toInt()}")
+        // Do NOT reset retryAttempt here — a session that logs on then drops within STABLE_CONNECTION_MS isn't healthy; arm a timer that resets it only after the session stays up (onWnDisconnected cancels it).
+        stableConnectionJob?.cancel()
+        refreshTokenWatchdogJob?.cancel()
+        stableConnectionJob =
+            scope.launch {
+                delay(STABLE_CONNECTION_MS)
+                retryAttempt = 0
+                Timber.d("Connection stable — reconnect retry budget reset")
+            }
+        startRefreshTokenWatchdog()
+        isLoggingOut = false
+        _isLoggedInFlow.value = true
+
+        val steamId64 = session.steamId()
+        if (steamId64 != 0L) {
+            // SteamID.accountID == the low 32 bits of the SteamID64.
+            val accountId = (steamId64 and 0xFFFFFFFFL).toInt()
+            if (PrefManager.steamUserAccountId != accountId) {
+                PrefManager.steamUserAccountId = accountId
+                Timber.d("Saving logged in Steam accountID $accountId")
                 clearCloudSyncCaches()
             }
-            val steamId64 = userSteamId!!.convertToUInt64()
             if (PrefManager.steamUserSteamId64 != steamId64) {
                 PrefManager.steamUserSteamId64 = steamId64
                 Timber.d("Saving logged in Steam ID64 $steamId64")
             }
         }
 
-        when (callback.result) {
-            EResult.TryAnotherCM -> {
-                _loginResult = LoginResult.Failed
-                reconnect()
-            }
-
-            EResult.OK -> {
-                // Steam's GeoIP-based cellID is often wrong (e.g. returning Romania for US users).
-                // Only log it for debugging; keep cellId at 0 ("Automatic") unless the user
-                // manually picks a server in Settings > Stores > Download Server.
-                Timber.d("Steam suggested cellID: ${callback.cellID} (not auto-saving, using Automatic unless manually set)")
-
-                // retrieve persona data of logged in user
-                scope.launch { requestUserPersona() }
-
-                // Request family share info if we have a familyGroupId.
-                if (callback.familyGroupId != 0L) {
-                    scope.launch {
-                        val request =
-                            SteammessagesFamilygroupsSteamclient.CFamilyGroups_GetFamilyGroup_Request
-                                .newBuilder()
-                                .apply {
-                                    familyGroupid = callback.familyGroupId
-                                }.build()
-
-                        _steamFamilyGroups!!.getFamilyGroup(request).await().let {
-                            if (it.result != EResult.OK) {
-                                Timber.w("An error occurred loading family group info.")
-                                return@launch
-                            }
-
-                            val response = it.body
-
-                            Timber.i("Found family share: ${response.name}, with ${response.membersCount} members.")
-
-                            response.membersList.forEach { member ->
-                                val accountID = SteamID(member.steamid).accountID.toInt()
-                                familyGroupMembers.add(accountID)
-                            }
-                        }
-                    }
-                }
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            .setSteamId(steamId64)
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            .setLoggedOn(true)
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            .setCloudEnabledForAccount(true)
 
-                picsChangesCheckerJob = continuousPICSChangesChecker()
-                picsGetProductInfoJob = continuousPICSGetProductInfo()
 
-                // Tell steam we're online, this allows friends to update.
-                _steamFriends?.setPersonaState(EPersonaState.from(PrefManager.personaState) ?: EPersonaState.Online)
+        // Start downloads that were requeued while AppInfo wasn't loaded yet.
+        DownloadCoordinator.blockingTick()
 
-                notificationHelper.notify("Connected")
+        // retrieve persona data of logged in user
+        scope.launch { requestUserPersona() }
 
-                _loginResult = LoginResult.Success
-            }
+        // Populate the license tables from CMsgClientLicenseList.
+        scope.launch { processLicenseList() }
 
-            else -> {
-                clearUserData()
+        scope.launch { pushFriendsListToLibSteamClient() }
 
-                _loginResult = LoginResult.Failed
+        scope.launch { refreshCloudQuotaForLibSteamClient() }
 
-                reconnect()
+        // Request family share info if the logon response gave us a family id.
+        val familyGroupId = session.familyGroupId()
+        if (familyGroupId != 0L) {
+            scope.launch {
+                val json = withWnSession { s -> s.getFamilyGroup(familyGroupId) }
+                if (json == null) {
+                    Timber.w("An error occurred loading family group info.")
+                    return@launch
+                }
+                try {
+                    val obj = JSONObject(json)
+                    val members = obj.optJSONArray("members")
+                    Timber.i(
+                        "Found family share: ${obj.optString("name")}, " +
+                            "with ${members?.length() ?: 0} members.",
+                    )
+                    if (members != null) {
+                        for (i in 0 until members.length()) {
+                            val memberId64 = members.getLong(i)
+                            familyGroupMembers.add((memberId64 and 0xFFFFFFFFL).toInt())
+                        }
+                    }
+                } catch (e: Exception) {
+                    Timber.w(e, "family group: parse failed")
+                }
             }
         }
 
-        val event = SteamEvent.LogonEnded(PrefManager.username, _loginResult)
-        PluviaApp.events.emit(event)
-    }
-
-    private fun onLoggedOff(callback: LoggedOffCallback) {
-        Timber.i("Logged off of Steam: ${callback.result}")
-
-        _isLoggedInFlow.value = false
-
-        notificationHelper.notify("Disconnected...")
-
-        if (isLoggingOut || callback.result == EResult.LogonSessionReplaced) {
-            // logOut() already handled cleanup; just stop the service.
-            if (!isLoggingOut) performLogOffDuties()
-
-            scope.launch { stop() }
-        } else if (callback.result == EResult.LoggedInElsewhere) {
-            // received when a client runs an app and wants to forcibly close another
-            // client running an app
-            val event = SteamEvent.ForceCloseApp
-            PluviaApp.events.emit(event)
-
-            reconnect()
-        } else {
-            reconnect()
-        }
-    }
-
-    private fun onPlayingSessionState(callback: PlayingSessionStateCallback) {
-        Timber.d("onPlayingSessionState called with isPlayingBlocked = " + callback.isPlayingBlocked)
-        _isPlayingBlocked.value = callback.isPlayingBlocked
-    }
-
-    @OptIn(ExperimentalStdlibApi::class)
-    private fun onPersonaStateReceived(callback: PersonaStateCallback) {
-        // Ignore accounts that arent individuals
-        if (!callback.friendId.isIndividualAccount) {
-            return
-        }
-
-        // Ignore states where the name is blank.
-        if (callback.playerName.isEmpty()) {
-            return
-        }
-
-        // Timber.d("Persona state received: ${callback.name}")
+        picsChangesCheckerJob?.cancel()
+        picsChangesCheckerJob = continuousPICSChangesChecker()
+        picsGetProductInfoJob?.cancel()
+        picsGetProductInfoJob = continuousPICSGetProductInfo()
+        messagePollerJob?.cancel()
+        messagePollerJob = if (PrefManager.chatServiceEnabled) continuousIncomingMessagePoller() else null
 
-        // Capture steamClient before launching the coroutine to avoid a race condition where
-        // steamClient is nulled out (service stopped) by the time the coroutine runs inside
-        // db.withTransaction, which would cause a NullPointerException.
-        val localSteamClient = steamClient ?: return
+        // Repair legacy depots whose stored download>size was frozen by the change-number skip.
+        healCorruptManifestDownloadSizes()
 
+        // Tell steam our presence — online (stored persona) when chat is on, offline when the master switch is off — this lets friends update.
         scope.launch {
-            db.withTransaction {
-                // Send off an event if we change states.
-                if (callback.friendId == localSteamClient.steamID) {
-                    Timber.d("Local persona state received: ${callback.playerName}")
-
-                    val avatarHash = callback.avatarHash.toHexString()
-                    val playerName = callback.playerName
-
-                    // Update local state flow
-                    _localPersona.update {
-                        it.copy(
-                            avatarHash = avatarHash,
-                            name = playerName,
-                            state = callback.personaState ?: EPersonaState.Offline,
-                            gameAppID = callback.gamePlayedAppId,
-                            gameName = appDao.findApp(callback.gamePlayedAppId)?.name ?: callback.gameName,
-                        )
-                    }
-
-                    // Cache local persona
-                    PrefManager.steamUserAvatarHash = avatarHash
-                    PrefManager.steamUserName = playerName
-
-                    val event = SteamEvent.PersonaStateReceived(localPersona.value)
-                    PluviaApp.events.emit(event)
+            val effectiveState =
+                if (!PrefManager.chatServiceEnabled) {
+                    EPersonaState.Offline.code()
+                } else {
+                    (EPersonaState.from(PrefManager.personaState) ?: EPersonaState.Online).code()
                 }
-            }
-        }
-    }
-
-    private fun onLicenseList(callback: LicenseListCallback) {
-        if (callback.result != EResult.OK) {
-            Timber.w("Failed to get License list")
-            return
+            withWnSession { s -> s.setPersonaState(effectiveState) }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setPersonaState(effectiveState)
         }
 
-        Timber.i("Received License List ${callback.result}, size: ${callback.licenseList.size}")
+        notificationHelper.notify("Connected")
+        _loginResult = LoginResult.Success
+        PluviaApp.events.emit(SteamEvent.LogonEnded(PrefManager.username, LoginResult.Success))
 
         scope.launch {
-            db.withTransaction {
-                // Note: I assume with every launch we do, in fact, update the licenses for app the apps if we join or get removed
-                //      from family sharing... We really can't test this as there is a 1-year cooldown.
-                //      Then 'findStaleLicences' will find these now invalid items to remove.
-
-                // Store raw licenses for DepotDownloader - each license in its own row
-                licenses = callback.licenseList
-                cachedLicenseDao.deleteAll()
-                val cachedLicenses =
-                    callback.licenseList.map { license ->
-                        CachedLicense(licenseJson = LicenseSerializer.serializeLicense(license))
-                    }
-                cachedLicenseDao.insertAll(cachedLicenses)
-
-                val licensesToAdd =
-                    callback.licenseList
-                        .groupBy { it.packageID }
-                        .map { licensesEntry ->
-                            val preferred =
-                                licensesEntry.value.firstOrNull {
-                                    it.ownerAccountID == userSteamId?.accountID?.toInt()
-                                } ?: licensesEntry.value.first()
-                            SteamLicense(
-                                packageId = licensesEntry.key,
-                                lastChangeNumber = preferred.lastChangeNumber,
-                                timeCreated = preferred.timeCreated,
-                                timeNextProcess = preferred.timeNextProcess,
-                                minuteLimit = preferred.minuteLimit,
-                                minutesUsed = preferred.minutesUsed,
-                                paymentMethod = preferred.paymentMethod,
-                                licenseFlags =
-                                    licensesEntry.value
-                                        .map { it.licenseFlags }
-                                        .reduceOrNull { first, second ->
-                                            val combined = EnumSet.copyOf(first)
-                                            combined.addAll(second)
-                                            combined
-                                        } ?: EnumSet.noneOf(ELicenseFlags::class.java),
-                                purchaseCode = preferred.purchaseCode,
-                                licenseType = preferred.licenseType,
-                                territoryCode = preferred.territoryCode,
-                                accessToken = preferred.accessToken,
-                                ownerAccountId = licensesEntry.value.map { it.ownerAccountID }, // Read note above
-                                masterPackageID = preferred.masterPackageID,
-                            )
-                        }
-
-                if (licensesToAdd.isNotEmpty()) {
-                    Timber.i("Adding ${licensesToAdd.size} licenses")
-                    licenseDao.insertAll(licensesToAdd)
+            try {
+                val installed = withContext(Dispatchers.IO) {
+                    appDao.getAllAppIds().filter { isAppInstalled(it) }
                 }
-
-                val licensesToRemove =
-                    licenseDao.findStaleLicences(
-                        packageIds = callback.licenseList.map { it.packageID },
-                    )
-                if (licensesToRemove.isNotEmpty()) {
-                    Timber.i("Removing ${licensesToRemove.size} (stale) licenses")
-                    val packageIds = licensesToRemove.map { it.packageId }
-                    licenseDao.deleteStaleLicenses(packageIds)
-                }
-
-                // Get PICS information with the current license database.
-                licenseDao
-                    .getAllLicenses()
-                    .map { PICSRequest(it.packageId, it.accessToken) }
-                    .chunked(MAX_PICS_BUFFER)
-                    .forEach { chunk ->
-                        Timber.d("onLicenseList: Queueing ${chunk.size} package(s) for PICS")
-                        packagePicsChannel.send(chunk)
+                if (installed.isEmpty()) {
+                    Timber.d("post-logon ticket pre-fetch: no installed apps")
+                    return@launch
+                }
+                Timber.i("post-logon ticket pre-fetch: ${installed.size} installed app(s)")
+                val sem = kotlinx.coroutines.sync.Semaphore(8)
+                kotlinx.coroutines.coroutineScope {
+                    installed.forEach { appId: Int ->
+                        launch {
+                            sem.withPermit {
+                                prefetchOwnershipTicketForLibSteamClient(appId)
+                            }
+                        }
                     }
+                }
+                Timber.i("post-logon ticket pre-fetch: complete")
+            } catch (t: Throwable) {
+                Timber.w(t, "post-logon ticket pre-fetch failed")
             }
         }
-    }
 
-    override fun onChanged(qrAuthSession: QrAuthSession?) {
-        qrAuthSession?.let { qr ->
-            if (!BuildConfig.DEBUG) {
-                Timber.d("QR code changed -> ${qr.challengeUrl}")
-            }
-
-            val event = SteamEvent.QrChallengeReceived(qr.challengeUrl)
-            PluviaApp.events.emit(event)
-        } ?: run { Timber.w("QR challenge url was null") }
     }
     // endregion
 
-    /**
-     * Request changes for apps and packages since a given change number.
-     * Checks every [PICS_CHANGE_CHECK_DELAY] seconds.
-     * Results are returned in a [PICSChangesCallback]
-     */
-    private fun continuousPICSChangesChecker(): Job =
-        scope.launch {
-            while (isActive && isLoggedIn) {
-                // Initial delay before each check
-                delay(60.seconds)
+    // QR challenge-URL updates flow from WnSteamSession via WnQrCallback; see startLoginWithQr below.
+    // endregion
 
-                PICSChangesCheck()
+    suspend fun refreshFriends() {
+        val svc = instance ?: return
+        val ids = withWnSession { s -> s.getFriendsList() } ?: LongArray(0)
+        if (ids.isEmpty()) return
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient.setFriendsList(ids)
+        val merged = LinkedHashMap<Long, SteamFriendEntry>()
+        for (id in ids) merged[id] = SteamFriendEntry(steamId = id, name = "", state = EPersonaState.Offline)
+        fun mergeJson(json: String?) {
+            val arr = try { JSONArray(json ?: "[]") } catch (_: Exception) { JSONArray() }
+            for (i in 0 until arr.length()) {
+                val o = arr.optJSONObject(i) ?: continue
+                val sid = o.optLong("sid", 0L)
+                if (sid == 0L) continue
+                merged[sid] = SteamFriendEntry(
+                    steamId = sid,
+                    name = o.optString("name", ""),
+                    state = EPersonaState.from(o.optInt("state", 0)) ?: EPersonaState.Offline,
+                    gameAppId = o.optInt("app", 0),
+                    gameName = o.optString("gameName", ""),
+                    avatarHash = o.optString("avatarHash", ""),
+                    connectString = o.optString("connect", ""),
+                )
             }
         }
-
-    private fun PICSChangesCheck() {
-        scope.launch {
-            ensureActive()
-
-            try {
-                val changesSince =
-                    _steamApps!!
-                        .picsGetChangesSince(
-                            lastChangeNumber = PrefManager.lastPICSChangeNumber,
-                            sendAppChangeList = true,
-                            sendPackageChangelist = true,
-                        ).await()
-
-                if (PrefManager.lastPICSChangeNumber == changesSince.currentChangeNumber) {
-                    Timber.w("Change number was the same as last change number, skipping")
-                    return@launch
+        runCatching {
+            mergeJson(com.winlator.cmod.feature.stores.steam.utils.PrefManager.friendsSnapshotJson)
+        }
+        svc._friendsList.value = merged.values.toList()
+        withWnSession { s -> s.requestFriendPersonas(ids, personaStateRequested = 0xffff) }
+        var gotLive = false
+        for (attempt in 0 until 20) {
+            if (attempt > 0 && attempt % 5 == 0) {
+                withWnSession { s -> s.requestFriendPersonas(ids, personaStateRequested = 0xffff) }
+            }
+            val json = withWnSession { s -> s.getFriendPersonas() }
+            if (!json.isNullOrBlank() && json != "[]") {
+                mergeJson(json)
+                gotLive = true
+                runCatching {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient.pushFriendPersonasJson(json, persistSnapshot = true)
                 }
-
-                // Set our last change number
-                PrefManager.lastPICSChangeNumber = changesSince.currentChangeNumber
-
-                Timber.d(
-                    "picsGetChangesSince:" +
-                        "\n\tlastChangeNumber: ${changesSince.lastChangeNumber}" +
-                        "\n\tcurrentChangeNumber: ${changesSince.currentChangeNumber}" +
-                        "\n\tisRequiresFullUpdate: ${changesSince.isRequiresFullUpdate}" +
-                        "\n\tisRequiresFullAppUpdate: ${changesSince.isRequiresFullAppUpdate}" +
-                        "\n\tisRequiresFullPackageUpdate: ${changesSince.isRequiresFullPackageUpdate}" +
-                        "\n\tappChangesCount: ${changesSince.appChanges.size}" +
-                        "\n\tpkgChangesCount: ${changesSince.packageChanges.size}",
-                )
-
-                // Process any app changes
-                launch {
-                    changesSince.appChanges.values
-                        .filter { changeData ->
-                            // only queue PICS requests for apps existing in the db that have changed
-                            val app = appDao.findApp(changeData.id) ?: return@filter false
-                            changeData.changeNumber != app.lastChangeNumber
-                        }.map { PICSRequest(id = it.id) }
-                        .chunked(MAX_PICS_BUFFER)
-                        .forEach { chunk ->
-                            ensureActive()
-                            Timber.d("onPicsChanges: Queueing ${chunk.size} app(s) for PICS")
-                            appPicsChannel.send(chunk)
-                        }
+            }
+            // Resolve game titles for in-game friends (Steam omits game_name for Steam apps).
+            for ((id, entry) in merged.toList()) {
+                if (entry.isOnline && entry.gameName.isBlank() && entry.gameAppId > 0) {
+                    val name = resolveGameName(entry.gameAppId)
+                    if (name.isNotBlank()) merged[id] = entry.copy(gameName = name)
                 }
+            }
+            svc._friendsList.value = merged.values.toList()
+            if (gotLive && merged.values.count { it.name.isNotBlank() } >= ids.size) break
+            kotlinx.coroutines.delay(1000L)
+        }
+    }
 
-                // Process any package changes
-                launch {
-                    val pkgsWithChanges =
-                        changesSince.packageChanges.values
-                            .filter { changeData ->
-                                // only queue PICS requests for pkgs existing in the db that have changed
-                                val pkg = licenseDao.findLicense(changeData.id) ?: return@filter false
-                                changeData.changeNumber != pkg.lastChangeNumber
-                            }
+    suspend fun syncFriendsPresence() {
+        val svc = instance ?: return
+        val current = svc._friendsList.value
+        if (current.isEmpty()) return
+        val json = withContext(Dispatchers.IO) { withWnSession { s -> s.getFriendPersonas() } } ?: return
+        val arr = try { JSONArray(json) } catch (_: Exception) { return }
+        if (arr.length() == 0) return
+        val byId = LinkedHashMap<Long, SteamFriendEntry>(current.size)
+        for (e in current) byId[e.steamId] = e
+        for (i in 0 until arr.length()) {
+            val o = arr.optJSONObject(i) ?: continue
+            val sid = o.optLong("sid", 0L)
+            if (sid == 0L || !byId.containsKey(sid)) continue
+            byId[sid] = SteamFriendEntry(
+                steamId = sid,
+                name = o.optString("name", ""),
+                state = EPersonaState.from(o.optInt("state", 0)) ?: EPersonaState.Offline,
+                gameAppId = o.optInt("app", 0),
+                gameName = o.optString("gameName", ""),
+                avatarHash = o.optString("avatarHash", ""),
+                connectString = o.optString("connect", ""),
+            )
+        }
+        for ((id, entry) in byId.toList()) {
+            if (entry.isOnline && entry.gameName.isBlank() && entry.gameAppId > 0) {
+                val name = resolveGameName(entry.gameAppId)
+                if (name.isNotBlank()) byId[id] = entry.copy(gameName = name)
+            }
+        }
+        svc._friendsList.value = byId.values.toList()
+    }
 
-                    if (pkgsWithChanges.isNotEmpty()) {
-                        val pkgsForAccessTokens = pkgsWithChanges.filter { it.isNeedsToken }.map { it.id }
+    private val gameNameCache = java.util.concurrent.ConcurrentHashMap<Int, String>()
 
-                        val accessTokens =
-                            _steamApps
-                                ?.picsGetAccessTokens(emptyList(), pkgsForAccessTokens)
-                                ?.await()
-                                ?.packageTokens ?: emptyMap()
+    // appId -> display name: cached, local app DB first, then the public store API.
+    suspend fun resolveGameName(appId: Int): String {
+        if (appId <= 0) return ""
+        gameNameCache[appId]?.let { return it }
+        getAppInfoOf(appId)?.name?.takeIf { it.isNotBlank() }?.let {
+            gameNameCache[appId] = it
+            return it
+        }
+        val fetched = withContext(Dispatchers.IO) {
+            runCatching {
+                val conn = java.net.URL(
+                    "https://store.steampowered.com/api/appdetails?appids=$appId&filters=basic",
+                ).openConnection() as java.net.HttpURLConnection
+                conn.connectTimeout = 8000
+                conn.readTimeout = 8000
+                conn.setRequestProperty("User-Agent", "Mozilla/5.0")
+                val text = conn.inputStream.bufferedReader().use { it.readText() }
+                val o = JSONObject(text).optJSONObject(appId.toString())
+                if (o?.optBoolean("success") == true) o.optJSONObject("data")?.optString("name").orEmpty() else ""
+            }.getOrDefault("")
+        }
+        if (fetched.isNotBlank()) gameNameCache[appId] = fetched
+        return fetched
+    }
 
-                        ensureActive()
+    // Send a 1-to-1 text message to a friend. Returns true on success.
+    suspend fun sendChatMessage(steamId: Long, text: String): Boolean {
+        if (text.isBlank()) return false
+        val resp = withContext(Dispatchers.IO) { withWnSession { s -> s.sendFriendMessage(steamId, text) } }
+        return !resp.isNullOrBlank()
+    }
 
-                        pkgsWithChanges
-                            .map { PICSRequest(it.id, accessTokens[it.id] ?: 0) }
-                            .chunked(MAX_PICS_BUFFER)
-                            .forEach { chunk ->
-                                Timber.d("onPicsChanges: Queueing ${chunk.size} package(s) for PICS")
-                                packagePicsChannel.send(chunk)
-                            }
-                    }
-                }
-            } catch (e: NullPointerException) {
-                Timber.w("No lastPICSChangeNumber, skipping")
-            } catch (e: AsyncJobFailedException) {
-                Timber.w("AsyncJobFailedException, skipping")
-            }
+    // Upload an image to Steam chat UGC and send it to a friend; returns the URL or null.
+    suspend fun sendChatImage(steamId: Long, bytes: ByteArray, fileName: String): String? {
+        if (bytes.isEmpty()) return null
+        val refreshToken = com.winlator.cmod.feature.stores.steam.utils.PrefManager.refreshToken
+        if (refreshToken.isBlank()) return null
+        return withContext(Dispatchers.IO) {
+            withWnSession { s -> s.sendChatImage(steamId, refreshToken, bytes, fileName) }
         }
     }
 
-    /**
-     * A buffered flow to parse so many PICS requests in a given moment.
-     */
-    private fun continuousPICSGetProductInfo(): Job =
-        scope.launch {
-            // Launch both coroutines within this parent job
-            launch {
-                appPicsChannel
-                    .receiveAsFlow()
-                    .filter { it.isNotEmpty() }
-                    .buffer(capacity = MAX_PICS_BUFFER, onBufferOverflow = BufferOverflow.SUSPEND)
-                    .collect { appRequests ->
-                        Timber.d("Processing ${appRequests.size} app PICS requests")
-
-                        ensureActive()
-                        if (!isLoggedIn) return@collect
-                        val steamApps = instance?._steamApps ?: return@collect
-
-                        val callback =
-                            steamApps
-                                .picsGetProductInfo(
-                                    apps = appRequests,
-                                    packages = emptyList(),
-                                ).await()
-
-                        callback.results.forEachIndexed { index, picsCallback ->
-                            Timber.d(
-                                "onPicsProduct: ${index + 1} of ${callback.results.size}" +
-                                    "\n\tReceived PICS result of ${picsCallback.apps.size} app(s)." +
-                                    "\n\tReceived PICS result of ${picsCallback.packages.size} package(s).",
-                            )
-
-                            ensureActive()
-                            val steamAppsMap =
-                                picsCallback.apps.values.mapNotNull { app ->
-                                    val appFromDb = appDao.findApp(app.id)
-                                    val packageId = appFromDb?.packageId ?: INVALID_PKG_ID
-                                    val packageFromDb = if (packageId != INVALID_PKG_ID) licenseDao.findLicense(packageId) else null
-                                    val ownerAccountId = packageFromDb?.ownerAccountId ?: emptyList()
-
-                                    // Apps with -1 for the ownerAccountId should be added.
-                                    //  This can help with friend game names.
-
-                                    // TODO maybe apps with -1 for the ownerAccountId can be stripped with necessities and name.
-
-                                    if (app.changeNumber != appFromDb?.lastChangeNumber) {
-                                        // Preserve custom install path if it exists (full absolute path)
-                                        val existingInstallDir = appFromDb?.installDir.orEmpty()
-                                        val preserveInstallDir =
-                                            existingInstallDir.isNotEmpty() &&
-                                                (existingInstallDir.startsWith("/") || existingInstallDir.contains(File.separator))
-
-                                        app.keyValues.generateSteamApp().copy(
-                                            packageId = packageId,
-                                            ownerAccountId = ownerAccountId,
-                                            receivedPICS = true,
-                                            lastChangeNumber = app.changeNumber,
-                                            licenseFlags = packageFromDb?.licenseFlags ?: EnumSet.noneOf(ELicenseFlags::class.java),
-                                            installDir =
-                                                if (preserveInstallDir) {
-                                                    existingInstallDir
-                                                } else {
-                                                    app.keyValues
-                                                        .generateSteamApp()
-                                                        .installDir
-                                                },
-                                        )
-                                    } else {
-                                        null
-                                    }
-                                }
+    // Load conversation history with a friend, ordered oldest-first.
+    suspend fun loadChatHistory(steamId: Long, count: Int = 50): List<com.winlator.cmod.feature.stores.steam.data.SteamChatMessage> {
+        val json = withContext(Dispatchers.IO) { withWnSession { s -> s.getRecentMessages(steamId, count) } } ?: "[]"
+        val arr = try { JSONArray(json) } catch (_: Exception) { JSONArray() }
+        val out = ArrayList<com.winlator.cmod.feature.stores.steam.data.SteamChatMessage>(arr.length())
+        for (i in 0 until arr.length()) {
+            val o = arr.optJSONObject(i) ?: continue
+            out.add(
+                com.winlator.cmod.feature.stores.steam.data.SteamChatMessage(
+                    fromSelf = o.optBoolean("fromSelf", false),
+                    text = o.optString("message", ""),
+                    timestamp = o.optInt("timestamp", 0),
+                    ordinal = o.optInt("ordinal", 0),
+                )
+            )
+        }
+        out.sortWith(compareBy({ it.timestamp }, { it.ordinal }))
+        return out
+    }
 
-                            if (steamAppsMap.isNotEmpty()) {
-                                Timber.i("Inserting ${steamAppsMap.size} PICS apps to database")
-                                db.withTransaction {
-                                    appDao.insertAll(steamAppsMap)
-                                }
-                            }
-                        }
-                    }
-            }
+    // Drain queued incoming messages, grouped by friend steamId.
+    suspend fun drainIncomingMessages(): Map<Long, List<com.winlator.cmod.feature.stores.steam.data.SteamChatMessage>> {
+        val json = withWnSession { s -> s.drainFriendMessages() } ?: "[]"
+        val arr = try { JSONArray(json) } catch (_: Exception) { JSONArray() }
+        if (arr.length() == 0) return emptyMap()
+        val grouped = LinkedHashMap<Long, MutableList<com.winlator.cmod.feature.stores.steam.data.SteamChatMessage>>()
+        for (i in 0 until arr.length()) {
+            val o = arr.optJSONObject(i) ?: continue
+            val fid = o.optLong("friendId", 0L)
+            if (fid == 0L) continue
+            grouped.getOrPut(fid) { ArrayList() }.add(
+                com.winlator.cmod.feature.stores.steam.data.SteamChatMessage(
+                    fromSelf = o.optBoolean("fromSelf", false),
+                    text = o.optString("message", ""),
+                    timestamp = o.optInt("timestamp", 0),
+                    ordinal = o.optInt("ordinal", 0),
+                )
+            )
+        }
+        return grouped
+    }
 
-            launch {
-                packagePicsChannel
-                    .receiveAsFlow()
-                    .filter { it.isNotEmpty() }
-                    .buffer(capacity = MAX_PICS_BUFFER, onBufferOverflow = BufferOverflow.SUSPEND)
-                    .collect { packageRequests ->
-                        Timber.d("Processing ${packageRequests.size} package PICS requests")
-
-                        ensureActive()
-                        if (!isLoggedIn) return@collect
-                        val steamApps = instance?._steamApps ?: return@collect
-
-                        val callback =
-                            steamApps
-                                .picsGetProductInfo(
-                                    apps = emptyList(),
-                                    packages = packageRequests,
-                                ).await()
-
-                        callback.results.forEach { picsCallback ->
-                            // Don't race the queue.
-                            if (!isLoggedIn) return@collect
-                            val queue = Collections.synchronizedList(mutableListOf<Int>())
-
-                            db.withTransaction {
-                                picsCallback.packages.values.forEach { pkg ->
-                                    val appIds = pkg.keyValues["appids"].children.map { it.asInteger() }
-                                    licenseDao.updateApps(pkg.id, appIds)
-
-                                    val depotIds = pkg.keyValues["depotids"].children.map { it.asInteger() }
-                                    licenseDao.updateDepots(pkg.id, depotIds)
-
-                                    // Insert a stub row (or update) of SteamApps to the database.
-                                    appIds.forEach { appid ->
-                                        val steamApp = appDao.findApp(appid)?.copy(packageId = pkg.id)
-                                        if (steamApp != null) {
-                                            appDao.update(steamApp)
-                                        } else {
-                                            val stubSteamApp = SteamApp(id = appid, packageId = pkg.id)
-                                            appDao.insert(stubSteamApp)
-                                        }
-                                    }
+    fun setActiveConversation(steamId: Long) {
+        if (steamId == 0L) return
+        activeConversations.merge(steamId, 1) { a, b -> a + b }
+        touchRecentChat(steamId)
+        clearUnread(steamId)
+        runCatching { notificationHelper.cancelChatNotification(steamId) }
+    }
 
-                                    queue.addAll(appIds)
-                                }
-                            }
+    fun sendChatImageAsync(friendId: Long, bytes: ByteArray, fileName: String) {
+        if (friendId == 0L || bytes.isEmpty()) return
+        scope.launch { sendChatImage(friendId, bytes, fileName) }
+    }
 
-                            try {
-                                // TODO: This could be an issue. (Stalling)
-                                steamApps
-                                    .picsGetAccessTokens(
-                                        appIds = queue,
-                                        packageIds = emptyList(),
-                                    ).await()
-                                    .appTokens
-                                    .forEach { (key, value) ->
-                                        appTokens[key] = value
-                                    }
+    fun clearActiveConversation(steamId: Long) {
+        if (steamId == 0L) return
+        activeConversations.compute(steamId) { _, v -> if (v == null || v <= 1) null else v - 1 }
+    }
 
-                                // Get PICS information with the app ids.
-                                queue
-                                    .map { PICSRequest(id = it, accessToken = appTokens[it] ?: 0L) }
-                                    .chunked(MAX_PICS_BUFFER)
-                                    .forEach { chunk ->
-                                        Timber.d("bufferedPICSGetProductInfo: Queueing ${chunk.size} for PICS")
-                                        appPicsChannel.send(chunk)
-                                    }
-                            } catch (e: AsyncJobFailedException) {
-                                Timber.w("Could not get PICS product info $e")
-                            }
-                        }
-                    }
-            }
-        }
+    fun clearUnread(steamId: Long) {
+        _unreadCounts.update { if (it.containsKey(steamId)) it - steamId else it }
+    }
 
-    /**
-     * Get encrypted app ticket for an app, with 30-minute caching.
-     * Returns the serialized protobuf bytes, or null if unavailable.
-     */
+    /** Encrypted app ticket for an app (30-minute cache); serialized protobuf bytes, or null if unavailable. */
     suspend fun getEncryptedAppTicket(appId: Int): ByteArray? {
         return try {
-            // Check database for existing ticket less than 30 minutes old
             val cachedTicket = encryptedAppTicketDao.getByAppId(appId)
             val now = System.currentTimeMillis()
             val thirtyMinutes = 30 * 60 * 1000L
@@ -6237,52 +4632,46 @@ class SteamService :
                 return cachedTicket.encryptedTicket
             }
 
-            // Request new ticket from Steam
-            val steamApps = instance?._steamApps ?: null
-            val response =
-                try {
-                    withTimeout(5_000) {
-                        steamApps?.requestEncryptedAppTicket(appId)?.await()
-                    }
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to request encrypted app ticket for app $appId")
-                    return null
+            // Cold Client needs this ticket for Capcom DRM titles; tolerate a slow wn-session cold-start by waiting up to 15s.
+            var wnTicket: ByteArray? = null
+            val ticketWaitDeadlineMs = System.currentTimeMillis() + 15_000L
+            while (wnTicket == null && System.currentTimeMillis() < ticketWaitDeadlineMs) {
+                wnTicket = withWnSession { session ->
+                    withContext(Dispatchers.IO) { session.requestEncryptedAppTicket(appId) }
                 }
-
-            if (response?.result != EResult.OK || response.encryptedAppTicket == null) {
-                Timber.w("Failed to get encrypted app ticket for app $appId: ${response?.result}")
-                return null
+                if (wnTicket != null) break
+                kotlinx.coroutines.delay(500L)
             }
-
-            // Extract all fields from the protobuf message
-            val ticketProto = response.encryptedAppTicket
-            val ticket =
-                EncryptedAppTicket(
-                    appId = appId,
-                    result = response.result.code(),
-                    ticketVersionNo = ticketProto!!.ticketVersionNo.toInt(),
-                    crcEncryptedTicket = ticketProto.crcEncryptedticket.toInt(),
-                    cbEncryptedUserData = ticketProto.cbEncrypteduserdata.toInt(),
-                    cbEncryptedAppOwnershipTicket = ticketProto.cbEncryptedAppownershipticket.toInt(),
-                    encryptedTicket = ticketProto.toByteArray(),
-                    timestamp = now,
-                )
-
-            // Store in database
-            encryptedAppTicketDao.insert(ticket)
-            Timber.d("Stored new encrypted app ticket protobuf for app $appId")
-
-            ticket.encryptedTicket
+            if (wnTicket == null) {
+                Timber.w("encrypted app ticket: 15s wait elapsed without success for app $appId")
+            }
+            if (wnTicket != null && wnTicket.isNotEmpty()) {
+                runCatching {
+                    encryptedAppTicketDao.insert(
+                        EncryptedAppTicket(
+                            appId = appId,
+                            result = EResult.OK.code(),
+                            ticketVersionNo = 0,
+                            crcEncryptedTicket = 0,
+                            cbEncryptedUserData = 0,
+                            cbEncryptedAppOwnershipTicket = 0,
+                            encryptedTicket = wnTicket,
+                            timestamp = now,
+                        ),
+                    )
+                }.onFailure { Timber.w(it, "encrypted app ticket cache insert failed") }
+                Timber.i("encrypted app ticket via wn-steam-client: ${wnTicket.size} bytes (app $appId)")
+                return wnTicket
+            }
+            Timber.w("wn-steam-client encrypted app ticket unavailable for app $appId")
+            null
         } catch (e: Exception) {
             Timber.e(e, "Error getting encrypted app ticket for app $appId")
             null
         }
     }
 
-    /**
-     * Get encrypted app ticket as base64 encoded string, with 30-minute caching.
-     * Returns the base64 encoded ticket, or null if unavailable.
-     */
+    /** Encrypted app ticket as a base64 string (30-minute cache); null if unavailable. */
     suspend fun getEncryptedAppTicketBase64(appId: Int): String? {
         val ticket = getEncryptedAppTicket(appId) ?: return null
         return Base64.encodeToString(ticket, Base64.NO_WRAP)
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceCloud.kt b/app/src/main/feature/stores/steam/service/SteamServiceCloud.kt
new file mode 100644
index 000000000..8a9d35352
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceCloud.kt
@@ -0,0 +1,562 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Launch-state priming + libsteamclient/achievements/workshop helpers, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.resolvePreferredLaunchBuildId(
+    app: SteamApp?,
+    branch: String,
+): Int {
+    val buildId =
+        app?.branches?.get(branch)?.buildId
+            ?: app?.branches?.get("public")?.buildId
+            ?: app?.branches?.values?.firstOrNull()?.buildId
+            ?: 0L
+    return buildId.coerceIn(0L, Int.MAX_VALUE.toLong()).toInt()
+}
+
+internal fun SteamService.Companion.resolvePreferredLaunchDepotIds(
+    appId: Int,
+    branch: String,
+    preferredLanguage: String = PrefManager.containerLanguage,
+): IntArray {
+    val trustedInstalledDepots =
+        getInstalledApp(appId)
+            ?.downloadedDepots
+            .orEmpty()
+            .asSequence()
+            .filter { it > 0 }
+            .distinct()
+            .sorted()
+            .toList()
+    if (trustedInstalledDepots.isNotEmpty()) {
+        return trustedInstalledDepots.toIntArray()
+    }
+
+    val installedDlcAppIds = getInstalledDlcDepotsOf(appId).orEmpty()
+    val fallbackSelectedDepots =
+        getSelectedDownloadDepots(
+            appId = appId,
+            userSelectedDlcAppIds = installedDlcAppIds,
+            preferredLanguage = preferredLanguage,
+            branch = branch,
+        ).keys
+            .asSequence()
+            .filter { it > 0 }
+            .distinct()
+            .sorted()
+            .toList()
+    if (fallbackSelectedDepots.isNotEmpty()) {
+        Timber.w(
+            "resolvePreferredLaunchDepotIds: appId=$appId branch=$branch " +
+                "had no trusted depot snapshot; using ${fallbackSelectedDepots.size} selected depot(s)",
+        )
+        return fallbackSelectedDepots.toIntArray()
+    }
+
+    return IntArray(0)
+}
+
+internal suspend fun SteamService.Companion.primeLibSteamClientLaunchState(
+    appId: Int,
+    selectedBranch: String,
+): Boolean {
+    val svc = instance ?: return false
+    val ctx = svc.applicationContext
+    val libSteamClient = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+    if (!libSteamClient.ensureLoaded(ctx)) {
+        Timber.w("primeLibSteamClientLaunchState: failed to load bridge library for appId=$appId")
+        return false
+    }
+    libSteamClient.seedFromPrefManager(ctx)
+
+    val manifestBranch = selectedBranch.ifBlank { "public" }
+    val app = withContext(Dispatchers.IO) { svc.appDao.findApp(appId) }
+    val rawInstalledApp = withContext(Dispatchers.IO) { svc.appInfoDao.getInstalledApp(appId) }
+    val ownedIds = withContext(Dispatchers.IO) { svc.appDao.getAllAppIds() }
+    val installedIds =
+        withContext(Dispatchers.IO) { svc.appInfoDao.getAllInstalledAppIds().toMutableSet() }
+            .apply {
+                if (rawInstalledApp?.isDownloaded == true) {
+                    add(appId)
+                }
+            }
+
+    libSteamClient.setAppId(appId)
+    if (ownedIds.isNotEmpty()) {
+        libSteamClient.setOwnedApps(ownedIds.toIntArray())
+    }
+    if (installedIds.isNotEmpty()) {
+        libSteamClient.setInstalledApps(installedIds.sorted().toIntArray())
+    }
+
+    app?.name?.takeIf { it.isNotBlank() }?.let { appName ->
+        libSteamClient.setAppNames(intArrayOf(appId), arrayOf(appName))
+    }
+
+    val installDir = runCatching { getAppDirPath(appId) }.getOrNull()
+    if (!installDir.isNullOrEmpty()) {
+        libSteamClient.setAppInstallDir(appId, installDir)
+    }
+
+    val buildId = resolvePreferredLaunchBuildId(app, manifestBranch)
+    if (buildId > 0) {
+        libSteamClient.setAppBuildId(appId, buildId)
+    }
+
+    val depotIds = resolvePreferredLaunchDepotIds(appId, manifestBranch)
+    if (depotIds.isNotEmpty()) {
+        libSteamClient.setAppInstalledDepots(appId, depotIds)
+    }
+
+    app?.packageId
+        ?.takeIf { it != INVALID_PKG_ID }
+        ?.let { packageId ->
+            libSteamClient.setAppSourcePackages(appId, intArrayOf(packageId))
+        }
+
+    val accountId = runCatching {
+        com.winlator.cmod.feature.stores.steam.utils
+            .SteamUtils.getSteam3AccountId().toLong()
+    }.getOrNull() ?: 0L
+    if (accountId > 0L) {
+        val remoteDir = runCatching {
+            com.winlator.cmod.feature.stores.steam.enums
+                .PathType.SteamUserData.toAbsPath(
+                    svc,
+                    appId,
+                    accountId,
+                )
+        }.getOrNull()
+        if (!remoteDir.isNullOrEmpty()) {
+            libSteamClient.setAppCloudRemoteDir(appId, remoteDir)
+        }
+    }
+
+    libSteamClient.setAppCurrentBeta(appId, selectedBranch)
+    Timber.i(
+        "primeLibSteamClientLaunchState: app=$appId branch=$manifestBranch " +
+            "buildId=$buildId depots=${depotIds.size} owned=${ownedIds.size} installed=${installedIds.size}",
+    )
+    return true
+}
+
+internal fun SteamService.Companion.pushAchievementSchemaToLibSteamClient(
+    appId: Int,
+    achievements: List<com.winlator.cmod.feature.stores.steam.statsgen.Achievement>,
+    stats: List<com.winlator.cmod.feature.stores.steam.statsgen.Stat>,
+    nameToBlockBit: Map<String, Pair<Int, Int>> = emptyMap(),
+) {
+    val locale = PrefManager.containerLanguage.ifBlank { "english" }
+    fun pick(map: Map<String, String>?): String =
+        map?.get(locale) ?: map?.get("english") ?: map?.values?.firstOrNull() ?: ""
+
+    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+        .setAppId(appId)
+
+    val n = achievements.size
+    if (n == 0) {
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            .setAchievementSchema(emptyArray(), emptyArray(), emptyArray(), emptyArray(), BooleanArray(0))
+        Timber.i("Pushed empty achievement schema to libsteamclient.so (app $appId)")
+        return
+    }
+
+    val apiNames     = Array(n) { i -> achievements[i].name }
+    val displayNames = Array(n) { i -> pick(achievements[i].displayName) }
+    val descriptions = Array(n) { i -> pick(achievements[i].description) }
+    val icons        = Array(n) { i -> achievements[i].icon ?: "" }
+    val hidden       = BooleanArray(n) { i -> achievements[i].hidden != 0 }
+    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+        .setAchievementSchema(apiNames, displayNames, descriptions, icons, hidden)
+
+    val statNames = mutableListOf<String>()
+    val statIds = mutableListOf<Int>()
+    for (s in stats) {
+        val id = s.id.toIntOrNull() ?: continue
+        if (s.name.isEmpty() || id < 0) continue
+        statNames.add(s.name)
+        statIds.add(id)
+    }
+    if (statNames.isNotEmpty()) {
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+            .setStatIds(statNames.toTypedArray(), statIds.toIntArray())
+        Timber.i("Pushed stat name→id map for app $appId: ${statNames.size} entries")
+    }
+
+    if (nameToBlockBit.isNotEmpty()) {
+        val mappedNames = mutableListOf<String>()
+        val mappedBlocks = mutableListOf<Int>()
+        val mappedBits = mutableListOf<Int>()
+        for (a in achievements) {
+            val pair = nameToBlockBit[a.name] ?: continue
+            mappedNames.add(a.name)
+            mappedBlocks.add(pair.first)
+            mappedBits.add(pair.second)
+        }
+        if (mappedNames.isNotEmpty()) {
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAchievementBlockBits(
+                    mappedNames.toTypedArray(),
+                    mappedBlocks.toIntArray(),
+                    mappedBits.toIntArray(),
+                )
+            Timber.i("Pushed achievement bit-pack mapping for app $appId: ${mappedNames.size} entries")
+        }
+    }
+
+    var localeAddsPushed = 0
+    for (a in achievements) {
+        val dnByLocale = a.displayName ?: emptyMap()
+        val dsByLocale = a.description ?: emptyMap()
+        val locales = dnByLocale.keys union dsByLocale.keys
+        for (loc in locales) {
+            if (loc.equals("english", ignoreCase = true)) continue
+            val dn = dnByLocale[loc]
+            val ds = dsByLocale[loc]
+            if (dn.isNullOrEmpty() && ds.isNullOrEmpty()) continue
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .addAchievementLocale(a.name, loc, dn, ds)
+            ++localeAddsPushed
+        }
+    }
+
+    var unlocksPushed = 0
+    for (a in achievements) {
+        val unlocked = a.unlocked == true
+        val ts       = a.unlockTimestamp ?: 0
+        if (unlocked || ts > 0) {
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAchievementProgress(a.name, unlocked, ts)
+            ++unlocksPushed
+        }
+    }
+    for (s in stats) {
+        when (s.type) {
+            "int" -> com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setStatInt(s.name, s.default.toIntOrNull() ?: 0)
+            "float" -> com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setStatFloat(s.name, s.default.toFloatOrNull() ?: 0f)
+        }
+    }
+    Timber.i("Pushed achievement schema to libsteamclient.so: app=$appId ach=$n unlocks=$unlocksPushed stats=${stats.size} localeAdds=$localeAddsPushed")
+
+    cacheAchievementSchemaJson(appId, achievements, stats, nameToBlockBit)
+}
+
+internal fun SteamService.Companion.cacheAchievementSchemaJson(
+    appId: Int,
+    achievements: List<com.winlator.cmod.feature.stores.steam.statsgen.Achievement>,
+    stats: List<com.winlator.cmod.feature.stores.steam.statsgen.Stat>,
+    nameToBlockBit: Map<String, Pair<Int, Int>> = emptyMap(),
+) {
+    if (appId <= 0) return
+    val ctx = instance?.applicationContext ?: return
+    try {
+        val dir = File(ctx.filesDir, "wn_lsteam_schemas")
+        if (!dir.exists()) dir.mkdirs()
+        val root = JSONObject()
+        root.put("v", 1)
+        root.put("ts", System.currentTimeMillis() / 1000)
+        val achArr = JSONArray()
+        for (a in achievements) {
+            val o = JSONObject()
+            o.put("name", a.name)
+            a.displayName?.takeIf { it.isNotEmpty() }?.let { m ->
+                val mo = JSONObject()
+                m.forEach { (k, v) -> mo.put(k, v) }
+                o.put("displayName", mo)
+            }
+            a.description?.takeIf { it.isNotEmpty() }?.let { m ->
+                val mo = JSONObject()
+                m.forEach { (k, v) -> mo.put(k, v) }
+                o.put("description", mo)
+            }
+            a.icon?.takeIf { it.isNotEmpty() }?.let { o.put("icon", it) }
+            if (a.hidden != 0) o.put("hidden", a.hidden)
+            a.unlocked?.let { o.put("unlocked", it) }
+            a.unlockTimestamp?.let { o.put("unlockTimestamp", it) }
+            achArr.put(o)
+        }
+        root.put("achievements", achArr)
+        val statArr = JSONArray()
+        for (s in stats) {
+            val o = JSONObject()
+            o.put("id", s.id)
+            o.put("name", s.name)
+            o.put("type", s.type)
+            o.put("default", s.default)
+            statArr.put(o)
+        }
+        root.put("stats", statArr)
+        if (nameToBlockBit.isNotEmpty()) {
+            val bitsArr = JSONArray()
+            for ((name, pair) in nameToBlockBit) {
+                val o = JSONObject()
+                o.put("name", name)
+                o.put("block", pair.first)
+                o.put("bit", pair.second)
+                bitsArr.put(o)
+            }
+            root.put("nameToBlockBit", bitsArr)
+        }
+        File(dir, "$appId.json").writeText(root.toString(), Charsets.UTF_8)
+        Timber.i("Cached schema for app $appId: ${achievements.size} ach, " +
+            "${stats.size} stats, ${nameToBlockBit.size} bit-mappings")
+    } catch (t: Throwable) {
+        Timber.w(t, "cacheAchievementSchemaJson failed appId=$appId")
+    }
+}
+
+internal fun SteamService.Companion.downloadWorkshopPreview(url: String, dest: File) {
+    val conn = java.net.URL(url).openConnection() as java.net.HttpURLConnection
+    conn.connectTimeout = 15_000
+    conn.readTimeout = 30_000
+    conn.instanceFollowRedirects = true
+    try {
+        if (conn.responseCode !in 200..299) return
+        val type = conn.contentType.orEmpty()
+        if (type.isNotEmpty() && !type.startsWith("image/")) return
+        dest.parentFile?.mkdirs()
+        val maxBytes = 16L * 1024 * 1024  // cap — a preview image is never this large
+        var over = false
+        var total = 0L
+        conn.inputStream.use { input ->
+            dest.outputStream().use { out ->
+                val buf = ByteArray(64 * 1024)
+                while (true) {
+                    val n = input.read(buf)
+                    if (n < 0) break
+                    total += n
+                    if (total > maxBytes) { over = true; break }
+                    out.write(buf, 0, n)
+                }
+            }
+        }
+        // Discard an over-cap (truncated) or empty download — never let mods.json reference a corrupt preview.
+        if (over || total == 0L) dest.delete()
+    } finally {
+        conn.disconnect()
+    }
+}
+
+internal fun SteamService.Companion.findSteamSettingsDir(
+    context: Context,
+    appId: Int,
+): String? {
+    val appDirPath = getAppDirPath(appId)
+    val appDirSettings = File(appDirPath, "steam_settings")
+    if (appDirSettings.isDirectory) {
+        return appDirSettings.absolutePath
+    }
+
+    val container = ContainerUtils.getContainer(context, "STEAM_$appId") ?: return null
+    val coldclientSettings =
+        File(
+            container.rootDir,
+            ".wine/drive_c/Program Files (x86)/Steam/steam_settings",
+        )
+    if (coldclientSettings.isDirectory) {
+        return coldclientSettings.absolutePath
+    }
+
+    return null
+}
+
+/** Decode a hex string (from the native JNI layer) to bytes; empty array for too-short/empty input. */
+internal fun SteamService.Companion.hexToBytes(hex: String): ByteArray {
+    if (hex.length < 2) return ByteArray(0)
+    val n = hex.length / 2
+    val out = ByteArray(n)
+    for (i in 0 until n) {
+        out[i] = ((Character.digit(hex[i * 2], 16) shl 4) or
+            Character.digit(hex[i * 2 + 1], 16)).toByte()
+    }
+    return out
+}
+
+/** Write achievement/stat values back to Steam (CMsgClientStoreUserStats2). Fire-and-forget. */
+internal suspend fun SteamService.Companion.sendStoreUserStats(
+    appId: Int,
+    stats: Map<Int, Int>,
+    steamId: Long,
+    crcStats: Int,
+) {
+    if (stats.isEmpty()) return
+    val statIds = IntArray(stats.size)
+    val statValues = IntArray(stats.size)
+    var i = 0
+    for ((id, value) in stats) {
+        statIds[i] = id
+        statValues[i] = value
+        i++
+    }
+    val sent = withWnSession { session ->
+        session.storeUserStats(appId, steamId, crcStats, statIds, statValues)
+        true
+    }
+    if (sent != true) {
+        Timber.e("Failed to send storeUserStats for appId=$appId — no session")
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceConnection.kt b/app/src/main/feature/stores/steam/service/SteamServiceConnection.kt
new file mode 100644
index 000000000..83b21b4a5
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceConnection.kt
@@ -0,0 +1,668 @@
+package com.winlator.cmod.feature.stores.steam.service
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.BACKGROUND_IDLE_GRACE_MS
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.CONNECT_LOGON_MAX_ATTEMPTS
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.MAX_PICS_BUFFER
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.RECONNECT_BACKOFF_CAP_MS
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.REFRESH_TOKEN_ROTATION_CHECK_INTERVAL_MS
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.REFRESH_TOKEN_ROTATION_THRESHOLD_DAYS
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.WN_PLANW_REAP_OFFLINE_MS
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.instance
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.isConnected
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.isLoggingOut
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.isRunning
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.isStopping
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.isWaitingForQRAuth
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.kickPlayingSessionIfReady
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.syncInProgressApps
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.userSteamId
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.withWnSession
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.wnLibrary
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.wnLibraryMirrorJob
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.wnLoggedOnHandled
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.wnSession
+import android.app.Service.STOP_FOREGROUND_REMOVE
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Instance connection/session lifecycle + bionic handoff + license processing, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.suspensionReasonForDiag(): String {
+    val reasons = mutableListOf<String>()
+    if (suspendedForBackground) reasons += "background-idle"
+    if (suspendedForBionic) reasons += "bionic-handoff"
+    if (!appInForeground) reasons += "app-bg"
+    if (isLoggingOut) reasons += "logging-out"
+    if (isStopping) reasons += "stopping"
+    return reasons.joinToString(",")
+}
+
+/** Brings up (or reuses) the long-lived session and logs it on with the stored refresh token; [withWnSession] promotes it and installs the orchestrator observer (fires [onWnLoggedOn]). Retries with backoff until logged on or the service stops. Cold-start auto-logon and reconnect. */
+internal fun SteamService.connectAndLogon() {
+    if (connectJob?.isActive == true) return
+    connectJob =
+        scope.launch {
+            PluviaApp.events.emit(SteamEvent.Connected(true))
+            var attempt = 0
+            while (isRunning && !isStopping && PrefManager.refreshToken.isNotBlank()) {
+                if (wnSession?.state() == 3) break
+                Timber.d("connectAndLogon: bringing up WN-Steam-Client session")
+                val state = withWnSession { it.state() }
+                if (state == 3) break
+                attempt++
+                if (attempt >= CONNECT_LOGON_MAX_ATTEMPTS) {
+                    // Logon failed this many times — likely an expired/revoked token or sustained outage. Stop instead of spinning a full bring-up + logon forever (battery drain); a foreground wake or explicit re-login re-triggers connectAndLogon.
+                    Timber.w("connectAndLogon: giving up after $attempt failed attempts")
+                    break
+                }
+                val backoffMs = reconnectBackoffMs(attempt)
+                Timber.w("connectAndLogon: not logged on — retry $attempt in ${backoffMs}ms")
+                delay(backoffMs)
+            }
+        }
+}
+
+internal fun SteamService.ensureHealthySessionImpl() {
+    if (!isRunning || isStopping || isLoggingOut) return
+    if (PrefManager.refreshToken.isBlank()) return
+    if (PluviaApp.isGameSessionActive()) return
+    if (suspendedForBionic) {
+        Timber.w("ensureHealthySession: clearing stale Bionic hand-off (no game running)")
+        bionicHandoffReleaseImpl()
+        return
+    }
+    if (wnSession?.state() == 3) return
+    Timber.i("ensureHealthySession: session not logged on — re-driving connectAndLogon")
+    retryAttempt = 0
+    connectAndLogon()
+}
+
+internal fun SteamService.handleAppForegrounded() {
+    appInForeground = true
+    // Cancel any pending suspend timer — the app is back, so the session must stay up regardless of how long it was minimized.
+    backgroundIdleJob?.cancel()
+    backgroundIdleJob = null
+    // Restore the quiet foreground notification and drop the background-chat one.
+    if (isRunning && !isStopping) {
+        runCatching {
+            startForeground(1, notificationHelper.createForegroundNotification("Steam Service is running"))
+            notificationHelper.cancelBackgroundRunning()
+        }.onFailure { Timber.w(it, "Failed to restore SteamService foreground notification") }
+    }
+    if (!suspendedForBackground) return
+    suspendedForBackground = false
+    Timber.i("App foregrounded — waking the WN-Steam-Client session")
+    retryAttempt = 0
+    if (isRunning && !isStopping && PrefManager.refreshToken.isNotBlank()) {
+        runCatching {
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setLoggedOn(true)
+        }
+        connectAndLogon()
+    }
+}
+
+/** App went to the background — arm the deferred suspend check. */
+internal fun SteamService.handleAppBackgrounded() {
+    appInForeground = false
+    if (PrefManager.chatStayRunningOnExit && isRunning && !isStopping) {
+        runCatching {
+            startForeground(
+                NotificationHelper.BACKGROUND_RUNNING_NOTIFICATION_ID,
+                notificationHelper.createBackgroundRunningNotification(),
+            )
+            notificationHelper.cancel()
+        }.onFailure { Timber.w(it, "Failed to show Steam background-chat notification") }
+    }
+    scheduleBackgroundSuspendCheck()
+}
+
+/** Arm the background suspend check: [maybeSuspendForBackground] runs immediately, then repeats once per [BACKGROUND_IDLE_GRACE_MS] while connection-critical work runs (so nothing has to hook each operation's completion). A foreground event cancels it. */
+internal fun SteamService.scheduleBackgroundSuspendCheck() {
+    backgroundIdleJob?.cancel()
+    if (appInForeground || isStopping || isLoggingOut) return
+    backgroundIdleJob =
+        scope.launch {
+            while (isActive) {
+                if (appInForeground || isStopping || isLoggingOut || suspendedForBackground) {
+                    return@launch
+                }
+                // Suspended → done. Still busy → loop and re-check later.
+                if (maybeSuspendForBackground()) return@launch
+                delay(BACKGROUND_IDLE_GRACE_MS)
+            }
+        }
+}
+
+/** Reason the connection must stay open (null = safe to suspend) — anything that would corrupt data if the CM session dropped mid-operation: an active download (not paused/queued), a running game session, or an in-flight cloud-save sync (never interrupt or the save can be left corrupt). */
+internal fun SteamService.connectionCriticalWork(): String? =
+    when {
+        DownloadCoordinator.hasActiveDownload() -> "a download is active"
+        PluviaApp.isGameSessionActive() -> "a game session is running"
+        syncInProgressApps.values.any { it.get() } -> "a cloud save sync is in progress"
+        PrefManager.chatStayRunningOnExit -> "background chat is enabled"
+        else -> null
+    }
+
+
+/** Suspend the backgrounded Steam session to draw no power — unless [connectionCriticalWork] still needs it. Disconnects the session and cancels every reconnect/PICS loop; wakes from [handleAppForegrounded]. Returns true if suspended. */
+internal fun SteamService.maybeSuspendForBackground(): Boolean {
+    if (appInForeground || isStopping || isLoggingOut || suspendedForBackground) return false
+    val keepAliveReason = connectionCriticalWork()
+    if (keepAliveReason != null) {
+        Timber.i("App backgrounded but %s — keeping the Steam session connected", keepAliveReason)
+        return false
+    }
+    Timber.i("App backgrounded and idle — suspending WN-Steam-Client session to save battery")
+    suspendedForBackground = true
+    connectJob?.cancel()
+    reconnectJob?.cancel()
+    stableConnectionJob?.cancel()
+    refreshTokenWatchdogJob?.cancel()
+    picsChangesCheckerJob?.cancel()
+    picsGetProductInfoJob?.cancel()
+    messagePollerJob?.cancel()
+    wnSession?.let { s -> runCatching { s.disconnect() } }
+    scope.launch(Dispatchers.Main) {
+        runCatching { stopForeground(STOP_FOREGROUND_REMOVE) }
+            .onFailure { Timber.w(it, "Failed to remove SteamService foreground state on background suspend") }
+        runCatching { notificationHelper.cancel() }
+            .onFailure { Timber.w(it, "Failed to cancel SteamService notification on background suspend") }
+    }
+    return true
+}
+
+internal fun SteamService.startRefreshTokenWatchdog() {
+    refreshTokenWatchdogJob?.cancel()
+    refreshTokenWatchdogJob = scope.launch(Dispatchers.IO) {
+        while (isActive && !isStopping && !isLoggingOut) {
+            runCatching { maybeRotateRefreshToken() }
+                .onFailure { Timber.w(it, "refresh-token watchdog tick threw") }
+            delay(REFRESH_TOKEN_ROTATION_CHECK_INTERVAL_MS)
+        }
+    }
+}
+
+internal suspend fun SteamService.maybeRotateRefreshToken() {
+    val cur = PrefManager.refreshToken
+    if (cur.isBlank()) return
+    val expMs: Long? = try {
+        val jwt = com.auth0.android.jwt.JWT(cur)
+        jwt.expiresAt?.time
+    } catch (t: Throwable) {
+        Timber.w(t, "refresh-token watchdog: JWT decode failed; rotating defensively")
+        null
+    }
+    val nowMs = System.currentTimeMillis()
+    val thresholdMs = REFRESH_TOKEN_ROTATION_THRESHOLD_DAYS * 24L * 60L * 60L * 1000L
+    val needsRotation = expMs == null || (expMs - nowMs) < thresholdMs
+    if (!needsRotation) {
+        val daysLeft = ((expMs!! - nowMs) / (24L * 60L * 60L * 1000L)).coerceAtLeast(0)
+        Timber.d("refresh-token watchdog: token healthy ($daysLeft days to expiry)")
+        return
+    }
+    val rotated = renewRefreshTokenForHandoff()
+    Timber.i("refresh-token watchdog: rotation attempt → $rotated")
+}
+
+internal suspend fun SteamService.renewRefreshTokenForHandoff(): Boolean =
+    withContext(Dispatchers.IO) {
+        val session = wnSession ?: return@withContext false
+        val current = PrefManager.refreshToken
+        val sid = PrefManager.steamUserSteamId64
+        if (current.isEmpty() || sid == 0L) return@withContext false
+        val fresh = try {
+            session.renewRefreshToken(current, sid, timeoutMs = 15_000)
+        } catch (t: Throwable) {
+            Timber.w(t, "renewRefreshToken threw")
+            null
+        }
+        if (fresh.isNullOrEmpty()) {
+            Timber.w("renewRefreshTokenForHandoff: no new token returned")
+            return@withContext false
+        }
+        PrefManager.refreshToken = fresh
+        Timber.i("renewRefreshTokenForHandoff: token rotated (len ${current.length} -> ${fresh.length})")
+        true
+    }
+
+
+internal fun SteamService.bionicHandoffAcquireImpl() {
+    if (suspendedForBionic) return
+    suspendedForBionic = true
+    Timber.i("Bionic hand-off ACQUIRE — suspending WN-Steam-Client session for the bootstrap")
+    connectJob?.cancel()
+    reconnectJob?.cancel()
+    stableConnectionJob?.cancel()
+    refreshTokenWatchdogJob?.cancel()
+    picsChangesCheckerJob?.cancel()
+    picsGetProductInfoJob?.cancel()
+    messagePollerJob?.cancel()
+    wnSession?.let { s -> runCatching { s.logOffAndDisconnect(500) } }
+}
+
+internal fun SteamService.bionicHandoffReleaseImpl() {
+    runCatching {
+        com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamBootstrap.stop()
+    }
+    if (!suspendedForBionic) return
+    suspendedForBionic = false
+    retryAttempt = 0
+    if (!(isRunning && !isStopping && !isLoggingOut && PrefManager.refreshToken.isNotBlank())) {
+        Timber.i("Bionic hand-off RELEASE — not resuming (service not in a resumable state)")
+        return
+    }
+    // PlanW: defer the wn-session resume so the account stays offline long enough for Steam to reap the launcher's games-played registration; resuming immediately keeps it online and the next launch hits AlreadyRunning (0x10).
+    if (PrefManager.wnPlanW) {
+        Timber.i(
+            "Bionic hand-off RELEASE — PlanW: deferring wn-session resume " +
+                "${WN_PLANW_REAP_OFFLINE_MS}ms so Steam reaps the launcher's " +
+                "games-played registration (account stays offline)",
+        )
+        scope.launch(Dispatchers.IO) {
+            delay(WN_PLANW_REAP_OFFLINE_MS)
+            // Skip if a new launch re-acquired the hand-off, or the session already came up some other way.
+            if (!suspendedForBionic && isRunning && !isStopping && !isLoggingOut &&
+                PrefManager.refreshToken.isNotBlank() && (wnSession?.state() ?: 0) != 3
+            ) {
+                Timber.i("Bionic hand-off RELEASE — PlanW reap window elapsed, resuming WN-Steam-Client")
+                connectAndLogon()
+            } else {
+                Timber.i(
+                    "Bionic hand-off RELEASE — PlanW reap window elapsed, resume skipped " +
+                        "(suspendedForBionic=$suspendedForBionic wnState=${wnSession?.state()})",
+                )
+            }
+        }
+    } else {
+        Timber.i("Bionic hand-off RELEASE — bootstrap logged off, resuming WN-Steam-Client")
+        connectAndLogon()
+    }
+}
+
+internal fun SteamService.bionicHandoffReleaseAndKickPlayingSessionAsyncImpl(onlyGame: Boolean) {
+    bionicHandoffReleaseImpl()
+    if (!isRunning || isStopping || isLoggingOut) return
+    scope.launch(Dispatchers.IO) {
+        repeat(20) { attempt ->
+            if (kickPlayingSessionIfReady(onlyGame)) {
+                Timber.i(
+                    "Bionic hand-off release: kickPlayingSessionIfReady fired " +
+                        "after reconnect (attempt ${attempt + 1}/20 onlyGame=$onlyGame)",
+                )
+                return@launch
+            }
+            delay(500L)
+        }
+        Timber.i(
+            "Bionic hand-off release: wn-session never became ready " +
+                "for kickPlayingSessionIfReady (onlyGame=$onlyGame)",
+        )
+    }
+}
+
+internal suspend fun SteamService.bionicHandoffReleaseAndKickPlayingSessionBlockingImpl(
+    onlyGame: Boolean,
+    maxWaitMs: Long,
+): Boolean {
+    bionicHandoffReleaseImpl()
+    if (!isRunning || isStopping || isLoggingOut) return false
+
+    val deadlineMs = System.currentTimeMillis() + maxWaitMs
+    var attempt = 0
+    do {
+        attempt++
+        if (kickPlayingSessionIfReady(onlyGame)) {
+            Timber.i(
+                "Bionic hand-off release: kickPlayingSessionIfReady fired " +
+                    "before close (attempt $attempt onlyGame=$onlyGame)",
+            )
+            return true
+        }
+
+        val remainingMs = deadlineMs - System.currentTimeMillis()
+        if (remainingMs <= 0L) break
+        delay(minOf(250L, remainingMs))
+    } while (true)
+
+    Timber.i(
+        "Bionic hand-off release: wn-session never became ready " +
+            "before close (onlyGame=$onlyGame timeoutMs=$maxWaitMs)",
+    )
+    return false
+}
+
+internal fun SteamService.clearValues() {
+    if (instance === this) {
+        instance = null
+    }
+
+    _loginResult = LoginResult.Failed
+    isRunning = false
+    isConnected = false
+    isLoggingOut = false
+    isWaitingForQRAuth = false
+
+    wnLoggedOnHandled = false
+    wnLibraryMirrorJob?.cancel()
+    wnLibraryMirrorJob = null
+    wnLibrary?.stopObserving()
+    wnLibrary = null
+
+    _unifiedFriends?.close()
+    _unifiedFriends = null
+
+    isStopping = false
+    retryAttempt = 0
+    reconnectJob?.cancel()
+    reconnectJob = null
+    stableConnectionJob?.cancel()
+    refreshTokenWatchdogJob?.cancel()
+    stableConnectionJob = null
+    backgroundIdleJob?.cancel()
+    backgroundIdleJob = null
+    suspendedForBackground = false
+    suspendedForBionic = false
+    appInForeground = true
+
+    PluviaApp.events.off<AndroidEvent.EndProcess, Unit>(onEndProcess)
+    PluviaApp.events.clearAllListenersOf<SteamEvent<Any>>()
+}
+
+/** Channel-dropped (onDisconnected) handler: reconnects while credentials + retries remain, else emits Disconnected and stops the service. Fired from the [installWnLogonObserver] state observer. */
+/** Exponential reconnect backoff (2s, 4s, 8s… doubling per 1-based attempt, capped at [RECONNECT_BACKOFF_CAP_MS]) — without it a connection that logs on then drops reconnects in a tight loop and overheats the device. */
+internal fun SteamService.reconnectBackoffMs(attempt: Int): Long {
+    val shift = (attempt - 1).coerceIn(0, 8) // 2^0 .. 2^8
+    val seconds = (1L shl shift) * 2L // 2, 4, 8, , 512
+    return (seconds * 1000L).coerceAtMost(RECONNECT_BACKOFF_CAP_MS)
+}
+
+/** Populate the steam_license / cached_license tables from the received licenses (CMsgClientLicenseList); driven from the post-logon flow. */
+internal suspend fun SteamService.processLicenseList() {
+    // The license list is pushed just after logon; poll briefly for it.
+    var json: String? = null
+    for (attempt in 0 until 15) {
+        json = withWnSession { session -> session.getLicenseList() }
+        if (json != null && json != "[]") break
+        delay(200)
+    }
+    val arr =
+        try {
+            JSONArray(json ?: "[]")
+        } catch (e: Exception) {
+            Timber.w(e, "processLicenseList: bad license JSON")
+            return
+        }
+    if (arr.length() == 0) {
+        Timber.w("processLicenseList: no licenses received")
+        return
+    }
+    Timber.i("Received License List, size: ${arr.length()}")
+
+    data class RawLicense(
+        val packageId: Int, val changeNumber: Int,
+        val timeCreated: Long, val timeNextProcess: Long,
+        val minuteLimit: Int, val minutesUsed: Int,
+        val paymentMethod: Int, val flags: Int,
+        val purchaseCountryCode: String, val licenseType: Int,
+        val territoryCode: Int, val accessToken: Long,
+        val ownerId: Int, val masterPackageId: Int,
+    )
+    val raw =
+        (0 until arr.length()).map { i ->
+            val o = arr.getJSONObject(i)
+            RawLicense(
+                packageId = o.optInt("packageId"),
+                changeNumber = o.optInt("changeNumber"),
+                timeCreated = o.optLong("timeCreated"),
+                timeNextProcess = o.optLong("timeNextProcess"),
+                minuteLimit = o.optInt("minuteLimit"),
+                minutesUsed = o.optInt("minutesUsed"),
+                paymentMethod = o.optInt("paymentMethod"),
+                flags = o.optInt("flags"),
+                purchaseCountryCode = o.optString("purchaseCountryCode"),
+                licenseType = o.optInt("licenseType"),
+                territoryCode = o.optInt("territoryCode"),
+                accessToken = o.optLong("accessToken"),
+                ownerId = o.optInt("ownerId"),
+                masterPackageId = o.optInt("masterPackageId"),
+            )
+        }
+
+    db.withTransaction {
+        // Every launch refreshes licenses, so findStaleLicences picks up packages we no longer have (e.g. family-share changes).
+
+        // Store raw licenses for the manifest-fetch path (CachedLicense).
+        cachedLicenseDao.deleteAll()
+        cachedLicenseDao.insertAll(
+            raw.map { l ->
+                CachedLicense(
+                    licenseJson =
+                        LicenseSerializer.serializeLicenseFields(
+                            packageID = l.packageId,
+                            lastChangeNumber = l.changeNumber,
+                            timeCreatedMs = l.timeCreated * 1000L,
+                            timeNextProcessMs = l.timeNextProcess * 1000L,
+                            minuteLimit = l.minuteLimit,
+                            minutesUsed = l.minutesUsed,
+                            paymentMethod = l.paymentMethod,
+                            flags = l.flags,
+                            purchaseCode = l.purchaseCountryCode,
+                            licenseType = l.licenseType,
+                            territoryCode = l.territoryCode,
+                            accessToken = l.accessToken,
+                            ownerAccountID = l.ownerId,
+                            masterPackageID = l.masterPackageId,
+                        ),
+                )
+            },
+        )
+
+        val myAccountId = userSteamId?.accountID?.toInt()
+        val licensesToAdd =
+            raw.groupBy { it.packageId }.map { (packageId, group) ->
+                val preferred =
+                    group.firstOrNull { it.ownerId == myAccountId }
+                        ?: group.first()
+                // OR-combine the flag bitfields across every owner of the package.
+                val combinedFlags = EnumSet.noneOf(ELicenseFlags::class.java)
+                group.forEach { combinedFlags.addAll(ELicenseFlags.from(it.flags)) }
+                SteamLicense(
+                    packageId = packageId,
+                    lastChangeNumber = preferred.changeNumber,
+                    timeCreated = Date(preferred.timeCreated * 1000L),
+                    timeNextProcess = Date(preferred.timeNextProcess * 1000L),
+                    minuteLimit = preferred.minuteLimit,
+                    minutesUsed = preferred.minutesUsed,
+                    paymentMethod = EPaymentMethod.from(preferred.paymentMethod) ?: EPaymentMethod.None,
+                    licenseFlags = combinedFlags,
+                    purchaseCode = preferred.purchaseCountryCode,
+                    licenseType = ELicenseType.from(preferred.licenseType) ?: ELicenseType.NoLicense,
+                    territoryCode = preferred.territoryCode,
+                    accessToken = preferred.accessToken,
+                    ownerAccountId = group.map { it.ownerId },
+                    masterPackageID = preferred.masterPackageId,
+                )
+            }
+
+        if (licensesToAdd.isNotEmpty()) {
+            Timber.i("Adding ${licensesToAdd.size} licenses")
+            licenseDao.insertAll(licensesToAdd)
+        }
+
+        val licensesToRemove =
+            licenseDao.findStaleLicences(packageIds = raw.map { it.packageId })
+        if (licensesToRemove.isNotEmpty()) {
+            Timber.i("Removing ${licensesToRemove.size} (stale) licenses")
+            licenseDao.deleteStaleLicenses(licensesToRemove.map { it.packageId })
+        }
+
+        licenseDao
+            .getAllLicenses()
+            .map { PICSRequest(it.packageId, it.accessToken) }
+            .chunked(MAX_PICS_BUFFER)
+            .forEach { chunk ->
+                Timber.d("processLicenseList: Queueing ${chunk.size} package(s) for PICS")
+                packagePicsChannel.send(chunk)
+            }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceControllerConfig.kt b/app/src/main/feature/stores/steam/service/SteamServiceControllerConfig.kt
new file mode 100644
index 000000000..d152a9d6d
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceControllerConfig.kt
@@ -0,0 +1,321 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Steam Input / controller-config parsing helpers, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.selectSteamControllerConfig(details: List<SteamControllerConfigDetail>): SteamControllerConfigDetail? {
+    if (details.isEmpty()) return null
+
+    val branchPriority = listOf("default", "public")
+    val controllerPriority =
+        listOf(
+            "controller_xbox360",
+            "controller_xboxone",
+            "controller_steamcontroller_gordon",
+            "controller_generic",
+        )
+
+    for (branch in branchPriority) {
+        for (controllerType in controllerPriority) {
+            val match =
+                details.firstOrNull { detail ->
+                    detail.controllerType.equals(controllerType, ignoreCase = true) &&
+                        detail.enabledBranches.any { it.equals(branch, ignoreCase = true) }
+                }
+            if (match != null) return match
+        }
+    }
+
+    return null
+}
+
+internal fun SteamService.Companion.resolveSteamInputManifestFile(
+    appId: Int,
+    appDirPath: String,
+): File? {
+    val manifestPath =
+        getAppInfoOf(appId)
+            ?.config
+            ?.steamInputManifestPath
+            ?.trim()
+            .orEmpty()
+    if (manifestPath.isEmpty()) return null
+
+    return resolvePathCaseInsensitive(appDirPath, manifestPath)
+}
+
+internal fun SteamService.Companion.loadConfigFromManifest(manifestFile: File): String? {
+    if (!manifestFile.exists()) return null
+    val manifestDirPath = manifestFile.parentFile?.path ?: return null
+
+    val manifestText = manifestFile.readText(Charsets.UTF_8)
+    val configText =
+        try {
+            parseManifestForConfig(manifestDirPath, manifestText)
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to parse Steam Input manifest config at ${manifestFile.path}")
+            return null
+        }
+    return configText ?: manifestText
+}
+
+internal fun SteamService.Companion.parseManifestForConfig(
+    manifestDirPath: String,
+    manifestText: String,
+): String? {
+    return try {
+        val kv = KeyValue.loadFromString(manifestText) ?: return null
+        val actionManifest =
+            if (kv.name?.equals("Action Manifest", ignoreCase = true) == true) {
+                kv
+            } else {
+                kv["Action Manifest"]
+            }
+        if (actionManifest === KeyValue.INVALID) return null
+
+        val configs = actionManifest["configurations"]
+        if (configs === KeyValue.INVALID || configs.children.isEmpty()) {
+            throw IllegalStateException("No configurations found in Action Manifest")
+        }
+
+        val preferredControllers =
+            listOf(
+                "controller_xboxone",
+                "controller_steamcontroller_gordon",
+                "controller_generic",
+                "controller_xbox360",
+            )
+
+        for (controllerType in preferredControllers) {
+            val controllerBlock = configs[controllerType]
+            if (controllerBlock === KeyValue.INVALID) continue
+
+            for (entry in controllerBlock.children) {
+                val pathNode = entry["path"]
+                val configPath = pathNode.asString().orEmpty()
+                if (pathNode === KeyValue.INVALID || configPath.isEmpty()) continue
+
+                val configFile =
+                    resolvePathCaseInsensitive(manifestDirPath, configPath)
+                        ?: continue
+                return configFile.readText(Charsets.UTF_8)
+            }
+        }
+
+        throw IllegalStateException("No valid controller configuration found in Action Manifest")
+    } catch (e: Exception) {
+        Timber.e(e, "Failed to parse Steam Input manifest config")
+        null
+    }
+}
+
+internal fun SteamService.Companion.resolvePathCaseInsensitive(
+    baseDirPath: String,
+    relativePath: String,
+): File? {
+    val normalizedPath = relativePath.replace('\\', '/')
+    val directFile = File(baseDirPath, normalizedPath)
+    if (directFile.exists()) return directFile
+
+    var currentDir = File(baseDirPath)
+    if (!currentDir.exists() || !currentDir.isDirectory) return null
+
+    val segments = normalizedPath.split('/').filter { it.isNotEmpty() }
+    for ((index, segment) in segments.withIndex()) {
+        if (segment == ".") continue
+        if (segment == "..") {
+            currentDir = currentDir.parentFile ?: return null
+            continue
+        }
+        val entries = currentDir.listFiles() ?: return null
+        val matched =
+            entries.firstOrNull {
+                it.name.equals(segment, ignoreCase = true)
+            } ?: return null
+
+        if (index == segments.lastIndex) {
+            return matched
+        }
+
+        if (!matched.isDirectory) return null
+        currentDir = matched
+    }
+
+    return null
+}
+
+internal fun SteamService.Companion.readBuiltInSteamInputTemplate(fileName: String): String? {
+    val assets = instance?.assets ?: return null
+    return runCatching {
+        assets.open("steaminput/$fileName").use { stream ->
+            stream.readBytes().toString(Charsets.UTF_8)
+        }
+    }.getOrNull()
+}
+
+internal fun SteamService.Companion.readDownloadedSteamInputTemplate(appId: Int): String? {
+    val configFile = File(getAppDirPath(appId), STEAM_CONTROLLER_CONFIG_FILENAME)
+    if (!configFile.exists()) return null
+    return configFile.readText(Charsets.UTF_8)
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceDepot.kt b/app/src/main/feature/stores/steam/service/SteamServiceDepot.kt
new file mode 100644
index 000000000..1897f44e6
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceDepot.kt
@@ -0,0 +1,443 @@
+package com.winlator.cmod.feature.stores.steam.service
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.GroupedBaseAppDlcDepot
+import com.winlator.cmod.feature.stores.steam.service.SteamService.ManifestSizes
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Depot/manifest resolution + size calculation, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.getEntitledDepotIds(packageId: Int): Set<Int>? {
+    if (packageId == INVALID_PKG_ID) return null
+    val depotIds =
+        runBlocking(Dispatchers.IO) {
+            instance
+                ?.licenseDao
+                ?.findLicense(packageId)
+                ?.depotIds
+                .orEmpty()
+        }
+    return depotIds.takeIf { it.isNotEmpty() }?.toSet()
+}
+
+internal fun SteamService.Companion.isDepotEntitled(
+    depotId: Int,
+    depot: DepotInfo,
+    entitledDepotIds: Set<Int>?,
+): Boolean {
+    // Explicit package grant wins (covers low-violence / regional packages).
+    if (entitledDepotIds != null && depotId in entitledDepotIds) return true
+    // Low-violence content needs an explicit grant; Steam denies its depot key otherwise.
+    if (depot.lowViolence) return false
+    if (entitledDepotIds == null) return true
+    if (depot.sharedInstall || depot.depotFromApp != INVALID_APP_ID) return true
+    // Package depot lists are often incomplete for base content; owning the app entitles it.
+    return depot.dlcAppId == INVALID_APP_ID
+}
+
+internal fun SteamService.Companion.getSelectedDownloadDepots(
+    appId: Int,
+    userSelectedDlcAppIds: Collection<Int>,
+    preferredLanguage: String = PrefManager.containerLanguage,
+    branch: String = "public",
+): Map<Int, DepotInfo> {
+    val downloadableDepots = getDownloadableDepots(appId, preferredLanguage)
+    if (downloadableDepots.isEmpty()) return emptyMap()
+
+    val selectedDlcIds = userSelectedDlcAppIds.toSet()
+    val indirectDlcAppIds = getDownloadableDlcAppsOf(appId).orEmpty().map { it.id }.toSet()
+    val mainDepots = getMainAppDepots(appId)
+    val appInfoForGrouping = getAppInfoOf(appId)
+    val groupedBaseDlcDepotIds =
+        appInfoForGrouping
+            ?.let { getGroupedBaseAppDlcContentDepotIds(it) }
+            .orEmpty()
+    // Base-package-entitled depots are always base content; never let positional DLC grouping drop them (a DLC marker preceding base depots would zero the game's size, e.g. DMC5 601151/2).
+    val baseEntitledDepotIds =
+        appInfoForGrouping?.packageId?.let { getEntitledDepotIds(it) }.orEmpty()
+
+    val selectedMainDepots =
+        mainDepots.filter { (depotId, depot) ->
+            (
+                depot.dlcAppId == INVALID_APP_ID &&
+                    (depotId !in groupedBaseDlcDepotIds || depotId in baseEntitledDepotIds)
+            ) ||
+                (depot.dlcAppId in selectedDlcIds && resolveDepotManifestInfo(depot, branch) != null)
+        } + getSelectedBaseAppDlcContentDepots(appId, selectedDlcIds, preferredLanguage, branch)
+
+    val selectedDlcDepots =
+        downloadableDepots.filter { (depotId, depot) ->
+            depotId !in selectedMainDepots &&
+                depot.dlcAppId in selectedDlcIds &&
+                depot.dlcAppId in indirectDlcAppIds &&
+                resolveDepotManifestInfo(depot, branch) != null
+        }
+
+    return selectedMainDepots + selectedDlcDepots
+}
+
+internal fun SteamService.Companion.getGroupedBaseAppDlcContentDepotIds(appInfo: SteamApp): Set<Int> {
+    return getGroupedBaseAppDlcDepots(appInfo).map { it.depotId }.toSet()
+}
+
+internal fun SteamService.Companion.getGroupedBaseAppDlcIds(
+    appInfo: SteamApp,
+    preferredLanguage: String = PrefManager.containerLanguage,
+    has64Bit: Boolean =
+        appInfo.depots.values.any {
+            it.osArch == OSArch.Arch64 &&
+                (it.osList.contains(OS.windows) || it.osList.isEmpty() || it.osList.contains(OS.none))
+        },
+): Set<Int> {
+    return getGroupedBaseAppDlcDepots(appInfo)
+        .filter { groupedDepot ->
+            filterForDownloadableDepots(groupedDepot.depot, has64Bit, preferredLanguage, ownedDlc = null)
+        }.map { it.dlcAppId }
+        .toSet()
+}
+
+internal fun SteamService.Companion.getGroupedBaseAppDlcDepots(appInfo: SteamApp): List<GroupedBaseAppDlcDepot> {
+    val declaredDlcIds =
+        (
+            appInfo.dlcAppIds.asSequence() +
+                appInfo.depots.values.asSequence()
+                    .map { it.dlcAppId }
+                    .filter { it != INVALID_APP_ID }
+        ).toSet()
+    if (declaredDlcIds.isEmpty()) return emptyList()
+
+    val depotIds = mutableListOf<GroupedBaseAppDlcDepot>()
+    var activeDlcAppId: Int? = null
+    for ((depotId, depot) in appInfo.depots) {
+        val isDlcMarkerDepot =
+            depotId in declaredDlcIds &&
+                depot.manifests.isEmpty()
+        if (isDlcMarkerDepot) {
+            activeDlcAppId = depotId
+            continue
+        }
+
+        val dlcAppId = activeDlcAppId
+        if (dlcAppId != null && depot.dlcAppId == INVALID_APP_ID) {
+            depotIds += GroupedBaseAppDlcDepot(depotId, dlcAppId, depot)
+        }
+    }
+
+    return depotIds
+}
+
+internal fun SteamService.Companion.getSelectedBaseAppDlcContentDepots(
+    appId: Int,
+    selectedDlcAppIds: Collection<Int>,
+    preferredLanguage: String = PrefManager.containerLanguage,
+    branch: String = "public",
+): Map<Int, DepotInfo> {
+    if (selectedDlcAppIds.isEmpty()) return emptyMap()
+    val appInfo = getAppInfoOf(appId) ?: return emptyMap()
+    val selectedDlcIds = selectedDlcAppIds.toSet()
+    val declaredDlcIds =
+        (
+            appInfo.dlcAppIds.asSequence() +
+                appInfo.depots.values.asSequence()
+                    .map { it.dlcAppId }
+                    .filter { it != INVALID_APP_ID }
+        ).toSet()
+    if (declaredDlcIds.isEmpty()) return emptyMap()
+
+    val has64Bit =
+        appInfo.depots.values.any {
+            it.osArch == OSArch.Arch64 &&
+                (it.osList.contains(OS.windows) || it.osList.isEmpty() || it.osList.contains(OS.none))
+        }
+
+    val selectedDepots = linkedMapOf<Int, DepotInfo>()
+    var activeDlcAppId: Int? = null
+    for ((depotId, depot) in appInfo.depots) {
+        val isDlcMarkerDepot =
+            depotId in declaredDlcIds &&
+                depot.manifests.isEmpty()
+        if (isDlcMarkerDepot) {
+            activeDlcAppId = depotId.takeIf { it in selectedDlcIds }
+            continue
+        }
+
+        val selectedDlcAppId =
+            when {
+                depot.dlcAppId in selectedDlcIds -> depot.dlcAppId
+                depot.dlcAppId == INVALID_APP_ID -> activeDlcAppId
+                else -> null
+            } ?: continue
+
+        val selectedDepot =
+            if (depot.dlcAppId == selectedDlcAppId) {
+                depot
+            } else {
+                depot.copy(dlcAppId = selectedDlcAppId)
+            }
+
+        if (!filterForDownloadableDepots(selectedDepot, has64Bit, preferredLanguage, ownedDlc = null)) continue
+        if (resolveDepotManifestInfo(selectedDepot, branch) == null) continue
+        selectedDepots[depotId] = selectedDepot
+    }
+
+    if (selectedDepots.isNotEmpty()) {
+        Timber.i(
+            "Recovered base-app DLC content depots for appId=$appId " +
+                "selectedDlcAppIds=${selectedDlcIds.sorted()} " +
+                "depotIdsByDlc=${selectedDepots.values.groupBy({ it.dlcAppId }, { it.depotId })}",
+        )
+    }
+    return selectedDepots
+}
+
+internal fun SteamService.Companion.resolveDepotManifestInfo(
+    depot: DepotInfo,
+    branch: String,
+    visitedApps: MutableSet<Int> = mutableSetOf(),
+): ManifestInfo? {
+    depot.manifests[branch]?.let { return it }
+    depot.encryptedManifests[branch]?.let { return it }
+
+    if (!branch.equals("public", ignoreCase = true)) {
+        depot.manifests["public"]?.let { return it }
+        depot.encryptedManifests["public"]?.let { return it }
+    }
+
+    val sourceAppId = depot.depotFromApp
+    if (sourceAppId == INVALID_APP_ID || !visitedApps.add(sourceAppId)) {
+        return null
+    }
+
+    val sourceDepot = getAppInfoOf(sourceAppId)?.depots?.get(depot.depotId) ?: return null
+    return resolveDepotManifestInfo(sourceDepot, branch, visitedApps)
+}
+
+internal fun SteamService.Companion.manifestDownloadBytes(manifest: ManifestInfo?): Long {
+    if (manifest == null) return 0L
+    val size = manifest.size.coerceAtLeast(0L)
+    // Compressed download can't exceed uncompressed size; reject bogus stored values (legacy depots showed tens of TiB), bound to size — healCorruptManifestDownloadSizes() restores the real value.
+    return manifest.download.takeIf { it in 1L..size } ?: size
+}
+
+internal fun SteamService.Companion.calculateManifestSizes(
+    depots: Collection<DepotInfo>,
+    branch: String,
+): ManifestSizes {
+    var totalInstallSize = 0L
+    var totalDownloadSize = 0L
+
+    depots.forEach { depot ->
+        val manifest = resolveDepotManifestInfo(depot, branch)
+        totalInstallSize += manifest?.size ?: 0L
+        totalDownloadSize += manifestDownloadBytes(manifest)
+    }
+
+    return ManifestSizes(
+        installSize = totalInstallSize,
+        downloadSize = totalDownloadSize,
+    )
+}
+
+internal fun SteamService.Companion.filterAlreadyInstalledDepots(
+    appId: Int,
+    depots: Map<Int, DepotInfo>,
+    includeInstalledDepots: Boolean,
+): Map<Int, DepotInfo> {
+    if (includeInstalledDepots || depots.isEmpty()) return depots
+
+    val installedApp = getTrustedInstalledAppInfo(appId) ?: return depots
+    val installedDlcAppIds = getInstalledDlcDepotsOf(appId).orEmpty().toSet()
+
+    return depots.filter { (depotId, depot) ->
+        val isInstalledBaseDepot =
+            depot.dlcAppId == INVALID_APP_ID &&
+                depotId in installedApp.downloadedDepots
+        val isInstalledDlcDepot =
+            depot.dlcAppId != INVALID_APP_ID &&
+                depot.dlcAppId in installedDlcAppIds
+
+        !isInstalledBaseDepot && !isInstalledDlcDepot
+    }
+}
+
+internal fun SteamService.Companion.filterAlreadyInstalledDlcSelection(
+    appId: Int,
+    dlcAppIds: List<Int>,
+    includeInstalledDepots: Boolean,
+    customInstallPath: String?,
+): List<Int> {
+    val selected = dlcAppIds.distinct()
+    if (selected.isEmpty() || includeInstalledDepots || customInstallPath != null) return selected
+
+    val installedDlcAppIds = getInstalledDlcDepotsOf(appId).orEmpty().toSet()
+    if (installedDlcAppIds.isEmpty()) return selected
+
+    val filtered = selected.filterNot { it in installedDlcAppIds }
+    val skipped = selected - filtered.toSet()
+    if (skipped.isNotEmpty()) {
+        Timber.i(
+            "Skipping already-installed Steam DLC selection for appId=$appId " +
+                "dlcAppIds=${skipped.sorted()}",
+        )
+    }
+    return filtered
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceDownloadApp.kt b/app/src/main/feature/stores/steam/service/SteamServiceDownloadApp.kt
new file mode 100644
index 000000000..f44199bc0
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceDownloadApp.kt
@@ -0,0 +1,218 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Private app-download helper overload, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.downloadApp(
+    appId: Int,
+    dlcAppIds: List<Int>,
+    includeInstalledDepots: Boolean,
+    enableVerify: Boolean,
+    allowPersistedProgress: Boolean = false,
+    hasPersistedResumeRow: Boolean = false,
+    customInstallPath: String? = null,
+    downloadTaskType: String = DownloadRecord.TASK_INSTALL,
+    targetDepotIds: Set<Int>? = null,
+): DownloadInfo? {
+    ensureFreshDepotData(appId)
+    val appInfo = getAppInfoOf(appId)
+    if (appInfo == null) {
+        Timber.e("Download aborted: Could not find AppInfo for appId: $appId")
+        return null
+    }
+
+    val effectiveDlcAppIds =
+        filterAlreadyInstalledDlcSelection(
+            appId = appId,
+            dlcAppIds = dlcAppIds,
+            includeInstalledDepots = includeInstalledDepots,
+            customInstallPath = customInstallPath,
+        )
+
+    val downloadableDepots = getDownloadableDepots(appId)
+    if (downloadableDepots.isEmpty()) {
+        Timber.w("Download aborted: No downloadable depots found for appId: $appId")
+        instance?.let { service ->
+            service.scope.launch(Dispatchers.Main) {
+                WinToast.show(service.applicationContext, "No downloadable content found for this game", Toast.LENGTH_LONG)
+            }
+        }
+        return null
+    }
+
+    // Delegate to the full depot-level downloadApp overload
+    return downloadApp(
+        appId = appId,
+        downloadableDepots = downloadableDepots,
+        userSelectedDlcAppIds = effectiveDlcAppIds,
+        branch = "public",
+        includeInstalledDepots = includeInstalledDepots,
+        enableVerify = enableVerify,
+        allowPersistedProgress = allowPersistedProgress,
+        hasPersistedResumeRow = hasPersistedResumeRow,
+        customInstallPath = customInstallPath,
+        downloadTaskType = downloadTaskType,
+        targetDepotIds = targetDepotIds,
+    )
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceDownloadFinalize.kt b/app/src/main/feature/stores/steam/service/SteamServiceDownloadFinalize.kt
new file mode 100644
index 000000000..57437a064
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceDownloadFinalize.kt
@@ -0,0 +1,556 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Download finalize/verify/complete, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.finalizeSnapshotResumeAsComplete(
+    appId: Int,
+    appDirPath: String,
+    mainAppDepots: Map<Int, DepotInfo>,
+    dlcAppDepots: Map<Int, DepotInfo>,
+    userSelectedDlcAppIds: List<Int>,
+): DownloadInfo {
+    val downloadingAppIds = CopyOnWriteArrayList<Int>()
+    val calculatedDlcAppIds = CopyOnWriteArrayList<Int>()
+    val allDepotIdsByDlcAppId =
+        dlcAppDepots.values
+            .groupBy(keySelector = { it.dlcAppId }, valueTransform = { it.depotId })
+            .mapValues { (_, depotIds) -> depotIds.sorted() }
+
+    userSelectedDlcAppIds.forEach { dlcAppId ->
+        if (allDepotIdsByDlcAppId[dlcAppId]?.isNotEmpty() == true) {
+            downloadingAppIds.add(dlcAppId)
+            calculatedDlcAppIds.add(dlcAppId)
+        }
+    }
+
+    if (mainAppDepots.isNotEmpty() && !downloadingAppIds.contains(appId)) {
+        downloadingAppIds.add(appId)
+    }
+
+    val info = DownloadInfo(1, appId, downloadingAppIds)
+    info.setPersistencePath(appDirPath)
+    info.updateStatus(DownloadPhase.COMPLETE)
+    info.setProgress(1f)
+    downloadJobs[appId] = info
+    notifyDownloadStarted(appId)
+
+    val selectedDlcAppIdSet = userSelectedDlcAppIds.toSet()
+    val mainAppDlcIds =
+        getMainAppDlcIdsWithoutProperDepotDlcIds(appId)
+            .filterTo(mutableListOf()) { it in selectedDlcAppIdSet }
+    mainAppDlcIds.addAll(
+        mainAppDepots.values
+            .map { it.dlcAppId }
+            .filter { it != INVALID_APP_ID && it in selectedDlcAppIdSet }
+            .distinct(),
+    )
+    if (dlcAppDepots.isEmpty()) {
+        mainAppDlcIds.addAll(
+            mainAppDepots
+                .filter { it.value.dlcAppId != INVALID_APP_ID && it.value.dlcAppId in selectedDlcAppIdSet }
+                .map { it.value.dlcAppId }
+                .distinct(),
+        )
+    }
+    mainAppDlcIds.addAll(calculatedDlcAppIds.filter { it !in mainAppDlcIds })
+
+    runBlocking(Dispatchers.IO) {
+        if (mainAppDepots.isNotEmpty()) {
+            completeAppDownload(
+                downloadInfo = info,
+                downloadingAppId = appId,
+                entitledDepotIds = mainAppDepots.keys.sorted(),
+                selectedDlcAppIds = mainAppDlcIds,
+                appDirPath = appDirPath,
+            )
+        }
+
+        calculatedDlcAppIds.forEach { dlcAppId ->
+            val dlcDepotIds = allDepotIdsByDlcAppId[dlcAppId].orEmpty()
+            completeAppDownload(
+                downloadInfo = info,
+                downloadingAppId = dlcAppId,
+                entitledDepotIds = dlcDepotIds,
+                selectedDlcAppIds = emptyList(),
+                appDirPath = appDirPath,
+            )
+        }
+
+        instance?.downloadingAppInfoDao?.deleteApp(appId)
+        Unit
+    }
+
+    // Show success message to user for no-op/resume completion
+    instance?.let { service ->
+        service.scope.launch(Dispatchers.Main) {
+            WinToast.show(service.applicationContext, "Download complete", Toast.LENGTH_SHORT)
+            Unit
+        }
+    }
+    return info
+}
+
+/** Returns one description per [expectedManifestByDepot] entry not finished at the expected manifest id in depot.config (missing, in-progress, or wrong manifest); an absent/unreadable config passes (legacy installs predate it). */
+/** Depot ids Steam denied a key for on the last native run (.DepotDownloader/denied.depots). */
+internal fun SteamService.Companion.readDeniedDepots(appDirPath: String): Set<Int> =
+    runCatching {
+        val file = File(File(appDirPath, ".DepotDownloader"), "denied.depots")
+        if (!file.isFile) return@runCatching emptySet<Int>()
+        file.readLines().mapNotNull { it.trim().toIntOrNull() }.toSet()
+    }.getOrDefault(emptySet())
+
+
+internal fun SteamService.Companion.verifyDepotConfigComplete(
+    appDirPath: String,
+    expectedManifestByDepot: Map<Int, Long>,
+): List<String> {
+    if (expectedManifestByDepot.isEmpty()) return emptyList()
+    val configFile = File(File(appDirPath, ".DepotDownloader"), "depot.config")
+    val installed: Map<Int, Long>? =
+        runCatching {
+            if (!configFile.isFile) return@runCatching null
+            val ids = JSONObject(configFile.readText()).optJSONObject("installedManifestIDs")
+                ?: return@runCatching emptyMap<Int, Long>()
+            buildMap {
+                for (key in ids.keys()) {
+                    val depotId = key.toIntOrNull() ?: continue
+                    put(depotId, ids.optLong(key, 0L))
+                }
+            }
+        }.getOrNull()
+
+    if (installed == null) {
+        Timber.w(
+            "Completeness gate: depot.config missing/unreadable at $configFile for " +
+                "${expectedManifestByDepot.size} expected depot(s); treating as pass (legacy install?)",
+        )
+        return emptyList()
+    }
+
+    val invalidManifestId = 0x7fffffffffffffffL
+    val failures = mutableListOf<String>()
+    for ((depotId, expectedGid) in expectedManifestByDepot.toSortedMap()) {
+        when (val recorded = installed[depotId]) {
+            null -> failures.add("depot $depotId missing (expected manifest $expectedGid)")
+            invalidManifestId -> failures.add("depot $depotId still in-progress (expected $expectedGid)")
+            expectedGid -> Unit
+            else -> failures.add("depot $depotId recorded at manifest $recorded, expected $expectedGid")
+        }
+    }
+    if (failures.isEmpty()) {
+        Timber.i(
+            "Completeness gate passed: ${expectedManifestByDepot.size} depot(s) fully recorded in depot.config at $appDirPath",
+        )
+    }
+    return failures
+}
+
+/** Read-only diagnostic: logs each base depot of [appId], whether it reached [selectedDepots] and the first rule that dropped it, warning when a base content depot is dropped. */
+internal fun SteamService.Companion.logDepotScopeDiagnostics(
+    appId: Int,
+    branch: String,
+    selectedDepots: Map<Int, DepotInfo>,
+) {
+    runCatching {
+        val appInfo = getAppInfoOf(appId) ?: return
+        val preferredLanguage = PrefManager.containerLanguage
+        val entitledDepotIds = getEntitledDepotIds(appInfo.packageId)
+        val has64Bit =
+            appInfo.depots.values.any {
+                it.osArch == OSArch.Arch64 &&
+                    (it.osList.contains(OS.windows) || it.osList.isEmpty() || it.osList.contains(OS.none))
+            }
+        val groupedBaseDlcDepotIds = getGroupedBaseAppDlcContentDepotIds(appInfo)
+        val baseEntitledDepotIds = getEntitledDepotIds(appInfo.packageId).orEmpty()
+
+        fun exclusionReason(depotId: Int, depot: DepotInfo): String {
+            if (depot.manifests.isEmpty() && depot.encryptedManifests.isNotEmpty()) return "encrypted-only-manifest"
+            if (depot.manifests.isEmpty() && !depot.sharedInstall) return "no-manifest"
+            if (resolveDepotManifestInfo(depot, branch) == null) return "manifest-unresolved(branch=$branch)"
+            val osOk =
+                depot.osList.contains(OS.windows) ||
+                    (!depot.osList.contains(OS.linux) && !depot.osList.contains(OS.macos))
+            if (!osOk) return "os-excluded(osList=${depot.osList})"
+            val archOk =
+                when (depot.osArch) {
+                    OSArch.Arch64, OSArch.Unknown -> true
+                    OSArch.Arch32 -> !has64Bit
+                    else -> false
+                }
+            if (!archOk) return "arch-excluded(osArch=${depot.osArch},has64Bit=$has64Bit)"
+            if (depot.language.isNotEmpty() && !depot.language.equals(preferredLanguage, ignoreCase = true)) {
+                return "language-mismatch(depot='${depot.language}',preferred='$preferredLanguage')"
+            }
+            if (!isDepotEntitled(depotId, depot, entitledDepotIds)) return "not-entitled"
+            if (depotId in groupedBaseDlcDepotIds && depotId !in baseEntitledDepotIds) return "grouped-as-dlc-content"
+            return "excluded-outside-base-filters"
+        }
+
+        val baseDepots = appInfo.depots.filter { it.value.dlcAppId == INVALID_APP_ID }
+        var maxBaseContentBytes = 0L
+        var selectedBaseBytes = 0L
+        val droppedBaseContent = mutableListOf<String>()
+        Timber.i(
+            "DEPOT-DIAG appId=$appId branch=$branch baseDepots=${baseDepots.size} " +
+                "selected=${selectedDepots.size} has64Bit=$has64Bit preferredLang='$preferredLanguage' " +
+                "entitled=${entitledDepotIds?.sorted()} groupedAsDlc=${groupedBaseDlcDepotIds.sorted()}",
+        )
+        for ((depotId, depot) in baseDepots) {
+            val manifest = resolveDepotManifestInfo(depot, branch)
+            val size = manifest?.size ?: 0L
+            val included = depotId in selectedDepots
+            val reason = if (included) null else exclusionReason(depotId, depot)
+            if (manifest != null) maxBaseContentBytes += size
+            if (included) {
+                selectedBaseBytes += size
+            } else if (manifest != null && size > 0L) {
+                droppedBaseContent.add("depot=$depotId size=$size reason=$reason")
+            }
+            Timber.i(
+                "DEPOT-DIAG  base depot=$depotId included=$included size=$size gid=${manifest?.gid} " +
+                    "osList=${depot.osList} osArch=${depot.osArch} lang='${depot.language}' " +
+                    "shared=${depot.sharedInstall} fromApp=${depot.depotFromApp}" +
+                    (if (reason != null) " DROP=$reason" else ""),
+            )
+        }
+        if (droppedBaseContent.isNotEmpty()) {
+            Timber.w(
+                "DEPOT-DIAG appId=$appId DROPPED ${droppedBaseContent.size} base content depot(s): " +
+                    "selectedBaseBytes=$selectedBaseBytes maxBaseContentBytes=$maxBaseContentBytes " +
+                    "(maxBase double-counts redundant 32/64-bit variants) -> $droppedBaseContent",
+            )
+        }
+    }.onFailure { e -> Timber.w(e, "DEPOT-DIAG failed for appId=$appId") }
+}
+
+internal suspend fun SteamService.Companion.completeAppDownload(
+    downloadInfo: DownloadInfo,
+    downloadingAppId: Int,
+    entitledDepotIds: List<Int>,
+    selectedDlcAppIds: List<Int>,
+    appDirPath: String,
+) {
+    Timber.i("Item $downloadingAppId download completed, saving database")
+    Timber.i(
+        "Steam DLC downloaded item: baseAppId=${downloadInfo.gameId} completedAppId=$downloadingAppId " +
+            "entitledDepotIds=${entitledDepotIds.sorted()} selectedDlcAppIds=${selectedDlcAppIds.sorted()} " +
+            "remainingAppIds=${downloadInfo.downloadingAppIds.sorted()}",
+    )
+
+    // runCatching: a transient Room failure on one DLC row shouldn't FAIL the whole download — bytes are on disk; stale-metadata recovery fixes the row on next launch.
+    runCatching {
+        val appInfo = instance?.appInfoDao?.getInstalledApp(downloadingAppId)
+        if (appInfo != null) {
+            val updatedDownloadedDepots = (appInfo.downloadedDepots + entitledDepotIds).distinct()
+            val updatedDlcDepots = (appInfo.dlcDepots + selectedDlcAppIds).distinct()
+
+            instance?.appInfoDao?.update(
+                AppInfo(
+                    downloadingAppId,
+                    isDownloaded = true,
+                    downloadedDepots = updatedDownloadedDepots.sorted(),
+                    dlcDepots = updatedDlcDepots.sorted(),
+                ),
+            )
+        } else {
+            instance?.appInfoDao?.insert(
+                AppInfo(
+                    downloadingAppId,
+                    isDownloaded = true,
+                    downloadedDepots = entitledDepotIds.sorted(),
+                    dlcDepots = selectedDlcAppIds.sorted(),
+                ),
+            )
+        }
+    }.onFailure { e ->
+        Timber.e(
+            e,
+            "DB write failed for completed item $downloadingAppId (baseApp=${downloadInfo.gameId}); " +
+                "files are on disk, continuing finalize anyway.",
+        )
+    }
+
+    // Remove completed appId from downloadInfo.dlcAppIds and check if it was actually removed
+    val wasRemoved = downloadInfo.downloadingAppIds.remove(downloadingAppId)
+    if (!wasRemoved) {
+        Timber.d("Item $downloadingAppId was already removed from downloading list, skipping redundant completion.")
+        return
+    }
+
+    // All downloading appIds are removed
+    if (downloadInfo.downloadingAppIds.isEmpty()) {
+        Timber.i("All items for game ${downloadInfo.gameId} completed, running final completion logic.")
+        Timber.i(
+            "Steam DLC download complete: appId=${downloadInfo.gameId} " +
+                "downloadedBytes=${downloadInfo.getBytesDownloaded()} totalBytes=${downloadInfo.getTotalExpectedBytes()}",
+        )
+        // Settle remaining bytes at the end so progress doesn't sit under 100% when complete (e.g. dedup-skipped chunks that never reported via onChunkCompleted).
+        val totalExpectedBytes = downloadInfo.getTotalExpectedBytes()
+        if (totalExpectedBytes > 0L) {
+            val downloadedBytes = downloadInfo.getBytesDownloaded()
+            val remainingBytes = (totalExpectedBytes - downloadedBytes).coerceAtLeast(0L)
+            if (remainingBytes > 0L) {
+                downloadInfo.updateBytesDownloaded(remainingBytes, System.currentTimeMillis())
+                downloadInfo.emitProgressChange()
+                updateCoordinatorDownloadProgress(downloadInfo)
+            }
+        }
+
+        // Defensive wrapping per marker — bytes are on disk, a single marker/DB write failing shouldn't flip the game to FAILED.
+        withContext(Dispatchers.IO) {
+            val markerAdded =
+                runCatching { MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER) }
+                    .getOrElse { e ->
+                        Timber.e(e, "Failed to add DOWNLOAD_COMPLETE_MARKER at $appDirPath")
+                        false
+                    }
+            if (!markerAdded) {
+                Timber.e(
+                    "DOWNLOAD_COMPLETE_MARKER write returned false for appId=${downloadInfo.gameId} at $appDirPath " +
+                        "(disk full / permissions?). Game files are on disk but next launch may re-validate.",
+                )
+            }
+            runCatching { MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER) }
+            runCatching { MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DLL_REPLACED) }
+            runCatching { MarkerUtils.removeMarker(appDirPath, Marker.STEAM_COLDCLIENT_USED) }
+            runCatching { MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DRM_PATCHED) }
+            runCatching { MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DRM_UNPACK_CHECKED) }
+
+            // Same reason as above: a Room exception here used to FAIL a fully-downloaded game with the COMPLETE marker already on disk.
+            val mainAppId = downloadInfo.gameId
+            val service = instance
+            if (service != null) {
+                runCatching {
+                    val mainAppInfo = service.appInfoDao.getInstalledApp(mainAppId)
+                    if (mainAppInfo != null) {
+                        val updatedMainDlcDepots =
+                            (mainAppInfo.dlcDepots + selectedDlcAppIds).distinct().sorted()
+                        service.appInfoDao.update(
+                            mainAppInfo.copy(
+                                isDownloaded = true,
+                                dlcDepots = updatedMainDlcDepots,
+                                installPath = appDirPath,
+                            ),
+                        )
+                        Timber.i(
+                            "Marked main app $mainAppId as downloaded in DB with dlcDepots=$updatedMainDlcDepots",
+                        )
+                    } else {
+                        service.appInfoDao.insert(
+                            AppInfo(
+                                mainAppId,
+                                isDownloaded = true,
+                                dlcDepots = selectedDlcAppIds.distinct().sorted(),
+                                installPath = appDirPath,
+                            ),
+                        )
+                        Timber.i(
+                            "Inserted main app $mainAppId as downloaded in DB with dlcDepots=${selectedDlcAppIds.distinct().sorted()}",
+                        )
+                    }
+                }.onFailure { e ->
+                    Timber.e(
+                        e,
+                        "Database write failed during finalize for appId=$mainAppId — bytes are on disk, " +
+                            "marker write ${if (markerAdded) "succeeded" else "FAILED"}; download will still be marked COMPLETE.",
+                    )
+                }
+            }
+            Unit
+        }
+
+        val service = instance
+        if (service != null) {
+            createSteamShortcut(service, downloadInfo.gameId)
+        }
+
+        // Mark inactive BEFORE updating status so checkQueue() frees this slot — else isActive() stays true and blocks the queue until manually cleared.
+        downloadInfo.setActive(false)
+        downloadInfo.updateStatus(DownloadPhase.COMPLETE)
+        PluviaApp.events.emit(AndroidEvent.LibraryInstallStatusChanged(downloadInfo.gameId))
+
+        downloadInfo.clearPersistedBytesDownloaded(appDirPath, sync = true)
+        // Notify the coordinator to advance the cross-store queue and persist COMPLETE.
+        runBlocking {
+            DownloadCoordinator.notifyFinished(
+                DownloadRecord.STORE_STEAM,
+                downloadInfo.gameId.toString(),
+                DownloadRecord.STATUS_COMPLETE,
+            )
+        }
+        checkQueue()
+    }
+    Unit
+}
+
+internal fun SteamService.Companion.updateCoordinatorDownloadProgress(downloadInfo: DownloadInfo) {
+    val (displayDownloadedBytes, displayTotalBytes) = downloadInfo.getDisplayBytesProgress()
+    DownloadCoordinator.updateProgress(
+        DownloadRecord.STORE_STEAM,
+        downloadInfo.gameId.toString(),
+        displayDownloadedBytes,
+        displayTotalBytes,
+    )
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceDownloadMain.kt b/app/src/main/feature/stores/steam/service/SteamServiceDownloadMain.kt
new file mode 100644
index 000000000..f2eb5a1ba
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceDownloadMain.kt
@@ -0,0 +1,1461 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Full app-download/verify/update implementation (11-arg overload), split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.downloadApp(
+    appId: Int,
+    downloadableDepots: Map<Int, DepotInfo>,
+    userSelectedDlcAppIds: List<Int>,
+    branch: String,
+    includeInstalledDepots: Boolean,
+    enableVerify: Boolean,
+    allowPersistedProgress: Boolean = false,
+    hasPersistedResumeRow: Boolean = false,
+    customInstallPath: String? = null,
+    downloadTaskType: String = DownloadRecord.TASK_INSTALL,
+    targetDepotIds: Set<Int>? = null,
+): DownloadInfo? {
+    var appDirPath = getAppDirPath(appId)
+    Timber.i("downloadApp called for appId: $appId, customInstallPath: $customInstallPath")
+    Timber.i(
+        "Steam DLC selection: appId=$appId selectedDlcAppIds=${userSelectedDlcAppIds.sorted()} " +
+            "includeInstalledDepots=$includeInstalledDepots verify=$enableVerify allowResume=$allowPersistedProgress " +
+            "targetDepotIds=${targetDepotIds?.sorted().orEmpty()}",
+    )
+
+    activeDownloadRecordFor(appId)?.let { activeRecord ->
+        val requestedScopeIds =
+            if (downloadTaskType == DownloadRecord.TASK_UPDATE && targetDepotIds != null) {
+                targetDepotIds
+            } else {
+                userSelectedDlcAppIds.toSet()
+            }
+        val isSameCoordinatorDispatch =
+            customInstallPath == null &&
+                activeRecord.taskType == downloadTaskType &&
+                parseDownloadScopeIds(activeRecord.selectedDlcs) == requestedScopeIds
+        if (!isSameCoordinatorDispatch) {
+            return rejectConflictingDownloadRequest(appId, activeRecord)
+        }
+    }
+
+    if (customInstallPath != null) {
+        val appInfo = getAppInfoOf(appId)
+        val folderName = getAppDirName(appInfo)
+        val safeFolderName = if (folderName.isNotEmpty()) folderName else appId.toString()
+
+        val customFile = File(customInstallPath)
+        val finalPath =
+            if (customFile.name.equals(safeFolderName, ignoreCase = true)) {
+                // User selected the game folder itself
+                normalizeInstallPath(customFile.absolutePath)
+            } else {
+                // User selected parent folder, create/use subfolder
+                normalizeInstallPath(File(customInstallPath, safeFolderName).absolutePath)
+            }
+
+        appDirPath = finalPath
+        Timber.i("Final custom appDirPath: $appDirPath")
+
+        runBlocking {
+            if (appInfo != null) {
+                val updatedApp = appInfo.copy(installDir = finalPath)
+                instance?.appDao?.update(updatedApp)
+                Timber.i("Updated SteamApp installDir in DB to: $finalPath")
+            }
+        }
+    }
+
+    val hasTrustedInstallAtStart =
+        customInstallPath == null &&
+            getTrustedInstalledAppInfo(appId) != null
+    val isAddingDlcToTrustedInstall =
+        hasTrustedInstallAtStart &&
+            !includeInstalledDepots &&
+            userSelectedDlcAppIds.isNotEmpty()
+
+    // Ensure the download directory exists
+    try {
+        val dir = File(appDirPath)
+        if (!dir.exists()) {
+            if (dir.mkdirs()) {
+                Timber.i("Created download directory: $appDirPath")
+            } else {
+                Timber.e("Failed to create download directory (mkdirs returned false): $appDirPath")
+                instance?.let { service ->
+                    service.scope.launch(Dispatchers.Main) {
+                        WinToast.show(
+                            service.applicationContext,
+                            "Failed to create download directory. Check permissions.",
+                            Toast.LENGTH_LONG,
+                        )
+                    }
+                }
+                return null
+            }
+        }
+
+        if (!MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)) {
+            Timber.e("Failed to add DOWNLOAD_IN_PROGRESS_MARKER at $appDirPath")
+        }
+
+        // Fresh installs reset completion state; when the base is already trusted, keep the marker while adding DLC so a cancelled DLC download doesn't make the base look missing.
+        if (downloadTaskType == DownloadRecord.TASK_UPDATE) {
+            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+        } else if (!includeInstalledDepots && !hasTrustedInstallAtStart) {
+            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+        }
+    } catch (e: Exception) {
+        Timber.e(e, "Error preparing download directory or markers: $appDirPath")
+    }
+
+    // If a custom path is provided, we want to force a new download at that location
+    if (customInstallPath != null) {
+        Timber.i("Custom path provided, cancelling any existing job for appId: $appId")
+        downloadJobs[appId]?.cancel("Restarting download at custom path")
+        downloadJobs.remove(appId)
+    } else {
+        // Only return existing job if it's still active
+        val existingJob = downloadJobs[appId]
+        if (existingJob != null && existingJob.isActive()) {
+            Timber.i("Returning existing active download job for appId: $appId")
+            return existingJob
+        }
+    }
+
+    Timber.d("Checking depots for appId: $appId. downloadableDepots count: ${downloadableDepots.size}")
+    if (downloadableDepots.isEmpty()) {
+        Timber.w("Download aborted: downloadableDepots is empty for appId: $appId")
+        return null
+    }
+
+    val indirectDlcAppIds = getDownloadableDlcAppsOf(appId).orEmpty().map { it.id }
+    Timber.d("Indirect DLC app IDs for appId $appId: $indirectDlcAppIds")
+
+    // Depots from Main game
+    val mainDepots = getMainAppDepots(appId)
+    val appInfoForDownload = getAppInfoOf(appId)
+    val groupedBaseDlcDepotIds =
+        appInfoForDownload
+            ?.let { getGroupedBaseAppDlcContentDepotIds(it) }
+            .orEmpty()
+    // Base-package-entitled depots are base content; never let positional DLC grouping drop them (e.g. DMC5 601151/2) — that zeroes the downloads-tab size.
+    val baseEntitledDepotIds =
+        appInfoForDownload?.packageId?.let { getEntitledDepotIds(it) }.orEmpty()
+    Timber.d("Main app depots count: ${mainDepots.size}")
+    val baseMainAppDepots =
+        if (isAddingDlcToTrustedInstall) {
+            Timber.i(
+                "Building DLC-only Steam download scope for installed appId=$appId " +
+                    "selectedDlcAppIds=${userSelectedDlcAppIds.sorted()}",
+            )
+            emptyMap()
+        } else {
+            mainDepots.filter { (depotId, depot) ->
+                depot.dlcAppId == INVALID_APP_ID &&
+                    (depotId !in groupedBaseDlcDepotIds || depotId in baseEntitledDepotIds)
+            }
+        }
+    val targetDepotIdSet = targetDepotIds?.takeIf { it.isNotEmpty() }
+    var originalMainAppDepots =
+        baseMainAppDepots +
+            mainDepots.filter { (_, depot) ->
+                userSelectedDlcAppIds.contains(depot.dlcAppId) &&
+                    resolveDepotManifestInfo(depot, branch) != null
+            } +
+            getSelectedBaseAppDlcContentDepots(
+                appId = appId,
+                selectedDlcAppIds = userSelectedDlcAppIds,
+                preferredLanguage = PrefManager.containerLanguage,
+                branch = branch,
+            )
+    if (targetDepotIdSet != null) {
+        originalMainAppDepots = originalMainAppDepots.filterKeys { it in targetDepotIdSet }
+    }
+    var mainAppDepots = originalMainAppDepots
+    Timber.d("Filtered main app depots count: ${mainAppDepots.size}")
+
+    // Depots from indirect DLC apps (reachable via findDownloadableDLCApps, which needs a cached license row).
+    val indirectDlcAppDepots =
+        downloadableDepots.filter { (_, depot) ->
+            !mainAppDepots.map { it.key }.contains(depot.depotId) &&
+                userSelectedDlcAppIds.contains(depot.dlcAppId) &&
+                indirectDlcAppIds.contains(depot.dlcAppId) &&
+                resolveDepotManifestInfo(depot, branch) != null
+        }
+    Timber.d("Filtered indirect DLC app depots count: ${indirectDlcAppDepots.size}")
+
+    // Selected DLCs whose depots aren't reachable via indirectDlcAppIds (stale license row, or DLC declared on the base game) — look them up by appId so the download matches getDlcOnlyManifestSizes and the estimate/downloads-tab stay in sync.
+    val coveredDlcAppIds =
+        (originalMainAppDepots.values.asSequence() + indirectDlcAppDepots.values.asSequence())
+            .mapNotNull { d -> d.dlcAppId.takeIf { it != INVALID_APP_ID } }
+            .toSet()
+    val missingDlcAppIds = userSelectedDlcAppIds.filter { it !in coveredDlcAppIds }
+    val extraDlcAppDepots: Map<Int, DepotInfo> =
+        if (missingDlcAppIds.isEmpty()) {
+            emptyMap()
+        } else {
+            val appInfoForArch = getAppInfoOf(appId)
+            val extraHas64Bit =
+                appInfoForArch?.depots?.values?.any {
+                    it.osArch == OSArch.Arch64 &&
+                        (it.osList.contains(OS.windows) || it.osList.isEmpty() || it.osList.contains(OS.none))
+                } ?: false
+            val extraLanguage = PrefManager.containerLanguage
+            val coveredDepotIds = originalMainAppDepots.keys + indirectDlcAppDepots.keys
+            val collected = mutableMapOf<Int, DepotInfo>()
+            for (dlcAppId in missingDlcAppIds) {
+                // Only recover depots for DLC the account owns; otherwise Steam denies the key.
+                val ownsDlc =
+                    runBlocking(Dispatchers.IO) {
+                        (instance?.licenseDao?.countLicensesForApp(dlcAppId) ?: 0) > 0
+                    }
+                if (!ownsDlc) {
+                    Timber.i("Skipping recovery depots for unowned DLC appId=$dlcAppId")
+                    continue
+                }
+                val dlcAppInfo =
+                    runBlocking(Dispatchers.IO) { instance?.appDao?.findApp(dlcAppId) }
+                        ?: continue
+                for ((depotId, depot) in dlcAppInfo.depots) {
+                    if (depotId in coveredDepotIds || depotId in collected) continue
+                    if (!filterForDownloadableDepots(depot, extraHas64Bit, extraLanguage, ownedDlc = null)) continue
+                    if (resolveDepotManifestInfo(depot, branch) == null) continue
+                    collected[depotId] =
+                        DepotInfo(
+                            depotId = depot.depotId,
+                            dlcAppId = dlcAppId,
+                            optionalDlcId = depot.optionalDlcId,
+                            depotFromApp = depot.depotFromApp,
+                            sharedInstall = depot.sharedInstall,
+                            osList = depot.osList,
+                            osArch = depot.osArch,
+                            language = depot.language,
+                            lowViolence = depot.lowViolence,
+                            manifests = depot.manifests,
+                            encryptedManifests = depot.encryptedManifests,
+                        )
+                }
+            }
+            collected
+        }
+    if (extraDlcAppDepots.isNotEmpty()) {
+        Timber.d("Recovered ${extraDlcAppDepots.size} extra DLC depots for selected DLCs ${missingDlcAppIds}")
+    }
+    // Single combined view of DLC depots (indirect + extras) used downstream for grouping, totals, and DownloadingAppInfo persistence — extras must be visible everywhere.
+    val dlcAppDepots =
+        (indirectDlcAppDepots + extraDlcAppDepots).let { depots ->
+            if (targetDepotIdSet == null) depots else depots.filterKeys { it in targetDepotIdSet }
+        }
+
+    // Drop already-downloaded depots only when install metadata is trusted; a custom path re-checks/downloads everything at the new location.
+    var installedApp = getInstalledApp(appId)
+    val hasCompleteMarker = MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+    var hasTrustedInstalledState = installedApp?.isDownloaded == true && hasCompleteMarker
+    if (!includeInstalledDepots && installedApp != null && !hasTrustedInstalledState && customInstallPath == null) {
+        val hasStaleInstallMetadata =
+            installedApp.isDownloaded ||
+                installedApp.downloadedDepots.isNotEmpty() ||
+                installedApp.dlcDepots.isNotEmpty()
+        if (hasStaleInstallMetadata) {
+            Timber.w(
+                "Clearing stale install metadata for appId=$appId " +
+                    "(isDownloaded=${installedApp.isDownloaded}, marker=$hasCompleteMarker)",
+            )
+            runBlocking(Dispatchers.IO) {
+                instance?.appInfoDao?.deleteApp(appId)
+            }
+            installedApp = null
+        }
+        hasTrustedInstalledState = false
+    }
+    if (installedApp != null && !includeInstalledDepots && hasTrustedInstalledState && customInstallPath == null) {
+        val beforeCount = mainAppDepots.size
+        mainAppDepots = mainAppDepots.filter { it.key !in installedApp.downloadedDepots }
+        Timber.d("Removed already downloaded depots. Count before: $beforeCount, after: ${mainAppDepots.size}")
+    }
+
+    // Resume support: .DepotDownloader/depot.config records depot state — finish_depot is written only after every file lands, so a "finished" entry always means a complete depot and is safe to keep across pause/resume (download() skips finished, write_depot() resumes the in-progress one chunk-by-chunk). Treat as "fresh" (discard depot.config) only for a brand-new install or a verify pass.
+    val depotConfigFile = File(File(appDirPath, ".DepotDownloader"), "depot.config")
+    val isFreshDownload =
+        downloadTaskType == DownloadRecord.TASK_VERIFY || !depotConfigFile.exists()
+    Timber.i(
+        "Download fresh=$isFreshDownload for appId=$appId " +
+            "(task=$downloadTaskType, depotConfigExists=${depotConfigFile.exists()})",
+    )
+
+    val allDepots = originalMainAppDepots + dlcAppDepots
+    // Use install (uncompressed) size for progress; resolveDepotManifestInfo follows depot.depotFromApp and falls back to the public branch so shared/proxied DLC depots contribute their full size, not the 1L fallback.
+    val depotSizeById =
+        allDepots.mapValues { (_, depot) ->
+            val mInfo = resolveDepotManifestInfo(depot, branch)
+            (mInfo?.size ?: 1L).coerceAtLeast(1L)
+        }
+
+    // Mutable so the safety check below can drop suspicious entries before they poison di.depotCumulativeUncompressedBytes during resume init.
+    var persistedDepotBytes: Map<Int, Long> =
+        if (allowPersistedProgress) {
+            DownloadInfo.loadPersistedDepotBytes(appDirPath)
+        } else {
+            emptyMap()
+        }
+
+    // Scope shrink (DLC de-selected, or Steam republished the depot list): drop orphan snapshot entries instead of refusing the resume; selectedDepots is built from current scope only, so partial-COMPLETE can't happen.
+    if (allowPersistedProgress && persistedDepotBytes.isNotEmpty()) {
+        val depotsInScope = allDepots.keys
+        val orphanSnapshotDepots = persistedDepotBytes.keys - depotsInScope
+        if (orphanSnapshotDepots.isNotEmpty()) {
+            Timber.w(
+                "Resume scope shrunk for appId=$appId: snapshot has depot(s) " +
+                    "$orphanSnapshotDepots that are not in the current download scope " +
+                    "(scope depots: $depotsInScope). Dropping orphan snapshot entries " +
+                    "and continuing with in-scope depots.",
+            )
+            persistedDepotBytes = persistedDepotBytes.filterKeys { it in depotsInScope }
+            DownloadInfo.persistDepotBytes(appDirPath, persistedDepotBytes)
+        }
+    }
+
+    val fullyDownloadedDepotsFromSnapshot = mutableSetOf<Int>()
+    if (persistedDepotBytes.isNotEmpty()) {
+        for ((depotId, _) in allDepots) {
+            val depotSize = depotSizeById[depotId] ?: 1L
+            val downloadedBytes = persistedDepotBytes[depotId] ?: 0L
+            Timber.d(
+                "Resume snapshot for appId=$appId depot=$depotId: persisted=$downloadedBytes / size=$depotSize " +
+                    (if (downloadedBytes >= depotSize) "-> SKIP-CANDIDATE" else "-> include"),
+            )
+            if (downloadedBytes >= depotSize) {
+                fullyDownloadedDepotsFromSnapshot.add(depotId)
+            }
+        }
+        if (fullyDownloadedDepotsFromSnapshot.isNotEmpty()) {
+            // Trust the snapshot's "fully downloaded" claim only when the COMPLETE marker exists; without it the install was partial and snapshots have historically been corrupted to depotSize prematurely, so let per-file checksum validation handle resume instead.
+            if (hasCompleteMarker) {
+                Timber.i(
+                    "Skipping ${fullyDownloadedDepotsFromSnapshot.size} fully downloaded depots from snapshot " +
+                        "(COMPLETE marker present): $fullyDownloadedDepotsFromSnapshot",
+                )
+                mainAppDepots = mainAppDepots.filter { it.key !in fullyDownloadedDepotsFromSnapshot }
+            } else {
+                Timber.w(
+                    "REFUSING to skip ${fullyDownloadedDepotsFromSnapshot.size} depots claimed full by snapshot " +
+                        "for appId=$appId because COMPLETE marker is absent. Depots will be re-validated " +
+                        "by the downloader; persisted byte counts are kept so the progress bar stays at the " +
+                        "user's last position while verification confirms files on disk: " +
+                        "$fullyDownloadedDepotsFromSnapshot",
+                )
+                // Keep persistedDepotBytes (the monotonic CAS in onProgress can't lower them, so the restored % shows during validation); just clear the skip set so the depots are re-validated.
+                fullyDownloadedDepotsFromSnapshot.clear()
+            }
+        }
+    }
+
+    // Combine main app and DLC depots
+    val filteredDlcAppDepots = dlcAppDepots.filter { it.key !in fullyDownloadedDepotsFromSnapshot }
+    val selectedDepots = mainAppDepots + filteredDlcAppDepots
+    Timber.i("Total selected depots for download: ${selectedDepots.size}")
+
+    logDepotScopeDiagnostics(appId, branch, selectedDepots)
+
+    if (selectedDepots.isEmpty()) {
+        var preSnapshotMainAppDepots = originalMainAppDepots
+        if (installedApp != null && !includeInstalledDepots && hasTrustedInstalledState) {
+            preSnapshotMainAppDepots = preSnapshotMainAppDepots.filter { it.key !in installedApp.downloadedDepots }
+        }
+        val preSnapshotSelectedDepots = preSnapshotMainAppDepots + dlcAppDepots
+
+        if (preSnapshotSelectedDepots.isEmpty()) {
+            // Zero depots resolved: either (1) nothing selected and base already installed (genuine no-op complete), or (2) selected DLC(s) with no downloadable content (entitlement/branch-access DLCs, e.g. appid 373300) — case (2) must not silently show "Complete / 0 B".
+            val selectedContentlessDlc = userSelectedDlcAppIds.isNotEmpty()
+            Timber.i(
+                "selectedDepots empty for appId=$appId — " +
+                    if (selectedContentlessDlc) {
+                        "selected DLC(s) $userSelectedDlcAppIds have no downloadable content"
+                    } else {
+                        "app already installed"
+                    },
+            )
+
+            // Instead of returning null, create a completed job so it shows in UI
+            val info = DownloadInfo(1, appId, CopyOnWriteArrayList(listOf(appId)))
+            info.updateStatus(DownloadPhase.COMPLETE)
+            info.setProgress(1f)
+            downloadJobs[appId] = info
+
+            if (allowPersistedProgress) {
+                Timber.i("Resume became a no-op; clearing stale persisted resume state")
+                clearFailedResumeState(appId)
+            }
+
+            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+
+            if (selectedContentlessDlc) {
+                // Record content-less DLC(s) as installed so the picker shows "Installed" — owned but with nothing to download.
+                runCatching {
+                    runBlocking(Dispatchers.IO) {
+                        val mainAppInfo = instance?.appInfoDao?.getInstalledApp(appId)
+                        if (mainAppInfo != null) {
+                            val updatedDlc =
+                                (mainAppInfo.dlcDepots + userSelectedDlcAppIds)
+                                    .distinct()
+                                    .sorted()
+                            instance?.appInfoDao?.update(
+                                mainAppInfo.copy(dlcDepots = updatedDlc),
+                            )
+                            Timber.i(
+                                "Marked content-less DLC(s) installed for appId=$appId: dlcDepots=$updatedDlc",
+                            )
+                        }
+                    }
+                }.onFailure { e ->
+                    Timber.w(e, "Failed to record content-less DLC(s) for appId=$appId")
+                }
+            }
+
+            // Honest message — don't claim a download happened when the selected DLC had no content to fetch.
+            instance?.let { service ->
+                service.scope.launch(Dispatchers.Main) {
+                    if (selectedContentlessDlc) {
+                        WinToast.show(
+                            service.applicationContext,
+                            "Selected DLC requires no download — marked installed",
+                            Toast.LENGTH_LONG,
+                        )
+                    } else {
+                        WinToast.show(
+                            service.applicationContext,
+                            "Download complete",
+                            Toast.LENGTH_SHORT,
+                        )
+                    }
+                }
+            }
+
+            return info
+        }
+
+        // Snapshot says all depots complete but marker missing — finalize metadata/markers directly instead of re-queuing depots.
+        val canFinalizeFromSnapshot =
+            allowPersistedProgress &&
+                fullyDownloadedDepotsFromSnapshot.isNotEmpty() &&
+                (hasCompleteMarker || hasPersistedResumeRow)
+        if (canFinalizeFromSnapshot) {
+            Timber.i("All resume depots appear complete from snapshot; finalizing without downloader")
+            val info =
+                finalizeSnapshotResumeAsComplete(
+                    appId = appId,
+                    appDirPath = appDirPath,
+                    mainAppDepots = preSnapshotMainAppDepots,
+                    dlcAppDepots = dlcAppDepots,
+                    userSelectedDlcAppIds = userSelectedDlcAppIds,
+                )
+            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            return info
+        } else {
+            if (allowPersistedProgress) {
+                if (fullyDownloadedDepotsFromSnapshot.isNotEmpty()) {
+                    Timber.w(
+                        "Snapshot indicates completion for appId=$appId but state is untrusted " +
+                            "(marker=$hasCompleteMarker, resumeRow=$hasPersistedResumeRow); clearing resume metadata",
+                    )
+                } else {
+                    Timber.i("selectedDepots resolved empty on resume; clearing stale resume metadata")
+                }
+                clearFailedResumeState(appId)
+            } else {
+                Timber.i("selectedDepots resolved empty after filtering; skipping download start")
+            }
+        }
+        MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+        return null
+    }
+
+    val downloadingAppIds = CopyOnWriteArrayList<Int>()
+    val calculatedDlcAppIds = CopyOnWriteArrayList<Int>()
+    val allDepotIdsByDlcAppId =
+        dlcAppDepots.values
+            .groupBy(keySelector = { it.dlcAppId }, valueTransform = { it.depotId })
+            .mapValues { (_, depotIds) -> depotIds.sorted() }
+    val selectedDlcDepotIdsByDlcAppId =
+        filteredDlcAppDepots.values
+            .groupBy(keySelector = { it.dlcAppId }, valueTransform = { it.depotId })
+            .mapValues { (_, depotIds) -> depotIds.sorted() }
+
+    userSelectedDlcAppIds.forEach { dlcAppId ->
+        if (allDepotIdsByDlcAppId[dlcAppId]?.isNotEmpty() == true) {
+            downloadingAppIds.add(dlcAppId)
+            calculatedDlcAppIds.add(dlcAppId)
+        }
+    }
+
+    if (mainAppDepots.isNotEmpty()) {
+        downloadingAppIds.add(appId)
+    }
+
+    // Some apps put DLC content under the base app with no dlcAppId on every depot; persist only DLC metadata in the selected scope, else marker-only DLCs get falsely saved as installed when a sibling DLC is selected.
+    val selectedDlcAppIdSet = userSelectedDlcAppIds.toSet()
+    val mainAppDlcIds =
+        getMainAppDlcIdsWithoutProperDepotDlcIds(appId)
+            .filterTo(mutableListOf()) { it in selectedDlcAppIdSet }
+    mainAppDlcIds.addAll(
+        mainAppDepots.values
+            .map { it.dlcAppId }
+            .filter { it != INVALID_APP_ID && it in selectedDlcAppIdSet }
+            .distinct(),
+    )
+
+    // If there are no DLC depots, download the main app only
+    if (dlcAppDepots.isEmpty()) {
+        // Because all dlcIDs are coming from main depots, need to add the dlcID to main app in order to save it to db after finish download
+        mainAppDlcIds.addAll(
+            mainAppDepots
+                .filter { it.value.dlcAppId != INVALID_APP_ID && it.value.dlcAppId in selectedDlcAppIdSet }
+                .map { it.value.dlcAppId }
+                .distinct(),
+        )
+        // Entitlement/config DLCs have no downloadable depot but must still be remembered as selected/installed so launch metadata can expose them later.
+        mainAppDlcIds.addAll(userSelectedDlcAppIds)
+
+        // Refresh id List, so only main app is downloaded
+        calculatedDlcAppIds.clear()
+        downloadingAppIds.clear()
+        downloadingAppIds.add(appId)
+    }
+
+    Timber.i("Starting download for $appId")
+    Timber.i("App contains ${mainAppDepots.size} depot(s): ${mainAppDepots.keys}")
+    Timber.i("DLC contains ${dlcAppDepots.size} depot(s): ${dlcAppDepots.keys}")
+    Timber.i("downloadingAppIds: $downloadingAppIds")
+
+    val service =
+        instance ?: run {
+            // Session gave up reconnecting and stopped the service; revive it and say so instead of failing silently.
+            Timber.e("SteamService instance is null, cannot start download job.")
+            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            runCatching {
+                val context = PluviaApp.instance.applicationContext ?: return@runCatching
+                if (PrefManager.refreshToken.isNotBlank()) start(context)
+                WinToast.show(
+                    context,
+                    "Steam is not connected — reconnecting, try the download again in a moment",
+                    Toast.LENGTH_LONG,
+                )
+            }
+            return null
+        }
+
+    val selectedDepotSizes =
+        selectedDepots.mapValues { (depotId, _) ->
+            depotSizeById[depotId] ?: 1L
+        }
+    val selectedTotalBytes = selectedDepotSizes.values.sum()
+    val totalBytes = selectedTotalBytes.coerceAtLeast(1L)
+    val selectedDisplayDownloadBytes =
+        selectedDepots.values
+            .sumOf { depot -> manifestDownloadBytes(resolveDepotManifestInfo(depot, branch)) }
+            .takeIf { it > 0L }
+            ?: totalBytes
+    Timber.i(
+        "Steam DLC selected download scope: appId=$appId selectedDlcAppIds=${userSelectedDlcAppIds.sorted()} " +
+            "calculatedDlcAppIds=${calculatedDlcAppIds.sorted()} mainDepotIds=${mainAppDepots.keys.sorted()} " +
+            "dlcDepotIdsByApp=$selectedDlcDepotIdsByDlcAppId totalBytes=$totalBytes " +
+            "displayDownloadBytes=$selectedDisplayDownloadBytes metadataDlcAppIds=${mainAppDlcIds.sorted()}",
+    )
+
+    runBlocking {
+        service.downloadingAppInfoDao.insert(
+            DownloadingAppInfo(
+                appId,
+                dlcAppIds = userSelectedDlcAppIds,
+            ),
+        )
+        Unit
+    }
+    Timber.i(
+        "Steam DLC selection persisted: appId=$appId selectedDlcAppIds=${userSelectedDlcAppIds.sorted()} " +
+            "installPath=$appDirPath",
+    )
+
+    // Ask the global coordinator whether this can start now or must queue behind other stores' downloads; it persists the decision in DownloadRecord so the request survives an app restart.
+    val coordDecision =
+        runBlocking {
+            val title = getAppInfoOf(appId)?.name.orEmpty()
+            val persistedScope =
+                if (downloadTaskType == DownloadRecord.TASK_UPDATE && targetDepotIdSet != null) {
+                    targetDepotIdSet.sorted().joinToString(",")
+                } else {
+                    userSelectedDlcAppIds.joinToString(",")
+                }
+            DownloadCoordinator.requestSlot(
+                store = DownloadRecord.STORE_STEAM,
+                storeGameId = appId.toString(),
+                title = title,
+                installPath = appDirPath,
+                selectedDlcs = persistedScope,
+                taskType = downloadTaskType,
+                bytesTotal = selectedDisplayDownloadBytes,
+            )
+        }
+    Timber.i(
+        "Steam DLC coordinator record: appId=$appId selectedDlcAppIds=${userSelectedDlcAppIds.sorted()} " +
+            "bytesTotal=$totalBytes displayDownloadBytes=$selectedDisplayDownloadBytes " +
+            "decision=${coordDecision::class.simpleName}",
+    )
+    if (coordDecision is DownloadCoordinator.Decision.Queue) {
+        Timber.i("Coordinator queued appId: $appId")
+        if (downloadTaskType == DownloadRecord.TASK_UPDATE) {
+            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+            MarkerUtils.addMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+        }
+        val info =
+            DownloadInfo(selectedDepots.size, appId, downloadingAppIds).also { di ->
+                di.setPersistencePath(appDirPath)
+                di.setTotalExpectedBytes(totalBytes)
+                di.setDisplayTotalExpectedBytes(selectedDisplayDownloadBytes)
+                di.updateStatus(DownloadPhase.QUEUED, "Queued")
+                di.setActive(false)
+            }
+        downloadJobs[appId] = info
+        notifyDownloadStarted(appId)
+        return info
+    }
+
+    val info =
+        DownloadInfo(selectedDepots.size, appId, downloadingAppIds).also { di ->
+            di.setPersistencePath(appDirPath)
+
+            // Set weights for each depot based on manifest sizes
+            selectedDepots.keys.forEachIndexed { index, depotId ->
+                di.setWeight(index, selectedDepotSizes[depotId] ?: 1L)
+            }
+
+            // Track progress only for depots in this run so excluded/complete depots can't pre-fill progress at startup.
+
+            // Total expected size (used for ETA based on recent download speed)
+            di.setTotalExpectedBytes(totalBytes)
+            di.setDisplayTotalExpectedBytes(selectedDisplayDownloadBytes)
+
+            var resumedBytes = 0L
+
+            if (allowPersistedProgress) {
+                for ((depotId, bytes) in persistedDepotBytes) {
+                    // Depot excluded as fully downloaded still needs its bytes tracked so future snapshots retain this progress.
+                    val depotSize = depotSizeById[depotId] ?: continue
+                    val safeBytes = bytes.coerceIn(0L, depotSize)
+                    di.depotCumulativeUncompressedBytes[depotId] =
+                        java.util.concurrent.atomic
+                            .AtomicLong(safeBytes)
+                    // Count resumed bytes only for depots actively downloading in this run.
+                    if (depotId in selectedDepots) {
+                        resumedBytes += safeBytes
+                    }
+                    Timber.i(
+                        "RESUME-INIT depot=$depotId loaded=$safeBytes (snapshot=$bytes, max=$depotSize, " +
+                            "inSelected=${depotId in selectedDepots}, inSession=${depotId in selectedDepotSizes.keys})",
+                    )
+                }
+            } else {
+                // SYNC clear so a stale snapshot from a prior session can't poison this fresh download — async clear races new persists that could read/overwrite with stale byte counts.
+                di.clearPersistedBytesDownloaded(appDirPath, sync = true)
+                Timber.i("RESUME-INIT cleared persisted snapshot (sync) for fresh download appId=$appId")
+            }
+            resumedBytes = resumedBytes.coerceIn(0L, totalBytes)
+
+            if (resumedBytes > 0L) {
+                di.initializeBytesDownloaded(resumedBytes)
+                Timber.i("Resumed download: initialized with $resumedBytes bytes")
+            }
+
+            val downloadJob =
+                service.scope.launch {
+                    // Worker-local session brought up when no logged-on wnSession exists; NOT promoted to the global field so a concurrent logOut()/relogin can't close it mid-download. Disconnected + closed in this worker's finally.
+                    var workerWnSession: WnSteamSession? = null
+                    // Wi-Fi + CPU keep-alive: without it Wi-Fi PSP drops radio power on screen-off and router NAT evicts chunk sockets, surfacing as spurious "WN download failed" on stable Wi-Fi.
+                    val keepAliveTag = "steam-download-$appId"
+                    val keepAliveCtx = service.applicationContext
+                    runCatching {
+                        SessionKeepAliveService.startDownload(keepAliveCtx, keepAliveTag)
+                    }.onFailure { e ->
+                        Timber.w(e, "Failed to acquire keep-alive for Steam download $appId")
+                    }
+                    try {
+                        // Retry loop for transient Steam API failures (AsyncJobFailedException) or missing client
+                        val maxRetries = 3
+
+                        for (attempt in 1..maxRetries) {
+                            try {
+                                if (attempt > 1) {
+                                    Timber.i("Retry attempt $attempt/$maxRetries for appId: $appId")
+                                    di.updateStatusMessage("Retrying download (attempt $attempt/$maxRetries)")
+                                    withContext(Dispatchers.Main) {
+                                        WinToast.show(
+                                            instance?.applicationContext ?: return@withContext,
+                                            "Retrying download (attempt $attempt/$maxRetries)",
+                                            Toast.LENGTH_SHORT,
+                                        )
+                                    }
+                                    kotlinx.coroutines.delay(3000L * attempt) // Exponential backoff
+                                }
+
+                                // Ensure a logged-on session (state()==3) for the download: prefer the long-lived wnSession, but it may not be logged on (cached-token restore, idled CM), so bring one up here if needed. The downloader requests depot keys itself.
+                                var wnReady = wnSession?.takeIf { it.state() == 3 }
+                                if (wnReady == null) {
+                                    // Brief grace period: wnSession may be mid-logon.
+                                    var grace = 0
+                                    while (grace < 8 && wnSession?.state() != 3) {
+                                        di.updateStatusMessage("Waiting for Steam connection")
+                                        delay(1000L)
+                                        grace++
+                                    }
+                                    wnReady = wnSession?.takeIf { it.state() == 3 }
+                                }
+                                if (wnReady == null) {
+                                    // Reuse a session this worker brought up on a prior retry, if still logged on.
+                                    wnReady = workerWnSession?.takeIf { it.state() == 3 }
+                                }
+                                if (wnReady == null) {
+                                    Timber.i("downloadApp: no logged-on wnSession — bringing one up for the download")
+                                    di.updateStatusMessage("Connecting to Steam")
+                                    val svc = instance
+                                        ?: throw Exception("Steam service unavailable.")
+                                    val refreshTok = PrefManager.refreshToken
+                                    if (refreshTok.isBlank()) {
+                                        throw Exception(
+                                            "Not logged in to Steam (no refresh token). " +
+                                                "Please sign in and try again.",
+                                        )
+                                    }
+                                    // Discard a worker session from a prior attempt that is no longer logged on.
+                                    workerWnSession?.let { stale ->
+                                        runCatching { stale.disconnect() }
+                                        runCatching { stale.close() }
+                                    }
+                                    workerWnSession = null
+                                    val brought = bringUpWnSession(svc)
+                                        ?: throw Exception(
+                                            "WN-Steam-Client: could not connect to Steam.",
+                                        )
+                                    workerWnSession = brought
+                                    // Download-only session: skip the library-populate PICS crawl so it doesn't flood the CM while the download needs the channel for depot keys.
+                                    brought.setAutoPopulateLibrary(false)
+                                    di.updateStatusMessage("Logging in to Steam")
+                                    if (!brought.logonWithRefreshToken(
+                                            refreshTok,
+                                            PrefManager.username,
+                                            PrefManager.steamUserSteamId64,
+                                        )
+                                    ) {
+                                        throw Exception("WN-Steam-Client: logon request failed.")
+                                    }
+                                    var logonWait = 0
+                                    while (brought.state() != 3 && logonWait < 30) {
+                                        delay(1000L)
+                                        logonWait++
+                                    }
+                                    if (brought.state() != 3) {
+                                        throw Exception(
+                                            "WN-Steam-Client: could not log on to Steam. " +
+                                                "Please check your connection.",
+                                        )
+                                    }
+                                    wnReady = brought
+                                    Timber.i("downloadApp: WN-Steam session logged on for download")
+                                }
+
+                                // Capture wnReady (a mutable var) once as a stable non-null handle for the download below.
+                                val wnSessionForDownload = wnReady
+                                    ?: throw Exception("WN-Steam-Client session unavailable.")
+
+                                Timber.i("Initializing WN-Steam downloader for appId: $appId (attempt $attempt)")
+                                di.updateStatusMessage("Initializing downloader")
+
+                                // CA bundle for HTTPS CDN verification (same one CaBundleExtractor provides for the CM session).
+                                val caPath = CaBundleExtractor.ensureBundle(
+                                    instance?.applicationContext
+                                        ?: throw Exception("Steam service unavailable"),
+                                )
+
+                                // Total expected bytes (drives di.getProgress()): use ManifestInfo.size (DECOMPRESSED) since onProgress reports decompressed bytes — the compressed .download size would overshoot 1.0.
+                                val grandTotalBytes = selectedDepots.values.sumOf { depot ->
+                                    resolveDepotManifestInfo(depot, branch)?.size ?: 0L
+                                }
+                                if (grandTotalBytes > 0L) di.setTotalExpectedBytes(grandTotalBytes)
+
+                                // Native downloadApp() takes one appId (depot-key entitlement), so split into one batch per app — main app then each owned DLC. Triple = (appId, depotIds, manifestIds).
+                                val wnBatches: List<Triple<Int, IntArray, LongArray>> = buildList {
+                                    if (mainAppDepots.isNotEmpty()) {
+                                        // Drop unresolvable depots (gid 0); sending manifest 0 aborts the native batch.
+                                        val resolved = mainAppDepots.keys.sorted().mapNotNull { id ->
+                                            val gid = resolveDepotManifestInfo(mainAppDepots[id]!!, branch)?.gid ?: 0L
+                                            if (gid > 0L) {
+                                                id to gid
+                                            } else {
+                                                Timber.w("Skipping main depot $id: unresolved manifest gid (branch=$branch)")
+                                                null
+                                            }
+                                        }
+                                        if (resolved.isNotEmpty()) {
+                                            add(Triple(
+                                                appId,
+                                                resolved.map { it.first }.toIntArray(),
+                                                resolved.map { it.second }.toLongArray(),
+                                            ))
+                                        }
+                                    }
+                                    calculatedDlcAppIds.forEach { dlcAppId ->
+                                        val dlcDepotIds = selectedDlcDepotIdsByDlcAppId[dlcAppId].orEmpty()
+                                        if (dlcDepotIds.isEmpty()) return@forEach
+                                        val resolved = dlcDepotIds.mapNotNull { depotId ->
+                                            val gid = selectedDepots[depotId]?.let { resolveDepotManifestInfo(it, branch)?.gid } ?: 0L
+                                            if (gid > 0L) {
+                                                depotId to gid
+                                            } else {
+                                                Timber.w("Skipping DLC depot $depotId (dlcAppId=$dlcAppId): unresolved manifest gid (branch=$branch)")
+                                                null
+                                            }
+                                        }
+                                        if (resolved.isEmpty()) return@forEach
+                                        Timber.i("Steam DLC batch queued: dlcAppId=$dlcAppId depotIds=${resolved.map { it.first }}")
+                                        add(Triple(
+                                            dlcAppId,
+                                            resolved.map { it.first }.toIntArray(),
+                                            resolved.map { it.second }.toLongArray(),
+                                        ))
+                                    }
+                                }
+                                if (wnBatches.isEmpty()) {
+                                    throw Exception("No depots resolved for download.")
+                                }
+                                Timber.i("WN download: ${wnBatches.size} app batch(es) to $appDirPath")
+
+                                // Steam Controller Config download
+                                val appConfig = getAppInfoOf(appId)?.config
+                                if (appConfig?.steamControllerTemplateIndex == 1) {
+                                    val controllerConfig =
+                                        appConfig.steamControllerConfigDetails
+                                            .let { selectSteamControllerConfig(it) }
+
+                                    if (controllerConfig != null) {
+                                        val publishedFileId = controllerConfig.publishedFileId
+                                        runCatching {
+                                            val requestBody =
+                                                FormBody
+                                                    .Builder()
+                                                    .add(
+                                                        "itemcount",
+                                                        "1",
+                                                    ).add("publishedfileids[0]", publishedFileId.toString())
+                                                    .build()
+                                            val request =
+                                                Request
+                                                    .Builder()
+                                                    .url(
+                                                        "https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1",
+                                                    ).post(requestBody)
+                                                    .build()
+                                            Net.http.newCall(request).execute().use { response ->
+                                                if (response.isSuccessful) {
+                                                    val responseBody = response.body?.string()
+                                                    if (!responseBody.isNullOrEmpty()) {
+                                                        val responseJson = JSONObject(responseBody)
+                                                        val responseData = responseJson.optJSONObject("response")
+                                                        val fileUrl =
+                                                            responseData
+                                                                ?.optJSONArray(
+                                                                    "publishedfiledetails",
+                                                                )?.optJSONObject(0)
+                                                                ?.optString("file_url", "")
+                                                                ?.trim()
+                                                        if (!fileUrl.isNullOrEmpty()) {
+                                                            val configFile = File(appDirPath, STEAM_CONTROLLER_CONFIG_FILENAME)
+                                                            val downloadRequest =
+                                                                Request
+                                                                    .Builder()
+                                                                    .url(fileUrl)
+                                                                    .get()
+                                                                    .build()
+                                                            Net.http.newCall(downloadRequest).execute().use { downloadResponse ->
+                                                                if (downloadResponse.isSuccessful) {
+                                                                    downloadResponse.body?.byteStream()?.use { input ->
+                                                                        configFile.outputStream().use { output ->
+                                                                            input.copyTo(output)
+                                                                        }
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                // Run each app batch through the native downloader (downloadApp() runs on a native worker thread); suspendCancellableCoroutine bridges WnDownloadListener.onComplete back here. Progress sets di's absolute byte count from the sum of every depot's cumulative bytes.
+                                Timber.i("Downloading game to $appDirPath (attempt $attempt)")
+                                val wnDepotBytes = java.util.concurrent.ConcurrentHashMap<Int, Long>()
+                                for ((depotId, bytes) in di.depotCumulativeUncompressedBytes) {
+                                    if (depotId in selectedDepots) {
+                                        val initialBytes = bytes.get().coerceAtLeast(0L)
+                                        if (initialBytes > 0L) {
+                                            wnDepotBytes[depotId] = initialBytes
+                                        }
+                                    }
+                                }
+                                val wnGlobalPrev =
+                                    java.util.concurrent.atomic.AtomicLong(wnDepotBytes.values.sum())
+                                // Throttle DownloadRecord progress persistence.
+                                val wnLastPersistMs = java.util.concurrent.atomic.AtomicLong(0L)
+                                for (batch in wnBatches) {
+                                    val (batchAppId, batchDepotIds, batchManifestIds) = batch
+                                    kotlinx.coroutines.suspendCancellableCoroutine<Unit> { cont ->
+                                        wnSessionForDownload.downloadApp(
+                                            batchAppId,
+                                            batchDepotIds,
+                                            batchManifestIds,
+                                            branch,
+                                            appDirPath,
+                                            isFreshDownload,
+                                            caPath,
+                                            // "Download Speed" setting → parallel chunk-download worker count.
+                                            PrefManager.downloadSpeed,
+                                            object : WnDownloadListener {
+                                                override fun onProgress(
+                                                    depotId: Int,
+                                                    depotDone: Long,
+                                                    depotTotal: Long,
+                                                    depotsDone: Int,
+                                                    depotsTotal: Int,
+                                                    verifying: Boolean,
+                                                ) {
+                                                    // The native worker may fire late callbacks after a pause/cancel (before it unwinds); ignore them or they'd overwrite PAUSED back to DOWNLOADING.
+                                                    if (!di.isActive()) return
+                                                    // Record per-depot cumulative bytes so the throttled snapshot (depot_bytes.json) restores the real % on resume; verification reports bytes from 0 each resume, so never let it lower a previously persisted count (quick pause/resume during VERIFYING would rewrite the snapshot to a partial scan).
+                                                    val depotBytes =
+                                                        di.depotCumulativeUncompressedBytes
+                                                        .getOrPut(depotId) {
+                                                            java.util.concurrent.atomic.AtomicLong(0L)
+                                                        }
+                                                    val observedDepotDone = depotDone.coerceAtLeast(0L)
+                                                    var monotonicDepotDone: Long
+                                                    while (true) {
+                                                        val currentDepotDone = depotBytes.get()
+                                                        monotonicDepotDone = maxOf(currentDepotDone, observedDepotDone)
+                                                        if (monotonicDepotDone == currentDepotDone ||
+                                                            depotBytes.compareAndSet(currentDepotDone, monotonicDepotDone)
+                                                        ) {
+                                                            break
+                                                        }
+                                                    }
+                                                    wnDepotBytes[depotId] = monotonicDepotDone
+                                                    di.markProgressSnapshotDirty()
+                                                    val g = wnDepotBytes.values.sum()
+                                                    val delta = g - wnGlobalPrev.getAndSet(g)
+                                                    if (delta > 0L) di.updateBytesDownloaded(delta)
+                                                    val statusTick =
+                                                        if (verifying && observedDepotDone < monotonicDepotDone) {
+                                                            "$g/$observedDepotDone"
+                                                        } else {
+                                                            g.toString()
+                                                        }
+                                                    // Phase from the native verifying flag: VERIFYING while validating on-disk content, DOWNLOADING while fetching. The status carries a unique suffix (g) each tick because a StateFlow dedups equal values, so a constant message would freeze the live byte count/speed — a changing one forces recomposition.
+                                                    di.updateStatus(
+                                                        if (verifying) {
+                                                            DownloadPhase.VERIFYING
+                                                        } else {
+                                                            DownloadPhase.DOWNLOADING
+                                                        },
+                                                        if (verifying) {
+                                                            "Verifying depot $depotId ($statusTick)"
+                                                        } else {
+                                                            "Downloading depot $depotId ($statusTick)"
+                                                        },
+                                                    )
+                                                    di.emitProgressChange()
+                                                    // Persist progress to the DownloadRecord (throttled 3s) so an app restart restores the real % instead of 0.
+                                                    val nowMs = System.currentTimeMillis()
+                                                    if (nowMs - wnLastPersistMs.get() >= 3000L) {
+                                                        wnLastPersistMs.set(nowMs)
+                                                        val (dispDone, dispTotal) =
+                                                            di.getDisplayBytesProgress()
+                                                        DownloadCoordinator.updateProgress(
+                                                            DownloadRecord.STORE_STEAM,
+                                                            appId.toString(),
+                                                            dispDone,
+                                                            dispTotal,
+                                                        )
+                                                    }
+                                                }
+
+                                                override fun onComplete(
+                                                    success: Boolean,
+                                                    error: String,
+                                                    bytesWritten: Long,
+                                                    depotsCompleted: Int,
+                                                    depotsSkipped: Int,
+                                                ) {
+                                                    if (!cont.isActive) return
+                                                    if (success) {
+                                                        cont.resumeWith(Result.success(Unit))
+                                                    } else if (!di.isActive() || di.isCancelling) {
+                                                        // Pause/cancel aborted the native download — resume normally; the post-await barrier classifies it as PAUSED/CANCELLED, not a spurious FAILED.
+                                                        cont.resumeWith(Result.success(Unit))
+                                                    } else {
+                                                        cont.resumeWith(
+                                                            Result.failure(
+                                                                WnDownloadTransientException(
+                                                                    "WN download failed (app $batchAppId): $error",
+                                                                ),
+                                                            ),
+                                                        )
+                                                    }
+                                                }
+                                            },
+                                        )
+                                        // Pause/cancel cancels this coroutine — abort the native worker so it stops promptly instead of running on in the background.
+                                        cont.invokeOnCancellation {
+                                            runCatching { wnSessionForDownload.cancelDownload() }
+                                        }
+                                    }
+                                }
+
+                                // Hard barrier: re-check cancellation even when the await returned cleanly — completion can fire as a side-effect of pending chunks being cancelled, and in that race we must NOT run completeAppDownload (it would set COMPLETE for a paused/partial install).
+                                coroutineContext.ensureActive()
+                                if (!di.isActive() || di.isCancelling) {
+                                    Timber.i(
+                                        "DepotDownloader completion returned but DownloadInfo is no longer active " +
+                                            "(isActive=${di.isActive()}, isCancelling=${di.isCancelling}). " +
+                                            "Skipping completeAppDownload — the user paused or cancelled.",
+                                    )
+                                    throw CancellationException(
+                                        if (di.isCancelling) "Cancelled by user" else "Paused by user",
+                                    )
+                                }
+
+                                Timber.i("DepotDownloader finished for appId: $appId")
+
+                                // If it was extremely fast (e.g. already downloaded), ensure some visibility in UI
+                                if (di.getProgress() >= 1.0f) {
+                                    delay(1000)
+                                }
+
+                                // If we got here without exception, download succeeded
+                                break
+                            } catch (e: AsyncJobFailedException) {
+                                Timber.w(e, "AsyncJobFailedException on attempt $attempt/$maxRetries for appId: $appId")
+                                if (attempt >= maxRetries) {
+                                    Timber.e("All $maxRetries retry attempts failed for appId: $appId")
+                                    throw e
+                                }
+                                di.setActive(true)
+                                continue
+                            } catch (e: Exception) {
+                                if (e is CancellationException) throw e
+                                if (!di.isActive() || di.isCancelling) throw e
+                                // Only retry the depot-transfer phase; entitlement/manifest/session errors won't fix themselves — fail fast.
+                                if (e !is WnDownloadTransientException) throw e
+                                Timber.w(e, "Transient WN download failure on attempt $attempt/$maxRetries for appId: $appId")
+                                if (attempt >= maxRetries) {
+                                    Timber.e("All $maxRetries retry attempts failed for appId: $appId")
+                                    throw e
+                                }
+                                // Force-flush the byte snapshot so the next attempt resumes from the same offset instead of re-validating.
+                                runCatching { di.persistProgressSnapshot(force = true) }
+                                runCatching { updateCoordinatorDownloadProgress(di) }
+                                // Failed batch's listener sets isActive=false; restore it so the next attempt's onProgress doesn't bail.
+                                di.setActive(true)
+                                continue
+                            }
+                        }
+
+                        // Complete app download - Wrap in try-catch to ensure we don't crash at the finish line
+                        try {
+                            di.updateStatusMessage("Finalizing installation")
+                            Timber.i("Finalizing installation at path: $appDirPath")
+
+                            // Refuse to mark COMPLETE unless every depot fetched this run is recorded as finished at the expected manifest id in depot.config.
+                            val deniedDepots = readDeniedDepots(appDirPath)
+                            if (deniedDepots.isNotEmpty()) {
+                                Timber.w(
+                                    "Completeness gate excluding ${deniedDepots.size} depot(s) Steam denied " +
+                                        "a key for appId=$appId: ${deniedDepots.sorted()}",
+                                )
+                            }
+                            val expectedManifestByDepot =
+                                selectedDepots.mapNotNull { (depotId, depot) ->
+                                    // Steam-denied depots aren't part of this account's install.
+                                    if (depotId in deniedDepots) return@mapNotNull null
+                                    val gid = resolveDepotManifestInfo(depot, branch)?.gid ?: 0L
+                                    if (gid > 0L) depotId to gid else null
+                                }.toMap()
+                            val completenessFailures =
+                                verifyDepotConfigComplete(appDirPath, expectedManifestByDepot)
+                            if (completenessFailures.isNotEmpty()) {
+                                Timber.e(
+                                    "COMPLETENESS GATE FAILED for appId=$appId task=$downloadTaskType at $appDirPath: " +
+                                        "${completenessFailures.size}/${expectedManifestByDepot.size} depot(s) not fully " +
+                                        "installed — refusing to mark COMPLETE. Details: ${completenessFailures.take(30)}",
+                                )
+                                // Keep resume state so a resume re-fetches the missing depots.
+                                runCatching { di.persistProgressSnapshot(force = true) }
+                                di.updateStatus(
+                                    DownloadPhase.FAILED,
+                                    "Install incomplete: ${completenessFailures.size} depot(s) missing — resume to finish",
+                                )
+                                di.setActive(false)
+                                MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                                if (downloadTaskType == DownloadRecord.TASK_UPDATE) {
+                                    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                                }
+                                runBlocking {
+                                    DownloadCoordinator.notifyFinished(
+                                        DownloadRecord.STORE_STEAM,
+                                        appId.toString(),
+                                        DownloadRecord.STATUS_FAILED,
+                                        "incomplete: ${completenessFailures.size} depot(s) missing",
+                                    )
+                                }
+                                removeDownloadJob(appId)
+                                instance?.let { service ->
+                                    service.scope.launch(Dispatchers.Main) {
+                                        WinToast.show(
+                                            service.applicationContext,
+                                            "Download incomplete — some files are missing. Resume to finish.",
+                                            Toast.LENGTH_LONG,
+                                        )
+                                    }
+                                }
+                                PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
+                                return@launch
+                            }
+
+                            if (originalMainAppDepots.isNotEmpty()) {
+                                val mainAppDepotIds = originalMainAppDepots.keys.sorted()
+                                completeAppDownload(di, appId, mainAppDepotIds, mainAppDlcIds, appDirPath)
+                            }
+
+                            calculatedDlcAppIds.forEach { dlcAppId ->
+                                val dlcDepotIds = selectedDlcDepotIdsByDlcAppId[dlcAppId].orEmpty()
+                                completeAppDownload(di, dlcAppId, dlcDepotIds, emptyList(), appDirPath)
+                            }
+                            Timber.i("Installation finalized for appId: $appId")
+
+                            instance?.let { service ->
+                                service.scope.launch(Dispatchers.Main) {
+                                    WinToast.show(service.applicationContext, "Download complete", Toast.LENGTH_SHORT)
+                                    Unit
+                                }
+                            }
+                        } catch (e: Exception) {
+                            Timber.e(e, "Error during finalize/database update for appId: $appId")
+                            throw e
+                        }
+
+                        removeDownloadJob(appId)
+
+                        runBlocking {
+                            instance?.downloadingAppInfoDao?.deleteApp(appId)
+                            Unit
+                        }
+                        Unit
+                    } catch (e: DownloadFailedException) {
+                        Timber.d(e, "Download failed for app $appId via cancellation")
+                        clearFailedResumeState(appId)
+                        di.updateStatus(DownloadPhase.FAILED)
+                        di.setActive(false)
+                        MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                        if (downloadTaskType == DownloadRecord.TASK_UPDATE) {
+                            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                        }
+                        runBlocking {
+                            DownloadCoordinator.notifyFinished(
+                                DownloadRecord.STORE_STEAM,
+                                appId.toString(),
+                                DownloadRecord.STATUS_FAILED,
+                                e.message,
+                            )
+                        }
+                        removeDownloadJob(appId)
+                        return@launch
+                    } catch (e: CancellationException) {
+                        if (di.isDeleting) {
+                            Timber.d("Download cancelled for deletion for app $appId")
+                            return@launch
+                        }
+
+                        if (di.isCancelling) {
+                            Timber.d("Download cancelled by user for app $appId")
+                            di.persistProgressSnapshot(force = true)
+                            di.updateStatus(DownloadPhase.CANCELLED)
+                            di.setActive(false)
+                            runBlocking {
+                                DownloadCoordinator.notifyFinished(
+                                    DownloadRecord.STORE_STEAM,
+                                    appId.toString(),
+                                    DownloadRecord.STATUS_CANCELLED,
+                                )
+                            }
+                            throw e
+                        }
+
+                        Timber.d(e, "Download paused for app $appId")
+                        // Keep downloadingAppInfo on cancellation so resume does not fall into verify mode.
+                        di.persistProgressSnapshot(force = true)
+                        di.updateStatus(DownloadPhase.PAUSED)
+                        di.setActive(false)
+                        runBlocking {
+                            DownloadCoordinator.notifyFinished(
+                                DownloadRecord.STORE_STEAM,
+                                appId.toString(),
+                                DownloadRecord.STATUS_PAUSED,
+                            )
+                        }
+                        throw e
+                    } catch (e: Exception) {
+                        Timber.e(e, "Download failed for app $appId")
+                        // Transient failures keep resume state so Retry continues from the same offset.
+                        val isTransientFailure = e is WnDownloadTransientException
+                        if (isTransientFailure) {
+                            runCatching { di.persistProgressSnapshot(force = true) }
+                        } else {
+                            clearFailedResumeState(appId)
+                        }
+
+                        val errorMsg =
+                            when (e) {
+                                is ClassCastException -> "Casting error: ${e.message}"
+                                is NullPointerException -> "Null reference: ${e.message}"
+                                else -> e.localizedMessage ?: e.message ?: e.javaClass.simpleName
+                            }
+
+                        di.updateStatus(DownloadPhase.FAILED, errorMsg)
+                        di.setActive(false)
+                        MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+                        if (downloadTaskType == DownloadRecord.TASK_UPDATE) {
+                            MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+                        }
+                        if (!isTransientFailure) {
+                            runBlocking {
+                                instance?.downloadingAppInfoDao?.deleteApp(appId)
+                                Unit
+                            }
+                        }
+                        runBlocking {
+                            DownloadCoordinator.notifyFinished(
+                                DownloadRecord.STORE_STEAM,
+                                appId.toString(),
+                                DownloadRecord.STATUS_FAILED,
+                                errorMsg,
+                            )
+                        }
+                        removeDownloadJob(appId)
+                        instance?.let { service ->
+                            service.scope.launch(Dispatchers.Main) {
+                                WinToast.show(service.applicationContext, "Download failed: $errorMsg", Toast.LENGTH_LONG)
+                                Unit
+                            }
+                        }
+                        PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
+                        Unit
+                    } finally {
+                        // Tear down a session this worker brought up itself.
+                        workerWnSession?.let { ws ->
+                            runCatching { ws.disconnect() }
+                            runCatching { ws.close() }
+                            Timber.i("downloadApp: closed worker WN-Steam session for app $appId")
+                        }
+                        workerWnSession = null
+                        runCatching {
+                            SessionKeepAliveService.stopDownload(keepAliveCtx, keepAliveTag)
+                        }.onFailure { e ->
+                            Timber.w(e, "Failed to release keep-alive for Steam download $appId")
+                        }
+                        Unit
+                    }
+                    Unit
+                }
+            downloadJob.invokeOnCompletion { throwable ->
+                if (throwable is CancellationException && throwable !is DownloadFailedException) {
+                    if (di.isDeleting) {
+                        // Deletion handled externally
+                    } else if (di.isCancelling) {
+                        // Keep in downloadJobs for UI visibility, but still check queue
+                        checkQueue()
+                    } else {
+                        Timber.d(throwable, "Download paused for app $appId")
+                        removeDownloadJob(appId)
+                    }
+                }
+            }
+            di.setDownloadJob(downloadJob)
+        }
+
+    downloadJobs[appId] = info
+    info.updateStatus(DownloadPhase.PREPARING)
+    notifyDownloadStarted(appId)
+    return info
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceDownloadQueue.kt b/app/src/main/feature/stores/steam/service/SteamServiceDownloadQueue.kt
new file mode 100644
index 000000000..ea9098841
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceDownloadQueue.kt
@@ -0,0 +1,473 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Download-queue control, resume/cleanup helpers + sync flags, split out of SteamService.kt (behavior-identical).
+
+// Overlay the real unlock state onto schema-derived achievement definitions.
+internal suspend fun SteamService.Companion.mergeAchievementUnlockState(
+    appId: Int,
+    achievements: List<com.winlator.cmod.feature.stores.steam.statsgen.Achievement>,
+    nameToBlockBit: Map<String, Pair<Int, Int>>,
+): List<com.winlator.cmod.feature.stores.steam.statsgen.Achievement> {
+    if (achievements.isEmpty() || nameToBlockBit.isEmpty()) return achievements
+    val statsJson = withWnSession { s -> s.getUserStatsFull(appId) } ?: return achievements
+    val blockUnlock = HashMap<Int, List<Long>>()
+    runCatching {
+        val obj = JSONObject(statsJson)
+        if (obj.optInt("eresult", 2) != EResult.OK.code()) return achievements
+        val blocks = obj.optJSONArray("achievementBlocks") ?: return achievements
+        for (i in 0 until blocks.length()) {
+            val b = blocks.getJSONObject(i)
+            val times = b.optJSONArray("unlockTimes")
+            val list = ArrayList<Long>(times?.length() ?: 0)
+            for (j in 0 until (times?.length() ?: 0)) list.add(times!!.getLong(j))
+            blockUnlock[b.optInt("achievementId")] = list
+        }
+    }
+    if (blockUnlock.isEmpty()) return achievements
+    val unlockedTotal = blockUnlock.values.sumOf { times -> times.count { it != 0L } }
+    Timber.i("Achievements: app=$appId merged unlock state ($unlockedTotal unlocked across ${blockUnlock.size} blocks)")
+    return achievements.map { ach ->
+        val mapped = nameToBlockBit[ach.name] ?: return@map ach
+        val t = blockUnlock[mapped.first]?.getOrNull(mapped.second) ?: 0L
+        if (t != 0L) ach.copy(unlocked = true, unlockTimestamp = t.toInt()) else ach.copy(unlocked = false)
+    }
+}
+
+internal fun SteamService.Companion.downloadUrlsFor(fileName: String): List<String> {
+    val alternate =
+        when (fileName) {
+            "steam-token.tzst" -> "steam-token-r2.tzst"
+            else -> null
+        }
+    return if (alternate != null) {
+        listOf(
+            "$COMPONENTS_BASE_URL/$fileName",
+            "$COMPONENTS_BASE_URL/$alternate",
+        )
+    } else {
+        listOf("$COMPONENTS_BASE_URL/$fileName")
+    }
+}
+
+internal fun SteamService.Companion.notifyDownloadStarted(appId: Int) {
+    PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, true))
+}
+
+internal fun SteamService.Companion.notifyDownloadStopped(appId: Int) {
+    PluviaApp.events.emit(AndroidEvent.DownloadStatusChanged(appId, false))
+}
+
+internal fun SteamService.Companion.removeDownloadJob(
+    appId: Int,
+    forceRemove: Boolean = false,
+) {
+    if (forceRemove) {
+        val removed = downloadJobs.remove(appId)
+        if (removed != null) {
+            notifyDownloadStopped(appId)
+        }
+    } else {
+        notifyDownloadStopped(appId)
+    }
+    checkQueue()
+    Unit
+}
+
+internal fun SteamService.Companion.clearCompletedDownloadsInternal(dispatchQueueAfterClear: Boolean) {
+    val toRemove =
+        downloadJobs
+            .filterValues {
+                val status = it.getStatusFlow().value
+                status == DownloadPhase.COMPLETE ||
+                    status == DownloadPhase.CANCELLED ||
+                    status == DownloadPhase.FAILED
+            }.keys
+    toRemove.forEach { appId ->
+        val removed = downloadJobs.remove(appId)
+        if (removed != null) {
+            notifyDownloadStopped(appId)
+        }
+    }
+    if (dispatchQueueAfterClear && toRemove.isNotEmpty()) {
+        checkQueue()
+    }
+}
+
+/** Returns true if there is an incomplete download on disk (in-progress marker or actively downloading). */
+internal fun SteamService.Companion.hasPartialDownloadFiles(appDirPath: String): Boolean {
+    val appDir = File(appDirPath)
+    if (!appDir.exists()) return false
+
+    val persistenceFile = File(File(appDirPath, DOWNLOAD_INFO_DIR), DOWNLOAD_INFO_FILE)
+    if (persistenceFile.exists() && persistenceFile.length() > 0L) {
+        return true
+    }
+
+    // Complete marker present and no persisted resume file → fully installed, not a resumable partial.
+    if (MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)) {
+        return false
+    }
+
+    if (MarkerUtils.hasMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)) {
+        return true
+    }
+
+    val rootFiles = appDir.listFiles() ?: return false
+    return rootFiles.any { file ->
+        if (file.name != DOWNLOAD_INFO_DIR) {
+            true
+        } else {
+            val nestedFiles = file.listFiles().orEmpty()
+            nestedFiles.any { nested ->
+                nested.name != DOWNLOAD_INFO_FILE && nested.name != LEGACY_DOWNLOAD_INFO_FILE
+            }
+        }
+    }
+}
+
+internal fun SteamService.Companion.inferResumeDlcAppIds(
+    appId: Int,
+    appDirPath: String,
+): List<Int> {
+    // Try to recover selected DLCs from persisted depot progress when metadata row is missing.
+    return runCatching {
+        val persistenceFile = File(File(appDirPath, DOWNLOAD_INFO_DIR), DOWNLOAD_INFO_FILE)
+        if (!persistenceFile.exists() || !persistenceFile.canRead()) return@runCatching emptyList()
+
+        val text = persistenceFile.readText().trim()
+        if (text.isEmpty()) return@runCatching emptyList()
+
+        val persistedDepotIds = mutableSetOf<Int>()
+        val json = JSONObject(text)
+        for (key in json.keys()) {
+            val depotId = key.toIntOrNull() ?: continue
+            persistedDepotIds.add(depotId)
+        }
+        if (persistedDepotIds.isEmpty()) return@runCatching emptyList()
+
+        val context = instance!!.applicationContext
+        val container =
+            if (ContainerUtils.hasContainer(context, "STEAM_$appId")) {
+                ContainerUtils.getContainer(context, "STEAM_$appId")
+            } else {
+                null
+            }
+        val containerLanguage = container?.language ?: PrefManager.containerLanguage
+        val depots = getDownloadableDepots(appId = appId, preferredLanguage = containerLanguage)
+        depots
+            .asSequence()
+            .filter { (depotId, _) -> depotId in persistedDepotIds }
+            .map { (_, depot) -> depot.dlcAppId }
+            .filter { it != INVALID_APP_ID }
+            .distinct()
+            .toList()
+    }.getOrElse {
+        emptyList()
+    }
+}
+
+internal fun SteamService.Companion.hasPersistedDepotResumeMetadata(appDirPath: String): Boolean {
+    return runCatching {
+        val persistenceFile = File(File(appDirPath, DOWNLOAD_INFO_DIR), DOWNLOAD_INFO_FILE)
+        if (!persistenceFile.exists() || !persistenceFile.canRead()) return@runCatching false
+
+        val text = persistenceFile.readText().trim()
+        if (text.isEmpty()) return@runCatching false
+
+        val json = JSONObject(text)
+        json.keys().asSequence().any { key -> key.toIntOrNull() != null }
+    }.getOrElse {
+        false
+    }
+}
+
+internal fun SteamService.Companion.clearPersistedProgressSnapshot(appDirPath: String) {
+    val persistenceDir = File(appDirPath, DOWNLOAD_INFO_DIR)
+    val persistenceFile = File(persistenceDir, DOWNLOAD_INFO_FILE)
+    if (persistenceFile.exists()) {
+        persistenceFile.delete()
+    }
+    val legacyFile = File(persistenceDir, LEGACY_DOWNLOAD_INFO_FILE)
+    if (legacyFile.exists()) {
+        legacyFile.delete()
+    }
+    if (persistenceDir.exists() && persistenceDir.list().isNullOrEmpty()) {
+        persistenceDir.delete()
+    }
+}
+
+internal fun SteamService.Companion.clearFailedResumeState(appId: Int) {
+    val appDirPath = getAppDirPath(appId)
+    clearPersistedProgressSnapshot(appDirPath)
+    runBlocking(Dispatchers.IO) {
+        instance?.downloadingAppInfoDao?.deleteApp(appId)
+    }
+}
+
+internal fun SteamService.Companion.deleteRecursivelyWithRetries(
+    target: File,
+    maxAttempts: Int = 5,
+    delayMs: Long = 250L,
+): Boolean {
+    if (!target.exists()) return true
+
+    repeat(maxAttempts) {
+        if (target.deleteRecursively()) return true
+        try {
+            Thread.sleep(delayMs)
+        } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
+            return !target.exists()
+        }
+    }
+
+    return !target.exists()
+}
+
+internal fun SteamService.Companion.cleanupSteamAppCacheDirs(appId: Int) {
+    StoreArtworkCache.deleteGame(PluviaApp.instance, "steam", appId.toString())
+    steamAppCacheDirs(appId).forEach { dir ->
+        if (!dir.exists()) return@forEach
+        Timber.i("Deleting Steam cache folder for appId $appId: ${dir.absolutePath}")
+        if (!deleteRecursivelyWithRetries(dir)) {
+            Timber.w("Failed to fully delete Steam cache folder for appId $appId: ${dir.absolutePath}")
+        }
+    }
+}
+
+internal fun SteamService.Companion.steamAppCacheDirs(appId: Int): List<File> {
+    val appIdString = appId.toString()
+    val dirs = linkedMapOf<String, File>()
+
+    fun addDir(dir: File) {
+        val normalized =
+            try {
+                dir.canonicalFile
+            } catch (_: IOException) {
+                dir.absoluteFile
+            }
+        dirs[normalized.path] = normalized
+    }
+
+    fun addSteamAppsRoot(root: File) {
+        addDir(File(root, "staging/$appIdString"))
+        addDir(File(root, "shadercache/$appIdString"))
+    }
+
+    fun addInstallRoot(installRoot: String) {
+        if (installRoot.isBlank()) return
+        val root = File(installRoot)
+        val steamAppsRoot =
+            if (root.name.equals("common", ignoreCase = true)) {
+                root.parentFile ?: root
+            } else {
+                root
+            }
+        addSteamAppsRoot(steamAppsRoot)
+    }
+
+    addDir(File(defaultAppStagingPath, appIdString))
+    if (defaultStoragePath.isNotBlank()) {
+        addDir(File(defaultStoragePath, "Steam/steamapps/shadercache/$appIdString"))
+    }
+
+    addInstallRoot(internalAppInstallPath)
+    addInstallRoot(externalAppInstallPath)
+    addInstallRoot(defaultAppInstallPath)
+    allInstallPaths.forEach(::addInstallRoot)
+
+    return dirs.values.toList()
+}
+
+internal fun SteamService.Companion.steamProtectedInstallRoots(): List<String> =
+    listOf(
+        internalAppInstallPath,
+        externalAppInstallPath,
+        defaultAppInstallPath,
+    ).filter { it.isNotBlank() }.distinct()
+
+
+internal fun SteamService.Companion.getSyncFlag(appId: Int): AtomicBoolean {
+    val existing = syncInProgressApps[appId]
+    if (existing != null) {
+        return existing
+    }
+    val created = AtomicBoolean(false)
+    val prior = syncInProgressApps.putIfAbsent(appId, created)
+    return prior ?: created
+}
+
+internal fun SteamService.Companion.tryAcquireSync(appId: Int): Boolean {
+    val flag = getSyncFlag(appId)
+    return flag.compareAndSet(false, true)
+}
+
+internal fun SteamService.Companion.releaseSync(appId: Int) {
+    val flag = syncInProgressApps[appId]
+    flag?.set(false)
+    if (flag != null && !flag.get()) {
+        syncInProgressApps.remove(appId, flag)
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceFriendsChat.kt b/app/src/main/feature/stores/steam/service/SteamServiceFriendsChat.kt
new file mode 100644
index 000000000..e0b039076
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceFriendsChat.kt
@@ -0,0 +1,624 @@
+package com.winlator.cmod.feature.stores.steam.service
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.INVALID_APP_ID
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.INVALID_PKG_ID
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.MAX_PICS_BUFFER
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.isLoggedIn
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.withWnSession
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Friends presence + chat + PICS pollers, split out of SteamService.kt (behavior-identical).
+
+internal suspend fun SteamService.pushFriendsListToLibSteamClient() {
+    var ids = LongArray(0)
+    for (attempt in 0 until 30) {
+        ids = withWnSession { s -> s.getFriendsList() } ?: LongArray(0)
+        if (ids.isNotEmpty()) break
+        delay(200)
+    }
+    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+        .setFriendsList(ids)
+    Timber.i("Pushed ${ids.size} friend(s) to libsteamclient.so")
+
+    if (ids.isEmpty()) return
+
+    withWnSession { s ->
+        s.requestFriendPersonas(ids, personaStateRequested = 1)
+    }
+
+    pushFriendPersonaNamesToLibSteamClient(ids)
+}
+
+internal suspend fun SteamService.pushFriendPersonaNamesToLibSteamClient(
+    expectedIds: LongArray,
+) {
+    var lastCount = -1
+    var json = "[]"
+    for (attempt in 0 until 30) {
+        json = withWnSession { s -> s.getFriendPersonas() } ?: "[]"
+        val arr = try { JSONArray(json) } catch (_: Exception) { JSONArray() }
+        if (arr.length() >= expectedIds.size) break
+        if (arr.length() == lastCount && arr.length() > 0) break
+        lastCount = arr.length()
+        delay(200)
+    }
+    val pushed = com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+        .pushFriendPersonasJson(json, persistSnapshot = true)
+    Timber.i("Pushed $pushed friend persona(s) to libsteamclient.so (snapshot persisted)")
+}
+
+internal fun SteamService.touchRecentChat(friendId: Long) {
+    if (friendId == 0L) return
+    _recentChats.update { it + (friendId to System.currentTimeMillis()) }
+}
+
+internal fun SteamService.isActiveConversation(steamId: Long): Boolean = activeConversations.containsKey(steamId)
+
+
+internal fun SteamService.continuousIncomingMessagePoller(): Job =
+    scope.launch {
+        while (isActive && isLoggedIn) {
+            delay(1000L)
+            val grouped = runCatching { drainIncomingMessages() }.getOrNull()
+            if (grouped.isNullOrEmpty()) continue
+            dispatchIncomingChat(grouped)
+        }
+    }
+
+
+internal fun SteamService.dispatchIncomingChat(
+    grouped: Map<Long, List<com.winlator.cmod.feature.stores.steam.data.SteamChatMessage>>,
+) {
+    val friends = _friendsList.value.associateBy { it.steamId }
+    val suppressed = GameSessionState.inGame && !PrefManager.chatInGameEnabled
+    for ((friendId, messages) in grouped) {
+        for (m in messages) _incomingChat.tryEmit(friendId to m)
+        val fromFriend = messages.filter { !it.fromSelf && it.text.isNotBlank() }
+        if (fromFriend.isEmpty()) continue
+        touchRecentChat(friendId)
+        if (isActiveConversation(friendId)) continue
+        _unreadCounts.update { it + (friendId to ((it[friendId] ?: 0) + fromFriend.size)) }
+        if (suppressed) continue
+        val name = friends[friendId]?.name?.ifBlank { friendId.toString() } ?: friendId.toString()
+        val preview = chatPreview(fromFriend.last().text)
+        if (PrefManager.chatNotificationsEnabled) {
+            runCatching { notificationHelper.notifyChatMessage(friendId, name, preview) }
+        }
+        if (PrefManager.chatHeadsEnabled) {
+            runCatching {
+                com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService.onIncoming(this, friendId)
+            }
+        }
+    }
+}
+
+internal fun SteamService.chatPreview(text: String): String {
+    val t = text.trim()
+    return if (t.startsWith("[img") || t.contains("steamusercontent.com")) {
+        getString(com.winlator.cmod.R.string.steam_chat_image)
+    } else {
+        t
+    }
+}
+
+/** Poll PICS for app/package changes since the last change number on a fixed interval. */
+internal fun SteamService.continuousPICSChangesChecker(): Job =
+    scope.launch {
+        while (isActive && isLoggedIn) {
+            PICSChangesCheck()
+            delay(60.seconds)
+        }
+    }
+
+
+internal fun SteamService.PICSChangesCheck() {
+    scope.launch {
+        ensureActive()
+
+        try {
+            // PICS change poll via the C++ WN-Steam-Client.
+            val changesJson =
+                withWnSession { session ->
+                    withContext(Dispatchers.IO) {
+                        session.getPicsChangesSince(PrefManager.lastPICSChangeNumber.toLong())
+                    }
+                }
+            if (changesJson == null) {
+                Timber.w("PICS changes-since via wn-steam-client unavailable, skipping")
+                return@launch
+            }
+            val changes = JSONObject(changesJson)
+            val currentCN = changes.optLong("currentChangeNumber", 0L)
+
+            if (PrefManager.lastPICSChangeNumber.toLong() == currentCN) {
+                Timber.w("Change number was the same as last change number, skipping")
+                return@launch
+            }
+            PrefManager.lastPICSChangeNumber = currentCN.toInt()
+
+            val appChanges = changes.optJSONArray("apps")
+            val pkgChanges = changes.optJSONArray("packages")
+            Timber.d(
+                "picsGetChangesSince(wn): current=$currentCN " +
+                    "apps=${appChanges?.length() ?: 0} pkgs=${pkgChanges?.length() ?: 0}",
+            )
+
+            launch {
+                val reqs = mutableListOf<PICSRequest>()
+                if (appChanges != null) {
+                    for (i in 0 until appChanges.length()) {
+                        val c = appChanges.getJSONObject(i)
+                        val appId = c.optInt("appid")
+                        // only queue apps existing in the db that have changed
+                        val dbApp = appDao.findApp(appId) ?: continue
+                        if (c.optInt("changeNumber") != dbApp.lastChangeNumber) {
+                            reqs.add(PICSRequest(id = appId))
+                        }
+                    }
+                }
+                reqs.chunked(MAX_PICS_BUFFER).forEach { chunk ->
+                    ensureActive()
+                    Timber.d("onPicsChanges: Queueing ${chunk.size} app(s) for PICS")
+                    appPicsChannel.send(chunk)
+                }
+            }
+
+            launch {
+                data class PkgChange(val id: Int, val needsToken: Boolean)
+                val changed = mutableListOf<PkgChange>()
+                if (pkgChanges != null) {
+                    for (i in 0 until pkgChanges.length()) {
+                        val c = pkgChanges.getJSONObject(i)
+                        val pkgId = c.optInt("packageid")
+                        val dbPkg = licenseDao.findLicense(pkgId) ?: continue
+                        if (c.optInt("changeNumber") != dbPkg.lastChangeNumber) {
+                            changed.add(PkgChange(pkgId, c.optBoolean("needsToken")))
+                        }
+                    }
+                }
+                if (changed.isNotEmpty()) {
+                    val needTokenIds = changed.filter { it.needsToken }.map { it.id }
+                    val tokens = HashMap<Int, Long>()
+                    if (needTokenIds.isNotEmpty()) {
+                        val tokJson =
+                            withWnSession { session ->
+                                withContext(Dispatchers.IO) {
+                                    session.getPicsAccessTokens(emptyList(), needTokenIds)
+                                }
+                            }
+                        if (tokJson != null) {
+                            JSONObject(tokJson).optJSONObject("packageTokens")?.let { pt ->
+                                for (k in pt.keys()) {
+                                    tokens[k.toInt()] = pt.getString(k).toLongOrNull() ?: 0L
+                                }
+                            }
+                        }
+                    }
+                    ensureActive()
+                    changed
+                        .map { PICSRequest(it.id, tokens[it.id] ?: 0L) }
+                        .chunked(MAX_PICS_BUFFER)
+                        .forEach { chunk ->
+                            Timber.d("onPicsChanges: Queueing ${chunk.size} package(s) for PICS")
+                            packagePicsChannel.send(chunk)
+                        }
+                }
+            }
+        } catch (e: Exception) {
+            Timber.w(e, "PICSChangesCheck failed")
+        }
+    }
+}
+
+/** Buffered flow that batches bursts of PICS requests. */
+internal fun SteamService.continuousPICSGetProductInfo(): Job =
+    scope.launch {
+        // App PICS — product info via the C++ WN-Steam-Client.
+        launch {
+            appPicsChannel
+                .receiveAsFlow()
+                .filter { it.isNotEmpty() }
+                .buffer(capacity = MAX_PICS_BUFFER, onBufferOverflow = BufferOverflow.SUSPEND)
+                .collect { appRequests ->
+                    Timber.d("Processing ${appRequests.size} app PICS requests")
+                    ensureActive()
+                    if (!isLoggedIn) return@collect
+
+                    val json =
+                        withWnSession { session ->
+                            withContext(Dispatchers.IO) {
+                                session.getPicsAppProductInfo(
+                                    appRequests.map { it.id },
+                                    appRequests.map { it.accessToken },
+                                )
+                            }
+                        } ?: return@collect
+
+                    try {
+                        val arr = JSONArray(json)
+                        val steamAppsList = mutableListOf<SteamApp>()
+                        for (i in 0 until arr.length()) {
+                            ensureActive()
+                            try {
+                                val entry = arr.getJSONObject(i)
+                                val appId = entry.optInt("appid")
+                                val changeNumber = entry.optInt("changeNumber")
+                                val appinfo = entry.optJSONObject("appinfo") ?: continue
+
+                                val appFromDb = appDao.findApp(appId)
+                                if (changeNumber == appFromDb?.lastChangeNumber) continue
+
+                                val packageId = appFromDb?.packageId ?: INVALID_PKG_ID
+                                val packageFromDb =
+                                    if (packageId != INVALID_PKG_ID) licenseDao.findLicense(packageId) else null
+                                val ownerAccountId = packageFromDb?.ownerAccountId ?: emptyList()
+
+                                val existingInstallDir = appFromDb?.installDir.orEmpty()
+                                val preserveInstallDir =
+                                    existingInstallDir.isNotEmpty() &&
+                                        (existingInstallDir.startsWith("/") || existingInstallDir.contains(File.separator))
+
+                                val generatedApp = WnKeyValue.fromJsonObject(appinfo).generateSteamApp()
+                                steamAppsList.add(
+                                    generatedApp.copy(
+                                        packageId = packageId,
+                                        ownerAccountId = ownerAccountId,
+                                        receivedPICS = true,
+                                        lastChangeNumber = changeNumber,
+                                        licenseFlags = packageFromDb?.licenseFlags ?: EnumSet.noneOf(ELicenseFlags::class.java),
+                                        installDir =
+                                            if (preserveInstallDir) existingInstallDir else generatedApp.installDir,
+                                    ),
+                                )
+                            } catch (e: Exception) {
+                                Timber.w(e, "PICS app entry decode failed")
+                            }
+                        }
+                        if (steamAppsList.isNotEmpty()) {
+                            Timber.i("Inserting ${steamAppsList.size} PICS apps to database (wn)")
+                            db.withTransaction { appDao.insertAll(steamAppsList) }
+                        }
+                    } catch (ce: kotlin.coroutines.cancellation.CancellationException) {
+                        throw ce
+                    } catch (e: Exception) {
+                        Timber.w(e, "PICS app batch processing failed")
+                    }
+                }
+        }
+
+        // Package PICS — package info via the C++ WN-Steam-Client.
+        launch {
+            packagePicsChannel
+                .receiveAsFlow()
+                .filter { it.isNotEmpty() }
+                .buffer(capacity = MAX_PICS_BUFFER, onBufferOverflow = BufferOverflow.SUSPEND)
+                .collect { packageRequests ->
+                    Timber.d("Processing ${packageRequests.size} package PICS requests")
+                    ensureActive()
+                    if (!isLoggedIn) return@collect
+
+                    val json =
+                        withWnSession { session ->
+                            withContext(Dispatchers.IO) {
+                                session.getPicsPackageInfo(
+                                    packageRequests.map { it.id },
+                                    packageRequests.map { it.accessToken },
+                                )
+                            }
+                        } ?: return@collect
+
+                    val queue = mutableListOf<Int>()
+                    try {
+                        val arr = JSONArray(json)
+                        db.withTransaction {
+                            for (i in 0 until arr.length()) {
+                                val pkg = arr.getJSONObject(i)
+                                val pkgId = pkg.optInt("packageid")
+                                val appIds = pkg.optJSONArray("appids").toIntList()
+                                licenseDao.updateApps(pkgId, appIds)
+                                val depotIds = pkg.optJSONArray("depotids").toIntList()
+                                licenseDao.updateDepots(pkgId, depotIds)
+
+                                if (appIds.isNotEmpty()) {
+                                    // Update package_id on existing rows in one statement; insert stubs for the rest (avoids a per-app find/update/insert N+1).
+                                    val existing = appDao.findExistingIds(appIds).toHashSet()
+                                    appDao.setPackageIdForApps(appIds, pkgId)
+                                    val newApps = appIds.asSequence()
+                                        .filter { it !in existing }
+                                        .map { SteamApp(id = it, packageId = pkgId) }
+                                        .toList()
+                                    if (newApps.isNotEmpty()) appDao.insertAll(newApps)
+                                }
+                                queue.addAll(appIds)
+                            }
+                        }
+                    } catch (ce: kotlin.coroutines.cancellation.CancellationException) {
+                        throw ce
+                    } catch (e: Exception) {
+                        Timber.w(e, "PICS package batch processing failed")
+                    }
+
+                    if (queue.isNotEmpty()) {
+                        // App access tokens for the package's apps, then re-queue.
+                        val tokens = HashMap<Int, Long>()
+                        val tokJson =
+                            withWnSession { session ->
+                                withContext(Dispatchers.IO) {
+                                    session.getPicsAccessTokens(queue, emptyList())
+                                }
+                            }
+                        if (tokJson != null) {
+                            JSONObject(tokJson).optJSONObject("appTokens")?.let { at ->
+                                for (k in at.keys()) {
+                                    tokens[k.toInt()] = at.getString(k).toLongOrNull() ?: 0L
+                                }
+                            }
+                        }
+                        queue
+                            .map { PICSRequest(id = it, accessToken = tokens[it] ?: 0L) }
+                            .chunked(MAX_PICS_BUFFER)
+                            .forEach { chunk ->
+                                Timber.d("bufferedPICSGetProductInfo: Queueing ${chunk.size} for PICS")
+                                appPicsChannel.send(chunk)
+                            }
+                    }
+                }
+        }
+    }
+
+
+/** Re-fetches apps whose stored manifest download>size (impossible — compressed can't exceed uncompressed); re-stores only when the fresh appinfo is clean so a bad response never overwrites good data. Self-limiting once rows are clean. */
+internal fun SteamService.healCorruptManifestDownloadSizes(): Job =
+    scope.launch {
+        if (!isLoggedIn) return@launch
+
+        fun SteamApp.hasCorruptDownload(): Boolean =
+            depots.values.any { depot ->
+                depot.manifests.values.any { m -> m.size > 0L && m.download > m.size }
+            }
+
+        val corruptAppIds =
+            runCatching {
+                withContext(Dispatchers.IO) { appDao.getAllAsList() }
+                    .filter { it.hasCorruptDownload() }
+                    .map { it.id }
+            }.getOrElse { e ->
+                Timber.w(e, "heal: scan for corrupt manifest download sizes failed")
+                return@launch
+            }
+        if (corruptAppIds.isEmpty()) return@launch
+        Timber.i(
+            "heal: ${corruptAppIds.size} app(s) have download>size; re-fetching: ${corruptAppIds.sorted()}",
+        )
+
+        // Owned-app appinfo only comes back in full with the access token.
+        val tokenMap = HashMap<Int, Long>()
+        runCatching {
+            withWnSession { session ->
+                withContext(Dispatchers.IO) { session.getPicsAccessTokens(corruptAppIds, emptyList()) }
+            }?.let { tokJson ->
+                JSONObject(tokJson).optJSONObject("appTokens")?.let { at ->
+                    for (k in at.keys()) tokenMap[k.toInt()] = at.getString(k).toLongOrNull() ?: 0L
+                }
+            }
+        }.onFailure { e -> Timber.w(e, "heal: access-token fetch failed; trying public appinfo") }
+
+        var healedCount = 0
+        corruptAppIds.chunked(MAX_PICS_BUFFER).forEach { chunk ->
+            ensureActive()
+            val json =
+                withWnSession { session ->
+                    withContext(Dispatchers.IO) {
+                        session.getPicsAppProductInfo(chunk, chunk.map { tokenMap[it] ?: 0L })
+                    }
+                } ?: return@forEach
+            runCatching {
+                val arr = JSONArray(json)
+                val healed = mutableListOf<SteamApp>()
+                for (i in 0 until arr.length()) {
+                    ensureActive()
+                    val entry = arr.getJSONObject(i)
+                    val appId = entry.optInt("appid")
+                    val changeNumber = entry.optInt("changeNumber")
+                    val appinfo = entry.optJSONObject("appinfo") ?: continue
+                    val generated = WnKeyValue.fromJsonObject(appinfo).generateSteamApp()
+                    if (generated.id == INVALID_APP_ID) continue
+                    // Only accept a re-fetch that actually removes the corruption.
+                    if (generated.hasCorruptDownload()) {
+                        Timber.w("heal: appId=$appId still reports download>size after re-fetch; leaving stored row")
+                        continue
+                    }
+                    val appFromDb = appDao.findApp(appId)
+                    val packageId = appFromDb?.packageId ?: INVALID_PKG_ID
+                    val packageFromDb =
+                        if (packageId != INVALID_PKG_ID) licenseDao.findLicense(packageId) else null
+                    val existingInstallDir = appFromDb?.installDir.orEmpty()
+                    val preserveInstallDir =
+                        existingInstallDir.isNotEmpty() &&
+                            (existingInstallDir.startsWith("/") || existingInstallDir.contains(File.separator))
+                    healed.add(
+                        generated.copy(
+                            packageId = packageId,
+                            ownerAccountId =
+                                packageFromDb?.ownerAccountId ?: appFromDb?.ownerAccountId.orEmpty(),
+                            receivedPICS = true,
+                            lastChangeNumber = changeNumber,
+                            licenseFlags =
+                                packageFromDb?.licenseFlags
+                                    ?: appFromDb?.licenseFlags
+                                    ?: EnumSet.noneOf(ELicenseFlags::class.java),
+                            installDir = if (preserveInstallDir) existingInstallDir else generated.installDir,
+                        ),
+                    )
+                }
+                if (healed.isNotEmpty()) {
+                    db.withTransaction { appDao.insertAll(healed) }
+                    healedCount += healed.size
+                }
+            }.onFailure { e -> Timber.w(e, "heal: batch processing failed") }
+        }
+        if (healedCount > 0) {
+            Timber.i("heal: corrected manifest download sizes for $healedCount app(s)")
+        }
+    }
+
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceInstall.kt b/app/src/main/feature/stores/steam/service/SteamServiceInstall.kt
new file mode 100644
index 000000000..dfd84ce45
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceInstall.kt
@@ -0,0 +1,290 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Install-path/shortcut helpers + download-request gating, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.isSuspiciousSteamInstallDirLeaf(value: String): Boolean {
+    val normalized = value.trim().replace('\\', '/').trimEnd('/')
+    if (normalized.isEmpty()) return false
+    val leaf = normalized.substringAfterLast('/')
+    return leaf.equals("common", ignoreCase = true) ||
+        leaf.equals("steamapps", ignoreCase = true)
+}
+
+internal fun SteamService.Companion.isSuspiciousSteamInstallPath(path: String): Boolean {
+    val normalized = path.trim().replace('\\', '/').trimEnd('/')
+    if (normalized.isEmpty()) return false
+    return normalized.endsWith("/steamapps/common", ignoreCase = true) ||
+        normalized.endsWith("/steamapps", ignoreCase = true)
+}
+
+internal fun SteamService.Companion.normalizeInstallPath(path: String): String {
+    if (path.isBlank()) return path
+    return try {
+        File(path).canonicalPath
+    } catch (_: IOException) {
+        File(path).absolutePath
+    }
+}
+
+internal fun SteamService.Companion.createSteamShortcut(
+    context: Context,
+    appId: Int,
+) {
+    try {
+        val container = ContainerUtils.getOrCreateContainer(context, "STEAM_$appId")
+        val appInfo = getAppInfoOf(appId) ?: return
+        val installPath = getAppDirPath(appId)
+        val launchExecutable = getInstalledExe(appId)
+        val desktopDir = container.getDesktopDir()
+        if (!desktopDir.exists()) desktopDir.mkdirs()
+
+        val shortcutFile = File(desktopDir, "${appInfo.name}.desktop")
+
+        // Skip if present — rewriting on every verify/update wiped per-game [Extra Data] (wine version, dxwrapper, env vars, cover art).
+        if (shortcutFile.exists() && shortcutFile.length() > 0L) {
+            Timber.i(
+                "Steam shortcut already exists for appId=$appId (${appInfo.name}); " +
+                    "preserving existing per-game settings.",
+            )
+            return
+        }
+
+        val content = StringBuilder()
+        content.append("[Desktop Entry]\n")
+        content.append("Type=Application\n")
+        content.append("Name=${appInfo.name}\n")
+        content.append("Exec=wine \"C:\\\\Program Files (x86)\\\\Steam\\\\steamclient_loader_x64.exe\"\n")
+        content.append("Icon=steam_icon_$appId\n")
+        content.append("\n[Extra Data]\n")
+        content.append("game_source=STEAM\n")
+        content.append("app_id=$appId\n")
+        content.append("container_id=${container.id}\n")
+        content.append("game_install_path=$installPath\n")
+        content.append("launch_exe_path=$launchExecutable\n")
+        content.append("use_container_defaults=1\n")
+
+        com.winlator.cmod.shared.io.FileUtils
+            .writeString(shortcutFile, content.toString())
+        Timber.i("Created Steam shortcut for ${appInfo.name} in container ${container.id}")
+    } catch (e: Exception) {
+        Timber.e(e, "Failed to create Steam shortcut for appId $appId")
+    }
+}
+
+internal fun SteamService.Companion.resolveInstalledDlcIdsForUpdateOrVerify(appId: Int): List<Int> {
+    val dlcAppIds = getInstalledDlcDepotsOf(appId).orEmpty().toMutableList()
+
+    getDownloadableDlcAppsOf(appId)?.forEach { dlcApp ->
+        val installedDlcApp = getInstalledApp(dlcApp.id)
+        if (installedDlcApp != null) {
+            dlcAppIds.add(installedDlcApp.id)
+        }
+    }
+
+    return dlcAppIds.distinct()
+}
+
+internal fun SteamService.Companion.parseDownloadScopeIds(scope: String): Set<Int> =
+    scope
+        .split(',')
+        .mapNotNull { it.trim().toIntOrNull() }
+        .toSet()
+
+
+internal fun SteamService.Companion.activeDownloadRecordFor(appId: Int): DownloadRecord? =
+    runCatching {
+        runBlocking(Dispatchers.IO) {
+            DownloadCoordinator.findRecord(
+                DownloadRecord.STORE_STEAM,
+                appId.toString(),
+            )
+        }
+    }.getOrNull()
+        ?.takeIf {
+            it.status in setOf(
+                DownloadRecord.STATUS_QUEUED,
+                DownloadRecord.STATUS_DOWNLOADING,
+                DownloadRecord.STATUS_PAUSED,
+            )
+        }
+
+
+internal fun SteamService.Companion.rejectConflictingDownloadRequest(appId: Int, record: DownloadRecord): DownloadInfo? {
+    Timber.i(
+        "Refusing Steam download request for appId=$appId because an active record already exists " +
+            "status=${record.status} taskType=${record.taskType} selectedDlcs=${record.selectedDlcs}",
+    )
+    instance?.let { service ->
+        service.scope.launch(Dispatchers.Main) {
+            WinToast.show(
+                service.applicationContext,
+                service.getString(R.string.store_game_download_already_active),
+                Toast.LENGTH_SHORT,
+            )
+        }
+    }
+    // Return null so callers can tell the request was rejected; returning the pre-existing job would let a verify/update pop-up latch onto an unrelated in-flight download and mislabel it.
+    return null
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceLogin.kt b/app/src/main/feature/stores/steam/service/SteamServiceLogin.kt
new file mode 100644
index 000000000..3e843984d
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceLogin.kt
@@ -0,0 +1,622 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Login token/session bring-up + update-check helpers, split out of SteamService.kt (behavior-identical).
+
+/** Persist native-client auth credentials for cold-start auto-logon. */
+internal fun SteamService.Companion.persistLoginTokens(
+    username: String,
+    accessToken: String?,
+    refreshToken: String?,
+    clientId: Long? = null,
+) {
+    isLoggingOut = false
+    PrefManager.username = username
+    if (accessToken != null) PrefManager.accessToken = accessToken
+    if (refreshToken != null) PrefManager.refreshToken = refreshToken
+    if (clientId != null) PrefManager.clientId = clientId
+    val tokenForSid = refreshToken ?: accessToken
+    var newSid: Long = 0L
+    var accountSwitched: Boolean = false
+    if (tokenForSid != null) {
+        runCatching {
+            val sub = JWT(tokenForSid).subject
+            if (!sub.isNullOrBlank()) {
+                val sid64 = sub.toLongOrNull()
+                if (sid64 != null && sid64 != 0L) {
+                    newSid = sid64
+                    val prev = PrefManager.steamUserSteamId64
+                    if (prev != sid64) {
+                        accountSwitched = (prev != 0L)
+                        PrefManager.steamUserSteamId64 = sid64
+                        PrefManager.steamUserAccountId =
+                            (sid64 and 0xFFFFFFFFL).toInt()
+                        Timber.i("persistLoginTokens: cached steamId64=$sid64" +
+                            if (accountSwitched) " (account switch from $prev)" else "")
+                    }
+                }
+            }
+        }.onFailure { e ->
+            Timber.w(e, "persistLoginTokens: JWT decode failed")
+        }
+    }
+    if (newSid != 0L) {
+        runCatching {
+            if (accountSwitched) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setPersonaName("")
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setFriendsList(LongArray(0))
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setCloudFiles(emptyArray(), IntArray(0), LongArray(0))
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setCloudEnabledForApp(false)
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppId(0)
+                Timber.i("persistLoginTokens: cleared libsteamclient mirror on account switch")
+                instance?.let { svc ->
+                    svc.scope.launch(Dispatchers.IO) {
+                        runCatching { svc.encryptedAppTicketDao.deleteAll() }
+                            .onFailure {
+                                Timber.w(it,
+                                    "Failed to clear encrypted-app-ticket cache on account switch")
+                            }
+                        runCatching { svc.db.steamAppDao().deleteAll() }
+                            .onFailure {
+                                Timber.w(it,
+                                    "Failed to clear steam_app catalog on account switch")
+                            }
+                        runCatching { svc.licenseDao.deleteAll() }
+                            .onFailure {
+                                Timber.w(it,
+                                    "Failed to clear steam_license on account switch")
+                            }
+                    }
+                }
+            }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setSteamId(newSid)
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setLoggedOn(true)
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setCloudEnabledForAccount(true)
+        }.onFailure { e ->
+            Timber.w(e, "persistLoginTokens: libsteamclient identity push failed")
+        }
+    }
+}
+
+/** Orchestrator observer on the long-lived [WnSteamSession]; drives the connection lifecycle off the channel state — state 2 (Connected): mark connected; state 3 (LoggedOn): mark connected+logged-in then run [onWnLoggedOn] once; state 0 (Disconnected): clear flows and, if still the shared session, hand off to [onWnDisconnected]. */
+internal fun SteamService.Companion.installWnLogonObserver(session: WnSteamSession) {
+    // A fresh session begins a fresh logon — let onWnLoggedOn re-run.
+    wnLoggedOnHandled = false
+    session.setStateObserver(object : WnSteamStateObserver {
+        override fun onStateChanged(state: Int) {
+            val name = when (state) {
+                0 -> "Disconnected"; 1 -> "Connecting"
+                2 -> "Connected";    3 -> "LoggedOn"
+                else -> "?($state)"
+            }
+            Timber.i("WnSteam(logon) state -> %s", name)
+            when (state) {
+                2 -> {
+                    isConnected = true
+                }
+                3 -> {
+                    isConnected = true
+                    _isLoggedInFlow.value = true
+                    recordLogonSuccess()
+                    if (!wnLoggedOnHandled) {
+                        wnLoggedOnHandled = true
+                        instance?.onWnLoggedOn(session)
+                    }
+                }
+                0 -> {
+                    if (wnSession === session) {
+                        isConnected = false
+                        if (PrefManager.refreshToken.isBlank()) {
+                            _isLoggedInFlow.value = false
+                        }
+                        wnSession = null
+                        wnLoggedOnHandled = false
+                        instance?.onWnDisconnected()
+                    }
+                }
+            }
+        }
+        override fun onClientMessage(emsg: Int, eresult: Int, body: ByteArray) {
+            Timber.d("WnSteam(logon) inbound emsg=%d eresult=%d body=%d bytes",
+                emsg, eresult, body.size)
+            if (emsg == 751 && eresult != 1) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .reportLogonFailure(eresult = eresult, stillRetrying = true)
+                recordLogonFailure(eresult)
+                val nonRecoverable = eresult == 5 || eresult == 15 ||
+                    eresult == 18 || eresult == 65
+                if (nonRecoverable && PrefManager.refreshToken.isNotBlank()) {
+                    Timber.w("WnSteam: non-recoverable EResult=$eresult on logon — " +
+                        "clearing refresh-token, will require re-sign-in")
+                    PrefManager.clearAuthTokens()
+                    _isLoggedInFlow.value = false
+                    runCatching {
+                        PluviaApp.events.emit(
+                            SteamEvent.LogonEnded(
+                                PrefManager.username,
+                                LoginResult.Failed,
+                                "Steam refused the cached session (EResult=$eresult). Please sign in again."))
+                    }
+                    runCatching {
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                            .setLoggedOn(false)
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                            .setSteamId(0L)
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                            .setPersonaName("")
+                    }
+                }
+            }
+        }
+    })
+    // Wire the Kotlin library facade now so it's ready for the populate-complete observer fire that lands a couple seconds after the ClientLicenseList push.
+    wnLibraryMirrorJob?.cancel()
+    wnLibrary?.stopObserving()
+    val library = WnLibraryStore(session)
+    wnLibrary = library
+    library.startObserving()
+    // Log every snapshot transition to see when the populate pipeline completes; the flow is hot + replay=1 so late collectors get the latest snapshot.
+    wnLibraryMirrorJob = instance?.scope?.launch(Dispatchers.Default) {
+        library.snapshots.collect { snap ->
+            Timber.i(
+                "WnLibrary snapshot: %d packages, %d owned apps (of %d tracked)",
+                snap.packages.size, snap.ownedApps.size, snap.allAppsCount,
+            )
+            val nameIds  = mutableListOf<Int>()
+            val nameStrs = mutableListOf<String>()
+            var buildIdsPushed = 0
+            var sourcePackagesPushed = 0
+            for (a in snap.ownedApps) {
+                if (a.name.isNotEmpty()) {
+                    nameIds.add(a.id)
+                    nameStrs.add(a.name)
+                }
+                if (a.buildId > 0) {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .setAppBuildId(a.id, a.buildId)
+                    ++buildIdsPushed
+                }
+                if (a.sourcePackageIds.isNotEmpty()) {
+                    com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                        .setAppSourcePackages(
+                            a.id, a.sourcePackageIds.toIntArray())
+                    ++sourcePackagesPushed
+                }
+            }
+            if (nameIds.isNotEmpty()) {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setAppNames(nameIds.toIntArray(), nameStrs.toTypedArray())
+            }
+            if (nameIds.isNotEmpty() || buildIdsPushed > 0 || sourcePackagesPushed > 0) {
+                Timber.d("WnLibrary mirror → libsteamclient.so: " +
+                    "names=${nameIds.size} buildIds=$buildIdsPushed " +
+                    "sourcePackages=$sourcePackagesPushed")
+            }
+        }
+    }
+}
+
+internal suspend fun SteamService.Companion.bringUpWnSession(svc: SteamService): WnSteamSession? {
+    val caPath = CaBundleExtractor.ensureBundle(svc)
+    if (caPath.isEmpty()) {
+        Timber.e("Cannot start WnSteam session: CA bundle unavailable")
+        return null
+    }
+    val cmUrl = withContext(Dispatchers.IO) {
+        WnSteamSession.pickCmUrl(caPath)
+    }
+    if (cmUrl.isEmpty()) {
+        Timber.e("Cannot start WnSteam session: no CM URL")
+        return null
+    }
+    Timber.i("WnSteam: connecting to %s", cmUrl)
+
+    val session = WnSteamSession()
+    var ok = false
+    try {
+        session.setCaBundlePath(caPath)
+        val connected = suspendCancellableCoroutine<Boolean> { cont ->
+            session.setStateObserver(object : WnSteamStateObserver {
+                override fun onStateChanged(state: Int) {
+                    if (!cont.isActive) return
+                    if (state == 2) cont.resume(true)
+                    else if (state == 0) cont.resume(false)
+                }
+                override fun onClientMessage(emsg: Int, eresult: Int, body: ByteArray) {}
+            })
+            if (!session.connect(cmUrl)) cont.resume(false)
+            cont.invokeOnCancellation { session.disconnect() }
+        }
+        if (!connected) {
+            Timber.e("WnSteam channel did not reach Connected state")
+            return null
+        }
+        ok = true
+        return session
+    } finally {
+        if (!ok) {
+            try { session.disconnect() } catch (_: Throwable) {}
+            try { session.close() } catch (_: Throwable) {}
+        }
+    }
+}
+
+internal fun SteamService.Companion.dispatchOverlayRequest(serialized: String) {
+    val parts = serialized.split('\u0001')
+    if (parts.size < 4) {
+        Timber.w("dispatchOverlayRequest: malformed payload (parts=${parts.size})")
+        return
+    }
+    val kind  = parts[0]
+    val arg1  = parts[1]
+    val sid   = parts[2].toLongOrNull() ?: 0L
+    val appId = parts[3].toIntOrNull() ?: 0
+    val url = when (kind) {
+        "webpage" -> if (arg1.startsWith("http://") || arg1.startsWith("https://")) arg1
+                     else "https://${arg1}"
+        "store"   -> "https://store.steampowered.com/app/${appId}/"
+        "user"    -> "https://steamcommunity.com/profiles/${sid}"
+        "invite"  -> {
+            Timber.i("overlay: invite dialog requested (lobby=0x${sid.toString(16)})")
+            return
+        }
+        "dialog"  -> when (arg1) {
+            "Achievements" -> "https://steamcommunity.com/stats/${appId}/achievements/"
+            "Players"      -> "https://steamcommunity.com/profiles/${
+                com.winlator.cmod.feature.stores.steam.utils.PrefManager.steamUserSteamId64
+            }"
+            else           -> "https://steamcommunity.com/profiles/${
+                com.winlator.cmod.feature.stores.steam.utils.PrefManager.steamUserSteamId64
+            }"
+        }
+        else -> {
+            Timber.w("dispatchOverlayRequest: unknown kind '$kind'")
+            return
+        }
+    }
+    val svc = instance ?: return
+    runCatching {
+        val intent = android.content.Intent(
+            android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)
+        ).apply {
+            addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        svc.applicationContext.startActivity(intent)
+        Timber.i("overlay: dispatched $kind → $url")
+    }.onFailure { e ->
+        Timber.w(e, "overlay: startActivity failed for $url")
+    }
+}
+
+internal fun SteamService.Companion.clearUserData() {
+    PrefManager.clearAuthTokens()
+
+    clearDatabase()
+}
+
+internal fun SteamService.Companion.clearCloudSyncCaches() {
+    instance?.let { svc ->
+        svc.scope.launch {
+            svc.db.withTransaction {
+                svc.changeNumbersDao.deleteAll()
+                svc.fileChangeListsDao.deleteAll()
+            }
+            Timber.i("Cleared cloud sync caches (change numbers + file lists)")
+        }
+    }
+}
+
+internal suspend fun SteamService.Companion.fetchLatestSteamAppInfo(appId: Int): SteamApp? {
+    // getPicsAppInfo returns {"changeNumber":N,"appinfo":{...}}; the native side parses appinfo VDF and WnKeyValue decodes it.
+    val wnApp =
+        withWnSession { session ->
+            withContext(Dispatchers.IO) {
+                // Fetch the app token first; token-gated apps omit depots without it.
+                val token =
+                    runCatching {
+                        session.getPicsAccessTokens(listOf(appId), emptyList())?.let { tj ->
+                            JSONObject(tj)
+                                .optJSONObject("appTokens")
+                                ?.optString(appId.toString())
+                                ?.toLongOrNull()
+                        }
+                    }.getOrNull() ?: 0L
+                session.getPicsAppInfo(appId, token)?.let { json ->
+                    try {
+                        val obj = JSONObject(json)
+                        val appinfo = obj.optJSONObject("appinfo") ?: return@let null
+                        val app = WnKeyValue.fromJsonObject(appinfo).generateSteamApp()
+                        if (app.id == INVALID_APP_ID) {
+                            null
+                        } else {
+                            app.copy(
+                                receivedPICS = true,
+                                lastChangeNumber = obj.optInt("changeNumber", 0),
+                            )
+                        }
+                    } catch (e: Exception) {
+                        Timber.w(e, "wn-steam-client appinfo parse failed for appId=$appId")
+                        null
+                    }
+                }
+            }
+        }
+    if (wnApp != null) {
+        Timber.i("app info via wn-steam-client: appId=$appId name='${wnApp.name}'")
+        return wnApp
+    }
+    Timber.w("wn-steam-client app info unavailable for appId=$appId")
+    return null
+}
+
+internal suspend fun SteamService.Companion.persistLatestSteamAppInfo(
+    appId: Int,
+    remoteSteamApp: SteamApp,
+) {
+    val service = instance ?: return
+    val appFromDb = service.appDao.findApp(appId)
+    val packageId = appFromDb?.packageId ?: remoteSteamApp.packageId
+    val packageFromDb = if (packageId != INVALID_PKG_ID) service.licenseDao.findLicense(packageId) else null
+    val existingInstallDir = appFromDb?.installDir.orEmpty()
+    val preserveInstallDir =
+        existingInstallDir.isNotEmpty() &&
+            (existingInstallDir.startsWith("/") || existingInstallDir.contains(File.separator))
+
+    service.appDao.insert(
+        remoteSteamApp.copy(
+            packageId = packageId,
+            ownerAccountId = packageFromDb?.ownerAccountId ?: appFromDb?.ownerAccountId.orEmpty(),
+            licenseFlags =
+                packageFromDb?.licenseFlags
+                    ?: appFromDb?.licenseFlags
+                    ?: EnumSet.noneOf(ELicenseFlags::class.java),
+            installDir = if (preserveInstallDir) existingInstallDir else remoteSteamApp.installDir,
+        ),
+    )
+}
+
+/** Force-refreshes [appId]'s PICS depot data once per session; no-op on the main thread. */
+internal fun SteamService.Companion.ensureFreshDepotData(appId: Int) {
+    if (appId <= 0 || instance == null) return
+    if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) return
+    if (!picsRefreshedAppsThisSession.add(appId)) return
+    val refreshed =
+        runCatching {
+            runBlocking(Dispatchers.IO) {
+                val fresh = fetchLatestSteamAppInfo(appId) ?: return@runBlocking false
+                persistLatestSteamAppInfo(appId, fresh)
+                true
+            }
+        }.getOrDefault(false)
+    if (refreshed) {
+        Timber.i("Refreshed PICS depot data for appId=$appId before depot selection")
+    } else {
+        picsRefreshedAppsThisSession.remove(appId)
+    }
+}
+
+internal fun SteamService.Companion.readInstalledDepotManifestIds(appDirPath: String): Map<Int, Long> =
+    runCatching {
+        val configFile = File(File(appDirPath, ".DepotDownloader"), "depot.config")
+        if (!configFile.exists() || !configFile.canRead()) return@runCatching emptyMap()
+        val json = JSONObject(configFile.readText())
+        val manifests = json.optJSONObject("installedManifestIDs") ?: return@runCatching emptyMap()
+        val result = mutableMapOf<Int, Long>()
+        for (key in manifests.keys()) {
+            val depotId = key.toIntOrNull() ?: continue
+            // Missing → INVALID_MANIFEST_ID (Long.MAX_VALUE).
+            result[depotId] = manifests.optLong(key, Long.MAX_VALUE)
+        }
+        result
+    }.getOrElse {
+        Timber.w(it, "Failed to read Steam depot.config for $appDirPath")
+        emptyMap()
+    }
+
+
+internal fun SteamService.Companion.cleanupCancelledUpdate(appDirPath: String) {
+    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+    MarkerUtils.removeMarker(appDirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+    clearPersistedProgressSnapshot(appDirPath)
+
+    val stagingDir = File(File(appDirPath, ".DepotDownloader"), "staging")
+    if (!stagingDir.exists()) return
+
+    stagingDir
+        .walkBottomUp()
+        .forEach { staged ->
+            if (staged == stagingDir) return@forEach
+            if (staged.isDirectory) {
+                if (staged.list().isNullOrEmpty()) staged.delete()
+                return@forEach
+            }
+
+            val relative = staged.relativeTo(stagingDir)
+            val finalFile = File(appDirPath, relative.path)
+            runCatching {
+                finalFile.parentFile?.mkdirs()
+                if (finalFile.exists()) {
+                    finalFile.delete()
+                }
+                if (!staged.renameTo(finalFile)) {
+                    staged.copyTo(finalFile, overwrite = true)
+                    staged.delete()
+                }
+            }.onFailure {
+                Timber.w(it, "Failed to restore staged Steam update file ${staged.absolutePath}")
+            }
+        }
+
+    if (stagingDir.exists() && stagingDir.list().isNullOrEmpty()) {
+        stagingDir.delete()
+    }
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamServiceMetadata.kt b/app/src/main/feature/stores/steam/service/SteamServiceMetadata.kt
new file mode 100644
index 000000000..91beca3c8
--- /dev/null
+++ b/app/src/main/feature/stores/steam/service/SteamServiceMetadata.kt
@@ -0,0 +1,325 @@
+package com.winlator.cmod.feature.stores.steam.service
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.room.withTransaction
+import com.winlator.cmod.BuildConfig
+import com.winlator.cmod.R
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.app.db.PluviaDatabase
+import com.winlator.cmod.app.db.download.DownloadRecord
+import com.winlator.cmod.app.service.DownloadService
+import com.winlator.cmod.app.service.NetworkMonitor
+import com.winlator.cmod.app.service.download.DownloadCoordinator
+import com.winlator.cmod.feature.shortcuts.LibraryShortcutUtils
+import com.winlator.cmod.feature.stores.steam.data.AppInfo
+import com.winlator.cmod.feature.stores.steam.data.CachedLicense
+import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.DownloadFailedException
+import com.winlator.cmod.feature.stores.steam.data.DownloadInfo
+import com.winlator.cmod.feature.stores.steam.data.WnDownloadTransientException
+import com.winlator.cmod.feature.stores.steam.data.DownloadingAppInfo
+import com.winlator.cmod.feature.stores.steam.data.EncryptedAppTicket
+import com.winlator.cmod.feature.stores.steam.data.GameProcessInfo
+import com.winlator.cmod.feature.stores.steam.data.LaunchInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
+import com.winlator.cmod.feature.stores.steam.data.OwnedGames
+import com.winlator.cmod.feature.stores.steam.data.PostSyncInfo
+import com.winlator.cmod.feature.stores.steam.data.SteamApp
+import com.winlator.cmod.feature.stores.steam.data.SteamControllerConfigDetail
+import com.winlator.cmod.feature.stores.steam.data.SteamFriend
+import com.winlator.cmod.feature.stores.steam.data.SteamFriendEntry
+import com.winlator.cmod.feature.stores.steam.data.SteamLicense
+import com.winlator.cmod.feature.stores.steam.data.UserFileInfo
+import com.winlator.cmod.feature.stores.steam.db.dao.AppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.CachedLicenseDao
+import com.winlator.cmod.feature.stores.steam.db.dao.ChangeNumbersDao
+import com.winlator.cmod.feature.stores.steam.db.dao.DownloadingAppInfoDao
+import com.winlator.cmod.feature.stores.steam.db.dao.EncryptedAppTicketDao
+import com.winlator.cmod.feature.stores.steam.db.dao.FileChangeListsDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamAppDao
+import com.winlator.cmod.feature.stores.steam.db.dao.SteamLicenseDao
+import com.winlator.cmod.feature.stores.steam.enums.ControllerSupport
+import com.winlator.cmod.feature.stores.steam.enums.DownloadPhase
+import com.winlator.cmod.feature.stores.steam.enums.GameSource
+import com.winlator.cmod.feature.stores.steam.enums.Language
+import com.winlator.cmod.feature.stores.steam.enums.LoginResult
+import com.winlator.cmod.feature.stores.steam.enums.Marker
+import com.winlator.cmod.feature.stores.steam.enums.OS
+import com.winlator.cmod.feature.stores.steam.enums.OSArch
+import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
+import com.winlator.cmod.feature.stores.steam.enums.SyncResult
+import com.auth0.android.jwt.JWT
+import com.winlator.cmod.feature.stores.common.StoreAuthStatus
+import com.winlator.cmod.feature.stores.common.StoreArtworkCache
+import com.winlator.cmod.feature.stores.common.StoreInstallPathSafety
+import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
+import com.winlator.cmod.feature.stores.steam.events.SteamEvent
+import com.winlator.cmod.feature.stores.steam.inventorygen.InventoryItemsGenerator
+import com.winlator.cmod.feature.stores.steam.wnsteam.CaBundleExtractor
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnDownloadListener
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthResult
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnLibraryStore
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnQrCallback
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamSession
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamStateObserver
+import com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlin.coroutines.resume
+import com.winlator.cmod.feature.stores.steam.statsgen.StatType
+import com.winlator.cmod.feature.stores.steam.statsgen.StatsAchievementsGenerator
+import com.winlator.cmod.feature.stores.steam.statsgen.VdfParser
+import com.winlator.cmod.feature.stores.steam.utils.ContainerUtils
+import com.winlator.cmod.feature.stores.steam.utils.LicenseSerializer
+import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils
+import com.winlator.cmod.feature.stores.steam.utils.Net
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.stores.steam.utils.SteamUtils
+import com.winlator.cmod.feature.stores.steam.utils.WnKeyValue
+import com.winlator.cmod.feature.stores.steam.utils.generateSteamApp
+import com.winlator.cmod.feature.steamcloudsync.SteamAutoCloud
+import com.winlator.cmod.feature.sync.google.CloudSyncManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.GPUInformation
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.shared.android.AppTerminationHelper
+import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.android.NotificationHelper
+import com.winlator.cmod.shared.io.StorageUtils
+import dagger.hilt.android.AndroidEntryPoint
+import com.winlator.cmod.feature.stores.steam.enums.EDepotFileFlag
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseType
+import com.winlator.cmod.feature.stores.steam.enums.EPaymentMethod
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.enums.EResult
+import com.winlator.cmod.feature.stores.steam.data.AsyncJobFailedException
+import com.winlator.cmod.feature.stores.steam.data.GamePlayedInfo
+import com.winlator.cmod.feature.stores.steam.data.PICSRequest
+import com.winlator.cmod.feature.stores.steam.data.SteamID
+import com.winlator.cmod.feature.stores.steam.utils.KeyValue
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlin.coroutines.coroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import okhttp3.FormBody
+import okhttp3.Request
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.lang.NullPointerException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Collections
+import java.util.Date
+import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.io.path.pathString
+import kotlin.time.Duration.Companion.seconds
+
+// Session/logon diagnostics + installed-metadata recovery, split out of SteamService.kt (behavior-identical).
+
+internal fun SteamService.Companion.recordLogonSuccess() {
+    if (logonGateUntilMs != 0L || consecutiveLogonFailures != 0) {
+        Timber.i("logon gate cleared (was open until ${logonGateUntilMs}, " +
+            "$consecutiveLogonFailures prior failure(s))")
+    }
+    logonGateUntilMs = 0L
+    lastLogonFailureEresult = 0
+    consecutiveLogonFailures = 0
+}
+
+internal fun SteamService.Companion.recordLogonFailure(eresult: Int) {
+    if (eresult == 1) return
+    if (eresult == 67 || eresult == 88) return
+    consecutiveLogonFailures += 1
+    lastLogonFailureEresult = eresult
+    val backoffMs = when (consecutiveLogonFailures) {
+        1    -> 30_000L
+        2    -> 120_000L
+        3    -> 300_000L
+        4    -> 900_000L
+        5    -> 1_800_000L
+        else -> 3_600_000L
+    }
+    logonGateUntilMs = System.currentTimeMillis() + backoffMs
+    Timber.w("logon gate engaged: EResult=$eresult, " +
+        "consecutive=$consecutiveLogonFailures, backoff=${backoffMs / 1000}s")
+}
+
+/** Tears down any prior wnSession at the top of every login entry so a retry doesn't leak the native handle (transport thread + heartbeat + TLS socket). */
+internal fun SteamService.Companion.teardownPriorWnSession() {
+    val prior = wnSession
+    wnSession = null
+    wnLoggedOnHandled = false
+    wnLibraryMirrorJob?.cancel()
+    wnLibraryMirrorJob = null
+    wnLibrary?.stopObserving()
+    wnLibrary = null
+    if (prior != null) {
+        Timber.i("Tearing down prior wnSession before relogin")
+        try { prior.disconnect() } catch (_: Throwable) {}
+        try { prior.close()      } catch (_: Throwable) {}
+    }
+}
+
+internal fun SteamService.Companion.getInstalledSelectableDlcAppIds(appId: Int): Set<Int> =
+    getSelectableDlcAppsOf(appId)
+        .mapNotNull { dlcApp ->
+            val dlcInfo = getInstalledApp(dlcApp.id)
+            if (dlcInfo?.isDownloaded == true) dlcApp.id else null
+        }.toSet()
+
+
+internal fun SteamService.Companion.getTrustedInstalledAppInfo(appId: Int): AppInfo? {
+    val appInfo = getInstalledApp(appId) ?: tryRecoverInstalledAppInfo(appId)
+    if (appInfo?.isDownloaded != true) return null
+
+    val dirPath = getAppDirPath(appId)
+    val dir = File(dirPath)
+    if (!dir.isDirectory) return null
+    if (!MarkerUtils.hasMarker(dirPath, Marker.DOWNLOAD_COMPLETE_MARKER)) return null
+
+    // Backfill the durable install path once (metadata present now) so recognition survives eviction.
+    if (appInfo.installPath.isNullOrEmpty()) {
+        runCatching {
+            runBlocking(Dispatchers.IO) {
+                PluviaDatabase.getInstance().appInfoDao().update(appInfo.copy(installPath = dirPath))
+            }
+        }
+        return appInfo.copy(installPath = dirPath)
+    }
+    return appInfo
+}
+
+internal fun SteamService.Companion.tryRecoverInstalledAppInfo(appId: Int): AppInfo? {
+    val dirPath = getAppDirPath(appId)
+    if (dirPath.isBlank()) return null
+    val hasCompleteMarker = MarkerUtils.hasMarker(dirPath, Marker.DOWNLOAD_COMPLETE_MARKER)
+    val hasInProgressMarker = MarkerUtils.hasMarker(dirPath, Marker.DOWNLOAD_IN_PROGRESS_MARKER)
+    if (!hasCompleteMarker || hasInProgressMarker) return null
+
+    val dir = File(dirPath)
+    if (!dir.exists() || !dir.isDirectory) return null
+
+    val downloadedDepotIds = runCatching { getMainAppDepots(appId).keys.sorted() }.getOrDefault(emptyList())
+    val installedDlcAppIds = getInstalledSelectableDlcAppIds(appId)
+    val recovered =
+        AppInfo(
+            id = appId,
+            isDownloaded = true,
+            downloadedDepots = downloadedDepotIds,
+            dlcDepots = installedDlcAppIds.sorted(),
+            installPath = dirPath,
+        )
+
+    runBlocking(Dispatchers.IO) {
+        PluviaDatabase.getInstance().appInfoDao().insert(recovered)
+    }
+    Timber.i("Recovered Steam installed metadata from disk for appId=$appId at $dirPath")
+    return recovered
+}
+
+/** The chosen download folder is not a steamapps root, so it never appears in [allInstallPaths] and marker scans miss games installed there. */
+internal fun SteamService.Companion.configuredDownloadRoot(): String? =
+    runCatching {
+        val context = PluviaApp.instance.applicationContext ?: return@runCatching null
+        val storeDefaultUri =
+            if (PrefManager.useSingleDownloadFolder) PrefManager.defaultDownloadFolder else PrefManager.steamDownloadFolder
+        if (storeDefaultUri.isEmpty()) return@runCatching null
+        com.winlator.cmod.shared.io.FileUtils
+            .getFilePathFromUri(context, android.net.Uri.parse(storeDefaultUri))
+    }.getOrNull()
+
+internal fun SteamService.Companion.countCompletedInstallMarkers(maxCount: Int = Int.MAX_VALUE): Int {
+    var count = 0
+    for (basePath in (allInstallPaths + listOfNotNull(configuredDownloadRoot())).distinct()) {
+        val baseDir = File(basePath)
+        val appDirs = baseDir.listFiles() ?: continue
+        for (appDir in appDirs) {
+            if (!appDir.isDirectory) continue
+            val hasCompleteMarker = File(appDir, Marker.DOWNLOAD_COMPLETE_MARKER.fileName).exists()
+            if (!hasCompleteMarker) continue
+
+            val hasInProgressMarker = File(appDir, Marker.DOWNLOAD_IN_PROGRESS_MARKER.fileName).exists()
+            if (hasInProgressMarker) continue
+
+            count++
+            if (count >= maxCount) return count
+        }
+    }
+    return count
+}
+
+internal fun SteamService.Companion.shouldRepairInstalledMetadata(): Boolean {
+    val db =
+        runCatching { PluviaDatabase.getInstance() }.getOrElse {
+            Timber.e(it, "Failed to access database for startup metadata repair gate")
+            return false
+        }
+
+    val knownAppCount =
+        runBlocking(Dispatchers.IO) {
+            runCatching { db.steamAppDao().getAllAppIds().size }.getOrElse {
+                Timber.e(it, "Failed to load Steam app ids for startup metadata repair gate")
+                return@runBlocking 0
+            }
+        }
+    if (knownAppCount == 0) return false
+
+    val installedDbCount =
+        runBlocking(Dispatchers.IO) {
+            runCatching { db.appInfoDao().getAllInstalledAppIds().size }.getOrElse {
+                Timber.e(it, "Failed to load installed Steam app ids for startup metadata repair gate")
+                return@runBlocking 0
+            }
+        }
+
+    val diskInstallCount = countCompletedInstallMarkers(maxCount = installedDbCount + 1)
+    return diskInstallCount > installedDbCount
+}
diff --git a/app/src/main/feature/stores/steam/service/SteamUnifiedFriends.kt b/app/src/main/feature/stores/steam/service/SteamUnifiedFriends.kt
index 333765a4b..287da2c1b 100644
--- a/app/src/main/feature/stores/steam/service/SteamUnifiedFriends.kt
+++ b/app/src/main/feature/stores/steam/service/SteamUnifiedFriends.kt
@@ -1,75 +1,54 @@
 package com.winlator.cmod.feature.stores.steam.service
+
 import com.winlator.cmod.feature.stores.steam.data.OwnedGames
-import `in`.dragonbra.javasteam.enums.EResult
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesPlayerSteamclient
-import `in`.dragonbra.javasteam.rpc.service.Player
-import `in`.dragonbra.javasteam.steam.handlers.steamunifiedmessages.SteamUnifiedMessages
-import kotlinx.coroutines.future.await
+import org.json.JSONArray
 import timber.log.Timber
 
+/**
+ * Owned-games lookup. this used to wrap JavaSteam's `Player`
+ * unified-messaging service; it now goes through the in-house C++
+ * WN-Steam-Client ([SteamService.withWnSession] → Player.GetOwnedGames#1).
+ *
+ * The [service] parameter is kept for call-site compatibility but is no
+ * longer needed — the C++ session is reached via the SteamService companion.
+ */
 class SteamUnifiedFriends(
-    service: SteamService,
+    @Suppress("UNUSED_PARAMETER") service: SteamService,
 ) : AutoCloseable {
-    private var unifiedMessages: SteamUnifiedMessages? = null
-
-    private var player: Player? = null
 
-    init {
-        unifiedMessages = service.steamClient!!.getHandler<SteamUnifiedMessages>()
-
-        player = unifiedMessages!!.createService(Player::class.java)
-    }
-
-    override fun close() {
-        unifiedMessages = null
-        player = null
-    }
+    override fun close() {}
 
     /**
-     * Gets a list of games that the user owns. If the library is private, it will be empty.
+     * Gets a list of games that the user owns. If the library is private, or
+     * the request fails, the list is empty (mirrors the old JavaSteam path).
+     *
+     * @param steamID the user's full 64-bit SteamID.
      */
     suspend fun getOwnedGames(steamID: Long): List<OwnedGames> {
-        val request =
-            SteammessagesPlayerSteamclient.CPlayer_GetOwnedGames_Request
-                .newBuilder()
-                .apply {
-                    steamid = steamID
-                    includePlayedFreeGames = true
-                    includeFreeSub = true
-                    includeAppinfo = true
-                    includeExtendedAppinfo = true
-                }.build()
-
-        val result =
-            try {
-                player?.getOwnedGames(request)?.await()
-            } catch (e: Exception) {
-                Timber.e(e, "Error getting owned games")
-                null
-            }
-
-        if (result == null || result.result != EResult.OK) {
+        val json = SteamService.withWnSession { session ->
+            session.getOwnedGames(steamID)
+        }
+        if (json == null) {
             Timber.w("Unable to get owned games!")
             return emptyList()
         }
-
-        val list =
-            result.body.gamesList.map { game ->
+        return try {
+            val arr = JSONArray(json)
+            (0 until arr.length()).map { i ->
+                val o = arr.getJSONObject(i)
                 OwnedGames(
-                    appId = game.appid,
-                    name = game.name,
-                    playtimeTwoWeeks = game.playtime2Weeks,
-                    playtimeForever = game.playtimeForever,
-                    imgIconUrl = game.imgIconUrl,
-                    sortAs = game.sortAs,
-                    rtimeLastPlayed = game.rtimeLastPlayed,
+                    appId = o.optInt("appId"),
+                    name = o.optString("name"),
+                    playtimeTwoWeeks = o.optInt("playtimeTwoWeeks"),
+                    playtimeForever = o.optInt("playtimeForever"),
+                    imgIconUrl = o.optString("imgIconUrl"),
+                    sortAs = o.optString("sortAs"),
+                    rtimeLastPlayed = o.optInt("rtimeLastPlayed"),
                 )
             }
-
-        if (list.size != result.body.gamesCount) {
-            Timber.w("List was not the same as given")
+        } catch (e: Exception) {
+            Timber.e(e, "Error parsing owned games")
+            emptyList()
         }
-
-        return list
     }
 }
diff --git a/app/src/main/feature/stores/steam/ui/SteamClientDownloadFailureDialog.kt b/app/src/main/feature/stores/steam/ui/SteamClientDownloadFailureDialog.kt
deleted file mode 100644
index 22f3fc326..000000000
--- a/app/src/main/feature/stores/steam/ui/SteamClientDownloadFailureDialog.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.winlator.cmod.feature.stores.steam.ui
-import android.app.Activity
-import android.app.Dialog
-import android.view.ViewGroup
-import android.view.Window
-import android.view.WindowManager
-import androidx.activity.ComponentActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-import com.winlator.cmod.shared.theme.WinNativeTheme
-
-object SteamClientDownloadFailureDialog {
-    @JvmStatic
-    fun show(
-        activity: Activity,
-        title: String,
-        message: String,
-        onRetry: Runnable,
-        onClose: Runnable,
-    ) {
-        val dialog =
-            Dialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
-                requestWindowFeature(Window.FEATURE_NO_TITLE)
-                setCancelable(false)
-                window?.apply {
-                    setLayout(
-                        WindowManager.LayoutParams.MATCH_PARENT,
-                        WindowManager.LayoutParams.WRAP_CONTENT,
-                    )
-                    setBackgroundDrawableResource(android.R.color.transparent)
-                }
-            }
-
-        val composeView =
-            ComposeView(activity).apply {
-                layoutParams =
-                    ViewGroup.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                    )
-                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
-                (activity as? ComponentActivity)?.let {
-                    setViewTreeLifecycleOwner(it)
-                    setViewTreeSavedStateRegistryOwner(it)
-                }
-                setContent {
-                    WinNativeTheme(
-                        colorScheme =
-                            darkColorScheme(
-                                primary = Color(0xFF57CBDE),
-                                surface = Color(0xFF1A2028),
-                                background = Color(0xFF141B24),
-                                onSurface = Color(0xFFF0F4FF),
-                                onBackground = Color(0xFFF0F4FF),
-                            ),
-                    ) {
-                        SteamClientDownloadFailureDialogContent(
-                            title = title,
-                            message = message,
-                            onRetry = {
-                                dialog.dismiss()
-                                onRetry.run()
-                            },
-                            onClose = {
-                                dialog.dismiss()
-                                onClose.run()
-                            },
-                        )
-                    }
-                }
-            }
-
-        dialog.setContentView(composeView)
-        dialog.show()
-    }
-}
-
-@Composable
-private fun SteamClientDownloadFailureDialogContent(
-    title: String,
-    message: String,
-    onRetry: () -> Unit,
-    onClose: () -> Unit,
-) {
-    Surface(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-        shape = RoundedCornerShape(20.dp),
-        color = Color(0xFF1A2028),
-        tonalElevation = 0.dp,
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .background(Color(0xFF1A2028))
-                    .padding(20.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-        ) {
-            Text(
-                text = title,
-                style = MaterialTheme.typography.titleLarge,
-                color = MaterialTheme.colorScheme.onSurface,
-                fontWeight = FontWeight.SemiBold,
-            )
-            Text(
-                text = message,
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.78f),
-            )
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                OutlinedButton(
-                    onClick = onClose,
-                    modifier = Modifier.weight(1f),
-                ) {
-                    Text("Close")
-                }
-                Button(
-                    onClick = onRetry,
-                    modifier = Modifier.weight(1f),
-                ) {
-                    Text("Retry")
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/feature/stores/steam/ui/SteamLoginViewModel.kt b/app/src/main/feature/stores/steam/ui/SteamLoginViewModel.kt
index e07278b9b..5c886b77b 100644
--- a/app/src/main/feature/stores/steam/ui/SteamLoginViewModel.kt
+++ b/app/src/main/feature/stores/steam/ui/SteamLoginViewModel.kt
@@ -8,7 +8,7 @@ import com.winlator.cmod.feature.stores.steam.enums.LoginScreen
 import com.winlator.cmod.feature.stores.steam.events.SteamEvent
 import com.winlator.cmod.feature.stores.steam.service.SteamService
 import com.winlator.cmod.feature.stores.steam.ui.data.UserLoginState
-import `in`.dragonbra.javasteam.steam.authentication.IAuthenticator
+import com.winlator.cmod.feature.stores.steam.wnsteam.WnAuthenticator
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -31,7 +31,7 @@ class SteamLoginViewModel : ViewModel() {
     private var credentialLoginJob: Job? = null
 
     private val authenticator =
-        object : IAuthenticator {
+        object : WnAuthenticator {
             override fun acceptDeviceConfirmation(): CompletableFuture<Boolean> {
                 Timber.tag("SteamLoginViewModel").i("Two-Factor, device confirmation")
 
diff --git a/app/src/main/feature/stores/steam/utils/ContainerUtils.kt b/app/src/main/feature/stores/steam/utils/ContainerUtils.kt
index 55273412f..8ea2b591b 100644
--- a/app/src/main/feature/stores/steam/utils/ContainerUtils.kt
+++ b/app/src/main/feature/stores/steam/utils/ContainerUtils.kt
@@ -13,7 +13,6 @@ object ContainerUtils {
      * Extracts the game ID from a container ID string
      */
     fun extractGameIdFromContainerId(containerId: String): Int {
-        // Remove duplicate suffix like (1), (2) if present
         val idWithoutSuffix =
             if (containerId.contains("(")) {
                 containerId.substringBefore("(")
diff --git a/app/src/main/feature/stores/steam/utils/FileUtils.kt b/app/src/main/feature/stores/steam/utils/FileUtils.kt
index 5cfe81f28..a53220888 100644
--- a/app/src/main/feature/stores/steam/utils/FileUtils.kt
+++ b/app/src/main/feature/stores/steam/utils/FileUtils.kt
@@ -148,25 +148,15 @@ object FileUtils {
         maxDepth: Int = -1,
         includeDirectories: Boolean = false,
     ): Stream<Path> {
-        val patternParts = pattern.split("*").filter { it.isNotEmpty() }
         if (!Files.exists(rootPath)) return emptyList<Path>().stream()
 
         val results = mutableListOf<Path>()
-
-        fun matches(fileName: String): Boolean {
-            var startIndex = 0
-            for (part in patternParts) {
-                val index = fileName.indexOf(part, startIndex)
-                if (index < 0) return false
-                startIndex = index + part.length
-            }
-            return true
-        }
+        val matcher = compilePatternMatcher(pattern)
 
         walkThroughPath(rootPath, maxDepth) { path ->
             if (path.isDirectory()) {
-                if (includeDirectories && matches(path.name)) results.add(path)
-            } else if (matches(path.name)) {
+                if (includeDirectories && matcher(path.name)) results.add(path)
+            } else if (matcher(path.name)) {
                 results.add(path)
             }
         }
@@ -174,6 +164,54 @@ object FileUtils {
         return results.stream()
     }
 
+    /**
+     * Short-circuiting variant of [findFilesRecursive] for "does anything match?"
+     * checks. Stops walking as soon as the first match is seen — wrapping the
+     * full-collect helper with `findAny()` would still scan the entire tree
+     * because [findFilesRecursive] returns an already-materialized list.
+     */
+    fun anyFileMatches(
+        rootPath: Path,
+        pattern: String,
+        maxDepth: Int = -1,
+        includeDirectories: Boolean = false,
+    ): Boolean {
+        if (!Files.exists(rootPath)) return false
+        val matcher = compilePatternMatcher(pattern)
+        return try {
+            walkThroughPath(rootPath, maxDepth) { path ->
+                val matched =
+                    if (path.isDirectory()) includeDirectories && matcher(path.name)
+                    else matcher(path.name)
+                if (matched) throw FoundMatch
+            }
+            false
+        } catch (_: FoundMatch) {
+            true
+        }
+    }
+
+    private object FoundMatch : RuntimeException() {
+        override fun fillInStackTrace(): Throwable = this
+    }
+
+    private fun compilePatternMatcher(pattern: String): (String) -> Boolean {
+        val parts = pattern.split("*").filter { it.isNotEmpty() }
+        return { fileName ->
+            var startIndex = 0
+            var ok = true
+            for (part in parts) {
+                val index = fileName.indexOf(part, startIndex)
+                if (index < 0) {
+                    ok = false
+                    break
+                }
+                startIndex = index + part.length
+            }
+            ok
+        }
+    }
+
     fun assetExists(
         assetManager: AssetManager,
         assetPath: String,
diff --git a/app/src/main/feature/stores/steam/utils/KeyValueUtils.kt b/app/src/main/feature/stores/steam/utils/KeyValueUtils.kt
index a29a45947..bdb6d3d23 100644
--- a/app/src/main/feature/stores/steam/utils/KeyValueUtils.kt
+++ b/app/src/main/feature/stores/steam/utils/KeyValueUtils.kt
@@ -20,15 +20,66 @@ import com.winlator.cmod.feature.stores.steam.enums.OSArch
 import com.winlator.cmod.feature.stores.steam.enums.PathType
 import com.winlator.cmod.feature.stores.steam.enums.ReleaseState
 import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.INVALID_APP_ID
-import `in`.dragonbra.javasteam.types.KeyValue
 import timber.log.Timber
 import java.util.Date
 
 /**
- * Extension functions relating to [KeyValue] as the receiver type.
+ * Extension functions relating to [WnKeyValue] as the receiver type.
  */
 
-fun KeyValue.generateSteamApp(): SteamApp =
+private data class WindowsRootRedirect(
+    val source: PathType,
+    val target: PathType,
+    val prependPath: String,
+    val replacements: List<Pair<String, String>>,
+)
+
+private fun WnKeyValue.parseWindowsRootRedirects(): List<WindowsRootRedirect> =
+    this["ufs"]["rootoverrides"].children.mapNotNull { entry ->
+        val os = entry["os"].value.orEmpty()
+        val osList = entry["oslist"].value.orEmpty()
+        val appliesToWindows =
+            os.equals("Windows", ignoreCase = true) ||
+                osList
+                    .split(",")
+                    .any { it.trim().equals("windows", ignoreCase = true) }
+        if (!appliesToWindows) return@mapNotNull null
+
+        WindowsRootRedirect(
+            source = PathType.from(entry["root"].value),
+            target = PathType.from(entry["useinstead"].value),
+            prependPath = entry["addpath"].value.orEmpty(),
+            replacements =
+                entry["pathtransforms"].children.map { transform ->
+                    transform["find"].value.orEmpty() to transform["replace"].value.orEmpty()
+                },
+        )
+    }
+
+private fun normalizeSteamUfsPath(value: String): String = if (value == "." || value == "/") "" else value
+
+private fun remapWindowsUfsPath(
+    originalPath: String,
+    redirect: WindowsRootRedirect?,
+): String {
+    if (redirect == null) return originalPath
+
+    var localPath =
+        if (redirect.prependPath.isNotEmpty()) {
+            val prefix = redirect.prependPath.replace('\\', '/').trimEnd('/')
+            if (originalPath.isNotEmpty()) "$prefix/${originalPath.trimStart('/')}" else prefix
+        } else {
+            originalPath
+        }
+
+    redirect.replacements.forEach { (find, replace) ->
+        localPath = localPath.replace(find, replace)
+    }
+
+    return localPath
+}
+
+fun WnKeyValue.generateSteamApp(): SteamApp =
     SteamApp(
         id = this["appid"].asInteger(INVALID_APP_ID),
         depots =
@@ -41,7 +92,7 @@ fun KeyValue.generateSteamApp(): SteamApp =
 
                     val manifests = currentDepot["manifests"].children.generateManifest()
 
-                    val encryptedManifests = currentDepot["encryptedManifests"].children.generateManifest()
+                    val encryptedManifests = currentDepot["encryptedmanifests"].children.generateManifest()
 
                     depotId to
                         DepotInfo(
@@ -58,6 +109,7 @@ fun KeyValue.generateSteamApp(): SteamApp =
                             encryptedManifests = encryptedManifests,
                             language = currentDepot["config"]["language"].value.orEmpty(),
                             realm = currentDepot["config"]["realm"].value.orEmpty(),
+                            lowViolence = currentDepot["config"]["lowviolence"].asBoolean(),
                             optionalDlcId = currentDepot["config"]["optionaldlc"].asInteger(INVALID_APP_ID),
                         )
                 },
@@ -113,8 +165,7 @@ fun KeyValue.generateSteamApp(): SteamApp =
         homepageUrl = this["extended"]["homepage"].value.orEmpty(),
         gameManualUrl = this["common"]["extended"]["gamemanualurl"].value.orEmpty(),
         loadAllBeforeLaunch = this["common"]["extended"]["loadallbeforelaunch"].asBoolean(),
-        // dlcAppIds = (this["common"]["extended"]["listofdlc"].value).Split(",").Select(uint.Parse).ToArray(),
-        dlcAppIds = emptyList(),
+        dlcAppIds = this["common"]["extended"]["listofdlc"].value.parseDlcAppIds(),
         isFreeApp = this["common"]["extended"]["isfreeapp"].asBoolean(),
         dlcForAppId = this["extended"]["dlcforappid"].asInteger(this["common"]["extended"]["dlcforappid"].asInteger()),
         mustOwnAppToPurchase = this["common"]["extended"]["mustownapptopurchase"].asInteger(),
@@ -157,23 +208,35 @@ fun KeyValue.generateSteamApp(): SteamApp =
                 steamInputManifestPath = this["config"]["steaminputmanifestpath"].value.orEmpty(),
                 steamControllerConfigDetails = parseSteamControllerConfigDetails(),
             ),
-        ufs =
+        ufs = run {
+            val windowsRootRedirects = parseWindowsRootRedirects()
+
             UFS(
                 quota = this["ufs"]["quota"].asInteger(),
                 maxNumFiles = this["ufs"]["maxnumfiles"].asInteger(),
                 saveFilePatterns =
-                    this["ufs"]["savefiles"].children.map {
+                    this["ufs"]["savefiles"].children.mapNotNull {
+                        val platforms = it["platforms"].children.map { platform -> platform.value?.lowercase() }
+                        if (platforms.isNotEmpty() && "windows" !in platforms) return@mapNotNull null
+
+                        val originalRoot = PathType.from(it["root"].value)
+                        val originalPath = normalizeSteamUfsPath(it["path"].value.orEmpty())
+                        val redirect = windowsRootRedirects.find { override -> override.source == originalRoot }
+
                         SaveFilePattern(
-                            root = PathType.from(it["root"].value),
-                            path = it["path"].value.orEmpty(),
+                            root = redirect?.target ?: originalRoot,
+                            path = remapWindowsUfsPath(originalPath, redirect),
                             pattern = it["pattern"].value.orEmpty(),
                             recursive = it["recursive"].asInteger(0),
+                            uploadRoot = originalRoot,
+                            uploadPath = originalPath,
                         )
                     },
-            ),
+            )
+        },
     )
 
-private fun KeyValue.parseSteamControllerConfigDetails(): List<SteamControllerConfigDetail> {
+private fun WnKeyValue.parseSteamControllerConfigDetails(): List<SteamControllerConfigDetail> {
     val details = this["config"]["steamcontrollerconfigdetails"]
     if (details.children.isEmpty()) return emptyList()
 
@@ -196,7 +259,7 @@ private fun KeyValue.parseSteamControllerConfigDetails(): List<SteamControllerCo
     }
 }
 
-fun List<KeyValue>.generateManifest(): Map<String, ManifestInfo> =
+fun List<WnKeyValue>.generateManifest(): Map<String, ManifestInfo> =
     associate { manifest ->
         manifest.name!! to
             ManifestInfo(
@@ -207,7 +270,7 @@ fun List<KeyValue>.generateManifest(): Map<String, ManifestInfo> =
             )
     }
 
-fun List<KeyValue>.toLangImgMap(): Map<Language, String> =
+fun List<WnKeyValue>.toLangImgMap(): Map<Language, String> =
     mapNotNull { kv ->
         Language
             .from(kv.name!!)
@@ -215,8 +278,16 @@ fun List<KeyValue>.toLangImgMap(): Map<Language, String> =
             ?.to(kv.value!!)
     }.toMap()
 
+private fun String?.parseDlcAppIds(): List<Int> =
+    this
+        .orEmpty()
+        .split(',', ';')
+        .mapNotNull { it.trim().toIntOrNull() }
+        .filter { it != INVALID_APP_ID }
+        .distinct()
+
 @Suppress("unused")
-fun KeyValue.printAllKeyValues(depth: Int = 0) {
+fun WnKeyValue.printAllKeyValues(depth: Int = 0) {
     val parent = this
     var tabString = ""
 
diff --git a/app/src/main/feature/stores/steam/utils/LicenseSerializer.kt b/app/src/main/feature/stores/steam/utils/LicenseSerializer.kt
index 61e2af4cd..e2efbc887 100644
--- a/app/src/main/feature/stores/steam/utils/LicenseSerializer.kt
+++ b/app/src/main/feature/stores/steam/utils/LicenseSerializer.kt
@@ -1,149 +1,61 @@
 package com.winlator.cmod.feature.stores.steam.utils
-import android.util.Base64
-import `in`.dragonbra.javasteam.enums.ELicenseFlags
-import `in`.dragonbra.javasteam.enums.ELicenseType
-import `in`.dragonbra.javasteam.enums.EPaymentMethod
-import `in`.dragonbra.javasteam.protobufs.steamclient.SteammessagesClientserver
-import `in`.dragonbra.javasteam.steam.handlers.steamapps.License
-import `in`.dragonbra.javasteam.types.DepotManifest
+import com.winlator.cmod.feature.stores.steam.enums.ELicenseFlags
 import org.json.JSONArray
 import org.json.JSONObject
 import timber.log.Timber
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
-import java.util.Date
-import java.util.EnumSet
 
+/**
+ * Serializes a Steam license to the JSON stored in the `cached_license`
+ * Room table.
+ *
+ * the license now comes from the C++ WN-Steam-Client as plain field
+ * values (see `processLicenseList`), so the only entry point is
+ * [serializeLicenseFields]. The old JavaSteam `License`-object /
+ * `DepotManifest` round-trips were dead code and were removed with the
+ * JavaSteam dependency.
+ */
 object LicenseSerializer {
     /**
-     * Serialize a single License object by extracting all its fields to a JSON string.
+     * Serialize a license from plain field values.
+     *
+     * @param flags raw ELicenseFlags bitfield (decomposed to the per-flag
+     *              code array the JSON format expects).
      */
-    fun serializeLicense(license: License): String =
+    fun serializeLicenseFields(
+        packageID: Int,
+        lastChangeNumber: Int,
+        timeCreatedMs: Long,
+        timeNextProcessMs: Long,
+        minuteLimit: Int,
+        minutesUsed: Int,
+        paymentMethod: Int,
+        flags: Int,
+        purchaseCode: String,
+        licenseType: Int,
+        territoryCode: Int,
+        accessToken: Long,
+        ownerAccountID: Int,
+        masterPackageID: Int,
+    ): String =
         try {
-            val jsonObj =
-                JSONObject().apply {
-                    put("packageID", license.packageID)
-                    put("lastChangeNumber", license.lastChangeNumber)
-                    put("timeCreated", license.timeCreated.time)
-                    put("timeNextProcess", license.timeNextProcess.time)
-                    put("minuteLimit", license.minuteLimit)
-                    put("minutesUsed", license.minutesUsed)
-                    put("paymentMethod", license.paymentMethod.code())
-                    put("licenseFlags", JSONArray(license.licenseFlags.map { it.code() }))
-                    put("purchaseCode", license.purchaseCode)
-                    put("licenseType", license.licenseType.code())
-                    put("territoryCode", license.territoryCode)
-                    put("accessToken", license.accessToken)
-                    put("ownerAccountID", license.ownerAccountID)
-                    put("masterPackageID", license.masterPackageID)
-                }
-            jsonObj.toString()
+            JSONObject().apply {
+                put("packageID", packageID)
+                put("lastChangeNumber", lastChangeNumber)
+                put("timeCreated", timeCreatedMs)
+                put("timeNextProcess", timeNextProcessMs)
+                put("minuteLimit", minuteLimit)
+                put("minutesUsed", minutesUsed)
+                put("paymentMethod", paymentMethod)
+                put("licenseFlags", JSONArray(ELicenseFlags.from(flags).map { it.code() }))
+                put("purchaseCode", purchaseCode)
+                put("licenseType", licenseType)
+                put("territoryCode", territoryCode)
+                put("accessToken", accessToken)
+                put("ownerAccountID", ownerAccountID)
+                put("masterPackageID", masterPackageID)
+            }.toString()
         } catch (e: Exception) {
-            Timber.e(e, "Failed to serialize license: ${e.message}")
+            Timber.e(e, "Failed to serialize license fields: ${e.message}")
             ""
         }
-
-    /**
-     * Deserialize JSON string to a single License object.
-     */
-    fun deserializeLicense(jsonStr: String): License? {
-        return try {
-            if (jsonStr.isEmpty()) return null
-
-            val jsonObj = JSONObject(jsonStr)
-
-            // Extract all fields
-            val packageID = jsonObj.optInt("packageID", 0)
-            val lastChangeNumber = jsonObj.optInt("lastChangeNumber", 0)
-            val timeCreated = Date(jsonObj.optLong("timeCreated", 0L))
-            val timeNextProcess = Date(jsonObj.optLong("timeNextProcess", 0L))
-            val minuteLimit = jsonObj.optInt("minuteLimit", 0)
-            val minutesUsed = jsonObj.optInt("minutesUsed", 0)
-            val paymentMethod = EPaymentMethod.from(jsonObj.optInt("paymentMethod", 0))
-            val licenseFlagsArray = jsonObj.optJSONArray("licenseFlags")
-            val licenseFlags =
-                if (licenseFlagsArray != null) {
-                    val flags = EnumSet.noneOf(ELicenseFlags::class.java)
-                    for (i in 0 until licenseFlagsArray.length()) {
-                        val flagCode = licenseFlagsArray.optInt(i)
-                        flags.add(ELicenseFlags.from(flagCode).first())
-                    }
-                    flags
-                } else {
-                    EnumSet.noneOf(ELicenseFlags::class.java)
-                }
-            val purchaseCode = jsonObj.optString("purchaseCode", "")
-            val licenseType = ELicenseType.from(jsonObj.optInt("licenseType", 0))
-            val territoryCode = jsonObj.optInt("territoryCode", 0)
-            val accessToken = jsonObj.optLong("accessToken", 0L)
-            val ownerAccountID = jsonObj.optInt("ownerAccountID", 0)
-            val masterPackageID = jsonObj.optInt("masterPackageID", 0)
-
-            // Construct License using CMsgClientLicenseList.License.newBuilder()
-            try {
-                val licenseBuilder =
-                    SteammessagesClientserver.CMsgClientLicenseList.License
-                        .newBuilder()
-                        .setPackageId(packageID)
-                        .setTimeCreated((timeCreated.time / 1000).toInt()) // Convert to Unix timestamp
-                        .setTimeNextProcess((timeNextProcess.time / 1000).toInt())
-                        .setMinuteLimit(minuteLimit)
-                        .setMinutesUsed(minutesUsed)
-                        .setPaymentMethod(paymentMethod.code())
-                        .setFlags(ELicenseFlags.code(licenseFlags))
-                        .setPurchaseCountryCode(purchaseCode)
-                        .setLicenseType(licenseType.code())
-                        .setTerritoryCode(territoryCode)
-                        .setAccessToken(accessToken)
-                        .setOwnerId(ownerAccountID)
-                        .setMasterPackageId(masterPackageID)
-                        .setChangeNumber(lastChangeNumber)
-
-                val licenseProto = licenseBuilder.build()
-                return License(licenseProto)
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to construct License using builder: ${e.message}")
-                null
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to deserialize license: ${e.message}")
-            null
-        }
-    }
-
-    /**
-     * Serialize a DepotManifest object using Java serialization.
-     */
-    fun serializeManifest(manifest: DepotManifest): String =
-        try {
-            val baos = ByteArrayOutputStream()
-            ObjectOutputStream(baos).use { oos ->
-                oos.writeObject(manifest)
-            }
-            Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT)
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to serialize manifest")
-            ""
-        }
-
-    /**
-     * Deserialize Base64 string to DepotManifest object using Java deserialization.
-     */
-    fun deserializeManifest(encodedStr: String): DepotManifest? {
-        return try {
-            if (encodedStr.isEmpty()) return null
-
-            val bytes = Base64.decode(encodedStr, Base64.DEFAULT)
-            ByteArrayInputStream(bytes).use { bais ->
-                ObjectInputStream(bais).use { ois ->
-                    ois.readObject() as? DepotManifest
-                }
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to deserialize manifest")
-            null
-        }
-    }
 }
diff --git a/app/src/main/feature/stores/steam/utils/PrefManager.kt b/app/src/main/feature/stores/steam/utils/PrefManager.kt
index 5d79dbda4..e03f53821 100644
--- a/app/src/main/feature/stores/steam/utils/PrefManager.kt
+++ b/app/src/main/feature/stores/steam/utils/PrefManager.kt
@@ -169,6 +169,18 @@ object PrefManager {
             setInt("steam_user_account_id", value)
         }
 
+    var wnHybridMode: Boolean
+        get() = getBoolean("wn_hybrid_mode", true)
+        set(value) {
+            setBoolean("wn_hybrid_mode", value)
+        }
+
+    var wnPlanW: Boolean
+        get() = getBoolean("wn_plan_w", true)
+        set(value) {
+            setBoolean("wn_plan_w", value)
+        }
+
     var cellId: Int
         get() = getInt("cell_id", 0)
         set(value) {
@@ -199,6 +211,12 @@ object PrefManager {
             setString("steam_user_avatar_hash", value)
         }
 
+    var friendsSnapshotJson: String
+        get() = getString("friends_snapshot_json", "")
+        set(value) {
+            setString("friends_snapshot_json", value)
+        }
+
     var personaState: Int
         get() = getInt("persona_state", 0)
         set(value) {
@@ -258,6 +276,18 @@ object PrefManager {
             setString("library_content_filters", value)
         }
 
+    var libraryImmersiveMode: Boolean
+        get() = getBoolean("library_immersive_mode", false)
+        set(value) {
+            setBoolean("library_immersive_mode", value)
+        }
+
+    var libraryImmersiveBlur: Boolean
+        get() = getBoolean("library_immersive_blur", false)
+        set(value) {
+            setBoolean("library_immersive_blur", value)
+        }
+
     var enableSteamLogs: Boolean
         get() = getBoolean("enable_steam_logs", false)
         set(value) {
@@ -294,6 +324,42 @@ object PrefManager {
             setString("gog_download_folder", value)
         }
 
+    var chatServiceEnabled: Boolean
+        get() = getBoolean("chat_service_enabled", true)
+        set(value) {
+            setBoolean("chat_service_enabled", value)
+        }
+
+    var chatNotificationsEnabled: Boolean
+        get() = getBoolean("chat_notifications_enabled", true)
+        set(value) {
+            setBoolean("chat_notifications_enabled", value)
+        }
+
+    var chatHeadsEnabled: Boolean
+        get() = getBoolean("chat_heads_enabled", false)
+        set(value) {
+            setBoolean("chat_heads_enabled", value)
+        }
+
+    var chatInGameEnabled: Boolean
+        get() = getBoolean("chat_in_game_enabled", false)
+        set(value) {
+            setBoolean("chat_in_game_enabled", value)
+        }
+
+    var chatHeadsAutoHide: Boolean
+        get() = getBoolean("chat_heads_auto_hide", false)
+        set(value) {
+            setBoolean("chat_heads_auto_hide", value)
+        }
+
+    var chatStayRunningOnExit: Boolean
+        get() = getBoolean("chat_stay_running_on_exit", false)
+        set(value) {
+            setBoolean("chat_stay_running_on_exit", value)
+        }
+
     fun clearAuthTokens() {
         requirePrefs().edit().apply {
             remove("user_name")
@@ -312,11 +378,4 @@ object PrefManager {
         libraryLayoutModeCache = null
         requirePrefs().edit().clear().commit()
     }
-
-    // Legacy support for Winlator properties if needed
-    var graphicsDriver: String
-        get() = getString("graphics_driver", "virgl")
-        set(value) {
-            setString("graphics_driver", value)
-        }
 }
diff --git a/app/src/main/feature/stores/steam/utils/SteamLaunchOptions.kt b/app/src/main/feature/stores/steam/utils/SteamLaunchOptions.kt
new file mode 100644
index 000000000..d1668b534
--- /dev/null
+++ b/app/src/main/feature/stores/steam/utils/SteamLaunchOptions.kt
@@ -0,0 +1,51 @@
+package com.winlator.cmod.feature.stores.steam.utils
+
+/** Parses Steam-style launch options: KEY=VALUE before %command% become env vars; args after become game args. */
+object SteamLaunchOptions {
+    private val ENV_KEY = Regex("[A-Za-z_][A-Za-z0-9_]*")
+    private const val COMMAND = "%command%"
+
+    data class Parsed(val env: LinkedHashMap<String, String>, val gameArgs: String)
+
+    @JvmStatic
+    fun parse(execArgs: String?): Parsed {
+        val env = LinkedHashMap<String, String>()
+        val raw = execArgs?.trim().orEmpty()
+        if (raw.isEmpty()) return Parsed(env, "")
+        val idx = raw.indexOf(COMMAND)
+        if (idx < 0) return Parsed(env, raw)
+        val before = raw.substring(0, idx).trim()
+        val after = raw.substring(idx + COMMAND.length).trim()
+        for (token in tokenize(before)) {
+            val eq = token.indexOf('=')
+            if (eq <= 0) continue
+            val key = token.substring(0, eq)
+            if (ENV_KEY.matches(key)) env[key] = token.substring(eq + 1)
+        }
+        return Parsed(env, after)
+    }
+
+    @JvmStatic
+    fun gameArgs(execArgs: String?): String = parse(execArgs).gameArgs
+
+    @JvmStatic
+    fun parseEnvVars(execArgs: String?): Map<String, String> = parse(execArgs).env
+
+    private fun tokenize(s: String): List<String> {
+        val out = ArrayList<String>()
+        val sb = StringBuilder()
+        var quote: Char? = null
+        for (c in s) {
+            when {
+                quote != null -> if (c == quote) quote = null else sb.append(c)
+                c == '"' || c == '\'' -> quote = c
+                c.isWhitespace() -> if (sb.isNotEmpty()) {
+                    out.add(sb.toString()); sb.setLength(0)
+                }
+                else -> sb.append(c)
+            }
+        }
+        if (sb.isNotEmpty()) out.add(sb.toString())
+        return out
+    }
+}
diff --git a/app/src/main/feature/stores/steam/utils/SteamTokenLogin.kt b/app/src/main/feature/stores/steam/utils/SteamTokenLogin.kt
deleted file mode 100644
index a6cde2c22..000000000
--- a/app/src/main/feature/stores/steam/utils/SteamTokenLogin.kt
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.winlator.cmod.feature.stores.steam.utils
-import android.annotation.SuppressLint
-import com.auth0.android.jwt.JWT
-import com.winlator.cmod.runtime.display.environment.ImageFs
-import com.winlator.cmod.runtime.display.environment.components.GuestProgramLauncherComponent
-import com.winlator.cmod.shared.io.FileUtils
-import com.winlator.cmod.shared.io.TarCompressorUtils
-import `in`.dragonbra.javasteam.types.KeyValue
-import timber.log.Timber
-import java.io.File
-import java.nio.file.Files
-import java.util.zip.CRC32
-import kotlin.io.path.createDirectories
-import kotlin.io.path.exists
-
-const val NULL_CHAR = '\u0000'
-const val TOKEN_EXPIRE_TIME = 86400L
-
-class SteamTokenLogin(
-    private val steamId: String,
-    private val login: String,
-    private val token: String,
-    private val imageFs: ImageFs,
-    private val guestProgramLauncherComponent: GuestProgramLauncherComponent? = null,
-) {
-    private fun clearCachedClientState() {
-        try {
-            val localSteamDir = File(imageFs.wineprefix, "drive_c/users/${ImageFs.USER}/AppData/Local/Steam")
-            val steamDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
-
-            listOf(
-                File(localSteamDir, "htmlcache"),
-                File(steamDir, "appcache/httpcache"),
-                File(steamDir, "appcache/librarycache"),
-            ).forEach { cacheDir ->
-                if (cacheDir.exists()) {
-                    cacheDir.deleteRecursively()
-                }
-            }
-        } catch (e: Exception) {
-            Timber.tag("SteamTokenLogin").w(e, "Failed to clear cached Steam client state")
-        }
-    }
-
-    fun setupSteamFiles(forceFreshClientToken: Boolean = false) {
-        SteamUtils.autoLoginUserChanges(imageFs)
-        phase1SteamConfig(forceFreshClientToken)
-    }
-
-    private fun hdr(): String {
-        val crc = CRC32()
-        crc.update(login.toByteArray())
-        return "${crc.value.toString(16)}1"
-    }
-
-    private fun execCommand(command: String): String =
-        guestProgramLauncherComponent?.execShellCommand(command, false)
-            ?: throw IllegalStateException("GuestProgramLauncherComponent is required for command execution")
-
-    private fun killWineServer() {
-        try {
-            execCommand("wineserver -k")
-        } catch (e: Exception) {
-            Timber.tag("SteamTokenLogin").e("Failed to kill wineserver: ${e.message}")
-        }
-    }
-
-    private fun encryptToken(token: String): String = execCommand("wine ${imageFs.rootDir}/opt/apps/steam-token.exe encrypt $login $token")
-
-    private fun decryptToken(vdfValue: String): String =
-        execCommand("wine ${imageFs.rootDir}/opt/apps/steam-token.exe decrypt $login $vdfValue")
-
-    private fun obfuscateToken(
-        value: String,
-        mtbf: Long,
-    ): String = SteamTokenHelper.obfuscate(value.toByteArray(), mtbf)
-
-    private fun deobfuscateToken(
-        value: String,
-        mtbf: Long,
-    ): String = SteamTokenHelper.deobfuscate(value, mtbf)
-
-    @SuppressLint("BinaryOperationInTimber")
-    private fun createConfigVdf(): String {
-        val hdr = hdr()
-        val minMTBF = 1000000000L
-        val maxMTBF = 2000000000L
-        var mtbf = kotlin.random.Random.nextLong(minMTBF, maxMTBF)
-        var encoded = ""
-
-        do {
-            try {
-                encoded = obfuscateToken("$token$NULL_CHAR", mtbf)
-            } catch (_: Exception) {
-                mtbf = kotlin.random.Random.nextLong(minMTBF, maxMTBF)
-            }
-        } while (encoded == "")
-
-        Timber.tag("SteamTokenLogin").d("MTBF: $mtbf")
-        Timber.tag("SteamTokenLogin").d("Encoded: $encoded")
-
-        return """
-            "InstallConfigStore"
-            {
-                "Software"
-                {
-                    "Valve"
-                    {
-                        "Steam"
-                        {
-                            "MTBF"		"$mtbf"
-                            "ConnectCache"
-                            {
-                                "$hdr"		"$encoded$NULL_CHAR"
-                            }
-                            "Accounts"
-                            {
-                                "$login"
-                                {
-                                    "SteamID"		"$steamId"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            """.trimIndent()
-    }
-
-    @SuppressLint("BinaryOperationInTimber")
-    private fun createLocalVdf(): String {
-        val hdr = hdr()
-        val encoded = encryptToken(token)
-
-        return """
-            "MachineUserConfigStore"
-            {
-                "Software"
-                {
-                    "Valve"
-                    {
-                        "Steam"
-                        {
-                            "ConnectCache"
-                            {
-                                "$hdr"		"$encoded"
-                            }
-                        }
-                    }
-                }
-            }
-            """.trimIndent()
-    }
-
-    fun phase1SteamConfig(forceFreshClientToken: Boolean = false) {
-        Timber.tag("SteamTokenLogin").d(
-            "phase1SteamConfig: start login=$login hasToken=${token.isNotEmpty()} tokenLen=${token.length} force=$forceFreshClientToken"
-        )
-        val steamConfigDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/config").toPath()
-        Files.createDirectories(steamConfigDir)
-        val localSteamDir = File(imageFs.wineprefix, "drive_c/users/${ImageFs.USER}/AppData/Local/Steam").toPath()
-        Files.createDirectories(localSteamDir)
-
-        val configVdfPath = steamConfigDir.resolve("config.vdf")
-        var shouldWriteConfig = forceFreshClientToken || !Files.exists(configVdfPath)
-        var shouldProcessPhase2 = false
-
-        if (!shouldWriteConfig && Files.exists(configVdfPath)) {
-            val vdfContent = FileUtils.readString(configVdfPath.toFile()) ?: ""
-            if (vdfContent.contains("ConnectCache")) {
-                val vdfData = KeyValue.loadFromString(vdfContent)
-                val mtbf =
-                    vdfData
-                        ?.get("Software")
-                        ?.get("Valve")
-                        ?.get("Steam")
-                        ?.get("MTBF")
-                        ?.value
-                val connectCacheValue =
-                    vdfData
-                        ?.get("Software")
-                        ?.get("Valve")
-                        ?.get("Steam")
-                        ?.get("ConnectCache")
-                        ?.get(hdr())
-                        ?.value
-
-                if (mtbf != null && connectCacheValue != null) {
-                    try {
-                        val decodedToken =
-                            deobfuscateToken(connectCacheValue.trimEnd(NULL_CHAR), mtbf.toLong()).trimEnd(NULL_CHAR)
-                        if (decodedToken != token) {
-                            Timber.tag("SteamTokenLogin").d("Saved JWT differs from current refresh token, overriding config.vdf")
-                            shouldWriteConfig = true
-                        } else if (JWT(decodedToken).isExpired(TOKEN_EXPIRE_TIME)) {
-                            Timber.tag("SteamTokenLogin").d("Saved JWT expired, overriding config.vdf")
-                            shouldWriteConfig = true
-                        } else {
-                            Timber.tag("SteamTokenLogin").d("Saved JWT is not expired, do not override config.vdf")
-                            shouldWriteConfig = false
-                        }
-                    } catch (_: Exception) {
-                        Timber.tag("SteamTokenLogin").d("Cannot parse saved JWT, overriding config.vdf")
-                        shouldWriteConfig = true
-                    }
-                } else {
-                    if (mtbf == null && connectCacheValue == null) {
-                        Timber.tag("SteamTokenLogin").d("MTBF and ConnectCache not found, overriding config.vdf")
-                        shouldWriteConfig = true
-                    } else if (mtbf != null) {
-                        Timber.tag("SteamTokenLogin").d("MTBF exists but ConnectCache not found, processing phase 2")
-                        shouldWriteConfig = false
-                        shouldProcessPhase2 = true
-                    }
-                }
-            } else if (vdfContent.contains("MTBF")) {
-                Timber.tag("SteamTokenLogin").d("MTBF exists but ConnectCache not found, processing phase 2")
-                shouldWriteConfig = false
-                shouldProcessPhase2 = true
-            }
-        }
-
-        if (shouldWriteConfig && token.isNotEmpty()) {
-            Timber.tag("SteamTokenLogin").d("phase1SteamConfig: writing config.vdf with ConnectCache entry")
-            Files.write(configVdfPath, createConfigVdf().toByteArray())
-            clearCachedClientState()
-
-            FileUtils.chmod(File(steamConfigDir.toFile(), "loginusers.vdf"), 505)
-            FileUtils.chmod(File(steamConfigDir.toFile(), "config.vdf"), 505)
-
-            if (localSteamDir.resolve("local.vdf").exists()) {
-                Files.delete(localSteamDir.resolve("local.vdf"))
-            }
-
-            if (guestProgramLauncherComponent == null) {
-                Timber.tag("SteamTokenLogin").d("phase1SteamConfig: config.vdf written; launcher not ready → skipping phase 2")
-            } else {
-                phase2LocalConfig(forceFreshClientToken)
-            }
-        } else if (shouldWriteConfig) {
-            Timber.tag("SteamTokenLogin").w(
-                "phase1SteamConfig: token is empty — config.vdf NOT written. Steam will require online login."
-            )
-        } else if (shouldProcessPhase2 || forceFreshClientToken || !localSteamDir.resolve("local.vdf").exists()) {
-            if (guestProgramLauncherComponent == null) {
-                Timber.tag("SteamTokenLogin").d("phase1SteamConfig: skipping phase 2 until launcher is ready")
-            } else {
-                phase2LocalConfig(forceFreshClientToken)
-            }
-        } else {
-            Timber.tag("SteamTokenLogin").d("phase1SteamConfig: existing config.vdf is valid, no changes needed")
-        }
-    }
-
-    fun phase2LocalConfig(forceFreshClientToken: Boolean = false) {
-        Timber.tag("SteamTokenLogin").d("phase2LocalConfig: start force=$forceFreshClientToken")
-        try {
-            val tokenArchive = File(imageFs.rootDir.parentFile, "steam-token.tzst")
-            if (!tokenArchive.exists()) {
-                Timber.tag("SteamTokenLogin").w(
-                    "phase2LocalConfig: steam-token.tzst is missing at ${tokenArchive.absolutePath}, cannot process local.vdf"
-                )
-                return
-            }
-
-            val extractDir = File(imageFs.rootDir, "opt/apps")
-            Files.createDirectories(extractDir.toPath())
-            TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, tokenArchive, extractDir)
-
-            val localSteamDir = File(imageFs.wineprefix, "drive_c/users/${ImageFs.USER}/AppData/Local/Steam").toPath()
-            Files.createDirectories(localSteamDir)
-
-            if (!forceFreshClientToken && localSteamDir.resolve("local.vdf").exists()) {
-                val vdfContent = FileUtils.readString(localSteamDir.resolve("local.vdf").toFile()) ?: ""
-                val vdfData = KeyValue.loadFromString(vdfContent)
-                val connectCacheValue =
-                    vdfData
-                        ?.get("Software")
-                        ?.get("Valve")
-                        ?.get("Steam")
-                        ?.get("ConnectCache")
-                        ?.get(hdr())
-                        ?.value
-                if (connectCacheValue != null) {
-                    try {
-                        val decodedToken = decryptToken(connectCacheValue.trimEnd(NULL_CHAR))
-                        if (decodedToken == token && !JWT(decodedToken).isExpired(TOKEN_EXPIRE_TIME)) {
-                            Timber.tag("SteamTokenLogin").d("Saved JWT is not expired, do not override local.vdf")
-                            return
-                        }
-                    } catch (e: Exception) {
-                        Timber.tag("SteamTokenLogin").d("An unexpected error occurred: ${e.message}")
-                    }
-                }
-            }
-
-            Timber.tag("SteamTokenLogin").d("Overriding local.vdf")
-            Files.write(localSteamDir.resolve("local.vdf"), createLocalVdf().toByteArray())
-            clearCachedClientState()
-            killWineServer()
-            FileUtils.chmod(File(localSteamDir.toFile(), "local.vdf"), 505)
-        } catch (e: Exception) {
-            Timber.tag("SteamTokenLogin").d("An unexpected error occurred: ${e.message}")
-            e.printStackTrace()
-        }
-    }
-}
diff --git a/app/src/main/feature/stores/steam/utils/SteamUtils.kt b/app/src/main/feature/stores/steam/utils/SteamUtils.kt
index 1449caa8a..40c66427b 100644
--- a/app/src/main/feature/stores/steam/utils/SteamUtils.kt
+++ b/app/src/main/feature/stores/steam/utils/SteamUtils.kt
@@ -3,6 +3,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.provider.Settings
 import com.winlator.cmod.feature.stores.steam.data.DepotInfo
+import com.winlator.cmod.feature.stores.steam.data.ManifestInfo
 import com.winlator.cmod.feature.stores.steam.enums.PathType
 import com.winlator.cmod.feature.stores.steam.enums.SpecialGameSaveMapping
 import com.winlator.cmod.feature.stores.steam.service.SteamService
@@ -14,9 +15,9 @@ import com.winlator.cmod.runtime.container.Container
 import com.winlator.cmod.runtime.display.environment.ImageFs
 import com.winlator.cmod.runtime.wine.WineUtils
 import com.winlator.cmod.runtime.wine.WineRegistryEditor
-import `in`.dragonbra.javasteam.enums.EOSType
-import `in`.dragonbra.javasteam.enums.EPersonaState
-import `in`.dragonbra.javasteam.types.KeyValue
+import com.winlator.cmod.feature.stores.steam.enums.EOSType
+import com.winlator.cmod.feature.stores.steam.enums.EPersonaState
+import com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.getOwnedAppDlc
 import kotlinx.coroutines.runBlocking
 import okhttp3.Call
 import okhttp3.Callback
@@ -52,7 +53,7 @@ object SteamUtils {
     private fun steamClientFiles(): Array<String> =
         coreSteamClientFiles() +
             arrayOf(
-                "steamclient_loader_x32.exe",
+                "steamclient_loader_x86.exe",
                 "steamclient_loader_x64.exe",
             )
 
@@ -100,9 +101,7 @@ object SteamUtils {
         }
     }
 
-    /**
-     * Backup steamclient artifacts before any DRM/Steamless manipulation.
-     */
+    // Back up steamclient artifacts before DRM/Steamless manipulation.
     @JvmStatic
     @JvmOverloads
     fun backupSteamclientFiles(
@@ -118,10 +117,7 @@ object SteamUtils {
             val dll = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/$file")
             val backupFile = File(backupDir, "$file.orig")
             if (dll.exists()) {
-                // Guard against stub-over-real contamination: if the existing backup is
-                // significantly larger than the current file, the current file must be
-                // a Goldberg stub (~200 KB) and overwriting the real-DLL backup (~13 MB)
-                // would permanently lose the pristine copy. Refuse the overwrite.
+                // Refuse to replace a real-DLL backup with a small Goldberg stub.
                 if (backupFile.exists() && backupFile.length() > dll.length() * 2 &&
                     backupFile.length() > 1_000_000) {
                     Timber.w(
@@ -140,14 +136,7 @@ object SteamUtils {
         Timber.i("backupSteamclientFiles complete (appId=$idLog, count=$backupCount)")
     }
 
-    /**
-     * Checks whether the shared Steam client store still contains the real
-     * Valve-signed DLLs, as opposed to Goldberg stubs left behind by an old
-     * ColdClient contamination. Real `steamclient64.dll` is ~13 MB; the Goldberg
-     * stub is ~200 KB. A generous 2 MB floor catches all known stubs.
-     *
-     * Returns true if the core files exist AND look like real Valve DLLs.
-     */
+    // True when the shared Steam store still has real DLLs, not stubs.
     @JvmStatic
     fun isSharedSteamStorePristine(context: Context): Boolean {
         val imageFs = ImageFs.find(context)
@@ -169,9 +158,7 @@ object SteamUtils {
         return true
     }
 
-    /**
-     * Restore steamclient artifacts and clean injected extras if needed.
-     */
+    // Restore steamclient artifacts and clean injected extras if needed.
     @JvmStatic
     @JvmOverloads
     fun restoreSteamclientFiles(
@@ -192,7 +179,10 @@ object SteamUtils {
                 }
             }
 
-            arrayOf("steamclient_loader_x32.exe.orig", "steamclient_loader_x64.exe.orig").forEach { loaderBackup ->
+            arrayOf(
+                "steamclient_loader_x32.exe.orig", "steamclient_loader_x86.exe.orig",
+                "steamclient_loader_x64.exe.orig",
+            ).forEach { loaderBackup ->
                 val staleBackup = File(backupDir, loaderBackup)
                 if (staleBackup.exists()) {
                     staleBackup.delete()
@@ -205,7 +195,10 @@ object SteamUtils {
             extraDllDir.deleteRecursively()
         }
 
-        arrayOf("steamclient_loader_x32.exe", "steamclient_loader_x64.exe").forEach { loaderExe ->
+        arrayOf(
+            "steamclient_loader_x32.exe", "steamclient_loader_x86.exe",
+            "steamclient_loader_x64.exe",
+        ).forEach { loaderExe ->
             val staleLoader = File(origDir, loaderExe)
             if (staleLoader.exists()) {
                 staleLoader.delete()
@@ -441,6 +434,72 @@ object SteamUtils {
             Timber.d(e, "Achievements generation skipped for appId=$appId")
         }
 
+        // Steam Inventory item definitions → items.json (best-effort; requires
+        // Steam login). Gives inventory-driven games (TF2/CS-style) their item
+        // catalog so the in-game inventory isn't empty.
+        runCatching {
+            runBlocking {
+                SteamService.generateInventoryItems(appId, settingsDir.absolutePath)
+            }
+        }.onFailure { e ->
+            Timber.d(e, "Inventory items generation skipped for appId=$appId")
+        }
+
+        // Steam Workshop mods → mods.json + mods/<id>/ + mod_images/<id>/
+        // (best-effort). Links any content staged by the Workshop browser into
+        // this steam_settings dir so gbe_fork's emulated ISteamUGC sees it.
+        runCatching {
+            com.winlator.cmod.feature.stores.steam.workshop.WorkshopModsGenerator
+                .generate(context, appId, settingsDir)
+        }.onFailure { e ->
+            Timber.d(e, "Workshop mods generation skipped for appId=$appId")
+        }
+
+        val cloudPushed = runCatching {
+            runBlocking {
+                SteamService.pushCloudStateToLibSteamClient(appId)
+            }
+        }
+        if (cloudPushed.isFailure) {
+            Timber.w(cloudPushed.exceptionOrNull(),
+                "Cloud state push FAILED for appId=$appId — clearing mirror to " +
+                "prevent stale data leaking from a previously-launched app")
+            runCatching {
+                com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                    .setCloudFiles(emptyArray(), IntArray(0), LongArray(0))
+            }
+        }
+
+        runCatching {
+            runBlocking {
+                SteamService.pushAppDlcsToLibSteamClient(appId)
+            }
+        }.onFailure { e ->
+            Timber.d(e, "DLC list push skipped for appId=$appId")
+        }
+
+        runCatching {
+            SteamService.pushAppInstalledDepotsToLibSteamClient(appId)
+        }.onFailure { e ->
+            Timber.d(e, "Installed depots push skipped for appId=$appId")
+        }
+
+        runCatching {
+            runBlocking {
+                SteamService.refreshEncryptedAppTicketForLibSteamClient(appId)
+            }
+        }.onFailure { e ->
+            Timber.d(e, "Encrypted app ticket push skipped for appId=$appId")
+        }
+
+        runCatching {
+            runBlocking {
+                SteamService.prefetchOwnershipTicketForLibSteamClient(appId)
+            }
+        }.onFailure { e ->
+            Timber.d(e, "Ownership ticket pre-fetch skipped for appId=$appId")
+        }
+
         // Special save-location symlinks
         ensureSaveLocationsForGames(context, appId)
     }
@@ -728,10 +787,82 @@ object SteamUtils {
      * Creates a Steam ACF (Application Cache File) manifest for the given app.
      * This allows real Steam to detect the game as installed.
      */
+    private fun resolveManifestForBranch(
+        depot: DepotInfo,
+        branch: String,
+        visitedApps: MutableSet<Int> = mutableSetOf(),
+    ): ManifestInfo? {
+        depot.manifests[branch]?.let { return it }
+        depot.encryptedManifests[branch]?.let { return it }
+
+        if (!branch.equals("public", ignoreCase = true)) {
+            depot.manifests["public"]?.let { return it }
+            depot.encryptedManifests["public"]?.let { return it }
+        }
+
+        val sourceAppId = depot.depotFromApp
+        if (sourceAppId == SteamService.INVALID_APP_ID || !visitedApps.add(sourceAppId)) {
+            return null
+        }
+
+        val sourceDepot = SteamService.getAppInfoOf(sourceAppId)?.depots?.get(depot.depotId) ?: return null
+        return resolveManifestForBranch(sourceDepot, branch, visitedApps)
+    }
+
+    private fun collectInstalledDepotManifests(
+        steamAppId: Int,
+        appInfo: com.winlator.cmod.feature.stores.steam.data.SteamApp,
+        branch: String,
+        installedDepotIds: Set<Int>,
+        installedDlcAppIds: Set<Int>,
+        language: String,
+    ): LinkedHashMap<Int, ManifestInfo> {
+        val allKnownDepots = linkedMapOf<Int, DepotInfo>()
+        appInfo.depots.forEach { (depotId, depot) -> allKnownDepots[depotId] = depot }
+        SteamService.getDownloadableDepots(steamAppId, language).forEach { (depotId, depot) ->
+            allKnownDepots[depotId] = depot
+        }
+
+        val installedDlcDepotsIds = SteamService.getInstalledDlcDepotsOf(steamAppId)
+        installedDlcDepotsIds?.forEach { appId ->
+            try {
+                runBlocking {
+                    getOwnedAppDlc(appId).forEach { (depotId, depot) ->
+                        allKnownDepots[depotId] = depot
+                    }
+                }
+            } catch (e: Exception) {
+                Timber.w(e, "Failed to resolve owned DLC depots for appId=$appId")
+            }
+        }
+
+
+        val installedDepots = linkedMapOf<Int, ManifestInfo>()
+        allKnownDepots.forEach { (depotId, depotInfo) ->
+            // Exclude shared depots from InstalledDepots — they belong in SharedDepots only
+            if (depotInfo.sharedInstall) return@forEach
+
+            val shouldInclude =
+                depotId in installedDepotIds ||
+                    (
+                        depotInfo.dlcAppId != SteamService.INVALID_APP_ID &&
+                            depotInfo.dlcAppId in installedDlcAppIds
+                    )
+            if (!shouldInclude) return@forEach
+
+            resolveManifestForBranch(depotInfo, branch)?.takeIf { it.gid != 0L }?.let { manifest ->
+                installedDepots[depotId] = manifest
+            }
+        }
+        return installedDepots
+    }
+
     @JvmStatic
+    @JvmOverloads
     fun createAppManifest(
         context: Context,
         steamAppId: Int,
+        language: String = "english",
     ) {
         try {
             Timber.i("Attempting to createAppManifest for appId: $steamAppId")
@@ -750,8 +881,14 @@ object SteamUtils {
             commonDir.mkdirs()
 
             val gameDir = File(SteamService.getAppDirPath(steamAppId))
+            if (!gameDir.isDirectory || !SteamService.isAppInstalled(steamAppId)) {
+                Timber.w("Skipping ACF manifest for appId=$steamAppId because the install is not trusted on disk")
+                return
+            }
             val gameName = gameDir.name
             val sizeOnDisk = calculateDirectorySize(gameDir)
+            val selectedBranch = SteamService.resolveSelectedBetaName(steamAppId).ifBlank { "public" }
+            val ownerSteamId = PrefManager.steamUserSteamId64.takeIf { it > 0L }?.toString() ?: "0"
 
             // Create symlink from Steam common directory to actual game directory
             val steamGameLink = File(commonDir, gameName)
@@ -764,18 +901,49 @@ object SteamUtils {
                 }
             }
 
-            val buildId = appInfo.branches["public"]?.buildId ?: 0L
-            val downloadableDepots = SteamService.getDownloadableDepots(steamAppId)
+            val buildId = appInfo.branches[selectedBranch]?.buildId ?: appInfo.branches["public"]?.buildId ?: 0L
+            val installedDepotIds = SteamService.getInstalledDepotsOf(steamAppId).orEmpty().toSet()
+            val installedDlcAppIds = SteamService.getInstalledDlcDepotsOf(steamAppId).orEmpty().toSet()
+            val installedDepots =
+                collectInstalledDepotManifests(
+                    steamAppId = steamAppId,
+                    appInfo = appInfo,
+                    branch = selectedBranch,
+                    installedDepotIds = installedDepotIds,
+                    installedDlcAppIds = installedDlcAppIds,
+                    language = language,
+                )
 
-            val regularDepots = mutableMapOf<Int, DepotInfo>()
-            val sharedDepots = mutableMapOf<Int, DepotInfo>()
+            // Compute total download and stage sizes from resolved depots
+            val totalBytesToDownload = installedDepots.values.sumOf { it.download }
+            val totalBytesToStage = installedDepots.values.sumOf { it.size }
 
-            downloadableDepots.forEach { (depotId, depotInfo) ->
-                val manifest = depotInfo.manifests["public"]
-                if (manifest != null && manifest.gid != 0L) {
-                    regularDepots[depotId] = depotInfo
-                } else {
-                    sharedDepots[depotId] = depotInfo
+            // Collect dlcAppId mapping for InstalledDepots entries
+            val allKnownDepots = linkedMapOf<Int, com.winlator.cmod.feature.stores.steam.data.DepotInfo>()
+            appInfo.depots.forEach { (depotId, depot) -> allKnownDepots[depotId] = depot }
+            SteamService.getDownloadableDepots(steamAppId, language).forEach { (depotId, depot) ->
+                allKnownDepots[depotId] = depot
+            }
+
+            // Collect shared depots for SharedDepots section
+            val sharedDepots = linkedMapOf<Int, Int>()
+            allKnownDepots.forEach { (depotId, depotInfo) ->
+                if (depotInfo.sharedInstall && depotInfo.depotFromApp != SteamService.INVALID_APP_ID) {
+                    sharedDepots[depotId] = depotInfo.depotFromApp
+                }
+            }
+
+            // Collect install scripts for InstallScripts section
+            val installScripts = linkedMapOf<Int, String>()
+            if (appInfo.installScript.isNotBlank()) {
+                // Map the base game depot(s) to the install script (base app's own depots only,
+                // matching the native launcher env-var path in XServerDisplayActivity).
+                appInfo.depots.forEach { (depotId, depotInfo) ->
+                    if (depotInfo.dlcAppId == SteamService.INVALID_APP_ID &&
+                        depotInfo.depotFromApp == SteamService.INVALID_APP_ID
+                    ) {
+                        installScripts[depotId] = appInfo.installScript
+                    }
                 }
             }
 
@@ -784,39 +952,81 @@ object SteamUtils {
                     appendLine("\"AppState\"")
                     appendLine("{")
                     appendLine("\t\"appid\"\t\t\"$steamAppId\"")
-                    appendLine("\t\"Universe\"\t\t\"1\"")
+                    appendLine("\t\"universe\"\t\t\"1\"")
+                    appendLine("\t\"LauncherPath\"\t\t\"C:\\\\Program Files (x86)\\\\Steam\\\\steam.exe\"")
                     appendLine("\t\"name\"\t\t\"${escapeString(appInfo.name)}\"")
                     appendLine("\t\"StateFlags\"\t\t\"4\"")
-                    appendLine("\t\"LastUpdated\"\t\t\"${System.currentTimeMillis() / 1000}\"")
-                    appendLine("\t\"SizeOnDisk\"\t\t\"$sizeOnDisk\"")
-                    appendLine("\t\"buildid\"\t\t\"$buildId\"")
 
-                    val actualInstallDir = appInfo.config.installDir.ifEmpty { gameName }
+                    val actualInstallDir = gameName
                     appendLine("\t\"installdir\"\t\t\"${escapeString(actualInstallDir)}\"")
 
-                    appendLine("\t\"LastOwner\"\t\t\"0\"")
-                    appendLine("\t\"BytesToDownload\"\t\t\"0\"")
-                    appendLine("\t\"BytesDownloaded\"\t\t\"0\"")
+                    appendLine("\t\"LastUpdated\"\t\t\"${System.currentTimeMillis() / 1000}\"")
+                    appendLine("\t\"LastPlayed\"\t\t\"0\"")
+                    appendLine("\t\"SizeOnDisk\"\t\t\"$sizeOnDisk\"")
+                    appendLine("\t\"StagingSize\"\t\t\"0\"")
+                    appendLine("\t\"buildid\"\t\t\"$buildId\"")
+                    appendLine("\t\"LastOwner\"\t\t\"$ownerSteamId\"")
+                    appendLine("\t\"DownloadType\"\t\t\"1\"")
+                    appendLine("\t\"UpdateResult\"\t\t\"0\"")
+                    appendLine("\t\"BytesToDownload\"\t\t\"$totalBytesToDownload\"")
+                    appendLine("\t\"BytesDownloaded\"\t\t\"$totalBytesToDownload\"")
+                    appendLine("\t\"BytesToStage\"\t\t\"$totalBytesToStage\"")
+                    appendLine("\t\"BytesStaged\"\t\t\"$totalBytesToStage\"")
+                    appendLine("\t\"TargetBuildID\"\t\t\"$buildId\"")
                     appendLine("\t\"AutoUpdateBehavior\"\t\t\"0\"")
                     appendLine("\t\"AllowOtherDownloadsWhileRunning\"\t\t\"0\"")
                     appendLine("\t\"ScheduledAutoUpdate\"\t\t\"0\"")
 
-                    if (regularDepots.isNotEmpty()) {
+                    if (installedDepots.isNotEmpty()) {
                         appendLine("\t\"InstalledDepots\"")
                         appendLine("\t{")
-                        regularDepots.forEach { (depotId, depotInfo) ->
-                            val manifest = depotInfo.manifests["public"]
+                        installedDepots.forEach { (depotId, manifest) ->
                             appendLine("\t\t\"$depotId\"")
                             appendLine("\t\t{")
-                            appendLine("\t\t\t\"manifest\"\t\t\"${manifest?.gid ?: "0"}\"")
-                            appendLine("\t\t\t\"size\"\t\t\"${manifest?.size ?: 0}\"")
+                            appendLine("\t\t\t\"manifest\"\t\t\"${manifest.gid}\"")
+                            appendLine("\t\t\t\"size\"\t\t\"${manifest.size}\"")
+                            val dlcAppId = allKnownDepots[depotId]?.dlcAppId
+                            if (dlcAppId != null && dlcAppId != SteamService.INVALID_APP_ID) {
+                                appendLine("\t\t\t\"dlcappid\"\t\t\"$dlcAppId\"")
+                            } else if (depotId in installedDlcAppIds) {
+                                appendLine("\t\t\t\"dlcappid\"\t\t\"$depotId\"")
+                            }
                             appendLine("\t\t}")
                         }
                         appendLine("\t}")
+                    } else if (installedDepotIds.isNotEmpty()) {
+                        Timber.w(
+                            "ACF manifest for appId=$steamAppId has ${installedDepotIds.size} trusted depot(s) " +
+                                "but none could be resolved for branch '$selectedBranch'",
+                        )
                     }
 
-                    appendLine("\t\"UserConfig\" { \"language\" \"english\" }")
-                    appendLine("\t\"MountedConfig\" { \"language\" \"english\" }")
+                    if (installScripts.isNotEmpty()) {
+                        appendLine("\t\"InstallScripts\"")
+                        appendLine("\t{")
+                        installScripts.forEach { (depotId, script) ->
+                            appendLine("\t\t\"$depotId\"\t\t\"${escapeString(script)}\"")
+                        }
+                        appendLine("\t}")
+                    }
+
+                    if (sharedDepots.isNotEmpty()) {
+                        appendLine("\t\"SharedDepots\"")
+                        appendLine("\t{")
+                        sharedDepots.forEach { (depotId, appTarget) ->
+                            appendLine("\t\t\"$depotId\"\t\t\"$appTarget\"")
+                        }
+                        appendLine("\t}")
+                    }
+
+                    appendLine("\t\"UserConfig\"")
+                    appendLine("\t{")
+                    appendLine("\t\t\"language\"\t\t\"$language\"")
+                    appendLine("\t}")
+                    appendLine("\t\"MountedConfig\"")
+                    appendLine("\t{")
+                    appendLine("\t\t\"language\"\t\t\"$language\"")
+                    appendLine("\t}")
                     appendLine("}")
                 }
 
@@ -824,19 +1034,50 @@ object SteamUtils {
             acfFile.writeText(acfContent)
             Timber.i("Created ACF manifest for ${appInfo.name} at ${acfFile.absolutePath}")
 
-            if (sharedDepots.isNotEmpty()) {
+            val hasSharedInstallDepots = appInfo.depots.values.any { it.sharedInstall }
+            if (hasSharedInstallDepots) {
                 val steamworksAcfContent =
                     buildString {
                         appendLine("\"AppState\"")
                         appendLine("{")
                         appendLine("\t\"appid\"\t\t\"228980\"")
-                        appendLine("\t\"Universe\"\t\t\"1\"")
+                        appendLine("\t\"universe\"\t\t\"1\"")
+                        appendLine("\t\"LauncherPath\"\t\t\"C:\\\\Program Files (x86)\\\\Steam\\\\steam.exe\"")
                         appendLine("\t\"name\"\t\t\"Steamworks Common Redistributables\"")
                         appendLine("\t\"StateFlags\"\t\t\"4\"")
                         appendLine("\t\"installdir\"\t\t\"Steamworks Shared\"")
+                        appendLine("\t\"LastUpdated\"\t\t\"${System.currentTimeMillis() / 1000}\"")
+                        appendLine("\t\"LastPlayed\"\t\t\"0\"")
+                        appendLine("\t\"SizeOnDisk\"\t\t\"0\"")
+                        appendLine("\t\"StagingSize\"\t\t\"0\"")
                         appendLine("\t\"buildid\"\t\t\"1\"")
+                        appendLine("\t\"LastOwner\"\t\t\"0\"")
+                        appendLine("\t\"DownloadType\"\t\t\"1\"")
+                        appendLine("\t\"UpdateResult\"\t\t\"0\"")
                         appendLine("\t\"BytesToDownload\"\t\t\"0\"")
                         appendLine("\t\"BytesDownloaded\"\t\t\"0\"")
+                        appendLine("\t\"BytesToStage\"\t\t\"0\"")
+                        appendLine("\t\"BytesStaged\"\t\t\"0\"")
+                        appendLine("\t\"TargetBuildID\"\t\t\"1\"")
+                        appendLine("\t\"AutoUpdateBehavior\"\t\t\"0\"")
+                        appendLine("\t\"AllowOtherDownloadsWhileRunning\"\t\t\"0\"")
+                        appendLine("\t\"ScheduledAutoUpdate\"\t\t\"0\"")
+                        appendLine("\t\"InstalledDepots\"")
+                        appendLine("\t{")
+                        appendLine("\t\t\"228980\"")
+                        appendLine("\t\t{")
+                        appendLine("\t\t\t\"manifest\"\t\t\"0\"")
+                        appendLine("\t\t\t\"size\"\t\t\"0\"")
+                        appendLine("\t\t}")
+                        appendLine("\t}")
+                        appendLine("\t\"UserConfig\"")
+                        appendLine("\t{")
+                        appendLine("\t\t\"language\"\t\t\"english\"")
+                        appendLine("\t}")
+                        appendLine("\t\"MountedConfig\"")
+                        appendLine("\t{")
+                        appendLine("\t\t\"language\"\t\t\"english\"")
+                        appendLine("\t}")
                         appendLine("}")
                     }
 
@@ -941,7 +1182,7 @@ object SteamUtils {
 
     private fun escapeString(input: String?): String {
         if (input == null) return ""
-        return input.replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r")
+        return input.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r")
     }
 
     private fun calculateDirectorySize(directory: File): Long {
@@ -970,8 +1211,9 @@ object SteamUtils {
      *  - steam_settings/steam_appid.txt
      *  - steam_settings/depots.txt
      *  - steam_settings/configs.user.ini  ([user::general] + conditional [user::saves])
-     *  - steam_settings/configs.app.ini   ([app::dlcs] with real IDs, [app::cloud_save::general/win])
+     *  - steam_settings/configs.app.ini   ([app::general] branch, [app::dlcs], [app::controller], [app::cloud_save])
      *  - steam_settings/configs.main.ini  ([main::connectivity] with offline support)
+     *  - steam_settings/branches.json     (branch list for GetCurrentBetaName/GetAppBuildId)
      *  - steam_settings/controller/       (Steam Input VDF config if useSteamInput=true)
      *  - steam_settings/supported_languages.txt
      *
@@ -979,7 +1221,6 @@ object SteamUtils {
      * @param appId              Steam app ID
      * @param language           container language (e.g. "english")
      * @param isOffline          whether to write offline=1 in configs.main.ini
-     * @param forceDlc           whether to write unlock_all=1 regardless of installed DLC
      * @param useSteamInput      whether to generate Steam Input controller config
      * @param ticketBase64       encrypted app ticket for online auth (may be null)
      */
@@ -990,7 +1231,6 @@ object SteamUtils {
         appId: Int,
         language: String = "english",
         isOffline: Boolean = false,
-        forceDlc: Boolean = false,
         useSteamInput: Boolean = false,
         ticketBase64: String? = null,
     ) {
@@ -1030,6 +1270,7 @@ object SteamUtils {
                     ?: "0"
             val accountId =
                 SteamService.userSteamId?.accountID?.toLong()
+                    ?: PrefManager.steamUserSteamId64.takeIf { it != 0L }?.let { it and 0xFFFFFFFFL }
                     ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
                     ?: 0L
 
@@ -1063,8 +1304,14 @@ object SteamUtils {
 
             val appIniContent =
                 buildString {
+                    // [app::general] — make Steam_Apps::GetCurrentBetaName()
+                    // deterministic; WinNative always installs the public branch.
+                    appendLine("[app::general]")
+                    appendLine("is_beta_branch=0")
+                    appendLine("branch_name=public")
+                    appendLine()
                     appendLine("[app::dlcs]")
-                    appendLine("unlock_all=${if (forceDlc) 1 else 0}")
+                    appendLine("unlock_all=0")
                     dlcIds?.sorted()?.forEach {
                         appendLine("$it=dlc$it")
                         appendedDlcIds.add(it)
@@ -1083,6 +1330,14 @@ object SteamUtils {
                             appendLine("${hiddenDlcApp.id}=dlc${hiddenDlcApp.id}")
                         }
                     }
+                    // [app::controller] — gbe_fork auto-enables SteamInput when
+                    // steam_settings/controller/ contains action sets; state it
+                    // explicitly so the generated config is self-describing.
+                    if (useSteamInput) {
+                        appendLine()
+                        appendLine("[app::controller]")
+                        appendLine("steam_input=1")
+                    }
                     if (appInfo != null) {
                         appendLine()
                         append(generateCloudSaveConfig(appId))
@@ -1104,6 +1359,38 @@ object SteamUtils {
                 }
             File(settingsDir, "configs.main.ini").writeText(mainIniContent)
 
+            // --- branches.json ---
+            // gbe_fork reads this for Steam_Apps::GetCurrentBetaName() and
+            // GetAppBuildId(). Emit the real branch list from PICS appinfo
+            // when known (with build ids), else a minimal public branch.
+            runCatching {
+                val branchesArr = org.json.JSONArray()
+                val branchList = appInfo?.branches?.values?.toList().orEmpty()
+                fun putBranch(name: String, protected: Boolean, buildId: Long, timeUpdated: Long) {
+                    branchesArr.put(
+                        org.json.JSONObject()
+                            .put("name", name)
+                            .put("description", "")
+                            .put("protected", protected)
+                            .put("build_id", buildId)
+                            .put("time_updated", timeUpdated),
+                    )
+                }
+                if (branchList.isEmpty()) {
+                    putBranch("public", false, 0L, 0L)
+                } else {
+                    branchList.forEach { b ->
+                        putBranch(b.name, b.pwdRequired, b.buildId, (b.timeUpdated?.time ?: 0L) / 1000L)
+                    }
+                    // gbe_fork falls back to "public" when branch_name isn't in
+                    // the file, but make it explicit so GetAppBuildId() is sane.
+                    if (branchList.none { it.name.equals("public", ignoreCase = true) }) {
+                        putBranch("public", false, 0L, 0L)
+                    }
+                }
+                File(settingsDir, "branches.json").writeText(branchesArr.toString(2), Charsets.UTF_8)
+            }.onFailure { e -> Timber.w(e, "Failed writing branches.json for appId=$appId") }
+
             // --- controller config ---
             val controllerDir = File(settingsDir, "controller")
             if (useSteamInput) {
@@ -1214,7 +1501,7 @@ object SteamUtils {
      * If any server-side pending remote operations exist for the app (one per partial/killed
      * session piles up on the server), Steam wants to show a cloud-conflict dialog via the
      * CEF webhelper. That dialog can't render on arm64ec Wine, so Steam suspends the launch
-     * indefinitely. Our own app already handles Steam Cloud sync via javasteam, so we turn
+     * indefinitely. Our own app already handles Steam Cloud sync via the WN-Steam-Client, so we turn
      * off Steam's own AutoCloud for the launched app — the server state isn't touched, we
      * just keep Steam from asking about it at launch.
      */
@@ -1245,6 +1532,30 @@ object SteamUtils {
         try {
             val exeCommandLine = container.execArgs
 
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setLaunchCommandLine(exeCommandLine)
+
+            val appIdInt = appId.toIntOrNull() ?: 0
+            val familyShared: Boolean =
+                if (appIdInt <= 0) {
+                    false
+                } else {
+                    val license = SteamService.getPkgInfoOf(appIdInt)
+                    val selfAcct = PrefManager.steamUserAccountId
+                    val owners   = license?.ownerAccountId.orEmpty()
+                    when {
+                        owners.isEmpty()         -> false
+                        owners.contains(selfAcct) -> false  // direct
+                        owners.any { it in SteamService.familyMembers } -> true
+                        else                     -> false
+                    }
+                }
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .setAppFamilyShared(familyShared)
+            if (familyShared) {
+                Timber.i("Bound app $appId is family-shared (owner outside self)")
+            }
+
             val steamPath = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
             val userDataPath = File(steamPath, "userdata/$steamUserId64")
             val configPath = File(userDataPath, "config")
@@ -1294,8 +1605,8 @@ object SteamUtils {
                     container
                         .getExtra("containerLanguage", null)
                         ?.takeIf { it.isNotEmpty() }
-                        ?: "english"
-                }.getOrDefault("english")
+                        ?: PrefManager.containerLanguage
+                }.getOrDefault(PrefManager.containerLanguage)
 
             val steamappsDir = File(steamPath, "steamapps")
             val appManifestFile = File(steamappsDir, "appmanifest_$appId.acf")
diff --git a/app/src/main/feature/stores/steam/utils/WnKeyValue.kt b/app/src/main/feature/stores/steam/utils/WnKeyValue.kt
new file mode 100644
index 000000000..ea80bf778
--- /dev/null
+++ b/app/src/main/feature/stores/steam/utils/WnKeyValue.kt
@@ -0,0 +1,107 @@
+package com.winlator.cmod.feature.stores.steam.utils
+
+import org.json.JSONObject
+
+/**
+ * Lightweight KeyValues node used by [generateSteamApp] and the other Steam appinfo decoders.
+ *
+ * This wraps the appinfo tree parsed by the C++ wn-steam-client without depending on
+ * JavaSteam's `KeyValue`. Values are either scalar leaves or nested maps.
+ *
+ * Missing keys return the shared [INVALID] node, so chained lookups stay null-safe and
+ * `asX()` getters fall back to their defaults.
+ */
+class WnKeyValue private constructor(
+    val name: String?,
+    private val leaf: Any?,
+    private val map: Map<String, Any>?,
+) {
+    companion object {
+        private val INVALID = WnKeyValue(null, null, null)
+
+        /** Wraps an already-parsed KeyValues map as an unnamed root node. */
+        fun fromMap(map: Map<String, Any>): WnKeyValue = WnKeyValue(null, null, map)
+
+        /** Builds a node from the JSON tree emitted by the C++ appinfo parser. */
+        fun fromJsonObject(obj: JSONObject): WnKeyValue = WnKeyValue(null, null, jsonObjectToMap(obj))
+
+        private fun jsonObjectToMap(obj: JSONObject): Map<String, Any> {
+            val m = LinkedHashMap<String, Any>()
+            for (key in obj.keys()) {
+                when (val v = obj.get(key)) {
+                    is JSONObject -> m[key] = jsonObjectToMap(v)
+                    else -> m[key] = v.toString()
+                }
+            }
+            return m
+        }
+    }
+
+    /** Looks up a child node, returning [INVALID] when absent. */
+    operator fun get(key: String): WnKeyValue {
+        val m = map ?: return INVALID
+        return when (val v = m[key]) {
+            null -> INVALID
+            is Map<*, *> -> {
+                @Suppress("UNCHECKED_CAST")
+                WnKeyValue(key, null, v as Map<String, Any>)
+            }
+            else -> WnKeyValue(key, v, null)
+        }
+    }
+
+    /** Child nodes in insertion order, or empty for leaf and invalid nodes. */
+    val children: List<WnKeyValue>
+        get() {
+            val m = map ?: return emptyList()
+            return m.entries.map { (k, v) ->
+                if (v is Map<*, *>) {
+                    @Suppress("UNCHECKED_CAST")
+                    WnKeyValue(k, null, v as Map<String, Any>)
+                } else {
+                    WnKeyValue(k, v, null)
+                }
+            }
+        }
+
+    /** Leaf value as a string, or null for subsection and invalid nodes. */
+    val value: String?
+        get() = when (leaf) {
+            null -> null
+            is String -> leaf
+            else -> leaf.toString()
+        }
+
+    fun asInteger(default: Int = 0): Int = when (val l = leaf) {
+        is Int -> l
+        is Long -> l.toInt()
+        is Float -> l.toInt()
+        is String -> l.trim().toIntOrNull() ?: l.trim().toDoubleOrNull()?.toInt() ?: default
+        else -> default
+    }
+
+    fun asLong(default: Long = 0L): Long = when (val l = leaf) {
+        is Long -> l
+        is Int -> l.toLong()
+        is Float -> l.toLong()
+        is String -> l.trim().toLongOrNull() ?: l.trim().toDoubleOrNull()?.toLong() ?: default
+        else -> default
+    }
+
+    fun asBoolean(default: Boolean = false): Boolean = when (val l = leaf) {
+        is Int -> l != 0
+        is Long -> l != 0L
+        is Float -> l != 0f
+        is String -> {
+            val s = l.trim()
+            when {
+                s.equals("true", ignoreCase = true) -> true
+                s.equals("false", ignoreCase = true) -> false
+                else -> (s.toIntOrNull() ?: 0) != 0
+            }
+        }
+        else -> default
+    }
+
+    fun asByte(default: Byte = 0): Byte = asInteger(default.toInt()).toByte()
+}
diff --git a/app/src/main/feature/stores/steam/utils/WnVdf.kt b/app/src/main/feature/stores/steam/utils/WnVdf.kt
new file mode 100644
index 000000000..0304b6edd
--- /dev/null
+++ b/app/src/main/feature/stores/steam/utils/WnVdf.kt
@@ -0,0 +1,212 @@
+package com.winlator.cmod.feature.stores.steam.utils
+
+import java.io.File
+
+/**
+ * Valve KeyValues node with text VDF parsing and serialization.
+ *
+ * Used for Steam config files such as `localconfig.vdf`, `appmanifest_*.acf`,
+ * `config.vdf`, `local.vdf`, and Steam Input controller manifests. The API mirrors
+ * the JavaSteam `KeyValue` surface used by the app.
+ *
+ * Only text VDF is supported because all current callers use text files.
+ */
+class KeyValue(
+    var name: String? = null,
+    var value: String? = null,
+) {
+    val children: MutableList<KeyValue> = mutableListOf()
+
+    /** True for `{ }` sections rather than `"key" "value"` leaves. */
+    var isSection: Boolean = false
+
+    /**
+     * Looks up a child by case-insensitive name.
+     *
+     * Missing children return [INVALID], so chained lookups stay null-safe.
+     */
+    operator fun get(key: String): KeyValue =
+        children.firstOrNull { it.name.equals(key, ignoreCase = true) } ?: INVALID
+
+    /** The node value, or null for sections and missing nodes. */
+    fun asString(): String? = value
+
+    /**
+     * Serializes this node as text VDF to [file].
+     *
+     * [asBinary] is accepted for call-site compatibility but ignored.
+     */
+    fun saveToFile(
+        file: File,
+        asBinary: Boolean = false,
+    ) {
+        file.writeText(serialize())
+    }
+
+    /** Serializes this node and its subtree to a text VDF string. */
+    fun serialize(): String = StringBuilder().also { writeNode(it, this, 0) }.toString()
+
+    private fun writeNode(
+        sb: StringBuilder,
+        kv: KeyValue,
+        depth: Int,
+    ) {
+        val indent = "\t".repeat(depth)
+        if (kv.children.isEmpty() && !kv.isSection) {
+            sb.append(indent).append(quote(kv.name.orEmpty()))
+                .append("\t\t").append(quote(kv.value.orEmpty())).append('\n')
+        } else {
+            sb.append(indent).append(quote(kv.name.orEmpty())).append('\n')
+            sb.append(indent).append("{\n")
+            for (child in kv.children) writeNode(sb, child, depth + 1)
+            sb.append(indent).append("}\n")
+        }
+    }
+
+    companion object {
+        /** Sentinel returned by [get] for missing children. Compare with `===`. */
+        val INVALID = KeyValue()
+
+        private fun quote(s: String): String {
+            val sb = StringBuilder(s.length + 2)
+            sb.append('"')
+            for (ch in s) {
+                when (ch) {
+                    '"' -> sb.append("\\\"")
+                    '\\' -> sb.append("\\\\")
+                    '\n' -> sb.append("\\n")
+                    '\t' -> sb.append("\\t")
+                    else -> sb.append(ch)
+                }
+            }
+            sb.append('"')
+            return sb.toString()
+        }
+
+        /** Parses a text VDF document, returning null on failure. */
+        fun loadFromString(text: String): KeyValue? =
+            try {
+                Parser(text).parseRoot()
+            } catch (e: Exception) {
+                null
+            }
+    }
+
+    /** Text VDF tokenizer and recursive-descent parser. */
+    private class Parser(
+        private val s: String,
+    ) {
+        private var i = 0
+
+        fun parseRoot(): KeyValue? {
+            val name = nextToken() ?: return null
+            val root = KeyValue(name)
+            skipWhitespaceAndComments()
+            if (i < s.length && s[i] == '{') {
+                root.isSection = true
+                i++
+                parseChildren(root)
+            } else {
+                // Support a degenerate `"name" "value"` document.
+                root.value = nextToken()
+            }
+            return root
+        }
+
+        private fun parseChildren(parent: KeyValue) {
+            while (true) {
+                skipWhitespaceAndComments()
+                if (i >= s.length) return
+                if (s[i] == '}') {
+                    i++
+                    return
+                }
+                val key = nextToken() ?: return
+                val node = KeyValue(key)
+                skipWhitespaceAndComments()
+                if (i < s.length && s[i] == '{') {
+                    node.isSection = true
+                    i++
+                    parseChildren(node)
+                } else {
+                    node.value = nextToken()
+                    // Optional platform conditions may follow values.
+                    skipWhitespaceAndComments()
+                    if (i < s.length && s[i] == '[') skipConditional()
+                }
+                parent.children.add(node)
+            }
+        }
+
+        private fun skipConditional() {
+            while (i < s.length && s[i] != ']') i++
+            if (i < s.length) i++
+        }
+
+        private fun skipWhitespaceAndComments() {
+            while (i < s.length) {
+                val c = s[i]
+                if (c == ' ' || c == '\t' || c == '\r' || c == '\n') {
+                    i++
+                } else if (c == '/' && i + 1 < s.length && s[i + 1] == '/') {
+                    while (i < s.length && s[i] != '\n') i++
+                } else {
+                    return
+                }
+            }
+        }
+
+        /** Reads the next quoted or unquoted token, or null at EOF or a brace. */
+        private fun nextToken(): String? {
+            skipWhitespaceAndComments()
+            if (i >= s.length) return null
+            val c = s[i]
+            if (c == '{' || c == '}') return null
+            return if (c == '"') readQuoted() else readUnquoted()
+        }
+
+        private fun readQuoted(): String {
+            i++
+            val sb = StringBuilder()
+            while (i < s.length) {
+                val c = s[i]
+                when {
+                    c == '"' -> {
+                        i++
+                        return sb.toString()
+                    }
+                    c == '\\' && i + 1 < s.length -> {
+                        when (s[i + 1]) {
+                            'n' -> sb.append('\n')
+                            't' -> sb.append('\t')
+                            'r' -> sb.append('\r')
+                            '"' -> sb.append('"')
+                            '\\' -> sb.append('\\')
+                            else -> sb.append(s[i + 1])
+                        }
+                        i += 2
+                    }
+                    else -> {
+                        sb.append(c)
+                        i++
+                    }
+                }
+            }
+            return sb.toString()
+        }
+
+        private fun readUnquoted(): String {
+            val start = i
+            while (i < s.length) {
+                val c = s[i]
+                if (c == ' ' || c == '\t' || c == '\r' || c == '\n' ||
+                    c == '{' || c == '}' || c == '"'
+                ) {
+                    break
+                }
+                i++
+            }
+            return s.substring(start, i)
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/AvatarFetcher.kt b/app/src/main/feature/stores/steam/wnsteam/AvatarFetcher.kt
new file mode 100644
index 000000000..a95a2a95d
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/AvatarFetcher.kt
@@ -0,0 +1,101 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import android.graphics.BitmapFactory
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.concurrent.ConcurrentHashMap
+
+object AvatarFetcher {
+    private const val TAG = "AvatarFetcher"
+    private const val CONNECT_TIMEOUT_MS = 8_000
+    private const val READ_TIMEOUT_MS    = 12_000
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private val inFlight = ConcurrentHashMap<String, Job>()
+
+    fun enqueueAllTiers(steamId: Long, hashHex: String) {
+        enqueue(steamId, hashHex, tier = 0)
+        enqueue(steamId, hashHex, tier = 1)
+        enqueue(steamId, hashHex, tier = 2)
+    }
+
+    fun enqueue(steamId: Long, hashHex: String, tier: Int = 0) {
+        if (steamId == 0L || tier !in 0..2) return
+        if (hashHex.isEmpty() || hashHex.length % 2 != 0) return
+        if (!hashHex.all { it in '0'..'9' || it in 'a'..'f' }) return
+        val key = "$hashHex:$tier"
+        if (inFlight.containsKey(key)) return
+        val job = scope.launch {
+            try {
+                val img = fetchAndDecode(hashHex, tier)
+                if (img == null) {
+                    Timber.tag(TAG).w("fetchAndDecode returned null hash=$hashHex tier=$tier")
+                    return@launch
+                }
+                val handle = WnLibSteamClient.nativePushFriendAvatar(
+                    steamId, tier, img.width, img.height, img.rgba)
+                Timber.tag(TAG).i(
+                    "pushed avatar sid=%d tier=%d %dx%d → handle=%d",
+                    steamId, tier, img.width, img.height, handle)
+            } catch (t: Throwable) {
+                Timber.tag(TAG).w(t, "fetch failed sid=$steamId hash=$hashHex tier=$tier")
+            } finally {
+                inFlight.remove(key)
+            }
+        }
+        inFlight[key] = job
+    }
+
+    @Throws(Exception::class)
+    fun fetchAndDecode(hashHex: String, tier: Int): RgbaImage? {
+        val suffix = when (tier) {
+            0 -> ""
+            1 -> "_medium"
+            2 -> "_full"
+            else -> return null
+        }
+        val url = URL("https://avatars.akamai.steamstatic.com/${hashHex}${suffix}.jpg")
+        val conn = (url.openConnection() as HttpURLConnection).apply {
+            connectTimeout = CONNECT_TIMEOUT_MS
+            readTimeout    = READ_TIMEOUT_MS
+            instanceFollowRedirects = true
+            requestMethod  = "GET"
+        }
+        val bytes = try {
+            if (conn.responseCode !in 200..299) {
+                Timber.tag(TAG).w("HTTP %d for %s", conn.responseCode, url)
+                return null
+            }
+            conn.inputStream.use { it.readBytes() }
+        } finally {
+            conn.disconnect()
+        }
+        val bmp = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) ?: return null
+        val w = bmp.width
+        val h = bmp.height
+        if (w <= 0 || h <= 0 || w > 1024 || h > 1024) {
+            Timber.tag(TAG).w("rejecting bitmap %dx%d (out of bounds)", w, h)
+            return null
+        }
+        val argb = IntArray(w * h)
+        bmp.getPixels(argb, 0, w, 0, 0, w, h)
+        bmp.recycle()
+        val rgba = ByteArray(w * h * 4)
+        for (i in 0 until w * h) {
+            val px = argb[i]
+            rgba[i * 4 + 0] = ((px shr 16) and 0xFF).toByte() // R
+            rgba[i * 4 + 1] = ((px shr 8)  and 0xFF).toByte() // G
+            rgba[i * 4 + 2] = ( px         and 0xFF).toByte() // B
+            rgba[i * 4 + 3] = ((px ushr 24) and 0xFF).toByte() // A
+        }
+        return RgbaImage(w, h, rgba)
+    }
+
+    data class RgbaImage(val width: Int, val height: Int, val rgba: ByteArray)
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/CaBundleExtractor.kt b/app/src/main/feature/stores/steam/wnsteam/CaBundleExtractor.kt
new file mode 100644
index 000000000..3c2c0f801
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/CaBundleExtractor.kt
@@ -0,0 +1,68 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import android.content.Context
+import timber.log.Timber
+import java.io.File
+
+/**
+ * IXWebSocket's OpenSSL backend expects a single PEM trust bundle file
+ * (`SSL_CTX_load_verify_locations` CAfile slot). Android's CA store is a
+ * **directory** of hashed-filename PEMs under `/system/etc/security/cacerts`,
+ * which OpenSSL can't consume in that form via IXWebSocket's API.
+ *
+ * This helper concatenates every `*.0` PEM in the system CA directory into
+ * a single file under the app's `filesDir/wnsteam_cacert.pem`, on first run.
+ * Subsequent calls reuse the cached bundle.
+ *
+ * The output path is what [WnSteamSession.setCaBundlePath] expects.
+ */
+object CaBundleExtractor {
+
+    private const val OUT_NAME = "wnsteam_cacert.pem"
+    private const val SYS_CA_DIR = "/system/etc/security/cacerts"
+
+    /**
+     * Ensures the bundle exists; returns its absolute path. Empty string
+     * on failure (in which case TLS handshakes will be rejected).
+     */
+    fun ensureBundle(context: Context): String {
+        val out = File(context.filesDir, OUT_NAME)
+        if (out.exists() && out.length() > 1024) {
+            // Sanity floor: a single empty file means a prior extraction failed.
+            return out.absolutePath
+        }
+
+        val src = File(SYS_CA_DIR)
+        if (!src.isDirectory) {
+            Timber.w("WnSteam CA bundle: %s missing, TLS will fail", SYS_CA_DIR)
+            return ""
+        }
+        val pems = src.listFiles { f -> f.isFile && f.name.endsWith(".0") }
+            ?: emptyArray()
+        if (pems.isEmpty()) {
+            Timber.w("WnSteam CA bundle: no *.0 files under %s", SYS_CA_DIR)
+            return ""
+        }
+
+        try {
+            out.bufferedWriter().use { w ->
+                for (f in pems) {
+                    try {
+                        f.bufferedReader().use { r ->
+                            r.copyTo(w)
+                        }
+                        w.newLine()
+                    } catch (e: Exception) {
+                        Timber.w(e, "WnSteam CA: skipped %s", f.name)
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "WnSteam CA: bundle write failed")
+            return ""
+        }
+        Timber.i("WnSteam CA bundle ready: %s (%d certs, %d bytes)",
+            out.absolutePath, pems.size, out.length())
+        return out.absolutePath
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnAuthCallback.kt b/app/src/main/feature/stores/steam/wnsteam/WnAuthCallback.kt
new file mode 100644
index 000000000..db0112a37
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnAuthCallback.kt
@@ -0,0 +1,11 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Fired by [WnSteamSession] when an auth session has an auth update.
+ * QR login can emit a remote-approval hint before the final success or
+ * failure result arrives. Invoked on a native worker thread — marshal
+ * to your own dispatcher before touching UI.
+ */
+fun interface WnAuthCallback {
+    fun onAuthResult(result: WnAuthResult)
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnAuthResult.kt b/app/src/main/feature/stores/steam/wnsteam/WnAuthResult.kt
new file mode 100644
index 000000000..40fdbfef7
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnAuthResult.kt
@@ -0,0 +1,20 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Result of a WnSteamSession login attempt. Constructor parameter order
+ * matches the JNI ctor signature in wn_session_jni.cpp's `build_auth_result`.
+ * Do NOT reorder the primary-constructor parameters without updating that
+ * file's `auth_result_ctor` signature lookup.
+ */
+data class WnAuthResult(
+    val success: Boolean,
+    val errorCode: Int,
+    val errorMessage: String,
+    val accountName: String,
+    val refreshToken: String,
+    val accessToken: String,
+    val newGuardData: String,
+    val steamId: Long,
+    val hadRemoteInteraction: Boolean,
+    val agreementSessionUrl: String,
+)
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnAuthenticator.kt b/app/src/main/feature/stores/steam/wnsteam/WnAuthenticator.kt
new file mode 100644
index 000000000..957e2fecc
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnAuthenticator.kt
@@ -0,0 +1,40 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import java.util.concurrent.CompletableFuture
+
+/**
+ * Mirrors JavaSteam's `in.dragonbra.javasteam.steam.authentication.IAuthenticator`
+ * shape exactly. SteamLoginViewModel's existing `object : IAuthenticator { ... }`
+ * block becomes `object : WnAuthenticator { ... }` with zero
+ * method-signature changes.
+ *
+ * The native client invokes these via JNI when Steam asks for a Steam Guard
+ * confirmation during BeginAuthSessionViaCredentials / PollAuthSessionStatus.
+ */
+interface WnAuthenticator {
+
+    /**
+     * Steam pushed a "tap to approve" prompt to the user's mobile authenticator.
+     * Return a future that completes `true` if the UI should wait for the user
+     * to approve out-of-band (always true for our flow — matches IAuthenticator).
+     */
+    fun acceptDeviceConfirmation(): CompletableFuture<Boolean>
+
+    /**
+     * Steam requires a TOTP code from the mobile authenticator.
+     * Complete the returned future with the code the user enters.
+     * @param previousCodeWasIncorrect true if a prior submission was rejected.
+     */
+    fun getDeviceCode(previousCodeWasIncorrect: Boolean): CompletableFuture<String>
+
+    /**
+     * Steam requires an email Steam Guard code.
+     * Complete the returned future with the code the user enters.
+     * @param email the email address Steam emailed the code to (may be null).
+     * @param previousCodeWasIncorrect true if a prior submission was rejected.
+     */
+    fun getEmailCode(
+        email: String?,
+        previousCodeWasIncorrect: Boolean,
+    ): CompletableFuture<String>
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnConnection.kt b/app/src/main/feature/stores/steam/wnsteam/WnConnection.kt
new file mode 100644
index 000000000..6a9a50c72
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnConnection.kt
@@ -0,0 +1,72 @@
+// JNI symbols depend on this package path and class name.
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import java.util.concurrent.atomic.AtomicLong
+
+// Thread-safe JVM handle for the native Steam CM encrypted channel.
+class WnConnection : AutoCloseable {
+
+    private val nativeHandle: AtomicLong
+
+    init {
+        WnSteamClient.ensureLoaded()
+        val h = nativeCreate()
+        require(h != 0L) { "wnsteam: nativeCreate returned 0" }
+        nativeHandle = AtomicLong(h)
+    }
+
+    // Set the PEM CA bundle used by TLS before [connect].
+    fun setCaBundlePath(path: String) {
+        val h = nativeHandle.get()
+        if (h == 0L) return
+        nativeSetCaBundlePath(h, path)
+    }
+
+    // Install or clear the lifecycle observer.
+    fun setObserver(observer: WnConnectionObserver?) {
+        val h = nativeHandle.get()
+        if (h == 0L) return
+        nativeSetObserver(h, observer)
+    }
+
+    // Connect to a Steam CM WSS URL.
+    fun connect(url: String): Boolean {
+        val h = nativeHandle.get()
+        if (h == 0L) return false
+        return nativeConnect(h, url)
+    }
+
+    fun disconnect() {
+        val h = nativeHandle.get()
+        if (h == 0L) return
+        nativeDisconnect(h)
+    }
+
+    // Send one application-layer message over the encrypted channel.
+    fun send(bytes: ByteArray): Boolean {
+        val h = nativeHandle.get()
+        if (h == 0L) return false
+        return nativeSend(h, bytes)
+    }
+
+    override fun close() {
+        val h = nativeHandle.getAndSet(0L)
+        if (h != 0L) nativeDestroy(h)
+    }
+
+    @Suppress("ProtectedInFinal", "unused")
+    protected fun finalize() {
+        // Safety net only; callers should close deterministically.
+        close()
+    }
+
+    companion object {
+        @JvmStatic private external fun nativeCreate(): Long
+        @JvmStatic private external fun nativeDestroy(handle: Long)
+        @JvmStatic private external fun nativeSetCaBundlePath(handle: Long, path: String)
+        @JvmStatic private external fun nativeSetObserver(handle: Long, observer: WnConnectionObserver?)
+        @JvmStatic private external fun nativeConnect(handle: Long, url: String): Boolean
+        @JvmStatic private external fun nativeDisconnect(handle: Long)
+        @JvmStatic private external fun nativeSend(handle: Long, data: ByteArray): Boolean
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnConnectionObserver.kt b/app/src/main/feature/stores/steam/wnsteam/WnConnectionObserver.kt
new file mode 100644
index 000000000..dfbec38f2
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnConnectionObserver.kt
@@ -0,0 +1,36 @@
+// IMPORTANT: the package path below is hard-bound to native JNI lookup.
+// Do NOT move this file or rename the package without updating native code.
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Callback surface for [WnConnection]. Implementations receive lifecycle and
+ * data events from the native EncryptedChannel.
+ *
+ * Threading: methods fire on the native transport's worker thread. Marshal
+ * to your own dispatcher before touching UI state. Methods must not throw —
+ * the native side catches exceptions but they produce log spam and lose the
+ * stack.
+ *
+ * `onDisconnected.reason` is the ordinal of a native ChannelDisconnectReason:
+ *   0 = UserInitiated
+ *   1 = TransportError
+ *   2 = HandshakeProtocolError
+ *   3 = HandshakeFailed
+ *   4 = EnvelopeDecryptFailed
+ *   5 = HmacMismatch
+ */
+interface WnConnectionObserver {
+    /** Encrypted channel reached the Encrypted state; safe to send messages. */
+    fun onConnected()
+
+    /** Channel terminated. See [reason] ordinal mapping above. */
+    fun onDisconnected(reason: Int, detail: String)
+
+    /**
+     * One decrypted application-layer message. Bytes start with either
+     * a CMsgProtoBufHeader+protobuf (proto flag set on EMsg) or a
+     * MsgHdr/ExtendedClientMsgHdr+struct body, exactly as Steam's CM
+     * dispatches them. The Kotlin layer parses based on the EMsg flag.
+     */
+    fun onMessage(bytes: ByteArray)
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnDownloadListener.kt b/app/src/main/feature/stores/steam/wnsteam/WnDownloadListener.kt
new file mode 100644
index 000000000..e92733809
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnDownloadListener.kt
@@ -0,0 +1,24 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+// Native depot download callbacks; methods run on a worker thread.
+interface WnDownloadListener {
+
+    // Per-chunk progress for the current depot.
+    fun onProgress(
+        depotId: Int,
+        depotDone: Long,
+        depotTotal: Long,
+        depotsDone: Int,
+        depotsTotal: Int,
+        verifying: Boolean,
+    )
+
+    // Fired once when the whole download succeeds or fails.
+    fun onComplete(
+        success: Boolean,
+        error: String,
+        bytesWritten: Long,
+        depotsCompleted: Int,
+        depotsSkipped: Int,
+    )
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnLauncherStatusTailer.kt b/app/src/main/feature/stores/steam/wnsteam/WnLauncherStatusTailer.kt
new file mode 100644
index 000000000..201f3d96f
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnLauncherStatusTailer.kt
@@ -0,0 +1,203 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import com.winlator.cmod.R
+import java.io.File
+import java.io.RandomAccessFile
+import java.util.concurrent.atomic.AtomicBoolean
+
+class WnLauncherStatusTailer(
+    context: Context,
+    private val logFile: File,
+    private val gameDisplayName: String,
+    private val pollIntervalMs: Long = 200L,
+    private val onPhase: (phaseText: String) -> Unit,
+    private val onLaunchComplete: (() -> Unit)? = null,
+    private val onLaunchFailed: ((reason: String) -> Unit)? = null,
+) {
+    private val running = AtomicBoolean(false)
+    private val appContext = context.applicationContext
+    private val main = Handler(Looper.getMainLooper())
+    private var thread: Thread? = null
+    @Volatile private var lastEmitted: String = ""
+    @Volatile private var launchAppDispatchedAt: Long = 0L
+    @Volatile private var fileExistedAtStart: Boolean = false
+    @Volatile private var launchCompleteSignaled: Boolean = false
+
+    fun start() {
+        if (!running.compareAndSet(false, true)) return
+        fileExistedAtStart = logFile.exists()
+        launchCompleteSignaled = false
+        android.util.Log.i(TAG, "start: path=" + logFile.absolutePath
+                + " exists=" + fileExistedAtStart
+                + " size=" + (if (fileExistedAtStart) logFile.length() else -1L)
+                + " canRead=" + logFile.canRead())
+        thread = Thread({ tailLoop() }, "WnLauncherStatusTailer").apply {
+            isDaemon = true
+            start()
+        }
+    }
+
+    fun stop() {
+        running.set(false)
+        thread?.interrupt()
+        thread = null
+    }
+
+    private fun tailLoop() {
+        var lastOffset = 0L
+        var openedOnce = false
+        var iter = 0
+        var totalLinesRead = 0
+        android.util.Log.i(TAG, "tailLoop: entered, polling every ${pollIntervalMs}ms")
+        while (running.get()) {
+            iter++
+            try {
+                if (!logFile.exists()) {
+                    if (iter % 25 == 1) {
+                        android.util.Log.i(TAG, "tailLoop iter=$iter: file does not yet exist at ${logFile.absolutePath}")
+                    }
+                    Thread.sleep(pollIntervalMs)
+                    continue
+                }
+                var linesThisIter = 0
+                RandomAccessFile(logFile, "r").use { raf ->
+                    val len = raf.length()
+                    if (!openedOnce) {
+                        openedOnce = true
+                        if (fileExistedAtStart) {
+                            lastOffset = len
+                            android.util.Log.i(TAG, "tailLoop: first read; file len=$len — seeking to end (skipping any stale content from previous launch); waiting for launcher to truncate + write new content")
+                        } else {
+                            lastOffset = 0L
+                            android.util.Log.i(TAG, "tailLoop: first read on freshly created log; file len=$len — reading from start")
+                        }
+                    } else if (len < lastOffset) {
+                        android.util.Log.i(TAG, "tailLoop iter=$iter: file shrank from $lastOffset to $len bytes — launcher truncated, resetting offset")
+                        lastOffset = 0L
+                    }
+                    raf.seek(lastOffset)
+                    while (true) {
+                        val line = raf.readLine() ?: break
+                        linesThisIter++
+                        totalLinesRead++
+                        consumeLine(line)
+                    }
+                    lastOffset = raf.filePointer
+                }
+                if (linesThisIter > 0) {
+                    android.util.Log.i(TAG, "tailLoop iter=$iter: read $linesThisIter new line(s), totalRead=$totalLinesRead, offset=$lastOffset")
+                }
+                watchdogTick()
+            } catch (ie: InterruptedException) {
+                Thread.currentThread().interrupt()
+                break
+            } catch (e: Exception) {
+                android.util.Log.e(TAG, "tail iteration failed", e)
+            }
+            try {
+                Thread.sleep(pollIntervalMs)
+            } catch (ie: InterruptedException) {
+                Thread.currentThread().interrupt()
+                break
+            }
+        }
+        android.util.Log.i(TAG, "tailLoop: exiting (running=${running.get()}, totalLinesRead=$totalLinesRead)")
+    }
+
+    private fun consumeLine(line: String) {
+        if (!line.contains("[wn-launcher]")) return
+        val isWatchingForExit = line.contains("watching \"") && line.contains("for exit")
+        val isTerminal = (line.contains("is running") && line.contains("LaunchApp"))
+                || isWatchingForExit
+                || line.contains("game process started pid=")
+        val isFatal = line.contains("LoadLibrary(") && line.contains("FAILED after all strategies")
+        val isLaunchAppDispatched = line.contains("IClientAppManager.LaunchApp(appId=")
+        val isCreateProcessFallback = line.contains("LaunchApp dispatched")
+                && line.contains("never appeared")
+                && line.contains("falling back to CreateProcess")
+        val phase = phaseFor(line)
+        if (phase != null && phase != lastEmitted) {
+            emitPhase(phase, line)
+        }
+        if (isLaunchAppDispatched) launchAppDispatchedAt = System.currentTimeMillis()
+        if (isTerminal) {
+            if (launchCompleteSignaled) return
+            launchCompleteSignaled = true
+            android.util.Log.i(TAG, "terminal phase (LaunchApp is running) — signaling launch complete")
+            // Disarm the watchdog: the game spawned successfully, so the 30s
+            // post-dispatch timeout would otherwise fire mid-play and kill the
+            // activity with a spurious onLaunchFailed.
+            launchAppDispatchedAt = 0L
+            main.post { onLaunchComplete?.invoke() }
+        } else if (isFatal) {
+            android.util.Log.w(TAG, "fatal phase (launcher LoadLibrary failed) — signaling launch failure")
+            main.post { onLaunchFailed?.invoke(appContext.getString(R.string.preloader_steam_launcher_start_failed)) }
+        } else if (isCreateProcessFallback) {
+            // Keep the UI on "Launching <game>" through the fallback; disarm the watchdog.
+            android.util.Log.w(TAG, "LaunchApp exhausted retries — launcher will try CreateProcess fallback (UI stays on Launching)")
+            launchAppDispatchedAt = 0L
+        }
+    }
+
+    private fun watchdogTick() {
+        val dispatchedAt = launchAppDispatchedAt
+        if (dispatchedAt == 0L) return  // disarmed on spawn / fallback
+        if (System.currentTimeMillis() - dispatchedAt > LAUNCH_APP_WATCHDOG_MS) {
+            android.util.Log.w(TAG, "watchdog: ${LAUNCH_APP_WATCHDOG_MS}ms elapsed after LaunchApp with no terminal — assuming launch failed")
+            launchAppDispatchedAt = 0L
+            main.post { onLaunchFailed?.invoke(appContext.getString(R.string.preloader_steam_launcher_game_never_started)) }
+        }
+    }
+
+    private fun emitPhase(phase: String, line: String) {
+        lastEmitted = phase
+        android.util.Log.i(TAG, "phase change: \"$phase\" (from line: ${line.take(80)})")
+        main.post { onPhase(phase) }
+    }
+
+    private fun phaseFor(line: String): String? = when {
+        line.contains("in-process Steam launcher starting") -> appContext.getString(R.string.preloader_starting_steam_launcher)
+        line.contains("steamclient64.dll loaded") -> appContext.getString(R.string.preloader_loading_steam_client)
+        line.contains("Steam_CreateGlobalUser OK") -> appContext.getString(R.string.preloader_connecting_to_steam)
+        line.contains("LogOn(") && line.contains("EResult=1") -> appContext.getString(R.string.preloader_signing_in_to_steam)
+        line.contains("callback 101 SteamServersConnected") -> appContext.getString(R.string.preloader_fetching_game_info)
+        line.contains("Steam_BLoggedOn=true") -> appContext.getString(R.string.preloader_steam_ready)
+        line.contains("RequestAppInfoUpdate(appId=") -> appContext.getString(R.string.preloader_updating_game_info)
+        line.contains("GetAppInstallState(appId=") -> appContext.getString(R.string.preloader_verifying_install)
+        line.contains("redist scan: scanning") -> appContext.getString(R.string.preloader_scanning_redists)
+        line.contains("installing redistributable:") -> phaseForInstallingRedist(line)
+        line.contains("redist scan: installed") -> appContext.getString(R.string.preloader_redists_ready)
+        line.contains("redist scan: ") && line.contains(" of ") -> appContext.getString(R.string.preloader_redists_ready)
+        line.contains("redist scan: 0 *.exe installers") -> appContext.getString(R.string.preloader_no_redists)
+        line.contains("redist scan: no _CommonRedist") -> appContext.getString(R.string.preloader_no_redists)
+        line.contains("steamservice: post-start state=4") -> appContext.getString(R.string.preloader_steam_service_running)
+        line.contains("IClientAppManager.LaunchApp(appId=") -> appContext.getString(R.string.preloader_launching_game, gameDisplayName)
+        line.contains("LoadLibrary(") && line.contains("FAILED after all strategies") ->
+            appContext.getString(R.string.preloader_steam_launcher_failed_restaging)
+        else -> null
+    }
+
+    private fun phaseForInstallingRedist(line: String): String {
+        val marker = "installing redistributable:"
+        val start = line.indexOf(marker)
+        if (start < 0) return appContext.getString(R.string.preloader_installing_redist_single)
+        val rest = line.substring(start + marker.length).trim()
+        val name = rest.substringBefore(" (").trim()
+        val ratio = rest.substringAfter("(", "").substringBefore(",", "").trim()
+        return if (name.isNotEmpty() && ratio.contains("/")) {
+            appContext.getString(R.string.preloader_installing_named_redist_progress, name, ratio)
+        } else if (name.isNotEmpty()) {
+            appContext.getString(R.string.preloader_installing_named_redist, name)
+        } else {
+            appContext.getString(R.string.preloader_installing_redist_single)
+        }
+    }
+
+    companion object {
+        private const val TAG = "WnLauncherTailer"
+        private const val LAUNCH_APP_WATCHDOG_MS = 35_000L
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnLibSteamClient.kt b/app/src/main/feature/stores/steam/wnsteam/WnLibSteamClient.kt
new file mode 100644
index 000000000..c92d9c37d
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnLibSteamClient.kt
@@ -0,0 +1,617 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import android.util.Log
+import org.json.JSONArray
+
+object WnLibSteamClient {
+    private const val TAG = "WnLibSteamClient"
+
+    @Volatile private var loaded = false
+
+    fun ensureLoaded(context: android.content.Context): Boolean {
+        if (loaded) return true
+        return try {
+            System.loadLibrary("steamclient")
+            loaded = true
+            Log.i(TAG, "libsteamclient.so loaded via System.loadLibrary (APK nativeLibraryDir)")
+            true
+        } catch (t: UnsatisfiedLinkError) {
+            Log.w(TAG, "System.loadLibrary(\"steamclient\") failed: ${t.message}; setters will no-op")
+            false
+        }
+    }
+
+    fun setSteamId(steamId64: Long) {
+        if (!loaded) return
+        try { nativeSetSteamId(steamId64) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setLoggedOn(loggedOn: Boolean) {
+        if (!loaded) return
+        try { nativeSetLoggedOn(loggedOn) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setPersonaName(name: String?) {
+        if (!loaded) return
+        try { nativeSetPersonaName(name.orEmpty()) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setPersonaState(state: Int) {
+        if (!loaded) return
+        try { nativeSetPersonaState(state) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppId(appId: Int) {
+        if (!loaded) return
+        try { nativeSetAppId(appId) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setIPCountry(country: String?) {
+        if (!loaded) return
+        try { nativeSetIPCountry(country.orEmpty()) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setUiLanguage(language: String?) {
+        if (!loaded) return
+        try { nativeSetUiLanguage(language.orEmpty()) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun seedFromPrefManager(context: android.content.Context) {
+        if (!ensureLoaded(context)) return
+        try {
+            var sid = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.steamUserSteamId64
+            if (sid == 0L) {
+                val rt = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.refreshToken
+                if (rt.isNotBlank()) {
+                    runCatching {
+                        val sub = com.auth0.android.jwt.JWT(rt).subject
+                        sub?.toLongOrNull()?.let { decoded ->
+                            if (decoded != 0L) {
+                                sid = decoded
+                                com.winlator.cmod.feature.stores.steam.utils
+                                    .PrefManager.steamUserSteamId64 = decoded
+                                com.winlator.cmod.feature.stores.steam.utils
+                                    .PrefManager.steamUserAccountId =
+                                    (decoded and 0xFFFFFFFFL).toInt()
+                                Log.i(TAG, "seedFromPrefManager: recovered " +
+                                    "steamId64=$decoded from refresh-token JWT")
+                            }
+                        }
+                    }.onFailure {
+                        Log.w(TAG, "seedFromPrefManager: JWT decode for " +
+                            "steamId recovery failed: ${it.message}")
+                    }
+                }
+            }
+            if (sid != 0L) {
+                nativeSetSteamId(sid)
+                nativeSetLoggedOn(true)
+            }
+            val name = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.steamUserName
+            if (name.isNotEmpty()) nativeSetPersonaName(name)
+            val pstate = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.personaState
+            if (pstate != 0) nativeSetPersonaState(pstate)
+            val lang = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.containerLanguage
+            if (lang.isNotEmpty()) nativeSetUiLanguage(lang)
+            if (sid != 0L) nativeSetCloudEnabledForAccount(true)
+            val hashHex = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.steamUserAvatarHash
+            if (sid != 0L && hashHex.isNotEmpty()
+                    && hashHex.length % 2 == 0
+                    && hashHex.all { it in '0'..'9' || it in 'a'..'f' }) {
+                val bytes = ByteArray(hashHex.length / 2)
+                for (k in bytes.indices) {
+                    val hi = Character.digit(hashHex[k * 2], 16)
+                    val lo = Character.digit(hashHex[k * 2 + 1], 16)
+                    bytes[k] = ((hi shl 4) or lo).toByte()
+                }
+                try { nativeSetFriendAvatarHash(sid, bytes) } catch (_: UnsatisfiedLinkError) {}
+                AvatarFetcher.enqueueAllTiers(sid, hashHex)
+                Log.i(TAG, "seedFromPrefManager: warmed self avatar sid=$sid hash=$hashHex")
+            } else {
+                Log.i(TAG, "seedFromPrefManager: name='$name' sid=$sid pstate=$pstate lang=$lang " +
+                    "(no avatar hash cached)")
+            }
+        } catch (_: UnsatisfiedLinkError) {}
+        try {
+            val friendsJson = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.friendsSnapshotJson
+            if (friendsJson.isNotEmpty()) {
+                val pushed = pushFriendPersonasJson(friendsJson, persistSnapshot = false)
+                Log.i(TAG, "seedFromPrefManager: replayed $pushed friend persona(s) from snapshot")
+            }
+        } catch (t: Throwable) {
+            Log.w(TAG, "seedFromPrefManager: friend snapshot replay failed: ${t.message}")
+        }
+    }
+
+    fun pushFriendPersonasJson(json: String, persistSnapshot: Boolean = true): Int {
+        if (!loaded) return 0
+        val arr = try { JSONArray(json) } catch (_: Exception) { return 0 }
+        if (arr.length() == 0) return 0
+        val sids = ArrayList<Long>(arr.length())
+        for (i in 0 until arr.length()) {
+            val obj = arr.optJSONObject(i) ?: continue
+            val sid = obj.optLong("sid", 0L)
+            if (sid == 0L) continue
+            sids.add(sid)
+
+            obj.optString("name", "").takeIf { it.isNotEmpty() }?.let {
+                setFriendPersonaName(sid, it)
+            }
+            obj.optInt("state", -1).takeIf { it >= 0 }?.let {
+                setFriendPersonaState(sid, it)
+            }
+            obj.optInt("app", -1).takeIf { it >= 0 }?.let {
+                setFriendGamePlayed(sid, it)
+            }
+            val hashHex = obj.optString("avatarHash", "")
+            if (hashHex.isNotEmpty() && hashHex.length % 2 == 0
+                    && hashHex.all { c -> c in '0'..'9' || c in 'a'..'f' }) {
+                val bytes = ByteArray(hashHex.length / 2)
+                for (k in bytes.indices) {
+                    val hi = Character.digit(hashHex[k * 2], 16)
+                    val lo = Character.digit(hashHex[k * 2 + 1], 16)
+                    bytes[k] = ((hi shl 4) or lo).toByte()
+                }
+                setFriendAvatarHash(sid, bytes)
+                AvatarFetcher.enqueueAllTiers(sid, hashHex)
+            }
+        }
+        if (sids.isNotEmpty()) {
+            setFriendsList(sids.toLongArray())
+        }
+        if (persistSnapshot && sids.isNotEmpty()) {
+            com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.friendsSnapshotJson = json
+        }
+        return sids.size
+    }
+
+    fun setOwnedApps(appIds: IntArray) {
+        if (!loaded) return
+        try { nativeSetOwnedApps(appIds) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setInstalledApps(appIds: IntArray) {
+        if (!loaded) return
+        try { nativeSetInstalledApps(appIds) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppInstallDir(appId: Int, dir: String?) {
+        if (!loaded) return
+        try { nativeSetAppInstallDir(appId, dir.orEmpty()) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppDlcs(
+        parentAppId: Int,
+        dlcAppIds: IntArray,
+        dlcNames: Array<String>,
+        available: BooleanArray,
+    ) {
+        if (!loaded || parentAppId <= 0) return
+        if (dlcAppIds.size != dlcNames.size || dlcAppIds.size != available.size) return
+        try { nativeSetAppDlcs(parentAppId, dlcAppIds, dlcNames, available) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppInstalledDepots(appId: Int, depotIds: IntArray?) {
+        if (!loaded || appId <= 0) return
+        try { nativeSetAppInstalledDepots(appId, depotIds) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppWorkshopItems(
+        appId: Int,
+        publishedFileIds: LongArray,
+        installDirs: Array<String>,
+        sizesBytes: LongArray,
+        timestamps: LongArray,
+    ) {
+        if (!loaded || appId <= 0) return
+        if (publishedFileIds.size != installDirs.size ||
+            publishedFileIds.size != sizesBytes.size ||
+            publishedFileIds.size != timestamps.size) return
+        try { nativeSetAppWorkshopItems(appId, publishedFileIds, installDirs, sizesBytes, timestamps) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setInventoryItemDefs(
+        appId: Int,
+        defIds: IntArray,
+        propCountsPerDef: IntArray,
+        propKeys: Array<String>,
+        propVals: Array<String>,
+    ) {
+        if (!loaded || appId <= 0) return
+        if (defIds.size != propCountsPerDef.size) return
+        if (propKeys.size != propVals.size) return
+        if (propCountsPerDef.sum() != propKeys.size) return
+        try { nativeSetInventoryItemDefs(appId, defIds, propCountsPerDef, propKeys, propVals) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppNames(appIds: IntArray, names: Array<String>) {
+        if (!loaded || appIds.size != names.size) return
+        if (appIds.isEmpty()) return
+        try { nativeSetAppNames(appIds, names) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppBuildId(appId: Int, buildId: Int) {
+        if (!loaded || appId <= 0) return
+        try { nativeSetAppBuildId(appId, buildId) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppSourcePackages(appId: Int, packageIds: IntArray?) {
+        if (!loaded || appId <= 0) return
+        try { nativeSetAppSourcePackages(appId, packageIds) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppCloudRemoteDir(appId: Int, path: String?) {
+        if (!loaded || appId <= 0) return
+        try { nativeSetAppCloudRemoteDir(appId, path) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setFriendsList(steamIds: LongArray) {
+        if (!loaded) return
+        try { nativeSetFriendsList(steamIds) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setFriendPersonaName(steamId64: Long, name: String?) {
+        if (!loaded) return
+        try { nativeSetFriendPersonaName(steamId64, name.orEmpty()) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setFriendPersonaState(steamId64: Long, state: Int) {
+        if (!loaded) return
+        try { nativeSetFriendPersonaState(steamId64, state) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setFriendGamePlayed(steamId64: Long, appId: Int) {
+        if (!loaded) return
+        try { nativeSetFriendGamePlayed(steamId64, appId) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setServerRealTime(serverRealTimeUnix: Int) {
+        if (!loaded) return
+        try { nativeSetServerRealTime(serverRealTimeUnix) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setLaunchCommandLine(cli: String?) {
+        if (!loaded) return
+        try { nativeSetLaunchCommandLine(cli.orEmpty()) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAppFamilyShared(familyShared: Boolean) {
+        if (!loaded) return
+        try { nativeSetAppFamilyShared(familyShared) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setEncryptedAppTicket(appId: Int, body: ByteArray?, eresult: Int) {
+        if (!loaded) return
+        try { nativeSetEncryptedAppTicket(appId, body, eresult) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun reportLogonFailure(eresult: Int, stillRetrying: Boolean) {
+        if (!loaded) return
+        try { nativeReportLogonFailure(eresult, stillRetrying) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setCloudEnabledForAccount(enabled: Boolean) {
+        if (!loaded) return
+        try { nativeSetCloudEnabledForAccount(enabled) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setCloudEnabledForApp(enabled: Boolean) {
+        if (!loaded) return
+        try { nativeSetCloudEnabledForApp(enabled) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setCloudQuota(totalBytes: Long, availableBytes: Long) {
+        if (!loaded) return
+        try { nativeSetCloudQuota(totalBytes, availableBytes) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setCloudFiles(names: Array<String>, sizes: IntArray, timestamps: LongArray) {
+        if (!loaded) return
+        if (names.size != sizes.size || names.size != timestamps.size) return
+        try { nativeSetCloudFiles(names, sizes, timestamps) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAchievementSchema(
+        apiNames: Array<String>,
+        displayNames: Array<String>,
+        descriptions: Array<String>,
+        icons: Array<String>,
+        hidden: BooleanArray,
+    ) {
+        if (!loaded) return
+        if (apiNames.size != displayNames.size ||
+            apiNames.size != descriptions.size ||
+            apiNames.size != icons.size ||
+            apiNames.size != hidden.size) return
+        try {
+            nativeSetAchievementSchema(apiNames, displayNames, descriptions, icons, hidden)
+        } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAchievementProgress(apiName: String, achieved: Boolean, unlockTimeUnix: Int) {
+        if (!loaded || apiName.isEmpty()) return
+        try { nativeSetAchievementProgress(apiName, achieved, unlockTimeUnix) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setAchievementBlockBits(
+        apiNames: Array<String>,
+        blockIds: IntArray,
+        bitIndices: IntArray,
+    ) {
+        if (!loaded) return
+        if (apiNames.size != blockIds.size || apiNames.size != bitIndices.size) return
+        try { nativeSetAchievementBlockBits(apiNames, blockIds, bitIndices) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setStatIds(names: Array<String>, ids: IntArray) {
+        if (!loaded) return
+        if (names.size != ids.size) return
+        try { nativeSetStatIds(names, ids) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun addAchievementLocale(apiName: String, locale: String,
+                             displayName: String?, description: String?) {
+        if (!loaded || apiName.isEmpty() || locale.isEmpty()) return
+        if (displayName.isNullOrEmpty() && description.isNullOrEmpty()) return
+        try {
+            nativeAddAchievementLocale(apiName, locale,
+                displayName.orEmpty(), description.orEmpty())
+        } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setStatInt(name: String, value: Int) {
+        if (!loaded || name.isEmpty()) return
+        try { nativeSetStatInt(name, value) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setStatFloat(name: String, value: Float) {
+        if (!loaded || name.isEmpty()) return
+        try { nativeSetStatFloat(name, value) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    @JvmStatic private external fun nativeSetSteamId(steamId64: Long)
+    @JvmStatic private external fun nativeSetLoggedOn(loggedOn: Boolean)
+    @JvmStatic private external fun nativeSetPersonaName(name: String)
+    @JvmStatic private external fun nativeSetPersonaState(state: Int)
+    @JvmStatic private external fun nativeSetAppId(appId: Int)
+    @JvmStatic private external fun nativeSetIPCountry(country: String)
+    @JvmStatic private external fun nativeSetUiLanguage(language: String)
+    @JvmStatic private external fun nativeSetOwnedApps(appIds: IntArray)
+    @JvmStatic private external fun nativeSetInstalledApps(appIds: IntArray)
+    @JvmStatic private external fun nativeSetAppInstallDir(appId: Int, dir: String)
+    @JvmStatic private external fun nativeSetAppDlcs(
+        parentAppId: Int, dlcAppIds: IntArray, dlcNames: Array<String>,
+        available: BooleanArray)
+    @JvmStatic private external fun nativeSetAppInstalledDepots(appId: Int, depotIds: IntArray?)
+    @JvmStatic private external fun nativeSetAppWorkshopItems(
+        appId: Int,
+        publishedFileIds: LongArray,
+        installDirs: Array<String>,
+        sizesBytes: LongArray,
+        timestamps: LongArray,
+    )
+    @JvmStatic private external fun nativeSetInventoryItemDefs(
+        appId: Int,
+        defIds: IntArray,
+        propCountsPerDef: IntArray,
+        propKeys: Array<String>,
+        propVals: Array<String>,
+    )
+    @JvmStatic private external fun nativeSetAppNames(appIds: IntArray, names: Array<String>)
+    @JvmStatic private external fun nativeSetAppBuildId(appId: Int, buildId: Int)
+    @JvmStatic private external fun nativeSetFriendsList(steamIds: LongArray)
+    @JvmStatic private external fun nativeSetFriendPersonaName(steamId64: Long, name: String)
+    @JvmStatic private external fun nativeSetFriendPersonaState(steamId64: Long, state: Int)
+    @JvmStatic private external fun nativeSetFriendGamePlayed(steamId64: Long, appId: Int)
+    @JvmStatic private external fun nativeSetServerRealTime(serverRealTimeUnix: Int)
+    @JvmStatic private external fun nativeReportLogonFailure(eresult: Int, stillRetrying: Boolean)
+    @JvmStatic private external fun nativeSetEncryptedAppTicket(appId: Int, body: ByteArray?, eresult: Int)
+    @JvmStatic private external fun nativeSetLaunchCommandLine(cli: String)
+    @JvmStatic private external fun nativeSetAppFamilyShared(familyShared: Boolean)
+    @JvmStatic private external fun nativeSetCloudEnabledForAccount(enabled: Boolean)
+    @JvmStatic private external fun nativeSetCloudEnabledForApp(enabled: Boolean)
+    @JvmStatic private external fun nativeSetCloudQuota(totalBytes: Long, availBytes: Long)
+    @JvmStatic private external fun nativeSetCloudFiles(
+        names: Array<String>, sizes: IntArray, timestamps: LongArray)
+    @JvmStatic private external fun nativeSetAchievementSchema(
+        apiNames: Array<String>, displayNames: Array<String>,
+        descriptions: Array<String>, icons: Array<String>, hidden: BooleanArray)
+    @JvmStatic private external fun nativeSetAchievementBlockBits(
+        apiNames: Array<String>, blockIds: IntArray, bitIndices: IntArray)
+    @JvmStatic private external fun nativeSetStatIds(names: Array<String>, ids: IntArray)
+    @JvmStatic private external fun nativeSetAchievementProgress(
+        apiName: String, achieved: Boolean, unlockTimeUnix: Int)
+    @JvmStatic private external fun nativeAddAchievementLocale(
+        apiName: String, locale: String, displayName: String, description: String)
+    @JvmStatic private external fun nativeSetStatInt(name: String, value: Int)
+    @JvmStatic private external fun nativeSetStatFloat(name: String, value: Float)
+    @JvmStatic external fun nativeDiagnosticAchievementCount(): Int
+    @JvmStatic external fun nativeDiagnosticCallbackDepth(): Int
+    @JvmStatic external fun nativeDiagnosticStoreStats(): Boolean
+    @JvmStatic external fun nativeDiagnosticSetAchievement(name: String): Boolean
+    @JvmStatic external fun nativeDiagnosticIndicateAchievementProgress(
+        name: String, current: Int, max: Int): Boolean
+    @JvmStatic external fun nativeSetFriendRichPresence(
+        steamId: Long, key: String, value: String?)
+    @JvmStatic external fun nativeDiagnosticSetRichPresence(
+        key: String, value: String?): Boolean
+    @JvmStatic external fun nativeDiagnosticClearRichPresence()
+    @JvmStatic external fun nativeDiagnosticRichPresenceKeyCount(steamId: Long): Int
+    @JvmStatic external fun nativeDiagnosticSetPersonaName(name: String): Long
+    @JvmStatic external fun nativeDiagnosticRequestUserInformation(steamId: Long, nameOnly: Boolean): Boolean
+    @JvmStatic external fun nativeDiagnosticRequestFriendRichPresence(steamId: Long)
+    @JvmStatic external fun nativeDiagnosticRequestUserInfoBulk(sids: LongArray, flags: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticGetCachedOwnershipTicket(
+        appId: Int, out: ByteArray?): Int
+    @JvmStatic external fun nativeDiagnosticInjectOwnershipTicket(
+        appId: Int, bytes: ByteArray): Boolean
+    @JvmStatic external fun nativeDiagnosticInjectLogonState(loggedOn: Boolean)
+    @JvmStatic external fun nativeDiagnosticInjectFriendsList(sids: LongArray?)
+    @JvmStatic external fun nativeDiagnosticInjectLicenseList(
+        packageIds: IntArray, ownerIds: IntArray?)
+    @JvmStatic external fun nativeDiagnosticGetLicenseOwner(packageId: Int): Int
+    @JvmStatic external fun nativeSetAppSourcePackages(
+        appId: Int, packageIds: IntArray?)
+    @JvmStatic external fun nativeDiagnosticGetEarliestPurchaseUnixTime(appId: Int): Int
+    @JvmStatic external fun nativeDiagnosticBIsSubscribedFromFreeWeekend(): Boolean
+    @JvmStatic external fun nativeDiagnosticBIsSubscribedFromFamilySharing(): Boolean
+    @JvmStatic external fun nativeDiagnosticGetAppOwner(): Long
+    @JvmStatic external fun nativeDiagnosticInjectTrialLicense(
+        packageId: Int, minuteLimit: Int, minutesUsed: Int)
+    @JvmStatic external fun nativeDiagnosticBIsTimedTrial(): Long
+    @JvmStatic external fun nativeDiagnosticBIsDlcInstalled(appId: Int): Boolean
+    @JvmStatic external fun nativeSetAppCurrentBeta(appId: Int, branch: String?)
+
+    fun setAppCurrentBeta(appId: Int, branch: String?) {
+        if (!loaded) return
+        try { nativeSetAppCurrentBeta(appId, branch) } catch (_: UnsatisfiedLinkError) {}
+    }
+    @JvmStatic external fun nativeDiagnosticGetCurrentBetaName(): String?
+    @JvmStatic external fun nativeSetAppDownloadProgress(
+        appId: Int, bytesDownloaded: Long, bytesTotal: Long)
+    @JvmStatic external fun nativeDiagnosticGetDlcDownloadProgress(appId: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticGetDlcDownloadProgressBytes(): Long
+    @JvmStatic external fun nativeDiagnosticGetDlcDownloadProgressTotal(): Long
+    @JvmStatic external fun nativeSetAppCloudRemoteDir(appId: Int, path: String?)
+    @JvmStatic external fun nativeDiagnosticCloudFileWrite(
+        name: String, data: ByteArray): Boolean
+    @JvmStatic external fun nativeDiagnosticCloudFileRead(
+        name: String, maxBytes: Int): ByteArray?
+    @JvmStatic external fun nativeDiagnosticCloudFileDelete(name: String): Boolean
+    @JvmStatic external fun nativeDiagnosticCloudFileWriteAsync(
+        name: String, data: ByteArray): Long
+    @JvmStatic external fun nativeDiagnosticCloudFileReadAsync(
+        name: String, offset: Int, cubToRead: Int): Long
+    @JvmStatic external fun nativeDiagnosticCloudFileReadAsyncComplete(
+        hCall: Long, cubToRead: Int): ByteArray?
+    @JvmStatic external fun nativeDiagnosticCloudStreamOpen(name: String): Long
+    @JvmStatic external fun nativeDiagnosticCloudStreamWriteChunk(
+        hStream: Long, data: ByteArray): Boolean
+    @JvmStatic external fun nativeDiagnosticCloudStreamClose(hStream: Long): Boolean
+    @JvmStatic external fun nativeDiagnosticCloudStreamCancel(hStream: Long): Boolean
+    @JvmStatic external fun nativeSetAppFlag(flagKind: Int, appId: Int, on: Boolean)
+    @JvmStatic external fun nativeDiagnosticAppsBool(slot: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticSetDlcContext(appId: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticCloudFileForget(name: String): Boolean
+    @JvmStatic external fun nativeDiagnosticCloudFilePersisted(name: String): Boolean
+    @JvmStatic external fun nativeSetAccountFlag(flagKind: Int, on: Boolean)
+    @JvmStatic external fun nativeDiagnosticUserBool(slot: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticSetDurationControl(state: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticGetUserDataFolder(): String?
+    @JvmStatic external fun nativeDiagnosticGetFriendRelationship(sid: Long): Int
+    @JvmStatic external fun nativeDiagnosticHasFriend(sid: Long, flags: Int): Boolean
+    @JvmStatic external fun nativeDiagnosticGetAuthTicketForWebApi(identity: String?): Long
+    @JvmStatic external fun nativeSetFriendSteamLevel(sid: Long, level: Int)
+    @JvmStatic external fun nativeIsAppMarkedCorrupt(appId: Int): Boolean
+    @JvmStatic external fun nativeClearAppCorruptFlag(appId: Int)
+    @JvmStatic external fun nativeDiagnosticUserHasLicense(sid: Long, appId: Int): Int
+    @JvmStatic external fun nativeDiagnosticMarkContentCorrupt(missingOnly: Boolean): Boolean
+    @JvmStatic external fun nativeDiagnosticGetFriendSteamLevel(sid: Long): Int
+    @JvmStatic external fun nativeSetSelfPlayerLevel(level: Int)
+    @JvmStatic external fun nativeSetSelfGameBadge(appId: Int, nSeries: Int, bFoil: Boolean, tier: Int)
+    @JvmStatic external fun nativeDiagnosticGetPlayerSteamLevel(): Int
+    @JvmStatic external fun nativeDiagnosticGetGameBadgeLevel(nSeries: Int, bFoil: Boolean): Int
+    @JvmStatic external fun nativeDiagnosticRequestStoreAuthURL(redirect: String?): Long
+    @JvmStatic external fun nativeDiagnosticGetMarketEligibility(): Long
+    @JvmStatic external fun nativeDiagnosticGetDurationControl(): Long
+    @JvmStatic external fun nativeDiagnosticCloudFileShare(name: String): Long
+    @JvmStatic external fun nativeDiagnosticAppsGetFileDetails(name: String): Long
+    @JvmStatic external fun nativeSetPlayerNickname(sid: Long, nickname: String?)
+    @JvmStatic external fun nativeDiagnosticGetPlayerNickname(sid: Long): String?
+    @JvmStatic external fun nativeDiagnosticCheckFileSignature(name: String?): Long
+    @JvmStatic external fun nativeGetPushedSteamId(): Long
+    @JvmStatic external fun nativeGetPushedPersonaName(): String
+    @JvmStatic external fun nativeGetPushedIpCountry(): String
+    @JvmStatic external fun nativeGetPushedPersonaState(): Int
+    @JvmStatic external fun nativeGetPushedLoggedOn(): Boolean
+    @JvmStatic external fun nativeGetPushedAppId(): Int
+    @JvmStatic external fun nativeGetPushedOwnedAppCount(): Int
+    @JvmStatic external fun nativeGetPushedInstalledAppCount(): Int
+    @JvmStatic external fun nativeGetPushedFriendCount(): Int
+    @JvmStatic external fun nativeGetPushedFirstFriend(): Long
+    @JvmStatic external fun nativeGetPushedUiLanguage(): String
+    @JvmStatic external fun nativeGetPushedServerRealTime(): Int
+    @JvmStatic external fun nativeGetPushedCloudFileCount(): Int
+    @JvmStatic external fun nativeGetPushedCloudEnabledAccount(): Boolean
+    @JvmStatic external fun nativeGetPushedCloudEnabledApp(): Boolean
+    @JvmStatic external fun nativeGetPushedEncryptedAppTicketSize(appId: Int): Int
+    @JvmStatic external fun nativeDiagnosticInjectAccountInfo(
+        twoFactor: Boolean, phoneVerified: Boolean,
+        phoneIdentifying: Boolean, phoneNeedsVerification: Boolean)
+    @JvmStatic external fun nativeDiagnosticUpdateAvgRateStat(
+        name: String, countThisSession: Float, sessionLength: Double): Float
+    @JvmStatic external fun nativeDiagnosticInjectPersonaEvent(
+        steamId: Long,
+        personaState: Int,
+        gameAppId: Int,
+        name: String?,
+        avatarHash: ByteArray?,
+        rpKeys: Array<String>?,
+        rpValues: Array<String>?,
+    )
+
+    @JvmStatic external fun nativeSetGameOverlayActive(active: Boolean)
+
+    fun setGameOverlayActive(active: Boolean) {
+        try { nativeSetGameOverlayActive(active) }
+        catch (_: UnsatisfiedLinkError) { /* .so not loaded yet */ }
+    }
+
+    @JvmStatic external fun nativePollOverlayRequest(): String?
+
+    fun pollOverlayRequest(): String? =
+        try { nativePollOverlayRequest() }
+        catch (_: UnsatisfiedLinkError) { null }
+
+    @JvmStatic external fun nativePushFriendAvatar(
+        steamId: Long, tier: Int, width: Int, height: Int, rgba: ByteArray): Int
+    @JvmStatic external fun nativeDiagnosticGetSmallAvatarSize(steamId: Long): Long
+    @JvmStatic external fun nativeDiagnosticGetTieredAvatarSize(steamId: Long, tier: Int): Long
+    @JvmStatic external fun nativeDiagnosticGetImageRGBA(handle: Int, out: ByteArray): Int
+
+    @JvmStatic external fun nativeSetFriendAvatarHash(steamId: Long, hash: ByteArray?)
+    @JvmStatic external fun nativeDiagnosticGetFriendAvatarHashHex(steamId: Long): String
+
+    @JvmStatic external fun nativeDiagnosticGetFriendPersonaState(steamId: Long): Int
+
+    fun setFriendAvatarHash(steamId: Long, hash: ByteArray?) {
+        try { nativeSetFriendAvatarHash(steamId, hash) }
+        catch (_: UnsatisfiedLinkError) { /* .so not loaded yet */ }
+    }
+
+    fun setFriendRichPresence(steamId: Long, key: String, value: String?) {
+        try {
+            nativeSetFriendRichPresence(steamId, key, value)
+        } catch (_: UnsatisfiedLinkError) { /* .so not loaded yet */ }
+    }
+    @JvmStatic external fun nativeDiagnosticRegisterAndDrain(iCallback: Int): Int
+    @JvmStatic external fun nativeDiagnosticPushAndDrainCallResult(callbackId: Int, eresult: Int): Long
+    @JvmStatic external fun nativeDiagnosticGetAuthTicket(buf: ByteArray): Int
+    @JvmStatic external fun nativeDiagnosticRequestEncryptedAppTicket(outBody: ByteArray): Long
+    @JvmStatic external fun nativeDiagnosticUtilsGetAPICallResult(callbackId: Int, eresult: Int): Int
+    @JvmStatic external fun nativeDiagnosticTcpAccepted(): Int
+    @JvmStatic external fun nativeDiagnosticShutdownPipe(): Boolean
+
+    fun shutdownPipe(): Boolean =
+        if (!loaded) false
+        else try { nativeDiagnosticShutdownPipe() } catch (_: UnsatisfiedLinkError) { false }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnLibraryModels.kt b/app/src/main/feature/stores/steam/wnsteam/WnLibraryModels.kt
new file mode 100644
index 000000000..4443d774f
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnLibraryModels.kt
@@ -0,0 +1,46 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Mirror of the native `OwnedPackage` struct — one of the user's Steam
+ * licenses (subscription/package). [accessToken] is encoded as decimal
+ * string since it's a uint64 and JSON has no native unsigned 64-bit type.
+ */
+data class WnOwnedPackage(
+    val id: Int,
+    val licenseFlags: Int,
+    val licenseType: Int,
+    val changeNumber: Int,
+    val accessToken: String,
+)
+
+/**
+ * Mirror of the native `OwnedApp` struct. Only apps with at least one
+ * source package are included in [WnLibrarySnapshot.ownedApps]; parent
+ * stubs (apps known only because the user owns DLC of them) are
+ * excluded.
+ */
+data class WnOwnedApp(
+    val id: Int,
+    val name: String,
+    val type: String,
+    val sortAs: String,
+    val osList: String,
+    val parentAppId: Int,
+    val changeNumber: Int,
+    val accessToken: String,
+    val dlcAppIds: List<Int>,
+    val sourcePackageIds: List<Int>,
+    val buildId: Int = 0,
+)
+
+/** Full snapshot of the native library store. */
+data class WnLibrarySnapshot(
+    val packages: List<WnOwnedPackage>,
+    val ownedApps: List<WnOwnedApp>,
+    val allAppsCount: Int,
+    val ownedAppsCount: Int,
+) {
+    companion object {
+        val EMPTY = WnLibrarySnapshot(emptyList(), emptyList(), 0, 0)
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnLibraryObserver.kt b/app/src/main/feature/stores/steam/wnsteam/WnLibraryObserver.kt
new file mode 100644
index 000000000..0d3647ab8
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnLibraryObserver.kt
@@ -0,0 +1,11 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Fired by [WnSteamSession]'s native library store whenever its snapshot
+ * changes (new license list ingested, PICS packages parsed, PICS apps
+ * parsed, access tokens granted). Invoked on a native worker thread —
+ * marshal to your own dispatcher and re-read the snapshot before touching UI.
+ */
+fun interface WnLibraryObserver {
+    fun onLibraryChanged()
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnLibraryStore.kt b/app/src/main/feature/stores/steam/wnsteam/WnLibraryStore.kt
new file mode 100644
index 000000000..bc0309cbc
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnLibraryStore.kt
@@ -0,0 +1,166 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Kotlin facade over the native [WnSteamSession]'s library store. Holds the
+ * latest [WnLibrarySnapshot] and exposes a [SharedFlow] that re-emits each
+ * time the native side fires its observer. Parsing happens on the
+ * dispatcher of whoever calls [refresh] — typically a background coroutine.
+ *
+ * Usage:
+ *   val library = WnLibraryStore(session)
+ *   library.startObserving()           // hooks up native observer
+ *   library.snapshots.collect { snap -> /* render UI */ }
+ *
+ * Native callbacks can arrive in bursts while the PICS crawler fills the
+ * store, so observer-driven refreshes are coalesced. The initial snapshot
+ * remains immediate.
+ */
+class WnLibraryStore(private val session: WnSteamSession) {
+
+    private val _snapshots =
+        MutableSharedFlow<WnLibrarySnapshot>(
+            replay = 1,
+            extraBufferCapacity = 1,
+            onBufferOverflow = BufferOverflow.DROP_OLDEST,
+        )
+
+    /** Hot flow of library snapshots. Latest value is replayed to new collectors. */
+    val snapshots: SharedFlow<WnLibrarySnapshot> = _snapshots.asSharedFlow()
+
+    private val refreshScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private val refreshScheduled = AtomicBoolean(false)
+    private val refreshLock = Any()
+    private val scheduleLock = Any()
+    private var refreshJob: Job? = null
+    @Volatile private var observing = false
+
+    private val nativeObserver = WnLibraryObserver { scheduleRefresh() }
+
+    /** Last snapshot — synchronous accessor for callers that can't suspend. */
+    @Volatile var current: WnLibrarySnapshot = WnLibrarySnapshot.EMPTY
+        private set
+
+    /** Wire the native observer and emit the initial snapshot. */
+    fun startObserving() {
+        synchronized(scheduleLock) {
+            observing = true
+        }
+        session.setLibraryObserver(nativeObserver)
+        refresh()
+    }
+
+    fun stopObserving() {
+        val pending = synchronized(scheduleLock) {
+            observing = false
+            refreshScheduled.set(false)
+            refreshJob.also { refreshJob = null }
+        }
+        pending?.cancel()
+        session.setLibraryObserver(null)
+        synchronized(refreshLock) {
+            // Barrier: if a delayed refresh is already inside native snapshot
+            // collection, wait for it before callers close the native handle.
+        }
+    }
+
+    private fun scheduleRefresh() {
+        synchronized(scheduleLock) {
+            if (!observing) return
+            if (!refreshScheduled.compareAndSet(false, true)) return
+            refreshJob = refreshScope.launch {
+                val thisJob = coroutineContext[Job]
+                try {
+                    delay(250L)
+                    if (observing) refresh()
+                } finally {
+                    synchronized(scheduleLock) {
+                        if (refreshJob === thisJob) {
+                            refreshScheduled.set(false)
+                            refreshJob = null
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /** Read + parse a fresh snapshot from native and emit it. */
+    fun refresh() {
+        synchronized(refreshLock) {
+            if (!observing) return
+            val json = session.getLibrarySnapshotJson()
+            val parsed = runCatching { parseSnapshot(json) }
+                .onFailure { Timber.tag(TAG).w(it, "snapshot parse failed; json=%s",
+                                                json.take(200)) }
+                .getOrDefault(WnLibrarySnapshot.EMPTY)
+            current = parsed
+            _snapshots.tryEmit(parsed)
+        }
+    }
+
+    companion object {
+        private const val TAG = "WnLibraryStore"
+
+        @JvmStatic
+        fun parseSnapshot(json: String): WnLibrarySnapshot {
+            if (json.isBlank() || json == "{}") return WnLibrarySnapshot.EMPTY
+            val root = JSONObject(json)
+            val packages = root.optJSONArray("packages")?.let { arr ->
+                List(arr.length()) { i ->
+                    val o = arr.getJSONObject(i)
+                    WnOwnedPackage(
+                        id           = o.getInt("id"),
+                        licenseFlags = o.optInt("flags"),
+                        licenseType  = o.optInt("license_type"),
+                        changeNumber = o.optInt("change_number"),
+                        accessToken  = o.optString("access_token", "0"),
+                    )
+                }
+            } ?: emptyList()
+            val ownedApps = root.optJSONArray("owned_apps")?.let { arr ->
+                List(arr.length()) { i ->
+                    val o = arr.getJSONObject(i)
+                    WnOwnedApp(
+                        id               = o.getInt("id"),
+                        name             = o.optString("name"),
+                        type             = o.optString("type"),
+                        sortAs           = o.optString("sort_as"),
+                        osList           = o.optString("os_list"),
+                        parentAppId      = o.optInt("parent"),
+                        changeNumber     = o.optInt("change_number"),
+                        accessToken      = o.optString("access_token", "0"),
+                        dlcAppIds        = o.optJSONArray("dlc").toIntList(),
+                        sourcePackageIds = o.optJSONArray("src_packages").toIntList(),
+                        buildId          = o.optInt("build_id", 0),
+                    )
+                }
+            } ?: emptyList()
+            return WnLibrarySnapshot(
+                packages       = packages,
+                ownedApps      = ownedApps,
+                allAppsCount   = root.optInt("all_apps_count"),
+                ownedAppsCount = root.optInt("owned_apps_count"),
+            )
+        }
+
+        private fun JSONArray?.toIntList(): List<Int> {
+            if (this == null) return emptyList()
+            return List(length()) { i -> getInt(i) }
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnPrepareAppCallback.kt b/app/src/main/feature/stores/steam/wnsteam/WnPrepareAppCallback.kt
new file mode 100644
index 000000000..a91ae709b
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnPrepareAppCallback.kt
@@ -0,0 +1,12 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Fired by [WnSteamSession.prepareApp] when the pre-warm finishes. Called on
+ * a native worker thread — marshal to your own dispatcher before touching UI.
+ *
+ * @param ok    true if all requested apps are cached and ready for Wine.
+ * @param error empty when ok=true; otherwise a short diagnostic string.
+ */
+fun interface WnPrepareAppCallback {
+    fun onPrepareResult(ok: Boolean, error: String)
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnQrCallback.kt b/app/src/main/feature/stores/steam/wnsteam/WnQrCallback.kt
new file mode 100644
index 000000000..bb12552c3
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnQrCallback.kt
@@ -0,0 +1,9 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Fires whenever the QR auth flow has a new challenge URL to render.
+ * Steam rotates the URL every ~30 s; re-render the QR each time.
+ */
+fun interface WnQrCallback {
+    fun onQrChallengeUrl(url: String)
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnSteamAssetsInstaller.kt b/app/src/main/feature/stores/steam/wnsteam/WnSteamAssetsInstaller.kt
new file mode 100644
index 000000000..5172d24ef
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnSteamAssetsInstaller.kt
@@ -0,0 +1,630 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import android.content.Context
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.shared.io.TarCompressorUtils
+import timber.log.Timber
+import java.io.File
+
+// Installs bundled Steam IPC assets into the imagefs and Wine prefix.
+object WnSteamAssetsInstaller {
+
+    private const val TAG = "WnSteamAssets"
+
+    private const val ASSET_DIR     = "wnsteam"
+    private const val STEAM_TZST    = "steam-androidarm64.tzst"
+    private const val LSC_ARM64EC   = "lsteamclient-arm64ec.tzst"
+    private const val LSC_X86_64    = "lsteamclient-x86_64.tzst"
+    private const val STEAMPIPE_API64 = "wnsteam/steampipe/steam_api64.dll"
+    private const val STEAMPIPE_API32 = "wnsteam/steampipe/steam_api.dll"
+    private const val VALVE_STEAM_X64 = "valve-steam-x86_64.tzst"
+    private const val STEAMPIPE_ORIGINAL_API64 = "wnsteam/steampipe/original_steam_api64.dll"
+
+    fun isSupportedFor(container: Container): Boolean =
+        lsteamclientArchive(container) != null
+
+    fun installBionicRuntime(context: Context): Boolean {
+        val imageFs = ImageFs.find(context)
+        val apkId = apkStamp(context)
+        val steamStamp = File(imageFs.libDir, ".wnsteam-androidarm64.stamp")
+        if (stampStale(steamStamp, apkId)) {
+            Timber.tag(TAG).i("Installing $STEAM_TZST → ${imageFs.rootDir} (apk=$apkId)")
+            val ok = TarCompressorUtils.extract(
+                TarCompressorUtils.Type.ZSTD,
+                context,
+                "$ASSET_DIR/$STEAM_TZST",
+                imageFs.rootDir,
+            )
+            if (!ok) {
+                Timber.tag(TAG).e("Failed to extract $STEAM_TZST")
+                return false
+            }
+            steamStamp.writeText(apkId)
+        }
+        stageBridgeLibsteamclient(context, imageFs)
+        return true
+    }
+
+    @Suppress("DEPRECATION")
+    private fun apkStamp(context: Context): String {
+        return try {
+            val pi = context.packageManager.getPackageInfo(context.packageName, 0)
+            "apk-u${pi.lastUpdateTime}"
+        } catch (e: Exception) {
+            Timber.tag(TAG).w(e, "apkStamp: package info unavailable; forcing re-stage")
+            "apk-unknown-${System.currentTimeMillis()}"
+        }
+    }
+
+    private fun stampStale(stamp: File, apkId: String): Boolean {
+        return try {
+            !stamp.exists() || stamp.readText().trim() != apkId
+        } catch (_: Exception) {
+            true
+        }
+    }
+
+    fun install(context: Context, container: Container): Boolean {
+        if (!installBionicRuntime(context)) return false
+        val imageFs = ImageFs.find(context)
+
+        // Wine-side bridge: arm64ec or x86_64 lsteamclient.dll.
+        val lscArchive = lsteamclientArchive(container)
+        if (lscArchive == null) {
+            Timber.tag(TAG).w(
+                "No lsteamclient archive for wineVersion=%s; skipping Wine bridge install",
+                container.wineVersion,
+            )
+            return true
+        }
+        val apkId = apkStamp(context)
+        val wineStamp = File(imageFs.libDir, ".wnsteam-${lscArchive}.stamp")
+        if (!stampStale(wineStamp, apkId)) return true
+
+        // Stage per-arch files, then copy DLLs into the prefix.
+        val stagingRoot = File(imageFs.tmpDir, "wnsteam-stage").apply {
+            deleteRecursively(); mkdirs()
+        }
+        Timber.tag(TAG).i("Installing $lscArchive → $stagingRoot")
+        val staged = TarCompressorUtils.extract(
+            TarCompressorUtils.Type.ZSTD,
+            context,
+            "$ASSET_DIR/$lscArchive",
+            stagingRoot,
+        )
+        if (!staged) {
+            Timber.tag(TAG).e("Failed to extract $lscArchive")
+            return false
+        }
+
+        val isArm64ec = lscArchive == LSC_ARM64EC
+        val winNative = if (isArm64ec) "aarch64-windows" else "x86_64-windows"
+        val unixSide  = if (isArm64ec) "aarch64-unix"    else "x86_64-unix"
+
+        val system32 = File(imageFs.wineprefix, "drive_c/windows/system32").apply { mkdirs() }
+        val syswow64 = File(imageFs.wineprefix, "drive_c/windows/syswow64").apply { mkdirs() }
+
+        val systemSrc = File(stagingRoot, "$winNative/lsteamclient.dll")
+        val syswowSrc = File(stagingRoot, "i386-windows/lsteamclient.dll")
+        if (!systemSrc.exists() || !syswowSrc.exists()) {
+            Timber.tag(TAG).e("Staged lsteamclient.dlls missing in $stagingRoot")
+            return false
+        }
+        systemSrc.copyTo(File(system32, "lsteamclient.dll"), overwrite = true)
+        syswowSrc.copyTo(File(syswow64, "lsteamclient.dll"), overwrite = true)
+
+        // Drop the Unix .so where Wine's loader already expects it.
+        val unixSoSrc = File(stagingRoot, "$unixSide/lsteamclient.so")
+        if (unixSoSrc.exists()) {
+            val unixSoDest = File(imageFs.libDir, "wine/$unixSide/lsteamclient.so").apply {
+                parentFile?.mkdirs()
+            }
+            unixSoSrc.copyTo(unixSoDest, overwrite = true)
+            patchLsteamclientLibPath(unixSoDest, context)
+        }
+
+        stagingRoot.deleteRecursively()
+        wineStamp.writeText(apkId)
+        Timber.tag(TAG).i("Wine bridge installed (variant=$lscArchive, apk=$apkId)")
+        return true
+    }
+
+    fun bridgeLibPath(context: Context): File =
+        File(context.filesDir, "libsteamclient.so")
+
+    fun installPlanWSteamService(context: Context, container: Container): Boolean {
+        val exeAsset    = "$ASSET_DIR/bionic/steamservice.exe"
+        val dllAsset    = "$ASSET_DIR/bionic/steamservice.dll"
+        val curVdfAsset = "$ASSET_DIR/bionic/service_current_versions.vdf"
+        val minVdfAsset = "$ASSET_DIR/bionic/service_minimum_versions.vdf"
+        val exePresent = try { context.assets.open(exeAsset).close(); true } catch (_: Exception) { false }
+        if (!exePresent) {
+            Timber.tag(TAG).i("planW: steamservice.exe asset not bundled — "
+                + "LaunchApp will fall back to CreateProcess inside the launcher")
+            return false
+        }
+        val steamDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
+        val binDir = File(steamDir, "bin").apply { mkdirs() }
+
+        val apkId = apkStamp(context)
+        val stageStamp = File(binDir, ".wn-planw-service.stamp")
+        val exeFile    = File(binDir, "steamservice.exe")
+        val dllFile    = File(binDir, "steamservice.dll")
+        val curVdfFile = File(binDir, "service_current_versions.vdf")
+        val minVdfFile = File(binDir, "service_minimum_versions.vdf")
+        if (!stampStale(stageStamp, apkId)
+            && exeFile.isFile && exeFile.length() > 0
+            && dllFile.isFile && dllFile.length() > 0
+            && curVdfFile.isFile && curVdfFile.length() > 0
+            && minVdfFile.isFile && minVdfFile.length() > 0) {
+            Timber.tag(TAG).d("planW: steamservice bundle already staged (apk=%s) — skipping per-launch copy", apkId)
+            return true
+        }
+
+        fun stage(asset: String, dstFile: File): Boolean {
+            val present = try { context.assets.open(asset).close(); true } catch (_: Exception) { false }
+            if (!present) return false
+            return try {
+                context.assets.open(asset).use { input ->
+                    dstFile.outputStream().use { output -> input.copyTo(output) }
+                }
+                Timber.tag(TAG).i("planW: staged %s (%d bytes) at %s",
+                    dstFile.name, dstFile.length(), dstFile.absolutePath)
+                true
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "planW: failed to stage %s", dstFile.name)
+                false
+            }
+        }
+
+        return try {
+            val exeOk    = stage(exeAsset,    exeFile)
+            val dllOk    = stage(dllAsset,    dllFile)
+            val curVdfOk = stage(curVdfAsset, curVdfFile)
+            val minVdfOk = stage(minVdfAsset, minVdfFile)
+            Timber.tag(TAG).i("planW: steamservice bundle staged exe=%b dll=%b curVdf=%b minVdf=%b",
+                exeOk, dllOk, curVdfOk, minVdfOk)
+            // Stamp only when the full bundle is on disk — a partial copy must
+            // re-run next launch, never get locked in by a fresh stamp.
+            if (exeOk && dllOk && curVdfOk && minVdfOk) {
+                try { stageStamp.writeText(apkId) } catch (_: Exception) {}
+            }
+            exeOk
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "planW: failed to stage steamservice bundle")
+            false
+        }
+    }
+
+    fun ensureRealSteamDir(context: Context, container: Container) {
+        val imageFs = ImageFs.find(context)
+        val steamDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
+        val steamPath = steamDir.toPath()
+        val sharedSteam = File(imageFs.rootDir, ".shared/steam-client-store")
+
+        val isLink = try {
+            java.nio.file.Files.isSymbolicLink(steamPath)
+        } catch (_: Exception) { false }
+        if (isLink) {
+            try {
+                java.nio.file.Files.delete(steamPath)
+                Timber.tag(TAG).i("ensureRealSteamDir: removed Steam-dir symlink at %s",
+                    steamDir.absolutePath)
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "ensureRealSteamDir: failed to delete Steam-dir symlink")
+                return
+            }
+        }
+        steamDir.mkdirs()
+
+        val sharedUserdata = File(sharedSteam, "userdata")
+        if (!sharedUserdata.isDirectory) return
+        val realUserdata = File(steamDir, "userdata").apply { mkdirs() }
+        var rescuedFiles = 0
+        var rescuedApps = 0
+        sharedUserdata.listFiles()?.forEach { accountDir ->
+            if (!accountDir.isDirectory) return@forEach
+            accountDir.listFiles()?.forEach { appDir ->
+                if (!appDir.isDirectory) return@forEach
+                val appIdName = appDir.name
+                if (appIdName == "7" || appIdName == "config") return@forEach
+                if (!appIdName.all { it.isDigit() }) return@forEach
+                val destAccountDir = File(realUserdata, accountDir.name)
+                val destAppDir = File(destAccountDir, appIdName)
+                val destAlreadyPopulated = destAppDir.isDirectory &&
+                    destAppDir.walkTopDown().filter { it.isFile }.any()
+                if (destAlreadyPopulated) return@forEach
+                try {
+                    appDir.copyRecursively(destAppDir, overwrite = true)
+                    val n = destAppDir.walkTopDown().filter { it.isFile }.count()
+                    rescuedFiles += n
+                    rescuedApps += 1
+                    Timber.tag(TAG).i(
+                        "ensureRealSteamDir: rescued %d file(s) for app %s from shared store",
+                        n, appIdName)
+                } catch (e: Exception) {
+                    Timber.tag(TAG).e(e,
+                        "ensureRealSteamDir: failed to rescue userdata for app %s", appIdName)
+                }
+            }
+        }
+        if (rescuedApps > 0) {
+            Timber.tag(TAG).i(
+                "ensureRealSteamDir: rescued userdata for %d app(s), %d total file(s)",
+                rescuedApps, rescuedFiles)
+        }
+    }
+
+    fun installSteamclientBridgeIntoContainer(context: Context, container: Container): Boolean {
+        val archive = lsteamclientArchive(container)
+        if (archive == null) {
+            Timber.tag(TAG).w("bridge: no lsteamclient archive for wineVersion=%s",
+                container.wineVersion)
+            return false
+        }
+        val imageFs = ImageFs.find(context)
+        val staging = File(imageFs.tmpDir, "wnsteam-bridge-stage").apply {
+            deleteRecursively(); mkdirs()
+        }
+        val ok = TarCompressorUtils.extract(
+            TarCompressorUtils.Type.ZSTD, context, "$ASSET_DIR/$archive", staging)
+        if (!ok) {
+            Timber.tag(TAG).e("bridge: failed to extract $archive")
+            staging.deleteRecursively()
+            return false
+        }
+        val isArm64ec = archive == LSC_ARM64EC
+        val winNative = if (isArm64ec) "aarch64-windows" else "x86_64-windows"
+        val unixSide = if (isArm64ec) "aarch64-unix" else "x86_64-unix"
+        val system32 = File(container.rootDir, ".wine/drive_c/windows/system32")
+            .apply { mkdirs() }
+        val syswow64 = File(container.rootDir, ".wine/drive_c/windows/syswow64")
+            .apply { mkdirs() }
+        var placed64 = false
+        val src64 = File(staging, "$winNative/lsteamclient.dll")
+        val src32 = File(staging, "i386-windows/lsteamclient.dll")
+        if (src64.exists()) {
+            src64.copyTo(File(system32, "lsteamclient.dll"), overwrite = true)
+            placed64 = true
+        }
+        if (src32.exists()) {
+            src32.copyTo(File(syswow64, "lsteamclient.dll"), overwrite = true)
+        }
+        val unixSo = File(staging, "$unixSide/lsteamclient.so")
+        if (unixSo.exists()) {
+            val dest = File(imageFs.libDir, "wine/$unixSide/lsteamclient.so")
+                .apply { parentFile?.mkdirs() }
+            unixSo.copyTo(dest, overwrite = true)
+            patchLsteamclientLibPath(dest, context)
+        }
+        staging.deleteRecursively()
+        Timber.tag(TAG).i("bridge: lsteamclient.dll → %s (64=%b src32=%b)",
+            system32.absolutePath, placed64, src32.exists())
+        return placed64
+    }
+
+    fun installPlanWValveSteam(context: Context, container: Container): Boolean {
+        val steamDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
+        ensureRealSteamDir(context, container)
+        val apkId = apkStamp(context)
+        val cache = File(context.filesDir, "wnsteam-planw-cache")
+        val cacheStamp = File(cache, ".planw-valve-steam.stamp")
+        if (stampStale(cacheStamp, apkId)) {
+            Timber.tag(TAG).i("planW: Valve Steam cache stale (apk=%s) — re-extracting %s",
+                apkId, VALVE_STEAM_X64)
+            cache.deleteRecursively(); cache.mkdirs()
+            val ok = TarCompressorUtils.extract(
+                TarCompressorUtils.Type.ZSTD, context,
+                "$ASSET_DIR/bionic/$VALVE_STEAM_X64", cache)
+            if (!ok) {
+                Timber.tag(TAG).e("planW: failed to extract %s into cache", VALVE_STEAM_X64)
+                cache.deleteRecursively()
+                return false
+            }
+            try { cacheStamp.writeText(apkId) } catch (_: Exception) {}
+            Timber.tag(TAG).i("planW: cached Valve Steam DLLs at %s (%d entries)",
+                cache.absolutePath, cache.listFiles()?.size ?: 0)
+        }
+
+        val stageStamp = File(steamDir, ".wn-planw-stage.stamp")
+        val cachedSc64 = File(cache, "steamclient64.dll")
+        val deployedSc64 = File(steamDir, "steamclient64.dll")
+        val sys32Tier0 = File(container.rootDir,
+            ".wine/drive_c/windows/system32/tier0_s64.dll")
+        if (!stampStale(stageStamp, apkId)
+            && cachedSc64.isFile && deployedSc64.isFile
+            && cachedSc64.length() == deployedSc64.length()
+            && sys32Tier0.isFile) {
+            Timber.tag(TAG).d("planW: Steam dir already staged (apk=%s, sc64=%d bytes) — skipping per-launch copy",
+                apkId, deployedSc64.length())
+            return true
+        }
+
+        var copied = 0
+        cache.listFiles()?.forEach { src ->
+            if (!src.isFile || src.name.startsWith(".")) return@forEach
+            val dst = File(steamDir, src.name)
+            try {
+                src.copyTo(dst, overwrite = true)
+                copied++
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "planW: copy %s -> %s failed", src.name, dst.absolutePath)
+            }
+        }
+        Timber.tag(TAG).i("planW: staged %d Valve Steam DLLs into %s (from cache)",
+            copied, steamDir.absolutePath)
+
+        val system32 = File(container.rootDir, ".wine/drive_c/windows/system32")
+            .apply { mkdirs() }
+        val syswow64 = File(container.rootDir, ".wine/drive_c/windows/syswow64")
+        var depCopied = 0
+        for (dep in arrayOf("tier0_s64.dll", "vstdlib_s64.dll")) {
+            val src = File(steamDir, dep)
+            if (src.isFile) {
+                try {
+                    src.copyTo(File(system32, dep), overwrite = true); depCopied++
+                } catch (e: Exception) {
+                    Timber.tag(TAG).e(e, "planW: copy %s -> system32 failed", dep)
+                }
+            }
+        }
+        if (syswow64.isDirectory) {
+            for (dep in arrayOf("tier0_s.dll", "vstdlib_s.dll")) {
+                val src = File(steamDir, dep)
+                if (src.isFile) {
+                    try { src.copyTo(File(syswow64, dep), overwrite = true) }
+                    catch (e: Exception) {
+                        Timber.tag(TAG).e(e, "planW: copy %s -> syswow64 failed", dep)
+                    }
+                }
+            }
+        }
+        Timber.tag(TAG).i("planW: staged %d tier0/vstdlib dep(s) into system32", depCopied)
+
+        if (copied >= 5) {
+            try { stageStamp.writeText(apkId) } catch (_: Exception) {}
+        }
+        return copied >= 5  // steamclient64 + Steam + Steam2 + tier0 + vstdlib (at minimum)
+    }
+
+    fun installPlanWLauncher(context: Context, container: Container): Boolean {
+        // Write THROUGH the Steam dir whether it's a real dir or a symlink to
+        // the shared backing store at <imageFs>/.shared/steam-client-store.
+        // Deleting the symlink (an earlier attempt) stranded the Valve DLLs
+        // there because updateSteamDirectoryVisibility re-creates the symlink
+        // each launch — without that link, steamclient64.dll is invisible to
+        // the launcher and LoadLibrary fails with GLE=126.
+        val steamDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
+        steamDir.mkdirs()
+        val dst = File(steamDir, "steam.exe")
+        File(steamDir, "wn-steam-launcher.exe").let { if (it.exists()) it.delete() }
+
+        val apkId = apkStamp(context)
+        val stageStamp = File(steamDir, ".wn-planw-launcher.stamp")
+        val staged = !stampStale(stageStamp, apkId) && dst.isFile && dst.length() > 0
+        val ok: Boolean
+        if (staged) {
+            Timber.tag(TAG).d("planW: steam.exe already staged (apk=%s, %d bytes) — skipping per-launch copy",
+                apkId, dst.length())
+            ok = true
+        } else {
+            if (dst.exists()) { try { dst.delete() } catch (_: Exception) {} }
+            ok = try {
+                context.assets.open("$ASSET_DIR/bionic/steam.exe").use { input ->
+                    dst.outputStream().use { output -> input.copyTo(output) }
+                }
+                Timber.tag(TAG).i("planW: installed steam.exe (%d bytes) at %s",
+                    dst.length(), dst.absolutePath)
+                true
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "planW: failed to install steam.exe")
+                false
+            }
+            if (ok) {
+                try { stageStamp.writeText(apkId) } catch (_: Exception) {}
+            }
+        }
+        try {
+            val caSrc = File(context.filesDir, "wnsteam_cacert.pem")
+            if (caSrc.exists() && caSrc.length() > 0) {
+                val caDst = File(steamDir, "wnsteam_cacert.pem")
+                // Always copy: the CA bundle source can be refreshed outside
+                // APK updates (e.g., a CA-refresh routine), and a same-size
+                // content change would otherwise leave the launcher TLS-ing
+                // against a stale trust store. The file is small (~few KB);
+                // the per-launch copy cost is negligible.
+                caSrc.copyTo(caDst, overwrite = true)
+                Timber.tag(TAG).i("planW: staged CA bundle (%d bytes) at %s",
+                    caDst.length(), caDst.absolutePath)
+            } else {
+                Timber.tag(TAG).w("planW: %s missing — STEAM_SSL_CERT_FILE will be unset, "
+                    + "launcher CM logon may fail TLS", caSrc.absolutePath)
+            }
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "planW: CA bundle stage failed")
+        }
+        return ok
+    }
+
+    private fun stageBridgeLibsteamclient(context: Context, imageFs: ImageFs): Boolean {
+        val src = File(imageFs.rootDir, "usr/lib/libsteamclient.so")
+        if (!src.exists()) {
+            Timber.tag(TAG).w("stageBridge: %s missing — bridge lib not staged", src.absolutePath)
+            return false
+        }
+        val dest = bridgeLibPath(context)
+        val apkId = apkStamp(context)
+        val stamp = File(context.filesDir, ".wnsteam-bridge-lib.stamp")
+        if (dest.exists() && dest.length() == src.length() && !stampStale(stamp, apkId)) {
+            return true
+        }
+        return try {
+            src.copyTo(dest, overwrite = true)
+            stamp.writeText(apkId)
+            Timber.tag(TAG).i("stageBridge: libsteamclient.so → %s (%d bytes, apk=%s)",
+                dest.absolutePath, dest.length(), apkId)
+            true
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "stageBridge: copy failed")
+            false
+        }
+    }
+
+    private fun patchLsteamclientLibPath(soFile: File, context: Context) {
+        val marker = "/data/data/app.winnative/files/imagefs/usr/lib/libsteamclient.so"
+        val markerBytes = marker.toByteArray(Charsets.US_ASCII)
+        val targetBytes = bridgeLibPath(context).absolutePath.toByteArray(Charsets.US_ASCII)
+        if (targetBytes.size > markerBytes.size) {
+            Timber.tag(TAG).e("lsteamclient patch: target path %d bytes exceeds %d-byte field",
+                targetBytes.size, markerBytes.size)
+            return
+        }
+        val bytes = try {
+            soFile.readBytes()
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "lsteamclient patch: read failed")
+            return
+        }
+        var patched = 0
+        var i = 0
+        while (i <= bytes.size - markerBytes.size) {
+            var match = true
+            for (j in markerBytes.indices) {
+                if (bytes[i + j] != markerBytes[j]) { match = false; break }
+            }
+            if (match) {
+                for (j in markerBytes.indices) {
+                    bytes[i + j] = if (j < targetBytes.size) targetBytes[j] else 0
+                }
+                patched++
+                i += markerBytes.size
+            } else {
+                i++
+            }
+        }
+        if (patched == 0) {
+            Timber.tag(TAG).w("lsteamclient patch: marker path not found in %s — "
+                + "upstream asset may have changed; bridge will fail to find libsteamclient.so",
+                soFile.name)
+            return
+        }
+        try {
+            soFile.writeBytes(bytes)
+            Timber.tag(TAG).i("lsteamclient patch: redirected %d path occurrence(s) in %s → %s",
+                patched, soFile.name, String(targetBytes, Charsets.US_ASCII))
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "lsteamclient patch: write failed")
+        }
+    }
+
+    fun reset(context: Context) {
+        val imageFs = ImageFs.find(context)
+        listOf(
+            File(imageFs.libDir, ".wnsteam-androidarm64.stamp"),
+            File(imageFs.libDir, ".wnsteam-$LSC_ARM64EC.stamp"),
+            File(imageFs.libDir, ".wnsteam-$LSC_X86_64.stamp"),
+            File(context.filesDir, ".wnsteam-bridge-lib.stamp"),
+            File(context.filesDir, "wnsteam-planw-cache/.planw-valve-steam.stamp"),
+        ).forEach { if (it.exists()) it.delete() }
+    }
+
+    fun installSteampipeBridgeIntoApp(context: Context, gameInstallDir: File): Int {
+        if (!gameInstallDir.isDirectory) {
+            Timber.tag(TAG).w("steampipe: game dir missing: ${gameInstallDir.absolutePath}")
+            return 0
+        }
+        var swapped = 0
+        val assetCache = HashMap<String, ByteArray>()
+        fun bridgeBytes(asset: String): ByteArray =
+            assetCache.getOrPut(asset) {
+                context.assets.open(asset).use { it.readBytes() }
+            }
+
+        gameInstallDir.walkTopDown().maxDepth(10).forEach { f ->
+            if (!f.isFile) return@forEach
+            val n = f.name.lowercase()
+            if (n != "steam_api.dll" && n != "steam_api64.dll") return@forEach
+            val is64 = n == "steam_api64.dll"
+            val asset = if (is64) STEAMPIPE_API64 else STEAMPIPE_API32
+            val orig = File(f.parentFile, f.name + ".orig")
+            try {
+                if (!orig.exists()) {
+                    f.copyTo(orig, overwrite = false)
+                }
+                val bytes = bridgeBytes(asset)
+                if (!fileContentEquals(f, bytes)) {
+                    java.io.FileOutputStream(f).use { out -> out.write(bytes) }
+                    Timber.tag(TAG).i("steampipe: swapped ${f.path} (orig backed up as ${orig.name})")
+                    swapped++
+                } else {
+                    Timber.tag(TAG).d("steampipe: ${f.path} already matches bridge asset")
+                }
+
+                if (is64) {
+                    val backend = File(f.parentFile, "original_steam_api64.dll")
+                    try {
+                        val backendBytes = bridgeBytes(STEAMPIPE_ORIGINAL_API64)
+                        if (!fileContentEquals(backend, backendBytes)) {
+                            java.io.FileOutputStream(backend).use { out -> out.write(backendBytes) }
+                            Timber.tag(TAG).i("steampipe: staged ${backend.path} as forwarder backend")
+                        } else {
+                            Timber.tag(TAG).d("steampipe: ${backend.path} already staged")
+                        }
+                    } catch (e: Exception) {
+                        Timber.tag(TAG).e(e, "steampipe: backend stage failed for ${backend.path}")
+                    }
+                }
+            } catch (e: Exception) {
+                Timber.tag(TAG).e(e, "steampipe: swap failed for ${f.path}")
+            }
+        }
+        Timber.tag(TAG).i("steampipe: $swapped steam_api*.dll(s) swapped under ${gameInstallDir.absolutePath}")
+        return swapped
+    }
+
+    private fun fileContentEquals(file: File, expected: ByteArray): Boolean {
+        if (!file.isFile || file.length() != expected.size.toLong()) return false
+        return try {
+            var offset = 0
+            var matches = true
+            file.inputStream().use { input ->
+                val buf = ByteArray(8192)
+                while (matches) {
+                    val read = input.read(buf)
+                    if (read < 0) return@use
+                    if (offset + read > expected.size) {
+                        matches = false
+                        return@use
+                    }
+                    for (i in 0 until read) {
+                        if (buf[i] != expected[offset + i]) {
+                            matches = false
+                            return@use
+                        }
+                    }
+                    offset += read
+                }
+            }
+            matches && offset == expected.size
+        } catch (_: Exception) {
+            false
+        }
+    }
+
+    private fun lsteamclientArchive(container: Container): String? {
+        val prefixArch = container.getExtra("wineprefixArch", "").lowercase()
+        if (prefixArch.isNotBlank()) {
+            return when {
+                prefixArch.contains("arm64ec") || prefixArch.contains("aarch64") -> LSC_ARM64EC
+                prefixArch.contains("x86_64") || prefixArch.contains("win64") -> LSC_X86_64
+                else -> null
+            }
+        }
+        return when {
+            container.wineVersion?.contains("arm64ec", ignoreCase = true) == true -> LSC_ARM64EC
+            container.wineVersion?.contains("x86_64",  ignoreCase = true) == true -> LSC_X86_64
+            else -> null
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnSteamBootstrap.kt b/app/src/main/feature/stores/steam/wnsteam/WnSteamBootstrap.kt
new file mode 100644
index 000000000..8290b4c3a
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnSteamBootstrap.kt
@@ -0,0 +1,579 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import android.content.Context
+import android.util.Log
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import java.io.File
+
+// JNI facade that boots libsteamclient.so for Wine's lsteamclient.dll.
+object WnSteamBootstrap {
+
+    private const val TAG = "WnSteamBootstrap"
+
+    @Volatile private var initialized = false
+    @Volatile private var prewarmRan = false
+
+    init {
+        try {
+            System.loadLibrary("wnsteambootstrap")
+        } catch (t: UnsatisfiedLinkError) {
+            // Optional in some variants.
+            Log.w(TAG, "libwnsteambootstrap.so not found in jniLibs: ${t.message}")
+        }
+    }
+
+    /**
+     * Initialize libsteamclient.so. Returns 0 on success, or a negative error.
+     * [extraEnv] is applied before dlopen for module-init reads.
+     */
+    @Synchronized
+    fun start(
+        context: Context,
+        libPath: String,
+        home: String,
+        steam3Master: String,
+        steamClientService: String,
+        extraEnv: Array<String>,
+        accountName: String?,
+        refreshToken: String?,
+        steamId64: Long,
+        appId: Int = 0,
+    ): Int {
+        if (initialized) {
+            if (appId > 0) {
+                Log.i(
+                    TAG,
+                    "start: app-bound launch requested while bootstrap is live; forcing a clean restart (appId=$appId)",
+                )
+                stop()
+            } else {
+                Log.i(TAG, "start: already initialized")
+                return 0
+            }
+        }
+        val rc = try {
+            nativeInit(context, libPath, home, steam3Master, steamClientService,
+                       extraEnv, accountName, refreshToken, steamId64, appId)
+        } catch (t: UnsatisfiedLinkError) {
+            Log.w(TAG, "nativeInit unavailable: ${t.message}")
+            return -100
+        }
+        if (rc == 0) initialized = true
+        Log.i(TAG, "start rc=$rc initialized=$initialized appId=$appId")
+        return rc
+    }
+
+    fun prewarm(context: Context) {
+        if (prewarmRan || initialized) return
+        prewarmRan = true
+        val app = context.applicationContext
+        Thread({
+            try {
+                val account = PrefManager.username
+                val token = PrefManager.refreshToken
+                val steamId = PrefManager.steamUserSteamId64
+                if (account.isEmpty() || token.isEmpty() || steamId <= 0L) {
+                    Log.i(TAG, "prewarm: no Steam credentials yet; skipping")
+                    prewarmRan = false   // permit a retry once signed in
+                    return@Thread
+                }
+                if (!WnSteamAssetsInstaller.installBionicRuntime(app)) {
+                    Log.w(TAG, "prewarm: libsteamclient.so staging failed")
+                    prewarmRan = false
+                    return@Thread
+                }
+                val imageFs = ImageFs.find(app)
+                val libPath = File(imageFs.rootDir, "usr/lib/libsteamclient.so").absolutePath
+                val home = File(imageFs.rootDir, "home").absolutePath
+                val rc = start(
+                    app, libPath, home,
+                    "127.0.0.1:57343", "127.0.0.1:57344",
+                    emptyArray(), account, token, steamId,
+                    appId = 0,   // library/prewarm: no specific game bound
+                )
+                Log.i(TAG, "prewarm: bootstrap start rc=$rc (Steam client pre-warmed, appId=0)")
+            } catch (t: Throwable) {
+                Log.e(TAG, "prewarm failed", t)
+                prewarmRan = false
+            }
+        }, "WnSteamPrewarm").start()
+    }
+
+    @Synchronized
+    fun stop() {
+        if (!initialized) return
+        try { nativeShutdown() } catch (_: UnsatisfiedLinkError) {}
+        initialized = false
+        prewarmRan = false
+        Log.i(TAG, "stop done")
+    }
+
+    // Pre-warm libsteamclient.so's PICS cache for the game and DLC.
+    fun prepareApp(parentAppId: Int, dlcAppIds: IntArray) {
+        if (!initialized) return
+        val all = IntArray(1 + dlcAppIds.size).also {
+            it[0] = parentAppId
+            System.arraycopy(dlcAppIds, 0, it, 1, dlcAppIds.size)
+        }
+        try { nativePrepareApp(all) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun setCloudEnabled(appId: Int, enabled: Boolean) {
+        if (!initialized) return
+        try { nativeSetCloudEnabled(appId, enabled) } catch (_: UnsatisfiedLinkError) {}
+    }
+
+    // Whether libsteamclient.so reports a logged-on user.
+    fun isLoggedOn(): Boolean {
+        if (!initialized) return false
+        return try { nativeIsLoggedOn() } catch (_: UnsatisfiedLinkError) { false }
+    }
+
+    // SteamID64 from libsteamclient.so, or 0 when not logged on.
+    fun steamId(): Long {
+        if (!initialized) return 0
+        return try { nativeGetSteamId() } catch (_: UnsatisfiedLinkError) { 0L }
+    }
+
+    @JvmStatic private external fun nativeInit(
+        context: Context,
+        libPath: String,
+        home: String,
+        steam3Master: String,
+        steamClientService: String,
+        extraEnv: Array<String>,
+        accountName: String?,
+        refreshToken: String?,
+        steamId64: Long,
+        appId: Int,
+    ): Int
+    @JvmStatic private external fun nativeShutdown()
+    @JvmStatic private external fun nativePrepareApp(appIds: IntArray)
+    @JvmStatic private external fun nativeSetCloudEnabled(appId: Int, enabled: Boolean)
+    @JvmStatic private external fun nativeIsLoggedOn(): Boolean
+    @JvmStatic private external fun nativeGetSteamId(): Long
+    @JvmStatic private external fun nativeBIsSubscribedApp(appId: Int): Boolean
+    @JvmStatic private external fun nativeISteamAppsBIsAppInstalled(appId: Int): Boolean
+    @JvmStatic private external fun nativeISteamAppsGetAppInstallDir(appId: Int): String?
+    @JvmStatic private external fun nativeISteamAppsGetInstalledDepots(appId: Int): IntArray
+    @JvmStatic private external fun nativeISteamAppsGetCurrentGameLanguage(): String?
+    @JvmStatic private external fun nativeISteamAppsBIsDlcInstalled(dlcAppId: Int): Boolean
+    @JvmStatic private external fun nativeISteamAppsGetEarliestPurchaseUnixTime(appId: Int): Int
+    @JvmStatic private external fun nativeISteamAppsGetDLCCount(appId: Int): Int
+    @JvmStatic private external fun nativeISteamAppsGetAppOwner(): Long
+    @JvmStatic private external fun nativeISteamAppsBIsSubscribedFromFamilySharing(): Boolean
+    @JvmStatic private external fun nativeISteamAppsGetAppBuildId(): Int
+    @JvmStatic private external fun nativeISteamUserBLoggedOn(): Boolean
+    @JvmStatic private external fun nativeISteamUserHasLicenseForApp(steamId64: Long, appId: Int): Int
+    @JvmStatic private external fun nativeISteamUserGetSteamID(): Long
+    @JvmStatic private external fun nativeISteamUtilsGetAppID(): Int
+    @JvmStatic private external fun nativeISteamUtilsGetServerRealTime(): Int
+    @JvmStatic private external fun nativeISteamUtilsGetIPCountry(): String?
+    @JvmStatic private external fun nativeISteamUtilsGetSteamUILanguage(): String?
+    @JvmStatic private external fun nativeISteamUtilsGetCurrentBatteryPower(): Int
+    @JvmStatic private external fun nativeISteamUtilsGetImageSize(imageHandle: Int): IntArray
+    @JvmStatic private external fun nativeISteamUtilsGetImageRGBA(imageHandle: Int, outRgba: ByteArray): Boolean
+    @JvmStatic private external fun nativeISteamRemoteStorageGetFileCount(): Int
+    @JvmStatic private external fun nativeISteamRemoteStorageIsCloudEnabledForAccount(): Boolean
+    @JvmStatic private external fun nativeISteamRemoteStorageIsCloudEnabledForApp(): Boolean
+    @JvmStatic private external fun nativeISteamRemoteStorageGetQuota(): LongArray?
+    @JvmStatic private external fun nativeISteamRemoteStorageListFiles(): Array<String>?
+    @JvmStatic private external fun nativeISteamRemoteStorageFileExists(name: String): Boolean
+    @JvmStatic private external fun nativeISteamRemoteStorageFileRead(name: String): ByteArray?
+    @JvmStatic private external fun nativeISteamRemoteStorageFileWrite(name: String, data: ByteArray): Boolean
+    @JvmStatic private external fun nativeISteamRemoteStorageFileDelete(name: String): Boolean
+    @JvmStatic private external fun nativeISteamRemoteStorageSetCloudEnabledForApp(enabled: Boolean)
+    @JvmStatic private external fun nativeISteamUserStatsRequestCurrentStats(): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsGetNumAchievements(): Int
+    @JvmStatic private external fun nativeISteamUserStatsListAchievements(): Array<String>?
+    @JvmStatic private external fun nativeISteamUserStatsGetAchievementAndUnlockTime(name: String): IntArray?
+    @JvmStatic private external fun nativeISteamUserStatsSetAchievement(name: String): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsClearAchievement(name: String): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsStoreStats(): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsGetStatInt(name: String): Int
+    @JvmStatic private external fun nativeISteamUserStatsGetStatFloat(name: String): Float
+    @JvmStatic private external fun nativeISteamUserStatsSetStatInt(name: String, data: Int): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsSetStatFloat(name: String, data: Float): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsUpdateAvgRateStat(name: String, countThisSession: Float, sessionLength: Double): Boolean
+    @JvmStatic private external fun nativeISteamUserStatsGetAchievementDisplayAttribute(name: String, key: String): String?
+    @JvmStatic private external fun nativeISteamUserStatsGetAchievementIcon(name: String): Int
+    @JvmStatic private external fun nativeISteamFriendsGetPersonaName(): String?
+    @JvmStatic private external fun nativeISteamFriendsGetPersonaState(): Int
+    @JvmStatic private external fun nativeISteamFriendsGetFriendCount(flags: Int): Int
+    @JvmStatic private external fun nativeISteamFriendsListFriends(flags: Int): LongArray
+    @JvmStatic private external fun nativeISteamFriendsGetFriendPersonaName(steamId: Long): String?
+    @JvmStatic private external fun nativeISteamFriendsGetFriendPersonaState(steamId: Long): Int
+    @JvmStatic private external fun nativeSubscribeCallback(id: Int)
+    @JvmStatic private external fun nativeUnsubscribeCallback(id: Int)
+    @JvmStatic private external fun nativeAwaitCallback(id: Int, timeoutMs: Int): ByteArray?
+
+    fun isSubscribedApp(appId: Int): Boolean {
+        if (!initialized) return false
+        return try {
+            nativeBIsSubscribedApp(appId)
+        } catch (_: UnsatisfiedLinkError) {
+            false
+        }
+    }
+
+    fun isAppInstalled(appId: Int): Boolean =
+        if (!initialized) false
+        else try { nativeISteamAppsBIsAppInstalled(appId) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun appInstallDir(appId: Int): String? =
+        if (!initialized) null
+        else try { nativeISteamAppsGetAppInstallDir(appId) }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun installedDepots(appId: Int): IntArray =
+        if (!initialized) IntArray(0)
+        else try { nativeISteamAppsGetInstalledDepots(appId) }
+             catch (_: UnsatisfiedLinkError) { IntArray(0) }
+
+    fun currentGameLanguage(): String? =
+        if (!initialized) null
+        else try { nativeISteamAppsGetCurrentGameLanguage() }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun isDlcInstalled(dlcAppId: Int): Boolean =
+        if (!initialized) false
+        else try { nativeISteamAppsBIsDlcInstalled(dlcAppId) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun earliestPurchaseUnixTime(appId: Int): Int =
+        if (!initialized) 0
+        else try { nativeISteamAppsGetEarliestPurchaseUnixTime(appId) }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun dlcCount(appId: Int): Int =
+        if (!initialized) 0
+        else try { nativeISteamAppsGetDLCCount(appId) }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun appOwner(): Long =
+        if (!initialized) 0L
+        else try { nativeISteamAppsGetAppOwner() }
+             catch (_: UnsatisfiedLinkError) { 0L }
+
+    fun isSubscribedFromFamilySharing(): Boolean =
+        if (!initialized) false
+        else try { nativeISteamAppsBIsSubscribedFromFamilySharing() }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun appBuildId(): Int =
+        if (!initialized) 0
+        else try { nativeISteamAppsGetAppBuildId() }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun loggedOnPublic(): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserBLoggedOn() }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun userHasLicenseForApp(steamId64: Long, appId: Int): Int =
+        if (!initialized) 2
+        else try { nativeISteamUserHasLicenseForApp(steamId64, appId) }
+             catch (_: UnsatisfiedLinkError) { 2 }
+
+    fun liveSteamId(): Long {
+        if (!initialized) return 0
+        return try {
+            nativeISteamUserGetSteamID()
+        } catch (_: UnsatisfiedLinkError) {
+            0L
+        }
+    }
+
+    fun currentAppId(): Int {
+        if (!initialized) return 0
+        return try {
+            nativeISteamUtilsGetAppID()
+        } catch (_: UnsatisfiedLinkError) {
+            0
+        }
+    }
+
+    fun serverRealTime(): Int =
+        if (!initialized) 0
+        else try { nativeISteamUtilsGetServerRealTime() }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun ipCountry(): String? =
+        if (!initialized) null
+        else try { nativeISteamUtilsGetIPCountry() }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun steamUiLanguage(): String? =
+        if (!initialized) null
+        else try { nativeISteamUtilsGetSteamUILanguage() }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun currentBatteryPower(): Int =
+        if (!initialized) 255
+        else try { nativeISteamUtilsGetCurrentBatteryPower() }
+             catch (_: UnsatisfiedLinkError) { 255 }
+
+    fun imageSize(imageHandle: Int): IntArray =
+        if (!initialized) intArrayOf(0, 0)
+        else try {
+            nativeISteamUtilsGetImageSize(imageHandle)
+        } catch (_: UnsatisfiedLinkError) { intArrayOf(0, 0) }
+
+    fun imageRGBA(imageHandle: Int, outRgba: ByteArray): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUtilsGetImageRGBA(imageHandle, outRgba) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun cloudFileCount(): Int =
+        if (!initialized) 0
+        else try { nativeISteamRemoteStorageGetFileCount() }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun cloudEnabledForAccount(): Boolean =
+        if (!initialized) false
+        else try { nativeISteamRemoteStorageIsCloudEnabledForAccount() }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun cloudEnabledForApp(): Boolean =
+        if (!initialized) false
+        else try { nativeISteamRemoteStorageIsCloudEnabledForApp() }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun cloudQuota(): LongArray =
+        if (!initialized) longArrayOf(0L, 0L)
+        else try {
+            nativeISteamRemoteStorageGetQuota() ?: longArrayOf(0L, 0L)
+        } catch (_: UnsatisfiedLinkError) {
+            longArrayOf(0L, 0L)
+        }
+
+    fun requestCurrentStats(): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserStatsRequestCurrentStats() }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun numAchievements(): Int =
+        if (!initialized) 0
+        else try { nativeISteamUserStatsGetNumAchievements() }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    data class CloudFileEntry(val name: String, val size: Int)
+
+    fun listCloudFiles(): List<CloudFileEntry> {
+        if (!initialized) return emptyList()
+        val raw = try {
+            nativeISteamRemoteStorageListFiles()
+        } catch (_: UnsatisfiedLinkError) {
+            null
+        } ?: return emptyList()
+        return raw.map { row ->
+            val tab = row.indexOf('\t')
+            if (tab <= 0) {
+                CloudFileEntry(row, -1)
+            } else {
+                val name = row.substring(0, tab)
+                val size = row.substring(tab + 1).toIntOrNull() ?: -1
+                CloudFileEntry(name, size)
+            }
+        }
+    }
+
+    fun cloudFileExists(name: String): Boolean =
+        if (!initialized) false
+        else try { nativeISteamRemoteStorageFileExists(name) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun cloudFileRead(name: String): ByteArray? =
+        if (!initialized) null
+        else try { nativeISteamRemoteStorageFileRead(name) }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun cloudFileWrite(name: String, data: ByteArray): Boolean =
+        if (!initialized) false
+        else try { nativeISteamRemoteStorageFileWrite(name, data) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun cloudFileDelete(name: String): Boolean =
+        if (!initialized) false
+        else try { nativeISteamRemoteStorageFileDelete(name) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun setCloudEnabledForApp(enabled: Boolean) {
+        if (!initialized) return
+        try { nativeISteamRemoteStorageSetCloudEnabledForApp(enabled) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    data class Achievement(
+        val apiName: String,
+        val displayName: String?,
+        val description: String?,
+        val hidden: Boolean,
+        val achieved: Boolean,
+        val unlockTimeRtime32: Int,
+    )
+
+    fun listAchievements(): List<String> =
+        if (!initialized) emptyList()
+        else try {
+            (nativeISteamUserStatsListAchievements() ?: emptyArray()).toList()
+        } catch (_: UnsatisfiedLinkError) {
+            emptyList()
+        }
+
+    fun listAchievementsFull(): List<Achievement> = listAchievements().map { name ->
+        val unlock = try {
+            nativeISteamUserStatsGetAchievementAndUnlockTime(name)
+        } catch (_: UnsatisfiedLinkError) { null }
+        val achieved = (unlock?.getOrNull(0) ?: 0) != 0
+        val unlockTime = unlock?.getOrNull(1) ?: 0
+        val display = try {
+            nativeISteamUserStatsGetAchievementDisplayAttribute(name, "name")
+        } catch (_: UnsatisfiedLinkError) { null }
+        val desc = try {
+            nativeISteamUserStatsGetAchievementDisplayAttribute(name, "desc")
+        } catch (_: UnsatisfiedLinkError) { null }
+        val hidden = try {
+            nativeISteamUserStatsGetAchievementDisplayAttribute(name, "hidden") == "1"
+        } catch (_: UnsatisfiedLinkError) { false }
+        Achievement(name, display, desc, hidden, achieved, unlockTime)
+    }
+
+    fun setAchievement(name: String): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserStatsSetAchievement(name) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun clearAchievement(name: String): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserStatsClearAchievement(name) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun storeStats(): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserStatsStoreStats() }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun getStatInt(name: String): Int =
+        if (!initialized) 0
+        else try { nativeISteamUserStatsGetStatInt(name) }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun getStatFloat(name: String): Float =
+        if (!initialized) 0.0f
+        else try { nativeISteamUserStatsGetStatFloat(name) }
+             catch (_: UnsatisfiedLinkError) { 0.0f }
+
+    fun setStatInt(name: String, data: Int): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserStatsSetStatInt(name, data) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun setStatFloat(name: String, data: Float): Boolean =
+        if (!initialized) false
+        else try { nativeISteamUserStatsSetStatFloat(name, data) }
+             catch (_: UnsatisfiedLinkError) { false }
+
+    fun updateAvgRateStat(name: String, countThisSession: Float, sessionLength: Double): Boolean =
+        if (!initialized) false
+        else try {
+            nativeISteamUserStatsUpdateAvgRateStat(name, countThisSession, sessionLength)
+        } catch (_: UnsatisfiedLinkError) { false }
+
+    object Callback {
+        const val EncryptedAppTicketResponse  = 154
+
+        const val SteamAPICallCompleted       = 703
+
+        const val PersonaStateChange          = 304
+        const val GameOverlayActivated        = 331
+
+        const val SteamAppInstalled           = 1041
+        const val SteamAppUninstalled         = 1042
+
+        const val UserStatsReceived           = 1101
+        const val UserStatsStored             = 1102
+        const val UserAchievementStored       = 1103
+
+        const val RemoteStorageFileShareResult            = 1307
+        const val RemoteStorageSubscribePublishedFileResult = 1314
+        const val RemoteStorageDownloadUGCResult          = 1317
+    }
+
+    fun subscribeCallback(callbackId: Int) {
+        if (!initialized) return
+        try { nativeSubscribeCallback(callbackId) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun unsubscribeCallback(callbackId: Int) {
+        if (!initialized) return
+        try { nativeUnsubscribeCallback(callbackId) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    object FriendFlags {
+        const val None              = 0x00
+        const val Blocked           = 0x01
+        const val FriendshipRequested = 0x02
+        const val Immediate         = 0x04
+        const val Clan              = 0x08
+        const val OnGameServer      = 0x10
+        const val RequestingFriendship = 0x80
+        const val RequestingInfo    = 0x100
+        const val Ignored           = 0x200
+        const val IgnoredFriend     = 0x400
+        const val ChatMember        = 0x1000
+        const val All               = 0xFFFF
+    }
+
+    fun personaName(): String? =
+        if (!initialized) null
+        else try { nativeISteamFriendsGetPersonaName() }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun personaState(): Int =
+        if (!initialized) 0
+        else try { nativeISteamFriendsGetPersonaState() }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun diagnosticRequestEncryptedAppTicket(): Pair<Long, ByteArray> {
+        val out = ByteArray(128)
+        val h = try {
+            com.winlator.cmod.feature.stores.steam.wnsteam.WnLibSteamClient
+                .nativeDiagnosticRequestEncryptedAppTicket(out)
+        } catch (_: UnsatisfiedLinkError) { 0L }
+        return h to out
+    }
+
+    fun friendCount(flags: Int = FriendFlags.Immediate): Int =
+        if (!initialized) 0
+        else try { nativeISteamFriendsGetFriendCount(flags) }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun listFriends(flags: Int = FriendFlags.Immediate): LongArray =
+        if (!initialized) LongArray(0)
+        else try { nativeISteamFriendsListFriends(flags) }
+             catch (_: UnsatisfiedLinkError) { LongArray(0) }
+
+    fun friendPersonaName(steamId: Long): String? =
+        if (!initialized) null
+        else try { nativeISteamFriendsGetFriendPersonaName(steamId) }
+             catch (_: UnsatisfiedLinkError) { null }
+
+    fun friendPersonaState(steamId: Long): Int =
+        if (!initialized) 0
+        else try { nativeISteamFriendsGetFriendPersonaState(steamId) }
+             catch (_: UnsatisfiedLinkError) { 0 }
+
+    fun awaitCallback(callbackId: Int, timeoutMs: Int): ByteArray? {
+        if (!initialized) return null
+        return try {
+            nativeAwaitCallback(callbackId, timeoutMs)
+        } catch (_: UnsatisfiedLinkError) {
+            null
+        }
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnSteamClient.kt b/app/src/main/feature/stores/steam/wnsteam/WnSteamClient.kt
new file mode 100644
index 000000000..bc237952b
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnSteamClient.kt
@@ -0,0 +1,33 @@
+// JNI symbols depend on this package path and class name.
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import timber.log.Timber
+
+// JVM-side entry point to the native wn-steam-client library.
+object WnSteamClient {
+
+    @Volatile
+    private var loaded: Boolean = false
+
+    // Load libwnsteam.so once; failed loads can be retried.
+    fun ensureLoaded() {
+        if (loaded) return
+        synchronized(this) {
+            if (loaded) return
+            System.loadLibrary("wnsteam")
+            loaded = true
+            Timber.tag(TAG).i("libwnsteam.so loaded, native version = %s", nativeVersion())
+        }
+    }
+
+    // Native library semver string.
+    fun version(): String {
+        ensureLoaded()
+        return nativeVersion()
+    }
+
+    @JvmStatic
+    private external fun nativeVersion(): String
+
+    private const val TAG = "WnSteamClient"
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnSteamSession.kt b/app/src/main/feature/stores/steam/wnsteam/WnSteamSession.kt
new file mode 100644
index 000000000..150a39112
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnSteamSession.kt
@@ -0,0 +1,790 @@
+// JNI symbols depend on this package path and class name.
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+import java.util.concurrent.atomic.AtomicLong
+
+// Production handle for the native Steam CM client and auth sessions.
+class WnSteamSession : AutoCloseable {
+
+    private val nativeHandle: AtomicLong
+
+    init {
+        WnSteamClient.ensureLoaded()
+        val h = nativeCreate()
+        require(h != 0L) { "wnsteam: nativeCreate returned 0" }
+        nativeHandle = AtomicLong(h)
+    }
+
+    fun setCaBundlePath(path: String) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSetCaBundlePath(h, path)
+    }
+
+    fun setStateObserver(observer: WnSteamStateObserver?) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSetStateObserver(h, observer)
+    }
+
+    // Toggle the post-logon library PICS crawl before [logonWithRefreshToken].
+    fun setAutoPopulateLibrary(enabled: Boolean) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSetAutoPopulateLibrary(h, enabled)
+    }
+
+    fun connect(url: String): Boolean {
+        val h = nativeHandle.get(); if (h == 0L) return false
+        return nativeConnect(h, url)
+    }
+
+    fun disconnect() {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeDisconnect(h)
+    }
+
+    fun logOffAndDisconnect(flushMs: Int = 500) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeLogOffAndDisconnect(h, flushMs)
+    }
+
+    fun renewRefreshToken(
+        currentToken: String,
+        steamId64: Long,
+        timeoutMs: Int = 15_000,
+    ): String? {
+        if (currentToken.isEmpty() || steamId64 == 0L) return null
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeRenewRefreshToken(h, currentToken, steamId64, timeoutMs)
+    }
+
+    fun startLoginWithCredentials(
+        username: String,
+        password: String,
+        persistentSession: Boolean,
+        authenticator: WnAuthenticator,
+        callback: WnAuthCallback,
+    ) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeStartLoginWithCredentials(h, username, password, persistentSession,
+            authenticator, callback)
+    }
+
+    // [resultCallback] may get a remote-approval update before the final token-bearing success when Steam Guard approves the QR.
+    fun startLoginWithQr(
+        qrCallback: WnQrCallback,
+        resultCallback: WnAuthCallback,
+    ) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeStartLoginWithQr(h, qrCallback, resultCallback)
+    }
+
+    fun cancelLogin() {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeCancelLogin(h)
+    }
+
+    // Log on with refresh token; [accountName] preferred when Steam provides it but auth polling can omit it after device confirmation.
+    fun logonWithRefreshToken(refreshToken: String, accountName: String, steamId: Long = 0L): Boolean {
+        val h = nativeHandle.get(); if (h == 0L) return false
+        return nativeLogonWithRefreshToken(h, refreshToken, accountName, steamId)
+    }
+
+    // Pre-warm app and DLC PICS metadata before launching a game.
+    fun prepareApp(appId: Int, dlcAppIds: IntArray, callback: WnPrepareAppCallback) {
+        val h = nativeHandle.get()
+        if (h == 0L) {
+            callback.onPrepareResult(false, "session closed")
+            return
+        }
+        nativePrepareApp(h, appId, dlcAppIds, callback)
+    }
+
+    // Start an async native depot download; [listener] runs on a worker thread.
+    fun downloadApp(
+        appId: Int,
+        depotIds: IntArray,
+        manifestIds: LongArray,
+        branch: String,
+        installDir: String,
+        fresh: Boolean,
+        caBundlePath: String,
+        maxWorkers: Int,
+        listener: WnDownloadListener,
+    ) {
+        require(depotIds.size == manifestIds.size) {
+            "wnsteam: depotIds/manifestIds size mismatch"
+        }
+        val h = nativeHandle.get()
+        if (h == 0L) {
+            listener.onComplete(false, "session closed", 0L, 0, 0)
+            return
+        }
+        nativeDownloadApp(h, appId, depotIds, manifestIds, branch, installDir,
+                          fresh, caBundlePath, maxWorkers, listener)
+    }
+
+    // Abort the current depot download.
+    fun cancelDownload() {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeCancelDownload(h)
+    }
+
+    fun startWineBridge(steam3Port: Int = 0, clientServicePort: Int = 0): Boolean {
+        val h = nativeHandle.get(); if (h == 0L) return false
+        return nativeStartWineBridge(h, steam3Port, clientServicePort)
+    }
+
+    fun stopWineBridge() {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeStopWineBridge(h)
+    }
+
+    fun wineBridgeLastError(): String {
+        val h = nativeHandle.get(); if (h == 0L) return ""
+        return nativeWineBridgeLastError(h)
+    }
+
+    // Return a cached app ownership ticket, or null if not pre-warmed.
+    fun getAppOwnershipTicket(appId: Int): ByteArray? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetAppOwnershipTicket(h, appId)
+    }
+
+    // Blocking encrypted-app-ticket request; returns null on failure.
+    fun requestEncryptedAppTicket(appId: Int): ByteArray? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeRequestEncryptedAppTicket(h, appId)
+    }
+
+    // Blocking user-stats schema request; call off the main thread.
+    fun getUserStatsSchema(appId: Int): ByteArray? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetUserStatsSchema(h, appId)
+    }
+
+    // Blocking full user-stats request for achievement write-back.
+    fun getUserStatsFull(appId: Int): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetUserStatsFull(h, appId)
+    }
+
+    // Blocking Steam Inventory item-definition archive fetch.
+    fun getItemDefArchive(appId: Int, caBundlePath: String): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        val bytes = nativeGetItemDefArchive(h, appId, caBundlePath) ?: return null
+        return String(bytes, Charsets.UTF_8)
+    }
+
+    // Blocking subscribed-Workshop-items fetch; returns "[]" when empty.
+    fun getSubscribedWorkshopItems(appId: Int): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetSubscribedWorkshopItems(h, appId)
+    }
+
+    // Blocking Workshop item depot download; returns bytes written or -1.
+    fun downloadWorkshopItem(
+        appId: Int,
+        manifestId: Long,
+        installDir: String,
+        caBundlePath: String,
+        maxWorkers: Int = 8,
+    ): Long {
+        val h = nativeHandle.get(); if (h == 0L) return -1L
+        return nativeDownloadWorkshopItem(h, appId, manifestId, installDir, caBundlePath, maxWorkers)
+    }
+
+    // Fire-and-forget stat or achievement write-back.
+    fun storeUserStats(
+        appId: Int,
+        steamId: Long,
+        crcStats: Int,
+        statIds: IntArray,
+        statValues: IntArray,
+    ) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeStoreUserStats(h, appId, steamId, crcStats, statIds, statValues)
+    }
+
+    // Blocking Steam Cloud changelist fetch.
+    fun getCloudFileList(appId: Int): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetCloudFileList(h, appId)
+    }
+
+    fun getCloudUserQuota(): LongArray? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return try { nativeGetCloudUserQuota(h) } catch (_: UnsatisfiedLinkError) { null }
+    }
+
+    fun getCloudDownloadInfo(appId: Int, filename: String): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetCloudDownloadInfo(h, appId, filename)
+    }
+
+    // Blocking Steam Cloud download: request `identity`, then auto-detect/decode the stored wrapper and validate against rawFileSize.
+    fun downloadCloudFile(appId: Int, filename: String): ByteArray? {
+        val infoJson = getCloudDownloadInfo(appId, filename) ?: return null
+        return try {
+            val obj = org.json.JSONObject(infoJson)
+            val host = obj.optString("urlHost")
+            if (host.isEmpty()) return null
+            val rawFileSize = obj.optInt("rawFileSize", 0)
+            val encrypted = obj.optBoolean("encrypted", false)
+            // Force https on Android (cleartext is blocked by default; the CDN serves both).
+            val url = java.net.URL("https://$host${obj.optString("urlPath")}")
+
+            // Up to 3 attempts so a transient HTTP/network blip can't strand the save.
+            var raw: ByteArray? = null
+            var lastCode = -1
+            for (attempt in 0 until 3) {
+                val conn = (url.openConnection() as java.net.HttpURLConnection).apply {
+                    requestMethod = "GET"
+                    connectTimeout = 15_000
+                    readTimeout = 30_000
+                    instanceFollowRedirects = true
+                    // Get the exact stored bytes (we decode below); stops the HTTP stack from transparently gunzipping.
+                    setRequestProperty("Accept-Encoding", "identity")
+                    obj.optJSONArray("headers")?.let { headers ->
+                        for (i in 0 until headers.length()) {
+                            val hd = headers.getJSONObject(i)
+                            setRequestProperty(hd.optString("name"), hd.optString("value"))
+                        }
+                    }
+                }
+                try {
+                    lastCode = conn.responseCode
+                    if (lastCode == 200) {
+                        raw = conn.inputStream.use { it.readBytes() }
+                        break
+                    }
+                    android.util.Log.w("WnSteamSession", "cloud GET $filename → HTTP $lastCode (attempt ${attempt + 1})")
+                } catch (e: Exception) {
+                    android.util.Log.w("WnSteamSession", "cloud GET $filename failed (attempt ${attempt + 1})", e)
+                } finally {
+                    conn.disconnect()
+                }
+                if (attempt < 2) Thread.sleep(400L * (attempt + 1))
+            }
+            if (raw == null) {
+                android.util.Log.w("WnSteamSession", "cloud file $filename: download failed (last HTTP $lastCode)")
+                return null
+            }
+
+            val body = decodeCloudPayload(raw, rawFileSize)
+            if (body == null || body.size != rawFileSize) {
+                android.util.Log.w(
+                    "WnSteamSession",
+                    "cloud file $filename: could not decode to expected size " +
+                        "(got ${body?.size ?: -1}, expected $rawFileSize, encrypted=$encrypted) — rejecting",
+                )
+                return null
+            }
+            body
+        } catch (e: Exception) {
+            android.util.Log.w("WnSteamSession", "cloud file download failed: $filename", e)
+            null
+        }
+    }
+
+    /** Decode a Steam Cloud payload, trying raw/PKZip/gzip/zlib/raw-DEFLATE and accepting the first match for [rawFileSize]. */
+    private fun decodeCloudPayload(raw: ByteArray, rawFileSize: Int): ByteArray? {
+        if (raw.isEmpty()) return if (rawFileSize == 0) raw else null
+        // Already the raw file (uncompressed, or the HTTP stack decoded transport compression).
+        if (raw.size == rawFileSize) return raw
+
+        // PKZip single-entry wrapper ("PK").
+        if (raw.size >= 4 && raw[0] == 0x50.toByte() && raw[1] == 0x4B.toByte()) {
+            runCatching {
+                java.util.zip.ZipInputStream(raw.inputStream()).use { zin ->
+                    if (zin.nextEntry == null) null else zin.readBytes()
+                }
+            }.getOrNull()?.let { if (it.size == rawFileSize) return it }
+        }
+        // gzip (0x1f 0x8b).
+        if (raw.size >= 2 && raw[0] == 0x1f.toByte() && raw[1] == 0x8b.toByte()) {
+            runCatching {
+                java.util.zip.GZIPInputStream(raw.inputStream()).use { it.readBytes() }
+            }.getOrNull()?.let { if (it.size == rawFileSize) return it }
+        }
+        // zlib-wrapped DEFLATE (RFC 1950) then raw DEFLATE (RFC 1951).
+        for (nowrap in booleanArrayOf(false, true)) {
+            runCatching { inflateBytes(raw, nowrap, rawFileSize) }
+                .getOrNull()
+                ?.let { if (it.size == rawFileSize) return it }
+        }
+        return null
+    }
+
+    private fun inflateBytes(data: ByteArray, nowrap: Boolean, sizeHint: Int): ByteArray {
+        val inflater = java.util.zip.Inflater(nowrap)
+        inflater.setInput(data)
+        val out = java.io.ByteArrayOutputStream(if (sizeHint > 0) sizeHint else data.size * 2)
+        val buf = ByteArray(64 * 1024)
+        try {
+            while (!inflater.finished()) {
+                val n = inflater.inflate(buf)
+                if (n == 0) {
+                    if (inflater.finished() || inflater.needsDictionary() || inflater.needsInput()) break
+                }
+                out.write(buf, 0, n)
+            }
+        } finally {
+            inflater.end()
+        }
+        return out.toByteArray()
+    }
+
+    // Result of [beginCloudUploadBatch].
+    data class CloudUploadBatch(val batchId: Long, val appChangeNumber: Long)
+
+    // Blocking Steam Cloud upload-batch opener.
+    fun beginCloudUploadBatch(
+        appId: Int,
+        fileNames: List<String>,
+        filesToDelete: List<String>,
+        clientId: Long,
+    ): CloudUploadBatch? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        val json = nativeCloudBeginUploadBatch(
+            h, appId, fileNames.joinToString("\n"), filesToDelete.joinToString("\n"), clientId,
+        ) ?: return null
+        return try {
+            val obj = org.json.JSONObject(json)
+            val batchId = obj.optLong("batchId", 0L)
+            if (batchId == 0L) null
+            else CloudUploadBatch(batchId, obj.optLong("appChangeNumber", 0L))
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    // Blocking file upload within an open Steam Cloud batch.
+    fun uploadCloudFile(
+        appId: Int,
+        filename: String,
+        fileBytes: ByteArray,
+        fileShaHex: String,
+        timestamp: Long,
+        batchId: Long,
+    ): Boolean {
+        val h = nativeHandle.get(); if (h == 0L) return false
+        // Cloud uploads are not compressed.
+        val beginJson = nativeCloudBeginFileUpload(
+            h, appId, filename, fileBytes.size, fileBytes.size, fileShaHex, timestamp, batchId,
+        ) ?: return false
+        try {
+            val blocks0 = org.json.JSONObject(beginJson).optJSONArray("blocks")
+            if (blocks0 == null || blocks0.length() == 0) {
+                android.util.Log.i(
+                    "WnSteamSession",
+                    "cloud upload short-circuit: blocks=0 for $filename — file already in cloud, treating as success"
+                )
+                nativeCloudCommitFileUpload(h, true, appId, fileShaHex, filename)
+                return true
+            }
+        } catch (e: Exception) {
+            android.util.Log.w("WnSteamSession", "uploadCloudFile early-parse failed: $filename", e)
+        }
+        var allOk = true
+        try {
+            val blocks = org.json.JSONObject(beginJson).optJSONArray("blocks")
+            if (blocks != null) {
+                for (i in 0 until blocks.length()) {
+                    val blk = blocks.getJSONObject(i)
+                    val host = blk.optString("urlHost")
+                    val off = blk.optLong("blockOffset", 0L).toInt()
+                    val len = blk.optInt("blockLength", 0)
+                    if (host.isEmpty() || off < 0 || len < 0 || off.toLong() + len > fileBytes.size) {
+                        allOk = false
+                        continue
+                    }
+                    val url = java.net.URL("https://$host${blk.optString("urlPath")}")
+                    val conn = (url.openConnection() as java.net.HttpURLConnection).apply {
+                        requestMethod = "PUT"
+                        doOutput = true
+                        connectTimeout = 15_000
+                        readTimeout = 30_000
+                        setFixedLengthStreamingMode(len)
+                        blk.optJSONArray("headers")?.let { hs ->
+                            for (k in 0 until hs.length()) {
+                                val hd = hs.getJSONObject(k)
+                                setRequestProperty(hd.optString("name"), hd.optString("value"))
+                            }
+                        }
+                        setRequestProperty("User-Agent", "Valve/Steam HTTP Client 1.0")
+                    }
+                    try {
+                        conn.outputStream.use { it.write(fileBytes, off, len) }
+                        val code = conn.responseCode
+                        if (code !in 200..299) {
+                            allOk = false
+                            android.util.Log.w("WnSteamSession", "cloud PUT block $i → HTTP $code")
+                        }
+                    } catch (e: Exception) {
+                        allOk = false
+                        android.util.Log.w("WnSteamSession", "cloud PUT block $i failed", e)
+                    } finally {
+                        conn.disconnect()
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            android.util.Log.w("WnSteamSession", "uploadCloudFile parse failed: $filename", e)
+            allOk = false
+        }
+        return nativeCloudCommitFileUpload(h, allOk, appId, fileShaHex, filename)
+    }
+
+    // Blocking Steam Cloud upload-batch completion.
+    fun completeCloudUploadBatch(appId: Int, batchId: Long, batchEresult: Int): Boolean {
+        val h = nativeHandle.get(); if (h == 0L) return false
+        return nativeCloudCompleteUploadBatch(h, appId, batchId, batchEresult)
+    }
+
+    // Blocking PICS change poll since [sinceChangeNumber].
+    fun getPicsChangesSince(sinceChangeNumber: Long): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetPicsChangesSince(h, sinceChangeNumber)
+    }
+
+    // Blocking PICS app-info fetch; [accessToken] is 0 for public appinfo.
+    fun getPicsAppInfo(appId: Int, accessToken: Long = 0L): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetPicsAppInfo(h, appId, accessToken)
+    }
+
+    // Blocking PICS access-token request.
+    fun getPicsAccessTokens(appIds: List<Int>, packageIds: List<Int>): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetPicsAccessTokens(
+            h, appIds.joinToString("\n"), packageIds.joinToString("\n"),
+        )
+    }
+
+    // Blocking batch PICS app product-info fetch.
+    fun getPicsAppProductInfo(appIds: List<Int>, tokens: List<Long>): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetPicsAppProductInfo(
+            h, appIds.joinToString("\n"), tokens.joinToString("\n"),
+        )
+    }
+
+    // Blocking batch PICS package product-info fetch.
+    fun getPicsPackageInfo(packageIds: List<Int>, tokens: List<Long>): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetPicsPackageInfo(
+            h, packageIds.joinToString("\n"), tokens.joinToString("\n"),
+        )
+    }
+
+    // Fire-and-forget running-games presence report.
+    fun notifyGamesPlayed(gamesJson: String, clientOsType: Int) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeNotifyGamesPlayed(h, gamesJson, clientOsType)
+    }
+
+    // Fire-and-forget request to release another active playing session.
+    fun kickPlayingSession(onlyStopGame: Boolean = false) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeKickPlayingSession(h, onlyStopGame)
+    }
+
+    // Cached playing-blocked state for this account.
+    fun isPlayingBlocked(): Boolean {
+        val h = nativeHandle.get(); if (h == 0L) return false
+        return nativeIsPlayingBlocked(h)
+    }
+
+    // Mark playing blocked before waiting for a post-kick server push.
+    fun markPlayingBlocked() {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeMarkPlayingBlocked(h)
+    }
+
+    // Fire-and-forget Steam persona state update.
+    fun setPersonaState(personaState: Int) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSetPersonaState(h, personaState)
+    }
+
+    fun setPersonaName(name: String, personaState: Int = 1) {
+        if (name.isEmpty()) return
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSetPersonaName(h, name, personaState)
+    }
+
+    fun requestUserPersona() {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeRequestUserPersona(h)
+    }
+
+    fun requestFriendPersonas(
+        steamIds: LongArray,
+        personaStateRequested: Int = 1,
+    ) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        if (steamIds.isEmpty()) return
+        try { nativeRequestFriendPersonas(h, steamIds, personaStateRequested) }
+        catch (_: UnsatisfiedLinkError) {}
+    }
+
+    fun getSelfPersona(): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetSelfPersona(h)
+    }
+
+    // Blocking Steam Family group lookup.
+    fun getFamilyGroup(familyGroupId: Long): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetFamilyGroup(h, familyGroupId)
+    }
+
+    // Cached license list JSON; empty until the post-logon push arrives.
+    fun getLicenseList(): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetLicenseList(h)
+    }
+
+    fun getFriendsList(): LongArray {
+        val h = nativeHandle.get(); if (h == 0L) return LongArray(0)
+        return try { nativeGetFriendsList(h) } catch (_: UnsatisfiedLinkError) { LongArray(0) }
+    }
+
+    fun getFriendPersonas(): String {
+        val h = nativeHandle.get(); if (h == 0L) return "[]"
+        return try { nativeGetFriendPersonas(h) ?: "[]" }
+               catch (_: UnsatisfiedLinkError) { "[]" }
+    }
+
+    // Blocking: send a 1-to-1 friend message; returns response JSON or null.
+    fun sendFriendMessage(steamId: Long, message: String): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return try { nativeSendFriendMessage(h, steamId, message) }
+               catch (_: UnsatisfiedLinkError) { null }
+    }
+
+    // Blocking: recent message history for a conversation; JSON array.
+    fun getRecentMessages(steamId: Long, count: Int = 50): String {
+        val h = nativeHandle.get(); if (h == 0L) return "[]"
+        return try { nativeGetRecentMessages(h, steamId, count) ?: "[]" }
+               catch (_: UnsatisfiedLinkError) { "[]" }
+    }
+
+    // Drains queued incoming-message notifications; JSON array.
+    fun drainFriendMessages(): String {
+        val h = nativeHandle.get(); if (h == 0L) return "[]"
+        return try { nativeDrainFriendMessages(h) ?: "[]" }
+               catch (_: UnsatisfiedLinkError) { "[]" }
+    }
+
+    // Blocking: upload an image to Steam chat UGC and send it to a friend; returns the URL or null.
+    fun sendChatImage(steamId: Long, refreshToken: String, bytes: ByteArray, fileName: String): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return try { nativeSendChatImage(h, steamId, refreshToken, bytes, fileName) }
+               catch (_: UnsatisfiedLinkError) { null }
+    }
+
+    fun getOwnedGames(steamId: Long): String? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        return nativeGetOwnedGames(h, steamId)
+    }
+
+    // Blocking launch-intent signal; empty pending-op list means clear to launch.
+    fun signalAppLaunchIntent(
+        appId: Int,
+        clientId: Long,
+        machineName: String,
+        ignorePending: Boolean,
+        osType: Int,
+    ): List<Int>? {
+        val h = nativeHandle.get(); if (h == 0L) return null
+        val json = nativeSignalAppLaunchIntent(h, appId, clientId, machineName, ignorePending, osType)
+            ?: return null
+        return try {
+            val arr = org.json.JSONObject(json).optJSONArray("pendingOps")
+            (0 until (arr?.length() ?: 0)).map { arr!!.getInt(it) }
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    fun signalAppExitSyncDone(
+        appId: Int,
+        clientId: Long,
+        uploadsCompleted: Boolean,
+        uploadsRequired: Boolean,
+    ) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSignalAppExitSyncDone(h, appId, clientId, uploadsCompleted, uploadsRequired)
+    }
+
+    // Fresh JSON snapshot of the native library store.
+    fun getLibrarySnapshotJson(): String {
+        val h = nativeHandle.get(); if (h == 0L) return "{}"
+        return nativeGetLibrarySnapshot(h)
+    }
+
+    // Install or clear the native library-store observer.
+    fun setLibraryObserver(observer: WnLibraryObserver?) {
+        val h = nativeHandle.get(); if (h == 0L) return
+        nativeSetLibraryObserver(h, observer)
+    }
+
+    fun state(): Int {
+        val h = nativeHandle.get(); if (h == 0L) return 0
+        return nativeState(h)
+    }
+
+    fun steamId(): Long {
+        val h = nativeHandle.get(); if (h == 0L) return 0L
+        return nativeSteamId(h)
+    }
+
+    // Steam Family group id from logon, or 0.
+    fun familyGroupId(): Long {
+        val h = nativeHandle.get(); if (h == 0L) return 0L
+        return nativeFamilyGroupId(h)
+    }
+
+    override fun close() {
+        val h = nativeHandle.getAndSet(0L)
+        if (h != 0L) nativeDestroy(h)
+    }
+
+    @Suppress("ProtectedInFinal", "unused")
+    protected fun finalize() { close() }
+
+    companion object {
+        // Blocking Steam CM WSS resolver; returns empty string on failure.
+        fun pickCmUrl(caBundlePath: String): String {
+            WnSteamClient.ensureLoaded()
+            return nativePickCmUrl(caBundlePath)
+        }
+
+        @JvmStatic private external fun nativePickCmUrl(caBundlePath: String): String
+
+        @JvmStatic private external fun nativeCreate(): Long
+        @JvmStatic private external fun nativeDestroy(handle: Long)
+        @JvmStatic private external fun nativeSetCaBundlePath(handle: Long, path: String)
+        @JvmStatic private external fun nativeSetStateObserver(handle: Long, observer: WnSteamStateObserver?)
+        @JvmStatic private external fun nativeSetAutoPopulateLibrary(handle: Long, enabled: Boolean)
+        @JvmStatic private external fun nativeConnect(handle: Long, url: String): Boolean
+        @JvmStatic private external fun nativeDisconnect(handle: Long)
+        @JvmStatic private external fun nativeLogOffAndDisconnect(handle: Long, flushMs: Int)
+        @JvmStatic private external fun nativeRenewRefreshToken(
+            handle: Long,
+            currentToken: String,
+            steamId64: Long,
+            timeoutMs: Int,
+        ): String?
+        @JvmStatic private external fun nativeStartLoginWithCredentials(
+            handle: Long,
+            username: String,
+            password: String,
+            persistentSession: Boolean,
+            authenticator: WnAuthenticator,
+            callback: WnAuthCallback,
+        )
+        @JvmStatic private external fun nativeStartLoginWithQr(
+            handle: Long,
+            qrCallback: WnQrCallback,
+            resultCallback: WnAuthCallback,
+        )
+        @JvmStatic private external fun nativeCancelLogin(handle: Long)
+        @JvmStatic private external fun nativeLogonWithRefreshToken(
+            handle: Long,
+            refreshToken: String,
+            accountName: String,
+            steamId: Long,
+        ): Boolean
+        @JvmStatic private external fun nativePrepareApp(
+            handle: Long,
+            appId: Int,
+            dlcAppIds: IntArray,
+            callback: WnPrepareAppCallback,
+        )
+        @JvmStatic private external fun nativeDownloadApp(
+            handle: Long,
+            appId: Int,
+            depotIds: IntArray,
+            manifestIds: LongArray,
+            branch: String,
+            installDir: String,
+            fresh: Boolean,
+            caBundlePath: String,
+            maxWorkers: Int,
+            listener: WnDownloadListener,
+        )
+        @JvmStatic private external fun nativeCancelDownload(handle: Long)
+        @JvmStatic private external fun nativeStartWineBridge(
+            handle: Long, steam3Port: Int, clientServicePort: Int): Boolean
+        @JvmStatic private external fun nativeStopWineBridge(handle: Long)
+        @JvmStatic private external fun nativeWineBridgeLastError(handle: Long): String
+        @JvmStatic private external fun nativeGetAppOwnershipTicket(handle: Long, appId: Int): ByteArray?
+        @JvmStatic private external fun nativeRequestEncryptedAppTicket(handle: Long, appId: Int): ByteArray?
+        @JvmStatic private external fun nativeGetUserStatsSchema(handle: Long, appId: Int): ByteArray?
+        @JvmStatic private external fun nativeGetUserStatsFull(handle: Long, appId: Int): String?
+        @JvmStatic private external fun nativeGetItemDefArchive(
+            handle: Long,
+            appId: Int,
+            caBundlePath: String,
+        ): ByteArray?
+        @JvmStatic private external fun nativeGetSubscribedWorkshopItems(
+            handle: Long,
+            appId: Int,
+        ): String?
+        @JvmStatic private external fun nativeDownloadWorkshopItem(
+            handle: Long,
+            appId: Int,
+            manifestId: Long,
+            installDir: String,
+            caBundlePath: String,
+            maxWorkers: Int,
+        ): Long
+        @JvmStatic private external fun nativeStoreUserStats(
+            handle: Long, appId: Int, steamId: Long, crcStats: Int,
+            statIds: IntArray, statValues: IntArray)
+        @JvmStatic private external fun nativeGetCloudFileList(handle: Long, appId: Int): String?
+        @JvmStatic private external fun nativeGetCloudUserQuota(handle: Long): LongArray?
+        @JvmStatic private external fun nativeGetCloudDownloadInfo(handle: Long, appId: Int, filename: String): String?
+        @JvmStatic private external fun nativeCloudBeginUploadBatch(handle: Long, appId: Int, files: String, filesToDelete: String, clientId: Long): String?
+        @JvmStatic private external fun nativeCloudBeginFileUpload(handle: Long, appId: Int, filename: String, fileSize: Int, rawFileSize: Int, shaHex: String, timestamp: Long, batchId: Long): String?
+        @JvmStatic private external fun nativeCloudCommitFileUpload(handle: Long, transferSucceeded: Boolean, appId: Int, shaHex: String, filename: String): Boolean
+        @JvmStatic private external fun nativeCloudCompleteUploadBatch(handle: Long, appId: Int, batchId: Long, batchEresult: Int): Boolean
+        @JvmStatic private external fun nativeGetPicsChangesSince(handle: Long, sinceChangeNumber: Long): String?
+        @JvmStatic private external fun nativeGetPicsAppInfo(handle: Long, appId: Int, accessToken: Long): String?
+        @JvmStatic private external fun nativeGetPicsAccessTokens(handle: Long, appIds: String, packageIds: String): String?
+        @JvmStatic private external fun nativeGetPicsAppProductInfo(handle: Long, appIds: String, tokens: String): String?
+        @JvmStatic private external fun nativeGetPicsPackageInfo(handle: Long, packageIds: String, tokens: String): String?
+        @JvmStatic private external fun nativeNotifyGamesPlayed(handle: Long, gamesJson: String, clientOsType: Int)
+        @JvmStatic private external fun nativeKickPlayingSession(handle: Long, onlyStopGame: Boolean)
+        @JvmStatic private external fun nativeIsPlayingBlocked(handle: Long): Boolean
+        @JvmStatic private external fun nativeMarkPlayingBlocked(handle: Long)
+        @JvmStatic private external fun nativeSetPersonaState(handle: Long, personaState: Int)
+        @JvmStatic private external fun nativeSetPersonaName(handle: Long, name: String, personaState: Int)
+        @JvmStatic private external fun nativeRequestUserPersona(handle: Long)
+        @JvmStatic private external fun nativeRequestFriendPersonas(
+            handle: Long, steamIds: LongArray, flags: Int)
+        @JvmStatic private external fun nativeGetSelfPersona(handle: Long): String?
+        @JvmStatic private external fun nativeGetFamilyGroup(
+            handle: Long, familyGroupId: Long): String?
+        @JvmStatic private external fun nativeGetLicenseList(handle: Long): String?
+        @JvmStatic private external fun nativeGetFriendsList(handle: Long): LongArray
+        @JvmStatic private external fun nativeGetFriendPersonas(handle: Long): String?
+        @JvmStatic private external fun nativeSendFriendMessage(handle: Long, steamId: Long, message: String): String?
+        @JvmStatic private external fun nativeGetRecentMessages(handle: Long, steamId: Long, count: Int): String?
+        @JvmStatic private external fun nativeDrainFriendMessages(handle: Long): String?
+        @JvmStatic private external fun nativeSendChatImage(handle: Long, steamId: Long, refreshToken: String, image: ByteArray, fileName: String): String?
+        @JvmStatic private external fun nativeGetOwnedGames(
+            handle: Long, steamId: Long): String?
+        @JvmStatic private external fun nativeSignalAppLaunchIntent(handle: Long, appId: Int, clientId: Long, machineName: String, ignorePending: Boolean, osType: Int): String?
+        @JvmStatic private external fun nativeSignalAppExitSyncDone(handle: Long, appId: Int, clientId: Long, uploadsCompleted: Boolean, uploadsRequired: Boolean)
+        @JvmStatic private external fun nativeGetLibrarySnapshot(handle: Long): String
+        @JvmStatic private external fun nativeSetLibraryObserver(
+            handle: Long,
+            observer: WnLibraryObserver?,
+        )
+        @JvmStatic private external fun nativeState(handle: Long): Int
+        @JvmStatic private external fun nativeSteamId(handle: Long): Long
+        @JvmStatic private external fun nativeFamilyGroupId(handle: Long): Long
+    }
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnSteamStateObserver.kt b/app/src/main/feature/stores/steam/wnsteam/WnSteamStateObserver.kt
new file mode 100644
index 000000000..c5af3b96e
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnSteamStateObserver.kt
@@ -0,0 +1,21 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+/**
+ * Lifecycle + arbitrary-message observer for [WnSteamSession]. Callbacks
+ * fire on a native worker thread — marshal to your own dispatcher.
+ *
+ * `state` ordinal mapping (matches native `wn_steam::ClientState`):
+ *   0 = Disconnected
+ *   1 = Connecting
+ *   2 = Connected   (encrypted channel established, not yet logged on)
+ *   3 = LoggedOn    (CMsgClientLogonResponse OK; heartbeat is running)
+ *
+ * `onClientMessage` is the firehose of inbound application-layer
+ * proto-flagged messages. `emsg` and `eresult` come from
+ * CMsgProtoBufHeader; `body` is the protobuf payload for the specific
+ * message type. Most Phase-2 callers only care about `onStateChanged`.
+ */
+interface WnSteamStateObserver {
+    fun onStateChanged(state: Int)
+    fun onClientMessage(emsg: Int, eresult: Int, body: ByteArray)
+}
diff --git a/app/src/main/feature/stores/steam/wnsteam/WnWineEnvVars.kt b/app/src/main/feature/stores/steam/wnsteam/WnWineEnvVars.kt
new file mode 100644
index 000000000..4a7f912bd
--- /dev/null
+++ b/app/src/main/feature/stores/steam/wnsteam/WnWineEnvVars.kt
@@ -0,0 +1,44 @@
+package com.winlator.cmod.feature.stores.steam.wnsteam
+
+// Builds the Steam launch environment consumed by Wine's lsteamclient.dll.
+object WnWineEnvVars {
+
+    data class Inputs(
+        val steamId64: Long,
+        val accountName: String,
+        val appId: Int,
+        val ownedDlcAppIds: List<Int>,
+        val steamRootLinux: String,
+        val breakpadDir: String,
+        val steam3MasterHostPort: String = "127.0.0.1:57343",
+        val steamClientServiceHostPort: String = "127.0.0.1:57344",
+        // Absolute Linux path to libsteamclient.so for lsteamclient.dll.
+        val libSteamClientSoPath: String,
+    )
+
+    fun build(input: Inputs): Map<String, String> {
+        val v = LinkedHashMap<String, String>(24)
+        // Both loader variants use the same Android libsteamclient.so.
+        v["WINESTEAMCLIENTPATH64"] = input.libSteamClientSoPath
+        v["WINESTEAMCLIENTPATH"]   = input.libSteamClientSoPath
+        v["_STEAM_SETENV_MANAGER"] = "1"
+        v["BREAKPAD_DUMP_LOCATION"] = input.breakpadDir
+        v["STEAM_BASE_FOLDER"]     = input.steamRootLinux
+        v["ENABLE_VK_LAYER_VALVE_steam_overlay_1"] = "0"
+        v["STEAMVIDEOTOKEN"]       = "1"
+        v["Steam3Master"]          = input.steam3MasterHostPort
+        v["SteamClientService"]    = input.steamClientServiceHostPort
+        v["SteamUser"]             = input.accountName
+        v["SteamAppUser"]          = input.accountName
+        v["SteamClientLaunch"]     = "1"
+        v["SteamEnv"]              = "1"
+        v["SteamPath"]             = """C:\Program Files (x86)\Steam"""
+        v["ValvePlatformMutex"]    = """c:\Program Files (x86)\Steam/"""
+        v["STEAMID"]               = input.steamId64.toString()
+        v["SteamGameId"]           = input.appId.toString()
+        v["SteamAppId"]            = input.appId.toString()
+        // lsteamclient.dll parses this on commas.
+        v["OWNED_DLCS"]            = input.ownedDlcAppIds.joinToString(",")
+        return v
+    }
+}
diff --git a/app/src/main/feature/stores/steam/workshop/WorkshopModsGenerator.kt b/app/src/main/feature/stores/steam/workshop/WorkshopModsGenerator.kt
new file mode 100644
index 000000000..b07c82f05
--- /dev/null
+++ b/app/src/main/feature/stores/steam/workshop/WorkshopModsGenerator.kt
@@ -0,0 +1,192 @@
+package com.winlator.cmod.feature.stores.steam.workshop
+
+import android.content.Context
+import android.system.Os
+import android.system.OsConstants
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.File
+
+/**
+ * Manages installed Steam Workshop item content and generates the
+ * `steam_settings/mods.json` manifest that gbe_fork's emulated ISteamUGC reads.
+ *
+ * Downloaded content is staged persistently, OUTSIDE `steam_settings`, so it
+ * survives the per-launch regeneration of that directory:
+ *
+ *   <externalFiles>/wn_workshop/<appId>/<id>/             depot content
+ *   <externalFiles>/wn_workshop/<appId>/<id>.meta.json    install marker + metadata
+ *   <externalFiles>/wn_workshop/<appId>/<id>.preview.jpg  preview image
+ *
+ * At launch [generate] links each staged item into the game's `steam_settings`
+ * the way gbe_fork expects:
+ *
+ *   steam_settings/mods/<id>            -> symlink to the staged content
+ *   steam_settings/mod_images/<id>/preview.jpg
+ *   steam_settings/mods.json           the manifest, keyed by published-file-id
+ */
+object WorkshopModsGenerator {
+    private const val TAG = "WorkshopModsGen"
+    const val PREVIEW_FILENAME = "preview.jpg"
+
+    /** Persistent per-app staging root for downloaded Workshop content. */
+    fun stagingDir(context: Context, appId: Int): File =
+        File(context.getExternalFilesDir(null), "wn_workshop/$appId")
+
+    fun contentDir(context: Context, appId: Int, publishedFileId: Long): File =
+        File(stagingDir(context, appId), publishedFileId.toString())
+
+    fun metaFile(context: Context, appId: Int, publishedFileId: Long): File =
+        File(stagingDir(context, appId), "$publishedFileId.meta.json")
+
+    fun previewFile(context: Context, appId: Int, publishedFileId: Long): File =
+        File(stagingDir(context, appId), "$publishedFileId.preview.jpg")
+
+    /**
+     * Published-file-ids that are fully staged — a meta marker AND a content
+     * directory both present (a marker without content is a torn install and
+     * is not reported as installed).
+     */
+    fun installedItemIds(context: Context, appId: Int): Set<Long> {
+        val files = stagingDir(context, appId).listFiles() ?: return emptySet()
+        return files
+            .mapNotNull { f ->
+                if (f.isFile && f.name.endsWith(".meta.json")) {
+                    f.name.removeSuffix(".meta.json").toLongOrNull()
+                } else {
+                    null
+                }
+            }
+            .filter { contentDir(context, appId, it).isDirectory }
+            .toSet()
+    }
+
+    /**
+     * Remove one staged Workshop item — its content directory, install marker
+     * and preview image. After this [installedItemIds] no longer reports the
+     * item and the next [generate] pass drops its `mods.json` entry and prunes
+     * the stale `steam_settings` link. The item can simply be installed again.
+     * Returns true once the item is no longer staged.
+     */
+    fun uninstall(context: Context, appId: Int, publishedFileId: Long): Boolean {
+        runCatching { metaFile(context, appId, publishedFileId).delete() }
+        runCatching { previewFile(context, appId, publishedFileId).delete() }
+        runCatching { contentDir(context, appId, publishedFileId).deleteRecursively() }
+        val stillInstalled = publishedFileId in installedItemIds(context, appId)
+        if (stillInstalled) {
+            Timber.tag(TAG).w("Workshop item %d still staged after uninstall", publishedFileId)
+        } else {
+            Timber.tag(TAG).i("Workshop item %d uninstalled for app %d", publishedFileId, appId)
+        }
+        return !stillInstalled
+    }
+
+    /**
+     * Build `steam_settings/mods.json` from the staged Workshop items and link
+     * their content + preview images into [settingsDir]. Returns the number of
+     * mods written. An empty install set writes `{}` (or removes a stale file).
+     */
+    fun generate(context: Context, appId: Int, settingsDir: File): Int {
+        val ids = installedItemIds(context, appId)
+        val modsJsonFile = File(settingsDir, "mods.json")
+        val modsDir = File(settingsDir, "mods")
+        val imagesDir = File(settingsDir, "mod_images")
+        if (ids.isEmpty()) {
+            // Drop every stale link/image — nothing is installed.
+            pruneOrphans(modsDir, emptySet())
+            pruneOrphans(imagesDir, emptySet())
+            if (modsJsonFile.exists()) modsJsonFile.writeText("{}", Charsets.UTF_8)
+            return 0
+        }
+        modsDir.mkdirs()
+        imagesDir.mkdirs()
+        val modsJson = JSONObject()
+        val writtenIds = HashSet<Long>()
+        for (id in ids) {
+            val content = contentDir(context, appId, id)
+            if (!content.isDirectory) continue
+            val meta =
+                try {
+                    JSONObject(metaFile(context, appId, id).readText())
+                } catch (e: Exception) {
+                    Timber.tag(TAG).w(e, "Skipping workshop item %d — unreadable meta", id)
+                    continue
+                }
+
+            // Link the staged content into steam_settings/mods/<id>.
+            linkContent(content, File(modsDir, id.toString()))
+
+            // Copy the preview into steam_settings/mod_images/<id>/ (gbe_fork
+            // always resolves preview images relative to steam_settings).
+            val preview = previewFile(context, appId, id)
+            val hasPreview = preview.isFile
+            if (hasPreview) {
+                val destDir = File(imagesDir, id.toString()).apply { mkdirs() }
+                runCatching { preview.copyTo(File(destDir, PREVIEW_FILENAME), overwrite = true) }
+                    .onFailure { Timber.tag(TAG).w(it, "Preview copy failed for %d", id) }
+            }
+
+            modsJson.put(
+                id.toString(),
+                JSONObject().apply {
+                    put("title", meta.optString("title", id.toString()))
+                    put("preview_filename", if (hasPreview) PREVIEW_FILENAME else "")
+                    put("total_files_sizes", meta.optLong("fileSize", 0L))
+                    put("primary_filesize", meta.optLong("fileSize", 0L))
+                    put("time_created", meta.optLong("timeUpdated", 0L))
+                    put("time_updated", meta.optLong("timeUpdated", 0L))
+                    put(
+                        "workshop_item_url",
+                        "https://steamcommunity.com/sharedfiles/filedetails/?id=$id",
+                    )
+                },
+            )
+            writtenIds.add(id)
+        }
+        // Prune by what was actually written this pass — so a torn item
+        // (vanished content / unreadable meta) doesn't keep a stale link.
+        pruneOrphans(modsDir, writtenIds)
+        pruneOrphans(imagesDir, writtenIds)
+        modsJsonFile.writeText(modsJson.toString(2), Charsets.UTF_8)
+        Timber.tag(TAG).i("Wrote mods.json with %d mod(s) for app %d", writtenIds.size, appId)
+        return writtenIds.size
+    }
+
+    /**
+     * Point [link] at [content] with a symlink so the (possibly large) staged
+     * content is not duplicated. Falls back to a recursive copy on filesystems
+     * that reject symlinks.
+     */
+    private fun linkContent(content: File, link: File) {
+        clearPath(link)
+        val linked = runCatching { Os.symlink(content.absolutePath, link.absolutePath) }.isSuccess
+        if (!linked) {
+            runCatching { content.copyRecursively(link, overwrite = true) }
+                .onFailure { Timber.tag(TAG).w(it, "Failed to stage mod content into %s", link) }
+        }
+    }
+
+    /** Remove every child of [dir] whose name is not a currently-installed id. */
+    private fun pruneOrphans(dir: File, ids: Set<Long>) {
+        val keep = ids.mapTo(HashSet()) { it.toString() }
+        dir.listFiles()?.forEach { child ->
+            if (child.name !in keep) clearPath(child)
+        }
+    }
+
+    /**
+     * Remove [path] whether it is a symlink, a file, or a real directory —
+     * WITHOUT ever recursing through a symlink. `lstat` (not `stat`) inspects
+     * the link itself, so a symlink is only ever unlinked, never followed:
+     * `deleteRecursively` is reached solely for a genuine directory.
+     */
+    private fun clearPath(path: File) {
+        val st = runCatching { Os.lstat(path.absolutePath) }.getOrNull() ?: return
+        when {
+            OsConstants.S_ISLNK(st.st_mode) || OsConstants.S_ISREG(st.st_mode) ->
+                runCatching { Os.remove(path.absolutePath) }
+            OsConstants.S_ISDIR(st.st_mode) ->
+                path.deleteRecursively()
+        }
+    }
+}
diff --git a/app/src/main/feature/sync/CloudSyncConflictDialog.kt b/app/src/main/feature/sync/CloudSyncConflictDialog.kt
deleted file mode 100644
index 2ddaa76ca..000000000
--- a/app/src/main/feature/sync/CloudSyncConflictDialog.kt
+++ /dev/null
@@ -1,383 +0,0 @@
-package com.winlator.cmod.feature.sync
-import android.app.Activity
-import android.app.Dialog
-import android.util.TypedValue
-import android.view.ViewGroup
-import android.view.Window
-import android.view.WindowManager
-import androidx.activity.ComponentActivity
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.CheckboxDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-import com.winlator.cmod.R
-import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
-import com.winlator.cmod.shared.theme.WinNativeTheme
-
-data class CloudSyncConflictTimestamps(
-    val localTimestampLabel: String,
-    val cloudTimestampLabel: String,
-)
-
-/**
- * Callback for the cloud-save conflict dialog. [keepBackup] reflects whether the
- * user wanted the replaced side archived into Save History before the overwrite.
- */
-fun interface CloudSyncConflictChoice {
-    fun onChoice(keepBackup: Boolean)
-}
-
-object CloudSyncConflictDialog {
-    @JvmStatic
-    fun show(
-        activity: Activity,
-        timestamps: CloudSyncConflictTimestamps,
-        onUseCloud: CloudSyncConflictChoice,
-        onUseLocal: CloudSyncConflictChoice,
-    ) {
-        val dialog =
-            Dialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
-                requestWindowFeature(Window.FEATURE_NO_TITLE)
-                setCancelable(false)
-                window?.apply {
-                    setLayout(
-                        WindowManager.LayoutParams.MATCH_PARENT,
-                        WindowManager.LayoutParams.WRAP_CONTENT,
-                    )
-                    setBackgroundDrawableResource(android.R.color.transparent)
-                }
-            }
-
-        val composeView =
-            ComposeView(activity).apply {
-                layoutParams =
-                    ViewGroup.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                    )
-                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
-                (activity as? ComponentActivity)?.let {
-                    setViewTreeLifecycleOwner(it)
-                    setViewTreeSavedStateRegistryOwner(it)
-                }
-                setContent {
-                    WinNativeTheme(
-                        colorScheme =
-                            darkColorScheme(
-                                primary = Color(0xFF57CBDE),
-                                surface = Color(0xFF1A2028),
-                                background = Color(0xFF141B24),
-                                onSurface = Color(0xFFF0F4FF),
-                                onBackground = Color(0xFFF0F4FF),
-                            ),
-                    ) {
-                        CloudSyncConflictDialogContent(
-                            timestamps = timestamps,
-                            initialKeepBackup = GameSaveBackupManager.isKeepReplacedBackupEnabled(activity),
-                            onKeepBackupChanged = { enabled ->
-                                GameSaveBackupManager.setKeepReplacedBackupEnabled(activity, enabled)
-                            },
-                            onUseCloud = { keepBackup ->
-                                dialog.dismiss()
-                                onUseCloud.onChoice(keepBackup)
-                            },
-                            onUseLocal = { keepBackup ->
-                                dialog.dismiss()
-                                onUseLocal.onChoice(keepBackup)
-                            },
-                        )
-                    }
-                }
-            }
-
-        dialog.setContentView(composeView)
-        dialog.show()
-        dialog.window?.apply {
-            val dm = activity.resources.displayMetrics
-            val horizontalMarginPx =
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, dm).toInt()
-            val maxDialogWidthPx =
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 640f, dm).toInt()
-            val targetWidth = (dm.widthPixels - (horizontalMarginPx * 2)).coerceAtMost(maxDialogWidthPx)
-            setLayout(targetWidth, WindowManager.LayoutParams.WRAP_CONTENT)
-        }
-    }
-}
-@Composable
-private fun CloudSyncConflictDialogContent(
-    timestamps: CloudSyncConflictTimestamps,
-    initialKeepBackup: Boolean,
-    onKeepBackupChanged: (Boolean) -> Unit,
-    onUseCloud: (keepBackup: Boolean) -> Unit,
-    onUseLocal: (keepBackup: Boolean) -> Unit,
-) {
-    var visible by remember { mutableStateOf(false) }
-    LaunchedEffect(Unit) { visible = true }
-    val scrollState = rememberScrollState()
-    var keepBackup by remember { mutableStateOf(initialKeepBackup) }
-
-    Surface(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
-                .widthIn(max = 640.dp),
-        shape = RoundedCornerShape(24.dp),
-        color = Color(0xFF171E27),
-        tonalElevation = 0.dp,
-    ) {
-        AnimatedVisibility(
-            visible = visible,
-            enter =
-                fadeIn(animationSpec = tween(220, easing = FastOutSlowInEasing)) +
-                    expandVertically(animationSpec = tween(240, easing = FastOutSlowInEasing)),
-        ) {
-            BoxWithConstraints {
-                val compactActions = maxWidth < 420.dp
-
-                Column(
-                    modifier =
-                        Modifier
-                            .background(
-                                brush =
-                                    Brush.verticalGradient(
-                                        colors = listOf(Color(0xFF1B2430), Color(0xFF151B24)),
-                                    ),
-                            ).border(1.dp, Color(0xFF263547), RoundedCornerShape(24.dp))
-                            .padding(20.dp)
-                            .heightIn(max = 560.dp),
-                    verticalArrangement = Arrangement.spacedBy(16.dp),
-                ) {
-                    Column(
-                        modifier =
-                            Modifier
-                                .weight(1f, fill = false)
-                                .verticalScroll(scrollState),
-                        verticalArrangement = Arrangement.spacedBy(16.dp),
-                    ) {
-                        Surface(
-                            shape = RoundedCornerShape(999.dp),
-                            color = Color(0x1F57CBDE),
-                        ) {
-                            Text(
-                                text = "Cloud Save Sync",
-                                modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-                                color = Color(0xFF7BD8E8),
-                                fontSize = 12.sp,
-                                fontWeight = FontWeight.SemiBold,
-                            )
-                        }
-
-                        Text(
-                            text = "A newer cloud save was detected for this title.",
-                            style = MaterialTheme.typography.titleLarge,
-                            color = MaterialTheme.colorScheme.onSurface,
-                            fontWeight = FontWeight.SemiBold,
-                        )
-                        Text(
-                            text = "Choose which version to keep before launch. Syncing from cloud will replace the local save data on this device.",
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.78f),
-                        )
-
-                        Surface(
-                            shape = RoundedCornerShape(18.dp),
-                            color = Color(0xFF121922),
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .border(1.dp, Color(0xFF233141), RoundedCornerShape(18.dp)),
-                        ) {
-                            Column(
-                                modifier =
-                                    Modifier
-                                        .fillMaxWidth()
-                                        .padding(16.dp),
-                                verticalArrangement = Arrangement.spacedBy(14.dp),
-                            ) {
-                                Text(
-                                    text = "Version Details",
-                                    style = MaterialTheme.typography.labelLarge,
-                                    color = Color(0xFF8FA7C1),
-                                    fontWeight = FontWeight.Medium,
-                                )
-                                Text(
-                                    text = "Local save\n${timestamps.localTimestampLabel}",
-                                    style = MaterialTheme.typography.bodyMedium,
-                                    color = MaterialTheme.colorScheme.onSurface,
-                                )
-                                Text(
-                                    text = "Cloud save\n${timestamps.cloudTimestampLabel}",
-                                    style = MaterialTheme.typography.bodyMedium,
-                                    color = MaterialTheme.colorScheme.onSurface,
-                                )
-                            }
-                        }
-
-                        KeepBackupCheckbox(
-                            checked = keepBackup,
-                            onCheckedChange = { v ->
-                                keepBackup = v
-                                onKeepBackupChanged(v)
-                            },
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(4.dp))
-
-                    if (compactActions) {
-                        Column(
-                            modifier = Modifier.fillMaxWidth(),
-                            verticalArrangement = Arrangement.spacedBy(12.dp),
-                        ) {
-                            OutlinedButton(
-                                onClick = { onUseLocal(keepBackup) },
-                                modifier = Modifier.fillMaxWidth(),
-                                colors =
-                                    ButtonDefaults.outlinedButtonColors(
-                                        contentColor = MaterialTheme.colorScheme.onSurface,
-                                    ),
-                                border = BorderStroke(1.dp, Color(0xFF31455B)),
-                            ) {
-                                Text("Keep Local")
-                            }
-                            Button(
-                                onClick = { onUseCloud(keepBackup) },
-                                modifier = Modifier.fillMaxWidth(),
-                                colors =
-                                    ButtonDefaults.buttonColors(
-                                        containerColor = Color(0xFF57CBDE),
-                                        contentColor = Color(0xFF0E141B),
-                                    ),
-                            ) {
-                                Text("Sync from Cloud")
-                            }
-                        }
-                    } else {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.spacedBy(12.dp),
-                        ) {
-                            OutlinedButton(
-                                onClick = { onUseLocal(keepBackup) },
-                                modifier = Modifier.weight(1f),
-                                colors =
-                                    ButtonDefaults.outlinedButtonColors(
-                                        contentColor = MaterialTheme.colorScheme.onSurface,
-                                    ),
-                                border = BorderStroke(1.dp, Color(0xFF31455B)),
-                            ) {
-                                Text("Keep Local")
-                            }
-                            Button(
-                                onClick = { onUseCloud(keepBackup) },
-                                modifier = Modifier.weight(1f),
-                                colors =
-                                    ButtonDefaults.buttonColors(
-                                        containerColor = Color(0xFF57CBDE),
-                                        contentColor = Color(0xFF0E141B),
-                                    ),
-                            ) {
-                                Text("Sync from Cloud")
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun KeepBackupCheckbox(
-    checked: Boolean,
-    onCheckedChange: (Boolean) -> Unit,
-) {
-    Surface(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clickable { onCheckedChange(!checked) },
-        shape = RoundedCornerShape(14.dp),
-        color = Color(0xFF121922),
-        border = BorderStroke(1.dp, Color(0xFF233141)),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 12.dp, vertical = 10.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Checkbox(
-                checked = checked,
-                onCheckedChange = onCheckedChange,
-                colors =
-                    CheckboxDefaults.colors(
-                        checkedColor = Color(0xFF57CBDE),
-                        uncheckedColor = Color(0xFF5F7388),
-                        checkmarkColor = Color(0xFF0E141B),
-                    ),
-            )
-            Spacer(Modifier.widthIn(min = 6.dp))
-            Column(modifier = Modifier.padding(start = 4.dp)) {
-                Text(
-                    text = stringResource(R.string.cloud_saves_keep_replaced_backup),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurface,
-                    fontWeight = FontWeight.Medium,
-                )
-                Text(
-                    text = stringResource(R.string.cloud_saves_keep_replaced_backup_summary),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.65f),
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/feature/sync/CloudSyncHelper.kt b/app/src/main/feature/sync/CloudSyncHelper.kt
index 60e764691..e760eacbc 100644
--- a/app/src/main/feature/sync/CloudSyncHelper.kt
+++ b/app/src/main/feature/sync/CloudSyncHelper.kt
@@ -3,11 +3,7 @@ import android.content.Context
 import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
 import com.winlator.cmod.feature.stores.gog.service.GOGCloudSavesManager
 import com.winlator.cmod.feature.stores.gog.service.GOGService
-import com.winlator.cmod.feature.stores.steam.enums.PathType
-import com.winlator.cmod.feature.stores.steam.enums.SaveLocation
-import com.winlator.cmod.feature.stores.steam.enums.SyncResult
-import com.winlator.cmod.feature.stores.steam.service.SteamService
-import com.winlator.cmod.feature.stores.steam.utils.PrefManager
+import com.winlator.cmod.feature.steamcloudsync.SteamCloudSyncHelper
 import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
 import com.winlator.cmod.runtime.container.Shortcut
 import kotlinx.coroutines.runBlocking
@@ -24,6 +20,35 @@ object CloudSyncHelper {
         return SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date(timestampMs))
     }
 
+    private fun File.hasAnyFile(): Boolean = exists() && walkTopDown().any { it.isFile }
+
+    private fun normalizeGogAppId(appId: String): String =
+        if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
+
+    private fun gogGameId(shortcut: Shortcut): String =
+        shortcut.getExtra("gog_id").ifEmpty { shortcut.getExtra("app_id") }
+
+    private fun storeGameId(shortcut: Shortcut): String =
+        if (shortcut.getExtra("game_source") == "GOG") {
+            gogGameId(shortcut)
+        } else {
+            shortcut.getExtra("app_id")
+        }
+
+    private fun epicTargetContainerId(shortcut: Shortcut): Int? =
+        shortcut
+            .getExtra("container_id")
+            .toIntOrNull()
+            ?.takeIf { it > 0 }
+            ?: shortcut.container?.id?.takeIf { it > 0 }
+
+    private fun gogTargetContainerId(shortcut: Shortcut): Int? =
+        shortcut
+            .getExtra("container_id")
+            .toIntOrNull()
+            ?.takeIf { it > 0 }
+            ?: shortcut.container?.id?.takeIf { it > 0 }
+
     @JvmStatic
     fun forceDownloadOnContainerSwap(
         context: Context,
@@ -35,7 +60,7 @@ object CloudSyncHelper {
         val result =
             runBlocking {
                 when (shortcut.getExtra("game_source")) {
-                    "STEAM" -> forceSteamDownload(context, shortcut)
+                    "STEAM" -> SteamCloudSyncHelper.forceDownload(context, shortcut)
                     "GOG" -> forceGogDownload(context, shortcut)
                     "EPIC" -> forceEpicDownload(context, shortcut)
                     else -> false
@@ -56,59 +81,24 @@ object CloudSyncHelper {
         return result
     }
 
-    private suspend fun forceSteamDownload(
-        context: Context,
-        shortcut: Shortcut,
-    ): Boolean {
-        val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return false
-        return forceSteamDownloadById(context, appId)
-    }
-
-    private suspend fun forceSteamDownloadById(
-        context: Context,
-        appId: Int,
-    ): Boolean =
-        try {
-            val accountId =
-                SteamService.userSteamId?.accountID?.toLong()
-                    ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
-                    ?: 0L
-            val prefixToPath: (String) -> String = { prefix ->
-                PathType.from(prefix).toAbsPath(context, appId, accountId)
-            }
-
-            val syncInfo =
-                SteamService
-                    .forceSyncUserFiles(
-                        appId = appId,
-                        prefixToPath = prefixToPath,
-                        preferredSave = SaveLocation.Remote,
-                        overrideLocalChangeNumber = -1,
-                    ).await()
-
-            syncInfo?.syncResult == SyncResult.Success
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to force Steam cloud download for appId=%d", appId)
-            false
-        }
-
     private suspend fun forceGogDownload(
         context: Context,
         shortcut: Shortcut,
     ): Boolean {
-        val rawAppId = shortcut.getExtra("app_id").ifEmpty { shortcut.getExtra("gog_id") }
+        val rawAppId = gogGameId(shortcut)
         if (rawAppId.isEmpty()) return false
-        return forceGogDownloadById(context, rawAppId)
+        return forceGogDownloadById(context, rawAppId, gogTargetContainerId(shortcut))
     }
 
     private suspend fun forceGogDownloadById(
         context: Context,
         rawAppId: String,
+        targetContainerId: Int? = null,
     ): Boolean {
         if (rawAppId.isEmpty()) return false
         val appId = if (rawAppId.startsWith("GOG_", ignoreCase = true)) rawAppId else "GOG_$rawAppId"
         return try {
-            GOGService.syncCloudSaves(context, appId, "download")
+            GOGService.syncCloudSaves(context, appId, "download", targetContainerId)
         } catch (e: Exception) {
             Timber.e(e, "Failed to force GOG cloud download for appId=%s", appId)
             false
@@ -120,15 +110,16 @@ object CloudSyncHelper {
         shortcut: Shortcut,
     ): Boolean {
         val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return false
-        return forceEpicDownloadById(context, appId)
+        return forceEpicDownloadById(context, appId, epicTargetContainerId(shortcut))
     }
 
     private suspend fun forceEpicDownloadById(
         context: Context,
         appId: Int,
+        targetContainerId: Int? = null,
     ): Boolean =
         try {
-            EpicCloudSavesManager.syncCloudSaves(context, appId, "download")
+            EpicCloudSavesManager.syncCloudSaves(context, appId, "download", targetContainerId)
         } catch (e: Exception) {
             Timber.e(e, "Failed to force Epic cloud download for appId=%d", appId)
             false
@@ -163,11 +154,28 @@ object CloudSyncHelper {
         shortcut: Shortcut,
     ): Boolean {
         val gameSource = shortcut.getExtra("game_source")
-        val appId = shortcut.getExtra("app_id").ifEmpty { shortcut.getExtra("gog_id") }
+        val appId = storeGameId(shortcut)
         if (gameSource.isEmpty() || appId.isEmpty()) return false
 
         val prefs = context.getSharedPreferences("cloud_sync_state", Context.MODE_PRIVATE)
-        return prefs.contains("synced_${gameSource}_$appId")
+        if (prefs.contains("synced_${gameSource}_$appId")) return true
+
+        return runBlocking {
+            when (gameSource) {
+                "STEAM" ->
+                    SteamCloudSyncHelper.hasActualLocalSaves(
+                        context,
+                        appId.toIntOrNull() ?: return@runBlocking false,
+                        SteamCloudSyncHelper.resolveShortcutContainer(context, shortcut),
+                    )
+                "EPIC" -> {
+                    val epicAppId = appId.toIntOrNull() ?: return@runBlocking false
+                    EpicCloudSavesManager.getResolvedSaveDirectory(context, epicAppId, epicTargetContainerId(shortcut))?.hasAnyFile() == true
+                }
+                "GOG" -> GOGService.hasActualLocalCloudSaves(context, normalizeGogAppId(appId), gogTargetContainerId(shortcut))
+                else -> false
+            }
+        }
     }
 
     /**
@@ -179,7 +187,7 @@ object CloudSyncHelper {
         shortcut: Shortcut,
     ) {
         val gameSource = shortcut.getExtra("game_source")
-        val appId = shortcut.getExtra("app_id").ifEmpty { shortcut.getExtra("gog_id") }
+        val appId = storeGameId(shortcut)
         if (gameSource.isEmpty() || appId.isEmpty()) return
 
         val prefs = context.getSharedPreferences("cloud_sync_state", Context.MODE_PRIVATE)
@@ -193,8 +201,8 @@ object CloudSyncHelper {
      * - **Steam**: compares local vs remote change numbers (single metadata call).
      * - **Epic**: uses [EpicCloudSavesManager.needsSync] which evaluates the
      *   sync action without performing it.
-     * - **GOG**: defaults to `true` when local saves exist (no lightweight
-     *   probe available; user is safely prompted).
+     * - **GOG**: compares resolved local saves with the provider file list
+     *   without downloading or uploading files.
      *
      * @return `true` if cloud data differs from local (dialog should be shown),
      *         `false` if saves are in sync or if the check cannot be performed.
@@ -210,23 +218,20 @@ object CloudSyncHelper {
             try {
                 when (shortcut.getExtra("game_source")) {
                     "STEAM" -> {
-                        val appId =
-                            shortcut.getExtra("app_id").toIntOrNull()
-                                ?: return@runBlocking false
-                        // Returns null when service is unavailable → treat as "can't tell"
-                        SteamService.cloudSavesDiffer(appId) ?: true
+                        SteamCloudSyncHelper.cloudSavesDiffer(context, shortcut)
                     }
 
                     "EPIC" -> {
                         val appId =
                             shortcut.getExtra("app_id").toIntOrNull()
                                 ?: return@runBlocking false
-                        EpicCloudSavesManager.needsSync(context, appId)
+                        EpicCloudSavesManager.needsSync(context, appId, epicTargetContainerId(shortcut))
                     }
 
-                    // GOG has no lightweight probe; default to prompting user
+                    // GOG probe fetches metadata only; it does not download or upload save files.
                     "GOG" -> {
-                        true
+                        val appId = gogGameId(shortcut)
+                        GOGService.cloudSavesDiffer(context, normalizeGogAppId(appId), gogTargetContainerId(shortcut)) ?: true
                     }
 
                     else -> {
@@ -242,79 +247,96 @@ object CloudSyncHelper {
     }
 
     @JvmStatic
-    fun getConflictTimestamps(
+    fun getEpicPendingSyncAction(
         context: Context,
         shortcut: Shortcut,
-    ): CloudSyncConflictTimestamps =
+    ): EpicCloudSavesManager.SyncAction =
         runBlocking {
             try {
-                when (shortcut.getExtra("game_source")) {
-                    "EPIC" -> {
-                        val appId = shortcut.getExtra("app_id").toIntOrNull()
-                        val saveDir = appId?.let { EpicCloudSavesManager.getResolvedSaveDirectory(context, it) }
-                        val localNewest =
-                            saveDir
-                                ?.takeIf { it.exists() }
-                                ?.walkTopDown()
-                                ?.filter { it.isFile }
-                                ?.maxOfOrNull(File::lastModified)
-                        // Must match the SharedPreferences name written by EpicCloudSavesManager.setSyncTimestamp.
-                        // Reading from "epic_games" silently always returned null and the conflict dialog
-                        // displayed "Unknown" for the cloud timestamp on every Epic prompt.
-                        val prefs = context.getSharedPreferences("epic_cloud_saves", Context.MODE_PRIVATE)
-                        val cloudTimestamp =
-                            prefs
-                                .getString("sync_timestamp_${appId ?: 0}", null)
-                                ?.let { runCatching { Instant.parse(it).toEpochMilli() }.getOrNull() }
-                        CloudSyncConflictTimestamps(
-                            localTimestampLabel = formatTimestamp(localNewest),
-                            cloudTimestampLabel = formatTimestamp(cloudTimestamp),
-                        )
-                    }
+                val appId =
+                    shortcut.getExtra("app_id").toIntOrNull()
+                        ?: return@runBlocking EpicCloudSavesManager.SyncAction.NONE
+                EpicCloudSavesManager.getPendingSyncAction(context, appId, epicTargetContainerId(shortcut))
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to probe Epic cloud sync action for %s", shortcut.name)
+                EpicCloudSavesManager.SyncAction.NONE
+            }
+        }
 
-                    "GOG" -> {
-                        val appId = shortcut.getExtra("app_id").ifEmpty { shortcut.getExtra("gog_id") }
-                        val installPath = shortcut.getExtra("game_install_path")
-                        val localNewest =
-                            installPath
-                                .takeIf { it.isNotEmpty() }
-                                ?.let { File(it) }
-                                ?.takeIf { it.exists() }
-                                ?.walkTopDown()
-                                ?.filter { it.isFile }
-                                ?.maxOfOrNull(File::lastModified)
-                        val rawAppId = if (appId.startsWith("GOG_", ignoreCase = true)) appId else "GOG_$appId"
-                        val gogManager = GOGService.getInstance()?.gogManager
-                        val cloudTimestamp =
-                            gogManager
-                                ?.getCloudSaveSyncTimestamp(rawAppId, "default")
-                                ?.toLongOrNull()
-                                ?.times(1000)
-                        CloudSyncConflictTimestamps(
-                            localTimestampLabel = formatTimestamp(localNewest),
-                            cloudTimestampLabel = formatTimestamp(cloudTimestamp),
-                        )
-                    }
+    @JvmStatic
+    fun getGogPendingSyncAction(
+        context: Context,
+        shortcut: Shortcut,
+    ): GOGCloudSavesManager.SyncAction =
+        runBlocking {
+            try {
+                val rawAppId = gogGameId(shortcut)
+                if (rawAppId.isEmpty()) return@runBlocking GOGCloudSavesManager.SyncAction.NONE
+                GOGService.getPendingSyncAction(context, normalizeGogAppId(rawAppId), gogTargetContainerId(shortcut))
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to probe GOG cloud sync action for %s", shortcut.name)
+                GOGCloudSavesManager.SyncAction.NONE
+            }
+        }
 
-                    "STEAM" -> {
-                        val appId = shortcut.getExtra("app_id").toIntOrNull()
-                        val localTracked =
-                            appId
-                                ?.let { SteamService.getTrackedCloudSaveFiles(it) }
-                                ?.maxOfOrNull { it.timestamp }
-                        CloudSyncConflictTimestamps(
-                            localTimestampLabel = formatTimestamp(localTracked),
-                            cloudTimestampLabel = "Unknown",
-                        )
-                    }
+    @JvmStatic
+    fun getEpicConflictTimestamps(
+        context: Context,
+        shortcut: Shortcut,
+    ): EpicCloudConflictTimestamps =
+        runBlocking {
+            try {
+                val appId = shortcut.getExtra("app_id").toIntOrNull()
+                val saveDir = appId?.let { EpicCloudSavesManager.getResolvedSaveDirectory(context, it, epicTargetContainerId(shortcut)) }
+                val localNewest =
+                    saveDir
+                        ?.takeIf { it.exists() }
+                        ?.walkTopDown()
+                        ?.filter { it.isFile }
+                        ?.maxOfOrNull(File::lastModified)
+                // Must match the SharedPreferences name written by EpicCloudSavesManager.setSyncTimestamp.
+                // Reading from "epic_games" silently always returned null and the conflict dialog
+                // displayed "Unknown" for the cloud timestamp on every Epic prompt.
+                val prefs = context.getSharedPreferences("epic_cloud_saves", Context.MODE_PRIVATE)
+                val cloudTimestamp =
+                    prefs
+                        .getString("sync_timestamp_${appId ?: 0}", null)
+                        ?.let { runCatching { Instant.parse(it).toEpochMilli() }.getOrNull() }
+                EpicCloudConflictTimestamps(
+                    localTimestampLabel = formatTimestamp(localNewest),
+                    cloudTimestampLabel = formatTimestamp(cloudTimestamp),
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to build Epic cloud conflict timestamps for %s", shortcut.name)
+                EpicCloudConflictTimestamps("Unknown", "Unknown")
+            }
+        }
 
-                    else -> {
-                        CloudSyncConflictTimestamps("Unknown", "Unknown")
-                    }
-                }
+    @JvmStatic
+    fun getGogConflictTimestamps(
+        context: Context,
+        shortcut: Shortcut,
+    ): GogCloudConflictTimestamps =
+        runBlocking {
+            try {
+                val appId = gogGameId(shortcut)
+                val gogContainer = gogTargetContainerId(shortcut)
+                val localNewest =
+                    GOGService
+                        .getResolvedSaveDirectories(context, normalizeGogAppId(appId), gogContainer)
+                        .asSequence()
+                        .filter { it.exists() }
+                        .flatMap { it.walkTopDown().asSequence() }
+                        .filter { it.isFile }
+                        .maxOfOrNull(File::lastModified)
+                val cloudTimestamp = GOGService.getNewestCloudSaveSyncTimestamp(context, normalizeGogAppId(appId), gogContainer)
+                GogCloudConflictTimestamps(
+                    localTimestampLabel = formatTimestamp(localNewest),
+                    cloudTimestampLabel = formatTimestamp(cloudTimestamp),
+                )
             } catch (e: Exception) {
-                Timber.e(e, "Failed to build cloud conflict timestamps for %s", shortcut.name)
-                CloudSyncConflictTimestamps("Unknown", "Unknown")
+                Timber.e(e, "Failed to build GOG cloud conflict timestamps for %s", shortcut.name)
+                GogCloudConflictTimestamps("Unknown", "Unknown")
             }
         }
 
@@ -330,7 +352,7 @@ object CloudSyncHelper {
         val result =
             runBlocking {
                 when (shortcut.getExtra("game_source")) {
-                    "STEAM" -> forceSteamDownload(context, shortcut)
+                    "STEAM" -> SteamCloudSyncHelper.forceDownload(context, shortcut)
                     "GOG" -> forceGogDownload(context, shortcut)
                     "EPIC" -> forceEpicDownload(context, shortcut)
                     else -> false
@@ -349,28 +371,84 @@ object CloudSyncHelper {
     }
 
     /**
-     * Download cloud saves for a game without requiring a container shortcut.
-     * Useful from the Cloud Saves screen when the user hasn't launched or pinned
-     * the game yet (so no shortcut exists), but still wants to pull saves down.
+     * Uploads the current local save files to the store cloud and records a sync marker.
      */
     @JvmStatic
+    fun uploadCloudSaves(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        val result =
+            runBlocking {
+                when (shortcut.getExtra("game_source")) {
+                    "STEAM" -> false
+                    "GOG" -> uploadGogCloudSaves(context, shortcut)
+                    "EPIC" -> uploadEpicCloudSaves(context, shortcut)
+                    else -> false
+                }
+            }
+        if (result) {
+            markCloudSaveSynced(context, shortcut)
+        }
+        Timber.i(
+            "Cloud save upload for %s (source=%s): %s",
+            shortcut.name,
+            shortcut.getExtra("game_source"),
+            result,
+        )
+        return result
+    }
+
+    private suspend fun uploadGogCloudSaves(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        val rawAppId = gogGameId(shortcut)
+        if (rawAppId.isEmpty()) return false
+        return try {
+            GOGService.syncCloudSaves(context, normalizeGogAppId(rawAppId), "upload", gogTargetContainerId(shortcut))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to upload GOG cloud saves for appId=%s", rawAppId)
+            false
+        }
+    }
+
+    private suspend fun uploadEpicCloudSaves(
+        context: Context,
+        shortcut: Shortcut,
+    ): Boolean {
+        val appId = shortcut.getExtra("app_id").toIntOrNull() ?: return false
+        return try {
+            // Launch conflict handling should not create a fresh Epic manifest
+            // when the local files are older than, or equal to, the cloud copy.
+            EpicCloudSavesManager.syncCloudSaves(context, appId, "exit_upload", epicTargetContainerId(shortcut))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to upload Epic cloud saves for appId=%d", appId)
+            false
+        }
+    }
+
+    @JvmStatic
+    @JvmOverloads
     fun downloadCloudSaves(
         context: Context,
         source: GameSaveBackupManager.GameSource,
         gameId: String,
+        shortcut: Shortcut? = null,
     ): Boolean {
         val result =
             runBlocking {
                 when (source) {
                     GameSaveBackupManager.GameSource.STEAM -> {
-                        val appId = gameId.toIntOrNull() ?: return@runBlocking false
-                        forceSteamDownloadById(context, appId)
+                        SteamCloudSyncHelper.forceDownloadById(context, gameId.toIntOrNull() ?: return@runBlocking false)
                     }
                     GameSaveBackupManager.GameSource.EPIC -> {
                         val appId = gameId.toIntOrNull() ?: return@runBlocking false
-                        forceEpicDownloadById(context, appId)
+                        forceEpicDownloadById(context, appId, shortcut?.let(::epicTargetContainerId))
                     }
-                    GameSaveBackupManager.GameSource.GOG -> forceGogDownloadById(context, gameId)
+                    GameSaveBackupManager.GameSource.GOG ->
+                        forceGogDownloadById(context, gameId, shortcut?.let(::gogTargetContainerId))
+                    GameSaveBackupManager.GameSource.CUSTOM -> false
                 }
             }
         if (result) {
diff --git a/app/src/main/feature/sync/EpicCloudConflictUi.kt b/app/src/main/feature/sync/EpicCloudConflictUi.kt
new file mode 100644
index 000000000..ed7aac223
--- /dev/null
+++ b/app/src/main/feature/sync/EpicCloudConflictUi.kt
@@ -0,0 +1,409 @@
+package com.winlator.cmod.feature.sync
+
+import android.app.Activity
+import android.app.Dialog
+import android.util.TypedValue
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val EpicCloudConflictWindow = Color(0xFF171A21)
+private val EpicCloudConflictPanel = Color(0xFF1B2838)
+private val EpicCloudConflictText = Color(0xFFD6D7D9)
+private val EpicCloudConflictBlue = Color(0xFF66C0F4)
+private val EpicPanelAlt = Color(0xFF101822)
+private val EpicBorder = Color(0xFF2A475E)
+private val EpicButton = Color(0xFF2A9FD6)
+private val EpicButtonText = Color(0xFFE5F3FF)
+private val EpicMuted = Color(0xFF8F98A0)
+
+data class EpicCloudConflictTimestamps(
+    val localTimestampLabel: String,
+    val cloudTimestampLabel: String,
+)
+
+object EpicCloudConflictDialog {
+    @JvmStatic
+    fun show(
+        activity: Activity,
+        timestamps: EpicCloudConflictTimestamps,
+        onUseCloud: (keepBackup: Boolean) -> Unit,
+        onUseLocal: (keepBackup: Boolean) -> Unit,
+    ) {
+        val dialog =
+            Dialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
+                requestWindowFeature(Window.FEATURE_NO_TITLE)
+                setCancelable(false)
+                window?.apply {
+                    setLayout(
+                        WindowManager.LayoutParams.MATCH_PARENT,
+                        WindowManager.LayoutParams.WRAP_CONTENT,
+                    )
+                    setBackgroundDrawableResource(android.R.color.transparent)
+                }
+            }
+
+        val navRegistry = PaneNavRegistry()
+
+        val composeView =
+            ComposeView(activity).apply {
+                layoutParams =
+                    ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                    )
+                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+                (activity as? ComponentActivity)?.let {
+                    setViewTreeLifecycleOwner(it)
+                    setViewTreeSavedStateRegistryOwner(it)
+                }
+                setContent {
+                    WinNativeTheme(
+                        colorScheme =
+                            darkColorScheme(
+                                primary = EpicCloudConflictBlue,
+                                surface = EpicCloudConflictPanel,
+                                background = EpicCloudConflictWindow,
+                                onSurface = EpicCloudConflictText,
+                                onBackground = EpicCloudConflictText,
+                            ),
+                    ) {
+                        EpicCloudConflictDialogContent(
+                            navRegistry = navRegistry,
+                            timestamps = timestamps,
+                            onUseCloud = { keep ->
+                                dialog.dismiss()
+                                onUseCloud(keep)
+                            },
+                            onUseLocal = { keep ->
+                                dialog.dismiss()
+                                onUseLocal(keep)
+                            },
+                        )
+                    }
+                }
+            }
+
+        dialog.setContentView(composeView)
+        dialog.show()
+        val restoreNav = dialog.window?.bindPaneNav(navRegistry, onDismiss = {})
+        dialog.setOnDismissListener { restoreNav?.invoke() }
+        dialog.window?.apply {
+            val dm = activity.resources.displayMetrics
+            val horizontalMarginPx =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, dm).toInt()
+            val maxDialogWidthPx =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 520f, dm).toInt()
+            val targetWidth = (dm.widthPixels - (horizontalMarginPx * 2)).coerceAtMost(maxDialogWidthPx)
+            setLayout(targetWidth, WindowManager.LayoutParams.WRAP_CONTENT)
+        }
+    }
+}
+
+@Composable
+internal fun EpicCloudConflictDialogContent(
+    navRegistry: PaneNavRegistry,
+    timestamps: EpicCloudConflictTimestamps,
+    onUseCloud: (keepBackup: Boolean) -> Unit,
+    onUseLocal: (keepBackup: Boolean) -> Unit,
+) {
+    val scrollState = rememberScrollState()
+    var keepBackup by remember { mutableStateOf(true) }
+
+    CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+    Surface(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(10.dp)
+                .widthIn(max = 520.dp),
+        shape = RoundedCornerShape(3.dp),
+        color = EpicCloudConflictWindow,
+        border = BorderStroke(1.dp, EpicBorder),
+        tonalElevation = 0.dp,
+    ) {
+        BoxWithConstraints {
+            val compactActions = maxWidth < 380.dp
+            Column(
+                modifier =
+                    Modifier
+                        .background(EpicCloudConflictWindow)
+                        .heightIn(max = 430.dp),
+            ) {
+                Text(
+                    text = "Epic Cloud Sync Conflict",
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .background(EpicCloudConflictPanel)
+                            .border(BorderStroke(0.dp, EpicCloudConflictPanel))
+                            .padding(horizontal = 14.dp, vertical = 9.dp),
+                    color = EpicCloudConflictBlue,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+
+                Column(
+                    modifier =
+                        Modifier
+                            .weight(1f, fill = false)
+                            .verticalScroll(scrollState)
+                            .padding(horizontal = 14.dp, vertical = 12.dp),
+                    verticalArrangement = Arrangement.spacedBy(10.dp),
+                ) {
+                    Text(
+                        text = "Your local save data does not match Epic Games cloud saves.",
+                        color = EpicCloudConflictText,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.SemiBold,
+                    )
+                    Text(
+                        text = "Choose whether to keep the saves on this device or replace them with the Epic Games cloud version before launching.",
+                        color = EpicMuted,
+                        fontSize = 12.sp,
+                        lineHeight = 16.sp,
+                    )
+
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(EpicPanelAlt)
+                                .border(1.dp, EpicBorder, RoundedCornerShape(2.dp))
+                                .padding(horizontal = 12.dp, vertical = 10.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        EpicVersionLine("Local saves", timestamps.localTimestampLabel)
+                        EpicVersionLine("Epic cloud saves", timestamps.cloudTimestampLabel)
+                    }
+
+                    EpicKeepBackupCheckbox(
+                        checked = keepBackup,
+                        onCheckedChange = { keepBackup = it },
+                    )
+                }
+
+                if (compactActions) {
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(EpicCloudConflictPanel)
+                                .padding(10.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        EpicOutlinedButton(
+                            "Use Local Saves",
+                            Modifier.fillMaxWidth().paneNavItem(onActivate = { onUseLocal(keepBackup) }),
+                        ) {
+                            onUseLocal(keepBackup)
+                        }
+                        EpicPrimaryButton(
+                            "Use Epic Cloud",
+                            Modifier.fillMaxWidth()
+                                .paneNavItem(onActivate = { onUseCloud(keepBackup) }, isEntry = true),
+                        ) {
+                            onUseCloud(keepBackup)
+                        }
+                    }
+                } else {
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(EpicCloudConflictPanel)
+                                .padding(10.dp),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        Spacer(modifier = Modifier.weight(1f))
+                        EpicOutlinedButton(
+                            "Use Local Saves",
+                            Modifier.widthIn(min = 132.dp).paneNavItem(onActivate = { onUseLocal(keepBackup) }),
+                        ) {
+                            onUseLocal(keepBackup)
+                        }
+                        EpicPrimaryButton(
+                            "Use Epic Cloud",
+                            Modifier.widthIn(min = 132.dp)
+                                .paneNavItem(onActivate = { onUseCloud(keepBackup) }, isEntry = true),
+                        ) {
+                            onUseCloud(keepBackup)
+                        }
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun EpicKeepBackupCheckbox(
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Surface(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .paneNavItem(
+                    cornerRadius = 2.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    onAdjust = { onCheckedChange(!checked) },
+                    tapToSelect = true,
+                ),
+        shape = RoundedCornerShape(2.dp),
+        color = EpicPanelAlt,
+        border = BorderStroke(1.dp, EpicBorder),
+    ) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp, vertical = 4.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Checkbox(
+                checked = checked,
+                onCheckedChange = onCheckedChange,
+                colors =
+                    CheckboxDefaults.colors(
+                        checkedColor = EpicCloudConflictBlue,
+                        uncheckedColor = EpicMuted,
+                        checkmarkColor = EpicCloudConflictWindow,
+                    ),
+            )
+            Spacer(Modifier.widthIn(min = 2.dp))
+            Column(modifier = Modifier.padding(start = 4.dp)) {
+                Text(
+                    text = stringResource(R.string.cloud_saves_keep_replaced_backup),
+                    color = EpicCloudConflictText,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Medium,
+                )
+                Text(
+                    text = stringResource(R.string.cloud_saves_keep_replaced_backup_summary),
+                    color = EpicMuted,
+                    fontSize = 11.sp,
+                    lineHeight = 14.sp,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun EpicVersionLine(
+    label: String,
+    timestamp: String,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = label,
+            modifier = Modifier.widthIn(min = 86.dp),
+            color = EpicMuted,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium,
+        )
+        Text(
+            text = timestamp,
+            color = EpicCloudConflictText,
+            fontSize = 12.sp,
+        )
+    }
+}
+
+@Composable
+private fun EpicPrimaryButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.height(34.dp),
+        shape = RoundedCornerShape(2.dp),
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor = EpicButton,
+                contentColor = EpicButtonText,
+            ),
+        contentPadding = ButtonDefaults.ContentPadding,
+    ) {
+        Text(text = text, fontSize = 12.sp, fontWeight = FontWeight.SemiBold)
+    }
+}
+
+@Composable
+private fun EpicOutlinedButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        modifier = modifier.height(34.dp),
+        shape = RoundedCornerShape(2.dp),
+        colors =
+            ButtonDefaults.outlinedButtonColors(
+                contentColor = EpicCloudConflictText,
+                containerColor = Color.Transparent,
+            ),
+        border = BorderStroke(1.dp, EpicBorder),
+        contentPadding = ButtonDefaults.ContentPadding,
+    ) {
+        Text(text = text, fontSize = 12.sp, fontWeight = FontWeight.Medium)
+    }
+}
diff --git a/app/src/main/feature/sync/EpicLaunchCloudSync.kt b/app/src/main/feature/sync/EpicLaunchCloudSync.kt
new file mode 100644
index 000000000..e1400696c
--- /dev/null
+++ b/app/src/main/feature/sync/EpicLaunchCloudSync.kt
@@ -0,0 +1,158 @@
+package com.winlator.cmod.feature.sync
+
+import android.app.Activity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.google.GoogleAuthMode
+import com.winlator.cmod.runtime.container.Shortcut
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+object EpicLaunchCloudSync {
+    fun interface StatusSink {
+        fun show(text: String)
+    }
+
+    @JvmStatic
+    fun syncBeforeLaunch(
+        activity: Activity,
+        shortcut: Shortcut?,
+        cloudSyncEnabled: Boolean,
+        statusSink: StatusSink,
+    ) {
+        if (shortcut == null) return
+        if (shortcut.getExtra("game_source") != "EPIC") return
+        if (!cloudSyncEnabled || CloudSyncHelper.isOfflineMode(shortcut)) return
+
+        CloudSyncHelper.forceDownloadOnContainerSwap(activity, shortcut)
+
+        if (!CloudSyncHelper.hasLocalCloudSaves(activity, shortcut)) {
+            statusSink.show(activity.getString(R.string.preloader_downloading_cloud))
+            CloudSyncHelper.downloadCloudSaves(activity, shortcut)
+            statusSink.show(activity.getString(R.string.preloader_initializing))
+            return
+        }
+
+        when (CloudSyncHelper.getEpicPendingSyncAction(activity, shortcut)) {
+            EpicCloudSavesManager.SyncAction.NONE -> return
+            EpicCloudSavesManager.SyncAction.DOWNLOAD -> {
+                statusSink.show(activity.getString(R.string.preloader_downloading_cloud))
+                CloudSyncHelper.downloadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+                return
+            }
+            EpicCloudSavesManager.SyncAction.UPLOAD -> {
+                statusSink.show(activity.getString(R.string.preloader_syncing_cloud))
+                CloudSyncHelper.uploadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+                return
+            }
+            EpicCloudSavesManager.SyncAction.CONFLICT -> {
+                // Fall through to the conflict dialog below.
+            }
+        }
+
+        val dialogLatch = CountDownLatch(1)
+        var useCloud = false
+        var useLocal = false
+        var keepBackup = false
+        val timestamps = CloudSyncHelper.getEpicConflictTimestamps(activity, shortcut)
+
+        val lifecycle = (activity as? LifecycleOwner)?.lifecycle
+        val cancelObserver =
+            LifecycleEventObserver { _, event ->
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    Timber.tag("EpicLaunchCloudSync").w(
+                        "Activity destroyed while Epic cloud-conflict dialog was up; releasing latch",
+                    )
+                    dialogLatch.countDown()
+                }
+            }
+
+        activity.runOnUiThread {
+            lifecycle?.addObserver(cancelObserver)
+            EpicCloudConflictDialog.show(
+                activity = activity,
+                timestamps = timestamps,
+                onUseCloud = { keep ->
+                    useCloud = true
+                    keepBackup = keep
+                    dialogLatch.countDown()
+                },
+                onUseLocal = { keep ->
+                    useCloud = false
+                    useLocal = true
+                    keepBackup = keep
+                    dialogLatch.countDown()
+                },
+            )
+        }
+
+        try {
+            if (!dialogLatch.await(10, TimeUnit.MINUTES)) {
+                Timber.tag("EpicLaunchCloudSync").w(
+                    "Epic cloud-conflict dialog timed out after 10 minutes; treating as 'keep local'",
+                )
+            }
+        } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
+            activity.runOnUiThread { lifecycle?.removeObserver(cancelObserver) }
+            return
+        }
+
+        activity.runOnUiThread { lifecycle?.removeObserver(cancelObserver) }
+
+        when {
+            useCloud -> {
+                if (keepBackup) {
+                    // "Use Cloud" overwrites the local save — back it up first (M-1).
+                    backupLocalSaveToGoogle(activity, shortcut)
+                }
+                statusSink.show(activity.getString(R.string.preloader_syncing_cloud))
+                CloudSyncHelper.downloadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+            }
+            useLocal -> {
+                if (keepBackup) {
+                    // "Use Local" pushes local over the Epic cloud; Epic has no non-destructive cloud capture (only Steam does), so back up the local save to Google as the recovery point.
+                    backupLocalSaveToGoogle(activity, shortcut)
+                }
+                statusSink.show(activity.getString(R.string.preloader_syncing_cloud))
+                CloudSyncHelper.uploadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+            }
+        }
+    }
+
+    /** Back up the local Epic save before a "Use Cloud" download overwrites it — mirrors to Google Play Games (no-op when not signed in). Best-effort; never blocks the launch path. */
+    private fun backupLocalSaveToGoogle(
+        activity: Activity,
+        shortcut: Shortcut,
+    ) {
+        val gameId = shortcut.getExtra("app_id").takeIf { it.isNotEmpty() } ?: return
+        val gameName = shortcut.name ?: "Unknown"
+        try {
+            val result =
+                runBlocking(Dispatchers.IO) {
+                    GameSaveBackupManager.backupSaveToGoogle(
+                        activity = activity,
+                        gameSource = GameSaveBackupManager.GameSource.EPIC,
+                        gameId = gameId,
+                        gameName = gameName,
+                        origin = GameSaveBackupManager.BackupOrigin.LOCAL,
+                        authMode = GoogleAuthMode.RESUME,
+                    )
+                }
+            Timber.tag("EpicLaunchCloudSync").i("Pre-overwrite Epic local backup: %s", result.message)
+        } catch (e: Exception) {
+            Timber.tag("EpicLaunchCloudSync").w(e, "Failed to back up Epic local save before Use-Cloud")
+        }
+    }
+}
diff --git a/app/src/main/feature/sync/GogCloudConflictUi.kt b/app/src/main/feature/sync/GogCloudConflictUi.kt
new file mode 100644
index 000000000..0c85ef4ad
--- /dev/null
+++ b/app/src/main/feature/sync/GogCloudConflictUi.kt
@@ -0,0 +1,409 @@
+package com.winlator.cmod.feature.sync
+
+import android.app.Activity
+import android.app.Dialog
+import android.util.TypedValue
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val GogCloudConflictWindow = Color(0xFF171A21)
+private val GogCloudConflictPanel = Color(0xFF1B2838)
+private val GogCloudConflictText = Color(0xFFD6D7D9)
+private val GogCloudConflictBlue = Color(0xFF66C0F4)
+private val GogPanelAlt = Color(0xFF101822)
+private val GogBorder = Color(0xFF2A475E)
+private val GogButton = Color(0xFF2A9FD6)
+private val GogButtonText = Color(0xFFE5F3FF)
+private val GogMuted = Color(0xFF8F98A0)
+
+data class GogCloudConflictTimestamps(
+    val localTimestampLabel: String,
+    val cloudTimestampLabel: String,
+)
+
+object GogCloudConflictDialog {
+    @JvmStatic
+    fun show(
+        activity: Activity,
+        timestamps: GogCloudConflictTimestamps,
+        onUseCloud: (keepBackup: Boolean) -> Unit,
+        onUseLocal: (keepBackup: Boolean) -> Unit,
+    ) {
+        val dialog =
+            Dialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
+                requestWindowFeature(Window.FEATURE_NO_TITLE)
+                setCancelable(false)
+                window?.apply {
+                    setLayout(
+                        WindowManager.LayoutParams.MATCH_PARENT,
+                        WindowManager.LayoutParams.WRAP_CONTENT,
+                    )
+                    setBackgroundDrawableResource(android.R.color.transparent)
+                }
+            }
+
+        val navRegistry = PaneNavRegistry()
+
+        val composeView =
+            ComposeView(activity).apply {
+                layoutParams =
+                    ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                    )
+                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+                (activity as? ComponentActivity)?.let {
+                    setViewTreeLifecycleOwner(it)
+                    setViewTreeSavedStateRegistryOwner(it)
+                }
+                setContent {
+                    WinNativeTheme(
+                        colorScheme =
+                            darkColorScheme(
+                                primary = GogCloudConflictBlue,
+                                surface = GogCloudConflictPanel,
+                                background = GogCloudConflictWindow,
+                                onSurface = GogCloudConflictText,
+                                onBackground = GogCloudConflictText,
+                            ),
+                    ) {
+                        GogCloudConflictDialogContent(
+                            navRegistry = navRegistry,
+                            timestamps = timestamps,
+                            onUseCloud = { keep ->
+                                dialog.dismiss()
+                                onUseCloud(keep)
+                            },
+                            onUseLocal = { keep ->
+                                dialog.dismiss()
+                                onUseLocal(keep)
+                            },
+                        )
+                    }
+                }
+            }
+
+        dialog.setContentView(composeView)
+        dialog.show()
+        val restoreNav = dialog.window?.bindPaneNav(navRegistry, onDismiss = {})
+        dialog.setOnDismissListener { restoreNav?.invoke() }
+        dialog.window?.apply {
+            val dm = activity.resources.displayMetrics
+            val horizontalMarginPx =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, dm).toInt()
+            val maxDialogWidthPx =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 520f, dm).toInt()
+            val targetWidth = (dm.widthPixels - (horizontalMarginPx * 2)).coerceAtMost(maxDialogWidthPx)
+            setLayout(targetWidth, WindowManager.LayoutParams.WRAP_CONTENT)
+        }
+    }
+}
+
+@Composable
+internal fun GogCloudConflictDialogContent(
+    navRegistry: PaneNavRegistry,
+    timestamps: GogCloudConflictTimestamps,
+    onUseCloud: (keepBackup: Boolean) -> Unit,
+    onUseLocal: (keepBackup: Boolean) -> Unit,
+) {
+    val scrollState = rememberScrollState()
+    var keepBackup by remember { mutableStateOf(true) }
+
+    CompositionLocalProvider(LocalPaneNav provides navRegistry) {
+    Surface(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(10.dp)
+                .widthIn(max = 520.dp),
+        shape = RoundedCornerShape(3.dp),
+        color = GogCloudConflictWindow,
+        border = BorderStroke(1.dp, GogBorder),
+        tonalElevation = 0.dp,
+    ) {
+        BoxWithConstraints {
+            val compactActions = maxWidth < 380.dp
+            Column(
+                modifier =
+                    Modifier
+                        .background(GogCloudConflictWindow)
+                        .heightIn(max = 430.dp),
+            ) {
+                Text(
+                    text = "GOG Cloud Sync Conflict",
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .background(GogCloudConflictPanel)
+                            .border(BorderStroke(0.dp, GogCloudConflictPanel))
+                            .padding(horizontal = 14.dp, vertical = 9.dp),
+                    color = GogCloudConflictBlue,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+
+                Column(
+                    modifier =
+                        Modifier
+                            .weight(1f, fill = false)
+                            .verticalScroll(scrollState)
+                            .padding(horizontal = 14.dp, vertical = 12.dp),
+                    verticalArrangement = Arrangement.spacedBy(10.dp),
+                ) {
+                    Text(
+                        text = "Your local save data does not match GOG cloud saves.",
+                        color = GogCloudConflictText,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.SemiBold,
+                    )
+                    Text(
+                        text = "Choose whether to keep the saves on this device or replace them with the GOG cloud version before launching.",
+                        color = GogMuted,
+                        fontSize = 12.sp,
+                        lineHeight = 16.sp,
+                    )
+
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(GogPanelAlt)
+                                .border(1.dp, GogBorder, RoundedCornerShape(2.dp))
+                                .padding(horizontal = 12.dp, vertical = 10.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        GogVersionLine("Local saves", timestamps.localTimestampLabel)
+                        GogVersionLine("GOG cloud saves", timestamps.cloudTimestampLabel)
+                    }
+
+                    GogKeepBackupCheckbox(
+                        checked = keepBackup,
+                        onCheckedChange = { keepBackup = it },
+                    )
+                }
+
+                if (compactActions) {
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(GogCloudConflictPanel)
+                                .padding(10.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        GogOutlinedButton(
+                            "Use Local Saves",
+                            Modifier.fillMaxWidth().paneNavItem(onActivate = { onUseLocal(keepBackup) }),
+                        ) {
+                            onUseLocal(keepBackup)
+                        }
+                        GogPrimaryButton(
+                            "Use GOG Cloud",
+                            Modifier.fillMaxWidth()
+                                .paneNavItem(onActivate = { onUseCloud(keepBackup) }, isEntry = true),
+                        ) {
+                            onUseCloud(keepBackup)
+                        }
+                    }
+                } else {
+                    Row(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .background(GogCloudConflictPanel)
+                                .padding(10.dp),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        Spacer(modifier = Modifier.weight(1f))
+                        GogOutlinedButton(
+                            "Use Local Saves",
+                            Modifier.widthIn(min = 132.dp).paneNavItem(onActivate = { onUseLocal(keepBackup) }),
+                        ) {
+                            onUseLocal(keepBackup)
+                        }
+                        GogPrimaryButton(
+                            "Use GOG Cloud",
+                            Modifier.widthIn(min = 132.dp)
+                                .paneNavItem(onActivate = { onUseCloud(keepBackup) }, isEntry = true),
+                        ) {
+                            onUseCloud(keepBackup)
+                        }
+                    }
+                }
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun GogKeepBackupCheckbox(
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Surface(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .paneNavItem(
+                    cornerRadius = 2.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    onAdjust = { onCheckedChange(!checked) },
+                    tapToSelect = true,
+                ),
+        shape = RoundedCornerShape(2.dp),
+        color = GogPanelAlt,
+        border = BorderStroke(1.dp, GogBorder),
+    ) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp, vertical = 4.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Checkbox(
+                checked = checked,
+                onCheckedChange = onCheckedChange,
+                colors =
+                    CheckboxDefaults.colors(
+                        checkedColor = GogCloudConflictBlue,
+                        uncheckedColor = GogMuted,
+                        checkmarkColor = GogCloudConflictWindow,
+                    ),
+            )
+            Spacer(Modifier.widthIn(min = 2.dp))
+            Column(modifier = Modifier.padding(start = 4.dp)) {
+                Text(
+                    text = stringResource(R.string.cloud_saves_keep_replaced_backup),
+                    color = GogCloudConflictText,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Medium,
+                )
+                Text(
+                    text = stringResource(R.string.cloud_saves_keep_replaced_backup_summary),
+                    color = GogMuted,
+                    fontSize = 11.sp,
+                    lineHeight = 14.sp,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun GogVersionLine(
+    label: String,
+    timestamp: String,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = label,
+            modifier = Modifier.widthIn(min = 86.dp),
+            color = GogMuted,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium,
+        )
+        Text(
+            text = timestamp,
+            color = GogCloudConflictText,
+            fontSize = 12.sp,
+        )
+    }
+}
+
+@Composable
+private fun GogPrimaryButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.height(34.dp),
+        shape = RoundedCornerShape(2.dp),
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor = GogButton,
+                contentColor = GogButtonText,
+            ),
+        contentPadding = ButtonDefaults.ContentPadding,
+    ) {
+        Text(text = text, fontSize = 12.sp, fontWeight = FontWeight.SemiBold)
+    }
+}
+
+@Composable
+private fun GogOutlinedButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        modifier = modifier.height(34.dp),
+        shape = RoundedCornerShape(2.dp),
+        colors =
+            ButtonDefaults.outlinedButtonColors(
+                contentColor = GogCloudConflictText,
+                containerColor = Color.Transparent,
+            ),
+        border = BorderStroke(1.dp, GogBorder),
+        contentPadding = ButtonDefaults.ContentPadding,
+    ) {
+        Text(text = text, fontSize = 12.sp, fontWeight = FontWeight.Medium)
+    }
+}
diff --git a/app/src/main/feature/sync/GogLaunchCloudSync.kt b/app/src/main/feature/sync/GogLaunchCloudSync.kt
new file mode 100644
index 000000000..b1e5f3a8e
--- /dev/null
+++ b/app/src/main/feature/sync/GogLaunchCloudSync.kt
@@ -0,0 +1,163 @@
+package com.winlator.cmod.feature.sync
+
+import android.app.Activity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.feature.stores.gog.service.GOGCloudSavesManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.google.GoogleAuthMode
+import com.winlator.cmod.runtime.container.Shortcut
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+object GogLaunchCloudSync {
+    fun interface StatusSink {
+        fun show(text: String)
+    }
+
+    @JvmStatic
+    fun syncBeforeLaunch(
+        activity: Activity,
+        shortcut: Shortcut?,
+        cloudSyncEnabled: Boolean,
+        statusSink: StatusSink,
+    ) {
+        if (shortcut == null) return
+        if (shortcut.getExtra("game_source") != "GOG") return
+        if (!cloudSyncEnabled || CloudSyncHelper.isOfflineMode(shortcut)) return
+
+        Timber.tag("GogLaunchCloudSync").i("Checking GOG cloud saves before launch for ${shortcut.name}")
+        CloudSyncHelper.forceDownloadOnContainerSwap(activity, shortcut)
+
+        if (!CloudSyncHelper.hasLocalCloudSaves(activity, shortcut)) {
+            Timber.tag("GogLaunchCloudSync").i("No local GOG cloud-save files found; downloading before launch")
+            statusSink.show(activity.getString(R.string.preloader_downloading_cloud))
+            CloudSyncHelper.downloadCloudSaves(activity, shortcut)
+            statusSink.show(activity.getString(R.string.preloader_initializing))
+            return
+        }
+
+        val pendingAction = CloudSyncHelper.getGogPendingSyncAction(activity, shortcut)
+        Timber.tag("GogLaunchCloudSync").i("Pending GOG cloud action before launch: $pendingAction")
+        when (pendingAction) {
+            GOGCloudSavesManager.SyncAction.NONE -> return
+            GOGCloudSavesManager.SyncAction.DOWNLOAD -> {
+                statusSink.show(activity.getString(R.string.preloader_downloading_cloud))
+                CloudSyncHelper.downloadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+                return
+            }
+            GOGCloudSavesManager.SyncAction.UPLOAD -> {
+                Timber.tag("GogLaunchCloudSync").i(
+                    "Local GOG cloud saves are newer before launch; deferring upload until exit",
+                )
+                return
+            }
+            GOGCloudSavesManager.SyncAction.CONFLICT -> {
+                // Fall through to the conflict dialog below.
+            }
+        }
+
+        val dialogLatch = CountDownLatch(1)
+        var useCloud = false
+        var useLocal = false
+        var keepBackup = false
+        val timestamps = CloudSyncHelper.getGogConflictTimestamps(activity, shortcut)
+
+        val lifecycle = (activity as? LifecycleOwner)?.lifecycle
+        val cancelObserver =
+            LifecycleEventObserver { _, event ->
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    Timber.tag("GogLaunchCloudSync").w(
+                        "Activity destroyed while GOG cloud-conflict dialog was up; releasing latch",
+                    )
+                    dialogLatch.countDown()
+                }
+            }
+
+        activity.runOnUiThread {
+            lifecycle?.addObserver(cancelObserver)
+            GogCloudConflictDialog.show(
+                activity = activity,
+                timestamps = timestamps,
+                onUseCloud = { keep ->
+                    useCloud = true
+                    keepBackup = keep
+                    dialogLatch.countDown()
+                },
+                onUseLocal = { keep ->
+                    useCloud = false
+                    useLocal = true
+                    keepBackup = keep
+                    dialogLatch.countDown()
+                },
+            )
+        }
+
+        try {
+            if (!dialogLatch.await(10, TimeUnit.MINUTES)) {
+                Timber.tag("GogLaunchCloudSync").w(
+                    "GOG cloud-conflict dialog timed out after 10 minutes; treating as 'keep local'",
+                )
+            }
+        } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
+            activity.runOnUiThread { lifecycle?.removeObserver(cancelObserver) }
+            return
+        }
+
+        activity.runOnUiThread { lifecycle?.removeObserver(cancelObserver) }
+
+        when {
+            useCloud -> {
+                if (keepBackup) {
+                    // "Use Cloud" overwrites the local save — back it up first (M-2).
+                    backupLocalSaveToGoogle(activity, shortcut)
+                }
+                statusSink.show(activity.getString(R.string.preloader_syncing_cloud))
+                CloudSyncHelper.downloadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+            }
+            useLocal -> {
+                if (keepBackup) {
+                    // "Use Local" pushes local over the GOG cloud; GOG has no non-destructive cloud capture (only Steam does), so back up the local save to Google as the recovery point.
+                    backupLocalSaveToGoogle(activity, shortcut)
+                }
+                statusSink.show(activity.getString(R.string.preloader_syncing_cloud))
+                CloudSyncHelper.uploadCloudSaves(activity, shortcut)
+                statusSink.show(activity.getString(R.string.preloader_initializing))
+            }
+        }
+    }
+
+    /** Back up the local GOG save before a "Use Cloud" download overwrites it — mirrors to Google Play Games (no-op when not signed in). Best-effort; never blocks the launch path. */
+    private fun backupLocalSaveToGoogle(
+        activity: Activity,
+        shortcut: Shortcut,
+    ) {
+        val gameId =
+            shortcut.getExtra("gog_id").ifEmpty { shortcut.getExtra("app_id") }.takeIf { it.isNotEmpty() } ?: return
+        val gameName = shortcut.name ?: "Unknown"
+        try {
+            val result =
+                runBlocking(Dispatchers.IO) {
+                    GameSaveBackupManager.backupSaveToGoogle(
+                        activity = activity,
+                        gameSource = GameSaveBackupManager.GameSource.GOG,
+                        gameId = gameId,
+                        gameName = gameName,
+                        origin = GameSaveBackupManager.BackupOrigin.LOCAL,
+                        authMode = GoogleAuthMode.RESUME,
+                    )
+                }
+            Timber.tag("GogLaunchCloudSync").i("Pre-overwrite GOG local backup: %s", result.message)
+        } catch (e: Exception) {
+            Timber.tag("GogLaunchCloudSync").w(e, "Failed to back up GOG local save before Use-Cloud")
+        }
+    }
+}
diff --git a/app/src/main/feature/sync/google/CloudSyncManager.kt b/app/src/main/feature/sync/google/CloudSyncManager.kt
index da5096d67..7248b35d0 100644
--- a/app/src/main/feature/sync/google/CloudSyncManager.kt
+++ b/app/src/main/feature/sync/google/CloudSyncManager.kt
@@ -2,7 +2,6 @@ package com.winlator.cmod.feature.sync.google
 import android.app.Activity
 import android.content.Context
 import android.os.ParcelFileDescriptor
-import android.os.SystemClock
 import android.util.Log
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
@@ -52,9 +51,9 @@ object CloudSyncManager {
     private const val KEY_GOOGLE_SYNC_ENABLED = "google_sync_enabled"
     private const val KEY_LAST_SYNC_TIME = "last_sync_time"
     private const val KEY_LAST_SYNC_ERROR = "last_sync_error"
-    private const val KEY_AUTO_BACKUP_PENDING = "auto_backup_pending"
-    private const val AUTO_BACKUP_MIN_INTERVAL_MS = 60_000L // debounce: at most one auto-upload per minute
-    @Volatile private var lastAutoBackupAttemptMs: Long = 0L
+
+    /** When true, the app attempts a Google Play Games sign-in once per process launch. Off by default. */
+    private const val KEY_AUTO_SIGNIN_ON_LAUNCH = "google_auto_signin_on_launch"
     private const val SNAPSHOT_NAME = "store_logins_v1"
     private const val AUTH_SESSION_RETRY_COUNT = 5
     private const val AUTH_SESSION_RETRY_DELAY_MS = 750L
@@ -138,17 +137,6 @@ object CloudSyncManager {
             }
     }
 
-    private data class EffectiveSyncGate(
-        val syncEnabled: Boolean,
-        val authenticated: Boolean,
-        val adoptedExistingSession: Boolean,
-    )
-
-    private data class SyncEntryResult(
-        val state: StoreLoginSyncState,
-        val autoRestoreSummary: SyncSummary? = null,
-    )
-
     fun signIn(
         activity: Activity,
         callback: (Boolean, String) -> Unit,
@@ -183,16 +171,11 @@ object CloudSyncManager {
                         return@withContext false to activity.getString(R.string.google_cloud_sign_in_finishing)
                     }
 
-                    Timber.tag(TAG).i("Play Games session ready; checking Saved Games state and auto-restoring missing store tokens")
+                    Timber.tag(TAG).i("Play Games session ready; checking Saved Games state")
                     val message =
                         runCatching {
-                            val summary = autoRestoreMissingStoresFromCloud(activity, reason = "manual_sign_in")
                             val state = readStateInternal(activity, authenticated = true)
                             when {
-                                summary.restoredStores.isNotEmpty() -> {
-                                    summary.message(activity)
-                                }
-
                                 state.cloudStores.isNotEmpty() && state.cloudStores != state.localStores -> {
                                     activity.getString(R.string.google_cloud_connected_restore_available, state.cloudStores.joinToString())
                                 }
@@ -229,6 +212,14 @@ object CloudSyncManager {
         callback(true, activity.getString(R.string.google_cloud_sync_disabled))
     }
 
+    /** Whether the app should auto sign-in to Google Play Games on launch. Off by default. */
+    fun isAutoSignInOnLaunchEnabled(context: Context): Boolean =
+        prefs(context).getBoolean(KEY_AUTO_SIGNIN_ON_LAUNCH, false)
+
+    fun setAutoSignInOnLaunchEnabled(context: Context, enabled: Boolean) {
+        prefs(context).edit().putBoolean(KEY_AUTO_SIGNIN_ON_LAUNCH, enabled).apply()
+    }
+
     fun isAuthenticated(
         activity: Activity,
         callback: (Boolean) -> Unit,
@@ -241,41 +232,25 @@ object CloudSyncManager {
         }
     }
 
-    fun queueStoreLoginBackup(context: Context) {
-        Timber.tag(TAG).i(
-            "Ignoring automatic store login backup request for %s; backups are manual-only",
-            context.packageName,
-        )
-    }
-
-    fun flushPendingBackup(activity: Activity) {
-        Timber.tag(TAG).v(
-            "Skipping automatic store login backup flush for %s; backups are manual-only",
-            activity::class.java.simpleName,
-        )
-    }
-
     suspend fun syncOnGoogleScreenOpened(activity: Activity): StoreLoginSyncState =
         withContext(Dispatchers.IO) {
-            readSyncEntryState(
-                activity = activity,
-                entryReason = "google_screen_opened",
-            ).state
+            readCachedStoreLoginState(activity)
         }
 
     suspend fun readStoreLoginState(activity: Activity): StoreLoginSyncState {
         return withContext(Dispatchers.IO) {
-            val syncGate = resolveEffectiveSyncGate(activity)
-            if (!syncGate.syncEnabled) {
-                return@withContext StoreLoginSyncState(
-                    googleSignedIn = false,
-                    localStores = collectLocalStoreNames(activity),
-                    status = SyncStatus.NOT_SIGNED_IN,
-                    detail = activity.getString(R.string.google_cloud_sign_in_to_sync),
-                )
+            readCachedStoreLoginState(activity)
+        }
+    }
+
+    suspend fun refreshStoreLoginState(activity: Activity): StoreLoginSyncState {
+        return withContext(Dispatchers.IO) {
+            if (!isGoogleSyncEnabled(activity)) {
+                return@withContext notSignedInState(activity)
             }
-            Timber.tag(TAG).d("Reading store login sync state; authenticated=%s", syncGate.authenticated)
-            readStateInternal(activity, syncGate.authenticated)
+            val authenticated = isAuthenticatedBlocking(activity)
+            Timber.tag(TAG).d("Refreshing store login sync state; authenticated=%s", authenticated)
+            readStateInternal(activity, authenticated)
         }
     }
 
@@ -422,104 +397,6 @@ object CloudSyncManager {
             }
         }
 
-    private suspend fun performBackupIfAuthenticated(activity: Activity) {
-        withContext(Dispatchers.IO) {
-            Timber.tag(TAG).v(
-                "performBackupIfAuthenticated skipped for %s; backups are manual-only",
-                activity::class.java.simpleName,
-            )
-        }
-    }
-
-    /**
-     * Fire-and-forget auto-backup of store-login tokens. Invoked from credential-save paths
-     * (login, token refresh, background worker) so the Google snapshot always holds the latest
-     * refresh token instead of a stale one.
-     *
-     * - No-op if Google sync is disabled.
-     * - No-op if an earlier attempt ran within the debounce window ([AUTO_BACKUP_MIN_INTERVAL_MS]).
-     * - If an [Activity] is currently attached (app is live), uploads immediately on the manager's scope.
-     * - Otherwise marks a pending flag that [flushPendingAutoBackup] will drain on next Activity resume.
-     *
-     * Silent on both success and failure — this runs alongside normal API calls and must not
-     * interrupt the user with toasts.
-     */
-    fun scheduleAutoBackup(context: Context) {
-        if (!isGoogleSyncEnabled(context)) return
-        val now = SystemClock.elapsedRealtime()
-        if (now - lastAutoBackupAttemptMs < AUTO_BACKUP_MIN_INTERVAL_MS) {
-            Timber.tag(TAG).v("scheduleAutoBackup debounced (last attempt %d ms ago)", now - lastAutoBackupAttemptMs)
-            return
-        }
-        lastAutoBackupAttemptMs = now
-
-        val activity = com.winlator.cmod.app.shell.UnifiedActivity.currentActivity()
-        if (activity == null) {
-            Timber.tag(TAG).i("Auto-backup: no Activity attached, deferring until next foreground")
-            prefs(context).edit().putBoolean(KEY_AUTO_BACKUP_PENDING, true).apply()
-            return
-        }
-
-        scope.launch {
-            if (performAutoBackupUpload(activity)) {
-                Timber.tag(TAG).i("Auto-backup of store logins completed")
-                prefs(context).edit().putBoolean(KEY_AUTO_BACKUP_PENDING, false).apply()
-            } else {
-                // Could not upload (no Google auth yet, network error, etc.). Leave pending
-                // so the next app foreground or next credential change can retry.
-                prefs(context).edit().putBoolean(KEY_AUTO_BACKUP_PENDING, true).apply()
-            }
-        }
-    }
-
-    /**
-     * Called on Activity foreground — uploads the local payload if a previous [scheduleAutoBackup]
-     * was deferred (e.g. the refresh worker ran while the app was killed). No-op if no pending flag
-     * or sync disabled.
-     */
-    suspend fun flushPendingAutoBackup(activity: Activity) {
-        if (!prefs(activity).getBoolean(KEY_AUTO_BACKUP_PENDING, false)) return
-        if (!isGoogleSyncEnabled(activity)) {
-            prefs(activity).edit().putBoolean(KEY_AUTO_BACKUP_PENDING, false).apply()
-            return
-        }
-        Timber.tag(TAG).i("Flushing pending auto-backup of store logins")
-        if (performAutoBackupUpload(activity)) {
-            prefs(activity).edit().putBoolean(KEY_AUTO_BACKUP_PENDING, false).apply()
-            lastAutoBackupAttemptMs = SystemClock.elapsedRealtime()
-        }
-    }
-
-    /**
-     * Silent snapshot upload used by auto-backup paths. Returns true iff the upload ran to
-     * completion (including the no-op case where the remote payload already matches).
-     * Does not surface user-visible messages on failure.
-     */
-    private suspend fun performAutoBackupUpload(activity: Activity): Boolean =
-        withContext(Dispatchers.IO) {
-            if (!isAuthenticatedBlocking(activity)) {
-                Timber.tag(TAG).d("Auto-backup upload skipped: Google Play Games not authenticated")
-                return@withContext false
-            }
-            runCatching {
-                syncMutex.withLock {
-                    val localPayload = collectLocalPayload(activity)
-                    if (localPayload.stores.isEmpty()) return@withLock
-                    val remotePayload = readRemotePayload(activity).payload
-                    val shouldUpload = remotePayload == null || localPayload.fingerprint != remotePayload.fingerprint
-                    if (shouldUpload) {
-                        backupPayload(activity, localPayload)
-                    } else {
-                        Timber.tag(TAG).d("Auto-backup upload skipped: remote fingerprint already matches")
-                    }
-                }
-                true
-            }.getOrElse { err ->
-                Timber.tag(TAG).w(err, "Auto-backup upload failed")
-                false
-            }
-        }
-
     private suspend fun rehydrateRestoredStores(
         context: Context,
         restoredStores: Set<String>,
@@ -1128,31 +1005,6 @@ object CloudSyncManager {
 
     private fun prefs(context: Context) = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
 
-    private suspend fun readSyncEntryState(
-        activity: Activity,
-        entryReason: String,
-    ): SyncEntryResult {
-        val syncGate = resolveEffectiveSyncGate(activity)
-        if (!syncGate.syncEnabled) {
-            return SyncEntryResult(state = notSignedInState(activity))
-        }
-        var autoRestoreSummary: SyncSummary? = null
-        if (syncGate.adoptedExistingSession && syncGate.authenticated) {
-            runCatching {
-                autoRestoreMissingStoresFromCloud(activity, reason = "adopted_existing_session")
-            }.onFailure { error ->
-                Timber.tag(TAG).e(error, "Automatic store token restore failed after adopting existing Google session")
-            }.onSuccess { summary ->
-                autoRestoreSummary = summary
-            }
-        }
-        Timber.tag(TAG).i("%s; authenticated=%s", entryReason, syncGate.authenticated)
-        return SyncEntryResult(
-            state = readStateInternal(activity, syncGate.authenticated),
-            autoRestoreSummary = autoRestoreSummary,
-        )
-    }
-
     private fun notSignedInState(activity: Activity): StoreLoginSyncState =
         StoreLoginSyncState(
             googleSignedIn = false,
@@ -1161,64 +1013,27 @@ object CloudSyncManager {
             detail = activity.getString(R.string.google_cloud_sign_in_to_sync),
         )
 
-    private suspend fun autoRestoreMissingStoresFromCloud(
-        activity: Activity,
-        reason: String,
-    ): SyncSummary {
-        Timber.tag(TAG).i("Checking for backed up store tokens to auto-restore (%s)", reason)
-        val summary =
-            performSmartSyncWithAuthRetry(
-                activity,
-                preferRestoreForMissingStores = true,
-            )
-        clearSyncError(activity)
-        if (summary.restoredStores.isNotEmpty()) {
-            Timber.tag(TAG).i(
-                "Auto-restored backed up store tokens (%s): %s",
-                reason,
-                summary.restoredStores,
-            )
-        }
-        return summary
-    }
-
-    private suspend fun resolveEffectiveSyncGate(activity: Activity): EffectiveSyncGate {
-        val preferences = prefs(activity)
-        if (preferences.contains(KEY_GOOGLE_SYNC_ENABLED)) {
-            val syncEnabled = preferences.getBoolean(KEY_GOOGLE_SYNC_ENABLED, false)
-            if (!syncEnabled) {
-                return EffectiveSyncGate(
-                    syncEnabled = false,
-                    authenticated = false,
-                    adoptedExistingSession = false,
-                )
-            }
-            return EffectiveSyncGate(
-                syncEnabled = true,
-                authenticated = isAuthenticatedBlocking(activity),
-                adoptedExistingSession = false,
-            )
-        }
-
-        val authenticated = isAuthenticatedBlocking(activity)
-        if (authenticated) {
-            preferences
-                .edit()
-                .putBoolean(KEY_GOOGLE_SYNC_ENABLED, true)
-                .apply()
-            clearSyncError(activity)
-            Timber.tag(TAG).i("Adopted existing Google Play Games session after local prefs reset")
-            return EffectiveSyncGate(
-                syncEnabled = true,
-                authenticated = true,
-                adoptedExistingSession = true,
-            )
-        }
-
-        return EffectiveSyncGate(
-            syncEnabled = false,
-            authenticated = false,
-            adoptedExistingSession = false,
+    fun readCachedStoreLoginState(context: Context): StoreLoginSyncState {
+        val localStores = collectLocalStoreNames(context)
+        val lastSyncTime = prefs(context).getLong(KEY_LAST_SYNC_TIME, 0L).takeIf { it > 0L }
+        val syncEnabled = isGoogleSyncEnabled(context)
+        return StoreLoginSyncState(
+            googleSignedIn = syncEnabled,
+            localStores = localStores,
+            cloudStores = emptySet(),
+            lastSyncTime = lastSyncTime,
+            status =
+                when {
+                    !syncEnabled -> SyncStatus.NOT_SIGNED_IN
+                    localStores.isNotEmpty() -> SyncStatus.BACKUP_PENDING
+                    else -> SyncStatus.EMPTY
+                },
+            detail =
+                when {
+                    !syncEnabled -> context.getString(R.string.google_cloud_sign_in_to_sync)
+                    localStores.isNotEmpty() -> context.getString(R.string.google_cloud_local_ready_to_backup, localStores.joinToString())
+                    else -> context.getString(R.string.google_cloud_connected_ready)
+                },
         )
     }
 
diff --git a/app/src/main/feature/sync/google/ContainerBackupManager.java b/app/src/main/feature/sync/google/ContainerBackupManager.java
deleted file mode 100644
index aa386451e..000000000
--- a/app/src/main/feature/sync/google/ContainerBackupManager.java
+++ /dev/null
@@ -1,680 +0,0 @@
-package com.winlator.cmod.feature.sync.google;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import com.google.android.gms.auth.api.identity.AuthorizationRequest;
-import com.google.android.gms.auth.api.identity.AuthorizationResult;
-import com.google.android.gms.auth.api.identity.Identity;
-import com.google.android.gms.common.api.Scope;
-import com.google.android.gms.games.PlayGames;
-import com.google.android.gms.tasks.Tasks;
-import com.winlator.cmod.runtime.container.Container;
-import com.winlator.cmod.shared.android.ActivityResultHost;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import timber.log.Timber;
-
-public final class ContainerBackupManager {
-  private static final String TAG = "ContainerBackup";
-  private static final String DRIVE_ROOT_FOLDER_NAME = "WinNative";
-  private static final String DRIVE_CONTAINERS_FOLDER_NAME = "Containers";
-  private static final String DRIVE_FILE_SCOPE = "https://www.googleapis.com/auth/drive.file";
-  private static final String PREFS_NAME = "google_store_login_sync";
-  private static final String KEY_GOOGLE_SYNC_ENABLED = "google_sync_enabled";
-  private static final int AUTH_SESSION_RETRY_COUNT = 5;
-  private static final long AUTH_SESSION_RETRY_DELAY_MS = 750L;
-
-  private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor();
-  private static final Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-  private static final MediaType JSON_MEDIA_TYPE = MediaType.get("application/json; charset=UTF-8");
-  private static final MediaType ZIP_MEDIA_TYPE = MediaType.get("application/zip");
-
-  private static final OkHttpClient HTTP_CLIENT =
-      new OkHttpClient.Builder()
-          .connectTimeout(30, TimeUnit.SECONDS)
-          .readTimeout(60, TimeUnit.SECONDS)
-          .writeTimeout(60, TimeUnit.SECONDS)
-          .build();
-
-  private ContainerBackupManager() {}
-
-  public interface ResultCallback<T> {
-    void onComplete(T result);
-  }
-
-  public static final class BackupResult {
-    public final boolean success;
-    public final String message;
-
-    public BackupResult(boolean success, String message) {
-      this.success = success;
-      this.message = message;
-    }
-  }
-
-  public static final class DriveBackupFile {
-    public final String id;
-    public final String name;
-
-    public DriveBackupFile(String id, String name) {
-      this.id = id;
-      this.name = name;
-    }
-  }
-
-  public static final class RestorePreparation {
-    public final boolean success;
-    public final boolean needsSelection;
-    public final String message;
-    public final DriveBackupFile matchedFile;
-    public final List<DriveBackupFile> candidates;
-
-    public RestorePreparation(
-        boolean success,
-        boolean needsSelection,
-        String message,
-        DriveBackupFile matchedFile,
-        List<DriveBackupFile> candidates) {
-      this.success = success;
-      this.needsSelection = needsSelection;
-      this.message = message;
-      this.matchedFile = matchedFile;
-      this.candidates = candidates;
-    }
-  }
-
-  public static void backupContainer(
-      Activity activity, Container container, ResultCallback<BackupResult> callback) {
-    EXECUTOR.execute(() -> post(callback, performBackup(activity, container)));
-  }
-
-  public static void prepareRestore(
-      Activity activity, Container container, ResultCallback<RestorePreparation> callback) {
-    EXECUTOR.execute(() -> post(callback, prepareRestoreInternal(activity, container)));
-  }
-
-  public static void restoreContainerFromDriveFile(
-      Activity activity,
-      Container container,
-      DriveBackupFile driveFile,
-      ResultCallback<BackupResult> callback) {
-    EXECUTOR.execute(() -> post(callback, performRestore(activity, container, driveFile)));
-  }
-
-  private static <T> void post(ResultCallback<T> callback, T value) {
-    MAIN_HANDLER.post(() -> callback.onComplete(value));
-  }
-
-  private static BackupResult performBackup(Activity activity, Container container) {
-    try {
-      Context context = activity.getApplicationContext();
-      String accessToken = requireAccessToken(activity, context);
-      if (accessToken == null) {
-        return new BackupResult(
-            false, "Google Drive authorization required. Please try again after granting access.");
-      }
-
-      File driveCRoot = new File(container.getRootDir(), ".wine/drive_c");
-      File usersDir = new File(driveCRoot, "users");
-      File programDataDir = new File(driveCRoot, "ProgramData");
-      if (!usersDir.exists() && !programDataDir.exists()) {
-        return new BackupResult(false, "No container data found to back up.");
-      }
-
-      byte[] zipBytes = zipContainerDirectories(usersDir, programDataDir);
-      if (zipBytes.length == 0) {
-        return new BackupResult(false, "Container backup is empty.");
-      }
-
-      String folderId = getOrCreateContainersFolder(accessToken);
-      if (folderId == null) {
-        return new BackupResult(false, "Failed to access WinNative/Containers on Google Drive.");
-      }
-
-      String fileName = buildBackupFileName(container);
-      String existingFileId = findDriveFileId(accessToken, folderId, fileName);
-      boolean uploaded =
-          existingFileId != null
-              ? updateDriveFile(accessToken, existingFileId, zipBytes)
-              : createDriveFile(accessToken, folderId, fileName, zipBytes);
-
-      return uploaded
-          ? new BackupResult(true, "Container backup uploaded to Google Drive.")
-          : new BackupResult(false, "Failed to upload container backup to Google Drive.");
-    } catch (Exception error) {
-      Timber.tag(TAG).e(error, "Container backup failed for %s", container.getName());
-      return new BackupResult(false, "Container backup failed: " + error.getMessage());
-    }
-  }
-
-  private static RestorePreparation prepareRestoreInternal(Activity activity, Container container) {
-    try {
-      Context context = activity.getApplicationContext();
-      String accessToken = requireAccessToken(activity, context);
-      if (accessToken == null) {
-        return new RestorePreparation(
-            false,
-            false,
-            "Google Drive authorization required. Please try again after granting access.",
-            null,
-            Collections.emptyList());
-      }
-
-      String folderId = getOrCreateContainersFolder(accessToken);
-      if (folderId == null) {
-        return new RestorePreparation(
-            false,
-            false,
-            "Failed to access WinNative/Containers on Google Drive.",
-            null,
-            Collections.emptyList());
-      }
-
-      String expectedFileName = buildBackupFileName(container);
-      DriveBackupFile matchedFile = findDriveFile(accessToken, folderId, expectedFileName);
-      if (matchedFile != null) {
-        return new RestorePreparation(true, false, null, matchedFile, Collections.emptyList());
-      }
-
-      List<DriveBackupFile> candidates = listDriveFiles(accessToken, folderId);
-      if (candidates.isEmpty()) {
-        return new RestorePreparation(
-            false,
-            false,
-            "No container backups were found in Google Drive.",
-            null,
-            Collections.emptyList());
-      }
-
-      return new RestorePreparation(
-          true,
-          true,
-          "No exact backup matched this container. Select a backup to restore.",
-          null,
-          candidates);
-    } catch (Exception error) {
-      Timber.tag(TAG).e(error, "Container restore preparation failed for %s", container.getName());
-      return new RestorePreparation(
-          false,
-          false,
-          "Container restore failed: " + error.getMessage(),
-          null,
-          Collections.emptyList());
-    }
-  }
-
-  private static BackupResult performRestore(
-      Activity activity, Container container, DriveBackupFile driveFile) {
-    try {
-      Context context = activity.getApplicationContext();
-      String accessToken = requireAccessToken(activity, context);
-      if (accessToken == null) {
-        return new BackupResult(
-            false, "Google Drive authorization required. Please try again after granting access.");
-      }
-
-      byte[] zipBytes = downloadDriveFile(accessToken, driveFile.id);
-      if (zipBytes == null || zipBytes.length == 0) {
-        return new BackupResult(false, "Downloaded container backup is empty.");
-      }
-
-      File driveCRoot = new File(container.getRootDir(), ".wine/drive_c");
-      File usersDir = new File(driveCRoot, "users");
-      File programDataDir = new File(driveCRoot, "ProgramData");
-
-      deleteRecursively(usersDir);
-      deleteRecursively(programDataDir);
-      if (!driveCRoot.exists() && !driveCRoot.mkdirs()) {
-        return new BackupResult(false, "Failed to prepare the container for restore.");
-      }
-
-      unzipToDirectory(zipBytes, driveCRoot);
-      return new BackupResult(true, "Container backup restored successfully.");
-    } catch (Exception error) {
-      Timber.tag(TAG)
-          .e(error, "Container restore failed for %s from %s", container.getName(), driveFile.name);
-      return new BackupResult(false, "Container restore failed: " + error.getMessage());
-    }
-  }
-
-  private static String requireAccessToken(Activity activity, Context context) throws Exception {
-    if (!isGoogleSyncEnabled(context)) {
-      return null;
-    }
-    if (!awaitAuthenticatedSession(activity)) {
-      throw new IllegalStateException("Not signed in to Google Play Games. Please sign in first.");
-    }
-    return getDriveAccessToken(activity);
-  }
-
-  private static boolean isGoogleSyncEnabled(Context context) {
-    return context
-        .getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-        .getBoolean(KEY_GOOGLE_SYNC_ENABLED, false);
-  }
-
-  private static boolean awaitAuthenticatedSession(Activity activity) throws InterruptedException {
-    PlayGamesBootstrap.ensureInitialized(activity);
-    for (int attempt = 0; attempt < AUTH_SESSION_RETRY_COUNT; attempt++) {
-      if (isAuthenticatedBlocking(activity)) {
-        return true;
-      }
-      if (attempt < AUTH_SESSION_RETRY_COUNT - 1) {
-        Thread.sleep(AUTH_SESSION_RETRY_DELAY_MS);
-      }
-    }
-    return false;
-  }
-
-  private static boolean isAuthenticatedBlocking(Activity activity) {
-    try {
-      PlayGamesBootstrap.ensureInitialized(activity);
-      Object result =
-          Tasks.await(
-              PlayGames.getGamesSignInClient(activity).isAuthenticated(), 10, TimeUnit.SECONDS);
-      return result != null
-          && Boolean.TRUE.equals(result.getClass().getMethod("isAuthenticated").invoke(result));
-    } catch (TimeoutException timeout) {
-      Timber.tag(TAG).e(timeout, "Timed out waiting for Google authentication state");
-      return false;
-    } catch (Exception error) {
-      Timber.tag(TAG).e(error, "Failed to read Google authentication state");
-      return false;
-    }
-  }
-
-  private static String getDriveAccessToken(Activity activity) {
-    try {
-      AuthorizationRequest authRequest =
-          AuthorizationRequest.builder()
-              .setRequestedScopes(Collections.singletonList(new Scope(DRIVE_FILE_SCOPE)))
-              .build();
-
-      AuthorizationResult authResult =
-          Tasks.await(Identity.getAuthorizationClient(activity).authorize(authRequest));
-      if (authResult == null) {
-        return null;
-      }
-
-      if (authResult.hasResolution()) {
-        if (authResult.getPendingIntent() != null) {
-          activity.runOnUiThread(
-              () -> {
-                try {
-                  if (activity instanceof ActivityResultHost) {
-                    ((ActivityResultHost) activity)
-                        .launchDriveAuthRequest(authResult.getPendingIntent().getIntentSender());
-                  } else {
-                    Timber.tag(TAG)
-                        .e(
-                            "Activity %s cannot launch Drive auth flow",
-                            activity.getClass().getSimpleName());
-                  }
-                } catch (Exception error) {
-                  Timber.tag(TAG).e(error, "Failed to launch Drive consent UI");
-                }
-              });
-        }
-        return null;
-      }
-
-      return authResult.getAccessToken();
-    } catch (Exception error) {
-      Timber.tag(TAG).e(error, "Failed to get Drive access token");
-      return null;
-    }
-  }
-
-  private static byte[] zipContainerDirectories(File usersDir, File programDataDir)
-      throws Exception {
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    try (ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream)) {
-      if (usersDir.exists()) {
-        addDirectoryToZip(zipOutputStream, usersDir, "users");
-      }
-      if (programDataDir.exists()) {
-        addDirectoryToZip(zipOutputStream, programDataDir, "ProgramData");
-      }
-    }
-    return outputStream.toByteArray();
-  }
-
-  private static void addDirectoryToZip(
-      ZipOutputStream zipOutputStream, File directory, String rootEntry) throws Exception {
-    String dirEntry = rootEntry.endsWith("/") ? rootEntry : rootEntry + "/";
-    zipOutputStream.putNextEntry(new ZipEntry(dirEntry));
-    zipOutputStream.closeEntry();
-
-    File[] children = directory.listFiles();
-    if (children == null) {
-      return;
-    }
-    for (File child : children) {
-      addFileToZip(zipOutputStream, child, rootEntry + "/" + child.getName());
-    }
-  }
-
-  private static void addFileToZip(ZipOutputStream zipOutputStream, File file, String entryName)
-      throws Exception {
-    if (file.isDirectory()) {
-      zipOutputStream.putNextEntry(new ZipEntry(entryName + "/"));
-      zipOutputStream.closeEntry();
-      File[] children = file.listFiles();
-      if (children == null) {
-        return;
-      }
-      for (File child : children) {
-        addFileToZip(zipOutputStream, child, entryName + "/" + child.getName());
-      }
-      return;
-    }
-
-    zipOutputStream.putNextEntry(new ZipEntry(entryName));
-    try (FileInputStream inputStream = new FileInputStream(file)) {
-      byte[] buffer = new byte[8192];
-      int count;
-      while ((count = inputStream.read(buffer)) > 0) {
-        zipOutputStream.write(buffer, 0, count);
-      }
-    }
-    zipOutputStream.closeEntry();
-  }
-
-  private static void unzipToDirectory(byte[] zipBytes, File destinationDirectory)
-      throws Exception {
-    String destinationPath = destinationDirectory.getCanonicalPath() + File.separator;
-    try (ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
-      ZipEntry entry;
-      while ((entry = zipInputStream.getNextEntry()) != null) {
-        File outputFile = new File(destinationDirectory, entry.getName());
-        String outputPath = outputFile.getCanonicalPath();
-        if (!outputPath.equals(destinationDirectory.getCanonicalPath())
-            && !outputPath.startsWith(destinationPath)) {
-          throw new SecurityException("Zip entry escapes the target directory");
-        }
-
-        if (entry.isDirectory()) {
-          outputFile.mkdirs();
-        } else {
-          File parent = outputFile.getParentFile();
-          if (parent != null && !parent.exists()) {
-            parent.mkdirs();
-          }
-          try (FileOutputStream outputStream = new FileOutputStream(outputFile)) {
-            byte[] buffer = new byte[8192];
-            int count;
-            while ((count = zipInputStream.read(buffer)) > 0) {
-              outputStream.write(buffer, 0, count);
-            }
-          }
-        }
-        zipInputStream.closeEntry();
-      }
-    }
-  }
-
-  private static void deleteRecursively(File file) {
-    if (file == null || !file.exists()) {
-      return;
-    }
-    if (file.isDirectory()) {
-      File[] children = file.listFiles();
-      if (children != null) {
-        for (File child : children) {
-          deleteRecursively(child);
-        }
-      }
-    }
-    if (!file.delete()) {
-      Timber.tag(TAG).w("Failed to delete %s during restore cleanup", file.getAbsolutePath());
-    }
-  }
-
-  private static String buildBackupFileName(Container container) {
-    String containerName = container.getName();
-    if (containerName == null || containerName.trim().isEmpty()) {
-      containerName = "Container-" + container.id;
-    }
-    String safeName =
-        containerName.replace('/', '_').replace('\\', '_').replace('\n', '_').replace('\r', '_');
-    return safeName + ".zip";
-  }
-
-  private static String getOrCreateContainersFolder(String accessToken) throws Exception {
-    String rootFolderId = getOrCreateFolder(accessToken, null, DRIVE_ROOT_FOLDER_NAME);
-    if (rootFolderId == null) {
-      return null;
-    }
-    return getOrCreateFolder(accessToken, rootFolderId, DRIVE_CONTAINERS_FOLDER_NAME);
-  }
-
-  private static String getOrCreateFolder(String accessToken, String parentId, String folderName)
-      throws Exception {
-    DriveBackupFile folder = findDriveFile(accessToken, parentId, folderName, true);
-    if (folder != null) {
-      return folder.id;
-    }
-
-    JSONObject metadata = new JSONObject();
-    metadata.put("name", folderName);
-    metadata.put("mimeType", "application/vnd.google-apps.folder");
-    if (parentId != null) {
-      metadata.put("parents", new JSONArray().put(parentId));
-    }
-
-    Request request =
-        new Request.Builder()
-            .url("https://www.googleapis.com/drive/v3/files?fields=id")
-            .addHeader("Authorization", "Bearer " + accessToken)
-            .post(RequestBody.create(metadata.toString(), JSON_MEDIA_TYPE))
-            .build();
-
-    try (okhttp3.Response response = HTTP_CLIENT.newCall(request).execute()) {
-      if (!response.isSuccessful()) {
-        Timber.tag(TAG)
-            .e(
-                "Failed to create folder %s: %d %s",
-                folderName, response.code(), response.message());
-        return null;
-      }
-      JSONObject json = new JSONObject(response.body() != null ? response.body().string() : "{}");
-      return json.optString("id", null);
-    }
-  }
-
-  private static String findDriveFileId(String accessToken, String folderId, String fileName)
-      throws Exception {
-    DriveBackupFile file = findDriveFile(accessToken, folderId, fileName);
-    return file != null ? file.id : null;
-  }
-
-  private static DriveBackupFile findDriveFile(String accessToken, String folderId, String fileName)
-      throws Exception {
-    return findDriveFile(accessToken, folderId, fileName, false);
-  }
-
-  private static DriveBackupFile findDriveFile(
-      String accessToken, String folderId, String fileName, boolean folderOnly) throws Exception {
-    StringBuilder queryBuilder = new StringBuilder();
-    queryBuilder.append("name='").append(escapeDriveQuery(fileName)).append("' and trashed=false");
-    if (folderId != null) {
-      queryBuilder.append(" and '").append(folderId).append("' in parents");
-    }
-    if (folderOnly) {
-      queryBuilder.append(" and mimeType='application/vnd.google-apps.folder'");
-    }
-
-    String url =
-        "https://www.googleapis.com/drive/v3/files?q="
-            + URLEncoder.encode(queryBuilder.toString(), "UTF-8")
-            + "&fields=files(id,name)&pageSize=1";
-    Request request =
-        new Request.Builder()
-            .url(url)
-            .addHeader("Authorization", "Bearer " + accessToken)
-            .get()
-            .build();
-
-    try (okhttp3.Response response = HTTP_CLIENT.newCall(request).execute()) {
-      if (!response.isSuccessful()) {
-        return null;
-      }
-      JSONObject json = new JSONObject(response.body() != null ? response.body().string() : "{}");
-      JSONArray files = json.optJSONArray("files");
-      if (files == null || files.length() == 0) {
-        return null;
-      }
-      JSONObject file = files.getJSONObject(0);
-      return new DriveBackupFile(file.getString("id"), file.getString("name"));
-    }
-  }
-
-  private static List<DriveBackupFile> listDriveFiles(String accessToken, String folderId)
-      throws Exception {
-    String query =
-        "'"
-            + folderId
-            + "' in parents and trashed=false and mimeType!='application/vnd.google-apps.folder'";
-    String url =
-        "https://www.googleapis.com/drive/v3/files?q="
-            + URLEncoder.encode(query, "UTF-8")
-            + "&fields=files(id,name)&pageSize=200";
-    Request request =
-        new Request.Builder()
-            .url(url)
-            .addHeader("Authorization", "Bearer " + accessToken)
-            .get()
-            .build();
-
-    ArrayList<DriveBackupFile> files = new ArrayList<>();
-    try (okhttp3.Response response = HTTP_CLIENT.newCall(request).execute()) {
-      if (!response.isSuccessful()) {
-        return files;
-      }
-      JSONObject json = new JSONObject(response.body() != null ? response.body().string() : "{}");
-      JSONArray results = json.optJSONArray("files");
-      if (results == null) {
-        return files;
-      }
-      for (int i = 0; i < results.length(); i++) {
-        JSONObject file = results.getJSONObject(i);
-        files.add(new DriveBackupFile(file.getString("id"), file.getString("name")));
-      }
-    }
-    files.sort(Comparator.comparing(file -> file.name.toLowerCase()));
-    return files;
-  }
-
-  private static boolean createDriveFile(
-      String accessToken, String folderId, String fileName, byte[] data) throws Exception {
-    JSONObject metadata = new JSONObject();
-    metadata.put("name", fileName);
-    metadata.put("parents", new JSONArray().put(folderId));
-
-    String boundary = "winnative_container_boundary_" + System.currentTimeMillis();
-    byte[] body = buildMultipartRelatedBody(boundary, metadata.toString(), data);
-
-    Request request =
-        new Request.Builder()
-            .url("https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=id")
-            .addHeader("Authorization", "Bearer " + accessToken)
-            .post(
-                RequestBody.create(body, MediaType.get("multipart/related; boundary=" + boundary)))
-            .build();
-
-    try (okhttp3.Response response = HTTP_CLIENT.newCall(request).execute()) {
-      if (response.isSuccessful()) {
-        return true;
-      }
-      Timber.tag(TAG)
-          .e(
-              "Failed to create Drive file %s: %d %s",
-              fileName, response.code(), response.message());
-      return false;
-    }
-  }
-
-  private static boolean updateDriveFile(String accessToken, String fileId, byte[] data)
-      throws Exception {
-    Request request =
-        new Request.Builder()
-            .url("https://www.googleapis.com/upload/drive/v3/files/" + fileId + "?uploadType=media")
-            .addHeader("Authorization", "Bearer " + accessToken)
-            .patch(RequestBody.create(data, ZIP_MEDIA_TYPE))
-            .build();
-
-    try (okhttp3.Response response = HTTP_CLIENT.newCall(request).execute()) {
-      if (response.isSuccessful()) {
-        return true;
-      }
-      Timber.tag(TAG)
-          .e("Failed to update Drive file %s: %d %s", fileId, response.code(), response.message());
-      return false;
-    }
-  }
-
-  private static byte[] downloadDriveFile(String accessToken, String fileId) throws Exception {
-    Request request =
-        new Request.Builder()
-            .url("https://www.googleapis.com/drive/v3/files/" + fileId + "?alt=media")
-            .addHeader("Authorization", "Bearer " + accessToken)
-            .get()
-            .build();
-
-    try (okhttp3.Response response = HTTP_CLIENT.newCall(request).execute()) {
-      if (!response.isSuccessful() || response.body() == null) {
-        return null;
-      }
-      return response.body().bytes();
-    }
-  }
-
-  private static byte[] buildMultipartRelatedBody(
-      String boundary, String jsonMetadata, byte[] fileData) throws Exception {
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    String crlf = "\r\n";
-
-    outputStream.write(("--" + boundary + crlf).getBytes(StandardCharsets.UTF_8));
-    outputStream.write(
-        ("Content-Type: application/json; charset=UTF-8" + crlf + crlf)
-            .getBytes(StandardCharsets.UTF_8));
-    outputStream.write(jsonMetadata.getBytes(StandardCharsets.UTF_8));
-    outputStream.write(crlf.getBytes(StandardCharsets.UTF_8));
-    outputStream.write(("--" + boundary + crlf).getBytes(StandardCharsets.UTF_8));
-    outputStream.write(
-        ("Content-Type: application/zip" + crlf + crlf).getBytes(StandardCharsets.UTF_8));
-    outputStream.write(fileData);
-    outputStream.write(crlf.getBytes(StandardCharsets.UTF_8));
-    outputStream.write(("--" + boundary + "--").getBytes(StandardCharsets.UTF_8));
-
-    return outputStream.toByteArray();
-  }
-
-  private static String escapeDriveQuery(String value) {
-    return value.replace("\\", "\\\\").replace("'", "\\'");
-  }
-}
diff --git a/app/src/main/feature/sync/google/GameSaveBackupManager.kt b/app/src/main/feature/sync/google/GameSaveBackupManager.kt
index 113c54e36..53c45ad4f 100644
--- a/app/src/main/feature/sync/google/GameSaveBackupManager.kt
+++ b/app/src/main/feature/sync/google/GameSaveBackupManager.kt
@@ -1,87 +1,105 @@
 package com.winlator.cmod.feature.sync.google
 import android.app.Activity
 import android.content.Context
-import com.google.android.gms.auth.api.identity.AuthorizationRequest
-import com.google.android.gms.auth.api.identity.AuthorizationResult
-import com.google.android.gms.auth.api.identity.Identity
-import com.google.android.gms.common.api.Scope
-import com.google.android.gms.games.PlayGames
-import com.google.android.gms.tasks.Tasks
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import com.google.android.gms.games.PlayGames
+import com.google.android.gms.games.SnapshotsClient
+import com.google.android.gms.games.snapshot.Snapshot
+import com.google.android.gms.games.snapshot.SnapshotMetadata
+import com.google.android.gms.games.snapshot.SnapshotMetadataChange
+import com.google.android.gms.tasks.Tasks
 import com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
 import com.winlator.cmod.feature.stores.gog.service.GOGService
-import com.winlator.cmod.feature.stores.steam.enums.PathType
-import com.winlator.cmod.feature.stores.steam.service.SteamService
-import com.winlator.cmod.feature.stores.steam.utils.PrefManager
-import com.winlator.cmod.shared.android.ActivityResultHost
+import com.winlator.cmod.feature.steamcloudsync.SteamCloudSyncHelper
+import com.winlator.cmod.feature.steamcloudsync.SteamSaveSnapshotManager
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONArray
 import org.json.JSONObject
 import timber.log.Timber
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
-import java.nio.file.Paths
+import java.security.MessageDigest
+import java.security.SecureRandom
 import java.text.SimpleDateFormat
-import java.time.Instant
 import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
-import kotlin.coroutines.resume
-import com.winlator.cmod.feature.stores.steam.utils.FileUtils as SteamFileUtils
-
-/**
- * Manages backup and restore of individual game cloud saves to/from Google Drive.
- *
- * Files are stored in a "WinNative" folder on the user's Google Drive as zip files.
- *
- * Flow:
- *   Backup:  Download cloud save from provider (Steam/Epic/GOG) → zip → upload to Google Drive
- *   Restore: Download from Google Drive → unzip → upload back to provider
- */
+
+/** Backup/restore per-game saves via Google Play Saved Games: a manifest snapshot (written LAST = the commit point) plus N gzipped-zip part snapshots; orphan parts are GC'd after a 24h grace so an interrupted upload can resume. Steam saves go through Steam Cloud, not here. */
 object GameSaveBackupManager {
     private const val TAG = "GameSaveBackup"
-    private const val DRIVE_ROOT_FOLDER_NAME = "WinNative"
-    private const val DRIVE_GAMES_FOLDER_NAME = "Games"
-    private const val DRIVE_HISTORY_FOLDER_NAME = "History"
-    private const val DRIVE_FILE_SCOPE = "https://www.googleapis.com/auth/drive.file"
     private const val PREFS_NAME = "google_store_login_sync"
-    private const val KEY_GOOGLE_SYNC_ENABLED = "google_sync_enabled"
+
+    /** Pref name preserved verbatim — flips true once Play Games sign-in succeeds. */
+    private const val KEY_GOOGLE_DRIVE_CONNECTED = "google_drive_connected"
     private const val KEY_KEEP_REPLACED_BACKUP = "cloud_sync_keep_replaced_backup"
     private const val AUTH_SESSION_RETRY_COUNT = 5
     private const val AUTH_SESSION_RETRY_DELAY_MS = 750L
 
     /** Maximum number of history entries retained (and shown) per game. */
-    const val MAX_HISTORY_ENTRIES = 30
+    const val MAX_HISTORY_ENTRIES = 100
 
     /** Entries older than this are pruned whenever history is listed or written. */
     const val HISTORY_MAX_AGE_DAYS = 30
 
-    const val REQUEST_CODE_DRIVE_AUTH = 9002
+    /** Hard ceiling on a save's compressed size — refuse to back up larger than this. */
+    private const val MAX_COMPRESSED_BYTES: Long = 50L * 1024L * 1024L
+
+    /** Defensive ceiling on the number of parts per save. */
+    private const val MAX_PARTS = 99
+
+    /** Reserve this many bytes inside getMaxDataSize() for snapshot envelope/metadata. */
+    private const val PART_SIZE_HEADROOM_BYTES = 4 * 1024
 
-    private val httpClient =
-        OkHttpClient
-            .Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(60, TimeUnit.SECONDS)
-            .writeTimeout(60, TimeUnit.SECONDS)
-            .build()
+    /** Floor used when getMaxDataSize() returns implausibly low values. */
+    private const val MIN_PART_SIZE_BYTES = 1L * 1024 * 1024
 
-    enum class GameSource { STEAM, EPIC, GOG }
+    /** Orphan parts (parent manifest missing) younger than this are skipped during GC. */
+    private const val ORPHAN_GRACE_MS: Long = 24L * 60L * 60L * 1000L
+
+    /** Snapshot uniqueName prefix — short to leave room for hash + saveId in the 100-char limit. */
+    private const val SNAPSHOT_PREFIX = "wnsv"
+
+    /** Bound the conflict-resolution loop so two thrashing devices can't loop us forever. */
+    private const val MAX_CONFLICT_RESOLVE_ATTEMPTS = 10
+
+    const val REQUEST_CODE_DRIVE_AUTH = 9002 // legacy; some callers still pass this through onActivityResult.
+
+    enum class GameSource(val code: Char) {
+        STEAM('s'),
+        EPIC('e'),
+        GOG('g'),
+        CUSTOM('c'),
+    }
+
+    /** Backend storage for a [BackupHistoryEntry] — routes Restore/Rename/Delete to the right manager and hides actions that don't apply. */
+    enum class BackupStorage {
+        /** Local rolling-snapshot capture (zipped to filesDir/save_history/steam/...). */
+        STEAM_LOCAL,
+        /** Steam Cloud's CURRENT file listing, grouped into save sets by ~120s timestamp clusters (Steam has no server-side version history). Restore re-downloads the group's files to their local paths. */
+        STEAM_CLOUD,
+        /** Epic cloud-save manifests: each upload writes a timestamped manifest plus chunk files; selecting a row restores that manifest. */
+        EPIC_CLOUD,
+        /** GOG cloud's live file listing. Restore pulls full cloud state down. */
+        GOG_CLOUD,
+
+        /** Google Play Games Saved Games: one manifest snapshot plus N gzipped-zip part snapshots, shown as a single GOOGLE entry. */
+        GOOGLE,
+    }
 
     /** Origin of a history backup — identifies which side of a conflict it came from. */
     enum class BackupOrigin(val tag: String) {
@@ -105,532 +123,603 @@ object GameSaveBackupManager {
         val message: String,
     )
 
-    /** A backed-up save stored under Games/History/<gameKey>/ on Drive. */
+    /** A backed-up save in Google Play Saved Games. `fileId` holds the manifest snapshot's unique-name (name kept for caller compatibility). */
     data class BackupHistoryEntry(
         val fileId: String,
         val fileName: String,
         val timestampMs: Long,
         val origin: BackupOrigin,
         val sizeBytes: Long,
-        /** Optional user label ("Boss fight", "Before ending", …). Null when unnamed. */
+        /** Optional user label. Persisted on the manifest snapshot's description field. */
         val label: String? = null,
+        /** Which backend produced this entry. Defaults to local Steam history for legacy callers. */
+        val storage: BackupStorage = BackupStorage.STEAM_LOCAL,
     )
 
     /** Max length of a user-provided history-entry label, after sanitization. */
     const val MAX_HISTORY_LABEL_LENGTH = 48
 
+    /** Custom-game extra-data keys persisted on the Shortcut. */
+    const val CUSTOM_SAVE_CONTAINER_ID_KEY = "customSaveContainerId"
+    const val CUSTOM_SAVE_WINDOWS_PATH_KEY = "customSaveWindowsPath"
+
+    /** Legacy key — an Android absolute path to a single custom-game folder. */
+    private const val LEGACY_CUSTOM_GAME_FOLDER_KEY = "custom_game_folder"
+
     private data class SaveBackupSource(
         val zipRoot: String,
         val localDir: File,
         val exactFiles: List<File>? = null,
     )
 
-    private data class DriveFileInfo(
-        val id: String,
-        val name: String,
-        val sizeBytes: Long,
-        val modifiedTimeMs: Long,
-    )
-
-    /**
-     * Back up the current local save state to Save History on Google Drive.
-     *
-     * Writes `WinNative/Games/History/<gameKey>/<timestamp>_manual.zip` and prunes
-     * old entries (>30 days or beyond MAX_HISTORY_ENTRIES). Does NOT pull from
-     * the store provider first — what's on disk is what gets saved. The legacy
-     * primary-slot zip (`<platform>_<id>_<name>.zip`) is no longer written; it's
-     * only read as a fallback when history is empty.
-     */
-    suspend fun backupToGoogle(
-        activity: Activity,
-        gameSource: GameSource,
-        gameId: String,
-        gameName: String,
-    ): BackupResult = backupDiscardedSave(activity, gameSource, gameId, gameName, BackupOrigin.MANUAL)
+    /** Parsed manifest payload — what gets written into the manifest snapshot's contents. */
+    private data class Manifest(
+        val schema: Int,
+        val source: GameSource,
+        val gameId: String,
+        val gameName: String,
+        val origin: BackupOrigin,
+        val createdAtMs: Long,
+        val uncompressedSize: Long,
+        val compressedSize: Long,
+        val sha256: String,
+        val parts: List<String>,
+        val windowsPath: String? = null,
+    ) {
+        fun toJson(): String =
+            JSONObject().apply {
+                put("schema", schema)
+                put("source", source.name)
+                put("gameId", gameId)
+                put("gameName", gameName)
+                put("origin", origin.name)
+                put("createdAtMs", createdAtMs)
+                put("uncompressedSize", uncompressedSize)
+                put("compressedSize", compressedSize)
+                put("sha256", sha256)
+                put("parts", JSONArray(parts))
+                if (windowsPath != null) put("windowsPath", windowsPath)
+            }.toString()
 
-    /**
-     * Exit auto-backup: zips local saves and writes them to Save History with
-     * origin=AUTO. Gated by the global [isAutoBackupEnabled] setting.
-     */
-    suspend fun autoBackupToGoogle(
-        activity: Activity,
-        gameSource: GameSource,
-        gameId: String,
-        gameName: String,
-    ): BackupResult {
-        val context = activity.applicationContext
-        if (!isGoogleSyncEnabled(context)) {
-            return BackupResult(false, "Google sync is not enabled.")
-        }
-        if (!isAutoBackupEnabled(context)) {
-            return BackupResult(false, "Auto backup is not enabled.")
+        companion object {
+            fun fromJson(json: String): Manifest? =
+                try {
+                    val o = JSONObject(json)
+                    val parts = mutableListOf<String>()
+                    val partsArr = o.getJSONArray("parts")
+                    for (i in 0 until partsArr.length()) parts += partsArr.getString(i)
+                    Manifest(
+                        schema = o.optInt("schema", 1),
+                        source = GameSource.valueOf(o.getString("source")),
+                        gameId = o.getString("gameId"),
+                        gameName = o.optString("gameName", ""),
+                        origin = BackupOrigin.valueOf(o.optString("origin", BackupOrigin.MANUAL.name)),
+                        createdAtMs = o.getLong("createdAtMs"),
+                        uncompressedSize = o.optLong("uncompressedSize", -1),
+                        compressedSize = o.optLong("compressedSize", -1),
+                        sha256 = o.optString("sha256", ""),
+                        parts = parts,
+                        windowsPath = if (o.has("windowsPath")) o.getString("windowsPath") else null,
+                    )
+                } catch (e: Exception) {
+                    Timber.tag(TAG).w(e, "Failed to parse manifest JSON")
+                    null
+                }
         }
-        return backupDiscardedSave(activity, gameSource, gameId, gameName, BackupOrigin.AUTO)
     }
 
-    fun isAutoBackupEnabled(context: Context): Boolean = prefs(context).getBoolean("cloud_sync_auto_backup", false)
+    // ── Public API ──
 
-    /**
-     * Triggers the Google Drive account selection / authorization consent flow.
-     * Returns true if authorization was already granted (token obtained),
-     * or false if the consent UI was launched (caller should wait for onDriveAuthResult).
-     */
-    suspend fun requestDriveAuthorization(activity: Activity): Boolean =
-        withContext(Dispatchers.IO) {
-            val token = getDriveAccessToken(activity)
-            token != null
-        }
+    /** Pref name kept verbatim ("google_drive_connected") for upgrade compatibility — the backend is now PGS. */
+    fun isDriveConnected(context: Context): Boolean = prefs(context).getBoolean(KEY_GOOGLE_DRIVE_CONNECTED, false)
 
-    /**
-     * Push the current on-disk save up to the store provider (Steam / Epic / GOG).
-     *
-     * Does **not** touch Google Drive and does **not** snapshot local first — this
-     * is a pure "sync up" used when the user wants the provider's cloud to match
-     * whatever they're currently playing with on disk. Kept named `restoreFromGoogle`
-     * for stable callers; the button label is "Restore cloud save".
-     */
-    suspend fun restoreFromGoogle(
+    /** Records whether a Google Play Games session is connected — the gate for loading Google Saved-Games history. */
+    fun setDriveConnected(context: Context, connected: Boolean) {
+        prefs(context).edit().putBoolean(KEY_GOOGLE_DRIVE_CONNECTED, connected).apply()
+    }
+
+    fun isKeepReplacedBackupEnabled(context: Context): Boolean =
+        prefs(context).getBoolean(KEY_KEEP_REPLACED_BACKUP, true)
+
+    fun setKeepReplacedBackupEnabled(context: Context, enabled: Boolean) {
+        prefs(context).edit().putBoolean(KEY_KEEP_REPLACED_BACKUP, enabled).apply()
+    }
+
+    /** Snapshot local saves into Save History as origin=[origin] — the central path for manual/auto backup and "keep a copy of the replaced save". [authMode]: SILENT for auto/list (no UI), INTERACTIVE for manual (may show the sign-in sheet). */
+    @JvmOverloads
+    suspend fun backupDiscardedSave(
         activity: Activity,
         gameSource: GameSource,
         gameId: String,
-        @Suppress("UNUSED_PARAMETER") gameName: String,
+        gameName: String,
+        origin: BackupOrigin,
+        authMode: GoogleAuthMode = GoogleAuthMode.INTERACTIVE,
+        customSaveDir: File? = null,
+        containerHint: Container? = null,
     ): BackupResult =
         withContext(Dispatchers.IO) {
             try {
-                val context = activity.applicationContext
-                val ok = syncUpToProvider(context, gameSource, gameId)
-                if (ok) {
-                    BackupResult(true, "Save pushed to ${gameSource.name}.")
-                } else {
-                    BackupResult(false, "Failed to push save to ${gameSource.name}.")
+                if (gameSource != GameSource.STEAM) {
+                    return@withContext BackupResult(false, "Google save backups are disabled.")
+                }
+                val appId = gameId.toIntOrNull()
+                    ?: return@withContext BackupResult(false, "Invalid Steam appId for snapshot.")
+
+                // 1) Local rolling snapshot — the offline rollback safety net (always attempted).
+                val localOk = SteamSaveSnapshotManager.recordSnapshot(activity.applicationContext, appId, origin, containerHint)
+
+                // 2) Mirror to Google Play Games when signed in; a silent no-op otherwise (only the local snapshot is kept).
+                val googleResult =
+                    runCatching {
+                        backupSaveToGoogle(activity, gameSource, gameId, gameName, origin, authMode, containerHint = containerHint)
+                    }.getOrElse { e ->
+                        Timber.tag(TAG).w(e, "Google mirror of kept save failed for $gameId")
+                        BackupResult(false, e.message ?: "Google backup failed.")
+                    }
+
+                when {
+                    googleResult.success -> BackupResult(true, googleResult.message)
+                    localOk -> BackupResult(true, "Local snapshot captured.")
+                    origin == BackupOrigin.LOCAL -> BackupResult(true, "No local save files found to snapshot.")
+                    else -> BackupResult(false, googleResult.message)
                 }
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "restoreFromGoogle (push) failed for $gameSource/$gameId")
-                BackupResult(false, "Push failed: ${e.message}")
+                Timber.tag(TAG).e(e, "backupDiscardedSave failed for $gameSource/$gameId")
+                BackupResult(false, "Failed to back up save: ${e.message}")
             }
         }
 
-    /**
-     * Called from Activity's onActivityResult when Drive consent is completed.
-     */
-    fun onDriveAuthResult(
-        activity: Activity,
-        resultCode: Int,
-    ) {
-        if (resultCode == Activity.RESULT_OK) {
-            Timber.tag(TAG).i("Drive authorization consent granted")
-        } else {
-            Timber.tag(TAG).w("Drive authorization consent denied (resultCode=%d)", resultCode)
-        }
-    }
-
-    // ── Backup history (WinNative/Games/History/<gameKey>) ──
-
-    /** Whether the conflict dialog checkbox "Keep a backup of the replaced save" is on. */
-    fun isKeepReplacedBackupEnabled(context: Context): Boolean =
-        prefs(context).getBoolean(KEY_KEEP_REPLACED_BACKUP, true)
-
-    fun setKeepReplacedBackupEnabled(
-        context: Context,
-        enabled: Boolean,
-    ) {
-        prefs(context).edit().putBoolean(KEY_KEEP_REPLACED_BACKUP, enabled).apply()
-    }
+    // ── Google Play Games saved-game backup / list / restore ──
 
-    /**
-     * Snapshot the current local save files (as they exist on disk right now) and
-     * upload to `WinNative/Games/History/<gameKey>/<timestamp>_<origin>.zip`.
-     *
-     * Does NOT sync with the provider first. Intended to be called just before an
-     * operation that is about to overwrite local saves (e.g. conflict "Use Cloud"),
-     * or from the manual/auto backup path to record an auditable history entry.
-     */
-    suspend fun backupDiscardedSave(
+    /** Back up the current local save to Google Play Games as ≤[MAX_PARTS] part snapshots plus a manifest written last (the commit point). */
+    @JvmOverloads
+    suspend fun backupSaveToGoogle(
         activity: Activity,
         gameSource: GameSource,
         gameId: String,
         gameName: String,
         origin: BackupOrigin,
+        authMode: GoogleAuthMode = GoogleAuthMode.INTERACTIVE,
+        label: String? = null,
+        customSaveDir: File? = null,
+        containerHint: Container? = null,
     ): BackupResult =
         withContext(Dispatchers.IO) {
             try {
-                val context = activity.applicationContext
-                if (!isGoogleSyncEnabled(context)) {
-                    return@withContext BackupResult(false, "Google sync is not enabled.")
-                }
-                if (!awaitAuthenticatedSession(activity)) {
+                if (!ensureAuthenticated(activity, authMode)) {
                     return@withContext BackupResult(false, "Not signed in to Google Play Games.")
                 }
-                val accessToken =
-                    getDriveAccessToken(activity)
-                        ?: return@withContext BackupResult(false, "Google Drive authorization required.")
-
-                val saveSources = getLocalSaveSources(context, gameSource, gameId, forRestore = false)
-                if (saveSources.isEmpty()) {
-                    return@withContext BackupResult(false, "No local save files found to back up.")
-                }
-                val zipBytes = zipSaveSources(saveSources)
-                if (zipBytes.isEmpty()) {
-                    return@withContext BackupResult(false, "Save files are empty.")
+                val context = activity.applicationContext
+                val sources =
+                    getLocalSaveSources(context, gameSource, gameId, customSaveDir, forRestore = false, containerHint = containerHint)
+                if (sources.isEmpty()) {
+                    return@withContext BackupResult(false, "No save files found to back up.")
                 }
+                val client =
+                    freshSnapshotsClient(activity)
+                        ?: return@withContext BackupResult(false, "Google Play Games is unavailable.")
+
+                val tmp = File.createTempFile("wnsv_b", ".gz", context.cacheDir)
+                try {
+                    val (uncompressed, sha) = streamGzippedZipToFile(sources, tmp)
+                    val compressed = tmp.length()
+                    if (compressed <= 0L) {
+                        return@withContext BackupResult(false, "Save archive was empty.")
+                    }
+                    if (compressed > MAX_COMPRESSED_BYTES) {
+                        return@withContext BackupResult(
+                            false,
+                            "Save is too large to back up (${formatMb(compressed)} > ${formatMb(MAX_COMPRESSED_BYTES)}).",
+                        )
+                    }
+                    val partSize = computePartSize(client)
+                    val partCount = ((compressed + partSize - 1) / partSize).toInt().coerceAtLeast(1)
+                    if (partCount > MAX_PARTS) {
+                        return@withContext BackupResult(false, "Save needs too many parts to store ($partCount).")
+                    }
 
-                val folderId =
-                    getOrCreateHistoryGameFolder(accessToken, gameSource, gameId, gameName)
-                        ?: return@withContext BackupResult(false, "Failed to access History folder on Google Drive.")
+                    val gameKey = buildGameKeyHash(gameSource, gameId)
+                    val createdAt = System.currentTimeMillis()
+                    val saveId = buildSaveId(createdAt)
+                    val partNames = (0 until partCount).map { partUniqueName(gameSource, gameKey, saveId, it) }
 
-                val fileName = buildHistoryFileName(System.currentTimeMillis(), origin)
-                val ok = createDriveFile(accessToken, folderId, fileName, zipBytes)
-                if (!ok) {
-                    return@withContext BackupResult(false, "Failed to upload history backup to Google Drive.")
-                }
+                    // Parts first. Any failure deletes the just-written parts so no orphans linger.
+                    if (!uploadParts(activity, client, tmp, partNames, partSize)) {
+                        deleteSnapshotsByName(activity, partNames)
+                        return@withContext BackupResult(false, "Failed to upload save to Google Play Games.")
+                    }
 
-                // Best-effort prune — never fail the caller if this fails
-                runCatching { pruneHistoryFolder(accessToken, folderId) }
-                    .onFailure { Timber.tag(TAG).w(it, "History prune failed") }
+                    val manifest =
+                        Manifest(
+                            schema = 1,
+                            source = gameSource,
+                            gameId = gameId,
+                            gameName = gameName,
+                            origin = origin,
+                            createdAtMs = createdAt,
+                            uncompressedSize = uncompressed,
+                            compressedSize = compressed,
+                            sha256 = sha,
+                            parts = partNames,
+                            windowsPath =
+                                if (gameSource == GameSource.CUSTOM) customSaveWindowsPathFor(context, gameId) else null,
+                        )
+                    val cleanLabel = sanitizeHistoryLabel(label)
+                    // Manifest written LAST — its existence commits the save.
+                    val committed =
+                        writeSnapshot(
+                            activity,
+                            client,
+                            uniqueName = manifestUniqueName(gameSource, gameKey, saveId),
+                            description = manifestDescription(origin, cleanLabel),
+                            playedTimeMs = 0L,
+                            data = manifest.toJson().toByteArray(Charsets.UTF_8),
+                        )
+                    if (!committed) {
+                        deleteSnapshotsByName(activity, partNames)
+                        return@withContext BackupResult(false, "Failed to finalize Google Play Games backup.")
+                    }
 
-                BackupResult(true, "Save backed up to Save History.")
+                    setDriveConnected(context, true)
+                    runCatching { pruneGoogleHistory(activity, client, gameSource, gameId) }
+                        .onFailure { Timber.tag(TAG).w(it, "pruneGoogleHistory failed for $gameId") }
+                    BackupResult(true, "Saved to Google Play Games.")
+                } finally {
+                    runCatching { tmp.delete() }
+                }
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "backupDiscardedSave failed for $gameSource/$gameId")
+                Timber.tag(TAG).e(e, "backupSaveToGoogle failed for $gameSource/$gameId")
                 BackupResult(false, "Failed to back up save: ${e.message}")
             }
         }
 
-    /**
-     * Lists up to [MAX_HISTORY_ENTRIES] backup entries for the given game, newest first.
-     * Also performs a best-effort prune of entries older than [HISTORY_MAX_AGE_DAYS].
-     * Returns an empty list if not signed in, folder does not exist, or Drive returns no files.
-     */
-    suspend fun listBackupHistory(
+    /** List a game's Google Play Games saved-game history (one entry per manifest, newest-first); empty when not signed in. */
+    @JvmOverloads
+    suspend fun listGoogleHistory(
         activity: Activity,
         gameSource: GameSource,
         gameId: String,
-        gameName: String,
+        authMode: GoogleAuthMode = GoogleAuthMode.RESUME,
     ): List<BackupHistoryEntry> =
         withContext(Dispatchers.IO) {
             try {
-                val context = activity.applicationContext
-                if (!isGoogleSyncEnabled(context)) return@withContext emptyList()
-                if (!awaitAuthenticatedSession(activity)) return@withContext emptyList()
-                val accessToken = getDriveAccessToken(activity) ?: return@withContext emptyList()
-
-                val folderId =
-                    findHistoryGameFolder(accessToken, gameSource, gameId, gameName)
-                        ?: return@withContext emptyList()
-
-                val files = listDriveFilesInFolder(accessToken, folderId)
-                val parsed =
-                    files.mapNotNull { file ->
-                        val parsedName =
-                            parseHistoryFileName(file.name)
-                                ?: return@mapNotNull null
+                if (!isDriveConnected(activity.applicationContext)) return@withContext emptyList()
+                if (!ensureAuthenticated(activity, authMode)) return@withContext emptyList()
+                val client = freshSnapshotsClient(activity) ?: return@withContext emptyList()
+                val gameKey = buildGameKeyHash(gameSource, gameId)
+                val prefix = manifestPrefix(gameSource, gameKey)
+                loadAllSnapshotsMetadata(client)
+                    .filter { it.uniqueName.startsWith(prefix) && it.uniqueName.endsWith("_m") }
+                    .mapNotNull { meta ->
+                        val bytes = readSnapshotBytes(client, meta.uniqueName) ?: return@mapNotNull null
+                        val manifest = Manifest.fromJson(String(bytes, Charsets.UTF_8)) ?: return@mapNotNull null
                         BackupHistoryEntry(
-                            fileId = file.id,
-                            fileName = file.name,
-                            timestampMs = parsedName.first,
-                            origin = parsedName.second,
-                            sizeBytes = file.sizeBytes,
-                            label = parsedName.third,
+                            fileId = meta.uniqueName,
+                            fileName = "",
+                            timestampMs = manifest.createdAtMs,
+                            origin = manifest.origin,
+                            sizeBytes = manifest.uncompressedSize.coerceAtLeast(0L),
+                            label = parseLabelFromDescription(meta.description),
+                            storage = BackupStorage.GOOGLE,
                         )
                     }
-
-                // Prune old entries in the background (don't block the UI)
-                val cutoff = System.currentTimeMillis() - HISTORY_MAX_AGE_DAYS * 24L * 60L * 60L * 1000L
-                parsed
-                    .filter { it.timestampMs in 1L..cutoff }
-                    .forEach { runCatching { deleteDriveFile(accessToken, it.fileId) } }
-
-                parsed
-                    .filter { it.timestampMs > cutoff }
                     .sortedByDescending { it.timestampMs }
                     .take(MAX_HISTORY_ENTRIES)
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "listBackupHistory failed for $gameSource/$gameId")
+                Timber.tag(TAG).e(e, "listGoogleHistory failed for $gameSource/$gameId")
                 emptyList()
             }
         }
 
-    /**
-     * Download a specific backup from history and unzip it over the local save directory.
-     * Does NOT sync back to the store provider — restores locally only so the next launch
-     * can pick up the restored files. Existing local files in the save dirs are overwritten.
-     */
-    suspend fun restoreFromHistoryEntry(
+    /** Restore a Google saved-game [entry]: reassemble + verify the parts, extract into the save dirs, then push to the game's primary cloud. */
+    @JvmOverloads
+    suspend fun restoreFromGoogle(
         activity: Activity,
+        entry: BackupHistoryEntry,
         gameSource: GameSource,
         gameId: String,
-        entry: BackupHistoryEntry,
+        authMode: GoogleAuthMode = GoogleAuthMode.INTERACTIVE,
+        customSaveDir: File? = null,
+        containerHint: Container? = null,
     ): BackupResult =
         withContext(Dispatchers.IO) {
             try {
-                val context = activity.applicationContext
-                if (!isGoogleSyncEnabled(context)) {
-                    return@withContext BackupResult(false, "Google sync is not enabled.")
-                }
-                if (!awaitAuthenticatedSession(activity)) {
+                if (!ensureAuthenticated(activity, authMode)) {
                     return@withContext BackupResult(false, "Not signed in to Google Play Games.")
                 }
-                val accessToken =
-                    getDriveAccessToken(activity)
-                        ?: return@withContext BackupResult(false, "Google Drive authorization required.")
-
-                val zipBytes = downloadDriveFile(accessToken, entry.fileId)
-                if (zipBytes == null || zipBytes.isEmpty()) {
-                    return@withContext BackupResult(false, "Downloaded backup is empty.")
+                val context = activity.applicationContext
+                val client =
+                    freshSnapshotsClient(activity)
+                        ?: return@withContext BackupResult(false, "Google Play Games is unavailable.")
+                val manifestBytes =
+                    readSnapshotBytes(client, entry.fileId)
+                        ?: return@withContext BackupResult(false, "Backup manifest is missing.")
+                val manifest =
+                    Manifest.fromJson(String(manifestBytes, Charsets.UTF_8))
+                        ?: return@withContext BackupResult(false, "Backup manifest is unreadable.")
+                if (manifest.parts.isEmpty()) {
+                    return@withContext BackupResult(false, "Backup has no data parts.")
                 }
 
-                val saveSources = getLocalSaveSources(context, gameSource, gameId, forRestore = true)
-                if (saveSources.isEmpty()) {
-                    return@withContext BackupResult(false, "Cannot determine save directory for this game.")
+                val tmp = File.createTempFile("wnsv_r", ".gz", context.cacheDir)
+                try {
+                    if (!downloadParts(client, manifest.parts, tmp)) {
+                        return@withContext BackupResult(false, "Failed to download backup parts.")
+                    }
+                    if (manifest.sha256.isNotEmpty() && !sha256OfFile(tmp).equals(manifest.sha256, ignoreCase = true)) {
+                        return@withContext BackupResult(false, "Backup integrity check failed.")
+                    }
+                    val sources =
+                        getLocalSaveSources(context, gameSource, gameId, customSaveDir, forRestore = true, containerHint = containerHint)
+                    if (sources.isEmpty()) {
+                        return@withContext BackupResult(false, "Cannot determine save directory for this game.")
+                    }
+
+                    // M-5: pre-restore rollback point for Steam (other stores rely on the Google backup being restored plus the provider's cloud copy).
+                    if (gameSource == GameSource.STEAM) {
+                        gameId.toIntOrNull()?.let { appId ->
+                            runCatching {
+                                SteamSaveSnapshotManager.recordSnapshot(context, appId, BackupOrigin.AUTO, containerHint)
+                            }.onFailure { Timber.tag(TAG).w(it, "Pre-restore snapshot failed for $gameId") }
+                        }
+                    }
+
+                    // M-5: extract to a temp staging tree, then atomically swap each save dir into place (move-aside + copy + rollback) so a mid-extraction failure can't leave a corrupt partial save.
+                    val staging = File(context.cacheDir, "wnsv_restore_${System.currentTimeMillis()}")
+                    try {
+                        staging.deleteRecursively()
+                        staging.mkdirs()
+                        val stagingSources = sources.map { SaveBackupSource(it.zipRoot, File(staging, it.zipRoot)) }
+                        stagingSources.forEach { it.localDir.mkdirs() }
+                        extractGzippedZipToSources(tmp, stagingSources)
+                        if (!swapRestoredSources(sources, staging)) {
+                            return@withContext BackupResult(
+                                false,
+                                "Restore could not be applied safely; your existing save was left unchanged.",
+                            )
+                        }
+                    } finally {
+                        runCatching { staging.deleteRecursively() }
+                    }
+
+                    val pushed =
+                        when (gameSource) {
+                            GameSource.STEAM ->
+                                gameId.toIntOrNull()?.let {
+                                    SteamCloudSyncHelper.uploadLocalSaves(context, it, containerHint)
+                                } ?: false
+                            else -> syncUpToProvider(context, gameSource, gameId)
+                        }
+                    BackupResult(true, if (pushed) "Save restored and synced." else "Save restored locally.")
+                } finally {
+                    runCatching { tmp.delete() }
                 }
-                unzipToSources(zipBytes, saveSources)
-                BackupResult(true, "Save restored from backup.")
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "restoreFromHistoryEntry failed for $gameSource/$gameId")
+                Timber.tag(TAG).e(e, "restoreFromGoogle failed for $gameSource/$gameId")
                 BackupResult(false, "Restore failed: ${e.message}")
             }
         }
 
-    /**
-     * Set or clear the user label on a history entry by renaming the Drive file.
-     * Timestamp + origin prefix are preserved, so sort order and age-based pruning
-     * remain unchanged. Pass `newLabel = null` (or blank) to clear the label.
-     *
-     * Returns a [BackupResult]; on success, callers should re-list history to pick
-     * up the renamed entry.
-     */
-    suspend fun renameBackupHistoryEntry(
+    /** Update the user label on a Google saved-game entry by rewriting its manifest description. */
+    suspend fun renameGoogleEntry(
         activity: Activity,
         entry: BackupHistoryEntry,
         newLabel: String?,
     ): BackupResult =
         withContext(Dispatchers.IO) {
             try {
-                val context = activity.applicationContext
-                if (!isGoogleSyncEnabled(context)) {
-                    return@withContext BackupResult(false, "Google sync is not enabled.")
-                }
-                if (!awaitAuthenticatedSession(activity)) {
+                if (!ensureAuthenticated(activity, GoogleAuthMode.INTERACTIVE)) {
                     return@withContext BackupResult(false, "Not signed in to Google Play Games.")
                 }
-                val accessToken =
-                    getDriveAccessToken(activity)
-                        ?: return@withContext BackupResult(false, "Google Drive authorization required.")
-
+                val client =
+                    freshSnapshotsClient(activity)
+                        ?: return@withContext BackupResult(false, "Google Play Games is unavailable.")
+                val bytes =
+                    readSnapshotBytes(client, entry.fileId)
+                        ?: return@withContext BackupResult(false, "Backup manifest is missing.")
+                val manifest =
+                    Manifest.fromJson(String(bytes, Charsets.UTF_8))
+                        ?: return@withContext BackupResult(false, "Backup manifest is unreadable.")
                 val cleanLabel = sanitizeHistoryLabel(newLabel)
-                val newName = buildHistoryFileName(entry.timestampMs, entry.origin, cleanLabel)
-                if (newName == entry.fileName) {
-                    return@withContext BackupResult(true, "Nothing to rename.")
-                }
-                val ok = renameDriveFile(accessToken, entry.fileId, newName)
-                if (ok) {
-                    BackupResult(true, if (cleanLabel.isNullOrEmpty()) "Label cleared." else "Renamed.")
-                } else {
-                    BackupResult(false, "Rename failed.")
-                }
+                val ok =
+                    writeSnapshot(
+                        activity,
+                        client,
+                        uniqueName = entry.fileId,
+                        description = manifestDescription(manifest.origin, cleanLabel),
+                        playedTimeMs = 0L,
+                        data = bytes,
+                    )
+                BackupResult(ok, if (ok) "Label updated." else "Rename failed.")
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "renameBackupHistoryEntry failed for %s", entry.fileName)
+                Timber.tag(TAG).e(e, "renameGoogleEntry failed")
                 BackupResult(false, "Rename failed: ${e.message}")
             }
         }
 
-    /** Permanently delete a Save History entry from Google Drive. */
-    suspend fun deleteBackupHistoryEntry(
+    /** Delete a Google saved-game entry and all of its part snapshots. */
+    suspend fun deleteGoogleEntry(
         activity: Activity,
         entry: BackupHistoryEntry,
     ): BackupResult =
         withContext(Dispatchers.IO) {
             try {
-                val context = activity.applicationContext
-                if (!isGoogleSyncEnabled(context)) {
-                    return@withContext BackupResult(false, "Google sync is not enabled.")
-                }
-                if (!awaitAuthenticatedSession(activity)) {
+                if (!ensureAuthenticated(activity, GoogleAuthMode.INTERACTIVE)) {
                     return@withContext BackupResult(false, "Not signed in to Google Play Games.")
                 }
-                val accessToken =
-                    getDriveAccessToken(activity)
-                        ?: return@withContext BackupResult(false, "Google Drive authorization required.")
-
-                val ok = deleteDriveFile(accessToken, entry.fileId)
-                if (ok) {
-                    BackupResult(true, "Backup deleted.")
-                } else {
-                    BackupResult(false, "Delete failed.")
-                }
+                val client =
+                    freshSnapshotsClient(activity)
+                        ?: return@withContext BackupResult(false, "Google Play Games is unavailable.")
+                deleteEntry(activity, client, entry)
+                BackupResult(true, "Backup deleted.")
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "deleteBackupHistoryEntry failed for %s", entry.fileName)
+                Timber.tag(TAG).e(e, "deleteGoogleEntry failed")
                 BackupResult(false, "Delete failed: ${e.message}")
             }
         }
 
-    // ── Provider sync helpers ──
+    /** Part size that fits within a single snapshot's `getMaxDataSize()`, minus envelope headroom. */
+    private suspend fun computePartSize(client: SnapshotsClient): Long {
+        val maxData =
+            runCatching { Tasks.await(client.getMaxDataSize()).toLong() }
+                .getOrNull()
+                ?.takeIf { it > 0L }
+                ?: (3L * 1024 * 1024) // Play Games historical default if the query fails.
+        return (maxData - PART_SIZE_HEADROOM_BYTES).coerceAtLeast(MIN_PART_SIZE_BYTES)
+    }
 
-    private suspend fun syncDownFromProvider(
-        context: Context,
-        source: GameSource,
+    /** Drop manifests beyond [MAX_HISTORY_ENTRIES] for this game (oldest first), with their parts. */
+    private suspend fun pruneGoogleHistory(
+        activity: Activity,
+        client: SnapshotsClient,
+        gameSource: GameSource,
         gameId: String,
-    ): Boolean {
-        return try {
-            when (source) {
-                GameSource.STEAM -> {
-                    val appId = gameId.toIntOrNull() ?: return false
-                    SteamService.syncCloudSavesForBackup(context, appId, "download")
-                }
+    ) {
+        val gameKey = buildGameKeyHash(gameSource, gameId)
+        val prefix = manifestPrefix(gameSource, gameKey)
+        val manifests =
+            loadAllSnapshotsMetadata(client)
+                .filter { it.uniqueName.startsWith(prefix) && it.uniqueName.endsWith("_m") }
+                .sortedByDescending { it.lastModifiedTimestamp }
+        if (manifests.size <= MAX_HISTORY_ENTRIES) return
+        manifests.drop(MAX_HISTORY_ENTRIES).forEach { meta ->
+            val bytes = readSnapshotBytes(client, meta.uniqueName)
+            val parts = bytes?.let { Manifest.fromJson(String(it, Charsets.UTF_8)) }?.parts.orEmpty()
+            if (parts.isNotEmpty()) deleteSnapshotsByName(activity, parts)
+            deleteSnapshotsByName(activity, listOf(meta.uniqueName))
+        }
+    }
 
-                GameSource.EPIC -> {
-                    val appId = gameId.toIntOrNull() ?: return false
-                    EpicCloudSavesManager.syncCloudSaves(context, appId, "download")
-                }
+    private fun formatMb(bytes: Long): String = "%.1f MB".format(bytes / (1024.0 * 1024.0))
 
-                GameSource.GOG -> {
-                    GOGService.syncCloudSaves(context, "GOG_$gameId", "download")
-                }
-            }
-        } catch (e: Exception) {
-            Timber.tag(TAG).e(e, "syncDownFromProvider failed for $source/$gameId")
-            false
+    // ── Custom-game helpers (used by the "Select Save Folder" picker UI) ──
+
+    fun setCustomGameSavePath(shortcut: Shortcut, container: Container, windowsPath: String) {
+        shortcut.putExtra(CUSTOM_SAVE_CONTAINER_ID_KEY, container.id.toString())
+        shortcut.putExtra(CUSTOM_SAVE_WINDOWS_PATH_KEY, windowsPath)
+        shortcut.saveData()
+    }
+
+    fun clearCustomGameSavePath(shortcut: Shortcut) {
+        shortcut.putExtra(CUSTOM_SAVE_CONTAINER_ID_KEY, null)
+        shortcut.putExtra(CUSTOM_SAVE_WINDOWS_PATH_KEY, null)
+        shortcut.saveData()
+    }
+
+    fun getCustomGameSaveWindowsPath(shortcut: Shortcut): String? =
+        shortcut.getExtra(CUSTOM_SAVE_WINDOWS_PATH_KEY)?.takeIf { it.isNotEmpty() }
+
+    /** Build the `gameId` token used for custom games when calling the public backup API. */
+    fun customGameId(shortcut: Shortcut): String {
+        val containerId = shortcut.container?.id?.toString() ?: "0"
+        val shortcutName = shortcut.file?.name ?: shortcut.name ?: "shortcut"
+        return "$containerId:$shortcutName"
+    }
+
+    private fun customSaveWindowsPathFor(context: Context, gameId: String): String? {
+        // Try our customGameId-encoded form first.
+        parseCustomGameId(gameId)?.let { (cid, file) ->
+            return findCustomShortcutByContainerAndFile(context, cid, file)
+                ?.let(::getCustomGameSaveWindowsPath)
         }
+        // Fall back to legacy gameId conventions (app_id / custom_name / shortcut.name).
+        return findCustomShortcutByGameId(context, gameId)
+            ?.let(::getCustomGameSaveWindowsPath)
     }
 
-    private suspend fun syncUpToProvider(
+    private fun resolveCustomSaveAndroidDir(
         context: Context,
-        source: GameSource,
         gameId: String,
-    ): Boolean {
-        return try {
-            when (source) {
-                GameSource.STEAM -> {
-                    val appId = gameId.toIntOrNull() ?: return false
-                    SteamService.syncCloudSavesForBackup(context, appId, "upload")
-                }
+        windowsPathFromManifest: String?,
+    ): File? {
+        val (containerIdOrNull, file) = parseCustomGameId(gameId)?.let { (cid, f) -> cid to f }
+            ?: (null to null)
 
-                GameSource.EPIC -> {
-                    val appId = gameId.toIntOrNull() ?: return false
-                    EpicCloudSavesManager.syncCloudSaves(context, appId, "upload")
-                }
+        val shortcut = if (containerIdOrNull != null && file != null) {
+            findCustomShortcutByContainerAndFile(context, containerIdOrNull, file)
+        } else {
+            findCustomShortcutByGameId(context, gameId)
+        }
 
-                GameSource.GOG -> {
-                    GOGService.syncCloudSaves(context, "GOG_$gameId", "upload")
+        val container =
+            shortcut?.container
+                ?: containerIdOrNull?.let { id ->
+                    ContainerManager(context).getContainers().firstOrNull { it.id == id }
                 }
-            }
-        } catch (e: Exception) {
-            Timber.tag(TAG).e(e, "syncUpToProvider failed for $source/$gameId")
-            false
-        }
+                ?: return null
+
+        val winPath =
+            windowsPathFromManifest
+                ?: shortcut?.let(::getCustomGameSaveWindowsPath)
+                ?: return null
+        return WinePathUtils.windowsToAndroidFile(winPath, container)
     }
 
-    // ── Local save directory resolution ──
+    private fun parseCustomGameId(gameId: String): Pair<Int, String>? {
+        val base = gameId.removeSuffix(ENGINE_SAVE_SUFFIX)
+        val sep = base.indexOf(':')
+        if (sep <= 0 || sep == base.length - 1) return null
+        val cid = base.substring(0, sep).toIntOrNull() ?: return null
+        return cid to base.substring(sep + 1)
+    }
+
+    private fun findCustomShortcutByContainerAndFile(
+        context: Context,
+        containerId: Int,
+        shortcutFile: String,
+    ): Shortcut? =
+        runCatching {
+            ContainerManager(context)
+                .loadShortcuts()
+                .firstOrNull { it.container?.id == containerId && (it.file?.name == shortcutFile) }
+        }.getOrNull()
+
+    /** Legacy lookup-by-gameId for backwards compatibility. */
+    private fun findCustomShortcutByGameId(context: Context, gameId: String): Shortcut? =
+        runCatching {
+            ContainerManager(context).loadShortcuts().firstOrNull {
+                it.getExtra("game_source") == "CUSTOM" &&
+                    (
+                        it.getExtra("app_id") == gameId ||
+                            it.getExtra("custom_name") == gameId ||
+                            it.name == gameId
+                    )
+            }
+        }.getOrNull()
+
+    // ── Save-source resolution ──
 
     private suspend fun getLocalSaveSources(
         context: Context,
         source: GameSource,
         gameId: String,
+        customSaveDir: File?,
         forRestore: Boolean,
+        containerHint: Container? = null,
     ): List<SaveBackupSource> =
         when (source) {
-            GameSource.STEAM -> getSteamSaveSources(context, gameId, forRestore)
-            GameSource.EPIC -> getEpicSaveSources(context, gameId, forRestore)
-            GameSource.GOG -> getGogSaveSources(context, gameId, forRestore)
-        }
-
-    private suspend fun getSteamSaveSources(
-        context: Context,
-        gameId: String,
-        forRestore: Boolean,
-    ): List<SaveBackupSource> {
-        val appId = gameId.toIntOrNull() ?: return emptyList()
-        val sources = linkedMapOf<String, SaveBackupSource>()
-        val appDir = SteamService.getAppDirPath(appId)
-        val goldbergSaves = File(appDir, "steam_settings/saves")
-        if (forRestore || (goldbergSaves.exists() && !goldbergSaves.listFiles().isNullOrEmpty())) {
-            sources["steam/steam_settings/saves"] =
-                SaveBackupSource(
-                    zipRoot = "steam/steam_settings/saves",
-                    localDir = goldbergSaves,
-                )
-        }
-
-        val accountId =
-            SteamService.userSteamId?.accountID?.toLong()
-                ?: PrefManager.steamUserAccountId.takeIf { it != 0 }?.toLong()
-                ?: 0L
-        val prefixToPath: (String) -> String = { prefix ->
-            PathType.from(prefix).toAbsPath(context, appId, accountId)
-        }
-
-        val trackedFiles = SteamService.getTrackedCloudSaveFiles(appId).orEmpty()
-        if (trackedFiles.isNotEmpty()) {
-            trackedFiles
-                .groupBy { it.root to it.substitutedPath }
-                .forEach { (key, files) ->
-                    val (root, substitutedPath) = key
-                    val localDir = File(Paths.get(prefixToPath(root.toString()), substitutedPath).toString())
-                    val zipRoot = buildSteamZipRoot(root, substitutedPath)
-                    val exactFiles =
-                        files
-                            .map { it.getAbsPath(prefixToPath) }
-                            .map { it.toFile() }
-                            .filter { forRestore || it.exists() }
-                    if (forRestore || exactFiles.isNotEmpty()) {
-                        sources[zipRoot] = SaveBackupSource(zipRoot, localDir, exactFiles)
-                    }
-                }
-        } else {
-            val appInfo = SteamService.getAppInfoOf(appId)
-            val savePatterns =
-                appInfo
-                    ?.ufs
-                    ?.saveFilePatterns
-                    .orEmpty()
-                    .filter { it.root.isWindows }
-            if (savePatterns.isNotEmpty()) {
-                savePatterns.groupBy { it.root to it.substitutedPath }.forEach { (key, patterns) ->
-                    val (root, substitutedPath) = key
-                    val localDir = File(Paths.get(prefixToPath(root.toString()), substitutedPath).toString())
-                    val exactFiles = mutableListOf<File>()
-                    patterns.forEach { pattern ->
-                        if (localDir.exists()) {
-                            SteamFileUtils
-                                .findFilesRecursive(
-                                    rootPath = localDir.toPath(),
-                                    pattern = pattern.pattern,
-                                    maxDepth = if (pattern.recursive != 0) 5 else 0,
-                                ).forEach { path ->
-                                    exactFiles += path.toFile()
-                                }
-                        }
-                    }
-                    if (forRestore || exactFiles.isNotEmpty()) {
-                        sources[buildSteamZipRoot(root, substitutedPath)] =
-                            SaveBackupSource(
-                                zipRoot = buildSteamZipRoot(root, substitutedPath),
-                                localDir = localDir,
-                                exactFiles = exactFiles.distinct(),
-                            )
-                    }
-                }
-            } else {
-                val steamUserDataDir = File(PathType.SteamUserData.toAbsPath(context, appId, accountId))
-                if (forRestore || (steamUserDataDir.exists() && !steamUserDataDir.listFiles().isNullOrEmpty())) {
-                    sources["steam/${PathType.SteamUserData.name}"] =
-                        SaveBackupSource(
-                            zipRoot = "steam/${PathType.SteamUserData.name}",
-                            localDir = steamUserDataDir,
-                        )
-                }
+            GameSource.STEAM -> {
+                // Reuse the local Steam snapshot manager's source enumeration so backup/restore share identical zipRoot -> dir mappings.
+                val appId = gameId.toIntOrNull() ?: return emptyList()
+                SteamSaveSnapshotManager
+                    .enumerateGoogleSaveSources(context, appId, forRestore, containerHint)
+                    .map { (zipRoot, dir) -> SaveBackupSource("steam/$zipRoot", dir) }
             }
+            GameSource.EPIC -> getEpicSaveSources(context, gameId, forRestore, containerHint)
+            GameSource.GOG -> getGogSaveSources(context, gameId, forRestore, containerHint)
+            GameSource.CUSTOM -> getCustomSaveSources(context, gameId, customSaveDir, forRestore)
         }
 
-        return sources.values.toList()
-    }
-
     private suspend fun getEpicSaveSources(
         context: Context,
         gameId: String,
         forRestore: Boolean,
+        containerHint: Container? = null,
     ): List<SaveBackupSource> {
         val appId = gameId.toIntOrNull() ?: return emptyList()
-        val saveDir = EpicCloudSavesManager.getResolvedSaveDirectory(context, appId) ?: return emptyList()
+        // Pass the game's container so the save dir resolves against the right wineprefix — without it a manual backup/restore (game not running) finds no saves.
+        val saveDir =
+            EpicCloudSavesManager.getResolvedSaveDirectory(context, appId, containerHint?.id) ?: return emptyList()
         return if (forRestore || (saveDir.exists() && !saveDir.listFiles().isNullOrEmpty())) {
             listOf(SaveBackupSource("epic/save", saveDir))
         } else {
@@ -642,8 +731,9 @@ object GameSaveBackupManager {
         context: Context,
         gameId: String,
         forRestore: Boolean,
+        containerHint: Container? = null,
     ): List<SaveBackupSource> {
-        val saveDirs = GOGService.getResolvedSaveDirectories(context, "GOG_$gameId")
+        val saveDirs = GOGService.getResolvedSaveDirectories(context, "GOG_$gameId", containerHint?.id)
         return saveDirs.mapIndexedNotNull { index, saveDir ->
             if (forRestore || (saveDir.exists() && !saveDir.listFiles().isNullOrEmpty())) {
                 SaveBackupSource("gog/location_$index", saveDir)
@@ -653,716 +743,788 @@ object GameSaveBackupManager {
         }
     }
 
-    // ── Zip helpers ──
-
-    private fun zipSaveSources(sources: List<SaveBackupSource>): ByteArray {
-        val baos = ByteArrayOutputStream()
-        ZipOutputStream(baos).use { zos ->
-            sources.forEach { source ->
-                val zipRoot = source.zipRoot.trimEnd('/')
-                if (zipRoot.isEmpty()) return@forEach
-                zos.putNextEntry(ZipEntry("$zipRoot/"))
-                zos.closeEntry()
-
-                val exactFiles = source.exactFiles?.filter { it.exists() }.orEmpty()
-                if (exactFiles.isNotEmpty()) {
-                    exactFiles.forEach { file ->
-                        val relativePath =
-                            source.localDir
-                                .toPath()
-                                .relativize(file.toPath())
-                                .toString()
-                                .replace(File.separatorChar, '/')
-                        addFileToZip(zos, file, "$zipRoot/$relativePath")
-                    }
-                } else if (source.localDir.exists()) {
-                    zipDirRecursive(zos, source.localDir, zipRoot)
-                }
+    fun retroSaveDir(context: Context, shortcut: Shortcut?, gameId: String? = null): File? {
+        val system = shortcut
+            ?.getExtra(com.winlator.cmod.feature.retro.RetroShortcuts.KEY_SYSTEM)
+            ?.takeIf { it.isNotBlank() } ?: return null
+        val gameName = shortcut.getExtra("custom_name", shortcut.name)
+        val engine =
+            if (gameId != null) {
+                isEngineGameId(gameId)
+            } else {
+                com.winlator.cmod.feature.retro.Gen1CloudSync.isEngineShortcut(shortcut)
             }
+        return when {
+            engine ->
+                com.winlator.cmod.feature.retro.Gen1CloudSync.stagingDir(
+                    context,
+                    gameId ?: com.winlator.cmod.feature.retro.Gen1CloudSync.cloudId(shortcut),
+                )
+            system == com.winlator.cmod.feature.retro.RetroSystems.PS2.id ->
+                File(com.armsx2.runtime.MainActivityRuntime.assetCopyRoot(context), "memcards")
+            com.winlator.cmod.feature.retro.RetroCoreManager
+                .usesDolphinCore(com.winlator.cmod.feature.retro.RetroSystems.fromId(system)) ->
+                com.winlator.cmod.feature.retro.DolphinCloudSync.stagingDir(
+                    context,
+                    com.winlator.cmod.feature.retro.RetroSaveStates.cloudGameId(system, gameName),
+                )
+            else -> com.winlator.cmod.feature.retro.RetroSaveStates.gameDir(context, gameName)
         }
-        return baos.toByteArray()
     }
 
-    private fun addFileToZip(
-        zos: ZipOutputStream,
-        file: File,
-        entryName: String,
-    ) {
-        zos.putNextEntry(ZipEntry(entryName))
-        FileInputStream(file).use { fis ->
-            val buf = ByteArray(8192)
-            var len: Int
-            while (fis.read(buf).also { len = it } > 0) {
-                zos.write(buf, 0, len)
+    fun customGameId(containerId: Int, shortcutFileName: String): String = "$containerId:$shortcutFileName"
+
+    const val ENGINE_SAVE_SUFFIX = ":3d"
+
+    fun isEngineGameId(gameId: String): Boolean = gameId.endsWith(ENGINE_SAVE_SUFFIX)
+
+    fun engineGameId(gameId: String): String =
+        if (isEngineGameId(gameId)) gameId else gameId + ENGINE_SAVE_SUFFIX
+
+    /** Custom-game save sources in priority order: explicit customSaveDir, then the customSaveWindowsPath extra, then the legacy custom_game_folder extra, then the prefix's users/xuser/{Documents,Saved Games,AppData}. */
+    private fun getCustomSaveSources(
+        context: Context,
+        gameId: String,
+        customSaveDir: File?,
+        forRestore: Boolean,
+    ): List<SaveBackupSource> {
+        val retroShortcut =
+            parseCustomGameId(gameId)?.let { (cid, f) -> findCustomShortcutByContainerAndFile(context, cid, f) }
+                ?: findCustomShortcutByGameId(context, gameId)
+        if (!forRestore && retroShortcut != null) {
+            val sys = retroShortcut.getExtra(com.winlator.cmod.feature.retro.RetroShortcuts.KEY_SYSTEM)
+            if (sys.isNotBlank()) {
+                com.winlator.cmod.feature.retro.DolphinCloudSync.refreshForBackup(
+                    context,
+                    sys,
+                    retroShortcut.getExtra("custom_name", retroShortcut.name),
+                )
             }
+            // Same reason as Dolphin's: what gets uploaded is a staged copy,
+            // so it has to be taken from the live save directory now rather
+            // than whenever the game last happened to stage one.
+            com.winlator.cmod.feature.retro.Gen1CloudSync.refreshForBackup(context, retroShortcut)
         }
-        zos.closeEntry()
-    }
-
-    private fun zipDirRecursive(
-        zos: ZipOutputStream,
-        dir: File,
-        baseName: String,
-    ) {
-        val children = dir.listFiles() ?: return
-        for (child in children) {
-            val entryName = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
-            if (child.isDirectory) {
-                zos.putNextEntry(ZipEntry("$entryName/"))
-                zos.closeEntry()
-                zipDirRecursive(zos, child, entryName)
+        val dir = retroSaveDir(context, retroShortcut, gameId)
+        if (dir != null) {
+            return if (forRestore || (dir.exists() && !dir.listFiles().isNullOrEmpty())) {
+                listOf(SaveBackupSource("retro/save", dir))
             } else {
-                zos.putNextEntry(ZipEntry(entryName))
-                FileInputStream(child).use { fis ->
-                    val buf = ByteArray(8192)
-                    var len: Int
-                    while (fis.read(buf).also { len = it } > 0) {
-                        zos.write(buf, 0, len)
-                    }
-                }
-                zos.closeEntry()
+                emptyList()
             }
         }
-    }
-
-    private fun unzipToSources(
-        zipBytes: ByteArray,
-        sources: List<SaveBackupSource>,
-    ) {
-        val sortedSources = sources.sortedByDescending { it.zipRoot.length }
-        ZipInputStream(ByteArrayInputStream(zipBytes)).use { zis ->
-            var entry: ZipEntry?
-            while (zis.nextEntry.also { entry = it } != null) {
-                val entryName = entry!!.name
-                val source =
-                    sortedSources.firstOrNull {
-                        entryName == "${it.zipRoot}/" || entryName.startsWith("${it.zipRoot}/")
-                    }
-                if (source == null) {
-                    zis.closeEntry()
-                    continue
-                }
 
-                val relativeName = entryName.removePrefix(source.zipRoot).removePrefix("/")
-                if (relativeName.isEmpty()) {
-                    source.localDir.mkdirs()
-                    zis.closeEntry()
-                    continue
-                }
+        val sources = linkedMapOf<String, SaveBackupSource>()
 
-                val file = File(source.localDir, relativeName)
-                if (!file.canonicalPath.startsWith(source.localDir.canonicalPath + File.separator) &&
-                    file.canonicalPath != source.localDir.canonicalPath
-                ) {
-                    throw SecurityException("Zip entry tries to escape target directory")
-                }
+        val pickerDir = customSaveDir ?: resolveCustomSaveAndroidDir(context, gameId, null)
+        if (pickerDir != null && (forRestore || (pickerDir.exists() && !pickerDir.listFiles().isNullOrEmpty()))) {
+            sources["custom/save"] = SaveBackupSource("custom/save", pickerDir)
+            return sources.values.toList()
+        }
 
-                if (entry!!.isDirectory) {
-                    file.mkdirs()
-                } else {
-                    file.parentFile?.mkdirs()
-                    FileOutputStream(file).use { fos ->
-                        val buf = ByteArray(8192)
-                        var len: Int
-                        while (zis.read(buf).also { len = it } > 0) {
-                            fos.write(buf, 0, len)
-                        }
-                    }
-                }
-                zis.closeEntry()
+        // Fall back to the legacy custom_game_folder + xuser dirs lookup.
+        val shortcut =
+            parseCustomGameId(gameId)?.let { (cid, f) ->
+                findCustomShortcutByContainerAndFile(context, cid, f)
+            } ?: findCustomShortcutByGameId(context, gameId)
+            ?: return emptyList()
+
+        val prefixDir = File(shortcut.container.rootDir, ".wine/drive_c/users/xuser")
+        listOf("Documents", "Saved Games", "AppData").forEach { dirName ->
+            val dir = File(prefixDir, dirName)
+            if (forRestore || (dir.exists() && !dir.listFiles().isNullOrEmpty())) {
+                sources["custom/$dirName"] = SaveBackupSource("custom/$dirName", dir)
             }
         }
+
+        val customGameFolder =
+            shortcut.getExtra(LEGACY_CUSTOM_GAME_FOLDER_KEY, "").takeIf { it.isNotBlank() }?.let(::File)
+        if (customGameFolder != null &&
+            (forRestore || (customGameFolder.exists() && !customGameFolder.listFiles().isNullOrEmpty()))
+        ) {
+            sources["custom/game_folder"] = SaveBackupSource("custom/game_folder", customGameFolder)
+        }
+
+        return sources.values.toList()
     }
 
-    // ── Drive file naming ──
+    // ── Provider sync ──
 
-    private fun buildDriveFileName(
+    @Suppress("unused")
+    private suspend fun syncDownFromProvider(
+        context: Context,
         source: GameSource,
         gameId: String,
-        gameName: String,
-    ): String {
-        val sanitizedName = gameName.replace(Regex("[^a-zA-Z0-9_ -]"), "").take(50).trim()
-        val sanitizedId = gameId.replace(Regex("[^a-zA-Z0-9_-]"), "_")
-        return "${source.name.lowercase()}_${sanitizedId}_$sanitizedName.zip"
+    ): Boolean {
+        return try {
+            when (source) {
+                GameSource.STEAM -> false // Steam Cloud handled elsewhere.
+                GameSource.EPIC -> {
+                    val appId = gameId.toIntOrNull() ?: return false
+                    EpicCloudSavesManager.syncCloudSaves(context, appId, "download")
+                }
+                GameSource.GOG -> GOGService.syncCloudSaves(context, "GOG_$gameId", "download")
+                GameSource.CUSTOM -> false
+            }
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "syncDownFromProvider failed for $source/$gameId")
+            false
+        }
     }
 
-    /** Folder name inside `WinNative/Games/History/` for a given game. Strips the `.zip` from the primary name. */
-    private fun buildHistoryGameFolderName(
+    private suspend fun syncUpToProvider(
+        context: Context,
         source: GameSource,
         gameId: String,
-        gameName: String,
-    ): String = buildDriveFileName(source, gameId, gameName).removeSuffix(".zip")
-
-    /**
-     * Produce `yyyyMMdd'T'HHmmss_<origin>[_<label>].zip` in UTC so filenames sort
-     * chronologically. The optional label is the user-provided name for the entry.
-     */
-    private fun buildHistoryFileName(
-        timestampMs: Long,
-        origin: BackupOrigin,
-        label: String? = null,
-    ): String {
-        val fmt = SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
-        val base = "${fmt.format(Date(timestampMs))}_${origin.tag}"
-        val clean = sanitizeHistoryLabel(label)
-        return if (clean.isNullOrEmpty()) "$base.zip" else "${base}_$clean.zip"
+    ): Boolean {
+        return try {
+            when (source) {
+                GameSource.STEAM -> false
+                GameSource.EPIC -> {
+                    val appId = gameId.toIntOrNull() ?: return false
+                    EpicCloudSavesManager.syncCloudSaves(context, appId, "upload")
+                }
+                GameSource.GOG -> GOGService.syncCloudSaves(context, "GOG_$gameId", "upload")
+                GameSource.CUSTOM -> false
+            }
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "syncUpToProvider failed for $source/$gameId")
+            false
+        }
     }
 
-    /**
-     * Strip out filename-hostile characters (path separators, control chars) and
-     * cap length. Returns null if the result would be empty.
-     */
-    fun sanitizeHistoryLabel(raw: String?): String? {
-        if (raw.isNullOrBlank()) return null
-        val cleaned =
-            raw
-                .replace(Regex("""[/\\:*?"<>|\r\n\t]"""), "")
-                .trim()
-                .take(MAX_HISTORY_LABEL_LENGTH)
-        return cleaned.ifEmpty { null }
+    // ── Streaming gzip+zip → cache file (used by backup) ──
+
+    private fun streamGzippedZipToFile(
+        sources: List<SaveBackupSource>,
+        outFile: File,
+    ): Pair<Long, String> {
+        val md = MessageDigest.getInstance("SHA-256")
+        var uncompressed = 0L
+        FileOutputStream(outFile).use { fos ->
+            HashingOutputStream(fos, md).use { hashing ->
+                GZIPOutputStream(hashing).use { gzip ->
+                    val countingZip = CountingZipOutputStream(gzip)
+                    countingZip.use { zos ->
+                        sources.forEach { src ->
+                            val zipRoot = src.zipRoot.trimEnd('/')
+                            if (zipRoot.isEmpty()) return@forEach
+                            zos.putNextEntry(ZipEntry("$zipRoot/"))
+                            zos.closeEntry()
+                            val exact = src.exactFiles?.filter { it.exists() }.orEmpty()
+                            if (exact.isNotEmpty()) {
+                                exact.forEach { file ->
+                                    val rel =
+                                        src.localDir
+                                            .toPath()
+                                            .relativize(file.toPath())
+                                            .toString()
+                                            .replace(File.separatorChar, '/')
+                                    addFileToZip(zos, file, "$zipRoot/$rel")
+                                }
+                            } else if (src.localDir.exists()) {
+                                zipDirRecursive(zos, src.localDir, zipRoot)
+                            }
+                        }
+                    }
+                    uncompressed = countingZip.bytesWritten
+                }
+            }
+        }
+        val sha = md.digest().joinToString("") { "%02x".format(it) }
+        return uncompressed to sha
     }
 
-    // Label captured non-greedily so it doesn't consume the `.zip` extension.
-    private val historyFileNameRegex = Regex("""^(\d{8}T\d{6})_([a-z]+)(?:_(.+?))?\.zip$""")
+    private fun addFileToZip(zos: ZipOutputStream, file: File, entryName: String) {
+        zos.putNextEntry(ZipEntry(entryName))
+        FileInputStream(file).use { fis ->
+            val buf = ByteArray(8192)
+            var len: Int
+            while (fis.read(buf).also { len = it } > 0) {
+                zos.write(buf, 0, len)
+            }
+        }
+        zos.closeEntry()
+    }
 
-    /** Returns (timestamp, origin, label) or null if the name does not match. */
-    private fun parseHistoryFileName(name: String): Triple<Long, BackupOrigin, String?>? {
-        val m = historyFileNameRegex.matchEntire(name) ?: return null
-        val fmt = SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
-        val ts = runCatching { fmt.parse(m.groupValues[1])?.time }.getOrNull() ?: return null
-        val origin = BackupOrigin.fromTag(m.groupValues[2]) ?: return null
-        val label = m.groupValues.getOrNull(3)?.takeIf { it.isNotEmpty() }
-        return Triple(ts, origin, label)
+    private fun zipDirRecursive(zos: ZipOutputStream, dir: File, baseName: String) {
+        val children = dir.listFiles() ?: return
+        for (child in children) {
+            val entryName = if (baseName.isEmpty()) child.name else "$baseName/${child.name}"
+            if (child.isDirectory) {
+                zos.putNextEntry(ZipEntry("$entryName/"))
+                zos.closeEntry()
+                zipDirRecursive(zos, child, entryName)
+            } else {
+                addFileToZip(zos, child, entryName)
+            }
+        }
     }
 
-    // ── Auth helpers ──
+    private class HashingOutputStream(
+        private val delegate: java.io.OutputStream,
+        private val md: MessageDigest,
+    ) : java.io.OutputStream() {
+        override fun write(b: Int) {
+            md.update(b.toByte())
+            delegate.write(b)
+        }
 
-    private fun prefs(context: Context) = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+        override fun write(b: ByteArray, off: Int, len: Int) {
+            md.update(b, off, len)
+            delegate.write(b, off, len)
+        }
 
-    private fun isGoogleSyncEnabled(context: Context): Boolean = prefs(context).getBoolean(KEY_GOOGLE_SYNC_ENABLED, false)
+        override fun flush() = delegate.flush()
+        override fun close() = delegate.close()
+    }
 
-    private fun isActivityValidForPlayGames(activity: Activity): Boolean {
-        if (activity.isFinishing || activity.isDestroyed) {
-            return false
+    private class CountingZipOutputStream(out: java.io.OutputStream) : ZipOutputStream(out) {
+        var bytesWritten: Long = 0
+            private set
+
+        override fun write(b: ByteArray, off: Int, len: Int) {
+            super.write(b, off, len)
+            bytesWritten += len
+        }
+
+        override fun write(b: Int) {
+            super.write(b)
+            bytesWritten += 1
         }
-        val lifecycleState = (activity as? LifecycleOwner)?.lifecycle?.currentState
-        return lifecycleState?.isAtLeast(Lifecycle.State.STARTED) ?: true
     }
 
-    private suspend fun isAuthenticatedBlocking(activity: Activity): Boolean {
-        if (!isActivityValidForPlayGames(activity)) {
-            Timber.tag(TAG).i(
-                "Skipping Google auth check because %s is finishing or destroyed",
-                activity::class.java.simpleName,
-            )
-            return false
+    // ── Snapshot upload / download / read / delete ──
+
+    private suspend fun uploadParts(
+        activity: Activity,
+        client: SnapshotsClient,
+        sourceFile: File,
+        partNames: List<String>,
+        partSize: Long,
+    ): Boolean {
+        // Allocate once and reuse — avoids tens of MB of transient allocations under GC pressure on exit-backup.
+        val partBufferSize = partSize.toInt().coerceAtMost(Int.MAX_VALUE).coerceAtLeast(1)
+        val part = ByteArray(partBufferSize)
+        FileInputStream(sourceFile).use { fis ->
+            for ((index, name) in partNames.withIndex()) {
+                var off = 0
+                while (off < part.size) {
+                    val n = fis.read(part, off, part.size - off)
+                    if (n <= 0) break
+                    off += n
+                }
+                if (off == 0) {
+                    Timber.tag(TAG).e("uploadParts: ran out of source bytes at part %d/%d", index, partNames.size)
+                    return false
+                }
+                // writeBytes copies and Tasks.await blocks until commit, so hand `part` directly on a full read; only the last partial part needs a fresh array.
+                val data = if (off == part.size) part else part.copyOf(off)
+                val ok =
+                    writeSnapshot(
+                        activity,
+                        client,
+                        uniqueName = name,
+                        description = "WinNative save part ${index + 1}/${partNames.size} (do not select)",
+                        playedTimeMs = 0L,
+                        data = data,
+                    )
+                if (!ok) return false
+            }
         }
+        return true
+    }
+
+    private suspend fun downloadParts(
+        client: SnapshotsClient,
+        partNames: List<String>,
+        outFile: File,
+    ): Boolean {
+        FileOutputStream(outFile).use { fos ->
+            for (name in partNames) {
+                val bytes = readSnapshotBytes(client, name) ?: return false
+                fos.write(bytes)
+            }
+        }
+        return true
+    }
+
+    private suspend fun writeSnapshot(
+        activity: Activity,
+        client: SnapshotsClient,
+        uniqueName: String,
+        description: String?,
+        playedTimeMs: Long,
+        data: ByteArray,
+    ): Boolean {
+        val snapshot = openSnapshot(activity, client, uniqueName, createIfMissing = true) ?: return false
         return try {
-            PlayGamesBootstrap.ensureInitialized(activity)
-            val task = PlayGames.getGamesSignInClient(activity).isAuthenticated
-            val result =
-                withContext(Dispatchers.IO) {
-                    try {
-                        Tasks.await(task, 10, TimeUnit.SECONDS)
-                    } catch (e: TimeoutException) {
-                        Timber.tag(TAG).e("Timeout waiting for Google authentication state")
-                        null
+            if (!snapshot.snapshotContents.writeBytes(data)) {
+                Timber.tag(TAG).e("writeBytes returned false for %s", uniqueName)
+                runCatching { Tasks.await(client.discardAndClose(snapshot)) }
+                return false
+            }
+            val change =
+                SnapshotMetadataChange.Builder()
+                    .apply {
+                        if (description != null) setDescription(description)
+                        setPlayedTimeMillis(playedTimeMs)
                     }
-                }
-            result?.isAuthenticated == true
-        } catch (error: Exception) {
-            Timber.tag(TAG).e(error, "Failed to read Google authentication state")
+                    .build()
+            Tasks.await(client.commitAndClose(snapshot, change))
+            true
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "writeSnapshot failed for %s", uniqueName)
+            runCatching { Tasks.await(client.discardAndClose(snapshot)) }
             false
         }
     }
 
-    private suspend fun awaitAuthenticatedSession(activity: Activity): Boolean {
-        if (!isActivityValidForPlayGames(activity)) {
-            return false
-        }
-        PlayGamesBootstrap.ensureInitialized(activity)
-        repeat(AUTH_SESSION_RETRY_COUNT) { attempt ->
-            if (isAuthenticatedBlocking(activity)) {
-                return true
-            }
-            if (attempt < AUTH_SESSION_RETRY_COUNT - 1) {
-                delay(AUTH_SESSION_RETRY_DELAY_MS)
+    private suspend fun readSnapshotBytes(client: SnapshotsClient, uniqueName: String): ByteArray? {
+        return try {
+            var result =
+                Tasks.await(
+                    client.open(
+                        uniqueName,
+                        false,
+                        SnapshotsClient.RESOLUTION_POLICY_MOST_RECENTLY_MODIFIED,
+                    ),
+                )
+            var conflictAttempts = 0
+            while (result.isConflict && conflictAttempts < MAX_CONFLICT_RESOLVE_ATTEMPTS) {
+                val candidates = listOfNotNull(result.conflict?.snapshot, result.conflict?.conflictingSnapshot)
+                val chosen = candidates.maxByOrNull { it.metadata.lastModifiedTimestamp } ?: return null
+                // MN-3: conflict resolution by most-recent mtime trusts device clocks (a wrong clock can win with an older save); log the pick + candidate timestamps so a bad auto-resolution is diagnosable.
+                Timber.tag(TAG).w(
+                    "Auto-resolving Google save conflict for %s by most-recent mtime; chose %d of %s",
+                    uniqueName,
+                    chosen.metadata.lastModifiedTimestamp,
+                    candidates.map { it.metadata.lastModifiedTimestamp },
+                )
+                result = Tasks.await(client.resolveConflict(result.conflict!!.conflictId, chosen))
+                conflictAttempts++
             }
+            if (result.isConflict) return null
+            val snapshot = result.data ?: return null
+            val bytes = snapshot.snapshotContents.readFully()
+            runCatching { Tasks.await(client.discardAndClose(snapshot)) }
+            bytes
+        } catch (e: Exception) {
+            if (isMissingSnapshotError(e)) return null
+            Timber.tag(TAG).w(e, "readSnapshotBytes failed for %s", uniqueName)
+            null
         }
-        return false
     }
 
-    /**
-     * Get an OAuth2 access token with Drive.file scope using AuthorizationClient.
-     * If the user hasn't granted Drive access yet, launches the consent UI and returns null
-     * (the caller should retry after consent is granted).
-     */
-    private suspend fun getDriveAccessToken(activity: Activity): String? =
-        withContext(Dispatchers.IO) {
+    private suspend fun openSnapshot(
+        @Suppress("UNUSED_PARAMETER") activity: Activity,
+        client: SnapshotsClient,
+        uniqueName: String,
+        createIfMissing: Boolean,
+    ): Snapshot? {
+        repeat(AUTH_SESSION_RETRY_COUNT) { attempt ->
             try {
-                if (!isActivityValidForPlayGames(activity)) {
+                var result =
+                    Tasks.await(
+                        client.open(
+                            uniqueName,
+                            createIfMissing,
+                            SnapshotsClient.RESOLUTION_POLICY_MOST_RECENTLY_MODIFIED,
+                        ),
+                    )
+                var conflictAttempts = 0
+                while (result.isConflict && conflictAttempts < MAX_CONFLICT_RESOLVE_ATTEMPTS) {
+                    val candidates = listOfNotNull(result.conflict?.snapshot, result.conflict?.conflictingSnapshot)
+                    val chosen = candidates.maxByOrNull { it.metadata.lastModifiedTimestamp } ?: return null
+                    // MN-3: see readSnapshotBytes — log clock-based auto-resolution so a wrong-clock mis-pick is diagnosable.
                     Timber.tag(TAG).w(
-                        "Skipping Drive authorization because %s is no longer active",
-                        activity::class.java.simpleName,
+                        "Auto-resolving Google save conflict for %s by most-recent mtime; chose %d of %s",
+                        uniqueName,
+                        chosen.metadata.lastModifiedTimestamp,
+                        candidates.map { it.metadata.lastModifiedTimestamp },
                     )
-                    return@withContext null
-                }
-                val authRequest =
-                    AuthorizationRequest
-                        .builder()
-                        .setRequestedScopes(listOf(Scope(DRIVE_FILE_SCOPE)))
-                        .build()
-
-                val authResult: AuthorizationResult =
-                    suspendCancellableCoroutine { cont ->
-                        Identity
-                            .getAuthorizationClient(activity)
-                            .authorize(authRequest)
-                            .addOnSuccessListener { result ->
-                                cont.resume(result)
-                            }.addOnFailureListener { e ->
-                                Timber.tag(TAG).e(e, "AuthorizationClient.authorize failed")
-                                cont.resume(null)
-                            }
-                    } ?: return@withContext null
-
-                if (authResult.hasResolution()) {
-                    // User needs to grant consent — launch the consent UI
-                    Timber.tag(TAG).i("Drive authorization requires user consent, launching...")
-                    val pendingIntent = authResult.pendingIntent
-                    if (pendingIntent != null) {
-                        withContext(Dispatchers.Main) {
-                            val host = activity as? ActivityResultHost
-                            if (host != null) {
-                                host.launchDriveAuthRequest(pendingIntent.intentSender)
-                            } else {
-                                Timber.tag(TAG).e(
-                                    "Activity %s cannot launch Drive auth flow",
-                                    activity::class.java.simpleName,
-                                )
-                            }
-                        }
-                    }
-                    return@withContext null // Will retry after consent
-                }
-
-                val token = authResult.accessToken
-                if (token != null) {
-                    Timber.tag(TAG).i("Got Drive access token via AuthorizationClient")
-                } else {
-                    Timber.tag(TAG).e("AuthorizationResult has no access token")
+                    result = Tasks.await(client.resolveConflict(result.conflict!!.conflictId, chosen))
+                    conflictAttempts++
                 }
-                token
+                return if (result.isConflict) null else result.data
             } catch (e: Exception) {
-                Timber.tag(TAG).e(e, "Failed to get Drive access token")
-                null
+                if (!createIfMissing && isMissingSnapshotError(e)) return null
+                if (attempt < AUTH_SESSION_RETRY_COUNT - 1) {
+                    Timber.tag(TAG).w(e, "openSnapshot %s failed; retrying", uniqueName)
+                    delay(AUTH_SESSION_RETRY_DELAY_MS)
+                    return@repeat
+                }
+                Timber.tag(TAG).e(e, "openSnapshot %s exhausted retries", uniqueName)
+                throw e
             }
         }
+        return null
+    }
 
-    // ── Google Drive REST API helpers ──
-
-    /**
-     * Find or create the "WinNative" folder on Google Drive.
-     */
-    private fun getOrCreateGameBackupsFolder(accessToken: String): String? {
-        val rootFolderId =
-            getOrCreateDriveFolder(accessToken, null, DRIVE_ROOT_FOLDER_NAME)
-                ?: return null
-        return getOrCreateDriveFolder(accessToken, rootFolderId, DRIVE_GAMES_FOLDER_NAME)
+    private fun isMissingSnapshotError(error: Throwable): Boolean {
+        val msg = error.message ?: return false
+        return msg.contains("SNAPSHOT_NOT_FOUND", ignoreCase = true) ||
+            msg.contains("status=4002", ignoreCase = true)
     }
 
-    private fun getOrCreateDriveFolder(
-        accessToken: String,
-        parentId: String?,
-        folderName: String,
-    ): String? {
-        val queryBuilder =
-            StringBuilder()
-                .append("name='")
-                .append(escapeDriveQuery(folderName))
-                .append("'")
-                .append(" and mimeType='application/vnd.google-apps.folder'")
-                .append(" and trashed=false")
-        if (parentId != null) {
-            queryBuilder.append(" and '").append(parentId).append("' in parents")
-        }
-        val searchRequest =
-            Request
-                .Builder()
-                .url(
-                    "https://www.googleapis.com/drive/v3/files?q=${java.net.URLEncoder.encode(
-                        queryBuilder.toString(),
-                        "UTF-8",
-                    )}&fields=files(id,name)",
-                ).addHeader("Authorization", "Bearer $accessToken")
-                .get()
-                .build()
-
-        httpClient.newCall(searchRequest).execute().use { response ->
-            if (response.isSuccessful) {
-                val json = JSONObject(response.body?.string() ?: "{}")
-                val files = json.optJSONArray("files")
-                if (files != null && files.length() > 0) {
-                    val folderId = files.getJSONObject(0).getString("id")
-                    Timber.tag(TAG).d("Found existing Drive folder: %s", folderId)
-                    return folderId
-                }
+    private suspend fun loadAllSnapshotsMetadata(client: SnapshotsClient): List<SnapshotMetaSummary> {
+        val result =
+            try {
+                Tasks.await(client.load(false))
+            } catch (e: Exception) {
+                Timber.tag(TAG).w(e, "Snapshots load failed")
+                return emptyList()
+            }
+        val buffer = result.get() ?: return emptyList()
+        val out = mutableListOf<SnapshotMetaSummary>()
+        try {
+            for (i in 0 until buffer.count) {
+                val m: SnapshotMetadata = buffer[i] ?: continue
+                out += SnapshotMetaSummary(
+                    uniqueName = m.uniqueName ?: continue,
+                    description = m.description,
+                    lastModifiedTimestamp = m.lastModifiedTimestamp,
+                )
             }
+        } finally {
+            buffer.release()
         }
+        return out
+    }
 
-        // Create the folder
-        val metadata =
-            JSONObject().apply {
-                put("name", folderName)
-                put("mimeType", "application/vnd.google-apps.folder")
-                if (parentId != null) {
-                    put("parents", org.json.JSONArray().put(parentId))
+    private data class SnapshotMetaSummary(
+        val uniqueName: String,
+        val description: String?,
+        val lastModifiedTimestamp: Long,
+    )
+
+    private suspend fun deleteSnapshotsByName(activity: Activity, names: Collection<String>) {
+        if (names.isEmpty()) return
+        val client = freshSnapshotsClient(activity) ?: return
+        val summaries =
+            try {
+                // Force fresh so the rollback path sees just-written parts that haven't synced to local cache yet.
+                val result = Tasks.await(client.load(true))
+                val buffer = result.get() ?: return
+                try {
+                    val map = HashMap<String, SnapshotMetadata>()
+                    for (i in 0 until buffer.count) {
+                        val m = buffer[i] ?: continue
+                        val n = m.uniqueName ?: continue
+                        if (n in names) map[n] = m.freeze()
+                    }
+                    map
+                } finally {
+                    buffer.release()
                 }
+            } catch (e: Exception) {
+                Timber.tag(TAG).w(e, "deleteSnapshotsByName: load failed")
+                return
             }
+        for ((_, meta) in summaries) {
+            runCatching { Tasks.await(client.delete(meta)) }
+                .onFailure { Timber.tag(TAG).w(it, "Snapshot delete failed for %s", meta.uniqueName) }
+        }
+    }
 
-        val createRequest =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/drive/v3/files?fields=id")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .post(metadata.toString().toRequestBody("application/json".toMediaType()))
-                .build()
-
-        httpClient.newCall(createRequest).execute().use { response ->
-            if (response.isSuccessful) {
-                val json = JSONObject(response.body?.string() ?: "{}")
-                val folderId = json.getString("id")
-                Timber.tag(TAG).i("Created Drive folder %s: %s", folderName, folderId)
-                return folderId
-            }
-            Timber.tag(TAG).e("Failed to create Drive folder %s: %d %s", folderName, response.code, response.message)
+    private suspend fun deleteEntry(
+        activity: Activity,
+        client: SnapshotsClient,
+        entry: BackupHistoryEntry,
+    ): Boolean {
+        val manifestBytes = readSnapshotBytes(client, entry.fileId)
+        val manifest = manifestBytes?.let { Manifest.fromJson(String(it, Charsets.UTF_8)) }
+        val partNames = manifest?.parts.orEmpty()
+        if (partNames.isNotEmpty()) {
+            deleteSnapshotsByName(activity, partNames)
         }
-        return null
+        deleteSnapshotsByName(activity, listOf(entry.fileId))
+        return true
     }
 
-    /**
-     * Find or create the game-specific history folder:
-     * `WinNative/Games/History/<gameKey>/`.
-     */
-    private fun getOrCreateHistoryGameFolder(
-        accessToken: String,
-        source: GameSource,
-        gameId: String,
-        gameName: String,
-    ): String? {
-        val gamesFolderId = getOrCreateGameBackupsFolder(accessToken) ?: return null
-        val historyFolderId = getOrCreateDriveFolder(accessToken, gamesFolderId, DRIVE_HISTORY_FOLDER_NAME) ?: return null
-        val gameKey = buildHistoryGameFolderName(source, gameId, gameName)
-        return getOrCreateDriveFolder(accessToken, historyFolderId, gameKey)
+    /** Google snapshot history is retired; retained as a no-op for legacy backup code paths. */
+    private suspend fun pruneHistory(activity: Activity, gameSource: GameSource, gameId: String, gameName: String) {
+        Unit
     }
 
-    /** Look up the history game folder without creating it (returns null if absent). */
-    private fun findHistoryGameFolder(
-        accessToken: String,
-        source: GameSource,
-        gameId: String,
-        gameName: String,
-    ): String? {
-        val rootFolderId = findDriveFolder(accessToken, null, DRIVE_ROOT_FOLDER_NAME) ?: return null
-        val gamesFolderId = findDriveFolder(accessToken, rootFolderId, DRIVE_GAMES_FOLDER_NAME) ?: return null
-        val historyFolderId = findDriveFolder(accessToken, gamesFolderId, DRIVE_HISTORY_FOLDER_NAME) ?: return null
-        val gameKey = buildHistoryGameFolderName(source, gameId, gameName)
-        return findDriveFolder(accessToken, historyFolderId, gameKey)
+    // ── Naming ──
+
+    private fun manifestPrefix(source: GameSource, gameKey: String): String =
+        "${SNAPSHOT_PREFIX}_${source.code}_${gameKey}_"
+
+    private fun partPrefix(source: GameSource, gameKey: String): String =
+        manifestPrefix(source, gameKey)
+
+    private fun manifestUniqueName(source: GameSource, gameKey: String, saveId: String): String =
+        "${SNAPSHOT_PREFIX}_${source.code}_${gameKey}_${saveId}_m"
+
+    private fun partUniqueName(source: GameSource, gameKey: String, saveId: String, partIndex: Int): String =
+        "${SNAPSHOT_PREFIX}_${source.code}_${gameKey}_${saveId}_p${"%03d".format(partIndex)}"
+
+    private fun buildGameKeyHash(source: GameSource, gameId: String): String {
+        val md = MessageDigest.getInstance("SHA-256")
+        md.update("${source.name}:$gameId".toByteArray(Charsets.UTF_8))
+        val digest = md.digest()
+        return digest.copyOfRange(0, 8).joinToString("") { "%02x".format(it) }
     }
 
-    private fun findDriveFolder(
-        accessToken: String,
-        parentId: String?,
-        folderName: String,
-    ): String? {
-        val queryBuilder =
-            StringBuilder()
-                .append("name='")
-                .append(escapeDriveQuery(folderName))
-                .append("'")
-                .append(" and mimeType='application/vnd.google-apps.folder'")
-                .append(" and trashed=false")
-        if (parentId != null) {
-            queryBuilder.append(" and '").append(parentId).append("' in parents")
+    private val saveIdRandom = SecureRandom()
+
+    private fun buildSaveId(timestampMs: Long): String {
+        val fmt = SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
+        val ts = fmt.format(Date(timestampMs))
+        val rand = StringBuilder(6)
+        repeat(6) { rand.append(('a' + saveIdRandom.nextInt(26))) }
+        return "${ts}_$rand"
+    }
+
+    private fun manifestDescription(origin: BackupOrigin, label: String?): String =
+        if (label.isNullOrEmpty()) origin.tag else "${origin.tag}|$label"
+
+    private fun parseLabelFromDescription(description: String?): String? {
+        if (description.isNullOrEmpty()) return null
+        val idx = description.indexOf('|')
+        return if (idx >= 0 && idx < description.length - 1) description.substring(idx + 1) else null
+    }
+
+    fun sanitizeHistoryLabel(raw: String?): String? {
+        if (raw.isNullOrBlank()) return null
+        val cleaned =
+            raw
+                .replace(Regex("""[/\\:*?"<>|\r\n\t]"""), "")
+                .trim()
+                .take(MAX_HISTORY_LABEL_LENGTH)
+        return cleaned.ifEmpty { null }
+    }
+
+    // ── Restore: extract ──
+
+    /** Apply a staged restore onto the live save dirs: move each live dir aside, copy in the staged one, delete the aside-backup only after every source succeeds; on failure restore the aside dirs so the live save is unchanged (the only rollback Epic/GOG/Custom have). */
+    private fun swapRestoredSources(liveSources: List<SaveBackupSource>, staging: File): Boolean {
+        val done = mutableListOf<Triple<File, File?, Boolean>>() // (live, bak, hadLive)
+        fun rollback() {
+            for ((live, bak, hadLive) in done.asReversed()) {
+                runCatching { live.deleteRecursively() }
+                if (hadLive && bak != null) runCatching { bak.renameTo(live) }
+            }
         }
-        val request =
-            Request
-                .Builder()
-                .url(
-                    "https://www.googleapis.com/drive/v3/files?q=${java.net.URLEncoder.encode(
-                        queryBuilder.toString(),
-                        "UTF-8",
-                    )}&fields=files(id,name)",
-                ).addHeader("Authorization", "Bearer $accessToken")
-                .get()
-                .build()
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful) {
-                val json = JSONObject(response.body?.string() ?: "{}")
-                val files = json.optJSONArray("files")
-                if (files != null && files.length() > 0) {
-                    return files.getJSONObject(0).getString("id")
+        return try {
+            for (src in liveSources) {
+                val stagingDir = File(staging, src.zipRoot)
+                val live = src.localDir
+                val parent = live.parentFile
+                if (parent == null || (!parent.exists() && !parent.mkdirs())) {
+                    rollback()
+                    return false
+                }
+                val hadLive = live.exists()
+                var bak: File? = null
+                if (hadLive) {
+                    bak = File(parent, "${live.name}.wnrestorebak")
+                    runCatching { bak.deleteRecursively() }
+                    if (!live.renameTo(bak)) { // same-parent rename = atomic move-aside
+                        rollback()
+                        return false
+                    }
+                }
+                if (!live.mkdirs() && !live.isDirectory) {
+                    if (hadLive && bak != null) runCatching { bak.renameTo(live) }
+                    rollback()
+                    return false
+                }
+                if (!copyDirContents(stagingDir, live)) {
+                    runCatching { live.deleteRecursively() }
+                    if (hadLive && bak != null) runCatching { bak.renameTo(live) }
+                    rollback()
+                    return false
                 }
+                done += Triple(live, bak, hadLive)
             }
+            // Every source copied successfully — drop the move-aside backups (commit).
+            done.forEach { (_, bak, _) -> bak?.let { runCatching { it.deleteRecursively() } } }
+            true
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "swapRestoredSources failed; rolling back")
+            rollback()
+            false
         }
-        return null
     }
 
-    private fun listDriveFilesInFolder(
-        accessToken: String,
-        folderId: String,
-    ): List<DriveFileInfo> {
-        val query = "'$folderId' in parents and trashed=false"
-        val request =
-            Request
-                .Builder()
-                .url(
-                    "https://www.googleapis.com/drive/v3/files?q=${java.net.URLEncoder.encode(query, "UTF-8")}" +
-                        "&fields=files(id,name,size,modifiedTime)&orderBy=modifiedTime desc&pageSize=200",
-                ).addHeader("Authorization", "Bearer $accessToken")
-                .get()
-                .build()
-        val results = mutableListOf<DriveFileInfo>()
-        httpClient.newCall(request).execute().use { response ->
-            if (!response.isSuccessful) {
-                Timber.tag(TAG).e("listDriveFilesInFolder failed: %d %s", response.code, response.message)
-                return emptyList()
-            }
-            val json = JSONObject(response.body?.string() ?: "{}")
-            val files = json.optJSONArray("files") ?: return emptyList()
-            for (i in 0 until files.length()) {
-                val f = files.getJSONObject(i)
-                val id = f.optString("id").takeIf { it.isNotEmpty() } ?: continue
-                val name = f.optString("name").takeIf { it.isNotEmpty() } ?: continue
-                val size = f.optString("size", "0").toLongOrNull() ?: 0L
-                val modifiedMs =
-                    f
-                        .optString("modifiedTime")
-                        .takeIf { it.isNotEmpty() }
-                        ?.let { runCatching { Instant.parse(it).toEpochMilli() }.getOrNull() }
-                        ?: 0L
-                results += DriveFileInfo(id, name, size, modifiedMs)
+    /** Recursively copy the CONTENTS of [from] into [to]. Returns false on any I/O failure. */
+    private fun copyDirContents(from: File, to: File): Boolean {
+        if (!from.isDirectory) return true // nothing was staged for this source
+        val children = from.listFiles() ?: return true
+        for (child in children) {
+            val dest = File(to, child.name)
+            if (child.isDirectory) {
+                if (!dest.isDirectory && !dest.mkdirs()) return false
+                if (!copyDirContents(child, dest)) return false
+            } else {
+                try {
+                    dest.parentFile?.mkdirs()
+                    FileInputStream(child).use { input ->
+                        FileOutputStream(dest).use { output ->
+                            val buf = ByteArray(8192)
+                            var len: Int
+                            while (input.read(buf).also { len = it } > 0) output.write(buf, 0, len)
+                        }
+                    }
+                } catch (e: Exception) {
+                    Timber.tag(TAG).w(e, "copyDirContents: failed to copy %s", child.name)
+                    return false
+                }
             }
         }
-        return results
+        return true
     }
 
-    private fun deleteDriveFile(
-        accessToken: String,
-        fileId: String,
-    ): Boolean {
-        val request =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/drive/v3/files/$fileId")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .delete()
-                .build()
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful || response.code == 404) return true
-            Timber.tag(TAG).w("deleteDriveFile %s failed: %d %s", fileId, response.code, response.message)
+    private fun extractGzippedZipToSources(gzippedZipFile: File, sources: List<SaveBackupSource>) {
+        val sortedSources = sources.sortedByDescending { it.zipRoot.length }
+        FileInputStream(gzippedZipFile).use { fis ->
+            GZIPInputStream(fis).use { gz ->
+                ZipInputStream(gz).use { zis ->
+                    var entry: ZipEntry?
+                    while (zis.nextEntry.also { entry = it } != null) {
+                        val entryName = entry!!.name
+                        val source =
+                            sortedSources.firstOrNull {
+                                entryName == "${it.zipRoot}/" || entryName.startsWith("${it.zipRoot}/")
+                            }
+                        if (source == null) {
+                            zis.closeEntry()
+                            continue
+                        }
+                        val relativeName = entryName.removePrefix(source.zipRoot).removePrefix("/")
+                        if (relativeName.isEmpty()) {
+                            source.localDir.mkdirs()
+                            zis.closeEntry()
+                            continue
+                        }
+                        val file = File(source.localDir, relativeName)
+                        if (!file.canonicalPath.startsWith(source.localDir.canonicalPath + File.separator) &&
+                            file.canonicalPath != source.localDir.canonicalPath
+                        ) {
+                            throw SecurityException("Zip entry tries to escape target directory")
+                        }
+                        if (entry!!.isDirectory) {
+                            file.mkdirs()
+                        } else {
+                            file.parentFile?.mkdirs()
+                            FileOutputStream(file).use { fos ->
+                                val buf = ByteArray(8192)
+                                var len: Int
+                                while (zis.read(buf).also { len = it } > 0) {
+                                    fos.write(buf, 0, len)
+                                }
+                            }
+                        }
+                        zis.closeEntry()
+                    }
+                }
+            }
         }
-        return false
     }
 
-    private fun renameDriveFile(
-        accessToken: String,
-        fileId: String,
-        newName: String,
-    ): Boolean {
-        val metadata = JSONObject().apply { put("name", newName) }
-        val request =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/drive/v3/files/$fileId?fields=id,name")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .patch(metadata.toString().toRequestBody("application/json".toMediaType()))
-                .build()
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful) return true
-            Timber.tag(TAG).w("renameDriveFile %s failed: %d %s", fileId, response.code, response.message)
+    private fun sha256OfFile(file: File): String {
+        val md = MessageDigest.getInstance("SHA-256")
+        FileInputStream(file).use { fis ->
+            val buf = ByteArray(8192)
+            var len: Int
+            while (fis.read(buf).also { len = it } > 0) {
+                md.update(buf, 0, len)
+            }
         }
-        return false
+        return md.digest().joinToString("") { "%02x".format(it) }
     }
 
-    /**
-     * Remove history entries older than [HISTORY_MAX_AGE_DAYS] or beyond [MAX_HISTORY_ENTRIES].
-     */
-    private fun pruneHistoryFolder(
-        accessToken: String,
-        folderId: String,
-    ) {
-        val all = listDriveFilesInFolder(accessToken, folderId)
-        val parsed =
-            all.mapNotNull { file ->
-                val p = parseHistoryFileName(file.name) ?: return@mapNotNull null
-                Triple(file.id, p.first, file)
-            }
-        val cutoff = System.currentTimeMillis() - HISTORY_MAX_AGE_DAYS * 24L * 60L * 60L * 1000L
-        parsed
-            .filter { it.second in 1L..cutoff }
-            .forEach { runCatching { deleteDriveFile(accessToken, it.first) } }
-        parsed
-            .filter { it.second > cutoff }
-            .sortedByDescending { it.second }
-            .drop(MAX_HISTORY_ENTRIES)
-            .forEach { runCatching { deleteDriveFile(accessToken, it.first) } }
+    // ── Auth helpers ──
+
+    private fun prefs(context: Context) = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+
+    private fun isActivityValidForPlayGames(activity: Activity): Boolean {
+        if (activity.isFinishing || activity.isDestroyed) return false
+        val state = (activity as? LifecycleOwner)?.lifecycle?.currentState
+        return state?.isAtLeast(Lifecycle.State.STARTED) ?: true
     }
 
-    /**
-     * Find a file by name inside a specific folder.
-     */
-    private fun findDriveFile(
-        accessToken: String,
-        folderId: String,
-        fileName: String,
-    ): String? {
-        val query = "name='${escapeDriveQuery(fileName)}' and '$folderId' in parents and trashed=false"
-        val request =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/drive/v3/files?q=${java.net.URLEncoder.encode(query, "UTF-8")}&fields=files(id,name)")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .get()
-                .build()
-
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful) {
-                val json = JSONObject(response.body?.string() ?: "{}")
-                val files = json.optJSONArray("files")
-                if (files != null && files.length() > 0) {
-                    return files.getJSONObject(0).getString("id")
+    private suspend fun isAuthenticatedBlocking(activity: Activity): Boolean {
+        if (!isActivityValidForPlayGames(activity)) {
+            Timber.tag(TAG).i(
+                "Skipping Google auth check because %s is finishing or destroyed",
+                activity::class.java.simpleName,
+            )
+            return false
+        }
+        return try {
+            PlayGamesBootstrap.ensureInitialized(activity)
+            val task = PlayGames.getGamesSignInClient(activity).isAuthenticated
+            val result =
+                withContext(Dispatchers.IO) {
+                    try {
+                        Tasks.await(task, 10, TimeUnit.SECONDS)
+                    } catch (e: TimeoutException) {
+                        Timber.tag(TAG).e("Timeout waiting for Google authentication state")
+                        null
+                    }
                 }
-            }
+            result?.isAuthenticated == true
+        } catch (error: Exception) {
+            Timber.tag(TAG).e(error, "Failed to read Google authentication state")
+            false
         }
-        return null
     }
 
-    /**
-     * Create a new file on Google Drive inside the specified folder.
-     */
-    private fun createDriveFile(
-        accessToken: String,
-        folderId: String,
-        fileName: String,
-        data: ByteArray,
-    ): Boolean {
-        val metadata =
-            JSONObject().apply {
-                put("name", fileName)
-                put("parents", org.json.JSONArray().put(folderId))
+    /** Used by INTERACTIVE callers (manual backup, rename, delete, restore from history). */
+    private suspend fun awaitAuthenticatedSession(activity: Activity): Boolean {
+        if (!isActivityValidForPlayGames(activity)) return false
+        PlayGamesBootstrap.ensureInitialized(activity)
+        repeat(AUTH_SESSION_RETRY_COUNT) { attempt ->
+            if (isAuthenticatedBlocking(activity)) return true
+            // For INTERACTIVE, kick the sign-in client once on first miss.
+            if (attempt == 0) {
+                runCatching {
+                    Tasks.await(PlayGames.getGamesSignInClient(activity).signIn(), 30, TimeUnit.SECONDS)
+                }
             }
-
-        val boundary = "winnative_boundary_${System.currentTimeMillis()}"
-        val body = buildMultipartRelatedBody(boundary, metadata.toString(), data)
-
-        val request =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=id")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .post(body.toRequestBody("multipart/related; boundary=$boundary".toMediaType()))
-                .build()
-
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful) {
-                Timber.tag(TAG).i("Created Drive file: %s (%d bytes)", fileName, data.size)
-                return true
+            if (attempt < AUTH_SESSION_RETRY_COUNT - 1) {
+                delay(AUTH_SESSION_RETRY_DELAY_MS)
             }
-            Timber.tag(TAG).e("Failed to create Drive file: %d %s", response.code, response.message)
         }
         return false
     }
 
-    private fun buildMultipartRelatedBody(
-        boundary: String,
-        jsonMetadata: String,
-        fileData: ByteArray,
-    ): ByteArray {
-        val baos = ByteArrayOutputStream()
-        val crlf = "\r\n"
-
-        fun write(s: String) = baos.write(s.toByteArray(Charsets.UTF_8))
-
-        write("--$boundary$crlf")
-        write("Content-Type: application/json; charset=UTF-8$crlf")
-        write(crlf)
-        write(jsonMetadata)
-        write(crlf)
-        write("--$boundary$crlf")
-        write("Content-Type: application/zip$crlf")
-        write(crlf)
-        baos.write(fileData)
-        write(crlf)
-        write("--$boundary--")
-
-        return baos.toByteArray()
-    }
-
-    /**
-     * Update an existing file on Google Drive (overwrite contents).
-     */
-    private fun updateDriveFile(
-        accessToken: String,
-        fileId: String,
-        data: ByteArray,
-    ): Boolean {
-        val request =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/upload/drive/v3/files/$fileId?uploadType=media")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .patch(data.toRequestBody("application/zip".toMediaType()))
-                .build()
-
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful) {
-                Timber.tag(TAG).i("Updated Drive file: %s (%d bytes)", fileId, data.size)
-                return true
-            }
-            Timber.tag(TAG).e("Failed to update Drive file: %d %s", response.code, response.message)
+    /** GoogleAuthMode contract: SILENT = one shot no UI; RESUME = silent retries (no UI) since cold-start re-auth is async and isAuthenticated can resolve false before it lands; INTERACTIVE = may launch the sign-in sheet. RESUME only retries when previously connected. */
+    private suspend fun ensureAuthenticated(activity: Activity, mode: GoogleAuthMode): Boolean {
+        return when (mode) {
+            GoogleAuthMode.SILENT -> isAuthenticatedBlocking(activity)
+            GoogleAuthMode.RESUME -> awaitResumeAuth(activity)
+            GoogleAuthMode.INTERACTIVE -> awaitAuthenticatedSession(activity)
         }
-        return false
     }
 
-    /**
-     * Download a file's content from Google Drive.
-     */
-    private fun downloadDriveFile(
-        accessToken: String,
-        fileId: String,
-    ): ByteArray? {
-        val request =
-            Request
-                .Builder()
-                .url("https://www.googleapis.com/drive/v3/files/$fileId?alt=media")
-                .addHeader("Authorization", "Bearer $accessToken")
-                .get()
-                .build()
-
-        httpClient.newCall(request).execute().use { response ->
-            if (response.isSuccessful) {
-                return response.body?.bytes()
-            }
-            Timber.tag(TAG).e("Failed to download Drive file: %d %s", response.code, response.message)
+    /** RESUME-mode auth: retry the silent check a few times to let the SDK settle. No signIn. */
+    private suspend fun awaitResumeAuth(activity: Activity): Boolean {
+        // No prior connection → don't pay retry cost; the user must explicitly Connect first.
+        if (!isDriveConnected(activity.applicationContext)) {
+            return isAuthenticatedBlocking(activity)
         }
-        return null
+        // Up to ~2.25s total (3 × 750ms) — bounded so a screen open doesn't feel like a hang but covers slow cold starts.
+        repeat(3) { attempt ->
+            if (isAuthenticatedBlocking(activity)) return true
+            if (attempt < 2) delay(AUTH_SESSION_RETRY_DELAY_MS)
+        }
+        return false
     }
 
-    private fun buildSteamZipRoot(
-        root: PathType,
-        substitutedPath: String,
-    ): String {
-        val normalizedPath =
-            substitutedPath
-                .replace(File.separatorChar, '/')
-                .trim('/')
-        return if (normalizedPath.isEmpty()) {
-            "steam/${root.name}"
-        } else {
-            "steam/${root.name}/$normalizedPath"
+    private suspend fun freshSnapshotsClient(activity: Activity): SnapshotsClient? {
+        if (!isActivityValidForPlayGames(activity)) {
+            Timber.tag(TAG).w(
+                "Skipping snapshot client creation for %s because the activity is no longer active",
+                activity::class.java.simpleName,
+            )
+            return null
         }
+        PlayGamesBootstrap.ensureInitialized(activity)
+        return PlayGames.getSnapshotsClient(activity)
     }
-
-    private fun escapeDriveQuery(value: String): String = value.replace("\\", "\\\\").replace("'", "\\'")
 }
diff --git a/app/src/main/feature/sync/google/GoogleAuthMode.kt b/app/src/main/feature/sync/google/GoogleAuthMode.kt
new file mode 100644
index 000000000..6dc3bf715
--- /dev/null
+++ b/app/src/main/feature/sync/google/GoogleAuthMode.kt
@@ -0,0 +1,17 @@
+package com.winlator.cmod.feature.sync.google
+
+enum class GoogleAuthMode {
+    /** Single shot check of cached PGS auth state. No retry, no UI. */
+    SILENT,
+
+    /**
+     * Patient silent check — retries `isAuthenticated` a few times with short backoff
+     * to give the SDK's background bootstrap auth time to complete on cold start. Never
+     * calls `signIn()` so it can NEVER show UI. Intended for callers that load on
+     * screen entry and would otherwise race the SDK's auto-sign-in.
+     */
+    RESUME,
+
+    /** Full interactive sign-in: retries plus an explicit `signIn()` call that may show UI. */
+    INTERACTIVE,
+}
diff --git a/app/src/main/feature/sync/google/GoogleFragment.kt b/app/src/main/feature/sync/google/GoogleFragment.kt
index f91e3c3c0..624eeede0 100644
--- a/app/src/main/feature/sync/google/GoogleFragment.kt
+++ b/app/src/main/feature/sync/google/GoogleFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
+import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.shared.theme.WinNativeTheme
 
 class GoogleFragment : Fragment() {
@@ -19,7 +20,9 @@ class GoogleFragment : Fragment() {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 WinNativeTheme {
-                    GoogleScreen()
+                    GoogleScreen(
+                        bridge = (requireActivity() as? UnifiedActivity)?.settingsNavBridge,
+                    )
                 }
             }
         }
diff --git a/app/src/main/feature/sync/google/GoogleScreen.kt b/app/src/main/feature/sync/google/GoogleScreen.kt
index 9da1c67b3..8422eb0b3 100644
--- a/app/src/main/feature/sync/google/GoogleScreen.kt
+++ b/app/src/main/feature/sync/google/GoogleScreen.kt
@@ -1,6 +1,5 @@
 package com.winlator.cmod.feature.sync.google
 import android.app.Activity
-import android.content.Context
 import android.text.format.DateUtils
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.RepeatMode
@@ -13,15 +12,12 @@ import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -38,10 +34,12 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.CloudSync
 import androidx.compose.material.icons.outlined.Gamepad
+import androidx.compose.material.icons.outlined.Refresh
 import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material.icons.outlined.Upload
 import androidx.compose.material3.Icon
@@ -49,6 +47,7 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -59,6 +58,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.pointer.pointerInput
@@ -70,11 +70,14 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.winlator.cmod.R
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.shared.ui.focus.rememberSettingsContentNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 import com.winlator.cmod.shared.ui.toast.WinToast
-import com.winlator.cmod.shared.ui.outlinedSwitchColors
 import kotlinx.coroutines.launch
 
-private val BgDark = Color(0xFF18181D)
+private val BgDark = Color(0xFF11111C)
 private val CardDark = Color(0xFF1C1C2A)
 private val CardBorder = Color(0xFF2A2A3A)
 private val IconBoxBg = Color(0xFF242434)
@@ -84,10 +87,11 @@ private val TextSecondary = Color(0xFF7A8FA8)
 private val StatusGreen = Color(0xFF3FB950)
 private val WarningAmber = Color(0xFFFFC857)
 private val DangerRed = Color(0xFFFF6B6B)
+private val NavHighlight = Color(0xFF4FC3F7)
 private val StoreLoginActionButtonWidth = 112.dp
 
 @Composable
-fun GoogleScreen() {
+fun GoogleScreen(bridge: SettingsNavBridge? = null) {
     val context = LocalContext.current
     val activity = context as? Activity
     val scope = rememberCoroutineScope()
@@ -97,53 +101,82 @@ fun GoogleScreen() {
     val navBarEndPadding = navBarPadding.calculateEndPadding(layoutDirection)
     val navBarBottomPadding = navBarPadding.calculateBottomPadding()
 
+    val contentNav = rememberSettingsContentNav(bridge)
+
     var googleSignedIn by remember { mutableStateOf(false) }
     var syncState by remember { mutableStateOf(CloudSyncManager.StoreLoginSyncState()) }
     var busy by remember { mutableStateOf(false) }
+    var autoSignIn by remember { mutableStateOf(CloudSyncManager.isAutoSignInOnLaunchEnabled(context)) }
 
-    val autoBackupPrefs =
-        remember {
-            context.getSharedPreferences("google_store_login_sync", Context.MODE_PRIVATE)
+    fun loadCachedState() {
+        val currentActivity = activity ?: return
+        scope.launch {
+            syncState = CloudSyncManager.readStoreLoginState(currentActivity)
+            googleSignedIn = syncState.googleSignedIn
         }
-    var autoBackupEnabled by remember {
-        mutableStateOf(autoBackupPrefs.getBoolean("cloud_sync_auto_backup", false))
     }
 
-    fun refreshState() {
+    fun refreshRemoteState() {
         val currentActivity = activity ?: return
+        busy = true
         scope.launch {
-            syncState = CloudSyncManager.readStoreLoginState(currentActivity)
-            googleSignedIn = syncState.googleSignedIn
+            try {
+                syncState = CloudSyncManager.refreshStoreLoginState(currentActivity)
+                googleSignedIn = syncState.googleSignedIn
+            } finally {
+                busy = false
+            }
         }
     }
 
     LaunchedEffect(activity) {
         val currentActivity = activity ?: return@LaunchedEffect
-        busy = true
         syncState = CloudSyncManager.syncOnGoogleScreenOpened(currentActivity)
         googleSignedIn = syncState.googleSignedIn
-        busy = false
     }
 
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(BgDark),
-        contentPadding =
-            PaddingValues(
-                start = 16.dp + navBarStartPadding,
-                top = 16.dp,
-                end = 16.dp + navBarEndPadding,
-                bottom = 16.dp + navBarBottomPadding,
-            ),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item("services_section") {
+    CompositionLocalProvider(LocalPaneNav provides contentNav) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(BgDark)
+                    .verticalScroll(rememberScrollState())
+                    .padding(
+                        start = 16.dp + navBarStartPadding,
+                        top = 16.dp,
+                        end = 16.dp + navBarEndPadding,
+                        bottom = 16.dp + navBarBottomPadding,
+                    ),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            SectionLabel(stringResource(R.string.google_auto_signin_section))
+
+            AutoSignInToggleCard(
+                checked = autoSignIn,
+                onCheckedChange = { enabled ->
+                    autoSignIn = enabled
+                    CloudSyncManager.setAutoSignInOnLaunchEnabled(context, enabled)
+                    if (enabled) {
+                        // Opted in: sign in right away (a toast here is expected, unlike the silent OFF path).
+                        val currentActivity = activity ?: return@AutoSignInToggleCard
+                        busy = true
+                        CloudSyncManager.signIn(currentActivity) { success, message ->
+                            busy = false
+                            googleSignedIn = success
+                            if (success) {
+                                com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+                                    .setDriveConnected(context, true)
+                            }
+                            WinToast.show(context, message)
+                            refreshRemoteState()
+                        }
+                    }
+                },
+            )
+
             SectionLabel(stringResource(R.string.google_cloud_services))
-        }
 
-        item("google_account_card") {
             GoogleAccountCard(
                 isLoggedIn = googleSignedIn,
                 busy = busy,
@@ -153,8 +186,10 @@ fun GoogleScreen() {
                     CloudSyncManager.signIn(currentActivity) { success, message ->
                         busy = false
                         googleSignedIn = success
+                        // Keep the Google Saved-Games gate (used by save backup/history) in sync.
+                        GameSaveBackupManager.setDriveConnected(context, success)
                         WinToast.show(context, message)
-                        refreshState()
+                        refreshRemoteState()
                     }
                 },
                 onSignOut = {
@@ -163,21 +198,21 @@ fun GoogleScreen() {
                     CloudSyncManager.signOut(currentActivity) { success, message ->
                         busy = false
                         googleSignedIn = !success
+                        if (success) GameSaveBackupManager.setDriveConnected(context, false)
                         WinToast.show(context, message)
-                        refreshState()
+                        loadCachedState()
                     }
                 },
             )
-        }
 
-        item("store_logins_section") {
             SectionLabel(stringResource(R.string.google_cloud_store_logins), modifier = Modifier.padding(top = 8.dp))
-        }
 
-        item("store_login_card") {
             StoreLoginCard(
                 state = syncState,
                 busy = busy,
+                onRefresh = {
+                    refreshRemoteState()
+                },
                 onBackup = {
                     val currentActivity = activity ?: return@StoreLoginCard
                     busy = true
@@ -185,7 +220,7 @@ fun GoogleScreen() {
                         try {
                             val message = CloudSyncManager.backupStoreLogins(currentActivity)
                             WinToast.show(context, message)
-                            syncState = CloudSyncManager.readStoreLoginState(currentActivity)
+                            syncState = CloudSyncManager.refreshStoreLoginState(currentActivity)
                             googleSignedIn = syncState.googleSignedIn
                         } finally {
                             busy = false
@@ -199,7 +234,7 @@ fun GoogleScreen() {
                         try {
                             val message = CloudSyncManager.restoreStoreLogins(currentActivity)
                             WinToast.show(context, message)
-                            syncState = CloudSyncManager.readStoreLoginState(currentActivity)
+                            syncState = CloudSyncManager.refreshStoreLoginState(currentActivity)
                             googleSignedIn = syncState.googleSignedIn
                         } finally {
                             busy = false
@@ -208,116 +243,6 @@ fun GoogleScreen() {
                 },
             )
         }
-
-        item("auto_backup_section") {
-            SectionLabel(stringResource(R.string.google_cloud_auto_backup), modifier = Modifier.padding(top = 8.dp))
-        }
-
-        item("auto_backup_card") {
-            AutoBackupCard(
-                enabled = autoBackupEnabled,
-                googleSignedIn = googleSignedIn,
-                busy = busy,
-                onToggle = { newValue ->
-                    if (newValue) {
-                        val currentActivity = activity ?: return@AutoBackupCard
-                        busy = true
-                        scope.launch {
-                            try {
-                                val alreadyAuthorized = GameSaveBackupManager.requestDriveAuthorization(currentActivity)
-                                if (alreadyAuthorized) {
-                                    autoBackupEnabled = true
-                                    autoBackupPrefs.edit().putBoolean("cloud_sync_auto_backup", true).apply()
-                                } else {
-                                    autoBackupEnabled = false
-                                    autoBackupPrefs.edit().putBoolean("cloud_sync_auto_backup", false).apply()
-                                }
-                            } catch (e: Exception) {
-                                WinToast.show(context, "Drive authorization failed: ${e.message}")
-                            } finally {
-                                busy = false
-                            }
-                        }
-                    } else {
-                        autoBackupEnabled = false
-                        autoBackupPrefs.edit().putBoolean("cloud_sync_auto_backup", false).apply()
-                    }
-                },
-            )
-        }
-    }
-}
-
-@Composable
-private fun AutoBackupCard(
-    enabled: Boolean,
-    googleSignedIn: Boolean,
-    busy: Boolean,
-    onToggle: (Boolean) -> Unit,
-) {
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(12.dp))
-                .background(CardDark)
-                .border(1.dp, CardBorder, RoundedCornerShape(12.dp))
-                .clickable(enabled = !busy) { onToggle(!enabled) },
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 14.dp, vertical = 11.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .size(34.dp)
-                        .clip(RoundedCornerShape(9.dp))
-                        .background(IconBoxBg),
-                contentAlignment = Alignment.Center,
-            ) {
-                Icon(
-                    imageVector = Icons.Outlined.CloudSync,
-                    contentDescription = null,
-                    tint = if (enabled && googleSignedIn) StatusGreen else TextSecondary,
-                    modifier = Modifier.size(17.dp),
-                )
-            }
-
-            Spacer(Modifier.width(13.dp))
-
-            Column(modifier = Modifier.weight(1f)) {
-                Text(
-                    text = stringResource(R.string.google_cloud_auto_backup),
-                    color = TextPrimary,
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.Medium,
-                )
-                Spacer(Modifier.height(4.dp))
-                Text(
-                    text = stringResource(R.string.google_cloud_auto_backup_summary),
-                    color = TextSecondary,
-                    fontSize = 11.sp,
-                )
-            }
-
-            Spacer(Modifier.width(4.dp))
-
-            Switch(
-                checked = enabled && googleSignedIn,
-                onCheckedChange = { onToggle(it) },
-                enabled = !busy,
-                modifier = Modifier.scale(0.78f),
-                colors =
-                    outlinedSwitchColors(
-                        accentColor = StatusGreen,
-                        textSecondaryColor = TextSecondary,
-                    ),
-            )
-        }
     }
 }
 
@@ -336,6 +261,75 @@ private fun SectionLabel(
     )
 }
 
+@Composable
+private fun AutoSignInToggleCard(
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(14.dp))
+                .background(CardDark)
+                .border(1.dp, CardBorder, RoundedCornerShape(14.dp))
+                .paneNavItem(
+                    cornerRadius = 14.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    highlightColor = NavHighlight,
+                    tapToSelect = true,
+                )
+                .padding(horizontal = 16.dp, vertical = 14.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size(38.dp)
+                    .clip(RoundedCornerShape(10.dp))
+                    .background(IconBoxBg),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Gamepad,
+                contentDescription = null,
+                tint = Accent,
+                modifier = Modifier.size(20.dp),
+            )
+        }
+        Spacer(Modifier.width(14.dp))
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = stringResource(R.string.google_auto_signin_title),
+                color = TextPrimary,
+                fontSize = 14.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+            Spacer(Modifier.height(2.dp))
+            Text(
+                text = stringResource(R.string.google_auto_signin_summary),
+                color = TextSecondary,
+                fontSize = 11.sp,
+                lineHeight = 15.sp,
+            )
+        }
+        Spacer(Modifier.width(12.dp))
+        Switch(
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+            modifier = Modifier.focusProperties { canFocus = false },
+            colors =
+                SwitchDefaults.colors(
+                    checkedThumbColor = Color.White,
+                    checkedTrackColor = Accent,
+                    uncheckedThumbColor = TextSecondary,
+                    uncheckedTrackColor = IconBoxBg,
+                    uncheckedBorderColor = CardBorder,
+                ),
+        )
+    }
+}
+
 @Composable
 private fun GoogleAccountCard(
     isLoggedIn: Boolean,
@@ -533,6 +527,7 @@ private fun GoogleAccountCard(
 private fun StoreLoginCard(
     state: CloudSyncManager.StoreLoginSyncState,
     busy: Boolean,
+    onRefresh: () -> Unit,
     onBackup: () -> Unit,
     onRestore: () -> Unit,
 ) {
@@ -646,6 +641,14 @@ private fun StoreLoginCard(
                         horizontalArrangement = Arrangement.End,
                         verticalAlignment = Alignment.CenterVertically,
                     ) {
+                        ActionButton(
+                            label = if (busy) stringResource(R.string.google_cloud_working) else stringResource(R.string.cloud_saves_history_refresh),
+                            textColor = StatusGreen,
+                            icon = Icons.Outlined.Refresh,
+                            enabled = !busy && state.googleSignedIn,
+                            onClick = onRefresh,
+                        )
+                        Spacer(Modifier.width(8.dp))
                         ActionButton(
                             label = if (busy) stringResource(R.string.google_cloud_working) else stringResource(R.string.google_cloud_backup),
                             textColor = WarningAmber,
@@ -705,7 +708,16 @@ private fun StoreLoginCard(
                         }
                     }
 
-                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        ActionButton(
+                            label = if (busy) stringResource(R.string.google_cloud_working) else stringResource(R.string.cloud_saves_history_refresh),
+                            textColor = StatusGreen,
+                            icon = Icons.Outlined.Refresh,
+                            enabled = !busy && state.googleSignedIn,
+                            onClick = onRefresh,
+                        )
                         ActionButton(
                             label = if (busy) stringResource(R.string.google_cloud_working) else stringResource(R.string.google_cloud_backup),
                             textColor = WarningAmber,
@@ -847,7 +859,12 @@ private fun ActionButton(
                     1.dp,
                     if (enabled) textColor.copy(alpha = 0.30f) else TextSecondary.copy(alpha = 0.2f),
                     RoundedCornerShape(8.dp),
-                ).pointerInput(onClick, enabled) {
+                ).paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (enabled) onClick() },
+                    highlightColor = NavHighlight,
+                )
+                .pointerInput(onClick, enabled) {
                     detectTapGestures(
                         onPress = {
                             if (!enabled) return@detectTapGestures
diff --git a/app/src/main/feature/sync/google/PlayGamesBootstrap.kt b/app/src/main/feature/sync/google/PlayGamesBootstrap.kt
index d1bb45b34..b0325ba7e 100644
--- a/app/src/main/feature/sync/google/PlayGamesBootstrap.kt
+++ b/app/src/main/feature/sync/google/PlayGamesBootstrap.kt
@@ -6,9 +6,12 @@ import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
 
 /**
- * Lazy initializer for the Play Games v2 SDK. Called from every entry point that needs it
- * (sign-in, snapshot client, auth check) instead of eagerly from [PluviaApp.onCreate] —
- * keeps cold-start fast and avoids initializing Google libs for users who never touch cloud sync.
+ * Idempotent initializer for the Play Games v2 SDK.
+ *
+ * Called eagerly from `PluviaApp.onCreate()` so the SDK's silent re-auth bootstrap starts at
+ * process start (covering the cold-start race where `isAuthenticated.await()` resolved false
+ * before the background auth had landed). Also called defensively from every entry point that
+ * needs PGS, so legacy callers and any new code paths are safe even if eager init is removed.
  */
 object PlayGamesBootstrap {
     private const val TAG = "PlayGamesBootstrap"
diff --git a/app/src/main/feature/sync/google/WinePathUtils.kt b/app/src/main/feature/sync/google/WinePathUtils.kt
new file mode 100644
index 000000000..da8be6a86
--- /dev/null
+++ b/app/src/main/feature/sync/google/WinePathUtils.kt
@@ -0,0 +1,99 @@
+package com.winlator.cmod.feature.sync.google
+
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import java.io.File
+
+/**
+ * Bidirectional Wine-prefix path utilities used by the Custom Games save-folder picker
+ * and Google save backup/restore. PathType.kt covers Steam/GOG/Epic forward mapping; this
+ * helper covers the missing reverse direction (Android → Windows) plus a forward
+ * resolver that goes through a specific Container.
+ */
+object WinePathUtils {
+
+    /**
+     * Container's drive_c root on the Android filesystem.
+     * Containers built by WinNative store their wine prefix at `<container.rootDir>/.wine`.
+     */
+    fun driveCRoot(container: Container): File =
+        File(container.rootDir, ".wine/drive_c")
+
+    /**
+     * Convert an absolute Android path that lives inside the container's drive_c
+     * to its Windows equivalent (e.g. `C:\\users\\xuser\\AppData\\Roaming\\MyGame`).
+     *
+     * Returns null if the path is not inside the container's drive_c — callers should
+     * reject the user's selection in that case rather than silently round-tripping.
+     *
+     * Case-insensitive prefix match on `drive_c` so a user picking through a path that
+     * was case-changed at any point still resolves cleanly.
+     */
+    fun androidToWindowsPath(absolutePath: String, container: Container): String? {
+        val driveC = driveCRoot(container)
+        val canonicalDriveC = runCatching { driveC.canonicalPath }.getOrNull() ?: driveC.absolutePath
+        val canonicalTarget = runCatching { File(absolutePath).canonicalPath }.getOrNull() ?: absolutePath
+
+        val prefixWithSep = canonicalDriveC.trimEnd('/') + "/"
+        val match =
+            when {
+                canonicalTarget.equals(canonicalDriveC, ignoreCase = true) -> ""
+                canonicalTarget.startsWith(prefixWithSep, ignoreCase = true) ->
+                    canonicalTarget.substring(prefixWithSep.length)
+                else -> return null
+            }
+
+        val winSegments = match.trim('/').split('/').filter { it.isNotEmpty() }
+        return if (winSegments.isEmpty()) {
+            "C:\\"
+        } else {
+            "C:\\" + winSegments.joinToString("\\")
+        }
+    }
+
+    /**
+     * Convert a Windows path (e.g. `C:\\users\\xuser\\Documents\\MyGame`) to its
+     * Android-side absolute path inside the given container's drive_c.
+     *
+     * Walks the actual on-disk tree case-insensitively so the resolved path matches
+     * existing folder casing rather than producing a path with the user-entered casing
+     * that would mkdir under a slightly-different name. If a path component doesn't yet
+     * exist on disk the user-supplied casing is preserved for that component.
+     */
+    fun windowsToAndroidFile(windowsPath: String, container: Container): File {
+        val normalized = windowsPath.trim().replace('/', '\\')
+        val withoutDrive =
+            when {
+                normalized.length >= 2 && normalized[1] == ':' -> normalized.substring(2)
+                else -> normalized
+            }.trimStart('\\')
+
+        val segments = withoutDrive.split('\\').filter { it.isNotEmpty() }
+        var cursor: File = driveCRoot(container)
+        for (segment in segments) {
+            val match = cursor
+                .takeIf { it.isDirectory }
+                ?.listFiles()
+                ?.firstOrNull { it.name.equals(segment, ignoreCase = true) }
+            cursor = match ?: File(cursor, segment)
+        }
+        return cursor
+    }
+
+    /**
+     * True if `candidate` is inside (or equal to) `container.rootDir/.wine/drive_c`.
+     * Used by the folder picker to validate the user's pick.
+     */
+    fun isInsideDriveC(candidate: File, container: Container): Boolean {
+        val driveC = driveCRoot(container)
+        val canonicalDriveC = runCatching { driveC.canonicalPath }.getOrNull() ?: driveC.absolutePath
+        val canonicalCandidate = runCatching { candidate.canonicalPath }.getOrNull() ?: candidate.absolutePath
+        if (canonicalCandidate.equals(canonicalDriveC, ignoreCase = true)) return true
+        val prefixWithSep = canonicalDriveC.trimEnd('/') + "/"
+        return canonicalCandidate.startsWith(prefixWithSep, ignoreCase = true)
+    }
+
+    /** Convenience: ensure the wine `xuser` matches what we assume. */
+    @Suppress("unused")
+    val WINE_USER: String = ImageFs.USER
+}
diff --git a/app/src/main/feature/sync/ui/CloudSavesUIContent.kt b/app/src/main/feature/sync/ui/CloudSavesUIContent.kt
new file mode 100644
index 000000000..f9f7870c1
--- /dev/null
+++ b/app/src/main/feature/sync/ui/CloudSavesUIContent.kt
@@ -0,0 +1,1776 @@
+package com.winlator.cmod.feature.sync.ui
+
+import android.app.Activity
+import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material.icons.outlined.CloudSync
+import androidx.compose.material.icons.outlined.CloudUpload
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.FolderOpen
+import androidx.compose.material.icons.outlined.History
+import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material.icons.outlined.Restore
+import androidx.compose.material.icons.outlined.UploadFile
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.app.shell.LaunchDangerConfirmDialog
+import com.winlator.cmod.feature.stores.epic.service.EpicCloudHistoryProvider
+import com.winlator.cmod.feature.stores.gog.service.GOGCloudHistoryProvider
+import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.steamcloudsync.SteamCloudHistoryProvider
+import com.winlator.cmod.feature.steamcloudsync.SteamCloudSyncHelper
+import com.winlator.cmod.feature.steamcloudsync.SteamSaveSnapshotManager
+import com.winlator.cmod.feature.sync.google.GameSaveBackupManager
+import com.winlator.cmod.feature.sync.google.GoogleAuthMode
+import com.winlator.cmod.feature.sync.google.WinePathUtils
+import com.winlator.cmod.runtime.container.ContainerManager
+import com.winlator.cmod.runtime.container.Shortcut
+import com.winlator.cmod.shared.android.DirectoryPickerDialog
+import com.winlator.cmod.shared.theme.WinNativeAccent
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.toast.WinToast
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+private val PageBg = Color(0xFF12121B)
+private val SurfaceDark = Color(0xFF1C1C2A)
+private val CardBorder = Color(0xFF2A2A3A)
+private val Accent = Color(0xFF1A9FFF)
+private val TextPrimary = Color(0xFFF0F4FF)
+private val TextSecondary = Color(0xFF7A8FA8)
+private val CloudPanel = Color(0xFF1C1C2A)
+private val CloudPanelRaised = Color(0xFF232334)
+private val CloudBorder = Color(0xFF2A2A3A)
+private val CloudAccent = Color(0xFF5CC8FF)
+private val CloudSuccess = Color(0xFF65D394)
+private val CloudWarning = Color(0xFFFFB85C)
+private val CloudDanger = Color(0xFFE07B6B)
+
+@Composable
+internal fun CloudSavesContent(
+    activity: Activity,
+    isWorking: Boolean,
+    cloudSyncEnabled: Boolean,
+    offlineModeEnabled: Boolean,
+    gameSource: GameSaveBackupManager.GameSource,
+    gameId: String,
+    gameName: String,
+    shortcut: Shortcut?,
+    retroSaveDir: java.io.File? = null,
+    onCloudSyncToggle: (Boolean) -> Unit,
+    onOfflineModeToggle: (Boolean) -> Unit,
+    onSyncFromCloud: () -> Unit,
+    showTitle: Boolean = true,
+    showBottomBack: Boolean = true,
+    onBack: () -> Unit,
+) {
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
+    // Anchor toasts to this screen's window so they render above the hosting dialog.
+    val hostView = LocalView.current
+    val notify: (String, Int) -> Unit = { message, duration -> WinToast.show(context, message, duration, hostView) }
+    var restoreInProgress by remember { mutableStateOf(false) }
+    var historyRefreshKey by remember { mutableStateOf(0) }
+    var historyLoading by remember { mutableStateOf(false) }
+    var historyEntries by remember { mutableStateOf<List<GameSaveBackupManager.BackupHistoryEntry>>(emptyList()) }
+    var historySteamUnreachable by remember { mutableStateOf(false) }
+    var entryPendingRestore by remember {
+        mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
+    }
+    var entryPendingRename by remember {
+        mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
+    }
+    var entryPendingDelete by remember {
+        mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
+    }
+    var deleteInProgress by remember { mutableStateOf(false) }
+    val steamManagedCloud = gameSource == GameSaveBackupManager.GameSource.STEAM
+    val targetContainerId =
+        shortcut
+            ?.getExtra("container_id")
+            ?.toIntOrNull()
+            ?.takeIf { it > 0 }
+            ?: shortcut?.container?.id?.takeIf { it > 0 }
+    // Resolve the game's REAL container: the `container_id` override wins over shortcut.container (stale once a game is reassigned), or cloud ops hit the wrong wineprefix → "No save files found".
+    val targetContainer =
+        remember(shortcut, targetContainerId) {
+            targetContainerId?.let { ContainerManager(context).getContainerById(it) } ?: shortcut?.container
+        }
+    var gogZipBusy by remember { mutableStateOf(false) }
+    var googleBackupBusy by remember { mutableStateOf(false) }
+    var pendingCloudFileDownload by remember {
+        mutableStateOf<GameSaveBackupManager.BackupHistoryEntry?>(null)
+    }
+    val cloudFileDownloadLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/octet-stream")) { uri ->
+            val entry = pendingCloudFileDownload
+            pendingCloudFileDownload = null
+            if (uri == null || entry == null) return@rememberLauncherForActivityResult
+            val appId = gameId.toIntOrNull() ?: return@rememberLauncherForActivityResult
+            scope.launch {
+                val ok =
+                    withContext(Dispatchers.IO) {
+                        runCatching {
+                            val bytes = SteamCloudHistoryProvider.downloadFileBytes(appId, entry.fileId)
+                            if (bytes == null) {
+                                false
+                            } else {
+                                context.contentResolver.openOutputStream(uri)?.use { output ->
+                                    output.write(bytes)
+                                    true
+                                } ?: false
+                            }
+                        }.getOrDefault(false)
+                    }
+                notify(
+                    context.getString(
+                        if (ok) R.string.cloud_saves_history_download_success else R.string.cloud_saves_history_download_failed,
+                    ),
+                    Toast.LENGTH_SHORT,
+                )
+            }
+        }
+    val gogZipLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
+            if (uri == null) return@rememberLauncherForActivityResult
+            scope.launch {
+                gogZipBusy = true
+                val result =
+                    withContext(Dispatchers.IO) {
+                        runCatching {
+                            context.contentResolver.openOutputStream(uri)?.use { output ->
+                                GOGService.exportCloudSavesZip(
+                                    context = context,
+                                    appId = gameId,
+                                    outputStream = output,
+                                    targetContainerId = targetContainerId,
+                                )
+                            } ?: GameSaveBackupManager.BackupResult(
+                                false,
+                                context.getString(R.string.cloud_saves_gog_zip_failed),
+                            )
+                        }.getOrElse {
+                            GameSaveBackupManager.BackupResult(false, it.message ?: context.getString(R.string.cloud_saves_gog_zip_failed))
+                        }
+                    }
+                gogZipBusy = false
+                notify(
+                    if (result.success) {
+                        context.getString(R.string.cloud_saves_gog_zip_success)
+                    } else {
+                        result.message.ifBlank { context.getString(R.string.cloud_saves_gog_zip_failed) }
+                    },
+                    Toast.LENGTH_SHORT,
+                )
+            }
+        }
+
+    LaunchedEffect(gameSource, gameId, targetContainerId, historyRefreshKey) {
+        historyLoading = true
+        historySteamUnreachable = false
+        historyEntries =
+            when (gameSource) {
+                GameSaveBackupManager.GameSource.STEAM -> {
+                    val appId = gameId.toIntOrNull()
+                    if (appId != null) {
+                        val cloud =
+                            when (val r = SteamCloudHistoryProvider.listCloudSaveGroupsDetailed(context, appId)) {
+                                is SteamCloudHistoryProvider.HistoryResult.Entries -> r.list
+                                SteamCloudHistoryProvider.HistoryResult.Empty -> emptyList()
+                                SteamCloudHistoryProvider.HistoryResult.Unreachable -> {
+                                    historySteamUnreachable = true
+                                    emptyList()
+                                }
+                            }
+                        // Surface the local rolling snapshots — STEAM_LOCAL entries are the only ones supporting true per-entry rollback (restoreFromEntry), so without them the user couldn't recover those saves.
+                        val localSnapshots = SteamSaveSnapshotManager.listHistory(context, appId)
+                        // Surface Google-mirrored "keep a copy" saves in the same list (silent no-op when not signed in).
+                        val google =
+                            GameSaveBackupManager.listGoogleHistory(
+                                activity,
+                                GameSaveBackupManager.GameSource.STEAM,
+                                gameId,
+                            )
+                        (cloud + localSnapshots + google).sortedByDescending { it.timestampMs }
+                    } else {
+                        emptyList()
+                    }
+                }
+                GameSaveBackupManager.GameSource.EPIC -> {
+                    val appId = gameId.toIntOrNull()
+                    val epic =
+                        if (appId != null) {
+                            EpicCloudHistoryProvider.listCloudSaveGroups(context, appId)
+                        } else {
+                            emptyList()
+                        }
+                    // Surface "Backup To Google" copies alongside the provider history.
+                    val google = GameSaveBackupManager.listGoogleHistory(activity, gameSource, gameId)
+                    (epic + google).sortedByDescending { it.timestampMs }
+                }
+                GameSaveBackupManager.GameSource.GOG -> {
+                    val gog = GOGCloudHistoryProvider.listCloudSaveGroups(context, gameId, targetContainerId)
+                    val google = GameSaveBackupManager.listGoogleHistory(activity, gameSource, gameId)
+                    (gog + google).sortedByDescending { it.timestampMs }
+                }
+                GameSaveBackupManager.GameSource.CUSTOM ->
+                    GameSaveBackupManager
+                        .listGoogleHistory(activity, gameSource, gameId)
+                        .sortedByDescending { it.timestampMs }
+            }
+        historyLoading = false
+    }
+
+    var wasWorking by remember { mutableStateOf(false) }
+    LaunchedEffect(isWorking) {
+        if (wasWorking && !isWorking) historyRefreshKey++
+        wasWorking = isWorking
+    }
+
+    val providerLabel =
+        when (gameSource) {
+            GameSaveBackupManager.GameSource.STEAM -> stringResource(R.string.preloader_platform_steam)
+            GameSaveBackupManager.GameSource.EPIC -> stringResource(R.string.preloader_platform_epic)
+            GameSaveBackupManager.GameSource.GOG -> stringResource(R.string.preloader_platform_gog)
+            GameSaveBackupManager.GameSource.CUSTOM -> stringResource(R.string.preloader_platform_custom)
+        }
+
+    val currentDensity = LocalDensity.current
+    val fixedDensity = remember(currentDensity.density) {
+        Density(density = currentDensity.density, fontScale = 1f)
+    }
+
+    CompositionLocalProvider(LocalDensity provides fixedDensity) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .background(PageBg)
+                .padding(horizontal = 16.dp, vertical = 12.dp),
+        verticalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        if (showTitle) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    stringResource(R.string.cloud_saves_title_for_provider, providerLabel, gameName).uppercase(),
+                    style = MaterialTheme.typography.labelMedium,
+                    color = TextSecondary,
+                    fontWeight = FontWeight.Bold,
+                    letterSpacing = 1.1.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f),
+                )
+            }
+        }
+
+        if (steamManagedCloud) {
+            val steamBrowseAppId = gameId.toIntOrNull()
+            val steamBrowseNoBrowser = stringResource(R.string.cloud_saves_steam_browse_no_browser)
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                TogglePairCard(
+                    modifier = Modifier.weight(1f),
+                    cloudSyncEnabled = cloudSyncEnabled,
+                    offlineModeEnabled = offlineModeEnabled,
+                    showOfflineMode = false,
+                    cloudSyncDisableSemantics = true,
+                    onCloudSyncToggle = onCloudSyncToggle,
+                    onOfflineModeToggle = onOfflineModeToggle,
+                )
+                ActionWithHelper(
+                    icon = Icons.AutoMirrored.Outlined.OpenInNew,
+                    label = stringResource(R.string.cloud_saves_steam_browse_label),
+                    tint = CloudWarning,
+                    modifier = Modifier.weight(1f),
+                    enabled = steamBrowseAppId != null,
+                    onClick = {
+                        val appId = steamBrowseAppId ?: return@ActionWithHelper
+                        val url = "https://store.steampowered.com/account/remotestorageapp/?appid=$appId"
+                        runCatching {
+                            activity.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)))
+                        }.onFailure {
+                            notify(steamBrowseNoBrowser, Toast.LENGTH_SHORT)
+                        }
+                    },
+                )
+            }
+        } else {
+            TogglePairCard(
+                cloudSyncEnabled = cloudSyncEnabled,
+                offlineModeEnabled = offlineModeEnabled,
+                showOfflineMode = !steamManagedCloud,
+                cloudSyncDisableSemantics = steamManagedCloud,
+                onCloudSyncToggle = onCloudSyncToggle,
+                onOfflineModeToggle = onOfflineModeToggle,
+            )
+        }
+
+        if (isWorking || gogZipBusy) {
+            LinearProgressIndicator(
+                modifier = Modifier.fillMaxWidth(),
+                color = Accent,
+                trackColor = CardBorder,
+            )
+        }
+
+        if (!steamManagedCloud && retroSaveDir == null) {
+            var customSavePath by remember(shortcut?.file?.absolutePath, historyRefreshKey) {
+                mutableStateOf(shortcut?.let { GameSaveBackupManager.getCustomGameSaveWindowsPath(it) })
+            }
+            val customNoContainer = stringResource(R.string.cloud_saves_custom_no_container)
+            val customPickerTitle = stringResource(R.string.cloud_saves_custom_picker_title)
+            val customOutsideDriveC = stringResource(R.string.cloud_saves_custom_outside_drive_c)
+            val customPathMapFailed = stringResource(R.string.cloud_saves_custom_path_map_failed)
+            val gogManageNoBrowser = stringResource(R.string.cloud_saves_gog_manage_no_browser)
+            val firstAction: @Composable (Modifier) -> Unit = { mod ->
+                if (gameSource == GameSaveBackupManager.GameSource.CUSTOM) {
+                    val pickerLabel =
+                        if (customSavePath.isNullOrEmpty()) {
+                            stringResource(R.string.cloud_saves_custom_select_folder)
+                        } else {
+                            stringResource(R.string.cloud_saves_custom_folder_label)
+                        }
+                    val pickerHelper =
+                        if (customSavePath.isNullOrEmpty()) {
+                            stringResource(R.string.cloud_saves_custom_select_folder_summary)
+                        } else {
+                            customSavePath.orEmpty()
+                        }
+                    ActionWithHelper(
+                        icon = Icons.Outlined.FolderOpen,
+                        label = pickerLabel,
+                        helper = pickerHelper,
+                        tint = CloudWarning,
+                        modifier = mod,
+                        enabled = !isWorking,
+                        onClick = {
+                            val sc = shortcut
+                            val container = sc?.container
+                            if (sc == null || container == null) {
+                                notify(
+                                    customNoContainer,
+                                    Toast.LENGTH_SHORT,
+                                )
+                                return@ActionWithHelper
+                            }
+                            val driveC = WinePathUtils.driveCRoot(container)
+                            DirectoryPickerDialog.show(
+                                activity,
+                                initialPath = driveC.absolutePath,
+                                title = customPickerTitle,
+                            ) { picked ->
+                                val pickedFile = java.io.File(picked)
+                                if (!WinePathUtils.isInsideDriveC(pickedFile, container)) {
+                                    notify(
+                                        customOutsideDriveC,
+                                        Toast.LENGTH_LONG,
+                                    )
+                                    return@show
+                                }
+                                val winPath =
+                                    WinePathUtils
+                                        .androidToWindowsPath(picked, container)
+                                if (winPath == null) {
+                                    notify(
+                                        customPathMapFailed,
+                                        Toast.LENGTH_LONG,
+                                    )
+                                    return@show
+                                }
+                                GameSaveBackupManager.setCustomGameSavePath(sc, container, winPath)
+                                customSavePath = winPath
+                                notify(
+                                    context.getString(R.string.cloud_saves_custom_folder_set, winPath),
+                                    Toast.LENGTH_SHORT,
+                                )
+                            }
+                        },
+                    )
+                } else {
+                    ActionWithHelper(
+                        icon = Icons.Outlined.CloudSync,
+                        label = stringResource(R.string.cloud_saves_sync_from_provider, providerLabel),
+                        helper = stringResource(R.string.cloud_saves_sync_summary, providerLabel),
+                        tint = CloudAccent,
+                        modifier = mod,
+                        enabled = !isWorking && !gogZipBusy,
+                        onClick = { if (!isWorking && !gogZipBusy) onSyncFromCloud() },
+                    )
+                }
+            }
+            val manageGogAction: @Composable (Modifier) -> Unit = { mod ->
+                ActionWithHelper(
+                    icon = Icons.AutoMirrored.Outlined.OpenInNew,
+                    label = stringResource(R.string.cloud_saves_gog_manage_label),
+                    helper = stringResource(R.string.cloud_saves_gog_manage_helper),
+                    tint = CloudWarning,
+                    modifier = mod,
+                    enabled = !gogZipBusy,
+                    onClick = {
+                        val url = "https://www.gog.com/account/cloud-saves/page/1"
+                        runCatching {
+                            activity.startActivity(
+                                android.content.Intent(
+                                    android.content.Intent.ACTION_VIEW,
+                                    android.net.Uri.parse(url),
+                                ),
+                            )
+                        }.onFailure {
+                            notify(
+                                gogManageNoBrowser,
+                                Toast.LENGTH_SHORT,
+                            )
+                        }
+                    },
+                )
+            }
+            val downloadGogZipAction: @Composable (Modifier) -> Unit = { mod ->
+                ActionWithHelper(
+                    icon = Icons.Outlined.Download,
+                    label = stringResource(R.string.cloud_saves_gog_zip_label),
+                    helper = stringResource(R.string.cloud_saves_gog_zip_helper),
+                    tint = CloudSuccess,
+                    modifier = mod,
+                    enabled = !isWorking && !gogZipBusy,
+                    onClick = {
+                        if (isWorking || gogZipBusy) return@ActionWithHelper
+                        scope.launch {
+                            gogZipBusy = true
+                            val hasCloudFiles =
+                                withContext(Dispatchers.IO) {
+                                    GOGCloudHistoryProvider
+                                        .listCloudSaveGroups(context, gameId, targetContainerId)
+                                        .isNotEmpty()
+                                }
+                            gogZipBusy = false
+                            if (hasCloudFiles) {
+                                gogZipLauncher.launch("${safeZipFileName(gameName)}_GOG_Cloud_Saves.zip")
+                            } else {
+                                notify(
+                                    context.getString(R.string.cloud_saves_gog_zip_empty),
+                                    Toast.LENGTH_SHORT,
+                                )
+                            }
+                        }
+                    },
+                )
+            }
+            BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
+                val compact = maxWidth < 520.dp
+                if (compact) {
+                    Column(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        ) {
+                            firstAction(Modifier.weight(1f))
+                            if (gameSource == GameSaveBackupManager.GameSource.GOG) {
+                                manageGogAction(Modifier.weight(1f))
+                                downloadGogZipAction(Modifier.weight(1f))
+                            } else {
+                                Spacer(Modifier.weight(1f))
+                            }
+                        }
+                    }
+                } else {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        firstAction(Modifier.weight(1f))
+                        if (gameSource == GameSaveBackupManager.GameSource.GOG) {
+                            manageGogAction(Modifier.weight(1f))
+                            downloadGogZipAction(Modifier.weight(1f))
+                        }
+                    }
+                }
+            }
+
+        }
+
+        // "Backup To Google" — manual backup of the local save to Google Play Games (every store). Passes the game's container so the save resolves against the correct wineprefix.
+        val backupToGoogleAction: @Composable (Modifier) -> Unit = { mod ->
+            ActionWithHelper(
+                icon = Icons.Outlined.CloudUpload,
+                label = stringResource(R.string.cloud_saves_google_backup_label),
+                tint = CloudSuccess,
+                modifier = mod,
+                enabled = !isWorking && !googleBackupBusy && gameId.isNotEmpty(),
+                onClick = {
+                    if (googleBackupBusy) return@ActionWithHelper
+                    scope.launch {
+                        googleBackupBusy = true
+                        try {
+                            val result =
+                                withContext(Dispatchers.IO) {
+                                    GameSaveBackupManager.backupSaveToGoogle(
+                                        activity = activity,
+                                        gameSource = gameSource,
+                                        gameId = gameId,
+                                        gameName = gameName,
+                                        origin = GameSaveBackupManager.BackupOrigin.MANUAL,
+                                        authMode = GoogleAuthMode.INTERACTIVE,
+                                        customSaveDir = retroSaveDir,
+                                        containerHint = targetContainer,
+                                    )
+                                }
+                            notify(result.message, Toast.LENGTH_LONG)
+                        } finally {
+                            googleBackupBusy = false
+                            historyRefreshKey++
+                        }
+                    }
+                },
+            )
+        }
+
+        if (steamManagedCloud) {
+            val steamAppIdInt = gameId.toIntOrNull()
+            var steamBusy by remember { mutableStateOf(false) }
+            val importLauncher =
+                rememberLauncherForActivityResult(
+                    contract = ActivityResultContracts.OpenMultipleDocuments(),
+                ) { uris: List<android.net.Uri> ->
+                    if (uris.isEmpty() || steamAppIdInt == null) return@rememberLauncherForActivityResult
+                    val sc = shortcut ?: return@rememberLauncherForActivityResult
+                    scope.launch {
+                        steamBusy = true
+                        try {
+                            val result =
+                                SteamSaveSnapshotManager
+                                    .importSnapshotFromFiles(activity, steamAppIdInt, uris, targetContainer)
+                            notify(
+                                result.message,
+                                Toast.LENGTH_LONG,
+                            )
+                        } finally {
+                            steamBusy = false
+                            historyRefreshKey++
+                        }
+                    }
+                }
+
+            if (steamBusy || googleBackupBusy) {
+                LinearProgressIndicator(
+                    modifier = Modifier.fillMaxWidth(),
+                    color = Accent,
+                    trackColor = CardBorder,
+                )
+            }
+
+            val steamSyncSuccess = stringResource(R.string.cloud_saves_steam_sync_success)
+            val steamSyncFailed = stringResource(R.string.cloud_saves_steam_sync_failed)
+            val steamImportPickerUnavailable = stringResource(R.string.cloud_saves_steam_import_picker_unavailable)
+            val steamPushSuccess = stringResource(R.string.cloud_saves_steam_push_success)
+            val steamPushFailed = stringResource(R.string.cloud_saves_steam_push_failed)
+            BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
+                val syncAction: @Composable (Modifier) -> Unit = { mod ->
+                    ActionWithHelper(
+                        icon = Icons.Outlined.CloudSync,
+                        label = stringResource(R.string.cloud_saves_steam_sync_label),
+                        tint = CloudAccent,
+                        modifier = mod,
+                        enabled = !steamBusy && steamAppIdInt != null,
+                        onClick = {
+                            val appId = steamAppIdInt ?: return@ActionWithHelper
+                            if (steamBusy) return@ActionWithHelper
+                            scope.launch {
+                                steamBusy = true
+                                try {
+                                    val ok =
+                                        withContext(Dispatchers.IO) {
+                                            SteamCloudSyncHelper
+                                                .forceDownloadById(activity, appId, targetContainer)
+                                        }
+                                    notify(
+                                        if (ok) steamSyncSuccess else steamSyncFailed,
+                                        Toast.LENGTH_SHORT,
+                                    )
+                                } finally {
+                                    steamBusy = false
+                                    historyRefreshKey++
+                                }
+                            }
+                        },
+                    )
+                }
+                val importAction: @Composable (Modifier) -> Unit = { mod ->
+                    ActionWithHelper(
+                        icon = Icons.Outlined.UploadFile,
+                        label = stringResource(R.string.cloud_saves_steam_import_label),
+                        tint = CloudSuccess,
+                        modifier = mod,
+                        enabled = !steamBusy && shortcut != null && steamAppIdInt != null,
+                        onClick = {
+                            runCatching {
+                                importLauncher.launch(arrayOf("*/*"))
+                            }.onFailure {
+                                notify(
+                                    steamImportPickerUnavailable,
+                                    Toast.LENGTH_SHORT,
+                                )
+                            }
+                        },
+                    )
+                }
+                val pushAction: @Composable (Modifier) -> Unit = { mod ->
+                    ActionWithHelper(
+                        icon = Icons.Outlined.CloudUpload,
+                        label = stringResource(R.string.cloud_saves_steam_push_label),
+                        tint = CloudAccent,
+                        modifier = mod,
+                        enabled = !steamBusy && shortcut != null && steamAppIdInt != null,
+                        onClick = {
+                            val sc = shortcut ?: return@ActionWithHelper
+                            if (steamBusy) return@ActionWithHelper
+                            scope.launch {
+                                steamBusy = true
+                                try {
+                                    val ok =
+                                        withContext(Dispatchers.IO) {
+                                            SteamCloudSyncHelper
+                                                .uploadLocalSavesBlocking(activity, sc)
+                                        }
+                                    notify(
+                                        if (ok) steamPushSuccess else steamPushFailed,
+                                        Toast.LENGTH_SHORT,
+                                    )
+                                } finally {
+                                    steamBusy = false
+                                    historyRefreshKey++
+                                }
+                            }
+                        },
+                    )
+                }
+                // 2x2 grid: Sync / Push on top, Import / Backup To Google below — equal-width cells so columns line up.
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        syncAction(Modifier.weight(1f))
+                        pushAction(Modifier.weight(1f))
+                    }
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        importAction(Modifier.weight(1f))
+                        backupToGoogleAction(Modifier.weight(1f))
+                    }
+                }
+            }
+        }
+
+        // For non-Steam stores, "Backup To Google" is its own full-width button (Steam puts it in the action grid above).
+        if (!steamManagedCloud) {
+            if (googleBackupBusy) {
+                LinearProgressIndicator(
+                    modifier = Modifier.fillMaxWidth(),
+                    color = Accent,
+                    trackColor = CardBorder,
+                )
+            }
+            backupToGoogleAction(Modifier.fillMaxWidth())
+        }
+
+        SaveHistorySection(
+            loading = historyLoading,
+            entries = historyEntries,
+            steamUnreachable = historySteamUnreachable,
+            onRefresh = {
+                historyRefreshKey++
+            },
+            onRestore = { entry -> entryPendingRestore = entry },
+            onRename = { entry -> entryPendingRename = entry },
+            onDelete = { entry -> entryPendingDelete = entry },
+            onDownload = { entry ->
+                pendingCloudFileDownload = entry
+                runCatching {
+                    cloudFileDownloadLauncher.launch(entry.fileName.substringAfterLast('/'))
+                }.onFailure {
+                    pendingCloudFileDownload = null
+                    notify(context.getString(R.string.cloud_saves_history_download_failed), Toast.LENGTH_SHORT)
+                }
+            },
+        )
+
+        if (showBottomBack) {
+            Spacer(Modifier.height(4.dp))
+            TextButton(onClick = onBack, modifier = Modifier.paneNavItem(cornerRadius = 8.dp, onActivate = onBack)) {
+                Icon(
+                    Icons.AutoMirrored.Outlined.ArrowBack,
+                    contentDescription = null,
+                    tint = TextSecondary,
+                    modifier = Modifier.size(18.dp),
+                )
+                Spacer(Modifier.width(6.dp))
+                Text(stringResource(R.string.common_ui_back), color = TextSecondary)
+            }
+        }
+    }
+
+    entryPendingDelete?.let { entry ->
+        val whenLabel =
+            remember(entry.timestampMs) {
+                android.text.format.DateUtils
+                    .getRelativeTimeSpanString(
+                        entry.timestampMs,
+                        System.currentTimeMillis(),
+                        android.text.format.DateUtils.MINUTE_IN_MILLIS,
+                    ).toString()
+            }
+        LaunchDangerConfirmDialog(
+            visible = true,
+            title = stringResource(R.string.cloud_saves_history_delete_confirm_title),
+            message = stringResource(R.string.cloud_saves_history_delete_confirm_body, whenLabel),
+            confirmLabel = stringResource(R.string.cloud_saves_history_delete),
+            icon = Icons.Outlined.Delete,
+            titleTextAlign = TextAlign.Center,
+            messageTextAlign = TextAlign.Center,
+            accentColor = CloudDanger,
+            onDismissRequest = { entryPendingDelete = null },
+            onConfirm = {
+                val target = entryPendingDelete ?: return@LaunchDangerConfirmDialog
+                entryPendingDelete = null
+                scope.launch {
+                    deleteInProgress = true
+                    val result =
+                        runCatching {
+                            GameSaveBackupManager.deleteGoogleEntry(activity, target)
+                        }.getOrElse {
+                            GameSaveBackupManager.BackupResult(false, it.message ?: "")
+                        }
+                    deleteInProgress = false
+                    notify(
+                        if (result.success) {
+                            context.getString(R.string.cloud_saves_history_delete_success)
+                        } else {
+                            context.getString(R.string.cloud_saves_history_delete_failed)
+                        },
+                        Toast.LENGTH_SHORT,
+                    )
+                    historyRefreshKey++
+                }
+            },
+        )
+    }
+
+    if (deleteInProgress) {
+        Dialog(
+            onDismissRequest = { deleteInProgress = false },
+            properties = DialogProperties(dismissOnClickOutside = false),
+        ) {
+            Surface(
+                shape = RoundedCornerShape(12.dp),
+                color = CloudPanel,
+                border = BorderStroke(1.dp, CloudBorder),
+            ) {
+                Row(
+                    modifier = Modifier.padding(20.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(26.dp),
+                        color = CloudDanger,
+                        strokeWidth = 3.dp,
+                    )
+                    Spacer(Modifier.width(16.dp))
+                    Text(
+                        text = stringResource(R.string.cloud_saves_deleting),
+                        color = Color.White,
+                    )
+                }
+            }
+        }
+    }
+
+    entryPendingRestore?.let { entry ->
+        val whenLabel =
+            remember(entry.timestampMs) {
+                android.text.format.DateUtils
+                    .getRelativeTimeSpanString(
+                        entry.timestampMs,
+                        System.currentTimeMillis(),
+                        android.text.format.DateUtils.MINUTE_IN_MILLIS,
+                    ).toString()
+            }
+        val bodyText =
+            if (entry.storage == GameSaveBackupManager.BackupStorage.STEAM_CLOUD) {
+                stringResource(R.string.cloud_saves_steam_restore_overwrite_body)
+            } else {
+                stringResource(R.string.cloud_saves_history_restore_confirm_body, whenLabel)
+            }
+        LaunchDangerConfirmDialog(
+            visible = true,
+            title = stringResource(R.string.cloud_saves_history_restore_confirm_title),
+            message = bodyText,
+            confirmLabel = stringResource(R.string.cloud_saves_history_restore),
+            icon = Icons.Outlined.Restore,
+            titleTextAlign = TextAlign.Center,
+            messageTextAlign = TextAlign.Center,
+            accentColor = CloudSuccess,
+            onDismissRequest = { entryPendingRestore = null },
+            onConfirm = {
+                val target = entryPendingRestore ?: return@LaunchDangerConfirmDialog
+                entryPendingRestore = null
+                scope.launch {
+                    restoreInProgress = true
+                    val result =
+                        when (target.storage) {
+                            GameSaveBackupManager.BackupStorage.STEAM_CLOUD -> {
+                                val appId = gameId.toIntOrNull()
+                                if (appId != null) {
+                                    SteamCloudHistoryProvider
+                                        .restoreSaveGroup(
+                                            activity,
+                                            appId,
+                                            target.fileId,
+                                            targetContainer,
+                                        )
+                                } else {
+                                    GameSaveBackupManager.BackupResult(false, context.getString(R.string.cloud_saves_invalid_app_id))
+                                }
+                            }
+                            GameSaveBackupManager.BackupStorage.STEAM_LOCAL -> {
+                                val appId = gameId.toIntOrNull()
+                                if (appId != null) {
+                                    SteamSaveSnapshotManager
+                                        .restoreFromEntry(
+                                            activity,
+                                            appId,
+                                            target.fileId,
+                                            targetContainer,
+                                        )
+                                } else {
+                                    GameSaveBackupManager.BackupResult(false, context.getString(R.string.cloud_saves_invalid_app_id))
+                                }
+                            }
+                            GameSaveBackupManager.BackupStorage.EPIC_CLOUD -> {
+                                val appId = gameId.toIntOrNull()
+                                if (appId != null) {
+                                    EpicCloudHistoryProvider
+                                        .restoreSaveGroup(
+                                            context,
+                                            appId,
+                                            target.fileId,
+                                        )
+                                } else {
+                                    GameSaveBackupManager.BackupResult(false, context.getString(R.string.cloud_saves_invalid_app_id))
+                                }
+                            }
+                            GameSaveBackupManager.BackupStorage.GOG_CLOUD -> {
+                                // GOG has no per-file rollback; restoring any entry re-pulls the full cloud state.
+                                GOGCloudHistoryProvider.restoreSaveGroup(context, gameId, targetContainerId)
+                            }
+                            GameSaveBackupManager.BackupStorage.GOOGLE -> {
+                                GameSaveBackupManager.restoreFromGoogle(
+                                    activity,
+                                    target,
+                                    gameSource,
+                                    gameId,
+                                    customSaveDir = retroSaveDir,
+                                    containerHint = targetContainer,
+                                )
+                            }
+                            else -> GameSaveBackupManager.BackupResult(false, context.getString(R.string.cloud_saves_history_restore_failed))
+                        }
+                    restoreInProgress = false
+                    notify(
+                        if (result.success) {
+                            context.getString(R.string.cloud_saves_history_restore_success)
+                        } else {
+                            context.getString(R.string.cloud_saves_history_restore_failed)
+                        },
+                        Toast.LENGTH_SHORT,
+                    )
+                    historyRefreshKey++
+                }
+            },
+        )
+    }
+
+    if (restoreInProgress) {
+        Dialog(
+            onDismissRequest = { restoreInProgress = false },
+            properties = DialogProperties(dismissOnClickOutside = false),
+        ) {
+            Surface(
+                shape = RoundedCornerShape(12.dp),
+                color = CloudPanel,
+                border = BorderStroke(1.dp, CloudBorder),
+            ) {
+                Row(
+                    modifier = Modifier.padding(20.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(26.dp),
+                        color = CloudAccent,
+                        strokeWidth = 3.dp,
+                    )
+                    Spacer(Modifier.width(16.dp))
+                    Text(
+                        text = stringResource(R.string.cloud_saves_restoring),
+                        color = Color.White,
+                    )
+                }
+            }
+        }
+    }
+
+    entryPendingRename?.let { entry ->
+        var labelInput by remember(entry.fileId) { mutableStateOf(entry.label.orEmpty()) }
+        WinNativeDialogShell(
+            onDismiss = { entryPendingRename = null },
+            maxWidth = 336.dp,
+            contentPadding = PaddingValues(start = 18.dp, top = 16.dp, end = 18.dp, bottom = 12.dp),
+        ) {
+            Text(
+                text = stringResource(R.string.cloud_saves_history_rename_title),
+                color = WinNativeTextPrimary,
+                fontSize = 13.sp,
+                lineHeight = 15.sp,
+                fontWeight = FontWeight.Bold,
+            )
+            Spacer(Modifier.height(8.dp))
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(WinNativeOutline),
+            )
+            Spacer(Modifier.height(10.dp))
+            OutlinedTextField(
+                value = labelInput,
+                onValueChange = { v ->
+                    labelInput = v.take(GameSaveBackupManager.MAX_HISTORY_LABEL_LENGTH)
+                },
+                singleLine = true,
+                placeholder = {
+                    Text(
+                        stringResource(R.string.cloud_saves_history_rename_hint),
+                        color = WinNativeTextSecondary,
+                        fontSize = 12.sp,
+                        lineHeight = 14.sp,
+                    )
+                },
+                textStyle =
+                    MaterialTheme.typography.bodySmall.copy(
+                        color = WinNativeTextPrimary,
+                        fontSize = 12.sp,
+                        lineHeight = 14.sp,
+                    ),
+                colors =
+                    OutlinedTextFieldDefaults.colors(
+                        focusedBorderColor = WinNativeAccent,
+                        unfocusedBorderColor = WinNativeOutline,
+                        focusedTextColor = WinNativeTextPrimary,
+                        unfocusedTextColor = WinNativeTextPrimary,
+                        focusedContainerColor = WinNativeBackground,
+                        unfocusedContainerColor = WinNativeBackground,
+                        cursorColor = WinNativeAccent,
+                    ),
+                shape = RoundedCornerShape(8.dp),
+                modifier = Modifier.fillMaxWidth().height(48.dp),
+            )
+            Spacer(Modifier.height(10.dp))
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(WinNativeOutline),
+            )
+            Spacer(Modifier.height(10.dp))
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                if (!entry.label.isNullOrBlank()) {
+                    CompactRenameDialogButton(
+                        label = stringResource(R.string.cloud_saves_history_rename_clear),
+                        textColor = WinNativeTextSecondary,
+                        onClick = {
+                            val target = entryPendingRename ?: return@CompactRenameDialogButton
+                            entryPendingRename = null
+                            scope.launch {
+                                when (target.storage) {
+                                    GameSaveBackupManager.BackupStorage.STEAM_CLOUD -> {
+                                        SteamCloudHistoryProvider
+                                            .setLabel(context, target.fileId, null)
+                                    }
+                                    GameSaveBackupManager.BackupStorage.EPIC_CLOUD -> {
+                                        EpicCloudHistoryProvider
+                                            .setLabel(context, target.fileId, null)
+                                    }
+                                    GameSaveBackupManager.BackupStorage.GOG_CLOUD -> {
+                                        GOGCloudHistoryProvider
+                                            .setLabel(context, target.fileId, null)
+                                    }
+                                    GameSaveBackupManager.BackupStorage.STEAM_LOCAL -> {
+                                        val appId = gameId.toIntOrNull()
+                                        if (appId != null) {
+                                            SteamSaveSnapshotManager
+                                                .renameEntry(activity, appId, target.fileId, null)
+                                        }
+                                    }
+                                    GameSaveBackupManager.BackupStorage.GOOGLE -> {
+                                        GameSaveBackupManager.renameGoogleEntry(activity, target, null)
+                                    }
+                                    else -> Unit
+                                }
+                                historyRefreshKey++
+                            }
+                        },
+                    )
+                }
+                CompactRenameDialogButton(
+                    label = stringResource(R.string.common_ui_cancel),
+                    textColor = WinNativeTextPrimary,
+                    onClick = { entryPendingRename = null },
+                )
+                CompactRenameDialogButton(
+                    label = stringResource(R.string.cloud_saves_history_rename_save),
+                    textColor = WinNativeAccent,
+                    backgroundColor = WinNativeAccent.copy(alpha = 0.12f),
+                    borderColor = WinNativeAccent.copy(alpha = 0.3f),
+                    onClick = {
+                        val target = entryPendingRename ?: return@CompactRenameDialogButton
+                        val newLabel = labelInput
+                        entryPendingRename = null
+                        scope.launch {
+                            val result =
+                                when (target.storage) {
+                                    GameSaveBackupManager.BackupStorage.STEAM_CLOUD -> {
+                                        SteamCloudHistoryProvider
+                                            .setLabel(context, target.fileId, newLabel)
+                                        GameSaveBackupManager.BackupResult(true, context.getString(R.string.cloud_saves_label_saved))
+                                    }
+                                    GameSaveBackupManager.BackupStorage.EPIC_CLOUD -> {
+                                        EpicCloudHistoryProvider
+                                            .setLabel(context, target.fileId, newLabel)
+                                        GameSaveBackupManager.BackupResult(true, context.getString(R.string.cloud_saves_label_saved))
+                                    }
+                                    GameSaveBackupManager.BackupStorage.GOG_CLOUD -> {
+                                        GOGCloudHistoryProvider
+                                            .setLabel(context, target.fileId, newLabel)
+                                        GameSaveBackupManager.BackupResult(true, context.getString(R.string.cloud_saves_label_saved))
+                                    }
+                                    GameSaveBackupManager.BackupStorage.STEAM_LOCAL -> {
+                                        val appId = gameId.toIntOrNull()
+                                        if (appId != null) {
+                                            SteamSaveSnapshotManager
+                                                .renameEntry(activity, appId, target.fileId, newLabel)
+                                        } else {
+                                            GameSaveBackupManager.BackupResult(false, context.getString(R.string.cloud_saves_invalid_app_id))
+                                        }
+                                    }
+                                    GameSaveBackupManager.BackupStorage.GOOGLE -> {
+                                        GameSaveBackupManager.renameGoogleEntry(activity, target, newLabel)
+                                    }
+                                    else -> GameSaveBackupManager.BackupResult(false, context.getString(R.string.cloud_saves_history_rename_failed))
+                                }
+                            notify(
+                                if (result.success) {
+                                    context.getString(R.string.cloud_saves_history_rename_success)
+                                } else {
+                                    context.getString(R.string.cloud_saves_history_rename_failed)
+                                },
+                                Toast.LENGTH_SHORT,
+                            )
+                            historyRefreshKey++
+                        }
+                    },
+                )
+            }
+        }
+    }
+    }
+}
+
+@Composable
+private fun SaveHistorySection(
+    loading: Boolean,
+    entries: List<GameSaveBackupManager.BackupHistoryEntry>,
+    steamUnreachable: Boolean = false,
+    onRefresh: () -> Unit,
+    onRestore: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
+    onRename: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
+    onDelete: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
+    onDownload: (GameSaveBackupManager.BackupHistoryEntry) -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(top = 2.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            stringResource(R.string.cloud_saves_history_title),
+            style = MaterialTheme.typography.labelMedium,
+            color = TextPrimary,
+            fontWeight = FontWeight.Bold,
+            letterSpacing = 1.1.sp,
+            modifier = Modifier.weight(1f),
+        )
+        IconButton(
+            onClick = onRefresh,
+            modifier = Modifier.size(28.dp).paneNavItem(cornerRadius = 6.dp, onActivate = onRefresh),
+        ) {
+            Icon(
+                Icons.Outlined.Refresh,
+                contentDescription = stringResource(R.string.cloud_saves_history_refresh),
+                tint = TextPrimary,
+                modifier = Modifier.size(18.dp),
+            )
+        }
+    }
+
+    Surface(
+        shape = RoundedCornerShape(8.dp),
+        color = CloudPanel,
+        border = BorderStroke(1.dp, CloudBorder),
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Column(modifier = Modifier.padding(vertical = 2.dp)) {
+            when {
+                loading -> {
+                    Text(
+                        stringResource(R.string.cloud_saves_history_loading),
+                        color = TextSecondary,
+                        fontSize = 12.sp,
+                        modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+                    )
+                }
+
+                entries.isEmpty() && steamUnreachable -> {
+                    Text(
+                        stringResource(R.string.cloud_saves_history_steam_unreachable),
+                        color = TextSecondary,
+                        fontSize = 12.sp,
+                        modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+                    )
+                }
+
+                entries.isEmpty() -> {
+                    Text(
+                        stringResource(R.string.cloud_saves_history_empty),
+                        color = TextSecondary,
+                        fontSize = 12.sp,
+                        modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+                    )
+                }
+
+                else -> {
+                    // Scrolls within a bounded panel so long histories aren't cut off on hosts without their own scrolling.
+                    Column(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .heightIn(max = 360.dp)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        entries.forEachIndexed { index, entry ->
+                            SaveHistoryRow(
+                                entry = entry,
+                                onRestore = { onRestore(entry) },
+                                onRename = { onRename(entry) },
+                                onDelete = { onDelete(entry) },
+                                onDownload = { onDownload(entry) },
+                            )
+                            if (index < entries.lastIndex) {
+                                HorizontalDivider(
+                                    color = CloudBorder.copy(alpha = 0.7f),
+                                    modifier = Modifier.padding(horizontal = 10.dp),
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun SaveHistoryRow(
+    entry: GameSaveBackupManager.BackupHistoryEntry,
+    onRestore: () -> Unit,
+    onRename: () -> Unit,
+    onDelete: () -> Unit,
+    onDownload: () -> Unit,
+) {
+    val whenLabel =
+        remember(entry.timestampMs) {
+            android.text.format.DateUtils
+                .getRelativeTimeSpanString(
+                    entry.timestampMs,
+                    System.currentTimeMillis(),
+                    android.text.format.DateUtils.MINUTE_IN_MILLIS,
+                ).toString()
+        }
+    // Badge reflects where the save is backed up (Steam/Google/Epic/GOG), not the conflict side it came from.
+    val storageLabel =
+        when (entry.storage) {
+            GameSaveBackupManager.BackupStorage.STEAM_CLOUD,
+            GameSaveBackupManager.BackupStorage.STEAM_LOCAL,
+            -> stringResource(R.string.cloud_saves_history_storage_steam)
+            GameSaveBackupManager.BackupStorage.GOOGLE -> stringResource(R.string.cloud_saves_history_storage_google)
+            GameSaveBackupManager.BackupStorage.EPIC_CLOUD -> stringResource(R.string.cloud_saves_history_storage_epic)
+            GameSaveBackupManager.BackupStorage.GOG_CLOUD -> stringResource(R.string.cloud_saves_history_storage_gog)
+        }
+    // STEAM_CLOUD entries mirror Steam's remote-storage website: one row per current cloud file, downloadable — no fake version history. Per-entry rollback lives in STEAM_LOCAL snapshots.
+    val canRestore =
+        entry.storage != GameSaveBackupManager.BackupStorage.GOG_CLOUD &&
+            entry.storage != GameSaveBackupManager.BackupStorage.STEAM_CLOUD
+    val canDownload = entry.storage == GameSaveBackupManager.BackupStorage.STEAM_CLOUD
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            Icons.Outlined.History,
+            contentDescription = null,
+            tint = CloudAccent,
+            modifier = Modifier.size(14.dp),
+        )
+        Spacer(Modifier.width(6.dp))
+        Column(
+            modifier = Modifier.weight(1f),
+            verticalArrangement = Arrangement.spacedBy(1.dp),
+        ) {
+            val title = entry.label?.takeIf { it.isNotBlank() } ?: whenLabel
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = title,
+                    color = TextPrimary,
+                    fontSize = 11.sp,
+                    lineHeight = 13.sp,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f, fill = false),
+                )
+                Spacer(Modifier.width(6.dp))
+                Box(
+                    modifier =
+                        Modifier
+                            .clip(RoundedCornerShape(4.dp))
+                            .background(CloudPanelRaised)
+                            .border(1.dp, CloudBorder.copy(alpha = 0.8f), RoundedCornerShape(4.dp))
+                            .padding(horizontal = 5.dp, vertical = 0.dp),
+                ) {
+                    Text(
+                        storageLabel.uppercase(),
+                        color = CloudAccent,
+                        fontSize = 8.sp,
+                        fontWeight = FontWeight.SemiBold,
+                        letterSpacing = 0.5.sp,
+                    )
+                }
+            }
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text =
+                        if (entry.fileName.isBlank()) {
+                            formatBytes(entry.sizeBytes)
+                        } else {
+                            "${formatBytes(entry.sizeBytes)} \u2022 ${entry.fileName}"
+                        },
+                    color = TextSecondary,
+                    fontSize = 9.sp,
+                    lineHeight = 11.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (!entry.label.isNullOrBlank()) {
+                    Spacer(Modifier.width(5.dp))
+                    Text(
+                        text = "\u2022 $whenLabel",
+                        color = TextSecondary,
+                        fontSize = 9.sp,
+                        lineHeight = 11.sp,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+        }
+        Spacer(Modifier.width(4.dp))
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            if (canRestore) {
+                HistoryActionChip(
+                    icon = Icons.Outlined.Restore,
+                    label = stringResource(R.string.cloud_saves_history_restore),
+                    tint = CloudSuccess,
+                    onClick = onRestore,
+                )
+                Spacer(Modifier.width(6.dp))
+            } else if (canDownload) {
+                HistoryActionChip(
+                    icon = Icons.Outlined.Download,
+                    label = stringResource(R.string.cloud_saves_history_download),
+                    tint = CloudAccent,
+                    onClick = onDownload,
+                )
+                Spacer(Modifier.width(6.dp))
+            }
+            HistoryIconButton(
+                icon = Icons.Outlined.Edit,
+                contentDescription = stringResource(R.string.cloud_saves_history_rename),
+                tint = TextPrimary,
+                onClick = onRename,
+            )
+            if (entry.storage == GameSaveBackupManager.BackupStorage.GOOGLE) {
+                HistoryIconButton(
+                    icon = Icons.Outlined.Delete,
+                    contentDescription = stringResource(R.string.cloud_saves_history_delete),
+                    tint = CloudDanger,
+                    onClick = onDelete,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun HistoryActionChip(
+    icon: ImageVector,
+    label: String,
+    tint: Color,
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .height(28.dp)
+                .paneNavItem(cornerRadius = 6.dp, onActivate = onClick)
+                .clip(RoundedCornerShape(6.dp))
+                .background(tint.copy(alpha = 0.14f))
+                .border(1.dp, tint.copy(alpha = 0.4f), RoundedCornerShape(6.dp))
+                .clickable(onClick = onClick)
+                .padding(horizontal = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+    ) {
+        Icon(
+            icon,
+            contentDescription = null,
+            tint = tint,
+            modifier = Modifier.size(14.dp),
+        )
+        Text(
+            label,
+            color = tint,
+            fontSize = 10.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun HistoryIconButton(
+    icon: ImageVector,
+    contentDescription: String,
+    tint: Color,
+    onClick: () -> Unit,
+) {
+    Box(
+        modifier =
+            Modifier
+                .size(28.dp)
+                .paneNavItem(cornerRadius = 6.dp, onActivate = onClick)
+                .clip(RoundedCornerShape(6.dp))
+                .border(1.dp, CloudBorder, RoundedCornerShape(6.dp))
+                .clickable(onClick = onClick),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            icon,
+            contentDescription = contentDescription,
+            tint = tint,
+            modifier = Modifier.size(14.dp),
+        )
+    }
+}
+
+private fun formatBytes(bytes: Long): String =
+    when {
+        bytes <= 0 -> "0 B"
+        bytes < 1024 -> "$bytes B"
+        bytes < 1024 * 1024 -> "%.1f KB".format(bytes / 1024.0)
+        bytes < 1024L * 1024 * 1024 -> "%.1f MB".format(bytes / (1024.0 * 1024.0))
+        else -> "%.2f GB".format(bytes / (1024.0 * 1024.0 * 1024.0))
+    }
+
+private fun safeZipFileName(name: String): String =
+    name
+        .replace(Regex("[^A-Za-z0-9._-]+"), "_")
+        .trim('_')
+        .ifEmpty { "GOG_Cloud_Saves" }
+
+@Composable
+private fun CompactRenameDialogButton(
+    label: String,
+    textColor: Color,
+    onClick: () -> Unit,
+    backgroundColor: Color = CloudPanelRaised,
+    borderColor: Color = CloudBorder,
+) {
+    Box(
+        modifier =
+            Modifier
+                .height(32.dp)
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick)
+                .clip(RoundedCornerShape(8.dp))
+                .background(backgroundColor)
+                .border(1.dp, borderColor, RoundedCornerShape(8.dp))
+                .clickable(
+                    interactionSource = MutableInteractionSource(),
+                    indication = null,
+                    onClick = onClick,
+                ).padding(horizontal = 12.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = textColor,
+            fontSize = 11.sp,
+            lineHeight = 13.sp,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun TogglePairCard(
+    cloudSyncEnabled: Boolean,
+    offlineModeEnabled: Boolean,
+    modifier: Modifier = Modifier.fillMaxWidth(),
+    showCloudSync: Boolean = true,
+    showOfflineMode: Boolean = true,
+    cloudSyncDisableSemantics: Boolean = false,
+    onCloudSyncToggle: (Boolean) -> Unit,
+    onOfflineModeToggle: (Boolean) -> Unit,
+) {
+    BoxWithConstraints(modifier = modifier) {
+        val stacked = maxWidth < 380.dp
+        val offlineGates = showOfflineMode && offlineModeEnabled
+        val cloudSyncCell: @Composable (Modifier) -> Unit = { mod ->
+            TogglePaneCell(
+                modifier = mod,
+                title = stringResource(
+                    if (cloudSyncDisableSemantics) {
+                        R.string.cloud_sync_disable_title
+                    } else {
+                        R.string.cloud_sync_title
+                    },
+                ),
+                summary =
+                    if (cloudSyncEnabled) {
+                        stringResource(R.string.cloud_sync_enabled_summary)
+                    } else {
+                        stringResource(R.string.cloud_sync_disabled_summary)
+                    },
+                checked =
+                    if (cloudSyncDisableSemantics) {
+                        !cloudSyncEnabled
+                    } else {
+                        cloudSyncEnabled && !offlineGates
+                    },
+                enabled = !offlineGates,
+                onCheckedChange = { value ->
+                    onCloudSyncToggle(if (cloudSyncDisableSemantics) !value else value)
+                },
+            )
+        }
+        val offlineCell: @Composable (Modifier) -> Unit = { mod ->
+            TogglePaneCell(
+                modifier = mod,
+                title = stringResource(R.string.cloud_saves_offline_mode),
+                summary = stringResource(R.string.cloud_saves_offline_mode_summary),
+                checked = offlineModeEnabled,
+                enabled = true,
+                compact = true,
+                onCheckedChange = onOfflineModeToggle,
+            )
+        }
+        if (!showCloudSync) {
+            offlineCell(Modifier.fillMaxWidth())
+            return@BoxWithConstraints
+        }
+        if (!showOfflineMode) {
+            cloudSyncCell(Modifier.fillMaxWidth())
+            return@BoxWithConstraints
+        }
+        if (stacked) {
+            Column(
+                modifier = Modifier.fillMaxWidth(),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                cloudSyncCell(Modifier.fillMaxWidth())
+                offlineCell(Modifier.fillMaxWidth())
+            }
+        } else {
+            Row(
+                modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                cloudSyncCell(Modifier.weight(1f).fillMaxHeight())
+                offlineCell(Modifier.weight(1f).fillMaxHeight())
+            }
+        }
+    }
+}
+
+@Composable
+private fun TogglePaneCell(
+    modifier: Modifier = Modifier,
+    title: String,
+    summary: String,
+    checked: Boolean,
+    enabled: Boolean,
+    compact: Boolean = false,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    val switchScale = if (compact) 0.72f else 0.8f
+    Column(
+        modifier =
+            modifier
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (enabled) onCheckedChange(!checked) },
+                    onAdjust = { d -> if (enabled) onCheckedChange(d > 0) },
+                )
+                .clip(RoundedCornerShape(8.dp))
+                .background(CloudPanel)
+                .border(1.dp, CloudBorder, RoundedCornerShape(8.dp))
+                .padding(
+                    start = 10.dp,
+                    end = 6.dp,
+                    top = if (compact) 0.dp else 2.dp,
+                    bottom = if (compact) 5.dp else 8.dp,
+                ),
+        verticalArrangement = Arrangement.spacedBy(0.dp),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                title,
+                color = if (enabled) TextPrimary else TextSecondary,
+                fontSize = 13.sp,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.weight(1f),
+            )
+            Switch(
+                checked = checked,
+                onCheckedChange = if (enabled) onCheckedChange else { _ -> },
+                enabled = enabled,
+                modifier = Modifier.graphicsLayer { scaleX = switchScale; scaleY = switchScale },
+                colors =
+                    outlinedSwitchColors(
+                        accentColor = Accent,
+                        textSecondaryColor = TextSecondary,
+                        checkedThumbColor = TextPrimary,
+                    ),
+            )
+        }
+        Text(
+            summary,
+            color = TextSecondary,
+            fontSize = if (compact) 9.sp else 10.sp,
+            lineHeight = if (compact) 11.sp else 12.sp,
+            maxLines = if (compact) 1 else 2,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+private fun ActionWithHelper(
+    icon: ImageVector,
+    label: String,
+    helper: String? = null,
+    tint: Color = CloudAccent,
+    modifier: Modifier = Modifier.fillMaxWidth(),
+    enabled: Boolean = true,
+    isEntry: Boolean = false,
+    onClick: () -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.97f else 1f,
+        animationSpec = spring(dampingRatio = 0.7f, stiffness = 700f),
+        label = "cloudActionScale",
+    )
+    Surface(
+        modifier =
+            modifier
+                .height(56.dp)
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { if (enabled) onClick() },
+                    isEntry = isEntry,
+                )
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }.clip(RoundedCornerShape(8.dp))
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    enabled = enabled,
+                    onClick = onClick,
+                ),
+        color = if (enabled) CloudPanelRaised else CloudPanel,
+        shape = RoundedCornerShape(8.dp),
+        border = BorderStroke(1.dp, CloudBorder),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Box(
+                modifier =
+                    Modifier
+                        .size(28.dp)
+                        .clip(RoundedCornerShape(6.dp))
+                        .background(tint.copy(alpha = if (enabled) 0.14f else 0.06f)),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    modifier = Modifier.size(16.dp),
+                    tint = tint.copy(alpha = if (enabled) 1f else 0.48f),
+                )
+            }
+            Spacer(Modifier.width(8.dp))
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
+                Text(
+                    label,
+                    color = if (enabled) TextPrimary else TextSecondary.copy(alpha = 0.64f),
+                    fontSize = 11.sp,
+                    lineHeight = 13.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (!helper.isNullOrBlank()) {
+                    Text(
+                        helper,
+                        color = TextSecondary.copy(alpha = if (enabled) 1f else 0.58f),
+                        fontSize = 9.sp,
+                        lineHeight = 10.sp,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/jniLibs/arm64-v8a/libltdl.so b/app/src/main/jniLibs/arm64-v8a/libltdl.so
index 48b910a2a..5cd08c89d 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libltdl.so and b/app/src/main/jniLibs/arm64-v8a/libltdl.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libpulse.so b/app/src/main/jniLibs/arm64-v8a/libpulse.so
index bc8b723e0..3443f4d4c 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libpulse.so and b/app/src/main/jniLibs/arm64-v8a/libpulse.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libpulseaudio.so b/app/src/main/jniLibs/arm64-v8a/libpulseaudio.so
index 59a044255..bccfd71c8 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libpulseaudio.so and b/app/src/main/jniLibs/arm64-v8a/libpulseaudio.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libpulsecommon-13.0.so b/app/src/main/jniLibs/arm64-v8a/libpulsecommon-13.0.so
index ce2e949f5..f09b73d0f 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libpulsecommon-13.0.so and b/app/src/main/jniLibs/arm64-v8a/libpulsecommon-13.0.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libpulsecore-13.0.so b/app/src/main/jniLibs/arm64-v8a/libpulsecore-13.0.so
index 031ff579f..9f932277b 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libpulsecore-13.0.so and b/app/src/main/jniLibs/arm64-v8a/libpulsecore-13.0.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libsndfile.so b/app/src/main/jniLibs/arm64-v8a/libsndfile.so
index dcf49b7fa..f7ab9d12b 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libsndfile.so and b/app/src/main/jniLibs/arm64-v8a/libsndfile.so differ
diff --git a/app/src/main/res/drawable-anydpi/ic_notification.xml b/app/src/main/res/drawable-anydpi/ic_notification.xml
index a95477ae1..dc1d6dbd6 100644
--- a/app/src/main/res/drawable-anydpi/ic_notification.xml
+++ b/app/src/main/res/drawable-anydpi/ic_notification.xml
@@ -1,15 +1,18 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="45.479"
-    android:viewportHeight="67.733"
+    android:viewportWidth="557.32"
+    android:viewportHeight="557.32"
     android:tint="#FFFFFF">
-  <group android:scaleX="0.6177225"
-      android:scaleY="0.92"
-      android:translateX="8.6928"
-      android:translateY="2.70932">
+  <group android:scaleX="0.84"
+      android:scaleY="0.84"
+      android:translateX="44.585"
+      android:translateY="83.21">
     <path
-        android:pathData="m22.727,-0c-0.293,0 -0.567,0.275 -1.878,1.886 -12.583,15.461 -19.562,28.909 -20.755,39.992 -0.149,1.387 -0.112,5.851 0.051,6.226 0.115,0.263 1.908,1.371 3.168,1.958 1.219,0.567 2.471,0.964 3.524,1.116 2.962,0.427 5.93,-0.501 9.551,-2.987 0.696,-0.478 2.505,-1.872 4.019,-3.099 3.155,-2.555 5.112,-4.034 6.305,-4.763 6.044,-3.693 10.566,-3.012 17.622,2.656l1.144,0.919l0,-0.533c0,-0.751 -0.325,-3.265 -0.611,-4.73 -2.013,-10.297 -8.906,-22.8 -20.263,-36.755 -1.31,-1.61 -1.585,-1.886 -1.878,-1.886zM22.727,3.091c0.247,0 4.841,5.957 7.248,9.397 6.37,9.105 10.611,17.569 12.358,24.662 0.234,0.949 0.425,1.79 0.425,1.871 0,0.08 -0.626,-0.273 -1.391,-0.786 -5.429,-3.639 -9.791,-3.682 -15.178,-0.148 -1.361,0.893 -2.425,1.706 -5.502,4.208 -4.93,4.007 -6.993,5.273 -9.892,6.068 -0.855,0.235 -3.091,0.395 -3.833,0.275 -1.831,-0.296 -4.677,-1.446 -4.81,-1.943 -0.039,-0.146 -0.072,-0.962 -0.073,-1.814 -0.009,-8.685 4.587,-19.796 13.4,-32.393 2.407,-3.44 7.002,-9.397 7.248,-9.397zM33.9,40.958c-1.776,-0.035 -3.546,0.411 -5.423,1.325 -1.842,0.897 -3.449,2.028 -7.484,5.266 -2.004,1.609 -4.257,3.334 -5.005,3.833 -3.768,2.515 -7.006,3.297 -10.25,2.474 -1.187,-0.301 -3.031,-1.096 -4.174,-1.799 -0.329,-0.203 -0.599,-0.344 -0.599,-0.315 0,0.029 0.146,0.46 0.324,0.957 1.216,3.39 3.696,7.007 6.432,9.381 3.587,3.112 8.163,5.101 12.752,5.544 4.357,0.42 8.51,-0.359 12.456,-2.337 6.321,-3.169 10.925,-9.234 12.163,-16.024 0.423,-2.318 0.424,-2.354 0.109,-2.65 -0.526,-0.495 -3.123,-2.434 -4.174,-3.117 -2.549,-1.655 -4.843,-2.493 -7.127,-2.537z"
-        android:fillColor="#ffffff"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M555.07,130.93l-93.02,187.8c-10.62,21.43-36.85,21.42-47.44-.04l-106.02-214.67c-10.44-21.13-36.17-21.54-47.08-.75l-55.17,88.82c-5.65,10.77-18.88,10.9-24.69.25s-12.75-21.96-16.74-30.2c-3.58-7.4-3.18-13.31.05-19.15C173.63,127.35,247.45,7.63,247.45,7.63,250.17,2.84,254.74-.02,259.63,0l44.31.2c9.65.04,18.56,6.06,23.5,15.85l92.24,182.93c8.41,16.68,28.85,16.68,37.27,0l40.93-81.11c4.96-9.82,13.92-15.84,23.6-15.84h19.56c12.55,0,20.37,16.09,14.03,28.89Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M54.85,97.36l110.54,221.73c8.57,17.19,29.56,17.36,38.33.31l55.32-107.59c7.7-14.98,26.18-14.7,33.56.5l91.13,194.97c7.45,15.35-1.93,34.47-16.91,34.47h-19.41c-7.26,0-13.92-4.77-17.28-12.37l-40.02-89.87c-7.07-15.99-25.35-14.56-33.14.95l-57.02,113.61c-7.59,15.12-26.15,15.02-33.62-.19L2.66,120.59c-7.54-15.35,1.84-34.57,16.86-34.57h18.54c6.9,0,13.29,4.31,16.79,11.34Z"/>
   </group>
 </vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_winnative_badge.png b/app/src/main/res/drawable-hdpi/ic_winnative_badge.png
new file mode 100644
index 000000000..c001d1a63
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_winnative_badge.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_winnative_badge.png b/app/src/main/res/drawable-mdpi/ic_winnative_badge.png
new file mode 100644
index 000000000..c5f8f73da
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_winnative_badge.png differ
diff --git a/app/src/main/res/drawable-nodpi/wallpaper_default.png b/app/src/main/res/drawable-nodpi/wallpaper_default.png
new file mode 100644
index 000000000..270b989ee
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/wallpaper_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_winnative_badge.png b/app/src/main/res/drawable-xhdpi/ic_winnative_badge.png
new file mode 100644
index 000000000..fa3ba2139
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_winnative_badge.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_winnative_badge.png b/app/src/main/res/drawable-xxhdpi/ic_winnative_badge.png
new file mode 100644
index 000000000..8f8b74fb4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_winnative_badge.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_winnative_badge.png b/app/src/main/res/drawable-xxxhdpi/ic_winnative_badge.png
new file mode 100644
index 000000000..54f7f4721
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_winnative_badge.png differ
diff --git a/app/src/main/res/drawable/ic_hud_plug.xml b/app/src/main/res/drawable/ic_hud_plug.xml
new file mode 100644
index 000000000..0c9874b2d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hud_plug.xml
@@ -0,0 +1,30 @@
+<!--
+  Material 3 style outlined plug, drawn in the HUD next to the live charging
+  wattage (replaces the old green "CHRG" text). White strokes so it can be
+  tinted at runtime via Drawable.setTint().
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <!-- The two prongs -->
+    <path
+        android:strokeColor="#FFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:pathData="M9,2.5L9,6.5 M15,2.5L15,6.5" />
+    <!-- Plug body, narrowing toward the cord -->
+    <path
+        android:strokeColor="#FFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M6.5,6.5L17.5,6.5L17.5,12L14.5,15.5L9.5,15.5L6.5,12Z" />
+    <!-- The cord -->
+    <path
+        android:strokeColor="#FFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:pathData="M12,15.5L12,21.5" />
+</vector>
diff --git a/app/src/main/res/drawable/icon_style.xml b/app/src/main/res/drawable/icon_style.xml
new file mode 100644
index 000000000..f023d2ed3
--- /dev/null
+++ b/app/src/main/res/drawable/icon_style.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='utf-8'?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:pathData="M11.99 18.54l-7.37-5.73L3 14.07l9 7l9-7l-1.63-1.27l-7.38 5.74zM12 16l7.36-5.73L21 9l-9-7l-9 7l1.63 1.27L12 16z" android:fillColor="#FFFFFFFF" /></vector>
diff --git a/app/src/main/res/drawable/pickerthemecontrol.xml b/app/src/main/res/drawable/pickerthemecontrol.xml
new file mode 100644
index 000000000..0d8a7ebe8
--- /dev/null
+++ b/app/src/main/res/drawable/pickerthemecontrol.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="199"
+    android:viewportHeight="200">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m142.65,4c4.29,0 5.8,0.46 7.6,2.33 2.12,2.19 3.12,2.35 17.75,2.75 13.36,0.37 15.98,0.71 19,2.48 1.93,1.13 4.53,3.6 5.78,5.5 1.62,2.45 2.27,4.87 2.24,8.44 -0.02,3.2 -0.75,6.17 -2.02,8.25 -1.12,1.81 -3.88,4.12 -6.25,5.23 -3.62,1.68 -6.43,1.98 -19,2 -14.52,0.02 -14.78,0.06 -16.75,2.52 -1.75,2.18 -2.8,2.5 -8.25,2.52 -4.88,0.02 -6.74,-0.42 -8.5,-2 -1.52,-1.36 -2.25,-3.16 -2.25,-9.02h-31.5c-26,0 -32.02,-0.26 -34.5,-1.5 -1.65,-0.83 -3,-1.95 -3,-2.5 0,-0.55 -2.36,-0.99 -5.25,-0.98 -2.93,0.01 -5.81,-0.55 -6.52,-1.25 -0.69,-0.7 -1.26,-2.51 -1.25,-4.02 0.01,-1.74 0.76,-3.12 2.02,-3.75 1.1,-0.55 3.8,-1 6,-1 2.8,0 4.9,-0.75 10,-5h64l-0.1,-3.43c-0.07,-2.63 0.55,-3.91 2.66,-5.5 1.98,-1.49 4.23,-2.07 8.09,-2.07zM138,40h9l-0.5,-29.5 -8.38,-0.61zM153,35c23.28,0 27.97,-0.42 30.5,-1.5 1.93,-0.83 3.95,-2.4 4.5,-3.5 0.55,-1.1 1,-3.58 1,-5.5 0,-2.54 -0.76,-4.2 -2.75,-6.04 -2.7,-2.48 -3.05,-2.53 -18,-2.5l-15.25,0.04zM66.91,25.32c0.03,0.64 0.63,1.75 1.32,2.44 0.97,0.97 8.62,1.26 32.52,1.25l31.25,-0.01v-8c-57.68,0 -62.08,0.21 -63.5,1.57 -0.9,0.86 -1.62,2.1 -1.59,2.75zM18,76h80v14h-33v95h-14v-95h-33zM51.84,36.18c0.93,0.18 3.57,4.06 6,8.82 3.65,7.16 4.24,9.12 3.77,12.5 -0.32,2.21 -1.58,5.01 -2.84,6.27 -1.24,1.25 -3.62,2.54 -5.27,2.86 -1.65,0.31 -3.9,0.32 -5,0.02 -1.1,-0.31 -3.25,-1.82 -4.78,-3.36 -2.08,-2.09 -2.78,-3.75 -2.75,-6.54 0.02,-2.07 0.86,-5.67 1.88,-8 1.01,-2.34 3.08,-6.2 4.59,-8.57 1.74,-2.74 3.35,-4.2 4.4,-4zM49.25,49.4c-1.23,2.53 -2.25,5.61 -2.26,6.85 -0.01,1.23 0.55,2.82 1.25,3.51 0.69,0.7 2.19,1.26 3.31,1.25 1.13,-0.01 2.25,-0.56 2.25,-1.25 0,-0.69 -1.02,-3.8 -2.25,-6.85-1.22,-3.04 -2.25,-6 -2.25,-6.55 0,-0.55 -0.52,1.35 -1.15,4.35"
+        android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/control_element_settings.xml b/app/src/main/res/layout/control_element_settings.xml
index aa0ad7336..5208ded73 100644
--- a/app/src/main/res/layout/control_element_settings.xml
+++ b/app/src/main/res/layout/control_element_settings.xml
@@ -226,13 +226,29 @@
                 android:spinnerMode="dropdown" />
         </LinearLayout>
 
-        <CheckBox
-            android:id="@+id/CBToggleSwitch"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
-            android:textColor="@color/settings_text_primary"
-            android:text="@string/input_controls_editor_toggle_switch" />
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/CBToggleSwitch"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp"
+                android:textColor="@color/settings_text_primary"
+                android:text="@string/input_controls_editor_toggle_switch" />
+
+            <CheckBox
+                android:id="@+id/CBSwipeable"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp"
+                android:textColor="@color/settings_text_primary"
+                android:text="@string/input_controls_editor_swipeable" />
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/LLCustomTextIcon"
diff --git a/app/src/main/res/layout/controls_editor_activity.xml b/app/src/main/res/layout/controls_editor_activity.xml
index 88b387e6d..8bf55e637 100644
--- a/app/src/main/res/layout/controls_editor_activity.xml
+++ b/app/src/main/res/layout/controls_editor_activity.xml
@@ -65,5 +65,15 @@
             android:id="@+id/BTColorPicker"
             style="@style/ToolButton.Dark"
             android:src="@drawable/pickercolorcontrol"  />
+
+        <ImageButton
+            android:id="@+id/BTAccentTheme"
+            style="@style/ToolButton.Dark"
+            android:src="@drawable/pickerthemecontrol"  />
+
+        <ImageButton
+            android:id="@+id/BTVisualStyle"
+            style="@style/ToolButton.Dark"
+            android:src="@drawable/icon_style"  />
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/frame_rating.xml b/app/src/main/res/layout/frame_rating.xml
index c33570ec1..ecc0655e0 100644
--- a/app/src/main/res/layout/frame_rating.xml
+++ b/app/src/main/res/layout/frame_rating.xml
@@ -63,6 +63,29 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text=" | "/>
+    <TextView
+        android:textSize="10sp"
+        android:textStyle="bold"
+        android:textColor="#9e9e9e"
+        android:id="@+id/TVCpuTemp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text="C.TMP"
+        android:shadowColor="#ff000000"
+        android:shadowDx="1"
+        android:shadowDy="1"
+        android:shadowRadius="1"
+        android:fontFamily="monospace"/>
+    <TextView
+        android:textSize="10sp"
+        android:textStyle="bold"
+        android:textColor="#616161"
+        android:id="@+id/Sep6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text=" | "/>
     <TextView
         android:textSize="10sp"
         android:textStyle="bold"
@@ -112,7 +135,7 @@
         android:id="@+id/TVTemp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TMP"
+        android:text="B.TMP"
         android:shadowColor="#ff000000"
         android:shadowDx="1"
         android:shadowDy="1"
@@ -139,6 +162,20 @@
         android:shadowDy="1"
         android:shadowRadius="1"
         android:fontFamily="monospace"/>
+    <TextView
+        android:textSize="10sp"
+        android:textStyle="bold"
+        android:textColor="#76ff03"
+        android:id="@+id/TVFrametime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text="0.0ms"
+        android:shadowColor="#ff000000"
+        android:shadowDx="1"
+        android:shadowDy="1"
+        android:shadowRadius="1"
+        android:fontFamily="monospace"/>
     <FrameLayout
         android:id="@+id/FLGraphContainer"
         android:background="@android:color/transparent"
diff --git a/app/src/main/res/values-b+es+419/arrays.xml b/app/src/main/res/values-b+es+419/arrays.xml
new file mode 100644
index 000000000..ef5e05c73
--- /dev/null
+++ b/app/src/main/res/values-b+es+419/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Imagen</item>
+        <item>Original</item>
+        <item>Color sólido</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-b+es+419/plurals.xml b/app/src/main/res/values-b+es+419/plurals.xml
new file mode 100644
index 000000000..bde911b98
--- /dev/null
+++ b/app/src/main/res/values-b+es+419/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d recurso ZIP</item>
+        <item quantity="other">%d recursos ZIP</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml
new file mode 100644
index 000000000..2cf95cefe
--- /dev/null
+++ b/app/src/main/res/values-b+es+419/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Ejecutar</string>
+    <string name="common_ui_edit">Editar</string>
+    <string name="common_ui_remove">Quitar</string>
+    <string name="common_ui_add">Agregar</string>
+    <string name="common_ui_shortcuts">Accesos directos</string>
+    <string name="common_ui_containers">Contenedores</string>
+    <string name="common_ui_input_controls">Controles de entrada</string>
+    <string name="common_ui_no_items_to_display">No hay elementos para mostrar</string>
+    <string name="common_ui_select_icon">Seleccionar icono</string>
+    <string name="common_ui_revert_icon">Revertir icono</string>
+    <string name="common_ui_select_exe">Seleccionar EXE</string>
+    <string name="common_ui_select_folder">Seleccionar carpeta</string>
+    <string name="common_ui_current_folder">Carpeta actual</string>
+    <string name="common_ui_enter_path">Ingresar ruta</string>
+    <string name="common_ui_path_not_found">Ruta no encontrada</string>
+    <string name="common_ui_select_valid_exe_file">Selecciona un archivo .exe válido</string>
+    <string name="common_ui_select_valid_icon_file">Selecciona un archivo .ico o .png válido.</string>
+    <string name="common_ui_exit">Salir</string>
+    <string name="common_ui_exit_app">Salir de la aplicación</string>
+    <string name="common_ui_profile">Perfil</string>
+    <string name="common_ui_name">Nombre</string>
+    <string name="common_ui_ok">Aceptar</string>
+    <string name="common_ui_cancel">Cancelar</string>
+    <string name="common_ui_untitled">Sin título</string>
+    <string name="common_ui_disabled">Deshabilitado</string>
+    <string name="common_ui_container">Contenedor</string>
+    <string name="common_ui_value">Valor</string>
+    <string name="common_ui_none">Ninguno</string>
+    <string name="common_ui_custom_text">Texto personalizado</string>
+    <string name="common_ui_icon">Icono</string>
+    <string name="common_ui_duplicate">Duplicar</string>
+    <string name="common_ui_credits_and_third_party_apps">Créditos y aplicaciones de terceros</string>
+    <string name="common_ui_loading">Cargando</string>
+    <string name="common_ui_exporting">Exportando</string>
+    <string name="common_ui_enable">Habilitar</string>
+    <string name="common_ui_disable">Deshabilitar</string>
+    <string name="common_ui_force">Forzar</string>
+    <string name="common_ui_version">Versión</string>
+    <string name="common_ui_advanced">Avanzado</string>
+    <string name="common_ui_graphics">Gráficos</string>
+    <string name="common_ui_system">Sistema</string>
+    <string name="common_ui_width">Ancho</string>
+    <string name="common_ui_height">Alto</string>
+    <string name="common_ui_open_file">Abrir archivo</string>
+    <string name="common_ui_download_file">Descargar archivo</string>
+    <string name="common_ui_downloading_file">Descargando archivo</string>
+    <string name="common_ui_browse">Explorar</string>
+    <string name="common_ui_options">Opciones</string>
+    <string name="common_ui_export">Exportar</string>
+    <string name="common_ui_new_file">Archivo nuevo</string>
+    <string name="common_ui_description">Descripción</string>
+    <string name="common_ui_continue">Continuar</string>
+    <string name="common_ui_warning">Advertencia</string>
+    <string name="common_ui_copy">copia</string>
+    <string name="common_ui_reset">Restablecer</string>
+    <string name="common_ui_close">Cerrar</string>
+    <string name="common_ui_confirm">Confirmar</string>
+    <string name="common_ui_unnamed">Sin nombre</string>
+    <string name="common_ui_download">Descargar</string>
+    <string name="common_ui_uninstall">Desinstalar</string>
+    <string name="common_ui_other">Otro</string>
+    <string name="common_ui_status">Estado</string>
+    <string name="common_ui_size">Tamaño</string>
+    <string name="common_ui_release_date">Fecha de lanzamiento</string>
+    <string name="common_ui_installed">Instalado</string>
+    <string name="common_ui_available">Disponible</string>
+    <string name="common_ui_settings">Configuración</string>
+    <string name="common_ui_enable_all">Habilitar todo</string>
+    <string name="common_ui_disable_all">Deshabilitar todo</string>
+    <string name="common_ui_select_all">Seleccionar todo</string>
+    <string name="common_ui_deselect_all">Deseleccionar todo</string>
+    <string name="common_ui_on">Activado</string>
+    <string name="common_ui_off">Desactivado</string>
+    <string name="common_ui_already_set">Ya configurado</string>
+    <string name="common_ui_shortcut">Acceso directo</string>
+    <string name="common_ui_custom">Personalizado</string>
+    <string name="common_ui_about">Acerca de</string>
+    <string name="common_ui_back">Atrás</string>
+    <string name="common_ui_apply">Aplicar</string>
+    <string name="common_ui_save">Guardar</string>
+    <string name="common_ui_clone">Clonar</string>
+    <string name="common_ui_properties">Propiedades</string>
+    <string name="common_ui_store">Tienda</string>
+    <string name="common_ui_library">Biblioteca</string>
+    <string name="common_ui_downloads">Descargas</string>
+    <string name="common_ui_import">Importar</string>
+    <string name="common_ui_sync">Sincronizar</string>
+    <string name="common_ui_sign_in">Iniciar sesión</string>
+    <string name="common_ui_submit">Enviar</string>
+    <string name="common_ui_coming_soon">Próximamente</string>
+    <string name="common_ui_signed_in">Sesión iniciada</string>
+    <string name="common_ui_required">Obligatorio</string>
+    <string name="common_ui_optional">Opcional</string>
+    <string name="common_ui_notifications">Notificaciones</string>
+    <string name="common_ui_mode">Modo</string>
+    <string name="common_ui_experimental">(Experimental)</string>
+    <string name="common_ui_current_version_label">Versión actual:</string>
+    <string name="common_ui_cannot_write_folder">No se puede escribir en la carpeta seleccionada</string>
+    <string name="common_ui_failed_create_directory">No se pudo crear el directorio predeterminado</string>
+    <string name="common_ui_device_not_supported">Lo sentimos, es posible que tu dispositivo no sea compatible</string>
+    <string name="common_ui_please_wait">Espera…</string>
+    <string name="common_ui_done">Listo</string>
+    <string name="common_ui_open">Abrir</string>
+    <string name="common_ui_connected">Conectado</string>
+    <string name="common_ui_install">Instalar</string>
+    <string name="common_ui_application">Aplicación</string>
+    <string name="common_ui_check">Comprobar</string>
+    <string name="store_game_check_for_update">Buscar actualización</string>
+    <string name="store_game_checking_for_update">Comprobando</string>
+    <string name="store_game_download_update">Descargar actualización</string>
+    <string name="store_game_no_update_available">No hay actualizaciones disponibles</string>
+    <string name="store_game_update_available">Actualización disponible</string>
+    <string name="store_game_update_check_failed">Error al buscar actualizaciones</string>
+    <string name="store_game_update">Actualizar</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verificar archivos</string>
+    <string name="store_game_verify_started">Verificando %1$s — revisa la pestaña Descargas</string>
+    <string name="store_game_steam_options">Opciones de Steam</string>
+    <string name="store_game_verify_complete">Verificación de archivos completada</string>
+    <string name="store_game_verify_failed_notice">Error al verificar archivos</string>
+    <string name="store_game_progress_background_hint">Puedes cerrar esto, seguirá ejecutándose. Revisa la pestaña Descargas en cualquier momento.</string>
+    <string name="store_game_checking_updates">Buscando actualizaciones</string>
+    <string name="store_game_no_updates_notice">No hay actualizaciones disponibles</string>
+    <string name="store_game_update_complete">Actualización completada</string>
+    <string name="store_game_update_failed_notice">Error en la actualización</string>
+    <string name="store_game_update_check_failed_notice">Error al buscar actualizaciones</string>
+    <string name="store_game_download_already_active">Este juego ya se está descargando. Cancela la descarga actual antes de agregar DLC.</string>
+    <string name="common_ui_select">Seleccionar</string>
+    <string name="common_ui_storage_roots">Raíces de almacenamiento</string>
+    <string name="common_ui_browse_local_folders_directly">Explorar carpetas locales directamente</string>
+    <string name="common_ui_no_folders_available_here">No hay carpetas disponibles aquí</string>
+    <string name="common_ui_grant_all_files_access_browse">Concede acceso a todos los archivos para explorar carpetas directamente.</string>
+    <string name="common_ui_not_configured">No configurado</string>
+    <string name="common_ui_reinstall">Reinstalar</string>
+    <string name="common_ui_exit_app_confirm">¿Salir de WinNative?</string>
+    <string name="common_ui_elements_count">%1$d elementos</string>
+    <string name="common_ui_disabled_placeholder">-- Deshabilitado --</string>
+    <string name="common_ui_enabled">Habilitado</string>
+    <string name="common_ui_unknown_error">Error desconocido</string>
+    <string name="common_ui_auto_detected">Detectado automáticamente</string>
+    <string name="common_ui_change">Cambiar</string>
+    <string name="common_ui_proceed">Continuar</string>
+    <string name="common_ui_sign_out">Cerrar sesión</string>
+    <string name="common_ui_name_cannot_be_empty">El nombre no puede estar vacío</string>
+    <string name="common_ui_error_with_message">Error: %1$s</string>
+    <string name="common_ui_64_bit">64 BITS</string>
+    <string name="common_ui_32_bit">32 BITS</string>
+    <string name="common_ui_64_bit_and_32_bit">64 BITS &amp; 32 BITS</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d carpeta</item>
+        <item quantity="other">%d carpetas</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d archivo</item>
+        <item quantity="other">%d archivos</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Obtener arte</string>
+    <string name="library_games_scraping_artwork">Obteniendo…</string>
+    <string name="library_games_shortcut_created">Acceso directo creado</string>
+    <string name="library_games_failed_to_create_shortcut">No se pudo crear el acceso directo: %s</string>
+    <string name="library_games_install_path">Ruta de instalación</string>
+    <string name="library_games_not_enough_space">Se necesita %1$s más de espacio</string>
+    <string name="library_games_download_slash_install">Descargar / Instalar</string>
+    <string name="library_games_save_management">GESTIÓN DE PARTIDAS GUARDADAS</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Disponible: %3$s</string>
+    <string name="library_games_last_played">Última vez jugado</string>
+    <string name="library_games_playtime">Tiempo de juego</string>
+    <string name="library_games_plays">Veces jugado</string>
+    <string name="library_games_dlcs">DLC</string>
+    <string name="library_games_uninstall_game">DESINSTALAR JUEGO</string>
+    <string name="library_games_remove_game">QUITAR JUEGO</string>
+    <string name="library_games_uninstall_confirm">¿Desinstalar %1$s y eliminar permanentemente su carpeta de juego instalada?</string>
+    <string name="library_games_remove_confirm">Quita %1$s de tu biblioteca. ¿Los archivos del juego en el disco permanecerán intactos?</string>
+    <string name="library_games_game_uninstalled">%1$s desinstalado.</string>
+    <string name="library_games_game_removed">%1$s eliminado.</string>
+    <string name="library_games_failed_to_uninstall">No se pudo desinstalar.</string>
+    <string name="library_games_failed_to_uninstall_reason">No se pudo desinstalar: %1$s</string>
+    <string name="library_games_loading">Cargando biblioteca…</string>
+    <string name="library_games_no_games_installed">No hay juegos instalados. Usa una pestaña de Tienda o el botón + para agregar juegos.</string>
+    <string name="library_games_times_played_label">Número de veces jugado: </string>
+    <string name="library_games_playtime_label">Tiempo de juego: </string>
+    <string name="library_games_no_games_hub">No hay juegos instalados\nHaz clic para abrir el backend de Winlator</string>
+    <string name="library_games_installed_badge">INSTALADO</string>
+    <string name="library_games_unknown_game">Juego desconocido</string>
+    <string name="library_games_layouts_header">DISEÑOS DE BIBLIOTECA</string>
+    <string name="library_games_layout_carousel">Carrusel</string>
+    <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPCIONES DE VISTA</string>
+    <string name="library_games_immersive_mode">Modo inmersivo</string>
+    <string name="library_games_immersive_mode_description">Usar el arte del juego enfocado como fondo</string>
+    <string name="library_games_immersive_blur">Desenfocar fondo</string>
+    <string name="library_games_immersive_blur_description">Aplicar un efecto de desenfoque al fondo inmersivo</string>
+    <string name="library_games_custom_game">Juego personalizado</string>
+    <string name="library_games_play">Jugar</string>
+    <string name="hero_boot_to_desktop_title">Iniciar en el escritorio</string>
+    <string name="hero_graphics_tests_title">Pruebas de gráficos</string>
+    <string name="hero_graphics_test_32">32 bits</string>
+    <string name="hero_graphics_test_64">64 bits</string>
+    <string name="hero_input_tests_title">Pruebas de entrada</string>
+    <string name="library_games_add_custom_game">Agregar juego personalizado</string>
+    <string name="library_games_game_name">Nombre del juego</string>
+    <string name="library_games_game_folder_mapped_drive">Carpeta del juego (unidad de juego asignada)</string>
+    <string name="library_games_select_exe_provide_name">Selecciona un exe y proporciona un nombre</string>
+    <string name="library_games_sign_in_prompt">Inicia sesión en una tienda o agrega un juego personalizado para armar tu biblioteca.</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Tiendas</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Carpeta de descargas compartida</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Usar una sola carpeta para todas las tiendas</string>
+    <string name="stores_accounts_default_downloads_folder">Carpeta de descargas predeterminada</string>
+    <string name="stores_accounts_steam_downloads">Descargas de Steam</string>
+    <string name="stores_accounts_epic_downloads">Descargas de Epic</string>
+    <string name="stores_accounts_gog_downloads">Descargas de GOG</string>
+    <string name="stores_accounts_download_speed">Velocidad de descarga</string>
+    <string name="stores_accounts_download_speed_subtitle">Controla la concurrencia de subprocesos de descarga de Steam</string>
+    <string name="stores_accounts_download_server">Servidor de descarga</string>
+    <string name="stores_accounts_connected_stores">Tiendas conectadas</string>
+    <string name="stores_accounts_download_settings">Configuración de descargas</string>
+    <string name="stores_accounts_download_speed_conservative">Conservadora</string>
+    <string name="stores_accounts_download_speed_balanced">Equilibrada</string>
+    <string name="stores_accounts_download_speed_standard">Estándar</string>
+    <string name="stores_accounts_download_speed_performance">Rendimiento</string>
+    <string name="stores_accounts_download_server_auto_detected">Detectado automáticamente: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Región de la CDN de Steam para descargas de juegos</string>
+    <string name="stores_accounts_sign_out_confirm">¿Cerrar sesión en %1$s?</string>
+    <string name="stores_accounts_sign_out_message">Deberás iniciar sesión de nuevo para acceder a tu biblioteca.</string>
+    <string name="stores_accounts_logged_in_epic">¡Sesión iniciada en Epic Games!</string>
+    <string name="stores_accounts_epic_login_failed">Error al iniciar sesión en Epic: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">¡Sesión iniciada en GOG!</string>
+    <string name="stores_accounts_gog_login_failed">Error al iniciar sesión en GOG: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Ruta de descarga personalizada</string>
+    <string name="stores_accounts_custom_download_path_description">Ya se configuró una ruta de descarga predeterminada en Configuración &gt; Tiendas. Si deseas establecer una ruta personalizada única para esta instalación específica, haz clic en Continuar.</string>
+    <string name="stores_accounts_not_signed_in">Sesión no iniciada</string>
+    <string name="stores_accounts_status_online">En línea</string>
+    <string name="stores_accounts_status_away">Ausente</string>
+    <string name="stores_accounts_status_offline">Sin conexión</string>
+    <string name="stores_accounts_status_invisible">Invisible</string>
+    <string name="stores_accounts_status_header">ESTADO</string>
+    <string name="stores_accounts_stores_header">TIENDAS</string>
+    <string name="stores_accounts_sign_in_store_prompt">Inicia sesión para acceder a la tienda de %1$s.</string>
+    <string name="stores_accounts_manage">Administrar cuentas de tiendas</string>
+    <string name="stores_accounts_sign_into_store">Iniciar sesión en %1$s</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Cancelar todo</string>
+    <string name="downloads_queue_preparing_download">Preparando descarga</string>
+    <string name="downloads_queue_installing_package">Instalando paquete</string>
+    <string name="downloads_queue_resume_all">Reanudar todo</string>
+    <string name="downloads_queue_pause_all">Pausar todo</string>
+    <string name="downloads_queue_clear">Borrar</string>
+    <string name="downloads_queue_status_label">Estado:</string>
+    <string name="downloads_queue_phase_downloading">Descargando</string>
+    <string name="downloads_queue_phase_downloading_file">Descargando [%1$s]</string>
+    <string name="downloads_queue_phase_queued">En cola</string>
+    <string name="downloads_queue_phase_paused">Pausado</string>
+    <string name="downloads_queue_phase_preparing">Preparando</string>
+    <string name="downloads_queue_phase_verifying">Verificando</string>
+    <string name="downloads_queue_phase_verifying_file">Verificando [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Aplicando parche</string>
+    <string name="downloads_queue_phase_applying_data">Aplicando datos</string>
+    <string name="downloads_queue_phase_finalizing">Finalizando</string>
+    <string name="downloads_queue_phase_unpacking">Descomprimiendo</string>
+    <string name="downloads_queue_phase_updating">Actualizando</string>
+    <string name="downloads_queue_phase_complete">Completo</string>
+    <string name="downloads_queue_phase_cancelled">Cancelado</string>
+    <string name="downloads_queue_phase_failed">Falló: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Desconocido</string>
+    <string name="downloads_queue_paused_resume_hint">En pausa - toca Reanudar para continuar</string>
+    <string name="downloads_queue_cancel_download">Cancelar descarga</string>
+    <string name="downloads_queue_cancel_download_title">¿Cancelar descarga?</string>
+    <string name="downloads_queue_cancel_download_confirm">¿Cancelar la descarga de %1$s y eliminar todos los archivos descargados?</string>
+    <string name="downloads_queue_cancel_download_warning">Cancelar la descarga de un DLC, juego o actualización puede corromper la instalación de tu juego.\n\n¿Seguro que quieres cancelar esta descarga y eliminar los archivos descargados hasta ahora?</string>
+    <string name="downloads_queue_cancel_all_title">¿Cancelar todas las descargas?</string>
+    <string name="downloads_queue_cancel_all_warning">Cancelar las descargas de DLC, juegos o actualizaciones puede corromper las instalaciones de tus juegos.\n\n¿Seguro que quieres cancelar todas las descargas y eliminar los archivos descargados hasta ahora?</string>
+    <string name="downloads_queue_this_game">este juego</string>
+    <string name="downloads_queue_empty">No hay descargas activas.</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">Nuevo contenedor</string>
+    <string name="containers_list_edit">Editar contenedor</string>
+    <string name="containers_list_creating">Creando contenedor</string>
+    <string name="containers_list_removing">Eliminando contenedor</string>
+    <string name="containers_list_duplicating">Duplicando contenedor</string>
+    <string name="containers_list_remove_title">Eliminar contenedor</string>
+    <string name="containers_list_duplicate_title">Duplicar contenedor</string>
+    <string name="containers_list_confirm_remove">¿Eliminar este contenedor? Las partidas guardadas dentro de él se eliminarán de forma permanente. Las partidas sincronizadas en la nube permanecen en la nube, pero los cambios locales que aún no se hayan sincronizado se perderán — sincroniza primero las partidas en la nube de este juego si quieres conservarlas.</string>
+    <string name="containers_list_confirm_duplicate">¿Quieres duplicar este contenedor?</string>
+    <string name="containers_list_duplicate_failed">No se pudo duplicar el contenedor</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">¿Quieres eliminar este acceso directo?</string>
+    <string name="shortcuts_list_add_to_home_screen">Agregar a la pantalla de inicio</string>
+    <string name="shortcuts_library_artwork_title">Arte de la biblioteca</string>
+    <string name="shortcuts_library_artwork_icon_title">Arte del icono</string>
+    <string name="shortcuts_library_artwork_hero_title">Fondo</string>
+    <string name="shortcuts_library_artwork_set">Establecer imagen</string>
+    <string name="shortcuts_library_artwork_failed">No se pudo cargar la imagen seleccionada.</string>
+    <string name="shortcuts_library_artwork_open_source">Abrir SteamGridDB</string>
+    <string name="shortcuts_list_not_available">Este acceso directo ya no está disponible. Elimínalo o vuelve a crearlo.</string>
+    <string name="shortcuts_list_select_a_container">Selecciona un contenedor</string>
+    <string name="shortcuts_list_error_opening_settings">Error al abrir la configuración del acceso directo</string>
+    <string name="shortcuts_list_removed">Acceso directo eliminado correctamente.</string>
+    <string name="shortcuts_list_remove_failed">No se pudo eliminar el acceso directo. Inténtalo de nuevo.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Eliminar acceso directo\n%1$s</string>
+    <string name="shortcuts_list_cloned">Acceso directo clonado correctamente.</string>
+    <string name="shortcuts_list_clone_failed">No se pudo clonar el acceso directo.</string>
+    <string name="shortcuts_list_exported_to">Acceso directo exportado a %1$s</string>
+    <string name="shortcuts_list_failed_export">No se pudo exportar el acceso directo</string>
+    <string name="shortcuts_export_all">Exportar todo</string>
+    <string name="shortcuts_export_to_frontend">Exportar al frontend</string>
+    <string name="shortcuts_export_all_done">Se exportaron %1$d juegos a %2$s</string>
+    <string name="shortcuts_export_all_none">No hay juegos para exportar</string>
+    <string name="shortcuts_list_added">Acceso directo agregado correctamente.</string>
+    <string name="shortcuts_list_readded_existing">Se volvió a agregar el acceso directo existente</string>
+    <string name="shortcuts_list_failed_add">No se pudo agregar el acceso directo.</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Argumentos de ejecución</string>
+    <string name="shortcuts_properties_target_path">Ruta de destino</string>
+    <string name="shortcuts_properties_disable_xinput">Desactivar Xinput (para control exclusivo de mouse/teclado)</string>
+    <string name="num_controllers">Número de controles</string>
+    <string name="shortcuts_properties_exclusive_input">Entrada exclusiva</string>
+    <string name="shortcuts_properties_custom_game_settings">Configuración personalizada del juego</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Usar lanzador heredado</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Emulación heredada de Steam: ejecuta el juego mediante el lanzador ColdClient y elimina el DRM de SteamStub del exe. Úsalo solo para juegos más antiguos que no funcionan con el lanzador de Steam.</string>
+    <string name="shortcuts_properties_runtime_patcher">Parcheador de DRM en tiempo de ejecución</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Inyecta una DLL parcheadora de DRM al iniciar. Reduce los FPS: úsalo solo si el lanzador heredado por sí solo falla.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">Cliente real de Steam de WinNative</string>
+    <string name="steam_section_emulator">Emulador heredado de Steam</string>
+    <string name="shortcuts_properties_use_steam_input">Usar Steam Input</string>
+    <string name="shortcuts_properties_steam_offline_mode">Modo sin conexión de Steam</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Hace que el cliente de Steam emulado se muestre como sin conexión, para que el juego no intente conexiones en línea. Úsalo para juegos que se quedan bloqueados en la verificación de red de Steam.</string>
+    <string name="shortcuts_properties_reset">Restablecer propiedades</string>
+    <string name="shortcuts_properties_updated_at">Acceso directo actualizado el %1$s</string>
+    <string name="shortcuts_properties_properties_reset">Propiedades restablecidas correctamente.</string>
+    <string name="shortcuts_properties_reset_per_game">Restablecer ajustes por juego</string>
+    <string name="shortcuts_properties_reset_per_game_message">¿Restablecer este juego para usar los valores predeterminados del contenedor seleccionado?</string>
+    <string name="shortcuts_properties_per_game_reset">Ajustes por juego restablecidos a los valores predeterminados del contenedor seleccionado</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">No hay ningún elemento de control seleccionado</string>
+    <string name="input_controls_editor_scale">Escala</string>
+    <string name="input_controls_editor_shape">Forma</string>
+    <string name="input_controls_editor_type">Tipo</string>
+    <string name="input_controls_editor_binding">Asignación</string>
+    <string name="binding_primary">Asignación principal</string>
+    <string name="binding_secondary">Asignación secundaria</string>
+    <string name="binding_third">Asignación terciaria</string>
+    <string name="binding_fourth">Asignación cuaternaria</string>
+    <string name="input_controls_editor_binding_up">Asignación arriba</string>
+    <string name="input_controls_editor_binding_right">Asignación derecha</string>
+    <string name="input_controls_editor_binding_down">Asignación abajo</string>
+    <string name="input_controls_editor_binding_left">Asignación izquierda</string>
+    <string name="input_controls_editor_overlay_opacity">Opacidad de la superposición</string>
+    <string name="input_controls_editor_opacity">Opacidad</string>
+    <string name="input_controls_editor_radial_menu">Menú radial</string>
+    <string name="input_controls_editor_radial_menu_options">Opciones del menú radial</string>
+    <string name="input_controls_editor_number_of_bindings">Número de asignaciones</string>
+    <string name="input_controls_editor_select_profile">Seleccionar perfil</string>
+    <string name="input_controls_select_style">Seleccionar estilo</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Vidrio</string>
+    <string name="input_controls_style_slate">Pizarra</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Destello</string>
+    <string name="input_controls_style_shadow">Sombra</string>
+    <string name="input_controls_style_reticle">Retícula</string>
+    <string name="input_controls_style_neon">Neón</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Tema de color</string>
+    <string name="input_controls_edit_duplicating_builtin">Perfil integrado — se creó una copia que puedes editar.</string>
+    <string name="input_controls_editor_profile_name">Nombre del perfil</string>
+    <string name="input_controls_editor_no_profile_selected">No hay ningún perfil seleccionado</string>
+    <string name="input_controls_editor_no_profile_found">No se encontró ningún perfil</string>
+    <string name="input_controls_editor_tap_to_switch">Toca para cambiar</string>
+    <string name="input_controls_editor_confirm_remove_profile">¿Quieres eliminar este perfil?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">¿Quieres duplicar este perfil?</string>
+    <string name="input_controls_editor_confirm_reset_profile">¿Restablecer este perfil a su diseño original? Se perderán los cambios que hayas hecho.</string>
+    <string name="input_controls_editor_profile_reset">Perfil restablecido a su diseño original.</string>
+    <string name="input_controls_editor_reset_unavailable">No hay ninguna instantánea original disponible para este perfil.</string>
+    <string name="input_controls_editor_title">Editor de controles</string>
+    <string name="input_controls_editor_toggle_switch">Interruptor</string>
+    <string name="input_controls_editor_swipeable">Deslizable</string>
+    <string name="input_controls_editor_profile_exported_to">Perfil exportado a</string>
+    <string name="input_controls_editor_unable_to_import">No se pudo importar el perfil</string>
+    <string name="input_controls_editor_import_profile">Importar perfil</string>
+    <string name="input_controls_editor_download_profile">Descargar perfil</string>
+    <string name="input_controls_editor_export_profile">Exportar perfil</string>
+    <string name="input_controls_editor_range">Rango</string>
+    <string name="input_controls_editor_confirm_download_profiles">¿Quieres descargar los perfiles seleccionados?</string>
+    <string name="input_controls_editor_unable_to_load_list">No se pudo cargar la lista de perfiles</string>
+    <string name="input_controls_editor_osc_transparency">Transparencia de los controles en pantalla</string>
+    <string name="input_controls_editor_osc_transparency_description">Ajusta la transparencia de los controles en pantalla.</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Tamaño de pantalla</string>
+    <string name="container_config_new_env_var">Nueva variable de entorno</string>
+    <string name="container_config_env_vars">Variables de entorno</string>
+    <string name="container_config_processor_affinity">Afinidad del procesador</string>
+    <string name="container_config_processor_affinity_32bit">Afinidad del procesador (apps de 32 bits)</string>
+    <string name="container_config_audio_driver">Controlador de audio</string>
+    <string name="container_config_win_components">Componentes de Win</string>
+    <string name="container_config_drives">Unidades</string>
+    <string name="container_config_arch">Arquitectura</string>
+    <string name="container_config_storage_info">Información de almacenamiento</string>
+    <string name="container_config_drive_c">Unidad C:</string>
+    <string name="container_config_cache">Caché</string>
+    <string name="container_config_total">Total</string>
+    <string name="container_config_clear_cache">Borrar caché</string>
+    <string name="container_config_estimated_used_space">Espacio usado estimado</string>
+    <string name="settings_containers_error_saving_wallpaper">Error al guardar el fondo de pantalla</string>
+    <string name="container_config_directinput_mapper_type">Tipo de asignador de DirectInput</string>
+    <string name="container_config_title">Configuración</string>
+    <string name="container_config_startup_selection">Selección de inicio</string>
+    <string name="container_config_glibc_exp_edition">Basado en</string>
+    <string name="container_config_refresh_rate_default_global">Predeterminado (global)</string>
+    <string name="container_config_enable_dinput">Activar DInput para juegos en Wine</string>
+    <string name="container_config_enable_xinput">Activar XInput para juegos en Wine</string>
+    <string name="container_config_dinput_legacy">Heredado (gamepads antiguos)</string>
+    <string name="container_config_dinput_modern">Moderno (tipo Xinput)</string>
+    <string name="container_config_help_xinput">
+        Si tu juego usa la &lt;i&gt;&lt;b&gt;API XInput&lt;/b&gt;&lt;/i&gt; para la compatibilidad con controles de juego, activa esta opción.&lt;br/&gt;&lt;br/&gt;
+        Esta opción afectará tanto a los controles de juego &lt;i&gt;&lt;b&gt;virtuales&lt;/b&gt;&lt;/i&gt; (proporcionados por Controles de entrada) como a los &lt;i&gt;&lt;b&gt;físicos&lt;/b&gt;&lt;/i&gt;.
+    </string>
+    <string name="container_config_help_dinput">
+        Si tu juego usa la &lt;i&gt;&lt;b&gt;API DInput&lt;/b&gt;&lt;/i&gt; para la compatibilidad con controles de juego, activa esta opción.&lt;br/&gt;&lt;br/&gt;
+        Esta opción afectará tanto a los controles de juego &lt;i&gt;&lt;b&gt;virtuales&lt;/b&gt;&lt;/i&gt; (proporcionados por Controles de entrada) como a los &lt;i&gt;&lt;b&gt;físicos&lt;/b&gt;&lt;/i&gt;.
+    </string>
+    <string name="container_config_xinput_dinput_warning">Algunos juegos pueden ser compatibles con ambas API. Activar XInput y DInput simultáneamente en esos juegos puede causar problemas de control, como se ve en títulos como The Binding of Isaac y la serie Resident Evil.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">Emulador de 32 bits</string>
+    <string name="container_config_emulator_wine_hint">El emulador lo determina la versión de wine. ARM64EC usa FEXCore, x86_64 usa Box64.</string>
+    <string name="container_config_label">Configuración</string>
+    <string name="container_config_restart_required">Reinicia el contenedor para que los cambios surtan efecto</string>
+    <string name="container_config_renderer">Renderizador</string>
+    <string name="container_config_variables">Variables</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">Entradas</string>
+    <string name="container_config_tab">Config</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">Emulador de 64 bits</string>
+    <string name="container_config_emulator_section">Emulador</string>
+    <string name="container_config_sdl2_compatibility">Activar compatibilidad con SDL2</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Configuración de Wine</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">Nombre de la GPU</string>
+    <string name="container_wine_offscreen_rendering_mode">Modo de renderizado fuera de pantalla</string>
+    <string name="container_wine_strict_shader_math">Matemática estricta de shaders</string>
+    <string name="container_wine_video_memory_size">Tamaño de memoria de video</string>
+    <string name="container_wine_dxwrapper">Envoltorio de DX</string>
+    <string name="container_wine_mouse_warp_override">Anulación de warp del mouse</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">Versión de DXVK</string>
+    <string name="container_wine_dxvk_config_title">Configuración de DXVK</string>
+    <string name="container_wine_wined3d_config_title">Configuración de WineD3D</string>
+    <string name="container_wine_vkd3d_version">Versión de VKD3D</string>
+    <string name="container_wine_version">Versión de Wine</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; es una capa de traducción de DirectX 1-11 a OpenGL.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; es una capa de traducción de Direct3D 9-11 a Vulkan.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; es una capa de traducción de la API de Direct3D 12 a Vulkan.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; es una implementación de DirectDraw para una mejor compatibilidad con juegos clásicos.
+    </string>
+    <string name="container_wine_enabled_async">Activar Async</string>
+    <string name="container_wine_enabled_async_cache">Activar caché de Async</string>
+    <string name="container_wine_vkd3d_feature_level">Nivel de características de VKD3D</string>
+    <string name="container_wine_ddraw_wrapper">Envoltorio de DDraw</string>
+    <string name="container_wine_error_not_installed">El paquete de Wine/Proton \'%1$s\' no está instalado y no se pudo descargar.</string>
+    <string name="container_no_wine_installed">No hay Wine ni Proton instalado. Instala uno primero.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Efecto de superficie</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Preajuste de Box64</string>
+    <string name="container_box64_version">Versión de Box64</string>
+    <string name="container_box64_stability">Estabilidad</string>
+    <string name="container_box64_compatibility">Compatibilidad</string>
+    <string name="container_box64_intermediate">Intermedio</string>
+    <string name="container_box64_performance">Rendimiento</string>
+    <string name="container_fexcore_performance_tso">Rendimiento TSO</string>
+    <string name="container_fexcore_extreme">Extremo</string>
+    <string name="container_fexcore_extreme_tso">Extremo TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Activa o desactiva el recompilador dinámico de Box64.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        Manejo de flags en los opcodes CALL/RET&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Trata CALL/RET como si nunca necesitaran flags (más rápido, inestable)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : La mayoría de los RET necesitarán flags, la mayoría de los CALL no&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Todos los CALL/RET necesitarán flags (más lento)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">Generación de -NAN como en x86</string>
+    <string name="box64_env_var_help__dynarec_fastround">Generación de redondeo x86 preciso</string>
+    <string name="box64_env_var_help__dynarec_x87double">Uso de Float/Double para la emulación de x87</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Construcción de BigBlock del Dynarec&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : No intentar construir bloques lo más grandes posible&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Construir bloques de Dynarec lo más grandes posible&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Construir bloques de Dynarec más grandes (continúa cuando los bloques se superponen, pero solo para bloques en memoria elf)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Construir bloques de Dynarec más grandes (continúa cuando los bloques se superponen, para todos los tipos de memoria)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Simulación del modelo de memoria fuerte&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : No intentar nada especial&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Activar alguna barrera de memoria al escribir en memoria (en algunos opcodes MOV)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Todo lo de 1 más una barrera de memoria en cada escritura en memoria usando MOV&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Todo lo de 2 más una barrera de memoria al leer de memoria y en algunos opcodes SSE/SSE2&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : Imita el TSO de x86 de forma similar a QEMU.
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">Define el valor máximo de avance permitido al construir el bloque</string>
+    <string name="box64_env_var_help__dynarec_callret">Optimización de los opcodes CALL/RET</string>
+    <string name="box64_env_var_help__dynarec_sep">Agrega puntos de entrada secundarios para optimizar CALL/RET cuando CALLRET está activado.</string>
+    <string name="box64_env_var_help__dynarec_wait">Define si el Dynarec esperará o no a que el FillBlock esté listo</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Ajusta las barreras de memoria para reducir el impacto en el rendimiento de la emulación de memoria fuerte&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Usar barreras seguras normales&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Usar barreras débiles para un ligero aumento de rendimiento&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Usar barreras débiles y, además, desactivar las barreras de última escritura</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        Generar solo atómicas alineadas (por ahora solo disponible en Arm64).&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Generar código de manejo de atómicas no alineadas.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Generar solo atómicas alineadas, lo que es más rápido y de menor tamaño de código, pero causará SIGBUS para los opcodes con prefijo LOCK que operan sobre direcciones de datos alineadas.</string>
+    <string name="box64_env_var_help__dynarec_df">
+        Activa o desactiva el uso de banderas diferidas.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Desactiva el uso de banderas diferidas.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Activa el uso de banderas diferidas.</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        Permite seguir ejecutando un bloque que no está protegido y potencialmente sucio.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : No permite seguir ejecutando un bloque que no está protegido y potencialmente sucio.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Permite seguir ejecutando un dynablock que escribe datos en la misma página que el código. Puede acelerar el tiempo de carga de algunos juegos, pero también puede provocar cierres inesperados.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Además, cuando detecte una HotPage, marcará esa página como NEVERCLEAN, por lo que no tendrá protección de escritura, pero los bloques construidos desde esa página siempre se verificarán. Puede ser más rápido de esa forma (aunque algunos casos de SMC podrían no ser interceptados).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        Activa o desactiva el uso de banderas nativas.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : No usar banderas nativas.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Usar banderas nativas cuando sea posible.</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        Activa la emulación de PAUSE de x86, puede ayudar al rendimiento de los spinlocks.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ignorar la instrucción PAUSE de x86.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Usar YIELD para emular la instrucción PAUSE de x86.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Usar WFI para emular la instrucción PAUSE de x86.&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Usar SEVL+WFE para emular la instrucción PAUSE de x86.
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">Reduce los metadatos de los bloques de dynarec para ahorrar memoria, con costos de compatibilidad.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">Usa los metadatos volátiles de PE para guiar la emulación de memoria fuerte en juegos de Windows de 64 bits.</string>
+    <string name="box64_env_var_help__dynacache">Controla el almacenamiento en caché de los bloques de dynarec generados entre ejecuciones para acelerar el inicio.</string>
+    <string name="box64_env_var_help__avx">
+        Expone las capacidades de AVX al huésped.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Desactivar la extensión AVX&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : activar las extensiones AVX, BMI1, F16C y VAES.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Todo lo del 1 más activar AVX2, BMI2, FMA, ADX, VPCLMULQDQ y RDRAND.&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">Expone las capacidades de AES de la CPU al huésped.</string>
+    <string name="box64_env_var_help__pclmulqdq">Expone las capacidades de PCLMULQDQ de la CPU al huésped.</string>
+    <string name="box64_env_var_help__shaext">Expone las capacidades de la extensión SHA de la CPU al huésped.</string>
+    <string name="box64_env_var_help__sse42">Expone las capacidades de SSE4.2 de la CPU al huésped.</string>
+    <string name="box64_env_var_help__sse_flushto0">Controla el comportamiento de flush-to-zero de SSE y el seguimiento de banderas de excepción.</string>
+    <string name="box64_env_var_help__x87_no80bits">Usa doble precisión de 64 bits en lugar de long double de 80 bits para x87.</string>
+    <string name="box64_env_var_help__cputype">Selecciona el modelo de CPU Intel o AMD expuesto al huésped.</string>
+    <string name="box64_env_var_help__maxcpu">Número máximo de CPU que Box64 presenta a los programas</string>
+    <string name="box64_env_var_help__unityplayer">Detecta UnityPlayer y marca la aplicación como un juego de Unity.</string>
+    <string name="box64_env_var_help__unity">Marca la aplicación como un juego de Unity y activa el manejo de compatibilidad específico de Unity.</string>
+    <string name="box64_env_var_help__mmap32">Forzar todas las asignaciones de memoria en espacios de direcciones de 32 bits</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">Activa las operaciones TSO IR (necesarias para aplicaciones multihilo).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">Hace atómicas las cargas/almacenamientos vectoriales cuando TSO está activado.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">Usa atómicos de media barrera para cargas/almacenamientos no alineados bajo TSO.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">Hace atómicos REP MOVS / REP STOS bajo TSO.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Usa un bloqueo estricto en todo el proceso para accesos atómicos divididos no alineados.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Aplica parches a los atómicos no alineados manejados por el kernel para reducir los cambios de contexto del kernel.</string>
+    <string name="fexcore_env_var_help__multiblock">Activa la compilación de código multibloque. Puede provocar compilaciones JIT más largas y tirones.</string>
+    <string name="fexcore_env_var_help__maxinst">Número máximo de instrucciones almacenadas en un bloque compilado.</string>
+    <string name="fexcore_env_var_help__hostfeatures">Controla el forzado de características de la CPU.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Escala el TSC en sistemas de baja frecuencia.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Oculta la distribución de núcleos de CPU híbridos al huésped.</string>
+    <string name="fexcore_env_var_help__smc_checks">Verifica si el código fue modificado antes de ejecutarlo.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Usa metadatos volátiles de los archivos PE para TSO cuando estén disponibles.</string>
+    <string name="fexcore_env_var_help__monohacks">Hacks especiales de SMC + bloques JIT para la detección de Mono.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">Oculta el bit de hypervisor de CPUID (útil para aplicaciones que se cierran con él).</string>
+    <string name="fexcore_env_var_help__disablel2cache">Desactiva la búsqueda en la caché L2 del JIT de FEXCore, ahorra memoria pero introduce tirones.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">Cambia la caché L1 del JIT de FEXCore a un tamaño dinámico, ahorra memoria pero introduce tirones.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Umbral de búsquedas por segundo para agrandar la caché L1 dinámica.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Umbral de búsquedas por segundo para reducir la caché L1 dinámica.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">Emula el punto flotante X87 usando precisión de 64 bits. Esto reduce la exactitud de la emulación y puede provocar errores de renderizado.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">Ajuste preestablecido de FEXCore</string>
+    <string name="container_fexcore_version">Versión de FEXCore</string>
+    <string name="use_unix_libs">Usar UnixLibs</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Controlador de gráficos</string>
+    <string name="container_zink_mode">Modo Zink</string>
+    <string name="container_graphics_configuration">Configuración del controlador de gráficos</string>
+    <string name="container_graphics_version">Versión del controlador de gráficos</string>
+    <string name="container_graphics_available_extensions">Extensiones disponibles</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d activadas</string>
+    <string name="container_graphics_max_device_memory">Memoria máxima del dispositivo</string>
+    <string name="container_graphics_sync_frame">Sincronizar cada fotograma</string>
+    <string name="container_graphics_disable_present_wait">Desactivar KHR_present_wait</string>
+    <string name="container_graphics_present_modes">Modos de presentación</string>
+    <string name="container_graphics_compositor_present_mode">Sincronización de pantalla de Vulkan</string>
+    <string name="container_graphics_resource_type">Tipo de recurso de memoria</string>
+    <string name="container_graphics_vulkan_version">Versión de Vulkan</string>
+    <string name="container_graphics_bcn_emulation">Emulación de BCn</string>
+    <string name="container_graphics_bcn_emulation_type">Tipo de emulación de BCn</string>
+    <string name="container_graphics_bcn_emulation_cache">Caché de emulación de BCn</string>
+    <string name="container_graphics_transcoder">Transcodificador de BCn</string>
+    <string name="container_graphics_quality">Calidad de BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">¿Quieres duplicar este ajuste preestablecido?</string>
+    <string name="container_presets_confirm_remove">¿Quieres eliminar este ajuste preestablecido?</string>
+    <string name="container_presets_title">Ajustes preestablecidos</string>
+    <string name="container_presets_preset">Ajuste preestablecido</string>
+    <string name="container_presets_new">Nuevo ajuste preestablecido</string>
+    <string name="container_presets_rename">Renombrar ajuste preestablecido</string>
+    <string name="container_presets_import">Importar ajuste preestablecido</string>
+    <string name="container_presets_custom">Personalizado</string>
+    <string name="container_presets_built_in">Predeterminado</string>
+    <string name="container_presets_changes_auto_saved">Los cambios se guardan automáticamente al editar este ajuste preestablecido personalizado.</string>
+    <string name="container_presets_cannot_rename">Los ajustes preestablecidos integrados no se pueden renombrar</string>
+    <string name="container_presets_unable_to_import">No se pudo importar el ajuste preestablecido</string>
+    <string name="container_presets_no_description">No hay descripción disponible</string>
+    <string name="container_presets_cannot_remove">No puedes eliminar este ajuste preestablecido</string>
+    <string name="container_presets_cannot_export">No se puede exportar este ajuste preestablecido</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Simular pantalla táctil</string>
+    <string name="session_xserver_preferences_button_text">   PREFERENCIAS   </string>
+    <string name="session_xserver_extra_keys_config_desc">Aquí puedes establecer el valor de la variable extra-keys como en la aplicación Termux (lee <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">esto</a>) y más \n
+Por ejemplo, <b>META</b> para la <i>tecla META</i>, \n
+<b>KEYBOARD</b> para la <i>tecla de activación del teclado en pantalla</i>, \n
+<b>PREFERENCES</b> para la <i>tecla de apertura de preferencias</i>, \n
+<b>MOUSE_HELPER</b> para la <i>tecla de activación del ayudante del mouse</i>, \n
+<b>STYLUS_HELPER</b> para la <i>tecla de activación de la superposición de anulación de clic con lápiz</i>, \n
+<b>EXIT</b> para la <i>tecla de salida de la aplicación</i>.</string>
+    <string name="session_xserver_pref_main">Preferencias</string>
+    <string name="session_xserver_pref_output">Salida</string>
+    <string name="session_xserver_pref_pointer">Puntero</string>
+    <string name="session_xserver_pref_kbd">Teclado</string>
+    <string name="session_xserver_pref_other">Otros</string>
+    <string name="session_xserver_pref_version">Versión</string>
+    <string name="session_xserver_notification_description">Mensajes de XServer de WinNative</string>
+    <string name="session_xserver_notification_content">WinNative se está ejecutando, no cierres ni deslices esta notificación</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Teclado</string>
+    <string name="session_drawer_fps_monitor">Monitor de FPS</string>
+    <string name="session_drawer_fps_monitor_subtitle">Mostrar estadísticas de rendimiento en tiempo real</string>
+    <string name="session_drawer_dual_series_battery">Batería de serie dual</string>
+    <string name="session_drawer_hud_frametime_numeric">Mostrar el tiempo de fotograma como número</string>
+    <string name="session_drawer_toggle_fullscreen">Alternar pantalla completa</string>
+    <string name="session_drawer_refactor_size">Reajustar tamaño</string>
+    <string name="session_drawer_show_touchscreen_controls">Mostrar controles de pantalla táctil</string>
+    <string name="session_drawer_magnifier">Lupa</string>
+    <string name="session_drawer_logs">Registros</string>
+    <string name="session_drawer_pip_mode">Modo PiP</string>
+    <string name="session_drawer_toggle_relative_mouse">Alternar movimiento relativo del mouse</string>
+    <string name="session_drawer_toggle_mouse">Alternar mouse</string>
+    <string name="session_drawer_pause_resume">Pausar/Reanudar</string>
+    <string name="session_drawer_relative_mouse_movement">Movimiento relativo del mouse</string>
+    <string name="session_drawer_mouse_input">Entrada del mouse</string>
+    <string name="session_drawer_touch">Toque</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_drawer_touch_touchscreen">Modo de pantalla táctil</string>
+    <string name="session_drawer_touch_map_right_stick">Asignar a la palanca derecha</string>
+    <string name="session_drawer_rts_gestures">Gestos RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Editar</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilidad de la palanca derecha</string>
+    <string name="session_rts_action">Acción</string>
+    <string name="session_rts_behavior">Comportamiento</string>
+    <string name="session_rts_tap1">Toque con 1 dedo</string>
+    <string name="session_rts_tap2">Toque con 2 dedos</string>
+    <string name="session_rts_tap3">Toque con 3 dedos</string>
+    <string name="session_rts_tap4">Toque con 4 dedos</string>
+    <string name="session_rts_double_tap">Doble toque (doble clic izquierdo)</string>
+    <string name="session_rts_long_press">Pulsación larga</string>
+    <string name="session_rts_hold2">Mantener con 2 dedos</string>
+    <string name="session_rts_hold3">Mantener con 3 dedos</string>
+    <string name="session_rts_hold4">Mantener con 4 dedos</string>
+    <string name="session_rts_swipe3">Deslizar con 3 dedos</string>
+    <string name="session_rts_swipe4">Deslizar con 4 dedos</string>
+    <string name="session_rts_up">Arriba</string>
+    <string name="session_rts_down">Abajo</string>
+    <string name="session_rts_left">Izquierda</string>
+    <string name="session_rts_right">Derecha</string>
+    <string name="session_rts_pan">Desplazar con 2 dedos</string>
+    <string name="session_rts_pan1">Desplazar con 1 dedo</string>
+    <string name="session_rts_zoom">Zoom con pellizco</string>
+    <string name="session_rts_drag">Arrastrar con 1 dedo</string>
+    <string name="session_rts_drag2">Arrastrar con 2 dedos</string>
+    <string name="session_rts_long_press_delay">Retardo de pulsación larga (ms)</string>
+    <string name="session_rts_hold_delay">Retardo de mantener (ms)</string>
+    <string name="session_rts_swipe_threshold">Umbral de deslizamiento (px)</string>
+    <string name="session_rts_gesture_threshold">Umbral de gesto (px)</string>
+    <string name="session_rts_double_tap_delay">Retardo de doble toque (ms)</string>
+    <string name="session_rts_drag_threshold">Umbral de arrastre (px)</string>
+    <string name="session_rts_pan_threshold">Inicio de desplazamiento/pellizco (px)</string>
+    <string name="common_ui_rename">Renombrar</string>
+    <string name="common_ui_new">Nuevo</string>
+    <string name="input_controls_editor_input_profiles_section">Perfiles de entrada</string>
+    <string name="session_gesture_profile_section">Perfil de gestos</string>
+    <string name="gesture_profile_new">Nuevo perfil de gestos</string>
+    <string name="gesture_profile_import">Importar perfil de gestos</string>
+    <string name="gesture_profile_export">Exportar perfil de gestos</string>
+    <string name="gesture_profile_none">No hay perfiles de gestos</string>
+    <string name="session_drawer_screen_effects">Efectos de pantalla</string>
+    <string name="session_drawer_screen_effects_subtitle">Escalado y efectos de color</string>
+    <string name="session_drawer_super_resolution">Superresolución</string>
+    <string name="session_drawer_upscaler_mode">Escalador</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Nitidez de bordes</string>
+    <string name="session_drawer_vivid">Vívido</string>
+    <string name="session_drawer_vivid_strength">Intensidad de vívido</string>
+    <string name="session_drawer_color_profile">Efecto de color</string>
+    <string name="session_drawer_picture_in_picture">Imagen en imagen</string>
+    <string name="session_drawer_exit_subtitle">Cerrar la sesión en ejecución</string>
+    <string name="session_drawer_touchscreen_overlay">Superposición de pantalla táctil</string>
+    <string name="session_drawer_resume">Reanudar</string>
+    <string name="session_drawer_retry">Reintentar</string>
+    <string name="downloads_no_internet">Sin conexión a internet</string>
+    <string name="session_drawer_pause">Pausar</string>
+    <string name="session_drawer_wine_processes_paused">Los procesos de Wine están en pausa</string>
+    <string name="session_drawer_pause_all_wine_processes">Pausar todos los procesos de Wine</string>
+    <string name="session_drawer_controls_section">Controles</string>
+    <string name="session_drawer_session_section">Sesión</string>
+    <string name="session_drawer_header_subtitle">Acceso rápido a controles, superposiciones y herramientas de sesión</string>
+    <string name="session_drawer_swipe_hint">Desliza para volver al juego</string>
+    <string name="session_drawer_main_menu_title">Menú</string>
+    <string name="session_drawer_hud_summary">Ajusta la visibilidad de la superposición y los datos</string>
+    <string name="session_drawer_hud_disabled_hint">Activa la superposición para personalizarla</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_background_alpha">Alfa del fondo</string>
+    <string name="session_drawer_hud_background">Fondo</string>
+    <string name="session_drawer_hud_scale">Escala</string>
+    <string name="session_drawer_hud_elements">Elementos del HUD</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">Gráfico</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD estilo Mango</string>
+    <string name="session_drawer_hud_mango_settings">Ajustes del HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Carga GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. GPU</string>
+    <string name="mango_hud_element_cpu_load">Carga CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batería</string>
+    <string name="mango_hud_element_lows" formatted="false">Mínimos 1%</string>
+    <string name="mango_hud_element_graph">Gráfico de frametime</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Frecuencia CPU</string>
+    <string name="mango_hud_element_gpu_clock">Frecuencia GPU</string>
+    <string name="mango_hud_element_cores">Por núcleo</string>
+    <string name="mango_hud_element_network">Red</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Resolución</string>
+    <string name="mango_hud_element_wine">Versión de Wine</string>
+    <string name="mango_hud_element_duration">Tiempo de sesión</string>
+    <string name="mango_hud_element_clock">Reloj</string>
+    <string name="mango_hud_element_throttle">Estado térmico</string>
+    <string name="mango_hud_group_memory">Memoria</string>
+    <string name="mango_hud_group_system">Sistema</string>
+    <string name="mango_hud_lock">Bloquear HUD</string>
+    <string name="mango_hud_lock_subtitle">Permite que los toques pasen a los controles detrás del HUD. Mantén pulsado el HUD para bloquearlo. (5s)</string>
+    <string name="hud_position_menu_title">Mover HUD a</string>
+    <string name="hud_position_top_left">Arriba a la izquierda</string>
+    <string name="hud_position_top_center">Arriba al centro</string>
+    <string name="hud_position_top_right">Arriba a la derecha</string>
+    <string name="hud_position_left_center">Centro a la izquierda</string>
+    <string name="hud_position_right_center">Centro a la derecha</string>
+    <string name="hud_position_bottom_left">Abajo a la izquierda</string>
+    <string name="hud_position_bottom_center">Abajo al centro</string>
+    <string name="hud_position_bottom_right">Abajo a la derecha</string>
+    <string name="session_drawer_hud_alpha_input_title">Establecer alfa</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Establecer alfa del fondo</string>
+    <string name="session_drawer_hud_scale_input_title">Establecer escala</string>
+    <string name="session_drawer_hud_input_hint">Ingresa un valor de %1$d a %2$d. Los valores por encima del límite se ajustan.</string>
+    <string name="session_drawer_command_center">Centro de comandos</string>
+    <string name="session_drawer_command_center_input">Entrada</string>
+    <string name="session_drawer_command_center_display">Pantalla</string>
+    <string name="session_drawer_command_center_system">Sistema</string>
+    <string name="session_drawer_fps_limiter">Limitador de FPS</string>
+    <string name="session_drawer_fps_limiter_off">Desactivado</string>
+    <string name="session_drawer_color_profile_disabled">Desactivado</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Natural</string>
+    <string name="session_drawer_color_profile_crt">Efecto CRT</string>
+    <string name="session_drawer_color_profile_toon">Caricatura</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Brillo</string>
+    <string name="session_drawer_contrast">Contraste</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_scale">Escala</string>
+    <string name="session_drawer_scale_nearest">Más cercano</string>
+    <string name="session_drawer_scale_linear">Lineal</string>
+    <string name="session_drawer_scale_bicubic">Bicúbico</string>
+    <string name="session_drawer_saturation">Saturación</string>
+    <string name="session_drawer_temperature">Temperatura</string>
+    <string name="session_drawer_tint">Tono</string>
+    <string name="session_drawer_sharpen">Nitidez</string>
+    <string name="session_drawer_scanlines">Líneas de escaneo</string>
+    <string name="session_drawer_pixelate">Pixelar</string>
+    <string name="session_drawer_block_size">Tamaño de bloque</string>
+    <string name="session_drawer_strength">Fuerza</string>
+    <string name="session_drawer_intensity">Intensidad</string>
+    <string name="session_drawer_color_blind">Daltonismo</string>
+    <string name="session_drawer_color_blind_protan">Protán</string>
+    <string name="session_drawer_color_blind_deutan">Deután</string>
+    <string name="session_drawer_color_blind_tritan">Tritán</string>
+    <string name="session_drawer_reset_effects">Restablecer efectos</string>
+    <string name="session_drawer_calibrate_advanced">Calibración avanzada</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Giro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Salida</string>
+    <string name="session_drawer_rail_label_apps">Más</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">Pantalla externa detectada</string>
+    <string name="display_output_prompt_message">¿Enviar el juego a la pantalla conectada? Tus controles en pantalla y el menú permanecen en este teléfono.</string>
+    <string name="display_output_prompt_swap">Intercambiar pantallas</string>
+    <string name="display_output_prompt_mirror">Duplicar</string>
+    <string name="display_output_swapped_toast">El juego se movió a la pantalla externa. Los controles permanecen en tu teléfono.</string>
+    <string name="display_output_cast_unavailable">Los ajustes de pantalla inalámbrica no están disponibles en este dispositivo.</string>
+    <string name="display_output_restored_toast">Pantalla externa desconectada: el juego regresó al teléfono.</string>
+    <string name="session_drawer_output_title">Salida de pantalla</string>
+    <string name="session_drawer_output_subtitle">El juego se muestra en la pantalla externa.</string>
+    <string name="session_drawer_output_device">Pantalla conectada</string>
+    <string name="session_drawer_output_resolution">Resolución</string>
+    <string name="session_drawer_output_refresh_rate">Frecuencia de actualización</string>
+    <string name="session_drawer_output_aspect_ratio">Relación de aspecto</string>
+    <string name="session_drawer_output_aspect_fit">Ajustar (Aspecto)</string>
+    <string name="session_drawer_output_aspect_stretch">Estirar (Rellenar)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (Recortar)</string>
+    <string name="session_drawer_output_return_to_phone">Volver al teléfono</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Transmitir a un televisor</string>
+    <string name="session_drawer_output_cast_body">Conecta un adaptador USB-C / HDMI, o toca abajo para conectar una pantalla inalámbrica (Miracast / Wi-Fi Direct). El juego se muestra en el televisor mientras estos controles permanecen en tu teléfono.</string>
+    <string name="session_drawer_output_cast_button">Conectar pantalla inalámbrica</string>
+    <string name="session_drawer_output_cast_note">Los televisores solo con Chromecast no pueden mostrar juego en vivo con controles privados: usa una pantalla inalámbrica o un adaptador USB‑C/HDMI para el mejor resultado.</string>
+    <string name="session_drawer_output_render_note">Los modos que informa tu pantalla cambian su salida real (puede ponerse en negro brevemente mientras se reinicializa). Otras resoluciones se renderizan a ese tamaño y se escalan por hardware al panel: mayor que la nativa mejora la nitidez (supermuestreo), menor corre más rápido.</string>
+    <string name="session_drawer_output_scaling_note">Este teléfono envía la pantalla a su %1$s nativo y no cambiará su modo, así que esto define la resolución de renderizado: se escala por hardware al panel (mayor que la nativa mejora la nitidez, menor corre más rápido).</string>
+    <string name="session_drawer_output_game_mode">Modo de juego (baja latencia)</string>
+    <string name="session_drawer_output_game_mode_on">Activado</string>
+    <string name="session_drawer_output_game_mode_off">Desactivado</string>
+    <string name="session_drawer_output_game_mode_note">Solicita el modo de juego / baja latencia del televisor (HDMI ALLM) para minimizar el retardo de entrada. Se muestra solo cuando la pantalla conectada lo admite.</string>
+    <string name="session_drawer_output_send_to_display">Enviar juego a la pantalla</string>
+    <string name="session_drawer_output_to_display">Salida a pantalla externa</string>
+    <string name="session_drawer_output_send_note">Hay una pantalla conectada. Envía el juego a ella: tus controles y el menú permanecen en este teléfono. Puedes devolverlo aquí en cualquier momento.</string>
+    <string name="session_drawer_output_display">Pantalla</string>
+    <string name="session_drawer_output_glasses">Lentes</string>
+    <string name="session_drawer_output_brightness">Brillo</string>
+    <string name="session_drawer_output_shade">Sombra (atenuación)</string>
+    <string name="session_drawer_output_3d">3D (lado a lado)</string>
+    <string name="glasses_panel_refresh">Frecuencia de actualización</string>
+    <string name="glasses_panel_sunblock">Bloqueo solar</string>
+    <string name="session_drawer_output_volume">Volumen</string>
+    <string name="session_drawer_output_glasses_note">Se envía directamente a tus lentes Viture por USB.</string>
+    <string name="session_drawer_rail_label_keyboard">Teclado</string>
+    <string name="session_drawer_rail_label_input_controls">Controles</string>
+    <string name="session_drawer_rail_label_relative_mouse">MouseRel</string>
+    <string name="session_drawer_rail_label_mouse">Mouse</string>
+    <string name="session_drawer_rail_label_fullscreen">Pantalla completa</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Zoom</string>
+    <string name="session_drawer_rail_label_task_manager">Tareas</string>
+    <string name="session_drawer_rail_label_record">Grabar</string>
+    <string name="session_drawer_rail_label_logs">Registros</string>
+    <string name="session_record_started">Grabación iniciada</string>
+    <string name="session_record_saved">Grabación guardada en WinNative/Recordings</string>
+    <string name="session_record_failed">No se pudo iniciar la grabación</string>
+    <string name="session_record_settings_title">Ajustes de grabación</string>
+    <string name="session_record_fps">Velocidad de fotogramas</string>
+    <string name="session_record_resolution">Resolución</string>
+    <string name="session_record_quality">Calidad</string>
+    <string name="session_record_include_ui">Grabar interfaz</string>
+    <string name="session_record_include_ui_subtitle">Incluir HUD y controles en pantalla</string>
+    <string name="session_record_now">Grabar ahora</string>
+    <string name="session_drawer_logs_clear">Borrar</string>
+    <string name="session_drawer_logs_pause">Pausar</string>
+    <string name="session_drawer_logs_resume">Reanudar</string>
+    <string name="session_drawer_logs_paused_indicator">En pausa</string>
+    <string name="session_drawer_logs_line_count">%1$d líneas</string>
+    <string name="session_drawer_logs_share">Compartir</string>
+    <string name="session_drawer_logs_share_subject">Registros de sesión</string>
+    <string name="session_drawer_logs_share_chooser">Compartir registros de sesión</string>
+    <string name="session_drawer_logs_share_failed">No se pudieron compartir los registros</string>
+    <string name="session_drawer_logs_share_empty">No hay líneas de registro para compartir</string>
+    <string name="session_gyroscope_activator">Activador</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">¿Quieres finalizar este proceso?</string>
+    <string name="session_task_title">Administrador de tareas</string>
+    <string name="session_task_process_name">Nombre del proceso</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">Memoria</string>
+    <string name="session_task_end_process">Finalizar proceso</string>
+    <string name="session_task_set_affinity">Establecer afinidad</string>
+    <string name="session_task_affinity_title">Afinidad del procesador</string>
+    <string name="session_task_affinity_all_cores">Todos los núcleos</string>
+    <string name="session_task_new_task">Nueva tarea</string>
+    <string name="session_task_bring_to_front">Traer al frente</string>
+    <string name="session_task_custom_value">Valor personalizado</string>
+    <string name="session_task_processes">Procesos</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">Uso por núcleo</string>
+    <string name="session_task_core_label">Núcleo %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d núcleo</item>
+        <item quantity="other">%d núcleos</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Orientación</string>
+    <string name="session_display_horizontal">Horizontal</string>
+    <string name="session_display_vertical">Vertical</string>
+    <string name="session_display_columns">Columnas</string>
+    <string name="session_display_frame_rate">Velocidad de fotogramas</string>
+    <string name="session_display_title">Pantalla</string>
+    <string name="session_display_fullscreen_stretched">Activar pantalla completa (estirada)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Renderizador:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB usados / %2$s total</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">¿Quieres quitar este control?</string>
+    <string name="session_gamepad_external_controllers">Controles externos</string>
+    <string name="session_gamepad_press_any_button">Presiona cualquier botón de tu control</string>
+    <string name="session_gamepad_bindings">asignaciones</string>
+    <string name="session_gamepad_control_bindings">Asignaciones de controles</string>
+    <string name="session_gamepad_game_controller">Control de juego</string>
+    <string name="session_gamepad_as_button">Es botón</string>
+    <string name="session_gamepad_as_axis">Es eje</string>
+    <string name="session_gamepad_trigger_type">Tipo</string>
+    <string name="session_gamepad_help_trigger_mode">Depende de tu &lt;b&gt;control físico&lt;/b&gt;:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;Es eje&lt;/b&gt; — el gatillo tiene un rango de movimiento lineal&lt;br/&gt;&#x2022; &lt;b&gt;Es botón&lt;/b&gt; — el gatillo actúa como un interruptor simple&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Nota: usar Es botón con un gatillo lineal pierde los datos analógicos.&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">Botón A</string>
+    <string name="session_gamepad_button_b">Botón B</string>
+    <string name="session_gamepad_button_x">Botón X</string>
+    <string name="session_gamepad_button_y">Botón Y</string>
+    <string name="session_gamepad_button_grip">Botón de agarre</string>
+    <string name="session_gamepad_button_trigger">Botón de gatillo</string>
+    <string name="session_gamepad_thumbstick_left">Palanca izquierda</string>
+    <string name="session_gamepad_thumbstick_right">Palanca derecha</string>
+    <string name="session_gamepad_thumbstick_up">Palanca arriba</string>
+    <string name="session_gamepad_thumbstick_down">Palanca abajo</string>
+    <string name="session_gamepad_configure_analog_sticks">Configurar palancas analógicas</string>
+    <string name="session_gamepad_left_stick">Palanca izquierda</string>
+    <string name="session_gamepad_right_stick">Palanca derecha</string>
+    <string name="session_gamepad_controller_manager">Administrador de controles</string>
+    <string name="session_gamepad_enable_vibration">Activar vibración</string>
+    <string name="session_gamepad_player_1">Jugador 1</string>
+    <string name="session_gamepad_player_2">Jugador 2</string>
+    <string name="session_gamepad_player_3">Jugador 3</string>
+    <string name="session_gamepad_player_4">Jugador 4</string>
+    <string name="session_gamepad_not_assigned">Sin asignar</string>
+    <string name="session_gamepad_assign">Asignar</string>
+    <string name="session_gamepad_press_any_button_for_player">Presiona cualquier botón en el control para</string>
+    <string name="session_gamepad_vibrate">Vibración</string>
+    <string name="session_gamepad_macros_hint">Alterna botones para activar el disparo automático.</string>
+    <string name="session_gamepad_macros">Macros</string>
+    <string name="session_gamepad_include_triggers_note">Aplicar también turbo a L2/R2 como pulsaciones digitales</string>
+    <string name="session_gamepad_square_deadzone">Zona muerta cuadrada</string>
+    <string name="session_gamepad_invert_x">Invertir X</string>
+    <string name="session_gamepad_invert_y">Invertir Y</string>
+    <string name="session_gamepad_save_profile">Guardar perfil</string>
+    <string name="session_gamepad_load_profile">Cargar perfil</string>
+    <string name="session_gamepad_button_start">Botón Start</string>
+    <string name="session_gamepad_button_select">Botón Select</string>
+    <string name="session_gamepad_button_l1">Botón L1</string>
+    <string name="session_gamepad_button_r1">Botón R1</string>
+    <string name="session_gamepad_button_l2">Botón L2</string>
+    <string name="session_gamepad_button_r2">Botón R2</string>
+    <string name="session_gamepad_button_l3">Botón L3</string>
+    <string name="session_gamepad_button_r3">Botón R3</string>
+    <string name="session_gamepad_dpad_up">Cruceta arriba</string>
+    <string name="session_gamepad_dpad_down">Cruceta abajo</string>
+    <string name="session_gamepad_dpad_left">Cruceta izquierda</string>
+    <string name="session_gamepad_dpad_right">Cruceta derecha</string>
+    <string name="session_gamepad_overwrite">Sobrescribir</string>
+    <string name="session_gamepad_save_as_new">Guardar como nuevo</string>
+    <string name="session_gamepad_overwrite_profile_message">¿Quieres sobrescribir el perfil actual o guardarlo como un perfil nuevo?</string>
+    <string name="session_gamepad_enter_profile_name">Ingresa el nombre del perfil</string>
+    <string name="session_gamepad_mappings_saved">¡Asignaciones guardadas!</string>
+    <string name="session_gamepad_profile_saved">¡Perfil guardado!</string>
+    <string name="session_gamepad_profile_saved_as_new">¡Perfil guardado como nuevo!</string>
+    <string name="session_gamepad_profile_loaded">¡Perfil cargado!</string>
+    <string name="session_gamepad_profile_name_empty">El nombre del perfil no puede estar vacío</string>
+    <string name="session_gamepad_no_profiles">-- Sin perfiles --</string>
+    <string name="session_gamepad_error_loading_profile">Error al cargar el perfil</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Controles táctiles</string>
+    <string name="input_controls_auto_hide_on_controller_title">Ocultar automáticamente con el control</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Oculta los controles táctiles cuando hay un control conectado</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">Giroscopio</string>
+    <string name="session_gyroscope_calibrate">Calibrar giroscopio</string>
+    <string name="session_gyroscope_enable_right_stick">Activar movimiento giroscópico de la palanca derecha</string>
+    <string name="session_gyroscope_activator_button">Botón de activación del giroscopio</string>
+    <string name="session_gyroscope_hold">Mantener</string>
+    <string name="session_gyroscope_toggle">Alternar</string>
+    <string name="session_gyroscope_orientation_mode">Inclinar para apuntar (orientación)</string>
+    <string name="session_gyroscope_x_sensitivity">Sensibilidad del eje X</string>
+    <string name="session_gyroscope_y_sensitivity">Sensibilidad del eje Y</string>
+    <string name="session_gyroscope_smoothing">Suavizado</string>
+    <string name="session_gyroscope_invert_x">Invertir eje X</string>
+    <string name="session_gyroscope_invert_y">Invertir eje Y</string>
+    <string name="session_gyroscope_filtering">Filtrado</string>
+    <string name="session_gyroscope_deadzone">Zona muerta</string>
+    <string name="session_gyroscope_sensitivity">Sensibilidad</string>
+    <string name="session_gyroscope_direction">Dirección</string>
+    <string name="session_gyroscope_mode">Modo de activación del giroscopio</string>
+    <string name="session_gyroscope_target_stick">Aplicar giro a</string>
+    <string name="session_gyroscope_enable_stick">Activar movimiento giroscópico de la palanca analógica</string>
+    <string name="session_gyroscope_reset_stick">Restablecer palanca</string>
+    <string name="session_gyroscope_reset_stick_to_center">Restablecer palanca al centro</string>
+    <string name="session_gyroscope_configuration">Configuración del giroscopio</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Movimiento de mouse experimental</string>
+    <string name="session_gyroscope_x_sensitivity_format">Sensibilidad X: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Sensibilidad Y: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Suavizado: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Zona muerta: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Sensibilidad: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Escala del mouse</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Escala del mouse: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">Velocidad del cursor</string>
+    <string name="settings_general_theme">Tema</string>
+    <string name="settings_general_background">Fondo</string>
+    <string name="settings_general_background_color_hex">Color (hex)</string>
+    <string name="settings_general_wallpaper_selected">Fondo de pantalla seleccionado</string>
+    <string name="settings_general_select_wallpaper">Seleccionar fondo de pantalla</string>
+    <string name="settings_general_title">General</string>
+    <string name="settings_general_enable_file_provider">Activar proveedor de archivos</string>
+    <string name="settings_general_enable_auto_scraping">Activar obtención automática de arte</string>
+    <string name="settings_general_take_effect_next_startup">Esta opción tendrá efecto en el próximo inicio.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Reinstalar Imagefs</string>
+    <string name="settings_general_confirm_reinstall_imagefs">¿Quieres reinstalar imagefs? Esta operación restaurará los archivos del sistema, tus contenedores no se modificarán.</string>
+    <string name="settings_general_refresh_rate">Frecuencia de actualización</string>
+    <string name="settings_general_refresh_rate_auto_max">Máx</string>
+    <string name="settings_general_refresh_rate_summary">Define la frecuencia de actualización de la pantalla y el límite de fotogramas de DXVK</string>
+    <string name="settings_general_touchscreen_timeout">Tiempo de espera de la pantalla táctil (requiere reinicio)</string>
+    <string name="settings_general_touchscreen_haptics">Activar respuesta háptica de la pantalla táctil</string>
+    <string name="settings_general_open_with_android_browser">Abrir el navegador de Android en Wine</string>
+    <string name="settings_general_share_android_clipboard">Compartir el portapapeles de Android con Wine</string>
+    <string name="settings_general_paths_title">Ajustes de rutas</string>
+    <string name="settings_general_paths_summary">Administra dónde Winlator guarda sus datos de trabajo y dónde se escriben los accesos directos exportados.</string>
+    <string name="settings_general_winlator_path_title">Ruta de almacenamiento</string>
+    <string name="settings_general_shortcut_export_path_title">Ruta de exportación de accesos directos</string>
+    <string name="settings_general_choose_path">Elegir ruta</string>
+    <string name="settings_general_xserver_cursor_summary">Ajusta la velocidad del puntero para la entrada táctil, del trackpad y del mouse dentro de la sesión de XServer.</string>
+    <string name="settings_general_cursor_lock_title">Control real del mouse</string>
+    <string name="settings_general_cursor_lock_summary">Mantiene activada la captura directa del mouse para juegos que necesitan entrada de puntero sin procesar. Desactívalo con Bajar volumen.</string>
+    <string name="settings_general_xinput_toggle_title">Desactivar XInput</string>
+    <string name="settings_general_xinput_toggle_summary">Desactiva el manejo de XInput cuando quieres control exclusivo del mouse y el teclado.</string>
+    <string name="settings_external_display_output_summary">Mueve el juego a una pantalla externa conectada en lugar de duplicar esta pantalla. Los lentes siempre usan su propia pantalla.</string>
+    <string name="settings_general_file_provider_summary">Expone los archivos de WinNative a los selectores de documentos y administradores de archivos de Android.</string>
+    <string name="settings_general_auto_scraping_summary">Permite que WinNative obtenga automáticamente el arte de juegos personalizados.</string>
+    <string name="settings_general_open_browser_summary">Abre los enlaces web compatibles en el navegador de Android en lugar de dentro de Wine.</string>
+    <string name="settings_general_clipboard_summary">Permite copiar y pegar entre las sesiones de Android y Wine.</string>
+    <string name="settings_general_imagefs_summary">Restaura los archivos del sistema incluidos sin eliminar tus contenedores existentes.</string>
+    <string name="settings_general_check_for_updates">Buscar actualizaciones</string>
+    <string name="settings_general_check_for_updates_summary">Busca automáticamente nuevas versiones de la app al iniciar y de forma periódica.</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">SoundFont MIDI</string>
+    <string name="settings_audio_sound">Sonido</string>
+    <string name="settings_audio_confirm_remove_sound_font">¿Deseas eliminar este soundfont?</string>
+    <string name="settings_audio_sound_font_removed_success">¡Soundfont eliminado correctamente!</string>
+    <string name="settings_audio_sound_font_removed_failed">¡Error al eliminar el soundfont!</string>
+    <string name="settings_audio_sound_font_installed_success">¡Soundfont instalado correctamente!</string>
+    <string name="settings_audio_sound_font_installed_failed">¡Error al instalar el soundfont!</string>
+    <string name="settings_audio_sound_font_already_exist">El soundfont que quieres instalar ya existe.</string>
+    <string name="settings_audio_unable_to_install_soundfont">No se pudo instalar el soundfont</string>
+    <string name="settings_audio_installing_soundfont">Instalando SoundFont</string>
+    <string name="settings_audio_sound_font_bad_format">Formato de SoundFont incorrecto.</string>
+    <string name="settings_audio_cannot_remove_default">No se puede eliminar el soundfont predeterminado</string>
+    <string name="settings_audio_summary">Instala, elimina y elige el SoundFont usado para la reproducción MIDI.</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Canal de depuración de Wine</string>
+    <string name="settings_debug_title">Depuración</string>
+    <string name="settings_debug_wine_logs_title">Habilitar registros de depuración de Wine</string>
+    <string name="settings_debug_wine_logs_subtitle">Escribir la salida de depuración de Wine en un archivo</string>
+    <string name="settings_debug_box_logs_title">Habilitar registros de Box86/64</string>
+    <string name="settings_debug_box_logs_subtitle">Escribir la salida de depuración de Box86 &amp; Box64 en un archivo</string>
+    <string name="settings_debug_fex_logs_title">Habilitar registros de FEXCore</string>
+    <string name="settings_debug_fex_logs_subtitle">Escribir la salida de depuración de FEXCore en un archivo</string>
+    <string name="settings_debug_emulator_logs_title">Registros de emulación de Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Registra en un archivo el emulador que use tu contenedor.</string>
+    <string name="settings_debug_steam_logs_title">Habilitar registros de Steam</string>
+    <string name="settings_debug_steam_logs_subtitle">Registra los eventos de autenticación y sesión de Steam para depuración.</string>
+    <string name="settings_debug_wine_channels_title">Canales de depuración de Wine</string>
+    <string name="settings_debug_wine_channels_summary">Elige qué canales de Wine se incluyen cuando se habilita el registro de depuración de Wine.</string>
+    <string name="settings_debug_wine_classes_title">Niveles de registro de Wine</string>
+    <string name="settings_debug_wine_classes_summary">Elige qué tipos de mensaje se registran. Trace es extremadamente detallado.</string>
+    <string name="settings_debug_input_logs">Registros de entrada</string>
+    <string name="settings_debug_input_logs_description">Registra los eventos de entrada de gamepad, toque y teclado</string>
+    <string name="settings_debug_download_logs">Registros de descarga</string>
+    <string name="settings_debug_download_logs_description">Registra los eventos del resolutor de descargas y del respaldo de WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Capas de validación de Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Reinicia la pantalla para aplicar.</string>
+    <string name="settings_debug_share_logs">Compartir registros</string>
+    <string name="settings_debug_delete_logs">Eliminar registros</string>
+    <string name="settings_debug_share_all_logs_short">Compartir todo</string>
+    <string name="settings_debug_download_all_logs_short">Descargar todo</string>
+    <string name="settings_debug_logs_saved">Guardado en %1$s</string>
+    <string name="settings_debug_delete_logs_short">Eliminar</string>
+    <string name="settings_debug_delete_all_logs_short">Eliminar todo</string>
+    <string name="settings_debug_open_logs_folder_short">Abrir administrador de registros</string>
+    <string name="settings_debug_logs_deleted">Registros eliminados</string>
+    <string name="settings_debug_delete_logs_confirm_title">¿Eliminar registros?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Esto elimina permanentemente todos los archivos de registro guardados (%1$s). Esta acción no se puede deshacer.</string>
+    <string name="settings_debug_logs_browser_title">Registros</string>
+    <string name="settings_debug_log_truncated">Mostrando los últimos %1$s de este registro</string>
+    <string name="settings_debug_logs_subject">Registros de WinNative (%1$s)</string>
+    <string name="settings_debug_no_logs_available">No hay registros de depuración disponibles. Primero habilita las opciones de depuración e inicia un juego.</string>
+    <string name="settings_debug_capture_failed">Error al capturar los registros: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">Registra en un archivo los errores, advertencias y fallos del proceso de WinNative</string>
+    <string name="settings_debug_section_emulation">Emulación</string>
+    <string name="settings_debug_section_subsystems">Subsistemas</string>
+    <string name="settings_debug_section_tools">Herramientas</string>
+    <string name="settings_debug_no_channels_selected">Ningún canal seleccionado</string>
+    <string name="settings_debug_no_channels_available">No hay canales disponibles</string>
+    <string name="settings_debug_channel_toggle_hint">Toca para activar o desactivar canales. Los canales habilitados se incluyen en la salida de depuración de Wine.</string>
+    <string name="settings_debug_remove_channel_desc">Eliminar %1$s</string>
+
+    <string name="settings_other_language_title">Idioma</string>
+    <string name="settings_other_language_summary">Elige el idioma de la interfaz</string>
+    <string name="settings_other_language_system_default">Predeterminado del sistema</string>
+    <string name="settings_other_game_language_title">Idioma del juego</string>
+    <string name="settings_other_game_language_summary">Idioma preferido para las descargas de Steam/Epic/GOG</string>
+
+    <string name="settings_other_section_integration">Integración</string>
+    <string name="settings_other_setup_wizard_title">Asistente de configuración</string>
+    <string name="settings_other_setup_wizard_summary">Abre de nuevo el asistente de configuración para revisar permisos, archivos del sistema y contenedores predeterminados.</string>
+    <string name="settings_other_checking_for_updates">Buscando actualizaciones…</string>
+    <string name="settings_other_update_check_cooldown">Espera %1$ds antes de volver a buscar</string>
+    <string name="settings_other_persistable_permission_failed">No se pudieron obtener los permisos persistentes: %1$s</string>
+    <string name="settings_other_keep_app_open">Mantén la app abierta mientras esto termina.</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">Instalar contenido</string>
+    <string name="settings_content_type">Categoría</string>
+    <string name="settings_content_components">Componentes</string>
+    <string name="settings_content_auto_create_container">Crear contenedor automáticamente</string>
+    <string name="settings_content_remove_title">¿Eliminar componente?</string>
+    <string name="settings_content_empty_subtitle">Instala un paquete o cambia de tipo para comenzar.</string>
+    <string name="settings_content_container_created">Contenedor creado: %1$s</string>
+    <string name="settings_content_download_failed">Error en la descarga.</string>
+    <string name="common_ui_working">Procesando</string>
+    <string name="settings_content_desc_wine">Creado por el proyecto Wine; traduce las llamadas Win32 a servicios nativos de Linux/Android.</string>
+    <string name="settings_content_desc_proton">Creado por Valve; un entorno de ejecución basado en Wine con parches de juegos para juegos de Windows.</string>
+    <string name="settings_content_desc_dxvk">Traduce las llamadas gráficas de Direct3D 9, 10 y 11 a Vulkan.</string>
+    <string name="settings_content_desc_vkd3d">Traduce las llamadas gráficas de Direct3D 12 a Vulkan.</string>
+    <string name="settings_content_desc_box64">Traduce el código de Linux x86_64 para que pueda ejecutarse en dispositivos ARM64.</string>
+    <string name="settings_content_desc_wowbox64">Compilación de Box64 usada por WoW64 para ejecutar apps de Windows de 32 bits dentro de Wine de 64 bits.</string>
+    <string name="settings_content_desc_fexcore">Traduce el código x86 y x86_64 para que pueda ejecutarse en dispositivos ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduce las llamadas gráficas de DirectDraw (Direct3D 7 y anteriores) a Vulkan.</string>
+    <string name="settings_content_unable_to_install">No se pudo instalar el contenido.</string>
+    <string name="settings_content_install_failed">Error en la instalación</string>
+    <string name="settings_content_file_cannot_be_recognized">No se puede reconocer el archivo.</string>
+    <string name="settings_content_profile_not_found">No se encontró el perfil en el contenido.</string>
+    <string name="settings_content_profile_cannot_be_recognized">No se puede reconocer el perfil</string>
+    <string name="settings_content_file_list">Lista de archivos</string>
+    <string name="settings_content_install_directory">Directorio de instalación</string>
+    <string name="settings_content_installed_success">¡Contenido instalado correctamente!</string>
+    <string name="settings_content_downloading_title">Descargando contenido</string>
+    <string name="settings_content_installing_title">Instalando contenido</string>
+    <string name="settings_content_extracting_title">Extrayendo contenido</string>
+    <string name="settings_content_extracting_detail">Extrayendo (%1$d archivos)</string>
+    <string name="settings_content_preparing_package">Preparando el paquete</string>
+    <string name="settings_content_download_complete">Descarga completada</string>
+    <string name="settings_content_already_installed_title">Componente ya instalado</string>
+    <string name="settings_content_already_installed_message">Este componente ya está instalado. Elimina la copia instalada antes de descargarlo de nuevo.
+
+Ruta instalada:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Contenido en conflicto instalado</string>
+    <string name="settings_content_conflicting_message">Desinstala el contenido en conflicto antes de descargar este paquete.
+
+Ruta instalada:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">No se puede confiar en el contenido.</string>
+    <string name="settings_content_is_incomplete">El contenido está incompleto.</string>
+    <string name="settings_content_untrusted_files_warning">Advertencia: El contenido adicional contiene archivos no confiables. Por lo general, los siguientes archivos no deberían modificarse. Decide si deseas continuar con la instalación.</string>
+    <string name="settings_content_confirm_remove">Esto eliminará el componente de tu dispositivo.</string>
+    <string name="settings_content_unable_to_remove_in_use">No se puede eliminar este contenido, porque un contenedor está usando este Wine actualmente.</string>
+    <string name="settings_content_download_in_components">Ninguno descargado. Descarga uno en Componentes.</string>
+    <string name="settings_content_types_header">TIPOS DE CONTENIDO</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Controladores</string>
+    <string name="settings_drivers_manager_header">Administrador de controladores</string>
+    <string name="settings_drivers_github_repos">Repositorios de GitHub</string>
+    <string name="settings_drivers_install">Instalar controladores</string>
+    <string name="settings_drivers_installed_success">Controlador instalado correctamente.</string>
+    <string name="settings_drivers_install_failed">Error al instalar el controlador.</string>
+    <string name="settings_drivers_remove_title">¿Eliminar controlador?</string>
+    <string name="settings_drivers_confirm_remove">Esto eliminará el controlador de tu dispositivo.</string>
+    <string name="settings_drivers_remove_repo_title">¿Eliminar repositorio?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s se eliminará de tu lista de repositorios.</string>
+    <string name="settings_drivers_repo_tap_to_load">Toca para cargar las versiones</string>
+    <string name="settings_drivers_repo_loading_releases">Cargando versiones</string>
+    <string name="settings_drivers_repo_release_count">%1$d versiones cargadas</string>
+    <string name="settings_drivers_repo_no_release_assets">No se encontraron recursos ZIP descargables en las versiones obtenidas.</string>
+    <string name="settings_drivers_repo_fetch_failed">No se pudieron cargar las versiones de GitHub.</string>
+    <string name="settings_drivers_repo_download_failed">Error en la descarga.</string>
+    <string name="settings_drivers_repo_no_version">Versión no disponible</string>
+    <string name="settings_drivers_repo_unknown_size">Tamaño desconocido</string>
+    <string name="settings_drivers_manager">Administrador de controladores</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">Instalando archivos del sistema</string>
+    <string name="setup_wizard_unable_to_install_system_files">No se pudieron instalar los archivos del sistema</string>
+    <string name="setup_wizard_system_image_not_installed">Imagen del sistema no instalada. Primero instala los componentes.</string>
+    <string name="setup_wizard_recommended_components">Componentes recomendados</string>
+    <string name="setup_wizard_step_format">Paso %1$d de %2$d</string>
+    <string name="setup_wizard_allow_file_access">Permitir acceso a todos los archivos</string>
+    <string name="setup_wizard_install_system_files">Instalar archivos del sistema</string>
+    <string name="setup_wizard_recommended_components_description">Componentes recomendados descarga e instala automáticamente los paquetes compatibles de DXVK, VKD3D, FEX, Box64 y Wowbox64.</string>
+    <string name="setup_wizard_each_button_downloads_description">Cada botón descarga el paquete, lo instala y crea su contenedor predeterminado automáticamente.</string>
+    <string name="setup_wizard_recommended_x86_64">x86-64 recomendado</string>
+    <string name="setup_wizard_recommended_arm64ec">ARM64EC recomendado</string>
+    <string name="setup_wizard_choose_components_description">Elige qué componentes instalar. Wine/Proton creará un contenedor automáticamente.</string>
+    <string name="setup_wizard_loading_components">Cargando componentes…</string>
+    <string name="setup_wizard_no_components_available">No hay componentes disponibles para esta categoría.</string>
+    <string name="setup_wizard_default_settings">Configuración predeterminada</string>
+    <string name="setup_wizard_containers">Configuración de contenedores</string>
+    <string name="setup_wizard_containers_description">Abre cada contenedor y establece los valores predeterminados que quieres que herede cada juego nuevo. Los juegos nuevos usarán el contenedor x86-64 de forma predeterminada.</string>
+    <string name="setup_wizard_store_sign_in_optional">Iniciar sesión en la tienda es opcional. Cada inicio de sesión regresa aquí cuando termina.</string>
+    <string name="setup_wizard_granted">Concedido</string>
+    <string name="setup_wizard_grant">Conceder</string>
+    <string name="setup_wizard_denied">Denegado</string>
+    <string name="setup_wizard_allow">Permitir</string>
+    <string name="setup_wizard_installing">Instalando</string>
+    <string name="setup_wizard_install_failed_reason">Error en la instalación: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Acceso requerido</string>
+    <string name="setup_wizard_select_components">Seleccionar componentes</string>
+    <string name="setup_wizard_recommended_wine_proton">Wine / Proton recomendado</string>
+    <string name="setup_wizard_advanced_setup">Configuración avanzada</string>
+    <string name="setup_wizard_title">Asistente de configuración</string>
+    <string name="setup_wizard_advanced_user">Usuario avanzado</string>
+    <string name="setup_wizard_next">Siguiente</string>
+    <string name="setup_wizard_finish">Finalizar</string>
+    <string name="setup_wizard_download_and_install">Descargar + Instalar</string>
+    <string name="setup_wizard_open_drivers">Abrir controladores</string>
+    <string name="setup_wizard_ready">Listo</string>
+    <string name="setup_wizard_download_and_create">Descargar + Crear</string>
+    <string name="setup_wizard_configured">Configurado</string>
+    <string name="setup_wizard_downloading">Descargando %1$s</string>
+    <string name="setup_wizard_installing_package">Instalando %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">Aún no hay paquetes de Wine o Proton instalados.</string>
+    <string name="setup_wizard_no_runtime_hint">Instala un paquete de Wine o Proton del paso anterior, o omite esto por ahora.</string>
+    <string name="setup_wizard_recommended_label">Recomendado</string>
+    <string name="setup_wizard_install_all_recommended">Instalar todos los recomendados</string>
+    <string name="setup_wizard_create_container">Crear contenedor</string>
+    <string name="setup_wizard_creating_container">Creando…</string>
+
+    <string name="input_controls_tap_to_click">Toca para hacer clic</string>
+    <string name="input_controls_reverse_binding_order">Invertir orden de asignaciones</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Autorización</string>
+    <string name="steam_login_sign_in_to_your_account">Inicia sesión en tu cuenta</string>
+    <string name="steam_login_username">Nombre de usuario</string>
+    <string name="steam_login_password">Contraseña</string>
+    <string name="steam_login_invalid_username_or_password">Nombre de usuario o contraseña no válidos</string>
+    <string name="steam_login_remember_me">Recordarme</string>
+    <string name="steam_login_sign_in_with_qr_code">Iniciar sesión con código QR</string>
+    <string name="steam_login_open_steam_app_qr_hint">Abre la app de Steam → toca el icono QR</string>
+    <string name="steam_login_failed_to_load_qr_code">Error al cargar el código QR</string>
+    <string name="steam_login_retry">Reintentar</string>
+    <string name="steam_login_generating_code">Generando código…</string>
+    <string name="steam_login_two_factor_auth">Autenticación en dos pasos</string>
+    <string name="steam_login_approve_login_steam_app">Aprueba este inicio de sesión desde\ntu app móvil de Steam</string>
+    <string name="steam_login_enter_code_sent_to">Ingresa el código enviado a\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">Ingresa tu código de Steam Guard</string>
+    <string name="steam_login_code">Código</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Sincronización en la nube</string>
+    <string name="google_cloud_sync_started">Sincronización en la nube iniciada.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Servicios de Google</string>
+    <string name="google_auto_signin_title">Iniciar sesión en Google al arrancar</string>
+    <string name="google_auto_signin_summary">Se conecta automáticamente a Google Play Games cuando la app inicia, para que los respaldos de partidas y la sincronización estén siempre listos. Cuando está desactivado, la app nunca inicia sesión por su cuenta.</string>
+    <string name="google_auto_signin_section">Al arrancar</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">Sincronizando</string>
+    <string name="google_cloud_status_connected">Conectado</string>
+    <string name="google_cloud_status_not_signed_in">Sin sesión iniciada</string>
+    <string name="google_cloud_working">Procesando…</string>
+    <string name="google_cloud_sign_in">Iniciar sesión</string>
+    <string name="google_cloud_disable_sync">Desactivar sincronización</string>
+    <string name="google_cloud_store_logins">Inicios de sesión de tiendas</string>
+    <string name="google_cloud_store_login_sync_busy">Trabajando en la sincronización de tus inicios de sesión de tiendas…</string>
+    <string name="google_cloud_saved_games_unavailable">Partidas guardadas de Google no disponibles</string>
+    <string name="google_cloud_snapshot_ready">Instantánea en la nube lista</string>
+    <string name="google_cloud_waiting_first_backup">Esperando el primer respaldo</string>
+    <string name="google_cloud_no_store_logins_detected">No se detectaron inicios de sesión de tiendas</string>
+    <string name="google_cloud_last_synced">Última sincronización %1$s</string>
+    <string name="google_cloud_backup">Respaldar</string>
+    <string name="google_cloud_restore">Restaurar</string>
+    <string name="google_cloud_sign_in_to_sync">Inicia sesión en Google Play Games para sincronizar los inicios de sesión de tiendas.</string>
+    <string name="google_cloud_sign_in_failed">Error al iniciar sesión en Google Play Games.</string>
+    <string name="google_cloud_sign_in_finishing">El inicio de sesión de Google Play Games aún está terminando. Espera un momento e intenta la sincronización en la nube de nuevo.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games conectado. La restauración está disponible para %1$s.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games conectado. Toca Respaldar para guardar los inicios de sesión de %1$s.</string>
+    <string name="google_cloud_connected_ready">Google Play Games conectado. Respaldar y Restaurar están listos.</string>
+    <string name="google_cloud_sync_disabled">Sincronización de Google Play Games desactivada para esta app.</string>
+    <string name="google_cloud_sign_in_first">Primero inicia sesión en Google Play Games.</string>
+    <string name="google_cloud_no_saved_logins_found">No se encontraron inicios de sesión de tiendas guardados en la sincronización en la nube de Google.</string>
+    <string name="google_cloud_backup_already_matches">El respaldo en la nube ya coincide con los inicios de sesión de tiendas actuales.</string>
+    <string name="google_cloud_no_local_logins">No hay inicios de sesión de tiendas locales disponibles para respaldar.</string>
+    <string name="google_cloud_logins_restored_and_synced">Inicios de sesión de tiendas restaurados y sincronizados para %1$s.</string>
+    <string name="google_cloud_logins_restored">Inicios de sesión de tiendas restaurados para %1$s.</string>
+    <string name="google_cloud_logins_backed_up">Inicios de sesión de tiendas respaldados para %1$s.</string>
+    <string name="google_cloud_sync_ready">La sincronización de inicios de sesión de tiendas está lista.</string>
+    <string name="google_cloud_no_logins_to_sync">Aún no hay inicios de sesión de tiendas disponibles para sincronizar.</string>
+    <string name="google_cloud_sign_in_to_backup">Inicia sesión para respaldar los tokens de inicio de sesión de %1$s.</string>
+    <string name="google_cloud_no_backed_up_logins">Aún no se encontraron inicios de sesión de tiendas respaldados.</string>
+    <string name="google_cloud_local_cloud_differ">Los inicios de sesión de tiendas locales y en la nube difieren. Usa Respaldar para sobrescribir los datos de la nube o Restaurar para traer los tokens guardados.</string>
+    <string name="google_cloud_local_ready_to_backup">Los inicios de sesión de tiendas locales están listos para respaldar para %1$s.</string>
+    <string name="google_cloud_backup_ready">El respaldo del inicio de sesión de la tienda está listo.</string>
+    <string name="google_cloud_restore_available">La restauración del inicio de sesión en la nube está disponible para %1$s.</string>
+    <string name="google_cloud_logins_synced">Los inicios de sesión de tiendas están sincronizados con Google Play Games.</string>
+    <string name="google_cloud_sync_problem">La sincronización del inicio de sesión de la tienda tuvo un problema.</string>
+    <string name="google_cloud_error_auth_needed">Google Play Games necesita terminar la autenticación antes de que la sincronización en la nube pueda acceder a las Partidas guardadas. Abre el aviso del perfil de Play Games si aparece y vuelve a intentarlo.</string>
+    <string name="google_cloud_error_developer">Las Partidas guardadas de Google Play Games rechazaron esta compilación. Revisa el ID de la app de Play Games, el nombre del paquete vinculado y el certificado de firma en Play Console.</string>
+    <string name="google_cloud_error_build_rejected">La cuenta de Google está conectada, pero las Partidas guardadas de Google Play Games rechazaron esta compilación. Revisa el ID de la app de Play Games, el paquete vinculado y el certificado de firma.</string>
+    <string name="google_cloud_error_network">La sincronización en la nube de Google falló porque la solicitud de red no se completó o los servicios de Google Play necesitan atención.</string>
+    <string name="google_cloud_error_no_snapshot">Aún no se encontraron inicios de sesión de tiendas guardados en la sincronización en la nube de Google.</string>
+    <string name="google_cloud_error_generic">La sincronización en la nube de Google falló: %1$s</string>
+    <string name="google_cloud_error_before_open">La sincronización en la nube de Google falló antes de que se pudieran abrir las Partidas guardadas de Google.</string>
+    <string name="cloud_saves_title">Guardados en la nube</string>
+    <string name="cloud_saves_title_for_provider">Guardados en la nube de %1$s - %2$s</string>
+    <string name="cloud_saves_sync_summary">Traer la versión que %1$s tiene ahora mismo.</string>
+    <string name="cloud_saves_sync_summary_generic">Traer la versión actual de la nube.</string>
+    <string name="cloud_saves_no_backups">Aún no hay respaldos para este juego.</string>
+    <string name="cloud_sync_title">Guardados en la nube</string>
+    <string name="cloud_sync_disable_title">Desactivar guardados en la nube</string>
+    <string name="cloud_saves_steam_push_label">Enviar a Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forzar la subida del guardado local</string>
+    <string name="cloud_saves_steam_push_success">Guardado enviado a Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">No se pudo enviar el guardado a Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud no está disponible en este momento. Reconectando en segundo plano; toca actualizar cuando vuelvas a estar en línea.</string>
+    <string name="steam_session_refused_event">Steam rechazó la sesión en caché (EResult=%1$d). Vuelve a iniciar sesión.</string>
+    <string name="cloud_sync_enabled_summary">Descargar al iniciar, enviar al salir.</string>
+    <string name="cloud_sync_disabled_summary">Iniciar sin descarga de guardado en la nube ni sincronización al salir.</string>
+    <string name="cloud_saves_offline_mode">Desactivar sincronización en la nube</string>
+    <string name="cloud_saves_offline_mode_summary">Detiene toda la actividad automática en la nube para este juego.</string>
+    <string name="cloud_saves_backing_up">Respaldando guardado en la nube…</string>
+    <string name="cloud_saves_restoring">Restaurando guardado en la nube…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">Sincronizar desde la nube de %1$s</string>
+    <string name="cloud_saves_sync_from_provider_generic">Sincronizar desde la nube</string>
+    <string name="cloud_saves_syncing_from_provider">Descargando guardado desde %1$s…</string>
+    <string name="cloud_saves_sync_from_provider_success">Guardado en la nube de %1$s descargado.</string>
+    <string name="cloud_saves_sync_from_provider_failed">No se pudo descargar el guardado desde %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Administrar guardados en la nube de GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Abre el sitio web oficial de GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">No hay navegador disponible para abrir la página de guardados en la nube de GOG</string>
+    <string name="cloud_saves_gog_zip_label">Descargar Zip de la nube de GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Guardar los archivos actuales de la nube</string>
+    <string name="cloud_saves_gog_zip_success">Zip de guardados en la nube de GOG guardado.</string>
+    <string name="cloud_saves_gog_zip_failed">No se pudo guardar el zip de guardados en la nube de GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">No se encontraron archivos de guardado en la nube de GOG.</string>
+    <string name="cloud_saves_google_backup_label">Respaldar en Google</string>
+    <string name="cloud_saves_google_backup_helper">Guardar una copia en Google Play Games</string>
+    <string name="cloud_saves_google_backup_no_save">No se encontraron archivos de guardado para respaldar.</string>
+    <string name="cloud_saves_history_title">Historial de guardados</string>
+    <string name="cloud_saves_history_empty">Aún no hay guardados anteriores respaldados. Los guardados reemplazados y los respaldos manuales aparecerán aquí durante 30 días.</string>
+    <string name="cloud_saves_history_loading">Cargando historial de guardados…</string>
+    <string name="cloud_saves_history_sign_in">Inicia sesión en Google para ver tu historial de guardados.</string>
+    <string name="cloud_saves_history_origin_local">local</string>
+    <string name="cloud_saves_history_origin_cloud">nube</string>
+    <string name="cloud_saves_history_origin_manual">manual</string>
+    <string name="cloud_saves_history_origin_auto">automático</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Restaurar</string>
+    <string name="cloud_saves_history_download">Descargar</string>
+    <string name="cloud_saves_history_download_success">Archivo descargado.</string>
+    <string name="cloud_saves_history_download_failed">La descarga falló.</string>
+    <string name="cloud_saves_history_cloud_readonly">Solo lectura</string>
+    <string name="cloud_saves_history_restore_confirm_title">¿Restaurar este respaldo?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Esto reemplazará tu guardado local actual con el respaldo de %1$s.</string>
+    <string name="cloud_saves_history_restore_success">Guardado restaurado desde el respaldo.</string>
+    <string name="cloud_saves_history_restore_failed">No se pudo restaurar este respaldo.</string>
+    <string name="cloud_saves_keep_replaced_backup">Conservar un respaldo del guardado reemplazado</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Si cambias de opinión, puedes restaurarlo desde el Historial de guardados.</string>
+    <string name="cloud_saves_history_refresh">Actualizar</string>
+    <string name="cloud_saves_history_rename">Cambiar nombre</string>
+    <string name="cloud_saves_history_rename_title">Nombra este respaldo</string>
+    <string name="cloud_saves_history_rename_hint">p. ej. Pelea contra jefe, Antes del final</string>
+    <string name="cloud_saves_history_rename_save">Guardar</string>
+    <string name="cloud_saves_history_rename_clear">Borrar</string>
+    <string name="cloud_saves_history_rename_success">Respaldo renombrado.</string>
+    <string name="cloud_saves_history_rename_failed">No se pudo cambiar el nombre del respaldo.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Seleccionar carpeta de guardado</string>
+    <string name="cloud_saves_custom_folder_label">Carpeta de guardado</string>
+    <string name="cloud_saves_custom_select_folder_summary">Apunta al directorio de guardado dentro del contenedor</string>
+    <string name="cloud_saves_custom_no_container">El contenedor no está disponible para este acceso directo</string>
+    <string name="cloud_saves_custom_picker_title">Seleccionar carpeta de guardado</string>
+    <string name="cloud_saves_custom_outside_drive_c">La carpeta seleccionada debe estar dentro de la unidad C: del contenedor</string>
+    <string name="cloud_saves_custom_path_map_failed">No se pudo asignar la carpeta seleccionada a una ruta de Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Carpeta de guardado establecida en %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sincronizar desde Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Descargar el guardado más reciente</string>
+    <string name="cloud_saves_steam_sync_success">Sincronizado desde Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">La sincronización con Steam Cloud falló</string>
+    <string name="cloud_saves_steam_browse_label">Ver guardados de Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Abrir almacenamiento en la nube</string>
+    <string name="cloud_saves_steam_browse_no_browser">No hay navegador disponible para abrir la página de Steam</string>
+    <string name="cloud_saves_steam_import_label">Importar archivos</string>
+    <string name="cloud_saves_steam_import_helper">Restaurar archivos descargados</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Selector de archivos no disponible</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Esto descargará los archivos de guardado actuales de Steam Cloud y sobrescribirá los archivos de guardado actuales.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID de app no válido</string>
+    <string name="cloud_saves_label_saved">Etiqueta guardada</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Guardados</string>
+    <string name="saves_import_export_confirm_selection">Confirmar selección</string>
+    <string name="saves_import_export_select_directory">Selecciona tu directorio de guardado</string>
+    <string name="saves_import_export_up_directory">Subir directorio</string>
+    <string name="saves_import_export_select_container">Contenedor de destino:</string>
+    <string name="saves_import_export_exported">Guardados exportados correctamente</string>
+    <string name="saves_import_export_exported_failed">No se pudieron exportar los guardados: %1$s</string>
+    <string name="saves_import_export_imported">Guardados importados correctamente</string>
+    <string name="saves_import_export_imported_failed">No se pudieron importar los guardados: %1$s</string>
+    <string name="saves_export_path_summary">Los guardados se exportarán a /WinNative/saves</string>
+    <string name="saves_export_success_path">Exportado a %1$s</string>
+    <string name="saves_export_warning_title">Usa esto solo con juegos personalizados</string>
+    <string name="saves_export_warning_body">La exportación puede incluir guardados de juegos instalados desde tiendas o con sincronización en la nube.</string>
+    <string name="saves_import_warning_title">Esto sobrescribirá los guardados existentes en este contenedor</string>
+    <string name="saves_import_warning_body">Al restaurar un respaldo más antiguo con varios juegos, copia primero cualquier guardado más reciente al zip con tu administrador de archivos. Solo se verán afectados los guardados existentes en el .zip. Administra los guardados con cuidado.</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Contenedor</string>
+    <string name="preloader_initializing">Inicializando</string>
+    <string name="preloader_launching">Iniciando</string>
+    <string name="preloader_closing">Cerrando %1$s</string>
+    <string name="preloader_preparing_steam_environment">Preparando el entorno de Steam</string>
+    <string name="preloader_starting_wine">Iniciando Wine</string>
+    <string name="preloader_starting_steam_launcher">Iniciando Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Cargando el cliente de Steam</string>
+    <string name="preloader_connecting_to_steam">Conectando a Steam</string>
+    <string name="preloader_signing_in_to_steam">Iniciando sesión en Steam</string>
+    <string name="preloader_fetching_game_info">Sesión iniciada — obteniendo información del juego</string>
+    <string name="preloader_steam_ready">Steam listo</string>
+    <string name="preloader_updating_game_info">Actualizando información del juego</string>
+    <string name="preloader_verifying_install">Verificando la instalación</string>
+    <string name="preloader_scanning_redists">Analizando redistribuibles</string>
+    <string name="preloader_installing_redist_single">Instalando redistribuible</string>
+    <string name="preloader_installing_named_redist">Instalando %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Instalando %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuibles listos</string>
+    <string name="preloader_no_redists">No hay redistribuibles para instalar</string>
+    <string name="preloader_steam_service_running">Servicio de Steam en ejecución</string>
+    <string name="preloader_launching_game">Iniciando %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher falló — reorganizando recursos</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher no pudo iniciar. Reorganizando — vuelve a iniciar</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher llegó al juego pero nunca se inició</string>
+    <string name="preloader_setup_environment">Configurando el entorno</string>
+    <string name="preloader_retrying_steam_client_download">Reintentando la descarga del cliente de Steam</string>
+    <string name="preloader_installing_mono">Instalando Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Instalando redistribuibles</string>
+    <string name="preloader_unpacking_exe">Descomprimiendo el ejecutable del juego</string>
+    <string name="preloader_downloading_cloud">Descargando guardados en la nube</string>
+    <string name="preloader_syncing_cloud">Sincronizando guardados en la nube</string>
+    <string name="preloader_uploading_cloud">Subiendo guardados en la nube</string>
+    <string name="preloader_checking_cloud">Comprobando guardados en la nube</string>
+    <string name="preloader_cloud_sync_retry">%1$s Reintento %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Descargando sincronización en la nube</string>
+    <string name="cloud_sync_failed_provider">La sincronización del guardado en la nube de %1$s falló.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Juego personalizado</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Registrar rendimiento en un archivo</string>
+    <string name="settings_hud_record_to_file_summary">Exporta métricas por segundo de FPS, CPU, GPU, temperatura y batería a /WinNative/logs/ durante el juego.</string>
+    <string name="settings_leaderboard_category">Rendimiento</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Cargando elementos del Workshop</string>
+    <string name="workshop_search_items">Buscar elementos del Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Obteniendo tus elementos suscritos desde Steam.</string>
+    <string name="workshop_error_title">No se pudieron cargar los elementos del Workshop</string>
+    <string name="workshop_error_subtitle">Algo salió mal. Vuelve a intentarlo.</string>
+    <string name="workshop_empty_title">No hay elementos del Workshop suscritos</string>
+    <string name="workshop_empty_subtitle">Suscríbete a elementos en el Steam Workshop y luego vuelve a abrir esta ventana.</string>
+    <string name="workshop_search_empty_title">Ningún elemento coincide con \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Prueba con un término de búsqueda diferente.</string>
+    <string name="workshop_clear_search">Borrar búsqueda</string>
+    <string name="workshop_item_fallback">Elemento del Workshop</string>
+    <string name="common_ui_failed">Falló</string>
+    <string name="steam_presence_snooze">Posponer</string>
+    <string name="steam_presence_busy">Ocupado</string>
+    <string name="steam_presence_looking_to_trade">Buscando intercambiar</string>
+    <string name="steam_presence_looking_to_play">Buscando jugar</string>
+    <string name="steam_friends_count">Amigos — %1$d en línea</string>
+    <string name="steam_friends_section_in_game">En el juego (%1$d)</string>
+    <string name="steam_friends_section_online">En línea (%1$d)</string>
+    <string name="steam_friends_section_offline">Desconectados (%1$d)</string>
+    <string name="steam_friends_none_loaded">Aún no se cargaron amigos.</string>
+    <string name="steam_friends_chat_off">El chat está desactivado. Vuelve a activar el Servicio de chat para ver a tus amigos.</string>
+    <string name="steam_friends_self_you">Tú</string>
+    <string name="steam_friends_in_game">En el juego</string>
+    <string name="steam_friends_join">Unirse</string>
+    <string name="steam_friends_play">Jugar</string>
+    <string name="steam_chat_image_failed">(no se pudo enviar la imagen)</string>
+    <string name="steam_chat_empty">Aún no hay mensajes. ¡Saluda!</string>
+    <string name="steam_chat_uploading_image">Subiendo imagen…</string>
+    <string name="steam_chat_send_image">Enviar imagen</string>
+    <string name="steam_chat_message_hint">Mensaje…</string>
+    <string name="steam_chat_send">Enviar</string>
+    <string name="steam_chat_image">Imagen</string>
+    <string name="steam_common_back">Atrás</string>
+    <string name="steam_achievements_title">Logros</string>
+    <string name="steam_achievements_empty">No se encontraron logros para este juego,\no inicia sesión en Steam para cargarlos.</string>
+    <string name="steam_achievements_hidden">Logro oculto</string>
+    <string name="steam_achievements_hidden_desc">Sigue jugando para revelar este logro.</string>
+    <string name="steam_achievements_unlocked_on">Desbloqueado %1$s</string>
+    <string name="steam_achievements_unlocked">Desbloqueado</string>
+    <string name="steam_join_joining">Uniéndote a %1$s en %2$s…</string>
+    <string name="steam_join_install">Instala %1$s para unirte a %2$s</string>
+    <string name="steam_join_not_owned">No tienes %1$s</string>
+    <string name="steam_chat_not_sent">(no enviado)</string>
+    <string name="steam_join_the_game">el juego</string>
+    <string name="steam_friends_settings">Configuración</string>
+    <string name="steam_chat_settings_title">Configuración del chat</string>
+    <string name="steam_chat_setting_service">Servicio de chat</string>
+    <string name="steam_chat_setting_service_desc">Inicia sesión para ver amigos y chatear; desactívalo para aparecer sin conexión</string>
+    <string name="steam_chat_setting_notifications">Notificaciones del chat</string>
+    <string name="steam_chat_setting_notifications_desc">Muestra una notificación cuando recibas un mensaje</string>
+    <string name="steam_chat_setting_heads">Burbujas de chat</string>
+    <string name="steam_chat_setting_heads_desc">Burbujas flotantes para leer y responder mensajes</string>
+    <string name="steam_chat_setting_ingame">Activar chat en el juego</string>
+    <string name="steam_chat_setting_ingame_desc">Recibe y envía mensajes mientras juegas</string>
+    <string name="steam_chat_setting_stay_running">Ejecutar en segundo plano</string>
+    <string name="steam_chat_setting_stay_running_desc">Mantén el chat en ejecución después de salir de WinNative</string>
+    <string name="steam_chat_settings_overlay_needed">Permite mostrar sobre otras apps para usar las burbujas de chat</string>
+    <string name="steam_chat_heads_title">Mensajes</string>
+    <string name="steam_chat_heads_recent_title">Recientes</string>
+    <string name="steam_chat_heads_online_title">En línea</string>
+    <string name="steam_chat_heads_new_chat">Mensaje nuevo</string>
+    <string name="steam_chat_setting_autohide">Ocultar automáticamente</string>
+    <string name="steam_chat_setting_autohide_desc">Atenúa la burbuja de chat tras 10 s de inactividad</string>
+    <string name="steam_chat_heads_friends_title">Amigos</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Archivos</string>
+    <string name="file_manager_copy">Copiar</string>
+    <string name="file_manager_cut">Cortar</string>
+    <string name="file_manager_paste">Pegar</string>
+    <string name="file_manager_paste_here">Pegar aquí</string>
+    <string name="file_manager_new_folder">Carpeta nueva</string>
+    <string name="file_manager_new_folder_short">Carpeta</string>
+    <string name="file_manager_multi_select">Elegir</string>
+    <string name="file_manager_create">Crear</string>
+    <string name="file_manager_delete">Eliminar</string>
+    <string name="file_manager_copy_count">Copiar (%1$d)</string>
+    <string name="file_manager_cut_count">Cortar (%1$d)</string>
+    <string name="file_manager_delete_count">Eliminar (%1$d)</string>
+    <string name="file_manager_extract">Extraer</string>
+    <string name="file_manager_extract_here">Extraer aquí</string>
+    <string name="file_manager_extract_to">Extraer en…</string>
+    <string name="file_manager_extracting">Extrayendo %1$s</string>
+    <string name="file_manager_extract_failed">Error al extraer</string>
+    <string name="file_manager_run_boot">Ejecutar / Arrancar</string>
+    <string name="file_manager_create_shortcut">Crear acceso directo</string>
+    <string name="file_manager_run_in_container">Ejecutar en el contenedor</string>
+    <string name="file_manager_no_containers">No hay contenedores disponibles</string>
+    <string name="file_manager_delete_confirm">¿Eliminar \"%1$s\"? Esto no se puede deshacer.</string>
+    <string name="file_manager_delete_confirm_multi">¿Eliminar %1$d elementos? Esto no se puede deshacer.</string>
+    <string name="file_manager_copying">Copiando %1$s</string>
+    <string name="file_manager_moving">Moviendo %1$s</string>
+    <string name="file_manager_copying_count">Copiando %1$d elementos</string>
+    <string name="file_manager_moving_count">Moviendo %1$d elementos</string>
+    <string name="file_manager_paste_into_itself">No se puede pegar una carpeta dentro de sí misma</string>
+    <string name="file_manager_operation_failed">La operación falló</string>
+    <string name="file_manager_delete_failed">La eliminación falló</string>
+    <string name="file_manager_rename_failed">El cambio de nombre falló</string>
+    <string name="file_manager_create_folder_failed">La creación de la carpeta falló</string>
+
+    <string name="settings_content_refresh">Actualizar</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Transferir partida</string>
+    <string name="retro_save_transfer_message">Importa una partida guardada local para este juego o exporta la partida actual.</string>
+    <string name="retro_save_transfer_import">Importar partida</string>
+    <string name="retro_save_transfer_export">Exportar partida</string>
+    <string name="retro_save_transfer_import_ok">Partida importada</string>
+    <string name="retro_save_transfer_import_failed">No se pudo importar la partida</string>
+    <string name="retro_save_transfer_export_ok">Partida exportada</string>
+    <string name="retro_save_transfer_export_failed">No se pudo exportar la partida</string>
+    <string name="retro_save_transfer_none">Aún no existe ninguna partida guardada para este juego</string>
+    <string name="retro_cheats_title">Trucos</string>
+    <string name="retro_cheats_hardcore_blocked">Los trucos están desactivados en el modo Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Guardar</string>
+    <string name="retro_ps2_cancel">Cancelar</string>
+    <string name="retro_ps2_save_state">Guardar estado</string>
+    <string name="retro_ps2_load_save_state">Cargar estado</string>
+    <string name="retro_ps2_achievements">Logros</string>
+    <string name="retro_ps2_cheats">Trucos</string>
+    <string name="retro_ps2_memory_cards">Tarjetas de memoria</string>
+    <string name="retro_ps2_fast_forward">Avance rápido</string>
+    <string name="retro_ps2_reset">Reiniciar</string>
+    <string name="retro_ps2_swap_disc">Cambiar disco</string>
+    <string name="retro_ps2_slot">Ranura %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Toca para cargar</string>
+    <string name="retro_ps2_slot_empty">Vacía</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Toca para sobrescribir</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Vacía — toca para guardar</string>
+    <string name="retro_ps2_slot_is_empty">La ranura %1$d está vacía</string>
+    <string name="retro_ps2_loaded_slot">Ranura %1$d cargada</string>
+    <string name="retro_ps2_could_not_load_slot">No se pudo cargar la ranura %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Guardado en la ranura %1$d</string>
+    <string name="retro_ps2_save_failed">Error al guardar</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Ranura 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Ranura 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Toca para usar</string>
+    <string name="retro_ps2_new_memory_card">Nueva tarjeta de memoria</string>
+    <string name="retro_ps2_import_card">Importar tarjeta</string>
+    <string name="retro_ps2_enable_online_dev9">Activar en línea (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adaptador de red de PS2: reinicia el juego para conectarlo</string>
+    <string name="retro_ps2_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_ps2_dns_mode">Modo DNS</string>
+    <string name="retro_ps2_primary_dns">DNS principal</string>
+    <string name="retro_ps2_secondary_dns">DNS secundario</string>
+    <string name="retro_ps2_optional">opcional</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automática (DHCP)</string>
+    <string name="retro_ps2_server_host">Servidor: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">toca para definir la IP (en blanco la elimina)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Agregar host de servidor</string>
+    <string name="retro_ps2_new_server_hostname">Nuevo nombre de host del servidor</string>
+    <string name="retro_ps2_server_hostname_hint">p. ej. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Controles en pantalla</string>
+    <string name="retro_ps2_edit_layout">Editar disposición</string>
+    <string name="retro_ps2_reset_layout">Restablecer disposición</string>
+    <string name="retro_ps2_layout_reset">Disposición restablecida</string>
+    <string name="retro_ps2_left_stick_invert_x">Stick izquierdo: invertir X</string>
+    <string name="retro_ps2_left_stick_invert_y">Stick izquierdo: invertir Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Stick derecho: invertir X</string>
+    <string name="retro_ps2_right_stick_invert_y">Stick derecho: invertir Y</string>
+    <string name="retro_ps2_button_color">Color de botones</string>
+    <string name="retro_ps2_letter_color">Color de letras</string>
+    <string name="retro_ps2_shadow_color">Color de sombra</string>
+    <string name="retro_ps2_background_color">Color de fondo</string>
+    <string name="retro_ps2_reset_colors">Restablecer colores</string>
+    <string name="retro_ps2_renderer">Renderizador</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Escala de resolución</string>
+    <string name="retro_ps2_scale_1x_native">1x (nativo)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_ps2_aspect_stretch">Estirar</string>
+    <string name="retro_ps2_aspect_auto_standard">Automático (estándar)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtro de pantalla</string>
+    <string name="retro_ps2_filter_nearest">Más cercano</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilineal (suave)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilineal (nítido)</string>
+    <string name="retro_ps2_texture_filter">Filtro de texturas</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilineal (forzado)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilineal (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilineal (sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Precisión de mezcla</string>
+    <string name="retro_ps2_blend_minimum">Mínima</string>
+    <string name="retro_ps2_blend_basic">Básica</string>
+    <string name="retro_ps2_blend_medium">Media</string>
+    <string name="retro_ps2_blend_high">Alta</string>
+    <string name="retro_ps2_blend_full">Completa</string>
+    <string name="retro_ps2_blend_maximum">Máxima</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Desactivado</string>
+    <string name="retro_ps2_shader_scanline">Líneas de escaneo</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Onda</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Saltar fotogramas</string>
+    <string name="retro_ps2_frameskip_off">Desactivado</string>
+    <string name="retro_ps2_frameskip_1">Saltar 1</string>
+    <string name="retro_ps2_frameskip_2">Saltar 2</string>
+    <string name="retro_ps2_frameskip_3">Saltar 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volumen</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Silenciar</string>
+    <string name="retro_ps2_swap_stereo_channels">Intercambiar canales estéreo</string>
+    <string name="retro_ps2_ee_cycle_rate">Frecuencia de ciclos EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (predeterminado)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_ps2_skip_off">Desactivado</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 instantáneo</string>
+    <string name="retro_ps2_mtvu">VU multihilo (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rápido</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Velocidad de emulación</string>
+    <string name="retro_ps2_hud_cpu_usage">Uso de CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Uso de GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Resolución interna</string>
+    <string name="retro_ps2_deinterlace_mode">Modo de desentrelazado</string>
+    <string name="retro_ps2_deint_auto">Automático</string>
+    <string name="retro_ps2_deint_off">Desactivado</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Relación de aspecto de FMV</string>
+    <string name="retro_ps2_anti_blur">Antidesenfoque</string>
+    <string name="retro_ps2_widescreen_patches">Parches panorámicos</string>
+    <string name="retro_ps2_no_interlace_patches">Parches sin entrelazado</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Detección de bucle INTC</string>
+    <string name="retro_ps2_wait_loop">Detección de bucle de espera</string>
+    <string name="retro_ps2_time_stretch">Estiramiento de tiempo de audio</string>
+    <string name="retro_ps2_audio_buffer">Búfer de audio</string>
+    <string name="retro_ps2_audio_latency">Latencia de salida</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Tiempos de fotograma</string>
+    <string name="retro_ps2_hud_gs_stats">Estadísticas de GS</string>
+    <string name="retro_ps2_hud_hw_info">Información de hardware</string>
+    <string name="retro_ps2_hud_version">Versión</string>
+    <string name="retro_ps2_hud_input_display">Visualización de entradas</string>
+    <string name="retro_ps2_tab_menu">Menú</string>
+    <string name="retro_ps2_tab_display">Pantalla</string>
+    <string name="retro_ps2_tab_performance">Rendimiento</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Sonido</string>
+    <string name="retro_ps2_tab_online">En línea</string>
+    <string name="retro_ps2_tab_controls">Controles</string>
+    <string name="retro_ps2_resume">Reanudar</string>
+    <string name="retro_ps2_pause">Pausar</string>
+    <string name="retro_ps2_exit">Salir</string>
+    <string name="retro_lr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Archivo de BIOS no válido</string>
+    <string name="retro_lr_invalid_retro_game">Juego retro no válido</string>
+    <string name="retro_lr_rom_not_found">ROM no encontrada: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">No se pudo leer la ROM dentro de este archivo</string>
+    <string name="retro_lr_core_not_installed">Núcleo no instalado: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Trucos activados: los logros están desactivados en esta sesión</string>
+    <string name="retro_lr_cloud_save_restored">Guardado en la nube restaurado</string>
+    <string name="retro_lr_restore_failed">Error al restaurar</string>
+    <string name="retro_lr_cloud_conflict_message">Existe un guardado en la nube más reciente para %1$s. ¿Deseas sincronizar y cuál guardado en la nube prefieres conservar?</string>
+    <string name="retro_lr_cloud_save">Guardado en la nube</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">No se pudo cargar el núcleo del emulador</string>
+    <string name="retro_lr_failed_load_rom">No se pudo cargar la ROM</string>
+    <string name="retro_lr_graphics_not_supported">Gráficos no compatibles con este núcleo</string>
+    <string name="retro_lr_emulator_error">Error del emulador</string>
+    <string name="retro_lr_shader_default">Predeterminado</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Nítido</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Escalado SGSR</string>
+    <string name="retro_lr_upscale_native">Nativo</string>
+    <string name="retro_lr_sound">Sonido</string>
+    <string name="retro_lr_left_stick_invert_x">Stick izquierdo: invertir X</string>
+    <string name="retro_lr_left_stick_invert_y">Stick izquierdo: invertir Y</string>
+    <string name="retro_lr_right_stick_invert_x">Stick derecho: invertir X</string>
+    <string name="retro_lr_right_stick_invert_y">Stick derecho: invertir Y</string>
+    <string name="retro_lr_on_screen_controls">Controles en pantalla</string>
+    <string name="retro_lr_haptic_feedback">Respuesta háptica</string>
+    <string name="retro_lr_portrait">Vertical</string>
+    <string name="retro_lr_landscape">Horizontal</string>
+    <string name="retro_lr_edit_layout">Editar disposición (%1$s)</string>
+    <string name="retro_lr_reset_layout">Restablecer disposición %1$s</string>
+    <string name="retro_lr_layout_reset">Disposición %1$s restablecida</string>
+    <string name="retro_lr_button_color">Color de botones</string>
+    <string name="retro_lr_letter_color">Color de letras</string>
+    <string name="retro_lr_shadow_color">Color de sombra</string>
+    <string name="retro_lr_background_color">Color de fondo</string>
+    <string name="retro_lr_reset_colors">Restablecer colores</string>
+    <string name="retro_lr_colors_reset">Colores restablecidos</string>
+    <string name="retro_lr_performance_hud">HUD de rendimiento</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa del fondo</string>
+    <string name="retro_lr_background">Fondo</string>
+    <string name="retro_lr_scale">Escala</string>
+    <string name="retro_lr_numeric_frametime">Tiempo de fotograma numérico</string>
+    <string name="retro_lr_dual_series_battery">Batería de doble serie</string>
+    <string name="retro_lr_hud_elements">ELEMENTOS DEL HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Consola</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batería</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Gráfica</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Guardar estado</string>
+    <string name="retro_lr_load_save_state">Cargar estado</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">La carga de estados está desactivada en modo Hardcore</string>
+    <string name="retro_lr_achievements">Logros</string>
+    <string name="retro_lr_cheats">Trucos</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Los trucos están desactivados en modo Hardcore</string>
+    <string name="retro_lr_reset">Reiniciar</string>
+    <string name="retro_lr_fast_forward">Avance rápido</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">El avance rápido está desactivado en modo Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disco %1$d/%2$d</string>
+    <string name="retro_lr_resume">Reanudar</string>
+    <string name="retro_lr_pause">Pausar</string>
+    <string name="retro_lr_exit">Salir</string>
+    <string name="retro_lr_saved_to_slot">Guardado en la ranura %1$d</string>
+    <string name="retro_lr_could_not_save_state">No se pudo guardar el estado</string>
+    <string name="retro_lr_bios_required_title">Se requiere la BIOS de %1$s</string>
+    <string name="retro_lr_bios_required_message">Los juegos de PlayStation necesitan un archivo de BIOS real de la consola que debes proporcionar. Importa una BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin o scph7001.bin) para continuar.</string>
+    <string name="retro_lr_import_bios">Importar BIOS…</string>
+    <string name="retro_lr_cancel">Cancelar</string>
+    <string name="retro_lr_slot_empty">La ranura %1$d está vacía</string>
+    <string name="retro_lr_loaded_slot">Ranura %1$d cargada</string>
+    <string name="retro_lr_could_not_load_state">No se pudo cargar el estado</string>
+    <string name="retro_lr_slot_title">Ranura %1$d</string>
+    <string name="retro_lr_rename_slot">Renombrar ranura %1$d</string>
+    <string name="retro_gs_section_general">General</string>
+    <string name="retro_gs_section_graphics">Gráficos</string>
+    <string name="retro_gs_section_performance">Rendimiento</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Entrada</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">En línea</string>
+    <string name="retro_gs_cancel">Cancelar</string>
+    <string name="retro_gs_save">Guardar</string>
+    <string name="retro_gs_shader_default">Predeterminado</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Nítido</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativo</string>
+    <string name="retro_gs_group_game">JUEGO</string>
+    <string name="retro_gs_label_name">Nombre</string>
+    <string name="retro_gs_label_system">Sistema</string>
+    <string name="retro_gs_label_emulator_core">Núcleo del emulador</string>
+    <string name="retro_gs_label_rom_path">Ruta de la ROM</string>
+    <string name="retro_gs_group_bios">BIOS de %1$s</string>
+    <string name="retro_gs_label_installed">Instalada</string>
+    <string name="retro_gs_bios_none">Ninguna: necesaria para ejecutar juegos de %1$s</string>
+    <string name="retro_gs_import_bios">Importar BIOS…</string>
+    <string name="retro_gs_remove_bios">Eliminar BIOS</string>
+    <string name="retro_gs_group_library_artwork">IMÁGENES DE LA BIBLIOTECA</string>
+    <string name="retro_gs_artwork_game_card">Imagen de la ficha del juego</string>
+    <string name="retro_gs_artwork_grid">Imagen de cuadrícula</string>
+    <string name="retro_gs_artwork_carousel">Imagen de carrusel</string>
+    <string name="retro_gs_artwork_list">Imagen de lista</string>
+    <string name="retro_gs_artwork_custom_set">Imagen personalizada establecida</string>
+    <string name="retro_gs_artwork_set_image">Establecer imagen</string>
+    <string name="retro_gs_artwork_remove">Eliminar</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Filtro de video</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Escalado SGSR</string>
+    <string name="retro_gs_performance_hud">HUD de rendimiento</string>
+    <string name="retro_gs_group_core">NÚCLEO</string>
+    <string name="retro_gs_renderer">Renderizador</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Escala de resolución</string>
+    <string name="retro_gs_scale_1x_native">1x (nativo)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_gs_aspect_stretch">Estirar</string>
+    <string name="retro_gs_aspect_auto_standard">Automático (estándar)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtro de pantalla</string>
+    <string name="retro_gs_filter_nearest">Más cercano</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilineal (suave)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilineal (nítido)</string>
+    <string name="retro_gs_texture_filter">Filtro de texturas</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilineal (forzado)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilineal (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilineal (sprites)</string>
+    <string name="retro_gs_blending_accuracy">Precisión de mezcla</string>
+    <string name="retro_gs_blend_minimum">Mínima</string>
+    <string name="retro_gs_blend_basic">Básica</string>
+    <string name="retro_gs_blend_medium">Media</string>
+    <string name="retro_gs_blend_high">Alta</string>
+    <string name="retro_gs_blend_full">Completa</string>
+    <string name="retro_gs_blend_maximum">Máxima</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Desactivado</string>
+    <string name="retro_gs_tvshader_scanline">Líneas de escaneo</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Onda</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Saltar fotogramas</string>
+    <string name="retro_gs_frameskip_1">Saltar 1</string>
+    <string name="retro_gs_frameskip_2">Saltar 2</string>
+    <string name="retro_gs_frameskip_3">Saltar 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">RENDIMIENTO</string>
+    <string name="retro_gs_ee_cycle_rate">Frecuencia de ciclos EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (predeterminado)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 instantáneo</string>
+    <string name="retro_gs_mtvu">VU multihilo (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rápido</string>
+    <string name="retro_gs_group_performance_hud">HUD DE RENDIMIENTO</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Velocidad de emulación</string>
+    <string name="retro_gs_hud_cpu_usage">Uso de CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Uso de GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Resolución interna</string>
+    <string name="retro_gs_deinterlace_mode">Modo de desentrelazado</string>
+    <string name="retro_gs_deint_auto">Automático</string>
+    <string name="retro_gs_deint_off">Desactivado</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Relación de aspecto de FMV</string>
+    <string name="retro_gs_anti_blur">Antidesenfoque</string>
+    <string name="retro_gs_widescreen_patches">Parches panorámicos</string>
+    <string name="retro_gs_no_interlace_patches">Parches sin entrelazado</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Detección de bucle INTC</string>
+    <string name="retro_gs_wait_loop">Detección de bucle de espera</string>
+    <string name="retro_gs_time_stretch">Estiramiento de tiempo de audio</string>
+    <string name="retro_gs_audio_buffer">Búfer de audio</string>
+    <string name="retro_gs_audio_latency">Latencia de salida</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Tiempos de fotograma</string>
+    <string name="retro_gs_hud_gs_stats">Estadísticas de GS</string>
+    <string name="retro_gs_hud_hw_info">Información de hardware</string>
+    <string name="retro_gs_hud_version">Versión</string>
+    <string name="retro_gs_hud_input_display">Visualización de entradas</string>
+    <string name="retro_gs_fast_boot">Arranque rápido</string>
+    <string name="retro_gs_group_online_dev9">EN LÍNEA (DEV9)</string>
+    <string name="retro_gs_enable_online">Activar en línea</string>
+    <string name="retro_gs_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_gs_net_auto">Automático</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Modo DNS</string>
+    <string name="retro_gs_dns_manual">Manual</string>
+    <string name="retro_gs_dns_internal">Interno</string>
+    <string name="retro_gs_primary_dns">DNS principal</string>
+    <string name="retro_gs_secondary_dns">DNS secundario</string>
+    <string name="retro_gs_dns_optional">opcional</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automática (DHCP)</string>
+    <string name="retro_gs_group_input">ENTRADA</string>
+    <string name="retro_engine_save">Guardar</string>
+    <string name="retro_engine_saved">Partida guardada</string>
+    <string name="retro_engine_loading">Cargando…</string>
+    <string name="retro_engine_load">Cargar</string>
+    <string name="retro_engine_saved_to">Guardado en %1$s</string>
+    <string name="retro_engine_slot_active_only">Activa</string>
+    <string name="retro_engine_rename_slot">Cambiar nombre de la ranura</string>
+    <string name="retro_engine_caught">%1$d capturados</string>
+    <string name="retro_engine_no_slots">Todavía no hay ranuras de guardado</string>
+    <string name="retro_engine_new_slot">Nueva ranura de guardado</string>
+    <string name="retro_engine_achievements_unavailable">No se registra en modo 3D</string>
+    <string name="retro_engine_fullscreen">Pantalla completa</string>
+    <string name="retro_engine_loaded_from">%1$s cargada</string>
+    <string name="retro_engine_slot_empty">Esa ranura está vacía</string>
+    <string name="retro_engine_loading_subtitle">Preparando los datos del juego por primera vez</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Juega este juego con el motor de vóxeles 3D en lugar del núcleo estándar</string>
+    <string name="retro_gs_on_screen_controls">Controles en pantalla</string>
+    <string name="retro_gs_haptic_feedback">Respuesta háptica</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Volumen</string>
+    <string name="retro_gs_mute">Silenciar</string>
+    <string name="retro_gs_swap_stereo">Intercambiar canales estéreo</string>
+    <string name="retro_gs_sound">Sonido</string>
+    <string name="retro_scr_retro_defaults">VALORES RETRO PREDETERMINADOS</string>
+    <string name="retro_scr_retro_defaults_desc">Valores predeterminados aplicados a los juegos de cada consola salvo que se modifiquen en los ajustes propios de un juego.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Cuenta</string>
+    <string name="retro_scr_signed_in">Sesión iniciada</string>
+    <string name="retro_scr_not_signed_in_hint">Sin sesión iniciada: abre los Logros de un juego para iniciar sesión</string>
+    <string name="retro_scr_achievements_enabled">Logros activados</string>
+    <string name="retro_scr_hardcore_default">Modo Hardcore de forma predeterminada (sin estados guardados)</string>
+    <string name="retro_scr_sign_out">Cerrar sesión</string>
+    <string name="retro_scr_playstation_bios">BIOS DE PLAYSTATION</string>
+    <string name="retro_scr_installed">Instalada</string>
+    <string name="retro_scr_none_ps1_bios">Ninguna: los juegos de PS1 requieren una BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importar BIOS de PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS de PS1 eliminada</string>
+    <string name="retro_scr_no_bios_to_remove">No hay ninguna BIOS que eliminar</string>
+    <string name="retro_scr_remove_ps1_bios">Eliminar BIOS de PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS DE PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Ninguna: los juegos de PS2 requieren una BIOS</string>
+    <string name="retro_scr_format">Formato</string>
+    <string name="retro_scr_ps2_bios_format">Volcado combinado en un solo archivo (.bin con región etiquetada, ~4MB). No se aceptan conjuntos ROM0/MEC/NVM separados.</string>
+    <string name="retro_scr_import_ps2_bios">Importar BIOS de PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS de PS2 eliminada</string>
+    <string name="retro_scr_remove_ps2_bios">Eliminar BIOS de PS2</string>
+    <string name="retro_scr_library_artwork">IMÁGENES DE LA BIBLIOTECA</string>
+    <string name="retro_scr_retro_case_art">Imagen retro de la caja (cartucho / caja de CD)</string>
+    <string name="retro_scr_box_art">Imagen de la caja</string>
+    <string name="retro_scr_box_art_desc">Se obtiene automáticamente de thumbnails.libretro.com al importar; una imagen personalizada siempre la reemplaza.</string>
+    <string name="retro_scr_roms_folder">CARPETA DE ROMS</string>
+    <string name="retro_scr_folder">Carpeta</string>
+    <string name="retro_scr_roms_not_set">Sin definir: elige una carpeta para importar juegos automáticamente</string>
+    <string name="retro_scr_auto_import">Importación automática</string>
+    <string name="retro_scr_auto_import_desc">Los juegos nuevos de esta carpeta se añaden automáticamente a tu biblioteca con la consola correcta detectada.</string>
+    <string name="retro_scr_select_roms_folder_title">Seleccionar carpeta de ROMs</string>
+    <string name="retro_scr_select_roms_folder_button">Seleccionar carpeta de ROMs…</string>
+    <string name="retro_scr_change_roms_folder_button">Cambiar carpeta de ROMs…</string>
+    <string name="retro_scr_scan_now">Analizar ahora</string>
+    <string name="retro_scr_console_defaults">VALORES PREDETERMINADOS DE LA CONSOLA</string>
+    <string name="retro_scr_console_defaults_desc">Toca una consola para configurar sus ajustes predeterminados.</string>
+    <string name="retro_scr_renderer">Renderizador</string>
+    <string name="retro_scr_upscale_resolution">Escalar resolución</string>
+    <string name="retro_scr_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_scr_aspect_stretch">Estirar</string>
+    <string name="retro_scr_aspect_auto_standard">Automático (estándar)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtro de pantalla</string>
+    <string name="retro_scr_filter_nearest">Más cercano</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilineal (suave)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilineal (nítido)</string>
+    <string name="retro_scr_texture_filter">Filtro de texturas</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilineal (forzado)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilineal (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilineal (sprites)</string>
+    <string name="retro_scr_blending_accuracy">Precisión de mezcla</string>
+    <string name="retro_scr_blend_minimum">Mínima</string>
+    <string name="retro_scr_blend_basic">Básica</string>
+    <string name="retro_scr_blend_medium">Media</string>
+    <string name="retro_scr_blend_high">Alta</string>
+    <string name="retro_scr_blend_full">Completa</string>
+    <string name="retro_scr_blend_maximum">Máxima</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Desactivado</string>
+    <string name="retro_scr_shader_scanline">Líneas de escaneo</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Onda</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Saltar fotogramas</string>
+    <string name="retro_scr_skip_1">Saltar 1</string>
+    <string name="retro_scr_skip_2">Saltar 2</string>
+    <string name="retro_scr_skip_3">Saltar 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Frecuencia de ciclos EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (predeterminado)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_scr_skip_off">Desactivado</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 instantáneo</string>
+    <string name="retro_scr_mtvu">VU multihilo (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rápido</string>
+    <string name="retro_scr_touch_controls">Controles táctiles en pantalla</string>
+    <string name="retro_scr_sound">Sonido</string>
+    <string name="retro_scr_swap_stereo">Intercambiar canales estéreo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: velocidad de emulación</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: uso de CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: uso de GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: resolución interna</string>
+    <string name="retro_scr_enable_online_dev9">Activar en línea (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_scr_net_auto">Automático</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Modo DNS</string>
+    <string name="retro_scr_dns_manual">Manual</string>
+    <string name="retro_scr_dns_internal">Interno</string>
+    <string name="retro_scr_primary_dns">DNS principal</string>
+    <string name="retro_scr_secondary_dns">DNS secundario</string>
+    <string name="retro_scr_optional">opcional</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automática (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Escalado SGSR</string>
+    <string name="retro_scr_performance_hud">HUD de rendimiento</string>
+    <string name="retro_scr_credits_licenses">CRÉDITOS &amp; LICENCIAS</string>
+    <string name="retro_scr_credits_desc">Algunas funciones de WinNative se basan en estos proyectos de código abierto. Toca para ver cada fuente.</string>
+    <string name="retro_scr_tab_defaults">Predeterminados</string>
+    <string name="retro_scr_tab_credits">Créditos</string>
+    <string name="retro_scr_enable_hardcore_title">¿Activar el modo Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">El modo Hardcore reinicia el juego ahora y desactiva la carga de estados guardados, el avance rápido y los trucos. Se perderá cualquier progreso sin guardar. ¿Continuar?</string>
+    <string name="retro_scr_cancel">Cancelar</string>
+    <string name="retro_scr_enable">Activar</string>
+    <string name="retro_scr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Archivo de BIOS no válido</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS de PS2 importada: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Archivo de BIOS de PS2 no válido</string>
+    <string name="retro_scr_no_game_serial">No hay ningún número de serie de juego para buscar trucos.</string>
+    <string name="retro_scr_applied_cheats">Se aplicaron %1$d truco(s).</string>
+    <string name="retro_scr_couldnt_apply_cheats">No se pudieron aplicar los trucos.</string>
+    <string name="retro_scr_cheats">Trucos</string>
+    <string name="retro_scr_apply">Aplicar</string>
+    <string name="retro_scr_no_cheats_found">No se encontraron trucos para este juego.</string>
+    <string name="retro_scr_achievements">Logros</string>
+    <string name="retro_scr_sign_in_ra">Inicia sesión en RetroAchievements</string>
+    <string name="retro_scr_username">Nombre de usuario</string>
+    <string name="retro_scr_password">Contraseña</string>
+    <string name="retro_scr_login_failed">Error de inicio de sesión</string>
+    <string name="retro_scr_signing_in">Iniciando sesión…</string>
+    <string name="retro_scr_sign_in">Iniciar sesión</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">No hay logros para este juego.</string>
+    <string name="retro_scr_back">Atrás</string>
+    <string name="retro_scr_enabled">Activado</string>
+    <string name="retro_scr_disabled">Desactivado</string>
+    <string name="retro_scr_rename">Renombrar</string>
+    <string name="retro_scr_save">Guardar</string>
+    <string name="retro_scr_cloud_save_conflict">Conflicto de guardado en la nube</string>
+    <string name="retro_scr_keep_local_save">Conservar guardado local</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menú</string>
+    <string name="retro_tab_display">Pantalla</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Sonido</string>
+    <string name="retro_tab_controls">Controles</string>
+    <string name="retro_scan_up_to_date">Biblioteca actualizada</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">%1$d añadidos</string>
+    <string name="retro_scan_removed">%1$d eliminados</string>
+    <string name="retro_scr_shader_default">Predeterminado</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Nítido</string>
+    <string name="retro_scr_upscale_native">Nativo</string>
+    <string name="retro_co_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_co_ntsc_filter">Filtro NTSC</string>
+    <string name="retro_co_colorization">Coloración</string>
+    <string name="retro_co_color_correction">Corrección de color</string>
+    <string name="retro_co_remove_sprite_limit">Quitar límite de sprites</string>
+    <string name="retro_co_resolution">Resolución</string>
+    <string name="retro_co_framebuffer_emulation">Emulación de framebuffer</string>
+    <string name="retro_co_dithering">Tramado</string>
+    <string name="retro_co_widescreen_hack">Hack de pantalla ancha</string>
+    <string name="retro_co_val_8_7_native">8:7 (nativo)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Desactivado</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Compuesto</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Automático</string>
+    <string name="retro_co_val_gba_screen">Pantalla GBA</string>
+    <string name="retro_co_val_gbc_screen">Pantalla GBC</string>
+    <string name="retro_co_val_on">Activado</string>
+    <string name="retro_co_val_320x240_native">320x240 (nativo)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ajustado</string>
+    <string name="retro_co_val_native">Nativo</string>
+    <string name="retro_co_val_internal">Interna</string>
+    <string name="retro_co_val_on_16_9">Activado (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Inicia sesión con tu cuenta de RetroAchievements para conseguir y seguir logros de juegos retro.</string>
+    <string name="retro_ach_username">Nombre de usuario</string>
+    <string name="retro_ach_password">Contraseña</string>
+    <string name="retro_ach_enter_credentials">Introduce tu nombre de usuario y contraseña</string>
+    <string name="retro_ach_login_failed">Error de inicio de sesión</string>
+    <string name="retro_ach_sign_in">Iniciar sesión</string>
+    <string name="retro_ach_password_disclaimer">Tu contraseña solo se usa una vez para obtener un token de inicio de sesión, que se almacena de forma segura en el dispositivo.</string>
+    <string name="retro_ach_achievements_enabled">Logros activados</string>
+    <string name="retro_ach_hardcore_mode">Modo Hardcore (sin estados guardados)</string>
+    <string name="retro_ach_points">%1$d / %2$d puntos</string>
+    <string name="retro_ach_none_found">No se encontraron logros para este juego.</string>
+    <string name="retro_ach_sign_out">Cerrar sesión</string>
+    <string name="retro_che_brand">TRUCOS</string>
+    <string name="retro_che_name">Nombre</string>
+    <string name="retro_che_code">Código</string>
+    <string name="retro_che_cancel">Cancelar</string>
+    <string name="retro_che_save">Guardar</string>
+    <string name="retro_che_default_name">Truco %1$d</string>
+    <string name="retro_che_empty">Aún no hay trucos. Añade un código de truco para este juego.</string>
+    <string name="retro_che_add">Añadir truco</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Controlador de GPU</string>
+    <string name="retro_gpu_driver_system">Sistema (Predeterminado)</string>
+    <string name="retro_gpu_driver_hint">Instala los controladores Turnip en Configuración \u2192 Controladores. Los mismos controladores funcionan para juegos de PC y de PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD de PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Unidad interna virtual para juegos basados en HDD como Final Fantasy XI. Reinicia el juego.</string>
+    <string name="retro_ps2_hdd_desc">Unidad interna virtual para juegos basados en HDD como Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Modo DNS configurado en Internal para que tus hosts de servidor personalizados tengan efecto.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">Núcleo de CPU</string>
+    <string name="retro_co_dual_core">Núcleo doble</string>
+    <string name="retro_co_internal_cheats">Trucos internos</string>
+    <string name="retro_co_internal_resolution">Resolución interna</string>
+    <string name="retro_co_renderer">Renderizador</string>
+    <string name="retro_co_sensor_bar">Posición de la barra de sensores</string>
+    <string name="retro_co_skip_gc_bios">Omitir intro de BIOS</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Abajo</string>
+    <string name="retro_co_val_cached_interpreter">Intérprete en caché</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_interpreter">Intérprete</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Ratón / Toque</string>
+    <string name="retro_co_val_right_stick_absolute">Palanca derecha (absoluta)</string>
+    <string name="retro_co_val_right_stick_relative">Palanca derecha (relativa)</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_val_stretch">Estirar</string>
+    <string name="retro_co_val_top">Arriba</string>
+    <string name="retro_co_vbi_skip">Omisión de VBI (salto de fotogramas automático)</string>
+    <string name="retro_co_widescreen">Pantalla panorámica</string>
+    <string name="retro_co_wiimote_pointer">Puntero del Wiimote</string>
+    <string name="retro_gs_cheats_apply_note">Los cambios se aplican la próxima vez que inicies este juego.</string>
+    <string name="retro_gs_cheats_detect_hint">Inicia este juego una vez para detectar el número de serie del disco; luego los trucos y parches aparecerán aquí.</string>
+    <string name="retro_gs_dnas_entry_desc">Omisión de autenticación DNAS: necesaria para el juego en línea</string>
+    <string name="retro_gs_dnas_group">Aplicado automáticamente (en línea)</string>
+    <string name="retro_gs_group_cheats">Trucos &amp; parches</string>
+    <string name="retro_gs_hdd_image_size">Tamaño: %1$s</string>
+    <string name="retro_gs_hdd_import">Importar imagen de HDD</string>
+    <string name="retro_gs_hdd_remove_short">Quitar</string>
+    <string name="retro_gs_netplay_enable">Habilitar NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Desactivado de forma predeterminada. Habilítalo y luego elige Alojar o Unirse antes de iniciar.\nSe vuelve a desactivar cuando sales del juego.</string>
+    <string name="retro_gs_netplay_host">Dirección del anfitrión</string>
+    <string name="retro_gs_netplay_host_hint">IP o nombre de host</string>
+    <string name="retro_gs_netplay_host_mode">Sesión de anfitrión</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">Activado = esperar a un jugador. Desactivado = unirse a la dirección del anfitrión</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay usa puertos de multijugador local a través de TCP (jugador 1 anfitrión / jugador 2 cliente). El juego en línea de PS2 usa Ethernet DEV9 en su lugar.</string>
+    <string name="retro_gs_netplay_port">Puerto</string>
+    <string name="retro_lr_memory_card_slot">Tarjeta de memoria %1$d</string>
+    <string name="retro_lr_screenshot">Captura de pantalla</string>
+    <string name="retro_lr_use_cloud_save">Usar guardado en la nube</string>
+    <string name="retro_netplay_conn_direct">LAN (IP directa)</string>
+    <string name="retro_netplay_connecting">Conectando…</string>
+    <string name="retro_netplay_connection">Conexión</string>
+    <string name="retro_netplay_conn_traversal">En línea (código de anfitrión)</string>
+    <string name="retro_netplay_dismiss">Descartar</string>
+    <string name="retro_netplay_dolphin_help">El NetPlay de GameCube/Wii usa el motor propio de Dolphin. Anfitrión = Jugador 1, Unirse = Jugador 2. Elige Alojar o Unirse y un tipo de conexión antes de iniciar; ambos dispositivos arrancan el mismo juego juntos.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Comparte la IP de Wi‑Fi de tu dispositivo y este puerto con el Jugador 2. El juego comienza automáticamente cuando se conecta.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">Cuando el juego arranca se muestra un código de anfitrión; compártelo con el Jugador 2. El juego comienza automáticamente cuando se conecta.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Ingresa la IP de Wi‑Fi y el puerto del anfitrión, luego inicia para conectarte.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Ingresa el código de anfitrión del Jugador 1, luego inicia para conectarte.</string>
+    <string name="retro_netplay_enable_before_launch">Habilita NetPlay en la configuración del juego y elige Alojar o Unirse antes de iniciar</string>
+    <string name="retro_netplay_find_rooms">Buscar salas en Wi‑Fi</string>
+    <string name="retro_netplay_game_link_hint">Game Link · cada pantalla es su propia consola portátil</string>
+    <string name="retro_netplay_gba_not_ready">El multijugador de GBA usa gpSP + adaptador inalámbrico. Asegúrate de que libgpsp esté instalado.</string>
+    <string name="retro_netplay_help">Multijugador de pantalla compartida a través de Wi‑Fi (como RetroArch).\nAnfitrión = Jugador 1, Unirse = Jugador 2. Ambos dispositivos muestran el mismo juego.</string>
+    <string name="retro_netplay_help_game_link">Game Link a través de Wi‑Fi: cada dispositivo ejecuta su propio juego.\nGB/GBC: enlace serie de Gambatte (Pokémon Gen 1–2).\nGBA: adaptador inalámbrico de gpSP (combates de Pokémon RF/VH/Esmeralda).</string>
+    <string name="retro_netplay_host_action">Alojar sala</string>
+    <string name="retro_netplay_host_code">Código de anfitrión</string>
+    <string name="retro_netplay_host_code_hint">Código de anfitrión de traversal proporcionado por el anfitrión</string>
+    <string name="retro_netplay_hosting_room">Alojando sala</string>
+    <string name="retro_netplay_host_mode_hint">Toca Alojar para abrir una sala para esta sesión de juego, luego inicia el juego. NetPlay se desactiva cuando sales.</string>
+    <string name="retro_netplay_in_room">En la sala</string>
+    <string name="retro_netplay_join_action">Unirse por IP</string>
+    <string name="retro_netplay_joined">Te uniste</string>
+    <string name="retro_netplay_join_room">Unirse</string>
+    <string name="retro_netplay_launch_mode">Al iniciar</string>
+    <string name="retro_netplay_leave">Salir</string>
+    <string name="retro_netplay_menu_hint">Anfitrión = J1 · Unirse = J2 · el mismo juego en ambas pantallas</string>
+    <string name="retro_netplay_mode_host">Alojar</string>
+    <string name="retro_netplay_mode_join">Unirse</string>
+    <string name="retro_netplay_mode_manual">Manual</string>
+    <string name="retro_netplay_no_rooms">No se encontraron salas. Asegúrate de que el anfitrión esté en la misma red Wi‑Fi y alojando una sala.</string>
+    <string name="retro_netplay_player_name">Nombre para mostrar</string>
+    <string name="retro_netplay_player_name_hint">Se muestra a otros jugadores</string>
+    <string name="retro_netplay_players_count">%1$d conectados</string>
+    <string name="retro_netplay_prelaunch_hint">La sala está abierta solo para esta sesión. Inicia cuando estés listo. Salir del juego desactiva NetPlay.</string>
+    <string name="retro_netplay_room_players">Jugadores</string>
+    <string name="retro_netplay_scan_action">Buscar Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Buscar de nuevo</string>
+    <string name="retro_netplay_scan_hint">Busca salas abiertas en la misma red Wi‑Fi, o únete por dirección IP.</string>
+    <string name="retro_netplay_scanning">Buscando en Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Resultados de la búsqueda</string>
+    <string name="retro_netplay_select_room_hint">Toca una sala para unirte ahora (no guarda la IP para el próximo inicio).</string>
+    <string name="retro_netplay_stop_scan">Detener búsqueda</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s se conectó</string>
+    <string name="retro_netplay_user_disconnected">%1$s se desconectó</string>
+    <string name="retro_netplay_waiting_players">Esperando jugadores…</string>
+    <string name="retro_ps2_coming_soon">La compatibilidad con PlayStation 2 llegará pronto</string>
+    <string name="retro_ps2_show_l3r3">Mostrar botones L3 / R3</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Cuando está desactivado, toca dos veces una palanca para pulsar L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">INDICADORES DEL CONTROLADOR TURNIP</string>
+    <string name="retro_ps2_turnip_flags_note">Se aplican solo cuando se selecciona un controlador de GPU personalizado arriba.</string>
+    <string name="retro_rom_missing">No se encontró el archivo del juego</string>
+    <string name="retro_scr_delete">Eliminar</string>
+    <string name="retro_scr_import_from_file">Importar desde archivo…</string>
+    <string name="retro_scr_loading">Cargando…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Cambiar consola</string>
+    <string name="retro_gs_identify_as">Identificar como consola</string>
+    <string name="retro_gs_console_changed">Ahora identificado como %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Aplica un efecto ReShade (.fx) a los juegos DXVK/VKD3D (Vulkan) mediante la capa vkBasalt integrada. Coloca cada efecto en su propia carpeta en Android/data/&lt;package&gt;/files/ReShade/. El ajuste de parámetros en vivo y el interruptor en el juego llegarán con la actualización de la capa de recarga en caliente.</string>
+    <string name="reshade_catalog_title">Efectos ReShade</string>
+    <string name="reshade_catalog_search">Buscar efectos…</string>
+    <string name="reshade_catalog_installed">Instalados (%1$d)</string>
+    <string name="reshade_catalog_available">Disponibles (%1$d)</string>
+    <string name="reshade_catalog_downloading">Descargando</string>
+    <string name="reshade_catalog_installing">Instalando</string>
+    <string name="reshade_catalog_offline_cache">Sin conexión — mostrando una lista en caché. Conéctate para descargar nuevos efectos.</string>
+    <string name="reshade_catalog_offline_none">Sin conexión — mostrando solo los efectos instalados. Conéctate para explorar el catálogo.</string>
+    <string name="reshade_catalog_needs_connection">Conéctate a Internet para descargar efectos.</string>
+    <string name="reshade_catalog_download_failed">No se pudo descargar %1$s.</string>
+    <string name="reshade_catalog_empty_query">Ningún efecto coincide con \"%1$s\".</string>
+    <string name="reshade_catalog_empty">No hay efectos disponibles. Conéctate a Internet para explorar el catálogo.</string>
+    <string name="reshade_catalog_done">Listo</string>
+    <string name="reshade_catalog_delete_cd">Eliminar %1$s</string>
+    <string name="reshade_catalog_delete_title">¿Eliminar %1$s?</string>
+    <string name="reshade_catalog_delete_body">Esto elimina el efecto del almacenamiento y de cualquier conjunto que lo use. Puedes volver a descargarlo más tarde.</string>
+    <string name="reshade_catalog_delete_confirm">Eliminar</string>
+    <string name="reshade_catalog_delete_cancel">Cancelar</string>
+    <string name="reshade_catalog_delete_failed">No se pudo eliminar %1$s.</string>
+    <string name="reshade_params_title">PARÁMETROS DEL EFECTO</string>
+    <string name="reshade_params_reset">Restablecer</string>
+    <string name="reshade_loadout_empty">Aún no hay efectos. Agrega uno o más efectos para crear un conjunto.</string>
+    <string name="reshade_loadout_add">Agregar efecto</string>
+    <string name="reshade_loadout_full">Conjunto lleno — quita un efecto para agregar otro.</string>
+    <string name="reshade_effect_active">activo</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pila</string>
+    <string name="reshade_mode_solo_hint">Un efecto activo a la vez (comparación A/B, cambia en directo durante el juego).</string>
+    <string name="reshade_mode_stack_hint">Superpón cualquier subconjunto de efectos, aplicados en orden.</string>
+    <string name="reshade_drawer_enable">Activar ReShade</string>
+    <string name="reshade_drawer_empty">No hay efectos ReShade en este conjunto. Agrega efectos en la configuración de este juego (o del contenedor) para cambiarlos y ajustarlos aquí.</string>
+    <string name="reshade_drawer_no_params">Este efecto no expone parámetros ajustables.</string>
+    <string name="cloud_saves_deleting">Eliminando guardado…</string>
+    <string name="cloud_saves_history_delete">Eliminar</string>
+    <string name="cloud_saves_history_delete_confirm_body">¿Eliminar permanentemente el guardado en la nube de %1$s? Esta acción no se puede deshacer.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Eliminar guardado en la nube</string>
+    <string name="cloud_saves_history_delete_failed">No se pudo eliminar el guardado en la nube</string>
+    <string name="cloud_saves_history_delete_success">Guardado en la nube eliminado</string>
+    <string name="retro_bundle_required">Descarga primero los núcleos de consola — Configuración › Retro</string>
+    <string name="retro_ps2_device_unsupported">Este dispositivo no puede ejecutar la emulación de PS2: necesita OpenGL ES 3.1 o posterior.</string>
+    <string name="retro_scr_consoles_check">Buscar actualizaciones</string>
+    <string name="retro_scr_consoles_checking">Buscando actualizaciones…</string>
+    <string name="retro_scr_consoles_download">Descargar núcleos de consola</string>
+    <string name="retro_scr_consoles_downloading">Descargando… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Núcleos de consola</string>
+    <string name="retro_scr_consoles_installed">Instalado — compilación %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Instalado — compilación %1$s (falló la búsqueda de actualizaciones)</string>
+    <string name="retro_scr_consoles_installing">Instalando…</string>
+    <string name="retro_scr_consoles_missing">No instalado: descárgalo para jugar juegos retro</string>
+    <string name="retro_scr_consoles_state">Estado</string>
+    <string name="retro_scr_consoles_update">Actualizar núcleos de consola</string>
+    <string name="retro_scr_consoles_update_available">Actualización disponible — compilación %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Verificando la descarga…</string>
+    <string name="retro_scr_consoles_working">Procesando…</string>
+    <string name="retro_tab_system">Sistema</string>
+</resources>
diff --git a/app/src/main/res/values-da/arrays.xml b/app/src/main/res/values-da/arrays.xml
new file mode 100644
index 000000000..ec02fd2fa
--- /dev/null
+++ b/app/src/main/res/values-da/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Billede</item>
+        <item>Original</item>
+        <item>Ensfarvet</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 361c37af4..d7acdd063 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Vælg venligst en gyldig .exe-fil</string>
     <string name="common_ui_select_valid_icon_file">Vælg venligst en gyldig .ico- eller .png-fil.</string>
     <string name="common_ui_exit">Afslut</string>
+    <string name="common_ui_exit_app">Afslut app</string>
     <string name="common_ui_profile">Profil</string>
     <string name="common_ui_name">Navn</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Ikon</string>
     <string name="common_ui_duplicate">Dupliker</string>
     <string name="common_ui_credits_and_third_party_apps">Credits og tredjepartsapps</string>
-    <string name="common_ui_loading">Indlæser…</string>
+    <string name="common_ui_loading">Indlæser</string>
+    <string name="common_ui_exporting">Eksporterer</string>
     <string name="common_ui_enable">Aktiver</string>
     <string name="common_ui_disable">Deaktiver</string>
     <string name="common_ui_force">Tving</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Højde</string>
     <string name="common_ui_open_file">Åbn fil</string>
     <string name="common_ui_download_file">Download fil</string>
-    <string name="common_ui_downloading_file">Downloader fil...</string>
+    <string name="common_ui_downloading_file">Downloader fil</string>
     <string name="common_ui_browse">Gennemse</string>
     <string name="common_ui_options">Indstillinger</string>
     <string name="common_ui_export">Eksporter</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Indstillinger</string>
     <string name="common_ui_enable_all">Aktiver alle</string>
     <string name="common_ui_disable_all">Deaktiver alle</string>
+    <string name="common_ui_select_all">Vælg alle</string>
+    <string name="common_ui_deselect_all">Fravælg alle</string>
     <string name="common_ui_on">Til</string>
     <string name="common_ui_off">Fra</string>
     <string name="common_ui_already_set">Allerede indstillet</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Installer</string>
     <string name="common_ui_application">Applikation</string>
     <string name="common_ui_check">Tjek</string>
+    <string name="store_game_check_for_update">Søg efter opdatering</string>
+    <string name="store_game_checking_for_update">Tjekker</string>
+    <string name="store_game_download_update">Download opdatering</string>
+    <string name="store_game_no_update_available">Ingen opdatering tilgængelig</string>
+    <string name="store_game_update_available">Opdatering tilgængelig</string>
+    <string name="store_game_update_check_failed">Kunne ikke tjekke for opdatering</string>
+    <string name="store_game_update">Opdater</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Bekræft filer</string>
+    <string name="store_game_verify_started">Bekræfter %1$s — se fanen Downloads</string>
+    <string name="store_game_steam_options">Steam-indstillinger</string>
+    <string name="store_game_verify_complete">Bekræftelse af filer fuldført</string>
+    <string name="store_game_verify_failed_notice">Bekræftelse af filer mislykkedes</string>
+    <string name="store_game_progress_background_hint">Du kan lukke dette — det fortsætter i baggrunden. Se fanen Downloads når som helst.</string>
+    <string name="store_game_checking_updates">Søger efter opdateringer</string>
+    <string name="store_game_no_updates_notice">Ingen opdateringer tilgængelige</string>
+    <string name="store_game_update_complete">Opdatering fuldført</string>
+    <string name="store_game_update_failed_notice">Opdatering mislykkedes</string>
+    <string name="store_game_update_check_failed_notice">Søgning efter opdateringer mislykkedes</string>
+    <string name="store_game_download_already_active">Dette spil downloades allerede. Annuller den aktuelle download, før du tilføjer DLC.</string>
     <string name="common_ui_select">Vælg</string>
     <string name="common_ui_select_folder">Vælg mappe</string>
     <string name="common_ui_current_folder">Nuværende mappe</string>
+    <string name="common_ui_enter_path">Indtast sti</string>
+    <string name="common_ui_path_not_found">Stien blev ikke fundet</string>
     <string name="common_ui_storage_roots">Lagringsrødder</string>
     <string name="common_ui_browse_local_folders_directly">Gennemse lokale mapper direkte</string>
     <string name="common_ui_no_folders_available_here">Ingen mapper tilgængelige her</string>
     <string name="common_ui_grant_all_files_access_browse">Giv fuld filadgang for at gennemse lokale mapper direkte.</string>
     <string name="common_ui_not_configured">Ikke konfigureret</string>
     <string name="common_ui_reinstall">Geninstaller</string>
-    <string name="common_ui_exit_app_confirm">Afslut WinNative?</string>
     <string name="common_ui_elements_count">%1$d elementer</string>
     <string name="common_ui_disabled_placeholder">-- Deaktiveret --</string>
     <string name="common_ui_enabled">Aktiveret</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Hent grafik</string>
+    <string name="library_games_scraping_artwork">Henter</string>
     <string name="library_games_shortcut_created">Genvej oprettet</string>
     <string name="library_games_failed_to_create_shortcut">Kunne ikke oprette genvej: %s</string>
     <string name="library_games_install_path">Installationssti</string>
+    <string name="library_games_not_enough_space">Kræver %1$s mere plads</string>
     <string name="library_games_download_slash_install">Download / Installer</string>
     <string name="library_games_save_management">GEMMEDATA HÅNDTERING</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Tilgængelig: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">Ingen spil installeret\nKlik for at åbne Winlator Backend</string>
     <string name="library_games_installed_badge">INSTALLERET</string>
     <string name="library_games_unknown_game">Ukendt spil</string>
-    <string name="library_games_layouts_header">LAYOUTS</string>
+    <string name="library_games_layouts_header">BIBLIOTEKSLAYOUTS</string>
     <string name="library_games_layout_carousel">Karrusel</string>
     <string name="library_games_layout_list">Liste</string>
+    <string name="library_games_view_options_header">VISNINGSINDSTILLINGER</string>
+    <string name="library_games_immersive_mode">Fordybende tilstand</string>
+    <string name="library_games_immersive_mode_description">Brug det fokuserede spils grafik som baggrund</string>
+    <string name="library_games_immersive_blur">Slør baggrunden</string>
+    <string name="library_games_immersive_blur_description">Anvend en sløringseffekt på den fordybende baggrund</string>
     <string name="library_games_custom_game">Brugerdefineret spil</string>
     <string name="library_games_play">Spil</string>
+    <string name="hero_boot_to_desktop_title">Boot til skrivebord</string>
+    <string name="hero_graphics_tests_title">Grafiktests</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Inputtests</string>
     <string name="library_games_add_custom_game">Tilføj brugerdefineret spil</string>
     <string name="library_games_game_name">Spilnavn</string>
     <string name="library_games_game_folder_mapped_drive">Spilmappe (tilknyttet spildrev)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Annulleret</string>
     <string name="downloads_queue_phase_failed">Mislykkedes: %1$s</string>
     <string name="downloads_queue_cancel_download">Annuller download</string>
+    <string name="downloads_queue_cancel_download_title">Annuller download?</string>
+    <string name="downloads_queue_cancel_download_warning">Annullering af en DLC-, spil- eller opdateringsdownload kan potentielt beskadige din spilinstallation.\n\nEr du sikker på, at du vil annullere?</string>
     <string name="downloads_queue_empty">Ingen aktive downloads.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Ny container</string>
     <string name="containers_list_edit">Rediger container</string>
-    <string name="containers_list_creating">Opretter container…</string>
-    <string name="containers_list_removing">Fjerner container…</string>
-    <string name="containers_list_duplicating">Duplikerer container…</string>
+    <string name="containers_list_creating">Opretter container</string>
+    <string name="containers_list_removing">Fjerner container</string>
+    <string name="containers_list_duplicating">Duplikerer container</string>
+    <string name="containers_list_remove_title">Fjern container</string>
+    <string name="containers_list_duplicate_title">Dupliker container</string>
     <string name="containers_list_confirm_remove">Vil du fjerne denne container?</string>
     <string name="containers_list_confirm_duplicate">Vil du duplikere denne container?</string>
+    <string name="containers_list_duplicate_failed">Kunne ikke duplikere containeren</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Vil du fjerne denne genvej?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Kunne ikke klone genvej.</string>
     <string name="shortcuts_list_exported_to">Genvej eksporteret til %1$s</string>
     <string name="shortcuts_list_failed_export">Kunne ikke eksportere genvej</string>
+    <string name="shortcuts_export_all">Eksportér alle</string>
+    <string name="shortcuts_export_to_frontend">Eksportér til frontend</string>
+    <string name="shortcuts_export_all_done">Eksporterede %1$d spil til %2$s</string>
+    <string name="shortcuts_export_all_none">Ingen spil at eksportere</string>
     <string name="shortcuts_list_added">Genvej tilføjet.</string>
     <string name="shortcuts_list_failed_add">Kunne ikke tilføje genvej.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Deaktiver XInput (For eksklusiv M/KB-styring)</string>
     <string name="shortcuts_properties_exclusive_input">Eksklusivt input</string>
     <string name="shortcuts_properties_custom_game_settings">Brugerdefinerede spilindstillinger</string>
-    <string name="shortcuts_properties_use_cold_client">Brug ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient er den foretrukne måde at håndtere Steam-emulering og DRM. Det patcher DRM under kørsel uden at ændre spilfiler.</string>
-    <string name="shortcuts_properties_unpack_files">Ældre DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">Fjern SteamStub DRM fra exe-filen på disken. Aktivér kun hvis spillet ikke starter uden det. ColdClient\'s runtime-patcher håndterer de fleste spil automatisk.</string>
-    <string name="shortcuts_properties_force_dlc">Tving DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Aktiver kun hvis DLC\'er ikke bliver fundet eller gemmedata med DLC ikke virker</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Start Steam-klient (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Starter den rigtige Steam-klient i Wine\nKræver en Steam-konto og kan reducere ydeevne\nIkke alle spil virker</string>
-    <string name="shortcuts_properties_steam_type">Steam-klient ydeevne</string>
-    <string name="steam_section_emulator">Steam-emulator (Goldberg)</string>
-    <string name="steam_section_real_client">Rigtig Steam-klient</string>
     <string name="shortcuts_properties_use_steam_input">Brug Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Steam offlinetilstand</string>
     <string name="shortcuts_properties_reset">Nulstil egenskaber</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Vil du duplikere denne profil?</string>
     <string name="input_controls_editor_title">Kontroleditor</string>
     <string name="input_controls_editor_toggle_switch">Skiftekontakt</string>
+    <string name="input_controls_editor_swipeable">Swipebar</string>
     <string name="input_controls_editor_profile_exported_to">Profil eksporteret til</string>
     <string name="input_controls_editor_unable_to_import">Kan ikke importere profil</string>
     <string name="input_controls_editor_import_profile">Importer profil</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Kompatibilitet</string>
     <string name="container_box64_intermediate">Mellemliggende</string>
     <string name="container_box64_performance">Ydeevne</string>
+    <string name="container_fexcore_performance_tso">Ydeevne TSO</string>
+    <string name="container_fexcore_extreme">Ekstrem</string>
+    <string name="container_fexcore_extreme_tso">Ekstrem TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Håndtering af flag på CALL/RET-opkoder&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Behandler CALL/RET som om de aldrig havde brug for flag (hurtigere, ustabilt)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">FEXCore-forudindstilling</string>
     <string name="container_fexcore_version">FEXCore-version</string>
+    <string name="use_unix_libs">Brug UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Grafikdriver</string>
+    <string name="container_zink_mode">Zink-tilstand</string>
+    <string name="container_graphics_transcoder">BCn-transkoder</string>
+    <string name="container_graphics_quality">BCn-kvalitet</string>
     <string name="container_graphics_configuration">Grafikdriver-konfiguration</string>
     <string name="container_graphics_version">Grafikdriver-version</string>
     <string name="container_graphics_available_extensions">Tilgængelige udvidelser</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">BCn-emulering</string>
     <string name="container_graphics_bcn_emulation_type">BCn-emuleringstype</string>
     <string name="container_graphics_bcn_emulation_cache">BCn-emuleringscache</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Superopløsning til spil 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Kantskarphed</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Vil du duplikere denne forudindstilling?</string>
     <string name="container_presets_confirm_remove">Vil du fjerne denne forudindstilling?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Brug DRI3-udvidelse</string>
     <string name="session_xserver_simulate_touch_screen">Simuler touchskærm</string>
     <string name="session_xserver_preferences_button_text">   PRÆFERENCER   </string>
     <string name="session_xserver_extra_keys_config_desc">Her kan du indstille værdien af extra-keys-variablen ligesom i Termux-appen (læs <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">dette</a>) og mere \n
@@ -526,12 +572,6 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="session_xserver_pref_kbd">Tastatur</string>
     <string name="session_xserver_pref_other">Andet</string>
     <string name="session_xserver_pref_version">Version</string>
-    <string name="session_xserver_use_dri3_description">Deaktivering kan rette grafiske fejl på visse enheder</string>
-    <string name="session_xserver_native_rendering">Native rendering</string>
-    <string name="session_xserver_native_rendering_enabled">DRI3 hardware-rendering</string>
-    <string name="session_xserver_native_rendering_disabled">Software WSI-fallback</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Native rendering aktiveret (træder i kraft ved næste start)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Native rendering deaktiveret (træder i kraft ved næste start)</string>
     <string name="session_xserver_notification_description">WinNative XServer-beskeder</string>
     <string name="session_xserver_notification_content">WinNative kører, luk ikke eller swipe denne notifikation væk</string>
 
@@ -551,6 +591,8 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="session_drawer_exit_subtitle">Luk den kørende session</string>
     <string name="session_drawer_touchscreen_overlay">Touchskærm-overlay</string>
     <string name="session_drawer_resume">Genoptag</string>
+    <string name="session_drawer_retry">Prøv igen</string>
+    <string name="downloads_no_internet">Ingen internetforbindelse</string>
     <string name="session_drawer_pause">Pause</string>
     <string name="session_drawer_wine_processes_paused">Wine-processer er sat på pause</string>
     <string name="session_drawer_pause_all_wine_processes">Sæt alle Wine-processer på pause</string>
@@ -561,6 +603,33 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Bat.</string>
     <string name="session_drawer_hud_element_graph">Graf</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango-stil HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD-indstillinger</string>
+    <string name="mango_hud_element_gpu_load">GPU-belastning</string>
+    <string name="mango_hud_element_gpu_temp">GPU-temp.</string>
+    <string name="mango_hud_element_cpu_load">CPU-belastning</string>
+    <string name="mango_hud_element_cpu_temp">CPU-temp.</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batteri</string>
+    <string name="mango_hud_element_lows" formatted="false">1% lavpunkter</string>
+    <string name="mango_hud_element_graph">Frametime-graf</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU-frekvens</string>
+    <string name="mango_hud_element_gpu_clock">GPU-frekvens</string>
+    <string name="mango_hud_element_cores">Pr. kerne</string>
+    <string name="mango_hud_element_network">Netværk</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Opløsning</string>
+    <string name="mango_hud_element_wine">Wine-version</string>
+    <string name="mango_hud_element_duration">Sessionstid</string>
+    <string name="mango_hud_element_clock">Ur</string>
+    <string name="mango_hud_element_throttle">Termisk status</string>
+    <string name="mango_hud_group_memory">Hukommelse</string>
+    <string name="mango_hud_group_system">System</string>
+    <string name="mango_hud_lock">Lås HUD</string>
+    <string name="mango_hud_lock_subtitle">Lad berøringer gå videre til knapperne bag HUD\'et. Hold på HUD\'et for at låse det. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Vil du afslutte denne proces?</string>
@@ -591,6 +660,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="session_display_frame_rate">Billedhastighed</string>
     <string name="session_display_title">Skærm</string>
     <string name="session_display_fullscreen_stretched">Aktiver fuldskærm (strakt)</string>
+    <string name="session_display_direct_composition">Direkte komposition (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="session_gamepad_error_loading_profile">Fejl ved indlæsning af profil</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Berøringskontroller</string>
+    <string name="input_controls_auto_hide_on_controller_title">Skjul automatisk ved controller</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Skjul skærmkontroller, når en controller er tilsluttet</string>
     <string name="session_gyroscope_title">Gyroskop</string>
     <string name="session_gyroscope_calibrate">Kalibrer gyroskop</string>
     <string name="session_gyroscope_enable_right_stick">Aktiver gyroskopisk bevægelse for højre stick</string>
@@ -700,6 +773,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_general_select_wallpaper">Vælg baggrundsbillede</string>
     <string name="settings_general_title">Generelt</string>
     <string name="settings_general_enable_file_provider">Aktiver filudbyder</string>
+    <string name="settings_general_enable_auto_scraping">Aktiver automatisk hentning</string>
     <string name="settings_general_take_effect_next_startup">Denne indstilling træder i kraft ved næste opstart.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Geninstaller Imagefs</string>
@@ -713,7 +787,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_general_share_android_clipboard">Del Android-udklipsholder med Wine</string>
     <string name="settings_general_paths_title">Sti-indstillinger</string>
     <string name="settings_general_paths_summary">Administrer hvor Winlator gemmer sine arbejdsdata og hvor eksporterede genveje skrives.</string>
-    <string name="settings_general_winlator_path_title">Winlator-sti</string>
+    <string name="settings_general_winlator_path_title">Lagringssti</string>
     <string name="settings_general_shortcut_export_path_title">Genvejs-eksportsti</string>
     <string name="settings_general_choose_path">Vælg sti</string>
     <string name="settings_general_xserver_cursor_summary">Juster markørhastighed for touch, trackpad og museinput i XServer-sessionen.</string>
@@ -721,7 +795,9 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_general_cursor_lock_summary">Holder direkte museopfangning aktiveret for spil der kræver rå markørinput. Deaktiver med Lydstyrke ned.</string>
     <string name="settings_general_xinput_toggle_title">Deaktiver XInput</string>
     <string name="settings_general_xinput_toggle_summary">Slår XInput-håndtering fra når du ønsker eksklusiv mus- og tastaturkontrol.</string>
-    <string name="settings_general_file_provider_summary">Gør Winlator-filer tilgængelige for Android-dokumentvælgere og filhåndtering.</string>
+    <string name="settings_external_display_output_summary">Flyt spillet til en tilsluttet ekstern skærm i stedet for at spejle denne skærm. Briller bruger altid deres egen skærm.</string>
+    <string name="settings_general_file_provider_summary">Gør WinNative-filer tilgængelige for Android-dokumentvælgere og filhåndtering.</string>
+    <string name="settings_general_auto_scraping_summary">Denne indstilling giver WinNative mulighed for automatisk at hente grafik til brugerdefinerede spil.</string>
     <string name="settings_general_open_browser_summary">Åbn understøttede weblinks i Android-browseren i stedet for inde i Wine.</string>
     <string name="settings_general_clipboard_summary">Tillad kopiering og indsættelse mellem Android og Wine-sessioner.</string>
     <string name="settings_general_imagefs_summary">Gendan medfølgende systemfiler uden at fjerne dine eksisterende containere.</string>
@@ -736,7 +812,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Installation af SoundFont mislykkedes!</string>
     <string name="settings_audio_sound_font_already_exist">Den SoundFont du vil installere eksisterer allerede.</string>
     <string name="settings_audio_unable_to_install_soundfont">Kan ikke installere SoundFont</string>
-    <string name="settings_audio_installing_soundfont">Installerer SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Installerer SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Forkert SoundFont-format.</string>
     <string name="settings_audio_cannot_remove_default">Kan ikke fjerne standard-SoundFont</string>
     <string name="settings_audio_summary">Installer, fjern og vælg den SoundFont der bruges til MIDI-afspilning.</string>
@@ -750,15 +826,33 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_debug_box_logs_subtitle">Skriv Box86 &amp; Box64-fejloutput til fil</string>
     <string name="settings_debug_fex_logs_title">Aktiver FEXCore-logfiler</string>
     <string name="settings_debug_fex_logs_subtitle">Skriv FEXCore-fejloutput til fil</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX-emuleringslogfiler</string>
+    <string name="settings_debug_emulator_logs_subtitle">Logfører den emulator din container bruger, til fil.</string>
     <string name="settings_debug_steam_logs_title">Aktiver Steam-logfiler</string>
     <string name="settings_debug_steam_logs_subtitle">Log Steam-godkendelses- og sessionshændelser til fejlfinding.</string>
     <string name="settings_debug_wine_channels_title">Wine Debug-kanaler</string>
     <string name="settings_debug_wine_channels_summary">Vælg hvilke Wine-kanaler der medtages når Wine-fejllogning er aktiveret.</string>
+    <string name="settings_debug_wine_classes_title">Wine-logniveauer</string>
+    <string name="settings_debug_wine_classes_summary">Vælg hvilke beskedtyper der logges. Trace er ekstremt omfattende.</string>
     <string name="settings_debug_input_logs">Input-logfiler</string>
     <string name="settings_debug_input_logs_description">Log gamepad-, touch- og tastaturinputhændelser</string>
     <string name="settings_debug_download_logs">Download-logfiler</string>
     <string name="settings_debug_download_logs_description">Log download-resolver og WinNative-fallback-hændelser</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan-valideringslag</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Genstart skærmen for at anvende.</string>
     <string name="settings_debug_share_logs">Del logfiler</string>
+    <string name="settings_debug_delete_logs">Slet logfiler</string>
+    <string name="settings_debug_share_all_logs_short">Del alle</string>
+    <string name="settings_debug_download_all_logs_short">Download alle</string>
+    <string name="settings_debug_logs_saved">Gemt i %1$s</string>
+    <string name="settings_debug_delete_logs_short">Slet</string>
+    <string name="settings_debug_delete_all_logs_short">Slet alle</string>
+    <string name="settings_debug_open_logs_folder_short">Åbn loghåndtering</string>
+    <string name="settings_debug_logs_deleted">Logfiler slettet</string>
+    <string name="settings_debug_delete_logs_confirm_title">Slet logfiler?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Dette sletter permanent alle gemte logfiler (%1$s). Det kan ikke fortrydes.</string>
+    <string name="settings_debug_logs_browser_title">Logfiler</string>
+    <string name="settings_debug_log_truncated">Viser de sidste %1$s af denne logfil</string>
     <string name="settings_debug_logs_subject">WinNative-logfiler (%1$s)</string>
     <string name="settings_debug_no_logs_available">Ingen fejlfindingslogfiler tilgængelige. Aktiver fejlfindingsindstillinger først og start et spil.</string>
     <string name="settings_debug_capture_failed">Kunne ikke indfange logfiler: %1$s</string>
@@ -773,6 +867,8 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
 
     <string name="settings_other_language_title">Sprog</string>
     <string name="settings_other_language_summary">Vælg visningssprog</string>
+    <string name="settings_other_game_language_title">Spilsprog</string>
+    <string name="settings_other_game_language_summary">Foretrukket sprog til Steam/Epic/GOG-downloads</string>
     <string name="settings_other_language_system_default">Systemstandard</string>
 
     <string name="settings_other_section_integration">Integration</string>
@@ -790,7 +886,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_content_empty_subtitle">Installer en pakke eller skift type for at komme i gang.</string>
     <string name="settings_content_container_created">Container oprettet: %1$s</string>
     <string name="settings_content_download_failed">Download mislykkedes.</string>
-    <string name="common_ui_working">Arbejder…</string>
+    <string name="common_ui_working">Arbejder</string>
     <string name="settings_content_desc_wine">Lavet af Wine-projektet; oversætter Win32-kald til native Linux/Android-tjenester.</string>
     <string name="settings_content_desc_proton">Lavet af Valve; en Wine-baseret runtime med spilrettelser til Windows-spil.</string>
     <string name="settings_content_desc_dxvk">Oversætter Direct3D 9-, 10- og 11-grafikkald til Vulkan.</string>
@@ -798,6 +894,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_content_desc_box64">Oversætter x86_64 Linux-kode, så den kan køre på ARM64-enheder.</string>
     <string name="settings_content_desc_wowbox64">Box64-build brugt af WoW64 til at køre 32-bit Windows-apps i 64-bit Wine.</string>
     <string name="settings_content_desc_fexcore">Oversætter x86- og x86_64-kode, så den kan køre på ARM64-enheder.</string>
+    <string name="settings_content_desc_d7vk">Oversætter DirectDraw-grafikkald (Direct3D 7 og ældre) til Vulkan.</string>
     <string name="settings_content_unable_to_install">Kan ikke installere indhold.</string>
     <string name="settings_content_install_failed">Installation mislykkedes</string>
     <string name="settings_content_file_cannot_be_recognized">Filen kan ikke genkendes.</string>
@@ -809,9 +906,14 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="settings_content_downloading_title">Downloader indhold</string>
     <string name="settings_content_installing_title">Installerer indhold</string>
     <string name="settings_content_extracting_title">Udpakker indhold</string>
-    <string name="settings_content_extracting_detail">Udpakker… (%1$d filer)</string>
-    <string name="settings_content_preparing_package">Forbereder pakke…</string>
+    <string name="settings_content_extracting_detail">Udpakker (%1$d filer)</string>
+    <string name="settings_content_preparing_package">Forbereder pakke</string>
     <string name="settings_content_download_complete">Download fuldført</string>
+    <string name="settings_content_already_installed_title">Komponent allerede installeret</string>
+    <string name="settings_content_already_installed_message">Denne komponent er allerede installeret. Fjern den installerede kopi, før du downloader den igen.
+
+Installeret sti:
+%1$s</string>
     <string name="settings_content_conflicting_title">Modstridende indhold installeret</string>
     <string name="settings_content_conflicting_message">Afinstaller venligst det modstridende indhold før du downloader denne pakke.
 
@@ -820,7 +922,7 @@ Installeret sti:
     <string name="settings_content_cannot_be_trusted">Indholdet kan ikke betros.</string>
     <string name="settings_content_is_incomplete">Indholdet er ufuldstændigt.</string>
     <string name="settings_content_untrusted_files_warning">Advarsel: Det ekstra indhold indeholder upålidelige filer. Generelt bør følgende filer ikke ændres. Beslut venligst om du vil fortsætte med installationen.</string>
-    <string name="settings_content_confirm_remove">Vil du fjerne dette indhold?</string>
+    <string name="settings_content_confirm_remove">Dette sletter komponenten fra din enhed.</string>
     <string name="settings_content_unable_to_remove_in_use">Kan ikke fjerne dette indhold, fordi en container bruger denne Wine.</string>
     <string name="settings_content_download_in_components">Ingen downloadet. Download venligst en i Komponenter.</string>
     <string name="settings_content_types_header">INDHOLDSTYPER</string>
@@ -832,9 +934,12 @@ Installeret sti:
     <string name="settings_drivers_install">Installer drivere</string>
     <string name="settings_drivers_installed_success">Driver installeret.</string>
     <string name="settings_drivers_install_failed">Kunne ikke installere driver.</string>
-    <string name="settings_drivers_confirm_remove">Vil du fjerne denne driver?</string>
+    <string name="settings_drivers_remove_title">Fjern driver?</string>
+    <string name="settings_drivers_confirm_remove">Dette sletter driveren fra din enhed.</string>
+    <string name="settings_drivers_remove_repo_title">Fjern lager?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s fjernes fra din lagerliste.</string>
     <string name="settings_drivers_repo_tap_to_load">Tryk for at indlæse udgivelser</string>
-    <string name="settings_drivers_repo_loading_releases">Indlæser udgivelser…</string>
+    <string name="settings_drivers_repo_loading_releases">Indlæser udgivelser</string>
     <string name="settings_drivers_repo_release_count">%1$d udgivelser indlæst</string>
     <string name="settings_drivers_repo_no_release_assets">Ingen downloadbare ZIP-filer blev fundet i de hentede udgivelser.</string>
     <string name="settings_drivers_repo_fetch_failed">Kunne ikke indlæse GitHub-udgivelser.</string>
@@ -844,7 +949,7 @@ Installeret sti:
     <string name="settings_drivers_manager">Driver-manager</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Installerer systemfiler…</string>
+    <string name="setup_wizard_installing_system_files">Installerer systemfiler</string>
     <string name="setup_wizard_unable_to_install_system_files">Kan ikke installere systemfiler</string>
     <string name="setup_wizard_system_image_not_installed">Systemimage ikke installeret. Installer venligst komponenter først.</string>
     <string name="setup_wizard_recommended_components">Anbefalede komponenter</string>
@@ -913,6 +1018,9 @@ Installeret sti:
     <string name="google_cloud_sync_started">Skysynkronisering startet.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Google-tjenester</string>
+    <string name="google_auto_signin_title">Log ind på Google ved opstart</string>
+    <string name="google_auto_signin_summary">Opret automatisk forbindelse til Google Play Spil, når appen starter, så sikkerhedskopier af gemte filer og synkronisering altid er klar. Når den er slået fra, logger appen aldrig ind af sig selv.</string>
+    <string name="google_auto_signin_section">Ved opstart</string>
     <string name="google_cloud_play_games">Google Play Spil</string>
     <string name="google_cloud_status_syncing">Synkroniserer</string>
     <string name="google_cloud_status_connected">Forbundet</string>
@@ -971,22 +1079,30 @@ Installeret sti:
     <string name="saves_import_export_exported_failed">Kunne ikke eksportere gemmedata: %1$s</string>
     <string name="saves_import_export_imported">Gemmedata importeret</string>
     <string name="saves_import_export_imported_failed">Kunne ikke importere gemmedata: %1$s</string>
+    <string name="saves_export_path_summary">Gemte spil eksporteres til /WinNative/saves</string>
+    <string name="saves_export_success_path">Eksporteret til %1$s</string>
+    <string name="saves_export_warning_title">Brug kun dette med brugerdefinerede spil</string>
+    <string name="saves_export_warning_body">Eksporten kan indeholde gemte spil fra butiksinstallerede spil eller spil med cloud-synkronisering.</string>
+    <string name="saves_import_warning_title">Dette overskriver eksisterende gemte spil i denne container</string>
+    <string name="saves_import_warning_body">Når du gendanner en ældre sikkerhedskopi med flere spil, skal du først kopiere nyere gemte spil ind i zip-filen med din filhåndtering. Kun gemte spil, der findes i .zip-filen, påvirkes. Administrer dine gemte spil med omtanke.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Container</string>
-    <string name="preloader_initializing">Initialiserer…</string>
-    <string name="preloader_launching">Starter…</string>
-    <string name="preloader_closing">Lukker %1$s…</string>
-    <string name="preloader_setup_environment">Opsætter miljø…</string>
-    <string name="preloader_installing_mono">Installerer Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Installerer redistribuerbare filer…</string>
-    <string name="preloader_unpacking_exe">Udpakker spilprogram…</string>
-    <string name="preloader_downloading_cloud">Downloader cloud-gemte data…</string>
-    <string name="preloader_syncing_cloud">Synkroniserer cloud-gemte data…</string>
-    <string name="preloader_cloud_downloading">Cloud Sync downloader…</string>
-    <string name="preloader_cloud_backup">Sikkerhedskopierer til Google Drev…</string>
+    <string name="preloader_initializing">Initialiserer</string>
+    <string name="preloader_launching">Starter</string>
+    <string name="preloader_closing">Lukker %1$s</string>
+    <string name="preloader_setup_environment">Opsætter miljø</string>
+    <string name="preloader_retrying_steam_client_download">Prøver at downloade Steam-klienten igen</string>
+    <string name="preloader_installing_mono">Installerer Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Installerer redistribuerbare filer</string>
+    <string name="preloader_unpacking_exe">Udpakker spilprogram</string>
+    <string name="preloader_downloading_cloud">Downloader cloud-gemte data</string>
+    <string name="preloader_syncing_cloud">Synkroniserer cloud-gemte data</string>
+    <string name="preloader_uploading_cloud">Uploader cloud-gemte data</string>
+    <string name="preloader_checking_cloud">Kontrollerer cloud-gemte data</string>
+    <string name="preloader_cloud_sync_retry">%1$s Prøver igen %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Cloud Sync downloader</string>
     <string name="cloud_sync_failed_provider">%1$s cloud-synkronisering mislykkedes.</string>
-    <string name="google_cloud_backup_failed">Sikkerhedskopiering til Google Drev mislykkedes.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Installeret sti:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Grafik</string>
-    <string name="container_backups_title">Sikkerhedskopier</string>
-    <string name="container_backups_prompt">Vælg en handling for denne containersikkerhedskopi.</string>
-    <string name="container_backups_backing_up">Sikkerhedskopierer container…</string>
-    <string name="container_backups_restoring">Gendanner container…</string>
-    <string name="container_backups_checking">Kontrollerer containersikkerhedskopier…</string>
-    <string name="container_backups_select_title">Vælg sikkerhedskopi der skal gendannes</string>
-    <string name="container_backups_no_files">Der blev ikke fundet nogen containersikkerhedskopier i Google Drive.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Primær binding</string>
     <string name="binding_secondary">Sekundær binding</string>
+    <string name="binding_third">Tertiær binding</string>
+    <string name="binding_fourth">Kvartær binding</string>
     <string name="input_controls_editor_tap_to_switch">Tryk for at skifte</string>
     <string name="input_controls_editor_download_profile">Download profil</string>
     <string name="container_config_emulator_section">Emulator</string>
@@ -1010,6 +1122,7 @@ Installeret sti:
     <string name="session_drawer_fps_monitor">FPS-overvågning</string>
     <string name="session_drawer_fps_monitor_subtitle">Vis ydeevnestatistik i realtid</string>
     <string name="session_drawer_dual_series_battery">Dual Series-batteri</string>
+    <string name="session_drawer_hud_frametime_numeric">Vis frametime som tal</string>
     <string name="session_drawer_command_center">Kommandocenter</string>
     <string name="session_drawer_command_center_input">Input</string>
     <string name="session_drawer_command_center_display">Skærm</string>
@@ -1022,7 +1135,6 @@ Installeret sti:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Naturlig</string>
     <string name="session_drawer_color_profile_crt">CRT-effekt</string>
-    <string name="session_drawer_upscaler_dls">Levende</string>
     <string name="session_drawer_calibrate_advanced">Avanceret kalibrering</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Gyro</string>
@@ -1034,7 +1146,6 @@ Installeret sti:
     <string name="session_drawer_rail_label_mouse">Mus</string>
     <string name="session_drawer_rail_label_fullscreen">Fuldskærm</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Nativ</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Opgaver</string>
     <string name="session_drawer_rail_label_logs">Logs</string>
@@ -1048,24 +1159,23 @@ Installeret sti:
     <string name="session_drawer_logs_share_chooser">Del sessionslogs</string>
     <string name="session_drawer_logs_share_failed">Kunne ikke dele logs</string>
     <string name="session_drawer_logs_share_empty">Ingen loglinjer at dele</string>
-    <string name="session_drawer_super_resolution">Skarphedsfiltre</string>
-    <string name="session_drawer_upscaler_mode">Filter</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Superopløsning</string>
+    <string name="session_drawer_upscaler_mode">Opskalering</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Levende</string>
+    <string name="session_drawer_vivid_strength">Levende styrke</string>
     <string name="session_drawer_main_menu_title">Menu</string>
     <string name="session_gyroscope_activator">Aktivator</string>
     <string name="settings_general_check_for_updates">Søg efter opdateringer</string>
     <string name="settings_general_check_for_updates_summary">Søg automatisk efter nye appversioner ved opstart og med jævne mellemrum.</string>
     <string name="setup_wizard_containers">Containeropsætning</string>
-    <string name="google_cloud_auto_backup">Automatisk sikkerhedskopi af Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Sikkerhedskopiér automatisk spilsaves til Google Drive hver gang du afslutter et spil.</string>
     <string name="cloud_saves_title">Cloud-saves</string>
-    <string name="cloud_saves_backup">Sikkerhedskopiér cloud-save</string>
-    <string name="cloud_saves_restore">Gendan cloud-save</string>
+    <string name="cloud_saves_title_for_provider">%1$s cloud-saves - %2$s</string>
     <string name="cloud_sync_title">Cloud Sync</string>
     <string name="cloud_sync_enabled_summary">Download cloud-saves ved opstart og synkroniser/sikkerhedskopiér dem ved afslutning.</string>
     <string name="cloud_sync_disabled_summary">Start dette spil uden download af cloud-save eller synkronisering ved afslutning.</string>
-    <string name="cloud_saves_backing_up">Sikkerhedskopierer cloud-save…</string>
-    <string name="cloud_saves_restoring">Gendanner cloud-save…</string>
+    <string name="cloud_saves_backing_up">Sikkerhedskopierer cloud-save</string>
+    <string name="cloud_saves_restoring">Gendanner cloud-save</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Installeret sti:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Styrer caching af genererede dynarec-blokke mellem kørsler for at fremskynde opstart.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@ Installeret sti:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch: cloud saves, downloads queue, session drawer, HUD position, artwork picker, runtime patcher (110 strings) -->
+    <string name="cloud_saves_history_empty">Ingen tidligere saves er sikkerhedskopieret endnu. Erstattede saves og manuelle sikkerhedskopier vises her i 30 dage.</string>
+    <string name="cloud_saves_history_loading">Indlæser save-historik\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">cloud</string>
+    <string name="cloud_saves_history_origin_local">lokal</string>
+    <string name="cloud_saves_history_origin_manual">manuel</string>
+    <string name="cloud_saves_history_refresh">Opdater</string>
+    <string name="cloud_saves_history_rename">Omdøb</string>
+    <string name="cloud_saves_history_rename_clear">Ryd</string>
+    <string name="cloud_saves_history_rename_failed">Kunne ikke omdøbe sikkerhedskopi.</string>
+    <string name="cloud_saves_history_rename_hint">f.eks. Bossfight, Før slutningen</string>
+    <string name="cloud_saves_history_rename_save">Gem</string>
+    <string name="cloud_saves_history_rename_success">Sikkerhedskopi omdøbt.</string>
+    <string name="cloud_saves_history_rename_title">Navngiv denne sikkerhedskopi</string>
+    <string name="cloud_saves_history_restore">Gendan</string>
+    <string name="cloud_saves_history_restore_confirm_body">Dette vil erstatte dit nuværende lokale save med sikkerhedskopien fra %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Gendan denne sikkerhedskopi?</string>
+    <string name="cloud_saves_history_restore_failed">Kunne ikke gendanne denne sikkerhedskopi.</string>
+    <string name="cloud_saves_history_restore_success">Save gendannet fra sikkerhedskopi.</string>
+    <string name="cloud_saves_history_sign_in">Log ind på Google for at se din save-historik.</string>
+    <string name="cloud_saves_history_title">Save-historik</string>
+    <string name="cloud_saves_history_download">Download</string>
+    <string name="cloud_saves_history_download_success">Filen er downloadet.</string>
+    <string name="cloud_saves_history_download_failed">Download mislykkedes.</string>
+    <string name="cloud_saves_keep_replaced_backup">Behold en sikkerhedskopi af det erstattede save</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Hvis du fortryder, kan du gendanne det fra Save-historik.</string>
+    <string name="cloud_saves_no_backups">Ingen sikkerhedskopier endnu for dette spil.</string>
+    <string name="cloud_saves_offline_mode">Deaktiver Cloud Sync</string>
+    <string name="cloud_saves_offline_mode_summary">Stopper al automatisk cloud-aktivitet for dette spil.</string>
+    <string name="cloud_saves_sync_from_provider">Synkroniser fra %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_failed">Kunne ikke downloade save fra %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Administrer GOG-cloudlagringer</string>
+    <string name="cloud_saves_gog_manage_helper">Åbner det officielle GOG-websted</string>
+    <string name="cloud_saves_gog_manage_no_browser">Ingen browser tilgængelig til at åbne siden med GOG-cloudlagringer</string>
+    <string name="cloud_saves_gog_zip_label">Download GOG-cloud-zip</string>
+    <string name="cloud_saves_gog_zip_helper">Gem aktuelle cloudfiler</string>
+    <string name="cloud_saves_gog_zip_success">GOG-cloudlagringer zip-fil gemt.</string>
+    <string name="cloud_saves_gog_zip_failed">Kunne ikke gemme zip-filen med GOG-cloudlagringer.</string>
+    <string name="cloud_saves_gog_zip_empty">Ingen GOG-cloudlagringsfiler fundet.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Synkroniser fra Cloud</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s cloud-save downloadet.</string>
+    <string name="cloud_saves_syncing_from_provider">Downloader save fra %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Hent den version %1$s har lige nu.</string>
+    <string name="cloud_saves_sync_summary_generic">Hent den nuværende cloud-version.</string>
+    <string name="common_ui_exit_app_confirm">Afslut WinNative?</string>
+    <string name="container_surface_effect">Overfladeeffekt</string>
+    <string name="downloads_queue_cancel_download_confirm">Annuller downloaden af %1$s og slet alle downloadede filer?</string>
+    <string name="downloads_queue_paused_resume_hint">Sat på pause – tryk på Fortsæt for at genoptage</string>
+    <string name="downloads_queue_phase_applying_data">Anvender data</string>
+    <string name="downloads_queue_phase_downloading">Downloader</string>
+    <string name="downloads_queue_phase_downloading_file">Downloader [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Afslutter</string>
+    <string name="downloads_queue_phase_patching">Patcher</string>
+    <string name="downloads_queue_phase_preparing">Forbereder</string>
+    <string name="downloads_queue_phase_queued">I kø</string>
+    <string name="downloads_queue_phase_unknown">Ukendt</string>
+    <string name="downloads_queue_phase_unpacking">Udpakker</string>
+    <string name="downloads_queue_phase_updating">Opdaterer</string>
+    <string name="downloads_queue_phase_verifying">Verificerer</string>
+    <string name="downloads_queue_phase_verifying_file">Verificerer [%1$s]</string>
+    <string name="downloads_queue_status_label">Status:</string>
+    <string name="downloads_queue_this_game">dette spil</string>
+    <string name="hud_position_bottom_center">Bund centrum</string>
+    <string name="hud_position_bottom_left">Bund venstre</string>
+    <string name="hud_position_bottom_right">Bund højre</string>
+    <string name="hud_position_left_center">Venstre centrum</string>
+    <string name="hud_position_menu_title">Flyt HUD til</string>
+    <string name="hud_position_right_center">Højre centrum</string>
+    <string name="hud_position_top_center">Top centrum</string>
+    <string name="hud_position_top_left">Top venstre</string>
+    <string name="hud_position_top_right">Top højre</string>
+    <string name="input_controls_editor_number_of_bindings">Antal bindinger</string>
+    <string name="input_controls_editor_opacity">Gennemsigtighed</string>
+    <string name="input_controls_editor_radial_menu">Radialmenu</string>
+    <string name="input_controls_editor_radial_menu_options">Radialmenupunkter</string>
+    <string name="input_controls_tap_to_click">Tryk for at klikke</string>
+    <string name="input_controls_reverse_binding_order">Omvendt rækkefølge for bindinger</string>
+    <string name="num_controllers">Antal controllere</string>
+    <string name="session_drawer_controls_section">Kontroller</string>
+    <string name="session_drawer_header_subtitle">Hurtig adgang til kontroller, overlays og sessionsværktøjer</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_alpha_input_title">Angiv alfa</string>
+    <string name="session_drawer_hud_disabled_hint">Slå overlayet til for at tilpasse det</string>
+    <string name="session_drawer_hud_elements">HUD-elementer</string>
+    <string name="session_drawer_hud_input_hint">Angiv en værdi fra %1$d til %2$d. Værdier over grænsen afskæres.</string>
+    <string name="session_drawer_hud_scale">Skalering</string>
+    <string name="session_drawer_hud_scale_input_title">Angiv skalering</string>
+    <string name="session_drawer_hud_summary">Juster overlay-synlighed og datapunkter</string>
+    <string name="session_drawer_screen_effects">Skærmeffekter</string>
+    <string name="session_drawer_session_section">Session</string>
+    <string name="session_drawer_swipe_hint">Stryg væk for at vende tilbage til spillet</string>
+    <string name="session_gamepad_enable_vibration">Aktiver vibration</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Eksperimentel musebevægelse</string>
+    <string name="session_gyroscope_mouse_scale">Museskalering</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Museskalering: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Åbn opsætningsguiden igen for at gennemgå tilladelser, systemfiler og standardcontainere.</string>
+    <string name="settings_other_setup_wizard_title">Opsætningsguide</string>
+    <string name="shortcuts_library_artwork_failed">Kunne ikke indlæse det valgte billede.</string>
+    <string name="shortcuts_library_artwork_open_source">Åbn SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Indstil billede</string>
+    <string name="shortcuts_library_artwork_title">Biblioteksbilleder</string>
+    <string name="shortcuts_library_artwork_icon_title">Ikonbillede</string>
+    <string name="shortcuts_library_artwork_hero_title">Baggrund</string>
+    <string name="shortcuts_list_readded_existing">Eksisterende genvej genføjet</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injicerer en DRM-patcher-DLL ved opstart. Reducerer FPS – brug kun hvis Legacy Launcher alene fejler.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Vælg mappe til gemte spil</string>
+    <string name="cloud_saves_custom_folder_label">Mappe til gemte spil</string>
+    <string name="cloud_saves_custom_select_folder_summary">Peg på gemmemappen inde i containeren</string>
+    <string name="cloud_saves_custom_no_container">Containeren er ikke tilgængelig for denne genvej</string>
+    <string name="cloud_saves_custom_picker_title">Vælg gemmemappe</string>
+    <string name="cloud_saves_custom_outside_drive_c">Den valgte mappe skal være inde i containerens C:-drev</string>
+    <string name="cloud_saves_custom_path_map_failed">Kunne ikke knytte den valgte mappe til en Windows-sti.</string>
+    <string name="cloud_saves_custom_folder_set">Gemmemappe sat til %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Synkroniser fra Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Download seneste gemte spil</string>
+    <string name="cloud_saves_steam_sync_success">Synkroniseret fra Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud-synkronisering mislykkedes</string>
+    <string name="cloud_saves_steam_browse_label">Vis Steam Cloud-saves</string>
+    <string name="cloud_saves_steam_browse_helper">Åbn cloudlager</string>
+    <string name="cloud_saves_steam_browse_no_browser">Ingen browser tilgængelig til at åbne Steam-siden</string>
+    <string name="cloud_saves_steam_import_label">Importér filer</string>
+    <string name="cloud_saves_steam_import_helper">Gendan downloadede filer</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Filvælger utilgængelig</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Dette downloader Steam Clouds aktuelle gemte filer og overskriver de aktuelle gemte filer.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Ugyldigt app-id</string>
+    <string name="cloud_saves_label_saved">Etiket gemt</string>
+    <string name="downloads_queue_cancel_all_title">Annuller alle downloads?</string>
+    <string name="downloads_queue_cancel_all_warning">Annullering af DLC-, spil- eller opdateringsdownloads kan potentielt beskadige dine spilinstallationer.\n\nEr du sikker på, at du vil annullere alle downloads og slette de filer, der er downloadet indtil nu?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Brug Legacy Launcher</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Ældre Steam-emulering: kører spillet gennem ColdClient-launcheren og fjerner SteamStub DRM fra exe-filen. Brug kun til ældre spil, der ikke virker med Steam Launcher.</string>
+    <string name="steam_section_real_client">WinNative ægte Steam-klient</string>
+    <string name="steam_section_emulator">Ældre Steam-emulator</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Får den emulerede Steam-klient til at melde sig offline, så spillet ikke forsøger onlineforbindelser. Bruges til spil, der hænger ved Steams netværkstjek.</string>
+    <string name="input_controls_select_style">Vælg stil</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Skifer</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Glimt</string>
+    <string name="input_controls_style_shadow">Skygge</string>
+    <string name="input_controls_style_reticle">Sigtekryds</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Farvetema</string>
+    <string name="input_controls_edit_duplicating_builtin">Indbygget profil - oprettede en kopi, du kan redigere.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Nulstil denne profil til dens oprindelige layout? Alle ændringer, du har lavet, går tabt.</string>
+    <string name="input_controls_editor_profile_reset">Profil nulstillet til dens oprindelige layout.</string>
+    <string name="input_controls_editor_reset_unavailable">Intet oprindeligt snapshot er tilgængeligt for denne profil.</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan-skærmsynkronisering</string>
+    <string name="cloud_sync_disable_title">Deaktiver cloud-gemte spil</string>
+    <string name="cloud_saves_steam_push_label">Upload til Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Tving upload af lokalt gemt spil</string>
+    <string name="cloud_saves_steam_push_success">Gemt spil uploadet til Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Kunne ikke uploade gemt spil til Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud er utilgængelig lige nu. Genopretter forbindelsen i baggrunden tryk opdater, når du er online igen.</string>
+    <string name="steam_session_refused_event">Steam afviste den cachede session (EResult=%1$d). Log ind igen.</string>
+    <string name="settings_hud_record_to_file_title">Optag ydeevne til fil</string>
+    <string name="settings_hud_record_to_file_summary">Eksporterer FPS-, CPU-, GPU-, temperatur- og batterimålinger pr. sekund til /WinNative/logs/ under spil.</string>
+    <string name="settings_leaderboard_category">Ydeevne</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Forbereder Steam-miljø</string>
+    <string name="preloader_starting_wine">Starter Wine</string>
+    <string name="preloader_starting_steam_launcher">Starter Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Indlæser Steam-klient</string>
+    <string name="preloader_connecting_to_steam">Opretter forbindelse til Steam</string>
+    <string name="preloader_signing_in_to_steam">Logger ind på Steam</string>
+    <string name="preloader_fetching_game_info">Logget ind — henter spilinfo</string>
+    <string name="preloader_steam_ready">Steam er klar</string>
+    <string name="preloader_updating_game_info">Opdaterer spilinfo</string>
+    <string name="preloader_verifying_install">Bekræfter installation</string>
+    <string name="preloader_scanning_redists">Scanner videredistribuerbare pakker</string>
+    <string name="preloader_installing_redist_single">Installerer videredistribuerbar pakke</string>
+    <string name="preloader_installing_named_redist">Installerer %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Installerer %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Videredistribuerbare pakker klar</string>
+    <string name="preloader_no_redists">Ingen videredistribuerbare pakker at installere</string>
+    <string name="preloader_steam_service_running">Steam-tjenesten kører</string>
+    <string name="preloader_launching_game">Starter %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher fejlede — forbereder ressourcer igen</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher kunne ikke starte. Forbereder igen — genstart venligst</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher nåede spillet, men det startede aldrig</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Indlæser Workshop-elementer</string>
+    <string name="workshop_search_items">Søg i Workshop-elementer</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Henter dine abonnerede emner fra Steam.</string>
+    <string name="workshop_error_title">Kunne ikke indlæse Workshop-emner</string>
+    <string name="workshop_error_subtitle">Noget gik galt. Prøv igen.</string>
+    <string name="workshop_empty_title">Ingen abonnerede Workshop-emner</string>
+    <string name="workshop_empty_subtitle">Abonnér på emner i Steam Workshop, og åbn derefter dette vindue igen.</string>
+    <string name="workshop_search_empty_title">Ingen emner matcher \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Prøv et andet søgeord.</string>
+    <string name="workshop_clear_search">Ryd søgning</string>
+    <string name="workshop_item_fallback">Workshop-emne</string>
+    <string name="common_ui_failed">Mislykket</string>
+    <string name="steam_presence_snooze">Snooze</string>
+    <string name="steam_presence_busy">Optaget</string>
+    <string name="steam_presence_looking_to_trade">Vil bytte</string>
+    <string name="steam_presence_looking_to_play">Vil spille</string>
+    <string name="steam_friends_count">Venner — %1$d online</string>
+    <string name="steam_friends_section_in_game">I spil (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Ingen venner indlæst endnu.</string>
+    <string name="steam_friends_chat_off">Chat er slået fra. Slå chattjenesten til igen for at se dine venner.</string>
+    <string name="steam_friends_self_you">Dig</string>
+    <string name="steam_friends_in_game">I spil</string>
+    <string name="steam_friends_join">Deltag</string>
+    <string name="steam_friends_play">Spil</string>
+    <string name="steam_chat_image_failed">(billedet kunne ikke sendes)</string>
+    <string name="steam_chat_empty">Ingen beskeder endnu. Sig hej!</string>
+    <string name="steam_chat_uploading_image">Uploader billede…</string>
+    <string name="steam_chat_send_image">Send billede</string>
+    <string name="steam_chat_message_hint">Besked…</string>
+    <string name="steam_chat_send">Send</string>
+    <string name="steam_chat_image">Billede</string>
+    <string name="steam_common_back">Tilbage</string>
+    <string name="steam_achievements_title">Præstationer</string>
+    <string name="steam_achievements_empty">Ingen præstationer fundet for dette spil,\neller log ind på Steam for at indlæse dem.</string>
+    <string name="steam_achievements_hidden">Skjult præstation</string>
+    <string name="steam_achievements_hidden_desc">Bliv ved med at spille for at afsløre denne præstation.</string>
+    <string name="steam_achievements_unlocked_on">Låst op %1$s</string>
+    <string name="steam_achievements_unlocked">Låst op</string>
+    <string name="steam_join_joining">Deltager hos %1$s i %2$s…</string>
+    <string name="steam_join_install">Installer %1$s for at deltage hos %2$s</string>
+    <string name="steam_join_not_owned">Du ejer ikke %1$s</string>
+    <string name="steam_chat_not_sent">(ikke sendt)</string>
+    <string name="steam_join_the_game">spillet</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Chattjeneste</string>
+    <string name="steam_chat_setting_service_desc">Log ind for at se venner og chatte; slå fra for at fremstå offline</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Udgang</string>
+    <string name="display_output_prompt_title">Ekstern skærm registreret</string>
+    <string name="display_output_prompt_message">Send spillet til den tilsluttede skærm? Dine skærmknapper og menuen forbliver på denne telefon.</string>
+    <string name="display_output_prompt_swap">Skift skærme</string>
+    <string name="display_output_prompt_mirror">Spejl</string>
+    <string name="display_output_swapped_toast">Spil flyttet til ekstern skærm. Knapperne forbliver på din telefon.</string>
+    <string name="display_output_cast_unavailable">Indstillinger for trådløs skærm er ikke tilgængelige på denne enhed.</string>
+    <string name="display_output_restored_toast">Ekstern skærm afbrudt — spillet er vendt tilbage til telefonen.</string>
+    <string name="session_drawer_output_title">Skærmudgang</string>
+    <string name="session_drawer_output_subtitle">Spillet vises på den eksterne skærm.</string>
+    <string name="session_drawer_output_device">Tilsluttet skærm</string>
+    <string name="session_drawer_output_resolution">Opløsning</string>
+    <string name="session_drawer_output_refresh_rate">Opdateringshastighed</string>
+    <string name="session_drawer_output_aspect_ratio">Billedformat</string>
+    <string name="session_drawer_output_aspect_fit">Tilpas (format)</string>
+    <string name="session_drawer_output_aspect_stretch">Stræk (udfyld)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (beskær)</string>
+    <string name="session_drawer_output_return_to_phone">Tilbage til telefonen</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Cast til et tv</string>
+    <string name="session_drawer_output_cast_body">Tilslut en USB-C-/HDMI-adapter, eller tryk nedenfor for at forbinde en trådløs skærm (Miracast / Wi-Fi Direct). Spillet vises på tv\'et, mens disse knapper forbliver på din telefon.</string>
+    <string name="session_drawer_output_cast_button">Forbind trådløs skærm</string>
+    <string name="session_drawer_output_cast_note">Tv\'er med kun Chromecast kan ikke vise live-spil med private knapper — brug en trådløs skærm eller en USB‑C-/HDMI-adapter for det bedste resultat.</string>
+    <string name="session_drawer_output_render_note">De tilstande, din skærm rapporterer, ændrer dens faktiske udgang (den kan blive sort et øjeblik, mens den geninitialiserer). Andre opløsninger gengives i den størrelse og skaleres via hardware til panelet — over den oprindelige bliver det skarpere (supersampling), under bliver det hurtigere.</string>
+    <string name="session_drawer_output_scaling_note">Denne telefon sender skærmen ud i dens oprindelige %1$s og skifter ikke tilstand, så dette indstiller renderingsopløsningen — den hardware‑skaleres til panelet (højere end oprindelig giver skarpere billede, lavere kører hurtigere).</string>
+    <string name="session_drawer_output_game_mode">Spiltilstand (lav latenstid)</string>
+    <string name="session_drawer_output_game_mode_on">Til</string>
+    <string name="session_drawer_output_game_mode_off">Fra</string>
+    <string name="session_drawer_output_game_mode_note">Anmoder om tv\'ets spil-/lavlatensstilstand (HDMI ALLM) for at minimere inputforsinkelse. Vises kun, når den tilsluttede skærm understøtter det.</string>
+    <string name="session_drawer_output_send_to_display">Send spil til skærm</string>
+    <string name="session_drawer_output_to_display">Output til ekstern skærm</string>
+    <string name="session_drawer_output_send_note">En skærm er tilsluttet. Send spillet til den — dine knapper og menuen forbliver på denne telefon. Du kan altid hente det tilbage hertil.</string>
+    <string name="session_drawer_output_display">Skærm</string>
+    <string name="session_drawer_output_glasses">Briller</string>
+    <string name="session_drawer_output_brightness">Lysstyrke</string>
+    <string name="session_drawer_output_shade">Skygge (dæmpning)</string>
+    <string name="session_drawer_output_3d">3D (side om side)</string>
+    <string name="glasses_panel_refresh">Opdateringshastighed</string>
+    <string name="glasses_panel_sunblock">Solfilter</string>
+    <string name="session_drawer_output_volume">Lydstyrke</string>
+    <string name="session_drawer_output_glasses_note">Sendes direkte til dine Viture-briller via USB.</string>
+
+    <!-- Session > Touch &amp; Gesture Profiles -->
+    <string name="common_ui_new">Ny</string>
+    <string name="common_ui_rename">Omdøb</string>
+    <string name="gesture_profile_export">Eksporter gestusprofil</string>
+    <string name="gesture_profile_import">Importer gestusprofil</string>
+    <string name="gesture_profile_new">Ny gestusprofil</string>
+    <string name="gesture_profile_none">Ingen gestusprofiler</string>
+    <string name="input_controls_editor_input_profiles_section">Inputprofiler</string>
+    <string name="session_drawer_right_stick_sensitivity">Følsomhed for højre stik</string>
+    <string name="session_drawer_rts_gestures">RTS-gestusser</string>
+    <string name="session_drawer_rts_gestures_edit">Rediger</string>
+    <string name="session_drawer_touch">Berøring</string>
+    <string name="session_drawer_touch_map_right_stick">Tilknyt højre stik</string>
+    <string name="session_drawer_touch_touchscreen">Touchskærm-tilstand</string>
+    <string name="session_drawer_touch_trackpad">Pegeplade</string>
+    <string name="session_gesture_profile_section">Gestusprofil</string>
+    <string name="session_rts_action">Handling</string>
+    <string name="session_rts_behavior">Adfærd</string>
+    <string name="session_rts_double_tap">Dobbelttryk (dobbelt venstreklik)</string>
+    <string name="session_rts_double_tap_delay">Forsinkelse for dobbelttryk (ms)</string>
+    <string name="session_rts_down">Ned</string>
+    <string name="session_rts_drag">1-finger-træk</string>
+    <string name="session_rts_pan1">1-finger-panorering</string>
+    <string name="session_rts_drag2">2-finger-træk</string>
+    <string name="session_rts_drag_threshold">Trækgrænse (px)</string>
+    <string name="session_rts_gesture_threshold">Gestusgrænse (px)</string>
+    <string name="session_rts_hold2">2-finger-hold</string>
+    <string name="session_rts_hold3">3-finger-hold</string>
+    <string name="session_rts_hold4">4-finger-hold</string>
+    <string name="session_rts_hold_delay">Holdeforsinkelse (ms)</string>
+    <string name="session_rts_left">Venstre</string>
+    <string name="session_rts_long_press">Langt tryk</string>
+    <string name="session_rts_long_press_delay">Forsinkelse for langt tryk (ms)</string>
+    <string name="session_rts_pan">2-finger-panorering</string>
+    <string name="session_rts_pan_threshold">Start for panorering/knib (px)</string>
+    <string name="session_rts_right">Højre</string>
+    <string name="session_rts_swipe3">3-finger-stryg</string>
+    <string name="session_rts_swipe4">4-finger-stryg</string>
+    <string name="session_rts_swipe_threshold">Strygegrænse (px)</string>
+    <string name="session_rts_tap1">1-finger-tryk</string>
+    <string name="session_rts_tap2">2-finger-tryk</string>
+    <string name="session_rts_tap3">3-finger-tryk</string>
+    <string name="session_rts_tap4">4-finger-tryk</string>
+    <string name="session_rts_up">Op</string>
+    <string name="session_rts_zoom">Knib for zoom</string>
+    <string name="session_drawer_brightness">Lysstyrke</string>
+    <string name="session_drawer_contrast">Kontrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Mætning</string>
+    <string name="session_drawer_temperature">Temperatur</string>
+    <string name="session_drawer_tint">Farvetone</string>
+    <string name="session_drawer_intensity">Intensitet</string>
+    <string name="session_drawer_strength">Styrke</string>
+    <string name="session_drawer_sharpen">Skarphed</string>
+    <string name="session_drawer_scanlines">Scanlinjer</string>
+    <string name="session_drawer_pixelate">Pixelering</string>
+    <string name="session_drawer_block_size">Blokstørrelse</string>
+    <string name="session_drawer_scale">Skalering</string>
+    <string name="session_drawer_scale_nearest">Nærmeste</string>
+    <string name="session_drawer_scale_linear">Lineær</string>
+    <string name="session_drawer_scale_bicubic">Bikubisk</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Tegneserie</string>
+    <string name="session_drawer_color_blind">Farveblind</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Nulstil effekter</string>
+    <string name="session_drawer_hud_background">Baggrund</string>
+    <string name="session_drawer_hud_background_alpha">Baggrundsalfa</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Indstil baggrundsalfa</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Tilpas størrelse</string>
+    <string name="session_task_bring_to_front">Flyt til forgrunden</string>
+    <string name="session_task_custom_value">Brugerdefineret værdi</string>
+    <string name="session_gyroscope_orientation_mode">Vip for at sigte (orientering)</string>
+
+    <!-- File manager -->
+    <string name="file_manager_title">Filer</string>
+    <string name="file_manager_copy">Kopier</string>
+    <string name="file_manager_cut">Klip</string>
+    <string name="file_manager_paste">Indsæt</string>
+    <string name="file_manager_paste_here">Indsæt her</string>
+    <string name="file_manager_new_folder">Ny mappe</string>
+    <string name="file_manager_new_folder_short">Mappe</string>
+    <string name="file_manager_multi_select">Vælg</string>
+    <string name="file_manager_create">Opret</string>
+    <string name="file_manager_delete">Slet</string>
+    <string name="file_manager_copy_count">Kopier (%1$d)</string>
+    <string name="file_manager_cut_count">Klip (%1$d)</string>
+    <string name="file_manager_delete_count">Slet (%1$d)</string>
+    <string name="file_manager_extract">Udpak</string>
+    <string name="file_manager_extract_here">Udpak her</string>
+    <string name="file_manager_extract_to">Udpak til…</string>
+    <string name="file_manager_extracting">Udpakker %1$s</string>
+    <string name="file_manager_extract_failed">Udpakning mislykkedes</string>
+    <string name="file_manager_run_boot">Kør / Boot</string>
+    <string name="file_manager_create_shortcut">Opret genvej</string>
+    <string name="file_manager_run_in_container">Kør i container</string>
+    <string name="file_manager_no_containers">Ingen containere tilgængelige</string>
+    <string name="file_manager_delete_confirm">Slet \"%1$s\"? Dette kan ikke fortrydes.</string>
+    <string name="file_manager_delete_confirm_multi">Slet %1$d elementer? Dette kan ikke fortrydes.</string>
+    <string name="file_manager_copying">Kopierer %1$s</string>
+    <string name="file_manager_moving">Flytter %1$s</string>
+    <string name="file_manager_copying_count">Kopierer %1$d elementer</string>
+    <string name="file_manager_moving_count">Flytter %1$d elementer</string>
+    <string name="file_manager_paste_into_itself">Kan ikke indsætte en mappe i sig selv</string>
+    <string name="file_manager_operation_failed">Handlingen mislykkedes</string>
+    <string name="file_manager_delete_failed">Sletning mislykkedes</string>
+    <string name="file_manager_rename_failed">Omdøbning mislykkedes</string>
+    <string name="file_manager_create_folder_failed">Oprettelse af mappe mislykkedes</string>
+    <string name="cloud_saves_google_backup_helper">Gem en kopi til Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Sikkerhedskopiér til Google</string>
+    <string name="cloud_saves_google_backup_no_save">Ingen gemte filer fundet at sikkerhedskopiere.</string>
+    <string name="cloud_saves_history_cloud_readonly">Skrivebeskyttet</string>
+    <string name="session_drawer_rail_label_record">Optag</string>
+    <string name="session_record_failed">Kunne ikke starte optagelse</string>
+    <string name="session_record_fps">Billedhastighed</string>
+    <string name="session_record_include_ui">Optag brugerflade</string>
+    <string name="session_record_include_ui_subtitle">Inkludér HUD og skærmknapper</string>
+    <string name="session_record_now">Optag nu</string>
+    <string name="session_record_quality">Kvalitet</string>
+    <string name="session_record_resolution">Opløsning</string>
+    <string name="session_record_saved">Optagelse gemt i WinNative/Recordings</string>
+    <string name="session_record_settings_title">Optageindstillinger</string>
+    <string name="session_record_started">Optagelse startet</string>
+    <string name="steam_chat_setting_stay_running">Kør i baggrunden</string>
+    <string name="steam_chat_setting_stay_running_desc">Hold chatten kørende, efter du afslutter WinNative</string>
+    <string name="settings_content_refresh">Opdater</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Overfør gemt spil</string>
+    <string name="retro_save_transfer_message">Importer et lokalt gemt spil til dette spil, eller eksporter det aktuelle gemte spil.</string>
+    <string name="retro_save_transfer_import">Importer gemt spil</string>
+    <string name="retro_save_transfer_export">Eksporter gemt spil</string>
+    <string name="retro_save_transfer_import_ok">Gemt spil importeret</string>
+    <string name="retro_save_transfer_import_failed">Kunne ikke importere gemt spil</string>
+    <string name="retro_save_transfer_export_ok">Gemt spil eksporteret</string>
+    <string name="retro_save_transfer_export_failed">Kunne ikke eksportere gemt spil</string>
+    <string name="retro_save_transfer_none">Der findes endnu ikke et gemt spil til dette spil</string>
+    <string name="retro_cheats_title">Snydekoder</string>
+    <string name="retro_cheats_hardcore_blocked">Snydekoder er deaktiveret i Hardcore-tilstand</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Gem</string>
+    <string name="retro_ps2_cancel">Annuller</string>
+    <string name="retro_ps2_save_state">Gem tilstand</string>
+    <string name="retro_ps2_load_save_state">Indlæs gemt tilstand</string>
+    <string name="retro_ps2_achievements">Præstationer</string>
+    <string name="retro_ps2_cheats">Snydekoder</string>
+    <string name="retro_ps2_memory_cards">Memory Cards</string>
+    <string name="retro_ps2_fast_forward">Spol frem</string>
+    <string name="retro_ps2_reset">Nulstil</string>
+    <string name="retro_ps2_swap_disc">Skift disk</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Tryk for at indlæse</string>
+    <string name="retro_ps2_slot_empty">Tom</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Tryk for at overskrive</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Tom – tryk for at gemme</string>
+    <string name="retro_ps2_slot_is_empty">Slot %1$d er tom</string>
+    <string name="retro_ps2_loaded_slot">Indlæste slot %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Kunne ikke indlæse slot %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Gemt i slot %1$d</string>
+    <string name="retro_ps2_save_failed">Gem mislykkedes</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Tryk for at bruge</string>
+    <string name="retro_ps2_new_memory_card">Nyt Memory Card</string>
+    <string name="retro_ps2_import_card">Importér kort</string>
+    <string name="retro_ps2_enable_online_dev9">Aktivér online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2-netværksadapter – genstarter spillet for at tilslutte den</string>
+    <string name="retro_ps2_ethernet_device">Ethernet-enhed</string>
+    <string name="retro_ps2_dns_mode">DNS-tilstand</string>
+    <string name="retro_ps2_primary_dns">Primær DNS</string>
+    <string name="retro_ps2_secondary_dns">Sekundær DNS</string>
+    <string name="retro_ps2_optional">valgfri</string>
+    <string name="retro_ps2_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">tryk for at angive IP (tom fjerner)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Tilføj serverhost</string>
+    <string name="retro_ps2_new_server_hostname">Nyt servernavn</string>
+    <string name="retro_ps2_server_hostname_hint">f.eks. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Skærmknapper</string>
+    <string name="retro_ps2_edit_layout">Rediger layout</string>
+    <string name="retro_ps2_reset_layout">Nulstil layout</string>
+    <string name="retro_ps2_layout_reset">Layout nulstillet</string>
+    <string name="retro_ps2_left_stick_invert_x">Venstre stik: Invertér X</string>
+    <string name="retro_ps2_left_stick_invert_y">Venstre stik: Invertér Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Højre stik: Invertér X</string>
+    <string name="retro_ps2_right_stick_invert_y">Højre stik: Invertér Y</string>
+    <string name="retro_ps2_button_color">Knapfarve</string>
+    <string name="retro_ps2_letter_color">Bogstavfarve</string>
+    <string name="retro_ps2_shadow_color">Skyggefarve</string>
+    <string name="retro_ps2_background_color">Baggrundsfarve</string>
+    <string name="retro_ps2_reset_colors">Nulstil farver</string>
+    <string name="retro_ps2_renderer">Renderer</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Opløsningsskala</string>
+    <string name="retro_ps2_scale_1x_native">1x (Native)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Billedformat</string>
+    <string name="retro_ps2_aspect_stretch">Stræk</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Skærmfilter</string>
+    <string name="retro_ps2_filter_nearest">Nærmeste</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilineær (Blød)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilineær (Skarp)</string>
+    <string name="retro_ps2_texture_filter">Teksturfilter</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilineær (Tvunget)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilineær (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilineær (Sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Blandingsnøjagtighed</string>
+    <string name="retro_ps2_blend_minimum">Minimum</string>
+    <string name="retro_ps2_blend_basic">Grundlæggende</string>
+    <string name="retro_ps2_blend_medium">Middel</string>
+    <string name="retro_ps2_blend_high">Høj</string>
+    <string name="retro_ps2_blend_full">Fuld</string>
+    <string name="retro_ps2_blend_maximum">Maksimum</string>
+    <string name="retro_ps2_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_ps2_shader_off">Fra</string>
+    <string name="retro_ps2_shader_scanline">Scanline</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Wave</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Frame Skip</string>
+    <string name="retro_ps2_frameskip_off">Fra</string>
+    <string name="retro_ps2_frameskip_1">Spring 1 over</string>
+    <string name="retro_ps2_frameskip_2">Spring 2 over</string>
+    <string name="retro_ps2_frameskip_3">Spring 3 over</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Lydstyrke</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Lyd fra</string>
+    <string name="retro_ps2_swap_stereo_channels">Byt stereokanaler</string>
+    <string name="retro_ps2_ee_cycle_rate">EE-cyklushastighed</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (Standard)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE-cyklusspring</string>
+    <string name="retro_ps2_skip_off">Fra</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Hurtig CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emuleringshastighed</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU-forbrug</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU-forbrug</string>
+    <string name="retro_ps2_hud_internal_resolution">Intern opløsning</string>
+    <string name="retro_ps2_deinterlace_mode">Deinterlace-tilstand</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Fra</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV-billedformat</string>
+    <string name="retro_ps2_anti_blur">Anti-slør</string>
+    <string name="retro_ps2_widescreen_patches">Widescreen-patches</string>
+    <string name="retro_ps2_no_interlace_patches">No-interlace-patches</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC-spin-registrering</string>
+    <string name="retro_ps2_wait_loop">Venteløkke-registrering</string>
+    <string name="retro_ps2_time_stretch">Lyd-timestretch</string>
+    <string name="retro_ps2_audio_buffer">Lydbuffer</string>
+    <string name="retro_ps2_audio_latency">Outputlatens</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Frametider</string>
+    <string name="retro_ps2_hud_gs_stats">GS-statistik</string>
+    <string name="retro_ps2_hud_hw_info">Hardwareinfo</string>
+    <string name="retro_ps2_hud_version">Version</string>
+    <string name="retro_ps2_hud_input_display">Inputvisning</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Skærm</string>
+    <string name="retro_ps2_tab_performance">Ydeevne</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Lyd</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Kontroller</string>
+    <string name="retro_ps2_resume">Fortsæt</string>
+    <string name="retro_ps2_pause">Pause</string>
+    <string name="retro_ps2_exit">Afslut</string>
+    <string name="retro_lr_bios_imported">BIOS importeret: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Ugyldig BIOS-fil</string>
+    <string name="retro_lr_invalid_retro_game">Ugyldigt retrospil</string>
+    <string name="retro_lr_rom_not_found">ROM ikke fundet: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Kunne ikke læse ROM\'en i dette arkiv</string>
+    <string name="retro_lr_core_not_installed">Kerne ikke installeret: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Snydekoder aktiveret – præstationer er deaktiveret for denne session</string>
+    <string name="retro_lr_cloud_save_restored">Cloud-gem gendannet</string>
+    <string name="retro_lr_restore_failed">Gendannelse mislykkedes</string>
+    <string name="retro_lr_cloud_conflict_message">Der findes et nyere cloud-gem for %1$s. Vil du synkronisere, og hvilket cloud-gem foretrækker du at beholde?</string>
+    <string name="retro_lr_cloud_save">Cloud-gem</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Emulatorkernen kunne ikke indlæses</string>
+    <string name="retro_lr_failed_load_rom">ROM kunne ikke indlæses</string>
+    <string name="retro_lr_graphics_not_supported">Grafik understøttes ikke af denne kerne</string>
+    <string name="retro_lr_emulator_error">Emulatorfejl</string>
+    <string name="retro_lr_shader_default">Standard</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Skarp</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR-opskalering</string>
+    <string name="retro_lr_upscale_native">Native</string>
+    <string name="retro_lr_sound">Lyd</string>
+    <string name="retro_lr_left_stick_invert_x">Venstre stik: Invertér X</string>
+    <string name="retro_lr_left_stick_invert_y">Venstre stik: Invertér Y</string>
+    <string name="retro_lr_right_stick_invert_x">Højre stik: Invertér X</string>
+    <string name="retro_lr_right_stick_invert_y">Højre stik: Invertér Y</string>
+    <string name="retro_lr_on_screen_controls">Skærmknapper</string>
+    <string name="retro_lr_haptic_feedback">Haptisk feedback</string>
+    <string name="retro_lr_portrait">Stående</string>
+    <string name="retro_lr_landscape">Liggende</string>
+    <string name="retro_lr_edit_layout">Rediger layout (%1$s)</string>
+    <string name="retro_lr_reset_layout">Nulstil %1$s-layout</string>
+    <string name="retro_lr_layout_reset">%1$s-layout nulstillet</string>
+    <string name="retro_lr_button_color">Knapfarve</string>
+    <string name="retro_lr_letter_color">Bogstavfarve</string>
+    <string name="retro_lr_shadow_color">Skyggefarve</string>
+    <string name="retro_lr_background_color">Baggrundsfarve</string>
+    <string name="retro_lr_reset_colors">Nulstil farver</string>
+    <string name="retro_lr_colors_reset">Farver nulstillet</string>
+    <string name="retro_lr_performance_hud">Ydeevne-HUD</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Baggrundsalfa</string>
+    <string name="retro_lr_background">Baggrund</string>
+    <string name="retro_lr_scale">Skala</string>
+    <string name="retro_lr_numeric_frametime">Numerisk frametid</string>
+    <string name="retro_lr_dual_series_battery">Dual-serie batteri</string>
+    <string name="retro_lr_hud_elements">HUD-ELEMENTER</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsol</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batteri</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Graf</string>
+    <string name="retro_lr_hud_cpu_temp">CPU-temp.</string>
+    <string name="retro_lr_save_state">Gem tilstand</string>
+    <string name="retro_lr_load_save_state">Indlæs gemt tilstand</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Indlæsning af tilstande er deaktiveret i Hardcore-tilstand</string>
+    <string name="retro_lr_achievements">Præstationer</string>
+    <string name="retro_lr_cheats">Snydekoder</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Snydekoder er deaktiveret i Hardcore-tilstand</string>
+    <string name="retro_lr_reset">Nulstil</string>
+    <string name="retro_lr_fast_forward">Spol frem</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Spol frem er deaktiveret i Hardcore-tilstand</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disk %1$d/%2$d</string>
+    <string name="retro_lr_resume">Fortsæt</string>
+    <string name="retro_lr_pause">Pause</string>
+    <string name="retro_lr_exit">Afslut</string>
+    <string name="retro_lr_saved_to_slot">Gemt i slot %1$d</string>
+    <string name="retro_lr_could_not_save_state">Kunne ikke gemme tilstand</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS påkrævet</string>
+    <string name="retro_lr_bios_required_message">PlayStation-spil kræver en rigtig konsol-BIOS-fil, som du selv skal levere. Importér en BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin eller scph7001.bin) for at fortsætte.</string>
+    <string name="retro_lr_import_bios">Importér BIOS…</string>
+    <string name="retro_lr_cancel">Annuller</string>
+    <string name="retro_lr_slot_empty">Slot %1$d er tom</string>
+    <string name="retro_lr_loaded_slot">Indlæste slot %1$d</string>
+    <string name="retro_lr_could_not_load_state">Kunne ikke indlæse tilstand</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Omdøb slot %1$d</string>
+    <string name="retro_gs_section_general">Generelt</string>
+    <string name="retro_gs_section_graphics">Grafik</string>
+    <string name="retro_gs_section_performance">Ydeevne</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Input</string>
+    <string name="retro_gs_section_audio">Lyd</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Annuller</string>
+    <string name="retro_gs_save">Gem</string>
+    <string name="retro_gs_shader_default">Standard</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Skarp</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Native</string>
+    <string name="retro_gs_group_game">SPIL</string>
+    <string name="retro_gs_label_name">Navn</string>
+    <string name="retro_gs_label_system">System</string>
+    <string name="retro_gs_label_emulator_core">Emulatorkerne</string>
+    <string name="retro_gs_label_rom_path">ROM-sti</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">Installeret</string>
+    <string name="retro_gs_bios_none">Ingen – påkrævet for at køre %1$s-spil</string>
+    <string name="retro_gs_import_bios">Importér BIOS…</string>
+    <string name="retro_gs_remove_bios">Fjern BIOS</string>
+    <string name="retro_gs_group_library_artwork">BIBLIOTEKSGRAFIK</string>
+    <string name="retro_gs_artwork_game_card">Spilkortbillede</string>
+    <string name="retro_gs_artwork_grid">Gitterbillede</string>
+    <string name="retro_gs_artwork_carousel">Karrusellbillede</string>
+    <string name="retro_gs_artwork_list">Listebillede</string>
+    <string name="retro_gs_artwork_custom_set">Brugerdefineret billede angivet</string>
+    <string name="retro_gs_artwork_set_image">Angiv billede</string>
+    <string name="retro_gs_artwork_remove">Fjern</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Videofilter</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR-opskalering</string>
+    <string name="retro_gs_performance_hud">Ydeevne-HUD</string>
+    <string name="retro_gs_group_core">KERNE</string>
+    <string name="retro_gs_renderer">Renderer</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Opløsningsskala</string>
+    <string name="retro_gs_scale_1x_native">1x (Native)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Billedformat</string>
+    <string name="retro_gs_aspect_stretch">Stræk</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Skærmfilter</string>
+    <string name="retro_gs_filter_nearest">Nærmeste</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilineær (Blød)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilineær (Skarp)</string>
+    <string name="retro_gs_texture_filter">Teksturfilter</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilineær (Tvunget)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilineær (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilineær (Sprites)</string>
+    <string name="retro_gs_blending_accuracy">Blandingsnøjagtighed</string>
+    <string name="retro_gs_blend_minimum">Minimum</string>
+    <string name="retro_gs_blend_basic">Grundlæggende</string>
+    <string name="retro_gs_blend_medium">Middel</string>
+    <string name="retro_gs_blend_high">Høj</string>
+    <string name="retro_gs_blend_full">Fuld</string>
+    <string name="retro_gs_blend_maximum">Maksimum</string>
+    <string name="retro_gs_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_gs_off">Fra</string>
+    <string name="retro_gs_tvshader_scanline">Scanline</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Wave</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Frame Skip</string>
+    <string name="retro_gs_frameskip_1">Spring 1 over</string>
+    <string name="retro_gs_frameskip_2">Spring 2 over</string>
+    <string name="retro_gs_frameskip_3">Spring 3 over</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">YDEEVNE</string>
+    <string name="retro_gs_ee_cycle_rate">EE-cyklushastighed</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (Standard)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE-cyklusspring</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Hurtig CDVD</string>
+    <string name="retro_gs_group_performance_hud">YDEEVNE-HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emuleringshastighed</string>
+    <string name="retro_gs_hud_cpu_usage">CPU-forbrug</string>
+    <string name="retro_gs_hud_gpu_usage">GPU-forbrug</string>
+    <string name="retro_gs_hud_internal_resolution">Intern opløsning</string>
+    <string name="retro_gs_deinterlace_mode">Deinterlace-tilstand</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Fra</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV-billedformat</string>
+    <string name="retro_gs_anti_blur">Anti-slør</string>
+    <string name="retro_gs_widescreen_patches">Widescreen-patches</string>
+    <string name="retro_gs_no_interlace_patches">No-interlace-patches</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC-spin-registrering</string>
+    <string name="retro_gs_wait_loop">Venteløkke-registrering</string>
+    <string name="retro_gs_time_stretch">Lyd-timestretch</string>
+    <string name="retro_gs_audio_buffer">Lydbuffer</string>
+    <string name="retro_gs_audio_latency">Outputlatens</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Frametider</string>
+    <string name="retro_gs_hud_gs_stats">GS-statistik</string>
+    <string name="retro_gs_hud_hw_info">Hardwareinfo</string>
+    <string name="retro_gs_hud_version">Version</string>
+    <string name="retro_gs_hud_input_display">Inputvisning</string>
+    <string name="retro_gs_fast_boot">Hurtig opstart</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Aktivér online</string>
+    <string name="retro_gs_ethernet_device">Ethernet-enhed</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS-tilstand</string>
+    <string name="retro_gs_dns_manual">Manuel</string>
+    <string name="retro_gs_dns_internal">Intern</string>
+    <string name="retro_gs_primary_dns">Primær DNS</string>
+    <string name="retro_gs_secondary_dns">Sekundær DNS</string>
+    <string name="retro_gs_dns_optional">valgfri</string>
+    <string name="retro_gs_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_gs_group_input">INPUT</string>
+    <string name="retro_engine_save">Gem</string>
+    <string name="retro_engine_saved">Spil gemt</string>
+    <string name="retro_engine_loading">Indlæser…</string>
+    <string name="retro_engine_load">Indlæs</string>
+    <string name="retro_engine_saved_to">Gemt til %1$s</string>
+    <string name="retro_engine_slot_active_only">Aktiv</string>
+    <string name="retro_engine_rename_slot">Omdøb gemmeplads</string>
+    <string name="retro_engine_caught">%1$d fanget</string>
+    <string name="retro_engine_no_slots">Ingen gemmepladser endnu</string>
+    <string name="retro_engine_new_slot">Ny gemmeplads</string>
+    <string name="retro_engine_achievements_unavailable">Ikke registreret i 3D-tilstand</string>
+    <string name="retro_engine_fullscreen">Fuld skærm</string>
+    <string name="retro_engine_loaded_from">Indlæste %1$s</string>
+    <string name="retro_engine_slot_empty">Den plads er tom</string>
+    <string name="retro_engine_loading_subtitle">Forbereder spildata for første gang</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Spil dette spil i 3D-voxelmotoren i stedet for den almindelige kerne</string>
+    <string name="retro_gs_on_screen_controls">Skærmknapper</string>
+    <string name="retro_gs_haptic_feedback">Haptisk feedback</string>
+    <string name="retro_gs_group_audio">LYD</string>
+    <string name="retro_gs_volume">Lydstyrke</string>
+    <string name="retro_gs_mute">Lyd fra</string>
+    <string name="retro_gs_swap_stereo">Byt stereokanaler</string>
+    <string name="retro_gs_sound">Lyd</string>
+    <string name="retro_scr_retro_defaults">RETRO-STANDARDER</string>
+    <string name="retro_scr_retro_defaults_desc">Standarder, der anvendes på hver konsols spil, medmindre de tilsidesættes i et spils egne indstillinger.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Konto</string>
+    <string name="retro_scr_signed_in">Logget ind</string>
+    <string name="retro_scr_not_signed_in_hint">Ikke logget ind – åbn et spils præstationer for at logge ind</string>
+    <string name="retro_scr_achievements_enabled">Præstationer aktiveret</string>
+    <string name="retro_scr_hardcore_default">Hardcore-tilstand som standard (ingen gemte tilstande)</string>
+    <string name="retro_scr_sign_out">Log ud</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">Installeret</string>
+    <string name="retro_scr_none_ps1_bios">Ingen – PS1-spil kræver en BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importér PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS fjernet</string>
+    <string name="retro_scr_no_bios_to_remove">Ingen BIOS at fjerne</string>
+    <string name="retro_scr_remove_ps1_bios">Fjern PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">Ingen – PS2-spil kræver en BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Sammenlagt enkeltfil-dump (regionsmærket .bin, ~4 MB). Opdelte ROM0/MEC/NVM-sæt accepteres ikke.</string>
+    <string name="retro_scr_import_ps2_bios">Importér PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS fjernet</string>
+    <string name="retro_scr_remove_ps2_bios">Fjern PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">BIBLIOTEKSGRAFIK</string>
+    <string name="retro_scr_retro_case_art">Retro coverart (kassette / cd-cover)</string>
+    <string name="retro_scr_box_art">Coverart</string>
+    <string name="retro_scr_box_art_desc">Hentes automatisk fra thumbnails.libretro.com ved import; et brugerdefineret billede tilsidesætter det altid.</string>
+    <string name="retro_scr_roms_folder">ROMS-MAPPE</string>
+    <string name="retro_scr_folder">Mappe</string>
+    <string name="retro_scr_roms_not_set">Ikke angivet – vælg en mappe for automatisk import af spil</string>
+    <string name="retro_scr_auto_import">Auto-import</string>
+    <string name="retro_scr_auto_import_desc">Nye spil i denne mappe tilføjes automatisk til dit bibliotek med den korrekte konsol registreret.</string>
+    <string name="retro_scr_select_roms_folder_title">Vælg ROMs-mappe</string>
+    <string name="retro_scr_select_roms_folder_button">Vælg ROMs-mappe…</string>
+    <string name="retro_scr_change_roms_folder_button">Skift ROMs-mappe…</string>
+    <string name="retro_scr_scan_now">Scan nu</string>
+    <string name="retro_scr_console_defaults">KONSOL-STANDARDER</string>
+    <string name="retro_scr_console_defaults_desc">Tryk på en konsol for at angive dens standardindstillinger.</string>
+    <string name="retro_scr_renderer">Renderer</string>
+    <string name="retro_scr_upscale_resolution">Opskalér opløsning</string>
+    <string name="retro_scr_aspect_ratio">Billedformat</string>
+    <string name="retro_scr_aspect_stretch">Stræk</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Skærmfilter</string>
+    <string name="retro_scr_filter_nearest">Nærmeste</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilineær (Blød)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilineær (Skarp)</string>
+    <string name="retro_scr_texture_filter">Teksturfilter</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilineær (Tvunget)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilineær (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilineær (Sprites)</string>
+    <string name="retro_scr_blending_accuracy">Blandingsnøjagtighed</string>
+    <string name="retro_scr_blend_minimum">Minimum</string>
+    <string name="retro_scr_blend_basic">Grundlæggende</string>
+    <string name="retro_scr_blend_medium">Middel</string>
+    <string name="retro_scr_blend_high">Høj</string>
+    <string name="retro_scr_blend_full">Fuld</string>
+    <string name="retro_scr_blend_maximum">Maksimum</string>
+    <string name="retro_scr_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_scr_shader_off">Fra</string>
+    <string name="retro_scr_shader_scanline">Scanline</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Wave</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Frame Skip</string>
+    <string name="retro_scr_skip_1">Spring 1 over</string>
+    <string name="retro_scr_skip_2">Spring 2 over</string>
+    <string name="retro_scr_skip_3">Spring 3 over</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">EE-cyklushastighed</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (Standard)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE-cyklusspring</string>
+    <string name="retro_scr_skip_off">Fra</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Hurtig CDVD</string>
+    <string name="retro_scr_touch_controls">Berøringsknapper på skærmen</string>
+    <string name="retro_scr_sound">Lyd</string>
+    <string name="retro_scr_swap_stereo">Byt stereokanaler</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: Emuleringshastighed</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU-forbrug</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU-forbrug</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: Intern opløsning</string>
+    <string name="retro_scr_enable_online_dev9">Aktivér online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet-enhed</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS-tilstand</string>
+    <string name="retro_scr_dns_manual">Manuel</string>
+    <string name="retro_scr_dns_internal">Intern</string>
+    <string name="retro_scr_primary_dns">Primær DNS</string>
+    <string name="retro_scr_secondary_dns">Sekundær DNS</string>
+    <string name="retro_scr_optional">valgfri</string>
+    <string name="retro_scr_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR-opskalering</string>
+    <string name="retro_scr_performance_hud">Ydeevne-HUD</string>
+    <string name="retro_scr_credits_licenses">MEDVIRKENDE &amp; LICENSER</string>
+    <string name="retro_scr_credits_desc">Nogle af WinNatives funktioner er bygget på disse open source-projekter. Tryk for at se hver kilde.</string>
+    <string name="retro_scr_tab_defaults">Standarder</string>
+    <string name="retro_scr_tab_credits">Medvirkende</string>
+    <string name="retro_scr_enable_hardcore_title">Aktivér Hardcore-tilstand?</string>
+    <string name="retro_scr_enable_hardcore_body">Hardcore-tilstand nulstiller spillet nu og deaktiverer indlæsning af gemte tilstande, spol frem og snydekoder. Ugemt fremskridt går tabt. Fortsæt?</string>
+    <string name="retro_scr_cancel">Annuller</string>
+    <string name="retro_scr_enable">Aktivér</string>
+    <string name="retro_scr_bios_imported">BIOS importeret: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Ugyldig BIOS-fil</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS importeret: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Ugyldig PS2 BIOS-fil</string>
+    <string name="retro_scr_no_game_serial">Intet spilserienummer at slå snydekoder op for.</string>
+    <string name="retro_scr_applied_cheats">Anvendte %1$d snydekode(r).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Kunne ikke anvende snydekoder.</string>
+    <string name="retro_scr_cheats">Snydekoder</string>
+    <string name="retro_scr_apply">Anvend</string>
+    <string name="retro_scr_no_cheats_found">Ingen snydekoder fundet for dette spil.</string>
+    <string name="retro_scr_achievements">Præstationer</string>
+    <string name="retro_scr_sign_in_ra">Log ind på RetroAchievements</string>
+    <string name="retro_scr_username">Brugernavn</string>
+    <string name="retro_scr_password">Adgangskode</string>
+    <string name="retro_scr_login_failed">Login mislykkedes</string>
+    <string name="retro_scr_signing_in">Logger ind…</string>
+    <string name="retro_scr_sign_in">Log ind</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d p.</string>
+    <string name="retro_scr_no_achievements">Ingen præstationer for dette spil.</string>
+    <string name="retro_scr_back">Tilbage</string>
+    <string name="retro_scr_enabled">Aktiveret</string>
+    <string name="retro_scr_disabled">Deaktiveret</string>
+    <string name="retro_scr_rename">Omdøb</string>
+    <string name="retro_scr_save">Gem</string>
+    <string name="retro_scr_cloud_save_conflict">Cloud-gemmekonflikt</string>
+    <string name="retro_scr_keep_local_save">Behold lokalt gem</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Skærm</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Lyd</string>
+    <string name="retro_tab_controls">Kontroller</string>
+    <string name="retro_scan_up_to_date">Bibliotek opdateret</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">tilføjet %1$d</string>
+    <string name="retro_scan_removed">fjernet %1$d</string>
+    <string name="retro_scr_shader_default">Standard</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Skarp</string>
+    <string name="retro_scr_upscale_native">Native</string>
+    <string name="retro_co_aspect_ratio">Billedformat</string>
+    <string name="retro_co_ntsc_filter">NTSC-filter</string>
+    <string name="retro_co_colorization">Farvelægning</string>
+    <string name="retro_co_color_correction">Farvekorrektion</string>
+    <string name="retro_co_remove_sprite_limit">Fjern sprite-grænse</string>
+    <string name="retro_co_resolution">Opløsning</string>
+    <string name="retro_co_framebuffer_emulation">Framebuffer-emulering</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Widescreen-hack</string>
+    <string name="retro_co_val_8_7_native">8:7 (Native)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Fra</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">GBA-skærm</string>
+    <string name="retro_co_val_gbc_screen">GBC-skærm</string>
+    <string name="retro_co_val_on">Til</string>
+    <string name="retro_co_val_320x240_native">320x240 (Native)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 justeret</string>
+    <string name="retro_co_val_native">Native</string>
+    <string name="retro_co_val_internal">Intern</string>
+    <string name="retro_co_val_on_16_9">Til (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Log ind med din RetroAchievements-konto for at optjene og følge præstationer for retrospil.</string>
+    <string name="retro_ach_username">Brugernavn</string>
+    <string name="retro_ach_password">Adgangskode</string>
+    <string name="retro_ach_enter_credentials">Indtast dit brugernavn og din adgangskode</string>
+    <string name="retro_ach_login_failed">Login mislykkedes</string>
+    <string name="retro_ach_sign_in">Log ind</string>
+    <string name="retro_ach_password_disclaimer">Din adgangskode bruges kun én gang til at hente et login-token, som gemmes sikkert på enheden.</string>
+    <string name="retro_ach_achievements_enabled">Præstationer aktiveret</string>
+    <string name="retro_ach_hardcore_mode">Hardcore-tilstand (ingen gemte tilstande)</string>
+    <string name="retro_ach_points">%1$d / %2$d point</string>
+    <string name="retro_ach_none_found">Ingen præstationer fundet for dette spil.</string>
+    <string name="retro_ach_sign_out">Log ud</string>
+    <string name="retro_che_brand">SNYDEKODER</string>
+    <string name="retro_che_name">Navn</string>
+    <string name="retro_che_code">Kode</string>
+    <string name="retro_che_cancel">Annuller</string>
+    <string name="retro_che_save">Gem</string>
+    <string name="retro_che_default_name">Snydekode %1$d</string>
+    <string name="retro_che_empty">Ingen snydekoder endnu. Tilføj en snydekode til dette spil.</string>
+    <string name="retro_che_add">Tilføj snydekode</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU-driver</string>
+    <string name="retro_gpu_driver_system">System (Standard)</string>
+    <string name="retro_gpu_driver_hint">Installer Turnip-drivere under Indstillinger \u2192 Drivere. De samme drivere virker til både PC- og PS2-spil.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Virtuelt internt drev til HDD-baserede spil som Final Fantasy XI. Genstarter spillet.</string>
+    <string name="retro_ps2_hdd_desc">Virtuelt internt drev til HDD-baserede spil som Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">DNS-tilstand indstillet til Internal, så dine tilpassede serverhosts træder i kraft.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">CPU-kerne</string>
+<string name="retro_co_dual_core">Dobbeltkerne</string>
+<string name="retro_co_internal_cheats">Interne snydekoder</string>
+<string name="retro_co_internal_resolution">Intern opløsning</string>
+<string name="retro_co_renderer">Renderer</string>
+<string name="retro_co_sensor_bar">Placering af sensorbjælke</string>
+<string name="retro_co_skip_gc_bios">Spring BIOS-intro over</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Nederst</string>
+<string name="retro_co_val_cached_interpreter">Cachet fortolker</string>
+<string name="retro_co_val_hardware">Hardware</string>
+<string name="retro_co_val_interpreter">Fortolker</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Mus / berøring</string>
+<string name="retro_co_val_right_stick_absolute">Højre stik (absolut)</string>
+<string name="retro_co_val_right_stick_relative">Højre stik (relativt)</string>
+<string name="retro_co_val_software">Software</string>
+<string name="retro_co_val_stretch">Stræk</string>
+<string name="retro_co_val_top">Øverst</string>
+<string name="retro_co_vbi_skip">VBI-spring (auto-billedspring)</string>
+<string name="retro_co_widescreen">Bredformat</string>
+<string name="retro_co_wiimote_pointer">Wiimote-markør</string>
+<string name="retro_gs_cheats_apply_note">Ændringer træder i kraft, næste gang du starter dette spil.</string>
+<string name="retro_gs_cheats_detect_hint">Start dette spil én gang, så dets diskserienummer kan registreres, hvorefter snydekoder og patches vises her.</string>
+<string name="retro_gs_dnas_entry_desc">DNAS-godkendelsesomgåelse — påkrævet for onlinespil</string>
+<string name="retro_gs_dnas_group">Anvendes automatisk (online)</string>
+<string name="retro_gs_group_cheats">Snydekoder &amp; patches</string>
+<string name="retro_gs_hdd_image_size">Størrelse: %1$s</string>
+<string name="retro_gs_hdd_import">Importér HDD-billede</string>
+<string name="retro_gs_hdd_remove_short">Fjern</string>
+<string name="retro_gs_netplay_enable">Aktivér NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">Slået fra som standard. Aktivér, og vælg derefter Vær vært eller Deltag før start.\nSlås fra igen, når du forlader spillet.</string>
+<string name="retro_gs_netplay_host">Værtsadresse</string>
+<string name="retro_gs_netplay_host_hint">IP eller værtsnavn</string>
+<string name="retro_gs_netplay_host_mode">Værtssession</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Til = vent på en spiller. Fra = deltag på værtsadresse</string>
+<string name="retro_gs_netplay_not_ready">NetPlay bruger lokale multiplayer-porte over TCP (spiller 1 vært / spiller 2 klient). PS2-online bruger i stedet DEV9 Ethernet.</string>
+<string name="retro_gs_netplay_port">Port</string>
+<string name="retro_lr_memory_card_slot">Hukommelseskort %1$d</string>
+<string name="retro_lr_screenshot">Skærmbillede</string>
+<string name="retro_lr_use_cloud_save">Brug cloud-gemning</string>
+<string name="retro_netplay_conn_direct">LAN (direkte IP)</string>
+<string name="retro_netplay_connecting">Opretter forbindelse…</string>
+<string name="retro_netplay_connection">Forbindelse</string>
+<string name="retro_netplay_conn_traversal">Online (værtskode)</string>
+<string name="retro_netplay_dismiss">Afvis</string>
+<string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay bruger Dolphin\'s egen motor. Vært = Spiller 1, Deltag = Spiller 2. Vælg Vær vært eller Deltag og en forbindelsestype før start; begge enheder starter det samme spil sammen.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Del din enheds Wi‑Fi-IP og denne port med Spiller 2. Spillet starter automatisk, når de opretter forbindelse.</string>
+<string name="retro_netplay_dolphin_host_online_hint">En værtskode vises, når spillet starter — del den med Spiller 2. Spillet starter automatisk, når de opretter forbindelse.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Indtast værtens Wi‑Fi-IP og port, og start derefter for at oprette forbindelse.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Indtast værtskoden fra Spiller 1, og start derefter for at oprette forbindelse.</string>
+<string name="retro_netplay_enable_before_launch">Aktivér NetPlay i spilindstillinger, og vælg Vær vært eller Deltag før start</string>
+<string name="retro_netplay_find_rooms">Find rum på Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · hver skærm er sin egen håndholdte konsol</string>
+<string name="retro_netplay_gba_not_ready">GBA-multiplayer bruger gpSP + trådløs adapter. Sørg for, at libgpsp er installeret.</string>
+<string name="retro_netplay_help">Multiplayer med delt skærm over Wi‑Fi (ligesom RetroArch).\nVært = Spiller 1, Deltag = Spiller 2. Begge enheder viser det samme spil.</string>
+<string name="retro_netplay_help_game_link">Game Link over Wi‑Fi — hver enhed kører sit eget spil.\nGB/GBC: Gambatte seriel forbindelse (Pokémon Gen 1–2).\nGBA: gpSP trådløs adapter (Pokémon FR/LG/Emerald-kampe).</string>
+<string name="retro_netplay_host_action">Vær vært for rum</string>
+<string name="retro_netplay_host_code">Værtskode</string>
+<string name="retro_netplay_host_code_hint">Traversal-værtskode fra værten</string>
+<string name="retro_netplay_hosting_room">Er vært for rum</string>
+<string name="retro_netplay_host_mode_hint">Tryk på Vær vært for at åbne et rum til denne spilsession, og start derefter spillet. NetPlay slås fra, når du afslutter.</string>
+<string name="retro_netplay_in_room">I rum</string>
+<string name="retro_netplay_join_action">Deltag via IP</string>
+<string name="retro_netplay_joined">Deltog</string>
+<string name="retro_netplay_join_room">Deltag</string>
+<string name="retro_netplay_launch_mode">Ved start</string>
+<string name="retro_netplay_leave">Forlad</string>
+<string name="retro_netplay_menu_hint">Vært = P1 · Deltag = P2 · samme spil på begge skærme</string>
+<string name="retro_netplay_mode_host">Vær vært</string>
+<string name="retro_netplay_mode_join">Deltag</string>
+<string name="retro_netplay_mode_manual">Manuel</string>
+<string name="retro_netplay_no_rooms">Ingen rum fundet. Sørg for, at værten er på det samme Wi‑Fi og er vært for et rum.</string>
+<string name="retro_netplay_player_name">Vist navn</string>
+<string name="retro_netplay_player_name_hint">Vises til andre spillere</string>
+<string name="retro_netplay_players_count">%1$d tilsluttet</string>
+<string name="retro_netplay_prelaunch_hint">Rummet er kun åbent for denne session. Start, når du er klar. Når du afslutter spillet, slås NetPlay fra.</string>
+<string name="retro_netplay_room_players">Spillere</string>
+<string name="retro_netplay_scan_action">Scan Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Scan igen</string>
+<string name="retro_netplay_scan_hint">Scan det samme Wi‑Fi for åbne rum, eller deltag via IP-adresse.</string>
+<string name="retro_netplay_scanning">Scanner Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Scanningsresultater</string>
+<string name="retro_netplay_select_room_hint">Tryk på et rum for at deltage nu (gemmer ikke IP\'en til næste start).</string>
+<string name="retro_netplay_stop_scan">Stop scanning</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s tilsluttet</string>
+<string name="retro_netplay_user_disconnected">%1$s afbrudt</string>
+<string name="retro_netplay_waiting_players">Venter på spillere…</string>
+<string name="retro_ps2_coming_soon">PlayStation 2-understøttelse kommer snart</string>
+<string name="retro_ps2_show_l3r3">Vis L3 / R3-knapper</string>
+<string name="retro_ps2_show_l3r3_subtitle">Når slået fra, dobbelttryk på et stik for at klikke L3 / R3</string>
+<string name="retro_ps2_turnip_flags">TURNIP-DRIVERFLAG</string>
+<string name="retro_ps2_turnip_flags_note">Anvendes kun, når en tilpasset GPU-driver er valgt ovenfor.</string>
+<string name="retro_rom_missing">Spilfil ikke fundet</string>
+<string name="retro_scr_delete">Slet</string>
+<string name="retro_scr_import_from_file">Importér fra fil…</string>
+<string name="retro_scr_loading">Indlæser…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Skift konsol</string>
+    <string name="retro_gs_identify_as">Identificer som konsol</string>
+    <string name="retro_gs_console_changed">Identificeret nu som %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Anvend en ReShade-effekt (.fx) på DXVK/VKD3D-spil (Vulkan) via det indbyggede vkBasalt-lag. Læg hver effekt i sin egen mappe under Android/data/&lt;package&gt;/files/ReShade/. Justering af parametre i realtid og kontakten i spillet kommer med opdateringen af live-reload-laget.</string>
+    <string name="reshade_catalog_title">ReShade-effekter</string>
+    <string name="reshade_catalog_search">Søg efter effekter…</string>
+    <string name="reshade_catalog_installed">Installeret (%1$d)</string>
+    <string name="reshade_catalog_available">Tilgængelige (%1$d)</string>
+    <string name="reshade_catalog_downloading">Downloader</string>
+    <string name="reshade_catalog_installing">Installerer</string>
+    <string name="reshade_catalog_offline_cache">Offline — viser en cachelagret liste. Opret forbindelse for at downloade nye effekter.</string>
+    <string name="reshade_catalog_offline_none">Offline — viser kun installerede effekter. Opret forbindelse for at gennemse kataloget.</string>
+    <string name="reshade_catalog_needs_connection">Opret forbindelse til internettet for at downloade effekter.</string>
+    <string name="reshade_catalog_download_failed">Kunne ikke downloade %1$s.</string>
+    <string name="reshade_catalog_empty_query">Ingen effekter matcher \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Ingen effekter tilgængelige. Opret forbindelse til internettet for at gennemse kataloget.</string>
+    <string name="reshade_catalog_done">Færdig</string>
+    <string name="reshade_catalog_delete_cd">Slet %1$s</string>
+    <string name="reshade_catalog_delete_title">Slet %1$s?</string>
+    <string name="reshade_catalog_delete_body">Dette fjerner effekten fra lageret og fra ethvert sæt, der bruger den. Du kan downloade den igen senere.</string>
+    <string name="reshade_catalog_delete_confirm">Slet</string>
+    <string name="reshade_catalog_delete_cancel">Annuller</string>
+    <string name="reshade_catalog_delete_failed">Kunne ikke slette %1$s.</string>
+    <string name="reshade_params_title">EFFEKTPARAMETRE</string>
+    <string name="reshade_params_reset">Nulstil</string>
+    <string name="reshade_loadout_empty">Ingen effekter endnu. Tilføj en eller flere effekter for at oprette et sæt.</string>
+    <string name="reshade_loadout_add">Tilføj effekt</string>
+    <string name="reshade_loadout_full">Sættet er fuldt — fjern en effekt for at tilføje en anden.</string>
+    <string name="reshade_effect_active">aktiv</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stak</string>
+    <string name="reshade_mode_solo_hint">Én effekt aktiv ad gangen (A/B-sammenligning, skift live i spillet).</string>
+    <string name="reshade_mode_stack_hint">Læg en vilkårlig delmængde af effekter i lag, anvendt i rækkefølge.</string>
+    <string name="reshade_drawer_enable">Aktivér ReShade</string>
+    <string name="reshade_drawer_empty">Ingen ReShade-effekter i dette sæt. Tilføj effekter i dette spils indstillinger (eller containerens) for at skifte og justere dem her.</string>
+    <string name="reshade_drawer_no_params">Denne effekt har ingen justerbare parametre.</string>
+    <string name="cloud_saves_deleting">Sletter save…</string>
+    <string name="cloud_saves_history_delete">Slet</string>
+    <string name="cloud_saves_history_delete_confirm_body">Vil du slette cloud-savet fra %1$s permanent? Dette kan ikke fortrydes.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Slet cloud-save</string>
+    <string name="cloud_saves_history_delete_failed">Kunne ikke slette cloud-save</string>
+    <string name="cloud_saves_history_delete_success">Cloud-save slettet</string>
+    <string name="retro_bundle_required">Hent konsolkernerne først — Indstillinger › Retro</string>
+    <string name="retro_ps2_device_unsupported">Denne enhed kan ikke køre PS2-emulering — den kræver OpenGL ES 3.1 eller nyere.</string>
+    <string name="retro_scr_consoles_check">Søg efter opdateringer</string>
+    <string name="retro_scr_consoles_checking">Søger efter opdateringer…</string>
+    <string name="retro_scr_consoles_download">Hent konsolkerner</string>
+    <string name="retro_scr_consoles_downloading">Henter… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Konsolkerner</string>
+    <string name="retro_scr_consoles_installed">Installeret — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installeret — build %1$s (kunne ikke søge efter opdateringer)</string>
+    <string name="retro_scr_consoles_installing">Installerer…</string>
+    <string name="retro_scr_consoles_missing">Ikke installeret — hent for at spille retrospil</string>
+    <string name="retro_scr_consoles_state">Status</string>
+    <string name="retro_scr_consoles_update">Opdater konsolkerner</string>
+    <string name="retro_scr_consoles_update_available">Opdatering tilgængelig — build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Bekræfter download…</string>
+    <string name="retro_scr_consoles_working">Arbejder…</string>
+    <string name="retro_tab_system">System</string>
 </resources>
diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml
new file mode 100644
index 000000000..bcf13a269
--- /dev/null
+++ b/app/src/main/res/values-de/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Bild</item>
+        <item>Original</item>
+        <item>Einfarbig</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d81d96637..1e968c89a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Bitte eine gültige .exe-Datei auswählen</string>
     <string name="common_ui_select_valid_icon_file">Bitte eine gültige .ico- oder .png-Datei auswählen.</string>
     <string name="common_ui_exit">Beenden</string>
+    <string name="common_ui_exit_app">App beenden</string>
     <string name="common_ui_profile">Profil</string>
     <string name="common_ui_name">Name</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Symbol</string>
     <string name="common_ui_duplicate">Duplizieren</string>
     <string name="common_ui_credits_and_third_party_apps">Danksagungen und Drittanbieter-Apps</string>
-    <string name="common_ui_loading">Laden…</string>
+    <string name="common_ui_loading">Laden</string>
+    <string name="common_ui_exporting">Exportieren</string>
     <string name="common_ui_enable">Aktivieren</string>
     <string name="common_ui_disable">Deaktivieren</string>
     <string name="common_ui_force">Erzwingen</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Höhe</string>
     <string name="common_ui_open_file">Datei öffnen</string>
     <string name="common_ui_download_file">Datei herunterladen</string>
-    <string name="common_ui_downloading_file">Datei wird heruntergeladen...</string>
+    <string name="common_ui_downloading_file">Datei wird heruntergeladen</string>
     <string name="common_ui_browse">Durchsuchen</string>
     <string name="common_ui_options">Optionen</string>
     <string name="common_ui_export">Exportieren</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Einstellungen</string>
     <string name="common_ui_enable_all">Alle aktivieren</string>
     <string name="common_ui_disable_all">Alle deaktivieren</string>
+    <string name="common_ui_select_all">Alle auswählen</string>
+    <string name="common_ui_deselect_all">Alle abwählen</string>
     <string name="common_ui_on">Ein</string>
     <string name="common_ui_off">Aus</string>
     <string name="common_ui_already_set">Bereits festgelegt</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Installieren</string>
     <string name="common_ui_application">Anwendung</string>
     <string name="common_ui_check">Prüfen</string>
+    <string name="store_game_check_for_update">Nach Update suchen</string>
+    <string name="store_game_checking_for_update">Suche</string>
+    <string name="store_game_download_update">Update herunterladen</string>
+    <string name="store_game_no_update_available">Kein Update verfügbar</string>
+    <string name="store_game_update_available">Update verfügbar</string>
+    <string name="store_game_update_check_failed">Update-Prüfung fehlgeschlagen</string>
+    <string name="store_game_update">Aktualisieren</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Dateien prüfen</string>
+    <string name="store_game_verify_started">%1$s wird geprüft — siehe Downloads-Tab</string>
+    <string name="store_game_steam_options">Steam-Optionen</string>
+    <string name="store_game_verify_complete">Dateiprüfung abgeschlossen</string>
+    <string name="store_game_verify_failed_notice">Dateiprüfung fehlgeschlagen</string>
+    <string name="store_game_progress_background_hint">Du kannst dies schließen — es läuft weiter. Sieh jederzeit im Downloads-Tab nach.</string>
+    <string name="store_game_checking_updates">Suche nach Updates</string>
+    <string name="store_game_no_updates_notice">Keine Updates verfügbar</string>
+    <string name="store_game_update_complete">Update abgeschlossen</string>
+    <string name="store_game_update_failed_notice">Update fehlgeschlagen</string>
+    <string name="store_game_update_check_failed_notice">Update-Prüfung fehlgeschlagen</string>
+    <string name="store_game_download_already_active">Dieses Spiel wird bereits heruntergeladen. Brich den aktuellen Download ab, bevor du DLC hinzufügst.</string>
     <string name="common_ui_select">Auswählen</string>
     <string name="common_ui_select_folder">Ordner auswählen</string>
     <string name="common_ui_current_folder">Aktueller Ordner</string>
+    <string name="common_ui_enter_path">Pfad eingeben</string>
+    <string name="common_ui_path_not_found">Pfad nicht gefunden</string>
     <string name="common_ui_storage_roots">Speicherorte</string>
     <string name="common_ui_browse_local_folders_directly">Lokale Ordner direkt durchsuchen</string>
     <string name="common_ui_no_folders_available_here">Hier sind keine Ordner verfügbar</string>
     <string name="common_ui_grant_all_files_access_browse">Gewähre Vollzugriff auf Dateien, um lokale Ordner direkt zu durchsuchen.</string>
     <string name="common_ui_not_configured">Nicht konfiguriert</string>
     <string name="common_ui_reinstall">Neu installieren</string>
-    <string name="common_ui_exit_app_confirm">WinNative beenden?</string>
     <string name="common_ui_elements_count">%1$d Elemente</string>
     <string name="common_ui_disabled_placeholder">-- Deaktiviert --</string>
     <string name="common_ui_enabled">Aktiviert</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Artwork abrufen</string>
+    <string name="library_games_scraping_artwork">Wird abgerufen</string>
     <string name="library_games_shortcut_created">Verknüpfung erstellt</string>
     <string name="library_games_failed_to_create_shortcut">Verknüpfung konnte nicht erstellt werden: %s</string>
     <string name="library_games_install_path">Installationspfad</string>
+    <string name="library_games_not_enough_space">Benötigt %1$s mehr Speicherplatz</string>
     <string name="library_games_download_slash_install">Herunterladen / Installieren</string>
     <string name="library_games_save_management">SPEICHERVERWALTUNG</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Verfügbar: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">Keine Spiele installiert\nKlicke, um das Winlator-Backend zu öffnen</string>
     <string name="library_games_installed_badge">INSTALLIERT</string>
     <string name="library_games_unknown_game">Unbekanntes Spiel</string>
-    <string name="library_games_layouts_header">LAYOUTS</string>
+    <string name="library_games_layouts_header">BIBLIOTHEKSLAYOUTS</string>
     <string name="library_games_layout_carousel">Karussell</string>
     <string name="library_games_layout_list">Liste</string>
+    <string name="library_games_view_options_header">ANSICHTSOPTIONEN</string>
+    <string name="library_games_immersive_mode">Immersiver Modus</string>
+    <string name="library_games_immersive_mode_description">Grafik des fokussierten Spiels als Hintergrund verwenden</string>
+    <string name="library_games_immersive_blur">Hintergrund verwischen</string>
+    <string name="library_games_immersive_blur_description">Unschärfeeffekt auf den immersiven Hintergrund anwenden</string>
     <string name="library_games_custom_game">Benutzerdefiniertes Spiel</string>
     <string name="library_games_play">Spielen</string>
+    <string name="hero_boot_to_desktop_title">Zum Desktop booten</string>
+    <string name="hero_graphics_tests_title">Grafiktests</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Eingabetests</string>
     <string name="library_games_add_custom_game">Benutzerdefiniertes Spiel hinzufügen</string>
     <string name="library_games_game_name">Spielname</string>
     <string name="library_games_game_folder_mapped_drive">Spieleordner (zugeordnetes Spielelaufwerk)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Abgebrochen</string>
     <string name="downloads_queue_phase_failed">Fehlgeschlagen: %1$s</string>
     <string name="downloads_queue_cancel_download">Download abbrechen</string>
+    <string name="downloads_queue_cancel_download_title">Download abbrechen?</string>
+    <string name="downloads_queue_cancel_download_warning">Das Abbrechen eines DLC-, Spiel- oder Update-Downloads kann deine Spielinstallation möglicherweise beschädigen.\n\nMöchtest du wirklich abbrechen?</string>
     <string name="downloads_queue_empty">Keine aktiven Downloads.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Neuer Container</string>
     <string name="containers_list_edit">Container bearbeiten</string>
-    <string name="containers_list_creating">Container wird erstellt…</string>
-    <string name="containers_list_removing">Container wird entfernt…</string>
-    <string name="containers_list_duplicating">Container wird dupliziert…</string>
+    <string name="containers_list_creating">Container wird erstellt</string>
+    <string name="containers_list_removing">Container wird entfernt</string>
+    <string name="containers_list_duplicating">Container wird dupliziert</string>
+    <string name="containers_list_remove_title">Container entfernen</string>
+    <string name="containers_list_duplicate_title">Container duplizieren</string>
     <string name="containers_list_confirm_remove">Möchtest du diesen Container entfernen?</string>
     <string name="containers_list_confirm_duplicate">Möchtest du diesen Container duplizieren?</string>
+    <string name="containers_list_duplicate_failed">Container konnte nicht dupliziert werden</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Möchtest du diese Verknüpfung entfernen?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Verknüpfung konnte nicht geklont werden.</string>
     <string name="shortcuts_list_exported_to">Verknüpfung exportiert nach %1$s</string>
     <string name="shortcuts_list_failed_export">Verknüpfung konnte nicht exportiert werden</string>
+    <string name="shortcuts_export_all">Alle exportieren</string>
+    <string name="shortcuts_export_to_frontend">An Frontend exportieren</string>
+    <string name="shortcuts_export_all_done">%1$d Spiele nach %2$s exportiert</string>
+    <string name="shortcuts_export_all_none">Keine Spiele zum Exportieren</string>
     <string name="shortcuts_list_added">Verknüpfung erfolgreich hinzugefügt.</string>
     <string name="shortcuts_list_failed_add">Verknüpfung konnte nicht hinzugefügt werden.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Xinput deaktivieren (Für exklusive Maus-/Tastatursteuerung)</string>
     <string name="shortcuts_properties_exclusive_input">Exklusive Eingabe</string>
     <string name="shortcuts_properties_custom_game_settings">Benutzerdefinierte Spieleinstellungen</string>
-    <string name="shortcuts_properties_use_cold_client">ColdClient Launcher verwenden</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient ist die bevorzugte Methode zur Handhabung von Steam-Emulation und DRM. Es patcht DRM zur Laufzeit, ohne Spieldateien zu verändern.</string>
-    <string name="shortcuts_properties_unpack_files">Legacy-DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">SteamStub DRM aus der exe auf der Festplatte entfernen. Nur aktivieren, wenn das Spiel ohne es nicht startet. ColdClient\'s Runtime-Patcher behandelt die meisten Spiele automatisch.</string>
-    <string name="shortcuts_properties_force_dlc">DLC erzwingen</string>
-    <string name="shortcuts_properties_force_dlc_description">Nur aktivieren, wenn DLCs nicht erkannt werden oder Spielstände mit DLC nicht funktionieren</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Steam-Client starten (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Startet den echten Steam-Client in Wine\nErfordert ein Steam-Konto und kann die Leistung verringern\nNicht alle Spiele funktionieren</string>
-    <string name="shortcuts_properties_steam_type">Steam-Client-Leistung</string>
-    <string name="steam_section_emulator">Steam-Emulator (Goldberg)</string>
-    <string name="steam_section_real_client">Echter Steam-Client</string>
     <string name="shortcuts_properties_use_steam_input">Steam Input verwenden</string>
     <string name="shortcuts_properties_steam_offline_mode">Steam-Offlinemodus</string>
     <string name="shortcuts_properties_reset">Eigenschaften zurücksetzen</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Möchtest du dieses Profil duplizieren?</string>
     <string name="input_controls_editor_title">Steuerungs-Editor</string>
     <string name="input_controls_editor_toggle_switch">Umschalter</string>
+    <string name="input_controls_editor_swipeable">Wischbar</string>
     <string name="input_controls_editor_profile_exported_to">Profil exportiert nach</string>
     <string name="input_controls_editor_unable_to_import">Profil kann nicht importiert werden</string>
     <string name="input_controls_editor_import_profile">Profil importieren</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Kompatibilität</string>
     <string name="container_box64_intermediate">Mittel</string>
     <string name="container_box64_performance">Leistung</string>
+    <string name="container_fexcore_performance_tso">Leistung TSO</string>
+    <string name="container_fexcore_extreme">Extrem</string>
+    <string name="container_fexcore_extreme_tso">Extrem TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Behandlung von Flags bei CALL/RET-Opcodes&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Behandelt CALL/RET so, als ob Flags nie benötigt werden (schneller, instabil)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">FEXCore-Voreinstellung</string>
     <string name="container_fexcore_version">FEXCore-Version</string>
+    <string name="use_unix_libs">UnixLibs verwenden</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Grafiktreiber</string>
+    <string name="container_zink_mode">Zink-Modus</string>
+    <string name="container_graphics_transcoder">BCn-Transcoder</string>
+    <string name="container_graphics_quality">BCn-Qualität</string>
     <string name="container_graphics_configuration">Grafiktreiber-Konfiguration</string>
     <string name="container_graphics_version">Grafiktreiber-Version</string>
     <string name="container_graphics_available_extensions">Verfügbare Erweiterungen</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">BCn-Emulation</string>
     <string name="container_graphics_bcn_emulation_type">BCn-Emulationstyp</string>
     <string name="container_graphics_bcn_emulation_cache">BCn-Emulations-Cache</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Spiel-Superauflösung 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Kantenschärfe</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Möchtest du diese Voreinstellung duplizieren?</string>
     <string name="container_presets_confirm_remove">Möchtest du diese Voreinstellung entfernen?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">DRI3-Erweiterung verwenden</string>
     <string name="session_xserver_simulate_touch_screen">Touchscreen simulieren</string>
     <string name="session_xserver_preferences_button_text">   EINSTELLUNGEN   </string>
     <string name="session_xserver_extra_keys_config_desc">Hier kannst du den Wert der Extra-Keys-Variable wie in der Termux-App festlegen (lies <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">dies</a>) und mehr \n
@@ -526,12 +572,6 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="session_xserver_pref_kbd">Tastatur</string>
     <string name="session_xserver_pref_other">Sonstiges</string>
     <string name="session_xserver_pref_version">Version</string>
-    <string name="session_xserver_use_dri3_description">Deaktivieren kann Grafikfehler auf einigen Geräten beheben</string>
-    <string name="session_xserver_native_rendering">Natives Rendering</string>
-    <string name="session_xserver_native_rendering_enabled">DRI3-Hardware-Rendering</string>
-    <string name="session_xserver_native_rendering_disabled">Software-WSI-Fallback</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Natives Rendering aktiviert (wirksam beim nächsten Start)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Natives Rendering deaktiviert (wirksam beim nächsten Start)</string>
     <string name="session_xserver_notification_description">WinNative XServer-Nachrichten</string>
     <string name="session_xserver_notification_content">WinNative läuft, beenden oder wischen Sie diese Benachrichtigung nicht weg</string>
 
@@ -551,6 +591,8 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="session_drawer_exit_subtitle">Laufende Sitzung schließen</string>
     <string name="session_drawer_touchscreen_overlay">Touchscreen-Overlay</string>
     <string name="session_drawer_resume">Fortsetzen</string>
+    <string name="session_drawer_retry">Erneut versuchen</string>
+    <string name="downloads_no_internet">Keine Internetverbindung</string>
     <string name="session_drawer_pause">Pausieren</string>
     <string name="session_drawer_wine_processes_paused">Wine-Prozesse sind pausiert</string>
     <string name="session_drawer_pause_all_wine_processes">Alle Wine-Prozesse pausieren</string>
@@ -561,6 +603,33 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Akku</string>
     <string name="session_drawer_hud_element_graph">Graph</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD im Mango-Stil</string>
+    <string name="session_drawer_hud_mango_settings">Mango-HUD-Einstellungen</string>
+    <string name="mango_hud_element_gpu_load">GPU-Last</string>
+    <string name="mango_hud_element_gpu_temp">GPU-Temp.</string>
+    <string name="mango_hud_element_cpu_load">CPU-Last</string>
+    <string name="mango_hud_element_cpu_temp">CPU-Temp.</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Akku</string>
+    <string name="mango_hud_element_lows" formatted="false">1%-Lows</string>
+    <string name="mango_hud_element_graph">Frametime-Graph</string>
+    <string name="mango_hud_element_engine">Engine</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU-Takt</string>
+    <string name="mango_hud_element_gpu_clock">GPU-Takt</string>
+    <string name="mango_hud_element_cores">Pro Kern</string>
+    <string name="mango_hud_element_network">Netzwerk</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Auflösung</string>
+    <string name="mango_hud_element_wine">Wine-Version</string>
+    <string name="mango_hud_element_duration">Sitzungszeit</string>
+    <string name="mango_hud_element_clock">Uhr</string>
+    <string name="mango_hud_element_throttle">Drosselstatus</string>
+    <string name="mango_hud_group_memory">Speicher</string>
+    <string name="mango_hud_group_system">System</string>
+    <string name="mango_hud_lock">HUD sperren</string>
+    <string name="mango_hud_lock_subtitle">Berührungen gelangen zu den Steuerelementen hinter dem HUD. Halte das HUD gedrückt, um es zu sperren. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Möchtest du diesen Prozess beenden?</string>
@@ -591,6 +660,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="session_display_frame_rate">Bildrate</string>
     <string name="session_display_title">Anzeige</string>
     <string name="session_display_fullscreen_stretched">Vollbild aktivieren (Gestreckt)</string>
+    <string name="session_display_direct_composition">Direkte Komposition (Zero-Copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="session_gamepad_error_loading_profile">Fehler beim Laden des Profils</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Touchscreen-Steuerung</string>
+    <string name="input_controls_auto_hide_on_controller_title">Bei Controller automatisch ausblenden</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Touchscreen-Steuerung ausblenden, wenn ein Controller verbunden ist</string>
     <string name="session_gyroscope_title">Gyroskop</string>
     <string name="session_gyroscope_calibrate">Gyroskop kalibrieren</string>
     <string name="session_gyroscope_enable_right_stick">Gyroskopische Bewegung des rechten Sticks aktivieren</string>
@@ -700,6 +773,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_general_select_wallpaper">Hintergrundbild auswählen</string>
     <string name="settings_general_title">Allgemein</string>
     <string name="settings_general_enable_file_provider">Dateianbieter aktivieren</string>
+    <string name="settings_general_enable_auto_scraping">Automatisches Abrufen aktivieren</string>
     <string name="settings_general_take_effect_next_startup">Diese Option wird beim nächsten Start wirksam.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Imagefs neu installieren</string>
@@ -713,7 +787,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_general_share_android_clipboard">Android-Zwischenablage mit Wine teilen</string>
     <string name="settings_general_paths_title">Pfadeinstellungen</string>
     <string name="settings_general_paths_summary">Verwalte, wo Winlator seine Arbeitsdaten speichert und wohin exportierte Verknüpfungen geschrieben werden.</string>
-    <string name="settings_general_winlator_path_title">Winlator-Pfad</string>
+    <string name="settings_general_winlator_path_title">Speicherpfad</string>
     <string name="settings_general_shortcut_export_path_title">Verknüpfungs-Exportpfad</string>
     <string name="settings_general_choose_path">Pfad auswählen</string>
     <string name="settings_general_xserver_cursor_summary">Zeigergeschwindigkeit für Touch-, Trackpad- und Mauseingabe innerhalb der XServer-Sitzung anpassen.</string>
@@ -721,7 +795,9 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_general_cursor_lock_summary">Hält die direkte Mauserfassung für Spiele aktiv, die Rohdaten-Zeigereingabe benötigen. Mit Leiser-Taste deaktivieren.</string>
     <string name="settings_general_xinput_toggle_title">XInput deaktivieren</string>
     <string name="settings_general_xinput_toggle_summary">Schaltet die XInput-Behandlung aus, wenn du exklusive Maus- und Tastatursteuerung möchtest.</string>
-    <string name="settings_general_file_provider_summary">Winlator-Dateien für Android-Dokumentenauswahl und Dateimanager bereitstellen.</string>
+    <string name="settings_external_display_output_summary">Verschiebt das Spiel auf ein angeschlossenes externes Display, anstatt diesen Bildschirm zu spiegeln. Brillen nutzen immer ihr eigenes Display.</string>
+    <string name="settings_general_file_provider_summary">WinNative-Dateien für Android-Dokumentenauswahl und Dateimanager bereitstellen.</string>
+    <string name="settings_general_auto_scraping_summary">Ermöglicht WinNative, automatisch Artwork für benutzerdefinierte Spiele abzurufen.</string>
     <string name="settings_general_open_browser_summary">Unterstützte Weblinks im Android-Browser statt in Wine öffnen.</string>
     <string name="settings_general_clipboard_summary">Kopieren und Einfügen zwischen Android und Wine-Sitzungen erlauben.</string>
     <string name="settings_general_imagefs_summary">Mitgelieferte Systemdateien wiederherstellen, ohne vorhandene Container zu entfernen.</string>
@@ -736,7 +812,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_audio_sound_font_installed_failed">SoundFont konnte nicht installiert werden!</string>
     <string name="settings_audio_sound_font_already_exist">Der zu installierende SoundFont ist bereits vorhanden.</string>
     <string name="settings_audio_unable_to_install_soundfont">SoundFont kann nicht installiert werden</string>
-    <string name="settings_audio_installing_soundfont">SoundFont wird installiert…</string>
+    <string name="settings_audio_installing_soundfont">SoundFont wird installiert</string>
     <string name="settings_audio_sound_font_bad_format">Ungültiges SoundFont-Format.</string>
     <string name="settings_audio_cannot_remove_default">Standard-SoundFont kann nicht entfernt werden</string>
     <string name="settings_audio_summary">SoundFont für MIDI-Wiedergabe installieren, entfernen und auswählen.</string>
@@ -750,15 +826,33 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_debug_box_logs_subtitle">Box86- &amp; Box64-Debug-Ausgabe in Datei schreiben</string>
     <string name="settings_debug_fex_logs_title">FEXCore-Protokolle aktivieren</string>
     <string name="settings_debug_fex_logs_subtitle">FEXCore-Debug-Ausgabe in Datei schreiben</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX-Emulationsprotokolle</string>
+    <string name="settings_debug_emulator_logs_subtitle">Protokolliert den Emulator, den dein Container verwendet, in eine Datei.</string>
     <string name="settings_debug_steam_logs_title">Steam-Protokolle aktivieren</string>
     <string name="settings_debug_steam_logs_subtitle">Steam-Authentifizierungs- und Sitzungsereignisse zum Debuggen protokollieren.</string>
     <string name="settings_debug_wine_channels_title">Wine-Debug-Kanäle</string>
     <string name="settings_debug_wine_channels_summary">Wähle, welche Wine-Kanäle einbezogen werden, wenn die Wine-Debug-Protokollierung aktiviert ist.</string>
+    <string name="settings_debug_wine_classes_title">Wine-Protokollebenen</string>
+    <string name="settings_debug_wine_classes_summary">Wählen Sie aus, welche Meldungstypen protokolliert werden. Trace ist extrem ausführlich.</string>
     <string name="settings_debug_input_logs">Eingabe-Protokolle</string>
     <string name="settings_debug_input_logs_description">Gamepad-, Touch- und Tastatur-Eingabeereignisse protokollieren</string>
     <string name="settings_debug_download_logs">Download-Protokolle</string>
     <string name="settings_debug_download_logs_description">Download-Resolver- und WinNative-Fallback-Ereignisse protokollieren</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan-Validierungsebenen</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Display neu starten, um die Änderung anzuwenden.</string>
     <string name="settings_debug_share_logs">Protokolle teilen</string>
+    <string name="settings_debug_delete_logs">Protokolle löschen</string>
+    <string name="settings_debug_share_all_logs_short">Alle teilen</string>
+    <string name="settings_debug_download_all_logs_short">Alle herunterladen</string>
+    <string name="settings_debug_logs_saved">Gespeichert in %1$s</string>
+    <string name="settings_debug_delete_logs_short">Löschen</string>
+    <string name="settings_debug_delete_all_logs_short">Alle löschen</string>
+    <string name="settings_debug_open_logs_folder_short">Protokollverwaltung öffnen</string>
+    <string name="settings_debug_logs_deleted">Protokolle gelöscht</string>
+    <string name="settings_debug_delete_logs_confirm_title">Protokolle löschen?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Dadurch werden alle gespeicherten Protokolldateien (%1$s) dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden.</string>
+    <string name="settings_debug_logs_browser_title">Protokolle</string>
+    <string name="settings_debug_log_truncated">Die letzten %1$s dieses Protokolls werden angezeigt</string>
     <string name="settings_debug_logs_subject">WinNative-Protokolle (%1$s)</string>
     <string name="settings_debug_no_logs_available">Keine Debug-Protokolle verfügbar. Bitte zuerst Debug-Optionen aktivieren und ein Spiel starten.</string>
     <string name="settings_debug_capture_failed">Protokolle konnten nicht erfasst werden: %1$s</string>
@@ -773,6 +867,8 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
 
     <string name="settings_other_language_title">Sprache</string>
     <string name="settings_other_language_summary">Anzeigesprache auswählen</string>
+    <string name="settings_other_game_language_title">Spielsprache</string>
+    <string name="settings_other_game_language_summary">Bevorzugte Sprache für Steam-/Epic-/GOG-Downloads</string>
     <string name="settings_other_language_system_default">Systemstandard</string>
 
     <string name="settings_other_section_integration">Integration</string>
@@ -790,7 +886,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_content_empty_subtitle">Installiere ein Paket oder wechsle den Typ, um zu beginnen.</string>
     <string name="settings_content_container_created">Container erstellt: %1$s</string>
     <string name="settings_content_download_failed">Download fehlgeschlagen.</string>
-    <string name="common_ui_working">Arbeite…</string>
+    <string name="common_ui_working">Arbeite</string>
     <string name="settings_content_desc_wine">Vom Wine-Projekt erstellt; übersetzt Win32-Aufrufe in native Linux/Android-Dienste.</string>
     <string name="settings_content_desc_proton">Von Valve erstellt; eine Wine-basierte Runtime mit Spiel-Patches für Windows-Spiele.</string>
     <string name="settings_content_desc_dxvk">Übersetzt Direct3D-9-, 10- und 11-Grafikaufrufe nach Vulkan.</string>
@@ -798,6 +894,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_content_desc_box64">Übersetzt x86_64-Linux-Code, damit er auf ARM64-Geräten läuft.</string>
     <string name="settings_content_desc_wowbox64">Box64-Build, den WoW64 zum Ausführen von 32-Bit-Windows-Apps in 64-Bit-Wine nutzt.</string>
     <string name="settings_content_desc_fexcore">Übersetzt x86- und x86_64-Code, damit er auf ARM64-Geräten läuft.</string>
+    <string name="settings_content_desc_d7vk">Übersetzt DirectDraw-Grafikaufrufe (Direct3D 7 und älter) nach Vulkan.</string>
     <string name="settings_content_unable_to_install">Inhalt kann nicht installiert werden.</string>
     <string name="settings_content_install_failed">Installation fehlgeschlagen</string>
     <string name="settings_content_file_cannot_be_recognized">Datei kann nicht erkannt werden.</string>
@@ -809,9 +906,14 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="settings_content_downloading_title">Inhalt wird heruntergeladen</string>
     <string name="settings_content_installing_title">Inhalt wird installiert</string>
     <string name="settings_content_extracting_title">Inhalt wird entpackt</string>
-    <string name="settings_content_extracting_detail">Entpacken… (%1$d Dateien)</string>
-    <string name="settings_content_preparing_package">Paket wird vorbereitet…</string>
+    <string name="settings_content_extracting_detail">Entpacken (%1$d Dateien)</string>
+    <string name="settings_content_preparing_package">Paket wird vorbereitet</string>
     <string name="settings_content_download_complete">Download abgeschlossen</string>
+    <string name="settings_content_already_installed_title">Komponente bereits installiert</string>
+    <string name="settings_content_already_installed_message">Diese Komponente ist bereits installiert. Entferne die installierte Kopie, bevor du sie erneut herunterlädst.
+
+Installierter Pfad:
+%1$s</string>
     <string name="settings_content_conflicting_title">Widersprüchlicher Inhalt installiert</string>
     <string name="settings_content_conflicting_message">Bitte deinstalliere den widersprüchlichen Inhalt, bevor du dieses Paket herunterlädst.
 
@@ -820,7 +922,7 @@ Installierter Pfad:
     <string name="settings_content_cannot_be_trusted">Inhalt ist nicht vertrauenswürdig.</string>
     <string name="settings_content_is_incomplete">Inhalt ist unvollständig.</string>
     <string name="settings_content_untrusted_files_warning">Warnung: Der zusätzliche Inhalt enthält nicht vertrauenswürdige Dateien. Im Allgemeinen sollten die folgenden Dateien nicht geändert werden. Bitte entscheide, ob du mit der Installation fortfahren möchtest.</string>
-    <string name="settings_content_confirm_remove">Möchtest du diesen Inhalt entfernen?</string>
+    <string name="settings_content_confirm_remove">Dadurch wird die Komponente von deinem Gerät gelöscht.</string>
     <string name="settings_content_unable_to_remove_in_use">Dieser Inhalt kann nicht entfernt werden, da ein Container dieses Wine derzeit verwendet.</string>
     <string name="settings_content_download_in_components">Nichts heruntergeladen. Bitte lade eines unter Komponenten herunter.</string>
     <string name="settings_content_types_header">INHALTSTYPEN</string>
@@ -832,9 +934,12 @@ Installierter Pfad:
     <string name="settings_drivers_install">Treiber installieren</string>
     <string name="settings_drivers_installed_success">Treiber erfolgreich installiert.</string>
     <string name="settings_drivers_install_failed">Treiber konnte nicht installiert werden.</string>
-    <string name="settings_drivers_confirm_remove">Möchtest du diesen Treiber entfernen?</string>
+    <string name="settings_drivers_remove_title">Treiber entfernen?</string>
+    <string name="settings_drivers_confirm_remove">Dadurch wird der Treiber von deinem Gerät gelöscht.</string>
+    <string name="settings_drivers_remove_repo_title">Repository entfernen?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s wird aus deiner Repository-Liste entfernt.</string>
     <string name="settings_drivers_repo_tap_to_load">Tippen, um Veröffentlichungen zu laden</string>
-    <string name="settings_drivers_repo_loading_releases">Veröffentlichungen werden geladen…</string>
+    <string name="settings_drivers_repo_loading_releases">Veröffentlichungen werden geladen</string>
     <string name="settings_drivers_repo_release_count">%1$d Veröffentlichungen geladen</string>
     <string name="settings_drivers_repo_no_release_assets">In den abgerufenen Veröffentlichungen wurden keine herunterladbaren ZIP-Dateien gefunden.</string>
     <string name="settings_drivers_repo_fetch_failed">GitHub-Veröffentlichungen konnten nicht geladen werden.</string>
@@ -844,7 +949,7 @@ Installierter Pfad:
     <string name="settings_drivers_manager">Treiberverwaltung</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Systemdateien werden installiert…</string>
+    <string name="setup_wizard_installing_system_files">Systemdateien werden installiert</string>
     <string name="setup_wizard_unable_to_install_system_files">Systemdateien können nicht installiert werden</string>
     <string name="setup_wizard_system_image_not_installed">Systemabbild nicht installiert. Bitte installiere zuerst die Komponenten.</string>
     <string name="setup_wizard_recommended_components">Empfohlene Komponenten</string>
@@ -913,6 +1018,9 @@ Installierter Pfad:
     <string name="google_cloud_sync_started">Cloud-Synchronisierung gestartet.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Google-Dienste</string>
+    <string name="google_auto_signin_title">Beim Start bei Google anmelden</string>
+    <string name="google_auto_signin_summary">Beim App-Start automatisch mit Google Play Games verbinden, damit Spielstand-Backups und Synchronisierung immer bereit sind. Wenn deaktiviert, meldet sich die App nie von selbst an.</string>
+    <string name="google_auto_signin_section">Beim Start</string>
     <string name="google_cloud_play_games">Google Play Games</string>
     <string name="google_cloud_status_syncing">Synchronisiere</string>
     <string name="google_cloud_status_connected">Verbunden</string>
@@ -971,22 +1079,30 @@ Installierter Pfad:
     <string name="saves_import_export_exported_failed">Spielstände konnten nicht exportiert werden: %1$s</string>
     <string name="saves_import_export_imported">Spielstände erfolgreich importiert</string>
     <string name="saves_import_export_imported_failed">Spielstände konnten nicht importiert werden: %1$s</string>
+    <string name="saves_export_path_summary">Spielstände werden nach /WinNative/saves exportiert</string>
+    <string name="saves_export_success_path">Exportiert nach %1$s</string>
+    <string name="saves_export_warning_title">Nur mit benutzerdefinierten Spielen verwenden</string>
+    <string name="saves_export_warning_body">Der Export kann Spielstände von über Stores installierten Spielen oder Spielen mit Cloud-Synchronisierung enthalten.</string>
+    <string name="saves_import_warning_title">Dadurch werden vorhandene Spielstände in diesem Container überschrieben</string>
+    <string name="saves_import_warning_body">Wenn du eine ältere Sicherung mit mehreren Spielen wiederherstellst, kopiere zuerst alle neueren Spielstände mit deinem Dateimanager in die ZIP-Datei. Nur die in der .zip vorhandenen Spielstände sind betroffen. Verwalte deine Spielstände mit Bedacht.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Container</string>
-    <string name="preloader_initializing">Initialisierung…</string>
-    <string name="preloader_launching">Wird gestartet…</string>
-    <string name="preloader_closing">%1$s wird geschlossen…</string>
-    <string name="preloader_setup_environment">Umgebung wird eingerichtet…</string>
-    <string name="preloader_installing_mono">Wine Mono v%1$s wird installiert…</string>
-    <string name="preloader_installing_redist">Redistributables werden installiert…</string>
-    <string name="preloader_unpacking_exe">Spiel-Programmdatei wird entpackt…</string>
-    <string name="preloader_downloading_cloud">Cloud-Spielstände werden heruntergeladen…</string>
-    <string name="preloader_syncing_cloud">Cloud-Spielstände werden synchronisiert…</string>
-    <string name="preloader_cloud_downloading">Cloud-Sync lädt herunter…</string>
-    <string name="preloader_cloud_backup">Spielstand wird auf Google Drive gesichert…</string>
+    <string name="preloader_initializing">Initialisierung</string>
+    <string name="preloader_launching">Wird gestartet</string>
+    <string name="preloader_closing">%1$s wird geschlossen</string>
+    <string name="preloader_setup_environment">Umgebung wird eingerichtet</string>
+    <string name="preloader_retrying_steam_client_download">Steam-Client-Download wird erneut versucht</string>
+    <string name="preloader_installing_mono">Wine Mono v%1$s wird installiert</string>
+    <string name="preloader_installing_redist">Redistributables werden installiert</string>
+    <string name="preloader_unpacking_exe">Spiel-Programmdatei wird entpackt</string>
+    <string name="preloader_downloading_cloud">Cloud-Spielstände werden heruntergeladen</string>
+    <string name="preloader_syncing_cloud">Cloud-Spielstände werden synchronisiert</string>
+    <string name="preloader_uploading_cloud">Cloud-Spielstände werden hochgeladen</string>
+    <string name="preloader_checking_cloud">Cloud-Spielstände werden geprüft</string>
+    <string name="preloader_cloud_sync_retry">%1$s Wiederholung %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Cloud-Sync lädt herunter</string>
     <string name="cloud_sync_failed_provider">%1$s Cloud-Synchronisierung fehlgeschlagen.</string>
-    <string name="google_cloud_backup_failed">Google Drive-Sicherung fehlgeschlagen.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Installierter Pfad:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Grafik</string>
-    <string name="container_backups_title">Sicherungen</string>
-    <string name="container_backups_prompt">Wähle eine Aktion für diese Containersicherung.</string>
-    <string name="container_backups_backing_up">Container wird gesichert…</string>
-    <string name="container_backups_restoring">Container wird wiederhergestellt…</string>
-    <string name="container_backups_checking">Containersicherungen werden geprüft…</string>
-    <string name="container_backups_select_title">Sicherung zum Wiederherstellen auswählen</string>
-    <string name="container_backups_no_files">Keine Containersicherungen in Google Drive gefunden.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Primäre Belegung</string>
     <string name="binding_secondary">Sekundäre Belegung</string>
+    <string name="binding_third">Tertiäre Belegung</string>
+    <string name="binding_fourth">Quartäre Belegung</string>
     <string name="input_controls_editor_tap_to_switch">Tippen zum Wechseln</string>
     <string name="input_controls_editor_download_profile">Profil herunterladen</string>
     <string name="container_config_emulator_section">Emulator</string>
@@ -1010,6 +1122,7 @@ Installierter Pfad:
     <string name="session_drawer_fps_monitor">FPS-Monitor</string>
     <string name="session_drawer_fps_monitor_subtitle">Leistungsstatistiken in Echtzeit anzeigen</string>
     <string name="session_drawer_dual_series_battery">Dual-Series-Akku</string>
+    <string name="session_drawer_hud_frametime_numeric">Frametime als Zahl anzeigen</string>
     <string name="session_drawer_command_center">Befehlszentrum</string>
     <string name="session_drawer_command_center_input">Eingabe</string>
     <string name="session_drawer_command_center_display">Anzeige</string>
@@ -1022,7 +1135,6 @@ Installierter Pfad:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Natürlich</string>
     <string name="session_drawer_color_profile_crt">CRT-Effekt</string>
-    <string name="session_drawer_upscaler_dls">Lebendig</string>
     <string name="session_drawer_calibrate_advanced">Erweiterte Kalibrierung</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Gyro</string>
@@ -1034,7 +1146,6 @@ Installierter Pfad:
     <string name="session_drawer_rail_label_mouse">Maus</string>
     <string name="session_drawer_rail_label_fullscreen">Vollbild</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Nativ</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Aufg.</string>
     <string name="session_drawer_rail_label_logs">Logs</string>
@@ -1048,24 +1159,23 @@ Installierter Pfad:
     <string name="session_drawer_logs_share_chooser">Sitzungslogs teilen</string>
     <string name="session_drawer_logs_share_failed">Logs konnten nicht geteilt werden</string>
     <string name="session_drawer_logs_share_empty">Keine Logzeilen zum Teilen</string>
-    <string name="session_drawer_super_resolution">Schärfungsfilter</string>
-    <string name="session_drawer_upscaler_mode">Filter</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Superauflösung</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Lebendig</string>
+    <string name="session_drawer_vivid_strength">Lebendigkeit</string>
     <string name="session_drawer_main_menu_title">Menü</string>
     <string name="session_gyroscope_activator">Aktivator</string>
     <string name="settings_general_check_for_updates">Nach Updates suchen</string>
     <string name="settings_general_check_for_updates_summary">Beim Start und regelmäßig automatisch nach neuen App-Versionen suchen.</string>
     <string name="setup_wizard_containers">Container-Einrichtung</string>
-    <string name="google_cloud_auto_backup">Automatische Cloud-Sync-Sicherung</string>
-    <string name="google_cloud_auto_backup_summary">Spielstände bei jedem Beenden eines Spiels automatisch in Google Drive sichern.</string>
     <string name="cloud_saves_title">Cloud-Speicherstände</string>
-    <string name="cloud_saves_backup">Cloud-Speicherstand sichern</string>
-    <string name="cloud_saves_restore">Cloud-Speicherstand wiederherstellen</string>
+    <string name="cloud_saves_title_for_provider">%1$s-Cloud-Speicherstände - %2$s</string>
     <string name="cloud_sync_title">Cloud-Synchronisierung</string>
     <string name="cloud_sync_enabled_summary">Cloud-Speicherstände beim Start herunterladen und beim Beenden synchronisieren/sichern.</string>
     <string name="cloud_sync_disabled_summary">Dieses Spiel ohne Cloud-Speicherstand-Download oder Synchronisierung beim Beenden starten.</string>
-    <string name="cloud_saves_backing_up">Cloud-Speicherstand wird gesichert…</string>
-    <string name="cloud_saves_restoring">Cloud-Speicherstand wird wiederhergestellt…</string>
+    <string name="cloud_saves_backing_up">Cloud-Speicherstand wird gesichert</string>
+    <string name="cloud_saves_restoring">Cloud-Speicherstand wird wiederhergestellt</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Installierter Pfad:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Steuert das Zwischenspeichern generierter Dynarec-Blöcke zwischen Durchläufen, um den Start zu beschleunigen.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@ Installierter Pfad:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch: cloud saves, downloads queue, session drawer, HUD position, artwork picker, runtime patcher (110 strings) -->
+    <string name="cloud_saves_history_empty">Noch keine früheren Spielstände gesichert. Ersetzte Spielstände und manuelle Backups erscheinen hier für 30 Tage.</string>
+    <string name="cloud_saves_history_loading">Speicherverlauf wird geladen\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">cloud</string>
+    <string name="cloud_saves_history_origin_local">lokal</string>
+    <string name="cloud_saves_history_origin_manual">manuell</string>
+    <string name="cloud_saves_history_refresh">Aktualisieren</string>
+    <string name="cloud_saves_history_rename">Umbenennen</string>
+    <string name="cloud_saves_history_rename_clear">Löschen</string>
+    <string name="cloud_saves_history_rename_failed">Backup konnte nicht umbenannt werden.</string>
+    <string name="cloud_saves_history_rename_hint">z. B. Bosskampf, Vor dem Ende</string>
+    <string name="cloud_saves_history_rename_save">Speichern</string>
+    <string name="cloud_saves_history_rename_success">Backup umbenannt.</string>
+    <string name="cloud_saves_history_rename_title">Dieses Backup benennen</string>
+    <string name="cloud_saves_history_restore">Wiederherstellen</string>
+    <string name="cloud_saves_history_restore_confirm_body">Dies ersetzt deinen aktuellen lokalen Spielstand durch das Backup vom %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Dieses Backup wiederherstellen?</string>
+    <string name="cloud_saves_history_restore_failed">Dieses Backup konnte nicht wiederhergestellt werden.</string>
+    <string name="cloud_saves_history_restore_success">Spielstand aus Backup wiederhergestellt.</string>
+    <string name="cloud_saves_history_sign_in">Melde dich bei Google an, um deinen Speicherverlauf anzuzeigen.</string>
+    <string name="cloud_saves_history_title">Speicherverlauf</string>
+    <string name="cloud_saves_history_download">Herunterladen</string>
+    <string name="cloud_saves_history_download_success">Datei heruntergeladen.</string>
+    <string name="cloud_saves_history_download_failed">Download fehlgeschlagen.</string>
+    <string name="cloud_saves_keep_replaced_backup">Backup des ersetzten Spielstands behalten</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Falls du es dir anders überlegst, kannst du ihn aus dem Speicherverlauf wiederherstellen.</string>
+    <string name="cloud_saves_no_backups">Noch keine Backups für dieses Spiel vorhanden.</string>
+    <string name="cloud_saves_offline_mode">Cloud-Synchronisierung deaktivieren</string>
+    <string name="cloud_saves_offline_mode_summary">Stoppt alle automatischen Cloud-Aktivitäten für dieses Spiel.</string>
+    <string name="cloud_saves_sync_from_provider">Von %1$s Cloud synchronisieren</string>
+    <string name="cloud_saves_sync_from_provider_failed">Spielstand konnte nicht von %1$s heruntergeladen werden.</string>
+    <string name="cloud_saves_gog_manage_label">GOG-Cloud-Spielstände verwalten</string>
+    <string name="cloud_saves_gog_manage_helper">Öffnet die offizielle GOG-Website</string>
+    <string name="cloud_saves_gog_manage_no_browser">Kein Browser verfügbar, um die GOG-Cloud-Spielstände-Seite zu öffnen</string>
+    <string name="cloud_saves_gog_zip_label">GOG-Cloud-ZIP herunterladen</string>
+    <string name="cloud_saves_gog_zip_helper">Aktuelle Cloud-Dateien speichern</string>
+    <string name="cloud_saves_gog_zip_success">GOG-Cloud-Spielstände-ZIP gespeichert.</string>
+    <string name="cloud_saves_gog_zip_failed">GOG-Cloud-Spielstände-ZIP konnte nicht gespeichert werden.</string>
+    <string name="cloud_saves_gog_zip_empty">Keine GOG-Cloud-Spielstandsdateien gefunden.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Von Cloud synchronisieren</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s Cloud-Spielstand heruntergeladen.</string>
+    <string name="cloud_saves_syncing_from_provider">Spielstand wird von %1$s heruntergeladen\u2026</string>
+    <string name="cloud_saves_sync_summary">Die Version abrufen, die %1$s gerade hat.</string>
+    <string name="cloud_saves_sync_summary_generic">Die aktuelle Cloud-Version abrufen.</string>
+    <string name="common_ui_exit_app_confirm">WinNative beenden?</string>
+    <string name="container_surface_effect">Oberflächeneffekt</string>
+    <string name="downloads_queue_cancel_download_confirm">Download von %1$s abbrechen und alle heruntergeladenen Dateien löschen?</string>
+    <string name="downloads_queue_paused_resume_hint">Pausiert – tippe auf Fortsetzen, um fortzufahren</string>
+    <string name="downloads_queue_phase_applying_data">Daten werden angewendet</string>
+    <string name="downloads_queue_phase_downloading">Wird heruntergeladen</string>
+    <string name="downloads_queue_phase_downloading_file">Wird heruntergeladen [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Wird abgeschlossen</string>
+    <string name="downloads_queue_phase_patching">Wird gepatcht</string>
+    <string name="downloads_queue_phase_preparing">Wird vorbereitet</string>
+    <string name="downloads_queue_phase_queued">In der Warteschlange</string>
+    <string name="downloads_queue_phase_unknown">Unbekannt</string>
+    <string name="downloads_queue_phase_unpacking">Wird entpackt</string>
+    <string name="downloads_queue_phase_updating">Wird aktualisiert</string>
+    <string name="downloads_queue_phase_verifying">Wird überprüft</string>
+    <string name="downloads_queue_phase_verifying_file">Wird überprüft [%1$s]</string>
+    <string name="downloads_queue_status_label">Status:</string>
+    <string name="downloads_queue_this_game">dieses Spiel</string>
+    <string name="hud_position_bottom_center">Unten Mitte</string>
+    <string name="hud_position_bottom_left">Unten Links</string>
+    <string name="hud_position_bottom_right">Unten Rechts</string>
+    <string name="hud_position_left_center">Links Mitte</string>
+    <string name="hud_position_menu_title">HUD verschieben nach</string>
+    <string name="hud_position_right_center">Rechts Mitte</string>
+    <string name="hud_position_top_center">Oben Mitte</string>
+    <string name="hud_position_top_left">Oben Links</string>
+    <string name="hud_position_top_right">Oben Rechts</string>
+    <string name="input_controls_editor_number_of_bindings">Anzahl der Belegungen</string>
+    <string name="input_controls_editor_opacity">Deckkraft</string>
+    <string name="input_controls_editor_radial_menu">Radialmenü</string>
+    <string name="input_controls_editor_radial_menu_options">Radialmenü-Optionen</string>
+    <string name="input_controls_tap_to_click">Tippen zum Klicken</string>
+    <string name="input_controls_reverse_binding_order">Bindungen in umgekehrter Reihenfolge</string>
+    <string name="num_controllers">Anzahl der Controller</string>
+    <string name="session_drawer_controls_section">Steuerung</string>
+    <string name="session_drawer_header_subtitle">Schnellzugriff auf Steuerung, Overlays und Sitzungswerkzeuge</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Alpha festlegen</string>
+    <string name="session_drawer_hud_disabled_hint">Overlay einschalten, um es anzupassen</string>
+    <string name="session_drawer_hud_elements">HUD-Elemente</string>
+    <string name="session_drawer_hud_input_hint">Gib einen Wert von %1$d bis %2$d ein. Werte über dem Limit werden begrenzt.</string>
+    <string name="session_drawer_hud_scale">Skalierung</string>
+    <string name="session_drawer_hud_scale_input_title">Skalierung festlegen</string>
+    <string name="session_drawer_hud_summary">Overlay-Sichtbarkeit und Datenpunkte anpassen</string>
+    <string name="session_drawer_screen_effects">Bildschirmeffekte</string>
+    <string name="session_drawer_session_section">Sitzung</string>
+    <string name="session_drawer_swipe_hint">Wegwischen, um ins Spiel zurückzukehren</string>
+    <string name="session_gamepad_enable_vibration">Vibration aktivieren</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Experimentelle Mausbewegung</string>
+    <string name="session_gyroscope_mouse_scale">Mausskalierung</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Mausskalierung: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Öffne den Einrichtungsassistenten erneut, um Berechtigungen, Systemdateien und Standard-Container zu überprüfen.</string>
+    <string name="settings_other_setup_wizard_title">Einrichtungsassistent</string>
+    <string name="shortcuts_library_artwork_failed">Das ausgewählte Bild konnte nicht geladen werden.</string>
+    <string name="shortcuts_library_artwork_open_source">SteamGridDB öffnen</string>
+    <string name="shortcuts_library_artwork_set">Bild setzen</string>
+    <string name="shortcuts_library_artwork_title">Bibliotheks-Artwork</string>
+    <string name="shortcuts_library_artwork_icon_title">Symbolbild</string>
+    <string name="shortcuts_library_artwork_hero_title">Hintergrund</string>
+    <string name="shortcuts_list_readded_existing">Vorhandene Verknüpfung erneut hinzugefügt</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injiziert beim Start eine DRM-Patcher-DLL. Reduziert FPS – nur verwenden, wenn der Legacy Launcher allein fehlschlägt.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Speicherordner auswählen</string>
+    <string name="cloud_saves_custom_folder_label">Speicherordner</string>
+    <string name="cloud_saves_custom_select_folder_summary">Auf den Speicherordner im Container verweisen</string>
+    <string name="cloud_saves_custom_no_container">Container für diese Verknüpfung nicht verfügbar</string>
+    <string name="cloud_saves_custom_picker_title">Speicherordner auswählen</string>
+    <string name="cloud_saves_custom_outside_drive_c">Der ausgewählte Ordner muss sich im Laufwerk C: des Containers befinden</string>
+    <string name="cloud_saves_custom_path_map_failed">Der ausgewählte Ordner konnte keinem Windows-Pfad zugeordnet werden.</string>
+    <string name="cloud_saves_custom_folder_set">Speicherordner auf %1$s gesetzt</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Von Steam Cloud synchronisieren</string>
+    <string name="cloud_saves_steam_sync_helper">Neueste Speicherung herunterladen</string>
+    <string name="cloud_saves_steam_sync_success">Von Steam Cloud synchronisiert</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud-Synchronisierung fehlgeschlagen</string>
+    <string name="cloud_saves_steam_browse_label">Steam-Cloud-Speicherstände anzeigen</string>
+    <string name="cloud_saves_steam_browse_helper">Cloudspeicher öffnen</string>
+    <string name="cloud_saves_steam_browse_no_browser">Kein Browser zum Öffnen der Steam-Seite verfügbar</string>
+    <string name="cloud_saves_steam_import_label">Dateien importieren</string>
+    <string name="cloud_saves_steam_import_helper">Heruntergeladene Dateien wiederherstellen</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Dateiauswahl nicht verfügbar</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Dies lädt die aktuellen Speicherdateien aus Steam Cloud herunter und überschreibt die aktuellen Speicherdateien.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Ungültige App-ID</string>
+    <string name="cloud_saves_label_saved">Bezeichnung gespeichert</string>
+    <string name="downloads_queue_cancel_all_title">Alle Downloads abbrechen?</string>
+    <string name="downloads_queue_cancel_all_warning">Das Abbrechen von DLC-, Spiel- oder Update-Downloads kann deine Spielinstallationen beschädigen.\n\nMöchtest du wirklich alle Downloads abbrechen und die bisher heruntergeladenen Dateien löschen?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Legacy Launcher verwenden</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Ältere Steam-Emulation: Startet das Spiel über den ColdClient-Launcher und entfernt SteamStub-DRM aus der EXE-Datei. Nur für ältere Spiele verwenden, die mit dem Steam Launcher nicht funktionieren.</string>
+    <string name="steam_section_real_client">Echter WinNative-Steam-Client</string>
+    <string name="steam_section_emulator">Älterer Steam-Emulator</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Lässt den emulierten Steam-Client offline melden, damit das Spiel keine Online-Verbindungen versucht. Für Spiele verwenden, die bei Steams Netzwerkprüfung hängen bleiben.</string>
+    <string name="input_controls_select_style">Stil auswählen</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Schiefer</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Schimmer</string>
+    <string name="input_controls_style_shadow">Schatten</string>
+    <string name="input_controls_style_reticle">Fadenkreuz</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Farbschema</string>
+    <string name="input_controls_edit_duplicating_builtin">Integriertes Profil - eine bearbeitbare Kopie wurde erstellt.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Dieses Profil auf sein ursprüngliches Layout zurücksetzen? Alle vorgenommenen Änderungen gehen verloren.</string>
+    <string name="input_controls_editor_profile_reset">Profil auf ursprüngliches Layout zurückgesetzt.</string>
+    <string name="input_controls_editor_reset_unavailable">Kein ursprünglicher Snapshot für dieses Profil verfügbar.</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan-Display-Sync</string>
+    <string name="cloud_sync_disable_title">Cloud-Speicherstände deaktivieren</string>
+    <string name="cloud_saves_steam_push_label">Zu Steam Cloud hochladen</string>
+    <string name="cloud_saves_steam_push_helper">Lokalen Speicherstand erzwingen hochladen</string>
+    <string name="cloud_saves_steam_push_success">Speicherstand in Steam Cloud hochgeladen.</string>
+    <string name="cloud_saves_steam_push_failed">Speicherstand konnte nicht in Steam Cloud hochgeladen werden.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud ist derzeit nicht erreichbar. Verbindung wird im Hintergrund wiederhergestellt tippe auf Aktualisieren, sobald du wieder online bist.</string>
+    <string name="steam_session_refused_event">Steam hat die zwischengespeicherte Sitzung abgelehnt (EResult=%1$d). Bitte melde dich erneut an.</string>
+    <string name="settings_hud_record_to_file_title">Leistung in Datei aufzeichnen</string>
+    <string name="settings_hud_record_to_file_summary">Exportiert während des Spielens sekündliche FPS-, CPU-, GPU-, Temperatur- und Akkumetriken nach /WinNative/logs/.</string>
+    <string name="settings_leaderboard_category">Leistung</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Steam-Umgebung wird vorbereitet</string>
+    <string name="preloader_starting_wine">Wine wird gestartet</string>
+    <string name="preloader_starting_steam_launcher">Steam Launcher wird gestartet</string>
+    <string name="preloader_loading_steam_client">Steam-Client wird geladen</string>
+    <string name="preloader_connecting_to_steam">Verbindung mit Steam wird hergestellt</string>
+    <string name="preloader_signing_in_to_steam">Bei Steam anmelden</string>
+    <string name="preloader_fetching_game_info">Angemeldet — Spielinfo wird abgerufen</string>
+    <string name="preloader_steam_ready">Steam bereit</string>
+    <string name="preloader_updating_game_info">Spielinfo wird aktualisiert</string>
+    <string name="preloader_verifying_install">Installation wird überprüft</string>
+    <string name="preloader_scanning_redists">Redistributables werden gesucht</string>
+    <string name="preloader_installing_redist_single">Redistributable wird installiert</string>
+    <string name="preloader_installing_named_redist">%1$s wird installiert</string>
+    <string name="preloader_installing_named_redist_progress">%1$s wird installiert (%2$s)</string>
+    <string name="preloader_redists_ready">Redistributables bereit</string>
+    <string name="preloader_no_redists">Keine Redistributables zu installieren</string>
+    <string name="preloader_steam_service_running">Steam-Dienst läuft</string>
+    <string name="preloader_launching_game">%1$s wird gestartet</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher fehlgeschlagen — Assets werden neu bereitgestellt</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher konnte nicht gestartet werden. Wird neu bereitgestellt — bitte erneut starten</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher hat das Spiel erreicht, aber es wurde nie gestartet</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Workshop-Elemente werden geladen</string>
+    <string name="workshop_search_items">Workshop-Elemente suchen</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Deine abonnierten Objekte werden von Steam abgerufen.</string>
+    <string name="workshop_error_title">Workshop-Objekte konnten nicht geladen werden</string>
+    <string name="workshop_error_subtitle">Etwas ist schiefgelaufen. Versuche es erneut.</string>
+    <string name="workshop_empty_title">Keine abonnierten Workshop-Objekte</string>
+    <string name="workshop_empty_subtitle">Abonniere Objekte im Steam Workshop und öffne dieses Fenster dann erneut.</string>
+    <string name="workshop_search_empty_title">Keine Objekte stimmen mit \"%1$s\" überein</string>
+    <string name="workshop_search_empty_subtitle">Versuche einen anderen Suchbegriff.</string>
+    <string name="workshop_clear_search">Suche löschen</string>
+    <string name="workshop_item_fallback">Workshop-Objekt</string>
+    <string name="common_ui_failed">Fehlgeschlagen</string>
+    <string name="steam_presence_snooze">Schlummern</string>
+    <string name="steam_presence_busy">Beschäftigt</string>
+    <string name="steam_presence_looking_to_trade">Sucht Tauschpartner</string>
+    <string name="steam_presence_looking_to_play">Sucht Mitspieler</string>
+    <string name="steam_friends_count">Freunde — %1$d online</string>
+    <string name="steam_friends_section_in_game">Im Spiel (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Noch keine Freunde geladen.</string>
+    <string name="steam_friends_chat_off">Chat ist deaktiviert. Aktiviere den Chat-Dienst erneut, um deine Freunde zu sehen.</string>
+    <string name="steam_friends_self_you">Du</string>
+    <string name="steam_friends_in_game">Im Spiel</string>
+    <string name="steam_friends_join">Beitreten</string>
+    <string name="steam_friends_play">Spielen</string>
+    <string name="steam_chat_image_failed">(Bild konnte nicht gesendet werden)</string>
+    <string name="steam_chat_empty">Noch keine Nachrichten. Sag Hallo!</string>
+    <string name="steam_chat_uploading_image">Bild wird hochgeladen…</string>
+    <string name="steam_chat_send_image">Bild senden</string>
+    <string name="steam_chat_message_hint">Nachricht…</string>
+    <string name="steam_chat_send">Senden</string>
+    <string name="steam_chat_image">Bild</string>
+    <string name="steam_common_back">Zurück</string>
+    <string name="steam_achievements_title">Errungenschaften</string>
+    <string name="steam_achievements_empty">Keine Errungenschaften für dieses Spiel gefunden,\noder melde dich bei Steam an, um sie zu laden.</string>
+    <string name="steam_achievements_hidden">Versteckte Errungenschaft</string>
+    <string name="steam_achievements_hidden_desc">Spiele weiter, um diese Errungenschaft freizuschalten.</string>
+    <string name="steam_achievements_unlocked_on">Freigeschaltet %1$s</string>
+    <string name="steam_achievements_unlocked">Freigeschaltet</string>
+    <string name="steam_join_joining">%1$s in %2$s beitreten…</string>
+    <string name="steam_join_install">Installiere %1$s, um %2$s beizutreten</string>
+    <string name="steam_join_not_owned">Du besitzt %1$s nicht</string>
+    <string name="steam_chat_not_sent">(nicht gesendet)</string>
+    <string name="steam_join_the_game">das Spiel</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Chat-Dienst</string>
+    <string name="steam_chat_setting_service_desc">Für Freunde und Chat anmelden; deaktivieren, um offline zu gehen</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Ausgabe</string>
+    <string name="display_output_prompt_title">Externes Display erkannt</string>
+    <string name="display_output_prompt_message">Das Spiel an das verbundene Display senden? Deine Bildschirmsteuerung und das Menü bleiben auf diesem Telefon.</string>
+    <string name="display_output_prompt_swap">Displays wechseln</string>
+    <string name="display_output_prompt_mirror">Spiegeln</string>
+    <string name="display_output_swapped_toast">Spiel auf externes Display verschoben. Die Steuerung bleibt auf deinem Telefon.</string>
+    <string name="display_output_cast_unavailable">Einstellungen für drahtlose Displays sind auf diesem Gerät nicht verfügbar.</string>
+    <string name="display_output_restored_toast">Externes Display getrennt — Spiel zum Telefon zurückgekehrt.</string>
+    <string name="session_drawer_output_title">Display-Ausgabe</string>
+    <string name="session_drawer_output_subtitle">Das Spiel wird auf dem externen Display angezeigt.</string>
+    <string name="session_drawer_output_device">Verbundenes Display</string>
+    <string name="session_drawer_output_resolution">Auflösung</string>
+    <string name="session_drawer_output_refresh_rate">Bildwiederholrate</string>
+    <string name="session_drawer_output_aspect_ratio">Seitenverhältnis</string>
+    <string name="session_drawer_output_aspect_fit">Anpassen (Seitenverhältnis)</string>
+    <string name="session_drawer_output_aspect_stretch">Strecken (Füllen)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (Zuschneiden)</string>
+    <string name="session_drawer_output_return_to_phone">Zurück zum Telefon</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">An einen Fernseher casten</string>
+    <string name="session_drawer_output_cast_body">Schließe einen USB-C-/HDMI-Adapter an oder tippe unten, um ein drahtloses Display (Miracast / Wi-Fi Direct) zu verbinden. Das Spiel wird auf dem Fernseher angezeigt, während diese Steuerung auf deinem Telefon bleibt.</string>
+    <string name="session_drawer_output_cast_button">Drahtloses Display verbinden</string>
+    <string name="session_drawer_output_cast_note">Fernseher nur mit Chromecast können kein Live-Gameplay mit privater Steuerung anzeigen — verwende für das beste Ergebnis ein drahtloses Display oder einen USB‑C-/HDMI-Adapter.</string>
+    <string name="session_drawer_output_render_note">Die von deinem Display gemeldeten Modi ändern die tatsächliche Ausgabe (es kann kurz schwarz werden, während es neu initialisiert). Andere Auflösungen werden in dieser Größe gerendert und per Hardware auf das Panel skaliert — über der nativen schärfer (Supersampling), darunter schneller.</string>
+    <string name="session_drawer_output_scaling_note">Dieses Telefon gibt das Display in seiner nativen Auflösung %1$s aus und wechselt den Modus nicht; dies legt daher die Renderauflösung fest — sie wird hardwareseitig auf das Panel skaliert (höher als nativ schärft, niedriger läuft schneller).</string>
+    <string name="session_drawer_output_game_mode">Spielmodus (geringe Latenz)</string>
+    <string name="session_drawer_output_game_mode_on">Ein</string>
+    <string name="session_drawer_output_game_mode_off">Aus</string>
+    <string name="session_drawer_output_game_mode_note">Fordert den Spiel-/Niedriglatenzmodus des Fernsehers (HDMI ALLM) an, um die Eingabeverzögerung zu minimieren. Wird nur angezeigt, wenn das verbundene Display dies unterstützt.</string>
+    <string name="session_drawer_output_send_to_display">Spiel an Display senden</string>
+    <string name="session_drawer_output_to_display">Auf externem Display ausgeben</string>
+    <string name="session_drawer_output_send_note">Ein Display ist verbunden. Sende das Spiel dorthin — deine Steuerung und das Menü bleiben auf diesem Telefon. Du kannst es jederzeit hierher zurückholen.</string>
+    <string name="session_drawer_output_display">Anzeige</string>
+    <string name="session_drawer_output_glasses">Brille</string>
+    <string name="session_drawer_output_brightness">Helligkeit</string>
+    <string name="session_drawer_output_shade">Tönung (Abdunkeln)</string>
+    <string name="session_drawer_output_3d">3D (Side-by-Side)</string>
+    <string name="glasses_panel_refresh">Bildwiederholrate</string>
+    <string name="glasses_panel_sunblock">Sonnenschutz</string>
+    <string name="session_drawer_output_volume">Lautstärke</string>
+    <string name="session_drawer_output_glasses_note">Direkt per USB an deine Viture-Brille gesendet.</string>
+
+    <!-- Session > Touch & Gesture Profiles -->
+    <string name="common_ui_new">Neu</string>
+    <string name="common_ui_rename">Umbenennen</string>
+    <string name="gesture_profile_export">Gestenprofil exportieren</string>
+    <string name="gesture_profile_import">Gestenprofil importieren</string>
+    <string name="gesture_profile_new">Neues Gestenprofil</string>
+    <string name="gesture_profile_none">Keine Gestenprofile</string>
+    <string name="input_controls_editor_input_profiles_section">Eingabeprofile</string>
+    <string name="session_drawer_right_stick_sensitivity">Empfindlichkeit rechter Stick</string>
+    <string name="session_drawer_rts_gestures">RTS-Gesten</string>
+    <string name="session_drawer_rts_gestures_edit">Bearbeiten</string>
+    <string name="session_drawer_touch">Touch</string>
+    <string name="session_drawer_touch_map_right_stick">Auf rechten Stick mappen</string>
+    <string name="session_drawer_touch_touchscreen">Touchscreen-Modus</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_gesture_profile_section">Gestenprofil</string>
+    <string name="session_rts_action">Aktion</string>
+    <string name="session_rts_behavior">Verhalten</string>
+    <string name="session_rts_double_tap">Doppeltippen (Doppelt links-klicken)</string>
+    <string name="session_rts_double_tap_delay">Doppeltipp-Verzögerung (ms)</string>
+    <string name="session_rts_down">Unten</string>
+    <string name="session_rts_drag">1-Finger-Ziehen</string>
+    <string name="session_rts_pan1">1-Finger-Schwenken</string>
+    <string name="session_rts_drag2">2-Finger-Ziehen</string>
+    <string name="session_rts_drag_threshold">Ziehschwelle (px)</string>
+    <string name="session_rts_gesture_threshold">Gestenschwelle (px)</string>
+    <string name="session_rts_hold2">2-Finger-Halten</string>
+    <string name="session_rts_hold3">3-Finger-Halten</string>
+    <string name="session_rts_hold4">4-Finger-Halten</string>
+    <string name="session_rts_hold_delay">Halteverzögerung (ms)</string>
+    <string name="session_rts_left">Links</string>
+    <string name="session_rts_long_press">Langes Drücken</string>
+    <string name="session_rts_long_press_delay">Verzögerung langes Drücken (ms)</string>
+    <string name="session_rts_pan">2-Finger-Schwenken</string>
+    <string name="session_rts_pan_threshold">Schwenk-/Zoom-Start (px)</string>
+    <string name="session_rts_right">Rechts</string>
+    <string name="session_rts_swipe3">3-Finger-Wischen</string>
+    <string name="session_rts_swipe4">4-Finger-Wischen</string>
+    <string name="session_rts_swipe_threshold">Wischschwelle (px)</string>
+    <string name="session_rts_tap1">1-Finger-Tippen</string>
+    <string name="session_rts_tap2">2-Finger-Tippen</string>
+    <string name="session_rts_tap3">3-Finger-Tippen</string>
+    <string name="session_rts_tap4">4-Finger-Tippen</string>
+    <string name="session_rts_up">Oben</string>
+    <string name="session_rts_zoom">Zwei-Finger-Zoom</string>
+    <string name="session_drawer_brightness">Helligkeit</string>
+    <string name="session_drawer_contrast">Kontrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Sättigung</string>
+    <string name="session_drawer_temperature">Temperatur</string>
+    <string name="session_drawer_tint">Farbton</string>
+    <string name="session_drawer_intensity">Intensität</string>
+    <string name="session_drawer_strength">Stärke</string>
+    <string name="session_drawer_sharpen">Schärfen</string>
+    <string name="session_drawer_scanlines">Scanlines</string>
+    <string name="session_drawer_pixelate">Verpixeln</string>
+    <string name="session_drawer_block_size">Blockgröße</string>
+    <string name="session_drawer_scale">Skalierung</string>
+    <string name="session_drawer_scale_nearest">Nächste</string>
+    <string name="session_drawer_scale_linear">Linear</string>
+    <string name="session_drawer_scale_bicubic">Bikubisch</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Cartoon</string>
+    <string name="session_drawer_color_blind">Farbenblind</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Effekte zurücksetzen</string>
+    <string name="session_drawer_hud_background">Hintergrund</string>
+    <string name="session_drawer_hud_background_alpha">Hintergrund-Alpha</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Hintergrund-Alpha festlegen</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Größe anpassen</string>
+    <string name="session_task_bring_to_front">In den Vordergrund</string>
+    <string name="session_task_custom_value">Benutzerdefinierter Wert</string>
+    <string name="session_gyroscope_orientation_mode">Zum Zielen neigen (Ausrichtung)</string>
+
+    <!-- File manager -->
+    <string name="file_manager_title">Dateien</string>
+    <string name="file_manager_copy">Kopieren</string>
+    <string name="file_manager_cut">Ausschneiden</string>
+    <string name="file_manager_paste">Einfügen</string>
+    <string name="file_manager_paste_here">Hier einfügen</string>
+    <string name="file_manager_new_folder">Neuer Ordner</string>
+    <string name="file_manager_new_folder_short">Ordner</string>
+    <string name="file_manager_multi_select">Wählen</string>
+    <string name="file_manager_create">Erstellen</string>
+    <string name="file_manager_delete">Löschen</string>
+    <string name="file_manager_copy_count">Kopieren (%1$d)</string>
+    <string name="file_manager_cut_count">Ausschneiden (%1$d)</string>
+    <string name="file_manager_delete_count">Löschen (%1$d)</string>
+    <string name="file_manager_extract">Entpacken</string>
+    <string name="file_manager_extract_here">Hier entpacken</string>
+    <string name="file_manager_extract_to">Entpacken nach…</string>
+    <string name="file_manager_extracting">%1$s wird entpackt</string>
+    <string name="file_manager_extract_failed">Entpacken fehlgeschlagen</string>
+    <string name="file_manager_run_boot">Ausführen / Booten</string>
+    <string name="file_manager_create_shortcut">Verknüpfung erstellen</string>
+    <string name="file_manager_run_in_container">Im Container ausführen</string>
+    <string name="file_manager_no_containers">Keine Container verfügbar</string>
+    <string name="file_manager_delete_confirm">\"%1$s\" löschen? Dies kann nicht rückgängig gemacht werden.</string>
+    <string name="file_manager_delete_confirm_multi">%1$d Elemente löschen? Dies kann nicht rückgängig gemacht werden.</string>
+    <string name="file_manager_copying">%1$s wird kopiert</string>
+    <string name="file_manager_moving">%1$s wird verschoben</string>
+    <string name="file_manager_copying_count">%1$d Elemente werden kopiert</string>
+    <string name="file_manager_moving_count">%1$d Elemente werden verschoben</string>
+    <string name="file_manager_paste_into_itself">Ein Ordner kann nicht in sich selbst eingefügt werden</string>
+    <string name="file_manager_operation_failed">Vorgang fehlgeschlagen</string>
+    <string name="file_manager_delete_failed">Löschen fehlgeschlagen</string>
+    <string name="file_manager_rename_failed">Umbenennen fehlgeschlagen</string>
+    <string name="file_manager_create_folder_failed">Ordner erstellen fehlgeschlagen</string>
+    <string name="cloud_saves_google_backup_helper">Eine Kopie bei Google Play Games speichern</string>
+    <string name="cloud_saves_google_backup_label">Bei Google sichern</string>
+    <string name="cloud_saves_google_backup_no_save">Keine Speicherdateien zum Sichern gefunden.</string>
+    <string name="cloud_saves_history_cloud_readonly">Schreibgeschützt</string>
+    <string name="session_drawer_rail_label_record">Aufnehmen</string>
+    <string name="session_record_failed">Aufnahme konnte nicht gestartet werden</string>
+    <string name="session_record_fps">Bildrate</string>
+    <string name="session_record_include_ui">Oberfläche aufnehmen</string>
+    <string name="session_record_include_ui_subtitle">HUD und Bildschirmsteuerung einbeziehen</string>
+    <string name="session_record_now">Jetzt aufnehmen</string>
+    <string name="session_record_quality">Qualität</string>
+    <string name="session_record_resolution">Auflösung</string>
+    <string name="session_record_saved">Aufnahme gespeichert in WinNative/Recordings</string>
+    <string name="session_record_settings_title">Aufnahmeeinstellungen</string>
+    <string name="session_record_started">Aufnahme gestartet</string>
+    <string name="steam_chat_setting_stay_running">Im Hintergrund ausführen</string>
+    <string name="steam_chat_setting_stay_running_desc">Chat nach dem Beenden von WinNative weiterlaufen lassen</string>
+    <string name="settings_content_refresh">Aktualisieren</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Spielstand übertragen</string>
+    <string name="retro_save_transfer_message">Importiere einen lokalen Spielstand für dieses Spiel oder exportiere den aktuellen Spielstand.</string>
+    <string name="retro_save_transfer_import">Spielstand importieren</string>
+    <string name="retro_save_transfer_export">Spielstand exportieren</string>
+    <string name="retro_save_transfer_import_ok">Spielstand importiert</string>
+    <string name="retro_save_transfer_import_failed">Spielstand konnte nicht importiert werden</string>
+    <string name="retro_save_transfer_export_ok">Spielstand exportiert</string>
+    <string name="retro_save_transfer_export_failed">Spielstand konnte nicht exportiert werden</string>
+    <string name="retro_save_transfer_none">Für dieses Spiel existiert noch kein Spielstand</string>
+    <string name="retro_cheats_title">Cheats</string>
+    <string name="retro_cheats_hardcore_blocked">Cheats sind im Hardcore-Modus deaktiviert</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Speichern</string>
+    <string name="retro_ps2_cancel">Abbrechen</string>
+    <string name="retro_ps2_save_state">Spielstand speichern</string>
+    <string name="retro_ps2_load_save_state">Spielstand laden</string>
+    <string name="retro_ps2_achievements">Erfolge</string>
+    <string name="retro_ps2_cheats">Cheats</string>
+    <string name="retro_ps2_memory_cards">Memory Cards</string>
+    <string name="retro_ps2_fast_forward">Schnellvorlauf</string>
+    <string name="retro_ps2_reset">Zurücksetzen</string>
+    <string name="retro_ps2_swap_disc">Disc wechseln</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Zum Laden tippen</string>
+    <string name="retro_ps2_slot_empty">Leer</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Zum Überschreiben tippen</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Leer – zum Speichern tippen</string>
+    <string name="retro_ps2_slot_is_empty">Slot %1$d ist leer</string>
+    <string name="retro_ps2_loaded_slot">Slot %1$d geladen</string>
+    <string name="retro_ps2_could_not_load_slot">Slot %1$d konnte nicht geladen werden</string>
+    <string name="retro_ps2_saved_to_slot">In Slot %1$d gespeichert</string>
+    <string name="retro_ps2_save_failed">Speichern fehlgeschlagen</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Zum Verwenden tippen</string>
+    <string name="retro_ps2_new_memory_card">Neue Memory Card</string>
+    <string name="retro_ps2_import_card">Card importieren</string>
+    <string name="retro_ps2_enable_online_dev9">Online aktivieren (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2-Netzwerkadapter – startet das Spiel neu, um ihn zu verbinden</string>
+    <string name="retro_ps2_ethernet_device">Ethernet-Gerät</string>
+    <string name="retro_ps2_dns_mode">DNS-Modus</string>
+    <string name="retro_ps2_primary_dns">Primärer DNS</string>
+    <string name="retro_ps2_secondary_dns">Sekundärer DNS</string>
+    <string name="retro_ps2_optional">optional</string>
+    <string name="retro_ps2_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">tippen, um IP festzulegen (leer entfernt)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Server-Host hinzufügen</string>
+    <string name="retro_ps2_new_server_hostname">Neuer Server-Hostname</string>
+    <string name="retro_ps2_server_hostname_hint">z. B. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Bildschirmsteuerung</string>
+    <string name="retro_ps2_edit_layout">Layout bearbeiten</string>
+    <string name="retro_ps2_reset_layout">Layout zurücksetzen</string>
+    <string name="retro_ps2_layout_reset">Layout zurückgesetzt</string>
+    <string name="retro_ps2_left_stick_invert_x">Linker Stick: X umkehren</string>
+    <string name="retro_ps2_left_stick_invert_y">Linker Stick: Y umkehren</string>
+    <string name="retro_ps2_right_stick_invert_x">Rechter Stick: X umkehren</string>
+    <string name="retro_ps2_right_stick_invert_y">Rechter Stick: Y umkehren</string>
+    <string name="retro_ps2_button_color">Tastenfarbe</string>
+    <string name="retro_ps2_letter_color">Buchstabenfarbe</string>
+    <string name="retro_ps2_shadow_color">Schattenfarbe</string>
+    <string name="retro_ps2_background_color">Hintergrundfarbe</string>
+    <string name="retro_ps2_reset_colors">Farben zurücksetzen</string>
+    <string name="retro_ps2_renderer">Renderer</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Auflösungsskalierung</string>
+    <string name="retro_ps2_scale_1x_native">1x (Nativ)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Seitenverhältnis</string>
+    <string name="retro_ps2_aspect_stretch">Strecken</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Anzeigefilter</string>
+    <string name="retro_ps2_filter_nearest">Nächster</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinear (Weich)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinear (Scharf)</string>
+    <string name="retro_ps2_texture_filter">Texturfilter</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinear (Erzwungen)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinear (Sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Blending-Genauigkeit</string>
+    <string name="retro_ps2_blend_minimum">Minimum</string>
+    <string name="retro_ps2_blend_basic">Einfach</string>
+    <string name="retro_ps2_blend_medium">Mittel</string>
+    <string name="retro_ps2_blend_high">Hoch</string>
+    <string name="retro_ps2_blend_full">Voll</string>
+    <string name="retro_ps2_blend_maximum">Maximum</string>
+    <string name="retro_ps2_crt_tv_shader">CRT-/TV-Shader</string>
+    <string name="retro_ps2_shader_off">Aus</string>
+    <string name="retro_ps2_shader_scanline">Scanline</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Wave</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Frame Skip</string>
+    <string name="retro_ps2_frameskip_off">Aus</string>
+    <string name="retro_ps2_frameskip_1">1 überspringen</string>
+    <string name="retro_ps2_frameskip_2">2 überspringen</string>
+    <string name="retro_ps2_frameskip_3">3 überspringen</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Lautstärke</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Stumm</string>
+    <string name="retro_ps2_swap_stereo_channels">Stereokanäle tauschen</string>
+    <string name="retro_ps2_ee_cycle_rate">EE-Taktrate</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (Standard)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE-Zyklus überspringen</string>
+    <string name="retro_ps2_skip_off">Aus</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Schnelles CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emulationsgeschwindigkeit</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU-Auslastung</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU-Auslastung</string>
+    <string name="retro_ps2_hud_internal_resolution">Interne Auflösung</string>
+    <string name="retro_ps2_deinterlace_mode">Deinterlace-Modus</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Aus</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV-Seitenverhältnis</string>
+    <string name="retro_ps2_anti_blur">Anti-Blur</string>
+    <string name="retro_ps2_widescreen_patches">Breitbild-Patches</string>
+    <string name="retro_ps2_no_interlace_patches">No-Interlace-Patches</string>
+    <string name="retro_ps2_vu_flag_hack">VU-Flag-Hack</string>
+    <string name="retro_ps2_intc_spin">INTC-Spin-Erkennung</string>
+    <string name="retro_ps2_wait_loop">Warteschleifen-Erkennung</string>
+    <string name="retro_ps2_time_stretch">Audio-Timestretch</string>
+    <string name="retro_ps2_audio_buffer">Audio-Puffer</string>
+    <string name="retro_ps2_audio_latency">Ausgabelatenz</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Frametimes</string>
+    <string name="retro_ps2_hud_gs_stats">GS-Statistiken</string>
+    <string name="retro_ps2_hud_hw_info">Hardware-Info</string>
+    <string name="retro_ps2_hud_version">Version</string>
+    <string name="retro_ps2_hud_input_display">Eingabeanzeige</string>
+    <string name="retro_ps2_tab_menu">Menü</string>
+    <string name="retro_ps2_tab_display">Anzeige</string>
+    <string name="retro_ps2_tab_performance">Leistung</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Ton</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Steuerung</string>
+    <string name="retro_ps2_resume">Fortsetzen</string>
+    <string name="retro_ps2_pause">Pause</string>
+    <string name="retro_ps2_exit">Beenden</string>
+    <string name="retro_lr_bios_imported">BIOS importiert: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Ungültige BIOS-Datei</string>
+    <string name="retro_lr_invalid_retro_game">Ungültiges Retro-Spiel</string>
+    <string name="retro_lr_rom_not_found">ROM nicht gefunden: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Die ROM in diesem Archiv konnte nicht gelesen werden</string>
+    <string name="retro_lr_core_not_installed">Core nicht installiert: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Cheats aktiviert – Erfolge sind für diese Sitzung deaktiviert</string>
+    <string name="retro_lr_cloud_save_restored">Cloud-Spielstand wiederhergestellt</string>
+    <string name="retro_lr_restore_failed">Wiederherstellung fehlgeschlagen</string>
+    <string name="retro_lr_cloud_conflict_message">Für %1$s existiert ein neuerer Cloud-Spielstand. Möchtest du synchronisieren, und welchen Cloud-Spielstand möchtest du behalten?</string>
+    <string name="retro_lr_cloud_save">Cloud-Spielstand</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Emulator-Core konnte nicht geladen werden</string>
+    <string name="retro_lr_failed_load_rom">ROM konnte nicht geladen werden</string>
+    <string name="retro_lr_graphics_not_supported">Grafik für diesen Core nicht unterstützt</string>
+    <string name="retro_lr_emulator_error">Emulatorfehler</string>
+    <string name="retro_lr_shader_default">Standard</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Scharf</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR-Upscale</string>
+    <string name="retro_lr_upscale_native">Nativ</string>
+    <string name="retro_lr_sound">Ton</string>
+    <string name="retro_lr_left_stick_invert_x">Linker Stick: X umkehren</string>
+    <string name="retro_lr_left_stick_invert_y">Linker Stick: Y umkehren</string>
+    <string name="retro_lr_right_stick_invert_x">Rechter Stick: X umkehren</string>
+    <string name="retro_lr_right_stick_invert_y">Rechter Stick: Y umkehren</string>
+    <string name="retro_lr_on_screen_controls">Bildschirmsteuerung</string>
+    <string name="retro_lr_haptic_feedback">Haptisches Feedback</string>
+    <string name="retro_lr_portrait">Hochformat</string>
+    <string name="retro_lr_landscape">Querformat</string>
+    <string name="retro_lr_edit_layout">Layout bearbeiten (%1$s)</string>
+    <string name="retro_lr_reset_layout">%1$s-Layout zurücksetzen</string>
+    <string name="retro_lr_layout_reset">%1$s-Layout zurückgesetzt</string>
+    <string name="retro_lr_button_color">Tastenfarbe</string>
+    <string name="retro_lr_letter_color">Buchstabenfarbe</string>
+    <string name="retro_lr_shadow_color">Schattenfarbe</string>
+    <string name="retro_lr_background_color">Hintergrundfarbe</string>
+    <string name="retro_lr_reset_colors">Farben zurücksetzen</string>
+    <string name="retro_lr_colors_reset">Farben zurückgesetzt</string>
+    <string name="retro_lr_performance_hud">Leistungs-HUD</string>
+    <string name="retro_lr_alpha">Alpha</string>
+    <string name="retro_lr_background_alpha">Hintergrund-Alpha</string>
+    <string name="retro_lr_background">Hintergrund</string>
+    <string name="retro_lr_scale">Skalierung</string>
+    <string name="retro_lr_numeric_frametime">Numerische Frame-Zeit</string>
+    <string name="retro_lr_dual_series_battery">Dual-Serien-Akku</string>
+    <string name="retro_lr_hud_elements">HUD-ELEMENTE</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsole</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Akku</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Diagramm</string>
+    <string name="retro_lr_hud_cpu_temp">CPU-Temp.</string>
+    <string name="retro_lr_save_state">Spielstand speichern</string>
+    <string name="retro_lr_load_save_state">Spielstand laden</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Das Laden von Spielständen ist im Hardcore-Modus deaktiviert</string>
+    <string name="retro_lr_achievements">Erfolge</string>
+    <string name="retro_lr_cheats">Cheats</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Cheats sind im Hardcore-Modus deaktiviert</string>
+    <string name="retro_lr_reset">Zurücksetzen</string>
+    <string name="retro_lr_fast_forward">Schnellvorlauf</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Schnellvorlauf ist im Hardcore-Modus deaktiviert</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disc %1$d/%2$d</string>
+    <string name="retro_lr_resume">Fortsetzen</string>
+    <string name="retro_lr_pause">Pause</string>
+    <string name="retro_lr_exit">Beenden</string>
+    <string name="retro_lr_saved_to_slot">In Slot %1$d gespeichert</string>
+    <string name="retro_lr_could_not_save_state">Spielstand konnte nicht gespeichert werden</string>
+    <string name="retro_lr_bios_required_title">%1$s-BIOS erforderlich</string>
+    <string name="retro_lr_bios_required_message">PlayStation-Spiele benötigen eine echte Konsolen-BIOS-Datei, die du selbst bereitstellen musst. Importiere ein BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin oder scph7001.bin), um fortzufahren.</string>
+    <string name="retro_lr_import_bios">BIOS importieren…</string>
+    <string name="retro_lr_cancel">Abbrechen</string>
+    <string name="retro_lr_slot_empty">Slot %1$d ist leer</string>
+    <string name="retro_lr_loaded_slot">Slot %1$d geladen</string>
+    <string name="retro_lr_could_not_load_state">Spielstand konnte nicht geladen werden</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Slot %1$d umbenennen</string>
+    <string name="retro_gs_section_general">Allgemein</string>
+    <string name="retro_gs_section_graphics">Grafik</string>
+    <string name="retro_gs_section_performance">Leistung</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Eingabe</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Abbrechen</string>
+    <string name="retro_gs_save">Speichern</string>
+    <string name="retro_gs_shader_default">Standard</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Scharf</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativ</string>
+    <string name="retro_gs_group_game">SPIEL</string>
+    <string name="retro_gs_label_name">Name</string>
+    <string name="retro_gs_label_system">System</string>
+    <string name="retro_gs_label_emulator_core">Emulator-Core</string>
+    <string name="retro_gs_label_rom_path">ROM-Pfad</string>
+    <string name="retro_gs_group_bios">%1$s-BIOS</string>
+    <string name="retro_gs_label_installed">Installiert</string>
+    <string name="retro_gs_bios_none">Keins – erforderlich für %1$s-Spiele</string>
+    <string name="retro_gs_import_bios">BIOS importieren…</string>
+    <string name="retro_gs_remove_bios">BIOS entfernen</string>
+    <string name="retro_gs_group_library_artwork">BIBLIOTHEKS-ARTWORK</string>
+    <string name="retro_gs_artwork_game_card">Spielkartenbild</string>
+    <string name="retro_gs_artwork_grid">Rasterbild</string>
+    <string name="retro_gs_artwork_carousel">Karussellbild</string>
+    <string name="retro_gs_artwork_list">Listenbild</string>
+    <string name="retro_gs_artwork_custom_set">Eigenes Bild festgelegt</string>
+    <string name="retro_gs_artwork_set_image">Bild festlegen</string>
+    <string name="retro_gs_artwork_remove">Entfernen</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Videofilter</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR-Upscale</string>
+    <string name="retro_gs_performance_hud">Leistungs-HUD</string>
+    <string name="retro_gs_group_core">CORE</string>
+    <string name="retro_gs_renderer">Renderer</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Auflösungsskalierung</string>
+    <string name="retro_gs_scale_1x_native">1x (Nativ)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Seitenverhältnis</string>
+    <string name="retro_gs_aspect_stretch">Strecken</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Anzeigefilter</string>
+    <string name="retro_gs_filter_nearest">Nächster</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinear (Weich)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinear (Scharf)</string>
+    <string name="retro_gs_texture_filter">Texturfilter</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinear (Erzwungen)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinear (Sprites)</string>
+    <string name="retro_gs_blending_accuracy">Blending-Genauigkeit</string>
+    <string name="retro_gs_blend_minimum">Minimum</string>
+    <string name="retro_gs_blend_basic">Einfach</string>
+    <string name="retro_gs_blend_medium">Mittel</string>
+    <string name="retro_gs_blend_high">Hoch</string>
+    <string name="retro_gs_blend_full">Voll</string>
+    <string name="retro_gs_blend_maximum">Maximum</string>
+    <string name="retro_gs_crt_tv_shader">CRT-/TV-Shader</string>
+    <string name="retro_gs_off">Aus</string>
+    <string name="retro_gs_tvshader_scanline">Scanline</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Wave</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Frame Skip</string>
+    <string name="retro_gs_frameskip_1">1 überspringen</string>
+    <string name="retro_gs_frameskip_2">2 überspringen</string>
+    <string name="retro_gs_frameskip_3">3 überspringen</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">LEISTUNG</string>
+    <string name="retro_gs_ee_cycle_rate">EE-Taktrate</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (Standard)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE-Zyklus überspringen</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Schnelles CDVD</string>
+    <string name="retro_gs_group_performance_hud">LEISTUNGS-HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emulationsgeschwindigkeit</string>
+    <string name="retro_gs_hud_cpu_usage">CPU-Auslastung</string>
+    <string name="retro_gs_hud_gpu_usage">GPU-Auslastung</string>
+    <string name="retro_gs_hud_internal_resolution">Interne Auflösung</string>
+    <string name="retro_gs_deinterlace_mode">Deinterlace-Modus</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Aus</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV-Seitenverhältnis</string>
+    <string name="retro_gs_anti_blur">Anti-Blur</string>
+    <string name="retro_gs_widescreen_patches">Breitbild-Patches</string>
+    <string name="retro_gs_no_interlace_patches">No-Interlace-Patches</string>
+    <string name="retro_gs_vu_flag_hack">VU-Flag-Hack</string>
+    <string name="retro_gs_intc_spin">INTC-Spin-Erkennung</string>
+    <string name="retro_gs_wait_loop">Warteschleifen-Erkennung</string>
+    <string name="retro_gs_time_stretch">Audio-Timestretch</string>
+    <string name="retro_gs_audio_buffer">Audio-Puffer</string>
+    <string name="retro_gs_audio_latency">Ausgabelatenz</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Frametimes</string>
+    <string name="retro_gs_hud_gs_stats">GS-Statistiken</string>
+    <string name="retro_gs_hud_hw_info">Hardware-Info</string>
+    <string name="retro_gs_hud_version">Version</string>
+    <string name="retro_gs_hud_input_display">Eingabeanzeige</string>
+    <string name="retro_gs_fast_boot">Schnellstart</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Online aktivieren</string>
+    <string name="retro_gs_ethernet_device">Ethernet-Gerät</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS-Modus</string>
+    <string name="retro_gs_dns_manual">Manuell</string>
+    <string name="retro_gs_dns_internal">Intern</string>
+    <string name="retro_gs_primary_dns">Primärer DNS</string>
+    <string name="retro_gs_secondary_dns">Sekundärer DNS</string>
+    <string name="retro_gs_dns_optional">optional</string>
+    <string name="retro_gs_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_gs_group_input">EINGABE</string>
+    <string name="retro_engine_save">Speichern</string>
+    <string name="retro_engine_saved">Spiel gespeichert</string>
+    <string name="retro_engine_loading">Wird geladen…</string>
+    <string name="retro_engine_load">Laden</string>
+    <string name="retro_engine_saved_to">In %1$s gespeichert</string>
+    <string name="retro_engine_slot_active_only">Aktiv</string>
+    <string name="retro_engine_rename_slot">Speicherplatz umbenennen</string>
+    <string name="retro_engine_caught">%1$d gefangen</string>
+    <string name="retro_engine_no_slots">Noch keine Speicherplätze</string>
+    <string name="retro_engine_new_slot">Neuer Speicherplatz</string>
+    <string name="retro_engine_achievements_unavailable">Im 3D-Modus nicht erfasst</string>
+    <string name="retro_engine_fullscreen">Vollbild</string>
+    <string name="retro_engine_loaded_from">%1$s geladen</string>
+    <string name="retro_engine_slot_empty">Dieser Speicherplatz ist leer</string>
+    <string name="retro_engine_loading_subtitle">Spieldaten werden zum ersten Mal vorbereitet</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Dieses Spiel mit der 3D-Voxel-Engine statt mit dem Standard-Core spielen</string>
+    <string name="retro_gs_on_screen_controls">Bildschirmsteuerung</string>
+    <string name="retro_gs_haptic_feedback">Haptisches Feedback</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Lautstärke</string>
+    <string name="retro_gs_mute">Stumm</string>
+    <string name="retro_gs_swap_stereo">Stereokanäle tauschen</string>
+    <string name="retro_gs_sound">Ton</string>
+    <string name="retro_scr_retro_defaults">RETRO-STANDARDS</string>
+    <string name="retro_scr_retro_defaults_desc">Standards, die auf die Spiele jeder Konsole angewendet werden, sofern sie nicht in den eigenen Einstellungen eines Spiels überschrieben werden.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Konto</string>
+    <string name="retro_scr_signed_in">Angemeldet</string>
+    <string name="retro_scr_not_signed_in_hint">Nicht angemeldet – öffne die Erfolge eines Spiels, um dich anzumelden</string>
+    <string name="retro_scr_achievements_enabled">Erfolge aktiviert</string>
+    <string name="retro_scr_hardcore_default">Hardcore-Modus standardmäßig (keine Spielstände)</string>
+    <string name="retro_scr_sign_out">Abmelden</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION-BIOS</string>
+    <string name="retro_scr_installed">Installiert</string>
+    <string name="retro_scr_none_ps1_bios">Keins – PS1-Spiele benötigen ein BIOS</string>
+    <string name="retro_scr_import_ps1_bios">PS1-BIOS importieren…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1-BIOS entfernt</string>
+    <string name="retro_scr_no_bios_to_remove">Kein BIOS zum Entfernen</string>
+    <string name="retro_scr_remove_ps1_bios">PS1-BIOS entfernen</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2-BIOS</string>
+    <string name="retro_scr_none_ps2_bios">Keins – PS2-Spiele benötigen ein BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Zusammengeführter Einzeldatei-Dump (regionsmarkierte .bin, ~4 MB). Geteilte ROM0/MEC/NVM-Sets werden nicht akzeptiert.</string>
+    <string name="retro_scr_import_ps2_bios">PS2-BIOS importieren…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2-BIOS entfernt</string>
+    <string name="retro_scr_remove_ps2_bios">PS2-BIOS entfernen</string>
+    <string name="retro_scr_library_artwork">BIBLIOTHEKS-ARTWORK</string>
+    <string name="retro_scr_retro_case_art">Retro-Hüllenbild (Modul / CD-Hülle)</string>
+    <string name="retro_scr_box_art">Verpackungsbild</string>
+    <string name="retro_scr_box_art_desc">Beim Import automatisch von thumbnails.libretro.com abgerufen; ein eigenes Bild hat immer Vorrang.</string>
+    <string name="retro_scr_roms_folder">ROMS-ORDNER</string>
+    <string name="retro_scr_folder">Ordner</string>
+    <string name="retro_scr_roms_not_set">Nicht festgelegt – wähle einen Ordner zum automatischen Importieren von Spielen</string>
+    <string name="retro_scr_auto_import">Auto-Import</string>
+    <string name="retro_scr_auto_import_desc">Neue Spiele in diesem Ordner werden automatisch mit der richtigen erkannten Konsole zu deiner Bibliothek hinzugefügt.</string>
+    <string name="retro_scr_select_roms_folder_title">ROMs-Ordner auswählen</string>
+    <string name="retro_scr_select_roms_folder_button">ROMs-Ordner auswählen…</string>
+    <string name="retro_scr_change_roms_folder_button">ROMs-Ordner ändern…</string>
+    <string name="retro_scr_scan_now">Jetzt scannen</string>
+    <string name="retro_scr_console_defaults">KONSOLEN-STANDARDS</string>
+    <string name="retro_scr_console_defaults_desc">Tippe auf eine Konsole, um ihre Standardeinstellungen festzulegen.</string>
+    <string name="retro_scr_renderer">Renderer</string>
+    <string name="retro_scr_upscale_resolution">Auflösung hochskalieren</string>
+    <string name="retro_scr_aspect_ratio">Seitenverhältnis</string>
+    <string name="retro_scr_aspect_stretch">Strecken</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Anzeigefilter</string>
+    <string name="retro_scr_filter_nearest">Nächster</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinear (Weich)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinear (Scharf)</string>
+    <string name="retro_scr_texture_filter">Texturfilter</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinear (Erzwungen)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinear (Sprites)</string>
+    <string name="retro_scr_blending_accuracy">Blending-Genauigkeit</string>
+    <string name="retro_scr_blend_minimum">Minimum</string>
+    <string name="retro_scr_blend_basic">Einfach</string>
+    <string name="retro_scr_blend_medium">Mittel</string>
+    <string name="retro_scr_blend_high">Hoch</string>
+    <string name="retro_scr_blend_full">Voll</string>
+    <string name="retro_scr_blend_maximum">Maximum</string>
+    <string name="retro_scr_crt_tv_shader">CRT-/TV-Shader</string>
+    <string name="retro_scr_shader_off">Aus</string>
+    <string name="retro_scr_shader_scanline">Scanline</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Wave</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Frame Skip</string>
+    <string name="retro_scr_skip_1">1 überspringen</string>
+    <string name="retro_scr_skip_2">2 überspringen</string>
+    <string name="retro_scr_skip_3">3 überspringen</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">EE-Taktrate</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (Standard)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE-Zyklus überspringen</string>
+    <string name="retro_scr_skip_off">Aus</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Schnelles CDVD</string>
+    <string name="retro_scr_touch_controls">Bildschirm-Touch-Steuerung</string>
+    <string name="retro_scr_sound">Ton</string>
+    <string name="retro_scr_swap_stereo">Stereokanäle tauschen</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: Emulationsgeschwindigkeit</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU-Auslastung</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU-Auslastung</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: Interne Auflösung</string>
+    <string name="retro_scr_enable_online_dev9">Online aktivieren (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet-Gerät</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS-Modus</string>
+    <string name="retro_scr_dns_manual">Manuell</string>
+    <string name="retro_scr_dns_internal">Intern</string>
+    <string name="retro_scr_primary_dns">Primärer DNS</string>
+    <string name="retro_scr_secondary_dns">Sekundärer DNS</string>
+    <string name="retro_scr_optional">optional</string>
+    <string name="retro_scr_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR-Upscaling</string>
+    <string name="retro_scr_performance_hud">Leistungs-HUD</string>
+    <string name="retro_scr_credits_licenses">MITWIRKENDE &amp; LIZENZEN</string>
+    <string name="retro_scr_credits_desc">Einige Funktionen von WinNative basieren auf diesen Open-Source-Projekten. Tippe, um die jeweilige Quelle anzuzeigen.</string>
+    <string name="retro_scr_tab_defaults">Standards</string>
+    <string name="retro_scr_tab_credits">Mitwirkende</string>
+    <string name="retro_scr_enable_hardcore_title">Hardcore-Modus aktivieren?</string>
+    <string name="retro_scr_enable_hardcore_body">Der Hardcore-Modus setzt das Spiel jetzt zurück und deaktiviert das Laden von Spielständen, Schnellvorlauf und Cheats. Nicht gespeicherter Fortschritt geht verloren. Fortfahren?</string>
+    <string name="retro_scr_cancel">Abbrechen</string>
+    <string name="retro_scr_enable">Aktivieren</string>
+    <string name="retro_scr_bios_imported">BIOS importiert: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Ungültige BIOS-Datei</string>
+    <string name="retro_scr_ps2_bios_imported">PS2-BIOS importiert: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Ungültige PS2-BIOS-Datei</string>
+    <string name="retro_scr_no_game_serial">Keine Spielserie zum Nachschlagen von Cheats.</string>
+    <string name="retro_scr_applied_cheats">%1$d Cheat(s) angewendet.</string>
+    <string name="retro_scr_couldnt_apply_cheats">Cheats konnten nicht angewendet werden.</string>
+    <string name="retro_scr_cheats">Cheats</string>
+    <string name="retro_scr_apply">Anwenden</string>
+    <string name="retro_scr_no_cheats_found">Keine Cheats für dieses Spiel gefunden.</string>
+    <string name="retro_scr_achievements">Erfolge</string>
+    <string name="retro_scr_sign_in_ra">Bei RetroAchievements anmelden</string>
+    <string name="retro_scr_username">Benutzername</string>
+    <string name="retro_scr_password">Passwort</string>
+    <string name="retro_scr_login_failed">Anmeldung fehlgeschlagen</string>
+    <string name="retro_scr_signing_in">Anmeldung läuft…</string>
+    <string name="retro_scr_sign_in">Anmelden</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d Pkt.</string>
+    <string name="retro_scr_no_achievements">Keine Erfolge für dieses Spiel.</string>
+    <string name="retro_scr_back">Zurück</string>
+    <string name="retro_scr_enabled">Aktiviert</string>
+    <string name="retro_scr_disabled">Deaktiviert</string>
+    <string name="retro_scr_rename">Umbenennen</string>
+    <string name="retro_scr_save">Speichern</string>
+    <string name="retro_scr_cloud_save_conflict">Cloud-Speicherkonflikt</string>
+    <string name="retro_scr_keep_local_save">Lokalen Spielstand behalten</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menü</string>
+    <string name="retro_tab_display">Anzeige</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Ton</string>
+    <string name="retro_tab_controls">Steuerung</string>
+    <string name="retro_scan_up_to_date">Bibliothek aktuell</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">%1$d hinzugefügt</string>
+    <string name="retro_scan_removed">%1$d entfernt</string>
+    <string name="retro_scr_shader_default">Standard</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Scharf</string>
+    <string name="retro_scr_upscale_native">Nativ</string>
+    <string name="retro_co_aspect_ratio">Seitenverhältnis</string>
+    <string name="retro_co_ntsc_filter">NTSC-Filter</string>
+    <string name="retro_co_colorization">Kolorierung</string>
+    <string name="retro_co_color_correction">Farbkorrektur</string>
+    <string name="retro_co_remove_sprite_limit">Sprite-Limit entfernen</string>
+    <string name="retro_co_resolution">Auflösung</string>
+    <string name="retro_co_framebuffer_emulation">Framebuffer-Emulation</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Widescreen-Hack</string>
+    <string name="retro_co_val_8_7_native">8:7 (Nativ)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Aus</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">GBA-Bildschirm</string>
+    <string name="retro_co_val_gbc_screen">GBC-Bildschirm</string>
+    <string name="retro_co_val_on">Ein</string>
+    <string name="retro_co_val_320x240_native">320x240 (Nativ)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 angepasst</string>
+    <string name="retro_co_val_native">Nativ</string>
+    <string name="retro_co_val_internal">Intern</string>
+    <string name="retro_co_val_on_16_9">Ein (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Melde dich mit deinem RetroAchievements-Konto an, um Erfolge für Retro-Spiele zu verdienen und zu verfolgen.</string>
+    <string name="retro_ach_username">Benutzername</string>
+    <string name="retro_ach_password">Passwort</string>
+    <string name="retro_ach_enter_credentials">Gib deinen Benutzernamen und dein Passwort ein</string>
+    <string name="retro_ach_login_failed">Anmeldung fehlgeschlagen</string>
+    <string name="retro_ach_sign_in">Anmelden</string>
+    <string name="retro_ach_password_disclaimer">Dein Passwort wird nur einmal verwendet, um ein Anmelde-Token zu erhalten, das sicher auf dem Gerät gespeichert wird.</string>
+    <string name="retro_ach_achievements_enabled">Erfolge aktiviert</string>
+    <string name="retro_ach_hardcore_mode">Hardcore-Modus (keine Spielstände)</string>
+    <string name="retro_ach_points">%1$d / %2$d Punkte</string>
+    <string name="retro_ach_none_found">Keine Erfolge für dieses Spiel gefunden.</string>
+    <string name="retro_ach_sign_out">Abmelden</string>
+    <string name="retro_che_brand">CHEATS</string>
+    <string name="retro_che_name">Name</string>
+    <string name="retro_che_code">Code</string>
+    <string name="retro_che_cancel">Abbrechen</string>
+    <string name="retro_che_save">Speichern</string>
+    <string name="retro_che_default_name">Cheat %1$d</string>
+    <string name="retro_che_empty">Noch keine Cheats. Füge einen Cheat-Code für dieses Spiel hinzu.</string>
+    <string name="retro_che_add">Cheat hinzufügen</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU-Treiber</string>
+    <string name="retro_gpu_driver_system">System (Standard)</string>
+    <string name="retro_gpu_driver_hint">Installiere Turnip-Treiber unter Einstellungen \u2192 Treiber. Dieselben Treiber funktionieren für PC- und PS2-Spiele.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2-HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Virtuelles internes Laufwerk für HDD-basierte Spiele wie Final Fantasy XI. Startet das Spiel neu.</string>
+    <string name="retro_ps2_hdd_desc">Virtuelles internes Laufwerk für HDD-basierte Spiele wie Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">DNS-Modus auf Internal gesetzt, damit deine benutzerdefinierten Server-Hosts wirksam werden.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">CPU-Kern</string>
+    <string name="retro_co_dual_core">Dual Core</string>
+    <string name="retro_co_internal_cheats">Interne Cheats</string>
+    <string name="retro_co_internal_resolution">Interne Auflösung</string>
+    <string name="retro_co_renderer">Renderer</string>
+    <string name="retro_co_sensor_bar">Position der Sensorleiste</string>
+    <string name="retro_co_skip_gc_bios">BIOS-Intro überspringen</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Unten</string>
+    <string name="retro_co_val_cached_interpreter">Zwischengespeicherter Interpreter</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_interpreter">Interpreter</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Maus / Touch</string>
+    <string name="retro_co_val_right_stick_absolute">Rechter Stick (absolut)</string>
+    <string name="retro_co_val_right_stick_relative">Rechter Stick (relativ)</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_val_stretch">Strecken</string>
+    <string name="retro_co_val_top">Oben</string>
+    <string name="retro_co_vbi_skip">VBI-Skip (automatisches Frameskip)</string>
+    <string name="retro_co_widescreen">Breitbild</string>
+    <string name="retro_co_wiimote_pointer">Wiimote-Zeiger</string>
+    <string name="retro_gs_cheats_apply_note">Änderungen werden beim nächsten Start dieses Spiels wirksam.</string>
+    <string name="retro_gs_cheats_detect_hint">Starte dieses Spiel einmal, damit seine Disc-Seriennummer erkannt werden kann, dann erscheinen hier Cheats und Patches.</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS-Authentifizierungs-Bypass — erforderlich für Online-Spiel</string>
+    <string name="retro_gs_dnas_group">Automatisch angewendet (Online)</string>
+    <string name="retro_gs_group_cheats">Cheats &amp; Patches</string>
+    <string name="retro_gs_hdd_image_size">Größe: %1$s</string>
+    <string name="retro_gs_hdd_import">HDD-Image importieren</string>
+    <string name="retro_gs_hdd_remove_short">Entfernen</string>
+    <string name="retro_gs_netplay_enable">NetPlay aktivieren</string>
+    <string name="retro_gs_netplay_enable_subtitle">Standardmäßig aus. Aktivieren, dann vor dem Start Host oder Beitreten wählen.\nWird beim Verlassen des Spiels wieder ausgeschaltet.</string>
+    <string name="retro_gs_netplay_host">Host-Adresse</string>
+    <string name="retro_gs_netplay_host_hint">IP oder Hostname</string>
+    <string name="retro_gs_netplay_host_mode">Host-Sitzung</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">Ein = auf einen Spieler warten. Aus = Host-Adresse beitreten</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay verwendet lokale Mehrspieler-Ports über TCP (Spieler 1 Host / Spieler 2 Client). PS2-Online verwendet stattdessen DEV9-Ethernet.</string>
+    <string name="retro_gs_netplay_port">Port</string>
+    <string name="retro_lr_memory_card_slot">Memory Card %1$d</string>
+    <string name="retro_lr_screenshot">Screenshot</string>
+    <string name="retro_lr_use_cloud_save">Cloud-Speicherstand verwenden</string>
+    <string name="retro_netplay_conn_direct">LAN (direkte IP)</string>
+    <string name="retro_netplay_connecting">Verbinden…</string>
+    <string name="retro_netplay_connection">Verbindung</string>
+    <string name="retro_netplay_conn_traversal">Online (Host-Code)</string>
+    <string name="retro_netplay_dismiss">Schließen</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii-NetPlay verwendet Dolphins eigene Engine. Host = Spieler 1, Beitreten = Spieler 2. Wähle vor dem Start Host oder Beitreten und einen Verbindungstyp; beide Geräte booten dasselbe Spiel gemeinsam.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Teile die Wi‑Fi-IP deines Geräts und diesen Port mit Spieler 2. Das Spiel startet automatisch, sobald er sich verbindet.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">Beim Booten des Spiels wird ein Host-Code angezeigt — teile ihn mit Spieler 2. Das Spiel startet automatisch, sobald er sich verbindet.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Gib die Wi‑Fi-IP und den Port des Hosts ein und starte dann, um zu verbinden.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Gib den Host-Code von Spieler 1 ein und starte dann, um zu verbinden.</string>
+    <string name="retro_netplay_enable_before_launch">Aktiviere NetPlay in den Spieleinstellungen und wähle vor dem Start Host oder Beitreten</string>
+    <string name="retro_netplay_find_rooms">Räume im Wi‑Fi finden</string>
+    <string name="retro_netplay_game_link_hint">Game Link · jeder Bildschirm ist ein eigener Handheld</string>
+    <string name="retro_netplay_gba_not_ready">GBA-Mehrspieler verwendet gpSP + Wireless-Adapter. Stelle sicher, dass libgpsp installiert ist.</string>
+    <string name="retro_netplay_help">Mehrspieler mit geteiltem Bildschirm über Wi‑Fi (wie RetroArch).\nHost = Spieler 1, Beitreten = Spieler 2. Beide Geräte zeigen dasselbe Spiel.</string>
+    <string name="retro_netplay_help_game_link">Game Link über Wi‑Fi — jedes Gerät führt sein eigenes Spiel aus.\nGB/GBC: Gambatte-Serial-Link (Pokémon Gen 1–2).\nGBA: gpSP-Wireless-Adapter (Pokémon FR/LG/Emerald-Kämpfe).</string>
+    <string name="retro_netplay_host_action">Raum hosten</string>
+    <string name="retro_netplay_host_code">Host-Code</string>
+    <string name="retro_netplay_host_code_hint">Traversal-Host-Code vom Host</string>
+    <string name="retro_netplay_hosting_room">Raum wird gehostet</string>
+    <string name="retro_netplay_host_mode_hint">Tippe auf Host, um für diese Spielsitzung einen Raum zu öffnen, und starte dann das Spiel. NetPlay wird beim Verlassen ausgeschaltet.</string>
+    <string name="retro_netplay_in_room">Im Raum</string>
+    <string name="retro_netplay_join_action">Per IP beitreten</string>
+    <string name="retro_netplay_joined">Beigetreten</string>
+    <string name="retro_netplay_join_room">Beitreten</string>
+    <string name="retro_netplay_launch_mode">Beim Start</string>
+    <string name="retro_netplay_leave">Verlassen</string>
+    <string name="retro_netplay_menu_hint">Host = P1 · Beitreten = P2 · dasselbe Spiel auf beiden Bildschirmen</string>
+    <string name="retro_netplay_mode_host">Host</string>
+    <string name="retro_netplay_mode_join">Beitreten</string>
+    <string name="retro_netplay_mode_manual">Manuell</string>
+    <string name="retro_netplay_no_rooms">Keine Räume gefunden. Stelle sicher, dass der Host im selben Wi‑Fi ist und einen Raum hostet.</string>
+    <string name="retro_netplay_player_name">Anzeigename</string>
+    <string name="retro_netplay_player_name_hint">Wird anderen Spielern angezeigt</string>
+    <string name="retro_netplay_players_count">%1$d verbunden</string>
+    <string name="retro_netplay_prelaunch_hint">Der Raum ist nur für diese Sitzung geöffnet. Starte, wenn du bereit bist. Beim Verlassen des Spiels wird NetPlay ausgeschaltet.</string>
+    <string name="retro_netplay_room_players">Spieler</string>
+    <string name="retro_netplay_scan_action">Wi‑Fi scannen</string>
+    <string name="retro_netplay_scan_again">Erneut scannen</string>
+    <string name="retro_netplay_scan_hint">Scanne dasselbe Wi‑Fi nach offenen Räumen oder tritt per IP-Adresse bei.</string>
+    <string name="retro_netplay_scanning">Wi‑Fi wird gescannt…</string>
+    <string name="retro_netplay_scan_results">Scan-Ergebnisse</string>
+    <string name="retro_netplay_select_room_hint">Tippe auf einen Raum, um jetzt beizutreten (speichert die IP nicht für den nächsten Start).</string>
+    <string name="retro_netplay_stop_scan">Scan stoppen</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s verbunden</string>
+    <string name="retro_netplay_user_disconnected">%1$s getrennt</string>
+    <string name="retro_netplay_waiting_players">Warten auf Spieler…</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2-Unterstützung kommt bald</string>
+    <string name="retro_ps2_show_l3r3">L3 / R3-Tasten anzeigen</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Wenn aus, doppeltippe einen Stick, um L3 / R3 zu klicken</string>
+    <string name="retro_ps2_turnip_flags">TURNIP-TREIBER-FLAGS</string>
+    <string name="retro_ps2_turnip_flags_note">Wird nur angewendet, wenn oben ein benutzerdefinierter GPU-Treiber ausgewählt ist.</string>
+    <string name="retro_rom_missing">Spieldatei nicht gefunden</string>
+    <string name="retro_scr_delete">Löschen</string>
+    <string name="retro_scr_import_from_file">Aus Datei importieren…</string>
+    <string name="retro_scr_loading">Wird geladen…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Konsole wechseln</string>
+    <string name="retro_gs_identify_as">Als Konsole identifizieren</string>
+    <string name="retro_gs_console_changed">Jetzt identifiziert als %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Wende über die integrierte vkBasalt-Ebene einen ReShade-Effekt (.fx) auf DXVK/VKD3D-Spiele (Vulkan) an. Lege jeden Effekt in einen eigenen Ordner unter Android/data/&lt;package&gt;/files/ReShade/. Live-Parameteranpassung und der In-Game-Schalter kommen mit dem Live-Reload-Ebenen-Update.</string>
+    <string name="reshade_catalog_title">ReShade-Effekte</string>
+    <string name="reshade_catalog_search">Effekte suchen…</string>
+    <string name="reshade_catalog_installed">Installiert (%1$d)</string>
+    <string name="reshade_catalog_available">Verfügbar (%1$d)</string>
+    <string name="reshade_catalog_downloading">Wird heruntergeladen</string>
+    <string name="reshade_catalog_installing">Wird installiert</string>
+    <string name="reshade_catalog_offline_cache">Offline — zwischengespeicherte Liste wird angezeigt. Verbinde dich, um neue Effekte herunterzuladen.</string>
+    <string name="reshade_catalog_offline_none">Offline — nur installierte Effekte werden angezeigt. Verbinde dich, um den Katalog zu durchsuchen.</string>
+    <string name="reshade_catalog_needs_connection">Stelle eine Internetverbindung her, um Effekte herunterzuladen.</string>
+    <string name="reshade_catalog_download_failed">%1$s konnte nicht heruntergeladen werden.</string>
+    <string name="reshade_catalog_empty_query">Keine Effekte passen zu \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Keine Effekte verfügbar. Stelle eine Internetverbindung her, um den Katalog zu durchsuchen.</string>
+    <string name="reshade_catalog_done">Fertig</string>
+    <string name="reshade_catalog_delete_cd">%1$s löschen</string>
+    <string name="reshade_catalog_delete_title">%1$s löschen?</string>
+    <string name="reshade_catalog_delete_body">Dadurch wird der Effekt aus dem Speicher und aus jeder Zusammenstellung entfernt, die ihn verwendet. Du kannst ihn später erneut herunterladen.</string>
+    <string name="reshade_catalog_delete_confirm">Löschen</string>
+    <string name="reshade_catalog_delete_cancel">Abbrechen</string>
+    <string name="reshade_catalog_delete_failed">%1$s konnte nicht gelöscht werden.</string>
+    <string name="reshade_params_title">EFFEKTPARAMETER</string>
+    <string name="reshade_params_reset">Zurücksetzen</string>
+    <string name="reshade_loadout_empty">Noch keine Effekte. Füge einen oder mehrere Effekte hinzu, um eine Zusammenstellung zu erstellen.</string>
+    <string name="reshade_loadout_add">Effekt hinzufügen</string>
+    <string name="reshade_loadout_full">Zusammenstellung voll — entferne einen Effekt, um einen weiteren hinzuzufügen.</string>
+    <string name="reshade_effect_active">aktiv</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stapel</string>
+    <string name="reshade_mode_solo_hint">Ein Effekt gleichzeitig aktiv (A/B-Vergleich, live im Spiel umschalten).</string>
+    <string name="reshade_mode_stack_hint">Beliebige Teilmenge von Effekten übereinanderlegen, in Reihenfolge angewendet.</string>
+    <string name="reshade_drawer_enable">ReShade aktivieren</string>
+    <string name="reshade_drawer_empty">Keine ReShade-Effekte in dieser Zusammenstellung. Füge Effekte in den Einstellungen dieses Spiels (oder des Containers) hinzu, um sie hier zu wechseln und anzupassen.</string>
+    <string name="reshade_drawer_no_params">Dieser Effekt bietet keine einstellbaren Parameter.</string>
+    <string name="cloud_saves_deleting">Speicherstand wird gelöscht…</string>
+    <string name="cloud_saves_history_delete">Löschen</string>
+    <string name="cloud_saves_history_delete_confirm_body">Cloud-Speicherstand von %1$s endgültig löschen? Das kann nicht rückgängig gemacht werden.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Cloud-Speicherstand löschen</string>
+    <string name="cloud_saves_history_delete_failed">Cloud-Speicherstand konnte nicht gelöscht werden</string>
+    <string name="cloud_saves_history_delete_success">Cloud-Speicherstand gelöscht</string>
+    <string name="retro_bundle_required">Lade zuerst die Konsolen-Cores herunter — Einstellungen › Retro</string>
+    <string name="retro_ps2_device_unsupported">Dieses Gerät kann keine PS2-Emulation ausführen — es benötigt OpenGL ES 3.1 oder neuer.</string>
+    <string name="retro_scr_consoles_check">Nach Updates suchen</string>
+    <string name="retro_scr_consoles_checking">Suche nach Updates…</string>
+    <string name="retro_scr_consoles_download">Konsolen-Cores herunterladen</string>
+    <string name="retro_scr_consoles_downloading">Wird heruntergeladen… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Konsolen-Cores</string>
+    <string name="retro_scr_consoles_installed">Installiert — Build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installiert — Build %1$s (Update-Suche fehlgeschlagen)</string>
+    <string name="retro_scr_consoles_installing">Wird installiert…</string>
+    <string name="retro_scr_consoles_missing">Nicht installiert — herunterladen, um Retro-Spiele zu spielen</string>
+    <string name="retro_scr_consoles_state">Status</string>
+    <string name="retro_scr_consoles_update">Konsolen-Cores aktualisieren</string>
+    <string name="retro_scr_consoles_update_available">Update verfügbar — Build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Download wird geprüft…</string>
+    <string name="retro_scr_consoles_working">Wird ausgeführt…</string>
+    <string name="retro_tab_system">System</string>
 </resources>
diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml
new file mode 100644
index 000000000..ef5e05c73
--- /dev/null
+++ b/app/src/main/res/values-es/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Imagen</item>
+        <item>Original</item>
+        <item>Color sólido</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a83f26ec5..db4e9377e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Por favor, selecciona un archivo .exe válido</string>
     <string name="common_ui_select_valid_icon_file">Por favor, selecciona un archivo .ico o .png válido.</string>
     <string name="common_ui_exit">Salir</string>
+    <string name="common_ui_exit_app">Salir de la aplicación</string>
     <string name="common_ui_profile">Perfil</string>
     <string name="common_ui_name">Nombre</string>
     <string name="common_ui_ok">Aceptar</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Icono</string>
     <string name="common_ui_duplicate">Duplicar</string>
     <string name="common_ui_credits_and_third_party_apps">Créditos y aplicaciones de terceros</string>
-    <string name="common_ui_loading">Cargando…</string>
+    <string name="common_ui_loading">Cargando</string>
+    <string name="common_ui_exporting">Exportando</string>
     <string name="common_ui_enable">Activar</string>
     <string name="common_ui_disable">Desactivar</string>
     <string name="common_ui_force">Forzar</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Alto</string>
     <string name="common_ui_open_file">Abrir archivo</string>
     <string name="common_ui_download_file">Descargar archivo</string>
-    <string name="common_ui_downloading_file">Descargando archivo...</string>
+    <string name="common_ui_downloading_file">Descargando archivo</string>
     <string name="common_ui_browse">Explorar</string>
     <string name="common_ui_options">Opciones</string>
     <string name="common_ui_export">Exportar</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Ajustes</string>
     <string name="common_ui_enable_all">Activar todo</string>
     <string name="common_ui_disable_all">Desactivar todo</string>
+    <string name="common_ui_select_all">Seleccionar todo</string>
+    <string name="common_ui_deselect_all">Deseleccionar todo</string>
     <string name="common_ui_on">Activado</string>
     <string name="common_ui_off">Desactivado</string>
     <string name="common_ui_already_set">Ya configurado</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Instalar</string>
     <string name="common_ui_application">Aplicación</string>
     <string name="common_ui_check">Comprobar</string>
+    <string name="store_game_check_for_update">Buscar actualización</string>
+    <string name="store_game_checking_for_update">Comprobando</string>
+    <string name="store_game_download_update">Descargar actualización</string>
+    <string name="store_game_no_update_available">No hay actualizaciones disponibles</string>
+    <string name="store_game_update_available">Actualización disponible</string>
+    <string name="store_game_update_check_failed">Error al comprobar actualizaciones</string>
+    <string name="store_game_update">Actualizar</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verificar archivos</string>
+    <string name="store_game_verify_started">Verificando %1$s — revisa la pestaña Descargas</string>
+    <string name="store_game_steam_options">Opciones de Steam</string>
+    <string name="store_game_verify_complete">Verificación de archivos completada</string>
+    <string name="store_game_verify_failed_notice">Error al verificar archivos</string>
+    <string name="store_game_progress_background_hint">Puedes cerrar esto — seguirá ejecutándose. Revisa la pestaña Descargas cuando quieras.</string>
+    <string name="store_game_checking_updates">Comprobando actualizaciones</string>
+    <string name="store_game_no_updates_notice">No hay actualizaciones disponibles</string>
+    <string name="store_game_update_complete">Actualización completada</string>
+    <string name="store_game_update_failed_notice">Error al actualizar</string>
+    <string name="store_game_update_check_failed_notice">Error al comprobar actualizaciones</string>
+    <string name="store_game_download_already_active">Este juego ya se está descargando. Cancela la descarga actual antes de añadir DLC.</string>
     <string name="common_ui_select">Seleccionar</string>
     <string name="common_ui_select_folder">Seleccionar carpeta</string>
     <string name="common_ui_current_folder">Carpeta actual</string>
+    <string name="common_ui_enter_path">Introducir ruta</string>
+    <string name="common_ui_path_not_found">Ruta no encontrada</string>
     <string name="common_ui_storage_roots">Ubicaciones de almacenamiento</string>
     <string name="common_ui_browse_local_folders_directly">Explorar carpetas locales directamente</string>
     <string name="common_ui_no_folders_available_here">No hay carpetas disponibles aquí</string>
     <string name="common_ui_grant_all_files_access_browse">Concede acceso total a los archivos para explorar carpetas locales directamente.</string>
     <string name="common_ui_not_configured">No configurado</string>
     <string name="common_ui_reinstall">Reinstalar</string>
-    <string name="common_ui_exit_app_confirm">¿Salir de WinNative?</string>
     <string name="common_ui_elements_count">%1$d elementos</string>
     <string name="common_ui_disabled_placeholder">-- Desactivado --</string>
     <string name="common_ui_enabled">Activado</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Obtener arte</string>
+    <string name="library_games_scraping_artwork">Obteniendo</string>
     <string name="library_games_shortcut_created">Acceso directo creado</string>
     <string name="library_games_failed_to_create_shortcut">Error al crear acceso directo: %s</string>
     <string name="library_games_install_path">Ruta de instalación</string>
+    <string name="library_games_not_enough_space">Se necesitan %1$s más de espacio</string>
     <string name="library_games_download_slash_install">Descargar / Instalar</string>
     <string name="library_games_save_management">GESTIÓN DE GUARDADOS</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Disponible: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">No hay juegos instalados\nHaz clic para abrir Winlator Backend</string>
     <string name="library_games_installed_badge">INSTALADO</string>
     <string name="library_games_unknown_game">Juego desconocido</string>
-    <string name="library_games_layouts_header">DISEÑOS</string>
+    <string name="library_games_layouts_header">DISEÑOS DE BIBLIOTECA</string>
     <string name="library_games_layout_carousel">Carrusel</string>
     <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPCIONES DE VISTA</string>
+    <string name="library_games_immersive_mode">Modo inmersivo</string>
+    <string name="library_games_immersive_mode_description">Usar el arte del juego enfocado como fondo</string>
+    <string name="library_games_immersive_blur">Desenfocar el fondo</string>
+    <string name="library_games_immersive_blur_description">Aplicar un efecto de desenfoque al fondo inmersivo</string>
     <string name="library_games_custom_game">Juego personalizado</string>
     <string name="library_games_play">Jugar</string>
+    <string name="hero_boot_to_desktop_title">Arrancar al escritorio</string>
+    <string name="hero_graphics_tests_title">Pruebas gráficas</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Pruebas de entrada</string>
     <string name="library_games_add_custom_game">Añadir juego personalizado</string>
     <string name="library_games_game_name">Nombre del juego</string>
     <string name="library_games_game_folder_mapped_drive">Carpeta del juego (unidad de juego asignada)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Cancelado</string>
     <string name="downloads_queue_phase_failed">Error: %1$s</string>
     <string name="downloads_queue_cancel_download">Cancelar descarga</string>
+    <string name="downloads_queue_cancel_download_title">¿Cancelar descarga?</string>
+    <string name="downloads_queue_cancel_download_warning">Cancelar una descarga de DLC, juego o actualización puede dañar potencialmente la instalación del juego.\n\n¿Seguro que quieres cancelar?</string>
     <string name="downloads_queue_empty">No hay descargas activas.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Nuevo contenedor</string>
     <string name="containers_list_edit">Editar contenedor</string>
-    <string name="containers_list_creating">Creando contenedor…</string>
-    <string name="containers_list_removing">Eliminando contenedor…</string>
-    <string name="containers_list_duplicating">Duplicando contenedor…</string>
+    <string name="containers_list_creating">Creando contenedor</string>
+    <string name="containers_list_removing">Eliminando contenedor</string>
+    <string name="containers_list_duplicating">Duplicando contenedor</string>
+    <string name="containers_list_remove_title">Eliminar contenedor</string>
+    <string name="containers_list_duplicate_title">Duplicar contenedor</string>
     <string name="containers_list_confirm_remove">¿Deseas eliminar este contenedor?</string>
     <string name="containers_list_confirm_duplicate">¿Deseas duplicar este contenedor?</string>
+    <string name="containers_list_duplicate_failed">No se pudo duplicar el contenedor</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">¿Deseas eliminar este acceso directo?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Error al clonar el acceso directo.</string>
     <string name="shortcuts_list_exported_to">Acceso directo exportado a %1$s</string>
     <string name="shortcuts_list_failed_export">Error al exportar el acceso directo</string>
+    <string name="shortcuts_export_all">Exportar todo</string>
+    <string name="shortcuts_export_to_frontend">Exportar al frontend</string>
+    <string name="shortcuts_export_all_done">Se exportaron %1$d juegos a %2$s</string>
+    <string name="shortcuts_export_all_none">No hay juegos para exportar</string>
     <string name="shortcuts_list_added">Acceso directo añadido correctamente.</string>
     <string name="shortcuts_list_failed_add">Error al añadir el acceso directo.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Desactivar XInput (Para control exclusivo de ratón/teclado)</string>
     <string name="shortcuts_properties_exclusive_input">Entrada exclusiva</string>
     <string name="shortcuts_properties_custom_game_settings">Ajustes personalizados del juego</string>
-    <string name="shortcuts_properties_use_cold_client">Usar ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient es la forma preferida de manejar la emulación de Steam y el DRM. Parchea el DRM en tiempo de ejecución sin modificar los archivos del juego.</string>
-    <string name="shortcuts_properties_unpack_files">DRM heredado</string>
-    <string name="shortcuts_properties_unpack_files_description">Elimina el DRM SteamStub del exe en disco. Actívalo solo si el juego no se inicia sin él. El parcheador en tiempo de ejecución de ColdClient maneja la mayoría de los juegos automáticamente.</string>
-    <string name="shortcuts_properties_force_dlc">Forzar DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Activar solo si los DLCs no se detectan o las partidas guardadas con DLC no funcionan</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Iniciar cliente Steam (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Inicia el cliente real de Steam en Wine\nRequiere una cuenta de Steam y puede reducir el rendimiento\nNo todos los juegos funcionan</string>
-    <string name="shortcuts_properties_steam_type">Rendimiento del cliente Steam</string>
-    <string name="steam_section_emulator">Emulador de Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Cliente real de Steam</string>
     <string name="shortcuts_properties_use_steam_input">Usar entrada de Steam</string>
     <string name="shortcuts_properties_steam_offline_mode">Modo sin conexión de Steam</string>
     <string name="shortcuts_properties_reset">Restablecer propiedades</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">¿Deseas duplicar este perfil?</string>
     <string name="input_controls_editor_title">Editor de controles</string>
     <string name="input_controls_editor_toggle_switch">Interruptor</string>
+    <string name="input_controls_editor_swipeable">Deslizable</string>
     <string name="input_controls_editor_profile_exported_to">Perfil exportado a</string>
     <string name="input_controls_editor_unable_to_import">No se pudo importar el perfil</string>
     <string name="input_controls_editor_import_profile">Importar perfil</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Compatibilidad</string>
     <string name="container_box64_intermediate">Intermedio</string>
     <string name="container_box64_performance">Rendimiento</string>
+    <string name="container_fexcore_performance_tso">Rendimiento TSO</string>
+    <string name="container_fexcore_extreme">Extremo</string>
+    <string name="container_fexcore_extreme_tso">Extremo TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Manejo de flags en opcodes CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Trata CALL/RET como si nunca necesitara flags (más rápido, inestable)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Preset de FEXCore</string>
     <string name="container_fexcore_version">Versión de FEXCore</string>
+    <string name="use_unix_libs">Usar UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Controlador gráfico</string>
+    <string name="container_zink_mode">Modo Zink</string>
+    <string name="container_graphics_transcoder">Transcodificador BCn</string>
+    <string name="container_graphics_quality">Calidad BCn</string>
     <string name="container_graphics_configuration">Configuración del controlador gráfico</string>
     <string name="container_graphics_version">Versión del controlador gráfico</string>
     <string name="container_graphics_available_extensions">Extensiones disponibles</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">Emulación BCn</string>
     <string name="container_graphics_bcn_emulation_type">Tipo de emulación BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Caché de emulación BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Súper resolución para juegos 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Nitidez de bordes</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">¿Deseas duplicar este preset?</string>
     <string name="container_presets_confirm_remove">¿Deseas eliminar este preset?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Usar extensión DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Simular pantalla táctil</string>
     <string name="session_xserver_preferences_button_text">   PREFERENCIAS   </string>
     <string name="session_xserver_extra_keys_config_desc">Aquí puedes establecer el valor de la variable extra-keys como en la app Termux (lee <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">esto</a>) y más \n
@@ -526,12 +572,6 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="session_xserver_pref_kbd">Teclado</string>
     <string name="session_xserver_pref_other">Otro</string>
     <string name="session_xserver_pref_version">Versión</string>
-    <string name="session_xserver_use_dri3_description">Desactivar puede corregir fallos gráficos en algunos dispositivos</string>
-    <string name="session_xserver_native_rendering">Renderizado nativo</string>
-    <string name="session_xserver_native_rendering_enabled">Renderizado por hardware DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Respaldo de WSI por software</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Renderizado nativo activado (tendrá efecto en el próximo inicio)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Renderizado nativo desactivado (tendrá efecto en el próximo inicio)</string>
     <string name="session_xserver_notification_description">Mensajes de XServer de WinNative</string>
     <string name="session_xserver_notification_content">WinNative se está ejecutando, no elimines ni deslices esta notificación</string>
 
@@ -551,6 +591,8 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="session_drawer_exit_subtitle">Cerrar la sesión en ejecución</string>
     <string name="session_drawer_touchscreen_overlay">Superposición táctil</string>
     <string name="session_drawer_resume">Reanudar</string>
+    <string name="session_drawer_retry">Reintentar</string>
+    <string name="downloads_no_internet">Sin conexión a internet</string>
     <string name="session_drawer_pause">Pausar</string>
     <string name="session_drawer_wine_processes_paused">Los procesos de Wine están pausados</string>
     <string name="session_drawer_pause_all_wine_processes">Pausar todos los procesos de Wine</string>
@@ -561,6 +603,33 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Bat.</string>
     <string name="session_drawer_hud_element_graph">Gráf.</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD estilo Mango</string>
+    <string name="session_drawer_hud_mango_settings">Ajustes del HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Carga GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. GPU</string>
+    <string name="mango_hud_element_cpu_load">Carga CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batería</string>
+    <string name="mango_hud_element_lows" formatted="false">Mínimos 1%</string>
+    <string name="mango_hud_element_graph">Gráfico de frametime</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Frecuencia CPU</string>
+    <string name="mango_hud_element_gpu_clock">Frecuencia GPU</string>
+    <string name="mango_hud_element_cores">Por núcleo</string>
+    <string name="mango_hud_element_network">Red</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Resolución</string>
+    <string name="mango_hud_element_wine">Versión de Wine</string>
+    <string name="mango_hud_element_duration">Tiempo de sesión</string>
+    <string name="mango_hud_element_clock">Reloj</string>
+    <string name="mango_hud_element_throttle">Estado térmico</string>
+    <string name="mango_hud_group_memory">Memoria</string>
+    <string name="mango_hud_group_system">Sistema</string>
+    <string name="mango_hud_lock">Bloquear HUD</string>
+    <string name="mango_hud_lock_subtitle">Permite que los toques pasen a los controles detrás del HUD. Mantén pulsado el HUD para bloquearlo. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">¿Deseas finalizar este proceso?</string>
@@ -591,6 +660,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="session_display_frame_rate">Tasa de fotogramas</string>
     <string name="session_display_title">Pantalla</string>
     <string name="session_display_fullscreen_stretched">Activar pantalla completa (estirada)</string>
+    <string name="session_display_direct_composition">Composición directa (sin copia)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderizador:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="session_gamepad_error_loading_profile">Error al cargar el perfil</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Controles táctiles</string>
+    <string name="input_controls_auto_hide_on_controller_title">Ocultar automáticamente con mando</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Oculta los controles táctiles cuando se conecta un mando</string>
     <string name="session_gyroscope_title">Giroscopio</string>
     <string name="session_gyroscope_calibrate">Calibrar giroscopio</string>
     <string name="session_gyroscope_enable_right_stick">Activar movimiento giroscópico del joystick derecho</string>
@@ -700,6 +773,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_general_select_wallpaper">Seleccionar fondo de pantalla</string>
     <string name="settings_general_title">General</string>
     <string name="settings_general_enable_file_provider">Activar proveedor de archivos</string>
+    <string name="settings_general_enable_auto_scraping">Activar obtención automática</string>
     <string name="settings_general_take_effect_next_startup">Esta opción tendrá efecto en el próximo inicio.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Reinstalar Imagefs</string>
@@ -713,7 +787,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_general_share_android_clipboard">Compartir portapapeles de Android con Wine</string>
     <string name="settings_general_paths_title">Ajustes de rutas</string>
     <string name="settings_general_paths_summary">Gestionar dónde Winlator almacena sus datos de trabajo y dónde se escriben los accesos directos exportados.</string>
-    <string name="settings_general_winlator_path_title">Ruta de Winlator</string>
+    <string name="settings_general_winlator_path_title">Ruta de almacenamiento</string>
     <string name="settings_general_shortcut_export_path_title">Ruta de exportación de accesos directos</string>
     <string name="settings_general_choose_path">Elegir ruta</string>
     <string name="settings_general_xserver_cursor_summary">Ajustar la velocidad del puntero para entrada táctil, trackpad y ratón dentro de la sesión de XServer.</string>
@@ -721,7 +795,9 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_general_cursor_lock_summary">Mantiene la captura directa del ratón activada para juegos que necesitan entrada de puntero sin procesar. Desactívalo con Bajar Volumen.</string>
     <string name="settings_general_xinput_toggle_title">Desactivar XInput</string>
     <string name="settings_general_xinput_toggle_summary">Desactiva el manejo de XInput cuando quieras control exclusivo de ratón y teclado.</string>
-    <string name="settings_general_file_provider_summary">Exponer los archivos de Winlator a los selectores de documentos y administradores de archivos de Android.</string>
+    <string name="settings_external_display_output_summary">Mueve el juego a una pantalla externa conectada en lugar de duplicar esta pantalla. Las gafas siempre usan su propia pantalla.</string>
+    <string name="settings_general_file_provider_summary">Exponer los archivos de WinNative a los selectores de documentos y administradores de archivos de Android.</string>
+    <string name="settings_general_auto_scraping_summary">Permite que WinNative obtenga automáticamente el arte de los juegos personalizados.</string>
     <string name="settings_general_open_browser_summary">Abrir enlaces web compatibles en el navegador de Android en lugar de dentro de Wine.</string>
     <string name="settings_general_clipboard_summary">Permitir copiar y pegar entre Android y las sesiones de Wine.</string>
     <string name="settings_general_imagefs_summary">Restaurar los archivos del sistema incluidos sin eliminar tus contenedores existentes.</string>
@@ -736,7 +812,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_audio_sound_font_installed_failed">¡Error al instalar el SoundFont!</string>
     <string name="settings_audio_sound_font_already_exist">El SoundFont que deseas instalar ya existe.</string>
     <string name="settings_audio_unable_to_install_soundfont">No se pudo instalar el SoundFont</string>
-    <string name="settings_audio_installing_soundfont">Instalando SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Instalando SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Formato de SoundFont incorrecto.</string>
     <string name="settings_audio_cannot_remove_default">No se puede eliminar el SoundFont predeterminado</string>
     <string name="settings_audio_summary">Instalar, eliminar y elegir el SoundFont usado para la reproducción MIDI.</string>
@@ -750,15 +826,33 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_debug_box_logs_subtitle">Escribir salida de depuración de Box86 y Box64 en archivo</string>
     <string name="settings_debug_fex_logs_title">Activar registros de FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Escribir salida de depuración de FEXCore en archivo</string>
+    <string name="settings_debug_emulator_logs_title">Registros de emulación Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Registra en archivo el emulador que usa tu contenedor.</string>
     <string name="settings_debug_steam_logs_title">Activar registros de Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Registrar eventos de autenticación y sesión de Steam para depuración.</string>
     <string name="settings_debug_wine_channels_title">Canales de depuración de Wine</string>
     <string name="settings_debug_wine_channels_summary">Elegir qué canales de Wine se incluyen cuando el registro de depuración de Wine está activado.</string>
+    <string name="settings_debug_wine_classes_title">Niveles de registro de Wine</string>
+    <string name="settings_debug_wine_classes_summary">Elige qué tipos de mensajes se registran. Trace es extremadamente detallado.</string>
     <string name="settings_debug_input_logs">Registros de entrada</string>
     <string name="settings_debug_input_logs_description">Registrar eventos de entrada de mando, táctil y teclado</string>
     <string name="settings_debug_download_logs">Registros de descarga</string>
     <string name="settings_debug_download_logs_description">Registrar eventos del resolvedor de descargas y respaldo de WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Capas de validación de Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Reinicia la pantalla para aplicar.</string>
     <string name="settings_debug_share_logs">Compartir registros</string>
+    <string name="settings_debug_delete_logs">Eliminar registros</string>
+    <string name="settings_debug_share_all_logs_short">Compartir todo</string>
+    <string name="settings_debug_download_all_logs_short">Descargar todo</string>
+    <string name="settings_debug_logs_saved">Guardado en %1$s</string>
+    <string name="settings_debug_delete_logs_short">Eliminar</string>
+    <string name="settings_debug_delete_all_logs_short">Eliminar todo</string>
+    <string name="settings_debug_open_logs_folder_short">Abrir gestor de registros</string>
+    <string name="settings_debug_logs_deleted">Registros eliminados</string>
+    <string name="settings_debug_delete_logs_confirm_title">¿Eliminar registros?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Esto eliminará permanentemente todos los archivos de registro guardados (%1$s). No se puede deshacer.</string>
+    <string name="settings_debug_logs_browser_title">Registros</string>
+    <string name="settings_debug_log_truncated">Mostrando los últimos %1$s de este registro</string>
     <string name="settings_debug_logs_subject">Registros de WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">No hay registros de depuración disponibles. Activa primero las opciones de depuración e inicia un juego.</string>
     <string name="settings_debug_capture_failed">Error al capturar registros: %1$s</string>
@@ -773,6 +867,8 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
 
     <string name="settings_other_language_title">Idioma</string>
     <string name="settings_other_language_summary">Elige el idioma de visualización</string>
+    <string name="settings_other_game_language_title">Idioma del juego</string>
+    <string name="settings_other_game_language_summary">Idioma preferido para las descargas de Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">Predeterminado del sistema</string>
 
     <string name="settings_other_section_integration">Integración</string>
@@ -790,7 +886,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_content_empty_subtitle">Instala un paquete o cambia de tipo para empezar.</string>
     <string name="settings_content_container_created">Contenedor creado: %1$s</string>
     <string name="settings_content_download_failed">Descarga fallida.</string>
-    <string name="common_ui_working">Trabajando…</string>
+    <string name="common_ui_working">Trabajando</string>
     <string name="settings_content_desc_wine">Creado por el proyecto Wine; traduce llamadas Win32 a servicios nativos de Linux/Android.</string>
     <string name="settings_content_desc_proton">Creado por Valve; runtime basado en Wine con parches para juegos de Windows.</string>
     <string name="settings_content_desc_dxvk">Traduce llamadas gráficas de Direct3D 9, 10 y 11 a Vulkan.</string>
@@ -798,6 +894,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_content_desc_box64">Traduce código Linux x86_64 para que se ejecute en dispositivos ARM64.</string>
     <string name="settings_content_desc_wowbox64">Build de Box64 usado por WoW64 para ejecutar apps Windows de 32 bits en Wine de 64 bits.</string>
     <string name="settings_content_desc_fexcore">Traduce código x86 y x86_64 para que se ejecute en dispositivos ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduce llamadas gráficas de DirectDraw (Direct3D 7 y anteriores) a Vulkan.</string>
     <string name="settings_content_unable_to_install">No se pudo instalar el contenido.</string>
     <string name="settings_content_install_failed">Error en la instalación</string>
     <string name="settings_content_file_cannot_be_recognized">No se puede reconocer el archivo.</string>
@@ -809,9 +906,14 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="settings_content_downloading_title">Descargando contenido</string>
     <string name="settings_content_installing_title">Instalando contenido</string>
     <string name="settings_content_extracting_title">Extrayendo contenido</string>
-    <string name="settings_content_extracting_detail">Extrayendo… (%1$d archivos)</string>
-    <string name="settings_content_preparing_package">Preparando paquete…</string>
+    <string name="settings_content_extracting_detail">Extrayendo (%1$d archivos)</string>
+    <string name="settings_content_preparing_package">Preparando paquete</string>
     <string name="settings_content_download_complete">Descarga completa</string>
+    <string name="settings_content_already_installed_title">Componente ya instalado</string>
+    <string name="settings_content_already_installed_message">Este componente ya está instalado. Elimina la copia instalada antes de descargarlo otra vez.
+
+Ruta instalada:
+%1$s</string>
     <string name="settings_content_conflicting_title">Contenido en conflicto instalado</string>
     <string name="settings_content_conflicting_message">Por favor, desinstala el contenido en conflicto antes de descargar este paquete.
 
@@ -820,7 +922,7 @@ Ruta instalada:
     <string name="settings_content_cannot_be_trusted">No se puede confiar en el contenido.</string>
     <string name="settings_content_is_incomplete">El contenido está incompleto.</string>
     <string name="settings_content_untrusted_files_warning">Advertencia: El contenido adicional contiene archivos no confiables. Generalmente, los siguientes archivos no deberían modificarse. Por favor, decide si deseas proceder con la instalación.</string>
-    <string name="settings_content_confirm_remove">¿Deseas eliminar este contenido?</string>
+    <string name="settings_content_confirm_remove">Esto eliminará el componente de tu dispositivo.</string>
     <string name="settings_content_unable_to_remove_in_use">No se puede eliminar este contenido, porque un contenedor está usando actualmente este Wine.</string>
     <string name="settings_content_download_in_components">Ninguno descargado. Por favor, descarga uno en Componentes.</string>
     <string name="settings_content_types_header">TIPOS DE CONTENIDO</string>
@@ -832,9 +934,12 @@ Ruta instalada:
     <string name="settings_drivers_install">Instalar controladores</string>
     <string name="settings_drivers_installed_success">Controlador instalado correctamente.</string>
     <string name="settings_drivers_install_failed">Error al instalar el controlador.</string>
-    <string name="settings_drivers_confirm_remove">¿Deseas eliminar este controlador?</string>
+    <string name="settings_drivers_remove_title">¿Eliminar controlador?</string>
+    <string name="settings_drivers_confirm_remove">Esto eliminará el controlador de tu dispositivo.</string>
+    <string name="settings_drivers_remove_repo_title">¿Eliminar repositorio?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s se eliminará de tu lista de repositorios.</string>
     <string name="settings_drivers_repo_tap_to_load">Toca para cargar versiones</string>
-    <string name="settings_drivers_repo_loading_releases">Cargando versiones…</string>
+    <string name="settings_drivers_repo_loading_releases">Cargando versiones</string>
     <string name="settings_drivers_repo_release_count">%1$d versiones cargadas</string>
     <string name="settings_drivers_repo_no_release_assets">No se encontraron archivos ZIP descargables en las versiones obtenidas.</string>
     <string name="settings_drivers_repo_fetch_failed">No se pudieron cargar las versiones de GitHub.</string>
@@ -844,7 +949,7 @@ Ruta instalada:
     <string name="settings_drivers_manager">Gestor de controladores</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Instalando archivos del sistema…</string>
+    <string name="setup_wizard_installing_system_files">Instalando archivos del sistema</string>
     <string name="setup_wizard_unable_to_install_system_files">No se pudieron instalar los archivos del sistema</string>
     <string name="setup_wizard_system_image_not_installed">Imagen del sistema no instalada. Por favor, instala los componentes primero.</string>
     <string name="setup_wizard_recommended_components">Componentes recomendados</string>
@@ -913,6 +1018,9 @@ Ruta instalada:
     <string name="google_cloud_sync_started">Sincronización en la nube iniciada.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Servicios de Google</string>
+    <string name="google_auto_signin_title">Iniciar sesión en Google al abrir</string>
+    <string name="google_auto_signin_summary">Conéctate automáticamente a Google Play Games cuando se inicia la aplicación para que las copias de seguridad y la sincronización de partidas guardadas estén siempre listas. Si está desactivado, la aplicación nunca inicia sesión por su cuenta.</string>
+    <string name="google_auto_signin_section">Al iniciar</string>
     <string name="google_cloud_play_games">Google Play Games</string>
     <string name="google_cloud_status_syncing">Sincronizando</string>
     <string name="google_cloud_status_connected">Conectado</string>
@@ -971,22 +1079,30 @@ Ruta instalada:
     <string name="saves_import_export_exported_failed">Error al exportar guardados: %1$s</string>
     <string name="saves_import_export_imported">Guardados importados correctamente</string>
     <string name="saves_import_export_imported_failed">Error al importar guardados: %1$s</string>
+    <string name="saves_export_path_summary">Las partidas guardadas se exportarán a /WinNative/saves</string>
+    <string name="saves_export_success_path">Exportado a %1$s</string>
+    <string name="saves_export_warning_title">Usa esto solo con juegos personalizados</string>
+    <string name="saves_export_warning_body">La exportación puede incluir partidas guardadas de juegos instalados desde tiendas o con sincronización en la nube.</string>
+    <string name="saves_import_warning_title">Esto sobrescribirá las partidas guardadas existentes de este contenedor</string>
+    <string name="saves_import_warning_body">Al restaurar una copia de seguridad antigua con varios juegos, copia primero cualquier partida guardada más reciente en el zip con tu administrador de archivos. Solo se verán afectadas las partidas guardadas que existan en el .zip. Gestiona tus partidas guardadas con cuidado.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Contenedor</string>
-    <string name="preloader_initializing">Inicializando…</string>
-    <string name="preloader_launching">Iniciando…</string>
-    <string name="preloader_closing">Cerrando %1$s…</string>
-    <string name="preloader_setup_environment">Configurando entorno…</string>
-    <string name="preloader_installing_mono">Instalando Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Instalando redistribuibles…</string>
-    <string name="preloader_unpacking_exe">Descomprimiendo ejecutable del juego…</string>
-    <string name="preloader_downloading_cloud">Descargando guardados en la nube…</string>
-    <string name="preloader_syncing_cloud">Sincronizando guardados en la nube…</string>
-    <string name="preloader_cloud_downloading">Descargando sincronización en la nube…</string>
-    <string name="preloader_cloud_backup">Respaldando guardado en Google Drive…</string>
+    <string name="preloader_initializing">Inicializando</string>
+    <string name="preloader_launching">Iniciando</string>
+    <string name="preloader_closing">Cerrando %1$s</string>
+    <string name="preloader_setup_environment">Configurando entorno</string>
+    <string name="preloader_retrying_steam_client_download">Reintentando descarga del cliente de Steam</string>
+    <string name="preloader_installing_mono">Instalando Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Instalando redistribuibles</string>
+    <string name="preloader_unpacking_exe">Descomprimiendo ejecutable del juego</string>
+    <string name="preloader_downloading_cloud">Descargando guardados en la nube</string>
+    <string name="preloader_syncing_cloud">Sincronizando guardados en la nube</string>
+    <string name="preloader_uploading_cloud">Subiendo guardados a la nube</string>
+    <string name="preloader_checking_cloud">Comprobando guardados en la nube</string>
+    <string name="preloader_cloud_sync_retry">%1$s Reintento %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Descargando sincronización en la nube</string>
     <string name="cloud_sync_failed_provider">Sincronización en la nube de %1$s falló.</string>
-    <string name="google_cloud_backup_failed">Respaldo en Google Drive falló.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Ruta instalada:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Gráficos</string>
-    <string name="container_backups_title">Copias de seguridad</string>
-    <string name="container_backups_prompt">Elige una acción para esta copia de seguridad del contenedor.</string>
-    <string name="container_backups_backing_up">Creando copia de seguridad del contenedor…</string>
-    <string name="container_backups_restoring">Restaurando contenedor…</string>
-    <string name="container_backups_checking">Comprobando copias de seguridad del contenedor…</string>
-    <string name="container_backups_select_title">Selecciona la copia para restaurar</string>
-    <string name="container_backups_no_files">No se encontraron copias de seguridad del contenedor en Google Drive.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Asignación principal</string>
     <string name="binding_secondary">Asignación secundaria</string>
+    <string name="binding_third">Asignación terciaria</string>
+    <string name="binding_fourth">Asignación cuaternaria</string>
     <string name="input_controls_editor_tap_to_switch">Toca para cambiar</string>
     <string name="input_controls_editor_download_profile">Descargar perfil</string>
     <string name="container_config_emulator_section">Emulador</string>
@@ -1010,6 +1122,7 @@ Ruta instalada:
     <string name="session_drawer_fps_monitor">Monitor de FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Mostrar estadísticas de rendimiento en tiempo real</string>
     <string name="session_drawer_dual_series_battery">Batería Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Mostrar tiempo de fotograma como número</string>
     <string name="session_drawer_command_center">Centro de comandos</string>
     <string name="session_drawer_command_center_input">Entrada</string>
     <string name="session_drawer_command_center_display">Pantalla</string>
@@ -1022,7 +1135,6 @@ Ruta instalada:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Natural</string>
     <string name="session_drawer_color_profile_crt">Efecto CRT</string>
-    <string name="session_drawer_upscaler_dls">Vívido</string>
     <string name="session_drawer_calibrate_advanced">Calibración avanzada</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Giro</string>
@@ -1034,7 +1146,6 @@ Ruta instalada:
     <string name="session_drawer_rail_label_mouse">Ratón</string>
     <string name="session_drawer_rail_label_fullscreen">Pantalla completa</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Nativo</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Tareas</string>
     <string name="session_drawer_rail_label_logs">Reg.</string>
@@ -1048,24 +1159,23 @@ Ruta instalada:
     <string name="session_drawer_logs_share_chooser">Compartir registros de sesión</string>
     <string name="session_drawer_logs_share_failed">No se pudieron compartir los registros</string>
     <string name="session_drawer_logs_share_empty">No hay líneas de registro para compartir</string>
-    <string name="session_drawer_super_resolution">Filtros de Nitidez</string>
-    <string name="session_drawer_upscaler_mode">Filtro</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Superresolución</string>
+    <string name="session_drawer_upscaler_mode">Escalador</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Vívido</string>
+    <string name="session_drawer_vivid_strength">Intensidad de viveza</string>
     <string name="session_drawer_main_menu_title">Menú</string>
     <string name="session_gyroscope_activator">Activador</string>
     <string name="settings_general_check_for_updates">Buscar actualizaciones</string>
     <string name="settings_general_check_for_updates_summary">Buscar automáticamente nuevas versiones de la aplicación al iniciar y periódicamente.</string>
     <string name="setup_wizard_containers">Configuración del contenedor</string>
-    <string name="google_cloud_auto_backup">Copia automática de Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Haz una copia automática de los guardados del juego en Google Drive cada vez que salgas de un juego.</string>
     <string name="cloud_saves_title">Guardados en la nube</string>
-    <string name="cloud_saves_backup">Hacer copia del guardado en la nube</string>
-    <string name="cloud_saves_restore">Restaurar guardado en la nube</string>
+    <string name="cloud_saves_title_for_provider">Guardados en la nube de %1$s - %2$s</string>
     <string name="cloud_sync_title">Sincronización en la nube</string>
     <string name="cloud_sync_enabled_summary">Descarga los guardados en la nube al iniciar y sincronízalos o respáldalos al salir.</string>
     <string name="cloud_sync_disabled_summary">Inicia este juego sin descarga de guardados en la nube ni sincronización al salir.</string>
-    <string name="cloud_saves_backing_up">Respaldando guardado en la nube…</string>
-    <string name="cloud_saves_restoring">Restaurando guardado en la nube…</string>
+    <string name="cloud_saves_backing_up">Respaldando guardado en la nube</string>
+    <string name="cloud_saves_restoring">Restaurando guardado en la nube</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Ruta instalada:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Controla el almacenamiento en caché de los bloques dynarec generados entre ejecuciones para acelerar el inicio.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@ Ruta instalada:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Aún no hay partidas guardadas anteriores. Las partidas reemplazadas y las copias manuales aparecerán aquí durante 30 días.</string>
+    <string name="cloud_saves_history_loading">Cargando historial de partidas\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">nube</string>
+    <string name="cloud_saves_history_origin_local">local</string>
+    <string name="cloud_saves_history_origin_manual">manual</string>
+    <string name="cloud_saves_history_refresh">Actualizar</string>
+    <string name="cloud_saves_history_rename">Renombrar</string>
+    <string name="cloud_saves_history_rename_clear">Borrar</string>
+    <string name="cloud_saves_history_rename_failed">No se pudo renombrar la copia de seguridad.</string>
+    <string name="cloud_saves_history_rename_hint">p. ej. Jefe final, Antes del final</string>
+    <string name="cloud_saves_history_rename_save">Guardar</string>
+    <string name="cloud_saves_history_rename_success">Copia de seguridad renombrada.</string>
+    <string name="cloud_saves_history_rename_title">Nombra esta copia de seguridad</string>
+    <string name="cloud_saves_history_restore">Restaurar</string>
+    <string name="cloud_saves_history_restore_confirm_body">Esto reemplazará tu partida local actual con la copia de seguridad de %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">¿Restaurar esta copia de seguridad?</string>
+    <string name="cloud_saves_history_restore_failed">No se pudo restaurar esta copia de seguridad.</string>
+    <string name="cloud_saves_history_restore_success">Partida restaurada desde la copia de seguridad.</string>
+    <string name="cloud_saves_history_sign_in">Inicia sesión en Google para ver tu historial de partidas.</string>
+    <string name="cloud_saves_history_title">Historial de partidas</string>
+    <string name="cloud_saves_history_download">Descargar</string>
+    <string name="cloud_saves_history_download_success">Archivo descargado.</string>
+    <string name="cloud_saves_history_download_failed">Error al descargar.</string>
+    <string name="cloud_saves_keep_replaced_backup">Guardar una copia de seguridad de la partida reemplazada</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Si cambias de opinión, puedes restaurarla desde el Historial de partidas.</string>
+    <string name="cloud_saves_no_backups">Aún no hay copias de seguridad para este juego.</string>
+    <string name="cloud_saves_offline_mode">Desactivar sincronización en la nube</string>
+    <string name="cloud_saves_offline_mode_summary">Detiene toda la actividad automática en la nube para este juego.</string>
+    <string name="cloud_saves_sync_from_provider">Sincronizar desde %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_failed">No se pudo descargar la partida de %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Gestionar guardados en la nube de GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Abre el sitio web oficial de GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">No hay ningún navegador disponible para abrir la página de guardados en la nube de GOG</string>
+    <string name="cloud_saves_gog_zip_label">Descargar ZIP de la nube de GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Guardar archivos actuales de la nube</string>
+    <string name="cloud_saves_gog_zip_success">ZIP de guardados en la nube de GOG guardado.</string>
+    <string name="cloud_saves_gog_zip_failed">No se pudo guardar el ZIP de guardados en la nube de GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">No se encontraron archivos de guardado en la nube de GOG.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Sincronizar desde la nube</string>
+    <string name="cloud_saves_sync_from_provider_success">Partida en la nube de %1$s descargada.</string>
+    <string name="cloud_saves_syncing_from_provider">Descargando partida de %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Descarga la versión que %1$s tiene ahora mismo.</string>
+    <string name="cloud_saves_sync_summary_generic">Descarga la versión actual en la nube.</string>
+    <string name="common_ui_exit_app_confirm">¿Salir de WinNative?</string>
+    <string name="container_surface_effect">Efecto de superficie</string>
+    <string name="downloads_queue_cancel_download_confirm">¿Cancelar la descarga de %1$s y eliminar todos los archivos descargados?</string>
+    <string name="downloads_queue_paused_resume_hint">En pausa: toca Reanudar para continuar</string>
+    <string name="downloads_queue_phase_applying_data">Aplicando datos</string>
+    <string name="downloads_queue_phase_downloading">Descargando</string>
+    <string name="downloads_queue_phase_downloading_file">Descargando [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Finalizando</string>
+    <string name="downloads_queue_phase_patching">Parcheando</string>
+    <string name="downloads_queue_phase_preparing">Preparando</string>
+    <string name="downloads_queue_phase_queued">En cola</string>
+    <string name="downloads_queue_phase_unknown">Desconocido</string>
+    <string name="downloads_queue_phase_unpacking">Descomprimiendo</string>
+    <string name="downloads_queue_phase_updating">Actualizando</string>
+    <string name="downloads_queue_phase_verifying">Verificando</string>
+    <string name="downloads_queue_phase_verifying_file">Verificando [%1$s]</string>
+    <string name="downloads_queue_status_label">Estado:</string>
+    <string name="downloads_queue_this_game">este juego</string>
+    <string name="hud_position_bottom_center">Centro inferior</string>
+    <string name="hud_position_bottom_left">Inferior izquierdo</string>
+    <string name="hud_position_bottom_right">Inferior derecho</string>
+    <string name="hud_position_left_center">Centro izquierdo</string>
+    <string name="hud_position_menu_title">Mover HUD a</string>
+    <string name="hud_position_right_center">Centro derecho</string>
+    <string name="hud_position_top_center">Centro superior</string>
+    <string name="hud_position_top_left">Superior izquierdo</string>
+    <string name="hud_position_top_right">Superior derecho</string>
+    <string name="input_controls_editor_number_of_bindings">Número de asignaciones</string>
+    <string name="input_controls_editor_opacity">Opacidad</string>
+    <string name="input_controls_editor_radial_menu">Menú radial</string>
+    <string name="input_controls_editor_radial_menu_options">Opciones del menú radial</string>
+    <string name="input_controls_tap_to_click">Toca para hacer clic</string>
+    <string name="input_controls_reverse_binding_order">Invertir orden de asignaciones</string>
+    <string name="num_controllers">Número de mandos</string>
+    <string name="session_drawer_controls_section">Controles</string>
+    <string name="session_drawer_header_subtitle">Acceso rápido a controles, superposiciones y herramientas de sesión</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_alpha_input_title">Establecer alfa</string>
+    <string name="session_drawer_hud_disabled_hint">Activa la superposición para personalizarla</string>
+    <string name="session_drawer_hud_elements">Elementos del HUD</string>
+    <string name="session_drawer_hud_input_hint">Introduce un valor entre %1$d y %2$d. Los valores superiores al límite se recortan.</string>
+    <string name="session_drawer_hud_scale">Escala</string>
+    <string name="session_drawer_hud_scale_input_title">Establecer escala</string>
+    <string name="session_drawer_hud_summary">Ajusta la visibilidad de la superposición y los datos mostrados</string>
+    <string name="session_drawer_screen_effects">Efectos de pantalla</string>
+    <string name="session_drawer_session_section">Sesión</string>
+    <string name="session_drawer_swipe_hint">Desliza para volver al juego</string>
+    <string name="session_gamepad_enable_vibration">Activar vibración</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Movimiento de ratón experimental</string>
+    <string name="session_gyroscope_mouse_scale">Escala del ratón</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Escala del ratón: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Abre el asistente de configuración de nuevo para revisar permisos, archivos del sistema y contenedores predeterminados.</string>
+    <string name="settings_other_setup_wizard_title">Asistente de configuración</string>
+    <string name="shortcuts_library_artwork_failed">Error al cargar la imagen seleccionada.</string>
+    <string name="shortcuts_library_artwork_open_source">Abrir SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Establecer imagen</string>
+    <string name="shortcuts_library_artwork_title">Imágenes de la biblioteca</string>
+    <string name="shortcuts_library_artwork_icon_title">Arte del icono</string>
+    <string name="shortcuts_library_artwork_hero_title">Fondo</string>
+    <string name="shortcuts_list_readded_existing">Acceso directo existente añadido de nuevo</string>
+    <string name="shortcuts_properties_runtime_patcher">Parcheador DRM en tiempo de ejecución</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Inyecta un DLL parcheador de DRM al iniciar. Reduce los FPS; úsalo solo si el lanzador heredado por sí solo falla.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Seleccionar carpeta de guardados</string>
+    <string name="cloud_saves_custom_folder_label">Carpeta de guardados</string>
+    <string name="cloud_saves_custom_select_folder_summary">Apunta al directorio de guardados dentro del contenedor</string>
+    <string name="cloud_saves_custom_no_container">El contenedor no está disponible para este acceso directo</string>
+    <string name="cloud_saves_custom_picker_title">Seleccionar carpeta de guardados</string>
+    <string name="cloud_saves_custom_outside_drive_c">La carpeta seleccionada debe estar dentro de la unidad C: del contenedor</string>
+    <string name="cloud_saves_custom_path_map_failed">No se pudo convertir la carpeta seleccionada a una ruta de Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Carpeta de guardados establecida en %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sincronizar desde Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Descargar el guardado más reciente</string>
+    <string name="cloud_saves_steam_sync_success">Sincronizado desde Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">La sincronización de Steam Cloud falló</string>
+    <string name="cloud_saves_steam_browse_label">Ver guardados de Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Abrir almacenamiento en la nube</string>
+    <string name="cloud_saves_steam_browse_no_browser">No hay ningún navegador disponible para abrir la página de Steam</string>
+    <string name="cloud_saves_steam_import_label">Importar archivos</string>
+    <string name="cloud_saves_steam_import_helper">Restaurar archivos descargados</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Selector de archivos no disponible</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Esto descargará los archivos de guardado actuales de Steam Cloud y sobrescribirá los archivos de guardado actuales.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID de aplicación no válido</string>
+    <string name="cloud_saves_label_saved">Etiqueta guardada</string>
+    <string name="downloads_queue_cancel_all_title">¿Cancelar todas las descargas?</string>
+    <string name="downloads_queue_cancel_all_warning">Cancelar descargas de DLC, juegos o actualizaciones puede dañar tus instalaciones de juegos.\n\n¿Seguro que quieres cancelar todas las descargas y eliminar los archivos descargados hasta ahora?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Usar lanzador heredado</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Emulación de Steam heredada: ejecuta el juego mediante el lanzador ColdClient y elimina SteamStub DRM del exe. Úsalo solo para juegos antiguos que no funcionan con Steam Launcher.</string>
+    <string name="steam_section_real_client">Cliente real de Steam de WinNative</string>
+    <string name="steam_section_emulator">Emulador de Steam heredado</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Hace que el cliente Steam emulado se reporte como desconectado, para que el juego no intente conexiones en línea. Úsalo en juegos que se quedan bloqueados en la comprobación de red de Steam.</string>
+    <string name="input_controls_select_style">Seleccionar estilo</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Pizarra</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Destello</string>
+    <string name="input_controls_style_shadow">Sombra</string>
+    <string name="input_controls_style_reticle">Retícula</string>
+    <string name="input_controls_style_neon">Neón</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Tema de color</string>
+    <string name="input_controls_edit_duplicating_builtin">Perfil integrado: se creó una copia que puedes editar.</string>
+    <string name="input_controls_editor_confirm_reset_profile">¿Restablecer este perfil a su diseño original? Se perderán todos los cambios que hayas hecho.</string>
+    <string name="input_controls_editor_profile_reset">Perfil restablecido a su diseño original.</string>
+    <string name="input_controls_editor_reset_unavailable">No hay una instantánea original disponible para este perfil.</string>
+    <string name="container_graphics_compositor_present_mode">Sincronización de pantalla Vulkan</string>
+    <string name="cloud_sync_disable_title">Desactivar guardados en la nube</string>
+    <string name="cloud_saves_steam_push_label">Subir a Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forzar subida del guardado local</string>
+    <string name="cloud_saves_steam_push_success">Guardado subido a Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">No se pudo subir el guardado a Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud no está disponible ahora. Reconectando en segundo plano toca actualizar cuando vuelvas a estar en línea.</string>
+    <string name="steam_session_refused_event">Steam rechazó la sesión en caché (EResult=%1$d). Inicia sesión de nuevo.</string>
+    <string name="settings_hud_record_to_file_title">Grabar rendimiento en archivo</string>
+    <string name="settings_hud_record_to_file_summary">Exporta métricas por segundo de FPS, CPU, GPU, temperatura y batería a /WinNative/logs/ durante el juego.</string>
+    <string name="settings_leaderboard_category">Rendimiento</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Preparando entorno de Steam</string>
+    <string name="preloader_starting_wine">Iniciando Wine</string>
+    <string name="preloader_starting_steam_launcher">Iniciando Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Cargando cliente de Steam</string>
+    <string name="preloader_connecting_to_steam">Conectando a Steam</string>
+    <string name="preloader_signing_in_to_steam">Iniciando sesión en Steam</string>
+    <string name="preloader_fetching_game_info">Sesión iniciada — obteniendo información del juego</string>
+    <string name="preloader_steam_ready">Steam listo</string>
+    <string name="preloader_updating_game_info">Actualizando información del juego</string>
+    <string name="preloader_verifying_install">Verificando instalación</string>
+    <string name="preloader_scanning_redists">Buscando redistribuibles</string>
+    <string name="preloader_installing_redist_single">Instalando redistribuible</string>
+    <string name="preloader_installing_named_redist">Instalando %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Instalando %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuibles listos</string>
+    <string name="preloader_no_redists">No hay redistribuibles para instalar</string>
+    <string name="preloader_steam_service_running">Servicio de Steam en ejecución</string>
+    <string name="preloader_launching_game">Iniciando %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher falló — preparando recursos de nuevo</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher no pudo iniciarse. Preparando de nuevo — vuelve a iniciar</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher llegó al juego, pero nunca se inició</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Cargando elementos de Workshop</string>
+    <string name="workshop_search_items">Buscar elementos de Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Obteniendo tus elementos suscritos de Steam.</string>
+    <string name="workshop_error_title">No se pudieron cargar los elementos del Workshop</string>
+    <string name="workshop_error_subtitle">Algo salió mal. Inténtalo de nuevo.</string>
+    <string name="workshop_empty_title">No hay elementos del Workshop suscritos</string>
+    <string name="workshop_empty_subtitle">Suscríbete a elementos en el Steam Workshop y vuelve a abrir esta ventana.</string>
+    <string name="workshop_search_empty_title">Ningún elemento coincide con \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Prueba con otro término de búsqueda.</string>
+    <string name="workshop_clear_search">Borrar búsqueda</string>
+    <string name="workshop_item_fallback">Elemento del Workshop</string>
+    <string name="common_ui_failed">Fallido</string>
+    <string name="steam_presence_snooze">Inactivo</string>
+    <string name="steam_presence_busy">Ocupado</string>
+    <string name="steam_presence_looking_to_trade">Buscando intercambio</string>
+    <string name="steam_presence_looking_to_play">Buscando jugar</string>
+    <string name="steam_friends_count">Amigos — %1$d en línea</string>
+    <string name="steam_friends_section_in_game">En juego (%1$d)</string>
+    <string name="steam_friends_section_online">En línea (%1$d)</string>
+    <string name="steam_friends_section_offline">Desconectado (%1$d)</string>
+    <string name="steam_friends_none_loaded">Aún no se han cargado amigos.</string>
+    <string name="steam_friends_chat_off">El chat está desactivado. Vuelve a activar el servicio de chat para ver a tus amigos.</string>
+    <string name="steam_friends_self_you">Tú</string>
+    <string name="steam_friends_in_game">En juego</string>
+    <string name="steam_friends_join">Unirse</string>
+    <string name="steam_friends_play">Jugar</string>
+    <string name="steam_chat_image_failed">(no se pudo enviar la imagen)</string>
+    <string name="steam_chat_empty">Aún no hay mensajes. ¡Saluda!</string>
+    <string name="steam_chat_uploading_image">Subiendo imagen…</string>
+    <string name="steam_chat_send_image">Enviar imagen</string>
+    <string name="steam_chat_message_hint">Mensaje…</string>
+    <string name="steam_chat_send">Enviar</string>
+    <string name="steam_chat_image">Imagen</string>
+    <string name="steam_common_back">Atrás</string>
+    <string name="steam_achievements_title">Logros</string>
+    <string name="steam_achievements_empty">No se encontraron logros para este juego,\no inicia sesión en Steam para cargarlos.</string>
+    <string name="steam_achievements_hidden">Logro oculto</string>
+    <string name="steam_achievements_hidden_desc">Sigue jugando para revelar este logro.</string>
+    <string name="steam_achievements_unlocked_on">Desbloqueado %1$s</string>
+    <string name="steam_achievements_unlocked">Desbloqueado</string>
+    <string name="steam_join_joining">Uniéndose a %1$s en %2$s…</string>
+    <string name="steam_join_install">Instala %1$s para unirte a %2$s</string>
+    <string name="steam_join_not_owned">No tienes %1$s</string>
+    <string name="steam_chat_not_sent">(no enviado)</string>
+    <string name="steam_join_the_game">el juego</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Servicio de chat</string>
+    <string name="steam_chat_setting_service_desc">Inicia sesión para amigos y chat; desactívalo para desconectarte</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Salida</string>
+    <string name="display_output_prompt_title">Pantalla externa detectada</string>
+    <string name="display_output_prompt_message">¿Enviar el juego a la pantalla conectada? Tus controles en pantalla y el menú permanecen en este teléfono.</string>
+    <string name="display_output_prompt_swap">Cambiar pantallas</string>
+    <string name="display_output_prompt_mirror">Duplicar</string>
+    <string name="display_output_swapped_toast">Juego movido a la pantalla externa. Los controles permanecen en tu teléfono.</string>
+    <string name="display_output_cast_unavailable">Los ajustes de pantalla inalámbrica no están disponibles en este dispositivo.</string>
+    <string name="display_output_restored_toast">Pantalla externa desconectada: el juego volvió al teléfono.</string>
+    <string name="session_drawer_output_title">Salida de pantalla</string>
+    <string name="session_drawer_output_subtitle">El juego se muestra en la pantalla externa.</string>
+    <string name="session_drawer_output_device">Pantalla conectada</string>
+    <string name="session_drawer_output_resolution">Resolución</string>
+    <string name="session_drawer_output_refresh_rate">Frecuencia de actualización</string>
+    <string name="session_drawer_output_aspect_ratio">Relación de aspecto</string>
+    <string name="session_drawer_output_aspect_fit">Ajustar (aspecto)</string>
+    <string name="session_drawer_output_aspect_stretch">Estirar (llenar)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (recortar)</string>
+    <string name="session_drawer_output_return_to_phone">Volver al teléfono</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Enviar a una TV</string>
+    <string name="session_drawer_output_cast_body">Conecta un adaptador USB-C / HDMI, o toca abajo para conectar una pantalla inalámbrica (Miracast / Wi-Fi Direct). El juego se muestra en la TV mientras estos controles permanecen en tu teléfono.</string>
+    <string name="session_drawer_output_cast_button">Conectar pantalla inalámbrica</string>
+    <string name="session_drawer_output_cast_note">Las TV solo con Chromecast no pueden mostrar el juego en vivo con controles privados: usa una pantalla inalámbrica o un adaptador USB‑C/HDMI para el mejor resultado.</string>
+    <string name="session_drawer_output_render_note">Los modos que informa tu pantalla cambian su salida real (puede quedar en negro un momento mientras se reinicia). Otras resoluciones se renderizan a ese tamaño y se escalan por hardware al panel: por encima de la nativa se ve más nítido (supermuestreo), por debajo va más rápido.</string>
+    <string name="session_drawer_output_scaling_note">Este teléfono envía la pantalla a su resolución nativa %1$s y no cambia de modo, así que esto define la resolución de renderizado — se escala por hardware al panel (más que la nativa mejora la nitidez, menos va más rápido).</string>
+    <string name="session_drawer_output_game_mode">Modo de juego (baja latencia)</string>
+    <string name="session_drawer_output_game_mode_on">Activado</string>
+    <string name="session_drawer_output_game_mode_off">Desactivado</string>
+    <string name="session_drawer_output_game_mode_note">Solicita el modo de juego / baja latencia de la TV (HDMI ALLM) para minimizar el retardo de entrada. Se muestra solo cuando la pantalla conectada lo admite.</string>
+    <string name="session_drawer_output_send_to_display">Enviar juego a la pantalla</string>
+    <string name="session_drawer_output_to_display">Salida a pantalla externa</string>
+    <string name="session_drawer_output_send_note">Hay una pantalla conectada. Envía el juego a ella: tus controles y el menú permanecen en este teléfono. Puedes devolverlo aquí en cualquier momento.</string>
+    <string name="session_drawer_output_display">Pantalla</string>
+    <string name="session_drawer_output_glasses">Gafas</string>
+    <string name="session_drawer_output_brightness">Brillo</string>
+    <string name="session_drawer_output_shade">Sombra (atenuación)</string>
+    <string name="session_drawer_output_3d">3D (lado a lado)</string>
+    <string name="glasses_panel_refresh">Frecuencia de actualización</string>
+    <string name="glasses_panel_sunblock">Filtro solar</string>
+    <string name="session_drawer_output_volume">Volumen</string>
+    <string name="session_drawer_output_glasses_note">Se envía directamente a tus gafas Viture por USB.</string>
+
+    <!-- Session > Touch & Gesture Profiles -->
+    <string name="common_ui_new">Nuevo</string>
+    <string name="common_ui_rename">Renombrar</string>
+    <string name="gesture_profile_export">Exportar perfil de gestos</string>
+    <string name="gesture_profile_import">Importar perfil de gestos</string>
+    <string name="gesture_profile_new">Nuevo perfil de gestos</string>
+    <string name="gesture_profile_none">No hay perfiles de gestos</string>
+    <string name="input_controls_editor_input_profiles_section">Perfiles de entrada</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilidad del stick derecho</string>
+    <string name="session_drawer_rts_gestures">Gestos RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Editar</string>
+    <string name="session_drawer_touch">Táctil</string>
+    <string name="session_drawer_touch_map_right_stick">Asignar al stick derecho</string>
+    <string name="session_drawer_touch_touchscreen">Modo pantalla táctil</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_gesture_profile_section">Perfil de gestos</string>
+    <string name="session_rts_action">Acción</string>
+    <string name="session_rts_behavior">Comportamiento</string>
+    <string name="session_rts_double_tap">Doble toque (doble clic izquierdo)</string>
+    <string name="session_rts_double_tap_delay">Retardo de doble toque (ms)</string>
+    <string name="session_rts_down">Abajo</string>
+    <string name="session_rts_drag">Arrastre con 1 dedo</string>
+    <string name="session_rts_pan1">Desplazar con 1 dedo</string>
+    <string name="session_rts_drag2">Arrastre con 2 dedos</string>
+    <string name="session_rts_drag_threshold">Umbral de arrastre (px)</string>
+    <string name="session_rts_gesture_threshold">Umbral de gesto (px)</string>
+    <string name="session_rts_hold2">Mantener con 2 dedos</string>
+    <string name="session_rts_hold3">Mantener con 3 dedos</string>
+    <string name="session_rts_hold4">Mantener con 4 dedos</string>
+    <string name="session_rts_hold_delay">Retardo de mantener (ms)</string>
+    <string name="session_rts_left">Izquierda</string>
+    <string name="session_rts_long_press">Pulsación larga</string>
+    <string name="session_rts_long_press_delay">Retardo de pulsación larga (ms)</string>
+    <string name="session_rts_pan">Desplazar con 2 dedos</string>
+    <string name="session_rts_pan_threshold">Inicio de desplazar/pellizcar (px)</string>
+    <string name="session_rts_right">Derecha</string>
+    <string name="session_rts_swipe3">Deslizar con 3 dedos</string>
+    <string name="session_rts_swipe4">Deslizar con 4 dedos</string>
+    <string name="session_rts_swipe_threshold">Umbral de deslizar (px)</string>
+    <string name="session_rts_tap1">Toque con 1 dedo</string>
+    <string name="session_rts_tap2">Toque con 2 dedos</string>
+    <string name="session_rts_tap3">Toque con 3 dedos</string>
+    <string name="session_rts_tap4">Toque con 4 dedos</string>
+    <string name="session_rts_up">Arriba</string>
+    <string name="session_rts_zoom">Zoom con pellizco</string>
+    <string name="session_drawer_brightness">Brillo</string>
+    <string name="session_drawer_contrast">Contraste</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Saturación</string>
+    <string name="session_drawer_temperature">Temperatura</string>
+    <string name="session_drawer_tint">Tinte</string>
+    <string name="session_drawer_intensity">Intensidad</string>
+    <string name="session_drawer_strength">Fuerza</string>
+    <string name="session_drawer_sharpen">Nitidez</string>
+    <string name="session_drawer_scanlines">Líneas de escaneo</string>
+    <string name="session_drawer_pixelate">Pixelar</string>
+    <string name="session_drawer_block_size">Tamaño de bloque</string>
+    <string name="session_drawer_scale">Escalado</string>
+    <string name="session_drawer_scale_nearest">Más cercano</string>
+    <string name="session_drawer_scale_linear">Lineal</string>
+    <string name="session_drawer_scale_bicubic">Bicúbico</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Caricatura</string>
+    <string name="session_drawer_color_blind">Daltonismo</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Restablecer efectos</string>
+    <string name="session_drawer_hud_background">Fondo</string>
+    <string name="session_drawer_hud_background_alpha">Alfa del fondo</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Establecer alfa del fondo</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Ajustar tamaño</string>
+    <string name="session_task_bring_to_front">Traer al frente</string>
+    <string name="session_task_custom_value">Valor personalizado</string>
+    <string name="session_gyroscope_orientation_mode">Inclinar para apuntar (orientación)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Archivos</string>
+    <string name="file_manager_copy">Copiar</string>
+    <string name="file_manager_cut">Cortar</string>
+    <string name="file_manager_paste">Pegar</string>
+    <string name="file_manager_paste_here">Pegar aquí</string>
+    <string name="file_manager_new_folder">Nueva carpeta</string>
+    <string name="file_manager_new_folder_short">Carpeta</string>
+    <string name="file_manager_multi_select">Elegir</string>
+    <string name="file_manager_create">Crear</string>
+    <string name="file_manager_delete">Eliminar</string>
+    <string name="file_manager_copy_count">Copiar (%1$d)</string>
+    <string name="file_manager_cut_count">Cortar (%1$d)</string>
+    <string name="file_manager_delete_count">Eliminar (%1$d)</string>
+    <string name="file_manager_extract">Extraer</string>
+    <string name="file_manager_extract_here">Extraer aquí</string>
+    <string name="file_manager_extract_to">Extraer en…</string>
+    <string name="file_manager_extracting">Extrayendo %1$s</string>
+    <string name="file_manager_extract_failed">Error al extraer</string>
+    <string name="file_manager_run_boot">Ejecutar / Arrancar</string>
+    <string name="file_manager_create_shortcut">Crear acceso directo</string>
+    <string name="file_manager_run_in_container">Ejecutar en contenedor</string>
+    <string name="file_manager_no_containers">No hay contenedores disponibles</string>
+    <string name="file_manager_delete_confirm">¿Eliminar \"%1$s\"? Esto no se puede deshacer.</string>
+    <string name="file_manager_delete_confirm_multi">¿Eliminar %1$d elementos? Esto no se puede deshacer.</string>
+    <string name="file_manager_copying">Copiando %1$s</string>
+    <string name="file_manager_moving">Moviendo %1$s</string>
+    <string name="file_manager_copying_count">Copiando %1$d elementos</string>
+    <string name="file_manager_moving_count">Moviendo %1$d elementos</string>
+    <string name="file_manager_paste_into_itself">No se puede pegar una carpeta dentro de sí misma</string>
+    <string name="file_manager_operation_failed">La operación falló</string>
+    <string name="file_manager_delete_failed">Error al eliminar</string>
+    <string name="file_manager_rename_failed">Error al renombrar</string>
+    <string name="file_manager_create_folder_failed">Error al crear la carpeta</string>
+    <string name="cloud_saves_google_backup_helper">Guardar una copia en Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Copia de seguridad en Google</string>
+    <string name="cloud_saves_google_backup_no_save">No se encontraron archivos de guardado para respaldar.</string>
+    <string name="cloud_saves_history_cloud_readonly">Solo lectura</string>
+    <string name="session_drawer_rail_label_record">Grabar</string>
+    <string name="session_record_failed">No se pudo iniciar la grabación</string>
+    <string name="session_record_fps">Tasa de fotogramas</string>
+    <string name="session_record_include_ui">Grabar interfaz</string>
+    <string name="session_record_include_ui_subtitle">Incluir HUD y controles en pantalla</string>
+    <string name="session_record_now">Grabar ahora</string>
+    <string name="session_record_quality">Calidad</string>
+    <string name="session_record_resolution">Resolución</string>
+    <string name="session_record_saved">Grabación guardada en WinNative/Recordings</string>
+    <string name="session_record_settings_title">Ajustes de grabación</string>
+    <string name="session_record_started">Grabación iniciada</string>
+    <string name="steam_chat_setting_stay_running">Ejecutar en segundo plano</string>
+    <string name="steam_chat_setting_stay_running_desc">Mantener el chat activo después de salir de WinNative</string>
+    <string name="settings_content_refresh">Actualizar</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Transferir partida</string>
+    <string name="retro_save_transfer_message">Importa una partida guardada local para este juego o exporta la partida actual.</string>
+    <string name="retro_save_transfer_import">Importar partida</string>
+    <string name="retro_save_transfer_export">Exportar partida</string>
+    <string name="retro_save_transfer_import_ok">Partida importada</string>
+    <string name="retro_save_transfer_import_failed">No se pudo importar la partida</string>
+    <string name="retro_save_transfer_export_ok">Partida exportada</string>
+    <string name="retro_save_transfer_export_failed">No se pudo exportar la partida</string>
+    <string name="retro_save_transfer_none">Aún no existe ninguna partida guardada para este juego</string>
+    <string name="retro_cheats_title">Trucos</string>
+    <string name="retro_cheats_hardcore_blocked">Los trucos están desactivados en el modo Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Guardar</string>
+    <string name="retro_ps2_cancel">Cancelar</string>
+    <string name="retro_ps2_save_state">Guardar estado</string>
+    <string name="retro_ps2_load_save_state">Cargar estado</string>
+    <string name="retro_ps2_achievements">Logros</string>
+    <string name="retro_ps2_cheats">Trucos</string>
+    <string name="retro_ps2_memory_cards">Tarjetas de memoria</string>
+    <string name="retro_ps2_fast_forward">Avance rápido</string>
+    <string name="retro_ps2_reset">Reiniciar</string>
+    <string name="retro_ps2_swap_disc">Cambiar disco</string>
+    <string name="retro_ps2_slot">Ranura %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Toca para cargar</string>
+    <string name="retro_ps2_slot_empty">Vacía</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Toca para sobrescribir</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Vacía — toca para guardar</string>
+    <string name="retro_ps2_slot_is_empty">La ranura %1$d está vacía</string>
+    <string name="retro_ps2_loaded_slot">Ranura %1$d cargada</string>
+    <string name="retro_ps2_could_not_load_slot">No se pudo cargar la ranura %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Guardado en la ranura %1$d</string>
+    <string name="retro_ps2_save_failed">Error al guardar</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Ranura 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Ranura 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Toca para usar</string>
+    <string name="retro_ps2_new_memory_card">Nueva tarjeta de memoria</string>
+    <string name="retro_ps2_import_card">Importar tarjeta</string>
+    <string name="retro_ps2_enable_online_dev9">Activar conexión (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adaptador de red de PS2: reinicia el juego para conectarlo</string>
+    <string name="retro_ps2_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_ps2_dns_mode">Modo DNS</string>
+    <string name="retro_ps2_primary_dns">DNS principal</string>
+    <string name="retro_ps2_secondary_dns">DNS secundario</string>
+    <string name="retro_ps2_optional">opcional</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automática (DHCP)</string>
+    <string name="retro_ps2_server_host">Servidor: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">toca para definir la IP (en blanco la elimina)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Añadir host de servidor</string>
+    <string name="retro_ps2_new_server_hostname">Nuevo nombre de host del servidor</string>
+    <string name="retro_ps2_server_hostname_hint">p. ej. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Controles en pantalla</string>
+    <string name="retro_ps2_edit_layout">Editar disposición</string>
+    <string name="retro_ps2_reset_layout">Restablecer disposición</string>
+    <string name="retro_ps2_layout_reset">Disposición restablecida</string>
+    <string name="retro_ps2_left_stick_invert_x">Stick izquierdo: invertir X</string>
+    <string name="retro_ps2_left_stick_invert_y">Stick izquierdo: invertir Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Stick derecho: invertir X</string>
+    <string name="retro_ps2_right_stick_invert_y">Stick derecho: invertir Y</string>
+    <string name="retro_ps2_button_color">Color de botones</string>
+    <string name="retro_ps2_letter_color">Color de letras</string>
+    <string name="retro_ps2_shadow_color">Color de sombra</string>
+    <string name="retro_ps2_background_color">Color de fondo</string>
+    <string name="retro_ps2_reset_colors">Restablecer colores</string>
+    <string name="retro_ps2_renderer">Renderizador</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Escala de resolución</string>
+    <string name="retro_ps2_scale_1x_native">1x (nativa)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_ps2_aspect_stretch">Estirar</string>
+    <string name="retro_ps2_aspect_auto_standard">Automática (estándar)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtro de pantalla</string>
+    <string name="retro_ps2_filter_nearest">Más cercano</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilineal (suave)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilineal (nítido)</string>
+    <string name="retro_ps2_texture_filter">Filtro de texturas</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilineal (forzado)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilineal (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilineal (sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Precisión de mezcla</string>
+    <string name="retro_ps2_blend_minimum">Mínima</string>
+    <string name="retro_ps2_blend_basic">Básica</string>
+    <string name="retro_ps2_blend_medium">Media</string>
+    <string name="retro_ps2_blend_high">Alta</string>
+    <string name="retro_ps2_blend_full">Completa</string>
+    <string name="retro_ps2_blend_maximum">Máxima</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Desactivado</string>
+    <string name="retro_ps2_shader_scanline">Líneas de escaneo</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Onda</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Saltar fotogramas</string>
+    <string name="retro_ps2_frameskip_off">Desactivado</string>
+    <string name="retro_ps2_frameskip_1">Saltar 1</string>
+    <string name="retro_ps2_frameskip_2">Saltar 2</string>
+    <string name="retro_ps2_frameskip_3">Saltar 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volumen</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Silenciar</string>
+    <string name="retro_ps2_swap_stereo_channels">Intercambiar canales estéreo</string>
+    <string name="retro_ps2_ee_cycle_rate">Frecuencia de ciclos EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (predeterminado)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_ps2_skip_off">Desactivado</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 instantáneo</string>
+    <string name="retro_ps2_mtvu">VU multihilo (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rápido</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Velocidad de emulación</string>
+    <string name="retro_ps2_hud_cpu_usage">Uso de CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Uso de GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Resolución interna</string>
+    <string name="retro_ps2_deinterlace_mode">Modo de desentrelazado</string>
+    <string name="retro_ps2_deint_auto">Automático</string>
+    <string name="retro_ps2_deint_off">Desactivado</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Relación de aspecto de FMV</string>
+    <string name="retro_ps2_anti_blur">Antidesenfoque</string>
+    <string name="retro_ps2_widescreen_patches">Parches panorámicos</string>
+    <string name="retro_ps2_no_interlace_patches">Parches sin entrelazado</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Detección de bucle INTC</string>
+    <string name="retro_ps2_wait_loop">Detección de bucle de espera</string>
+    <string name="retro_ps2_time_stretch">Estiramiento de tiempo de audio</string>
+    <string name="retro_ps2_audio_buffer">Búfer de audio</string>
+    <string name="retro_ps2_audio_latency">Latencia de salida</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Tiempos de fotograma</string>
+    <string name="retro_ps2_hud_gs_stats">Estadísticas de GS</string>
+    <string name="retro_ps2_hud_hw_info">Información de hardware</string>
+    <string name="retro_ps2_hud_version">Versión</string>
+    <string name="retro_ps2_hud_input_display">Visualización de entradas</string>
+    <string name="retro_ps2_tab_menu">Menú</string>
+    <string name="retro_ps2_tab_display">Pantalla</string>
+    <string name="retro_ps2_tab_performance">Rendimiento</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Sonido</string>
+    <string name="retro_ps2_tab_online">En línea</string>
+    <string name="retro_ps2_tab_controls">Controles</string>
+    <string name="retro_ps2_resume">Reanudar</string>
+    <string name="retro_ps2_pause">Pausar</string>
+    <string name="retro_ps2_exit">Salir</string>
+    <string name="retro_lr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Archivo de BIOS no válido</string>
+    <string name="retro_lr_invalid_retro_game">Juego retro no válido</string>
+    <string name="retro_lr_rom_not_found">ROM no encontrada: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">No se pudo leer la ROM dentro de este archivo</string>
+    <string name="retro_lr_core_not_installed">Núcleo no instalado: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Trucos activados: los logros están desactivados en esta sesión</string>
+    <string name="retro_lr_cloud_save_restored">Partida en la nube restaurada</string>
+    <string name="retro_lr_restore_failed">Error al restaurar</string>
+    <string name="retro_lr_cloud_conflict_message">Existe una partida en la nube más reciente para %1$s. ¿Deseas sincronizar y qué partida en la nube prefieres conservar?</string>
+    <string name="retro_lr_cloud_save">Partida en la nube</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">No se pudo cargar el núcleo del emulador</string>
+    <string name="retro_lr_failed_load_rom">No se pudo cargar la ROM</string>
+    <string name="retro_lr_graphics_not_supported">Gráficos no compatibles con este núcleo</string>
+    <string name="retro_lr_emulator_error">Error del emulador</string>
+    <string name="retro_lr_shader_default">Predeterminado</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Nítido</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Escalado SGSR</string>
+    <string name="retro_lr_upscale_native">Nativa</string>
+    <string name="retro_lr_sound">Sonido</string>
+    <string name="retro_lr_left_stick_invert_x">Stick izquierdo: invertir X</string>
+    <string name="retro_lr_left_stick_invert_y">Stick izquierdo: invertir Y</string>
+    <string name="retro_lr_right_stick_invert_x">Stick derecho: invertir X</string>
+    <string name="retro_lr_right_stick_invert_y">Stick derecho: invertir Y</string>
+    <string name="retro_lr_on_screen_controls">Controles en pantalla</string>
+    <string name="retro_lr_haptic_feedback">Respuesta háptica</string>
+    <string name="retro_lr_portrait">Vertical</string>
+    <string name="retro_lr_landscape">Horizontal</string>
+    <string name="retro_lr_edit_layout">Editar disposición (%1$s)</string>
+    <string name="retro_lr_reset_layout">Restablecer disposición %1$s</string>
+    <string name="retro_lr_layout_reset">Disposición %1$s restablecida</string>
+    <string name="retro_lr_button_color">Color de botones</string>
+    <string name="retro_lr_letter_color">Color de letras</string>
+    <string name="retro_lr_shadow_color">Color de sombra</string>
+    <string name="retro_lr_background_color">Color de fondo</string>
+    <string name="retro_lr_reset_colors">Restablecer colores</string>
+    <string name="retro_lr_colors_reset">Colores restablecidos</string>
+    <string name="retro_lr_performance_hud">HUD de rendimiento</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa del fondo</string>
+    <string name="retro_lr_background">Fondo</string>
+    <string name="retro_lr_scale">Escala</string>
+    <string name="retro_lr_numeric_frametime">Tiempo de fotograma numérico</string>
+    <string name="retro_lr_dual_series_battery">Batería de doble serie</string>
+    <string name="retro_lr_hud_elements">ELEMENTOS DEL HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Consola</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batería</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Gráfica</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Guardar estado</string>
+    <string name="retro_lr_load_save_state">Cargar estado</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">La carga de estados está desactivada en modo Hardcore</string>
+    <string name="retro_lr_achievements">Logros</string>
+    <string name="retro_lr_cheats">Trucos</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Los trucos están desactivados en modo Hardcore</string>
+    <string name="retro_lr_reset">Reiniciar</string>
+    <string name="retro_lr_fast_forward">Avance rápido</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">El avance rápido está desactivado en modo Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disco %1$d/%2$d</string>
+    <string name="retro_lr_resume">Reanudar</string>
+    <string name="retro_lr_pause">Pausar</string>
+    <string name="retro_lr_exit">Salir</string>
+    <string name="retro_lr_saved_to_slot">Guardado en la ranura %1$d</string>
+    <string name="retro_lr_could_not_save_state">No se pudo guardar el estado</string>
+    <string name="retro_lr_bios_required_title">Se requiere la BIOS de %1$s</string>
+    <string name="retro_lr_bios_required_message">Los juegos de PlayStation necesitan un archivo de BIOS real de la consola que debes proporcionar. Importa una BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin o scph7001.bin) para continuar.</string>
+    <string name="retro_lr_import_bios">Importar BIOS…</string>
+    <string name="retro_lr_cancel">Cancelar</string>
+    <string name="retro_lr_slot_empty">La ranura %1$d está vacía</string>
+    <string name="retro_lr_loaded_slot">Ranura %1$d cargada</string>
+    <string name="retro_lr_could_not_load_state">No se pudo cargar el estado</string>
+    <string name="retro_lr_slot_title">Ranura %1$d</string>
+    <string name="retro_lr_rename_slot">Renombrar ranura %1$d</string>
+    <string name="retro_gs_section_general">General</string>
+    <string name="retro_gs_section_graphics">Gráficos</string>
+    <string name="retro_gs_section_performance">Rendimiento</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Entrada</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">En línea</string>
+    <string name="retro_gs_cancel">Cancelar</string>
+    <string name="retro_gs_save">Guardar</string>
+    <string name="retro_gs_shader_default">Predeterminado</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Nítido</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativa</string>
+    <string name="retro_gs_group_game">JUEGO</string>
+    <string name="retro_gs_label_name">Nombre</string>
+    <string name="retro_gs_label_system">Sistema</string>
+    <string name="retro_gs_label_emulator_core">Núcleo del emulador</string>
+    <string name="retro_gs_label_rom_path">Ruta de la ROM</string>
+    <string name="retro_gs_group_bios">BIOS de %1$s</string>
+    <string name="retro_gs_label_installed">Instalada</string>
+    <string name="retro_gs_bios_none">Ninguna: necesaria para ejecutar juegos de %1$s</string>
+    <string name="retro_gs_import_bios">Importar BIOS…</string>
+    <string name="retro_gs_remove_bios">Quitar BIOS</string>
+    <string name="retro_gs_group_library_artwork">ILUSTRACIONES DE LA BIBLIOTECA</string>
+    <string name="retro_gs_artwork_game_card">Imagen de la ficha del juego</string>
+    <string name="retro_gs_artwork_grid">Imagen de cuadrícula</string>
+    <string name="retro_gs_artwork_carousel">Imagen de carrusel</string>
+    <string name="retro_gs_artwork_list">Imagen de lista</string>
+    <string name="retro_gs_artwork_custom_set">Imagen personalizada establecida</string>
+    <string name="retro_gs_artwork_set_image">Establecer imagen</string>
+    <string name="retro_gs_artwork_remove">Quitar</string>
+    <string name="retro_gs_group_video">VÍDEO</string>
+    <string name="retro_gs_video_filter">Filtro de vídeo</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Escalado SGSR</string>
+    <string name="retro_gs_performance_hud">HUD de rendimiento</string>
+    <string name="retro_gs_group_core">NÚCLEO</string>
+    <string name="retro_gs_renderer">Renderizador</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Escala de resolución</string>
+    <string name="retro_gs_scale_1x_native">1x (nativa)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_gs_aspect_stretch">Estirar</string>
+    <string name="retro_gs_aspect_auto_standard">Automática (estándar)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtro de pantalla</string>
+    <string name="retro_gs_filter_nearest">Más cercano</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilineal (suave)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilineal (nítido)</string>
+    <string name="retro_gs_texture_filter">Filtro de texturas</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilineal (forzado)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilineal (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilineal (sprites)</string>
+    <string name="retro_gs_blending_accuracy">Precisión de mezcla</string>
+    <string name="retro_gs_blend_minimum">Mínima</string>
+    <string name="retro_gs_blend_basic">Básica</string>
+    <string name="retro_gs_blend_medium">Media</string>
+    <string name="retro_gs_blend_high">Alta</string>
+    <string name="retro_gs_blend_full">Completa</string>
+    <string name="retro_gs_blend_maximum">Máxima</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Desactivado</string>
+    <string name="retro_gs_tvshader_scanline">Líneas de escaneo</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Onda</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Saltar fotogramas</string>
+    <string name="retro_gs_frameskip_1">Saltar 1</string>
+    <string name="retro_gs_frameskip_2">Saltar 2</string>
+    <string name="retro_gs_frameskip_3">Saltar 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">RENDIMIENTO</string>
+    <string name="retro_gs_ee_cycle_rate">Frecuencia de ciclos EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (predeterminado)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 instantáneo</string>
+    <string name="retro_gs_mtvu">VU multihilo (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rápido</string>
+    <string name="retro_gs_group_performance_hud">HUD DE RENDIMIENTO</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Velocidad de emulación</string>
+    <string name="retro_gs_hud_cpu_usage">Uso de CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Uso de GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Resolución interna</string>
+    <string name="retro_gs_deinterlace_mode">Modo de desentrelazado</string>
+    <string name="retro_gs_deint_auto">Automático</string>
+    <string name="retro_gs_deint_off">Desactivado</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Relación de aspecto de FMV</string>
+    <string name="retro_gs_anti_blur">Antidesenfoque</string>
+    <string name="retro_gs_widescreen_patches">Parches panorámicos</string>
+    <string name="retro_gs_no_interlace_patches">Parches sin entrelazado</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Detección de bucle INTC</string>
+    <string name="retro_gs_wait_loop">Detección de bucle de espera</string>
+    <string name="retro_gs_time_stretch">Estiramiento de tiempo de audio</string>
+    <string name="retro_gs_audio_buffer">Búfer de audio</string>
+    <string name="retro_gs_audio_latency">Latencia de salida</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Tiempos de fotograma</string>
+    <string name="retro_gs_hud_gs_stats">Estadísticas de GS</string>
+    <string name="retro_gs_hud_hw_info">Información de hardware</string>
+    <string name="retro_gs_hud_version">Versión</string>
+    <string name="retro_gs_hud_input_display">Visualización de entradas</string>
+    <string name="retro_gs_fast_boot">Arranque rápido</string>
+    <string name="retro_gs_group_online_dev9">EN LÍNEA (DEV9)</string>
+    <string name="retro_gs_enable_online">Activar conexión</string>
+    <string name="retro_gs_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_gs_net_auto">Automático</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Modo DNS</string>
+    <string name="retro_gs_dns_manual">Manual</string>
+    <string name="retro_gs_dns_internal">Interno</string>
+    <string name="retro_gs_primary_dns">DNS principal</string>
+    <string name="retro_gs_secondary_dns">DNS secundario</string>
+    <string name="retro_gs_dns_optional">opcional</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automática (DHCP)</string>
+    <string name="retro_gs_group_input">ENTRADA</string>
+    <string name="retro_engine_save">Guardar</string>
+    <string name="retro_engine_saved">Partida guardada</string>
+    <string name="retro_engine_loading">Cargando…</string>
+    <string name="retro_engine_load">Cargar</string>
+    <string name="retro_engine_saved_to">Guardado en %1$s</string>
+    <string name="retro_engine_slot_active_only">Activa</string>
+    <string name="retro_engine_rename_slot">Renombrar ranura de guardado</string>
+    <string name="retro_engine_caught">%1$d capturados</string>
+    <string name="retro_engine_no_slots">Aún no hay ranuras de guardado</string>
+    <string name="retro_engine_new_slot">Nueva ranura de guardado</string>
+    <string name="retro_engine_achievements_unavailable">No se registra en modo 3D</string>
+    <string name="retro_engine_fullscreen">Pantalla completa</string>
+    <string name="retro_engine_loaded_from">%1$s cargada</string>
+    <string name="retro_engine_slot_empty">Esa ranura está vacía</string>
+    <string name="retro_engine_loading_subtitle">Preparando los datos del juego por primera vez</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Juega a este juego con el motor de vóxeles 3D en lugar del núcleo estándar</string>
+    <string name="retro_gs_on_screen_controls">Controles en pantalla</string>
+    <string name="retro_gs_haptic_feedback">Respuesta háptica</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Volumen</string>
+    <string name="retro_gs_mute">Silenciar</string>
+    <string name="retro_gs_swap_stereo">Intercambiar canales estéreo</string>
+    <string name="retro_gs_sound">Sonido</string>
+    <string name="retro_scr_retro_defaults">VALORES RETRO PREDETERMINADOS</string>
+    <string name="retro_scr_retro_defaults_desc">Valores predeterminados aplicados a los juegos de cada consola salvo que se modifiquen en los ajustes propios de un juego.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Cuenta</string>
+    <string name="retro_scr_signed_in">Sesión iniciada</string>
+    <string name="retro_scr_not_signed_in_hint">Sin sesión iniciada: abre los Logros de un juego para iniciar sesión</string>
+    <string name="retro_scr_achievements_enabled">Logros activados</string>
+    <string name="retro_scr_hardcore_default">Modo Hardcore de forma predeterminada (sin estados guardados)</string>
+    <string name="retro_scr_sign_out">Cerrar sesión</string>
+    <string name="retro_scr_playstation_bios">BIOS DE PLAYSTATION</string>
+    <string name="retro_scr_installed">Instalada</string>
+    <string name="retro_scr_none_ps1_bios">Ninguna: los juegos de PS1 requieren una BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importar BIOS de PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS de PS1 eliminada</string>
+    <string name="retro_scr_no_bios_to_remove">No hay ninguna BIOS que eliminar</string>
+    <string name="retro_scr_remove_ps1_bios">Quitar BIOS de PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS DE PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Ninguna: los juegos de PS2 requieren una BIOS</string>
+    <string name="retro_scr_format">Formato</string>
+    <string name="retro_scr_ps2_bios_format">Volcado combinado en un solo archivo (.bin con región etiquetada, ~4MB). No se aceptan conjuntos ROM0/MEC/NVM separados.</string>
+    <string name="retro_scr_import_ps2_bios">Importar BIOS de PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS de PS2 eliminada</string>
+    <string name="retro_scr_remove_ps2_bios">Quitar BIOS de PS2</string>
+    <string name="retro_scr_library_artwork">ILUSTRACIONES DE LA BIBLIOTECA</string>
+    <string name="retro_scr_retro_case_art">Ilustración retro de la caja (cartucho / caja de CD)</string>
+    <string name="retro_scr_box_art">Ilustración de la caja</string>
+    <string name="retro_scr_box_art_desc">Se obtiene automáticamente de thumbnails.libretro.com al importar; una imagen personalizada siempre la sustituye.</string>
+    <string name="retro_scr_roms_folder">CARPETA DE ROMS</string>
+    <string name="retro_scr_folder">Carpeta</string>
+    <string name="retro_scr_roms_not_set">Sin definir: elige una carpeta para importar juegos automáticamente</string>
+    <string name="retro_scr_auto_import">Importación automática</string>
+    <string name="retro_scr_auto_import_desc">Los juegos nuevos de esta carpeta se añaden automáticamente a tu biblioteca con la consola correcta detectada.</string>
+    <string name="retro_scr_select_roms_folder_title">Seleccionar carpeta de ROMs</string>
+    <string name="retro_scr_select_roms_folder_button">Seleccionar carpeta de ROMs…</string>
+    <string name="retro_scr_change_roms_folder_button">Cambiar carpeta de ROMs…</string>
+    <string name="retro_scr_scan_now">Analizar ahora</string>
+    <string name="retro_scr_console_defaults">VALORES PREDETERMINADOS DE LA CONSOLA</string>
+    <string name="retro_scr_console_defaults_desc">Toca una consola para configurar sus ajustes predeterminados.</string>
+    <string name="retro_scr_renderer">Renderizador</string>
+    <string name="retro_scr_upscale_resolution">Escalar resolución</string>
+    <string name="retro_scr_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_scr_aspect_stretch">Estirar</string>
+    <string name="retro_scr_aspect_auto_standard">Automática (estándar)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtro de pantalla</string>
+    <string name="retro_scr_filter_nearest">Más cercano</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilineal (suave)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilineal (nítido)</string>
+    <string name="retro_scr_texture_filter">Filtro de texturas</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilineal (forzado)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilineal (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilineal (sprites)</string>
+    <string name="retro_scr_blending_accuracy">Precisión de mezcla</string>
+    <string name="retro_scr_blend_minimum">Mínima</string>
+    <string name="retro_scr_blend_basic">Básica</string>
+    <string name="retro_scr_blend_medium">Media</string>
+    <string name="retro_scr_blend_high">Alta</string>
+    <string name="retro_scr_blend_full">Completa</string>
+    <string name="retro_scr_blend_maximum">Máxima</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Desactivado</string>
+    <string name="retro_scr_shader_scanline">Líneas de escaneo</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Onda</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Saltar fotogramas</string>
+    <string name="retro_scr_skip_1">Saltar 1</string>
+    <string name="retro_scr_skip_2">Saltar 2</string>
+    <string name="retro_scr_skip_3">Saltar 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Frecuencia de ciclos EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (predeterminado)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_scr_skip_off">Desactivado</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 instantáneo</string>
+    <string name="retro_scr_mtvu">VU multihilo (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rápido</string>
+    <string name="retro_scr_touch_controls">Controles táctiles en pantalla</string>
+    <string name="retro_scr_sound">Sonido</string>
+    <string name="retro_scr_swap_stereo">Intercambiar canales estéreo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: velocidad de emulación</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: uso de CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: uso de GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: resolución interna</string>
+    <string name="retro_scr_enable_online_dev9">Activar conexión (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_scr_net_auto">Automático</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Modo DNS</string>
+    <string name="retro_scr_dns_manual">Manual</string>
+    <string name="retro_scr_dns_internal">Interno</string>
+    <string name="retro_scr_primary_dns">DNS principal</string>
+    <string name="retro_scr_secondary_dns">DNS secundario</string>
+    <string name="retro_scr_optional">opcional</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automática (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Escalado SGSR</string>
+    <string name="retro_scr_performance_hud">HUD de rendimiento</string>
+    <string name="retro_scr_credits_licenses">CRÉDITOS &amp; LICENCIAS</string>
+    <string name="retro_scr_credits_desc">Algunas de las funciones de WinNative se basan en estos proyectos de código abierto. Toca para ver cada fuente.</string>
+    <string name="retro_scr_tab_defaults">Predeterminados</string>
+    <string name="retro_scr_tab_credits">Créditos</string>
+    <string name="retro_scr_enable_hardcore_title">¿Activar el modo Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">El modo Hardcore reinicia el juego ahora y desactiva la carga de estados guardados, el avance rápido y los trucos. Se perderá cualquier progreso sin guardar. ¿Continuar?</string>
+    <string name="retro_scr_cancel">Cancelar</string>
+    <string name="retro_scr_enable">Activar</string>
+    <string name="retro_scr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Archivo de BIOS no válido</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS de PS2 importada: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Archivo de BIOS de PS2 no válido</string>
+    <string name="retro_scr_no_game_serial">No hay ningún número de serie de juego para buscar trucos.</string>
+    <string name="retro_scr_applied_cheats">Se aplicaron %1$d truco(s).</string>
+    <string name="retro_scr_couldnt_apply_cheats">No se pudieron aplicar los trucos.</string>
+    <string name="retro_scr_cheats">Trucos</string>
+    <string name="retro_scr_apply">Aplicar</string>
+    <string name="retro_scr_no_cheats_found">No se encontraron trucos para este juego.</string>
+    <string name="retro_scr_achievements">Logros</string>
+    <string name="retro_scr_sign_in_ra">Inicia sesión en RetroAchievements</string>
+    <string name="retro_scr_username">Nombre de usuario</string>
+    <string name="retro_scr_password">Contraseña</string>
+    <string name="retro_scr_login_failed">Error de inicio de sesión</string>
+    <string name="retro_scr_signing_in">Iniciando sesión…</string>
+    <string name="retro_scr_sign_in">Iniciar sesión</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">No hay logros para este juego.</string>
+    <string name="retro_scr_back">Atrás</string>
+    <string name="retro_scr_enabled">Activado</string>
+    <string name="retro_scr_disabled">Desactivado</string>
+    <string name="retro_scr_rename">Renombrar</string>
+    <string name="retro_scr_save">Guardar</string>
+    <string name="retro_scr_cloud_save_conflict">Conflicto de partida en la nube</string>
+    <string name="retro_scr_keep_local_save">Conservar partida local</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menú</string>
+    <string name="retro_tab_display">Pantalla</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Sonido</string>
+    <string name="retro_tab_controls">Controles</string>
+    <string name="retro_scan_up_to_date">Biblioteca actualizada</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">%1$d añadidos</string>
+    <string name="retro_scan_removed">%1$d eliminados</string>
+    <string name="retro_scr_shader_default">Predeterminado</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Nítido</string>
+    <string name="retro_scr_upscale_native">Nativa</string>
+    <string name="retro_co_aspect_ratio">Relación de aspecto</string>
+    <string name="retro_co_ntsc_filter">Filtro NTSC</string>
+    <string name="retro_co_colorization">Coloración</string>
+    <string name="retro_co_color_correction">Corrección de color</string>
+    <string name="retro_co_remove_sprite_limit">Quitar límite de sprites</string>
+    <string name="retro_co_resolution">Resolución</string>
+    <string name="retro_co_framebuffer_emulation">Emulación de framebuffer</string>
+    <string name="retro_co_dithering">Tramado</string>
+    <string name="retro_co_widescreen_hack">Hack panorámico</string>
+    <string name="retro_co_val_8_7_native">8:7 (nativa)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Desactivado</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Compuesto</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Automático</string>
+    <string name="retro_co_val_gba_screen">Pantalla GBA</string>
+    <string name="retro_co_val_gbc_screen">Pantalla GBC</string>
+    <string name="retro_co_val_on">Activado</string>
+    <string name="retro_co_val_320x240_native">320x240 (nativa)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ajustado</string>
+    <string name="retro_co_val_native">Nativa</string>
+    <string name="retro_co_val_internal">Interna</string>
+    <string name="retro_co_val_on_16_9">Activado (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Inicia sesión con tu cuenta de RetroAchievements para conseguir y seguir logros de juegos retro.</string>
+    <string name="retro_ach_username">Nombre de usuario</string>
+    <string name="retro_ach_password">Contraseña</string>
+    <string name="retro_ach_enter_credentials">Introduce tu nombre de usuario y contraseña</string>
+    <string name="retro_ach_login_failed">Error de inicio de sesión</string>
+    <string name="retro_ach_sign_in">Iniciar sesión</string>
+    <string name="retro_ach_password_disclaimer">Tu contraseña solo se usa una vez para obtener un token de inicio de sesión, que se almacena de forma segura en el dispositivo.</string>
+    <string name="retro_ach_achievements_enabled">Logros activados</string>
+    <string name="retro_ach_hardcore_mode">Modo Hardcore (sin estados guardados)</string>
+    <string name="retro_ach_points">%1$d / %2$d puntos</string>
+    <string name="retro_ach_none_found">No se encontraron logros para este juego.</string>
+    <string name="retro_ach_sign_out">Cerrar sesión</string>
+    <string name="retro_che_brand">TRUCOS</string>
+    <string name="retro_che_name">Nombre</string>
+    <string name="retro_che_code">Código</string>
+    <string name="retro_che_cancel">Cancelar</string>
+    <string name="retro_che_save">Guardar</string>
+    <string name="retro_che_default_name">Truco %1$d</string>
+    <string name="retro_che_empty">Aún no hay trucos. Añade un código de truco para este juego.</string>
+    <string name="retro_che_add">Añadir truco</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Controlador de GPU</string>
+    <string name="retro_gpu_driver_system">Sistema (Predeterminado)</string>
+    <string name="retro_gpu_driver_hint">Instala los controladores Turnip en Ajustes \u2192 Controladores. Los mismos controladores funcionan para juegos de PC y de PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD de PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Unidad interna virtual para juegos basados en HDD como Final Fantasy XI. Reinicia el juego.</string>
+    <string name="retro_ps2_hdd_desc">Unidad interna virtual para juegos basados en HDD como Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Modo DNS configurado en Internal para que tus hosts de servidor personalizados surtan efecto.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">Núcleo de CPU</string>
+<string name="retro_co_dual_core">Doble núcleo</string>
+<string name="retro_co_internal_cheats">Trucos internos</string>
+<string name="retro_co_internal_resolution">Resolución interna</string>
+<string name="retro_co_renderer">Renderizador</string>
+<string name="retro_co_sensor_bar">Posición de la barra de sensores</string>
+<string name="retro_co_skip_gc_bios">Omitir intro de BIOS</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Abajo</string>
+<string name="retro_co_val_cached_interpreter">Intérprete en caché</string>
+<string name="retro_co_val_hardware">Hardware</string>
+<string name="retro_co_val_interpreter">Intérprete</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Ratón / Táctil</string>
+<string name="retro_co_val_right_stick_absolute">Stick derecho (absoluto)</string>
+<string name="retro_co_val_right_stick_relative">Stick derecho (relativo)</string>
+<string name="retro_co_val_software">Software</string>
+<string name="retro_co_val_stretch">Estirar</string>
+<string name="retro_co_val_top">Arriba</string>
+<string name="retro_co_vbi_skip">Omitir VBI (salto de fotogramas automático)</string>
+<string name="retro_co_widescreen">Panorámica</string>
+<string name="retro_co_wiimote_pointer">Puntero del Wiimote</string>
+<string name="retro_gs_cheats_apply_note">Los cambios se aplican la próxima vez que inicies este juego.</string>
+<string name="retro_gs_cheats_detect_hint">Inicia este juego una vez para que se pueda detectar el número de serie del disco; entonces aparecerán aquí los trucos y parches.</string>
+<string name="retro_gs_dnas_entry_desc">Omisión de autenticación DNAS: necesaria para el juego en línea</string>
+<string name="retro_gs_dnas_group">Aplicado automáticamente (en línea)</string>
+<string name="retro_gs_group_cheats">Trucos y parches</string>
+<string name="retro_gs_hdd_image_size">Tamaño: %1$s</string>
+<string name="retro_gs_hdd_import">Importar imagen de HDD</string>
+<string name="retro_gs_hdd_remove_short">Quitar</string>
+<string name="retro_gs_netplay_enable">Activar NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">Desactivado de forma predeterminada. Actívalo y luego elige Alojar o Unirse antes de iniciar.\nSe vuelve a desactivar cuando sales del juego.</string>
+<string name="retro_gs_netplay_host">Dirección del anfitrión</string>
+<string name="retro_gs_netplay_host_hint">IP o nombre de host</string>
+<string name="retro_gs_netplay_host_mode">Sesión de anfitrión</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Activado = esperar a un jugador. Desactivado = unirse a la dirección del anfitrión</string>
+<string name="retro_gs_netplay_not_ready">NetPlay usa puertos de multijugador local sobre TCP (jugador 1 anfitrión / jugador 2 cliente). El juego en línea de PS2 usa Ethernet DEV9 en su lugar.</string>
+<string name="retro_gs_netplay_port">Puerto</string>
+<string name="retro_lr_memory_card_slot">Tarjeta de memoria %1$d</string>
+<string name="retro_lr_screenshot">Captura de pantalla</string>
+<string name="retro_lr_use_cloud_save">Usar guardado en la nube</string>
+<string name="retro_netplay_conn_direct">LAN (IP directa)</string>
+<string name="retro_netplay_connecting">Conectando…</string>
+<string name="retro_netplay_connection">Conexión</string>
+<string name="retro_netplay_conn_traversal">En línea (código de anfitrión)</string>
+<string name="retro_netplay_dismiss">Descartar</string>
+<string name="retro_netplay_dolphin_help">El NetPlay de GameCube/Wii usa el propio motor de Dolphin. Anfitrión = Jugador 1, Unirse = Jugador 2. Elige Alojar o Unirse y un tipo de conexión antes de iniciar; ambos dispositivos arrancan el mismo juego juntos.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Comparte la IP de Wi‑Fi de tu dispositivo y este puerto con el Jugador 2. El juego se inicia automáticamente en cuanto se conecte.</string>
+<string name="retro_netplay_dolphin_host_online_hint">Se muestra un código de anfitrión cuando arranca el juego: compártelo con el Jugador 2. El juego se inicia automáticamente en cuanto se conecte.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Introduce la IP de Wi‑Fi y el puerto del anfitrión y luego inicia para conectar.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Introduce el código de anfitrión del Jugador 1 y luego inicia para conectar.</string>
+<string name="retro_netplay_enable_before_launch">Activa NetPlay en los ajustes del juego y elige Alojar o Unirse antes de iniciar</string>
+<string name="retro_netplay_find_rooms">Buscar salas en Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · cada pantalla es su propia consola portátil</string>
+<string name="retro_netplay_gba_not_ready">El multijugador de GBA usa gpSP + adaptador inalámbrico. Asegúrate de que libgpsp esté instalado.</string>
+<string name="retro_netplay_help">Multijugador de pantalla compartida por Wi‑Fi (como RetroArch).\nAnfitrión = Jugador 1, Unirse = Jugador 2. Ambos dispositivos muestran el mismo juego.</string>
+<string name="retro_netplay_help_game_link">Game Link por Wi‑Fi: cada dispositivo ejecuta su propio juego.\nGB/GBC: enlace serie de Gambatte (Pokémon Gen 1–2).\nGBA: adaptador inalámbrico de gpSP (combates de Pokémon FR/LG/Esmeralda).</string>
+<string name="retro_netplay_host_action">Alojar sala</string>
+<string name="retro_netplay_host_code">Código de anfitrión</string>
+<string name="retro_netplay_host_code_hint">Código de anfitrión de traversal del anfitrión</string>
+<string name="retro_netplay_hosting_room">Alojando sala</string>
+<string name="retro_netplay_host_mode_hint">Toca Alojar para abrir una sala para esta sesión de juego y luego inicia el juego. NetPlay se desactiva cuando sales.</string>
+<string name="retro_netplay_in_room">En la sala</string>
+<string name="retro_netplay_join_action">Unirse por IP</string>
+<string name="retro_netplay_joined">Unido</string>
+<string name="retro_netplay_join_room">Unirse</string>
+<string name="retro_netplay_launch_mode">Al iniciar</string>
+<string name="retro_netplay_leave">Salir</string>
+<string name="retro_netplay_menu_hint">Anfitrión = J1 · Unirse = J2 · el mismo juego en ambas pantallas</string>
+<string name="retro_netplay_mode_host">Alojar</string>
+<string name="retro_netplay_mode_join">Unirse</string>
+<string name="retro_netplay_mode_manual">Manual</string>
+<string name="retro_netplay_no_rooms">No se encontraron salas. Asegúrate de que el anfitrión esté en el mismo Wi‑Fi y alojando una sala.</string>
+<string name="retro_netplay_player_name">Nombre visible</string>
+<string name="retro_netplay_player_name_hint">Se muestra a los demás jugadores</string>
+<string name="retro_netplay_players_count">%1$d conectados</string>
+<string name="retro_netplay_prelaunch_hint">La sala está abierta solo para esta sesión. Inicia cuando estés listo. Al salir del juego se desactiva NetPlay.</string>
+<string name="retro_netplay_room_players">Jugadores</string>
+<string name="retro_netplay_scan_action">Buscar en Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Buscar de nuevo</string>
+<string name="retro_netplay_scan_hint">Busca salas abiertas en el mismo Wi‑Fi o únete por dirección IP.</string>
+<string name="retro_netplay_scanning">Buscando en Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Resultados de la búsqueda</string>
+<string name="retro_netplay_select_room_hint">Toca una sala para unirte ahora (no guarda la IP para el próximo inicio).</string>
+<string name="retro_netplay_stop_scan">Detener búsqueda</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s se ha conectado</string>
+<string name="retro_netplay_user_disconnected">%1$s se ha desconectado</string>
+<string name="retro_netplay_waiting_players">Esperando a los jugadores…</string>
+<string name="retro_ps2_coming_soon">La compatibilidad con PlayStation 2 llegará pronto</string>
+<string name="retro_ps2_show_l3r3">Mostrar botones L3 / R3</string>
+<string name="retro_ps2_show_l3r3_subtitle">Cuando está desactivado, toca dos veces un stick para pulsar L3 / R3</string>
+<string name="retro_ps2_turnip_flags">FLAGS DEL CONTROLADOR TURNIP</string>
+<string name="retro_ps2_turnip_flags_note">Se aplican solo cuando se selecciona un controlador de GPU personalizado arriba.</string>
+<string name="retro_rom_missing">Archivo del juego no encontrado</string>
+<string name="retro_scr_delete">Eliminar</string>
+<string name="retro_scr_import_from_file">Importar desde archivo…</string>
+<string name="retro_scr_loading">Cargando…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Cambiar de consola</string>
+    <string name="retro_gs_identify_as">Identificar como consola</string>
+    <string name="retro_gs_console_changed">Ahora identificado como %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Aplica un efecto ReShade (.fx) a los juegos DXVK/VKD3D (Vulkan) mediante la capa vkBasalt integrada. Coloca cada efecto en su propia carpeta en Android/data/&lt;package&gt;/files/ReShade/. El ajuste de parámetros en vivo y el interruptor en el juego llegarán con la actualización de la capa de recarga en caliente.</string>
+    <string name="reshade_catalog_title">Efectos ReShade</string>
+    <string name="reshade_catalog_search">Buscar efectos…</string>
+    <string name="reshade_catalog_installed">Instalados (%1$d)</string>
+    <string name="reshade_catalog_available">Disponibles (%1$d)</string>
+    <string name="reshade_catalog_downloading">Descargando</string>
+    <string name="reshade_catalog_installing">Instalando</string>
+    <string name="reshade_catalog_offline_cache">Sin conexión — mostrando una lista en caché. Conéctate para descargar nuevos efectos.</string>
+    <string name="reshade_catalog_offline_none">Sin conexión — mostrando solo los efectos instalados. Conéctate para explorar el catálogo.</string>
+    <string name="reshade_catalog_needs_connection">Conéctate a Internet para descargar efectos.</string>
+    <string name="reshade_catalog_download_failed">No se pudo descargar %1$s.</string>
+    <string name="reshade_catalog_empty_query">Ningún efecto coincide con \"%1$s\".</string>
+    <string name="reshade_catalog_empty">No hay efectos disponibles. Conéctate a Internet para explorar el catálogo.</string>
+    <string name="reshade_catalog_done">Listo</string>
+    <string name="reshade_catalog_delete_cd">Eliminar %1$s</string>
+    <string name="reshade_catalog_delete_title">¿Eliminar %1$s?</string>
+    <string name="reshade_catalog_delete_body">Esto elimina el efecto del almacenamiento y de cualquier conjunto que lo use. Puedes volver a descargarlo más tarde.</string>
+    <string name="reshade_catalog_delete_confirm">Eliminar</string>
+    <string name="reshade_catalog_delete_cancel">Cancelar</string>
+    <string name="reshade_catalog_delete_failed">No se pudo eliminar %1$s.</string>
+    <string name="reshade_params_title">PARÁMETROS DEL EFECTO</string>
+    <string name="reshade_params_reset">Restablecer</string>
+    <string name="reshade_loadout_empty">Aún no hay efectos. Añade uno o más efectos para crear un conjunto.</string>
+    <string name="reshade_loadout_add">Añadir efecto</string>
+    <string name="reshade_loadout_full">Conjunto lleno — quita un efecto para añadir otro.</string>
+    <string name="reshade_effect_active">activo</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pila</string>
+    <string name="reshade_mode_solo_hint">Un efecto activo a la vez (comparación A/B, cambia en directo durante el juego).</string>
+    <string name="reshade_mode_stack_hint">Superpón cualquier subconjunto de efectos, aplicados en orden.</string>
+    <string name="reshade_drawer_enable">Activar ReShade</string>
+    <string name="reshade_drawer_empty">No hay efectos ReShade en este conjunto. Añade efectos en los ajustes de este juego (o del contenedor) para cambiarlos y ajustarlos aquí.</string>
+    <string name="reshade_drawer_no_params">Este efecto no expone parámetros ajustables.</string>
+    <string name="cloud_saves_deleting">Eliminando partida guardada…</string>
+    <string name="cloud_saves_history_delete">Eliminar</string>
+    <string name="cloud_saves_history_delete_confirm_body">¿Eliminar permanentemente la partida guardada en la nube de %1$s? Esta acción no se puede deshacer.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Eliminar partida en la nube</string>
+    <string name="cloud_saves_history_delete_failed">No se pudo eliminar la partida en la nube</string>
+    <string name="cloud_saves_history_delete_success">Partida en la nube eliminada</string>
+    <string name="retro_bundle_required">Descarga primero los núcleos de consola — Ajustes › Retro</string>
+    <string name="retro_ps2_device_unsupported">Este dispositivo no puede ejecutar la emulación de PS2: necesita OpenGL ES 3.1 o posterior.</string>
+    <string name="retro_scr_consoles_check">Buscar actualizaciones</string>
+    <string name="retro_scr_consoles_checking">Buscando actualizaciones…</string>
+    <string name="retro_scr_consoles_download">Descargar núcleos de consola</string>
+    <string name="retro_scr_consoles_downloading">Descargando… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Núcleos de consola</string>
+    <string name="retro_scr_consoles_installed">Instalado — compilación %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Instalado — compilación %1$s (fallo al buscar actualizaciones)</string>
+    <string name="retro_scr_consoles_installing">Instalando…</string>
+    <string name="retro_scr_consoles_missing">No instalado: descárgalo para jugar a juegos retro</string>
+    <string name="retro_scr_consoles_state">Estado</string>
+    <string name="retro_scr_consoles_update">Actualizar núcleos de consola</string>
+    <string name="retro_scr_consoles_update_available">Actualización disponible — compilación %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Verificando la descarga…</string>
+    <string name="retro_scr_consoles_working">Procesando…</string>
+    <string name="retro_tab_system">Sistema</string>
 </resources>
+
diff --git a/app/src/main/res/values-fi/arrays.xml b/app/src/main/res/values-fi/arrays.xml
new file mode 100644
index 000000000..b6658448f
--- /dev/null
+++ b/app/src/main/res/values-fi/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Kuva</item>
+        <item>Alkuperäinen</item>
+        <item>Yhtenäinen väri</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-fi/plurals.xml b/app/src/main/res/values-fi/plurals.xml
new file mode 100644
index 000000000..e2ca60b7a
--- /dev/null
+++ b/app/src/main/res/values-fi/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP-resurssi</item>
+        <item quantity="other">%d ZIP-resurssia</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 000000000..0234bbdb9
--- /dev/null
+++ b/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Suorita</string>
+    <string name="common_ui_edit">Muokkaa</string>
+    <string name="common_ui_remove">Poista</string>
+    <string name="common_ui_add">Lisää</string>
+    <string name="common_ui_shortcuts">Pikakuvakkeet</string>
+    <string name="common_ui_containers">Säiliöt</string>
+    <string name="common_ui_input_controls">Syöttöohjaimet</string>
+    <string name="common_ui_no_items_to_display">Ei näytettäviä kohteita</string>
+    <string name="common_ui_select_icon">Valitse kuvake</string>
+    <string name="common_ui_revert_icon">Palauta kuvake</string>
+    <string name="common_ui_select_exe">Valitse EXE</string>
+    <string name="common_ui_select_folder">Valitse kansio</string>
+    <string name="common_ui_current_folder">Nykyinen kansio</string>
+    <string name="common_ui_enter_path">Anna polku</string>
+    <string name="common_ui_path_not_found">Polkua ei löytynyt</string>
+    <string name="common_ui_select_valid_exe_file">Valitse kelvollinen .exe-tiedosto</string>
+    <string name="common_ui_select_valid_icon_file">Valitse kelvollinen .ico- tai .png-tiedosto.</string>
+    <string name="common_ui_exit">Poistu</string>
+    <string name="common_ui_exit_app">Poistu sovelluksesta</string>
+    <string name="common_ui_profile">Profiili</string>
+    <string name="common_ui_name">Nimi</string>
+    <string name="common_ui_ok">OK</string>
+    <string name="common_ui_cancel">Peruuta</string>
+    <string name="common_ui_untitled">Nimetön</string>
+    <string name="common_ui_disabled">Poistettu käytöstä</string>
+    <string name="common_ui_container">Säiliö</string>
+    <string name="common_ui_value">Arvo</string>
+    <string name="common_ui_none">Ei mitään</string>
+    <string name="common_ui_custom_text">Mukautettu teksti</string>
+    <string name="common_ui_icon">Kuvake</string>
+    <string name="common_ui_duplicate">Monista</string>
+    <string name="common_ui_credits_and_third_party_apps">Tekijät ja kolmannen osapuolen sovellukset</string>
+    <string name="common_ui_loading">Ladataan</string>
+    <string name="common_ui_exporting">Viedään</string>
+    <string name="common_ui_enable">Ota käyttöön</string>
+    <string name="common_ui_disable">Poista käytöstä</string>
+    <string name="common_ui_force">Pakota</string>
+    <string name="common_ui_version">Versio</string>
+    <string name="common_ui_advanced">Lisäasetukset</string>
+    <string name="common_ui_graphics">Grafiikka</string>
+    <string name="common_ui_system">Järjestelmä</string>
+    <string name="common_ui_width">Leveys</string>
+    <string name="common_ui_height">Korkeus</string>
+    <string name="common_ui_open_file">Avaa tiedosto</string>
+    <string name="common_ui_download_file">Lataa tiedosto</string>
+    <string name="common_ui_downloading_file">Ladataan tiedostoa</string>
+    <string name="common_ui_browse">Selaa</string>
+    <string name="common_ui_options">Valinnat</string>
+    <string name="common_ui_export">Vie</string>
+    <string name="common_ui_new_file">Uusi tiedosto</string>
+    <string name="common_ui_description">Kuvaus</string>
+    <string name="common_ui_continue">Jatka</string>
+    <string name="common_ui_warning">Varoitus</string>
+    <string name="common_ui_copy">kopio</string>
+    <string name="common_ui_reset">Nollaa</string>
+    <string name="common_ui_close">Sulje</string>
+    <string name="common_ui_confirm">Vahvista</string>
+    <string name="common_ui_unnamed">Nimetön</string>
+    <string name="common_ui_download">Lataa</string>
+    <string name="common_ui_uninstall">Poista asennus</string>
+    <string name="common_ui_other">Muu</string>
+    <string name="common_ui_status">Tila</string>
+    <string name="common_ui_size">Koko</string>
+    <string name="common_ui_release_date">Julkaisupäivä</string>
+    <string name="common_ui_installed">Asennettu</string>
+    <string name="common_ui_available">Saatavilla</string>
+    <string name="common_ui_settings">Asetukset</string>
+    <string name="common_ui_enable_all">Ota kaikki käyttöön</string>
+    <string name="common_ui_disable_all">Poista kaikki käytöstä</string>
+    <string name="common_ui_select_all">Valitse kaikki</string>
+    <string name="common_ui_deselect_all">Poista kaikki valinnat</string>
+    <string name="common_ui_on">Päällä</string>
+    <string name="common_ui_off">Pois</string>
+    <string name="common_ui_already_set">Jo asetettu</string>
+    <string name="common_ui_shortcut">Pikakuvake</string>
+    <string name="common_ui_custom">Mukautettu</string>
+    <string name="common_ui_about">Tietoja</string>
+    <string name="common_ui_back">Takaisin</string>
+    <string name="common_ui_apply">Käytä</string>
+    <string name="common_ui_save">Tallenna</string>
+    <string name="common_ui_clone">Kloonaa</string>
+    <string name="common_ui_properties">Ominaisuudet</string>
+    <string name="common_ui_store">Kauppa</string>
+    <string name="common_ui_library">Kirjasto</string>
+    <string name="common_ui_downloads">Lataukset</string>
+    <string name="common_ui_import">Tuo</string>
+    <string name="common_ui_sync">Synkronoi</string>
+    <string name="common_ui_sign_in">Kirjaudu sisään</string>
+    <string name="common_ui_submit">Lähetä</string>
+    <string name="common_ui_coming_soon">Tulossa pian</string>
+    <string name="common_ui_signed_in">Kirjautunut sisään</string>
+    <string name="common_ui_required">Pakollinen</string>
+    <string name="common_ui_optional">Valinnainen</string>
+    <string name="common_ui_notifications">Ilmoitukset</string>
+    <string name="common_ui_mode">Tila</string>
+    <string name="common_ui_experimental">(Kokeellinen)</string>
+    <string name="common_ui_current_version_label">Nykyinen versio:</string>
+    <string name="common_ui_cannot_write_folder">Valittuun kansioon ei voi kirjoittaa</string>
+    <string name="common_ui_failed_create_directory">Oletushakemiston luonti epäonnistui</string>
+    <string name="common_ui_device_not_supported">Valitettavasti laitettasi ei ehkä tueta</string>
+    <string name="common_ui_please_wait">Odota\u2026</string>
+    <string name="common_ui_done">Valmis</string>
+    <string name="common_ui_open">Avaa</string>
+    <string name="common_ui_connected">Yhdistetty</string>
+    <string name="common_ui_install">Asenna</string>
+    <string name="common_ui_application">Sovellus</string>
+    <string name="common_ui_check">Tarkista</string>
+    <string name="store_game_check_for_update">Tarkista päivitykset</string>
+    <string name="store_game_checking_for_update">Tarkistetaan</string>
+    <string name="store_game_download_update">Lataa päivitys</string>
+    <string name="store_game_no_update_available">Ei päivityksiä saatavilla</string>
+    <string name="store_game_update_available">Päivitys saatavilla</string>
+    <string name="store_game_update_check_failed">Päivitysten tarkistus epäonnistui</string>
+    <string name="store_game_update">Päivitä</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Tarkista tiedostot</string>
+    <string name="store_game_verify_started">Tarkistetaan %1$s — katso Lataukset-välilehteä</string>
+    <string name="store_game_steam_options">Steam-asetukset</string>
+    <string name="store_game_verify_complete">Tiedostojen tarkistus valmis</string>
+    <string name="store_game_verify_failed_notice">Tiedostojen tarkistus epäonnistui</string>
+    <string name="store_game_progress_background_hint">Voit sulkea tämän — toiminto jatkuu. Katso Lataukset-välilehteä milloin tahansa.</string>
+    <string name="store_game_checking_updates">Tarkistetaan päivityksiä</string>
+    <string name="store_game_no_updates_notice">Ei päivityksiä saatavilla</string>
+    <string name="store_game_update_complete">Päivitys valmis</string>
+    <string name="store_game_update_failed_notice">Päivitys epäonnistui</string>
+    <string name="store_game_update_check_failed_notice">Päivitysten tarkistus epäonnistui</string>
+    <string name="store_game_download_already_active">Tätä peliä ladataan jo. Peruuta nykyinen lataus ennen DLC:n lisäämistä.</string>
+    <string name="common_ui_select">Valitse</string>
+    <string name="common_ui_storage_roots">Tallennussijainnit</string>
+    <string name="common_ui_browse_local_folders_directly">Selaa paikallisia kansioita suoraan</string>
+    <string name="common_ui_no_folders_available_here">Täällä ei ole kansioita saatavilla</string>
+    <string name="common_ui_grant_all_files_access_browse">Myönnä kaikkien tiedostojen käyttöoikeus selataksesi kansioita suoraan.</string>
+    <string name="common_ui_not_configured">Ei määritetty</string>
+    <string name="common_ui_reinstall">Asenna uudelleen</string>
+    <string name="common_ui_exit_app_confirm">Poistutaanko WinNativesta?</string>
+    <string name="common_ui_elements_count">%1$d elementtiä</string>
+    <string name="common_ui_disabled_placeholder">-- Poistettu käytöstä --</string>
+    <string name="common_ui_enabled">Käytössä</string>
+    <string name="common_ui_unknown_error">Tuntematon virhe</string>
+    <string name="common_ui_auto_detected">Tunnistettu automaattisesti</string>
+    <string name="common_ui_change">Vaihda</string>
+    <string name="common_ui_proceed">Jatka</string>
+    <string name="common_ui_sign_out">Kirjaudu ulos</string>
+    <string name="common_ui_name_cannot_be_empty">Nimi ei voi olla tyhjä</string>
+    <string name="common_ui_error_with_message">Virhe: %1$s</string>
+    <string name="common_ui_64_bit">64-BITTINEN</string>
+    <string name="common_ui_32_bit">32-BITTINEN</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BITTINEN &amp; 32-BITTINEN</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d kansio</item>
+        <item quantity="other">%d kansiota</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d tiedosto</item>
+        <item quantity="other">%d tiedostoa</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Hae kuvitus</string>
+    <string name="library_games_scraping_artwork">Haetaan</string>
+    <string name="library_games_shortcut_created">Pikakuvake luotu</string>
+    <string name="library_games_failed_to_create_shortcut">Pikakuvakkeen luonti epäonnistui: %s</string>
+    <string name="library_games_install_path">Asennuspolku</string>
+    <string name="library_games_not_enough_space">Tarvitaan %1$s lisää tilaa</string>
+    <string name="library_games_download_slash_install">Lataa / Asenna</string>
+    <string name="library_games_save_management">TALLENNUSTEN HALLINTA</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Saatavilla: %3$s</string>
+    <string name="library_games_last_played">Viimeksi pelattu</string>
+    <string name="library_games_playtime">Peliaika</string>
+    <string name="library_games_plays">Pelikerrat</string>
+    <string name="library_games_dlcs">DLC:t</string>
+    <string name="library_games_uninstall_game">POISTA PELIN ASENNUS</string>
+    <string name="library_games_remove_game">POISTA PELI</string>
+    <string name="library_games_uninstall_confirm">Poistetaanko pelin %1$s asennus ja sen asennettu pelikansio pysyvästi?</string>
+    <string name="library_games_remove_confirm">Poistetaanko %1$s kirjastostasi? Levyllä olevat pelitiedostot säilyvät koskemattomina.</string>
+    <string name="library_games_game_uninstalled">Pelin %1$s asennus poistettu.</string>
+    <string name="library_games_game_removed">%1$s poistettu.</string>
+    <string name="library_games_failed_to_uninstall">Asennuksen poisto epäonnistui.</string>
+    <string name="library_games_failed_to_uninstall_reason">Asennuksen poisto epäonnistui: %1$s</string>
+    <string name="library_games_loading">Ladataan kirjastoa\u2026</string>
+    <string name="library_games_no_games_installed">Ei asennettuja pelejä. Lisää pelejä Kauppa-välilehden tai +-painikkeen avulla.</string>
+    <string name="library_games_times_played_label">Pelikertojen määrä: </string>
+    <string name="library_games_playtime_label">Peliaika: </string>
+    <string name="library_games_no_games_hub">Ei asennettuja pelejä\nAvaa Winlator-taustajärjestelmä napsauttamalla</string>
+    <string name="library_games_installed_badge">ASENNETTU</string>
+    <string name="library_games_unknown_game">Tuntematon peli</string>
+    <string name="library_games_layouts_header">KIRJASTON ASETTELUT</string>
+    <string name="library_games_layout_carousel">Karuselli</string>
+    <string name="library_games_layout_list">Luettelo</string>
+    <string name="library_games_view_options_header">NÄKYMÄASETUKSET</string>
+    <string name="library_games_immersive_mode">Immersiivinen tila</string>
+    <string name="library_games_immersive_mode_description">Käytä valitun pelin kuvitusta taustana</string>
+    <string name="library_games_immersive_blur">Sumenna tausta</string>
+    <string name="library_games_immersive_blur_description">Lisää sumennustehoste immersiiviseen taustaan</string>
+    <string name="library_games_custom_game">Mukautettu peli</string>
+    <string name="library_games_play">Pelaa</string>
+    <string name="hero_boot_to_desktop_title">Käynnistä työpöydälle</string>
+    <string name="hero_graphics_tests_title">Grafiikkatestit</string>
+    <string name="hero_graphics_test_32">32-bittinen</string>
+    <string name="hero_graphics_test_64">64-bittinen</string>
+    <string name="hero_input_tests_title">Syötetestit</string>
+    <string name="library_games_add_custom_game">Lisää mukautettu peli</string>
+    <string name="library_games_game_name">Pelin nimi</string>
+    <string name="library_games_game_folder_mapped_drive">Pelikansio (yhdistetty peliasema)</string>
+    <string name="library_games_select_exe_provide_name">Valitse exe ja anna nimi</string>
+    <string name="library_games_sign_in_prompt">Kirjaudu kauppaan tai lisää mukautettu peli rakentaaksesi kirjastosi.</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Kaupat</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Jaettu latauskansio</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Käytä yhtä kansiota kaikissa kaupoissa</string>
+    <string name="stores_accounts_default_downloads_folder">Oletuslatauskansio</string>
+    <string name="stores_accounts_steam_downloads">Steam-lataukset</string>
+    <string name="stores_accounts_epic_downloads">Epic-lataukset</string>
+    <string name="stores_accounts_gog_downloads">GOG-lataukset</string>
+    <string name="stores_accounts_download_speed">Latausnopeus</string>
+    <string name="stores_accounts_download_speed_subtitle">Ohjaa Steam-latausten säikeiden rinnakkaisuutta</string>
+    <string name="stores_accounts_download_server">Latauspalvelin</string>
+    <string name="stores_accounts_connected_stores">Yhdistetyt kaupat</string>
+    <string name="stores_accounts_download_settings">Latausasetukset</string>
+    <string name="stores_accounts_download_speed_conservative">Varovainen</string>
+    <string name="stores_accounts_download_speed_balanced">Tasapainoinen</string>
+    <string name="stores_accounts_download_speed_standard">Vakio</string>
+    <string name="stores_accounts_download_speed_performance">Suorituskyky</string>
+    <string name="stores_accounts_download_server_auto_detected">Tunnistettu automaattisesti: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Steam CDN -alue pelilatauksia varten</string>
+    <string name="stores_accounts_sign_out_confirm">Kirjaudutaanko ulos palvelusta %1$s?</string>
+    <string name="stores_accounts_sign_out_message">Sinun on kirjauduttava uudelleen sisään päästäksesi kirjastoosi.</string>
+    <string name="stores_accounts_logged_in_epic">Kirjauduttu Epic Gamesiin!</string>
+    <string name="stores_accounts_epic_login_failed">Epic-kirjautuminen epäonnistui: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">Kirjauduttu GOGiin!</string>
+    <string name="stores_accounts_gog_login_failed">GOG-kirjautuminen epäonnistui: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Mukautettu latauspolku</string>
+    <string name="stores_accounts_custom_download_path_description">Oletuslatauspolku on jo määritetty kohdassa Asetukset &gt; Kaupat. Jos haluat asettaa yksilöllisen mukautetun polun tälle asennukselle, napsauta Jatka.</string>
+    <string name="stores_accounts_not_signed_in">Ei kirjautunut</string>
+    <string name="stores_accounts_status_online">Paikalla</string>
+    <string name="stores_accounts_status_away">Poissa</string>
+    <string name="stores_accounts_status_offline">Poissa linjoilta</string>
+    <string name="stores_accounts_status_invisible">Näkymätön</string>
+    <string name="stores_accounts_status_header">TILA</string>
+    <string name="stores_accounts_stores_header">KAUPAT</string>
+    <string name="stores_accounts_sign_in_store_prompt">Kirjaudu sisään käyttääksesi %1$s-kauppaa.</string>
+    <string name="stores_accounts_manage">Hallitse kauppatilejä</string>
+    <string name="stores_accounts_sign_into_store">Kirjaudu palveluun %1$s</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Peruuta kaikki</string>
+    <string name="downloads_queue_preparing_download">Valmistellaan latausta</string>
+    <string name="downloads_queue_installing_package">Asennetaan pakettia</string>
+    <string name="downloads_queue_resume_all">Jatka kaikkia</string>
+    <string name="downloads_queue_pause_all">Keskeytä kaikki</string>
+    <string name="downloads_queue_clear">Tyhjennä</string>
+    <string name="downloads_queue_status_label">Tila:</string>
+    <string name="downloads_queue_phase_downloading">Ladataan</string>
+    <string name="downloads_queue_phase_downloading_file">Ladataan [%1$s]</string>
+    <string name="downloads_queue_phase_queued">Jonossa</string>
+    <string name="downloads_queue_phase_paused">Keskeytetty</string>
+    <string name="downloads_queue_phase_preparing">Valmistellaan</string>
+    <string name="downloads_queue_phase_verifying">Tarkistetaan</string>
+    <string name="downloads_queue_phase_verifying_file">Tarkistetaan [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Korjataan</string>
+    <string name="downloads_queue_phase_applying_data">Otetaan tiedot käyttöön</string>
+    <string name="downloads_queue_phase_finalizing">Viimeistellään</string>
+    <string name="downloads_queue_phase_unpacking">Puretaan</string>
+    <string name="downloads_queue_phase_updating">Päivitetään</string>
+    <string name="downloads_queue_phase_complete">Valmis</string>
+    <string name="downloads_queue_phase_cancelled">Peruutettu</string>
+    <string name="downloads_queue_phase_failed">Epäonnistui: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Tuntematon</string>
+    <string name="downloads_queue_paused_resume_hint">Keskeytetty – jatka napauttamalla Jatka</string>
+    <string name="downloads_queue_cancel_download">Peruuta lataus</string>
+    <string name="downloads_queue_cancel_download_title">Peruutetaanko lataus?</string>
+    <string name="downloads_queue_cancel_download_confirm">Peruutetaanko kohteen %1$s lataus ja poistetaanko kaikki ladatut tiedostot?</string>
+    <string name="downloads_queue_cancel_download_warning">DLC:n, pelin tai päivityksen latauksen peruuttaminen voi vahingoittaa pelin asennusta.\n\nHaluatko varmasti peruuttaa tämän latauksen ja poistaa tähän mennessä ladatut tiedostot?</string>
+    <string name="downloads_queue_cancel_all_title">Peruutetaanko kaikki lataukset?</string>
+    <string name="downloads_queue_cancel_all_warning">DLC-, peli- tai päivityslatausten peruuttaminen voi vahingoittaa pelien asennuksia.\n\nHaluatko varmasti peruuttaa kaikki lataukset ja poistaa tähän mennessä ladatut tiedostot?</string>
+    <string name="downloads_queue_this_game">tämä peli</string>
+    <string name="downloads_queue_empty">Ei aktiivisia latauksia.</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">Uusi säiliö</string>
+    <string name="containers_list_edit">Muokkaa säiliötä</string>
+    <string name="containers_list_creating">Luodaan säiliötä</string>
+    <string name="containers_list_removing">Poistetaan säiliötä</string>
+    <string name="containers_list_duplicating">Kopioidaan säiliötä</string>
+    <string name="containers_list_remove_title">Poista säiliö</string>
+    <string name="containers_list_duplicate_title">Kopioi säiliö</string>
+    <string name="containers_list_confirm_remove">Poistetaanko tämä säiliö? Kaikki sen sisältämät pelitallennukset poistetaan pysyvästi. Pilveen synkronoidut tallennukset säilyvät pilvessä, mutta paikalliset muutokset, joita ei ole vielä synkronoitu, menetetään – synkronoi tämän pelin pilvitallennukset ensin, jos haluat säilyttää ne.</string>
+    <string name="containers_list_confirm_duplicate">Haluatko kopioida tämän säiliön?</string>
+    <string name="containers_list_duplicate_failed">Säiliön kopiointi epäonnistui</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">Haluatko poistaa tämän pikakuvakkeen?</string>
+    <string name="shortcuts_list_add_to_home_screen">Lisää aloitusnäyttöön</string>
+    <string name="shortcuts_library_artwork_title">Kirjaston kuvitus</string>
+    <string name="shortcuts_library_artwork_icon_title">Kuvakegrafiikka</string>
+    <string name="shortcuts_library_artwork_hero_title">Tausta</string>
+    <string name="shortcuts_library_artwork_set">Aseta kuva</string>
+    <string name="shortcuts_library_artwork_failed">Valitun kuvan lataaminen epäonnistui.</string>
+    <string name="shortcuts_library_artwork_open_source">Avaa SteamGridDB</string>
+    <string name="shortcuts_list_not_available">Tämä pikakuvake ei ole enää käytettävissä. Poista tai luo se uudelleen.</string>
+    <string name="shortcuts_list_select_a_container">Valitse säiliö</string>
+    <string name="shortcuts_list_error_opening_settings">Virhe avattaessa pikakuvakkeen asetuksia</string>
+    <string name="shortcuts_list_removed">Pikakuvake poistettu onnistuneesti.</string>
+    <string name="shortcuts_list_remove_failed">Pikakuvakkeen poistaminen epäonnistui. Yritä uudelleen.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Poista pikakuvake\n%1$s</string>
+    <string name="shortcuts_list_cloned">Pikakuvake kloonattu onnistuneesti.</string>
+    <string name="shortcuts_list_clone_failed">Pikakuvakkeen kloonaaminen epäonnistui.</string>
+    <string name="shortcuts_list_exported_to">Pikakuvake viety kohteeseen %1$s</string>
+    <string name="shortcuts_list_failed_export">Pikakuvakkeen vieminen epäonnistui</string>
+    <string name="shortcuts_export_all">Vie kaikki</string>
+    <string name="shortcuts_export_to_frontend">Vie käyttöliittymään</string>
+    <string name="shortcuts_export_all_done">Viety %1$d peliä kohteeseen %2$s</string>
+    <string name="shortcuts_export_all_none">Ei vietäviä pelejä</string>
+    <string name="shortcuts_list_added">Pikakuvake lisätty onnistuneesti.</string>
+    <string name="shortcuts_list_readded_existing">Olemassa oleva pikakuvake lisätty uudelleen</string>
+    <string name="shortcuts_list_failed_add">Pikakuvakkeen lisääminen epäonnistui.</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Suoritusargumentit</string>
+    <string name="shortcuts_properties_target_path">Kohdepolku</string>
+    <string name="shortcuts_properties_disable_xinput">Poista Xinput käytöstä (yksinomaiseen hiiri/näppäimistö-ohjaukseen)</string>
+    <string name="num_controllers">Ohjainten määrä</string>
+    <string name="shortcuts_properties_exclusive_input">Yksinomainen syöte</string>
+    <string name="shortcuts_properties_custom_game_settings">Mukautetut peliasetukset</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Käytä vanhaa käynnistintä</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Vanha Steam-emulointi: suorittaa pelin ColdClient-käynnistimen kautta ja poistaa SteamStub-DRM-suojauksen exe-tiedostosta. Käytä vain vanhoihin peleihin, jotka eivät toimi Steam-käynnistimen kanssa.</string>
+    <string name="shortcuts_properties_runtime_patcher">DRM-suorituksenaikainen korjain</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Lisää DRM-korjaimen DLL:n käynnistyksen yhteydessä. Laskee FPS:ää – käytä vain, jos pelkkä vanha käynnistin epäonnistuu.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">WinNative-oikea Steam-asiakas</string>
+    <string name="steam_section_emulator">Vanha Steam-emulaattori</string>
+    <string name="shortcuts_properties_use_steam_input">Käytä Steam-syötettä</string>
+    <string name="shortcuts_properties_steam_offline_mode">Steamin offline-tila</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Saa emuloidun Steam-asiakkaan ilmoittautumaan offline-tilaan, jotta peli ei yritä muodostaa verkkoyhteyksiä. Käytä peleihin, jotka jumittuvat Steamin verkkotarkistuksessa.</string>
+    <string name="shortcuts_properties_reset">Palauta ominaisuudet</string>
+    <string name="shortcuts_properties_updated_at">Pikakuvake päivitetty %1$s</string>
+    <string name="shortcuts_properties_properties_reset">Ominaisuudet palautettu onnistuneesti.</string>
+    <string name="shortcuts_properties_reset_per_game">Palauta pelikohtaiset asetukset</string>
+    <string name="shortcuts_properties_reset_per_game_message">Palautetaanko tämä peli käyttämään valitun säiliön oletusasetuksia?</string>
+    <string name="shortcuts_properties_per_game_reset">Pelikohtaiset asetukset palautettu valitun säiliön oletusasetuksiin</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">Ei valittua ohjauselementtiä</string>
+    <string name="input_controls_editor_scale">Skaala</string>
+    <string name="input_controls_editor_shape">Muoto</string>
+    <string name="input_controls_editor_type">Tyyppi</string>
+    <string name="input_controls_editor_binding">Sidonta</string>
+    <string name="binding_primary">Ensisijainen sidonta</string>
+    <string name="binding_secondary">Toissijainen sidonta</string>
+    <string name="binding_third">Kolmas sidonta</string>
+    <string name="binding_fourth">Neljäs sidonta</string>
+    <string name="input_controls_editor_binding_up">Sidonta ylös</string>
+    <string name="input_controls_editor_binding_right">Sidonta oikealle</string>
+    <string name="input_controls_editor_binding_down">Sidonta alas</string>
+    <string name="input_controls_editor_binding_left">Sidonta vasemmalle</string>
+    <string name="input_controls_editor_overlay_opacity">Peittokuvan peittävyys</string>
+    <string name="input_controls_editor_opacity">Peittävyys</string>
+    <string name="input_controls_editor_radial_menu">Säteittäinen valikko</string>
+    <string name="input_controls_editor_radial_menu_options">Säteittäisen valikon asetukset</string>
+    <string name="input_controls_editor_number_of_bindings">Sidontojen määrä</string>
+    <string name="input_controls_editor_select_profile">Valitse profiili</string>
+    <string name="input_controls_select_style">Valitse tyyli</string>
+    <string name="input_controls_style_original">Alkuperäinen</string>
+    <string name="input_controls_style_gamehub">Lasi</string>
+    <string name="input_controls_style_slate">Liuske</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Kimallus</string>
+    <string name="input_controls_style_shadow">Varjo</string>
+    <string name="input_controls_style_reticle">Ristikko</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Väriteema</string>
+    <string name="input_controls_edit_duplicating_builtin">Sisäänrakennettu profiili – luotiin kopio, jota voit muokata.</string>
+    <string name="input_controls_editor_profile_name">Profiilin nimi</string>
+    <string name="input_controls_editor_no_profile_selected">Ei valittua profiilia</string>
+    <string name="input_controls_editor_no_profile_found">Profiilia ei löytynyt</string>
+    <string name="input_controls_editor_tap_to_switch">Vaihda napauttamalla</string>
+    <string name="input_controls_editor_confirm_remove_profile">Haluatko poistaa tämän profiilin?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">Haluatko kopioida tämän profiilin?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Palautetaanko tämä profiili alkuperäiseen asetteluunsa? Kaikki tekemäsi muutokset menetetään.</string>
+    <string name="input_controls_editor_profile_reset">Profiili palautettu alkuperäiseen asetteluunsa.</string>
+    <string name="input_controls_editor_reset_unavailable">Tälle profiilille ei ole saatavilla alkuperäistä tilannevedosta.</string>
+    <string name="input_controls_editor_title">Ohjausten muokkain</string>
+    <string name="input_controls_editor_toggle_switch">Vaihtokytkin</string>
+    <string name="input_controls_editor_swipeable">Pyyhkäisyaktivointi</string>
+    <string name="input_controls_editor_profile_exported_to">Profiili viety kohteeseen</string>
+    <string name="input_controls_editor_unable_to_import">Profiilia ei voitu tuoda</string>
+    <string name="input_controls_editor_import_profile">Tuo profiili</string>
+    <string name="input_controls_editor_download_profile">Lataa profiili</string>
+    <string name="input_controls_editor_export_profile">Vie profiili</string>
+    <string name="input_controls_editor_range">Alue</string>
+    <string name="input_controls_editor_confirm_download_profiles">Haluatko ladata valitut profiilit?</string>
+    <string name="input_controls_editor_unable_to_load_list">Profiililuetteloa ei voitu ladata</string>
+    <string name="input_controls_editor_osc_transparency">Näyttöohjainten läpinäkyvyys</string>
+    <string name="input_controls_editor_osc_transparency_description">Säädä näyttöohjainten läpinäkyvyyttä.</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Näytön koko</string>
+    <string name="container_config_new_env_var">Uusi ympäristömuuttuja</string>
+    <string name="container_config_env_vars">Ympäristömuuttujat</string>
+    <string name="container_config_processor_affinity">Suorittimen affiniteetti</string>
+    <string name="container_config_processor_affinity_32bit">Suorittimen affiniteetti (32-bittiset sovellukset)</string>
+    <string name="container_config_audio_driver">Ääniohjain</string>
+    <string name="container_config_win_components">Win-komponentit</string>
+    <string name="container_config_drives">Asemat</string>
+    <string name="container_config_arch">Arkkitehtuuri</string>
+    <string name="container_config_storage_info">Tallennustilan tiedot</string>
+    <string name="container_config_drive_c">C:-asema</string>
+    <string name="container_config_cache">Välimuisti</string>
+    <string name="container_config_total">Yhteensä</string>
+    <string name="container_config_clear_cache">Tyhjennä välimuisti</string>
+    <string name="container_config_estimated_used_space">Arvioitu käytetty tila</string>
+    <string name="settings_containers_error_saving_wallpaper">Virhe taustakuvaa tallennettaessa</string>
+    <string name="container_config_directinput_mapper_type">DirectInput-määritystyyppi</string>
+    <string name="container_config_title">Määritykset</string>
+    <string name="container_config_startup_selection">Käynnistysvalinta</string>
+    <string name="container_config_glibc_exp_edition">Perustuu</string>
+    <string name="container_config_refresh_rate_default_global">Oletus (yleinen)</string>
+    <string name="container_config_enable_dinput">Ota DInput käyttöön Wine-peleissä</string>
+    <string name="container_config_enable_xinput">Ota XInput käyttöön Wine-peleissä</string>
+    <string name="container_config_dinput_legacy">Vanha (vanhat ohjaimet)</string>
+    <string name="container_config_dinput_modern">Moderni (Xinput-tyyppinen)</string>
+    <string name="container_config_help_xinput">
+        Jos pelisi käyttää &lt;i&gt;&lt;b&gt;XInput API&lt;/b&gt;&lt;/i&gt; -rajapintaa peliohjaimen tukeen, ota tämä asetus käyttöön.&lt;br/&gt;&lt;br/&gt;
+        Tämä asetus vaikuttaa sekä &lt;i&gt;&lt;b&gt;virtuaalisiin&lt;/b&gt;&lt;/i&gt; (Input Controls -toiminnon tarjoamiin) että &lt;i&gt;&lt;b&gt;fyysisiin&lt;/b&gt;&lt;/i&gt; peliohjaimiin.
+    </string>
+    <string name="container_config_help_dinput">
+        Jos pelisi käyttää &lt;i&gt;&lt;b&gt;DInput API&lt;/b&gt;&lt;/i&gt; -rajapintaa peliohjaimen tukeen, ota tämä asetus käyttöön.&lt;br/&gt;&lt;br/&gt;
+        Tämä asetus vaikuttaa sekä &lt;i&gt;&lt;b&gt;virtuaalisiin&lt;/b&gt;&lt;/i&gt; (Input Controls -toiminnon tarjoamiin) että &lt;i&gt;&lt;b&gt;fyysisiin&lt;/b&gt;&lt;/i&gt; peliohjaimiin.
+    </string>
+    <string name="container_config_xinput_dinput_warning">Jotkin pelit voivat tukea molempia rajapintoja. XInputin ja DInputin ottaminen käyttöön samanaikaisesti tällaisissa peleissä voi aiheuttaa ohjausongelmia, kuten peleissä The Binding of Isaac ja Resident Evil -sarja.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32-bittinen emulaattori</string>
+    <string name="container_config_emulator_wine_hint">Emulaattori määräytyy wine-version mukaan. ARM64EC käyttää FEXCorea, x86_64 käyttää Box64:ää.</string>
+    <string name="container_config_label">Määritykset</string>
+    <string name="container_config_restart_required">Käynnistä säiliö uudelleen, jotta muutokset tulevat voimaan</string>
+    <string name="container_config_renderer">Renderöijä</string>
+    <string name="container_config_variables">Muuttujat</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">Syötteet</string>
+    <string name="container_config_tab">Määritys</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">64-bittinen emulaattori</string>
+    <string name="container_config_emulator_section">Emulaattori</string>
+    <string name="container_config_sdl2_compatibility">Ota SDL2-yhteensopivuus käyttöön</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Wine-määritykset</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">GPU:n nimi</string>
+    <string name="container_wine_offscreen_rendering_mode">Näytön ulkopuolinen renderöintitila</string>
+    <string name="container_wine_strict_shader_math">Tiukka varjostinmatematiikka</string>
+    <string name="container_wine_video_memory_size">Näyttömuistin koko</string>
+    <string name="container_wine_dxwrapper">DX-käärin</string>
+    <string name="container_wine_mouse_warp_override">Hiiren siirron ohitus</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">DXVK-versio</string>
+    <string name="container_wine_dxvk_config_title">DXVK-määritykset</string>
+    <string name="container_wine_wined3d_config_title">WineD3D-määritykset</string>
+    <string name="container_wine_vkd3d_version">VKD3D-versio</string>
+    <string name="container_wine_version">Wine-versio</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; on käännöskerros DirectX 1–11:stä OpenGL:ään.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; on käännöskerros Direct3D 9–11:stä Vulkaniin.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; on käännöskerros Direct3D 12 -rajapinnasta Vulkaniin.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; on DirectDraw-toteutus, joka parantaa yhteensopivuutta klassisten pelien kanssa.
+    </string>
+    <string name="container_wine_enabled_async">Ota Async käyttöön</string>
+    <string name="container_wine_enabled_async_cache">Ota Async-välimuisti käyttöön</string>
+    <string name="container_wine_vkd3d_feature_level">VKD3D-ominaisuustaso</string>
+    <string name="container_wine_ddraw_wrapper">DDraw-käärin</string>
+    <string name="container_wine_error_not_installed">Wine/Proton-pakettia \'%1$s\' ei ole asennettu, eikä sitä voitu ladata.</string>
+    <string name="container_no_wine_installed">Wineä tai Protonia ei ole asennettu. Asenna ensin toinen niistä.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Pintaefekti</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Box64-esiasetus</string>
+    <string name="container_box64_version">Box64-versio</string>
+    <string name="container_box64_stability">Vakaus</string>
+    <string name="container_box64_compatibility">Yhteensopivuus</string>
+    <string name="container_box64_intermediate">Keskitaso</string>
+    <string name="container_box64_performance">Suorituskyky</string>
+    <string name="container_fexcore_performance_tso">Suorituskyky TSO</string>
+    <string name="container_fexcore_extreme">Äärimmäinen</string>
+    <string name="container_fexcore_extreme_tso">Äärimmäinen TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Ottaa käyttöön tai poistaa käytöstä Box64:n dynaamisen uudelleenkääntäjän.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        Lippujen käsittely CALL/RET-opkoodeissa&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Käsittelee CALL/RET:n kuin se ei koskaan tarvitsisi lippuja (nopeampi, epävakaa)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Useimmat RET tarvitsevat lippuja, useimmat CALL:t eivät&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Kaikki CALL/RET tarvitsevat lippuja (hitaampi)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">-NAN:n generointi kuten x86:ssa</string>
+    <string name="box64_env_var_help__dynarec_fastround">Tarkan x86-pyöristyksen generointi</string>
+    <string name="box64_env_var_help__dynarec_x87double">Float/Double-arvojen käyttö x87-emulointiin</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec rakentaa BigBlock-lohkon&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Älä yritä rakentaa lohkosta mahdollisimman suurta&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Rakenna Dynarec-lohkosta mahdollisimman suuri&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Rakenna Dynarec-lohkosta suurempi (jatka lohkojen limittyessä, mutta vain elf-muistissa oleville lohkoille)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Rakenna Dynarec-lohkosta suurempi (jatka lohkojen limittyessä, kaikentyyppiselle muistille)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Vahvan muistimallin simulointi&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Älä yritä mitään erityistä&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Ota käyttöön jokin muistieste muistiin kirjoitettaessa (joissakin MOV-opkoodeissa)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Kaikki 1 sekä muistieste jokaisella MOV:lla tehtävällä muistiin kirjoituksella&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Kaikki 2 sekä muistieste muistista luettaessa ja joissakin SSE/SSE2-opkoodeissa&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : Jäljittelee x86 TSO:ta samaan tapaan kuin QEMU.
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">Määrittää suurimman sallitun eteenpäinarvon lohkoa rakennettaessa</string>
+    <string name="box64_env_var_help__dynarec_callret">CALL/RET-opkoodien optimointi</string>
+    <string name="box64_env_var_help__dynarec_sep">Lisää toissijaisia sisääntulokohtia CALL/RET:n optimoimiseksi, kun CALLRET on käytössä.</string>
+    <string name="box64_env_var_help__dynarec_wait">Määrittää, odottaako Dynarec FillBlockin valmistumista vai ei</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Säädä muistiesteitä vahvan muistiemuloinnin suorituskykyvaikutuksen vähentämiseksi&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Käytä tavallisia turvallisia esteitä&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Käytä heikkoja esteitä lievän suorituskykyparannuksen saamiseksi&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Käytä heikkoja esteitä ja poista lisäksi viimeisen kirjoituksen esteet käytöstä</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        Generoi vain tasatut atomioperaatiot (tällä hetkellä saatavilla vain Arm64:llä).&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Generoi tasaamattomien atomioperaatioiden käsittelykoodi.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Generoi vain tasatut atomioperaatiot, mikä on nopeampaa ja pienemmän koodikoon, mutta aiheuttaa SIGBUS-virheen LOCK-etuliitteisille opkoodeille, jotka toimivat tasatuissa data-osoitteissa.</string>
+    <string name="box64_env_var_help__dynarec_df">
+        Ota lykättyjen lippujen käyttö käyttöön tai poista se käytöstä.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Poista lykättyjen lippujen käyttö käytöstä.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Ota lykättyjen lippujen käyttö käyttöön.</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        Salli sellaisen lohkon suorittamisen jatkaminen, joka on suojaamaton ja mahdollisesti likainen.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Älä salli sellaisen lohkon suorittamisen jatkamista, joka on suojaamaton ja mahdollisesti likainen.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Salli sellaisen dynablock-lohkon suorittamisen jatkaminen, joka kirjoittaa dataa samalle sivulle kuin koodi. Se voi nopeuttaa joidenkin pelien latausaikaa, mutta voi myös aiheuttaa odottamattomia kaatumisia.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Kun HotPage havaitaan, myös merkitsee kyseisen sivun NEVERCLEAN-tilaan, jolloin sitä ei suojata kirjoitukselta, mutta kyseiseltä sivulta rakennettu lohko testataan aina. Tämä voi olla nopeampaa (mutta joitakin SMC-tapauksia ei ehkä havaita).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        Ota natiivilippujen käyttö käyttöön tai poista se käytöstä.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Älä käytä natiivilippuja.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Käytä natiivilippuja, kun mahdollista.</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        Ota käyttöön x86 PAUSE -emulointi, joka voi parantaa spinlockien suorituskykyä.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ohita x86 PAUSE -käsky.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Käytä YIELD-käskyä x86 PAUSE -käskyn emulointiin.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Käytä WFI-käskyä x86 PAUSE -käskyn emulointiin.&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Käytä SEVL+WFE-käskyä x86 PAUSE -käskyn emulointiin.
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">Vähentää dynarec-lohkojen metatietoja muistin säästämiseksi yhteensopivuuden kustannuksella.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">Käyttää PE:n volatile-metatietoja ohjaamaan vahvaa muistiemulointia 64-bittisille Windows-peleille.</string>
+    <string name="box64_env_var_help__dynacache">Ohjaa luotujen dynarec-lohkojen välimuistiin tallennusta ajokertojen välillä käynnistyksen nopeuttamiseksi.</string>
+    <string name="box64_env_var_help__avx">
+        Tuo AVX-ominaisuudet vieraskäyttöjärjestelmän saataville.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Poista AVX-laajennus käytöstä&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ota käyttöön AVX-, BMI1-, F16C- ja VAES-laajennukset.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Kaikki tason 1 lisäksi ota käyttöön AVX2, BMI2, FMA, ADX, VPCLMULQDQ ja RDRAND.&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">Tuo AES-suorittimen ominaisuudet vieraskäyttöjärjestelmän saataville.</string>
+    <string name="box64_env_var_help__pclmulqdq">Tuo PCLMULQDQ-suorittimen ominaisuudet vieraskäyttöjärjestelmän saataville.</string>
+    <string name="box64_env_var_help__shaext">Tuo SHA-laajennuksen suoritinominaisuudet vieraskäyttöjärjestelmän saataville.</string>
+    <string name="box64_env_var_help__sse42">Tuo SSE4.2-suorittimen ominaisuudet vieraskäyttöjärjestelmän saataville.</string>
+    <string name="box64_env_var_help__sse_flushto0">Ohjaa SSE:n flush-to-zero-toimintaa ja poikkeuslippujen seurantaa.</string>
+    <string name="box64_env_var_help__x87_no80bits">Käyttää 64-bittistä double-tarkkuutta 80-bittisen long double -tarkkuuden sijaan x87:lle.</string>
+    <string name="box64_env_var_help__cputype">Valitsee vieraskäyttöjärjestelmälle näytettävän Intel- tai AMD-suoritinmallin.</string>
+    <string name="box64_env_var_help__maxcpu">Box64:n ohjelmille esittämä suorittimien enimmäismäärä</string>
+    <string name="box64_env_var_help__unityplayer">Tunnistaa UnityPlayerin ja merkitsee sovelluksen Unity-peliksi.</string>
+    <string name="box64_env_var_help__unity">Merkitsee sovelluksen Unity-peliksi ja ottaa käyttöön Unity-kohtaisen yhteensopivuuskäsittelyn.</string>
+    <string name="box64_env_var_help__mmap32">Pakota kaikki muistinvaraukset 32-bittisiin osoiteavaruuksiin</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">Ottaa käyttöön TSO IR -operaatiot (vaaditaan monisäikeisille sovelluksille).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">Tekee vektorien lataus-/tallennusoperaatioista atomisia, kun TSO on käytössä.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">Käyttää half-barrier-atomeja kohdistamattomiin lataus-/tallennusoperaatioihin TSO:n alaisuudessa.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">Tekee REP MOVS- / REP STOS -operaatioista atomisia TSO:n alaisuudessa.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Käyttää tiukkaa prosessinlaajuista lukkoa jaettuihin kohdistamattomiin atomisiin käyttöihin.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Korjaa jälkikäteen ytimen käsittelemät kohdistamattomat atomit ytimen kontekstinvaihtojen vähentämiseksi.</string>
+    <string name="fexcore_env_var_help__multiblock">Ottaa käyttöön monilohkoisen koodin kääntämisen. Voi aiheuttaa pidempää JIT-kääntämistä ja nykimistä.</string>
+    <string name="fexcore_env_var_help__maxinst">Käännettyyn lohkoon tallennettavien käskyjen enimmäismäärä.</string>
+    <string name="fexcore_env_var_help__hostfeatures">Ohjaa suoritinominaisuuksien pakottamista.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Skaalaa TSC:tä matalataajuisissa järjestelmissä.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Piilottaa hybridisuoritinytimien asettelun vieraskäyttöjärjestelmältä.</string>
+    <string name="fexcore_env_var_help__smc_checks">Tarkistaa koodin muutokset ennen suorittamista.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Käyttää PE-tiedostojen volatile-metatietoja TSO:lle, kun saatavilla.</string>
+    <string name="fexcore_env_var_help__monohacks">Erityiset SMC- + JIT-lohkovirittelyt Monon tunnistukseen.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">Piilottaa CPUID:n hypervisor-bitin (hyödyllinen sovelluksille, jotka kaatuvat sen kanssa).</string>
+    <string name="fexcore_env_var_help__disablel2cache">Poistaa käytöstä FEXCore JIT L2 -välimuistihaun, mikä säästää muistia mutta aiheuttaa nykimistä.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">Vaihtaa FEXCore JIT L1 -välimuistin dynaamisesti kokoutuvaksi, mikä säästää muistia mutta aiheuttaa nykimistä.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Hakuja sekunnissa -kynnys dynaamisen L1-välimuistin kasvattamiseen.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Hakuja sekunnissa -kynnys dynaamisen L1-välimuistin pienentämiseen.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">Emuloi X87-liukulukuja 64-bittisellä tarkkuudella. Tämä heikentää emuloinnin tarkkuutta ja voi aiheuttaa renderöintivirheitä.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">FEXCore-esiasetus</string>
+    <string name="container_fexcore_version">FEXCore-versio</string>
+    <string name="use_unix_libs">Käytä UnixLibs-kirjastoja</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Grafiikka-ajuri</string>
+    <string name="container_zink_mode">Zink-tila</string>
+    <string name="container_graphics_configuration">Grafiikka-ajurin asetukset</string>
+    <string name="container_graphics_version">Grafiikka-ajurin versio</string>
+    <string name="container_graphics_available_extensions">Saatavilla olevat laajennukset</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d käytössä</string>
+    <string name="container_graphics_max_device_memory">Laitteen enimmäismuisti</string>
+    <string name="container_graphics_sync_frame">Synkronoi joka kehys</string>
+    <string name="container_graphics_disable_present_wait">Poista KHR_present_wait käytöstä</string>
+    <string name="container_graphics_present_modes">Esitystilat</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan-näytön synkronointi</string>
+    <string name="container_graphics_resource_type">Muistiresurssin tyyppi</string>
+    <string name="container_graphics_vulkan_version">Vulkan-versio</string>
+    <string name="container_graphics_bcn_emulation">BCn-emulointi</string>
+    <string name="container_graphics_bcn_emulation_type">BCn-emuloinnin tyyppi</string>
+    <string name="container_graphics_bcn_emulation_cache">BCn-emuloinnin välimuisti</string>
+    <string name="container_graphics_transcoder">BCn-transkooderi</string>
+    <string name="container_graphics_quality">BCn-laatu</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">Haluatko monistaa tämän esiasetuksen?</string>
+    <string name="container_presets_confirm_remove">Haluatko poistaa tämän esiasetuksen?</string>
+    <string name="container_presets_title">Esiasetukset</string>
+    <string name="container_presets_preset">Esiasetus</string>
+    <string name="container_presets_new">Uusi esiasetus</string>
+    <string name="container_presets_rename">Nimeä esiasetus uudelleen</string>
+    <string name="container_presets_import">Tuo esiasetus</string>
+    <string name="container_presets_custom">Mukautettu</string>
+    <string name="container_presets_built_in">Oletus</string>
+    <string name="container_presets_changes_auto_saved">Muutokset tallennetaan automaattisesti tätä mukautettua esiasetusta muokattaessa.</string>
+    <string name="container_presets_cannot_rename">Sisäänrakennettuja esiasetuksia ei voi nimetä uudelleen</string>
+    <string name="container_presets_unable_to_import">Esiasetuksen tuominen ei onnistu</string>
+    <string name="container_presets_no_description">Kuvausta ei ole saatavilla</string>
+    <string name="container_presets_cannot_remove">Tätä esiasetusta ei voi poistaa</string>
+    <string name="container_presets_cannot_export">Tätä esiasetusta ei voi viedä</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Simuloi kosketusnäyttöä</string>
+    <string name="session_xserver_preferences_button_text">   ASETUKSET   </string>
+    <string name="session_xserver_extra_keys_config_desc">Täällä voit asettaa extra-keys-muuttujan arvon kuten Termux-sovelluksessa (lue <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">tämä</a>) ja paljon muuta \n
+E.g. <b>META</b> for <i>META-näppäin</i>, \n
+<b>KEYBOARD</b> for <i>ohjelmistonäppäimistön vaihtonäppäin</i>, \n
+<b>PREFERENCES</b> for <i>asetusten avausnäppäin</i>, \n
+<b>MOUSE_HELPER</b> for <i>hiiriapurin vaihtonäppäin</i>, \n
+<b>STYLUS_HELPER</b> for <i>kynän klikkauksen ohituspeittokuvan vaihtonäppäin</i>, \n
+<b>EXIT</b> for <i>sovelluksen lopetusnäppäin</i>.</string>
+    <string name="session_xserver_pref_main">Asetukset</string>
+    <string name="session_xserver_pref_output">Ulostulo</string>
+    <string name="session_xserver_pref_pointer">Osoitin</string>
+    <string name="session_xserver_pref_kbd">Näppäimistö</string>
+    <string name="session_xserver_pref_other">Muut</string>
+    <string name="session_xserver_pref_version">Versio</string>
+    <string name="session_xserver_notification_description">WinNative XServer -viestit</string>
+    <string name="session_xserver_notification_content">WinNative on käynnissä, älä sulje tai pyyhkäise tätä ilmoitusta pois</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Näppäimistö</string>
+    <string name="session_drawer_fps_monitor">FPS-mittari</string>
+    <string name="session_drawer_fps_monitor_subtitle">Näytä reaaliaikaiset suorituskykytiedot</string>
+    <string name="session_drawer_dual_series_battery">Dual Series -akku</string>
+    <string name="session_drawer_hud_frametime_numeric">Näytä kehysaika numerona</string>
+    <string name="session_drawer_toggle_fullscreen">Vaihda koko näyttö</string>
+    <string name="session_drawer_refactor_size">Muokkaa kokoa</string>
+    <string name="session_drawer_show_touchscreen_controls">Näytä kosketusnäytön ohjaimet</string>
+    <string name="session_drawer_magnifier">Suurennuslasi</string>
+    <string name="session_drawer_logs">Lokit</string>
+    <string name="session_drawer_pip_mode">PiP-tila</string>
+    <string name="session_drawer_toggle_relative_mouse">Vaihda suhteellinen hiiren liike</string>
+    <string name="session_drawer_toggle_mouse">Vaihda hiiri</string>
+    <string name="session_drawer_pause_resume">Keskeytä/jatka</string>
+    <string name="session_drawer_relative_mouse_movement">Suhteellinen hiiren liike</string>
+    <string name="session_drawer_mouse_input">Hiiren syöte</string>
+    <string name="session_drawer_touch">Kosketus</string>
+    <string name="session_drawer_touch_trackpad">Kosketuslevy</string>
+    <string name="session_drawer_touch_touchscreen">Kosketusnäyttötila</string>
+    <string name="session_drawer_touch_map_right_stick">Yhdistä oikeaan sauvaan</string>
+    <string name="session_drawer_rts_gestures">RTS-eleet</string>
+    <string name="session_drawer_rts_gestures_edit">Muokkaa</string>
+    <string name="session_drawer_right_stick_sensitivity">Oikean sauvan herkkyys</string>
+    <string name="session_rts_action">Toiminto</string>
+    <string name="session_rts_behavior">Toiminta</string>
+    <string name="session_rts_tap1">1 sormen napautus</string>
+    <string name="session_rts_tap2">2 sormen napautus</string>
+    <string name="session_rts_tap3">3 sormen napautus</string>
+    <string name="session_rts_tap4">4 sormen napautus</string>
+    <string name="session_rts_double_tap">Kaksoisnapautus (kaksoisklikkaus vasemmalla)</string>
+    <string name="session_rts_long_press">Pitkä painallus</string>
+    <string name="session_rts_hold2">2 sormen pito</string>
+    <string name="session_rts_hold3">3 sormen pito</string>
+    <string name="session_rts_hold4">4 sormen pito</string>
+    <string name="session_rts_swipe3">3 sormen pyyhkäisy</string>
+    <string name="session_rts_swipe4">4 sormen pyyhkäisy</string>
+    <string name="session_rts_up">Ylös</string>
+    <string name="session_rts_down">Alas</string>
+    <string name="session_rts_left">Vasen</string>
+    <string name="session_rts_right">Oikea</string>
+    <string name="session_rts_pan">2 sormen panorointi</string>
+    <string name="session_rts_pan1">1 sormen panorointi</string>
+    <string name="session_rts_zoom">Nipistyszoomaus</string>
+    <string name="session_rts_drag">1 sormen veto</string>
+    <string name="session_rts_drag2">2 sormen veto</string>
+    <string name="session_rts_long_press_delay">Pitkän painalluksen viive (ms)</string>
+    <string name="session_rts_hold_delay">Pidon viive (ms)</string>
+    <string name="session_rts_swipe_threshold">Pyyhkäisyn kynnys (px)</string>
+    <string name="session_rts_gesture_threshold">Eleen kynnys (px)</string>
+    <string name="session_rts_double_tap_delay">Kaksoisnapautuksen viive (ms)</string>
+    <string name="session_rts_drag_threshold">Vedon kynnys (px)</string>
+    <string name="session_rts_pan_threshold">Panoroinnin/nipistyksen aloitus (px)</string>
+    <string name="common_ui_rename">Nimeä uudelleen</string>
+    <string name="common_ui_new">Uusi</string>
+    <string name="input_controls_editor_input_profiles_section">Syöteprofiilit</string>
+    <string name="session_gesture_profile_section">Eleprofiili</string>
+    <string name="gesture_profile_new">Uusi eleprofiili</string>
+    <string name="gesture_profile_import">Tuo eleprofiili</string>
+    <string name="gesture_profile_export">Vie eleprofiili</string>
+    <string name="gesture_profile_none">Ei eleprofiileja</string>
+    <string name="session_drawer_screen_effects">Näyttötehosteet</string>
+    <string name="session_drawer_screen_effects_subtitle">Skaalaus ja väritehosteet</string>
+    <string name="session_drawer_super_resolution">Super Resolution</string>
+    <string name="session_drawer_upscaler_mode">Skaalain</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Reunojen terävyys</string>
+    <string name="session_drawer_vivid">Eloisa</string>
+    <string name="session_drawer_vivid_strength">Eloisuuden voimakkuus</string>
+    <string name="session_drawer_color_profile">Väritehoste</string>
+    <string name="session_drawer_picture_in_picture">Kuva kuvassa</string>
+    <string name="session_drawer_exit_subtitle">Sulje käynnissä oleva istunto</string>
+    <string name="session_drawer_touchscreen_overlay">Kosketusnäytön peittokuva</string>
+    <string name="session_drawer_resume">Jatka</string>
+    <string name="session_drawer_retry">Yritä uudelleen</string>
+    <string name="downloads_no_internet">Ei internetyhteyttä</string>
+    <string name="session_drawer_pause">Keskeytä</string>
+    <string name="session_drawer_wine_processes_paused">Wine-prosessit on keskeytetty</string>
+    <string name="session_drawer_pause_all_wine_processes">Keskeytä kaikki Wine-prosessit</string>
+    <string name="session_drawer_controls_section">Ohjaimet</string>
+    <string name="session_drawer_session_section">Istunto</string>
+    <string name="session_drawer_header_subtitle">Pikapääsy ohjaimiin, peittokuviin ja istuntotyökaluihin</string>
+    <string name="session_drawer_swipe_hint">Pyyhkäise pois palataksesi peliin</string>
+    <string name="session_drawer_main_menu_title">Valikko</string>
+    <string name="session_drawer_hud_summary">Säädä peittokuvan näkyvyyttä ja datapisteitä</string>
+    <string name="session_drawer_hud_disabled_hint">Ota peittokuva käyttöön mukauttaaksesi sitä</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_background_alpha">Taustan alfa</string>
+    <string name="session_drawer_hud_background">Tausta</string>
+    <string name="session_drawer_hud_scale">Skaala</string>
+    <string name="session_drawer_hud_elements">HUD-elementit</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">Kaavio</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango-tyylinen HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango-HUDin asetukset</string>
+    <string name="mango_hud_element_gpu_load">GPU-kuorma</string>
+    <string name="mango_hud_element_gpu_temp">GPU-lämpötila</string>
+    <string name="mango_hud_element_cpu_load">CPU-kuorma</string>
+    <string name="mango_hud_element_cpu_temp">CPU-lämpötila</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Akku</string>
+    <string name="mango_hud_element_lows" formatted="false">1 %:n minimit</string>
+    <string name="mango_hud_element_graph">Frametime-kaavio</string>
+    <string name="mango_hud_element_engine">Moottori</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU-kellotaajuus</string>
+    <string name="mango_hud_element_gpu_clock">GPU-kellotaajuus</string>
+    <string name="mango_hud_element_cores">Ydinkohtainen</string>
+    <string name="mango_hud_element_network">Verkko</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Resoluutio</string>
+    <string name="mango_hud_element_wine">Wine-versio</string>
+    <string name="mango_hud_element_duration">Istunnon kesto</string>
+    <string name="mango_hud_element_clock">Kello</string>
+    <string name="mango_hud_element_throttle">Kuristustila</string>
+    <string name="mango_hud_group_memory">Muisti</string>
+    <string name="mango_hud_group_system">Järjestelmä</string>
+    <string name="mango_hud_lock">Lukitse HUD</string>
+    <string name="mango_hud_lock_subtitle">Kosketukset menevät HUDin takana oleviin ohjaimiin. Pidä HUDia painettuna lukitaksesi sen. (5s)</string>
+    <string name="hud_position_menu_title">Siirrä HUD kohtaan</string>
+    <string name="hud_position_top_left">Ylävasen</string>
+    <string name="hud_position_top_center">Yläkeskusta</string>
+    <string name="hud_position_top_right">Yläoikea</string>
+    <string name="hud_position_left_center">Vasen keskusta</string>
+    <string name="hud_position_right_center">Oikea keskusta</string>
+    <string name="hud_position_bottom_left">Alavasen</string>
+    <string name="hud_position_bottom_center">Alakeskusta</string>
+    <string name="hud_position_bottom_right">Alaoikea</string>
+    <string name="session_drawer_hud_alpha_input_title">Aseta alfa</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Aseta taustan alfa</string>
+    <string name="session_drawer_hud_scale_input_title">Aseta skaala</string>
+    <string name="session_drawer_hud_input_hint">Syötä arvo väliltä %1$d–%2$d. Rajan ylittävät arvot rajataan.</string>
+    <string name="session_drawer_command_center">Komentokeskus</string>
+    <string name="session_drawer_command_center_input">Syöte</string>
+    <string name="session_drawer_command_center_display">Näyttö</string>
+    <string name="session_drawer_command_center_system">Järjestelmä</string>
+    <string name="session_drawer_fps_limiter">FPS-rajoitin</string>
+    <string name="session_drawer_fps_limiter_off">Pois</string>
+    <string name="session_drawer_color_profile_disabled">Ei käytössä</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Luonnollinen</string>
+    <string name="session_drawer_color_profile_crt">CRT-tehoste</string>
+    <string name="session_drawer_color_profile_toon">Sarjakuva</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Kirkkaus</string>
+    <string name="session_drawer_contrast">Kontrasti</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_scale">Skaala</string>
+    <string name="session_drawer_scale_nearest">Lähin</string>
+    <string name="session_drawer_scale_linear">Lineaarinen</string>
+    <string name="session_drawer_scale_bicubic">Bikuubinen</string>
+    <string name="session_drawer_saturation">Kylläisyys</string>
+    <string name="session_drawer_temperature">Lämpötila</string>
+    <string name="session_drawer_tint">Sävy</string>
+    <string name="session_drawer_sharpen">Terävöitä</string>
+    <string name="session_drawer_scanlines">Juovat</string>
+    <string name="session_drawer_pixelate">Pikselöi</string>
+    <string name="session_drawer_block_size">Lohkon koko</string>
+    <string name="session_drawer_strength">Voimakkuus</string>
+    <string name="session_drawer_intensity">Intensiteetti</string>
+    <string name="session_drawer_color_blind">Värisokeus</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Palauta tehosteet</string>
+    <string name="session_drawer_calibrate_advanced">Lisäkalibrointi</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Gyro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Ulostulo</string>
+    <string name="session_drawer_rail_label_apps">Lisää</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">Ulkoinen näyttö havaittu</string>
+    <string name="display_output_prompt_message">Lähetetäänkö peli liitettyyn näyttöön? Näytön ohjaimet ja valikko pysyvät tässä puhelimessa.</string>
+    <string name="display_output_prompt_swap">Vaihda näyttöjä</string>
+    <string name="display_output_prompt_mirror">Peilaa</string>
+    <string name="display_output_swapped_toast">Peli siirretty ulkoiseen näyttöön. Ohjaimet pysyvät puhelimessa.</string>
+    <string name="display_output_cast_unavailable">Langattoman näytön asetukset eivät ole käytettävissä tässä laitteessa.</string>
+    <string name="display_output_restored_toast">Ulkoinen näyttö irrotettu — peli palautettu puhelimeen.</string>
+    <string name="session_drawer_output_title">Näytön ulostulo</string>
+    <string name="session_drawer_output_subtitle">Peli näkyy ulkoisessa näytössä.</string>
+    <string name="session_drawer_output_device">Liitetty näyttö</string>
+    <string name="session_drawer_output_resolution">Tarkkuus</string>
+    <string name="session_drawer_output_refresh_rate">Virkistystaajuus</string>
+    <string name="session_drawer_output_aspect_ratio">Kuvasuhde</string>
+    <string name="session_drawer_output_aspect_fit">Sovita (kuvasuhde)</string>
+    <string name="session_drawer_output_aspect_stretch">Venytä (täytä)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoomaa (rajaa)</string>
+    <string name="session_drawer_output_return_to_phone">Palauta puhelimeen</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Lähetä televisioon</string>
+    <string name="session_drawer_output_cast_body">Liitä USB-C- / HDMI-sovitin tai yhdistä langaton näyttö napauttamalla alta (Miracast / Wi-Fi Direct). Peli näkyy televisiossa, kun nämä ohjaimet pysyvät puhelimessa.</string>
+    <string name="session_drawer_output_cast_button">Yhdistä langaton näyttö</string>
+    <string name="session_drawer_output_cast_note">Pelkät Chromecast-televisiot eivät voi näyttää live-peliä yksityisillä ohjaimilla — käytä langatonta näyttöä tai USB-C-/HDMI-sovitinta parhaan tuloksen saamiseksi.</string>
+    <string name="session_drawer_output_render_note">Näyttösi ilmoittamat tilat vaihtavat sen todellisen ulostulon (se saattaa hetkeksi mennä mustaksi uudelleenalustuksen aikana). Muut tarkkuudet renderöidään siinä koossa ja skaalataan laitteistolla paneeliin — natiivia korkeampi terävöittää (supersampling), matalampi toimii nopeammin.</string>
+    <string name="session_drawer_output_scaling_note">Tämä puhelin lähettää näytön natiivilla %1$s -tarkkuudella eikä vaihda sen tilaa, joten tämä asettaa renderöintitarkkuuden — se skaalataan laitteistolla paneeliin (natiivia korkeampi terävöittää, matalampi toimii nopeammin).</string>
+    <string name="session_drawer_output_game_mode">Pelitila (matala viive)</string>
+    <string name="session_drawer_output_game_mode_on">Päällä</string>
+    <string name="session_drawer_output_game_mode_off">Pois</string>
+    <string name="session_drawer_output_game_mode_note">Pyytää television matalan viiveen / pelitilan (HDMI ALLM) syöttöviiveen minimoimiseksi. Näkyy vain, kun liitetty näyttö tukee sitä.</string>
+    <string name="session_drawer_output_send_to_display">Lähetä peli näyttöön</string>
+    <string name="session_drawer_output_to_display">Ulostulo ulkoiseen näyttöön</string>
+    <string name="session_drawer_output_send_note">Näyttö on liitetty. Lähetä peli siihen — ohjaimet ja valikko pysyvät tässä puhelimessa. Voit palauttaa sen tänne milloin tahansa.</string>
+    <string name="session_drawer_output_display">Näyttö</string>
+    <string name="session_drawer_output_glasses">Lasit</string>
+    <string name="session_drawer_output_brightness">Kirkkaus</string>
+    <string name="session_drawer_output_shade">Tummennus (himmennys)</string>
+    <string name="session_drawer_output_3d">3D (rinnakkain)</string>
+    <string name="glasses_panel_refresh">Virkistystaajuus</string>
+    <string name="glasses_panel_sunblock">Auringonsuoja</string>
+    <string name="session_drawer_output_volume">Äänenvoimakkuus</string>
+    <string name="session_drawer_output_glasses_note">Lähetetään suoraan Viture-laseihisi USB:n kautta.</string>
+    <string name="session_drawer_rail_label_keyboard">Näppäimistö</string>
+    <string name="session_drawer_rail_label_input_controls">Ohjaimet</string>
+    <string name="session_drawer_rail_label_relative_mouse">SuhtHiiri</string>
+    <string name="session_drawer_rail_label_mouse">Hiiri</string>
+    <string name="session_drawer_rail_label_fullscreen">Koko näyttö</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Zoomaus</string>
+    <string name="session_drawer_rail_label_task_manager">Tehtävät</string>
+    <string name="session_drawer_rail_label_record">Tallenna</string>
+    <string name="session_drawer_rail_label_logs">Lokit</string>
+    <string name="session_record_started">Tallennus aloitettu</string>
+    <string name="session_record_saved">Tallennus tallennettu kansioon WinNative/Recordings</string>
+    <string name="session_record_failed">Tallennusta ei voitu aloittaa</string>
+    <string name="session_record_settings_title">Tallennusasetukset</string>
+    <string name="session_record_fps">Ruutunopeus</string>
+    <string name="session_record_resolution">Tarkkuus</string>
+    <string name="session_record_quality">Laatu</string>
+    <string name="session_record_include_ui">Tallenna käyttöliittymä</string>
+    <string name="session_record_include_ui_subtitle">Sisällytä HUD ja näytön ohjaimet</string>
+    <string name="session_record_now">Tallenna nyt</string>
+    <string name="session_drawer_logs_clear">Tyhjennä</string>
+    <string name="session_drawer_logs_pause">Keskeytä</string>
+    <string name="session_drawer_logs_resume">Jatka</string>
+    <string name="session_drawer_logs_paused_indicator">Keskeytetty</string>
+    <string name="session_drawer_logs_line_count">%1$d riviä</string>
+    <string name="session_drawer_logs_share">Jaa</string>
+    <string name="session_drawer_logs_share_subject">Istuntolokit</string>
+    <string name="session_drawer_logs_share_chooser">Jaa istuntolokit</string>
+    <string name="session_drawer_logs_share_failed">Lokien jakaminen epäonnistui</string>
+    <string name="session_drawer_logs_share_empty">Ei jaettavia lokirivejä</string>
+    <string name="session_gyroscope_activator">Aktivointi</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">Haluatko lopettaa tämän prosessin?</string>
+    <string name="session_task_title">Tehtävienhallinta</string>
+    <string name="session_task_process_name">Prosessin nimi</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">Muisti</string>
+    <string name="session_task_end_process">Lopeta prosessi</string>
+    <string name="session_task_set_affinity">Aseta affiniteetti</string>
+    <string name="session_task_affinity_title">Suoritinaffiniteetti</string>
+    <string name="session_task_affinity_all_cores">Kaikki ytimet</string>
+    <string name="session_task_new_task">Uusi tehtävä</string>
+    <string name="session_task_bring_to_front">Tuo eteen</string>
+    <string name="session_task_custom_value">Mukautettu arvo</string>
+    <string name="session_task_processes">Prosessit</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">Ydinkohtainen käyttö</string>
+    <string name="session_task_core_label">Ydin %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d ydin</item>
+        <item quantity="other">%d ydintä</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Suunta</string>
+    <string name="session_display_horizontal">Vaaka</string>
+    <string name="session_display_vertical">Pysty</string>
+    <string name="session_display_columns">Sarakkeet</string>
+    <string name="session_display_frame_rate">Ruutunopeus</string>
+    <string name="session_display_title">Näyttö</string>
+    <string name="session_display_fullscreen_stretched">Ota käyttöön koko näyttö (venytetty)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Renderöijä:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s Gt käytössä / %2$s yhteensä</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">Haluatko poistaa tämän ohjaimen?</string>
+    <string name="session_gamepad_external_controllers">Ulkoiset ohjaimet</string>
+    <string name="session_gamepad_press_any_button">Paina mitä tahansa painiketta ohjaimessasi</string>
+    <string name="session_gamepad_bindings">sidokset</string>
+    <string name="session_gamepad_control_bindings">Ohjaussidokset</string>
+    <string name="session_gamepad_game_controller">Peliohjain</string>
+    <string name="session_gamepad_as_button">On painike</string>
+    <string name="session_gamepad_as_axis">On akseli</string>
+    <string name="session_gamepad_trigger_type">Tyyppi</string>
+    <string name="session_gamepad_help_trigger_mode">Riippuu &lt;b&gt;fyysisestä ohjaimestasi&lt;/b&gt;:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;On akseli&lt;/b&gt; — liipaisimella on lineaarinen liikealue&lt;br/&gt;&#x2022; &lt;b&gt;On painike&lt;/b&gt; — liipaisin toimii yksinkertaisena kytkimenä&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Huomaa: On painike -asetuksen käyttö lineaarisen liipaisimen kanssa hukkaa analogitiedot.&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">Painike A</string>
+    <string name="session_gamepad_button_b">Painike B</string>
+    <string name="session_gamepad_button_x">Painike X</string>
+    <string name="session_gamepad_button_y">Painike Y</string>
+    <string name="session_gamepad_button_grip">Grip-painike</string>
+    <string name="session_gamepad_button_trigger">Liipaisinpainike</string>
+    <string name="session_gamepad_thumbstick_left">Sauva vasemmalle</string>
+    <string name="session_gamepad_thumbstick_right">Sauva oikealle</string>
+    <string name="session_gamepad_thumbstick_up">Sauva ylös</string>
+    <string name="session_gamepad_thumbstick_down">Sauva alas</string>
+    <string name="session_gamepad_configure_analog_sticks">Määritä analogisauvat</string>
+    <string name="session_gamepad_left_stick">Vasen sauva</string>
+    <string name="session_gamepad_right_stick">Oikea sauva</string>
+    <string name="session_gamepad_controller_manager">Ohjainten hallinta</string>
+    <string name="session_gamepad_enable_vibration">Ota tärinä käyttöön</string>
+    <string name="session_gamepad_player_1">Pelaaja 1</string>
+    <string name="session_gamepad_player_2">Pelaaja 2</string>
+    <string name="session_gamepad_player_3">Pelaaja 3</string>
+    <string name="session_gamepad_player_4">Pelaaja 4</string>
+    <string name="session_gamepad_not_assigned">Ei määritetty</string>
+    <string name="session_gamepad_assign">Määritä</string>
+    <string name="session_gamepad_press_any_button_for_player">Paina mitä tahansa painiketta ohjaimessa pelaajalle</string>
+    <string name="session_gamepad_vibrate">Tärinä</string>
+    <string name="session_gamepad_macros_hint">Ota automaattilaukaus käyttöön painikkeiden kytkimillä.</string>
+    <string name="session_gamepad_macros">Makrot</string>
+    <string name="session_gamepad_include_triggers_note">Käytä turboa myös L2/R2-painikkeisiin digitaalisina painalluksina</string>
+    <string name="session_gamepad_square_deadzone">Neliömäinen kuollut alue</string>
+    <string name="session_gamepad_invert_x">Käännä X</string>
+    <string name="session_gamepad_invert_y">Käännä Y</string>
+    <string name="session_gamepad_save_profile">Tallenna profiili</string>
+    <string name="session_gamepad_load_profile">Lataa profiili</string>
+    <string name="session_gamepad_button_start">Painike Start</string>
+    <string name="session_gamepad_button_select">Painike Select</string>
+    <string name="session_gamepad_button_l1">Painike L1</string>
+    <string name="session_gamepad_button_r1">Painike R1</string>
+    <string name="session_gamepad_button_l2">Painike L2</string>
+    <string name="session_gamepad_button_r2">Painike R2</string>
+    <string name="session_gamepad_button_l3">Painike L3</string>
+    <string name="session_gamepad_button_r3">Painike R3</string>
+    <string name="session_gamepad_dpad_up">Ristiohjain ylös</string>
+    <string name="session_gamepad_dpad_down">Ristiohjain alas</string>
+    <string name="session_gamepad_dpad_left">Ristiohjain vasemmalle</string>
+    <string name="session_gamepad_dpad_right">Ristiohjain oikealle</string>
+    <string name="session_gamepad_overwrite">Korvaa</string>
+    <string name="session_gamepad_save_as_new">Tallenna uutena</string>
+    <string name="session_gamepad_overwrite_profile_message">Haluatko korvata nykyisen profiilin vai tallentaa uutena profiilina?</string>
+    <string name="session_gamepad_enter_profile_name">Anna profiilin nimi</string>
+    <string name="session_gamepad_mappings_saved">Määritykset tallennettu!</string>
+    <string name="session_gamepad_profile_saved">Profiili tallennettu!</string>
+    <string name="session_gamepad_profile_saved_as_new">Profiili tallennettu uutena!</string>
+    <string name="session_gamepad_profile_loaded">Profiili ladattu!</string>
+    <string name="session_gamepad_profile_name_empty">Profiilin nimi ei voi olla tyhjä</string>
+    <string name="session_gamepad_no_profiles">-- Ei profiileja --</string>
+    <string name="session_gamepad_error_loading_profile">Virhe profiilin latauksessa</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Kosketusnäytön ohjaimet</string>
+    <string name="input_controls_auto_hide_on_controller_title">Piilota automaattisesti ohjaimella</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Piilota kosketusnäytön ohjaimet, kun ohjain on liitetty</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">Gyroskooppi</string>
+    <string name="session_gyroscope_calibrate">Kalibroi gyroskooppi</string>
+    <string name="session_gyroscope_enable_right_stick">Ota oikean sauvan gyroskooppiliike käyttöön</string>
+    <string name="session_gyroscope_activator_button">Gyroskoopin aktivointipainike</string>
+    <string name="session_gyroscope_hold">Pidä pohjassa</string>
+    <string name="session_gyroscope_toggle">Vaihda</string>
+    <string name="session_gyroscope_orientation_mode">Kallista tähdätäksesi (asento)</string>
+    <string name="session_gyroscope_x_sensitivity">X-akselin herkkyys</string>
+    <string name="session_gyroscope_y_sensitivity">Y-akselin herkkyys</string>
+    <string name="session_gyroscope_smoothing">Pehmennys</string>
+    <string name="session_gyroscope_invert_x">Käännä X-akseli</string>
+    <string name="session_gyroscope_invert_y">Käännä Y-akseli</string>
+    <string name="session_gyroscope_filtering">Suodatus</string>
+    <string name="session_gyroscope_deadzone">Kuollut alue</string>
+    <string name="session_gyroscope_sensitivity">Herkkyys</string>
+    <string name="session_gyroscope_direction">Suunta</string>
+    <string name="session_gyroscope_mode">Gyroskoopin aktivointitila</string>
+    <string name="session_gyroscope_target_stick">Kohdista gyro</string>
+    <string name="session_gyroscope_enable_stick">Ota analogisauvan gyroskooppiliike käyttöön</string>
+    <string name="session_gyroscope_reset_stick">Nollaa sauva</string>
+    <string name="session_gyroscope_reset_stick_to_center">Nollaa sauva keskelle</string>
+    <string name="session_gyroscope_configuration">Gyroskoopin määritys</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Kokeellinen hiiren liike</string>
+    <string name="session_gyroscope_x_sensitivity_format">X-herkkyys: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Y-herkkyys: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Pehmennys: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Kuollut alue: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Herkkyys: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Hiiren skaala</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Hiiren skaala: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">Osoittimen nopeus</string>
+    <string name="settings_general_theme">Teema</string>
+    <string name="settings_general_background">Tausta</string>
+    <string name="settings_general_background_color_hex">Väri (heksa)</string>
+    <string name="settings_general_wallpaper_selected">Taustakuva valittu</string>
+    <string name="settings_general_select_wallpaper">Valitse taustakuva</string>
+    <string name="settings_general_title">Yleiset</string>
+    <string name="settings_general_enable_file_provider">Ota tiedostojen tarjoaja käyttöön</string>
+    <string name="settings_general_enable_auto_scraping">Ota automaattinen haku käyttöön</string>
+    <string name="settings_general_take_effect_next_startup">Tämä asetus tulee voimaan seuraavalla käynnistyksellä.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Asenna Imagefs uudelleen</string>
+    <string name="settings_general_confirm_reinstall_imagefs">Haluatko asentaa imagefs:n uudelleen? Tämä toiminto palauttaa järjestelmätiedostot, säiliöitäsi ei muuteta.</string>
+    <string name="settings_general_refresh_rate">Virkistystaajuus</string>
+    <string name="settings_general_refresh_rate_auto_max">Maksimi</string>
+    <string name="settings_general_refresh_rate_summary">Aseta näytön virkistystaajuus ja DXVK-ruuturaja</string>
+    <string name="settings_general_touchscreen_timeout">Kosketusnäytön aikakatkaisu (vaatii uudelleenkäynnistyksen)</string>
+    <string name="settings_general_touchscreen_haptics">Ota kosketusnäytön haptinen palaute käyttöön</string>
+    <string name="settings_general_open_with_android_browser">Avaa Android-selain Winessä</string>
+    <string name="settings_general_share_android_clipboard">Jaa Androidin leikepöytä Winen kanssa</string>
+    <string name="settings_general_paths_title">Polkuasetukset</string>
+    <string name="settings_general_paths_summary">Hallitse mihin Winlator tallentaa työtietonsa ja mihin viedyt pikakuvakkeet kirjoitetaan.</string>
+    <string name="settings_general_winlator_path_title">Tallennuspolku</string>
+    <string name="settings_general_shortcut_export_path_title">Pikakuvakkeiden vientipolku</string>
+    <string name="settings_general_choose_path">Valitse polku</string>
+    <string name="settings_general_xserver_cursor_summary">Säädä osoittimen nopeutta kosketus-, ohjauslevy- ja hiirisyötteelle XServer-istunnossa.</string>
+    <string name="settings_general_cursor_lock_title">Todellinen hiiren hallinta</string>
+    <string name="settings_general_cursor_lock_summary">Pitää suoran hiiren kaappauksen käytössä peleille, jotka tarvitsevat raakaa osoitinsyötettä. Poista se käytöstä äänenvoimakkuuden vähennyspainikkeella.</string>
+    <string name="settings_general_xinput_toggle_title">Poista XInput käytöstä</string>
+    <string name="settings_general_xinput_toggle_summary">Poistaa XInput-käsittelyn käytöstä, kun haluat yksinomaisen hiiren ja näppäimistön hallinnan.</string>
+    <string name="settings_external_display_output_summary">Siirrä peli liitettyyn ulkoiseen näyttöön tämän näytön peilaamisen sijaan. Lasit käyttävät aina omaa näyttöään.</string>
+    <string name="settings_general_file_provider_summary">Tuo WinNative-tiedostot Androidin dokumenttien valitsimien ja tiedostonhallintaohjelmien saataville.</string>
+    <string name="settings_general_auto_scraping_summary">Tämä asetus antaa WinNativen hakea mukautettujen pelien kuvituksen automaattisesti.</string>
+    <string name="settings_general_open_browser_summary">Avaa tuetut verkkolinkit Androidin selaimessa Wine-istunnon sijaan.</string>
+    <string name="settings_general_clipboard_summary">Salli kopiointi ja liittäminen Androidin ja Wine-istuntojen välillä.</string>
+    <string name="settings_general_imagefs_summary">Palauta mukana toimitetut järjestelmätiedostot poistamatta olemassa olevia säilöjä.</string>
+    <string name="settings_general_check_for_updates">Tarkista päivitykset</string>
+    <string name="settings_general_check_for_updates_summary">Tarkista uudet sovellusversiot automaattisesti käynnistyksen yhteydessä ja säännöllisesti.</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI SoundFont</string>
+    <string name="settings_audio_sound">Ääni</string>
+    <string name="settings_audio_confirm_remove_sound_font">Haluatko poistaa tämän soundfontin?</string>
+    <string name="settings_audio_sound_font_removed_success">Soundfont poistettu onnistuneesti!</string>
+    <string name="settings_audio_sound_font_removed_failed">Soundfontin poisto epäonnistui!</string>
+    <string name="settings_audio_sound_font_installed_success">Soundfont asennettu onnistuneesti!</string>
+    <string name="settings_audio_sound_font_installed_failed">Soundfontin asennus epäonnistui!</string>
+    <string name="settings_audio_sound_font_already_exist">Asennettava soundfont on jo olemassa.</string>
+    <string name="settings_audio_unable_to_install_soundfont">Soundfontin asennus ei onnistu</string>
+    <string name="settings_audio_installing_soundfont">Asennetaan SoundFontia</string>
+    <string name="settings_audio_sound_font_bad_format">Virheellinen SoundFont-muoto.</string>
+    <string name="settings_audio_cannot_remove_default">Oletussoundfontia ei voi poistaa</string>
+    <string name="settings_audio_summary">Asenna, poista ja valitse MIDI-toistoon käytettävä SoundFont.</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Wine-virheenkorjauskanava</string>
+    <string name="settings_debug_title">Virheenkorjaus</string>
+    <string name="settings_debug_wine_logs_title">Ota Wine-virheenkorjauslokit käyttöön</string>
+    <string name="settings_debug_wine_logs_subtitle">Kirjoita Wine-virheenkorjaustuloste tiedostoon</string>
+    <string name="settings_debug_box_logs_title">Ota Box86/64-lokit käyttöön</string>
+    <string name="settings_debug_box_logs_subtitle">Kirjoita Box86- &amp; Box64-virheenkorjaustuloste tiedostoon</string>
+    <string name="settings_debug_fex_logs_title">Ota FEXCore-lokit käyttöön</string>
+    <string name="settings_debug_fex_logs_subtitle">Kirjoita FEXCore-virheenkorjaustuloste tiedostoon</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX-emulointilokit</string>
+    <string name="settings_debug_emulator_logs_subtitle">Kirjaa lokiin sen emulaattorin, jota säiliösi käyttää.</string>
+    <string name="settings_debug_steam_logs_title">Ota Steam-lokit käyttöön</string>
+    <string name="settings_debug_steam_logs_subtitle">Kirjaa Steam-todennus- ja istuntotapahtumat virheenkorjausta varten.</string>
+    <string name="settings_debug_wine_channels_title">Wine-virheenkorjauskanavat</string>
+    <string name="settings_debug_wine_channels_summary">Valitse, mitkä Wine-kanavat sisällytetään, kun Wine-virheenkorjauskirjaus on käytössä.</string>
+    <string name="settings_debug_wine_classes_title">Wine-lokitasot</string>
+    <string name="settings_debug_wine_classes_summary">Valitse, mitkä viestityypit kirjataan lokiin. Jäljitys on erittäin monisanainen.</string>
+    <string name="settings_debug_input_logs">Syötelokit</string>
+    <string name="settings_debug_input_logs_description">Kirjaa peliohjaimen, kosketuksen ja näppäimistön syötetapahtumat</string>
+    <string name="settings_debug_download_logs">Latauslokit</string>
+    <string name="settings_debug_download_logs_description">Kirjaa latausten selvitys- ja WinNative-varajärjestelmätapahtumat</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan-validointikerrokset</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Käynnistä näyttö uudelleen ottaaksesi käyttöön.</string>
+    <string name="settings_debug_share_logs">Jaa lokit</string>
+    <string name="settings_debug_delete_logs">Poista lokit</string>
+    <string name="settings_debug_share_all_logs_short">Jaa kaikki</string>
+    <string name="settings_debug_download_all_logs_short">Lataa kaikki</string>
+    <string name="settings_debug_logs_saved">Tallennettu kohteeseen %1$s</string>
+    <string name="settings_debug_delete_logs_short">Poista</string>
+    <string name="settings_debug_delete_all_logs_short">Poista kaikki</string>
+    <string name="settings_debug_open_logs_folder_short">Avaa lokien hallinta</string>
+    <string name="settings_debug_logs_deleted">Lokit poistettu</string>
+    <string name="settings_debug_delete_logs_confirm_title">Poistetaanko lokit?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Tämä poistaa pysyvästi kaikki tallennetut lokitiedostot (%1$s). Tätä ei voi kumota.</string>
+    <string name="settings_debug_logs_browser_title">Lokit</string>
+    <string name="settings_debug_log_truncated">Näytetään tämän lokin viimeiset %1$s</string>
+    <string name="settings_debug_logs_subject">WinNative-lokit (%1$s)</string>
+    <string name="settings_debug_no_logs_available">Virheenkorjauslokeja ei ole saatavilla. Ota ensin virheenkorjausasetukset käyttöön ja käynnistä peli.</string>
+    <string name="settings_debug_capture_failed">Lokien kaappaus epäonnistui: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">Kirjaa WinNative-prosessin virheet, varoitukset ja kaatumiset tiedostoon</string>
+    <string name="settings_debug_section_emulation">Emulointi</string>
+    <string name="settings_debug_section_subsystems">Alijärjestelmät</string>
+    <string name="settings_debug_section_tools">Työkalut</string>
+    <string name="settings_debug_no_channels_selected">Ei valittuja kanavia</string>
+    <string name="settings_debug_no_channels_available">Ei saatavilla olevia kanavia</string>
+    <string name="settings_debug_channel_toggle_hint">Vaihda kanavia napauttamalla. Käyttöön otetut kanavat sisällytetään Wine-virheenkorjaustulosteeseen.</string>
+    <string name="settings_debug_remove_channel_desc">Poista %1$s</string>
+
+    <string name="settings_other_language_title">Kieli</string>
+    <string name="settings_other_language_summary">Valitse näyttökieli</string>
+    <string name="settings_other_language_system_default">Järjestelmän oletus</string>
+    <string name="settings_other_game_language_title">Pelin kieli</string>
+    <string name="settings_other_game_language_summary">Ensisijainen kieli Steam/Epic/GOG-latauksille</string>
+
+    <string name="settings_other_section_integration">Integrointi</string>
+    <string name="settings_other_setup_wizard_title">Ohjattu asennus</string>
+    <string name="settings_other_setup_wizard_summary">Avaa ohjattu asennus uudelleen tarkistaaksesi käyttöoikeudet, järjestelmätiedostot ja oletussäiliöt.</string>
+    <string name="settings_other_checking_for_updates">Tarkistetaan päivityksiä…</string>
+    <string name="settings_other_update_check_cooldown">Odota %1$d s ennen uutta tarkistusta</string>
+    <string name="settings_other_persistable_permission_failed">Pysyvien käyttöoikeuksien ottaminen ei onnistu: %1$s</string>
+    <string name="settings_other_keep_app_open">Pidä sovellus auki, kunnes tämä on valmis.</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">Asenna sisältöä</string>
+    <string name="settings_content_type">Luokka</string>
+    <string name="settings_content_components">Komponentit</string>
+    <string name="settings_content_auto_create_container">Luo säiliö automaattisesti</string>
+    <string name="settings_content_remove_title">Poistetaanko komponentti?</string>
+    <string name="settings_content_empty_subtitle">Aloita asentamalla paketti tai vaihtamalla tyyppiä.</string>
+    <string name="settings_content_container_created">Luotu säiliö: %1$s</string>
+    <string name="settings_content_download_failed">Lataus epäonnistui.</string>
+    <string name="common_ui_working">Käsitellään</string>
+    <string name="settings_content_desc_wine">Wine-projektin tekemä; kääntää Win32-kutsut natiiveiksi Linux-/Android-palveluiksi.</string>
+    <string name="settings_content_desc_proton">Valven tekemä; Wine-pohjainen ajonaikainen ympäristö, jossa on pelikorjauksia Windows-peleille.</string>
+    <string name="settings_content_desc_dxvk">Kääntää Direct3D 9-, 10- ja 11 -grafiikkakutsut Vulkaniksi.</string>
+    <string name="settings_content_desc_vkd3d">Kääntää Direct3D 12 -grafiikkakutsut Vulkaniksi.</string>
+    <string name="settings_content_desc_box64">Kääntää x86_64 Linux -koodin, jotta se voi toimia ARM64-laitteilla.</string>
+    <string name="settings_content_desc_wowbox64">Box64-käännös, jota WoW64 käyttää 32-bittisten Windows-sovellusten ajamiseen 64-bittisessä Winessä.</string>
+    <string name="settings_content_desc_fexcore">Kääntää x86- ja x86_64-koodin, jotta se voi toimia ARM64-laitteilla.</string>
+    <string name="settings_content_desc_d7vk">Kääntää DirectDraw (Direct3D 7 ja aiemmat) -grafiikkakutsut Vulkaniksi.</string>
+    <string name="settings_content_unable_to_install">Sisällön asennus ei onnistu.</string>
+    <string name="settings_content_install_failed">Asennus epäonnistui</string>
+    <string name="settings_content_file_cannot_be_recognized">Tiedostoa ei tunnisteta.</string>
+    <string name="settings_content_profile_not_found">Profiilia ei löytynyt sisällöstä.</string>
+    <string name="settings_content_profile_cannot_be_recognized">Profiilia ei tunnisteta</string>
+    <string name="settings_content_file_list">Tiedostoluettelo</string>
+    <string name="settings_content_install_directory">Asennushakemisto</string>
+    <string name="settings_content_installed_success">Sisältö asennettu onnistuneesti!</string>
+    <string name="settings_content_downloading_title">Ladataan sisältöä</string>
+    <string name="settings_content_installing_title">Asennetaan sisältöä</string>
+    <string name="settings_content_extracting_title">Puretaan sisältöä</string>
+    <string name="settings_content_extracting_detail">Puretaan (%1$d tiedostoa)</string>
+    <string name="settings_content_preparing_package">Valmistellaan pakettia</string>
+    <string name="settings_content_download_complete">Lataus valmis</string>
+    <string name="settings_content_already_installed_title">Komponentti on jo asennettu</string>
+    <string name="settings_content_already_installed_message">Tämä komponentti on jo asennettu. Poista asennettu kopio ennen kuin lataat sen uudelleen.
+
+Asennuspolku:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Ristiriitainen sisältö asennettu</string>
+    <string name="settings_content_conflicting_message">Poista ristiriitainen sisältö ennen tämän paketin lataamista.
+
+Asennuspolku:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">Sisältöön ei voi luottaa.</string>
+    <string name="settings_content_is_incomplete">Sisältö on epätäydellinen.</string>
+    <string name="settings_content_untrusted_files_warning">Varoitus: Lisäsisältö sisältää tiedostoja, joihin ei voi luottaa. Yleensä seuraavia tiedostoja ei tulisi muokata. Päätä, jatketaanko asennusta.</string>
+    <string name="settings_content_confirm_remove">Tämä poistaa komponentin laitteestasi.</string>
+    <string name="settings_content_unable_to_remove_in_use">Tätä sisältöä ei voi poistaa, koska säiliö käyttää parhaillaan tätä Wineä.</string>
+    <string name="settings_content_download_in_components">Ei ladattua. Lataa yksi Komponentit-osiossa.</string>
+    <string name="settings_content_types_header">SISÄLTÖTYYPIT</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Ajurit</string>
+    <string name="settings_drivers_manager_header">Ajurien hallinta</string>
+    <string name="settings_drivers_github_repos">GitHub-repot</string>
+    <string name="settings_drivers_install">Asenna ajureita</string>
+    <string name="settings_drivers_installed_success">Ajuri asennettu onnistuneesti.</string>
+    <string name="settings_drivers_install_failed">Ajurin asennus epäonnistui.</string>
+    <string name="settings_drivers_remove_title">Poistetaanko ajuri?</string>
+    <string name="settings_drivers_confirm_remove">Tämä poistaa ajurin laitteestasi.</string>
+    <string name="settings_drivers_remove_repo_title">Poistetaanko repo?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s poistetaan repoluettelostasi.</string>
+    <string name="settings_drivers_repo_tap_to_load">Lataa julkaisut napauttamalla</string>
+    <string name="settings_drivers_repo_loading_releases">Ladataan julkaisuja</string>
+    <string name="settings_drivers_repo_release_count">%1$d julkaisua ladattu</string>
+    <string name="settings_drivers_repo_no_release_assets">Haetuista julkaisuista ei löytynyt ladattavia ZIP-tiedostoja.</string>
+    <string name="settings_drivers_repo_fetch_failed">GitHub-julkaisujen lataaminen epäonnistui.</string>
+    <string name="settings_drivers_repo_download_failed">Lataus epäonnistui.</string>
+    <string name="settings_drivers_repo_no_version">Versio ei ole saatavilla</string>
+    <string name="settings_drivers_repo_unknown_size">Tuntematon koko</string>
+    <string name="settings_drivers_manager">Ajurien hallinta</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">Asennetaan järjestelmätiedostoja</string>
+    <string name="setup_wizard_unable_to_install_system_files">Järjestelmätiedostojen asennus ei onnistu</string>
+    <string name="setup_wizard_system_image_not_installed">Järjestelmävedosta ei ole asennettu. Asenna ensin komponentit.</string>
+    <string name="setup_wizard_recommended_components">Suositellut komponentit</string>
+    <string name="setup_wizard_step_format">Vaihe %1$d / %2$d</string>
+    <string name="setup_wizard_allow_file_access">Salli kaikki tiedostojen käyttö</string>
+    <string name="setup_wizard_install_system_files">Asenna järjestelmätiedostot</string>
+    <string name="setup_wizard_recommended_components_description">Suositellut komponentit lataa ja asentaa tuetut DXVK-, VKD3D-, FEX-, Box64- ja Wowbox64-paketit automaattisesti.</string>
+    <string name="setup_wizard_each_button_downloads_description">Jokainen painike lataa paketin, asentaa sen ja luo sen oletussäiliön automaattisesti.</string>
+    <string name="setup_wizard_recommended_x86_64">Suositeltu x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">Suositeltu ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">Valitse asennettavat komponentit. Wine/Proton luo säiliön automaattisesti.</string>
+    <string name="setup_wizard_loading_components">Ladataan komponentteja…</string>
+    <string name="setup_wizard_no_components_available">Tälle luokalle ei ole saatavilla komponentteja.</string>
+    <string name="setup_wizard_default_settings">Oletusasetukset</string>
+    <string name="setup_wizard_containers">Säiliön määritys</string>
+    <string name="setup_wizard_containers_description">Avaa jokainen säiliö ja aseta oletukset, jotka haluat jokaisen uuden pelin perivän. Uudet pelit kohdistetaan oletuksena x86-64-säiliöön.</string>
+    <string name="setup_wizard_store_sign_in_optional">Kauppaan kirjautuminen on valinnaista. Jokainen kirjautuminen palaa tänne, kun se on valmis.</string>
+    <string name="setup_wizard_granted">Myönnetty</string>
+    <string name="setup_wizard_grant">Myönnä</string>
+    <string name="setup_wizard_denied">Evätty</string>
+    <string name="setup_wizard_allow">Salli</string>
+    <string name="setup_wizard_installing">Asennetaan</string>
+    <string name="setup_wizard_install_failed_reason">Asennus epäonnistui: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Vaadittu käyttöoikeus</string>
+    <string name="setup_wizard_select_components">Valitse komponentit</string>
+    <string name="setup_wizard_recommended_wine_proton">Suositeltu Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">Lisäasetukset</string>
+    <string name="setup_wizard_title">Ohjattu asennus</string>
+    <string name="setup_wizard_advanced_user">Edistynyt käyttäjä</string>
+    <string name="setup_wizard_next">Seuraava</string>
+    <string name="setup_wizard_finish">Valmis</string>
+    <string name="setup_wizard_download_and_install">Lataa + asenna</string>
+    <string name="setup_wizard_open_drivers">Avaa ajurit</string>
+    <string name="setup_wizard_ready">Valmis</string>
+    <string name="setup_wizard_download_and_create">Lataa + luo</string>
+    <string name="setup_wizard_configured">Määritetty</string>
+    <string name="setup_wizard_downloading">Ladataan %1$s</string>
+    <string name="setup_wizard_installing_package">Asennetaan %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">Wine- tai Proton-paketteja ei ole vielä asennettu.</string>
+    <string name="setup_wizard_no_runtime_hint">Asenna Wine- tai Proton-paketti edellisestä vaiheesta tai ohita tämä toistaiseksi.</string>
+    <string name="setup_wizard_recommended_label">Suositeltu</string>
+    <string name="setup_wizard_install_all_recommended">Asenna kaikki suositellut</string>
+    <string name="setup_wizard_create_container">Luo säiliö</string>
+    <string name="setup_wizard_creating_container">Luodaan…</string>
+
+    <string name="input_controls_tap_to_click">Napauta klikataksesi</string>
+    <string name="input_controls_reverse_binding_order">Käänteinen sidontajärjestys</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Valtuutus</string>
+    <string name="steam_login_sign_in_to_your_account">Kirjaudu tilillesi</string>
+    <string name="steam_login_username">Käyttäjänimi</string>
+    <string name="steam_login_password">Salasana</string>
+    <string name="steam_login_invalid_username_or_password">Virheellinen käyttäjänimi tai salasana</string>
+    <string name="steam_login_remember_me">Muista minut</string>
+    <string name="steam_login_sign_in_with_qr_code">Kirjaudu QR-koodilla</string>
+    <string name="steam_login_open_steam_app_qr_hint">Avaa Steam-sovellus → napauta QR-kuvaketta</string>
+    <string name="steam_login_failed_to_load_qr_code">QR-koodin lataaminen epäonnistui</string>
+    <string name="steam_login_retry">Yritä uudelleen</string>
+    <string name="steam_login_generating_code">Luodaan koodia…</string>
+    <string name="steam_login_two_factor_auth">Kaksivaiheinen todennus</string>
+    <string name="steam_login_approve_login_steam_app">Hyväksy tämä kirjautuminen\nSteam-mobiilisovelluksellasi</string>
+    <string name="steam_login_enter_code_sent_to">Anna koodi, joka lähetettiin osoitteeseen\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">Anna Steam Guard -koodisi</string>
+    <string name="steam_login_code">Koodi</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Pilvisynkronointi</string>
+    <string name="google_cloud_sync_started">Pilvisynkronointi aloitettu.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Google-palvelut</string>
+    <string name="google_auto_signin_title">Kirjaudu Googleen käynnistyksen yhteydessä</string>
+    <string name="google_auto_signin_summary">Yhdistä automaattisesti Google Play Gamesiin sovelluksen käynnistyessä, jotta tallennusten varmuuskopiointi ja synkronointi ovat aina valmiina. Kun tämä on pois päältä, sovellus ei koskaan kirjaudu sisään itsestään.</string>
+    <string name="google_auto_signin_section">Käynnistyksessä</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">Synkronoidaan</string>
+    <string name="google_cloud_status_connected">Yhdistetty</string>
+    <string name="google_cloud_status_not_signed_in">Ei kirjautunut sisään</string>
+    <string name="google_cloud_working">Käsitellään…</string>
+    <string name="google_cloud_sign_in">Kirjaudu sisään</string>
+    <string name="google_cloud_disable_sync">Poista synkronointi käytöstä</string>
+    <string name="google_cloud_store_logins">Kauppojen kirjautumiset</string>
+    <string name="google_cloud_store_login_sync_busy">Käsitellään kauppojen kirjautumisten synkronointia…</string>
+    <string name="google_cloud_saved_games_unavailable">Googlen tallennetut pelit eivät ole käytettävissä</string>
+    <string name="google_cloud_snapshot_ready">Pilvitilannevedos valmis</string>
+    <string name="google_cloud_waiting_first_backup">Odotetaan ensimmäistä varmuuskopiota</string>
+    <string name="google_cloud_no_store_logins_detected">Kauppojen kirjautumisia ei havaittu</string>
+    <string name="google_cloud_last_synced">Viimeksi synkronoitu %1$s</string>
+    <string name="google_cloud_backup">Varmuuskopioi</string>
+    <string name="google_cloud_restore">Palauta</string>
+    <string name="google_cloud_sign_in_to_sync">Kirjaudu Google Play Gamesiin synkronoidaksesi kauppojen kirjautumiset.</string>
+    <string name="google_cloud_sign_in_failed">Google Play Gamesiin kirjautuminen epäonnistui.</string>
+    <string name="google_cloud_sign_in_finishing">Google Play Gamesiin kirjautuminen on vielä käynnissä. Odota hetki ja yritä pilvisynkronointia uudelleen.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games yhdistetty. Palautus on saatavilla kohteelle %1$s.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games yhdistetty. Napauta Varmuuskopioi tallentaaksesi %1$s kirjautumista.</string>
+    <string name="google_cloud_connected_ready">Google Play Games yhdistetty. Varmuuskopiointi ja palautus ovat valmiina.</string>
+    <string name="google_cloud_sync_disabled">Google Play Games -synkronointi on poistettu käytöstä tälle sovellukselle.</string>
+    <string name="google_cloud_sign_in_first">Kirjaudu ensin Google Play Gamesiin.</string>
+    <string name="google_cloud_no_saved_logins_found">Google-pilvisynkronoinnista ei löytynyt tallennettuja kauppojen kirjautumisia.</string>
+    <string name="google_cloud_backup_already_matches">Pilvivarmuuskopio vastaa jo nykyisiä kauppojen kirjautumisia.</string>
+    <string name="google_cloud_no_local_logins">Varmuuskopioitavia paikallisia kauppojen kirjautumisia ei ole saatavilla.</string>
+    <string name="google_cloud_logins_restored_and_synced">Kauppojen kirjautumiset palautettu ja synkronoitu kohteelle %1$s.</string>
+    <string name="google_cloud_logins_restored">Palautettiin kauppojen kirjautumiset kohteelle %1$s.</string>
+    <string name="google_cloud_logins_backed_up">Varmuuskopioitiin kauppojen kirjautumiset kohteelle %1$s.</string>
+    <string name="google_cloud_sync_ready">Kauppojen kirjautumisten synkronointi on valmis.</string>
+    <string name="google_cloud_no_logins_to_sync">Synkronoitavia kauppojen kirjautumisia ei ole vielä saatavilla.</string>
+    <string name="google_cloud_sign_in_to_backup">Kirjaudu sisään varmuuskopioidaksesi %1$s-kirjautumistunnukset.</string>
+    <string name="google_cloud_no_backed_up_logins">Varmuuskopioituja kaupan kirjautumisia ei vielä löytynyt.</string>
+    <string name="google_cloud_local_cloud_differ">Paikalliset ja pilvessä olevat kaupan kirjautumiset eroavat toisistaan. Käytä Varmuuskopiointi korvataksesi pilvidatan tai Palauta hakeaksesi tallennetut tunnukset.</string>
+    <string name="google_cloud_local_ready_to_backup">Paikalliset kaupan kirjautumiset ovat valmiita varmuuskopioitaviksi kohteelle %1$s.</string>
+    <string name="google_cloud_backup_ready">Kaupan kirjautumisen varmuuskopio on valmis.</string>
+    <string name="google_cloud_restore_available">Pilvikirjautumisen palautus on saatavilla kohteelle %1$s.</string>
+    <string name="google_cloud_logins_synced">Kaupan kirjautumiset on synkronoitu Google Play Games -palvelun kanssa.</string>
+    <string name="google_cloud_sync_problem">Kaupan kirjautumisen synkronoinnissa ilmeni ongelma.</string>
+    <string name="google_cloud_error_auth_needed">Google Play Games -palvelun on viimeisteltävä todennus, ennen kuin pilvisynkronointi voi käyttää tallennettuja pelejä. Avaa Play Games -profiilikehote, jos se näkyy, ja yritä uudelleen.</string>
+    <string name="google_cloud_error_developer">Google Play Games -tallennetut pelit hylkäsi tämän koontiversion. Tarkista Play Games -sovellustunnus, linkitetty paketin nimi ja allekirjoitusvarmenne Play Consolessa.</string>
+    <string name="google_cloud_error_build_rejected">Google-tili on yhdistetty, mutta Google Play Games -tallennetut pelit hylkäsi tämän koontiversion. Tarkista Play Games -sovellustunnus, linkitetty paketti ja allekirjoitusvarmenne.</string>
+    <string name="google_cloud_error_network">Google-pilvisynkronointi epäonnistui, koska verkkopyyntö ei valmistunut tai Google Play -palvelut vaativat huomiota.</string>
+    <string name="google_cloud_error_no_snapshot">Google-pilvisynkronoinnista ei vielä löytynyt tallennettuja kaupan kirjautumisia.</string>
+    <string name="google_cloud_error_generic">Google-pilvisynkronointi epäonnistui: %1$s</string>
+    <string name="google_cloud_error_before_open">Google-pilvisynkronointi epäonnistui, ennen kuin Google-tallennetut pelit ehti avautua.</string>
+    <string name="cloud_saves_title">Pilvitallennukset</string>
+    <string name="cloud_saves_title_for_provider">%1$s-pilvitallennukset – %2$s</string>
+    <string name="cloud_saves_sync_summary">Hae versio, joka %1$s:lla on juuri nyt.</string>
+    <string name="cloud_saves_sync_summary_generic">Hae nykyinen pilviversio.</string>
+    <string name="cloud_saves_no_backups">Ei vielä varmuuskopioita tälle pelille.</string>
+    <string name="cloud_sync_title">Pilvitallennukset</string>
+    <string name="cloud_sync_disable_title">Poista pilvitallennukset käytöstä</string>
+    <string name="cloud_saves_steam_push_label">Lähetä Steam Cloudiin</string>
+    <string name="cloud_saves_steam_push_helper">Pakota paikallisen tallennuksen lähetys</string>
+    <string name="cloud_saves_steam_push_success">Tallennus lähetetty Steam Cloudiin.</string>
+    <string name="cloud_saves_steam_push_failed">Tallennuksen lähetys Steam Cloudiin epäonnistui.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud ei ole juuri nyt tavoitettavissa. Yhdistetään uudelleen taustalla — napauta päivitä, kun olet taas verkossa.</string>
+    <string name="steam_session_refused_event">Steam hylkäsi välimuistiin tallennetun istunnon (EResult=%1$d). Kirjaudu uudelleen sisään.</string>
+    <string name="cloud_sync_enabled_summary">Lataa käynnistyksessä, lähetä lopetettaessa.</string>
+    <string name="cloud_sync_disabled_summary">Käynnistä ilman pilvitallennuksen latausta tai lopetussynkronointia.</string>
+    <string name="cloud_saves_offline_mode">Poista pilvisynkronointi käytöstä</string>
+    <string name="cloud_saves_offline_mode_summary">Pysäyttää kaiken automaattisen pilvitoiminnan tälle pelille.</string>
+    <string name="cloud_saves_backing_up">Varmuuskopioidaan pilvitallennusta…</string>
+    <string name="cloud_saves_restoring">Palautetaan pilvitallennusta…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">Synkronoi %1$s-pilvestä</string>
+    <string name="cloud_saves_sync_from_provider_generic">Synkronoi pilvestä</string>
+    <string name="cloud_saves_syncing_from_provider">Ladataan tallennusta kohteesta %1$s…</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s-pilvitallennus ladattu.</string>
+    <string name="cloud_saves_sync_from_provider_failed">Tallennuksen lataus kohteesta %1$s epäonnistui.</string>
+    <string name="cloud_saves_gog_manage_label">Hallitse GOG-pilvitallennuksia</string>
+    <string name="cloud_saves_gog_manage_helper">Avaa virallisen GOG-verkkosivuston</string>
+    <string name="cloud_saves_gog_manage_no_browser">Ei selainta, jolla avata GOG-pilvitallennusten sivu</string>
+    <string name="cloud_saves_gog_zip_label">Lataa GOG-pilvi-zip</string>
+    <string name="cloud_saves_gog_zip_helper">Tallenna nykyiset pilvitiedostot</string>
+    <string name="cloud_saves_gog_zip_success">GOG-pilvitallennusten zip tallennettu.</string>
+    <string name="cloud_saves_gog_zip_failed">GOG-pilvitallennusten zipin tallennus epäonnistui.</string>
+    <string name="cloud_saves_gog_zip_empty">GOG-pilvitallennustiedostoja ei löytynyt.</string>
+    <string name="cloud_saves_google_backup_label">Varmuuskopioi Googleen</string>
+    <string name="cloud_saves_google_backup_helper">Tallenna kopio Google Play Gamesiin</string>
+    <string name="cloud_saves_google_backup_no_save">Varmuuskopioitavia tallennustiedostoja ei löytynyt.</string>
+    <string name="cloud_saves_history_title">Tallennushistoria</string>
+    <string name="cloud_saves_history_empty">Aiempia tallennuksia ei ole vielä varmuuskopioitu. Korvatut tallennukset ja manuaaliset varmuuskopiot näkyvät täällä 30 päivän ajan.</string>
+    <string name="cloud_saves_history_loading">Ladataan tallennushistoriaa…</string>
+    <string name="cloud_saves_history_sign_in">Kirjaudu Googleen nähdäksesi tallennushistoriasi.</string>
+    <string name="cloud_saves_history_origin_local">paikallinen</string>
+    <string name="cloud_saves_history_origin_cloud">pilvi</string>
+    <string name="cloud_saves_history_origin_manual">manuaalinen</string>
+    <string name="cloud_saves_history_origin_auto">automaattinen</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Palauta</string>
+    <string name="cloud_saves_history_download">Lataa</string>
+    <string name="cloud_saves_history_download_success">Tiedosto ladattu.</string>
+    <string name="cloud_saves_history_download_failed">Lataus epäonnistui.</string>
+    <string name="cloud_saves_history_cloud_readonly">Vain luku</string>
+    <string name="cloud_saves_history_restore_confirm_title">Palautetaanko tämä varmuuskopio?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Tämä korvaa nykyisen paikallisen tallennuksesi kohteen %1$s varmuuskopiolla.</string>
+    <string name="cloud_saves_history_restore_success">Tallennus palautettu varmuuskopiosta.</string>
+    <string name="cloud_saves_history_restore_failed">Tämän varmuuskopion palautus epäonnistui.</string>
+    <string name="cloud_saves_keep_replaced_backup">Säilytä varmuuskopio korvatusta tallennuksesta</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Jos muutat mielesi, voit palauttaa sen Tallennushistoriasta.</string>
+    <string name="cloud_saves_history_refresh">Päivitä</string>
+    <string name="cloud_saves_history_rename">Nimeä uudelleen</string>
+    <string name="cloud_saves_history_rename_title">Nimeä tämä varmuuskopio</string>
+    <string name="cloud_saves_history_rename_hint">esim. Pomotaistelu, Ennen loppua</string>
+    <string name="cloud_saves_history_rename_save">Tallenna</string>
+    <string name="cloud_saves_history_rename_clear">Tyhjennä</string>
+    <string name="cloud_saves_history_rename_success">Varmuuskopio nimetty uudelleen.</string>
+    <string name="cloud_saves_history_rename_failed">Varmuuskopion uudelleennimeäminen epäonnistui.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Valitse tallennuskansio</string>
+    <string name="cloud_saves_custom_folder_label">Tallennuskansio</string>
+    <string name="cloud_saves_custom_select_folder_summary">Osoita säilön sisäiseen tallennushakemistoon</string>
+    <string name="cloud_saves_custom_no_container">Säilö ei ole saatavilla tälle pikakuvakkeelle</string>
+    <string name="cloud_saves_custom_picker_title">Valitse tallennuskansio</string>
+    <string name="cloud_saves_custom_outside_drive_c">Valitun kansion on oltava säilön C:-aseman sisällä</string>
+    <string name="cloud_saves_custom_path_map_failed">Valittua kansiota ei voitu yhdistää Windows-polkuun.</string>
+    <string name="cloud_saves_custom_folder_set">Tallennuskansioksi asetettu %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Synkronoi Steam Cloudista</string>
+    <string name="cloud_saves_steam_sync_helper">Lataa uusin tallennus</string>
+    <string name="cloud_saves_steam_sync_success">Synkronoitu Steam Cloudista</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud -synkronointi epäonnistui</string>
+    <string name="cloud_saves_steam_browse_label">Näytä Steam Cloud -tallennukset</string>
+    <string name="cloud_saves_steam_browse_helper">Avaa pilvitallennustila</string>
+    <string name="cloud_saves_steam_browse_no_browser">Ei selainta, jolla avata Steam-sivu</string>
+    <string name="cloud_saves_steam_import_label">Tuo tiedostot</string>
+    <string name="cloud_saves_steam_import_helper">Palauta ladatut tiedostot</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Tiedostonvalitsin ei ole saatavilla</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Tämä lataa Steam Cloudin nykyiset tallennustiedostot ja korvaa nykyiset tallennustiedostot.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Virheellinen sovellustunnus</string>
+    <string name="cloud_saves_label_saved">Nimike tallennettu</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Tallennukset</string>
+    <string name="saves_import_export_confirm_selection">Vahvista valinta</string>
+    <string name="saves_import_export_select_directory">Valitse tallennushakemistosi</string>
+    <string name="saves_import_export_up_directory">Ylempi hakemisto</string>
+    <string name="saves_import_export_select_container">Kohdesäilö:</string>
+    <string name="saves_import_export_exported">Tallennukset vietiin onnistuneesti</string>
+    <string name="saves_import_export_exported_failed">Tallennusten vienti epäonnistui: %1$s</string>
+    <string name="saves_import_export_imported">Tallennukset tuotiin onnistuneesti</string>
+    <string name="saves_import_export_imported_failed">Tallennusten tuonti epäonnistui: %1$s</string>
+    <string name="saves_export_path_summary">Tallennukset viedään kansioon /WinNative/saves</string>
+    <string name="saves_export_success_path">Viety kohteeseen %1$s</string>
+    <string name="saves_export_warning_title">Käytä tätä vain mukautettujen pelien kanssa</string>
+    <string name="saves_export_warning_body">Vienti voi sisältää tallennuksia kaupasta asennetuista tai pilvisynkronoiduista peleistä.</string>
+    <string name="saves_import_warning_title">Tämä korvaa tämän säilön olemassa olevat tallennukset</string>
+    <string name="saves_import_warning_body">Kun palautat vanhempaa varmuuskopiota, jossa on useita pelejä, kopioi ensin uudemmat tallennukset zip-tiedostoon tiedostonhallinnallasi. Muutos koskee vain zip-tiedostossa olevia tallennuksia. Hallitse tallennuksia viisaasti.</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Säilö</string>
+    <string name="preloader_initializing">Alustetaan</string>
+    <string name="preloader_launching">Käynnistetään</string>
+    <string name="preloader_closing">Suljetaan %1$s</string>
+    <string name="preloader_preparing_steam_environment">Valmistellaan Steam-ympäristöä</string>
+    <string name="preloader_starting_wine">Käynnistetään Wine</string>
+    <string name="preloader_starting_steam_launcher">Käynnistetään Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Ladataan Steam-asiakasohjelmaa</string>
+    <string name="preloader_connecting_to_steam">Yhdistetään Steamiin</string>
+    <string name="preloader_signing_in_to_steam">Kirjaudutaan Steamiin</string>
+    <string name="preloader_fetching_game_info">Kirjauduttu sisään — haetaan pelitietoja</string>
+    <string name="preloader_steam_ready">Steam valmis</string>
+    <string name="preloader_updating_game_info">Päivitetään pelitietoja</string>
+    <string name="preloader_verifying_install">Vahvistetaan asennusta</string>
+    <string name="preloader_scanning_redists">Tarkistetaan jaettavia komponentteja</string>
+    <string name="preloader_installing_redist_single">Asennetaan jaettavaa komponenttia</string>
+    <string name="preloader_installing_named_redist">Asennetaan %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Asennetaan %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Jaettavat komponentit valmiina</string>
+    <string name="preloader_no_redists">Ei asennettavia jaettavia komponentteja</string>
+    <string name="preloader_steam_service_running">Steam-palvelu käynnissä</string>
+    <string name="preloader_launching_game">Käynnistetään %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher epäonnistui — valmistellaan resursseja uudelleen</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher ei voinut käynnistyä. Valmistellaan uudelleen — käynnistä uudelleen</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher tavoitti pelin, mutta se ei koskaan käynnistynyt</string>
+    <string name="preloader_setup_environment">Määritetään ympäristöä</string>
+    <string name="preloader_retrying_steam_client_download">Yritetään Steam-asiakasohjelman latausta uudelleen</string>
+    <string name="preloader_installing_mono">Asennetaan Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Asennetaan jaettavia komponentteja</string>
+    <string name="preloader_unpacking_exe">Puretaan pelin suoritustiedostoa</string>
+    <string name="preloader_downloading_cloud">Ladataan pilvitallennuksia</string>
+    <string name="preloader_syncing_cloud">Synkronoidaan pilvitallennuksia</string>
+    <string name="preloader_uploading_cloud">Lähetetään pilvitallennuksia</string>
+    <string name="preloader_checking_cloud">Tarkistetaan pilvitallennuksia</string>
+    <string name="preloader_cloud_sync_retry">%1$s Yritys %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Pilvisynkronointi lataa</string>
+    <string name="cloud_sync_failed_provider">%1$s-pilvitallennuksen synkronointi epäonnistui.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Mukautettu peli</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Tallenna suorituskyky tiedostoon</string>
+    <string name="settings_hud_record_to_file_summary">Vie sekuntikohtaiset FPS-, CPU-, GPU-, lämpötila- ja akkumittarit kansioon /WinNative/logs/ pelaamisen aikana.</string>
+    <string name="settings_leaderboard_category">Suorituskyky</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Ladataan Workshop-kohteita</string>
+    <string name="workshop_search_items">Hae Workshop-kohteita</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Haetaan tilaamiasi kohteita Steamista.</string>
+    <string name="workshop_error_title">Workshop-kohteiden lataus epäonnistui</string>
+    <string name="workshop_error_subtitle">Jokin meni pieleen. Yritä uudelleen.</string>
+    <string name="workshop_empty_title">Ei tilattuja Workshop-kohteita</string>
+    <string name="workshop_empty_subtitle">Tilaa kohteita Steam Workshopissa ja avaa tämä ikkuna uudelleen.</string>
+    <string name="workshop_search_empty_title">Yksikään kohde ei vastaa hakua \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Kokeile eri hakusanaa.</string>
+    <string name="workshop_clear_search">Tyhjennä haku</string>
+    <string name="workshop_item_fallback">Workshop-kohde</string>
+    <string name="common_ui_failed">Epäonnistui</string>
+    <string name="steam_presence_snooze">Torkku</string>
+    <string name="steam_presence_busy">Varattu</string>
+    <string name="steam_presence_looking_to_trade">Etsii vaihtoa</string>
+    <string name="steam_presence_looking_to_play">Etsii pelikaveria</string>
+    <string name="steam_friends_count">Kaverit — %1$d verkossa</string>
+    <string name="steam_friends_section_in_game">Pelissä (%1$d)</string>
+    <string name="steam_friends_section_online">Verkossa (%1$d)</string>
+    <string name="steam_friends_section_offline">Poissa verkosta (%1$d)</string>
+    <string name="steam_friends_none_loaded">Kavereita ei ole vielä ladattu.</string>
+    <string name="steam_friends_chat_off">Chat on pois päältä. Ota chat-palvelu takaisin käyttöön nähdäksesi kaverisi.</string>
+    <string name="steam_friends_self_you">Sinä</string>
+    <string name="steam_friends_in_game">Pelissä</string>
+    <string name="steam_friends_join">Liity</string>
+    <string name="steam_friends_play">Pelaa</string>
+    <string name="steam_chat_image_failed">(kuvan lähetys epäonnistui)</string>
+    <string name="steam_chat_empty">Ei vielä viestejä. Tervehdi!</string>
+    <string name="steam_chat_uploading_image">Lähetetään kuvaa…</string>
+    <string name="steam_chat_send_image">Lähetä kuva</string>
+    <string name="steam_chat_message_hint">Viesti…</string>
+    <string name="steam_chat_send">Lähetä</string>
+    <string name="steam_chat_image">Kuva</string>
+    <string name="steam_common_back">Takaisin</string>
+    <string name="steam_achievements_title">Saavutukset</string>
+    <string name="steam_achievements_empty">Tälle pelille ei löytynyt saavutuksia,\ntai kirjaudu Steamiin ladataksesi ne.</string>
+    <string name="steam_achievements_hidden">Piilotettu saavutus</string>
+    <string name="steam_achievements_hidden_desc">Jatka pelaamista paljastaaksesi tämän saavutuksen.</string>
+    <string name="steam_achievements_unlocked_on">Avattu %1$s</string>
+    <string name="steam_achievements_unlocked">Avattu</string>
+    <string name="steam_join_joining">Liitytään kohteeseen %1$s pelissä %2$s…</string>
+    <string name="steam_join_install">Asenna %1$s liittyäksesi kohteeseen %2$s</string>
+    <string name="steam_join_not_owned">Et omista peliä %1$s</string>
+    <string name="steam_chat_not_sent">(ei lähetetty)</string>
+    <string name="steam_join_the_game">peli</string>
+    <string name="steam_friends_settings">Asetukset</string>
+    <string name="steam_chat_settings_title">Chatin asetukset</string>
+    <string name="steam_chat_setting_service">Chat-palvelu</string>
+    <string name="steam_chat_setting_service_desc">Kirjaudu sisään nähdäksesi kaverit ja chatataksesi; poista käytöstä näkyäksesi poissa linjoilta</string>
+    <string name="steam_chat_setting_notifications">Chat-ilmoitukset</string>
+    <string name="steam_chat_setting_notifications_desc">Näytä ilmoitus, kun saat viestin</string>
+    <string name="steam_chat_setting_heads">Chat-kuplat</string>
+    <string name="steam_chat_setting_heads_desc">Kelluvat kuplat viestien lukemiseen ja vastaamiseen</string>
+    <string name="steam_chat_setting_ingame">Ota chat käyttöön pelissä</string>
+    <string name="steam_chat_setting_ingame_desc">Vastaanota ja lähetä viestejä pelatessasi</string>
+    <string name="steam_chat_setting_stay_running">Suorita taustalla</string>
+    <string name="steam_chat_setting_stay_running_desc">Pidä chat käynnissä, kun poistut WinNativesta</string>
+    <string name="steam_chat_settings_overlay_needed">Salli näyttö muiden sovellusten päällä käyttääksesi chat-kuplia</string>
+    <string name="steam_chat_heads_title">Viestit</string>
+    <string name="steam_chat_heads_recent_title">Viimeaikaiset</string>
+    <string name="steam_chat_heads_online_title">Verkossa</string>
+    <string name="steam_chat_heads_new_chat">Uusi viesti</string>
+    <string name="steam_chat_setting_autohide">Piilota automaattisesti</string>
+    <string name="steam_chat_setting_autohide_desc">Häivytä chat-kupla 10 sekunnin käyttämättömyyden jälkeen</string>
+    <string name="steam_chat_heads_friends_title">Kaverit</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Tiedostot</string>
+    <string name="file_manager_copy">Kopioi</string>
+    <string name="file_manager_cut">Leikkaa</string>
+    <string name="file_manager_paste">Liitä</string>
+    <string name="file_manager_paste_here">Liitä tähän</string>
+    <string name="file_manager_new_folder">Uusi kansio</string>
+    <string name="file_manager_new_folder_short">Kansio</string>
+    <string name="file_manager_multi_select">Valitse</string>
+    <string name="file_manager_create">Luo</string>
+    <string name="file_manager_delete">Poista</string>
+    <string name="file_manager_copy_count">Kopioi (%1$d)</string>
+    <string name="file_manager_cut_count">Leikkaa (%1$d)</string>
+    <string name="file_manager_delete_count">Poista (%1$d)</string>
+    <string name="file_manager_extract">Pura</string>
+    <string name="file_manager_extract_here">Pura tähän</string>
+    <string name="file_manager_extract_to">Pura kohteeseen…</string>
+    <string name="file_manager_extracting">Puretaan %1$s</string>
+    <string name="file_manager_extract_failed">Purkaminen epäonnistui</string>
+    <string name="file_manager_run_boot">Suorita / käynnistä</string>
+    <string name="file_manager_create_shortcut">Luo pikakuvake</string>
+    <string name="file_manager_run_in_container">Suorita säilössä</string>
+    <string name="file_manager_no_containers">Ei saatavilla olevia säilöjä</string>
+    <string name="file_manager_delete_confirm">Poistetaanko \"%1$s\"? Tätä ei voi kumota.</string>
+    <string name="file_manager_delete_confirm_multi">Poistetaanko %1$d kohdetta? Tätä ei voi kumota.</string>
+    <string name="file_manager_copying">Kopioidaan %1$s</string>
+    <string name="file_manager_moving">Siirretään %1$s</string>
+    <string name="file_manager_copying_count">Kopioidaan %1$d kohdetta</string>
+    <string name="file_manager_moving_count">Siirretään %1$d kohdetta</string>
+    <string name="file_manager_paste_into_itself">Kansiota ei voi liittää itseensä</string>
+    <string name="file_manager_operation_failed">Toiminto epäonnistui</string>
+    <string name="file_manager_delete_failed">Poisto epäonnistui</string>
+    <string name="file_manager_rename_failed">Uudelleennimeäminen epäonnistui</string>
+    <string name="file_manager_create_folder_failed">Kansion luonti epäonnistui</string>
+
+    <string name="settings_content_refresh">Päivitä</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Siirrä tallennus</string>
+    <string name="retro_save_transfer_message">Tuo peliin paikallinen tallennus tai vie pelin nykyinen tallennus.</string>
+    <string name="retro_save_transfer_import">Tuo tallennus</string>
+    <string name="retro_save_transfer_export">Vie tallennus</string>
+    <string name="retro_save_transfer_import_ok">Tallennus tuotu</string>
+    <string name="retro_save_transfer_import_failed">Tallennuksen tuonti epäonnistui</string>
+    <string name="retro_save_transfer_export_ok">Tallennus viety</string>
+    <string name="retro_save_transfer_export_failed">Tallennuksen vienti epäonnistui</string>
+    <string name="retro_save_transfer_none">Tälle pelille ei ole vielä tallennusta</string>
+    <string name="retro_cheats_title">Huijaukset</string>
+    <string name="retro_cheats_hardcore_blocked">Huijaukset on poistettu käytöstä Hardcore-tilassa</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Tallenna</string>
+    <string name="retro_ps2_cancel">Peruuta</string>
+    <string name="retro_ps2_save_state">Tallenna tila</string>
+    <string name="retro_ps2_load_save_state">Lataa tallennustila</string>
+    <string name="retro_ps2_achievements">Saavutukset</string>
+    <string name="retro_ps2_cheats">Huijaukset</string>
+    <string name="retro_ps2_memory_cards">Muistikortit</string>
+    <string name="retro_ps2_fast_forward">Pikakelaus</string>
+    <string name="retro_ps2_reset">Nollaa</string>
+    <string name="retro_ps2_swap_disc">Vaihda levy</string>
+    <string name="retro_ps2_slot">Paikka %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Napauta ladataksesi</string>
+    <string name="retro_ps2_slot_empty">Tyhjä</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Napauta korvataksesi</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Tyhjä — napauta tallentaaksesi</string>
+    <string name="retro_ps2_slot_is_empty">Paikka %1$d on tyhjä</string>
+    <string name="retro_ps2_loaded_slot">Ladattiin paikka %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Paikkaa %1$d ei voitu ladata</string>
+    <string name="retro_ps2_saved_to_slot">Tallennettiin paikkaan %1$d</string>
+    <string name="retro_ps2_save_failed">Tallennus epäonnistui</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Paikka 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Paikka 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Napauta käyttääksesi</string>
+    <string name="retro_ps2_new_memory_card">Uusi muistikortti</string>
+    <string name="retro_ps2_import_card">Tuo kortti</string>
+    <string name="retro_ps2_enable_online_dev9">Ota verkko käyttöön (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2-verkkosovitin — käynnistää pelin uudelleen liittääkseen sen</string>
+    <string name="retro_ps2_ethernet_device">Ethernet-laite</string>
+    <string name="retro_ps2_dns_mode">DNS-tila</string>
+    <string name="retro_ps2_primary_dns">Ensisijainen DNS</string>
+    <string name="retro_ps2_secondary_dns">Toissijainen DNS</string>
+    <string name="retro_ps2_optional">valinnainen</string>
+    <string name="retro_ps2_auto_ip_dhcp">Automaattinen IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Palvelin: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">napauta asettaaksesi IP:n (tyhjä poistaa)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Lisää palvelinisäntä</string>
+    <string name="retro_ps2_new_server_hostname">Uusi palvelimen isäntänimi</string>
+    <string name="retro_ps2_server_hostname_hint">esim. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Näytön ohjaimet</string>
+    <string name="retro_ps2_edit_layout">Muokkaa asettelua</string>
+    <string name="retro_ps2_reset_layout">Palauta asettelu</string>
+    <string name="retro_ps2_layout_reset">Asettelu palautettu</string>
+    <string name="retro_ps2_left_stick_invert_x">Vasen sauva: käännä X</string>
+    <string name="retro_ps2_left_stick_invert_y">Vasen sauva: käännä Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Oikea sauva: käännä X</string>
+    <string name="retro_ps2_right_stick_invert_y">Oikea sauva: käännä Y</string>
+    <string name="retro_ps2_button_color">Painikkeen väri</string>
+    <string name="retro_ps2_letter_color">Kirjaimen väri</string>
+    <string name="retro_ps2_shadow_color">Varjon väri</string>
+    <string name="retro_ps2_background_color">Taustaväri</string>
+    <string name="retro_ps2_reset_colors">Palauta värit</string>
+    <string name="retro_ps2_renderer">Renderöijä</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Tarkkuuskerroin</string>
+    <string name="retro_ps2_scale_1x_native">1x (natiivi)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Kuvasuhde</string>
+    <string name="retro_ps2_aspect_stretch">Venytä</string>
+    <string name="retro_ps2_aspect_auto_standard">Automaattinen (vakio)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Näyttösuodatin</string>
+    <string name="retro_ps2_filter_nearest">Lähin</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilineaarinen (pehmeä)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilineaarinen (terävä)</string>
+    <string name="retro_ps2_texture_filter">Tekstuurisuodatin</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilineaarinen (pakotettu)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilineaarinen (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilineaarinen (spritet)</string>
+    <string name="retro_ps2_blending_accuracy">Sekoituksen tarkkuus</string>
+    <string name="retro_ps2_blend_minimum">Minimi</string>
+    <string name="retro_ps2_blend_basic">Perus</string>
+    <string name="retro_ps2_blend_medium">Keskitaso</string>
+    <string name="retro_ps2_blend_high">Korkea</string>
+    <string name="retro_ps2_blend_full">Täysi</string>
+    <string name="retro_ps2_blend_maximum">Maksimi</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV -sävytin</string>
+    <string name="retro_ps2_shader_off">Pois</string>
+    <string name="retro_ps2_shader_scanline">Juovat</string>
+    <string name="retro_ps2_shader_diagonal">Vino</string>
+    <string name="retro_ps2_shader_triangular">Kolmiomainen</string>
+    <string name="retro_ps2_shader_wave">Aalto</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Ruutujen ohitus</string>
+    <string name="retro_ps2_frameskip_off">Pois</string>
+    <string name="retro_ps2_frameskip_1">Ohita 1</string>
+    <string name="retro_ps2_frameskip_2">Ohita 2</string>
+    <string name="retro_ps2_frameskip_3">Ohita 3</string>
+    <string name="retro_ps2_mipmapping">Mipmap-tekstuurit</string>
+    <string name="retro_ps2_volume">Äänenvoimakkuus</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Mykistä</string>
+    <string name="retro_ps2_swap_stereo_channels">Vaihda stereokanavat</string>
+    <string name="retro_ps2_ee_cycle_rate">EE-syklinopeus</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (oletus)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE-syklien ohitus</string>
+    <string name="retro_ps2_skip_off">Pois</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Välitön VU1</string>
+    <string name="retro_ps2_mtvu">Monisäikeinen VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Nopea CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emulointinopeus</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU-käyttö</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU-käyttö</string>
+    <string name="retro_ps2_hud_internal_resolution">Sisäinen tarkkuus</string>
+    <string name="retro_ps2_deinterlace_mode">Lomituksenpoistotila</string>
+    <string name="retro_ps2_deint_auto">Automaattinen</string>
+    <string name="retro_ps2_deint_off">Pois</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV-kuvasuhde</string>
+    <string name="retro_ps2_anti_blur">Sumennuksen esto</string>
+    <string name="retro_ps2_widescreen_patches">Laajakuvapaikkaukset</string>
+    <string name="retro_ps2_no_interlace_patches">Lomituksenpoistopaikkaukset</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC-spin-tunnistus</string>
+    <string name="retro_ps2_wait_loop">Odotussilmukan tunnistus</string>
+    <string name="retro_ps2_time_stretch">Äänen aikavenytys</string>
+    <string name="retro_ps2_audio_buffer">Äänipuskuri</string>
+    <string name="retro_ps2_audio_latency">Lähtöviive</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Kuva-ajat</string>
+    <string name="retro_ps2_hud_gs_stats">GS-tilastot</string>
+    <string name="retro_ps2_hud_hw_info">Laitteistotiedot</string>
+    <string name="retro_ps2_hud_version">Versio</string>
+    <string name="retro_ps2_hud_input_display">Syötenäyttö</string>
+    <string name="retro_ps2_tab_menu">Valikko</string>
+    <string name="retro_ps2_tab_display">Näyttö</string>
+    <string name="retro_ps2_tab_performance">Suorituskyky</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Ääni</string>
+    <string name="retro_ps2_tab_online">Verkko</string>
+    <string name="retro_ps2_tab_controls">Ohjaimet</string>
+    <string name="retro_ps2_resume">Jatka</string>
+    <string name="retro_ps2_pause">Keskeytä</string>
+    <string name="retro_ps2_exit">Poistu</string>
+    <string name="retro_lr_bios_imported">BIOS tuotu: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Virheellinen BIOS-tiedosto</string>
+    <string name="retro_lr_invalid_retro_game">Virheellinen retropeli</string>
+    <string name="retro_lr_rom_not_found">ROMia ei löytynyt: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">ROMia ei voitu lukea tästä arkistosta</string>
+    <string name="retro_lr_core_not_installed">Ydintä ei ole asennettu: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Huijaukset käytössä — saavutukset ovat poissa käytöstä tässä istunnossa</string>
+    <string name="retro_lr_cloud_save_restored">Pilvitallennus palautettu</string>
+    <string name="retro_lr_restore_failed">Palautus epäonnistui</string>
+    <string name="retro_lr_cloud_conflict_message">Kohteelle %1$s on olemassa uudempi pilvitallennus. Haluatko synkronoida, ja minkä pilvitallennuksen haluat säilyttää?</string>
+    <string name="retro_lr_cloud_save">Pilvitallennus</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Emulaattoriytimen lataus epäonnistui</string>
+    <string name="retro_lr_failed_load_rom">ROMin lataus epäonnistui</string>
+    <string name="retro_lr_graphics_not_supported">Grafiikkaa ei tueta tälle ytimelle</string>
+    <string name="retro_lr_emulator_error">Emulaattorivirhe</string>
+    <string name="retro_lr_shader_default">Oletus</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Terävä</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR-skaalaus</string>
+    <string name="retro_lr_upscale_native">Natiivi</string>
+    <string name="retro_lr_sound">Ääni</string>
+    <string name="retro_lr_left_stick_invert_x">Vasen sauva: käännä X</string>
+    <string name="retro_lr_left_stick_invert_y">Vasen sauva: käännä Y</string>
+    <string name="retro_lr_right_stick_invert_x">Oikea sauva: käännä X</string>
+    <string name="retro_lr_right_stick_invert_y">Oikea sauva: käännä Y</string>
+    <string name="retro_lr_on_screen_controls">Näytön ohjaimet</string>
+    <string name="retro_lr_haptic_feedback">Haptinen palaute</string>
+    <string name="retro_lr_portrait">Pysty</string>
+    <string name="retro_lr_landscape">Vaaka</string>
+    <string name="retro_lr_edit_layout">Muokkaa asettelua (%1$s)</string>
+    <string name="retro_lr_reset_layout">Palauta %1$s-asettelu</string>
+    <string name="retro_lr_layout_reset">%1$s-asettelu palautettu</string>
+    <string name="retro_lr_button_color">Painikkeen väri</string>
+    <string name="retro_lr_letter_color">Kirjaimen väri</string>
+    <string name="retro_lr_shadow_color">Varjon väri</string>
+    <string name="retro_lr_background_color">Taustaväri</string>
+    <string name="retro_lr_reset_colors">Palauta värit</string>
+    <string name="retro_lr_colors_reset">Värit palautettu</string>
+    <string name="retro_lr_performance_hud">Suorituskyky-HUD</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Taustan alfa</string>
+    <string name="retro_lr_background">Tausta</string>
+    <string name="retro_lr_scale">Skaala</string>
+    <string name="retro_lr_numeric_frametime">Numeerinen ruutuaika</string>
+    <string name="retro_lr_dual_series_battery">Kaksisarjainen akku</string>
+    <string name="retro_lr_hud_elements">HUD-ELEMENTIT</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsoli</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Akku</string>
+    <string name="retro_lr_hud_temp">Lämpötila</string>
+    <string name="retro_lr_hud_graph">Kaavio</string>
+    <string name="retro_lr_hud_cpu_temp">CPU-lämpötila</string>
+    <string name="retro_lr_save_state">Tallenna tila</string>
+    <string name="retro_lr_load_save_state">Lataa tallennustila</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Tilojen lataus on poissa käytöstä Hardcore-tilassa</string>
+    <string name="retro_lr_achievements">Saavutukset</string>
+    <string name="retro_lr_cheats">Huijaukset</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Huijaukset ovat poissa käytöstä Hardcore-tilassa</string>
+    <string name="retro_lr_reset">Nollaa</string>
+    <string name="retro_lr_fast_forward">Pikakelaus</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Pikakelaus on poissa käytöstä Hardcore-tilassa</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Levy %1$d/%2$d</string>
+    <string name="retro_lr_resume">Jatka</string>
+    <string name="retro_lr_pause">Keskeytä</string>
+    <string name="retro_lr_exit">Poistu</string>
+    <string name="retro_lr_saved_to_slot">Tallennettiin paikkaan %1$d</string>
+    <string name="retro_lr_could_not_save_state">Tilaa ei voitu tallentaa</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS vaaditaan</string>
+    <string name="retro_lr_bios_required_message">PlayStation-pelit tarvitsevat aidon konsolin BIOS-tiedoston, joka sinun on toimitettava. Tuo BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin tai scph7001.bin) jatkaaksesi.</string>
+    <string name="retro_lr_import_bios">Tuo BIOS…</string>
+    <string name="retro_lr_cancel">Peruuta</string>
+    <string name="retro_lr_slot_empty">Paikka %1$d on tyhjä</string>
+    <string name="retro_lr_loaded_slot">Ladattiin paikka %1$d</string>
+    <string name="retro_lr_could_not_load_state">Tilaa ei voitu ladata</string>
+    <string name="retro_lr_slot_title">Paikka %1$d</string>
+    <string name="retro_lr_rename_slot">Nimeä paikka %1$d uudelleen</string>
+    <string name="retro_gs_section_general">Yleiset</string>
+    <string name="retro_gs_section_graphics">Grafiikka</string>
+    <string name="retro_gs_section_performance">Suorituskyky</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Syöte</string>
+    <string name="retro_gs_section_audio">Ääni</string>
+    <string name="retro_gs_section_online">Verkko</string>
+    <string name="retro_gs_cancel">Peruuta</string>
+    <string name="retro_gs_save">Tallenna</string>
+    <string name="retro_gs_shader_default">Oletus</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Terävä</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Natiivi</string>
+    <string name="retro_gs_group_game">PELI</string>
+    <string name="retro_gs_label_name">Nimi</string>
+    <string name="retro_gs_label_system">Järjestelmä</string>
+    <string name="retro_gs_label_emulator_core">Emulaattoriydin</string>
+    <string name="retro_gs_label_rom_path">ROM-polku</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">Asennettu</string>
+    <string name="retro_gs_bios_none">Ei mitään — vaaditaan %1$s-pelien ajamiseen</string>
+    <string name="retro_gs_import_bios">Tuo BIOS…</string>
+    <string name="retro_gs_remove_bios">Poista BIOS</string>
+    <string name="retro_gs_group_library_artwork">KIRJASTON KUVITUS</string>
+    <string name="retro_gs_artwork_game_card">Pelikortin kuva</string>
+    <string name="retro_gs_artwork_grid">Ruudukkokuva</string>
+    <string name="retro_gs_artwork_carousel">Karusellikuva</string>
+    <string name="retro_gs_artwork_list">Luettelokuva</string>
+    <string name="retro_gs_artwork_custom_set">Mukautettu kuva asetettu</string>
+    <string name="retro_gs_artwork_set_image">Aseta kuva</string>
+    <string name="retro_gs_artwork_remove">Poista</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Videosuodatin</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR-skaalaus</string>
+    <string name="retro_gs_performance_hud">Suorituskyky-HUD</string>
+    <string name="retro_gs_group_core">YDIN</string>
+    <string name="retro_gs_renderer">Renderöijä</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Tarkkuuskerroin</string>
+    <string name="retro_gs_scale_1x_native">1x (natiivi)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Kuvasuhde</string>
+    <string name="retro_gs_aspect_stretch">Venytä</string>
+    <string name="retro_gs_aspect_auto_standard">Automaattinen (vakio)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Näyttösuodatin</string>
+    <string name="retro_gs_filter_nearest">Lähin</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilineaarinen (pehmeä)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilineaarinen (terävä)</string>
+    <string name="retro_gs_texture_filter">Tekstuurisuodatin</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilineaarinen (pakotettu)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilineaarinen (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilineaarinen (spritet)</string>
+    <string name="retro_gs_blending_accuracy">Sekoituksen tarkkuus</string>
+    <string name="retro_gs_blend_minimum">Minimi</string>
+    <string name="retro_gs_blend_basic">Perus</string>
+    <string name="retro_gs_blend_medium">Keskitaso</string>
+    <string name="retro_gs_blend_high">Korkea</string>
+    <string name="retro_gs_blend_full">Täysi</string>
+    <string name="retro_gs_blend_maximum">Maksimi</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV -sävytin</string>
+    <string name="retro_gs_off">Pois</string>
+    <string name="retro_gs_tvshader_scanline">Juovat</string>
+    <string name="retro_gs_tvshader_diagonal">Vino</string>
+    <string name="retro_gs_tvshader_triangular">Kolmiomainen</string>
+    <string name="retro_gs_tvshader_wave">Aalto</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Ruutujen ohitus</string>
+    <string name="retro_gs_frameskip_1">Ohita 1</string>
+    <string name="retro_gs_frameskip_2">Ohita 2</string>
+    <string name="retro_gs_frameskip_3">Ohita 3</string>
+    <string name="retro_gs_mipmapping">Mipmap-tekstuurit</string>
+    <string name="retro_gs_group_performance">SUORITUSKYKY</string>
+    <string name="retro_gs_ee_cycle_rate">EE-syklinopeus</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (oletus)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE-syklien ohitus</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Välitön VU1</string>
+    <string name="retro_gs_mtvu">Monisäikeinen VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Nopea CDVD</string>
+    <string name="retro_gs_group_performance_hud">SUORITUSKYKY-HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emulointinopeus</string>
+    <string name="retro_gs_hud_cpu_usage">CPU-käyttö</string>
+    <string name="retro_gs_hud_gpu_usage">GPU-käyttö</string>
+    <string name="retro_gs_hud_internal_resolution">Sisäinen tarkkuus</string>
+    <string name="retro_gs_deinterlace_mode">Lomituksenpoistotila</string>
+    <string name="retro_gs_deint_auto">Automaattinen</string>
+    <string name="retro_gs_deint_off">Pois</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV-kuvasuhde</string>
+    <string name="retro_gs_anti_blur">Sumennuksen esto</string>
+    <string name="retro_gs_widescreen_patches">Laajakuvapaikkaukset</string>
+    <string name="retro_gs_no_interlace_patches">Lomituksenpoistopaikkaukset</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC-spin-tunnistus</string>
+    <string name="retro_gs_wait_loop">Odotussilmukan tunnistus</string>
+    <string name="retro_gs_time_stretch">Äänen aikavenytys</string>
+    <string name="retro_gs_audio_buffer">Äänipuskuri</string>
+    <string name="retro_gs_audio_latency">Lähtöviive</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Kuva-ajat</string>
+    <string name="retro_gs_hud_gs_stats">GS-tilastot</string>
+    <string name="retro_gs_hud_hw_info">Laitteistotiedot</string>
+    <string name="retro_gs_hud_version">Versio</string>
+    <string name="retro_gs_hud_input_display">Syötenäyttö</string>
+    <string name="retro_gs_fast_boot">Pikakäynnistys</string>
+    <string name="retro_gs_group_online_dev9">VERKKO (DEV9)</string>
+    <string name="retro_gs_enable_online">Ota verkko käyttöön</string>
+    <string name="retro_gs_ethernet_device">Ethernet-laite</string>
+    <string name="retro_gs_net_auto">Automaattinen</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS-tila</string>
+    <string name="retro_gs_dns_manual">Manuaalinen</string>
+    <string name="retro_gs_dns_internal">Sisäinen</string>
+    <string name="retro_gs_primary_dns">Ensisijainen DNS</string>
+    <string name="retro_gs_secondary_dns">Toissijainen DNS</string>
+    <string name="retro_gs_dns_optional">valinnainen</string>
+    <string name="retro_gs_auto_ip_dhcp">Automaattinen IP (DHCP)</string>
+    <string name="retro_gs_group_input">SYÖTE</string>
+    <string name="retro_engine_save">Tallenna</string>
+    <string name="retro_engine_saved">Peli tallennettu</string>
+    <string name="retro_engine_loading">Ladataan…</string>
+    <string name="retro_engine_load">Lataa</string>
+    <string name="retro_engine_saved_to">Tallennettu kohteeseen %1$s</string>
+    <string name="retro_engine_slot_active_only">Aktiivinen</string>
+    <string name="retro_engine_rename_slot">Nimeä tallennuspaikka uudelleen</string>
+    <string name="retro_engine_caught">%1$d napattu</string>
+    <string name="retro_engine_no_slots">Ei vielä tallennuspaikkoja</string>
+    <string name="retro_engine_new_slot">Uusi tallennuspaikka</string>
+    <string name="retro_engine_achievements_unavailable">Ei seurata 3D-tilassa</string>
+    <string name="retro_engine_fullscreen">Koko näyttö</string>
+    <string name="retro_engine_loaded_from">Ladattu %1$s</string>
+    <string name="retro_engine_slot_empty">Tuo tallennuspaikka on tyhjä</string>
+    <string name="retro_engine_loading_subtitle">Valmistellaan pelitietoja ensimmäistä kertaa</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Pelaa tätä peliä 3D-voxelmoottorilla vakioytimen sijaan</string>
+    <string name="retro_gs_on_screen_controls">Näytön ohjaimet</string>
+    <string name="retro_gs_haptic_feedback">Haptinen palaute</string>
+    <string name="retro_gs_group_audio">ÄÄNI</string>
+    <string name="retro_gs_volume">Äänenvoimakkuus</string>
+    <string name="retro_gs_mute">Mykistä</string>
+    <string name="retro_gs_swap_stereo">Vaihda stereokanavat</string>
+    <string name="retro_gs_sound">Ääni</string>
+    <string name="retro_scr_retro_defaults">RETRO-OLETUKSET</string>
+    <string name="retro_scr_retro_defaults_desc">Oletukset, joita sovelletaan kunkin konsolin peleihin, ellei niitä ohiteta pelin omissa asetuksissa.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Tili</string>
+    <string name="retro_scr_signed_in">Kirjautunut sisään</string>
+    <string name="retro_scr_not_signed_in_hint">Ei kirjautunut — avaa pelin Saavutukset kirjautuaksesi sisään</string>
+    <string name="retro_scr_achievements_enabled">Saavutukset käytössä</string>
+    <string name="retro_scr_hardcore_default">Hardcore-tila oletuksena (ei tallennustiloja)</string>
+    <string name="retro_scr_sign_out">Kirjaudu ulos</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">Asennettu</string>
+    <string name="retro_scr_none_ps1_bios">Ei mitään — PS1-pelit vaativat BIOSin</string>
+    <string name="retro_scr_import_ps1_bios">Tuo PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS poistettu</string>
+    <string name="retro_scr_no_bios_to_remove">Ei poistettavaa BIOSia</string>
+    <string name="retro_scr_remove_ps1_bios">Poista PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">Ei mitään — PS2-pelit vaativat BIOSin</string>
+    <string name="retro_scr_format">Muoto</string>
+    <string name="retro_scr_ps2_bios_format">Yhdistetty yhden tiedoston vedos (aluemerkitty .bin, ~4 Mt). Jaettuja ROM0/MEC/NVM-sarjoja ei hyväksytä.</string>
+    <string name="retro_scr_import_ps2_bios">Tuo PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS poistettu</string>
+    <string name="retro_scr_remove_ps2_bios">Poista PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">KIRJASTON KUVITUS</string>
+    <string name="retro_scr_retro_case_art">Retrokotelon kuvitus (kasetti / CD-kotelo)</string>
+    <string name="retro_scr_box_art">Kansikuva</string>
+    <string name="retro_scr_box_art_desc">Haetaan automaattisesti osoitteesta thumbnails.libretro.com tuonnin yhteydessä; mukautettu kuva ohittaa sen aina.</string>
+    <string name="retro_scr_roms_folder">ROM-KANSIO</string>
+    <string name="retro_scr_folder">Kansio</string>
+    <string name="retro_scr_roms_not_set">Ei asetettu — valitse kansio pelien automaattista tuontia varten</string>
+    <string name="retro_scr_auto_import">Automaattinen tuonti</string>
+    <string name="retro_scr_auto_import_desc">Tämän kansion uudet pelit lisätään kirjastoosi automaattisesti oikea konsoli tunnistettuna.</string>
+    <string name="retro_scr_select_roms_folder_title">Valitse ROM-kansio</string>
+    <string name="retro_scr_select_roms_folder_button">Valitse ROM-kansio…</string>
+    <string name="retro_scr_change_roms_folder_button">Vaihda ROM-kansio…</string>
+    <string name="retro_scr_scan_now">Skannaa nyt</string>
+    <string name="retro_scr_console_defaults">KONSOLIOLETUKSET</string>
+    <string name="retro_scr_console_defaults_desc">Napauta konsolia asettaaksesi sen oletusasetukset.</string>
+    <string name="retro_scr_renderer">Renderöijä</string>
+    <string name="retro_scr_upscale_resolution">Skaalaa tarkkuutta</string>
+    <string name="retro_scr_aspect_ratio">Kuvasuhde</string>
+    <string name="retro_scr_aspect_stretch">Venytä</string>
+    <string name="retro_scr_aspect_auto_standard">Automaattinen (vakio)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Näyttösuodatin</string>
+    <string name="retro_scr_filter_nearest">Lähin</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilineaarinen (pehmeä)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilineaarinen (terävä)</string>
+    <string name="retro_scr_texture_filter">Tekstuurisuodatin</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilineaarinen (pakotettu)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilineaarinen (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilineaarinen (spritet)</string>
+    <string name="retro_scr_blending_accuracy">Sekoituksen tarkkuus</string>
+    <string name="retro_scr_blend_minimum">Minimi</string>
+    <string name="retro_scr_blend_basic">Perus</string>
+    <string name="retro_scr_blend_medium">Keskitaso</string>
+    <string name="retro_scr_blend_high">Korkea</string>
+    <string name="retro_scr_blend_full">Täysi</string>
+    <string name="retro_scr_blend_maximum">Maksimi</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV -sävytin</string>
+    <string name="retro_scr_shader_off">Pois</string>
+    <string name="retro_scr_shader_scanline">Juovat</string>
+    <string name="retro_scr_shader_diagonal">Vino</string>
+    <string name="retro_scr_shader_triangular">Kolmiomainen</string>
+    <string name="retro_scr_shader_wave">Aalto</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Ruutujen ohitus</string>
+    <string name="retro_scr_skip_1">Ohita 1</string>
+    <string name="retro_scr_skip_2">Ohita 2</string>
+    <string name="retro_scr_skip_3">Ohita 3</string>
+    <string name="retro_scr_mipmapping">Mipmap-tekstuurit</string>
+    <string name="retro_scr_ee_cycle_rate">EE-syklinopeus</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (oletus)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE-syklien ohitus</string>
+    <string name="retro_scr_skip_off">Pois</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Välitön VU1</string>
+    <string name="retro_scr_mtvu">Monisäikeinen VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Nopea CDVD</string>
+    <string name="retro_scr_touch_controls">Näytön kosketusohjaimet</string>
+    <string name="retro_scr_sound">Ääni</string>
+    <string name="retro_scr_swap_stereo">Vaihda stereokanavat</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: emulointinopeus</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU-käyttö</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU-käyttö</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: sisäinen tarkkuus</string>
+    <string name="retro_scr_enable_online_dev9">Ota verkko käyttöön (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet-laite</string>
+    <string name="retro_scr_net_auto">Automaattinen</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS-tila</string>
+    <string name="retro_scr_dns_manual">Manuaalinen</string>
+    <string name="retro_scr_dns_internal">Sisäinen</string>
+    <string name="retro_scr_primary_dns">Ensisijainen DNS</string>
+    <string name="retro_scr_secondary_dns">Toissijainen DNS</string>
+    <string name="retro_scr_optional">valinnainen</string>
+    <string name="retro_scr_auto_ip_dhcp">Automaattinen IP (DHCP)</string>
+    <string name="retro_scr_shader">Sävytin</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR-skaalaus</string>
+    <string name="retro_scr_performance_hud">Suorituskyky-HUD</string>
+    <string name="retro_scr_credits_licenses">TEKIJÄT &amp; LISENSSIT</string>
+    <string name="retro_scr_credits_desc">Osa WinNativen ominaisuuksista perustuu näihin avoimen lähdekoodin projekteihin. Napauta nähdäksesi kunkin lähteen.</string>
+    <string name="retro_scr_tab_defaults">Oletukset</string>
+    <string name="retro_scr_tab_credits">Tekijät</string>
+    <string name="retro_scr_enable_hardcore_title">Otetaanko Hardcore-tila käyttöön?</string>
+    <string name="retro_scr_enable_hardcore_body">Hardcore-tila nollaa pelin nyt ja poistaa käytöstä tallennustilojen latauksen, pikakelauksen ja huijaukset. Kaikki tallentamaton edistyminen menetetään. Jatketaanko?</string>
+    <string name="retro_scr_cancel">Peruuta</string>
+    <string name="retro_scr_enable">Ota käyttöön</string>
+    <string name="retro_scr_bios_imported">BIOS tuotu: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Virheellinen BIOS-tiedosto</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS tuotu: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Virheellinen PS2 BIOS -tiedosto</string>
+    <string name="retro_scr_no_game_serial">Ei pelin sarjanumeroa, jolle etsiä huijauksia.</string>
+    <string name="retro_scr_applied_cheats">Otettiin käyttöön %1$d huijaus(ta).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Huijauksia ei voitu ottaa käyttöön.</string>
+    <string name="retro_scr_cheats">Huijaukset</string>
+    <string name="retro_scr_apply">Ota käyttöön</string>
+    <string name="retro_scr_no_cheats_found">Tälle pelille ei löytynyt huijauksia.</string>
+    <string name="retro_scr_achievements">Saavutukset</string>
+    <string name="retro_scr_sign_in_ra">Kirjaudu RetroAchievements-palveluun</string>
+    <string name="retro_scr_username">Käyttäjänimi</string>
+    <string name="retro_scr_password">Salasana</string>
+    <string name="retro_scr_login_failed">Kirjautuminen epäonnistui</string>
+    <string name="retro_scr_signing_in">Kirjaudutaan sisään…</string>
+    <string name="retro_scr_sign_in">Kirjaudu sisään</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pistettä</string>
+    <string name="retro_scr_no_achievements">Tälle pelille ei ole saavutuksia.</string>
+    <string name="retro_scr_back">Takaisin</string>
+    <string name="retro_scr_enabled">Käytössä</string>
+    <string name="retro_scr_disabled">Pois käytöstä</string>
+    <string name="retro_scr_rename">Nimeä uudelleen</string>
+    <string name="retro_scr_save">Tallenna</string>
+    <string name="retro_scr_cloud_save_conflict">Pilvitallennuksen ristiriita</string>
+    <string name="retro_scr_keep_local_save">Säilytä paikallinen tallennus</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Valikko</string>
+    <string name="retro_tab_display">Näyttö</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Ääni</string>
+    <string name="retro_tab_controls">Ohjaimet</string>
+    <string name="retro_scan_up_to_date">Kirjasto ajan tasalla</string>
+    <string name="retro_scan_roms">ROMit: %1$s</string>
+    <string name="retro_scan_added">lisätty %1$d</string>
+    <string name="retro_scan_removed">poistettu %1$d</string>
+    <string name="retro_scr_shader_default">Oletus</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Terävä</string>
+    <string name="retro_scr_upscale_native">Natiivi</string>
+    <string name="retro_co_aspect_ratio">Kuvasuhde</string>
+    <string name="retro_co_ntsc_filter">NTSC-suodatin</string>
+    <string name="retro_co_colorization">Värjäys</string>
+    <string name="retro_co_color_correction">Värikorjaus</string>
+    <string name="retro_co_remove_sprite_limit">Poista spriterajoitus</string>
+    <string name="retro_co_resolution">Tarkkuus</string>
+    <string name="retro_co_framebuffer_emulation">Framebuffer-emulointi</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Laajakuvahakkeri</string>
+    <string name="retro_co_val_8_7_native">8:7 (natiivi)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Pois</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Komposiitti</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Automaattinen</string>
+    <string name="retro_co_val_gba_screen">GBA-näyttö</string>
+    <string name="retro_co_val_gbc_screen">GBC-näyttö</string>
+    <string name="retro_co_val_on">Päällä</string>
+    <string name="retro_co_val_320x240_native">320x240 (natiivi)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 säädetty</string>
+    <string name="retro_co_val_native">Natiivi</string>
+    <string name="retro_co_val_internal">Sisäinen</string>
+    <string name="retro_co_val_on_16_9">Päällä (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Kirjaudu sisään RetroAchievements-tililläsi ansaitaksesi ja seurataksesi saavutuksia retropeleissä.</string>
+    <string name="retro_ach_username">Käyttäjänimi</string>
+    <string name="retro_ach_password">Salasana</string>
+    <string name="retro_ach_enter_credentials">Anna käyttäjänimesi ja salasanasi</string>
+    <string name="retro_ach_login_failed">Kirjautuminen epäonnistui</string>
+    <string name="retro_ach_sign_in">Kirjaudu sisään</string>
+    <string name="retro_ach_password_disclaimer">Salasanaasi käytetään vain kerran kirjautumistunnisteen hankkimiseen, joka tallennetaan turvallisesti laitteelle.</string>
+    <string name="retro_ach_achievements_enabled">Saavutukset käytössä</string>
+    <string name="retro_ach_hardcore_mode">Hardcore-tila (ei tallennustiloja)</string>
+    <string name="retro_ach_points">%1$d / %2$d pistettä</string>
+    <string name="retro_ach_none_found">Tälle pelille ei löytynyt saavutuksia.</string>
+    <string name="retro_ach_sign_out">Kirjaudu ulos</string>
+    <string name="retro_che_brand">HUIJAUKSET</string>
+    <string name="retro_che_name">Nimi</string>
+    <string name="retro_che_code">Koodi</string>
+    <string name="retro_che_cancel">Peruuta</string>
+    <string name="retro_che_save">Tallenna</string>
+    <string name="retro_che_default_name">Huijaus %1$d</string>
+    <string name="retro_che_empty">Ei vielä huijauksia. Lisää huijauskoodi tälle pelille.</string>
+    <string name="retro_che_add">Lisää huijaus</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU-ajuri</string>
+    <string name="retro_gpu_driver_system">Järjestelmä (Oletus)</string>
+    <string name="retro_gpu_driver_hint">Asenna Turnip-ajurit kohdasta Asetukset \u2192 Ajurit. Samat ajurit toimivat sekä PC- että PS2-peleissä.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Virtuaalinen sisäinen asema HDD-pohjaisille peleille, kuten Final Fantasy XI. Käynnistää pelin uudelleen.</string>
+    <string name="retro_ps2_hdd_desc">Virtuaalinen sisäinen asema HDD-pohjaisille peleille, kuten Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">DNS-tila asetettu Internal-tilaan, jotta mukautetut palvelinisännät tulevat voimaan.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">Suoritinydin</string>
+    <string name="retro_co_dual_core">Kaksoisydin</string>
+    <string name="retro_co_internal_cheats">Sisäiset huijaukset</string>
+    <string name="retro_co_internal_resolution">Sisäinen tarkkuus</string>
+    <string name="retro_co_renderer">Piirtomoottori</string>
+    <string name="retro_co_sensor_bar">Sensoripalkin sijainti</string>
+    <string name="retro_co_skip_gc_bios">Ohita BIOS-intro</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Alhaalla</string>
+    <string name="retro_co_val_cached_interpreter">Välimuistitettu tulkki</string>
+    <string name="retro_co_val_hardware">Laitteisto</string>
+    <string name="retro_co_val_interpreter">Tulkki</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Hiiri / kosketus</string>
+    <string name="retro_co_val_right_stick_absolute">Oikea sauva (absoluuttinen)</string>
+    <string name="retro_co_val_right_stick_relative">Oikea sauva (suhteellinen)</string>
+    <string name="retro_co_val_software">Ohjelmisto</string>
+    <string name="retro_co_val_stretch">Venytä</string>
+    <string name="retro_co_val_top">Ylhäällä</string>
+    <string name="retro_co_vbi_skip">VBI-ohitus (automaattinen ruutujen ohitus)</string>
+    <string name="retro_co_widescreen">Laajakuva</string>
+    <string name="retro_co_wiimote_pointer">Wiimote-osoitin</string>
+    <string name="retro_gs_cheats_apply_note">Muutokset tulevat voimaan, kun käynnistät tämän pelin seuraavan kerran.</string>
+    <string name="retro_gs_cheats_detect_hint">Käynnistä tämä peli kerran, jotta sen levyn sarjanumero voidaan tunnistaa, minkä jälkeen huijaukset ja korjaukset näkyvät tässä.</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS-todennuksen ohitus — vaaditaan verkkopeliin</string>
+    <string name="retro_gs_dnas_group">Automaattisesti käytössä (verkossa)</string>
+    <string name="retro_gs_group_cheats">Huijaukset &amp; korjaukset</string>
+    <string name="retro_gs_hdd_image_size">Koko: %1$s</string>
+    <string name="retro_gs_hdd_import">Tuo HDD-levykuva</string>
+    <string name="retro_gs_hdd_remove_short">Poista</string>
+    <string name="retro_gs_netplay_enable">Ota NetPlay käyttöön</string>
+    <string name="retro_gs_netplay_enable_subtitle">Oletuksena pois päältä. Ota käyttöön ja valitse sitten Isännöi tai Liity ennen käynnistystä.\nKytkeytyy taas pois, kun poistut pelistä.</string>
+    <string name="retro_gs_netplay_host">Isännän osoite</string>
+    <string name="retro_gs_netplay_host_hint">IP tai isäntänimi</string>
+    <string name="retro_gs_netplay_host_mode">Isännöi istuntoa</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">Päällä = odota pelaajaa. Pois = liity isännän osoitteeseen</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay käyttää paikallisen moninpelin portteja TCP:n kautta (pelaaja 1 isäntä / pelaaja 2 asiakas). PS2-verkkopeli käyttää sen sijaan DEV9-Ethernetiä.</string>
+    <string name="retro_gs_netplay_port">Portti</string>
+    <string name="retro_lr_memory_card_slot">Muistikortti %1$d</string>
+    <string name="retro_lr_screenshot">Kuvakaappaus</string>
+    <string name="retro_lr_use_cloud_save">Käytä pilvitallennusta</string>
+    <string name="retro_netplay_conn_direct">LAN (suora IP)</string>
+    <string name="retro_netplay_connecting">Yhdistetään…</string>
+    <string name="retro_netplay_connection">Yhteys</string>
+    <string name="retro_netplay_conn_traversal">Verkossa (isäntäkoodi)</string>
+    <string name="retro_netplay_dismiss">Hylkää</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii-NetPlay käyttää Dolphinin omaa moottoria. Isäntä = pelaaja 1, Liity = pelaaja 2. Valitse Isännöi tai Liity ja yhteystyyppi ennen käynnistystä; molemmat laitteet käynnistävät saman pelin yhdessä.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Jaa laitteesi Wi‑Fi-IP-osoite ja tämä portti pelaajan 2 kanssa. Peli alkaa automaattisesti, kun hän yhdistää.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">Isäntäkoodi näytetään, kun peli käynnistyy — jaa se pelaajan 2 kanssa. Peli alkaa automaattisesti, kun hän yhdistää.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Syötä isännän Wi‑Fi-IP-osoite ja portti, käynnistä sitten yhdistääksesi.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Syötä isäntäkoodi pelaajalta 1, käynnistä sitten yhdistääksesi.</string>
+    <string name="retro_netplay_enable_before_launch">Ota NetPlay käyttöön peliasetuksissa ja valitse Isännöi tai Liity ennen käynnistystä</string>
+    <string name="retro_netplay_find_rooms">Etsi huoneita Wi‑Fi-verkosta</string>
+    <string name="retro_netplay_game_link_hint">Game Link · jokainen näyttö on oma käsikonsolinsa</string>
+    <string name="retro_netplay_gba_not_ready">GBA-moninpeli käyttää gpSP:tä + langatonta sovitinta. Varmista, että libgpsp on asennettu.</string>
+    <string name="retro_netplay_help">Jaetun näytön moninpeli Wi‑Fi-verkossa (kuten RetroArch).\nIsäntä = pelaaja 1, Liity = pelaaja 2. Molemmat laitteet näyttävät saman pelin.</string>
+    <string name="retro_netplay_help_game_link">Game Link Wi‑Fi-verkossa — jokainen laite käyttää omaa peliään.\nGB/GBC: Gambatte-sarjalinkki (Pokémon Gen 1–2).\nGBA: gpSP langaton sovitin (Pokémon FR/LG/Emerald-taistelut).</string>
+    <string name="retro_netplay_host_action">Isännöi huonetta</string>
+    <string name="retro_netplay_host_code">Isäntäkoodi</string>
+    <string name="retro_netplay_host_code_hint">Traversal-isäntäkoodi isännältä</string>
+    <string name="retro_netplay_hosting_room">Isännöidään huonetta</string>
+    <string name="retro_netplay_host_mode_hint">Napauta Isännöi avataksesi huoneen tälle peli-istunnolle, käynnistä sitten peli. NetPlay kytkeytyy pois, kun poistut.</string>
+    <string name="retro_netplay_in_room">Huoneessa</string>
+    <string name="retro_netplay_join_action">Liity IP:n kautta</string>
+    <string name="retro_netplay_joined">Liittynyt</string>
+    <string name="retro_netplay_join_room">Liity</string>
+    <string name="retro_netplay_launch_mode">Käynnistettäessä</string>
+    <string name="retro_netplay_leave">Poistu</string>
+    <string name="retro_netplay_menu_hint">Isäntä = P1 · Liity = P2 · sama peli molemmilla näytöillä</string>
+    <string name="retro_netplay_mode_host">Isännöi</string>
+    <string name="retro_netplay_mode_join">Liity</string>
+    <string name="retro_netplay_mode_manual">Manuaalinen</string>
+    <string name="retro_netplay_no_rooms">Huoneita ei löytynyt. Varmista, että isäntä on samassa Wi‑Fi-verkossa ja isännöi huonetta.</string>
+    <string name="retro_netplay_player_name">Näyttönimi</string>
+    <string name="retro_netplay_player_name_hint">Näytetään muille pelaajille</string>
+    <string name="retro_netplay_players_count">%1$d yhdistetty</string>
+    <string name="retro_netplay_prelaunch_hint">Huone on avoinna vain tälle istunnolle. Käynnistä, kun olet valmis. Pelistä poistuminen kytkee NetPlayn pois.</string>
+    <string name="retro_netplay_room_players">Pelaajat</string>
+    <string name="retro_netplay_scan_action">Etsi Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Etsi uudelleen</string>
+    <string name="retro_netplay_scan_hint">Etsi avoimia huoneita samasta Wi‑Fi-verkosta tai liity IP-osoitteen kautta.</string>
+    <string name="retro_netplay_scanning">Etsitään Wi‑Fi-verkkoa…</string>
+    <string name="retro_netplay_scan_results">Hakutulokset</string>
+    <string name="retro_netplay_select_room_hint">Napauta huonetta liittyäksesi heti (ei tallenna IP-osoitetta seuraavaa käynnistystä varten).</string>
+    <string name="retro_netplay_stop_scan">Lopeta haku</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s yhdistetty</string>
+    <string name="retro_netplay_user_disconnected">%1$s katkaisi yhteyden</string>
+    <string name="retro_netplay_waiting_players">Odotetaan pelaajia…</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2 -tuki tulee pian</string>
+    <string name="retro_ps2_show_l3r3">Näytä L3-/R3-painikkeet</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Kun pois päältä, napauta sauvaa kahdesti painaaksesi L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">TURNIP-AJURIN LIPUT</string>
+    <string name="retro_ps2_turnip_flags_note">Käytetään vain, kun yllä on valittu mukautettu GPU-ajuri.</string>
+    <string name="retro_rom_missing">Pelitiedostoa ei löytynyt</string>
+    <string name="retro_scr_delete">Poista</string>
+    <string name="retro_scr_import_from_file">Tuo tiedostosta…</string>
+    <string name="retro_scr_loading">Ladataan…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Vaihda konsoli</string>
+    <string name="retro_gs_identify_as">Tunnista konsolina</string>
+    <string name="retro_gs_console_changed">Tunnistetaan nyt: %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Käytä ReShade-tehostetta (.fx) DXVK/VKD3D-peleissä (Vulkan) sisäänrakennetun vkBasalt-kerroksen kautta. Sijoita jokainen tehoste omaan kansioonsa polkuun Android/data/&lt;package&gt;/files/ReShade/. Reaaliaikainen parametrien säätö ja pelinsisäinen kytkin tulevat live-reload-kerroksen päivityksen myötä.</string>
+    <string name="reshade_catalog_title">ReShade-tehosteet</string>
+    <string name="reshade_catalog_search">Hae tehosteita…</string>
+    <string name="reshade_catalog_installed">Asennettu (%1$d)</string>
+    <string name="reshade_catalog_available">Saatavilla (%1$d)</string>
+    <string name="reshade_catalog_downloading">Ladataan</string>
+    <string name="reshade_catalog_installing">Asennetaan</string>
+    <string name="reshade_catalog_offline_cache">Offline — näytetään välimuistiin tallennettu luettelo. Muodosta yhteys ladataksesi uusia tehosteita.</string>
+    <string name="reshade_catalog_offline_none">Offline — näytetään vain asennetut tehosteet. Muodosta yhteys selataksesi luetteloa.</string>
+    <string name="reshade_catalog_needs_connection">Muodosta internetyhteys ladataksesi tehosteita.</string>
+    <string name="reshade_catalog_download_failed">Kohteen %1$s lataaminen epäonnistui.</string>
+    <string name="reshade_catalog_empty_query">Mikään tehoste ei vastaa hakua \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Ei tehosteita saatavilla. Muodosta internetyhteys selataksesi luetteloa.</string>
+    <string name="reshade_catalog_done">Valmis</string>
+    <string name="reshade_catalog_delete_cd">Poista %1$s</string>
+    <string name="reshade_catalog_delete_title">Poistetaanko %1$s?</string>
+    <string name="reshade_catalog_delete_body">Tämä poistaa tehosteen tallennustilasta ja kaikista kokoonpanoista, jotka käyttävät sitä. Voit ladata sen myöhemmin uudelleen.</string>
+    <string name="reshade_catalog_delete_confirm">Poista</string>
+    <string name="reshade_catalog_delete_cancel">Peruuta</string>
+    <string name="reshade_catalog_delete_failed">Kohteen %1$s poistaminen epäonnistui.</string>
+    <string name="reshade_params_title">TEHOSTEEN PARAMETRIT</string>
+    <string name="reshade_params_reset">Nollaa</string>
+    <string name="reshade_loadout_empty">Ei vielä tehosteita. Lisää yksi tai useampi tehoste luodaksesi kokoonpanon.</string>
+    <string name="reshade_loadout_add">Lisää tehoste</string>
+    <string name="reshade_loadout_full">Kokoonpano täynnä — poista tehoste lisätäksesi toisen.</string>
+    <string name="reshade_effect_active">aktiivinen</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pino</string>
+    <string name="reshade_mode_solo_hint">Yksi tehoste aktiivisena kerrallaan (A/B-vertailu, vaihda pelin aikana).</string>
+    <string name="reshade_mode_stack_hint">Kerrosta mikä tahansa tehosteiden osajoukko, käytetään järjestyksessä.</string>
+    <string name="reshade_drawer_enable">Ota ReShade käyttöön</string>
+    <string name="reshade_drawer_empty">Tässä kokoonpanossa ei ole ReShade-tehosteita. Lisää tehosteita tämän pelin asetuksissa (tai säiliön asetuksissa) vaihtaaksesi ja säätääksesi niitä täällä.</string>
+    <string name="reshade_drawer_no_params">Tällä tehosteella ei ole säädettäviä parametreja.</string>
+    <string name="cloud_saves_deleting">Poistetaan tallennusta…</string>
+    <string name="cloud_saves_history_delete">Poista</string>
+    <string name="cloud_saves_history_delete_confirm_body">Poistetaanko pilvitallennus lähteestä %1$s pysyvästi? Tätä ei voi kumota.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Poista pilvitallennus</string>
+    <string name="cloud_saves_history_delete_failed">Pilvitallennuksen poisto epäonnistui</string>
+    <string name="cloud_saves_history_delete_success">Pilvitallennus poistettu</string>
+    <string name="retro_bundle_required">Lataa ensin konsoliytimet — Asetukset › Retro</string>
+    <string name="retro_ps2_device_unsupported">Tämä laite ei pysty PS2-emulointiin — se vaatii OpenGL ES 3.1:n tai uudemman.</string>
+    <string name="retro_scr_consoles_check">Tarkista päivitykset</string>
+    <string name="retro_scr_consoles_checking">Tarkistetaan päivityksiä…</string>
+    <string name="retro_scr_consoles_download">Lataa konsoliytimet</string>
+    <string name="retro_scr_consoles_downloading">Ladataan… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Konsoliytimet</string>
+    <string name="retro_scr_consoles_installed">Asennettu — koontiversio %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Asennettu — koontiversio %1$s (päivitysten tarkistus epäonnistui)</string>
+    <string name="retro_scr_consoles_installing">Asennetaan…</string>
+    <string name="retro_scr_consoles_missing">Ei asennettu — lataa pelataksesi retropelejä</string>
+    <string name="retro_scr_consoles_state">Tila</string>
+    <string name="retro_scr_consoles_update">Päivitä konsoliytimet</string>
+    <string name="retro_scr_consoles_update_available">Päivitys saatavilla — koontiversio %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Vahvistetaan latausta…</string>
+    <string name="retro_scr_consoles_working">Käsitellään…</string>
+    <string name="retro_tab_system">Järjestelmä</string>
+</resources>
diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml
new file mode 100644
index 000000000..7c57102b0
--- /dev/null
+++ b/app/src/main/res/values-fr/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Image</item>
+        <item>Original</item>
+        <item>Couleur unie</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9ce9db95f..48f3da18a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Veuillez sélectionner un fichier .exe valide</string>
     <string name="common_ui_select_valid_icon_file">Veuillez sélectionner un fichier .ico ou .png valide.</string>
     <string name="common_ui_exit">Quitter</string>
+    <string name="common_ui_exit_app">Quitter l\'application</string>
     <string name="common_ui_profile">Profil</string>
     <string name="common_ui_name">Nom</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Icône</string>
     <string name="common_ui_duplicate">Dupliquer</string>
     <string name="common_ui_credits_and_third_party_apps">Crédits et applications tierces</string>
-    <string name="common_ui_loading">Chargement…</string>
+    <string name="common_ui_loading">Chargement</string>
+    <string name="common_ui_exporting">Exportation</string>
     <string name="common_ui_enable">Activer</string>
     <string name="common_ui_disable">Désactiver</string>
     <string name="common_ui_force">Forcer</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Hauteur</string>
     <string name="common_ui_open_file">Ouvrir un fichier</string>
     <string name="common_ui_download_file">Télécharger un fichier</string>
-    <string name="common_ui_downloading_file">Téléchargement du fichier...</string>
+    <string name="common_ui_downloading_file">Téléchargement du fichier</string>
     <string name="common_ui_browse">Parcourir</string>
     <string name="common_ui_options">Options</string>
     <string name="common_ui_export">Exporter</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Paramètres</string>
     <string name="common_ui_enable_all">Tout activer</string>
     <string name="common_ui_disable_all">Tout désactiver</string>
+    <string name="common_ui_select_all">Tout sélectionner</string>
+    <string name="common_ui_deselect_all">Tout désélectionner</string>
     <string name="common_ui_on">Activé</string>
     <string name="common_ui_off">Désactivé</string>
     <string name="common_ui_already_set">Déjà défini</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Installer</string>
     <string name="common_ui_application">Application</string>
     <string name="common_ui_check">Vérifier</string>
+    <string name="store_game_check_for_update">Rechercher une mise à jour</string>
+    <string name="store_game_checking_for_update">Vérification</string>
+    <string name="store_game_download_update">Télécharger la mise à jour</string>
+    <string name="store_game_no_update_available">Aucune mise à jour disponible</string>
+    <string name="store_game_update_available">Mise à jour disponible</string>
+    <string name="store_game_update_check_failed">Échec de la vérification des mises à jour</string>
+    <string name="store_game_update">Mettre à jour</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Vérifier les fichiers</string>
+    <string name="store_game_verify_started">Vérification de %1$s — consultez l\'onglet Téléchargements</string>
+    <string name="store_game_steam_options">Options Steam</string>
+    <string name="store_game_verify_complete">Vérification des fichiers terminée</string>
+    <string name="store_game_verify_failed_notice">Échec de la vérification des fichiers</string>
+    <string name="store_game_progress_background_hint">Vous pouvez fermer ceci — cela continue en arrière-plan. Consultez l\'onglet Téléchargements à tout moment.</string>
+    <string name="store_game_checking_updates">Recherche de mises à jour</string>
+    <string name="store_game_no_updates_notice">Aucune mise à jour disponible</string>
+    <string name="store_game_update_complete">Mise à jour terminée</string>
+    <string name="store_game_update_failed_notice">Échec de la mise à jour</string>
+    <string name="store_game_update_check_failed_notice">Échec de la recherche de mise à jour</string>
+    <string name="store_game_download_already_active">Ce jeu est déjà en cours de téléchargement. Annulez le téléchargement actuel avant d\'ajouter du DLC.</string>
     <string name="common_ui_select">Sélectionner</string>
     <string name="common_ui_select_folder">Sélectionner un dossier</string>
     <string name="common_ui_current_folder">Dossier actuel</string>
+    <string name="common_ui_enter_path">Saisir le chemin</string>
+    <string name="common_ui_path_not_found">Chemin introuvable</string>
     <string name="common_ui_storage_roots">Emplacements de stockage</string>
     <string name="common_ui_browse_local_folders_directly">Parcourir directement les dossiers locaux</string>
     <string name="common_ui_no_folders_available_here">Aucun dossier disponible ici</string>
     <string name="common_ui_grant_all_files_access_browse">Accordez l\'accès complet aux fichiers pour parcourir directement les dossiers locaux.</string>
     <string name="common_ui_not_configured">Non configuré</string>
     <string name="common_ui_reinstall">Réinstaller</string>
-    <string name="common_ui_exit_app_confirm">Quitter WinNative ?</string>
     <string name="common_ui_elements_count">%1$d éléments</string>
     <string name="common_ui_disabled_placeholder">-- Désactivé --</string>
     <string name="common_ui_enabled">Activé</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Récupérer les illustrations</string>
+    <string name="library_games_scraping_artwork">Récupération</string>
     <string name="library_games_shortcut_created">Raccourci créé</string>
     <string name="library_games_failed_to_create_shortcut">Échec de la création du raccourci : %s</string>
     <string name="library_games_install_path">Chemin d\'installation</string>
+    <string name="library_games_not_enough_space">Il faut %1$s d\'espace en plus</string>
     <string name="library_games_download_slash_install">Télécharger / Installer</string>
     <string name="library_games_save_management">GESTION DES SAUVEGARDES</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Disponible : %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">Aucun jeu installé\nCliquez pour ouvrir le backend Winlator</string>
     <string name="library_games_installed_badge">INSTALLÉ</string>
     <string name="library_games_unknown_game">Jeu inconnu</string>
-    <string name="library_games_layouts_header">DISPOSITIONS</string>
+    <string name="library_games_layouts_header">DISPOSITIONS DE LA BIBLIOTHÈQUE</string>
     <string name="library_games_layout_carousel">Carrousel</string>
     <string name="library_games_layout_list">Liste</string>
+    <string name="library_games_view_options_header">OPTIONS D’AFFICHAGE</string>
+    <string name="library_games_immersive_mode">Mode immersif</string>
+    <string name="library_games_immersive_mode_description">Utiliser l’illustration du jeu sélectionné comme arrière-plan</string>
+    <string name="library_games_immersive_blur">Flouter l’arrière-plan</string>
+    <string name="library_games_immersive_blur_description">Appliquer un effet de flou à l’arrière-plan immersif</string>
     <string name="library_games_custom_game">Jeu personnalisé</string>
     <string name="library_games_play">Jouer</string>
+    <string name="hero_boot_to_desktop_title">Démarrer sur le bureau</string>
+    <string name="hero_graphics_tests_title">Tests graphiques</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Tests d\'entrée</string>
     <string name="library_games_add_custom_game">Ajouter un jeu personnalisé</string>
     <string name="library_games_game_name">Nom du jeu</string>
     <string name="library_games_game_folder_mapped_drive">Dossier du jeu (lecteur de jeu mappé)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Annulé</string>
     <string name="downloads_queue_phase_failed">Échec : %1$s</string>
     <string name="downloads_queue_cancel_download">Annuler le téléchargement</string>
+    <string name="downloads_queue_cancel_download_title">Annuler le téléchargement ?</string>
+    <string name="downloads_queue_cancel_download_warning">Annuler le téléchargement d\'un DLC, d\'un jeu ou d\'une mise à jour peut potentiellement corrompre l\'installation du jeu.\n\nVoulez-vous vraiment annuler ?</string>
     <string name="downloads_queue_empty">Aucun téléchargement actif.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Nouveau conteneur</string>
     <string name="containers_list_edit">Modifier le conteneur</string>
-    <string name="containers_list_creating">Création du conteneur…</string>
-    <string name="containers_list_removing">Suppression du conteneur…</string>
-    <string name="containers_list_duplicating">Duplication du conteneur…</string>
+    <string name="containers_list_creating">Création du conteneur</string>
+    <string name="containers_list_removing">Suppression du conteneur</string>
+    <string name="containers_list_duplicating">Duplication du conteneur</string>
+    <string name="containers_list_remove_title">Supprimer le conteneur</string>
+    <string name="containers_list_duplicate_title">Dupliquer le conteneur</string>
     <string name="containers_list_confirm_remove">Voulez-vous supprimer ce conteneur ?</string>
     <string name="containers_list_confirm_duplicate">Voulez-vous dupliquer ce conteneur ?</string>
+    <string name="containers_list_duplicate_failed">Échec de la duplication du conteneur</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Voulez-vous supprimer ce raccourci ?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Échec du clonage du raccourci.</string>
     <string name="shortcuts_list_exported_to">Raccourci exporté vers %1$s</string>
     <string name="shortcuts_list_failed_export">Échec de l\'exportation du raccourci</string>
+    <string name="shortcuts_export_all">Tout exporter</string>
+    <string name="shortcuts_export_to_frontend">Exporter vers le frontend</string>
+    <string name="shortcuts_export_all_done">%1$d jeux exportés vers %2$s</string>
+    <string name="shortcuts_export_all_none">Aucun jeu à exporter</string>
     <string name="shortcuts_list_added">Raccourci ajouté avec succès.</string>
     <string name="shortcuts_list_failed_add">Échec de l\'ajout du raccourci.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Désactiver Xinput (pour contrôle exclusif clavier/souris)</string>
     <string name="shortcuts_properties_exclusive_input">Entrée exclusive</string>
     <string name="shortcuts_properties_custom_game_settings">Paramètres de jeu personnalisés</string>
-    <string name="shortcuts_properties_use_cold_client">Utiliser ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient est la méthode préférée pour gérer l\'émulation Steam et le DRM. Il corrige le DRM au moment de l\'exécution sans modifier les fichiers du jeu.</string>
-    <string name="shortcuts_properties_unpack_files">DRM hérité</string>
-    <string name="shortcuts_properties_unpack_files_description">Supprime le DRM SteamStub de l\'exe sur le disque. À activer uniquement si le jeu ne se lance pas sans. Le patcheur runtime de ColdClient gère la plupart des jeux automatiquement.</string>
-    <string name="shortcuts_properties_force_dlc">Forcer les DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Activez uniquement si les DLC ne sont pas détectés ou si les sauvegardes avec DLC ne fonctionnent pas</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Lancer le client Steam (bêta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Lance le vrai client Steam dans Wine\nNécessite un compte Steam et peut réduire les performances\nTous les jeux ne fonctionnent pas</string>
-    <string name="shortcuts_properties_steam_type">Performance du client Steam</string>
-    <string name="steam_section_emulator">Émulateur Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Vrai client Steam</string>
     <string name="shortcuts_properties_use_steam_input">Utiliser Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Mode hors ligne Steam</string>
     <string name="shortcuts_properties_reset">Réinitialiser les propriétés</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Voulez-vous dupliquer ce profil ?</string>
     <string name="input_controls_editor_title">Éditeur de contrôles</string>
     <string name="input_controls_editor_toggle_switch">Interrupteur à bascule</string>
+    <string name="input_controls_editor_swipeable">Activation par glissement</string>
     <string name="input_controls_editor_profile_exported_to">Profil exporté vers</string>
     <string name="input_controls_editor_unable_to_import">Impossible d\'importer le profil</string>
     <string name="input_controls_editor_import_profile">Importer un profil</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Compatibilité</string>
     <string name="container_box64_intermediate">Intermédiaire</string>
     <string name="container_box64_performance">Performance</string>
+    <string name="container_fexcore_performance_tso">Performance TSO</string>
+    <string name="container_fexcore_extreme">Extrême</string>
+    <string name="container_fexcore_extreme_tso">Extrême TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Gestion des drapeaux sur les opcodes CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Traite CALL/RET comme s\'ils n\'avaient jamais besoin de drapeaux (plus rapide, instable)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Préréglage FEXCore</string>
     <string name="container_fexcore_version">Version de FEXCore</string>
+    <string name="use_unix_libs">Utiliser les UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Pilote graphique</string>
+    <string name="container_zink_mode">Mode Zink</string>
+    <string name="container_graphics_transcoder">Transcodeur BCn</string>
+    <string name="container_graphics_quality">Qualité BCn</string>
     <string name="container_graphics_configuration">Configuration du pilote graphique</string>
     <string name="container_graphics_version">Version du pilote graphique</string>
     <string name="container_graphics_available_extensions">Extensions disponibles</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">Émulation BCn</string>
     <string name="container_graphics_bcn_emulation_type">Type d\'émulation BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Cache d\'émulation BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Super résolution de jeu 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Netteté des bords</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Voulez-vous dupliquer ce préréglage ?</string>
     <string name="container_presets_confirm_remove">Voulez-vous supprimer ce préréglage ?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Utiliser l\'extension DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Simuler un écran tactile</string>
     <string name="session_xserver_preferences_button_text">   PRÉFÉRENCES   </string>
     <string name="session_xserver_extra_keys_config_desc">Ici vous pouvez définir la valeur de la variable extra-keys comme dans l\'application Termux (lire <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">ceci</a>) et plus encore \n
@@ -526,12 +572,6 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="session_xserver_pref_kbd">Clavier</string>
     <string name="session_xserver_pref_other">Autre</string>
     <string name="session_xserver_pref_version">Version</string>
-    <string name="session_xserver_use_dri3_description">Désactiver peut corriger des artefacts graphiques sur certains appareils</string>
-    <string name="session_xserver_native_rendering">Rendu natif</string>
-    <string name="session_xserver_native_rendering_enabled">Rendu matériel DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Repli logiciel WSI</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Rendu natif activé (prend effet au prochain lancement)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Rendu natif désactivé (prend effet au prochain lancement)</string>
     <string name="session_xserver_notification_description">Messages XServer de WinNative</string>
     <string name="session_xserver_notification_content">WinNative est en cours d\'exécution, ne supprimez pas et ne balayez pas cette notification</string>
 
@@ -551,6 +591,8 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="session_drawer_exit_subtitle">Fermer la session en cours</string>
     <string name="session_drawer_touchscreen_overlay">Surcouche tactile</string>
     <string name="session_drawer_resume">Reprendre</string>
+    <string name="session_drawer_retry">Réessayer</string>
+    <string name="downloads_no_internet">Pas de connexion Internet</string>
     <string name="session_drawer_pause">Pause</string>
     <string name="session_drawer_wine_processes_paused">Les processus Wine sont en pause</string>
     <string name="session_drawer_pause_all_wine_processes">Mettre en pause tous les processus Wine</string>
@@ -561,6 +603,33 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Batt.</string>
     <string name="session_drawer_hud_element_graph">Graphe</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD style Mango</string>
+    <string name="session_drawer_hud_mango_settings">Paramètres du HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Charge GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. GPU</string>
+    <string name="mango_hud_element_cpu_load">Charge CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batterie</string>
+    <string name="mango_hud_element_lows" formatted="false">1 % bas</string>
+    <string name="mango_hud_element_graph">Graphique de frametime</string>
+    <string name="mango_hud_element_engine">Moteur</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Fréquence CPU</string>
+    <string name="mango_hud_element_gpu_clock">Fréquence GPU</string>
+    <string name="mango_hud_element_cores">Par cœur</string>
+    <string name="mango_hud_element_network">Réseau</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Résolution</string>
+    <string name="mango_hud_element_wine">Version de Wine</string>
+    <string name="mango_hud_element_duration">Durée de session</string>
+    <string name="mango_hud_element_clock">Horloge</string>
+    <string name="mango_hud_element_throttle">État thermique</string>
+    <string name="mango_hud_group_memory">Mémoire</string>
+    <string name="mango_hud_group_system">Système</string>
+    <string name="mango_hud_lock">Verrouiller le HUD</string>
+    <string name="mango_hud_lock_subtitle">Laisse passer les touches vers les commandes derrière le HUD. Maintenez le HUD pour le verrouiller. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Voulez-vous terminer ce processus ?</string>
@@ -591,6 +660,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="session_display_frame_rate">Fréquence d\'images</string>
     <string name="session_display_title">Affichage</string>
     <string name="session_display_fullscreen_stretched">Activer le plein écran (étiré)</string>
+    <string name="session_display_direct_composition">Composition directe (zéro copie)</string>
     <string name="session_display_fps_label">FPS :</string>
     <string name="session_display_renderer_label">Moteur de rendu :</string>
     <string name="session_display_gpu_label">GPU :</string>
@@ -664,6 +734,9 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="session_gamepad_error_loading_profile">Erreur lors du chargement du profil</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Commandes tactiles</string>
+    <string name="input_controls_auto_hide_on_controller_title">Masquer automatiquement avec une manette</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Masquer les commandes tactiles lorsqu\'une manette est connectée</string>
     <string name="session_gyroscope_title">Gyroscope</string>
     <string name="session_gyroscope_calibrate">Calibrer le gyroscope</string>
     <string name="session_gyroscope_enable_right_stick">Activer le mouvement gyroscopique du stick droit</string>
@@ -700,6 +773,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_general_select_wallpaper">Sélectionner le fond d\'écran</string>
     <string name="settings_general_title">Général</string>
     <string name="settings_general_enable_file_provider">Activer le fournisseur de fichiers</string>
+    <string name="settings_general_enable_auto_scraping">Activer la récupération automatique</string>
     <string name="settings_general_take_effect_next_startup">Cette option prendra effet au prochain démarrage.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Réinstaller Imagefs</string>
@@ -713,7 +787,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_general_share_android_clipboard">Partager le presse-papiers Android avec Wine</string>
     <string name="settings_general_paths_title">Paramètres des chemins</string>
     <string name="settings_general_paths_summary">Gérer l\'emplacement des données de travail de Winlator et l\'emplacement d\'exportation des raccourcis.</string>
-    <string name="settings_general_winlator_path_title">Chemin de Winlator</string>
+    <string name="settings_general_winlator_path_title">Chemin de stockage</string>
     <string name="settings_general_shortcut_export_path_title">Chemin d\'exportation des raccourcis</string>
     <string name="settings_general_choose_path">Choisir un chemin</string>
     <string name="settings_general_xserver_cursor_summary">Ajuster la vitesse du pointeur pour la saisie tactile, le trackpad et la souris dans la session XServer.</string>
@@ -721,7 +795,9 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_general_cursor_lock_summary">Maintient la capture directe de la souris activée pour les jeux nécessitant une saisie brute du pointeur. Désactivez avec Volume Bas.</string>
     <string name="settings_general_xinput_toggle_title">Désactiver XInput</string>
     <string name="settings_general_xinput_toggle_summary">Désactive la gestion XInput lorsque vous souhaitez un contrôle exclusif au clavier et à la souris.</string>
-    <string name="settings_general_file_provider_summary">Exposer les fichiers de Winlator aux sélecteurs de documents et gestionnaires de fichiers Android.</string>
+    <string name="settings_external_display_output_summary">Déplace le jeu vers un écran externe connecté au lieu de dupliquer cet écran. Les lunettes utilisent toujours leur propre écran.</string>
+    <string name="settings_general_file_provider_summary">Exposer les fichiers de WinNative aux sélecteurs de documents et gestionnaires de fichiers Android.</string>
+    <string name="settings_general_auto_scraping_summary">Permet à WinNative de récupérer automatiquement les illustrations des jeux personnalisés.</string>
     <string name="settings_general_open_browser_summary">Ouvrir les liens web pris en charge dans le navigateur Android au lieu de les ouvrir dans Wine.</string>
     <string name="settings_general_clipboard_summary">Permettre le copier-coller entre Android et les sessions Wine.</string>
     <string name="settings_general_imagefs_summary">Restaurer les fichiers système fournis sans supprimer vos conteneurs existants.</string>
@@ -736,7 +812,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Échec de l\'installation de la police sonore !</string>
     <string name="settings_audio_sound_font_already_exist">La police sonore que vous souhaitez installer existe déjà.</string>
     <string name="settings_audio_unable_to_install_soundfont">Impossible d\'installer la police sonore</string>
-    <string name="settings_audio_installing_soundfont">Installation de la SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Installation de la SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Format de SoundFont invalide.</string>
     <string name="settings_audio_cannot_remove_default">Impossible de supprimer la police sonore par défaut</string>
     <string name="settings_audio_summary">Installer, supprimer et choisir la SoundFont utilisée pour la lecture MIDI.</string>
@@ -750,15 +826,33 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_debug_box_logs_subtitle">Écrire la sortie de débogage Box86 &amp; Box64 dans un fichier</string>
     <string name="settings_debug_fex_logs_title">Activer les journaux FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Écrire la sortie de débogage FEXCore dans un fichier</string>
+    <string name="settings_debug_emulator_logs_title">Journaux d\'émulation Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Journalise dans un fichier l\'émulateur utilisé par votre conteneur.</string>
     <string name="settings_debug_steam_logs_title">Activer les journaux Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Journaliser les événements d\'authentification et de session Steam pour le débogage.</string>
     <string name="settings_debug_wine_channels_title">Canaux de débogage Wine</string>
     <string name="settings_debug_wine_channels_summary">Choisir les canaux Wine inclus lorsque la journalisation de débogage Wine est activée.</string>
+    <string name="settings_debug_wine_classes_title">Niveaux de journalisation Wine</string>
+    <string name="settings_debug_wine_classes_summary">Choisissez les types de messages journalisés. Trace est extrêmement verbeux.</string>
     <string name="settings_debug_input_logs">Journaux de saisie</string>
     <string name="settings_debug_input_logs_description">Journaliser les événements de saisie manette, tactile et clavier</string>
     <string name="settings_debug_download_logs">Journaux de téléchargement</string>
     <string name="settings_debug_download_logs_description">Journaliser les événements du résolveur de téléchargement et du repli WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Couches de validation Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Redémarrez l\'affichage pour appliquer.</string>
     <string name="settings_debug_share_logs">Partager les journaux</string>
+    <string name="settings_debug_delete_logs">Supprimer les journaux</string>
+    <string name="settings_debug_share_all_logs_short">Tout partager</string>
+    <string name="settings_debug_download_all_logs_short">Tout télécharger</string>
+    <string name="settings_debug_logs_saved">Enregistré dans %1$s</string>
+    <string name="settings_debug_delete_logs_short">Supprimer</string>
+    <string name="settings_debug_delete_all_logs_short">Tout supprimer</string>
+    <string name="settings_debug_open_logs_folder_short">Ouvrir le gestionnaire des journaux</string>
+    <string name="settings_debug_logs_deleted">Journaux supprimés</string>
+    <string name="settings_debug_delete_logs_confirm_title">Supprimer les journaux ?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Cela supprime définitivement tous les fichiers journaux enregistrés (%1$s). Cette action est irréversible.</string>
+    <string name="settings_debug_logs_browser_title">Journaux</string>
+    <string name="settings_debug_log_truncated">Affichage des derniers %1$s de ce journal</string>
     <string name="settings_debug_logs_subject">Journaux WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">Aucun journal de débogage disponible. Activez d\'abord les options de débogage puis lancez un jeu.</string>
     <string name="settings_debug_capture_failed">Échec de la capture des journaux : %1$s</string>
@@ -773,6 +867,8 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
 
     <string name="settings_other_language_title">Langue</string>
     <string name="settings_other_language_summary">Choisir la langue d\'affichage</string>
+    <string name="settings_other_game_language_title">Langue du jeu</string>
+    <string name="settings_other_game_language_summary">Langue préférée pour les téléchargements Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">Paramètre système</string>
 
     <string name="settings_other_section_integration">Intégration</string>
@@ -790,7 +886,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_content_empty_subtitle">Installez un paquet ou changez de type pour commencer.</string>
     <string name="settings_content_container_created">Conteneur créé : %1$s</string>
     <string name="settings_content_download_failed">Échec du téléchargement.</string>
-    <string name="common_ui_working">En cours…</string>
+    <string name="common_ui_working">En cours</string>
     <string name="settings_content_desc_wine">Créé par le projet Wine ; traduit les appels Win32 vers des services Linux/Android natifs.</string>
     <string name="settings_content_desc_proton">Créé par Valve ; runtime basé sur Wine avec des correctifs pour les jeux Windows.</string>
     <string name="settings_content_desc_dxvk">Traduit les appels graphiques Direct3D 9, 10 et 11 vers Vulkan.</string>
@@ -798,6 +894,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_content_desc_box64">Traduit le code Linux x86_64 pour l’exécuter sur des appareils ARM64.</string>
     <string name="settings_content_desc_wowbox64">Build Box64 utilisé par WoW64 pour exécuter des apps Windows 32 bits dans Wine 64 bits.</string>
     <string name="settings_content_desc_fexcore">Traduit le code x86 et x86_64 pour l’exécuter sur des appareils ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduit les appels graphiques DirectDraw (Direct3D 7 et antérieurs) vers Vulkan.</string>
     <string name="settings_content_unable_to_install">Impossible d\'installer le contenu.</string>
     <string name="settings_content_install_failed">Échec de l\'installation</string>
     <string name="settings_content_file_cannot_be_recognized">Le fichier ne peut pas être reconnu.</string>
@@ -809,9 +906,14 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="settings_content_downloading_title">Téléchargement du contenu</string>
     <string name="settings_content_installing_title">Installation du contenu</string>
     <string name="settings_content_extracting_title">Extraction du contenu</string>
-    <string name="settings_content_extracting_detail">Extraction… (%1$d fichiers)</string>
-    <string name="settings_content_preparing_package">Préparation du paquet…</string>
+    <string name="settings_content_extracting_detail">Extraction (%1$d fichiers)</string>
+    <string name="settings_content_preparing_package">Préparation du paquet</string>
     <string name="settings_content_download_complete">Téléchargement terminé</string>
+    <string name="settings_content_already_installed_title">Composant déjà installé</string>
+    <string name="settings_content_already_installed_message">Ce composant est déjà installé. Supprimez la copie installée avant de le télécharger à nouveau.
+
+Chemin installé :
+%1$s</string>
     <string name="settings_content_conflicting_title">Contenu en conflit installé</string>
     <string name="settings_content_conflicting_message">Veuillez désinstaller le contenu en conflit avant de télécharger ce paquet.
 
@@ -820,7 +922,7 @@ Chemin installé :
     <string name="settings_content_cannot_be_trusted">Le contenu ne peut pas être vérifié.</string>
     <string name="settings_content_is_incomplete">Le contenu est incomplet.</string>
     <string name="settings_content_untrusted_files_warning">Avertissement : le contenu additionnel contient des fichiers non vérifiés. En général, les fichiers suivants ne devraient pas être modifiés. Veuillez décider si vous souhaitez poursuivre l\'installation.</string>
-    <string name="settings_content_confirm_remove">Voulez-vous supprimer ce contenu ?</string>
+    <string name="settings_content_confirm_remove">Cette action supprimera le composant de votre appareil.</string>
     <string name="settings_content_unable_to_remove_in_use">Impossible de supprimer ce contenu, car un conteneur utilise actuellement cette version de Wine.</string>
     <string name="settings_content_download_in_components">Aucun téléchargé. Veuillez en télécharger un dans Composants.</string>
     <string name="settings_content_types_header">TYPES DE CONTENU</string>
@@ -832,9 +934,12 @@ Chemin installé :
     <string name="settings_drivers_install">Installer des pilotes</string>
     <string name="settings_drivers_installed_success">Pilote installé avec succès.</string>
     <string name="settings_drivers_install_failed">Échec de l\'installation du pilote.</string>
-    <string name="settings_drivers_confirm_remove">Voulez-vous supprimer ce pilote ?</string>
+    <string name="settings_drivers_remove_title">Supprimer le pilote ?</string>
+    <string name="settings_drivers_confirm_remove">Cette action supprimera le pilote de votre appareil.</string>
+    <string name="settings_drivers_remove_repo_title">Supprimer le dépôt ?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s sera retiré de votre liste de dépôts.</string>
     <string name="settings_drivers_repo_tap_to_load">Appuyez pour charger les versions</string>
-    <string name="settings_drivers_repo_loading_releases">Chargement des versions…</string>
+    <string name="settings_drivers_repo_loading_releases">Chargement des versions</string>
     <string name="settings_drivers_repo_release_count">%1$d versions chargées</string>
     <string name="settings_drivers_repo_no_release_assets">Aucun fichier ZIP téléchargeable n\'a été trouvé dans les versions récupérées.</string>
     <string name="settings_drivers_repo_fetch_failed">Impossible de charger les versions GitHub.</string>
@@ -844,7 +949,7 @@ Chemin installé :
     <string name="settings_drivers_manager">Gestionnaire de pilotes</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Installation des fichiers système…</string>
+    <string name="setup_wizard_installing_system_files">Installation des fichiers système</string>
     <string name="setup_wizard_unable_to_install_system_files">Impossible d\'installer les fichiers système</string>
     <string name="setup_wizard_system_image_not_installed">Image système non installée. Veuillez d\'abord installer les composants.</string>
     <string name="setup_wizard_recommended_components">Composants recommandés</string>
@@ -913,6 +1018,9 @@ Chemin installé :
     <string name="google_cloud_sync_started">Synchronisation cloud démarrée.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Services Google</string>
+    <string name="google_auto_signin_title">Se connecter à Google au démarrage</string>
+    <string name="google_auto_signin_summary">Se connecter automatiquement à Google Play Jeux au démarrage de l\'application afin que les sauvegardes et la synchronisation soient toujours prêtes. Lorsque l\'option est désactivée, l\'application ne se connecte jamais d\'elle-même.</string>
+    <string name="google_auto_signin_section">Au démarrage</string>
     <string name="google_cloud_play_games">Google Play Jeux</string>
     <string name="google_cloud_status_syncing">Synchronisation</string>
     <string name="google_cloud_status_connected">Connecté</string>
@@ -971,22 +1079,30 @@ Chemin installé :
     <string name="saves_import_export_exported_failed">Échec de l\'exportation des sauvegardes : %1$s</string>
     <string name="saves_import_export_imported">Sauvegardes importées avec succès</string>
     <string name="saves_import_export_imported_failed">Échec de l\'importation des sauvegardes : %1$s</string>
+    <string name="saves_export_path_summary">Les sauvegardes seront exportées vers /WinNative/saves</string>
+    <string name="saves_export_success_path">Exporté vers %1$s</string>
+    <string name="saves_export_warning_title">À utiliser uniquement avec les jeux personnalisés</string>
+    <string name="saves_export_warning_body">Les sauvegardes exportées peuvent inclure celles de jeux installés depuis une boutique ou synchronisés avec le cloud.</string>
+    <string name="saves_import_warning_title">Cette action écrasera les sauvegardes existantes dans ce conteneur</string>
+    <string name="saves_import_warning_body">Pour restaurer une ancienne sauvegarde contenant plusieurs jeux, copiez au préalable les sauvegardes plus récentes dans le fichier zip avec votre gestionnaire de fichiers. Seules les sauvegardes présentes dans le fichier .zip seront affectées. Gérez vos sauvegardes avec soin.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Conteneur</string>
-    <string name="preloader_initializing">Initialisation…</string>
-    <string name="preloader_launching">Lancement…</string>
-    <string name="preloader_closing">Fermeture de %1$s…</string>
-    <string name="preloader_setup_environment">Configuration de l\'environnement…</string>
-    <string name="preloader_installing_mono">Installation de Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Installation des redistribuables…</string>
-    <string name="preloader_unpacking_exe">Extraction de l\'exécutable du jeu…</string>
-    <string name="preloader_downloading_cloud">Téléchargement des sauvegardes cloud…</string>
-    <string name="preloader_syncing_cloud">Synchronisation des sauvegardes cloud…</string>
-    <string name="preloader_cloud_downloading">Téléchargement Cloud Sync…</string>
-    <string name="preloader_cloud_backup">Sauvegarde vers Google Drive…</string>
+    <string name="preloader_initializing">Initialisation</string>
+    <string name="preloader_launching">Lancement</string>
+    <string name="preloader_closing">Fermeture de %1$s</string>
+    <string name="preloader_setup_environment">Configuration de l\'environnement</string>
+    <string name="preloader_retrying_steam_client_download">Nouvelle tentative de téléchargement du client Steam</string>
+    <string name="preloader_installing_mono">Installation de Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Installation des redistribuables</string>
+    <string name="preloader_unpacking_exe">Extraction de l\'exécutable du jeu</string>
+    <string name="preloader_downloading_cloud">Téléchargement des sauvegardes cloud</string>
+    <string name="preloader_syncing_cloud">Synchronisation des sauvegardes cloud</string>
+    <string name="preloader_uploading_cloud">Téléversement des sauvegardes cloud</string>
+    <string name="preloader_checking_cloud">Vérification des sauvegardes cloud</string>
+    <string name="preloader_cloud_sync_retry">%1$s Nouvelle tentative %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Téléchargement Cloud Sync</string>
     <string name="cloud_sync_failed_provider">Synchronisation cloud %1$s échouée.</string>
-    <string name="google_cloud_backup_failed">Sauvegarde Google Drive échouée.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Chemin installé :
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Graphismes</string>
-    <string name="container_backups_title">Sauvegardes</string>
-    <string name="container_backups_prompt">Choisissez une action pour cette sauvegarde de conteneur.</string>
-    <string name="container_backups_backing_up">Sauvegarde du conteneur…</string>
-    <string name="container_backups_restoring">Restauration du conteneur…</string>
-    <string name="container_backups_checking">Vérification des sauvegardes du conteneur…</string>
-    <string name="container_backups_select_title">Sélectionner une sauvegarde à restaurer</string>
-    <string name="container_backups_no_files">Aucune sauvegarde de conteneur trouvée dans Google Drive.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Affectation principale</string>
     <string name="binding_secondary">Affectation secondaire</string>
+    <string name="binding_third">Affectation tertiaire</string>
+    <string name="binding_fourth">Affectation quaternaire</string>
     <string name="input_controls_editor_tap_to_switch">Touchez pour basculer</string>
     <string name="input_controls_editor_download_profile">Télécharger le profil</string>
     <string name="container_config_emulator_section">Émulateur</string>
@@ -1010,6 +1122,7 @@ Chemin installé :
     <string name="session_drawer_fps_monitor">Moniteur FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Afficher les statistiques de performance en temps réel</string>
     <string name="session_drawer_dual_series_battery">Batterie Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Afficher le temps d\'image en nombre</string>
     <string name="session_drawer_command_center">Centre de commande</string>
     <string name="session_drawer_command_center_input">Entrée</string>
     <string name="session_drawer_command_center_display">Affichage</string>
@@ -1022,7 +1135,6 @@ Chemin installé :
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Naturel</string>
     <string name="session_drawer_color_profile_crt">Effet CRT</string>
-    <string name="session_drawer_upscaler_dls">Vif</string>
     <string name="session_drawer_calibrate_advanced">Étalonnage avancé</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Gyro</string>
@@ -1034,7 +1146,6 @@ Chemin installé :
     <string name="session_drawer_rail_label_mouse">Souris</string>
     <string name="session_drawer_rail_label_fullscreen">Plein écran</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Natif</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Tâches</string>
     <string name="session_drawer_rail_label_logs">Logs</string>
@@ -1048,24 +1159,23 @@ Chemin installé :
     <string name="session_drawer_logs_share_chooser">Partager les logs de session</string>
     <string name="session_drawer_logs_share_failed">Échec du partage des logs</string>
     <string name="session_drawer_logs_share_empty">Aucune ligne de log à partager</string>
-    <string name="session_drawer_super_resolution">Filtres de Netteté</string>
-    <string name="session_drawer_upscaler_mode">Filtre</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Super résolution</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Vif</string>
+    <string name="session_drawer_vivid_strength">Intensité du mode vif</string>
     <string name="session_drawer_main_menu_title">Menu</string>
     <string name="session_gyroscope_activator">Activateur</string>
     <string name="settings_general_check_for_updates">Rechercher des mises à jour</string>
     <string name="settings_general_check_for_updates_summary">Rechercher automatiquement de nouvelles versions de l\'application au lancement et périodiquement.</string>
     <string name="setup_wizard_containers">Configuration du conteneur</string>
-    <string name="google_cloud_auto_backup">Sauvegarde automatique Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Sauvegardez automatiquement les sauvegardes de jeu sur Google Drive chaque fois que vous quittez un jeu.</string>
     <string name="cloud_saves_title">Sauvegardes cloud</string>
-    <string name="cloud_saves_backup">Sauvegarder la sauvegarde cloud</string>
-    <string name="cloud_saves_restore">Restaurer la sauvegarde cloud</string>
+    <string name="cloud_saves_title_for_provider">Sauvegardes cloud %1$s - %2$s</string>
     <string name="cloud_sync_title">Synchronisation cloud</string>
     <string name="cloud_sync_enabled_summary">Téléchargez les sauvegardes cloud au lancement et synchronisez-les/sauvegardez-les à la fermeture.</string>
     <string name="cloud_sync_disabled_summary">Lancez ce jeu sans téléchargement de sauvegarde cloud ni synchronisation à la fermeture.</string>
-    <string name="cloud_saves_backing_up">Sauvegarde cloud en cours…</string>
-    <string name="cloud_saves_restoring">Restauration de la sauvegarde cloud…</string>
+    <string name="cloud_saves_backing_up">Sauvegarde cloud en cours</string>
+    <string name="cloud_saves_restoring">Restauration de la sauvegarde cloud</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Chemin installé :
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Contrôle la mise en cache des blocs dynarec générés entre les exécutions pour accélérer le démarrage.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@ Chemin installé :
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Aucune sauvegarde précédente pour l\'instant. Les sauvegardes remplacées et les sauvegardes manuelles apparaîtront ici pendant 30 jours.</string>
+    <string name="cloud_saves_history_loading">Chargement de l\'historique des sauvegardes\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">cloud</string>
+    <string name="cloud_saves_history_origin_local">local</string>
+    <string name="cloud_saves_history_origin_manual">manuel</string>
+    <string name="cloud_saves_history_refresh">Actualiser</string>
+    <string name="cloud_saves_history_rename">Renommer</string>
+    <string name="cloud_saves_history_rename_clear">Effacer</string>
+    <string name="cloud_saves_history_rename_failed">Impossible de renommer la sauvegarde.</string>
+    <string name="cloud_saves_history_rename_hint">ex. Combat de boss, Avant la fin</string>
+    <string name="cloud_saves_history_rename_save">Enregistrer</string>
+    <string name="cloud_saves_history_rename_success">Sauvegarde renommée.</string>
+    <string name="cloud_saves_history_rename_title">Nommer cette sauvegarde</string>
+    <string name="cloud_saves_history_restore">Restaurer</string>
+    <string name="cloud_saves_history_restore_confirm_body">Cette action remplacera votre sauvegarde locale actuelle par la sauvegarde du %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Restaurer cette sauvegarde ?</string>
+    <string name="cloud_saves_history_restore_failed">Impossible de restaurer cette sauvegarde.</string>
+    <string name="cloud_saves_history_restore_success">Sauvegarde restaurée.</string>
+    <string name="cloud_saves_history_sign_in">Connectez-vous à Google pour afficher votre historique de sauvegardes.</string>
+    <string name="cloud_saves_history_title">Historique des sauvegardes</string>
+    <string name="cloud_saves_history_download">Télécharger</string>
+    <string name="cloud_saves_history_download_success">Fichier téléchargé.</string>
+    <string name="cloud_saves_history_download_failed">Échec du téléchargement.</string>
+    <string name="cloud_saves_keep_replaced_backup">Conserver une copie de la sauvegarde remplacée</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Si vous changez d\'avis, vous pouvez la restaurer depuis l\'historique des sauvegardes.</string>
+    <string name="cloud_saves_no_backups">Aucune sauvegarde pour ce jeu.</string>
+    <string name="cloud_saves_offline_mode">Désactiver la synchronisation Cloud</string>
+    <string name="cloud_saves_offline_mode_summary">Désactive toute activité cloud automatique pour ce jeu.</string>
+    <string name="cloud_saves_sync_from_provider">Synchroniser depuis %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_failed">Impossible de télécharger la sauvegarde depuis %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Gérer les sauvegardes cloud GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Ouvre le site officiel de GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Aucun navigateur disponible pour ouvrir la page des sauvegardes cloud GOG</string>
+    <string name="cloud_saves_gog_zip_label">Télécharger le ZIP cloud GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Enregistrer les fichiers cloud actuels</string>
+    <string name="cloud_saves_gog_zip_success">ZIP des sauvegardes cloud GOG enregistré.</string>
+    <string name="cloud_saves_gog_zip_failed">Impossible d’enregistrer le ZIP des sauvegardes cloud GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Aucun fichier de sauvegarde cloud GOG trouvé.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Synchroniser depuis le Cloud</string>
+    <string name="cloud_saves_sync_from_provider_success">Sauvegarde cloud %1$s téléchargée.</string>
+    <string name="cloud_saves_syncing_from_provider">Téléchargement de la sauvegarde depuis %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Récupère la version actuelle de %1$s.</string>
+    <string name="cloud_saves_sync_summary_generic">Récupère la version cloud actuelle.</string>
+    <string name="common_ui_exit_app_confirm">Quitter WinNative ?</string>
+    <string name="container_surface_effect">Effet de surface</string>
+    <string name="downloads_queue_cancel_download_confirm">Annuler le téléchargement de %1$s et supprimer tous les fichiers téléchargés ?</string>
+    <string name="downloads_queue_paused_resume_hint">En pause - appuyez sur Reprendre pour continuer</string>
+    <string name="downloads_queue_phase_applying_data">Application des données</string>
+    <string name="downloads_queue_phase_downloading">Téléchargement</string>
+    <string name="downloads_queue_phase_downloading_file">Téléchargement [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Finalisation</string>
+    <string name="downloads_queue_phase_patching">Correction</string>
+    <string name="downloads_queue_phase_preparing">Préparation</string>
+    <string name="downloads_queue_phase_queued">En file d\'attente</string>
+    <string name="downloads_queue_phase_unknown">Inconnu</string>
+    <string name="downloads_queue_phase_unpacking">Décompression</string>
+    <string name="downloads_queue_phase_updating">Mise à jour</string>
+    <string name="downloads_queue_phase_verifying">Vérification</string>
+    <string name="downloads_queue_phase_verifying_file">Vérification [%1$s]</string>
+    <string name="downloads_queue_status_label">État :</string>
+    <string name="downloads_queue_this_game">ce jeu</string>
+    <string name="hud_position_bottom_center">Centre bas</string>
+    <string name="hud_position_bottom_left">Gauche bas</string>
+    <string name="hud_position_bottom_right">Droite bas</string>
+    <string name="hud_position_left_center">Centre gauche</string>
+    <string name="hud_position_menu_title">Déplacer le HUD vers</string>
+    <string name="hud_position_right_center">Centre droit</string>
+    <string name="hud_position_top_center">Centre haut</string>
+    <string name="hud_position_top_left">Gauche haut</string>
+    <string name="hud_position_top_right">Droite haut</string>
+    <string name="input_controls_editor_number_of_bindings">Nombre d\'assignations</string>
+    <string name="input_controls_editor_opacity">Opacité</string>
+    <string name="input_controls_editor_radial_menu">Menu radial</string>
+    <string name="input_controls_editor_radial_menu_options">Options du menu radial</string>
+    <string name="input_controls_tap_to_click">Appuyer pour cliquer</string>
+    <string name="input_controls_reverse_binding_order">Ordre inversé des associations</string>
+    <string name="num_controllers">Nombre de manettes</string>
+    <string name="session_drawer_controls_section">Contrôles</string>
+    <string name="session_drawer_header_subtitle">Accès rapide aux contrôles, superpositions et outils de session</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Définir l\'alpha</string>
+    <string name="session_drawer_hud_disabled_hint">Activez la superposition pour la personnaliser</string>
+    <string name="session_drawer_hud_elements">Éléments HUD</string>
+    <string name="session_drawer_hud_input_hint">Entrez une valeur de %1$d à %2$d. Les valeurs dépassant la limite sont écrêtées.</string>
+    <string name="session_drawer_hud_scale">Échelle</string>
+    <string name="session_drawer_hud_scale_input_title">Définir l\'échelle</string>
+    <string name="session_drawer_hud_summary">Ajustez la visibilité de la superposition et les points de données</string>
+    <string name="session_drawer_screen_effects">Effets d\'écran</string>
+    <string name="session_drawer_session_section">Session</string>
+    <string name="session_drawer_swipe_hint">Balayez pour revenir dans le jeu</string>
+    <string name="session_gamepad_enable_vibration">Activer la vibration</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Mouvement de souris expérimental</string>
+    <string name="session_gyroscope_mouse_scale">Échelle de la souris</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Échelle de la souris : %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Ouvrez à nouveau l\'assistant de configuration pour vérifier les autorisations, les fichiers système et les conteneurs par défaut.</string>
+    <string name="settings_other_setup_wizard_title">Assistant de configuration</string>
+    <string name="shortcuts_library_artwork_failed">Impossible de charger l\'image sélectionnée.</string>
+    <string name="shortcuts_library_artwork_open_source">Ouvrir SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Définir l\'image</string>
+    <string name="shortcuts_library_artwork_title">Illustrations de la bibliothèque</string>
+    <string name="shortcuts_library_artwork_icon_title">Image de l\'icône</string>
+    <string name="shortcuts_library_artwork_hero_title">Arrière-plan</string>
+    <string name="shortcuts_list_readded_existing">Raccourci existant rajouté</string>
+    <string name="shortcuts_properties_runtime_patcher">Correcteur DRM d\'exécution</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injecte un DLL de correction DRM au lancement. Réduit les FPS — à utiliser seulement si le lanceur hérité seul échoue.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Sélectionner le dossier de sauvegarde</string>
+    <string name="cloud_saves_custom_folder_label">Dossier de sauvegarde</string>
+    <string name="cloud_saves_custom_select_folder_summary">Indiquez le dossier de sauvegarde dans le conteneur</string>
+    <string name="cloud_saves_custom_no_container">Conteneur indisponible pour ce raccourci</string>
+    <string name="cloud_saves_custom_picker_title">Sélectionner le dossier de sauvegarde</string>
+    <string name="cloud_saves_custom_outside_drive_c">Le dossier sélectionné doit se trouver dans le lecteur C: du conteneur</string>
+    <string name="cloud_saves_custom_path_map_failed">Impossible d’associer le dossier sélectionné à un chemin Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Dossier de sauvegarde défini sur %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Synchroniser depuis Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Télécharger la dernière sauvegarde</string>
+    <string name="cloud_saves_steam_sync_success">Synchronisé depuis Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Échec de la synchronisation Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_label">Voir les sauvegardes Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Ouvrir le stockage cloud</string>
+    <string name="cloud_saves_steam_browse_no_browser">Aucun navigateur disponible pour ouvrir la page Steam</string>
+    <string name="cloud_saves_steam_import_label">Importer des fichiers</string>
+    <string name="cloud_saves_steam_import_helper">Restaurer les fichiers téléchargés</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Sélecteur de fichiers indisponible</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Cela téléchargera les fichiers de sauvegarde actuels de Steam Cloud et remplacera les fichiers de sauvegarde actuels.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID d’application invalide</string>
+    <string name="cloud_saves_label_saved">Libellé enregistré</string>
+    <string name="downloads_queue_cancel_all_title">Annuler tous les téléchargements ?</string>
+    <string name="downloads_queue_cancel_all_warning">Annuler des téléchargements de DLC, jeux ou mises à jour peut potentiellement corrompre vos installations de jeux.\n\nVoulez-vous vraiment annuler tous les téléchargements et supprimer les fichiers déjà téléchargés ?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Utiliser le lanceur hérité</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Émulation Steam héritée : lance le jeu via le lanceur ColdClient et retire le DRM SteamStub de l\'exe. À utiliser uniquement pour les anciens jeux qui ne fonctionnent pas avec Steam Launcher.</string>
+    <string name="steam_section_real_client">Client Steam réel WinNative</string>
+    <string name="steam_section_emulator">Émulateur Steam hérité</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Force le client Steam émulé à se signaler hors ligne afin que le jeu ne tente pas de connexions en ligne. À utiliser pour les jeux qui restent bloqués sur la vérification réseau de Steam.</string>
+    <string name="input_controls_select_style">Sélectionner le style</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Ardoise</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Éclat</string>
+    <string name="input_controls_style_shadow">Ombre</string>
+    <string name="input_controls_style_reticle">Réticule</string>
+    <string name="input_controls_style_neon">Néon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Thème de couleur</string>
+    <string name="input_controls_edit_duplicating_builtin">Profil intégré : une copie modifiable a été créée.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Réinitialiser ce profil à sa disposition d\'origine ? Toutes vos modifications seront perdues.</string>
+    <string name="input_controls_editor_profile_reset">Profil réinitialisé à sa disposition d\'origine.</string>
+    <string name="input_controls_editor_reset_unavailable">Aucun instantané d\'origine n\'est disponible pour ce profil.</string>
+    <string name="container_graphics_compositor_present_mode">Synchronisation d\'affichage Vulkan</string>
+    <string name="cloud_sync_disable_title">Désactiver les sauvegardes cloud</string>
+    <string name="cloud_saves_steam_push_label">Envoyer vers Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forcer l\'envoi de la sauvegarde locale</string>
+    <string name="cloud_saves_steam_push_success">Sauvegarde envoyée vers Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Impossible d\'envoyer la sauvegarde vers Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud est inaccessible pour le moment. Reconnexion en arrière-plan touchez Actualiser une fois de nouveau en ligne.</string>
+    <string name="steam_session_refused_event">Steam a refusé la session en cache (EResult=%1$d). Veuillez vous reconnecter.</string>
+    <string name="settings_hud_record_to_file_title">Enregistrer les performances dans un fichier</string>
+    <string name="settings_hud_record_to_file_summary">Exporte chaque seconde les métriques FPS, CPU, GPU, température et batterie dans /WinNative/logs/ pendant le jeu.</string>
+    <string name="settings_leaderboard_category">Performances</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Préparation de l’environnement Steam</string>
+    <string name="preloader_starting_wine">Démarrage de Wine</string>
+    <string name="preloader_starting_steam_launcher">Démarrage de Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Chargement du client Steam</string>
+    <string name="preloader_connecting_to_steam">Connexion à Steam</string>
+    <string name="preloader_signing_in_to_steam">Connexion à Steam</string>
+    <string name="preloader_fetching_game_info">Connecté — récupération des infos du jeu</string>
+    <string name="preloader_steam_ready">Steam prêt</string>
+    <string name="preloader_updating_game_info">Mise à jour des infos du jeu</string>
+    <string name="preloader_verifying_install">Vérification de l’installation</string>
+    <string name="preloader_scanning_redists">Recherche des redistribuables</string>
+    <string name="preloader_installing_redist_single">Installation du redistribuable</string>
+    <string name="preloader_installing_named_redist">Installation de %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Installation de %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuables prêts</string>
+    <string name="preloader_no_redists">Aucun redistribuable à installer</string>
+    <string name="preloader_steam_service_running">Service Steam en cours d’exécution</string>
+    <string name="preloader_launching_game">Lancement de %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Échec de Steam Launcher — remise en place des ressources</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher n’a pas pu démarrer. Remise en place des ressources — veuillez relancer</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher a atteint le jeu, mais celui-ci n’a jamais démarré</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Chargement des éléments du Workshop</string>
+    <string name="workshop_search_items">Rechercher des éléments du Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Récupération de vos objets abonnés depuis Steam.</string>
+    <string name="workshop_error_title">Impossible de charger les objets du Workshop</string>
+    <string name="workshop_error_subtitle">Une erreur s\'est produite. Réessayez.</string>
+    <string name="workshop_empty_title">Aucun objet du Workshop abonné</string>
+    <string name="workshop_empty_subtitle">Abonnez-vous à des objets sur le Steam Workshop, puis rouvrez cette fenêtre.</string>
+    <string name="workshop_search_empty_title">Aucun objet ne correspond à \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Essayez un autre terme de recherche.</string>
+    <string name="workshop_clear_search">Effacer la recherche</string>
+    <string name="workshop_item_fallback">Objet du Workshop</string>
+    <string name="common_ui_failed">Échec</string>
+    <string name="steam_presence_snooze">En veille</string>
+    <string name="steam_presence_busy">Occupé</string>
+    <string name="steam_presence_looking_to_trade">Cherche à échanger</string>
+    <string name="steam_presence_looking_to_play">Cherche à jouer</string>
+    <string name="steam_friends_count">Amis — %1$d en ligne</string>
+    <string name="steam_friends_section_in_game">En jeu (%1$d)</string>
+    <string name="steam_friends_section_online">En ligne (%1$d)</string>
+    <string name="steam_friends_section_offline">Hors ligne (%1$d)</string>
+    <string name="steam_friends_none_loaded">Aucun ami chargé pour le moment.</string>
+    <string name="steam_friends_chat_off">Le chat est désactivé. Réactivez le service de chat pour voir vos amis.</string>
+    <string name="steam_friends_self_you">Vous</string>
+    <string name="steam_friends_in_game">En jeu</string>
+    <string name="steam_friends_join">Rejoindre</string>
+    <string name="steam_friends_play">Jouer</string>
+    <string name="steam_chat_image_failed">(échec de l\'envoi de l\'image)</string>
+    <string name="steam_chat_empty">Aucun message. Dites bonjour !</string>
+    <string name="steam_chat_uploading_image">Envoi de l\'image…</string>
+    <string name="steam_chat_send_image">Envoyer une image</string>
+    <string name="steam_chat_message_hint">Message…</string>
+    <string name="steam_chat_send">Envoyer</string>
+    <string name="steam_chat_image">Image</string>
+    <string name="steam_common_back">Retour</string>
+    <string name="steam_achievements_title">Succès</string>
+    <string name="steam_achievements_empty">Aucun succès trouvé pour ce jeu,\nou connectez-vous à Steam pour les charger.</string>
+    <string name="steam_achievements_hidden">Succès caché</string>
+    <string name="steam_achievements_hidden_desc">Continuez à jouer pour révéler ce succès.</string>
+    <string name="steam_achievements_unlocked_on">Débloqué %1$s</string>
+    <string name="steam_achievements_unlocked">Débloqué</string>
+    <string name="steam_join_joining">Rejoindre %1$s dans %2$s…</string>
+    <string name="steam_join_install">Installez %1$s pour rejoindre %2$s</string>
+    <string name="steam_join_not_owned">Vous ne possédez pas %1$s</string>
+    <string name="steam_chat_not_sent">(non envoyé)</string>
+    <string name="steam_join_the_game">le jeu</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Service de chat</string>
+    <string name="steam_chat_setting_service_desc">Connectez-vous aux amis et au chat ; désactivez pour passer hors ligne</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Sortie</string>
+    <string name="display_output_prompt_title">Écran externe détecté</string>
+    <string name="display_output_prompt_message">Envoyer le jeu vers l\'écran connecté ? Vos commandes à l\'écran et le menu restent sur ce téléphone.</string>
+    <string name="display_output_prompt_swap">Changer d\'écran</string>
+    <string name="display_output_prompt_mirror">Dupliquer</string>
+    <string name="display_output_swapped_toast">Jeu déplacé vers l\'écran externe. Les commandes restent sur votre téléphone.</string>
+    <string name="display_output_cast_unavailable">Les paramètres d\'affichage sans fil ne sont pas disponibles sur cet appareil.</string>
+    <string name="display_output_restored_toast">Écran externe déconnecté — le jeu est revenu sur le téléphone.</string>
+    <string name="session_drawer_output_title">Sortie d\'affichage</string>
+    <string name="session_drawer_output_subtitle">Le jeu s\'affiche sur l\'écran externe.</string>
+    <string name="session_drawer_output_device">Écran connecté</string>
+    <string name="session_drawer_output_resolution">Résolution</string>
+    <string name="session_drawer_output_refresh_rate">Taux de rafraîchissement</string>
+    <string name="session_drawer_output_aspect_ratio">Format d\'image</string>
+    <string name="session_drawer_output_aspect_fit">Ajuster (format)</string>
+    <string name="session_drawer_output_aspect_stretch">Étirer (remplir)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (rogner)</string>
+    <string name="session_drawer_output_return_to_phone">Revenir au téléphone</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Diffuser sur un téléviseur</string>
+    <string name="session_drawer_output_cast_body">Branchez un adaptateur USB-C / HDMI, ou touchez ci-dessous pour connecter un écran sans fil (Miracast / Wi-Fi Direct). Le jeu s\'affiche sur le téléviseur tandis que ces commandes restent sur votre téléphone.</string>
+    <string name="session_drawer_output_cast_button">Connecter un écran sans fil</string>
+    <string name="session_drawer_output_cast_note">Les téléviseurs uniquement Chromecast ne peuvent pas afficher le jeu en direct avec des commandes privées — utilisez un écran sans fil ou un adaptateur USB‑C/HDMI pour un meilleur résultat.</string>
+    <string name="session_drawer_output_render_note">Les modes signalés par votre écran changent sa sortie réelle (il peut devenir noir un instant pendant la réinitialisation). Les autres résolutions sont rendues à cette taille et mises à l\'échelle matériellement vers la dalle — au-dessus de la native, c\'est plus net (suréchantillonnage), en dessous, c\'est plus rapide.</string>
+    <string name="session_drawer_output_scaling_note">Ce téléphone affiche l\'écran dans sa résolution native %1$s et ne change pas de mode ; ceci définit donc la résolution de rendu — elle est mise à l\'échelle matérielle vers la dalle (au‑dessus du natif c\'est plus net, en dessous c\'est plus rapide).</string>
+    <string name="session_drawer_output_game_mode">Mode jeu (faible latence)</string>
+    <string name="session_drawer_output_game_mode_on">Activé</string>
+    <string name="session_drawer_output_game_mode_off">Désactivé</string>
+    <string name="session_drawer_output_game_mode_note">Demande le mode jeu / faible latence du téléviseur (HDMI ALLM) pour réduire la latence d\'entrée. Affiché uniquement lorsque l\'écran connecté le prend en charge.</string>
+    <string name="session_drawer_output_send_to_display">Envoyer le jeu vers l\'écran</string>
+    <string name="session_drawer_output_to_display">Sortie vers l\'écran externe</string>
+    <string name="session_drawer_output_send_note">Un écran est connecté. Envoyez-y le jeu — vos commandes et le menu restent sur ce téléphone. Vous pouvez le ramener ici à tout moment.</string>
+    <string name="session_drawer_output_display">Affichage</string>
+    <string name="session_drawer_output_glasses">Lunettes</string>
+    <string name="session_drawer_output_brightness">Luminosité</string>
+    <string name="session_drawer_output_shade">Teinte (assombrissement)</string>
+    <string name="session_drawer_output_3d">3D (côte à côte)</string>
+    <string name="glasses_panel_refresh">Fréquence d\'actualisation</string>
+    <string name="glasses_panel_sunblock">Filtre solaire</string>
+    <string name="session_drawer_output_volume">Volume</string>
+    <string name="session_drawer_output_glasses_note">Envoyé directement à vos lunettes Viture via USB.</string>
+
+    <!-- Session > Touch & Gesture Profiles -->
+    <string name="common_ui_new">Nouveau</string>
+    <string name="common_ui_rename">Renommer</string>
+    <string name="gesture_profile_export">Exporter le profil de gestes</string>
+    <string name="gesture_profile_import">Importer un profil de gestes</string>
+    <string name="gesture_profile_new">Nouveau profil de gestes</string>
+    <string name="gesture_profile_none">Aucun profil de gestes</string>
+    <string name="input_controls_editor_input_profiles_section">Profils de saisie</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilité du stick droit</string>
+    <string name="session_drawer_rts_gestures">Gestes RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Modifier</string>
+    <string name="session_drawer_touch">Tactile</string>
+    <string name="session_drawer_touch_map_right_stick">Mapper sur le stick droit</string>
+    <string name="session_drawer_touch_touchscreen">Mode écran tactile</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_gesture_profile_section">Profil de gestes</string>
+    <string name="session_rts_action">Action</string>
+    <string name="session_rts_behavior">Comportement</string>
+    <string name="session_rts_double_tap">Double appui (double clic gauche)</string>
+    <string name="session_rts_double_tap_delay">Délai de double appui (ms)</string>
+    <string name="session_rts_down">Bas</string>
+    <string name="session_rts_drag">Glissement à 1 doigt</string>
+    <string name="session_rts_pan1">Déplacement à 1 doigt</string>
+    <string name="session_rts_drag2">Glissement à 2 doigts</string>
+    <string name="session_rts_drag_threshold">Seuil de glissement (px)</string>
+    <string name="session_rts_gesture_threshold">Seuil de geste (px)</string>
+    <string name="session_rts_hold2">Maintien à 2 doigts</string>
+    <string name="session_rts_hold3">Maintien à 3 doigts</string>
+    <string name="session_rts_hold4">Maintien à 4 doigts</string>
+    <string name="session_rts_hold_delay">Délai de maintien (ms)</string>
+    <string name="session_rts_left">Gauche</string>
+    <string name="session_rts_long_press">Appui long</string>
+    <string name="session_rts_long_press_delay">Délai d\'appui long (ms)</string>
+    <string name="session_rts_pan">Déplacement à 2 doigts</string>
+    <string name="session_rts_pan_threshold">Début déplacement/pincement (px)</string>
+    <string name="session_rts_right">Droite</string>
+    <string name="session_rts_swipe3">Balayage à 3 doigts</string>
+    <string name="session_rts_swipe4">Balayage à 4 doigts</string>
+    <string name="session_rts_swipe_threshold">Seuil de balayage (px)</string>
+    <string name="session_rts_tap1">Appui à 1 doigt</string>
+    <string name="session_rts_tap2">Appui à 2 doigts</string>
+    <string name="session_rts_tap3">Appui à 3 doigts</string>
+    <string name="session_rts_tap4">Appui à 4 doigts</string>
+    <string name="session_rts_up">Haut</string>
+    <string name="session_rts_zoom">Zoom par pincement</string>
+    <string name="session_drawer_brightness">Luminosité</string>
+    <string name="session_drawer_contrast">Contraste</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Saturation</string>
+    <string name="session_drawer_temperature">Température</string>
+    <string name="session_drawer_tint">Teinte</string>
+    <string name="session_drawer_intensity">Intensité</string>
+    <string name="session_drawer_strength">Force</string>
+    <string name="session_drawer_sharpen">Netteté</string>
+    <string name="session_drawer_scanlines">Lignes de balayage</string>
+    <string name="session_drawer_pixelate">Pixelliser</string>
+    <string name="session_drawer_block_size">Taille de bloc</string>
+    <string name="session_drawer_scale">Échelle</string>
+    <string name="session_drawer_scale_nearest">Plus proche</string>
+    <string name="session_drawer_scale_linear">Linéaire</string>
+    <string name="session_drawer_scale_bicubic">Bicubique</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Cartoon</string>
+    <string name="session_drawer_color_blind">Daltonisme</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Réinitialiser les effets</string>
+    <string name="session_drawer_hud_background">Arrière-plan</string>
+    <string name="session_drawer_hud_background_alpha">Alpha de l\'arrière-plan</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Définir l\'alpha de l\'arrière-plan</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Ajuster la taille</string>
+    <string name="session_task_bring_to_front">Mettre au premier plan</string>
+    <string name="session_task_custom_value">Valeur personnalisée</string>
+    <string name="session_gyroscope_orientation_mode">Incliner pour viser (orientation)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Fichiers</string>
+    <string name="file_manager_copy">Copier</string>
+    <string name="file_manager_cut">Couper</string>
+    <string name="file_manager_paste">Coller</string>
+    <string name="file_manager_paste_here">Coller ici</string>
+    <string name="file_manager_new_folder">Nouveau dossier</string>
+    <string name="file_manager_new_folder_short">Dossier</string>
+    <string name="file_manager_multi_select">Choisir</string>
+    <string name="file_manager_create">Créer</string>
+    <string name="file_manager_delete">Supprimer</string>
+    <string name="file_manager_copy_count">Copier (%1$d)</string>
+    <string name="file_manager_cut_count">Couper (%1$d)</string>
+    <string name="file_manager_delete_count">Supprimer (%1$d)</string>
+    <string name="file_manager_extract">Extraire</string>
+    <string name="file_manager_extract_here">Extraire ici</string>
+    <string name="file_manager_extract_to">Extraire vers…</string>
+    <string name="file_manager_extracting">Extraction de %1$s</string>
+    <string name="file_manager_extract_failed">Échec de l\'extraction</string>
+    <string name="file_manager_run_boot">Lancer / Démarrer</string>
+    <string name="file_manager_create_shortcut">Créer un raccourci</string>
+    <string name="file_manager_run_in_container">Exécuter dans le conteneur</string>
+    <string name="file_manager_no_containers">Aucun conteneur disponible</string>
+    <string name="file_manager_delete_confirm">Supprimer \"%1$s\" ? Cette action est irréversible.</string>
+    <string name="file_manager_delete_confirm_multi">Supprimer %1$d éléments ? Cette action est irréversible.</string>
+    <string name="file_manager_copying">Copie de %1$s</string>
+    <string name="file_manager_moving">Déplacement de %1$s</string>
+    <string name="file_manager_copying_count">Copie de %1$d éléments</string>
+    <string name="file_manager_moving_count">Déplacement de %1$d éléments</string>
+    <string name="file_manager_paste_into_itself">Impossible de coller un dossier dans lui-même</string>
+    <string name="file_manager_operation_failed">Échec de l\'opération</string>
+    <string name="file_manager_delete_failed">Échec de la suppression</string>
+    <string name="file_manager_rename_failed">Échec du renommage</string>
+    <string name="file_manager_create_folder_failed">Échec de la création du dossier</string>
+    <string name="cloud_saves_google_backup_helper">Enregistrer une copie sur Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Sauvegarder sur Google</string>
+    <string name="cloud_saves_google_backup_no_save">Aucun fichier de sauvegarde à sauvegarder.</string>
+    <string name="cloud_saves_history_cloud_readonly">Lecture seule</string>
+    <string name="session_drawer_rail_label_record">Enregistrer</string>
+    <string name="session_record_failed">Impossible de démarrer l\'enregistrement</string>
+    <string name="session_record_fps">Fréquence d\'images</string>
+    <string name="session_record_include_ui">Enregistrer l\'interface</string>
+    <string name="session_record_include_ui_subtitle">Inclure le HUD et les commandes à l\'écran</string>
+    <string name="session_record_now">Enregistrer maintenant</string>
+    <string name="session_record_quality">Qualité</string>
+    <string name="session_record_resolution">Résolution</string>
+    <string name="session_record_saved">Enregistrement sauvegardé dans WinNative/Recordings</string>
+    <string name="session_record_settings_title">Paramètres d\'enregistrement</string>
+    <string name="session_record_started">Enregistrement démarré</string>
+    <string name="steam_chat_setting_stay_running">Exécuter en arrière-plan</string>
+    <string name="steam_chat_setting_stay_running_desc">Garder le chat actif après avoir quitté WinNative</string>
+    <string name="settings_content_refresh">Actualiser</string>
+    <string name="settings_retro_title">Rétro</string>
+    <string name="retro_save_transfer_title">Transférer la sauvegarde</string>
+    <string name="retro_save_transfer_message">Importez une sauvegarde locale pour ce jeu ou exportez la sauvegarde actuelle.</string>
+    <string name="retro_save_transfer_import">Importer la sauvegarde</string>
+    <string name="retro_save_transfer_export">Exporter la sauvegarde</string>
+    <string name="retro_save_transfer_import_ok">Sauvegarde importée</string>
+    <string name="retro_save_transfer_import_failed">Impossible d\'importer la sauvegarde</string>
+    <string name="retro_save_transfer_export_ok">Sauvegarde exportée</string>
+    <string name="retro_save_transfer_export_failed">Impossible d\'exporter la sauvegarde</string>
+    <string name="retro_save_transfer_none">Aucune sauvegarde n\'existe encore pour ce jeu</string>
+    <string name="retro_cheats_title">Codes de triche</string>
+    <string name="retro_cheats_hardcore_blocked">Les codes de triche sont désactivés en mode Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Enregistrer</string>
+    <string name="retro_ps2_cancel">Annuler</string>
+    <string name="retro_ps2_save_state">Sauvegarde rapide</string>
+    <string name="retro_ps2_load_save_state">Charger la sauvegarde</string>
+    <string name="retro_ps2_achievements">Succès</string>
+    <string name="retro_ps2_cheats">Codes de triche</string>
+    <string name="retro_ps2_memory_cards">Cartes mémoire</string>
+    <string name="retro_ps2_fast_forward">Avance rapide</string>
+    <string name="retro_ps2_reset">Réinitialiser</string>
+    <string name="retro_ps2_swap_disc">Changer de disque</string>
+    <string name="retro_ps2_slot">Emplacement %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Appuyez pour charger</string>
+    <string name="retro_ps2_slot_empty">Vide</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Appuyez pour écraser</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Vide — appuyez pour enregistrer</string>
+    <string name="retro_ps2_slot_is_empty">L\'emplacement %1$d est vide</string>
+    <string name="retro_ps2_loaded_slot">Emplacement %1$d chargé</string>
+    <string name="retro_ps2_could_not_load_slot">Impossible de charger l\'emplacement %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Enregistré dans l\'emplacement %1$d</string>
+    <string name="retro_ps2_save_failed">Échec de l\'enregistrement</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Emplacement 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Emplacement 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Appuyez pour utiliser</string>
+    <string name="retro_ps2_new_memory_card">Nouvelle carte mémoire</string>
+    <string name="retro_ps2_import_card">Importer une carte</string>
+    <string name="retro_ps2_enable_online_dev9">Activer le mode en ligne (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adaptateur réseau PS2 — redémarre le jeu pour le connecter</string>
+    <string name="retro_ps2_ethernet_device">Périphérique Ethernet</string>
+    <string name="retro_ps2_dns_mode">Mode DNS</string>
+    <string name="retro_ps2_primary_dns">DNS principal</string>
+    <string name="retro_ps2_secondary_dns">DNS secondaire</string>
+    <string name="retro_ps2_optional">facultatif</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automatique (DHCP)</string>
+    <string name="retro_ps2_server_host">Serveur : %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">appuyez pour définir l\'IP (vide pour supprimer)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Ajouter un hôte serveur</string>
+    <string name="retro_ps2_new_server_hostname">Nouveau nom d\'hôte serveur</string>
+    <string name="retro_ps2_server_hostname_hint">ex. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Commandes à l\'écran</string>
+    <string name="retro_ps2_edit_layout">Modifier la disposition</string>
+    <string name="retro_ps2_reset_layout">Réinitialiser la disposition</string>
+    <string name="retro_ps2_layout_reset">Disposition réinitialisée</string>
+    <string name="retro_ps2_left_stick_invert_x">Stick gauche : inverser X</string>
+    <string name="retro_ps2_left_stick_invert_y">Stick gauche : inverser Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Stick droit : inverser X</string>
+    <string name="retro_ps2_right_stick_invert_y">Stick droit : inverser Y</string>
+    <string name="retro_ps2_button_color">Couleur des boutons</string>
+    <string name="retro_ps2_letter_color">Couleur des lettres</string>
+    <string name="retro_ps2_shadow_color">Couleur de l\'ombre</string>
+    <string name="retro_ps2_background_color">Couleur de fond</string>
+    <string name="retro_ps2_reset_colors">Réinitialiser les couleurs</string>
+    <string name="retro_ps2_renderer">Moteur de rendu</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Échelle de résolution</string>
+    <string name="retro_ps2_scale_1x_native">1x (native)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Rapport d\'aspect</string>
+    <string name="retro_ps2_aspect_stretch">Étirer</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtre d\'affichage</string>
+    <string name="retro_ps2_filter_nearest">Au plus proche</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinéaire (lisse)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinéaire (net)</string>
+    <string name="retro_ps2_texture_filter">Filtre de texture</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinéaire (forcé)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinéaire (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinéaire (sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Précision du mélange</string>
+    <string name="retro_ps2_blend_minimum">Minimale</string>
+    <string name="retro_ps2_blend_basic">Basique</string>
+    <string name="retro_ps2_blend_medium">Moyenne</string>
+    <string name="retro_ps2_blend_high">Élevée</string>
+    <string name="retro_ps2_blend_full">Complète</string>
+    <string name="retro_ps2_blend_maximum">Maximale</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Désactivé</string>
+    <string name="retro_ps2_shader_scanline">Lignes de balayage</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangulaire</string>
+    <string name="retro_ps2_shader_wave">Onde</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Saut d\'images</string>
+    <string name="retro_ps2_frameskip_off">Désactivé</string>
+    <string name="retro_ps2_frameskip_1">Sauter 1</string>
+    <string name="retro_ps2_frameskip_2">Sauter 2</string>
+    <string name="retro_ps2_frameskip_3">Sauter 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volume</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Muet</string>
+    <string name="retro_ps2_swap_stereo_channels">Inverser les canaux stéréo</string>
+    <string name="retro_ps2_ee_cycle_rate">Fréquence de cycle EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (par défaut)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Saut de cycle EE</string>
+    <string name="retro_ps2_skip_off">Désactivé</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 instantané</string>
+    <string name="retro_ps2_mtvu">VU multithread (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rapide</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Vitesse d\'émulation</string>
+    <string name="retro_ps2_hud_cpu_usage">Utilisation CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Utilisation GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Résolution interne</string>
+    <string name="retro_ps2_deinterlace_mode">Mode de désentrelacement</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Désactivé</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Format d\'image des FMV</string>
+    <string name="retro_ps2_anti_blur">Anti-flou</string>
+    <string name="retro_ps2_widescreen_patches">Patchs écran large</string>
+    <string name="retro_ps2_no_interlace_patches">Patchs anti-entrelacement</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Détection de boucle INTC</string>
+    <string name="retro_ps2_wait_loop">Détection de boucle d\'attente</string>
+    <string name="retro_ps2_time_stretch">Étirement temporel audio</string>
+    <string name="retro_ps2_audio_buffer">Tampon audio</string>
+    <string name="retro_ps2_audio_latency">Latence de sortie</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Temps de trame</string>
+    <string name="retro_ps2_hud_gs_stats">Statistiques GS</string>
+    <string name="retro_ps2_hud_hw_info">Infos matériel</string>
+    <string name="retro_ps2_hud_version">Version</string>
+    <string name="retro_ps2_hud_input_display">Affichage des entrées</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Affichage</string>
+    <string name="retro_ps2_tab_performance">Performances</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Son</string>
+    <string name="retro_ps2_tab_online">En ligne</string>
+    <string name="retro_ps2_tab_controls">Commandes</string>
+    <string name="retro_ps2_resume">Reprendre</string>
+    <string name="retro_ps2_pause">Pause</string>
+    <string name="retro_ps2_exit">Quitter</string>
+    <string name="retro_lr_bios_imported">BIOS importé : %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Fichier BIOS non valide</string>
+    <string name="retro_lr_invalid_retro_game">Jeu rétro non valide</string>
+    <string name="retro_lr_rom_not_found">ROM introuvable : %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Impossible de lire la ROM dans cette archive</string>
+    <string name="retro_lr_core_not_installed">Core non installé : %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Codes de triche activés — les succès sont désactivés pour cette session</string>
+    <string name="retro_lr_cloud_save_restored">Sauvegarde cloud restaurée</string>
+    <string name="retro_lr_restore_failed">Échec de la restauration</string>
+    <string name="retro_lr_cloud_conflict_message">Une sauvegarde cloud plus récente existe pour %1$s. Souhaitez-vous synchroniser, et quelle sauvegarde cloud préférez-vous conserver ?</string>
+    <string name="retro_lr_cloud_save">Sauvegarde cloud</string>
+    <string name="retro_lr_renderer_default">Rétro</string>
+    <string name="retro_lr_failed_load_core">Échec du chargement du core d\'émulation</string>
+    <string name="retro_lr_failed_load_rom">Échec du chargement de la ROM</string>
+    <string name="retro_lr_graphics_not_supported">Graphismes non pris en charge pour ce core</string>
+    <string name="retro_lr_emulator_error">Erreur de l\'émulateur</string>
+    <string name="retro_lr_shader_default">Par défaut</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Net</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Mise à l\'échelle SGSR</string>
+    <string name="retro_lr_upscale_native">Native</string>
+    <string name="retro_lr_sound">Son</string>
+    <string name="retro_lr_left_stick_invert_x">Stick gauche : inverser X</string>
+    <string name="retro_lr_left_stick_invert_y">Stick gauche : inverser Y</string>
+    <string name="retro_lr_right_stick_invert_x">Stick droit : inverser X</string>
+    <string name="retro_lr_right_stick_invert_y">Stick droit : inverser Y</string>
+    <string name="retro_lr_on_screen_controls">Commandes à l\'écran</string>
+    <string name="retro_lr_haptic_feedback">Retour haptique</string>
+    <string name="retro_lr_portrait">Portrait</string>
+    <string name="retro_lr_landscape">Paysage</string>
+    <string name="retro_lr_edit_layout">Modifier la disposition (%1$s)</string>
+    <string name="retro_lr_reset_layout">Réinitialiser la disposition %1$s</string>
+    <string name="retro_lr_layout_reset">Disposition %1$s réinitialisée</string>
+    <string name="retro_lr_button_color">Couleur des boutons</string>
+    <string name="retro_lr_letter_color">Couleur des lettres</string>
+    <string name="retro_lr_shadow_color">Couleur de l\'ombre</string>
+    <string name="retro_lr_background_color">Couleur de fond</string>
+    <string name="retro_lr_reset_colors">Réinitialiser les couleurs</string>
+    <string name="retro_lr_colors_reset">Couleurs réinitialisées</string>
+    <string name="retro_lr_performance_hud">HUD de performances</string>
+    <string name="retro_lr_alpha">Alpha</string>
+    <string name="retro_lr_background_alpha">Alpha du fond</string>
+    <string name="retro_lr_background">Fond</string>
+    <string name="retro_lr_scale">Échelle</string>
+    <string name="retro_lr_numeric_frametime">Temps d\'image numérique</string>
+    <string name="retro_lr_dual_series_battery">Batterie double série</string>
+    <string name="retro_lr_hud_elements">ÉLÉMENTS DU HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Console</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batterie</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Graphique</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Sauvegarde rapide</string>
+    <string name="retro_lr_load_save_state">Charger la sauvegarde</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Le chargement des sauvegardes est désactivé en mode Hardcore</string>
+    <string name="retro_lr_achievements">Succès</string>
+    <string name="retro_lr_cheats">Codes de triche</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Les codes de triche sont désactivés en mode Hardcore</string>
+    <string name="retro_lr_reset">Réinitialiser</string>
+    <string name="retro_lr_fast_forward">Avance rapide</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">L\'avance rapide est désactivée en mode Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disque %1$d/%2$d</string>
+    <string name="retro_lr_resume">Reprendre</string>
+    <string name="retro_lr_pause">Pause</string>
+    <string name="retro_lr_exit">Quitter</string>
+    <string name="retro_lr_saved_to_slot">Enregistré dans l\'emplacement %1$d</string>
+    <string name="retro_lr_could_not_save_state">Impossible d\'enregistrer la sauvegarde</string>
+    <string name="retro_lr_bios_required_title">BIOS %1$s requis</string>
+    <string name="retro_lr_bios_required_message">Les jeux PlayStation nécessitent un vrai fichier BIOS de console que vous devez fournir. Importez un BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin ou scph7001.bin) pour continuer.</string>
+    <string name="retro_lr_import_bios">Importer un BIOS…</string>
+    <string name="retro_lr_cancel">Annuler</string>
+    <string name="retro_lr_slot_empty">L\'emplacement %1$d est vide</string>
+    <string name="retro_lr_loaded_slot">Emplacement %1$d chargé</string>
+    <string name="retro_lr_could_not_load_state">Impossible de charger la sauvegarde</string>
+    <string name="retro_lr_slot_title">Emplacement %1$d</string>
+    <string name="retro_lr_rename_slot">Renommer l\'emplacement %1$d</string>
+    <string name="retro_gs_section_general">Général</string>
+    <string name="retro_gs_section_graphics">Graphismes</string>
+    <string name="retro_gs_section_performance">Performances</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Entrée</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">En ligne</string>
+    <string name="retro_gs_cancel">Annuler</string>
+    <string name="retro_gs_save">Enregistrer</string>
+    <string name="retro_gs_shader_default">Par défaut</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Net</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Native</string>
+    <string name="retro_gs_group_game">JEU</string>
+    <string name="retro_gs_label_name">Nom</string>
+    <string name="retro_gs_label_system">Système</string>
+    <string name="retro_gs_label_emulator_core">Core d\'émulation</string>
+    <string name="retro_gs_label_rom_path">Chemin de la ROM</string>
+    <string name="retro_gs_group_bios">BIOS %1$s</string>
+    <string name="retro_gs_label_installed">Installé</string>
+    <string name="retro_gs_bios_none">Aucun — requis pour exécuter les jeux %1$s</string>
+    <string name="retro_gs_import_bios">Importer un BIOS…</string>
+    <string name="retro_gs_remove_bios">Supprimer le BIOS</string>
+    <string name="retro_gs_group_library_artwork">ILLUSTRATIONS DE LA BIBLIOTHÈQUE</string>
+    <string name="retro_gs_artwork_game_card">Image de la fiche de jeu</string>
+    <string name="retro_gs_artwork_grid">Image en grille</string>
+    <string name="retro_gs_artwork_carousel">Image du carrousel</string>
+    <string name="retro_gs_artwork_list">Image en liste</string>
+    <string name="retro_gs_artwork_custom_set">Image personnalisée définie</string>
+    <string name="retro_gs_artwork_set_image">Définir l\'image</string>
+    <string name="retro_gs_artwork_remove">Supprimer</string>
+    <string name="retro_gs_group_video">VIDÉO</string>
+    <string name="retro_gs_video_filter">Filtre vidéo</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Mise à l\'échelle SGSR</string>
+    <string name="retro_gs_performance_hud">HUD de performances</string>
+    <string name="retro_gs_group_core">CORE</string>
+    <string name="retro_gs_renderer">Moteur de rendu</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Échelle de résolution</string>
+    <string name="retro_gs_scale_1x_native">1x (native)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Rapport d\'aspect</string>
+    <string name="retro_gs_aspect_stretch">Étirer</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtre d\'affichage</string>
+    <string name="retro_gs_filter_nearest">Au plus proche</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinéaire (lisse)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinéaire (net)</string>
+    <string name="retro_gs_texture_filter">Filtre de texture</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinéaire (forcé)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinéaire (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinéaire (sprites)</string>
+    <string name="retro_gs_blending_accuracy">Précision du mélange</string>
+    <string name="retro_gs_blend_minimum">Minimale</string>
+    <string name="retro_gs_blend_basic">Basique</string>
+    <string name="retro_gs_blend_medium">Moyenne</string>
+    <string name="retro_gs_blend_high">Élevée</string>
+    <string name="retro_gs_blend_full">Complète</string>
+    <string name="retro_gs_blend_maximum">Maximale</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Désactivé</string>
+    <string name="retro_gs_tvshader_scanline">Lignes de balayage</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangulaire</string>
+    <string name="retro_gs_tvshader_wave">Onde</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Saut d\'images</string>
+    <string name="retro_gs_frameskip_1">Sauter 1</string>
+    <string name="retro_gs_frameskip_2">Sauter 2</string>
+    <string name="retro_gs_frameskip_3">Sauter 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">PERFORMANCES</string>
+    <string name="retro_gs_ee_cycle_rate">Fréquence de cycle EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (par défaut)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Saut de cycle EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 instantané</string>
+    <string name="retro_gs_mtvu">VU multithread (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rapide</string>
+    <string name="retro_gs_group_performance_hud">HUD DE PERFORMANCES</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Vitesse d\'émulation</string>
+    <string name="retro_gs_hud_cpu_usage">Utilisation CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Utilisation GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Résolution interne</string>
+    <string name="retro_gs_deinterlace_mode">Mode de désentrelacement</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Désactivé</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Format d\'image des FMV</string>
+    <string name="retro_gs_anti_blur">Anti-flou</string>
+    <string name="retro_gs_widescreen_patches">Patchs écran large</string>
+    <string name="retro_gs_no_interlace_patches">Patchs anti-entrelacement</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Détection de boucle INTC</string>
+    <string name="retro_gs_wait_loop">Détection de boucle d\'attente</string>
+    <string name="retro_gs_time_stretch">Étirement temporel audio</string>
+    <string name="retro_gs_audio_buffer">Tampon audio</string>
+    <string name="retro_gs_audio_latency">Latence de sortie</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Temps de trame</string>
+    <string name="retro_gs_hud_gs_stats">Statistiques GS</string>
+    <string name="retro_gs_hud_hw_info">Infos matériel</string>
+    <string name="retro_gs_hud_version">Version</string>
+    <string name="retro_gs_hud_input_display">Affichage des entrées</string>
+    <string name="retro_gs_fast_boot">Démarrage rapide</string>
+    <string name="retro_gs_group_online_dev9">EN LIGNE (DEV9)</string>
+    <string name="retro_gs_enable_online">Activer le mode en ligne</string>
+    <string name="retro_gs_ethernet_device">Périphérique Ethernet</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Mode DNS</string>
+    <string name="retro_gs_dns_manual">Manuel</string>
+    <string name="retro_gs_dns_internal">Interne</string>
+    <string name="retro_gs_primary_dns">DNS principal</string>
+    <string name="retro_gs_secondary_dns">DNS secondaire</string>
+    <string name="retro_gs_dns_optional">facultatif</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automatique (DHCP)</string>
+    <string name="retro_gs_group_input">ENTRÉE</string>
+    <string name="retro_engine_save">Enregistrer</string>
+    <string name="retro_engine_saved">Partie enregistrée</string>
+    <string name="retro_engine_loading">Chargement…</string>
+    <string name="retro_engine_load">Charger</string>
+    <string name="retro_engine_saved_to">Enregistré dans %1$s</string>
+    <string name="retro_engine_slot_active_only">Actif</string>
+    <string name="retro_engine_rename_slot">Renommer l\'emplacement</string>
+    <string name="retro_engine_caught">%1$d capturés</string>
+    <string name="retro_engine_no_slots">Aucun emplacement de sauvegarde</string>
+    <string name="retro_engine_new_slot">Nouvel emplacement de sauvegarde</string>
+    <string name="retro_engine_achievements_unavailable">Non suivi en mode 3D</string>
+    <string name="retro_engine_fullscreen">Plein écran</string>
+    <string name="retro_engine_loaded_from">%1$s chargée</string>
+    <string name="retro_engine_slot_empty">Cet emplacement est vide</string>
+    <string name="retro_engine_loading_subtitle">Préparation des données du jeu pour la première fois</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Jouer à ce jeu avec le moteur voxel 3D au lieu du cœur standard</string>
+    <string name="retro_gs_on_screen_controls">Commandes à l\'écran</string>
+    <string name="retro_gs_haptic_feedback">Retour haptique</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Volume</string>
+    <string name="retro_gs_mute">Muet</string>
+    <string name="retro_gs_swap_stereo">Inverser les canaux stéréo</string>
+    <string name="retro_gs_sound">Son</string>
+    <string name="retro_scr_retro_defaults">PARAMÈTRES RÉTRO PAR DÉFAUT</string>
+    <string name="retro_scr_retro_defaults_desc">Paramètres par défaut appliqués aux jeux de chaque console, sauf modification dans les réglages propres à un jeu.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Compte</string>
+    <string name="retro_scr_signed_in">Connecté</string>
+    <string name="retro_scr_not_signed_in_hint">Non connecté — ouvrez les Succès d\'un jeu pour vous connecter</string>
+    <string name="retro_scr_achievements_enabled">Succès activés</string>
+    <string name="retro_scr_hardcore_default">Mode Hardcore par défaut (pas de sauvegardes rapides)</string>
+    <string name="retro_scr_sign_out">Se déconnecter</string>
+    <string name="retro_scr_playstation_bios">BIOS PLAYSTATION</string>
+    <string name="retro_scr_installed">Installé</string>
+    <string name="retro_scr_none_ps1_bios">Aucun — les jeux PS1 nécessitent un BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importer le BIOS PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS PS1 supprimé</string>
+    <string name="retro_scr_no_bios_to_remove">Aucun BIOS à supprimer</string>
+    <string name="retro_scr_remove_ps1_bios">Supprimer le BIOS PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Aucun — les jeux PS2 nécessitent un BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Dump fusionné en un seul fichier (.bin marqué par région, ~4 Mo). Les jeux ROM0/MEC/NVM séparés ne sont pas acceptés.</string>
+    <string name="retro_scr_import_ps2_bios">Importer le BIOS PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS PS2 supprimé</string>
+    <string name="retro_scr_remove_ps2_bios">Supprimer le BIOS PS2</string>
+    <string name="retro_scr_library_artwork">ILLUSTRATIONS DE LA BIBLIOTHÈQUE</string>
+    <string name="retro_scr_retro_case_art">Illustration rétro (cartouche / boîtier CD)</string>
+    <string name="retro_scr_box_art">Jaquette</string>
+    <string name="retro_scr_box_art_desc">Récupérée automatiquement depuis thumbnails.libretro.com à l\'import ; une image personnalisée la remplace toujours.</string>
+    <string name="retro_scr_roms_folder">DOSSIER DES ROMS</string>
+    <string name="retro_scr_folder">Dossier</string>
+    <string name="retro_scr_roms_not_set">Non défini — choisissez un dossier pour importer automatiquement les jeux</string>
+    <string name="retro_scr_auto_import">Import automatique</string>
+    <string name="retro_scr_auto_import_desc">Les nouveaux jeux de ce dossier sont ajoutés automatiquement à votre bibliothèque avec la bonne console détectée.</string>
+    <string name="retro_scr_select_roms_folder_title">Sélectionner le dossier des ROMs</string>
+    <string name="retro_scr_select_roms_folder_button">Sélectionner le dossier des ROMs…</string>
+    <string name="retro_scr_change_roms_folder_button">Changer de dossier des ROMs…</string>
+    <string name="retro_scr_scan_now">Analyser maintenant</string>
+    <string name="retro_scr_console_defaults">PARAMÈTRES CONSOLE PAR DÉFAUT</string>
+    <string name="retro_scr_console_defaults_desc">Appuyez sur une console pour définir ses paramètres par défaut.</string>
+    <string name="retro_scr_renderer">Moteur de rendu</string>
+    <string name="retro_scr_upscale_resolution">Résolution de mise à l\'échelle</string>
+    <string name="retro_scr_aspect_ratio">Rapport d\'aspect</string>
+    <string name="retro_scr_aspect_stretch">Étirer</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtre d\'affichage</string>
+    <string name="retro_scr_filter_nearest">Au plus proche</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinéaire (lisse)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinéaire (net)</string>
+    <string name="retro_scr_texture_filter">Filtre de texture</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinéaire (forcé)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinéaire (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinéaire (sprites)</string>
+    <string name="retro_scr_blending_accuracy">Précision du mélange</string>
+    <string name="retro_scr_blend_minimum">Minimale</string>
+    <string name="retro_scr_blend_basic">Basique</string>
+    <string name="retro_scr_blend_medium">Moyenne</string>
+    <string name="retro_scr_blend_high">Élevée</string>
+    <string name="retro_scr_blend_full">Complète</string>
+    <string name="retro_scr_blend_maximum">Maximale</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Désactivé</string>
+    <string name="retro_scr_shader_scanline">Lignes de balayage</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangulaire</string>
+    <string name="retro_scr_shader_wave">Onde</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Saut d\'images</string>
+    <string name="retro_scr_skip_1">Sauter 1</string>
+    <string name="retro_scr_skip_2">Sauter 2</string>
+    <string name="retro_scr_skip_3">Sauter 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Fréquence de cycle EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (par défaut)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Saut de cycle EE</string>
+    <string name="retro_scr_skip_off">Désactivé</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 instantané</string>
+    <string name="retro_scr_mtvu">VU multithread (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rapide</string>
+    <string name="retro_scr_touch_controls">Commandes tactiles à l\'écran</string>
+    <string name="retro_scr_sound">Son</string>
+    <string name="retro_scr_swap_stereo">Inverser les canaux stéréo</string>
+    <string name="retro_scr_hud_fps">HUD : FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD : vitesse d\'émulation</string>
+    <string name="retro_scr_hud_cpu_usage">HUD : utilisation CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD : utilisation GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD : résolution interne</string>
+    <string name="retro_scr_enable_online_dev9">Activer le mode en ligne (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Périphérique Ethernet</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Mode DNS</string>
+    <string name="retro_scr_dns_manual">Manuel</string>
+    <string name="retro_scr_dns_internal">Interne</string>
+    <string name="retro_scr_primary_dns">DNS principal</string>
+    <string name="retro_scr_secondary_dns">DNS secondaire</string>
+    <string name="retro_scr_optional">facultatif</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automatique (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Mise à l\'échelle SGSR</string>
+    <string name="retro_scr_performance_hud">HUD de performances</string>
+    <string name="retro_scr_credits_licenses">CRÉDITS &amp; LICENCES</string>
+    <string name="retro_scr_credits_desc">Certaines fonctionnalités de WinNative reposent sur ces projets open source. Appuyez pour voir chaque source.</string>
+    <string name="retro_scr_tab_defaults">Par défaut</string>
+    <string name="retro_scr_tab_credits">Crédits</string>
+    <string name="retro_scr_enable_hardcore_title">Activer le mode Hardcore ?</string>
+    <string name="retro_scr_enable_hardcore_body">Le mode Hardcore réinitialise le jeu maintenant et désactive le chargement des sauvegardes rapides, l\'avance rapide et les codes de triche. Toute progression non enregistrée sera perdue. Continuer ?</string>
+    <string name="retro_scr_cancel">Annuler</string>
+    <string name="retro_scr_enable">Activer</string>
+    <string name="retro_scr_bios_imported">BIOS importé : %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Fichier BIOS non valide</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS PS2 importé : %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Fichier BIOS PS2 non valide</string>
+    <string name="retro_scr_no_game_serial">Aucun numéro de série de jeu pour rechercher des codes de triche.</string>
+    <string name="retro_scr_applied_cheats">%1$d code(s) de triche appliqué(s).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Impossible d\'appliquer les codes de triche.</string>
+    <string name="retro_scr_cheats">Codes de triche</string>
+    <string name="retro_scr_apply">Appliquer</string>
+    <string name="retro_scr_no_cheats_found">Aucun code de triche trouvé pour ce jeu.</string>
+    <string name="retro_scr_achievements">Succès</string>
+    <string name="retro_scr_sign_in_ra">Se connecter à RetroAchievements</string>
+    <string name="retro_scr_username">Nom d\'utilisateur</string>
+    <string name="retro_scr_password">Mot de passe</string>
+    <string name="retro_scr_login_failed">Échec de la connexion</string>
+    <string name="retro_scr_signing_in">Connexion en cours…</string>
+    <string name="retro_scr_sign_in">Se connecter</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">Aucun succès pour ce jeu.</string>
+    <string name="retro_scr_back">Retour</string>
+    <string name="retro_scr_enabled">Activé</string>
+    <string name="retro_scr_disabled">Désactivé</string>
+    <string name="retro_scr_rename">Renommer</string>
+    <string name="retro_scr_save">Enregistrer</string>
+    <string name="retro_scr_cloud_save_conflict">Conflit de sauvegarde cloud</string>
+    <string name="retro_scr_keep_local_save">Conserver la sauvegarde locale</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Affichage</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Son</string>
+    <string name="retro_tab_controls">Commandes</string>
+    <string name="retro_scan_up_to_date">Bibliothèque à jour</string>
+    <string name="retro_scan_roms">ROMs : %1$s</string>
+    <string name="retro_scan_added">%1$d ajouté(s)</string>
+    <string name="retro_scan_removed">%1$d supprimé(s)</string>
+    <string name="retro_scr_shader_default">Par défaut</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Net</string>
+    <string name="retro_scr_upscale_native">Native</string>
+    <string name="retro_co_aspect_ratio">Rapport d\'aspect</string>
+    <string name="retro_co_ntsc_filter">Filtre NTSC</string>
+    <string name="retro_co_colorization">Colorisation</string>
+    <string name="retro_co_color_correction">Correction des couleurs</string>
+    <string name="retro_co_remove_sprite_limit">Supprimer la limite de sprites</string>
+    <string name="retro_co_resolution">Résolution</string>
+    <string name="retro_co_framebuffer_emulation">Émulation du framebuffer</string>
+    <string name="retro_co_dithering">Tramage</string>
+    <string name="retro_co_widescreen_hack">Hack écran large</string>
+    <string name="retro_co_val_8_7_native">8:7 (native)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Désactivé</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">Écran GBA</string>
+    <string name="retro_co_val_gbc_screen">Écran GBC</string>
+    <string name="retro_co_val_on">Activé</string>
+    <string name="retro_co_val_320x240_native">320x240 (native)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ajusté</string>
+    <string name="retro_co_val_native">Native</string>
+    <string name="retro_co_val_internal">Interne</string>
+    <string name="retro_co_val_on_16_9">Activé (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Connectez-vous avec votre compte RetroAchievements pour gagner et suivre des succès sur les jeux rétro.</string>
+    <string name="retro_ach_username">Nom d\'utilisateur</string>
+    <string name="retro_ach_password">Mot de passe</string>
+    <string name="retro_ach_enter_credentials">Saisissez votre nom d\'utilisateur et votre mot de passe</string>
+    <string name="retro_ach_login_failed">Échec de la connexion</string>
+    <string name="retro_ach_sign_in">Se connecter</string>
+    <string name="retro_ach_password_disclaimer">Votre mot de passe n\'est utilisé qu\'une seule fois pour obtenir un jeton de connexion, stocké en toute sécurité sur l\'appareil.</string>
+    <string name="retro_ach_achievements_enabled">Succès activés</string>
+    <string name="retro_ach_hardcore_mode">Mode Hardcore (pas de sauvegardes rapides)</string>
+    <string name="retro_ach_points">%1$d / %2$d points</string>
+    <string name="retro_ach_none_found">Aucun succès trouvé pour ce jeu.</string>
+    <string name="retro_ach_sign_out">Se déconnecter</string>
+    <string name="retro_che_brand">CODES DE TRICHE</string>
+    <string name="retro_che_name">Nom</string>
+    <string name="retro_che_code">Code</string>
+    <string name="retro_che_cancel">Annuler</string>
+    <string name="retro_che_save">Enregistrer</string>
+    <string name="retro_che_default_name">Code de triche %1$d</string>
+    <string name="retro_che_empty">Aucun code de triche. Ajoutez un code de triche pour ce jeu.</string>
+    <string name="retro_che_add">Ajouter un code</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Pilote GPU</string>
+    <string name="retro_gpu_driver_system">Système (Par défaut)</string>
+    <string name="retro_gpu_driver_hint">Installez les pilotes Turnip dans Paramètres \u2192 Pilotes. Les mêmes pilotes fonctionnent pour les jeux PC et PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Lecteur interne virtuel pour les jeux sur HDD comme Final Fantasy XI. Redémarre le jeu.</string>
+    <string name="retro_ps2_hdd_desc">Lecteur interne virtuel pour les jeux sur HDD comme Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Mode DNS réglé sur Internal pour que vos hôtes de serveur personnalisés prennent effet.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">Cœur CPU</string>
+<string name="retro_co_dual_core">Double cœur</string>
+<string name="retro_co_internal_cheats">Codes de triche internes</string>
+<string name="retro_co_internal_resolution">Résolution interne</string>
+<string name="retro_co_renderer">Moteur de rendu</string>
+<string name="retro_co_sensor_bar">Position de la barre de capteurs</string>
+<string name="retro_co_skip_gc_bios">Passer l\'intro du BIOS</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Bas</string>
+<string name="retro_co_val_cached_interpreter">Interpréteur en cache</string>
+<string name="retro_co_val_hardware">Matériel</string>
+<string name="retro_co_val_interpreter">Interpréteur</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Souris / Tactile</string>
+<string name="retro_co_val_right_stick_absolute">Stick droit (absolu)</string>
+<string name="retro_co_val_right_stick_relative">Stick droit (relatif)</string>
+<string name="retro_co_val_software">Logiciel</string>
+<string name="retro_co_val_stretch">Étirer</string>
+<string name="retro_co_val_top">Haut</string>
+<string name="retro_co_vbi_skip">Saut VBI (saut d\'image auto)</string>
+<string name="retro_co_widescreen">Écran large</string>
+<string name="retro_co_wiimote_pointer">Pointeur Wiimote</string>
+<string name="retro_gs_cheats_apply_note">Les modifications s\'appliquent au prochain lancement de ce jeu.</string>
+<string name="retro_gs_cheats_detect_hint">Lancez ce jeu une fois pour détecter le numéro de série du disque, puis les codes de triche et correctifs apparaîtront ici.</string>
+<string name="retro_gs_dnas_entry_desc">Contournement de l\'authentification DNAS — requis pour le jeu en ligne</string>
+<string name="retro_gs_dnas_group">Appliqué automatiquement (en ligne)</string>
+<string name="retro_gs_group_cheats">Codes de triche &amp; correctifs</string>
+<string name="retro_gs_hdd_image_size">Taille : %1$s</string>
+<string name="retro_gs_hdd_import">Importer une image HDD</string>
+<string name="retro_gs_hdd_remove_short">Supprimer</string>
+<string name="retro_gs_netplay_enable">Activer NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">Désactivé par défaut. Activez-le, puis choisissez Héberger ou Rejoindre avant le lancement.\nSe désactive à nouveau lorsque vous quittez le jeu.</string>
+<string name="retro_gs_netplay_host">Adresse de l\'hôte</string>
+<string name="retro_gs_netplay_host_hint">IP ou nom d\'hôte</string>
+<string name="retro_gs_netplay_host_mode">Héberger une session</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Activé = attendre un joueur. Désactivé = rejoindre l\'adresse de l\'hôte</string>
+<string name="retro_gs_netplay_not_ready">NetPlay utilise les ports multijoueur locaux via TCP (joueur 1 hôte / joueur 2 client). Le jeu en ligne PS2 utilise plutôt l\'Ethernet DEV9.</string>
+<string name="retro_gs_netplay_port">Port</string>
+<string name="retro_lr_memory_card_slot">Carte mémoire %1$d</string>
+<string name="retro_lr_screenshot">Capture d\'écran</string>
+<string name="retro_lr_use_cloud_save">Utiliser la sauvegarde cloud</string>
+<string name="retro_netplay_conn_direct">LAN (IP directe)</string>
+<string name="retro_netplay_connecting">Connexion…</string>
+<string name="retro_netplay_connection">Connexion</string>
+<string name="retro_netplay_conn_traversal">En ligne (code hôte)</string>
+<string name="retro_netplay_dismiss">Ignorer</string>
+<string name="retro_netplay_dolphin_help">Le NetPlay GameCube/Wii utilise le propre moteur de Dolphin. Hôte = Joueur 1, Rejoindre = Joueur 2. Choisissez Héberger ou Rejoindre et un type de connexion avant le lancement ; les deux appareils démarrent le même jeu ensemble.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Partagez l\'IP Wi‑Fi de votre appareil et ce port avec le Joueur 2. Le jeu démarre automatiquement dès qu\'il se connecte.</string>
+<string name="retro_netplay_dolphin_host_online_hint">Un code hôte s\'affiche au démarrage du jeu — partagez-le avec le Joueur 2. Le jeu démarre automatiquement dès qu\'il se connecte.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Saisissez l\'IP Wi‑Fi et le port de l\'hôte, puis lancez pour vous connecter.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Saisissez le code hôte du Joueur 1, puis lancez pour vous connecter.</string>
+<string name="retro_netplay_enable_before_launch">Activez NetPlay dans les paramètres du jeu et choisissez Héberger ou Rejoindre avant le lancement</string>
+<string name="retro_netplay_find_rooms">Trouver des salons sur le Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · chaque écran est sa propre console portable</string>
+<string name="retro_netplay_gba_not_ready">Le multijoueur GBA utilise gpSP + l\'adaptateur sans fil. Assurez-vous que libgpsp est installé.</string>
+<string name="retro_netplay_help">Multijoueur à écran partagé via Wi‑Fi (comme RetroArch).\nHôte = Joueur 1, Rejoindre = Joueur 2. Les deux appareils affichent le même jeu.</string>
+<string name="retro_netplay_help_game_link">Game Link via Wi‑Fi — chaque appareil exécute son propre jeu.\nGB/GBC : liaison série Gambatte (Pokémon Gén 1–2).\nGBA : adaptateur sans fil gpSP (combats Pokémon RF/VF/Émeraude).</string>
+<string name="retro_netplay_host_action">Héberger un salon</string>
+<string name="retro_netplay_host_code">Code hôte</string>
+<string name="retro_netplay_host_code_hint">Code hôte de traversée fourni par l\'hôte</string>
+<string name="retro_netplay_hosting_room">Hébergement du salon</string>
+<string name="retro_netplay_host_mode_hint">Appuyez sur Héberger pour ouvrir un salon pour cette session de jeu, puis lancez le jeu. NetPlay se désactive lorsque vous quittez.</string>
+<string name="retro_netplay_in_room">Dans le salon</string>
+<string name="retro_netplay_join_action">Rejoindre par IP</string>
+<string name="retro_netplay_joined">Rejoint</string>
+<string name="retro_netplay_join_room">Rejoindre</string>
+<string name="retro_netplay_launch_mode">Au lancement</string>
+<string name="retro_netplay_leave">Quitter</string>
+<string name="retro_netplay_menu_hint">Hôte = J1 · Rejoindre = J2 · même jeu sur les deux écrans</string>
+<string name="retro_netplay_mode_host">Héberger</string>
+<string name="retro_netplay_mode_join">Rejoindre</string>
+<string name="retro_netplay_mode_manual">Manuel</string>
+<string name="retro_netplay_no_rooms">Aucun salon trouvé. Assurez-vous que l\'hôte est sur le même Wi‑Fi et héberge un salon.</string>
+<string name="retro_netplay_player_name">Nom affiché</string>
+<string name="retro_netplay_player_name_hint">Affiché aux autres joueurs</string>
+<string name="retro_netplay_players_count">%1$d connecté(s)</string>
+<string name="retro_netplay_prelaunch_hint">Le salon est ouvert pour cette session uniquement. Lancez quand vous êtes prêt. Quitter le jeu désactive NetPlay.</string>
+<string name="retro_netplay_room_players">Joueurs</string>
+<string name="retro_netplay_scan_action">Analyser le Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Analyser à nouveau</string>
+<string name="retro_netplay_scan_hint">Analysez le même Wi‑Fi à la recherche de salons ouverts, ou rejoignez par adresse IP.</string>
+<string name="retro_netplay_scanning">Analyse du Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Résultats de l\'analyse</string>
+<string name="retro_netplay_select_room_hint">Appuyez sur un salon pour le rejoindre maintenant (n\'enregistre pas l\'IP pour le prochain lancement).</string>
+<string name="retro_netplay_stop_scan">Arrêter l\'analyse</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s connecté</string>
+<string name="retro_netplay_user_disconnected">%1$s déconnecté</string>
+<string name="retro_netplay_waiting_players">En attente des joueurs…</string>
+<string name="retro_ps2_coming_soon">La prise en charge de la PlayStation 2 arrive bientôt</string>
+<string name="retro_ps2_show_l3r3">Afficher les boutons L3 / R3</string>
+<string name="retro_ps2_show_l3r3_subtitle">Lorsque désactivé, appuyez deux fois sur un stick pour cliquer L3 / R3</string>
+<string name="retro_ps2_turnip_flags">DRAPEAUX DU PILOTE TURNIP</string>
+<string name="retro_ps2_turnip_flags_note">Appliqué uniquement lorsqu\'un pilote GPU personnalisé est sélectionné ci-dessus.</string>
+<string name="retro_rom_missing">Fichier de jeu introuvable</string>
+<string name="retro_scr_delete">Supprimer</string>
+<string name="retro_scr_import_from_file">Importer depuis un fichier…</string>
+<string name="retro_scr_loading">Chargement…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Changer de console</string>
+    <string name="retro_gs_identify_as">Identifier comme console</string>
+    <string name="retro_gs_console_changed">Désormais identifié comme %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Appliquez un effet ReShade (.fx) aux jeux DXVK/VKD3D (Vulkan) via la couche vkBasalt intégrée. Placez chaque effet dans son propre dossier sous Android/data/&lt;package&gt;/files/ReShade/. Le réglage des paramètres en direct et le bouton en jeu arriveront avec la mise à jour de la couche à rechargement à chaud.</string>
+    <string name="reshade_catalog_title">Effets ReShade</string>
+    <string name="reshade_catalog_search">Rechercher des effets…</string>
+    <string name="reshade_catalog_installed">Installés (%1$d)</string>
+    <string name="reshade_catalog_available">Disponibles (%1$d)</string>
+    <string name="reshade_catalog_downloading">Téléchargement</string>
+    <string name="reshade_catalog_installing">Installation</string>
+    <string name="reshade_catalog_offline_cache">Hors ligne — liste en cache affichée. Connectez-vous pour télécharger de nouveaux effets.</string>
+    <string name="reshade_catalog_offline_none">Hors ligne — seuls les effets installés sont affichés. Connectez-vous pour parcourir le catalogue.</string>
+    <string name="reshade_catalog_needs_connection">Connectez-vous à Internet pour télécharger des effets.</string>
+    <string name="reshade_catalog_download_failed">Échec du téléchargement de %1$s.</string>
+    <string name="reshade_catalog_empty_query">Aucun effet ne correspond à \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Aucun effet disponible. Connectez-vous à Internet pour parcourir le catalogue.</string>
+    <string name="reshade_catalog_done">Terminé</string>
+    <string name="reshade_catalog_delete_cd">Supprimer %1$s</string>
+    <string name="reshade_catalog_delete_title">Supprimer %1$s ?</string>
+    <string name="reshade_catalog_delete_body">Cela supprime l\'effet du stockage et de toute configuration qui l\'utilise. Vous pourrez le télécharger à nouveau plus tard.</string>
+    <string name="reshade_catalog_delete_confirm">Supprimer</string>
+    <string name="reshade_catalog_delete_cancel">Annuler</string>
+    <string name="reshade_catalog_delete_failed">Impossible de supprimer %1$s.</string>
+    <string name="reshade_params_title">PARAMÈTRES DE L\'EFFET</string>
+    <string name="reshade_params_reset">Réinitialiser</string>
+    <string name="reshade_loadout_empty">Aucun effet pour l\'instant. Ajoutez un ou plusieurs effets pour créer une configuration.</string>
+    <string name="reshade_loadout_add">Ajouter un effet</string>
+    <string name="reshade_loadout_full">Configuration pleine — supprimez un effet pour en ajouter un autre.</string>
+    <string name="reshade_effect_active">actif</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pile</string>
+    <string name="reshade_mode_solo_hint">Un seul effet actif à la fois (comparaison A/B, changez en direct dans le jeu).</string>
+    <string name="reshade_mode_stack_hint">Superposez n\'importe quel sous-ensemble d\'effets, appliqués dans l\'ordre.</string>
+    <string name="reshade_drawer_enable">Activer ReShade</string>
+    <string name="reshade_drawer_empty">Aucun effet ReShade dans cette configuration. Ajoutez des effets dans les paramètres de ce jeu (ou du conteneur) pour les changer et les régler ici.</string>
+    <string name="reshade_drawer_no_params">Cet effet n\'expose aucun paramètre réglable.</string>
+    <string name="cloud_saves_deleting">Suppression de la sauvegarde…</string>
+    <string name="cloud_saves_history_delete">Supprimer</string>
+    <string name="cloud_saves_history_delete_confirm_body">Supprimer définitivement la sauvegarde cloud de %1$s ? Cette action est irréversible.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Supprimer la sauvegarde cloud</string>
+    <string name="cloud_saves_history_delete_failed">Impossible de supprimer la sauvegarde cloud</string>
+    <string name="cloud_saves_history_delete_success">Sauvegarde cloud supprimée</string>
+    <string name="retro_bundle_required">Téléchargez d\'abord les cœurs de console — Paramètres › Rétro</string>
+    <string name="retro_ps2_device_unsupported">Cet appareil ne peut pas exécuter l\'émulation PS2 — il faut OpenGL ES 3.1 ou plus récent.</string>
+    <string name="retro_scr_consoles_check">Rechercher des mises à jour</string>
+    <string name="retro_scr_consoles_checking">Recherche de mises à jour…</string>
+    <string name="retro_scr_consoles_download">Télécharger les cœurs de console</string>
+    <string name="retro_scr_consoles_downloading">Téléchargement… %1$d / %2$d Mo</string>
+    <string name="retro_scr_consoles_group">Cœurs de console</string>
+    <string name="retro_scr_consoles_installed">Installé — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installé — build %1$s (échec de la recherche de mises à jour)</string>
+    <string name="retro_scr_consoles_installing">Installation…</string>
+    <string name="retro_scr_consoles_missing">Non installé — téléchargez pour jouer aux jeux rétro</string>
+    <string name="retro_scr_consoles_state">État</string>
+    <string name="retro_scr_consoles_update">Mettre à jour les cœurs de console</string>
+    <string name="retro_scr_consoles_update_available">Mise à jour disponible — build %1$s (%2$d Mo)</string>
+    <string name="retro_scr_consoles_verifying">Vérification du téléchargement…</string>
+    <string name="retro_scr_consoles_working">Traitement…</string>
+    <string name="retro_tab_system">Système</string>
 </resources>
+
diff --git a/app/src/main/res/values-hi/arrays.xml b/app/src/main/res/values-hi/arrays.xml
new file mode 100644
index 000000000..659921178
--- /dev/null
+++ b/app/src/main/res/values-hi/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>छवि</item>
+        <item>मूल</item>
+        <item>ठोस रंग</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-hi/plurals.xml b/app/src/main/res/values-hi/plurals.xml
new file mode 100644
index 000000000..c0813440c
--- /dev/null
+++ b/app/src/main/res/values-hi/plurals.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP एसेट</item>
+        <item quantity="other">%d ZIP एसेट</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 000000000..4ec7d0be4
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,2413 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">चलाएँ</string>
+    <string name="common_ui_edit">संपादित करें</string>
+    <string name="common_ui_remove">हटाएँ</string>
+    <string name="common_ui_add">जोड़ें</string>
+    <string name="common_ui_shortcuts">शॉर्टकट</string>
+    <string name="common_ui_containers">कंटेनर</string>
+    <string name="common_ui_input_controls">इनपुट नियंत्रण</string>
+    <string name="common_ui_no_items_to_display">प्रदर्शित करने के लिए कोई आइटम नहीं</string>
+    <string name="common_ui_select_icon">आइकन चुनें</string>
+    <string name="common_ui_revert_icon">आइकन वापस करें</string>
+    <string name="common_ui_select_exe">EXE चुनें</string>
+    <string name="common_ui_select_folder">फ़ोल्डर चुनें</string>
+    <string name="common_ui_current_folder">वर्तमान फ़ोल्डर</string>
+    <string name="common_ui_enter_path">पथ दर्ज करें</string>
+    <string name="common_ui_path_not_found">पथ नहीं मिला</string>
+    <string name="common_ui_select_valid_exe_file">कृपया मान्य .exe फ़ाइल चुनें</string>
+    <string name="common_ui_select_valid_icon_file">कृपया मान्य .ico या .png फ़ाइल चुनें।</string>
+    <string name="common_ui_exit">बाहर निकलें</string>
+    <string name="common_ui_exit_app">ऐप से बाहर निकलें</string>
+    <string name="common_ui_profile">प्रोफ़ाइल</string>
+    <string name="common_ui_name">नाम</string>
+    <string name="common_ui_ok">ठीक है</string>
+    <string name="common_ui_cancel">रद्द करें</string>
+    <string name="common_ui_untitled">शीर्षकहीन</string>
+    <string name="common_ui_disabled">अक्षम</string>
+    <string name="common_ui_container">कंटेनर</string>
+    <string name="common_ui_value">मान</string>
+    <string name="common_ui_none">कोई नहीं</string>
+    <string name="common_ui_custom_text">कस्टम टेक्स्ट</string>
+    <string name="common_ui_icon">आइकन</string>
+    <string name="common_ui_duplicate">डुप्लिकेट</string>
+    <string name="common_ui_credits_and_third_party_apps">श्रेय और तृतीय-पक्ष ऐप्स</string>
+    <string name="common_ui_loading">लोड हो रहा है</string>
+    <string name="common_ui_enable">सक्षम करें</string>
+    <string name="common_ui_disable">अक्षम करें</string>
+    <string name="common_ui_force">बाध्य करें</string>
+    <string name="common_ui_version">संस्करण</string>
+    <string name="common_ui_advanced">उन्नत</string>
+    <string name="common_ui_graphics">ग्राफ़िक्स</string>
+    <string name="common_ui_system">सिस्टम</string>
+    <string name="common_ui_width">चौड़ाई</string>
+    <string name="common_ui_height">ऊँचाई</string>
+    <string name="common_ui_open_file">फ़ाइल खोलें</string>
+    <string name="common_ui_download_file">फ़ाइल डाउनलोड करें</string>
+    <string name="common_ui_downloading_file">फ़ाइल डाउनलोड हो रही है</string>
+    <string name="common_ui_browse">ब्राउज़ करें</string>
+    <string name="common_ui_options">विकल्प</string>
+    <string name="common_ui_export">निर्यात करें</string>
+    <string name="common_ui_new_file">नई फ़ाइल</string>
+    <string name="common_ui_description">विवरण</string>
+    <string name="common_ui_continue">जारी रखें</string>
+    <string name="common_ui_warning">चेतावनी</string>
+    <string name="common_ui_copy">कॉपी</string>
+    <string name="common_ui_reset">रीसेट</string>
+    <string name="common_ui_close">बंद करें</string>
+    <string name="common_ui_confirm">पुष्टि करें</string>
+    <string name="common_ui_unnamed">बिना नाम</string>
+    <string name="common_ui_download">डाउनलोड</string>
+    <string name="common_ui_uninstall">अनइंस्टॉल करें</string>
+    <string name="common_ui_other">अन्य</string>
+    <string name="common_ui_status">स्थिति</string>
+    <string name="common_ui_size">आकार</string>
+    <string name="common_ui_release_date">रिलीज़ दिनांक</string>
+    <string name="common_ui_installed">इंस्टॉल है</string>
+    <string name="common_ui_available">उपलब्ध</string>
+    <string name="common_ui_settings">सेटिंग्स</string>
+    <string name="common_ui_enable_all">सभी सक्षम करें</string>
+    <string name="common_ui_disable_all">सभी अक्षम करें</string>
+    <string name="common_ui_select_all">सभी चुनें</string>
+    <string name="common_ui_deselect_all">सभी अचयनित करें</string>
+    <string name="common_ui_on">चालू</string>
+    <string name="common_ui_off">बंद</string>
+    <string name="common_ui_already_set">पहले से सेट है</string>
+    <string name="common_ui_shortcut">शॉर्टकट</string>
+    <string name="common_ui_custom">कस्टम</string>
+    <string name="common_ui_about">परिचय</string>
+    <string name="common_ui_back">वापस</string>
+    <string name="common_ui_apply">लागू करें</string>
+    <string name="common_ui_save">सहेजें</string>
+    <string name="common_ui_clone">क्लोन करें</string>
+    <string name="common_ui_properties">गुण</string>
+    <string name="common_ui_store">स्टोर</string>
+    <string name="common_ui_library">लाइब्रेरी</string>
+    <string name="common_ui_downloads">डाउनलोड</string>
+    <string name="common_ui_import">आयात करें</string>
+    <string name="common_ui_sync">सिंक करें</string>
+    <string name="common_ui_sign_in">साइन इन करें</string>
+    <string name="common_ui_submit">सबमिट करें</string>
+    <string name="common_ui_coming_soon">जल्द आ रहा है</string>
+    <string name="common_ui_signed_in">साइन इन है</string>
+    <string name="common_ui_required">आवश्यक</string>
+    <string name="common_ui_optional">वैकल्पिक</string>
+    <string name="common_ui_notifications">सूचनाएँ</string>
+    <string name="common_ui_mode">मोड</string>
+    <string name="common_ui_experimental">(प्रायोगिक)</string>
+    <string name="common_ui_current_version_label">वर्तमान संस्करण:</string>
+    <string name="common_ui_cannot_write_folder">चुने गए फ़ोल्डर में लिखा नहीं जा सकता</string>
+    <string name="common_ui_failed_create_directory">डिफ़ॉल्ट डायरेक्टरी बनाने में विफल</string>
+    <string name="common_ui_device_not_supported">क्षमा करें, आपका डिवाइस समर्थित नहीं हो सकता</string>
+    <string name="common_ui_please_wait">कृपया प्रतीक्षा करें\u2026</string>
+    <string name="common_ui_done">पूर्ण</string>
+    <string name="common_ui_open">खोलें</string>
+    <string name="common_ui_connected">कनेक्टेड</string>
+    <string name="common_ui_install">इंस्टॉल करें</string>
+    <string name="common_ui_application">ऐप्लिकेशन</string>
+    <string name="common_ui_check">जाँचें</string>
+    <string name="store_game_check_for_update">अपडेट की जाँच करें</string>
+    <string name="store_game_checking_for_update">जाँच हो रही है</string>
+    <string name="store_game_download_update">अपडेट डाउनलोड करें</string>
+    <string name="store_game_no_update_available">कोई अपडेट उपलब्ध नहीं</string>
+    <string name="store_game_update_available">अपडेट उपलब्ध है</string>
+    <string name="store_game_update_check_failed">अपडेट जाँच विफल रही</string>
+    <string name="store_game_update">अपडेट</string>
+    <string name="store_game_workshop">वर्कशॉप</string>
+    <string name="store_game_verify_files">फ़ाइलें सत्यापित करें</string>
+    <string name="store_game_verify_started">%1$s का सत्यापन - डाउनलोड टैब की जाँच करें</string>
+    <string name="store_game_steam_options">Steam विकल्प</string>
+    <string name="store_game_verify_complete">फ़ाइल सत्यापन पूरा हुआ</string>
+    <string name="store_game_verify_failed_notice">फ़ाइल सत्यापन विफल रहा</string>
+    <string name="store_game_progress_background_hint">आप इसे बंद कर सकते हैं - यह चलता रहता है। किसी भी समय डाउनलोड टैब जांचें।</string>
+    <string name="store_game_checking_updates">अपडेट की जाँच हो रही है</string>
+    <string name="store_game_no_updates_notice">कोई अपडेट उपलब्ध नहीं</string>
+    <string name="store_game_update_complete">अपडेट पूरा हुआ</string>
+    <string name="store_game_update_failed_notice">अपडेट विफल रहा</string>
+    <string name="store_game_update_check_failed_notice">अपडेट जाँच विफल रही</string>
+    <string name="store_game_download_already_active">यह गेम पहले से ही डाउनलोड हो रहा है. DLC जोड़ने से पहले वर्तमान डाउनलोड रद्द करें।</string>
+    <string name="common_ui_select">चुनें</string>
+    <string name="common_ui_storage_roots">स्टोरेज रूट</string>
+    <string name="common_ui_browse_local_folders_directly">स्थानीय फ़ोल्डर सीधे ब्राउज़ करें</string>
+    <string name="common_ui_no_folders_available_here">यहाँ कोई फ़ोल्डर उपलब्ध नहीं</string>
+    <string name="common_ui_grant_all_files_access_browse">फ़ोल्डरों को सीधे ब्राउज़ करने के लिए सभी फ़ाइलों तक पहुंच प्रदान करें।</string>
+    <string name="common_ui_not_configured">कॉन्फ़िगर नहीं</string>
+    <string name="common_ui_reinstall">पुनः इंस्टॉल करें</string>
+    <string name="common_ui_exit_app_confirm">WinNative से बाहर निकलें?</string>
+    <string name="common_ui_elements_count">%1$d तत्व</string>
+    <string name="common_ui_disabled_placeholder">-- अक्षम --</string>
+    <string name="common_ui_enabled">सक्षम</string>
+    <string name="common_ui_unknown_error">अज्ञात त्रुटि</string>
+    <string name="common_ui_auto_detected">स्वतः पता चला</string>
+    <string name="common_ui_change">बदलें</string>
+    <string name="common_ui_proceed">आगे बढ़ें</string>
+    <string name="common_ui_sign_out">साइन आउट करें</string>
+    <string name="common_ui_name_cannot_be_empty">नाम खाली नहीं हो सकता</string>
+    <string name="common_ui_error_with_message">त्रुटि: %1$s</string>
+    <string name="common_ui_64_bit">64-BIT</string>
+    <string name="common_ui_32_bit">32-BIT</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BIT और 32-BIT</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d फ़ोल्डर</item>
+        <item quantity="other">%d फ़ोल्डर</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d फ़ाइल</item>
+        <item quantity="other">%d फ़ाइलें</item>
+    </plurals>
+    <string name="library_games_scrape_artwork">आर्टवर्क प्राप्त करें</string>
+    <string name="library_games_scraping_artwork">प्राप्त हो रहा है</string>
+    <string name="library_games_shortcut_created">शॉर्टकट बनाया गया</string>
+    <string name="library_games_failed_to_create_shortcut">शॉर्टकट बनाने में विफल: %s</string>
+    <string name="library_games_install_path">इंस्टॉल पथ</string>
+    <string name="library_games_not_enough_space">%1$s अधिक स्थान की आवश्यकता है</string>
+    <string name="library_games_download_slash_install">डाउनलोड / इंस्टॉल</string>
+    <string name="library_games_save_management">सेव प्रबंधन</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • उपलब्ध: %3$s</string>
+    <string name="library_games_last_played">आखिरी बार खेला गया</string>
+    <string name="library_games_playtime">खेलने का समय</string>
+    <string name="library_games_plays">खेल</string>
+    <string name="library_games_dlcs">DLCs</string>
+    <string name="library_games_uninstall_game">गेम अनइंस्टॉल करें</string>
+    <string name="library_games_remove_game">गेम हटाएँ</string>
+    <string name="library_games_uninstall_confirm">%1$s को अनइंस्टॉल करें और इसके इंस्टॉल किए गए गेम फ़ोल्डर को स्थायी रूप से हटा दें?</string>
+    <string name="library_games_remove_confirm">अपनी लाइब्रेरी से %1$s हटाएं। डिस्क पर गेम फ़ाइलें अछूती रहेंगी?</string>
+    <string name="library_games_game_uninstalled">%1$s अनइंस्टॉल किया गया.</string>
+    <string name="library_games_game_removed">%1$s हटा दिया गया.</string>
+    <string name="library_games_failed_to_uninstall">अनइंस्टॉल करने में विफल.</string>
+    <string name="library_games_failed_to_uninstall_reason">अनइंस्टॉल करने में विफल: %1$s</string>
+    <string name="library_games_loading">लाइब्रेरी लोड हो रही है\u2026</string>
+    <string name="library_games_no_games_installed">कोई गेम इंस्टॉल नहीं है. गेम जोड़ने के लिए स्टोर टैब या + बटन का उपयोग करें।</string>
+    <string name="library_games_times_played_label">खेले गए समय की संख्या:</string>
+    <string name="library_games_playtime_label">खेलने का समय: </string>
+    <string name="library_games_no_games_hub">कोई गेम इंस्टॉल नहीं\nWinlator बैकएंड खोलने के लिए क्लिक करें</string>
+    <string name="library_games_installed_badge">इंस्टॉल है</string>
+    <string name="library_games_unknown_game">अज्ञात गेम</string>
+    <string name="library_games_layouts_header">लाइब्रेरी लेआउट</string>
+    <string name="library_games_layout_carousel">कैरोसेल</string>
+    <string name="library_games_layout_list">सूची</string>
+    <string name="library_games_view_options_header">दृश्य विकल्प</string>
+    <string name="library_games_immersive_mode">इमर्सिव मोड</string>
+    <string name="library_games_immersive_mode_description">फोकस किए गए गेम की आर्ट को बैकग्राउंड के रूप में उपयोग करें</string>
+    <string name="library_games_immersive_blur">बैकग्राउंड धुंधला करें</string>
+    <string name="library_games_immersive_blur_description">इमर्सिव बैकग्राउंड पर धुंधला प्रभाव लागू करें</string>
+    <string name="library_games_custom_game">कस्टम गेम</string>
+    <string name="library_games_play">खेलें</string>
+    <string name="hero_boot_to_desktop_title">डेस्कटॉप पर बूट करें</string>
+    <string name="hero_graphics_tests_title">ग्राफ़िक्स परीक्षण</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">इनपुट परीक्षण</string>
+    <string name="library_games_add_custom_game">कस्टम गेम जोड़ें</string>
+    <string name="library_games_game_name">गेम का नाम</string>
+    <string name="library_games_game_folder_mapped_drive">गेम फ़ोल्डर (मैप्ड गेम ड्राइव)</string>
+    <string name="library_games_select_exe_provide_name">एक exe चुनें और नाम दें</string>
+    <string name="library_games_sign_in_prompt">किसी स्टोर में साइन इन करें या अपनी लाइब्रेरी बनाने के लिए एक कस्टम गेम जोड़ें।</string>
+    <string name="stores_accounts_title">स्टोर</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">साझा डाउनलोड फ़ोल्डर</string>
+    <string name="stores_accounts_shared_downloads_subtitle">सभी स्टोर में एक ही फ़ोल्डर का उपयोग करें</string>
+    <string name="stores_accounts_default_downloads_folder">डिफ़ॉल्ट डाउनलोड फ़ोल्डर</string>
+    <string name="stores_accounts_steam_downloads">Steam डाउनलोड</string>
+    <string name="stores_accounts_epic_downloads">Epic डाउनलोड</string>
+    <string name="stores_accounts_gog_downloads">GOG डाउनलोड</string>
+    <string name="stores_accounts_download_speed">डाउनलोड गति</string>
+    <string name="stores_accounts_download_speed_subtitle">Steam डाउनलोड थ्रेड समवर्ती को नियंत्रित करता है</string>
+    <string name="stores_accounts_download_server">डाउनलोड सर्वर</string>
+    <string name="stores_accounts_connected_stores">कनेक्टेड स्टोर</string>
+    <string name="stores_accounts_download_settings">डाउनलोड सेटिंग्स</string>
+    <string name="stores_accounts_download_speed_conservative">सुरक्षित</string>
+    <string name="stores_accounts_download_speed_balanced">संतुलित</string>
+    <string name="stores_accounts_download_speed_standard">मानक</string>
+    <string name="stores_accounts_download_speed_performance">प्रदर्शन</string>
+    <string name="stores_accounts_download_server_auto_detected">स्वतः पता लगाया गया: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">गेम डाउनलोड के लिए Steam CDN क्षेत्र</string>
+    <string name="stores_accounts_sign_out_confirm">%1$s से साइन आउट करें?</string>
+    <string name="stores_accounts_sign_out_message">अपनी लाइब्रेरी तक पहुंचने के लिए आपको फिर से साइन इन करना होगा।</string>
+    <string name="stores_accounts_logged_in_epic">Epic Games में लॉग इन किया!</string>
+    <string name="stores_accounts_epic_login_failed">Epic लॉगिन विफल: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">GOG में लॉग इन किया!</string>
+    <string name="stores_accounts_gog_login_failed">GOG लॉगिन विफल: %1$s</string>
+    <string name="stores_accounts_custom_download_path">कस्टम डाउनलोड पथ</string>
+    <string name="stores_accounts_custom_download_path_description">सेटिंग्स &gt; स्टोर्स में एक डिफ़ॉल्ट डाउनलोड पथ पहले से ही कॉन्फ़िगर किया गया है। यदि आप इस विशिष्ट इंस्टॉलेशन के लिए एक अद्वितीय कस्टम पथ सेट करना चाहते हैं, तो आगे बढ़ें पर क्लिक करें।</string>
+    <string name="stores_accounts_not_signed_in">साइन इन नहीं किया गया</string>
+    <string name="stores_accounts_status_online">ऑनलाइन</string>
+    <string name="stores_accounts_status_away">दूर</string>
+    <string name="stores_accounts_status_offline">ऑफ़लाइन</string>
+    <string name="stores_accounts_status_invisible">अदृश्य</string>
+    <string name="stores_accounts_status_header">स्थिति</string>
+    <string name="stores_accounts_stores_header">स्टोर</string>
+    <string name="stores_accounts_sign_in_store_prompt">कृपया %1$s स्टोर तक पहुंचने के लिए साइन इन करें।</string>
+    <string name="stores_accounts_manage">स्टोर खाते प्रबंधित करें</string>
+    <string name="stores_accounts_sign_into_store">%1$s में साइन इन करें</string>
+    <string name="downloads_queue_cancel_all">सभी रद्द करें</string>
+    <string name="downloads_queue_preparing_download">डाउनलोड तैयार हो रहा है</string>
+    <string name="downloads_queue_installing_package">पैकेज इंस्टॉल हो रहा है</string>
+    <string name="downloads_queue_resume_all">सभी फिर शुरू करें</string>
+    <string name="downloads_queue_pause_all">सभी रोकें</string>
+    <string name="downloads_queue_clear">साफ़ करें</string>
+    <string name="downloads_queue_status_label">स्थिति:</string>
+    <string name="downloads_queue_phase_downloading">डाउनलोड हो रहा है</string>
+    <string name="downloads_queue_phase_downloading_file">डाउनलोड हो रहा है... [%1$s]</string>
+    <string name="downloads_queue_phase_queued">कतार में</string>
+    <string name="downloads_queue_phase_paused">रोका गया</string>
+    <string name="downloads_queue_phase_preparing">तैयार हो रहा है</string>
+    <string name="downloads_queue_phase_verifying">सत्यापित हो रहा है</string>
+    <string name="downloads_queue_phase_verifying_file">सत्यापन हो रहा है... [%1$s]</string>
+    <string name="downloads_queue_phase_patching">पैच हो रहा है</string>
+    <string name="downloads_queue_phase_applying_data">डेटा लागू हो रहा है</string>
+    <string name="downloads_queue_phase_finalizing">अंतिम रूप दिया जा रहा है</string>
+    <string name="downloads_queue_phase_unpacking">अनपैक हो रहा है</string>
+    <string name="downloads_queue_phase_updating">अपडेट हो रहा है</string>
+    <string name="downloads_queue_phase_complete">पूर्ण</string>
+    <string name="downloads_queue_phase_cancelled">रद्द</string>
+    <string name="downloads_queue_phase_failed">विफल: %1$s</string>
+    <string name="downloads_queue_phase_unknown">अज्ञात</string>
+    <string name="downloads_queue_paused_resume_hint">रोका गया - जारी रखने के लिए फिर से शुरू करें पर टैप करें</string>
+    <string name="downloads_queue_cancel_download">डाउनलोड रद्द करें</string>
+    <string name="downloads_queue_cancel_download_title">डाउनलोड रद्द करें?</string>
+    <string name="downloads_queue_cancel_download_warning">DLC, गेम या अपडेट डाउनलोड को रद्द करने से आपका गेम इंस्टॉल संभावित रूप से दूषित हो सकता है।\n\nक्या आप वाकई इस डाउनलोड को रद्द करना चाहते हैं और अब तक डाउनलोड की गई फ़ाइलों को हटाना चाहते हैं?</string>
+    <string name="downloads_queue_cancel_all_title">सभी डाउनलोड रद्द करें?</string>
+    <string name="downloads_queue_cancel_all_warning">DLC, गेम या अपडेट डाउनलोड रद्द करने से संभावित रूप से आपका गेम इंस्टॉल ख़राब हो सकता है।\n\nक्या आप वाकई सभी डाउनलोड रद्द करना चाहते हैं और अब तक डाउनलोड की गई फ़ाइलों को हटाना चाहते हैं?</string>
+    <string name="downloads_queue_empty">कोई सक्रिय डाउनलोड नहीं।</string>
+    <string name="containers_list_new">नया कंटेनर</string>
+    <string name="containers_list_edit">कंटेनर संपादित करें</string>
+    <string name="containers_list_creating">कंटेनर बनाया जा रहा है</string>
+    <string name="containers_list_removing">कंटेनर हटाया जा रहा है</string>
+    <string name="containers_list_duplicating">कंटेनर डुप्लिकेट किया जा रहा है</string>
+    <string name="containers_list_remove_title">कंटेनर हटाएं</string>
+    <string name="containers_list_duplicate_title">कंटेनर की नकल बनाएं</string>
+    <string name="containers_list_confirm_remove">क्या आप इस कंटेनर को हटाना चाहते हैं?</string>
+    <string name="containers_list_confirm_duplicate">क्या आप इस कंटेनर की नकल बनाना चाहते हैं?</string>
+    <string name="containers_list_duplicate_failed">कंटेनर डुप्लिकेट करने में विफल</string>
+    <string name="shortcuts_list_confirm_remove">क्या आप इस शॉर्टकट को हटाना चाहते हैं?</string>
+    <string name="shortcuts_list_add_to_home_screen">होम स्क्रीन में जोड़ें</string>
+    <string name="shortcuts_library_artwork_title">लाइब्रेरी आर्टवर्क</string>
+    <string name="shortcuts_library_artwork_icon_title">आइकन आर्ट</string>
+    <string name="shortcuts_library_artwork_hero_title">पृष्ठभूमि</string>
+    <string name="shortcuts_library_artwork_set">छवि सेट करें</string>
+    <string name="shortcuts_library_artwork_failed">चयनित छवि लोड करने में विफल.</string>
+    <string name="shortcuts_library_artwork_open_source">SteamGridDB खोलें</string>
+    <string name="shortcuts_list_not_available">यह शॉर्टकट अब उपलब्ध नहीं है. कृपया इसे हटा दें या पुनः बनाएं।</string>
+    <string name="shortcuts_list_select_a_container">कंटेनर चुनें</string>
+    <string name="shortcuts_list_error_opening_settings">शॉर्टकट सेटिंग खोलने में त्रुटि</string>
+    <string name="shortcuts_list_removed">शॉर्टकट सफलतापूर्वक हटाया गया.</string>
+    <string name="shortcuts_list_remove_failed">शॉर्टकट हटाने में विफल. कृपया पुन: प्रयास करें।</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">शॉर्टकट\n%1$s हटाएं</string>
+    <string name="shortcuts_list_cloned">शॉर्टकट क्लोन सफलतापूर्वक किया गया.</string>
+    <string name="shortcuts_list_clone_failed">शॉर्टकट क्लोन करने में विफल.</string>
+    <string name="shortcuts_list_exported_to">शॉर्टकट %1$s पर निर्यात किया गया</string>
+    <string name="shortcuts_list_failed_export">शॉर्टकट निर्यात करने में विफल</string>
+    <string name="shortcuts_export_all">सभी निर्यात करें</string>
+    <string name="shortcuts_export_to_frontend">फ्रंटएंड में निर्यात करें</string>
+    <string name="shortcuts_export_all_done">%1$d गेम %2$s में निर्यात किए गए</string>
+    <string name="shortcuts_export_all_none">निर्यात करने के लिए कोई गेम नहीं</string>
+    <string name="shortcuts_list_added">शॉर्टकट सफलतापूर्वक जोड़ा गया.</string>
+    <string name="shortcuts_list_readded_existing">मौजूदा शॉर्टकट पुनः जोड़ा गया</string>
+    <string name="shortcuts_list_failed_add">शॉर्टकट जोड़ने में विफल.</string>
+    <string name="shortcuts_properties_exec_arguments">Exec आर्ग्युमेंट्स</string>
+    <string name="shortcuts_properties_target_path">लक्ष्य पथ</string>
+    <string name="shortcuts_properties_disable_xinput">Xinput अक्षम करें (विशेष एम/केबी नियंत्रण के लिए)</string>
+    <string name="num_controllers">कंट्रोलरों की संख्या</string>
+    <string name="shortcuts_properties_exclusive_input">विशेष इनपुट</string>
+    <string name="shortcuts_properties_custom_game_settings">कस्टम गेम सेटिंग्स</string>
+    <string name="shortcuts_properties_runtime_patcher">रनटाइम DRM पैचर</string>
+    <string name="shortcuts_properties_runtime_patcher_description">लॉन्च के समय DRM पैचर DLL इंजेक्ट करता है। FPS कम करता है - केवल तब उपयोग करें जब Legacy Launcher अकेले विफल हो।</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="shortcuts_properties_use_steam_input">Steam Input उपयोग करें</string>
+    <string name="shortcuts_properties_steam_offline_mode">Steam ऑफ़लाइन मोड</string>
+    <string name="shortcuts_properties_reset">गुण रीसेट करें</string>
+    <string name="shortcuts_properties_updated_at">शॉर्टकट %1$s पर अपडेट किया गया</string>
+    <string name="shortcuts_properties_properties_reset">गुण सफलतापूर्वक रीसेट हो गए.</string>
+    <string name="shortcuts_properties_reset_per_game">प्रति-गेम सेटिंग्स रीसेट करें</string>
+    <string name="shortcuts_properties_reset_per_game_message">चयनित कंटेनर डिफ़ॉल्ट का उपयोग करने के लिए इस गेम को रीसेट करें?</string>
+    <string name="shortcuts_properties_per_game_reset">प्रति-गेम सेटिंग्स चयनित कंटेनर डिफ़ॉल्ट पर रीसेट हो जाती हैं</string>
+    <string name="input_controls_editor_no_element_selected">कोई नियंत्रण तत्व चयनित नहीं</string>
+    <string name="input_controls_editor_scale">स्केल</string>
+    <string name="input_controls_editor_shape">आकार</string>
+    <string name="input_controls_editor_type">प्रकार</string>
+    <string name="input_controls_editor_binding">बाइंडिंग</string>
+    <string name="binding_primary">प्राथमिक बाइंडिंग</string>
+    <string name="binding_secondary">द्वितीयक बाइंडिंग</string>
+    <string name="binding_third">तृतीयक बाइंडिंग</string>
+    <string name="binding_fourth">चतुर्थक बाइंडिंग</string>
+    <string name="input_controls_editor_binding_up">ऊपर बाइंडिंग</string>
+    <string name="input_controls_editor_binding_right">दाएँ बाइंडिंग</string>
+    <string name="input_controls_editor_binding_down">नीचे बाइंडिंग</string>
+    <string name="input_controls_editor_binding_left">बाएँ बाइंडिंग</string>
+    <string name="input_controls_editor_overlay_opacity">ओवरले अपारदर्शिता</string>
+    <string name="input_controls_editor_opacity">अपारदर्शिता</string>
+    <string name="input_controls_editor_radial_menu">रेडियल मेनू</string>
+    <string name="input_controls_editor_radial_menu_options">रेडियल मेनू विकल्प</string>
+    <string name="input_controls_editor_number_of_bindings">बाइंडिंग की संख्या</string>
+    <string name="input_controls_editor_select_profile">प्रोफ़ाइल चुनें</string>
+    <string name="input_controls_select_style">शैली चुनें</string>
+    <string name="input_controls_style_original">मूल</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">स्लेट</string>
+    <string name="input_controls_style_halo">हेलो</string>
+    <string name="input_controls_style_glint">चमक</string>
+    <string name="input_controls_style_shadow">छाया</string>
+    <string name="input_controls_style_reticle">रेटिकल</string>
+    <string name="input_controls_style_neon">नियॉन</string>
+    <string name="input_controls_style_lumina">लुमिना</string>
+    <string name="input_controls_accent_theme">रंग थीम</string>
+    <string name="input_controls_edit_duplicating_builtin">अंतर्निहित प्रोफ़ाइल - एक प्रति बनाई गई जिसे आप संपादित कर सकते हैं।</string>
+    <string name="input_controls_editor_profile_name">प्रोफ़ाइल नाम</string>
+    <string name="input_controls_editor_no_profile_selected">कोई प्रोफ़ाइल चयनित नहीं</string>
+    <string name="input_controls_editor_no_profile_found">कोई प्रोफ़ाइल नहीं मिली</string>
+    <string name="input_controls_editor_tap_to_switch">बदलने के लिए टैप करें</string>
+    <string name="input_controls_editor_confirm_remove_profile">क्या आप यह प्रोफ़ाइल हटाना चाहते हैं?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">क्या आप इस प्रोफ़ाइल की नकल बनाना चाहते हैं?</string>
+    <string name="input_controls_editor_confirm_reset_profile">इस प्रोफ़ाइल को इसके मूल लेआउट पर रीसेट करें? आपके द्वारा किया गया कोई भी परिवर्तन खो जाएगा.</string>
+    <string name="input_controls_editor_profile_reset">प्रोफ़ाइल को उसके मूल लेआउट पर रीसेट किया गया।</string>
+    <string name="input_controls_editor_reset_unavailable">इस प्रोफ़ाइल के लिए कोई मूल स्नैपशॉट उपलब्ध नहीं है.</string>
+    <string name="input_controls_editor_title">नियंत्रण संपादक</string>
+    <string name="input_controls_editor_toggle_switch">टॉगल स्विच</string>
+    <string name="input_controls_editor_swipeable">स्वाइप योग्य</string>
+    <string name="input_controls_editor_profile_exported_to">प्रोफ़ाइल को निर्यात किया गया</string>
+    <string name="input_controls_editor_unable_to_import">प्रोफ़ाइल आयात करने में असमर्थ</string>
+    <string name="input_controls_editor_import_profile">प्रोफ़ाइल आयात करें</string>
+    <string name="input_controls_editor_download_profile">प्रोफ़ाइल डाउनलोड करें</string>
+    <string name="input_controls_editor_export_profile">प्रोफ़ाइल निर्यात करें</string>
+    <string name="input_controls_editor_range">रेंज</string>
+    <string name="input_controls_editor_confirm_download_profiles">क्या आप चयनित प्रोफ़ाइल डाउनलोड करना चाहते हैं?</string>
+    <string name="input_controls_editor_unable_to_load_list">प्रोफ़ाइल सूची लोड करने में असमर्थ</string>
+    <string name="input_controls_editor_osc_transparency">ऑन-स्क्रीन नियंत्रण पारदर्शिता</string>
+    <string name="input_controls_editor_osc_transparency_description">ऑन-स्क्रीन नियंत्रणों की पारदर्शिता को समायोजित करें।</string>
+    <string name="container_config_screen_size">स्क्रीन आकार</string>
+    <string name="container_config_new_env_var">नया पर्यावरण वैरिएबल</string>
+    <string name="container_config_env_vars">पर्यावरण वैरिएबल</string>
+    <string name="container_config_processor_affinity">प्रोसेसर अफ़िनिटी</string>
+    <string name="container_config_processor_affinity_32bit">प्रोसेसर अफ़िनिटी (32-बिट ऐप्स)</string>
+    <string name="container_config_audio_driver">ऑडियो ड्राइवर</string>
+    <string name="container_config_win_components">Win घटक</string>
+    <string name="container_config_drives">ड्राइव</string>
+    <string name="container_config_arch">आर्किटेक्चर</string>
+    <string name="container_config_storage_info">स्टोरेज जानकारी</string>
+    <string name="container_config_drive_c">ड्राइव C:</string>
+    <string name="container_config_cache">कैश</string>
+    <string name="container_config_total">कुल</string>
+    <string name="container_config_clear_cache">कैश साफ़ करें</string>
+    <string name="container_config_estimated_used_space">अनुमानित उपयोग किया गया स्थान</string>
+    <string name="settings_containers_error_saving_wallpaper">वॉलपेपर सहेजने में त्रुटि</string>
+    <string name="container_config_directinput_mapper_type">DirectInput मैपर प्रकार</string>
+    <string name="container_config_title">कॉन्फ़िगरेशन</string>
+    <string name="container_config_startup_selection">स्टार्टअप चयन</string>
+    <string name="container_config_glibc_exp_edition">आधारित</string>
+    <string name="container_config_refresh_rate_default_global">डिफ़ॉल्ट (वैश्विक)</string>
+    <string name="container_config_enable_dinput">Wine में गेम के लिए DInput सक्षम करें</string>
+    <string name="container_config_enable_xinput">Wine में गेम के लिए XInput सक्षम करें</string>
+    <string name="container_config_dinput_legacy">लेगेसी (पुराने गेमपैड)</string>
+    <string name="container_config_dinput_modern">आधुनिक (XInput जैसा)</string>
+    <string name="container_config_help_xinput">
+        यदि आपका गेम गेम कंट्रोलर समर्थन के लिए &lt;i&gt;&lt;b&gt;XInput API&lt;/b&gt;&lt;/i&gt; का उपयोग करता है, तो कृपया इस विकल्प को सक्षम करें।&lt;br/&gt;&lt;br/&gt;
+        यह विकल्प &lt;i&gt;&lt;b&gt;आभासी&lt;/b&gt;&lt;/i&gt; (इनपुट नियंत्रण द्वारा प्रदान किए गए) और &lt;i&gt;&lt;b&gt;भौतिक&lt;/b&gt;&lt;/i&gt; गेम कंट्रोलर दोनों को प्रभावित करेगा।
+    </string>
+    <string name="container_config_help_dinput">
+        यदि आपका गेम गेम कंट्रोलर समर्थन के लिए &lt;i&gt;&lt;b&gt;DInput API&lt;/b&gt;&lt;/i&gt; का उपयोग करता है, तो कृपया इस विकल्प को सक्षम करें।&lt;br/&gt;&lt;br/&gt;
+        यह विकल्प &lt;i&gt;&lt;b&gt;आभासी&lt;/b&gt;&lt;/i&gt; (इनपुट नियंत्रण द्वारा प्रदान किए गए) और &lt;i&gt;&lt;b&gt;भौतिक&lt;/b&gt;&lt;/i&gt; गेम कंट्रोलर दोनों को प्रभावित करेगा।
+    </string>
+    <string name="container_config_xinput_dinput_warning">कुछ गेम दोनों एपीआई का समर्थन कर सकते हैं। ऐसे गेम में XInput और DInput दोनों को एक साथ सक्षम करने से नियंत्रण संबंधी समस्याएं हो सकती हैं, जैसा कि द बाइंडिंग ऑफ इसाक और रेजिडेंट ईविल सीरीज़ जैसे शीर्षकों में देखा गया है।</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32-बिट एमुलेटर</string>
+    <string name="container_config_emulator_wine_hint">एम्यूलेटर Wine संस्करण द्वारा निर्धारित किया जाता है। ARM64EC FEXCore का उपयोग करता है, x86_64 Box64 का उपयोग करता है।</string>
+    <string name="container_config_label">कॉन्फ़िगरेशन</string>
+    <string name="container_config_restart_required">बदलाव लागू करने के लिए कंटेनर पुनः शुरू करें</string>
+    <string name="container_config_renderer">रेंडरर</string>
+    <string name="container_config_variables">वैरिएबल</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">इनपुट</string>
+    <string name="container_config_tab">कॉन्फ़िग</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">64-बिट एमुलेटर</string>
+    <string name="container_config_emulator_section">एमुलेटर</string>
+    <string name="container_config_sdl2_compatibility">SDL2 संगतता सक्षम करें</string>
+    <string name="container_wine_configuration">Wine कॉन्फ़िगरेशन</string>
+    <string name="container_wine_csmt">CSMT (कमांड स्ट्रीम मल्टी-थ्रेड)</string>
+    <string name="container_wine_gpu_name">GPU नाम</string>
+    <string name="container_wine_offscreen_rendering_mode">ऑफ़स्क्रीन रेंडरिंग मोड</string>
+    <string name="container_wine_strict_shader_math">सख्त शेडर गणित</string>
+    <string name="container_wine_video_memory_size">वीडियो मेमोरी आकार</string>
+    <string name="container_wine_dxwrapper">DX रैपर</string>
+    <string name="container_wine_mouse_warp_override">माउस वार्प ओवरराइड</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">DXVK संस्करण</string>
+    <string name="container_wine_dxvk_config_title">DXVK कॉन्फ़िगरेशन</string>
+    <string name="container_wine_wined3d_config_title">WineD3D कॉन्फ़िगरेशन</string>
+    <string name="container_wine_vkd3d_version">VKD3D संस्करण</string>
+    <string name="container_wine_version">Wine संस्करण</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; DirectX 1-11 को OpenGL में अनुवाद करने वाली परत है।&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; Direct3D 9-11 को Vulkan में अनुवाद करने वाली परत है।&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; Direct3D 12 API को Vulkan में अनुवाद करने वाली परत है।&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; क्लासिक गेम के साथ बेहतर संगतता के लिए DirectDraw का कार्यान्वयन है।
+    </string>
+    <string name="container_wine_enabled_async">Async सक्षम करें</string>
+    <string name="container_wine_enabled_async_cache">Async कैश सक्षम करें</string>
+    <string name="container_wine_vkd3d_feature_level">VKD3D फ़ीचर स्तर</string>
+    <string name="container_wine_ddraw_wrapper">DDraw रैपर</string>
+    <string name="container_wine_error_not_installed">Wine/Proton पैकेज \'%1$s\' स्थापित नहीं है और डाउनलोड नहीं किया जा सका।</string>
+    <string name="container_no_wine_installed">कोई Wine या Proton स्थापित नहीं है। पहले एक इंस्टॉल करें.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">सरफ़ेस प्रभाव</string>
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Box64 प्रीसेट</string>
+    <string name="container_box64_version">Box64 संस्करण</string>
+    <string name="container_box64_stability">स्थिरता</string>
+    <string name="container_box64_compatibility">संगतता</string>
+    <string name="container_box64_intermediate">मध्यम</string>
+    <string name="container_box64_performance">प्रदर्शन</string>
+    <string name="container_fexcore_performance_tso">प्रदर्शन TSO</string>
+    <string name="container_fexcore_extreme">चरम</string>
+    <string name="container_fexcore_extreme_tso">चरम TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Box64 डायनामिक रीकंपाइलर को सक्षम या अक्षम करता है।</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        CALL/RET opcodes पर flags का व्यवहार&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : CALL/RET को ऐसे मानता है जैसे उन्हें flags की ज़रूरत नहीं होती (तेज़, अस्थिर)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ज़्यादातर RET को flags चाहिए होंगे, ज़्यादातर CALLS को नहीं&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : सभी CALL/RET को flags चाहिए होंगे (धीमा)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">x86 की तरह -NAN का सृजन</string>
+    <string name="box64_env_var_help__dynarec_fastround">सटीक x86 राउंडिंग का निर्माण</string>
+    <string name="box64_env_var_help__dynarec_x87double">x87 अनुकरण के लिए फ्लोट/डबल का उपयोग</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec BigBlock बनाना&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : block को जितना संभव हो उतना बड़ा बनाने की कोशिश न करें&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Dynarec block को जितना संभव हो उतना बड़ा बनाएँ&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Dynarec block को और बड़ा बनाएँ (block overlap होने पर जारी रखें, लेकिन केवल elf memory के blocks के लिए)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Dynarec block को और बड़ा बनाएँ (सभी memory प्रकारों के लिए block overlap होने पर जारी रखें)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Strong Memory model का simulation&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : कुछ विशेष न करें&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : memory में लिखते समय कुछ Memory Barrier सक्षम करें (कुछ MOV opcodes पर)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : 1 के साथ MOV से memory में हर write पर Memory Barrier भी लगाएँ&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : 2 के साथ memory से read करते समय और कुछ SSE/SSE2 opcodes पर Memory Barrier भी लगाएँ&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : QEMU की तरह x86 TSO की नकल करता है।
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">ब्लॉक बनाते समय अधिकतम अनुमत फ़ॉरवर्ड मान को परिभाषित करता है</string>
+    <string name="box64_env_var_help__dynarec_callret">CALL/RET ऑपकोड का अनुकूलन</string>
+    <string name="box64_env_var_help__dynarec_sep">CALLRET सक्षम होने पर CALL/RET को अनुकूलित करने के लिए द्वितीयक प्रवेश बिंदु जोड़ता है।</string>
+    <string name="box64_env_var_help__dynarec_wait">परिभाषित करता है कि Dynarec, FillBlock के तैयार होने की प्रतीक्षा करेगा या नहीं</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        strong memory emulation के performance impact को कम करने के लिए memory barriers समायोजित करें&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : सामान्य safe barriers उपयोग करें&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : हल्के performance boost के लिए weak barriers उपयोग करें&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : weak barriers उपयोग करें और last write barriers भी अक्षम करें
+    </string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        केवल aligned atomics जनरेट करें (अभी केवल Arm64 पर उपलब्ध)।&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : unaligned atomics संभालने वाला कोड जनरेट करें।&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : केवल aligned atomics जनरेट करें, जो तेज़ और छोटे कोड आकार वाला है, लेकिन aligned डेटा पतों पर काम करने वाले LOCK-prefixed opcodes के लिए SIGBUS का कारण बनेगा।
+    </string>
+    <string name="box64_env_var_help__dynarec_df">
+        deferred flags के उपयोग को सक्षम या अक्षम करें।&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : deferred flags का उपयोग अक्षम करें।&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : deferred flags का उपयोग सक्षम करें।
+    </string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        ऐसे block को चलते रहने की अनुमति दें जो unprotected और संभावित रूप से dirty है।&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ऐसे block को चलते रहने की अनुमति न दें जो unprotected और संभावित रूप से dirty है।&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ऐसे dynablock को चलते रहने दें जो code वाले उसी page में data लिखता है। इससे कुछ गेम का load समय तेज़ हो सकता है, लेकिन अनपेक्षित crash भी हो सकते हैं।&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : HotPage मिलने पर उस page को NEVERCLEAN के रूप में चिह्नित करेगा, इसलिए वह write-protected नहीं होगा, लेकिन उस page से बने block हमेशा जाँचे जाएँगे। इससे गति बढ़ सकती है (लेकिन कुछ SMC मामले पकड़े नहीं जा सकते)।
+    </string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        native flags के उपयोग को सक्षम या अक्षम करें।&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : native flags का उपयोग न करें।&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : संभव होने पर native flags का उपयोग करें।
+    </string>
+    <string name="box64_env_var_help__dynarec_pause">
+        x86 PAUSE emulation सक्षम करें; यह spinlock के प्रदर्शन में मदद कर सकता है।&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : x86 PAUSE instruction को अनदेखा करें।&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : x86 PAUSE instruction का emulation करने के लिए YIELD का उपयोग करें।&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : x86 PAUSE instruction का emulation करने के लिए WFI का उपयोग करें।&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : x86 PAUSE instruction का emulation करने के लिए SEVL+WFE का उपयोग करें।
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">संगतता ट्रेडऑफ़ के साथ मेमोरी को बचाने के लिए डायनारेक ब्लॉक मेटाडेटा को कम करता है।</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">64-बिट Windows गेम के लिए मजबूत मेमोरी अनुकरण का मार्गदर्शन करने के लिए PE अस्थिर मेटाडेटा का उपयोग करता है।</string>
+    <string name="box64_env_var_help__dynacache">स्टार्टअप को तेज़ करने के लिए रन के बीच जनरेट किए गए dynarec ब्लॉक की कैशिंग को नियंत्रित करता है।</string>
+    <string name="box64_env_var_help__avx">
+        guest को AVX क्षमताएँ दिखाता है।&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : AVX extension अक्षम करें&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : AVX, BMI1, F16C और VAES extension सक्षम करें।&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : 1 के साथ AVX2, BMI2, FMA, ADX, VPCLMULQDQ और RDRAND भी सक्षम करें।&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">guest को AES CPU क्षमताएँ दिखाता है।</string>
+    <string name="box64_env_var_help__pclmulqdq">guest को PCLMULQDQ CPU क्षमताएँ दिखाता है।</string>
+    <string name="box64_env_var_help__shaext">guest को SHA extension CPU क्षमताएँ दिखाता है।</string>
+    <string name="box64_env_var_help__sse42">guest को SSE4.2 CPU क्षमताएँ दिखाता है।</string>
+    <string name="box64_env_var_help__sse_flushto0">SSE फ्लश-टू-जीरो व्यवहार और अपवाद फ़्लैग ट्रैकिंग को नियंत्रित करता है।</string>
+    <string name="box64_env_var_help__x87_no80bits">x87 के लिए 80-बिट लंबे डबल के बजाय 64-बिट डबल प्रिसिजन का उपयोग करता है।</string>
+    <string name="box64_env_var_help__cputype">guest को दिखाए जाने वाले Intel या AMD CPU मॉडल को चुनता है।</string>
+    <string name="box64_env_var_help__maxcpu">Box64 द्वारा प्रोग्रामों को प्रस्तुत सीपीयू की अधिकतम संख्या</string>
+    <string name="box64_env_var_help__unityplayer">यूनिटीप्लेयर का पता लगाता है और ऐप को यूनिटी गेम के रूप में चिह्नित करता है।</string>
+    <string name="box64_env_var_help__unity">ऐप को यूनिटी गेम के रूप में चिह्नित करता है और यूनिटी-विशिष्ट संगतता प्रबंधन को सक्षम करता है।</string>
+    <string name="box64_env_var_help__mmap32">प्रत्येक मेमोरी आवंटन को 32 बिट एड्रेस स्पेस में बाध्य करें</string>
+    <string name="fexcore_env_var_help__tsoenabled">TSO IR ऑप्स सक्षम करता है (मल्टीथ्रेडेड ऐप्स के लिए आवश्यक)।</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">TSO सक्षम होने पर vector loads/stores को atomic बनाता है।</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">TSO के तहत unaligned loads/stores के लिए half-barrier atomics उपयोग करता है।</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">TSO के तहत REP MOVS / REP STOS को atomic बनाता है।</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">split unaligned atomic accesses के लिए strict process-wide lock उपयोग करता है।</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">kernel context switches घटाने के लिए kernel-handled unaligned atomics को backpatch करता है।</string>
+    <string name="fexcore_env_var_help__multiblock">multiblock code compilation सक्षम करता है। इससे JIT compilation लंबा हो सकता है और stutter आ सकता है।</string>
+    <string name="fexcore_env_var_help__maxinst">संकलित ब्लॉक में संग्रहीत निर्देशों की अधिकतम संख्या।</string>
+    <string name="fexcore_env_var_help__hostfeatures">CPU फ़ीचर फ़ोर्सिंग को नियंत्रित करता है।</string>
+    <string name="fexcore_env_var_help__smalltscscale">कम-आवृत्ति प्रणालियों पर स्केल TSC।</string>
+    <string name="fexcore_env_var_help__hidehybrid">guest से hybrid CPU core layout छुपाता है।</string>
+    <string name="fexcore_env_var_help__smc_checks">निष्पादन से पहले संशोधन के लिए कोड की जाँच करता है।</string>
+    <string name="fexcore_env_var_help__volatilemetadata">उपलब्ध होने पर TSO के लिए PE फ़ाइलों से अस्थिर मेटाडेटा का उपयोग करता है।</string>
+    <string name="fexcore_env_var_help__monohacks">मोनो डिटेक्शन के लिए विशेष SMC + JIT ब्लॉक हैक।</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">CPUID हाइपरविजर बिट को छुपाता है (ऐप्स के लिए उपयोगी जो इसके साथ क्रैश हो जाते हैं)।</string>
+    <string name="fexcore_env_var_help__disablel2cache">FEXCore JIT L2 cache lookup अक्षम करता है, जिससे memory बचती है लेकिन stutter आ सकता है।</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">FEXCore JIT L1 cache को dynamic size पर स्विच करता है, जिससे memory बचती है लेकिन stutter आ सकता है।</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">dynamic L1 cache बढ़ाने के लिए lookups-per-second threshold।</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">dynamic L1 cache घटाने के लिए lookups-per-second threshold।</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">64-बिट परिशुद्धता का उपयोग करके X87 फ़्लोटिंग पॉइंट का अनुकरण करता है। इससे अनुकरण सटीकता कम हो जाती है और इसके परिणामस्वरूप बग उत्पन्न हो सकते हैं।</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">FEXCore प्रीसेट</string>
+    <string name="container_fexcore_version">FEXCore संस्करण</string>
+    <string name="use_unix_libs">UnixLibs का उपयोग करें</string>
+    <string name="container_graphics_driver">ग्राफ़िक्स ड्राइवर</string>
+    <string name="container_zink_mode">Zink मोड</string>
+    <string name="container_graphics_transcoder">BCn ट्रांसकोडर</string>
+    <string name="container_graphics_quality">BCn गुणवत्ता</string>
+    <string name="container_graphics_configuration">ग्राफ़िक्स ड्राइवर कॉन्फ़िगरेशन</string>
+    <string name="container_graphics_version">ग्राफ़िक्स ड्राइवर संस्करण</string>
+    <string name="container_graphics_available_extensions">उपलब्ध एक्सटेंशन</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d सक्षम</string>
+    <string name="container_graphics_max_device_memory">अधिकतम डिवाइस मेमोरी</string>
+    <string name="container_graphics_sync_frame">हर फ़्रेम सिंक करें</string>
+    <string name="container_graphics_disable_present_wait">KHR_present_wait अक्षम करें</string>
+    <string name="container_graphics_present_modes">प्रेज़ेंट मोड</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan डिस्प्ले सिंक</string>
+    <string name="container_graphics_resource_type">मेमोरी संसाधन प्रकार</string>
+    <string name="container_graphics_vulkan_version">Vulkan संस्करण</string>
+    <string name="container_graphics_bcn_emulation">BCn एमुलेशन</string>
+    <string name="container_graphics_bcn_emulation_type">BCn एमुलेशन प्रकार</string>
+    <string name="container_graphics_bcn_emulation_cache">BCn एमुलेशन कैश</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <string name="container_presets_confirm_duplicate">क्या आप इस प्रीसेट की नकल बनाना चाहते हैं?</string>
+    <string name="container_presets_confirm_remove">क्या आप इस प्रीसेट को हटाना चाहते हैं?</string>
+    <string name="container_presets_title">प्रीसेट</string>
+    <string name="container_presets_preset">प्रीसेट</string>
+    <string name="container_presets_new">नया प्रीसेट</string>
+    <string name="container_presets_rename">प्रीसेट का नाम बदलें</string>
+    <string name="container_presets_import">प्रीसेट आयात करें</string>
+    <string name="container_presets_custom">कस्टम</string>
+    <string name="container_presets_built_in">डिफ़ॉल्ट</string>
+    <string name="container_presets_changes_auto_saved">इस कस्टम प्रीसेट को संपादित करते समय परिवर्तन स्वचालित रूप से सहेजे जाते हैं।</string>
+    <string name="container_presets_cannot_rename">अंतर्निहित प्रीसेट का नाम नहीं बदला जा सकता</string>
+    <string name="container_presets_unable_to_import">प्रीसेट आयात करने में असमर्थ</string>
+    <string name="container_presets_no_description">कोई विवरण उपलब्ध नहीं</string>
+    <string name="container_presets_cannot_remove">आप इस प्रीसेट को नहीं हटा सकते</string>
+    <string name="container_presets_cannot_export">इस प्रीसेट को निर्यात नहीं किया जा सकता</string>
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">टच स्क्रीन का अनुकरण करें</string>
+    <string name="session_xserver_preferences_button_text">   PREFERENCES   </string>
+    <string name="session_xserver_extra_keys_config_desc">यहाँ आप Termux ऐप की तरह extra-keys वैरिएबल का मान सेट कर सकते हैं (<a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">इसे</a> पढ़ें) और भी बहुत कुछ \n
+उदा. <b>META</b> के लिए <i>META कुंजी</i>, \n
+<b>KEYBOARD</b> के लिए <i>सॉफ़्ट कीबोर्ड टॉगल कुंजी</i>, \n
+<b>PREFERENCES</b> के लिए <i>प्राथमिकताएँ खोलने की कुंजी</i>, \n
+<b>MOUSE_HELPER</b> के लिए <i>माउस हेल्पर टॉगल कुंजी</i>, \n
+<b>STYLUS_HELPER</b> के लिए <i>स्टाइलस क्लिक ओवरराइड ओवरले टॉगल कुंजी</i>, \n
+<b>EXIT</b> के लिए <i>ऐप्लिकेशन से बाहर निकलने की कुंजी</i>।</string>
+    <string name="session_xserver_pref_main">प्राथमिकताएँ</string>
+    <string name="session_xserver_pref_output">आउटपुट</string>
+    <string name="session_xserver_pref_pointer">पॉइंटर</string>
+    <string name="session_xserver_pref_kbd">कीबोर्ड</string>
+    <string name="session_xserver_pref_other">अन्य</string>
+    <string name="session_xserver_pref_version">संस्करण</string>
+    <string name="session_xserver_notification_description">WinNative XServer संदेश</string>
+    <string name="session_xserver_notification_content">WinNative चल रहा है, इस अधिसूचना को बंद न करें या स्वाइप न करें</string>
+    <string name="session_drawer_keyboard">कीबोर्ड</string>
+    <string name="session_drawer_fps_monitor">FPS मॉनिटर</string>
+    <string name="session_drawer_fps_monitor_subtitle">रीयल-टाइम प्रदर्शन आँकड़े दिखाएँ</string>
+    <string name="session_drawer_dual_series_battery">ड्यूल सीरीज़ बैटरी</string>
+    <string name="session_drawer_hud_frametime_numeric">फ़्रेमटाइम को संख्या के रूप में दिखाएँ</string>
+    <string name="session_drawer_toggle_fullscreen">फ़ुलस्क्रीन टॉगल करें</string>
+    <string name="session_drawer_show_touchscreen_controls">टचस्क्रीन नियंत्रण दिखाएँ</string>
+    <string name="session_drawer_magnifier">आवर्धक</string>
+    <string name="session_drawer_logs">लॉग</string>
+    <string name="session_drawer_pip_mode">PiP मोड</string>
+    <string name="session_drawer_toggle_relative_mouse">सापेक्ष माउस मूवमेंट टॉगल करें</string>
+    <string name="session_drawer_toggle_mouse">माउस टॉगल करें</string>
+    <string name="session_drawer_pause_resume">रोकें/फिर शुरू करें</string>
+    <string name="session_drawer_relative_mouse_movement">सापेक्ष माउस मूवमेंट</string>
+    <string name="session_drawer_mouse_input">माउस इनपुट</string>
+    <string name="session_drawer_screen_effects">स्क्रीन प्रभाव</string>
+    <string name="session_drawer_screen_effects_subtitle">अपस्केलिंग और रंग प्रभाव</string>
+    <string name="session_drawer_super_resolution">सुपर रेज़ोल्यूशन</string>
+    <string name="session_drawer_upscaler_mode">अपस्केलर</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">किनारों की तीक्ष्णता</string>
+    <string name="session_drawer_vivid">विविड</string>
+    <string name="session_drawer_vivid_strength">विविड तीव्रता</string>
+    <string name="session_drawer_color_profile">रंग प्रभाव</string>
+    <string name="session_drawer_picture_in_picture">पिक्चर इन पिक्चर</string>
+    <string name="session_drawer_exit_subtitle">चल रहे सत्र को बंद करें</string>
+    <string name="session_drawer_touchscreen_overlay">टचस्क्रीन ओवरले</string>
+    <string name="session_drawer_resume">फिर शुरू करें</string>
+    <string name="session_drawer_retry">पुनः प्रयास करें</string>
+    <string name="downloads_no_internet">इंटरनेट कनेक्शन नहीं</string>
+    <string name="session_drawer_pause">रोकें</string>
+    <string name="session_drawer_wine_processes_paused">Wine प्रक्रियाएँ रुकी हुई हैं</string>
+    <string name="session_drawer_pause_all_wine_processes">सभी Wine प्रक्रियाओं को रोकें</string>
+    <string name="session_drawer_controls_section">नियंत्रण</string>
+    <string name="session_drawer_session_section">सेशन</string>
+    <string name="session_drawer_header_subtitle">नियंत्रण, ओवरले और सत्र टूल तक त्वरित पहुंच</string>
+    <string name="session_drawer_swipe_hint">खेल में वापस आने के लिए दूर स्वाइप करें</string>
+    <string name="session_drawer_main_menu_title">मेनू</string>
+    <string name="session_drawer_hud_summary">ओवरले दृश्यता और डेटा बिंदुओं को ट्यून करें</string>
+    <string name="session_drawer_hud_disabled_hint">इसे अनुकूलित करने के लिए ओवरले चालू करें</string>
+    <string name="session_drawer_hud_alpha">अल्फ़ा</string>
+    <string name="session_drawer_hud_scale">स्केल</string>
+    <string name="session_drawer_hud_elements">HUD तत्व</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_graph">ग्राफ़</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango स्टाइल HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD सेटिंग्स</string>
+    <string name="mango_hud_element_gpu_load">GPU लोड</string>
+    <string name="mango_hud_element_gpu_temp">GPU तापमान</string>
+    <string name="mango_hud_element_cpu_load">CPU लोड</string>
+    <string name="mango_hud_element_cpu_temp">CPU तापमान</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">बैटरी</string>
+    <string name="mango_hud_element_lows" formatted="false">1% लो</string>
+    <string name="mango_hud_element_graph">फ्रेमटाइम ग्राफ़</string>
+    <string name="mango_hud_element_engine">इंजन</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU क्लॉक</string>
+    <string name="mango_hud_element_gpu_clock">GPU क्लॉक</string>
+    <string name="mango_hud_element_cores">प्रति कोर</string>
+    <string name="mango_hud_element_network">नेटवर्क</string>
+    <string name="mango_hud_element_swap">स्वैप</string>
+    <string name="mango_hud_element_resolution">रिज़ॉल्यूशन</string>
+    <string name="mango_hud_element_wine">Wine संस्करण</string>
+    <string name="mango_hud_element_duration">सत्र समय</string>
+    <string name="mango_hud_element_clock">घड़ी</string>
+    <string name="mango_hud_element_throttle">थ्रॉटल स्थिति</string>
+    <string name="mango_hud_group_memory">मेमोरी</string>
+    <string name="mango_hud_group_system">सिस्टम</string>
+    <string name="mango_hud_lock">HUD लॉक करें</string>
+    <string name="mango_hud_lock_subtitle">स्पर्श HUD के पीछे के नियंत्रणों तक पहुँचें। लॉक करने के लिए HUD को दबाए रखें। (5s)</string>
+    <string name="hud_position_menu_title">HUD को यहाँ ले जाएँ</string>
+    <string name="hud_position_top_left">ऊपर बाएँ</string>
+    <string name="hud_position_top_center">ऊपर केंद्र</string>
+    <string name="hud_position_top_right">ऊपर दाएँ</string>
+    <string name="hud_position_left_center">बाएँ केंद्र</string>
+    <string name="hud_position_right_center">दाएँ केंद्र</string>
+    <string name="hud_position_bottom_left">नीचे बाएँ</string>
+    <string name="hud_position_bottom_center">नीचे केंद्र</string>
+    <string name="hud_position_bottom_right">नीचे दाएँ</string>
+    <string name="session_drawer_hud_alpha_input_title">अल्फ़ा सेट करें</string>
+    <string name="session_drawer_hud_scale_input_title">स्केल सेट करें</string>
+    <string name="session_drawer_hud_input_hint">%1$d से %2$d तक एक मान दर्ज करें। सीमा से ऊपर के मूल्यों को दबा दिया जाता है।</string>
+    <string name="session_drawer_command_center">कमांड सेंटर</string>
+    <string name="session_drawer_command_center_input">इनपुट</string>
+    <string name="session_drawer_command_center_display">डिस्प्ले</string>
+    <string name="session_drawer_command_center_system">सिस्टम</string>
+    <string name="session_drawer_fps_limiter">FPS लिमिटर</string>
+    <string name="session_drawer_fps_limiter_off">बंद</string>
+    <string name="session_drawer_color_profile_disabled">अक्षम</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">प्राकृतिक</string>
+    <string name="session_drawer_color_profile_crt">CRT प्रभाव</string>
+    <string name="session_drawer_calibrate_advanced">उन्नत कैलिब्रेशन</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Gyro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_apps">और</string>
+    <string name="session_drawer_rail_label_keyboard">कीबोर्ड</string>
+    <string name="session_drawer_rail_label_input_controls">नियंत्रण</string>
+    <string name="session_drawer_rail_label_relative_mouse">RelMouse</string>
+    <string name="session_drawer_rail_label_mouse">माउस</string>
+    <string name="session_drawer_rail_label_fullscreen">फ़ुलस्क्रीन</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">ज़ूम</string>
+    <string name="session_drawer_rail_label_task_manager">कार्य</string>
+    <string name="session_drawer_rail_label_logs">लॉग</string>
+    <string name="session_drawer_logs_clear">साफ़ करें</string>
+    <string name="session_drawer_logs_pause">रोकें</string>
+    <string name="session_drawer_logs_resume">फिर शुरू करें</string>
+    <string name="session_drawer_logs_paused_indicator">रोका गया</string>
+    <string name="session_drawer_logs_line_count">%1$d लाइनें</string>
+    <string name="session_drawer_logs_share">शेयर करें</string>
+    <string name="session_drawer_logs_share_subject">सेशन लॉग</string>
+    <string name="session_drawer_logs_share_chooser">सेशन लॉग शेयर करें</string>
+    <string name="session_drawer_logs_share_failed">लॉग साझा करने में विफल</string>
+    <string name="session_drawer_logs_share_empty">साझा करने के लिए कोई लॉग लाइन नहीं</string>
+    <string name="session_gyroscope_activator">एक्टिवेटर</string>
+    <string name="session_task_confirm_end_process">क्या आप इस प्रक्रिया को समाप्त करना चाहते हैं?</string>
+    <string name="session_task_title">टास्क मैनेजर</string>
+    <string name="session_task_process_name">प्रक्रिया नाम</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">मेमोरी</string>
+    <string name="session_task_end_process">प्रक्रिया समाप्त करें</string>
+    <string name="session_task_set_affinity">अफ़िनिटी सेट करें</string>
+    <string name="session_task_affinity_title">प्रोसेसर अफ़िनिटी</string>
+    <string name="session_task_affinity_all_cores">सभी कोर</string>
+    <string name="session_task_new_task">नया कार्य</string>
+    <string name="session_task_processes">प्रक्रियाएँ</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">प्रति-कोर उपयोग</string>
+    <string name="session_task_core_label">कोर %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d कोर</item>
+        <item quantity="other">%d कोर</item>
+    </plurals>
+    <string name="session_display_orientation">ओरिएंटेशन</string>
+    <string name="session_display_horizontal">क्षैतिज</string>
+    <string name="session_display_vertical">ऊर्ध्वाधर</string>
+    <string name="session_display_columns">कॉलम</string>
+    <string name="session_display_frame_rate">फ़्रेम दर</string>
+    <string name="session_display_title">डिस्प्ले</string>
+    <string name="session_display_fullscreen_stretched">फ़ुलस्क्रीन सक्षम करें (खींचा हुआ)</string>
+    <string name="session_display_direct_composition">डायरेक्ट कंपोज़िशन (ज़ीरो-कॉपी)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Renderer:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB प्रयुक्त / %2$s कुल</string>
+    <string name="session_gamepad_confirm_remove_controller">क्या आप इस नियंत्रक को हटाना चाहते हैं?</string>
+    <string name="session_gamepad_external_controllers">बाहरी कंट्रोलर</string>
+    <string name="session_gamepad_press_any_button">अपने कंट्रोलर पर कोई भी बटन दबाएँ</string>
+    <string name="session_gamepad_bindings">बाइंडिंग</string>
+    <string name="session_gamepad_control_bindings">नियंत्रण बाइंडिंग</string>
+    <string name="session_gamepad_game_controller">गेम कंट्रोलर</string>
+    <string name="session_gamepad_as_button">बटन है</string>
+    <string name="session_gamepad_as_axis">अक्ष है</string>
+    <string name="session_gamepad_trigger_type">प्रकार</string>
+    <string name="session_gamepad_help_trigger_mode">आपके &lt;b&gt;भौतिक कंट्रोलर&lt;/b&gt; पर निर्भर करता है:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;Is Axis&lt;/b&gt; — ट्रिगर में motion की linear range होती है&lt;br/&gt;&#x2022; &lt;b&gt;Is Button&lt;/b&gt; — ट्रिगर साधारण switch की तरह काम करता है&lt;br/&gt;&lt;br/&gt;&lt;i&gt;नोट: linear trigger के साथ Is Button उपयोग करने पर analog data खो जाता है।&lt;/i&gt;</string>
+    <string name="session_gamepad_button_a">बटन A</string>
+    <string name="session_gamepad_button_b">बटन B</string>
+    <string name="session_gamepad_button_x">बटन X</string>
+    <string name="session_gamepad_button_y">बटन Y</string>
+    <string name="session_gamepad_button_grip">ग्रिप बटन</string>
+    <string name="session_gamepad_button_trigger">ट्रिगर बटन</string>
+    <string name="session_gamepad_thumbstick_left">थंबस्टिक बाएँ</string>
+    <string name="session_gamepad_thumbstick_right">थंबस्टिक दाएँ</string>
+    <string name="session_gamepad_thumbstick_up">थंबस्टिक ऊपर</string>
+    <string name="session_gamepad_thumbstick_down">थंबस्टिक नीचे</string>
+    <string name="session_gamepad_configure_analog_sticks">एनालॉग स्टिक कॉन्फ़िगर करें</string>
+    <string name="session_gamepad_left_stick">बायाँ स्टिक</string>
+    <string name="session_gamepad_right_stick">दायाँ स्टिक</string>
+    <string name="session_gamepad_controller_manager">कंट्रोलर मैनेजर</string>
+    <string name="session_gamepad_enable_vibration">वाइब्रेशन सक्षम करें</string>
+    <string name="session_gamepad_player_1">खिलाड़ी 1</string>
+    <string name="session_gamepad_player_2">खिलाड़ी 2</string>
+    <string name="session_gamepad_player_3">खिलाड़ी 3</string>
+    <string name="session_gamepad_player_4">खिलाड़ी 4</string>
+    <string name="session_gamepad_not_assigned">असाइन नहीं</string>
+    <string name="session_gamepad_assign">असाइन करें</string>
+    <string name="session_gamepad_press_any_button_for_player">इसके लिए कंट्रोलर पर कोई भी बटन दबाएं</string>
+    <string name="session_gamepad_vibrate">वाइब्रेशन</string>
+    <string name="session_gamepad_macros_hint">ऑटोफ़ायर सक्षम करने के लिए बटन टॉगल करें।</string>
+    <string name="session_gamepad_macros">मैक्रो</string>
+    <string name="session_gamepad_include_triggers_note">डिजिटल प्रेस के रूप में L2/R2 पर टर्बो भी लागू करें</string>
+    <string name="session_gamepad_square_deadzone">स्क्वायर डेडज़ोन</string>
+    <string name="session_gamepad_invert_x">X उलटें</string>
+    <string name="session_gamepad_invert_y">Y उलटें</string>
+    <string name="session_gamepad_save_profile">प्रोफ़ाइल सहेजें</string>
+    <string name="session_gamepad_load_profile">प्रोफ़ाइल लोड करें</string>
+    <string name="session_gamepad_button_start">Start बटन</string>
+    <string name="session_gamepad_button_select">Select बटन</string>
+    <string name="session_gamepad_button_l1">L1 बटन</string>
+    <string name="session_gamepad_button_r1">R1 बटन</string>
+    <string name="session_gamepad_button_l2">L2 बटन</string>
+    <string name="session_gamepad_button_r2">R2 बटन</string>
+    <string name="session_gamepad_button_l3">L3 बटन</string>
+    <string name="session_gamepad_button_r3">R3 बटन</string>
+    <string name="session_gamepad_dpad_up">D-pad ऊपर</string>
+    <string name="session_gamepad_dpad_down">D-pad नीचे</string>
+    <string name="session_gamepad_dpad_left">D-pad बाएँ</string>
+    <string name="session_gamepad_dpad_right">D-pad दाएँ</string>
+    <string name="session_gamepad_overwrite">ओवरराइट करें</string>
+    <string name="session_gamepad_save_as_new">नया सहेजें</string>
+    <string name="session_gamepad_overwrite_profile_message">क्या आप वर्तमान प्रोफ़ाइल को अधिलेखित करना चाहते हैं या नई प्रोफ़ाइल के रूप में सहेजना चाहते हैं?</string>
+    <string name="session_gamepad_enter_profile_name">प्रोफ़ाइल नाम दर्ज करें</string>
+    <string name="session_gamepad_mappings_saved">मैपिंग सहेजी गई!</string>
+    <string name="session_gamepad_profile_saved">प्रोफ़ाइल सहेजी गई!</string>
+    <string name="session_gamepad_profile_saved_as_new">प्रोफ़ाइल नए रूप में सहेजी गई!</string>
+    <string name="session_gamepad_profile_loaded">प्रोफ़ाइल लोड हुई!</string>
+    <string name="session_gamepad_profile_name_empty">प्रोफ़ाइल नाम खाली नहीं हो सकता</string>
+    <string name="session_gamepad_no_profiles">-- कोई प्रोफ़ाइल नहीं --</string>
+    <string name="session_gamepad_error_loading_profile">प्रोफ़ाइल लोड करने में त्रुटि</string>
+    <string name="input_controls_auto_hide_section">टचस्क्रीन नियंत्रण</string>
+    <string name="input_controls_auto_hide_on_controller_title">कंट्रोलर पर अपने आप छिपाएँ</string>
+    <string name="input_controls_auto_hide_on_controller_summary">कंट्रोलर कनेक्ट होने पर टचस्क्रीन नियंत्रण छिपाएँ</string>
+    <string name="session_gyroscope_title">जाइरोस्कोप</string>
+    <string name="session_gyroscope_calibrate">जाइरोस्कोप कैलिब्रेट करें</string>
+    <string name="session_gyroscope_enable_right_stick">राइट स्टिक जाइरोस्कोपिक मोशन सक्षम करें</string>
+    <string name="session_gyroscope_activator_button">जाइरोस्कोप सक्रियण बटन</string>
+    <string name="session_gyroscope_hold">दबाकर रखें</string>
+    <string name="session_gyroscope_toggle">टॉगल</string>
+    <string name="session_gyroscope_x_sensitivity">X-अक्ष संवेदनशीलता</string>
+    <string name="session_gyroscope_y_sensitivity">Y-अक्ष संवेदनशीलता</string>
+    <string name="session_gyroscope_smoothing">स्मूदिंग</string>
+    <string name="session_gyroscope_invert_x">X-अक्ष उलटें</string>
+    <string name="session_gyroscope_invert_y">Y-अक्ष उलटें</string>
+    <string name="session_gyroscope_filtering">फ़िल्टरिंग</string>
+    <string name="session_gyroscope_deadzone">डेडज़ोन</string>
+    <string name="session_gyroscope_sensitivity">संवेदनशीलता</string>
+    <string name="session_gyroscope_direction">दिशा</string>
+    <string name="session_gyroscope_mode">जाइरोस्कोप सक्रियण मोड</string>
+    <string name="session_gyroscope_target_stick">जाइरो लगाएं</string>
+    <string name="session_gyroscope_enable_stick">एनालॉग स्टिक जाइरोस्कोपिक मोशन सक्षम करें</string>
+    <string name="session_gyroscope_reset_stick">स्टिक रीसेट करें</string>
+    <string name="session_gyroscope_reset_stick_to_center">स्टिक को केंद्र पर रीसेट करें</string>
+    <string name="session_gyroscope_configuration">जाइरोस्कोप विन्यास</string>
+    <string name="session_gyroscope_experimental_mouse_movement">प्रायोगिक माउस आंदोलन</string>
+    <string name="session_gyroscope_x_sensitivity_format">एक्स संवेदनशीलता: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Y संवेदनशीलता: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">चौरसाई: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">डेडज़ोन: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">संवेदनशीलता: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">माउस स्केल</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">माउस स्केल: %1$d%%</string>
+    <string name="settings_general_cursor_speed">कर्सर गति</string>
+    <string name="settings_general_theme">थीम</string>
+    <string name="settings_general_background">पृष्ठभूमि</string>
+    <string name="settings_general_background_color_hex">रंग (hex)</string>
+    <string name="settings_general_wallpaper_selected">वॉलपेपर चुना गया</string>
+    <string name="settings_general_select_wallpaper">वॉलपेपर चुनें</string>
+    <string name="settings_general_title">सामान्य</string>
+    <string name="settings_general_enable_file_provider">फ़ाइल प्रदाता सक्षम करें</string>
+    <string name="settings_general_enable_auto_scraping">स्वतः प्राप्ति सक्षम करें</string>
+    <string name="settings_general_take_effect_next_startup">यह विकल्प अगले स्टार्टअप पर प्रभावी होगा.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Imagefs पुनः इंस्टॉल करें</string>
+    <string name="settings_general_confirm_reinstall_imagefs">क्या आप इमेजफ़्स को पुनः स्थापित करना चाहते हैं? यह ऑपरेशन सिस्टम फ़ाइलों को पुनर्स्थापित करेगा, आपके कंटेनर नहीं बदले जाएंगे।</string>
+    <string name="settings_general_refresh_rate">रीफ़्रेश दर</string>
+    <string name="settings_general_refresh_rate_auto_max">अधिकतम</string>
+    <string name="settings_general_refresh_rate_summary">डिस्प्ले रिफ्रेश रेट और DXVK फ्रेम लिमिट सेट करें</string>
+    <string name="settings_general_touchscreen_timeout">टचस्क्रीन टाइमआउट (पुनरारंभ की आवश्यकता है)</string>
+    <string name="settings_general_touchscreen_haptics">टचस्क्रीन हैप्टिक फीडबैक सक्षम करें</string>
+    <string name="settings_general_open_with_android_browser">Wine में Android ब्राउज़र खोलें</string>
+    <string name="settings_general_share_android_clipboard">Android क्लिपबोर्ड को Wine के साथ साझा करें</string>
+    <string name="settings_general_paths_title">पथ सेटिंग्स</string>
+    <string name="settings_general_paths_summary">प्रबंधित करें कि Winlator अपना कार्यशील डेटा कहां संग्रहीत करता है और निर्यात किए गए शॉर्टकट कहां लिखे गए हैं।</string>
+    <string name="settings_general_winlator_path_title">संग्रहण पथ</string>
+    <string name="settings_general_shortcut_export_path_title">शॉर्टकट निर्यात पथ</string>
+    <string name="settings_general_choose_path">पथ चुनें</string>
+    <string name="settings_general_xserver_cursor_summary">XServer सत्र के अंदर टच, ट्रैकपैड और माउस इनपुट के लिए पॉइंटर गति समायोजित करें।</string>
+    <string name="settings_general_cursor_lock_title">सही माउस नियंत्रण</string>
+    <string name="settings_general_cursor_lock_summary">उन खेलों के लिए सीधे माउस कैप्चर को सक्षम रखता है जिन्हें रॉ पॉइंटर इनपुट की आवश्यकता होती है। इसे वॉल्यूम डाउन के साथ अक्षम करें।</string>
+    <string name="settings_general_xinput_toggle_title">XInput अक्षम करें</string>
+    <string name="settings_general_xinput_toggle_summary">जब आप विशेष माउस और कीबोर्ड नियंत्रण चाहते हैं तो XInput हैंडलिंग बंद कर देता है।</string>
+    <string name="settings_external_display_output_summary">इस स्क्रीन को मिरर करने के बजाय गेम को कनेक्टेड बाहरी डिस्प्ले पर ले जाएँ। ग्लास हमेशा अपनी डिस्प्ले का उपयोग करते हैं।</string>
+    <string name="settings_general_file_provider_summary">WinNative फ़ाइलों को Android दस्तावेज़ चयनकर्ताओं और फ़ाइल प्रबंधकों के सामने उजागर करें।</string>
+    <string name="settings_general_auto_scraping_summary">यह सेटिंग WinNative को कस्टम गेम आर्टवर्क स्वतः प्राप्त करने देती है।</string>
+    <string name="settings_general_open_browser_summary">समर्थित वेब लिंक को Wine के बजाय Android ब्राउज़र में खोलें।</string>
+    <string name="settings_general_clipboard_summary">Android और Wine सत्रों के बीच कॉपी और पेस्ट करने की अनुमति दें।</string>
+    <string name="settings_general_imagefs_summary">अपने मौजूदा कंटेनरों को हटाए बिना बंडल सिस्टम फ़ाइलों को पुनर्स्थापित करें।</string>
+    <string name="settings_general_check_for_updates">अपडेट की जाँच करें</string>
+    <string name="settings_general_check_for_updates_summary">लॉन्च पर और समय-समय पर नए ऐप संस्करणों की स्वचालित रूप से जाँच करें।</string>
+    <string name="settings_audio_midi_sound_font">MIDI SoundFont</string>
+    <string name="settings_audio_sound">ध्वनि</string>
+    <string name="settings_audio_confirm_remove_sound_font">क्या आप इस साउंडफ़ॉन्ट को हटाना चाहते हैं?</string>
+    <string name="settings_audio_sound_font_removed_success">साउंडफ़ॉन्ट सफलतापूर्वक हटा दिया गया!</string>
+    <string name="settings_audio_sound_font_removed_failed">साउंडफ़ॉन्ट हटाया नहीं जा सका!</string>
+    <string name="settings_audio_sound_font_installed_success">साउंडफ़ॉन्ट सफलतापूर्वक इंस्टॉल हो गया!</string>
+    <string name="settings_audio_sound_font_installed_failed">साउंडफ़ॉन्ट स्थापित करना विफल रहा!</string>
+    <string name="settings_audio_sound_font_already_exist">जिस साउंडफ़ॉन्ट को आप इंस्टॉल करना चाहते हैं वह पहले से मौजूद है।</string>
+    <string name="settings_audio_unable_to_install_soundfont">साउंडफ़ॉन्ट स्थापित करने में असमर्थ</string>
+    <string name="settings_audio_installing_soundfont">SoundFont इंस्टॉल हो रहा है</string>
+    <string name="settings_audio_sound_font_bad_format">खराब SoundFont फ़ॉर्मेट।</string>
+    <string name="settings_audio_cannot_remove_default">डिफ़ॉल्ट soundfont हटाया नहीं जा सकता</string>
+    <string name="settings_audio_summary">MIDI प्लेबैक के लिए उपयोग किए जाने वाले SoundFont को स्थापित करें, हटाएं और चुनें।</string>
+    <string name="settings_debug_wine_debug_channel">Wine डिबग चैनल</string>
+    <string name="settings_debug_title">डीबग</string>
+    <string name="settings_debug_wine_logs_title">Wine डीबग लॉग सक्षम करें</string>
+    <string name="settings_debug_wine_logs_subtitle">फ़ाइल में Wine डिबग आउटपुट लिखें</string>
+    <string name="settings_debug_box_logs_title">Box86/64 लॉग सक्षम करें</string>
+    <string name="settings_debug_box_logs_subtitle">फ़ाइल में Box86 और Box64 डिबग आउटपुट लिखें</string>
+    <string name="settings_debug_fex_logs_title">FEXCore लॉग सक्षम करें</string>
+    <string name="settings_debug_fex_logs_subtitle">फ़ाइल में FEXCore डिबग आउटपुट लिखें</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX एमुलेशन लॉग</string>
+    <string name="settings_debug_emulator_logs_subtitle">आपका कंटेनर जो एमुलेटर उपयोग करता है उसे फ़ाइल में लॉग करता है।</string>
+    <string name="settings_debug_steam_logs_title">Steam लॉग सक्षम करें</string>
+    <string name="settings_debug_steam_logs_subtitle">डिबगिंग के लिए Steam प्रमाणीकरण और सत्र ईवेंट लॉग करें।</string>
+    <string name="settings_debug_wine_channels_title">Wine डीबग चैनल</string>
+    <string name="settings_debug_wine_channels_summary">चुनें कि Wine डिबग लॉगिंग सक्षम होने पर कौन से Wine चैनल शामिल हैं।</string>
+    <string name="settings_debug_wine_classes_title">Wine लॉग स्तर</string>
+    <string name="settings_debug_wine_classes_summary">चुनें कि कौन-से संदेश प्रकार लॉग किए जाएँ। Trace अत्यधिक विस्तृत होता है।</string>
+    <string name="settings_debug_input_logs">इनपुट लॉग</string>
+    <string name="settings_debug_input_logs_description">गेमपैड, टच और कीबोर्ड इनपुट इवेंट लॉग करें</string>
+    <string name="settings_debug_download_logs">डाउनलोड लॉग</string>
+    <string name="settings_debug_download_logs_description">डाउनलोड रिज़ॉल्वर और WinNative फ़ॉलबैक ईवेंट लॉग करें</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan सत्यापन परतें</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">लागू करने के लिए प्रदर्शन पुनः प्रारंभ करें.</string>
+    <string name="settings_debug_share_logs">लॉग शेयर करें</string>
+    <string name="settings_debug_delete_logs">लॉग हटाएं</string>
+    <string name="settings_debug_share_all_logs_short">सभी शेयर करें</string>
+    <string name="settings_debug_download_all_logs_short">सभी डाउनलोड करें</string>
+    <string name="settings_debug_logs_saved">%1$s में सहेजा गया</string>
+    <string name="settings_debug_delete_logs_short">हटाएं</string>
+    <string name="settings_debug_delete_all_logs_short">सभी हटाएं</string>
+    <string name="settings_debug_open_logs_folder_short">लॉग मैनेजर खोलें</string>
+    <string name="settings_debug_logs_deleted">लॉग हटा दिए गए</string>
+    <string name="settings_debug_delete_logs_confirm_title">लॉग हटाएं?</string>
+    <string name="settings_debug_delete_logs_confirm_message">यह सभी सहेजी गई लॉग फ़ाइलों (%1$s) को स्थायी रूप से हटा देगा। इसे पूर्ववत नहीं किया जा सकता।</string>
+    <string name="settings_debug_logs_browser_title">लॉग</string>
+    <string name="settings_debug_log_truncated">इस लॉग के अंतिम %1$s दिखाए जा रहे हैं</string>
+    <string name="settings_debug_logs_subject">WinNative लॉग्स (%1$s)</string>
+    <string name="settings_debug_no_logs_available">कोई डिबग लॉग उपलब्ध नहीं है. पहले डिबगिंग विकल्प सक्षम करें और एक गेम लॉन्च करें।</string>
+    <string name="settings_debug_capture_failed">लॉग कैप्चर करने में विफल: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">फ़ाइल में WinNative प्रक्रिया त्रुटियाँ, चेतावनियाँ और क्रैश लॉग करें</string>
+    <string name="settings_debug_section_emulation">एमुलेशन</string>
+    <string name="settings_debug_section_subsystems">सब-सिस्टम</string>
+    <string name="settings_debug_section_tools">टूल</string>
+    <string name="settings_debug_no_channels_selected">कोई चैनल चयनित नहीं</string>
+    <string name="settings_debug_no_channels_available">कोई चैनल उपलब्ध नहीं</string>
+    <string name="settings_debug_channel_toggle_hint">चैनल टॉगल करने के लिए टैप करें. सक्षम चैनल Wine डिबग आउटपुट में शामिल हैं।</string>
+    <string name="settings_debug_remove_channel_desc">%1$s हटाएं</string>
+    <string name="settings_other_language_title">भाषा</string>
+    <string name="settings_other_language_summary">प्रदर्शन भाषा चुनें</string>
+    <string name="settings_other_game_language_title">गेम भाषा</string>
+    <string name="settings_other_game_language_summary">Steam/Epic/GOG डाउनलोड के लिए पसंदीदा भाषा</string>
+    <string name="settings_other_language_system_default">सिस्टम डिफ़ॉल्ट</string>
+    <string name="settings_other_section_integration">इंटीग्रेशन</string>
+    <string name="settings_other_setup_wizard_title">सेटअप विज़ार्ड</string>
+    <string name="settings_other_setup_wizard_summary">अनुमतियों, सिस्टम फ़ाइलों और डिफ़ॉल्ट कंटेनरों की समीक्षा करने के लिए सेटअप विज़ार्ड को फिर से खोलें।</string>
+    <string name="settings_other_checking_for_updates">अपडेट की जाँच हो रही है\u2026</string>
+    <string name="settings_other_update_check_cooldown">दोबारा जाँच करने से पहले कृपया %1$ds प्रतीक्षा करें</string>
+    <string name="settings_other_persistable_permission_failed">स्थायी अनुमतियाँ लेने में असमर्थ: %1$s</string>
+    <string name="settings_other_keep_app_open">कृपया यह समाप्त होने तक ऐप को खुला रखें।</string>
+    <string name="settings_content_install">कंटेंट इंस्टॉल करें</string>
+    <string name="settings_content_type">श्रेणी</string>
+    <string name="settings_content_components">घटक</string>
+    <string name="settings_content_auto_create_container">कंटेनर स्वतः बनाएँ</string>
+    <string name="settings_content_remove_title">घटक हटाएँ?</string>
+    <string name="settings_content_empty_subtitle">शुरू करने के लिए कोई पैकेज इंस्टॉल करें या प्रकार बदलें।</string>
+    <string name="settings_content_container_created">कंटेनर बनाया गया: %1$s</string>
+    <string name="settings_content_download_failed">डाउनलोड विफल रहा.</string>
+    <string name="common_ui_working">कार्यरत</string>
+    <string name="settings_content_desc_wine">Wine प्रोजेक्ट द्वारा निर्मित; Win32 कॉलों का मूल Linux/Android सेवाओं में अनुवाद करता है।</string>
+    <string name="settings_content_desc_proton">वाल्व द्वारा निर्मित; Windows गेम्स के लिए गेम पैच के साथ Wine-आधारित रनटाइम।</string>
+    <string name="settings_content_desc_dxvk">Direct3D 9, 10 और 11 ग्राफ़िक्स कॉल का Vulkan में अनुवाद करता है।</string>
+    <string name="settings_content_desc_vkd3d">Direct3D 12 ग्राफ़िक्स कॉल का Vulkan में अनुवाद करता है।</string>
+    <string name="settings_content_desc_box64">x86_64 Linux कोड का अनुवाद करता है ताकि यह ARM64 उपकरणों पर चल सके।</string>
+    <string name="settings_content_desc_wowbox64">Box64 बिल्ड का उपयोग WoW64 द्वारा 64-बिट Wine के अंदर 32-बिट Windows ऐप्स चलाने के लिए किया जाता है।</string>
+    <string name="settings_content_desc_fexcore">x86 और x86_64 कोड का अनुवाद करता है ताकि यह ARM64 डिवाइस पर चल सके।</string>
+    <string name="settings_content_desc_d7vk">DirectDraw (Direct3D 7 और इससे पुराने) ग्राफ़िक्स कॉल का Vulkan में अनुवाद करता है।</string>
+    <string name="settings_content_unable_to_install">कंटेंट इंस्टॉल नहीं किया जा सका।</string>
+    <string name="settings_content_install_failed">इंस्टॉल विफल</string>
+    <string name="settings_content_file_cannot_be_recognized">फ़ाइल को पहचाना नहीं जा सका.</string>
+    <string name="settings_content_profile_not_found">कंटेंट में प्रोफ़ाइल नहीं मिली।</string>
+    <string name="settings_content_profile_cannot_be_recognized">प्रोफ़ाइल को पहचाना नहीं जा सकता</string>
+    <string name="settings_content_file_list">फ़ाइल सूची</string>
+    <string name="settings_content_install_directory">इंस्टॉल डायरेक्टरी</string>
+    <string name="settings_content_installed_success">कंटेंट सफलतापूर्वक इंस्टॉल हुआ!</string>
+    <string name="settings_content_downloading_title">कंटेंट डाउनलोड हो रहा है</string>
+    <string name="settings_content_installing_title">कंटेंट इंस्टॉल हो रहा है</string>
+    <string name="settings_content_extracting_title">कंटेंट निकाला जा रहा है</string>
+    <string name="settings_content_extracting_detail">निकाला जा रहा है... (%1$d फ़ाइलें)</string>
+    <string name="settings_content_preparing_package">पैकेज तैयार किया जा रहा है</string>
+    <string name="settings_content_download_complete">डाउनलोड पूरा</string>
+    <string name="settings_content_already_installed_title">घटक पहले से इंस्टॉल है</string>
+    <string name="settings_content_already_installed_message">
+        यह घटक पहले से इंस्टॉल है। इसे दोबारा डाउनलोड करने से पहले इंस्टॉल की गई कॉपी हटाएँ।
+        
+        इंस्टॉल पथ:
+        %1$s
+    </string>
+    <string name="settings_content_conflicting_title">विरोधी कंटेंट इंस्टॉल है</string>
+    <string name="settings_content_conflicting_message">
+        कृपया इस पैकेज को डाउनलोड करने से पहले विरोधी कंटेंट को अनइंस्टॉल करें।
+        
+        इंस्टॉल पथ:
+        %1$s
+    </string>
+    <string name="settings_content_cannot_be_trusted">इस कंटेंट पर भरोसा नहीं किया जा सकता।</string>
+    <string name="settings_content_is_incomplete">कंटेंट अधूरा है।</string>
+    <string name="settings_content_untrusted_files_warning">चेतावनी: अतिरिक्त कंटेंट में अविश्वसनीय फ़ाइलें हैं। आम तौर पर, नीचे दी गई फ़ाइलों को बदला नहीं जाना चाहिए। कृपया तय करें कि इंस्टॉलेशन जारी रखना है या नहीं।</string>
+    <string name="settings_content_confirm_remove">यह आपके डिवाइस से घटक को हटा देगा।</string>
+    <string name="settings_content_unable_to_remove_in_use">यह कंटेंट हटाया नहीं जा सकता, क्योंकि कोई कंटेनर अभी इस Wine का उपयोग कर रहा है।</string>
+    <string name="settings_content_download_in_components">कुछ भी डाउनलोड नहीं हुआ। कृपया Components में जाकर कोई एक डाउनलोड करें।</string>
+    <string name="settings_content_types_header">कंटेंट प्रकार</string>
+    <string name="settings_drivers_title">ड्राइवर</string>
+    <string name="settings_drivers_manager_header">ड्राइवर मैनेजर</string>
+    <string name="settings_drivers_github_repos">GitHub रेपो</string>
+    <string name="settings_drivers_install">ड्राइवर इंस्टॉल करें</string>
+    <string name="settings_drivers_installed_success">ड्राइवर सफलतापूर्वक इंस्टॉल हुआ।</string>
+    <string name="settings_drivers_install_failed">ड्राइवर इंस्टॉल करने में विफल।</string>
+    <string name="settings_drivers_remove_title">ड्राइवर हटाएं?</string>
+    <string name="settings_drivers_confirm_remove">यह आपके डिवाइस से ड्राइवर को हटा देगा।</string>
+    <string name="settings_drivers_remove_repo_title">रिपॉज़िटरी हटाएं?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s को आपकी रिपॉज़िटरी सूची से हटा दिया जाएगा।</string>
+    <string name="settings_drivers_repo_tap_to_load">रिलीज़ लोड करने के लिए टैप करें</string>
+    <string name="settings_drivers_repo_loading_releases">रिलीज़ लोड हो रही हैं</string>
+    <string name="settings_drivers_repo_release_count">%1$d रिलीज़ लोड हो गई हैं</string>
+    <string name="settings_drivers_repo_no_release_assets">प्राप्त रिलीज़ में कोई डाउनलोड योग्य ZIP एसेट नहीं मिला।</string>
+    <string name="settings_drivers_repo_fetch_failed">GitHub रिलीज़ लोड नहीं हो सका.</string>
+    <string name="settings_drivers_repo_download_failed">डाउनलोड विफल रहा.</string>
+    <string name="settings_drivers_repo_no_version">संस्करण उपलब्ध नहीं</string>
+    <string name="settings_drivers_repo_unknown_size">अज्ञात आकार</string>
+    <string name="settings_drivers_manager">ड्राइवर मैनेजर</string>
+    <string name="setup_wizard_installing_system_files">सिस्टम फ़ाइलें इंस्टॉल हो रही हैं</string>
+    <string name="setup_wizard_unable_to_install_system_files">सिस्टम फ़ाइलें इंस्टॉल नहीं की जा सकीं</string>
+    <string name="setup_wizard_system_image_not_installed">सिस्टम इमेज इंस्टॉल नहीं है। कृपया पहले घटक इंस्टॉल करें।</string>
+    <string name="setup_wizard_recommended_components">अनुशंसित घटक</string>
+    <string name="setup_wizard_step_format">चरण %1$d / %2$d</string>
+    <string name="setup_wizard_allow_file_access">सभी फ़ाइलों की पहुँच दें</string>
+    <string name="setup_wizard_install_system_files">सिस्टम फ़ाइलें इंस्टॉल करें</string>
+    <string name="setup_wizard_recommended_components_description">अनुशंसित घटक समर्थित DXVK, VKD3D, FEX, Box64, और Wowbox64 पैकेजों को स्वचालित रूप से डाउनलोड और इंस्टॉल करता है।</string>
+    <string name="setup_wizard_each_button_downloads_description">प्रत्येक बटन पैकेज को डाउनलोड करता है, इसे इंस्टॉल करता है, और स्वचालित रूप से अपना डिफ़ॉल्ट कंटेनर बनाता है।</string>
+    <string name="setup_wizard_recommended_x86_64">अनुशंसित x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">अनुशंसित ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">चुनें कि कौन से घटक इंस्टॉल करने हैं। Wine/Proton अपने-आप कंटेनर बनाएगा।</string>
+    <string name="setup_wizard_loading_components">घटक लोड हो रहे हैं\u2026</string>
+    <string name="setup_wizard_no_components_available">इस श्रेणी के लिए कोई घटक उपलब्ध नहीं है.</string>
+    <string name="setup_wizard_default_settings">डिफ़ॉल्ट सेटिंग्स</string>
+    <string name="setup_wizard_containers">कंटेनर सेटअप</string>
+    <string name="setup_wizard_containers_description">प्रत्येक कंटेनर खोलें और डिफ़ॉल्ट सेट करें जिसे आप हर नए गेम को प्राप्त करना चाहते हैं। नए गेम डिफ़ॉल्ट रूप से x86-64 कंटेनर को लक्षित करेंगे।</string>
+    <string name="setup_wizard_store_sign_in_optional">स्टोर साइन-इन वैकल्पिक है. प्रत्येक साइन-इन समाप्त होने पर यहीं लौटता है।</string>
+    <string name="setup_wizard_granted">अनुमति मिल गई</string>
+    <string name="setup_wizard_grant">अनुमति दें</string>
+    <string name="setup_wizard_denied">अस्वीकृत</string>
+    <string name="setup_wizard_allow">अनुमति दें</string>
+    <string name="setup_wizard_installing">इंस्टॉल हो रहा है</string>
+    <string name="setup_wizard_install_failed_reason">इंस्टॉल विफल: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">आवश्यक पहुँच</string>
+    <string name="setup_wizard_select_components">घटक चुनें</string>
+    <string name="setup_wizard_recommended_wine_proton">अनुशंसित Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">उन्नत सेटअप</string>
+    <string name="setup_wizard_title">सेटअप विज़ार्ड</string>
+    <string name="setup_wizard_advanced_user">उन्नत उपयोगकर्ता</string>
+    <string name="setup_wizard_next">अगला</string>
+    <string name="setup_wizard_finish">समाप्त</string>
+    <string name="setup_wizard_download_and_install">डाउनलोड + इंस्टॉल</string>
+    <string name="setup_wizard_open_drivers">ड्राइवर खोलें</string>
+    <string name="setup_wizard_ready">तैयार</string>
+    <string name="setup_wizard_download_and_create">डाउनलोड + बनाएँ</string>
+    <string name="setup_wizard_configured">कॉन्फ़िगर है</string>
+    <string name="setup_wizard_downloading">%1$s डाउनलोड हो रहा है</string>
+    <string name="setup_wizard_installing_package">%1$s इंस्टॉल हो रहा है</string>
+    <string name="setup_wizard_no_runtime_installed">अभी तक कोई Wine या Proton पैकेज इंस्टॉल नहीं है।</string>
+    <string name="setup_wizard_no_runtime_hint">पिछले चरण से कोई Wine या Proton पैकेज इंस्टॉल करें, या अभी इसे छोड़ दें।</string>
+    <string name="setup_wizard_recommended_label">अनुशंसित</string>
+    <string name="setup_wizard_install_all_recommended">सभी अनुशंसित इंस्टॉल करें</string>
+    <string name="setup_wizard_create_container">कंटेनर बनाएँ</string>
+    <string name="setup_wizard_creating_container">बनाया जा रहा है\u2026</string>
+    <string name="input_controls_tap_to_click">टैप करके क्लिक करें</string>
+    <string name="input_controls_reverse_binding_order">बाइंडिंग क्रम उलटें</string>
+    <string name="steam_login_auth_webview_title">प्राधिकरण</string>
+    <string name="steam_login_sign_in_to_your_account">अपने खाते में साइन इन करें</string>
+    <string name="steam_login_username">उपयोगकर्ता नाम</string>
+    <string name="steam_login_password">पासवर्ड</string>
+    <string name="steam_login_invalid_username_or_password">अमान्य उपयोगकर्ता नाम या पासवर्ड</string>
+    <string name="steam_login_remember_me">मुझे याद रखें</string>
+    <string name="steam_login_sign_in_with_qr_code">QR कोड से साइन इन करें</string>
+    <string name="steam_login_open_steam_app_qr_hint">Steam ऐप खोलें → QR आइकन पर टैप करें</string>
+    <string name="steam_login_failed_to_load_qr_code">QR कोड लोड करने में विफल</string>
+    <string name="steam_login_retry">पुनः प्रयास करें</string>
+    <string name="steam_login_generating_code">कोड बनाया जा रहा है\u2026</string>
+    <string name="steam_login_two_factor_auth">दो-कारक प्रमाणीकरण</string>
+    <string name="steam_login_approve_login_steam_app">\nअपने Steam मोबाइल ऐप से इस लॉगिन को स्वीकृत करें</string>
+    <string name="steam_login_enter_code_sent_to">\n%1$s पर भेजा गया कोड दर्ज करें</string>
+    <string name="steam_login_enter_steam_guard_code">अपना Steam Guard कोड दर्ज करें</string>
+    <string name="steam_login_code">कोड</string>
+    <string name="google_cloud_title">क्लाउड सिंक</string>
+    <string name="google_cloud_sync_started">क्लाउड सिंक शुरू हुआ।</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Google सेवाएँ</string>
+    <string name="google_auto_signin_title">लॉन्च पर Google में साइन इन करें</string>
+    <string name="google_auto_signin_summary">ऐप शुरू होने पर अपने आप Google Play Games से कनेक्ट करें ताकि सेव बैकअप और सिंक हमेशा तैयार रहें. बंद होने पर, ऐप कभी भी अपने आप साइन इन नहीं करता.</string>
+    <string name="google_auto_signin_section">लॉन्च पर</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">सिंक हो रहा है</string>
+    <string name="google_cloud_status_connected">कनेक्टेड</string>
+    <string name="google_cloud_status_not_signed_in">साइन इन नहीं</string>
+    <string name="google_cloud_working">काम हो रहा है\u2026</string>
+    <string name="google_cloud_sign_in">साइन इन करें</string>
+    <string name="google_cloud_disable_sync">सिंक अक्षम करें</string>
+    <string name="google_cloud_store_logins">स्टोर लॉगिन</string>
+    <string name="google_cloud_store_login_sync_busy">आपके स्टोर लॉगिन सिंक पर काम हो रहा है\u2026</string>
+    <string name="google_cloud_saved_games_unavailable">Google Saved Games अनुपलब्ध है</string>
+    <string name="google_cloud_snapshot_ready">क्लाउड स्नैपशॉट तैयार</string>
+    <string name="google_cloud_waiting_first_backup">पहले बैकअप की प्रतीक्षा है</string>
+    <string name="google_cloud_no_store_logins_detected">कोई स्टोर लॉगिन नहीं मिला</string>
+    <string name="google_cloud_last_synced">अंतिम सिंक %1$s</string>
+    <string name="google_cloud_backup">बैकअप</string>
+    <string name="google_cloud_restore">पुनर्स्थापित करें</string>
+    <string name="google_cloud_sign_in_to_sync">स्टोर लॉगिन सिंक करने के लिए Google Play Games में साइन इन करें।</string>
+    <string name="google_cloud_sign_in_failed">Google Play Games साइन-इन विफल रहा।</string>
+    <string name="google_cloud_sign_in_finishing">Google Play Games साइन-इन अभी पूरा हो रहा है। थोड़ा इंतज़ार करें और क्लाउड सिंक फिर से आज़माएँ।</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games कनेक्ट है। %1$s के लिए रीस्टोर उपलब्ध है।</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games जुड़ा। %1$s लॉगिन सहेजने के लिए बैकअप पर टैप करें।</string>
+    <string name="google_cloud_connected_ready">Google Play Games जुड़ा हुआ है। बैकअप और रीस्टोर तैयार हैं.</string>
+    <string name="google_cloud_sync_disabled">इस ऐप के लिए Google Play Games सिंक अक्षम है।</string>
+    <string name="google_cloud_sign_in_first">सबसे पहले Google Play Games में साइन इन करें।</string>
+    <string name="google_cloud_no_saved_logins_found">Google क्लाउड सिंक में कोई सहेजा गया स्टोर लॉगिन नहीं मिला।</string>
+    <string name="google_cloud_backup_already_matches">क्लाउड बैकअप पहले से ही मौजूदा स्टोर लॉगिन से मेल खाता है।</string>
+    <string name="google_cloud_no_local_logins">बैकअप के लिए कोई स्थानीय स्टोर लॉगिन उपलब्ध नहीं है।</string>
+    <string name="google_cloud_logins_restored_and_synced">%1$s के लिए स्टोर लॉगिन रीस्टोर और सिंक हो गए।</string>
+    <string name="google_cloud_logins_restored">%1$s के लिए स्टोर लॉगिन रीस्टोर हो गए।</string>
+    <string name="google_cloud_logins_backed_up">%1$s के लिए स्टोर लॉगिन का बैकअप लिया गया।</string>
+    <string name="google_cloud_sync_ready">स्टोर लॉगिन सिंक तैयार है.</string>
+    <string name="google_cloud_no_logins_to_sync">सिंक करने के लिए अभी तक कोई स्टोर लॉगिन उपलब्ध नहीं है।</string>
+    <string name="google_cloud_sign_in_to_backup">%1$s लॉगिन टोकन का बैकअप लेने के लिए साइन इन करें।</string>
+    <string name="google_cloud_no_backed_up_logins">अभी तक कोई बैकअप किया गया स्टोर लॉगिन नहीं मिला।</string>
+    <string name="google_cloud_local_cloud_differ">स्थानीय और क्लाउड स्टोर लॉगिन अलग-अलग हैं। क्लाउड डेटा को ओवरराइट करने के लिए Backup इस्तेमाल करें या सेव किए गए टोकन लेने के लिए Restore इस्तेमाल करें।</string>
+    <string name="google_cloud_local_ready_to_backup">स्थानीय स्टोर लॉगिन %1$s के लिए बैकअप के लिए तैयार हैं।</string>
+    <string name="google_cloud_backup_ready">स्टोर लॉगिन बैकअप तैयार है.</string>
+    <string name="google_cloud_restore_available">%1$s के लिए क्लाउड लॉगिन रीस्टोर उपलब्ध है।</string>
+    <string name="google_cloud_logins_synced">स्टोर लॉगिन Google Play Games के साथ समन्वयित हैं।</string>
+    <string name="google_cloud_sync_problem">स्टोर लॉगिन सिंक में समस्या आ गई।</string>
+    <string name="google_cloud_error_auth_needed">क्लाउड सिंक के Saved Games तक पहुँचने से पहले Google Play Games को प्रमाणीकरण पूरा करना होगा। अगर Play Games प्रोफ़ाइल प्रॉम्प्ट दिखे, तो उसे खोलें और फिर पुनः प्रयास करें।</string>
+    <string name="google_cloud_error_developer">Google Play Games सेव्ड गेम्स ने इस बिल्ड को अस्वीकार कर दिया। Play Console में प्ले गेम्स ऐप आईडी, लिंक किए गए पैकेज का नाम और हस्ताक्षर प्रमाणपत्र की जांच करें।</string>
+    <string name="google_cloud_error_build_rejected">Google खाता जुड़ा हुआ है, लेकिन Google Play Games सेव्ड गेम्स ने इस बिल्ड को अस्वीकार कर दिया। Play गेम्स ऐप आईडी, लिंक किए गए पैकेज और हस्ताक्षर प्रमाणपत्र की जांच करें।</string>
+    <string name="google_cloud_error_network">Google क्लाउड सिंक विफल रहा क्योंकि नेटवर्क अनुरोध पूरा नहीं हुआ या Google Play services पर ध्यान देने की आवश्यकता है।</string>
+    <string name="google_cloud_error_no_snapshot">Google क्लाउड सिंक में अभी तक कोई सहेजा गया स्टोर लॉगिन नहीं मिला।</string>
+    <string name="google_cloud_error_generic">Google क्लाउड सिंक विफल: %1$s</string>
+    <string name="google_cloud_error_before_open">Google Saved Games खुलने से पहले Google क्लाउड सिंक विफल हो गया।</string>
+    <string name="cloud_saves_title">क्लाउड सेव</string>
+    <string name="cloud_saves_title_for_provider">%1$s क्लाउड सेव - %2$s</string>
+    <string name="cloud_saves_sync_summary">%1$s के पास अभी जो संस्करण है, उसे डाउनलोड करें।</string>
+    <string name="cloud_saves_sync_summary_generic">मौजूदा क्लाउड संस्करण डाउनलोड करें।</string>
+    <string name="cloud_saves_no_backups">इस गेम के लिए अभी तक कोई बैकअप नहीं है.</string>
+    <string name="cloud_sync_title">ऑटो क्लाउड सिंक</string>
+    <string name="cloud_sync_enabled_summary">लॉन्च पर डाउनलोड करें, बाहर निकलने पर पुश करें।</string>
+    <string name="cloud_sync_disabled_summary">क्लाउड सेव डाउनलोड या एग्जिट सिंक के बिना लॉन्च करें।</string>
+    <string name="cloud_saves_offline_mode">क्लाउड सिंक अक्षम करें</string>
+    <string name="cloud_saves_offline_mode_summary">इस गेम के लिए सभी स्वचालित क्लाउड गतिविधि बंद कर देता है।</string>
+    <string name="cloud_saves_backing_up">क्लाउड सेव का बैकअप लिया जा रहा है\u2026</string>
+    <string name="cloud_saves_restoring">क्लाउड सेव रीस्टोर हो रहा है\u2026</string>
+    <string name="cloud_saves_sync_from_provider">%1$s क्लाउड से सिंक करें</string>
+    <string name="cloud_saves_sync_from_provider_generic">क्लाउड से सिंक करें</string>
+    <string name="cloud_saves_syncing_from_provider">%1$s से सेव डाउनलोड हो रहा है\u2026</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s क्लाउड सेव डाउनलोड किया गया।</string>
+    <string name="cloud_saves_sync_from_provider_failed">%1$s से सेव डाउनलोड नहीं किया जा सका.</string>
+    <string name="cloud_saves_gog_manage_label">GOG क्लाउड सेव प्रबंधित करें</string>
+    <string name="cloud_saves_gog_manage_helper">आधिकारिक GOG वेबसाइट खोलता है</string>
+    <string name="cloud_saves_gog_manage_no_browser">GOG क्लाउड सेव पेज खोलने के लिए कोई ब्राउज़र उपलब्ध नहीं है</string>
+    <string name="cloud_saves_gog_zip_label">GOG क्लाउड ज़िप डाउनलोड करें</string>
+    <string name="cloud_saves_gog_zip_helper">वर्तमान क्लाउड फ़ाइलें सहेजें</string>
+    <string name="cloud_saves_gog_zip_success">GOG क्लाउड सेव ZIP सहेजी गई।</string>
+    <string name="cloud_saves_gog_zip_failed">GOG क्लाउड सेव ZIP सहेजी नहीं जा सकी।</string>
+    <string name="cloud_saves_gog_zip_empty">कोई GOG क्लाउड सेव फ़ाइलें नहीं मिलीं।</string>
+    <string name="cloud_saves_history_title">सेव इतिहास</string>
+    <string name="cloud_saves_history_download">डाउनलोड करें</string>
+    <string name="cloud_saves_history_download_success">फ़ाइल डाउनलोड हो गई।</string>
+    <string name="cloud_saves_history_download_failed">डाउनलोड विफल रहा।</string>
+    <string name="cloud_saves_history_empty">अभी तक किसी पिछली सेव का बैकअप नहीं है। बदली गई सेव और मैन्युअल बैकअप यहाँ 30 दिनों तक दिखेंगे।</string>
+    <string name="cloud_saves_history_loading">सेव इतिहास लोड हो रहा है\u2026</string>
+    <string name="cloud_saves_history_sign_in">अपना सेव इतिहास देखने के लिए Google में साइन इन करें।</string>
+    <string name="cloud_saves_history_origin_local">स्थानीय</string>
+    <string name="cloud_saves_history_origin_cloud">क्लाउड</string>
+    <string name="cloud_saves_history_origin_manual">मैनुअल</string>
+    <string name="cloud_saves_history_origin_auto">ऑटो</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">पुनर्स्थापित करें</string>
+    <string name="cloud_saves_history_restore_confirm_title">इस बैकअप को पुनर्स्थापित करें?</string>
+    <string name="cloud_saves_history_restore_confirm_body">यह आपके वर्तमान स्थानीय सेव को %1$s के बैकअप से बदल देगा।</string>
+    <string name="cloud_saves_history_restore_success">सेव बैकअप से रीस्टोर हो गई।</string>
+    <string name="cloud_saves_history_restore_failed">इस बैकअप को पुनर्स्थापित नहीं किया जा सका.</string>
+    <string name="cloud_saves_keep_replaced_backup">प्रतिस्थापित सेव का बैकअप रखें</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">यदि आप अपना मन बदलते हैं, तो आप इसे सेव हिस्ट्री से पुनर्स्थापित कर सकते हैं।</string>
+    <string name="cloud_saves_history_refresh">रीफ़्रेश</string>
+    <string name="cloud_saves_history_rename">नाम बदलें</string>
+    <string name="cloud_saves_history_rename_title">इस बैकअप को नाम दें</string>
+    <string name="cloud_saves_history_rename_hint">जैसे: बॉस फाइट, अंत से पहले</string>
+    <string name="cloud_saves_history_rename_save">सहेजें</string>
+    <string name="cloud_saves_history_rename_clear">साफ़ करें</string>
+    <string name="cloud_saves_history_rename_success">बैकअप का नाम बदला गया.</string>
+    <string name="cloud_saves_history_rename_failed">बैकअप का नाम नहीं बदला जा सका.</string>
+    <string name="cloud_saves_custom_select_folder">सेव फ़ोल्डर चुनें</string>
+    <string name="cloud_saves_custom_folder_label">सेव फ़ोल्डर</string>
+    <string name="cloud_saves_custom_select_folder_summary">कंटेनर के अंदर वाली सेव डायरेक्टरी चुनें</string>
+    <string name="cloud_saves_custom_no_container">इस शॉर्टकट के लिए कंटेनर उपलब्ध नहीं है</string>
+    <string name="cloud_saves_custom_picker_title">सेव फ़ोल्डर चुनें</string>
+    <string name="cloud_saves_custom_outside_drive_c">चयनित फ़ोल्डर कंटेनर के C: ड्राइव के अंदर होना चाहिए</string>
+    <string name="cloud_saves_custom_path_map_failed">चयनित फ़ोल्डर को Windows पथ पर मैप नहीं किया जा सका।</string>
+    <string name="cloud_saves_custom_folder_set">सेव फ़ोल्डर %1$s पर सेट किया गया</string>
+    <string name="cloud_saves_steam_sync_label">Steam Cloud से सिंक करें</string>
+    <string name="cloud_saves_steam_sync_helper">नवीनतम सेव डाउनलोड करें</string>
+    <string name="cloud_saves_steam_sync_success">Steam Cloud से सिंक किया गया</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud सिंक विफल रहा</string>
+    <string name="cloud_saves_steam_browse_label">Steam Cloud सेव देखें</string>
+    <string name="cloud_saves_steam_browse_helper">क्लाउड स्टोरेज खोलें</string>
+    <string name="cloud_saves_steam_browse_no_browser">Steam पृष्ठ खोलने के लिए कोई ब्राउज़र उपलब्ध नहीं है</string>
+    <string name="cloud_saves_steam_import_label">फ़ाइलें आयात करें</string>
+    <string name="cloud_saves_steam_import_helper">डाउनलोड की गई फ़ाइलें रीस्टोर करें</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">फ़ाइल पिकर उपलब्ध नहीं</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">यह Steam Cloud की मौजूदा सेव फ़ाइलें डाउनलोड करेगा और वर्तमान सेव फ़ाइलों को अधिलेखित कर देगा।</string>
+    <string name="cloud_saves_invalid_app_id">अमान्य ऐप ID</string>
+    <string name="cloud_saves_label_saved">लेबल सहेजा गया</string>
+    <string name="saves_import_export_title">सेव</string>
+    <string name="saves_import_export_confirm_selection">चयन की पुष्टि करें</string>
+    <string name="saves_import_export_select_directory">अपनी सेव डायरेक्टरी चुनें</string>
+    <string name="saves_import_export_up_directory">ऊपरी डायरेक्टरी</string>
+    <string name="saves_import_export_select_container">लक्ष्य कंटेनर:</string>
+    <string name="saves_import_export_exported">सेव सफलतापूर्वक निर्यात हुईं</string>
+    <string name="saves_import_export_exported_failed">सेव निर्यात करने में विफल: %1$s</string>
+    <string name="saves_import_export_imported">सेव सफलतापूर्वक आयात हुईं</string>
+    <string name="saves_import_export_imported_failed">सेव आयात करने में विफल: %1$s</string>
+    <string name="preloader_default_name">कंटेनर</string>
+    <string name="preloader_initializing">आरंभ हो रहा है</string>
+    <string name="preloader_launching">लॉन्च हो रहा है</string>
+    <string name="preloader_closing">%1$s को बंद किया जा रहा है</string>
+    <string name="preloader_setup_environment">पर्यावरण सेट हो रहा है</string>
+    <string name="preloader_retrying_steam_client_download">Steam client डाउनलोड का पुनः प्रयास हो रहा है</string>
+    <string name="preloader_installing_mono">Wine Mono v%1$s इंस्टॉल किया जा रहा है</string>
+    <string name="preloader_installing_redist">redistributable पैकेज इंस्टॉल हो रहे हैं</string>
+    <string name="preloader_unpacking_exe">गेम executable अनपैक किया जा रहा है</string>
+    <string name="preloader_downloading_cloud">क्लाउड सेव डाउनलोड हो रहे हैं</string>
+    <string name="preloader_syncing_cloud">क्लाउड सेव सिंक हो रहे हैं</string>
+    <string name="preloader_uploading_cloud">क्लाउड सेव अपलोड हो रहे हैं</string>
+    <string name="preloader_checking_cloud">क्लाउड सेव जाँचे जा रहे हैं</string>
+    <string name="preloader_cloud_sync_retry">%1$s पुनः प्रयास करें %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">क्लाउड सिंक डाउनलोड हो रहा है</string>
+    <string name="cloud_sync_failed_provider">%1$s क्लाउड सेव सिंक विफल रहा।</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">कस्टम गेम</string>
+    <string name="settings_hud_record_to_file_title">प्रदर्शन को फ़ाइल में रिकॉर्ड करें</string>
+    <string name="settings_hud_record_to_file_summary">गेमप्ले के दौरान प्रति सेकंड FPS, CPU, GPU, तापमान और बैटरी मेट्रिक्स को /WinNative/logs/ में निर्यात करता है।</string>
+    <string name="settings_leaderboard_category">प्रदर्शन</string>
+    <string name="saves_import_warning_title">यह इस कंटेनर में मौजूदा सेव को ओवरराइट कर देगा</string>
+    <string name="saves_import_warning_body">कई गेम वाली पुरानी बैकअप को पुनर्स्थापित करते समय, पहले अपने फ़ाइल मैनेजर से किसी भी नए सेव को zip में कॉपी करें। केवल .zip में मौजूद सेव ही प्रभावित होंगे। अपने सेव को समझदारी से प्रबंधित करें।</string>
+    <string name="saves_export_path_summary">सेव /WinNative/saves में निर्यात किए जाएंगे</string>
+    <string name="saves_export_success_path">%1$s में निर्यात किया गया</string>
+    <string name="saves_export_warning_title">इसे केवल कस्टम गेम के साथ उपयोग करें</string>
+    <string name="saves_export_warning_body">निर्यात में स्टोर से इंस्टॉल किए गए या क्लाउड-सिंक गेम के सेव शामिल हो सकते हैं।</string>
+    <string name="common_ui_exporting">निर्यात हो रहा है</string>
+    <string name="downloads_queue_cancel_download_confirm">%1$s का डाउनलोड रद्द करें और सभी डाउनलोड की गई फ़ाइलें हटाएँ?</string>
+    <string name="downloads_queue_this_game">यह गेम</string>
+    <string name="shortcuts_properties_use_legacy_launcher">लेगेसी लॉन्चर का उपयोग करें</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">लेगेसी Steam एम्यूलेशन: गेम को ColdClient लॉन्चर के माध्यम से चलाता है और exe से SteamStub DRM हटाता है। केवल पुराने गेम के लिए उपयोग करें जो Steam Launcher के साथ काम नहीं करते।</string>
+    <string name="steam_section_real_client">WinNative वास्तविक Steam क्लाइंट</string>
+    <string name="steam_section_emulator">लेगेसी Steam एम्यूलेटर</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">एम्यूलेटेड Steam क्लाइंट को ऑफ़लाइन रिपोर्ट कराता है, ताकि गेम ऑनलाइन कनेक्शन का प्रयास न करे। उन गेम के लिए उपयोग करें जो Steam की नेटवर्क जाँच पर अटक जाते हैं।</string>
+    <string name="cloud_sync_disable_title">क्लाउड सेव अक्षम करें</string>
+    <string name="cloud_saves_steam_push_label">Steam Cloud पर भेजें</string>
+    <string name="cloud_saves_steam_push_helper">स्थानीय सेव को जबरन अपलोड करें</string>
+    <string name="cloud_saves_steam_push_success">सेव Steam Cloud पर भेज दिया गया।</string>
+    <string name="cloud_saves_steam_push_failed">सेव Steam Cloud पर नहीं भेजा जा सका।</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud अभी पहुँच योग्य नहीं है। पृष्ठभूमि में फिर से कनेक्ट हो रहा है ऑनलाइन वापस आने पर रीफ़्रेश टैप करें।</string>
+    <string name="steam_session_refused_event">Steam ने कैश किए गए सत्र को अस्वीकार कर दिया (EResult=%1$d)। कृपया फिर से साइन इन करें।</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Steam वातावरण तैयार किया जा रहा है</string>
+    <string name="preloader_starting_wine">Wine शुरू हो रहा है</string>
+    <string name="preloader_starting_steam_launcher">Steam Launcher शुरू हो रहा है</string>
+    <string name="preloader_loading_steam_client">Steam क्लाइंट लोड हो रहा है</string>
+    <string name="preloader_connecting_to_steam">Steam से कनेक्ट हो रहा है</string>
+    <string name="preloader_signing_in_to_steam">Steam में साइन इन हो रहा है</string>
+    <string name="preloader_fetching_game_info">साइन इन हो गया — गेम जानकारी लाई जा रही है</string>
+    <string name="preloader_steam_ready">Steam तैयार है</string>
+    <string name="preloader_updating_game_info">गेम जानकारी अपडेट हो रही है</string>
+    <string name="preloader_verifying_install">इंस्टॉलेशन सत्यापित हो रहा है</string>
+    <string name="preloader_scanning_redists">रीडिस्ट्रिब्यूटेबल स्कैन हो रहे हैं</string>
+    <string name="preloader_installing_redist_single">रीडिस्ट्रिब्यूटेबल इंस्टॉल हो रहा है</string>
+    <string name="preloader_installing_named_redist">%1$s इंस्टॉल हो रहा है</string>
+    <string name="preloader_installing_named_redist_progress">%1$s इंस्टॉल हो रहा है (%2$s)</string>
+    <string name="preloader_redists_ready">रीडिस्ट्रिब्यूटेबल तैयार हैं</string>
+    <string name="preloader_no_redists">इंस्टॉल करने के लिए कोई रीडिस्ट्रिब्यूटेबल नहीं</string>
+    <string name="preloader_steam_service_running">Steam सेवा चल रही है</string>
+    <string name="preloader_launching_game">%1$s शुरू हो रहा है</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher विफल हुआ — संसाधन फिर से तैयार हो रहे हैं</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher शुरू नहीं हो सका। फिर से तैयार हो रहा है — कृपया दोबारा लॉन्च करें</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher गेम तक पहुंचा, लेकिन गेम शुरू नहीं हुआ</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Workshop आइटम लोड हो रहे हैं</string>
+    <string name="workshop_search_items">Workshop आइटम खोजें</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Steam से आपकी सब्सक्राइब की गई वस्तुएँ प्राप्त की जा रही हैं।</string>
+    <string name="workshop_error_title">Workshop आइटम लोड नहीं हो सके</string>
+    <string name="workshop_error_subtitle">कुछ गलत हो गया। पुनः प्रयास करें।</string>
+    <string name="workshop_empty_title">कोई सब्सक्राइब किया गया Workshop आइटम नहीं</string>
+    <string name="workshop_empty_subtitle">Steam Workshop पर आइटम सब्सक्राइब करें, फिर इस विंडो को दोबारा खोलें।</string>
+    <string name="workshop_search_empty_title">\"%1$s\" से कोई आइटम मेल नहीं खाता</string>
+    <string name="workshop_search_empty_subtitle">कोई दूसरा खोज शब्द आज़माएँ।</string>
+    <string name="workshop_clear_search">खोज साफ़ करें</string>
+    <string name="workshop_item_fallback">Workshop आइटम</string>
+    <string name="common_ui_failed">विफल</string>
+    <string name="steam_presence_snooze">स्नूज़</string>
+    <string name="steam_presence_busy">व्यस्त</string>
+    <string name="steam_presence_looking_to_trade">व्यापार के इच्छुक</string>
+    <string name="steam_presence_looking_to_play">खेलने के इच्छुक</string>
+    <string name="steam_friends_count">मित्र — %1$d ऑनलाइन</string>
+    <string name="steam_friends_section_in_game">खेल में (%1$d)</string>
+    <string name="steam_friends_section_online">ऑनलाइन (%1$d)</string>
+    <string name="steam_friends_section_offline">ऑफ़लाइन (%1$d)</string>
+    <string name="steam_friends_none_loaded">अभी तक कोई मित्र लोड नहीं हुआ।</string>
+    <string name="steam_friends_chat_off">चैट बंद है। अपने मित्रों को देखने के लिए चैट सेवा फिर से चालू करें।</string>
+    <string name="steam_friends_self_you">आप</string>
+    <string name="steam_friends_in_game">खेल में</string>
+    <string name="steam_friends_join">शामिल हों</string>
+    <string name="steam_friends_play">खेलें</string>
+    <string name="steam_chat_image_failed">(छवि भेजने में विफल)</string>
+    <string name="steam_chat_empty">अभी तक कोई संदेश नहीं। नमस्ते कहें!</string>
+    <string name="steam_chat_uploading_image">छवि अपलोड हो रही है…</string>
+    <string name="steam_chat_send_image">छवि भेजें</string>
+    <string name="steam_chat_message_hint">संदेश…</string>
+    <string name="steam_chat_send">भेजें</string>
+    <string name="steam_chat_image">छवि</string>
+    <string name="steam_common_back">वापस</string>
+    <string name="steam_achievements_title">उपलब्धियाँ</string>
+    <string name="steam_achievements_empty">इस गेम के लिए कोई उपलब्धि नहीं मिली,\nया उन्हें लोड करने के लिए Steam में साइन इन करें।</string>
+    <string name="steam_achievements_hidden">छिपी हुई उपलब्धि</string>
+    <string name="steam_achievements_hidden_desc">इस उपलब्धि को प्रकट करने के लिए खेलते रहें।</string>
+    <string name="steam_achievements_unlocked_on">अनलॉक किया %1$s</string>
+    <string name="steam_achievements_unlocked">अनलॉक किया</string>
+    <string name="steam_join_joining">%2$s में %1$s से जुड़ रहे हैं…</string>
+    <string name="steam_join_install">%2$s से जुड़ने के लिए %1$s इंस्टॉल करें</string>
+    <string name="steam_join_not_owned">आपके पास %1$s नहीं है</string>
+    <string name="steam_chat_not_sent">(नहीं भेजा गया)</string>
+    <string name="steam_join_the_game">गेम</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">चैट सेवा</string>
+    <string name="steam_chat_setting_service_desc">मित्रों और चैट के लिए साइन इन करें; ऑफ़लाइन दिखने के लिए बंद करें।</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">आउटपुट</string>
+    <string name="display_output_prompt_title">बाहरी डिस्प्ले का पता चला</string>
+    <string name="display_output_prompt_message">गेम को कनेक्ट किए गए डिस्प्ले पर भेजें? आपके ऑन-स्क्रीन नियंत्रण और मेन्यू इसी फ़ोन पर रहेंगे।</string>
+    <string name="display_output_prompt_swap">डिस्प्ले बदलें</string>
+    <string name="display_output_prompt_mirror">मिरर करें</string>
+    <string name="display_output_swapped_toast">गेम बाहरी डिस्प्ले पर ले जाया गया। नियंत्रण आपके फ़ोन पर रहेंगे।</string>
+    <string name="display_output_cast_unavailable">इस डिवाइस पर वायरलेस डिस्प्ले सेटिंग्स उपलब्ध नहीं हैं।</string>
+    <string name="display_output_restored_toast">बाहरी डिस्प्ले डिस्कनेक्ट हो गया — गेम फ़ोन पर वापस आ गया।</string>
+    <string name="session_drawer_output_title">डिस्प्ले आउटपुट</string>
+    <string name="session_drawer_output_subtitle">गेम बाहरी डिस्प्ले पर दिख रहा है।</string>
+    <string name="session_drawer_output_device">कनेक्ट किया गया डिस्प्ले</string>
+    <string name="session_drawer_output_resolution">रिज़ॉल्यूशन</string>
+    <string name="session_drawer_output_refresh_rate">रिफ्रेश दर</string>
+    <string name="session_drawer_output_aspect_ratio">आस्पेक्ट अनुपात</string>
+    <string name="session_drawer_output_aspect_fit">फ़िट (आस्पेक्ट)</string>
+    <string name="session_drawer_output_aspect_stretch">स्ट्रेच (भरें)</string>
+    <string name="session_drawer_output_aspect_zoom">ज़ूम (क्रॉप)</string>
+    <string name="session_drawer_output_return_to_phone">फ़ोन पर वापस जाएँ</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">किसी TV पर कास्ट करें</string>
+    <string name="session_drawer_output_cast_body">USB-C / HDMI अडैप्टर कनेक्ट करें, या वायरलेस डिस्प्ले (Miracast / Wi-Fi Direct) कनेक्ट करने के लिए नीचे टैप करें। गेम TV पर दिखेगा जबकि ये नियंत्रण आपके फ़ोन पर रहेंगे।</string>
+    <string name="session_drawer_output_cast_button">वायरलेस डिस्प्ले कनेक्ट करें</string>
+    <string name="session_drawer_output_cast_note">केवल-Chromecast वाले TV निजी नियंत्रण के साथ लाइव गेमप्ले नहीं दिखा सकते — सर्वोत्तम परिणाम के लिए वायरलेस डिस्प्ले या USB‑C/HDMI अडैप्टर का उपयोग करें।</string>
+    <string name="session_drawer_output_render_note">आपका डिस्प्ले जिन मोड की रिपोर्ट करता है वे उसके वास्तविक आउटपुट को बदलते हैं (पुनः आरंभ होते समय यह कुछ पल के लिए काला हो सकता है)। अन्य रिज़ॉल्यूशन उसी आकार पर रेंडर होते हैं और हार्डवेयर द्वारा पैनल पर स्केल किए जाते हैं — नेटिव से अधिक पर तीक्ष्ण (सुपरसैंपलिंग), कम पर तेज़।</string>
+    <string name="session_drawer_output_scaling_note">यह फ़ोन डिस्प्ले को उसके मूल %1$s पर भेजता है और उसका मोड नहीं बदलता, इसलिए यह रेंडर रिज़ॉल्यूशन सेट करता है — इसे हार्डवेयर द्वारा पैनल के अनुसार स्केल किया जाता है (मूल से अधिक पर तीक्ष्णता बढ़ती है, कम पर तेज़ चलता है)।</string>
+    <string name="session_drawer_output_game_mode">गेम मोड (कम विलंबता)</string>
+    <string name="session_drawer_output_game_mode_on">चालू</string>
+    <string name="session_drawer_output_game_mode_off">बंद</string>
+    <string name="session_drawer_output_game_mode_note">इनपुट विलंब कम करने के लिए TV का गेम / कम-विलंबता मोड (HDMI ALLM) अनुरोध करता है। केवल तब दिखता है जब कनेक्ट किया गया डिस्प्ले इसका समर्थन करता है।</string>
+    <string name="session_drawer_output_send_to_display">गेम को डिस्प्ले पर भेजें</string>
+    <string name="session_drawer_output_to_display">बाहरी डिस्प्ले पर आउटपुट</string>
+    <string name="session_drawer_output_send_note">एक डिस्प्ले कनेक्ट है। गेम को उस पर भेजें — आपके नियंत्रण और मेन्यू इसी फ़ोन पर रहेंगे। आप इसे कभी भी यहाँ वापस ला सकते हैं।</string>
+    <string name="session_drawer_output_display">डिस्प्ले</string>
+    <string name="session_drawer_output_glasses">ग्लासेस</string>
+    <string name="session_drawer_output_brightness">चमक</string>
+    <string name="session_drawer_output_shade">शेड (मंद करना)</string>
+    <string name="session_drawer_output_3d">3D (साइड-बाय-साइड)</string>
+    <string name="glasses_panel_refresh">रिफ़्रेश दर</string>
+    <string name="glasses_panel_sunblock">सनब्लॉक</string>
+    <string name="session_drawer_output_volume">वॉल्यूम</string>
+    <string name="session_drawer_output_glasses_note">USB के माध्यम से सीधे आपके Viture ग्लासेस पर भेजा गया।</string>
+
+    <string name="common_ui_new">नया</string>
+    <string name="common_ui_rename">नाम बदलें</string>
+    <string name="gesture_profile_export">जेस्चर प्रोफ़ाइल निर्यात करें</string>
+    <string name="gesture_profile_import">जेस्चर प्रोफ़ाइल आयात करें</string>
+    <string name="gesture_profile_new">नई जेस्चर प्रोफ़ाइल</string>
+    <string name="gesture_profile_none">कोई जेस्चर प्रोफ़ाइल नहीं</string>
+    <string name="input_controls_editor_input_profiles_section">इनपुट प्रोफ़ाइल</string>
+    <string name="session_drawer_right_stick_sensitivity">दायाँ स्टिक संवेदनशीलता</string>
+    <string name="session_drawer_rts_gestures">RTS जेस्चर</string>
+    <string name="session_drawer_rts_gestures_edit">संपादित करें</string>
+    <string name="session_drawer_touch">टच</string>
+    <string name="session_drawer_touch_map_right_stick">दाएँ स्टिक से मैप करें</string>
+    <string name="session_drawer_touch_touchscreen">टचस्क्रीन मोड</string>
+    <string name="session_drawer_touch_trackpad">ट्रैकपैड</string>
+    <string name="session_gesture_profile_section">जेस्चर प्रोफ़ाइल</string>
+    <string name="session_rts_action">क्रिया</string>
+    <string name="session_rts_behavior">व्यवहार</string>
+    <string name="session_rts_double_tap">डबल टैप (डबल लेफ़्ट-क्लिक)</string>
+    <string name="session_rts_double_tap_delay">डबल टैप विलंब (ms)</string>
+    <string name="session_rts_down">नीचे</string>
+    <string name="session_rts_drag">1-उंगली ड्रैग</string>
+    <string name="session_rts_pan1">1-उंगली पैन</string>
+    <string name="session_rts_drag2">2-उंगली ड्रैग</string>
+    <string name="session_rts_drag_threshold">ड्रैग सीमा (px)</string>
+    <string name="session_rts_gesture_threshold">जेस्चर सीमा (px)</string>
+    <string name="session_rts_hold2">2-उंगली होल्ड</string>
+    <string name="session_rts_hold3">3-उंगली होल्ड</string>
+    <string name="session_rts_hold4">4-उंगली होल्ड</string>
+    <string name="session_rts_hold_delay">होल्ड विलंब (ms)</string>
+    <string name="session_rts_left">बाएँ</string>
+    <string name="session_rts_long_press">लंबा दबाएँ</string>
+    <string name="session_rts_long_press_delay">लंबा दबाने का विलंब (ms)</string>
+    <string name="session_rts_pan">2-उंगली पैन</string>
+    <string name="session_rts_pan_threshold">पैन/पिंच शुरुआत (px)</string>
+    <string name="session_rts_right">दाएँ</string>
+    <string name="session_rts_swipe3">3-उंगली स्वाइप</string>
+    <string name="session_rts_swipe4">4-उंगली स्वाइप</string>
+    <string name="session_rts_swipe_threshold">स्वाइप सीमा (px)</string>
+    <string name="session_rts_tap1">1-उंगली टैप</string>
+    <string name="session_rts_tap2">2-उंगली टैप</string>
+    <string name="session_rts_tap3">3-उंगली टैप</string>
+    <string name="session_rts_tap4">4-उंगली टैप</string>
+    <string name="session_rts_up">ऊपर</string>
+    <string name="session_rts_zoom">पिंच ज़ूम</string>
+    <string name="session_drawer_brightness">चमक</string>
+    <string name="session_drawer_contrast">कंट्रास्ट</string>
+    <string name="session_drawer_gamma">गामा</string>
+    <string name="session_drawer_saturation">संतृप्ति</string>
+    <string name="session_drawer_temperature">तापमान</string>
+    <string name="session_drawer_tint">रंगत</string>
+    <string name="session_drawer_intensity">तीव्रता</string>
+    <string name="session_drawer_strength">प्रबलता</string>
+    <string name="session_drawer_sharpen">तीक्ष्णता</string>
+    <string name="session_drawer_scanlines">स्कैनलाइन</string>
+    <string name="session_drawer_pixelate">पिक्सेलेट</string>
+    <string name="session_drawer_block_size">ब्लॉक आकार</string>
+    <string name="session_drawer_scale">स्केल</string>
+    <string name="session_drawer_scale_nearest">निकटतम</string>
+    <string name="session_drawer_scale_linear">रैखिक</string>
+    <string name="session_drawer_scale_bicubic">बाइक्यूबिक</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">कार्टून</string>
+    <string name="session_drawer_color_blind">वर्णांधता</string>
+    <string name="session_drawer_color_blind_protan">प्रोटान</string>
+    <string name="session_drawer_color_blind_deutan">ड्यूटान</string>
+    <string name="session_drawer_color_blind_tritan">ट्रिटान</string>
+    <string name="session_drawer_reset_effects">प्रभाव रीसेट करें</string>
+    <string name="session_drawer_hud_background">पृष्ठभूमि</string>
+    <string name="session_drawer_hud_background_alpha">पृष्ठभूमि अल्फा</string>
+    <string name="session_drawer_hud_background_alpha_input_title">पृष्ठभूमि अल्फा सेट करें</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">आकार समायोजित करें</string>
+    <string name="session_task_bring_to_front">सामने लाएँ</string>
+    <string name="session_task_custom_value">कस्टम मान</string>
+    <string name="session_gyroscope_orientation_mode">निशाना लगाने के लिए झुकाएँ (ओरिएंटेशन)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">फ़ाइलें</string>
+    <string name="file_manager_copy">कॉपी करें</string>
+    <string name="file_manager_cut">काटें</string>
+    <string name="file_manager_paste">पेस्ट करें</string>
+    <string name="file_manager_paste_here">यहाँ पेस्ट करें</string>
+    <string name="file_manager_new_folder">नया फ़ोल्डर</string>
+    <string name="file_manager_new_folder_short">फ़ोल्डर</string>
+    <string name="file_manager_multi_select">चुनें</string>
+    <string name="file_manager_create">बनाएँ</string>
+    <string name="file_manager_delete">हटाएँ</string>
+    <string name="file_manager_copy_count">कॉपी करें (%1$d)</string>
+    <string name="file_manager_cut_count">काटें (%1$d)</string>
+    <string name="file_manager_delete_count">हटाएँ (%1$d)</string>
+    <string name="file_manager_extract">निकालें</string>
+    <string name="file_manager_extract_here">यहाँ निकालें</string>
+    <string name="file_manager_extract_to">यहाँ निकालें…</string>
+    <string name="file_manager_extracting">%1$s निकाला जा रहा है</string>
+    <string name="file_manager_extract_failed">निकालना विफल</string>
+    <string name="file_manager_run_boot">चलाएँ / बूट करें</string>
+    <string name="file_manager_create_shortcut">शॉर्टकट बनाएँ</string>
+    <string name="file_manager_run_in_container">कंटेनर में चलाएँ</string>
+    <string name="file_manager_no_containers">कोई कंटेनर उपलब्ध नहीं</string>
+    <string name="file_manager_delete_confirm">\"%1$s\" को हटाएँ? इसे पूर्ववत नहीं किया जा सकता।</string>
+    <string name="file_manager_delete_confirm_multi">%1$d आइटम हटाएँ? इसे पूर्ववत नहीं किया जा सकता।</string>
+    <string name="file_manager_copying">%1$s कॉपी हो रहा है</string>
+    <string name="file_manager_moving">%1$s स्थानांतरित हो रहा है</string>
+    <string name="file_manager_copying_count">%1$d आइटम कॉपी हो रहे हैं</string>
+    <string name="file_manager_moving_count">%1$d आइटम स्थानांतरित हो रहे हैं</string>
+    <string name="file_manager_paste_into_itself">किसी फ़ोल्डर को उसी में पेस्ट नहीं किया जा सकता</string>
+    <string name="file_manager_operation_failed">कार्रवाई विफल रही</string>
+    <string name="file_manager_delete_failed">हटाना विफल रहा</string>
+    <string name="file_manager_rename_failed">नाम बदलना विफल रहा</string>
+    <string name="file_manager_create_folder_failed">फ़ोल्डर बनाना विफल रहा</string>
+    <string name="cloud_saves_google_backup_helper">Google Play Games में एक प्रति सहेजें</string>
+    <string name="cloud_saves_google_backup_label">Google पर बैकअप लें</string>
+    <string name="cloud_saves_google_backup_no_save">बैकअप के लिए कोई सेव फ़ाइल नहीं मिली।</string>
+    <string name="cloud_saves_history_cloud_readonly">केवल पढ़ने योग्य</string>
+    <string name="session_drawer_rail_label_record">रिकॉर्ड करें</string>
+    <string name="session_record_failed">रिकॉर्डिंग शुरू नहीं हो सकी</string>
+    <string name="session_record_fps">फ़्रेम दर</string>
+    <string name="session_record_include_ui">UI रिकॉर्ड करें</string>
+    <string name="session_record_include_ui_subtitle">HUD और ऑन-स्क्रीन नियंत्रण शामिल करें</string>
+    <string name="session_record_now">अभी रिकॉर्ड करें</string>
+    <string name="session_record_quality">गुणवत्ता</string>
+    <string name="session_record_resolution">रिज़ॉल्यूशन</string>
+    <string name="session_record_saved">रिकॉर्डिंग WinNative/Recordings में सहेजी गई</string>
+    <string name="session_record_settings_title">रिकॉर्ड सेटिंग्स</string>
+    <string name="session_record_started">रिकॉर्डिंग शुरू हुई</string>
+    <string name="steam_chat_setting_stay_running">बैकग्राउंड में चलाएँ</string>
+    <string name="steam_chat_setting_stay_running_desc">WinNative से बाहर निकलने के बाद चैट चालू रखें</string>
+    <string name="settings_content_refresh">रीफ़्रेश</string>
+    <string name="settings_retro_title">रेट्रो</string>
+    <string name="retro_save_transfer_title">सेव ट्रांसफ़र करें</string>
+    <string name="retro_save_transfer_message">इस गेम में स्थानीय सेव फ़ाइल इंपोर्ट करें, या गेम का मौजूदा सेव एक्सपोर्ट करें।</string>
+    <string name="retro_save_transfer_import">सेव इंपोर्ट करें</string>
+    <string name="retro_save_transfer_export">सेव एक्सपोर्ट करें</string>
+    <string name="retro_save_transfer_import_ok">सेव इंपोर्ट हो गया</string>
+    <string name="retro_save_transfer_import_failed">सेव इंपोर्ट नहीं हो सका</string>
+    <string name="retro_save_transfer_export_ok">सेव एक्सपोर्ट हो गया</string>
+    <string name="retro_save_transfer_export_failed">सेव एक्सपोर्ट नहीं हो सका</string>
+    <string name="retro_save_transfer_none">इस गेम के लिए अभी कोई सेव मौजूद नहीं है</string>
+    <string name="retro_cheats_title">चीट</string>
+    <string name="retro_cheats_hardcore_blocked">हार्डकोर मोड में चीट अक्षम हैं</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">सहेजें</string>
+    <string name="retro_ps2_cancel">रद्द करें</string>
+    <string name="retro_ps2_save_state">स्टेट सहेजें</string>
+    <string name="retro_ps2_load_save_state">सहेजी स्टेट लोड करें</string>
+    <string name="retro_ps2_achievements">उपलब्धियाँ</string>
+    <string name="retro_ps2_cheats">चीट्स</string>
+    <string name="retro_ps2_memory_cards">मेमोरी कार्ड</string>
+    <string name="retro_ps2_fast_forward">फ़ास्ट फ़ॉरवर्ड</string>
+    <string name="retro_ps2_reset">रीसेट</string>
+    <string name="retro_ps2_swap_disc">डिस्क बदलें</string>
+    <string name="retro_ps2_slot">स्लॉट %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">लोड करने हेतु टैप करें</string>
+    <string name="retro_ps2_slot_empty">खाली</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">अधिलेखित करने हेतु टैप करें</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">खाली — सहेजने हेतु टैप करें</string>
+    <string name="retro_ps2_slot_is_empty">स्लॉट %1$d खाली है</string>
+    <string name="retro_ps2_loaded_slot">स्लॉट %1$d लोड किया गया</string>
+    <string name="retro_ps2_could_not_load_slot">स्लॉट %1$d लोड नहीं हो सका</string>
+    <string name="retro_ps2_saved_to_slot">स्लॉट %1$d में सहेजा गया</string>
+    <string name="retro_ps2_save_failed">सहेजना विफल</string>
+    <string name="retro_ps2_slot_1_suffix">  •  स्लॉट 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  स्लॉट 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  उपयोग हेतु टैप करें</string>
+    <string name="retro_ps2_new_memory_card">नया मेमोरी कार्ड</string>
+    <string name="retro_ps2_import_card">कार्ड आयात करें</string>
+    <string name="retro_ps2_enable_online_dev9">ऑनलाइन सक्षम करें (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 नेटवर्क अडैप्टर — इसे जोड़ने हेतु गेम पुनः आरंभ करता है</string>
+    <string name="retro_ps2_ethernet_device">ईथरनेट डिवाइस</string>
+    <string name="retro_ps2_dns_mode">DNS मोड</string>
+    <string name="retro_ps2_primary_dns">प्राथमिक DNS</string>
+    <string name="retro_ps2_secondary_dns">द्वितीयक DNS</string>
+    <string name="retro_ps2_optional">वैकल्पिक</string>
+    <string name="retro_ps2_auto_ip_dhcp">स्वतः IP (DHCP)</string>
+    <string name="retro_ps2_server_host">सर्वर: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">IP सेट करने हेतु टैप करें (खाली हटाता है)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">सर्वर होस्ट जोड़ें</string>
+    <string name="retro_ps2_new_server_hostname">नया सर्वर होस्टनेम</string>
+    <string name="retro_ps2_server_hostname_hint">उदा. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">ऑन-स्क्रीन नियंत्रण</string>
+    <string name="retro_ps2_edit_layout">लेआउट संपादित करें</string>
+    <string name="retro_ps2_reset_layout">लेआउट रीसेट करें</string>
+    <string name="retro_ps2_layout_reset">लेआउट रीसेट हुआ</string>
+    <string name="retro_ps2_left_stick_invert_x">बायाँ स्टिक: X उलटें</string>
+    <string name="retro_ps2_left_stick_invert_y">बायाँ स्टिक: Y उलटें</string>
+    <string name="retro_ps2_right_stick_invert_x">दायाँ स्टिक: X उलटें</string>
+    <string name="retro_ps2_right_stick_invert_y">दायाँ स्टिक: Y उलटें</string>
+    <string name="retro_ps2_button_color">बटन रंग</string>
+    <string name="retro_ps2_letter_color">अक्षर रंग</string>
+    <string name="retro_ps2_shadow_color">छाया रंग</string>
+    <string name="retro_ps2_background_color">पृष्ठभूमि रंग</string>
+    <string name="retro_ps2_reset_colors">रंग रीसेट करें</string>
+    <string name="retro_ps2_renderer">रेंडरर</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">रिज़ॉल्यूशन स्केल</string>
+    <string name="retro_ps2_scale_1x_native">1x (नेटिव)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">आस्पेक्ट रेशियो</string>
+    <string name="retro_ps2_aspect_stretch">स्ट्रेच</string>
+    <string name="retro_ps2_aspect_auto_standard">स्वतः (मानक)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">डिस्प्ले फ़िल्टर</string>
+    <string name="retro_ps2_filter_nearest">निकटतम</string>
+    <string name="retro_ps2_filter_bilinear_smooth">बाइलीनियर (स्मूद)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">बाइलीनियर (शार्प)</string>
+    <string name="retro_ps2_texture_filter">टेक्सचर फ़िल्टर</string>
+    <string name="retro_ps2_filter_bilinear_forced">बाइलीनियर (बलपूर्वक)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">बाइलीनियर (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">बाइलीनियर (स्प्राइट)</string>
+    <string name="retro_ps2_blending_accuracy">ब्लेंडिंग परिशुद्धता</string>
+    <string name="retro_ps2_blend_minimum">न्यूनतम</string>
+    <string name="retro_ps2_blend_basic">मूल</string>
+    <string name="retro_ps2_blend_medium">मध्यम</string>
+    <string name="retro_ps2_blend_high">उच्च</string>
+    <string name="retro_ps2_blend_full">पूर्ण</string>
+    <string name="retro_ps2_blend_maximum">अधिकतम</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV शेडर</string>
+    <string name="retro_ps2_shader_off">बंद</string>
+    <string name="retro_ps2_shader_scanline">स्कैनलाइन</string>
+    <string name="retro_ps2_shader_diagonal">विकर्ण</string>
+    <string name="retro_ps2_shader_triangular">त्रिकोणीय</string>
+    <string name="retro_ps2_shader_wave">वेव</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">फ़्रेम स्किप</string>
+    <string name="retro_ps2_frameskip_off">बंद</string>
+    <string name="retro_ps2_frameskip_1">1 स्किप करें</string>
+    <string name="retro_ps2_frameskip_2">2 स्किप करें</string>
+    <string name="retro_ps2_frameskip_3">3 स्किप करें</string>
+    <string name="retro_ps2_mipmapping">मिपमैपिंग</string>
+    <string name="retro_ps2_volume">वॉल्यूम</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">म्यूट</string>
+    <string name="retro_ps2_swap_stereo_channels">स्टीरियो चैनल बदलें</string>
+    <string name="retro_ps2_ee_cycle_rate">EE साइकिल दर</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (डिफ़ॉल्ट)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE साइकिल स्किप</string>
+    <string name="retro_ps2_skip_off">बंद</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">इंस्टेंट VU1</string>
+    <string name="retro_ps2_mtvu">मल्टी-थ्रेडेड VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">फ़ास्ट CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">एमुलेशन गति</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU उपयोग</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU उपयोग</string>
+    <string name="retro_ps2_hud_internal_resolution">आंतरिक रिज़ॉल्यूशन</string>
+    <string name="retro_ps2_deinterlace_mode">डीइंटरलेस मोड</string>
+    <string name="retro_ps2_deint_auto">स्वतः</string>
+    <string name="retro_ps2_deint_off">बंद</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV आस्पेक्ट रेशियो</string>
+    <string name="retro_ps2_anti_blur">एंटी-ब्लर</string>
+    <string name="retro_ps2_widescreen_patches">वाइडस्क्रीन पैच</string>
+    <string name="retro_ps2_no_interlace_patches">नो-इंटरलेस पैच</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC स्पिन डिटेक्शन</string>
+    <string name="retro_ps2_wait_loop">वेट लूप डिटेक्शन</string>
+    <string name="retro_ps2_time_stretch">ऑडियो टाइम स्ट्रेच</string>
+    <string name="retro_ps2_audio_buffer">ऑडियो बफर</string>
+    <string name="retro_ps2_audio_latency">आउटपुट लेटेंसी</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">फ्रेम समय</string>
+    <string name="retro_ps2_hud_gs_stats">GS आँकड़े</string>
+    <string name="retro_ps2_hud_hw_info">हार्डवेयर जानकारी</string>
+    <string name="retro_ps2_hud_version">संस्करण</string>
+    <string name="retro_ps2_hud_input_display">इनपुट डिस्प्ले</string>
+    <string name="retro_ps2_tab_menu">मेनू</string>
+    <string name="retro_ps2_tab_display">डिस्प्ले</string>
+    <string name="retro_ps2_tab_performance">प्रदर्शन</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">ध्वनि</string>
+    <string name="retro_ps2_tab_online">ऑनलाइन</string>
+    <string name="retro_ps2_tab_controls">नियंत्रण</string>
+    <string name="retro_ps2_resume">पुनः आरंभ</string>
+    <string name="retro_ps2_pause">रोकें</string>
+    <string name="retro_ps2_exit">बाहर निकलें</string>
+    <string name="retro_lr_bios_imported">BIOS आयात हुआ: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">अमान्य BIOS फ़ाइल</string>
+    <string name="retro_lr_invalid_retro_game">अमान्य रेट्रो गेम</string>
+    <string name="retro_lr_rom_not_found">ROM नहीं मिला: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">इस संग्रह के अंदर की ROM पढ़ी नहीं जा सकी</string>
+    <string name="retro_lr_core_not_installed">कोर स्थापित नहीं: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">चीट्स सक्षम — इस सत्र हेतु उपलब्धियाँ अक्षम हैं</string>
+    <string name="retro_lr_cloud_save_restored">क्लाउड सेव पुनर्स्थापित हुआ</string>
+    <string name="retro_lr_restore_failed">पुनर्स्थापना विफल</string>
+    <string name="retro_lr_cloud_conflict_message">%1$s हेतु एक नया क्लाउड सेव मौजूद है. क्या आप सिंक करना चाहते हैं, और आप कौन-सा क्लाउड सेव रखना पसंद करेंगे?</string>
+    <string name="retro_lr_cloud_save">क्लाउड सेव</string>
+    <string name="retro_lr_renderer_default">रेट्रो</string>
+    <string name="retro_lr_failed_load_core">एमुलेटर कोर लोड करने में विफल</string>
+    <string name="retro_lr_failed_load_rom">ROM लोड करने में विफल</string>
+    <string name="retro_lr_graphics_not_supported">इस कोर हेतु ग्राफ़िक्स समर्थित नहीं</string>
+    <string name="retro_lr_emulator_error">एमुलेटर त्रुटि</string>
+    <string name="retro_lr_shader_default">डिफ़ॉल्ट</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">शार्प</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR अपस्केल</string>
+    <string name="retro_lr_upscale_native">नेटिव</string>
+    <string name="retro_lr_sound">ध्वनि</string>
+    <string name="retro_lr_left_stick_invert_x">बायाँ स्टिक: X उलटें</string>
+    <string name="retro_lr_left_stick_invert_y">बायाँ स्टिक: Y उलटें</string>
+    <string name="retro_lr_right_stick_invert_x">दायाँ स्टिक: X उलटें</string>
+    <string name="retro_lr_right_stick_invert_y">दायाँ स्टिक: Y उलटें</string>
+    <string name="retro_lr_on_screen_controls">ऑन-स्क्रीन नियंत्रण</string>
+    <string name="retro_lr_haptic_feedback">हैप्टिक फ़ीडबैक</string>
+    <string name="retro_lr_portrait">पोर्ट्रेट</string>
+    <string name="retro_lr_landscape">लैंडस्केप</string>
+    <string name="retro_lr_edit_layout">लेआउट संपादित करें (%1$s)</string>
+    <string name="retro_lr_reset_layout">%1$s लेआउट रीसेट करें</string>
+    <string name="retro_lr_layout_reset">%1$s लेआउट रीसेट हुआ</string>
+    <string name="retro_lr_button_color">बटन रंग</string>
+    <string name="retro_lr_letter_color">अक्षर रंग</string>
+    <string name="retro_lr_shadow_color">छाया रंग</string>
+    <string name="retro_lr_background_color">पृष्ठभूमि रंग</string>
+    <string name="retro_lr_reset_colors">रंग रीसेट करें</string>
+    <string name="retro_lr_colors_reset">रंग रीसेट हुए</string>
+    <string name="retro_lr_performance_hud">प्रदर्शन HUD</string>
+    <string name="retro_lr_alpha">अल्फा</string>
+    <string name="retro_lr_background_alpha">पृष्ठभूमि अल्फा</string>
+    <string name="retro_lr_background">पृष्ठभूमि</string>
+    <string name="retro_lr_scale">स्केल</string>
+    <string name="retro_lr_numeric_frametime">संख्यात्मक फ़्रेमटाइम</string>
+    <string name="retro_lr_dual_series_battery">डुअल-सीरीज़ बैटरी</string>
+    <string name="retro_lr_hud_elements">HUD तत्व</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">कंसोल</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">बैटरी</string>
+    <string name="retro_lr_hud_temp">तापमान</string>
+    <string name="retro_lr_hud_graph">ग्राफ़</string>
+    <string name="retro_lr_hud_cpu_temp">CPU तापमान</string>
+    <string name="retro_lr_save_state">स्टेट सहेजें</string>
+    <string name="retro_lr_load_save_state">सहेजी स्टेट लोड करें</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">हार्डकोर मोड में स्टेट लोड करना अक्षम है</string>
+    <string name="retro_lr_achievements">उपलब्धियाँ</string>
+    <string name="retro_lr_cheats">चीट्स</string>
+    <string name="retro_lr_cheats_disabled_hardcore">हार्डकोर मोड में चीट्स अक्षम हैं</string>
+    <string name="retro_lr_reset">रीसेट</string>
+    <string name="retro_lr_fast_forward">फ़ास्ट फ़ॉरवर्ड</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">हार्डकोर मोड में फ़ास्ट फ़ॉरवर्ड अक्षम है</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">डिस्क %1$d/%2$d</string>
+    <string name="retro_lr_resume">पुनः आरंभ</string>
+    <string name="retro_lr_pause">रोकें</string>
+    <string name="retro_lr_exit">बाहर निकलें</string>
+    <string name="retro_lr_saved_to_slot">स्लॉट %1$d में सहेजा गया</string>
+    <string name="retro_lr_could_not_save_state">स्टेट सहेजी नहीं जा सकी</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS आवश्यक</string>
+    <string name="retro_lr_bios_required_message">PlayStation गेम्स को एक वास्तविक कंसोल BIOS फ़ाइल की आवश्यकता होती है जो आपको उपलब्ध करानी होगी. जारी रखने हेतु एक BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin या scph7001.bin) आयात करें.</string>
+    <string name="retro_lr_import_bios">BIOS आयात करें…</string>
+    <string name="retro_lr_cancel">रद्द करें</string>
+    <string name="retro_lr_slot_empty">स्लॉट %1$d खाली है</string>
+    <string name="retro_lr_loaded_slot">स्लॉट %1$d लोड किया गया</string>
+    <string name="retro_lr_could_not_load_state">स्टेट लोड नहीं हो सकी</string>
+    <string name="retro_lr_slot_title">स्लॉट %1$d</string>
+    <string name="retro_lr_rename_slot">स्लॉट %1$d का नाम बदलें</string>
+    <string name="retro_gs_section_general">सामान्य</string>
+    <string name="retro_gs_section_graphics">ग्राफ़िक्स</string>
+    <string name="retro_gs_section_performance">प्रदर्शन</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">इनपुट</string>
+    <string name="retro_gs_section_audio">ऑडियो</string>
+    <string name="retro_gs_section_online">ऑनलाइन</string>
+    <string name="retro_gs_cancel">रद्द करें</string>
+    <string name="retro_gs_save">सहेजें</string>
+    <string name="retro_gs_shader_default">डिफ़ॉल्ट</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">शार्प</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">नेटिव</string>
+    <string name="retro_gs_group_game">गेम</string>
+    <string name="retro_gs_label_name">नाम</string>
+    <string name="retro_gs_label_system">सिस्टम</string>
+    <string name="retro_gs_label_emulator_core">एमुलेटर कोर</string>
+    <string name="retro_gs_label_rom_path">ROM पथ</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">स्थापित</string>
+    <string name="retro_gs_bios_none">कोई नहीं — %1$s गेम्स चलाने हेतु आवश्यक</string>
+    <string name="retro_gs_import_bios">BIOS आयात करें…</string>
+    <string name="retro_gs_remove_bios">BIOS हटाएँ</string>
+    <string name="retro_gs_group_library_artwork">लाइब्रेरी आर्टवर्क</string>
+    <string name="retro_gs_artwork_game_card">गेम कार्ड छवि</string>
+    <string name="retro_gs_artwork_grid">ग्रिड छवि</string>
+    <string name="retro_gs_artwork_carousel">कैरोसेल छवि</string>
+    <string name="retro_gs_artwork_list">सूची छवि</string>
+    <string name="retro_gs_artwork_custom_set">कस्टम छवि सेट</string>
+    <string name="retro_gs_artwork_set_image">छवि सेट करें</string>
+    <string name="retro_gs_artwork_remove">हटाएँ</string>
+    <string name="retro_gs_group_video">वीडियो</string>
+    <string name="retro_gs_video_filter">वीडियो फ़िल्टर</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR अपस्केल</string>
+    <string name="retro_gs_performance_hud">प्रदर्शन HUD</string>
+    <string name="retro_gs_group_core">कोर</string>
+    <string name="retro_gs_renderer">रेंडरर</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">रिज़ॉल्यूशन स्केल</string>
+    <string name="retro_gs_scale_1x_native">1x (नेटिव)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">आस्पेक्ट रेशियो</string>
+    <string name="retro_gs_aspect_stretch">स्ट्रेच</string>
+    <string name="retro_gs_aspect_auto_standard">स्वतः (मानक)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">डिस्प्ले फ़िल्टर</string>
+    <string name="retro_gs_filter_nearest">निकटतम</string>
+    <string name="retro_gs_filter_bilinear_smooth">बाइलीनियर (स्मूद)</string>
+    <string name="retro_gs_filter_bilinear_sharp">बाइलीनियर (शार्प)</string>
+    <string name="retro_gs_texture_filter">टेक्सचर फ़िल्टर</string>
+    <string name="retro_gs_filter_bilinear_forced">बाइलीनियर (बलपूर्वक)</string>
+    <string name="retro_gs_filter_bilinear_ps2">बाइलीनियर (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">बाइलीनियर (स्प्राइट)</string>
+    <string name="retro_gs_blending_accuracy">ब्लेंडिंग परिशुद्धता</string>
+    <string name="retro_gs_blend_minimum">न्यूनतम</string>
+    <string name="retro_gs_blend_basic">मूल</string>
+    <string name="retro_gs_blend_medium">मध्यम</string>
+    <string name="retro_gs_blend_high">उच्च</string>
+    <string name="retro_gs_blend_full">पूर्ण</string>
+    <string name="retro_gs_blend_maximum">अधिकतम</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV शेडर</string>
+    <string name="retro_gs_off">बंद</string>
+    <string name="retro_gs_tvshader_scanline">स्कैनलाइन</string>
+    <string name="retro_gs_tvshader_diagonal">विकर्ण</string>
+    <string name="retro_gs_tvshader_triangular">त्रिकोणीय</string>
+    <string name="retro_gs_tvshader_wave">वेव</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">फ़्रेम स्किप</string>
+    <string name="retro_gs_frameskip_1">1 स्किप करें</string>
+    <string name="retro_gs_frameskip_2">2 स्किप करें</string>
+    <string name="retro_gs_frameskip_3">3 स्किप करें</string>
+    <string name="retro_gs_mipmapping">मिपमैपिंग</string>
+    <string name="retro_gs_group_performance">प्रदर्शन</string>
+    <string name="retro_gs_ee_cycle_rate">EE साइकिल दर</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (डिफ़ॉल्ट)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE साइकिल स्किप</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">इंस्टेंट VU1</string>
+    <string name="retro_gs_mtvu">मल्टी-थ्रेडेड VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">फ़ास्ट CDVD</string>
+    <string name="retro_gs_group_performance_hud">प्रदर्शन HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">एमुलेशन गति</string>
+    <string name="retro_gs_hud_cpu_usage">CPU उपयोग</string>
+    <string name="retro_gs_hud_gpu_usage">GPU उपयोग</string>
+    <string name="retro_gs_hud_internal_resolution">आंतरिक रिज़ॉल्यूशन</string>
+    <string name="retro_gs_deinterlace_mode">डीइंटरलेस मोड</string>
+    <string name="retro_gs_deint_auto">स्वतः</string>
+    <string name="retro_gs_deint_off">बंद</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV आस्पेक्ट रेशियो</string>
+    <string name="retro_gs_anti_blur">एंटी-ब्लर</string>
+    <string name="retro_gs_widescreen_patches">वाइडस्क्रीन पैच</string>
+    <string name="retro_gs_no_interlace_patches">नो-इंटरलेस पैच</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC स्पिन डिटेक्शन</string>
+    <string name="retro_gs_wait_loop">वेट लूप डिटेक्शन</string>
+    <string name="retro_gs_time_stretch">ऑडियो टाइम स्ट्रेच</string>
+    <string name="retro_gs_audio_buffer">ऑडियो बफर</string>
+    <string name="retro_gs_audio_latency">आउटपुट लेटेंसी</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">फ्रेम समय</string>
+    <string name="retro_gs_hud_gs_stats">GS आँकड़े</string>
+    <string name="retro_gs_hud_hw_info">हार्डवेयर जानकारी</string>
+    <string name="retro_gs_hud_version">संस्करण</string>
+    <string name="retro_gs_hud_input_display">इनपुट डिस्प्ले</string>
+    <string name="retro_gs_fast_boot">फास्ट बूट</string>
+    <string name="retro_gs_group_online_dev9">ऑनलाइन (DEV9)</string>
+    <string name="retro_gs_enable_online">ऑनलाइन सक्षम करें</string>
+    <string name="retro_gs_ethernet_device">ईथरनेट डिवाइस</string>
+    <string name="retro_gs_net_auto">स्वतः</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS मोड</string>
+    <string name="retro_gs_dns_manual">मैन्युअल</string>
+    <string name="retro_gs_dns_internal">आंतरिक</string>
+    <string name="retro_gs_primary_dns">प्राथमिक DNS</string>
+    <string name="retro_gs_secondary_dns">द्वितीयक DNS</string>
+    <string name="retro_gs_dns_optional">वैकल्पिक</string>
+    <string name="retro_gs_auto_ip_dhcp">स्वतः IP (DHCP)</string>
+    <string name="retro_gs_group_input">इनपुट</string>
+    <string name="retro_engine_save">सहेजें</string>
+    <string name="retro_engine_saved">गेम सहेजा गया</string>
+    <string name="retro_engine_loading">लोड हो रहा है…</string>
+    <string name="retro_engine_load">लोड करें</string>
+    <string name="retro_engine_saved_to">%1$s में सहेजा गया</string>
+    <string name="retro_engine_slot_active_only">सक्रिय</string>
+    <string name="retro_engine_rename_slot">सेव स्लॉट का नाम बदलें</string>
+    <string name="retro_engine_caught">%1$d पकड़े गए</string>
+    <string name="retro_engine_no_slots">अभी तक कोई सेव स्लॉट नहीं</string>
+    <string name="retro_engine_new_slot">नया सेव स्लॉट</string>
+    <string name="retro_engine_achievements_unavailable">3D मोड में ट्रैक नहीं किया जाता</string>
+    <string name="retro_engine_fullscreen">पूर्ण स्क्रीन</string>
+    <string name="retro_engine_loaded_from">%1$s लोड किया गया</string>
+    <string name="retro_engine_slot_empty">वह स्लॉट खाली है</string>
+    <string name="retro_engine_loading_subtitle">पहली बार गेम डेटा तैयार किया जा रहा है</string>
+    <string name="retro_gs_engine_3d">वॉक्सेल 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">इस गेम को मानक कोर के बजाय 3D वॉक्सेल इंजन में खेलें</string>
+    <string name="retro_gs_on_screen_controls">ऑन-स्क्रीन नियंत्रण</string>
+    <string name="retro_gs_haptic_feedback">हैप्टिक फ़ीडबैक</string>
+    <string name="retro_gs_group_audio">ऑडियो</string>
+    <string name="retro_gs_volume">वॉल्यूम</string>
+    <string name="retro_gs_mute">म्यूट</string>
+    <string name="retro_gs_swap_stereo">स्टीरियो चैनल बदलें</string>
+    <string name="retro_gs_sound">ध्वनि</string>
+    <string name="retro_scr_retro_defaults">रेट्रो डिफ़ॉल्ट</string>
+    <string name="retro_scr_retro_defaults_desc">प्रत्येक कंसोल के गेम्स पर लागू डिफ़ॉल्ट, जब तक कि किसी गेम की अपनी सेटिंग्स में अधिरोहित न किए जाएँ.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">खाता</string>
+    <string name="retro_scr_signed_in">साइन इन</string>
+    <string name="retro_scr_not_signed_in_hint">साइन इन नहीं — साइन इन करने हेतु किसी गेम की उपलब्धियाँ खोलें</string>
+    <string name="retro_scr_achievements_enabled">उपलब्धियाँ सक्षम</string>
+    <string name="retro_scr_hardcore_default">डिफ़ॉल्ट रूप से हार्डकोर मोड (कोई सेव स्टेट नहीं)</string>
+    <string name="retro_scr_sign_out">साइन आउट</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">स्थापित</string>
+    <string name="retro_scr_none_ps1_bios">कोई नहीं — PS1 गेम्स हेतु BIOS आवश्यक</string>
+    <string name="retro_scr_import_ps1_bios">PS1 BIOS आयात करें…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS हटाया गया</string>
+    <string name="retro_scr_no_bios_to_remove">हटाने हेतु कोई BIOS नहीं</string>
+    <string name="retro_scr_remove_ps1_bios">PS1 BIOS हटाएँ</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">कोई नहीं — PS2 गेम्स हेतु BIOS आवश्यक</string>
+    <string name="retro_scr_format">फ़ॉर्मेट</string>
+    <string name="retro_scr_ps2_bios_format">मर्ज किया गया एकल-फ़ाइल डंप (क्षेत्र-टैग .bin, ~4MB). विभाजित ROM0/MEC/NVM सेट स्वीकार्य नहीं हैं.</string>
+    <string name="retro_scr_import_ps2_bios">PS2 BIOS आयात करें…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS हटाया गया</string>
+    <string name="retro_scr_remove_ps2_bios">PS2 BIOS हटाएँ</string>
+    <string name="retro_scr_library_artwork">लाइब्रेरी आर्टवर्क</string>
+    <string name="retro_scr_retro_case_art">रेट्रो केस आर्ट (कार्ट्रिज / CD केस)</string>
+    <string name="retro_scr_box_art">बॉक्स आर्ट</string>
+    <string name="retro_scr_box_art_desc">आयात पर thumbnails.libretro.com से स्वतः प्राप्त; कस्टम छवि सदैव इसे अधिरोहित करती है.</string>
+    <string name="retro_scr_roms_folder">ROMS फ़ोल्डर</string>
+    <string name="retro_scr_folder">फ़ोल्डर</string>
+    <string name="retro_scr_roms_not_set">सेट नहीं — गेम्स स्वतः आयात करने हेतु एक फ़ोल्डर चुनें</string>
+    <string name="retro_scr_auto_import">स्वतः-आयात</string>
+    <string name="retro_scr_auto_import_desc">इस फ़ोल्डर के नए गेम्स सही कंसोल का पता लगाकर स्वतः आपकी लाइब्रेरी में जुड़ जाते हैं.</string>
+    <string name="retro_scr_select_roms_folder_title">ROMs फ़ोल्डर चुनें</string>
+    <string name="retro_scr_select_roms_folder_button">ROMs फ़ोल्डर चुनें…</string>
+    <string name="retro_scr_change_roms_folder_button">ROMs फ़ोल्डर बदलें…</string>
+    <string name="retro_scr_scan_now">अभी स्कैन करें</string>
+    <string name="retro_scr_console_defaults">कंसोल डिफ़ॉल्ट</string>
+    <string name="retro_scr_console_defaults_desc">इसकी डिफ़ॉल्ट सेटिंग्स सेट करने हेतु किसी कंसोल पर टैप करें.</string>
+    <string name="retro_scr_renderer">रेंडरर</string>
+    <string name="retro_scr_upscale_resolution">रिज़ॉल्यूशन अपस्केल करें</string>
+    <string name="retro_scr_aspect_ratio">आस्पेक्ट रेशियो</string>
+    <string name="retro_scr_aspect_stretch">स्ट्रेच</string>
+    <string name="retro_scr_aspect_auto_standard">स्वतः (मानक)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">डिस्प्ले फ़िल्टर</string>
+    <string name="retro_scr_filter_nearest">निकटतम</string>
+    <string name="retro_scr_filter_bilinear_smooth">बाइलीनियर (स्मूद)</string>
+    <string name="retro_scr_filter_bilinear_sharp">बाइलीनियर (शार्प)</string>
+    <string name="retro_scr_texture_filter">टेक्सचर फ़िल्टर</string>
+    <string name="retro_scr_filter_bilinear_forced">बाइलीनियर (बलपूर्वक)</string>
+    <string name="retro_scr_filter_bilinear_ps2">बाइलीनियर (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">बाइलीनियर (स्प्राइट)</string>
+    <string name="retro_scr_blending_accuracy">ब्लेंडिंग परिशुद्धता</string>
+    <string name="retro_scr_blend_minimum">न्यूनतम</string>
+    <string name="retro_scr_blend_basic">मूल</string>
+    <string name="retro_scr_blend_medium">मध्यम</string>
+    <string name="retro_scr_blend_high">उच्च</string>
+    <string name="retro_scr_blend_full">पूर्ण</string>
+    <string name="retro_scr_blend_maximum">अधिकतम</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV शेडर</string>
+    <string name="retro_scr_shader_off">बंद</string>
+    <string name="retro_scr_shader_scanline">स्कैनलाइन</string>
+    <string name="retro_scr_shader_diagonal">विकर्ण</string>
+    <string name="retro_scr_shader_triangular">त्रिकोणीय</string>
+    <string name="retro_scr_shader_wave">वेव</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">फ़्रेम स्किप</string>
+    <string name="retro_scr_skip_1">1 स्किप करें</string>
+    <string name="retro_scr_skip_2">2 स्किप करें</string>
+    <string name="retro_scr_skip_3">3 स्किप करें</string>
+    <string name="retro_scr_mipmapping">मिपमैपिंग</string>
+    <string name="retro_scr_ee_cycle_rate">EE साइकिल दर</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (डिफ़ॉल्ट)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE साइकिल स्किप</string>
+    <string name="retro_scr_skip_off">बंद</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">इंस्टेंट VU1</string>
+    <string name="retro_scr_mtvu">मल्टी-थ्रेडेड VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">फ़ास्ट CDVD</string>
+    <string name="retro_scr_touch_controls">ऑन-स्क्रीन टच नियंत्रण</string>
+    <string name="retro_scr_sound">ध्वनि</string>
+    <string name="retro_scr_swap_stereo">स्टीरियो चैनल बदलें</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: एमुलेशन गति</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU उपयोग</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU उपयोग</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: आंतरिक रिज़ॉल्यूशन</string>
+    <string name="retro_scr_enable_online_dev9">ऑनलाइन सक्षम करें (DEV9)</string>
+    <string name="retro_scr_ethernet_device">ईथरनेट डिवाइस</string>
+    <string name="retro_scr_net_auto">स्वतः</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS मोड</string>
+    <string name="retro_scr_dns_manual">मैन्युअल</string>
+    <string name="retro_scr_dns_internal">आंतरिक</string>
+    <string name="retro_scr_primary_dns">प्राथमिक DNS</string>
+    <string name="retro_scr_secondary_dns">द्वितीयक DNS</string>
+    <string name="retro_scr_optional">वैकल्पिक</string>
+    <string name="retro_scr_auto_ip_dhcp">स्वतः IP (DHCP)</string>
+    <string name="retro_scr_shader">शेडर</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR अपस्केलिंग</string>
+    <string name="retro_scr_performance_hud">प्रदर्शन HUD</string>
+    <string name="retro_scr_credits_licenses">क्रेडिट &amp; लाइसेंस</string>
+    <string name="retro_scr_credits_desc">WinNative की कुछ सुविधाएँ इन ओपन-सोर्स परियोजनाओं पर आधारित हैं. प्रत्येक स्रोत देखने के लिए टैप करें.</string>
+    <string name="retro_scr_tab_defaults">डिफ़ॉल्ट</string>
+    <string name="retro_scr_tab_credits">क्रेडिट</string>
+    <string name="retro_scr_enable_hardcore_title">हार्डकोर मोड सक्षम करें?</string>
+    <string name="retro_scr_enable_hardcore_body">हार्डकोर मोड अभी गेम रीसेट करता है और सेव स्टेट लोड करना, फ़ास्ट फ़ॉरवर्ड, और चीट्स अक्षम कर देता है. कोई भी असहेजी प्रगति खो जाएगी. जारी रखें?</string>
+    <string name="retro_scr_cancel">रद्द करें</string>
+    <string name="retro_scr_enable">सक्षम करें</string>
+    <string name="retro_scr_bios_imported">BIOS आयात हुआ: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">अमान्य BIOS फ़ाइल</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS आयात हुआ: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">अमान्य PS2 BIOS फ़ाइल</string>
+    <string name="retro_scr_no_game_serial">चीट्स खोजने हेतु कोई गेम सीरियल नहीं.</string>
+    <string name="retro_scr_applied_cheats">%1$d चीट(s) लागू किए गए.</string>
+    <string name="retro_scr_couldnt_apply_cheats">चीट्स लागू नहीं किए जा सके.</string>
+    <string name="retro_scr_cheats">चीट्स</string>
+    <string name="retro_scr_apply">लागू करें</string>
+    <string name="retro_scr_no_cheats_found">इस गेम हेतु कोई चीट्स नहीं मिले.</string>
+    <string name="retro_scr_achievements">उपलब्धियाँ</string>
+    <string name="retro_scr_sign_in_ra">RetroAchievements में साइन इन करें</string>
+    <string name="retro_scr_username">उपयोगकर्ता नाम</string>
+    <string name="retro_scr_password">पासवर्ड</string>
+    <string name="retro_scr_login_failed">लॉगिन विफल</string>
+    <string name="retro_scr_signing_in">साइन इन हो रहा है…</string>
+    <string name="retro_scr_sign_in">साइन इन</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d अंक</string>
+    <string name="retro_scr_no_achievements">इस गेम हेतु कोई उपलब्धियाँ नहीं.</string>
+    <string name="retro_scr_back">वापस</string>
+    <string name="retro_scr_enabled">सक्षम</string>
+    <string name="retro_scr_disabled">अक्षम</string>
+    <string name="retro_scr_rename">नाम बदलें</string>
+    <string name="retro_scr_save">सहेजें</string>
+    <string name="retro_scr_cloud_save_conflict">क्लाउड सेव विरोध</string>
+    <string name="retro_scr_keep_local_save">स्थानीय सेव रखें</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">मेनू</string>
+    <string name="retro_tab_display">डिस्प्ले</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">ध्वनि</string>
+    <string name="retro_tab_controls">नियंत्रण</string>
+    <string name="retro_scan_up_to_date">लाइब्रेरी अद्यतित</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">%1$d जोड़े गए</string>
+    <string name="retro_scan_removed">%1$d हटाए गए</string>
+    <string name="retro_scr_shader_default">डिफ़ॉल्ट</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">शार्प</string>
+    <string name="retro_scr_upscale_native">नेटिव</string>
+    <string name="retro_co_aspect_ratio">आस्पेक्ट रेशियो</string>
+    <string name="retro_co_ntsc_filter">NTSC फ़िल्टर</string>
+    <string name="retro_co_colorization">रंगीकरण</string>
+    <string name="retro_co_color_correction">रंग सुधार</string>
+    <string name="retro_co_remove_sprite_limit">स्प्राइट सीमा हटाएँ</string>
+    <string name="retro_co_resolution">रिज़ॉल्यूशन</string>
+    <string name="retro_co_framebuffer_emulation">फ़्रेमबफ़र एमुलेशन</string>
+    <string name="retro_co_dithering">डिदरिंग</string>
+    <string name="retro_co_widescreen_hack">वाइडस्क्रीन हैक</string>
+    <string name="retro_co_val_8_7_native">8:7 (नेटिव)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">बंद</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">कंपोज़िट</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">स्वतः</string>
+    <string name="retro_co_val_gba_screen">GBA स्क्रीन</string>
+    <string name="retro_co_val_gbc_screen">GBC स्क्रीन</string>
+    <string name="retro_co_val_on">चालू</string>
+    <string name="retro_co_val_320x240_native">320x240 (नेटिव)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 समायोजित</string>
+    <string name="retro_co_val_native">नेटिव</string>
+    <string name="retro_co_val_internal">आंतरिक</string>
+    <string name="retro_co_val_on_16_9">चालू (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">रेट्रो गेम्स हेतु उपलब्धियाँ अर्जित करने और ट्रैक करने के लिए अपने RetroAchievements खाते से साइन इन करें.</string>
+    <string name="retro_ach_username">उपयोगकर्ता नाम</string>
+    <string name="retro_ach_password">पासवर्ड</string>
+    <string name="retro_ach_enter_credentials">अपना उपयोगकर्ता नाम और पासवर्ड दर्ज करें</string>
+    <string name="retro_ach_login_failed">लॉगिन विफल</string>
+    <string name="retro_ach_sign_in">साइन इन</string>
+    <string name="retro_ach_password_disclaimer">आपका पासवर्ड केवल एक बार लॉगिन टोकन प्राप्त करने हेतु उपयोग होता है, जो डिवाइस पर सुरक्षित रूप से संग्रहीत है.</string>
+    <string name="retro_ach_achievements_enabled">उपलब्धियाँ सक्षम</string>
+    <string name="retro_ach_hardcore_mode">हार्डकोर मोड (कोई सेव स्टेट नहीं)</string>
+    <string name="retro_ach_points">%1$d / %2$d अंक</string>
+    <string name="retro_ach_none_found">इस गेम हेतु कोई उपलब्धियाँ नहीं मिलीं.</string>
+    <string name="retro_ach_sign_out">साइन आउट</string>
+    <string name="retro_che_brand">चीट्स</string>
+    <string name="retro_che_name">नाम</string>
+    <string name="retro_che_code">कोड</string>
+    <string name="retro_che_cancel">रद्द करें</string>
+    <string name="retro_che_save">सहेजें</string>
+    <string name="retro_che_default_name">चीट %1$d</string>
+    <string name="retro_che_empty">अभी तक कोई चीट्स नहीं. इस गेम हेतु एक चीट कोड जोड़ें.</string>
+    <string name="retro_che_add">चीट जोड़ें</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU ड्राइवर</string>
+    <string name="retro_gpu_driver_system">सिस्टम (डिफ़ॉल्ट)</string>
+    <string name="retro_gpu_driver_hint">Turnip ड्राइवर सेटिंग्स \u2192 ड्राइवर्स में इंस्टॉल करें। ये ड्राइवर PC और PS2 दोनों गेम्स के लिए काम करते हैं।</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Final Fantasy XI जैसे HDD-आधारित गेम के लिए वर्चुअल आंतरिक ड्राइव। गेम को पुनः आरंभ करता है।</string>
+    <string name="retro_ps2_hdd_desc">Final Fantasy XI जैसे HDD-आधारित गेम के लिए वर्चुअल आंतरिक ड्राइव।</string>
+    <string name="retro_ps2_dns_auto_internal">DNS मोड को Internal पर सेट किया गया ताकि आपके कस्टम सर्वर होस्ट प्रभावी हों।</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">CPU कोर</string>
+    <string name="retro_co_dual_core">डुअल कोर</string>
+    <string name="retro_co_internal_cheats">आंतरिक चीट्स</string>
+    <string name="retro_co_internal_resolution">आंतरिक रिज़ॉल्यूशन</string>
+    <string name="retro_co_renderer">रेंडरर</string>
+    <string name="retro_co_sensor_bar">सेंसर बार स्थिति</string>
+    <string name="retro_co_skip_gc_bios">BIOS इंट्रो छोड़ें</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">नीचे</string>
+    <string name="retro_co_val_cached_interpreter">कैश्ड इंटरप्रेटर</string>
+    <string name="retro_co_val_hardware">हार्डवेयर</string>
+    <string name="retro_co_val_interpreter">इंटरप्रेटर</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">माउस / टच</string>
+    <string name="retro_co_val_right_stick_absolute">राइट स्टिक (एब्सोल्यूट)</string>
+    <string name="retro_co_val_right_stick_relative">राइट स्टिक (रिलेटिव)</string>
+    <string name="retro_co_val_software">सॉफ़्टवेयर</string>
+    <string name="retro_co_val_stretch">स्ट्रेच</string>
+    <string name="retro_co_val_top">ऊपर</string>
+    <string name="retro_co_vbi_skip">VBI स्किप (ऑटो फ़्रेमस्किप)</string>
+    <string name="retro_co_widescreen">वाइडस्क्रीन</string>
+    <string name="retro_co_wiimote_pointer">Wiimote पॉइंटर</string>
+    <string name="retro_gs_cheats_apply_note">अगली बार इस गेम को लॉन्च करने पर बदलाव लागू होंगे।</string>
+    <string name="retro_gs_cheats_detect_hint">इस गेम को एक बार लॉन्च करें ताकि इसका डिस्क सीरियल पहचाना जा सके, फिर चीट्स और पैच यहाँ दिखाई देंगे।</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS ऑथ बायपास — ऑनलाइन प्ले के लिए आवश्यक</string>
+    <string name="retro_gs_dnas_group">ऑटो-लागू (ऑनलाइन)</string>
+    <string name="retro_gs_group_cheats">चीट्स &amp; पैच</string>
+    <string name="retro_gs_hdd_image_size">आकार: %1$s</string>
+    <string name="retro_gs_hdd_import">HDD इमेज इंपोर्ट करें</string>
+    <string name="retro_gs_hdd_remove_short">हटाएँ</string>
+    <string name="retro_gs_netplay_enable">NetPlay सक्षम करें</string>
+    <string name="retro_gs_netplay_enable_subtitle">डिफ़ॉल्ट रूप से बंद। सक्षम करें, फिर लॉन्च से पहले Host या Join चुनें।\nगेम से बाहर निकलने पर यह फिर से बंद हो जाता है।</string>
+    <string name="retro_gs_netplay_host">Host पता</string>
+    <string name="retro_gs_netplay_host_hint">IP या होस्टनेम</string>
+    <string name="retro_gs_netplay_host_mode">Host सेशन</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">चालू = किसी खिलाड़ी की प्रतीक्षा करें। बंद = host पते से जुड़ें</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay TCP पर लोकल मल्टीप्लेयर पोर्ट का उपयोग करता है (खिलाड़ी 1 host / खिलाड़ी 2 क्लाइंट)। PS2 ऑनलाइन इसके बजाय DEV9 ईथरनेट का उपयोग करता है।</string>
+    <string name="retro_gs_netplay_port">पोर्ट</string>
+    <string name="retro_lr_memory_card_slot">मेमोरी कार्ड %1$d</string>
+    <string name="retro_lr_screenshot">स्क्रीनशॉट</string>
+    <string name="retro_lr_use_cloud_save">क्लाउड सेव का उपयोग करें</string>
+    <string name="retro_netplay_conn_direct">LAN (सीधा IP)</string>
+    <string name="retro_netplay_connecting">कनेक्ट हो रहा है…</string>
+    <string name="retro_netplay_connection">कनेक्शन</string>
+    <string name="retro_netplay_conn_traversal">ऑनलाइन (host कोड)</string>
+    <string name="retro_netplay_dismiss">खारिज करें</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay Dolphin के अपने इंजन का उपयोग करता है। Host = खिलाड़ी 1, Join = खिलाड़ी 2। लॉन्च से पहले Host या Join और एक कनेक्शन प्रकार चुनें; दोनों डिवाइस एक साथ वही गेम बूट करते हैं।</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">अपने डिवाइस का Wi‑Fi IP और यह पोर्ट खिलाड़ी 2 के साथ साझा करें। जैसे ही वे कनेक्ट होते हैं गेम अपने आप शुरू हो जाता है।</string>
+    <string name="retro_netplay_dolphin_host_online_hint">गेम बूट होने पर एक host कोड दिखाया जाता है — इसे खिलाड़ी 2 के साथ साझा करें। जैसे ही वे कनेक्ट होते हैं गेम अपने आप शुरू हो जाता है।</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">host का Wi‑Fi IP और पोर्ट दर्ज करें, फिर कनेक्ट करने के लिए लॉन्च करें।</string>
+    <string name="retro_netplay_dolphin_join_online_hint">खिलाड़ी 1 से host कोड दर्ज करें, फिर कनेक्ट करने के लिए लॉन्च करें।</string>
+    <string name="retro_netplay_enable_before_launch">गेम सेटिंग्स में NetPlay सक्षम करें और लॉन्च से पहले Host या Join चुनें</string>
+    <string name="retro_netplay_find_rooms">Wi‑Fi पर रूम खोजें</string>
+    <string name="retro_netplay_game_link_hint">Game Link · प्रत्येक स्क्रीन अपना अलग हैंडहेल्ड है</string>
+    <string name="retro_netplay_gba_not_ready">GBA मल्टीप्लेयर gpSP + Wireless Adapter का उपयोग करता है। सुनिश्चित करें कि libgpsp इंस्टॉल है।</string>
+    <string name="retro_netplay_help">Wi‑Fi पर साझा-स्क्रीन मल्टीप्लेयर (RetroArch की तरह)।\nHost = खिलाड़ी 1, Join = खिलाड़ी 2। दोनों डिवाइस वही गेम दिखाते हैं।</string>
+    <string name="retro_netplay_help_game_link">Wi‑Fi पर Game Link — प्रत्येक डिवाइस अपना गेम चलाता है।\nGB/GBC: Gambatte सीरियल लिंक (Pokémon Gen 1–2)।\nGBA: gpSP Wireless Adapter (Pokémon FR/LG/Emerald बैटल)।</string>
+    <string name="retro_netplay_host_action">रूम होस्ट करें</string>
+    <string name="retro_netplay_host_code">Host कोड</string>
+    <string name="retro_netplay_host_code_hint">host से ट्रैवर्सल host कोड</string>
+    <string name="retro_netplay_hosting_room">रूम होस्ट हो रहा है</string>
+    <string name="retro_netplay_host_mode_hint">इस प्ले सेशन के लिए एक रूम खोलने हेतु Host टैप करें, फिर गेम लॉन्च करें। बाहर निकलने पर NetPlay बंद हो जाता है।</string>
+    <string name="retro_netplay_in_room">रूम में</string>
+    <string name="retro_netplay_join_action">IP द्वारा जुड़ें</string>
+    <string name="retro_netplay_joined">जुड़ गए</string>
+    <string name="retro_netplay_join_room">Join</string>
+    <string name="retro_netplay_launch_mode">लॉन्च पर</string>
+    <string name="retro_netplay_leave">छोड़ें</string>
+    <string name="retro_netplay_menu_hint">Host = P1 · Join = P2 · दोनों स्क्रीन पर वही गेम</string>
+    <string name="retro_netplay_mode_host">Host</string>
+    <string name="retro_netplay_mode_join">Join</string>
+    <string name="retro_netplay_mode_manual">मैन्युअल</string>
+    <string name="retro_netplay_no_rooms">कोई रूम नहीं मिला। सुनिश्चित करें कि host उसी Wi‑Fi पर है और एक रूम होस्ट कर रहा है।</string>
+    <string name="retro_netplay_player_name">प्रदर्शन नाम</string>
+    <string name="retro_netplay_player_name_hint">अन्य खिलाड़ियों को दिखाया गया</string>
+    <string name="retro_netplay_players_count">%1$d जुड़े</string>
+    <string name="retro_netplay_prelaunch_hint">रूम केवल इस सेशन के लिए खुला है। तैयार होने पर लॉन्च करें। गेम से बाहर निकलने पर NetPlay बंद हो जाता है।</string>
+    <string name="retro_netplay_room_players">खिलाड़ी</string>
+    <string name="retro_netplay_scan_action">Wi‑Fi स्कैन करें</string>
+    <string name="retro_netplay_scan_again">फिर से स्कैन करें</string>
+    <string name="retro_netplay_scan_hint">खुले रूम के लिए उसी Wi‑Fi को स्कैन करें, या IP पते द्वारा जुड़ें।</string>
+    <string name="retro_netplay_scanning">Wi‑Fi स्कैन हो रहा है…</string>
+    <string name="retro_netplay_scan_results">स्कैन परिणाम</string>
+    <string name="retro_netplay_select_room_hint">अभी जुड़ने के लिए किसी रूम पर टैप करें (अगले लॉन्च के लिए IP सहेजता नहीं है)।</string>
+    <string name="retro_netplay_stop_scan">स्कैन रोकें</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s जुड़ गया</string>
+    <string name="retro_netplay_user_disconnected">%1$s डिस्कनेक्ट हो गया</string>
+    <string name="retro_netplay_waiting_players">खिलाड़ियों की प्रतीक्षा हो रही है…</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2 समर्थन जल्द ही आ रहा है</string>
+    <string name="retro_ps2_show_l3r3">L3 / R3 बटन दिखाएँ</string>
+    <string name="retro_ps2_show_l3r3_subtitle">बंद होने पर, L3 / R3 क्लिक करने के लिए स्टिक को डबल-टैप करें</string>
+    <string name="retro_ps2_turnip_flags">TURNIP ड्राइवर फ़्लैग</string>
+    <string name="retro_ps2_turnip_flags_note">केवल तभी लागू होता है जब ऊपर एक कस्टम GPU ड्राइवर चुना गया हो।</string>
+    <string name="retro_rom_missing">गेम फ़ाइल नहीं मिली</string>
+    <string name="retro_scr_delete">हटाएँ</string>
+    <string name="retro_scr_import_from_file">फ़ाइल से इंपोर्ट करें…</string>
+    <string name="retro_scr_loading">लोड हो रहा है…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">कंसोल बदलें</string>
+    <string name="retro_gs_identify_as">कंसोल के रूप में पहचानें</string>
+    <string name="retro_gs_console_changed">अब %1$s के रूप में पहचाना गया</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">अंतर्निहित vkBasalt लेयर के माध्यम से DXVK/VKD3D (Vulkan) गेम पर ReShade प्रभाव (.fx) लागू करें। प्रत्येक प्रभाव को Android/data/&lt;package&gt;/files/ReShade/ के अंतर्गत उसके अपने फ़ोल्डर में रखें। लाइव पैरामीटर ट्यूनिंग और इन-गेम टॉगल लाइव-रीलोड लेयर अपडेट के साथ आएंगे।</string>
+    <string name="reshade_catalog_title">ReShade प्रभाव</string>
+    <string name="reshade_catalog_search">प्रभाव खोजें…</string>
+    <string name="reshade_catalog_installed">इंस्टॉल किए गए (%1$d)</string>
+    <string name="reshade_catalog_available">उपलब्ध (%1$d)</string>
+    <string name="reshade_catalog_downloading">डाउनलोड हो रहा है</string>
+    <string name="reshade_catalog_installing">इंस्टॉल हो रहा है</string>
+    <string name="reshade_catalog_offline_cache">ऑफ़लाइन — एक कैश की गई सूची दिखाई जा रही है। नए प्रभाव डाउनलोड करने के लिए कनेक्ट करें।</string>
+    <string name="reshade_catalog_offline_none">ऑफ़लाइन — केवल इंस्टॉल किए गए प्रभाव दिखाए जा रहे हैं। कैटलॉग ब्राउज़ करने के लिए कनेक्ट करें।</string>
+    <string name="reshade_catalog_needs_connection">प्रभाव डाउनलोड करने के लिए इंटरनेट से कनेक्ट करें।</string>
+    <string name="reshade_catalog_download_failed">%1$s डाउनलोड करने में विफल।</string>
+    <string name="reshade_catalog_empty_query">\"%1$s\" से कोई प्रभाव मेल नहीं खाता।</string>
+    <string name="reshade_catalog_empty">कोई प्रभाव उपलब्ध नहीं। कैटलॉग ब्राउज़ करने के लिए इंटरनेट से कनेक्ट करें।</string>
+    <string name="reshade_catalog_done">पूर्ण</string>
+    <string name="reshade_catalog_delete_cd">%1$s हटाएँ</string>
+    <string name="reshade_catalog_delete_title">%1$s हटाएँ?</string>
+    <string name="reshade_catalog_delete_body">यह प्रभाव को स्टोरेज से और उसका उपयोग करने वाले किसी भी लोडआउट से हटा देता है। आप इसे बाद में फिर से डाउनलोड कर सकते हैं।</string>
+    <string name="reshade_catalog_delete_confirm">हटाएँ</string>
+    <string name="reshade_catalog_delete_cancel">रद्द करें</string>
+    <string name="reshade_catalog_delete_failed">%1$s को हटाया नहीं जा सका।</string>
+    <string name="reshade_params_title">प्रभाव पैरामीटर</string>
+    <string name="reshade_params_reset">रीसेट</string>
+    <string name="reshade_loadout_empty">अभी तक कोई प्रभाव नहीं। लोडआउट बनाने के लिए एक या अधिक प्रभाव जोड़ें।</string>
+    <string name="reshade_loadout_add">प्रभाव जोड़ें</string>
+    <string name="reshade_loadout_full">लोडआउट भरा है — दूसरा जोड़ने के लिए एक प्रभाव हटाएँ।</string>
+    <string name="reshade_effect_active">सक्रिय</string>
+    <string name="reshade_mode_solo">सोलो</string>
+    <string name="reshade_mode_stack">स्टैक</string>
+    <string name="reshade_mode_solo_hint">एक समय में एक प्रभाव सक्रिय (A/B तुलना, गेम में लाइव स्विच करें)।</string>
+    <string name="reshade_mode_stack_hint">प्रभावों के किसी भी उपसमूह को परत करें, क्रम में लागू किया जाता है।</string>
+    <string name="reshade_drawer_enable">ReShade सक्षम करें</string>
+    <string name="reshade_drawer_empty">इस लोडआउट में कोई ReShade प्रभाव नहीं है। उन्हें यहाँ बदलने और ट्यून करने के लिए इस गेम की सेटिंग (या कंटेनर की) में प्रभाव जोड़ें।</string>
+    <string name="reshade_drawer_no_params">यह प्रभाव कोई समायोज्य पैरामीटर प्रदान नहीं करता।</string>
+    <string name="cloud_saves_deleting">सेव हटाया जा रहा है…</string>
+    <string name="cloud_saves_history_delete">हटाएं</string>
+    <string name="cloud_saves_history_delete_confirm_body">%1$s से क्लाउड सेव को हमेशा के लिए हटाएं? इसे पूर्ववत नहीं किया जा सकता।</string>
+    <string name="cloud_saves_history_delete_confirm_title">क्लाउड सेव हटाएं</string>
+    <string name="cloud_saves_history_delete_failed">क्लाउड सेव नहीं हटाया जा सका</string>
+    <string name="cloud_saves_history_delete_success">क्लाउड सेव हटा दिया गया</string>
+    <string name="retro_bundle_required">पहले कंसोल कोर डाउनलोड करें — सेटिंग्स › रेट्रो</string>
+    <string name="retro_ps2_device_unsupported">यह डिवाइस PS2 एमुलेशन नहीं चला सकता — इसके लिए OpenGL ES 3.1 या नया चाहिए।</string>
+    <string name="retro_scr_consoles_check">अपडेट जांचें</string>
+    <string name="retro_scr_consoles_checking">अपडेट जांचे जा रहे हैं…</string>
+    <string name="retro_scr_consoles_download">कंसोल कोर डाउनलोड करें</string>
+    <string name="retro_scr_consoles_downloading">डाउनलोड हो रहा है… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">कंसोल कोर</string>
+    <string name="retro_scr_consoles_installed">इंस्टॉल है — बिल्ड %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">इंस्टॉल है — बिल्ड %1$s (अपडेट जांच विफल)</string>
+    <string name="retro_scr_consoles_installing">इंस्टॉल हो रहा है…</string>
+    <string name="retro_scr_consoles_missing">इंस्टॉल नहीं है — रेट्रो गेम खेलने के लिए डाउनलोड करें</string>
+    <string name="retro_scr_consoles_state">स्थिति</string>
+    <string name="retro_scr_consoles_update">कंसोल कोर अपडेट करें</string>
+    <string name="retro_scr_consoles_update_available">अपडेट उपलब्ध — बिल्ड %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">डाउनलोड सत्यापित हो रहा है…</string>
+    <string name="retro_scr_consoles_working">काम चल रहा है…</string>
+    <string name="retro_tab_system">सिस्टम</string>
+</resources>
diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
new file mode 100644
index 000000000..3d3285c51
--- /dev/null
+++ b/app/src/main/res/values-it/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Immagine</item>
+        <item>Originale</item>
+        <item>Tinta unita</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 150063e97..3b5432dad 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Seleziona un file .exe valido</string>
     <string name="common_ui_select_valid_icon_file">Seleziona un file .ico o .png valido.</string>
     <string name="common_ui_exit">Esci</string>
+    <string name="common_ui_exit_app">Esci dall\'app</string>
     <string name="common_ui_profile">Profilo</string>
     <string name="common_ui_name">Nome</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Icona</string>
     <string name="common_ui_duplicate">Duplica</string>
     <string name="common_ui_credits_and_third_party_apps">Crediti e app di terze parti</string>
-    <string name="common_ui_loading">Caricamento…</string>
+    <string name="common_ui_loading">Caricamento</string>
+    <string name="common_ui_exporting">Esportazione</string>
     <string name="common_ui_enable">Abilita</string>
     <string name="common_ui_disable">Disabilita</string>
     <string name="common_ui_force">Forza</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Altezza</string>
     <string name="common_ui_open_file">Apri file</string>
     <string name="common_ui_download_file">Scarica file</string>
-    <string name="common_ui_downloading_file">Download del file in corso...</string>
+    <string name="common_ui_downloading_file">Download del file in corso</string>
     <string name="common_ui_browse">Sfoglia</string>
     <string name="common_ui_options">Opzioni</string>
     <string name="common_ui_export">Esporta</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Impostazioni</string>
     <string name="common_ui_enable_all">Abilita tutto</string>
     <string name="common_ui_disable_all">Disabilita tutto</string>
+    <string name="common_ui_select_all">Seleziona tutto</string>
+    <string name="common_ui_deselect_all">Deseleziona tutto</string>
     <string name="common_ui_on">Attivo</string>
     <string name="common_ui_off">Disattivo</string>
     <string name="common_ui_already_set">Già impostato</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Installa</string>
     <string name="common_ui_application">Applicazione</string>
     <string name="common_ui_check">Verifica</string>
+    <string name="store_game_check_for_update">Controlla aggiornamenti</string>
+    <string name="store_game_checking_for_update">Controllo</string>
+    <string name="store_game_download_update">Scarica aggiornamento</string>
+    <string name="store_game_no_update_available">Nessun aggiornamento disponibile</string>
+    <string name="store_game_update_available">Aggiornamento disponibile</string>
+    <string name="store_game_update_check_failed">Controllo aggiornamenti non riuscito</string>
+    <string name="store_game_update">Aggiorna</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verifica file</string>
+    <string name="store_game_verify_started">Verifica di %1$s — controlla la scheda Download</string>
+    <string name="store_game_steam_options">Opzioni Steam</string>
+    <string name="store_game_verify_complete">Verifica file completata</string>
+    <string name="store_game_verify_failed_notice">Verifica file non riuscita</string>
+    <string name="store_game_progress_background_hint">Puoi chiudere questa finestra — continua in background. Controlla la scheda Download in qualsiasi momento.</string>
+    <string name="store_game_checking_updates">Controllo aggiornamenti</string>
+    <string name="store_game_no_updates_notice">Nessun aggiornamento disponibile</string>
+    <string name="store_game_update_complete">Aggiornamento completato</string>
+    <string name="store_game_update_failed_notice">Aggiornamento non riuscito</string>
+    <string name="store_game_update_check_failed_notice">Controllo aggiornamenti non riuscito</string>
+    <string name="store_game_download_already_active">Questo gioco è già in download. Annulla il download corrente prima di aggiungere DLC.</string>
     <string name="common_ui_select">Seleziona</string>
     <string name="common_ui_select_folder">Seleziona cartella</string>
     <string name="common_ui_current_folder">Cartella corrente</string>
+    <string name="common_ui_enter_path">Inserisci percorso</string>
+    <string name="common_ui_path_not_found">Percorso non trovato</string>
     <string name="common_ui_storage_roots">Percorsi di archiviazione</string>
     <string name="common_ui_browse_local_folders_directly">Sfoglia direttamente le cartelle locali</string>
     <string name="common_ui_no_folders_available_here">Nessuna cartella disponibile qui</string>
     <string name="common_ui_grant_all_files_access_browse">Concedi l\'accesso completo ai file per sfogliare direttamente le cartelle locali.</string>
     <string name="common_ui_not_configured">Non configurato</string>
     <string name="common_ui_reinstall">Reinstalla</string>
-    <string name="common_ui_exit_app_confirm">Uscire da WinNative?</string>
     <string name="common_ui_elements_count">%1$d elementi</string>
     <string name="common_ui_disabled_placeholder">-- Disabilitato --</string>
     <string name="common_ui_enabled">Abilitato</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Recupera immagini</string>
+    <string name="library_games_scraping_artwork">Recupero</string>
     <string name="library_games_shortcut_created">Scorciatoia creata</string>
     <string name="library_games_failed_to_create_shortcut">Impossibile creare la scorciatoia: %s</string>
     <string name="library_games_install_path">Percorso di installazione</string>
+    <string name="library_games_not_enough_space">Servono altri %1$s di spazio</string>
     <string name="library_games_download_slash_install">Scarica / Installa</string>
     <string name="library_games_save_management">GESTIONE SALVATAGGI</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Disponibile: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">Nessun gioco installato\nTocca per aprire il backend Winlator</string>
     <string name="library_games_installed_badge">INSTALLATO</string>
     <string name="library_games_unknown_game">Gioco sconosciuto</string>
-    <string name="library_games_layouts_header">LAYOUT</string>
+    <string name="library_games_layouts_header">LAYOUT DELLA LIBRERIA</string>
     <string name="library_games_layout_carousel">Carosello</string>
     <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPZIONI DI VISUALIZZAZIONE</string>
+    <string name="library_games_immersive_mode">Modalità immersiva</string>
+    <string name="library_games_immersive_mode_description">Usa l’immagine del gioco selezionato come sfondo</string>
+    <string name="library_games_immersive_blur">Sfoca lo sfondo</string>
+    <string name="library_games_immersive_blur_description">Applica un effetto sfocatura allo sfondo immersivo</string>
     <string name="library_games_custom_game">Gioco personalizzato</string>
     <string name="library_games_play">Gioca</string>
+    <string name="hero_boot_to_desktop_title">Avvia sul desktop</string>
+    <string name="hero_graphics_tests_title">Test grafici</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Test di input</string>
     <string name="library_games_add_custom_game">Aggiungi gioco personalizzato</string>
     <string name="library_games_game_name">Nome del gioco</string>
     <string name="library_games_game_folder_mapped_drive">Cartella del gioco (unità di gioco mappata)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Annullato</string>
     <string name="downloads_queue_phase_failed">Fallito: %1$s</string>
     <string name="downloads_queue_cancel_download">Annulla download</string>
+    <string name="downloads_queue_cancel_download_title">Annullare il download?</string>
+    <string name="downloads_queue_cancel_download_warning">Annullare il download di un DLC, gioco o aggiornamento potrebbe danneggiare l\'installazione del gioco.\n\nVuoi davvero annullare?</string>
     <string name="downloads_queue_empty">Nessun download attivo.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Nuovo contenitore</string>
     <string name="containers_list_edit">Modifica contenitore</string>
-    <string name="containers_list_creating">Creazione contenitore…</string>
-    <string name="containers_list_removing">Rimozione contenitore…</string>
-    <string name="containers_list_duplicating">Duplicazione contenitore…</string>
+    <string name="containers_list_creating">Creazione contenitore</string>
+    <string name="containers_list_removing">Rimozione contenitore</string>
+    <string name="containers_list_duplicating">Duplicazione contenitore</string>
+    <string name="containers_list_remove_title">Rimuovi contenitore</string>
+    <string name="containers_list_duplicate_title">Duplica contenitore</string>
     <string name="containers_list_confirm_remove">Vuoi rimuovere questo contenitore?</string>
     <string name="containers_list_confirm_duplicate">Vuoi duplicare questo contenitore?</string>
+    <string name="containers_list_duplicate_failed">Impossibile duplicare il contenitore</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Vuoi rimuovere questa scorciatoia?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Impossibile clonare la scorciatoia.</string>
     <string name="shortcuts_list_exported_to">Scorciatoia esportata in %1$s</string>
     <string name="shortcuts_list_failed_export">Impossibile esportare la scorciatoia</string>
+    <string name="shortcuts_export_all">Esporta tutto</string>
+    <string name="shortcuts_export_to_frontend">Esporta nel frontend</string>
+    <string name="shortcuts_export_all_done">%1$d giochi esportati in %2$s</string>
+    <string name="shortcuts_export_all_none">Nessun gioco da esportare</string>
     <string name="shortcuts_list_added">Scorciatoia aggiunta con successo.</string>
     <string name="shortcuts_list_failed_add">Impossibile aggiungere la scorciatoia.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Disabilita Xinput (per controllo esclusivo M/T)</string>
     <string name="shortcuts_properties_exclusive_input">Input esclusivo</string>
     <string name="shortcuts_properties_custom_game_settings">Impostazioni di gioco personalizzate</string>
-    <string name="shortcuts_properties_use_cold_client">Usa ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient è il metodo preferito per gestire l\'emulazione Steam e il DRM. Applica la patch al DRM in fase di esecuzione senza modificare i file di gioco.</string>
-    <string name="shortcuts_properties_unpack_files">DRM legacy</string>
-    <string name="shortcuts_properties_unpack_files_description">Rimuove il DRM SteamStub dall\'exe su disco. Attivare solo se il gioco non si avvia senza. Il patcher runtime di ColdClient gestisce la maggior parte dei giochi automaticamente.</string>
-    <string name="shortcuts_properties_force_dlc">Forza DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Abilita solo se i DLC non vengono rilevati o i salvataggi con DLC non funzionano</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Avvia client Steam (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Avvia il vero client Steam in Wine\nRichiede un account Steam e potrebbe ridurre le prestazioni\nNon tutti i giochi funzionano</string>
-    <string name="shortcuts_properties_steam_type">Prestazioni client Steam</string>
-    <string name="steam_section_emulator">Emulatore Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Client Steam reale</string>
     <string name="shortcuts_properties_use_steam_input">Usa Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Modalità offline Steam</string>
     <string name="shortcuts_properties_reset">Ripristina proprietà</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Vuoi duplicare questo profilo?</string>
     <string name="input_controls_editor_title">Editor controlli</string>
     <string name="input_controls_editor_toggle_switch">Interruttore a levetta</string>
+    <string name="input_controls_editor_swipeable">Attivabile con swipe</string>
     <string name="input_controls_editor_profile_exported_to">Profilo esportato in</string>
     <string name="input_controls_editor_unable_to_import">Impossibile importare il profilo</string>
     <string name="input_controls_editor_import_profile">Importa profilo</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Compatibilità</string>
     <string name="container_box64_intermediate">Intermedio</string>
     <string name="container_box64_performance">Prestazioni</string>
+    <string name="container_fexcore_performance_tso">Prestazioni TSO</string>
+    <string name="container_fexcore_extreme">Estremo</string>
+    <string name="container_fexcore_extreme_tso">Estremo TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Gestione dei flag sugli opcode CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Tratta CALL/RET come se non avessero mai bisogno dei flag (più veloce, instabile)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Preset FEXCore</string>
     <string name="container_fexcore_version">Versione FEXCore</string>
+    <string name="use_unix_libs">Usa UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Driver grafico</string>
+    <string name="container_zink_mode">Modalità Zink</string>
+    <string name="container_graphics_transcoder">Transcodificatore BCn</string>
+    <string name="container_graphics_quality">Qualità BCn</string>
     <string name="container_graphics_configuration">Configurazione driver grafico</string>
     <string name="container_graphics_version">Versione driver grafico</string>
     <string name="container_graphics_available_extensions">Estensioni disponibili</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">Emulazione BCn</string>
     <string name="container_graphics_bcn_emulation_type">Tipo emulazione BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Cache emulazione BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Super risoluzione per giochi 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Nitidezza bordi</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Vuoi duplicare questo preset?</string>
     <string name="container_presets_confirm_remove">Vuoi rimuovere questo preset?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Usa l\'estensione DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Simula touchscreen</string>
     <string name="session_xserver_preferences_button_text">   PREFERENZE   </string>
     <string name="session_xserver_extra_keys_config_desc">Qui puoi impostare il valore della variabile extra-keys come nell\'app Termux (leggi <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">questo</a>) e altro \n
@@ -526,12 +572,6 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="session_xserver_pref_kbd">Tastiera</string>
     <string name="session_xserver_pref_other">Altro</string>
     <string name="session_xserver_pref_version">Versione</string>
-    <string name="session_xserver_use_dri3_description">La disabilitazione può risolvere difetti grafici su alcuni dispositivi</string>
-    <string name="session_xserver_native_rendering">Rendering nativo</string>
-    <string name="session_xserver_native_rendering_enabled">Rendering hardware DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Fallback software WSI</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Rendering nativo abilitato (effettivo al prossimo avvio)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Rendering nativo disabilitato (effettivo al prossimo avvio)</string>
     <string name="session_xserver_notification_description">Messaggi XServer di WinNative</string>
     <string name="session_xserver_notification_content">WinNative è in esecuzione, non chiudere o scorrere via questa notifica</string>
 
@@ -551,6 +591,8 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="session_drawer_exit_subtitle">Chiudi la sessione in corso</string>
     <string name="session_drawer_touchscreen_overlay">Overlay touchscreen</string>
     <string name="session_drawer_resume">Riprendi</string>
+    <string name="session_drawer_retry">Riprova</string>
+    <string name="downloads_no_internet">Nessuna connessione Internet</string>
     <string name="session_drawer_pause">Pausa</string>
     <string name="session_drawer_wine_processes_paused">Processi Wine in pausa</string>
     <string name="session_drawer_pause_all_wine_processes">Metti in pausa tutti i processi Wine</string>
@@ -561,6 +603,33 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Batt.</string>
     <string name="session_drawer_hud_element_graph">Graf.</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD stile Mango</string>
+    <string name="session_drawer_hud_mango_settings">Impostazioni HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Carico GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. GPU</string>
+    <string name="mango_hud_element_cpu_load">Carico CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batteria</string>
+    <string name="mango_hud_element_lows" formatted="false">Minimi 1%</string>
+    <string name="mango_hud_element_graph">Grafico frametime</string>
+    <string name="mango_hud_element_engine">Motore</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Clock CPU</string>
+    <string name="mango_hud_element_gpu_clock">Clock GPU</string>
+    <string name="mango_hud_element_cores">Per core</string>
+    <string name="mango_hud_element_network">Rete</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Risoluzione</string>
+    <string name="mango_hud_element_wine">Versione Wine</string>
+    <string name="mango_hud_element_duration">Durata sessione</string>
+    <string name="mango_hud_element_clock">Orologio</string>
+    <string name="mango_hud_element_throttle">Stato termico</string>
+    <string name="mango_hud_group_memory">Memoria</string>
+    <string name="mango_hud_group_system">Sistema</string>
+    <string name="mango_hud_lock">Blocca HUD</string>
+    <string name="mango_hud_lock_subtitle">Consente ai tocchi di raggiungere i controlli dietro l\'HUD. Tieni premuto l\'HUD per bloccarlo. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Vuoi terminare questo processo?</string>
@@ -591,6 +660,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="session_display_frame_rate">Frequenza fotogrammi</string>
     <string name="session_display_title">Display</string>
     <string name="session_display_fullscreen_stretched">Abilita schermo intero (allungato)</string>
+    <string name="session_display_direct_composition">Composizione diretta (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="session_gamepad_error_loading_profile">Errore nel caricamento del profilo</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Controlli touchscreen</string>
+    <string name="input_controls_auto_hide_on_controller_title">Nascondi automaticamente con controller</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Nascondi i controlli touchscreen quando è collegato un controller</string>
     <string name="session_gyroscope_title">Giroscopio</string>
     <string name="session_gyroscope_calibrate">Calibra giroscopio</string>
     <string name="session_gyroscope_enable_right_stick">Abilita movimento giroscopico sulla levetta destra</string>
@@ -700,6 +773,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_general_select_wallpaper">Seleziona sfondo</string>
     <string name="settings_general_title">Generali</string>
     <string name="settings_general_enable_file_provider">Abilita File Provider</string>
+    <string name="settings_general_enable_auto_scraping">Abilita recupero automatico</string>
     <string name="settings_general_take_effect_next_startup">Questa opzione avrà effetto al prossimo avvio.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Reinstalla Imagefs</string>
@@ -713,7 +787,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_general_share_android_clipboard">Condividi appunti Android con Wine</string>
     <string name="settings_general_paths_title">Impostazioni percorso</string>
     <string name="settings_general_paths_summary">Gestisci dove Winlator memorizza i dati di lavoro e dove vengono scritte le scorciatoie esportate.</string>
-    <string name="settings_general_winlator_path_title">Percorso Winlator</string>
+    <string name="settings_general_winlator_path_title">Percorso di archiviazione</string>
     <string name="settings_general_shortcut_export_path_title">Percorso esportazione scorciatoie</string>
     <string name="settings_general_choose_path">Scegli percorso</string>
     <string name="settings_general_xserver_cursor_summary">Regola la velocità del puntatore per input touch, trackpad e mouse all\'interno della sessione XServer.</string>
@@ -721,7 +795,9 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_general_cursor_lock_summary">Mantiene la cattura diretta del mouse abilitata per i giochi che necessitano di input raw del puntatore. Disabilitalo con Volume Giù.</string>
     <string name="settings_general_xinput_toggle_title">Disabilita XInput</string>
     <string name="settings_general_xinput_toggle_summary">Disattiva la gestione XInput quando vuoi il controllo esclusivo di mouse e tastiera.</string>
-    <string name="settings_general_file_provider_summary">Esponi i file di Winlator ai selettori di documenti e file manager di Android.</string>
+    <string name="settings_external_display_output_summary">Sposta il gioco su un display esterno collegato invece di duplicare questo schermo. Gli occhiali usano sempre il proprio display.</string>
+    <string name="settings_general_file_provider_summary">Esponi i file di WinNative ai selettori di documenti e file manager di Android.</string>
+    <string name="settings_general_auto_scraping_summary">Consente a WinNative di recuperare automaticamente le immagini dei giochi personalizzati.</string>
     <string name="settings_general_open_browser_summary">Apri i link web supportati nel browser Android invece che all\'interno di Wine.</string>
     <string name="settings_general_clipboard_summary">Consenti copia e incolla tra Android e le sessioni Wine.</string>
     <string name="settings_general_imagefs_summary">Ripristina i file di sistema inclusi senza rimuovere i contenitori esistenti.</string>
@@ -736,7 +812,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Installazione SoundFont fallita!</string>
     <string name="settings_audio_sound_font_already_exist">Il SoundFont che vuoi installare è già presente.</string>
     <string name="settings_audio_unable_to_install_soundfont">Impossibile installare il SoundFont</string>
-    <string name="settings_audio_installing_soundfont">Installazione SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Installazione SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Formato SoundFont non valido.</string>
     <string name="settings_audio_cannot_remove_default">Impossibile rimuovere il SoundFont predefinito</string>
     <string name="settings_audio_summary">Installa, rimuovi e scegli il SoundFont utilizzato per la riproduzione MIDI.</string>
@@ -750,15 +826,33 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_debug_box_logs_subtitle">Scrivi l\'output di debug Box86 e Box64 su file</string>
     <string name="settings_debug_fex_logs_title">Abilita log FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Scrivi l\'output di debug FEXCore su file</string>
+    <string name="settings_debug_emulator_logs_title">Log di emulazione Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Registra su file l\'emulatore usato dal tuo container.</string>
     <string name="settings_debug_steam_logs_title">Abilita log Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Registra gli eventi di autenticazione e sessione Steam per il debug.</string>
     <string name="settings_debug_wine_channels_title">Canali debug Wine</string>
     <string name="settings_debug_wine_channels_summary">Scegli quali canali Wine includere quando il logging di debug Wine è abilitato.</string>
+    <string name="settings_debug_wine_classes_title">Livelli di log di Wine</string>
+    <string name="settings_debug_wine_classes_summary">Scegli quali tipi di messaggi registrare. Trace è estremamente prolisso.</string>
     <string name="settings_debug_input_logs">Log input</string>
     <string name="settings_debug_input_logs_description">Registra gli eventi di input gamepad, touch e tastiera</string>
     <string name="settings_debug_download_logs">Log download</string>
     <string name="settings_debug_download_logs_description">Registra gli eventi del risolutore download e fallback WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Livelli di validazione Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Riavvia il display per applicare.</string>
     <string name="settings_debug_share_logs">Condividi log</string>
+    <string name="settings_debug_delete_logs">Elimina log</string>
+    <string name="settings_debug_share_all_logs_short">Condividi tutto</string>
+    <string name="settings_debug_download_all_logs_short">Scarica tutto</string>
+    <string name="settings_debug_logs_saved">Salvato in %1$s</string>
+    <string name="settings_debug_delete_logs_short">Elimina</string>
+    <string name="settings_debug_delete_all_logs_short">Elimina tutto</string>
+    <string name="settings_debug_open_logs_folder_short">Apri gestione log</string>
+    <string name="settings_debug_logs_deleted">Log eliminati</string>
+    <string name="settings_debug_delete_logs_confirm_title">Eliminare i log?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Questo elimina definitivamente tutti i file di log salvati (%1$s). Non può essere annullato.</string>
+    <string name="settings_debug_logs_browser_title">Log</string>
+    <string name="settings_debug_log_truncated">Visualizzazione degli ultimi %1$s di questo log</string>
     <string name="settings_debug_logs_subject">Log WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">Nessun log di debug disponibile. Attiva prima le opzioni di debug e avvia un gioco.</string>
     <string name="settings_debug_capture_failed">Impossibile acquisire i log: %1$s</string>
@@ -773,6 +867,8 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
 
     <string name="settings_other_language_title">Lingua</string>
     <string name="settings_other_language_summary">Scegli la lingua di visualizzazione</string>
+    <string name="settings_other_game_language_title">Lingua del gioco</string>
+    <string name="settings_other_game_language_summary">Lingua preferita per i download di Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">Predefinita di sistema</string>
 
     <string name="settings_other_section_integration">Integrazione</string>
@@ -790,7 +886,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_content_empty_subtitle">Installa un pacchetto o cambia tipo per iniziare.</string>
     <string name="settings_content_container_created">Container creato: %1$s</string>
     <string name="settings_content_download_failed">Download non riuscito.</string>
-    <string name="common_ui_working">Elaborazione in corso…</string>
+    <string name="common_ui_working">Elaborazione in corso</string>
     <string name="settings_content_desc_wine">Creato dal progetto Wine; traduce le chiamate Win32 in servizi Linux/Android nativi.</string>
     <string name="settings_content_desc_proton">Creato da Valve; runtime basato su Wine con patch per i giochi Windows.</string>
     <string name="settings_content_desc_dxvk">Traduce le chiamate grafiche Direct3D 9, 10 e 11 in Vulkan.</string>
@@ -798,6 +894,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_content_desc_box64">Traduce codice Linux x86_64 per eseguirlo su dispositivi ARM64.</string>
     <string name="settings_content_desc_wowbox64">Build Box64 usata da WoW64 per eseguire app Windows a 32 bit in Wine a 64 bit.</string>
     <string name="settings_content_desc_fexcore">Traduce codice x86 e x86_64 per eseguirlo su dispositivi ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduce le chiamate grafiche DirectDraw (Direct3D 7 e precedenti) in Vulkan.</string>
     <string name="settings_content_unable_to_install">Impossibile installare il contenuto.</string>
     <string name="settings_content_install_failed">Installazione fallita</string>
     <string name="settings_content_file_cannot_be_recognized">Impossibile riconoscere il file.</string>
@@ -809,9 +906,14 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="settings_content_downloading_title">Download contenuto</string>
     <string name="settings_content_installing_title">Installazione contenuto</string>
     <string name="settings_content_extracting_title">Estrazione contenuto</string>
-    <string name="settings_content_extracting_detail">Estrazione in corso… (%1$d file)</string>
-    <string name="settings_content_preparing_package">Preparazione pacchetto…</string>
+    <string name="settings_content_extracting_detail">Estrazione in corso (%1$d file)</string>
+    <string name="settings_content_preparing_package">Preparazione pacchetto</string>
     <string name="settings_content_download_complete">Download completato</string>
+    <string name="settings_content_already_installed_title">Componente già installato</string>
+    <string name="settings_content_already_installed_message">Questo componente è già installato. Rimuovi la copia installata prima di scaricarlo di nuovo.
+
+Percorso installato:
+%1$s</string>
     <string name="settings_content_conflicting_title">Contenuto in conflitto installato</string>
     <string name="settings_content_conflicting_message">Disinstalla il contenuto in conflitto prima di scaricare questo pacchetto.
 
@@ -820,7 +922,7 @@ Percorso installato:
     <string name="settings_content_cannot_be_trusted">Il contenuto non è attendibile.</string>
     <string name="settings_content_is_incomplete">Il contenuto è incompleto.</string>
     <string name="settings_content_untrusted_files_warning">Avviso: il contenuto aggiuntivo contiene file non attendibili. In genere, i seguenti file non dovrebbero essere modificati. Decidi se procedere con l\'installazione.</string>
-    <string name="settings_content_confirm_remove">Vuoi rimuovere questo contenuto?</string>
+    <string name="settings_content_confirm_remove">Questo eliminerà il componente dal dispositivo.</string>
     <string name="settings_content_unable_to_remove_in_use">Impossibile rimuovere questo contenuto, perché un contenitore sta attualmente usando questo Wine.</string>
     <string name="settings_content_download_in_components">Nessuno scaricato. Scaricane uno in Componenti.</string>
     <string name="settings_content_types_header">TIPI DI CONTENUTO</string>
@@ -832,9 +934,12 @@ Percorso installato:
     <string name="settings_drivers_install">Installa driver</string>
     <string name="settings_drivers_installed_success">Driver installato con successo.</string>
     <string name="settings_drivers_install_failed">Installazione driver fallita.</string>
-    <string name="settings_drivers_confirm_remove">Vuoi rimuovere questo driver?</string>
+    <string name="settings_drivers_remove_title">Rimuovere il driver?</string>
+    <string name="settings_drivers_confirm_remove">Questo eliminerà il driver dal dispositivo.</string>
+    <string name="settings_drivers_remove_repo_title">Rimuovere il repository?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s verrà rimosso dalla lista dei repository.</string>
     <string name="settings_drivers_repo_tap_to_load">Tocca per caricare le release</string>
-    <string name="settings_drivers_repo_loading_releases">Caricamento release…</string>
+    <string name="settings_drivers_repo_loading_releases">Caricamento release</string>
     <string name="settings_drivers_repo_release_count">%1$d release caricate</string>
     <string name="settings_drivers_repo_no_release_assets">Nessun asset ZIP scaricabile trovato nelle release recuperate.</string>
     <string name="settings_drivers_repo_fetch_failed">Impossibile caricare le release GitHub.</string>
@@ -844,7 +949,7 @@ Percorso installato:
     <string name="settings_drivers_manager">Gestore driver</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Installazione file di sistema…</string>
+    <string name="setup_wizard_installing_system_files">Installazione file di sistema</string>
     <string name="setup_wizard_unable_to_install_system_files">Impossibile installare i file di sistema</string>
     <string name="setup_wizard_system_image_not_installed">Immagine di sistema non installata. Installa prima i componenti.</string>
     <string name="setup_wizard_recommended_components">Componenti consigliati</string>
@@ -913,6 +1018,9 @@ Percorso installato:
     <string name="google_cloud_sync_started">Sincronizzazione cloud avviata.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Servizi Google</string>
+    <string name="google_auto_signin_title">Accedi a Google all\'avvio</string>
+    <string name="google_auto_signin_summary">Connettiti automaticamente a Google Play Giochi all\'avvio dell\'app, così i backup dei salvataggi e la sincronizzazione sono sempre pronti. Se disattivato, l\'app non accede mai da sola.</string>
+    <string name="google_auto_signin_section">All\'avvio</string>
     <string name="google_cloud_play_games">Google Play Giochi</string>
     <string name="google_cloud_status_syncing">Sincronizzazione</string>
     <string name="google_cloud_status_connected">Connesso</string>
@@ -971,22 +1079,30 @@ Percorso installato:
     <string name="saves_import_export_exported_failed">Impossibile esportare i salvataggi: %1$s</string>
     <string name="saves_import_export_imported">Salvataggi importati con successo</string>
     <string name="saves_import_export_imported_failed">Impossibile importare i salvataggi: %1$s</string>
+    <string name="saves_export_path_summary">I salvataggi saranno esportati in /WinNative/saves</string>
+    <string name="saves_export_success_path">Esportato in %1$s</string>
+    <string name="saves_export_warning_title">Usa questa funzione solo con giochi personalizzati</string>
+    <string name="saves_export_warning_body">Il file esportato può includere salvataggi di giochi installati dagli store o sincronizzati nel cloud.</string>
+    <string name="saves_import_warning_title">Questo sovrascriverà i salvataggi esistenti in questo contenitore</string>
+    <string name="saves_import_warning_body">Quando ripristini un backup precedente con più giochi, copia prima i salvataggi più recenti nel file zip con il tuo file manager. Verranno modificati solo i salvataggi presenti nel file .zip. Gestisci i tuoi salvataggi con attenzione.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Contenitore</string>
-    <string name="preloader_initializing">Inizializzazione…</string>
-    <string name="preloader_launching">Avvio…</string>
-    <string name="preloader_closing">Chiusura di %1$s…</string>
-    <string name="preloader_setup_environment">Configurazione dell\'ambiente…</string>
-    <string name="preloader_installing_mono">Installazione di Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Installazione dei redistributable…</string>
-    <string name="preloader_unpacking_exe">Estrazione dell\'eseguibile del gioco…</string>
-    <string name="preloader_downloading_cloud">Download dei salvataggi cloud…</string>
-    <string name="preloader_syncing_cloud">Sincronizzazione dei salvataggi cloud…</string>
-    <string name="preloader_cloud_downloading">Download Cloud Sync…</string>
-    <string name="preloader_cloud_backup">Backup del salvataggio su Google Drive…</string>
+    <string name="preloader_initializing">Inizializzazione</string>
+    <string name="preloader_launching">Avvio</string>
+    <string name="preloader_closing">Chiusura di %1$s</string>
+    <string name="preloader_setup_environment">Configurazione dell\'ambiente</string>
+    <string name="preloader_retrying_steam_client_download">Nuovo tentativo di download del client Steam</string>
+    <string name="preloader_installing_mono">Installazione di Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Installazione dei redistributable</string>
+    <string name="preloader_unpacking_exe">Estrazione dell\'eseguibile del gioco</string>
+    <string name="preloader_downloading_cloud">Download dei salvataggi cloud</string>
+    <string name="preloader_syncing_cloud">Sincronizzazione dei salvataggi cloud</string>
+    <string name="preloader_uploading_cloud">Upload dei salvataggi cloud</string>
+    <string name="preloader_checking_cloud">Controllo dei salvataggi cloud</string>
+    <string name="preloader_cloud_sync_retry">%1$s Tentativo %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Download Cloud Sync</string>
     <string name="cloud_sync_failed_provider">Sincronizzazione cloud %1$s non riuscita.</string>
-    <string name="google_cloud_backup_failed">Backup su Google Drive non riuscito.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Percorso installato:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Grafica</string>
-    <string name="container_backups_title">Backup</string>
-    <string name="container_backups_prompt">Scegli un\'azione per questo backup del container.</string>
-    <string name="container_backups_backing_up">Backup del container in corso…</string>
-    <string name="container_backups_restoring">Ripristino del container in corso…</string>
-    <string name="container_backups_checking">Controllo dei backup del container…</string>
-    <string name="container_backups_select_title">Seleziona il backup da ripristinare</string>
-    <string name="container_backups_no_files">Nessun backup del container trovato in Google Drive.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Associazione primaria</string>
     <string name="binding_secondary">Associazione secondaria</string>
+    <string name="binding_third">Associazione terziaria</string>
+    <string name="binding_fourth">Associazione quaternaria</string>
     <string name="input_controls_editor_tap_to_switch">Tocca per cambiare</string>
     <string name="input_controls_editor_download_profile">Scarica profilo</string>
     <string name="container_config_emulator_section">Emulatore</string>
@@ -1010,6 +1122,7 @@ Percorso installato:
     <string name="session_drawer_fps_monitor">Monitor FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Mostra statistiche prestazioni in tempo reale</string>
     <string name="session_drawer_dual_series_battery">Batteria Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Mostra il frametime come numero</string>
     <string name="session_drawer_command_center">Centro comandi</string>
     <string name="session_drawer_command_center_input">Input</string>
     <string name="session_drawer_command_center_display">Schermo</string>
@@ -1022,7 +1135,6 @@ Percorso installato:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Naturale</string>
     <string name="session_drawer_color_profile_crt">Effetto CRT</string>
-    <string name="session_drawer_upscaler_dls">Vivido</string>
     <string name="session_drawer_calibrate_advanced">Calibrazione avanzata</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Giro</string>
@@ -1034,7 +1146,6 @@ Percorso installato:
     <string name="session_drawer_rail_label_mouse">Mouse</string>
     <string name="session_drawer_rail_label_fullscreen">Schermo intero</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Nativo</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Attività</string>
     <string name="session_drawer_rail_label_logs">Log</string>
@@ -1048,24 +1159,23 @@ Percorso installato:
     <string name="session_drawer_logs_share_chooser">Condividi log della sessione</string>
     <string name="session_drawer_logs_share_failed">Impossibile condividere i log</string>
     <string name="session_drawer_logs_share_empty">Nessuna riga di log da condividere</string>
-    <string name="session_drawer_super_resolution">Filtri Nitidezza</string>
-    <string name="session_drawer_upscaler_mode">Filtro</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Super risoluzione</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Vivido</string>
+    <string name="session_drawer_vivid_strength">Intensità vividezza</string>
     <string name="session_drawer_main_menu_title">Menu</string>
     <string name="session_gyroscope_activator">Attivatore</string>
     <string name="settings_general_check_for_updates">Controlla aggiornamenti</string>
     <string name="settings_general_check_for_updates_summary">Controlla automaticamente la presenza di nuove versioni dell\'app all\'avvio e periodicamente.</string>
     <string name="setup_wizard_containers">Configurazione container</string>
-    <string name="google_cloud_auto_backup">Backup automatico Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Esegui automaticamente il backup dei salvataggi di gioco su Google Drive ogni volta che esci da un gioco.</string>
     <string name="cloud_saves_title">Salvataggi cloud</string>
-    <string name="cloud_saves_backup">Backup salvataggio cloud</string>
-    <string name="cloud_saves_restore">Ripristina salvataggio cloud</string>
+    <string name="cloud_saves_title_for_provider">Salvataggi cloud di %1$s - %2$s</string>
     <string name="cloud_sync_title">Sincronizzazione cloud</string>
     <string name="cloud_sync_enabled_summary">Scarica i salvataggi cloud all\'avvio e sincronizzali/esegui il backup all\'uscita.</string>
     <string name="cloud_sync_disabled_summary">Avvia questo gioco senza scaricare i salvataggi cloud né sincronizzarli all\'uscita.</string>
-    <string name="cloud_saves_backing_up">Backup salvataggio cloud in corso…</string>
-    <string name="cloud_saves_restoring">Ripristino salvataggio cloud in corso…</string>
+    <string name="cloud_saves_backing_up">Backup salvataggio cloud in corso</string>
+    <string name="cloud_saves_restoring">Ripristino salvataggio cloud in corso</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Percorso installato:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Controlla la memorizzazione nella cache dei blocchi dynarec generati tra le esecuzioni per velocizzare l\'avvio.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@ Percorso installato:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Nessun salvataggio precedente ancora sottoposto a backup. I salvataggi sostituiti e i backup manuali appariranno qui per 30 giorni.</string>
+    <string name="cloud_saves_history_loading">Caricamento cronologia salvataggi\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">cloud</string>
+    <string name="cloud_saves_history_origin_local">locale</string>
+    <string name="cloud_saves_history_origin_manual">manuale</string>
+    <string name="cloud_saves_history_refresh">Aggiorna</string>
+    <string name="cloud_saves_history_rename">Rinomina</string>
+    <string name="cloud_saves_history_rename_clear">Cancella</string>
+    <string name="cloud_saves_history_rename_failed">Impossibile rinominare il backup.</string>
+    <string name="cloud_saves_history_rename_hint">es. Boss finale, Prima del finale</string>
+    <string name="cloud_saves_history_rename_save">Salva</string>
+    <string name="cloud_saves_history_rename_success">Backup rinominato.</string>
+    <string name="cloud_saves_history_rename_title">Assegna un nome a questo backup</string>
+    <string name="cloud_saves_history_restore">Ripristina</string>
+    <string name="cloud_saves_history_restore_confirm_body">Il salvataggio locale corrente verrà sostituito con il backup del %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Ripristinare questo backup?</string>
+    <string name="cloud_saves_history_restore_failed">Impossibile ripristinare questo backup.</string>
+    <string name="cloud_saves_history_restore_success">Salvataggio ripristinato dal backup.</string>
+    <string name="cloud_saves_history_sign_in">Accedi a Google per visualizzare la cronologia dei salvataggi.</string>
+    <string name="cloud_saves_history_title">Cronologia salvataggi</string>
+    <string name="cloud_saves_history_download">Scarica</string>
+    <string name="cloud_saves_history_download_success">File scaricato.</string>
+    <string name="cloud_saves_history_download_failed">Download non riuscito.</string>
+    <string name="cloud_saves_keep_replaced_backup">Mantieni un backup del salvataggio sostituito</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Se cambi idea, puoi ripristinarlo dalla Cronologia salvataggi.</string>
+    <string name="cloud_saves_no_backups">Ancora nessun backup per questo gioco.</string>
+    <string name="cloud_saves_offline_mode">Disabilita sincronizzazione Cloud</string>
+    <string name="cloud_saves_offline_mode_summary">Interrompe tutte le attività cloud automatiche per questo gioco.</string>
+    <string name="cloud_saves_sync_from_provider">Sincronizza da %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_failed">Impossibile scaricare il salvataggio da %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Gestisci salvataggi cloud GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Apre il sito web ufficiale GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Nessun browser disponibile per aprire la pagina dei salvataggi cloud GOG</string>
+    <string name="cloud_saves_gog_zip_label">Scarica ZIP cloud GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Salva i file cloud correnti</string>
+    <string name="cloud_saves_gog_zip_success">ZIP dei salvataggi cloud GOG salvato.</string>
+    <string name="cloud_saves_gog_zip_failed">Impossibile salvare lo ZIP dei salvataggi cloud GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Nessun file di salvataggio cloud GOG trovato.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Sincronizza dal Cloud</string>
+    <string name="cloud_saves_sync_from_provider_success">Salvataggio cloud di %1$s scaricato.</string>
+    <string name="cloud_saves_syncing_from_provider">Download salvataggio da %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Scarica la versione che %1$s ha al momento.</string>
+    <string name="cloud_saves_sync_summary_generic">Scarica la versione cloud corrente.</string>
+    <string name="common_ui_exit_app_confirm">Uscire da WinNative?</string>
+    <string name="container_surface_effect">Effetto superficie</string>
+    <string name="downloads_queue_cancel_download_confirm">Annullare il download di %1$s ed eliminare tutti i file scaricati?</string>
+    <string name="downloads_queue_paused_resume_hint">In pausa - tocca Riprendi per continuare</string>
+    <string name="downloads_queue_phase_applying_data">Applicazione dati</string>
+    <string name="downloads_queue_phase_downloading">Download in corso</string>
+    <string name="downloads_queue_phase_downloading_file">Download in corso [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Finalizzazione</string>
+    <string name="downloads_queue_phase_patching">Applicazione patch</string>
+    <string name="downloads_queue_phase_preparing">Preparazione</string>
+    <string name="downloads_queue_phase_queued">In coda</string>
+    <string name="downloads_queue_phase_unknown">Sconosciuto</string>
+    <string name="downloads_queue_phase_unpacking">Estrazione</string>
+    <string name="downloads_queue_phase_updating">Aggiornamento</string>
+    <string name="downloads_queue_phase_verifying">Verifica</string>
+    <string name="downloads_queue_phase_verifying_file">Verifica [%1$s]</string>
+    <string name="downloads_queue_status_label">Stato:</string>
+    <string name="downloads_queue_this_game">questo gioco</string>
+    <string name="hud_position_bottom_center">Centro basso</string>
+    <string name="hud_position_bottom_left">In basso a sinistra</string>
+    <string name="hud_position_bottom_right">In basso a destra</string>
+    <string name="hud_position_left_center">Centro sinistra</string>
+    <string name="hud_position_menu_title">Sposta HUD in</string>
+    <string name="hud_position_right_center">Centro destra</string>
+    <string name="hud_position_top_center">Centro alto</string>
+    <string name="hud_position_top_left">In alto a sinistra</string>
+    <string name="hud_position_top_right">In alto a destra</string>
+    <string name="input_controls_editor_number_of_bindings">Numero di associazioni</string>
+    <string name="input_controls_editor_opacity">Opacità</string>
+    <string name="input_controls_editor_radial_menu">Menu radiale</string>
+    <string name="input_controls_editor_radial_menu_options">Opzioni menu radiale</string>
+    <string name="input_controls_tap_to_click">Tocca per fare clic</string>
+    <string name="input_controls_reverse_binding_order">Inverti ordine associazioni</string>
+    <string name="num_controllers">Numero di controller</string>
+    <string name="session_drawer_controls_section">Controlli</string>
+    <string name="session_drawer_header_subtitle">Accesso rapido a controlli, overlay e strumenti di sessione</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Imposta Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">Attiva l\'overlay per personalizzarlo</string>
+    <string name="session_drawer_hud_elements">Elementi HUD</string>
+    <string name="session_drawer_hud_input_hint">Inserisci un valore da %1$d a %2$d. I valori superiori al limite vengono troncati.</string>
+    <string name="session_drawer_hud_scale">Scala</string>
+    <string name="session_drawer_hud_scale_input_title">Imposta scala</string>
+    <string name="session_drawer_hud_summary">Regola la visibilità dell\'overlay e i punti dati</string>
+    <string name="session_drawer_screen_effects">Effetti schermo</string>
+    <string name="session_drawer_session_section">Sessione</string>
+    <string name="session_drawer_swipe_hint">Scorri via per tornare al gioco</string>
+    <string name="session_gamepad_enable_vibration">Abilita vibrazione</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Movimento mouse sperimentale</string>
+    <string name="session_gyroscope_mouse_scale">Scala mouse</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Scala mouse: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Apri di nuovo la procedura guidata di configurazione per rivedere le autorizzazioni, i file di sistema e i container predefiniti.</string>
+    <string name="settings_other_setup_wizard_title">Procedura guidata di configurazione</string>
+    <string name="shortcuts_library_artwork_failed">Impossibile caricare l\'immagine selezionata.</string>
+    <string name="shortcuts_library_artwork_open_source">Apri SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Imposta immagine</string>
+    <string name="shortcuts_library_artwork_title">Immagini della libreria</string>
+    <string name="shortcuts_library_artwork_icon_title">Immagine icona</string>
+    <string name="shortcuts_library_artwork_hero_title">Sfondo</string>
+    <string name="shortcuts_list_readded_existing">Collegamento esistente riaggiunto</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Inietta una DLL patcher DRM all\'avvio. Riduce gli FPS — usala solo se il Legacy Launcher da solo non riesce.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Seleziona cartella salvataggi</string>
+    <string name="cloud_saves_custom_folder_label">Cartella salvataggi</string>
+    <string name="cloud_saves_custom_select_folder_summary">Indica la directory dei salvataggi nel container</string>
+    <string name="cloud_saves_custom_no_container">Container non disponibile per questo collegamento</string>
+    <string name="cloud_saves_custom_picker_title">Seleziona cartella salvataggi</string>
+    <string name="cloud_saves_custom_outside_drive_c">La cartella selezionata deve trovarsi nell’unità C: del container</string>
+    <string name="cloud_saves_custom_path_map_failed">Impossibile associare la cartella selezionata a un percorso Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Cartella salvataggi impostata su %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sincronizza da Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Scarica il salvataggio più recente</string>
+    <string name="cloud_saves_steam_sync_success">Sincronizzato da Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Sincronizzazione Steam Cloud non riuscita</string>
+    <string name="cloud_saves_steam_browse_label">Visualizza salvataggi Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Apri archivio cloud</string>
+    <string name="cloud_saves_steam_browse_no_browser">Nessun browser disponibile per aprire la pagina Steam</string>
+    <string name="cloud_saves_steam_import_label">Importa file</string>
+    <string name="cloud_saves_steam_import_helper">Ripristina i file scaricati</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Selettore file non disponibile</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Questo scaricherà i file di salvataggio attuali da Steam Cloud e sovrascriverà i file di salvataggio attuali.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID app non valido</string>
+    <string name="cloud_saves_label_saved">Etichetta salvata</string>
+    <string name="downloads_queue_cancel_all_title">Annullare tutti i download?</string>
+    <string name="downloads_queue_cancel_all_warning">Annullare download di DLC, giochi o aggiornamenti può potenzialmente corrompere le installazioni dei giochi.\n\nVuoi davvero annullare tutti i download ed eliminare i file scaricati finora?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Usa launcher legacy</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Emulazione Steam legacy: esegue il gioco tramite il launcher ColdClient e rimuove SteamStub DRM dall\'exe. Usa solo per giochi più vecchi che non funzionano con Steam Launcher.</string>
+    <string name="steam_section_real_client">Client Steam reale WinNative</string>
+    <string name="steam_section_emulator">Emulatore Steam legacy</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Fa sì che il client Steam emulato risulti offline, così il gioco non tenterà connessioni online. Usa per i giochi che si bloccano durante il controllo di rete di Steam.</string>
+    <string name="input_controls_select_style">Seleziona stile</string>
+    <string name="input_controls_style_original">Originale</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Ardesia</string>
+    <string name="input_controls_style_halo">Alone</string>
+    <string name="input_controls_style_glint">Bagliore</string>
+    <string name="input_controls_style_shadow">Ombra</string>
+    <string name="input_controls_style_reticle">Reticolo</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Tema colore</string>
+    <string name="input_controls_edit_duplicating_builtin">Profilo integrato: è stata creata una copia modificabile.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Ripristinare questo profilo al layout originale? Tutte le modifiche apportate andranno perse.</string>
+    <string name="input_controls_editor_profile_reset">Profilo ripristinato al layout originale.</string>
+    <string name="input_controls_editor_reset_unavailable">Nessuno snapshot originale disponibile per questo profilo.</string>
+    <string name="container_graphics_compositor_present_mode">Sincronizzazione display Vulkan</string>
+    <string name="cloud_sync_disable_title">Disattiva salvataggi cloud</string>
+    <string name="cloud_saves_steam_push_label">Invia a Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forza upload del salvataggio locale</string>
+    <string name="cloud_saves_steam_push_success">Salvataggio inviato a Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Impossibile inviare il salvataggio a Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud non è raggiungibile al momento. Riconnessione in background tocca aggiorna quando torni online.</string>
+    <string name="steam_session_refused_event">Steam ha rifiutato la sessione in cache (EResult=%1$d). Accedi di nuovo.</string>
+    <string name="settings_hud_record_to_file_title">Registra prestazioni su file</string>
+    <string name="settings_hud_record_to_file_summary">Esporta ogni secondo metriche FPS, CPU, GPU, temperatura e batteria in /WinNative/logs/ durante il gioco.</string>
+    <string name="settings_leaderboard_category">Prestazioni</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Preparazione ambiente Steam</string>
+    <string name="preloader_starting_wine">Avvio di Wine</string>
+    <string name="preloader_starting_steam_launcher">Avvio di Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Caricamento client Steam</string>
+    <string name="preloader_connecting_to_steam">Connessione a Steam</string>
+    <string name="preloader_signing_in_to_steam">Accesso a Steam</string>
+    <string name="preloader_fetching_game_info">Accesso effettuato — recupero informazioni del gioco</string>
+    <string name="preloader_steam_ready">Steam pronto</string>
+    <string name="preloader_updating_game_info">Aggiornamento informazioni del gioco</string>
+    <string name="preloader_verifying_install">Verifica installazione</string>
+    <string name="preloader_scanning_redists">Scansione dei redistribuibili</string>
+    <string name="preloader_installing_redist_single">Installazione redistribuibile</string>
+    <string name="preloader_installing_named_redist">Installazione di %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Installazione di %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuibili pronti</string>
+    <string name="preloader_no_redists">Nessun redistribuibile da installare</string>
+    <string name="preloader_steam_service_running">Servizio Steam in esecuzione</string>
+    <string name="preloader_launching_game">Avvio di %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher non riuscito — ripristino risorse</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher non è riuscito ad avviarsi. Ripristino risorse — riavvia</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher ha raggiunto il gioco, ma non si è avviato</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Caricamento elementi Workshop</string>
+    <string name="workshop_search_items">Cerca elementi Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Recupero dei tuoi oggetti sottoscritti da Steam.</string>
+    <string name="workshop_error_title">Impossibile caricare gli oggetti del Workshop</string>
+    <string name="workshop_error_subtitle">Qualcosa è andato storto. Riprova.</string>
+    <string name="workshop_empty_title">Nessun oggetto del Workshop sottoscritto</string>
+    <string name="workshop_empty_subtitle">Iscriviti agli oggetti nel Steam Workshop, poi riapri questa finestra.</string>
+    <string name="workshop_search_empty_title">Nessun oggetto corrisponde a \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Prova un altro termine di ricerca.</string>
+    <string name="workshop_clear_search">Cancella ricerca</string>
+    <string name="workshop_item_fallback">Oggetto del Workshop</string>
+    <string name="common_ui_failed">Non riuscito</string>
+    <string name="steam_presence_snooze">Inattivo</string>
+    <string name="steam_presence_busy">Occupato</string>
+    <string name="steam_presence_looking_to_trade">In cerca di scambi</string>
+    <string name="steam_presence_looking_to_play">In cerca di gioco</string>
+    <string name="steam_friends_count">Amici — %1$d online</string>
+    <string name="steam_friends_section_in_game">In gioco (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Ancora nessun amico caricato.</string>
+    <string name="steam_friends_chat_off">La chat è disattivata. Riattiva il servizio chat per vedere i tuoi amici.</string>
+    <string name="steam_friends_self_you">Tu</string>
+    <string name="steam_friends_in_game">In gioco</string>
+    <string name="steam_friends_join">Unisciti</string>
+    <string name="steam_friends_play">Gioca</string>
+    <string name="steam_chat_image_failed">(invio immagine non riuscito)</string>
+    <string name="steam_chat_empty">Ancora nessun messaggio. Saluta!</string>
+    <string name="steam_chat_uploading_image">Caricamento immagine…</string>
+    <string name="steam_chat_send_image">Invia immagine</string>
+    <string name="steam_chat_message_hint">Messaggio…</string>
+    <string name="steam_chat_send">Invia</string>
+    <string name="steam_chat_image">Immagine</string>
+    <string name="steam_common_back">Indietro</string>
+    <string name="steam_achievements_title">Obiettivi</string>
+    <string name="steam_achievements_empty">Nessun obiettivo trovato per questo gioco,\noppure accedi a Steam per caricarli.</string>
+    <string name="steam_achievements_hidden">Obiettivo nascosto</string>
+    <string name="steam_achievements_hidden_desc">Continua a giocare per rivelare questo obiettivo.</string>
+    <string name="steam_achievements_unlocked_on">Sbloccato %1$s</string>
+    <string name="steam_achievements_unlocked">Sbloccato</string>
+    <string name="steam_join_joining">Partecipazione a %1$s in %2$s…</string>
+    <string name="steam_join_install">Installa %1$s per unirti a %2$s</string>
+    <string name="steam_join_not_owned">Non possiedi %1$s</string>
+    <string name="steam_chat_not_sent">(non inviato)</string>
+    <string name="steam_join_the_game">il gioco</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Servizio chat</string>
+    <string name="steam_chat_setting_service_desc">Accedi per amici e chat; disattiva per andare offline</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Uscita</string>
+    <string name="display_output_prompt_title">Display esterno rilevato</string>
+    <string name="display_output_prompt_message">Inviare il gioco al display collegato? I comandi a schermo e il menu restano su questo telefono.</string>
+    <string name="display_output_prompt_swap">Cambia display</string>
+    <string name="display_output_prompt_mirror">Duplica</string>
+    <string name="display_output_swapped_toast">Gioco spostato sul display esterno. I comandi restano sul telefono.</string>
+    <string name="display_output_cast_unavailable">Le impostazioni del display wireless non sono disponibili su questo dispositivo.</string>
+    <string name="display_output_restored_toast">Display esterno disconnesso — gioco tornato sul telefono.</string>
+    <string name="session_drawer_output_title">Uscita display</string>
+    <string name="session_drawer_output_subtitle">Il gioco viene mostrato sul display esterno.</string>
+    <string name="session_drawer_output_device">Display collegato</string>
+    <string name="session_drawer_output_resolution">Risoluzione</string>
+    <string name="session_drawer_output_refresh_rate">Frequenza di aggiornamento</string>
+    <string name="session_drawer_output_aspect_ratio">Proporzioni</string>
+    <string name="session_drawer_output_aspect_fit">Adatta (proporzioni)</string>
+    <string name="session_drawer_output_aspect_stretch">Allunga (riempi)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (ritaglia)</string>
+    <string name="session_drawer_output_return_to_phone">Torna al telefono</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Trasmetti a una TV</string>
+    <string name="session_drawer_output_cast_body">Collega un adattatore USB-C / HDMI, oppure tocca qui sotto per connettere un display wireless (Miracast / Wi-Fi Direct). Il gioco viene mostrato sulla TV mentre questi comandi restano sul telefono.</string>
+    <string name="session_drawer_output_cast_button">Connetti display wireless</string>
+    <string name="session_drawer_output_cast_note">Le TV solo Chromecast non possono mostrare il gioco in tempo reale con comandi privati: per il risultato migliore usa un display wireless o un adattatore USB‑C/HDMI.</string>
+    <string name="session_drawer_output_render_note">Le modalità segnalate dal display ne cambiano l\'uscita reale (può diventare nero per un istante mentre si reinizializza). Le altre risoluzioni vengono renderizzate a quella dimensione e scalate via hardware sul pannello — sopra la nativa è più nitido (supersampling), sotto è più veloce.</string>
+    <string name="session_drawer_output_scaling_note">Questo telefono invia lo schermo alla sua risoluzione nativa %1$s e non cambia modalità, quindi questo imposta la risoluzione di rendering — viene scalata via hardware sul pannello (oltre la nativa aumenta la nitidezza, sotto va più veloce).</string>
+    <string name="session_drawer_output_game_mode">Modalità gioco (bassa latenza)</string>
+    <string name="session_drawer_output_game_mode_on">Attiva</string>
+    <string name="session_drawer_output_game_mode_off">Disattiva</string>
+    <string name="session_drawer_output_game_mode_note">Richiede la modalità gioco / bassa latenza della TV (HDMI ALLM) per ridurre il ritardo di input. Mostrata solo quando il display collegato la supporta.</string>
+    <string name="session_drawer_output_send_to_display">Invia il gioco al display</string>
+    <string name="session_drawer_output_to_display">Uscita su display esterno</string>
+    <string name="session_drawer_output_send_note">Un display è collegato. Inviaci il gioco: i comandi e il menu restano su questo telefono. Puoi riportarlo qui in qualsiasi momento.</string>
+    <string name="session_drawer_output_display">Schermo</string>
+    <string name="session_drawer_output_glasses">Occhiali</string>
+    <string name="session_drawer_output_brightness">Luminosità</string>
+    <string name="session_drawer_output_shade">Oscuramento</string>
+    <string name="session_drawer_output_3d">3D (affiancato)</string>
+    <string name="glasses_panel_refresh">Frequenza di aggiornamento</string>
+    <string name="glasses_panel_sunblock">Filtro solare</string>
+    <string name="session_drawer_output_volume">Volume</string>
+    <string name="session_drawer_output_glasses_note">Inviato direttamente ai tuoi occhiali Viture via USB.</string>
+
+    <!-- Touch Input > Gesture Profiles -->
+    <string name="common_ui_new">Nuovo</string>
+    <string name="common_ui_rename">Rinomina</string>
+    <string name="gesture_profile_export">Esporta profilo gesti</string>
+    <string name="gesture_profile_import">Importa profilo gesti</string>
+    <string name="gesture_profile_new">Nuovo profilo gesti</string>
+    <string name="gesture_profile_none">Nessun profilo gesti</string>
+    <string name="input_controls_editor_input_profiles_section">Profili di input</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilità stick destro</string>
+    <string name="session_drawer_rts_gestures">Gesti RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Modifica</string>
+    <string name="session_drawer_touch">Tocco</string>
+    <string name="session_drawer_touch_map_right_stick">Mappa su stick destro</string>
+    <string name="session_drawer_touch_touchscreen">Modalità touchscreen</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_gesture_profile_section">Profilo gesti</string>
+    <string name="session_rts_action">Azione</string>
+    <string name="session_rts_behavior">Comportamento</string>
+    <string name="session_rts_double_tap">Doppio tocco (doppio clic sinistro)</string>
+    <string name="session_rts_double_tap_delay">Ritardo doppio tocco (ms)</string>
+    <string name="session_rts_down">Giù</string>
+    <string name="session_rts_drag">Trascinamento a 1 dito</string>
+    <string name="session_rts_pan1">Scorrimento a 1 dito</string>
+    <string name="session_rts_drag2">Trascinamento a 2 dita</string>
+    <string name="session_rts_drag_threshold">Soglia di trascinamento (px)</string>
+    <string name="session_rts_gesture_threshold">Soglia gesto (px)</string>
+    <string name="session_rts_hold2">Pressione a 2 dita</string>
+    <string name="session_rts_hold3">Pressione a 3 dita</string>
+    <string name="session_rts_hold4">Pressione a 4 dita</string>
+    <string name="session_rts_hold_delay">Ritardo pressione (ms)</string>
+    <string name="session_rts_left">Sinistra</string>
+    <string name="session_rts_long_press">Pressione prolungata</string>
+    <string name="session_rts_long_press_delay">Ritardo pressione prolungata (ms)</string>
+    <string name="session_rts_pan">Scorrimento a 2 dita</string>
+    <string name="session_rts_pan_threshold">Avvio scorrimento/pizzico (px)</string>
+    <string name="session_rts_right">Destra</string>
+    <string name="session_rts_swipe3">Scorrimento a 3 dita</string>
+    <string name="session_rts_swipe4">Scorrimento a 4 dita</string>
+    <string name="session_rts_swipe_threshold">Soglia di scorrimento (px)</string>
+    <string name="session_rts_tap1">Tocco a 1 dito</string>
+    <string name="session_rts_tap2">Tocco a 2 dita</string>
+    <string name="session_rts_tap3">Tocco a 3 dita</string>
+    <string name="session_rts_tap4">Tocco a 4 dita</string>
+    <string name="session_rts_up">Su</string>
+    <string name="session_rts_zoom">Zoom a pizzico</string>
+    <string name="session_drawer_brightness">Luminosità</string>
+    <string name="session_drawer_contrast">Contrasto</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Saturazione</string>
+    <string name="session_drawer_temperature">Temperatura</string>
+    <string name="session_drawer_tint">Tinta</string>
+    <string name="session_drawer_intensity">Intensità</string>
+    <string name="session_drawer_strength">Forza</string>
+    <string name="session_drawer_sharpen">Nitidezza</string>
+    <string name="session_drawer_scanlines">Scanline</string>
+    <string name="session_drawer_pixelate">Pixelizza</string>
+    <string name="session_drawer_block_size">Dimensione blocco</string>
+    <string name="session_drawer_scale">Scala</string>
+    <string name="session_drawer_scale_nearest">Più vicino</string>
+    <string name="session_drawer_scale_linear">Lineare</string>
+    <string name="session_drawer_scale_bicubic">Bicubico</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Cartoon</string>
+    <string name="session_drawer_color_blind">Daltonismo</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Reimposta effetti</string>
+    <string name="session_drawer_hud_background">Sfondo</string>
+    <string name="session_drawer_hud_background_alpha">Alfa sfondo</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Imposta alfa sfondo</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Adatta dimensione</string>
+    <string name="session_task_bring_to_front">Porta in primo piano</string>
+    <string name="session_task_custom_value">Valore personalizzato</string>
+    <string name="session_gyroscope_orientation_mode">Inclina per mirare (orientamento)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">File</string>
+    <string name="file_manager_copy">Copia</string>
+    <string name="file_manager_cut">Taglia</string>
+    <string name="file_manager_paste">Incolla</string>
+    <string name="file_manager_paste_here">Incolla qui</string>
+    <string name="file_manager_new_folder">Nuova cartella</string>
+    <string name="file_manager_new_folder_short">Cartella</string>
+    <string name="file_manager_multi_select">Scegli</string>
+    <string name="file_manager_create">Crea</string>
+    <string name="file_manager_delete">Elimina</string>
+    <string name="file_manager_copy_count">Copia (%1$d)</string>
+    <string name="file_manager_cut_count">Taglia (%1$d)</string>
+    <string name="file_manager_delete_count">Elimina (%1$d)</string>
+    <string name="file_manager_extract">Estrai</string>
+    <string name="file_manager_extract_here">Estrai qui</string>
+    <string name="file_manager_extract_to">Estrai in…</string>
+    <string name="file_manager_extracting">Estrazione di %1$s in corso</string>
+    <string name="file_manager_extract_failed">Estrazione non riuscita</string>
+    <string name="file_manager_run_boot">Avvia / Boot</string>
+    <string name="file_manager_create_shortcut">Crea scorciatoia</string>
+    <string name="file_manager_run_in_container">Esegui nel contenitore</string>
+    <string name="file_manager_no_containers">Nessun contenitore disponibile</string>
+    <string name="file_manager_delete_confirm">Eliminare \"%1$s\"? L\'operazione non può essere annullata.</string>
+    <string name="file_manager_delete_confirm_multi">Eliminare %1$d elementi? L\'operazione non può essere annullata.</string>
+    <string name="file_manager_copying">Copia di %1$s in corso</string>
+    <string name="file_manager_moving">Spostamento di %1$s in corso</string>
+    <string name="file_manager_copying_count">Copia di %1$d elementi in corso</string>
+    <string name="file_manager_moving_count">Spostamento di %1$d elementi in corso</string>
+    <string name="file_manager_paste_into_itself">Impossibile incollare una cartella in sé stessa</string>
+    <string name="file_manager_operation_failed">Operazione non riuscita</string>
+    <string name="file_manager_delete_failed">Eliminazione non riuscita</string>
+    <string name="file_manager_rename_failed">Rinomina non riuscita</string>
+    <string name="file_manager_create_folder_failed">Creazione cartella non riuscita</string>
+    <string name="cloud_saves_google_backup_helper">Salva una copia su Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Backup su Google</string>
+    <string name="cloud_saves_google_backup_no_save">Nessun file di salvataggio da sottoporre a backup.</string>
+    <string name="cloud_saves_history_cloud_readonly">Sola lettura</string>
+    <string name="session_drawer_rail_label_record">Registra</string>
+    <string name="session_record_failed">Impossibile avviare la registrazione</string>
+    <string name="session_record_fps">Frequenza fotogrammi</string>
+    <string name="session_record_include_ui">Registra interfaccia</string>
+    <string name="session_record_include_ui_subtitle">Includi HUD e controlli su schermo</string>
+    <string name="session_record_now">Registra ora</string>
+    <string name="session_record_quality">Qualità</string>
+    <string name="session_record_resolution">Risoluzione</string>
+    <string name="session_record_saved">Registrazione salvata in WinNative/Recordings</string>
+    <string name="session_record_settings_title">Impostazioni registrazione</string>
+    <string name="session_record_started">Registrazione avviata</string>
+    <string name="steam_chat_setting_stay_running">Esegui in background</string>
+    <string name="steam_chat_setting_stay_running_desc">Mantieni la chat attiva dopo aver chiuso WinNative</string>
+    <string name="settings_content_refresh">Aggiorna</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Trasferisci salvataggio</string>
+    <string name="retro_save_transfer_message">Importa un salvataggio locale per questo gioco o esporta il salvataggio attuale.</string>
+    <string name="retro_save_transfer_import">Importa salvataggio</string>
+    <string name="retro_save_transfer_export">Esporta salvataggio</string>
+    <string name="retro_save_transfer_import_ok">Salvataggio importato</string>
+    <string name="retro_save_transfer_import_failed">Impossibile importare il salvataggio</string>
+    <string name="retro_save_transfer_export_ok">Salvataggio esportato</string>
+    <string name="retro_save_transfer_export_failed">Impossibile esportare il salvataggio</string>
+    <string name="retro_save_transfer_none">Non esiste ancora alcun salvataggio per questo gioco</string>
+    <string name="retro_cheats_title">Trucchi</string>
+    <string name="retro_cheats_hardcore_blocked">I trucchi sono disattivati in modalità Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Salva</string>
+    <string name="retro_ps2_cancel">Annulla</string>
+    <string name="retro_ps2_save_state">Salvataggio rapido</string>
+    <string name="retro_ps2_load_save_state">Carica salvataggio rapido</string>
+    <string name="retro_ps2_achievements">Obiettivi</string>
+    <string name="retro_ps2_cheats">Trucchi</string>
+    <string name="retro_ps2_memory_cards">Memory card</string>
+    <string name="retro_ps2_fast_forward">Avanzamento rapido</string>
+    <string name="retro_ps2_reset">Reimposta</string>
+    <string name="retro_ps2_swap_disc">Cambia disco</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Tocca per caricare</string>
+    <string name="retro_ps2_slot_empty">Vuoto</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Tocca per sovrascrivere</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Vuoto — tocca per salvare</string>
+    <string name="retro_ps2_slot_is_empty">Lo slot %1$d è vuoto</string>
+    <string name="retro_ps2_loaded_slot">Slot %1$d caricato</string>
+    <string name="retro_ps2_could_not_load_slot">Impossibile caricare lo slot %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Salvato nello slot %1$d</string>
+    <string name="retro_ps2_save_failed">Salvataggio non riuscito</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Tocca per usare</string>
+    <string name="retro_ps2_new_memory_card">Nuova memory card</string>
+    <string name="retro_ps2_import_card">Importa card</string>
+    <string name="retro_ps2_enable_online_dev9">Attiva modalità online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adattatore di rete PS2 — riavvia il gioco per collegarlo</string>
+    <string name="retro_ps2_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_ps2_dns_mode">Modalità DNS</string>
+    <string name="retro_ps2_primary_dns">DNS primario</string>
+    <string name="retro_ps2_secondary_dns">DNS secondario</string>
+    <string name="retro_ps2_optional">facoltativo</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automatico (DHCP)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">tocca per impostare l\'IP (vuoto per rimuovere)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Aggiungi host server</string>
+    <string name="retro_ps2_new_server_hostname">Nuovo nome host server</string>
+    <string name="retro_ps2_server_hostname_hint">es. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Comandi a schermo</string>
+    <string name="retro_ps2_edit_layout">Modifica layout</string>
+    <string name="retro_ps2_reset_layout">Reimposta layout</string>
+    <string name="retro_ps2_layout_reset">Layout reimpostato</string>
+    <string name="retro_ps2_left_stick_invert_x">Stick sinistro: inverti X</string>
+    <string name="retro_ps2_left_stick_invert_y">Stick sinistro: inverti Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Stick destro: inverti X</string>
+    <string name="retro_ps2_right_stick_invert_y">Stick destro: inverti Y</string>
+    <string name="retro_ps2_button_color">Colore pulsanti</string>
+    <string name="retro_ps2_letter_color">Colore lettere</string>
+    <string name="retro_ps2_shadow_color">Colore ombra</string>
+    <string name="retro_ps2_background_color">Colore sfondo</string>
+    <string name="retro_ps2_reset_colors">Reimposta colori</string>
+    <string name="retro_ps2_renderer">Renderer</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Scala risoluzione</string>
+    <string name="retro_ps2_scale_1x_native">1x (nativa)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Proporzioni</string>
+    <string name="retro_ps2_aspect_stretch">Allunga</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtro schermo</string>
+    <string name="retro_ps2_filter_nearest">Più vicino</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilineare (morbido)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilineare (nitido)</string>
+    <string name="retro_ps2_texture_filter">Filtro texture</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilineare (forzato)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilineare (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilineare (sprite)</string>
+    <string name="retro_ps2_blending_accuracy">Precisione fusione</string>
+    <string name="retro_ps2_blend_minimum">Minima</string>
+    <string name="retro_ps2_blend_basic">Base</string>
+    <string name="retro_ps2_blend_medium">Media</string>
+    <string name="retro_ps2_blend_high">Alta</string>
+    <string name="retro_ps2_blend_full">Completa</string>
+    <string name="retro_ps2_blend_maximum">Massima</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Off</string>
+    <string name="retro_ps2_shader_scanline">Scanline</string>
+    <string name="retro_ps2_shader_diagonal">Diagonale</string>
+    <string name="retro_ps2_shader_triangular">Triangolare</string>
+    <string name="retro_ps2_shader_wave">Onda</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Salto fotogrammi</string>
+    <string name="retro_ps2_frameskip_off">Off</string>
+    <string name="retro_ps2_frameskip_1">Salta 1</string>
+    <string name="retro_ps2_frameskip_2">Salta 2</string>
+    <string name="retro_ps2_frameskip_3">Salta 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volume</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Muto</string>
+    <string name="retro_ps2_swap_stereo_channels">Inverti canali stereo</string>
+    <string name="retro_ps2_ee_cycle_rate">Frequenza cicli EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (predefinito)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Salto cicli EE</string>
+    <string name="retro_ps2_skip_off">Off</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 istantaneo</string>
+    <string name="retro_ps2_mtvu">VU multi-thread (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rapido</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Velocità emulazione</string>
+    <string name="retro_ps2_hud_cpu_usage">Utilizzo CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Utilizzo GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Risoluzione interna</string>
+    <string name="retro_ps2_deinterlace_mode">Modalità deinterlacciamento</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Off</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Rapporto d\'aspetto FMV</string>
+    <string name="retro_ps2_anti_blur">Anti-sfocatura</string>
+    <string name="retro_ps2_widescreen_patches">Patch widescreen</string>
+    <string name="retro_ps2_no_interlace_patches">Patch no-interlace</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Rilevamento spin INTC</string>
+    <string name="retro_ps2_wait_loop">Rilevamento loop di attesa</string>
+    <string name="retro_ps2_time_stretch">Time stretch audio</string>
+    <string name="retro_ps2_audio_buffer">Buffer audio</string>
+    <string name="retro_ps2_audio_latency">Latenza di uscita</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Tempi dei frame</string>
+    <string name="retro_ps2_hud_gs_stats">Statistiche GS</string>
+    <string name="retro_ps2_hud_hw_info">Info hardware</string>
+    <string name="retro_ps2_hud_version">Versione</string>
+    <string name="retro_ps2_hud_input_display">Visualizzazione input</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Schermo</string>
+    <string name="retro_ps2_tab_performance">Prestazioni</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Audio</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Comandi</string>
+    <string name="retro_ps2_resume">Riprendi</string>
+    <string name="retro_ps2_pause">Pausa</string>
+    <string name="retro_ps2_exit">Esci</string>
+    <string name="retro_lr_bios_imported">BIOS importato: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">File BIOS non valido</string>
+    <string name="retro_lr_invalid_retro_game">Gioco retro non valido</string>
+    <string name="retro_lr_rom_not_found">ROM non trovata: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Impossibile leggere la ROM in questo archivio</string>
+    <string name="retro_lr_core_not_installed">Core non installato: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Trucchi attivati — gli obiettivi sono disattivati per questa sessione</string>
+    <string name="retro_lr_cloud_save_restored">Salvataggio cloud ripristinato</string>
+    <string name="retro_lr_restore_failed">Ripristino non riuscito</string>
+    <string name="retro_lr_cloud_conflict_message">Esiste un salvataggio cloud più recente per %1$s. Vuoi sincronizzare, e quale salvataggio cloud preferisci conservare?</string>
+    <string name="retro_lr_cloud_save">Salvataggio cloud</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Impossibile caricare il core di emulazione</string>
+    <string name="retro_lr_failed_load_rom">Impossibile caricare la ROM</string>
+    <string name="retro_lr_graphics_not_supported">Grafica non supportata per questo core</string>
+    <string name="retro_lr_emulator_error">Errore dell\'emulatore</string>
+    <string name="retro_lr_shader_default">Predefinito</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Nitido</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Upscaling SGSR</string>
+    <string name="retro_lr_upscale_native">Nativa</string>
+    <string name="retro_lr_sound">Audio</string>
+    <string name="retro_lr_left_stick_invert_x">Stick sinistro: inverti X</string>
+    <string name="retro_lr_left_stick_invert_y">Stick sinistro: inverti Y</string>
+    <string name="retro_lr_right_stick_invert_x">Stick destro: inverti X</string>
+    <string name="retro_lr_right_stick_invert_y">Stick destro: inverti Y</string>
+    <string name="retro_lr_on_screen_controls">Comandi a schermo</string>
+    <string name="retro_lr_haptic_feedback">Feedback aptico</string>
+    <string name="retro_lr_portrait">Verticale</string>
+    <string name="retro_lr_landscape">Orizzontale</string>
+    <string name="retro_lr_edit_layout">Modifica layout (%1$s)</string>
+    <string name="retro_lr_reset_layout">Reimposta layout %1$s</string>
+    <string name="retro_lr_layout_reset">Layout %1$s reimpostato</string>
+    <string name="retro_lr_button_color">Colore pulsanti</string>
+    <string name="retro_lr_letter_color">Colore lettere</string>
+    <string name="retro_lr_shadow_color">Colore ombra</string>
+    <string name="retro_lr_background_color">Colore sfondo</string>
+    <string name="retro_lr_reset_colors">Reimposta colori</string>
+    <string name="retro_lr_colors_reset">Colori reimpostati</string>
+    <string name="retro_lr_performance_hud">HUD prestazioni</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa sfondo</string>
+    <string name="retro_lr_background">Sfondo</string>
+    <string name="retro_lr_scale">Scala</string>
+    <string name="retro_lr_numeric_frametime">Frametime numerico</string>
+    <string name="retro_lr_dual_series_battery">Batteria doppia serie</string>
+    <string name="retro_lr_hud_elements">ELEMENTI HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Console</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batteria</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Grafico</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Salvataggio rapido</string>
+    <string name="retro_lr_load_save_state">Carica salvataggio rapido</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Il caricamento dei salvataggi è disattivato in modalità Hardcore</string>
+    <string name="retro_lr_achievements">Obiettivi</string>
+    <string name="retro_lr_cheats">Trucchi</string>
+    <string name="retro_lr_cheats_disabled_hardcore">I trucchi sono disattivati in modalità Hardcore</string>
+    <string name="retro_lr_reset">Reimposta</string>
+    <string name="retro_lr_fast_forward">Avanzamento rapido</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">L\'avanzamento rapido è disattivato in modalità Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disco %1$d/%2$d</string>
+    <string name="retro_lr_resume">Riprendi</string>
+    <string name="retro_lr_pause">Pausa</string>
+    <string name="retro_lr_exit">Esci</string>
+    <string name="retro_lr_saved_to_slot">Salvato nello slot %1$d</string>
+    <string name="retro_lr_could_not_save_state">Impossibile salvare lo stato</string>
+    <string name="retro_lr_bios_required_title">BIOS %1$s richiesto</string>
+    <string name="retro_lr_bios_required_message">I giochi PlayStation richiedono un vero file BIOS di console che devi fornire. Importa un BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin o scph7001.bin) per continuare.</string>
+    <string name="retro_lr_import_bios">Importa BIOS…</string>
+    <string name="retro_lr_cancel">Annulla</string>
+    <string name="retro_lr_slot_empty">Lo slot %1$d è vuoto</string>
+    <string name="retro_lr_loaded_slot">Slot %1$d caricato</string>
+    <string name="retro_lr_could_not_load_state">Impossibile caricare lo stato</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Rinomina slot %1$d</string>
+    <string name="retro_gs_section_general">Generale</string>
+    <string name="retro_gs_section_graphics">Grafica</string>
+    <string name="retro_gs_section_performance">Prestazioni</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Input</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Annulla</string>
+    <string name="retro_gs_save">Salva</string>
+    <string name="retro_gs_shader_default">Predefinito</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Nitido</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativa</string>
+    <string name="retro_gs_group_game">GIOCO</string>
+    <string name="retro_gs_label_name">Nome</string>
+    <string name="retro_gs_label_system">Sistema</string>
+    <string name="retro_gs_label_emulator_core">Core emulatore</string>
+    <string name="retro_gs_label_rom_path">Percorso ROM</string>
+    <string name="retro_gs_group_bios">BIOS %1$s</string>
+    <string name="retro_gs_label_installed">Installato</string>
+    <string name="retro_gs_bios_none">Nessuno — richiesto per eseguire i giochi %1$s</string>
+    <string name="retro_gs_import_bios">Importa BIOS…</string>
+    <string name="retro_gs_remove_bios">Rimuovi BIOS</string>
+    <string name="retro_gs_group_library_artwork">ILLUSTRAZIONI LIBRERIA</string>
+    <string name="retro_gs_artwork_game_card">Immagine scheda gioco</string>
+    <string name="retro_gs_artwork_grid">Immagine griglia</string>
+    <string name="retro_gs_artwork_carousel">Immagine carosello</string>
+    <string name="retro_gs_artwork_list">Immagine elenco</string>
+    <string name="retro_gs_artwork_custom_set">Immagine personalizzata impostata</string>
+    <string name="retro_gs_artwork_set_image">Imposta immagine</string>
+    <string name="retro_gs_artwork_remove">Rimuovi</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Filtro video</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Upscaling SGSR</string>
+    <string name="retro_gs_performance_hud">HUD prestazioni</string>
+    <string name="retro_gs_group_core">CORE</string>
+    <string name="retro_gs_renderer">Renderer</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Scala risoluzione</string>
+    <string name="retro_gs_scale_1x_native">1x (nativa)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Proporzioni</string>
+    <string name="retro_gs_aspect_stretch">Allunga</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtro schermo</string>
+    <string name="retro_gs_filter_nearest">Più vicino</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilineare (morbido)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilineare (nitido)</string>
+    <string name="retro_gs_texture_filter">Filtro texture</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilineare (forzato)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilineare (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilineare (sprite)</string>
+    <string name="retro_gs_blending_accuracy">Precisione fusione</string>
+    <string name="retro_gs_blend_minimum">Minima</string>
+    <string name="retro_gs_blend_basic">Base</string>
+    <string name="retro_gs_blend_medium">Media</string>
+    <string name="retro_gs_blend_high">Alta</string>
+    <string name="retro_gs_blend_full">Completa</string>
+    <string name="retro_gs_blend_maximum">Massima</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Off</string>
+    <string name="retro_gs_tvshader_scanline">Scanline</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonale</string>
+    <string name="retro_gs_tvshader_triangular">Triangolare</string>
+    <string name="retro_gs_tvshader_wave">Onda</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Salto fotogrammi</string>
+    <string name="retro_gs_frameskip_1">Salta 1</string>
+    <string name="retro_gs_frameskip_2">Salta 2</string>
+    <string name="retro_gs_frameskip_3">Salta 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">PRESTAZIONI</string>
+    <string name="retro_gs_ee_cycle_rate">Frequenza cicli EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (predefinito)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Salto cicli EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 istantaneo</string>
+    <string name="retro_gs_mtvu">VU multi-thread (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rapido</string>
+    <string name="retro_gs_group_performance_hud">HUD PRESTAZIONI</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Velocità emulazione</string>
+    <string name="retro_gs_hud_cpu_usage">Utilizzo CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Utilizzo GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Risoluzione interna</string>
+    <string name="retro_gs_deinterlace_mode">Modalità deinterlacciamento</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Off</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Rapporto d\'aspetto FMV</string>
+    <string name="retro_gs_anti_blur">Anti-sfocatura</string>
+    <string name="retro_gs_widescreen_patches">Patch widescreen</string>
+    <string name="retro_gs_no_interlace_patches">Patch no-interlace</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Rilevamento spin INTC</string>
+    <string name="retro_gs_wait_loop">Rilevamento loop di attesa</string>
+    <string name="retro_gs_time_stretch">Time stretch audio</string>
+    <string name="retro_gs_audio_buffer">Buffer audio</string>
+    <string name="retro_gs_audio_latency">Latenza di uscita</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Tempi dei frame</string>
+    <string name="retro_gs_hud_gs_stats">Statistiche GS</string>
+    <string name="retro_gs_hud_hw_info">Info hardware</string>
+    <string name="retro_gs_hud_version">Versione</string>
+    <string name="retro_gs_hud_input_display">Visualizzazione input</string>
+    <string name="retro_gs_fast_boot">Avvio rapido</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Attiva modalità online</string>
+    <string name="retro_gs_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Modalità DNS</string>
+    <string name="retro_gs_dns_manual">Manuale</string>
+    <string name="retro_gs_dns_internal">Interno</string>
+    <string name="retro_gs_primary_dns">DNS primario</string>
+    <string name="retro_gs_secondary_dns">DNS secondario</string>
+    <string name="retro_gs_dns_optional">facoltativo</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automatico (DHCP)</string>
+    <string name="retro_gs_group_input">INPUT</string>
+    <string name="retro_engine_save">Salva</string>
+    <string name="retro_engine_saved">Partita salvata</string>
+    <string name="retro_engine_loading">Caricamento…</string>
+    <string name="retro_engine_load">Carica</string>
+    <string name="retro_engine_saved_to">Salvato in %1$s</string>
+    <string name="retro_engine_slot_active_only">Attivo</string>
+    <string name="retro_engine_rename_slot">Rinomina slot di salvataggio</string>
+    <string name="retro_engine_caught">%1$d catturati</string>
+    <string name="retro_engine_no_slots">Nessuno slot di salvataggio</string>
+    <string name="retro_engine_new_slot">Nuovo slot di salvataggio</string>
+    <string name="retro_engine_achievements_unavailable">Non tracciato in modalità 3D</string>
+    <string name="retro_engine_fullscreen">Schermo intero</string>
+    <string name="retro_engine_loaded_from">%1$s caricata</string>
+    <string name="retro_engine_slot_empty">Quello slot è vuoto</string>
+    <string name="retro_engine_loading_subtitle">Preparazione dei dati di gioco per la prima volta</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Gioca a questo gioco con il motore voxel 3D invece del core standard</string>
+    <string name="retro_gs_on_screen_controls">Comandi a schermo</string>
+    <string name="retro_gs_haptic_feedback">Feedback aptico</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Volume</string>
+    <string name="retro_gs_mute">Muto</string>
+    <string name="retro_gs_swap_stereo">Inverti canali stereo</string>
+    <string name="retro_gs_sound">Audio</string>
+    <string name="retro_scr_retro_defaults">IMPOSTAZIONI RETRO PREDEFINITE</string>
+    <string name="retro_scr_retro_defaults_desc">Impostazioni predefinite applicate ai giochi di ogni console, salvo modifiche nelle impostazioni del singolo gioco.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Account</string>
+    <string name="retro_scr_signed_in">Connesso</string>
+    <string name="retro_scr_not_signed_in_hint">Non connesso — apri gli Obiettivi di un gioco per accedere</string>
+    <string name="retro_scr_achievements_enabled">Obiettivi attivati</string>
+    <string name="retro_scr_hardcore_default">Modalità Hardcore per impostazione predefinita (nessun salvataggio rapido)</string>
+    <string name="retro_scr_sign_out">Disconnetti</string>
+    <string name="retro_scr_playstation_bios">BIOS PLAYSTATION</string>
+    <string name="retro_scr_installed">Installato</string>
+    <string name="retro_scr_none_ps1_bios">Nessuno — i giochi PS1 richiedono un BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importa BIOS PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS PS1 rimosso</string>
+    <string name="retro_scr_no_bios_to_remove">Nessun BIOS da rimuovere</string>
+    <string name="retro_scr_remove_ps1_bios">Rimuovi BIOS PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Nessuno — i giochi PS2 richiedono un BIOS</string>
+    <string name="retro_scr_format">Formato</string>
+    <string name="retro_scr_ps2_bios_format">Dump unito in un singolo file (.bin con tag regione, ~4 MB). I set ROM0/MEC/NVM separati non sono accettati.</string>
+    <string name="retro_scr_import_ps2_bios">Importa BIOS PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS PS2 rimosso</string>
+    <string name="retro_scr_remove_ps2_bios">Rimuovi BIOS PS2</string>
+    <string name="retro_scr_library_artwork">ILLUSTRAZIONI LIBRERIA</string>
+    <string name="retro_scr_retro_case_art">Illustrazione retro (cartuccia / custodia CD)</string>
+    <string name="retro_scr_box_art">Copertina</string>
+    <string name="retro_scr_box_art_desc">Recuperata automaticamente da thumbnails.libretro.com all\'importazione; un\'immagine personalizzata la sostituisce sempre.</string>
+    <string name="retro_scr_roms_folder">CARTELLA ROM</string>
+    <string name="retro_scr_folder">Cartella</string>
+    <string name="retro_scr_roms_not_set">Non impostata — scegli una cartella per importare automaticamente i giochi</string>
+    <string name="retro_scr_auto_import">Importazione automatica</string>
+    <string name="retro_scr_auto_import_desc">I nuovi giochi in questa cartella vengono aggiunti automaticamente alla libreria con la console corretta rilevata.</string>
+    <string name="retro_scr_select_roms_folder_title">Seleziona cartella ROM</string>
+    <string name="retro_scr_select_roms_folder_button">Seleziona cartella ROM…</string>
+    <string name="retro_scr_change_roms_folder_button">Cambia cartella ROM…</string>
+    <string name="retro_scr_scan_now">Scansiona ora</string>
+    <string name="retro_scr_console_defaults">IMPOSTAZIONI CONSOLE PREDEFINITE</string>
+    <string name="retro_scr_console_defaults_desc">Tocca una console per impostare le impostazioni predefinite.</string>
+    <string name="retro_scr_renderer">Renderer</string>
+    <string name="retro_scr_upscale_resolution">Risoluzione upscaling</string>
+    <string name="retro_scr_aspect_ratio">Proporzioni</string>
+    <string name="retro_scr_aspect_stretch">Allunga</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtro schermo</string>
+    <string name="retro_scr_filter_nearest">Più vicino</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilineare (morbido)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilineare (nitido)</string>
+    <string name="retro_scr_texture_filter">Filtro texture</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilineare (forzato)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilineare (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilineare (sprite)</string>
+    <string name="retro_scr_blending_accuracy">Precisione fusione</string>
+    <string name="retro_scr_blend_minimum">Minima</string>
+    <string name="retro_scr_blend_basic">Base</string>
+    <string name="retro_scr_blend_medium">Media</string>
+    <string name="retro_scr_blend_high">Alta</string>
+    <string name="retro_scr_blend_full">Completa</string>
+    <string name="retro_scr_blend_maximum">Massima</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Off</string>
+    <string name="retro_scr_shader_scanline">Scanline</string>
+    <string name="retro_scr_shader_diagonal">Diagonale</string>
+    <string name="retro_scr_shader_triangular">Triangolare</string>
+    <string name="retro_scr_shader_wave">Onda</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Salto fotogrammi</string>
+    <string name="retro_scr_skip_1">Salta 1</string>
+    <string name="retro_scr_skip_2">Salta 2</string>
+    <string name="retro_scr_skip_3">Salta 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Frequenza cicli EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (predefinito)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Salto cicli EE</string>
+    <string name="retro_scr_skip_off">Off</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 istantaneo</string>
+    <string name="retro_scr_mtvu">VU multi-thread (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rapido</string>
+    <string name="retro_scr_touch_controls">Comandi touch a schermo</string>
+    <string name="retro_scr_sound">Audio</string>
+    <string name="retro_scr_swap_stereo">Inverti canali stereo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: velocità emulazione</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: utilizzo CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: utilizzo GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: risoluzione interna</string>
+    <string name="retro_scr_enable_online_dev9">Attiva modalità online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Modalità DNS</string>
+    <string name="retro_scr_dns_manual">Manuale</string>
+    <string name="retro_scr_dns_internal">Interno</string>
+    <string name="retro_scr_primary_dns">DNS primario</string>
+    <string name="retro_scr_secondary_dns">DNS secondario</string>
+    <string name="retro_scr_optional">facoltativo</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automatico (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Upscaling SGSR</string>
+    <string name="retro_scr_performance_hud">HUD prestazioni</string>
+    <string name="retro_scr_credits_licenses">CREDITI &amp; LICENZE</string>
+    <string name="retro_scr_credits_desc">Alcune funzioni di WinNative si basano su questi progetti open source. Tocca per visualizzare ogni fonte.</string>
+    <string name="retro_scr_tab_defaults">Predefiniti</string>
+    <string name="retro_scr_tab_credits">Crediti</string>
+    <string name="retro_scr_enable_hardcore_title">Attivare la modalità Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">La modalità Hardcore reimposta il gioco ora e disattiva il caricamento dei salvataggi rapidi, l\'avanzamento rapido e i trucchi. Ogni progresso non salvato andrà perso. Continuare?</string>
+    <string name="retro_scr_cancel">Annulla</string>
+    <string name="retro_scr_enable">Attiva</string>
+    <string name="retro_scr_bios_imported">BIOS importato: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">File BIOS non valido</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS PS2 importato: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">File BIOS PS2 non valido</string>
+    <string name="retro_scr_no_game_serial">Nessun numero di serie del gioco per cercare i trucchi.</string>
+    <string name="retro_scr_applied_cheats">Applicati %1$d trucco/trucchi.</string>
+    <string name="retro_scr_couldnt_apply_cheats">Impossibile applicare i trucchi.</string>
+    <string name="retro_scr_cheats">Trucchi</string>
+    <string name="retro_scr_apply">Applica</string>
+    <string name="retro_scr_no_cheats_found">Nessun trucco trovato per questo gioco.</string>
+    <string name="retro_scr_achievements">Obiettivi</string>
+    <string name="retro_scr_sign_in_ra">Accedi a RetroAchievements</string>
+    <string name="retro_scr_username">Nome utente</string>
+    <string name="retro_scr_password">Password</string>
+    <string name="retro_scr_login_failed">Accesso non riuscito</string>
+    <string name="retro_scr_signing_in">Accesso in corso…</string>
+    <string name="retro_scr_sign_in">Accedi</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pt</string>
+    <string name="retro_scr_no_achievements">Nessun obiettivo per questo gioco.</string>
+    <string name="retro_scr_back">Indietro</string>
+    <string name="retro_scr_enabled">Attivato</string>
+    <string name="retro_scr_disabled">Disattivato</string>
+    <string name="retro_scr_rename">Rinomina</string>
+    <string name="retro_scr_save">Salva</string>
+    <string name="retro_scr_cloud_save_conflict">Conflitto salvataggio cloud</string>
+    <string name="retro_scr_keep_local_save">Mantieni salvataggio locale</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Schermo</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Audio</string>
+    <string name="retro_tab_controls">Comandi</string>
+    <string name="retro_scan_up_to_date">Libreria aggiornata</string>
+    <string name="retro_scan_roms">ROM: %1$s</string>
+    <string name="retro_scan_added">%1$d aggiunti</string>
+    <string name="retro_scan_removed">%1$d rimossi</string>
+    <string name="retro_scr_shader_default">Predefinito</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Nitido</string>
+    <string name="retro_scr_upscale_native">Nativa</string>
+    <string name="retro_co_aspect_ratio">Proporzioni</string>
+    <string name="retro_co_ntsc_filter">Filtro NTSC</string>
+    <string name="retro_co_colorization">Colorazione</string>
+    <string name="retro_co_color_correction">Correzione colore</string>
+    <string name="retro_co_remove_sprite_limit">Rimuovi limite sprite</string>
+    <string name="retro_co_resolution">Risoluzione</string>
+    <string name="retro_co_framebuffer_emulation">Emulazione framebuffer</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Hack widescreen</string>
+    <string name="retro_co_val_8_7_native">8:7 (nativa)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Off</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composito</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">Schermo GBA</string>
+    <string name="retro_co_val_gbc_screen">Schermo GBC</string>
+    <string name="retro_co_val_on">On</string>
+    <string name="retro_co_val_320x240_native">320x240 (nativa)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 adattato</string>
+    <string name="retro_co_val_native">Nativa</string>
+    <string name="retro_co_val_internal">Interna</string>
+    <string name="retro_co_val_on_16_9">On (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Accedi con il tuo account RetroAchievements per ottenere e monitorare gli obiettivi dei giochi retro.</string>
+    <string name="retro_ach_username">Nome utente</string>
+    <string name="retro_ach_password">Password</string>
+    <string name="retro_ach_enter_credentials">Inserisci nome utente e password</string>
+    <string name="retro_ach_login_failed">Accesso non riuscito</string>
+    <string name="retro_ach_sign_in">Accedi</string>
+    <string name="retro_ach_password_disclaimer">La tua password viene usata una sola volta per ottenere un token di accesso, memorizzato in modo sicuro sul dispositivo.</string>
+    <string name="retro_ach_achievements_enabled">Obiettivi attivati</string>
+    <string name="retro_ach_hardcore_mode">Modalità Hardcore (nessun salvataggio rapido)</string>
+    <string name="retro_ach_points">%1$d / %2$d punti</string>
+    <string name="retro_ach_none_found">Nessun obiettivo trovato per questo gioco.</string>
+    <string name="retro_ach_sign_out">Disconnetti</string>
+    <string name="retro_che_brand">TRUCCHI</string>
+    <string name="retro_che_name">Nome</string>
+    <string name="retro_che_code">Codice</string>
+    <string name="retro_che_cancel">Annulla</string>
+    <string name="retro_che_save">Salva</string>
+    <string name="retro_che_default_name">Trucco %1$d</string>
+    <string name="retro_che_empty">Nessun trucco. Aggiungi un codice trucco per questo gioco.</string>
+    <string name="retro_che_add">Aggiungi trucco</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Driver GPU</string>
+    <string name="retro_gpu_driver_system">Sistema (Predefinito)</string>
+    <string name="retro_gpu_driver_hint">Installa i driver Turnip in Impostazioni \u2192 Driver. Gli stessi driver funzionano sia per i giochi PC che PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Unità interna virtuale per giochi basati su HDD come Final Fantasy XI. Riavvia il gioco.</string>
+    <string name="retro_ps2_hdd_desc">Unità interna virtuale per giochi basati su HDD come Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Modalità DNS impostata su Internal affinché i tuoi host server personalizzati abbiano effetto.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">Core CPU</string>
+    <string name="retro_co_dual_core">Dual Core</string>
+    <string name="retro_co_internal_cheats">Trucchi interni</string>
+    <string name="retro_co_internal_resolution">Risoluzione interna</string>
+    <string name="retro_co_renderer">Renderer</string>
+    <string name="retro_co_sensor_bar">Posizione della barra sensori</string>
+    <string name="retro_co_skip_gc_bios">Salta l\'intro del BIOS</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">In basso</string>
+    <string name="retro_co_val_cached_interpreter">Interprete con cache</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_interpreter">Interprete</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Mouse / Tocco</string>
+    <string name="retro_co_val_right_stick_absolute">Stick destro (assoluto)</string>
+    <string name="retro_co_val_right_stick_relative">Stick destro (relativo)</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_val_stretch">Allunga</string>
+    <string name="retro_co_val_top">In alto</string>
+    <string name="retro_co_vbi_skip">Salto VBI (Frameskip automatico)</string>
+    <string name="retro_co_widescreen">Widescreen</string>
+    <string name="retro_co_wiimote_pointer">Puntatore Wiimote</string>
+    <string name="retro_gs_cheats_apply_note">Le modifiche verranno applicate al prossimo avvio di questo gioco.</string>
+    <string name="retro_gs_cheats_detect_hint">Avvia questo gioco una volta per rilevare il numero di serie del disco, poi trucchi e patch appariranno qui.</string>
+    <string name="retro_gs_dnas_entry_desc">Bypass autenticazione DNAS — necessario per il gioco online</string>
+    <string name="retro_gs_dnas_group">Applicati automaticamente (Online)</string>
+    <string name="retro_gs_group_cheats">Trucchi &amp; Patch</string>
+    <string name="retro_gs_hdd_image_size">Dimensione: %1$s</string>
+    <string name="retro_gs_hdd_import">Importa immagine HDD</string>
+    <string name="retro_gs_hdd_remove_short">Rimuovi</string>
+    <string name="retro_gs_netplay_enable">Abilita NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Disattivato per impostazione predefinita. Abilitalo, poi scegli Ospita o Unisciti prima dell\'avvio.\nSi disattiva di nuovo quando esci dal gioco.</string>
+    <string name="retro_gs_netplay_host">Indirizzo host</string>
+    <string name="retro_gs_netplay_host_hint">IP o nome host</string>
+    <string name="retro_gs_netplay_host_mode">Ospita sessione</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">On = attendi un giocatore. Off = unisciti all\'indirizzo host</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay usa porte multigiocatore locali su TCP (giocatore 1 host / giocatore 2 client). L\'online PS2 usa invece Ethernet DEV9.</string>
+    <string name="retro_gs_netplay_port">Porta</string>
+    <string name="retro_lr_memory_card_slot">Memory Card %1$d</string>
+    <string name="retro_lr_screenshot">Screenshot</string>
+    <string name="retro_lr_use_cloud_save">Usa salvataggio su cloud</string>
+    <string name="retro_netplay_conn_direct">LAN (IP diretto)</string>
+    <string name="retro_netplay_connecting">Connessione in corso…</string>
+    <string name="retro_netplay_connection">Connessione</string>
+    <string name="retro_netplay_conn_traversal">Online (codice host)</string>
+    <string name="retro_netplay_dismiss">Ignora</string>
+    <string name="retro_netplay_dolphin_help">Il NetPlay GameCube/Wii usa il motore di Dolphin. Ospita = Giocatore 1, Unisciti = Giocatore 2. Scegli Ospita o Unisciti e un tipo di connessione prima dell\'avvio; entrambi i dispositivi avviano insieme lo stesso gioco.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Condividi l\'IP Wi‑Fi del tuo dispositivo e questa porta con il Giocatore 2. Il gioco si avvia automaticamente quando si connette.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">Un codice host viene mostrato all\'avvio del gioco — condividilo con il Giocatore 2. Il gioco si avvia automaticamente quando si connette.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Inserisci l\'IP Wi‑Fi e la porta dell\'host, poi avvia per connetterti.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Inserisci il codice host del Giocatore 1, poi avvia per connetterti.</string>
+    <string name="retro_netplay_enable_before_launch">Abilita NetPlay nelle impostazioni di gioco e scegli Ospita o Unisciti prima dell\'avvio</string>
+    <string name="retro_netplay_find_rooms">Trova stanze su Wi‑Fi</string>
+    <string name="retro_netplay_game_link_hint">Game Link · ogni schermo è la propria console portatile</string>
+    <string name="retro_netplay_gba_not_ready">Il multigiocatore GBA usa gpSP + Wireless Adapter. Assicurati che libgpsp sia installato.</string>
+    <string name="retro_netplay_help">Multigiocatore a schermo condiviso su Wi‑Fi (come RetroArch).\nOspita = Giocatore 1, Unisciti = Giocatore 2. Entrambi i dispositivi mostrano lo stesso gioco.</string>
+    <string name="retro_netplay_help_game_link">Game Link su Wi‑Fi — ogni dispositivo esegue il proprio gioco.\nGB/GBC: collegamento seriale Gambatte (Pokémon Gen 1–2).\nGBA: gpSP Wireless Adapter (battaglie Pokémon FR/LG/Emerald).</string>
+    <string name="retro_netplay_host_action">Ospita stanza</string>
+    <string name="retro_netplay_host_code">Codice host</string>
+    <string name="retro_netplay_host_code_hint">Codice host di traversal dall\'host</string>
+    <string name="retro_netplay_hosting_room">Ospitando stanza</string>
+    <string name="retro_netplay_host_mode_hint">Tocca Ospita per aprire una stanza per questa sessione di gioco, poi avvia il gioco. NetPlay si disattiva quando esci.</string>
+    <string name="retro_netplay_in_room">Nella stanza</string>
+    <string name="retro_netplay_join_action">Unisciti tramite IP</string>
+    <string name="retro_netplay_joined">Unito</string>
+    <string name="retro_netplay_join_room">Unisciti</string>
+    <string name="retro_netplay_launch_mode">All\'avvio</string>
+    <string name="retro_netplay_leave">Esci</string>
+    <string name="retro_netplay_menu_hint">Ospita = G1 · Unisciti = G2 · stesso gioco su entrambi gli schermi</string>
+    <string name="retro_netplay_mode_host">Ospita</string>
+    <string name="retro_netplay_mode_join">Unisciti</string>
+    <string name="retro_netplay_mode_manual">Manuale</string>
+    <string name="retro_netplay_no_rooms">Nessuna stanza trovata. Assicurati che l\'host sia sulla stessa rete Wi‑Fi e stia ospitando una stanza.</string>
+    <string name="retro_netplay_player_name">Nome visualizzato</string>
+    <string name="retro_netplay_player_name_hint">Mostrato agli altri giocatori</string>
+    <string name="retro_netplay_players_count">%1$d connessi</string>
+    <string name="retro_netplay_prelaunch_hint">La stanza è aperta solo per questa sessione. Avvia quando sei pronto. Uscire dal gioco disattiva NetPlay.</string>
+    <string name="retro_netplay_room_players">Giocatori</string>
+    <string name="retro_netplay_scan_action">Scansiona Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Scansiona di nuovo</string>
+    <string name="retro_netplay_scan_hint">Scansiona la stessa rete Wi‑Fi per stanze aperte, oppure unisciti tramite indirizzo IP.</string>
+    <string name="retro_netplay_scanning">Scansione Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Risultati scansione</string>
+    <string name="retro_netplay_select_room_hint">Tocca una stanza per unirti ora (non salva l\'IP per il prossimo avvio).</string>
+    <string name="retro_netplay_stop_scan">Ferma scansione</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s connesso</string>
+    <string name="retro_netplay_user_disconnected">%1$s disconnesso</string>
+    <string name="retro_netplay_waiting_players">In attesa di giocatori…</string>
+    <string name="retro_ps2_coming_soon">Il supporto per PlayStation 2 è in arrivo</string>
+    <string name="retro_ps2_show_l3r3">Mostra pulsanti L3 / R3</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Quando disattivato, tocca due volte uno stick per premere L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">FLAG DRIVER TURNIP</string>
+    <string name="retro_ps2_turnip_flags_note">Applicati solo quando è selezionato un driver GPU personalizzato qui sopra.</string>
+    <string name="retro_rom_missing">File di gioco non trovato</string>
+    <string name="retro_scr_delete">Elimina</string>
+    <string name="retro_scr_import_from_file">Importa da file…</string>
+    <string name="retro_scr_loading">Caricamento…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Cambia console</string>
+    <string name="retro_gs_identify_as">Identifica come console</string>
+    <string name="retro_gs_console_changed">Ora identificato come %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Applica un effetto ReShade (.fx) ai giochi DXVK/VKD3D (Vulkan) tramite il livello vkBasalt integrato. Metti ogni effetto in una propria cartella in Android/data/&lt;package&gt;/files/ReShade/. La regolazione dei parametri in tempo reale e l\'interruttore in gioco arriveranno con l\'aggiornamento del livello a ricaricamento immediato.</string>
+    <string name="reshade_catalog_title">Effetti ReShade</string>
+    <string name="reshade_catalog_search">Cerca effetti…</string>
+    <string name="reshade_catalog_installed">Installati (%1$d)</string>
+    <string name="reshade_catalog_available">Disponibili (%1$d)</string>
+    <string name="reshade_catalog_downloading">Download in corso</string>
+    <string name="reshade_catalog_installing">Installazione in corso</string>
+    <string name="reshade_catalog_offline_cache">Offline — visualizzazione di un elenco memorizzato nella cache. Connettiti per scaricare nuovi effetti.</string>
+    <string name="reshade_catalog_offline_none">Offline — visualizzazione dei soli effetti installati. Connettiti per sfogliare il catalogo.</string>
+    <string name="reshade_catalog_needs_connection">Connettiti a Internet per scaricare effetti.</string>
+    <string name="reshade_catalog_download_failed">Impossibile scaricare %1$s.</string>
+    <string name="reshade_catalog_empty_query">Nessun effetto corrisponde a \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Nessun effetto disponibile. Connettiti a Internet per sfogliare il catalogo.</string>
+    <string name="reshade_catalog_done">Fatto</string>
+    <string name="reshade_catalog_delete_cd">Elimina %1$s</string>
+    <string name="reshade_catalog_delete_title">Eliminare %1$s?</string>
+    <string name="reshade_catalog_delete_body">Questo rimuove l\'effetto dalla memoria e da qualsiasi configurazione che lo utilizza. Potrai scaricarlo di nuovo in seguito.</string>
+    <string name="reshade_catalog_delete_confirm">Elimina</string>
+    <string name="reshade_catalog_delete_cancel">Annulla</string>
+    <string name="reshade_catalog_delete_failed">Impossibile eliminare %1$s.</string>
+    <string name="reshade_params_title">PARAMETRI DELL\'EFFETTO</string>
+    <string name="reshade_params_reset">Ripristina</string>
+    <string name="reshade_loadout_empty">Ancora nessun effetto. Aggiungi uno o più effetti per creare una configurazione.</string>
+    <string name="reshade_loadout_add">Aggiungi effetto</string>
+    <string name="reshade_loadout_full">Configurazione piena — rimuovi un effetto per aggiungerne un altro.</string>
+    <string name="reshade_effect_active">attivo</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pila</string>
+    <string name="reshade_mode_solo_hint">Un effetto attivo alla volta (confronto A/B, cambia dal vivo nel gioco).</string>
+    <string name="reshade_mode_stack_hint">Sovrapponi qualsiasi sottoinsieme di effetti, applicati in ordine.</string>
+    <string name="reshade_drawer_enable">Abilita ReShade</string>
+    <string name="reshade_drawer_empty">Nessun effetto ReShade in questa configurazione. Aggiungi effetti nelle impostazioni di questo gioco (o del contenitore) per cambiarli e regolarli qui.</string>
+    <string name="reshade_drawer_no_params">Questo effetto non espone parametri regolabili.</string>
+    <string name="cloud_saves_deleting">Eliminazione salvataggio…</string>
+    <string name="cloud_saves_history_delete">Elimina</string>
+    <string name="cloud_saves_history_delete_confirm_body">Eliminare definitivamente il salvataggio cloud da %1$s? L\'operazione non può essere annullata.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Elimina salvataggio cloud</string>
+    <string name="cloud_saves_history_delete_failed">Impossibile eliminare il salvataggio cloud</string>
+    <string name="cloud_saves_history_delete_success">Salvataggio cloud eliminato</string>
+    <string name="retro_bundle_required">Scarica prima i core delle console — Impostazioni › Retro</string>
+    <string name="retro_ps2_device_unsupported">Questo dispositivo non può eseguire l\'emulazione PS2: richiede OpenGL ES 3.1 o successivo.</string>
+    <string name="retro_scr_consoles_check">Cerca aggiornamenti</string>
+    <string name="retro_scr_consoles_checking">Ricerca aggiornamenti…</string>
+    <string name="retro_scr_consoles_download">Scarica i core delle console</string>
+    <string name="retro_scr_consoles_downloading">Download… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Core delle console</string>
+    <string name="retro_scr_consoles_installed">Installato — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installato — build %1$s (controllo aggiornamenti non riuscito)</string>
+    <string name="retro_scr_consoles_installing">Installazione…</string>
+    <string name="retro_scr_consoles_missing">Non installato — scaricalo per giocare ai giochi retro</string>
+    <string name="retro_scr_consoles_state">Stato</string>
+    <string name="retro_scr_consoles_update">Aggiorna i core delle console</string>
+    <string name="retro_scr_consoles_update_available">Aggiornamento disponibile — build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Verifica del download…</string>
+    <string name="retro_scr_consoles_working">Operazione in corso…</string>
+    <string name="retro_tab_system">Sistema</string>
 </resources>
+
diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
new file mode 100644
index 000000000..e16611a81
--- /dev/null
+++ b/app/src/main/res/values-ja/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>画像</item>
+        <item>オリジナル</item>
+        <item>単色</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-ja/plurals.xml b/app/src/main/res/values-ja/plurals.xml
new file mode 100644
index 000000000..917428e6f
--- /dev/null
+++ b/app/src/main/res/values-ja/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d 個の ZIP アセット</item>
+        <item quantity="other">%d 個の ZIP アセット</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 000000000..311c03fca
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">実行</string>
+    <string name="common_ui_edit">編集</string>
+    <string name="common_ui_remove">削除</string>
+    <string name="common_ui_add">追加</string>
+    <string name="common_ui_shortcuts">ショートカット</string>
+    <string name="common_ui_containers">コンテナ</string>
+    <string name="common_ui_input_controls">入力コントロール</string>
+    <string name="common_ui_no_items_to_display">表示する項目がありません</string>
+    <string name="common_ui_select_icon">アイコンを選択</string>
+    <string name="common_ui_revert_icon">アイコンを元に戻す</string>
+    <string name="common_ui_select_exe">EXEを選択</string>
+    <string name="common_ui_select_folder">フォルダを選択</string>
+    <string name="common_ui_current_folder">現在のフォルダ</string>
+    <string name="common_ui_enter_path">パスを入力</string>
+    <string name="common_ui_path_not_found">パスが見つかりません</string>
+    <string name="common_ui_select_valid_exe_file">有効な.exeファイルを選択してください</string>
+    <string name="common_ui_select_valid_icon_file">有効な.icoまたは.pngファイルを選択してください。</string>
+    <string name="common_ui_exit">終了</string>
+    <string name="common_ui_exit_app">アプリを終了</string>
+    <string name="common_ui_profile">プロファイル</string>
+    <string name="common_ui_name">名前</string>
+    <string name="common_ui_ok">OK</string>
+    <string name="common_ui_cancel">キャンセル</string>
+    <string name="common_ui_untitled">無題</string>
+    <string name="common_ui_disabled">無効</string>
+    <string name="common_ui_container">コンテナ</string>
+    <string name="common_ui_value">値</string>
+    <string name="common_ui_none">なし</string>
+    <string name="common_ui_custom_text">カスタムテキスト</string>
+    <string name="common_ui_icon">アイコン</string>
+    <string name="common_ui_duplicate">複製</string>
+    <string name="common_ui_credits_and_third_party_apps">クレジットとサードパーティアプリ</string>
+    <string name="common_ui_loading">読み込み中</string>
+    <string name="common_ui_exporting">エクスポート中</string>
+    <string name="common_ui_enable">有効化</string>
+    <string name="common_ui_disable">無効化</string>
+    <string name="common_ui_force">強制</string>
+    <string name="common_ui_version">バージョン</string>
+    <string name="common_ui_advanced">詳細設定</string>
+    <string name="common_ui_graphics">グラフィック</string>
+    <string name="common_ui_system">システム</string>
+    <string name="common_ui_width">幅</string>
+    <string name="common_ui_height">高さ</string>
+    <string name="common_ui_open_file">ファイルを開く</string>
+    <string name="common_ui_download_file">ファイルをダウンロード</string>
+    <string name="common_ui_downloading_file">ファイルをダウンロード中</string>
+    <string name="common_ui_browse">参照</string>
+    <string name="common_ui_options">オプション</string>
+    <string name="common_ui_export">エクスポート</string>
+    <string name="common_ui_new_file">新規ファイル</string>
+    <string name="common_ui_description">説明</string>
+    <string name="common_ui_continue">続行</string>
+    <string name="common_ui_warning">警告</string>
+    <string name="common_ui_copy">コピー</string>
+    <string name="common_ui_reset">リセット</string>
+    <string name="common_ui_close">閉じる</string>
+    <string name="common_ui_confirm">確認</string>
+    <string name="common_ui_unnamed">名前なし</string>
+    <string name="common_ui_download">ダウンロード</string>
+    <string name="common_ui_uninstall">アンインストール</string>
+    <string name="common_ui_other">その他</string>
+    <string name="common_ui_status">ステータス</string>
+    <string name="common_ui_size">サイズ</string>
+    <string name="common_ui_release_date">リリース日</string>
+    <string name="common_ui_installed">インストール済み</string>
+    <string name="common_ui_available">利用可能</string>
+    <string name="common_ui_settings">設定</string>
+    <string name="common_ui_enable_all">すべて有効化</string>
+    <string name="common_ui_disable_all">すべて無効化</string>
+    <string name="common_ui_select_all">すべて選択</string>
+    <string name="common_ui_deselect_all">すべて選択解除</string>
+    <string name="common_ui_on">オン</string>
+    <string name="common_ui_off">オフ</string>
+    <string name="common_ui_already_set">設定済み</string>
+    <string name="common_ui_shortcut">ショートカット</string>
+    <string name="common_ui_custom">カスタム</string>
+    <string name="common_ui_about">情報</string>
+    <string name="common_ui_back">戻る</string>
+    <string name="common_ui_apply">適用</string>
+    <string name="common_ui_save">保存</string>
+    <string name="common_ui_clone">クローン</string>
+    <string name="common_ui_properties">プロパティ</string>
+    <string name="common_ui_store">ストア</string>
+    <string name="common_ui_library">ライブラリ</string>
+    <string name="common_ui_downloads">ダウンロード</string>
+    <string name="common_ui_import">インポート</string>
+    <string name="common_ui_sync">同期</string>
+    <string name="common_ui_sign_in">サインイン</string>
+    <string name="common_ui_submit">送信</string>
+    <string name="common_ui_coming_soon">近日公開</string>
+    <string name="common_ui_signed_in">サインイン済み</string>
+    <string name="common_ui_required">必須</string>
+    <string name="common_ui_optional">任意</string>
+    <string name="common_ui_notifications">通知</string>
+    <string name="common_ui_mode">モード</string>
+    <string name="common_ui_experimental">(実験的)</string>
+    <string name="common_ui_current_version_label">現在のバージョン:</string>
+    <string name="common_ui_cannot_write_folder">選択したフォルダに書き込めません</string>
+    <string name="common_ui_failed_create_directory">デフォルトディレクトリの作成に失敗しました</string>
+    <string name="common_ui_device_not_supported">申し訳ありません、お使いのデバイスはサポートされていない可能性があります</string>
+    <string name="common_ui_please_wait">お待ちください…</string>
+    <string name="common_ui_done">完了</string>
+    <string name="common_ui_open">開く</string>
+    <string name="common_ui_connected">接続済み</string>
+    <string name="common_ui_install">インストール</string>
+    <string name="common_ui_application">アプリケーション</string>
+    <string name="common_ui_check">確認</string>
+    <string name="store_game_check_for_update">更新を確認</string>
+    <string name="store_game_checking_for_update">確認中</string>
+    <string name="store_game_download_update">更新をダウンロード</string>
+    <string name="store_game_no_update_available">利用可能な更新はありません</string>
+    <string name="store_game_update_available">更新が利用可能です</string>
+    <string name="store_game_update_check_failed">更新の確認に失敗しました</string>
+    <string name="store_game_update">更新</string>
+    <string name="store_game_workshop">ワークショップ</string>
+    <string name="store_game_verify_files">ファイルを検証</string>
+    <string name="store_game_verify_started">%1$s を検証中 — ダウンロードタブを確認してください</string>
+    <string name="store_game_steam_options">Steamオプション</string>
+    <string name="store_game_verify_complete">ファイルの検証が完了しました</string>
+    <string name="store_game_verify_failed_notice">ファイルの検証に失敗しました</string>
+    <string name="store_game_progress_background_hint">これを閉じても処理は続行されます。いつでもダウンロードタブで確認できます。</string>
+    <string name="store_game_checking_updates">更新を確認中</string>
+    <string name="store_game_no_updates_notice">利用可能な更新はありません</string>
+    <string name="store_game_update_complete">更新が完了しました</string>
+    <string name="store_game_update_failed_notice">更新に失敗しました</string>
+    <string name="store_game_update_check_failed_notice">更新の確認に失敗しました</string>
+    <string name="store_game_download_already_active">このゲームはすでにダウンロード中です。DLCを追加する前に、現在のダウンロードをキャンセルしてください。</string>
+    <string name="common_ui_select">選択</string>
+    <string name="common_ui_storage_roots">ストレージのルート</string>
+    <string name="common_ui_browse_local_folders_directly">ローカルフォルダを直接参照</string>
+    <string name="common_ui_no_folders_available_here">ここに利用可能なフォルダはありません</string>
+    <string name="common_ui_grant_all_files_access_browse">フォルダを直接参照するには、すべてのファイルへのアクセスを許可してください。</string>
+    <string name="common_ui_not_configured">未設定</string>
+    <string name="common_ui_reinstall">再インストール</string>
+    <string name="common_ui_exit_app_confirm">WinNativeを終了しますか?</string>
+    <string name="common_ui_elements_count">%1$d 個の要素</string>
+    <string name="common_ui_disabled_placeholder">-- 無効 --</string>
+    <string name="common_ui_enabled">有効</string>
+    <string name="common_ui_unknown_error">不明なエラー</string>
+    <string name="common_ui_auto_detected">自動検出</string>
+    <string name="common_ui_change">変更</string>
+    <string name="common_ui_proceed">続ける</string>
+    <string name="common_ui_sign_out">サインアウト</string>
+    <string name="common_ui_name_cannot_be_empty">名前を空にすることはできません</string>
+    <string name="common_ui_error_with_message">エラー: %1$s</string>
+    <string name="common_ui_64_bit">64ビット</string>
+    <string name="common_ui_32_bit">32ビット</string>
+    <string name="common_ui_64_bit_and_32_bit">64ビット &amp; 32ビット</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d 個のフォルダ</item>
+        <item quantity="other">%d 個のフォルダ</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d 個のファイル</item>
+        <item quantity="other">%d 個のファイル</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">アートワークを取得</string>
+    <string name="library_games_scraping_artwork">取得中</string>
+    <string name="library_games_shortcut_created">ショートカットを作成しました</string>
+    <string name="library_games_failed_to_create_shortcut">ショートカットの作成に失敗しました: %s</string>
+    <string name="library_games_install_path">インストールパス</string>
+    <string name="library_games_not_enough_space">あと %1$s の空き容量が必要です</string>
+    <string name="library_games_download_slash_install">ダウンロード / インストール</string>
+    <string name="library_games_save_management">セーブ管理</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • 空き容量: %3$s</string>
+    <string name="library_games_last_played">最終プレイ</string>
+    <string name="library_games_playtime">プレイ時間</string>
+    <string name="library_games_plays">プレイ回数</string>
+    <string name="library_games_dlcs">DLC</string>
+    <string name="library_games_uninstall_game">ゲームをアンインストール</string>
+    <string name="library_games_remove_game">ゲームを削除</string>
+    <string name="library_games_uninstall_confirm">%1$s をアンインストールし、インストール済みのゲームフォルダを完全に削除しますか?</string>
+    <string name="library_games_remove_confirm">%1$s をライブラリから削除します。ディスク上のゲームファイルはそのまま残ります。よろしいですか?</string>
+    <string name="library_games_game_uninstalled">%1$s をアンインストールしました。</string>
+    <string name="library_games_game_removed">%1$s を削除しました。</string>
+    <string name="library_games_failed_to_uninstall">アンインストールに失敗しました。</string>
+    <string name="library_games_failed_to_uninstall_reason">アンインストールに失敗しました: %1$s</string>
+    <string name="library_games_loading">ライブラリを読み込み中…</string>
+    <string name="library_games_no_games_installed">ゲームがインストールされていません。ストアタブまたは + ボタンでゲームを追加してください。</string>
+    <string name="library_games_times_played_label">プレイ回数: </string>
+    <string name="library_games_playtime_label">プレイ時間: </string>
+    <string name="library_games_no_games_hub">ゲームがインストールされていません\nクリックしてWinlatorバックエンドを開く</string>
+    <string name="library_games_installed_badge">インストール済み</string>
+    <string name="library_games_unknown_game">不明なゲーム</string>
+    <string name="library_games_layouts_header">ライブラリのレイアウト</string>
+    <string name="library_games_layout_carousel">カルーセル</string>
+    <string name="library_games_layout_list">リスト</string>
+    <string name="library_games_view_options_header">表示オプション</string>
+    <string name="library_games_immersive_mode">没入モード</string>
+    <string name="library_games_immersive_mode_description">フォーカス中のゲームアートを背景として使用</string>
+    <string name="library_games_immersive_blur">背景をぼかす</string>
+    <string name="library_games_immersive_blur_description">没入背景にぼかし効果を適用します</string>
+    <string name="library_games_custom_game">カスタムゲーム</string>
+    <string name="library_games_play">プレイ</string>
+    <string name="hero_boot_to_desktop_title">デスクトップで起動</string>
+    <string name="hero_graphics_tests_title">グラフィックテスト</string>
+    <string name="hero_graphics_test_32">32ビット</string>
+    <string name="hero_graphics_test_64">64ビット</string>
+    <string name="hero_input_tests_title">入力テスト</string>
+    <string name="library_games_add_custom_game">カスタムゲームを追加</string>
+    <string name="library_games_game_name">ゲーム名</string>
+    <string name="library_games_game_folder_mapped_drive">ゲームフォルダ (マッピングされたゲームドライブ)</string>
+    <string name="library_games_select_exe_provide_name">exeを選択して名前を入力してください</string>
+    <string name="library_games_sign_in_prompt">ストアにサインインするか、カスタムゲームを追加してライブラリを構築してください。</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">ストア</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">共有ダウンロードフォルダ</string>
+    <string name="stores_accounts_shared_downloads_subtitle">すべてのストアで単一のフォルダを使用</string>
+    <string name="stores_accounts_default_downloads_folder">デフォルトのダウンロードフォルダ</string>
+    <string name="stores_accounts_steam_downloads">Steamダウンロード</string>
+    <string name="stores_accounts_epic_downloads">Epicダウンロード</string>
+    <string name="stores_accounts_gog_downloads">GOGダウンロード</string>
+    <string name="stores_accounts_download_speed">ダウンロード速度</string>
+    <string name="stores_accounts_download_speed_subtitle">Steamのダウンロードスレッドの同時実行数を制御します</string>
+    <string name="stores_accounts_download_server">ダウンロードサーバー</string>
+    <string name="stores_accounts_connected_stores">接続済みのストア</string>
+    <string name="stores_accounts_download_settings">ダウンロード設定</string>
+    <string name="stores_accounts_download_speed_conservative">控えめ</string>
+    <string name="stores_accounts_download_speed_balanced">バランス</string>
+    <string name="stores_accounts_download_speed_standard">標準</string>
+    <string name="stores_accounts_download_speed_performance">パフォーマンス</string>
+    <string name="stores_accounts_download_server_auto_detected">自動検出: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">ゲームダウンロード用のSteam CDNリージョン</string>
+    <string name="stores_accounts_sign_out_confirm">%1$s からサインアウトしますか?</string>
+    <string name="stores_accounts_sign_out_message">ライブラリにアクセスするには、再度サインインする必要があります。</string>
+    <string name="stores_accounts_logged_in_epic">Epic Gamesにログインしました!</string>
+    <string name="stores_accounts_epic_login_failed">Epicへのログインに失敗しました: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">GOGにログインしました!</string>
+    <string name="stores_accounts_gog_login_failed">GOGへのログインに失敗しました: %1$s</string>
+    <string name="stores_accounts_custom_download_path">カスタムダウンロードパス</string>
+    <string name="stores_accounts_custom_download_path_description">デフォルトのダウンロードパスはすでに 設定 &gt; ストア で設定されています。このインストール専用の固有のカスタムパスを設定する場合は、続けるをクリックしてください。</string>
+    <string name="stores_accounts_not_signed_in">サインインしていません</string>
+    <string name="stores_accounts_status_online">オンライン</string>
+    <string name="stores_accounts_status_away">退席中</string>
+    <string name="stores_accounts_status_offline">オフライン</string>
+    <string name="stores_accounts_status_invisible">オフライン表示</string>
+    <string name="stores_accounts_status_header">ステータス</string>
+    <string name="stores_accounts_stores_header">ストア</string>
+    <string name="stores_accounts_sign_in_store_prompt">%1$s ストアにアクセスするにはサインインしてください。</string>
+    <string name="stores_accounts_manage">ストアアカウントを管理</string>
+    <string name="stores_accounts_sign_into_store">%1$s にサインイン</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">すべてキャンセル</string>
+    <string name="downloads_queue_preparing_download">ダウンロードを準備中</string>
+    <string name="downloads_queue_installing_package">パッケージをインストール中</string>
+    <string name="downloads_queue_resume_all">すべて再開</string>
+    <string name="downloads_queue_pause_all">すべて一時停止</string>
+    <string name="downloads_queue_clear">クリア</string>
+    <string name="downloads_queue_status_label">ステータス:</string>
+    <string name="downloads_queue_phase_downloading">ダウンロード中</string>
+    <string name="downloads_queue_phase_downloading_file">ダウンロード中 [%1$s]</string>
+    <string name="downloads_queue_phase_queued">待機中</string>
+    <string name="downloads_queue_phase_paused">一時停止中</string>
+    <string name="downloads_queue_phase_preparing">準備中</string>
+    <string name="downloads_queue_phase_verifying">検証中</string>
+    <string name="downloads_queue_phase_verifying_file">[%1$s] を検証中</string>
+    <string name="downloads_queue_phase_patching">パッチ適用中</string>
+    <string name="downloads_queue_phase_applying_data">データを適用中</string>
+    <string name="downloads_queue_phase_finalizing">最終処理中</string>
+    <string name="downloads_queue_phase_unpacking">展開中</string>
+    <string name="downloads_queue_phase_updating">更新中</string>
+    <string name="downloads_queue_phase_complete">完了</string>
+    <string name="downloads_queue_phase_cancelled">キャンセル済み</string>
+    <string name="downloads_queue_phase_failed">失敗: %1$s</string>
+    <string name="downloads_queue_phase_unknown">不明</string>
+    <string name="downloads_queue_paused_resume_hint">一時停止中 - 続行するには「再開」をタップ</string>
+    <string name="downloads_queue_cancel_download">ダウンロードをキャンセル</string>
+    <string name="downloads_queue_cancel_download_title">ダウンロードをキャンセルしますか?</string>
+    <string name="downloads_queue_cancel_download_confirm">%1$s のダウンロードをキャンセルし、ダウンロード済みのファイルをすべて削除しますか?</string>
+    <string name="downloads_queue_cancel_download_warning">DLC、ゲーム、または更新のダウンロードをキャンセルすると、ゲームのインストールが破損する可能性があります。\n\nこのダウンロードをキャンセルし、これまでにダウンロードしたファイルを削除してもよろしいですか?</string>
+    <string name="downloads_queue_cancel_all_title">すべてのダウンロードをキャンセルしますか?</string>
+    <string name="downloads_queue_cancel_all_warning">DLC、ゲーム、または更新のダウンロードをキャンセルすると、ゲームのインストールが破損する可能性があります。\n\nすべてのダウンロードをキャンセルし、これまでにダウンロードしたファイルを削除してもよろしいですか?</string>
+    <string name="downloads_queue_this_game">このゲーム</string>
+    <string name="downloads_queue_empty">アクティブなダウンロードはありません。</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">新しいコンテナ</string>
+    <string name="containers_list_edit">コンテナを編集</string>
+    <string name="containers_list_creating">コンテナを作成中</string>
+    <string name="containers_list_removing">コンテナを削除中</string>
+    <string name="containers_list_duplicating">コンテナを複製中</string>
+    <string name="containers_list_remove_title">コンテナを削除</string>
+    <string name="containers_list_duplicate_title">コンテナを複製</string>
+    <string name="containers_list_confirm_remove">このコンテナを削除しますか? 内部に保存されたゲームのセーブデータはすべて完全に削除されます。クラウドに同期済みのセーブデータはクラウドに残りますが、未同期のローカルの変更は失われます — 残しておきたい場合は、先にこのゲームのクラウドセーブを同期してください。</string>
+    <string name="containers_list_confirm_duplicate">このコンテナを複製しますか?</string>
+    <string name="containers_list_duplicate_failed">コンテナの複製に失敗しました</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">このショートカットを削除しますか?</string>
+    <string name="shortcuts_list_add_to_home_screen">ホーム画面に追加</string>
+    <string name="shortcuts_library_artwork_title">ライブラリのアートワーク</string>
+    <string name="shortcuts_library_artwork_icon_title">アイコン画像</string>
+    <string name="shortcuts_library_artwork_hero_title">背景</string>
+    <string name="shortcuts_library_artwork_set">画像を設定</string>
+    <string name="shortcuts_library_artwork_failed">選択した画像を読み込めませんでした。</string>
+    <string name="shortcuts_library_artwork_open_source">SteamGridDB を開く</string>
+    <string name="shortcuts_list_not_available">このショートカットは利用できなくなりました。削除するか再作成してください。</string>
+    <string name="shortcuts_list_select_a_container">コンテナを選択</string>
+    <string name="shortcuts_list_error_opening_settings">ショートカット設定を開く際にエラーが発生しました</string>
+    <string name="shortcuts_list_removed">ショートカットを削除しました。</string>
+    <string name="shortcuts_list_remove_failed">ショートカットの削除に失敗しました。もう一度お試しください。</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">ショートカットを削除\n%1$s</string>
+    <string name="shortcuts_list_cloned">ショートカットを複製しました。</string>
+    <string name="shortcuts_list_clone_failed">ショートカットの複製に失敗しました。</string>
+    <string name="shortcuts_list_exported_to">ショートカットを %1$s にエクスポートしました</string>
+    <string name="shortcuts_list_failed_export">ショートカットのエクスポートに失敗しました</string>
+    <string name="shortcuts_export_all">すべてエクスポート</string>
+    <string name="shortcuts_export_to_frontend">フロントエンドにエクスポート</string>
+    <string name="shortcuts_export_all_done">%1$d 個のゲームを %2$s にエクスポートしました</string>
+    <string name="shortcuts_export_all_none">エクスポートするゲームがありません</string>
+    <string name="shortcuts_list_added">ショートカットを追加しました。</string>
+    <string name="shortcuts_list_readded_existing">既存のショートカットを再追加しました</string>
+    <string name="shortcuts_list_failed_add">ショートカットの追加に失敗しました。</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">実行引数</string>
+    <string name="shortcuts_properties_target_path">ターゲットパス</string>
+    <string name="shortcuts_properties_disable_xinput">Xinput を無効化 (マウス/キーボード専用操作向け)</string>
+    <string name="num_controllers">コントローラーの数</string>
+    <string name="shortcuts_properties_exclusive_input">排他入力</string>
+    <string name="shortcuts_properties_custom_game_settings">カスタムゲーム設定</string>
+    <string name="shortcuts_properties_use_legacy_launcher">レガシーランチャーを使用</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">レガシー Steam エミュレーション: ColdClient ランチャー経由でゲームを起動し、exe から SteamStub DRM を除去します。Steam ランチャーで動作しない古いゲームにのみ使用してください。</string>
+    <string name="shortcuts_properties_runtime_patcher">ランタイム DRM パッチャー</string>
+    <string name="shortcuts_properties_runtime_patcher_description">起動時に DRM パッチャー DLL を注入します。FPS が低下します — レガシーランチャー単体で失敗する場合にのみ使用してください。</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">WinNative 本物の Steam クライアント</string>
+    <string name="steam_section_emulator">レガシー Steam エミュレーター</string>
+    <string name="shortcuts_properties_use_steam_input">Steam Input を使用</string>
+    <string name="shortcuts_properties_steam_offline_mode">Steam オフラインモード</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">エミュレートされた Steam クライアントをオフラインとして報告させ、ゲームがオンライン接続を試みないようにします。Steam のネットワークチェックでハングするゲームに使用してください。</string>
+    <string name="shortcuts_properties_reset">プロパティをリセット</string>
+    <string name="shortcuts_properties_updated_at">ショートカットを %1$s に更新しました</string>
+    <string name="shortcuts_properties_properties_reset">プロパティをリセットしました。</string>
+    <string name="shortcuts_properties_reset_per_game">ゲーム個別設定をリセット</string>
+    <string name="shortcuts_properties_reset_per_game_message">このゲームを選択したコンテナの既定値を使用するようにリセットしますか?</string>
+    <string name="shortcuts_properties_per_game_reset">ゲーム個別設定を選択したコンテナの既定値にリセットしました</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">操作要素が選択されていません</string>
+    <string name="input_controls_editor_scale">スケール</string>
+    <string name="input_controls_editor_shape">形状</string>
+    <string name="input_controls_editor_type">種類</string>
+    <string name="input_controls_editor_binding">バインド</string>
+    <string name="binding_primary">プライマリバインド</string>
+    <string name="binding_secondary">セカンダリバインド</string>
+    <string name="binding_third">サードバインド</string>
+    <string name="binding_fourth">フォースバインド</string>
+    <string name="input_controls_editor_binding_up">上バインド</string>
+    <string name="input_controls_editor_binding_right">右バインド</string>
+    <string name="input_controls_editor_binding_down">下バインド</string>
+    <string name="input_controls_editor_binding_left">左バインド</string>
+    <string name="input_controls_editor_overlay_opacity">オーバーレイの不透明度</string>
+    <string name="input_controls_editor_opacity">不透明度</string>
+    <string name="input_controls_editor_radial_menu">ラジアルメニュー</string>
+    <string name="input_controls_editor_radial_menu_options">ラジアルメニューオプション</string>
+    <string name="input_controls_editor_number_of_bindings">バインドの数</string>
+    <string name="input_controls_editor_select_profile">プロファイルを選択</string>
+    <string name="input_controls_select_style">スタイルを選択</string>
+    <string name="input_controls_style_original">オリジナル</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">スレート</string>
+    <string name="input_controls_style_halo">ハロー</string>
+    <string name="input_controls_style_glint">グリント</string>
+    <string name="input_controls_style_shadow">シャドウ</string>
+    <string name="input_controls_style_reticle">レティクル</string>
+    <string name="input_controls_style_neon">ネオン</string>
+    <string name="input_controls_style_lumina">ルミナ</string>
+    <string name="input_controls_accent_theme">カラーテーマ</string>
+    <string name="input_controls_edit_duplicating_builtin">組み込みプロファイル — 編集可能なコピーを作成しました。</string>
+    <string name="input_controls_editor_profile_name">プロファイル名</string>
+    <string name="input_controls_editor_no_profile_selected">プロファイルが選択されていません</string>
+    <string name="input_controls_editor_no_profile_found">プロファイルが見つかりません</string>
+    <string name="input_controls_editor_tap_to_switch">タップして切り替え</string>
+    <string name="input_controls_editor_confirm_remove_profile">このプロファイルを削除しますか?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">このプロファイルを複製しますか?</string>
+    <string name="input_controls_editor_confirm_reset_profile">このプロファイルを元のレイアウトにリセットしますか? 加えた変更はすべて失われます。</string>
+    <string name="input_controls_editor_profile_reset">プロファイルを元のレイアウトにリセットしました。</string>
+    <string name="input_controls_editor_reset_unavailable">このプロファイルには元のスナップショットがありません。</string>
+    <string name="input_controls_editor_title">操作エディター</string>
+    <string name="input_controls_editor_toggle_switch">トグルスイッチ</string>
+    <string name="input_controls_editor_swipeable">スワイプ可能</string>
+    <string name="input_controls_editor_profile_exported_to">プロファイルのエクスポート先</string>
+    <string name="input_controls_editor_unable_to_import">プロファイルをインポートできません</string>
+    <string name="input_controls_editor_import_profile">プロファイルをインポート</string>
+    <string name="input_controls_editor_download_profile">プロファイルをダウンロード</string>
+    <string name="input_controls_editor_export_profile">プロファイルをエクスポート</string>
+    <string name="input_controls_editor_range">範囲</string>
+    <string name="input_controls_editor_confirm_download_profiles">選択したプロファイルをダウンロードしますか?</string>
+    <string name="input_controls_editor_unable_to_load_list">プロファイル一覧を読み込めません</string>
+    <string name="input_controls_editor_osc_transparency">画面上コントロールの透明度</string>
+    <string name="input_controls_editor_osc_transparency_description">画面上コントロールの透明度を調整します。</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">画面サイズ</string>
+    <string name="container_config_new_env_var">新しい環境変数</string>
+    <string name="container_config_env_vars">環境変数</string>
+    <string name="container_config_processor_affinity">プロセッサアフィニティ</string>
+    <string name="container_config_processor_affinity_32bit">プロセッサアフィニティ (32ビットアプリ)</string>
+    <string name="container_config_audio_driver">オーディオドライバー</string>
+    <string name="container_config_win_components">Win コンポーネント</string>
+    <string name="container_config_drives">ドライブ</string>
+    <string name="container_config_arch">アーキテクチャ</string>
+    <string name="container_config_storage_info">ストレージ情報</string>
+    <string name="container_config_drive_c">ドライブ C:</string>
+    <string name="container_config_cache">キャッシュ</string>
+    <string name="container_config_total">合計</string>
+    <string name="container_config_clear_cache">キャッシュをクリア</string>
+    <string name="container_config_estimated_used_space">推定使用済み容量</string>
+    <string name="settings_containers_error_saving_wallpaper">壁紙の保存中にエラーが発生しました</string>
+    <string name="container_config_directinput_mapper_type">DirectInput マッパーの種類</string>
+    <string name="container_config_title">設定</string>
+    <string name="container_config_startup_selection">起動時の選択</string>
+    <string name="container_config_glibc_exp_edition">ベース</string>
+    <string name="container_config_refresh_rate_default_global">既定 (グローバル)</string>
+    <string name="container_config_enable_dinput">Wine 内のゲームで DInput を有効化</string>
+    <string name="container_config_enable_xinput">Wine 内のゲームで XInput を有効化</string>
+    <string name="container_config_dinput_legacy">レガシー (古いゲームパッド)</string>
+    <string name="container_config_dinput_modern">モダン (Xinput 準拠)</string>
+    <string name="container_config_help_xinput">
+        ゲームがゲームコントローラーのサポートに &lt;i&gt;&lt;b&gt;XInput API&lt;/b&gt;&lt;/i&gt; を利用している場合は、このオプションを有効にしてください。&lt;br/&gt;&lt;br/&gt;
+        このオプションは &lt;i&gt;&lt;b&gt;仮想&lt;/b&gt;&lt;/i&gt; (入力コントロールで提供) と &lt;i&gt;&lt;b&gt;物理&lt;/b&gt;&lt;/i&gt; の両方のゲームコントローラーに影響します。
+    </string>
+    <string name="container_config_help_dinput">
+        ゲームがゲームコントローラーのサポートに &lt;i&gt;&lt;b&gt;DInput API&lt;/b&gt;&lt;/i&gt; を利用している場合は、このオプションを有効にしてください。&lt;br/&gt;&lt;br/&gt;
+        このオプションは &lt;i&gt;&lt;b&gt;仮想&lt;/b&gt;&lt;/i&gt; (入力コントロールで提供) と &lt;i&gt;&lt;b&gt;物理&lt;/b&gt;&lt;/i&gt; の両方のゲームコントローラーに影響します。
+    </string>
+    <string name="container_config_xinput_dinput_warning">一部のゲームは両方の API に対応している場合があります。そのようなゲームで XInput と DInput を同時に有効にすると、The Binding of Isaac や Resident Evil シリーズなどのタイトルで見られるように、操作に問題が生じることがあります。</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32ビットエミュレーター</string>
+    <string name="container_config_emulator_wine_hint">エミュレーターは wine のバージョンによって決まります。ARM64EC は FEXCore、x86_64 は Box64 を使用します。</string>
+    <string name="container_config_label">設定</string>
+    <string name="container_config_restart_required">変更を反映するにはコンテナを再起動してください</string>
+    <string name="container_config_renderer">レンダラー</string>
+    <string name="container_config_variables">変数</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">入力</string>
+    <string name="container_config_tab">設定</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">64ビットエミュレーター</string>
+    <string name="container_config_emulator_section">エミュレーター</string>
+    <string name="container_config_sdl2_compatibility">SDL2 互換性を有効化</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Wine 設定</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">GPU 名</string>
+    <string name="container_wine_offscreen_rendering_mode">オフスクリーンレンダリングモード</string>
+    <string name="container_wine_strict_shader_math">厳密なシェーダー演算</string>
+    <string name="container_wine_video_memory_size">ビデオメモリサイズ</string>
+    <string name="container_wine_dxwrapper">DX ラッパー</string>
+    <string name="container_wine_mouse_warp_override">マウスワープの上書き</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">DXVK バージョン</string>
+    <string name="container_wine_dxvk_config_title">DXVK 設定</string>
+    <string name="container_wine_wined3d_config_title">WineD3D 設定</string>
+    <string name="container_wine_vkd3d_version">VKD3D バージョン</string>
+    <string name="container_wine_version">Wine バージョン</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; は DirectX 1〜11 を OpenGL に変換するレイヤーです。&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; は Direct3D 9〜11 を Vulkan に変換するレイヤーです。&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; は Direct3D 12 API を Vulkan に変換するレイヤーです。&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; は、クラシックゲームとの互換性を高めるための DirectDraw の実装です。
+    </string>
+    <string name="container_wine_enabled_async">Async を有効化</string>
+    <string name="container_wine_enabled_async_cache">Async キャッシュを有効化</string>
+    <string name="container_wine_vkd3d_feature_level">VKD3D 機能レベル</string>
+    <string name="container_wine_ddraw_wrapper">DDraw ラッパー</string>
+    <string name="container_wine_error_not_installed">Wine/Proton パッケージ \'%1$s\' がインストールされておらず、ダウンロードもできませんでした。</string>
+    <string name="container_no_wine_installed">Wine または Proton がインストールされていません。先にいずれかをインストールしてください。</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">サーフェスエフェクト</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Box64 プリセット</string>
+    <string name="container_box64_version">Box64 バージョン</string>
+    <string name="container_box64_stability">安定性</string>
+    <string name="container_box64_compatibility">互換性</string>
+    <string name="container_box64_intermediate">中間</string>
+    <string name="container_box64_performance">パフォーマンス</string>
+    <string name="container_fexcore_performance_tso">パフォーマンス TSO</string>
+    <string name="container_fexcore_extreme">エクストリーム</string>
+    <string name="container_fexcore_extreme_tso">エクストリーム TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Box64 の動的リコンパイラーを有効または無効にします。</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        CALL/RET オペコードでのフラグの処理&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : CALL/RET でフラグが不要であるかのように扱う (高速、不安定)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ほとんどの RET でフラグが必要、ほとんどの CALL では不要&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : すべての CALL/RET でフラグが必要 (低速)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">x86 と同様に -NAN を生成します</string>
+    <string name="box64_env_var_help__dynarec_fastround">正確な x86 の丸めを生成します</string>
+    <string name="box64_env_var_help__dynarec_x87double">x87 エミュレーションに Float/Double を使用します</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec による BigBlock の構築&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ブロックをできるだけ大きく構築しようとしない&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Dynarec ブロックをできるだけ大きく構築する&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Dynarec ブロックをより大きく構築する (ブロックが重なっても継続するが、elf メモリ内のブロックのみ)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Dynarec ブロックをより大きく構築する (ブロックが重なっても継続、すべての種類のメモリで)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Strong Memory モデルのシミュレーション&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : 特別なことは何もしない&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : メモリへの書き込み時に一部のメモリバリアを有効化する (一部の MOV オペコードで)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : 1 のすべてに加え、MOV を使用したメモリへのすべての書き込みでメモリバリアを追加&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : 2 のすべてに加え、メモリからの読み取り時および一部の SSE/SSE2 オペコードでメモリバリアを追加&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : QEMU と同様に x86 TSO を模倣します。
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">ブロック構築時に許可される最大の前方値を定義します</string>
+    <string name="box64_env_var_help__dynarec_callret">CALL/RET オペコードの最適化</string>
+    <string name="box64_env_var_help__dynarec_sep">CALLRET が有効な場合に、CALL/RET を最適化するためのセカンダリエントリポイントを追加します。</string>
+    <string name="box64_env_var_help__dynarec_wait">Dynarec が FillBlock の準備完了を待つかどうかを定義します</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Strong Memory エミュレーションのパフォーマンスへの影響を軽減するためにメモリバリアを調整します&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : 通常の安全なバリアを使用&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : 弱いバリアを使用して緩やかにパフォーマンスを向上&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : 弱いバリアを使用し、さらに最後の書き込みバリアを無効化</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        アライメントされたアトミックのみを生成します (現時点では Arm64 のみで利用可能)。&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : アライメントされていないアトミックの処理コードを生成します。&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : アライメントされたアトミックのみを生成します。これは高速でコードサイズも小さくなりますが、アライメントされたデータアドレスを操作する LOCK プレフィックス付きオペコードで SIGBUS を引き起こします。</string>
+    <string name="box64_env_var_help__dynarec_df">
+        遅延フラグの使用を有効または無効にします。&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : 遅延フラグの使用を無効にします。&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : 遅延フラグの使用を有効にします。</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        保護されておらず、ダーティである可能性のあるブロックの実行継続を許可します。&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : 保護されておらず、ダーティである可能性のあるブロックの実行継続を許可しません。&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : コードと同じページにデータを書き込む dynablock の実行継続を許可します。一部のゲームでは読み込み時間が短縮されることがありますが、予期しないクラッシュが発生する可能性もあります。&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : さらに、HotPage を検出した場合、そのページを NEVERCLEAN としてフラグ付けします。そのため書き込み保護されませんが、そのページから構築されたブロックは常にテストされます。この方法の方が高速になることがあります（ただし一部の SMC ケースがトラップされない場合があります）。</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        ネイティブフラグの使用を有効または無効にします。&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ネイティブフラグを使用しません。&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : 可能な場合はネイティブフラグを使用します。</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        x86 PAUSE エミュレーションを有効にします。スピンロックのパフォーマンス向上に役立つ場合があります。&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : x86 PAUSE 命令を無視します。&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : YIELD を使用して x86 PAUSE 命令をエミュレートします。&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : WFI を使用して x86 PAUSE 命令をエミュレートします。&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : SEVL+WFE を使用して x86 PAUSE 命令をエミュレートします。
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">dynarec ブロックのメタデータを削減してメモリを節約しますが、互換性とのトレードオフがあります。</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">PE の volatile メタデータを使用して、64 ビット Windows ゲームの強力なメモリエミュレーションを誘導します。</string>
+    <string name="box64_env_var_help__dynacache">起動を高速化するため、実行間で生成された dynarec ブロックのキャッシュを制御します。</string>
+    <string name="box64_env_var_help__avx">
+        AVX 機能をゲストに公開します。&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : AVX 拡張を無効にします&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : AVX、BMI1、F16C、VAES 拡張を有効にします。&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : 1 のすべてに加えて、AVX2、BMI2、FMA、ADX、VPCLMULQDQ、RDRAND を有効にします。&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">AES CPU 機能をゲストに公開します。</string>
+    <string name="box64_env_var_help__pclmulqdq">PCLMULQDQ CPU 機能をゲストに公開します。</string>
+    <string name="box64_env_var_help__shaext">SHA 拡張 CPU 機能をゲストに公開します。</string>
+    <string name="box64_env_var_help__sse42">SSE4.2 CPU 機能をゲストに公開します。</string>
+    <string name="box64_env_var_help__sse_flushto0">SSE のフラッシュ・トゥ・ゼロ動作と例外フラグの追跡を制御します。</string>
+    <string name="box64_env_var_help__x87_no80bits">x87 で 80 ビットの long double の代わりに 64 ビットの倍精度を使用します。</string>
+    <string name="box64_env_var_help__cputype">ゲストに公開する Intel または AMD の CPU モデルを選択します。</string>
+    <string name="box64_env_var_help__maxcpu">Box64 がプログラムに提示する CPU の最大数</string>
+    <string name="box64_env_var_help__unityplayer">UnityPlayer を検出し、アプリを Unity ゲームとしてマークします。</string>
+    <string name="box64_env_var_help__unity">アプリを Unity ゲームとしてマークし、Unity 固有の互換性処理を有効にします。</string>
+    <string name="box64_env_var_help__mmap32">すべてのメモリ割り当てを 32 ビットアドレス空間で強制します</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">TSO IR 操作を有効にします（マルチスレッドアプリに必要）。</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">TSO が有効な場合、ベクトルのロード/ストアをアトミックにします。</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">TSO 下で非整列のロード/ストアにハーフバリアアトミックを使用します。</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">TSO 下で REP MOVS / REP STOS をアトミックにします。</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">分割された非整列アトミックアクセスに対して、厳密なプロセス全体のロックを使用します。</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">カーネルが処理する非整列アトミックをバックパッチし、カーネルのコンテキストスイッチを削減します。</string>
+    <string name="fexcore_env_var_help__multiblock">マルチブロックコードコンパイルを有効にします。JIT コンパイルが長くなり、スタッタリングが発生する可能性があります。</string>
+    <string name="fexcore_env_var_help__maxinst">コンパイルされたブロックに格納される命令の最大数。</string>
+    <string name="fexcore_env_var_help__hostfeatures">CPU 機能の強制を制御します。</string>
+    <string name="fexcore_env_var_help__smalltscscale">低周波数システムで TSC をスケーリングします。</string>
+    <string name="fexcore_env_var_help__hidehybrid">ハイブリッド CPU コアレイアウトをゲストから隠します。</string>
+    <string name="fexcore_env_var_help__smc_checks">実行前にコードの変更をチェックします。</string>
+    <string name="fexcore_env_var_help__volatilemetadata">利用可能な場合、PE ファイルの volatile メタデータを TSO に使用します。</string>
+    <string name="fexcore_env_var_help__monohacks">Mono 検出のための特別な SMC + JIT ブロックハック。</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">CPUID のハイパーバイザービットを隠します（これが原因でクラッシュするアプリに有用）。</string>
+    <string name="fexcore_env_var_help__disablel2cache">FEXCore JIT の L2 キャッシュ検索を無効にします。メモリを節約しますが、スタッタリングが発生します。</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">FEXCore JIT の L1 キャッシュを動的サイズに切り替えます。メモリを節約しますが、スタッタリングが発生します。</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">動的 L1 キャッシュを拡大するための毎秒あたりの検索回数のしきい値。</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">動的 L1 キャッシュを縮小するための毎秒あたりの検索回数のしきい値。</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">X87 浮動小数点を 64 ビット精度でエミュレートします。エミュレーションの精度が低下し、レンダリングのバグが発生する可能性があります。</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">FEXCore プリセット</string>
+    <string name="container_fexcore_version">FEXCore バージョン</string>
+    <string name="use_unix_libs">UnixLibs を使用</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">グラフィックスドライバー</string>
+    <string name="container_zink_mode">Zink モード</string>
+    <string name="container_graphics_configuration">グラフィックスドライバー設定</string>
+    <string name="container_graphics_version">グラフィックスドライバーバージョン</string>
+    <string name="container_graphics_available_extensions">利用可能な拡張機能</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d 個有効</string>
+    <string name="container_graphics_max_device_memory">最大デバイスメモリ</string>
+    <string name="container_graphics_sync_frame">毎フレーム同期</string>
+    <string name="container_graphics_disable_present_wait">KHR_present_wait を無効化</string>
+    <string name="container_graphics_present_modes">プレゼントモード</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan ディスプレイ同期</string>
+    <string name="container_graphics_resource_type">メモリリソースタイプ</string>
+    <string name="container_graphics_vulkan_version">Vulkan バージョン</string>
+    <string name="container_graphics_bcn_emulation">BCn エミュレーション</string>
+    <string name="container_graphics_bcn_emulation_type">BCn エミュレーションタイプ</string>
+    <string name="container_graphics_bcn_emulation_cache">BCn エミュレーションキャッシュ</string>
+    <string name="container_graphics_transcoder">BCn トランスコーダー</string>
+    <string name="container_graphics_quality">BCn 品質</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">このプリセットを複製しますか？</string>
+    <string name="container_presets_confirm_remove">このプリセットを削除しますか？</string>
+    <string name="container_presets_title">プリセット</string>
+    <string name="container_presets_preset">プリセット</string>
+    <string name="container_presets_new">新規プリセット</string>
+    <string name="container_presets_rename">プリセット名を変更</string>
+    <string name="container_presets_import">プリセットをインポート</string>
+    <string name="container_presets_custom">カスタム</string>
+    <string name="container_presets_built_in">デフォルト</string>
+    <string name="container_presets_changes_auto_saved">このカスタムプリセットの編集中は変更が自動的に保存されます。</string>
+    <string name="container_presets_cannot_rename">組み込みプリセットの名前は変更できません</string>
+    <string name="container_presets_unable_to_import">プリセットをインポートできません</string>
+    <string name="container_presets_no_description">説明はありません</string>
+    <string name="container_presets_cannot_remove">このプリセットは削除できません</string>
+    <string name="container_presets_cannot_export">このプリセットはエクスポートできません</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">タッチスクリーンをシミュレート</string>
+    <string name="session_xserver_preferences_button_text">   設定   </string>
+    <string name="session_xserver_extra_keys_config_desc">ここでは Termux アプリのように extra-keys 変数の値を設定できます（<a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">こちら</a>を参照）。その他 \n
+例： <i>META キー</i> には <b>META</b>、\n
+<i>ソフトキーボード切り替えキー</i> には <b>KEYBOARD</b>、\n
+<i>設定を開くキー</i> には <b>PREFERENCES</b>、\n
+<i>マウスヘルパー切り替えキー</i> には <b>MOUSE_HELPER</b>、\n
+<i>スタイラスクリックオーバーライドオーバーレイ切り替えキー</i> には <b>STYLUS_HELPER</b>、\n
+<i>アプリケーション終了キー</i> には <b>EXIT</b>。</string>
+    <string name="session_xserver_pref_main">設定</string>
+    <string name="session_xserver_pref_output">出力</string>
+    <string name="session_xserver_pref_pointer">ポインター</string>
+    <string name="session_xserver_pref_kbd">キーボード</string>
+    <string name="session_xserver_pref_other">その他</string>
+    <string name="session_xserver_pref_version">バージョン</string>
+    <string name="session_xserver_notification_description">WinNative XServer メッセージ</string>
+    <string name="session_xserver_notification_content">WinNative が実行中です。この通知を消したりスワイプしたりしないでください</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">キーボード</string>
+    <string name="session_drawer_fps_monitor">FPS モニター</string>
+    <string name="session_drawer_fps_monitor_subtitle">リアルタイムのパフォーマンス統計を表示</string>
+    <string name="session_drawer_dual_series_battery">デュアルシリーズバッテリー</string>
+    <string name="session_drawer_hud_frametime_numeric">フレームタイムを数値で表示</string>
+    <string name="session_drawer_toggle_fullscreen">全画面表示を切り替え</string>
+    <string name="session_drawer_refactor_size">サイズを再調整</string>
+    <string name="session_drawer_show_touchscreen_controls">タッチスクリーンコントロールを表示</string>
+    <string name="session_drawer_magnifier">拡大鏡</string>
+    <string name="session_drawer_logs">ログ</string>
+    <string name="session_drawer_pip_mode">PiP モード</string>
+    <string name="session_drawer_toggle_relative_mouse">相対マウス移動を切り替え</string>
+    <string name="session_drawer_toggle_mouse">マウスを切り替え</string>
+    <string name="session_drawer_pause_resume">一時停止/再開</string>
+    <string name="session_drawer_relative_mouse_movement">相対マウス移動</string>
+    <string name="session_drawer_mouse_input">マウス入力</string>
+    <string name="session_drawer_touch">タッチ</string>
+    <string name="session_drawer_touch_trackpad">トラックパッド</string>
+    <string name="session_drawer_touch_touchscreen">タッチスクリーンモード</string>
+    <string name="session_drawer_touch_map_right_stick">右スティックに割り当て</string>
+    <string name="session_drawer_rts_gestures">RTS ジェスチャー</string>
+    <string name="session_drawer_rts_gestures_edit">編集</string>
+    <string name="session_drawer_right_stick_sensitivity">右スティックの感度</string>
+    <string name="session_rts_action">アクション</string>
+    <string name="session_rts_behavior">動作</string>
+    <string name="session_rts_tap1">1本指タップ</string>
+    <string name="session_rts_tap2">2本指タップ</string>
+    <string name="session_rts_tap3">3本指タップ</string>
+    <string name="session_rts_tap4">4本指タップ</string>
+    <string name="session_rts_double_tap">ダブルタップ（左ダブルクリック）</string>
+    <string name="session_rts_long_press">長押し</string>
+    <string name="session_rts_hold2">2本指ホールド</string>
+    <string name="session_rts_hold3">3本指ホールド</string>
+    <string name="session_rts_hold4">4本指ホールド</string>
+    <string name="session_rts_swipe3">3本指スワイプ</string>
+    <string name="session_rts_swipe4">4本指スワイプ</string>
+    <string name="session_rts_up">上</string>
+    <string name="session_rts_down">下</string>
+    <string name="session_rts_left">左</string>
+    <string name="session_rts_right">右</string>
+    <string name="session_rts_pan">2本指パン</string>
+    <string name="session_rts_pan1">1本指パン</string>
+    <string name="session_rts_zoom">ピンチズーム</string>
+    <string name="session_rts_drag">1本指ドラッグ</string>
+    <string name="session_rts_drag2">2本指ドラッグ</string>
+    <string name="session_rts_long_press_delay">長押し遅延（ms）</string>
+    <string name="session_rts_hold_delay">ホールド遅延（ms）</string>
+    <string name="session_rts_swipe_threshold">スワイプしきい値（px）</string>
+    <string name="session_rts_gesture_threshold">ジェスチャーしきい値（px）</string>
+    <string name="session_rts_double_tap_delay">ダブルタップ遅延（ms）</string>
+    <string name="session_rts_drag_threshold">ドラッグしきい値（px）</string>
+    <string name="session_rts_pan_threshold">パン/ピンチ開始（px）</string>
+    <string name="common_ui_rename">名前を変更</string>
+    <string name="common_ui_new">新規</string>
+    <string name="input_controls_editor_input_profiles_section">入力プロファイル</string>
+    <string name="session_gesture_profile_section">ジェスチャープロファイル</string>
+    <string name="gesture_profile_new">新規ジェスチャープロファイル</string>
+    <string name="gesture_profile_import">ジェスチャープロファイルをインポート</string>
+    <string name="gesture_profile_export">ジェスチャープロファイルをエクスポート</string>
+    <string name="gesture_profile_none">ジェスチャープロファイルなし</string>
+    <string name="session_drawer_screen_effects">スクリーンエフェクト</string>
+    <string name="session_drawer_screen_effects_subtitle">アップスケーリングとカラーエフェクト</string>
+    <string name="session_drawer_super_resolution">スーパーレゾリューション</string>
+    <string name="session_drawer_upscaler_mode">アップスケーラー</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">エッジシャープネス</string>
+    <string name="session_drawer_vivid">ビビッド</string>
+    <string name="session_drawer_vivid_strength">ビビッドの強さ</string>
+    <string name="session_drawer_color_profile">カラーエフェクト</string>
+    <string name="session_drawer_picture_in_picture">ピクチャーインピクチャー</string>
+    <string name="session_drawer_exit_subtitle">実行中のセッションを閉じる</string>
+    <string name="session_drawer_touchscreen_overlay">タッチスクリーンオーバーレイ</string>
+    <string name="session_drawer_resume">再開</string>
+    <string name="session_drawer_retry">再試行</string>
+    <string name="downloads_no_internet">インターネット接続がありません</string>
+    <string name="session_drawer_pause">一時停止</string>
+    <string name="session_drawer_wine_processes_paused">Wine プロセスが一時停止しています</string>
+    <string name="session_drawer_pause_all_wine_processes">すべての Wine プロセスを一時停止</string>
+    <string name="session_drawer_controls_section">コントロール</string>
+    <string name="session_drawer_session_section">セッション</string>
+    <string name="session_drawer_header_subtitle">コントロール、オーバーレイ、セッションツールへのクイックアクセス</string>
+    <string name="session_drawer_swipe_hint">スワイプで消してゲームに戻る</string>
+    <string name="session_drawer_main_menu_title">メニュー</string>
+    <string name="session_drawer_hud_summary">オーバーレイの表示とデータポイントを調整</string>
+    <string name="session_drawer_hud_disabled_hint">オーバーレイをカスタマイズするにはオンにしてください</string>
+    <string name="session_drawer_hud_alpha">アルファ</string>
+    <string name="session_drawer_hud_background_alpha">背景アルファ</string>
+    <string name="session_drawer_hud_background">背景</string>
+    <string name="session_drawer_hud_scale">スケール</string>
+    <string name="session_drawer_hud_elements">HUD 要素</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">グラフ</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango風HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD設定</string>
+    <string name="mango_hud_element_gpu_load">GPU使用率</string>
+    <string name="mango_hud_element_gpu_temp">GPU温度</string>
+    <string name="mango_hud_element_cpu_load">CPU使用率</string>
+    <string name="mango_hud_element_cpu_temp">CPU温度</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">バッテリー</string>
+    <string name="mango_hud_element_lows" formatted="false">1% Low</string>
+    <string name="mango_hud_element_graph">フレームタイムグラフ</string>
+    <string name="mango_hud_element_engine">エンジン</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPUクロック</string>
+    <string name="mango_hud_element_gpu_clock">GPUクロック</string>
+    <string name="mango_hud_element_cores">コア別</string>
+    <string name="mango_hud_element_network">ネットワーク</string>
+    <string name="mango_hud_element_swap">スワップ</string>
+    <string name="mango_hud_element_resolution">解像度</string>
+    <string name="mango_hud_element_wine">Wineバージョン</string>
+    <string name="mango_hud_element_duration">セッション時間</string>
+    <string name="mango_hud_element_clock">時計</string>
+    <string name="mango_hud_element_throttle">サーマル状態</string>
+    <string name="mango_hud_group_memory">メモリ</string>
+    <string name="mango_hud_group_system">システム</string>
+    <string name="mango_hud_lock">HUDをロック</string>
+    <string name="mango_hud_lock_subtitle">タッチをHUD背後のコントロールに通します。HUDを長押しするとロックします。 (5s)</string>
+    <string name="hud_position_menu_title">HUD の移動先</string>
+    <string name="hud_position_top_left">左上</string>
+    <string name="hud_position_top_center">上中央</string>
+    <string name="hud_position_top_right">右上</string>
+    <string name="hud_position_left_center">左中央</string>
+    <string name="hud_position_right_center">右中央</string>
+    <string name="hud_position_bottom_left">左下</string>
+    <string name="hud_position_bottom_center">下中央</string>
+    <string name="hud_position_bottom_right">右下</string>
+    <string name="session_drawer_hud_alpha_input_title">アルファを設定</string>
+    <string name="session_drawer_hud_background_alpha_input_title">背景アルファを設定</string>
+    <string name="session_drawer_hud_scale_input_title">スケールを設定</string>
+    <string name="session_drawer_hud_input_hint">%1$d から %2$d までの値を入力してください。上限を超える値は制限されます。</string>
+    <string name="session_drawer_command_center">コマンドセンター</string>
+    <string name="session_drawer_command_center_input">入力</string>
+    <string name="session_drawer_command_center_display">ディスプレイ</string>
+    <string name="session_drawer_command_center_system">システム</string>
+    <string name="session_drawer_fps_limiter">FPS リミッター</string>
+    <string name="session_drawer_fps_limiter_off">オフ</string>
+    <string name="session_drawer_color_profile_disabled">無効</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">ナチュラル</string>
+    <string name="session_drawer_color_profile_crt">CRT エフェクト</string>
+    <string name="session_drawer_color_profile_toon">トゥーン</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">明るさ</string>
+    <string name="session_drawer_contrast">コントラスト</string>
+    <string name="session_drawer_gamma">ガンマ</string>
+    <string name="session_drawer_scale">スケール</string>
+    <string name="session_drawer_scale_nearest">ニアレスト</string>
+    <string name="session_drawer_scale_linear">リニア</string>
+    <string name="session_drawer_scale_bicubic">バイキュービック</string>
+    <string name="session_drawer_saturation">彩度</string>
+    <string name="session_drawer_temperature">色温度</string>
+    <string name="session_drawer_tint">色合い</string>
+    <string name="session_drawer_sharpen">シャープ化</string>
+    <string name="session_drawer_scanlines">スキャンライン</string>
+    <string name="session_drawer_pixelate">ピクセル化</string>
+    <string name="session_drawer_block_size">ブロックサイズ</string>
+    <string name="session_drawer_strength">強さ</string>
+    <string name="session_drawer_intensity">強度</string>
+    <string name="session_drawer_color_blind">色覚補正</string>
+    <string name="session_drawer_color_blind_protan">1型（赤）</string>
+    <string name="session_drawer_color_blind_deutan">2型（緑）</string>
+    <string name="session_drawer_color_blind_tritan">3型（青）</string>
+    <string name="session_drawer_reset_effects">エフェクトをリセット</string>
+    <string name="session_drawer_calibrate_advanced">詳細キャリブレーション</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">ジャイロ</string>
+    <string name="session_drawer_rail_label_effects">エフェクト</string>
+    <string name="session_drawer_rail_label_output">出力</string>
+    <string name="session_drawer_rail_label_apps">その他</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">外部ディスプレイを検出</string>
+    <string name="display_output_prompt_message">接続されたディスプレイにゲームを送信しますか？画面上のコントロールとメニューはこのスマートフォンに残ります。</string>
+    <string name="display_output_prompt_swap">ディスプレイを切り替え</string>
+    <string name="display_output_prompt_mirror">ミラーリング</string>
+    <string name="display_output_swapped_toast">ゲームを外部ディスプレイに移動しました。コントロールはスマートフォンに残ります。</string>
+    <string name="display_output_cast_unavailable">このデバイスではワイヤレスディスプレイ設定を利用できません。</string>
+    <string name="display_output_restored_toast">外部ディスプレイが切断されました — ゲームはスマートフォンに戻りました。</string>
+    <string name="session_drawer_output_title">ディスプレイ出力</string>
+    <string name="session_drawer_output_subtitle">ゲームは外部ディスプレイに表示されています。</string>
+    <string name="session_drawer_output_device">接続中のディスプレイ</string>
+    <string name="session_drawer_output_resolution">解像度</string>
+    <string name="session_drawer_output_refresh_rate">リフレッシュレート</string>
+    <string name="session_drawer_output_aspect_ratio">アスペクト比</string>
+    <string name="session_drawer_output_aspect_fit">フィット（アスペクト比維持）</string>
+    <string name="session_drawer_output_aspect_stretch">ストレッチ（全面表示）</string>
+    <string name="session_drawer_output_aspect_zoom">ズーム（切り抜き）</string>
+    <string name="session_drawer_output_return_to_phone">スマートフォンに戻す</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">テレビにキャスト</string>
+    <string name="session_drawer_output_cast_body">USB-C / HDMI アダプターを接続するか、下をタップしてワイヤレスディスプレイ（Miracast / Wi-Fi Direct）に接続します。ゲームはテレビに表示され、これらのコントロールはスマートフォンに残ります。</string>
+    <string name="session_drawer_output_cast_button">ワイヤレスディスプレイに接続</string>
+    <string name="session_drawer_output_cast_note">Chromecast専用テレビでは、プライベートコントロールを使ったライブゲームプレイを表示できません — 最良の結果を得るにはワイヤレスディスプレイまたは USB-C/HDMI アダプターを使用してください。</string>
+    <string name="session_drawer_output_render_note">ディスプレイが報告するモードは実際の出力を切り替えます（再初期化中は一時的に黒画面になることがあります）。その他の解像度はそのサイズでレンダリングされ、ハードウェアでパネルにスケーリングされます — ネイティブより高いと鮮明になり（スーパーサンプリング）、低いと高速に動作します。</string>
+    <string name="session_drawer_output_scaling_note">このスマートフォンはネイティブの %1$s でディスプレイを出力し、モードを切り替えないため、これはレンダリング解像度を設定します — ハードウェアでパネルにスケーリングされます（ネイティブより高いと鮮明に、低いと高速に動作します）。</string>
+    <string name="session_drawer_output_game_mode">ゲームモード（低遅延）</string>
+    <string name="session_drawer_output_game_mode_on">オン</string>
+    <string name="session_drawer_output_game_mode_off">オフ</string>
+    <string name="session_drawer_output_game_mode_note">テレビの低遅延／ゲームモード（HDMI ALLM）を要求し、入力遅延を最小限に抑えます。接続中のディスプレイが対応している場合のみ表示されます。</string>
+    <string name="session_drawer_output_send_to_display">ディスプレイにゲームを送信</string>
+    <string name="session_drawer_output_to_display">外部ディスプレイに出力</string>
+    <string name="session_drawer_output_send_note">ディスプレイが接続されています。ゲームをそこに送信できます — コントロールとメニューはこのスマートフォンに残ります。いつでもここに戻せます。</string>
+    <string name="session_drawer_output_display">ディスプレイ</string>
+    <string name="session_drawer_output_glasses">グラス</string>
+    <string name="session_drawer_output_brightness">明るさ</string>
+    <string name="session_drawer_output_shade">シェード（減光）</string>
+    <string name="session_drawer_output_3d">3D（サイドバイサイド）</string>
+    <string name="glasses_panel_refresh">リフレッシュレート</string>
+    <string name="glasses_panel_sunblock">サンブロック</string>
+    <string name="session_drawer_output_volume">音量</string>
+    <string name="session_drawer_output_glasses_note">USB経由でお使いの Viture グラスに直接送信されます。</string>
+    <string name="session_drawer_rail_label_keyboard">キーボード</string>
+    <string name="session_drawer_rail_label_input_controls">コントロール</string>
+    <string name="session_drawer_rail_label_relative_mouse">相対マウス</string>
+    <string name="session_drawer_rail_label_mouse">マウス</string>
+    <string name="session_drawer_rail_label_fullscreen">全画面</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">ズーム</string>
+    <string name="session_drawer_rail_label_task_manager">タスク</string>
+    <string name="session_drawer_rail_label_record">録画</string>
+    <string name="session_drawer_rail_label_logs">ログ</string>
+    <string name="session_record_started">録画を開始しました</string>
+    <string name="session_record_saved">録画を WinNative/Recordings に保存しました</string>
+    <string name="session_record_failed">録画を開始できませんでした</string>
+    <string name="session_record_settings_title">録画設定</string>
+    <string name="session_record_fps">フレームレート</string>
+    <string name="session_record_resolution">解像度</string>
+    <string name="session_record_quality">画質</string>
+    <string name="session_record_include_ui">UIを録画</string>
+    <string name="session_record_include_ui_subtitle">HUDと画面上のコントロールを含める</string>
+    <string name="session_record_now">今すぐ録画</string>
+    <string name="session_drawer_logs_clear">クリア</string>
+    <string name="session_drawer_logs_pause">一時停止</string>
+    <string name="session_drawer_logs_resume">再開</string>
+    <string name="session_drawer_logs_paused_indicator">一時停止中</string>
+    <string name="session_drawer_logs_line_count">%1$d 行</string>
+    <string name="session_drawer_logs_share">共有</string>
+    <string name="session_drawer_logs_share_subject">セッションログ</string>
+    <string name="session_drawer_logs_share_chooser">セッションログを共有</string>
+    <string name="session_drawer_logs_share_failed">ログの共有に失敗しました</string>
+    <string name="session_drawer_logs_share_empty">共有するログ行がありません</string>
+    <string name="session_gyroscope_activator">アクティベーター</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">このプロセスを終了しますか？</string>
+    <string name="session_task_title">タスクマネージャー</string>
+    <string name="session_task_process_name">プロセス名</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">メモリ</string>
+    <string name="session_task_end_process">プロセスを終了</string>
+    <string name="session_task_set_affinity">アフィニティを設定</string>
+    <string name="session_task_affinity_title">プロセッサアフィニティ</string>
+    <string name="session_task_affinity_all_cores">全コア</string>
+    <string name="session_task_new_task">新しいタスク</string>
+    <string name="session_task_bring_to_front">最前面に表示</string>
+    <string name="session_task_custom_value">カスタム値</string>
+    <string name="session_task_processes">プロセス</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">コアごとの使用率</string>
+    <string name="session_task_core_label">コア %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d コア</item>
+        <item quantity="other">%d コア</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">向き</string>
+    <string name="session_display_horizontal">横</string>
+    <string name="session_display_vertical">縦</string>
+    <string name="session_display_columns">列</string>
+    <string name="session_display_frame_rate">フレームレート</string>
+    <string name="session_display_title">ディスプレイ</string>
+    <string name="session_display_fullscreen_stretched">全画面を有効にする（ストレッチ）</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">レンダラー:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB 使用中 / %2$s 合計</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">このコントローラーを削除しますか？</string>
+    <string name="session_gamepad_external_controllers">外部コントローラー</string>
+    <string name="session_gamepad_press_any_button">コントローラーのいずれかのボタンを押してください</string>
+    <string name="session_gamepad_bindings">割り当て</string>
+    <string name="session_gamepad_control_bindings">コントロールの割り当て</string>
+    <string name="session_gamepad_game_controller">ゲームコントローラー</string>
+    <string name="session_gamepad_as_button">ボタンとして</string>
+    <string name="session_gamepad_as_axis">軸として</string>
+    <string name="session_gamepad_trigger_type">タイプ</string>
+    <string name="session_gamepad_help_trigger_mode">お使いの &lt;b&gt;物理コントローラー&lt;/b&gt; によって異なります:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;軸として&lt;/b&gt; — トリガーは直線的な可動範囲を持ちます&lt;br/&gt;&#x2022; &lt;b&gt;ボタンとして&lt;/b&gt; — トリガーは単純なスイッチとして動作します&lt;br/&gt;&lt;br/&gt;&lt;i&gt;注: リニアトリガーで「ボタンとして」を使用するとアナログデータが失われます。&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">ボタン A</string>
+    <string name="session_gamepad_button_b">ボタン B</string>
+    <string name="session_gamepad_button_x">ボタン X</string>
+    <string name="session_gamepad_button_y">ボタン Y</string>
+    <string name="session_gamepad_button_grip">グリップボタン</string>
+    <string name="session_gamepad_button_trigger">トリガーボタン</string>
+    <string name="session_gamepad_thumbstick_left">スティック左</string>
+    <string name="session_gamepad_thumbstick_right">スティック右</string>
+    <string name="session_gamepad_thumbstick_up">スティック上</string>
+    <string name="session_gamepad_thumbstick_down">スティック下</string>
+    <string name="session_gamepad_configure_analog_sticks">アナログスティックを設定</string>
+    <string name="session_gamepad_left_stick">左スティック</string>
+    <string name="session_gamepad_right_stick">右スティック</string>
+    <string name="session_gamepad_controller_manager">コントローラーマネージャー</string>
+    <string name="session_gamepad_enable_vibration">振動を有効にする</string>
+    <string name="session_gamepad_player_1">プレイヤー 1</string>
+    <string name="session_gamepad_player_2">プレイヤー 2</string>
+    <string name="session_gamepad_player_3">プレイヤー 3</string>
+    <string name="session_gamepad_player_4">プレイヤー 4</string>
+    <string name="session_gamepad_not_assigned">未割り当て</string>
+    <string name="session_gamepad_assign">割り当て</string>
+    <string name="session_gamepad_press_any_button_for_player">次のプレイヤーのコントローラーでいずれかのボタンを押してください：</string>
+    <string name="session_gamepad_vibrate">振動</string>
+    <string name="session_gamepad_macros_hint">ボタンを切り替えて連射を有効にします。</string>
+    <string name="session_gamepad_macros">マクロ</string>
+    <string name="session_gamepad_include_triggers_note">L2/R2 にもデジタル押下としてターボを適用</string>
+    <string name="session_gamepad_square_deadzone">スクエアデッドゾーン</string>
+    <string name="session_gamepad_invert_x">X軸を反転</string>
+    <string name="session_gamepad_invert_y">Y軸を反転</string>
+    <string name="session_gamepad_save_profile">プロファイルを保存</string>
+    <string name="session_gamepad_load_profile">プロファイルを読み込み</string>
+    <string name="session_gamepad_button_start">ボタン Start</string>
+    <string name="session_gamepad_button_select">ボタン Select</string>
+    <string name="session_gamepad_button_l1">ボタン L1</string>
+    <string name="session_gamepad_button_r1">ボタン R1</string>
+    <string name="session_gamepad_button_l2">ボタン L2</string>
+    <string name="session_gamepad_button_r2">ボタン R2</string>
+    <string name="session_gamepad_button_l3">ボタン L3</string>
+    <string name="session_gamepad_button_r3">ボタン R3</string>
+    <string name="session_gamepad_dpad_up">十字キー上</string>
+    <string name="session_gamepad_dpad_down">十字キー下</string>
+    <string name="session_gamepad_dpad_left">十字キー左</string>
+    <string name="session_gamepad_dpad_right">十字キー右</string>
+    <string name="session_gamepad_overwrite">上書き</string>
+    <string name="session_gamepad_save_as_new">新規として保存</string>
+    <string name="session_gamepad_overwrite_profile_message">現在のプロファイルを上書きしますか、それとも新しいプロファイルとして保存しますか？</string>
+    <string name="session_gamepad_enter_profile_name">プロファイル名を入力</string>
+    <string name="session_gamepad_mappings_saved">マッピングを保存しました！</string>
+    <string name="session_gamepad_profile_saved">プロファイルを保存しました！</string>
+    <string name="session_gamepad_profile_saved_as_new">プロファイルを新規として保存しました！</string>
+    <string name="session_gamepad_profile_loaded">プロファイルを読み込みました！</string>
+    <string name="session_gamepad_profile_name_empty">プロファイル名を空にすることはできません</string>
+    <string name="session_gamepad_no_profiles">-- プロファイルなし --</string>
+    <string name="session_gamepad_error_loading_profile">プロファイルの読み込みエラー</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">タッチスクリーンコントロール</string>
+    <string name="input_controls_auto_hide_on_controller_title">コントローラー接続時に自動的に隠す</string>
+    <string name="input_controls_auto_hide_on_controller_summary">コントローラーが接続されているときにタッチスクリーンコントロールを隠す</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">ジャイロスコープ</string>
+    <string name="session_gyroscope_calibrate">ジャイロスコープをキャリブレーション</string>
+    <string name="session_gyroscope_enable_right_stick">右スティックのジャイロ操作を有効にする</string>
+    <string name="session_gyroscope_activator_button">ジャイロスコープ起動ボタン</string>
+    <string name="session_gyroscope_hold">長押し</string>
+    <string name="session_gyroscope_toggle">切り替え</string>
+    <string name="session_gyroscope_orientation_mode">傾けて照準（向き）</string>
+    <string name="session_gyroscope_x_sensitivity">X軸の感度</string>
+    <string name="session_gyroscope_y_sensitivity">Y軸の感度</string>
+    <string name="session_gyroscope_smoothing">スムージング</string>
+    <string name="session_gyroscope_invert_x">X軸を反転</string>
+    <string name="session_gyroscope_invert_y">Y軸を反転</string>
+    <string name="session_gyroscope_filtering">フィルタリング</string>
+    <string name="session_gyroscope_deadzone">デッドゾーン</string>
+    <string name="session_gyroscope_sensitivity">感度</string>
+    <string name="session_gyroscope_direction">方向</string>
+    <string name="session_gyroscope_mode">ジャイロスコープ起動モード</string>
+    <string name="session_gyroscope_target_stick">ジャイロの適用先</string>
+    <string name="session_gyroscope_enable_stick">アナログスティックのジャイロ操作を有効にする</string>
+    <string name="session_gyroscope_reset_stick">スティックをリセット</string>
+    <string name="session_gyroscope_reset_stick_to_center">スティックを中央にリセット</string>
+    <string name="session_gyroscope_configuration">ジャイロスコープの設定</string>
+    <string name="session_gyroscope_experimental_mouse_movement">実験的なマウス操作</string>
+    <string name="session_gyroscope_x_sensitivity_format">X感度: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Y感度: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">スムージング: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">デッドゾーン: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">感度: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">マウススケール</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">マウススケール: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">カーソル速度</string>
+    <string name="settings_general_theme">テーマ</string>
+    <string name="settings_general_background">背景</string>
+    <string name="settings_general_background_color_hex">色（16進数）</string>
+    <string name="settings_general_wallpaper_selected">壁紙を選択しました</string>
+    <string name="settings_general_select_wallpaper">壁紙を選択</string>
+    <string name="settings_general_title">一般</string>
+    <string name="settings_general_enable_file_provider">ファイルプロバイダーを有効にする</string>
+    <string name="settings_general_enable_auto_scraping">アートワークの自動取得を有効にする</string>
+    <string name="settings_general_take_effect_next_startup">このオプションは次回起動時に有効になります。</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Imagefs を再インストール</string>
+    <string name="settings_general_confirm_reinstall_imagefs">imagefs を再インストールしますか？この操作はシステムファイルを復元しますが、コンテナは変更されません。</string>
+    <string name="settings_general_refresh_rate">リフレッシュレート</string>
+    <string name="settings_general_refresh_rate_auto_max">最大</string>
+    <string name="settings_general_refresh_rate_summary">ディスプレイのリフレッシュレートと DXVK のフレーム上限を設定します</string>
+    <string name="settings_general_touchscreen_timeout">タッチスクリーンのタイムアウト（再起動が必要）</string>
+    <string name="settings_general_touchscreen_haptics">タッチスクリーンの触覚フィードバックを有効にする</string>
+    <string name="settings_general_open_with_android_browser">Wine で Android ブラウザを開く</string>
+    <string name="settings_general_share_android_clipboard">Android のクリップボードを Wine と共有</string>
+    <string name="settings_general_paths_title">パス設定</string>
+    <string name="settings_general_paths_summary">Winlator が作業データを保存する場所とエクスポートしたショートカットの書き込み先を管理します。</string>
+    <string name="settings_general_winlator_path_title">ストレージパス</string>
+    <string name="settings_general_shortcut_export_path_title">ショートカットのエクスポートパス</string>
+    <string name="settings_general_choose_path">パスを選択</string>
+    <string name="settings_general_xserver_cursor_summary">XServer セッション内でのタッチ、トラックパッド、マウス入力のポインター速度を調整します。</string>
+    <string name="settings_general_cursor_lock_title">真のマウス制御</string>
+    <string name="settings_general_cursor_lock_summary">生のポインター入力を必要とするゲームのために、直接マウスキャプチャを有効なままにします。音量ダウンで無効にできます。</string>
+    <string name="settings_general_xinput_toggle_title">XInput を無効にする</string>
+    <string name="settings_general_xinput_toggle_summary">マウスとキーボードを排他的に制御したいときに XInput 処理をオフにします。</string>
+    <string name="settings_external_display_output_summary">この画面をミラーリングする代わりに、接続された外部ディスプレイにゲームを移動します。グラスは常に独自のディスプレイを使用します。</string>
+    <string name="settings_general_file_provider_summary">WinNative のファイルを Android のドキュメントピッカーやファイルマネージャーに公開します。</string>
+    <string name="settings_general_auto_scraping_summary">WinNative がカスタムゲームのアートワークを自動的に取得できるようにします。</string>
+    <string name="settings_general_open_browser_summary">対応する Web リンクを Wine 内ではなく Android のブラウザで開きます。</string>
+    <string name="settings_general_clipboard_summary">Android と Wine セッション間でのコピー＆ペーストを許可します。</string>
+    <string name="settings_general_imagefs_summary">既存のコンテナを削除せずに、同梱のシステムファイルを復元します。</string>
+    <string name="settings_general_check_for_updates">更新を確認</string>
+    <string name="settings_general_check_for_updates_summary">起動時および定期的に、アプリの新しいバージョンを自動的に確認します。</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI サウンドフォント</string>
+    <string name="settings_audio_sound">サウンド</string>
+    <string name="settings_audio_confirm_remove_sound_font">このサウンドフォントを削除しますか？</string>
+    <string name="settings_audio_sound_font_removed_success">サウンドフォントを削除しました！</string>
+    <string name="settings_audio_sound_font_removed_failed">サウンドフォントの削除に失敗しました！</string>
+    <string name="settings_audio_sound_font_installed_success">サウンドフォントをインストールしました！</string>
+    <string name="settings_audio_sound_font_installed_failed">サウンドフォントのインストールに失敗しました！</string>
+    <string name="settings_audio_sound_font_already_exist">インストールしようとしているサウンドフォントは既に存在します。</string>
+    <string name="settings_audio_unable_to_install_soundfont">サウンドフォントをインストールできません</string>
+    <string name="settings_audio_installing_soundfont">サウンドフォントをインストール中</string>
+    <string name="settings_audio_sound_font_bad_format">サウンドフォントの形式が不正です。</string>
+    <string name="settings_audio_cannot_remove_default">既定のサウンドフォントは削除できません</string>
+    <string name="settings_audio_summary">MIDI 再生に使用するサウンドフォントのインストール、削除、選択を行います。</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Wine デバッグチャンネル</string>
+    <string name="settings_debug_title">デバッグ</string>
+    <string name="settings_debug_wine_logs_title">Wine デバッグログを有効化</string>
+    <string name="settings_debug_wine_logs_subtitle">Wine のデバッグ出力をファイルに書き込みます</string>
+    <string name="settings_debug_box_logs_title">Box86/64 ログを有効化</string>
+    <string name="settings_debug_box_logs_subtitle">Box86 &amp; Box64 のデバッグ出力をファイルに書き込みます</string>
+    <string name="settings_debug_fex_logs_title">FEXCore ログを有効化</string>
+    <string name="settings_debug_fex_logs_subtitle">FEXCore のデバッグ出力をファイルに書き込みます</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX エミュレーションログ</string>
+    <string name="settings_debug_emulator_logs_subtitle">コンテナが使用しているエミュレーターのログをファイルに書き込みます。</string>
+    <string name="settings_debug_steam_logs_title">Steam ログを有効化</string>
+    <string name="settings_debug_steam_logs_subtitle">デバッグ用に Steam の認証とセッションイベントを記録します。</string>
+    <string name="settings_debug_wine_channels_title">Wine デバッグチャンネル</string>
+    <string name="settings_debug_wine_channels_summary">Wine デバッグログを有効にしたときに含める Wine チャンネルを選択します。</string>
+    <string name="settings_debug_wine_classes_title">Wine ログレベル</string>
+    <string name="settings_debug_wine_classes_summary">記録するメッセージの種類を選択します。Trace は非常に詳細です。</string>
+    <string name="settings_debug_input_logs">入力ログ</string>
+    <string name="settings_debug_input_logs_description">ゲームパッド、タッチ、キーボードの入力イベントを記録します</string>
+    <string name="settings_debug_download_logs">ダウンロードログ</string>
+    <string name="settings_debug_download_logs_description">ダウンロードリゾルバーと WinNative フォールバックのイベントを記録します</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan 検証レイヤー</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">適用するにはディスプレイを再起動してください。</string>
+    <string name="settings_debug_share_logs">ログを共有</string>
+    <string name="settings_debug_delete_logs">ログを削除</string>
+    <string name="settings_debug_share_all_logs_short">すべて共有</string>
+    <string name="settings_debug_download_all_logs_short">すべてダウンロード</string>
+    <string name="settings_debug_logs_saved">%1$s に保存しました</string>
+    <string name="settings_debug_delete_logs_short">削除</string>
+    <string name="settings_debug_delete_all_logs_short">すべて削除</string>
+    <string name="settings_debug_open_logs_folder_short">ログマネージャーを開く</string>
+    <string name="settings_debug_logs_deleted">ログを削除しました</string>
+    <string name="settings_debug_delete_logs_confirm_title">ログを削除しますか？</string>
+    <string name="settings_debug_delete_logs_confirm_message">保存済みのすべてのログファイル（%1$s）を完全に削除します。この操作は元に戻せません。</string>
+    <string name="settings_debug_logs_browser_title">ログ</string>
+    <string name="settings_debug_log_truncated">このログの末尾 %1$s を表示中</string>
+    <string name="settings_debug_logs_subject">WinNative ログ（%1$s）</string>
+    <string name="settings_debug_no_logs_available">利用可能なデバッグログがありません。先にデバッグオプションを有効にしてゲームを起動してください。</string>
+    <string name="settings_debug_capture_failed">ログの取得に失敗しました: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">WinNative プロセスのエラー、警告、クラッシュをファイルに記録します</string>
+    <string name="settings_debug_section_emulation">エミュレーション</string>
+    <string name="settings_debug_section_subsystems">サブシステム</string>
+    <string name="settings_debug_section_tools">ツール</string>
+    <string name="settings_debug_no_channels_selected">チャンネルが選択されていません</string>
+    <string name="settings_debug_no_channels_available">利用可能なチャンネルがありません</string>
+    <string name="settings_debug_channel_toggle_hint">タップしてチャンネルを切り替えます。有効なチャンネルは Wine デバッグ出力に含まれます。</string>
+    <string name="settings_debug_remove_channel_desc">%1$s を削除</string>
+
+    <string name="settings_other_language_title">言語</string>
+    <string name="settings_other_language_summary">表示言語を選択します</string>
+    <string name="settings_other_language_system_default">システムの既定</string>
+    <string name="settings_other_game_language_title">ゲームの言語</string>
+    <string name="settings_other_game_language_summary">Steam/Epic/GOG のダウンロードで優先する言語</string>
+
+    <string name="settings_other_section_integration">連携</string>
+    <string name="settings_other_setup_wizard_title">セットアップウィザード</string>
+    <string name="settings_other_setup_wizard_summary">セットアップウィザードを再度開いて、権限、システムファイル、既定のコンテナを確認します。</string>
+    <string name="settings_other_checking_for_updates">更新を確認中…</string>
+    <string name="settings_other_update_check_cooldown">再度確認するまで %1$d 秒お待ちください</string>
+    <string name="settings_other_persistable_permission_failed">永続的な権限を取得できません: %1$s</string>
+    <string name="settings_other_keep_app_open">完了するまでアプリを開いたままにしてください。</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">コンテンツをインストール</string>
+    <string name="settings_content_type">カテゴリ</string>
+    <string name="settings_content_components">コンポーネント</string>
+    <string name="settings_content_auto_create_container">コンテナを自動作成</string>
+    <string name="settings_content_remove_title">コンポーネントを削除しますか？</string>
+    <string name="settings_content_empty_subtitle">パッケージをインストールするか、種類を切り替えて開始してください。</string>
+    <string name="settings_content_container_created">コンテナを作成しました: %1$s</string>
+    <string name="settings_content_download_failed">ダウンロードに失敗しました。</string>
+    <string name="common_ui_working">処理中</string>
+    <string name="settings_content_desc_wine">Wine プロジェクトによる開発。Win32 の呼び出しをネイティブの Linux/Android サービスに変換します。</string>
+    <string name="settings_content_desc_proton">Valve による開発。Windows ゲーム向けのパッチを備えた Wine ベースのランタイムです。</string>
+    <string name="settings_content_desc_dxvk">Direct3D 9、10、11 のグラフィックス呼び出しを Vulkan に変換します。</string>
+    <string name="settings_content_desc_vkd3d">Direct3D 12 のグラフィックス呼び出しを Vulkan に変換します。</string>
+    <string name="settings_content_desc_box64">x86_64 の Linux コードを ARM64 デバイスで実行できるように変換します。</string>
+    <string name="settings_content_desc_wowbox64">64 ビット Wine 内で 32 ビット Windows アプリを実行するために WoW64 が使用する Box64 ビルドです。</string>
+    <string name="settings_content_desc_fexcore">x86 および x86_64 のコードを ARM64 デバイスで実行できるように変換します。</string>
+    <string name="settings_content_desc_d7vk">DirectDraw（Direct3D 7 以前）のグラフィックス呼び出しを Vulkan に変換します。</string>
+    <string name="settings_content_unable_to_install">コンテンツをインストールできません。</string>
+    <string name="settings_content_install_failed">インストールに失敗しました</string>
+    <string name="settings_content_file_cannot_be_recognized">ファイルを認識できません。</string>
+    <string name="settings_content_profile_not_found">コンテンツ内にプロファイルが見つかりません。</string>
+    <string name="settings_content_profile_cannot_be_recognized">プロファイルを認識できません</string>
+    <string name="settings_content_file_list">ファイル一覧</string>
+    <string name="settings_content_install_directory">インストール先ディレクトリ</string>
+    <string name="settings_content_installed_success">コンテンツをインストールしました！</string>
+    <string name="settings_content_downloading_title">コンテンツをダウンロード中</string>
+    <string name="settings_content_installing_title">コンテンツをインストール中</string>
+    <string name="settings_content_extracting_title">コンテンツを展開中</string>
+    <string name="settings_content_extracting_detail">展開中（%1$d ファイル）</string>
+    <string name="settings_content_preparing_package">パッケージを準備中</string>
+    <string name="settings_content_download_complete">ダウンロード完了</string>
+    <string name="settings_content_already_installed_title">コンポーネントは既にインストール済み</string>
+    <string name="settings_content_already_installed_message">このコンポーネントは既にインストールされています。再度ダウンロードする前に、インストール済みのコピーを削除してください。
+
+インストール先:
+%1$s</string>
+    <string name="settings_content_conflicting_title">競合するコンテンツがインストール済み</string>
+    <string name="settings_content_conflicting_message">このパッケージをダウンロードする前に、競合するコンテンツをアンインストールしてください。
+
+インストール先:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">コンテンツを信頼できません。</string>
+    <string name="settings_content_is_incomplete">コンテンツが不完全です。</string>
+    <string name="settings_content_untrusted_files_warning">警告: 追加コンテンツには信頼できないファイルが含まれています。通常、以下のファイルは変更すべきではありません。インストールを続行するかどうか判断してください。</string>
+    <string name="settings_content_confirm_remove">コンポーネントをデバイスから削除します。</string>
+    <string name="settings_content_unable_to_remove_in_use">現在この Wine を使用しているコンテナがあるため、このコンテンツを削除できません。</string>
+    <string name="settings_content_download_in_components">ダウンロードされていません。コンポーネントで 1 つダウンロードしてください。</string>
+    <string name="settings_content_types_header">コンテンツの種類</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">ドライバー</string>
+    <string name="settings_drivers_manager_header">ドライバーマネージャー</string>
+    <string name="settings_drivers_github_repos">GitHub リポジトリ</string>
+    <string name="settings_drivers_install">ドライバーをインストール</string>
+    <string name="settings_drivers_installed_success">ドライバーをインストールしました。</string>
+    <string name="settings_drivers_install_failed">ドライバーのインストールに失敗しました。</string>
+    <string name="settings_drivers_remove_title">ドライバーを削除しますか？</string>
+    <string name="settings_drivers_confirm_remove">ドライバーをデバイスから削除します。</string>
+    <string name="settings_drivers_remove_repo_title">リポジトリを削除しますか？</string>
+    <string name="settings_drivers_remove_repo_message">%1$s がリポジトリ一覧から削除されます。</string>
+    <string name="settings_drivers_repo_tap_to_load">タップしてリリースを読み込みます</string>
+    <string name="settings_drivers_repo_loading_releases">リリースを読み込み中</string>
+    <string name="settings_drivers_repo_release_count">%1$d 件のリリースを読み込みました</string>
+    <string name="settings_drivers_repo_no_release_assets">取得したリリースにダウンロード可能な ZIP アセットが見つかりませんでした。</string>
+    <string name="settings_drivers_repo_fetch_failed">GitHub のリリースを読み込めませんでした。</string>
+    <string name="settings_drivers_repo_download_failed">ダウンロードに失敗しました。</string>
+    <string name="settings_drivers_repo_no_version">バージョン情報がありません</string>
+    <string name="settings_drivers_repo_unknown_size">サイズ不明</string>
+    <string name="settings_drivers_manager">ドライバーマネージャー</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">システムファイルをインストール中</string>
+    <string name="setup_wizard_unable_to_install_system_files">システムファイルをインストールできません</string>
+    <string name="setup_wizard_system_image_not_installed">システムイメージがインストールされていません。先にコンポーネントをインストールしてください。</string>
+    <string name="setup_wizard_recommended_components">推奨コンポーネント</string>
+    <string name="setup_wizard_step_format">ステップ %1$d / %2$d</string>
+    <string name="setup_wizard_allow_file_access">すべてのファイルへのアクセスを許可</string>
+    <string name="setup_wizard_install_system_files">システムファイルをインストール</string>
+    <string name="setup_wizard_recommended_components_description">推奨コンポーネントは、対応する DXVK、VKD3D、FEX、Box64、Wowbox64 パッケージを自動的にダウンロードしてインストールします。</string>
+    <string name="setup_wizard_each_button_downloads_description">各ボタンはパッケージをダウンロードしてインストールし、その既定のコンテナを自動的に作成します。</string>
+    <string name="setup_wizard_recommended_x86_64">推奨 x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">推奨 ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">インストールするコンポーネントを選択します。Wine/Proton がコンテナを自動作成します。</string>
+    <string name="setup_wizard_loading_components">コンポーネントを読み込み中…</string>
+    <string name="setup_wizard_no_components_available">このカテゴリで利用可能なコンポーネントはありません。</string>
+    <string name="setup_wizard_default_settings">既定の設定</string>
+    <string name="setup_wizard_containers">コンテナのセットアップ</string>
+    <string name="setup_wizard_containers_description">各コンテナを開いて、すべての新しいゲームに引き継がせたい既定値を設定します。新しいゲームは既定で x86-64 コンテナを対象とします。</string>
+    <string name="setup_wizard_store_sign_in_optional">ストアへのサインインは任意です。各サインインは完了するとここに戻ります。</string>
+    <string name="setup_wizard_granted">許可済み</string>
+    <string name="setup_wizard_grant">許可する</string>
+    <string name="setup_wizard_denied">拒否済み</string>
+    <string name="setup_wizard_allow">許可</string>
+    <string name="setup_wizard_installing">インストール中</string>
+    <string name="setup_wizard_install_failed_reason">インストールに失敗しました: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">必要なアクセス権</string>
+    <string name="setup_wizard_select_components">コンポーネントを選択</string>
+    <string name="setup_wizard_recommended_wine_proton">推奨 Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">詳細セットアップ</string>
+    <string name="setup_wizard_title">セットアップウィザード</string>
+    <string name="setup_wizard_advanced_user">上級ユーザー</string>
+    <string name="setup_wizard_next">次へ</string>
+    <string name="setup_wizard_finish">完了</string>
+    <string name="setup_wizard_download_and_install">ダウンロード + インストール</string>
+    <string name="setup_wizard_open_drivers">ドライバーを開く</string>
+    <string name="setup_wizard_ready">準備完了</string>
+    <string name="setup_wizard_download_and_create">ダウンロード + 作成</string>
+    <string name="setup_wizard_configured">設定済み</string>
+    <string name="setup_wizard_downloading">%1$s をダウンロード中</string>
+    <string name="setup_wizard_installing_package">%1$s をインストール中</string>
+    <string name="setup_wizard_no_runtime_installed">Wine または Proton パッケージがまだインストールされていません。</string>
+    <string name="setup_wizard_no_runtime_hint">前の手順で Wine または Proton パッケージをインストールするか、今はこれをスキップしてください。</string>
+    <string name="setup_wizard_recommended_label">推奨</string>
+    <string name="setup_wizard_install_all_recommended">推奨をすべてインストール</string>
+    <string name="setup_wizard_create_container">コンテナを作成</string>
+    <string name="setup_wizard_creating_container">作成中…</string>
+
+    <string name="input_controls_tap_to_click">タップでクリック</string>
+    <string name="input_controls_reverse_binding_order">バインドの順序を逆にする</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">認証</string>
+    <string name="steam_login_sign_in_to_your_account">アカウントにサインイン</string>
+    <string name="steam_login_username">ユーザー名</string>
+    <string name="steam_login_password">パスワード</string>
+    <string name="steam_login_invalid_username_or_password">ユーザー名またはパスワードが正しくありません</string>
+    <string name="steam_login_remember_me">ログイン情報を保存</string>
+    <string name="steam_login_sign_in_with_qr_code">QR コードでサインイン</string>
+    <string name="steam_login_open_steam_app_qr_hint">Steam アプリを開く → QR アイコンをタップ</string>
+    <string name="steam_login_failed_to_load_qr_code">QR コードの読み込みに失敗しました</string>
+    <string name="steam_login_retry">再試行</string>
+    <string name="steam_login_generating_code">コードを生成中…</string>
+    <string name="steam_login_two_factor_auth">2 要素認証</string>
+    <string name="steam_login_approve_login_steam_app">Steam モバイルアプリから\nこのログインを承認してください</string>
+    <string name="steam_login_enter_code_sent_to">%1$s に送信された\nコードを入力してください</string>
+    <string name="steam_login_enter_steam_guard_code">Steam Guard コードを入力してください</string>
+    <string name="steam_login_code">コード</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">クラウド同期</string>
+    <string name="google_cloud_sync_started">クラウド同期を開始しました。</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Google サービス</string>
+    <string name="google_auto_signin_title">起動時に Google にサインイン</string>
+    <string name="google_auto_signin_summary">アプリ起動時に Google Play Games へ自動的に接続し、セーブデータのバックアップと同期を常に利用できるようにします。オフの場合、アプリが自動でサインインすることはありません。</string>
+    <string name="google_auto_signin_section">起動時</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">同期中</string>
+    <string name="google_cloud_status_connected">接続済み</string>
+    <string name="google_cloud_status_not_signed_in">サインインしていません</string>
+    <string name="google_cloud_working">処理中…</string>
+    <string name="google_cloud_sign_in">サインイン</string>
+    <string name="google_cloud_disable_sync">同期を無効化</string>
+    <string name="google_cloud_store_logins">ストアのログイン情報</string>
+    <string name="google_cloud_store_login_sync_busy">ストアのログイン同期を処理中…</string>
+    <string name="google_cloud_saved_games_unavailable">Google セーブ済みゲームを利用できません</string>
+    <string name="google_cloud_snapshot_ready">クラウドスナップショットの準備完了</string>
+    <string name="google_cloud_waiting_first_backup">最初のバックアップを待機中</string>
+    <string name="google_cloud_no_store_logins_detected">ストアのログイン情報が検出されませんでした</string>
+    <string name="google_cloud_last_synced">最終同期 %1$s</string>
+    <string name="google_cloud_backup">バックアップ</string>
+    <string name="google_cloud_restore">復元</string>
+    <string name="google_cloud_sign_in_to_sync">ストアのログイン情報を同期するには Google Play Games にサインインしてください。</string>
+    <string name="google_cloud_sign_in_failed">Google Play Games へのサインインに失敗しました。</string>
+    <string name="google_cloud_sign_in_finishing">Google Play Games へのサインインがまだ完了していません。しばらく待ってから、もう一度クラウド同期をお試しください。</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games に接続しました。%1$s の復元を利用できます。</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games に接続しました。バックアップをタップして %1$s のログイン情報を保存してください。</string>
+    <string name="google_cloud_connected_ready">Google Play Games に接続しました。バックアップと復元の準備が整いました。</string>
+    <string name="google_cloud_sync_disabled">このアプリでは Google Play Games の同期が無効です。</string>
+    <string name="google_cloud_sign_in_first">先に Google Play Games にサインインしてください。</string>
+    <string name="google_cloud_no_saved_logins_found">Google クラウド同期に保存されたストアのログイン情報が見つかりませんでした。</string>
+    <string name="google_cloud_backup_already_matches">クラウドバックアップは既に現在のストアのログイン情報と一致しています。</string>
+    <string name="google_cloud_no_local_logins">バックアップできるローカルのストアログイン情報がありません。</string>
+    <string name="google_cloud_logins_restored_and_synced">%1$s のストアログイン情報を復元して同期しました。</string>
+    <string name="google_cloud_logins_restored">%1$s のストアログイン情報を復元しました。</string>
+    <string name="google_cloud_logins_backed_up">%1$s のストアログイン情報をバックアップしました。</string>
+    <string name="google_cloud_sync_ready">ストアログインの同期の準備が整いました。</string>
+    <string name="google_cloud_no_logins_to_sync">まだ同期できるストアのログイン情報がありません。</string>
+    <string name="google_cloud_sign_in_to_backup">サインインして %1$s のログイントークンをバックアップします。</string>
+    <string name="google_cloud_no_backed_up_logins">バックアップ済みのストアログインはまだ見つかりません。</string>
+    <string name="google_cloud_local_cloud_differ">ローカルとクラウドのストアログインが異なります。「バックアップ」でクラウドのデータを上書きするか、「復元」で保存済みのトークンを取得してください。</string>
+    <string name="google_cloud_local_ready_to_backup">ローカルのストアログインは %1$s 用にバックアップする準備ができています。</string>
+    <string name="google_cloud_backup_ready">ストアログインのバックアップの準備ができました。</string>
+    <string name="google_cloud_restore_available">%1$s 用のクラウドログインの復元が利用できます。</string>
+    <string name="google_cloud_logins_synced">ストアログインは Google Play Games と同期されています。</string>
+    <string name="google_cloud_sync_problem">ストアログインの同期で問題が発生しました。</string>
+    <string name="google_cloud_error_auth_needed">クラウド同期が保存済みゲームにアクセスするには、Google Play Games の認証を完了する必要があります。表示された場合は Play Games のプロフィールのプロンプトを開いてから、もう一度お試しください。</string>
+    <string name="google_cloud_error_developer">Google Play Games の保存済みゲームがこのビルドを拒否しました。Play Console で Play Games のアプリ ID、リンク済みのパッケージ名、署名証明書を確認してください。</string>
+    <string name="google_cloud_error_build_rejected">Google アカウントは接続されていますが、Google Play Games の保存済みゲームがこのビルドを拒否しました。Play Games のアプリ ID、リンク済みパッケージ、署名証明書を確認してください。</string>
+    <string name="google_cloud_error_network">ネットワークリクエストが完了しなかったか、Google Play 開発者サービスに対応が必要なため、Google クラウド同期に失敗しました。</string>
+    <string name="google_cloud_error_no_snapshot">Google クラウド同期に保存済みのストアログインはまだ見つかりませんでした。</string>
+    <string name="google_cloud_error_generic">Google クラウド同期に失敗しました: %1$s</string>
+    <string name="google_cloud_error_before_open">Google の保存済みゲームを開く前に Google クラウド同期に失敗しました。</string>
+    <string name="cloud_saves_title">クラウドセーブ</string>
+    <string name="cloud_saves_title_for_provider">%1$s クラウドセーブ - %2$s</string>
+    <string name="cloud_saves_sync_summary">%1$s が現在持っているバージョンを取得します。</string>
+    <string name="cloud_saves_sync_summary_generic">現在のクラウドバージョンを取得します。</string>
+    <string name="cloud_saves_no_backups">このゲームのバックアップはまだありません。</string>
+    <string name="cloud_sync_title">クラウドセーブ</string>
+    <string name="cloud_sync_disable_title">クラウドセーブを無効にする</string>
+    <string name="cloud_saves_steam_push_label">Steam Cloud にプッシュ</string>
+    <string name="cloud_saves_steam_push_helper">ローカルセーブを強制アップロード</string>
+    <string name="cloud_saves_steam_push_success">セーブを Steam Cloud にプッシュしました。</string>
+    <string name="cloud_saves_steam_push_failed">セーブを Steam Cloud にプッシュできませんでした。</string>
+    <string name="cloud_saves_history_steam_unreachable">現在 Steam Cloud に接続できません。バックグラウンドで再接続しています。オンラインに戻ったら更新をタップしてください。</string>
+    <string name="steam_session_refused_event">Steam がキャッシュされたセッションを拒否しました (EResult=%1$d)。もう一度サインインしてください。</string>
+    <string name="cloud_sync_enabled_summary">起動時にダウンロード、終了時にプッシュします。</string>
+    <string name="cloud_sync_disabled_summary">クラウドセーブのダウンロードや終了時の同期なしで起動します。</string>
+    <string name="cloud_saves_offline_mode">クラウド同期を無効にする</string>
+    <string name="cloud_saves_offline_mode_summary">このゲームの自動クラウド処理をすべて停止します。</string>
+    <string name="cloud_saves_backing_up">クラウドセーブをバックアップ中…</string>
+    <string name="cloud_saves_restoring">クラウドセーブを復元中…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">%1$s クラウドから同期</string>
+    <string name="cloud_saves_sync_from_provider_generic">クラウドから同期</string>
+    <string name="cloud_saves_syncing_from_provider">%1$s からセーブをダウンロード中…</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s のクラウドセーブをダウンロードしました。</string>
+    <string name="cloud_saves_sync_from_provider_failed">%1$s からセーブをダウンロードできませんでした。</string>
+    <string name="cloud_saves_gog_manage_label">GOG クラウドセーブを管理</string>
+    <string name="cloud_saves_gog_manage_helper">GOG 公式サイトを開きます</string>
+    <string name="cloud_saves_gog_manage_no_browser">GOG クラウドセーブのページを開けるブラウザがありません</string>
+    <string name="cloud_saves_gog_zip_label">GOG クラウド Zip をダウンロード</string>
+    <string name="cloud_saves_gog_zip_helper">現在のクラウドファイルを保存</string>
+    <string name="cloud_saves_gog_zip_success">GOG クラウドセーブの zip を保存しました。</string>
+    <string name="cloud_saves_gog_zip_failed">GOG クラウドセーブの zip を保存できませんでした。</string>
+    <string name="cloud_saves_gog_zip_empty">GOG クラウドセーブのファイルが見つかりません。</string>
+    <string name="cloud_saves_google_backup_label">Google にバックアップ</string>
+    <string name="cloud_saves_google_backup_helper">Google Play Games にコピーを保存</string>
+    <string name="cloud_saves_google_backup_no_save">バックアップするセーブファイルが見つかりません。</string>
+    <string name="cloud_saves_history_title">セーブ履歴</string>
+    <string name="cloud_saves_history_empty">まだバックアップされた過去のセーブはありません。置き換えられたセーブと手動バックアップは、ここに 30 日間表示されます。</string>
+    <string name="cloud_saves_history_loading">セーブ履歴を読み込み中…</string>
+    <string name="cloud_saves_history_sign_in">Google にサインインしてセーブ履歴を表示してください。</string>
+    <string name="cloud_saves_history_origin_local">ローカル</string>
+    <string name="cloud_saves_history_origin_cloud">クラウド</string>
+    <string name="cloud_saves_history_origin_manual">手動</string>
+    <string name="cloud_saves_history_origin_auto">自動</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">復元</string>
+    <string name="cloud_saves_history_download">ダウンロード</string>
+    <string name="cloud_saves_history_download_success">ファイルをダウンロードしました。</string>
+    <string name="cloud_saves_history_download_failed">ダウンロードに失敗しました。</string>
+    <string name="cloud_saves_history_cloud_readonly">読み取り専用</string>
+    <string name="cloud_saves_history_restore_confirm_title">このバックアップを復元しますか？</string>
+    <string name="cloud_saves_history_restore_confirm_body">現在のローカルセーブが %1$s のバックアップで置き換えられます。</string>
+    <string name="cloud_saves_history_restore_success">バックアップからセーブを復元しました。</string>
+    <string name="cloud_saves_history_restore_failed">このバックアップを復元できませんでした。</string>
+    <string name="cloud_saves_keep_replaced_backup">置き換えられたセーブのバックアップを保持する</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">気が変わった場合は、セーブ履歴から復元できます。</string>
+    <string name="cloud_saves_history_refresh">更新</string>
+    <string name="cloud_saves_history_rename">名前を変更</string>
+    <string name="cloud_saves_history_rename_title">このバックアップに名前を付ける</string>
+    <string name="cloud_saves_history_rename_hint">例: ボス戦、エンディング前</string>
+    <string name="cloud_saves_history_rename_save">保存</string>
+    <string name="cloud_saves_history_rename_clear">クリア</string>
+    <string name="cloud_saves_history_rename_success">バックアップの名前を変更しました。</string>
+    <string name="cloud_saves_history_rename_failed">バックアップの名前を変更できませんでした。</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">セーブフォルダを選択</string>
+    <string name="cloud_saves_custom_folder_label">セーブフォルダ</string>
+    <string name="cloud_saves_custom_select_folder_summary">コンテナ内のセーブディレクトリを指定します</string>
+    <string name="cloud_saves_custom_no_container">このショートカットではコンテナを利用できません</string>
+    <string name="cloud_saves_custom_picker_title">セーブフォルダを選択</string>
+    <string name="cloud_saves_custom_outside_drive_c">選択したフォルダはコンテナの C: ドライブ内にある必要があります</string>
+    <string name="cloud_saves_custom_path_map_failed">選択したフォルダを Windows パスに対応付けできませんでした。</string>
+    <string name="cloud_saves_custom_folder_set">セーブフォルダを %1$s に設定しました</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Steam Cloud から同期</string>
+    <string name="cloud_saves_steam_sync_helper">最新のセーブをダウンロード</string>
+    <string name="cloud_saves_steam_sync_success">Steam Cloud から同期しました</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud の同期に失敗しました</string>
+    <string name="cloud_saves_steam_browse_label">Steam Cloud セーブを表示</string>
+    <string name="cloud_saves_steam_browse_helper">クラウドストレージを開く</string>
+    <string name="cloud_saves_steam_browse_no_browser">Steam のページを開けるブラウザがありません</string>
+    <string name="cloud_saves_steam_import_label">ファイルをインポート</string>
+    <string name="cloud_saves_steam_import_helper">ダウンロードしたファイルを復元</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">ファイルピッカーを利用できません</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Steam Cloud の現在のセーブファイルをダウンロードし、現在のセーブファイルを上書きします。</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">無効なアプリ ID</string>
+    <string name="cloud_saves_label_saved">ラベルを保存しました</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">セーブ</string>
+    <string name="saves_import_export_confirm_selection">選択を確定</string>
+    <string name="saves_import_export_select_directory">セーブディレクトリを選択してください</string>
+    <string name="saves_import_export_up_directory">上のディレクトリへ</string>
+    <string name="saves_import_export_select_container">対象コンテナ:</string>
+    <string name="saves_import_export_exported">セーブを正常にエクスポートしました</string>
+    <string name="saves_import_export_exported_failed">セーブのエクスポートに失敗しました: %1$s</string>
+    <string name="saves_import_export_imported">セーブを正常にインポートしました</string>
+    <string name="saves_import_export_imported_failed">セーブのインポートに失敗しました: %1$s</string>
+    <string name="saves_export_path_summary">セーブは /WinNative/saves にエクスポートされます</string>
+    <string name="saves_export_success_path">%1$s にエクスポートしました</string>
+    <string name="saves_export_warning_title">カスタムゲームでのみ使用してください</string>
+    <string name="saves_export_warning_body">エクスポートには、ストアからインストールしたゲームやクラウド同期のゲームのセーブが含まれる場合があります。</string>
+    <string name="saves_import_warning_title">これによりこのコンテナ内の既存のセーブが上書きされます</string>
+    <string name="saves_import_warning_body">複数のゲームを含む古いバックアップを復元する場合は、先にファイルマネージャーで新しいセーブを zip にコピーしてください。zip 内に存在するセーブのみが影響を受けます。セーブは慎重に管理してください。</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">コンテナ</string>
+    <string name="preloader_initializing">初期化中</string>
+    <string name="preloader_launching">起動中</string>
+    <string name="preloader_closing">%1$s を終了中</string>
+    <string name="preloader_preparing_steam_environment">Steam 環境を準備中</string>
+    <string name="preloader_starting_wine">Wine を起動中</string>
+    <string name="preloader_starting_steam_launcher">Steam ランチャーを起動中</string>
+    <string name="preloader_loading_steam_client">Steam クライアントを読み込み中</string>
+    <string name="preloader_connecting_to_steam">Steam に接続中</string>
+    <string name="preloader_signing_in_to_steam">Steam にサインイン中</string>
+    <string name="preloader_fetching_game_info">サインインしました — ゲーム情報を取得中</string>
+    <string name="preloader_steam_ready">Steam の準備ができました</string>
+    <string name="preloader_updating_game_info">ゲーム情報を更新中</string>
+    <string name="preloader_verifying_install">インストールを検証中</string>
+    <string name="preloader_scanning_redists">再頒布可能パッケージをスキャン中</string>
+    <string name="preloader_installing_redist_single">再頒布可能パッケージをインストール中</string>
+    <string name="preloader_installing_named_redist">%1$s をインストール中</string>
+    <string name="preloader_installing_named_redist_progress">%1$s をインストール中 (%2$s)</string>
+    <string name="preloader_redists_ready">再頒布可能パッケージの準備ができました</string>
+    <string name="preloader_no_redists">インストールする再頒布可能パッケージはありません</string>
+    <string name="preloader_steam_service_running">Steam サービスを実行中</string>
+    <string name="preloader_launching_game">%1$s を起動中</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam ランチャーが失敗しました — アセットを再ステージング中</string>
+    <string name="preloader_steam_launcher_start_failed">Steam ランチャーを起動できませんでした。再ステージング中です — もう一度起動してください</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam ランチャーはゲームに到達しましたが、起動しませんでした</string>
+    <string name="preloader_setup_environment">環境をセットアップ中</string>
+    <string name="preloader_retrying_steam_client_download">Steam クライアントのダウンロードを再試行中</string>
+    <string name="preloader_installing_mono">Wine Mono v%1$s をインストール中</string>
+    <string name="preloader_installing_redist">再頒布可能パッケージをインストール中</string>
+    <string name="preloader_unpacking_exe">ゲームの実行ファイルを展開中</string>
+    <string name="preloader_downloading_cloud">クラウドセーブをダウンロード中</string>
+    <string name="preloader_syncing_cloud">クラウドセーブを同期中</string>
+    <string name="preloader_uploading_cloud">クラウドセーブをアップロード中</string>
+    <string name="preloader_checking_cloud">クラウドセーブを確認中</string>
+    <string name="preloader_cloud_sync_retry">%1$s 再試行 %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">クラウド同期をダウンロード中</string>
+    <string name="cloud_sync_failed_provider">%1$s のクラウドセーブ同期に失敗しました。</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">カスタムゲーム</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">パフォーマンスをファイルに記録</string>
+    <string name="settings_hud_record_to_file_summary">プレイ中に FPS、CPU、GPU、温度、バッテリーの各指標を毎秒 /WinNative/logs/ にエクスポートします。</string>
+    <string name="settings_leaderboard_category">パフォーマンス</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Workshop のアイテムを読み込み中</string>
+    <string name="workshop_search_items">Workshop のアイテムを検索</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Steam から購読済みのアイテムを取得しています。</string>
+    <string name="workshop_error_title">Workshop のアイテムを読み込めませんでした</string>
+    <string name="workshop_error_subtitle">問題が発生しました。もう一度お試しください。</string>
+    <string name="workshop_empty_title">購読済みの Workshop アイテムはありません</string>
+    <string name="workshop_empty_subtitle">Steam Workshop でアイテムを購読してから、このウィンドウを再度開いてください。</string>
+    <string name="workshop_search_empty_title">\"%1$s\" に一致するアイテムはありません</string>
+    <string name="workshop_search_empty_subtitle">別の検索語をお試しください。</string>
+    <string name="workshop_clear_search">検索をクリア</string>
+    <string name="workshop_item_fallback">Workshop アイテム</string>
+    <string name="common_ui_failed">失敗しました</string>
+    <string name="steam_presence_snooze">スヌーズ</string>
+    <string name="steam_presence_busy">取り込み中</string>
+    <string name="steam_presence_looking_to_trade">トレード相手募集中</string>
+    <string name="steam_presence_looking_to_play">プレイ相手募集中</string>
+    <string name="steam_friends_count">フレンド — %1$d 人オンライン</string>
+    <string name="steam_friends_section_in_game">ゲーム中 (%1$d)</string>
+    <string name="steam_friends_section_online">オンライン (%1$d)</string>
+    <string name="steam_friends_section_offline">オフライン (%1$d)</string>
+    <string name="steam_friends_none_loaded">フレンドはまだ読み込まれていません。</string>
+    <string name="steam_friends_chat_off">チャットはオフです。フレンドを表示するにはチャットサービスをオンに戻してください。</string>
+    <string name="steam_friends_self_you">自分</string>
+    <string name="steam_friends_in_game">ゲーム中</string>
+    <string name="steam_friends_join">参加</string>
+    <string name="steam_friends_play">プレイ</string>
+    <string name="steam_chat_image_failed">(画像の送信に失敗しました)</string>
+    <string name="steam_chat_empty">まだメッセージはありません。あいさつしましょう！</string>
+    <string name="steam_chat_uploading_image">画像をアップロード中…</string>
+    <string name="steam_chat_send_image">画像を送信</string>
+    <string name="steam_chat_message_hint">メッセージ…</string>
+    <string name="steam_chat_send">送信</string>
+    <string name="steam_chat_image">画像</string>
+    <string name="steam_common_back">戻る</string>
+    <string name="steam_achievements_title">実績</string>
+    <string name="steam_achievements_empty">このゲームの実績が見つかりません。\nまたは Steam にサインインして読み込んでください。</string>
+    <string name="steam_achievements_hidden">隠し実績</string>
+    <string name="steam_achievements_hidden_desc">プレイを続けてこの実績を明らかにしましょう。</string>
+    <string name="steam_achievements_unlocked_on">%1$s に解除</string>
+    <string name="steam_achievements_unlocked">解除済み</string>
+    <string name="steam_join_joining">%2$s で %1$s に参加中…</string>
+    <string name="steam_join_install">%2$s に参加するには %1$s をインストールしてください</string>
+    <string name="steam_join_not_owned">%1$s を所有していません</string>
+    <string name="steam_chat_not_sent">(未送信)</string>
+    <string name="steam_join_the_game">ゲーム</string>
+    <string name="steam_friends_settings">設定</string>
+    <string name="steam_chat_settings_title">チャット設定</string>
+    <string name="steam_chat_setting_service">チャットサービス</string>
+    <string name="steam_chat_setting_service_desc">サインインしてフレンドとチャットします。オフにするとオフラインになります。</string>
+    <string name="steam_chat_setting_notifications">チャット通知</string>
+    <string name="steam_chat_setting_notifications_desc">メッセージを受信したときに通知を表示します</string>
+    <string name="steam_chat_setting_heads">チャットヘッド</string>
+    <string name="steam_chat_setting_heads_desc">メッセージを読んで返信するためのフローティングバブル</string>
+    <string name="steam_chat_setting_ingame">ゲーム中のチャットを有効にする</string>
+    <string name="steam_chat_setting_ingame_desc">プレイ中にメッセージを送受信します</string>
+    <string name="steam_chat_setting_stay_running">バックグラウンドで実行</string>
+    <string name="steam_chat_setting_stay_running_desc">WinNative を終了した後もチャットを実行し続けます</string>
+    <string name="steam_chat_settings_overlay_needed">チャットヘッドを使用するには他のアプリの上への表示を許可してください</string>
+    <string name="steam_chat_heads_title">メッセージ</string>
+    <string name="steam_chat_heads_recent_title">最近</string>
+    <string name="steam_chat_heads_online_title">オンライン</string>
+    <string name="steam_chat_heads_new_chat">新しいメッセージ</string>
+    <string name="steam_chat_setting_autohide">自動的に隠す</string>
+    <string name="steam_chat_setting_autohide_desc">10 秒間操作がないとチャットヘッドをフェードアウトします</string>
+    <string name="steam_chat_heads_friends_title">フレンド</string>
+    <!-- File manager -->
+    <string name="file_manager_title">ファイル</string>
+    <string name="file_manager_copy">コピー</string>
+    <string name="file_manager_cut">切り取り</string>
+    <string name="file_manager_paste">貼り付け</string>
+    <string name="file_manager_paste_here">ここに貼り付け</string>
+    <string name="file_manager_new_folder">新しいフォルダ</string>
+    <string name="file_manager_new_folder_short">フォルダ</string>
+    <string name="file_manager_multi_select">選択</string>
+    <string name="file_manager_create">作成</string>
+    <string name="file_manager_delete">削除</string>
+    <string name="file_manager_copy_count">コピー (%1$d)</string>
+    <string name="file_manager_cut_count">切り取り (%1$d)</string>
+    <string name="file_manager_delete_count">削除 (%1$d)</string>
+    <string name="file_manager_extract">展開</string>
+    <string name="file_manager_extract_here">ここに展開</string>
+    <string name="file_manager_extract_to">指定先に展開…</string>
+    <string name="file_manager_extracting">%1$s を展開中</string>
+    <string name="file_manager_extract_failed">展開に失敗しました</string>
+    <string name="file_manager_run_boot">実行 / 起動</string>
+    <string name="file_manager_create_shortcut">ショートカットを作成</string>
+    <string name="file_manager_run_in_container">コンテナ内で実行</string>
+    <string name="file_manager_no_containers">利用可能なコンテナがありません</string>
+    <string name="file_manager_delete_confirm">\"%1$s\" を削除しますか？この操作は元に戻せません。</string>
+    <string name="file_manager_delete_confirm_multi">%1$d 件を削除しますか？この操作は元に戻せません。</string>
+    <string name="file_manager_copying">%1$s をコピー中</string>
+    <string name="file_manager_moving">%1$s を移動中</string>
+    <string name="file_manager_copying_count">%1$d 件をコピー中</string>
+    <string name="file_manager_moving_count">%1$d 件を移動中</string>
+    <string name="file_manager_paste_into_itself">フォルダをそれ自身の中に貼り付けることはできません</string>
+    <string name="file_manager_operation_failed">操作に失敗しました</string>
+    <string name="file_manager_delete_failed">削除に失敗しました</string>
+    <string name="file_manager_rename_failed">名前の変更に失敗しました</string>
+    <string name="file_manager_create_folder_failed">フォルダの作成に失敗しました</string>
+
+    <string name="settings_content_refresh">更新</string>
+    <string name="settings_retro_title">レトロ</string>
+    <string name="retro_save_transfer_title">セーブの転送</string>
+    <string name="retro_save_transfer_message">このゲームにローカルのセーブをインポートするか、現在のセーブをエクスポートします。</string>
+    <string name="retro_save_transfer_import">セーブをインポート</string>
+    <string name="retro_save_transfer_export">セーブをエクスポート</string>
+    <string name="retro_save_transfer_import_ok">セーブをインポートしました</string>
+    <string name="retro_save_transfer_import_failed">セーブをインポートできませんでした</string>
+    <string name="retro_save_transfer_export_ok">セーブをエクスポートしました</string>
+    <string name="retro_save_transfer_export_failed">セーブをエクスポートできませんでした</string>
+    <string name="retro_save_transfer_none">このゲームのセーブはまだありません</string>
+    <string name="retro_cheats_title">チート</string>
+    <string name="retro_cheats_hardcore_blocked">ハードコアモードではチートは無効です</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">保存</string>
+    <string name="retro_ps2_cancel">キャンセル</string>
+    <string name="retro_ps2_save_state">ステートセーブ</string>
+    <string name="retro_ps2_load_save_state">ステートロード</string>
+    <string name="retro_ps2_achievements">実績</string>
+    <string name="retro_ps2_cheats">チート</string>
+    <string name="retro_ps2_memory_cards">メモリーカード</string>
+    <string name="retro_ps2_fast_forward">早送り</string>
+    <string name="retro_ps2_reset">リセット</string>
+    <string name="retro_ps2_swap_disc">ディスク交換</string>
+    <string name="retro_ps2_slot">スロット %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">タップでロード</string>
+    <string name="retro_ps2_slot_empty">空き</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">タップで上書き</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">空き — タップで保存</string>
+    <string name="retro_ps2_slot_is_empty">スロット %1$d は空です</string>
+    <string name="retro_ps2_loaded_slot">スロット %1$d をロードしました</string>
+    <string name="retro_ps2_could_not_load_slot">スロット %1$d をロードできませんでした</string>
+    <string name="retro_ps2_saved_to_slot">スロット %1$d に保存しました</string>
+    <string name="retro_ps2_save_failed">保存に失敗しました</string>
+    <string name="retro_ps2_slot_1_suffix">  •  スロット 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  スロット 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  タップで使用</string>
+    <string name="retro_ps2_new_memory_card">新規メモリーカード</string>
+    <string name="retro_ps2_import_card">カードをインポート</string>
+    <string name="retro_ps2_enable_online_dev9">オンラインを有効化 (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 ネットワークアダプター — ゲームを再起動して接続します</string>
+    <string name="retro_ps2_ethernet_device">イーサネットデバイス</string>
+    <string name="retro_ps2_dns_mode">DNS モード</string>
+    <string name="retro_ps2_primary_dns">プライマリ DNS</string>
+    <string name="retro_ps2_secondary_dns">セカンダリ DNS</string>
+    <string name="retro_ps2_optional">任意</string>
+    <string name="retro_ps2_auto_ip_dhcp">自動 IP (DHCP)</string>
+    <string name="retro_ps2_server_host">サーバー: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">タップで IP を設定 (空欄で削除)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">サーバーホストを追加</string>
+    <string name="retro_ps2_new_server_hostname">新規サーバーホスト名</string>
+    <string name="retro_ps2_server_hostname_hint">例: bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">画面上のコントロール</string>
+    <string name="retro_ps2_edit_layout">レイアウトを編集</string>
+    <string name="retro_ps2_reset_layout">レイアウトをリセット</string>
+    <string name="retro_ps2_layout_reset">レイアウトをリセットしました</string>
+    <string name="retro_ps2_left_stick_invert_x">左スティック: X 軸反転</string>
+    <string name="retro_ps2_left_stick_invert_y">左スティック: Y 軸反転</string>
+    <string name="retro_ps2_right_stick_invert_x">右スティック: X 軸反転</string>
+    <string name="retro_ps2_right_stick_invert_y">右スティック: Y 軸反転</string>
+    <string name="retro_ps2_button_color">ボタンの色</string>
+    <string name="retro_ps2_letter_color">文字の色</string>
+    <string name="retro_ps2_shadow_color">影の色</string>
+    <string name="retro_ps2_background_color">背景の色</string>
+    <string name="retro_ps2_reset_colors">色をリセット</string>
+    <string name="retro_ps2_renderer">レンダラー</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">解像度スケール</string>
+    <string name="retro_ps2_scale_1x_native">1x (ネイティブ)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">アスペクト比</string>
+    <string name="retro_ps2_aspect_stretch">ストレッチ</string>
+    <string name="retro_ps2_aspect_auto_standard">自動 (標準)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">表示フィルター</string>
+    <string name="retro_ps2_filter_nearest">ニアレスト</string>
+    <string name="retro_ps2_filter_bilinear_smooth">バイリニア (スムーズ)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">バイリニア (シャープ)</string>
+    <string name="retro_ps2_texture_filter">テクスチャフィルター</string>
+    <string name="retro_ps2_filter_bilinear_forced">バイリニア (強制)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">バイリニア (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">バイリニア (スプライト)</string>
+    <string name="retro_ps2_blending_accuracy">ブレンド精度</string>
+    <string name="retro_ps2_blend_minimum">最小</string>
+    <string name="retro_ps2_blend_basic">基本</string>
+    <string name="retro_ps2_blend_medium">中</string>
+    <string name="retro_ps2_blend_high">高</string>
+    <string name="retro_ps2_blend_full">フル</string>
+    <string name="retro_ps2_blend_maximum">最大</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV シェーダー</string>
+    <string name="retro_ps2_shader_off">オフ</string>
+    <string name="retro_ps2_shader_scanline">スキャンライン</string>
+    <string name="retro_ps2_shader_diagonal">ダイアゴナル</string>
+    <string name="retro_ps2_shader_triangular">トライアンギュラー</string>
+    <string name="retro_ps2_shader_wave">ウェーブ</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">フレームスキップ</string>
+    <string name="retro_ps2_frameskip_off">オフ</string>
+    <string name="retro_ps2_frameskip_1">1 スキップ</string>
+    <string name="retro_ps2_frameskip_2">2 スキップ</string>
+    <string name="retro_ps2_frameskip_3">3 スキップ</string>
+    <string name="retro_ps2_mipmapping">ミップマッピング</string>
+    <string name="retro_ps2_volume">音量</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">ミュート</string>
+    <string name="retro_ps2_swap_stereo_channels">ステレオチャンネルを入れ替え</string>
+    <string name="retro_ps2_ee_cycle_rate">EE サイクルレート</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (デフォルト)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE サイクルスキップ</string>
+    <string name="retro_ps2_skip_off">オフ</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">マルチスレッド VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Fast CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">エミュレーション速度</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU 使用率</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU 使用率</string>
+    <string name="retro_ps2_hud_internal_resolution">内部解像度</string>
+    <string name="retro_ps2_deinterlace_mode">インターレース解除モード</string>
+    <string name="retro_ps2_deint_auto">自動</string>
+    <string name="retro_ps2_deint_off">オフ</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMVアスペクト比</string>
+    <string name="retro_ps2_anti_blur">アンチブラー</string>
+    <string name="retro_ps2_widescreen_patches">ワイドスクリーンパッチ</string>
+    <string name="retro_ps2_no_interlace_patches">インターレース解除パッチ</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTCスピン検出</string>
+    <string name="retro_ps2_wait_loop">待機ループ検出</string>
+    <string name="retro_ps2_time_stretch">オーディオタイムストレッチ</string>
+    <string name="retro_ps2_audio_buffer">オーディオバッファ</string>
+    <string name="retro_ps2_audio_latency">出力レイテンシ</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">フレームタイム</string>
+    <string name="retro_ps2_hud_gs_stats">GS統計</string>
+    <string name="retro_ps2_hud_hw_info">ハードウェア情報</string>
+    <string name="retro_ps2_hud_version">バージョン</string>
+    <string name="retro_ps2_hud_input_display">入力表示</string>
+    <string name="retro_ps2_tab_menu">メニュー</string>
+    <string name="retro_ps2_tab_display">表示</string>
+    <string name="retro_ps2_tab_performance">パフォーマンス</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">サウンド</string>
+    <string name="retro_ps2_tab_online">オンライン</string>
+    <string name="retro_ps2_tab_controls">コントロール</string>
+    <string name="retro_ps2_resume">再開</string>
+    <string name="retro_ps2_pause">一時停止</string>
+    <string name="retro_ps2_exit">終了</string>
+    <string name="retro_lr_bios_imported">BIOS をインポートしました: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">無効な BIOS ファイル</string>
+    <string name="retro_lr_invalid_retro_game">無効なレトロゲーム</string>
+    <string name="retro_lr_rom_not_found">ROM が見つかりません: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">このアーカイブ内の ROM を読み込めませんでした</string>
+    <string name="retro_lr_core_not_installed">コアがインストールされていません: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">チート有効 — このセッションでは実績が無効になります</string>
+    <string name="retro_lr_cloud_save_restored">クラウドセーブを復元しました</string>
+    <string name="retro_lr_restore_failed">復元に失敗しました</string>
+    <string name="retro_lr_cloud_conflict_message">%1$s のより新しいクラウドセーブが存在します。同期しますか、またどのクラウドセーブを保持しますか？</string>
+    <string name="retro_lr_cloud_save">クラウドセーブ</string>
+    <string name="retro_lr_renderer_default">レトロ</string>
+    <string name="retro_lr_failed_load_core">エミュレータコアの読み込みに失敗しました</string>
+    <string name="retro_lr_failed_load_rom">ROM の読み込みに失敗しました</string>
+    <string name="retro_lr_graphics_not_supported">このコアではグラフィックスがサポートされていません</string>
+    <string name="retro_lr_emulator_error">エミュレータエラー</string>
+    <string name="retro_lr_shader_default">デフォルト</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">シャープ</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR アップスケール</string>
+    <string name="retro_lr_upscale_native">ネイティブ</string>
+    <string name="retro_lr_sound">サウンド</string>
+    <string name="retro_lr_left_stick_invert_x">左スティック: X 軸反転</string>
+    <string name="retro_lr_left_stick_invert_y">左スティック: Y 軸反転</string>
+    <string name="retro_lr_right_stick_invert_x">右スティック: X 軸反転</string>
+    <string name="retro_lr_right_stick_invert_y">右スティック: Y 軸反転</string>
+    <string name="retro_lr_on_screen_controls">画面上のコントロール</string>
+    <string name="retro_lr_haptic_feedback">触覚フィードバック</string>
+    <string name="retro_lr_portrait">縦向き</string>
+    <string name="retro_lr_landscape">横向き</string>
+    <string name="retro_lr_edit_layout">レイアウトを編集 (%1$s)</string>
+    <string name="retro_lr_reset_layout">%1$s レイアウトをリセット</string>
+    <string name="retro_lr_layout_reset">%1$s レイアウトをリセットしました</string>
+    <string name="retro_lr_button_color">ボタンの色</string>
+    <string name="retro_lr_letter_color">文字の色</string>
+    <string name="retro_lr_shadow_color">影の色</string>
+    <string name="retro_lr_background_color">背景の色</string>
+    <string name="retro_lr_reset_colors">色をリセット</string>
+    <string name="retro_lr_colors_reset">色をリセットしました</string>
+    <string name="retro_lr_performance_hud">パフォーマンス HUD</string>
+    <string name="retro_lr_alpha">アルファ</string>
+    <string name="retro_lr_background_alpha">背景アルファ</string>
+    <string name="retro_lr_background">背景</string>
+    <string name="retro_lr_scale">スケール</string>
+    <string name="retro_lr_numeric_frametime">数値フレームタイム</string>
+    <string name="retro_lr_dual_series_battery">デュアルシリーズバッテリー</string>
+    <string name="retro_lr_hud_elements">HUD 要素</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">コンソール</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">バッテリー</string>
+    <string name="retro_lr_hud_temp">温度</string>
+    <string name="retro_lr_hud_graph">グラフ</string>
+    <string name="retro_lr_hud_cpu_temp">CPU 温度</string>
+    <string name="retro_lr_save_state">ステートセーブ</string>
+    <string name="retro_lr_load_save_state">ステートロード</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">ハードコアモードではステートのロードが無効です</string>
+    <string name="retro_lr_achievements">実績</string>
+    <string name="retro_lr_cheats">チート</string>
+    <string name="retro_lr_cheats_disabled_hardcore">ハードコアモードではチートが無効です</string>
+    <string name="retro_lr_reset">リセット</string>
+    <string name="retro_lr_fast_forward">早送り</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">ハードコアモードでは早送りが無効です</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">ディスク %1$d/%2$d</string>
+    <string name="retro_lr_resume">再開</string>
+    <string name="retro_lr_pause">一時停止</string>
+    <string name="retro_lr_exit">終了</string>
+    <string name="retro_lr_saved_to_slot">スロット %1$d に保存しました</string>
+    <string name="retro_lr_could_not_save_state">ステートを保存できませんでした</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS が必要です</string>
+    <string name="retro_lr_bios_required_message">PlayStation のゲームには、ユーザーが用意する必要のある実機の BIOS ファイルが必要です。続行するには BIOS (scph5501.bin、scph5500.bin、scph5502.bin、scph1001.bin または scph7001.bin) をインポートしてください。</string>
+    <string name="retro_lr_import_bios">BIOS をインポート…</string>
+    <string name="retro_lr_cancel">キャンセル</string>
+    <string name="retro_lr_slot_empty">スロット %1$d は空です</string>
+    <string name="retro_lr_loaded_slot">スロット %1$d をロードしました</string>
+    <string name="retro_lr_could_not_load_state">ステートをロードできませんでした</string>
+    <string name="retro_lr_slot_title">スロット %1$d</string>
+    <string name="retro_lr_rename_slot">スロット %1$d の名前を変更</string>
+    <string name="retro_gs_section_general">一般</string>
+    <string name="retro_gs_section_graphics">グラフィックス</string>
+    <string name="retro_gs_section_performance">パフォーマンス</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">入力</string>
+    <string name="retro_gs_section_audio">オーディオ</string>
+    <string name="retro_gs_section_online">オンライン</string>
+    <string name="retro_gs_cancel">キャンセル</string>
+    <string name="retro_gs_save">保存</string>
+    <string name="retro_gs_shader_default">デフォルト</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">シャープ</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">ネイティブ</string>
+    <string name="retro_gs_group_game">ゲーム</string>
+    <string name="retro_gs_label_name">名前</string>
+    <string name="retro_gs_label_system">システム</string>
+    <string name="retro_gs_label_emulator_core">エミュレータコア</string>
+    <string name="retro_gs_label_rom_path">ROM パス</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">インストール済み</string>
+    <string name="retro_gs_bios_none">なし — %1$s のゲームを実行するには必要です</string>
+    <string name="retro_gs_import_bios">BIOS をインポート…</string>
+    <string name="retro_gs_remove_bios">BIOS を削除</string>
+    <string name="retro_gs_group_library_artwork">ライブラリアートワーク</string>
+    <string name="retro_gs_artwork_game_card">ゲームカード画像</string>
+    <string name="retro_gs_artwork_grid">グリッド画像</string>
+    <string name="retro_gs_artwork_carousel">カルーセル画像</string>
+    <string name="retro_gs_artwork_list">リスト画像</string>
+    <string name="retro_gs_artwork_custom_set">カスタム画像を設定済み</string>
+    <string name="retro_gs_artwork_set_image">画像を設定</string>
+    <string name="retro_gs_artwork_remove">削除</string>
+    <string name="retro_gs_group_video">映像</string>
+    <string name="retro_gs_video_filter">映像フィルター</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR アップスケール</string>
+    <string name="retro_gs_performance_hud">パフォーマンス HUD</string>
+    <string name="retro_gs_group_core">コア</string>
+    <string name="retro_gs_renderer">レンダラー</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">解像度スケール</string>
+    <string name="retro_gs_scale_1x_native">1x (ネイティブ)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">アスペクト比</string>
+    <string name="retro_gs_aspect_stretch">ストレッチ</string>
+    <string name="retro_gs_aspect_auto_standard">自動 (標準)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">表示フィルター</string>
+    <string name="retro_gs_filter_nearest">ニアレスト</string>
+    <string name="retro_gs_filter_bilinear_smooth">バイリニア (スムーズ)</string>
+    <string name="retro_gs_filter_bilinear_sharp">バイリニア (シャープ)</string>
+    <string name="retro_gs_texture_filter">テクスチャフィルター</string>
+    <string name="retro_gs_filter_bilinear_forced">バイリニア (強制)</string>
+    <string name="retro_gs_filter_bilinear_ps2">バイリニア (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">バイリニア (スプライト)</string>
+    <string name="retro_gs_blending_accuracy">ブレンド精度</string>
+    <string name="retro_gs_blend_minimum">最小</string>
+    <string name="retro_gs_blend_basic">基本</string>
+    <string name="retro_gs_blend_medium">中</string>
+    <string name="retro_gs_blend_high">高</string>
+    <string name="retro_gs_blend_full">フル</string>
+    <string name="retro_gs_blend_maximum">最大</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV シェーダー</string>
+    <string name="retro_gs_off">オフ</string>
+    <string name="retro_gs_tvshader_scanline">スキャンライン</string>
+    <string name="retro_gs_tvshader_diagonal">ダイアゴナル</string>
+    <string name="retro_gs_tvshader_triangular">トライアンギュラー</string>
+    <string name="retro_gs_tvshader_wave">ウェーブ</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">フレームスキップ</string>
+    <string name="retro_gs_frameskip_1">1 スキップ</string>
+    <string name="retro_gs_frameskip_2">2 スキップ</string>
+    <string name="retro_gs_frameskip_3">3 スキップ</string>
+    <string name="retro_gs_mipmapping">ミップマッピング</string>
+    <string name="retro_gs_group_performance">パフォーマンス</string>
+    <string name="retro_gs_ee_cycle_rate">EE サイクルレート</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (デフォルト)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE サイクルスキップ</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">マルチスレッド VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Fast CDVD</string>
+    <string name="retro_gs_group_performance_hud">パフォーマンス HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">エミュレーション速度</string>
+    <string name="retro_gs_hud_cpu_usage">CPU 使用率</string>
+    <string name="retro_gs_hud_gpu_usage">GPU 使用率</string>
+    <string name="retro_gs_hud_internal_resolution">内部解像度</string>
+    <string name="retro_gs_deinterlace_mode">インターレース解除モード</string>
+    <string name="retro_gs_deint_auto">自動</string>
+    <string name="retro_gs_deint_off">オフ</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMVアスペクト比</string>
+    <string name="retro_gs_anti_blur">アンチブラー</string>
+    <string name="retro_gs_widescreen_patches">ワイドスクリーンパッチ</string>
+    <string name="retro_gs_no_interlace_patches">インターレース解除パッチ</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTCスピン検出</string>
+    <string name="retro_gs_wait_loop">待機ループ検出</string>
+    <string name="retro_gs_time_stretch">オーディオタイムストレッチ</string>
+    <string name="retro_gs_audio_buffer">オーディオバッファ</string>
+    <string name="retro_gs_audio_latency">出力レイテンシ</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">フレームタイム</string>
+    <string name="retro_gs_hud_gs_stats">GS統計</string>
+    <string name="retro_gs_hud_hw_info">ハードウェア情報</string>
+    <string name="retro_gs_hud_version">バージョン</string>
+    <string name="retro_gs_hud_input_display">入力表示</string>
+    <string name="retro_gs_fast_boot">高速起動</string>
+    <string name="retro_gs_group_online_dev9">オンライン (DEV9)</string>
+    <string name="retro_gs_enable_online">オンラインを有効化</string>
+    <string name="retro_gs_ethernet_device">イーサネットデバイス</string>
+    <string name="retro_gs_net_auto">自動</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS モード</string>
+    <string name="retro_gs_dns_manual">手動</string>
+    <string name="retro_gs_dns_internal">内部</string>
+    <string name="retro_gs_primary_dns">プライマリ DNS</string>
+    <string name="retro_gs_secondary_dns">セカンダリ DNS</string>
+    <string name="retro_gs_dns_optional">任意</string>
+    <string name="retro_gs_auto_ip_dhcp">自動 IP (DHCP)</string>
+    <string name="retro_gs_group_input">入力</string>
+    <string name="retro_engine_save">セーブ</string>
+    <string name="retro_engine_saved">ゲームを保存しました</string>
+    <string name="retro_engine_loading">読み込み中…</string>
+    <string name="retro_engine_load">ロード</string>
+    <string name="retro_engine_saved_to">%1$s に保存しました</string>
+    <string name="retro_engine_slot_active_only">使用中</string>
+    <string name="retro_engine_rename_slot">セーブスロットの名前を変更</string>
+    <string name="retro_engine_caught">%1$d 匹捕獲</string>
+    <string name="retro_engine_no_slots">セーブスロットがありません</string>
+    <string name="retro_engine_new_slot">新しいセーブスロット</string>
+    <string name="retro_engine_achievements_unavailable">3Dモードでは記録されません</string>
+    <string name="retro_engine_fullscreen">全画面</string>
+    <string name="retro_engine_loaded_from">%1$s をロードしました</string>
+    <string name="retro_engine_slot_empty">そのスロットは空です</string>
+    <string name="retro_engine_loading_subtitle">初回のゲームデータを準備しています</string>
+    <string name="retro_gs_engine_3d">ボクセル3D</string>
+    <string name="retro_gs_engine_3d_subtitle">標準コアの代わりに3Dボクセルエンジンでこのゲームをプレイします</string>
+    <string name="retro_gs_on_screen_controls">画面上のコントロール</string>
+    <string name="retro_gs_haptic_feedback">触覚フィードバック</string>
+    <string name="retro_gs_group_audio">オーディオ</string>
+    <string name="retro_gs_volume">音量</string>
+    <string name="retro_gs_mute">ミュート</string>
+    <string name="retro_gs_swap_stereo">ステレオチャンネルを入れ替え</string>
+    <string name="retro_gs_sound">サウンド</string>
+    <string name="retro_scr_retro_defaults">レトロデフォルト</string>
+    <string name="retro_scr_retro_defaults_desc">各ゲーム独自の設定で上書きされない限り、各コンソールのゲームに適用されるデフォルト設定です。</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">アカウント</string>
+    <string name="retro_scr_signed_in">サインイン済み</string>
+    <string name="retro_scr_not_signed_in_hint">サインインしていません — ゲームの実績を開いてサインインしてください</string>
+    <string name="retro_scr_achievements_enabled">実績を有効化</string>
+    <string name="retro_scr_hardcore_default">デフォルトでハードコアモード (ステートセーブなし)</string>
+    <string name="retro_scr_sign_out">サインアウト</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">インストール済み</string>
+    <string name="retro_scr_none_ps1_bios">なし — PS1 のゲームには BIOS が必要です</string>
+    <string name="retro_scr_import_ps1_bios">PS1 BIOS をインポート…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS を削除しました</string>
+    <string name="retro_scr_no_bios_to_remove">削除する BIOS がありません</string>
+    <string name="retro_scr_remove_ps1_bios">PS1 BIOS を削除</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">なし — PS2 のゲームには BIOS が必要です</string>
+    <string name="retro_scr_format">形式</string>
+    <string name="retro_scr_ps2_bios_format">単一ファイルに統合されたダンプ (地域タグ付き .bin、約 4MB)。分割された ROM0/MEC/NVM セットは使用できません。</string>
+    <string name="retro_scr_import_ps2_bios">PS2 BIOS をインポート…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS を削除しました</string>
+    <string name="retro_scr_remove_ps2_bios">PS2 BIOS を削除</string>
+    <string name="retro_scr_library_artwork">ライブラリアートワーク</string>
+    <string name="retro_scr_retro_case_art">レトロケースアート (カートリッジ / CD ケース)</string>
+    <string name="retro_scr_box_art">ボックスアート</string>
+    <string name="retro_scr_box_art_desc">インポート時に thumbnails.libretro.com から自動的に取得されます。カスタム画像は常にこれを上書きします。</string>
+    <string name="retro_scr_roms_folder">ROMS フォルダー</string>
+    <string name="retro_scr_folder">フォルダー</string>
+    <string name="retro_scr_roms_not_set">未設定 — フォルダーを選択してゲームを自動インポート</string>
+    <string name="retro_scr_auto_import">自動インポート</string>
+    <string name="retro_scr_auto_import_desc">このフォルダー内の新しいゲームは、適切なコンソールが検出された状態で自動的にライブラリに追加されます。</string>
+    <string name="retro_scr_select_roms_folder_title">ROMs フォルダーを選択</string>
+    <string name="retro_scr_select_roms_folder_button">ROMs フォルダーを選択…</string>
+    <string name="retro_scr_change_roms_folder_button">ROMs フォルダーを変更…</string>
+    <string name="retro_scr_scan_now">今すぐスキャン</string>
+    <string name="retro_scr_console_defaults">コンソールデフォルト</string>
+    <string name="retro_scr_console_defaults_desc">コンソールをタップしてデフォルト設定を行います。</string>
+    <string name="retro_scr_renderer">レンダラー</string>
+    <string name="retro_scr_upscale_resolution">解像度をアップスケール</string>
+    <string name="retro_scr_aspect_ratio">アスペクト比</string>
+    <string name="retro_scr_aspect_stretch">ストレッチ</string>
+    <string name="retro_scr_aspect_auto_standard">自動 (標準)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">表示フィルター</string>
+    <string name="retro_scr_filter_nearest">ニアレスト</string>
+    <string name="retro_scr_filter_bilinear_smooth">バイリニア (スムーズ)</string>
+    <string name="retro_scr_filter_bilinear_sharp">バイリニア (シャープ)</string>
+    <string name="retro_scr_texture_filter">テクスチャフィルター</string>
+    <string name="retro_scr_filter_bilinear_forced">バイリニア (強制)</string>
+    <string name="retro_scr_filter_bilinear_ps2">バイリニア (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">バイリニア (スプライト)</string>
+    <string name="retro_scr_blending_accuracy">ブレンド精度</string>
+    <string name="retro_scr_blend_minimum">最小</string>
+    <string name="retro_scr_blend_basic">基本</string>
+    <string name="retro_scr_blend_medium">中</string>
+    <string name="retro_scr_blend_high">高</string>
+    <string name="retro_scr_blend_full">フル</string>
+    <string name="retro_scr_blend_maximum">最大</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV シェーダー</string>
+    <string name="retro_scr_shader_off">オフ</string>
+    <string name="retro_scr_shader_scanline">スキャンライン</string>
+    <string name="retro_scr_shader_diagonal">ダイアゴナル</string>
+    <string name="retro_scr_shader_triangular">トライアンギュラー</string>
+    <string name="retro_scr_shader_wave">ウェーブ</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">フレームスキップ</string>
+    <string name="retro_scr_skip_1">1 スキップ</string>
+    <string name="retro_scr_skip_2">2 スキップ</string>
+    <string name="retro_scr_skip_3">3 スキップ</string>
+    <string name="retro_scr_mipmapping">ミップマッピング</string>
+    <string name="retro_scr_ee_cycle_rate">EE サイクルレート</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (デフォルト)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE サイクルスキップ</string>
+    <string name="retro_scr_skip_off">オフ</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">マルチスレッド VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Fast CDVD</string>
+    <string name="retro_scr_touch_controls">画面上のタッチコントロール</string>
+    <string name="retro_scr_sound">サウンド</string>
+    <string name="retro_scr_swap_stereo">ステレオチャンネルを入れ替え</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: エミュレーション速度</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU 使用率</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU 使用率</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: 内部解像度</string>
+    <string name="retro_scr_enable_online_dev9">オンラインを有効化 (DEV9)</string>
+    <string name="retro_scr_ethernet_device">イーサネットデバイス</string>
+    <string name="retro_scr_net_auto">自動</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS モード</string>
+    <string name="retro_scr_dns_manual">手動</string>
+    <string name="retro_scr_dns_internal">内部</string>
+    <string name="retro_scr_primary_dns">プライマリ DNS</string>
+    <string name="retro_scr_secondary_dns">セカンダリ DNS</string>
+    <string name="retro_scr_optional">任意</string>
+    <string name="retro_scr_auto_ip_dhcp">自動 IP (DHCP)</string>
+    <string name="retro_scr_shader">シェーダー</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR アップスケーリング</string>
+    <string name="retro_scr_performance_hud">パフォーマンス HUD</string>
+    <string name="retro_scr_credits_licenses">クレジット &amp; ライセンス</string>
+    <string name="retro_scr_credits_desc">WinNative の一部の機能はこれらのオープンソースプロジェクトを基盤としています。タップして各ソースを表示します。</string>
+    <string name="retro_scr_tab_defaults">デフォルト</string>
+    <string name="retro_scr_tab_credits">クレジット</string>
+    <string name="retro_scr_enable_hardcore_title">ハードコアモードを有効にしますか？</string>
+    <string name="retro_scr_enable_hardcore_body">ハードコアモードは今すぐゲームをリセットし、ステートセーブのロード、早送り、チートを無効にします。保存していない進行状況は失われます。続行しますか？</string>
+    <string name="retro_scr_cancel">キャンセル</string>
+    <string name="retro_scr_enable">有効化</string>
+    <string name="retro_scr_bios_imported">BIOS をインポートしました: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">無効な BIOS ファイル</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS をインポートしました: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">無効な PS2 BIOS ファイル</string>
+    <string name="retro_scr_no_game_serial">チートを検索するゲームシリアルがありません。</string>
+    <string name="retro_scr_applied_cheats">%1$d 件のチートを適用しました。</string>
+    <string name="retro_scr_couldnt_apply_cheats">チートを適用できませんでした。</string>
+    <string name="retro_scr_cheats">チート</string>
+    <string name="retro_scr_apply">適用</string>
+    <string name="retro_scr_no_cheats_found">このゲームのチートが見つかりません。</string>
+    <string name="retro_scr_achievements">実績</string>
+    <string name="retro_scr_sign_in_ra">RetroAchievements にサインイン</string>
+    <string name="retro_scr_username">ユーザー名</string>
+    <string name="retro_scr_password">パスワード</string>
+    <string name="retro_scr_login_failed">ログインに失敗しました</string>
+    <string name="retro_scr_signing_in">サインインしています…</string>
+    <string name="retro_scr_sign_in">サインイン</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">このゲームの実績はありません。</string>
+    <string name="retro_scr_back">戻る</string>
+    <string name="retro_scr_enabled">有効</string>
+    <string name="retro_scr_disabled">無効</string>
+    <string name="retro_scr_rename">名前を変更</string>
+    <string name="retro_scr_save">保存</string>
+    <string name="retro_scr_cloud_save_conflict">クラウドセーブの競合</string>
+    <string name="retro_scr_keep_local_save">ローカルセーブを保持</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">メニュー</string>
+    <string name="retro_tab_display">表示</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">サウンド</string>
+    <string name="retro_tab_controls">コントロール</string>
+    <string name="retro_scan_up_to_date">ライブラリは最新です</string>
+    <string name="retro_scan_roms">ROM: %1$s</string>
+    <string name="retro_scan_added">%1$d 件追加</string>
+    <string name="retro_scan_removed">%1$d 件削除</string>
+    <string name="retro_scr_shader_default">デフォルト</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">シャープ</string>
+    <string name="retro_scr_upscale_native">ネイティブ</string>
+    <string name="retro_co_aspect_ratio">アスペクト比</string>
+    <string name="retro_co_ntsc_filter">NTSC フィルター</string>
+    <string name="retro_co_colorization">カラー化</string>
+    <string name="retro_co_color_correction">色補正</string>
+    <string name="retro_co_remove_sprite_limit">スプライト制限を解除</string>
+    <string name="retro_co_resolution">解像度</string>
+    <string name="retro_co_framebuffer_emulation">フレームバッファエミュレーション</string>
+    <string name="retro_co_dithering">ディザリング</string>
+    <string name="retro_co_widescreen_hack">ワイドスクリーンハック</string>
+    <string name="retro_co_val_8_7_native">8:7 (ネイティブ)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">オフ</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">コンポジット</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">自動</string>
+    <string name="retro_co_val_gba_screen">GBA スクリーン</string>
+    <string name="retro_co_val_gbc_screen">GBC スクリーン</string>
+    <string name="retro_co_val_on">オン</string>
+    <string name="retro_co_val_320x240_native">320x240 (ネイティブ)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 調整済み</string>
+    <string name="retro_co_val_native">ネイティブ</string>
+    <string name="retro_co_val_internal">内部</string>
+    <string name="retro_co_val_on_16_9">オン (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">RetroAchievements アカウントでサインインして、レトロゲームの実績を獲得・追跡しましょう。</string>
+    <string name="retro_ach_username">ユーザー名</string>
+    <string name="retro_ach_password">パスワード</string>
+    <string name="retro_ach_enter_credentials">ユーザー名とパスワードを入力してください</string>
+    <string name="retro_ach_login_failed">ログインに失敗しました</string>
+    <string name="retro_ach_sign_in">サインイン</string>
+    <string name="retro_ach_password_disclaimer">パスワードはログイントークンの取得に一度だけ使用され、デバイス上に安全に保存されます。</string>
+    <string name="retro_ach_achievements_enabled">実績を有効化</string>
+    <string name="retro_ach_hardcore_mode">ハードコアモード (ステートセーブなし)</string>
+    <string name="retro_ach_points">%1$d / %2$d ポイント</string>
+    <string name="retro_ach_none_found">このゲームの実績が見つかりません。</string>
+    <string name="retro_ach_sign_out">サインアウト</string>
+    <string name="retro_che_brand">チート</string>
+    <string name="retro_che_name">名前</string>
+    <string name="retro_che_code">コード</string>
+    <string name="retro_che_cancel">キャンセル</string>
+    <string name="retro_che_save">保存</string>
+    <string name="retro_che_default_name">チート %1$d</string>
+    <string name="retro_che_empty">チートはまだありません。このゲームのチートコードを追加してください。</string>
+    <string name="retro_che_add">チートを追加</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPUドライバー</string>
+    <string name="retro_gpu_driver_system">システム（デフォルト）</string>
+    <string name="retro_gpu_driver_hint">Turnipドライバーは設定 \u2192 ドライバーからインストールします。同じドライバーがPCとPS2の両方のゲームで動作します。</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Final Fantasy XI などの HDD ベースのゲーム用の仮想内蔵ドライブ。ゲームを再起動します。</string>
+    <string name="retro_ps2_hdd_desc">Final Fantasy XI などの HDD ベースのゲーム用の仮想内蔵ドライブ。</string>
+    <string name="retro_ps2_dns_auto_internal">カスタムサーバーホストを有効にするため、DNS モードを Internal に設定しました。</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">CPU コア</string>
+    <string name="retro_co_dual_core">デュアルコア</string>
+    <string name="retro_co_internal_cheats">内部チート</string>
+    <string name="retro_co_internal_resolution">内部解像度</string>
+    <string name="retro_co_renderer">レンダラー</string>
+    <string name="retro_co_sensor_bar">センサーバーの位置</string>
+    <string name="retro_co_skip_gc_bios">BIOS イントロをスキップ</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">下</string>
+    <string name="retro_co_val_cached_interpreter">キャッシュ付きインタプリタ</string>
+    <string name="retro_co_val_hardware">ハードウェア</string>
+    <string name="retro_co_val_interpreter">インタプリタ</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">マウス / タッチ</string>
+    <string name="retro_co_val_right_stick_absolute">右スティック (絶対)</string>
+    <string name="retro_co_val_right_stick_relative">右スティック (相対)</string>
+    <string name="retro_co_val_software">ソフトウェア</string>
+    <string name="retro_co_val_stretch">引き伸ばし</string>
+    <string name="retro_co_val_top">上</string>
+    <string name="retro_co_vbi_skip">VBI スキップ (自動フレームスキップ)</string>
+    <string name="retro_co_widescreen">ワイドスクリーン</string>
+    <string name="retro_co_wiimote_pointer">Wiimote ポインター</string>
+    <string name="retro_gs_cheats_apply_note">変更は次回このゲームを起動したときに適用されます。</string>
+    <string name="retro_gs_cheats_detect_hint">このゲームを一度起動するとディスクのシリアルが検出され、チートとパッチがここに表示されます。</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS 認証バイパス — オンラインプレイに必要</string>
+    <string name="retro_gs_dnas_group">自動適用 (オンライン)</string>
+    <string name="retro_gs_group_cheats">チート &amp; パッチ</string>
+    <string name="retro_gs_hdd_image_size">サイズ: %1$s</string>
+    <string name="retro_gs_hdd_import">HDD イメージをインポート</string>
+    <string name="retro_gs_hdd_remove_short">削除</string>
+    <string name="retro_gs_netplay_enable">NetPlay を有効化</string>
+    <string name="retro_gs_netplay_enable_subtitle">デフォルトはオフです。有効にしてから、起動前にホストまたは参加を選択してください。\nゲームを終了すると再びオフになります。</string>
+    <string name="retro_gs_netplay_host">ホストアドレス</string>
+    <string name="retro_gs_netplay_host_hint">IP またはホスト名</string>
+    <string name="retro_gs_netplay_host_mode">ホストセッション</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">オン = プレイヤーを待つ。オフ = ホストアドレスに参加</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay は TCP 経由のローカルマルチプレイヤーポートを使用します (プレイヤー 1 がホスト / プレイヤー 2 がクライアント)。PS2 オンラインは代わりに DEV9 イーサネットを使用します。</string>
+    <string name="retro_gs_netplay_port">ポート</string>
+    <string name="retro_lr_memory_card_slot">メモリーカード %1$d</string>
+    <string name="retro_lr_screenshot">スクリーンショット</string>
+    <string name="retro_lr_use_cloud_save">クラウドセーブを使用</string>
+    <string name="retro_netplay_conn_direct">LAN (直接 IP)</string>
+    <string name="retro_netplay_connecting">接続中…</string>
+    <string name="retro_netplay_connection">接続</string>
+    <string name="retro_netplay_conn_traversal">オンライン (ホストコード)</string>
+    <string name="retro_netplay_dismiss">閉じる</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii の NetPlay は Dolphin 独自のエンジンを使用します。ホスト = プレイヤー 1、参加 = プレイヤー 2。起動前にホストまたは参加と接続タイプを選択してください。両方のデバイスが同じゲームを一緒に起動します。</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">デバイスの Wi‑Fi IP とこのポートをプレイヤー 2 と共有してください。相手が接続すると自動的にゲームが開始します。</string>
+    <string name="retro_netplay_dolphin_host_online_hint">ゲーム起動時にホストコードが表示されます — プレイヤー 2 と共有してください。相手が接続すると自動的にゲームが開始します。</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">ホストの Wi‑Fi IP とポートを入力してから、起動して接続してください。</string>
+    <string name="retro_netplay_dolphin_join_online_hint">プレイヤー 1 のホストコードを入力してから、起動して接続してください。</string>
+    <string name="retro_netplay_enable_before_launch">ゲーム設定で NetPlay を有効にし、起動前にホストまたは参加を選択してください</string>
+    <string name="retro_netplay_find_rooms">Wi‑Fi 上のルームを探す</string>
+    <string name="retro_netplay_game_link_hint">Game Link · 各画面がそれぞれの携帯機です</string>
+    <string name="retro_netplay_gba_not_ready">GBA マルチプレイヤーは gpSP + ワイヤレスアダプターを使用します。libgpsp がインストールされていることを確認してください。</string>
+    <string name="retro_netplay_help">Wi‑Fi 経由の画面共有マルチプレイヤー (RetroArch と同様)。\nホスト = プレイヤー 1、参加 = プレイヤー 2。両方のデバイスに同じゲームが表示されます。</string>
+    <string name="retro_netplay_help_game_link">Wi‑Fi 経由の Game Link — 各デバイスがそれぞれのゲームを実行します。\nGB/GBC: Gambatte シリアルリンク (Pokémon 第 1〜2 世代)。\nGBA: gpSP ワイヤレスアダプター (Pokémon FR/LG/エメラルドのバトル)。</string>
+    <string name="retro_netplay_host_action">ルームをホスト</string>
+    <string name="retro_netplay_host_code">ホストコード</string>
+    <string name="retro_netplay_host_code_hint">ホストからのトラバーサルホストコード</string>
+    <string name="retro_netplay_hosting_room">ルームをホスト中</string>
+    <string name="retro_netplay_host_mode_hint">ホストをタップしてこのプレイセッション用のルームを開き、ゲームを起動してください。NetPlay は終了時にオフになります。</string>
+    <string name="retro_netplay_in_room">ルーム内</string>
+    <string name="retro_netplay_join_action">IP で参加</string>
+    <string name="retro_netplay_joined">参加しました</string>
+    <string name="retro_netplay_join_room">参加</string>
+    <string name="retro_netplay_launch_mode">起動時</string>
+    <string name="retro_netplay_leave">退出</string>
+    <string name="retro_netplay_menu_hint">ホスト = P1 · 参加 = P2 · 両方の画面に同じゲーム</string>
+    <string name="retro_netplay_mode_host">ホスト</string>
+    <string name="retro_netplay_mode_join">参加</string>
+    <string name="retro_netplay_mode_manual">手動</string>
+    <string name="retro_netplay_no_rooms">ルームが見つかりません。ホストが同じ Wi‑Fi に接続しており、ルームをホストしていることを確認してください。</string>
+    <string name="retro_netplay_player_name">表示名</string>
+    <string name="retro_netplay_player_name_hint">他のプレイヤーに表示されます</string>
+    <string name="retro_netplay_players_count">%1$d 人接続中</string>
+    <string name="retro_netplay_prelaunch_hint">ルームはこのセッションのみ有効です。準備ができたら起動してください。ゲームを終了すると NetPlay がオフになります。</string>
+    <string name="retro_netplay_room_players">プレイヤー</string>
+    <string name="retro_netplay_scan_action">Wi‑Fi をスキャン</string>
+    <string name="retro_netplay_scan_again">再スキャン</string>
+    <string name="retro_netplay_scan_hint">同じ Wi‑Fi で開いているルームをスキャンするか、IP アドレスで参加してください。</string>
+    <string name="retro_netplay_scanning">Wi‑Fi をスキャン中…</string>
+    <string name="retro_netplay_scan_results">スキャン結果</string>
+    <string name="retro_netplay_select_room_hint">ルームをタップすると今すぐ参加できます (次回起動用に IP は保存されません)。</string>
+    <string name="retro_netplay_stop_scan">スキャンを停止</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s が接続しました</string>
+    <string name="retro_netplay_user_disconnected">%1$s が切断しました</string>
+    <string name="retro_netplay_waiting_players">プレイヤーを待っています…</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2 のサポートは近日公開予定です</string>
+    <string name="retro_ps2_show_l3r3">L3 / R3 ボタンを表示</string>
+    <string name="retro_ps2_show_l3r3_subtitle">オフの場合、スティックをダブルタップすると L3 / R3 をクリックできます</string>
+    <string name="retro_ps2_turnip_flags">TURNIP ドライバーフラグ</string>
+    <string name="retro_ps2_turnip_flags_note">上で選択したカスタム GPU ドライバーが選択されている場合にのみ適用されます。</string>
+    <string name="retro_rom_missing">ゲームファイルが見つかりません</string>
+    <string name="retro_scr_delete">削除</string>
+    <string name="retro_scr_import_from_file">ファイルからインポート…</string>
+    <string name="retro_scr_loading">読み込み中…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">コンソールを変更</string>
+    <string name="retro_gs_identify_as">コンソールとして識別</string>
+    <string name="retro_gs_console_changed">現在 %1$s として識別されています</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">内蔵の vkBasalt レイヤーを介して DXVK/VKD3D（Vulkan）ゲームに ReShade エフェクト（.fx）を適用します。各エフェクトを Android/data/&lt;package&gt;/files/ReShade/ 以下の専用フォルダーに配置してください。ライブパラメーター調整とゲーム内トグルは、ライブリロードレイヤーの更新で提供されます。</string>
+    <string name="reshade_catalog_title">ReShade エフェクト</string>
+    <string name="reshade_catalog_search">エフェクトを検索…</string>
+    <string name="reshade_catalog_installed">インストール済み (%1$d)</string>
+    <string name="reshade_catalog_available">利用可能 (%1$d)</string>
+    <string name="reshade_catalog_downloading">ダウンロード中</string>
+    <string name="reshade_catalog_installing">インストール中</string>
+    <string name="reshade_catalog_offline_cache">オフライン — キャッシュされたリストを表示しています。新しいエフェクトをダウンロードするには接続してください。</string>
+    <string name="reshade_catalog_offline_none">オフライン — インストール済みのエフェクトのみ表示しています。カタログを参照するには接続してください。</string>
+    <string name="reshade_catalog_needs_connection">エフェクトをダウンロードするにはインターネットに接続してください。</string>
+    <string name="reshade_catalog_download_failed">%1$s のダウンロードに失敗しました。</string>
+    <string name="reshade_catalog_empty_query">\"%1$s\" に一致するエフェクトはありません。</string>
+    <string name="reshade_catalog_empty">利用可能なエフェクトがありません。カタログを参照するにはインターネットに接続してください。</string>
+    <string name="reshade_catalog_done">完了</string>
+    <string name="reshade_catalog_delete_cd">%1$s を削除</string>
+    <string name="reshade_catalog_delete_title">%1$s を削除しますか？</string>
+    <string name="reshade_catalog_delete_body">ストレージと、これを使用しているすべてのロードアウトからエフェクトが削除されます。後で再度ダウンロードできます。</string>
+    <string name="reshade_catalog_delete_confirm">削除</string>
+    <string name="reshade_catalog_delete_cancel">キャンセル</string>
+    <string name="reshade_catalog_delete_failed">%1$s を削除できませんでした。</string>
+    <string name="reshade_params_title">エフェクトのパラメーター</string>
+    <string name="reshade_params_reset">リセット</string>
+    <string name="reshade_loadout_empty">エフェクトはまだありません。ロードアウトを作成するには、1 つ以上のエフェクトを追加してください。</string>
+    <string name="reshade_loadout_add">エフェクトを追加</string>
+    <string name="reshade_loadout_full">ロードアウトが満杯です — 別のエフェクトを追加するには 1 つ削除してください。</string>
+    <string name="reshade_effect_active">有効</string>
+    <string name="reshade_mode_solo">ソロ</string>
+    <string name="reshade_mode_stack">スタック</string>
+    <string name="reshade_mode_solo_hint">一度に 1 つのエフェクトが有効（A/B 比較、ゲーム中にライブ切り替え）。</string>
+    <string name="reshade_mode_stack_hint">任意のエフェクトの組み合わせを重ねて、順番に適用します。</string>
+    <string name="reshade_drawer_enable">ReShade を有効にする</string>
+    <string name="reshade_drawer_empty">このロードアウトには ReShade エフェクトがありません。ここで切り替えたり調整したりするには、このゲームの設定（またはコンテナの設定）でエフェクトを追加してください。</string>
+    <string name="reshade_drawer_no_params">このエフェクトには調整可能なパラメーターがありません。</string>
+    <string name="cloud_saves_deleting">セーブデータを削除中…</string>
+    <string name="cloud_saves_history_delete">削除</string>
+    <string name="cloud_saves_history_delete_confirm_body">%1$s のクラウドセーブを完全に削除しますか？この操作は取り消せません。</string>
+    <string name="cloud_saves_history_delete_confirm_title">クラウドセーブを削除</string>
+    <string name="cloud_saves_history_delete_failed">クラウドセーブを削除できませんでした</string>
+    <string name="cloud_saves_history_delete_success">クラウドセーブを削除しました</string>
+    <string name="retro_bundle_required">先にコンソールコアをダウンロードしてください — 設定 › レトロ</string>
+    <string name="retro_ps2_device_unsupported">このデバイスでは PS2 エミュレーションを実行できません。OpenGL ES 3.1 以降が必要です。</string>
+    <string name="retro_scr_consoles_check">更新を確認</string>
+    <string name="retro_scr_consoles_checking">更新を確認中…</string>
+    <string name="retro_scr_consoles_download">コンソールコアをダウンロード</string>
+    <string name="retro_scr_consoles_downloading">ダウンロード中… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">コンソールコア</string>
+    <string name="retro_scr_consoles_installed">インストール済み — ビルド %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">インストール済み — ビルド %1$s（更新の確認に失敗）</string>
+    <string name="retro_scr_consoles_installing">インストール中…</string>
+    <string name="retro_scr_consoles_missing">未インストール — ダウンロードするとレトロゲームをプレイできます</string>
+    <string name="retro_scr_consoles_state">状態</string>
+    <string name="retro_scr_consoles_update">コンソールコアを更新</string>
+    <string name="retro_scr_consoles_update_available">更新があります — ビルド %1$s（%2$d MB）</string>
+    <string name="retro_scr_consoles_verifying">ダウンロードを検証中…</string>
+    <string name="retro_scr_consoles_working">処理中…</string>
+    <string name="retro_tab_system">システム</string>
+</resources>
diff --git a/app/src/main/res/values-ko/arrays.xml b/app/src/main/res/values-ko/arrays.xml
new file mode 100644
index 000000000..d46ba7114
--- /dev/null
+++ b/app/src/main/res/values-ko/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>이미지</item>
+        <item>원본</item>
+        <item>단색</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b29a073e2..f0d8f4b05 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">올바른 .exe 파일을 선택하세요</string>
     <string name="common_ui_select_valid_icon_file">올바른 .ico 또는 .png 파일을 선택하세요.</string>
     <string name="common_ui_exit">종료</string>
+    <string name="common_ui_exit_app">앱 종료</string>
     <string name="common_ui_profile">프로필</string>
     <string name="common_ui_name">이름</string>
     <string name="common_ui_ok">확인</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">아이콘</string>
     <string name="common_ui_duplicate">복제</string>
     <string name="common_ui_credits_and_third_party_apps">크레딧 및 서드파티 앱</string>
-    <string name="common_ui_loading">로딩 중…</string>
+    <string name="common_ui_loading">로딩 중</string>
+    <string name="common_ui_exporting">내보내는 중</string>
     <string name="common_ui_enable">활성화</string>
     <string name="common_ui_disable">비활성화</string>
     <string name="common_ui_force">강제</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">높이</string>
     <string name="common_ui_open_file">파일 열기</string>
     <string name="common_ui_download_file">파일 다운로드</string>
-    <string name="common_ui_downloading_file">파일 다운로드 중...</string>
+    <string name="common_ui_downloading_file">파일 다운로드 중</string>
     <string name="common_ui_browse">찾아보기</string>
     <string name="common_ui_options">옵션</string>
     <string name="common_ui_export">내보내기</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">설정</string>
     <string name="common_ui_enable_all">모두 활성화</string>
     <string name="common_ui_disable_all">모두 비활성화</string>
+    <string name="common_ui_select_all">모두 선택</string>
+    <string name="common_ui_deselect_all">모두 선택 해제</string>
     <string name="common_ui_on">켜기</string>
     <string name="common_ui_off">끄기</string>
     <string name="common_ui_already_set">이미 설정됨</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">설치</string>
     <string name="common_ui_application">애플리케이션</string>
     <string name="common_ui_check">확인</string>
+    <string name="store_game_check_for_update">업데이트 확인</string>
+    <string name="store_game_checking_for_update">확인 중</string>
+    <string name="store_game_download_update">업데이트 다운로드</string>
+    <string name="store_game_no_update_available">사용 가능한 업데이트 없음</string>
+    <string name="store_game_update_available">업데이트 가능</string>
+    <string name="store_game_update_check_failed">업데이트 확인 실패</string>
+    <string name="store_game_update">업데이트</string>
+    <string name="store_game_workshop">창작마당</string>
+    <string name="store_game_verify_files">파일 확인</string>
+    <string name="store_game_verify_started">%1$s 확인 중 — 다운로드 탭을 확인하세요</string>
+    <string name="store_game_steam_options">Steam 옵션</string>
+    <string name="store_game_verify_complete">파일 확인 완료</string>
+    <string name="store_game_verify_failed_notice">파일 확인 실패</string>
+    <string name="store_game_progress_background_hint">이 창을 닫아도 계속 실행됩니다. 언제든지 다운로드 탭에서 확인하세요.</string>
+    <string name="store_game_checking_updates">업데이트 확인 중</string>
+    <string name="store_game_no_updates_notice">사용 가능한 업데이트 없음</string>
+    <string name="store_game_update_complete">업데이트 완료</string>
+    <string name="store_game_update_failed_notice">업데이트 실패</string>
+    <string name="store_game_update_check_failed_notice">업데이트 확인 실패</string>
+    <string name="store_game_download_already_active">이 게임은 이미 다운로드 중입니다. DLC를 추가하기 전에 현재 다운로드를 취소하세요.</string>
     <string name="common_ui_select">선택</string>
     <string name="common_ui_select_folder">폴더 선택</string>
     <string name="common_ui_current_folder">현재 폴더</string>
+    <string name="common_ui_enter_path">경로 입력</string>
+    <string name="common_ui_path_not_found">경로를 찾을 수 없음</string>
     <string name="common_ui_storage_roots">저장소 루트</string>
     <string name="common_ui_browse_local_folders_directly">로컬 폴더를 바로 탐색</string>
     <string name="common_ui_no_folders_available_here">여기에서 사용할 수 있는 폴더가 없습니다</string>
     <string name="common_ui_grant_all_files_access_browse">로컬 폴더를 바로 탐색하려면 모든 파일 접근 권한을 허용하세요.</string>
     <string name="common_ui_not_configured">구성되지 않음</string>
     <string name="common_ui_reinstall">재설치</string>
-    <string name="common_ui_exit_app_confirm">WinNative를 종료하시겠습니까?</string>
     <string name="common_ui_elements_count">%1$d개 항목</string>
     <string name="common_ui_disabled_placeholder">-- 비활성화됨 --</string>
     <string name="common_ui_enabled">활성화됨</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">아트워크 가져오기</string>
+    <string name="library_games_scraping_artwork">가져오는 중</string>
     <string name="library_games_shortcut_created">바로가기가 생성되었습니다</string>
     <string name="library_games_failed_to_create_shortcut">바로가기 생성 실패: %s</string>
     <string name="library_games_install_path">설치 경로</string>
+    <string name="library_games_not_enough_space">%1$s의 공간이 더 필요합니다</string>
     <string name="library_games_download_slash_install">다운로드 / 설치</string>
     <string name="library_games_save_management">저장 데이터 관리</string>
     <string name="library_games_download_install_available">%1$s / %2$s • 사용 가능: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">설치된 게임 없음\n클릭하여 Winlator 백엔드 열기</string>
     <string name="library_games_installed_badge">설치됨</string>
     <string name="library_games_unknown_game">알 수 없는 게임</string>
-    <string name="library_games_layouts_header">레이아웃</string>
+    <string name="library_games_layouts_header">라이브러리 레이아웃</string>
     <string name="library_games_layout_carousel">캐러셀</string>
     <string name="library_games_layout_list">목록</string>
+    <string name="library_games_view_options_header">보기 옵션</string>
+    <string name="library_games_immersive_mode">몰입 모드</string>
+    <string name="library_games_immersive_mode_description">포커스된 게임 아트를 배경으로 사용</string>
+    <string name="library_games_immersive_blur">배경 흐리게</string>
+    <string name="library_games_immersive_blur_description">몰입 배경에 흐림 효과 적용</string>
     <string name="library_games_custom_game">사용자 지정 게임</string>
     <string name="library_games_play">플레이</string>
+    <string name="hero_boot_to_desktop_title">데스크톱으로 부팅</string>
+    <string name="hero_graphics_tests_title">그래픽 테스트</string>
+    <string name="hero_graphics_test_32">32비트</string>
+    <string name="hero_graphics_test_64">64비트</string>
+    <string name="hero_input_tests_title">입력 테스트</string>
     <string name="library_games_add_custom_game">사용자 지정 게임 추가</string>
     <string name="library_games_game_name">게임 이름</string>
     <string name="library_games_game_folder_mapped_drive">게임 폴더(매핑된 게임 드라이브)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">취소됨</string>
     <string name="downloads_queue_phase_failed">실패: %1$s</string>
     <string name="downloads_queue_cancel_download">다운로드 취소</string>
+    <string name="downloads_queue_cancel_download_title">다운로드를 취소하시겠습니까?</string>
+    <string name="downloads_queue_cancel_download_warning">DLC, 게임 또는 업데이트 다운로드를 취소하면 게임 설치가 손상될 수 있습니다.\n\n정말 취소하시겠습니까?</string>
     <string name="downloads_queue_empty">활성 다운로드가 없습니다.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">새 컨테이너</string>
     <string name="containers_list_edit">컨테이너 편집</string>
-    <string name="containers_list_creating">컨테이너 생성 중…</string>
-    <string name="containers_list_removing">컨테이너 제거 중…</string>
-    <string name="containers_list_duplicating">컨테이너 복제 중…</string>
+    <string name="containers_list_creating">컨테이너 생성 중</string>
+    <string name="containers_list_removing">컨테이너 제거 중</string>
+    <string name="containers_list_duplicating">컨테이너 복제 중</string>
+    <string name="containers_list_remove_title">컨테이너 제거</string>
+    <string name="containers_list_duplicate_title">컨테이너 복제</string>
     <string name="containers_list_confirm_remove">이 컨테이너를 제거하시겠습니까?</string>
     <string name="containers_list_confirm_duplicate">이 컨테이너를 복제하시겠습니까?</string>
+    <string name="containers_list_duplicate_failed">컨테이너 복제에 실패했습니다</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">이 바로가기를 제거하시겠습니까?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">바로가기 복제에 실패했습니다.</string>
     <string name="shortcuts_list_exported_to">바로가기가 %1$s(으)로 내보내졌습니다</string>
     <string name="shortcuts_list_failed_export">바로가기 내보내기에 실패했습니다</string>
+    <string name="shortcuts_export_all">모두 내보내기</string>
+    <string name="shortcuts_export_to_frontend">프런트엔드로 내보내기</string>
+    <string name="shortcuts_export_all_done">게임 %1$d개를 %2$s(으)로 내보냈습니다</string>
+    <string name="shortcuts_export_all_none">내보낼 게임이 없습니다</string>
     <string name="shortcuts_list_added">바로가기가 성공적으로 추가되었습니다.</string>
     <string name="shortcuts_list_failed_add">바로가기 추가에 실패했습니다.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">XInput 비활성화 (마우스/키보드 전용 제어)</string>
     <string name="shortcuts_properties_exclusive_input">전용 입력</string>
     <string name="shortcuts_properties_custom_game_settings">사용자 지정 게임 설정</string>
-    <string name="shortcuts_properties_use_cold_client">ColdClient Launcher 사용</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient는 Steam 에뮬레이션과 DRM을 처리하는 권장 방식입니다. 게임 파일을 수정하지 않고 런타임에 DRM을 패치합니다.</string>
-    <string name="shortcuts_properties_unpack_files">레거시 DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">디스크의 exe에서 SteamStub DRM을 제거합니다. 게임이 이 기능 없이 실행되지 않을 때만 활성화하세요. ColdClient의 런타임 패처가 대부분의 게임을 자동으로 처리합니다.</string>
-    <string name="shortcuts_properties_force_dlc">DLC 강제 적용</string>
-    <string name="shortcuts_properties_force_dlc_description">DLC가 감지되지 않거나 DLC가 포함된 저장 데이터가 작동하지 않는 경우에만 활성화하세요</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Steam 클라이언트 실행 (베타)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Wine에서 실제 Steam 클라이언트를 실행합니다\nSteam 계정이 필요하며 성능이 저하될 수 있습니다\n모든 게임이 작동하지는 않습니다</string>
-    <string name="shortcuts_properties_steam_type">Steam 클라이언트 성능</string>
-    <string name="steam_section_emulator">Steam 에뮬레이터 (Goldberg)</string>
-    <string name="steam_section_real_client">실제 Steam 클라이언트</string>
     <string name="shortcuts_properties_use_steam_input">Steam 입력 사용</string>
     <string name="shortcuts_properties_steam_offline_mode">Steam 오프라인 모드</string>
     <string name="shortcuts_properties_reset">속성 초기화</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">이 프로필을 복제하시겠습니까?</string>
     <string name="input_controls_editor_title">컨트롤 편집기</string>
     <string name="input_controls_editor_toggle_switch">토글 스위치</string>
+    <string name="input_controls_editor_swipeable">스와이프 가능</string>
     <string name="input_controls_editor_profile_exported_to">프로필이 다음으로 내보내졌습니다:</string>
     <string name="input_controls_editor_unable_to_import">프로필을 가져올 수 없습니다</string>
     <string name="input_controls_editor_import_profile">프로필 가져오기</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">호환성</string>
     <string name="container_box64_intermediate">중간</string>
     <string name="container_box64_performance">성능</string>
+    <string name="container_fexcore_performance_tso">성능 TSO</string>
+    <string name="container_fexcore_extreme">익스트림</string>
+    <string name="container_fexcore_extreme_tso">익스트림 TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         CALL/RET 옵코드의 플래그 처리&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : CALL/RET에 플래그가 필요하지 않은 것으로 처리 (빠르지만 불안정)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">FEXCore 프리셋</string>
     <string name="container_fexcore_version">FEXCore 버전</string>
+    <string name="use_unix_libs">UnixLibs 사용</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">그래픽 드라이버</string>
+    <string name="container_zink_mode">Zink 모드</string>
+    <string name="container_graphics_transcoder">BCn 트랜스코더</string>
+    <string name="container_graphics_quality">BCn 품질</string>
     <string name="container_graphics_configuration">그래픽 드라이버 구성</string>
     <string name="container_graphics_version">그래픽 드라이버 버전</string>
     <string name="container_graphics_available_extensions">사용 가능한 확장</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">BCn 에뮬레이션</string>
     <string name="container_graphics_bcn_emulation_type">BCn 에뮬레이션 유형</string>
     <string name="container_graphics_bcn_emulation_cache">BCn 에뮬레이션 캐시</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ 게임 슈퍼 해상도 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">가장자리 선명도</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">이 프리셋을 복제하시겠습니까?</string>
     <string name="container_presets_confirm_remove">이 프리셋을 제거하시겠습니까?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">DRI3 확장 사용</string>
     <string name="session_xserver_simulate_touch_screen">터치 스크린 시뮬레이션</string>
     <string name="session_xserver_preferences_button_text">   환경설정   </string>
     <string name="session_xserver_extra_keys_config_desc">Termux 앱에서처럼 extra-keys 변수의 값을 설정할 수 있습니다 (<a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">여기</a>를 참고하세요) \n
@@ -526,12 +572,6 @@
     <string name="session_xserver_pref_kbd">키보드</string>
     <string name="session_xserver_pref_other">기타</string>
     <string name="session_xserver_pref_version">버전</string>
-    <string name="session_xserver_use_dri3_description">비활성화하면 일부 기기에서 그래픽 결함이 수정될 수 있습니다</string>
-    <string name="session_xserver_native_rendering">네이티브 렌더링</string>
-    <string name="session_xserver_native_rendering_enabled">DRI3 하드웨어 렌더링</string>
-    <string name="session_xserver_native_rendering_disabled">소프트웨어 WSI 폴백</string>
-    <string name="session_xserver_native_rendering_enabled_toast">네이티브 렌더링 활성화됨 (다음 실행 시 적용)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">네이티브 렌더링 비활성화됨 (다음 실행 시 적용)</string>
     <string name="session_xserver_notification_description">WinNative XServer 메시지</string>
     <string name="session_xserver_notification_content">WinNative가 실행 중입니다. 이 알림을 종료하거나 스와이프하지 마세요</string>
 
@@ -551,6 +591,8 @@
     <string name="session_drawer_exit_subtitle">실행 중인 세션 닫기</string>
     <string name="session_drawer_touchscreen_overlay">터치스크린 오버레이</string>
     <string name="session_drawer_resume">재개</string>
+    <string name="session_drawer_retry">다시 시도</string>
+    <string name="downloads_no_internet">인터넷 연결 없음</string>
     <string name="session_drawer_pause">일시 중지</string>
     <string name="session_drawer_wine_processes_paused">Wine 프로세스가 일시 중지되었습니다</string>
     <string name="session_drawer_pause_all_wine_processes">모든 Wine 프로세스 일시 중지</string>
@@ -561,6 +603,33 @@
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">배터리</string>
     <string name="session_drawer_hud_element_graph">그래프</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango 스타일 HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD 설정</string>
+    <string name="mango_hud_element_gpu_load">GPU 부하</string>
+    <string name="mango_hud_element_gpu_temp">GPU 온도</string>
+    <string name="mango_hud_element_cpu_load">CPU 부하</string>
+    <string name="mango_hud_element_cpu_temp">CPU 온도</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">배터리</string>
+    <string name="mango_hud_element_lows" formatted="false">1% 최저</string>
+    <string name="mango_hud_element_graph">프레임타임 그래프</string>
+    <string name="mango_hud_element_engine">엔진</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU 클럭</string>
+    <string name="mango_hud_element_gpu_clock">GPU 클럭</string>
+    <string name="mango_hud_element_cores">코어별</string>
+    <string name="mango_hud_element_network">네트워크</string>
+    <string name="mango_hud_element_swap">스왑</string>
+    <string name="mango_hud_element_resolution">해상도</string>
+    <string name="mango_hud_element_wine">Wine 버전</string>
+    <string name="mango_hud_element_duration">세션 시간</string>
+    <string name="mango_hud_element_clock">시계</string>
+    <string name="mango_hud_element_throttle">스로틀 상태</string>
+    <string name="mango_hud_group_memory">메모리</string>
+    <string name="mango_hud_group_system">시스템</string>
+    <string name="mango_hud_lock">HUD 잠금</string>
+    <string name="mango_hud_lock_subtitle">터치가 HUD 뒤의 컨트롤로 전달됩니다. HUD를 길게 누르면 잠깁니다. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">이 프로세스를 종료하시겠습니까?</string>
@@ -591,6 +660,7 @@
     <string name="session_display_frame_rate">프레임 레이트</string>
     <string name="session_display_title">디스플레이</string>
     <string name="session_display_fullscreen_stretched">전체 화면 활성화 (늘림)</string>
+    <string name="session_display_direct_composition">다이렉트 컴포지션(제로 카피)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">렌더러:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@
     <string name="session_gamepad_error_loading_profile">프로필 불러오기 오류</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">터치스크린 컨트롤</string>
+    <string name="input_controls_auto_hide_on_controller_title">컨트롤러 연결 시 자동 숨김</string>
+    <string name="input_controls_auto_hide_on_controller_summary">컨트롤러가 연결되면 터치스크린 컨트롤 숨기기</string>
     <string name="session_gyroscope_title">자이로스코프</string>
     <string name="session_gyroscope_calibrate">자이로스코프 보정</string>
     <string name="session_gyroscope_enable_right_stick">오른쪽 스틱 자이로스코프 모션 활성화</string>
@@ -700,6 +773,7 @@
     <string name="settings_general_select_wallpaper">배경화면 선택</string>
     <string name="settings_general_title">일반</string>
     <string name="settings_general_enable_file_provider">파일 제공자 활성화</string>
+    <string name="settings_general_enable_auto_scraping">자동 아트워크 가져오기 활성화</string>
     <string name="settings_general_take_effect_next_startup">이 옵션은 다음 시작 시 적용됩니다.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Imagefs 재설치</string>
@@ -713,7 +787,7 @@
     <string name="settings_general_share_android_clipboard">Wine과 Android 클립보드 공유</string>
     <string name="settings_general_paths_title">경로 설정</string>
     <string name="settings_general_paths_summary">Winlator가 작업 데이터를 저장하는 위치와 내보낸 바로가기가 기록되는 위치를 관리합니다.</string>
-    <string name="settings_general_winlator_path_title">Winlator 경로</string>
+    <string name="settings_general_winlator_path_title">저장소 경로</string>
     <string name="settings_general_shortcut_export_path_title">바로가기 내보내기 경로</string>
     <string name="settings_general_choose_path">경로 선택</string>
     <string name="settings_general_xserver_cursor_summary">XServer 세션 내 터치, 트랙패드 및 마우스 입력의 포인터 속도를 조정합니다.</string>
@@ -721,7 +795,9 @@
     <string name="settings_general_cursor_lock_summary">원시 포인터 입력이 필요한 게임에서 직접 마우스 캡처를 유지합니다. 볼륨 다운으로 비활성화할 수 있습니다.</string>
     <string name="settings_general_xinput_toggle_title">XInput 비활성화</string>
     <string name="settings_general_xinput_toggle_summary">마우스와 키보드만 사용하려는 경우 XInput 처리를 끕니다.</string>
-    <string name="settings_general_file_provider_summary">Android 문서 선택기 및 파일 관리자에 Winlator 파일을 노출합니다.</string>
+    <string name="settings_external_display_output_summary">이 화면을 미러링하는 대신 연결된 외부 디스플레이로 게임을 옮깁니다. 안경은 항상 자체 디스플레이를 사용합니다.</string>
+    <string name="settings_general_file_provider_summary">Android 문서 선택기 및 파일 관리자에 WinNative 파일을 노출합니다.</string>
+    <string name="settings_general_auto_scraping_summary">WinNative가 사용자 지정 게임 아트워크를 자동으로 가져올 수 있도록 합니다.</string>
     <string name="settings_general_open_browser_summary">지원되는 웹 링크를 Wine 내부 대신 Android 브라우저에서 엽니다.</string>
     <string name="settings_general_clipboard_summary">Android와 Wine 세션 간에 복사 및 붙여넣기를 허용합니다.</string>
     <string name="settings_general_imagefs_summary">기존 컨테이너를 제거하지 않고 번들된 시스템 파일을 복원합니다.</string>
@@ -736,7 +812,7 @@
     <string name="settings_audio_sound_font_installed_failed">SoundFont 설치에 실패했습니다!</string>
     <string name="settings_audio_sound_font_already_exist">설치하려는 SoundFont가 이미 존재합니다.</string>
     <string name="settings_audio_unable_to_install_soundfont">SoundFont를 설치할 수 없습니다</string>
-    <string name="settings_audio_installing_soundfont">SoundFont 설치 중…</string>
+    <string name="settings_audio_installing_soundfont">SoundFont 설치 중</string>
     <string name="settings_audio_sound_font_bad_format">잘못된 SoundFont 형식입니다.</string>
     <string name="settings_audio_cannot_remove_default">기본 SoundFont는 제거할 수 없습니다</string>
     <string name="settings_audio_summary">MIDI 재생에 사용되는 SoundFont를 설치, 제거 및 선택합니다.</string>
@@ -750,15 +826,33 @@
     <string name="settings_debug_box_logs_subtitle">Box86 및 Box64 디버그 출력을 파일에 기록</string>
     <string name="settings_debug_fex_logs_title">FEXCore 로그 활성화</string>
     <string name="settings_debug_fex_logs_subtitle">FEXCore 디버그 출력을 파일에 기록</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX 에뮬레이션 로그</string>
+    <string name="settings_debug_emulator_logs_subtitle">컨테이너가 사용하는 에뮬레이터를 파일로 기록합니다.</string>
     <string name="settings_debug_steam_logs_title">Steam 로그 활성화</string>
     <string name="settings_debug_steam_logs_subtitle">디버깅을 위해 Steam 인증 및 세션 이벤트를 기록합니다.</string>
     <string name="settings_debug_wine_channels_title">Wine 디버그 채널</string>
     <string name="settings_debug_wine_channels_summary">Wine 디버그 로깅이 활성화되었을 때 포함할 Wine 채널을 선택합니다.</string>
+    <string name="settings_debug_wine_classes_title">Wine 로그 레벨</string>
+    <string name="settings_debug_wine_classes_summary">기록할 메시지 유형을 선택하세요. Trace는 매우 상세합니다.</string>
     <string name="settings_debug_input_logs">입력 로그</string>
     <string name="settings_debug_input_logs_description">게임패드, 터치 및 키보드 입력 이벤트를 기록</string>
     <string name="settings_debug_download_logs">다운로드 로그</string>
     <string name="settings_debug_download_logs_description">다운로드 리졸버 및 WinNative 폴백 이벤트를 기록</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan 검증 레이어</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">적용하려면 디스플레이를 다시 시작하세요.</string>
     <string name="settings_debug_share_logs">로그 공유</string>
+    <string name="settings_debug_delete_logs">로그 삭제</string>
+    <string name="settings_debug_share_all_logs_short">모두 공유</string>
+    <string name="settings_debug_download_all_logs_short">모두 다운로드</string>
+    <string name="settings_debug_logs_saved">%1$s에 저장됨</string>
+    <string name="settings_debug_delete_logs_short">삭제</string>
+    <string name="settings_debug_delete_all_logs_short">모두 삭제</string>
+    <string name="settings_debug_open_logs_folder_short">로그 관리자 열기</string>
+    <string name="settings_debug_logs_deleted">로그가 삭제되었습니다</string>
+    <string name="settings_debug_delete_logs_confirm_title">로그를 삭제할까요?</string>
+    <string name="settings_debug_delete_logs_confirm_message">저장된 모든 로그 파일(%1$s)을 영구적으로 삭제합니다. 되돌릴 수 없습니다.</string>
+    <string name="settings_debug_logs_browser_title">로그</string>
+    <string name="settings_debug_log_truncated">이 로그의 마지막 %1$s 표시 중</string>
     <string name="settings_debug_logs_subject">WinNative 로그 (%1$s)</string>
     <string name="settings_debug_no_logs_available">사용 가능한 디버그 로그가 없습니다. 먼저 디버그 옵션을 활성화하고 게임을 실행하세요.</string>
     <string name="settings_debug_capture_failed">로그 캡처 실패: %1$s</string>
@@ -773,6 +867,8 @@
 
     <string name="settings_other_language_title">언어</string>
     <string name="settings_other_language_summary">표시 언어 선택</string>
+    <string name="settings_other_game_language_title">게임 언어</string>
+    <string name="settings_other_game_language_summary">Steam/Epic/GOG 다운로드에 사용할 기본 언어</string>
     <string name="settings_other_language_system_default">시스템 기본값</string>
 
     <string name="settings_other_section_integration">통합</string>
@@ -790,7 +886,7 @@
     <string name="settings_content_empty_subtitle">시작하려면 패키지를 설치하거나 유형을 전환하세요.</string>
     <string name="settings_content_container_created">컨테이너 생성됨: %1$s</string>
     <string name="settings_content_download_failed">다운로드 실패.</string>
-    <string name="common_ui_working">처리 중…</string>
+    <string name="common_ui_working">처리 중</string>
     <string name="settings_content_desc_wine">Wine 프로젝트에서 제작했으며 Win32 호출을 네이티브 Linux/Android 서비스로 변환합니다.</string>
     <string name="settings_content_desc_proton">Valve에서 제작한 Wine 기반 런타임이며 Windows 게임용 패치를 포함합니다.</string>
     <string name="settings_content_desc_dxvk">Direct3D 9, 10, 11 그래픽 호출을 Vulkan으로 변환합니다.</string>
@@ -798,6 +894,7 @@
     <string name="settings_content_desc_box64">x86_64 Linux 코드를 ARM64 기기에서 실행되도록 변환합니다.</string>
     <string name="settings_content_desc_wowbox64">64비트 Wine에서 32비트 Windows 앱을 실행하기 위해 WoW64가 사용하는 Box64 빌드입니다.</string>
     <string name="settings_content_desc_fexcore">x86 및 x86_64 코드를 ARM64 기기에서 실행되도록 변환합니다.</string>
+    <string name="settings_content_desc_d7vk">DirectDraw(Direct3D 7 이하) 그래픽 호출을 Vulkan으로 변환합니다.</string>
     <string name="settings_content_unable_to_install">콘텐츠를 설치할 수 없습니다.</string>
     <string name="settings_content_install_failed">설치 실패</string>
     <string name="settings_content_file_cannot_be_recognized">파일을 인식할 수 없습니다.</string>
@@ -809,9 +906,14 @@
     <string name="settings_content_downloading_title">콘텐츠 다운로드 중</string>
     <string name="settings_content_installing_title">콘텐츠 설치 중</string>
     <string name="settings_content_extracting_title">콘텐츠 추출 중</string>
-    <string name="settings_content_extracting_detail">추출 중… (%1$d개 파일)</string>
-    <string name="settings_content_preparing_package">패키지 준비 중…</string>
+    <string name="settings_content_extracting_detail">추출 중 (%1$d개 파일)</string>
+    <string name="settings_content_preparing_package">패키지 준비 중</string>
     <string name="settings_content_download_complete">다운로드 완료</string>
+    <string name="settings_content_already_installed_title">구성 요소가 이미 설치됨</string>
+    <string name="settings_content_already_installed_message">이 구성 요소는 이미 설치되어 있습니다. 다시 다운로드하기 전에 설치된 복사본을 제거하세요.
+
+설치된 경로:
+%1$s</string>
     <string name="settings_content_conflicting_title">충돌하는 콘텐츠가 설치되어 있음</string>
     <string name="settings_content_conflicting_message">이 패키지를 다운로드하기 전에 충돌하는 콘텐츠를 제거하세요.
 
@@ -820,7 +922,7 @@
     <string name="settings_content_cannot_be_trusted">콘텐츠를 신뢰할 수 없습니다.</string>
     <string name="settings_content_is_incomplete">콘텐츠가 불완전합니다.</string>
     <string name="settings_content_untrusted_files_warning">경고: 추가 콘텐츠에 신뢰할 수 없는 파일이 포함되어 있습니다. 일반적으로 다음 파일은 수정되어서는 안 됩니다. 설치를 진행할지 결정하세요.</string>
-    <string name="settings_content_confirm_remove">이 콘텐츠를 제거하시겠습니까?</string>
+    <string name="settings_content_confirm_remove">기기에서 이 구성 요소가 삭제됩니다.</string>
     <string name="settings_content_unable_to_remove_in_use">현재 컨테이너가 이 Wine을 사용하고 있어 콘텐츠를 제거할 수 없습니다.</string>
     <string name="settings_content_download_in_components">다운로드된 항목이 없습니다. 구성 요소에서 하나를 다운로드하세요.</string>
     <string name="settings_content_types_header">콘텐츠 유형</string>
@@ -832,9 +934,12 @@
     <string name="settings_drivers_install">드라이버 설치</string>
     <string name="settings_drivers_installed_success">드라이버가 성공적으로 설치되었습니다.</string>
     <string name="settings_drivers_install_failed">드라이버 설치에 실패했습니다.</string>
-    <string name="settings_drivers_confirm_remove">이 드라이버를 제거하시겠습니까?</string>
+    <string name="settings_drivers_remove_title">드라이버를 제거하시겠습니까?</string>
+    <string name="settings_drivers_confirm_remove">기기에서 이 드라이버가 삭제됩니다.</string>
+    <string name="settings_drivers_remove_repo_title">저장소를 제거하시겠습니까?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s이(가) 저장소 목록에서 제거됩니다.</string>
     <string name="settings_drivers_repo_tap_to_load">탭하여 릴리스 로드</string>
-    <string name="settings_drivers_repo_loading_releases">릴리스 로딩 중…</string>
+    <string name="settings_drivers_repo_loading_releases">릴리스 로딩 중</string>
     <string name="settings_drivers_repo_release_count">%1$d개 릴리스 로드됨</string>
     <string name="settings_drivers_repo_no_release_assets">가져온 릴리스에서 다운로드 가능한 ZIP 파일을 찾을 수 없습니다.</string>
     <string name="settings_drivers_repo_fetch_failed">GitHub 릴리스를 불러올 수 없습니다.</string>
@@ -844,7 +949,7 @@
     <string name="settings_drivers_manager">드라이버 관리</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">시스템 파일 설치 중…</string>
+    <string name="setup_wizard_installing_system_files">시스템 파일 설치 중</string>
     <string name="setup_wizard_unable_to_install_system_files">시스템 파일을 설치할 수 없습니다</string>
     <string name="setup_wizard_system_image_not_installed">시스템 이미지가 설치되지 않았습니다. 먼저 구성 요소를 설치하세요.</string>
     <string name="setup_wizard_recommended_components">권장 구성 요소</string>
@@ -913,6 +1018,9 @@
     <string name="google_cloud_sync_started">클라우드 동기화가 시작되었습니다.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Google 서비스</string>
+    <string name="google_auto_signin_title">실행 시 Google에 로그인</string>
+    <string name="google_auto_signin_summary">앱이 시작될 때 자동으로 Google Play 게임에 연결하여 저장 백업과 동기화가 항상 준비되도록 합니다. 끄면 앱이 자동으로 로그인하지 않습니다.</string>
+    <string name="google_auto_signin_section">실행 시</string>
     <string name="google_cloud_play_games">Google Play 게임</string>
     <string name="google_cloud_status_syncing">동기화 중</string>
     <string name="google_cloud_status_connected">연결됨</string>
@@ -971,22 +1079,30 @@
     <string name="saves_import_export_exported_failed">저장 데이터 내보내기 실패: %1$s</string>
     <string name="saves_import_export_imported">저장 데이터가 성공적으로 가져와졌습니다</string>
     <string name="saves_import_export_imported_failed">저장 데이터 가져오기 실패: %1$s</string>
+    <string name="saves_export_path_summary">저장 데이터가 /WinNative/saves로 내보내집니다</string>
+    <string name="saves_export_success_path">%1$s로 내보냈습니다</string>
+    <string name="saves_export_warning_title">사용자 지정 게임에만 사용하세요</string>
+    <string name="saves_export_warning_body">내보내기에는 스토어에서 설치한 게임이나 클라우드 동기화 게임의 저장 데이터가 포함될 수 있습니다.</string>
+    <string name="saves_import_warning_title">이 컨테이너의 기존 저장 데이터를 덮어씁니다</string>
+    <string name="saves_import_warning_body">여러 게임이 포함된 이전 백업을 복원할 때는 먼저 파일 관리자로 더 최신 저장 데이터를 zip 파일에 복사하세요. .zip에 있는 저장 데이터만 영향을 받습니다. 저장 데이터를 신중하게 관리하세요.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">컨테이너</string>
-    <string name="preloader_initializing">초기화 중…</string>
-    <string name="preloader_launching">실행 중…</string>
-    <string name="preloader_closing">%1$s 종료 중…</string>
-    <string name="preloader_setup_environment">환경 설정 중…</string>
-    <string name="preloader_installing_mono">Wine Mono v%1$s 설치 중…</string>
-    <string name="preloader_installing_redist">재배포 파일 설치 중…</string>
-    <string name="preloader_unpacking_exe">게임 실행 파일 압축 해제 중…</string>
-    <string name="preloader_downloading_cloud">클라우드 세이브 다운로드 중…</string>
-    <string name="preloader_syncing_cloud">클라우드 세이브 동기화 중…</string>
-    <string name="preloader_cloud_downloading">클라우드 동기화 다운로드 중…</string>
-    <string name="preloader_cloud_backup">Google 드라이브에 세이브 백업 중…</string>
+    <string name="preloader_initializing">초기화 중</string>
+    <string name="preloader_launching">실행 중</string>
+    <string name="preloader_closing">%1$s 종료 중</string>
+    <string name="preloader_setup_environment">환경 설정 중</string>
+    <string name="preloader_retrying_steam_client_download">Steam 클라이언트 다운로드 다시 시도 중</string>
+    <string name="preloader_installing_mono">Wine Mono v%1$s 설치 중</string>
+    <string name="preloader_installing_redist">재배포 파일 설치 중</string>
+    <string name="preloader_unpacking_exe">게임 실행 파일 압축 해제 중</string>
+    <string name="preloader_downloading_cloud">클라우드 세이브 다운로드 중</string>
+    <string name="preloader_syncing_cloud">클라우드 세이브 동기화 중</string>
+    <string name="preloader_uploading_cloud">클라우드 세이브 업로드 중</string>
+    <string name="preloader_checking_cloud">클라우드 세이브 확인 중</string>
+    <string name="preloader_cloud_sync_retry">%1$s 재시도 %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">클라우드 동기화 다운로드 중</string>
     <string name="cloud_sync_failed_provider">%1$s 클라우드 동기화에 실패했습니다.</string>
-    <string name="google_cloud_backup_failed">Google 드라이브 백업에 실패했습니다.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">그래픽</string>
-    <string name="container_backups_title">백업</string>
-    <string name="container_backups_prompt">이 컨테이너 백업에 대해 수행할 작업을 선택하세요.</string>
-    <string name="container_backups_backing_up">컨테이너 백업 중…</string>
-    <string name="container_backups_restoring">컨테이너 복원 중…</string>
-    <string name="container_backups_checking">컨테이너 백업 확인 중…</string>
-    <string name="container_backups_select_title">복원할 백업 선택</string>
-    <string name="container_backups_no_files">Google Drive에서 컨테이너 백업을 찾지 못했습니다.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">기본 바인딩</string>
     <string name="binding_secondary">보조 바인딩</string>
+    <string name="binding_third">세 번째 바인딩</string>
+    <string name="binding_fourth">네 번째 바인딩</string>
     <string name="input_controls_editor_tap_to_switch">탭하여 전환</string>
     <string name="input_controls_editor_download_profile">프로필 다운로드</string>
     <string name="container_config_emulator_section">에뮬레이터</string>
@@ -1010,6 +1122,7 @@
     <string name="session_drawer_fps_monitor">FPS 모니터</string>
     <string name="session_drawer_fps_monitor_subtitle">실시간 성능 통계 표시</string>
     <string name="session_drawer_dual_series_battery">듀얼 시리즈 배터리</string>
+    <string name="session_drawer_hud_frametime_numeric">프레임타임을 숫자로 표시</string>
     <string name="session_drawer_command_center">명령 센터</string>
     <string name="session_drawer_command_center_input">입력</string>
     <string name="session_drawer_command_center_display">디스플레이</string>
@@ -1022,7 +1135,6 @@
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">자연</string>
     <string name="session_drawer_color_profile_crt">CRT 효과</string>
-    <string name="session_drawer_upscaler_dls">선명</string>
     <string name="session_drawer_calibrate_advanced">고급 보정</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">자이로</string>
@@ -1034,7 +1146,6 @@
     <string name="session_drawer_rail_label_mouse">마우스</string>
     <string name="session_drawer_rail_label_fullscreen">전체 화면</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">네이티브</string>
     <string name="session_drawer_rail_label_magnifier">확대</string>
     <string name="session_drawer_rail_label_task_manager">작업</string>
     <string name="session_drawer_rail_label_logs">로그</string>
@@ -1048,24 +1159,23 @@
     <string name="session_drawer_logs_share_chooser">세션 로그 공유</string>
     <string name="session_drawer_logs_share_failed">로그를 공유하지 못했습니다</string>
     <string name="session_drawer_logs_share_empty">공유할 로그 줄이 없습니다</string>
-    <string name="session_drawer_super_resolution">선명도 필터</string>
-    <string name="session_drawer_upscaler_mode">필터</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">슈퍼 해상도</string>
+    <string name="session_drawer_upscaler_mode">업스케일러</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">선명</string>
+    <string name="session_drawer_vivid_strength">선명도 강도</string>
     <string name="session_drawer_main_menu_title">메뉴</string>
     <string name="session_gyroscope_activator">활성화</string>
     <string name="settings_general_check_for_updates">업데이트 확인</string>
     <string name="settings_general_check_for_updates_summary">앱 실행 시와 주기적으로 새 버전을 자동으로 확인합니다.</string>
     <string name="setup_wizard_containers">컨테이너 설정</string>
-    <string name="google_cloud_auto_backup">클라우드 동기화 자동 백업</string>
-    <string name="google_cloud_auto_backup_summary">게임을 종료할 때마다 게임 저장 데이터를 Google Drive에 자동으로 백업합니다.</string>
     <string name="cloud_saves_title">클라우드 저장</string>
-    <string name="cloud_saves_backup">클라우드 저장 백업</string>
-    <string name="cloud_saves_restore">클라우드 저장 복원</string>
+    <string name="cloud_saves_title_for_provider">%1$s 클라우드 저장 - %2$s</string>
     <string name="cloud_sync_title">클라우드 동기화</string>
     <string name="cloud_sync_enabled_summary">실행 시 클라우드 저장을 다운로드하고 종료 시 동기화/백업합니다.</string>
     <string name="cloud_sync_disabled_summary">클라우드 저장 다운로드나 종료 시 동기화 없이 이 게임을 실행합니다.</string>
-    <string name="cloud_saves_backing_up">클라우드 저장 백업 중…</string>
-    <string name="cloud_saves_restoring">클라우드 저장 복원 중…</string>
+    <string name="cloud_saves_backing_up">클라우드 저장 백업 중</string>
+    <string name="cloud_saves_restoring">클라우드 저장 복원 중</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">실행 사이에 생성된 dynarec 블록의 캐싱을 제어하여 시작 속도를 높입니다.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1283 @@
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">아직 백업된 이전 저장 파일이 없습니다. 교체된 저장 파일과 수동 백업이 30일 동안 여기에 표시됩니다.</string>
+    <string name="cloud_saves_history_loading">저장 기록 불러오는 중\u2026</string>
+    <string name="cloud_saves_history_origin_auto">자동</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">클라우드</string>
+    <string name="cloud_saves_history_origin_local">로컬</string>
+    <string name="cloud_saves_history_origin_manual">수동</string>
+    <string name="cloud_saves_history_refresh">새로고침</string>
+    <string name="cloud_saves_history_rename">이름 바꾸기</string>
+    <string name="cloud_saves_history_rename_clear">지우기</string>
+    <string name="cloud_saves_history_rename_failed">백업 이름을 바꿀 수 없습니다.</string>
+    <string name="cloud_saves_history_rename_hint">예: 보스 전투, 엔딩 직전</string>
+    <string name="cloud_saves_history_rename_save">저장</string>
+    <string name="cloud_saves_history_rename_success">백업 이름이 변경되었습니다.</string>
+    <string name="cloud_saves_history_rename_title">백업 이름 설정</string>
+    <string name="cloud_saves_history_restore">복원</string>
+    <string name="cloud_saves_history_restore_confirm_body">현재 로컬 저장 파일이 %1$s의 백업으로 교체됩니다.</string>
+    <string name="cloud_saves_history_restore_confirm_title">이 백업을 복원하시겠습니까?</string>
+    <string name="cloud_saves_history_restore_failed">이 백업을 복원할 수 없습니다.</string>
+    <string name="cloud_saves_history_restore_success">백업에서 저장 파일을 복원했습니다.</string>
+    <string name="cloud_saves_history_sign_in">Google에 로그인하여 저장 기록을 확인하세요.</string>
+    <string name="cloud_saves_history_title">저장 기록</string>
+    <string name="cloud_saves_history_download">다운로드</string>
+    <string name="cloud_saves_history_download_success">파일을 다운로드했습니다.</string>
+    <string name="cloud_saves_history_download_failed">다운로드 실패.</string>
+    <string name="cloud_saves_keep_replaced_backup">교체된 저장 파일의 백업 유지</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">마음이 바뀌면 저장 기록에서 복원할 수 있습니다.</string>
+    <string name="cloud_saves_no_backups">이 게임의 백업이 아직 없습니다.</string>
+    <string name="cloud_saves_offline_mode">클라우드 동기화 비활성화</string>
+    <string name="cloud_saves_offline_mode_summary">이 게임의 모든 자동 클라우드 활동을 중지합니다.</string>
+    <string name="cloud_saves_sync_from_provider">%1$s 클라우드에서 동기화</string>
+    <string name="cloud_saves_sync_from_provider_failed">%1$s에서 저장 파일을 다운로드할 수 없습니다.</string>
+    <string name="cloud_saves_gog_manage_label">GOG 클라우드 저장 관리</string>
+    <string name="cloud_saves_gog_manage_helper">공식 GOG 웹사이트를 엽니다</string>
+    <string name="cloud_saves_gog_manage_no_browser">GOG 클라우드 저장 페이지를 열 수 있는 브라우저가 없습니다</string>
+    <string name="cloud_saves_gog_zip_label">GOG 클라우드 Zip 다운로드</string>
+    <string name="cloud_saves_gog_zip_helper">현재 클라우드 파일 저장</string>
+    <string name="cloud_saves_gog_zip_success">GOG 클라우드 저장 zip이 저장되었습니다.</string>
+    <string name="cloud_saves_gog_zip_failed">GOG 클라우드 저장 zip을 저장할 수 없습니다.</string>
+    <string name="cloud_saves_gog_zip_empty">GOG 클라우드 저장 파일을 찾을 수 없습니다.</string>
+    <string name="cloud_saves_sync_from_provider_generic">클라우드에서 동기화</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s 클라우드 저장 파일을 다운로드했습니다.</string>
+    <string name="cloud_saves_syncing_from_provider">%1$s에서 저장 파일 다운로드 중\u2026</string>
+    <string name="cloud_saves_sync_summary">%1$s에 현재 있는 버전을 가져옵니다.</string>
+    <string name="cloud_saves_sync_summary_generic">현재 클라우드 버전을 가져옵니다.</string>
+    <string name="common_ui_exit_app_confirm">WinNative를 종료하시겠습니까?</string>
+    <string name="container_surface_effect">표면 효과</string>
+    <string name="downloads_queue_cancel_download_confirm">%1$s 다운로드를 취소하고 다운로드된 모든 파일을 삭제하시겠습니까?</string>
+    <string name="downloads_queue_paused_resume_hint">일시 중지됨 - 계속하려면 재개를 탭하세요</string>
+    <string name="downloads_queue_phase_applying_data">데이터 적용 중</string>
+    <string name="downloads_queue_phase_downloading">다운로드 중</string>
+    <string name="downloads_queue_phase_downloading_file">다운로드 중 [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">마무리 중</string>
+    <string name="downloads_queue_phase_patching">패치 중</string>
+    <string name="downloads_queue_phase_preparing">준비 중</string>
+    <string name="downloads_queue_phase_queued">대기 중</string>
+    <string name="downloads_queue_phase_unknown">알 수 없음</string>
+    <string name="downloads_queue_phase_unpacking">압축 해제 중</string>
+    <string name="downloads_queue_phase_updating">업데이트 중</string>
+    <string name="downloads_queue_phase_verifying">검증 중</string>
+    <string name="downloads_queue_phase_verifying_file">검증 중 [%1$s]</string>
+    <string name="downloads_queue_status_label">상태:</string>
+    <string name="downloads_queue_this_game">이 게임</string>
+    <string name="hud_position_bottom_center">하단 가운데</string>
+    <string name="hud_position_bottom_left">하단 왼쪽</string>
+    <string name="hud_position_bottom_right">하단 오른쪽</string>
+    <string name="hud_position_left_center">왼쪽 가운데</string>
+    <string name="hud_position_menu_title">HUD 이동 위치</string>
+    <string name="hud_position_right_center">오른쪽 가운데</string>
+    <string name="hud_position_top_center">상단 가운데</string>
+    <string name="hud_position_top_left">상단 왼쪽</string>
+    <string name="hud_position_top_right">상단 오른쪽</string>
+    <string name="input_controls_editor_number_of_bindings">바인딩 수</string>
+    <string name="input_controls_editor_opacity">불투명도</string>
+    <string name="input_controls_editor_radial_menu">방사형 메뉴</string>
+    <string name="input_controls_editor_radial_menu_options">방사형 메뉴 옵션</string>
+    <string name="input_controls_tap_to_click">탭하여 클릭</string>
+    <string name="input_controls_reverse_binding_order">바인딩 순서 반대로</string>
+    <string name="num_controllers">컨트롤러 수</string>
+    <string name="session_drawer_controls_section">컨트롤</string>
+    <string name="session_drawer_header_subtitle">컨트롤, 오버레이 및 세션 도구 빠른 접근</string>
+    <string name="session_drawer_hud_alpha">알파</string>
+    <string name="session_drawer_hud_alpha_input_title">알파 설정</string>
+    <string name="session_drawer_hud_disabled_hint">오버레이를 켜서 사용자 지정하세요</string>
+    <string name="session_drawer_hud_elements">HUD 요소</string>
+    <string name="session_drawer_hud_input_hint">%1$d에서 %2$d 사이의 값을 입력하세요. 한도를 초과하는 값은 자동으로 조정됩니다.</string>
+    <string name="session_drawer_hud_scale">크기</string>
+    <string name="session_drawer_hud_scale_input_title">크기 설정</string>
+    <string name="session_drawer_hud_summary">오버레이 표시 및 데이터 항목 조정</string>
+    <string name="session_drawer_screen_effects">화면 효과</string>
+    <string name="session_drawer_session_section">세션</string>
+    <string name="session_drawer_swipe_hint">스와이프하여 게임으로 돌아가기</string>
+    <string name="session_gamepad_enable_vibration">진동 활성화</string>
+    <string name="session_gyroscope_experimental_mouse_movement">실험적 마우스 이동</string>
+    <string name="session_gyroscope_mouse_scale">마우스 배율</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">마우스 배율: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">설정 마법사를 다시 열어 권한, 시스템 파일 및 기본 컨테이너를 검토하세요.</string>
+    <string name="settings_other_setup_wizard_title">설정 마법사</string>
+    <string name="shortcuts_library_artwork_failed">선택한 이미지를 불러오지 못했습니다.</string>
+    <string name="shortcuts_library_artwork_open_source">SteamGridDB 열기</string>
+    <string name="shortcuts_library_artwork_set">이미지 설정</string>
+    <string name="shortcuts_library_artwork_title">라이브러리 아트워크</string>
+    <string name="shortcuts_library_artwork_icon_title">아이콘 이미지</string>
+    <string name="shortcuts_library_artwork_hero_title">배경</string>
+    <string name="shortcuts_list_readded_existing">기존 바로가기를 다시 추가했습니다</string>
+    <string name="shortcuts_properties_runtime_patcher">런타임 DRM 패처</string>
+    <string name="shortcuts_properties_runtime_patcher_description">실행 시 DRM 패처 DLL을 주입합니다. FPS가 저하되므로 Legacy Launcher만으로 실패할 때만 사용하세요.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">저장 폴더 선택</string>
+    <string name="cloud_saves_custom_folder_label">저장 폴더</string>
+    <string name="cloud_saves_custom_select_folder_summary">컨테이너 안의 저장 디렉터리를 지정합니다</string>
+    <string name="cloud_saves_custom_no_container">이 바로가기에 사용할 컨테이너가 없습니다</string>
+    <string name="cloud_saves_custom_picker_title">저장 폴더 선택</string>
+    <string name="cloud_saves_custom_outside_drive_c">선택한 폴더는 컨테이너의 C: 드라이브 안에 있어야 합니다</string>
+    <string name="cloud_saves_custom_path_map_failed">선택한 폴더를 Windows 경로로 매핑할 수 없습니다.</string>
+    <string name="cloud_saves_custom_folder_set">저장 폴더가 %1$s(으)로 설정되었습니다</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Steam Cloud에서 동기화</string>
+    <string name="cloud_saves_steam_sync_helper">최신 저장 파일 다운로드</string>
+    <string name="cloud_saves_steam_sync_success">Steam Cloud에서 동기화되었습니다</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud 동기화에 실패했습니다</string>
+    <string name="cloud_saves_steam_browse_label">Steam Cloud 저장 보기</string>
+    <string name="cloud_saves_steam_browse_helper">클라우드 저장소 열기</string>
+    <string name="cloud_saves_steam_browse_no_browser">Steam 페이지를 열 수 있는 브라우저가 없습니다</string>
+    <string name="cloud_saves_steam_import_label">파일 가져오기</string>
+    <string name="cloud_saves_steam_import_helper">다운로드한 파일 복원</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">파일 선택기를 사용할 수 없습니다</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Steam Cloud의 현재 저장 파일을 다운로드하고 현재 저장 파일을 덮어씁니다.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">잘못된 앱 ID</string>
+    <string name="cloud_saves_label_saved">라벨이 저장되었습니다</string>
+    <string name="downloads_queue_cancel_all_title">모든 다운로드를 취소할까요?</string>
+    <string name="downloads_queue_cancel_all_warning">DLC, 게임 또는 업데이트 다운로드를 취소하면 게임 설치가 손상될 수 있습니다.\n\n모든 다운로드를 취소하고 지금까지 다운로드한 파일을 삭제할까요?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Legacy Launcher 사용</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Legacy Steam 에뮬레이션: ColdClient 런처로 게임을 실행하고 exe에서 SteamStub DRM을 제거합니다. Steam Launcher에서 작동하지 않는 오래된 게임에만 사용하세요.</string>
+    <string name="steam_section_real_client">WinNative 실제 Steam 클라이언트</string>
+    <string name="steam_section_emulator">레거시 Steam 에뮬레이터</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">에뮬레이트된 Steam 클라이언트가 오프라인으로 표시되게 하여 게임이 온라인 연결을 시도하지 않도록 합니다. Steam 네트워크 확인에서 멈추는 게임에 사용하세요.</string>
+    <string name="input_controls_select_style">스타일 선택</string>
+    <string name="input_controls_style_original">원본</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">슬레이트</string>
+    <string name="input_controls_style_halo">헤일로</string>
+    <string name="input_controls_style_glint">글린트</string>
+    <string name="input_controls_style_shadow">섀도우</string>
+    <string name="input_controls_style_reticle">레티클</string>
+    <string name="input_controls_style_neon">네온</string>
+    <string name="input_controls_style_lumina">루미나</string>
+    <string name="input_controls_accent_theme">색상 테마</string>
+    <string name="input_controls_edit_duplicating_builtin">기본 제공 프로필입니다. 편집할 수 있는 복사본을 만들었습니다.</string>
+    <string name="input_controls_editor_confirm_reset_profile">이 프로필을 원래 레이아웃으로 초기화할까요? 변경 사항이 모두 손실됩니다.</string>
+    <string name="input_controls_editor_profile_reset">프로필이 원래 레이아웃으로 초기화되었습니다.</string>
+    <string name="input_controls_editor_reset_unavailable">이 프로필에 사용할 수 있는 원본 스냅샷이 없습니다.</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan 디스플레이 동기화</string>
+    <string name="cloud_sync_disable_title">클라우드 저장 비활성화</string>
+    <string name="cloud_saves_steam_push_label">Steam Cloud로 업로드</string>
+    <string name="cloud_saves_steam_push_helper">로컬 저장 강제 업로드</string>
+    <string name="cloud_saves_steam_push_success">저장 파일을 Steam Cloud로 업로드했습니다.</string>
+    <string name="cloud_saves_steam_push_failed">저장 파일을 Steam Cloud로 업로드할 수 없습니다.</string>
+    <string name="cloud_saves_history_steam_unreachable">현재 Steam Cloud에 연결할 수 없습니다. 백그라운드에서 다시 연결 중입니다 온라인 상태가 되면 새로 고침을 누르세요.</string>
+    <string name="steam_session_refused_event">Steam이 캐시된 세션을 거부했습니다(EResult=%1$d). 다시 로그인하세요.</string>
+    <string name="settings_hud_record_to_file_title">성능을 파일로 기록</string>
+    <string name="settings_hud_record_to_file_summary">게임 플레이 중 초당 FPS, CPU, GPU, 온도 및 배터리 지표를 /WinNative/logs/로 내보냅니다.</string>
+    <string name="settings_leaderboard_category">성능</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Steam 환경 준비 중</string>
+    <string name="preloader_starting_wine">Wine 시작 중</string>
+    <string name="preloader_starting_steam_launcher">Steam Launcher 시작 중</string>
+    <string name="preloader_loading_steam_client">Steam 클라이언트 로드 중</string>
+    <string name="preloader_connecting_to_steam">Steam에 연결 중</string>
+    <string name="preloader_signing_in_to_steam">Steam에 로그인 중</string>
+    <string name="preloader_fetching_game_info">로그인됨 — 게임 정보 가져오는 중</string>
+    <string name="preloader_steam_ready">Steam 준비됨</string>
+    <string name="preloader_updating_game_info">게임 정보 업데이트 중</string>
+    <string name="preloader_verifying_install">설치 확인 중</string>
+    <string name="preloader_scanning_redists">재배포 패키지 검색 중</string>
+    <string name="preloader_installing_redist_single">재배포 패키지 설치 중</string>
+    <string name="preloader_installing_named_redist">%1$s 설치 중</string>
+    <string name="preloader_installing_named_redist_progress">%1$s 설치 중 (%2$s)</string>
+    <string name="preloader_redists_ready">재배포 패키지 준비됨</string>
+    <string name="preloader_no_redists">설치할 재배포 패키지가 없습니다</string>
+    <string name="preloader_steam_service_running">Steam 서비스 실행 중</string>
+    <string name="preloader_launching_game">%1$s 실행 중</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher 실패 — 리소스 다시 준비 중</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher를 시작할 수 없습니다. 다시 준비 중 — 다시 실행하세요</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher가 게임까지 도달했지만 게임이 시작되지 않았습니다</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Workshop 항목 로드 중</string>
+    <string name="workshop_search_items">Workshop 항목 검색</string>
+    <string name="workshop_title">STEAM 창작마당</string>
+    <string name="workshop_loading_subtitle">Steam에서 구독한 항목을 가져오는 중입니다.</string>
+    <string name="workshop_error_title">창작마당 항목을 불러올 수 없습니다</string>
+    <string name="workshop_error_subtitle">문제가 발생했습니다. 다시 시도하세요.</string>
+    <string name="workshop_empty_title">구독한 창작마당 항목이 없습니다</string>
+    <string name="workshop_empty_subtitle">Steam 창작마당에서 항목을 구독한 후 이 창을 다시 여세요.</string>
+    <string name="workshop_search_empty_title">\"%1$s\"와(과) 일치하는 항목이 없습니다</string>
+    <string name="workshop_search_empty_subtitle">다른 검색어를 사용해 보세요.</string>
+    <string name="workshop_clear_search">검색 지우기</string>
+    <string name="workshop_item_fallback">창작마당 항목</string>
+    <string name="common_ui_failed">실패</string>
+    <string name="steam_presence_snooze">잠시 자리 비움</string>
+    <string name="steam_presence_busy">다른 용무 중</string>
+    <string name="steam_presence_looking_to_trade">교환 희망</string>
+    <string name="steam_presence_looking_to_play">게임 희망</string>
+    <string name="steam_friends_count">친구 — %1$d명 온라인</string>
+    <string name="steam_friends_section_in_game">게임 중 (%1$d)</string>
+    <string name="steam_friends_section_online">온라인 (%1$d)</string>
+    <string name="steam_friends_section_offline">오프라인 (%1$d)</string>
+    <string name="steam_friends_none_loaded">아직 불러온 친구가 없습니다.</string>
+    <string name="steam_friends_chat_off">채팅이 꺼져 있습니다. 친구를 보려면 채팅 서비스를 다시 켜세요.</string>
+    <string name="steam_friends_self_you">나</string>
+    <string name="steam_friends_in_game">게임 중</string>
+    <string name="steam_friends_join">참가</string>
+    <string name="steam_friends_play">플레이</string>
+    <string name="steam_chat_image_failed">(이미지 전송 실패)</string>
+    <string name="steam_chat_empty">아직 메시지가 없습니다. 인사해 보세요!</string>
+    <string name="steam_chat_uploading_image">이미지 업로드 중…</string>
+    <string name="steam_chat_send_image">이미지 보내기</string>
+    <string name="steam_chat_message_hint">메시지…</string>
+    <string name="steam_chat_send">보내기</string>
+    <string name="steam_chat_image">이미지</string>
+    <string name="steam_common_back">뒤로</string>
+    <string name="steam_achievements_title">도전 과제</string>
+    <string name="steam_achievements_empty">이 게임의 도전 과제를 찾을 수 없습니다.\n또는 Steam에 로그인하여 불러오세요.</string>
+    <string name="steam_achievements_hidden">숨겨진 도전 과제</string>
+    <string name="steam_achievements_hidden_desc">이 도전 과제를 확인하려면 계속 플레이하세요.</string>
+    <string name="steam_achievements_unlocked_on">%1$s 달성</string>
+    <string name="steam_achievements_unlocked">달성</string>
+    <string name="steam_join_joining">%2$s에서 %1$s님 참가 중…</string>
+    <string name="steam_join_install">%2$s에 참가하려면 %1$s을(를) 설치하세요</string>
+    <string name="steam_join_not_owned">%1$s을(를) 보유하고 있지 않습니다</string>
+    <string name="steam_chat_not_sent">(전송되지 않음)</string>
+    <string name="steam_join_the_game">게임</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">채팅 서비스</string>
+    <string name="steam_chat_setting_service_desc">로그인하여 친구와 채팅하세요. 끄면 오프라인으로 전환됩니다.</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">출력</string>
+    <string name="display_output_prompt_title">외부 디스플레이 감지됨</string>
+    <string name="display_output_prompt_message">게임을 연결된 디스플레이로 보낼까요? 화면 컨트롤과 메뉴는 이 휴대폰에 그대로 유지됩니다.</string>
+    <string name="display_output_prompt_swap">디스플레이 전환</string>
+    <string name="display_output_prompt_mirror">미러링</string>
+    <string name="display_output_swapped_toast">게임이 외부 디스플레이로 이동했습니다. 컨트롤은 휴대폰에 그대로 유지됩니다.</string>
+    <string name="display_output_cast_unavailable">이 기기에서는 무선 디스플레이 설정을 사용할 수 없습니다.</string>
+    <string name="display_output_restored_toast">외부 디스플레이 연결이 끊겨 게임이 휴대폰으로 돌아왔습니다.</string>
+    <string name="session_drawer_output_title">디스플레이 출력</string>
+    <string name="session_drawer_output_subtitle">게임이 외부 디스플레이에 표시되고 있습니다.</string>
+    <string name="session_drawer_output_device">연결된 디스플레이</string>
+    <string name="session_drawer_output_resolution">해상도</string>
+    <string name="session_drawer_output_refresh_rate">주사율</string>
+    <string name="session_drawer_output_aspect_ratio">화면 비율</string>
+    <string name="session_drawer_output_aspect_fit">맞춤 (비율)</string>
+    <string name="session_drawer_output_aspect_stretch">늘이기 (채우기)</string>
+    <string name="session_drawer_output_aspect_zoom">확대 (자르기)</string>
+    <string name="session_drawer_output_return_to_phone">휴대폰으로 돌아가기</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">TV로 캐스트</string>
+    <string name="session_drawer_output_cast_body">USB-C / HDMI 어댑터를 연결하거나 아래를 눌러 무선 디스플레이(Miracast / Wi-Fi Direct)를 연결하세요. 게임은 TV에 표시되고 이 컨트롤은 휴대폰에 그대로 유지됩니다.</string>
+    <string name="session_drawer_output_cast_button">무선 디스플레이 연결</string>
+    <string name="session_drawer_output_cast_note">Chromecast 전용 TV는 비공개 컨트롤로 실시간 게임플레이를 표시할 수 없습니다 — 최상의 결과를 위해 무선 디스플레이나 USB‑C/HDMI 어댑터를 사용하세요.</string>
+    <string name="session_drawer_output_render_note">디스플레이가 보고하는 모드는 실제 출력을 변경합니다(재초기화되는 동안 잠시 검게 표시될 수 있음). 다른 해상도는 해당 크기로 렌더링되어 하드웨어로 패널에 맞게 스케일됩니다 — 기본보다 높으면 더 선명해지고(슈퍼샘플링) 낮으면 더 빨라집니다.</string>
+    <string name="session_drawer_output_scaling_note">이 휴대폰은 디스플레이를 기본 %1$s로 출력하며 모드를 전환하지 않으므로, 이 설정은 렌더링 해상도를 정합니다 — 패널에 맞춰 하드웨어로 스케일링됩니다(기본보다 높으면 선명해지고, 낮으면 더 빠릅니다).</string>
+    <string name="session_drawer_output_game_mode">게임 모드 (낮은 지연)</string>
+    <string name="session_drawer_output_game_mode_on">켜기</string>
+    <string name="session_drawer_output_game_mode_off">끄기</string>
+    <string name="session_drawer_output_game_mode_note">입력 지연을 최소화하기 위해 TV의 게임/저지연 모드(HDMI ALLM)를 요청합니다. 연결된 디스플레이가 지원할 때만 표시됩니다.</string>
+    <string name="session_drawer_output_send_to_display">게임을 디스플레이로 보내기</string>
+    <string name="session_drawer_output_to_display">외부 디스플레이로 출력</string>
+    <string name="session_drawer_output_send_note">디스플레이가 연결되어 있습니다. 게임을 그곳으로 보내세요 — 컨트롤과 메뉴는 이 휴대폰에 그대로 유지됩니다. 언제든지 다시 가져올 수 있습니다.</string>
+    <string name="session_drawer_output_display">디스플레이</string>
+    <string name="session_drawer_output_glasses">글래스</string>
+    <string name="session_drawer_output_brightness">밝기</string>
+    <string name="session_drawer_output_shade">셰이드(디밍)</string>
+    <string name="session_drawer_output_3d">3D(좌우 분할)</string>
+    <string name="glasses_panel_refresh">주사율</string>
+    <string name="glasses_panel_sunblock">햇빛 차단</string>
+    <string name="session_drawer_output_volume">볼륨</string>
+    <string name="session_drawer_output_glasses_note">USB로 Viture 글래스에 직접 전송됩니다.</string>
+
+    <!-- Session > Touch & Gesture Profiles -->
+    <string name="common_ui_new">새로 만들기</string>
+    <string name="common_ui_rename">이름 변경</string>
+    <string name="gesture_profile_export">제스처 프로필 내보내기</string>
+    <string name="gesture_profile_import">제스처 프로필 가져오기</string>
+    <string name="gesture_profile_new">새 제스처 프로필</string>
+    <string name="gesture_profile_none">제스처 프로필 없음</string>
+    <string name="input_controls_editor_input_profiles_section">입력 프로필</string>
+    <string name="session_drawer_right_stick_sensitivity">오른쪽 스틱 감도</string>
+    <string name="session_drawer_rts_gestures">RTS 제스처</string>
+    <string name="session_drawer_rts_gestures_edit">편집</string>
+    <string name="session_drawer_touch">터치</string>
+    <string name="session_drawer_touch_map_right_stick">오른쪽 스틱에 매핑</string>
+    <string name="session_drawer_touch_touchscreen">터치스크린 모드</string>
+    <string name="session_drawer_touch_trackpad">트랙패드</string>
+    <string name="session_gesture_profile_section">제스처 프로필</string>
+    <string name="session_rts_action">동작</string>
+    <string name="session_rts_behavior">방식</string>
+    <string name="session_rts_double_tap">더블 탭 (더블 좌클릭)</string>
+    <string name="session_rts_double_tap_delay">더블 탭 지연 (ms)</string>
+    <string name="session_rts_down">아래</string>
+    <string name="session_rts_drag">1손가락 드래그</string>
+    <string name="session_rts_pan1">1손가락 이동</string>
+    <string name="session_rts_drag2">2손가락 드래그</string>
+    <string name="session_rts_drag_threshold">드래그 임계값 (px)</string>
+    <string name="session_rts_gesture_threshold">제스처 임계값 (px)</string>
+    <string name="session_rts_hold2">2손가락 길게 누르기</string>
+    <string name="session_rts_hold3">3손가락 길게 누르기</string>
+    <string name="session_rts_hold4">4손가락 길게 누르기</string>
+    <string name="session_rts_hold_delay">길게 누르기 지연 (ms)</string>
+    <string name="session_rts_left">왼쪽</string>
+    <string name="session_rts_long_press">길게 누르기</string>
+    <string name="session_rts_long_press_delay">길게 누르기 지연 (ms)</string>
+    <string name="session_rts_pan">2손가락 이동</string>
+    <string name="session_rts_pan_threshold">이동/핀치 시작 (px)</string>
+    <string name="session_rts_right">오른쪽</string>
+    <string name="session_rts_swipe3">3손가락 스와이프</string>
+    <string name="session_rts_swipe4">4손가락 스와이프</string>
+    <string name="session_rts_swipe_threshold">스와이프 임계값 (px)</string>
+    <string name="session_rts_tap1">1손가락 탭</string>
+    <string name="session_rts_tap2">2손가락 탭</string>
+    <string name="session_rts_tap3">3손가락 탭</string>
+    <string name="session_rts_tap4">4손가락 탭</string>
+    <string name="session_rts_up">위</string>
+    <string name="session_rts_zoom">핀치 줌</string>
+    <string name="session_drawer_brightness">밝기</string>
+    <string name="session_drawer_contrast">대비</string>
+    <string name="session_drawer_gamma">감마</string>
+    <string name="session_drawer_saturation">채도</string>
+    <string name="session_drawer_temperature">색온도</string>
+    <string name="session_drawer_tint">색조</string>
+    <string name="session_drawer_intensity">강도</string>
+    <string name="session_drawer_strength">세기</string>
+    <string name="session_drawer_sharpen">선명화</string>
+    <string name="session_drawer_scanlines">스캔라인</string>
+    <string name="session_drawer_pixelate">픽셀화</string>
+    <string name="session_drawer_block_size">블록 크기</string>
+    <string name="session_drawer_scale">스케일링</string>
+    <string name="session_drawer_scale_nearest">최근접</string>
+    <string name="session_drawer_scale_linear">선형</string>
+    <string name="session_drawer_scale_bicubic">바이큐빅</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">카툰</string>
+    <string name="session_drawer_color_blind">색맹</string>
+    <string name="session_drawer_color_blind_protan">적색맹</string>
+    <string name="session_drawer_color_blind_deutan">녹색맹</string>
+    <string name="session_drawer_color_blind_tritan">청색맹</string>
+    <string name="session_drawer_reset_effects">효과 초기화</string>
+    <string name="session_drawer_hud_background">배경</string>
+    <string name="session_drawer_hud_background_alpha">배경 알파</string>
+    <string name="session_drawer_hud_background_alpha_input_title">배경 알파 설정</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">크기 조정</string>
+    <string name="session_task_bring_to_front">앞으로 가져오기</string>
+    <string name="session_task_custom_value">사용자 지정 값</string>
+    <string name="session_gyroscope_orientation_mode">기울여 조준 (방향)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">파일</string>
+    <string name="file_manager_copy">복사</string>
+    <string name="file_manager_cut">잘라내기</string>
+    <string name="file_manager_paste">붙여넣기</string>
+    <string name="file_manager_paste_here">여기에 붙여넣기</string>
+    <string name="file_manager_new_folder">새 폴더</string>
+    <string name="file_manager_new_folder_short">폴더</string>
+    <string name="file_manager_multi_select">선택</string>
+    <string name="file_manager_create">만들기</string>
+    <string name="file_manager_delete">삭제</string>
+    <string name="file_manager_copy_count">복사 (%1$d)</string>
+    <string name="file_manager_cut_count">잘라내기 (%1$d)</string>
+    <string name="file_manager_delete_count">삭제 (%1$d)</string>
+    <string name="file_manager_extract">풀기</string>
+    <string name="file_manager_extract_here">여기에 압축 풀기</string>
+    <string name="file_manager_extract_to">다른 위치에 풀기…</string>
+    <string name="file_manager_extracting">%1$s 압축 푸는 중</string>
+    <string name="file_manager_extract_failed">압축 풀기 실패</string>
+    <string name="file_manager_run_boot">실행 / 부팅</string>
+    <string name="file_manager_create_shortcut">바로가기 만들기</string>
+    <string name="file_manager_run_in_container">컨테이너에서 실행</string>
+    <string name="file_manager_no_containers">사용 가능한 컨테이너가 없습니다</string>
+    <string name="file_manager_delete_confirm">\"%1$s\"을(를) 삭제하시겠습니까? 이 작업은 취소할 수 없습니다.</string>
+    <string name="file_manager_delete_confirm_multi">%1$d개 항목을 삭제하시겠습니까? 이 작업은 취소할 수 없습니다.</string>
+    <string name="file_manager_copying">%1$s 복사 중</string>
+    <string name="file_manager_moving">%1$s 이동 중</string>
+    <string name="file_manager_copying_count">%1$d개 항목 복사 중</string>
+    <string name="file_manager_moving_count">%1$d개 항목 이동 중</string>
+    <string name="file_manager_paste_into_itself">폴더를 자기 자신 안에 붙여넣을 수 없습니다</string>
+    <string name="file_manager_operation_failed">작업에 실패했습니다</string>
+    <string name="file_manager_delete_failed">삭제에 실패했습니다</string>
+    <string name="file_manager_rename_failed">이름 변경에 실패했습니다</string>
+    <string name="file_manager_create_folder_failed">폴더 만들기에 실패했습니다</string>
+    <string name="cloud_saves_google_backup_helper">Google Play Games에 복사본 저장</string>
+    <string name="cloud_saves_google_backup_label">Google에 백업</string>
+    <string name="cloud_saves_google_backup_no_save">백업할 저장 파일이 없습니다.</string>
+    <string name="cloud_saves_history_cloud_readonly">읽기 전용</string>
+    <string name="session_drawer_rail_label_record">녹화</string>
+    <string name="session_record_failed">녹화를 시작할 수 없습니다</string>
+    <string name="session_record_fps">프레임 레이트</string>
+    <string name="session_record_include_ui">UI 녹화</string>
+    <string name="session_record_include_ui_subtitle">HUD 및 화면 컨트롤 포함</string>
+    <string name="session_record_now">지금 녹화</string>
+    <string name="session_record_quality">품질</string>
+    <string name="session_record_resolution">해상도</string>
+    <string name="session_record_saved">녹화가 WinNative/Recordings에 저장되었습니다</string>
+    <string name="session_record_settings_title">녹화 설정</string>
+    <string name="session_record_started">녹화 시작됨</string>
+    <string name="steam_chat_setting_stay_running">백그라운드에서 실행</string>
+    <string name="steam_chat_setting_stay_running_desc">WinNative를 종료한 후에도 채팅 유지</string>
+    <string name="settings_content_refresh">새로고침</string>
+    <string name="settings_retro_title">레트로</string>
+    <string name="retro_save_transfer_title">세이브 전송</string>
+    <string name="retro_save_transfer_message">이 게임에 로컬 세이브 파일을 가져오거나 현재 세이브를 내보냅니다.</string>
+    <string name="retro_save_transfer_import">세이브 가져오기</string>
+    <string name="retro_save_transfer_export">세이브 내보내기</string>
+    <string name="retro_save_transfer_import_ok">세이브를 가져왔습니다</string>
+    <string name="retro_save_transfer_import_failed">세이브를 가져올 수 없습니다</string>
+    <string name="retro_save_transfer_export_ok">세이브를 내보냈습니다</string>
+    <string name="retro_save_transfer_export_failed">세이브를 내보낼 수 없습니다</string>
+    <string name="retro_save_transfer_none">이 게임에는 아직 세이브가 없습니다</string>
+    <string name="retro_cheats_title">치트</string>
+    <string name="retro_cheats_hardcore_blocked">하드코어 모드에서는 치트를 사용할 수 없습니다</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">저장</string>
+    <string name="retro_ps2_cancel">취소</string>
+    <string name="retro_ps2_save_state">상태 저장</string>
+    <string name="retro_ps2_load_save_state">상태 불러오기</string>
+    <string name="retro_ps2_achievements">도전 과제</string>
+    <string name="retro_ps2_cheats">치트</string>
+    <string name="retro_ps2_memory_cards">메모리 카드</string>
+    <string name="retro_ps2_fast_forward">빨리 감기</string>
+    <string name="retro_ps2_reset">재설정</string>
+    <string name="retro_ps2_swap_disc">디스크 교체</string>
+    <string name="retro_ps2_slot">슬롯 %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">탭하여 불러오기</string>
+    <string name="retro_ps2_slot_empty">비어 있음</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">탭하여 덮어쓰기</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">비어 있음 — 탭하여 저장</string>
+    <string name="retro_ps2_slot_is_empty">슬롯 %1$d 이(가) 비어 있습니다</string>
+    <string name="retro_ps2_loaded_slot">슬롯 %1$d 을(를) 불러왔습니다</string>
+    <string name="retro_ps2_could_not_load_slot">슬롯 %1$d 을(를) 불러올 수 없습니다</string>
+    <string name="retro_ps2_saved_to_slot">슬롯 %1$d 에 저장했습니다</string>
+    <string name="retro_ps2_save_failed">저장에 실패했습니다</string>
+    <string name="retro_ps2_slot_1_suffix">  •  슬롯 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  슬롯 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  탭하여 사용</string>
+    <string name="retro_ps2_new_memory_card">새 메모리 카드</string>
+    <string name="retro_ps2_import_card">카드 가져오기</string>
+    <string name="retro_ps2_enable_online_dev9">온라인 사용 (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 네트워크 어댑터 — 게임을 다시 시작하여 연결합니다</string>
+    <string name="retro_ps2_ethernet_device">이더넷 장치</string>
+    <string name="retro_ps2_dns_mode">DNS 모드</string>
+    <string name="retro_ps2_primary_dns">기본 DNS</string>
+    <string name="retro_ps2_secondary_dns">보조 DNS</string>
+    <string name="retro_ps2_optional">선택 사항</string>
+    <string name="retro_ps2_auto_ip_dhcp">자동 IP (DHCP)</string>
+    <string name="retro_ps2_server_host">서버: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">탭하여 IP 설정 (비우면 삭제)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">서버 호스트 추가</string>
+    <string name="retro_ps2_new_server_hostname">새 서버 호스트 이름</string>
+    <string name="retro_ps2_server_hostname_hint">예: bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">화면 컨트롤</string>
+    <string name="retro_ps2_edit_layout">레이아웃 편집</string>
+    <string name="retro_ps2_reset_layout">레이아웃 재설정</string>
+    <string name="retro_ps2_layout_reset">레이아웃을 재설정했습니다</string>
+    <string name="retro_ps2_left_stick_invert_x">왼쪽 스틱: X축 반전</string>
+    <string name="retro_ps2_left_stick_invert_y">왼쪽 스틱: Y축 반전</string>
+    <string name="retro_ps2_right_stick_invert_x">오른쪽 스틱: X축 반전</string>
+    <string name="retro_ps2_right_stick_invert_y">오른쪽 스틱: Y축 반전</string>
+    <string name="retro_ps2_button_color">버튼 색상</string>
+    <string name="retro_ps2_letter_color">글자 색상</string>
+    <string name="retro_ps2_shadow_color">그림자 색상</string>
+    <string name="retro_ps2_background_color">배경 색상</string>
+    <string name="retro_ps2_reset_colors">색상 재설정</string>
+    <string name="retro_ps2_renderer">렌더러</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">해상도 스케일</string>
+    <string name="retro_ps2_scale_1x_native">1x (네이티브)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">화면 비율</string>
+    <string name="retro_ps2_aspect_stretch">늘이기</string>
+    <string name="retro_ps2_aspect_auto_standard">자동 (표준)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">디스플레이 필터</string>
+    <string name="retro_ps2_filter_nearest">니어리스트</string>
+    <string name="retro_ps2_filter_bilinear_smooth">바이리니어 (부드럽게)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">바이리니어 (선명하게)</string>
+    <string name="retro_ps2_texture_filter">텍스처 필터</string>
+    <string name="retro_ps2_filter_bilinear_forced">바이리니어 (강제)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">바이리니어 (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">바이리니어 (스프라이트)</string>
+    <string name="retro_ps2_blending_accuracy">블렌딩 정확도</string>
+    <string name="retro_ps2_blend_minimum">최소</string>
+    <string name="retro_ps2_blend_basic">기본</string>
+    <string name="retro_ps2_blend_medium">중간</string>
+    <string name="retro_ps2_blend_high">높음</string>
+    <string name="retro_ps2_blend_full">전체</string>
+    <string name="retro_ps2_blend_maximum">최대</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV 셰이더</string>
+    <string name="retro_ps2_shader_off">끔</string>
+    <string name="retro_ps2_shader_scanline">스캔라인</string>
+    <string name="retro_ps2_shader_diagonal">대각선</string>
+    <string name="retro_ps2_shader_triangular">삼각형</string>
+    <string name="retro_ps2_shader_wave">웨이브</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">프레임 스킵</string>
+    <string name="retro_ps2_frameskip_off">끔</string>
+    <string name="retro_ps2_frameskip_1">1 스킵</string>
+    <string name="retro_ps2_frameskip_2">2 스킵</string>
+    <string name="retro_ps2_frameskip_3">3 스킵</string>
+    <string name="retro_ps2_mipmapping">밉매핑</string>
+    <string name="retro_ps2_volume">볼륨</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">음소거</string>
+    <string name="retro_ps2_swap_stereo_channels">스테레오 채널 교체</string>
+    <string name="retro_ps2_ee_cycle_rate">EE 사이클 레이트</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (기본값)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE 사이클 스킵</string>
+    <string name="retro_ps2_skip_off">끔</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">멀티 스레드 VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Fast CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">에뮬레이션 속도</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU 사용량</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU 사용량</string>
+    <string name="retro_ps2_hud_internal_resolution">내부 해상도</string>
+    <string name="retro_ps2_deinterlace_mode">디인터레이스 모드</string>
+    <string name="retro_ps2_deint_auto">자동</string>
+    <string name="retro_ps2_deint_off">끔</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV 화면비</string>
+    <string name="retro_ps2_anti_blur">안티 블러</string>
+    <string name="retro_ps2_widescreen_patches">와이드스크린 패치</string>
+    <string name="retro_ps2_no_interlace_patches">노 인터레이스 패치</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC 스핀 감지</string>
+    <string name="retro_ps2_wait_loop">대기 루프 감지</string>
+    <string name="retro_ps2_time_stretch">오디오 타임 스트레치</string>
+    <string name="retro_ps2_audio_buffer">오디오 버퍼</string>
+    <string name="retro_ps2_audio_latency">출력 지연 시간</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">프레임 시간</string>
+    <string name="retro_ps2_hud_gs_stats">GS 통계</string>
+    <string name="retro_ps2_hud_hw_info">하드웨어 정보</string>
+    <string name="retro_ps2_hud_version">버전</string>
+    <string name="retro_ps2_hud_input_display">입력 표시</string>
+    <string name="retro_ps2_tab_menu">메뉴</string>
+    <string name="retro_ps2_tab_display">디스플레이</string>
+    <string name="retro_ps2_tab_performance">성능</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">사운드</string>
+    <string name="retro_ps2_tab_online">온라인</string>
+    <string name="retro_ps2_tab_controls">컨트롤</string>
+    <string name="retro_ps2_resume">계속하기</string>
+    <string name="retro_ps2_pause">일시정지</string>
+    <string name="retro_ps2_exit">종료</string>
+    <string name="retro_lr_bios_imported">BIOS 가져옴: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">잘못된 BIOS 파일</string>
+    <string name="retro_lr_invalid_retro_game">잘못된 레트로 게임</string>
+    <string name="retro_lr_rom_not_found">ROM 을 찾을 수 없음: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">이 아카이브 안의 ROM 을 읽을 수 없습니다</string>
+    <string name="retro_lr_core_not_installed">코어가 설치되지 않음: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">치트 사용 — 이 세션에서는 도전 과제가 비활성화됩니다</string>
+    <string name="retro_lr_cloud_save_restored">클라우드 저장을 복원했습니다</string>
+    <string name="retro_lr_restore_failed">복원에 실패했습니다</string>
+    <string name="retro_lr_cloud_conflict_message">%1$s 에 더 최신 클라우드 저장이 있습니다. 동기화하시겠습니까? 어느 클라우드 저장을 유지하시겠습니까?</string>
+    <string name="retro_lr_cloud_save">클라우드 저장</string>
+    <string name="retro_lr_renderer_default">레트로</string>
+    <string name="retro_lr_failed_load_core">에뮬레이터 코어를 불러오지 못했습니다</string>
+    <string name="retro_lr_failed_load_rom">ROM 을 불러오지 못했습니다</string>
+    <string name="retro_lr_graphics_not_supported">이 코어에서는 그래픽이 지원되지 않습니다</string>
+    <string name="retro_lr_emulator_error">에뮬레이터 오류</string>
+    <string name="retro_lr_shader_default">기본값</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">선명하게</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR 업스케일</string>
+    <string name="retro_lr_upscale_native">네이티브</string>
+    <string name="retro_lr_sound">사운드</string>
+    <string name="retro_lr_left_stick_invert_x">왼쪽 스틱: X축 반전</string>
+    <string name="retro_lr_left_stick_invert_y">왼쪽 스틱: Y축 반전</string>
+    <string name="retro_lr_right_stick_invert_x">오른쪽 스틱: X축 반전</string>
+    <string name="retro_lr_right_stick_invert_y">오른쪽 스틱: Y축 반전</string>
+    <string name="retro_lr_on_screen_controls">화면 컨트롤</string>
+    <string name="retro_lr_haptic_feedback">햅틱 피드백</string>
+    <string name="retro_lr_portrait">세로 모드</string>
+    <string name="retro_lr_landscape">가로 모드</string>
+    <string name="retro_lr_edit_layout">레이아웃 편집 (%1$s)</string>
+    <string name="retro_lr_reset_layout">%1$s 레이아웃 재설정</string>
+    <string name="retro_lr_layout_reset">%1$s 레이아웃을 재설정했습니다</string>
+    <string name="retro_lr_button_color">버튼 색상</string>
+    <string name="retro_lr_letter_color">글자 색상</string>
+    <string name="retro_lr_shadow_color">그림자 색상</string>
+    <string name="retro_lr_background_color">배경 색상</string>
+    <string name="retro_lr_reset_colors">색상 재설정</string>
+    <string name="retro_lr_colors_reset">색상을 재설정했습니다</string>
+    <string name="retro_lr_performance_hud">성능 HUD</string>
+    <string name="retro_lr_alpha">알파</string>
+    <string name="retro_lr_background_alpha">배경 알파</string>
+    <string name="retro_lr_background">배경</string>
+    <string name="retro_lr_scale">스케일</string>
+    <string name="retro_lr_numeric_frametime">숫자 프레임타임</string>
+    <string name="retro_lr_dual_series_battery">듀얼 시리즈 배터리</string>
+    <string name="retro_lr_hud_elements">HUD 요소</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">콘솔</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">배터리</string>
+    <string name="retro_lr_hud_temp">온도</string>
+    <string name="retro_lr_hud_graph">그래프</string>
+    <string name="retro_lr_hud_cpu_temp">CPU 온도</string>
+    <string name="retro_lr_save_state">상태 저장</string>
+    <string name="retro_lr_load_save_state">상태 불러오기</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">하드코어 모드에서는 상태 불러오기가 비활성화됩니다</string>
+    <string name="retro_lr_achievements">도전 과제</string>
+    <string name="retro_lr_cheats">치트</string>
+    <string name="retro_lr_cheats_disabled_hardcore">하드코어 모드에서는 치트가 비활성화됩니다</string>
+    <string name="retro_lr_reset">재설정</string>
+    <string name="retro_lr_fast_forward">빨리 감기</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">하드코어 모드에서는 빨리 감기가 비활성화됩니다</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">디스크 %1$d/%2$d</string>
+    <string name="retro_lr_resume">계속하기</string>
+    <string name="retro_lr_pause">일시정지</string>
+    <string name="retro_lr_exit">종료</string>
+    <string name="retro_lr_saved_to_slot">슬롯 %1$d 에 저장했습니다</string>
+    <string name="retro_lr_could_not_save_state">상태를 저장할 수 없습니다</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS 필요</string>
+    <string name="retro_lr_bios_required_message">PlayStation 게임에는 사용자가 직접 준비해야 하는 실제 콘솔 BIOS 파일이 필요합니다. 계속하려면 BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin 또는 scph7001.bin) 를 가져오세요.</string>
+    <string name="retro_lr_import_bios">BIOS 가져오기…</string>
+    <string name="retro_lr_cancel">취소</string>
+    <string name="retro_lr_slot_empty">슬롯 %1$d 이(가) 비어 있습니다</string>
+    <string name="retro_lr_loaded_slot">슬롯 %1$d 을(를) 불러왔습니다</string>
+    <string name="retro_lr_could_not_load_state">상태를 불러올 수 없습니다</string>
+    <string name="retro_lr_slot_title">슬롯 %1$d</string>
+    <string name="retro_lr_rename_slot">슬롯 %1$d 이름 변경</string>
+    <string name="retro_gs_section_general">일반</string>
+    <string name="retro_gs_section_graphics">그래픽</string>
+    <string name="retro_gs_section_performance">성능</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">입력</string>
+    <string name="retro_gs_section_audio">오디오</string>
+    <string name="retro_gs_section_online">온라인</string>
+    <string name="retro_gs_cancel">취소</string>
+    <string name="retro_gs_save">저장</string>
+    <string name="retro_gs_shader_default">기본값</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">선명하게</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">네이티브</string>
+    <string name="retro_gs_group_game">게임</string>
+    <string name="retro_gs_label_name">이름</string>
+    <string name="retro_gs_label_system">시스템</string>
+    <string name="retro_gs_label_emulator_core">에뮬레이터 코어</string>
+    <string name="retro_gs_label_rom_path">ROM 경로</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">설치됨</string>
+    <string name="retro_gs_bios_none">없음 — %1$s 게임을 실행하려면 필요합니다</string>
+    <string name="retro_gs_import_bios">BIOS 가져오기…</string>
+    <string name="retro_gs_remove_bios">BIOS 제거</string>
+    <string name="retro_gs_group_library_artwork">라이브러리 아트워크</string>
+    <string name="retro_gs_artwork_game_card">게임 카드 이미지</string>
+    <string name="retro_gs_artwork_grid">그리드 이미지</string>
+    <string name="retro_gs_artwork_carousel">캐러셀 이미지</string>
+    <string name="retro_gs_artwork_list">목록 이미지</string>
+    <string name="retro_gs_artwork_custom_set">사용자 지정 이미지 설정됨</string>
+    <string name="retro_gs_artwork_set_image">이미지 설정</string>
+    <string name="retro_gs_artwork_remove">제거</string>
+    <string name="retro_gs_group_video">비디오</string>
+    <string name="retro_gs_video_filter">비디오 필터</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR 업스케일</string>
+    <string name="retro_gs_performance_hud">성능 HUD</string>
+    <string name="retro_gs_group_core">코어</string>
+    <string name="retro_gs_renderer">렌더러</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">해상도 스케일</string>
+    <string name="retro_gs_scale_1x_native">1x (네이티브)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">화면 비율</string>
+    <string name="retro_gs_aspect_stretch">늘이기</string>
+    <string name="retro_gs_aspect_auto_standard">자동 (표준)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">디스플레이 필터</string>
+    <string name="retro_gs_filter_nearest">니어리스트</string>
+    <string name="retro_gs_filter_bilinear_smooth">바이리니어 (부드럽게)</string>
+    <string name="retro_gs_filter_bilinear_sharp">바이리니어 (선명하게)</string>
+    <string name="retro_gs_texture_filter">텍스처 필터</string>
+    <string name="retro_gs_filter_bilinear_forced">바이리니어 (강제)</string>
+    <string name="retro_gs_filter_bilinear_ps2">바이리니어 (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">바이리니어 (스프라이트)</string>
+    <string name="retro_gs_blending_accuracy">블렌딩 정확도</string>
+    <string name="retro_gs_blend_minimum">최소</string>
+    <string name="retro_gs_blend_basic">기본</string>
+    <string name="retro_gs_blend_medium">중간</string>
+    <string name="retro_gs_blend_high">높음</string>
+    <string name="retro_gs_blend_full">전체</string>
+    <string name="retro_gs_blend_maximum">최대</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV 셰이더</string>
+    <string name="retro_gs_off">끔</string>
+    <string name="retro_gs_tvshader_scanline">스캔라인</string>
+    <string name="retro_gs_tvshader_diagonal">대각선</string>
+    <string name="retro_gs_tvshader_triangular">삼각형</string>
+    <string name="retro_gs_tvshader_wave">웨이브</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">프레임 스킵</string>
+    <string name="retro_gs_frameskip_1">1 스킵</string>
+    <string name="retro_gs_frameskip_2">2 스킵</string>
+    <string name="retro_gs_frameskip_3">3 스킵</string>
+    <string name="retro_gs_mipmapping">밉매핑</string>
+    <string name="retro_gs_group_performance">성능</string>
+    <string name="retro_gs_ee_cycle_rate">EE 사이클 레이트</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (기본값)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE 사이클 스킵</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">멀티 스레드 VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Fast CDVD</string>
+    <string name="retro_gs_group_performance_hud">성능 HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">에뮬레이션 속도</string>
+    <string name="retro_gs_hud_cpu_usage">CPU 사용량</string>
+    <string name="retro_gs_hud_gpu_usage">GPU 사용량</string>
+    <string name="retro_gs_hud_internal_resolution">내부 해상도</string>
+    <string name="retro_gs_deinterlace_mode">디인터레이스 모드</string>
+    <string name="retro_gs_deint_auto">자동</string>
+    <string name="retro_gs_deint_off">끔</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV 화면비</string>
+    <string name="retro_gs_anti_blur">안티 블러</string>
+    <string name="retro_gs_widescreen_patches">와이드스크린 패치</string>
+    <string name="retro_gs_no_interlace_patches">노 인터레이스 패치</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC 스핀 감지</string>
+    <string name="retro_gs_wait_loop">대기 루프 감지</string>
+    <string name="retro_gs_time_stretch">오디오 타임 스트레치</string>
+    <string name="retro_gs_audio_buffer">오디오 버퍼</string>
+    <string name="retro_gs_audio_latency">출력 지연 시간</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">프레임 시간</string>
+    <string name="retro_gs_hud_gs_stats">GS 통계</string>
+    <string name="retro_gs_hud_hw_info">하드웨어 정보</string>
+    <string name="retro_gs_hud_version">버전</string>
+    <string name="retro_gs_hud_input_display">입력 표시</string>
+    <string name="retro_gs_fast_boot">빠른 부팅</string>
+    <string name="retro_gs_group_online_dev9">온라인 (DEV9)</string>
+    <string name="retro_gs_enable_online">온라인 사용</string>
+    <string name="retro_gs_ethernet_device">이더넷 장치</string>
+    <string name="retro_gs_net_auto">자동</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS 모드</string>
+    <string name="retro_gs_dns_manual">수동</string>
+    <string name="retro_gs_dns_internal">내부</string>
+    <string name="retro_gs_primary_dns">기본 DNS</string>
+    <string name="retro_gs_secondary_dns">보조 DNS</string>
+    <string name="retro_gs_dns_optional">선택 사항</string>
+    <string name="retro_gs_auto_ip_dhcp">자동 IP (DHCP)</string>
+    <string name="retro_gs_group_input">입력</string>
+    <string name="retro_engine_save">저장</string>
+    <string name="retro_engine_saved">게임 저장됨</string>
+    <string name="retro_engine_loading">불러오는 중…</string>
+    <string name="retro_engine_load">불러오기</string>
+    <string name="retro_engine_saved_to">%1$s에 저장됨</string>
+    <string name="retro_engine_slot_active_only">사용 중</string>
+    <string name="retro_engine_rename_slot">저장 슬롯 이름 변경</string>
+    <string name="retro_engine_caught">%1$d마리 포획</string>
+    <string name="retro_engine_no_slots">저장 슬롯이 없습니다</string>
+    <string name="retro_engine_new_slot">새 저장 슬롯</string>
+    <string name="retro_engine_achievements_unavailable">3D 모드에서는 기록되지 않음</string>
+    <string name="retro_engine_fullscreen">전체 화면</string>
+    <string name="retro_engine_loaded_from">%1$s 불러옴</string>
+    <string name="retro_engine_slot_empty">해당 슬롯이 비어 있습니다</string>
+    <string name="retro_engine_loading_subtitle">게임 데이터를 처음으로 준비하는 중</string>
+    <string name="retro_gs_engine_3d">복셀 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">기본 코어 대신 3D 복셀 엔진으로 이 게임을 플레이합니다</string>
+    <string name="retro_gs_on_screen_controls">화면 컨트롤</string>
+    <string name="retro_gs_haptic_feedback">햅틱 피드백</string>
+    <string name="retro_gs_group_audio">오디오</string>
+    <string name="retro_gs_volume">볼륨</string>
+    <string name="retro_gs_mute">음소거</string>
+    <string name="retro_gs_swap_stereo">스테레오 채널 교체</string>
+    <string name="retro_gs_sound">사운드</string>
+    <string name="retro_scr_retro_defaults">레트로 기본값</string>
+    <string name="retro_scr_retro_defaults_desc">게임 자체 설정에서 재정의하지 않는 한 각 콘솔의 게임에 적용되는 기본값입니다.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">계정</string>
+    <string name="retro_scr_signed_in">로그인됨</string>
+    <string name="retro_scr_not_signed_in_hint">로그인하지 않음 — 게임의 도전 과제를 열어 로그인하세요</string>
+    <string name="retro_scr_achievements_enabled">도전 과제 사용</string>
+    <string name="retro_scr_hardcore_default">기본적으로 하드코어 모드 (상태 저장 없음)</string>
+    <string name="retro_scr_sign_out">로그아웃</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">설치됨</string>
+    <string name="retro_scr_none_ps1_bios">없음 — PS1 게임에는 BIOS 가 필요합니다</string>
+    <string name="retro_scr_import_ps1_bios">PS1 BIOS 가져오기…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS 를 제거했습니다</string>
+    <string name="retro_scr_no_bios_to_remove">제거할 BIOS 가 없습니다</string>
+    <string name="retro_scr_remove_ps1_bios">PS1 BIOS 제거</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">없음 — PS2 게임에는 BIOS 가 필요합니다</string>
+    <string name="retro_scr_format">형식</string>
+    <string name="retro_scr_ps2_bios_format">단일 파일로 병합된 덤프 (지역 태그가 있는 .bin, 약 4MB). 분할된 ROM0/MEC/NVM 세트는 허용되지 않습니다.</string>
+    <string name="retro_scr_import_ps2_bios">PS2 BIOS 가져오기…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS 를 제거했습니다</string>
+    <string name="retro_scr_remove_ps2_bios">PS2 BIOS 제거</string>
+    <string name="retro_scr_library_artwork">라이브러리 아트워크</string>
+    <string name="retro_scr_retro_case_art">레트로 케이스 아트 (카트리지 / CD 케이스)</string>
+    <string name="retro_scr_box_art">박스 아트</string>
+    <string name="retro_scr_box_art_desc">가져올 때 thumbnails.libretro.com 에서 자동으로 가져옵니다. 사용자 지정 이미지는 항상 이를 재정의합니다.</string>
+    <string name="retro_scr_roms_folder">ROMS 폴더</string>
+    <string name="retro_scr_folder">폴더</string>
+    <string name="retro_scr_roms_not_set">설정되지 않음 — 폴더를 선택하여 게임을 자동으로 가져오기</string>
+    <string name="retro_scr_auto_import">자동 가져오기</string>
+    <string name="retro_scr_auto_import_desc">이 폴더의 새 게임은 올바른 콘솔이 감지된 상태로 라이브러리에 자동으로 추가됩니다.</string>
+    <string name="retro_scr_select_roms_folder_title">ROMs 폴더 선택</string>
+    <string name="retro_scr_select_roms_folder_button">ROMs 폴더 선택…</string>
+    <string name="retro_scr_change_roms_folder_button">ROMs 폴더 변경…</string>
+    <string name="retro_scr_scan_now">지금 스캔</string>
+    <string name="retro_scr_console_defaults">콘솔 기본값</string>
+    <string name="retro_scr_console_defaults_desc">콘솔을 탭하여 기본 설정을 지정하세요.</string>
+    <string name="retro_scr_renderer">렌더러</string>
+    <string name="retro_scr_upscale_resolution">해상도 업스케일</string>
+    <string name="retro_scr_aspect_ratio">화면 비율</string>
+    <string name="retro_scr_aspect_stretch">늘이기</string>
+    <string name="retro_scr_aspect_auto_standard">자동 (표준)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">디스플레이 필터</string>
+    <string name="retro_scr_filter_nearest">니어리스트</string>
+    <string name="retro_scr_filter_bilinear_smooth">바이리니어 (부드럽게)</string>
+    <string name="retro_scr_filter_bilinear_sharp">바이리니어 (선명하게)</string>
+    <string name="retro_scr_texture_filter">텍스처 필터</string>
+    <string name="retro_scr_filter_bilinear_forced">바이리니어 (강제)</string>
+    <string name="retro_scr_filter_bilinear_ps2">바이리니어 (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">바이리니어 (스프라이트)</string>
+    <string name="retro_scr_blending_accuracy">블렌딩 정확도</string>
+    <string name="retro_scr_blend_minimum">최소</string>
+    <string name="retro_scr_blend_basic">기본</string>
+    <string name="retro_scr_blend_medium">중간</string>
+    <string name="retro_scr_blend_high">높음</string>
+    <string name="retro_scr_blend_full">전체</string>
+    <string name="retro_scr_blend_maximum">최대</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV 셰이더</string>
+    <string name="retro_scr_shader_off">끔</string>
+    <string name="retro_scr_shader_scanline">스캔라인</string>
+    <string name="retro_scr_shader_diagonal">대각선</string>
+    <string name="retro_scr_shader_triangular">삼각형</string>
+    <string name="retro_scr_shader_wave">웨이브</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">프레임 스킵</string>
+    <string name="retro_scr_skip_1">1 스킵</string>
+    <string name="retro_scr_skip_2">2 스킵</string>
+    <string name="retro_scr_skip_3">3 스킵</string>
+    <string name="retro_scr_mipmapping">밉매핑</string>
+    <string name="retro_scr_ee_cycle_rate">EE 사이클 레이트</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (기본값)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE 사이클 스킵</string>
+    <string name="retro_scr_skip_off">끔</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">멀티 스레드 VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Fast CDVD</string>
+    <string name="retro_scr_touch_controls">화면 터치 컨트롤</string>
+    <string name="retro_scr_sound">사운드</string>
+    <string name="retro_scr_swap_stereo">스테레오 채널 교체</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: 에뮬레이션 속도</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU 사용량</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU 사용량</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: 내부 해상도</string>
+    <string name="retro_scr_enable_online_dev9">온라인 사용 (DEV9)</string>
+    <string name="retro_scr_ethernet_device">이더넷 장치</string>
+    <string name="retro_scr_net_auto">자동</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS 모드</string>
+    <string name="retro_scr_dns_manual">수동</string>
+    <string name="retro_scr_dns_internal">내부</string>
+    <string name="retro_scr_primary_dns">기본 DNS</string>
+    <string name="retro_scr_secondary_dns">보조 DNS</string>
+    <string name="retro_scr_optional">선택 사항</string>
+    <string name="retro_scr_auto_ip_dhcp">자동 IP (DHCP)</string>
+    <string name="retro_scr_shader">셰이더</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR 업스케일링</string>
+    <string name="retro_scr_performance_hud">성능 HUD</string>
+    <string name="retro_scr_credits_licenses">크레딧 &amp; 라이선스</string>
+    <string name="retro_scr_credits_desc">WinNative의 일부 기능은 이러한 오픈 소스 프로젝트를 기반으로 합니다. 탭하여 각 소스를 확인하세요.</string>
+    <string name="retro_scr_tab_defaults">기본값</string>
+    <string name="retro_scr_tab_credits">크레딧</string>
+    <string name="retro_scr_enable_hardcore_title">하드코어 모드를 사용하시겠습니까?</string>
+    <string name="retro_scr_enable_hardcore_body">하드코어 모드는 지금 게임을 재설정하고 상태 저장 불러오기, 빨리 감기, 치트를 비활성화합니다. 저장하지 않은 진행 상황은 손실됩니다. 계속하시겠습니까?</string>
+    <string name="retro_scr_cancel">취소</string>
+    <string name="retro_scr_enable">사용</string>
+    <string name="retro_scr_bios_imported">BIOS 가져옴: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">잘못된 BIOS 파일</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS 가져옴: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">잘못된 PS2 BIOS 파일</string>
+    <string name="retro_scr_no_game_serial">치트를 검색할 게임 시리얼이 없습니다.</string>
+    <string name="retro_scr_applied_cheats">치트 %1$d 개를 적용했습니다.</string>
+    <string name="retro_scr_couldnt_apply_cheats">치트를 적용할 수 없습니다.</string>
+    <string name="retro_scr_cheats">치트</string>
+    <string name="retro_scr_apply">적용</string>
+    <string name="retro_scr_no_cheats_found">이 게임의 치트를 찾을 수 없습니다.</string>
+    <string name="retro_scr_achievements">도전 과제</string>
+    <string name="retro_scr_sign_in_ra">RetroAchievements 에 로그인</string>
+    <string name="retro_scr_username">사용자 이름</string>
+    <string name="retro_scr_password">비밀번호</string>
+    <string name="retro_scr_login_failed">로그인에 실패했습니다</string>
+    <string name="retro_scr_signing_in">로그인 중…</string>
+    <string name="retro_scr_sign_in">로그인</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">이 게임의 도전 과제가 없습니다.</string>
+    <string name="retro_scr_back">뒤로</string>
+    <string name="retro_scr_enabled">사용</string>
+    <string name="retro_scr_disabled">사용 안 함</string>
+    <string name="retro_scr_rename">이름 변경</string>
+    <string name="retro_scr_save">저장</string>
+    <string name="retro_scr_cloud_save_conflict">클라우드 저장 충돌</string>
+    <string name="retro_scr_keep_local_save">로컬 저장 유지</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">메뉴</string>
+    <string name="retro_tab_display">디스플레이</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">사운드</string>
+    <string name="retro_tab_controls">컨트롤</string>
+    <string name="retro_scan_up_to_date">라이브러리가 최신 상태입니다</string>
+    <string name="retro_scan_roms">ROM: %1$s</string>
+    <string name="retro_scan_added">%1$d 개 추가됨</string>
+    <string name="retro_scan_removed">%1$d 개 제거됨</string>
+    <string name="retro_scr_shader_default">기본값</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">선명하게</string>
+    <string name="retro_scr_upscale_native">네이티브</string>
+    <string name="retro_co_aspect_ratio">화면 비율</string>
+    <string name="retro_co_ntsc_filter">NTSC 필터</string>
+    <string name="retro_co_colorization">색상화</string>
+    <string name="retro_co_color_correction">색 보정</string>
+    <string name="retro_co_remove_sprite_limit">스프라이트 제한 해제</string>
+    <string name="retro_co_resolution">해상도</string>
+    <string name="retro_co_framebuffer_emulation">프레임버퍼 에뮬레이션</string>
+    <string name="retro_co_dithering">디더링</string>
+    <string name="retro_co_widescreen_hack">와이드스크린 핵</string>
+    <string name="retro_co_val_8_7_native">8:7 (네이티브)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">끔</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">컴포지트</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">자동</string>
+    <string name="retro_co_val_gba_screen">GBA 화면</string>
+    <string name="retro_co_val_gbc_screen">GBC 화면</string>
+    <string name="retro_co_val_on">켬</string>
+    <string name="retro_co_val_320x240_native">320x240 (네이티브)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 조정됨</string>
+    <string name="retro_co_val_native">네이티브</string>
+    <string name="retro_co_val_internal">내부</string>
+    <string name="retro_co_val_on_16_9">켬 (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">RetroAchievements 계정으로 로그인하여 레트로 게임의 도전 과제를 획득하고 추적하세요.</string>
+    <string name="retro_ach_username">사용자 이름</string>
+    <string name="retro_ach_password">비밀번호</string>
+    <string name="retro_ach_enter_credentials">사용자 이름과 비밀번호를 입력하세요</string>
+    <string name="retro_ach_login_failed">로그인에 실패했습니다</string>
+    <string name="retro_ach_sign_in">로그인</string>
+    <string name="retro_ach_password_disclaimer">비밀번호는 로그인 토큰을 얻기 위해 한 번만 사용되며, 기기에 안전하게 저장됩니다.</string>
+    <string name="retro_ach_achievements_enabled">도전 과제 사용</string>
+    <string name="retro_ach_hardcore_mode">하드코어 모드 (상태 저장 없음)</string>
+    <string name="retro_ach_points">%1$d / %2$d 포인트</string>
+    <string name="retro_ach_none_found">이 게임의 도전 과제를 찾을 수 없습니다.</string>
+    <string name="retro_ach_sign_out">로그아웃</string>
+    <string name="retro_che_brand">치트</string>
+    <string name="retro_che_name">이름</string>
+    <string name="retro_che_code">코드</string>
+    <string name="retro_che_cancel">취소</string>
+    <string name="retro_che_save">저장</string>
+    <string name="retro_che_default_name">치트 %1$d</string>
+    <string name="retro_che_empty">아직 치트가 없습니다. 이 게임의 치트 코드를 추가하세요.</string>
+    <string name="retro_che_add">치트 추가</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU 드라이버</string>
+    <string name="retro_gpu_driver_system">시스템(기본값)</string>
+    <string name="retro_gpu_driver_hint">설정 \u2192 드라이버에서 Turnip 드라이버를 설치하세요. 동일한 드라이버가 PC와 PS2 게임 모두에서 작동합니다.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Final Fantasy XI 같은 HDD 기반 게임용 가상 내장 드라이브. 게임을 다시 시작합니다.</string>
+    <string name="retro_ps2_hdd_desc">Final Fantasy XI 같은 HDD 기반 게임용 가상 내장 드라이브.</string>
+    <string name="retro_ps2_dns_auto_internal">사용자 지정 서버 호스트가 적용되도록 DNS 모드를 Internal로 설정했습니다.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">CPU 코어</string>
+    <string name="retro_co_dual_core">듀얼 코어</string>
+    <string name="retro_co_internal_cheats">내장 치트</string>
+    <string name="retro_co_internal_resolution">내부 해상도</string>
+    <string name="retro_co_renderer">렌더러</string>
+    <string name="retro_co_sensor_bar">센서 바 위치</string>
+    <string name="retro_co_skip_gc_bios">BIOS 인트로 건너뛰기</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">아래</string>
+    <string name="retro_co_val_cached_interpreter">캐시된 인터프리터</string>
+    <string name="retro_co_val_hardware">하드웨어</string>
+    <string name="retro_co_val_interpreter">인터프리터</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">마우스 / 터치</string>
+    <string name="retro_co_val_right_stick_absolute">오른쪽 스틱 (절대)</string>
+    <string name="retro_co_val_right_stick_relative">오른쪽 스틱 (상대)</string>
+    <string name="retro_co_val_software">소프트웨어</string>
+    <string name="retro_co_val_stretch">늘이기</string>
+    <string name="retro_co_val_top">위</string>
+    <string name="retro_co_vbi_skip">VBI 건너뛰기 (자동 프레임 스킵)</string>
+    <string name="retro_co_widescreen">와이드스크린</string>
+    <string name="retro_co_wiimote_pointer">Wiimote 포인터</string>
+    <string name="retro_gs_cheats_apply_note">변경 사항은 다음에 이 게임을 실행할 때 적용됩니다.</string>
+    <string name="retro_gs_cheats_detect_hint">이 게임을 한 번 실행하면 디스크 시리얼이 감지되며, 그 후 치트와 패치가 여기에 표시됩니다.</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS 인증 우회 — 온라인 플레이에 필요</string>
+    <string name="retro_gs_dnas_group">자동 적용 (온라인)</string>
+    <string name="retro_gs_group_cheats">치트 &amp; 패치</string>
+    <string name="retro_gs_hdd_image_size">크기: %1$s</string>
+    <string name="retro_gs_hdd_import">HDD 이미지 가져오기</string>
+    <string name="retro_gs_hdd_remove_short">제거</string>
+    <string name="retro_gs_netplay_enable">NetPlay 사용</string>
+    <string name="retro_gs_netplay_enable_subtitle">기본적으로 꺼져 있습니다. 사용을 켠 다음 실행 전에 Host 또는 Join을 선택하세요.\n게임을 종료하면 다시 꺼집니다.</string>
+    <string name="retro_gs_netplay_host">Host 주소</string>
+    <string name="retro_gs_netplay_host_hint">IP 또는 호스트 이름</string>
+    <string name="retro_gs_netplay_host_mode">Host 세션</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">켜짐 = 플레이어 대기. 꺼짐 = host 주소로 접속</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay는 TCP를 통해 로컬 멀티플레이 포트를 사용합니다 (플레이어 1 host / 플레이어 2 클라이언트). PS2 온라인은 대신 DEV9 이더넷을 사용합니다.</string>
+    <string name="retro_gs_netplay_port">Port</string>
+    <string name="retro_lr_memory_card_slot">메모리 카드 %1$d</string>
+    <string name="retro_lr_screenshot">스크린샷</string>
+    <string name="retro_lr_use_cloud_save">클라우드 저장 사용</string>
+    <string name="retro_netplay_conn_direct">LAN (직접 IP)</string>
+    <string name="retro_netplay_connecting">연결 중…</string>
+    <string name="retro_netplay_connection">연결</string>
+    <string name="retro_netplay_conn_traversal">온라인 (host 코드)</string>
+    <string name="retro_netplay_dismiss">닫기</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay는 Dolphin 자체 엔진을 사용합니다. Host = 플레이어 1, Join = 플레이어 2. 실행 전에 Host 또는 Join과 연결 유형을 선택하세요. 두 기기가 함께 같은 게임을 부팅합니다.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">기기의 Wi‑Fi IP와 이 port를 플레이어 2와 공유하세요. 상대가 연결하면 게임이 자동으로 시작됩니다.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">게임이 부팅되면 host 코드가 표시됩니다 — 플레이어 2와 공유하세요. 상대가 연결하면 게임이 자동으로 시작됩니다.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">host의 Wi‑Fi IP와 port를 입력한 다음 실행하여 연결하세요.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">플레이어 1의 host 코드를 입력한 다음 실행하여 연결하세요.</string>
+    <string name="retro_netplay_enable_before_launch">게임 설정에서 NetPlay를 사용으로 설정하고 실행 전에 Host 또는 Join을 선택하세요</string>
+    <string name="retro_netplay_find_rooms">Wi‑Fi에서 방 찾기</string>
+    <string name="retro_netplay_game_link_hint">Game Link · 각 화면은 독립된 휴대용 기기입니다</string>
+    <string name="retro_netplay_gba_not_ready">GBA 멀티플레이는 gpSP + Wireless Adapter를 사용합니다. libgpsp가 설치되어 있는지 확인하세요.</string>
+    <string name="retro_netplay_help">Wi‑Fi를 통한 화면 공유 멀티플레이 (RetroArch와 유사).\nHost = 플레이어 1, Join = 플레이어 2. 두 기기가 같은 게임을 표시합니다.</string>
+    <string name="retro_netplay_help_game_link">Wi‑Fi를 통한 Game Link — 각 기기가 자체 게임을 실행합니다.\nGB/GBC: Gambatte 시리얼 링크 (Pokémon 1–2세대).\nGBA: gpSP Wireless Adapter (Pokémon FR/LG/Emerald 배틀).</string>
+    <string name="retro_netplay_host_action">방 호스팅</string>
+    <string name="retro_netplay_host_code">Host 코드</string>
+    <string name="retro_netplay_host_code_hint">host의 트래버설 host 코드</string>
+    <string name="retro_netplay_hosting_room">방 호스팅 중</string>
+    <string name="retro_netplay_host_mode_hint">Host를 눌러 이 플레이 세션용 방을 연 다음 게임을 실행하세요. 종료하면 NetPlay가 꺼집니다.</string>
+    <string name="retro_netplay_in_room">방에 있음</string>
+    <string name="retro_netplay_join_action">IP로 참가</string>
+    <string name="retro_netplay_joined">참가함</string>
+    <string name="retro_netplay_join_room">Join</string>
+    <string name="retro_netplay_launch_mode">실행 시</string>
+    <string name="retro_netplay_leave">나가기</string>
+    <string name="retro_netplay_menu_hint">Host = P1 · Join = P2 · 두 화면에 같은 게임</string>
+    <string name="retro_netplay_mode_host">Host</string>
+    <string name="retro_netplay_mode_join">Join</string>
+    <string name="retro_netplay_mode_manual">수동</string>
+    <string name="retro_netplay_no_rooms">방을 찾을 수 없습니다. host가 같은 Wi‑Fi에 있고 방을 호스팅 중인지 확인하세요.</string>
+    <string name="retro_netplay_player_name">표시 이름</string>
+    <string name="retro_netplay_player_name_hint">다른 플레이어에게 표시됨</string>
+    <string name="retro_netplay_players_count">%1$d명 연결됨</string>
+    <string name="retro_netplay_prelaunch_hint">방은 이 세션 동안에만 열려 있습니다. 준비되면 실행하세요. 게임을 종료하면 NetPlay가 꺼집니다.</string>
+    <string name="retro_netplay_room_players">플레이어</string>
+    <string name="retro_netplay_scan_action">Wi‑Fi 스캔</string>
+    <string name="retro_netplay_scan_again">다시 스캔</string>
+    <string name="retro_netplay_scan_hint">같은 Wi‑Fi에서 열린 방을 스캔하거나 IP 주소로 참가하세요.</string>
+    <string name="retro_netplay_scanning">Wi‑Fi 스캔 중…</string>
+    <string name="retro_netplay_scan_results">스캔 결과</string>
+    <string name="retro_netplay_select_room_hint">방을 눌러 지금 참가하세요 (다음 실행을 위해 IP를 저장하지 않습니다).</string>
+    <string name="retro_netplay_stop_scan">스캔 중지</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s 연결됨</string>
+    <string name="retro_netplay_user_disconnected">%1$s 연결 끊김</string>
+    <string name="retro_netplay_waiting_players">플레이어 대기 중…</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2 지원이 곧 제공됩니다</string>
+    <string name="retro_ps2_show_l3r3">L3 / R3 버튼 표시</string>
+    <string name="retro_ps2_show_l3r3_subtitle">꺼져 있으면 스틱을 두 번 눌러 L3 / R3를 클릭합니다</string>
+    <string name="retro_ps2_turnip_flags">TURNIP 드라이버 플래그</string>
+    <string name="retro_ps2_turnip_flags_note">위에서 사용자 지정 GPU 드라이버를 선택한 경우에만 적용됩니다.</string>
+    <string name="retro_rom_missing">게임 파일을 찾을 수 없음</string>
+    <string name="retro_scr_delete">삭제</string>
+    <string name="retro_scr_import_from_file">파일에서 가져오기…</string>
+    <string name="retro_scr_loading">로딩 중…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">콘솔 변경</string>
+    <string name="retro_gs_identify_as">콘솔로 인식</string>
+    <string name="retro_gs_console_changed">이제 %1$s(으)로 인식됨</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">내장된 vkBasalt 레이어를 통해 DXVK/VKD3D(Vulkan) 게임에 ReShade 효과(.fx)를 적용합니다. 각 효과를 Android/data/&lt;package&gt;/files/ReShade/ 아래의 자체 폴더에 넣으세요. 실시간 매개변수 조정 및 게임 내 토글은 라이브 리로드 레이어 업데이트와 함께 제공됩니다.</string>
+    <string name="reshade_catalog_title">ReShade 효과</string>
+    <string name="reshade_catalog_search">효과 검색…</string>
+    <string name="reshade_catalog_installed">설치됨 (%1$d)</string>
+    <string name="reshade_catalog_available">사용 가능 (%1$d)</string>
+    <string name="reshade_catalog_downloading">다운로드 중</string>
+    <string name="reshade_catalog_installing">설치 중</string>
+    <string name="reshade_catalog_offline_cache">오프라인 — 캐시된 목록을 표시합니다. 새 효과를 다운로드하려면 연결하세요.</string>
+    <string name="reshade_catalog_offline_none">오프라인 — 설치된 효과만 표시합니다. 카탈로그를 찾아보려면 연결하세요.</string>
+    <string name="reshade_catalog_needs_connection">효과를 다운로드하려면 인터넷에 연결하세요.</string>
+    <string name="reshade_catalog_download_failed">%1$s 다운로드에 실패했습니다.</string>
+    <string name="reshade_catalog_empty_query">\"%1$s\"와(과) 일치하는 효과가 없습니다.</string>
+    <string name="reshade_catalog_empty">사용 가능한 효과가 없습니다. 카탈로그를 찾아보려면 인터넷에 연결하세요.</string>
+    <string name="reshade_catalog_done">완료</string>
+    <string name="reshade_catalog_delete_cd">%1$s 삭제</string>
+    <string name="reshade_catalog_delete_title">%1$s을(를) 삭제하시겠습니까?</string>
+    <string name="reshade_catalog_delete_body">저장소와 이 효과를 사용하는 모든 로드아웃에서 효과가 제거됩니다. 나중에 다시 다운로드할 수 있습니다.</string>
+    <string name="reshade_catalog_delete_confirm">삭제</string>
+    <string name="reshade_catalog_delete_cancel">취소</string>
+    <string name="reshade_catalog_delete_failed">%1$s을(를) 삭제할 수 없습니다.</string>
+    <string name="reshade_params_title">효과 매개변수</string>
+    <string name="reshade_params_reset">초기화</string>
+    <string name="reshade_loadout_empty">아직 효과가 없습니다. 로드아웃을 만들려면 하나 이상의 효과를 추가하세요.</string>
+    <string name="reshade_loadout_add">효과 추가</string>
+    <string name="reshade_loadout_full">로드아웃이 가득 찼습니다 — 다른 효과를 추가하려면 효과 하나를 제거하세요.</string>
+    <string name="reshade_effect_active">활성</string>
+    <string name="reshade_mode_solo">솔로</string>
+    <string name="reshade_mode_stack">스택</string>
+    <string name="reshade_mode_solo_hint">한 번에 하나의 효과만 활성화(A/B 비교, 게임 중 실시간 전환).</string>
+    <string name="reshade_mode_stack_hint">효과의 하위 집합을 겹쳐서 순서대로 적용합니다.</string>
+    <string name="reshade_drawer_enable">ReShade 사용</string>
+    <string name="reshade_drawer_empty">이 로드아웃에 ReShade 효과가 없습니다. 여기에서 전환하고 조정하려면 이 게임의 설정(또는 컨테이너 설정)에서 효과를 추가하세요.</string>
+    <string name="reshade_drawer_no_params">이 효과에는 조정 가능한 매개변수가 없습니다.</string>
+    <string name="cloud_saves_deleting">저장 데이터 삭제 중…</string>
+    <string name="cloud_saves_history_delete">삭제</string>
+    <string name="cloud_saves_history_delete_confirm_body">%1$s의 클라우드 저장 데이터를 영구적으로 삭제할까요? 되돌릴 수 없습니다.</string>
+    <string name="cloud_saves_history_delete_confirm_title">클라우드 저장 삭제</string>
+    <string name="cloud_saves_history_delete_failed">클라우드 저장을 삭제할 수 없습니다</string>
+    <string name="cloud_saves_history_delete_success">클라우드 저장이 삭제되었습니다</string>
+    <string name="retro_bundle_required">먼저 콘솔 코어를 다운로드하세요 — 설정 › 레트로</string>
+    <string name="retro_ps2_device_unsupported">이 기기에서는 PS2 에뮬레이션을 실행할 수 없습니다. OpenGL ES 3.1 이상이 필요합니다.</string>
+    <string name="retro_scr_consoles_check">업데이트 확인</string>
+    <string name="retro_scr_consoles_checking">업데이트 확인 중…</string>
+    <string name="retro_scr_consoles_download">콘솔 코어 다운로드</string>
+    <string name="retro_scr_consoles_downloading">다운로드 중… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">콘솔 코어</string>
+    <string name="retro_scr_consoles_installed">설치됨 — 빌드 %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">설치됨 — 빌드 %1$s (업데이트 확인 실패)</string>
+    <string name="retro_scr_consoles_installing">설치 중…</string>
+    <string name="retro_scr_consoles_missing">설치되지 않음 — 다운로드하면 레트로 게임을 즐길 수 있습니다</string>
+    <string name="retro_scr_consoles_state">상태</string>
+    <string name="retro_scr_consoles_update">콘솔 코어 업데이트</string>
+    <string name="retro_scr_consoles_update_available">업데이트 있음 — 빌드 %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">다운로드 확인 중…</string>
+    <string name="retro_scr_consoles_working">처리 중…</string>
+    <string name="retro_tab_system">시스템</string>
 </resources>
+
diff --git a/app/src/main/res/values-no/arrays.xml b/app/src/main/res/values-no/arrays.xml
new file mode 100644
index 000000000..75b8f9ab3
--- /dev/null
+++ b/app/src/main/res/values-no/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Bilde</item>
+        <item>Original</item>
+        <item>Ensfarget</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-no/plurals.xml b/app/src/main/res/values-no/plurals.xml
new file mode 100644
index 000000000..887ac6056
--- /dev/null
+++ b/app/src/main/res/values-no/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP-ressurs</item>
+        <item quantity="other">%d ZIP-ressurser</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
new file mode 100644
index 000000000..75bdff9b2
--- /dev/null
+++ b/app/src/main/res/values-no/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Kjør</string>
+    <string name="common_ui_edit">Rediger</string>
+    <string name="common_ui_remove">Fjern</string>
+    <string name="common_ui_add">Legg til</string>
+    <string name="common_ui_shortcuts">Snarveier</string>
+    <string name="common_ui_containers">Containere</string>
+    <string name="common_ui_input_controls">Inndatakontroller</string>
+    <string name="common_ui_no_items_to_display">Ingen elementer å vise</string>
+    <string name="common_ui_select_icon">Velg ikon</string>
+    <string name="common_ui_revert_icon">Tilbakestill ikon</string>
+    <string name="common_ui_select_exe">Velg EXE</string>
+    <string name="common_ui_select_folder">Velg mappe</string>
+    <string name="common_ui_current_folder">Gjeldende mappe</string>
+    <string name="common_ui_enter_path">Angi sti</string>
+    <string name="common_ui_path_not_found">Fant ikke stien</string>
+    <string name="common_ui_select_valid_exe_file">Velg en gyldig .exe-fil</string>
+    <string name="common_ui_select_valid_icon_file">Velg en gyldig .ico- eller .png-fil.</string>
+    <string name="common_ui_exit">Avslutt</string>
+    <string name="common_ui_exit_app">Avslutt app</string>
+    <string name="common_ui_profile">Profil</string>
+    <string name="common_ui_name">Navn</string>
+    <string name="common_ui_ok">OK</string>
+    <string name="common_ui_cancel">Avbryt</string>
+    <string name="common_ui_untitled">Uten tittel</string>
+    <string name="common_ui_disabled">Deaktivert</string>
+    <string name="common_ui_container">Container</string>
+    <string name="common_ui_value">Verdi</string>
+    <string name="common_ui_none">Ingen</string>
+    <string name="common_ui_custom_text">Egendefinert tekst</string>
+    <string name="common_ui_icon">Ikon</string>
+    <string name="common_ui_duplicate">Dupliser</string>
+    <string name="common_ui_credits_and_third_party_apps">Bidragsytere og tredjepartsapper</string>
+    <string name="common_ui_loading">Laster</string>
+    <string name="common_ui_exporting">Eksporterer</string>
+    <string name="common_ui_enable">Aktiver</string>
+    <string name="common_ui_disable">Deaktiver</string>
+    <string name="common_ui_force">Tving</string>
+    <string name="common_ui_version">Versjon</string>
+    <string name="common_ui_advanced">Avansert</string>
+    <string name="common_ui_graphics">Grafikk</string>
+    <string name="common_ui_system">System</string>
+    <string name="common_ui_width">Bredde</string>
+    <string name="common_ui_height">Høyde</string>
+    <string name="common_ui_open_file">Åpne fil</string>
+    <string name="common_ui_download_file">Last ned fil</string>
+    <string name="common_ui_downloading_file">Laster ned fil</string>
+    <string name="common_ui_browse">Bla gjennom</string>
+    <string name="common_ui_options">Alternativer</string>
+    <string name="common_ui_export">Eksporter</string>
+    <string name="common_ui_new_file">Ny fil</string>
+    <string name="common_ui_description">Beskrivelse</string>
+    <string name="common_ui_continue">Fortsett</string>
+    <string name="common_ui_warning">Advarsel</string>
+    <string name="common_ui_copy">kopi</string>
+    <string name="common_ui_reset">Tilbakestill</string>
+    <string name="common_ui_close">Lukk</string>
+    <string name="common_ui_confirm">Bekreft</string>
+    <string name="common_ui_unnamed">Uten navn</string>
+    <string name="common_ui_download">Last ned</string>
+    <string name="common_ui_uninstall">Avinstaller</string>
+    <string name="common_ui_other">Annet</string>
+    <string name="common_ui_status">Status</string>
+    <string name="common_ui_size">Størrelse</string>
+    <string name="common_ui_release_date">Utgivelsesdato</string>
+    <string name="common_ui_installed">Installert</string>
+    <string name="common_ui_available">Tilgjengelig</string>
+    <string name="common_ui_settings">Innstillinger</string>
+    <string name="common_ui_enable_all">Aktiver alle</string>
+    <string name="common_ui_disable_all">Deaktiver alle</string>
+    <string name="common_ui_select_all">Velg alle</string>
+    <string name="common_ui_deselect_all">Fjern alle valg</string>
+    <string name="common_ui_on">På</string>
+    <string name="common_ui_off">Av</string>
+    <string name="common_ui_already_set">Allerede angitt</string>
+    <string name="common_ui_shortcut">Snarvei</string>
+    <string name="common_ui_custom">Egendefinert</string>
+    <string name="common_ui_about">Om</string>
+    <string name="common_ui_back">Tilbake</string>
+    <string name="common_ui_apply">Bruk</string>
+    <string name="common_ui_save">Lagre</string>
+    <string name="common_ui_clone">Klon</string>
+    <string name="common_ui_properties">Egenskaper</string>
+    <string name="common_ui_store">Butikk</string>
+    <string name="common_ui_library">Bibliotek</string>
+    <string name="common_ui_downloads">Nedlastinger</string>
+    <string name="common_ui_import">Importer</string>
+    <string name="common_ui_sync">Synkroniser</string>
+    <string name="common_ui_sign_in">Logg inn</string>
+    <string name="common_ui_submit">Send inn</string>
+    <string name="common_ui_coming_soon">Kommer snart</string>
+    <string name="common_ui_signed_in">Innlogget</string>
+    <string name="common_ui_required">Påkrevd</string>
+    <string name="common_ui_optional">Valgfritt</string>
+    <string name="common_ui_notifications">Varsler</string>
+    <string name="common_ui_mode">Modus</string>
+    <string name="common_ui_experimental">(Eksperimentell)</string>
+    <string name="common_ui_current_version_label">Gjeldende versjon:</string>
+    <string name="common_ui_cannot_write_folder">Kan ikke skrive til den valgte mappen</string>
+    <string name="common_ui_failed_create_directory">Kunne ikke opprette standardmappe</string>
+    <string name="common_ui_device_not_supported">Beklager, enheten din støttes kanskje ikke</string>
+    <string name="common_ui_please_wait">Vent litt\u2026</string>
+    <string name="common_ui_done">Ferdig</string>
+    <string name="common_ui_open">Åpne</string>
+    <string name="common_ui_connected">Tilkoblet</string>
+    <string name="common_ui_install">Installer</string>
+    <string name="common_ui_application">Applikasjon</string>
+    <string name="common_ui_check">Sjekk</string>
+    <string name="store_game_check_for_update">Se etter oppdatering</string>
+    <string name="store_game_checking_for_update">Sjekker</string>
+    <string name="store_game_download_update">Last ned oppdatering</string>
+    <string name="store_game_no_update_available">Ingen oppdatering tilgjengelig</string>
+    <string name="store_game_update_available">Oppdatering tilgjengelig</string>
+    <string name="store_game_update_check_failed">Oppdateringssjekk mislyktes</string>
+    <string name="store_game_update">Oppdater</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Bekreft filer</string>
+    <string name="store_game_verify_started">Bekrefter %1$s — sjekk Nedlastinger-fanen</string>
+    <string name="store_game_steam_options">Steam-alternativer</string>
+    <string name="store_game_verify_complete">Bekreftelse av filer fullført</string>
+    <string name="store_game_verify_failed_notice">Bekreftelse av filer mislyktes</string>
+    <string name="store_game_progress_background_hint">Du kan lukke dette — det fortsetter å kjøre. Sjekk Nedlastinger-fanen når som helst.</string>
+    <string name="store_game_checking_updates">Ser etter oppdateringer</string>
+    <string name="store_game_no_updates_notice">Ingen oppdateringer tilgjengelig</string>
+    <string name="store_game_update_complete">Oppdatering fullført</string>
+    <string name="store_game_update_failed_notice">Oppdatering mislyktes</string>
+    <string name="store_game_update_check_failed_notice">Oppdateringssjekk mislyktes</string>
+    <string name="store_game_download_already_active">Dette spillet lastes allerede ned. Avbryt gjeldende nedlasting før du legger til DLC.</string>
+    <string name="common_ui_select">Velg</string>
+    <string name="common_ui_storage_roots">Lagringsrøtter</string>
+    <string name="common_ui_browse_local_folders_directly">Bla gjennom lokale mapper direkte</string>
+    <string name="common_ui_no_folders_available_here">Ingen mapper tilgjengelig her</string>
+    <string name="common_ui_grant_all_files_access_browse">Gi tilgang til alle filer for å bla gjennom mapper direkte.</string>
+    <string name="common_ui_not_configured">Ikke konfigurert</string>
+    <string name="common_ui_reinstall">Installer på nytt</string>
+    <string name="common_ui_exit_app_confirm">Avslutte WinNative?</string>
+    <string name="common_ui_elements_count">%1$d elementer</string>
+    <string name="common_ui_disabled_placeholder">-- Deaktivert --</string>
+    <string name="common_ui_enabled">Aktivert</string>
+    <string name="common_ui_unknown_error">Ukjent feil</string>
+    <string name="common_ui_auto_detected">Automatisk oppdaget</string>
+    <string name="common_ui_change">Endre</string>
+    <string name="common_ui_proceed">Fortsett</string>
+    <string name="common_ui_sign_out">Logg ut</string>
+    <string name="common_ui_name_cannot_be_empty">Navn kan ikke være tomt</string>
+    <string name="common_ui_error_with_message">Feil: %1$s</string>
+    <string name="common_ui_64_bit">64-BIT</string>
+    <string name="common_ui_32_bit">32-BIT</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BIT &amp; 32-BIT</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d mappe</item>
+        <item quantity="other">%d mapper</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d fil</item>
+        <item quantity="other">%d filer</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Hent grafikk</string>
+    <string name="library_games_scraping_artwork">Henter</string>
+    <string name="library_games_shortcut_created">Snarvei opprettet</string>
+    <string name="library_games_failed_to_create_shortcut">Kunne ikke opprette snarvei: %s</string>
+    <string name="library_games_install_path">Installasjonssti</string>
+    <string name="library_games_not_enough_space">Trenger %1$s mer plass</string>
+    <string name="library_games_download_slash_install">Last ned / Installer</string>
+    <string name="library_games_save_management">LAGRINGSBEHANDLING</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Tilgjengelig: %3$s</string>
+    <string name="library_games_last_played">Sist spilt</string>
+    <string name="library_games_playtime">Spilletid</string>
+    <string name="library_games_plays">Spillinger</string>
+    <string name="library_games_dlcs">DLC-er</string>
+    <string name="library_games_uninstall_game">AVINSTALLER SPILL</string>
+    <string name="library_games_remove_game">FJERN SPILL</string>
+    <string name="library_games_uninstall_confirm">Avinstallere %1$s og slette den installerte spillmappen permanent?</string>
+    <string name="library_games_remove_confirm">Fjerne %1$s fra biblioteket ditt. Spillfilene på disken forblir uberørt?</string>
+    <string name="library_games_game_uninstalled">%1$s avinstallert.</string>
+    <string name="library_games_game_removed">%1$s fjernet.</string>
+    <string name="library_games_failed_to_uninstall">Avinstallering mislyktes.</string>
+    <string name="library_games_failed_to_uninstall_reason">Avinstallering mislyktes: %1$s</string>
+    <string name="library_games_loading">Laster bibliotek\u2026</string>
+    <string name="library_games_no_games_installed">Ingen spill installert. Bruk en Butikk-fane eller +-knappen for å legge til spill.</string>
+    <string name="library_games_times_played_label">Antall ganger spilt: </string>
+    <string name="library_games_playtime_label">Spilletid: </string>
+    <string name="library_games_no_games_hub">Ingen spill installert\nKlikk for å åpne Winlator-backend</string>
+    <string name="library_games_installed_badge">INSTALLERT</string>
+    <string name="library_games_unknown_game">Ukjent spill</string>
+    <string name="library_games_layouts_header">BIBLIOTEKOPPSETT</string>
+    <string name="library_games_layout_carousel">Karusell</string>
+    <string name="library_games_layout_list">Liste</string>
+    <string name="library_games_view_options_header">VISNINGSALTERNATIVER</string>
+    <string name="library_games_immersive_mode">Oppslukende modus</string>
+    <string name="library_games_immersive_mode_description">Bruk fokusert spillkunst som bakgrunn</string>
+    <string name="library_games_immersive_blur">Uskarp bakgrunn</string>
+    <string name="library_games_immersive_blur_description">Bruk en uskarphetseffekt på den oppslukende bakgrunnen</string>
+    <string name="library_games_custom_game">Egendefinert spill</string>
+    <string name="library_games_play">Spill</string>
+    <string name="hero_boot_to_desktop_title">Start til skrivebord</string>
+    <string name="hero_graphics_tests_title">Grafikktester</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Inndatatester</string>
+    <string name="library_games_add_custom_game">Legg til egendefinert spill</string>
+    <string name="library_games_game_name">Spillnavn</string>
+    <string name="library_games_game_folder_mapped_drive">Spillmappe (tilordnet spillstasjon)</string>
+    <string name="library_games_select_exe_provide_name">Velg en exe og oppgi et navn</string>
+    <string name="library_games_sign_in_prompt">Logg inn på en butikk eller legg til et egendefinert spill for å bygge biblioteket ditt.</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Butikker</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Delt nedlastingsmappe</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Bruk én enkelt mappe på tvers av alle butikker</string>
+    <string name="stores_accounts_default_downloads_folder">Standard nedlastingsmappe</string>
+    <string name="stores_accounts_steam_downloads">Steam-nedlastinger</string>
+    <string name="stores_accounts_epic_downloads">Epic-nedlastinger</string>
+    <string name="stores_accounts_gog_downloads">GOG-nedlastinger</string>
+    <string name="stores_accounts_download_speed">Nedlastingshastighet</string>
+    <string name="stores_accounts_download_speed_subtitle">Styrer samtidigheten for Steam-nedlastingstråder</string>
+    <string name="stores_accounts_download_server">Nedlastingsserver</string>
+    <string name="stores_accounts_connected_stores">Tilkoblede butikker</string>
+    <string name="stores_accounts_download_settings">Nedlastingsinnstillinger</string>
+    <string name="stores_accounts_download_speed_conservative">Konservativ</string>
+    <string name="stores_accounts_download_speed_balanced">Balansert</string>
+    <string name="stores_accounts_download_speed_standard">Standard</string>
+    <string name="stores_accounts_download_speed_performance">Ytelse</string>
+    <string name="stores_accounts_download_server_auto_detected">Automatisk oppdaget: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Steam CDN-region for spillnedlastinger</string>
+    <string name="stores_accounts_sign_out_confirm">Logge ut av %1$s?</string>
+    <string name="stores_accounts_sign_out_message">Du må logge inn igjen for å få tilgang til biblioteket ditt.</string>
+    <string name="stores_accounts_logged_in_epic">Logget inn på Epic Games!</string>
+    <string name="stores_accounts_epic_login_failed">Epic-innlogging mislyktes: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">Logget inn på GOG!</string>
+    <string name="stores_accounts_gog_login_failed">GOG-innlogging mislyktes: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Egendefinert nedlastingssti</string>
+    <string name="stores_accounts_custom_download_path_description">En standard nedlastingssti er allerede konfigurert i Innstillinger &gt; Butikker. Hvis du vil angi en unik egendefinert sti for denne spesifikke installasjonen, klikk Fortsett.</string>
+    <string name="stores_accounts_not_signed_in">Ikke innlogget</string>
+    <string name="stores_accounts_status_online">Pålogget</string>
+    <string name="stores_accounts_status_away">Borte</string>
+    <string name="stores_accounts_status_offline">Frakoblet</string>
+    <string name="stores_accounts_status_invisible">Usynlig</string>
+    <string name="stores_accounts_status_header">STATUS</string>
+    <string name="stores_accounts_stores_header">BUTIKKER</string>
+    <string name="stores_accounts_sign_in_store_prompt">Logg inn for å få tilgang til %1$s-butikken.</string>
+    <string name="stores_accounts_manage">Administrer butikkontoer</string>
+    <string name="stores_accounts_sign_into_store">Logg inn på %1$s</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Avbryt alle</string>
+    <string name="downloads_queue_preparing_download">Forbereder nedlasting</string>
+    <string name="downloads_queue_installing_package">Installerer pakke</string>
+    <string name="downloads_queue_resume_all">Gjenoppta alle</string>
+    <string name="downloads_queue_pause_all">Sett alle på pause</string>
+    <string name="downloads_queue_clear">Tøm</string>
+    <string name="downloads_queue_status_label">Status:</string>
+    <string name="downloads_queue_phase_downloading">Laster ned</string>
+    <string name="downloads_queue_phase_downloading_file">Laster ned [%1$s]</string>
+    <string name="downloads_queue_phase_queued">I kø</string>
+    <string name="downloads_queue_phase_paused">På pause</string>
+    <string name="downloads_queue_phase_preparing">Forbereder</string>
+    <string name="downloads_queue_phase_verifying">Bekrefter</string>
+    <string name="downloads_queue_phase_verifying_file">Verifiserer [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Lapper</string>
+    <string name="downloads_queue_phase_applying_data">Tar i bruk data</string>
+    <string name="downloads_queue_phase_finalizing">Fullfører</string>
+    <string name="downloads_queue_phase_unpacking">Pakker ut</string>
+    <string name="downloads_queue_phase_updating">Oppdaterer</string>
+    <string name="downloads_queue_phase_complete">Fullført</string>
+    <string name="downloads_queue_phase_cancelled">Avbrutt</string>
+    <string name="downloads_queue_phase_failed">Mislyktes: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Ukjent</string>
+    <string name="downloads_queue_paused_resume_hint">Satt på pause – trykk Fortsett for å fortsette</string>
+    <string name="downloads_queue_cancel_download">Avbryt nedlasting</string>
+    <string name="downloads_queue_cancel_download_title">Avbryte nedlasting?</string>
+    <string name="downloads_queue_cancel_download_confirm">Avbryte nedlastingen av %1$s og slette alle nedlastede filer?</string>
+    <string name="downloads_queue_cancel_download_warning">Å avbryte en nedlasting av DLC, spill eller oppdatering kan potensielt ødelegge spillinstallasjonen din.\n\nEr du sikker på at du vil avbryte denne nedlastingen og slette filene som er lastet ned så langt?</string>
+    <string name="downloads_queue_cancel_all_title">Avbryte alle nedlastinger?</string>
+    <string name="downloads_queue_cancel_all_warning">Å avbryte nedlastinger av DLC, spill eller oppdateringer kan potensielt ødelegge spillinstallasjonene dine.\n\nEr du sikker på at du vil avbryte alle nedlastinger og slette filene som er lastet ned så langt?</string>
+    <string name="downloads_queue_this_game">dette spillet</string>
+    <string name="downloads_queue_empty">Ingen aktive nedlastinger.</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">Ny beholder</string>
+    <string name="containers_list_edit">Rediger beholder</string>
+    <string name="containers_list_creating">Oppretter beholder</string>
+    <string name="containers_list_removing">Fjerner beholder</string>
+    <string name="containers_list_duplicating">Dupliserer beholder</string>
+    <string name="containers_list_remove_title">Fjern beholder</string>
+    <string name="containers_list_duplicate_title">Dupliser beholder</string>
+    <string name="containers_list_confirm_remove">Fjerne denne beholderen? Eventuelle spilllagringer som er lagret i den, vil bli slettet permanent. Skylagrede lagringer forblir i skyen, men lokale endringer som ennå ikke er synkronisert, vil gå tapt – synkroniser dette spillets skylagringer først hvis du vil beholde dem.</string>
+    <string name="containers_list_confirm_duplicate">Vil du duplisere denne beholderen?</string>
+    <string name="containers_list_duplicate_failed">Kunne ikke duplisere beholderen</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">Vil du fjerne denne snarveien?</string>
+    <string name="shortcuts_list_add_to_home_screen">Legg til på startskjermen</string>
+    <string name="shortcuts_library_artwork_title">Bibliotekgrafikk</string>
+    <string name="shortcuts_library_artwork_icon_title">Ikonbilde</string>
+    <string name="shortcuts_library_artwork_hero_title">Bakgrunn</string>
+    <string name="shortcuts_library_artwork_set">Angi bilde</string>
+    <string name="shortcuts_library_artwork_failed">Kunne ikke laste inn det valgte bildet.</string>
+    <string name="shortcuts_library_artwork_open_source">Åpne SteamGridDB</string>
+    <string name="shortcuts_list_not_available">Denne snarveien er ikke lenger tilgjengelig. Slett eller opprett den på nytt.</string>
+    <string name="shortcuts_list_select_a_container">Velg en beholder</string>
+    <string name="shortcuts_list_error_opening_settings">Feil ved åpning av snarveisinnstillinger</string>
+    <string name="shortcuts_list_removed">Snarveien ble fjernet.</string>
+    <string name="shortcuts_list_remove_failed">Kunne ikke fjerne snarveien. Prøv igjen.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Fjern snarvei\n%1$s</string>
+    <string name="shortcuts_list_cloned">Snarveien ble klonet.</string>
+    <string name="shortcuts_list_clone_failed">Kunne ikke klone snarveien.</string>
+    <string name="shortcuts_list_exported_to">Snarvei eksportert til %1$s</string>
+    <string name="shortcuts_list_failed_export">Kunne ikke eksportere snarveien</string>
+    <string name="shortcuts_export_all">Eksporter alle</string>
+    <string name="shortcuts_export_to_frontend">Eksporter til frontend</string>
+    <string name="shortcuts_export_all_done">Eksporterte %1$d spill til %2$s</string>
+    <string name="shortcuts_export_all_none">Ingen spill å eksportere</string>
+    <string name="shortcuts_list_added">Snarveien ble lagt til.</string>
+    <string name="shortcuts_list_readded_existing">La til eksisterende snarvei på nytt</string>
+    <string name="shortcuts_list_failed_add">Kunne ikke legge til snarveien.</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Kjøreargumenter</string>
+    <string name="shortcuts_properties_target_path">Målbane</string>
+    <string name="shortcuts_properties_disable_xinput">Deaktiver Xinput (for eksklusiv mus/tastatur-styring)</string>
+    <string name="num_controllers">Antall kontrollere</string>
+    <string name="shortcuts_properties_exclusive_input">Eksklusiv inndata</string>
+    <string name="shortcuts_properties_custom_game_settings">Tilpassede spillinnstillinger</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Bruk eldre starter</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Eldre Steam-emulering: kjører spillet gjennom ColdClient-starteren og fjerner SteamStub-DRM fra exe-filen. Bruk bare for eldre spill som ikke fungerer med Steam-starteren.</string>
+    <string name="shortcuts_properties_runtime_patcher">DRM-lapper ved kjøring</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injiserer en DRM-lapper-DLL ved oppstart. Reduserer FPS – bruk bare hvis den eldre starteren alene mislykkes.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">WinNative ekte Steam-klient</string>
+    <string name="steam_section_emulator">Eldre Steam-emulator</string>
+    <string name="shortcuts_properties_use_steam_input">Bruk Steam Input</string>
+    <string name="shortcuts_properties_steam_offline_mode">Steam frakoblet modus</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Får den emulerte Steam-klienten til å rapportere som frakoblet, slik at spillet ikke forsøker nettforbindelser. Bruk for spill som henger på Steams nettverkssjekk.</string>
+    <string name="shortcuts_properties_reset">Tilbakestill egenskaper</string>
+    <string name="shortcuts_properties_updated_at">Snarvei oppdatert %1$s</string>
+    <string name="shortcuts_properties_properties_reset">Egenskapene ble tilbakestilt.</string>
+    <string name="shortcuts_properties_reset_per_game">Tilbakestill innstillinger per spill</string>
+    <string name="shortcuts_properties_reset_per_game_message">Tilbakestille dette spillet til å bruke den valgte beholderens standardverdier?</string>
+    <string name="shortcuts_properties_per_game_reset">Innstillinger per spill tilbakestilt til den valgte beholderens standardverdier</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">Ingen kontrollelement valgt</string>
+    <string name="input_controls_editor_scale">Skala</string>
+    <string name="input_controls_editor_shape">Form</string>
+    <string name="input_controls_editor_type">Type</string>
+    <string name="input_controls_editor_binding">Tilordning</string>
+    <string name="binding_primary">Primær tilordning</string>
+    <string name="binding_secondary">Sekundær tilordning</string>
+    <string name="binding_third">Tertiær tilordning</string>
+    <string name="binding_fourth">Kvartær tilordning</string>
+    <string name="input_controls_editor_binding_up">Tilordning opp</string>
+    <string name="input_controls_editor_binding_right">Tilordning høyre</string>
+    <string name="input_controls_editor_binding_down">Tilordning ned</string>
+    <string name="input_controls_editor_binding_left">Tilordning venstre</string>
+    <string name="input_controls_editor_overlay_opacity">Overleggsgjennomsiktighet</string>
+    <string name="input_controls_editor_opacity">Gjennomsiktighet</string>
+    <string name="input_controls_editor_radial_menu">Radialmeny</string>
+    <string name="input_controls_editor_radial_menu_options">Alternativer for radialmeny</string>
+    <string name="input_controls_editor_number_of_bindings">Antall tilordninger</string>
+    <string name="input_controls_editor_select_profile">Velg profil</string>
+    <string name="input_controls_select_style">Velg stil</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Skifer</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Glimt</string>
+    <string name="input_controls_style_shadow">Skygge</string>
+    <string name="input_controls_style_reticle">Retikkel</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Fargetema</string>
+    <string name="input_controls_edit_duplicating_builtin">Innebygd profil – opprettet en kopi du kan redigere.</string>
+    <string name="input_controls_editor_profile_name">Profilnavn</string>
+    <string name="input_controls_editor_no_profile_selected">Ingen profil valgt</string>
+    <string name="input_controls_editor_no_profile_found">Ingen profil funnet</string>
+    <string name="input_controls_editor_tap_to_switch">Trykk for å bytte</string>
+    <string name="input_controls_editor_confirm_remove_profile">Vil du fjerne denne profilen?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">Vil du duplisere denne profilen?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Tilbakestille denne profilen til det opprinnelige oppsettet? Alle endringer du har gjort, vil gå tapt.</string>
+    <string name="input_controls_editor_profile_reset">Profilen ble tilbakestilt til det opprinnelige oppsettet.</string>
+    <string name="input_controls_editor_reset_unavailable">Ingen opprinnelig øyeblikksbilde er tilgjengelig for denne profilen.</string>
+    <string name="input_controls_editor_title">Kontrollredigering</string>
+    <string name="input_controls_editor_toggle_switch">Vippebryter</string>
+    <string name="input_controls_editor_swipeable">Sveipbar</string>
+    <string name="input_controls_editor_profile_exported_to">Profil eksportert til</string>
+    <string name="input_controls_editor_unable_to_import">Kan ikke importere profil</string>
+    <string name="input_controls_editor_import_profile">Importer profil</string>
+    <string name="input_controls_editor_download_profile">Last ned profil</string>
+    <string name="input_controls_editor_export_profile">Eksporter profil</string>
+    <string name="input_controls_editor_range">Rekkevidde</string>
+    <string name="input_controls_editor_confirm_download_profiles">Vil du laste ned de valgte profilene?</string>
+    <string name="input_controls_editor_unable_to_load_list">Kan ikke laste inn profilliste</string>
+    <string name="input_controls_editor_osc_transparency">Gjennomsiktighet for skjermkontroller</string>
+    <string name="input_controls_editor_osc_transparency_description">Juster gjennomsiktigheten til skjermkontrollene.</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Skjermstørrelse</string>
+    <string name="container_config_new_env_var">Ny miljøvariabel</string>
+    <string name="container_config_env_vars">Miljøvariabler</string>
+    <string name="container_config_processor_affinity">Prosessortilknytning</string>
+    <string name="container_config_processor_affinity_32bit">Prosessortilknytning (32-biters apper)</string>
+    <string name="container_config_audio_driver">Lyddriver</string>
+    <string name="container_config_win_components">Win-komponenter</string>
+    <string name="container_config_drives">Stasjoner</string>
+    <string name="container_config_arch">Arkitektur</string>
+    <string name="container_config_storage_info">Lagringsinfo</string>
+    <string name="container_config_drive_c">Stasjon C:</string>
+    <string name="container_config_cache">Buffer</string>
+    <string name="container_config_total">Totalt</string>
+    <string name="container_config_clear_cache">Tøm buffer</string>
+    <string name="container_config_estimated_used_space">Estimert brukt plass</string>
+    <string name="settings_containers_error_saving_wallpaper">Feil ved lagring av bakgrunnsbilde</string>
+    <string name="container_config_directinput_mapper_type">DirectInput-mappertype</string>
+    <string name="container_config_title">Konfigurasjon</string>
+    <string name="container_config_startup_selection">Oppstartsvalg</string>
+    <string name="container_config_glibc_exp_edition">Basert på</string>
+    <string name="container_config_refresh_rate_default_global">Standard (global)</string>
+    <string name="container_config_enable_dinput">Aktiver DInput for spill i Wine</string>
+    <string name="container_config_enable_xinput">Aktiver XInput for spill i Wine</string>
+    <string name="container_config_dinput_legacy">Eldre (gamle spillkontrollere)</string>
+    <string name="container_config_dinput_modern">Moderne (XInput-lignende)</string>
+    <string name="container_config_help_xinput">
+        Hvis spillet ditt bruker &lt;i&gt;&lt;b&gt;XInput-API-et&lt;/b&gt;&lt;/i&gt; for støtte for spillkontrollere, aktiver dette alternativet.&lt;br/&gt;&lt;br/&gt;
+        Dette alternativet påvirker både &lt;i&gt;&lt;b&gt;virtuelle&lt;/b&gt;&lt;/i&gt; (levert av Input-kontroller) og &lt;i&gt;&lt;b&gt;fysiske&lt;/b&gt;&lt;/i&gt; spillkontrollere.
+    </string>
+    <string name="container_config_help_dinput">
+        Hvis spillet ditt bruker &lt;i&gt;&lt;b&gt;DInput-API-et&lt;/b&gt;&lt;/i&gt; for støtte for spillkontrollere, aktiver dette alternativet.&lt;br/&gt;&lt;br/&gt;
+        Dette alternativet påvirker både &lt;i&gt;&lt;b&gt;virtuelle&lt;/b&gt;&lt;/i&gt; (levert av Input-kontroller) og &lt;i&gt;&lt;b&gt;fysiske&lt;/b&gt;&lt;/i&gt; spillkontrollere.
+    </string>
+    <string name="container_config_xinput_dinput_warning">Noen spill kan støtte begge API-ene. Å aktivere både XInput og DInput samtidig i slike spill kan forårsake kontrollproblemer, slik som i titler som The Binding of Isaac og Resident Evil-serien.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32-biters emulator</string>
+    <string name="container_config_emulator_wine_hint">Emulatoren bestemmes av wine-versjonen. ARM64EC bruker FEXCore, x86_64 bruker Box64.</string>
+    <string name="container_config_label">Konfigurasjon</string>
+    <string name="container_config_restart_required">Start beholderen på nytt for at endringene skal tre i kraft</string>
+    <string name="container_config_renderer">Gjengiver</string>
+    <string name="container_config_variables">Variabler</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">Inndata</string>
+    <string name="container_config_tab">Konfig</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">64-biters emulator</string>
+    <string name="container_config_emulator_section">Emulator</string>
+    <string name="container_config_sdl2_compatibility">Aktiver SDL2-kompatibilitet</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Wine-konfigurasjon</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">GPU-navn</string>
+    <string name="container_wine_offscreen_rendering_mode">Gjengivelsesmodus utenfor skjerm</string>
+    <string name="container_wine_strict_shader_math">Streng shader-matematikk</string>
+    <string name="container_wine_video_memory_size">Videominnestørrelse</string>
+    <string name="container_wine_dxwrapper">DX-innpakning</string>
+    <string name="container_wine_mouse_warp_override">Overstyring av museforflytning</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">DXVK-versjon</string>
+    <string name="container_wine_dxvk_config_title">DXVK-konfigurasjon</string>
+    <string name="container_wine_wined3d_config_title">WineD3D-konfigurasjon</string>
+    <string name="container_wine_vkd3d_version">VKD3D-versjon</string>
+    <string name="container_wine_version">Wine-versjon</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; er et oversettelseslag for DirectX 1-11 til OpenGL.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; er et oversettelseslag for Direct3D 9-11 til Vulkan.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; er et oversettelseslag for Direct3D 12-API-et til Vulkan.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; er en implementasjon av DirectDraw for bedre kompatibilitet med klassiske spill.
+    </string>
+    <string name="container_wine_enabled_async">Aktiver Async</string>
+    <string name="container_wine_enabled_async_cache">Aktiver Async-buffer</string>
+    <string name="container_wine_vkd3d_feature_level">VKD3D-funksjonsnivå</string>
+    <string name="container_wine_ddraw_wrapper">DDraw-innpakning</string>
+    <string name="container_wine_error_not_installed">Wine/Proton-pakken \'%1$s\' er ikke installert og kunne ikke lastes ned.</string>
+    <string name="container_no_wine_installed">Ingen Wine eller Proton installert. Installer én først.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Overflateeffekt</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Box64-forhåndsinnstilling</string>
+    <string name="container_box64_version">Box64-versjon</string>
+    <string name="container_box64_stability">Stabilitet</string>
+    <string name="container_box64_compatibility">Kompatibilitet</string>
+    <string name="container_box64_intermediate">Middels</string>
+    <string name="container_box64_performance">Ytelse</string>
+    <string name="container_fexcore_performance_tso">Ytelse TSO</string>
+    <string name="container_fexcore_extreme">Ekstrem</string>
+    <string name="container_fexcore_extreme_tso">Ekstrem TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Aktiverer eller deaktiverer Box64 dynamisk rekompilator.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        Håndtering av flagg på CALL/RET-opkoder&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Behandler CALL/RET som om det aldri trengte flagg (raskere, ustabilt)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : De fleste RET vil trenge flagg, de fleste CALL vil ikke&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Alle CALL/RET vil trenge flagg (langsommere)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">Generering av -NAN som på x86</string>
+    <string name="box64_env_var_help__dynarec_fastround">Generering av presis x86-avrunding</string>
+    <string name="box64_env_var_help__dynarec_x87double">Bruk av Float/Double for x87-emulering</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec bygger BigBlock&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ikke prøv å bygge blokk så stor som mulig&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Bygg Dynarec-blokk så stor som mulig&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Bygg Dynarec-blokk større (fortsett når blokk overlapper, men bare for blokker i elf-minne)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Bygg Dynarec-blokk større (fortsett når blokk overlapper, for alle typer minne)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Simulering av sterk minnemodell&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ikke prøv noe spesielt&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Aktiver noen minnebarrierer ved skriving til minne (på noen MOV-opkoder)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Alt fra 1 pluss en minnebarriere på hver skriving til minne med MOV&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Alt fra 2 pluss minnebarriere ved lesing fra minne og på noen SSE/SSE2-opkoder&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : Etterligner x86 TSO likt QEMU.
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">Definerer maks tillatt forlengsverdi ved bygging av blokk</string>
+    <string name="box64_env_var_help__dynarec_callret">Optimalisering av CALL/RET-opkoder</string>
+    <string name="box64_env_var_help__dynarec_sep">Legger til sekundære inngangspunkter for å optimalisere CALL/RET når CALLRET er aktivert.</string>
+    <string name="box64_env_var_help__dynarec_wait">Definerer om Dynarec skal vente på at FillBlock skal være klar</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Juster minnebarrierer for å redusere ytelsespåvirkningen av sterk minneemulering&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Bruk vanlige sikre barrierer&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Bruk svake barrierer for en mild ytelsesøkning&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Bruk svake barrierer, og deaktiver i tillegg siste skrivebarrierer</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        Generer bare justerte atomics (bare tilgjengelig på Arm64 foreløpig).&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Generer kode for håndtering av ujusterte atomics.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Generer bare justerte atomics, som er raskere og gir mindre kodestørrelse, men vil forårsake SIGBUS for LOCK-prefikserte opkoder som opererer på justerte dataadresser.</string>
+    <string name="box64_env_var_help__dynarec_df">
+        Aktiver eller deaktiver bruk av utsatte flagg.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Deaktiver bruk av utsatte flagg.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Aktiver bruk av utsatte flagg.</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        Tillat fortsatt kjøring av en blokk som er ubeskyttet og potensielt skitten.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ikke tillat fortsatt kjøring av en blokk som er ubeskyttet og potensielt skitten.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Tillat fortsatt kjøring av en dynablokk som skriver data på samme side som kode. Det kan gi raskere lastetid for enkelte spill, men kan også gi uventede krasj.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Vil også, når det oppdager en HotPage, merke den siden som NEVERCLEAN, slik at den ikke blir skrivebeskyttet, men blokker bygget fra den siden vil alltid bli testet. Det kan være raskere på den måten (men enkelte SMC-tilfeller fanges kanskje ikke opp).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        Aktiver eller deaktiver bruk av native flagg.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ikke bruk native flagg.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Bruk native flagg når det er mulig.</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        Aktiver x86 PAUSE-emulering, kan forbedre ytelsen til spinlocks.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ignorer x86 PAUSE-instruksjon.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Bruk YIELD for å emulere x86 PAUSE-instruksjon.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Bruk WFI for å emulere x86 PAUSE-instruksjon.&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Bruk SEVL+WFE for å emulere x86 PAUSE-instruksjon.
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">Reduserer metadata for dynarec-blokker for å spare minne, med kompatibilitetsavveininger.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">Bruker PE volatile metadata for å styre sterk minneemulering for 64-biters Windows-spill.</string>
+    <string name="box64_env_var_help__dynacache">Styrer mellomlagring av genererte dynarec-blokker mellom kjøringer for å øke oppstartshastigheten.</string>
+    <string name="box64_env_var_help__avx">
+        Eksponerer AVX-funksjoner til gjesten.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Deaktiver AVX-utvidelse&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : aktiver AVX-, BMI1-, F16C- og VAES-utvidelse.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Alt i 1 pluss aktiver AVX2, BMI2, FMA, ADX, VPCLMULQDQ og RDRAND.&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">Eksponerer AES CPU-funksjoner til gjesten.</string>
+    <string name="box64_env_var_help__pclmulqdq">Eksponerer PCLMULQDQ CPU-funksjoner til gjesten.</string>
+    <string name="box64_env_var_help__shaext">Eksponerer SHA-utvidelsens CPU-funksjoner til gjesten.</string>
+    <string name="box64_env_var_help__sse42">Eksponerer SSE4.2 CPU-funksjoner til gjesten.</string>
+    <string name="box64_env_var_help__sse_flushto0">Styrer SSE flush-to-zero-oppførsel og sporing av unntaksflagg.</string>
+    <string name="box64_env_var_help__x87_no80bits">Bruker 64-biters double-presisjon i stedet for 80-biters long double for x87.</string>
+    <string name="box64_env_var_help__cputype">Velger Intel- eller AMD-CPU-modellen som eksponeres til gjesten.</string>
+    <string name="box64_env_var_help__maxcpu">Maksimalt antall CPU-er som Box64 presenterer til programmer</string>
+    <string name="box64_env_var_help__unityplayer">Oppdager UnityPlayer og merker appen som et Unity-spill.</string>
+    <string name="box64_env_var_help__unity">Merker appen som et Unity-spill og aktiverer Unity-spesifikk kompatibilitetshåndtering.</string>
+    <string name="box64_env_var_help__mmap32">Tving all minneallokering til 32-biters adresserom</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">Aktiverer TSO IR-operasjoner (kreves for flertrådede apper).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">Gjør vektor-load/store atomiske når TSO er aktivert.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">Bruker halvbarriere-atomics for ujusterte load/store under TSO.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">Gjør REP MOVS / REP STOS atomiske under TSO.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Bruker en streng prosessomfattende lås for delte ujusterte atomiske tilganger.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Etterlapper kjernehåndterte ujusterte atomics for å redusere kontekstbytter i kjernen.</string>
+    <string name="fexcore_env_var_help__multiblock">Aktiverer multiblokk-kodekompilering. Kan gi lengre JIT-kompilering og hakking.</string>
+    <string name="fexcore_env_var_help__maxinst">Maksimalt antall instruksjoner lagret i en kompilert blokk.</string>
+    <string name="fexcore_env_var_help__hostfeatures">Styrer tvang av CPU-funksjoner.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Skalerer TSC på lavfrekvenssystemer.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Skjuler hybrid CPU-kjernelayout fra gjesten.</string>
+    <string name="fexcore_env_var_help__smc_checks">Sjekker kode for endringer før kjøring.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Bruker volatile metadata fra PE-filer for TSO når tilgjengelig.</string>
+    <string name="fexcore_env_var_help__monohacks">Spesielle SMC + JIT-blokk-hacks for Mono-deteksjon.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">Skjuler CPUID-hypervisorbit (nyttig for apper som krasjer med det).</string>
+    <string name="fexcore_env_var_help__disablel2cache">Deaktiverer FEXCore JIT L2-hurtigbufferoppslag, sparer minne, men gir hakking.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">Endrer FEXCore JIT L1-hurtigbuffer til å ha dynamisk størrelse, sparer minne, men gir hakking.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Terskel for oppslag per sekund for å øke den dynamiske L1-hurtigbufferen.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Terskel for oppslag per sekund for å krympe den dynamiske L1-hurtigbufferen.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">Emulerer X87 flyttall med 64-biters presisjon. Dette reduserer emuleringsnøyaktigheten og kan føre til renderingsfeil.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">FEXCore-forhåndsinnstilling</string>
+    <string name="container_fexcore_version">FEXCore-versjon</string>
+    <string name="use_unix_libs">Bruk UnixLibs</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Grafikkdriver</string>
+    <string name="container_zink_mode">Zink-modus</string>
+    <string name="container_graphics_configuration">Konfigurasjon av grafikkdriver</string>
+    <string name="container_graphics_version">Versjon av grafikkdriver</string>
+    <string name="container_graphics_available_extensions">Tilgjengelige utvidelser</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d aktivert</string>
+    <string name="container_graphics_max_device_memory">Maks enhetsminne</string>
+    <string name="container_graphics_sync_frame">Synkroniser hver ramme</string>
+    <string name="container_graphics_disable_present_wait">Deaktiver KHR_present_wait</string>
+    <string name="container_graphics_present_modes">Presentasjonsmoduser</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan-skjermsynkronisering</string>
+    <string name="container_graphics_resource_type">Type minneressurs</string>
+    <string name="container_graphics_vulkan_version">Vulkan-versjon</string>
+    <string name="container_graphics_bcn_emulation">BCn-emulering</string>
+    <string name="container_graphics_bcn_emulation_type">Type BCn-emulering</string>
+    <string name="container_graphics_bcn_emulation_cache">BCn-emuleringshurtigbuffer</string>
+    <string name="container_graphics_transcoder">BCn-transkoder</string>
+    <string name="container_graphics_quality">BCn-kvalitet</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">Vil du duplisere denne forhåndsinnstillingen?</string>
+    <string name="container_presets_confirm_remove">Vil du fjerne denne forhåndsinnstillingen?</string>
+    <string name="container_presets_title">Forhåndsinnstillinger</string>
+    <string name="container_presets_preset">Forhåndsinnstilling</string>
+    <string name="container_presets_new">Ny forhåndsinnstilling</string>
+    <string name="container_presets_rename">Gi nytt navn til forhåndsinnstilling</string>
+    <string name="container_presets_import">Importer forhåndsinnstilling</string>
+    <string name="container_presets_custom">Egendefinert</string>
+    <string name="container_presets_built_in">Standard</string>
+    <string name="container_presets_changes_auto_saved">Endringer lagres automatisk mens du redigerer denne egendefinerte forhåndsinnstillingen.</string>
+    <string name="container_presets_cannot_rename">Innebygde forhåndsinnstillinger kan ikke gis nytt navn</string>
+    <string name="container_presets_unable_to_import">Kan ikke importere forhåndsinnstilling</string>
+    <string name="container_presets_no_description">Ingen beskrivelse tilgjengelig</string>
+    <string name="container_presets_cannot_remove">Du kan ikke fjerne denne forhåndsinnstillingen</string>
+    <string name="container_presets_cannot_export">Kan ikke eksportere denne forhåndsinnstillingen</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Simuler berøringsskjerm</string>
+    <string name="session_xserver_preferences_button_text">   INNSTILLINGER   </string>
+    <string name="session_xserver_extra_keys_config_desc">Her kan du angi verdien til extra-keys-variabelen som i Termux-appen (les <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">dette</a>) og mer \n
+F.eks. <b>META</b> for <i>META-tast</i>, \n
+<b>KEYBOARD</b> for <i>tast for veksling av skjermtastatur</i>, \n
+<b>PREFERENCES</b> for <i>tast for å åpne innstillinger</i>, \n
+<b>MOUSE_HELPER</b> for <i>tast for veksling av musehjelper</i>, \n
+<b>STYLUS_HELPER</b> for <i>tast for veksling av overlegg for pekepennklikk-overstyring</i>, \n
+<b>EXIT</b> for <i>tast for å avslutte applikasjonen</i>.</string>
+    <string name="session_xserver_pref_main">Innstillinger</string>
+    <string name="session_xserver_pref_output">Utdata</string>
+    <string name="session_xserver_pref_pointer">Peker</string>
+    <string name="session_xserver_pref_kbd">Tastatur</string>
+    <string name="session_xserver_pref_other">Annet</string>
+    <string name="session_xserver_pref_version">Versjon</string>
+    <string name="session_xserver_notification_description">WinNative XServer-meldinger</string>
+    <string name="session_xserver_notification_content">WinNative kjører, ikke avslutt eller sveip bort dette varselet</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Tastatur</string>
+    <string name="session_drawer_fps_monitor">FPS-monitor</string>
+    <string name="session_drawer_fps_monitor_subtitle">Vis ytelsesstatistikk i sanntid</string>
+    <string name="session_drawer_dual_series_battery">Dobbel batteriserie</string>
+    <string name="session_drawer_hud_frametime_numeric">Vis frametime som tall</string>
+    <string name="session_drawer_toggle_fullscreen">Veksle fullskjerm</string>
+    <string name="session_drawer_refactor_size">Refaktorer størrelse</string>
+    <string name="session_drawer_show_touchscreen_controls">Vis berøringsskjermkontroller</string>
+    <string name="session_drawer_magnifier">Forstørrelsesglass</string>
+    <string name="session_drawer_logs">Logger</string>
+    <string name="session_drawer_pip_mode">PiP-modus</string>
+    <string name="session_drawer_toggle_relative_mouse">Veksle relativ musebevegelse</string>
+    <string name="session_drawer_toggle_mouse">Veksle mus</string>
+    <string name="session_drawer_pause_resume">Pause/gjenoppta</string>
+    <string name="session_drawer_relative_mouse_movement">Relativ musebevegelse</string>
+    <string name="session_drawer_mouse_input">Museinndata</string>
+    <string name="session_drawer_touch">Berøring</string>
+    <string name="session_drawer_touch_trackpad">Styreplate</string>
+    <string name="session_drawer_touch_touchscreen">Berøringsskjermmodus</string>
+    <string name="session_drawer_touch_map_right_stick">Tilordne til høyre spak</string>
+    <string name="session_drawer_rts_gestures">RTS-bevegelser</string>
+    <string name="session_drawer_rts_gestures_edit">Rediger</string>
+    <string name="session_drawer_right_stick_sensitivity">Følsomhet for høyre spak</string>
+    <string name="session_rts_action">Handling</string>
+    <string name="session_rts_behavior">Oppførsel</string>
+    <string name="session_rts_tap1">1-finger-trykk</string>
+    <string name="session_rts_tap2">2-finger-trykk</string>
+    <string name="session_rts_tap3">3-finger-trykk</string>
+    <string name="session_rts_tap4">4-finger-trykk</string>
+    <string name="session_rts_double_tap">Dobbelttrykk (dobbelt venstreklikk)</string>
+    <string name="session_rts_long_press">Langt trykk</string>
+    <string name="session_rts_hold2">2-finger-hold</string>
+    <string name="session_rts_hold3">3-finger-hold</string>
+    <string name="session_rts_hold4">4-finger-hold</string>
+    <string name="session_rts_swipe3">3-finger-sveip</string>
+    <string name="session_rts_swipe4">4-finger-sveip</string>
+    <string name="session_rts_up">Opp</string>
+    <string name="session_rts_down">Ned</string>
+    <string name="session_rts_left">Venstre</string>
+    <string name="session_rts_right">Høyre</string>
+    <string name="session_rts_pan">2-finger-panorering</string>
+    <string name="session_rts_pan1">1-finger-panorering</string>
+    <string name="session_rts_zoom">Knipezoom</string>
+    <string name="session_rts_drag">1-finger-dra</string>
+    <string name="session_rts_drag2">2-finger-dra</string>
+    <string name="session_rts_long_press_delay">Forsinkelse for langt trykk (ms)</string>
+    <string name="session_rts_hold_delay">Forsinkelse for hold (ms)</string>
+    <string name="session_rts_swipe_threshold">Terskel for sveip (px)</string>
+    <string name="session_rts_gesture_threshold">Terskel for bevegelse (px)</string>
+    <string name="session_rts_double_tap_delay">Forsinkelse for dobbelttrykk (ms)</string>
+    <string name="session_rts_drag_threshold">Terskel for dra (px)</string>
+    <string name="session_rts_pan_threshold">Start for panorering/knip (px)</string>
+    <string name="common_ui_rename">Gi nytt navn</string>
+    <string name="common_ui_new">Ny</string>
+    <string name="input_controls_editor_input_profiles_section">Inndataprofiler</string>
+    <string name="session_gesture_profile_section">Bevegelsesprofil</string>
+    <string name="gesture_profile_new">Ny bevegelsesprofil</string>
+    <string name="gesture_profile_import">Importer bevegelsesprofil</string>
+    <string name="gesture_profile_export">Eksporter bevegelsesprofil</string>
+    <string name="gesture_profile_none">Ingen bevegelsesprofiler</string>
+    <string name="session_drawer_screen_effects">Skjermeffekter</string>
+    <string name="session_drawer_screen_effects_subtitle">Oppskalering og fargeeffekter</string>
+    <string name="session_drawer_super_resolution">Superoppløsning</string>
+    <string name="session_drawer_upscaler_mode">Oppskalering</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Kantskarphet</string>
+    <string name="session_drawer_vivid">Levende</string>
+    <string name="session_drawer_vivid_strength">Levende-styrke</string>
+    <string name="session_drawer_color_profile">Fargeeffekt</string>
+    <string name="session_drawer_picture_in_picture">Bilde-i-bilde</string>
+    <string name="session_drawer_exit_subtitle">Lukk den kjørende økten</string>
+    <string name="session_drawer_touchscreen_overlay">Berøringsskjermoverlegg</string>
+    <string name="session_drawer_resume">Gjenoppta</string>
+    <string name="session_drawer_retry">Prøv igjen</string>
+    <string name="downloads_no_internet">Ingen internettforbindelse</string>
+    <string name="session_drawer_pause">Pause</string>
+    <string name="session_drawer_wine_processes_paused">Wine-prosesser er satt på pause</string>
+    <string name="session_drawer_pause_all_wine_processes">Sett alle Wine-prosesser på pause</string>
+    <string name="session_drawer_controls_section">Kontroller</string>
+    <string name="session_drawer_session_section">Økt</string>
+    <string name="session_drawer_header_subtitle">Rask tilgang til kontroller, overlegg og øktverktøy</string>
+    <string name="session_drawer_swipe_hint">Sveip bort for å gå tilbake til spillet</string>
+    <string name="session_drawer_main_menu_title">Meny</string>
+    <string name="session_drawer_hud_summary">Juster overleggets synlighet og datapunkter</string>
+    <string name="session_drawer_hud_disabled_hint">Slå på overlegget for å tilpasse det</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_background_alpha">Bakgrunnsalfa</string>
+    <string name="session_drawer_hud_background">Bakgrunn</string>
+    <string name="session_drawer_hud_scale">Skala</string>
+    <string name="session_drawer_hud_elements">HUD-elementer</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">Graf</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango-stil HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD-innstillinger</string>
+    <string name="mango_hud_element_gpu_load">GPU-belastning</string>
+    <string name="mango_hud_element_gpu_temp">GPU-temp.</string>
+    <string name="mango_hud_element_cpu_load">CPU-belastning</string>
+    <string name="mango_hud_element_cpu_temp">CPU-temp.</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batteri</string>
+    <string name="mango_hud_element_lows" formatted="false">1 %-bunner</string>
+    <string name="mango_hud_element_graph">Frametime-graf</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU-klokke</string>
+    <string name="mango_hud_element_gpu_clock">GPU-klokke</string>
+    <string name="mango_hud_element_cores">Per kjerne</string>
+    <string name="mango_hud_element_network">Nettverk</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Oppløsning</string>
+    <string name="mango_hud_element_wine">Wine-versjon</string>
+    <string name="mango_hud_element_duration">Økttid</string>
+    <string name="mango_hud_element_clock">Klokke</string>
+    <string name="mango_hud_element_throttle">Termisk status</string>
+    <string name="mango_hud_group_memory">Minne</string>
+    <string name="mango_hud_group_system">System</string>
+    <string name="mango_hud_lock">Lås HUD</string>
+    <string name="mango_hud_lock_subtitle">La berøringer gå til kontrollene bak HUD-en. Hold på HUD-en for å låse den. (5s)</string>
+    <string name="hud_position_menu_title">Flytt HUD til</string>
+    <string name="hud_position_top_left">Øverst til venstre</string>
+    <string name="hud_position_top_center">Øverst i midten</string>
+    <string name="hud_position_top_right">Øverst til høyre</string>
+    <string name="hud_position_left_center">Midt til venstre</string>
+    <string name="hud_position_right_center">Midt til høyre</string>
+    <string name="hud_position_bottom_left">Nederst til venstre</string>
+    <string name="hud_position_bottom_center">Nederst i midten</string>
+    <string name="hud_position_bottom_right">Nederst til høyre</string>
+    <string name="session_drawer_hud_alpha_input_title">Angi alfa</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Angi bakgrunnsalfa</string>
+    <string name="session_drawer_hud_scale_input_title">Angi skala</string>
+    <string name="session_drawer_hud_input_hint">Skriv inn en verdi fra %1$d til %2$d. Verdier over grensen begrenses.</string>
+    <string name="session_drawer_command_center">Kommandosenter</string>
+    <string name="session_drawer_command_center_input">Inndata</string>
+    <string name="session_drawer_command_center_display">Skjerm</string>
+    <string name="session_drawer_command_center_system">System</string>
+    <string name="session_drawer_fps_limiter">FPS-begrenser</string>
+    <string name="session_drawer_fps_limiter_off">Av</string>
+    <string name="session_drawer_color_profile_disabled">Deaktivert</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Naturlig</string>
+    <string name="session_drawer_color_profile_crt">CRT-effekt</string>
+    <string name="session_drawer_color_profile_toon">Tegneserie</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Lysstyrke</string>
+    <string name="session_drawer_contrast">Kontrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_scale">Skala</string>
+    <string name="session_drawer_scale_nearest">Nærmeste</string>
+    <string name="session_drawer_scale_linear">Lineær</string>
+    <string name="session_drawer_scale_bicubic">Bikubisk</string>
+    <string name="session_drawer_saturation">Metning</string>
+    <string name="session_drawer_temperature">Temperatur</string>
+    <string name="session_drawer_tint">Fargetone</string>
+    <string name="session_drawer_sharpen">Skjerp</string>
+    <string name="session_drawer_scanlines">Skannelinjer</string>
+    <string name="session_drawer_pixelate">Pikselering</string>
+    <string name="session_drawer_block_size">Blokkstørrelse</string>
+    <string name="session_drawer_strength">Styrke</string>
+    <string name="session_drawer_intensity">Intensitet</string>
+    <string name="session_drawer_color_blind">Fargeblind</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Nullstill effekter</string>
+    <string name="session_drawer_calibrate_advanced">Avansert kalibrering</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Gyro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Utgang</string>
+    <string name="session_drawer_rail_label_apps">Mer</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">Ekstern skjerm oppdaget</string>
+    <string name="display_output_prompt_message">Sende spillet til den tilkoblede skjermen? Skjermkontrollene og menyen blir værende på denne telefonen.</string>
+    <string name="display_output_prompt_swap">Bytt skjermer</string>
+    <string name="display_output_prompt_mirror">Speil</string>
+    <string name="display_output_swapped_toast">Spillet er flyttet til ekstern skjerm. Kontrollene blir værende på telefonen.</string>
+    <string name="display_output_cast_unavailable">Innstillinger for trådløs skjerm er ikke tilgjengelige på denne enheten.</string>
+    <string name="display_output_restored_toast">Ekstern skjerm frakoblet — spillet er ført tilbake til telefonen.</string>
+    <string name="session_drawer_output_title">Skjermutgang</string>
+    <string name="session_drawer_output_subtitle">Spillet vises på den eksterne skjermen.</string>
+    <string name="session_drawer_output_device">Tilkoblet skjerm</string>
+    <string name="session_drawer_output_resolution">Oppløsning</string>
+    <string name="session_drawer_output_refresh_rate">Oppdateringsfrekvens</string>
+    <string name="session_drawer_output_aspect_ratio">Sideforhold</string>
+    <string name="session_drawer_output_aspect_fit">Tilpass (sideforhold)</string>
+    <string name="session_drawer_output_aspect_stretch">Strekk (fyll)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (beskjær)</string>
+    <string name="session_drawer_output_return_to_phone">Tilbake til telefon</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Cast til en TV</string>
+    <string name="session_drawer_output_cast_body">Koble til en USB-C-/HDMI-adapter, eller trykk nedenfor for å koble til en trådløs skjerm (Miracast / Wi-Fi Direct). Spillet vises på TV-en mens disse kontrollene blir værende på telefonen.</string>
+    <string name="session_drawer_output_cast_button">Koble til trådløs skjerm</string>
+    <string name="session_drawer_output_cast_note">TV-er med kun Chromecast kan ikke vise direkte spilling med private kontroller — bruk en trådløs skjerm eller en USB‑C/HDMI-adapter for best resultat.</string>
+    <string name="session_drawer_output_render_note">Moduser som skjermen din rapporterer, bytter dens faktiske utgang (den kan bli svart et øyeblikk mens den re‑initialiseres). Andre oppløsninger gjengis i den størrelsen og skaleres maskinvarebasert til panelet — høyere enn opprinnelig gir skarpere bilde (supersampling), lavere kjører raskere.</string>
+    <string name="session_drawer_output_scaling_note">Denne telefonen sender ut skjermen i sin opprinnelige %1$s og bytter ikke modus, så dette angir gjengivelsesoppløsningen — den skaleres maskinvarebasert til panelet (høyere enn opprinnelig gir skarpere bilde, lavere kjører raskere).</string>
+    <string name="session_drawer_output_game_mode">Spillmodus (lav forsinkelse)</string>
+    <string name="session_drawer_output_game_mode_on">På</string>
+    <string name="session_drawer_output_game_mode_off">Av</string>
+    <string name="session_drawer_output_game_mode_note">Ber om TV-ens lavforsinkelses-/spillmodus (HDMI ALLM) for å minimere inndataforsinkelse. Vises kun når den tilkoblede skjermen støtter det.</string>
+    <string name="session_drawer_output_send_to_display">Send spillet til skjermen</string>
+    <string name="session_drawer_output_to_display">Utgang til ekstern skjerm</string>
+    <string name="session_drawer_output_send_note">En skjerm er tilkoblet. Send spillet til den — kontrollene og menyen blir værende på denne telefonen. Du kan hente det tilbake hit når som helst.</string>
+    <string name="session_drawer_output_display">Skjerm</string>
+    <string name="session_drawer_output_glasses">Briller</string>
+    <string name="session_drawer_output_brightness">Lysstyrke</string>
+    <string name="session_drawer_output_shade">Skygge (demping)</string>
+    <string name="session_drawer_output_3d">3D (side ved side)</string>
+    <string name="glasses_panel_refresh">Oppdateringsfrekvens</string>
+    <string name="glasses_panel_sunblock">Solblokk</string>
+    <string name="session_drawer_output_volume">Volum</string>
+    <string name="session_drawer_output_glasses_note">Sendes direkte til Viture-brillene dine over USB.</string>
+    <string name="session_drawer_rail_label_keyboard">Tastatur</string>
+    <string name="session_drawer_rail_label_input_controls">Kontroller</string>
+    <string name="session_drawer_rail_label_relative_mouse">RelMus</string>
+    <string name="session_drawer_rail_label_mouse">Mus</string>
+    <string name="session_drawer_rail_label_fullscreen">Fullskjerm</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Zoom</string>
+    <string name="session_drawer_rail_label_task_manager">Oppgaver</string>
+    <string name="session_drawer_rail_label_record">Ta opp</string>
+    <string name="session_drawer_rail_label_logs">Logger</string>
+    <string name="session_record_started">Opptak startet</string>
+    <string name="session_record_saved">Opptak lagret i WinNative/Recordings</string>
+    <string name="session_record_failed">Kunne ikke starte opptak</string>
+    <string name="session_record_settings_title">Opptaksinnstillinger</string>
+    <string name="session_record_fps">Bildefrekvens</string>
+    <string name="session_record_resolution">Oppløsning</string>
+    <string name="session_record_quality">Kvalitet</string>
+    <string name="session_record_include_ui">Ta opp grensesnitt</string>
+    <string name="session_record_include_ui_subtitle">Inkluder HUD og skjermkontroller</string>
+    <string name="session_record_now">Ta opp nå</string>
+    <string name="session_drawer_logs_clear">Tøm</string>
+    <string name="session_drawer_logs_pause">Pause</string>
+    <string name="session_drawer_logs_resume">Fortsett</string>
+    <string name="session_drawer_logs_paused_indicator">Pauset</string>
+    <string name="session_drawer_logs_line_count">%1$d linjer</string>
+    <string name="session_drawer_logs_share">Del</string>
+    <string name="session_drawer_logs_share_subject">Øktlogger</string>
+    <string name="session_drawer_logs_share_chooser">Del øktlogger</string>
+    <string name="session_drawer_logs_share_failed">Kunne ikke dele logger</string>
+    <string name="session_drawer_logs_share_empty">Ingen logglinjer å dele</string>
+    <string name="session_gyroscope_activator">Aktivator</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">Vil du avslutte denne prosessen?</string>
+    <string name="session_task_title">Oppgavebehandling</string>
+    <string name="session_task_process_name">Prosessnavn</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">Minne</string>
+    <string name="session_task_end_process">Avslutt prosess</string>
+    <string name="session_task_set_affinity">Angi affinitet</string>
+    <string name="session_task_affinity_title">Prosessoraffinitet</string>
+    <string name="session_task_affinity_all_cores">Alle kjerner</string>
+    <string name="session_task_new_task">Ny oppgave</string>
+    <string name="session_task_bring_to_front">Flytt til forgrunnen</string>
+    <string name="session_task_custom_value">Egendefinert verdi</string>
+    <string name="session_task_processes">Prosesser</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">Bruk per kjerne</string>
+    <string name="session_task_core_label">Kjerne %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d kjerne</item>
+        <item quantity="other">%d kjerner</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Retning</string>
+    <string name="session_display_horizontal">Horisontal</string>
+    <string name="session_display_vertical">Vertikal</string>
+    <string name="session_display_columns">Kolonner</string>
+    <string name="session_display_frame_rate">Bildefrekvens</string>
+    <string name="session_display_title">Skjerm</string>
+    <string name="session_display_fullscreen_stretched">Aktiver fullskjerm (strukket)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Gjengiver:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB brukt / %2$s totalt</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">Vil du fjerne denne kontrolleren?</string>
+    <string name="session_gamepad_external_controllers">Eksterne kontrollere</string>
+    <string name="session_gamepad_press_any_button">Trykk på en knapp på kontrolleren</string>
+    <string name="session_gamepad_bindings">tilordninger</string>
+    <string name="session_gamepad_control_bindings">Kontrolltilordninger</string>
+    <string name="session_gamepad_game_controller">Spillkontroller</string>
+    <string name="session_gamepad_as_button">Er knapp</string>
+    <string name="session_gamepad_as_axis">Er akse</string>
+    <string name="session_gamepad_trigger_type">Type</string>
+    <string name="session_gamepad_help_trigger_mode">Avhenger av din &lt;b&gt;fysiske kontroller&lt;/b&gt;:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;Er akse&lt;/b&gt; — avtrekkeren har et lineært bevegelsesområde&lt;br/&gt;&#x2022; &lt;b&gt;Er knapp&lt;/b&gt; — avtrekkeren fungerer som en enkel bryter&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Merk: bruk av Er knapp med en lineær avtrekker mister analoge data.&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">Knapp A</string>
+    <string name="session_gamepad_button_b">Knapp B</string>
+    <string name="session_gamepad_button_x">Knapp X</string>
+    <string name="session_gamepad_button_y">Knapp Y</string>
+    <string name="session_gamepad_button_grip">Gripeknapp</string>
+    <string name="session_gamepad_button_trigger">Avtrekkerknapp</string>
+    <string name="session_gamepad_thumbstick_left">Styrespak venstre</string>
+    <string name="session_gamepad_thumbstick_right">Styrespak høyre</string>
+    <string name="session_gamepad_thumbstick_up">Styrespak opp</string>
+    <string name="session_gamepad_thumbstick_down">Styrespak ned</string>
+    <string name="session_gamepad_configure_analog_sticks">Konfigurer analoge spaker</string>
+    <string name="session_gamepad_left_stick">Venstre spak</string>
+    <string name="session_gamepad_right_stick">Høyre spak</string>
+    <string name="session_gamepad_controller_manager">Kontrollerbehandling</string>
+    <string name="session_gamepad_enable_vibration">Aktiver vibrasjon</string>
+    <string name="session_gamepad_player_1">Spiller 1</string>
+    <string name="session_gamepad_player_2">Spiller 2</string>
+    <string name="session_gamepad_player_3">Spiller 3</string>
+    <string name="session_gamepad_player_4">Spiller 4</string>
+    <string name="session_gamepad_not_assigned">Ikke tildelt</string>
+    <string name="session_gamepad_assign">Tildel</string>
+    <string name="session_gamepad_press_any_button_for_player">Trykk på en knapp på kontrolleren for</string>
+    <string name="session_gamepad_vibrate">Vibrasjon</string>
+    <string name="session_gamepad_macros_hint">Slå på knapper for å aktivere autoskyting.</string>
+    <string name="session_gamepad_macros">Makroer</string>
+    <string name="session_gamepad_include_triggers_note">Bruk også turbo på L2/R2 som digitale trykk</string>
+    <string name="session_gamepad_square_deadzone">Kvadratisk dødsone</string>
+    <string name="session_gamepad_invert_x">Inverter X</string>
+    <string name="session_gamepad_invert_y">Inverter Y</string>
+    <string name="session_gamepad_save_profile">Lagre profil</string>
+    <string name="session_gamepad_load_profile">Last inn profil</string>
+    <string name="session_gamepad_button_start">Knapp Start</string>
+    <string name="session_gamepad_button_select">Knapp Select</string>
+    <string name="session_gamepad_button_l1">Knapp L1</string>
+    <string name="session_gamepad_button_r1">Knapp R1</string>
+    <string name="session_gamepad_button_l2">Knapp L2</string>
+    <string name="session_gamepad_button_r2">Knapp R2</string>
+    <string name="session_gamepad_button_l3">Knapp L3</string>
+    <string name="session_gamepad_button_r3">Knapp R3</string>
+    <string name="session_gamepad_dpad_up">D-pad opp</string>
+    <string name="session_gamepad_dpad_down">D-pad ned</string>
+    <string name="session_gamepad_dpad_left">D-pad venstre</string>
+    <string name="session_gamepad_dpad_right">D-pad høyre</string>
+    <string name="session_gamepad_overwrite">Overskriv</string>
+    <string name="session_gamepad_save_as_new">Lagre som ny</string>
+    <string name="session_gamepad_overwrite_profile_message">Vil du overskrive den gjeldende profilen eller lagre som en ny profil?</string>
+    <string name="session_gamepad_enter_profile_name">Skriv inn profilnavn</string>
+    <string name="session_gamepad_mappings_saved">Tilordninger lagret!</string>
+    <string name="session_gamepad_profile_saved">Profil lagret!</string>
+    <string name="session_gamepad_profile_saved_as_new">Profil lagret som ny!</string>
+    <string name="session_gamepad_profile_loaded">Profil lastet inn!</string>
+    <string name="session_gamepad_profile_name_empty">Profilnavn kan ikke være tomt</string>
+    <string name="session_gamepad_no_profiles">-- Ingen profiler --</string>
+    <string name="session_gamepad_error_loading_profile">Feil ved innlasting av profil</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Berøringsskjermkontroller</string>
+    <string name="input_controls_auto_hide_on_controller_title">Skjul automatisk med kontroller</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Skjul berøringsskjermkontroller når en kontroller er tilkoblet</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">Gyroskop</string>
+    <string name="session_gyroscope_calibrate">Kalibrer gyroskop</string>
+    <string name="session_gyroscope_enable_right_stick">Aktiver gyroskopisk bevegelse for høyre spak</string>
+    <string name="session_gyroscope_activator_button">Aktiveringsknapp for gyroskop</string>
+    <string name="session_gyroscope_hold">Hold</string>
+    <string name="session_gyroscope_toggle">Veksle</string>
+    <string name="session_gyroscope_orientation_mode">Vipp for å sikte (orientering)</string>
+    <string name="session_gyroscope_x_sensitivity">Følsomhet for X-akse</string>
+    <string name="session_gyroscope_y_sensitivity">Følsomhet for Y-akse</string>
+    <string name="session_gyroscope_smoothing">Utjevning</string>
+    <string name="session_gyroscope_invert_x">Inverter X-akse</string>
+    <string name="session_gyroscope_invert_y">Inverter Y-akse</string>
+    <string name="session_gyroscope_filtering">Filtrering</string>
+    <string name="session_gyroscope_deadzone">Dødsone</string>
+    <string name="session_gyroscope_sensitivity">Følsomhet</string>
+    <string name="session_gyroscope_direction">Retning</string>
+    <string name="session_gyroscope_mode">Aktiveringsmodus for gyroskop</string>
+    <string name="session_gyroscope_target_stick">Bruk gyro på</string>
+    <string name="session_gyroscope_enable_stick">Aktiver gyroskopisk bevegelse for analog spak</string>
+    <string name="session_gyroscope_reset_stick">Nullstill spak</string>
+    <string name="session_gyroscope_reset_stick_to_center">Nullstill spak til midten</string>
+    <string name="session_gyroscope_configuration">Gyroskopkonfigurasjon</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Eksperimentell musbevegelse</string>
+    <string name="session_gyroscope_x_sensitivity_format">X-følsomhet: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Y-følsomhet: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Utjevning: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Dødsone: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Følsomhet: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Musskala</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Musskala: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">Markørhastighet</string>
+    <string name="settings_general_theme">Tema</string>
+    <string name="settings_general_background">Bakgrunn</string>
+    <string name="settings_general_background_color_hex">Farge (hex)</string>
+    <string name="settings_general_wallpaper_selected">Bakgrunnsbilde valgt</string>
+    <string name="settings_general_select_wallpaper">Velg bakgrunnsbilde</string>
+    <string name="settings_general_title">Generelt</string>
+    <string name="settings_general_enable_file_provider">Aktiver File Provider</string>
+    <string name="settings_general_enable_auto_scraping">Aktiver automatisk henting</string>
+    <string name="settings_general_take_effect_next_startup">Dette valget trer i kraft ved neste oppstart.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Installer Imagefs på nytt</string>
+    <string name="settings_general_confirm_reinstall_imagefs">Vil du installere imagefs på nytt? Denne operasjonen gjenoppretter systemfiler, beholderne dine endres ikke.</string>
+    <string name="settings_general_refresh_rate">Oppdateringsfrekvens</string>
+    <string name="settings_general_refresh_rate_auto_max">Maks</string>
+    <string name="settings_general_refresh_rate_summary">Angi skjermens oppdateringsfrekvens og DXVK-bildegrense</string>
+    <string name="settings_general_touchscreen_timeout">Tidsavbrudd for berøringsskjerm (krever omstart)</string>
+    <string name="settings_general_touchscreen_haptics">Aktiver haptisk tilbakemelding for berøringsskjerm</string>
+    <string name="settings_general_open_with_android_browser">Åpne Android-nettleser i Wine</string>
+    <string name="settings_general_share_android_clipboard">Del Android-utklippstavle med Wine</string>
+    <string name="settings_general_paths_title">Baneinnstillinger</string>
+    <string name="settings_general_paths_summary">Administrer hvor Winlator lagrer arbeidsdataene sine og hvor eksporterte snarveier skrives.</string>
+    <string name="settings_general_winlator_path_title">Lagringsbane</string>
+    <string name="settings_general_shortcut_export_path_title">Eksportbane for snarvei</string>
+    <string name="settings_general_choose_path">Velg bane</string>
+    <string name="settings_general_xserver_cursor_summary">Juster pekerhastighet for berøring, styreplate og musinndata i XServer-økten.</string>
+    <string name="settings_general_cursor_lock_title">Ekte musstyring</string>
+    <string name="settings_general_cursor_lock_summary">Holder direkte musfangst aktivert for spill som trenger rå pekerinndata. Slå det av med Volum ned.</string>
+    <string name="settings_general_xinput_toggle_title">Deaktiver XInput</string>
+    <string name="settings_general_xinput_toggle_summary">Slår av XInput-håndtering når du vil ha eksklusiv mus- og tastaturkontroll.</string>
+    <string name="settings_external_display_output_summary">Flytt spillet til en tilkoblet ekstern skjerm i stedet for å speile denne skjermen. Briller bruker alltid sin egen skjerm.</string>
+    <string name="settings_general_file_provider_summary">Gjør WinNative-filer tilgjengelige for Androids dokumentvelgere og filbehandlere.</string>
+    <string name="settings_general_auto_scraping_summary">Denne innstillingen lar WinNative automatisk hente grafikk til egendefinerte spill.</string>
+    <string name="settings_general_open_browser_summary">Åpne støttede nettlenker i Android-nettleseren i stedet for inne i Wine.</string>
+    <string name="settings_general_clipboard_summary">Tillat kopiering og innliming mellom Android- og Wine-økter.</string>
+    <string name="settings_general_imagefs_summary">Gjenopprett medfølgende systemfiler uten å fjerne dine eksisterende containere.</string>
+    <string name="settings_general_check_for_updates">Se etter oppdateringer</string>
+    <string name="settings_general_check_for_updates_summary">Se automatisk etter nye appversjoner ved oppstart og med jevne mellomrom.</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI-SoundFont</string>
+    <string name="settings_audio_sound">Lyd</string>
+    <string name="settings_audio_confirm_remove_sound_font">Vil du fjerne denne soundfonten?</string>
+    <string name="settings_audio_sound_font_removed_success">Soundfont fjernet.</string>
+    <string name="settings_audio_sound_font_removed_failed">Kunne ikke fjerne soundfont.</string>
+    <string name="settings_audio_sound_font_installed_success">Soundfont installert.</string>
+    <string name="settings_audio_sound_font_installed_failed">Kunne ikke installere soundfont.</string>
+    <string name="settings_audio_sound_font_already_exist">Soundfonten du vil installere finnes allerede.</string>
+    <string name="settings_audio_unable_to_install_soundfont">Kan ikke installere soundfont</string>
+    <string name="settings_audio_installing_soundfont">Installerer SoundFont</string>
+    <string name="settings_audio_sound_font_bad_format">Ugyldig SoundFont-format.</string>
+    <string name="settings_audio_cannot_remove_default">Kan ikke fjerne standard soundfont</string>
+    <string name="settings_audio_summary">Installer, fjern og velg SoundFont-en som brukes til MIDI-avspilling.</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Wine-feilsøkingskanal</string>
+    <string name="settings_debug_title">Feilsøking</string>
+    <string name="settings_debug_wine_logs_title">Aktiver Wine-feilsøkingslogger</string>
+    <string name="settings_debug_wine_logs_subtitle">Skriv Wine-feilsøkingsutdata til fil</string>
+    <string name="settings_debug_box_logs_title">Aktiver Box86/64-logger</string>
+    <string name="settings_debug_box_logs_subtitle">Skriv feilsøkingsutdata fra Box86 &amp; Box64 til fil</string>
+    <string name="settings_debug_fex_logs_title">Aktiver FEXCore-logger</string>
+    <string name="settings_debug_fex_logs_subtitle">Skriv FEXCore-feilsøkingsutdata til fil</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX-emuleringslogger</string>
+    <string name="settings_debug_emulator_logs_subtitle">Logger til fil, uansett hvilken emulator containeren din bruker.</string>
+    <string name="settings_debug_steam_logs_title">Aktiver Steam-logger</string>
+    <string name="settings_debug_steam_logs_subtitle">Logg Steam-autentisering og økthendelser for feilsøking.</string>
+    <string name="settings_debug_wine_channels_title">Wine-feilsøkingskanaler</string>
+    <string name="settings_debug_wine_channels_summary">Velg hvilke Wine-kanaler som inkluderes når Wine-feilsøkingslogging er aktivert.</string>
+    <string name="settings_debug_wine_classes_title">Wine-loggnivåer</string>
+    <string name="settings_debug_wine_classes_summary">Velg hvilke meldingstyper som logges. Trace er ekstremt detaljert.</string>
+    <string name="settings_debug_input_logs">Inndatalogger</string>
+    <string name="settings_debug_input_logs_description">Logg inndatahendelser fra spillkontroller, berøring og tastatur</string>
+    <string name="settings_debug_download_logs">Nedlastingslogger</string>
+    <string name="settings_debug_download_logs_description">Logg nedlastingsresolver- og WinNative-reservehendelser</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan-valideringslag</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Start skjermen på nytt for å ta i bruk.</string>
+    <string name="settings_debug_share_logs">Del logger</string>
+    <string name="settings_debug_delete_logs">Slett logger</string>
+    <string name="settings_debug_share_all_logs_short">Del alle</string>
+    <string name="settings_debug_download_all_logs_short">Last ned alle</string>
+    <string name="settings_debug_logs_saved">Lagret til %1$s</string>
+    <string name="settings_debug_delete_logs_short">Slett</string>
+    <string name="settings_debug_delete_all_logs_short">Slett alle</string>
+    <string name="settings_debug_open_logs_folder_short">Åpne loggbehandler</string>
+    <string name="settings_debug_logs_deleted">Logger slettet</string>
+    <string name="settings_debug_delete_logs_confirm_title">Slette logger?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Dette sletter permanent alle lagrede loggfiler (%1$s). Dette kan ikke angres.</string>
+    <string name="settings_debug_logs_browser_title">Logger</string>
+    <string name="settings_debug_log_truncated">Viser de siste %1$s av denne loggen</string>
+    <string name="settings_debug_logs_subject">WinNative-logger (%1$s)</string>
+    <string name="settings_debug_no_logs_available">Ingen feilsøkingslogger tilgjengelig. Aktiver feilsøkingsalternativer først og start et spill.</string>
+    <string name="settings_debug_capture_failed">Kunne ikke fange logger: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">Logg WinNative-prosessfeil, advarsler og krasj til fil</string>
+    <string name="settings_debug_section_emulation">Emulering</string>
+    <string name="settings_debug_section_subsystems">Delsystemer</string>
+    <string name="settings_debug_section_tools">Verktøy</string>
+    <string name="settings_debug_no_channels_selected">Ingen kanaler valgt</string>
+    <string name="settings_debug_no_channels_available">Ingen kanaler tilgjengelig</string>
+    <string name="settings_debug_channel_toggle_hint">Trykk for å veksle kanaler. Aktiverte kanaler inkluderes i Wine-feilsøkingsutdata.</string>
+    <string name="settings_debug_remove_channel_desc">Fjern %1$s</string>
+
+    <string name="settings_other_language_title">Språk</string>
+    <string name="settings_other_language_summary">Velg visningsspråk</string>
+    <string name="settings_other_language_system_default">Systemstandard</string>
+    <string name="settings_other_game_language_title">Spillspråk</string>
+    <string name="settings_other_game_language_summary">Foretrukket språk for Steam/Epic/GOG-nedlastinger</string>
+
+    <string name="settings_other_section_integration">Integrasjon</string>
+    <string name="settings_other_setup_wizard_title">Oppsettsveiviser</string>
+    <string name="settings_other_setup_wizard_summary">Åpne oppsettsveiviseren på nytt for å gå gjennom tillatelser, systemfiler og standardcontainere.</string>
+    <string name="settings_other_checking_for_updates">Ser etter oppdateringer…</string>
+    <string name="settings_other_update_check_cooldown">Vent %1$ds før du sjekker igjen</string>
+    <string name="settings_other_persistable_permission_failed">Kan ikke ta vedvarende tillatelser: %1$s</string>
+    <string name="settings_other_keep_app_open">Hold appen åpen mens dette fullføres.</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">Installer innhold</string>
+    <string name="settings_content_type">Kategori</string>
+    <string name="settings_content_components">Komponenter</string>
+    <string name="settings_content_auto_create_container">Opprett container automatisk</string>
+    <string name="settings_content_remove_title">Fjerne komponent?</string>
+    <string name="settings_content_empty_subtitle">Installer en pakke eller bytt type for å komme i gang.</string>
+    <string name="settings_content_container_created">Opprettet container: %1$s</string>
+    <string name="settings_content_download_failed">Nedlasting mislyktes.</string>
+    <string name="common_ui_working">Arbeider</string>
+    <string name="settings_content_desc_wine">Laget av Wine-prosjektet; oversetter Win32-kall til opprinnelige Linux-/Android-tjenester.</string>
+    <string name="settings_content_desc_proton">Laget av Valve; en Wine-basert kjøretid med spillpatcher for Windows-spill.</string>
+    <string name="settings_content_desc_dxvk">Oversetter grafikkkall fra Direct3D 9, 10 og 11 til Vulkan.</string>
+    <string name="settings_content_desc_vkd3d">Oversetter grafikkkall fra Direct3D 12 til Vulkan.</string>
+    <string name="settings_content_desc_box64">Oversetter x86_64 Linux-kode slik at den kan kjøre på ARM64-enheter.</string>
+    <string name="settings_content_desc_wowbox64">Box64-versjon brukt av WoW64 for å kjøre 32-bits Windows-apper inne i 64-bits Wine.</string>
+    <string name="settings_content_desc_fexcore">Oversetter x86- og x86_64-kode slik at den kan kjøre på ARM64-enheter.</string>
+    <string name="settings_content_desc_d7vk">Oversetter grafikkkall fra DirectDraw (Direct3D 7 og eldre) til Vulkan.</string>
+    <string name="settings_content_unable_to_install">Kan ikke installere innhold.</string>
+    <string name="settings_content_install_failed">Installasjon mislyktes</string>
+    <string name="settings_content_file_cannot_be_recognized">Filen kan ikke gjenkjennes.</string>
+    <string name="settings_content_profile_not_found">Profil ikke funnet i innholdet.</string>
+    <string name="settings_content_profile_cannot_be_recognized">Profilen kan ikke gjenkjennes</string>
+    <string name="settings_content_file_list">Filliste</string>
+    <string name="settings_content_install_directory">Installasjonsmappe</string>
+    <string name="settings_content_installed_success">Innhold installert.</string>
+    <string name="settings_content_downloading_title">Laster ned innhold</string>
+    <string name="settings_content_installing_title">Installerer innhold</string>
+    <string name="settings_content_extracting_title">Pakker ut innhold</string>
+    <string name="settings_content_extracting_detail">Pakker ut (%1$d filer)</string>
+    <string name="settings_content_preparing_package">Forbereder pakke</string>
+    <string name="settings_content_download_complete">Nedlasting fullført</string>
+    <string name="settings_content_already_installed_title">Komponent allerede installert</string>
+    <string name="settings_content_already_installed_message">Denne komponenten er allerede installert. Fjern den installerte kopien før du laster den ned igjen.
+
+Installert bane:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Motstridende innhold installert</string>
+    <string name="settings_content_conflicting_message">Avinstaller det motstridende innholdet før du laster ned denne pakken.
+
+Installert bane:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">Innholdet kan ikke stoles på.</string>
+    <string name="settings_content_is_incomplete">Innholdet er ufullstendig.</string>
+    <string name="settings_content_untrusted_files_warning">Advarsel: Tilleggsinnholdet inneholder ikke-klarerte filer. Generelt bør ikke følgende filer endres. Bestem om du vil fortsette med installasjonen.</string>
+    <string name="settings_content_confirm_remove">Dette sletter komponenten fra enheten din.</string>
+    <string name="settings_content_unable_to_remove_in_use">Kan ikke fjerne dette innholdet, fordi en container bruker denne Wine akkurat nå.</string>
+    <string name="settings_content_download_in_components">Ingen lastet ned. Last ned én under Komponenter.</string>
+    <string name="settings_content_types_header">INNHOLDSTYPER</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Drivere</string>
+    <string name="settings_drivers_manager_header">Driverbehandler</string>
+    <string name="settings_drivers_github_repos">GitHub-repositorier</string>
+    <string name="settings_drivers_install">Installer drivere</string>
+    <string name="settings_drivers_installed_success">Driver installert.</string>
+    <string name="settings_drivers_install_failed">Kunne ikke installere driver.</string>
+    <string name="settings_drivers_remove_title">Fjerne driver?</string>
+    <string name="settings_drivers_confirm_remove">Dette sletter driveren fra enheten din.</string>
+    <string name="settings_drivers_remove_repo_title">Fjerne repositorium?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s fjernes fra repositoriumlisten din.</string>
+    <string name="settings_drivers_repo_tap_to_load">Trykk for å laste utgivelser</string>
+    <string name="settings_drivers_repo_loading_releases">Laster utgivelser</string>
+    <string name="settings_drivers_repo_release_count">%1$d utgivelser lastet</string>
+    <string name="settings_drivers_repo_no_release_assets">Ingen nedlastbare ZIP-ressurser ble funnet i de hentede utgivelsene.</string>
+    <string name="settings_drivers_repo_fetch_failed">Kunne ikke laste GitHub-utgivelser.</string>
+    <string name="settings_drivers_repo_download_failed">Nedlasting mislyktes.</string>
+    <string name="settings_drivers_repo_no_version">Versjon utilgjengelig</string>
+    <string name="settings_drivers_repo_unknown_size">Ukjent størrelse</string>
+    <string name="settings_drivers_manager">Driverbehandler</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">Installerer systemfiler</string>
+    <string name="setup_wizard_unable_to_install_system_files">Kan ikke installere systemfiler</string>
+    <string name="setup_wizard_system_image_not_installed">Systembilde ikke installert. Installer komponenter først.</string>
+    <string name="setup_wizard_recommended_components">Anbefalte komponenter</string>
+    <string name="setup_wizard_step_format">Trinn %1$d av %2$d</string>
+    <string name="setup_wizard_allow_file_access">Tillat all filtilgang</string>
+    <string name="setup_wizard_install_system_files">Installer systemfiler</string>
+    <string name="setup_wizard_recommended_components_description">Anbefalte komponenter laster ned og installerer de støttede DXVK-, VKD3D-, FEX-, Box64- og Wowbox64-pakkene automatisk.</string>
+    <string name="setup_wizard_each_button_downloads_description">Hver knapp laster ned pakken, installerer den og oppretter dens standardcontainer automatisk.</string>
+    <string name="setup_wizard_recommended_x86_64">Anbefalt x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">Anbefalt ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">Velg hvilke komponenter som skal installeres. Wine/Proton oppretter automatisk en container.</string>
+    <string name="setup_wizard_loading_components">Laster komponenter…</string>
+    <string name="setup_wizard_no_components_available">Ingen komponenter tilgjengelig for denne kategorien.</string>
+    <string name="setup_wizard_default_settings">Standardinnstillinger</string>
+    <string name="setup_wizard_containers">Containeroppsett</string>
+    <string name="setup_wizard_containers_description">Åpne hver container og angi standardene du vil at hvert nye spill skal arve. Nye spill retter seg mot x86-64-containeren som standard.</string>
+    <string name="setup_wizard_store_sign_in_optional">Butikkinnlogging er valgfritt. Hver innlogging returnerer hit når den er ferdig.</string>
+    <string name="setup_wizard_granted">Innvilget</string>
+    <string name="setup_wizard_grant">Innvilg</string>
+    <string name="setup_wizard_denied">Nektet</string>
+    <string name="setup_wizard_allow">Tillat</string>
+    <string name="setup_wizard_installing">Installerer</string>
+    <string name="setup_wizard_install_failed_reason">Installasjon mislyktes: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Nødvendig tilgang</string>
+    <string name="setup_wizard_select_components">Velg komponenter</string>
+    <string name="setup_wizard_recommended_wine_proton">Anbefalt Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">Avansert oppsett</string>
+    <string name="setup_wizard_title">Oppsettsveiviser</string>
+    <string name="setup_wizard_advanced_user">Avansert bruker</string>
+    <string name="setup_wizard_next">Neste</string>
+    <string name="setup_wizard_finish">Fullfør</string>
+    <string name="setup_wizard_download_and_install">Last ned + installer</string>
+    <string name="setup_wizard_open_drivers">Åpne drivere</string>
+    <string name="setup_wizard_ready">Klar</string>
+    <string name="setup_wizard_download_and_create">Last ned + opprett</string>
+    <string name="setup_wizard_configured">Konfigurert</string>
+    <string name="setup_wizard_downloading">Laster ned %1$s</string>
+    <string name="setup_wizard_installing_package">Installerer %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">Ingen Wine- eller Proton-pakker installert ennå.</string>
+    <string name="setup_wizard_no_runtime_hint">Installer en Wine- eller Proton-pakke fra forrige trinn, eller hopp over dette for nå.</string>
+    <string name="setup_wizard_recommended_label">Anbefalt</string>
+    <string name="setup_wizard_install_all_recommended">Installer alle anbefalte</string>
+    <string name="setup_wizard_create_container">Opprett container</string>
+    <string name="setup_wizard_creating_container">Oppretter…</string>
+
+    <string name="input_controls_tap_to_click">Trykk for å klikke</string>
+    <string name="input_controls_reverse_binding_order">Omvendt rekkefølge for bindinger</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Autorisasjon</string>
+    <string name="steam_login_sign_in_to_your_account">Logg inn på kontoen din</string>
+    <string name="steam_login_username">Brukernavn</string>
+    <string name="steam_login_password">Passord</string>
+    <string name="steam_login_invalid_username_or_password">Ugyldig brukernavn eller passord</string>
+    <string name="steam_login_remember_me">Husk meg</string>
+    <string name="steam_login_sign_in_with_qr_code">Logg inn med QR-kode</string>
+    <string name="steam_login_open_steam_app_qr_hint">Åpne Steam-appen → trykk på QR-ikonet</string>
+    <string name="steam_login_failed_to_load_qr_code">Kunne ikke laste QR-kode</string>
+    <string name="steam_login_retry">Prøv igjen</string>
+    <string name="steam_login_generating_code">Genererer kode…</string>
+    <string name="steam_login_two_factor_auth">Tofaktorautentisering</string>
+    <string name="steam_login_approve_login_steam_app">Godkjenn denne innloggingen fra\nSteam-mobilappen din</string>
+    <string name="steam_login_enter_code_sent_to">Skriv inn koden sendt til\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">Skriv inn Steam Guard-koden din</string>
+    <string name="steam_login_code">Kode</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Skysynkronisering</string>
+    <string name="google_cloud_sync_started">Skysynkronisering startet.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Google-tjenester</string>
+    <string name="google_auto_signin_title">Logg inn på Google ved oppstart</string>
+    <string name="google_auto_signin_summary">Koble automatisk til Google Play Games når appen starter, slik at lagringssikkerhetskopier og synkronisering alltid er klare. Når den er av, logger appen aldri inn på egen hånd.</string>
+    <string name="google_auto_signin_section">Ved oppstart</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">Synkroniserer</string>
+    <string name="google_cloud_status_connected">Tilkoblet</string>
+    <string name="google_cloud_status_not_signed_in">Ikke innlogget</string>
+    <string name="google_cloud_working">Arbeider…</string>
+    <string name="google_cloud_sign_in">Logg inn</string>
+    <string name="google_cloud_disable_sync">Deaktiver synkronisering</string>
+    <string name="google_cloud_store_logins">Butikkinnlogginger</string>
+    <string name="google_cloud_store_login_sync_busy">Arbeider med synkronisering av butikkinnloggingene dine…</string>
+    <string name="google_cloud_saved_games_unavailable">Google Lagrede spill utilgjengelig</string>
+    <string name="google_cloud_snapshot_ready">Skyøyeblikksbilde klart</string>
+    <string name="google_cloud_waiting_first_backup">Venter på første sikkerhetskopi</string>
+    <string name="google_cloud_no_store_logins_detected">Ingen butikkinnlogginger oppdaget</string>
+    <string name="google_cloud_last_synced">Sist synkronisert %1$s</string>
+    <string name="google_cloud_backup">Sikkerhetskopier</string>
+    <string name="google_cloud_restore">Gjenopprett</string>
+    <string name="google_cloud_sign_in_to_sync">Logg inn på Google Play Games for å synkronisere butikkinnlogginger.</string>
+    <string name="google_cloud_sign_in_failed">Innlogging på Google Play Games mislyktes.</string>
+    <string name="google_cloud_sign_in_finishing">Innlogging på Google Play Games fullføres fortsatt. Vent et øyeblikk og prøv skysynkronisering igjen.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games tilkoblet. Gjenoppretting er tilgjengelig for %1$s.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games tilkoblet. Trykk Sikkerhetskopier for å lagre %1$s innlogginger.</string>
+    <string name="google_cloud_connected_ready">Google Play Games tilkoblet. Sikkerhetskopiering og gjenoppretting er klare.</string>
+    <string name="google_cloud_sync_disabled">Google Play Games-synkronisering deaktivert for denne appen.</string>
+    <string name="google_cloud_sign_in_first">Logg inn på Google Play Games først.</string>
+    <string name="google_cloud_no_saved_logins_found">Ingen lagrede butikkinnlogginger ble funnet i Google-skysynkronisering.</string>
+    <string name="google_cloud_backup_already_matches">Skysikkerhetskopien samsvarer allerede med de gjeldende butikkinnloggingene.</string>
+    <string name="google_cloud_no_local_logins">Ingen lokale butikkinnlogginger er tilgjengelige for sikkerhetskopiering.</string>
+    <string name="google_cloud_logins_restored_and_synced">Butikkinnlogginger gjenopprettet og synkronisert for %1$s.</string>
+    <string name="google_cloud_logins_restored">Gjenopprettet butikkinnlogginger for %1$s.</string>
+    <string name="google_cloud_logins_backed_up">Sikkerhetskopierte butikkinnlogginger for %1$s.</string>
+    <string name="google_cloud_sync_ready">Synkronisering av butikkinnlogging er klar.</string>
+    <string name="google_cloud_no_logins_to_sync">Ingen butikkinnlogginger tilgjengelige for synkronisering ennå.</string>
+    <string name="google_cloud_sign_in_to_backup">Logg inn for å sikkerhetskopiere %1$s-innloggingstokener.</string>
+    <string name="google_cloud_no_backed_up_logins">Ingen sikkerhetskopierte butikkinnlogginger funnet ennå.</string>
+    <string name="google_cloud_local_cloud_differ">Lokale og sky-baserte butikkinnlogginger er ulike. Bruk Sikkerhetskopier for å overskrive skydata, eller Gjenopprett for å hente de lagrede tokenene.</string>
+    <string name="google_cloud_local_ready_to_backup">Lokale butikkinnlogginger er klare til å sikkerhetskopieres for %1$s.</string>
+    <string name="google_cloud_backup_ready">Sikkerhetskopi av butikkinnlogging er klar.</string>
+    <string name="google_cloud_restore_available">Gjenoppretting av skyinnlogging er tilgjengelig for %1$s.</string>
+    <string name="google_cloud_logins_synced">Butikkinnlogginger er synkronisert med Google Play Games.</string>
+    <string name="google_cloud_sync_problem">Synkronisering av butikkinnlogging støtte på et problem.</string>
+    <string name="google_cloud_error_auth_needed">Google Play Games må fullføre autentiseringen før skysynkronisering kan få tilgang til Lagrede spill. Åpne Play Games-profilforespørselen hvis den vises, og prøv igjen.</string>
+    <string name="google_cloud_error_developer">Google Play Games Lagrede spill avviste denne appversjonen. Kontroller Play Games-app-ID-en, koblet pakkenavn og signeringssertifikat i Play Console.</string>
+    <string name="google_cloud_error_build_rejected">Google-kontoen er tilkoblet, men Google Play Games Lagrede spill avviste denne appversjonen. Kontroller Play Games-app-ID-en, koblet pakke og signeringssertifikat.</string>
+    <string name="google_cloud_error_network">Google skysynkronisering mislyktes fordi nettverksforespørselen ikke ble fullført, eller Google Play-tjenester trenger tilsyn.</string>
+    <string name="google_cloud_error_no_snapshot">Ingen lagrede butikkinnlogginger ble funnet i Google skysynkronisering ennå.</string>
+    <string name="google_cloud_error_generic">Google skysynkronisering mislyktes: %1$s</string>
+    <string name="google_cloud_error_before_open">Google skysynkronisering mislyktes før Google Lagrede spill kunne åpnes.</string>
+    <string name="cloud_saves_title">Skylagringer</string>
+    <string name="cloud_saves_title_for_provider">%1$s Skylagringer - %2$s</string>
+    <string name="cloud_saves_sync_summary">Hent versjonen %1$s har akkurat nå.</string>
+    <string name="cloud_saves_sync_summary_generic">Hent gjeldende skyversjon.</string>
+    <string name="cloud_saves_no_backups">Ingen sikkerhetskopier ennå for dette spillet.</string>
+    <string name="cloud_sync_title">Skylagringer</string>
+    <string name="cloud_sync_disable_title">Deaktiver skylagringer</string>
+    <string name="cloud_saves_steam_push_label">Send til Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Tvangsopplast lokal lagring</string>
+    <string name="cloud_saves_steam_push_success">Lagring sendt til Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Kunne ikke sende lagring til Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud er utilgjengelig akkurat nå. Kobler til igjen i bakgrunnen – trykk på oppdater når du er tilbake på nett.</string>
+    <string name="steam_session_refused_event">Steam avviste den bufrede økten (EResult=%1$d). Logg inn på nytt.</string>
+    <string name="cloud_sync_enabled_summary">Last ned ved oppstart, send ved avslutning.</string>
+    <string name="cloud_sync_disabled_summary">Start uten nedlasting av skylagring eller synkronisering ved avslutning.</string>
+    <string name="cloud_saves_offline_mode">Deaktiver skysynkronisering</string>
+    <string name="cloud_saves_offline_mode_summary">Stopper all automatisk skyaktivitet for dette spillet.</string>
+    <string name="cloud_saves_backing_up">Sikkerhetskopierer skylagring…</string>
+    <string name="cloud_saves_restoring">Gjenoppretter skylagring…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">Synkroniser fra %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_generic">Synkroniser fra skyen</string>
+    <string name="cloud_saves_syncing_from_provider">Laster ned lagring fra %1$s…</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s-skylagring lastet ned.</string>
+    <string name="cloud_saves_sync_from_provider_failed">Kunne ikke laste ned lagring fra %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Administrer GOG-skylagringer</string>
+    <string name="cloud_saves_gog_manage_helper">Åpner det offisielle GOG-nettstedet</string>
+    <string name="cloud_saves_gog_manage_no_browser">Ingen nettleser tilgjengelig for å åpne GOG-skylagringssiden</string>
+    <string name="cloud_saves_gog_zip_label">Last ned GOG-sky-zip</string>
+    <string name="cloud_saves_gog_zip_helper">Lagre gjeldende skyfiler</string>
+    <string name="cloud_saves_gog_zip_success">GOG-skylagringer-zip lagret.</string>
+    <string name="cloud_saves_gog_zip_failed">Kunne ikke lagre GOG-skylagringer-zip.</string>
+    <string name="cloud_saves_gog_zip_empty">Ingen GOG-skylagringsfiler funnet.</string>
+    <string name="cloud_saves_google_backup_label">Sikkerhetskopier til Google</string>
+    <string name="cloud_saves_google_backup_helper">Lagre en kopi til Google Play Games</string>
+    <string name="cloud_saves_google_backup_no_save">Ingen lagringsfiler funnet å sikkerhetskopiere.</string>
+    <string name="cloud_saves_history_title">Lagringshistorikk</string>
+    <string name="cloud_saves_history_empty">Ingen tidligere lagringer sikkerhetskopiert ennå. Erstattede lagringer og manuelle sikkerhetskopier vises her i 30 dager.</string>
+    <string name="cloud_saves_history_loading">Laster lagringshistorikk…</string>
+    <string name="cloud_saves_history_sign_in">Logg inn på Google for å se lagringshistorikken din.</string>
+    <string name="cloud_saves_history_origin_local">lokal</string>
+    <string name="cloud_saves_history_origin_cloud">sky</string>
+    <string name="cloud_saves_history_origin_manual">manuell</string>
+    <string name="cloud_saves_history_origin_auto">automatisk</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Gjenopprett</string>
+    <string name="cloud_saves_history_download">Last ned</string>
+    <string name="cloud_saves_history_download_success">Fil lastet ned.</string>
+    <string name="cloud_saves_history_download_failed">Nedlasting mislyktes.</string>
+    <string name="cloud_saves_history_cloud_readonly">Skrivebeskyttet</string>
+    <string name="cloud_saves_history_restore_confirm_title">Gjenopprette denne sikkerhetskopien?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Dette vil erstatte din nåværende lokale lagring med sikkerhetskopien fra %1$s.</string>
+    <string name="cloud_saves_history_restore_success">Lagring gjenopprettet fra sikkerhetskopi.</string>
+    <string name="cloud_saves_history_restore_failed">Kunne ikke gjenopprette denne sikkerhetskopien.</string>
+    <string name="cloud_saves_keep_replaced_backup">Behold en sikkerhetskopi av den erstattede lagringen</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Hvis du ombestemmer deg, kan du gjenopprette den fra Lagringshistorikk.</string>
+    <string name="cloud_saves_history_refresh">Oppdater</string>
+    <string name="cloud_saves_history_rename">Gi nytt navn</string>
+    <string name="cloud_saves_history_rename_title">Gi denne sikkerhetskopien et navn</string>
+    <string name="cloud_saves_history_rename_hint">f.eks. Bosskamp, Før slutten</string>
+    <string name="cloud_saves_history_rename_save">Lagre</string>
+    <string name="cloud_saves_history_rename_clear">Tøm</string>
+    <string name="cloud_saves_history_rename_success">Sikkerhetskopi fikk nytt navn.</string>
+    <string name="cloud_saves_history_rename_failed">Kunne ikke gi sikkerhetskopien nytt navn.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Velg lagringsmappe</string>
+    <string name="cloud_saves_custom_folder_label">Lagringsmappe</string>
+    <string name="cloud_saves_custom_select_folder_summary">Pek til lagringskatalogen inne i containeren</string>
+    <string name="cloud_saves_custom_no_container">Container ikke tilgjengelig for denne snarveien</string>
+    <string name="cloud_saves_custom_picker_title">Velg lagringsmappe</string>
+    <string name="cloud_saves_custom_outside_drive_c">Valgt mappe må være på containerens C:-stasjon</string>
+    <string name="cloud_saves_custom_path_map_failed">Kunne ikke tilordne den valgte mappen til en Windows-bane.</string>
+    <string name="cloud_saves_custom_folder_set">Lagringsmappe satt til %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Synkroniser fra Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Last ned nyeste lagring</string>
+    <string name="cloud_saves_steam_sync_success">Synkronisert fra Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud-synkronisering mislyktes</string>
+    <string name="cloud_saves_steam_browse_label">Vis Steam Cloud-lagringer</string>
+    <string name="cloud_saves_steam_browse_helper">Åpne skylagring</string>
+    <string name="cloud_saves_steam_browse_no_browser">Ingen nettleser tilgjengelig for å åpne Steam-siden</string>
+    <string name="cloud_saves_steam_import_label">Importer filer</string>
+    <string name="cloud_saves_steam_import_helper">Gjenopprett nedlastede filer</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Filvelger utilgjengelig</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Dette vil laste ned Steam Clouds gjeldende lagringsfiler og overskrive de nåværende lagringsfilene.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Ugyldig app-ID</string>
+    <string name="cloud_saves_label_saved">Etikett lagret</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Lagringer</string>
+    <string name="saves_import_export_confirm_selection">Bekreft valg</string>
+    <string name="saves_import_export_select_directory">Velg lagringskatalogen din</string>
+    <string name="saves_import_export_up_directory">Opp én katalog</string>
+    <string name="saves_import_export_select_container">Målcontainer:</string>
+    <string name="saves_import_export_exported">Lagringer eksportert</string>
+    <string name="saves_import_export_exported_failed">Kunne ikke eksportere lagringer: %1$s</string>
+    <string name="saves_import_export_imported">Lagringer importert</string>
+    <string name="saves_import_export_imported_failed">Kunne ikke importere lagringer: %1$s</string>
+    <string name="saves_export_path_summary">Lagringer eksporteres til /WinNative/saves</string>
+    <string name="saves_export_success_path">Eksportert til %1$s</string>
+    <string name="saves_export_warning_title">Bruk dette kun med egendefinerte spill</string>
+    <string name="saves_export_warning_body">Eksport kan inkludere lagringer fra butikkinstallerte eller skysynkroniserte spill.</string>
+    <string name="saves_import_warning_title">Dette vil overskrive eksisterende lagringer i denne containeren</string>
+    <string name="saves_import_warning_body">Når du gjenoppretter en eldre sikkerhetskopi med flere spill, kopier eventuelle nyere lagringer inn i zip-filen med filbehandleren din først. Kun lagringer som finnes i .zip-filen påvirkes. Administrer lagringer med omhu.</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Container</string>
+    <string name="preloader_initializing">Initialiserer</string>
+    <string name="preloader_launching">Starter</string>
+    <string name="preloader_closing">Lukker %1$s</string>
+    <string name="preloader_preparing_steam_environment">Forbereder Steam-miljø</string>
+    <string name="preloader_starting_wine">Starter Wine</string>
+    <string name="preloader_starting_steam_launcher">Starter Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Laster Steam-klient</string>
+    <string name="preloader_connecting_to_steam">Kobler til Steam</string>
+    <string name="preloader_signing_in_to_steam">Logger inn på Steam</string>
+    <string name="preloader_fetching_game_info">Logget inn – henter spillinfo</string>
+    <string name="preloader_steam_ready">Steam klar</string>
+    <string name="preloader_updating_game_info">Oppdaterer spillinfo</string>
+    <string name="preloader_verifying_install">Verifiserer installasjon</string>
+    <string name="preloader_scanning_redists">Skanner redistribuerbare pakker</string>
+    <string name="preloader_installing_redist_single">Installerer redistribuerbar pakke</string>
+    <string name="preloader_installing_named_redist">Installerer %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Installerer %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuerbare pakker klare</string>
+    <string name="preloader_no_redists">Ingen redistribuerbare pakker å installere</string>
+    <string name="preloader_steam_service_running">Steam-tjeneste kjører</string>
+    <string name="preloader_launching_game">Starter %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher mislyktes – gjenoppsetter ressurser</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher kunne ikke starte. Gjenoppsetter – start på nytt</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher nådde spillet, men det startet aldri</string>
+    <string name="preloader_setup_environment">Setter opp miljø</string>
+    <string name="preloader_retrying_steam_client_download">Prøver Steam-klientnedlasting på nytt</string>
+    <string name="preloader_installing_mono">Installerer Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Installerer redistribuerbare pakker</string>
+    <string name="preloader_unpacking_exe">Pakker ut spillets kjørbare fil</string>
+    <string name="preloader_downloading_cloud">Laster ned skylagringer</string>
+    <string name="preloader_syncing_cloud">Synkroniserer skylagringer</string>
+    <string name="preloader_uploading_cloud">Laster opp skylagringer</string>
+    <string name="preloader_checking_cloud">Kontrollerer skylagringer</string>
+    <string name="preloader_cloud_sync_retry">%1$s Forsøk %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Skysynkronisering laster ned</string>
+    <string name="cloud_sync_failed_provider">%1$s-skylagringssynkronisering mislyktes.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Egendefinert spill</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Registrer ytelse til fil</string>
+    <string name="settings_hud_record_to_file_summary">Eksporterer FPS-, CPU-, GPU-, temperatur- og batterimålinger per sekund til /WinNative/logs/ under spilling.</string>
+    <string name="settings_leaderboard_category">Ytelse</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Laster Workshop-elementer</string>
+    <string name="workshop_search_items">Søk i Workshop-elementer</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Henter dine abonnerte elementer fra Steam.</string>
+    <string name="workshop_error_title">Kunne ikke laste Workshop-elementer</string>
+    <string name="workshop_error_subtitle">Noe gikk galt. Prøv igjen.</string>
+    <string name="workshop_empty_title">Ingen abonnerte Workshop-elementer</string>
+    <string name="workshop_empty_subtitle">Abonner på elementer i Steam Workshop, og åpne dette vinduet på nytt.</string>
+    <string name="workshop_search_empty_title">Ingen elementer samsvarer med \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Prøv et annet søkeord.</string>
+    <string name="workshop_clear_search">Tøm søk</string>
+    <string name="workshop_item_fallback">Workshop-element</string>
+    <string name="common_ui_failed">Mislyktes</string>
+    <string name="steam_presence_snooze">Slumre</string>
+    <string name="steam_presence_busy">Opptatt</string>
+    <string name="steam_presence_looking_to_trade">Ser etter bytte</string>
+    <string name="steam_presence_looking_to_play">Ser etter å spille</string>
+    <string name="steam_friends_count">Venner — %1$d på nett</string>
+    <string name="steam_friends_section_in_game">I spill (%1$d)</string>
+    <string name="steam_friends_section_online">På nett (%1$d)</string>
+    <string name="steam_friends_section_offline">Frakoblet (%1$d)</string>
+    <string name="steam_friends_none_loaded">Ingen venner lastet ennå.</string>
+    <string name="steam_friends_chat_off">Chatten er av. Slå på chattetjenesten igjen for å se vennene dine.</string>
+    <string name="steam_friends_self_you">Du</string>
+    <string name="steam_friends_in_game">I spill</string>
+    <string name="steam_friends_join">Bli med</string>
+    <string name="steam_friends_play">Spill</string>
+    <string name="steam_chat_image_failed">(bilde kunne ikke sendes)</string>
+    <string name="steam_chat_empty">Ingen meldinger ennå. Si hei!</string>
+    <string name="steam_chat_uploading_image">Laster opp bilde…</string>
+    <string name="steam_chat_send_image">Send bilde</string>
+    <string name="steam_chat_message_hint">Melding…</string>
+    <string name="steam_chat_send">Send</string>
+    <string name="steam_chat_image">Bilde</string>
+    <string name="steam_common_back">Tilbake</string>
+    <string name="steam_achievements_title">Prestasjoner</string>
+    <string name="steam_achievements_empty">Ingen prestasjoner funnet for dette spillet,\neller logg inn på Steam for å laste dem.</string>
+    <string name="steam_achievements_hidden">Skjult prestasjon</string>
+    <string name="steam_achievements_hidden_desc">Fortsett å spille for å avdekke denne prestasjonen.</string>
+    <string name="steam_achievements_unlocked_on">Låst opp %1$s</string>
+    <string name="steam_achievements_unlocked">Låst opp</string>
+    <string name="steam_join_joining">Blir med %1$s i %2$s…</string>
+    <string name="steam_join_install">Installer %1$s for å bli med %2$s</string>
+    <string name="steam_join_not_owned">Du eier ikke %1$s</string>
+    <string name="steam_chat_not_sent">(ikke sendt)</string>
+    <string name="steam_join_the_game">spillet</string>
+    <string name="steam_friends_settings">Innstillinger</string>
+    <string name="steam_chat_settings_title">Chatteinnstillinger</string>
+    <string name="steam_chat_setting_service">Chattetjeneste</string>
+    <string name="steam_chat_setting_service_desc">Logg inn for å se venner og chatte; slå av for å vises frakoblet</string>
+    <string name="steam_chat_setting_notifications">Chattevarsler</string>
+    <string name="steam_chat_setting_notifications_desc">Vis et varsel når du mottar en melding</string>
+    <string name="steam_chat_setting_heads">Chattehoder</string>
+    <string name="steam_chat_setting_heads_desc">Flytende bobler for å lese og svare på meldinger</string>
+    <string name="steam_chat_setting_ingame">Aktiver chat i spill</string>
+    <string name="steam_chat_setting_ingame_desc">Motta og send meldinger mens du spiller</string>
+    <string name="steam_chat_setting_stay_running">Kjør i bakgrunnen</string>
+    <string name="steam_chat_setting_stay_running_desc">Hold chatten i gang etter at du avslutter WinNative</string>
+    <string name="steam_chat_settings_overlay_needed">Tillat visning over andre apper for å bruke chattehoder</string>
+    <string name="steam_chat_heads_title">Meldinger</string>
+    <string name="steam_chat_heads_recent_title">Nylige</string>
+    <string name="steam_chat_heads_online_title">På nett</string>
+    <string name="steam_chat_heads_new_chat">Ny melding</string>
+    <string name="steam_chat_setting_autohide">Skjul automatisk</string>
+    <string name="steam_chat_setting_autohide_desc">Ton ut chattehodet etter 10 s uten aktivitet</string>
+    <string name="steam_chat_heads_friends_title">Venner</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Filer</string>
+    <string name="file_manager_copy">Kopier</string>
+    <string name="file_manager_cut">Klipp ut</string>
+    <string name="file_manager_paste">Lim inn</string>
+    <string name="file_manager_paste_here">Lim inn her</string>
+    <string name="file_manager_new_folder">Ny mappe</string>
+    <string name="file_manager_new_folder_short">Mappe</string>
+    <string name="file_manager_multi_select">Velg</string>
+    <string name="file_manager_create">Opprett</string>
+    <string name="file_manager_delete">Slett</string>
+    <string name="file_manager_copy_count">Kopier (%1$d)</string>
+    <string name="file_manager_cut_count">Klipp ut (%1$d)</string>
+    <string name="file_manager_delete_count">Slett (%1$d)</string>
+    <string name="file_manager_extract">Pakk ut</string>
+    <string name="file_manager_extract_here">Pakk ut her</string>
+    <string name="file_manager_extract_to">Pakk ut til…</string>
+    <string name="file_manager_extracting">Pakker ut %1$s</string>
+    <string name="file_manager_extract_failed">Utpakking mislyktes</string>
+    <string name="file_manager_run_boot">Kjør / Boot</string>
+    <string name="file_manager_create_shortcut">Opprett snarvei</string>
+    <string name="file_manager_run_in_container">Kjør i container</string>
+    <string name="file_manager_no_containers">Ingen containere tilgjengelig</string>
+    <string name="file_manager_delete_confirm">Slette \"%1$s\"? Dette kan ikke angres.</string>
+    <string name="file_manager_delete_confirm_multi">Slette %1$d elementer? Dette kan ikke angres.</string>
+    <string name="file_manager_copying">Kopierer %1$s</string>
+    <string name="file_manager_moving">Flytter %1$s</string>
+    <string name="file_manager_copying_count">Kopierer %1$d elementer</string>
+    <string name="file_manager_moving_count">Flytter %1$d elementer</string>
+    <string name="file_manager_paste_into_itself">Kan ikke lime inn en mappe i seg selv</string>
+    <string name="file_manager_operation_failed">Operasjonen mislyktes</string>
+    <string name="file_manager_delete_failed">Sletting mislyktes</string>
+    <string name="file_manager_rename_failed">Endring av navn mislyktes</string>
+    <string name="file_manager_create_folder_failed">Oppretting av mappe mislyktes</string>
+
+    <string name="settings_content_refresh">Oppdater</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Overfør lagret spill</string>
+    <string name="retro_save_transfer_message">Importer et lokalt lagret spill til dette spillet, eller eksporter det gjeldende lagrede spillet.</string>
+    <string name="retro_save_transfer_import">Importer lagret spill</string>
+    <string name="retro_save_transfer_export">Eksporter lagret spill</string>
+    <string name="retro_save_transfer_import_ok">Lagret spill importert</string>
+    <string name="retro_save_transfer_import_failed">Kunne ikke importere lagret spill</string>
+    <string name="retro_save_transfer_export_ok">Lagret spill eksportert</string>
+    <string name="retro_save_transfer_export_failed">Kunne ikke eksportere lagret spill</string>
+    <string name="retro_save_transfer_none">Det finnes ennå ingen lagring for dette spillet</string>
+    <string name="retro_cheats_title">Juksekoder</string>
+    <string name="retro_cheats_hardcore_blocked">Juksekoder er deaktivert i Hardcore-modus</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Lagre</string>
+    <string name="retro_ps2_cancel">Avbryt</string>
+    <string name="retro_ps2_save_state">Lagre tilstand</string>
+    <string name="retro_ps2_load_save_state">Last inn lagret tilstand</string>
+    <string name="retro_ps2_achievements">Prestasjoner</string>
+    <string name="retro_ps2_cheats">Juksekoder</string>
+    <string name="retro_ps2_memory_cards">Memory Cards</string>
+    <string name="retro_ps2_fast_forward">Spol fremover</string>
+    <string name="retro_ps2_reset">Tilbakestill</string>
+    <string name="retro_ps2_swap_disc">Bytt disk</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Trykk for å laste inn</string>
+    <string name="retro_ps2_slot_empty">Tom</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Trykk for å overskrive</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Tom – trykk for å lagre</string>
+    <string name="retro_ps2_slot_is_empty">Slot %1$d er tom</string>
+    <string name="retro_ps2_loaded_slot">Lastet inn slot %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Kunne ikke laste inn slot %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Lagret i slot %1$d</string>
+    <string name="retro_ps2_save_failed">Lagring mislyktes</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Trykk for å bruke</string>
+    <string name="retro_ps2_new_memory_card">Nytt Memory Card</string>
+    <string name="retro_ps2_import_card">Importer kort</string>
+    <string name="retro_ps2_enable_online_dev9">Aktiver online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2-nettverksadapter – starter spillet på nytt for å koble den til</string>
+    <string name="retro_ps2_ethernet_device">Ethernet-enhet</string>
+    <string name="retro_ps2_dns_mode">DNS-modus</string>
+    <string name="retro_ps2_primary_dns">Primær DNS</string>
+    <string name="retro_ps2_secondary_dns">Sekundær DNS</string>
+    <string name="retro_ps2_optional">valgfritt</string>
+    <string name="retro_ps2_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">trykk for å angi IP (tom fjerner)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Legg til serververt</string>
+    <string name="retro_ps2_new_server_hostname">Nytt serververtsnavn</string>
+    <string name="retro_ps2_server_hostname_hint">f.eks. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Skjermkontroller</string>
+    <string name="retro_ps2_edit_layout">Rediger oppsett</string>
+    <string name="retro_ps2_reset_layout">Tilbakestill oppsett</string>
+    <string name="retro_ps2_layout_reset">Oppsett tilbakestilt</string>
+    <string name="retro_ps2_left_stick_invert_x">Venstre spak: Inverter X</string>
+    <string name="retro_ps2_left_stick_invert_y">Venstre spak: Inverter Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Høyre spak: Inverter X</string>
+    <string name="retro_ps2_right_stick_invert_y">Høyre spak: Inverter Y</string>
+    <string name="retro_ps2_button_color">Knappfarge</string>
+    <string name="retro_ps2_letter_color">Bokstavfarge</string>
+    <string name="retro_ps2_shadow_color">Skyggefarge</string>
+    <string name="retro_ps2_background_color">Bakgrunnsfarge</string>
+    <string name="retro_ps2_reset_colors">Tilbakestill farger</string>
+    <string name="retro_ps2_renderer">Renderer</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Oppløsningsskala</string>
+    <string name="retro_ps2_scale_1x_native">1x (Native)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Bildeformat</string>
+    <string name="retro_ps2_aspect_stretch">Strekk</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Skjermfilter</string>
+    <string name="retro_ps2_filter_nearest">Nærmeste</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilineær (Myk)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilineær (Skarp)</string>
+    <string name="retro_ps2_texture_filter">Teksturfilter</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilineær (Tvunget)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilineær (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilineær (Sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Blandingsnøyaktighet</string>
+    <string name="retro_ps2_blend_minimum">Minimum</string>
+    <string name="retro_ps2_blend_basic">Grunnleggende</string>
+    <string name="retro_ps2_blend_medium">Middels</string>
+    <string name="retro_ps2_blend_high">Høy</string>
+    <string name="retro_ps2_blend_full">Full</string>
+    <string name="retro_ps2_blend_maximum">Maksimum</string>
+    <string name="retro_ps2_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_ps2_shader_off">Av</string>
+    <string name="retro_ps2_shader_scanline">Scanline</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Wave</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Frame Skip</string>
+    <string name="retro_ps2_frameskip_off">Av</string>
+    <string name="retro_ps2_frameskip_1">Hopp over 1</string>
+    <string name="retro_ps2_frameskip_2">Hopp over 2</string>
+    <string name="retro_ps2_frameskip_3">Hopp over 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volum</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Demp</string>
+    <string name="retro_ps2_swap_stereo_channels">Bytt stereokanaler</string>
+    <string name="retro_ps2_ee_cycle_rate">EE-syklusrate</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (Standard)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE-syklushopp</string>
+    <string name="retro_ps2_skip_off">Av</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Rask CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emuleringshastighet</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU-bruk</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU-bruk</string>
+    <string name="retro_ps2_hud_internal_resolution">Intern oppløsning</string>
+    <string name="retro_ps2_deinterlace_mode">Deinterlace-modus</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Av</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV-bildeformat</string>
+    <string name="retro_ps2_anti_blur">Anti-uskarphet</string>
+    <string name="retro_ps2_widescreen_patches">Widescreen-patcher</string>
+    <string name="retro_ps2_no_interlace_patches">No-interlace-patcher</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC-spinngjenkjenning</string>
+    <string name="retro_ps2_wait_loop">Venteløkke-gjenkjenning</string>
+    <string name="retro_ps2_time_stretch">Lyd-timestretch</string>
+    <string name="retro_ps2_audio_buffer">Lydbuffer</string>
+    <string name="retro_ps2_audio_latency">Utgangslatens</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Frametider</string>
+    <string name="retro_ps2_hud_gs_stats">GS-statistikk</string>
+    <string name="retro_ps2_hud_hw_info">Maskinvareinfo</string>
+    <string name="retro_ps2_hud_version">Versjon</string>
+    <string name="retro_ps2_hud_input_display">Inndatavisning</string>
+    <string name="retro_ps2_tab_menu">Meny</string>
+    <string name="retro_ps2_tab_display">Skjerm</string>
+    <string name="retro_ps2_tab_performance">Ytelse</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Lyd</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Kontroller</string>
+    <string name="retro_ps2_resume">Fortsett</string>
+    <string name="retro_ps2_pause">Pause</string>
+    <string name="retro_ps2_exit">Avslutt</string>
+    <string name="retro_lr_bios_imported">BIOS importert: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Ugyldig BIOS-fil</string>
+    <string name="retro_lr_invalid_retro_game">Ugyldig retrospill</string>
+    <string name="retro_lr_rom_not_found">ROM ikke funnet: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Kunne ikke lese ROM-en i dette arkivet</string>
+    <string name="retro_lr_core_not_installed">Kjerne ikke installert: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Juksekoder aktivert – prestasjoner er deaktivert for denne økten</string>
+    <string name="retro_lr_cloud_save_restored">Sky-lagring gjenopprettet</string>
+    <string name="retro_lr_restore_failed">Gjenoppretting mislyktes</string>
+    <string name="retro_lr_cloud_conflict_message">Det finnes en nyere sky-lagring for %1$s. Vil du synkronisere, og hvilken sky-lagring foretrekker du å beholde?</string>
+    <string name="retro_lr_cloud_save">Sky-lagring</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Kunne ikke laste inn emulatorkjernen</string>
+    <string name="retro_lr_failed_load_rom">Kunne ikke laste inn ROM</string>
+    <string name="retro_lr_graphics_not_supported">Grafikk støttes ikke for denne kjernen</string>
+    <string name="retro_lr_emulator_error">Emulatorfeil</string>
+    <string name="retro_lr_shader_default">Standard</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Skarp</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR-oppskalering</string>
+    <string name="retro_lr_upscale_native">Native</string>
+    <string name="retro_lr_sound">Lyd</string>
+    <string name="retro_lr_left_stick_invert_x">Venstre spak: Inverter X</string>
+    <string name="retro_lr_left_stick_invert_y">Venstre spak: Inverter Y</string>
+    <string name="retro_lr_right_stick_invert_x">Høyre spak: Inverter X</string>
+    <string name="retro_lr_right_stick_invert_y">Høyre spak: Inverter Y</string>
+    <string name="retro_lr_on_screen_controls">Skjermkontroller</string>
+    <string name="retro_lr_haptic_feedback">Haptisk tilbakemelding</string>
+    <string name="retro_lr_portrait">Stående</string>
+    <string name="retro_lr_landscape">Liggende</string>
+    <string name="retro_lr_edit_layout">Rediger oppsett (%1$s)</string>
+    <string name="retro_lr_reset_layout">Tilbakestill %1$s-oppsett</string>
+    <string name="retro_lr_layout_reset">%1$s-oppsett tilbakestilt</string>
+    <string name="retro_lr_button_color">Knappfarge</string>
+    <string name="retro_lr_letter_color">Bokstavfarge</string>
+    <string name="retro_lr_shadow_color">Skyggefarge</string>
+    <string name="retro_lr_background_color">Bakgrunnsfarge</string>
+    <string name="retro_lr_reset_colors">Tilbakestill farger</string>
+    <string name="retro_lr_colors_reset">Farger tilbakestilt</string>
+    <string name="retro_lr_performance_hud">Ytelse-HUD</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Bakgrunnsalfa</string>
+    <string name="retro_lr_background">Bakgrunn</string>
+    <string name="retro_lr_scale">Skala</string>
+    <string name="retro_lr_numeric_frametime">Numerisk frametid</string>
+    <string name="retro_lr_dual_series_battery">Dual-serie batteri</string>
+    <string name="retro_lr_hud_elements">HUD-ELEMENTER</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsoll</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batteri</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Graf</string>
+    <string name="retro_lr_hud_cpu_temp">CPU-temp.</string>
+    <string name="retro_lr_save_state">Lagre tilstand</string>
+    <string name="retro_lr_load_save_state">Last inn lagret tilstand</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Innlasting av tilstander er deaktivert i Hardcore-modus</string>
+    <string name="retro_lr_achievements">Prestasjoner</string>
+    <string name="retro_lr_cheats">Juksekoder</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Juksekoder er deaktivert i Hardcore-modus</string>
+    <string name="retro_lr_reset">Tilbakestill</string>
+    <string name="retro_lr_fast_forward">Spol fremover</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Spoling fremover er deaktivert i Hardcore-modus</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disk %1$d/%2$d</string>
+    <string name="retro_lr_resume">Fortsett</string>
+    <string name="retro_lr_pause">Pause</string>
+    <string name="retro_lr_exit">Avslutt</string>
+    <string name="retro_lr_saved_to_slot">Lagret i slot %1$d</string>
+    <string name="retro_lr_could_not_save_state">Kunne ikke lagre tilstand</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS kreves</string>
+    <string name="retro_lr_bios_required_message">PlayStation-spill trenger en ekte konsoll-BIOS-fil som du selv må oppgi. Importer en BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin eller scph7001.bin) for å fortsette.</string>
+    <string name="retro_lr_import_bios">Importer BIOS…</string>
+    <string name="retro_lr_cancel">Avbryt</string>
+    <string name="retro_lr_slot_empty">Slot %1$d er tom</string>
+    <string name="retro_lr_loaded_slot">Lastet inn slot %1$d</string>
+    <string name="retro_lr_could_not_load_state">Kunne ikke laste inn tilstand</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Gi nytt navn til slot %1$d</string>
+    <string name="retro_gs_section_general">Generelt</string>
+    <string name="retro_gs_section_graphics">Grafikk</string>
+    <string name="retro_gs_section_performance">Ytelse</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Inndata</string>
+    <string name="retro_gs_section_audio">Lyd</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Avbryt</string>
+    <string name="retro_gs_save">Lagre</string>
+    <string name="retro_gs_shader_default">Standard</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Skarp</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Native</string>
+    <string name="retro_gs_group_game">SPILL</string>
+    <string name="retro_gs_label_name">Navn</string>
+    <string name="retro_gs_label_system">System</string>
+    <string name="retro_gs_label_emulator_core">Emulatorkjerne</string>
+    <string name="retro_gs_label_rom_path">ROM-bane</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">Installert</string>
+    <string name="retro_gs_bios_none">Ingen – kreves for å kjøre %1$s-spill</string>
+    <string name="retro_gs_import_bios">Importer BIOS…</string>
+    <string name="retro_gs_remove_bios">Fjern BIOS</string>
+    <string name="retro_gs_group_library_artwork">BIBLIOTEKSGRAFIKK</string>
+    <string name="retro_gs_artwork_game_card">Spillkortbilde</string>
+    <string name="retro_gs_artwork_grid">Rutenettbilde</string>
+    <string name="retro_gs_artwork_carousel">Karusellbilde</string>
+    <string name="retro_gs_artwork_list">Listebilde</string>
+    <string name="retro_gs_artwork_custom_set">Egendefinert bilde angitt</string>
+    <string name="retro_gs_artwork_set_image">Angi bilde</string>
+    <string name="retro_gs_artwork_remove">Fjern</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Videofilter</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR-oppskalering</string>
+    <string name="retro_gs_performance_hud">Ytelse-HUD</string>
+    <string name="retro_gs_group_core">KJERNE</string>
+    <string name="retro_gs_renderer">Renderer</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Oppløsningsskala</string>
+    <string name="retro_gs_scale_1x_native">1x (Native)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Bildeformat</string>
+    <string name="retro_gs_aspect_stretch">Strekk</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Skjermfilter</string>
+    <string name="retro_gs_filter_nearest">Nærmeste</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilineær (Myk)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilineær (Skarp)</string>
+    <string name="retro_gs_texture_filter">Teksturfilter</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilineær (Tvunget)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilineær (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilineær (Sprites)</string>
+    <string name="retro_gs_blending_accuracy">Blandingsnøyaktighet</string>
+    <string name="retro_gs_blend_minimum">Minimum</string>
+    <string name="retro_gs_blend_basic">Grunnleggende</string>
+    <string name="retro_gs_blend_medium">Middels</string>
+    <string name="retro_gs_blend_high">Høy</string>
+    <string name="retro_gs_blend_full">Full</string>
+    <string name="retro_gs_blend_maximum">Maksimum</string>
+    <string name="retro_gs_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_gs_off">Av</string>
+    <string name="retro_gs_tvshader_scanline">Scanline</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Wave</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Frame Skip</string>
+    <string name="retro_gs_frameskip_1">Hopp over 1</string>
+    <string name="retro_gs_frameskip_2">Hopp over 2</string>
+    <string name="retro_gs_frameskip_3">Hopp over 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">YTELSE</string>
+    <string name="retro_gs_ee_cycle_rate">EE-syklusrate</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (Standard)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE-syklushopp</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Rask CDVD</string>
+    <string name="retro_gs_group_performance_hud">YTELSE-HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emuleringshastighet</string>
+    <string name="retro_gs_hud_cpu_usage">CPU-bruk</string>
+    <string name="retro_gs_hud_gpu_usage">GPU-bruk</string>
+    <string name="retro_gs_hud_internal_resolution">Intern oppløsning</string>
+    <string name="retro_gs_deinterlace_mode">Deinterlace-modus</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Av</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV-bildeformat</string>
+    <string name="retro_gs_anti_blur">Anti-uskarphet</string>
+    <string name="retro_gs_widescreen_patches">Widescreen-patcher</string>
+    <string name="retro_gs_no_interlace_patches">No-interlace-patcher</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC-spinngjenkjenning</string>
+    <string name="retro_gs_wait_loop">Venteløkke-gjenkjenning</string>
+    <string name="retro_gs_time_stretch">Lyd-timestretch</string>
+    <string name="retro_gs_audio_buffer">Lydbuffer</string>
+    <string name="retro_gs_audio_latency">Utgangslatens</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Frametider</string>
+    <string name="retro_gs_hud_gs_stats">GS-statistikk</string>
+    <string name="retro_gs_hud_hw_info">Maskinvareinfo</string>
+    <string name="retro_gs_hud_version">Versjon</string>
+    <string name="retro_gs_hud_input_display">Inndatavisning</string>
+    <string name="retro_gs_fast_boot">Hurtigoppstart</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Aktiver online</string>
+    <string name="retro_gs_ethernet_device">Ethernet-enhet</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS-modus</string>
+    <string name="retro_gs_dns_manual">Manuell</string>
+    <string name="retro_gs_dns_internal">Intern</string>
+    <string name="retro_gs_primary_dns">Primær DNS</string>
+    <string name="retro_gs_secondary_dns">Sekundær DNS</string>
+    <string name="retro_gs_dns_optional">valgfritt</string>
+    <string name="retro_gs_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_gs_group_input">INNDATA</string>
+    <string name="retro_engine_save">Lagre</string>
+    <string name="retro_engine_saved">Spill lagret</string>
+    <string name="retro_engine_loading">Laster…</string>
+    <string name="retro_engine_load">Last inn</string>
+    <string name="retro_engine_saved_to">Lagret til %1$s</string>
+    <string name="retro_engine_slot_active_only">Aktiv</string>
+    <string name="retro_engine_rename_slot">Gi nytt navn til lagringsplass</string>
+    <string name="retro_engine_caught">%1$d fanget</string>
+    <string name="retro_engine_no_slots">Ingen lagringsplasser ennå</string>
+    <string name="retro_engine_new_slot">Ny lagringsplass</string>
+    <string name="retro_engine_achievements_unavailable">Spores ikke i 3D-modus</string>
+    <string name="retro_engine_fullscreen">Fullskjerm</string>
+    <string name="retro_engine_loaded_from">Lastet inn %1$s</string>
+    <string name="retro_engine_slot_empty">Den plassen er tom</string>
+    <string name="retro_engine_loading_subtitle">Forbereder spilldata for første gang</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Spill dette spillet i 3D-voxelmotoren i stedet for standardkjernen</string>
+    <string name="retro_gs_on_screen_controls">Skjermkontroller</string>
+    <string name="retro_gs_haptic_feedback">Haptisk tilbakemelding</string>
+    <string name="retro_gs_group_audio">LYD</string>
+    <string name="retro_gs_volume">Volum</string>
+    <string name="retro_gs_mute">Demp</string>
+    <string name="retro_gs_swap_stereo">Bytt stereokanaler</string>
+    <string name="retro_gs_sound">Lyd</string>
+    <string name="retro_scr_retro_defaults">RETRO-STANDARDER</string>
+    <string name="retro_scr_retro_defaults_desc">Standarder som brukes på hver konsolls spill med mindre de overstyres i et spills egne innstillinger.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Konto</string>
+    <string name="retro_scr_signed_in">Logget inn</string>
+    <string name="retro_scr_not_signed_in_hint">Ikke logget inn – åpne et spills prestasjoner for å logge inn</string>
+    <string name="retro_scr_achievements_enabled">Prestasjoner aktivert</string>
+    <string name="retro_scr_hardcore_default">Hardcore-modus som standard (ingen lagrede tilstander)</string>
+    <string name="retro_scr_sign_out">Logg ut</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">Installert</string>
+    <string name="retro_scr_none_ps1_bios">Ingen – PS1-spill krever en BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importer PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS fjernet</string>
+    <string name="retro_scr_no_bios_to_remove">Ingen BIOS å fjerne</string>
+    <string name="retro_scr_remove_ps1_bios">Fjern PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">Ingen – PS2-spill krever en BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Sammenslått enkeltfil-dump (regionsmerket .bin, ~4 MB). Delte ROM0/MEC/NVM-sett godtas ikke.</string>
+    <string name="retro_scr_import_ps2_bios">Importer PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS fjernet</string>
+    <string name="retro_scr_remove_ps2_bios">Fjern PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">BIBLIOTEKSGRAFIKK</string>
+    <string name="retro_scr_retro_case_art">Retro coverart (kassett / CD-cover)</string>
+    <string name="retro_scr_box_art">Coverart</string>
+    <string name="retro_scr_box_art_desc">Hentes automatisk fra thumbnails.libretro.com ved import; et egendefinert bilde overstyrer det alltid.</string>
+    <string name="retro_scr_roms_folder">ROMS-MAPPE</string>
+    <string name="retro_scr_folder">Mappe</string>
+    <string name="retro_scr_roms_not_set">Ikke angitt – velg en mappe for å importere spill automatisk</string>
+    <string name="retro_scr_auto_import">Auto-import</string>
+    <string name="retro_scr_auto_import_desc">Nye spill i denne mappen legges automatisk til i biblioteket ditt med riktig konsoll gjenkjent.</string>
+    <string name="retro_scr_select_roms_folder_title">Velg ROM-mappe</string>
+    <string name="retro_scr_select_roms_folder_button">Velg ROM-mappe…</string>
+    <string name="retro_scr_change_roms_folder_button">Endre ROM-mappe…</string>
+    <string name="retro_scr_scan_now">Skann nå</string>
+    <string name="retro_scr_console_defaults">KONSOLL-STANDARDER</string>
+    <string name="retro_scr_console_defaults_desc">Trykk på en konsoll for å angi standardinnstillingene.</string>
+    <string name="retro_scr_renderer">Renderer</string>
+    <string name="retro_scr_upscale_resolution">Oppskaler oppløsning</string>
+    <string name="retro_scr_aspect_ratio">Bildeformat</string>
+    <string name="retro_scr_aspect_stretch">Strekk</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Skjermfilter</string>
+    <string name="retro_scr_filter_nearest">Nærmeste</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilineær (Myk)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilineær (Skarp)</string>
+    <string name="retro_scr_texture_filter">Teksturfilter</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilineær (Tvunget)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilineær (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilineær (Sprites)</string>
+    <string name="retro_scr_blending_accuracy">Blandingsnøyaktighet</string>
+    <string name="retro_scr_blend_minimum">Minimum</string>
+    <string name="retro_scr_blend_basic">Grunnleggende</string>
+    <string name="retro_scr_blend_medium">Middels</string>
+    <string name="retro_scr_blend_high">Høy</string>
+    <string name="retro_scr_blend_full">Full</string>
+    <string name="retro_scr_blend_maximum">Maksimum</string>
+    <string name="retro_scr_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_scr_shader_off">Av</string>
+    <string name="retro_scr_shader_scanline">Scanline</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Wave</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Frame Skip</string>
+    <string name="retro_scr_skip_1">Hopp over 1</string>
+    <string name="retro_scr_skip_2">Hopp over 2</string>
+    <string name="retro_scr_skip_3">Hopp over 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">EE-syklusrate</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (Standard)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE-syklushopp</string>
+    <string name="retro_scr_skip_off">Av</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Rask CDVD</string>
+    <string name="retro_scr_touch_controls">Berøringskontroller på skjermen</string>
+    <string name="retro_scr_sound">Lyd</string>
+    <string name="retro_scr_swap_stereo">Bytt stereokanaler</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: Emuleringshastighet</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU-bruk</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU-bruk</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: Intern oppløsning</string>
+    <string name="retro_scr_enable_online_dev9">Aktiver online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet-enhet</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS-modus</string>
+    <string name="retro_scr_dns_manual">Manuell</string>
+    <string name="retro_scr_dns_internal">Intern</string>
+    <string name="retro_scr_primary_dns">Primær DNS</string>
+    <string name="retro_scr_secondary_dns">Sekundær DNS</string>
+    <string name="retro_scr_optional">valgfritt</string>
+    <string name="retro_scr_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR-oppskalering</string>
+    <string name="retro_scr_performance_hud">Ytelse-HUD</string>
+    <string name="retro_scr_credits_licenses">BIDRAGSYTERE &amp; LISENSER</string>
+    <string name="retro_scr_credits_desc">Noen av WinNatives funksjoner er bygget på disse åpen kildekode-prosjektene. Trykk for å se hver kilde.</string>
+    <string name="retro_scr_tab_defaults">Standarder</string>
+    <string name="retro_scr_tab_credits">Bidragsytere</string>
+    <string name="retro_scr_enable_hardcore_title">Aktivere Hardcore-modus?</string>
+    <string name="retro_scr_enable_hardcore_body">Hardcore-modus tilbakestiller spillet nå og deaktiverer innlasting av lagrede tilstander, spoling fremover og juksekoder. Ulagret fremdrift går tapt. Fortsette?</string>
+    <string name="retro_scr_cancel">Avbryt</string>
+    <string name="retro_scr_enable">Aktiver</string>
+    <string name="retro_scr_bios_imported">BIOS importert: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Ugyldig BIOS-fil</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS importert: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Ugyldig PS2 BIOS-fil</string>
+    <string name="retro_scr_no_game_serial">Ingen spillserie å slå opp juksekoder for.</string>
+    <string name="retro_scr_applied_cheats">Brukte %1$d juksekode(r).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Kunne ikke bruke juksekoder.</string>
+    <string name="retro_scr_cheats">Juksekoder</string>
+    <string name="retro_scr_apply">Bruk</string>
+    <string name="retro_scr_no_cheats_found">Ingen juksekoder funnet for dette spillet.</string>
+    <string name="retro_scr_achievements">Prestasjoner</string>
+    <string name="retro_scr_sign_in_ra">Logg inn på RetroAchievements</string>
+    <string name="retro_scr_username">Brukernavn</string>
+    <string name="retro_scr_password">Passord</string>
+    <string name="retro_scr_login_failed">Innlogging mislyktes</string>
+    <string name="retro_scr_signing_in">Logger inn…</string>
+    <string name="retro_scr_sign_in">Logg inn</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d p.</string>
+    <string name="retro_scr_no_achievements">Ingen prestasjoner for dette spillet.</string>
+    <string name="retro_scr_back">Tilbake</string>
+    <string name="retro_scr_enabled">Aktivert</string>
+    <string name="retro_scr_disabled">Deaktivert</string>
+    <string name="retro_scr_rename">Gi nytt navn</string>
+    <string name="retro_scr_save">Lagre</string>
+    <string name="retro_scr_cloud_save_conflict">Sky-lagringskonflikt</string>
+    <string name="retro_scr_keep_local_save">Behold lokal lagring</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Meny</string>
+    <string name="retro_tab_display">Skjerm</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Lyd</string>
+    <string name="retro_tab_controls">Kontroller</string>
+    <string name="retro_scan_up_to_date">Biblioteket er oppdatert</string>
+    <string name="retro_scan_roms">ROM-er: %1$s</string>
+    <string name="retro_scan_added">lagt til %1$d</string>
+    <string name="retro_scan_removed">fjernet %1$d</string>
+    <string name="retro_scr_shader_default">Standard</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Skarp</string>
+    <string name="retro_scr_upscale_native">Native</string>
+    <string name="retro_co_aspect_ratio">Bildeformat</string>
+    <string name="retro_co_ntsc_filter">NTSC-filter</string>
+    <string name="retro_co_colorization">Fargelegging</string>
+    <string name="retro_co_color_correction">Fargekorrigering</string>
+    <string name="retro_co_remove_sprite_limit">Fjern sprite-grense</string>
+    <string name="retro_co_resolution">Oppløsning</string>
+    <string name="retro_co_framebuffer_emulation">Framebuffer-emulering</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Widescreen-hack</string>
+    <string name="retro_co_val_8_7_native">8:7 (Native)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Av</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">GBA-skjerm</string>
+    <string name="retro_co_val_gbc_screen">GBC-skjerm</string>
+    <string name="retro_co_val_on">På</string>
+    <string name="retro_co_val_320x240_native">320x240 (Native)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 justert</string>
+    <string name="retro_co_val_native">Native</string>
+    <string name="retro_co_val_internal">Intern</string>
+    <string name="retro_co_val_on_16_9">På (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Logg inn med RetroAchievements-kontoen din for å tjene og spore prestasjoner for retrospill.</string>
+    <string name="retro_ach_username">Brukernavn</string>
+    <string name="retro_ach_password">Passord</string>
+    <string name="retro_ach_enter_credentials">Skriv inn brukernavn og passord</string>
+    <string name="retro_ach_login_failed">Innlogging mislyktes</string>
+    <string name="retro_ach_sign_in">Logg inn</string>
+    <string name="retro_ach_password_disclaimer">Passordet ditt brukes bare én gang for å hente et innloggingstoken, som lagres sikkert på enheten.</string>
+    <string name="retro_ach_achievements_enabled">Prestasjoner aktivert</string>
+    <string name="retro_ach_hardcore_mode">Hardcore-modus (ingen lagrede tilstander)</string>
+    <string name="retro_ach_points">%1$d / %2$d poeng</string>
+    <string name="retro_ach_none_found">Ingen prestasjoner funnet for dette spillet.</string>
+    <string name="retro_ach_sign_out">Logg ut</string>
+    <string name="retro_che_brand">JUKSEKODER</string>
+    <string name="retro_che_name">Navn</string>
+    <string name="retro_che_code">Kode</string>
+    <string name="retro_che_cancel">Avbryt</string>
+    <string name="retro_che_save">Lagre</string>
+    <string name="retro_che_default_name">Juksekode %1$d</string>
+    <string name="retro_che_empty">Ingen juksekoder ennå. Legg til en juksekode for dette spillet.</string>
+    <string name="retro_che_add">Legg til juksekode</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU-driver</string>
+    <string name="retro_gpu_driver_system">System (Standard)</string>
+    <string name="retro_gpu_driver_hint">Installer Turnip-drivere under Innstillinger \u2192 Drivere. De samme driverne fungerer for både PC- og PS2-spill.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Virtuell intern stasjon for HDD-baserte spill som Final Fantasy XI. Starter spillet på nytt.</string>
+    <string name="retro_ps2_hdd_desc">Virtuell intern stasjon for HDD-baserte spill som Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">DNS-modus satt til Internal, slik at dine egendefinerte serververtar trer i kraft.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">CPU-kjerne</string>
+    <string name="retro_co_dual_core">Dobbeltkjerne</string>
+    <string name="retro_co_internal_cheats">Interne juksekoder</string>
+    <string name="retro_co_internal_resolution">Intern oppløsning</string>
+    <string name="retro_co_renderer">Gjengiver</string>
+    <string name="retro_co_sensor_bar">Plassering av sensorlinje</string>
+    <string name="retro_co_skip_gc_bios">Hopp over BIOS-intro</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Nederst</string>
+    <string name="retro_co_val_cached_interpreter">Bufret tolker</string>
+    <string name="retro_co_val_hardware">Maskinvare</string>
+    <string name="retro_co_val_interpreter">Tolker</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Mus / berøring</string>
+    <string name="retro_co_val_right_stick_absolute">Høyre spak (absolutt)</string>
+    <string name="retro_co_val_right_stick_relative">Høyre spak (relativ)</string>
+    <string name="retro_co_val_software">Programvare</string>
+    <string name="retro_co_val_stretch">Strekk</string>
+    <string name="retro_co_val_top">Øverst</string>
+    <string name="retro_co_vbi_skip">VBI-hopp (auto-bildehopp)</string>
+    <string name="retro_co_widescreen">Bredskjerm</string>
+    <string name="retro_co_wiimote_pointer">Wiimote-peker</string>
+    <string name="retro_gs_cheats_apply_note">Endringene trer i kraft neste gang du starter dette spillet.</string>
+    <string name="retro_gs_cheats_detect_hint">Start dette spillet én gang slik at plateserienummeret kan oppdages, så vil juksekoder og oppdateringer vises her.</string>
+    <string name="retro_gs_dnas_entry_desc">Omgåelse av DNAS-autentisering — kreves for nettspill</string>
+    <string name="retro_gs_dnas_group">Automatisk anvendt (på nett)</string>
+    <string name="retro_gs_group_cheats">Juksekoder &amp; oppdateringer</string>
+    <string name="retro_gs_hdd_image_size">Størrelse: %1$s</string>
+    <string name="retro_gs_hdd_import">Importer HDD-avbildning</string>
+    <string name="retro_gs_hdd_remove_short">Fjern</string>
+    <string name="retro_gs_netplay_enable">Aktiver NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Av som standard. Aktiver, og velg deretter Vert eller Bli med før oppstart.\nSlås av igjen når du avslutter spillet.</string>
+    <string name="retro_gs_netplay_host">Vertsadresse</string>
+    <string name="retro_gs_netplay_host_hint">IP eller vertsnavn</string>
+    <string name="retro_gs_netplay_host_mode">Vertsøkt</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">På = vent på en spiller. Av = koble til vertsadresse</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay bruker lokale flerspillerporter over TCP (spiller 1 vert / spiller 2 klient). PS2-nettspill bruker DEV9 Ethernet i stedet.</string>
+    <string name="retro_gs_netplay_port">Port</string>
+    <string name="retro_lr_memory_card_slot">Minnekort %1$d</string>
+    <string name="retro_lr_screenshot">Skjermbilde</string>
+    <string name="retro_lr_use_cloud_save">Bruk skylagring</string>
+    <string name="retro_netplay_conn_direct">LAN (direkte IP)</string>
+    <string name="retro_netplay_connecting">Kobler til…</string>
+    <string name="retro_netplay_connection">Tilkobling</string>
+    <string name="retro_netplay_conn_traversal">På nett (vertskode)</string>
+    <string name="retro_netplay_dismiss">Lukk</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii-NetPlay bruker Dolphins egen motor. Vert = spiller 1, Bli med = spiller 2. Velg Vert eller Bli med og en tilkoblingstype før oppstart; begge enhetene starter det samme spillet sammen.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Del enhetens Wi‑Fi-IP og denne porten med spiller 2. Spillet starter automatisk så snart de kobler til.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">En vertskode vises når spillet starter — del den med spiller 2. Spillet starter automatisk så snart de kobler til.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Skriv inn vertens Wi‑Fi-IP og port, og start deretter for å koble til.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Skriv inn vertskoden fra spiller 1, og start deretter for å koble til.</string>
+    <string name="retro_netplay_enable_before_launch">Aktiver NetPlay i spillinnstillingene og velg Vert eller Bli med før oppstart</string>
+    <string name="retro_netplay_find_rooms">Finn rom på Wi‑Fi</string>
+    <string name="retro_netplay_game_link_hint">Game Link · hver skjerm er sin egen håndholdte konsoll</string>
+    <string name="retro_netplay_gba_not_ready">GBA-flerspiller bruker gpSP + trådløs adapter. Sørg for at libgpsp er installert.</string>
+    <string name="retro_netplay_help">Flerspiller med delt skjerm over Wi‑Fi (som RetroArch).\nVert = spiller 1, Bli med = spiller 2. Begge enhetene viser det samme spillet.</string>
+    <string name="retro_netplay_help_game_link">Game Link over Wi‑Fi — hver enhet kjører sitt eget spill.\nGB/GBC: Gambatte seriell tilkobling (Pokémon Gen 1–2).\nGBA: gpSP trådløs adapter (Pokémon FR/LG/Emerald-kamper).</string>
+    <string name="retro_netplay_host_action">Vær vert for rom</string>
+    <string name="retro_netplay_host_code">Vertskode</string>
+    <string name="retro_netplay_host_code_hint">Traverserings-vertskode fra verten</string>
+    <string name="retro_netplay_hosting_room">Er vert for rom</string>
+    <string name="retro_netplay_host_mode_hint">Trykk på Vert for å åpne et rom for denne spilløkten, og start deretter spillet. NetPlay slås av når du avslutter.</string>
+    <string name="retro_netplay_in_room">I rom</string>
+    <string name="retro_netplay_join_action">Bli med via IP</string>
+    <string name="retro_netplay_joined">Ble med</string>
+    <string name="retro_netplay_join_room">Bli med</string>
+    <string name="retro_netplay_launch_mode">Ved oppstart</string>
+    <string name="retro_netplay_leave">Forlat</string>
+    <string name="retro_netplay_menu_hint">Vert = S1 · Bli med = S2 · samme spill på begge skjermer</string>
+    <string name="retro_netplay_mode_host">Vert</string>
+    <string name="retro_netplay_mode_join">Bli med</string>
+    <string name="retro_netplay_mode_manual">Manuell</string>
+    <string name="retro_netplay_no_rooms">Fant ingen rom. Sørg for at verten er på samme Wi‑Fi og er vert for et rom.</string>
+    <string name="retro_netplay_player_name">Visningsnavn</string>
+    <string name="retro_netplay_player_name_hint">Vises til andre spillere</string>
+    <string name="retro_netplay_players_count">%1$d tilkoblet</string>
+    <string name="retro_netplay_prelaunch_hint">Rommet er åpent kun for denne økten. Start når du er klar. Å avslutte spillet slår av NetPlay.</string>
+    <string name="retro_netplay_room_players">Spillere</string>
+    <string name="retro_netplay_scan_action">Skann Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Skann på nytt</string>
+    <string name="retro_netplay_scan_hint">Skann samme Wi‑Fi etter åpne rom, eller bli med via IP-adresse.</string>
+    <string name="retro_netplay_scanning">Skanner Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Skanneresultater</string>
+    <string name="retro_netplay_select_room_hint">Trykk på et rom for å bli med nå (lagrer ikke IP-en til neste oppstart).</string>
+    <string name="retro_netplay_stop_scan">Stopp skanning</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s koblet til</string>
+    <string name="retro_netplay_user_disconnected">%1$s koblet fra</string>
+    <string name="retro_netplay_waiting_players">Venter på spillere…</string>
+    <string name="retro_ps2_coming_soon">Støtte for PlayStation 2 kommer snart</string>
+    <string name="retro_ps2_show_l3r3">Vis L3- / R3-knapper</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Når av, dobbelttrykk en spak for å klikke L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">TURNIP-DRIVERFLAGG</string>
+    <string name="retro_ps2_turnip_flags_note">Brukes kun når en egendefinert GPU-driver er valgt ovenfor.</string>
+    <string name="retro_rom_missing">Fant ikke spillfilen</string>
+    <string name="retro_scr_delete">Slett</string>
+    <string name="retro_scr_import_from_file">Importer fra fil…</string>
+    <string name="retro_scr_loading">Laster inn…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Bytt konsoll</string>
+    <string name="retro_gs_identify_as">Identifiser som konsoll</string>
+    <string name="retro_gs_console_changed">Nå identifisert som %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Bruk en ReShade-effekt (.fx) på DXVK/VKD3D-spill (Vulkan) via det innebygde vkBasalt-laget. Legg hver effekt i sin egen mappe under Android/data/&lt;package&gt;/files/ReShade/. Justering av parametere i sanntid og bryteren i spillet kommer med oppdateringen av live-reload-laget.</string>
+    <string name="reshade_catalog_title">ReShade-effekter</string>
+    <string name="reshade_catalog_search">Søk etter effekter…</string>
+    <string name="reshade_catalog_installed">Installert (%1$d)</string>
+    <string name="reshade_catalog_available">Tilgjengelige (%1$d)</string>
+    <string name="reshade_catalog_downloading">Laster ned</string>
+    <string name="reshade_catalog_installing">Installerer</string>
+    <string name="reshade_catalog_offline_cache">Frakoblet — viser en bufret liste. Koble til for å laste ned nye effekter.</string>
+    <string name="reshade_catalog_offline_none">Frakoblet — viser bare installerte effekter. Koble til for å bla gjennom katalogen.</string>
+    <string name="reshade_catalog_needs_connection">Koble til internett for å laste ned effekter.</string>
+    <string name="reshade_catalog_download_failed">Kunne ikke laste ned %1$s.</string>
+    <string name="reshade_catalog_empty_query">Ingen effekter samsvarer med \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Ingen effekter tilgjengelige. Koble til internett for å bla gjennom katalogen.</string>
+    <string name="reshade_catalog_done">Ferdig</string>
+    <string name="reshade_catalog_delete_cd">Slett %1$s</string>
+    <string name="reshade_catalog_delete_title">Slette %1$s?</string>
+    <string name="reshade_catalog_delete_body">Dette fjerner effekten fra lagringen og fra alle sett som bruker den. Du kan laste den ned igjen senere.</string>
+    <string name="reshade_catalog_delete_confirm">Slett</string>
+    <string name="reshade_catalog_delete_cancel">Avbryt</string>
+    <string name="reshade_catalog_delete_failed">Kunne ikke slette %1$s.</string>
+    <string name="reshade_params_title">EFFEKTPARAMETERE</string>
+    <string name="reshade_params_reset">Tilbakestill</string>
+    <string name="reshade_loadout_empty">Ingen effekter ennå. Legg til én eller flere effekter for å lage et sett.</string>
+    <string name="reshade_loadout_add">Legg til effekt</string>
+    <string name="reshade_loadout_full">Settet er fullt — fjern en effekt for å legge til en annen.</string>
+    <string name="reshade_effect_active">aktiv</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stabel</string>
+    <string name="reshade_mode_solo_hint">Én effekt aktiv om gangen (A/B-sammenligning, bytt live i spillet).</string>
+    <string name="reshade_mode_stack_hint">Legg lag på lag med et vilkårlig utvalg effekter, brukt i rekkefølge.</string>
+    <string name="reshade_drawer_enable">Aktiver ReShade</string>
+    <string name="reshade_drawer_empty">Ingen ReShade-effekter i dette settet. Legg til effekter i dette spillets innstillinger (eller containerens) for å bytte og justere dem her.</string>
+    <string name="reshade_drawer_no_params">Denne effekten har ingen justerbare parametere.</string>
+    <string name="cloud_saves_deleting">Sletter lagring…</string>
+    <string name="cloud_saves_history_delete">Slett</string>
+    <string name="cloud_saves_history_delete_confirm_body">Vil du slette skylagringen fra %1$s permanent? Dette kan ikke angres.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Slett skylagring</string>
+    <string name="cloud_saves_history_delete_failed">Kunne ikke slette skylagringen</string>
+    <string name="cloud_saves_history_delete_success">Skylagring slettet</string>
+    <string name="retro_bundle_required">Last ned konsollkjernene først — Innstillinger › Retro</string>
+    <string name="retro_ps2_device_unsupported">Denne enheten kan ikke kjøre PS2-emulering — den krever OpenGL ES 3.1 eller nyere.</string>
+    <string name="retro_scr_consoles_check">Se etter oppdateringer</string>
+    <string name="retro_scr_consoles_checking">Ser etter oppdateringer…</string>
+    <string name="retro_scr_consoles_download">Last ned konsollkjerner</string>
+    <string name="retro_scr_consoles_downloading">Laster ned… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Konsollkjerner</string>
+    <string name="retro_scr_consoles_installed">Installert — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installert — build %1$s (kunne ikke se etter oppdateringer)</string>
+    <string name="retro_scr_consoles_installing">Installerer…</string>
+    <string name="retro_scr_consoles_missing">Ikke installert — last ned for å spille retrospill</string>
+    <string name="retro_scr_consoles_state">Status</string>
+    <string name="retro_scr_consoles_update">Oppdater konsollkjerner</string>
+    <string name="retro_scr_consoles_update_available">Oppdatering tilgjengelig — build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Verifiserer nedlastingen…</string>
+    <string name="retro_scr_consoles_working">Arbeider…</string>
+    <string name="retro_tab_system">System</string>
+</resources>
diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml
index 22a5577b5..8386d06b8 100644
--- a/app/src/main/res/values-pl/arrays.xml
+++ b/app/src/main/res/values-pl/arrays.xml
@@ -1,128 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--  Winlator  -->
-    <string-array name="screen_size_entries">
-        <item>Niestandardowa</item>
-        <item>640x480 (4:3)</item>
-        <item>800x600 (4:3)</item>
-        <item>854x480 (16:9)</item>
-        <item>960x540 (16:9)</item>
-        <item>1024x768 (4:3)</item>
-        <item>1280x720 (16:9)</item>
-        <item>1280x800 (16:10)</item>
-        <item>1280x1024 (5:4)</item>
-        <item>1366x768 (16:9)</item>
-        <item>1440x900 (16:10)</item>
-        <item>1600x900 (16:9)</item>
-        <item>1920x1080 (16:9)</item>
-    </string-array>
-    <string-array name="graphics_driver_entries">
-        <item>Vortek (Uniwersalny)</item>
-        <item>Turnip (Adreno)</item>
-        <item>VirGL (Uniwersalny)</item>
-        <item>Adreno (Adreno)</item>
-        <item>SD 8 Elite (SD 8 Elite)</item>
-    </string-array>
-    <string-array name="wrapper_graphics_driver_version_entries">
-        <item>System</item>
-    </string-array>
-    <string-array name="audio_driver_entries">
-        <item>ALSA</item>
-        <item>PulseAudio</item>
-    </string-array>
-    <string-array name="binding_type_entries">
-        <item>Klawiatura</item>
-        <item>Mysz</item>
-        <item>Gamepad</item>
-    </string-array>
-    <string-array name="dxwrapper_entries">
-        <item>WineD3D</item>
-        <item>DXVK</item>
-        <item>VKD3D</item>
-        <item>CNC DDraw</item>
-    </string-array>
-    <string-array name="dxvk_version_entries">
-    </string-array>
-    <string-array name="vkd3d_version_entries">
-        <item>None</item>
-    </string-array>
-    <string-array name="present_mode_entries">
-        <item>Nigdy</item>
-        <item>mailbox</item>
-        <item>Normalny</item>
-        <item>fifo</item>
-        <item>Zawsze</item>
-        <item>immediate</item>
-        <item>relaxed</item>
-    </string-array>
-    <string-array name="resource_type_entries">
-        <item>auto</item>
-        <item>dmabuf</item>
-        <item>ahb</item>
-        <item>opaque</item>
-    </string-array>
-    <string-array name="vulkan_version_entries">
-        <item>1.1</item>
-        <item>1.2</item>
-        <item>1.3</item>
-    </string-array>
-    <string-array name="bcn_emulation_entries">
-        <item>brak</item>
-        <item>częściowa</item>
-        <item>pełna</item>
-        <item>auto</item>
-    </string-array>
-    <string-array name="bcn_emulation_type_entries">
-        <item>programowa</item>
-        <item>obliczeniowa (compute)</item>
-    </string-array>
-    <string-array name="bcn_emulation_cache_entries">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-    <string-array name="video_memory_size_entries">
-        <item>32 MB</item>
-        <item>64 MB</item>
-        <item>128 MB</item>
-        <item>256 MB</item>
-        <item>512 MB</item>
-        <item>1024 MB</item>
-        <item>2048 MB</item>
-        <item>4096 MB</item>
-        <item>6144 MB</item>
-        <item>8192 MB</item>
-        <item>10240 MB</item>
-        <item>12288 MB</item>
-    </string-array>
-    <string-array name="wincomponent_entries">
-        <item>Wbudowany (Wine)</item>
-        <item>Natywny (Windows)</item>
-    </string-array>
-    <string-array name="box64_version_entries">
-    </string-array>
-    <string-array name="wowbox64_version_entries">
-    </string-array>
-    <string-array name="fexcore_version_entries">
-    </string-array>
-    <string-array name="dinput_mapper_type_entries">
-        <item>Standardowy (Stare pady)</item>
-        <item>XInput</item>
-    </string-array>
-    <string-array name="desktop_theme_entries">
-        <item>Jasny</item>
-        <item>Ciemny</item>
-    </string-array>
     <string-array name="desktop_background_type_entries">
         <item>Obraz</item>
+        <item>Oryginalny</item>
         <item>Jednolity kolor</item>
     </string-array>
-    <string-array name="startup_selection_entries">
-        <item>Normalny (Załaduj wszystkie usługi)</item>
-        <item>Podstawowy (Tylko niezbędne usługi)</item>
-        <item>Agresywny (Zatrzymaj usługi przy starcie)</item>
-    </string-array>
-    <string-array name="emulator_entries">
-        <item>FEXCore</item>
-        <item>Box64</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b1b4dc69a..7194f5e2d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Wybierz prawidłowy plik .exe</string>
     <string name="common_ui_select_valid_icon_file">Wybierz prawidłowy plik .ico lub .png.</string>
     <string name="common_ui_exit">Wyjście</string>
+    <string name="common_ui_exit_app">Zamknij aplikację</string>
     <string name="common_ui_profile">Profil</string>
     <string name="common_ui_name">Nazwa</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Ikona</string>
     <string name="common_ui_duplicate">Duplikuj</string>
     <string name="common_ui_credits_and_third_party_apps">Autorzy i aplikacje zewnętrzne</string>
-    <string name="common_ui_loading">Ładowanie…</string>
+    <string name="common_ui_loading">Ładowanie</string>
+    <string name="common_ui_exporting">Eksportowanie</string>
     <string name="common_ui_enable">Włącz</string>
     <string name="common_ui_disable">Wyłącz</string>
     <string name="common_ui_force">Wymuś</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Wysokość</string>
     <string name="common_ui_open_file">Otwórz plik</string>
     <string name="common_ui_download_file">Pobierz plik</string>
-    <string name="common_ui_downloading_file">Pobieranie pliku...</string>
+    <string name="common_ui_downloading_file">Pobieranie pliku</string>
     <string name="common_ui_browse">Przeglądaj</string>
     <string name="common_ui_options">Opcje</string>
     <string name="common_ui_export">Eksportuj</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Ustawienia</string>
     <string name="common_ui_enable_all">Włącz wszystko</string>
     <string name="common_ui_disable_all">Wyłącz wszystko</string>
+    <string name="common_ui_select_all">Zaznacz wszystko</string>
+    <string name="common_ui_deselect_all">Odznacz wszystko</string>
     <string name="common_ui_on">Wł.</string>
     <string name="common_ui_off">Wył.</string>
     <string name="common_ui_already_set">Już ustawione</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Zainstaluj</string>
     <string name="common_ui_application">Aplikacja</string>
     <string name="common_ui_check">Sprawdź</string>
+    <string name="store_game_check_for_update">Sprawdź aktualizacje</string>
+    <string name="store_game_checking_for_update">Sprawdzanie</string>
+    <string name="store_game_download_update">Pobierz aktualizację</string>
+    <string name="store_game_no_update_available">Brak dostępnych aktualizacji</string>
+    <string name="store_game_update_available">Aktualizacja dostępna</string>
+    <string name="store_game_update_check_failed">Nie udało się sprawdzić aktualizacji</string>
+    <string name="store_game_update">Aktualizuj</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Zweryfikuj pliki</string>
+    <string name="store_game_verify_started">Weryfikowanie %1$s — sprawdź kartę Pobrane</string>
+    <string name="store_game_steam_options">Opcje Steam</string>
+    <string name="store_game_verify_complete">Weryfikacja plików zakończona</string>
+    <string name="store_game_verify_failed_notice">Weryfikacja plików nie powiodła się</string>
+    <string name="store_game_progress_background_hint">Możesz to zamknąć — proces będzie dalej działał. Sprawdź kartę Pobrane w dowolnym momencie.</string>
+    <string name="store_game_checking_updates">Sprawdzanie aktualizacji</string>
+    <string name="store_game_no_updates_notice">Brak dostępnych aktualizacji</string>
+    <string name="store_game_update_complete">Aktualizacja zakończona</string>
+    <string name="store_game_update_failed_notice">Aktualizacja nie powiodła się</string>
+    <string name="store_game_update_check_failed_notice">Sprawdzanie aktualizacji nie powiodło się</string>
+    <string name="store_game_download_already_active">Ta gra jest już pobierana. Anuluj bieżące pobieranie przed dodaniem DLC.</string>
     <string name="common_ui_select">Wybierz</string>
     <string name="common_ui_select_folder">Wybierz folder</string>
     <string name="common_ui_current_folder">Bieżący folder</string>
+    <string name="common_ui_enter_path">Wprowadź ścieżkę</string>
+    <string name="common_ui_path_not_found">Nie znaleziono ścieżki</string>
     <string name="common_ui_storage_roots">Lokalizacje pamięci</string>
     <string name="common_ui_browse_local_folders_directly">Przeglądaj lokalne foldery bezpośrednio</string>
     <string name="common_ui_no_folders_available_here">Brak dostępnych folderów w tej lokalizacji</string>
     <string name="common_ui_grant_all_files_access_browse">Przyznaj pełny dostęp do plików, aby bezpośrednio przeglądać lokalne foldery.</string>
     <string name="common_ui_not_configured">Nie skonfigurowano</string>
     <string name="common_ui_reinstall">Zainstaluj ponownie</string>
-    <string name="common_ui_exit_app_confirm">Zamknąć WinNative?</string>
     <string name="common_ui_elements_count">%1$d elementów</string>
     <string name="common_ui_disabled_placeholder">-- Wyłączone --</string>
     <string name="common_ui_enabled">Włączone</string>
@@ -138,9 +163,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Pobierz grafiki</string>
+    <string name="library_games_scraping_artwork">Pobieranie</string>
     <string name="library_games_shortcut_created">Skrót utworzony</string>
     <string name="library_games_failed_to_create_shortcut">Nie udało się utworzyć skrótu: %s</string>
     <string name="library_games_install_path">Ścieżka instalacji</string>
+    <string name="library_games_not_enough_space">Potrzeba jeszcze %1$s miejsca</string>
     <string name="library_games_download_slash_install">Pobierz / Zainstaluj</string>
     <string name="library_games_save_management">ZARZĄDZANIE ZAPISAMI</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Dostępne: %3$s</string>
@@ -163,11 +191,21 @@
     <string name="library_games_no_games_hub">Brak zainstalowanych gier\nKliknij, aby otworzyć Winlator Backend</string>
     <string name="library_games_installed_badge">ZAINSTALOWANO</string>
     <string name="library_games_unknown_game">Nieznana gra</string>
-    <string name="library_games_layouts_header">UKŁADY</string>
+    <string name="library_games_layouts_header">UKŁADY BIBLIOTEKI</string>
     <string name="library_games_layout_carousel">Karuzela</string>
     <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPCJE WIDOKU</string>
+    <string name="library_games_immersive_mode">Tryb immersyjny</string>
+    <string name="library_games_immersive_mode_description">Użyj grafiki wybranej gry jako tła</string>
+    <string name="library_games_immersive_blur">Rozmyj tło</string>
+    <string name="library_games_immersive_blur_description">Zastosuj efekt rozmycia do tła immersyjnego</string>
     <string name="library_games_custom_game">Własna gra</string>
     <string name="library_games_play">Graj</string>
+    <string name="hero_boot_to_desktop_title">Uruchom pulpit</string>
+    <string name="hero_graphics_tests_title">Testy graficzne</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Testy wejścia</string>
     <string name="library_games_add_custom_game">Dodaj własną grę</string>
     <string name="library_games_game_name">Nazwa gry</string>
     <string name="library_games_game_folder_mapped_drive">Folder gry (zmapowany dysk gry)</string>
@@ -225,16 +263,21 @@
     <string name="downloads_queue_phase_cancelled">Anulowano</string>
     <string name="downloads_queue_phase_failed">Błąd: %1$s</string>
     <string name="downloads_queue_cancel_download">Anuluj pobieranie</string>
+    <string name="downloads_queue_cancel_download_title">Anulować pobieranie?</string>
+    <string name="downloads_queue_cancel_download_warning">Anulowanie pobierania DLC, gry lub aktualizacji może potencjalnie uszkodzić instalację gry.\n\nCzy na pewno chcesz anulować?</string>
     <string name="downloads_queue_empty">Brak aktywnych pobrań.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Nowy kontener</string>
     <string name="containers_list_edit">Edytuj kontener</string>
-    <string name="containers_list_creating">Tworzenie kontenera…</string>
-    <string name="containers_list_removing">Usuwanie kontenera…</string>
-    <string name="containers_list_duplicating">Duplikowanie kontenera…</string>
+    <string name="containers_list_creating">Tworzenie kontenera</string>
+    <string name="containers_list_removing">Usuwanie kontenera</string>
+    <string name="containers_list_duplicating">Duplikowanie kontenera</string>
+    <string name="containers_list_remove_title">Usuń kontener</string>
+    <string name="containers_list_duplicate_title">Zduplikuj kontener</string>
     <string name="containers_list_confirm_remove">Czy chcesz usunąć ten kontener?</string>
     <string name="containers_list_confirm_duplicate">Czy chcesz zduplikować ten kontener?</string>
+    <string name="containers_list_duplicate_failed">Nie udało się zduplikować kontenera</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Czy chcesz usunąć ten skrót?</string>
@@ -249,6 +292,10 @@
     <string name="shortcuts_list_clone_failed">Nie udało się sklonować skrótu.</string>
     <string name="shortcuts_list_exported_to">Skrót wyeksportowany do %1$s</string>
     <string name="shortcuts_list_failed_export">Nie udało się wyeksportować skrótu</string>
+    <string name="shortcuts_export_all">Eksportuj wszystko</string>
+    <string name="shortcuts_export_to_frontend">Eksportuj do frontendu</string>
+    <string name="shortcuts_export_all_done">Wyeksportowano %1$d gier do %2$s</string>
+    <string name="shortcuts_export_all_none">Brak gier do wyeksportowania</string>
     <string name="shortcuts_list_added">Skrót dodany pomyślnie.</string>
     <string name="shortcuts_list_failed_add">Nie udało się dodać skrótu.</string>
 
@@ -258,17 +305,6 @@
     <string name="shortcuts_properties_disable_xinput">Wyłącz Xinput (dla wyłącznej kontroli M/KB)</string>
     <string name="shortcuts_properties_exclusive_input">Wyłączne wejście</string>
     <string name="shortcuts_properties_custom_game_settings">Własne ustawienia gry</string>
-    <string name="shortcuts_properties_use_cold_client">Użyj ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient to preferowany sposób obsługi emulacji Steam i DRM. Patchuje DRM w czasie działania bez modyfikowania plików gry.</string>
-    <string name="shortcuts_properties_unpack_files">Starsze DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">Usuwa SteamStub DRM z exe na dysku. Włącz tylko jeśli gra nie uruchamia się bez tego. Patcher runtime ColdClient obsługuje większość gier automatycznie.</string>
-    <string name="shortcuts_properties_force_dlc">Wymuś DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Włącz tylko wtedy, gdy DLC nie są wykrywane lub zapisy z DLC nie działają</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Uruchom klienta Steam (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Uruchamia prawdziwego klienta Steam w Wine\nWymaga konta Steam i może obniżyć wydajność\nNie wszystkie gry działają</string>
-    <string name="shortcuts_properties_steam_type">Wydajność klienta Steam</string>
-    <string name="steam_section_emulator">Emulator Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Prawdziwy klient Steam</string>
     <string name="shortcuts_properties_use_steam_input">Użyj Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Tryb offline Steam</string>
     <string name="shortcuts_properties_reset">Resetuj właściwości</string>
@@ -297,6 +333,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Czy chcesz zduplikować ten profil?</string>
     <string name="input_controls_editor_title">Edytor sterowania</string>
     <string name="input_controls_editor_toggle_switch">Przełącznik</string>
+    <string name="input_controls_editor_swipeable">Aktywacja przesunięciem</string>
     <string name="input_controls_editor_profile_exported_to">Profil wyeksportowany do</string>
     <string name="input_controls_editor_unable_to_import">Nie można zaimportować profilu</string>
     <string name="input_controls_editor_import_profile">Importuj profil</string>
@@ -395,6 +432,10 @@
     <string name="container_box64_compatibility">Kompatybilność</string>
     <string name="container_box64_intermediate">Pośredni</string>
     <string name="container_box64_performance">Wydajność</string>
+    <string name="container_fexcore_performance_tso">Wydajność TSO</string>
+    <string name="container_fexcore_extreme">Ekstremalny</string>
+    <string name="container_fexcore_extreme_tso">Ekstremalny TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Obsługa flag w opcodach CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Traktuje CALL/RET jakby nigdy nie potrzebowały flag (szybciej, niestabilne)&lt;br /&gt;
@@ -479,9 +520,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Preset FEXCore</string>
     <string name="container_fexcore_version">Wersja FEXCore</string>
+    <string name="use_unix_libs">Użyj UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Sterownik grafiki</string>
+    <string name="container_zink_mode">Tryb Zink</string>
+    <string name="container_graphics_transcoder">Transkoder BCn</string>
+    <string name="container_graphics_quality">Jakość BCn</string>
     <string name="container_graphics_configuration">Konfiguracja sterownika grafiki</string>
     <string name="container_graphics_version">Wersja sterownika grafiki</string>
     <string name="container_graphics_available_extensions">Dostępne rozszerzenia</string>
@@ -495,6 +540,8 @@
     <string name="container_graphics_bcn_emulation">Emulacja BCn</string>
     <string name="container_graphics_bcn_emulation_type">Typ emulacji BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Pamięć podręczna emulacji BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Superrozdzielczość w grach 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Ostrość krawędzi</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Czy chcesz zduplikować ten preset?</string>
     <string name="container_presets_confirm_remove">Czy chcesz usunąć ten preset?</string>
@@ -514,7 +561,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Użyj rozszerzenia DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Symuluj ekran dotykowy</string>
     <string name="session_xserver_preferences_button_text">   PREFERENCJE   </string>
     <string name="session_xserver_extra_keys_config_desc">Tutaj możesz ustawić wartość zmiennej extra-keys tak jak w aplikacji Termux (przeczytaj <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">to</a>) i więcej \n
@@ -530,12 +576,6 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="session_xserver_pref_kbd">Klawiatura</string>
     <string name="session_xserver_pref_other">Inne</string>
     <string name="session_xserver_pref_version">Wersja</string>
-    <string name="session_xserver_use_dri3_description">Wyłączenie może naprawić błędy graficzne na niektórych urządzeniach</string>
-    <string name="session_xserver_native_rendering">Renderowanie natywne</string>
-    <string name="session_xserver_native_rendering_enabled">Renderowanie sprzętowe DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Programowy fallback WSI</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Renderowanie natywne włączone (zacznie działać po ponownym uruchomieniu)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Renderowanie natywne wyłączone (zacznie działać po ponownym uruchomieniu)</string>
     <string name="session_xserver_notification_description">Wiadomości WinNative XServer</string>
     <string name="session_xserver_notification_content">WinNative jest uruchomiony, nie zamykaj ani nie usuwaj tego powiadomienia</string>
 
@@ -555,6 +595,8 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="session_drawer_exit_subtitle">Zamknij bieżącą sesję</string>
     <string name="session_drawer_touchscreen_overlay">Nakładka dotykowa</string>
     <string name="session_drawer_resume">Wznów</string>
+    <string name="session_drawer_retry">Ponów próbę</string>
+    <string name="downloads_no_internet">Brak połączenia z internetem</string>
     <string name="session_drawer_pause">Wstrzymaj</string>
     <string name="session_drawer_wine_processes_paused">Procesy Wine są wstrzymane</string>
     <string name="session_drawer_pause_all_wine_processes">Wstrzymaj wszystkie procesy Wine</string>
@@ -565,6 +607,33 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Bat.</string>
     <string name="session_drawer_hud_element_graph">Wykr.</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD w stylu Mango</string>
+    <string name="session_drawer_hud_mango_settings">Ustawienia HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Obciążenie GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. GPU</string>
+    <string name="mango_hud_element_cpu_load">Obciążenie CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Bateria</string>
+    <string name="mango_hud_element_lows" formatted="false">1% dołków</string>
+    <string name="mango_hud_element_graph">Wykres frametime</string>
+    <string name="mango_hud_element_engine">Silnik</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Takt CPU</string>
+    <string name="mango_hud_element_gpu_clock">Takt GPU</string>
+    <string name="mango_hud_element_cores">Na rdzeń</string>
+    <string name="mango_hud_element_network">Sieć</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Rozdzielczość</string>
+    <string name="mango_hud_element_wine">Wersja Wine</string>
+    <string name="mango_hud_element_duration">Czas sesji</string>
+    <string name="mango_hud_element_clock">Zegar</string>
+    <string name="mango_hud_element_throttle">Stan dławienia</string>
+    <string name="mango_hud_group_memory">Pamięć</string>
+    <string name="mango_hud_group_system">System</string>
+    <string name="mango_hud_lock">Zablokuj HUD</string>
+    <string name="mango_hud_lock_subtitle">Dotknięcia trafiają do sterowania za HUD-em. Przytrzymaj HUD, aby go zablokować. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Czy chcesz zakończyć ten proces?</string>
@@ -597,6 +666,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="session_display_frame_rate">Częstotliwość klatek</string>
     <string name="session_display_title">Wyświetlacz</string>
     <string name="session_display_fullscreen_stretched">Włącz pełny ekran (rozciągnięty)</string>
+    <string name="session_display_direct_composition">Kompozycja bezpośrednia (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -670,6 +740,9 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="session_gamepad_error_loading_profile">Błąd wczytywania profilu</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Sterowanie dotykowe</string>
+    <string name="input_controls_auto_hide_on_controller_title">Ukryj automatycznie przy kontrolerze</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Ukryj sterowanie dotykowe, gdy podłączony jest kontroler</string>
     <string name="session_gyroscope_title">Żyroskop</string>
     <string name="session_gyroscope_calibrate">Kalibruj żyroskop</string>
     <string name="session_gyroscope_enable_right_stick">Włącz ruch żyroskopowy prawej gałki</string>
@@ -706,6 +779,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_general_select_wallpaper">Wybierz tapetę</string>
     <string name="settings_general_title">Ogólne</string>
     <string name="settings_general_enable_file_provider">Włącz dostawcę plików</string>
+    <string name="settings_general_enable_auto_scraping">Włącz automatyczne pobieranie grafik</string>
     <string name="settings_general_take_effect_next_startup">Ta opcja zacznie działać po ponownym uruchomieniu.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Reinstaluj Imagefs</string>
@@ -719,7 +793,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_general_share_android_clipboard">Udostępnij schowek Androida w Wine</string>
     <string name="settings_general_paths_title">Ustawienia ścieżek</string>
     <string name="settings_general_paths_summary">Zarządzaj miejscami przechowywania danych roboczych Winlator i eksportowanych skrótów.</string>
-    <string name="settings_general_winlator_path_title">Ścieżka Winlator</string>
+    <string name="settings_general_winlator_path_title">Ścieżka pamięci masowej</string>
     <string name="settings_general_shortcut_export_path_title">Ścieżka eksportu skrótów</string>
     <string name="settings_general_choose_path">Wybierz ścieżkę</string>
     <string name="settings_general_xserver_cursor_summary">Dostosuj prędkość wskaźnika dla dotyku, gładzika i myszy w sesji XServer.</string>
@@ -727,7 +801,9 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_general_cursor_lock_summary">Utrzymuje bezpośrednie przechwytywanie myszy dla gier wymagających surowego wejścia wskaźnika. Wyłącz przyciskiem Ciszej.</string>
     <string name="settings_general_xinput_toggle_title">Wyłącz XInput</string>
     <string name="settings_general_xinput_toggle_summary">Wyłącza obsługę XInput, gdy chcesz wyłącznej kontroli myszy i klawiatury.</string>
-    <string name="settings_general_file_provider_summary">Udostępnij pliki Winlator selektorom dokumentów i menedżerom plików Androida.</string>
+    <string name="settings_external_display_output_summary">Przenosi grę na podłączony zewnętrzny wyświetlacz zamiast powielać ten ekran. Okulary zawsze korzystają z własnego wyświetlacza.</string>
+    <string name="settings_general_file_provider_summary">Udostępnij pliki WinNative selektorom dokumentów i menedżerom plików Androida.</string>
+    <string name="settings_general_auto_scraping_summary">To ustawienie pozwala WinNative automatycznie pobierać grafiki własnych gier.</string>
     <string name="settings_general_open_browser_summary">Otwieraj obsługiwane linki w przeglądarce Androida zamiast w Wine.</string>
     <string name="settings_general_clipboard_summary">Umożliw kopiowanie i wklejanie między Androidem a sesjami Wine.</string>
     <string name="settings_general_imagefs_summary">Przywróć dołączone pliki systemowe bez usuwania istniejących kontenerów.</string>
@@ -742,7 +818,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Nie udało się zainstalować soundfontu!</string>
     <string name="settings_audio_sound_font_already_exist">Soundfont, który chcesz zainstalować, już istnieje.</string>
     <string name="settings_audio_unable_to_install_soundfont">Nie można zainstalować soundfontu</string>
-    <string name="settings_audio_installing_soundfont">Instalowanie SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Instalowanie SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Nieprawidłowy format SoundFont.</string>
     <string name="settings_audio_cannot_remove_default">Nie można usunąć domyślnego soundfontu</string>
     <string name="settings_audio_summary">Instaluj, usuwaj i wybieraj SoundFont używany do odtwarzania MIDI.</string>
@@ -756,15 +832,33 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_debug_box_logs_subtitle">Zapisuj dane debugowania Box86 i Box64 do pliku</string>
     <string name="settings_debug_fex_logs_title">Włącz logi FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Zapisuj dane debugowania FEXCore do pliku</string>
+    <string name="settings_debug_emulator_logs_title">Dzienniki emulacji Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Zapisuje do pliku emulator używany przez twój kontener.</string>
     <string name="settings_debug_steam_logs_title">Włącz logi Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Loguj zdarzenia uwierzytelniania i sesji Steam do celów debugowania.</string>
     <string name="settings_debug_wine_channels_title">Kanały debugowania Wine</string>
     <string name="settings_debug_wine_channels_summary">Wybierz, które kanały Wine są uwzględniane przy włączonym logowaniu debugowania Wine.</string>
+    <string name="settings_debug_wine_classes_title">Poziomy logów Wine</string>
+    <string name="settings_debug_wine_classes_summary">Wybierz, które typy komunikatów są rejestrowane. Trace jest wyjątkowo szczegółowy.</string>
     <string name="settings_debug_input_logs">Logi wejścia</string>
     <string name="settings_debug_input_logs_description">Loguj zdarzenia gamepada, dotyku i klawiatury</string>
     <string name="settings_debug_download_logs">Logi pobierania</string>
     <string name="settings_debug_download_logs_description">Loguj zdarzenia resolvera pobierania i fallbacku WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Warstwy walidacji Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Uruchom ponownie wyświetlanie, aby zastosować.</string>
     <string name="settings_debug_share_logs">Udostępnij logi</string>
+    <string name="settings_debug_delete_logs">Usuń logi</string>
+    <string name="settings_debug_share_all_logs_short">Udostępnij wszystko</string>
+    <string name="settings_debug_download_all_logs_short">Pobierz wszystko</string>
+    <string name="settings_debug_logs_saved">Zapisano w %1$s</string>
+    <string name="settings_debug_delete_logs_short">Usuń</string>
+    <string name="settings_debug_delete_all_logs_short">Usuń wszystko</string>
+    <string name="settings_debug_open_logs_folder_short">Otwórz menedżer logów</string>
+    <string name="settings_debug_logs_deleted">Logi usunięte</string>
+    <string name="settings_debug_delete_logs_confirm_title">Usunąć logi?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Spowoduje to trwałe usunięcie wszystkich zapisanych plików logów (%1$s). Tej operacji nie można cofnąć.</string>
+    <string name="settings_debug_logs_browser_title">Logi</string>
+    <string name="settings_debug_log_truncated">Wyświetlanie ostatnich %1$s tego logu</string>
     <string name="settings_debug_logs_subject">Logi WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">Brak dostępnych logów debugowania. Najpierw włącz opcje debugowania i uruchom grę.</string>
     <string name="settings_debug_capture_failed">Nie udało się przechwycić logów: %1$s</string>
@@ -779,6 +873,8 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
 
     <string name="settings_other_language_title">Język</string>
     <string name="settings_other_language_summary">Wybierz język wyświetlania</string>
+    <string name="settings_other_game_language_title">Język gry</string>
+    <string name="settings_other_game_language_summary">Preferowany język pobierania ze Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">Domyślny systemu</string>
 
     <string name="settings_other_section_integration">Integracja</string>
@@ -796,7 +892,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_content_empty_subtitle">Zainstaluj pakiet lub zmień typ, aby rozpocząć.</string>
     <string name="settings_content_container_created">Utworzono kontener: %1$s</string>
     <string name="settings_content_download_failed">Pobieranie nie powiodło się.</string>
-    <string name="common_ui_working">Pracuję…</string>
+    <string name="common_ui_working">Pracuję</string>
     <string name="settings_content_desc_wine">Stworzone przez projekt Wine; tłumaczy wywołania Win32 na natywne usługi Linux/Android.</string>
     <string name="settings_content_desc_proton">Stworzone przez Valve; runtime oparty na Wine z łatkami dla gier Windows.</string>
     <string name="settings_content_desc_dxvk">Tłumaczy wywołania graficzne Direct3D 9, 10 i 11 na Vulkan.</string>
@@ -804,6 +900,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_content_desc_box64">Tłumaczy kod Linuksa x86_64, aby działał na urządzeniach ARM64.</string>
     <string name="settings_content_desc_wowbox64">Build Box64 używany przez WoW64 do uruchamiania 32-bitowych aplikacji Windows w 64-bitowym Wine.</string>
     <string name="settings_content_desc_fexcore">Tłumaczy kod x86 i x86_64, aby działał na urządzeniach ARM64.</string>
+    <string name="settings_content_desc_d7vk">Tłumaczy wywołania graficzne DirectDraw (Direct3D 7 i starsze) na Vulkan.</string>
     <string name="settings_content_unable_to_install">Nie można zainstalować zawartości.</string>
     <string name="settings_content_install_failed">Instalacja nie powiodła się</string>
     <string name="settings_content_file_cannot_be_recognized">Nie można rozpoznać pliku.</string>
@@ -815,9 +912,14 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="settings_content_downloading_title">Pobieranie zawartości</string>
     <string name="settings_content_installing_title">Instalowanie zawartości</string>
     <string name="settings_content_extracting_title">Wypakowywanie zawartości</string>
-    <string name="settings_content_extracting_detail">Wypakowywanie… (%1$d plików)</string>
-    <string name="settings_content_preparing_package">Przygotowywanie pakietu…</string>
+    <string name="settings_content_extracting_detail">Wypakowywanie (%1$d plików)</string>
+    <string name="settings_content_preparing_package">Przygotowywanie pakietu</string>
     <string name="settings_content_download_complete">Pobieranie zakończone</string>
+    <string name="settings_content_already_installed_title">Komponent jest już zainstalowany</string>
+    <string name="settings_content_already_installed_message">Ten komponent jest już zainstalowany. Usuń zainstalowaną kopię przed ponownym pobraniem.
+
+Zainstalowana ścieżka:
+%1$s</string>
     <string name="settings_content_conflicting_title">Zainstalowano sprzeczną zawartość</string>
     <string name="settings_content_conflicting_message">Odinstaluj sprzeczną zawartość przed pobraniem tego pakietu.
 
@@ -826,7 +928,7 @@ Zainstalowana ścieżka:
     <string name="settings_content_cannot_be_trusted">Nie można zaufać zawartości.</string>
     <string name="settings_content_is_incomplete">Zawartość jest niekompletna.</string>
     <string name="settings_content_untrusted_files_warning">Ostrzeżenie: Dodatkowa zawartość zawiera niezaufane pliki. Ogólnie, następujące pliki nie powinny być modyfikowane. Zdecyduj, czy kontynuować instalację.</string>
-    <string name="settings_content_confirm_remove">Czy chcesz usunąć tę zawartość?</string>
+    <string name="settings_content_confirm_remove">Spowoduje to usunięcie komponentu z urządzenia.</string>
     <string name="settings_content_unable_to_remove_in_use">Nie można usunąć tej zawartości, ponieważ kontener aktualnie używa tego Wine.</string>
     <string name="settings_content_download_in_components">Nic nie pobrano. Pobierz coś w Komponentach.</string>
     <string name="settings_content_types_header">TYPY ZAWARTOŚCI</string>
@@ -838,9 +940,12 @@ Zainstalowana ścieżka:
     <string name="settings_drivers_install">Zainstaluj sterowniki</string>
     <string name="settings_drivers_installed_success">Sterownik zainstalowany pomyślnie.</string>
     <string name="settings_drivers_install_failed">Nie udało się zainstalować sterownika.</string>
-    <string name="settings_drivers_confirm_remove">Czy chcesz usunąć ten sterownik?</string>
+    <string name="settings_drivers_remove_title">Usunąć sterownik?</string>
+    <string name="settings_drivers_confirm_remove">Spowoduje to usunięcie sterownika z urządzenia.</string>
+    <string name="settings_drivers_remove_repo_title">Usunąć repozytorium?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s zostanie usunięte z listy repozytoriów.</string>
     <string name="settings_drivers_repo_tap_to_load">Dotknij, aby wczytać wydania</string>
-    <string name="settings_drivers_repo_loading_releases">Wczytywanie wydań…</string>
+    <string name="settings_drivers_repo_loading_releases">Wczytywanie wydań</string>
     <string name="settings_drivers_repo_release_count">Wczytano %1$d wydań</string>
     <string name="settings_drivers_repo_no_release_assets">Nie znaleziono zasobów ZIP do pobrania w pobranych wydaniach.</string>
     <string name="settings_drivers_repo_fetch_failed">Nie można wczytać wydań z GitHub.</string>
@@ -850,7 +955,7 @@ Zainstalowana ścieżka:
     <string name="settings_drivers_manager">Menedżer sterowników</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Instalowanie plików systemowych…</string>
+    <string name="setup_wizard_installing_system_files">Instalowanie plików systemowych</string>
     <string name="setup_wizard_unable_to_install_system_files">Nie można zainstalować plików systemowych</string>
     <string name="setup_wizard_system_image_not_installed">Obraz systemu nie jest zainstalowany. Najpierw zainstaluj komponenty.</string>
     <string name="setup_wizard_recommended_components">Zalecane komponenty</string>
@@ -919,6 +1024,9 @@ Zainstalowana ścieżka:
     <string name="google_cloud_sync_started">Rozpoczęto synchronizację w chmurze.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Usługi Google</string>
+    <string name="google_auto_signin_title">Logowanie do Google przy starcie</string>
+    <string name="google_auto_signin_summary">Automatycznie łącz z Google Play Games po uruchomieniu aplikacji, aby kopie zapasowe zapisów i synchronizacja były zawsze gotowe. Gdy wyłączone, aplikacja nigdy nie loguje się samodzielnie.</string>
+    <string name="google_auto_signin_section">Przy starcie</string>
     <string name="google_cloud_play_games">Google Play Games</string>
     <string name="google_cloud_status_syncing">Synchronizowanie</string>
     <string name="google_cloud_status_connected">Połączono</string>
@@ -977,22 +1085,30 @@ Zainstalowana ścieżka:
     <string name="saves_import_export_exported_failed">Nie udało się wyeksportować zapisów: %1$s</string>
     <string name="saves_import_export_imported">Zapisy zaimportowane pomyślnie</string>
     <string name="saves_import_export_imported_failed">Nie udało się zaimportować zapisów: %1$s</string>
+    <string name="saves_export_path_summary">Zapisy zostaną wyeksportowane do /WinNative/saves</string>
+    <string name="saves_export_success_path">Wyeksportowano do %1$s</string>
+    <string name="saves_export_warning_title">Używaj tylko z grami niestandardowymi</string>
+    <string name="saves_export_warning_body">Eksport może zawierać zapisy z gier zainstalowanych ze sklepów lub synchronizowanych z chmurą.</string>
+    <string name="saves_import_warning_title">Spowoduje to nadpisanie istniejących zapisów w tym kontenerze</string>
+    <string name="saves_import_warning_body">Podczas przywracania starszej kopii zapasowej z wieloma grami najpierw skopiuj nowsze zapisy do pliku zip za pomocą menedżera plików. Zmienione zostaną tylko zapisy znajdujące się w pliku .zip. Zarządzaj zapisami rozważnie.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Kontener</string>
-    <string name="preloader_initializing">Inicjalizacja…</string>
-    <string name="preloader_launching">Uruchamianie…</string>
-    <string name="preloader_closing">Zamykanie %1$s…</string>
-    <string name="preloader_setup_environment">Konfiguracja środowiska…</string>
-    <string name="preloader_installing_mono">Instalowanie Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Instalowanie pakietów redystrybucyjnych…</string>
-    <string name="preloader_unpacking_exe">Rozpakowywanie pliku wykonywalnego gry…</string>
-    <string name="preloader_downloading_cloud">Pobieranie zapisów z chmury…</string>
-    <string name="preloader_syncing_cloud">Synchronizacja zapisów z chmury…</string>
-    <string name="preloader_cloud_downloading">Pobieranie synchronizacji chmury…</string>
-    <string name="preloader_cloud_backup">Tworzenie kopii zapasowej na Dysku Google…</string>
+    <string name="preloader_initializing">Inicjalizacja</string>
+    <string name="preloader_launching">Uruchamianie</string>
+    <string name="preloader_closing">Zamykanie %1$s</string>
+    <string name="preloader_setup_environment">Konfiguracja środowiska</string>
+    <string name="preloader_retrying_steam_client_download">Ponawianie pobierania klienta Steam</string>
+    <string name="preloader_installing_mono">Instalowanie Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Instalowanie pakietów redystrybucyjnych</string>
+    <string name="preloader_unpacking_exe">Rozpakowywanie pliku wykonywalnego gry</string>
+    <string name="preloader_downloading_cloud">Pobieranie zapisów z chmury</string>
+    <string name="preloader_syncing_cloud">Synchronizacja zapisów z chmury</string>
+    <string name="preloader_uploading_cloud">Przesyłanie zapisów do chmury</string>
+    <string name="preloader_checking_cloud">Sprawdzanie zapisów w chmurze</string>
+    <string name="preloader_cloud_sync_retry">%1$s Próba %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Pobieranie synchronizacji chmury</string>
     <string name="cloud_sync_failed_provider">Synchronizacja chmury %1$s nie powiodła się.</string>
-    <string name="google_cloud_backup_failed">Kopia zapasowa na Dysku Google nie powiodła się.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -1000,15 +1116,11 @@ Zainstalowana ścieżka:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Grafika</string>
-    <string name="container_backups_title">Kopie zapasowe</string>
-    <string name="container_backups_prompt">Wybierz działanie dla tej kopii zapasowej kontenera.</string>
-    <string name="container_backups_backing_up">Tworzenie kopii zapasowej kontenera…</string>
-    <string name="container_backups_restoring">Przywracanie kontenera…</string>
-    <string name="container_backups_checking">Sprawdzanie kopii zapasowych kontenera…</string>
-    <string name="container_backups_select_title">Wybierz kopię zapasową do przywrócenia</string>
-    <string name="container_backups_no_files">Nie znaleziono kopii zapasowych kontenera na Dysku Google.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Pierwsze przypisanie</string>
     <string name="binding_secondary">Drugie przypisanie</string>
+    <string name="binding_third">Trzecie przypisanie</string>
+    <string name="binding_fourth">Czwarte przypisanie</string>
     <string name="input_controls_editor_tap_to_switch">Dotknij, aby przełączyć</string>
     <string name="input_controls_editor_download_profile">Pobierz profil</string>
     <string name="container_config_emulator_section">Emulator</string>
@@ -1016,6 +1128,7 @@ Zainstalowana ścieżka:
     <string name="session_drawer_fps_monitor">Monitor FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Pokaż statystyki wydajności w czasie rzeczywistym</string>
     <string name="session_drawer_dual_series_battery">Bateria Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Pokaż czas klatki jako liczbę</string>
     <string name="session_drawer_command_center">Centrum poleceń</string>
     <string name="session_drawer_command_center_input">Wejście</string>
     <string name="session_drawer_command_center_display">Ekran</string>
@@ -1028,7 +1141,6 @@ Zainstalowana ścieżka:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Naturalny</string>
     <string name="session_drawer_color_profile_crt">Efekt CRT</string>
-    <string name="session_drawer_upscaler_dls">Żywy</string>
     <string name="session_drawer_calibrate_advanced">Zaawansowana kalibracja</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Gyro</string>
@@ -1040,7 +1152,6 @@ Zainstalowana ścieżka:
     <string name="session_drawer_rail_label_mouse">Mysz</string>
     <string name="session_drawer_rail_label_fullscreen">Pełny ekran</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Natyw.</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Zad.</string>
     <string name="session_drawer_rail_label_logs">Logi</string>
@@ -1054,24 +1165,23 @@ Zainstalowana ścieżka:
     <string name="session_drawer_logs_share_chooser">Udostępnij logi sesji</string>
     <string name="session_drawer_logs_share_failed">Nie udało się udostępnić logów</string>
     <string name="session_drawer_logs_share_empty">Brak wierszy logu do udostępnienia</string>
-    <string name="session_drawer_super_resolution">Filtry Wyostrzania</string>
-    <string name="session_drawer_upscaler_mode">Filtr</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Superrozdzielczość</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Żywe</string>
+    <string name="session_drawer_vivid_strength">Intensywność żywych kolorów</string>
     <string name="session_drawer_main_menu_title">Menu</string>
     <string name="session_gyroscope_activator">Aktywator</string>
     <string name="settings_general_check_for_updates">Sprawdź aktualizacje</string>
     <string name="settings_general_check_for_updates_summary">Automatycznie sprawdzaj nowe wersje aplikacji przy uruchomieniu i okresowo.</string>
     <string name="setup_wizard_containers">Konfiguracja kontenera</string>
-    <string name="google_cloud_auto_backup">Automatyczna kopia Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Automatycznie twórz kopie zapasowe zapisów gry na Dysku Google przy każdym wyjściu z gry.</string>
     <string name="cloud_saves_title">Zapisy w chmurze</string>
-    <string name="cloud_saves_backup">Utwórz kopię zapisu w chmurze</string>
-    <string name="cloud_saves_restore">Przywróć zapis w chmurze</string>
+    <string name="cloud_saves_title_for_provider">Zapisy w chmurze %1$s - %2$s</string>
     <string name="cloud_sync_title">Synchronizacja z chmurą</string>
     <string name="cloud_sync_enabled_summary">Pobieraj zapisy z chmury przy uruchomieniu oraz synchronizuj/twórz ich kopie przy wyjściu.</string>
     <string name="cloud_sync_disabled_summary">Uruchom tę grę bez pobierania zapisów z chmury i bez synchronizacji przy wyjściu.</string>
-    <string name="cloud_saves_backing_up">Tworzenie kopii zapisu w chmurze…</string>
-    <string name="cloud_saves_restoring">Przywracanie zapisu w chmurze…</string>
+    <string name="cloud_saves_backing_up">Tworzenie kopii zapisu w chmurze</string>
+    <string name="cloud_saves_restoring">Przywracanie zapisu w chmurze</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1079,6 +1189,7 @@ Zainstalowana ścieżka:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Steruje buforowaniem wygenerowanych bloków dynarec między uruchomieniami, aby przyspieszyć uruchamianie.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1092,4 +1203,1282 @@ Zainstalowana ścieżka:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Brak poprzednich zapisów w kopii zapasowej. Zastąpione zapisy i ręczne kopie zapasowe będą tu widoczne przez 30 dni.</string>
+    <string name="cloud_saves_history_loading">Ładowanie historii zapisów\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">chmura</string>
+    <string name="cloud_saves_history_origin_local">lokalne</string>
+    <string name="cloud_saves_history_origin_manual">ręczne</string>
+    <string name="cloud_saves_history_refresh">Odśwież</string>
+    <string name="cloud_saves_history_rename">Zmień nazwę</string>
+    <string name="cloud_saves_history_rename_clear">Wyczyść</string>
+    <string name="cloud_saves_history_rename_failed">Nie udało się zmienić nazwy kopii zapasowej.</string>
+    <string name="cloud_saves_history_rename_hint">np. Walka z bossem, Przed zakończeniem</string>
+    <string name="cloud_saves_history_rename_save">Zapisz</string>
+    <string name="cloud_saves_history_rename_success">Nazwa kopii zapasowej zmieniona.</string>
+    <string name="cloud_saves_history_rename_title">Nadaj nazwę tej kopii zapasowej</string>
+    <string name="cloud_saves_history_restore">Przywróć</string>
+    <string name="cloud_saves_history_restore_confirm_body">Zastąpi to bieżący lokalny zapis kopią zapasową z %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Przywrócić tę kopię zapasową?</string>
+    <string name="cloud_saves_history_restore_failed">Nie udało się przywrócić tej kopii zapasowej.</string>
+    <string name="cloud_saves_history_restore_success">Zapis przywrócony z kopii zapasowej.</string>
+    <string name="cloud_saves_history_sign_in">Zaloguj się do Google, aby wyświetlić historię zapisów.</string>
+    <string name="cloud_saves_history_title">Historia zapisów</string>
+    <string name="cloud_saves_history_download">Pobierz</string>
+    <string name="cloud_saves_history_download_success">Plik pobrany.</string>
+    <string name="cloud_saves_history_download_failed">Pobieranie nie powiodło się.</string>
+    <string name="cloud_saves_keep_replaced_backup">Zachowaj kopię zapasową zastąpionego zapisu</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Jeśli zmienisz zdanie, możesz ją przywrócić z Historii zapisów.</string>
+    <string name="cloud_saves_no_backups">Brak kopii zapasowych dla tej gry.</string>
+    <string name="cloud_saves_offline_mode">Wyłącz synchronizację w chmurze</string>
+    <string name="cloud_saves_offline_mode_summary">Zatrzymuje całą automatyczną aktywność w chmurze dla tej gry.</string>
+    <string name="cloud_saves_sync_from_provider">Synchronizuj z chmury %1$s</string>
+    <string name="cloud_saves_sync_from_provider_failed">Nie udało się pobrać zapisu z %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Zarządzaj zapisami w chmurze GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Otwiera oficjalną stronę GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Brak przeglądarki do otwarcia strony zapisów w chmurze GOG</string>
+    <string name="cloud_saves_gog_zip_label">Pobierz ZIP z chmury GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Zapisz bieżące pliki z chmury</string>
+    <string name="cloud_saves_gog_zip_success">Zapisano ZIP zapisów w chmurze GOG.</string>
+    <string name="cloud_saves_gog_zip_failed">Nie udało się zapisać ZIP-a zapisów w chmurze GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Nie znaleziono plików zapisów w chmurze GOG.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Synchronizuj z chmury</string>
+    <string name="cloud_saves_sync_from_provider_success">Zapis w chmurze %1$s pobrany.</string>
+    <string name="cloud_saves_syncing_from_provider">Pobieranie zapisu z %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Pobierz wersję, którą ma teraz %1$s.</string>
+    <string name="cloud_saves_sync_summary_generic">Pobierz bieżącą wersję z chmury.</string>
+    <string name="common_ui_exit_app_confirm">Zamknąć WinNative?</string>
+    <string name="container_surface_effect">Efekt powierzchni</string>
+    <string name="downloads_queue_cancel_download_confirm">Anulować pobieranie %1$s i usunąć wszystkie pobrane pliki?</string>
+    <string name="downloads_queue_paused_resume_hint">Wstrzymano — dotknij Wznów, aby kontynuować</string>
+    <string name="downloads_queue_phase_applying_data">Stosowanie danych</string>
+    <string name="downloads_queue_phase_downloading">Pobieranie</string>
+    <string name="downloads_queue_phase_downloading_file">Pobieranie [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Finalizowanie</string>
+    <string name="downloads_queue_phase_patching">Łatanie</string>
+    <string name="downloads_queue_phase_preparing">Przygotowywanie</string>
+    <string name="downloads_queue_phase_queued">W kolejce</string>
+    <string name="downloads_queue_phase_unknown">Nieznany</string>
+    <string name="downloads_queue_phase_unpacking">Rozpakowywanie</string>
+    <string name="downloads_queue_phase_updating">Aktualizowanie</string>
+    <string name="downloads_queue_phase_verifying">Weryfikowanie</string>
+    <string name="downloads_queue_phase_verifying_file">Weryfikowanie [%1$s]</string>
+    <string name="downloads_queue_status_label">Stan:</string>
+    <string name="downloads_queue_this_game">tę grę</string>
+    <string name="hud_position_bottom_center">Dół — środek</string>
+    <string name="hud_position_bottom_left">Dół — lewo</string>
+    <string name="hud_position_bottom_right">Dół — prawo</string>
+    <string name="hud_position_left_center">Lewo — środek</string>
+    <string name="hud_position_menu_title">Przenieś HUD do</string>
+    <string name="hud_position_right_center">Prawo — środek</string>
+    <string name="hud_position_top_center">Góra — środek</string>
+    <string name="hud_position_top_left">Góra — lewo</string>
+    <string name="hud_position_top_right">Góra — prawo</string>
+    <string name="input_controls_editor_number_of_bindings">Liczba przypisań</string>
+    <string name="input_controls_editor_opacity">Przezroczystość</string>
+    <string name="input_controls_editor_radial_menu">Menu radialne</string>
+    <string name="input_controls_editor_radial_menu_options">Opcje menu radialnego</string>
+    <string name="input_controls_tap_to_click">Dotknij, aby kliknąć</string>
+    <string name="input_controls_reverse_binding_order">Odwróć kolejność przypisań</string>
+    <string name="num_controllers">Liczba kontrolerów</string>
+    <string name="session_drawer_controls_section">Sterowanie</string>
+    <string name="session_drawer_header_subtitle">Szybki dostęp do sterowania, nakładek i narzędzi sesji</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Ustaw Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">Włącz nakładkę, aby ją dostosować</string>
+    <string name="session_drawer_hud_elements">Elementy HUD</string>
+    <string name="session_drawer_hud_input_hint">Wprowadź wartość od %1$d do %2$d. Wartości powyżej limitu są przycinane.</string>
+    <string name="session_drawer_hud_scale">Skala</string>
+    <string name="session_drawer_hud_scale_input_title">Ustaw skalę</string>
+    <string name="session_drawer_hud_summary">Dostosuj widoczność nakładki i punkty danych</string>
+    <string name="session_drawer_screen_effects">Efekty ekranu</string>
+    <string name="session_drawer_session_section">Sesja</string>
+    <string name="session_drawer_swipe_hint">Przesuń, aby wrócić do gry</string>
+    <string name="session_gamepad_enable_vibration">Włącz wibracje</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Eksperymentalne ruchy myszy</string>
+    <string name="session_gyroscope_mouse_scale">Skala myszy</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Skala myszy: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Otwórz ponownie kreatora konfiguracji, aby przejrzeć uprawnienia, pliki systemowe i domyślne kontenery.</string>
+    <string name="settings_other_setup_wizard_title">Kreator konfiguracji</string>
+    <string name="shortcuts_library_artwork_failed">Nie udało się załadować wybranego obrazu.</string>
+    <string name="shortcuts_library_artwork_open_source">Otwórz SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Ustaw obraz</string>
+    <string name="shortcuts_library_artwork_title">Grafiki biblioteki</string>
+    <string name="shortcuts_library_artwork_icon_title">Obraz ikony</string>
+    <string name="shortcuts_library_artwork_hero_title">Tło</string>
+    <string name="shortcuts_list_readded_existing">Ponownie dodano istniejący skrót</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Wstrzykuje DLL patchera DRM przy starcie. Obniża FPS — używaj tylko, gdy sam starszy launcher zawodzi.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Wybierz folder zapisów</string>
+    <string name="cloud_saves_custom_folder_label">Folder zapisów</string>
+    <string name="cloud_saves_custom_select_folder_summary">Wskaż katalog zapisów wewnątrz kontenera</string>
+    <string name="cloud_saves_custom_no_container">Kontener nie jest dostępny dla tego skrótu</string>
+    <string name="cloud_saves_custom_picker_title">Wybierz folder zapisów</string>
+    <string name="cloud_saves_custom_outside_drive_c">Wybrany folder musi znajdować się na dysku C: kontenera</string>
+    <string name="cloud_saves_custom_path_map_failed">Nie udało się zmapować wybranego folderu na ścieżkę Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Folder zapisów ustawiono na %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Synchronizuj ze Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Pobierz najnowszy zapis</string>
+    <string name="cloud_saves_steam_sync_success">Zsynchronizowano ze Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Synchronizacja Steam Cloud nie powiodła się</string>
+    <string name="cloud_saves_steam_browse_label">Wyświetl zapisy Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Otwórz magazyn w chmurze</string>
+    <string name="cloud_saves_steam_browse_no_browser">Brak dostępnej przeglądarki do otwarcia strony Steam</string>
+    <string name="cloud_saves_steam_import_label">Importuj pliki</string>
+    <string name="cloud_saves_steam_import_helper">Przywróć pobrane pliki</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Wybór plików jest niedostępny</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Spowoduje to pobranie bieżących plików zapisów ze Steam Cloud i nadpisanie bieżących plików zapisów.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Nieprawidłowy identyfikator aplikacji</string>
+    <string name="cloud_saves_label_saved">Etykieta zapisana</string>
+    <string name="downloads_queue_cancel_all_title">Anulować wszystkie pobierania?</string>
+    <string name="downloads_queue_cancel_all_warning">Anulowanie pobierania DLC, gry lub aktualizacji może potencjalnie uszkodzić instalacje gier.\n\nCzy na pewno chcesz anulować wszystkie pobierania i usunąć dotąd pobrane pliki?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Użyj starszego launchera</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Starsza emulacja Steam: uruchamia grę przez launcher ColdClient i usuwa SteamStub DRM z pliku exe. Używaj tylko dla starszych gier, które nie działają ze Steam Launcherem.</string>
+    <string name="steam_section_real_client">Prawdziwy klient Steam WinNative</string>
+    <string name="steam_section_emulator">Starszy emulator Steam</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Sprawia, że emulowany klient Steam zgłasza tryb offline, dzięki czemu gra nie próbuje połączeń online. Używaj dla gier, które zawieszają się na sprawdzaniu sieci Steam.</string>
+    <string name="input_controls_select_style">Wybierz styl</string>
+    <string name="input_controls_style_original">Oryginalny</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Łupek</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Błysk</string>
+    <string name="input_controls_style_shadow">Cień</string>
+    <string name="input_controls_style_reticle">Celownik</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Motyw kolorystyczny</string>
+    <string name="input_controls_edit_duplicating_builtin">Wbudowany profil — utworzono kopię, którą możesz edytować.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Zresetować ten profil do oryginalnego układu? Wszystkie wprowadzone zmiany zostaną utracone.</string>
+    <string name="input_controls_editor_profile_reset">Profil zresetowany do oryginalnego układu.</string>
+    <string name="input_controls_editor_reset_unavailable">Brak oryginalnej migawki dla tego profilu.</string>
+    <string name="container_graphics_compositor_present_mode">Synchronizacja wyświetlania Vulkan</string>
+    <string name="cloud_sync_disable_title">Wyłącz zapisy w chmurze</string>
+    <string name="cloud_saves_steam_push_label">Wyślij do Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Wymuś wysłanie lokalnego zapisu</string>
+    <string name="cloud_saves_steam_push_success">Zapis wysłany do Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Nie udało się wysłać zapisu do Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud jest teraz niedostępny. Ponowne łączenie w tle dotknij odśwież, gdy wrócisz online.</string>
+    <string name="steam_session_refused_event">Steam odrzucił zapisaną w pamięci podręcznej sesję (EResult=%1$d). Zaloguj się ponownie.</string>
+    <string name="settings_hud_record_to_file_title">Rejestruj wydajność do pliku</string>
+    <string name="settings_hud_record_to_file_summary">Eksportuje co sekundę metryki FPS, CPU, GPU, temperatury i baterii do /WinNative/logs/ podczas gry.</string>
+    <string name="settings_leaderboard_category">Wydajność</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Przygotowywanie środowiska Steam</string>
+    <string name="preloader_starting_wine">Uruchamianie Wine</string>
+    <string name="preloader_starting_steam_launcher">Uruchamianie Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Ładowanie klienta Steam</string>
+    <string name="preloader_connecting_to_steam">Łączenie ze Steam</string>
+    <string name="preloader_signing_in_to_steam">Logowanie do Steam</string>
+    <string name="preloader_fetching_game_info">Zalogowano — pobieranie informacji o grze</string>
+    <string name="preloader_steam_ready">Steam gotowy</string>
+    <string name="preloader_updating_game_info">Aktualizowanie informacji o grze</string>
+    <string name="preloader_verifying_install">Weryfikowanie instalacji</string>
+    <string name="preloader_scanning_redists">Skanowanie pakietów redystrybucyjnych</string>
+    <string name="preloader_installing_redist_single">Instalowanie pakietu redystrybucyjnego</string>
+    <string name="preloader_installing_named_redist">Instalowanie %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Instalowanie %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Pakiety redystrybucyjne gotowe</string>
+    <string name="preloader_no_redists">Brak pakietów redystrybucyjnych do zainstalowania</string>
+    <string name="preloader_steam_service_running">Usługa Steam działa</string>
+    <string name="preloader_launching_game">Uruchamianie %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher nie powiódł się — ponowne przygotowywanie zasobów</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher nie mógł się uruchomić. Ponowne przygotowywanie — uruchom ponownie</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher dotarł do gry, ale gra się nie uruchomiła</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Ładowanie elementów Workshop</string>
+    <string name="workshop_search_items">Szukaj elementów Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Pobieranie subskrybowanych elementów ze Steam.</string>
+    <string name="workshop_error_title">Nie udało się załadować elementów Workshop</string>
+    <string name="workshop_error_subtitle">Coś poszło nie tak. Spróbuj ponownie.</string>
+    <string name="workshop_empty_title">Brak subskrybowanych elementów Workshop</string>
+    <string name="workshop_empty_subtitle">Subskrybuj elementy w Steam Workshop, a następnie ponownie otwórz to okno.</string>
+    <string name="workshop_search_empty_title">Żaden element nie pasuje do \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Spróbuj innego wyszukiwanego hasła.</string>
+    <string name="workshop_clear_search">Wyczyść wyszukiwanie</string>
+    <string name="workshop_item_fallback">Element Workshop</string>
+    <string name="common_ui_failed">Niepowodzenie</string>
+    <string name="steam_presence_snooze">Drzemka</string>
+    <string name="steam_presence_busy">Zajęty</string>
+    <string name="steam_presence_looking_to_trade">Chce handlować</string>
+    <string name="steam_presence_looking_to_play">Chce grać</string>
+    <string name="steam_friends_count">Znajomi — %1$d online</string>
+    <string name="steam_friends_section_in_game">W grze (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Nie wczytano jeszcze znajomych.</string>
+    <string name="steam_friends_chat_off">Czat jest wyłączony. Włącz ponownie Usługę czatu, aby zobaczyć znajomych.</string>
+    <string name="steam_friends_self_you">Ty</string>
+    <string name="steam_friends_in_game">W grze</string>
+    <string name="steam_friends_join">Dołącz</string>
+    <string name="steam_friends_play">Graj</string>
+    <string name="steam_chat_image_failed">(nie udało się wysłać obrazu)</string>
+    <string name="steam_chat_empty">Brak wiadomości. Przywitaj się!</string>
+    <string name="steam_chat_uploading_image">Wysyłanie obrazu…</string>
+    <string name="steam_chat_send_image">Wyślij obraz</string>
+    <string name="steam_chat_message_hint">Wiadomość…</string>
+    <string name="steam_chat_send">Wyślij</string>
+    <string name="steam_chat_image">Obraz</string>
+    <string name="steam_common_back">Wstecz</string>
+    <string name="steam_achievements_title">Osiągnięcia</string>
+    <string name="steam_achievements_empty">Nie znaleziono osiągnięć dla tej gry,\nlub zaloguj się do Steam, aby je wczytać.</string>
+    <string name="steam_achievements_hidden">Ukryte osiągnięcie</string>
+    <string name="steam_achievements_hidden_desc">Graj dalej, aby odkryć to osiągnięcie.</string>
+    <string name="steam_achievements_unlocked_on">Odblokowano %1$s</string>
+    <string name="steam_achievements_unlocked">Odblokowano</string>
+    <string name="steam_join_joining">Dołączanie do %1$s w %2$s…</string>
+    <string name="steam_join_install">Zainstaluj %1$s, aby dołączyć do %2$s</string>
+    <string name="steam_join_not_owned">Nie posiadasz %1$s</string>
+    <string name="steam_chat_not_sent">(nie wysłano)</string>
+    <string name="steam_join_the_game">grę</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Usługa czatu</string>
+    <string name="steam_chat_setting_service_desc">Zaloguj się, aby widzieć znajomych i czatować; wyłącz, aby przejść w tryb offline</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Wyjście</string>
+    <string name="display_output_prompt_title">Wykryto zewnętrzny wyświetlacz</string>
+    <string name="display_output_prompt_message">Wysłać grę na podłączony wyświetlacz? Sterowanie ekranowe i menu pozostaną na tym telefonie.</string>
+    <string name="display_output_prompt_swap">Przełącz wyświetlacze</string>
+    <string name="display_output_prompt_mirror">Powiel</string>
+    <string name="display_output_swapped_toast">Gra przeniesiona na zewnętrzny wyświetlacz. Sterowanie pozostaje na telefonie.</string>
+    <string name="display_output_cast_unavailable">Ustawienia wyświetlacza bezprzewodowego są niedostępne na tym urządzeniu.</string>
+    <string name="display_output_restored_toast">Zewnętrzny wyświetlacz odłączony — gra wróciła na telefon.</string>
+    <string name="session_drawer_output_title">Wyjście obrazu</string>
+    <string name="session_drawer_output_subtitle">Gra jest wyświetlana na zewnętrznym wyświetlaczu.</string>
+    <string name="session_drawer_output_device">Podłączony wyświetlacz</string>
+    <string name="session_drawer_output_resolution">Rozdzielczość</string>
+    <string name="session_drawer_output_refresh_rate">Częstotliwość odświeżania</string>
+    <string name="session_drawer_output_aspect_ratio">Proporcje obrazu</string>
+    <string name="session_drawer_output_aspect_fit">Dopasuj (proporcje)</string>
+    <string name="session_drawer_output_aspect_stretch">Rozciągnij (wypełnij)</string>
+    <string name="session_drawer_output_aspect_zoom">Powiększ (przytnij)</string>
+    <string name="session_drawer_output_return_to_phone">Wróć do telefonu</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Prześlij do telewizora</string>
+    <string name="session_drawer_output_cast_body">Podłącz adapter USB-C / HDMI lub dotknij poniżej, aby połączyć wyświetlacz bezprzewodowy (Miracast / Wi-Fi Direct). Gra wyświetla się na telewizorze, a te elementy sterujące pozostają na telefonie.</string>
+    <string name="session_drawer_output_cast_button">Połącz wyświetlacz bezprzewodowy</string>
+    <string name="session_drawer_output_cast_note">Telewizory tylko z Chromecastem nie mogą wyświetlać rozgrywki na żywo z prywatnym sterowaniem — aby uzyskać najlepszy efekt, użyj wyświetlacza bezprzewodowego lub adaptera USB‑C/HDMI.</string>
+    <string name="session_drawer_output_render_note">Tryby zgłaszane przez wyświetlacz zmieniają jego rzeczywiste wyjście (może na chwilę zgasnąć podczas ponownej inicjalizacji). Inne rozdzielczości są renderowane w tym rozmiarze i sprzętowo skalowane do panelu — powyżej natywnej jest ostrzej (supersampling), poniżej działa szybciej.</string>
+    <string name="session_drawer_output_scaling_note">Ten telefon wyświetla obraz w natywnej rozdzielczości %1$s i nie zmienia trybu, więc to ustawia rozdzielczość renderowania — jest ona sprzętowo skalowana do panelu (powyżej natywnej wyostrza, poniżej działa szybciej).</string>
+    <string name="session_drawer_output_game_mode">Tryb gry (niskie opóźnienie)</string>
+    <string name="session_drawer_output_game_mode_on">Wł.</string>
+    <string name="session_drawer_output_game_mode_off">Wył.</string>
+    <string name="session_drawer_output_game_mode_note">Żąda trybu gry / niskiego opóźnienia telewizora (HDMI ALLM), aby zminimalizować opóźnienie wejścia. Wyświetlane tylko, gdy podłączony wyświetlacz to obsługuje.</string>
+    <string name="session_drawer_output_send_to_display">Wyślij grę na wyświetlacz</string>
+    <string name="session_drawer_output_to_display">Wyjście na ekran zewnętrzny</string>
+    <string name="session_drawer_output_send_note">Wyświetlacz jest podłączony. Wyślij na niego grę — sterowanie i menu pozostaną na tym telefonie. Możesz w każdej chwili przywrócić ją tutaj.</string>
+    <string name="session_drawer_output_display">Ekran</string>
+    <string name="session_drawer_output_glasses">Okulary</string>
+    <string name="session_drawer_output_brightness">Jasność</string>
+    <string name="session_drawer_output_shade">Przyciemnienie</string>
+    <string name="session_drawer_output_3d">3D (obok siebie)</string>
+    <string name="glasses_panel_refresh">Częstotliwość odświeżania</string>
+    <string name="glasses_panel_sunblock">Filtr słoneczny</string>
+    <string name="session_drawer_output_volume">Głośność</string>
+    <string name="session_drawer_output_glasses_note">Wysyłane bezpośrednio do okularów Viture przez USB.</string>
+
+    <!-- Session > Touch &amp; Gesture Profiles -->
+    <string name="common_ui_new">Nowy</string>
+    <string name="common_ui_rename">Zmień nazwę</string>
+    <string name="gesture_profile_export">Eksportuj profil gestów</string>
+    <string name="gesture_profile_import">Importuj profil gestów</string>
+    <string name="gesture_profile_new">Nowy profil gestów</string>
+    <string name="gesture_profile_none">Brak profili gestów</string>
+    <string name="input_controls_editor_input_profiles_section">Profile wejścia</string>
+    <string name="session_drawer_right_stick_sensitivity">Czułość prawej gałki</string>
+    <string name="session_drawer_rts_gestures">Gesty RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Edytuj</string>
+    <string name="session_drawer_touch">Dotyk</string>
+    <string name="session_drawer_touch_map_right_stick">Mapuj na prawą gałkę</string>
+    <string name="session_drawer_touch_touchscreen">Tryb ekranu dotykowego</string>
+    <string name="session_drawer_touch_trackpad">Gładzik</string>
+    <string name="session_gesture_profile_section">Profil gestów</string>
+    <string name="session_rts_action">Akcja</string>
+    <string name="session_rts_behavior">Zachowanie</string>
+    <string name="session_rts_double_tap">Dwukrotne dotknięcie (dwukrotne kliknięcie lewym)</string>
+    <string name="session_rts_double_tap_delay">Opóźnienie dwukrotnego dotknięcia (ms)</string>
+    <string name="session_rts_down">W dół</string>
+    <string name="session_rts_drag">Przeciąganie 1 palcem</string>
+    <string name="session_rts_pan1">Przesuwanie 1 palcem</string>
+    <string name="session_rts_drag2">Przeciąganie 2 palcami</string>
+    <string name="session_rts_drag_threshold">Próg przeciągania (px)</string>
+    <string name="session_rts_gesture_threshold">Próg gestu (px)</string>
+    <string name="session_rts_hold2">Przytrzymanie 2 palcami</string>
+    <string name="session_rts_hold3">Przytrzymanie 3 palcami</string>
+    <string name="session_rts_hold4">Przytrzymanie 4 palcami</string>
+    <string name="session_rts_hold_delay">Opóźnienie przytrzymania (ms)</string>
+    <string name="session_rts_left">W lewo</string>
+    <string name="session_rts_long_press">Długie przytrzymanie</string>
+    <string name="session_rts_long_press_delay">Opóźnienie długiego przytrzymania (ms)</string>
+    <string name="session_rts_pan">Przesuwanie 2 palcami</string>
+    <string name="session_rts_pan_threshold">Początek przesuwania/szczypania (px)</string>
+    <string name="session_rts_right">W prawo</string>
+    <string name="session_rts_swipe3">Przesunięcie 3 palcami</string>
+    <string name="session_rts_swipe4">Przesunięcie 4 palcami</string>
+    <string name="session_rts_swipe_threshold">Próg przesunięcia (px)</string>
+    <string name="session_rts_tap1">Dotknięcie 1 palcem</string>
+    <string name="session_rts_tap2">Dotknięcie 2 palcami</string>
+    <string name="session_rts_tap3">Dotknięcie 3 palcami</string>
+    <string name="session_rts_tap4">Dotknięcie 4 palcami</string>
+    <string name="session_rts_up">W górę</string>
+    <string name="session_rts_zoom">Powiększenie szczypaniem</string>
+    <string name="session_drawer_brightness">Jasność</string>
+    <string name="session_drawer_contrast">Kontrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Nasycenie</string>
+    <string name="session_drawer_temperature">Temperatura</string>
+    <string name="session_drawer_tint">Odcień</string>
+    <string name="session_drawer_intensity">Intensywność</string>
+    <string name="session_drawer_strength">Siła</string>
+    <string name="session_drawer_sharpen">Wyostrzanie</string>
+    <string name="session_drawer_scanlines">Linie skanowania</string>
+    <string name="session_drawer_pixelate">Pikselizacja</string>
+    <string name="session_drawer_block_size">Rozmiar bloku</string>
+    <string name="session_drawer_scale">Skalowanie</string>
+    <string name="session_drawer_scale_nearest">Najbliższe</string>
+    <string name="session_drawer_scale_linear">Liniowe</string>
+    <string name="session_drawer_scale_bicubic">Dwusześcienne</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Kreskówka</string>
+    <string name="session_drawer_color_blind">Daltonizm</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Resetuj efekty</string>
+    <string name="session_drawer_hud_background">Tło</string>
+    <string name="session_drawer_hud_background_alpha">Alfa tła</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Ustaw alfę tła</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Dopasuj rozmiar</string>
+    <string name="session_task_bring_to_front">Przenieś na wierzch</string>
+    <string name="session_task_custom_value">Wartość niestandardowa</string>
+    <string name="session_gyroscope_orientation_mode">Przechyl, aby celować (orientacja)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Pliki</string>
+    <string name="file_manager_copy">Kopiuj</string>
+    <string name="file_manager_cut">Wytnij</string>
+    <string name="file_manager_paste">Wklej</string>
+    <string name="file_manager_paste_here">Wklej tutaj</string>
+    <string name="file_manager_new_folder">Nowy folder</string>
+    <string name="file_manager_new_folder_short">Folder</string>
+    <string name="file_manager_multi_select">Wybierz</string>
+    <string name="file_manager_create">Utwórz</string>
+    <string name="file_manager_delete">Usuń</string>
+    <string name="file_manager_copy_count">Kopiuj (%1$d)</string>
+    <string name="file_manager_cut_count">Wytnij (%1$d)</string>
+    <string name="file_manager_delete_count">Usuń (%1$d)</string>
+    <string name="file_manager_extract">Wypakuj</string>
+    <string name="file_manager_extract_here">Wypakuj tutaj</string>
+    <string name="file_manager_extract_to">Wypakuj do…</string>
+    <string name="file_manager_extracting">Wypakowywanie %1$s</string>
+    <string name="file_manager_extract_failed">Wypakowywanie nie powiodło się</string>
+    <string name="file_manager_run_boot">Uruchom / Rozruch</string>
+    <string name="file_manager_create_shortcut">Utwórz skrót</string>
+    <string name="file_manager_run_in_container">Uruchom w kontenerze</string>
+    <string name="file_manager_no_containers">Brak dostępnych kontenerów</string>
+    <string name="file_manager_delete_confirm">Usunąć \"%1$s\"? Tej operacji nie można cofnąć.</string>
+    <string name="file_manager_delete_confirm_multi">Usunąć %1$d elementów? Tej operacji nie można cofnąć.</string>
+    <string name="file_manager_copying">Kopiowanie %1$s</string>
+    <string name="file_manager_moving">Przenoszenie %1$s</string>
+    <string name="file_manager_copying_count">Kopiowanie %1$d elementów</string>
+    <string name="file_manager_moving_count">Przenoszenie %1$d elementów</string>
+    <string name="file_manager_paste_into_itself">Nie można wkleić folderu do niego samego</string>
+    <string name="file_manager_operation_failed">Operacja nie powiodła się</string>
+    <string name="file_manager_delete_failed">Usuwanie nie powiodło się</string>
+    <string name="file_manager_rename_failed">Zmiana nazwy nie powiodła się</string>
+    <string name="file_manager_create_folder_failed">Tworzenie folderu nie powiodło się</string>
+    <string name="cloud_saves_google_backup_helper">Zapisz kopię w Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Kopia zapasowa w Google</string>
+    <string name="cloud_saves_google_backup_no_save">Nie znaleziono plików zapisu do utworzenia kopii.</string>
+    <string name="cloud_saves_history_cloud_readonly">Tylko do odczytu</string>
+    <string name="session_drawer_rail_label_record">Nagrywaj</string>
+    <string name="session_record_failed">Nie można rozpocząć nagrywania</string>
+    <string name="session_record_fps">Częstotliwość klatek</string>
+    <string name="session_record_include_ui">Nagrywaj interfejs</string>
+    <string name="session_record_include_ui_subtitle">Uwzględnij HUD i elementy sterujące na ekranie</string>
+    <string name="session_record_now">Nagrywaj teraz</string>
+    <string name="session_record_quality">Jakość</string>
+    <string name="session_record_resolution">Rozdzielczość</string>
+    <string name="session_record_saved">Nagranie zapisano w WinNative/Recordings</string>
+    <string name="session_record_settings_title">Ustawienia nagrywania</string>
+    <string name="session_record_started">Rozpoczęto nagrywanie</string>
+    <string name="steam_chat_setting_stay_running">Uruchom w tle</string>
+    <string name="steam_chat_setting_stay_running_desc">Pozostaw czat aktywny po zamknięciu WinNative</string>
+    <string name="settings_content_refresh">Odśwież</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Przenieś zapis</string>
+    <string name="retro_save_transfer_message">Zaimportuj lokalny zapis do tej gry lub wyeksportuj bieżący zapis.</string>
+    <string name="retro_save_transfer_import">Importuj zapis</string>
+    <string name="retro_save_transfer_export">Eksportuj zapis</string>
+    <string name="retro_save_transfer_import_ok">Zaimportowano zapis</string>
+    <string name="retro_save_transfer_import_failed">Nie udało się zaimportować zapisu</string>
+    <string name="retro_save_transfer_export_ok">Wyeksportowano zapis</string>
+    <string name="retro_save_transfer_export_failed">Nie udało się wyeksportować zapisu</string>
+    <string name="retro_save_transfer_none">Dla tej gry nie ma jeszcze zapisu</string>
+    <string name="retro_cheats_title">Kody</string>
+    <string name="retro_cheats_hardcore_blocked">Kody są wyłączone w trybie Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Zapisz</string>
+    <string name="retro_ps2_cancel">Anuluj</string>
+    <string name="retro_ps2_save_state">Zapisz stan</string>
+    <string name="retro_ps2_load_save_state">Wczytaj stan</string>
+    <string name="retro_ps2_achievements">Osiągnięcia</string>
+    <string name="retro_ps2_cheats">Kody</string>
+    <string name="retro_ps2_memory_cards">Karty pamięci</string>
+    <string name="retro_ps2_fast_forward">Przewijanie</string>
+    <string name="retro_ps2_reset">Resetuj</string>
+    <string name="retro_ps2_swap_disc">Zmień płytę</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Dotknij, aby wczytać</string>
+    <string name="retro_ps2_slot_empty">Pusty</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Dotknij, aby nadpisać</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Pusty — dotknij, aby zapisać</string>
+    <string name="retro_ps2_slot_is_empty">Slot %1$d jest pusty</string>
+    <string name="retro_ps2_loaded_slot">Wczytano slot %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Nie udało się wczytać slotu %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Zapisano w slocie %1$d</string>
+    <string name="retro_ps2_save_failed">Zapis nie powiódł się</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Dotknij, aby użyć</string>
+    <string name="retro_ps2_new_memory_card">Nowa karta pamięci</string>
+    <string name="retro_ps2_import_card">Importuj kartę</string>
+    <string name="retro_ps2_enable_online_dev9">Włącz sieć (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Karta sieciowa PS2 — uruchamia grę ponownie, aby ją podłączyć</string>
+    <string name="retro_ps2_ethernet_device">Urządzenie Ethernet</string>
+    <string name="retro_ps2_dns_mode">Tryb DNS</string>
+    <string name="retro_ps2_primary_dns">Podstawowy DNS</string>
+    <string name="retro_ps2_secondary_dns">Zapasowy DNS</string>
+    <string name="retro_ps2_optional">opcjonalne</string>
+    <string name="retro_ps2_auto_ip_dhcp">Auto IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Serwer: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">dotknij, aby ustawić IP (puste usuwa)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Dodaj host serwera</string>
+    <string name="retro_ps2_new_server_hostname">Nowa nazwa hosta serwera</string>
+    <string name="retro_ps2_server_hostname_hint">np. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Sterowanie ekranowe</string>
+    <string name="retro_ps2_edit_layout">Edytuj układ</string>
+    <string name="retro_ps2_reset_layout">Resetuj układ</string>
+    <string name="retro_ps2_layout_reset">Zresetowano układ</string>
+    <string name="retro_ps2_left_stick_invert_x">Lewa gałka: odwróć X</string>
+    <string name="retro_ps2_left_stick_invert_y">Lewa gałka: odwróć Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Prawa gałka: odwróć X</string>
+    <string name="retro_ps2_right_stick_invert_y">Prawa gałka: odwróć Y</string>
+    <string name="retro_ps2_button_color">Kolor przycisku</string>
+    <string name="retro_ps2_letter_color">Kolor litery</string>
+    <string name="retro_ps2_shadow_color">Kolor cienia</string>
+    <string name="retro_ps2_background_color">Kolor tła</string>
+    <string name="retro_ps2_reset_colors">Resetuj kolory</string>
+    <string name="retro_ps2_renderer">Renderer</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Skala rozdzielczości</string>
+    <string name="retro_ps2_scale_1x_native">1x (natywna)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Proporcje obrazu</string>
+    <string name="retro_ps2_aspect_stretch">Rozciągnij</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtr wyświetlania</string>
+    <string name="retro_ps2_filter_nearest">Najbliższy</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Dwuliniowy (gładki)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Dwuliniowy (ostry)</string>
+    <string name="retro_ps2_texture_filter">Filtr tekstur</string>
+    <string name="retro_ps2_filter_bilinear_forced">Dwuliniowy (wymuszony)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Dwuliniowy (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Dwuliniowy (sprite\'y)</string>
+    <string name="retro_ps2_blending_accuracy">Dokładność mieszania</string>
+    <string name="retro_ps2_blend_minimum">Minimalna</string>
+    <string name="retro_ps2_blend_basic">Podstawowa</string>
+    <string name="retro_ps2_blend_medium">Średnia</string>
+    <string name="retro_ps2_blend_high">Wysoka</string>
+    <string name="retro_ps2_blend_full">Pełna</string>
+    <string name="retro_ps2_blend_maximum">Maksymalna</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Wył.</string>
+    <string name="retro_ps2_shader_scanline">Linie skanowania</string>
+    <string name="retro_ps2_shader_diagonal">Ukośny</string>
+    <string name="retro_ps2_shader_triangular">Trójkątny</string>
+    <string name="retro_ps2_shader_wave">Fala</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Pomijanie klatek</string>
+    <string name="retro_ps2_frameskip_off">Wył.</string>
+    <string name="retro_ps2_frameskip_1">Pomiń 1</string>
+    <string name="retro_ps2_frameskip_2">Pomiń 2</string>
+    <string name="retro_ps2_frameskip_3">Pomiń 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Głośność</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Wycisz</string>
+    <string name="retro_ps2_swap_stereo_channels">Zamień kanały stereo</string>
+    <string name="retro_ps2_ee_cycle_rate">Szybkość cykli EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (domyślnie)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Pomijanie cykli EE</string>
+    <string name="retro_ps2_skip_off">Wył.</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Natychmiastowy VU1</string>
+    <string name="retro_ps2_mtvu">Wielowątkowy VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Szybki CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Szybkość emulacji</string>
+    <string name="retro_ps2_hud_cpu_usage">Użycie CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Użycie GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Rozdzielczość wewnętrzna</string>
+    <string name="retro_ps2_deinterlace_mode">Tryb usuwania przeplotu</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Wył.</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Proporcje obrazu FMV</string>
+    <string name="retro_ps2_anti_blur">Antyrozmycie</string>
+    <string name="retro_ps2_widescreen_patches">Łatki szerokoekranowe</string>
+    <string name="retro_ps2_no_interlace_patches">Łatki bez przeplotu</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Wykrywanie pętli INTC</string>
+    <string name="retro_ps2_wait_loop">Wykrywanie pętli oczekiwania</string>
+    <string name="retro_ps2_time_stretch">Rozciąganie czasu dźwięku</string>
+    <string name="retro_ps2_audio_buffer">Bufor dźwięku</string>
+    <string name="retro_ps2_audio_latency">Opóźnienie wyjścia</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Czasy klatek</string>
+    <string name="retro_ps2_hud_gs_stats">Statystyki GS</string>
+    <string name="retro_ps2_hud_hw_info">Informacje o sprzęcie</string>
+    <string name="retro_ps2_hud_version">Wersja</string>
+    <string name="retro_ps2_hud_input_display">Wyświetlanie wejścia</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Ekran</string>
+    <string name="retro_ps2_tab_performance">Wydajność</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Dźwięk</string>
+    <string name="retro_ps2_tab_online">Sieć</string>
+    <string name="retro_ps2_tab_controls">Sterowanie</string>
+    <string name="retro_ps2_resume">Wznów</string>
+    <string name="retro_ps2_pause">Pauza</string>
+    <string name="retro_ps2_exit">Wyjdź</string>
+    <string name="retro_lr_bios_imported">Zaimportowano BIOS: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Nieprawidłowy plik BIOS</string>
+    <string name="retro_lr_invalid_retro_game">Nieprawidłowa gra retro</string>
+    <string name="retro_lr_rom_not_found">Nie znaleziono ROM: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Nie udało się odczytać ROM z tego archiwum</string>
+    <string name="retro_lr_core_not_installed">Rdzeń nie zainstalowany: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Kody włączone — osiągnięcia są wyłączone w tej sesji</string>
+    <string name="retro_lr_cloud_save_restored">Przywrócono zapis w chmurze</string>
+    <string name="retro_lr_restore_failed">Przywracanie nie powiodło się</string>
+    <string name="retro_lr_cloud_conflict_message">Istnieje nowszy zapis w chmurze dla %1$s. Czy chcesz zsynchronizować i który zapis w chmurze zachować?</string>
+    <string name="retro_lr_cloud_save">Zapis w chmurze</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Nie udało się wczytać rdzenia emulatora</string>
+    <string name="retro_lr_failed_load_rom">Nie udało się wczytać ROM</string>
+    <string name="retro_lr_graphics_not_supported">Grafika nieobsługiwana dla tego rdzenia</string>
+    <string name="retro_lr_emulator_error">Błąd emulatora</string>
+    <string name="retro_lr_shader_default">Domyślny</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Ostry</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Skalowanie SGSR</string>
+    <string name="retro_lr_upscale_native">Natywna</string>
+    <string name="retro_lr_sound">Dźwięk</string>
+    <string name="retro_lr_left_stick_invert_x">Lewa gałka: odwróć X</string>
+    <string name="retro_lr_left_stick_invert_y">Lewa gałka: odwróć Y</string>
+    <string name="retro_lr_right_stick_invert_x">Prawa gałka: odwróć X</string>
+    <string name="retro_lr_right_stick_invert_y">Prawa gałka: odwróć Y</string>
+    <string name="retro_lr_on_screen_controls">Sterowanie ekranowe</string>
+    <string name="retro_lr_haptic_feedback">Wibracje dotykowe</string>
+    <string name="retro_lr_portrait">Pionowo</string>
+    <string name="retro_lr_landscape">Poziomo</string>
+    <string name="retro_lr_edit_layout">Edytuj układ (%1$s)</string>
+    <string name="retro_lr_reset_layout">Resetuj układ %1$s</string>
+    <string name="retro_lr_layout_reset">Zresetowano układ %1$s</string>
+    <string name="retro_lr_button_color">Kolor przycisku</string>
+    <string name="retro_lr_letter_color">Kolor litery</string>
+    <string name="retro_lr_shadow_color">Kolor cienia</string>
+    <string name="retro_lr_background_color">Kolor tła</string>
+    <string name="retro_lr_reset_colors">Resetuj kolory</string>
+    <string name="retro_lr_colors_reset">Zresetowano kolory</string>
+    <string name="retro_lr_performance_hud">HUD wydajności</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa tła</string>
+    <string name="retro_lr_background">Tło</string>
+    <string name="retro_lr_scale">Skala</string>
+    <string name="retro_lr_numeric_frametime">Numeryczny czas klatki</string>
+    <string name="retro_lr_dual_series_battery">Bateria dwuszeregowa</string>
+    <string name="retro_lr_hud_elements">ELEMENTY HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsola</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Bateria</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Wykres</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Zapisz stan</string>
+    <string name="retro_lr_load_save_state">Wczytaj stan</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Wczytywanie stanów jest wyłączone w trybie Hardcore</string>
+    <string name="retro_lr_achievements">Osiągnięcia</string>
+    <string name="retro_lr_cheats">Kody</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Kody są wyłączone w trybie Hardcore</string>
+    <string name="retro_lr_reset">Resetuj</string>
+    <string name="retro_lr_fast_forward">Przewijanie</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Przewijanie jest wyłączone w trybie Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Płyta %1$d/%2$d</string>
+    <string name="retro_lr_resume">Wznów</string>
+    <string name="retro_lr_pause">Pauza</string>
+    <string name="retro_lr_exit">Wyjdź</string>
+    <string name="retro_lr_saved_to_slot">Zapisano w slocie %1$d</string>
+    <string name="retro_lr_could_not_save_state">Nie udało się zapisać stanu</string>
+    <string name="retro_lr_bios_required_title">Wymagany BIOS %1$s</string>
+    <string name="retro_lr_bios_required_message">Gry PlayStation wymagają prawdziwego pliku BIOS konsoli, który musisz dostarczyć. Zaimportuj BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin lub scph7001.bin), aby kontynuować.</string>
+    <string name="retro_lr_import_bios">Importuj BIOS…</string>
+    <string name="retro_lr_cancel">Anuluj</string>
+    <string name="retro_lr_slot_empty">Slot %1$d jest pusty</string>
+    <string name="retro_lr_loaded_slot">Wczytano slot %1$d</string>
+    <string name="retro_lr_could_not_load_state">Nie udało się wczytać stanu</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Zmień nazwę slotu %1$d</string>
+    <string name="retro_gs_section_general">Ogólne</string>
+    <string name="retro_gs_section_graphics">Grafika</string>
+    <string name="retro_gs_section_performance">Wydajność</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Wejście</string>
+    <string name="retro_gs_section_audio">Dźwięk</string>
+    <string name="retro_gs_section_online">Sieć</string>
+    <string name="retro_gs_cancel">Anuluj</string>
+    <string name="retro_gs_save">Zapisz</string>
+    <string name="retro_gs_shader_default">Domyślny</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Ostry</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Natywna</string>
+    <string name="retro_gs_group_game">GRA</string>
+    <string name="retro_gs_label_name">Nazwa</string>
+    <string name="retro_gs_label_system">System</string>
+    <string name="retro_gs_label_emulator_core">Rdzeń emulatora</string>
+    <string name="retro_gs_label_rom_path">Ścieżka ROM</string>
+    <string name="retro_gs_group_bios">BIOS %1$s</string>
+    <string name="retro_gs_label_installed">Zainstalowany</string>
+    <string name="retro_gs_bios_none">Brak — wymagany do uruchamiania gier %1$s</string>
+    <string name="retro_gs_import_bios">Importuj BIOS…</string>
+    <string name="retro_gs_remove_bios">Usuń BIOS</string>
+    <string name="retro_gs_group_library_artwork">GRAFIKA BIBLIOTEKI</string>
+    <string name="retro_gs_artwork_game_card">Obraz karty gry</string>
+    <string name="retro_gs_artwork_grid">Obraz siatki</string>
+    <string name="retro_gs_artwork_carousel">Obraz karuzeli</string>
+    <string name="retro_gs_artwork_list">Obraz listy</string>
+    <string name="retro_gs_artwork_custom_set">Ustawiono obraz niestandardowy</string>
+    <string name="retro_gs_artwork_set_image">Ustaw obraz</string>
+    <string name="retro_gs_artwork_remove">Usuń</string>
+    <string name="retro_gs_group_video">WIDEO</string>
+    <string name="retro_gs_video_filter">Filtr wideo</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Skalowanie SGSR</string>
+    <string name="retro_gs_performance_hud">HUD wydajności</string>
+    <string name="retro_gs_group_core">RDZEŃ</string>
+    <string name="retro_gs_renderer">Renderer</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Skala rozdzielczości</string>
+    <string name="retro_gs_scale_1x_native">1x (natywna)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Proporcje obrazu</string>
+    <string name="retro_gs_aspect_stretch">Rozciągnij</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtr wyświetlania</string>
+    <string name="retro_gs_filter_nearest">Najbliższy</string>
+    <string name="retro_gs_filter_bilinear_smooth">Dwuliniowy (gładki)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Dwuliniowy (ostry)</string>
+    <string name="retro_gs_texture_filter">Filtr tekstur</string>
+    <string name="retro_gs_filter_bilinear_forced">Dwuliniowy (wymuszony)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Dwuliniowy (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Dwuliniowy (sprite\'y)</string>
+    <string name="retro_gs_blending_accuracy">Dokładność mieszania</string>
+    <string name="retro_gs_blend_minimum">Minimalna</string>
+    <string name="retro_gs_blend_basic">Podstawowa</string>
+    <string name="retro_gs_blend_medium">Średnia</string>
+    <string name="retro_gs_blend_high">Wysoka</string>
+    <string name="retro_gs_blend_full">Pełna</string>
+    <string name="retro_gs_blend_maximum">Maksymalna</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Wył.</string>
+    <string name="retro_gs_tvshader_scanline">Linie skanowania</string>
+    <string name="retro_gs_tvshader_diagonal">Ukośny</string>
+    <string name="retro_gs_tvshader_triangular">Trójkątny</string>
+    <string name="retro_gs_tvshader_wave">Fala</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Pomijanie klatek</string>
+    <string name="retro_gs_frameskip_1">Pomiń 1</string>
+    <string name="retro_gs_frameskip_2">Pomiń 2</string>
+    <string name="retro_gs_frameskip_3">Pomiń 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">WYDAJNOŚĆ</string>
+    <string name="retro_gs_ee_cycle_rate">Szybkość cykli EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (domyślnie)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Pomijanie cykli EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Natychmiastowy VU1</string>
+    <string name="retro_gs_mtvu">Wielowątkowy VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Szybki CDVD</string>
+    <string name="retro_gs_group_performance_hud">HUD WYDAJNOŚCI</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Szybkość emulacji</string>
+    <string name="retro_gs_hud_cpu_usage">Użycie CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Użycie GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Rozdzielczość wewnętrzna</string>
+    <string name="retro_gs_deinterlace_mode">Tryb usuwania przeplotu</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Wył.</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Proporcje obrazu FMV</string>
+    <string name="retro_gs_anti_blur">Antyrozmycie</string>
+    <string name="retro_gs_widescreen_patches">Łatki szerokoekranowe</string>
+    <string name="retro_gs_no_interlace_patches">Łatki bez przeplotu</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Wykrywanie pętli INTC</string>
+    <string name="retro_gs_wait_loop">Wykrywanie pętli oczekiwania</string>
+    <string name="retro_gs_time_stretch">Rozciąganie czasu dźwięku</string>
+    <string name="retro_gs_audio_buffer">Bufor dźwięku</string>
+    <string name="retro_gs_audio_latency">Opóźnienie wyjścia</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Czasy klatek</string>
+    <string name="retro_gs_hud_gs_stats">Statystyki GS</string>
+    <string name="retro_gs_hud_hw_info">Informacje o sprzęcie</string>
+    <string name="retro_gs_hud_version">Wersja</string>
+    <string name="retro_gs_hud_input_display">Wyświetlanie wejścia</string>
+    <string name="retro_gs_fast_boot">Szybki rozruch</string>
+    <string name="retro_gs_group_online_dev9">SIEĆ (DEV9)</string>
+    <string name="retro_gs_enable_online">Włącz sieć</string>
+    <string name="retro_gs_ethernet_device">Urządzenie Ethernet</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Tryb DNS</string>
+    <string name="retro_gs_dns_manual">Ręczny</string>
+    <string name="retro_gs_dns_internal">Wewnętrzny</string>
+    <string name="retro_gs_primary_dns">Podstawowy DNS</string>
+    <string name="retro_gs_secondary_dns">Zapasowy DNS</string>
+    <string name="retro_gs_dns_optional">opcjonalne</string>
+    <string name="retro_gs_auto_ip_dhcp">Auto IP (DHCP)</string>
+    <string name="retro_gs_group_input">WEJŚCIE</string>
+    <string name="retro_engine_save">Zapisz</string>
+    <string name="retro_engine_saved">Gra zapisana</string>
+    <string name="retro_engine_loading">Wczytywanie…</string>
+    <string name="retro_engine_load">Wczytaj</string>
+    <string name="retro_engine_saved_to">Zapisano w %1$s</string>
+    <string name="retro_engine_slot_active_only">Aktywny</string>
+    <string name="retro_engine_rename_slot">Zmień nazwę slotu zapisu</string>
+    <string name="retro_engine_caught">Złapano: %1$d</string>
+    <string name="retro_engine_no_slots">Brak slotów zapisu</string>
+    <string name="retro_engine_new_slot">Nowy slot zapisu</string>
+    <string name="retro_engine_achievements_unavailable">Nieśledzone w trybie 3D</string>
+    <string name="retro_engine_fullscreen">Pełny ekran</string>
+    <string name="retro_engine_loaded_from">Wczytano %1$s</string>
+    <string name="retro_engine_slot_empty">Ten slot jest pusty</string>
+    <string name="retro_engine_loading_subtitle">Pierwsze przygotowywanie danych gry</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Graj w tę grę w silniku wokselowym 3D zamiast standardowego rdzenia</string>
+    <string name="retro_gs_on_screen_controls">Sterowanie ekranowe</string>
+    <string name="retro_gs_haptic_feedback">Wibracje dotykowe</string>
+    <string name="retro_gs_group_audio">DŹWIĘK</string>
+    <string name="retro_gs_volume">Głośność</string>
+    <string name="retro_gs_mute">Wycisz</string>
+    <string name="retro_gs_swap_stereo">Zamień kanały stereo</string>
+    <string name="retro_gs_sound">Dźwięk</string>
+    <string name="retro_scr_retro_defaults">USTAWIENIA DOMYŚLNE RETRO</string>
+    <string name="retro_scr_retro_defaults_desc">Ustawienia domyślne stosowane do gier każdej konsoli, chyba że zostaną zastąpione we własnych ustawieniach gry.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Konto</string>
+    <string name="retro_scr_signed_in">Zalogowano</string>
+    <string name="retro_scr_not_signed_in_hint">Nie zalogowano — otwórz Osiągnięcia gry, aby się zalogować</string>
+    <string name="retro_scr_achievements_enabled">Osiągnięcia włączone</string>
+    <string name="retro_scr_hardcore_default">Tryb Hardcore domyślnie (bez stanów zapisu)</string>
+    <string name="retro_scr_sign_out">Wyloguj</string>
+    <string name="retro_scr_playstation_bios">BIOS PLAYSTATION</string>
+    <string name="retro_scr_installed">Zainstalowany</string>
+    <string name="retro_scr_none_ps1_bios">Brak — gry PS1 wymagają BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importuj BIOS PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">Usunięto BIOS PS1</string>
+    <string name="retro_scr_no_bios_to_remove">Brak BIOS do usunięcia</string>
+    <string name="retro_scr_remove_ps1_bios">Usuń BIOS PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Brak — gry PS2 wymagają BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Scalony zrzut jednoplikowy (.bin z oznaczeniem regionu, ~4 MB). Podzielone zestawy ROM0/MEC/NVM nie są akceptowane.</string>
+    <string name="retro_scr_import_ps2_bios">Importuj BIOS PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">Usunięto BIOS PS2</string>
+    <string name="retro_scr_remove_ps2_bios">Usuń BIOS PS2</string>
+    <string name="retro_scr_library_artwork">GRAFIKA BIBLIOTEKI</string>
+    <string name="retro_scr_retro_case_art">Grafika pudełka retro (kartridż / etui CD)</string>
+    <string name="retro_scr_box_art">Grafika pudełka</string>
+    <string name="retro_scr_box_art_desc">Pobierana automatycznie z thumbnails.libretro.com przy imporcie; niestandardowy obraz zawsze ją zastępuje.</string>
+    <string name="retro_scr_roms_folder">FOLDER ROM</string>
+    <string name="retro_scr_folder">Folder</string>
+    <string name="retro_scr_roms_not_set">Nie ustawiono — wybierz folder do automatycznego importu gier</string>
+    <string name="retro_scr_auto_import">Automatyczny import</string>
+    <string name="retro_scr_auto_import_desc">Nowe gry w tym folderze są automatycznie dodawane do biblioteki z wykryciem właściwej konsoli.</string>
+    <string name="retro_scr_select_roms_folder_title">Wybierz folder ROM</string>
+    <string name="retro_scr_select_roms_folder_button">Wybierz folder ROM…</string>
+    <string name="retro_scr_change_roms_folder_button">Zmień folder ROM…</string>
+    <string name="retro_scr_scan_now">Skanuj teraz</string>
+    <string name="retro_scr_console_defaults">USTAWIENIA DOMYŚLNE KONSOLI</string>
+    <string name="retro_scr_console_defaults_desc">Dotknij konsoli, aby ustawić jej ustawienia domyślne.</string>
+    <string name="retro_scr_renderer">Renderer</string>
+    <string name="retro_scr_upscale_resolution">Skaluj rozdzielczość</string>
+    <string name="retro_scr_aspect_ratio">Proporcje obrazu</string>
+    <string name="retro_scr_aspect_stretch">Rozciągnij</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtr wyświetlania</string>
+    <string name="retro_scr_filter_nearest">Najbliższy</string>
+    <string name="retro_scr_filter_bilinear_smooth">Dwuliniowy (gładki)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Dwuliniowy (ostry)</string>
+    <string name="retro_scr_texture_filter">Filtr tekstur</string>
+    <string name="retro_scr_filter_bilinear_forced">Dwuliniowy (wymuszony)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Dwuliniowy (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Dwuliniowy (sprite\'y)</string>
+    <string name="retro_scr_blending_accuracy">Dokładność mieszania</string>
+    <string name="retro_scr_blend_minimum">Minimalna</string>
+    <string name="retro_scr_blend_basic">Podstawowa</string>
+    <string name="retro_scr_blend_medium">Średnia</string>
+    <string name="retro_scr_blend_high">Wysoka</string>
+    <string name="retro_scr_blend_full">Pełna</string>
+    <string name="retro_scr_blend_maximum">Maksymalna</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Wył.</string>
+    <string name="retro_scr_shader_scanline">Linie skanowania</string>
+    <string name="retro_scr_shader_diagonal">Ukośny</string>
+    <string name="retro_scr_shader_triangular">Trójkątny</string>
+    <string name="retro_scr_shader_wave">Fala</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Pomijanie klatek</string>
+    <string name="retro_scr_skip_1">Pomiń 1</string>
+    <string name="retro_scr_skip_2">Pomiń 2</string>
+    <string name="retro_scr_skip_3">Pomiń 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Szybkość cykli EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (domyślnie)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Pomijanie cykli EE</string>
+    <string name="retro_scr_skip_off">Wył.</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Natychmiastowy VU1</string>
+    <string name="retro_scr_mtvu">Wielowątkowy VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Szybki CDVD</string>
+    <string name="retro_scr_touch_controls">Sterowanie dotykowe na ekranie</string>
+    <string name="retro_scr_sound">Dźwięk</string>
+    <string name="retro_scr_swap_stereo">Zamień kanały stereo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: szybkość emulacji</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: użycie CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: użycie GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: rozdzielczość wewnętrzna</string>
+    <string name="retro_scr_enable_online_dev9">Włącz sieć (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Urządzenie Ethernet</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Tryb DNS</string>
+    <string name="retro_scr_dns_manual">Ręczny</string>
+    <string name="retro_scr_dns_internal">Wewnętrzny</string>
+    <string name="retro_scr_primary_dns">Podstawowy DNS</string>
+    <string name="retro_scr_secondary_dns">Zapasowy DNS</string>
+    <string name="retro_scr_optional">opcjonalne</string>
+    <string name="retro_scr_auto_ip_dhcp">Auto IP (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Skalowanie SGSR</string>
+    <string name="retro_scr_performance_hud">HUD wydajności</string>
+    <string name="retro_scr_credits_licenses">AUTORZY &amp; LICENCJE</string>
+    <string name="retro_scr_credits_desc">Niektóre funkcje WinNative są oparte na tych projektach open-source. Dotknij, aby zobaczyć każde źródło.</string>
+    <string name="retro_scr_tab_defaults">Domyślne</string>
+    <string name="retro_scr_tab_credits">Autorzy</string>
+    <string name="retro_scr_enable_hardcore_title">Włączyć tryb Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">Tryb Hardcore resetuje teraz grę i wyłącza wczytywanie stanów zapisu, przewijanie i kody. Wszelkie niezapisane postępy zostaną utracone. Kontynuować?</string>
+    <string name="retro_scr_cancel">Anuluj</string>
+    <string name="retro_scr_enable">Włącz</string>
+    <string name="retro_scr_bios_imported">Zaimportowano BIOS: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Nieprawidłowy plik BIOS</string>
+    <string name="retro_scr_ps2_bios_imported">Zaimportowano BIOS PS2: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Nieprawidłowy plik BIOS PS2</string>
+    <string name="retro_scr_no_game_serial">Brak numeru seryjnego gry do wyszukania kodów.</string>
+    <string name="retro_scr_applied_cheats">Zastosowano %1$d kod(ów).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Nie udało się zastosować kodów.</string>
+    <string name="retro_scr_cheats">Kody</string>
+    <string name="retro_scr_apply">Zastosuj</string>
+    <string name="retro_scr_no_cheats_found">Nie znaleziono kodów dla tej gry.</string>
+    <string name="retro_scr_achievements">Osiągnięcia</string>
+    <string name="retro_scr_sign_in_ra">Zaloguj się do RetroAchievements</string>
+    <string name="retro_scr_username">Nazwa użytkownika</string>
+    <string name="retro_scr_password">Hasło</string>
+    <string name="retro_scr_login_failed">Logowanie nie powiodło się</string>
+    <string name="retro_scr_signing_in">Logowanie…</string>
+    <string name="retro_scr_sign_in">Zaloguj</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pkt</string>
+    <string name="retro_scr_no_achievements">Brak osiągnięć dla tej gry.</string>
+    <string name="retro_scr_back">Wstecz</string>
+    <string name="retro_scr_enabled">Włączone</string>
+    <string name="retro_scr_disabled">Wyłączone</string>
+    <string name="retro_scr_rename">Zmień nazwę</string>
+    <string name="retro_scr_save">Zapisz</string>
+    <string name="retro_scr_cloud_save_conflict">Konflikt zapisu w chmurze</string>
+    <string name="retro_scr_keep_local_save">Zachowaj zapis lokalny</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Ekran</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Dźwięk</string>
+    <string name="retro_tab_controls">Sterowanie</string>
+    <string name="retro_scan_up_to_date">Biblioteka aktualna</string>
+    <string name="retro_scan_roms">ROM-y: %1$s</string>
+    <string name="retro_scan_added">dodano %1$d</string>
+    <string name="retro_scan_removed">usunięto %1$d</string>
+    <string name="retro_scr_shader_default">Domyślny</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Ostry</string>
+    <string name="retro_scr_upscale_native">Natywna</string>
+    <string name="retro_co_aspect_ratio">Proporcje obrazu</string>
+    <string name="retro_co_ntsc_filter">Filtr NTSC</string>
+    <string name="retro_co_colorization">Koloryzacja</string>
+    <string name="retro_co_color_correction">Korekcja kolorów</string>
+    <string name="retro_co_remove_sprite_limit">Usuń limit sprite\'ów</string>
+    <string name="retro_co_resolution">Rozdzielczość</string>
+    <string name="retro_co_framebuffer_emulation">Emulacja bufora ramki</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Hack panoramiczny</string>
+    <string name="retro_co_val_8_7_native">8:7 (natywna)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Wył.</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">Ekran GBA</string>
+    <string name="retro_co_val_gbc_screen">Ekran GBC</string>
+    <string name="retro_co_val_on">Wł.</string>
+    <string name="retro_co_val_320x240_native">320x240 (natywna)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 dopasowane</string>
+    <string name="retro_co_val_native">Natywna</string>
+    <string name="retro_co_val_internal">Wewnętrzna</string>
+    <string name="retro_co_val_on_16_9">Wł. (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Zaloguj się swoim kontem RetroAchievements, aby zdobywać i śledzić osiągnięcia w grach retro.</string>
+    <string name="retro_ach_username">Nazwa użytkownika</string>
+    <string name="retro_ach_password">Hasło</string>
+    <string name="retro_ach_enter_credentials">Wprowadź nazwę użytkownika i hasło</string>
+    <string name="retro_ach_login_failed">Logowanie nie powiodło się</string>
+    <string name="retro_ach_sign_in">Zaloguj</string>
+    <string name="retro_ach_password_disclaimer">Twoje hasło jest używane tylko raz do uzyskania tokenu logowania, który jest bezpiecznie przechowywany na urządzeniu.</string>
+    <string name="retro_ach_achievements_enabled">Osiągnięcia włączone</string>
+    <string name="retro_ach_hardcore_mode">Tryb Hardcore (bez stanów zapisu)</string>
+    <string name="retro_ach_points">%1$d / %2$d punktów</string>
+    <string name="retro_ach_none_found">Nie znaleziono osiągnięć dla tej gry.</string>
+    <string name="retro_ach_sign_out">Wyloguj</string>
+    <string name="retro_che_brand">KODY</string>
+    <string name="retro_che_name">Nazwa</string>
+    <string name="retro_che_code">Kod</string>
+    <string name="retro_che_cancel">Anuluj</string>
+    <string name="retro_che_save">Zapisz</string>
+    <string name="retro_che_default_name">Kod %1$d</string>
+    <string name="retro_che_empty">Brak kodów. Dodaj kod dla tej gry.</string>
+    <string name="retro_che_add">Dodaj kod</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Sterownik GPU</string>
+    <string name="retro_gpu_driver_system">System (Domyślny)</string>
+    <string name="retro_gpu_driver_hint">Zainstaluj sterowniki Turnip w Ustawienia \u2192 Sterowniki. Te same sterowniki działają zarówno w grach PC, jak i PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Wirtualny dysk wewnętrzny dla gier opartych na HDD, takich jak Final Fantasy XI. Uruchamia grę ponownie.</string>
+    <string name="retro_ps2_hdd_desc">Wirtualny dysk wewnętrzny dla gier opartych na HDD, takich jak Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Tryb DNS ustawiony na Internal, aby Twoje niestandardowe hosty serwera zaczęły działać.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">Rdzeń CPU</string>
+<string name="retro_co_dual_core">Dwa rdzenie</string>
+<string name="retro_co_internal_cheats">Wbudowane kody</string>
+<string name="retro_co_internal_resolution">Rozdzielczość wewnętrzna</string>
+<string name="retro_co_renderer">Renderer</string>
+<string name="retro_co_sensor_bar">Pozycja listwy sensorów</string>
+<string name="retro_co_skip_gc_bios">Pomiń intro BIOS</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Dół</string>
+<string name="retro_co_val_cached_interpreter">Interpreter z buforowaniem</string>
+<string name="retro_co_val_hardware">Sprzętowy</string>
+<string name="retro_co_val_interpreter">Interpreter</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Mysz / dotyk</string>
+<string name="retro_co_val_right_stick_absolute">Prawy drążek (bezwzględny)</string>
+<string name="retro_co_val_right_stick_relative">Prawy drążek (względny)</string>
+<string name="retro_co_val_software">Programowy</string>
+<string name="retro_co_val_stretch">Rozciągnij</string>
+<string name="retro_co_val_top">Góra</string>
+<string name="retro_co_vbi_skip">Pomijanie VBI (automatyczne pomijanie klatek)</string>
+<string name="retro_co_widescreen">Panoramiczny</string>
+<string name="retro_co_wiimote_pointer">Wskaźnik Wiimote</string>
+<string name="retro_gs_cheats_apply_note">Zmiany zostaną zastosowane przy następnym uruchomieniu tej gry.</string>
+<string name="retro_gs_cheats_detect_hint">Uruchom tę grę raz, aby można było wykryć numer seryjny płyty, a następnie pojawią się tutaj kody i łatki.</string>
+<string name="retro_gs_dnas_entry_desc">Obejście autoryzacji DNAS — wymagane do gry online</string>
+<string name="retro_gs_dnas_group">Stosowane automatycznie (online)</string>
+<string name="retro_gs_group_cheats">Kody i łatki</string>
+<string name="retro_gs_hdd_image_size">Rozmiar: %1$s</string>
+<string name="retro_gs_hdd_import">Importuj obraz HDD</string>
+<string name="retro_gs_hdd_remove_short">Usuń</string>
+<string name="retro_gs_netplay_enable">Włącz NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">Domyślnie wyłączone. Włącz, a następnie przed uruchomieniem wybierz Hostuj lub Dołącz.\nWyłącza się ponownie po zamknięciu gry.</string>
+<string name="retro_gs_netplay_host">Adres hosta</string>
+<string name="retro_gs_netplay_host_hint">IP lub nazwa hosta</string>
+<string name="retro_gs_netplay_host_mode">Sesja hosta</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Wł. = czekaj na gracza. Wył. = dołącz do adresu hosta</string>
+<string name="retro_gs_netplay_not_ready">NetPlay używa lokalnych portów gry wieloosobowej przez TCP (gracz 1 host / gracz 2 klient). PS2 online używa zamiast tego Ethernetu DEV9.</string>
+<string name="retro_gs_netplay_port">Port</string>
+<string name="retro_lr_memory_card_slot">Karta pamięci %1$d</string>
+<string name="retro_lr_screenshot">Zrzut ekranu</string>
+<string name="retro_lr_use_cloud_save">Użyj zapisu w chmurze</string>
+<string name="retro_netplay_conn_direct">LAN (bezpośrednie IP)</string>
+<string name="retro_netplay_connecting">Łączenie…</string>
+<string name="retro_netplay_connection">Połączenie</string>
+<string name="retro_netplay_conn_traversal">Online (kod hosta)</string>
+<string name="retro_netplay_dismiss">Odrzuć</string>
+<string name="retro_netplay_dolphin_help">NetPlay dla GameCube/Wii używa własnego silnika Dolphin. Host = Gracz 1, Dołącz = Gracz 2. Wybierz Hostuj lub Dołącz oraz typ połączenia przed uruchomieniem; oba urządzenia wspólnie uruchamiają tę samą grę.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Udostępnij adres IP Wi‑Fi swojego urządzenia oraz ten port graczowi 2. Gra uruchamia się automatycznie po jego połączeniu.</string>
+<string name="retro_netplay_dolphin_host_online_hint">Kod hosta jest wyświetlany po uruchomieniu gry — udostępnij go graczowi 2. Gra uruchamia się automatycznie po jego połączeniu.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Wprowadź adres IP Wi‑Fi hosta oraz port, a następnie uruchom, aby się połączyć.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Wprowadź kod hosta od gracza 1, a następnie uruchom, aby się połączyć.</string>
+<string name="retro_netplay_enable_before_launch">Włącz NetPlay w ustawieniach gry i wybierz Hostuj lub Dołącz przed uruchomieniem</string>
+<string name="retro_netplay_find_rooms">Znajdź pokoje w sieci Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · każdy ekran to osobna konsola przenośna</string>
+<string name="retro_netplay_gba_not_ready">Gra wieloosobowa GBA używa gpSP + adaptera bezprzewodowego. Upewnij się, że zainstalowano libgpsp.</string>
+<string name="retro_netplay_help">Gra wieloosobowa ze wspólnym ekranem przez Wi‑Fi (jak w RetroArch).\nHost = Gracz 1, Dołącz = Gracz 2. Oba urządzenia pokazują tę samą grę.</string>
+<string name="retro_netplay_help_game_link">Game Link przez Wi‑Fi — każde urządzenie uruchamia własną grę.\nGB/GBC: łącze szeregowe Gambatte (Pokémon gen. 1–2).\nGBA: adapter bezprzewodowy gpSP (walki Pokémon FR/LG/Emerald).</string>
+<string name="retro_netplay_host_action">Hostuj pokój</string>
+<string name="retro_netplay_host_code">Kod hosta</string>
+<string name="retro_netplay_host_code_hint">Kod hosta traversal od hosta</string>
+<string name="retro_netplay_hosting_room">Hostowanie pokoju</string>
+<string name="retro_netplay_host_mode_hint">Naciśnij Hostuj, aby otworzyć pokój na tę sesję gry, a następnie uruchom grę. NetPlay wyłącza się po zamknięciu.</string>
+<string name="retro_netplay_in_room">W pokoju</string>
+<string name="retro_netplay_join_action">Dołącz przez IP</string>
+<string name="retro_netplay_joined">Dołączono</string>
+<string name="retro_netplay_join_room">Dołącz</string>
+<string name="retro_netplay_launch_mode">Przy uruchomieniu</string>
+<string name="retro_netplay_leave">Opuść</string>
+<string name="retro_netplay_menu_hint">Host = G1 · Dołącz = G2 · ta sama gra na obu ekranach</string>
+<string name="retro_netplay_mode_host">Hostuj</string>
+<string name="retro_netplay_mode_join">Dołącz</string>
+<string name="retro_netplay_mode_manual">Ręcznie</string>
+<string name="retro_netplay_no_rooms">Nie znaleziono pokoi. Upewnij się, że host jest w tej samej sieci Wi‑Fi i hostuje pokój.</string>
+<string name="retro_netplay_player_name">Wyświetlana nazwa</string>
+<string name="retro_netplay_player_name_hint">Widoczna dla innych graczy</string>
+<string name="retro_netplay_players_count">Połączono: %1$d</string>
+<string name="retro_netplay_prelaunch_hint">Pokój jest otwarty tylko na tę sesję. Uruchom, gdy będziesz gotów. Zamknięcie gry wyłącza NetPlay.</string>
+<string name="retro_netplay_room_players">Gracze</string>
+<string name="retro_netplay_scan_action">Skanuj Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Skanuj ponownie</string>
+<string name="retro_netplay_scan_hint">Przeskanuj tę samą sieć Wi‑Fi w poszukiwaniu otwartych pokoi lub dołącz przez adres IP.</string>
+<string name="retro_netplay_scanning">Skanowanie Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Wyniki skanowania</string>
+<string name="retro_netplay_select_room_hint">Naciśnij pokój, aby dołączyć teraz (nie zapisuje adresu IP na następne uruchomienie).</string>
+<string name="retro_netplay_stop_scan">Zatrzymaj skanowanie</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s połączony</string>
+<string name="retro_netplay_user_disconnected">%1$s rozłączony</string>
+<string name="retro_netplay_waiting_players">Oczekiwanie na graczy…</string>
+<string name="retro_ps2_coming_soon">Obsługa PlayStation 2 pojawi się wkrótce</string>
+<string name="retro_ps2_show_l3r3">Pokaż przyciski L3 / R3</string>
+<string name="retro_ps2_show_l3r3_subtitle">Gdy wyłączone, dwukrotnie naciśnij drążek, aby kliknąć L3 / R3</string>
+<string name="retro_ps2_turnip_flags">FLAGI STEROWNIKA TURNIP</string>
+<string name="retro_ps2_turnip_flags_note">Stosowane tylko, gdy powyżej wybrano niestandardowy sterownik GPU.</string>
+<string name="retro_rom_missing">Nie znaleziono pliku gry</string>
+<string name="retro_scr_delete">Usuń</string>
+<string name="retro_scr_import_from_file">Importuj z pliku…</string>
+<string name="retro_scr_loading">Ładowanie…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Zmień konsolę</string>
+    <string name="retro_gs_identify_as">Identyfikuj jako konsolę</string>
+    <string name="retro_gs_console_changed">Teraz zidentyfikowano jako %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Zastosuj efekt ReShade (.fx) do gier DXVK/VKD3D (Vulkan) za pomocą wbudowanej warstwy vkBasalt. Umieść każdy efekt w osobnym folderze w Android/data/&lt;package&gt;/files/ReShade/. Dostrajanie parametrów na żywo i przełącznik w grze pojawią się wraz z aktualizacją warstwy przeładowywanej na żywo.</string>
+    <string name="reshade_catalog_title">Efekty ReShade</string>
+    <string name="reshade_catalog_search">Szukaj efektów…</string>
+    <string name="reshade_catalog_installed">Zainstalowane (%1$d)</string>
+    <string name="reshade_catalog_available">Dostępne (%1$d)</string>
+    <string name="reshade_catalog_downloading">Pobieranie</string>
+    <string name="reshade_catalog_installing">Instalowanie</string>
+    <string name="reshade_catalog_offline_cache">Offline — wyświetlanie listy z pamięci podręcznej. Połącz się, aby pobrać nowe efekty.</string>
+    <string name="reshade_catalog_offline_none">Offline — wyświetlanie tylko zainstalowanych efektów. Połącz się, aby przeglądać katalog.</string>
+    <string name="reshade_catalog_needs_connection">Połącz się z internetem, aby pobrać efekty.</string>
+    <string name="reshade_catalog_download_failed">Nie udało się pobrać %1$s.</string>
+    <string name="reshade_catalog_empty_query">Żaden efekt nie pasuje do \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Brak dostępnych efektów. Połącz się z internetem, aby przeglądać katalog.</string>
+    <string name="reshade_catalog_done">Gotowe</string>
+    <string name="reshade_catalog_delete_cd">Usuń %1$s</string>
+    <string name="reshade_catalog_delete_title">Usunąć %1$s?</string>
+    <string name="reshade_catalog_delete_body">Spowoduje to usunięcie efektu z pamięci oraz z każdego zestawu, który go używa. Możesz go pobrać ponownie później.</string>
+    <string name="reshade_catalog_delete_confirm">Usuń</string>
+    <string name="reshade_catalog_delete_cancel">Anuluj</string>
+    <string name="reshade_catalog_delete_failed">Nie udało się usunąć %1$s.</string>
+    <string name="reshade_params_title">PARAMETRY EFEKTU</string>
+    <string name="reshade_params_reset">Resetuj</string>
+    <string name="reshade_loadout_empty">Nie ma jeszcze efektów. Dodaj jeden lub więcej efektów, aby utworzyć zestaw.</string>
+    <string name="reshade_loadout_add">Dodaj efekt</string>
+    <string name="reshade_loadout_full">Zestaw pełny — usuń efekt, aby dodać kolejny.</string>
+    <string name="reshade_effect_active">aktywny</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stos</string>
+    <string name="reshade_mode_solo_hint">Jeden efekt aktywny naraz (porównanie A/B, przełączaj na żywo w grze).</string>
+    <string name="reshade_mode_stack_hint">Nakładaj dowolny podzbiór efektów, stosowane w kolejności.</string>
+    <string name="reshade_drawer_enable">Włącz ReShade</string>
+    <string name="reshade_drawer_empty">Brak efektów ReShade w tym zestawie. Dodaj efekty w ustawieniach tej gry (lub kontenera), aby je tutaj przełączać i dostrajać.</string>
+    <string name="reshade_drawer_no_params">Ten efekt nie udostępnia żadnych regulowanych parametrów.</string>
+    <string name="cloud_saves_deleting">Usuwanie zapisu…</string>
+    <string name="cloud_saves_history_delete">Usuń</string>
+    <string name="cloud_saves_history_delete_confirm_body">Trwale usunąć zapis w chmurze z %1$s? Tej operacji nie można cofnąć.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Usuń zapis w chmurze</string>
+    <string name="cloud_saves_history_delete_failed">Nie udało się usunąć zapisu w chmurze</string>
+    <string name="cloud_saves_history_delete_success">Zapis w chmurze usunięty</string>
+    <string name="retro_bundle_required">Najpierw pobierz rdzenie konsol — Ustawienia › Retro</string>
+    <string name="retro_ps2_device_unsupported">To urządzenie nie obsługuje emulacji PS2 — wymaga OpenGL ES 3.1 lub nowszego.</string>
+    <string name="retro_scr_consoles_check">Sprawdź aktualizacje</string>
+    <string name="retro_scr_consoles_checking">Sprawdzanie aktualizacji…</string>
+    <string name="retro_scr_consoles_download">Pobierz rdzenie konsol</string>
+    <string name="retro_scr_consoles_downloading">Pobieranie… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Rdzenie konsol</string>
+    <string name="retro_scr_consoles_installed">Zainstalowano — kompilacja %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Zainstalowano — kompilacja %1$s (nie udało się sprawdzić aktualizacji)</string>
+    <string name="retro_scr_consoles_installing">Instalowanie…</string>
+    <string name="retro_scr_consoles_missing">Nie zainstalowano — pobierz, aby grać w gry retro</string>
+    <string name="retro_scr_consoles_state">Stan</string>
+    <string name="retro_scr_consoles_update">Zaktualizuj rdzenie konsol</string>
+    <string name="retro_scr_consoles_update_available">Dostępna aktualizacja — kompilacja %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Weryfikowanie pobranego pliku…</string>
+    <string name="retro_scr_consoles_working">Trwa praca…</string>
+    <string name="retro_tab_system">System</string>
 </resources>
+
diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml
new file mode 100644
index 000000000..413149067
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Imagem</item>
+        <item>Original</item>
+        <item>Cor sólida</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f0a919aa9..739c85610 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Por favor, selecione um arquivo .exe valido</string>
     <string name="common_ui_select_valid_icon_file">Por favor, selecione um arquivo .ico ou .png valido.</string>
     <string name="common_ui_exit">Sair</string>
+    <string name="common_ui_exit_app">Sair do aplicativo</string>
     <string name="common_ui_profile">Perfil</string>
     <string name="common_ui_name">Nome</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Icone</string>
     <string name="common_ui_duplicate">Duplicar</string>
     <string name="common_ui_credits_and_third_party_apps">Creditos e aplicativos de terceiros</string>
-    <string name="common_ui_loading">Carregando…</string>
+    <string name="common_ui_loading">Carregando</string>
+    <string name="common_ui_exporting">Exportando</string>
     <string name="common_ui_enable">Ativar</string>
     <string name="common_ui_disable">Desativar</string>
     <string name="common_ui_force">Forcar</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Altura</string>
     <string name="common_ui_open_file">Abrir Arquivo</string>
     <string name="common_ui_download_file">Baixar Arquivo</string>
-    <string name="common_ui_downloading_file">Baixando Arquivo...</string>
+    <string name="common_ui_downloading_file">Baixando Arquivo</string>
     <string name="common_ui_browse">Navegar</string>
     <string name="common_ui_options">Opcoes</string>
     <string name="common_ui_export">Exportar</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Configuracoes</string>
     <string name="common_ui_enable_all">Ativar tudo</string>
     <string name="common_ui_disable_all">Desativar tudo</string>
+    <string name="common_ui_select_all">Selecionar tudo</string>
+    <string name="common_ui_deselect_all">Desmarcar tudo</string>
     <string name="common_ui_on">Ligado</string>
     <string name="common_ui_off">Desligado</string>
     <string name="common_ui_already_set">Ja Definido</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Instalar</string>
     <string name="common_ui_application">Aplicativo</string>
     <string name="common_ui_check">Verificar</string>
+    <string name="store_game_check_for_update">Verificar atualização</string>
+    <string name="store_game_checking_for_update">Verificando</string>
+    <string name="store_game_download_update">Baixar atualização</string>
+    <string name="store_game_no_update_available">Nenhuma atualização disponível</string>
+    <string name="store_game_update_available">Atualização disponível</string>
+    <string name="store_game_update_check_failed">Falha ao verificar atualização</string>
+    <string name="store_game_update">Atualizar</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verificar arquivos</string>
+    <string name="store_game_verify_started">Verificando %1$s — confira a aba Downloads</string>
+    <string name="store_game_steam_options">Opções do Steam</string>
+    <string name="store_game_verify_complete">Verificação de arquivos concluída</string>
+    <string name="store_game_verify_failed_notice">Falha na verificação de arquivos</string>
+    <string name="store_game_progress_background_hint">Você pode fechar isto — continuará em segundo plano. Confira a aba Downloads quando quiser.</string>
+    <string name="store_game_checking_updates">Verificando atualizações</string>
+    <string name="store_game_no_updates_notice">Nenhuma atualização disponível</string>
+    <string name="store_game_update_complete">Atualização concluída</string>
+    <string name="store_game_update_failed_notice">Falha na atualização</string>
+    <string name="store_game_update_check_failed_notice">Falha ao verificar atualizações</string>
+    <string name="store_game_download_already_active">Este jogo já está sendo baixado. Cancele o download atual antes de adicionar DLC.</string>
     <string name="common_ui_select">Selecionar</string>
     <string name="common_ui_select_folder">Selecionar pasta</string>
     <string name="common_ui_current_folder">Pasta atual</string>
+    <string name="common_ui_enter_path">Inserir caminho</string>
+    <string name="common_ui_path_not_found">Caminho não encontrado</string>
     <string name="common_ui_storage_roots">Locais de armazenamento</string>
     <string name="common_ui_browse_local_folders_directly">Navegar pelas pastas locais diretamente</string>
     <string name="common_ui_no_folders_available_here">Nenhuma pasta disponível aqui</string>
     <string name="common_ui_grant_all_files_access_browse">Conceda acesso total aos arquivos para navegar pelas pastas locais diretamente.</string>
     <string name="common_ui_not_configured">Não configurado</string>
     <string name="common_ui_reinstall">Reinstalar</string>
-    <string name="common_ui_exit_app_confirm">Sair do WinNative?</string>
     <string name="common_ui_elements_count">%1$d elementos</string>
     <string name="common_ui_disabled_placeholder">-- Desativado --</string>
     <string name="common_ui_enabled">Ativado</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Obter arte</string>
+    <string name="library_games_scraping_artwork">Obtendo…</string>
     <string name="library_games_shortcut_created">Atalho criado</string>
     <string name="library_games_failed_to_create_shortcut">Falha ao criar atalho: %s</string>
     <string name="library_games_install_path">Caminho de Instalacao</string>
+    <string name="library_games_not_enough_space">Precisa de mais %1$s de espaco</string>
     <string name="library_games_download_slash_install">Baixar / Instalar</string>
     <string name="library_games_save_management">GERENCIAMENTO DE SAVES</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Disponivel: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">Nenhum Jogo Instalado\nClique para abrir o Backend do Winlator</string>
     <string name="library_games_installed_badge">INSTALADO</string>
     <string name="library_games_unknown_game">Jogo Desconhecido</string>
-    <string name="library_games_layouts_header">LAYOUTS</string>
+    <string name="library_games_layouts_header">LAYOUTS DA BIBLIOTECA</string>
     <string name="library_games_layout_carousel">Carrossel</string>
     <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPÇÕES DE VISUALIZAÇÃO</string>
+    <string name="library_games_immersive_mode">Modo imersivo</string>
+    <string name="library_games_immersive_mode_description">Usar a arte do jogo em foco como plano de fundo</string>
+    <string name="library_games_immersive_blur">Desfocar o plano de fundo</string>
+    <string name="library_games_immersive_blur_description">Aplicar um efeito de desfoque ao plano de fundo imersivo</string>
     <string name="library_games_custom_game">Jogo Personalizado</string>
     <string name="library_games_play">Jogar</string>
+    <string name="hero_boot_to_desktop_title">Inicializar na área de trabalho</string>
+    <string name="hero_graphics_tests_title">Testes gráficos</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Testes de entrada</string>
     <string name="library_games_add_custom_game">Adicionar Jogo Personalizado</string>
     <string name="library_games_game_name">Nome do Jogo</string>
     <string name="library_games_game_folder_mapped_drive">Pasta do jogo (unidade de jogo mapeada)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Cancelado</string>
     <string name="downloads_queue_phase_failed">Falhou: %1$s</string>
     <string name="downloads_queue_cancel_download">Cancelar Download</string>
+    <string name="downloads_queue_cancel_download_title">Cancelar download?</string>
+    <string name="downloads_queue_cancel_download_warning">Cancelar o download de um DLC, jogo ou atualização pode corromper a instalação do jogo.\n\nTem certeza de que deseja cancelar?</string>
     <string name="downloads_queue_empty">Nenhum download ativo.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Novo Container</string>
     <string name="containers_list_edit">Editar Container</string>
-    <string name="containers_list_creating">Criando Container…</string>
-    <string name="containers_list_removing">Removendo Container…</string>
-    <string name="containers_list_duplicating">Duplicando Container…</string>
+    <string name="containers_list_creating">Criando Container</string>
+    <string name="containers_list_removing">Removendo Container</string>
+    <string name="containers_list_duplicating">Duplicando Container</string>
+    <string name="containers_list_remove_title">Remover container</string>
+    <string name="containers_list_duplicate_title">Duplicar container</string>
     <string name="containers_list_confirm_remove">Deseja remover este container?</string>
     <string name="containers_list_confirm_duplicate">Deseja duplicar este container?</string>
+    <string name="containers_list_duplicate_failed">Falha ao duplicar o container</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Deseja remover este atalho?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Falha ao clonar atalho.</string>
     <string name="shortcuts_list_exported_to">Atalho exportado para %1$s</string>
     <string name="shortcuts_list_failed_export">Falha ao exportar atalho</string>
+    <string name="shortcuts_export_all">Exportar tudo</string>
+    <string name="shortcuts_export_to_frontend">Exportar para o frontend</string>
+    <string name="shortcuts_export_all_done">%1$d jogos exportados para %2$s</string>
+    <string name="shortcuts_export_all_none">Nenhum jogo para exportar</string>
     <string name="shortcuts_list_added">Atalho adicionado com sucesso.</string>
     <string name="shortcuts_list_failed_add">Falha ao adicionar atalho.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Desativar Xinput (Para Controle Exclusivo de M/T)</string>
     <string name="shortcuts_properties_exclusive_input">Entrada Exclusiva</string>
     <string name="shortcuts_properties_custom_game_settings">Configuracoes Personalizadas do Jogo</string>
-    <string name="shortcuts_properties_use_cold_client">Usar ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient é a forma preferida de lidar com emulação Steam e DRM. Ele corrige o DRM em tempo de execução sem modificar os arquivos do jogo.</string>
-    <string name="shortcuts_properties_unpack_files">DRM Legado</string>
-    <string name="shortcuts_properties_unpack_files_description">Remove o DRM SteamStub do exe no disco. Ative apenas se o jogo não iniciar sem isso. O patcher de runtime do ColdClient lida com a maioria dos jogos automaticamente.</string>
-    <string name="shortcuts_properties_force_dlc">Forcar DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Ative apenas se as DLCs nao forem detectadas ou saves com DLC nao estiverem funcionando</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Iniciar Cliente Steam (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Inicia o cliente real do Steam no Wine\nRequer uma conta Steam e pode reduzir o desempenho\nNem todos os jogos funcionam</string>
-    <string name="shortcuts_properties_steam_type">Desempenho do cliente Steam</string>
-    <string name="steam_section_emulator">Emulador Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Cliente Steam real</string>
     <string name="shortcuts_properties_use_steam_input">Usar Entrada Steam</string>
     <string name="shortcuts_properties_steam_offline_mode">Modo Offline do Steam</string>
     <string name="shortcuts_properties_reset">Redefinir Propriedades</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Deseja duplicar este perfil?</string>
     <string name="input_controls_editor_title">Editor de Controles</string>
     <string name="input_controls_editor_toggle_switch">Interruptor</string>
+    <string name="input_controls_editor_swipeable">Deslizável</string>
     <string name="input_controls_editor_profile_exported_to">Perfil exportado para</string>
     <string name="input_controls_editor_unable_to_import">Nao foi possivel importar o perfil</string>
     <string name="input_controls_editor_import_profile">Importar Perfil</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Compatibilidade</string>
     <string name="container_box64_intermediate">Intermediario</string>
     <string name="container_box64_performance">Desempenho</string>
+    <string name="container_fexcore_performance_tso">Desempenho TSO</string>
+    <string name="container_fexcore_extreme">Extremo</string>
+    <string name="container_fexcore_extreme_tso">Extremo TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Tratamento de flags nas opcodes CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Trata CALL/RET como se nunca precisasse de flags (mais rapido, instavel)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Predefinicao FEXCore</string>
     <string name="container_fexcore_version">Versao do FEXCore</string>
+    <string name="use_unix_libs">Usar UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Driver Grafico</string>
+    <string name="container_zink_mode">Modo Zink</string>
+    <string name="container_graphics_transcoder">Transcodificador BCn</string>
+    <string name="container_graphics_quality">Qualidade BCn</string>
     <string name="container_graphics_configuration">Configuracao do Driver Grafico</string>
     <string name="container_graphics_version">Versao do Driver Grafico</string>
     <string name="container_graphics_available_extensions">Extensoes Disponiveis</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">Emulacao BCn</string>
     <string name="container_graphics_bcn_emulation_type">Tipo de Emulacao BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Cache de Emulacao BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Super-resolução para jogos 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Nitidez das bordas</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Deseja duplicar esta predefinicao?</string>
     <string name="container_presets_confirm_remove">Deseja remover esta predefinicao?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Usar extensao DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Simular tela sensivel ao toque</string>
     <string name="session_xserver_preferences_button_text">   PREFERENCIAS   </string>
     <string name="session_xserver_extra_keys_config_desc">Aqui voce pode definir o valor da variavel extra-keys como no aplicativo Termux (leia <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">isto</a>) e mais \n
@@ -526,12 +572,6 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="session_xserver_pref_kbd">Teclado</string>
     <string name="session_xserver_pref_other">Outro</string>
     <string name="session_xserver_pref_version">Versao</string>
-    <string name="session_xserver_use_dri3_description">Desativar pode corrigir falhas graficas em alguns dispositivos</string>
-    <string name="session_xserver_native_rendering">Renderizacao Nativa</string>
-    <string name="session_xserver_native_rendering_enabled">Renderizacao por hardware DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Fallback de WSI por software</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Renderizacao nativa ativada (tera efeito no proximo inicio)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Renderizacao nativa desativada (tera efeito no proximo inicio)</string>
     <string name="session_xserver_notification_description">Mensagens do XServer do WinNative</string>
     <string name="session_xserver_notification_content">WinNative está em execução, não feche ou deslize esta notificação</string>
 
@@ -551,6 +591,8 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="session_drawer_exit_subtitle">Fechar a sessao em execucao</string>
     <string name="session_drawer_touchscreen_overlay">Sobreposicao da Tela Sensivel ao Toque</string>
     <string name="session_drawer_resume">Retomar</string>
+    <string name="session_drawer_retry">Tentar novamente</string>
+    <string name="downloads_no_internet">Sem conexão com a internet</string>
     <string name="session_drawer_pause">Pausar</string>
     <string name="session_drawer_wine_processes_paused">Processos do Wine estao pausados</string>
     <string name="session_drawer_pause_all_wine_processes">Pausar todos os processos do Wine</string>
@@ -561,6 +603,33 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Bat.</string>
     <string name="session_drawer_hud_element_graph">Graf.</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD estilo Mango</string>
+    <string name="session_drawer_hud_mango_settings">Configurações do HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Carga da GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. da GPU</string>
+    <string name="mango_hud_element_cpu_load">Carga da CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. da CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Bateria</string>
+    <string name="mango_hud_element_lows" formatted="false">Mínimos de 1%</string>
+    <string name="mango_hud_element_graph">Gráfico de frametime</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Clock da CPU</string>
+    <string name="mango_hud_element_gpu_clock">Clock da GPU</string>
+    <string name="mango_hud_element_cores">Por núcleo</string>
+    <string name="mango_hud_element_network">Rede</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Resolução</string>
+    <string name="mango_hud_element_wine">Versão do Wine</string>
+    <string name="mango_hud_element_duration">Tempo de sessão</string>
+    <string name="mango_hud_element_clock">Relógio</string>
+    <string name="mango_hud_element_throttle">Estado térmico</string>
+    <string name="mango_hud_group_memory">Memória</string>
+    <string name="mango_hud_group_system">Sistema</string>
+    <string name="mango_hud_lock">Bloquear HUD</string>
+    <string name="mango_hud_lock_subtitle">Permite que os toques cheguem aos controles atrás do HUD. Segure o HUD para bloqueá-lo. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Deseja encerrar este processo?</string>
@@ -591,6 +660,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="session_display_frame_rate">Taxa de Quadros</string>
     <string name="session_display_title">Tela</string>
     <string name="session_display_fullscreen_stretched">Ativar Tela Cheia (Esticada)</string>
+    <string name="session_display_direct_composition">Composição direta (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderizador:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="session_gamepad_error_loading_profile">Erro ao carregar perfil</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Controles de toque</string>
+    <string name="input_controls_auto_hide_on_controller_title">Ocultar automaticamente com controle</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Ocultar os controles de toque quando um controle estiver conectado</string>
     <string name="session_gyroscope_title">Giroscopio</string>
     <string name="session_gyroscope_calibrate">Calibrar Giroscopio</string>
     <string name="session_gyroscope_enable_right_stick">Ativar Movimento Giroscopico do Analogico Direito</string>
@@ -700,6 +773,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_general_select_wallpaper">Selecionar papel de parede</string>
     <string name="settings_general_title">Geral</string>
     <string name="settings_general_enable_file_provider">Ativar Provedor de Arquivos</string>
+    <string name="settings_general_enable_auto_scraping">Ativar obtenção automática de arte</string>
     <string name="settings_general_take_effect_next_startup">Esta opcao tera efeito na proxima inicializacao.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Reinstalar Imagefs</string>
@@ -713,7 +787,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_general_share_android_clipboard">Compartilhar Area de Transferencia do Android com o Wine</string>
     <string name="settings_general_paths_title">Configuracoes de Caminho</string>
     <string name="settings_general_paths_summary">Gerenciar onde o Winlator armazena seus dados de trabalho e onde os atalhos exportados sao gravados.</string>
-    <string name="settings_general_winlator_path_title">Caminho do Winlator</string>
+    <string name="settings_general_winlator_path_title">Caminho de armazenamento</string>
     <string name="settings_general_shortcut_export_path_title">Caminho de Exportacao de Atalhos</string>
     <string name="settings_general_choose_path">Escolher Caminho</string>
     <string name="settings_general_xserver_cursor_summary">Ajustar a velocidade do ponteiro para entrada por toque, trackpad e mouse dentro da sessao XServer.</string>
@@ -721,7 +795,9 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_general_cursor_lock_summary">Mantem a captura direta do mouse ativada para jogos que precisam de entrada bruta do ponteiro. Desative com Volume Baixo.</string>
     <string name="settings_general_xinput_toggle_title">Desativar XInput</string>
     <string name="settings_general_xinput_toggle_summary">Desliga o tratamento XInput quando voce quer controle exclusivo de mouse e teclado.</string>
-    <string name="settings_general_file_provider_summary">Expor arquivos do Winlator para seletores de documentos e gerenciadores de arquivos do Android.</string>
+    <string name="settings_external_display_output_summary">Move o jogo para um monitor externo conectado em vez de espelhar esta tela. Os óculos sempre usam a própria tela.</string>
+    <string name="settings_general_file_provider_summary">Expor arquivos do WinNative para seletores de documentos e gerenciadores de arquivos do Android.</string>
+    <string name="settings_general_auto_scraping_summary">Permite que o WinNative obtenha automaticamente a arte de jogos personalizados.</string>
     <string name="settings_general_open_browser_summary">Abrir links da web compativeis no navegador Android em vez de dentro do Wine.</string>
     <string name="settings_general_clipboard_summary">Permitir copiar e colar entre o Android e sessoes do Wine.</string>
     <string name="settings_general_imagefs_summary">Restaurar arquivos do sistema inclusos sem remover seus containers existentes.</string>
@@ -736,7 +812,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Falha ao instalar SoundFont!</string>
     <string name="settings_audio_sound_font_already_exist">O SoundFont que voce deseja instalar ja existe.</string>
     <string name="settings_audio_unable_to_install_soundfont">Nao foi possivel instalar o SoundFont</string>
-    <string name="settings_audio_installing_soundfont">Instalando SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Instalando SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Formato de SoundFont invalido.</string>
     <string name="settings_audio_cannot_remove_default">Nao e possivel remover o SoundFont padrao</string>
     <string name="settings_audio_summary">Instalar, remover e escolher o SoundFont usado para reproducao MIDI.</string>
@@ -750,15 +826,33 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_debug_box_logs_subtitle">Gravar saida de depuracao do Box86 &amp; Box64 em arquivo</string>
     <string name="settings_debug_fex_logs_title">Ativar Logs do FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Gravar saida de depuracao do FEXCore em arquivo</string>
+    <string name="settings_debug_emulator_logs_title">Logs de emulação Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Registra em arquivo o emulador que seu contêiner usa.</string>
     <string name="settings_debug_steam_logs_title">Ativar Logs do Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Registrar eventos de autenticacao e sessao do Steam para depuracao.</string>
     <string name="settings_debug_wine_channels_title">Canais de Depuracao do Wine</string>
     <string name="settings_debug_wine_channels_summary">Escolher quais canais do Wine sao incluidos quando o log de depuracao do Wine esta ativado.</string>
+    <string name="settings_debug_wine_classes_title">Níveis de log do Wine</string>
+    <string name="settings_debug_wine_classes_summary">Escolha quais tipos de mensagem são registrados. Trace é extremamente detalhado.</string>
     <string name="settings_debug_input_logs">Logs de Entrada</string>
     <string name="settings_debug_input_logs_description">Registrar eventos de entrada do gamepad, toque e teclado</string>
     <string name="settings_debug_download_logs">Logs de Download</string>
     <string name="settings_debug_download_logs_description">Registrar eventos do resolvedor de download e fallback do WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Camadas de Validação Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Reinicie a exibição para aplicar.</string>
     <string name="settings_debug_share_logs">Compartilhar Logs</string>
+    <string name="settings_debug_delete_logs">Excluir logs</string>
+    <string name="settings_debug_share_all_logs_short">Compartilhar tudo</string>
+    <string name="settings_debug_download_all_logs_short">Baixar tudo</string>
+    <string name="settings_debug_logs_saved">Salvo em %1$s</string>
+    <string name="settings_debug_delete_logs_short">Excluir</string>
+    <string name="settings_debug_delete_all_logs_short">Excluir tudo</string>
+    <string name="settings_debug_open_logs_folder_short">Abrir gerenciador de logs</string>
+    <string name="settings_debug_logs_deleted">Logs excluídos</string>
+    <string name="settings_debug_delete_logs_confirm_title">Excluir logs?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Isso exclui permanentemente todos os arquivos de log salvos (%1$s). Não é possível desfazer.</string>
+    <string name="settings_debug_logs_browser_title">Logs</string>
+    <string name="settings_debug_log_truncated">Mostrando os últimos %1$s deste log</string>
     <string name="settings_debug_logs_subject">Logs do WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">Nenhum log de depuração disponível. Ative as opções de depuração primeiro e inicie um jogo.</string>
     <string name="settings_debug_capture_failed">Falha ao capturar logs: %1$s</string>
@@ -773,6 +867,8 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
 
     <string name="settings_other_language_title">Idioma</string>
     <string name="settings_other_language_summary">Escolher o idioma de exibição</string>
+    <string name="settings_other_game_language_title">Idioma do jogo</string>
+    <string name="settings_other_game_language_summary">Idioma preferido para downloads da Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">Padrão do sistema</string>
 
     <string name="settings_other_section_integration">Integração</string>
@@ -790,7 +886,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_content_empty_subtitle">Instale um pacote ou mude o tipo para começar.</string>
     <string name="settings_content_container_created">Contêiner criado: %1$s</string>
     <string name="settings_content_download_failed">Falha no download.</string>
-    <string name="common_ui_working">Processando…</string>
+    <string name="common_ui_working">Processando</string>
     <string name="settings_content_desc_wine">Criado pelo projeto Wine; traduz chamadas Win32 para serviços nativos Linux/Android.</string>
     <string name="settings_content_desc_proton">Criado pela Valve; runtime baseado no Wine com patches para jogos Windows.</string>
     <string name="settings_content_desc_dxvk">Traduz chamadas gráficas Direct3D 9, 10 e 11 para Vulkan.</string>
@@ -798,6 +894,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_content_desc_box64">Traduz código Linux x86_64 para execução em dispositivos ARM64.</string>
     <string name="settings_content_desc_wowbox64">Build Box64 usado pelo WoW64 para executar apps Windows de 32 bits no Wine de 64 bits.</string>
     <string name="settings_content_desc_fexcore">Traduz código x86 e x86_64 para execução em dispositivos ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduz chamadas gráficas DirectDraw (Direct3D 7 e anteriores) para Vulkan.</string>
     <string name="settings_content_unable_to_install">Nao foi possivel instalar o conteudo.</string>
     <string name="settings_content_install_failed">Falha na Instalacao</string>
     <string name="settings_content_file_cannot_be_recognized">O arquivo nao pode ser reconhecido.</string>
@@ -809,9 +906,14 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="settings_content_downloading_title">Baixando Conteudo</string>
     <string name="settings_content_installing_title">Instalando Conteudo</string>
     <string name="settings_content_extracting_title">Extraindo Conteudo</string>
-    <string name="settings_content_extracting_detail">Extraindo… (%1$d arquivos)</string>
-    <string name="settings_content_preparing_package">Preparando pacote…</string>
+    <string name="settings_content_extracting_detail">Extraindo (%1$d arquivos)</string>
+    <string name="settings_content_preparing_package">Preparando pacote</string>
     <string name="settings_content_download_complete">Download concluido</string>
+    <string name="settings_content_already_installed_title">Componente ja instalado</string>
+    <string name="settings_content_already_installed_message">Este componente ja esta instalado. Remova a copia instalada antes de baixa-lo novamente.
+
+Caminho instalado:
+%1$s</string>
     <string name="settings_content_conflicting_title">Conteudo Conflitante Instalado</string>
     <string name="settings_content_conflicting_message">Por favor, desinstale o conteudo conflitante antes de baixar este pacote.
 
@@ -820,7 +922,7 @@ Caminho instalado:
     <string name="settings_content_cannot_be_trusted">O conteudo nao e confiavel.</string>
     <string name="settings_content_is_incomplete">O conteudo esta incompleto.</string>
     <string name="settings_content_untrusted_files_warning">Aviso: O conteudo adicional contem arquivos nao confiaveis. Geralmente, os seguintes arquivos nao devem ser modificados. Por favor, decida se deseja prosseguir com a instalacao.</string>
-    <string name="settings_content_confirm_remove">Deseja remover este conteudo?</string>
+    <string name="settings_content_confirm_remove">Isso excluirá o componente do seu dispositivo.</string>
     <string name="settings_content_unable_to_remove_in_use">Nao e possivel remover este conteudo, porque um container esta usando este Wine atualmente.</string>
     <string name="settings_content_download_in_components">Nenhum baixado. Por favor, baixe um em Componentes.</string>
     <string name="settings_content_types_header">TIPOS DE CONTEUDO</string>
@@ -832,9 +934,12 @@ Caminho instalado:
     <string name="settings_drivers_install">Instalar Drivers</string>
     <string name="settings_drivers_installed_success">Driver instalado com sucesso.</string>
     <string name="settings_drivers_install_failed">Falha ao instalar driver.</string>
-    <string name="settings_drivers_confirm_remove">Deseja remover este driver?</string>
+    <string name="settings_drivers_remove_title">Remover driver?</string>
+    <string name="settings_drivers_confirm_remove">Isso excluirá o driver do seu dispositivo.</string>
+    <string name="settings_drivers_remove_repo_title">Remover repositório?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s será removido da sua lista de repositórios.</string>
     <string name="settings_drivers_repo_tap_to_load">Toque para carregar versoes</string>
-    <string name="settings_drivers_repo_loading_releases">Carregando versoes…</string>
+    <string name="settings_drivers_repo_loading_releases">Carregando versoes</string>
     <string name="settings_drivers_repo_release_count">%1$d versoes carregadas</string>
     <string name="settings_drivers_repo_no_release_assets">Nenhum arquivo ZIP disponivel para download foi encontrado nas versoes obtidas.</string>
     <string name="settings_drivers_repo_fetch_failed">Nao foi possivel carregar as versoes do GitHub.</string>
@@ -844,7 +949,7 @@ Caminho instalado:
     <string name="settings_drivers_manager">Gerenciador de Drivers</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Instalando Arquivos do Sistema…</string>
+    <string name="setup_wizard_installing_system_files">Instalando Arquivos do Sistema</string>
     <string name="setup_wizard_unable_to_install_system_files">Nao foi possivel instalar os arquivos do sistema</string>
     <string name="setup_wizard_system_image_not_installed">Imagem do sistema nao instalada. Por favor, instale os componentes primeiro.</string>
     <string name="setup_wizard_recommended_components">Componentes Recomendados</string>
@@ -913,6 +1018,9 @@ Caminho instalado:
     <string name="google_cloud_sync_started">Sincronizacao na nuvem iniciada.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Servicos Google</string>
+    <string name="google_auto_signin_title">Entrar no Google ao iniciar</string>
+    <string name="google_auto_signin_summary">Conecte-se automaticamente ao Google Play Games quando o app é iniciado para que os backups de saves e a sincronização estejam sempre prontos. Quando desativado, o app nunca entra sozinho.</string>
+    <string name="google_auto_signin_section">Ao iniciar</string>
     <string name="google_cloud_play_games">Google Play Games</string>
     <string name="google_cloud_status_syncing">Sincronizando</string>
     <string name="google_cloud_status_connected">Conectado</string>
@@ -971,22 +1079,30 @@ Caminho instalado:
     <string name="saves_import_export_exported_failed">Falha ao exportar saves: %1$s</string>
     <string name="saves_import_export_imported">Saves importados com sucesso</string>
     <string name="saves_import_export_imported_failed">Falha ao importar saves: %1$s</string>
+    <string name="saves_export_path_summary">Os saves serão exportados para /WinNative/saves</string>
+    <string name="saves_export_success_path">Exportado para %1$s</string>
+    <string name="saves_export_warning_title">Use isto apenas com jogos personalizados</string>
+    <string name="saves_export_warning_body">A exportação pode incluir saves de jogos instalados por lojas ou com sincronização em nuvem.</string>
+    <string name="saves_import_warning_title">Isso substituirá os saves existentes neste contêiner</string>
+    <string name="saves_import_warning_body">Ao restaurar um backup antigo com vários jogos, copie primeiro os saves mais recentes para o zip com seu gerenciador de arquivos. Somente os saves presentes no .zip serão afetados. Gerencie seus saves com cuidado.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Contêiner</string>
-    <string name="preloader_initializing">Inicializando…</string>
-    <string name="preloader_launching">Iniciando…</string>
-    <string name="preloader_closing">Fechando %1$s…</string>
-    <string name="preloader_setup_environment">Configurando ambiente…</string>
-    <string name="preloader_installing_mono">Instalando Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Instalando redistribuíveis…</string>
-    <string name="preloader_unpacking_exe">Descompactando executável do jogo…</string>
-    <string name="preloader_downloading_cloud">Baixando saves na nuvem…</string>
-    <string name="preloader_syncing_cloud">Sincronizando saves na nuvem…</string>
-    <string name="preloader_cloud_downloading">Download da sincronização na nuvem…</string>
-    <string name="preloader_cloud_backup">Fazendo backup do save no Google Drive…</string>
+    <string name="preloader_initializing">Inicializando</string>
+    <string name="preloader_launching">Iniciando</string>
+    <string name="preloader_closing">Fechando %1$s</string>
+    <string name="preloader_setup_environment">Configurando ambiente</string>
+    <string name="preloader_retrying_steam_client_download">Tentando baixar o cliente Steam novamente</string>
+    <string name="preloader_installing_mono">Instalando Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Instalando redistribuíveis</string>
+    <string name="preloader_unpacking_exe">Descompactando executável do jogo</string>
+    <string name="preloader_downloading_cloud">Baixando saves na nuvem</string>
+    <string name="preloader_syncing_cloud">Sincronizando saves na nuvem</string>
+    <string name="preloader_uploading_cloud">Enviando saves para a nuvem</string>
+    <string name="preloader_checking_cloud">Verificando saves na nuvem</string>
+    <string name="preloader_cloud_sync_retry">%1$s Tentativa %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Download da sincronização na nuvem</string>
     <string name="cloud_sync_failed_provider">Sincronização na nuvem do %1$s falhou.</string>
-    <string name="google_cloud_backup_failed">Backup no Google Drive falhou.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Caminho instalado:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Gráficos</string>
-    <string name="container_backups_title">Backups</string>
-    <string name="container_backups_prompt">Escolha uma ação para este backup do contêiner.</string>
-    <string name="container_backups_backing_up">Fazendo backup do contêiner…</string>
-    <string name="container_backups_restoring">Restaurando contêiner…</string>
-    <string name="container_backups_checking">Verificando backups do contêiner…</string>
-    <string name="container_backups_select_title">Selecione o backup para restaurar</string>
-    <string name="container_backups_no_files">Nenhum backup de contêiner foi encontrado no Google Drive.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Vinculação primária</string>
     <string name="binding_secondary">Vinculação secundária</string>
+    <string name="binding_third">Vinculação terciária</string>
+    <string name="binding_fourth">Vinculação quaternária</string>
     <string name="input_controls_editor_tap_to_switch">Toque para alternar</string>
     <string name="input_controls_editor_download_profile">Baixar perfil</string>
     <string name="container_config_emulator_section">Emulador</string>
@@ -1010,6 +1122,7 @@ Caminho instalado:
     <string name="session_drawer_fps_monitor">Monitor de FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Mostrar estatísticas de desempenho em tempo real</string>
     <string name="session_drawer_dual_series_battery">Bateria Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Mostrar frametime como número</string>
     <string name="session_drawer_command_center">Central de comandos</string>
     <string name="session_drawer_command_center_input">Entrada</string>
     <string name="session_drawer_command_center_display">Tela</string>
@@ -1022,7 +1135,6 @@ Caminho instalado:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Natural</string>
     <string name="session_drawer_color_profile_crt">Efeito CRT</string>
-    <string name="session_drawer_upscaler_dls">Vívido</string>
     <string name="session_drawer_calibrate_advanced">Calibração avançada</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Giro</string>
@@ -1034,7 +1146,6 @@ Caminho instalado:
     <string name="session_drawer_rail_label_mouse">Mouse</string>
     <string name="session_drawer_rail_label_fullscreen">Tela cheia</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Nativo</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Tarefas</string>
     <string name="session_drawer_rail_label_logs">Logs</string>
@@ -1048,24 +1159,23 @@ Caminho instalado:
     <string name="session_drawer_logs_share_chooser">Compartilhar logs da sessão</string>
     <string name="session_drawer_logs_share_failed">Falha ao compartilhar logs</string>
     <string name="session_drawer_logs_share_empty">Não há linhas de log para compartilhar</string>
-    <string name="session_drawer_super_resolution">Filtros de Nitidez</string>
-    <string name="session_drawer_upscaler_mode">Filtro</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Super-resolução</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Vívido</string>
+    <string name="session_drawer_vivid_strength">Intensidade do vívido</string>
     <string name="session_drawer_main_menu_title">Menu</string>
     <string name="session_gyroscope_activator">Ativador</string>
     <string name="settings_general_check_for_updates">Verificar atualizações</string>
     <string name="settings_general_check_for_updates_summary">Verifique automaticamente novas versões do app ao iniciar e periodicamente.</string>
     <string name="setup_wizard_containers">Configuração do contêiner</string>
-    <string name="google_cloud_auto_backup">Backup automático do Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Faça backup automático dos salvamentos do jogo no Google Drive sempre que sair de um jogo.</string>
     <string name="cloud_saves_title">Salvamentos na nuvem</string>
-    <string name="cloud_saves_backup">Fazer backup do salvamento na nuvem</string>
-    <string name="cloud_saves_restore">Restaurar salvamento na nuvem</string>
+    <string name="cloud_saves_title_for_provider">Salvamentos na nuvem de %1$s - %2$s</string>
     <string name="cloud_sync_title">Sincronização na nuvem</string>
     <string name="cloud_sync_enabled_summary">Baixe os salvamentos na nuvem ao iniciar e sincronize/faça backup deles ao sair.</string>
     <string name="cloud_sync_disabled_summary">Inicie este jogo sem baixar salvamentos na nuvem nem sincronizar ao sair.</string>
-    <string name="cloud_saves_backing_up">Fazendo backup do salvamento na nuvem…</string>
-    <string name="cloud_saves_restoring">Restaurando salvamento na nuvem…</string>
+    <string name="cloud_saves_backing_up">Fazendo backup do salvamento na nuvem</string>
+    <string name="cloud_saves_restoring">Restaurando salvamento na nuvem</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Caminho instalado:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Controla o cache dos blocos dynarec gerados entre execuções para acelerar a inicialização.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@ Caminho instalado:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Nenhum save anterior com backup ainda. Saves substituídos e backups manuais aparecerão aqui por 30 dias.</string>
+    <string name="cloud_saves_history_loading">Carregando histórico de saves\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">nuvem</string>
+    <string name="cloud_saves_history_origin_local">local</string>
+    <string name="cloud_saves_history_origin_manual">manual</string>
+    <string name="cloud_saves_history_refresh">Atualizar</string>
+    <string name="cloud_saves_history_rename">Renomear</string>
+    <string name="cloud_saves_history_rename_clear">Limpar</string>
+    <string name="cloud_saves_history_rename_failed">Não foi possível renomear o backup.</string>
+    <string name="cloud_saves_history_rename_hint">ex.: Luta com chefe, Antes do final</string>
+    <string name="cloud_saves_history_rename_save">Salvar</string>
+    <string name="cloud_saves_history_rename_success">Backup renomeado.</string>
+    <string name="cloud_saves_history_rename_title">Nomear este backup</string>
+    <string name="cloud_saves_history_restore">Restaurar</string>
+    <string name="cloud_saves_history_restore_confirm_body">Isso substituirá seu save local atual pelo backup de %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Restaurar este backup?</string>
+    <string name="cloud_saves_history_restore_failed">Não foi possível restaurar este backup.</string>
+    <string name="cloud_saves_history_restore_success">Save restaurado do backup.</string>
+    <string name="cloud_saves_history_sign_in">Faça login no Google para ver seu histórico de saves.</string>
+    <string name="cloud_saves_history_title">Histórico de Saves</string>
+    <string name="cloud_saves_history_download">Baixar</string>
+    <string name="cloud_saves_history_download_success">Arquivo baixado.</string>
+    <string name="cloud_saves_history_download_failed">Falha no download.</string>
+    <string name="cloud_saves_keep_replaced_backup">Manter backup do save substituído</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Se mudar de ideia, você pode restaurá-lo pelo Histórico de Saves.</string>
+    <string name="cloud_saves_no_backups">Nenhum backup ainda para este jogo.</string>
+    <string name="cloud_saves_offline_mode">Desativar Sincronização com a Nuvem</string>
+    <string name="cloud_saves_offline_mode_summary">Interrompe toda atividade automática na nuvem para este jogo.</string>
+    <string name="cloud_saves_sync_from_provider">Sincronizar da Nuvem %1$s</string>
+    <string name="cloud_saves_sync_from_provider_failed">Não foi possível baixar o save de %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Gerenciar saves na nuvem GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Abre o site oficial da GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Nenhum navegador disponível para abrir a página de saves na nuvem GOG</string>
+    <string name="cloud_saves_gog_zip_label">Baixar ZIP da nuvem GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Salvar arquivos atuais da nuvem</string>
+    <string name="cloud_saves_gog_zip_success">ZIP dos saves na nuvem GOG salvo.</string>
+    <string name="cloud_saves_gog_zip_failed">Não foi possível salvar o ZIP dos saves na nuvem GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Nenhum arquivo de save na nuvem GOG encontrado.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Sincronizar da Nuvem</string>
+    <string name="cloud_saves_sync_from_provider_success">Save na nuvem do %1$s baixado.</string>
+    <string name="cloud_saves_syncing_from_provider">Baixando save de %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Baixar a versão que o %1$s tem agora.</string>
+    <string name="cloud_saves_sync_summary_generic">Baixar a versão atual na nuvem.</string>
+    <string name="common_ui_exit_app_confirm">Sair do WinNative?</string>
+    <string name="container_surface_effect">Efeito de Superfície</string>
+    <string name="downloads_queue_cancel_download_confirm">Cancelar o download de %1$s e excluir todos os arquivos baixados?</string>
+    <string name="downloads_queue_paused_resume_hint">Pausado - toque em Retomar para continuar</string>
+    <string name="downloads_queue_phase_applying_data">Aplicando dados</string>
+    <string name="downloads_queue_phase_downloading">Baixando</string>
+    <string name="downloads_queue_phase_downloading_file">Baixando [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Finalizando</string>
+    <string name="downloads_queue_phase_patching">Aplicando patch</string>
+    <string name="downloads_queue_phase_preparing">Preparando</string>
+    <string name="downloads_queue_phase_queued">Na fila</string>
+    <string name="downloads_queue_phase_unknown">Desconhecido</string>
+    <string name="downloads_queue_phase_unpacking">Descompactando</string>
+    <string name="downloads_queue_phase_updating">Atualizando</string>
+    <string name="downloads_queue_phase_verifying">Verificando</string>
+    <string name="downloads_queue_phase_verifying_file">Verificando [%1$s]</string>
+    <string name="downloads_queue_status_label">Status:</string>
+    <string name="downloads_queue_this_game">este jogo</string>
+    <string name="hud_position_bottom_center">Centro Inferior</string>
+    <string name="hud_position_bottom_left">Inferior Esquerdo</string>
+    <string name="hud_position_bottom_right">Inferior Direito</string>
+    <string name="hud_position_left_center">Centro Esquerdo</string>
+    <string name="hud_position_menu_title">Mover HUD para</string>
+    <string name="hud_position_right_center">Centro Direito</string>
+    <string name="hud_position_top_center">Centro Superior</string>
+    <string name="hud_position_top_left">Superior Esquerdo</string>
+    <string name="hud_position_top_right">Superior Direito</string>
+    <string name="input_controls_editor_number_of_bindings">Número de Mapeamentos</string>
+    <string name="input_controls_editor_opacity">Opacidade</string>
+    <string name="input_controls_editor_radial_menu">Menu Radial</string>
+    <string name="input_controls_editor_radial_menu_options">Opções do Menu Radial</string>
+    <string name="input_controls_tap_to_click">Toque para Clicar</string>
+    <string name="input_controls_reverse_binding_order">Inverter ordem das associações</string>
+    <string name="num_controllers">Número de Controles</string>
+    <string name="session_drawer_controls_section">Controles</string>
+    <string name="session_drawer_header_subtitle">Acesso rápido a controles, sobreposições e ferramentas de sessão</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Definir Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">Ative a sobreposição para personalizá-la</string>
+    <string name="session_drawer_hud_elements">Elementos do HUD</string>
+    <string name="session_drawer_hud_input_hint">Insira um valor de %1$d a %2$d. Valores acima do limite são limitados ao máximo.</string>
+    <string name="session_drawer_hud_scale">Escala</string>
+    <string name="session_drawer_hud_scale_input_title">Definir Escala</string>
+    <string name="session_drawer_hud_summary">Ajuste a visibilidade da sobreposição e os dados exibidos</string>
+    <string name="session_drawer_screen_effects">Efeitos de Tela</string>
+    <string name="session_drawer_session_section">Sessão</string>
+    <string name="session_drawer_swipe_hint">Deslize para voltar ao jogo</string>
+    <string name="session_gamepad_enable_vibration">Ativar Vibração</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Movimento de Mouse Experimental</string>
+    <string name="session_gyroscope_mouse_scale">Escala do Mouse</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Escala do Mouse: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Abra o assistente de configuração novamente para revisar permissões, arquivos do sistema e contêineres padrão.</string>
+    <string name="settings_other_setup_wizard_title">Assistente de Configuração</string>
+    <string name="shortcuts_library_artwork_failed">Falha ao carregar a imagem selecionada.</string>
+    <string name="shortcuts_library_artwork_open_source">Abrir SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Definir imagem</string>
+    <string name="shortcuts_library_artwork_title">Arte da Biblioteca</string>
+    <string name="shortcuts_library_artwork_icon_title">Arte do Ícone</string>
+    <string name="shortcuts_library_artwork_hero_title">Plano de Fundo</string>
+    <string name="shortcuts_list_readded_existing">Atalho existente readicionado</string>
+    <string name="shortcuts_properties_runtime_patcher">Patcher DRM em Tempo de Execução</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injeta uma DLL de patch DRM ao iniciar. Reduz FPS — use apenas se o inicializador legado sozinho falhar.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Selecionar pasta de saves</string>
+    <string name="cloud_saves_custom_folder_label">Pasta de saves</string>
+    <string name="cloud_saves_custom_select_folder_summary">Aponte para o diretório de saves dentro do contêiner</string>
+    <string name="cloud_saves_custom_no_container">Contêiner indisponível para este atalho</string>
+    <string name="cloud_saves_custom_picker_title">Selecionar pasta de saves</string>
+    <string name="cloud_saves_custom_outside_drive_c">A pasta selecionada deve estar dentro da unidade C: do contêiner</string>
+    <string name="cloud_saves_custom_path_map_failed">Não foi possível mapear a pasta selecionada para um caminho do Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Pasta de saves definida como %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sincronizar do Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Baixar save mais recente</string>
+    <string name="cloud_saves_steam_sync_success">Sincronizado do Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Falha na sincronização do Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_label">Ver salvamentos do Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Abrir armazenamento em nuvem</string>
+    <string name="cloud_saves_steam_browse_no_browser">Nenhum navegador disponível para abrir a página do Steam</string>
+    <string name="cloud_saves_steam_import_label">Importar arquivos</string>
+    <string name="cloud_saves_steam_import_helper">Restaurar arquivos baixados</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Seletor de arquivos indisponível</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Isso baixará os arquivos de save atuais do Steam Cloud e substituirá os arquivos de save atuais.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID de app inválido</string>
+    <string name="cloud_saves_label_saved">Rótulo salvo</string>
+    <string name="downloads_queue_cancel_all_title">Cancelar todos os downloads?</string>
+    <string name="downloads_queue_cancel_all_warning">Cancelar downloads de DLC, jogo ou atualização pode corromper suas instalações de jogos.\n\nTem certeza de que deseja cancelar todos os downloads e excluir os arquivos baixados até agora?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Usar inicializador legado</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Emulação Steam legada: executa o jogo pelo inicializador ColdClient e remove o DRM SteamStub do exe. Use apenas em jogos antigos que não funcionam com o Steam Launcher.</string>
+    <string name="steam_section_real_client">Cliente Steam real do WinNative</string>
+    <string name="steam_section_emulator">Emulador Steam legado</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Faz o cliente Steam emulado informar que está offline, para que o jogo não tente conexões online. Use em jogos que travam na verificação de rede do Steam.</string>
+    <string name="input_controls_select_style">Selecionar estilo</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Ardósia</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Brilho</string>
+    <string name="input_controls_style_shadow">Sombra</string>
+    <string name="input_controls_style_reticle">Retícula</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Tema de cores</string>
+    <string name="input_controls_edit_duplicating_builtin">Perfil integrado - uma cópia editável foi criada.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Redefinir este perfil para o layout original? Todas as alterações feitas serão perdidas.</string>
+    <string name="input_controls_editor_profile_reset">Perfil redefinido para o layout original.</string>
+    <string name="input_controls_editor_reset_unavailable">Nenhum snapshot original está disponível para este perfil.</string>
+    <string name="container_graphics_compositor_present_mode">Sincronização de tela Vulkan</string>
+    <string name="cloud_sync_disable_title">Desativar salvamentos na nuvem</string>
+    <string name="cloud_saves_steam_push_label">Enviar para Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forçar upload do salvamento local</string>
+    <string name="cloud_saves_steam_push_success">Salvamento enviado para Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Não foi possível enviar o salvamento para Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud está inacessível no momento. Reconectando em segundo plano toque em atualizar quando estiver online novamente.</string>
+    <string name="steam_session_refused_event">Steam recusou a sessão em cache (EResult=%1$d). Entre novamente.</string>
+    <string name="settings_hud_record_to_file_title">Gravar desempenho em arquivo</string>
+    <string name="settings_hud_record_to_file_summary">Exporta métricas por segundo de FPS, CPU, GPU, temperatura e bateria para /WinNative/logs/ durante o jogo.</string>
+    <string name="settings_leaderboard_category">Desempenho</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Preparando ambiente Steam</string>
+    <string name="preloader_starting_wine">Iniciando Wine</string>
+    <string name="preloader_starting_steam_launcher">Iniciando Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Carregando cliente Steam</string>
+    <string name="preloader_connecting_to_steam">Conectando ao Steam</string>
+    <string name="preloader_signing_in_to_steam">Entrando no Steam</string>
+    <string name="preloader_fetching_game_info">Conectado — buscando informações do jogo</string>
+    <string name="preloader_steam_ready">Steam pronto</string>
+    <string name="preloader_updating_game_info">Atualizando informações do jogo</string>
+    <string name="preloader_verifying_install">Verificando instalação</string>
+    <string name="preloader_scanning_redists">Procurando redistribuíveis</string>
+    <string name="preloader_installing_redist_single">Instalando redistribuível</string>
+    <string name="preloader_installing_named_redist">Instalando %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Instalando %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuíveis prontos</string>
+    <string name="preloader_no_redists">Nenhum redistribuível para instalar</string>
+    <string name="preloader_steam_service_running">Serviço Steam em execução</string>
+    <string name="preloader_launching_game">Iniciando %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher falhou — preparando recursos novamente</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher não pôde iniciar. Preparando novamente — inicie de novo</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher chegou ao jogo, mas ele não iniciou</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Carregando itens do Workshop</string>
+    <string name="workshop_search_items">Buscar itens do Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Obtendo seus itens inscritos da Steam.</string>
+    <string name="workshop_error_title">Não foi possível carregar os itens do Workshop</string>
+    <string name="workshop_error_subtitle">Algo deu errado. Tente novamente.</string>
+    <string name="workshop_empty_title">Nenhum item do Workshop inscrito</string>
+    <string name="workshop_empty_subtitle">Inscreva-se em itens no Steam Workshop e reabra esta janela.</string>
+    <string name="workshop_search_empty_title">Nenhum item corresponde a \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Tente outro termo de pesquisa.</string>
+    <string name="workshop_clear_search">Limpar pesquisa</string>
+    <string name="workshop_item_fallback">Item do Workshop</string>
+    <string name="common_ui_failed">Falhou</string>
+    <string name="steam_presence_snooze">Soneca</string>
+    <string name="steam_presence_busy">Ocupado</string>
+    <string name="steam_presence_looking_to_trade">Quer trocar</string>
+    <string name="steam_presence_looking_to_play">Quer jogar</string>
+    <string name="steam_friends_count">Amigos — %1$d online</string>
+    <string name="steam_friends_section_in_game">Em jogo (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Nenhum amigo carregado ainda.</string>
+    <string name="steam_friends_chat_off">O chat está desativado. Reative o Serviço de Chat para ver seus amigos.</string>
+    <string name="steam_friends_self_you">Você</string>
+    <string name="steam_friends_in_game">Em jogo</string>
+    <string name="steam_friends_join">Entrar</string>
+    <string name="steam_friends_play">Jogar</string>
+    <string name="steam_chat_image_failed">(falha ao enviar imagem)</string>
+    <string name="steam_chat_empty">Sem mensagens ainda. Diga oi!</string>
+    <string name="steam_chat_uploading_image">Enviando imagem…</string>
+    <string name="steam_chat_send_image">Enviar imagem</string>
+    <string name="steam_chat_message_hint">Mensagem…</string>
+    <string name="steam_chat_send">Enviar</string>
+    <string name="steam_chat_image">Imagem</string>
+    <string name="steam_common_back">Voltar</string>
+    <string name="steam_achievements_title">Conquistas</string>
+    <string name="steam_achievements_empty">Nenhuma conquista encontrada para este jogo,\nou entre no Steam para carregá-las.</string>
+    <string name="steam_achievements_hidden">Conquista oculta</string>
+    <string name="steam_achievements_hidden_desc">Continue jogando para revelar esta conquista.</string>
+    <string name="steam_achievements_unlocked_on">Desbloqueada %1$s</string>
+    <string name="steam_achievements_unlocked">Desbloqueada</string>
+    <string name="steam_join_joining">Entrando com %1$s em %2$s…</string>
+    <string name="steam_join_install">Instale %1$s para entrar com %2$s</string>
+    <string name="steam_join_not_owned">Você não possui %1$s</string>
+    <string name="steam_chat_not_sent">(não enviado)</string>
+    <string name="steam_join_the_game">o jogo</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Serviço de Chat</string>
+    <string name="steam_chat_setting_service_desc">Entre para ver amigos e conversar; desative para ficar offline</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Saída</string>
+    <string name="display_output_prompt_title">Tela externa detectada</string>
+    <string name="display_output_prompt_message">Enviar o jogo para a tela conectada? Seus controles na tela e o menu permanecem neste telefone.</string>
+    <string name="display_output_prompt_swap">Trocar telas</string>
+    <string name="display_output_prompt_mirror">Espelhar</string>
+    <string name="display_output_swapped_toast">Jogo movido para a tela externa. Os controles permanecem no seu telefone.</string>
+    <string name="display_output_cast_unavailable">As configurações de tela sem fio não estão disponíveis neste dispositivo.</string>
+    <string name="display_output_restored_toast">Tela externa desconectada — o jogo voltou para o telefone.</string>
+    <string name="session_drawer_output_title">Saída de tela</string>
+    <string name="session_drawer_output_subtitle">O jogo está sendo exibido na tela externa.</string>
+    <string name="session_drawer_output_device">Tela conectada</string>
+    <string name="session_drawer_output_resolution">Resolução</string>
+    <string name="session_drawer_output_refresh_rate">Taxa de atualização</string>
+    <string name="session_drawer_output_aspect_ratio">Proporção</string>
+    <string name="session_drawer_output_aspect_fit">Ajustar (proporção)</string>
+    <string name="session_drawer_output_aspect_stretch">Esticar (preencher)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (cortar)</string>
+    <string name="session_drawer_output_return_to_phone">Voltar ao telefone</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Transmitir para uma TV</string>
+    <string name="session_drawer_output_cast_body">Conecte um adaptador USB-C / HDMI ou toque abaixo para conectar uma tela sem fio (Miracast / Wi-Fi Direct). O jogo aparece na TV enquanto estes controles permanecem no seu telefone.</string>
+    <string name="session_drawer_output_cast_button">Conectar tela sem fio</string>
+    <string name="session_drawer_output_cast_note">TVs apenas com Chromecast não conseguem exibir o jogo ao vivo com controles privados — use uma tela sem fio ou um adaptador USB‑C/HDMI para o melhor resultado.</string>
+    <string name="session_drawer_output_render_note">Os modos que sua tela informa mudam a saída real dela (pode ficar preta por um instante enquanto reinicializa). Outras resoluções são renderizadas nesse tamanho e escalonadas por hardware para o painel — acima da nativa fica mais nítido (supersampling), abaixo fica mais rápido.</string>
+    <string name="session_drawer_output_scaling_note">Este telefone exibe a tela na resolução nativa %1$s e não troca de modo, então isto define a resolução de renderização — ela é escalada por hardware para o painel (acima da nativa deixa mais nítido, abaixo roda mais rápido).</string>
+    <string name="session_drawer_output_game_mode">Modo jogo (baixa latência)</string>
+    <string name="session_drawer_output_game_mode_on">Ligado</string>
+    <string name="session_drawer_output_game_mode_off">Desligado</string>
+    <string name="session_drawer_output_game_mode_note">Solicita o modo jogo / baixa latência da TV (HDMI ALLM) para minimizar o atraso de entrada. Exibido apenas quando a tela conectada é compatível.</string>
+    <string name="session_drawer_output_send_to_display">Enviar jogo para a tela</string>
+    <string name="session_drawer_output_to_display">Saída para tela externa</string>
+    <string name="session_drawer_output_send_note">Uma tela está conectada. Envie o jogo para ela — seus controles e o menu permanecem neste telefone. Você pode trazê-lo de volta aqui a qualquer momento.</string>
+    <string name="session_drawer_output_display">Tela</string>
+    <string name="session_drawer_output_glasses">Óculos</string>
+    <string name="session_drawer_output_brightness">Brilho</string>
+    <string name="session_drawer_output_shade">Sombra (escurecimento)</string>
+    <string name="session_drawer_output_3d">3D (lado a lado)</string>
+    <string name="glasses_panel_refresh">Taxa de atualização</string>
+    <string name="glasses_panel_sunblock">Bloqueio solar</string>
+    <string name="session_drawer_output_volume">Volume</string>
+    <string name="session_drawer_output_glasses_note">Enviado diretamente para seus óculos Viture via USB.</string>
+
+    <!-- Touch Input & Gesture Profiles -->
+    <string name="common_ui_new">Novo</string>
+    <string name="common_ui_rename">Renomear</string>
+    <string name="gesture_profile_export">Exportar Perfil de Gestos</string>
+    <string name="gesture_profile_import">Importar Perfil de Gestos</string>
+    <string name="gesture_profile_new">Novo Perfil de Gestos</string>
+    <string name="gesture_profile_none">Nenhum perfil de gestos</string>
+    <string name="input_controls_editor_input_profiles_section">Perfis de Entrada</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilidade do analógico direito</string>
+    <string name="session_drawer_rts_gestures">Gestos RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Editar</string>
+    <string name="session_drawer_touch">Toque</string>
+    <string name="session_drawer_touch_map_right_stick">Mapear para o analógico direito</string>
+    <string name="session_drawer_touch_touchscreen">Modo Tela Sensível ao Toque</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_gesture_profile_section">Perfil de Gestos</string>
+    <string name="session_rts_action">Ação</string>
+    <string name="session_rts_behavior">Comportamento</string>
+    <string name="session_rts_double_tap">Toque duplo (clique esquerdo duplo)</string>
+    <string name="session_rts_double_tap_delay">Atraso do toque duplo (ms)</string>
+    <string name="session_rts_down">Baixo</string>
+    <string name="session_rts_drag">Arrastar com 1 dedo</string>
+    <string name="session_rts_pan1">Mover com 1 dedo</string>
+    <string name="session_rts_drag2">Arrastar com 2 dedos</string>
+    <string name="session_rts_drag_threshold">Limite de arrasto (px)</string>
+    <string name="session_rts_gesture_threshold">Limite do gesto (px)</string>
+    <string name="session_rts_hold2">Segurar com 2 dedos</string>
+    <string name="session_rts_hold3">Segurar com 3 dedos</string>
+    <string name="session_rts_hold4">Segurar com 4 dedos</string>
+    <string name="session_rts_hold_delay">Atraso ao segurar (ms)</string>
+    <string name="session_rts_left">Esquerda</string>
+    <string name="session_rts_long_press">Pressão longa</string>
+    <string name="session_rts_long_press_delay">Atraso da pressão longa (ms)</string>
+    <string name="session_rts_pan">Mover com 2 dedos</string>
+    <string name="session_rts_pan_threshold">Início de mover/pinçar (px)</string>
+    <string name="session_rts_right">Direita</string>
+    <string name="session_rts_swipe3">Deslizar com 3 dedos</string>
+    <string name="session_rts_swipe4">Deslizar com 4 dedos</string>
+    <string name="session_rts_swipe_threshold">Limite de deslize (px)</string>
+    <string name="session_rts_tap1">Toque com 1 dedo</string>
+    <string name="session_rts_tap2">Toque com 2 dedos</string>
+    <string name="session_rts_tap3">Toque com 3 dedos</string>
+    <string name="session_rts_tap4">Toque com 4 dedos</string>
+    <string name="session_rts_up">Cima</string>
+    <string name="session_rts_zoom">Zoom com pinça</string>
+    <string name="session_drawer_brightness">Brilho</string>
+    <string name="session_drawer_contrast">Contraste</string>
+    <string name="session_drawer_gamma">Gama</string>
+    <string name="session_drawer_saturation">Saturação</string>
+    <string name="session_drawer_temperature">Temperatura</string>
+    <string name="session_drawer_tint">Tonalidade</string>
+    <string name="session_drawer_intensity">Intensidade</string>
+    <string name="session_drawer_strength">Força</string>
+    <string name="session_drawer_sharpen">Nitidez</string>
+    <string name="session_drawer_scanlines">Linhas de varredura</string>
+    <string name="session_drawer_pixelate">Pixelizar</string>
+    <string name="session_drawer_block_size">Tamanho do bloco</string>
+    <string name="session_drawer_scale">Escala</string>
+    <string name="session_drawer_scale_nearest">Mais próximo</string>
+    <string name="session_drawer_scale_linear">Linear</string>
+    <string name="session_drawer_scale_bicubic">Bicúbico</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Cartoon</string>
+    <string name="session_drawer_color_blind">Daltonismo</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Redefinir efeitos</string>
+    <string name="session_drawer_hud_background">Fundo</string>
+    <string name="session_drawer_hud_background_alpha">Alfa do fundo</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Definir alfa do fundo</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Ajustar tamanho</string>
+    <string name="session_task_bring_to_front">Trazer para frente</string>
+    <string name="session_task_custom_value">Valor personalizado</string>
+    <string name="session_gyroscope_orientation_mode">Incline para mirar (orientação)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Arquivos</string>
+    <string name="file_manager_copy">Copiar</string>
+    <string name="file_manager_cut">Recortar</string>
+    <string name="file_manager_paste">Colar</string>
+    <string name="file_manager_paste_here">Colar aqui</string>
+    <string name="file_manager_new_folder">Nova Pasta</string>
+    <string name="file_manager_new_folder_short">Pasta</string>
+    <string name="file_manager_multi_select">Marcar</string>
+    <string name="file_manager_create">Criar</string>
+    <string name="file_manager_delete">Excluir</string>
+    <string name="file_manager_copy_count">Copiar (%1$d)</string>
+    <string name="file_manager_cut_count">Recortar (%1$d)</string>
+    <string name="file_manager_delete_count">Excluir (%1$d)</string>
+    <string name="file_manager_extract">Extrair</string>
+    <string name="file_manager_extract_here">Extrair aqui</string>
+    <string name="file_manager_extract_to">Extrair para…</string>
+    <string name="file_manager_extracting">Extraindo %1$s</string>
+    <string name="file_manager_extract_failed">Falha na extração</string>
+    <string name="file_manager_run_boot">Executar / Inicializar</string>
+    <string name="file_manager_create_shortcut">Criar Atalho</string>
+    <string name="file_manager_run_in_container">Executar no container</string>
+    <string name="file_manager_no_containers">Nenhum container disponivel</string>
+    <string name="file_manager_delete_confirm">Excluir \"%1$s\"? Isso nao pode ser desfeito.</string>
+    <string name="file_manager_delete_confirm_multi">Excluir %1$d itens? Isso nao pode ser desfeito.</string>
+    <string name="file_manager_copying">Copiando %1$s</string>
+    <string name="file_manager_moving">Movendo %1$s</string>
+    <string name="file_manager_copying_count">Copiando %1$d itens</string>
+    <string name="file_manager_moving_count">Movendo %1$d itens</string>
+    <string name="file_manager_paste_into_itself">Nao e possivel colar uma pasta dentro dela mesma</string>
+    <string name="file_manager_operation_failed">Falha na operacao</string>
+    <string name="file_manager_delete_failed">Falha ao excluir</string>
+    <string name="file_manager_rename_failed">Falha ao renomear</string>
+    <string name="file_manager_create_folder_failed">Falha ao criar pasta</string>
+    <string name="cloud_saves_google_backup_helper">Salvar uma cópia no Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Backup no Google</string>
+    <string name="cloud_saves_google_backup_no_save">Nenhum arquivo de salvamento encontrado para backup.</string>
+    <string name="cloud_saves_history_cloud_readonly">Somente leitura</string>
+    <string name="session_drawer_rail_label_record">Gravar</string>
+    <string name="session_record_failed">Não foi possível iniciar a gravação</string>
+    <string name="session_record_fps">Taxa de Quadros</string>
+    <string name="session_record_include_ui">Gravar interface</string>
+    <string name="session_record_include_ui_subtitle">Incluir HUD e controles na tela</string>
+    <string name="session_record_now">Gravar agora</string>
+    <string name="session_record_quality">Qualidade</string>
+    <string name="session_record_resolution">Resolução</string>
+    <string name="session_record_saved">Gravação salva em WinNative/Recordings</string>
+    <string name="session_record_settings_title">Configurações de gravação</string>
+    <string name="session_record_started">Gravação iniciada</string>
+    <string name="steam_chat_setting_stay_running">Executar em segundo plano</string>
+    <string name="steam_chat_setting_stay_running_desc">Manter o chat ativo após sair do WinNative</string>
+    <string name="settings_content_refresh">Atualizar</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Transferir save</string>
+    <string name="retro_save_transfer_message">Importe um save local para este jogo ou exporte o save atual.</string>
+    <string name="retro_save_transfer_import">Importar save</string>
+    <string name="retro_save_transfer_export">Exportar save</string>
+    <string name="retro_save_transfer_import_ok">Save importado</string>
+    <string name="retro_save_transfer_import_failed">Não foi possível importar o save</string>
+    <string name="retro_save_transfer_export_ok">Save exportado</string>
+    <string name="retro_save_transfer_export_failed">Não foi possível exportar o save</string>
+    <string name="retro_save_transfer_none">Ainda não existe um save para este jogo</string>
+    <string name="retro_cheats_title">Cheats</string>
+    <string name="retro_cheats_hardcore_blocked">Os cheats estão desativados no modo Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Salvar</string>
+    <string name="retro_ps2_cancel">Cancelar</string>
+    <string name="retro_ps2_save_state">Salvar estado</string>
+    <string name="retro_ps2_load_save_state">Carregar estado</string>
+    <string name="retro_ps2_achievements">Conquistas</string>
+    <string name="retro_ps2_cheats">Trapaças</string>
+    <string name="retro_ps2_memory_cards">Cartões de memória</string>
+    <string name="retro_ps2_fast_forward">Avanço rápido</string>
+    <string name="retro_ps2_reset">Reiniciar</string>
+    <string name="retro_ps2_swap_disc">Trocar disco</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Toque para carregar</string>
+    <string name="retro_ps2_slot_empty">Vazio</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Toque para substituir</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Vazio — toque para salvar</string>
+    <string name="retro_ps2_slot_is_empty">O slot %1$d está vazio</string>
+    <string name="retro_ps2_loaded_slot">Slot %1$d carregado</string>
+    <string name="retro_ps2_could_not_load_slot">Não foi possível carregar o slot %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Salvo no slot %1$d</string>
+    <string name="retro_ps2_save_failed">Falha ao salvar</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Toque para usar</string>
+    <string name="retro_ps2_new_memory_card">Novo cartão de memória</string>
+    <string name="retro_ps2_import_card">Importar cartão</string>
+    <string name="retro_ps2_enable_online_dev9">Ativar online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adaptador de rede do PS2 — reinicia o jogo para conectá-lo</string>
+    <string name="retro_ps2_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_ps2_dns_mode">Modo DNS</string>
+    <string name="retro_ps2_primary_dns">DNS primário</string>
+    <string name="retro_ps2_secondary_dns">DNS secundário</string>
+    <string name="retro_ps2_optional">opcional</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automático (DHCP)</string>
+    <string name="retro_ps2_server_host">Servidor: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">toque para definir o IP (em branco remove)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Adicionar host do servidor</string>
+    <string name="retro_ps2_new_server_hostname">Novo nome de host do servidor</string>
+    <string name="retro_ps2_server_hostname_hint">p. ex. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Controles na tela</string>
+    <string name="retro_ps2_edit_layout">Editar disposição</string>
+    <string name="retro_ps2_reset_layout">Repor disposição</string>
+    <string name="retro_ps2_layout_reset">Disposição reposta</string>
+    <string name="retro_ps2_left_stick_invert_x">Analógico esquerdo: inverter X</string>
+    <string name="retro_ps2_left_stick_invert_y">Analógico esquerdo: inverter Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Analógico direito: inverter X</string>
+    <string name="retro_ps2_right_stick_invert_y">Analógico direito: inverter Y</string>
+    <string name="retro_ps2_button_color">Cor dos botões</string>
+    <string name="retro_ps2_letter_color">Cor das letras</string>
+    <string name="retro_ps2_shadow_color">Cor da sombra</string>
+    <string name="retro_ps2_background_color">Cor de fundo</string>
+    <string name="retro_ps2_reset_colors">Repor cores</string>
+    <string name="retro_ps2_renderer">Renderizador</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Escala de resolução</string>
+    <string name="retro_ps2_scale_1x_native">1x (nativa)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Proporção da tela</string>
+    <string name="retro_ps2_aspect_stretch">Esticar</string>
+    <string name="retro_ps2_aspect_auto_standard">Automática (padrão)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtro de tela</string>
+    <string name="retro_ps2_filter_nearest">Mais próximo</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinear (suave)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinear (nítido)</string>
+    <string name="retro_ps2_texture_filter">Filtro de texturas</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinear (forçado)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinear (sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Precisão da mistura</string>
+    <string name="retro_ps2_blend_minimum">Mínima</string>
+    <string name="retro_ps2_blend_basic">Básica</string>
+    <string name="retro_ps2_blend_medium">Média</string>
+    <string name="retro_ps2_blend_high">Alta</string>
+    <string name="retro_ps2_blend_full">Completa</string>
+    <string name="retro_ps2_blend_maximum">Máxima</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Desligado</string>
+    <string name="retro_ps2_shader_scanline">Linhas de varredura</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Onda</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Ignorar fotogramas</string>
+    <string name="retro_ps2_frameskip_off">Desligado</string>
+    <string name="retro_ps2_frameskip_1">Ignorar 1</string>
+    <string name="retro_ps2_frameskip_2">Ignorar 2</string>
+    <string name="retro_ps2_frameskip_3">Ignorar 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volume</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Sem som</string>
+    <string name="retro_ps2_swap_stereo_channels">Trocar canais estéreo</string>
+    <string name="retro_ps2_ee_cycle_rate">Taxa de ciclos EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (padrão)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_ps2_skip_off">Desligado</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 instantâneo</string>
+    <string name="retro_ps2_mtvu">VU multithread (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rápido</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Velocidade de emulação</string>
+    <string name="retro_ps2_hud_cpu_usage">Uso da CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Uso da GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Resolução interna</string>
+    <string name="retro_ps2_deinterlace_mode">Modo de desentrelaçamento</string>
+    <string name="retro_ps2_deint_auto">Automático</string>
+    <string name="retro_ps2_deint_off">Desligado</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Proporção de FMV</string>
+    <string name="retro_ps2_anti_blur">Antidesfoque</string>
+    <string name="retro_ps2_widescreen_patches">Patches de widescreen</string>
+    <string name="retro_ps2_no_interlace_patches">Patches sem entrelaçamento</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Detecção de loop INTC</string>
+    <string name="retro_ps2_wait_loop">Detecção de loop de espera</string>
+    <string name="retro_ps2_time_stretch">Esticamento de tempo do áudio</string>
+    <string name="retro_ps2_audio_buffer">Buffer de áudio</string>
+    <string name="retro_ps2_audio_latency">Latência de saída</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Tempos de quadro</string>
+    <string name="retro_ps2_hud_gs_stats">Estatísticas do GS</string>
+    <string name="retro_ps2_hud_hw_info">Informações de hardware</string>
+    <string name="retro_ps2_hud_version">Versão</string>
+    <string name="retro_ps2_hud_input_display">Exibição de entradas</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Tela</string>
+    <string name="retro_ps2_tab_performance">Desempenho</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Som</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Controles</string>
+    <string name="retro_ps2_resume">Retomar</string>
+    <string name="retro_ps2_pause">Pausar</string>
+    <string name="retro_ps2_exit">Sair</string>
+    <string name="retro_lr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Ficheiro de BIOS inválido</string>
+    <string name="retro_lr_invalid_retro_game">Jogo retro inválido</string>
+    <string name="retro_lr_rom_not_found">ROM não encontrada: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Não foi possível ler a ROM dentro deste arquivo</string>
+    <string name="retro_lr_core_not_installed">Núcleo não instalado: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Trapaças ativadas — as conquistas estão desativadas nesta sessão</string>
+    <string name="retro_lr_cloud_save_restored">Save na nuvem restaurado</string>
+    <string name="retro_lr_restore_failed">Falha ao restaurar</string>
+    <string name="retro_lr_cloud_conflict_message">Existe um save na nuvem mais recente para %1$s. Deseja sincronizar e qual save na nuvem prefere manter?</string>
+    <string name="retro_lr_cloud_save">Save na nuvem</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Falha ao carregar o núcleo do emulador</string>
+    <string name="retro_lr_failed_load_rom">Falha ao carregar a ROM</string>
+    <string name="retro_lr_graphics_not_supported">Gráficos não suportados por este núcleo</string>
+    <string name="retro_lr_emulator_error">Erro do emulador</string>
+    <string name="retro_lr_shader_default">Padrão</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Nítido</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Upscaling SGSR</string>
+    <string name="retro_lr_upscale_native">Nativa</string>
+    <string name="retro_lr_sound">Som</string>
+    <string name="retro_lr_left_stick_invert_x">Analógico esquerdo: inverter X</string>
+    <string name="retro_lr_left_stick_invert_y">Analógico esquerdo: inverter Y</string>
+    <string name="retro_lr_right_stick_invert_x">Analógico direito: inverter X</string>
+    <string name="retro_lr_right_stick_invert_y">Analógico direito: inverter Y</string>
+    <string name="retro_lr_on_screen_controls">Controles na tela</string>
+    <string name="retro_lr_haptic_feedback">Resposta tátil</string>
+    <string name="retro_lr_portrait">Vertical</string>
+    <string name="retro_lr_landscape">Horizontal</string>
+    <string name="retro_lr_edit_layout">Editar disposição (%1$s)</string>
+    <string name="retro_lr_reset_layout">Repor disposição %1$s</string>
+    <string name="retro_lr_layout_reset">Disposição %1$s reposta</string>
+    <string name="retro_lr_button_color">Cor dos botões</string>
+    <string name="retro_lr_letter_color">Cor das letras</string>
+    <string name="retro_lr_shadow_color">Cor da sombra</string>
+    <string name="retro_lr_background_color">Cor de fundo</string>
+    <string name="retro_lr_reset_colors">Repor cores</string>
+    <string name="retro_lr_colors_reset">Cores repostas</string>
+    <string name="retro_lr_performance_hud">HUD de desempenho</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa do fundo</string>
+    <string name="retro_lr_background">Fundo</string>
+    <string name="retro_lr_scale">Escala</string>
+    <string name="retro_lr_numeric_frametime">Tempo de fotograma numérico</string>
+    <string name="retro_lr_dual_series_battery">Bateria de série dupla</string>
+    <string name="retro_lr_hud_elements">ELEMENTOS DO HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Console</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Bateria</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Gráfico</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Salvar estado</string>
+    <string name="retro_lr_load_save_state">Carregar estado</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">O carregamento de estados está desativado no modo Hardcore</string>
+    <string name="retro_lr_achievements">Conquistas</string>
+    <string name="retro_lr_cheats">Trapaças</string>
+    <string name="retro_lr_cheats_disabled_hardcore">As trapaças estão desativadas no modo Hardcore</string>
+    <string name="retro_lr_reset">Reiniciar</string>
+    <string name="retro_lr_fast_forward">Avanço rápido</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">O avanço rápido está desativado no modo Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disco %1$d/%2$d</string>
+    <string name="retro_lr_resume">Retomar</string>
+    <string name="retro_lr_pause">Pausar</string>
+    <string name="retro_lr_exit">Sair</string>
+    <string name="retro_lr_saved_to_slot">Salvo no slot %1$d</string>
+    <string name="retro_lr_could_not_save_state">Não foi possível salvar o estado</string>
+    <string name="retro_lr_bios_required_title">BIOS de %1$s necessária</string>
+    <string name="retro_lr_bios_required_message">Os jogos de PlayStation precisam de um arquivo de BIOS real do console que você deve fornecer. Importe uma BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin ou scph7001.bin) para continuar.</string>
+    <string name="retro_lr_import_bios">Importar BIOS…</string>
+    <string name="retro_lr_cancel">Cancelar</string>
+    <string name="retro_lr_slot_empty">O slot %1$d está vazio</string>
+    <string name="retro_lr_loaded_slot">Slot %1$d carregado</string>
+    <string name="retro_lr_could_not_load_state">Não foi possível carregar o estado</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Renomear slot %1$d</string>
+    <string name="retro_gs_section_general">Geral</string>
+    <string name="retro_gs_section_graphics">Gráficos</string>
+    <string name="retro_gs_section_performance">Desempenho</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Entrada</string>
+    <string name="retro_gs_section_audio">Áudio</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Cancelar</string>
+    <string name="retro_gs_save">Guardar</string>
+    <string name="retro_gs_shader_default">Padrão</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Nítido</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativa</string>
+    <string name="retro_gs_group_game">JOGO</string>
+    <string name="retro_gs_label_name">Nome</string>
+    <string name="retro_gs_label_system">Sistema</string>
+    <string name="retro_gs_label_emulator_core">Núcleo do emulador</string>
+    <string name="retro_gs_label_rom_path">Caminho da ROM</string>
+    <string name="retro_gs_group_bios">BIOS do %1$s</string>
+    <string name="retro_gs_label_installed">Instalada</string>
+    <string name="retro_gs_bios_none">Nenhuma — necessária para executar jogos de %1$s</string>
+    <string name="retro_gs_import_bios">Importar BIOS…</string>
+    <string name="retro_gs_remove_bios">Remover BIOS</string>
+    <string name="retro_gs_group_library_artwork">IMAGENS DA BIBLIOTECA</string>
+    <string name="retro_gs_artwork_game_card">Imagem do card do jogo</string>
+    <string name="retro_gs_artwork_grid">Imagem da grade</string>
+    <string name="retro_gs_artwork_carousel">Imagem do carrossel</string>
+    <string name="retro_gs_artwork_list">Imagem da lista</string>
+    <string name="retro_gs_artwork_custom_set">Imagem personalizada definida</string>
+    <string name="retro_gs_artwork_set_image">Definir imagem</string>
+    <string name="retro_gs_artwork_remove">Remover</string>
+    <string name="retro_gs_group_video">VÍDEO</string>
+    <string name="retro_gs_video_filter">Filtro de vídeo</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Upscaling SGSR</string>
+    <string name="retro_gs_performance_hud">HUD de desempenho</string>
+    <string name="retro_gs_group_core">NÚCLEO</string>
+    <string name="retro_gs_renderer">Renderizador</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Escala de resolução</string>
+    <string name="retro_gs_scale_1x_native">1x (nativa)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Proporção da tela</string>
+    <string name="retro_gs_aspect_stretch">Esticar</string>
+    <string name="retro_gs_aspect_auto_standard">Automática (padrão)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtro de tela</string>
+    <string name="retro_gs_filter_nearest">Mais próximo</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinear (suave)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinear (nítido)</string>
+    <string name="retro_gs_texture_filter">Filtro de texturas</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinear (forçado)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinear (sprites)</string>
+    <string name="retro_gs_blending_accuracy">Precisão da mistura</string>
+    <string name="retro_gs_blend_minimum">Mínima</string>
+    <string name="retro_gs_blend_basic">Básica</string>
+    <string name="retro_gs_blend_medium">Média</string>
+    <string name="retro_gs_blend_high">Alta</string>
+    <string name="retro_gs_blend_full">Completa</string>
+    <string name="retro_gs_blend_maximum">Máxima</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Desligado</string>
+    <string name="retro_gs_tvshader_scanline">Linhas de varredura</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Onda</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Ignorar fotogramas</string>
+    <string name="retro_gs_frameskip_1">Ignorar 1</string>
+    <string name="retro_gs_frameskip_2">Ignorar 2</string>
+    <string name="retro_gs_frameskip_3">Ignorar 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">DESEMPENHO</string>
+    <string name="retro_gs_ee_cycle_rate">Taxa de ciclos EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (padrão)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 instantâneo</string>
+    <string name="retro_gs_mtvu">VU multithread (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rápido</string>
+    <string name="retro_gs_group_performance_hud">HUD DE DESEMPENHO</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Velocidade de emulação</string>
+    <string name="retro_gs_hud_cpu_usage">Uso da CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Uso da GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Resolução interna</string>
+    <string name="retro_gs_deinterlace_mode">Modo de desentrelaçamento</string>
+    <string name="retro_gs_deint_auto">Automático</string>
+    <string name="retro_gs_deint_off">Desligado</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Proporção de FMV</string>
+    <string name="retro_gs_anti_blur">Antidesfoque</string>
+    <string name="retro_gs_widescreen_patches">Patches de widescreen</string>
+    <string name="retro_gs_no_interlace_patches">Patches sem entrelaçamento</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Detecção de loop INTC</string>
+    <string name="retro_gs_wait_loop">Detecção de loop de espera</string>
+    <string name="retro_gs_time_stretch">Esticamento de tempo do áudio</string>
+    <string name="retro_gs_audio_buffer">Buffer de áudio</string>
+    <string name="retro_gs_audio_latency">Latência de saída</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Tempos de quadro</string>
+    <string name="retro_gs_hud_gs_stats">Estatísticas do GS</string>
+    <string name="retro_gs_hud_hw_info">Informações de hardware</string>
+    <string name="retro_gs_hud_version">Versão</string>
+    <string name="retro_gs_hud_input_display">Exibição de entradas</string>
+    <string name="retro_gs_fast_boot">Inicialização rápida</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Ativar online</string>
+    <string name="retro_gs_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_gs_net_auto">Automático</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Modo DNS</string>
+    <string name="retro_gs_dns_manual">Manual</string>
+    <string name="retro_gs_dns_internal">Interno</string>
+    <string name="retro_gs_primary_dns">DNS primário</string>
+    <string name="retro_gs_secondary_dns">DNS secundário</string>
+    <string name="retro_gs_dns_optional">opcional</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automático (DHCP)</string>
+    <string name="retro_gs_group_input">ENTRADA</string>
+    <string name="retro_engine_save">Salvar</string>
+    <string name="retro_engine_saved">Jogo salvo</string>
+    <string name="retro_engine_loading">Carregando…</string>
+    <string name="retro_engine_load">Carregar</string>
+    <string name="retro_engine_saved_to">Salvo em %1$s</string>
+    <string name="retro_engine_slot_active_only">Ativo</string>
+    <string name="retro_engine_rename_slot">Renomear slot de salvamento</string>
+    <string name="retro_engine_caught">%1$d capturados</string>
+    <string name="retro_engine_no_slots">Ainda não há slots de salvamento</string>
+    <string name="retro_engine_new_slot">Novo slot de salvamento</string>
+    <string name="retro_engine_achievements_unavailable">Não registrado no modo 3D</string>
+    <string name="retro_engine_fullscreen">Tela cheia</string>
+    <string name="retro_engine_loaded_from">%1$s carregado</string>
+    <string name="retro_engine_slot_empty">Esse slot está vazio</string>
+    <string name="retro_engine_loading_subtitle">Preparando os dados do jogo pela primeira vez</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Jogue este jogo no motor de voxels 3D em vez do núcleo padrão</string>
+    <string name="retro_gs_on_screen_controls">Controles na tela</string>
+    <string name="retro_gs_haptic_feedback">Resposta tátil</string>
+    <string name="retro_gs_group_audio">ÁUDIO</string>
+    <string name="retro_gs_volume">Volume</string>
+    <string name="retro_gs_mute">Sem som</string>
+    <string name="retro_gs_swap_stereo">Trocar canais estéreo</string>
+    <string name="retro_gs_sound">Som</string>
+    <string name="retro_scr_retro_defaults">PADRÕES RETRO</string>
+    <string name="retro_scr_retro_defaults_desc">Padrões aplicados aos jogos de cada console, a menos que substituídos nas configurações do próprio jogo.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Conta</string>
+    <string name="retro_scr_signed_in">Sessão iniciada</string>
+    <string name="retro_scr_not_signed_in_hint">Sem sessão iniciada — abra as Conquistas de um jogo para entrar</string>
+    <string name="retro_scr_achievements_enabled">Conquistas ativadas</string>
+    <string name="retro_scr_hardcore_default">Modo Hardcore por padrão (sem estados salvos)</string>
+    <string name="retro_scr_sign_out">Sair</string>
+    <string name="retro_scr_playstation_bios">BIOS DO PLAYSTATION</string>
+    <string name="retro_scr_installed">Instalada</string>
+    <string name="retro_scr_none_ps1_bios">Nenhuma — os jogos de PS1 exigem uma BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importar BIOS do PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS do PS1 removida</string>
+    <string name="retro_scr_no_bios_to_remove">Não há nenhuma BIOS para remover</string>
+    <string name="retro_scr_remove_ps1_bios">Remover BIOS do PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS DO PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Nenhuma — os jogos de PS2 exigem uma BIOS</string>
+    <string name="retro_scr_format">Formato</string>
+    <string name="retro_scr_ps2_bios_format">Cópia combinada em um único arquivo (.bin com região marcada, ~4MB). Conjuntos ROM0/MEC/NVM separados não são aceitos.</string>
+    <string name="retro_scr_import_ps2_bios">Importar BIOS do PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS do PS2 removida</string>
+    <string name="retro_scr_remove_ps2_bios">Remover BIOS do PS2</string>
+    <string name="retro_scr_library_artwork">IMAGENS DA BIBLIOTECA</string>
+    <string name="retro_scr_retro_case_art">Imagem retro da caixa (cartucho / caixa de CD)</string>
+    <string name="retro_scr_box_art">Imagem da caixa</string>
+    <string name="retro_scr_box_art_desc">Obtida automaticamente de thumbnails.libretro.com na importação; uma imagem personalizada sempre a substitui.</string>
+    <string name="retro_scr_roms_folder">PASTA DE ROMS</string>
+    <string name="retro_scr_folder">Pasta</string>
+    <string name="retro_scr_roms_not_set">Não definida — escolha uma pasta para importar jogos automaticamente</string>
+    <string name="retro_scr_auto_import">Importação automática</string>
+    <string name="retro_scr_auto_import_desc">Os novos jogos nesta pasta são adicionados automaticamente à sua biblioteca com o console correto detectado.</string>
+    <string name="retro_scr_select_roms_folder_title">Selecionar pasta de ROMs</string>
+    <string name="retro_scr_select_roms_folder_button">Selecionar pasta de ROMs…</string>
+    <string name="retro_scr_change_roms_folder_button">Mudar pasta de ROMs…</string>
+    <string name="retro_scr_scan_now">Analisar agora</string>
+    <string name="retro_scr_console_defaults">PADRÕES DO CONSOLE</string>
+    <string name="retro_scr_console_defaults_desc">Toque em um console para definir suas configurações padrão.</string>
+    <string name="retro_scr_renderer">Renderizador</string>
+    <string name="retro_scr_upscale_resolution">Escalonar resolução</string>
+    <string name="retro_scr_aspect_ratio">Proporção da tela</string>
+    <string name="retro_scr_aspect_stretch">Esticar</string>
+    <string name="retro_scr_aspect_auto_standard">Automática (padrão)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtro de tela</string>
+    <string name="retro_scr_filter_nearest">Mais próximo</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinear (suave)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinear (nítido)</string>
+    <string name="retro_scr_texture_filter">Filtro de texturas</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinear (forçado)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinear (sprites)</string>
+    <string name="retro_scr_blending_accuracy">Precisão da mistura</string>
+    <string name="retro_scr_blend_minimum">Mínima</string>
+    <string name="retro_scr_blend_basic">Básica</string>
+    <string name="retro_scr_blend_medium">Média</string>
+    <string name="retro_scr_blend_high">Alta</string>
+    <string name="retro_scr_blend_full">Completa</string>
+    <string name="retro_scr_blend_maximum">Máxima</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Desligado</string>
+    <string name="retro_scr_shader_scanline">Linhas de varredura</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Onda</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Ignorar fotogramas</string>
+    <string name="retro_scr_skip_1">Ignorar 1</string>
+    <string name="retro_scr_skip_2">Ignorar 2</string>
+    <string name="retro_scr_skip_3">Ignorar 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Taxa de ciclos EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (padrão)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_scr_skip_off">Desligado</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 instantâneo</string>
+    <string name="retro_scr_mtvu">VU multithread (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rápido</string>
+    <string name="retro_scr_touch_controls">Controles de toque na tela</string>
+    <string name="retro_scr_sound">Som</string>
+    <string name="retro_scr_swap_stereo">Trocar canais estéreo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: velocidade de emulação</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: uso da CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: uso da GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: resolução interna</string>
+    <string name="retro_scr_enable_online_dev9">Ativar online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_scr_net_auto">Automático</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Modo DNS</string>
+    <string name="retro_scr_dns_manual">Manual</string>
+    <string name="retro_scr_dns_internal">Interno</string>
+    <string name="retro_scr_primary_dns">DNS primário</string>
+    <string name="retro_scr_secondary_dns">DNS secundário</string>
+    <string name="retro_scr_optional">opcional</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automático (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Upscaling SGSR</string>
+    <string name="retro_scr_performance_hud">HUD de desempenho</string>
+    <string name="retro_scr_credits_licenses">CRÉDITOS &amp; LICENÇAS</string>
+    <string name="retro_scr_credits_desc">Alguns recursos do WinNative são baseados nestes projetos de código aberto. Toque para ver cada fonte.</string>
+    <string name="retro_scr_tab_defaults">Predefinições</string>
+    <string name="retro_scr_tab_credits">Créditos</string>
+    <string name="retro_scr_enable_hardcore_title">Ativar o modo Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">O modo Hardcore reinicia o jogo agora e desativa o carregamento de estados salvos, o avanço rápido e as trapaças. Qualquer progresso não salvo será perdido. Continuar?</string>
+    <string name="retro_scr_cancel">Cancelar</string>
+    <string name="retro_scr_enable">Ativar</string>
+    <string name="retro_scr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Ficheiro de BIOS inválido</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS da PS2 importada: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Ficheiro de BIOS da PS2 inválido</string>
+    <string name="retro_scr_no_game_serial">Não há número de série do jogo para procurar trapaças.</string>
+    <string name="retro_scr_applied_cheats">Foram aplicadas %1$d trapaça(s).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Não foi possível aplicar as trapaças.</string>
+    <string name="retro_scr_cheats">Trapaças</string>
+    <string name="retro_scr_apply">Aplicar</string>
+    <string name="retro_scr_no_cheats_found">Nenhuma trapaça encontrada para este jogo.</string>
+    <string name="retro_scr_achievements">Conquistas</string>
+    <string name="retro_scr_sign_in_ra">Entre no RetroAchievements</string>
+    <string name="retro_scr_username">Nome de usuário</string>
+    <string name="retro_scr_password">Senha</string>
+    <string name="retro_scr_login_failed">Falha ao entrar</string>
+    <string name="retro_scr_signing_in">Entrando…</string>
+    <string name="retro_scr_sign_in">Entrar</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">Não há conquistas para este jogo.</string>
+    <string name="retro_scr_back">Voltar</string>
+    <string name="retro_scr_enabled">Ativado</string>
+    <string name="retro_scr_disabled">Desativado</string>
+    <string name="retro_scr_rename">Renomear</string>
+    <string name="retro_scr_save">Salvar</string>
+    <string name="retro_scr_cloud_save_conflict">Conflito de save na nuvem</string>
+    <string name="retro_scr_keep_local_save">Manter save local</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Tela</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Som</string>
+    <string name="retro_tab_controls">Controles</string>
+    <string name="retro_scan_up_to_date">Biblioteca atualizada</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">%1$d adicionados</string>
+    <string name="retro_scan_removed">%1$d removidos</string>
+    <string name="retro_scr_shader_default">Padrão</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Nítido</string>
+    <string name="retro_scr_upscale_native">Nativa</string>
+    <string name="retro_co_aspect_ratio">Proporção da tela</string>
+    <string name="retro_co_ntsc_filter">Filtro NTSC</string>
+    <string name="retro_co_colorization">Colorização</string>
+    <string name="retro_co_color_correction">Correção de cor</string>
+    <string name="retro_co_remove_sprite_limit">Remover limite de sprites</string>
+    <string name="retro_co_resolution">Resolução</string>
+    <string name="retro_co_framebuffer_emulation">Emulação de framebuffer</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Hack widescreen</string>
+    <string name="retro_co_val_8_7_native">8:7 (nativa)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Desligado</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composto</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Automático</string>
+    <string name="retro_co_val_gba_screen">Tela GBA</string>
+    <string name="retro_co_val_gbc_screen">Tela GBC</string>
+    <string name="retro_co_val_on">Ligado</string>
+    <string name="retro_co_val_320x240_native">320x240 (nativa)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ajustado</string>
+    <string name="retro_co_val_native">Nativa</string>
+    <string name="retro_co_val_internal">Interna</string>
+    <string name="retro_co_val_on_16_9">Ligado (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Entre com sua conta RetroAchievements para conquistar e acompanhar conquistas de jogos retro.</string>
+    <string name="retro_ach_username">Nome de usuário</string>
+    <string name="retro_ach_password">Senha</string>
+    <string name="retro_ach_enter_credentials">Digite seu nome de usuário e senha</string>
+    <string name="retro_ach_login_failed">Falha ao entrar</string>
+    <string name="retro_ach_sign_in">Entrar</string>
+    <string name="retro_ach_password_disclaimer">Sua senha é usada apenas uma vez para obter um token de login, que é armazenado com segurança no dispositivo.</string>
+    <string name="retro_ach_achievements_enabled">Conquistas ativadas</string>
+    <string name="retro_ach_hardcore_mode">Modo Hardcore (sem estados salvos)</string>
+    <string name="retro_ach_points">%1$d / %2$d pontos</string>
+    <string name="retro_ach_none_found">Nenhuma conquista encontrada para este jogo.</string>
+    <string name="retro_ach_sign_out">Sair</string>
+    <string name="retro_che_brand">TRAPAÇAS</string>
+    <string name="retro_che_name">Nome</string>
+    <string name="retro_che_code">Código</string>
+    <string name="retro_che_cancel">Cancelar</string>
+    <string name="retro_che_save">Guardar</string>
+    <string name="retro_che_default_name">Trapaça %1$d</string>
+    <string name="retro_che_empty">Ainda não há trapaças. Adicione um código de trapaça para este jogo.</string>
+    <string name="retro_che_add">Adicionar trapaça</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Driver de GPU</string>
+    <string name="retro_gpu_driver_system">Sistema (Padrão)</string>
+    <string name="retro_gpu_driver_hint">Instale os drivers Turnip em Configurações \u2192 Drivers. Os mesmos drivers funcionam para jogos de PC e de PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD do PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Unidade interna virtual para jogos baseados em HDD como Final Fantasy XI. Reinicia o jogo.</string>
+    <string name="retro_ps2_hdd_desc">Unidade interna virtual para jogos baseados em HDD como Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Modo DNS definido como Internal para que seus hosts de servidor personalizados tenham efeito.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">Núcleo da CPU</string>
+    <string name="retro_co_dual_core">Núcleo Duplo</string>
+    <string name="retro_co_internal_cheats">Trapaças Internas</string>
+    <string name="retro_co_internal_resolution">Resolução Interna</string>
+    <string name="retro_co_renderer">Renderizador</string>
+    <string name="retro_co_sensor_bar">Posição da Barra de Sensor</string>
+    <string name="retro_co_skip_gc_bios">Pular Introdução do BIOS</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Inferior</string>
+    <string name="retro_co_val_cached_interpreter">Interpretador em Cache</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_interpreter">Interpretador</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Mouse / Toque</string>
+    <string name="retro_co_val_right_stick_absolute">Analógico Direito (Absoluto)</string>
+    <string name="retro_co_val_right_stick_relative">Analógico Direito (Relativo)</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_val_stretch">Esticar</string>
+    <string name="retro_co_val_top">Superior</string>
+    <string name="retro_co_vbi_skip">Pulo de VBI (Salto de Quadros Automático)</string>
+    <string name="retro_co_widescreen">Tela Panorâmica</string>
+    <string name="retro_co_wiimote_pointer">Ponteiro do Wiimote</string>
+    <string name="retro_gs_cheats_apply_note">As alterações serão aplicadas na próxima vez que você iniciar este jogo.</string>
+    <string name="retro_gs_cheats_detect_hint">Inicie este jogo uma vez para que o número de série do disco possa ser detectado; então as trapaças e correções aparecerão aqui.</string>
+    <string name="retro_gs_dnas_entry_desc">Contorno de autenticação DNAS — necessário para jogar online</string>
+    <string name="retro_gs_dnas_group">Aplicado Automaticamente (Online)</string>
+    <string name="retro_gs_group_cheats">Trapaças &amp; Correções</string>
+    <string name="retro_gs_hdd_image_size">Tamanho: %1$s</string>
+    <string name="retro_gs_hdd_import">Importar Imagem do HDD</string>
+    <string name="retro_gs_hdd_remove_short">Remover</string>
+    <string name="retro_gs_netplay_enable">Ativar NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Desativado por padrão. Ative e, em seguida, escolha Hospedar ou Entrar antes de iniciar.\nDesativa novamente ao sair do jogo.</string>
+    <string name="retro_gs_netplay_host">Endereço do host</string>
+    <string name="retro_gs_netplay_host_hint">IP ou nome do host</string>
+    <string name="retro_gs_netplay_host_mode">Hospedar sessão</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">Ligado = aguardar um jogador. Desligado = entrar no endereço do host</string>
+    <string name="retro_gs_netplay_not_ready">O NetPlay usa portas de multijogador local via TCP (jogador 1 host / jogador 2 cliente). O online do PS2 usa Ethernet DEV9 em vez disso.</string>
+    <string name="retro_gs_netplay_port">Porta</string>
+    <string name="retro_lr_memory_card_slot">Cartão de Memória %1$d</string>
+    <string name="retro_lr_screenshot">Captura de Tela</string>
+    <string name="retro_lr_use_cloud_save">Usar Salvamento na Nuvem</string>
+    <string name="retro_netplay_conn_direct">LAN (IP direto)</string>
+    <string name="retro_netplay_connecting">Conectando…</string>
+    <string name="retro_netplay_connection">Conexão</string>
+    <string name="retro_netplay_conn_traversal">Online (código do host)</string>
+    <string name="retro_netplay_dismiss">Dispensar</string>
+    <string name="retro_netplay_dolphin_help">O NetPlay de GameCube/Wii usa o próprio motor do Dolphin. Host = Jogador 1, Entrar = Jogador 2. Escolha Hospedar ou Entrar e um tipo de conexão antes de iniciar; ambos os dispositivos iniciam o mesmo jogo juntos.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Compartilhe o IP de Wi‑Fi do seu dispositivo e esta porta com o Jogador 2. O jogo começa automaticamente assim que ele se conectar.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">Um código do host é exibido quando o jogo inicia — compartilhe-o com o Jogador 2. O jogo começa automaticamente assim que ele se conectar.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Insira o IP de Wi‑Fi e a porta do host, depois inicie para conectar.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Insira o código do host do Jogador 1, depois inicie para conectar.</string>
+    <string name="retro_netplay_enable_before_launch">Ative o NetPlay nas configurações do jogo e escolha Hospedar ou Entrar antes de iniciar</string>
+    <string name="retro_netplay_find_rooms">Encontrar salas no Wi‑Fi</string>
+    <string name="retro_netplay_game_link_hint">Game Link · cada tela é seu próprio portátil</string>
+    <string name="retro_netplay_gba_not_ready">O multijogador de GBA usa gpSP + Adaptador Sem Fio. Certifique-se de que o libgpsp esteja instalado.</string>
+    <string name="retro_netplay_help">Multijogador de tela compartilhada via Wi‑Fi (como o RetroArch).\nHost = Jogador 1, Entrar = Jogador 2. Ambos os dispositivos mostram o mesmo jogo.</string>
+    <string name="retro_netplay_help_game_link">Game Link via Wi‑Fi — cada dispositivo roda seu próprio jogo.\nGB/GBC: link serial do Gambatte (Pokémon Ger. 1–2).\nGBA: Adaptador Sem Fio do gpSP (batalhas de Pokémon FR/LG/Emerald).</string>
+    <string name="retro_netplay_host_action">Hospedar sala</string>
+    <string name="retro_netplay_host_code">Código do host</string>
+    <string name="retro_netplay_host_code_hint">Código do host de traversal fornecido pelo host</string>
+    <string name="retro_netplay_hosting_room">Hospedando sala</string>
+    <string name="retro_netplay_host_mode_hint">Toque em Hospedar para abrir uma sala para esta sessão de jogo, depois inicie o jogo. O NetPlay desativa ao sair.</string>
+    <string name="retro_netplay_in_room">Na sala</string>
+    <string name="retro_netplay_join_action">Entrar por IP</string>
+    <string name="retro_netplay_joined">Entrou</string>
+    <string name="retro_netplay_join_room">Entrar</string>
+    <string name="retro_netplay_launch_mode">Ao iniciar</string>
+    <string name="retro_netplay_leave">Sair</string>
+    <string name="retro_netplay_menu_hint">Host = J1 · Entrar = J2 · mesmo jogo em ambas as telas</string>
+    <string name="retro_netplay_mode_host">Hospedar</string>
+    <string name="retro_netplay_mode_join">Entrar</string>
+    <string name="retro_netplay_mode_manual">Manual</string>
+    <string name="retro_netplay_no_rooms">Nenhuma sala encontrada. Certifique-se de que o host esteja no mesmo Wi‑Fi e hospedando uma sala.</string>
+    <string name="retro_netplay_player_name">Nome de exibição</string>
+    <string name="retro_netplay_player_name_hint">Mostrado a outros jogadores</string>
+    <string name="retro_netplay_players_count">%1$d conectado(s)</string>
+    <string name="retro_netplay_prelaunch_hint">A sala fica aberta apenas para esta sessão. Inicie quando estiver pronto. Sair do jogo desativa o NetPlay.</string>
+    <string name="retro_netplay_room_players">Jogadores</string>
+    <string name="retro_netplay_scan_action">Buscar no Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Buscar novamente</string>
+    <string name="retro_netplay_scan_hint">Busque salas abertas no mesmo Wi‑Fi ou entre por endereço IP.</string>
+    <string name="retro_netplay_scanning">Buscando no Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Resultados da busca</string>
+    <string name="retro_netplay_select_room_hint">Toque em uma sala para entrar agora (não salva o IP para a próxima inicialização).</string>
+    <string name="retro_netplay_stop_scan">Parar busca</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s conectou-se</string>
+    <string name="retro_netplay_user_disconnected">%1$s desconectou-se</string>
+    <string name="retro_netplay_waiting_players">Aguardando jogadores…</string>
+    <string name="retro_ps2_coming_soon">O suporte a PlayStation 2 chegará em breve</string>
+    <string name="retro_ps2_show_l3r3">Mostrar Botões L3 / R3</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Quando desativado, toque duas vezes em um analógico para clicar L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">FLAGS DO DRIVER TURNIP</string>
+    <string name="retro_ps2_turnip_flags_note">Aplicado apenas quando um driver de GPU personalizado é selecionado acima.</string>
+    <string name="retro_rom_missing">Arquivo do jogo não encontrado</string>
+    <string name="retro_scr_delete">Excluir</string>
+    <string name="retro_scr_import_from_file">Importar de arquivo…</string>
+    <string name="retro_scr_loading">Carregando…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Mudar console</string>
+    <string name="retro_gs_identify_as">Identificar como console</string>
+    <string name="retro_gs_console_changed">Agora identificado como %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Aplique um efeito ReShade (.fx) a jogos DXVK/VKD3D (Vulkan) por meio da camada vkBasalt integrada. Coloque cada efeito em sua própria pasta em Android/data/&lt;package&gt;/files/ReShade/. O ajuste de parâmetros ao vivo e o botão no jogo chegarão com a atualização da camada de recarregamento ao vivo.</string>
+    <string name="reshade_catalog_title">Efeitos ReShade</string>
+    <string name="reshade_catalog_search">Pesquisar efeitos…</string>
+    <string name="reshade_catalog_installed">Instalados (%1$d)</string>
+    <string name="reshade_catalog_available">Disponíveis (%1$d)</string>
+    <string name="reshade_catalog_downloading">Baixando</string>
+    <string name="reshade_catalog_installing">Instalando</string>
+    <string name="reshade_catalog_offline_cache">Offline — mostrando uma lista em cache. Conecte-se para baixar novos efeitos.</string>
+    <string name="reshade_catalog_offline_none">Offline — mostrando apenas os efeitos instalados. Conecte-se para explorar o catálogo.</string>
+    <string name="reshade_catalog_needs_connection">Conecte-se à internet para baixar efeitos.</string>
+    <string name="reshade_catalog_download_failed">Falha ao baixar %1$s.</string>
+    <string name="reshade_catalog_empty_query">Nenhum efeito corresponde a \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Nenhum efeito disponível. Conecte-se à internet para explorar o catálogo.</string>
+    <string name="reshade_catalog_done">Concluído</string>
+    <string name="reshade_catalog_delete_cd">Excluir %1$s</string>
+    <string name="reshade_catalog_delete_title">Excluir %1$s?</string>
+    <string name="reshade_catalog_delete_body">Isso remove o efeito do armazenamento e de qualquer conjunto que o utilize. Você pode baixá-lo novamente mais tarde.</string>
+    <string name="reshade_catalog_delete_confirm">Excluir</string>
+    <string name="reshade_catalog_delete_cancel">Cancelar</string>
+    <string name="reshade_catalog_delete_failed">Não foi possível excluir %1$s.</string>
+    <string name="reshade_params_title">PARÂMETROS DO EFEITO</string>
+    <string name="reshade_params_reset">Redefinir</string>
+    <string name="reshade_loadout_empty">Ainda não há efeitos. Adicione um ou mais efeitos para criar um conjunto.</string>
+    <string name="reshade_loadout_add">Adicionar efeito</string>
+    <string name="reshade_loadout_full">Conjunto cheio — remova um efeito para adicionar outro.</string>
+    <string name="reshade_effect_active">ativo</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pilha</string>
+    <string name="reshade_mode_solo_hint">Um efeito ativo por vez (comparação A/B, alterne ao vivo no jogo).</string>
+    <string name="reshade_mode_stack_hint">Sobreponha qualquer subconjunto de efeitos, aplicados em ordem.</string>
+    <string name="reshade_drawer_enable">Ativar ReShade</string>
+    <string name="reshade_drawer_empty">Nenhum efeito ReShade neste conjunto. Adicione efeitos nas configurações deste jogo (ou do contêiner) para alterná-los e ajustá-los aqui.</string>
+    <string name="reshade_drawer_no_params">Este efeito não expõe parâmetros ajustáveis.</string>
+    <string name="cloud_saves_deleting">Excluindo save…</string>
+    <string name="cloud_saves_history_delete">Excluir</string>
+    <string name="cloud_saves_history_delete_confirm_body">Excluir permanentemente o save na nuvem de %1$s? Isso não pode ser desfeito.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Excluir save na nuvem</string>
+    <string name="cloud_saves_history_delete_failed">Não foi possível excluir o save na nuvem</string>
+    <string name="cloud_saves_history_delete_success">Save na nuvem excluído</string>
+    <string name="retro_bundle_required">Baixe primeiro os núcleos de console — Configuracoes › Retro</string>
+    <string name="retro_ps2_device_unsupported">Este dispositivo não pode executar a emulação de PS2 — ele precisa de OpenGL ES 3.1 ou mais recente.</string>
+    <string name="retro_scr_consoles_check">Verificar atualizações</string>
+    <string name="retro_scr_consoles_checking">Verificando atualizações…</string>
+    <string name="retro_scr_consoles_download">Baixar núcleos de console</string>
+    <string name="retro_scr_consoles_downloading">Baixando… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Núcleos de console</string>
+    <string name="retro_scr_consoles_installed">Instalado — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Instalado — build %1$s (falha ao verificar atualizações)</string>
+    <string name="retro_scr_consoles_installing">Instalando…</string>
+    <string name="retro_scr_consoles_missing">Não instalado — baixe para jogar jogos retro</string>
+    <string name="retro_scr_consoles_state">Status</string>
+    <string name="retro_scr_consoles_update">Atualizar núcleos de console</string>
+    <string name="retro_scr_consoles_update_available">Atualização disponível — build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Verificando o download…</string>
+    <string name="retro_scr_consoles_working">Processando…</string>
+    <string name="retro_tab_system">Sistema</string>
 </resources>
+
diff --git a/app/src/main/res/values-pt/arrays.xml b/app/src/main/res/values-pt/arrays.xml
new file mode 100644
index 000000000..f849b38dd
--- /dev/null
+++ b/app/src/main/res/values-pt/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Imagem</item>
+        <item>Original</item>
+        <item>Cor Sólida</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-pt/plurals.xml b/app/src/main/res/values-pt/plurals.xml
new file mode 100644
index 000000000..bde911b98
--- /dev/null
+++ b/app/src/main/res/values-pt/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d recurso ZIP</item>
+        <item quantity="other">%d recursos ZIP</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..a12861c72
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Executar</string>
+    <string name="common_ui_edit">Editar</string>
+    <string name="common_ui_remove">Remover</string>
+    <string name="common_ui_add">Adicionar</string>
+    <string name="common_ui_shortcuts">Atalhos</string>
+    <string name="common_ui_containers">Contentores</string>
+    <string name="common_ui_input_controls">Controlos de Entrada</string>
+    <string name="common_ui_no_items_to_display">Sem itens para mostrar</string>
+    <string name="common_ui_select_icon">Selecionar Ícone</string>
+    <string name="common_ui_revert_icon">Reverter Ícone</string>
+    <string name="common_ui_select_exe">Selecionar EXE</string>
+    <string name="common_ui_select_folder">Selecionar Pasta</string>
+    <string name="common_ui_current_folder">Pasta Atual</string>
+    <string name="common_ui_enter_path">Introduzir caminho</string>
+    <string name="common_ui_path_not_found">Caminho não encontrado</string>
+    <string name="common_ui_select_valid_exe_file">Selecione um ficheiro .exe válido</string>
+    <string name="common_ui_select_valid_icon_file">Selecione um ficheiro .ico ou .png válido.</string>
+    <string name="common_ui_exit">Sair</string>
+    <string name="common_ui_exit_app">Sair da Aplicação</string>
+    <string name="common_ui_profile">Perfil</string>
+    <string name="common_ui_name">Nome</string>
+    <string name="common_ui_ok">OK</string>
+    <string name="common_ui_cancel">Cancelar</string>
+    <string name="common_ui_untitled">Sem título</string>
+    <string name="common_ui_disabled">Desativado</string>
+    <string name="common_ui_container">Contentor</string>
+    <string name="common_ui_value">Valor</string>
+    <string name="common_ui_none">Nenhum</string>
+    <string name="common_ui_custom_text">Texto Personalizado</string>
+    <string name="common_ui_icon">Ícone</string>
+    <string name="common_ui_duplicate">Duplicar</string>
+    <string name="common_ui_credits_and_third_party_apps">Créditos e aplicações de terceiros</string>
+    <string name="common_ui_loading">A carregar</string>
+    <string name="common_ui_exporting">A exportar</string>
+    <string name="common_ui_enable">Ativar</string>
+    <string name="common_ui_disable">Desativar</string>
+    <string name="common_ui_force">Forçar</string>
+    <string name="common_ui_version">Versão</string>
+    <string name="common_ui_advanced">Avançado</string>
+    <string name="common_ui_graphics">Gráficos</string>
+    <string name="common_ui_system">Sistema</string>
+    <string name="common_ui_width">Largura</string>
+    <string name="common_ui_height">Altura</string>
+    <string name="common_ui_open_file">Abrir Ficheiro</string>
+    <string name="common_ui_download_file">Transferir Ficheiro</string>
+    <string name="common_ui_downloading_file">A transferir ficheiro</string>
+    <string name="common_ui_browse">Procurar</string>
+    <string name="common_ui_options">Opções</string>
+    <string name="common_ui_export">Exportar</string>
+    <string name="common_ui_new_file">Novo Ficheiro</string>
+    <string name="common_ui_description">Descrição</string>
+    <string name="common_ui_continue">Continuar</string>
+    <string name="common_ui_warning">Aviso</string>
+    <string name="common_ui_copy">cópia</string>
+    <string name="common_ui_reset">Repor</string>
+    <string name="common_ui_close">Fechar</string>
+    <string name="common_ui_confirm">Confirmar</string>
+    <string name="common_ui_unnamed">Sem nome</string>
+    <string name="common_ui_download">Transferir</string>
+    <string name="common_ui_uninstall">Desinstalar</string>
+    <string name="common_ui_other">Outro</string>
+    <string name="common_ui_status">Estado</string>
+    <string name="common_ui_size">Tamanho</string>
+    <string name="common_ui_release_date">Data de Lançamento</string>
+    <string name="common_ui_installed">Instalado</string>
+    <string name="common_ui_available">Disponível</string>
+    <string name="common_ui_settings">Definições</string>
+    <string name="common_ui_enable_all">Ativar tudo</string>
+    <string name="common_ui_disable_all">Desativar tudo</string>
+    <string name="common_ui_select_all">Selecionar tudo</string>
+    <string name="common_ui_deselect_all">Desmarcar tudo</string>
+    <string name="common_ui_on">Ligado</string>
+    <string name="common_ui_off">Desligado</string>
+    <string name="common_ui_already_set">Já definido</string>
+    <string name="common_ui_shortcut">Atalho</string>
+    <string name="common_ui_custom">Personalizado</string>
+    <string name="common_ui_about">Acerca de</string>
+    <string name="common_ui_back">Voltar</string>
+    <string name="common_ui_apply">Aplicar</string>
+    <string name="common_ui_save">Guardar</string>
+    <string name="common_ui_clone">Clonar</string>
+    <string name="common_ui_properties">Propriedades</string>
+    <string name="common_ui_store">Loja</string>
+    <string name="common_ui_library">Biblioteca</string>
+    <string name="common_ui_downloads">Transferências</string>
+    <string name="common_ui_import">Importar</string>
+    <string name="common_ui_sync">Sincronizar</string>
+    <string name="common_ui_sign_in">Iniciar Sessão</string>
+    <string name="common_ui_submit">Submeter</string>
+    <string name="common_ui_coming_soon">Brevemente</string>
+    <string name="common_ui_signed_in">Sessão iniciada</string>
+    <string name="common_ui_required">Obrigatório</string>
+    <string name="common_ui_optional">Opcional</string>
+    <string name="common_ui_notifications">Notificações</string>
+    <string name="common_ui_mode">Modo</string>
+    <string name="common_ui_experimental">(Experimental)</string>
+    <string name="common_ui_current_version_label">Versão Atual:</string>
+    <string name="common_ui_cannot_write_folder">Não é possível escrever na pasta selecionada</string>
+    <string name="common_ui_failed_create_directory">Falha ao criar a pasta predefinida</string>
+    <string name="common_ui_device_not_supported">Lamentamos, o seu dispositivo pode não ser suportado</string>
+    <string name="common_ui_please_wait">Aguarde\u2026</string>
+    <string name="common_ui_done">Concluído</string>
+    <string name="common_ui_open">Abrir</string>
+    <string name="common_ui_connected">Ligado</string>
+    <string name="common_ui_install">Instalar</string>
+    <string name="common_ui_application">Aplicação</string>
+    <string name="common_ui_check">Verificar</string>
+    <string name="store_game_check_for_update">Procurar Atualização</string>
+    <string name="store_game_checking_for_update">A verificar</string>
+    <string name="store_game_download_update">Transferir Atualização</string>
+    <string name="store_game_no_update_available">Nenhuma atualização disponível</string>
+    <string name="store_game_update_available">Atualização disponível</string>
+    <string name="store_game_update_check_failed">Falha na verificação de atualização</string>
+    <string name="store_game_update">Atualizar</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verificar Ficheiros</string>
+    <string name="store_game_verify_started">A verificar %1$s — consulte o separador Transferências</string>
+    <string name="store_game_steam_options">Opções do Steam</string>
+    <string name="store_game_verify_complete">Verificação de Ficheiros Concluída</string>
+    <string name="store_game_verify_failed_notice">Falha na Verificação de Ficheiros</string>
+    <string name="store_game_progress_background_hint">Pode fechar isto — continua a funcionar. Consulte o separador Transferências a qualquer momento.</string>
+    <string name="store_game_checking_updates">A procurar atualizações</string>
+    <string name="store_game_no_updates_notice">Nenhuma Atualização Disponível</string>
+    <string name="store_game_update_complete">Atualização Concluída</string>
+    <string name="store_game_update_failed_notice">Falha na Atualização</string>
+    <string name="store_game_update_check_failed_notice">Falha na Verificação de Atualização</string>
+    <string name="store_game_download_already_active">Este jogo já está a ser transferido. Cancele a transferência atual antes de adicionar DLC.</string>
+    <string name="common_ui_select">Selecionar</string>
+    <string name="common_ui_storage_roots">Raízes de Armazenamento</string>
+    <string name="common_ui_browse_local_folders_directly">Procurar pastas locais diretamente</string>
+    <string name="common_ui_no_folders_available_here">Nenhuma pasta disponível aqui</string>
+    <string name="common_ui_grant_all_files_access_browse">Conceda acesso a todos os ficheiros para procurar pastas diretamente.</string>
+    <string name="common_ui_not_configured">Não configurado</string>
+    <string name="common_ui_reinstall">Reinstalar</string>
+    <string name="common_ui_exit_app_confirm">Sair do WinNative?</string>
+    <string name="common_ui_elements_count">%1$d elementos</string>
+    <string name="common_ui_disabled_placeholder">-- Desativado --</string>
+    <string name="common_ui_enabled">Ativado</string>
+    <string name="common_ui_unknown_error">Erro desconhecido</string>
+    <string name="common_ui_auto_detected">Detetado automaticamente</string>
+    <string name="common_ui_change">Alterar</string>
+    <string name="common_ui_proceed">Prosseguir</string>
+    <string name="common_ui_sign_out">Terminar Sessão</string>
+    <string name="common_ui_name_cannot_be_empty">O nome não pode estar vazio</string>
+    <string name="common_ui_error_with_message">Erro: %1$s</string>
+    <string name="common_ui_64_bit">64-BIT</string>
+    <string name="common_ui_32_bit">32-BIT</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BIT &amp; 32-BIT</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d pasta</item>
+        <item quantity="other">%d pastas</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d ficheiro</item>
+        <item quantity="other">%d ficheiros</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Obter arte</string>
+    <string name="library_games_scraping_artwork">A obter…</string>
+    <string name="library_games_shortcut_created">Atalho criado</string>
+    <string name="library_games_failed_to_create_shortcut">Falha ao criar atalho: %s</string>
+    <string name="library_games_install_path">Caminho de Instalação</string>
+    <string name="library_games_not_enough_space">São necessários mais %1$s de espaço</string>
+    <string name="library_games_download_slash_install">Transferir / Instalar</string>
+    <string name="library_games_save_management">GESTÃO DE GRAVAÇÕES</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Disponível: %3$s</string>
+    <string name="library_games_last_played">Jogado pela Última Vez</string>
+    <string name="library_games_playtime">Tempo de Jogo</string>
+    <string name="library_games_plays">Vezes jogado</string>
+    <string name="library_games_dlcs">DLCs</string>
+    <string name="library_games_uninstall_game">DESINSTALAR JOGO</string>
+    <string name="library_games_remove_game">REMOVER JOGO</string>
+    <string name="library_games_uninstall_confirm">Desinstalar %1$s e eliminar permanentemente a sua pasta de jogo instalada?</string>
+    <string name="library_games_remove_confirm">Remover %1$s da sua biblioteca. Os ficheiros do jogo no disco permanecerão intactos?</string>
+    <string name="library_games_game_uninstalled">%1$s desinstalado.</string>
+    <string name="library_games_game_removed">%1$s removido.</string>
+    <string name="library_games_failed_to_uninstall">Falha ao desinstalar.</string>
+    <string name="library_games_failed_to_uninstall_reason">Falha ao desinstalar: %1$s</string>
+    <string name="library_games_loading">A carregar biblioteca\u2026</string>
+    <string name="library_games_no_games_installed">Nenhum jogo instalado. Use um separador de Loja ou o botão + para adicionar jogos.</string>
+    <string name="library_games_times_played_label">Número de vezes jogado: </string>
+    <string name="library_games_playtime_label">Tempo de jogo: </string>
+    <string name="library_games_no_games_hub">Nenhum Jogo Instalado\nClique para abrir o Winlator Backend</string>
+    <string name="library_games_installed_badge">INSTALADO</string>
+    <string name="library_games_unknown_game">Jogo Desconhecido</string>
+    <string name="library_games_layouts_header">DISPOSIÇÕES DA BIBLIOTECA</string>
+    <string name="library_games_layout_carousel">Carrossel</string>
+    <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPÇÕES DE VISUALIZAÇÃO</string>
+    <string name="library_games_immersive_mode">Modo Imersivo</string>
+    <string name="library_games_immersive_mode_description">Usar a arte do jogo em foco como fundo</string>
+    <string name="library_games_immersive_blur">Desfocar Fundo</string>
+    <string name="library_games_immersive_blur_description">Aplicar um efeito de desfocagem ao fundo imersivo</string>
+    <string name="library_games_custom_game">Jogo Personalizado</string>
+    <string name="library_games_play">Jogar</string>
+    <string name="hero_boot_to_desktop_title">Arrancar para o Ambiente de Trabalho</string>
+    <string name="hero_graphics_tests_title">Testes Gráficos</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Testes de Entrada</string>
+    <string name="library_games_add_custom_game">Adicionar Jogo Personalizado</string>
+    <string name="library_games_game_name">Nome do Jogo</string>
+    <string name="library_games_game_folder_mapped_drive">Pasta do Jogo (Unidade de Jogo Mapeada)</string>
+    <string name="library_games_select_exe_provide_name">Selecione um exe e indique um nome</string>
+    <string name="library_games_sign_in_prompt">Inicie sessão numa loja ou adicione um jogo personalizado para construir a sua biblioteca.</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Lojas</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Pasta de Transferências Partilhada</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Usar uma única pasta em todas as lojas</string>
+    <string name="stores_accounts_default_downloads_folder">Pasta de Transferências Predefinida</string>
+    <string name="stores_accounts_steam_downloads">Transferências da Steam</string>
+    <string name="stores_accounts_epic_downloads">Transferências da Epic</string>
+    <string name="stores_accounts_gog_downloads">Transferências da GOG</string>
+    <string name="stores_accounts_download_speed">Velocidade de Transferência</string>
+    <string name="stores_accounts_download_speed_subtitle">Controla a concorrência de threads de transferência da Steam</string>
+    <string name="stores_accounts_download_server">Servidor de Transferência</string>
+    <string name="stores_accounts_connected_stores">Lojas Ligadas</string>
+    <string name="stores_accounts_download_settings">Definições de Transferência</string>
+    <string name="stores_accounts_download_speed_conservative">Conservador</string>
+    <string name="stores_accounts_download_speed_balanced">Equilibrado</string>
+    <string name="stores_accounts_download_speed_standard">Padrão</string>
+    <string name="stores_accounts_download_speed_performance">Desempenho</string>
+    <string name="stores_accounts_download_server_auto_detected">Detetado automaticamente: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Região do CDN da Steam para transferências de jogos</string>
+    <string name="stores_accounts_sign_out_confirm">Terminar sessão de %1$s?</string>
+    <string name="stores_accounts_sign_out_message">Terá de iniciar sessão novamente para aceder à sua biblioteca.</string>
+    <string name="stores_accounts_logged_in_epic">Sessão iniciada na Epic Games!</string>
+    <string name="stores_accounts_epic_login_failed">Falha no início de sessão da Epic: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">Sessão iniciada na GOG!</string>
+    <string name="stores_accounts_gog_login_failed">Falha no início de sessão da GOG: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Caminho de Transferência Personalizado</string>
+    <string name="stores_accounts_custom_download_path_description">Já foi configurado um caminho de transferência predefinido em Definições &gt; Lojas. Se pretender definir um caminho personalizado exclusivo para esta instalação específica, clique em Prosseguir.</string>
+    <string name="stores_accounts_not_signed_in">Sessão não iniciada</string>
+    <string name="stores_accounts_status_online">Online</string>
+    <string name="stores_accounts_status_away">Ausente</string>
+    <string name="stores_accounts_status_offline">Offline</string>
+    <string name="stores_accounts_status_invisible">Invisível</string>
+    <string name="stores_accounts_status_header">ESTADO</string>
+    <string name="stores_accounts_stores_header">LOJAS</string>
+    <string name="stores_accounts_sign_in_store_prompt">Inicie sessão para aceder à loja %1$s.</string>
+    <string name="stores_accounts_manage">Gerir Contas de Lojas</string>
+    <string name="stores_accounts_sign_into_store">Iniciar sessão em %1$s</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Cancelar Tudo</string>
+    <string name="downloads_queue_preparing_download">A preparar transferência</string>
+    <string name="downloads_queue_installing_package">A instalar pacote</string>
+    <string name="downloads_queue_resume_all">Retomar Tudo</string>
+    <string name="downloads_queue_pause_all">Pausar Tudo</string>
+    <string name="downloads_queue_clear">Limpar</string>
+    <string name="downloads_queue_status_label">Estado:</string>
+    <string name="downloads_queue_phase_downloading">A transferir</string>
+    <string name="downloads_queue_phase_downloading_file">A transferir [%1$s]</string>
+    <string name="downloads_queue_phase_queued">Em fila</string>
+    <string name="downloads_queue_phase_paused">Em pausa</string>
+    <string name="downloads_queue_phase_preparing">A preparar</string>
+    <string name="downloads_queue_phase_verifying">A verificar</string>
+    <string name="downloads_queue_phase_verifying_file">A verificar [%1$s]</string>
+    <string name="downloads_queue_phase_patching">A aplicar patch</string>
+    <string name="downloads_queue_phase_applying_data">A aplicar dados</string>
+    <string name="downloads_queue_phase_finalizing">A finalizar</string>
+    <string name="downloads_queue_phase_unpacking">A descompactar</string>
+    <string name="downloads_queue_phase_updating">A atualizar</string>
+    <string name="downloads_queue_phase_complete">Concluído</string>
+    <string name="downloads_queue_phase_cancelled">Cancelado</string>
+    <string name="downloads_queue_phase_failed">Falhou: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Desconhecido</string>
+    <string name="downloads_queue_paused_resume_hint">Em pausa - toque em Retomar para continuar</string>
+    <string name="downloads_queue_cancel_download">Cancelar transferência</string>
+    <string name="downloads_queue_cancel_download_title">Cancelar transferência?</string>
+    <string name="downloads_queue_cancel_download_confirm">Cancelar a transferência de %1$s e eliminar todos os ficheiros transferidos?</string>
+    <string name="downloads_queue_cancel_download_warning">Cancelar a transferência de um DLC, jogo ou atualização pode corromper a instalação do seu jogo.\n\nTem a certeza de que pretende cancelar esta transferência e eliminar os ficheiros transferidos até agora?</string>
+    <string name="downloads_queue_cancel_all_title">Cancelar todas as transferências?</string>
+    <string name="downloads_queue_cancel_all_warning">Cancelar as transferências de DLC, jogos ou atualizações pode corromper as instalações dos seus jogos.\n\nTem a certeza de que pretende cancelar todas as transferências e eliminar os ficheiros transferidos até agora?</string>
+    <string name="downloads_queue_this_game">este jogo</string>
+    <string name="downloads_queue_empty">Nenhuma transferência ativa.</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">Novo contentor</string>
+    <string name="containers_list_edit">Editar contentor</string>
+    <string name="containers_list_creating">A criar contentor</string>
+    <string name="containers_list_removing">A remover contentor</string>
+    <string name="containers_list_duplicating">A duplicar contentor</string>
+    <string name="containers_list_remove_title">Remover contentor</string>
+    <string name="containers_list_duplicate_title">Duplicar contentor</string>
+    <string name="containers_list_confirm_remove">Remover este contentor? Quaisquer jogos guardados armazenados no seu interior serão eliminados permanentemente. Os jogos guardados sincronizados na nuvem permanecem na nuvem, mas as alterações locais que ainda não foram sincronizadas serão perdidas — sincronize primeiro os jogos guardados na nuvem deste jogo se os quiser manter.</string>
+    <string name="containers_list_confirm_duplicate">Pretende duplicar este contentor?</string>
+    <string name="containers_list_duplicate_failed">Falha ao duplicar o contentor</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">Pretende remover este atalho?</string>
+    <string name="shortcuts_list_add_to_home_screen">Adicionar ao ecrã inicial</string>
+    <string name="shortcuts_library_artwork_title">Arte da biblioteca</string>
+    <string name="shortcuts_library_artwork_icon_title">Imagem do ícone</string>
+    <string name="shortcuts_library_artwork_hero_title">Fundo</string>
+    <string name="shortcuts_library_artwork_set">Definir imagem</string>
+    <string name="shortcuts_library_artwork_failed">Falha ao carregar a imagem selecionada.</string>
+    <string name="shortcuts_library_artwork_open_source">Abrir SteamGridDB</string>
+    <string name="shortcuts_list_not_available">Este atalho já não está disponível. Elimine-o ou recrie-o.</string>
+    <string name="shortcuts_list_select_a_container">Selecione um contentor</string>
+    <string name="shortcuts_list_error_opening_settings">Erro ao abrir as definições do atalho</string>
+    <string name="shortcuts_list_removed">Atalho removido com êxito.</string>
+    <string name="shortcuts_list_remove_failed">Falha ao remover o atalho. Tente novamente.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Remover atalho\n%1$s</string>
+    <string name="shortcuts_list_cloned">Atalho clonado com êxito.</string>
+    <string name="shortcuts_list_clone_failed">Falha ao clonar o atalho.</string>
+    <string name="shortcuts_list_exported_to">Atalho exportado para %1$s</string>
+    <string name="shortcuts_list_failed_export">Falha ao exportar o atalho</string>
+    <string name="shortcuts_export_all">Exportar tudo</string>
+    <string name="shortcuts_export_to_frontend">Exportar para o frontend</string>
+    <string name="shortcuts_export_all_done">%1$d jogos exportados para %2$s</string>
+    <string name="shortcuts_export_all_none">Nenhum jogo para exportar</string>
+    <string name="shortcuts_list_added">Atalho adicionado com êxito.</string>
+    <string name="shortcuts_list_readded_existing">Atalho existente readicionado</string>
+    <string name="shortcuts_list_failed_add">Falha ao adicionar o atalho.</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Argumentos de execução</string>
+    <string name="shortcuts_properties_target_path">Caminho de destino</string>
+    <string name="shortcuts_properties_disable_xinput">Desativar Xinput (para controlo exclusivo de rato/teclado)</string>
+    <string name="num_controllers">Número de comandos</string>
+    <string name="shortcuts_properties_exclusive_input">Entrada exclusiva</string>
+    <string name="shortcuts_properties_custom_game_settings">Definições personalizadas do jogo</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Utilizar o iniciador antigo</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Emulação Steam antiga: executa o jogo através do iniciador ColdClient e remove a proteção SteamStub DRM do exe. Utilize apenas para jogos antigos que não funcionam com o Steam Launcher.</string>
+    <string name="shortcuts_properties_runtime_patcher">Patcher de DRM em tempo de execução</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injeta uma DLL de patcher de DRM no arranque. Reduz os FPS — utilize apenas se o iniciador antigo por si só falhar.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">Cliente Steam real do WinNative</string>
+    <string name="steam_section_emulator">Emulador Steam antigo</string>
+    <string name="shortcuts_properties_use_steam_input">Utilizar Steam Input</string>
+    <string name="shortcuts_properties_steam_offline_mode">Modo offline do Steam</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Faz com que o cliente Steam emulado se apresente como offline, para que o jogo não tente estabelecer ligações online. Utilize para jogos que ficam bloqueados na verificação de rede do Steam.</string>
+    <string name="shortcuts_properties_reset">Repor propriedades</string>
+    <string name="shortcuts_properties_updated_at">Atalho atualizado às %1$s</string>
+    <string name="shortcuts_properties_properties_reset">Propriedades repostas com êxito.</string>
+    <string name="shortcuts_properties_reset_per_game">Repor definições por jogo</string>
+    <string name="shortcuts_properties_reset_per_game_message">Repor este jogo para utilizar as predefinições do contentor selecionado?</string>
+    <string name="shortcuts_properties_per_game_reset">Definições por jogo repostas para as predefinições do contentor selecionado</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">Nenhum elemento de controlo selecionado</string>
+    <string name="input_controls_editor_scale">Escala</string>
+    <string name="input_controls_editor_shape">Forma</string>
+    <string name="input_controls_editor_type">Tipo</string>
+    <string name="input_controls_editor_binding">Associação</string>
+    <string name="binding_primary">Associação primária</string>
+    <string name="binding_secondary">Associação secundária</string>
+    <string name="binding_third">Associação terciária</string>
+    <string name="binding_fourth">Associação quaternária</string>
+    <string name="input_controls_editor_binding_up">Associação para cima</string>
+    <string name="input_controls_editor_binding_right">Associação para a direita</string>
+    <string name="input_controls_editor_binding_down">Associação para baixo</string>
+    <string name="input_controls_editor_binding_left">Associação para a esquerda</string>
+    <string name="input_controls_editor_overlay_opacity">Opacidade da sobreposição</string>
+    <string name="input_controls_editor_opacity">Opacidade</string>
+    <string name="input_controls_editor_radial_menu">Menu radial</string>
+    <string name="input_controls_editor_radial_menu_options">Opções do menu radial</string>
+    <string name="input_controls_editor_number_of_bindings">Número de associações</string>
+    <string name="input_controls_editor_select_profile">Selecionar perfil</string>
+    <string name="input_controls_select_style">Selecionar estilo</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Vidro</string>
+    <string name="input_controls_style_slate">Ardósia</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Brilho</string>
+    <string name="input_controls_style_shadow">Sombra</string>
+    <string name="input_controls_style_reticle">Retícula</string>
+    <string name="input_controls_style_neon">Néon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Tema de cores</string>
+    <string name="input_controls_edit_duplicating_builtin">Perfil incorporado — foi criada uma cópia que pode editar.</string>
+    <string name="input_controls_editor_profile_name">Nome do perfil</string>
+    <string name="input_controls_editor_no_profile_selected">Nenhum perfil selecionado</string>
+    <string name="input_controls_editor_no_profile_found">Nenhum perfil encontrado</string>
+    <string name="input_controls_editor_tap_to_switch">Toque para mudar</string>
+    <string name="input_controls_editor_confirm_remove_profile">Pretende remover este perfil?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">Pretende duplicar este perfil?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Repor este perfil para o esquema original? Quaisquer alterações que fez serão perdidas.</string>
+    <string name="input_controls_editor_profile_reset">Perfil reposto para o esquema original.</string>
+    <string name="input_controls_editor_reset_unavailable">Não existe nenhum instantâneo original disponível para este perfil.</string>
+    <string name="input_controls_editor_title">Editor de controlos</string>
+    <string name="input_controls_editor_toggle_switch">Interruptor de alternância</string>
+    <string name="input_controls_editor_swipeable">Deslizável</string>
+    <string name="input_controls_editor_profile_exported_to">Perfil exportado para</string>
+    <string name="input_controls_editor_unable_to_import">Não foi possível importar o perfil</string>
+    <string name="input_controls_editor_import_profile">Importar perfil</string>
+    <string name="input_controls_editor_download_profile">Transferir perfil</string>
+    <string name="input_controls_editor_export_profile">Exportar perfil</string>
+    <string name="input_controls_editor_range">Intervalo</string>
+    <string name="input_controls_editor_confirm_download_profiles">Pretende transferir os perfis selecionados?</string>
+    <string name="input_controls_editor_unable_to_load_list">Não foi possível carregar a lista de perfis</string>
+    <string name="input_controls_editor_osc_transparency">Transparência dos controlos no ecrã</string>
+    <string name="input_controls_editor_osc_transparency_description">Ajuste a transparência dos controlos no ecrã.</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Tamanho do ecrã</string>
+    <string name="container_config_new_env_var">Nova variável de ambiente</string>
+    <string name="container_config_env_vars">Variáveis de ambiente</string>
+    <string name="container_config_processor_affinity">Afinidade do processador</string>
+    <string name="container_config_processor_affinity_32bit">Afinidade do processador (aplicações de 32 bits)</string>
+    <string name="container_config_audio_driver">Controlador de áudio</string>
+    <string name="container_config_win_components">Componentes Win</string>
+    <string name="container_config_drives">Unidades</string>
+    <string name="container_config_arch">Arquitetura</string>
+    <string name="container_config_storage_info">Informações de armazenamento</string>
+    <string name="container_config_drive_c">Unidade C:</string>
+    <string name="container_config_cache">Cache</string>
+    <string name="container_config_total">Total</string>
+    <string name="container_config_clear_cache">Limpar cache</string>
+    <string name="container_config_estimated_used_space">Espaço utilizado estimado</string>
+    <string name="settings_containers_error_saving_wallpaper">Erro ao guardar a imagem de fundo</string>
+    <string name="container_config_directinput_mapper_type">Tipo de mapeador DirectInput</string>
+    <string name="container_config_title">Configuração</string>
+    <string name="container_config_startup_selection">Seleção de arranque</string>
+    <string name="container_config_glibc_exp_edition">Baseado em</string>
+    <string name="container_config_refresh_rate_default_global">Predefinição (global)</string>
+    <string name="container_config_enable_dinput">Ativar DInput para jogos no Wine</string>
+    <string name="container_config_enable_xinput">Ativar XInput para jogos no Wine</string>
+    <string name="container_config_dinput_legacy">Antigo (comandos antigos)</string>
+    <string name="container_config_dinput_modern">Moderno (semelhante a Xinput)</string>
+    <string name="container_config_help_xinput">
+        Se o seu jogo utiliza a &lt;i&gt;&lt;b&gt;API XInput&lt;/b&gt;&lt;/i&gt; para suporte de comandos de jogo, ative esta opção.&lt;br/&gt;&lt;br/&gt;
+        Esta opção afetará tanto os comandos de jogo &lt;i&gt;&lt;b&gt;virtuais&lt;/b&gt;&lt;/i&gt; (fornecidos pelos Controlos de Entrada) como os &lt;i&gt;&lt;b&gt;físicos&lt;/b&gt;&lt;/i&gt;.
+    </string>
+    <string name="container_config_help_dinput">
+        Se o seu jogo utiliza a &lt;i&gt;&lt;b&gt;API DInput&lt;/b&gt;&lt;/i&gt; para suporte de comandos de jogo, ative esta opção.&lt;br/&gt;&lt;br/&gt;
+        Esta opção afetará tanto os comandos de jogo &lt;i&gt;&lt;b&gt;virtuais&lt;/b&gt;&lt;/i&gt; (fornecidos pelos Controlos de Entrada) como os &lt;i&gt;&lt;b&gt;físicos&lt;/b&gt;&lt;/i&gt;.
+    </string>
+    <string name="container_config_xinput_dinput_warning">Alguns jogos podem suportar ambas as APIs. Ativar simultaneamente o XInput e o DInput nesses jogos pode causar problemas de controlo, como acontece em títulos como The Binding of Isaac e a série Resident Evil.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">Emulador de 32 bits</string>
+    <string name="container_config_emulator_wine_hint">O emulador é determinado pela versão do Wine. O ARM64EC utiliza FEXCore, o x86_64 utiliza Box64.</string>
+    <string name="container_config_label">Configuração</string>
+    <string name="container_config_restart_required">Reinicie o contentor para que as alterações tenham efeito</string>
+    <string name="container_config_renderer">Renderizador</string>
+    <string name="container_config_variables">Variáveis</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">Entradas</string>
+    <string name="container_config_tab">Config</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">Emulador de 64 bits</string>
+    <string name="container_config_emulator_section">Emulador</string>
+    <string name="container_config_sdl2_compatibility">Ativar compatibilidade com SDL2</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Configuração do Wine</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">Nome da GPU</string>
+    <string name="container_wine_offscreen_rendering_mode">Modo de renderização fora do ecrã</string>
+    <string name="container_wine_strict_shader_math">Matemática de shader estrita</string>
+    <string name="container_wine_video_memory_size">Tamanho da memória de vídeo</string>
+    <string name="container_wine_dxwrapper">Wrapper DX</string>
+    <string name="container_wine_mouse_warp_override">Substituição do warp do rato</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">Versão do DXVK</string>
+    <string name="container_wine_dxvk_config_title">Configuração do DXVK</string>
+    <string name="container_wine_wined3d_config_title">Configuração do WineD3D</string>
+    <string name="container_wine_vkd3d_version">Versão do VKD3D</string>
+    <string name="container_wine_version">Versão do Wine</string>
+    <string name="container_wine_dxwrapper_help_content">
+        O &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; é uma camada de tradução de DirectX 1-11 para OpenGL.&lt;br /&gt;&lt;br /&gt;
+        O &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; é uma camada de tradução de Direct3D 9-11 para Vulkan.&lt;br /&gt;&lt;br /&gt;
+        O &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; é uma camada de tradução da API Direct3D 12 para Vulkan.&lt;br /&gt;&lt;br /&gt;
+        O &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; é uma implementação de DirectDraw para melhor compatibilidade com jogos clássicos.
+    </string>
+    <string name="container_wine_enabled_async">Ativar Async</string>
+    <string name="container_wine_enabled_async_cache">Ativar cache Async</string>
+    <string name="container_wine_vkd3d_feature_level">Nível de funcionalidade do VKD3D</string>
+    <string name="container_wine_ddraw_wrapper">Wrapper DDraw</string>
+    <string name="container_wine_error_not_installed">O pacote Wine/Proton \'%1$s\' não está instalado e não foi possível transferi-lo.</string>
+    <string name="container_no_wine_installed">Nenhum Wine ou Proton instalado. Instale um primeiro.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Efeito de superfície</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Predefinição do Box64</string>
+    <string name="container_box64_version">Versão do Box64</string>
+    <string name="container_box64_stability">Estabilidade</string>
+    <string name="container_box64_compatibility">Compatibilidade</string>
+    <string name="container_box64_intermediate">Intermédio</string>
+    <string name="container_box64_performance">Desempenho</string>
+    <string name="container_fexcore_performance_tso">Desempenho TSO</string>
+    <string name="container_fexcore_extreme">Extremo</string>
+    <string name="container_fexcore_extreme_tso">Extremo TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Ativa ou desativa o recompilador dinâmico do Box64.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        Tratamento de flags nos opcodes CALL/RET&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Trata CALL/RET como se nunca precisassem de flags (mais rápido, instável)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : A maioria dos RET precisará de flags, a maioria dos CALL não&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Todos os CALL/RET precisarão de flags (mais lento)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">Geração de -NAN como no x86</string>
+    <string name="box64_env_var_help__dynarec_fastround">Geração de arredondamento x86 preciso</string>
+    <string name="box64_env_var_help__dynarec_x87double">Utilização de Float/Double para emulação x87</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Construção de BigBlock pelo Dynarec&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Não tentar construir blocos tão grandes quanto possível&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Construir blocos do Dynarec tão grandes quanto possível&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Construir blocos do Dynarec maiores (continua quando os blocos se sobrepõem, mas apenas para blocos na memória elf)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Construir blocos do Dynarec maiores (continua quando os blocos se sobrepõem, para todos os tipos de memória)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Simulação do modelo de memória forte (Strong Memory)&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Não tentar nada de especial&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Ativar alguma Memory Barrier ao escrever na memória (em alguns opcodes MOV)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Todos os do nível 1 mais uma Memory Barrier em cada escrita na memória com MOV&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Todos os do nível 2 mais uma Memory Barrier ao ler da memória e em alguns opcodes SSE/SSE2&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : Imita o TSO do x86 de forma semelhante ao QEMU.
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">Define o valor máximo de avanço permitido ao construir o Bloco</string>
+    <string name="box64_env_var_help__dynarec_callret">Otimização dos opcodes CALL/RET</string>
+    <string name="box64_env_var_help__dynarec_sep">Adiciona pontos de entrada secundários para otimizar CALL/RET quando o CALLRET está ativado.</string>
+    <string name="box64_env_var_help__dynarec_wait">Define se o Dynarec vai ou não esperar que o FillBlock esteja pronto</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Ajusta as memory barriers para reduzir o impacto no desempenho da emulação de memória forte&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Utilizar barreiras seguras normais&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Utilizar barreiras fracas para um ligeiro aumento de desempenho&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Utilizar barreiras fracas e, adicionalmente, desativar as barreiras da última escrita</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        Gerar apenas atomics alinhados (disponível apenas em Arm64 por agora).&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Gerar código de tratamento de atomics não alinhados.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Gerar apenas atomics alinhados, o que é mais rápido e resulta num código de menor tamanho, mas causará SIGBUS para opcodes com prefixo LOCK que operam sobre endereços de dados alinhados.</string>
+    <string name="box64_env_var_help__dynarec_df">
+        Ativar ou desativar a utilização de flags diferidas.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Desativar a utilização de flags diferidas.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Ativar a utilização de flags diferidas.</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        Permitir continuar a executar um bloco que está desprotegido e potencialmente sujo.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Não permitir continuar a executar um bloco que está desprotegido e potencialmente sujo.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Permitir continuar a executar um dynablock que escreve dados na mesma página que o código. Pode acelerar o tempo de carregamento de alguns jogos, mas também pode causar falhas inesperadas.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Também irá, ao detetar uma HotPage, marcar essa página como NEVERCLEAN, e assim não será protegida contra escrita, mas os blocos criados a partir dessa página serão sempre testados. Pode ser mais rápido desta forma (mas alguns casos de SMC podem não ser intercetados).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        Ativar ou desativar a utilização de flags nativas.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Não utilizar flags nativas.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Utilizar flags nativas quando possível.</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        Ativar a emulação de x86 PAUSE, pode ajudar o desempenho de spinlocks.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ignorar a instrução x86 PAUSE.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Utilizar YIELD para emular a instrução x86 PAUSE.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Utilizar WFI para emular a instrução x86 PAUSE.&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Utilizar SEVL+WFE para emular a instrução x86 PAUSE.
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">Reduz os metadados dos blocos do dynarec para poupar memória, com compromissos de compatibilidade.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">Utiliza metadados voláteis de PE para orientar a emulação de memória forte em jogos de Windows de 64 bits.</string>
+    <string name="box64_env_var_help__dynacache">Controla a colocação em cache dos blocos gerados pelo dynarec entre execuções para acelerar o arranque.</string>
+    <string name="box64_env_var_help__avx">
+        Expõe as capacidades AVX ao convidado.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Desativar a extensão AVX&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ativar as extensões AVX, BMI1, F16C e VAES.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Tudo o de 1 mais ativar AVX2, BMI2, FMA, ADX, VPCLMULQDQ e RDRAND.&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">Expõe as capacidades de CPU AES ao convidado.</string>
+    <string name="box64_env_var_help__pclmulqdq">Expõe as capacidades de CPU PCLMULQDQ ao convidado.</string>
+    <string name="box64_env_var_help__shaext">Expõe as capacidades de CPU da extensão SHA ao convidado.</string>
+    <string name="box64_env_var_help__sse42">Expõe as capacidades de CPU SSE4.2 ao convidado.</string>
+    <string name="box64_env_var_help__sse_flushto0">Controla o comportamento flush-to-zero do SSE e o registo das flags de exceção.</string>
+    <string name="box64_env_var_help__x87_no80bits">Utiliza precisão dupla de 64 bits em vez de long double de 80 bits para o x87.</string>
+    <string name="box64_env_var_help__cputype">Seleciona o modelo de CPU Intel ou AMD exposto ao convidado.</string>
+    <string name="box64_env_var_help__maxcpu">Número máximo de CPUs apresentados aos programas pelo Box64</string>
+    <string name="box64_env_var_help__unityplayer">Deteta o UnityPlayer e marca a aplicação como um jogo Unity.</string>
+    <string name="box64_env_var_help__unity">Marca a aplicação como um jogo Unity e ativa o tratamento de compatibilidade específico do Unity.</string>
+    <string name="box64_env_var_help__mmap32">Forçar todas as alocações de memória em espaços de endereços de 32 bits</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">Ativa as operações IR de TSO (necessário para aplicações multithread).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">Torna atómicos os load/store de vetores quando o TSO está ativado.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">Utiliza atómicos de meia barreira para load/store não alinhados sob TSO.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">Torna atómicos os REP MOVS / REP STOS sob TSO.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Utiliza um bloqueio estrito a nível de processo para acessos atómicos divididos não alinhados.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Aplica backpatch aos atómicos não alinhados tratados pelo kernel para reduzir as mudanças de contexto do kernel.</string>
+    <string name="fexcore_env_var_help__multiblock">Ativa a compilação de código multiblock. Pode causar compilação JIT mais longa e engasgos.</string>
+    <string name="fexcore_env_var_help__maxinst">Número máximo de instruções armazenadas num bloco compilado.</string>
+    <string name="fexcore_env_var_help__hostfeatures">Controla a imposição de funcionalidades da CPU.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Escala o TSC em sistemas de baixa frequência.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Oculta a disposição híbrida dos núcleos da CPU ao convidado.</string>
+    <string name="fexcore_env_var_help__smc_checks">Verifica o código quanto a modificações antes da execução.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Utiliza metadados voláteis de ficheiros PE para TSO quando disponíveis.</string>
+    <string name="fexcore_env_var_help__monohacks">Hacks especiais de SMC + bloco JIT para deteção do Mono.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">Oculta o bit de hipervisor do CPUID (útil para aplicações que falham com ele).</string>
+    <string name="fexcore_env_var_help__disablel2cache">Desativa a consulta da cache L2 do JIT do FEXCore, poupando memória mas introduzindo engasgos.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">Muda a cache L1 do JIT do FEXCore para ter tamanho dinâmico, poupando memória mas introduzindo engasgos.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Limite de consultas por segundo para aumentar a cache L1 dinâmica.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Limite de consultas por segundo para reduzir a cache L1 dinâmica.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">Emula a vírgula flutuante X87 com precisão de 64 bits. Isto reduz a precisão da emulação e pode resultar em erros de renderização.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">Predefinição FEXCore</string>
+    <string name="container_fexcore_version">Versão do FEXCore</string>
+    <string name="use_unix_libs">Utilizar UnixLibs</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Controlador Gráfico</string>
+    <string name="container_zink_mode">Modo Zink</string>
+    <string name="container_graphics_configuration">Configuração do Controlador Gráfico</string>
+    <string name="container_graphics_version">Versão do Controlador Gráfico</string>
+    <string name="container_graphics_available_extensions">Extensões Disponíveis</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d ativadas</string>
+    <string name="container_graphics_max_device_memory">Memória Máxima do Dispositivo</string>
+    <string name="container_graphics_sync_frame">Sincronizar Cada Fotograma</string>
+    <string name="container_graphics_disable_present_wait">Desativar KHR_present_wait</string>
+    <string name="container_graphics_present_modes">Modos de Apresentação</string>
+    <string name="container_graphics_compositor_present_mode">Sincronização de Ecrã Vulkan</string>
+    <string name="container_graphics_resource_type">Tipo de Recurso de Memória</string>
+    <string name="container_graphics_vulkan_version">Versão do Vulkan</string>
+    <string name="container_graphics_bcn_emulation">Emulação BCn</string>
+    <string name="container_graphics_bcn_emulation_type">Tipo de Emulação BCn</string>
+    <string name="container_graphics_bcn_emulation_cache">Cache de Emulação BCn</string>
+    <string name="container_graphics_transcoder">Transcodificador BCn</string>
+    <string name="container_graphics_quality">Qualidade BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">Pretende duplicar esta predefinição?</string>
+    <string name="container_presets_confirm_remove">Pretende remover esta predefinição?</string>
+    <string name="container_presets_title">Predefinições</string>
+    <string name="container_presets_preset">Predefinição</string>
+    <string name="container_presets_new">Nova Predefinição</string>
+    <string name="container_presets_rename">Mudar Nome da Predefinição</string>
+    <string name="container_presets_import">Importar Predefinição</string>
+    <string name="container_presets_custom">Personalizada</string>
+    <string name="container_presets_built_in">Padrão</string>
+    <string name="container_presets_changes_auto_saved">As alterações são guardadas automaticamente ao editar esta predefinição personalizada.</string>
+    <string name="container_presets_cannot_rename">Não é possível mudar o nome das predefinições incorporadas</string>
+    <string name="container_presets_unable_to_import">Não foi possível importar a predefinição</string>
+    <string name="container_presets_no_description">Nenhuma descrição disponível</string>
+    <string name="container_presets_cannot_remove">Não pode remover esta predefinição</string>
+    <string name="container_presets_cannot_export">Não é possível exportar esta predefinição</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Simular ecrã tátil</string>
+    <string name="session_xserver_preferences_button_text">   PREFERÊNCIAS   </string>
+    <string name="session_xserver_extra_keys_config_desc">Aqui pode definir o valor da variável extra-keys tal como na aplicação Termux (leia <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">isto</a>) e mais \n
+Por ex. <b>META</b> para <i>tecla META</i>, \n
+<b>KEYBOARD</b> para <i>tecla de alternância do teclado virtual</i>, \n
+<b>PREFERENCES</b> para <i>tecla de abertura das preferências</i>, \n
+<b>MOUSE_HELPER</b> para <i>tecla de alternância do assistente do rato</i>, \n
+<b>STYLUS_HELPER</b> para <i>tecla de alternância da sobreposição de substituição de clique da caneta</i>, \n
+<b>EXIT</b> para <i>tecla de saída da aplicação</i>.</string>
+    <string name="session_xserver_pref_main">Preferências</string>
+    <string name="session_xserver_pref_output">Saída</string>
+    <string name="session_xserver_pref_pointer">Ponteiro</string>
+    <string name="session_xserver_pref_kbd">Teclado</string>
+    <string name="session_xserver_pref_other">Outro</string>
+    <string name="session_xserver_pref_version">Versão</string>
+    <string name="session_xserver_notification_description">Mensagens do XServer do WinNative</string>
+    <string name="session_xserver_notification_content">O WinNative está em execução, não termine nem deslize esta notificação</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Teclado</string>
+    <string name="session_drawer_fps_monitor">Monitor de FPS</string>
+    <string name="session_drawer_fps_monitor_subtitle">Mostrar estatísticas de desempenho em tempo real</string>
+    <string name="session_drawer_dual_series_battery">Bateria de Série Dupla</string>
+    <string name="session_drawer_hud_frametime_numeric">Mostrar Frametime como Número</string>
+    <string name="session_drawer_toggle_fullscreen">Alternar Ecrã Inteiro</string>
+    <string name="session_drawer_refactor_size">Redimensionar</string>
+    <string name="session_drawer_show_touchscreen_controls">Mostrar Controlos do Ecrã Tátil</string>
+    <string name="session_drawer_magnifier">Lupa</string>
+    <string name="session_drawer_logs">Registos</string>
+    <string name="session_drawer_pip_mode">Modo PiP</string>
+    <string name="session_drawer_toggle_relative_mouse">Alternar Movimento Relativo do Rato</string>
+    <string name="session_drawer_toggle_mouse">Alternar Rato</string>
+    <string name="session_drawer_pause_resume">Pausar/Retomar</string>
+    <string name="session_drawer_relative_mouse_movement">Movimento Relativo do Rato</string>
+    <string name="session_drawer_mouse_input">Entrada do Rato</string>
+    <string name="session_drawer_touch">Toque</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_drawer_touch_touchscreen">Modo de Ecrã Tátil</string>
+    <string name="session_drawer_touch_map_right_stick">Mapear para o Manípulo Direito</string>
+    <string name="session_drawer_rts_gestures">Gestos RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Editar</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilidade do manípulo direito</string>
+    <string name="session_rts_action">Ação</string>
+    <string name="session_rts_behavior">Comportamento</string>
+    <string name="session_rts_tap1">Toque com 1 dedo</string>
+    <string name="session_rts_tap2">Toque com 2 dedos</string>
+    <string name="session_rts_tap3">Toque com 3 dedos</string>
+    <string name="session_rts_tap4">Toque com 4 dedos</string>
+    <string name="session_rts_double_tap">Toque duplo (duplo clique esquerdo)</string>
+    <string name="session_rts_long_press">Toque longo</string>
+    <string name="session_rts_hold2">Manter com 2 dedos</string>
+    <string name="session_rts_hold3">Manter com 3 dedos</string>
+    <string name="session_rts_hold4">Manter com 4 dedos</string>
+    <string name="session_rts_swipe3">Deslize com 3 dedos</string>
+    <string name="session_rts_swipe4">Deslize com 4 dedos</string>
+    <string name="session_rts_up">Cima</string>
+    <string name="session_rts_down">Baixo</string>
+    <string name="session_rts_left">Esquerda</string>
+    <string name="session_rts_right">Direita</string>
+    <string name="session_rts_pan">Deslocamento com 2 dedos</string>
+    <string name="session_rts_pan1">Deslocamento com 1 dedo</string>
+    <string name="session_rts_zoom">Zoom por pinça</string>
+    <string name="session_rts_drag">Arrastar com 1 dedo</string>
+    <string name="session_rts_drag2">Arrastar com 2 dedos</string>
+    <string name="session_rts_long_press_delay">Atraso do toque longo (ms)</string>
+    <string name="session_rts_hold_delay">Atraso de manter (ms)</string>
+    <string name="session_rts_swipe_threshold">Limiar de deslize (px)</string>
+    <string name="session_rts_gesture_threshold">Limiar de gesto (px)</string>
+    <string name="session_rts_double_tap_delay">Atraso do toque duplo (ms)</string>
+    <string name="session_rts_drag_threshold">Limiar de arrasto (px)</string>
+    <string name="session_rts_pan_threshold">Início de deslocamento/pinça (px)</string>
+    <string name="common_ui_rename">Mudar Nome</string>
+    <string name="common_ui_new">Novo</string>
+    <string name="input_controls_editor_input_profiles_section">Perfis de Entrada</string>
+    <string name="session_gesture_profile_section">Perfil de Gestos</string>
+    <string name="gesture_profile_new">Novo Perfil de Gestos</string>
+    <string name="gesture_profile_import">Importar Perfil de Gestos</string>
+    <string name="gesture_profile_export">Exportar Perfil de Gestos</string>
+    <string name="gesture_profile_none">Nenhum perfil de gestos</string>
+    <string name="session_drawer_screen_effects">Efeitos de Ecrã</string>
+    <string name="session_drawer_screen_effects_subtitle">Ampliação e efeitos de cor</string>
+    <string name="session_drawer_super_resolution">Super Resolução</string>
+    <string name="session_drawer_upscaler_mode">Ampliador</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Nitidez das Arestas</string>
+    <string name="session_drawer_vivid">Vívido</string>
+    <string name="session_drawer_vivid_strength">Intensidade do Vívido</string>
+    <string name="session_drawer_color_profile">Efeito de Cor</string>
+    <string name="session_drawer_picture_in_picture">Imagem na Imagem</string>
+    <string name="session_drawer_exit_subtitle">Fechar a sessão em execução</string>
+    <string name="session_drawer_touchscreen_overlay">Sobreposição do Ecrã Tátil</string>
+    <string name="session_drawer_resume">Retomar</string>
+    <string name="session_drawer_retry">Tentar Novamente</string>
+    <string name="downloads_no_internet">Sem ligação à Internet</string>
+    <string name="session_drawer_pause">Pausar</string>
+    <string name="session_drawer_wine_processes_paused">Os processos do Wine estão em pausa</string>
+    <string name="session_drawer_pause_all_wine_processes">Pausar todos os processos do Wine</string>
+    <string name="session_drawer_controls_section">Controlos</string>
+    <string name="session_drawer_session_section">Sessão</string>
+    <string name="session_drawer_header_subtitle">Acesso rápido a controlos, sobreposições e ferramentas da sessão</string>
+    <string name="session_drawer_swipe_hint">Deslize para voltar ao jogo</string>
+    <string name="session_drawer_main_menu_title">Menu</string>
+    <string name="session_drawer_hud_summary">Ajustar a visibilidade da sobreposição e os pontos de dados</string>
+    <string name="session_drawer_hud_disabled_hint">Ative a sobreposição para a personalizar</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_background_alpha">Alfa do Fundo</string>
+    <string name="session_drawer_hud_background">Fundo</string>
+    <string name="session_drawer_hud_scale">Escala</string>
+    <string name="session_drawer_hud_elements">Elementos do HUD</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">Gráfico</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD estilo Mango</string>
+    <string name="session_drawer_hud_mango_settings">Definições do HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Carga da GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. da GPU</string>
+    <string name="mango_hud_element_cpu_load">Carga da CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. da CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Bateria</string>
+    <string name="mango_hud_element_lows" formatted="false">Mínimos de 1%</string>
+    <string name="mango_hud_element_graph">Gráfico de frametime</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Clock da CPU</string>
+    <string name="mango_hud_element_gpu_clock">Clock da GPU</string>
+    <string name="mango_hud_element_cores">Por núcleo</string>
+    <string name="mango_hud_element_network">Rede</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Resolução</string>
+    <string name="mango_hud_element_wine">Versão do Wine</string>
+    <string name="mango_hud_element_duration">Tempo de sessão</string>
+    <string name="mango_hud_element_clock">Relógio</string>
+    <string name="mango_hud_element_throttle">Estado térmico</string>
+    <string name="mango_hud_group_memory">Memória</string>
+    <string name="mango_hud_group_system">Sistema</string>
+    <string name="mango_hud_lock">Bloquear HUD</string>
+    <string name="mango_hud_lock_subtitle">Permite que os toques cheguem aos controlos atrás do HUD. Mantenha o HUD premido para o bloquear. (5s)</string>
+    <string name="hud_position_menu_title">Mover HUD para</string>
+    <string name="hud_position_top_left">Superior Esquerdo</string>
+    <string name="hud_position_top_center">Superior Centro</string>
+    <string name="hud_position_top_right">Superior Direito</string>
+    <string name="hud_position_left_center">Esquerda Centro</string>
+    <string name="hud_position_right_center">Direita Centro</string>
+    <string name="hud_position_bottom_left">Inferior Esquerdo</string>
+    <string name="hud_position_bottom_center">Inferior Centro</string>
+    <string name="hud_position_bottom_right">Inferior Direito</string>
+    <string name="session_drawer_hud_alpha_input_title">Definir Alfa</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Definir Alfa do Fundo</string>
+    <string name="session_drawer_hud_scale_input_title">Definir Escala</string>
+    <string name="session_drawer_hud_input_hint">Introduza um valor de %1$d a %2$d. Os valores acima do limite são ajustados.</string>
+    <string name="session_drawer_command_center">Centro de Comando</string>
+    <string name="session_drawer_command_center_input">Entrada</string>
+    <string name="session_drawer_command_center_display">Ecrã</string>
+    <string name="session_drawer_command_center_system">Sistema</string>
+    <string name="session_drawer_fps_limiter">Limitador de FPS</string>
+    <string name="session_drawer_fps_limiter_off">Desligado</string>
+    <string name="session_drawer_color_profile_disabled">Desativado</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Natural</string>
+    <string name="session_drawer_color_profile_crt">Efeito CRT</string>
+    <string name="session_drawer_color_profile_toon">Toon</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Brilho</string>
+    <string name="session_drawer_contrast">Contraste</string>
+    <string name="session_drawer_gamma">Gama</string>
+    <string name="session_drawer_scale">Escala</string>
+    <string name="session_drawer_scale_nearest">Vizinho mais Próximo</string>
+    <string name="session_drawer_scale_linear">Linear</string>
+    <string name="session_drawer_scale_bicubic">Bicúbico</string>
+    <string name="session_drawer_saturation">Saturação</string>
+    <string name="session_drawer_temperature">Temperatura</string>
+    <string name="session_drawer_tint">Tonalidade</string>
+    <string name="session_drawer_sharpen">Nitidez</string>
+    <string name="session_drawer_scanlines">Linhas de varrimento</string>
+    <string name="session_drawer_pixelate">Pixelizar</string>
+    <string name="session_drawer_block_size">Tamanho do bloco</string>
+    <string name="session_drawer_strength">Força</string>
+    <string name="session_drawer_intensity">Intensidade</string>
+    <string name="session_drawer_color_blind">Daltonismo</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Repor efeitos</string>
+    <string name="session_drawer_calibrate_advanced">Calibração avançada</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Giro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Saída</string>
+    <string name="session_drawer_rail_label_apps">Mais</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">Ecrã externo detetado</string>
+    <string name="display_output_prompt_message">Enviar o jogo para o ecrã ligado? Os teus controlos no ecrã e o menu permanecem neste telemóvel.</string>
+    <string name="display_output_prompt_swap">Trocar ecrãs</string>
+    <string name="display_output_prompt_mirror">Espelhar</string>
+    <string name="display_output_swapped_toast">Jogo movido para o ecrã externo. Os controlos permanecem no teu telemóvel.</string>
+    <string name="display_output_cast_unavailable">As definições de ecrã sem fios não estão disponíveis neste dispositivo.</string>
+    <string name="display_output_restored_toast">Ecrã externo desligado — jogo devolvido ao telemóvel.</string>
+    <string name="session_drawer_output_title">Saída de ecrã</string>
+    <string name="session_drawer_output_subtitle">O jogo está a ser apresentado no ecrã externo.</string>
+    <string name="session_drawer_output_device">Ecrã ligado</string>
+    <string name="session_drawer_output_resolution">Resolução</string>
+    <string name="session_drawer_output_refresh_rate">Taxa de atualização</string>
+    <string name="session_drawer_output_aspect_ratio">Proporção</string>
+    <string name="session_drawer_output_aspect_fit">Ajustar (Proporção)</string>
+    <string name="session_drawer_output_aspect_stretch">Esticar (Preencher)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (Cortar)</string>
+    <string name="session_drawer_output_return_to_phone">Voltar ao telemóvel</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Transmitir para uma TV</string>
+    <string name="session_drawer_output_cast_body">Liga um adaptador USB-C / HDMI, ou toca abaixo para ligar um ecrã sem fios (Miracast / Wi-Fi Direct). O jogo é apresentado na TV enquanto estes controlos permanecem no teu telemóvel.</string>
+    <string name="session_drawer_output_cast_button">Ligar ecrã sem fios</string>
+    <string name="session_drawer_output_cast_note">As TVs apenas com Chromecast não conseguem mostrar jogabilidade em direto com controlos privados — usa um ecrã sem fios ou um adaptador USB‑C/HDMI para o melhor resultado.</string>
+    <string name="session_drawer_output_render_note">Os modos que o teu ecrã reporta alteram a sua saída real (pode ficar preto por breves instantes enquanto reinicializa). Outras resoluções são renderizadas nesse tamanho e escaladas por hardware para o painel — acima da nativa aumenta a nitidez (supersampling), abaixo é mais rápido.</string>
+    <string name="session_drawer_output_scaling_note">Este telemóvel envia o ecrã na sua resolução nativa %1$s e não altera o modo, por isso isto define a resolução de renderização — é escalada por hardware para o painel (acima da nativa aumenta a nitidez, abaixo é mais rápido).</string>
+    <string name="session_drawer_output_game_mode">Modo de jogo (Baixa latência)</string>
+    <string name="session_drawer_output_game_mode_on">Ligado</string>
+    <string name="session_drawer_output_game_mode_off">Desligado</string>
+    <string name="session_drawer_output_game_mode_note">Solicita o modo de jogo / baixa latência da TV (HDMI ALLM) para minimizar o atraso de entrada. Apresentado apenas quando o ecrã ligado o suporta.</string>
+    <string name="session_drawer_output_send_to_display">Enviar jogo para o ecrã</string>
+    <string name="session_drawer_output_to_display">Saída para ecrã externo</string>
+    <string name="session_drawer_output_send_note">Está ligado um ecrã. Envia o jogo para ele — os teus controlos e o menu permanecem neste telemóvel. Podes trazê-lo de volta a qualquer momento.</string>
+    <string name="session_drawer_output_display">Ecrã</string>
+    <string name="session_drawer_output_glasses">Óculos</string>
+    <string name="session_drawer_output_brightness">Brilho</string>
+    <string name="session_drawer_output_shade">Sombra (escurecimento)</string>
+    <string name="session_drawer_output_3d">3D (lado a lado)</string>
+    <string name="glasses_panel_refresh">Taxa de atualização</string>
+    <string name="glasses_panel_sunblock">Proteção solar</string>
+    <string name="session_drawer_output_volume">Volume</string>
+    <string name="session_drawer_output_glasses_note">Enviado diretamente para os teus óculos Viture através de USB.</string>
+    <string name="session_drawer_rail_label_keyboard">Teclado</string>
+    <string name="session_drawer_rail_label_input_controls">Controlos</string>
+    <string name="session_drawer_rail_label_relative_mouse">RatoRel</string>
+    <string name="session_drawer_rail_label_mouse">Rato</string>
+    <string name="session_drawer_rail_label_fullscreen">Ecrã inteiro</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Zoom</string>
+    <string name="session_drawer_rail_label_task_manager">Tarefas</string>
+    <string name="session_drawer_rail_label_record">Gravar</string>
+    <string name="session_drawer_rail_label_logs">Registos</string>
+    <string name="session_record_started">Gravação iniciada</string>
+    <string name="session_record_saved">Gravação guardada em WinNative/Recordings</string>
+    <string name="session_record_failed">Não foi possível iniciar a gravação</string>
+    <string name="session_record_settings_title">Definições de gravação</string>
+    <string name="session_record_fps">Taxa de fotogramas</string>
+    <string name="session_record_resolution">Resolução</string>
+    <string name="session_record_quality">Qualidade</string>
+    <string name="session_record_include_ui">Gravar interface</string>
+    <string name="session_record_include_ui_subtitle">Incluir HUD e controlos no ecrã</string>
+    <string name="session_record_now">Gravar agora</string>
+    <string name="session_drawer_logs_clear">Limpar</string>
+    <string name="session_drawer_logs_pause">Pausar</string>
+    <string name="session_drawer_logs_resume">Retomar</string>
+    <string name="session_drawer_logs_paused_indicator">Em pausa</string>
+    <string name="session_drawer_logs_line_count">%1$d linhas</string>
+    <string name="session_drawer_logs_share">Partilhar</string>
+    <string name="session_drawer_logs_share_subject">Registos da sessão</string>
+    <string name="session_drawer_logs_share_chooser">Partilhar registos da sessão</string>
+    <string name="session_drawer_logs_share_failed">Falha ao partilhar registos</string>
+    <string name="session_drawer_logs_share_empty">Sem linhas de registo para partilhar</string>
+    <string name="session_gyroscope_activator">Ativador</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">Queres terminar este processo?</string>
+    <string name="session_task_title">Gestor de tarefas</string>
+    <string name="session_task_process_name">Nome do processo</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">Memória</string>
+    <string name="session_task_end_process">Terminar processo</string>
+    <string name="session_task_set_affinity">Definir afinidade</string>
+    <string name="session_task_affinity_title">Afinidade do processador</string>
+    <string name="session_task_affinity_all_cores">Todos os núcleos</string>
+    <string name="session_task_new_task">Nova tarefa</string>
+    <string name="session_task_bring_to_front">Trazer para a frente</string>
+    <string name="session_task_custom_value">Valor personalizado</string>
+    <string name="session_task_processes">Processos</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">Utilização por núcleo</string>
+    <string name="session_task_core_label">Núcleo %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d núcleo</item>
+        <item quantity="other">%d núcleos</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Orientação</string>
+    <string name="session_display_horizontal">Horizontal</string>
+    <string name="session_display_vertical">Vertical</string>
+    <string name="session_display_columns">Colunas</string>
+    <string name="session_display_frame_rate">Taxa de fotogramas</string>
+    <string name="session_display_title">Ecrã</string>
+    <string name="session_display_fullscreen_stretched">Ativar ecrã inteiro (Esticado)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Renderizador:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB usados / %2$s total</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">Queres remover este comando?</string>
+    <string name="session_gamepad_external_controllers">Comandos externos</string>
+    <string name="session_gamepad_press_any_button">Prime qualquer botão no teu comando</string>
+    <string name="session_gamepad_bindings">associações</string>
+    <string name="session_gamepad_control_bindings">Associações de controlos</string>
+    <string name="session_gamepad_game_controller">Comando de jogo</string>
+    <string name="session_gamepad_as_button">É Botão</string>
+    <string name="session_gamepad_as_axis">É Eixo</string>
+    <string name="session_gamepad_trigger_type">Tipo</string>
+    <string name="session_gamepad_help_trigger_mode">Depende do teu &lt;b&gt;Comando físico&lt;/b&gt;:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;É Eixo&lt;/b&gt; — o gatilho tem um curso de movimento linear&lt;br/&gt;&#x2022; &lt;b&gt;É Botão&lt;/b&gt; — o gatilho funciona como um simples interruptor&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Nota: usar É Botão com um gatilho linear perde os dados analógicos.&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">Botão A</string>
+    <string name="session_gamepad_button_b">Botão B</string>
+    <string name="session_gamepad_button_x">Botão X</string>
+    <string name="session_gamepad_button_y">Botão Y</string>
+    <string name="session_gamepad_button_grip">Botão de aperto</string>
+    <string name="session_gamepad_button_trigger">Botão de gatilho</string>
+    <string name="session_gamepad_thumbstick_left">Analógico esquerda</string>
+    <string name="session_gamepad_thumbstick_right">Analógico direita</string>
+    <string name="session_gamepad_thumbstick_up">Analógico cima</string>
+    <string name="session_gamepad_thumbstick_down">Analógico baixo</string>
+    <string name="session_gamepad_configure_analog_sticks">Configurar analógicos</string>
+    <string name="session_gamepad_left_stick">Analógico esquerdo</string>
+    <string name="session_gamepad_right_stick">Analógico direito</string>
+    <string name="session_gamepad_controller_manager">Gestor de comandos</string>
+    <string name="session_gamepad_enable_vibration">Ativar vibração</string>
+    <string name="session_gamepad_player_1">Jogador 1</string>
+    <string name="session_gamepad_player_2">Jogador 2</string>
+    <string name="session_gamepad_player_3">Jogador 3</string>
+    <string name="session_gamepad_player_4">Jogador 4</string>
+    <string name="session_gamepad_not_assigned">Não atribuído</string>
+    <string name="session_gamepad_assign">Atribuir</string>
+    <string name="session_gamepad_press_any_button_for_player">Prime qualquer botão no comando para</string>
+    <string name="session_gamepad_vibrate">Vibração</string>
+    <string name="session_gamepad_macros_hint">Alterna os botões para ativar o disparo automático.</string>
+    <string name="session_gamepad_macros">Macros</string>
+    <string name="session_gamepad_include_triggers_note">Aplicar também turbo a L2/R2 como pressões digitais</string>
+    <string name="session_gamepad_square_deadzone">Zona morta quadrada</string>
+    <string name="session_gamepad_invert_x">Inverter X</string>
+    <string name="session_gamepad_invert_y">Inverter Y</string>
+    <string name="session_gamepad_save_profile">Guardar perfil</string>
+    <string name="session_gamepad_load_profile">Carregar perfil</string>
+    <string name="session_gamepad_button_start">Botão Start</string>
+    <string name="session_gamepad_button_select">Botão Select</string>
+    <string name="session_gamepad_button_l1">Botão L1</string>
+    <string name="session_gamepad_button_r1">Botão R1</string>
+    <string name="session_gamepad_button_l2">Botão L2</string>
+    <string name="session_gamepad_button_r2">Botão R2</string>
+    <string name="session_gamepad_button_l3">Botão L3</string>
+    <string name="session_gamepad_button_r3">Botão R3</string>
+    <string name="session_gamepad_dpad_up">D-pad cima</string>
+    <string name="session_gamepad_dpad_down">D-pad baixo</string>
+    <string name="session_gamepad_dpad_left">D-pad esquerda</string>
+    <string name="session_gamepad_dpad_right">D-pad direita</string>
+    <string name="session_gamepad_overwrite">Substituir</string>
+    <string name="session_gamepad_save_as_new">Guardar como novo</string>
+    <string name="session_gamepad_overwrite_profile_message">Queres substituir o perfil atual ou guardar como um novo perfil?</string>
+    <string name="session_gamepad_enter_profile_name">Introduz o nome do perfil</string>
+    <string name="session_gamepad_mappings_saved">Mapeamentos guardados!</string>
+    <string name="session_gamepad_profile_saved">Perfil guardado!</string>
+    <string name="session_gamepad_profile_saved_as_new">Perfil guardado como novo!</string>
+    <string name="session_gamepad_profile_loaded">Perfil carregado!</string>
+    <string name="session_gamepad_profile_name_empty">O nome do perfil não pode estar vazio</string>
+    <string name="session_gamepad_no_profiles">-- Sem perfis --</string>
+    <string name="session_gamepad_error_loading_profile">Erro ao carregar o perfil</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Controlos de ecrã tátil</string>
+    <string name="input_controls_auto_hide_on_controller_title">Ocultar automaticamente com comando</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Ocultar os controlos de ecrã tátil quando um comando está ligado</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">Giroscópio</string>
+    <string name="session_gyroscope_calibrate">Calibrar giroscópio</string>
+    <string name="session_gyroscope_enable_right_stick">Ativar movimento giroscópico do analógico direito</string>
+    <string name="session_gyroscope_activator_button">Botão de ativação do giroscópio</string>
+    <string name="session_gyroscope_hold">Manter premido</string>
+    <string name="session_gyroscope_toggle">Alternar</string>
+    <string name="session_gyroscope_orientation_mode">Inclinar para apontar (Orientação)</string>
+    <string name="session_gyroscope_x_sensitivity">Sensibilidade do eixo X</string>
+    <string name="session_gyroscope_y_sensitivity">Sensibilidade do eixo Y</string>
+    <string name="session_gyroscope_smoothing">Suavização</string>
+    <string name="session_gyroscope_invert_x">Inverter eixo X</string>
+    <string name="session_gyroscope_invert_y">Inverter eixo Y</string>
+    <string name="session_gyroscope_filtering">Filtragem</string>
+    <string name="session_gyroscope_deadzone">Zona morta</string>
+    <string name="session_gyroscope_sensitivity">Sensibilidade</string>
+    <string name="session_gyroscope_direction">Direção</string>
+    <string name="session_gyroscope_mode">Modo de ativação do giroscópio</string>
+    <string name="session_gyroscope_target_stick">Aplicar giroscópio a</string>
+    <string name="session_gyroscope_enable_stick">Ativar movimento giroscópico do analógico</string>
+    <string name="session_gyroscope_reset_stick">Repor analógico</string>
+    <string name="session_gyroscope_reset_stick_to_center">Repor analógico ao centro</string>
+    <string name="session_gyroscope_configuration">Configuração do giroscópio</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Movimento do rato experimental</string>
+    <string name="session_gyroscope_x_sensitivity_format">Sensibilidade X: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Sensibilidade Y: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Suavização: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Zona morta: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Sensibilidade: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Escala do rato</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Escala do rato: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">Velocidade do cursor</string>
+    <string name="settings_general_theme">Tema</string>
+    <string name="settings_general_background">Fundo</string>
+    <string name="settings_general_background_color_hex">Cor (hex)</string>
+    <string name="settings_general_wallpaper_selected">Papel de parede selecionado</string>
+    <string name="settings_general_select_wallpaper">Selecionar papel de parede</string>
+    <string name="settings_general_title">Geral</string>
+    <string name="settings_general_enable_file_provider">Ativar fornecedor de ficheiros</string>
+    <string name="settings_general_enable_auto_scraping">Ativar obtenção automática de arte</string>
+    <string name="settings_general_take_effect_next_startup">Esta opção terá efeito no próximo arranque.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Reinstalar Imagefs</string>
+    <string name="settings_general_confirm_reinstall_imagefs">Queres reinstalar o imagefs? Esta operação irá restaurar os ficheiros do sistema, os teus contentores não serão alterados.</string>
+    <string name="settings_general_refresh_rate">Taxa de atualização</string>
+    <string name="settings_general_refresh_rate_auto_max">Máx</string>
+    <string name="settings_general_refresh_rate_summary">Define a taxa de atualização do ecrã e o limite de fotogramas do DXVK</string>
+    <string name="settings_general_touchscreen_timeout">Tempo limite do ecrã tátil (Requer reinício)</string>
+    <string name="settings_general_touchscreen_haptics">Ativar feedback háptico do ecrã tátil</string>
+    <string name="settings_general_open_with_android_browser">Abrir o navegador Android no Wine</string>
+    <string name="settings_general_share_android_clipboard">Partilhar a área de transferência do Android com o Wine</string>
+    <string name="settings_general_paths_title">Definições de caminho</string>
+    <string name="settings_general_paths_summary">Gere onde o Winlator guarda os seus dados de trabalho e onde são escritos os atalhos exportados.</string>
+    <string name="settings_general_winlator_path_title">Caminho de armazenamento</string>
+    <string name="settings_general_shortcut_export_path_title">Caminho de exportação de atalhos</string>
+    <string name="settings_general_choose_path">Escolher caminho</string>
+    <string name="settings_general_xserver_cursor_summary">Ajusta a velocidade do ponteiro para entrada de toque, trackpad e rato dentro da sessão XServer.</string>
+    <string name="settings_general_cursor_lock_title">Controlo real do rato</string>
+    <string name="settings_general_cursor_lock_summary">Mantém a captura direta do rato ativada para jogos que precisam de entrada de ponteiro em bruto. Desativa-a com Baixar volume.</string>
+    <string name="settings_general_xinput_toggle_title">Desativar XInput</string>
+    <string name="settings_general_xinput_toggle_summary">Desliga o processamento de XInput quando queres controlo exclusivo do rato e do teclado.</string>
+    <string name="settings_external_display_output_summary">Move o jogo para um ecrã externo ligado em vez de espelhar este ecrã. Os óculos usam sempre o seu próprio ecrã.</string>
+    <string name="settings_general_file_provider_summary">Expõe os ficheiros do WinNative aos seletores de documentos e gestores de ficheiros do Android.</string>
+    <string name="settings_general_auto_scraping_summary">Permite que o WinNative obtenha automaticamente a arte de jogos personalizados.</string>
+    <string name="settings_general_open_browser_summary">Abrir as ligações web suportadas no navegador do Android em vez de dentro do Wine.</string>
+    <string name="settings_general_clipboard_summary">Permitir copiar e colar entre o Android e as sessões do Wine.</string>
+    <string name="settings_general_imagefs_summary">Restaurar os ficheiros de sistema incluídos sem remover os seus contentores existentes.</string>
+    <string name="settings_general_check_for_updates">Procurar Atualizações</string>
+    <string name="settings_general_check_for_updates_summary">Procurar automaticamente novas versões da aplicação ao iniciar e periodicamente.</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">SoundFont MIDI</string>
+    <string name="settings_audio_sound">Som</string>
+    <string name="settings_audio_confirm_remove_sound_font">Pretende remover este soundfont?</string>
+    <string name="settings_audio_sound_font_removed_success">Soundfont removido com sucesso!</string>
+    <string name="settings_audio_sound_font_removed_failed">Falha ao remover o soundfont!</string>
+    <string name="settings_audio_sound_font_installed_success">Soundfont instalado com sucesso!</string>
+    <string name="settings_audio_sound_font_installed_failed">Falha ao instalar o soundfont!</string>
+    <string name="settings_audio_sound_font_already_exist">O soundfont que pretende instalar já existe.</string>
+    <string name="settings_audio_unable_to_install_soundfont">Não foi possível instalar o soundfont</string>
+    <string name="settings_audio_installing_soundfont">A instalar SoundFont</string>
+    <string name="settings_audio_sound_font_bad_format">Formato de SoundFont inválido.</string>
+    <string name="settings_audio_cannot_remove_default">Não é possível remover o soundfont predefinido</string>
+    <string name="settings_audio_summary">Instalar, remover e escolher o SoundFont utilizado para a reprodução MIDI.</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Canal de Depuração do Wine</string>
+    <string name="settings_debug_title">Depuração</string>
+    <string name="settings_debug_wine_logs_title">Ativar Registos de Depuração do Wine</string>
+    <string name="settings_debug_wine_logs_subtitle">Escrever a saída de depuração do Wine num ficheiro</string>
+    <string name="settings_debug_box_logs_title">Ativar Registos do Box86/64</string>
+    <string name="settings_debug_box_logs_subtitle">Escrever a saída de depuração do Box86 &amp; Box64 num ficheiro</string>
+    <string name="settings_debug_fex_logs_title">Ativar Registos do FEXCore</string>
+    <string name="settings_debug_fex_logs_subtitle">Escrever a saída de depuração do FEXCore num ficheiro</string>
+    <string name="settings_debug_emulator_logs_title">Registos de Emulação Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Regista, num ficheiro, o emulador que o seu contentor utilizar.</string>
+    <string name="settings_debug_steam_logs_title">Ativar Registos do Steam</string>
+    <string name="settings_debug_steam_logs_subtitle">Registar eventos de autenticação e de sessão do Steam para depuração.</string>
+    <string name="settings_debug_wine_channels_title">Canais de Depuração do Wine</string>
+    <string name="settings_debug_wine_channels_summary">Escolha os canais do Wine incluídos quando o registo de depuração do Wine está ativado.</string>
+    <string name="settings_debug_wine_classes_title">Níveis de Registo do Wine</string>
+    <string name="settings_debug_wine_classes_summary">Escolha os tipos de mensagem registados. O rastreio é extremamente detalhado.</string>
+    <string name="settings_debug_input_logs">Registos de Entrada</string>
+    <string name="settings_debug_input_logs_description">Registar eventos de entrada de comando, toque e teclado</string>
+    <string name="settings_debug_download_logs">Registos de Transferências</string>
+    <string name="settings_debug_download_logs_description">Registar eventos do resolvedor de transferências e de recurso do WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Camadas de Validação do Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Reinicie o ecrã para aplicar.</string>
+    <string name="settings_debug_share_logs">Partilhar Registos</string>
+    <string name="settings_debug_delete_logs">Eliminar Registos</string>
+    <string name="settings_debug_share_all_logs_short">Partilhar tudo</string>
+    <string name="settings_debug_download_all_logs_short">Transferir tudo</string>
+    <string name="settings_debug_logs_saved">Guardado em %1$s</string>
+    <string name="settings_debug_delete_logs_short">Eliminar</string>
+    <string name="settings_debug_delete_all_logs_short">Eliminar tudo</string>
+    <string name="settings_debug_open_logs_folder_short">Abrir Gestor de Registos</string>
+    <string name="settings_debug_logs_deleted">Registos eliminados</string>
+    <string name="settings_debug_delete_logs_confirm_title">Eliminar Registos?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Isto elimina permanentemente todos os ficheiros de registo guardados (%1$s). Esta ação não pode ser anulada.</string>
+    <string name="settings_debug_logs_browser_title">Registos</string>
+    <string name="settings_debug_log_truncated">A mostrar os últimos %1$s deste registo</string>
+    <string name="settings_debug_logs_subject">Registos do WinNative (%1$s)</string>
+    <string name="settings_debug_no_logs_available">Não há registos de depuração disponíveis. Ative primeiro as opções de depuração e inicie um jogo.</string>
+    <string name="settings_debug_capture_failed">Falha ao capturar os registos: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">Registar erros, avisos e falhas do processo do WinNative num ficheiro</string>
+    <string name="settings_debug_section_emulation">Emulação</string>
+    <string name="settings_debug_section_subsystems">Subsistemas</string>
+    <string name="settings_debug_section_tools">Ferramentas</string>
+    <string name="settings_debug_no_channels_selected">Nenhum canal selecionado</string>
+    <string name="settings_debug_no_channels_available">Nenhum canal disponível</string>
+    <string name="settings_debug_channel_toggle_hint">Toque para alternar os canais. Os canais ativados são incluídos na saída de depuração do Wine.</string>
+    <string name="settings_debug_remove_channel_desc">Remover %1$s</string>
+
+    <string name="settings_other_language_title">Idioma</string>
+    <string name="settings_other_language_summary">Escolha o idioma de apresentação</string>
+    <string name="settings_other_language_system_default">Predefinição do sistema</string>
+    <string name="settings_other_game_language_title">Idioma do jogo</string>
+    <string name="settings_other_game_language_summary">Idioma preferido para transferências da Steam/Epic/GOG</string>
+
+    <string name="settings_other_section_integration">Integração</string>
+    <string name="settings_other_setup_wizard_title">Assistente de Configuração</string>
+    <string name="settings_other_setup_wizard_summary">Abra novamente o assistente de configuração para rever permissões, ficheiros de sistema e contentores predefinidos.</string>
+    <string name="settings_other_checking_for_updates">A procurar atualizações…</string>
+    <string name="settings_other_update_check_cooldown">Aguarde %1$ds antes de verificar novamente</string>
+    <string name="settings_other_persistable_permission_failed">Não foi possível obter permissões persistentes: %1$s</string>
+    <string name="settings_other_keep_app_open">Mantenha a aplicação aberta até isto terminar.</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">Instalar Conteúdo</string>
+    <string name="settings_content_type">Categoria</string>
+    <string name="settings_content_components">Componentes</string>
+    <string name="settings_content_auto_create_container">Criar contentor automaticamente</string>
+    <string name="settings_content_remove_title">Remover componente?</string>
+    <string name="settings_content_empty_subtitle">Instale um pacote ou mude de tipo para começar.</string>
+    <string name="settings_content_container_created">Contentor criado: %1$s</string>
+    <string name="settings_content_download_failed">Falha na transferência.</string>
+    <string name="common_ui_working">A processar</string>
+    <string name="settings_content_desc_wine">Criado pelo projeto Wine; traduz chamadas Win32 para serviços nativos de Linux/Android.</string>
+    <string name="settings_content_desc_proton">Criado pela Valve; um runtime baseado em Wine com correções para jogos de Windows.</string>
+    <string name="settings_content_desc_dxvk">Traduz chamadas gráficas de Direct3D 9, 10 e 11 para Vulkan.</string>
+    <string name="settings_content_desc_vkd3d">Traduz chamadas gráficas de Direct3D 12 para Vulkan.</string>
+    <string name="settings_content_desc_box64">Traduz código Linux x86_64 para que possa ser executado em dispositivos ARM64.</string>
+    <string name="settings_content_desc_wowbox64">Compilação do Box64 utilizada pelo WoW64 para executar aplicações de Windows de 32 bits dentro do Wine de 64 bits.</string>
+    <string name="settings_content_desc_fexcore">Traduz código x86 e x86_64 para que possa ser executado em dispositivos ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduz chamadas gráficas de DirectDraw (Direct3D 7 e anteriores) para Vulkan.</string>
+    <string name="settings_content_unable_to_install">Não foi possível instalar o conteúdo.</string>
+    <string name="settings_content_install_failed">Falha na Instalação</string>
+    <string name="settings_content_file_cannot_be_recognized">Não é possível reconhecer o ficheiro.</string>
+    <string name="settings_content_profile_not_found">Perfil não encontrado no conteúdo.</string>
+    <string name="settings_content_profile_cannot_be_recognized">Não é possível reconhecer o perfil</string>
+    <string name="settings_content_file_list">Lista de Ficheiros</string>
+    <string name="settings_content_install_directory">Diretório de Instalação</string>
+    <string name="settings_content_installed_success">Conteúdo instalado com sucesso!</string>
+    <string name="settings_content_downloading_title">A Transferir Conteúdo</string>
+    <string name="settings_content_installing_title">A Instalar Conteúdo</string>
+    <string name="settings_content_extracting_title">A Extrair Conteúdo</string>
+    <string name="settings_content_extracting_detail">A extrair (%1$d ficheiros)</string>
+    <string name="settings_content_preparing_package">A preparar o pacote</string>
+    <string name="settings_content_download_complete">Transferência concluída</string>
+    <string name="settings_content_already_installed_title">Componente Já Instalado</string>
+    <string name="settings_content_already_installed_message">Este componente já está instalado. Remova a cópia instalada antes de o transferir novamente.
+
+Caminho instalado:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Conteúdo Conflituoso Instalado</string>
+    <string name="settings_content_conflicting_message">Desinstale o conteúdo conflituoso antes de transferir este pacote.
+
+Caminho instalado:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">O conteúdo não é fidedigno.</string>
+    <string name="settings_content_is_incomplete">O conteúdo está incompleto.</string>
+    <string name="settings_content_untrusted_files_warning">Aviso: o conteúdo adicional contém ficheiros não fidedignos. Geralmente, os ficheiros seguintes não devem ser modificados. Decida se pretende prosseguir com a instalação.</string>
+    <string name="settings_content_confirm_remove">Isto irá eliminar o componente do seu dispositivo.</string>
+    <string name="settings_content_unable_to_remove_in_use">Não é possível remover este conteúdo, porque um contentor está atualmente a utilizar este Wine.</string>
+    <string name="settings_content_download_in_components">Nenhum transferido. Transfira um em Componentes.</string>
+    <string name="settings_content_types_header">TIPOS DE CONTEÚDO</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Controladores</string>
+    <string name="settings_drivers_manager_header">Gestor de Controladores</string>
+    <string name="settings_drivers_github_repos">Repositórios do GitHub</string>
+    <string name="settings_drivers_install">Instalar Controladores</string>
+    <string name="settings_drivers_installed_success">Controlador instalado com sucesso.</string>
+    <string name="settings_drivers_install_failed">Falha ao instalar o controlador.</string>
+    <string name="settings_drivers_remove_title">Remover controlador?</string>
+    <string name="settings_drivers_confirm_remove">Isto irá eliminar o controlador do seu dispositivo.</string>
+    <string name="settings_drivers_remove_repo_title">Remover repositório?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s será removido da sua lista de repositórios.</string>
+    <string name="settings_drivers_repo_tap_to_load">Toque para carregar as versões</string>
+    <string name="settings_drivers_repo_loading_releases">A carregar as versões</string>
+    <string name="settings_drivers_repo_release_count">%1$d versões carregadas</string>
+    <string name="settings_drivers_repo_no_release_assets">Não foram encontrados ficheiros ZIP transferíveis nas versões obtidas.</string>
+    <string name="settings_drivers_repo_fetch_failed">Não foi possível carregar as versões do GitHub.</string>
+    <string name="settings_drivers_repo_download_failed">Falha na transferência.</string>
+    <string name="settings_drivers_repo_no_version">Versão indisponível</string>
+    <string name="settings_drivers_repo_unknown_size">Tamanho desconhecido</string>
+    <string name="settings_drivers_manager">Gestor de Controladores</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">A Instalar Ficheiros de Sistema</string>
+    <string name="setup_wizard_unable_to_install_system_files">Não foi possível instalar os ficheiros de sistema</string>
+    <string name="setup_wizard_system_image_not_installed">Imagem de sistema não instalada. Instale primeiro os componentes.</string>
+    <string name="setup_wizard_recommended_components">Componentes Recomendados</string>
+    <string name="setup_wizard_step_format">Passo %1$d de %2$d</string>
+    <string name="setup_wizard_allow_file_access">Permitir todo o acesso a ficheiros</string>
+    <string name="setup_wizard_install_system_files">Instalar Ficheiros de Sistema</string>
+    <string name="setup_wizard_recommended_components_description">Os Componentes Recomendados transferem e instalam automaticamente os pacotes suportados DXVK, VKD3D, FEX, Box64 e Wowbox64.</string>
+    <string name="setup_wizard_each_button_downloads_description">Cada botão transfere o pacote, instala-o e cria automaticamente o respetivo contentor predefinido.</string>
+    <string name="setup_wizard_recommended_x86_64">x86-64 Recomendado</string>
+    <string name="setup_wizard_recommended_arm64ec">ARM64EC Recomendado</string>
+    <string name="setup_wizard_choose_components_description">Escolha os componentes a instalar. O Wine/Proton criará automaticamente um contentor.</string>
+    <string name="setup_wizard_loading_components">A carregar componentes…</string>
+    <string name="setup_wizard_no_components_available">Não há componentes disponíveis para esta categoria.</string>
+    <string name="setup_wizard_default_settings">Definições Predefinidas</string>
+    <string name="setup_wizard_containers">Configuração de Contentores</string>
+    <string name="setup_wizard_containers_description">Abra cada contentor e defina as predefinições que pretende que cada novo jogo herde. Por predefinição, os novos jogos utilizarão o contentor x86-64.</string>
+    <string name="setup_wizard_store_sign_in_optional">O início de sessão na loja é opcional. Cada início de sessão regressa aqui quando termina.</string>
+    <string name="setup_wizard_granted">Concedido</string>
+    <string name="setup_wizard_grant">Conceder</string>
+    <string name="setup_wizard_denied">Recusado</string>
+    <string name="setup_wizard_allow">Permitir</string>
+    <string name="setup_wizard_installing">A instalar</string>
+    <string name="setup_wizard_install_failed_reason">Falha na instalação: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Acesso Necessário</string>
+    <string name="setup_wizard_select_components">Selecionar Componentes</string>
+    <string name="setup_wizard_recommended_wine_proton">Wine / Proton Recomendado</string>
+    <string name="setup_wizard_advanced_setup">Configuração Avançada</string>
+    <string name="setup_wizard_title">Assistente de Configuração</string>
+    <string name="setup_wizard_advanced_user">Utilizador Avançado</string>
+    <string name="setup_wizard_next">Seguinte</string>
+    <string name="setup_wizard_finish">Concluir</string>
+    <string name="setup_wizard_download_and_install">Transferir + Instalar</string>
+    <string name="setup_wizard_open_drivers">Abrir Controladores</string>
+    <string name="setup_wizard_ready">Pronto</string>
+    <string name="setup_wizard_download_and_create">Transferir + Criar</string>
+    <string name="setup_wizard_configured">Configurado</string>
+    <string name="setup_wizard_downloading">A transferir %1$s</string>
+    <string name="setup_wizard_installing_package">A instalar %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">Ainda não há pacotes de Wine ou Proton instalados.</string>
+    <string name="setup_wizard_no_runtime_hint">Instale um pacote de Wine ou Proton no passo anterior, ou ignore isto por agora.</string>
+    <string name="setup_wizard_recommended_label">Recomendado</string>
+    <string name="setup_wizard_install_all_recommended">Instalar Todos os Recomendados</string>
+    <string name="setup_wizard_create_container">Criar Contentor</string>
+    <string name="setup_wizard_creating_container">A criar…</string>
+
+    <string name="input_controls_tap_to_click">Tocar para Clicar</string>
+    <string name="input_controls_reverse_binding_order">Inverter ordem das associações</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Autorização</string>
+    <string name="steam_login_sign_in_to_your_account">Inicie sessão na sua conta</string>
+    <string name="steam_login_username">Nome de utilizador</string>
+    <string name="steam_login_password">Palavra-passe</string>
+    <string name="steam_login_invalid_username_or_password">Nome de utilizador ou palavra-passe inválidos</string>
+    <string name="steam_login_remember_me">Lembrar-me</string>
+    <string name="steam_login_sign_in_with_qr_code">Iniciar sessão com Código QR</string>
+    <string name="steam_login_open_steam_app_qr_hint">Abra a aplicação Steam → toque no ícone QR</string>
+    <string name="steam_login_failed_to_load_qr_code">Falha ao carregar o código QR</string>
+    <string name="steam_login_retry">Tentar novamente</string>
+    <string name="steam_login_generating_code">A gerar o código…</string>
+    <string name="steam_login_two_factor_auth">Autenticação de Dois Fatores</string>
+    <string name="steam_login_approve_login_steam_app">Aprove este início de sessão na\nsua aplicação móvel Steam</string>
+    <string name="steam_login_enter_code_sent_to">Introduza o código enviado para\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">Introduza o seu código Steam Guard</string>
+    <string name="steam_login_code">Código</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Sincronização na Nuvem</string>
+    <string name="google_cloud_sync_started">Sincronização na nuvem iniciada.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Serviços Google</string>
+    <string name="google_auto_signin_title">Iniciar sessão no Google ao arrancar</string>
+    <string name="google_auto_signin_summary">Ligar automaticamente ao Google Play Games quando a aplicação arranca para que as cópias de segurança dos jogos guardados e a sincronização estejam sempre prontas. Quando desativado, a aplicação nunca inicia sessão por conta própria.</string>
+    <string name="google_auto_signin_section">Ao Arrancar</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">A sincronizar</string>
+    <string name="google_cloud_status_connected">Ligado</string>
+    <string name="google_cloud_status_not_signed_in">Sessão não iniciada</string>
+    <string name="google_cloud_working">A processar…</string>
+    <string name="google_cloud_sign_in">Iniciar Sessão</string>
+    <string name="google_cloud_disable_sync">Desativar Sincronização</string>
+    <string name="google_cloud_store_logins">Inícios de Sessão da Loja</string>
+    <string name="google_cloud_store_login_sync_busy">A trabalhar na sincronização dos seus inícios de sessão da loja…</string>
+    <string name="google_cloud_saved_games_unavailable">Jogos Guardados do Google indisponíveis</string>
+    <string name="google_cloud_snapshot_ready">Instantâneo na nuvem pronto</string>
+    <string name="google_cloud_waiting_first_backup">A aguardar a primeira cópia de segurança</string>
+    <string name="google_cloud_no_store_logins_detected">Nenhum início de sessão da loja detetado</string>
+    <string name="google_cloud_last_synced">Última sincronização %1$s</string>
+    <string name="google_cloud_backup">Cópia de Segurança</string>
+    <string name="google_cloud_restore">Restaurar</string>
+    <string name="google_cloud_sign_in_to_sync">Inicie sessão no Google Play Games para sincronizar os inícios de sessão da loja.</string>
+    <string name="google_cloud_sign_in_failed">Falha no início de sessão do Google Play Games.</string>
+    <string name="google_cloud_sign_in_finishing">O início de sessão do Google Play Games ainda está a terminar. Aguarde um momento e tente novamente a sincronização na nuvem.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games ligado. O restauro está disponível para %1$s.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games ligado. Toque em Cópia de Segurança para guardar %1$s inícios de sessão.</string>
+    <string name="google_cloud_connected_ready">Google Play Games ligado. A Cópia de Segurança e o Restauro estão prontos.</string>
+    <string name="google_cloud_sync_disabled">Sincronização do Google Play Games desativada para esta aplicação.</string>
+    <string name="google_cloud_sign_in_first">Inicie primeiro sessão no Google Play Games.</string>
+    <string name="google_cloud_no_saved_logins_found">Não foram encontrados inícios de sessão da loja guardados na sincronização na nuvem do Google.</string>
+    <string name="google_cloud_backup_already_matches">A cópia de segurança na nuvem já corresponde aos inícios de sessão atuais da loja.</string>
+    <string name="google_cloud_no_local_logins">Não há inícios de sessão da loja locais disponíveis para copiar.</string>
+    <string name="google_cloud_logins_restored_and_synced">Inícios de sessão da loja restaurados e sincronizados para %1$s.</string>
+    <string name="google_cloud_logins_restored">Inícios de sessão da loja restaurados para %1$s.</string>
+    <string name="google_cloud_logins_backed_up">Cópia de segurança dos inícios de sessão da loja efetuada para %1$s.</string>
+    <string name="google_cloud_sync_ready">A sincronização dos inícios de sessão da loja está pronta.</string>
+    <string name="google_cloud_no_logins_to_sync">Ainda não há inícios de sessão da loja disponíveis para sincronizar.</string>
+    <string name="google_cloud_sign_in_to_backup">Inicie sessão para efetuar cópia de segurança dos tokens de início de sessão de %1$s.</string>
+    <string name="google_cloud_no_backed_up_logins">Ainda não foram encontrados inícios de sessão de lojas em cópia de segurança.</string>
+    <string name="google_cloud_local_cloud_differ">Os inícios de sessão de lojas locais e na nuvem são diferentes. Use Cópia de segurança para substituir os dados na nuvem ou Restaurar para obter os tokens guardados.</string>
+    <string name="google_cloud_local_ready_to_backup">Os inícios de sessão de lojas locais estão prontos para cópia de segurança de %1$s.</string>
+    <string name="google_cloud_backup_ready">A cópia de segurança dos inícios de sessão de lojas está pronta.</string>
+    <string name="google_cloud_restore_available">O restauro dos inícios de sessão na nuvem está disponível para %1$s.</string>
+    <string name="google_cloud_logins_synced">Os inícios de sessão de lojas estão sincronizados com o Google Play Games.</string>
+    <string name="google_cloud_sync_problem">A sincronização dos inícios de sessão de lojas encontrou um problema.</string>
+    <string name="google_cloud_error_auth_needed">O Google Play Games precisa de concluir a autenticação antes de a sincronização na nuvem poder aceder aos Jogos Guardados. Abra o pedido de perfil do Play Games se for apresentado e tente novamente.</string>
+    <string name="google_cloud_error_developer">Os Jogos Guardados do Google Play Games rejeitaram esta versão. Verifique o ID da aplicação do Play Games, o nome do pacote associado e o certificado de assinatura na Play Console.</string>
+    <string name="google_cloud_error_build_rejected">A conta Google está associada, mas os Jogos Guardados do Google Play Games rejeitaram esta versão. Verifique o ID da aplicação do Play Games, o pacote associado e o certificado de assinatura.</string>
+    <string name="google_cloud_error_network">A sincronização na nuvem da Google falhou porque o pedido de rede não foi concluído ou os serviços do Google Play precisam de atenção.</string>
+    <string name="google_cloud_error_no_snapshot">Ainda não foram encontrados inícios de sessão de lojas guardados na sincronização na nuvem da Google.</string>
+    <string name="google_cloud_error_generic">A sincronização na nuvem da Google falhou: %1$s</string>
+    <string name="google_cloud_error_before_open">A sincronização na nuvem da Google falhou antes de os Jogos Guardados da Google poderem abrir.</string>
+    <string name="cloud_saves_title">Jogos Guardados na Nuvem</string>
+    <string name="cloud_saves_title_for_provider">%1$s Jogos Guardados na Nuvem - %2$s</string>
+    <string name="cloud_saves_sync_summary">Obter a versão que %1$s tem neste momento.</string>
+    <string name="cloud_saves_sync_summary_generic">Obter a versão atual na nuvem.</string>
+    <string name="cloud_saves_no_backups">Ainda não existem cópias de segurança para este jogo.</string>
+    <string name="cloud_sync_title">Jogos Guardados na Nuvem</string>
+    <string name="cloud_sync_disable_title">Desativar Jogos Guardados na Nuvem</string>
+    <string name="cloud_saves_steam_push_label">Enviar para a Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forçar o envio do jogo guardado local</string>
+    <string name="cloud_saves_steam_push_success">Jogo guardado enviado para a Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Não foi possível enviar o jogo guardado para a Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">A Steam Cloud está inacessível neste momento. A reconectar em segundo plano; toque em atualizar assim que voltar a ficar online.</string>
+    <string name="steam_session_refused_event">A Steam recusou a sessão em cache (EResult=%1$d). Inicie sessão novamente.</string>
+    <string name="cloud_sync_enabled_summary">Transferir ao iniciar, enviar ao sair.</string>
+    <string name="cloud_sync_disabled_summary">Iniciar sem transferência de jogos guardados na nuvem nem sincronização ao sair.</string>
+    <string name="cloud_saves_offline_mode">Desativar sincronização na nuvem</string>
+    <string name="cloud_saves_offline_mode_summary">Para toda a atividade automática na nuvem para este jogo.</string>
+    <string name="cloud_saves_backing_up">A efetuar cópia de segurança do jogo guardado na nuvem…</string>
+    <string name="cloud_saves_restoring">A restaurar o jogo guardado na nuvem…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">Sincronizar da %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_generic">Sincronizar da nuvem</string>
+    <string name="cloud_saves_syncing_from_provider">A transferir o jogo guardado de %1$s…</string>
+    <string name="cloud_saves_sync_from_provider_success">Jogo guardado na nuvem de %1$s transferido.</string>
+    <string name="cloud_saves_sync_from_provider_failed">Não foi possível transferir o jogo guardado de %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Gerir Jogos Guardados na GOG Cloud</string>
+    <string name="cloud_saves_gog_manage_helper">Abre o site oficial da GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Não há navegador disponível para abrir a página de jogos guardados na nuvem da GOG</string>
+    <string name="cloud_saves_gog_zip_label">Transferir Zip da GOG Cloud</string>
+    <string name="cloud_saves_gog_zip_helper">Guardar os ficheiros atuais da nuvem</string>
+    <string name="cloud_saves_gog_zip_success">Zip de jogos guardados na nuvem da GOG guardado.</string>
+    <string name="cloud_saves_gog_zip_failed">Não foi possível guardar o zip de jogos guardados na nuvem da GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Não foram encontrados ficheiros de jogos guardados na nuvem da GOG.</string>
+    <string name="cloud_saves_google_backup_label">Cópia de segurança para a Google</string>
+    <string name="cloud_saves_google_backup_helper">Guardar uma cópia no Google Play Games</string>
+    <string name="cloud_saves_google_backup_no_save">Não foram encontrados ficheiros de jogos guardados para cópia de segurança.</string>
+    <string name="cloud_saves_history_title">Histórico de Jogos Guardados</string>
+    <string name="cloud_saves_history_empty">Ainda não há jogos guardados anteriores em cópia de segurança. Os jogos guardados substituídos e as cópias de segurança manuais aparecem aqui durante 30 dias.</string>
+    <string name="cloud_saves_history_loading">A carregar o histórico de jogos guardados…</string>
+    <string name="cloud_saves_history_sign_in">Inicie sessão na Google para ver o seu histórico de jogos guardados.</string>
+    <string name="cloud_saves_history_origin_local">local</string>
+    <string name="cloud_saves_history_origin_cloud">nuvem</string>
+    <string name="cloud_saves_history_origin_manual">manual</string>
+    <string name="cloud_saves_history_origin_auto">automático</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Restaurar</string>
+    <string name="cloud_saves_history_download">Transferir</string>
+    <string name="cloud_saves_history_download_success">Ficheiro transferido.</string>
+    <string name="cloud_saves_history_download_failed">A transferência falhou.</string>
+    <string name="cloud_saves_history_cloud_readonly">Apenas de leitura</string>
+    <string name="cloud_saves_history_restore_confirm_title">Restaurar esta cópia de segurança?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Isto irá substituir o seu jogo guardado local atual pela cópia de segurança de %1$s.</string>
+    <string name="cloud_saves_history_restore_success">Jogo guardado restaurado a partir da cópia de segurança.</string>
+    <string name="cloud_saves_history_restore_failed">Não foi possível restaurar esta cópia de segurança.</string>
+    <string name="cloud_saves_keep_replaced_backup">Manter uma cópia de segurança do jogo guardado substituído</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Se mudar de ideias, pode restaurá-lo a partir do Histórico de Jogos Guardados.</string>
+    <string name="cloud_saves_history_refresh">Atualizar</string>
+    <string name="cloud_saves_history_rename">Mudar o nome</string>
+    <string name="cloud_saves_history_rename_title">Dê um nome a esta cópia de segurança</string>
+    <string name="cloud_saves_history_rename_hint">ex.: Luta com o chefe, Antes do final</string>
+    <string name="cloud_saves_history_rename_save">Guardar</string>
+    <string name="cloud_saves_history_rename_clear">Limpar</string>
+    <string name="cloud_saves_history_rename_success">Nome da cópia de segurança alterado.</string>
+    <string name="cloud_saves_history_rename_failed">Não foi possível mudar o nome da cópia de segurança.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Selecionar pasta de jogos guardados</string>
+    <string name="cloud_saves_custom_folder_label">Pasta de jogos guardados</string>
+    <string name="cloud_saves_custom_select_folder_summary">Aponte para o diretório de jogos guardados dentro do contentor</string>
+    <string name="cloud_saves_custom_no_container">Contentor não disponível para este atalho</string>
+    <string name="cloud_saves_custom_picker_title">Selecionar pasta de jogos guardados</string>
+    <string name="cloud_saves_custom_outside_drive_c">A pasta selecionada tem de estar dentro da unidade C: do contentor</string>
+    <string name="cloud_saves_custom_path_map_failed">Não foi possível mapear a pasta selecionada para um caminho do Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Pasta de jogos guardados definida como %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sincronizar da Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Transferir o jogo guardado mais recente</string>
+    <string name="cloud_saves_steam_sync_success">Sincronizado da Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">A sincronização com a Steam Cloud falhou</string>
+    <string name="cloud_saves_steam_browse_label">Ver Jogos Guardados na Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Abrir armazenamento na nuvem</string>
+    <string name="cloud_saves_steam_browse_no_browser">Não há navegador disponível para abrir a página da Steam</string>
+    <string name="cloud_saves_steam_import_label">Importar ficheiros</string>
+    <string name="cloud_saves_steam_import_helper">Restaurar ficheiros transferidos</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Seletor de ficheiros indisponível</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Isto irá transferir os ficheiros de jogo guardado atuais da Steam Cloud e substituir os ficheiros de jogo guardado atuais.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID da aplicação inválido</string>
+    <string name="cloud_saves_label_saved">Etiqueta guardada</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Jogos Guardados</string>
+    <string name="saves_import_export_confirm_selection">Confirmar seleção</string>
+    <string name="saves_import_export_select_directory">Selecione o diretório dos jogos guardados</string>
+    <string name="saves_import_export_up_directory">Subir diretório</string>
+    <string name="saves_import_export_select_container">Contentor de destino:</string>
+    <string name="saves_import_export_exported">Jogos guardados exportados com êxito</string>
+    <string name="saves_import_export_exported_failed">Falha ao exportar os jogos guardados: %1$s</string>
+    <string name="saves_import_export_imported">Jogos guardados importados com êxito</string>
+    <string name="saves_import_export_imported_failed">Falha ao importar os jogos guardados: %1$s</string>
+    <string name="saves_export_path_summary">Os jogos guardados serão exportados para /WinNative/saves</string>
+    <string name="saves_export_success_path">Exportado para %1$s</string>
+    <string name="saves_export_warning_title">Use isto apenas com jogos personalizados</string>
+    <string name="saves_export_warning_body">A exportação pode incluir jogos guardados de jogos instalados pela loja ou com sincronização na nuvem.</string>
+    <string name="saves_import_warning_title">Isto irá substituir os jogos guardados existentes neste contentor</string>
+    <string name="saves_import_warning_body">Ao restaurar uma cópia de segurança mais antiga com vários jogos, copie primeiro quaisquer jogos guardados mais recentes para o zip com o seu gestor de ficheiros. Apenas os jogos guardados existentes no .zip serão afetados. Faça uma gestão sensata dos jogos guardados.</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Contentor</string>
+    <string name="preloader_initializing">A inicializar</string>
+    <string name="preloader_launching">A iniciar</string>
+    <string name="preloader_closing">A fechar %1$s</string>
+    <string name="preloader_preparing_steam_environment">A preparar o ambiente Steam</string>
+    <string name="preloader_starting_wine">A iniciar o Wine</string>
+    <string name="preloader_starting_steam_launcher">A iniciar o Steam Launcher</string>
+    <string name="preloader_loading_steam_client">A carregar o cliente Steam</string>
+    <string name="preloader_connecting_to_steam">A ligar à Steam</string>
+    <string name="preloader_signing_in_to_steam">A iniciar sessão na Steam</string>
+    <string name="preloader_fetching_game_info">Sessão iniciada — a obter informações do jogo</string>
+    <string name="preloader_steam_ready">Steam pronta</string>
+    <string name="preloader_updating_game_info">A atualizar as informações do jogo</string>
+    <string name="preloader_verifying_install">A verificar a instalação</string>
+    <string name="preloader_scanning_redists">A analisar redistribuíveis</string>
+    <string name="preloader_installing_redist_single">A instalar redistribuível</string>
+    <string name="preloader_installing_named_redist">A instalar %1$s</string>
+    <string name="preloader_installing_named_redist_progress">A instalar %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuíveis prontos</string>
+    <string name="preloader_no_redists">Sem redistribuíveis para instalar</string>
+    <string name="preloader_steam_service_running">Serviço Steam em execução</string>
+    <string name="preloader_launching_game">A iniciar %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">O Steam Launcher falhou — a preparar os recursos novamente</string>
+    <string name="preloader_steam_launcher_start_failed">O Steam Launcher não conseguiu iniciar. A preparar novamente — reinicie</string>
+    <string name="preloader_steam_launcher_game_never_started">O Steam Launcher chegou ao jogo mas este nunca iniciou</string>
+    <string name="preloader_setup_environment">A configurar o ambiente</string>
+    <string name="preloader_retrying_steam_client_download">A repetir a transferência do cliente Steam</string>
+    <string name="preloader_installing_mono">A instalar o Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">A instalar redistribuíveis</string>
+    <string name="preloader_unpacking_exe">A descompactar o executável do jogo</string>
+    <string name="preloader_downloading_cloud">A transferir jogos guardados na nuvem</string>
+    <string name="preloader_syncing_cloud">A sincronizar jogos guardados na nuvem</string>
+    <string name="preloader_uploading_cloud">A enviar jogos guardados na nuvem</string>
+    <string name="preloader_checking_cloud">A verificar jogos guardados na nuvem</string>
+    <string name="preloader_cloud_sync_retry">%1$s Tentativa %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Sincronização na Nuvem a Transferir</string>
+    <string name="cloud_sync_failed_provider">A sincronização de jogos guardados na nuvem de %1$s falhou.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Jogo Personalizado</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Gravar desempenho para ficheiro</string>
+    <string name="settings_hud_record_to_file_summary">Exporta métricas por segundo de FPS, CPU, GPU, temperatura e bateria para /WinNative/logs/ durante o jogo.</string>
+    <string name="settings_leaderboard_category">Desempenho</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">A carregar itens da Workshop</string>
+    <string name="workshop_search_items">Procurar itens da Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">A obter os seus itens subscritos da Steam.</string>
+    <string name="workshop_error_title">Não foi possível carregar os itens da Workshop</string>
+    <string name="workshop_error_subtitle">Algo correu mal. Tente novamente.</string>
+    <string name="workshop_empty_title">Sem itens da Workshop subscritos</string>
+    <string name="workshop_empty_subtitle">Subscreva itens na Steam Workshop e depois reabra esta janela.</string>
+    <string name="workshop_search_empty_title">Nenhum item corresponde a \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Experimente um termo de pesquisa diferente.</string>
+    <string name="workshop_clear_search">Limpar pesquisa</string>
+    <string name="workshop_item_fallback">Item da Workshop</string>
+    <string name="common_ui_failed">Falhou</string>
+    <string name="steam_presence_snooze">Adiar</string>
+    <string name="steam_presence_busy">Ocupado</string>
+    <string name="steam_presence_looking_to_trade">À procura de trocas</string>
+    <string name="steam_presence_looking_to_play">À procura de jogar</string>
+    <string name="steam_friends_count">Amigos — %1$d online</string>
+    <string name="steam_friends_section_in_game">Em jogo (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Ainda não foram carregados amigos.</string>
+    <string name="steam_friends_chat_off">A conversa está desativada. Reative o Serviço de conversa para ver os seus amigos.</string>
+    <string name="steam_friends_self_you">Tu</string>
+    <string name="steam_friends_in_game">Em jogo</string>
+    <string name="steam_friends_join">Juntar-se</string>
+    <string name="steam_friends_play">Jogar</string>
+    <string name="steam_chat_image_failed">(falha ao enviar a imagem)</string>
+    <string name="steam_chat_empty">Ainda não há mensagens. Diz olá!</string>
+    <string name="steam_chat_uploading_image">A carregar imagem…</string>
+    <string name="steam_chat_send_image">Enviar imagem</string>
+    <string name="steam_chat_message_hint">Mensagem…</string>
+    <string name="steam_chat_send">Enviar</string>
+    <string name="steam_chat_image">Imagem</string>
+    <string name="steam_common_back">Voltar</string>
+    <string name="steam_achievements_title">Proezas</string>
+    <string name="steam_achievements_empty">Não foram encontradas proezas para este jogo,\nou inicie sessão na Steam para as carregar.</string>
+    <string name="steam_achievements_hidden">Proeza oculta</string>
+    <string name="steam_achievements_hidden_desc">Continue a jogar para revelar esta proeza.</string>
+    <string name="steam_achievements_unlocked_on">Desbloqueada em %1$s</string>
+    <string name="steam_achievements_unlocked">Desbloqueada</string>
+    <string name="steam_join_joining">A juntar-se a %1$s em %2$s…</string>
+    <string name="steam_join_install">Instale %1$s para se juntar a %2$s</string>
+    <string name="steam_join_not_owned">Não possui %1$s</string>
+    <string name="steam_chat_not_sent">(não enviada)</string>
+    <string name="steam_join_the_game">o jogo</string>
+    <string name="steam_friends_settings">Definições</string>
+    <string name="steam_chat_settings_title">Definições de conversa</string>
+    <string name="steam_chat_setting_service">Serviço de conversa</string>
+    <string name="steam_chat_setting_service_desc">Inicie sessão para ver amigos e conversar; desative para ficar offline</string>
+    <string name="steam_chat_setting_notifications">Notificações de conversa</string>
+    <string name="steam_chat_setting_notifications_desc">Mostrar uma notificação quando recebe uma mensagem</string>
+    <string name="steam_chat_setting_heads">Balões de conversa</string>
+    <string name="steam_chat_setting_heads_desc">Balões flutuantes para ler e responder a mensagens</string>
+    <string name="steam_chat_setting_ingame">Ativar conversa no jogo</string>
+    <string name="steam_chat_setting_ingame_desc">Receber e enviar mensagens enquanto joga</string>
+    <string name="steam_chat_setting_stay_running">Executar em segundo plano</string>
+    <string name="steam_chat_setting_stay_running_desc">Manter a conversa em execução depois de sair do WinNative</string>
+    <string name="steam_chat_settings_overlay_needed">Permita a apresentação sobre outras aplicações para usar os balões de conversa</string>
+    <string name="steam_chat_heads_title">Mensagens</string>
+    <string name="steam_chat_heads_recent_title">Recentes</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">Nova mensagem</string>
+    <string name="steam_chat_setting_autohide">Ocultar automaticamente</string>
+    <string name="steam_chat_setting_autohide_desc">Desvanecer o balão de conversa após 10s de inatividade</string>
+    <string name="steam_chat_heads_friends_title">Amigos</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Ficheiros</string>
+    <string name="file_manager_copy">Copiar</string>
+    <string name="file_manager_cut">Cortar</string>
+    <string name="file_manager_paste">Colar</string>
+    <string name="file_manager_paste_here">Colar aqui</string>
+    <string name="file_manager_new_folder">Nova pasta</string>
+    <string name="file_manager_new_folder_short">Pasta</string>
+    <string name="file_manager_multi_select">Marcar</string>
+    <string name="file_manager_create">Criar</string>
+    <string name="file_manager_delete">Eliminar</string>
+    <string name="file_manager_copy_count">Copiar (%1$d)</string>
+    <string name="file_manager_cut_count">Cortar (%1$d)</string>
+    <string name="file_manager_delete_count">Eliminar (%1$d)</string>
+    <string name="file_manager_extract">Extrair</string>
+    <string name="file_manager_extract_here">Extrair aqui</string>
+    <string name="file_manager_extract_to">Extrair para…</string>
+    <string name="file_manager_extracting">A extrair %1$s</string>
+    <string name="file_manager_extract_failed">Falha na extração</string>
+    <string name="file_manager_run_boot">Executar / Arrancar</string>
+    <string name="file_manager_create_shortcut">Criar atalho</string>
+    <string name="file_manager_run_in_container">Executar no contentor</string>
+    <string name="file_manager_no_containers">Não há contentores disponíveis</string>
+    <string name="file_manager_delete_confirm">Eliminar \"%1$s\"? Isto não pode ser anulado.</string>
+    <string name="file_manager_delete_confirm_multi">Eliminar %1$d itens? Isto não pode ser anulado.</string>
+    <string name="file_manager_copying">A copiar %1$s</string>
+    <string name="file_manager_moving">A mover %1$s</string>
+    <string name="file_manager_copying_count">A copiar %1$d itens</string>
+    <string name="file_manager_moving_count">A mover %1$d itens</string>
+    <string name="file_manager_paste_into_itself">Não é possível colar uma pasta dentro de si própria</string>
+    <string name="file_manager_operation_failed">A operação falhou</string>
+    <string name="file_manager_delete_failed">A eliminação falhou</string>
+    <string name="file_manager_rename_failed">A mudança de nome falhou</string>
+    <string name="file_manager_create_folder_failed">A criação da pasta falhou</string>
+
+    <string name="settings_content_refresh">Atualizar</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Transferir save</string>
+    <string name="retro_save_transfer_message">Importe um save local para este jogo ou exporte o save atual.</string>
+    <string name="retro_save_transfer_import">Importar save</string>
+    <string name="retro_save_transfer_export">Exportar save</string>
+    <string name="retro_save_transfer_import_ok">Save importado</string>
+    <string name="retro_save_transfer_import_failed">Não foi possível importar o save</string>
+    <string name="retro_save_transfer_export_ok">Save exportado</string>
+    <string name="retro_save_transfer_export_failed">Não foi possível exportar o save</string>
+    <string name="retro_save_transfer_none">Ainda não existe um save para este jogo</string>
+    <string name="retro_cheats_title">Cheats</string>
+    <string name="retro_cheats_hardcore_blocked">Os cheats estão desativados no modo Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Guardar</string>
+    <string name="retro_ps2_cancel">Cancelar</string>
+    <string name="retro_ps2_save_state">Guardar estado</string>
+    <string name="retro_ps2_load_save_state">Carregar estado</string>
+    <string name="retro_ps2_achievements">Proezas</string>
+    <string name="retro_ps2_cheats">Batotas</string>
+    <string name="retro_ps2_memory_cards">Cartões de memória</string>
+    <string name="retro_ps2_fast_forward">Avanço rápido</string>
+    <string name="retro_ps2_reset">Reiniciar</string>
+    <string name="retro_ps2_swap_disc">Trocar disco</string>
+    <string name="retro_ps2_slot">Ranhura %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Toque para carregar</string>
+    <string name="retro_ps2_slot_empty">Vazia</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Toque para substituir</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Vazia — toque para guardar</string>
+    <string name="retro_ps2_slot_is_empty">A ranhura %1$d está vazia</string>
+    <string name="retro_ps2_loaded_slot">Ranhura %1$d carregada</string>
+    <string name="retro_ps2_could_not_load_slot">Não foi possível carregar a ranhura %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Guardado na ranhura %1$d</string>
+    <string name="retro_ps2_save_failed">Falha ao guardar</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Ranhura 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Ranhura 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Toque para usar</string>
+    <string name="retro_ps2_new_memory_card">Novo cartão de memória</string>
+    <string name="retro_ps2_import_card">Importar cartão</string>
+    <string name="retro_ps2_enable_online_dev9">Ativar online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adaptador de rede da PS2 — reinicia o jogo para o ligar</string>
+    <string name="retro_ps2_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_ps2_dns_mode">Modo DNS</string>
+    <string name="retro_ps2_primary_dns">DNS primário</string>
+    <string name="retro_ps2_secondary_dns">DNS secundário</string>
+    <string name="retro_ps2_optional">opcional</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automático (DHCP)</string>
+    <string name="retro_ps2_server_host">Servidor: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">toque para definir o IP (em branco remove)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Adicionar anfitrião do servidor</string>
+    <string name="retro_ps2_new_server_hostname">Novo nome de anfitrião do servidor</string>
+    <string name="retro_ps2_server_hostname_hint">p. ex. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Controlos no ecrã</string>
+    <string name="retro_ps2_edit_layout">Editar disposição</string>
+    <string name="retro_ps2_reset_layout">Repor disposição</string>
+    <string name="retro_ps2_layout_reset">Disposição reposta</string>
+    <string name="retro_ps2_left_stick_invert_x">Manípulo esquerdo: inverter X</string>
+    <string name="retro_ps2_left_stick_invert_y">Manípulo esquerdo: inverter Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Manípulo direito: inverter X</string>
+    <string name="retro_ps2_right_stick_invert_y">Manípulo direito: inverter Y</string>
+    <string name="retro_ps2_button_color">Cor dos botões</string>
+    <string name="retro_ps2_letter_color">Cor das letras</string>
+    <string name="retro_ps2_shadow_color">Cor da sombra</string>
+    <string name="retro_ps2_background_color">Cor de fundo</string>
+    <string name="retro_ps2_reset_colors">Repor cores</string>
+    <string name="retro_ps2_renderer">Renderizador</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Escala de resolução</string>
+    <string name="retro_ps2_scale_1x_native">1x (nativa)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Proporção de imagem</string>
+    <string name="retro_ps2_aspect_stretch">Esticar</string>
+    <string name="retro_ps2_aspect_auto_standard">Automática (padrão)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtro de ecrã</string>
+    <string name="retro_ps2_filter_nearest">Mais próximo</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinear (suave)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinear (nítido)</string>
+    <string name="retro_ps2_texture_filter">Filtro de texturas</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinear (forçado)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinear (sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Precisão da mistura</string>
+    <string name="retro_ps2_blend_minimum">Mínima</string>
+    <string name="retro_ps2_blend_basic">Básica</string>
+    <string name="retro_ps2_blend_medium">Média</string>
+    <string name="retro_ps2_blend_high">Alta</string>
+    <string name="retro_ps2_blend_full">Completa</string>
+    <string name="retro_ps2_blend_maximum">Máxima</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Desligado</string>
+    <string name="retro_ps2_shader_scanline">Linhas de varrimento</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Onda</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Ignorar fotogramas</string>
+    <string name="retro_ps2_frameskip_off">Desligado</string>
+    <string name="retro_ps2_frameskip_1">Ignorar 1</string>
+    <string name="retro_ps2_frameskip_2">Ignorar 2</string>
+    <string name="retro_ps2_frameskip_3">Ignorar 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volume</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Sem som</string>
+    <string name="retro_ps2_swap_stereo_channels">Trocar canais estéreo</string>
+    <string name="retro_ps2_ee_cycle_rate">Taxa de ciclos EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (predefinição)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_ps2_skip_off">Desligado</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 instantâneo</string>
+    <string name="retro_ps2_mtvu">VU multitarefa (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rápido</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Velocidade de emulação</string>
+    <string name="retro_ps2_hud_cpu_usage">Utilização da CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Utilização da GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Resolução interna</string>
+    <string name="retro_ps2_deinterlace_mode">Modo de desentrelaçamento</string>
+    <string name="retro_ps2_deint_auto">Automático</string>
+    <string name="retro_ps2_deint_off">Desligado</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Proporção de FMV</string>
+    <string name="retro_ps2_anti_blur">Antidesfoque</string>
+    <string name="retro_ps2_widescreen_patches">Patches de ecrã panorâmico</string>
+    <string name="retro_ps2_no_interlace_patches">Patches sem entrelaçamento</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Deteção de ciclo INTC</string>
+    <string name="retro_ps2_wait_loop">Deteção de ciclo de espera</string>
+    <string name="retro_ps2_time_stretch">Esticamento de tempo do áudio</string>
+    <string name="retro_ps2_audio_buffer">Buffer de áudio</string>
+    <string name="retro_ps2_audio_latency">Latência de saída</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Tempos de fotograma</string>
+    <string name="retro_ps2_hud_gs_stats">Estatísticas do GS</string>
+    <string name="retro_ps2_hud_hw_info">Informações de hardware</string>
+    <string name="retro_ps2_hud_version">Versão</string>
+    <string name="retro_ps2_hud_input_display">Visualização de entradas</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Ecrã</string>
+    <string name="retro_ps2_tab_performance">Desempenho</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Som</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Controlos</string>
+    <string name="retro_ps2_resume">Retomar</string>
+    <string name="retro_ps2_pause">Pausar</string>
+    <string name="retro_ps2_exit">Sair</string>
+    <string name="retro_lr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Ficheiro de BIOS inválido</string>
+    <string name="retro_lr_invalid_retro_game">Jogo retro inválido</string>
+    <string name="retro_lr_rom_not_found">ROM não encontrada: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Não foi possível ler a ROM dentro deste arquivo</string>
+    <string name="retro_lr_core_not_installed">Núcleo não instalado: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Batotas ativadas — as proezas estão desativadas nesta sessão</string>
+    <string name="retro_lr_cloud_save_restored">Jogo guardado na nuvem restaurado</string>
+    <string name="retro_lr_restore_failed">Falha ao restaurar</string>
+    <string name="retro_lr_cloud_conflict_message">Existe um jogo guardado na nuvem mais recente para %1$s. Pretende sincronizar e qual jogo guardado na nuvem prefere manter?</string>
+    <string name="retro_lr_cloud_save">Jogo guardado na nuvem</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Falha ao carregar o núcleo do emulador</string>
+    <string name="retro_lr_failed_load_rom">Falha ao carregar a ROM</string>
+    <string name="retro_lr_graphics_not_supported">Gráficos não suportados por este núcleo</string>
+    <string name="retro_lr_emulator_error">Erro do emulador</string>
+    <string name="retro_lr_shader_default">Predefinição</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Nítido</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Escalonamento SGSR</string>
+    <string name="retro_lr_upscale_native">Nativa</string>
+    <string name="retro_lr_sound">Som</string>
+    <string name="retro_lr_left_stick_invert_x">Manípulo esquerdo: inverter X</string>
+    <string name="retro_lr_left_stick_invert_y">Manípulo esquerdo: inverter Y</string>
+    <string name="retro_lr_right_stick_invert_x">Manípulo direito: inverter X</string>
+    <string name="retro_lr_right_stick_invert_y">Manípulo direito: inverter Y</string>
+    <string name="retro_lr_on_screen_controls">Controlos no ecrã</string>
+    <string name="retro_lr_haptic_feedback">Retorno tátil</string>
+    <string name="retro_lr_portrait">Vertical</string>
+    <string name="retro_lr_landscape">Horizontal</string>
+    <string name="retro_lr_edit_layout">Editar disposição (%1$s)</string>
+    <string name="retro_lr_reset_layout">Repor disposição %1$s</string>
+    <string name="retro_lr_layout_reset">Disposição %1$s reposta</string>
+    <string name="retro_lr_button_color">Cor dos botões</string>
+    <string name="retro_lr_letter_color">Cor das letras</string>
+    <string name="retro_lr_shadow_color">Cor da sombra</string>
+    <string name="retro_lr_background_color">Cor de fundo</string>
+    <string name="retro_lr_reset_colors">Repor cores</string>
+    <string name="retro_lr_colors_reset">Cores repostas</string>
+    <string name="retro_lr_performance_hud">HUD de desempenho</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa do fundo</string>
+    <string name="retro_lr_background">Fundo</string>
+    <string name="retro_lr_scale">Escala</string>
+    <string name="retro_lr_numeric_frametime">Tempo de fotograma numérico</string>
+    <string name="retro_lr_dual_series_battery">Bateria de série dupla</string>
+    <string name="retro_lr_hud_elements">ELEMENTOS DO HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Consola</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Bateria</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Gráfico</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Guardar estado</string>
+    <string name="retro_lr_load_save_state">Carregar estado</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">O carregamento de estados está desativado no modo Hardcore</string>
+    <string name="retro_lr_achievements">Proezas</string>
+    <string name="retro_lr_cheats">Batotas</string>
+    <string name="retro_lr_cheats_disabled_hardcore">As batotas estão desativadas no modo Hardcore</string>
+    <string name="retro_lr_reset">Reiniciar</string>
+    <string name="retro_lr_fast_forward">Avanço rápido</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">O avanço rápido está desativado no modo Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disco %1$d/%2$d</string>
+    <string name="retro_lr_resume">Retomar</string>
+    <string name="retro_lr_pause">Pausar</string>
+    <string name="retro_lr_exit">Sair</string>
+    <string name="retro_lr_saved_to_slot">Guardado na ranhura %1$d</string>
+    <string name="retro_lr_could_not_save_state">Não foi possível guardar o estado</string>
+    <string name="retro_lr_bios_required_title">BIOS de %1$s necessária</string>
+    <string name="retro_lr_bios_required_message">Os jogos da PlayStation precisam de um ficheiro de BIOS real da consola que tem de fornecer. Importe uma BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin ou scph7001.bin) para continuar.</string>
+    <string name="retro_lr_import_bios">Importar BIOS…</string>
+    <string name="retro_lr_cancel">Cancelar</string>
+    <string name="retro_lr_slot_empty">A ranhura %1$d está vazia</string>
+    <string name="retro_lr_loaded_slot">Ranhura %1$d carregada</string>
+    <string name="retro_lr_could_not_load_state">Não foi possível carregar o estado</string>
+    <string name="retro_lr_slot_title">Ranhura %1$d</string>
+    <string name="retro_lr_rename_slot">Mudar o nome da ranhura %1$d</string>
+    <string name="retro_gs_section_general">Geral</string>
+    <string name="retro_gs_section_graphics">Gráficos</string>
+    <string name="retro_gs_section_performance">Desempenho</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Entrada</string>
+    <string name="retro_gs_section_audio">Áudio</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Cancelar</string>
+    <string name="retro_gs_save">Guardar</string>
+    <string name="retro_gs_shader_default">Predefinição</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Nítido</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativa</string>
+    <string name="retro_gs_group_game">JOGO</string>
+    <string name="retro_gs_label_name">Nome</string>
+    <string name="retro_gs_label_system">Sistema</string>
+    <string name="retro_gs_label_emulator_core">Núcleo do emulador</string>
+    <string name="retro_gs_label_rom_path">Caminho da ROM</string>
+    <string name="retro_gs_group_bios">BIOS de %1$s</string>
+    <string name="retro_gs_label_installed">Instalada</string>
+    <string name="retro_gs_bios_none">Nenhuma — necessária para executar jogos de %1$s</string>
+    <string name="retro_gs_import_bios">Importar BIOS…</string>
+    <string name="retro_gs_remove_bios">Remover BIOS</string>
+    <string name="retro_gs_group_library_artwork">IMAGENS DA BIBLIOTECA</string>
+    <string name="retro_gs_artwork_game_card">Imagem do cartão do jogo</string>
+    <string name="retro_gs_artwork_grid">Imagem da grelha</string>
+    <string name="retro_gs_artwork_carousel">Imagem do carrossel</string>
+    <string name="retro_gs_artwork_list">Imagem da lista</string>
+    <string name="retro_gs_artwork_custom_set">Imagem personalizada definida</string>
+    <string name="retro_gs_artwork_set_image">Definir imagem</string>
+    <string name="retro_gs_artwork_remove">Remover</string>
+    <string name="retro_gs_group_video">VÍDEO</string>
+    <string name="retro_gs_video_filter">Filtro de vídeo</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Escalonamento SGSR</string>
+    <string name="retro_gs_performance_hud">HUD de desempenho</string>
+    <string name="retro_gs_group_core">NÚCLEO</string>
+    <string name="retro_gs_renderer">Renderizador</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Escala de resolução</string>
+    <string name="retro_gs_scale_1x_native">1x (nativa)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Proporção de imagem</string>
+    <string name="retro_gs_aspect_stretch">Esticar</string>
+    <string name="retro_gs_aspect_auto_standard">Automática (padrão)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtro de ecrã</string>
+    <string name="retro_gs_filter_nearest">Mais próximo</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinear (suave)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinear (nítido)</string>
+    <string name="retro_gs_texture_filter">Filtro de texturas</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinear (forçado)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinear (sprites)</string>
+    <string name="retro_gs_blending_accuracy">Precisão da mistura</string>
+    <string name="retro_gs_blend_minimum">Mínima</string>
+    <string name="retro_gs_blend_basic">Básica</string>
+    <string name="retro_gs_blend_medium">Média</string>
+    <string name="retro_gs_blend_high">Alta</string>
+    <string name="retro_gs_blend_full">Completa</string>
+    <string name="retro_gs_blend_maximum">Máxima</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Desligado</string>
+    <string name="retro_gs_tvshader_scanline">Linhas de varrimento</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Onda</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Ignorar fotogramas</string>
+    <string name="retro_gs_frameskip_1">Ignorar 1</string>
+    <string name="retro_gs_frameskip_2">Ignorar 2</string>
+    <string name="retro_gs_frameskip_3">Ignorar 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">DESEMPENHO</string>
+    <string name="retro_gs_ee_cycle_rate">Taxa de ciclos EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (predefinição)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 instantâneo</string>
+    <string name="retro_gs_mtvu">VU multitarefa (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rápido</string>
+    <string name="retro_gs_group_performance_hud">HUD DE DESEMPENHO</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Velocidade de emulação</string>
+    <string name="retro_gs_hud_cpu_usage">Utilização da CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Utilização da GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Resolução interna</string>
+    <string name="retro_gs_deinterlace_mode">Modo de desentrelaçamento</string>
+    <string name="retro_gs_deint_auto">Automático</string>
+    <string name="retro_gs_deint_off">Desligado</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Proporção de FMV</string>
+    <string name="retro_gs_anti_blur">Antidesfoque</string>
+    <string name="retro_gs_widescreen_patches">Patches de ecrã panorâmico</string>
+    <string name="retro_gs_no_interlace_patches">Patches sem entrelaçamento</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Deteção de ciclo INTC</string>
+    <string name="retro_gs_wait_loop">Deteção de ciclo de espera</string>
+    <string name="retro_gs_time_stretch">Esticamento de tempo do áudio</string>
+    <string name="retro_gs_audio_buffer">Buffer de áudio</string>
+    <string name="retro_gs_audio_latency">Latência de saída</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Tempos de fotograma</string>
+    <string name="retro_gs_hud_gs_stats">Estatísticas do GS</string>
+    <string name="retro_gs_hud_hw_info">Informações de hardware</string>
+    <string name="retro_gs_hud_version">Versão</string>
+    <string name="retro_gs_hud_input_display">Visualização de entradas</string>
+    <string name="retro_gs_fast_boot">Arranque rápido</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Ativar online</string>
+    <string name="retro_gs_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_gs_net_auto">Automático</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Modo DNS</string>
+    <string name="retro_gs_dns_manual">Manual</string>
+    <string name="retro_gs_dns_internal">Interno</string>
+    <string name="retro_gs_primary_dns">DNS primário</string>
+    <string name="retro_gs_secondary_dns">DNS secundário</string>
+    <string name="retro_gs_dns_optional">opcional</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automático (DHCP)</string>
+    <string name="retro_gs_group_input">ENTRADA</string>
+    <string name="retro_engine_save">Guardar</string>
+    <string name="retro_engine_saved">Jogo guardado</string>
+    <string name="retro_engine_loading">A carregar…</string>
+    <string name="retro_engine_load">Carregar</string>
+    <string name="retro_engine_saved_to">Guardado em %1$s</string>
+    <string name="retro_engine_slot_active_only">Ativo</string>
+    <string name="retro_engine_rename_slot">Mudar o nome do espaço</string>
+    <string name="retro_engine_caught">%1$d capturados</string>
+    <string name="retro_engine_no_slots">Ainda não há espaços de gravação</string>
+    <string name="retro_engine_new_slot">Novo espaço de gravação</string>
+    <string name="retro_engine_achievements_unavailable">Não registado no modo 3D</string>
+    <string name="retro_engine_fullscreen">Ecrã inteiro</string>
+    <string name="retro_engine_loaded_from">%1$s carregado</string>
+    <string name="retro_engine_slot_empty">Esse espaço está vazio</string>
+    <string name="retro_engine_loading_subtitle">A preparar os dados do jogo pela primeira vez</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Jogar este jogo no motor de voxels 3D em vez do núcleo padrão</string>
+    <string name="retro_gs_on_screen_controls">Controlos no ecrã</string>
+    <string name="retro_gs_haptic_feedback">Retorno tátil</string>
+    <string name="retro_gs_group_audio">ÁUDIO</string>
+    <string name="retro_gs_volume">Volume</string>
+    <string name="retro_gs_mute">Sem som</string>
+    <string name="retro_gs_swap_stereo">Trocar canais estéreo</string>
+    <string name="retro_gs_sound">Som</string>
+    <string name="retro_scr_retro_defaults">PREDEFINIÇÕES RETRO</string>
+    <string name="retro_scr_retro_defaults_desc">Predefinições aplicadas aos jogos de cada consola, salvo se substituídas nas definições do próprio jogo.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Conta</string>
+    <string name="retro_scr_signed_in">Sessão iniciada</string>
+    <string name="retro_scr_not_signed_in_hint">Sem sessão iniciada — abra as Proezas de um jogo para iniciar sessão</string>
+    <string name="retro_scr_achievements_enabled">Proezas ativadas</string>
+    <string name="retro_scr_hardcore_default">Modo Hardcore por predefinição (sem estados guardados)</string>
+    <string name="retro_scr_sign_out">Terminar sessão</string>
+    <string name="retro_scr_playstation_bios">BIOS DA PLAYSTATION</string>
+    <string name="retro_scr_installed">Instalada</string>
+    <string name="retro_scr_none_ps1_bios">Nenhuma — os jogos da PS1 requerem uma BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importar BIOS da PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS da PS1 removida</string>
+    <string name="retro_scr_no_bios_to_remove">Não há nenhuma BIOS para remover</string>
+    <string name="retro_scr_remove_ps1_bios">Remover BIOS da PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS DA PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Nenhuma — os jogos da PS2 requerem uma BIOS</string>
+    <string name="retro_scr_format">Formato</string>
+    <string name="retro_scr_ps2_bios_format">Cópia combinada num único ficheiro (.bin com região etiquetada, ~4MB). Conjuntos ROM0/MEC/NVM separados não são aceites.</string>
+    <string name="retro_scr_import_ps2_bios">Importar BIOS da PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS da PS2 removida</string>
+    <string name="retro_scr_remove_ps2_bios">Remover BIOS da PS2</string>
+    <string name="retro_scr_library_artwork">IMAGENS DA BIBLIOTECA</string>
+    <string name="retro_scr_retro_case_art">Imagem retro da caixa (cartucho / caixa de CD)</string>
+    <string name="retro_scr_box_art">Imagem da caixa</string>
+    <string name="retro_scr_box_art_desc">Obtida automaticamente de thumbnails.libretro.com na importação; uma imagem personalizada substitui-a sempre.</string>
+    <string name="retro_scr_roms_folder">PASTA DE ROMS</string>
+    <string name="retro_scr_folder">Pasta</string>
+    <string name="retro_scr_roms_not_set">Não definida — escolha uma pasta para importar jogos automaticamente</string>
+    <string name="retro_scr_auto_import">Importação automática</string>
+    <string name="retro_scr_auto_import_desc">Os novos jogos nesta pasta são adicionados automaticamente à sua biblioteca com a consola correta detetada.</string>
+    <string name="retro_scr_select_roms_folder_title">Selecionar pasta de ROMs</string>
+    <string name="retro_scr_select_roms_folder_button">Selecionar pasta de ROMs…</string>
+    <string name="retro_scr_change_roms_folder_button">Mudar pasta de ROMs…</string>
+    <string name="retro_scr_scan_now">Analisar agora</string>
+    <string name="retro_scr_console_defaults">PREDEFINIÇÕES DA CONSOLA</string>
+    <string name="retro_scr_console_defaults_desc">Toque numa consola para definir as suas predefinições.</string>
+    <string name="retro_scr_renderer">Renderizador</string>
+    <string name="retro_scr_upscale_resolution">Escalonar resolução</string>
+    <string name="retro_scr_aspect_ratio">Proporção de imagem</string>
+    <string name="retro_scr_aspect_stretch">Esticar</string>
+    <string name="retro_scr_aspect_auto_standard">Automática (padrão)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtro de ecrã</string>
+    <string name="retro_scr_filter_nearest">Mais próximo</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinear (suave)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinear (nítido)</string>
+    <string name="retro_scr_texture_filter">Filtro de texturas</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinear (forçado)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinear (sprites)</string>
+    <string name="retro_scr_blending_accuracy">Precisão da mistura</string>
+    <string name="retro_scr_blend_minimum">Mínima</string>
+    <string name="retro_scr_blend_basic">Básica</string>
+    <string name="retro_scr_blend_medium">Média</string>
+    <string name="retro_scr_blend_high">Alta</string>
+    <string name="retro_scr_blend_full">Completa</string>
+    <string name="retro_scr_blend_maximum">Máxima</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Desligado</string>
+    <string name="retro_scr_shader_scanline">Linhas de varrimento</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Onda</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Ignorar fotogramas</string>
+    <string name="retro_scr_skip_1">Ignorar 1</string>
+    <string name="retro_scr_skip_2">Ignorar 2</string>
+    <string name="retro_scr_skip_3">Ignorar 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Taxa de ciclos EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (predefinição)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Salto de ciclos EE</string>
+    <string name="retro_scr_skip_off">Desligado</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 instantâneo</string>
+    <string name="retro_scr_mtvu">VU multitarefa (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rápido</string>
+    <string name="retro_scr_touch_controls">Controlos tácteis no ecrã</string>
+    <string name="retro_scr_sound">Som</string>
+    <string name="retro_scr_swap_stereo">Trocar canais estéreo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: velocidade de emulação</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: utilização da CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: utilização da GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: resolução interna</string>
+    <string name="retro_scr_enable_online_dev9">Ativar online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Dispositivo Ethernet</string>
+    <string name="retro_scr_net_auto">Automático</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Modo DNS</string>
+    <string name="retro_scr_dns_manual">Manual</string>
+    <string name="retro_scr_dns_internal">Interno</string>
+    <string name="retro_scr_primary_dns">DNS primário</string>
+    <string name="retro_scr_secondary_dns">DNS secundário</string>
+    <string name="retro_scr_optional">opcional</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automático (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Escalonamento SGSR</string>
+    <string name="retro_scr_performance_hud">HUD de desempenho</string>
+    <string name="retro_scr_credits_licenses">CRÉDITOS &amp; LICENÇAS</string>
+    <string name="retro_scr_credits_desc">Algumas funcionalidades do WinNative baseiam-se nestes projetos de código aberto. Toque para ver cada fonte.</string>
+    <string name="retro_scr_tab_defaults">Predefinições</string>
+    <string name="retro_scr_tab_credits">Créditos</string>
+    <string name="retro_scr_enable_hardcore_title">Ativar o modo Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">O modo Hardcore reinicia o jogo agora e desativa o carregamento de estados guardados, o avanço rápido e as batotas. Qualquer progresso não guardado será perdido. Continuar?</string>
+    <string name="retro_scr_cancel">Cancelar</string>
+    <string name="retro_scr_enable">Ativar</string>
+    <string name="retro_scr_bios_imported">BIOS importada: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Ficheiro de BIOS inválido</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS da PS2 importada: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Ficheiro de BIOS da PS2 inválido</string>
+    <string name="retro_scr_no_game_serial">Não há número de série do jogo para procurar batotas.</string>
+    <string name="retro_scr_applied_cheats">Foram aplicadas %1$d batota(s).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Não foi possível aplicar as batotas.</string>
+    <string name="retro_scr_cheats">Batotas</string>
+    <string name="retro_scr_apply">Aplicar</string>
+    <string name="retro_scr_no_cheats_found">Não foram encontradas batotas para este jogo.</string>
+    <string name="retro_scr_achievements">Proezas</string>
+    <string name="retro_scr_sign_in_ra">Inicie sessão no RetroAchievements</string>
+    <string name="retro_scr_username">Nome de utilizador</string>
+    <string name="retro_scr_password">Palavra-passe</string>
+    <string name="retro_scr_login_failed">Falha ao iniciar sessão</string>
+    <string name="retro_scr_signing_in">A iniciar sessão…</string>
+    <string name="retro_scr_sign_in">Iniciar sessão</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">Não há proezas para este jogo.</string>
+    <string name="retro_scr_back">Voltar</string>
+    <string name="retro_scr_enabled">Ativado</string>
+    <string name="retro_scr_disabled">Desativado</string>
+    <string name="retro_scr_rename">Mudar o nome</string>
+    <string name="retro_scr_save">Guardar</string>
+    <string name="retro_scr_cloud_save_conflict">Conflito de jogo guardado na nuvem</string>
+    <string name="retro_scr_keep_local_save">Manter jogo guardado local</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Ecrã</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Som</string>
+    <string name="retro_tab_controls">Controlos</string>
+    <string name="retro_scan_up_to_date">Biblioteca atualizada</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">%1$d adicionados</string>
+    <string name="retro_scan_removed">%1$d removidos</string>
+    <string name="retro_scr_shader_default">Predefinição</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Nítido</string>
+    <string name="retro_scr_upscale_native">Nativa</string>
+    <string name="retro_co_aspect_ratio">Proporção de imagem</string>
+    <string name="retro_co_ntsc_filter">Filtro NTSC</string>
+    <string name="retro_co_colorization">Colorização</string>
+    <string name="retro_co_color_correction">Correção de cor</string>
+    <string name="retro_co_remove_sprite_limit">Remover limite de sprites</string>
+    <string name="retro_co_resolution">Resolução</string>
+    <string name="retro_co_framebuffer_emulation">Emulação de framebuffer</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Hack panorâmico</string>
+    <string name="retro_co_val_8_7_native">8:7 (nativa)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Desligado</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composto</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Automático</string>
+    <string name="retro_co_val_gba_screen">Ecrã GBA</string>
+    <string name="retro_co_val_gbc_screen">Ecrã GBC</string>
+    <string name="retro_co_val_on">Ligado</string>
+    <string name="retro_co_val_320x240_native">320x240 (nativa)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ajustado</string>
+    <string name="retro_co_val_native">Nativa</string>
+    <string name="retro_co_val_internal">Interna</string>
+    <string name="retro_co_val_on_16_9">Ligado (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Inicie sessão com a sua conta RetroAchievements para conquistar e acompanhar proezas de jogos retro.</string>
+    <string name="retro_ach_username">Nome de utilizador</string>
+    <string name="retro_ach_password">Palavra-passe</string>
+    <string name="retro_ach_enter_credentials">Introduza o seu nome de utilizador e palavra-passe</string>
+    <string name="retro_ach_login_failed">Falha ao iniciar sessão</string>
+    <string name="retro_ach_sign_in">Iniciar sessão</string>
+    <string name="retro_ach_password_disclaimer">A sua palavra-passe é usada apenas uma vez para obter um token de início de sessão, que é armazenado em segurança no dispositivo.</string>
+    <string name="retro_ach_achievements_enabled">Proezas ativadas</string>
+    <string name="retro_ach_hardcore_mode">Modo Hardcore (sem estados guardados)</string>
+    <string name="retro_ach_points">%1$d / %2$d pontos</string>
+    <string name="retro_ach_none_found">Não foram encontradas proezas para este jogo.</string>
+    <string name="retro_ach_sign_out">Terminar sessão</string>
+    <string name="retro_che_brand">BATOTAS</string>
+    <string name="retro_che_name">Nome</string>
+    <string name="retro_che_code">Código</string>
+    <string name="retro_che_cancel">Cancelar</string>
+    <string name="retro_che_save">Guardar</string>
+    <string name="retro_che_default_name">Batota %1$d</string>
+    <string name="retro_che_empty">Ainda não há batotas. Adicione um código de batota para este jogo.</string>
+    <string name="retro_che_add">Adicionar batota</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Controlador de GPU</string>
+    <string name="retro_gpu_driver_system">Sistema (Predefinição)</string>
+    <string name="retro_gpu_driver_hint">Instala os controladores Turnip em Definições \u2192 Controladores. Os mesmos controladores funcionam para jogos de PC e de PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD do PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Unidade interna virtual para jogos baseados em HDD como Final Fantasy XI. Reinicia o jogo.</string>
+    <string name="retro_ps2_hdd_desc">Unidade interna virtual para jogos baseados em HDD como Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Modo DNS definido como Internal para que os teus hosts de servidor personalizados tenham efeito.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">Núcleo do CPU</string>
+    <string name="retro_co_dual_core">Núcleo Duplo</string>
+    <string name="retro_co_internal_cheats">Cheats Internos</string>
+    <string name="retro_co_internal_resolution">Resolução Interna</string>
+    <string name="retro_co_renderer">Renderizador</string>
+    <string name="retro_co_sensor_bar">Posição da Barra de Sensor</string>
+    <string name="retro_co_skip_gc_bios">Ignorar Introdução do BIOS</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Inferior</string>
+    <string name="retro_co_val_cached_interpreter">Interpretador em Cache</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_interpreter">Interpretador</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Rato / Toque</string>
+    <string name="retro_co_val_right_stick_absolute">Stick Direito (Absoluto)</string>
+    <string name="retro_co_val_right_stick_relative">Stick Direito (Relativo)</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_val_stretch">Esticar</string>
+    <string name="retro_co_val_top">Superior</string>
+    <string name="retro_co_vbi_skip">Ignorar VBI (Salto Automático de Fotogramas)</string>
+    <string name="retro_co_widescreen">Ecrã Panorâmico</string>
+    <string name="retro_co_wiimote_pointer">Ponteiro do Wiimote</string>
+    <string name="retro_gs_cheats_apply_note">As alterações são aplicadas da próxima vez que iniciar este jogo.</string>
+    <string name="retro_gs_cheats_detect_hint">Inicie este jogo uma vez para que o número de série do disco possa ser detetado; depois, os cheats e patches aparecerão aqui.</string>
+    <string name="retro_gs_dnas_entry_desc">Contorno da autenticação DNAS — necessário para jogar online</string>
+    <string name="retro_gs_dnas_group">Aplicado Automaticamente (Online)</string>
+    <string name="retro_gs_group_cheats">Cheats &amp; Patches</string>
+    <string name="retro_gs_hdd_image_size">Tamanho: %1$s</string>
+    <string name="retro_gs_hdd_import">Importar Imagem de HDD</string>
+    <string name="retro_gs_hdd_remove_short">Remover</string>
+    <string name="retro_gs_netplay_enable">Ativar NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Desativado por predefinição. Ative e, em seguida, escolha Alojar ou Juntar-se antes de iniciar.\nVolta a desativar-se quando sai do jogo.</string>
+    <string name="retro_gs_netplay_host">Endereço do anfitrião</string>
+    <string name="retro_gs_netplay_host_hint">IP ou nome de anfitrião</string>
+    <string name="retro_gs_netplay_host_mode">Alojar sessão</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">Ligado = aguardar um jogador. Desligado = juntar-se ao endereço do anfitrião</string>
+    <string name="retro_gs_netplay_not_ready">O NetPlay utiliza portas de multijogador local através de TCP (jogador 1 anfitrião / jogador 2 cliente). O online da PS2 utiliza Ethernet DEV9 em vez disso.</string>
+    <string name="retro_gs_netplay_port">Porta</string>
+    <string name="retro_lr_memory_card_slot">Cartão de Memória %1$d</string>
+    <string name="retro_lr_screenshot">Captura de Ecrã</string>
+    <string name="retro_lr_use_cloud_save">Utilizar Gravação na Nuvem</string>
+    <string name="retro_netplay_conn_direct">LAN (IP direto)</string>
+    <string name="retro_netplay_connecting">A ligar…</string>
+    <string name="retro_netplay_connection">Ligação</string>
+    <string name="retro_netplay_conn_traversal">Online (código de anfitrião)</string>
+    <string name="retro_netplay_dismiss">Dispensar</string>
+    <string name="retro_netplay_dolphin_help">O NetPlay de GameCube/Wii utiliza o motor próprio do Dolphin. Anfitrião = Jogador 1, Juntar-se = Jogador 2. Escolha Alojar ou Juntar-se e um tipo de ligação antes de iniciar; ambos os dispositivos arrancam o mesmo jogo em conjunto.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Partilhe o IP de Wi‑Fi do seu dispositivo e esta porta com o Jogador 2. O jogo inicia automaticamente assim que se ligarem.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">É apresentado um código de anfitrião quando o jogo arranca — partilhe-o com o Jogador 2. O jogo inicia automaticamente assim que se ligarem.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Introduza o IP de Wi‑Fi e a porta do anfitrião e, em seguida, inicie para ligar.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Introduza o código de anfitrião do Jogador 1 e, em seguida, inicie para ligar.</string>
+    <string name="retro_netplay_enable_before_launch">Ative o NetPlay nas definições do jogo e escolha Alojar ou Juntar-se antes de iniciar</string>
+    <string name="retro_netplay_find_rooms">Procurar salas na Wi‑Fi</string>
+    <string name="retro_netplay_game_link_hint">Game Link · cada ecrã é a sua própria consola portátil</string>
+    <string name="retro_netplay_gba_not_ready">O multijogador de GBA utiliza gpSP + Adaptador Sem Fios. Certifique-se de que o libgpsp está instalado.</string>
+    <string name="retro_netplay_help">Multijogador de ecrã partilhado através de Wi‑Fi (como o RetroArch).\nAnfitrião = Jogador 1, Juntar-se = Jogador 2. Ambos os dispositivos mostram o mesmo jogo.</string>
+    <string name="retro_netplay_help_game_link">Game Link através de Wi‑Fi — cada dispositivo executa o seu próprio jogo.\nGB/GBC: ligação série do Gambatte (Pokémon Gen 1–2).\nGBA: Adaptador Sem Fios do gpSP (combates de Pokémon FR/LG/Emerald).</string>
+    <string name="retro_netplay_host_action">Alojar sala</string>
+    <string name="retro_netplay_host_code">Código de anfitrião</string>
+    <string name="retro_netplay_host_code_hint">Código de anfitrião de travessia fornecido pelo anfitrião</string>
+    <string name="retro_netplay_hosting_room">A alojar sala</string>
+    <string name="retro_netplay_host_mode_hint">Toque em Alojar para abrir uma sala para esta sessão de jogo e, em seguida, inicie o jogo. O NetPlay desativa-se quando sai.</string>
+    <string name="retro_netplay_in_room">Na sala</string>
+    <string name="retro_netplay_join_action">Juntar-se por IP</string>
+    <string name="retro_netplay_joined">Juntou-se</string>
+    <string name="retro_netplay_join_room">Juntar-se</string>
+    <string name="retro_netplay_launch_mode">Ao iniciar</string>
+    <string name="retro_netplay_leave">Sair</string>
+    <string name="retro_netplay_menu_hint">Anfitrião = P1 · Juntar-se = P2 · o mesmo jogo em ambos os ecrãs</string>
+    <string name="retro_netplay_mode_host">Alojar</string>
+    <string name="retro_netplay_mode_join">Juntar-se</string>
+    <string name="retro_netplay_mode_manual">Manual</string>
+    <string name="retro_netplay_no_rooms">Nenhuma sala encontrada. Certifique-se de que o anfitrião está na mesma Wi‑Fi e a alojar uma sala.</string>
+    <string name="retro_netplay_player_name">Nome de apresentação</string>
+    <string name="retro_netplay_player_name_hint">Mostrado aos outros jogadores</string>
+    <string name="retro_netplay_players_count">%1$d ligado(s)</string>
+    <string name="retro_netplay_prelaunch_hint">A sala está aberta apenas para esta sessão. Inicie quando estiver pronto. Sair do jogo desativa o NetPlay.</string>
+    <string name="retro_netplay_room_players">Jogadores</string>
+    <string name="retro_netplay_scan_action">Procurar Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Procurar novamente</string>
+    <string name="retro_netplay_scan_hint">Procure na mesma Wi‑Fi por salas abertas ou junte-se por endereço IP.</string>
+    <string name="retro_netplay_scanning">A procurar Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Resultados da procura</string>
+    <string name="retro_netplay_select_room_hint">Toque numa sala para se juntar agora (não guarda o IP para o próximo início).</string>
+    <string name="retro_netplay_stop_scan">Parar procura</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s ligou-se</string>
+    <string name="retro_netplay_user_disconnected">%1$s desligou-se</string>
+    <string name="retro_netplay_waiting_players">A aguardar jogadores…</string>
+    <string name="retro_ps2_coming_soon">O suporte para PlayStation 2 chegará em breve</string>
+    <string name="retro_ps2_show_l3r3">Mostrar Botões L3 / R3</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Quando desligado, toque duas vezes num stick para clicar em L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">FLAGS DO CONTROLADOR TURNIP</string>
+    <string name="retro_ps2_turnip_flags_note">Aplicado apenas quando um controlador de GPU personalizado é selecionado acima.</string>
+    <string name="retro_rom_missing">Ficheiro do jogo não encontrado</string>
+    <string name="retro_scr_delete">Eliminar</string>
+    <string name="retro_scr_import_from_file">Importar de ficheiro…</string>
+    <string name="retro_scr_loading">A carregar…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Mudar de consola</string>
+    <string name="retro_gs_identify_as">Identificar como consola</string>
+    <string name="retro_gs_console_changed">Agora identificado como %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Aplique um efeito ReShade (.fx) a jogos DXVK/VKD3D (Vulkan) através da camada vkBasalt integrada. Coloque cada efeito na sua própria pasta em Android/data/&lt;package&gt;/files/ReShade/. O ajuste de parâmetros em tempo real e o botão no jogo chegarão com a atualização da camada de recarregamento em tempo real.</string>
+    <string name="reshade_catalog_title">Efeitos ReShade</string>
+    <string name="reshade_catalog_search">Procurar efeitos…</string>
+    <string name="reshade_catalog_installed">Instalados (%1$d)</string>
+    <string name="reshade_catalog_available">Disponíveis (%1$d)</string>
+    <string name="reshade_catalog_downloading">A transferir</string>
+    <string name="reshade_catalog_installing">A instalar</string>
+    <string name="reshade_catalog_offline_cache">Offline — a mostrar uma lista em cache. Ligue-se para transferir novos efeitos.</string>
+    <string name="reshade_catalog_offline_none">Offline — a mostrar apenas os efeitos instalados. Ligue-se para explorar o catálogo.</string>
+    <string name="reshade_catalog_needs_connection">Ligue-se à internet para transferir efeitos.</string>
+    <string name="reshade_catalog_download_failed">Falha ao transferir %1$s.</string>
+    <string name="reshade_catalog_empty_query">Nenhum efeito corresponde a \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Nenhum efeito disponível. Ligue-se à internet para explorar o catálogo.</string>
+    <string name="reshade_catalog_done">Concluído</string>
+    <string name="reshade_catalog_delete_cd">Eliminar %1$s</string>
+    <string name="reshade_catalog_delete_title">Eliminar %1$s?</string>
+    <string name="reshade_catalog_delete_body">Isto remove o efeito do armazenamento e de qualquer conjunto que o utilize. Pode transferi-lo novamente mais tarde.</string>
+    <string name="reshade_catalog_delete_confirm">Eliminar</string>
+    <string name="reshade_catalog_delete_cancel">Cancelar</string>
+    <string name="reshade_catalog_delete_failed">Não foi possível eliminar %1$s.</string>
+    <string name="reshade_params_title">PARÂMETROS DO EFEITO</string>
+    <string name="reshade_params_reset">Repor</string>
+    <string name="reshade_loadout_empty">Ainda não há efeitos. Adicione um ou mais efeitos para criar um conjunto.</string>
+    <string name="reshade_loadout_add">Adicionar efeito</string>
+    <string name="reshade_loadout_full">Conjunto cheio — remova um efeito para adicionar outro.</string>
+    <string name="reshade_effect_active">ativo</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Pilha</string>
+    <string name="reshade_mode_solo_hint">Um efeito ativo de cada vez (comparação A/B, alterne em direto no jogo).</string>
+    <string name="reshade_mode_stack_hint">Sobreponha qualquer subconjunto de efeitos, aplicados por ordem.</string>
+    <string name="reshade_drawer_enable">Ativar ReShade</string>
+    <string name="reshade_drawer_empty">Não há efeitos ReShade neste conjunto. Adicione efeitos nas definições deste jogo (ou do contentor) para os alternar e ajustar aqui.</string>
+    <string name="reshade_drawer_no_params">Este efeito não expõe parâmetros ajustáveis.</string>
+    <string name="cloud_saves_deleting">A eliminar jogo guardado…</string>
+    <string name="cloud_saves_history_delete">Eliminar</string>
+    <string name="cloud_saves_history_delete_confirm_body">Eliminar permanentemente o jogo guardado na nuvem de %1$s? Esta ação não pode ser anulada.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Eliminar Jogo Guardado na Nuvem</string>
+    <string name="cloud_saves_history_delete_failed">Não foi possível eliminar o jogo guardado na nuvem</string>
+    <string name="cloud_saves_history_delete_success">Jogo guardado na nuvem eliminado</string>
+    <string name="retro_bundle_required">Transfira primeiro os núcleos de consola — Definições › Retro</string>
+    <string name="retro_ps2_device_unsupported">Este dispositivo não consegue executar a emulação de PS2 — necessita de OpenGL ES 3.1 ou mais recente.</string>
+    <string name="retro_scr_consoles_check">Procurar atualizações</string>
+    <string name="retro_scr_consoles_checking">A procurar atualizações…</string>
+    <string name="retro_scr_consoles_download">Transferir núcleos de consola</string>
+    <string name="retro_scr_consoles_downloading">A transferir… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Núcleos de Consola</string>
+    <string name="retro_scr_consoles_installed">Instalado — compilação %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Instalado — compilação %1$s (falha ao procurar atualizações)</string>
+    <string name="retro_scr_consoles_installing">A instalar…</string>
+    <string name="retro_scr_consoles_missing">Não instalado — transfira para jogar jogos retro</string>
+    <string name="retro_scr_consoles_state">Estado</string>
+    <string name="retro_scr_consoles_update">Atualizar núcleos de consola</string>
+    <string name="retro_scr_consoles_update_available">Atualização disponível — compilação %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">A verificar a transferência…</string>
+    <string name="retro_scr_consoles_working">A processar…</string>
+    <string name="retro_tab_system">Sistema</string>
+</resources>
diff --git a/app/src/main/res/values-ro/arrays.xml b/app/src/main/res/values-ro/arrays.xml
new file mode 100644
index 000000000..0f266557f
--- /dev/null
+++ b/app/src/main/res/values-ro/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Imagine</item>
+        <item>Original</item>
+        <item>Culoare uniformă</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 93cd2b646..905bdf81d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Selecteaza un fisier .exe valid</string>
     <string name="common_ui_select_valid_icon_file">Selecteaza un fisier .ico sau .png valid.</string>
     <string name="common_ui_exit">Iesire</string>
+    <string name="common_ui_exit_app">Ieși din aplicație</string>
     <string name="common_ui_profile">Profil</string>
     <string name="common_ui_name">Nume</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Pictograma</string>
     <string name="common_ui_duplicate">Duplicare</string>
     <string name="common_ui_credits_and_third_party_apps">Credite si aplicatii terte</string>
-    <string name="common_ui_loading">Se incarca…</string>
+    <string name="common_ui_loading">Se incarca</string>
+    <string name="common_ui_exporting">Se exporta</string>
     <string name="common_ui_enable">Activare</string>
     <string name="common_ui_disable">Dezactivare</string>
     <string name="common_ui_force">Fortare</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Inaltime</string>
     <string name="common_ui_open_file">Deschide fisier</string>
     <string name="common_ui_download_file">Descarca fisier</string>
-    <string name="common_ui_downloading_file">Se descarca fisierul...</string>
+    <string name="common_ui_downloading_file">Se descarca fisierul</string>
     <string name="common_ui_browse">Navigare</string>
     <string name="common_ui_options">Optiuni</string>
     <string name="common_ui_export">Exportare</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Setari</string>
     <string name="common_ui_enable_all">Activeaza tot</string>
     <string name="common_ui_disable_all">Dezactiveaza tot</string>
+    <string name="common_ui_select_all">Selecteaza tot</string>
+    <string name="common_ui_deselect_all">Deselecteaza tot</string>
     <string name="common_ui_on">Pornit</string>
     <string name="common_ui_off">Oprit</string>
     <string name="common_ui_already_set">Deja setat</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Instaleaza</string>
     <string name="common_ui_application">Aplicație</string>
     <string name="common_ui_check">Verifică</string>
+    <string name="store_game_check_for_update">Caută actualizări</string>
+    <string name="store_game_checking_for_update">Se verifică</string>
+    <string name="store_game_download_update">Descarcă actualizarea</string>
+    <string name="store_game_no_update_available">Nu există actualizări disponibile</string>
+    <string name="store_game_update_available">Actualizare disponibilă</string>
+    <string name="store_game_update_check_failed">Verificarea actualizărilor a eșuat</string>
+    <string name="store_game_update">Actualizează</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verifică fișierele</string>
+    <string name="store_game_verify_started">Se verifică %1$s — verifică fila Descărcări</string>
+    <string name="store_game_steam_options">Opțiuni Steam</string>
+    <string name="store_game_verify_complete">Verificarea fișierelor s-a încheiat</string>
+    <string name="store_game_verify_failed_notice">Verificarea fișierelor a eșuat</string>
+    <string name="store_game_progress_background_hint">Poți închide această fereastră — continuă în fundal. Verifică fila Descărcări oricând.</string>
+    <string name="store_game_checking_updates">Se verifică actualizările</string>
+    <string name="store_game_no_updates_notice">Nu sunt actualizări disponibile</string>
+    <string name="store_game_update_complete">Actualizare finalizată</string>
+    <string name="store_game_update_failed_notice">Actualizarea a eșuat</string>
+    <string name="store_game_update_check_failed_notice">Verificarea actualizărilor a eșuat</string>
+    <string name="store_game_download_already_active">Acest joc se descarcă deja. Anulează descărcarea curentă înainte de a adăuga DLC.</string>
     <string name="common_ui_select">Selectează</string>
     <string name="common_ui_select_folder">Selectează folder</string>
     <string name="common_ui_current_folder">Folder curent</string>
+    <string name="common_ui_enter_path">Introduceți calea</string>
+    <string name="common_ui_path_not_found">Calea nu a fost găsită</string>
     <string name="common_ui_storage_roots">Locații de stocare</string>
     <string name="common_ui_browse_local_folders_directly">Răsfoiește direct folderele locale</string>
     <string name="common_ui_no_folders_available_here">Niciun folder disponibil aici</string>
     <string name="common_ui_grant_all_files_access_browse">Acordă acces complet la fișiere pentru a răsfoi direct folderele locale.</string>
     <string name="common_ui_not_configured">Neconfigurat</string>
     <string name="common_ui_reinstall">Reinstalează</string>
-    <string name="common_ui_exit_app_confirm">Iesi din WinNative?</string>
     <string name="common_ui_elements_count">%1$d elemente</string>
     <string name="common_ui_disabled_placeholder">-- Dezactivat --</string>
     <string name="common_ui_enabled">Activat</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Obține ilustrații</string>
+    <string name="library_games_scraping_artwork">Se obțin…</string>
     <string name="library_games_shortcut_created">Comanda rapida creata</string>
     <string name="library_games_failed_to_create_shortcut">Nu s-a putut crea comanda rapida: %s</string>
     <string name="library_games_install_path">Cale de instalare</string>
+    <string name="library_games_not_enough_space">Mai este nevoie de %1$s spatiu</string>
     <string name="library_games_download_slash_install">Descarca / Instaleaza</string>
     <string name="library_games_save_management">GESTIONARE SALVARI</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Disponibil: %3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">Niciun joc instalat\nApasa pentru a deschide Winlator Backend</string>
     <string name="library_games_installed_badge">INSTALAT</string>
     <string name="library_games_unknown_game">Joc necunoscut</string>
-    <string name="library_games_layouts_header">ASPECTE</string>
+    <string name="library_games_layouts_header">ASPECTE ALE BIBLIOTECII</string>
     <string name="library_games_layout_carousel">Carusel</string>
     <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">OPȚIUNI DE VIZUALIZARE</string>
+    <string name="library_games_immersive_mode">Mod imersiv</string>
+    <string name="library_games_immersive_mode_description">Folosește grafica jocului focalizat ca fundal</string>
+    <string name="library_games_immersive_blur">Estompează fundalul</string>
+    <string name="library_games_immersive_blur_description">Aplică un efect de estompare asupra fundalului imersiv</string>
     <string name="library_games_custom_game">Joc personalizat</string>
     <string name="library_games_play">Joaca</string>
+    <string name="hero_boot_to_desktop_title">Pornește pe desktop</string>
+    <string name="hero_graphics_tests_title">Teste grafice</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Teste de intrare</string>
     <string name="library_games_add_custom_game">Adauga joc personalizat</string>
     <string name="library_games_game_name">Nume joc</string>
     <string name="library_games_game_folder_mapped_drive">Folder joc (unitate de joc mapata)</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">Anulat</string>
     <string name="downloads_queue_phase_failed">Esuat: %1$s</string>
     <string name="downloads_queue_cancel_download">Anuleaza descarcarea</string>
+    <string name="downloads_queue_cancel_download_title">Anulezi descărcarea?</string>
+    <string name="downloads_queue_cancel_download_warning">Anularea descărcării unui DLC, joc sau actualizare poate corupe instalarea jocului.\n\nSigur vrei să anulezi?</string>
     <string name="downloads_queue_empty">Nu exista descarcari active.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Container nou</string>
     <string name="containers_list_edit">Editeaza container</string>
-    <string name="containers_list_creating">Se creeaza containerul…</string>
-    <string name="containers_list_removing">Se elimina containerul…</string>
-    <string name="containers_list_duplicating">Se duplica containerul…</string>
+    <string name="containers_list_creating">Se creeaza containerul</string>
+    <string name="containers_list_removing">Se elimina containerul</string>
+    <string name="containers_list_duplicating">Se duplica containerul</string>
+    <string name="containers_list_remove_title">Elimina containerul</string>
+    <string name="containers_list_duplicate_title">Duplica containerul</string>
     <string name="containers_list_confirm_remove">Doresti sa elimini acest container?</string>
     <string name="containers_list_confirm_duplicate">Doresti sa duplici acest container?</string>
+    <string name="containers_list_duplicate_failed">Duplicarea containerului a esuat</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Doresti sa elimini aceasta comanda rapida?</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">Nu s-a putut clona comanda rapida.</string>
     <string name="shortcuts_list_exported_to">Comanda rapida exportata in %1$s</string>
     <string name="shortcuts_list_failed_export">Nu s-a putut exporta comanda rapida</string>
+    <string name="shortcuts_export_all">Exportă tot</string>
+    <string name="shortcuts_export_to_frontend">Exportă în frontend</string>
+    <string name="shortcuts_export_all_done">%1$d jocuri exportate în %2$s</string>
+    <string name="shortcuts_export_all_none">Niciun joc de exportat</string>
     <string name="shortcuts_list_added">Comanda rapida adaugata cu succes.</string>
     <string name="shortcuts_list_failed_add">Nu s-a putut adauga comanda rapida.</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">Dezactiveaza Xinput (pentru control exclusiv M/T)</string>
     <string name="shortcuts_properties_exclusive_input">Intrare exclusiva</string>
     <string name="shortcuts_properties_custom_game_settings">Setari personalizate joc</string>
-    <string name="shortcuts_properties_use_cold_client">Foloseste ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient este metoda preferată pentru gestionarea emulării Steam și a DRM. Aplică patch-ul DRM la rulare fără a modifica fișierele jocului.</string>
-    <string name="shortcuts_properties_unpack_files">DRM vechi</string>
-    <string name="shortcuts_properties_unpack_files_description">Elimină DRM SteamStub din exe de pe disc. Activează doar dacă jocul nu pornește fără aceasta. Patcher-ul runtime al ColdClient gestionează automat majoritatea jocurilor.</string>
-    <string name="shortcuts_properties_force_dlc">Forteaza DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Activeaza doar daca DLC-urile nu sunt detectate sau salvarile cu DLC nu functioneaza</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Lanseaza clientul Steam (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Lanseaza clientul real Steam in Wine\nNecesita un cont Steam si poate reduce performanta\nNu toate jocurile functioneaza</string>
-    <string name="shortcuts_properties_steam_type">Performanta client Steam</string>
-    <string name="steam_section_emulator">Emulator Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Client Steam real</string>
     <string name="shortcuts_properties_use_steam_input">Foloseste Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Mod offline Steam</string>
     <string name="shortcuts_properties_reset">Reseteaza proprietatile</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Doresti sa duplici acest profil?</string>
     <string name="input_controls_editor_title">Editor controale</string>
     <string name="input_controls_editor_toggle_switch">Comutator</string>
+    <string name="input_controls_editor_swipeable">Activare prin glisare</string>
     <string name="input_controls_editor_profile_exported_to">Profil exportat in</string>
     <string name="input_controls_editor_unable_to_import">Nu s-a putut importa profilul</string>
     <string name="input_controls_editor_import_profile">Importa profil</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">Compatibilitate</string>
     <string name="container_box64_intermediate">Intermediar</string>
     <string name="container_box64_performance">Performanta</string>
+    <string name="container_fexcore_performance_tso">Performanta TSO</string>
+    <string name="container_fexcore_extreme">Extrem</string>
+    <string name="container_fexcore_extreme_tso">Extrem TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Gestionarea indicatorilor la operatiile CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Trateaza CALL/RET ca si cum nu ar avea nevoie niciodata de indicatori (mai rapid, instabil)&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Preset FEXCore</string>
     <string name="container_fexcore_version">Versiune FEXCore</string>
+    <string name="use_unix_libs">Folosește UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Driver grafic</string>
+    <string name="container_zink_mode">Mod Zink</string>
+    <string name="container_graphics_transcoder">Transcodor BCn</string>
+    <string name="container_graphics_quality">Calitate BCn</string>
     <string name="container_graphics_configuration">Configurare driver grafic</string>
     <string name="container_graphics_version">Versiune driver grafic</string>
     <string name="container_graphics_available_extensions">Extensii disponibile</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">Emulare BCn</string>
     <string name="container_graphics_bcn_emulation_type">Tip emulare BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Cache emulare BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Super rezoluție pentru jocuri 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Claritate margini</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Doresti sa duplici acest preset?</string>
     <string name="container_presets_confirm_remove">Doresti sa elimini acest preset?</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Foloseste extensia DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Simuleaza ecran tactil</string>
     <string name="session_xserver_preferences_button_text">   PREFERINTE   </string>
     <string name="session_xserver_extra_keys_config_desc">Aici poti seta valoarea variabilei extra-keys ca in aplicatia Termux (citeste <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">aici</a>) si altele \n
@@ -526,12 +572,6 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="session_xserver_pref_kbd">Tastatura</string>
     <string name="session_xserver_pref_other">Altele</string>
     <string name="session_xserver_pref_version">Versiune</string>
-    <string name="session_xserver_use_dri3_description">Dezactivarea poate rezolva probleme grafice pe unele dispozitive</string>
-    <string name="session_xserver_native_rendering">Randare nativa</string>
-    <string name="session_xserver_native_rendering_enabled">Randare hardware DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Alternativa software WSI</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Randarea nativa activata (intra in vigoare la urmatoarea lansare)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Randarea nativa dezactivata (intra in vigoare la urmatoarea lansare)</string>
     <string name="session_xserver_notification_description">Mesaje WinNative XServer</string>
     <string name="session_xserver_notification_content">WinNative rulează, nu închideți sau glisați această notificare</string>
 
@@ -551,6 +591,8 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="session_drawer_exit_subtitle">Inchide sesiunea curenta</string>
     <string name="session_drawer_touchscreen_overlay">Suprapunere tactila</string>
     <string name="session_drawer_resume">Reluare</string>
+    <string name="session_drawer_retry">Reîncearcă</string>
+    <string name="downloads_no_internet">Fără conexiune la internet</string>
     <string name="session_drawer_pause">Pauza</string>
     <string name="session_drawer_wine_processes_paused">Procesele Wine sunt in pauza</string>
     <string name="session_drawer_pause_all_wine_processes">Pune in pauza toate procesele Wine</string>
@@ -561,6 +603,33 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Bat.</string>
     <string name="session_drawer_hud_element_graph">Grafic</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD stil Mango</string>
+    <string name="session_drawer_hud_mango_settings">Setări HUD Mango</string>
+    <string name="mango_hud_element_gpu_load">Sarcină GPU</string>
+    <string name="mango_hud_element_gpu_temp">Temp. GPU</string>
+    <string name="mango_hud_element_cpu_load">Sarcină CPU</string>
+    <string name="mango_hud_element_cpu_temp">Temp. CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Baterie</string>
+    <string name="mango_hud_element_lows" formatted="false">Minime 1%</string>
+    <string name="mango_hud_element_graph">Grafic frametime</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Frecvență CPU</string>
+    <string name="mango_hud_element_gpu_clock">Frecvență GPU</string>
+    <string name="mango_hud_element_cores">Per nucleu</string>
+    <string name="mango_hud_element_network">Rețea</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Rezoluție</string>
+    <string name="mango_hud_element_wine">Versiune Wine</string>
+    <string name="mango_hud_element_duration">Timp sesiune</string>
+    <string name="mango_hud_element_clock">Ceas</string>
+    <string name="mango_hud_element_throttle">Stare termică</string>
+    <string name="mango_hud_group_memory">Memorie</string>
+    <string name="mango_hud_group_system">Sistem</string>
+    <string name="mango_hud_lock">Blochează HUD</string>
+    <string name="mango_hud_lock_subtitle">Permite atingerilor să ajungă la comenzile din spatele HUD-ului. Ține apăsat HUD-ul pentru a-l bloca. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Doresti sa opresti acest proces?</string>
@@ -591,6 +660,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="session_display_frame_rate">Rata cadrelor</string>
     <string name="session_display_title">Afisaj</string>
     <string name="session_display_fullscreen_stretched">Activeaza ecran complet (intins)</string>
+    <string name="session_display_direct_composition">Compoziție directă (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -664,6 +734,9 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="session_gamepad_error_loading_profile">Eroare la incarcarea profilului</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Comenzi tactile</string>
+    <string name="input_controls_auto_hide_on_controller_title">Ascunde automat la controler</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Ascunde comenzile tactile când este conectat un controler</string>
     <string name="session_gyroscope_title">Giroscop</string>
     <string name="session_gyroscope_calibrate">Calibreaza giroscopul</string>
     <string name="session_gyroscope_enable_right_stick">Activeaza miscarea giroscopica pe stick-ul drept</string>
@@ -700,6 +773,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_general_select_wallpaper">Selectează fundalul</string>
     <string name="settings_general_title">General</string>
     <string name="settings_general_enable_file_provider">Activeaza furnizorul de fisiere</string>
+    <string name="settings_general_enable_auto_scraping">Activează obținerea automată</string>
     <string name="settings_general_take_effect_next_startup">Aceasta optiune va avea efect la urmatoarea pornire.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Reinstaleaza Imagefs</string>
@@ -713,7 +787,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_general_share_android_clipboard">Partajeaza clipboard-ul Android cu Wine</string>
     <string name="settings_general_paths_title">Setari cai</string>
     <string name="settings_general_paths_summary">Gestioneaza unde Winlator stocheaza datele de lucru si unde sunt scrise comenzile rapide exportate.</string>
-    <string name="settings_general_winlator_path_title">Cale Winlator</string>
+    <string name="settings_general_winlator_path_title">Cale de stocare</string>
     <string name="settings_general_shortcut_export_path_title">Cale export comenzi rapide</string>
     <string name="settings_general_choose_path">Alege calea</string>
     <string name="settings_general_xserver_cursor_summary">Ajusteaza viteza cursorului pentru intrarea tactila, trackpad si mouse in sesiunea XServer.</string>
@@ -721,7 +795,9 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_general_cursor_lock_summary">Mentine captura directa a mouse-ului activata pentru jocuri care necesita intrare bruta de cursor. Dezactiveaza cu Volum Jos.</string>
     <string name="settings_general_xinput_toggle_title">Dezactiveaza XInput</string>
     <string name="settings_general_xinput_toggle_summary">Opreste gestionarea XInput cand doresti control exclusiv cu mouse-ul si tastatura.</string>
-    <string name="settings_general_file_provider_summary">Expune fisierele Winlator catre selectoarele de documente si managerii de fisiere Android.</string>
+    <string name="settings_external_display_output_summary">Mută jocul pe un afișaj extern conectat în loc să oglindească acest ecran. Ochelarii folosesc întotdeauna propriul afișaj.</string>
+    <string name="settings_general_file_provider_summary">Expune fisierele WinNative catre selectoarele de documente si managerii de fisiere Android.</string>
+    <string name="settings_general_auto_scraping_summary">Această setare permite WinNative să obțină automat ilustrațiile jocurilor personalizate.</string>
     <string name="settings_general_open_browser_summary">Deschide link-urile web compatibile in browserul Android in loc de Wine.</string>
     <string name="settings_general_clipboard_summary">Permite copierea si lipirea intre Android si sesiunile Wine.</string>
     <string name="settings_general_imagefs_summary">Restaureaza fisierele de sistem incluse fara a elimina containerele existente.</string>
@@ -736,7 +812,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Instalarea soundfont-ului a esuat!</string>
     <string name="settings_audio_sound_font_already_exist">Soundfont-ul pe care doresti sa il instalezi exista deja.</string>
     <string name="settings_audio_unable_to_install_soundfont">Nu se poate instala soundfont-ul</string>
-    <string name="settings_audio_installing_soundfont">Se instaleaza SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Se instaleaza SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Format SoundFont incorect.</string>
     <string name="settings_audio_cannot_remove_default">Nu se poate elimina soundfont-ul implicit</string>
     <string name="settings_audio_summary">Instaleaza, elimina si alege SoundFont-ul folosit pentru redarea MIDI.</string>
@@ -750,15 +826,33 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_debug_box_logs_subtitle">Scrie iesirea de depanare Box86 si Box64 in fisier</string>
     <string name="settings_debug_fex_logs_title">Activeaza jurnalele FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Scrie iesirea de depanare FEXCore in fisier</string>
+    <string name="settings_debug_emulator_logs_title">Jurnale de emulare Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Înregistrează în fișier emulatorul folosit de containerul tău.</string>
     <string name="settings_debug_steam_logs_title">Activeaza jurnalele Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Inregistreaza evenimentele de autentificare si sesiune Steam pentru depanare.</string>
     <string name="settings_debug_wine_channels_title">Canale de depanare Wine</string>
     <string name="settings_debug_wine_channels_summary">Alege ce canale Wine sunt incluse cand jurnalizarea de depanare Wine este activata.</string>
+    <string name="settings_debug_wine_classes_title">Niveluri de jurnal Wine</string>
+    <string name="settings_debug_wine_classes_summary">Alege ce tipuri de mesaje sunt înregistrate. Trace este extrem de detaliat.</string>
     <string name="settings_debug_input_logs">Jurnale de intrare</string>
     <string name="settings_debug_input_logs_description">Inregistreaza evenimentele de intrare gamepad, tactile si tastatura</string>
     <string name="settings_debug_download_logs">Jurnale descarcari</string>
     <string name="settings_debug_download_logs_description">Inregistreaza evenimentele de rezolvare descarcari si alternativa WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Straturi de validare Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Repornește afișajul pentru aplicare.</string>
     <string name="settings_debug_share_logs">Partajeaza jurnalele</string>
+    <string name="settings_debug_delete_logs">Șterge jurnalele</string>
+    <string name="settings_debug_share_all_logs_short">Partajează tot</string>
+    <string name="settings_debug_download_all_logs_short">Descarcă tot</string>
+    <string name="settings_debug_logs_saved">Salvat în %1$s</string>
+    <string name="settings_debug_delete_logs_short">Șterge</string>
+    <string name="settings_debug_delete_all_logs_short">Șterge tot</string>
+    <string name="settings_debug_open_logs_folder_short">Deschide managerul de jurnale</string>
+    <string name="settings_debug_logs_deleted">Jurnale șterse</string>
+    <string name="settings_debug_delete_logs_confirm_title">Ștergi jurnalele?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Aceasta șterge definitiv toate fișierele jurnal salvate (%1$s). Acțiunea nu poate fi anulată.</string>
+    <string name="settings_debug_logs_browser_title">Jurnale</string>
+    <string name="settings_debug_log_truncated">Se afișează ultimele %1$s din acest jurnal</string>
     <string name="settings_debug_logs_subject">Jurnale WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">Nu sunt disponibile jurnale de depanare. Activează mai întâi opțiunile de depanare și lansează un joc.</string>
     <string name="settings_debug_capture_failed">Capturarea jurnalelor a eșuat: %1$s</string>
@@ -773,6 +867,8 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
 
     <string name="settings_other_language_title">Limbă</string>
     <string name="settings_other_language_summary">Alege limba de afișare</string>
+    <string name="settings_other_game_language_title">Limba jocului</string>
+    <string name="settings_other_game_language_summary">Limba preferată pentru descărcările Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">Implicit sistem</string>
 
     <string name="settings_other_section_integration">Integrare</string>
@@ -790,7 +886,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_content_empty_subtitle">Instalează un pachet sau schimbă tipul pentru a începe.</string>
     <string name="settings_content_container_created">Container creat: %1$s</string>
     <string name="settings_content_download_failed">Descărcare eșuată.</string>
-    <string name="common_ui_working">Se lucrează…</string>
+    <string name="common_ui_working">Se lucrează</string>
     <string name="settings_content_desc_wine">Creat de proiectul Wine; traduce apelurile Win32 în servicii native Linux/Android.</string>
     <string name="settings_content_desc_proton">Creat de Valve; runtime bazat pe Wine cu patch-uri pentru jocuri Windows.</string>
     <string name="settings_content_desc_dxvk">Traduce apelurile grafice Direct3D 9, 10 și 11 în Vulkan.</string>
@@ -798,6 +894,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_content_desc_box64">Traduce cod Linux x86_64 pentru rulare pe dispozitive ARM64.</string>
     <string name="settings_content_desc_wowbox64">Build Box64 folosit de WoW64 pentru a rula aplicații Windows pe 32 de biți în Wine pe 64 de biți.</string>
     <string name="settings_content_desc_fexcore">Traduce cod x86 și x86_64 pentru rulare pe dispozitive ARM64.</string>
+    <string name="settings_content_desc_d7vk">Traduce apelurile grafice DirectDraw (Direct3D 7 și anterioare) în Vulkan.</string>
     <string name="settings_content_unable_to_install">Nu se poate instala continutul.</string>
     <string name="settings_content_install_failed">Instalare esuata</string>
     <string name="settings_content_file_cannot_be_recognized">Fisierul nu poate fi recunoscut.</string>
@@ -809,9 +906,14 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="settings_content_downloading_title">Se descarca continutul</string>
     <string name="settings_content_installing_title">Se instaleaza continutul</string>
     <string name="settings_content_extracting_title">Se extrage continutul</string>
-    <string name="settings_content_extracting_detail">Se extrage… (%1$d fisiere)</string>
-    <string name="settings_content_preparing_package">Se pregateste pachetul…</string>
+    <string name="settings_content_extracting_detail">Se extrage (%1$d fisiere)</string>
+    <string name="settings_content_preparing_package">Se pregateste pachetul</string>
     <string name="settings_content_download_complete">Descarcare completa</string>
+    <string name="settings_content_already_installed_title">Componenta deja instalata</string>
+    <string name="settings_content_already_installed_message">Aceasta componenta este deja instalata. Elimina copia instalata inainte sa o descarci din nou.
+
+Cale instalata:
+%1$s</string>
     <string name="settings_content_conflicting_title">Continut conflictual instalat</string>
     <string name="settings_content_conflicting_message">Dezinstaleaza continutul conflictual inainte de a descarca acest pachet.
 
@@ -820,7 +922,7 @@ Cale instalata:
     <string name="settings_content_cannot_be_trusted">Continutul nu poate fi considerat de incredere.</string>
     <string name="settings_content_is_incomplete">Continutul este incomplet.</string>
     <string name="settings_content_untrusted_files_warning">Avertisment: Continutul suplimentar contine fisiere nesigure. In general, urmatoarele fisiere nu ar trebui modificate. Decide daca doresti sa continui instalarea.</string>
-    <string name="settings_content_confirm_remove">Doresti sa elimini acest continut?</string>
+    <string name="settings_content_confirm_remove">Aceasta va sterge componenta de pe dispozitiv.</string>
     <string name="settings_content_unable_to_remove_in_use">Nu se poate elimina acest continut, deoarece un container foloseste in prezent acest Wine.</string>
     <string name="settings_content_download_in_components">Nimic descarcat. Descarca unul din Componente.</string>
     <string name="settings_content_types_header">TIPURI DE CONTINUT</string>
@@ -832,9 +934,12 @@ Cale instalata:
     <string name="settings_drivers_install">Instaleaza drivere</string>
     <string name="settings_drivers_installed_success">Driver instalat cu succes.</string>
     <string name="settings_drivers_install_failed">Instalarea driverului a esuat.</string>
-    <string name="settings_drivers_confirm_remove">Doresti sa elimini acest driver?</string>
+    <string name="settings_drivers_remove_title">Elimini driverul?</string>
+    <string name="settings_drivers_confirm_remove">Aceasta va sterge driverul de pe dispozitiv.</string>
+    <string name="settings_drivers_remove_repo_title">Elimini depozitul?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s va fi eliminat din lista ta de depozite.</string>
     <string name="settings_drivers_repo_tap_to_load">Apasa pentru a incarca versiunile</string>
-    <string name="settings_drivers_repo_loading_releases">Se incarca versiunile…</string>
+    <string name="settings_drivers_repo_loading_releases">Se incarca versiunile</string>
     <string name="settings_drivers_repo_release_count">%1$d versiuni incarcate</string>
     <string name="settings_drivers_repo_no_release_assets">Nu s-au gasit resurse ZIP descarcabile in versiunile obtinute.</string>
     <string name="settings_drivers_repo_fetch_failed">Nu s-au putut incarca versiunile GitHub.</string>
@@ -844,7 +949,7 @@ Cale instalata:
     <string name="settings_drivers_manager">Manager drivere</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Se instaleaza fisierele de sistem…</string>
+    <string name="setup_wizard_installing_system_files">Se instaleaza fisierele de sistem</string>
     <string name="setup_wizard_unable_to_install_system_files">Nu s-au putut instala fisierele de sistem</string>
     <string name="setup_wizard_system_image_not_installed">Imaginea de sistem nu este instalata. Instaleaza mai intai componentele.</string>
     <string name="setup_wizard_recommended_components">Componente recomandate</string>
@@ -913,6 +1018,9 @@ Cale instalata:
     <string name="google_cloud_sync_started">Sincronizarea cloud a inceput.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Servicii Google</string>
+    <string name="google_auto_signin_title">Conectare la Google la pornire</string>
+    <string name="google_auto_signin_summary">Conectează-te automat la Google Play Games la pornirea aplicației, astfel încât copiile de rezervă ale salvărilor și sincronizarea să fie mereu pregătite. Când este dezactivat, aplicația nu se conectează niciodată singură.</string>
+    <string name="google_auto_signin_section">La pornire</string>
     <string name="google_cloud_play_games">Google Play Games</string>
     <string name="google_cloud_status_syncing">Se sincronizeaza</string>
     <string name="google_cloud_status_connected">Conectat</string>
@@ -971,22 +1079,30 @@ Cale instalata:
     <string name="saves_import_export_exported_failed">Exportul salvarilor a esuat: %1$s</string>
     <string name="saves_import_export_imported">Salvarile au fost importate cu succes</string>
     <string name="saves_import_export_imported_failed">Importul salvarilor a esuat: %1$s</string>
+    <string name="saves_export_path_summary">Salvarile vor fi exportate in /WinNative/saves</string>
+    <string name="saves_export_success_path">Exportat in %1$s</string>
+    <string name="saves_export_warning_title">Foloseste aceasta optiune doar cu jocuri personalizate</string>
+    <string name="saves_export_warning_body">Exportul poate include salvari din jocuri instalate din magazine sau sincronizate in cloud.</string>
+    <string name="saves_import_warning_title">Aceasta va suprascrie salvarile existente din acest container</string>
+    <string name="saves_import_warning_body">Cand restaurezi o copie de rezerva mai veche cu mai multe jocuri, copiaza mai intai salvarile mai noi in fisierul zip cu managerul de fisiere. Doar salvarile existente in fisierul .zip vor fi afectate. Gestioneaza-ti salvarile cu grija.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Container</string>
-    <string name="preloader_initializing">Se inițializează…</string>
-    <string name="preloader_launching">Se lansează…</string>
-    <string name="preloader_closing">Se închide %1$s…</string>
-    <string name="preloader_setup_environment">Se configurează mediul…</string>
-    <string name="preloader_installing_mono">Se instalează Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Se instalează redistribuibilele…</string>
-    <string name="preloader_unpacking_exe">Se decomprimă executabilul jocului…</string>
-    <string name="preloader_downloading_cloud">Se descarcă salvările din cloud…</string>
-    <string name="preloader_syncing_cloud">Se sincronizează salvările din cloud…</string>
-    <string name="preloader_cloud_downloading">Descărcare Cloud Sync…</string>
-    <string name="preloader_cloud_backup">Se face backup pe Google Drive…</string>
+    <string name="preloader_initializing">Se inițializează</string>
+    <string name="preloader_launching">Se lansează</string>
+    <string name="preloader_closing">Se închide %1$s</string>
+    <string name="preloader_setup_environment">Se configurează mediul</string>
+    <string name="preloader_retrying_steam_client_download">Se reîncearcă descărcarea clientului Steam</string>
+    <string name="preloader_installing_mono">Se instalează Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Se instalează redistribuibilele</string>
+    <string name="preloader_unpacking_exe">Se decomprimă executabilul jocului</string>
+    <string name="preloader_downloading_cloud">Se descarcă salvările din cloud</string>
+    <string name="preloader_syncing_cloud">Se sincronizează salvările din cloud</string>
+    <string name="preloader_uploading_cloud">Se încarcă salvările în cloud</string>
+    <string name="preloader_checking_cloud">Se verifică salvările din cloud</string>
+    <string name="preloader_cloud_sync_retry">%1$s Reîncercare %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Descărcare Cloud Sync</string>
     <string name="cloud_sync_failed_provider">Sincronizarea cloud %1$s a eșuat.</string>
-    <string name="google_cloud_backup_failed">Backup-ul pe Google Drive a eșuat.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@ Cale instalata:
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Grafică</string>
-    <string name="container_backups_title">Copii de rezervă</string>
-    <string name="container_backups_prompt">Alege o acțiune pentru această copie de rezervă a containerului.</string>
-    <string name="container_backups_backing_up">Se face copia de rezervă a containerului…</string>
-    <string name="container_backups_restoring">Se restaurează containerul…</string>
-    <string name="container_backups_checking">Se verifică copiile de rezervă ale containerului…</string>
-    <string name="container_backups_select_title">Selectează copia de rezervă de restaurat</string>
-    <string name="container_backups_no_files">Nu au fost găsite copii de rezervă ale containerului în Google Drive.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Asociere primară</string>
     <string name="binding_secondary">Asociere secundară</string>
+    <string name="binding_third">Asociere terțiară</string>
+    <string name="binding_fourth">Asociere cuaternară</string>
     <string name="input_controls_editor_tap_to_switch">Atinge pentru a schimba</string>
     <string name="input_controls_editor_download_profile">Descarcă profilul</string>
     <string name="container_config_emulator_section">Emulator</string>
@@ -1010,6 +1122,7 @@ Cale instalata:
     <string name="session_drawer_fps_monitor">Monitor FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Afișează statisticile de performanță în timp real</string>
     <string name="session_drawer_dual_series_battery">Baterie Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Afișează timpul cadrului ca număr</string>
     <string name="session_drawer_command_center">Centru de comandă</string>
     <string name="session_drawer_command_center_input">Intrare</string>
     <string name="session_drawer_command_center_display">Afișaj</string>
@@ -1022,7 +1135,6 @@ Cale instalata:
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Natural</string>
     <string name="session_drawer_color_profile_crt">Efect CRT</string>
-    <string name="session_drawer_upscaler_dls">Viu</string>
     <string name="session_drawer_calibrate_advanced">Calibrare avansată</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Giro</string>
@@ -1034,7 +1146,6 @@ Cale instalata:
     <string name="session_drawer_rail_label_mouse">Mouse</string>
     <string name="session_drawer_rail_label_fullscreen">Ecran complet</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Nativ</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Sarcini</string>
     <string name="session_drawer_rail_label_logs">Loguri</string>
@@ -1048,24 +1159,23 @@ Cale instalata:
     <string name="session_drawer_logs_share_chooser">Partajează logurile sesiunii</string>
     <string name="session_drawer_logs_share_failed">Nu s-au putut partaja logurile</string>
     <string name="session_drawer_logs_share_empty">Nu există linii de log de partajat</string>
-    <string name="session_drawer_super_resolution">Filtre Claritate</string>
-    <string name="session_drawer_upscaler_mode">Filtru</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Super rezoluție</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Viu</string>
+    <string name="session_drawer_vivid_strength">Intensitate vividă</string>
     <string name="session_drawer_main_menu_title">Meniu</string>
     <string name="session_gyroscope_activator">Activator</string>
     <string name="settings_general_check_for_updates">Verifică actualizările</string>
     <string name="settings_general_check_for_updates_summary">Verifică automat dacă există versiuni noi ale aplicației la pornire și periodic.</string>
     <string name="setup_wizard_containers">Configurare container</string>
-    <string name="google_cloud_auto_backup">Backup automat Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Salvează automat copiile de rezervă ale jocurilor în Google Drive de fiecare dată când ieși dintr-un joc.</string>
     <string name="cloud_saves_title">Salvări în cloud</string>
-    <string name="cloud_saves_backup">Fă backup salvării în cloud</string>
-    <string name="cloud_saves_restore">Restaurează salvarea în cloud</string>
+    <string name="cloud_saves_title_for_provider">Salvări în cloud %1$s - %2$s</string>
     <string name="cloud_sync_title">Sincronizare în cloud</string>
     <string name="cloud_sync_enabled_summary">Descarcă salvările din cloud la pornire și sincronizează/fă backup la ieșire.</string>
     <string name="cloud_sync_disabled_summary">Pornește acest joc fără descărcarea salvărilor din cloud sau sincronizare la ieșire.</string>
-    <string name="cloud_saves_backing_up">Se face backup salvării în cloud…</string>
-    <string name="cloud_saves_restoring">Se restaurează salvarea în cloud…</string>
+    <string name="cloud_saves_backing_up">Se face backup salvării în cloud</string>
+    <string name="cloud_saves_restoring">Se restaurează salvarea în cloud</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@ Cale instalata:
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Controlează memorarea în cache a blocurilor dynarec generate între rulări pentru a accelera pornirea.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1281 @@ Cale instalata:
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Nicio salvare anterioară arhivată încă. Salvările înlocuite și copiile de siguranță manuale vor apărea aici timp de 30 de zile.</string>
+    <string name="cloud_saves_history_loading">Se încarcă istoricul salvărilor\u2026</string>
+    <string name="cloud_saves_history_origin_auto">auto</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">cloud</string>
+    <string name="cloud_saves_history_origin_local">local</string>
+    <string name="cloud_saves_history_origin_manual">manual</string>
+    <string name="cloud_saves_history_refresh">Reîmprospătează</string>
+    <string name="cloud_saves_history_rename">Redenumește</string>
+    <string name="cloud_saves_history_rename_clear">Șterge text</string>
+    <string name="cloud_saves_history_rename_failed">Imposibil de redenumit copia de siguranță.</string>
+    <string name="cloud_saves_history_rename_hint">ex.: Lupta cu șeful, Înainte de final</string>
+    <string name="cloud_saves_history_rename_save">Salvează</string>
+    <string name="cloud_saves_history_rename_success">Copie de siguranță redenumită.</string>
+    <string name="cloud_saves_history_rename_title">Denumește această copie de siguranță</string>
+    <string name="cloud_saves_history_restore">Restaurează</string>
+    <string name="cloud_saves_history_restore_confirm_body">Aceasta va înlocui salvarea locală curentă cu copia de siguranță din %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Restaurezi această copie de siguranță?</string>
+    <string name="cloud_saves_history_restore_failed">Imposibil de restaurat această copie de siguranță.</string>
+    <string name="cloud_saves_history_restore_success">Salvare restaurată din copia de siguranță.</string>
+    <string name="cloud_saves_history_sign_in">Autentifică-te la Google pentru a vedea istoricul salvărilor.</string>
+    <string name="cloud_saves_history_title">Istoric salvări</string>
+    <string name="cloud_saves_history_download">Descarcă</string>
+    <string name="cloud_saves_history_download_success">Fișier descărcat.</string>
+    <string name="cloud_saves_history_download_failed">Descărcarea a eșuat.</string>
+    <string name="cloud_saves_keep_replaced_backup">Păstrează o copie de siguranță a salvării înlocuite</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Dacă te răzgândești, o poți restaura din Istoricul salvărilor.</string>
+    <string name="cloud_saves_no_backups">Nicio copie de siguranță pentru acest joc încă.</string>
+    <string name="cloud_saves_offline_mode">Dezactivează sincronizarea în cloud</string>
+    <string name="cloud_saves_offline_mode_summary">Oprește toată activitatea cloud automată pentru acest joc.</string>
+    <string name="cloud_saves_sync_from_provider">Sincronizare din cloud %1$s</string>
+    <string name="cloud_saves_sync_from_provider_failed">Imposibil de descărcat salvarea de la %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Gestionează salvările în cloud GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Deschide site-ul oficial GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Nu există niciun browser disponibil pentru a deschide pagina salvărilor în cloud GOG</string>
+    <string name="cloud_saves_gog_zip_label">Descarcă ZIP-ul din cloud GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Salvează fișierele cloud curente</string>
+    <string name="cloud_saves_gog_zip_success">ZIP-ul salvărilor în cloud GOG a fost salvat.</string>
+    <string name="cloud_saves_gog_zip_failed">Nu s-a putut salva ZIP-ul salvărilor în cloud GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Nu s-au găsit fișiere de salvare în cloud GOG.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Sincronizare din cloud</string>
+    <string name="cloud_saves_sync_from_provider_success">Salvare cloud %1$s descărcată.</string>
+    <string name="cloud_saves_syncing_from_provider">Se descarcă salvarea de la %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Preia versiunea pe care o are %1$s acum.</string>
+    <string name="cloud_saves_sync_summary_generic">Preia versiunea cloud curentă.</string>
+    <string name="common_ui_exit_app_confirm">Ieși din WinNative?</string>
+    <string name="container_surface_effect">Efect de suprafață</string>
+    <string name="downloads_queue_cancel_download_confirm">Anulezi descărcarea pentru %1$s și ștergi toate fișierele descărcate?</string>
+    <string name="downloads_queue_paused_resume_hint">Pauză - apasă Reluare pentru a continua</string>
+    <string name="downloads_queue_phase_applying_data">Se aplică datele</string>
+    <string name="downloads_queue_phase_downloading">Se descarcă</string>
+    <string name="downloads_queue_phase_downloading_file">Se descarcă [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Se finalizează</string>
+    <string name="downloads_queue_phase_patching">Se aplică patch-ul</string>
+    <string name="downloads_queue_phase_preparing">Se pregătește</string>
+    <string name="downloads_queue_phase_queued">În coadă</string>
+    <string name="downloads_queue_phase_unknown">Necunoscut</string>
+    <string name="downloads_queue_phase_unpacking">Se dezarhivează</string>
+    <string name="downloads_queue_phase_updating">Se actualizează</string>
+    <string name="downloads_queue_phase_verifying">Se verifică</string>
+    <string name="downloads_queue_phase_verifying_file">Se verifică [%1$s]</string>
+    <string name="downloads_queue_status_label">Stare:</string>
+    <string name="downloads_queue_this_game">acest joc</string>
+    <string name="hud_position_bottom_center">Jos centru</string>
+    <string name="hud_position_bottom_left">Jos stânga</string>
+    <string name="hud_position_bottom_right">Jos dreapta</string>
+    <string name="hud_position_left_center">Stânga centru</string>
+    <string name="hud_position_menu_title">Mută HUD în</string>
+    <string name="hud_position_right_center">Dreapta centru</string>
+    <string name="hud_position_top_center">Sus centru</string>
+    <string name="hud_position_top_left">Sus stânga</string>
+    <string name="hud_position_top_right">Sus dreapta</string>
+    <string name="input_controls_editor_number_of_bindings">Număr de asocieri</string>
+    <string name="input_controls_editor_opacity">Opacitate</string>
+    <string name="input_controls_editor_radial_menu">Meniu radial</string>
+    <string name="input_controls_editor_radial_menu_options">Opțiuni meniu radial</string>
+    <string name="input_controls_tap_to_click">Atingere pentru clic</string>
+    <string name="input_controls_reverse_binding_order">Inversează ordinea asocierilor</string>
+    <string name="num_controllers">Număr de controlere</string>
+    <string name="session_drawer_controls_section">Controale</string>
+    <string name="session_drawer_header_subtitle">Acces rapid la controale, suprapuneri și instrumente de sesiune</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Setează Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">Activează suprapunerea pentru a o personaliza</string>
+    <string name="session_drawer_hud_elements">Elemente HUD</string>
+    <string name="session_drawer_hud_input_hint">Introdu o valoare între %1$d și %2$d. Valorile peste limită sunt trunchiate.</string>
+    <string name="session_drawer_hud_scale">Scară</string>
+    <string name="session_drawer_hud_scale_input_title">Setează scara</string>
+    <string name="session_drawer_hud_summary">Ajustează vizibilitatea suprapunerii și punctele de date</string>
+    <string name="session_drawer_screen_effects">Efecte de ecran</string>
+    <string name="session_drawer_session_section">Sesiune</string>
+    <string name="session_drawer_swipe_hint">Glisează pentru a reveni în joc</string>
+    <string name="session_gamepad_enable_vibration">Activează vibrația</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Mișcare mouse experimentală</string>
+    <string name="session_gyroscope_mouse_scale">Scară mouse</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Scară mouse: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Deschide din nou expertul de configurare pentru a revizui permisiunile, fișierele de sistem și containerele implicite.</string>
+    <string name="settings_other_setup_wizard_title">Expert de configurare</string>
+    <string name="shortcuts_library_artwork_failed">Imposibil de încărcat imaginea selectată.</string>
+    <string name="shortcuts_library_artwork_open_source">Deschide SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Setează imaginea</string>
+    <string name="shortcuts_library_artwork_title">Ilustrații bibliotecă</string>
+    <string name="shortcuts_library_artwork_icon_title">Imagine pictogramă</string>
+    <string name="shortcuts_library_artwork_hero_title">Fundal</string>
+    <string name="shortcuts_list_readded_existing">Scurtătură existentă readăugată</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injectează un DLL patcher DRM la lansare. Reduce FPS — folosește doar dacă lansatorul moștenit singur eșuează.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Selectează folderul salvărilor</string>
+    <string name="cloud_saves_custom_folder_label">Folder salvări</string>
+    <string name="cloud_saves_custom_select_folder_summary">Indică directorul salvărilor din container</string>
+    <string name="cloud_saves_custom_no_container">Containerul nu este disponibil pentru această scurtătură</string>
+    <string name="cloud_saves_custom_picker_title">Selectează folderul salvărilor</string>
+    <string name="cloud_saves_custom_outside_drive_c">Folderul selectat trebuie să fie în unitatea C: a containerului</string>
+    <string name="cloud_saves_custom_path_map_failed">Folderul selectat nu a putut fi mapat la o cale Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Folderul salvărilor a fost setat la %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sincronizează din Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Descarcă cea mai recentă salvare</string>
+    <string name="cloud_saves_steam_sync_success">Sincronizat din Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Sincronizarea Steam Cloud a eșuat</string>
+    <string name="cloud_saves_steam_browse_label">Vezi salvările Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Deschide stocarea în cloud</string>
+    <string name="cloud_saves_steam_browse_no_browser">Nu există niciun browser disponibil pentru a deschide pagina Steam</string>
+    <string name="cloud_saves_steam_import_label">Importă fișiere</string>
+    <string name="cloud_saves_steam_import_helper">Restaurează fișierele descărcate</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Selectorul de fișiere nu este disponibil</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Aceasta va descărca fișierele de salvare curente din Steam Cloud și va suprascrie fișierele de salvare curente.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">ID aplicație nevalid</string>
+    <string name="cloud_saves_label_saved">Etichetă salvată</string>
+    <string name="downloads_queue_cancel_all_title">Anulezi toate descărcările?</string>
+    <string name="downloads_queue_cancel_all_warning">Anularea descărcărilor de DLC, jocuri sau actualizări poate corupe instalările jocurilor.\n\nSigur vrei să anulezi toate descărcările și să ștergi fișierele descărcate până acum?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Folosește lansatorul moștenit</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Emulare Steam moștenită: rulează jocul prin lansatorul ColdClient și elimină DRM-ul SteamStub din exe. Folosește doar pentru jocuri mai vechi care nu funcționează cu Steam Launcher.</string>
+    <string name="steam_section_real_client">Client Steam real WinNative</string>
+    <string name="steam_section_emulator">Emulator Steam moștenit</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Face clientul Steam emulat să raporteze că este offline, astfel încât jocul să nu încerce conexiuni online. Folosește pentru jocurile care se blochează la verificarea rețelei Steam.</string>
+    <string name="input_controls_select_style">Selectează stilul</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Ardezie</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Sclipire</string>
+    <string name="input_controls_style_shadow">Umbră</string>
+    <string name="input_controls_style_reticle">Reticul</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Temă de culoare</string>
+    <string name="input_controls_edit_duplicating_builtin">Profil integrat - a fost creată o copie editabilă.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Resetezi acest profil la aspectul original? Toate modificările făcute se vor pierde.</string>
+    <string name="input_controls_editor_profile_reset">Profil resetat la aspectul original.</string>
+    <string name="input_controls_editor_reset_unavailable">Nu există niciun instantaneu original disponibil pentru acest profil.</string>
+    <string name="container_graphics_compositor_present_mode">Sincronizare afișaj Vulkan</string>
+    <string name="cloud_sync_disable_title">Dezactivează salvările în cloud</string>
+    <string name="cloud_saves_steam_push_label">Trimite în Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Forțează încărcarea salvării locale</string>
+    <string name="cloud_saves_steam_push_success">Salvare trimisă în Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Nu s-a putut trimite salvarea în Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud nu este accesibil acum. Reconectare în fundal atinge reîmprospătare când revii online.</string>
+    <string name="steam_session_refused_event">Steam a refuzat sesiunea din cache (EResult=%1$d). Conectează-te din nou.</string>
+    <string name="settings_hud_record_to_file_title">Înregistrează performanța în fișier</string>
+    <string name="settings_hud_record_to_file_summary">Exportă în /WinNative/logs/ metrici pe secundă pentru FPS, CPU, GPU, temperatură și baterie în timpul jocului.</string>
+    <string name="settings_leaderboard_category">Performanță</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Se pregătește mediul Steam</string>
+    <string name="preloader_starting_wine">Se pornește Wine</string>
+    <string name="preloader_starting_steam_launcher">Se pornește Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Se încarcă clientul Steam</string>
+    <string name="preloader_connecting_to_steam">Se conectează la Steam</string>
+    <string name="preloader_signing_in_to_steam">Se autentifică în Steam</string>
+    <string name="preloader_fetching_game_info">Autentificat — se preiau informațiile jocului</string>
+    <string name="preloader_steam_ready">Steam este pregătit</string>
+    <string name="preloader_updating_game_info">Se actualizează informațiile jocului</string>
+    <string name="preloader_verifying_install">Se verifică instalarea</string>
+    <string name="preloader_scanning_redists">Se scanează redistribuibilele</string>
+    <string name="preloader_installing_redist_single">Se instalează redistribuibilul</string>
+    <string name="preloader_installing_named_redist">Se instalează %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Se instalează %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistribuibile pregătite</string>
+    <string name="preloader_no_redists">Nu există redistribuibile de instalat</string>
+    <string name="preloader_steam_service_running">Serviciul Steam rulează</string>
+    <string name="preloader_launching_game">Se lansează %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher a eșuat — se pregătesc din nou resursele</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher nu a putut porni. Se pregătește din nou — relansează</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher a ajuns la joc, dar acesta nu a pornit</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Se încarcă elementele Workshop</string>
+    <string name="workshop_search_items">Caută elemente Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Se preiau obiectele tale abonate de la Steam.</string>
+    <string name="workshop_error_title">Articolele din Workshop nu au putut fi încărcate</string>
+    <string name="workshop_error_subtitle">Ceva n-a mers bine. Încearcă din nou.</string>
+    <string name="workshop_empty_title">Niciun articol abonat din Workshop</string>
+    <string name="workshop_empty_subtitle">Abonează-te la articole în Steam Workshop, apoi redeschide această fereastră.</string>
+    <string name="workshop_search_empty_title">Niciun articol nu corespunde cu \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Încearcă alt termen de căutare.</string>
+    <string name="workshop_clear_search">Șterge căutarea</string>
+    <string name="workshop_item_fallback">Articol din Workshop</string>
+    <string name="common_ui_failed">Eșuat</string>
+    <string name="steam_presence_snooze">Inactiv</string>
+    <string name="steam_presence_busy">Ocupat</string>
+    <string name="steam_presence_looking_to_trade">Caută schimburi</string>
+    <string name="steam_presence_looking_to_play">Caută să joace</string>
+    <string name="steam_friends_count">Prieteni — %1$d online</string>
+    <string name="steam_friends_section_in_game">În joc (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Niciun prieten încărcat încă.</string>
+    <string name="steam_friends_chat_off">Chatul este dezactivat. Reactivează Serviciul de chat pentru a-ți vedea prietenii.</string>
+    <string name="steam_friends_self_you">Tu</string>
+    <string name="steam_friends_in_game">În joc</string>
+    <string name="steam_friends_join">Alătură-te</string>
+    <string name="steam_friends_play">Joacă</string>
+    <string name="steam_chat_image_failed">(imaginea nu a putut fi trimisă)</string>
+    <string name="steam_chat_empty">Niciun mesaj încă. Salută!</string>
+    <string name="steam_chat_uploading_image">Se încarcă imaginea…</string>
+    <string name="steam_chat_send_image">Trimite imagine</string>
+    <string name="steam_chat_message_hint">Mesaj…</string>
+    <string name="steam_chat_send">Trimite</string>
+    <string name="steam_chat_image">Imagine</string>
+    <string name="steam_common_back">Înapoi</string>
+    <string name="steam_achievements_title">Realizări</string>
+    <string name="steam_achievements_empty">Nicio realizare găsită pentru acest joc,\nsau conectează-te la Steam pentru a le încărca.</string>
+    <string name="steam_achievements_hidden">Realizare ascunsă</string>
+    <string name="steam_achievements_hidden_desc">Continuă să joci pentru a dezvălui această realizare.</string>
+    <string name="steam_achievements_unlocked_on">Deblocat %1$s</string>
+    <string name="steam_achievements_unlocked">Deblocat</string>
+    <string name="steam_join_joining">Te alături lui %1$s în %2$s…</string>
+    <string name="steam_join_install">Instalează %1$s pentru a te alătura lui %2$s</string>
+    <string name="steam_join_not_owned">Nu deții %1$s</string>
+    <string name="steam_chat_not_sent">(netrimis)</string>
+    <string name="steam_join_the_game">jocul</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Serviciu de chat</string>
+    <string name="steam_chat_setting_service_desc">Conectează-te pentru a-ți vedea prietenii și a discuta; dezactivează pentru a apărea offline</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Ieșire</string>
+    <string name="display_output_prompt_title">Ecran extern detectat</string>
+    <string name="display_output_prompt_message">Trimiteți jocul către ecranul conectat? Comenzile de pe ecran și meniul rămân pe acest telefon.</string>
+    <string name="display_output_prompt_swap">Comută ecranele</string>
+    <string name="display_output_prompt_mirror">Oglindește</string>
+    <string name="display_output_swapped_toast">Joc mutat pe ecranul extern. Comenzile rămân pe telefon.</string>
+    <string name="display_output_cast_unavailable">Setările pentru ecran wireless nu sunt disponibile pe acest dispozitiv.</string>
+    <string name="display_output_restored_toast">Ecran extern deconectat — jocul a revenit pe telefon.</string>
+    <string name="session_drawer_output_title">Ieșire ecran</string>
+    <string name="session_drawer_output_subtitle">Jocul este afișat pe ecranul extern.</string>
+    <string name="session_drawer_output_device">Ecran conectat</string>
+    <string name="session_drawer_output_resolution">Rezoluție</string>
+    <string name="session_drawer_output_refresh_rate">Rată de reîmprospătare</string>
+    <string name="session_drawer_output_aspect_ratio">Raport de aspect</string>
+    <string name="session_drawer_output_aspect_fit">Potrivire (aspect)</string>
+    <string name="session_drawer_output_aspect_stretch">Întinde (umple)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (decupează)</string>
+    <string name="session_drawer_output_return_to_phone">Înapoi la telefon</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Proiectează pe un televizor</string>
+    <string name="session_drawer_output_cast_body">Conectează un adaptor USB-C / HDMI sau atinge mai jos pentru a conecta un ecran wireless (Miracast / Wi-Fi Direct). Jocul apare pe televizor, iar aceste comenzi rămân pe telefon.</string>
+    <string name="session_drawer_output_cast_button">Conectează ecran wireless</string>
+    <string name="session_drawer_output_cast_note">Televizoarele doar cu Chromecast nu pot afișa jocul live cu comenzi private — folosește un ecran wireless sau un adaptor USB‑C/HDMI pentru cel mai bun rezultat.</string>
+    <string name="session_drawer_output_render_note">Modurile raportate de ecran îi schimbă ieșirea reală (poate deveni negru o clipă în timp ce se reinițializează). Alte rezoluții sunt randate la acea dimensiune și scalate hardware pe panou — peste cea nativă e mai clar (supereșantionare), sub ea e mai rapid.</string>
+    <string name="session_drawer_output_scaling_note">Acest telefon redă afișajul la rezoluția sa nativă %1$s și nu schimbă modul, așa că aceasta setează rezoluția de randare — este scalată hardware pe panou (peste cea nativă crește claritatea, sub ea rulează mai rapid).</string>
+    <string name="session_drawer_output_game_mode">Mod joc (latență redusă)</string>
+    <string name="session_drawer_output_game_mode_on">Pornit</string>
+    <string name="session_drawer_output_game_mode_off">Oprit</string>
+    <string name="session_drawer_output_game_mode_note">Solicită modul joc / latență redusă al televizorului (HDMI ALLM) pentru a minimiza întârzierea la intrare. Afișat doar când ecranul conectat îl acceptă.</string>
+    <string name="session_drawer_output_send_to_display">Trimite jocul la ecran</string>
+    <string name="session_drawer_output_to_display">Ieșire pe afișaj extern</string>
+    <string name="session_drawer_output_send_note">Un ecran este conectat. Trimite-i jocul — comenzile și meniul rămân pe acest telefon. Îl poți aduce înapoi aici oricând.</string>
+    <string name="session_drawer_output_display">Ecran</string>
+    <string name="session_drawer_output_glasses">Ochelari</string>
+    <string name="session_drawer_output_brightness">Luminozitate</string>
+    <string name="session_drawer_output_shade">Umbră (atenuare)</string>
+    <string name="session_drawer_output_3d">3D (alăturat)</string>
+    <string name="glasses_panel_refresh">Rată de reîmprospătare</string>
+    <string name="glasses_panel_sunblock">Filtru solar</string>
+    <string name="session_drawer_output_volume">Volum</string>
+    <string name="session_drawer_output_glasses_note">Trimis direct la ochelarii Viture prin USB.</string>
+
+    <string name="common_ui_new">Nou</string>
+    <string name="common_ui_rename">Redenumește</string>
+    <string name="gesture_profile_export">Exportă profilul de gesturi</string>
+    <string name="gesture_profile_import">Importă profilul de gesturi</string>
+    <string name="gesture_profile_new">Profil de gesturi nou</string>
+    <string name="gesture_profile_none">Niciun profil de gesturi</string>
+    <string name="input_controls_editor_input_profiles_section">Profiluri de intrare</string>
+    <string name="session_drawer_right_stick_sensitivity">Sensibilitate stick dreapta</string>
+    <string name="session_drawer_rts_gestures">Gesturi RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Editează</string>
+    <string name="session_drawer_touch">Tactil</string>
+    <string name="session_drawer_touch_map_right_stick">Mapează pe stick dreapta</string>
+    <string name="session_drawer_touch_touchscreen">Mod ecran tactil</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_gesture_profile_section">Profil de gesturi</string>
+    <string name="session_rts_action">Acțiune</string>
+    <string name="session_rts_behavior">Comportament</string>
+    <string name="session_rts_double_tap">Atingere dublă (dublu clic stânga)</string>
+    <string name="session_rts_double_tap_delay">Întârziere atingere dublă (ms)</string>
+    <string name="session_rts_down">Jos</string>
+    <string name="session_rts_drag">Tragere cu 1 deget</string>
+    <string name="session_rts_pan1">Glisare cu 1 deget</string>
+    <string name="session_rts_drag2">Tragere cu 2 degete</string>
+    <string name="session_rts_drag_threshold">Prag tragere (px)</string>
+    <string name="session_rts_gesture_threshold">Prag gest (px)</string>
+    <string name="session_rts_hold2">Apăsare cu 2 degete</string>
+    <string name="session_rts_hold3">Apăsare cu 3 degete</string>
+    <string name="session_rts_hold4">Apăsare cu 4 degete</string>
+    <string name="session_rts_hold_delay">Întârziere apăsare (ms)</string>
+    <string name="session_rts_left">Stânga</string>
+    <string name="session_rts_long_press">Apăsare lungă</string>
+    <string name="session_rts_long_press_delay">Întârziere apăsare lungă (ms)</string>
+    <string name="session_rts_pan">Glisare cu 2 degete</string>
+    <string name="session_rts_pan_threshold">Start glisare/ciupire (px)</string>
+    <string name="session_rts_right">Dreapta</string>
+    <string name="session_rts_swipe3">Glisare cu 3 degete</string>
+    <string name="session_rts_swipe4">Glisare cu 4 degete</string>
+    <string name="session_rts_swipe_threshold">Prag glisare (px)</string>
+    <string name="session_rts_tap1">Atingere cu 1 deget</string>
+    <string name="session_rts_tap2">Atingere cu 2 degete</string>
+    <string name="session_rts_tap3">Atingere cu 3 degete</string>
+    <string name="session_rts_tap4">Atingere cu 4 degete</string>
+    <string name="session_rts_up">Sus</string>
+    <string name="session_rts_zoom">Zoom prin ciupire</string>
+    <string name="session_drawer_brightness">Luminozitate</string>
+    <string name="session_drawer_contrast">Contrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_saturation">Saturație</string>
+    <string name="session_drawer_temperature">Temperatură</string>
+    <string name="session_drawer_tint">Nuanță</string>
+    <string name="session_drawer_intensity">Intensitate</string>
+    <string name="session_drawer_strength">Putere</string>
+    <string name="session_drawer_sharpen">Claritate</string>
+    <string name="session_drawer_scanlines">Linii de scanare</string>
+    <string name="session_drawer_pixelate">Pixelare</string>
+    <string name="session_drawer_block_size">Dimensiune bloc</string>
+    <string name="session_drawer_scale">Scalare</string>
+    <string name="session_drawer_scale_nearest">Cel mai apropiat</string>
+    <string name="session_drawer_scale_linear">Liniar</string>
+    <string name="session_drawer_scale_bicubic">Bicubic</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Caricatură</string>
+    <string name="session_drawer_color_blind">Daltonism</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Resetează efectele</string>
+    <string name="session_drawer_hud_background">Fundal</string>
+    <string name="session_drawer_hud_background_alpha">Alfa fundal</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Setează alfa fundalului</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Ajustează dimensiunea</string>
+    <string name="session_task_bring_to_front">Adu în față</string>
+    <string name="session_task_custom_value">Valoare personalizată</string>
+    <string name="session_gyroscope_orientation_mode">Înclină pentru a ținti (orientare)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Fisiere</string>
+    <string name="file_manager_copy">Copiaza</string>
+    <string name="file_manager_cut">Decupeaza</string>
+    <string name="file_manager_paste">Lipeste</string>
+    <string name="file_manager_paste_here">Lipeste aici</string>
+    <string name="file_manager_new_folder">Folder nou</string>
+    <string name="file_manager_new_folder_short">Folder</string>
+    <string name="file_manager_multi_select">Alege</string>
+    <string name="file_manager_create">Creeaza</string>
+    <string name="file_manager_delete">Sterge</string>
+    <string name="file_manager_copy_count">Copiaza (%1$d)</string>
+    <string name="file_manager_cut_count">Decupeaza (%1$d)</string>
+    <string name="file_manager_delete_count">Sterge (%1$d)</string>
+    <string name="file_manager_extract">Extrage</string>
+    <string name="file_manager_extract_here">Extrage aici</string>
+    <string name="file_manager_extract_to">Extrage in…</string>
+    <string name="file_manager_extracting">Se extrage %1$s</string>
+    <string name="file_manager_extract_failed">Extragere esuata</string>
+    <string name="file_manager_run_boot">Ruleaza / Porneste</string>
+    <string name="file_manager_create_shortcut">Creeaza comanda rapida</string>
+    <string name="file_manager_run_in_container">Ruleaza in container</string>
+    <string name="file_manager_no_containers">Niciun container disponibil</string>
+    <string name="file_manager_delete_confirm">Stergi \"%1$s\"? Aceasta actiune nu poate fi anulata.</string>
+    <string name="file_manager_delete_confirm_multi">Stergi %1$d elemente? Aceasta actiune nu poate fi anulata.</string>
+    <string name="file_manager_copying">Se copiaza %1$s</string>
+    <string name="file_manager_moving">Se muta %1$s</string>
+    <string name="file_manager_copying_count">Se copiaza %1$d elemente</string>
+    <string name="file_manager_moving_count">Se muta %1$d elemente</string>
+    <string name="file_manager_paste_into_itself">Nu poti lipi un folder in el insusi</string>
+    <string name="file_manager_operation_failed">Operatiunea a esuat</string>
+    <string name="file_manager_delete_failed">Stergerea a esuat</string>
+    <string name="file_manager_rename_failed">Redenumirea a esuat</string>
+    <string name="file_manager_create_folder_failed">Crearea folderului a esuat</string>
+    <string name="cloud_saves_google_backup_helper">Salvează o copie în Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Backup pe Google</string>
+    <string name="cloud_saves_google_backup_no_save">Nu s-au găsit fișiere salvate pentru backup.</string>
+    <string name="cloud_saves_history_cloud_readonly">Doar citire</string>
+    <string name="session_drawer_rail_label_record">Înregistrează</string>
+    <string name="session_record_failed">Nu s-a putut porni înregistrarea</string>
+    <string name="session_record_fps">Rata cadrelor</string>
+    <string name="session_record_include_ui">Înregistrează interfața</string>
+    <string name="session_record_include_ui_subtitle">Include HUD și comenzile de pe ecran</string>
+    <string name="session_record_now">Înregistrează acum</string>
+    <string name="session_record_quality">Calitate</string>
+    <string name="session_record_resolution">Rezoluție</string>
+    <string name="session_record_saved">Înregistrare salvată în WinNative/Recordings</string>
+    <string name="session_record_settings_title">Setări de înregistrare</string>
+    <string name="session_record_started">Înregistrare pornită</string>
+    <string name="steam_chat_setting_stay_running">Rulează în fundal</string>
+    <string name="steam_chat_setting_stay_running_desc">Menține chatul activ după ce ieși din WinNative</string>
+    <string name="settings_content_refresh">Reîmprospătează</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Transferă salvarea</string>
+    <string name="retro_save_transfer_message">Importă o salvare locală în acest joc sau exportă salvarea curentă.</string>
+    <string name="retro_save_transfer_import">Importă salvarea</string>
+    <string name="retro_save_transfer_export">Exportă salvarea</string>
+    <string name="retro_save_transfer_import_ok">Salvare importată</string>
+    <string name="retro_save_transfer_import_failed">Salvarea nu a putut fi importată</string>
+    <string name="retro_save_transfer_export_ok">Salvare exportată</string>
+    <string name="retro_save_transfer_export_failed">Salvarea nu a putut fi exportată</string>
+    <string name="retro_save_transfer_none">Nu există încă o salvare pentru acest joc</string>
+    <string name="retro_cheats_title">Coduri</string>
+    <string name="retro_cheats_hardcore_blocked">Codurile sunt dezactivate în modul Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Salvează</string>
+    <string name="retro_ps2_cancel">Anulează</string>
+    <string name="retro_ps2_save_state">Salvare de stare</string>
+    <string name="retro_ps2_load_save_state">Încarcă salvarea de stare</string>
+    <string name="retro_ps2_achievements">Realizări</string>
+    <string name="retro_ps2_cheats">Coduri</string>
+    <string name="retro_ps2_memory_cards">Carduri de memorie</string>
+    <string name="retro_ps2_fast_forward">Derulare rapidă</string>
+    <string name="retro_ps2_reset">Resetează</string>
+    <string name="retro_ps2_swap_disc">Schimbă discul</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Atinge pentru a încărca</string>
+    <string name="retro_ps2_slot_empty">Gol</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Atinge pentru a suprascrie</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Gol — atinge pentru a salva</string>
+    <string name="retro_ps2_slot_is_empty">Slotul %1$d este gol</string>
+    <string name="retro_ps2_loaded_slot">Slotul %1$d încărcat</string>
+    <string name="retro_ps2_could_not_load_slot">Nu s-a putut încărca slotul %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Salvat în slotul %1$d</string>
+    <string name="retro_ps2_save_failed">Salvarea a eșuat</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Atinge pentru a folosi</string>
+    <string name="retro_ps2_new_memory_card">Card de memorie nou</string>
+    <string name="retro_ps2_import_card">Importă card</string>
+    <string name="retro_ps2_enable_online_dev9">Activează modul online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Adaptor de rețea PS2 — repornește jocul pentru a-l atașa</string>
+    <string name="retro_ps2_ethernet_device">Dispozitiv Ethernet</string>
+    <string name="retro_ps2_dns_mode">Mod DNS</string>
+    <string name="retro_ps2_primary_dns">DNS principal</string>
+    <string name="retro_ps2_secondary_dns">DNS secundar</string>
+    <string name="retro_ps2_optional">opțional</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP automat (DHCP)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">atinge pentru a seta IP-ul (gol pentru a elimina)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Adaugă gazdă server</string>
+    <string name="retro_ps2_new_server_hostname">Nume nou de gazdă server</string>
+    <string name="retro_ps2_server_hostname_hint">ex. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Comenzi pe ecran</string>
+    <string name="retro_ps2_edit_layout">Editează aspectul</string>
+    <string name="retro_ps2_reset_layout">Resetează aspectul</string>
+    <string name="retro_ps2_layout_reset">Aspect resetat</string>
+    <string name="retro_ps2_left_stick_invert_x">Stick stâng: inversează X</string>
+    <string name="retro_ps2_left_stick_invert_y">Stick stâng: inversează Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Stick drept: inversează X</string>
+    <string name="retro_ps2_right_stick_invert_y">Stick drept: inversează Y</string>
+    <string name="retro_ps2_button_color">Culoare butoane</string>
+    <string name="retro_ps2_letter_color">Culoare litere</string>
+    <string name="retro_ps2_shadow_color">Culoare umbră</string>
+    <string name="retro_ps2_background_color">Culoare fundal</string>
+    <string name="retro_ps2_reset_colors">Resetează culorile</string>
+    <string name="retro_ps2_renderer">Motor de randare</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Scală rezoluție</string>
+    <string name="retro_ps2_scale_1x_native">1x (nativă)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Raport de aspect</string>
+    <string name="retro_ps2_aspect_stretch">Întinde</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Filtru afișaj</string>
+    <string name="retro_ps2_filter_nearest">Cel mai apropiat</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Biliniar (fin)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Biliniar (clar)</string>
+    <string name="retro_ps2_texture_filter">Filtru textură</string>
+    <string name="retro_ps2_filter_bilinear_forced">Biliniar (forțat)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Biliniar (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Biliniar (sprite-uri)</string>
+    <string name="retro_ps2_blending_accuracy">Precizie amestecare</string>
+    <string name="retro_ps2_blend_minimum">Minimă</string>
+    <string name="retro_ps2_blend_basic">De bază</string>
+    <string name="retro_ps2_blend_medium">Medie</string>
+    <string name="retro_ps2_blend_high">Ridicată</string>
+    <string name="retro_ps2_blend_full">Completă</string>
+    <string name="retro_ps2_blend_maximum">Maximă</string>
+    <string name="retro_ps2_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_ps2_shader_off">Dezactivat</string>
+    <string name="retro_ps2_shader_scanline">Linii de scanare</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triunghiular</string>
+    <string name="retro_ps2_shader_wave">Undă</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Omitere cadre</string>
+    <string name="retro_ps2_frameskip_off">Dezactivat</string>
+    <string name="retro_ps2_frameskip_1">Omite 1</string>
+    <string name="retro_ps2_frameskip_2">Omite 2</string>
+    <string name="retro_ps2_frameskip_3">Omite 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volum</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Fără sunet</string>
+    <string name="retro_ps2_swap_stereo_channels">Inversează canalele stereo</string>
+    <string name="retro_ps2_ee_cycle_rate">Frecvență cicluri EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (implicit)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Omitere cicluri EE</string>
+    <string name="retro_ps2_skip_off">Dezactivat</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 instant</string>
+    <string name="retro_ps2_mtvu">VU multi-thread (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD rapid</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Viteză emulare</string>
+    <string name="retro_ps2_hud_cpu_usage">Utilizare CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Utilizare GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Rezoluție internă</string>
+    <string name="retro_ps2_deinterlace_mode">Mod deîntrețesere</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Dezactivat</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Raport de aspect FMV</string>
+    <string name="retro_ps2_anti_blur">Anti-neclaritate</string>
+    <string name="retro_ps2_widescreen_patches">Patch-uri widescreen</string>
+    <string name="retro_ps2_no_interlace_patches">Patch-uri fără întrețesere</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Detectare buclă INTC</string>
+    <string name="retro_ps2_wait_loop">Detectare buclă de așteptare</string>
+    <string name="retro_ps2_time_stretch">Întindere temporală audio</string>
+    <string name="retro_ps2_audio_buffer">Buffer audio</string>
+    <string name="retro_ps2_audio_latency">Latență de ieșire</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Timpi de cadru</string>
+    <string name="retro_ps2_hud_gs_stats">Statistici GS</string>
+    <string name="retro_ps2_hud_hw_info">Informații hardware</string>
+    <string name="retro_ps2_hud_version">Versiune</string>
+    <string name="retro_ps2_hud_input_display">Afișare intrări</string>
+    <string name="retro_ps2_tab_menu">Meniu</string>
+    <string name="retro_ps2_tab_display">Afișaj</string>
+    <string name="retro_ps2_tab_performance">Performanță</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Sunet</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Comenzi</string>
+    <string name="retro_ps2_resume">Reia</string>
+    <string name="retro_ps2_pause">Pauză</string>
+    <string name="retro_ps2_exit">Ieșire</string>
+    <string name="retro_lr_bios_imported">BIOS importat: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Fișier BIOS nevalid</string>
+    <string name="retro_lr_invalid_retro_game">Joc retro nevalid</string>
+    <string name="retro_lr_rom_not_found">ROM negăsit: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Nu s-a putut citi ROM-ul din această arhivă</string>
+    <string name="retro_lr_core_not_installed">Core neinstalat: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Coduri activate — realizările sunt dezactivate pentru această sesiune</string>
+    <string name="retro_lr_cloud_save_restored">Salvare din cloud restaurată</string>
+    <string name="retro_lr_restore_failed">Restaurarea a eșuat</string>
+    <string name="retro_lr_cloud_conflict_message">Există o salvare din cloud mai recentă pentru %1$s. Dorești să sincronizezi și pe care salvare din cloud preferi să o păstrezi?</string>
+    <string name="retro_lr_cloud_save">Salvare din cloud</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Încărcarea core-ului de emulare a eșuat</string>
+    <string name="retro_lr_failed_load_rom">Încărcarea ROM-ului a eșuat</string>
+    <string name="retro_lr_graphics_not_supported">Grafica nu este acceptată pentru acest core</string>
+    <string name="retro_lr_emulator_error">Eroare de emulator</string>
+    <string name="retro_lr_shader_default">Implicit</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Clar</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Mărire SGSR</string>
+    <string name="retro_lr_upscale_native">Nativă</string>
+    <string name="retro_lr_sound">Sunet</string>
+    <string name="retro_lr_left_stick_invert_x">Stick stâng: inversează X</string>
+    <string name="retro_lr_left_stick_invert_y">Stick stâng: inversează Y</string>
+    <string name="retro_lr_right_stick_invert_x">Stick drept: inversează X</string>
+    <string name="retro_lr_right_stick_invert_y">Stick drept: inversează Y</string>
+    <string name="retro_lr_on_screen_controls">Comenzi pe ecran</string>
+    <string name="retro_lr_haptic_feedback">Feedback haptic</string>
+    <string name="retro_lr_portrait">Portret</string>
+    <string name="retro_lr_landscape">Peisaj</string>
+    <string name="retro_lr_edit_layout">Editează aspectul (%1$s)</string>
+    <string name="retro_lr_reset_layout">Resetează aspectul %1$s</string>
+    <string name="retro_lr_layout_reset">Aspect %1$s resetat</string>
+    <string name="retro_lr_button_color">Culoare butoane</string>
+    <string name="retro_lr_letter_color">Culoare litere</string>
+    <string name="retro_lr_shadow_color">Culoare umbră</string>
+    <string name="retro_lr_background_color">Culoare fundal</string>
+    <string name="retro_lr_reset_colors">Resetează culorile</string>
+    <string name="retro_lr_colors_reset">Culori resetate</string>
+    <string name="retro_lr_performance_hud">HUD performanță</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Alfa fundal</string>
+    <string name="retro_lr_background">Fundal</string>
+    <string name="retro_lr_scale">Scală</string>
+    <string name="retro_lr_numeric_frametime">Timp de cadru numeric</string>
+    <string name="retro_lr_dual_series_battery">Baterie dublă serie</string>
+    <string name="retro_lr_hud_elements">ELEMENTE HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Consolă</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Baterie</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Grafic</string>
+    <string name="retro_lr_hud_cpu_temp">Temp. CPU</string>
+    <string name="retro_lr_save_state">Salvare de stare</string>
+    <string name="retro_lr_load_save_state">Încarcă salvarea de stare</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Încărcarea salvărilor este dezactivată în modul Hardcore</string>
+    <string name="retro_lr_achievements">Realizări</string>
+    <string name="retro_lr_cheats">Coduri</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Codurile sunt dezactivate în modul Hardcore</string>
+    <string name="retro_lr_reset">Resetează</string>
+    <string name="retro_lr_fast_forward">Derulare rapidă</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Derularea rapidă este dezactivată în modul Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disc %1$d/%2$d</string>
+    <string name="retro_lr_resume">Reia</string>
+    <string name="retro_lr_pause">Pauză</string>
+    <string name="retro_lr_exit">Ieșire</string>
+    <string name="retro_lr_saved_to_slot">Salvat în slotul %1$d</string>
+    <string name="retro_lr_could_not_save_state">Nu s-a putut salva starea</string>
+    <string name="retro_lr_bios_required_title">BIOS %1$s necesar</string>
+    <string name="retro_lr_bios_required_message">Jocurile PlayStation au nevoie de un fișier BIOS real de consolă pe care trebuie să îl furnizezi. Importă un BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin sau scph7001.bin) pentru a continua.</string>
+    <string name="retro_lr_import_bios">Importă BIOS…</string>
+    <string name="retro_lr_cancel">Anulează</string>
+    <string name="retro_lr_slot_empty">Slotul %1$d este gol</string>
+    <string name="retro_lr_loaded_slot">Slotul %1$d încărcat</string>
+    <string name="retro_lr_could_not_load_state">Nu s-a putut încărca starea</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Redenumește slotul %1$d</string>
+    <string name="retro_gs_section_general">General</string>
+    <string name="retro_gs_section_graphics">Grafică</string>
+    <string name="retro_gs_section_performance">Performanță</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Intrare</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Anulează</string>
+    <string name="retro_gs_save">Salvează</string>
+    <string name="retro_gs_shader_default">Implicit</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Clar</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Nativă</string>
+    <string name="retro_gs_group_game">JOC</string>
+    <string name="retro_gs_label_name">Nume</string>
+    <string name="retro_gs_label_system">Sistem</string>
+    <string name="retro_gs_label_emulator_core">Core emulator</string>
+    <string name="retro_gs_label_rom_path">Cale ROM</string>
+    <string name="retro_gs_group_bios">BIOS %1$s</string>
+    <string name="retro_gs_label_installed">Instalat</string>
+    <string name="retro_gs_bios_none">Niciunul — necesar pentru a rula jocurile %1$s</string>
+    <string name="retro_gs_import_bios">Importă BIOS…</string>
+    <string name="retro_gs_remove_bios">Elimină BIOS</string>
+    <string name="retro_gs_group_library_artwork">GRAFICĂ BIBLIOTECĂ</string>
+    <string name="retro_gs_artwork_game_card">Imagine fișă joc</string>
+    <string name="retro_gs_artwork_grid">Imagine grilă</string>
+    <string name="retro_gs_artwork_carousel">Imagine carusel</string>
+    <string name="retro_gs_artwork_list">Imagine listă</string>
+    <string name="retro_gs_artwork_custom_set">Imagine personalizată setată</string>
+    <string name="retro_gs_artwork_set_image">Setează imaginea</string>
+    <string name="retro_gs_artwork_remove">Elimină</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Filtru video</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Mărire SGSR</string>
+    <string name="retro_gs_performance_hud">HUD performanță</string>
+    <string name="retro_gs_group_core">CORE</string>
+    <string name="retro_gs_renderer">Motor de randare</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Scală rezoluție</string>
+    <string name="retro_gs_scale_1x_native">1x (nativă)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Raport de aspect</string>
+    <string name="retro_gs_aspect_stretch">Întinde</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Filtru afișaj</string>
+    <string name="retro_gs_filter_nearest">Cel mai apropiat</string>
+    <string name="retro_gs_filter_bilinear_smooth">Biliniar (fin)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Biliniar (clar)</string>
+    <string name="retro_gs_texture_filter">Filtru textură</string>
+    <string name="retro_gs_filter_bilinear_forced">Biliniar (forțat)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Biliniar (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Biliniar (sprite-uri)</string>
+    <string name="retro_gs_blending_accuracy">Precizie amestecare</string>
+    <string name="retro_gs_blend_minimum">Minimă</string>
+    <string name="retro_gs_blend_basic">De bază</string>
+    <string name="retro_gs_blend_medium">Medie</string>
+    <string name="retro_gs_blend_high">Ridicată</string>
+    <string name="retro_gs_blend_full">Completă</string>
+    <string name="retro_gs_blend_maximum">Maximă</string>
+    <string name="retro_gs_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_gs_off">Dezactivat</string>
+    <string name="retro_gs_tvshader_scanline">Linii de scanare</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triunghiular</string>
+    <string name="retro_gs_tvshader_wave">Undă</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Omitere cadre</string>
+    <string name="retro_gs_frameskip_1">Omite 1</string>
+    <string name="retro_gs_frameskip_2">Omite 2</string>
+    <string name="retro_gs_frameskip_3">Omite 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">PERFORMANȚĂ</string>
+    <string name="retro_gs_ee_cycle_rate">Frecvență cicluri EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (implicit)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Omitere cicluri EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 instant</string>
+    <string name="retro_gs_mtvu">VU multi-thread (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD rapid</string>
+    <string name="retro_gs_group_performance_hud">HUD PERFORMANȚĂ</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Viteză emulare</string>
+    <string name="retro_gs_hud_cpu_usage">Utilizare CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Utilizare GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Rezoluție internă</string>
+    <string name="retro_gs_deinterlace_mode">Mod deîntrețesere</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Dezactivat</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Raport de aspect FMV</string>
+    <string name="retro_gs_anti_blur">Anti-neclaritate</string>
+    <string name="retro_gs_widescreen_patches">Patch-uri widescreen</string>
+    <string name="retro_gs_no_interlace_patches">Patch-uri fără întrețesere</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Detectare buclă INTC</string>
+    <string name="retro_gs_wait_loop">Detectare buclă de așteptare</string>
+    <string name="retro_gs_time_stretch">Întindere temporală audio</string>
+    <string name="retro_gs_audio_buffer">Buffer audio</string>
+    <string name="retro_gs_audio_latency">Latență de ieșire</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Timpi de cadru</string>
+    <string name="retro_gs_hud_gs_stats">Statistici GS</string>
+    <string name="retro_gs_hud_hw_info">Informații hardware</string>
+    <string name="retro_gs_hud_version">Versiune</string>
+    <string name="retro_gs_hud_input_display">Afișare intrări</string>
+    <string name="retro_gs_fast_boot">Pornire rapidă</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Activează modul online</string>
+    <string name="retro_gs_ethernet_device">Dispozitiv Ethernet</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Mod DNS</string>
+    <string name="retro_gs_dns_manual">Manual</string>
+    <string name="retro_gs_dns_internal">Intern</string>
+    <string name="retro_gs_primary_dns">DNS principal</string>
+    <string name="retro_gs_secondary_dns">DNS secundar</string>
+    <string name="retro_gs_dns_optional">opțional</string>
+    <string name="retro_gs_auto_ip_dhcp">IP automat (DHCP)</string>
+    <string name="retro_gs_group_input">INTRARE</string>
+    <string name="retro_engine_save">Salvează</string>
+    <string name="retro_engine_saved">Joc salvat</string>
+    <string name="retro_engine_loading">Se încarcă…</string>
+    <string name="retro_engine_load">Încarcă</string>
+    <string name="retro_engine_saved_to">Salvat în %1$s</string>
+    <string name="retro_engine_slot_active_only">Activ</string>
+    <string name="retro_engine_rename_slot">Redenumește slotul de salvare</string>
+    <string name="retro_engine_caught">%1$d capturați</string>
+    <string name="retro_engine_no_slots">Încă nu există sloturi de salvare</string>
+    <string name="retro_engine_new_slot">Slot de salvare nou</string>
+    <string name="retro_engine_achievements_unavailable">Nu este urmărit în modul 3D</string>
+    <string name="retro_engine_fullscreen">Ecran complet</string>
+    <string name="retro_engine_loaded_from">%1$s încărcat</string>
+    <string name="retro_engine_slot_empty">Acel slot este gol</string>
+    <string name="retro_engine_loading_subtitle">Se pregătesc datele jocului pentru prima dată</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Joacă acest joc în motorul voxel 3D în loc de nucleul standard</string>
+    <string name="retro_gs_on_screen_controls">Comenzi pe ecran</string>
+    <string name="retro_gs_haptic_feedback">Feedback haptic</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Volum</string>
+    <string name="retro_gs_mute">Fără sunet</string>
+    <string name="retro_gs_swap_stereo">Inversează canalele stereo</string>
+    <string name="retro_gs_sound">Sunet</string>
+    <string name="retro_scr_retro_defaults">SETĂRI RETRO IMPLICITE</string>
+    <string name="retro_scr_retro_defaults_desc">Setări implicite aplicate jocurilor fiecărei console, cu excepția celor modificate în setările proprii ale unui joc.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Cont</string>
+    <string name="retro_scr_signed_in">Conectat</string>
+    <string name="retro_scr_not_signed_in_hint">Neconectat — deschide Realizările unui joc pentru a te conecta</string>
+    <string name="retro_scr_achievements_enabled">Realizări activate</string>
+    <string name="retro_scr_hardcore_default">Mod Hardcore implicit (fără salvări de stare)</string>
+    <string name="retro_scr_sign_out">Deconectează-te</string>
+    <string name="retro_scr_playstation_bios">BIOS PLAYSTATION</string>
+    <string name="retro_scr_installed">Instalat</string>
+    <string name="retro_scr_none_ps1_bios">Niciunul — jocurile PS1 necesită un BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importă BIOS PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS PS1 eliminat</string>
+    <string name="retro_scr_no_bios_to_remove">Niciun BIOS de eliminat</string>
+    <string name="retro_scr_remove_ps1_bios">Elimină BIOS PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Niciunul — jocurile PS2 necesită un BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Dump unificat într-un singur fișier (.bin etichetat cu regiunea, ~4 MB). Seturile ROM0/MEC/NVM separate nu sunt acceptate.</string>
+    <string name="retro_scr_import_ps2_bios">Importă BIOS PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS PS2 eliminat</string>
+    <string name="retro_scr_remove_ps2_bios">Elimină BIOS PS2</string>
+    <string name="retro_scr_library_artwork">GRAFICĂ BIBLIOTECĂ</string>
+    <string name="retro_scr_retro_case_art">Grafică retro (cartuș / cutie CD)</string>
+    <string name="retro_scr_box_art">Copertă</string>
+    <string name="retro_scr_box_art_desc">Preluată automat de pe thumbnails.libretro.com la import; o imagine personalizată o înlocuiește întotdeauna.</string>
+    <string name="retro_scr_roms_folder">DOSAR ROM-URI</string>
+    <string name="retro_scr_folder">Dosar</string>
+    <string name="retro_scr_roms_not_set">Nesetat — alege un dosar pentru a importa automat jocuri</string>
+    <string name="retro_scr_auto_import">Import automat</string>
+    <string name="retro_scr_auto_import_desc">Jocurile noi din acest dosar sunt adăugate automat în bibliotecă, cu consola corectă detectată.</string>
+    <string name="retro_scr_select_roms_folder_title">Selectează dosarul ROM-urilor</string>
+    <string name="retro_scr_select_roms_folder_button">Selectează dosarul ROM-urilor…</string>
+    <string name="retro_scr_change_roms_folder_button">Schimbă dosarul ROM-urilor…</string>
+    <string name="retro_scr_scan_now">Scanează acum</string>
+    <string name="retro_scr_console_defaults">SETĂRI CONSOLĂ IMPLICITE</string>
+    <string name="retro_scr_console_defaults_desc">Atinge o consolă pentru a-i seta setările implicite.</string>
+    <string name="retro_scr_renderer">Motor de randare</string>
+    <string name="retro_scr_upscale_resolution">Rezoluție mărire</string>
+    <string name="retro_scr_aspect_ratio">Raport de aspect</string>
+    <string name="retro_scr_aspect_stretch">Întinde</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Filtru afișaj</string>
+    <string name="retro_scr_filter_nearest">Cel mai apropiat</string>
+    <string name="retro_scr_filter_bilinear_smooth">Biliniar (fin)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Biliniar (clar)</string>
+    <string name="retro_scr_texture_filter">Filtru textură</string>
+    <string name="retro_scr_filter_bilinear_forced">Biliniar (forțat)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Biliniar (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Biliniar (sprite-uri)</string>
+    <string name="retro_scr_blending_accuracy">Precizie amestecare</string>
+    <string name="retro_scr_blend_minimum">Minimă</string>
+    <string name="retro_scr_blend_basic">De bază</string>
+    <string name="retro_scr_blend_medium">Medie</string>
+    <string name="retro_scr_blend_high">Ridicată</string>
+    <string name="retro_scr_blend_full">Completă</string>
+    <string name="retro_scr_blend_maximum">Maximă</string>
+    <string name="retro_scr_crt_tv_shader">Shader CRT / TV</string>
+    <string name="retro_scr_shader_off">Dezactivat</string>
+    <string name="retro_scr_shader_scanline">Linii de scanare</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triunghiular</string>
+    <string name="retro_scr_shader_wave">Undă</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Omitere cadre</string>
+    <string name="retro_scr_skip_1">Omite 1</string>
+    <string name="retro_scr_skip_2">Omite 2</string>
+    <string name="retro_scr_skip_3">Omite 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">Frecvență cicluri EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (implicit)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Omitere cicluri EE</string>
+    <string name="retro_scr_skip_off">Dezactivat</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 instant</string>
+    <string name="retro_scr_mtvu">VU multi-thread (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD rapid</string>
+    <string name="retro_scr_touch_controls">Comenzi tactile pe ecran</string>
+    <string name="retro_scr_sound">Sunet</string>
+    <string name="retro_scr_swap_stereo">Inversează canalele stereo</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: viteză emulare</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: utilizare CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: utilizare GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: rezoluție internă</string>
+    <string name="retro_scr_enable_online_dev9">Activează modul online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Dispozitiv Ethernet</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Mod DNS</string>
+    <string name="retro_scr_dns_manual">Manual</string>
+    <string name="retro_scr_dns_internal">Intern</string>
+    <string name="retro_scr_primary_dns">DNS principal</string>
+    <string name="retro_scr_secondary_dns">DNS secundar</string>
+    <string name="retro_scr_optional">opțional</string>
+    <string name="retro_scr_auto_ip_dhcp">IP automat (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">Mărire SGSR</string>
+    <string name="retro_scr_performance_hud">HUD performanță</string>
+    <string name="retro_scr_credits_licenses">CREDITE &amp; LICENȚE</string>
+    <string name="retro_scr_credits_desc">Unele funcții ale WinNative sunt construite pe aceste proiecte open-source. Atinge pentru a vedea fiecare sursă.</string>
+    <string name="retro_scr_tab_defaults">Implicite</string>
+    <string name="retro_scr_tab_credits">Credite</string>
+    <string name="retro_scr_enable_hardcore_title">Activezi modul Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">Modul Hardcore resetează jocul acum și dezactivează încărcarea salvărilor de stare, derularea rapidă și codurile. Orice progres nesalvat va fi pierdut. Continui?</string>
+    <string name="retro_scr_cancel">Anulează</string>
+    <string name="retro_scr_enable">Activează</string>
+    <string name="retro_scr_bios_imported">BIOS importat: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Fișier BIOS nevalid</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS PS2 importat: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Fișier BIOS PS2 nevalid</string>
+    <string name="retro_scr_no_game_serial">Niciun număr de serie al jocului pentru a căuta coduri.</string>
+    <string name="retro_scr_applied_cheats">S-au aplicat %1$d cod(uri).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Nu s-au putut aplica codurile.</string>
+    <string name="retro_scr_cheats">Coduri</string>
+    <string name="retro_scr_apply">Aplică</string>
+    <string name="retro_scr_no_cheats_found">Niciun cod găsit pentru acest joc.</string>
+    <string name="retro_scr_achievements">Realizări</string>
+    <string name="retro_scr_sign_in_ra">Conectează-te la RetroAchievements</string>
+    <string name="retro_scr_username">Nume de utilizator</string>
+    <string name="retro_scr_password">Parolă</string>
+    <string name="retro_scr_login_failed">Conectarea a eșuat</string>
+    <string name="retro_scr_signing_in">Conectare în curs…</string>
+    <string name="retro_scr_sign_in">Conectează-te</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pct</string>
+    <string name="retro_scr_no_achievements">Nicio realizare pentru acest joc.</string>
+    <string name="retro_scr_back">Înapoi</string>
+    <string name="retro_scr_enabled">Activat</string>
+    <string name="retro_scr_disabled">Dezactivat</string>
+    <string name="retro_scr_rename">Redenumește</string>
+    <string name="retro_scr_save">Salvează</string>
+    <string name="retro_scr_cloud_save_conflict">Conflict de salvare din cloud</string>
+    <string name="retro_scr_keep_local_save">Păstrează salvarea locală</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Meniu</string>
+    <string name="retro_tab_display">Afișaj</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Sunet</string>
+    <string name="retro_tab_controls">Comenzi</string>
+    <string name="retro_scan_up_to_date">Bibliotecă actualizată</string>
+    <string name="retro_scan_roms">ROM-uri: %1$s</string>
+    <string name="retro_scan_added">%1$d adăugate</string>
+    <string name="retro_scan_removed">%1$d eliminate</string>
+    <string name="retro_scr_shader_default">Implicit</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Clar</string>
+    <string name="retro_scr_upscale_native">Nativă</string>
+    <string name="retro_co_aspect_ratio">Raport de aspect</string>
+    <string name="retro_co_ntsc_filter">Filtru NTSC</string>
+    <string name="retro_co_colorization">Colorare</string>
+    <string name="retro_co_color_correction">Corecție de culoare</string>
+    <string name="retro_co_remove_sprite_limit">Elimină limita de sprite-uri</string>
+    <string name="retro_co_resolution">Rezoluție</string>
+    <string name="retro_co_framebuffer_emulation">Emulare framebuffer</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Hack ecran lat</string>
+    <string name="retro_co_val_8_7_native">8:7 (nativă)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Dezactivat</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Compozit</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">Ecran GBA</string>
+    <string name="retro_co_val_gbc_screen">Ecran GBC</string>
+    <string name="retro_co_val_on">Activat</string>
+    <string name="retro_co_val_320x240_native">320x240 (nativă)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ajustat</string>
+    <string name="retro_co_val_native">Nativă</string>
+    <string name="retro_co_val_internal">Internă</string>
+    <string name="retro_co_val_on_16_9">Activat (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Conectează-te cu contul tău RetroAchievements pentru a câștiga și urmări realizări pentru jocuri retro.</string>
+    <string name="retro_ach_username">Nume de utilizator</string>
+    <string name="retro_ach_password">Parolă</string>
+    <string name="retro_ach_enter_credentials">Introdu numele de utilizator și parola</string>
+    <string name="retro_ach_login_failed">Conectarea a eșuat</string>
+    <string name="retro_ach_sign_in">Conectează-te</string>
+    <string name="retro_ach_password_disclaimer">Parola ta este folosită o singură dată pentru a obține un token de conectare, stocat în siguranță pe dispozitiv.</string>
+    <string name="retro_ach_achievements_enabled">Realizări activate</string>
+    <string name="retro_ach_hardcore_mode">Mod Hardcore (fără salvări de stare)</string>
+    <string name="retro_ach_points">%1$d / %2$d puncte</string>
+    <string name="retro_ach_none_found">Nicio realizare găsită pentru acest joc.</string>
+    <string name="retro_ach_sign_out">Deconectează-te</string>
+    <string name="retro_che_brand">CODURI</string>
+    <string name="retro_che_name">Nume</string>
+    <string name="retro_che_code">Cod</string>
+    <string name="retro_che_cancel">Anulează</string>
+    <string name="retro_che_save">Salvează</string>
+    <string name="retro_che_default_name">Cod %1$d</string>
+    <string name="retro_che_empty">Niciun cod încă. Adaugă un cod pentru acest joc.</string>
+    <string name="retro_che_add">Adaugă cod</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Driver GPU</string>
+    <string name="retro_gpu_driver_system">Sistem (Implicit)</string>
+    <string name="retro_gpu_driver_hint">Instalează driverele Turnip din Setări \u2192 Drivere. Aceleași drivere funcționează atât pentru jocurile PC, cât și PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Unitate internă virtuală pentru jocuri bazate pe HDD precum Final Fantasy XI. Repornește jocul.</string>
+    <string name="retro_ps2_hdd_desc">Unitate internă virtuală pentru jocuri bazate pe HDD precum Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Mod DNS setat pe Internal pentru ca gazdele tale de server personalizate să aibă efect.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">Nucleu CPU</string>
+    <string name="retro_co_dual_core">Dublu nucleu</string>
+    <string name="retro_co_internal_cheats">Coduri interne</string>
+    <string name="retro_co_internal_resolution">Rezoluție internă</string>
+    <string name="retro_co_renderer">Randator</string>
+    <string name="retro_co_sensor_bar">Poziția barei de senzori</string>
+    <string name="retro_co_skip_gc_bios">Omite introducerea BIOS</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">Jos</string>
+    <string name="retro_co_val_cached_interpreter">Interpretor în cache</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_interpreter">Interpretor</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">Mouse / Atingere</string>
+    <string name="retro_co_val_right_stick_absolute">Stick dreapta (Absolut)</string>
+    <string name="retro_co_val_right_stick_relative">Stick dreapta (Relativ)</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_val_stretch">Întindere</string>
+    <string name="retro_co_val_top">Sus</string>
+    <string name="retro_co_vbi_skip">Omitere VBI (Săritură automată de cadre)</string>
+    <string name="retro_co_widescreen">Ecran lat</string>
+    <string name="retro_co_wiimote_pointer">Indicator Wiimote</string>
+    <string name="retro_gs_cheats_apply_note">Modificările se aplică data viitoare când pornești acest joc.</string>
+    <string name="retro_gs_cheats_detect_hint">Pornește acest joc o dată pentru ca seria discului să poată fi detectată, apoi codurile și patch-urile vor apărea aici.</string>
+    <string name="retro_gs_dnas_entry_desc">Ocolire autentificare DNAS — necesară pentru jocul online</string>
+    <string name="retro_gs_dnas_group">Aplicat automat (Online)</string>
+    <string name="retro_gs_group_cheats">Coduri &amp; Patch-uri</string>
+    <string name="retro_gs_hdd_image_size">Dimensiune: %1$s</string>
+    <string name="retro_gs_hdd_import">Importă imagine HDD</string>
+    <string name="retro_gs_hdd_remove_short">Elimină</string>
+    <string name="retro_gs_netplay_enable">Activează NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Dezactivat implicit. Activează, apoi alege Găzduire sau Alăturare înainte de pornire.\nSe dezactivează din nou când ieși din joc.</string>
+    <string name="retro_gs_netplay_host">Adresă gazdă</string>
+    <string name="retro_gs_netplay_host_hint">IP sau nume de gazdă</string>
+    <string name="retro_gs_netplay_host_mode">Sesiune de găzduire</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">Pornit = așteaptă un jucător. Oprit = alătură-te adresei gazdei</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay folosește porturi de multiplayer local prin TCP (jucătorul 1 gazdă / jucătorul 2 client). Online-ul PS2 folosește în schimb Ethernet DEV9.</string>
+    <string name="retro_gs_netplay_port">Port</string>
+    <string name="retro_lr_memory_card_slot">Card de memorie %1$d</string>
+    <string name="retro_lr_screenshot">Captură de ecran</string>
+    <string name="retro_lr_use_cloud_save">Folosește salvarea în cloud</string>
+    <string name="retro_netplay_conn_direct">LAN (IP direct)</string>
+    <string name="retro_netplay_connecting">Se conectează…</string>
+    <string name="retro_netplay_connection">Conexiune</string>
+    <string name="retro_netplay_conn_traversal">Online (cod gazdă)</string>
+    <string name="retro_netplay_dismiss">Închide</string>
+    <string name="retro_netplay_dolphin_help">NetPlay pentru GameCube/Wii folosește propriul motor Dolphin. Gazdă = Jucătorul 1, Alăturare = Jucătorul 2. Alege Găzduire sau Alăturare și un tip de conexiune înainte de pornire; ambele dispozitive pornesc împreună același joc.</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Partajează IP-ul Wi‑Fi al dispozitivului tău și acest port cu Jucătorul 2. Jocul pornește automat odată ce se conectează.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">Un cod gazdă este afișat când pornește jocul — partajează-l cu Jucătorul 2. Jocul pornește automat odată ce se conectează.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Introdu IP-ul Wi‑Fi al gazdei și portul, apoi pornește pentru a te conecta.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Introdu codul gazdă de la Jucătorul 1, apoi pornește pentru a te conecta.</string>
+    <string name="retro_netplay_enable_before_launch">Activează NetPlay în setările jocului și alege Găzduire sau Alăturare înainte de pornire</string>
+    <string name="retro_netplay_find_rooms">Găsește camere pe Wi‑Fi</string>
+    <string name="retro_netplay_game_link_hint">Game Link · fiecare ecran este propria consolă portabilă</string>
+    <string name="retro_netplay_gba_not_ready">Multiplayer-ul GBA folosește gpSP + Adaptor wireless. Asigură-te că libgpsp este instalat.</string>
+    <string name="retro_netplay_help">Multiplayer cu ecran partajat prin Wi‑Fi (ca RetroArch).\nGazdă = Jucătorul 1, Alăturare = Jucătorul 2. Ambele dispozitive afișează același joc.</string>
+    <string name="retro_netplay_help_game_link">Game Link prin Wi‑Fi — fiecare dispozitiv rulează propriul joc.\nGB/GBC: legătură serială Gambatte (Pokémon Gen 1–2).\nGBA: Adaptor wireless gpSP (lupte Pokémon FR/LG/Emerald).</string>
+    <string name="retro_netplay_host_action">Găzduiește cameră</string>
+    <string name="retro_netplay_host_code">Cod gazdă</string>
+    <string name="retro_netplay_host_code_hint">Cod gazdă de traversare de la gazdă</string>
+    <string name="retro_netplay_hosting_room">Se găzduiește camera</string>
+    <string name="retro_netplay_host_mode_hint">Atinge Găzduire pentru a deschide o cameră pentru această sesiune de joc, apoi pornește jocul. NetPlay se dezactivează când ieși.</string>
+    <string name="retro_netplay_in_room">În cameră</string>
+    <string name="retro_netplay_join_action">Alătură-te prin IP</string>
+    <string name="retro_netplay_joined">Alăturat</string>
+    <string name="retro_netplay_join_room">Alăturare</string>
+    <string name="retro_netplay_launch_mode">La pornire</string>
+    <string name="retro_netplay_leave">Părăsește</string>
+    <string name="retro_netplay_menu_hint">Gazdă = P1 · Alăturare = P2 · același joc pe ambele ecrane</string>
+    <string name="retro_netplay_mode_host">Găzduire</string>
+    <string name="retro_netplay_mode_join">Alăturare</string>
+    <string name="retro_netplay_mode_manual">Manual</string>
+    <string name="retro_netplay_no_rooms">Nu s-au găsit camere. Asigură-te că gazda este pe același Wi‑Fi și găzduiește o cameră.</string>
+    <string name="retro_netplay_player_name">Nume afișat</string>
+    <string name="retro_netplay_player_name_hint">Afișat celorlalți jucători</string>
+    <string name="retro_netplay_players_count">%1$d conectat(i)</string>
+    <string name="retro_netplay_prelaunch_hint">Camera este deschisă doar pentru această sesiune. Pornește când ești gata. Ieșirea din joc dezactivează NetPlay.</string>
+    <string name="retro_netplay_room_players">Jucători</string>
+    <string name="retro_netplay_scan_action">Scanează Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">Scanează din nou</string>
+    <string name="retro_netplay_scan_hint">Scanează același Wi‑Fi pentru camere deschise, sau alătură-te prin adresă IP.</string>
+    <string name="retro_netplay_scanning">Se scanează Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Rezultatele scanării</string>
+    <string name="retro_netplay_select_room_hint">Atinge o cameră pentru a te alătura acum (nu salvează IP-ul pentru următoarea pornire).</string>
+    <string name="retro_netplay_stop_scan">Oprește scanarea</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s conectat</string>
+    <string name="retro_netplay_user_disconnected">%1$s deconectat</string>
+    <string name="retro_netplay_waiting_players">Se așteaptă jucători…</string>
+    <string name="retro_ps2_coming_soon">Suportul pentru PlayStation 2 va fi disponibil în curând</string>
+    <string name="retro_ps2_show_l3r3">Afișează butoanele L3 / R3</string>
+    <string name="retro_ps2_show_l3r3_subtitle">Când este oprit, atinge de două ori un stick pentru a apăsa L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">INDICATOARE DRIVER TURNIP</string>
+    <string name="retro_ps2_turnip_flags_note">Aplicate doar când un driver GPU personalizat este selectat mai sus.</string>
+    <string name="retro_rom_missing">Fișierul jocului nu a fost găsit</string>
+    <string name="retro_scr_delete">Șterge</string>
+    <string name="retro_scr_import_from_file">Importă din fișier…</string>
+    <string name="retro_scr_loading">Se încarcă…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Schimbă consola</string>
+    <string name="retro_gs_identify_as">Identifică drept consolă</string>
+    <string name="retro_gs_console_changed">Identificat acum ca %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Aplică un efect ReShade (.fx) jocurilor DXVK/VKD3D (Vulkan) prin stratul vkBasalt integrat. Pune fiecare efect în propriul folder în Android/data/&lt;package&gt;/files/ReShade/. Reglarea parametrilor în timp real și comutatorul din joc vor sosi odată cu actualizarea stratului cu reîncărcare în timp real.</string>
+    <string name="reshade_catalog_title">Efecte ReShade</string>
+    <string name="reshade_catalog_search">Caută efecte…</string>
+    <string name="reshade_catalog_installed">Instalate (%1$d)</string>
+    <string name="reshade_catalog_available">Disponibile (%1$d)</string>
+    <string name="reshade_catalog_downloading">Se descarcă</string>
+    <string name="reshade_catalog_installing">Se instalează</string>
+    <string name="reshade_catalog_offline_cache">Offline — se afișează o listă din cache. Conectează-te pentru a descărca efecte noi.</string>
+    <string name="reshade_catalog_offline_none">Offline — se afișează doar efectele instalate. Conectează-te pentru a răsfoi catalogul.</string>
+    <string name="reshade_catalog_needs_connection">Conectează-te la internet pentru a descărca efecte.</string>
+    <string name="reshade_catalog_download_failed">Descărcarea %1$s a eșuat.</string>
+    <string name="reshade_catalog_empty_query">Niciun efect nu corespunde cu \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Niciun efect disponibil. Conectează-te la internet pentru a răsfoi catalogul.</string>
+    <string name="reshade_catalog_done">Gata</string>
+    <string name="reshade_catalog_delete_cd">Șterge %1$s</string>
+    <string name="reshade_catalog_delete_title">Ștergi %1$s?</string>
+    <string name="reshade_catalog_delete_body">Aceasta elimină efectul din stocare și din orice configurație care îl folosește. Îl poți descărca din nou mai târziu.</string>
+    <string name="reshade_catalog_delete_confirm">Șterge</string>
+    <string name="reshade_catalog_delete_cancel">Anulează</string>
+    <string name="reshade_catalog_delete_failed">Nu s-a putut șterge %1$s.</string>
+    <string name="reshade_params_title">PARAMETRII EFECTULUI</string>
+    <string name="reshade_params_reset">Resetează</string>
+    <string name="reshade_loadout_empty">Încă niciun efect. Adaugă unul sau mai multe efecte pentru a crea o configurație.</string>
+    <string name="reshade_loadout_add">Adaugă efect</string>
+    <string name="reshade_loadout_full">Configurație plină — elimină un efect pentru a adăuga altul.</string>
+    <string name="reshade_effect_active">activ</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stivă</string>
+    <string name="reshade_mode_solo_hint">Un singur efect activ pe rând (comparație A/B, comută live în joc).</string>
+    <string name="reshade_mode_stack_hint">Suprapune orice subset de efecte, aplicate în ordine.</string>
+    <string name="reshade_drawer_enable">Activează ReShade</string>
+    <string name="reshade_drawer_empty">Niciun efect ReShade în această configurație. Adaugă efecte în setările acestui joc (sau ale containerului) pentru a le comuta și ajusta aici.</string>
+    <string name="reshade_drawer_no_params">Acest efect nu expune parametri ajustabili.</string>
+    <string name="cloud_saves_deleting">Se șterge salvarea…</string>
+    <string name="cloud_saves_history_delete">Șterge</string>
+    <string name="cloud_saves_history_delete_confirm_body">Ștergi definitiv salvarea din cloud de la %1$s? Această acțiune nu poate fi anulată.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Șterge salvarea din cloud</string>
+    <string name="cloud_saves_history_delete_failed">Salvarea din cloud nu a putut fi ștearsă</string>
+    <string name="cloud_saves_history_delete_success">Salvare din cloud ștearsă</string>
+    <string name="retro_bundle_required">Descarcă mai întâi nucleele consolelor — Setari › Retro</string>
+    <string name="retro_ps2_device_unsupported">Acest dispozitiv nu poate rula emularea PS2 — necesită OpenGL ES 3.1 sau mai nou.</string>
+    <string name="retro_scr_consoles_check">Caută actualizări</string>
+    <string name="retro_scr_consoles_checking">Se caută actualizări…</string>
+    <string name="retro_scr_consoles_download">Descarcă nucleele consolelor</string>
+    <string name="retro_scr_consoles_downloading">Se descarcă… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Nucleele consolelor</string>
+    <string name="retro_scr_consoles_installed">Instalat — versiunea %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Instalat — versiunea %1$s (verificarea actualizărilor a eșuat)</string>
+    <string name="retro_scr_consoles_installing">Se instalează…</string>
+    <string name="retro_scr_consoles_missing">Neinstalat — descarcă pentru a juca jocuri retro</string>
+    <string name="retro_scr_consoles_state">Stare</string>
+    <string name="retro_scr_consoles_update">Actualizează nucleele consolelor</string>
+    <string name="retro_scr_consoles_update_available">Actualizare disponibilă — versiunea %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Se verifică descărcarea…</string>
+    <string name="retro_scr_consoles_working">Se lucrează…</string>
+    <string name="retro_tab_system">Sistem</string>
 </resources>
+
diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml
new file mode 100644
index 000000000..eb7c9a165
--- /dev/null
+++ b/app/src/main/res/values-ru/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Изображение</item>
+        <item>Оригинал</item>
+        <item>Сплошной цвет</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-ru/plurals.xml b/app/src/main/res/values-ru/plurals.xml
new file mode 100644
index 000000000..c11850249
--- /dev/null
+++ b/app/src/main/res/values-ru/plurals.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP-файл</item>
+        <item quantity="few">%d ZIP-файла</item>
+        <item quantity="many">%d ZIP-файлов</item>
+        <item quantity="other">%d ZIP-файла</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 000000000..f461aec33
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,2383 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Запустить</string>
+    <string name="common_ui_edit">Редактировать</string>
+    <string name="common_ui_remove">Удалить</string>
+    <string name="common_ui_add">Добавить</string>
+    <string name="common_ui_shortcuts">Ярлыки</string>
+    <string name="common_ui_containers">Контейнеры</string>
+    <string name="common_ui_input_controls">Управление вводом</string>
+    <string name="common_ui_no_items_to_display">Нет элементов для отображения</string>
+    <string name="common_ui_select_icon">Выбрать значок</string>
+    <string name="common_ui_revert_icon">Вернуть значок</string>
+    <string name="common_ui_select_exe">Выбрать EXE</string>
+    <string name="common_ui_select_folder">Выбрать папку</string>
+    <string name="common_ui_current_folder">Текущая папка</string>
+    <string name="common_ui_enter_path">Введите путь</string>
+    <string name="common_ui_path_not_found">Путь не найден</string>
+    <string name="common_ui_select_valid_exe_file">Выберите корректный файл .exe</string>
+    <string name="common_ui_select_valid_icon_file">Выберите корректный файл .ico или .png.</string>
+    <string name="common_ui_exit">Выход</string>
+    <string name="common_ui_exit_app">Выйти из приложения</string>
+    <string name="common_ui_profile">Профиль</string>
+    <string name="common_ui_name">Название</string>
+    <string name="common_ui_ok">OK</string>
+    <string name="common_ui_cancel">Отмена</string>
+    <string name="common_ui_untitled">Без названия</string>
+    <string name="common_ui_disabled">Отключено</string>
+    <string name="common_ui_container">Контейнер</string>
+    <string name="common_ui_value">Значение</string>
+    <string name="common_ui_none">Нет</string>
+    <string name="common_ui_custom_text">Пользовательский текст</string>
+    <string name="common_ui_icon">Значок</string>
+    <string name="common_ui_duplicate">Дублировать</string>
+    <string name="common_ui_credits_and_third_party_apps">Авторы и сторонние приложения</string>
+    <string name="common_ui_loading">Загрузка</string>
+    <string name="common_ui_enable">Включить</string>
+    <string name="common_ui_disable">Отключить</string>
+    <string name="common_ui_force">Принудительно</string>
+    <string name="common_ui_version">Версия</string>
+    <string name="common_ui_advanced">Дополнительно</string>
+    <string name="common_ui_graphics">Графика</string>
+    <string name="common_ui_system">Система</string>
+    <string name="common_ui_width">Ширина</string>
+    <string name="common_ui_height">Высота</string>
+    <string name="common_ui_open_file">Открыть файл</string>
+    <string name="common_ui_download_file">Скачать файл</string>
+    <string name="common_ui_downloading_file">Скачивание файла</string>
+    <string name="common_ui_browse">Обзор</string>
+    <string name="common_ui_options">Параметры</string>
+    <string name="common_ui_export">Экспорт</string>
+    <string name="common_ui_new_file">Новый файл</string>
+    <string name="common_ui_description">Описание</string>
+    <string name="common_ui_continue">Продолжить</string>
+    <string name="common_ui_warning">Предупреждение</string>
+    <string name="common_ui_copy">копия</string>
+    <string name="common_ui_reset">Сбросить</string>
+    <string name="common_ui_close">Закрыть</string>
+    <string name="common_ui_confirm">Подтвердить</string>
+    <string name="common_ui_unnamed">Без имени</string>
+    <string name="common_ui_download">Скачать</string>
+    <string name="common_ui_uninstall">Удалить</string>
+    <string name="common_ui_other">Другое</string>
+    <string name="common_ui_status">Статус</string>
+    <string name="common_ui_size">Размер</string>
+    <string name="common_ui_release_date">Дата выпуска</string>
+    <string name="common_ui_installed">Установлено</string>
+    <string name="common_ui_available">Доступно</string>
+    <string name="common_ui_settings">Настройки</string>
+    <string name="common_ui_enable_all">Включить все</string>
+    <string name="common_ui_disable_all">Отключить все</string>
+    <string name="common_ui_select_all">Выбрать все</string>
+    <string name="common_ui_deselect_all">Снять выделение</string>
+    <string name="common_ui_on">Вкл.</string>
+    <string name="common_ui_off">Выкл.</string>
+    <string name="common_ui_already_set">Уже задано</string>
+    <string name="common_ui_shortcut">Ярлык</string>
+    <string name="common_ui_custom">Пользовательский</string>
+    <string name="common_ui_about">О приложении</string>
+    <string name="common_ui_back">Назад</string>
+    <string name="common_ui_apply">Применить</string>
+    <string name="common_ui_save">Сохранить</string>
+    <string name="common_ui_clone">Клонировать</string>
+    <string name="common_ui_properties">Свойства</string>
+    <string name="common_ui_store">Магазин</string>
+    <string name="common_ui_library">Библиотека</string>
+    <string name="common_ui_downloads">Загрузки</string>
+    <string name="common_ui_import">Импорт</string>
+    <string name="common_ui_sync">Синхронизация</string>
+    <string name="common_ui_sign_in">Войти</string>
+    <string name="common_ui_submit">Отправить</string>
+    <string name="common_ui_coming_soon">Скоро</string>
+    <string name="common_ui_signed_in">Выполнен вход</string>
+    <string name="common_ui_required">Обязательно</string>
+    <string name="common_ui_optional">Необязательно</string>
+    <string name="common_ui_notifications">Уведомления</string>
+    <string name="common_ui_mode">Режим</string>
+    <string name="common_ui_experimental">(Экспериментально)</string>
+    <string name="common_ui_current_version_label">Текущая версия:</string>
+    <string name="common_ui_cannot_write_folder">Невозможно записать в выбранную папку</string>
+    <string name="common_ui_failed_create_directory">Не удалось создать каталог по умолчанию</string>
+    <string name="common_ui_device_not_supported">К сожалению, ваше устройство может не поддерживаться</string>
+    <string name="common_ui_please_wait">Пожалуйста, подождите\u2026</string>
+    <string name="common_ui_done">Готово</string>
+    <string name="common_ui_open">Открыть</string>
+    <string name="common_ui_connected">Подключено</string>
+    <string name="common_ui_install">Установить</string>
+    <string name="common_ui_application">Приложение</string>
+    <string name="common_ui_check">Проверить</string>
+    <string name="store_game_check_for_update">Проверить обновления</string>
+    <string name="store_game_checking_for_update">Проверка</string>
+    <string name="store_game_download_update">Скачать обновление</string>
+    <string name="store_game_no_update_available">Обновлений нет</string>
+    <string name="store_game_update_available">Доступно обновление</string>
+    <string name="store_game_update_check_failed">Не удалось проверить обновления</string>
+    <string name="store_game_update">Обновить</string>
+    <string name="store_game_workshop">Мастерская</string>
+    <string name="store_game_verify_files">Проверить файлы</string>
+    <string name="store_game_verify_started">Проверка %1$s — смотрите вкладку «Загрузки».</string>
+    <string name="store_game_steam_options">Параметры Steam</string>
+    <string name="store_game_verify_complete">Проверка файлов завершена</string>
+    <string name="store_game_verify_failed_notice">Не удалось проверить файлы</string>
+    <string name="store_game_progress_background_hint">Это окно можно закрыть — процесс продолжит работу. Вкладку «Загрузки» можно проверить в любое время.</string>
+    <string name="store_game_checking_updates">Проверка обновлений</string>
+    <string name="store_game_no_updates_notice">Нет доступных обновлений</string>
+    <string name="store_game_update_complete">Обновление завершено</string>
+    <string name="store_game_update_failed_notice">Обновление не выполнено</string>
+    <string name="store_game_update_check_failed_notice">Проверка обновления не удалась</string>
+    <string name="store_game_download_already_active">Эта игра уже загружается. Отмените текущую загрузку перед добавлением DLC.</string>
+    <string name="common_ui_select">Выбрать</string>
+    <string name="common_ui_storage_roots">Корни хранилища</string>
+    <string name="common_ui_browse_local_folders_directly">Просматривать локальные папки напрямую</string>
+    <string name="common_ui_no_folders_available_here">Здесь нет доступных папок</string>
+    <string name="common_ui_grant_all_files_access_browse">Предоставьте полный доступ к файлам, чтобы просматривать папки напрямую.</string>
+    <string name="common_ui_not_configured">Не настроено</string>
+    <string name="common_ui_reinstall">Переустановить</string>
+    <string name="common_ui_exit_app_confirm">Выйти из WinNative?</string>
+    <string name="common_ui_elements_count">%1$d элементов</string>
+    <string name="common_ui_disabled_placeholder">-- Отключено --</string>
+    <string name="common_ui_enabled">Включено</string>
+    <string name="common_ui_unknown_error">Неизвестная ошибка</string>
+    <string name="common_ui_auto_detected">Определено автоматически</string>
+    <string name="common_ui_change">Изменить</string>
+    <string name="common_ui_proceed">Продолжить</string>
+    <string name="common_ui_sign_out">Выйти</string>
+    <string name="common_ui_name_cannot_be_empty">Название не может быть пустым</string>
+    <string name="common_ui_error_with_message">Ошибка: %1$s</string>
+    <string name="common_ui_64_bit">64-БИТ</string>
+    <string name="common_ui_32_bit">32-БИТ</string>
+    <string name="common_ui_64_bit_and_32_bit">64-БИТ И 32-БИТ</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d папка</item>
+        <item quantity="few">%d папки</item>
+        <item quantity="many">%d папок</item>
+        <item quantity="other">%d папки</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d файл</item>
+        <item quantity="few">%d файла</item>
+        <item quantity="many">%d файлов</item>
+        <item quantity="other">%d файла</item>
+    </plurals>
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Загрузить обложки</string>
+    <string name="library_games_scraping_artwork">Загрузка</string>
+    <string name="library_games_shortcut_created">Ярлык создан.</string>
+    <string name="library_games_failed_to_create_shortcut">Не удалось создать ярлык: %s</string>
+    <string name="library_games_install_path">Путь установки</string>
+    <string name="library_games_not_enough_space">Нужно еще %1$s места</string>
+    <string name="library_games_download_slash_install">Скачать/Установить</string>
+    <string name="library_games_save_management">УПРАВЛЕНИЕ СОХРАНЕНИЯМИ</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Доступно: %3$s</string>
+    <string name="library_games_last_played">Последний запуск</string>
+    <string name="library_games_playtime">Время игры</string>
+    <string name="library_games_plays">Запуски</string>
+    <string name="library_games_dlcs">DLC</string>
+    <string name="library_games_uninstall_game">УДАЛИТЬ ИГРУ</string>
+    <string name="library_games_remove_game">УДАЛИТЬ ИЗ БИБЛИОТЕКИ</string>
+    <string name="library_games_uninstall_confirm">Удалить %1$s и навсегда стереть папку установленной игры?</string>
+    <string name="library_games_remove_confirm">Удалить %1$s из библиотеки? Файлы игры на диске останутся без изменений.</string>
+    <string name="library_games_game_uninstalled">%1$s удалена.</string>
+    <string name="library_games_game_removed">%1$s удалена из библиотеки.</string>
+    <string name="library_games_failed_to_uninstall">Не удалось удалить.</string>
+    <string name="library_games_failed_to_uninstall_reason">Не удалось удалить: %1$s</string>
+    <string name="library_games_loading">Загрузка библиотеки\u2026</string>
+    <string name="library_games_no_games_installed">Игры не установлены. Используйте вкладку «Магазин» или кнопку «+», чтобы добавить игры.</string>
+    <string name="library_games_times_played_label">Количество запусков: </string>
+    <string name="library_games_playtime_label">Время в игре: </string>
+    <string name="library_games_no_games_hub">Игры не установлены
+Нажмите, чтобы открыть Winlator Backend</string>
+    <string name="library_games_installed_badge">УСТАНОВЛЕНО</string>
+    <string name="library_games_unknown_game">Неизвестная игра</string>
+    <string name="library_games_layouts_header">СХЕМЫ БИБЛИОТЕКИ</string>
+    <string name="library_games_layout_carousel">Карусель</string>
+    <string name="library_games_layout_list">Список</string>
+    <string name="library_games_view_options_header">ПАРАМЕТРЫ ВИДА</string>
+    <string name="library_games_immersive_mode">Режим погружения</string>
+    <string name="library_games_immersive_mode_description">Использовать изображение выбранной игры как фон</string>
+    <string name="library_games_immersive_blur">Размыть фон</string>
+    <string name="library_games_immersive_blur_description">Применить эффект размытия к фону режима погружения</string>
+    <string name="library_games_custom_game">Пользовательская игра</string>
+    <string name="library_games_play">Играть</string>
+    <string name="hero_boot_to_desktop_title">Загрузить рабочий стол</string>
+    <string name="hero_graphics_tests_title">Графические тесты</string>
+    <string name="hero_graphics_test_32">32-бит</string>
+    <string name="hero_graphics_test_64">64-бит</string>
+    <string name="hero_input_tests_title">Тесты ввода</string>
+    <string name="library_games_add_custom_game">Добавить пользовательскую игру</string>
+    <string name="library_games_game_name">Название игры</string>
+    <string name="library_games_game_folder_mapped_drive">Папка с игрой (подключенный игровой диск)</string>
+    <string name="library_games_select_exe_provide_name">Выберите EXE-файл и укажите название.</string>
+    <string name="library_games_sign_in_prompt">Войдите в магазин или добавьте собственную игру, чтобы создать свою библиотеку.</string>
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Магазины</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Общая папка загрузок</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Используйте одну папку во всех магазинах</string>
+    <string name="stores_accounts_default_downloads_folder">Папка загрузок по умолчанию</string>
+    <string name="stores_accounts_steam_downloads">Загрузки Steam</string>
+    <string name="stores_accounts_epic_downloads">Загрузки Epic</string>
+    <string name="stores_accounts_gog_downloads">Загрузки GOG</string>
+    <string name="stores_accounts_download_speed">Скорость загрузки</string>
+    <string name="stores_accounts_download_speed_subtitle">Управляет количеством потоков загрузки Steam</string>
+    <string name="stores_accounts_download_server">Сервер загрузки</string>
+    <string name="stores_accounts_connected_stores">Подключенные магазины</string>
+    <string name="stores_accounts_download_settings">Настройки загрузки</string>
+    <string name="stores_accounts_download_speed_conservative">Консервативный</string>
+    <string name="stores_accounts_download_speed_balanced">Сбалансированный</string>
+    <string name="stores_accounts_download_speed_standard">Стандартный</string>
+    <string name="stores_accounts_download_speed_performance">Высокая производительность</string>
+    <string name="stores_accounts_download_server_auto_detected">Определено автоматически: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Регион Steam CDN для загрузки игр</string>
+    <string name="stores_accounts_sign_out_confirm">Выйти из аккаунта %1$s?</string>
+    <string name="stores_accounts_sign_out_message">Чтобы получить доступ к библиотеке, нужно будет войти снова.</string>
+    <string name="stores_accounts_logged_in_epic">Вход в Epic Games выполнен!</string>
+    <string name="stores_accounts_epic_login_failed">Не удалось войти в Epic: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">Вход в GOG выполнен!</string>
+    <string name="stores_accounts_gog_login_failed">Не удалось войти в GOG: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Пользовательский путь загрузки</string>
+    <string name="stores_accounts_custom_download_path_description">Путь загрузки по умолчанию уже настроен в разделе «Настройки» &gt; «Магазины». Если вы хотите установить уникальный путь для этой конкретной установки, нажмите «Продолжить».</string>
+    <string name="stores_accounts_not_signed_in">Вход не выполнен</string>
+    <string name="stores_accounts_status_online">Онлайн</string>
+    <string name="stores_accounts_status_away">Нет на месте</string>
+    <string name="stores_accounts_status_offline">Не в сети</string>
+    <string name="stores_accounts_status_invisible">Невидимый</string>
+    <string name="stores_accounts_status_header">СТАТУС</string>
+    <string name="stores_accounts_stores_header">МАГАЗИНЫ</string>
+    <string name="stores_accounts_sign_in_store_prompt">Войдите, чтобы получить доступ к магазину %1$s.</string>
+    <string name="stores_accounts_manage">Управление учетными записями магазинов</string>
+    <string name="stores_accounts_sign_into_store">Войти в %1$s</string>
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Отменить все</string>
+    <string name="downloads_queue_preparing_download">Подготовка загрузки</string>
+    <string name="downloads_queue_installing_package">Установка пакета</string>
+    <string name="downloads_queue_resume_all">Возобновить все</string>
+    <string name="downloads_queue_pause_all">Приостановить все</string>
+    <string name="downloads_queue_clear">Очистить</string>
+    <string name="downloads_queue_status_label">Статус:</string>
+    <string name="downloads_queue_phase_downloading">Загрузка</string>
+    <string name="downloads_queue_phase_downloading_file">Загрузка [%1$s]</string>
+    <string name="downloads_queue_phase_queued">В очереди</string>
+    <string name="downloads_queue_phase_paused">Приостановлено</string>
+    <string name="downloads_queue_phase_preparing">Подготовка</string>
+    <string name="downloads_queue_phase_verifying">Проверка</string>
+    <string name="downloads_queue_phase_verifying_file">Проверка [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Применение патча</string>
+    <string name="downloads_queue_phase_applying_data">Применение данных</string>
+    <string name="downloads_queue_phase_finalizing">Завершение</string>
+    <string name="downloads_queue_phase_unpacking">Распаковка</string>
+    <string name="downloads_queue_phase_updating">Обновление</string>
+    <string name="downloads_queue_phase_complete">Завершено</string>
+    <string name="downloads_queue_phase_cancelled">Отменено</string>
+    <string name="downloads_queue_phase_failed">Ошибка: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Неизвестно</string>
+    <string name="downloads_queue_paused_resume_hint">Приостановлено. Нажмите «Возобновить», чтобы продолжить.</string>
+    <string name="downloads_queue_cancel_download">Отменить загрузку</string>
+    <string name="downloads_queue_cancel_download_title">Отменить загрузку?</string>
+    <string name="downloads_queue_cancel_download_warning">Отмена загрузки DLC, игры или обновления может привести к повреждению установки игры.\n\nВы уверены, что хотите отменить загрузку и удалить уже загруженные файлы?</string>
+    <string name="downloads_queue_cancel_all_title">Отменить все загрузки?</string>
+    <string name="downloads_queue_cancel_all_warning">Отмена загрузок DLC, игр или обновлений может повредить установленные игры.\n\nВы уверены, что хотите отменить все загрузки и удалить уже загруженные файлы?</string>
+    <string name="downloads_queue_empty">Нет активных загрузок.</string>
+    <!-- Containers > List -->
+    <string name="containers_list_new">Новый контейнер</string>
+    <string name="containers_list_edit">Редактировать контейнер</string>
+    <string name="containers_list_creating">Создание контейнера</string>
+    <string name="containers_list_removing">Удаление контейнера</string>
+    <string name="containers_list_duplicating">Дублирование контейнера</string>
+    <string name="containers_list_remove_title">Удалить контейнер</string>
+    <string name="containers_list_duplicate_title">Дублировать контейнер</string>
+    <string name="containers_list_confirm_remove">Вы хотите удалить этот контейнер?</string>
+    <string name="containers_list_confirm_duplicate">Вы хотите продублировать этот контейнер?</string>
+    <string name="containers_list_duplicate_failed">Не удалось продублировать контейнер</string>
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">Вы хотите удалить этот ярлык?</string>
+    <string name="shortcuts_list_add_to_home_screen">Добавить на главный экран</string>
+    <string name="shortcuts_library_artwork_title">Обложки библиотеки</string>
+    <string name="shortcuts_library_artwork_icon_title">Изображение значка</string>
+    <string name="shortcuts_library_artwork_hero_title">Фон</string>
+    <string name="shortcuts_library_artwork_set">Установить изображение</string>
+    <string name="shortcuts_library_artwork_failed">Не удалось загрузить выбранное изображение.</string>
+    <string name="shortcuts_library_artwork_open_source">Открыть SteamGridDB</string>
+    <string name="shortcuts_list_not_available">Этот ярлык больше недоступен. Пожалуйста, удалите или создайте заново.</string>
+    <string name="shortcuts_list_select_a_container">Выберите контейнер</string>
+    <string name="shortcuts_list_error_opening_settings">Ошибка открытия настроек ярлыка</string>
+    <string name="shortcuts_list_removed">Ярлык успешно удален.</string>
+    <string name="shortcuts_list_remove_failed">Не удалось удалить ярлык. Пожалуйста, попробуйте еще раз.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Удалить ярлык\n%1$s</string>
+    <string name="shortcuts_list_cloned">Ярлык успешно клонирован.</string>
+    <string name="shortcuts_list_clone_failed">Не удалось клонировать ярлык.</string>
+    <string name="shortcuts_list_exported_to">Ярлык экспортирован в %1$s.</string>
+    <string name="shortcuts_list_failed_export">Не удалось экспортировать ярлык.</string>
+    <string name="shortcuts_export_all">Экспортировать все</string>
+    <string name="shortcuts_export_to_frontend">Экспорт во фронтенд</string>
+    <string name="shortcuts_export_all_done">Экспортировано %1$d игр в %2$s</string>
+    <string name="shortcuts_export_all_none">Нет игр для экспорта</string>
+    <string name="shortcuts_list_added">Ярлык успешно добавлен.</string>
+    <string name="shortcuts_list_readded_existing">Повторно добавлен существующий ярлык</string>
+    <string name="shortcuts_list_failed_add">Не удалось добавить ярлык.</string>
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Аргументы запуска</string>
+    <string name="shortcuts_properties_target_path">Целевой путь</string>
+    <string name="shortcuts_properties_disable_xinput">Отключить XInput (для эксклюзивного управления мышью/клавиатурой)</string>
+    <string name="num_controllers">Количество контроллеров</string>
+    <string name="shortcuts_properties_exclusive_input">Эксклюзивный ввод</string>
+    <string name="shortcuts_properties_custom_game_settings">Пользовательские настройки игры</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM-патчер</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Внедряет DLL DRM-патчера при запуске. Снижает FPS — используйте только если один устаревший лаунчер не помогает.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="shortcuts_properties_use_steam_input">Использовать Steam Input</string>
+    <string name="shortcuts_properties_steam_offline_mode">Офлайн-режим Steam</string>
+    <string name="shortcuts_properties_reset">Сбросить свойства</string>
+    <string name="shortcuts_properties_updated_at">Ярлык обновлен: %1$s.</string>
+    <string name="shortcuts_properties_properties_reset">Свойства успешно сброшены.</string>
+    <string name="shortcuts_properties_reset_per_game">Сбросить настройки игры</string>
+    <string name="shortcuts_properties_reset_per_game_message">Сбросить эту игру, чтобы использовать выбранные настройки контейнера по умолчанию?</string>
+    <string name="shortcuts_properties_per_game_reset">Настройки этой игры сброшены до значений выбранного контейнера по умолчанию.</string>
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">Элемент управления не выбран</string>
+    <string name="input_controls_editor_scale">Масштаб</string>
+    <string name="input_controls_editor_shape">Форма</string>
+    <string name="input_controls_editor_type">Тип</string>
+    <string name="input_controls_editor_binding">Привязка</string>
+    <string name="binding_primary">Первичная привязка</string>
+    <string name="binding_secondary">Вторичная привязка</string>
+    <string name="binding_third">Третичная привязка</string>
+    <string name="binding_fourth">Четвертичная привязка</string>
+    <string name="input_controls_editor_binding_up">Привязка вверх</string>
+    <string name="input_controls_editor_binding_right">Привязка вправо</string>
+    <string name="input_controls_editor_binding_down">Привязка вниз</string>
+    <string name="input_controls_editor_binding_left">Привязка влево</string>
+    <string name="input_controls_editor_overlay_opacity">Непрозрачность наложения</string>
+    <string name="input_controls_editor_opacity">Непрозрачность</string>
+    <string name="input_controls_editor_radial_menu">Радиальное меню</string>
+    <string name="input_controls_editor_radial_menu_options">Параметры кругового меню</string>
+    <string name="input_controls_editor_number_of_bindings">Количество привязок</string>
+    <string name="input_controls_editor_select_profile">Выберите профиль</string>
+    <string name="input_controls_select_style">Выберите стиль</string>
+    <string name="input_controls_style_original">Оригинал</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Сланец</string>
+    <string name="input_controls_style_halo">Ореол</string>
+    <string name="input_controls_style_glint">Блик</string>
+    <string name="input_controls_style_shadow">Тень</string>
+    <string name="input_controls_style_reticle">Прицел</string>
+    <string name="input_controls_style_neon">Неон</string>
+    <string name="input_controls_style_lumina">Люмина</string>
+    <string name="input_controls_accent_theme">Цветовая тема</string>
+    <string name="input_controls_edit_duplicating_builtin">Встроенный профиль — созданную копию можно редактировать.</string>
+    <string name="input_controls_editor_profile_name">Имя профиля</string>
+    <string name="input_controls_editor_no_profile_selected">Профиль не выбран</string>
+    <string name="input_controls_editor_no_profile_found">Профиль не найден</string>
+    <string name="input_controls_editor_tap_to_switch">Нажмите, чтобы переключиться</string>
+    <string name="input_controls_editor_confirm_remove_profile">Вы хотите удалить этот профиль?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">Вы хотите дублировать этот профиль?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Восстановить исходный макет этого профиля? Любые внесенные вами изменения будут потеряны.</string>
+    <string name="input_controls_editor_profile_reset">Профиль сброшен к исходному макету.</string>
+    <string name="input_controls_editor_reset_unavailable">Для этого профиля нет исходного снимка.</string>
+    <string name="input_controls_editor_title">Редактор элементов управления</string>
+    <string name="input_controls_editor_toggle_switch">Тумблер</string>
+    <string name="input_controls_editor_swipeable">Активация свайпом</string>
+    <string name="input_controls_editor_profile_exported_to">Профиль экспортирован в</string>
+    <string name="input_controls_editor_unable_to_import">Невозможно импортировать профиль</string>
+    <string name="input_controls_editor_import_profile">Импортировать профиль</string>
+    <string name="input_controls_editor_download_profile">Скачать профиль</string>
+    <string name="input_controls_editor_export_profile">Экспортировать профиль</string>
+    <string name="input_controls_editor_range">Диапазон</string>
+    <string name="input_controls_editor_confirm_download_profiles">Хотите загрузить выбранные профили?</string>
+    <string name="input_controls_editor_unable_to_load_list">Невозможно загрузить список профилей</string>
+    <string name="input_controls_editor_osc_transparency">Прозрачность экранных элементов управления</string>
+    <string name="input_controls_editor_osc_transparency_description">Настройте прозрачность экранных элементов управления.</string>
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Размер экрана</string>
+    <string name="container_config_new_env_var">Новая переменная среды</string>
+    <string name="container_config_env_vars">Переменные среды</string>
+    <string name="container_config_processor_affinity">Привязка процессора</string>
+    <string name="container_config_processor_affinity_32bit">Привязка процессора (32-разрядные приложения)</string>
+    <string name="container_config_audio_driver">Аудиодрайвер</string>
+    <string name="container_config_win_components">Компоненты Windows</string>
+    <string name="container_config_drives">Диски</string>
+    <string name="container_config_arch">Архитектура</string>
+    <string name="container_config_storage_info">Информация о хранилище</string>
+    <string name="container_config_drive_c">Диск С:</string>
+    <string name="container_config_cache">Кэш</string>
+    <string name="container_config_total">Всего</string>
+    <string name="container_config_clear_cache">Очистить кэш</string>
+    <string name="container_config_estimated_used_space">Предполагаемое используемое пространство</string>
+    <string name="settings_containers_error_saving_wallpaper">Ошибка сохранения обоев.</string>
+    <string name="container_config_directinput_mapper_type">Тип преобразователя DirectInput</string>
+    <string name="container_config_title">Конфигурация</string>
+    <string name="container_config_startup_selection">Выбор запуска</string>
+    <string name="container_config_glibc_exp_edition">На основе</string>
+    <string name="container_config_refresh_rate_default_global">По умолчанию (глобальный)</string>
+    <string name="container_config_enable_dinput">Включить DInput для игр в Wine</string>
+    <string name="container_config_enable_xinput">Включить XInput для игр в Wine</string>
+    <string name="container_config_dinput_legacy">Устаревший (старые геймпады)</string>
+    <string name="container_config_dinput_modern">Современный (как XInput)</string>
+    <string name="container_config_help_xinput">Если ваша игра использует &lt;i&gt;&lt;b&gt;XInput API&lt;/b&gt;&lt;/i&gt; для поддержки игрового контроллера, включите эту опцию.&lt;br/&gt;&lt;br/&gt;\n Этот параметр повлияет как на &lt;i&gt;&lt;b&gt;виртуальные&lt;/b&gt;&lt;/i&gt; (предоставляемые элементами управления вводом), так и на &lt;i&gt;&lt;b&gt;физические&lt;/b&gt;&lt;/i&gt; игровые контроллеры.</string>
+    <string name="container_config_help_dinput">Если ваша игра использует &lt;i&gt;&lt;b&gt;DInput API&lt;/b&gt;&lt;/i&gt; для поддержки игровых контроллеров, включите эту опцию.&lt;br/&gt;&lt;br/&gt;\n Этот параметр повлияет как на &lt;i&gt;&lt;b&gt;виртуальные&lt;/b&gt;&lt;/i&gt; (предоставляемые элементами управления вводом), так и на &lt;i&gt;&lt;b&gt;физические&lt;/b&gt;&lt;/i&gt; игровые контроллеры.</string>
+    <string name="container_config_xinput_dinput_warning">Некоторые игры могут поддерживать оба API. Одновременное включение XInput и DInput в таких играх может вызвать проблемы с управлением, как это видно в таких играх, как The Binding of Isaac и серии Resident Evil.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32-битный эмулятор</string>
+    <string name="container_config_emulator_wine_hint">Эмулятор определяется версией Wine. ARM64EC использует FEXCore, x86_64 использует Box64.</string>
+    <string name="container_config_label">Конфигурация</string>
+    <string name="container_config_restart_required">Перезапустите контейнер, чтобы изменения вступили в силу.</string>
+    <string name="container_config_renderer">Рендерер</string>
+    <string name="container_config_variables">Переменные</string>
+    <string name="container_config_windows">Окна</string>
+    <string name="container_config_inputs">Ввод</string>
+    <string name="container_config_tab">Конфигурация</string>
+    <string name="container_config_av_tab">АУДИО/ВИДЕО</string>
+    <string name="container_config_emulator_64bit">64-битный эмулятор</string>
+    <string name="container_config_emulator_section">Эмулятор</string>
+    <string name="container_config_sdl2_compatibility">Включить совместимость SDL2</string>
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Конфигурация Wine</string>
+    <string name="container_wine_csmt">CSMT (многопоточный командный поток)</string>
+    <string name="container_wine_gpu_name">Имя GPU</string>
+    <string name="container_wine_offscreen_rendering_mode">Режим внеэкранного рендеринга</string>
+    <string name="container_wine_strict_shader_math">Строгая математика шейдеров</string>
+    <string name="container_wine_video_memory_size">Размер видеопамяти</string>
+    <string name="container_wine_dxwrapper">DX-обертка</string>
+    <string name="container_wine_mouse_warp_override">Переопределение деформации мыши</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">Версия DXVK</string>
+    <string name="container_wine_dxvk_config_title">Конфигурация DXVK</string>
+    <string name="container_wine_wined3d_config_title">Конфигурация WineD3D</string>
+    <string name="container_wine_vkd3d_version">Версия VKD3D</string>
+    <string name="container_wine_version">Версия Wine</string>
+    <string name="container_wine_dxwrapper_help_content">&lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; — это слой трансляции DirectX 1–11 в OpenGL.&lt;br /&gt;&lt;br /&gt;\n &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; — это слой трансляции Direct3D 9–11 в Vulkan.&lt;br /&gt;&lt;br /&gt;\n &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; — это слой трансляции API Direct3D 12 в Vulkan.&lt;br /&gt;&lt;br /&gt;\n &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; — это реализация DirectDraw для лучшей совместимости с классическими играми.</string>
+    <string name="container_wine_enabled_async">Включить асинхронность</string>
+    <string name="container_wine_enabled_async_cache">Включить асинхронный кеш</string>
+    <string name="container_wine_vkd3d_feature_level">Уровень функций VKD3D</string>
+    <string name="container_wine_ddraw_wrapper">Обертка DDraw</string>
+    <string name="container_wine_error_not_installed">Пакет Wine/Proton «%1$s» не установлен и не может быть загружен.</string>
+    <string name="container_no_wine_installed">Wine или Proton не установлены. Сначала установите один.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Поверхностный эффект</string>
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Пресет Box64</string>
+    <string name="container_box64_version">Версия Box64</string>
+    <string name="container_box64_stability">Стабильность</string>
+    <string name="container_box64_compatibility">Совместимость</string>
+    <string name="container_box64_intermediate">Средний</string>
+    <string name="container_box64_performance">Производительность</string>
+    <string name="container_fexcore_performance_tso">Производительность TSO</string>
+    <string name="container_fexcore_extreme">Экстремальный</string>
+    <string name="container_fexcore_extreme_tso">Экстремальный TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Включает или отключает динамический рекомпилятор Box64.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">Обработка флагов в кодах операций CALL/RET&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: обрабатывает CALL/RET так, как будто ему никогда не нужны флаги (быстрее, нестабильнее)&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: Большинству RET потребуются флаги, большинству CALLS - нет.&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: для всех вызовов CALL/RET потребуются флаги (медленнее).</string>
+    <string name="box64_env_var_help__dynarec_fastnan">Генерация -NAN как на x86</string>
+    <string name="box64_env_var_help__dynarec_fastround">Генерация точного округления x86</string>
+    <string name="box64_env_var_help__dynarec_x87double">Использование Float/Double для эмуляции x87</string>
+    <string name="box64_env_var_help__dynarec_bigblock">Dynarec строит BigBlock&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: не пытаться построить блок как можно большего размера&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: построить блок Dynarec как можно большего размера&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: увеличить блок Dynarec (продолжать, если блоки перекрываются, но только для блоков в памяти elf)&lt;br /&gt;\n &lt;b&gt;3&lt;/b&gt;: увеличить блок Dynarec (продолжать, если блоки перекрываются, для всех типов памяти)</string>
+    <string name="box64_env_var_help__dynarec_strongmem">Эмуляция строгой модели памяти&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: не делать ничего особенного&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: включить некоторые барьеры памяти при записи в память (для некоторых инструкций MOV)&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: все из 1 плюс барьер памяти при каждой записи в память с помощью MOV&lt;br /&gt;\n &lt;b&gt;3&lt;/b&gt;: все из 2 плюс барьер памяти при чтении из памяти и некоторых инструкциях SSE/SSE2&lt;br /&gt;\n &lt;b&gt;4&lt;/b&gt;: имитировать TSO x86 аналогично QEMU.</string>
+    <string name="box64_env_var_help__dynarec_forward">Определяет максимально допустимое прямое значение при построении блока.</string>
+    <string name="box64_env_var_help__dynarec_callret">Оптимизация кодов операций CALL/RET</string>
+    <string name="box64_env_var_help__dynarec_sep">Добавляет вторичные точки входа для оптимизации CALL/RET, когда CALLRET включен.</string>
+    <string name="box64_env_var_help__dynarec_wait">Определяет, будет ли Dynarec ждать готовности FillBlock.</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">Настройте барьеры памяти, чтобы снизить влияние сильной эмуляции памяти на производительность&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: используйте обычные безопасные барьеры&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: используйте слабые барьеры для небольшого повышения производительности&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: использовать слабые барьеры, дополнительно отключить барьеры последней записи.</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">Генерировать только выровненные атомы (пока доступно только на Arm64).&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: создать код обработки невыровненных атомов.&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: генерировать только выровненные атомарные элементы, что быстрее и имеет меньший размер кода, но приведет к тому, что коды операций с префиксом SIGBUS for LOCK будут работать с выровненными адресами данных.</string>
+    <string name="box64_env_var_help__dynarec_df">Включите или отключите использование отложенных флагов.&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: отключить использование флагов отсрочки.&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: включить использование флагов отложенного выполнения.</string>
+    <string name="box64_env_var_help__dynarec_dirty">Разрешить продолжить запуск незащищенного и потенциально грязного блока.&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: запретить продолжение выполнения незащищенного и потенциально грязного блока.&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: разрешить продолжение запуска dynablock, который записывает данные на той же странице, что и код. Загрузка некоторых игр может ускориться, но также возможны неожиданные сбои.&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: также при обнаружении HotPage пометит эту страницу как NEVERCLEAN, и поэтому она не будет защищена от записи, но сборка блоков с этой страницы всегда будет проверяться. Так может быть быстрее (но некоторые случаи SMC могут не быть перехвачены).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">Включите или отключите использование собственных флагов.&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: не использовать собственные флаги.&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: по возможности используйте собственные флаги.</string>
+    <string name="box64_env_var_help__dynarec_pause">Включите эмуляцию PAUSE x86, это может улучшить производительность спин-блокировок.&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: игнорировать инструкцию PAUSE x86.&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: используйте YIELD для эмуляции инструкции PAUSE x86.&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: используйте WFI для эмуляции инструкции PAUSE x86.&lt;br /&gt;\n &lt;b&gt;3&lt;/b&gt;: используйте SEVL+WFE для эмуляции инструкции PAUSE x86.</string>
+    <string name="box64_env_var_help__dynarec_noarch">Уменьшает метаданные блока dynarec для экономии памяти с компромиссом совместимости.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">Использует изменчивые метаданные PE для управления надежной эмуляцией памяти для 64-битных игр для Windows.</string>
+    <string name="box64_env_var_help__dynacache">Управляет кэшированием сгенерированных блоков dynarec между запусками для ускорения запуска.</string>
+    <string name="box64_env_var_help__avx">Предоставляет гостю возможности AVX.&lt;br /&gt;&lt;br /&gt;\n &lt;b&gt;0&lt;/b&gt;: отключить расширение AVX&lt;br /&gt;\n &lt;b&gt;1&lt;/b&gt;: включить расширение AVX, BMI1, F16C и VAES.&lt;br /&gt;\n &lt;b&gt;2&lt;/b&gt;: все 1 плюс включение AVX2, BMI2, FMA, ADX, VPCLMULQDQ и RDRAND.&lt;br /&gt;</string>
+    <string name="box64_env_var_help__aes">Предоставляет гостевой системе возможности AES CPU.</string>
+    <string name="box64_env_var_help__pclmulqdq">Предоставляет гостевой системе возможности PCLMULQDQ CPU.</string>
+    <string name="box64_env_var_help__shaext">Предоставляет гостевой системе возможности расширения SHA CPU.</string>
+    <string name="box64_env_var_help__sse42">Предоставляет гостевой системе возможности SSE4.2 CPU.</string>
+    <string name="box64_env_var_help__sse_flushto0">Управляет поведением сброса SSE до нуля и отслеживанием флагов исключений.</string>
+    <string name="box64_env_var_help__x87_no80bits">Использует 64-битную двойную точность вместо 80-битной long double для x87.</string>
+    <string name="box64_env_var_help__cputype">Выбирает модель CPU Intel или AMD, доступную гостевой системе.</string>
+    <string name="box64_env_var_help__maxcpu">Максимальное количество CPU, показываемое программам Box64</string>
+    <string name="box64_env_var_help__unityplayer">Обнаруживает UnityPlayer и помечает приложение как игру Unity.</string>
+    <string name="box64_env_var_help__unity">Отмечает приложение как игру Unity и включает обработку совместимости с Unity.</string>
+    <string name="box64_env_var_help__mmap32">Принудительно использовать каждое выделение памяти в 32-битном адресном пространстве.</string>
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">Включает операции TSO IR (требуется для многопоточных приложений).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">Делает векторную загрузку/сохранение атомарной, когда TSO включен.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">Использует полубарьерную атомику для несогласованных загрузок/сохранений в рамках TSO.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">Делает REP MOVS/REP STOS атомарным под TSO.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Использует строгую блокировку всего процесса для разделения невыровненных атомарных доступов.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Обрабатывает невыровненные атомы, обрабатываемые ядром, чтобы уменьшить количество переключений контекста ядра.</string>
+    <string name="fexcore_env_var_help__multiblock">Включает многоблочную компиляцию кода. Может привести к более длительной JIT-компиляции и зависаниям.</string>
+    <string name="fexcore_env_var_help__maxinst">Максимальное количество инструкций, хранящихся в скомпилированном блоке.</string>
+    <string name="fexcore_env_var_help__hostfeatures">Управляет принудительной активацией функции CPU.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Масштабирует TSC на низкочастотных системах.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Скрывает гибридную структуру ядер CPU от гостевой системы.</string>
+    <string name="fexcore_env_var_help__smc_checks">Проверяет код на наличие изменений перед выполнением.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Использует изменчивые метаданные из файлов PE для TSO, если они доступны.</string>
+    <string name="fexcore_env_var_help__monohacks">Специальные хаки SMC + JIT для обнаружения Mono.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">Скрывает бит идентификатора гипервизора CPU (полезно для приложений, которые аварийно завершают работу из-за него).</string>
+    <string name="fexcore_env_var_help__disablel2cache">Отключает поиск в кэше FEXCore JIT L2, экономя память, но вызывая зависания.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">Переключает кэш FEXCore JIT L1 на динамический размер, экономя память, но вызывая зависания.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Порог запросов в секунду для увеличения динамического кэша L1.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Порог запросов в секунду для сжатия динамического кэша L1.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">Эмулирует X87 с плавающей запятой, используя 64-битную точность. Это снижает точность эмуляции и может привести к ошибкам рендеринга.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">Пресет FEXCore</string>
+    <string name="container_fexcore_version">Версия FEXCore</string>
+    <string name="use_unix_libs">Использовать UnixLibs</string>
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Графический драйвер</string>
+    <string name="container_zink_mode">Режим Zink</string>
+    <string name="container_graphics_transcoder">Транскодер BCn</string>
+    <string name="container_graphics_quality">Качество BCn</string>
+    <string name="container_graphics_configuration">Конфигурация графического драйвера</string>
+    <string name="container_graphics_version">Версия графического драйвера</string>
+    <string name="container_graphics_available_extensions">Доступные расширения</string>
+    <string name="container_graphics_extensions_enabled_summary">Включено %1$d/%2$d</string>
+    <string name="container_graphics_max_device_memory">Макс. память устройства</string>
+    <string name="container_graphics_sync_frame">Синхронизировать каждый кадр</string>
+    <string name="container_graphics_disable_present_wait">Отключить KHR_present_wait</string>
+    <string name="container_graphics_present_modes">Текущие режимы</string>
+    <string name="container_graphics_compositor_present_mode">Синхронизация дисплея Vulkan</string>
+    <string name="container_graphics_resource_type">Тип ресурса памяти</string>
+    <string name="container_graphics_vulkan_version">Версия Vulkan</string>
+    <string name="container_graphics_bcn_emulation">Эмуляция BCn</string>
+    <string name="container_graphics_bcn_emulation_type">Тип эмуляции BCn</string>
+    <string name="container_graphics_bcn_emulation_cache">Кэш эмуляции BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">Вы хотите продублировать этот пресет?</string>
+    <string name="container_presets_confirm_remove">Вы хотите удалить этот пресет?</string>
+    <string name="container_presets_title">Пресеты</string>
+    <string name="container_presets_preset">Предустановка</string>
+    <string name="container_presets_new">Новый пресет</string>
+    <string name="container_presets_rename">Переименовать пресет</string>
+    <string name="container_presets_import">Импортировать пресет</string>
+    <string name="container_presets_custom">Пользовательский</string>
+    <string name="container_presets_built_in">По умолчанию</string>
+    <string name="container_presets_changes_auto_saved">Изменения сохраняются автоматически при редактировании этого пользовательского пресета.</string>
+    <string name="container_presets_cannot_rename">Встроенные пресеты нельзя переименовывать.</string>
+    <string name="container_presets_unable_to_import">Невозможно импортировать пресет</string>
+    <string name="container_presets_no_description">Нет описания</string>
+    <string name="container_presets_cannot_remove">Вы не можете удалить этот пресет</string>
+    <string name="container_presets_cannot_export">Невозможно экспортировать этот пресет</string>
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Имитировать сенсорный экран</string>
+    <string name="session_xserver_preferences_button_text">ПРЕДПОЧТЕНИЯ</string>
+    <string name="session_xserver_extra_keys_config_desc">Здесь вы можете установить значение переменной дополнительных ключей, как в приложении Termux (читайте</string>
+    <string name="session_xserver_pref_main">Предпочтения</string>
+    <string name="session_xserver_pref_output">Выход</string>
+    <string name="session_xserver_pref_pointer">Указатель</string>
+    <string name="session_xserver_pref_kbd">Клавиатура</string>
+    <string name="session_xserver_pref_other">Другое</string>
+    <string name="session_xserver_pref_version">Версия</string>
+    <string name="session_xserver_notification_description">Сообщения WinNative XServer</string>
+    <string name="session_xserver_notification_content">WinNative запущен, не уничтожайте и не смахивайте это уведомление</string>
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Клавиатура</string>
+    <string name="session_drawer_fps_monitor">Монитор ФПС</string>
+    <string name="session_drawer_fps_monitor_subtitle">Показывать статистику производительности в реальном времени</string>
+    <string name="session_drawer_dual_series_battery">Две батареи последовательно</string>
+    <string name="session_drawer_hud_frametime_numeric">Показать время кадра как число</string>
+    <string name="session_drawer_toggle_fullscreen">Переключить полноэкранный режим</string>
+    <string name="session_drawer_show_touchscreen_controls">Показать элементы управления сенсорным экраном</string>
+    <string name="session_drawer_magnifier">Лупа</string>
+    <string name="session_drawer_logs">Журналы</string>
+    <string name="session_drawer_pip_mode">Режим PiP</string>
+    <string name="session_drawer_toggle_relative_mouse">Переключить относительное движение мыши</string>
+    <string name="session_drawer_toggle_mouse">Переключить мышь</string>
+    <string name="session_drawer_pause_resume">Пауза/возобновить</string>
+    <string name="session_drawer_relative_mouse_movement">Относительное движение мыши</string>
+    <string name="session_drawer_mouse_input">Ввод мыши</string>
+    <string name="session_drawer_screen_effects">Экранные эффекты</string>
+    <string name="session_drawer_screen_effects_subtitle">Масштабирование и цветовые эффекты</string>
+    <string name="session_drawer_super_resolution">Супер разрешение</string>
+    <string name="session_drawer_upscaler_mode">Апскейлер</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Резкость краёв</string>
+    <string name="session_drawer_vivid">Насыщенный</string>
+    <string name="session_drawer_vivid_strength">Интенсивность насыщенности</string>
+    <string name="session_drawer_color_profile">Цветовой эффект</string>
+    <string name="session_drawer_picture_in_picture">Картинка в картинке</string>
+    <string name="session_drawer_exit_subtitle">Закрыть текущий сеанс</string>
+    <string name="session_drawer_touchscreen_overlay">Наложение сенсорного экрана</string>
+    <string name="session_drawer_resume">Продолжить</string>
+    <string name="session_drawer_retry">Повторить</string>
+    <string name="downloads_no_internet">Нет подключения к Интернету</string>
+    <string name="session_drawer_pause">Пауза</string>
+    <string name="session_drawer_wine_processes_paused">Процессы Wine приостановлены</string>
+    <string name="session_drawer_pause_all_wine_processes">Приостановить все процессы Wine</string>
+    <string name="session_drawer_controls_section">Элементы управления</string>
+    <string name="session_drawer_session_section">Сеанс</string>
+    <string name="session_drawer_header_subtitle">Быстрый доступ к элементам управления, наложениям и инструментам сеанса.</string>
+    <string name="session_drawer_swipe_hint">Проведите пальцем по экрану, чтобы вернуться в игру.</string>
+    <string name="session_drawer_main_menu_title">Меню</string>
+    <string name="session_drawer_hud_summary">Настройте видимость оверлея и отображаемые данные</string>
+    <string name="session_drawer_hud_disabled_hint">Включите наложение, чтобы настроить его</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_scale">Масштаб</string>
+    <string name="session_drawer_hud_elements">Элементы HUD</string>
+    <string name="session_drawer_hud_element_fps">ФПС</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">Батарея</string>
+    <string name="session_drawer_hud_element_graph">График</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD в стиле Mango</string>
+    <string name="session_drawer_hud_mango_settings">Настройки Mango HUD</string>
+    <string name="mango_hud_element_gpu_load">Нагрузка GPU</string>
+    <string name="mango_hud_element_gpu_temp">Темп. GPU</string>
+    <string name="mango_hud_element_cpu_load">Нагрузка CPU</string>
+    <string name="mango_hud_element_cpu_temp">Темп. CPU</string>
+    <string name="mango_hud_element_ram">ОЗУ</string>
+    <string name="mango_hud_element_battery">Батарея</string>
+    <string name="mango_hud_element_lows" formatted="false">1% минимумы</string>
+    <string name="mango_hud_element_graph">График фреймтайма</string>
+    <string name="mango_hud_element_engine">Движок</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Частота CPU</string>
+    <string name="mango_hud_element_gpu_clock">Частота GPU</string>
+    <string name="mango_hud_element_cores">По ядрам</string>
+    <string name="mango_hud_element_network">Сеть</string>
+    <string name="mango_hud_element_swap">Подкачка</string>
+    <string name="mango_hud_element_resolution">Разрешение</string>
+    <string name="mango_hud_element_wine">Версия Wine</string>
+    <string name="mango_hud_element_duration">Время сессии</string>
+    <string name="mango_hud_element_clock">Часы</string>
+    <string name="mango_hud_element_throttle">Троттлинг</string>
+    <string name="mango_hud_group_memory">Память</string>
+    <string name="mango_hud_group_system">Система</string>
+    <string name="mango_hud_lock">Заблокировать HUD</string>
+    <string name="mango_hud_lock_subtitle">Касания проходят к элементам управления за HUD. Удерживайте HUD, чтобы заблокировать. (5s)</string>
+    <string name="hud_position_menu_title">Переместить HUD</string>
+    <string name="hud_position_top_left">Вверху слева</string>
+    <string name="hud_position_top_center">Вверху по центру</string>
+    <string name="hud_position_top_right">Вверху справа</string>
+    <string name="hud_position_left_center">Слева по центру</string>
+    <string name="hud_position_right_center">Справа по центру</string>
+    <string name="hud_position_bottom_left">Внизу слева</string>
+    <string name="hud_position_bottom_center">Внизу по центру</string>
+    <string name="hud_position_bottom_right">Внизу справа</string>
+    <string name="session_drawer_hud_alpha_input_title">Задать Alpha</string>
+    <string name="session_drawer_hud_scale_input_title">Установить масштаб</string>
+    <string name="session_drawer_hud_input_hint">Введите значение от %1$d до %2$d. Значения выше предела будут ограничены.</string>
+    <string name="session_drawer_command_center">Командный центр</string>
+    <string name="session_drawer_command_center_input">Ввод</string>
+    <string name="session_drawer_command_center_display">Экран</string>
+    <string name="session_drawer_command_center_system">Система</string>
+    <string name="session_drawer_fps_limiter">Ограничитель ФПС</string>
+    <string name="session_drawer_fps_limiter_off">Выкл.</string>
+    <string name="session_drawer_color_profile_disabled">Отключено</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Естественный</string>
+    <string name="session_drawer_color_profile_crt">ЭЛТ-эффект</string>
+    <string name="session_drawer_calibrate_advanced">Расширенная калибровка</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Гироскоп</string>
+    <string name="session_drawer_rail_label_effects">Эффекты</string>
+    <string name="session_drawer_rail_label_apps">Еще</string>
+    <string name="session_drawer_rail_label_keyboard">Клавиатура</string>
+    <string name="session_drawer_rail_label_input_controls">Элементы управления</string>
+    <string name="session_drawer_rail_label_relative_mouse">Отн. мышь</string>
+    <string name="session_drawer_rail_label_mouse">Мышь</string>
+    <string name="session_drawer_rail_label_fullscreen">Полноэкранный</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Лупа</string>
+    <string name="session_drawer_rail_label_task_manager">Задачи</string>
+    <string name="session_drawer_rail_label_logs">Журналы</string>
+    <string name="session_drawer_logs_clear">Очистить</string>
+    <string name="session_drawer_logs_pause">Пауза</string>
+    <string name="session_drawer_logs_resume">Продолжить</string>
+    <string name="session_drawer_logs_paused_indicator">Приостановлено</string>
+    <string name="session_drawer_logs_line_count">%1$d строк</string>
+    <string name="session_drawer_logs_share">Поделиться</string>
+    <string name="session_drawer_logs_share_subject">Журналы сеанса</string>
+    <string name="session_drawer_logs_share_chooser">Поделиться журналами сеанса</string>
+    <string name="session_drawer_logs_share_failed">Не удалось поделиться журналами.</string>
+    <string name="session_drawer_logs_share_empty">Нет строк журнала, которыми можно поделиться.</string>
+    <string name="session_gyroscope_activator">Активатор</string>
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">Вы хотите завершить этот процесс?</string>
+    <string name="session_task_title">Диспетчер задач</string>
+    <string name="session_task_process_name">Имя процесса</string>
+    <string name="session_task_pid">ПИД</string>
+    <string name="session_task_memory">Память</string>
+    <string name="session_task_end_process">Завершить процесс</string>
+    <string name="session_task_set_affinity">Задать привязку</string>
+    <string name="session_task_affinity_title">Привязка процессора</string>
+    <string name="session_task_affinity_all_cores">Все ядра</string>
+    <string name="session_task_new_task">Новая задача</string>
+    <string name="session_task_processes">Процессы</string>
+    <string name="session_task_cpu_usage_format">CPU(%1$d%%)</string>
+    <string name="session_task_per_core_usage">Использование каждого ядра</string>
+    <string name="session_task_core_label">Ядро %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d ядро</item>
+        <item quantity="few">%d ядра</item>
+        <item quantity="many">%d ядер</item>
+        <item quantity="other">%d ядра</item>
+    </plurals>
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Ориентация</string>
+    <string name="session_display_horizontal">Горизонтальный</string>
+    <string name="session_display_vertical">Вертикальный</string>
+    <string name="session_display_columns">Столбцы</string>
+    <string name="session_display_frame_rate">Частота кадров</string>
+    <string name="session_display_title">Экран</string>
+    <string name="session_display_fullscreen_stretched">Включить полноэкранный режим (растянутый)</string>
+    <string name="session_display_direct_composition">Прямая композиция (без копирования)</string>
+    <string name="session_display_fps_label">ФПС:</string>
+    <string name="session_display_renderer_label">Рендерер:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">Использовано %1$s ГБ / всего %2$s</string>
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">Вы хотите удалить этот контроллер?</string>
+    <string name="session_gamepad_external_controllers">Внешние контроллеры</string>
+    <string name="session_gamepad_press_any_button">Нажмите любую кнопку на вашем контроллере</string>
+    <string name="session_gamepad_bindings">Привязки</string>
+    <string name="session_gamepad_control_bindings">Привязки управления</string>
+    <string name="session_gamepad_game_controller">Игровой контроллер</string>
+    <string name="session_gamepad_as_button">Кнопка</string>
+    <string name="session_gamepad_as_axis">Ось</string>
+    <string name="session_gamepad_trigger_type">Тип</string>
+    <string name="session_gamepad_help_trigger_mode">Зависит от вашего &lt;b&gt;физического контроллера&lt;/b&gt;:&lt;br/&gt;&lt;br/&gt;• &lt;b&gt;Ось&lt;/b&gt; — триггер имеет линейный диапазон хода.&lt;br/&gt;• &lt;b&gt;Кнопка&lt;/b&gt; — триггер работает как простой переключатель.&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Примечание: если выбрать «Кнопка» для линейного триггера, аналоговые данные будут потеряны.&lt;/i&gt;</string>
+    <string name="session_gamepad_button_a">Кнопка А</string>
+    <string name="session_gamepad_button_b">Кнопка B</string>
+    <string name="session_gamepad_button_x">Кнопка X</string>
+    <string name="session_gamepad_button_y">Кнопка Y</string>
+    <string name="session_gamepad_button_grip">Кнопка захвата</string>
+    <string name="session_gamepad_button_trigger">Кнопка триггера</string>
+    <string name="session_gamepad_thumbstick_left">Стик влево</string>
+    <string name="session_gamepad_thumbstick_right">Стик вправо</string>
+    <string name="session_gamepad_thumbstick_up">Стик вверх</string>
+    <string name="session_gamepad_thumbstick_down">Стик вниз</string>
+    <string name="session_gamepad_configure_analog_sticks">Настройка аналоговых стиков</string>
+    <string name="session_gamepad_left_stick">Левый стик</string>
+    <string name="session_gamepad_right_stick">Правый стик</string>
+    <string name="session_gamepad_controller_manager">Менеджер контроллеров</string>
+    <string name="session_gamepad_enable_vibration">Включить вибрацию</string>
+    <string name="session_gamepad_player_1">Игрок 1</string>
+    <string name="session_gamepad_player_2">Игрок 2</string>
+    <string name="session_gamepad_player_3">Игрок 3</string>
+    <string name="session_gamepad_player_4">Игрок 4</string>
+    <string name="session_gamepad_not_assigned">Не назначено</string>
+    <string name="session_gamepad_assign">Назначить</string>
+    <string name="session_gamepad_press_any_button_for_player">Нажмите любую кнопку на контроллере для игрока</string>
+    <string name="session_gamepad_vibrate">Вибрация</string>
+    <string name="session_gamepad_macros_hint">Переключите кнопки, чтобы включить автоматический огонь.</string>
+    <string name="session_gamepad_macros">Макросы</string>
+    <string name="session_gamepad_include_triggers_note">Также применять турбо к L2/R2 как к цифровым триггерам.</string>
+    <string name="session_gamepad_square_deadzone">Квадратная мертвая зона</string>
+    <string name="session_gamepad_invert_x">Инвертировать X</string>
+    <string name="session_gamepad_invert_y">Инвертировать Y</string>
+    <string name="session_gamepad_save_profile">Сохранить профиль</string>
+    <string name="session_gamepad_load_profile">Загрузить профиль</string>
+    <string name="session_gamepad_button_start">Кнопка Start</string>
+    <string name="session_gamepad_button_select">Кнопка Select</string>
+    <string name="session_gamepad_button_l1">Кнопка L1</string>
+    <string name="session_gamepad_button_r1">Кнопка R1</string>
+    <string name="session_gamepad_button_l2">Кнопка L2</string>
+    <string name="session_gamepad_button_r2">Кнопка R2</string>
+    <string name="session_gamepad_button_l3">Кнопка L3</string>
+    <string name="session_gamepad_button_r3">Кнопка R3</string>
+    <string name="session_gamepad_dpad_up">D-pad вверх</string>
+    <string name="session_gamepad_dpad_down">D-pad вниз</string>
+    <string name="session_gamepad_dpad_left">Крестовина влево</string>
+    <string name="session_gamepad_dpad_right">Крестовина вправо</string>
+    <string name="session_gamepad_overwrite">Перезаписать</string>
+    <string name="session_gamepad_save_as_new">Сохранить как новый</string>
+    <string name="session_gamepad_overwrite_profile_message">Вы хотите перезаписать текущий профиль или сохранить его как новый?</string>
+    <string name="session_gamepad_enter_profile_name">Введите имя профиля</string>
+    <string name="session_gamepad_mappings_saved">Привязки сохранены!</string>
+    <string name="session_gamepad_profile_saved">Профиль сохранен!</string>
+    <string name="session_gamepad_profile_saved_as_new">Профиль сохранен как новый!</string>
+    <string name="session_gamepad_profile_loaded">Профиль загружен!</string>
+    <string name="session_gamepad_profile_name_empty">Имя профиля не может быть пустым</string>
+    <string name="session_gamepad_no_profiles">-- Нет профилей --</string>
+    <string name="session_gamepad_error_loading_profile">Ошибка загрузки профиля.</string>
+    <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Сенсорное управление</string>
+    <string name="input_controls_auto_hide_on_controller_title">Автоскрытие при контроллере</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Скрывать сенсорное управление при подключении контроллера</string>
+    <string name="session_gyroscope_title">Гироскоп</string>
+    <string name="session_gyroscope_calibrate">Калибровка гироскопа</string>
+    <string name="session_gyroscope_enable_right_stick">Включить управление правым стиком через гироскоп</string>
+    <string name="session_gyroscope_activator_button">Кнопка активации гироскопа</string>
+    <string name="session_gyroscope_hold">Держать</string>
+    <string name="session_gyroscope_toggle">Переключать</string>
+    <string name="session_gyroscope_x_sensitivity">Чувствительность по оси X</string>
+    <string name="session_gyroscope_y_sensitivity">Чувствительность по оси Y</string>
+    <string name="session_gyroscope_smoothing">Сглаживание</string>
+    <string name="session_gyroscope_invert_x">Инвертировать ось X</string>
+    <string name="session_gyroscope_invert_y">Инвертировать ось Y</string>
+    <string name="session_gyroscope_filtering">Фильтрация</string>
+    <string name="session_gyroscope_deadzone">Мертвая зона</string>
+    <string name="session_gyroscope_sensitivity">Чувствительность</string>
+    <string name="session_gyroscope_direction">Направление</string>
+    <string name="session_gyroscope_mode">Режим активации гироскопа</string>
+    <string name="session_gyroscope_target_stick">Применить гироскоп к</string>
+    <string name="session_gyroscope_enable_stick">Включить управление аналоговым стиком через гироскоп</string>
+    <string name="session_gyroscope_reset_stick">Сбросить стик</string>
+    <string name="session_gyroscope_reset_stick_to_center">Сбросить стик в центр</string>
+    <string name="session_gyroscope_configuration">Конфигурация гироскопа</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Экспериментальное движение мыши</string>
+    <string name="session_gyroscope_x_sensitivity_format">Чувствительность X: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Чувствительность Y: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Сглаживание: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Мертвая зона: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Чувствительность: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Масштаб мыши</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Масштаб мыши: %1$d%%</string>
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">Скорость курсора</string>
+    <string name="settings_general_theme">Тема</string>
+    <string name="settings_general_background">Фон</string>
+    <string name="settings_general_background_color_hex">Цвет (шестнадцатеричный)</string>
+    <string name="settings_general_wallpaper_selected">Обои выбраны</string>
+    <string name="settings_general_select_wallpaper">Выбрать обои</string>
+    <string name="settings_general_title">Общие</string>
+    <string name="settings_general_enable_file_provider">Включить поставщика файлов</string>
+    <string name="settings_general_enable_auto_scraping">Включить автозагрузку обложек</string>
+    <string name="settings_general_take_effect_next_startup">Эта опция вступит в силу при следующем запуске.</string>
+    <string name="settings_general_imagefs">ImageFS</string>
+    <string name="settings_general_reinstall_imagefs">Переустановить ImageFS</string>
+    <string name="settings_general_confirm_reinstall_imagefs">Переустановить ImageFS? Эта операция восстановит системные файлы; ваши контейнеры не будут изменены.</string>
+    <string name="settings_general_refresh_rate">Частота обновления</string>
+    <string name="settings_general_refresh_rate_auto_max">Макс</string>
+    <string name="settings_general_refresh_rate_summary">Установите частоту обновления дисплея и ограничение кадров DXVK.</string>
+    <string name="settings_general_touchscreen_timeout">Тайм-аут сенсорного экрана (требуется перезагрузка)</string>
+    <string name="settings_general_touchscreen_haptics">Включить тактильную обратную связь с сенсорным экраном</string>
+    <string name="settings_general_open_with_android_browser">Открывать браузер Android в Wine</string>
+    <string name="settings_general_share_android_clipboard">Общий буфер обмена Android с Wine</string>
+    <string name="settings_general_paths_title">Настройки пути</string>
+    <string name="settings_general_paths_summary">Управляйте тем, где Winlator хранит свои рабочие данные и куда записываются экспортированные ярлыки.</string>
+    <string name="settings_general_winlator_path_title">Путь хранилища</string>
+    <string name="settings_general_shortcut_export_path_title">Путь экспорта ярлыков</string>
+    <string name="settings_general_choose_path">Выберите путь</string>
+    <string name="settings_general_xserver_cursor_summary">Настройте скорость указателя для сенсорного ввода, трекпада и мыши внутри сеанса XServer.</string>
+    <string name="settings_general_cursor_lock_title">Настоящее управление мышью</string>
+    <string name="settings_general_cursor_lock_summary">Сохраняет прямой захват мыши включенным для игр, которым требуется необработанный ввод указателя. Отключите его с помощью Volume Down.</string>
+    <string name="settings_general_xinput_toggle_title">Отключить XInput</string>
+    <string name="settings_general_xinput_toggle_summary">Отключает обработку XInput, если вам требуется единоличное управление мышью и клавиатурой.</string>
+    <string name="settings_external_display_output_summary">Переносит игру на подключённый внешний дисплей вместо зеркалирования этого экрана. Очки всегда используют собственный дисплей.</string>
+    <string name="settings_general_file_provider_summary">Предоставляйте файлы WinNative средствам выбора документов и файловым менеджерам Android.</string>
+    <string name="settings_general_auto_scraping_summary">Этот параметр позволяет WinNative автоматически загружать обложки пользовательских игр.</string>
+    <string name="settings_general_open_browser_summary">Открывайте поддерживаемые веб-ссылки в браузере Android, а не внутри Wine.</string>
+    <string name="settings_general_clipboard_summary">Разрешить копирование и вставку между сеансами Android и Wine.</string>
+    <string name="settings_general_imagefs_summary">Восстановите связанные системные файлы, не удаляя существующие контейнеры.</string>
+    <string name="settings_general_check_for_updates">Проверять обновления</string>
+    <string name="settings_general_check_for_updates_summary">Автоматически проверять наличие новых версий приложений при запуске и периодически.</string>
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI SoundFont</string>
+    <string name="settings_audio_sound">Звук</string>
+    <string name="settings_audio_confirm_remove_sound_font">Вы хотите удалить этот звуковой шрифт?</string>
+    <string name="settings_audio_sound_font_removed_success">Soundfont успешно удален!</string>
+    <string name="settings_audio_sound_font_removed_failed">Не удалось удалить SoundFont!</string>
+    <string name="settings_audio_sound_font_installed_success">Soundfont успешно установлен!</string>
+    <string name="settings_audio_sound_font_installed_failed">Не удалось установить Soundfont!</string>
+    <string name="settings_audio_sound_font_already_exist">Звуковой шрифт, который вы хотите установить, уже существует.</string>
+    <string name="settings_audio_unable_to_install_soundfont">Не удалось установить SoundFont</string>
+    <string name="settings_audio_installing_soundfont">Установка SoundFont</string>
+    <string name="settings_audio_sound_font_bad_format">Неправильный формат SoundFont.</string>
+    <string name="settings_audio_cannot_remove_default">Невозможно удалить звуковой шрифт по умолчанию</string>
+    <string name="settings_audio_summary">Установите, удалите и выберите SoundFont, используемый для воспроизведения MIDI.</string>
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Канал отладки Wine</string>
+    <string name="settings_debug_title">Отладка</string>
+    <string name="settings_debug_wine_logs_title">Включить журналы отладки Wine</string>
+    <string name="settings_debug_wine_logs_subtitle">Записать отладочный вывод Wine в файл</string>
+    <string name="settings_debug_box_logs_title">Включить журналы Box86/64</string>
+    <string name="settings_debug_box_logs_subtitle">Записывать отладочный вывод Box86 и Box64 в файл.</string>
+    <string name="settings_debug_fex_logs_title">Включить журналы FEXCore</string>
+    <string name="settings_debug_fex_logs_subtitle">Записывать отладочный вывод FEXCore в файл</string>
+    <string name="settings_debug_emulator_logs_title">Журналы эмуляции Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Записывает в файл эмулятор, который использует ваш контейнер.</string>
+    <string name="settings_debug_steam_logs_title">Включить журналы Steam</string>
+    <string name="settings_debug_steam_logs_subtitle">Записывать события аутентификации Steam и сеанса для отладки.</string>
+    <string name="settings_debug_wine_channels_title">Каналы отладки Wine</string>
+    <string name="settings_debug_wine_channels_summary">Выберите, какие каналы Wine будут включены, если включено ведение журнала отладки Wine.</string>
+    <string name="settings_debug_wine_classes_title">Уровни журнала Wine</string>
+    <string name="settings_debug_wine_classes_summary">Выберите, какие типы сообщений записывать. Trace очень подробный.</string>
+    <string name="settings_debug_input_logs">Входные журналы</string>
+    <string name="settings_debug_input_logs_description">Записывать события ввода с геймпада, сенсорного экрана и клавиатуры.</string>
+    <string name="settings_debug_download_logs">Журналы загрузок</string>
+    <string name="settings_debug_download_logs_description">Записывать события загрузок и резервного копирования WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Слои валидации Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Перезапустите дисплей, чтобы применить.</string>
+    <string name="settings_debug_share_logs">Поделиться журналами</string>
+    <string name="settings_debug_delete_logs">Удалить журналы</string>
+    <string name="settings_debug_share_all_logs_short">Поделиться всеми</string>
+    <string name="settings_debug_download_all_logs_short">Скачать все</string>
+    <string name="settings_debug_logs_saved">Сохранено в %1$s</string>
+    <string name="settings_debug_delete_logs_short">Удалить</string>
+    <string name="settings_debug_delete_all_logs_short">Удалить все</string>
+    <string name="settings_debug_open_logs_folder_short">Открыть диспетчер журналов</string>
+    <string name="settings_debug_logs_deleted">Журналы удалены</string>
+    <string name="settings_debug_delete_logs_confirm_title">Удалить журналы?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Это навсегда удалит все сохраненные файлы журналов (%1$s). Действие нельзя отменить.</string>
+    <string name="settings_debug_logs_browser_title">Журналы</string>
+    <string name="settings_debug_log_truncated">Показаны последние %1$s этого журнала</string>
+    <string name="settings_debug_logs_subject">Журналы WinNative (%1$s)</string>
+    <string name="settings_debug_no_logs_available">Журналы отладки отсутствуют. Сначала включите параметры отладки и запустите игру.</string>
+    <string name="settings_debug_capture_failed">Не удалось записать журналы: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">Записывать ошибки процесса WinNative, предупреждения и сбои в файл.</string>
+    <string name="settings_debug_section_emulation">Эмуляция</string>
+    <string name="settings_debug_section_subsystems">Подсистемы</string>
+    <string name="settings_debug_section_tools">Инструменты</string>
+    <string name="settings_debug_no_channels_selected">Каналы не выбраны</string>
+    <string name="settings_debug_no_channels_available">Нет доступных каналов</string>
+    <string name="settings_debug_channel_toggle_hint">Нажмите, чтобы переключить каналы. Включенные каналы включаются в выходные данные отладки Wine.</string>
+    <string name="settings_debug_remove_channel_desc">Удалить %1$s</string>
+    <string name="settings_other_language_title">Язык</string>
+    <string name="settings_other_language_summary">Выберите язык интерфейса</string>
+    <string name="settings_other_game_language_title">Язык игры</string>
+    <string name="settings_other_game_language_summary">Предпочитаемый язык для загрузок Steam/Epic/GOG</string>
+    <string name="settings_other_language_system_default">Системный язык</string>
+    <string name="settings_other_section_integration">Интеграция</string>
+    <string name="settings_other_setup_wizard_title">Мастер установки</string>
+    <string name="settings_other_setup_wizard_summary">Снова откройте мастер установки, чтобы просмотреть разрешения, системные файлы и контейнеры по умолчанию.</string>
+    <string name="settings_other_checking_for_updates">Проверка обновлений\u2026</string>
+    <string name="settings_other_update_check_cooldown">Подождите %1$d перед повторной проверкой.</string>
+    <string name="settings_other_persistable_permission_failed">Не удалось получить постоянные разрешения: %1$s</string>
+    <string name="settings_other_keep_app_open">Пожалуйста, оставьте приложение открытым, пока это закончится.</string>
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">Установить контент</string>
+    <string name="settings_content_type">Категория</string>
+    <string name="settings_content_components">Компоненты</string>
+    <string name="settings_content_auto_create_container">Автоматическое создание контейнера</string>
+    <string name="settings_content_remove_title">Удалить компонент?</string>
+    <string name="settings_content_empty_subtitle">Чтобы начать работу, установите пакет или переключите тип.</string>
+    <string name="settings_content_container_created">Контейнер создан: %1$s.</string>
+    <string name="settings_content_download_failed">Загрузка не удалась.</string>
+    <string name="common_ui_working">Выполняется</string>
+    <string name="settings_content_desc_wine">Создано проектом Wine; преобразует вызовы Win32 в собственные службы Linux/Android.</string>
+    <string name="settings_content_desc_proton">Создано Valve; среда выполнения на основе Wine с игровыми патчами для игр Windows.</string>
+    <string name="settings_content_desc_dxvk">Преобразует графические вызовы Direct3D 9, 10 и 11 в Vulkan.</string>
+    <string name="settings_content_desc_vkd3d">Преобразует графические вызовы Direct3D 12 в Vulkan.</string>
+    <string name="settings_content_desc_box64">Преобразует код Linux x86_64, чтобы он мог работать на устройствах ARM64.</string>
+    <string name="settings_content_desc_wowbox64">Сборка Box64, используемая WoW64 для запуска 32-битных приложений Windows внутри 64-битной версии Wine.</string>
+    <string name="settings_content_desc_fexcore">Преобразует код x86 и x86_64, чтобы он мог работать на устройствах ARM64.</string>
+    <string name="settings_content_desc_d7vk">Преобразует графические вызовы DirectDraw (Direct3D 7 и более ранних версий) в Vulkan.</string>
+    <string name="settings_content_unable_to_install">Невозможно установить контент.</string>
+    <string name="settings_content_install_failed">Установка не удалась</string>
+    <string name="settings_content_file_cannot_be_recognized">Файл не может быть распознан.</string>
+    <string name="settings_content_profile_not_found">Профиль не найден в пакете контента.</string>
+    <string name="settings_content_profile_cannot_be_recognized">Профиль не может быть распознан</string>
+    <string name="settings_content_file_list">Список файлов</string>
+    <string name="settings_content_install_directory">Каталог установки</string>
+    <string name="settings_content_installed_success">Контент успешно установлен!</string>
+    <string name="settings_content_downloading_title">Загрузка контента</string>
+    <string name="settings_content_installing_title">Установка контента</string>
+    <string name="settings_content_extracting_title">Извлечение контента</string>
+    <string name="settings_content_extracting_detail">Извлечение (%1$d файлов)</string>
+    <string name="settings_content_preparing_package">Готовим пакет</string>
+    <string name="settings_content_download_complete">Загрузка завершена</string>
+    <string name="settings_content_already_installed_title">Компонент уже установлен</string>
+    <string name="settings_content_already_installed_message">Этот компонент уже установлен. Удалите установленную копию перед повторной загрузкой.
+
+Установленный путь:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Установлен конфликтующий контент</string>
+    <string name="settings_content_conflicting_message">Удалите конфликтующее содержимое перед загрузкой этого пакета.
+
+Установленный путь:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">Этому контенту нельзя доверять.</string>
+    <string name="settings_content_is_incomplete">Контент неполный.</string>
+    <string name="settings_content_untrusted_files_warning">Внимание: дополнительный контент содержит ненадежные файлы. Как правило, следующие файлы не следует изменять. Пожалуйста, решите, продолжать ли установку.</string>
+    <string name="settings_content_confirm_remove">Это удалит компонент с вашего устройства.</string>
+    <string name="settings_content_unable_to_remove_in_use">Невозможно удалить это содержимое, поскольку контейнер сейчас использует этот Wine.</string>
+    <string name="settings_content_download_in_components">Ничего не скачано. Загрузите один из компонентов.</string>
+    <string name="settings_content_types_header">ТИПЫ КОНТЕНТА</string>
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Драйверы</string>
+    <string name="settings_drivers_manager_header">Менеджер драйверов</string>
+    <string name="settings_drivers_github_repos">Репозитории GitHub</string>
+    <string name="settings_drivers_install">Установить драйверы</string>
+    <string name="settings_drivers_installed_success">Драйвер успешно установлен.</string>
+    <string name="settings_drivers_install_failed">Не удалось установить драйвер.</string>
+    <string name="settings_drivers_remove_title">Удалить драйвер?</string>
+    <string name="settings_drivers_confirm_remove">Это удалит драйвер с вашего устройства.</string>
+    <string name="settings_drivers_remove_repo_title">Удалить репозиторий?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s будет удален из списка репозиториев.</string>
+    <string name="settings_drivers_repo_tap_to_load">Нажмите, чтобы загрузить выпуски</string>
+    <string name="settings_drivers_repo_loading_releases">Загрузка выпусков</string>
+    <string name="settings_drivers_repo_release_count">Загружено релизов: %1$d</string>
+    <string name="settings_drivers_repo_no_release_assets">В полученных выпусках не обнаружено загружаемых ZIP-ресурсов.</string>
+    <string name="settings_drivers_repo_fetch_failed">Не удалось загрузить выпуски GitHub.</string>
+    <string name="settings_drivers_repo_download_failed">Загрузка не удалась.</string>
+    <string name="settings_drivers_repo_no_version">Версия недоступна</string>
+    <string name="settings_drivers_repo_unknown_size">Неизвестный размер</string>
+    <string name="settings_drivers_manager">Менеджер драйверов</string>
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">Установка системных файлов</string>
+    <string name="setup_wizard_unable_to_install_system_files">Не удалось установить системные файлы</string>
+    <string name="setup_wizard_system_image_not_installed">Образ системы не установлен. Сначала установите компоненты.</string>
+    <string name="setup_wizard_recommended_components">Рекомендуемые компоненты</string>
+    <string name="setup_wizard_step_format">Шаг %1$d из %2$d</string>
+    <string name="setup_wizard_allow_file_access">Разрешить полный доступ к файлам</string>
+    <string name="setup_wizard_install_system_files">Установить системные файлы</string>
+    <string name="setup_wizard_recommended_components_description">Рекомендуемые компоненты автоматически скачивают и устанавливают поддерживаемые пакеты DXVK, VKD3D, FEX, Box64 и Wowbox64.</string>
+    <string name="setup_wizard_each_button_downloads_description">Каждая кнопка загружает пакет, устанавливает его и автоматически создает контейнер по умолчанию.</string>
+    <string name="setup_wizard_recommended_x86_64">Рекомендуемый x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">Рекомендуемый ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">Выберите компоненты для установки. Wine/Proton автоматически создаст контейнер.</string>
+    <string name="setup_wizard_loading_components">Загрузка компонентов\u2026</string>
+    <string name="setup_wizard_no_components_available">В этой категории нет доступных компонентов.</string>
+    <string name="setup_wizard_default_settings">Настройки по умолчанию</string>
+    <string name="setup_wizard_containers">Настройка контейнера</string>
+    <string name="setup_wizard_containers_description">Откройте каждый контейнер и задайте настройки по умолчанию, которые должна унаследовать каждая новая игра. Новые игры по умолчанию будут использовать контейнер x86-64.</string>
+    <string name="setup_wizard_store_sign_in_optional">Вход в магазины необязателен. После завершения каждого входа вы вернетесь сюда.</string>
+    <string name="setup_wizard_granted">Разрешено</string>
+    <string name="setup_wizard_grant">Предоставить</string>
+    <string name="setup_wizard_denied">Запрещено</string>
+    <string name="setup_wizard_allow">Разрешить</string>
+    <string name="setup_wizard_installing">Установка</string>
+    <string name="setup_wizard_install_failed_reason">Не удалось установить: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Требуемый доступ</string>
+    <string name="setup_wizard_select_components">Выберите компоненты</string>
+    <string name="setup_wizard_recommended_wine_proton">Рекомендуется Wine/Proton</string>
+    <string name="setup_wizard_advanced_setup">Расширенная настройка</string>
+    <string name="setup_wizard_title">Мастер установки</string>
+    <string name="setup_wizard_advanced_user">Опытный пользователь</string>
+    <string name="setup_wizard_next">Далее</string>
+    <string name="setup_wizard_finish">Готово</string>
+    <string name="setup_wizard_download_and_install">Скачать + Установить</string>
+    <string name="setup_wizard_open_drivers">Открыть драйверы</string>
+    <string name="setup_wizard_ready">Готово</string>
+    <string name="setup_wizard_download_and_create">Скачать + Создать</string>
+    <string name="setup_wizard_configured">Настроено</string>
+    <string name="setup_wizard_downloading">Скачивание %1$s</string>
+    <string name="setup_wizard_installing_package">Установка %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">Пакеты Wine или Proton пока не установлены.</string>
+    <string name="setup_wizard_no_runtime_hint">Установите пакет Wine или Proton из предыдущего шага или пока пропустите его.</string>
+    <string name="setup_wizard_recommended_label">Рекомендуется</string>
+    <string name="setup_wizard_install_all_recommended">Установить все рекомендуемые</string>
+    <string name="setup_wizard_create_container">Создать контейнер</string>
+    <string name="setup_wizard_creating_container">Создание\u2026</string>
+    <string name="input_controls_tap_to_click">Касание для клика</string>
+    <string name="input_controls_reverse_binding_order">Обратный порядок привязок</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Авторизация</string>
+    <string name="steam_login_sign_in_to_your_account">Войдите в свою учетную запись</string>
+    <string name="steam_login_username">Имя пользователя</string>
+    <string name="steam_login_password">Пароль</string>
+    <string name="steam_login_invalid_username_or_password">Неверное имя пользователя или пароль</string>
+    <string name="steam_login_remember_me">Запомнить меня</string>
+    <string name="steam_login_sign_in_with_qr_code">Войти по QR-коду</string>
+    <string name="steam_login_open_steam_app_qr_hint">Откройте приложение Steam → нажмите значок QR</string>
+    <string name="steam_login_failed_to_load_qr_code">Не удалось загрузить QR-код.</string>
+    <string name="steam_login_retry">Повторить</string>
+    <string name="steam_login_generating_code">Генерация кода\u2026</string>
+    <string name="steam_login_two_factor_auth">Двухфакторная аутентификация</string>
+    <string name="steam_login_approve_login_steam_app">Подтвердите этот вход\nв мобильном приложении Steam</string>
+    <string name="steam_login_enter_code_sent_to">Введите код, отправленный на\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">Введите код Steam Guard</string>
+    <string name="steam_login_code">Код</string>
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Облачная синхронизация</string>
+    <string name="google_cloud_sync_started">Синхронизация с облаком началась.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Сервисы Google</string>
+    <string name="google_auto_signin_title">Вход в Google при запуске</string>
+    <string name="google_auto_signin_summary">Автоматически подключаться к Google Play Games при запуске приложения, чтобы резервные копии сохранений и синхронизация всегда были готовы. Когда выключено, приложение никогда не входит само.</string>
+    <string name="google_auto_signin_section">При запуске</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">Синхронизация</string>
+    <string name="google_cloud_status_connected">Подключено</string>
+    <string name="google_cloud_status_not_signed_in">Вход не выполнен</string>
+    <string name="google_cloud_working">Выполняется\u2026</string>
+    <string name="google_cloud_sign_in">Войти</string>
+    <string name="google_cloud_disable_sync">Отключить синхронизацию</string>
+    <string name="google_cloud_store_logins">Данные входа в магазины</string>
+    <string name="google_cloud_store_login_sync_busy">Синхронизация данных входа в магазины\u2026</string>
+    <string name="google_cloud_saved_games_unavailable">Google Saved Games недоступны</string>
+    <string name="google_cloud_snapshot_ready">Облачный снимок готов</string>
+    <string name="google_cloud_waiting_first_backup">Ожидание первой резервной копии</string>
+    <string name="google_cloud_no_store_logins_detected">Данные входа в магазины не обнаружены</string>
+    <string name="google_cloud_last_synced">Последняя синхронизация: %1$s</string>
+    <string name="google_cloud_backup">Резервная копия</string>
+    <string name="google_cloud_restore">Восстановить</string>
+    <string name="google_cloud_sign_in_to_sync">Войдите в Google Play Games, чтобы синхронизировать данные входа в магазины.</string>
+    <string name="google_cloud_sign_in_failed">Не удалось войти в Google Play Games.</string>
+    <string name="google_cloud_sign_in_finishing">Вход в Google Play Games еще завершается. Подождите немного и повторите облачную синхронизацию.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games подключен. Для %1$s доступно восстановление.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games подключен. Нажмите «Резервная копия», чтобы сохранить данные входа для %1$s.</string>
+    <string name="google_cloud_connected_ready">Google Play Games подключен. Резервное копирование и восстановление готовы.</string>
+    <string name="google_cloud_sync_disabled">Синхронизация Google Play Games отключена для этого приложения.</string>
+    <string name="google_cloud_sign_in_first">Сначала войдите в Google Play Games.</string>
+    <string name="google_cloud_no_saved_logins_found">При облачной синхронизации Google не обнаружены сохраненные данные входа в магазины.</string>
+    <string name="google_cloud_backup_already_matches">Облачная резервная копия уже соответствует текущим данным входа в магазины.</string>
+    <string name="google_cloud_no_local_logins">Нет локальных данных входа в магазины для резервного копирования.</string>
+    <string name="google_cloud_logins_restored_and_synced">Данные входа в магазины восстановлены и синхронизированы для %1$s.</string>
+    <string name="google_cloud_logins_restored">Данные входа в магазины восстановлены для %1$s.</string>
+    <string name="google_cloud_logins_backed_up">Данные входа в магазины сохранены в резервной копии для %1$s.</string>
+    <string name="google_cloud_sync_ready">Синхронизация данных входа в магазины готова.</string>
+    <string name="google_cloud_no_logins_to_sync">Пока нет данных входа в магазины для синхронизации.</string>
+    <string name="google_cloud_sign_in_to_backup">Войдите, чтобы создать резервную копию токенов входа для %1$s.</string>
+    <string name="google_cloud_no_backed_up_logins">Резервные копии данных входа в магазины пока не найдены.</string>
+    <string name="google_cloud_local_cloud_differ">Локальные и облачные данные входа в магазины различаются. Используйте «Резервное копирование», чтобы перезаписать облачные данные, или «Восстановить», чтобы получить сохраненные токены.</string>
+    <string name="google_cloud_local_ready_to_backup">Локальные данные входа в магазины готовы к резервному копированию для %1$s.</string>
+    <string name="google_cloud_backup_ready">Резервная копия данных входа в магазины готова.</string>
+    <string name="google_cloud_restore_available">Доступно восстановление облачных логинов для %1$s.</string>
+    <string name="google_cloud_logins_synced">Данные входа в магазины синхронизированы с Google Play Games.</string>
+    <string name="google_cloud_sync_problem">При синхронизации данных входа в магазины возникла проблема.</string>
+    <string name="google_cloud_error_auth_needed">Google Play Games нужно завершить аутентификацию, прежде чем облачная синхронизация сможет получить доступ к Saved Games. Откройте запрос профиля Play Games, если он показан, затем повторите попытку.</string>
+    <string name="google_cloud_error_developer">Google Play Games Saved Games отклонили эту сборку. Проверьте ID приложения Play Games, имя связанного пакета и сертификат подписи в Play Console.</string>
+    <string name="google_cloud_error_build_rejected">Учетная запись Google подключена, но Google Play Games Saved Games отклонили эту сборку. Проверьте ID приложения Play Games, связанный пакет и сертификат подписи.</string>
+    <string name="google_cloud_error_network">Облачная синхронизация Google не удалась, потому что сетевой запрос не завершился или службы Google Play требуют внимания.</string>
+    <string name="google_cloud_error_no_snapshot">В облачной синхронизации Google пока не обнаружены сохраненные данные входа в магазины.</string>
+    <string name="google_cloud_error_generic">Не удалось выполнить облачную синхронизацию Google: %1$s</string>
+    <string name="google_cloud_error_before_open">Облачная синхронизация Google не удалась до открытия Google Saved Games.</string>
+    <string name="cloud_saves_title">Облачные сохранения</string>
+    <string name="cloud_saves_title_for_provider">Облачные сохранения %1$s - %2$s</string>
+    <string name="cloud_saves_sync_summary">Получить версию, которая сейчас есть у %1$s.</string>
+    <string name="cloud_saves_sync_summary_generic">Получить текущую облачную версию.</string>
+    <string name="cloud_saves_no_backups">Для этой игры пока нет резервных копий.</string>
+    <string name="cloud_sync_title">Автоматическая синхронизация с облаком</string>
+    <string name="cloud_sync_enabled_summary">Скачивать при запуске, отправлять при выходе.</string>
+    <string name="cloud_sync_disabled_summary">Запускать без скачивания облачных сохранений и синхронизации при выходе.</string>
+    <string name="cloud_saves_offline_mode">Отключить облачную синхронизацию</string>
+    <string name="cloud_saves_offline_mode_summary">Останавливает всю автоматическую облачную активность для этой игры.</string>
+    <string name="cloud_saves_backing_up">Резервное копирование облачного сохранения\u2026</string>
+    <string name="cloud_saves_restoring">Восстановление облачного сохранения\u2026</string>
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">Синхронизировать из облака %1$s</string>
+    <string name="cloud_saves_sync_from_provider_generic">Синхронизировать из облака</string>
+    <string name="cloud_saves_syncing_from_provider">Скачивание сохранения из облака %1$s</string>
+    <string name="cloud_saves_sync_from_provider_success">Облачное сохранение из %1$s скачано.</string>
+    <string name="cloud_saves_sync_from_provider_failed">Не удалось скачать сохранение из облака %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Управление облачными сохранениями GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Открывает официальный сайт GOG.</string>
+    <string name="cloud_saves_gog_manage_no_browser">Нет браузера, позволяющего открыть страницу облачных сохранений GOG.</string>
+    <string name="cloud_saves_gog_zip_label">Скачать ZIP облачных сохранений GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Сохранить текущие облачные файлы</string>
+    <string name="cloud_saves_gog_zip_success">ZIP облачных сохранений GOG сохранен.</string>
+    <string name="cloud_saves_gog_zip_failed">Не удалось сохранить ZIP облачных сохранений GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Файлы облачного сохранения GOG не найдены.</string>
+    <string name="cloud_saves_history_title">История сохранений</string>
+    <string name="cloud_saves_history_download">Скачать</string>
+    <string name="cloud_saves_history_download_success">Файл скачан.</string>
+    <string name="cloud_saves_history_download_failed">Не удалось скачать.</string>
+    <string name="cloud_saves_history_empty">Предыдущие сохранения еще не сохранены. Замененные сохранения и ручные резервные копии будут появляться здесь в течение 30 дней.</string>
+    <string name="cloud_saves_history_loading">Загрузка истории сохранений\u2026</string>
+    <string name="cloud_saves_history_sign_in">Войдите в Google, чтобы просмотреть историю сохранений.</string>
+    <string name="cloud_saves_history_origin_local">локально</string>
+    <string name="cloud_saves_history_origin_cloud">облако</string>
+    <string name="cloud_saves_history_origin_manual">вручную</string>
+    <string name="cloud_saves_history_origin_auto">авто</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Восстановить</string>
+    <string name="cloud_saves_history_restore_confirm_title">Восстановить эту резервную копию?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Это заменит ваше текущее локальное сохранение резервной копией от %1$s.</string>
+    <string name="cloud_saves_history_restore_success">Сохранение восстановлено из резервной копии.</string>
+    <string name="cloud_saves_history_restore_failed">Не удалось восстановить эту резервную копию.</string>
+    <string name="cloud_saves_keep_replaced_backup">Сохранять резервную копию заменяемого сохранения</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Если передумаете, его можно восстановить из истории сохранений.</string>
+    <string name="cloud_saves_history_refresh">Обновить</string>
+    <string name="cloud_saves_history_rename">Переименовать</string>
+    <string name="cloud_saves_history_rename_title">Назовите эту резервную копию</string>
+    <string name="cloud_saves_history_rename_hint">например: Босс, Перед финалом</string>
+    <string name="cloud_saves_history_rename_save">Сохранить</string>
+    <string name="cloud_saves_history_rename_clear">Очистить</string>
+    <string name="cloud_saves_history_rename_success">Резервная копия переименована.</string>
+    <string name="cloud_saves_history_rename_failed">Не удалось переименовать резервную копию.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Выбрать папку сохранений</string>
+    <string name="cloud_saves_custom_folder_label">Папка сохранений</string>
+    <string name="cloud_saves_custom_select_folder_summary">Укажите каталог сохранений внутри контейнера</string>
+    <string name="cloud_saves_custom_no_container">Контейнер недоступен для этого ярлыка</string>
+    <string name="cloud_saves_custom_picker_title">Выбрать папку сохранений</string>
+    <string name="cloud_saves_custom_outside_drive_c">Выбранная папка должна находиться внутри диска C: контейнера</string>
+    <string name="cloud_saves_custom_path_map_failed">Не удалось сопоставить выбранную папку с путем Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Папка сохранений задана: %1$s</string>
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Синхронизация с Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Скачать последнее сохранение</string>
+    <string name="cloud_saves_steam_sync_success">Синхронизировано с Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Не удалось синхронизировать Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_label">Просмотреть сохранения Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Открыть облачное хранилище</string>
+    <string name="cloud_saves_steam_browse_no_browser">Нет браузера, позволяющего открыть страницу Steam.</string>
+    <string name="cloud_saves_steam_import_label">Импортировать файлы</string>
+    <string name="cloud_saves_steam_import_helper">Восстановить скачанные файлы</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Средство выбора файлов недоступно</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Это скачает текущие файлы сохранений из Steam Cloud и перезапишет текущие файлы сохранений.</string>
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Неверный идентификатор приложения</string>
+    <string name="cloud_saves_label_saved">Метка сохранена.</string>
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Сохранения</string>
+    <string name="saves_import_export_confirm_selection">Подтвердить выбор</string>
+    <string name="saves_import_export_select_directory">Выберите каталог сохранений</string>
+    <string name="saves_import_export_up_directory">На уровень выше</string>
+    <string name="saves_import_export_select_container">Целевой контейнер:</string>
+    <string name="saves_import_export_exported">Сохранения успешно экспортированы.</string>
+    <string name="saves_import_export_exported_failed">Не удалось экспортировать сохранения: %1$s</string>
+    <string name="saves_import_export_imported">Сохранения успешно импортированы</string>
+    <string name="saves_import_export_imported_failed">Не удалось импортировать сохранения: %1$s</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Контейнер</string>
+    <string name="preloader_initializing">Инициализация</string>
+    <string name="preloader_launching">Запуск</string>
+    <string name="preloader_closing">Закрытие %1$s</string>
+    <string name="preloader_setup_environment">Настройка среды</string>
+    <string name="preloader_retrying_steam_client_download">Повторная попытка загрузки клиента Steam</string>
+    <string name="preloader_installing_mono">Установка Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Установка распространяемых компонентов</string>
+    <string name="preloader_unpacking_exe">Распаковка исполняемого файла игры</string>
+    <string name="preloader_downloading_cloud">Загрузка облачных сохранений</string>
+    <string name="preloader_syncing_cloud">Синхронизация сохранений в облаке</string>
+    <string name="preloader_uploading_cloud">Загрузка сохранений в облако</string>
+    <string name="preloader_checking_cloud">Проверка сохранений в облаке</string>
+    <string name="preloader_cloud_sync_retry">%1$s: повтор %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Скачивание облачных сохранений</string>
+    <string name="cloud_sync_failed_provider">Не удалось синхронизировать облачное сохранение %1$s.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Пользовательская игра</string>
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Записывать производительность в файл</string>
+    <string name="settings_hud_record_to_file_summary">Экспортировать ежесекундные показатели FPS, CPU, GPU, температуры и батареи в /WinNative/logs/ во время игры.</string>
+    <string name="settings_leaderboard_category">Производительность</string>
+    <string name="saves_import_warning_title">Это перезапишет существующие сохранения в этом контейнере</string>
+    <string name="saves_import_warning_body">При восстановлении старой резервной копии с несколькими играми сначала скопируйте более новые сохранения в zip-файл с помощью файлового менеджера. Будут затронуты только сохранения, имеющиеся в .zip-файле. Управляйте сохранениями разумно.</string>
+    <string name="saves_export_path_summary">Сохранения будут экспортированы в /WinNative/saves</string>
+    <string name="saves_export_success_path">Экспортировано в %1$s</string>
+    <string name="saves_export_warning_title">Используйте только для пользовательских игр</string>
+    <string name="saves_export_warning_body">Экспорт может включать сохранения из игр, установленных из магазинов, или игр с облачной синхронизацией.</string>
+    <string name="common_ui_exporting">Экспорт</string>
+    <string name="downloads_queue_cancel_download_confirm">Отменить загрузку %1$s и удалить все скачанные файлы?</string>
+    <string name="downloads_queue_this_game">эта игра</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Использовать устаревший лаунчер</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Устаревшая эмуляция Steam: запускает игру через лаунчер ColdClient и удаляет SteamStub DRM из exe. Используйте только для старых игр, которые не работают со Steam Launcher.</string>
+    <string name="steam_section_real_client">Настоящий клиент Steam WinNative</string>
+    <string name="steam_section_emulator">Устаревший эмулятор Steam</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Заставляет эмулируемый клиент Steam сообщать, что он офлайн, чтобы игра не пыталась подключаться к сети. Используйте для игр, которые зависают на сетевой проверке Steam.</string>
+    <string name="cloud_sync_disable_title">Отключить облачные сохранения</string>
+    <string name="cloud_saves_steam_push_label">Отправить в Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Принудительно загрузить локальное сохранение</string>
+    <string name="cloud_saves_steam_push_success">Сохранение отправлено в Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Не удалось отправить сохранение в Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud сейчас недоступен. Повторное подключение выполняется в фоне нажмите обновить, когда снова будете онлайн.</string>
+    <string name="steam_session_refused_event">Steam отклонил кэшированную сессию (EResult=%1$d). Войдите снова.</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Подготовка среды Steam</string>
+    <string name="preloader_starting_wine">Запуск Wine</string>
+    <string name="preloader_starting_steam_launcher">Запуск Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Загрузка клиента Steam</string>
+    <string name="preloader_connecting_to_steam">Подключение к Steam</string>
+    <string name="preloader_signing_in_to_steam">Вход в Steam</string>
+    <string name="preloader_fetching_game_info">Вход выполнен — получение информации об игре</string>
+    <string name="preloader_steam_ready">Steam готов</string>
+    <string name="preloader_updating_game_info">Обновление информации об игре</string>
+    <string name="preloader_verifying_install">Проверка установки</string>
+    <string name="preloader_scanning_redists">Поиск распространяемых компонентов</string>
+    <string name="preloader_installing_redist_single">Установка распространяемого компонента</string>
+    <string name="preloader_installing_named_redist">Установка %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Установка %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Распространяемые компоненты готовы</string>
+    <string name="preloader_no_redists">Нет распространяемых компонентов для установки</string>
+    <string name="preloader_steam_service_running">Служба Steam запущена</string>
+    <string name="preloader_launching_game">Запуск %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Сбой Steam Launcher — повторная подготовка ресурсов</string>
+    <string name="preloader_steam_launcher_start_failed">Не удалось запустить Steam Launcher. Повторная подготовка — запустите снова</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher дошёл до игры, но она не запустилась</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Загрузка элементов Workshop</string>
+    <string name="workshop_search_items">Поиск элементов Workshop</string>
+    <string name="workshop_title">МАСТЕРСКАЯ STEAM</string>
+    <string name="workshop_loading_subtitle">Получение предметов, на которые вы подписаны, из Steam.</string>
+    <string name="workshop_error_title">Не удалось загрузить предметы Мастерской</string>
+    <string name="workshop_error_subtitle">Что-то пошло не так. Повторите попытку.</string>
+    <string name="workshop_empty_title">Нет предметов Мастерской, на которые вы подписаны</string>
+    <string name="workshop_empty_subtitle">Подпишитесь на предметы в Мастерской Steam, затем снова откройте это окно.</string>
+    <string name="workshop_search_empty_title">Нет предметов, соответствующих \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Попробуйте другой поисковый запрос.</string>
+    <string name="workshop_clear_search">Очистить поиск</string>
+    <string name="workshop_item_fallback">Предмет Мастерской</string>
+    <string name="common_ui_failed">Ошибка</string>
+    <string name="steam_presence_snooze">Спящий режим</string>
+    <string name="steam_presence_busy">Занят</string>
+    <string name="steam_presence_looking_to_trade">Хочет обмен</string>
+    <string name="steam_presence_looking_to_play">Хочет играть</string>
+    <string name="steam_friends_count">Друзья — %1$d в сети</string>
+    <string name="steam_friends_section_in_game">В игре (%1$d)</string>
+    <string name="steam_friends_section_online">В сети (%1$d)</string>
+    <string name="steam_friends_section_offline">Не в сети (%1$d)</string>
+    <string name="steam_friends_none_loaded">Друзья ещё не загружены.</string>
+    <string name="steam_friends_chat_off">Чат выключен. Снова включите Службу чата, чтобы видеть друзей.</string>
+    <string name="steam_friends_self_you">Вы</string>
+    <string name="steam_friends_in_game">В игре</string>
+    <string name="steam_friends_join">Войти</string>
+    <string name="steam_friends_play">Играть</string>
+    <string name="steam_chat_image_failed">(не удалось отправить изображение)</string>
+    <string name="steam_chat_empty">Сообщений пока нет. Поздоровайтесь!</string>
+    <string name="steam_chat_uploading_image">Отправка изображения…</string>
+    <string name="steam_chat_send_image">Отправить изображение</string>
+    <string name="steam_chat_message_hint">Сообщение…</string>
+    <string name="steam_chat_send">Отправить</string>
+    <string name="steam_chat_image">Изображение</string>
+    <string name="steam_common_back">Назад</string>
+    <string name="steam_achievements_title">Достижения</string>
+    <string name="steam_achievements_empty">Достижения для этой игры не найдены,\nили войдите в Steam, чтобы загрузить их.</string>
+    <string name="steam_achievements_hidden">Скрытое достижение</string>
+    <string name="steam_achievements_hidden_desc">Продолжайте играть, чтобы открыть это достижение.</string>
+    <string name="steam_achievements_unlocked_on">Получено %1$s</string>
+    <string name="steam_achievements_unlocked">Получено</string>
+    <string name="steam_join_joining">Подключение к %1$s в %2$s…</string>
+    <string name="steam_join_install">Установите %1$s, чтобы подключиться к %2$s</string>
+    <string name="steam_join_not_owned">У вас нет %1$s</string>
+    <string name="steam_chat_not_sent">(не отправлено)</string>
+    <string name="steam_join_the_game">игру</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Служба чата</string>
+    <string name="steam_chat_setting_service_desc">Войдите, чтобы видеть друзей и общаться в чате; выключите, чтобы перейти в офлайн</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Вывод</string>
+    <string name="display_output_prompt_title">Обнаружен внешний дисплей</string>
+    <string name="display_output_prompt_message">Отправить игру на подключённый дисплей? Экранные элементы управления и меню останутся на этом телефоне.</string>
+    <string name="display_output_prompt_swap">Переключить дисплеи</string>
+    <string name="display_output_prompt_mirror">Дублировать</string>
+    <string name="display_output_swapped_toast">Игра перенесена на внешний дисплей. Управление остаётся на телефоне.</string>
+    <string name="display_output_cast_unavailable">Настройки беспроводного дисплея недоступны на этом устройстве.</string>
+    <string name="display_output_restored_toast">Внешний дисплей отключён — игра вернулась на телефон.</string>
+    <string name="session_drawer_output_title">Вывод изображения</string>
+    <string name="session_drawer_output_subtitle">Игра отображается на внешнем дисплее.</string>
+    <string name="session_drawer_output_device">Подключённый дисплей</string>
+    <string name="session_drawer_output_resolution">Разрешение</string>
+    <string name="session_drawer_output_refresh_rate">Частота обновления</string>
+    <string name="session_drawer_output_aspect_ratio">Соотношение сторон</string>
+    <string name="session_drawer_output_aspect_fit">Вписать (пропорции)</string>
+    <string name="session_drawer_output_aspect_stretch">Растянуть (заполнить)</string>
+    <string name="session_drawer_output_aspect_zoom">Увеличить (обрезать)</string>
+    <string name="session_drawer_output_return_to_phone">Вернуть на телефон</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Транслировать на телевизор</string>
+    <string name="session_drawer_output_cast_body">Подключите адаптер USB-C / HDMI или нажмите ниже, чтобы подключить беспроводной дисплей (Miracast / Wi-Fi Direct). Игра отображается на телевизоре, а это управление остаётся на телефоне.</string>
+    <string name="session_drawer_output_cast_button">Подключить беспроводной дисплей</string>
+    <string name="session_drawer_output_cast_note">Телевизоры только с Chromecast не могут показывать игру в реальном времени с приватным управлением — для лучшего результата используйте беспроводной дисплей или адаптер USB‑C/HDMI.</string>
+    <string name="session_drawer_output_render_note">Режимы, которые сообщает дисплей, меняют его реальный вывод (он может ненадолго погаснуть при повторной инициализации). Другие разрешения рендерятся в этом размере и аппаратно масштабируются на панель — выше нативного резче (суперсэмплинг), ниже быстрее.</string>
+    <string name="session_drawer_output_scaling_note">Этот телефон выводит изображение в собственном разрешении %1$s и не меняет режим, поэтому здесь задаётся разрешение рендеринга — оно аппаратно масштабируется под панель (выше нативного — чётче, ниже — быстрее).</string>
+    <string name="session_drawer_output_game_mode">Игровой режим (низкая задержка)</string>
+    <string name="session_drawer_output_game_mode_on">Вкл.</string>
+    <string name="session_drawer_output_game_mode_off">Выкл.</string>
+    <string name="session_drawer_output_game_mode_note">Запрашивает игровой режим / низкую задержку телевизора (HDMI ALLM) для уменьшения задержки ввода. Показывается только если подключённый дисплей это поддерживает.</string>
+    <string name="session_drawer_output_send_to_display">Отправить игру на дисплей</string>
+    <string name="session_drawer_output_to_display">Вывод на внешний дисплей</string>
+    <string name="session_drawer_output_send_note">Дисплей подключён. Отправьте игру на него — управление и меню останутся на этом телефоне. Вы можете вернуть её сюда в любой момент.</string>
+    <string name="session_drawer_output_display">Экран</string>
+    <string name="session_drawer_output_glasses">Очки</string>
+    <string name="session_drawer_output_brightness">Яркость</string>
+    <string name="session_drawer_output_shade">Затемнение</string>
+    <string name="session_drawer_output_3d">3D (бок о бок)</string>
+    <string name="glasses_panel_refresh">Частота обновления</string>
+    <string name="glasses_panel_sunblock">Светофильтр</string>
+    <string name="session_drawer_output_volume">Громкость</string>
+    <string name="session_drawer_output_glasses_note">Отправляется напрямую на очки Viture по USB.</string>
+
+    <!-- Touch & Gesture Profiles -->
+    <string name="common_ui_new">Создать</string>
+    <string name="common_ui_rename">Переименовать</string>
+    <string name="gesture_profile_export">Экспорт профиля жестов</string>
+    <string name="gesture_profile_import">Импорт профиля жестов</string>
+    <string name="gesture_profile_new">Новый профиль жестов</string>
+    <string name="gesture_profile_none">Нет профилей жестов</string>
+    <string name="input_controls_editor_input_profiles_section">Профили ввода</string>
+    <string name="session_drawer_right_stick_sensitivity">Чувствительность правого стика</string>
+    <string name="session_drawer_rts_gestures">Жесты RTS</string>
+    <string name="session_drawer_rts_gestures_edit">Изменить</string>
+    <string name="session_drawer_touch">Касание</string>
+    <string name="session_drawer_touch_map_right_stick">Назначить на правый стик</string>
+    <string name="session_drawer_touch_touchscreen">Режим сенсорного экрана</string>
+    <string name="session_drawer_touch_trackpad">Трекпад</string>
+    <string name="session_gesture_profile_section">Профиль жестов</string>
+    <string name="session_rts_action">Действие</string>
+    <string name="session_rts_behavior">Поведение</string>
+    <string name="session_rts_double_tap">Двойное касание (двойной левый клик)</string>
+    <string name="session_rts_double_tap_delay">Задержка двойного касания (мс)</string>
+    <string name="session_rts_down">Вниз</string>
+    <string name="session_rts_drag">Перетаскивание 1 пальцем</string>
+    <string name="session_rts_pan1">Прокрутка 1 пальцем</string>
+    <string name="session_rts_drag2">Перетаскивание 2 пальцами</string>
+    <string name="session_rts_drag_threshold">Порог перетаскивания (пикс.)</string>
+    <string name="session_rts_gesture_threshold">Порог жеста (пикс.)</string>
+    <string name="session_rts_hold2">Удержание 2 пальцами</string>
+    <string name="session_rts_hold3">Удержание 3 пальцами</string>
+    <string name="session_rts_hold4">Удержание 4 пальцами</string>
+    <string name="session_rts_hold_delay">Задержка удержания (мс)</string>
+    <string name="session_rts_left">Влево</string>
+    <string name="session_rts_long_press">Долгое нажатие</string>
+    <string name="session_rts_long_press_delay">Задержка долгого нажатия (мс)</string>
+    <string name="session_rts_pan">Прокрутка 2 пальцами</string>
+    <string name="session_rts_pan_threshold">Старт прокрутки/масштабирования (пикс.)</string>
+    <string name="session_rts_right">Вправо</string>
+    <string name="session_rts_swipe3">Свайп 3 пальцами</string>
+    <string name="session_rts_swipe4">Свайп 4 пальцами</string>
+    <string name="session_rts_swipe_threshold">Порог свайпа (пикс.)</string>
+    <string name="session_rts_tap1">Касание 1 пальцем</string>
+    <string name="session_rts_tap2">Касание 2 пальцами</string>
+    <string name="session_rts_tap3">Касание 3 пальцами</string>
+    <string name="session_rts_tap4">Касание 4 пальцами</string>
+    <string name="session_rts_up">Вверх</string>
+    <string name="session_rts_zoom">Масштабирование щипком</string>
+    <string name="session_drawer_brightness">Яркость</string>
+    <string name="session_drawer_contrast">Контраст</string>
+    <string name="session_drawer_gamma">Гамма</string>
+    <string name="session_drawer_saturation">Насыщенность</string>
+    <string name="session_drawer_temperature">Температура</string>
+    <string name="session_drawer_tint">Оттенок</string>
+    <string name="session_drawer_intensity">Интенсивность</string>
+    <string name="session_drawer_strength">Сила</string>
+    <string name="session_drawer_sharpen">Резкость</string>
+    <string name="session_drawer_scanlines">Строки развёртки</string>
+    <string name="session_drawer_pixelate">Пикселизация</string>
+    <string name="session_drawer_block_size">Размер блока</string>
+    <string name="session_drawer_scale">Масштабирование</string>
+    <string name="session_drawer_scale_nearest">Ближайший</string>
+    <string name="session_drawer_scale_linear">Линейный</string>
+    <string name="session_drawer_scale_bicubic">Бикубический</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Мультяшный</string>
+    <string name="session_drawer_color_blind">Дальтонизм</string>
+    <string name="session_drawer_color_blind_protan">Протан</string>
+    <string name="session_drawer_color_blind_deutan">Дейтан</string>
+    <string name="session_drawer_color_blind_tritan">Тритан</string>
+    <string name="session_drawer_reset_effects">Сбросить эффекты</string>
+    <string name="session_drawer_hud_background">Фон</string>
+    <string name="session_drawer_hud_background_alpha">Альфа фона</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Задать альфу фона</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Изменить размер</string>
+    <string name="session_task_bring_to_front">На передний план</string>
+    <string name="session_task_custom_value">Своё значение</string>
+    <string name="session_gyroscope_orientation_mode">Наклон для прицеливания (ориентация)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Файлы</string>
+    <string name="file_manager_copy">Копировать</string>
+    <string name="file_manager_cut">Вырезать</string>
+    <string name="file_manager_paste">Вставить</string>
+    <string name="file_manager_paste_here">Вставить сюда</string>
+    <string name="file_manager_new_folder">Новая папка</string>
+    <string name="file_manager_new_folder_short">Папка</string>
+    <string name="file_manager_multi_select">Выбор</string>
+    <string name="file_manager_create">Создать</string>
+    <string name="file_manager_delete">Удалить</string>
+    <string name="file_manager_copy_count">Копировать (%1$d)</string>
+    <string name="file_manager_cut_count">Вырезать (%1$d)</string>
+    <string name="file_manager_delete_count">Удалить (%1$d)</string>
+    <string name="file_manager_extract">Извлечь</string>
+    <string name="file_manager_extract_here">Извлечь сюда</string>
+    <string name="file_manager_extract_to">Извлечь в…</string>
+    <string name="file_manager_extracting">Извлечение %1$s</string>
+    <string name="file_manager_extract_failed">Не удалось извлечь</string>
+    <string name="file_manager_run_boot">Запустить / Загрузить</string>
+    <string name="file_manager_create_shortcut">Создать ярлык</string>
+    <string name="file_manager_run_in_container">Запустить в контейнере</string>
+    <string name="file_manager_no_containers">Нет доступных контейнеров</string>
+    <string name="file_manager_delete_confirm">Удалить \"%1$s\"? Это действие нельзя отменить.</string>
+    <string name="file_manager_delete_confirm_multi">Удалить %1$d объектов? Это действие нельзя отменить.</string>
+    <string name="file_manager_copying">Копирование %1$s</string>
+    <string name="file_manager_moving">Перемещение %1$s</string>
+    <string name="file_manager_copying_count">Копирование %1$d объектов</string>
+    <string name="file_manager_moving_count">Перемещение %1$d объектов</string>
+    <string name="file_manager_paste_into_itself">Нельзя вставить папку в саму себя</string>
+    <string name="file_manager_operation_failed">Не удалось выполнить операцию</string>
+    <string name="file_manager_delete_failed">Не удалось удалить</string>
+    <string name="file_manager_rename_failed">Не удалось переименовать</string>
+    <string name="file_manager_create_folder_failed">Не удалось создать папку</string>
+    <string name="cloud_saves_google_backup_helper">Сохранить копию в Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Резервная копия в Google</string>
+    <string name="cloud_saves_google_backup_no_save">Не найдено файлов сохранения для резервного копирования.</string>
+    <string name="cloud_saves_history_cloud_readonly">Только чтение</string>
+    <string name="session_drawer_rail_label_record">Запись</string>
+    <string name="session_record_failed">Не удалось начать запись</string>
+    <string name="session_record_fps">Частота кадров</string>
+    <string name="session_record_include_ui">Записывать интерфейс</string>
+    <string name="session_record_include_ui_subtitle">Включить HUD и экранные элементы управления</string>
+    <string name="session_record_now">Записать сейчас</string>
+    <string name="session_record_quality">Качество</string>
+    <string name="session_record_resolution">Разрешение</string>
+    <string name="session_record_saved">Запись сохранена в WinNative/Recordings</string>
+    <string name="session_record_settings_title">Настройки записи</string>
+    <string name="session_record_started">Запись начата</string>
+    <string name="steam_chat_setting_stay_running">Работать в фоне</string>
+    <string name="steam_chat_setting_stay_running_desc">Оставлять чат активным после выхода из WinNative</string>
+    <string name="settings_content_refresh">Обновить</string>
+    <string name="settings_retro_title">Ретро</string>
+    <string name="retro_save_transfer_title">Перенос сохранения</string>
+    <string name="retro_save_transfer_message">Импортируйте локальное сохранение для этой игры или экспортируйте текущее сохранение.</string>
+    <string name="retro_save_transfer_import">Импорт сохранения</string>
+    <string name="retro_save_transfer_export">Экспорт сохранения</string>
+    <string name="retro_save_transfer_import_ok">Сохранение импортировано</string>
+    <string name="retro_save_transfer_import_failed">Не удалось импортировать сохранение</string>
+    <string name="retro_save_transfer_export_ok">Сохранение экспортировано</string>
+    <string name="retro_save_transfer_export_failed">Не удалось экспортировать сохранение</string>
+    <string name="retro_save_transfer_none">Для этой игры ещё нет сохранения</string>
+    <string name="retro_cheats_title">Читы</string>
+    <string name="retro_cheats_hardcore_blocked">Читы отключены в режиме Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Сохранить</string>
+    <string name="retro_ps2_cancel">Отмена</string>
+    <string name="retro_ps2_save_state">Сохранить состояние</string>
+    <string name="retro_ps2_load_save_state">Загрузить состояние</string>
+    <string name="retro_ps2_achievements">Достижения</string>
+    <string name="retro_ps2_cheats">Читы</string>
+    <string name="retro_ps2_memory_cards">Карты памяти</string>
+    <string name="retro_ps2_fast_forward">Ускорение</string>
+    <string name="retro_ps2_reset">Сброс</string>
+    <string name="retro_ps2_swap_disc">Сменить диск</string>
+    <string name="retro_ps2_slot">Слот %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Нажмите для загрузки</string>
+    <string name="retro_ps2_slot_empty">Пусто</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Нажмите для перезаписи</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Пусто — нажмите для сохранения</string>
+    <string name="retro_ps2_slot_is_empty">Слот %1$d пуст</string>
+    <string name="retro_ps2_loaded_slot">Загружен слот %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Не удалось загрузить слот %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Сохранено в слот %1$d</string>
+    <string name="retro_ps2_save_failed">Не удалось сохранить</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Слот 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Слот 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Нажмите для использования</string>
+    <string name="retro_ps2_new_memory_card">Новая карта памяти</string>
+    <string name="retro_ps2_import_card">Импорт карты</string>
+    <string name="retro_ps2_enable_online_dev9">Включить сеть (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Сетевой адаптер PS2 — перезапускает игру для подключения</string>
+    <string name="retro_ps2_ethernet_device">Устройство Ethernet</string>
+    <string name="retro_ps2_dns_mode">Режим DNS</string>
+    <string name="retro_ps2_primary_dns">Основной DNS</string>
+    <string name="retro_ps2_secondary_dns">Дополнительный DNS</string>
+    <string name="retro_ps2_optional">необязательно</string>
+    <string name="retro_ps2_auto_ip_dhcp">Авто IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Сервер: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">нажмите для указания IP (пусто — удаляет)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Добавить хост сервера</string>
+    <string name="retro_ps2_new_server_hostname">Новое имя хоста сервера</string>
+    <string name="retro_ps2_server_hostname_hint">напр. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Экранные кнопки</string>
+    <string name="retro_ps2_edit_layout">Изменить раскладку</string>
+    <string name="retro_ps2_reset_layout">Сбросить раскладку</string>
+    <string name="retro_ps2_layout_reset">Раскладка сброшена</string>
+    <string name="retro_ps2_left_stick_invert_x">Левый стик: инверт. X</string>
+    <string name="retro_ps2_left_stick_invert_y">Левый стик: инверт. Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Правый стик: инверт. X</string>
+    <string name="retro_ps2_right_stick_invert_y">Правый стик: инверт. Y</string>
+    <string name="retro_ps2_button_color">Цвет кнопок</string>
+    <string name="retro_ps2_letter_color">Цвет букв</string>
+    <string name="retro_ps2_shadow_color">Цвет тени</string>
+    <string name="retro_ps2_background_color">Цвет фона</string>
+    <string name="retro_ps2_reset_colors">Сбросить цвета</string>
+    <string name="retro_ps2_renderer">Рендерер</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Масштаб разрешения</string>
+    <string name="retro_ps2_scale_1x_native">1x (родное)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Соотношение сторон</string>
+    <string name="retro_ps2_aspect_stretch">Растянуть</string>
+    <string name="retro_ps2_aspect_auto_standard">Авто (стандарт)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Фильтр экрана</string>
+    <string name="retro_ps2_filter_nearest">Ближайший</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Билинейный (мягкий)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Билинейный (резкий)</string>
+    <string name="retro_ps2_texture_filter">Фильтр текстур</string>
+    <string name="retro_ps2_filter_bilinear_forced">Билинейный (принуд.)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Билинейный (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Билинейный (спрайты)</string>
+    <string name="retro_ps2_blending_accuracy">Точность смешивания</string>
+    <string name="retro_ps2_blend_minimum">Минимальная</string>
+    <string name="retro_ps2_blend_basic">Базовая</string>
+    <string name="retro_ps2_blend_medium">Средняя</string>
+    <string name="retro_ps2_blend_high">Высокая</string>
+    <string name="retro_ps2_blend_full">Полная</string>
+    <string name="retro_ps2_blend_maximum">Максимальная</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / ТВ-шейдер</string>
+    <string name="retro_ps2_shader_off">Выкл.</string>
+    <string name="retro_ps2_shader_scanline">Строчный</string>
+    <string name="retro_ps2_shader_diagonal">Диагональный</string>
+    <string name="retro_ps2_shader_triangular">Треугольный</string>
+    <string name="retro_ps2_shader_wave">Волна</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Пропуск кадров</string>
+    <string name="retro_ps2_frameskip_off">Выкл.</string>
+    <string name="retro_ps2_frameskip_1">Пропуск 1</string>
+    <string name="retro_ps2_frameskip_2">Пропуск 2</string>
+    <string name="retro_ps2_frameskip_3">Пропуск 3</string>
+    <string name="retro_ps2_mipmapping">Мип-текстурирование</string>
+    <string name="retro_ps2_volume">Громкость</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Без звука</string>
+    <string name="retro_ps2_swap_stereo_channels">Поменять стереоканалы</string>
+    <string name="retro_ps2_ee_cycle_rate">Частота циклов EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (по умолч.)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Пропуск циклов EE</string>
+    <string name="retro_ps2_skip_off">Выкл.</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Мгновенный VU1</string>
+    <string name="retro_ps2_mtvu">Многопоточный VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Быстрый CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Скорость эмуляции</string>
+    <string name="retro_ps2_hud_cpu_usage">Загрузка CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Загрузка GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Внутреннее разрешение</string>
+    <string name="retro_ps2_deinterlace_mode">Режим деинтерлейсинга</string>
+    <string name="retro_ps2_deint_auto">Авто</string>
+    <string name="retro_ps2_deint_off">Выкл.</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Соотношение сторон FMV</string>
+    <string name="retro_ps2_anti_blur">Антиразмытие</string>
+    <string name="retro_ps2_widescreen_patches">Широкоэкранные патчи</string>
+    <string name="retro_ps2_no_interlace_patches">Патчи без чересстрочности</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Обнаружение цикла INTC</string>
+    <string name="retro_ps2_wait_loop">Обнаружение цикла ожидания</string>
+    <string name="retro_ps2_time_stretch">Растяжение звука по времени</string>
+    <string name="retro_ps2_audio_buffer">Аудиобуфер</string>
+    <string name="retro_ps2_audio_latency">Задержка вывода</string>
+    <string name="retro_ps2_ms">%1$d мс</string>
+    <string name="retro_ps2_hud_frame_times">Время кадров</string>
+    <string name="retro_ps2_hud_gs_stats">Статистика GS</string>
+    <string name="retro_ps2_hud_hw_info">Информация об оборудовании</string>
+    <string name="retro_ps2_hud_version">Версия</string>
+    <string name="retro_ps2_hud_input_display">Отображение ввода</string>
+    <string name="retro_ps2_tab_menu">Меню</string>
+    <string name="retro_ps2_tab_display">Экран</string>
+    <string name="retro_ps2_tab_performance">Производительность</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Звук</string>
+    <string name="retro_ps2_tab_online">Сеть</string>
+    <string name="retro_ps2_tab_controls">Управление</string>
+    <string name="retro_ps2_resume">Продолжить</string>
+    <string name="retro_ps2_pause">Пауза</string>
+    <string name="retro_ps2_exit">Выход</string>
+    <string name="retro_lr_bios_imported">BIOS импортирован: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Недопустимый файл BIOS</string>
+    <string name="retro_lr_invalid_retro_game">Недопустимая ретро-игра</string>
+    <string name="retro_lr_rom_not_found">ROM не найден: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Не удалось прочитать ROM в этом архиве</string>
+    <string name="retro_lr_core_not_installed">Ядро не установлено: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Читы включены — достижения отключены для этой сессии</string>
+    <string name="retro_lr_cloud_save_restored">Облачное сохранение восстановлено</string>
+    <string name="retro_lr_restore_failed">Не удалось восстановить</string>
+    <string name="retro_lr_cloud_conflict_message">Для %1$s существует более новое облачное сохранение. Хотите синхронизировать, и какое облачное сохранение оставить?</string>
+    <string name="retro_lr_cloud_save">Облачное сохранение</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Не удалось загрузить ядро эмулятора</string>
+    <string name="retro_lr_failed_load_rom">Не удалось загрузить ROM</string>
+    <string name="retro_lr_graphics_not_supported">Графика не поддерживается этим ядром</string>
+    <string name="retro_lr_emulator_error">Ошибка эмулятора</string>
+    <string name="retro_lr_shader_default">По умолчанию</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Резкий</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Апскейл SGSR</string>
+    <string name="retro_lr_upscale_native">Родное</string>
+    <string name="retro_lr_sound">Звук</string>
+    <string name="retro_lr_left_stick_invert_x">Левый стик: инверт. X</string>
+    <string name="retro_lr_left_stick_invert_y">Левый стик: инверт. Y</string>
+    <string name="retro_lr_right_stick_invert_x">Правый стик: инверт. X</string>
+    <string name="retro_lr_right_stick_invert_y">Правый стик: инверт. Y</string>
+    <string name="retro_lr_on_screen_controls">Экранные кнопки</string>
+    <string name="retro_lr_haptic_feedback">Виброотклик</string>
+    <string name="retro_lr_portrait">Портретная</string>
+    <string name="retro_lr_landscape">Альбомная</string>
+    <string name="retro_lr_edit_layout">Изменить раскладку (%1$s)</string>
+    <string name="retro_lr_reset_layout">Сбросить раскладку %1$s</string>
+    <string name="retro_lr_layout_reset">Раскладка %1$s сброшена</string>
+    <string name="retro_lr_button_color">Цвет кнопок</string>
+    <string name="retro_lr_letter_color">Цвет букв</string>
+    <string name="retro_lr_shadow_color">Цвет тени</string>
+    <string name="retro_lr_background_color">Цвет фона</string>
+    <string name="retro_lr_reset_colors">Сбросить цвета</string>
+    <string name="retro_lr_colors_reset">Цвета сброшены</string>
+    <string name="retro_lr_performance_hud">HUD производительности</string>
+    <string name="retro_lr_alpha">Прозрачность</string>
+    <string name="retro_lr_background_alpha">Прозрачность фона</string>
+    <string name="retro_lr_background">Фон</string>
+    <string name="retro_lr_scale">Масштаб</string>
+    <string name="retro_lr_numeric_frametime">Числовое время кадра</string>
+    <string name="retro_lr_dual_series_battery">Двойной график батареи</string>
+    <string name="retro_lr_hud_elements">ЭЛЕМЕНТЫ HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Консоль</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Батарея</string>
+    <string name="retro_lr_hud_temp">Темп.</string>
+    <string name="retro_lr_hud_graph">График</string>
+    <string name="retro_lr_hud_cpu_temp">Темп. CPU</string>
+    <string name="retro_lr_save_state">Сохранить состояние</string>
+    <string name="retro_lr_load_save_state">Загрузить состояние</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Загрузка состояний отключена в режиме Hardcore</string>
+    <string name="retro_lr_achievements">Достижения</string>
+    <string name="retro_lr_cheats">Читы</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Читы отключены в режиме Hardcore</string>
+    <string name="retro_lr_reset">Сброс</string>
+    <string name="retro_lr_fast_forward">Ускорение</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Ускорение отключено в режиме Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Диск %1$d/%2$d</string>
+    <string name="retro_lr_resume">Продолжить</string>
+    <string name="retro_lr_pause">Пауза</string>
+    <string name="retro_lr_exit">Выход</string>
+    <string name="retro_lr_saved_to_slot">Сохранено в слот %1$d</string>
+    <string name="retro_lr_could_not_save_state">Не удалось сохранить состояние</string>
+    <string name="retro_lr_bios_required_title">Требуется BIOS %1$s</string>
+    <string name="retro_lr_bios_required_message">Играм PlayStation нужен настоящий файл BIOS консоли, который вы должны предоставить. Импортируйте BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin или scph7001.bin), чтобы продолжить.</string>
+    <string name="retro_lr_import_bios">Импорт BIOS…</string>
+    <string name="retro_lr_cancel">Отмена</string>
+    <string name="retro_lr_slot_empty">Слот %1$d пуст</string>
+    <string name="retro_lr_loaded_slot">Загружен слот %1$d</string>
+    <string name="retro_lr_could_not_load_state">Не удалось загрузить состояние</string>
+    <string name="retro_lr_slot_title">Слот %1$d</string>
+    <string name="retro_lr_rename_slot">Переименовать слот %1$d</string>
+    <string name="retro_gs_section_general">Общие</string>
+    <string name="retro_gs_section_graphics">Графика</string>
+    <string name="retro_gs_section_performance">Производительность</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Ввод</string>
+    <string name="retro_gs_section_audio">Звук</string>
+    <string name="retro_gs_section_online">Сеть</string>
+    <string name="retro_gs_cancel">Отмена</string>
+    <string name="retro_gs_save">Сохранить</string>
+    <string name="retro_gs_shader_default">По умолчанию</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Резкий</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Родное</string>
+    <string name="retro_gs_group_game">ИГРА</string>
+    <string name="retro_gs_label_name">Название</string>
+    <string name="retro_gs_label_system">Система</string>
+    <string name="retro_gs_label_emulator_core">Ядро эмулятора</string>
+    <string name="retro_gs_label_rom_path">Путь к ROM</string>
+    <string name="retro_gs_group_bios">BIOS %1$s</string>
+    <string name="retro_gs_label_installed">Установлен</string>
+    <string name="retro_gs_bios_none">Нет — требуется для запуска игр %1$s</string>
+    <string name="retro_gs_import_bios">Импорт BIOS…</string>
+    <string name="retro_gs_remove_bios">Удалить BIOS</string>
+    <string name="retro_gs_group_library_artwork">ОФОРМЛЕНИЕ БИБЛИОТЕКИ</string>
+    <string name="retro_gs_artwork_game_card">Изображение карточки игры</string>
+    <string name="retro_gs_artwork_grid">Изображение сетки</string>
+    <string name="retro_gs_artwork_carousel">Изображение карусели</string>
+    <string name="retro_gs_artwork_list">Изображение списка</string>
+    <string name="retro_gs_artwork_custom_set">Задано своё изображение</string>
+    <string name="retro_gs_artwork_set_image">Задать изображение</string>
+    <string name="retro_gs_artwork_remove">Удалить</string>
+    <string name="retro_gs_group_video">ВИДЕО</string>
+    <string name="retro_gs_video_filter">Видеофильтр</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Апскейл SGSR</string>
+    <string name="retro_gs_performance_hud">HUD производительности</string>
+    <string name="retro_gs_group_core">ЯДРО</string>
+    <string name="retro_gs_renderer">Рендерер</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Масштаб разрешения</string>
+    <string name="retro_gs_scale_1x_native">1x (родное)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Соотношение сторон</string>
+    <string name="retro_gs_aspect_stretch">Растянуть</string>
+    <string name="retro_gs_aspect_auto_standard">Авто (стандарт)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Фильтр экрана</string>
+    <string name="retro_gs_filter_nearest">Ближайший</string>
+    <string name="retro_gs_filter_bilinear_smooth">Билинейный (мягкий)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Билинейный (резкий)</string>
+    <string name="retro_gs_texture_filter">Фильтр текстур</string>
+    <string name="retro_gs_filter_bilinear_forced">Билинейный (принуд.)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Билинейный (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Билинейный (спрайты)</string>
+    <string name="retro_gs_blending_accuracy">Точность смешивания</string>
+    <string name="retro_gs_blend_minimum">Минимальная</string>
+    <string name="retro_gs_blend_basic">Базовая</string>
+    <string name="retro_gs_blend_medium">Средняя</string>
+    <string name="retro_gs_blend_high">Высокая</string>
+    <string name="retro_gs_blend_full">Полная</string>
+    <string name="retro_gs_blend_maximum">Максимальная</string>
+    <string name="retro_gs_crt_tv_shader">CRT / ТВ-шейдер</string>
+    <string name="retro_gs_off">Выкл.</string>
+    <string name="retro_gs_tvshader_scanline">Строчный</string>
+    <string name="retro_gs_tvshader_diagonal">Диагональный</string>
+    <string name="retro_gs_tvshader_triangular">Треугольный</string>
+    <string name="retro_gs_tvshader_wave">Волна</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Пропуск кадров</string>
+    <string name="retro_gs_frameskip_1">Пропуск 1</string>
+    <string name="retro_gs_frameskip_2">Пропуск 2</string>
+    <string name="retro_gs_frameskip_3">Пропуск 3</string>
+    <string name="retro_gs_mipmapping">Мип-текстурирование</string>
+    <string name="retro_gs_group_performance">ПРОИЗВОДИТЕЛЬНОСТЬ</string>
+    <string name="retro_gs_ee_cycle_rate">Частота циклов EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (по умолч.)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Пропуск циклов EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Мгновенный VU1</string>
+    <string name="retro_gs_mtvu">Многопоточный VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Быстрый CDVD</string>
+    <string name="retro_gs_group_performance_hud">HUD ПРОИЗВОДИТЕЛЬНОСТИ</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Скорость эмуляции</string>
+    <string name="retro_gs_hud_cpu_usage">Загрузка CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Загрузка GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Внутреннее разрешение</string>
+    <string name="retro_gs_deinterlace_mode">Режим деинтерлейсинга</string>
+    <string name="retro_gs_deint_auto">Авто</string>
+    <string name="retro_gs_deint_off">Выкл.</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Соотношение сторон FMV</string>
+    <string name="retro_gs_anti_blur">Антиразмытие</string>
+    <string name="retro_gs_widescreen_patches">Широкоэкранные патчи</string>
+    <string name="retro_gs_no_interlace_patches">Патчи без чересстрочности</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Обнаружение цикла INTC</string>
+    <string name="retro_gs_wait_loop">Обнаружение цикла ожидания</string>
+    <string name="retro_gs_time_stretch">Растяжение звука по времени</string>
+    <string name="retro_gs_audio_buffer">Аудиобуфер</string>
+    <string name="retro_gs_audio_latency">Задержка вывода</string>
+    <string name="retro_gs_ms">%1$d мс</string>
+    <string name="retro_gs_hud_frame_times">Время кадров</string>
+    <string name="retro_gs_hud_gs_stats">Статистика GS</string>
+    <string name="retro_gs_hud_hw_info">Информация об оборудовании</string>
+    <string name="retro_gs_hud_version">Версия</string>
+    <string name="retro_gs_hud_input_display">Отображение ввода</string>
+    <string name="retro_gs_fast_boot">Быстрая загрузка</string>
+    <string name="retro_gs_group_online_dev9">СЕТЬ (DEV9)</string>
+    <string name="retro_gs_enable_online">Включить сеть</string>
+    <string name="retro_gs_ethernet_device">Устройство Ethernet</string>
+    <string name="retro_gs_net_auto">Авто</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Режим DNS</string>
+    <string name="retro_gs_dns_manual">Вручную</string>
+    <string name="retro_gs_dns_internal">Внутренний</string>
+    <string name="retro_gs_primary_dns">Основной DNS</string>
+    <string name="retro_gs_secondary_dns">Дополнительный DNS</string>
+    <string name="retro_gs_dns_optional">необязательно</string>
+    <string name="retro_gs_auto_ip_dhcp">Авто IP (DHCP)</string>
+    <string name="retro_gs_group_input">ВВОД</string>
+    <string name="retro_engine_save">Сохранить</string>
+    <string name="retro_engine_saved">Игра сохранена</string>
+    <string name="retro_engine_loading">Загрузка…</string>
+    <string name="retro_engine_load">Загрузить</string>
+    <string name="retro_engine_saved_to">Сохранено в %1$s</string>
+    <string name="retro_engine_slot_active_only">Активен</string>
+    <string name="retro_engine_rename_slot">Переименовать слот сохранения</string>
+    <string name="retro_engine_caught">Поймано: %1$d</string>
+    <string name="retro_engine_no_slots">Слотов сохранения пока нет</string>
+    <string name="retro_engine_new_slot">Новый слот сохранения</string>
+    <string name="retro_engine_achievements_unavailable">Не отслеживается в режиме 3D</string>
+    <string name="retro_engine_fullscreen">Полный экран</string>
+    <string name="retro_engine_loaded_from">Загружено: %1$s</string>
+    <string name="retro_engine_slot_empty">Этот слот пуст</string>
+    <string name="retro_engine_loading_subtitle">Первичная подготовка данных игры</string>
+    <string name="retro_gs_engine_3d">Воксельный 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Играть в эту игру в воксельном 3D-движке вместо стандартного ядра</string>
+    <string name="retro_gs_on_screen_controls">Экранные кнопки</string>
+    <string name="retro_gs_haptic_feedback">Виброотклик</string>
+    <string name="retro_gs_group_audio">ЗВУК</string>
+    <string name="retro_gs_volume">Громкость</string>
+    <string name="retro_gs_mute">Без звука</string>
+    <string name="retro_gs_swap_stereo">Поменять стереоканалы</string>
+    <string name="retro_gs_sound">Звук</string>
+    <string name="retro_scr_retro_defaults">РЕТРО-НАСТРОЙКИ ПО УМОЛЧАНИЮ</string>
+    <string name="retro_scr_retro_defaults_desc">Настройки по умолчанию применяются к играм каждой консоли, если не переопределены в настройках самой игры.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Аккаунт</string>
+    <string name="retro_scr_signed_in">Выполнен вход</string>
+    <string name="retro_scr_not_signed_in_hint">Вход не выполнен — откройте Достижения игры для входа</string>
+    <string name="retro_scr_achievements_enabled">Достижения включены</string>
+    <string name="retro_scr_hardcore_default">Режим Hardcore по умолчанию (без сохранений состояний)</string>
+    <string name="retro_scr_sign_out">Выйти</string>
+    <string name="retro_scr_playstation_bios">BIOS PLAYSTATION</string>
+    <string name="retro_scr_installed">Установлен</string>
+    <string name="retro_scr_none_ps1_bios">Нет — играм PS1 требуется BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Импорт BIOS PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS PS1 удалён</string>
+    <string name="retro_scr_no_bios_to_remove">Нет BIOS для удаления</string>
+    <string name="retro_scr_remove_ps1_bios">Удалить BIOS PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Нет — играм PS2 требуется BIOS</string>
+    <string name="retro_scr_format">Формат</string>
+    <string name="retro_scr_ps2_bios_format">Объединённый однофайловый дамп (с меткой региона .bin, ~4МБ). Раздельные наборы ROM0/MEC/NVM не принимаются.</string>
+    <string name="retro_scr_import_ps2_bios">Импорт BIOS PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS PS2 удалён</string>
+    <string name="retro_scr_remove_ps2_bios">Удалить BIOS PS2</string>
+    <string name="retro_scr_library_artwork">ОФОРМЛЕНИЕ БИБЛИОТЕКИ</string>
+    <string name="retro_scr_retro_case_art">Ретро-обложка (картридж / коробка CD)</string>
+    <string name="retro_scr_box_art">Обложка</string>
+    <string name="retro_scr_box_art_desc">Загружается автоматически с thumbnails.libretro.com при импорте; своё изображение всегда имеет приоритет.</string>
+    <string name="retro_scr_roms_folder">ПАПКА ROM</string>
+    <string name="retro_scr_folder">Папка</string>
+    <string name="retro_scr_roms_not_set">Не задана — выберите папку для авто-импорта игр</string>
+    <string name="retro_scr_auto_import">Авто-импорт</string>
+    <string name="retro_scr_auto_import_desc">Новые игры в этой папке добавляются в библиотеку автоматически с определением нужной консоли.</string>
+    <string name="retro_scr_select_roms_folder_title">Выбрать папку ROM</string>
+    <string name="retro_scr_select_roms_folder_button">Выбрать папку ROM…</string>
+    <string name="retro_scr_change_roms_folder_button">Сменить папку ROM…</string>
+    <string name="retro_scr_scan_now">Сканировать</string>
+    <string name="retro_scr_console_defaults">НАСТРОЙКИ КОНСОЛИ ПО УМОЛЧАНИЮ</string>
+    <string name="retro_scr_console_defaults_desc">Нажмите на консоль, чтобы задать её настройки по умолчанию.</string>
+    <string name="retro_scr_renderer">Рендерер</string>
+    <string name="retro_scr_upscale_resolution">Апскейл разрешения</string>
+    <string name="retro_scr_aspect_ratio">Соотношение сторон</string>
+    <string name="retro_scr_aspect_stretch">Растянуть</string>
+    <string name="retro_scr_aspect_auto_standard">Авто (стандарт)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Фильтр экрана</string>
+    <string name="retro_scr_filter_nearest">Ближайший</string>
+    <string name="retro_scr_filter_bilinear_smooth">Билинейный (мягкий)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Билинейный (резкий)</string>
+    <string name="retro_scr_texture_filter">Фильтр текстур</string>
+    <string name="retro_scr_filter_bilinear_forced">Билинейный (принуд.)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Билинейный (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Билинейный (спрайты)</string>
+    <string name="retro_scr_blending_accuracy">Точность смешивания</string>
+    <string name="retro_scr_blend_minimum">Минимальная</string>
+    <string name="retro_scr_blend_basic">Базовая</string>
+    <string name="retro_scr_blend_medium">Средняя</string>
+    <string name="retro_scr_blend_high">Высокая</string>
+    <string name="retro_scr_blend_full">Полная</string>
+    <string name="retro_scr_blend_maximum">Максимальная</string>
+    <string name="retro_scr_crt_tv_shader">CRT / ТВ-шейдер</string>
+    <string name="retro_scr_shader_off">Выкл.</string>
+    <string name="retro_scr_shader_scanline">Строчный</string>
+    <string name="retro_scr_shader_diagonal">Диагональный</string>
+    <string name="retro_scr_shader_triangular">Треугольный</string>
+    <string name="retro_scr_shader_wave">Волна</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Пропуск кадров</string>
+    <string name="retro_scr_skip_1">Пропуск 1</string>
+    <string name="retro_scr_skip_2">Пропуск 2</string>
+    <string name="retro_scr_skip_3">Пропуск 3</string>
+    <string name="retro_scr_mipmapping">Мип-текстурирование</string>
+    <string name="retro_scr_ee_cycle_rate">Частота циклов EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (по умолч.)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Пропуск циклов EE</string>
+    <string name="retro_scr_skip_off">Выкл.</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Мгновенный VU1</string>
+    <string name="retro_scr_mtvu">Многопоточный VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Быстрый CDVD</string>
+    <string name="retro_scr_touch_controls">Экранное сенсорное управление</string>
+    <string name="retro_scr_sound">Звук</string>
+    <string name="retro_scr_swap_stereo">Поменять стереоканалы</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: скорость эмуляции</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: загрузка CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: загрузка GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: внутреннее разрешение</string>
+    <string name="retro_scr_enable_online_dev9">Включить сеть (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Устройство Ethernet</string>
+    <string name="retro_scr_net_auto">Авто</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Режим DNS</string>
+    <string name="retro_scr_dns_manual">Вручную</string>
+    <string name="retro_scr_dns_internal">Внутренний</string>
+    <string name="retro_scr_primary_dns">Основной DNS</string>
+    <string name="retro_scr_secondary_dns">Дополнительный DNS</string>
+    <string name="retro_scr_optional">необязательно</string>
+    <string name="retro_scr_auto_ip_dhcp">Авто IP (DHCP)</string>
+    <string name="retro_scr_shader">Шейдер</string>
+    <string name="retro_scr_sgsr_upscaling">Апскейл SGSR</string>
+    <string name="retro_scr_performance_hud">HUD производительности</string>
+    <string name="retro_scr_credits_licenses">БЛАГОДАРНОСТИ &amp; ЛИЦЕНЗИИ</string>
+    <string name="retro_scr_credits_desc">Некоторые функции WinNative построены на этих проектах с открытым исходным кодом. Нажмите, чтобы посмотреть каждый источник.</string>
+    <string name="retro_scr_tab_defaults">По умолчанию</string>
+    <string name="retro_scr_tab_credits">Благодарности</string>
+    <string name="retro_scr_enable_hardcore_title">Включить режим Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">Режим Hardcore сбрасывает игру сейчас и отключает загрузку сохранений состояний, ускорение и читы. Любой несохранённый прогресс будет потерян. Продолжить?</string>
+    <string name="retro_scr_cancel">Отмена</string>
+    <string name="retro_scr_enable">Включить</string>
+    <string name="retro_scr_bios_imported">BIOS импортирован: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Недопустимый файл BIOS</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS PS2 импортирован: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Недопустимый файл BIOS PS2</string>
+    <string name="retro_scr_no_game_serial">Нет серийного номера игры для поиска читов.</string>
+    <string name="retro_scr_applied_cheats">Применено читов: %1$d.</string>
+    <string name="retro_scr_couldnt_apply_cheats">Не удалось применить читы.</string>
+    <string name="retro_scr_cheats">Читы</string>
+    <string name="retro_scr_apply">Применить</string>
+    <string name="retro_scr_no_cheats_found">Читы для этой игры не найдены.</string>
+    <string name="retro_scr_achievements">Достижения</string>
+    <string name="retro_scr_sign_in_ra">Войти в RetroAchievements</string>
+    <string name="retro_scr_username">Имя пользователя</string>
+    <string name="retro_scr_password">Пароль</string>
+    <string name="retro_scr_login_failed">Ошибка входа</string>
+    <string name="retro_scr_signing_in">Выполняется вход…</string>
+    <string name="retro_scr_sign_in">Войти</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d очк.</string>
+    <string name="retro_scr_no_achievements">Для этой игры нет достижений.</string>
+    <string name="retro_scr_back">Назад</string>
+    <string name="retro_scr_enabled">Включено</string>
+    <string name="retro_scr_disabled">Отключено</string>
+    <string name="retro_scr_rename">Переименовать</string>
+    <string name="retro_scr_save">Сохранить</string>
+    <string name="retro_scr_cloud_save_conflict">Конфликт облачного сохранения</string>
+    <string name="retro_scr_keep_local_save">Оставить локальное сохранение</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Меню</string>
+    <string name="retro_tab_display">Экран</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Звук</string>
+    <string name="retro_tab_controls">Управление</string>
+    <string name="retro_scan_up_to_date">Библиотека актуальна</string>
+    <string name="retro_scan_roms">ROM: %1$s</string>
+    <string name="retro_scan_added">добавлено %1$d</string>
+    <string name="retro_scan_removed">удалено %1$d</string>
+    <string name="retro_scr_shader_default">По умолчанию</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Резкий</string>
+    <string name="retro_scr_upscale_native">Родное</string>
+    <string name="retro_co_aspect_ratio">Соотношение сторон</string>
+    <string name="retro_co_ntsc_filter">Фильтр NTSC</string>
+    <string name="retro_co_colorization">Раскрашивание</string>
+    <string name="retro_co_color_correction">Коррекция цвета</string>
+    <string name="retro_co_remove_sprite_limit">Снять лимит спрайтов</string>
+    <string name="retro_co_resolution">Разрешение</string>
+    <string name="retro_co_framebuffer_emulation">Эмуляция кадрового буфера</string>
+    <string name="retro_co_dithering">Дизеринг</string>
+    <string name="retro_co_widescreen_hack">Широкоэкранный хак</string>
+    <string name="retro_co_val_8_7_native">8:7 (родное)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (ТВ)</string>
+    <string name="retro_co_val_off">Выкл.</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Композитный</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Авто</string>
+    <string name="retro_co_val_gba_screen">Экран GBA</string>
+    <string name="retro_co_val_gbc_screen">Экран GBC</string>
+    <string name="retro_co_val_on">Вкл.</string>
+    <string name="retro_co_val_320x240_native">320x240 (родное)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 с коррекцией</string>
+    <string name="retro_co_val_native">Родное</string>
+    <string name="retro_co_val_internal">Внутреннее</string>
+    <string name="retro_co_val_on_16_9">Вкл. (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Войдите с аккаунтом RetroAchievements, чтобы получать и отслеживать достижения в ретро-играх.</string>
+    <string name="retro_ach_username">Имя пользователя</string>
+    <string name="retro_ach_password">Пароль</string>
+    <string name="retro_ach_enter_credentials">Введите имя пользователя и пароль</string>
+    <string name="retro_ach_login_failed">Ошибка входа</string>
+    <string name="retro_ach_sign_in">Войти</string>
+    <string name="retro_ach_password_disclaimer">Ваш пароль используется только один раз для получения токена входа, который надёжно хранится на устройстве.</string>
+    <string name="retro_ach_achievements_enabled">Достижения включены</string>
+    <string name="retro_ach_hardcore_mode">Режим Hardcore (без сохранений состояний)</string>
+    <string name="retro_ach_points">%1$d / %2$d очков</string>
+    <string name="retro_ach_none_found">Достижения для этой игры не найдены.</string>
+    <string name="retro_ach_sign_out">Выйти</string>
+    <string name="retro_che_brand">ЧИТЫ</string>
+    <string name="retro_che_name">Название</string>
+    <string name="retro_che_code">Код</string>
+    <string name="retro_che_cancel">Отмена</string>
+    <string name="retro_che_save">Сохранить</string>
+    <string name="retro_che_default_name">Чит %1$d</string>
+    <string name="retro_che_empty">Читов пока нет. Добавьте чит-код для этой игры.</string>
+    <string name="retro_che_add">Добавить чит</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Драйвер GPU</string>
+    <string name="retro_gpu_driver_system">Системный (По умолчанию)</string>
+    <string name="retro_gpu_driver_hint">Установите драйверы Turnip в разделе Настройки \u2192 Драйверы. Одни и те же драйверы работают для игр PC и PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Виртуальный внутренний диск для игр на HDD, таких как Final Fantasy XI. Перезапускает игру.</string>
+    <string name="retro_ps2_hdd_desc">Виртуальный внутренний диск для игр на HDD, таких как Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Режим DNS установлен на Internal, чтобы ваши пользовательские хосты сервера вступили в силу.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">Ядро CPU</string>
+<string name="retro_co_dual_core">Два ядра</string>
+<string name="retro_co_internal_cheats">Встроенные читы</string>
+<string name="retro_co_internal_resolution">Внутреннее разрешение</string>
+<string name="retro_co_renderer">Рендерер</string>
+<string name="retro_co_sensor_bar">Положение сенсорной панели</string>
+<string name="retro_co_skip_gc_bios">Пропустить заставку BIOS</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Снизу</string>
+<string name="retro_co_val_cached_interpreter">Кэширующий интерпретатор</string>
+<string name="retro_co_val_hardware">Аппаратный</string>
+<string name="retro_co_val_interpreter">Интерпретатор</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Мышь / Касание</string>
+<string name="retro_co_val_right_stick_absolute">Правый стик (абсолютный)</string>
+<string name="retro_co_val_right_stick_relative">Правый стик (относительный)</string>
+<string name="retro_co_val_software">Программный</string>
+<string name="retro_co_val_stretch">Растянуть</string>
+<string name="retro_co_val_top">Сверху</string>
+<string name="retro_co_vbi_skip">Пропуск VBI (авто пропуск кадров)</string>
+<string name="retro_co_widescreen">Широкий экран</string>
+<string name="retro_co_wiimote_pointer">Указатель Wiimote</string>
+<string name="retro_gs_cheats_apply_note">Изменения применятся при следующем запуске этой игры.</string>
+<string name="retro_gs_cheats_detect_hint">Запустите эту игру один раз, чтобы определить серийный номер диска, после чего здесь появятся читы и патчи.</string>
+<string name="retro_gs_dnas_entry_desc">Обход авторизации DNAS — необходим для игры онлайн</string>
+<string name="retro_gs_dnas_group">Применяется автоматически (онлайн)</string>
+<string name="retro_gs_group_cheats">Читы &amp; патчи</string>
+<string name="retro_gs_hdd_image_size">Размер: %1$s</string>
+<string name="retro_gs_hdd_import">Импорт образа HDD</string>
+<string name="retro_gs_hdd_remove_short">Удалить</string>
+<string name="retro_gs_netplay_enable">Включить NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">По умолчанию выключено. Включите, затем выберите «Хост» или «Присоединиться» перед запуском.\nСнова выключается при выходе из игры.</string>
+<string name="retro_gs_netplay_host">Адрес хоста</string>
+<string name="retro_gs_netplay_host_hint">IP или имя хоста</string>
+<string name="retro_gs_netplay_host_mode">Сессия хоста</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Вкл = ждать игрока. Выкл = присоединиться к адресу хоста</string>
+<string name="retro_gs_netplay_not_ready">NetPlay использует локальные порты для нескольких игроков по TCP (игрок 1 — хост / игрок 2 — клиент). Онлайн-игра PS2 вместо этого использует Ethernet DEV9.</string>
+<string name="retro_gs_netplay_port">Порт</string>
+<string name="retro_lr_memory_card_slot">Карта памяти %1$d</string>
+<string name="retro_lr_screenshot">Снимок экрана</string>
+<string name="retro_lr_use_cloud_save">Использовать облачное сохранение</string>
+<string name="retro_netplay_conn_direct">LAN (прямой IP)</string>
+<string name="retro_netplay_connecting">Подключение…</string>
+<string name="retro_netplay_connection">Подключение</string>
+<string name="retro_netplay_conn_traversal">Онлайн (код хоста)</string>
+<string name="retro_netplay_dismiss">Закрыть</string>
+<string name="retro_netplay_dolphin_help">NetPlay для GameCube/Wii использует собственный движок Dolphin. Хост = игрок 1, «Присоединиться» = игрок 2. Выберите «Хост» или «Присоединиться» и тип подключения перед запуском; оба устройства запускают одну и ту же игру вместе.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Сообщите игроку 2 IP-адрес вашего устройства в сети Wi‑Fi и этот порт. Игра запустится автоматически, как только он подключится.</string>
+<string name="retro_netplay_dolphin_host_online_hint">При загрузке игры отображается код хоста — сообщите его игроку 2. Игра запустится автоматически, как только он подключится.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Введите IP-адрес хоста в сети Wi‑Fi и порт, затем запустите для подключения.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Введите код хоста от игрока 1, затем запустите для подключения.</string>
+<string name="retro_netplay_enable_before_launch">Включите NetPlay в настройках игры и выберите «Хост» или «Присоединиться» перед запуском</string>
+<string name="retro_netplay_find_rooms">Найти комнаты в Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · каждый экран — своя консоль</string>
+<string name="retro_netplay_gba_not_ready">Мультиплеер GBA использует gpSP + беспроводной адаптер. Убедитесь, что libgpsp установлен.</string>
+<string name="retro_netplay_help">Мультиплеер с общим экраном по Wi‑Fi (как в RetroArch).\nХост = игрок 1, «Присоединиться» = игрок 2. Оба устройства показывают одну и ту же игру.</string>
+<string name="retro_netplay_help_game_link">Game Link по Wi‑Fi — каждое устройство запускает свою игру.\nGB/GBC: последовательное соединение Gambatte (Pokémon 1–2 поколения).\nGBA: беспроводной адаптер gpSP (сражения Pokémon FR/LG/Emerald).</string>
+<string name="retro_netplay_host_action">Создать комнату</string>
+<string name="retro_netplay_host_code">Код хоста</string>
+<string name="retro_netplay_host_code_hint">Код хоста для сквозного подключения от хоста</string>
+<string name="retro_netplay_hosting_room">Размещение комнаты</string>
+<string name="retro_netplay_host_mode_hint">Нажмите «Хост», чтобы открыть комнату для этой игровой сессии, затем запустите игру. NetPlay выключается при выходе.</string>
+<string name="retro_netplay_in_room">В комнате</string>
+<string name="retro_netplay_join_action">Присоединиться по IP</string>
+<string name="retro_netplay_joined">Присоединился</string>
+<string name="retro_netplay_join_room">Присоединиться</string>
+<string name="retro_netplay_launch_mode">При запуске</string>
+<string name="retro_netplay_leave">Покинуть</string>
+<string name="retro_netplay_menu_hint">Хост = И1 · Присоединиться = И2 · одна игра на обоих экранах</string>
+<string name="retro_netplay_mode_host">Хост</string>
+<string name="retro_netplay_mode_join">Присоединиться</string>
+<string name="retro_netplay_mode_manual">Вручную</string>
+<string name="retro_netplay_no_rooms">Комнаты не найдены. Убедитесь, что хост находится в той же сети Wi‑Fi и разместил комнату.</string>
+<string name="retro_netplay_player_name">Отображаемое имя</string>
+<string name="retro_netplay_player_name_hint">Показывается другим игрокам</string>
+<string name="retro_netplay_players_count">%1$d подключено</string>
+<string name="retro_netplay_prelaunch_hint">Комната открыта только для этой сессии. Запустите, когда будете готовы. Выход из игры выключает NetPlay.</string>
+<string name="retro_netplay_room_players">Игроки</string>
+<string name="retro_netplay_scan_action">Сканировать Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Сканировать снова</string>
+<string name="retro_netplay_scan_hint">Сканируйте ту же сеть Wi‑Fi на наличие открытых комнат или присоединяйтесь по IP-адресу.</string>
+<string name="retro_netplay_scanning">Сканирование Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Результаты сканирования</string>
+<string name="retro_netplay_select_room_hint">Нажмите на комнату, чтобы присоединиться сейчас (IP не сохраняется для следующего запуска).</string>
+<string name="retro_netplay_stop_scan">Остановить сканирование</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s подключился</string>
+<string name="retro_netplay_user_disconnected">%1$s отключился</string>
+<string name="retro_netplay_waiting_players">Ожидание игроков…</string>
+<string name="retro_ps2_coming_soon">Поддержка PlayStation 2 скоро появится</string>
+<string name="retro_ps2_show_l3r3">Показать кнопки L3 / R3</string>
+<string name="retro_ps2_show_l3r3_subtitle">Когда выключено, дважды нажмите на стик для клика L3 / R3</string>
+<string name="retro_ps2_turnip_flags">ФЛАГИ ДРАЙВЕРА TURNIP</string>
+<string name="retro_ps2_turnip_flags_note">Применяется только когда выше выбран пользовательский драйвер GPU.</string>
+<string name="retro_rom_missing">Файл игры не найден</string>
+<string name="retro_scr_delete">Удалить</string>
+<string name="retro_scr_import_from_file">Импорт из файла…</string>
+<string name="retro_scr_loading">Загрузка…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Сменить консоль</string>
+    <string name="retro_gs_identify_as">Определять как консоль</string>
+    <string name="retro_gs_console_changed">Теперь определяется как %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Применяйте эффект ReShade (.fx) к играм DXVK/VKD3D (Vulkan) через встроенный слой vkBasalt. Поместите каждый эффект в отдельную папку в Android/data/&lt;package&gt;/files/ReShade/. Настройка параметров в реальном времени и переключатель в игре появятся с обновлением слоя с горячей перезагрузкой.</string>
+    <string name="reshade_catalog_title">Эффекты ReShade</string>
+    <string name="reshade_catalog_search">Поиск эффектов…</string>
+    <string name="reshade_catalog_installed">Установлено (%1$d)</string>
+    <string name="reshade_catalog_available">Доступно (%1$d)</string>
+    <string name="reshade_catalog_downloading">Загрузка</string>
+    <string name="reshade_catalog_installing">Установка</string>
+    <string name="reshade_catalog_offline_cache">Не в сети — показан кешированный список. Подключитесь, чтобы загрузить новые эффекты.</string>
+    <string name="reshade_catalog_offline_none">Не в сети — показаны только установленные эффекты. Подключитесь, чтобы просмотреть каталог.</string>
+    <string name="reshade_catalog_needs_connection">Подключитесь к интернету, чтобы загрузить эффекты.</string>
+    <string name="reshade_catalog_download_failed">Не удалось загрузить %1$s.</string>
+    <string name="reshade_catalog_empty_query">Нет эффектов, соответствующих \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Нет доступных эффектов. Подключитесь к интернету, чтобы просмотреть каталог.</string>
+    <string name="reshade_catalog_done">Готово</string>
+    <string name="reshade_catalog_delete_cd">Удалить %1$s</string>
+    <string name="reshade_catalog_delete_title">Удалить %1$s?</string>
+    <string name="reshade_catalog_delete_body">Это удалит эффект из хранилища и из всех наборов, где он используется. Позже вы сможете скачать его снова.</string>
+    <string name="reshade_catalog_delete_confirm">Удалить</string>
+    <string name="reshade_catalog_delete_cancel">Отмена</string>
+    <string name="reshade_catalog_delete_failed">Не удалось удалить %1$s.</string>
+    <string name="reshade_params_title">ПАРАМЕТРЫ ЭФФЕКТА</string>
+    <string name="reshade_params_reset">Сбросить</string>
+    <string name="reshade_loadout_empty">Пока нет эффектов. Добавьте один или несколько эффектов, чтобы создать набор.</string>
+    <string name="reshade_loadout_add">Добавить эффект</string>
+    <string name="reshade_loadout_full">Набор заполнен — удалите эффект, чтобы добавить другой.</string>
+    <string name="reshade_effect_active">активен</string>
+    <string name="reshade_mode_solo">Соло</string>
+    <string name="reshade_mode_stack">Стек</string>
+    <string name="reshade_mode_solo_hint">Одновременно активен один эффект (сравнение A/B, переключение на лету в игре).</string>
+    <string name="reshade_mode_stack_hint">Наложите любой набор эффектов, применяются по порядку.</string>
+    <string name="reshade_drawer_enable">Включить ReShade</string>
+    <string name="reshade_drawer_empty">В этом наборе нет эффектов ReShade. Добавьте эффекты в настройках этой игры (или контейнера), чтобы переключать и настраивать их здесь.</string>
+    <string name="reshade_drawer_no_params">У этого эффекта нет настраиваемых параметров.</string>
+    <string name="cloud_saves_deleting">Удаление сохранения…</string>
+    <string name="cloud_saves_history_delete">Удалить</string>
+    <string name="cloud_saves_history_delete_confirm_body">Удалить облачное сохранение из %1$s навсегда? Это действие нельзя отменить.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Удалить облачное сохранение</string>
+    <string name="cloud_saves_history_delete_failed">Не удалось удалить облачное сохранение</string>
+    <string name="cloud_saves_history_delete_success">Облачное сохранение удалено</string>
+    <string name="retro_bundle_required">Сначала загрузите ядра консолей — Настройки › Ретро</string>
+    <string name="retro_ps2_device_unsupported">Это устройство не может запустить эмуляцию PS2 — требуется OpenGL ES 3.1 или новее.</string>
+    <string name="retro_scr_consoles_check">Проверить обновления</string>
+    <string name="retro_scr_consoles_checking">Проверка обновлений…</string>
+    <string name="retro_scr_consoles_download">Загрузить ядра консолей</string>
+    <string name="retro_scr_consoles_downloading">Загрузка… %1$d / %2$d МБ</string>
+    <string name="retro_scr_consoles_group">Ядра консолей</string>
+    <string name="retro_scr_consoles_installed">Установлено — сборка %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Установлено — сборка %1$s (не удалось проверить обновления)</string>
+    <string name="retro_scr_consoles_installing">Установка…</string>
+    <string name="retro_scr_consoles_missing">Не установлено — загрузите, чтобы играть в ретро-игры</string>
+    <string name="retro_scr_consoles_state">Состояние</string>
+    <string name="retro_scr_consoles_update">Обновить ядра консолей</string>
+    <string name="retro_scr_consoles_update_available">Доступно обновление — сборка %1$s (%2$d МБ)</string>
+    <string name="retro_scr_consoles_verifying">Проверка загрузки…</string>
+    <string name="retro_scr_consoles_working">Выполняется…</string>
+    <string name="retro_tab_system">Система</string>
+</resources>
diff --git a/app/src/main/res/values-sv/arrays.xml b/app/src/main/res/values-sv/arrays.xml
new file mode 100644
index 000000000..de8685c13
--- /dev/null
+++ b/app/src/main/res/values-sv/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Bild</item>
+        <item>Original</item>
+        <item>Enfärgad</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-sv/plurals.xml b/app/src/main/res/values-sv/plurals.xml
new file mode 100644
index 000000000..e183dbb30
--- /dev/null
+++ b/app/src/main/res/values-sv/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP-resurs</item>
+        <item quantity="other">%d ZIP-resurser</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 000000000..82d020fbf
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Kör</string>
+    <string name="common_ui_edit">Redigera</string>
+    <string name="common_ui_remove">Ta bort</string>
+    <string name="common_ui_add">Lägg till</string>
+    <string name="common_ui_shortcuts">Genvägar</string>
+    <string name="common_ui_containers">Behållare</string>
+    <string name="common_ui_input_controls">Inmatningskontroller</string>
+    <string name="common_ui_no_items_to_display">Inga objekt att visa</string>
+    <string name="common_ui_select_icon">Välj ikon</string>
+    <string name="common_ui_revert_icon">Återställ ikon</string>
+    <string name="common_ui_select_exe">Välj EXE</string>
+    <string name="common_ui_select_folder">Välj mapp</string>
+    <string name="common_ui_current_folder">Aktuell mapp</string>
+    <string name="common_ui_enter_path">Ange sökväg</string>
+    <string name="common_ui_path_not_found">Sökvägen hittades inte</string>
+    <string name="common_ui_select_valid_exe_file">Välj en giltig .exe-fil</string>
+    <string name="common_ui_select_valid_icon_file">Välj en giltig .ico- eller .png-fil.</string>
+    <string name="common_ui_exit">Avsluta</string>
+    <string name="common_ui_exit_app">Avsluta app</string>
+    <string name="common_ui_profile">Profil</string>
+    <string name="common_ui_name">Namn</string>
+    <string name="common_ui_ok">OK</string>
+    <string name="common_ui_cancel">Avbryt</string>
+    <string name="common_ui_untitled">Namnlös</string>
+    <string name="common_ui_disabled">Inaktiverad</string>
+    <string name="common_ui_container">Behållare</string>
+    <string name="common_ui_value">Värde</string>
+    <string name="common_ui_none">Ingen</string>
+    <string name="common_ui_custom_text">Anpassad text</string>
+    <string name="common_ui_icon">Ikon</string>
+    <string name="common_ui_duplicate">Duplicera</string>
+    <string name="common_ui_credits_and_third_party_apps">Erkännanden och tredjepartsappar</string>
+    <string name="common_ui_loading">Läser in</string>
+    <string name="common_ui_exporting">Exporterar</string>
+    <string name="common_ui_enable">Aktivera</string>
+    <string name="common_ui_disable">Inaktivera</string>
+    <string name="common_ui_force">Tvinga</string>
+    <string name="common_ui_version">Version</string>
+    <string name="common_ui_advanced">Avancerat</string>
+    <string name="common_ui_graphics">Grafik</string>
+    <string name="common_ui_system">System</string>
+    <string name="common_ui_width">Bredd</string>
+    <string name="common_ui_height">Höjd</string>
+    <string name="common_ui_open_file">Öppna fil</string>
+    <string name="common_ui_download_file">Ladda ner fil</string>
+    <string name="common_ui_downloading_file">Laddar ner fil</string>
+    <string name="common_ui_browse">Bläddra</string>
+    <string name="common_ui_options">Alternativ</string>
+    <string name="common_ui_export">Exportera</string>
+    <string name="common_ui_new_file">Ny fil</string>
+    <string name="common_ui_description">Beskrivning</string>
+    <string name="common_ui_continue">Fortsätt</string>
+    <string name="common_ui_warning">Varning</string>
+    <string name="common_ui_copy">kopiera</string>
+    <string name="common_ui_reset">Återställ</string>
+    <string name="common_ui_close">Stäng</string>
+    <string name="common_ui_confirm">Bekräfta</string>
+    <string name="common_ui_unnamed">Namnlös</string>
+    <string name="common_ui_download">Ladda ner</string>
+    <string name="common_ui_uninstall">Avinstallera</string>
+    <string name="common_ui_other">Övrigt</string>
+    <string name="common_ui_status">Status</string>
+    <string name="common_ui_size">Storlek</string>
+    <string name="common_ui_release_date">Utgivningsdatum</string>
+    <string name="common_ui_installed">Installerad</string>
+    <string name="common_ui_available">Tillgänglig</string>
+    <string name="common_ui_settings">Inställningar</string>
+    <string name="common_ui_enable_all">Aktivera alla</string>
+    <string name="common_ui_disable_all">Inaktivera alla</string>
+    <string name="common_ui_select_all">Markera alla</string>
+    <string name="common_ui_deselect_all">Avmarkera alla</string>
+    <string name="common_ui_on">På</string>
+    <string name="common_ui_off">Av</string>
+    <string name="common_ui_already_set">Redan inställd</string>
+    <string name="common_ui_shortcut">Genväg</string>
+    <string name="common_ui_custom">Anpassad</string>
+    <string name="common_ui_about">Om</string>
+    <string name="common_ui_back">Tillbaka</string>
+    <string name="common_ui_apply">Verkställ</string>
+    <string name="common_ui_save">Spara</string>
+    <string name="common_ui_clone">Klona</string>
+    <string name="common_ui_properties">Egenskaper</string>
+    <string name="common_ui_store">Butik</string>
+    <string name="common_ui_library">Bibliotek</string>
+    <string name="common_ui_downloads">Nedladdningar</string>
+    <string name="common_ui_import">Importera</string>
+    <string name="common_ui_sync">Synkronisera</string>
+    <string name="common_ui_sign_in">Logga in</string>
+    <string name="common_ui_submit">Skicka</string>
+    <string name="common_ui_coming_soon">Kommer snart</string>
+    <string name="common_ui_signed_in">Inloggad</string>
+    <string name="common_ui_required">Obligatoriskt</string>
+    <string name="common_ui_optional">Valfritt</string>
+    <string name="common_ui_notifications">Aviseringar</string>
+    <string name="common_ui_mode">Läge</string>
+    <string name="common_ui_experimental">(Experimentell)</string>
+    <string name="common_ui_current_version_label">Aktuell version:</string>
+    <string name="common_ui_cannot_write_folder">Kan inte skriva till den valda mappen</string>
+    <string name="common_ui_failed_create_directory">Det gick inte att skapa standardkatalogen</string>
+    <string name="common_ui_device_not_supported">Tyvärr, din enhet kanske inte stöds</string>
+    <string name="common_ui_please_wait">Vänta\u2026</string>
+    <string name="common_ui_done">Klar</string>
+    <string name="common_ui_open">Öppna</string>
+    <string name="common_ui_connected">Ansluten</string>
+    <string name="common_ui_install">Installera</string>
+    <string name="common_ui_application">Applikation</string>
+    <string name="common_ui_check">Kontrollera</string>
+    <string name="store_game_check_for_update">Sök efter uppdatering</string>
+    <string name="store_game_checking_for_update">Kontrollerar</string>
+    <string name="store_game_download_update">Ladda ner uppdatering</string>
+    <string name="store_game_no_update_available">Ingen uppdatering tillgänglig</string>
+    <string name="store_game_update_available">Uppdatering tillgänglig</string>
+    <string name="store_game_update_check_failed">Uppdateringskontroll misslyckades</string>
+    <string name="store_game_update">Uppdatera</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verifiera filer</string>
+    <string name="store_game_verify_started">Verifierar %1$s — kontrollera fliken Nedladdningar</string>
+    <string name="store_game_steam_options">Steam-alternativ</string>
+    <string name="store_game_verify_complete">Filverifiering klar</string>
+    <string name="store_game_verify_failed_notice">Filverifiering misslyckades</string>
+    <string name="store_game_progress_background_hint">Du kan stänga detta — det fortsätter köra. Kontrollera fliken Nedladdningar när som helst.</string>
+    <string name="store_game_checking_updates">Söker efter uppdateringar</string>
+    <string name="store_game_no_updates_notice">Inga uppdateringar tillgängliga</string>
+    <string name="store_game_update_complete">Uppdatering klar</string>
+    <string name="store_game_update_failed_notice">Uppdatering misslyckades</string>
+    <string name="store_game_update_check_failed_notice">Uppdateringskontroll misslyckades</string>
+    <string name="store_game_download_already_active">Detta spel laddas redan ner. Avbryt den aktuella nedladdningen innan du lägger till DLC.</string>
+    <string name="common_ui_select">Välj</string>
+    <string name="common_ui_storage_roots">Lagringsrötter</string>
+    <string name="common_ui_browse_local_folders_directly">Bläddra bland lokala mappar direkt</string>
+    <string name="common_ui_no_folders_available_here">Inga mappar tillgängliga här</string>
+    <string name="common_ui_grant_all_files_access_browse">Bevilja åtkomst till alla filer för att bläddra bland mappar direkt.</string>
+    <string name="common_ui_not_configured">Inte konfigurerad</string>
+    <string name="common_ui_reinstall">Installera om</string>
+    <string name="common_ui_exit_app_confirm">Avsluta WinNative?</string>
+    <string name="common_ui_elements_count">%1$d element</string>
+    <string name="common_ui_disabled_placeholder">-- Inaktiverad --</string>
+    <string name="common_ui_enabled">Aktiverad</string>
+    <string name="common_ui_unknown_error">Okänt fel</string>
+    <string name="common_ui_auto_detected">Autodetekterad</string>
+    <string name="common_ui_change">Ändra</string>
+    <string name="common_ui_proceed">Fortsätt</string>
+    <string name="common_ui_sign_out">Logga ut</string>
+    <string name="common_ui_name_cannot_be_empty">Namnet får inte vara tomt</string>
+    <string name="common_ui_error_with_message">Fel: %1$s</string>
+    <string name="common_ui_64_bit">64-BITARS</string>
+    <string name="common_ui_32_bit">32-BITARS</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BITARS &amp; 32-BITARS</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d mapp</item>
+        <item quantity="other">%d mappar</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d fil</item>
+        <item quantity="other">%d filer</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Hämta grafik</string>
+    <string name="library_games_scraping_artwork">Hämtar</string>
+    <string name="library_games_shortcut_created">Genväg skapad</string>
+    <string name="library_games_failed_to_create_shortcut">Det gick inte att skapa genväg: %s</string>
+    <string name="library_games_install_path">Installationssökväg</string>
+    <string name="library_games_not_enough_space">Behöver %1$s mer utrymme</string>
+    <string name="library_games_download_slash_install">Ladda ner / Installera</string>
+    <string name="library_games_save_management">SPARHANTERING</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Tillgängligt: %3$s</string>
+    <string name="library_games_last_played">Senast spelad</string>
+    <string name="library_games_playtime">Speltid</string>
+    <string name="library_games_plays">Spelningar</string>
+    <string name="library_games_dlcs">DLC</string>
+    <string name="library_games_uninstall_game">AVINSTALLERA SPEL</string>
+    <string name="library_games_remove_game">TA BORT SPEL</string>
+    <string name="library_games_uninstall_confirm">Avinstallera %1$s och radera dess installerade spelmapp permanent?</string>
+    <string name="library_games_remove_confirm">Ta bort %1$s från ditt bibliotek. Spelfilerna på disken förblir orörda?</string>
+    <string name="library_games_game_uninstalled">%1$s avinstallerad.</string>
+    <string name="library_games_game_removed">%1$s borttagen.</string>
+    <string name="library_games_failed_to_uninstall">Det gick inte att avinstallera.</string>
+    <string name="library_games_failed_to_uninstall_reason">Det gick inte att avinstallera: %1$s</string>
+    <string name="library_games_loading">Läser in bibliotek\u2026</string>
+    <string name="library_games_no_games_installed">Inga spel installerade. Använd en butiksflik eller +-knappen för att lägga till spel.</string>
+    <string name="library_games_times_played_label">Antal gånger spelad: </string>
+    <string name="library_games_playtime_label">Speltid: </string>
+    <string name="library_games_no_games_hub">Inga spel installerade\nKlicka för att öppna Winlator-backend</string>
+    <string name="library_games_installed_badge">INSTALLERAD</string>
+    <string name="library_games_unknown_game">Okänt spel</string>
+    <string name="library_games_layouts_header">BIBLIOTEKSLAYOUTER</string>
+    <string name="library_games_layout_carousel">Karusell</string>
+    <string name="library_games_layout_list">Lista</string>
+    <string name="library_games_view_options_header">VISNINGSALTERNATIV</string>
+    <string name="library_games_immersive_mode">Uppslukande läge</string>
+    <string name="library_games_immersive_mode_description">Använd fokuserad spelbild som bakgrund</string>
+    <string name="library_games_immersive_blur">Oskarp bakgrund</string>
+    <string name="library_games_immersive_blur_description">Applicera en oskärpeeffekt på den uppslukande bakgrunden</string>
+    <string name="library_games_custom_game">Anpassat spel</string>
+    <string name="library_games_play">Spela</string>
+    <string name="hero_boot_to_desktop_title">Starta till skrivbord</string>
+    <string name="hero_graphics_tests_title">Grafiktester</string>
+    <string name="hero_graphics_test_32">32-bitars</string>
+    <string name="hero_graphics_test_64">64-bitars</string>
+    <string name="hero_input_tests_title">Inmatningstester</string>
+    <string name="library_games_add_custom_game">Lägg till anpassat spel</string>
+    <string name="library_games_game_name">Spelnamn</string>
+    <string name="library_games_game_folder_mapped_drive">Spelmapp (Mappad speldisk)</string>
+    <string name="library_games_select_exe_provide_name">Välj en exe och ange ett namn</string>
+    <string name="library_games_sign_in_prompt">Logga in på en butik eller lägg till ett anpassat spel för att bygga ditt bibliotek.</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Butiker</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Delad nedladdningsmapp</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Använd en enda mapp för alla butiker</string>
+    <string name="stores_accounts_default_downloads_folder">Standardnedladdningsmapp</string>
+    <string name="stores_accounts_steam_downloads">Steam-nedladdningar</string>
+    <string name="stores_accounts_epic_downloads">Epic-nedladdningar</string>
+    <string name="stores_accounts_gog_downloads">GOG-nedladdningar</string>
+    <string name="stores_accounts_download_speed">Nedladdningshastighet</string>
+    <string name="stores_accounts_download_speed_subtitle">Styr samtidigheten för Steam-nedladdningstrådar</string>
+    <string name="stores_accounts_download_server">Nedladdningsserver</string>
+    <string name="stores_accounts_connected_stores">Anslutna butiker</string>
+    <string name="stores_accounts_download_settings">Nedladdningsinställningar</string>
+    <string name="stores_accounts_download_speed_conservative">Konservativ</string>
+    <string name="stores_accounts_download_speed_balanced">Balanserad</string>
+    <string name="stores_accounts_download_speed_standard">Standard</string>
+    <string name="stores_accounts_download_speed_performance">Prestanda</string>
+    <string name="stores_accounts_download_server_auto_detected">Autodetekterad: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Steam CDN-region för spelnedladdningar</string>
+    <string name="stores_accounts_sign_out_confirm">Logga ut från %1$s?</string>
+    <string name="stores_accounts_sign_out_message">Du måste logga in igen för att komma åt ditt bibliotek.</string>
+    <string name="stores_accounts_logged_in_epic">Inloggad på Epic Games!</string>
+    <string name="stores_accounts_epic_login_failed">Epic-inloggning misslyckades: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">Inloggad på GOG!</string>
+    <string name="stores_accounts_gog_login_failed">GOG-inloggning misslyckades: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Anpassad nedladdningssökväg</string>
+    <string name="stores_accounts_custom_download_path_description">En standardsökväg för nedladdning har redan konfigurerats i Inställningar &gt; Butiker. Om du vill ange en unik anpassad sökväg för just den här installationen, klicka på Fortsätt.</string>
+    <string name="stores_accounts_not_signed_in">Inte inloggad</string>
+    <string name="stores_accounts_status_online">Online</string>
+    <string name="stores_accounts_status_away">Frånvarande</string>
+    <string name="stores_accounts_status_offline">Offline</string>
+    <string name="stores_accounts_status_invisible">Osynlig</string>
+    <string name="stores_accounts_status_header">STATUS</string>
+    <string name="stores_accounts_stores_header">BUTIKER</string>
+    <string name="stores_accounts_sign_in_store_prompt">Logga in för att komma åt butiken %1$s.</string>
+    <string name="stores_accounts_manage">Hantera butikskonton</string>
+    <string name="stores_accounts_sign_into_store">Logga in på %1$s</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Avbryt alla</string>
+    <string name="downloads_queue_preparing_download">Förbereder nedladdning</string>
+    <string name="downloads_queue_installing_package">Installerar paket</string>
+    <string name="downloads_queue_resume_all">Återuppta alla</string>
+    <string name="downloads_queue_pause_all">Pausa alla</string>
+    <string name="downloads_queue_clear">Rensa</string>
+    <string name="downloads_queue_status_label">Status:</string>
+    <string name="downloads_queue_phase_downloading">Laddar ner</string>
+    <string name="downloads_queue_phase_downloading_file">Laddar ner [%1$s]</string>
+    <string name="downloads_queue_phase_queued">I kö</string>
+    <string name="downloads_queue_phase_paused">Pausad</string>
+    <string name="downloads_queue_phase_preparing">Förbereder</string>
+    <string name="downloads_queue_phase_verifying">Verifierar</string>
+    <string name="downloads_queue_phase_verifying_file">Verifierar [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Patchar</string>
+    <string name="downloads_queue_phase_applying_data">Tillämpar data</string>
+    <string name="downloads_queue_phase_finalizing">Slutför</string>
+    <string name="downloads_queue_phase_unpacking">Packar upp</string>
+    <string name="downloads_queue_phase_updating">Uppdaterar</string>
+    <string name="downloads_queue_phase_complete">Klar</string>
+    <string name="downloads_queue_phase_cancelled">Avbruten</string>
+    <string name="downloads_queue_phase_failed">Misslyckades: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Okänd</string>
+    <string name="downloads_queue_paused_resume_hint">Pausad - tryck på Återuppta för att fortsätta</string>
+    <string name="downloads_queue_cancel_download">Avbryt nedladdning</string>
+    <string name="downloads_queue_cancel_download_title">Avbryt nedladdning?</string>
+    <string name="downloads_queue_cancel_download_confirm">Avbryta nedladdningen av %1$s och radera alla nedladdade filer?</string>
+    <string name="downloads_queue_cancel_download_warning">Att avbryta en nedladdning av DLC, spel eller uppdatering kan potentiellt skada din spelinstallation.\n\nÄr du säker på att du vill avbryta denna nedladdning och radera de filer som hittills laddats ner?</string>
+    <string name="downloads_queue_cancel_all_title">Avbryt alla nedladdningar?</string>
+    <string name="downloads_queue_cancel_all_warning">Att avbryta nedladdningar av DLC, spel eller uppdateringar kan potentiellt skada dina spelinstallationer.\n\nÄr du säker på att du vill avbryta alla nedladdningar och radera de filer som hittills laddats ner?</string>
+    <string name="downloads_queue_this_game">det här spelet</string>
+    <string name="downloads_queue_empty">Inga aktiva nedladdningar.</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">Ny container</string>
+    <string name="containers_list_edit">Redigera container</string>
+    <string name="containers_list_creating">Skapar container</string>
+    <string name="containers_list_removing">Tar bort container</string>
+    <string name="containers_list_duplicating">Duplicerar container</string>
+    <string name="containers_list_remove_title">Ta bort container</string>
+    <string name="containers_list_duplicate_title">Duplicera container</string>
+    <string name="containers_list_confirm_remove">Ta bort den här containern? Alla spelsparningar som lagras i den raderas permanent. Molnsynkade sparningar finns kvar i molnet, men lokala ändringar som ännu inte synkats går förlorade — synka det här spelets molnsparningar först om du vill behålla dem.</string>
+    <string name="containers_list_confirm_duplicate">Vill du duplicera den här containern?</string>
+    <string name="containers_list_duplicate_failed">Det gick inte att duplicera containern</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">Vill du ta bort den här genvägen?</string>
+    <string name="shortcuts_list_add_to_home_screen">Lägg till på startskärmen</string>
+    <string name="shortcuts_library_artwork_title">Biblioteksgrafik</string>
+    <string name="shortcuts_library_artwork_icon_title">Ikonbild</string>
+    <string name="shortcuts_library_artwork_hero_title">Bakgrund</string>
+    <string name="shortcuts_library_artwork_set">Ange bild</string>
+    <string name="shortcuts_library_artwork_failed">Det gick inte att läsa in den valda bilden.</string>
+    <string name="shortcuts_library_artwork_open_source">Öppna SteamGridDB</string>
+    <string name="shortcuts_list_not_available">Den här genvägen är inte längre tillgänglig. Radera eller återskapa den.</string>
+    <string name="shortcuts_list_select_a_container">Välj en container</string>
+    <string name="shortcuts_list_error_opening_settings">Fel vid öppning av genvägsinställningar</string>
+    <string name="shortcuts_list_removed">Genvägen togs bort.</string>
+    <string name="shortcuts_list_remove_failed">Det gick inte att ta bort genvägen. Försök igen.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Ta bort genväg\n%1$s</string>
+    <string name="shortcuts_list_cloned">Genvägen klonades.</string>
+    <string name="shortcuts_list_clone_failed">Det gick inte att klona genvägen.</string>
+    <string name="shortcuts_list_exported_to">Genväg exporterad till %1$s</string>
+    <string name="shortcuts_list_failed_export">Det gick inte att exportera genvägen</string>
+    <string name="shortcuts_export_all">Exportera alla</string>
+    <string name="shortcuts_export_to_frontend">Exportera till frontend</string>
+    <string name="shortcuts_export_all_done">Exporterade %1$d spel till %2$s</string>
+    <string name="shortcuts_export_all_none">Inga spel att exportera</string>
+    <string name="shortcuts_list_added">Genvägen lades till.</string>
+    <string name="shortcuts_list_readded_existing">Lade till befintlig genväg igen</string>
+    <string name="shortcuts_list_failed_add">Det gick inte att lägga till genvägen.</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Körargument</string>
+    <string name="shortcuts_properties_target_path">Målsökväg</string>
+    <string name="shortcuts_properties_disable_xinput">Inaktivera Xinput (för exklusiv M/tangentbordskontroll)</string>
+    <string name="num_controllers">Antal handkontroller</string>
+    <string name="shortcuts_properties_exclusive_input">Exklusiv inmatning</string>
+    <string name="shortcuts_properties_custom_game_settings">Anpassade spelinställningar</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Använd äldre startprogram</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Äldre Steam-emulering: kör spelet via ColdClient-startprogrammet och tar bort SteamStub-DRM från exe-filen. Använd endast för äldre spel som inte fungerar med Steam-startprogrammet.</string>
+    <string name="shortcuts_properties_runtime_patcher">DRM-patchning vid körning</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injicerar en DRM-patchnings-DLL vid start. Minskar FPS — använd endast om det äldre startprogrammet ensamt misslyckas.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">WinNative Real Steam Client</string>
+    <string name="steam_section_emulator">Äldre Steam-emulator</string>
+    <string name="shortcuts_properties_use_steam_input">Använd Steam Input</string>
+    <string name="shortcuts_properties_steam_offline_mode">Steam offlineläge</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Får den emulerade Steam-klienten att rapportera som offline, så att spelet inte försöker upprätta onlineanslutningar. Använd för spel som hänger sig vid Steams nätverkskontroll.</string>
+    <string name="shortcuts_properties_reset">Återställ egenskaper</string>
+    <string name="shortcuts_properties_updated_at">Genväg uppdaterad %1$s</string>
+    <string name="shortcuts_properties_properties_reset">Egenskaperna återställdes.</string>
+    <string name="shortcuts_properties_reset_per_game">Återställ inställningar per spel</string>
+    <string name="shortcuts_properties_reset_per_game_message">Återställa det här spelet till att använda den valda containerns standardinställningar?</string>
+    <string name="shortcuts_properties_per_game_reset">Inställningar per spel återställda till den valda containerns standardvärden</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">Inget kontrollelement valt</string>
+    <string name="input_controls_editor_scale">Skala</string>
+    <string name="input_controls_editor_shape">Form</string>
+    <string name="input_controls_editor_type">Typ</string>
+    <string name="input_controls_editor_binding">Bindning</string>
+    <string name="binding_primary">Primär bindning</string>
+    <string name="binding_secondary">Sekundär bindning</string>
+    <string name="binding_third">Tertiär bindning</string>
+    <string name="binding_fourth">Kvartär bindning</string>
+    <string name="input_controls_editor_binding_up">Bindning upp</string>
+    <string name="input_controls_editor_binding_right">Bindning höger</string>
+    <string name="input_controls_editor_binding_down">Bindning ner</string>
+    <string name="input_controls_editor_binding_left">Bindning vänster</string>
+    <string name="input_controls_editor_overlay_opacity">Överläggets opacitet</string>
+    <string name="input_controls_editor_opacity">Opacitet</string>
+    <string name="input_controls_editor_radial_menu">Radiell meny</string>
+    <string name="input_controls_editor_radial_menu_options">Alternativ för radiell meny</string>
+    <string name="input_controls_editor_number_of_bindings">Antal bindningar</string>
+    <string name="input_controls_editor_select_profile">Välj profil</string>
+    <string name="input_controls_select_style">Välj stil</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glas</string>
+    <string name="input_controls_style_slate">Skiffer</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Glimt</string>
+    <string name="input_controls_style_shadow">Skugga</string>
+    <string name="input_controls_style_reticle">Hårkors</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Färgtema</string>
+    <string name="input_controls_edit_duplicating_builtin">Inbyggd profil — en kopia som du kan redigera har skapats.</string>
+    <string name="input_controls_editor_profile_name">Profilnamn</string>
+    <string name="input_controls_editor_no_profile_selected">Ingen profil vald</string>
+    <string name="input_controls_editor_no_profile_found">Ingen profil hittades</string>
+    <string name="input_controls_editor_tap_to_switch">Tryck för att byta</string>
+    <string name="input_controls_editor_confirm_remove_profile">Vill du ta bort den här profilen?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">Vill du duplicera den här profilen?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Återställa den här profilen till dess ursprungliga layout? Alla ändringar du gjort går förlorade.</string>
+    <string name="input_controls_editor_profile_reset">Profilen återställdes till dess ursprungliga layout.</string>
+    <string name="input_controls_editor_reset_unavailable">Ingen ursprunglig ögonblicksbild finns tillgänglig för den här profilen.</string>
+    <string name="input_controls_editor_title">Kontrollredigerare</string>
+    <string name="input_controls_editor_toggle_switch">Växlingsknapp</string>
+    <string name="input_controls_editor_swipeable">Svepbar</string>
+    <string name="input_controls_editor_profile_exported_to">Profil exporterad till</string>
+    <string name="input_controls_editor_unable_to_import">Det gick inte att importera profilen</string>
+    <string name="input_controls_editor_import_profile">Importera profil</string>
+    <string name="input_controls_editor_download_profile">Ladda ner profil</string>
+    <string name="input_controls_editor_export_profile">Exportera profil</string>
+    <string name="input_controls_editor_range">Intervall</string>
+    <string name="input_controls_editor_confirm_download_profiles">Vill du ladda ner de valda profilerna?</string>
+    <string name="input_controls_editor_unable_to_load_list">Det gick inte att läsa in profillistan</string>
+    <string name="input_controls_editor_osc_transparency">Transparens för skärmkontroller</string>
+    <string name="input_controls_editor_osc_transparency_description">Justera transparensen för skärmkontrollerna.</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Skärmstorlek</string>
+    <string name="container_config_new_env_var">Ny miljövariabel</string>
+    <string name="container_config_env_vars">Miljövariabler</string>
+    <string name="container_config_processor_affinity">Processoraffinitet</string>
+    <string name="container_config_processor_affinity_32bit">Processoraffinitet (32-bitars appar)</string>
+    <string name="container_config_audio_driver">Ljuddrivrutin</string>
+    <string name="container_config_win_components">Win-komponenter</string>
+    <string name="container_config_drives">Enheter</string>
+    <string name="container_config_arch">Arkitektur</string>
+    <string name="container_config_storage_info">Lagringsinfo</string>
+    <string name="container_config_drive_c">Enhet C:</string>
+    <string name="container_config_cache">Cache</string>
+    <string name="container_config_total">Totalt</string>
+    <string name="container_config_clear_cache">Rensa cache</string>
+    <string name="container_config_estimated_used_space">Uppskattat använt utrymme</string>
+    <string name="settings_containers_error_saving_wallpaper">Fel vid sparande av bakgrundsbild</string>
+    <string name="container_config_directinput_mapper_type">DirectInput-mappartyp</string>
+    <string name="container_config_title">Konfiguration</string>
+    <string name="container_config_startup_selection">Uppstartsval</string>
+    <string name="container_config_glibc_exp_edition">Baserad på</string>
+    <string name="container_config_refresh_rate_default_global">Standard (global)</string>
+    <string name="container_config_enable_dinput">Aktivera DInput för spel i Wine</string>
+    <string name="container_config_enable_xinput">Aktivera XInput för spel i Wine</string>
+    <string name="container_config_dinput_legacy">Äldre (gamla handkontroller)</string>
+    <string name="container_config_dinput_modern">Modern (XInput-liknande)</string>
+    <string name="container_config_help_xinput">
+        Om ditt spel använder &lt;i&gt;&lt;b&gt;XInput-API:et&lt;/b&gt;&lt;/i&gt; för stöd för spelkontroller, aktivera det här alternativet.&lt;br/&gt;&lt;br/&gt;
+        Det här alternativet påverkar både &lt;i&gt;&lt;b&gt;virtuella&lt;/b&gt;&lt;/i&gt; (från Input Controls) och &lt;i&gt;&lt;b&gt;fysiska&lt;/b&gt;&lt;/i&gt; spelkontroller.
+    </string>
+    <string name="container_config_help_dinput">
+        Om ditt spel använder &lt;i&gt;&lt;b&gt;DInput-API:et&lt;/b&gt;&lt;/i&gt; för stöd för spelkontroller, aktivera det här alternativet.&lt;br/&gt;&lt;br/&gt;
+        Det här alternativet påverkar både &lt;i&gt;&lt;b&gt;virtuella&lt;/b&gt;&lt;/i&gt; (från Input Controls) och &lt;i&gt;&lt;b&gt;fysiska&lt;/b&gt;&lt;/i&gt; spelkontroller.
+    </string>
+    <string name="container_config_xinput_dinput_warning">Vissa spel kan ha stöd för båda API:erna. Att aktivera både XInput och DInput samtidigt i sådana spel kan orsaka kontrollproblem, som i titlar som The Binding of Isaac och Resident Evil-serien.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32-bitars emulator</string>
+    <string name="container_config_emulator_wine_hint">Emulatorn bestäms av wine-versionen. ARM64EC använder FEXCore, x86_64 använder Box64.</string>
+    <string name="container_config_label">Konfiguration</string>
+    <string name="container_config_restart_required">Starta om containern för att ändringarna ska träda i kraft</string>
+    <string name="container_config_renderer">Renderare</string>
+    <string name="container_config_variables">Variabler</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">Inmatningar</string>
+    <string name="container_config_tab">Konfig</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">64-bitars emulator</string>
+    <string name="container_config_emulator_section">Emulator</string>
+    <string name="container_config_sdl2_compatibility">Aktivera SDL2-kompatibilitet</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Wine-konfiguration</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">GPU-namn</string>
+    <string name="container_wine_offscreen_rendering_mode">Läge för rendering utanför skärmen</string>
+    <string name="container_wine_strict_shader_math">Strikt shader-matematik</string>
+    <string name="container_wine_video_memory_size">Videominnesstorlek</string>
+    <string name="container_wine_dxwrapper">DX-omslag</string>
+    <string name="container_wine_mouse_warp_override">Åsidosättning av musförflyttning</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">DXVK-version</string>
+    <string name="container_wine_dxvk_config_title">DXVK-konfiguration</string>
+    <string name="container_wine_wined3d_config_title">WineD3D-konfiguration</string>
+    <string name="container_wine_vkd3d_version">VKD3D-version</string>
+    <string name="container_wine_version">Wine-version</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; är ett översättningslager för DirectX 1-11 till OpenGL.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; är ett översättningslager för Direct3D 9-11 till Vulkan.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; är ett översättningslager för Direct3D 12-API:et till Vulkan.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; är en implementering av DirectDraw för bättre kompatibilitet med klassiska spel.
+    </string>
+    <string name="container_wine_enabled_async">Aktivera Async</string>
+    <string name="container_wine_enabled_async_cache">Aktivera Async-cache</string>
+    <string name="container_wine_vkd3d_feature_level">VKD3D-funktionsnivå</string>
+    <string name="container_wine_ddraw_wrapper">DDraw-omslag</string>
+    <string name="container_wine_error_not_installed">Wine/Proton-paketet \'%1$s\' är inte installerat och kunde inte laddas ner.</string>
+    <string name="container_no_wine_installed">Ingen Wine eller Proton är installerad. Installera en först.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Yteffekt</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Box64-förinställning</string>
+    <string name="container_box64_version">Box64-version</string>
+    <string name="container_box64_stability">Stabilitet</string>
+    <string name="container_box64_compatibility">Kompatibilitet</string>
+    <string name="container_box64_intermediate">Mellannivå</string>
+    <string name="container_box64_performance">Prestanda</string>
+    <string name="container_fexcore_performance_tso">Prestanda TSO</string>
+    <string name="container_fexcore_extreme">Extrem</string>
+    <string name="container_fexcore_extreme_tso">Extrem TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Aktiverar eller inaktiverar Box64:s dynamiska omkompilerare.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        Hantering av flaggor på CALL/RET-opkoder&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Behandlar CALL/RET som om de aldrig behövde flaggor (snabbare, instabilt)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : De flesta RET behöver flaggor, de flesta CALL gör det inte&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Alla CALL/RET behöver flaggor (långsammare)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">Generering av -NAN som på x86</string>
+    <string name="box64_env_var_help__dynarec_fastround">Generering av precis x86-avrundning</string>
+    <string name="box64_env_var_help__dynarec_x87double">Användning av Float/Double för x87-emulering</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec bygger BigBlock&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Försök inte bygga blocket så stort som möjligt&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Bygg Dynarec-blocket så stort som möjligt&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Bygg Dynarec-blocket större (fortsätt när blocket överlappar, men endast för block i elf-minne)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Bygg Dynarec-blocket större (fortsätt när blocket överlappar, för alla typer av minne)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Simulering av Strong Memory-modell&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Försök inte med något speciellt&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Aktivera vissa Memory Barrier vid skrivning till minne (på vissa MOV-opkoder)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Allt i 1 plus en Memory Barrier vid varje skrivning till minne med MOV&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Allt i 2 plus Memory Barrier vid läsning från minne och på vissa SSE/SSE2-opkoder&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : Efterliknar x86 TSO på liknande sätt som QEMU.
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">Definierar det högsta tillåtna framåtvärdet vid byggande av block</string>
+    <string name="box64_env_var_help__dynarec_callret">Optimering av CALL/RET-opkoder</string>
+    <string name="box64_env_var_help__dynarec_sep">Lägger till sekundära ingångspunkter för att optimera CALL/RET när CALLRET är aktiverat.</string>
+    <string name="box64_env_var_help__dynarec_wait">Definierar huruvida Dynarec ska vänta på att FillBlock blir klar</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Justera minnesbarriärer för att minska prestandapåverkan av strong memory-emulering&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Använd vanliga säkra barriärer&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Använd svaga barriärer för en mild prestandaökning&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Använd svaga barriärer, inaktivera dessutom barriärer för sista skrivningen</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        Generera endast justerade atomics (endast tillgängligt på Arm64 för närvarande).&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Generera kod som hanterar ojusterade atomics.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Generera endast justerade atomics, vilket är snabbare och ger mindre kodstorlek, men orsakar SIGBUS för LOCK-prefixade opkoder som opererar på justerade dataadresser.</string>
+    <string name="box64_env_var_help__dynarec_df">
+        Aktivera eller inaktivera användningen av deferred flags.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Inaktivera användningen av deferred flags.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Aktivera användningen av deferred flags.</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        Tillåt fortsatt körning av ett block som är oskyddat och potentiellt smutsigt.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Tillåt inte fortsatt körning av ett block som är oskyddat och potentiellt smutsigt.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Tillåt fortsatt körning av ett dynablock som skriver data på samma sida som kod. Det kan snabba upp laddningstiden för vissa spel men kan också orsaka oväntade krascher.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Kommer även, när en HotPage upptäcks, att markera den sidan som NEVERCLEAN, så att den inte skrivskyddas men block som byggs från den sidan alltid testas. Det kan vara snabbare på det sättet (men vissa SMC-fall kanske inte fångas).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        Aktivera eller inaktivera användningen av native flags.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Använd inte native flags.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Använd native flags när det är möjligt.</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        Aktivera x86 PAUSE-emulering, kan förbättra prestandan för spinlocks.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ignorera x86 PAUSE-instruktionen.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Använd YIELD för att emulera x86 PAUSE-instruktionen.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Använd WFI för att emulera x86 PAUSE-instruktionen.&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Använd SEVL+WFE för att emulera x86 PAUSE-instruktionen.
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">Minskar dynarec-blockmetadata för att spara minne, med kompatibilitetsavvägningar.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">Använder PE volatile-metadata för att styra stark minnesemulering för 64-bitars Windows-spel.</string>
+    <string name="box64_env_var_help__dynacache">Styr cachning av genererade dynarec-block mellan körningar för att snabba upp starten.</string>
+    <string name="box64_env_var_help__avx">
+        Exponerar AVX-funktioner för gästen.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Inaktivera AVX-tillägg&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : aktivera AVX-, BMI1-, F16C- och VAES-tillägg.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Allt i 1 plus aktivera AVX2, BMI2, FMA, ADX, VPCLMULQDQ och RDRAND.&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">Exponerar AES-processorfunktioner för gästen.</string>
+    <string name="box64_env_var_help__pclmulqdq">Exponerar PCLMULQDQ-processorfunktioner för gästen.</string>
+    <string name="box64_env_var_help__shaext">Exponerar SHA-tilläggets processorfunktioner för gästen.</string>
+    <string name="box64_env_var_help__sse42">Exponerar SSE4.2-processorfunktioner för gästen.</string>
+    <string name="box64_env_var_help__sse_flushto0">Styr SSE flush-to-zero-beteende och spårning av undantagsflaggor.</string>
+    <string name="box64_env_var_help__x87_no80bits">Använder 64-bitars double-precision istället för 80-bitars long double för x87.</string>
+    <string name="box64_env_var_help__cputype">Väljer vilken Intel- eller AMD-processormodell som exponeras för gästen.</string>
+    <string name="box64_env_var_help__maxcpu">Maximalt antal processorer som Box64 presenterar för program</string>
+    <string name="box64_env_var_help__unityplayer">Upptäcker UnityPlayer och markerar appen som ett Unity-spel.</string>
+    <string name="box64_env_var_help__unity">Markerar appen som ett Unity-spel och aktiverar Unity-specifik kompatibilitetshantering.</string>
+    <string name="box64_env_var_help__mmap32">Tvinga all minnesallokering till 32-bitars adressrymder</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">Aktiverar TSO IR-operationer (krävs för flertrådade appar).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">Gör vektorläsningar/-skrivningar atomiska när TSO är aktiverat.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">Använder half-barrier-atomics för ojusterade läsningar/skrivningar under TSO.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">Gör REP MOVS / REP STOS atomiska under TSO.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Använder ett strikt processomfattande lås för delade ojusterade atomiska åtkomster.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Efterlappar kärnhanterade ojusterade atomics för att minska kontextväxlingar i kärnan.</string>
+    <string name="fexcore_env_var_help__multiblock">Aktiverar multiblock-kodkompilering. Kan orsaka längre JIT-kompilering och hackighet.</string>
+    <string name="fexcore_env_var_help__maxinst">Maximalt antal instruktioner som lagras i ett kompilerat block.</string>
+    <string name="fexcore_env_var_help__hostfeatures">Styr framtvingande av processorfunktioner.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Skalar TSC på lågfrekventa system.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Döljer hybrid-processorkärnlayout för gästen.</string>
+    <string name="fexcore_env_var_help__smc_checks">Kontrollerar om kod har ändrats innan körning.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Använder volatile-metadata från PE-filer för TSO när det är tillgängligt.</string>
+    <string name="fexcore_env_var_help__monohacks">Speciella SMC- + JIT-blockhack för Mono-detektering.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">Döljer CPUID-hypervisorbiten (användbart för appar som kraschar med den).</string>
+    <string name="fexcore_env_var_help__disablel2cache">Inaktiverar FEXCore JIT L2-cacheuppslag, sparar minne men introducerar hackighet.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">Ändrar FEXCore JIT L1-cache till dynamisk storlek, sparar minne men introducerar hackighet.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Tröskelvärde för uppslag per sekund för att utöka den dynamiska L1-cachen.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Tröskelvärde för uppslag per sekund för att krympa den dynamiska L1-cachen.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">Emulerar X87-flyttal med 64-bitars precision. Detta minskar emuleringsnoggrannheten och kan orsaka renderingsfel.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">FEXCore-förinställning</string>
+    <string name="container_fexcore_version">FEXCore-version</string>
+    <string name="use_unix_libs">Använd UnixLibs</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Grafikdrivrutin</string>
+    <string name="container_zink_mode">Zink-läge</string>
+    <string name="container_graphics_configuration">Grafikdrivrutinskonfiguration</string>
+    <string name="container_graphics_version">Grafikdrivrutinsversion</string>
+    <string name="container_graphics_available_extensions">Tillgängliga tillägg</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d aktiverade</string>
+    <string name="container_graphics_max_device_memory">Max enhetsminne</string>
+    <string name="container_graphics_sync_frame">Synkronisera varje bildruta</string>
+    <string name="container_graphics_disable_present_wait">Inaktivera KHR_present_wait</string>
+    <string name="container_graphics_present_modes">Presentationslägen</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan-skärmsynkronisering</string>
+    <string name="container_graphics_resource_type">Minnesresurstyp</string>
+    <string name="container_graphics_vulkan_version">Vulkan-version</string>
+    <string name="container_graphics_bcn_emulation">BCn-emulering</string>
+    <string name="container_graphics_bcn_emulation_type">BCn-emuleringstyp</string>
+    <string name="container_graphics_bcn_emulation_cache">BCn-emuleringscache</string>
+    <string name="container_graphics_transcoder">BCn-omkodare</string>
+    <string name="container_graphics_quality">BCn-kvalitet</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">Vill du duplicera den här förinställningen?</string>
+    <string name="container_presets_confirm_remove">Vill du ta bort den här förinställningen?</string>
+    <string name="container_presets_title">Förinställningar</string>
+    <string name="container_presets_preset">Förinställning</string>
+    <string name="container_presets_new">Ny förinställning</string>
+    <string name="container_presets_rename">Byt namn på förinställning</string>
+    <string name="container_presets_import">Importera förinställning</string>
+    <string name="container_presets_custom">Anpassad</string>
+    <string name="container_presets_built_in">Standard</string>
+    <string name="container_presets_changes_auto_saved">Ändringar sparas automatiskt när du redigerar den här anpassade förinställningen.</string>
+    <string name="container_presets_cannot_rename">Inbyggda förinställningar kan inte byta namn</string>
+    <string name="container_presets_unable_to_import">Det gick inte att importera förinställningen</string>
+    <string name="container_presets_no_description">Ingen beskrivning tillgänglig</string>
+    <string name="container_presets_cannot_remove">Du kan inte ta bort den här förinställningen</string>
+    <string name="container_presets_cannot_export">Det går inte att exportera den här förinställningen</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Simulera pekskärm</string>
+    <string name="session_xserver_preferences_button_text">   INSTÄLLNINGAR   </string>
+    <string name="session_xserver_extra_keys_config_desc">Här kan du ange värdet på extra-keys-variabeln som i Termux-appen (läs <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">detta</a>) och mer \n
+T.ex. <b>META</b> för <i>META-tangent</i>, \n
+<b>KEYBOARD</b> för <i>tangent för att växla mjukt tangentbord</i>, \n
+<b>PREFERENCES</b> för <i>tangent för att öppna inställningar</i>, \n
+<b>MOUSE_HELPER</b> för <i>tangent för att växla mushjälp</i>, \n
+<b>STYLUS_HELPER</b> för <i>tangent för att växla överlägg för penn-klickåsidosättning</i>, \n
+<b>EXIT</b> för <i>tangent för att avsluta applikationen</i>.</string>
+    <string name="session_xserver_pref_main">Inställningar</string>
+    <string name="session_xserver_pref_output">Utdata</string>
+    <string name="session_xserver_pref_pointer">Pekare</string>
+    <string name="session_xserver_pref_kbd">Tangentbord</string>
+    <string name="session_xserver_pref_other">Övrigt</string>
+    <string name="session_xserver_pref_version">Version</string>
+    <string name="session_xserver_notification_description">WinNative XServer-meddelanden</string>
+    <string name="session_xserver_notification_content">WinNative körs, avsluta eller svep inte bort den här aviseringen</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Tangentbord</string>
+    <string name="session_drawer_fps_monitor">FPS-övervakare</string>
+    <string name="session_drawer_fps_monitor_subtitle">Visa prestandastatistik i realtid</string>
+    <string name="session_drawer_dual_series_battery">Dubbelseriebatteri</string>
+    <string name="session_drawer_hud_frametime_numeric">Visa bildrutetid som siffra</string>
+    <string name="session_drawer_toggle_fullscreen">Växla helskärm</string>
+    <string name="session_drawer_refactor_size">Ändra storlek</string>
+    <string name="session_drawer_show_touchscreen_controls">Visa pekskärmskontroller</string>
+    <string name="session_drawer_magnifier">Förstoringsglas</string>
+    <string name="session_drawer_logs">Loggar</string>
+    <string name="session_drawer_pip_mode">PiP-läge</string>
+    <string name="session_drawer_toggle_relative_mouse">Växla relativ musrörelse</string>
+    <string name="session_drawer_toggle_mouse">Växla mus</string>
+    <string name="session_drawer_pause_resume">Pausa/Återuppta</string>
+    <string name="session_drawer_relative_mouse_movement">Relativ musrörelse</string>
+    <string name="session_drawer_mouse_input">Musinmatning</string>
+    <string name="session_drawer_touch">Touch</string>
+    <string name="session_drawer_touch_trackpad">Styrplatta</string>
+    <string name="session_drawer_touch_touchscreen">Pekskärmsläge</string>
+    <string name="session_drawer_touch_map_right_stick">Mappa till höger spak</string>
+    <string name="session_drawer_rts_gestures">RTS-gester</string>
+    <string name="session_drawer_rts_gestures_edit">Redigera</string>
+    <string name="session_drawer_right_stick_sensitivity">Känslighet för höger spak</string>
+    <string name="session_rts_action">Åtgärd</string>
+    <string name="session_rts_behavior">Beteende</string>
+    <string name="session_rts_tap1">1-fingertryck</string>
+    <string name="session_rts_tap2">2-fingertryck</string>
+    <string name="session_rts_tap3">3-fingertryck</string>
+    <string name="session_rts_tap4">4-fingertryck</string>
+    <string name="session_rts_double_tap">Dubbeltryck (dubbelt vänsterklick)</string>
+    <string name="session_rts_long_press">Långtryck</string>
+    <string name="session_rts_hold2">2-fingerhållning</string>
+    <string name="session_rts_hold3">3-fingerhållning</string>
+    <string name="session_rts_hold4">4-fingerhållning</string>
+    <string name="session_rts_swipe3">3-fingersvep</string>
+    <string name="session_rts_swipe4">4-fingersvep</string>
+    <string name="session_rts_up">Upp</string>
+    <string name="session_rts_down">Ned</string>
+    <string name="session_rts_left">Vänster</string>
+    <string name="session_rts_right">Höger</string>
+    <string name="session_rts_pan">2-fingerpanorering</string>
+    <string name="session_rts_pan1">1-fingerpanorering</string>
+    <string name="session_rts_zoom">Nyp för att zooma</string>
+    <string name="session_rts_drag">1-fingerdragning</string>
+    <string name="session_rts_drag2">2-fingerdragning</string>
+    <string name="session_rts_long_press_delay">Fördröjning för långtryck (ms)</string>
+    <string name="session_rts_hold_delay">Fördröjning för hållning (ms)</string>
+    <string name="session_rts_swipe_threshold">Svepningströskel (px)</string>
+    <string name="session_rts_gesture_threshold">Gesttröskel (px)</string>
+    <string name="session_rts_double_tap_delay">Fördröjning för dubbeltryck (ms)</string>
+    <string name="session_rts_drag_threshold">Dragtröskel (px)</string>
+    <string name="session_rts_pan_threshold">Start för panorering/nyp (px)</string>
+    <string name="common_ui_rename">Byt namn</string>
+    <string name="common_ui_new">Ny</string>
+    <string name="input_controls_editor_input_profiles_section">Inmatningsprofiler</string>
+    <string name="session_gesture_profile_section">Gestprofil</string>
+    <string name="gesture_profile_new">Ny gestprofil</string>
+    <string name="gesture_profile_import">Importera gestprofil</string>
+    <string name="gesture_profile_export">Exportera gestprofil</string>
+    <string name="gesture_profile_none">Inga gestprofiler</string>
+    <string name="session_drawer_screen_effects">Skärmeffekter</string>
+    <string name="session_drawer_screen_effects_subtitle">Uppskalning och färgeffekter</string>
+    <string name="session_drawer_super_resolution">Superupplösning</string>
+    <string name="session_drawer_upscaler_mode">Uppskalare</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Kantskärpa</string>
+    <string name="session_drawer_vivid">Livfull</string>
+    <string name="session_drawer_vivid_strength">Livfullhetsstyrka</string>
+    <string name="session_drawer_color_profile">Färgeffekt</string>
+    <string name="session_drawer_picture_in_picture">Bild-i-bild</string>
+    <string name="session_drawer_exit_subtitle">Stäng den pågående sessionen</string>
+    <string name="session_drawer_touchscreen_overlay">Pekskärmsöverlägg</string>
+    <string name="session_drawer_resume">Återuppta</string>
+    <string name="session_drawer_retry">Försök igen</string>
+    <string name="downloads_no_internet">Ingen internetanslutning</string>
+    <string name="session_drawer_pause">Pausa</string>
+    <string name="session_drawer_wine_processes_paused">Wine-processer är pausade</string>
+    <string name="session_drawer_pause_all_wine_processes">Pausa alla Wine-processer</string>
+    <string name="session_drawer_controls_section">Kontroller</string>
+    <string name="session_drawer_session_section">Session</string>
+    <string name="session_drawer_header_subtitle">Snabb åtkomst till kontroller, överlägg och sessionsverktyg</string>
+    <string name="session_drawer_swipe_hint">Svep bort för att hoppa tillbaka in i spelet</string>
+    <string name="session_drawer_main_menu_title">Meny</string>
+    <string name="session_drawer_hud_summary">Justera överläggets synlighet och datapunkter</string>
+    <string name="session_drawer_hud_disabled_hint">Slå på överlägget för att anpassa det</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_background_alpha">Bakgrundsalfa</string>
+    <string name="session_drawer_hud_background">Bakgrund</string>
+    <string name="session_drawer_hud_scale">Skala</string>
+    <string name="session_drawer_hud_elements">HUD-element</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">Graf</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD i Mango-stil</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD-inställningar</string>
+    <string name="mango_hud_element_gpu_load">GPU-belastning</string>
+    <string name="mango_hud_element_gpu_temp">GPU-temp.</string>
+    <string name="mango_hud_element_cpu_load">CPU-belastning</string>
+    <string name="mango_hud_element_cpu_temp">CPU-temp.</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Batteri</string>
+    <string name="mango_hud_element_lows" formatted="false">1 %-lägsta</string>
+    <string name="mango_hud_element_graph">Frametime-graf</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU-klocka</string>
+    <string name="mango_hud_element_gpu_clock">GPU-klocka</string>
+    <string name="mango_hud_element_cores">Per kärna</string>
+    <string name="mango_hud_element_network">Nätverk</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Upplösning</string>
+    <string name="mango_hud_element_wine">Wine-version</string>
+    <string name="mango_hud_element_duration">Sessionstid</string>
+    <string name="mango_hud_element_clock">Klocka</string>
+    <string name="mango_hud_element_throttle">Termisk status</string>
+    <string name="mango_hud_group_memory">Minne</string>
+    <string name="mango_hud_group_system">System</string>
+    <string name="mango_hud_lock">Lås HUD</string>
+    <string name="mango_hud_lock_subtitle">Låt tryck nå kontrollerna bakom HUD:en. Håll in HUD:en för att låsa den. (5s)</string>
+    <string name="hud_position_menu_title">Flytta HUD till</string>
+    <string name="hud_position_top_left">Uppe till vänster</string>
+    <string name="hud_position_top_center">Uppe i mitten</string>
+    <string name="hud_position_top_right">Uppe till höger</string>
+    <string name="hud_position_left_center">Mitten till vänster</string>
+    <string name="hud_position_right_center">Mitten till höger</string>
+    <string name="hud_position_bottom_left">Nere till vänster</string>
+    <string name="hud_position_bottom_center">Nere i mitten</string>
+    <string name="hud_position_bottom_right">Nere till höger</string>
+    <string name="session_drawer_hud_alpha_input_title">Ange alfa</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Ange bakgrundsalfa</string>
+    <string name="session_drawer_hud_scale_input_title">Ange skala</string>
+    <string name="session_drawer_hud_input_hint">Ange ett värde mellan %1$d och %2$d. Värden över gränsen begränsas.</string>
+    <string name="session_drawer_command_center">Kommandocenter</string>
+    <string name="session_drawer_command_center_input">Inmatning</string>
+    <string name="session_drawer_command_center_display">Skärm</string>
+    <string name="session_drawer_command_center_system">System</string>
+    <string name="session_drawer_fps_limiter">FPS-begränsare</string>
+    <string name="session_drawer_fps_limiter_off">Av</string>
+    <string name="session_drawer_color_profile_disabled">Inaktiverad</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Naturlig</string>
+    <string name="session_drawer_color_profile_crt">CRT-effekt</string>
+    <string name="session_drawer_color_profile_toon">Tecknad</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Ljusstyrka</string>
+    <string name="session_drawer_contrast">Kontrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_scale">Skala</string>
+    <string name="session_drawer_scale_nearest">Närmaste</string>
+    <string name="session_drawer_scale_linear">Linjär</string>
+    <string name="session_drawer_scale_bicubic">Bikubisk</string>
+    <string name="session_drawer_saturation">Mättnad</string>
+    <string name="session_drawer_temperature">Temperatur</string>
+    <string name="session_drawer_tint">Nyans</string>
+    <string name="session_drawer_sharpen">Skärpa</string>
+    <string name="session_drawer_scanlines">Scanlinjer</string>
+    <string name="session_drawer_pixelate">Pixelera</string>
+    <string name="session_drawer_block_size">Blockstorlek</string>
+    <string name="session_drawer_strength">Styrka</string>
+    <string name="session_drawer_intensity">Intensitet</string>
+    <string name="session_drawer_color_blind">Färgblind</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Återställ effekter</string>
+    <string name="session_drawer_calibrate_advanced">Avancerad kalibrering</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Gyro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Utgång</string>
+    <string name="session_drawer_rail_label_apps">Mer</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">Extern skärm upptäckt</string>
+    <string name="display_output_prompt_message">Skicka spelet till den anslutna skärmen? Dina skärmkontroller och din meny stannar på den här telefonen.</string>
+    <string name="display_output_prompt_swap">Byt skärmar</string>
+    <string name="display_output_prompt_mirror">Spegla</string>
+    <string name="display_output_swapped_toast">Spelet flyttat till extern skärm. Kontrollerna stannar på telefonen.</string>
+    <string name="display_output_cast_unavailable">Inställningar för trådlös skärm är inte tillgängliga på den här enheten.</string>
+    <string name="display_output_restored_toast">Extern skärm frånkopplad — spelet återfört till telefonen.</string>
+    <string name="session_drawer_output_title">Skärmutgång</string>
+    <string name="session_drawer_output_subtitle">Spelet visas på den externa skärmen.</string>
+    <string name="session_drawer_output_device">Ansluten skärm</string>
+    <string name="session_drawer_output_resolution">Upplösning</string>
+    <string name="session_drawer_output_refresh_rate">Uppdateringsfrekvens</string>
+    <string name="session_drawer_output_aspect_ratio">Bildförhållande</string>
+    <string name="session_drawer_output_aspect_fit">Anpassa (bildförhållande)</string>
+    <string name="session_drawer_output_aspect_stretch">Sträck ut (fyll)</string>
+    <string name="session_drawer_output_aspect_zoom">Zooma (beskär)</string>
+    <string name="session_drawer_output_return_to_phone">Återför till telefonen</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Casta till en TV</string>
+    <string name="session_drawer_output_cast_body">Anslut en USB-C-/HDMI-adapter, eller tryck nedan för att ansluta en trådlös skärm (Miracast / Wi-Fi Direct). Spelet visas på TV:n medan dessa kontroller stannar på telefonen.</string>
+    <string name="session_drawer_output_cast_button">Anslut trådlös skärm</string>
+    <string name="session_drawer_output_cast_note">TV-apparater med endast Chromecast kan inte visa live-spel med privata kontroller — använd en trådlös skärm eller en USB-C-/HDMI-adapter för bästa resultat.</string>
+    <string name="session_drawer_output_render_note">Lägen som din skärm rapporterar byter dess faktiska utsignal (den kan bli svart en kort stund medan den initieras om). Andra upplösningar renderas i den storleken och hårdvaruskalas till panelen — högre än inbyggd upplösning ger skärpa (supersampling), lägre går snabbare.</string>
+    <string name="session_drawer_output_scaling_note">Den här telefonen matar ut skärmen i sin inbyggda %1$s och byter inte läge, så detta ställer in renderingsupplösningen — den hårdvaruskalas till panelen (högre än inbyggd upplösning ger skärpa, lägre går snabbare).</string>
+    <string name="session_drawer_output_game_mode">Spelläge (låg latens)</string>
+    <string name="session_drawer_output_game_mode_on">På</string>
+    <string name="session_drawer_output_game_mode_off">Av</string>
+    <string name="session_drawer_output_game_mode_note">Begär TV:ns läge för låg latens / spelläge (HDMI ALLM) för att minimera inmatningsfördröjning. Visas endast när den anslutna skärmen stöder det.</string>
+    <string name="session_drawer_output_send_to_display">Skicka spelet till skärmen</string>
+    <string name="session_drawer_output_to_display">Mata ut till extern skärm</string>
+    <string name="session_drawer_output_send_note">En skärm är ansluten. Skicka spelet dit — dina kontroller och din meny stannar på den här telefonen. Du kan återföra det hit när som helst.</string>
+    <string name="session_drawer_output_display">Skärm</string>
+    <string name="session_drawer_output_glasses">Glasögon</string>
+    <string name="session_drawer_output_brightness">Ljusstyrka</string>
+    <string name="session_drawer_output_shade">Toning (dämpning)</string>
+    <string name="session_drawer_output_3d">3D (sida vid sida)</string>
+    <string name="glasses_panel_refresh">Uppdateringsfrekvens</string>
+    <string name="glasses_panel_sunblock">Solskydd</string>
+    <string name="session_drawer_output_volume">Volym</string>
+    <string name="session_drawer_output_glasses_note">Skickas direkt till dina Viture-glasögon via USB.</string>
+    <string name="session_drawer_rail_label_keyboard">Tangentbord</string>
+    <string name="session_drawer_rail_label_input_controls">Kontroller</string>
+    <string name="session_drawer_rail_label_relative_mouse">RelMus</string>
+    <string name="session_drawer_rail_label_mouse">Mus</string>
+    <string name="session_drawer_rail_label_fullscreen">Helskärm</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Zoom</string>
+    <string name="session_drawer_rail_label_task_manager">Uppgifter</string>
+    <string name="session_drawer_rail_label_record">Spela in</string>
+    <string name="session_drawer_rail_label_logs">Loggar</string>
+    <string name="session_record_started">Inspelning startad</string>
+    <string name="session_record_saved">Inspelning sparad i WinNative/Recordings</string>
+    <string name="session_record_failed">Kunde inte starta inspelningen</string>
+    <string name="session_record_settings_title">Inspelningsinställningar</string>
+    <string name="session_record_fps">Bildfrekvens</string>
+    <string name="session_record_resolution">Upplösning</string>
+    <string name="session_record_quality">Kvalitet</string>
+    <string name="session_record_include_ui">Spela in gränssnitt</string>
+    <string name="session_record_include_ui_subtitle">Inkludera HUD och skärmkontroller</string>
+    <string name="session_record_now">Spela in nu</string>
+    <string name="session_drawer_logs_clear">Rensa</string>
+    <string name="session_drawer_logs_pause">Pausa</string>
+    <string name="session_drawer_logs_resume">Återuppta</string>
+    <string name="session_drawer_logs_paused_indicator">Pausad</string>
+    <string name="session_drawer_logs_line_count">%1$d rader</string>
+    <string name="session_drawer_logs_share">Dela</string>
+    <string name="session_drawer_logs_share_subject">Sessionsloggar</string>
+    <string name="session_drawer_logs_share_chooser">Dela sessionsloggar</string>
+    <string name="session_drawer_logs_share_failed">Det gick inte att dela loggarna</string>
+    <string name="session_drawer_logs_share_empty">Inga loggrader att dela</string>
+    <string name="session_gyroscope_activator">Aktivator</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">Vill du avsluta den här processen?</string>
+    <string name="session_task_title">Aktivitetshanteraren</string>
+    <string name="session_task_process_name">Processnamn</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">Minne</string>
+    <string name="session_task_end_process">Avsluta process</string>
+    <string name="session_task_set_affinity">Ange tillhörighet</string>
+    <string name="session_task_affinity_title">Processortillhörighet</string>
+    <string name="session_task_affinity_all_cores">Alla kärnor</string>
+    <string name="session_task_new_task">Ny aktivitet</string>
+    <string name="session_task_bring_to_front">Ta fram</string>
+    <string name="session_task_custom_value">Anpassat värde</string>
+    <string name="session_task_processes">Processer</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">Användning per kärna</string>
+    <string name="session_task_core_label">Kärna %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d kärna</item>
+        <item quantity="other">%d kärnor</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Orientering</string>
+    <string name="session_display_horizontal">Horisontell</string>
+    <string name="session_display_vertical">Vertikal</string>
+    <string name="session_display_columns">Kolumner</string>
+    <string name="session_display_frame_rate">Bildfrekvens</string>
+    <string name="session_display_title">Skärm</string>
+    <string name="session_display_fullscreen_stretched">Aktivera helskärm (utsträckt)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Renderare:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB använt / %2$s totalt</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">Vill du ta bort den här handkontrollen?</string>
+    <string name="session_gamepad_external_controllers">Externa handkontroller</string>
+    <string name="session_gamepad_press_any_button">Tryck på valfri knapp på handkontrollen</string>
+    <string name="session_gamepad_bindings">bindningar</string>
+    <string name="session_gamepad_control_bindings">Kontrollbindningar</string>
+    <string name="session_gamepad_game_controller">Handkontroll</string>
+    <string name="session_gamepad_as_button">Är knapp</string>
+    <string name="session_gamepad_as_axis">Är axel</string>
+    <string name="session_gamepad_trigger_type">Typ</string>
+    <string name="session_gamepad_help_trigger_mode">Beror på din &lt;b&gt;fysiska handkontroll&lt;/b&gt;:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;Är axel&lt;/b&gt; — avtryckaren har ett linjärt rörelseomfång&lt;br/&gt;&#x2022; &lt;b&gt;Är knapp&lt;/b&gt; — avtryckaren fungerar som en enkel omkopplare&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Obs: att använda Är knapp med en linjär avtryckare förlorar analoga data.&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">Knapp A</string>
+    <string name="session_gamepad_button_b">Knapp B</string>
+    <string name="session_gamepad_button_x">Knapp X</string>
+    <string name="session_gamepad_button_y">Knapp Y</string>
+    <string name="session_gamepad_button_grip">Greppknapp</string>
+    <string name="session_gamepad_button_trigger">Avtryckarknapp</string>
+    <string name="session_gamepad_thumbstick_left">Styrspak vänster</string>
+    <string name="session_gamepad_thumbstick_right">Styrspak höger</string>
+    <string name="session_gamepad_thumbstick_up">Styrspak upp</string>
+    <string name="session_gamepad_thumbstick_down">Styrspak ner</string>
+    <string name="session_gamepad_configure_analog_sticks">Konfigurera analoga spakar</string>
+    <string name="session_gamepad_left_stick">Vänster spak</string>
+    <string name="session_gamepad_right_stick">Höger spak</string>
+    <string name="session_gamepad_controller_manager">Handkontrollhanterare</string>
+    <string name="session_gamepad_enable_vibration">Aktivera vibration</string>
+    <string name="session_gamepad_player_1">Spelare 1</string>
+    <string name="session_gamepad_player_2">Spelare 2</string>
+    <string name="session_gamepad_player_3">Spelare 3</string>
+    <string name="session_gamepad_player_4">Spelare 4</string>
+    <string name="session_gamepad_not_assigned">Ej tilldelad</string>
+    <string name="session_gamepad_assign">Tilldela</string>
+    <string name="session_gamepad_press_any_button_for_player">Tryck på valfri knapp på handkontrollen för</string>
+    <string name="session_gamepad_vibrate">Vibration</string>
+    <string name="session_gamepad_macros_hint">Växla knappar för att aktivera autoeld.</string>
+    <string name="session_gamepad_macros">Makron</string>
+    <string name="session_gamepad_include_triggers_note">Använd även turbo på L2/R2 som digitala tryckningar</string>
+    <string name="session_gamepad_square_deadzone">Fyrkantig dödzon</string>
+    <string name="session_gamepad_invert_x">Invertera X</string>
+    <string name="session_gamepad_invert_y">Invertera Y</string>
+    <string name="session_gamepad_save_profile">Spara profil</string>
+    <string name="session_gamepad_load_profile">Läs in profil</string>
+    <string name="session_gamepad_button_start">Knapp Start</string>
+    <string name="session_gamepad_button_select">Knapp Select</string>
+    <string name="session_gamepad_button_l1">Knapp L1</string>
+    <string name="session_gamepad_button_r1">Knapp R1</string>
+    <string name="session_gamepad_button_l2">Knapp L2</string>
+    <string name="session_gamepad_button_r2">Knapp R2</string>
+    <string name="session_gamepad_button_l3">Knapp L3</string>
+    <string name="session_gamepad_button_r3">Knapp R3</string>
+    <string name="session_gamepad_dpad_up">Styrkors upp</string>
+    <string name="session_gamepad_dpad_down">Styrkors ner</string>
+    <string name="session_gamepad_dpad_left">Styrkors vänster</string>
+    <string name="session_gamepad_dpad_right">Styrkors höger</string>
+    <string name="session_gamepad_overwrite">Skriv över</string>
+    <string name="session_gamepad_save_as_new">Spara som ny</string>
+    <string name="session_gamepad_overwrite_profile_message">Vill du skriva över den aktuella profilen eller spara som en ny profil?</string>
+    <string name="session_gamepad_enter_profile_name">Ange profilnamn</string>
+    <string name="session_gamepad_mappings_saved">Mappningar sparade!</string>
+    <string name="session_gamepad_profile_saved">Profil sparad!</string>
+    <string name="session_gamepad_profile_saved_as_new">Profil sparad som ny!</string>
+    <string name="session_gamepad_profile_loaded">Profil inläst!</string>
+    <string name="session_gamepad_profile_name_empty">Profilnamnet får inte vara tomt</string>
+    <string name="session_gamepad_no_profiles">-- Inga profiler --</string>
+    <string name="session_gamepad_error_loading_profile">Fel vid inläsning av profil</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Pekskärmskontroller</string>
+    <string name="input_controls_auto_hide_on_controller_title">Dölj automatiskt med handkontroll</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Dölj pekskärmskontroller när en handkontroll är ansluten</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">Gyroskop</string>
+    <string name="session_gyroscope_calibrate">Kalibrera gyroskop</string>
+    <string name="session_gyroscope_enable_right_stick">Aktivera gyroskopisk rörelse för höger spak</string>
+    <string name="session_gyroscope_activator_button">Aktiveringsknapp för gyroskop</string>
+    <string name="session_gyroscope_hold">Håll</string>
+    <string name="session_gyroscope_toggle">Växla</string>
+    <string name="session_gyroscope_orientation_mode">Luta för att sikta (orientering)</string>
+    <string name="session_gyroscope_x_sensitivity">Känslighet för X-axel</string>
+    <string name="session_gyroscope_y_sensitivity">Känslighet för Y-axel</string>
+    <string name="session_gyroscope_smoothing">Utjämning</string>
+    <string name="session_gyroscope_invert_x">Invertera X-axel</string>
+    <string name="session_gyroscope_invert_y">Invertera Y-axel</string>
+    <string name="session_gyroscope_filtering">Filtrering</string>
+    <string name="session_gyroscope_deadzone">Dödzon</string>
+    <string name="session_gyroscope_sensitivity">Känslighet</string>
+    <string name="session_gyroscope_direction">Riktning</string>
+    <string name="session_gyroscope_mode">Aktiveringsläge för gyroskop</string>
+    <string name="session_gyroscope_target_stick">Använd gyro på</string>
+    <string name="session_gyroscope_enable_stick">Aktivera gyroskopisk rörelse för analog spak</string>
+    <string name="session_gyroscope_reset_stick">Återställ spak</string>
+    <string name="session_gyroscope_reset_stick_to_center">Återställ spak till mitten</string>
+    <string name="session_gyroscope_configuration">Gyroskopkonfiguration</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Experimentell musrörelse</string>
+    <string name="session_gyroscope_x_sensitivity_format">X-känslighet: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Y-känslighet: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Utjämning: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Dödzon: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Känslighet: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Musskala</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Musskala: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">Markörhastighet</string>
+    <string name="settings_general_theme">Tema</string>
+    <string name="settings_general_background">Bakgrund</string>
+    <string name="settings_general_background_color_hex">Färg (hex)</string>
+    <string name="settings_general_wallpaper_selected">Bakgrundsbild vald</string>
+    <string name="settings_general_select_wallpaper">Välj bakgrundsbild</string>
+    <string name="settings_general_title">Allmänt</string>
+    <string name="settings_general_enable_file_provider">Aktivera filleverantör</string>
+    <string name="settings_general_enable_auto_scraping">Aktivera automatisk hämtning</string>
+    <string name="settings_general_take_effect_next_startup">Det här alternativet börjar gälla vid nästa start.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Installera om Imagefs</string>
+    <string name="settings_general_confirm_reinstall_imagefs">Vill du installera om imagefs? Den här åtgärden återställer systemfiler, dina behållare ändras inte.</string>
+    <string name="settings_general_refresh_rate">Uppdateringsfrekvens</string>
+    <string name="settings_general_refresh_rate_auto_max">Max</string>
+    <string name="settings_general_refresh_rate_summary">Ställ in skärmens uppdateringsfrekvens och DXVK-bildgräns</string>
+    <string name="settings_general_touchscreen_timeout">Pekskärmens tidsgräns (kräver omstart)</string>
+    <string name="settings_general_touchscreen_haptics">Aktivera haptisk återkoppling för pekskärm</string>
+    <string name="settings_general_open_with_android_browser">Öppna Android-webbläsare i Wine</string>
+    <string name="settings_general_share_android_clipboard">Dela Android-urklipp med Wine</string>
+    <string name="settings_general_paths_title">Sökvägsinställningar</string>
+    <string name="settings_general_paths_summary">Hantera var Winlator lagrar sina arbetsdata och var exporterade genvägar skrivs.</string>
+    <string name="settings_general_winlator_path_title">Lagringssökväg</string>
+    <string name="settings_general_shortcut_export_path_title">Exportsökväg för genvägar</string>
+    <string name="settings_general_choose_path">Välj sökväg</string>
+    <string name="settings_general_xserver_cursor_summary">Justera pekarhastigheten för pek-, styrplatte- och musinmatning i XServer-sessionen.</string>
+    <string name="settings_general_cursor_lock_title">Äkta muskontroll</string>
+    <string name="settings_general_cursor_lock_summary">Håller direkt musinfångning aktiverad för spel som behöver rå pekarinmatning. Inaktivera den med Volym ner.</string>
+    <string name="settings_general_xinput_toggle_title">Inaktivera XInput</string>
+    <string name="settings_general_xinput_toggle_summary">Stänger av XInput-hantering när du vill ha exklusiv mus- och tangentbordskontroll.</string>
+    <string name="settings_external_display_output_summary">Flytta spelet till en ansluten extern skärm i stället för att spegla den här skärmen. Glasögon använder alltid sin egen skärm.</string>
+    <string name="settings_general_file_provider_summary">Exponera WinNative-filer för Androids dokumentväljare och filhanterare.</string>
+    <string name="settings_general_auto_scraping_summary">Den här inställningen låter WinNative automatiskt hämta grafik för anpassade spel.</string>
+    <string name="settings_general_open_browser_summary">Öppna webblänkar som stöds i Android-webbläsaren i stället för i Wine.</string>
+    <string name="settings_general_clipboard_summary">Tillåt kopiera och klistra in mellan Android- och Wine-sessioner.</string>
+    <string name="settings_general_imagefs_summary">Återställ medföljande systemfiler utan att ta bort dina befintliga containrar.</string>
+    <string name="settings_general_check_for_updates">Sök efter uppdateringar</string>
+    <string name="settings_general_check_for_updates_summary">Sök automatiskt efter nya appversioner vid start och regelbundet.</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI-SoundFont</string>
+    <string name="settings_audio_sound">Ljud</string>
+    <string name="settings_audio_confirm_remove_sound_font">Vill du ta bort denna soundfont?</string>
+    <string name="settings_audio_sound_font_removed_success">Soundfont borttagen!</string>
+    <string name="settings_audio_sound_font_removed_failed">Det gick inte att ta bort soundfont!</string>
+    <string name="settings_audio_sound_font_installed_success">Soundfont installerad!</string>
+    <string name="settings_audio_sound_font_installed_failed">Det gick inte att installera soundfont!</string>
+    <string name="settings_audio_sound_font_already_exist">Soundfonten du vill installera finns redan.</string>
+    <string name="settings_audio_unable_to_install_soundfont">Det gick inte att installera soundfont</string>
+    <string name="settings_audio_installing_soundfont">Installerar SoundFont</string>
+    <string name="settings_audio_sound_font_bad_format">Ogiltigt SoundFont-format.</string>
+    <string name="settings_audio_cannot_remove_default">Kan inte ta bort standard-soundfont</string>
+    <string name="settings_audio_summary">Installera, ta bort och välj den SoundFont som används för MIDI-uppspelning.</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Wine-felsökningskanal</string>
+    <string name="settings_debug_title">Felsökning</string>
+    <string name="settings_debug_wine_logs_title">Aktivera Wine-felsökningsloggar</string>
+    <string name="settings_debug_wine_logs_subtitle">Skriv Wine-felsökningsutdata till fil</string>
+    <string name="settings_debug_box_logs_title">Aktivera Box86/64-loggar</string>
+    <string name="settings_debug_box_logs_subtitle">Skriv felsökningsutdata för Box86 &amp; Box64 till fil</string>
+    <string name="settings_debug_fex_logs_title">Aktivera FEXCore-loggar</string>
+    <string name="settings_debug_fex_logs_subtitle">Skriv FEXCore-felsökningsutdata till fil</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX-emuleringsloggar</string>
+    <string name="settings_debug_emulator_logs_subtitle">Loggar den emulator som din container använder, till fil.</string>
+    <string name="settings_debug_steam_logs_title">Aktivera Steam-loggar</string>
+    <string name="settings_debug_steam_logs_subtitle">Logga Steam-autentiserings- och sessionshändelser för felsökning.</string>
+    <string name="settings_debug_wine_channels_title">Wine-felsökningskanaler</string>
+    <string name="settings_debug_wine_channels_summary">Välj vilka Wine-kanaler som inkluderas när Wine-felsökningsloggning är aktiverad.</string>
+    <string name="settings_debug_wine_classes_title">Wine-loggnivåer</string>
+    <string name="settings_debug_wine_classes_summary">Välj vilka meddelandetyper som loggas. Trace är extremt utförlig.</string>
+    <string name="settings_debug_input_logs">Inmatningsloggar</string>
+    <string name="settings_debug_input_logs_description">Logga inmatningshändelser från gamepad, pekskärm och tangentbord</string>
+    <string name="settings_debug_download_logs">Nedladdningsloggar</string>
+    <string name="settings_debug_download_logs_description">Logga händelser för nedladdningsupplösare och WinNative-reserv</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan-valideringslager</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Starta om skärmen för att tillämpa.</string>
+    <string name="settings_debug_share_logs">Dela loggar</string>
+    <string name="settings_debug_delete_logs">Ta bort loggar</string>
+    <string name="settings_debug_share_all_logs_short">Dela alla</string>
+    <string name="settings_debug_download_all_logs_short">Ladda ner alla</string>
+    <string name="settings_debug_logs_saved">Sparad till %1$s</string>
+    <string name="settings_debug_delete_logs_short">Ta bort</string>
+    <string name="settings_debug_delete_all_logs_short">Ta bort alla</string>
+    <string name="settings_debug_open_logs_folder_short">Öppna logghanteraren</string>
+    <string name="settings_debug_logs_deleted">Loggar borttagna</string>
+    <string name="settings_debug_delete_logs_confirm_title">Ta bort loggar?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Detta tar permanent bort alla sparade loggfiler (%1$s). Detta kan inte ångras.</string>
+    <string name="settings_debug_logs_browser_title">Loggar</string>
+    <string name="settings_debug_log_truncated">Visar de senaste %1$s av denna logg</string>
+    <string name="settings_debug_logs_subject">WinNative-loggar (%1$s)</string>
+    <string name="settings_debug_no_logs_available">Inga felsökningsloggar tillgängliga. Aktivera felsökningsalternativ först och starta ett spel.</string>
+    <string name="settings_debug_capture_failed">Det gick inte att fånga loggar: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">Logga WinNative-processfel, varningar och krascher till fil</string>
+    <string name="settings_debug_section_emulation">Emulering</string>
+    <string name="settings_debug_section_subsystems">Delsystem</string>
+    <string name="settings_debug_section_tools">Verktyg</string>
+    <string name="settings_debug_no_channels_selected">Inga kanaler valda</string>
+    <string name="settings_debug_no_channels_available">Inga kanaler tillgängliga</string>
+    <string name="settings_debug_channel_toggle_hint">Tryck för att växla kanaler. Aktiverade kanaler inkluderas i Wine-felsökningsutdata.</string>
+    <string name="settings_debug_remove_channel_desc">Ta bort %1$s</string>
+
+    <string name="settings_other_language_title">Språk</string>
+    <string name="settings_other_language_summary">Välj visningsspråk</string>
+    <string name="settings_other_language_system_default">Systemstandard</string>
+    <string name="settings_other_game_language_title">Spelspråk</string>
+    <string name="settings_other_game_language_summary">Föredraget språk för Steam/Epic/GOG-nedladdningar</string>
+
+    <string name="settings_other_section_integration">Integration</string>
+    <string name="settings_other_setup_wizard_title">Installationsguide</string>
+    <string name="settings_other_setup_wizard_summary">Öppna installationsguiden igen för att granska behörigheter, systemfiler och standardcontainrar.</string>
+    <string name="settings_other_checking_for_updates">Söker efter uppdateringar…</string>
+    <string name="settings_other_update_check_cooldown">Vänta %1$ds innan du söker igen</string>
+    <string name="settings_other_persistable_permission_failed">Det gick inte att ta beständiga behörigheter: %1$s</string>
+    <string name="settings_other_keep_app_open">Håll appen öppen medan detta slutförs.</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">Installera innehåll</string>
+    <string name="settings_content_type">Kategori</string>
+    <string name="settings_content_components">Komponenter</string>
+    <string name="settings_content_auto_create_container">Skapa container automatiskt</string>
+    <string name="settings_content_remove_title">Ta bort komponent?</string>
+    <string name="settings_content_empty_subtitle">Installera ett paket eller byt typ för att komma igång.</string>
+    <string name="settings_content_container_created">Container skapad: %1$s</string>
+    <string name="settings_content_download_failed">Nedladdningen misslyckades.</string>
+    <string name="common_ui_working">Arbetar</string>
+    <string name="settings_content_desc_wine">Skapad av Wine-projektet; översätter Win32-anrop till inbyggda Linux/Android-tjänster.</string>
+    <string name="settings_content_desc_proton">Skapad av Valve; en Wine-baserad körmiljö med spelpatchar för Windows-spel.</string>
+    <string name="settings_content_desc_dxvk">Översätter grafikanrop för Direct3D 9, 10 och 11 till Vulkan.</string>
+    <string name="settings_content_desc_vkd3d">Översätter grafikanrop för Direct3D 12 till Vulkan.</string>
+    <string name="settings_content_desc_box64">Översätter x86_64 Linux-kod så att den kan köras på ARM64-enheter.</string>
+    <string name="settings_content_desc_wowbox64">Box64-bygge som används av WoW64 för att köra 32-bitars Windows-appar i 64-bitars Wine.</string>
+    <string name="settings_content_desc_fexcore">Översätter x86- och x86_64-kod så att den kan köras på ARM64-enheter.</string>
+    <string name="settings_content_desc_d7vk">Översätter grafikanrop för DirectDraw (Direct3D 7 och tidigare) till Vulkan.</string>
+    <string name="settings_content_unable_to_install">Det gick inte att installera innehåll.</string>
+    <string name="settings_content_install_failed">Installationen misslyckades</string>
+    <string name="settings_content_file_cannot_be_recognized">Filen kan inte kännas igen.</string>
+    <string name="settings_content_profile_not_found">Profilen hittades inte i innehållet.</string>
+    <string name="settings_content_profile_cannot_be_recognized">Profilen kan inte kännas igen</string>
+    <string name="settings_content_file_list">Fillista</string>
+    <string name="settings_content_install_directory">Installationskatalog</string>
+    <string name="settings_content_installed_success">Innehåll installerat!</string>
+    <string name="settings_content_downloading_title">Laddar ner innehåll</string>
+    <string name="settings_content_installing_title">Installerar innehåll</string>
+    <string name="settings_content_extracting_title">Extraherar innehåll</string>
+    <string name="settings_content_extracting_detail">Extraherar (%1$d filer)</string>
+    <string name="settings_content_preparing_package">Förbereder paket</string>
+    <string name="settings_content_download_complete">Nedladdning klar</string>
+    <string name="settings_content_already_installed_title">Komponenten är redan installerad</string>
+    <string name="settings_content_already_installed_message">Denna komponent är redan installerad. Ta bort den installerade kopian innan du laddar ner den igen.
+
+Installerad sökväg:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Motstridigt innehåll installerat</string>
+    <string name="settings_content_conflicting_message">Avinstallera det motstridiga innehållet innan du laddar ner detta paket.
+
+Installerad sökväg:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">Innehållet kan inte litas på.</string>
+    <string name="settings_content_is_incomplete">Innehållet är ofullständigt.</string>
+    <string name="settings_content_untrusted_files_warning">Varning: Det ytterligare innehållet innehåller filer som inte är betrodda. Vanligtvis bör följande filer inte ändras. Bestäm om du vill fortsätta med installationen.</string>
+    <string name="settings_content_confirm_remove">Detta tar bort komponenten från din enhet.</string>
+    <string name="settings_content_unable_to_remove_in_use">Det gick inte att ta bort detta innehåll eftersom en container just nu använder detta Wine.</string>
+    <string name="settings_content_download_in_components">Ingen nedladdad. Ladda ner en under Komponenter.</string>
+    <string name="settings_content_types_header">INNEHÅLLSTYPER</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Drivrutiner</string>
+    <string name="settings_drivers_manager_header">Drivrutinshanterare</string>
+    <string name="settings_drivers_github_repos">GitHub-repositorier</string>
+    <string name="settings_drivers_install">Installera drivrutiner</string>
+    <string name="settings_drivers_installed_success">Drivrutin installerad.</string>
+    <string name="settings_drivers_install_failed">Det gick inte att installera drivrutinen.</string>
+    <string name="settings_drivers_remove_title">Ta bort drivrutin?</string>
+    <string name="settings_drivers_confirm_remove">Detta tar bort drivrutinen från din enhet.</string>
+    <string name="settings_drivers_remove_repo_title">Ta bort repositorium?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s tas bort från din repositorielista.</string>
+    <string name="settings_drivers_repo_tap_to_load">Tryck för att läsa in utgåvor</string>
+    <string name="settings_drivers_repo_loading_releases">Läser in utgåvor</string>
+    <string name="settings_drivers_repo_release_count">%1$d utgåvor inlästa</string>
+    <string name="settings_drivers_repo_no_release_assets">Inga nedladdningsbara ZIP-resurser hittades i de hämtade utgåvorna.</string>
+    <string name="settings_drivers_repo_fetch_failed">Det gick inte att läsa in GitHub-utgåvor.</string>
+    <string name="settings_drivers_repo_download_failed">Nedladdningen misslyckades.</string>
+    <string name="settings_drivers_repo_no_version">Version otillgänglig</string>
+    <string name="settings_drivers_repo_unknown_size">Okänd storlek</string>
+    <string name="settings_drivers_manager">Drivrutinshanterare</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">Installerar systemfiler</string>
+    <string name="setup_wizard_unable_to_install_system_files">Det gick inte att installera systemfiler</string>
+    <string name="setup_wizard_system_image_not_installed">Systemavbildning inte installerad. Installera komponenter först.</string>
+    <string name="setup_wizard_recommended_components">Rekommenderade komponenter</string>
+    <string name="setup_wizard_step_format">Steg %1$d av %2$d</string>
+    <string name="setup_wizard_allow_file_access">Tillåt all filåtkomst</string>
+    <string name="setup_wizard_install_system_files">Installera systemfiler</string>
+    <string name="setup_wizard_recommended_components_description">Rekommenderade komponenter laddar ner och installerar de paket som stöds för DXVK, VKD3D, FEX, Box64 och Wowbox64 automatiskt.</string>
+    <string name="setup_wizard_each_button_downloads_description">Varje knapp laddar ner paketet, installerar det och skapar dess standardcontainer automatiskt.</string>
+    <string name="setup_wizard_recommended_x86_64">Rekommenderad x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">Rekommenderad ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">Välj vilka komponenter som ska installeras. Wine/Proton skapar en container automatiskt.</string>
+    <string name="setup_wizard_loading_components">Läser in komponenter…</string>
+    <string name="setup_wizard_no_components_available">Inga komponenter tillgängliga för denna kategori.</string>
+    <string name="setup_wizard_default_settings">Standardinställningar</string>
+    <string name="setup_wizard_containers">Containerinställning</string>
+    <string name="setup_wizard_containers_description">Öppna varje container och ange de standardvärden du vill att varje nytt spel ska ärva. Nya spel riktas mot x86-64-containern som standard.</string>
+    <string name="setup_wizard_store_sign_in_optional">Inloggning i butiker är valfri. Varje inloggning återvänder hit när den är klar.</string>
+    <string name="setup_wizard_granted">Beviljad</string>
+    <string name="setup_wizard_grant">Bevilja</string>
+    <string name="setup_wizard_denied">Nekad</string>
+    <string name="setup_wizard_allow">Tillåt</string>
+    <string name="setup_wizard_installing">Installerar</string>
+    <string name="setup_wizard_install_failed_reason">Installationen misslyckades: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Nödvändig åtkomst</string>
+    <string name="setup_wizard_select_components">Välj komponenter</string>
+    <string name="setup_wizard_recommended_wine_proton">Rekommenderad Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">Avancerad installation</string>
+    <string name="setup_wizard_title">Installationsguide</string>
+    <string name="setup_wizard_advanced_user">Avancerad användare</string>
+    <string name="setup_wizard_next">Nästa</string>
+    <string name="setup_wizard_finish">Slutför</string>
+    <string name="setup_wizard_download_and_install">Ladda ner + installera</string>
+    <string name="setup_wizard_open_drivers">Öppna drivrutiner</string>
+    <string name="setup_wizard_ready">Klar</string>
+    <string name="setup_wizard_download_and_create">Ladda ner + skapa</string>
+    <string name="setup_wizard_configured">Konfigurerad</string>
+    <string name="setup_wizard_downloading">Laddar ner %1$s</string>
+    <string name="setup_wizard_installing_package">Installerar %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">Inga Wine- eller Proton-paket installerade ännu.</string>
+    <string name="setup_wizard_no_runtime_hint">Installera ett Wine- eller Proton-paket från föregående steg, eller hoppa över detta för tillfället.</string>
+    <string name="setup_wizard_recommended_label">Rekommenderad</string>
+    <string name="setup_wizard_install_all_recommended">Installera alla rekommenderade</string>
+    <string name="setup_wizard_create_container">Skapa container</string>
+    <string name="setup_wizard_creating_container">Skapar…</string>
+
+    <string name="input_controls_tap_to_click">Tryck för att klicka</string>
+    <string name="input_controls_reverse_binding_order">Omvänd ordning för bindningar</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Auktorisering</string>
+    <string name="steam_login_sign_in_to_your_account">Logga in på ditt konto</string>
+    <string name="steam_login_username">Användarnamn</string>
+    <string name="steam_login_password">Lösenord</string>
+    <string name="steam_login_invalid_username_or_password">Ogiltigt användarnamn eller lösenord</string>
+    <string name="steam_login_remember_me">Kom ihåg mig</string>
+    <string name="steam_login_sign_in_with_qr_code">Logga in med QR-kod</string>
+    <string name="steam_login_open_steam_app_qr_hint">Öppna Steam-appen → tryck på QR-ikonen</string>
+    <string name="steam_login_failed_to_load_qr_code">Det gick inte att läsa in QR-koden</string>
+    <string name="steam_login_retry">Försök igen</string>
+    <string name="steam_login_generating_code">Genererar kod…</string>
+    <string name="steam_login_two_factor_auth">Tvåfaktorsautentisering</string>
+    <string name="steam_login_approve_login_steam_app">Godkänn denna inloggning från\ndin Steam-mobilapp</string>
+    <string name="steam_login_enter_code_sent_to">Ange koden som skickats till\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">Ange din Steam Guard-kod</string>
+    <string name="steam_login_code">Kod</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Molnsynkronisering</string>
+    <string name="google_cloud_sync_started">Molnsynkronisering startad.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Google-tjänster</string>
+    <string name="google_auto_signin_title">Logga in på Google vid start</string>
+    <string name="google_auto_signin_summary">Anslut automatiskt till Google Play Games när appen startar så att säkerhetskopior och synkronisering alltid är redo. När det är av loggar appen aldrig in på egen hand.</string>
+    <string name="google_auto_signin_section">Vid start</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">Synkroniserar</string>
+    <string name="google_cloud_status_connected">Ansluten</string>
+    <string name="google_cloud_status_not_signed_in">Inte inloggad</string>
+    <string name="google_cloud_working">Arbetar…</string>
+    <string name="google_cloud_sign_in">Logga in</string>
+    <string name="google_cloud_disable_sync">Inaktivera synkronisering</string>
+    <string name="google_cloud_store_logins">Butiksinloggningar</string>
+    <string name="google_cloud_store_login_sync_busy">Arbetar med din synkronisering av butiksinloggningar…</string>
+    <string name="google_cloud_saved_games_unavailable">Google Sparade spel otillgängligt</string>
+    <string name="google_cloud_snapshot_ready">Molnögonblicksbild redo</string>
+    <string name="google_cloud_waiting_first_backup">Väntar på första säkerhetskopian</string>
+    <string name="google_cloud_no_store_logins_detected">Inga butiksinloggningar upptäckta</string>
+    <string name="google_cloud_last_synced">Senast synkroniserad %1$s</string>
+    <string name="google_cloud_backup">Säkerhetskopiera</string>
+    <string name="google_cloud_restore">Återställ</string>
+    <string name="google_cloud_sign_in_to_sync">Logga in på Google Play Games för att synkronisera butiksinloggningar.</string>
+    <string name="google_cloud_sign_in_failed">Inloggning på Google Play Games misslyckades.</string>
+    <string name="google_cloud_sign_in_finishing">Inloggning på Google Play Games slutförs fortfarande. Vänta en stund och försök med molnsynkronisering igen.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games anslutet. Återställning är tillgänglig för %1$s.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games anslutet. Tryck på Säkerhetskopiera för att spara %1$s inloggningar.</string>
+    <string name="google_cloud_connected_ready">Google Play Games anslutet. Säkerhetskopiering och återställning är redo.</string>
+    <string name="google_cloud_sync_disabled">Synkronisering med Google Play Games inaktiverad för denna app.</string>
+    <string name="google_cloud_sign_in_first">Logga in på Google Play Games först.</string>
+    <string name="google_cloud_no_saved_logins_found">Inga sparade butiksinloggningar hittades i Google molnsynkronisering.</string>
+    <string name="google_cloud_backup_already_matches">Molnsäkerhetskopian matchar redan de aktuella butiksinloggningarna.</string>
+    <string name="google_cloud_no_local_logins">Inga lokala butiksinloggningar är tillgängliga att säkerhetskopiera.</string>
+    <string name="google_cloud_logins_restored_and_synced">Butiksinloggningar återställda och synkroniserade för %1$s.</string>
+    <string name="google_cloud_logins_restored">Återställde butiksinloggningar för %1$s.</string>
+    <string name="google_cloud_logins_backed_up">Säkerhetskopierade butiksinloggningar för %1$s.</string>
+    <string name="google_cloud_sync_ready">Synkronisering av butiksinloggningar är redo.</string>
+    <string name="google_cloud_no_logins_to_sync">Inga butiksinloggningar tillgängliga att synkronisera ännu.</string>
+    <string name="google_cloud_sign_in_to_backup">Logga in för att säkerhetskopiera inloggningstoken för %1$s.</string>
+    <string name="google_cloud_no_backed_up_logins">Inga säkerhetskopierade butiksinloggningar hittades ännu.</string>
+    <string name="google_cloud_local_cloud_differ">Lokala och molnbaserade butiksinloggningar skiljer sig åt. Använd Säkerhetskopiera för att skriva över molndata eller Återställ för att hämta de sparade token.</string>
+    <string name="google_cloud_local_ready_to_backup">Lokala butiksinloggningar är redo att säkerhetskopieras för %1$s.</string>
+    <string name="google_cloud_backup_ready">Säkerhetskopian av butiksinloggningen är klar.</string>
+    <string name="google_cloud_restore_available">Molnåterställning av inloggning är tillgänglig för %1$s.</string>
+    <string name="google_cloud_logins_synced">Butiksinloggningar är synkroniserade med Google Play Games.</string>
+    <string name="google_cloud_sync_problem">Ett problem uppstod vid synkronisering av butiksinloggning.</string>
+    <string name="google_cloud_error_auth_needed">Google Play Games måste slutföra autentiseringen innan molnsynkroniseringen kan komma åt Sparade spel. Öppna Play Games-profilprompten om den visas och försök igen.</string>
+    <string name="google_cloud_error_developer">Google Play Games Sparade spel avvisade den här versionen. Kontrollera Play Games app-ID, länkat paketnamn och signeringscertifikat i Play Console.</string>
+    <string name="google_cloud_error_build_rejected">Google-kontot är anslutet, men Google Play Games Sparade spel avvisade den här versionen. Kontrollera Play Games app-ID, länkat paket och signeringscertifikat.</string>
+    <string name="google_cloud_error_network">Google-molnsynkroniseringen misslyckades eftersom nätverksbegäran inte slutfördes eller Google Play-tjänster behöver åtgärdas.</string>
+    <string name="google_cloud_error_no_snapshot">Inga sparade butiksinloggningar hittades ännu i Google-molnsynkroniseringen.</string>
+    <string name="google_cloud_error_generic">Google-molnsynkroniseringen misslyckades: %1$s</string>
+    <string name="google_cloud_error_before_open">Google-molnsynkroniseringen misslyckades innan Google Sparade spel kunde öppnas.</string>
+    <string name="cloud_saves_title">Molnsparningar</string>
+    <string name="cloud_saves_title_for_provider">%1$s Molnsparningar - %2$s</string>
+    <string name="cloud_saves_sync_summary">Hämta den version %1$s har just nu.</string>
+    <string name="cloud_saves_sync_summary_generic">Hämta den aktuella molnversionen.</string>
+    <string name="cloud_saves_no_backups">Inga säkerhetskopior ännu för det här spelet.</string>
+    <string name="cloud_sync_title">Molnsparningar</string>
+    <string name="cloud_sync_disable_title">Inaktivera molnsparningar</string>
+    <string name="cloud_saves_steam_push_label">Skicka till Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Tvinga uppladdning av lokal sparning</string>
+    <string name="cloud_saves_steam_push_success">Sparningen skickades till Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Det gick inte att skicka sparningen till Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud är inte tillgänglig just nu. Återansluter i bakgrunden – tryck på uppdatera när du är online igen.</string>
+    <string name="steam_session_refused_event">Steam avvisade den cachade sessionen (EResult=%1$d). Logga in igen.</string>
+    <string name="cloud_sync_enabled_summary">Ladda ner vid start, skicka vid avslut.</string>
+    <string name="cloud_sync_disabled_summary">Starta utan nedladdning av molnsparning eller synkronisering vid avslut.</string>
+    <string name="cloud_saves_offline_mode">Inaktivera molnsynkronisering</string>
+    <string name="cloud_saves_offline_mode_summary">Stoppar all automatisk molnaktivitet för det här spelet.</string>
+    <string name="cloud_saves_backing_up">Säkerhetskopierar molnsparning…</string>
+    <string name="cloud_saves_restoring">Återställer molnsparning…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">Synkronisera från %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_generic">Synkronisera från molnet</string>
+    <string name="cloud_saves_syncing_from_provider">Laddar ner sparning från %1$s…</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s molnsparning nedladdad.</string>
+    <string name="cloud_saves_sync_from_provider_failed">Det gick inte att ladda ner sparning från %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Hantera GOG-molnsparningar</string>
+    <string name="cloud_saves_gog_manage_helper">Öppnar den officiella GOG-webbplatsen</string>
+    <string name="cloud_saves_gog_manage_no_browser">Ingen webbläsare tillgänglig för att öppna sidan med GOG-molnsparningar</string>
+    <string name="cloud_saves_gog_zip_label">Ladda ner GOG-moln-zip</string>
+    <string name="cloud_saves_gog_zip_helper">Spara aktuella molnfiler</string>
+    <string name="cloud_saves_gog_zip_success">Zip med GOG-molnsparningar sparad.</string>
+    <string name="cloud_saves_gog_zip_failed">Det gick inte att spara zip med GOG-molnsparningar.</string>
+    <string name="cloud_saves_gog_zip_empty">Inga GOG-molnsparningsfiler hittades.</string>
+    <string name="cloud_saves_google_backup_label">Säkerhetskopiera till Google</string>
+    <string name="cloud_saves_google_backup_helper">Spara en kopia till Google Play Games</string>
+    <string name="cloud_saves_google_backup_no_save">Inga sparningsfiler hittades att säkerhetskopiera.</string>
+    <string name="cloud_saves_history_title">Sparningshistorik</string>
+    <string name="cloud_saves_history_empty">Inga tidigare sparningar har säkerhetskopierats ännu. Ersatta sparningar och manuella säkerhetskopior visas här i 30 dagar.</string>
+    <string name="cloud_saves_history_loading">Laddar sparningshistorik…</string>
+    <string name="cloud_saves_history_sign_in">Logga in på Google för att se din sparningshistorik.</string>
+    <string name="cloud_saves_history_origin_local">lokal</string>
+    <string name="cloud_saves_history_origin_cloud">moln</string>
+    <string name="cloud_saves_history_origin_manual">manuell</string>
+    <string name="cloud_saves_history_origin_auto">automatisk</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Återställ</string>
+    <string name="cloud_saves_history_download">Ladda ner</string>
+    <string name="cloud_saves_history_download_success">Filen nedladdad.</string>
+    <string name="cloud_saves_history_download_failed">Nedladdningen misslyckades.</string>
+    <string name="cloud_saves_history_cloud_readonly">Skrivskyddad</string>
+    <string name="cloud_saves_history_restore_confirm_title">Återställa den här säkerhetskopian?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Detta ersätter din nuvarande lokala sparning med säkerhetskopian från %1$s.</string>
+    <string name="cloud_saves_history_restore_success">Sparningen återställdes från säkerhetskopia.</string>
+    <string name="cloud_saves_history_restore_failed">Det gick inte att återställa den här säkerhetskopian.</string>
+    <string name="cloud_saves_keep_replaced_backup">Behåll en säkerhetskopia av den ersatta sparningen</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Om du ändrar dig kan du återställa den från Sparningshistorik.</string>
+    <string name="cloud_saves_history_refresh">Uppdatera</string>
+    <string name="cloud_saves_history_rename">Byt namn</string>
+    <string name="cloud_saves_history_rename_title">Namnge den här säkerhetskopian</string>
+    <string name="cloud_saves_history_rename_hint">t.ex. Bossstrid, Före slutet</string>
+    <string name="cloud_saves_history_rename_save">Spara</string>
+    <string name="cloud_saves_history_rename_clear">Rensa</string>
+    <string name="cloud_saves_history_rename_success">Säkerhetskopian bytte namn.</string>
+    <string name="cloud_saves_history_rename_failed">Det gick inte att byta namn på säkerhetskopian.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Välj sparningsmapp</string>
+    <string name="cloud_saves_custom_folder_label">Sparningsmapp</string>
+    <string name="cloud_saves_custom_select_folder_summary">Peka på sparningskatalogen i containern</string>
+    <string name="cloud_saves_custom_no_container">Container inte tillgänglig för den här genvägen</string>
+    <string name="cloud_saves_custom_picker_title">Välj sparningsmapp</string>
+    <string name="cloud_saves_custom_outside_drive_c">Den valda mappen måste ligga på containerns C:-enhet</string>
+    <string name="cloud_saves_custom_path_map_failed">Det gick inte att mappa den valda mappen till en Windows-sökväg.</string>
+    <string name="cloud_saves_custom_folder_set">Sparningsmapp inställd på %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Synkronisera från Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Ladda ner senaste sparning</string>
+    <string name="cloud_saves_steam_sync_success">Synkroniserat från Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Synkronisering med Steam Cloud misslyckades</string>
+    <string name="cloud_saves_steam_browse_label">Visa Steam Cloud-sparningar</string>
+    <string name="cloud_saves_steam_browse_helper">Öppna molnlagring</string>
+    <string name="cloud_saves_steam_browse_no_browser">Ingen webbläsare tillgänglig för att öppna Steam-sidan</string>
+    <string name="cloud_saves_steam_import_label">Importera filer</string>
+    <string name="cloud_saves_steam_import_helper">Återställ nedladdade filer</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Filväljare inte tillgänglig</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Detta laddar ner Steam Clouds aktuella sparningsfiler och skriver över de nuvarande sparningsfilerna.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Ogiltigt app-ID</string>
+    <string name="cloud_saves_label_saved">Etikett sparad</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Sparningar</string>
+    <string name="saves_import_export_confirm_selection">Bekräfta val</string>
+    <string name="saves_import_export_select_directory">Välj din sparningskatalog</string>
+    <string name="saves_import_export_up_directory">Upp en katalog</string>
+    <string name="saves_import_export_select_container">Målcontainer:</string>
+    <string name="saves_import_export_exported">Sparningar exporterades</string>
+    <string name="saves_import_export_exported_failed">Det gick inte att exportera sparningar: %1$s</string>
+    <string name="saves_import_export_imported">Sparningar importerades</string>
+    <string name="saves_import_export_imported_failed">Det gick inte att importera sparningar: %1$s</string>
+    <string name="saves_export_path_summary">Sparningar exporteras till /WinNative/saves</string>
+    <string name="saves_export_success_path">Exporterat till %1$s</string>
+    <string name="saves_export_warning_title">Använd endast detta med anpassade spel</string>
+    <string name="saves_export_warning_body">Exporten kan innehålla sparningar från butiksinstallerade eller molnsynkroniserade spel.</string>
+    <string name="saves_import_warning_title">Detta skriver över befintliga sparningar i den här containern</string>
+    <string name="saves_import_warning_body">När du återställer en äldre säkerhetskopia med flera spel, kopiera först in eventuella nyare sparningar i zip-filen med din filhanterare. Endast sparningar som finns i .zip-filen påverkas. Hantera sparningar klokt.</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Container</string>
+    <string name="preloader_initializing">Initierar</string>
+    <string name="preloader_launching">Startar</string>
+    <string name="preloader_closing">Stänger %1$s</string>
+    <string name="preloader_preparing_steam_environment">Förbereder Steam-miljö</string>
+    <string name="preloader_starting_wine">Startar Wine</string>
+    <string name="preloader_starting_steam_launcher">Startar Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Laddar Steam-klient</string>
+    <string name="preloader_connecting_to_steam">Ansluter till Steam</string>
+    <string name="preloader_signing_in_to_steam">Loggar in på Steam</string>
+    <string name="preloader_fetching_game_info">Inloggad – hämtar spelinformation</string>
+    <string name="preloader_steam_ready">Steam redo</string>
+    <string name="preloader_updating_game_info">Uppdaterar spelinformation</string>
+    <string name="preloader_verifying_install">Verifierar installation</string>
+    <string name="preloader_scanning_redists">Söker efter distributionspaket</string>
+    <string name="preloader_installing_redist_single">Installerar distributionspaket</string>
+    <string name="preloader_installing_named_redist">Installerar %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Installerar %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Distributionspaket redo</string>
+    <string name="preloader_no_redists">Inga distributionspaket att installera</string>
+    <string name="preloader_steam_service_running">Steam-tjänsten körs</string>
+    <string name="preloader_launching_game">Startar %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher misslyckades – förbereder resurser på nytt</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher kunde inte starta. Förbereder på nytt – starta om</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher nådde spelet men det startade aldrig</string>
+    <string name="preloader_setup_environment">Konfigurerar miljö</string>
+    <string name="preloader_retrying_steam_client_download">Försöker ladda ner Steam-klienten igen</string>
+    <string name="preloader_installing_mono">Installerar Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Installerar distributionspaket</string>
+    <string name="preloader_unpacking_exe">Packar upp spelets körbara fil</string>
+    <string name="preloader_downloading_cloud">Laddar ner molnsparningar</string>
+    <string name="preloader_syncing_cloud">Synkroniserar molnsparningar</string>
+    <string name="preloader_uploading_cloud">Laddar upp molnsparningar</string>
+    <string name="preloader_checking_cloud">Kontrollerar molnsparningar</string>
+    <string name="preloader_cloud_sync_retry">%1$s Försök %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Molnsynkronisering laddar ner</string>
+    <string name="cloud_sync_failed_provider">%1$s molnsparningssynkronisering misslyckades.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Anpassat spel</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Spela in prestanda till fil</string>
+    <string name="settings_hud_record_to_file_summary">Exporterar mätvärden per sekund för FPS, CPU, GPU, temperatur och batteri till /WinNative/logs/ under spelandet.</string>
+    <string name="settings_leaderboard_category">Prestanda</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Laddar Workshop-objekt</string>
+    <string name="workshop_search_items">Sök efter Workshop-objekt</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Hämtar dina prenumererade objekt från Steam.</string>
+    <string name="workshop_error_title">Det gick inte att ladda Workshop-objekt</string>
+    <string name="workshop_error_subtitle">Något gick fel. Försök igen.</string>
+    <string name="workshop_empty_title">Inga prenumererade Workshop-objekt</string>
+    <string name="workshop_empty_subtitle">Prenumerera på objekt i Steam Workshop och öppna sedan det här fönstret igen.</string>
+    <string name="workshop_search_empty_title">Inga objekt matchar \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Prova en annan sökterm.</string>
+    <string name="workshop_clear_search">Rensa sökning</string>
+    <string name="workshop_item_fallback">Workshop-objekt</string>
+    <string name="common_ui_failed">Misslyckades</string>
+    <string name="steam_presence_snooze">Snooza</string>
+    <string name="steam_presence_busy">Upptagen</string>
+    <string name="steam_presence_looking_to_trade">Vill byta</string>
+    <string name="steam_presence_looking_to_play">Vill spela</string>
+    <string name="steam_friends_count">Vänner — %1$d online</string>
+    <string name="steam_friends_section_in_game">I spel (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">Inga vänner har laddats ännu.</string>
+    <string name="steam_friends_chat_off">Chatten är avstängd. Slå på chattjänsten igen för att se dina vänner.</string>
+    <string name="steam_friends_self_you">Du</string>
+    <string name="steam_friends_in_game">I spel</string>
+    <string name="steam_friends_join">Anslut</string>
+    <string name="steam_friends_play">Spela</string>
+    <string name="steam_chat_image_failed">(det gick inte att skicka bilden)</string>
+    <string name="steam_chat_empty">Inga meddelanden ännu. Säg hej!</string>
+    <string name="steam_chat_uploading_image">Laddar upp bild…</string>
+    <string name="steam_chat_send_image">Skicka bild</string>
+    <string name="steam_chat_message_hint">Meddelande…</string>
+    <string name="steam_chat_send">Skicka</string>
+    <string name="steam_chat_image">Bild</string>
+    <string name="steam_common_back">Tillbaka</string>
+    <string name="steam_achievements_title">Prestationer</string>
+    <string name="steam_achievements_empty">Inga prestationer hittades för det här spelet,\neller logga in på Steam för att ladda dem.</string>
+    <string name="steam_achievements_hidden">Dold prestation</string>
+    <string name="steam_achievements_hidden_desc">Fortsätt spela för att avslöja den här prestationen.</string>
+    <string name="steam_achievements_unlocked_on">Upplåst %1$s</string>
+    <string name="steam_achievements_unlocked">Upplåst</string>
+    <string name="steam_join_joining">Ansluter till %1$s i %2$s…</string>
+    <string name="steam_join_install">Installera %1$s för att ansluta till %2$s</string>
+    <string name="steam_join_not_owned">Du äger inte %1$s</string>
+    <string name="steam_chat_not_sent">(inte skickat)</string>
+    <string name="steam_join_the_game">spelet</string>
+    <string name="steam_friends_settings">Inställningar</string>
+    <string name="steam_chat_settings_title">Chattinställningar</string>
+    <string name="steam_chat_setting_service">Chattjänst</string>
+    <string name="steam_chat_setting_service_desc">Logga in för att se vänner och chatta; stäng av för att visas offline</string>
+    <string name="steam_chat_setting_notifications">Chattaviseringar</string>
+    <string name="steam_chat_setting_notifications_desc">Visa en avisering när du får ett meddelande</string>
+    <string name="steam_chat_setting_heads">Chatthuvuden</string>
+    <string name="steam_chat_setting_heads_desc">Flytande bubblor för att läsa och svara på meddelanden</string>
+    <string name="steam_chat_setting_ingame">Aktivera chatt i spel</string>
+    <string name="steam_chat_setting_ingame_desc">Ta emot och skicka meddelanden medan du spelar</string>
+    <string name="steam_chat_setting_stay_running">Kör i bakgrunden</string>
+    <string name="steam_chat_setting_stay_running_desc">Håll chatten igång efter att du avslutat WinNative</string>
+    <string name="steam_chat_settings_overlay_needed">Tillåt visning över andra appar för att använda chatthuvuden</string>
+    <string name="steam_chat_heads_title">Meddelanden</string>
+    <string name="steam_chat_heads_recent_title">Senaste</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">Nytt meddelande</string>
+    <string name="steam_chat_setting_autohide">Dölj automatiskt</string>
+    <string name="steam_chat_setting_autohide_desc">Tona bort chatthuvudet efter 10 s inaktivitet</string>
+    <string name="steam_chat_heads_friends_title">Vänner</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Filer</string>
+    <string name="file_manager_copy">Kopiera</string>
+    <string name="file_manager_cut">Klipp ut</string>
+    <string name="file_manager_paste">Klistra in</string>
+    <string name="file_manager_paste_here">Klistra in här</string>
+    <string name="file_manager_new_folder">Ny mapp</string>
+    <string name="file_manager_new_folder_short">Mapp</string>
+    <string name="file_manager_multi_select">Välj</string>
+    <string name="file_manager_create">Skapa</string>
+    <string name="file_manager_delete">Ta bort</string>
+    <string name="file_manager_copy_count">Kopiera (%1$d)</string>
+    <string name="file_manager_cut_count">Klipp ut (%1$d)</string>
+    <string name="file_manager_delete_count">Ta bort (%1$d)</string>
+    <string name="file_manager_extract">Packa upp</string>
+    <string name="file_manager_extract_here">Packa upp här</string>
+    <string name="file_manager_extract_to">Packa upp till…</string>
+    <string name="file_manager_extracting">Packar upp %1$s</string>
+    <string name="file_manager_extract_failed">Uppackningen misslyckades</string>
+    <string name="file_manager_run_boot">Kör / Starta</string>
+    <string name="file_manager_create_shortcut">Skapa genväg</string>
+    <string name="file_manager_run_in_container">Kör i container</string>
+    <string name="file_manager_no_containers">Inga containrar tillgängliga</string>
+    <string name="file_manager_delete_confirm">Ta bort \"%1$s\"? Detta kan inte ångras.</string>
+    <string name="file_manager_delete_confirm_multi">Ta bort %1$d objekt? Detta kan inte ångras.</string>
+    <string name="file_manager_copying">Kopierar %1$s</string>
+    <string name="file_manager_moving">Flyttar %1$s</string>
+    <string name="file_manager_copying_count">Kopierar %1$d objekt</string>
+    <string name="file_manager_moving_count">Flyttar %1$d objekt</string>
+    <string name="file_manager_paste_into_itself">Det går inte att klistra in en mapp i sig själv</string>
+    <string name="file_manager_operation_failed">Åtgärden misslyckades</string>
+    <string name="file_manager_delete_failed">Borttagning misslyckades</string>
+    <string name="file_manager_rename_failed">Namnbyte misslyckades</string>
+    <string name="file_manager_create_folder_failed">Det gick inte att skapa mappen</string>
+
+    <string name="settings_content_refresh">Uppdatera</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Överför sparfil</string>
+    <string name="retro_save_transfer_message">Importera en lokal sparfil till det här spelet eller exportera spelets nuvarande sparfil.</string>
+    <string name="retro_save_transfer_import">Importera sparfil</string>
+    <string name="retro_save_transfer_export">Exportera sparfil</string>
+    <string name="retro_save_transfer_import_ok">Sparfil importerad</string>
+    <string name="retro_save_transfer_import_failed">Det gick inte att importera sparfilen</string>
+    <string name="retro_save_transfer_export_ok">Sparfil exporterad</string>
+    <string name="retro_save_transfer_export_failed">Det gick inte att exportera sparfilen</string>
+    <string name="retro_save_transfer_none">Det finns ännu ingen sparfil för det här spelet</string>
+    <string name="retro_cheats_title">Fusk</string>
+    <string name="retro_cheats_hardcore_blocked">Fusk är inaktiverat i Hardcore-läge</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Spara</string>
+    <string name="retro_ps2_cancel">Avbryt</string>
+    <string name="retro_ps2_save_state">Spara tillstånd</string>
+    <string name="retro_ps2_load_save_state">Läs in sparat tillstånd</string>
+    <string name="retro_ps2_achievements">Prestationer</string>
+    <string name="retro_ps2_cheats">Fusk</string>
+    <string name="retro_ps2_memory_cards">Memory Cards</string>
+    <string name="retro_ps2_fast_forward">Snabbspola</string>
+    <string name="retro_ps2_reset">Återställ</string>
+    <string name="retro_ps2_swap_disc">Byt skiva</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Tryck för att läsa in</string>
+    <string name="retro_ps2_slot_empty">Tom</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Tryck för att skriva över</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Tom – tryck för att spara</string>
+    <string name="retro_ps2_slot_is_empty">Slot %1$d är tom</string>
+    <string name="retro_ps2_loaded_slot">Läste in slot %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Kunde inte läsa in slot %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Sparat i slot %1$d</string>
+    <string name="retro_ps2_save_failed">Sparandet misslyckades</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Tryck för att använda</string>
+    <string name="retro_ps2_new_memory_card">Nytt Memory Card</string>
+    <string name="retro_ps2_import_card">Importera kort</string>
+    <string name="retro_ps2_enable_online_dev9">Aktivera online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2-nätverksadapter – startar om spelet för att ansluta den</string>
+    <string name="retro_ps2_ethernet_device">Ethernet-enhet</string>
+    <string name="retro_ps2_dns_mode">DNS-läge</string>
+    <string name="retro_ps2_primary_dns">Primär DNS</string>
+    <string name="retro_ps2_secondary_dns">Sekundär DNS</string>
+    <string name="retro_ps2_optional">valfritt</string>
+    <string name="retro_ps2_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">tryck för att ange IP (tom tar bort)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Lägg till servervärd</string>
+    <string name="retro_ps2_new_server_hostname">Nytt servervärdnamn</string>
+    <string name="retro_ps2_server_hostname_hint">t.ex. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Skärmkontroller</string>
+    <string name="retro_ps2_edit_layout">Redigera layout</string>
+    <string name="retro_ps2_reset_layout">Återställ layout</string>
+    <string name="retro_ps2_layout_reset">Layout återställd</string>
+    <string name="retro_ps2_left_stick_invert_x">Vänster spak: Invertera X</string>
+    <string name="retro_ps2_left_stick_invert_y">Vänster spak: Invertera Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Höger spak: Invertera X</string>
+    <string name="retro_ps2_right_stick_invert_y">Höger spak: Invertera Y</string>
+    <string name="retro_ps2_button_color">Knappfärg</string>
+    <string name="retro_ps2_letter_color">Bokstavsfärg</string>
+    <string name="retro_ps2_shadow_color">Skuggfärg</string>
+    <string name="retro_ps2_background_color">Bakgrundsfärg</string>
+    <string name="retro_ps2_reset_colors">Återställ färger</string>
+    <string name="retro_ps2_renderer">Renderare</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Upplösningsskala</string>
+    <string name="retro_ps2_scale_1x_native">1x (Native)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Bildförhållande</string>
+    <string name="retro_ps2_aspect_stretch">Sträck ut</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Skärmfilter</string>
+    <string name="retro_ps2_filter_nearest">Närmaste</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinjär (Mjuk)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinjär (Skarp)</string>
+    <string name="retro_ps2_texture_filter">Texturfilter</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinjär (Tvingad)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinjär (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinjär (Sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Blandningsnoggrannhet</string>
+    <string name="retro_ps2_blend_minimum">Minimum</string>
+    <string name="retro_ps2_blend_basic">Grundläggande</string>
+    <string name="retro_ps2_blend_medium">Medel</string>
+    <string name="retro_ps2_blend_high">Hög</string>
+    <string name="retro_ps2_blend_full">Full</string>
+    <string name="retro_ps2_blend_maximum">Maximum</string>
+    <string name="retro_ps2_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_ps2_shader_off">Av</string>
+    <string name="retro_ps2_shader_scanline">Scanline</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Wave</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Frame Skip</string>
+    <string name="retro_ps2_frameskip_off">Av</string>
+    <string name="retro_ps2_frameskip_1">Hoppa över 1</string>
+    <string name="retro_ps2_frameskip_2">Hoppa över 2</string>
+    <string name="retro_ps2_frameskip_3">Hoppa över 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volym</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Tyst</string>
+    <string name="retro_ps2_swap_stereo_channels">Byt stereokanaler</string>
+    <string name="retro_ps2_ee_cycle_rate">EE-cykelfrekvens</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (Standard)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE-cykelhopp</string>
+    <string name="retro_ps2_skip_off">Av</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Snabb CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emuleringshastighet</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU-användning</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU-användning</string>
+    <string name="retro_ps2_hud_internal_resolution">Intern upplösning</string>
+    <string name="retro_ps2_deinterlace_mode">Deinterlace-läge</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Av</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV-bildförhållande</string>
+    <string name="retro_ps2_anti_blur">Anti-oskärpa</string>
+    <string name="retro_ps2_widescreen_patches">Widescreen-patchar</string>
+    <string name="retro_ps2_no_interlace_patches">No-interlace-patchar</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC-spinndetektering</string>
+    <string name="retro_ps2_wait_loop">Vänteloopsdetektering</string>
+    <string name="retro_ps2_time_stretch">Ljud-timestretch</string>
+    <string name="retro_ps2_audio_buffer">Ljudbuffert</string>
+    <string name="retro_ps2_audio_latency">Utgångslatens</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Bildrutetider</string>
+    <string name="retro_ps2_hud_gs_stats">GS-statistik</string>
+    <string name="retro_ps2_hud_hw_info">Hårdvaruinfo</string>
+    <string name="retro_ps2_hud_version">Version</string>
+    <string name="retro_ps2_hud_input_display">Inmatningsvisning</string>
+    <string name="retro_ps2_tab_menu">Meny</string>
+    <string name="retro_ps2_tab_display">Skärm</string>
+    <string name="retro_ps2_tab_performance">Prestanda</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Ljud</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Kontroller</string>
+    <string name="retro_ps2_resume">Fortsätt</string>
+    <string name="retro_ps2_pause">Pausa</string>
+    <string name="retro_ps2_exit">Avsluta</string>
+    <string name="retro_lr_bios_imported">BIOS importerat: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Ogiltig BIOS-fil</string>
+    <string name="retro_lr_invalid_retro_game">Ogiltigt retrospel</string>
+    <string name="retro_lr_rom_not_found">ROM hittades inte: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Kunde inte läsa ROM:en i detta arkiv</string>
+    <string name="retro_lr_core_not_installed">Kärna ej installerad: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Fusk aktiverat – prestationer är inaktiverade för denna session</string>
+    <string name="retro_lr_cloud_save_restored">Molnsparning återställd</string>
+    <string name="retro_lr_restore_failed">Återställning misslyckades</string>
+    <string name="retro_lr_cloud_conflict_message">En nyare molnsparning finns för %1$s. Vill du synkronisera, och vilken molnsparning föredrar du att behålla?</string>
+    <string name="retro_lr_cloud_save">Molnsparning</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Det gick inte att läsa in emulatorkärnan</string>
+    <string name="retro_lr_failed_load_rom">Det gick inte att läsa in ROM</string>
+    <string name="retro_lr_graphics_not_supported">Grafik stöds inte för denna kärna</string>
+    <string name="retro_lr_emulator_error">Emulatorfel</string>
+    <string name="retro_lr_shader_default">Standard</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Skarp</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR-uppskalning</string>
+    <string name="retro_lr_upscale_native">Native</string>
+    <string name="retro_lr_sound">Ljud</string>
+    <string name="retro_lr_left_stick_invert_x">Vänster spak: Invertera X</string>
+    <string name="retro_lr_left_stick_invert_y">Vänster spak: Invertera Y</string>
+    <string name="retro_lr_right_stick_invert_x">Höger spak: Invertera X</string>
+    <string name="retro_lr_right_stick_invert_y">Höger spak: Invertera Y</string>
+    <string name="retro_lr_on_screen_controls">Skärmkontroller</string>
+    <string name="retro_lr_haptic_feedback">Haptisk återkoppling</string>
+    <string name="retro_lr_portrait">Stående</string>
+    <string name="retro_lr_landscape">Liggande</string>
+    <string name="retro_lr_edit_layout">Redigera layout (%1$s)</string>
+    <string name="retro_lr_reset_layout">Återställ %1$s-layout</string>
+    <string name="retro_lr_layout_reset">%1$s-layout återställd</string>
+    <string name="retro_lr_button_color">Knappfärg</string>
+    <string name="retro_lr_letter_color">Bokstavsfärg</string>
+    <string name="retro_lr_shadow_color">Skuggfärg</string>
+    <string name="retro_lr_background_color">Bakgrundsfärg</string>
+    <string name="retro_lr_reset_colors">Återställ färger</string>
+    <string name="retro_lr_colors_reset">Färger återställda</string>
+    <string name="retro_lr_performance_hud">Prestanda-HUD</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Bakgrundsalfa</string>
+    <string name="retro_lr_background">Bakgrund</string>
+    <string name="retro_lr_scale">Skala</string>
+    <string name="retro_lr_numeric_frametime">Numerisk bildtid</string>
+    <string name="retro_lr_dual_series_battery">Dubbelserie-batteri</string>
+    <string name="retro_lr_hud_elements">HUD-ELEMENT</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsol</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Batteri</string>
+    <string name="retro_lr_hud_temp">Temp.</string>
+    <string name="retro_lr_hud_graph">Graf</string>
+    <string name="retro_lr_hud_cpu_temp">CPU-temp.</string>
+    <string name="retro_lr_save_state">Spara tillstånd</string>
+    <string name="retro_lr_load_save_state">Läs in sparat tillstånd</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Inläsning av tillstånd är inaktiverad i Hardcore-läge</string>
+    <string name="retro_lr_achievements">Prestationer</string>
+    <string name="retro_lr_cheats">Fusk</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Fusk är inaktiverat i Hardcore-läge</string>
+    <string name="retro_lr_reset">Återställ</string>
+    <string name="retro_lr_fast_forward">Snabbspola</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Snabbspolning är inaktiverad i Hardcore-läge</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Skiva %1$d/%2$d</string>
+    <string name="retro_lr_resume">Fortsätt</string>
+    <string name="retro_lr_pause">Pausa</string>
+    <string name="retro_lr_exit">Avsluta</string>
+    <string name="retro_lr_saved_to_slot">Sparat i slot %1$d</string>
+    <string name="retro_lr_could_not_save_state">Kunde inte spara tillstånd</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS krävs</string>
+    <string name="retro_lr_bios_required_message">PlayStation-spel kräver en riktig konsol-BIOS-fil som du måste tillhandahålla själv. Importera en BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin eller scph7001.bin) för att fortsätta.</string>
+    <string name="retro_lr_import_bios">Importera BIOS…</string>
+    <string name="retro_lr_cancel">Avbryt</string>
+    <string name="retro_lr_slot_empty">Slot %1$d är tom</string>
+    <string name="retro_lr_loaded_slot">Läste in slot %1$d</string>
+    <string name="retro_lr_could_not_load_state">Kunde inte läsa in tillstånd</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Byt namn på slot %1$d</string>
+    <string name="retro_gs_section_general">Allmänt</string>
+    <string name="retro_gs_section_graphics">Grafik</string>
+    <string name="retro_gs_section_performance">Prestanda</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Inmatning</string>
+    <string name="retro_gs_section_audio">Ljud</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Avbryt</string>
+    <string name="retro_gs_save">Spara</string>
+    <string name="retro_gs_shader_default">Standard</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Skarp</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Native</string>
+    <string name="retro_gs_group_game">SPEL</string>
+    <string name="retro_gs_label_name">Namn</string>
+    <string name="retro_gs_label_system">System</string>
+    <string name="retro_gs_label_emulator_core">Emulatorkärna</string>
+    <string name="retro_gs_label_rom_path">ROM-sökväg</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">Installerat</string>
+    <string name="retro_gs_bios_none">Inget – krävs för att köra %1$s-spel</string>
+    <string name="retro_gs_import_bios">Importera BIOS…</string>
+    <string name="retro_gs_remove_bios">Ta bort BIOS</string>
+    <string name="retro_gs_group_library_artwork">BIBLIOTEKSGRAFIK</string>
+    <string name="retro_gs_artwork_game_card">Spelkortsbild</string>
+    <string name="retro_gs_artwork_grid">Rutnätsbild</string>
+    <string name="retro_gs_artwork_carousel">Karusellbild</string>
+    <string name="retro_gs_artwork_list">Listbild</string>
+    <string name="retro_gs_artwork_custom_set">Anpassad bild inställd</string>
+    <string name="retro_gs_artwork_set_image">Ställ in bild</string>
+    <string name="retro_gs_artwork_remove">Ta bort</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Videofilter</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR-uppskalning</string>
+    <string name="retro_gs_performance_hud">Prestanda-HUD</string>
+    <string name="retro_gs_group_core">KÄRNA</string>
+    <string name="retro_gs_renderer">Renderare</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Upplösningsskala</string>
+    <string name="retro_gs_scale_1x_native">1x (Native)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Bildförhållande</string>
+    <string name="retro_gs_aspect_stretch">Sträck ut</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Skärmfilter</string>
+    <string name="retro_gs_filter_nearest">Närmaste</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinjär (Mjuk)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinjär (Skarp)</string>
+    <string name="retro_gs_texture_filter">Texturfilter</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinjär (Tvingad)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinjär (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinjär (Sprites)</string>
+    <string name="retro_gs_blending_accuracy">Blandningsnoggrannhet</string>
+    <string name="retro_gs_blend_minimum">Minimum</string>
+    <string name="retro_gs_blend_basic">Grundläggande</string>
+    <string name="retro_gs_blend_medium">Medel</string>
+    <string name="retro_gs_blend_high">Hög</string>
+    <string name="retro_gs_blend_full">Full</string>
+    <string name="retro_gs_blend_maximum">Maximum</string>
+    <string name="retro_gs_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_gs_off">Av</string>
+    <string name="retro_gs_tvshader_scanline">Scanline</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Wave</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Frame Skip</string>
+    <string name="retro_gs_frameskip_1">Hoppa över 1</string>
+    <string name="retro_gs_frameskip_2">Hoppa över 2</string>
+    <string name="retro_gs_frameskip_3">Hoppa över 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">PRESTANDA</string>
+    <string name="retro_gs_ee_cycle_rate">EE-cykelfrekvens</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (Standard)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE-cykelhopp</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Snabb CDVD</string>
+    <string name="retro_gs_group_performance_hud">PRESTANDA-HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emuleringshastighet</string>
+    <string name="retro_gs_hud_cpu_usage">CPU-användning</string>
+    <string name="retro_gs_hud_gpu_usage">GPU-användning</string>
+    <string name="retro_gs_hud_internal_resolution">Intern upplösning</string>
+    <string name="retro_gs_deinterlace_mode">Deinterlace-läge</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Av</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV-bildförhållande</string>
+    <string name="retro_gs_anti_blur">Anti-oskärpa</string>
+    <string name="retro_gs_widescreen_patches">Widescreen-patchar</string>
+    <string name="retro_gs_no_interlace_patches">No-interlace-patchar</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC-spinndetektering</string>
+    <string name="retro_gs_wait_loop">Vänteloopsdetektering</string>
+    <string name="retro_gs_time_stretch">Ljud-timestretch</string>
+    <string name="retro_gs_audio_buffer">Ljudbuffert</string>
+    <string name="retro_gs_audio_latency">Utgångslatens</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Bildrutetider</string>
+    <string name="retro_gs_hud_gs_stats">GS-statistik</string>
+    <string name="retro_gs_hud_hw_info">Hårdvaruinfo</string>
+    <string name="retro_gs_hud_version">Version</string>
+    <string name="retro_gs_hud_input_display">Inmatningsvisning</string>
+    <string name="retro_gs_fast_boot">Snabbstart</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Aktivera online</string>
+    <string name="retro_gs_ethernet_device">Ethernet-enhet</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS-läge</string>
+    <string name="retro_gs_dns_manual">Manuell</string>
+    <string name="retro_gs_dns_internal">Intern</string>
+    <string name="retro_gs_primary_dns">Primär DNS</string>
+    <string name="retro_gs_secondary_dns">Sekundär DNS</string>
+    <string name="retro_gs_dns_optional">valfritt</string>
+    <string name="retro_gs_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_gs_group_input">INMATNING</string>
+    <string name="retro_engine_save">Spara</string>
+    <string name="retro_engine_saved">Spelet sparat</string>
+    <string name="retro_engine_loading">Läser in…</string>
+    <string name="retro_engine_load">Läs in</string>
+    <string name="retro_engine_saved_to">Sparat till %1$s</string>
+    <string name="retro_engine_slot_active_only">Aktiv</string>
+    <string name="retro_engine_rename_slot">Byt namn på sparplats</string>
+    <string name="retro_engine_caught">%1$d fångade</string>
+    <string name="retro_engine_no_slots">Inga sparplatser ännu</string>
+    <string name="retro_engine_new_slot">Ny sparplats</string>
+    <string name="retro_engine_achievements_unavailable">Spåras inte i 3D-läge</string>
+    <string name="retro_engine_fullscreen">Helskärm</string>
+    <string name="retro_engine_loaded_from">Läste in %1$s</string>
+    <string name="retro_engine_slot_empty">Den platsen är tom</string>
+    <string name="retro_engine_loading_subtitle">Förbereder speldata för första gången</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Spela det här spelet i 3D-voxelmotorn i stället för standardkärnan</string>
+    <string name="retro_gs_on_screen_controls">Skärmkontroller</string>
+    <string name="retro_gs_haptic_feedback">Haptisk återkoppling</string>
+    <string name="retro_gs_group_audio">LJUD</string>
+    <string name="retro_gs_volume">Volym</string>
+    <string name="retro_gs_mute">Tyst</string>
+    <string name="retro_gs_swap_stereo">Byt stereokanaler</string>
+    <string name="retro_gs_sound">Ljud</string>
+    <string name="retro_scr_retro_defaults">RETRO-STANDARDER</string>
+    <string name="retro_scr_retro_defaults_desc">Standarder som tillämpas på varje konsols spel om de inte åsidosätts i ett spels egna inställningar.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Konto</string>
+    <string name="retro_scr_signed_in">Inloggad</string>
+    <string name="retro_scr_not_signed_in_hint">Inte inloggad – öppna ett spels prestationer för att logga in</string>
+    <string name="retro_scr_achievements_enabled">Prestationer aktiverade</string>
+    <string name="retro_scr_hardcore_default">Hardcore-läge som standard (inga sparade tillstånd)</string>
+    <string name="retro_scr_sign_out">Logga ut</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">Installerat</string>
+    <string name="retro_scr_none_ps1_bios">Inget – PS1-spel kräver en BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Importera PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS borttaget</string>
+    <string name="retro_scr_no_bios_to_remove">Ingen BIOS att ta bort</string>
+    <string name="retro_scr_remove_ps1_bios">Ta bort PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">Inget – PS2-spel kräver en BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Sammanslagen enkelfilsdump (regionsmärkt .bin, ~4 MB). Uppdelade ROM0/MEC/NVM-uppsättningar accepteras inte.</string>
+    <string name="retro_scr_import_ps2_bios">Importera PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS borttaget</string>
+    <string name="retro_scr_remove_ps2_bios">Ta bort PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">BIBLIOTEKSGRAFIK</string>
+    <string name="retro_scr_retro_case_art">Retro fodralbild (kassett / CD-fodral)</string>
+    <string name="retro_scr_box_art">Omslagsbild</string>
+    <string name="retro_scr_box_art_desc">Hämtas automatiskt från thumbnails.libretro.com vid import; en anpassad bild åsidosätter den alltid.</string>
+    <string name="retro_scr_roms_folder">ROMS-MAPP</string>
+    <string name="retro_scr_folder">Mapp</string>
+    <string name="retro_scr_roms_not_set">Inte inställd – välj en mapp för att importera spel automatiskt</string>
+    <string name="retro_scr_auto_import">Auto-import</string>
+    <string name="retro_scr_auto_import_desc">Nya spel i denna mapp läggs automatiskt till i ditt bibliotek med rätt konsol identifierad.</string>
+    <string name="retro_scr_select_roms_folder_title">Välj ROM-mapp</string>
+    <string name="retro_scr_select_roms_folder_button">Välj ROM-mapp…</string>
+    <string name="retro_scr_change_roms_folder_button">Ändra ROM-mapp…</string>
+    <string name="retro_scr_scan_now">Sök nu</string>
+    <string name="retro_scr_console_defaults">KONSOL-STANDARDER</string>
+    <string name="retro_scr_console_defaults_desc">Tryck på en konsol för att ange dess standardinställningar.</string>
+    <string name="retro_scr_renderer">Renderare</string>
+    <string name="retro_scr_upscale_resolution">Uppskala upplösning</string>
+    <string name="retro_scr_aspect_ratio">Bildförhållande</string>
+    <string name="retro_scr_aspect_stretch">Sträck ut</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Skärmfilter</string>
+    <string name="retro_scr_filter_nearest">Närmaste</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinjär (Mjuk)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinjär (Skarp)</string>
+    <string name="retro_scr_texture_filter">Texturfilter</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinjär (Tvingad)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinjär (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinjär (Sprites)</string>
+    <string name="retro_scr_blending_accuracy">Blandningsnoggrannhet</string>
+    <string name="retro_scr_blend_minimum">Minimum</string>
+    <string name="retro_scr_blend_basic">Grundläggande</string>
+    <string name="retro_scr_blend_medium">Medel</string>
+    <string name="retro_scr_blend_high">Hög</string>
+    <string name="retro_scr_blend_full">Full</string>
+    <string name="retro_scr_blend_maximum">Maximum</string>
+    <string name="retro_scr_crt_tv_shader">CRT-/TV-shader</string>
+    <string name="retro_scr_shader_off">Av</string>
+    <string name="retro_scr_shader_scanline">Scanline</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Wave</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Frame Skip</string>
+    <string name="retro_scr_skip_1">Hoppa över 1</string>
+    <string name="retro_scr_skip_2">Hoppa över 2</string>
+    <string name="retro_scr_skip_3">Hoppa över 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">EE-cykelfrekvens</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (Standard)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE-cykelhopp</string>
+    <string name="retro_scr_skip_off">Av</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Snabb CDVD</string>
+    <string name="retro_scr_touch_controls">Pekkontroller på skärmen</string>
+    <string name="retro_scr_sound">Ljud</string>
+    <string name="retro_scr_swap_stereo">Byt stereokanaler</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: Emuleringshastighet</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU-användning</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU-användning</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: Intern upplösning</string>
+    <string name="retro_scr_enable_online_dev9">Aktivera online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet-enhet</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS-läge</string>
+    <string name="retro_scr_dns_manual">Manuell</string>
+    <string name="retro_scr_dns_internal">Intern</string>
+    <string name="retro_scr_primary_dns">Primär DNS</string>
+    <string name="retro_scr_secondary_dns">Sekundär DNS</string>
+    <string name="retro_scr_optional">valfritt</string>
+    <string name="retro_scr_auto_ip_dhcp">Auto-IP (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR-uppskalning</string>
+    <string name="retro_scr_performance_hud">Prestanda-HUD</string>
+    <string name="retro_scr_credits_licenses">MEDVERKANDE &amp; LICENSER</string>
+    <string name="retro_scr_credits_desc">Vissa av WinNatives funktioner bygger på dessa projekt med öppen källkod. Tryck för att visa varje källa.</string>
+    <string name="retro_scr_tab_defaults">Standarder</string>
+    <string name="retro_scr_tab_credits">Medverkande</string>
+    <string name="retro_scr_enable_hardcore_title">Aktivera Hardcore-läge?</string>
+    <string name="retro_scr_enable_hardcore_body">Hardcore-läge återställer spelet nu och inaktiverar inläsning av sparade tillstånd, snabbspolning och fusk. Osparade framsteg går förlorade. Fortsätta?</string>
+    <string name="retro_scr_cancel">Avbryt</string>
+    <string name="retro_scr_enable">Aktivera</string>
+    <string name="retro_scr_bios_imported">BIOS importerat: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Ogiltig BIOS-fil</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS importerat: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Ogiltig PS2 BIOS-fil</string>
+    <string name="retro_scr_no_game_serial">Inget spelserienummer att slå upp fusk för.</string>
+    <string name="retro_scr_applied_cheats">Tillämpade %1$d fusk.</string>
+    <string name="retro_scr_couldnt_apply_cheats">Kunde inte tillämpa fusk.</string>
+    <string name="retro_scr_cheats">Fusk</string>
+    <string name="retro_scr_apply">Tillämpa</string>
+    <string name="retro_scr_no_cheats_found">Inget fusk hittades för detta spel.</string>
+    <string name="retro_scr_achievements">Prestationer</string>
+    <string name="retro_scr_sign_in_ra">Logga in på RetroAchievements</string>
+    <string name="retro_scr_username">Användarnamn</string>
+    <string name="retro_scr_password">Lösenord</string>
+    <string name="retro_scr_login_failed">Inloggningen misslyckades</string>
+    <string name="retro_scr_signing_in">Loggar in…</string>
+    <string name="retro_scr_sign_in">Logga in</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d p</string>
+    <string name="retro_scr_no_achievements">Inga prestationer för detta spel.</string>
+    <string name="retro_scr_back">Tillbaka</string>
+    <string name="retro_scr_enabled">Aktiverat</string>
+    <string name="retro_scr_disabled">Inaktiverat</string>
+    <string name="retro_scr_rename">Byt namn</string>
+    <string name="retro_scr_save">Spara</string>
+    <string name="retro_scr_cloud_save_conflict">Molnsparningskonflikt</string>
+    <string name="retro_scr_keep_local_save">Behåll lokal sparning</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Meny</string>
+    <string name="retro_tab_display">Skärm</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Ljud</string>
+    <string name="retro_tab_controls">Kontroller</string>
+    <string name="retro_scan_up_to_date">Biblioteket är uppdaterat</string>
+    <string name="retro_scan_roms">ROM:ar: %1$s</string>
+    <string name="retro_scan_added">lade till %1$d</string>
+    <string name="retro_scan_removed">tog bort %1$d</string>
+    <string name="retro_scr_shader_default">Standard</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Skarp</string>
+    <string name="retro_scr_upscale_native">Native</string>
+    <string name="retro_co_aspect_ratio">Bildförhållande</string>
+    <string name="retro_co_ntsc_filter">NTSC-filter</string>
+    <string name="retro_co_colorization">Färgläggning</string>
+    <string name="retro_co_color_correction">Färgkorrigering</string>
+    <string name="retro_co_remove_sprite_limit">Ta bort sprite-gräns</string>
+    <string name="retro_co_resolution">Upplösning</string>
+    <string name="retro_co_framebuffer_emulation">Framebuffer-emulering</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Widescreen-hack</string>
+    <string name="retro_co_val_8_7_native">8:7 (Native)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Av</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">GBA-skärm</string>
+    <string name="retro_co_val_gbc_screen">GBC-skärm</string>
+    <string name="retro_co_val_on">På</string>
+    <string name="retro_co_val_320x240_native">320x240 (Native)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 justerad</string>
+    <string name="retro_co_val_native">Native</string>
+    <string name="retro_co_val_internal">Intern</string>
+    <string name="retro_co_val_on_16_9">På (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Logga in med ditt RetroAchievements-konto för att tjäna och spåra prestationer för retrospel.</string>
+    <string name="retro_ach_username">Användarnamn</string>
+    <string name="retro_ach_password">Lösenord</string>
+    <string name="retro_ach_enter_credentials">Ange ditt användarnamn och lösenord</string>
+    <string name="retro_ach_login_failed">Inloggningen misslyckades</string>
+    <string name="retro_ach_sign_in">Logga in</string>
+    <string name="retro_ach_password_disclaimer">Ditt lösenord används bara en gång för att hämta en inloggningstoken, som lagras säkert på enheten.</string>
+    <string name="retro_ach_achievements_enabled">Prestationer aktiverade</string>
+    <string name="retro_ach_hardcore_mode">Hardcore-läge (inga sparade tillstånd)</string>
+    <string name="retro_ach_points">%1$d / %2$d poäng</string>
+    <string name="retro_ach_none_found">Inga prestationer hittades för detta spel.</string>
+    <string name="retro_ach_sign_out">Logga ut</string>
+    <string name="retro_che_brand">FUSK</string>
+    <string name="retro_che_name">Namn</string>
+    <string name="retro_che_code">Kod</string>
+    <string name="retro_che_cancel">Avbryt</string>
+    <string name="retro_che_save">Spara</string>
+    <string name="retro_che_default_name">Fusk %1$d</string>
+    <string name="retro_che_empty">Inget fusk ännu. Lägg till en fuskkod för detta spel.</string>
+    <string name="retro_che_add">Lägg till fusk</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU-drivrutin</string>
+    <string name="retro_gpu_driver_system">System (Standard)</string>
+    <string name="retro_gpu_driver_hint">Installera Turnip-drivrutiner under Inställningar \u2192 Drivrutiner. Samma drivrutiner fungerar för både PC- och PS2-spel.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Virtuell intern enhet för HDD-baserade spel som Final Fantasy XI. Startar om spelet.</string>
+    <string name="retro_ps2_hdd_desc">Virtuell intern enhet för HDD-baserade spel som Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">DNS-läge inställt på Internal så att dina anpassade servervärdar träder i kraft.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">CPU-kärna</string>
+<string name="retro_co_dual_core">Dubbelkärna</string>
+<string name="retro_co_internal_cheats">Interna fusk</string>
+<string name="retro_co_internal_resolution">Intern upplösning</string>
+<string name="retro_co_renderer">Renderare</string>
+<string name="retro_co_sensor_bar">Sensorstavens position</string>
+<string name="retro_co_skip_gc_bios">Hoppa över BIOS-intro</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Nederkant</string>
+<string name="retro_co_val_cached_interpreter">Cachad tolk</string>
+<string name="retro_co_val_hardware">Hårdvara</string>
+<string name="retro_co_val_interpreter">Tolk</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Mus / pekskärm</string>
+<string name="retro_co_val_right_stick_absolute">Höger spak (absolut)</string>
+<string name="retro_co_val_right_stick_relative">Höger spak (relativ)</string>
+<string name="retro_co_val_software">Programvara</string>
+<string name="retro_co_val_stretch">Sträck</string>
+<string name="retro_co_val_top">Överkant</string>
+<string name="retro_co_vbi_skip">VBI-hopp (auto-bildhopp)</string>
+<string name="retro_co_widescreen">Bredbild</string>
+<string name="retro_co_wiimote_pointer">Wiimote-pekare</string>
+<string name="retro_gs_cheats_apply_note">Ändringarna gäller nästa gång du startar spelet.</string>
+<string name="retro_gs_cheats_detect_hint">Starta spelet en gång så att dess skivserienummer kan identifieras, sedan visas fusk och patchar här.</string>
+<string name="retro_gs_dnas_entry_desc">DNAS-autentiseringsförbikoppling — krävs för onlinespel</string>
+<string name="retro_gs_dnas_group">Tillämpas automatiskt (online)</string>
+<string name="retro_gs_group_cheats">Fusk &amp; patchar</string>
+<string name="retro_gs_hdd_image_size">Storlek: %1$s</string>
+<string name="retro_gs_hdd_import">Importera HDD-avbild</string>
+<string name="retro_gs_hdd_remove_short">Ta bort</string>
+<string name="retro_gs_netplay_enable">Aktivera NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">Av som standard. Aktivera och välj sedan Värd eller Anslut före start.\nStängs av igen när du avslutar spelet.</string>
+<string name="retro_gs_netplay_host">Värdadress</string>
+<string name="retro_gs_netplay_host_hint">IP eller värdnamn</string>
+<string name="retro_gs_netplay_host_mode">Värdsession</string>
+<string name="retro_gs_netplay_host_mode_subtitle">På = vänta på en spelare. Av = anslut till värdadress</string>
+<string name="retro_gs_netplay_not_ready">NetPlay använder lokala flerspelarportar över TCP (spelare 1 värd / spelare 2 klient). PS2-online använder DEV9 Ethernet i stället.</string>
+<string name="retro_gs_netplay_port">Port</string>
+<string name="retro_lr_memory_card_slot">Minneskort %1$d</string>
+<string name="retro_lr_screenshot">Skärmbild</string>
+<string name="retro_lr_use_cloud_save">Använd molnsparning</string>
+<string name="retro_netplay_conn_direct">LAN (direkt IP)</string>
+<string name="retro_netplay_connecting">Ansluter…</string>
+<string name="retro_netplay_connection">Anslutning</string>
+<string name="retro_netplay_conn_traversal">Online (värdkod)</string>
+<string name="retro_netplay_dismiss">Avfärda</string>
+<string name="retro_netplay_dolphin_help">GameCube/Wii-NetPlay använder Dolphins egen motor. Värd = spelare 1, Anslut = spelare 2. Välj Värd eller Anslut och en anslutningstyp före start; båda enheterna startar samma spel tillsammans.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Dela enhetens Wi‑Fi-IP och den här porten med spelare 2. Spelet startar automatiskt när de ansluter.</string>
+<string name="retro_netplay_dolphin_host_online_hint">En värdkod visas när spelet startar — dela den med spelare 2. Spelet startar automatiskt när de ansluter.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Ange värdens Wi‑Fi-IP och port, starta sedan för att ansluta.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Ange värdkoden från spelare 1, starta sedan för att ansluta.</string>
+<string name="retro_netplay_enable_before_launch">Aktivera NetPlay i spelinställningarna och välj Värd eller Anslut före start</string>
+<string name="retro_netplay_find_rooms">Hitta rum på Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · varje skärm är sin egen handhållna enhet</string>
+<string name="retro_netplay_gba_not_ready">GBA-flerspelarläge använder gpSP + trådlös adapter. Se till att libgpsp är installerat.</string>
+<string name="retro_netplay_help">Flerspelarläge med delad skärm över Wi‑Fi (som RetroArch).\nVärd = spelare 1, Anslut = spelare 2. Båda enheterna visar samma spel.</string>
+<string name="retro_netplay_help_game_link">Game Link över Wi‑Fi — varje enhet kör sitt eget spel.\nGB/GBC: Gambatte seriell länk (Pokémon Gen 1–2).\nGBA: gpSP trådlös adapter (Pokémon FR/LG/Emerald-strider).</string>
+<string name="retro_netplay_host_action">Var värd för rum</string>
+<string name="retro_netplay_host_code">Värdkod</string>
+<string name="retro_netplay_host_code_hint">Traversal-värdkod från värden</string>
+<string name="retro_netplay_hosting_room">Är värd för rum</string>
+<string name="retro_netplay_host_mode_hint">Tryck på Värd för att öppna ett rum för den här spelsessionen, starta sedan spelet. NetPlay stängs av när du avslutar.</string>
+<string name="retro_netplay_in_room">I rum</string>
+<string name="retro_netplay_join_action">Anslut via IP</string>
+<string name="retro_netplay_joined">Ansluten</string>
+<string name="retro_netplay_join_room">Anslut</string>
+<string name="retro_netplay_launch_mode">Vid start</string>
+<string name="retro_netplay_leave">Lämna</string>
+<string name="retro_netplay_menu_hint">Värd = S1 · Anslut = S2 · samma spel på båda skärmarna</string>
+<string name="retro_netplay_mode_host">Värd</string>
+<string name="retro_netplay_mode_join">Anslut</string>
+<string name="retro_netplay_mode_manual">Manuell</string>
+<string name="retro_netplay_no_rooms">Inga rum hittades. Se till att värden är på samma Wi‑Fi och är värd för ett rum.</string>
+<string name="retro_netplay_player_name">Visningsnamn</string>
+<string name="retro_netplay_player_name_hint">Visas för andra spelare</string>
+<string name="retro_netplay_players_count">%1$d anslutna</string>
+<string name="retro_netplay_prelaunch_hint">Rummet är endast öppet för den här sessionen. Starta när du är redo. Att avsluta spelet stänger av NetPlay.</string>
+<string name="retro_netplay_room_players">Spelare</string>
+<string name="retro_netplay_scan_action">Sök Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Sök igen</string>
+<string name="retro_netplay_scan_hint">Sök på samma Wi‑Fi efter öppna rum, eller anslut via IP-adress.</string>
+<string name="retro_netplay_scanning">Söker Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Sökresultat</string>
+<string name="retro_netplay_select_room_hint">Tryck på ett rum för att ansluta nu (sparar inte IP-adressen till nästa start).</string>
+<string name="retro_netplay_stop_scan">Stoppa sökning</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s anslöt</string>
+<string name="retro_netplay_user_disconnected">%1$s kopplade från</string>
+<string name="retro_netplay_waiting_players">Väntar på spelare…</string>
+<string name="retro_ps2_coming_soon">Stöd för PlayStation 2 kommer snart</string>
+<string name="retro_ps2_show_l3r3">Visa L3-/R3-knappar</string>
+<string name="retro_ps2_show_l3r3_subtitle">När av, dubbeltryck på en spak för att klicka L3 / R3</string>
+<string name="retro_ps2_turnip_flags">TURNIP-DRIVRUTINSFLAGGOR</string>
+<string name="retro_ps2_turnip_flags_note">Tillämpas endast när en anpassad GPU-drivrutin är vald ovan.</string>
+<string name="retro_rom_missing">Spelfilen hittades inte</string>
+<string name="retro_scr_delete">Ta bort</string>
+<string name="retro_scr_import_from_file">Importera från fil…</string>
+<string name="retro_scr_loading">Läser in…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Byt konsol</string>
+    <string name="retro_gs_identify_as">Identifiera som konsol</string>
+    <string name="retro_gs_console_changed">Identifieras nu som %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Använd en ReShade-effekt (.fx) på DXVK/VKD3D-spel (Vulkan) via det inbyggda vkBasalt-lagret. Lägg varje effekt i sin egen mapp under Android/data/&lt;package&gt;/files/ReShade/. Justering av parametrar i realtid och växeln i spelet kommer med uppdateringen av live-reload-lagret.</string>
+    <string name="reshade_catalog_title">ReShade-effekter</string>
+    <string name="reshade_catalog_search">Sök effekter…</string>
+    <string name="reshade_catalog_installed">Installerade (%1$d)</string>
+    <string name="reshade_catalog_available">Tillgängliga (%1$d)</string>
+    <string name="reshade_catalog_downloading">Laddar ner</string>
+    <string name="reshade_catalog_installing">Installerar</string>
+    <string name="reshade_catalog_offline_cache">Offline — visar en cachad lista. Anslut för att ladda ner nya effekter.</string>
+    <string name="reshade_catalog_offline_none">Offline — visar endast installerade effekter. Anslut för att bläddra i katalogen.</string>
+    <string name="reshade_catalog_needs_connection">Anslut till internet för att ladda ner effekter.</string>
+    <string name="reshade_catalog_download_failed">Det gick inte att ladda ner %1$s.</string>
+    <string name="reshade_catalog_empty_query">Inga effekter matchar \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Inga effekter tillgängliga. Anslut till internet för att bläddra i katalogen.</string>
+    <string name="reshade_catalog_done">Klar</string>
+    <string name="reshade_catalog_delete_cd">Ta bort %1$s</string>
+    <string name="reshade_catalog_delete_title">Ta bort %1$s?</string>
+    <string name="reshade_catalog_delete_body">Detta tar bort effekten från lagringen och från alla uppsättningar som använder den. Du kan ladda ner den igen senare.</string>
+    <string name="reshade_catalog_delete_confirm">Ta bort</string>
+    <string name="reshade_catalog_delete_cancel">Avbryt</string>
+    <string name="reshade_catalog_delete_failed">Det gick inte att ta bort %1$s.</string>
+    <string name="reshade_params_title">EFFEKTPARAMETRAR</string>
+    <string name="reshade_params_reset">Återställ</string>
+    <string name="reshade_loadout_empty">Inga effekter ännu. Lägg till en eller flera effekter för att skapa en uppsättning.</string>
+    <string name="reshade_loadout_add">Lägg till effekt</string>
+    <string name="reshade_loadout_full">Uppsättningen är full — ta bort en effekt för att lägga till en annan.</string>
+    <string name="reshade_effect_active">aktiv</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stapel</string>
+    <string name="reshade_mode_solo_hint">En effekt aktiv i taget (A/B-jämförelse, växla live i spelet).</string>
+    <string name="reshade_mode_stack_hint">Lägg valfri delmängd av effekter i lager, tillämpade i ordning.</string>
+    <string name="reshade_drawer_enable">Aktivera ReShade</string>
+    <string name="reshade_drawer_empty">Inga ReShade-effekter i den här uppsättningen. Lägg till effekter i det här spelets inställningar (eller containerns) för att växla och justera dem här.</string>
+    <string name="reshade_drawer_no_params">Den här effekten har inga justerbara parametrar.</string>
+    <string name="cloud_saves_deleting">Tar bort sparfil…</string>
+    <string name="cloud_saves_history_delete">Ta bort</string>
+    <string name="cloud_saves_history_delete_confirm_body">Vill du ta bort molnsparningen från %1$s permanent? Det går inte att ångra.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Ta bort molnsparning</string>
+    <string name="cloud_saves_history_delete_failed">Det gick inte att ta bort molnsparningen</string>
+    <string name="cloud_saves_history_delete_success">Molnsparning borttagen</string>
+    <string name="retro_bundle_required">Ladda ner konsolkärnorna först — Inställningar › Retro</string>
+    <string name="retro_ps2_device_unsupported">Den här enheten kan inte köra PS2-emulering — den kräver OpenGL ES 3.1 eller senare.</string>
+    <string name="retro_scr_consoles_check">Sök efter uppdateringar</string>
+    <string name="retro_scr_consoles_checking">Söker efter uppdateringar…</string>
+    <string name="retro_scr_consoles_download">Ladda ner konsolkärnor</string>
+    <string name="retro_scr_consoles_downloading">Laddar ner… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Konsolkärnor</string>
+    <string name="retro_scr_consoles_installed">Installerad — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installerad — build %1$s (kunde inte söka efter uppdateringar)</string>
+    <string name="retro_scr_consoles_installing">Installerar…</string>
+    <string name="retro_scr_consoles_missing">Inte installerad — ladda ner för att spela retrospel</string>
+    <string name="retro_scr_consoles_state">Status</string>
+    <string name="retro_scr_consoles_update">Uppdatera konsolkärnor</string>
+    <string name="retro_scr_consoles_update_available">Uppdatering tillgänglig — build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">Verifierar nedladdningen…</string>
+    <string name="retro_scr_consoles_working">Arbetar…</string>
+    <string name="retro_tab_system">System</string>
+</resources>
diff --git a/app/src/main/res/values-th/arrays.xml b/app/src/main/res/values-th/arrays.xml
new file mode 100644
index 000000000..075d7a06c
--- /dev/null
+++ b/app/src/main/res/values-th/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>รูปภาพ</item>
+        <item>ต้นฉบับ</item>
+        <item>สีล้วน</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-th/plurals.xml b/app/src/main/res/values-th/plurals.xml
new file mode 100644
index 000000000..86dbf30b6
--- /dev/null
+++ b/app/src/main/res/values-th/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP ไฟล์</item>
+        <item quantity="other">%d ZIP ไฟล์</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
new file mode 100644
index 000000000..af11128d8
--- /dev/null
+++ b/app/src/main/res/values-th/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">เรียกใช้</string>
+    <string name="common_ui_edit">แก้ไข</string>
+    <string name="common_ui_remove">นำออก</string>
+    <string name="common_ui_add">เพิ่ม</string>
+    <string name="common_ui_shortcuts">ทางลัด</string>
+    <string name="common_ui_containers">คอนเทนเนอร์</string>
+    <string name="common_ui_input_controls">การควบคุมอินพุต</string>
+    <string name="common_ui_no_items_to_display">ไม่มีรายการที่จะแสดง</string>
+    <string name="common_ui_select_icon">เลือกไอคอน</string>
+    <string name="common_ui_revert_icon">คืนค่าไอคอน</string>
+    <string name="common_ui_select_exe">เลือก EXE</string>
+    <string name="common_ui_select_folder">เลือกโฟลเดอร์</string>
+    <string name="common_ui_current_folder">โฟลเดอร์ปัจจุบัน</string>
+    <string name="common_ui_enter_path">ป้อนพาธ</string>
+    <string name="common_ui_path_not_found">ไม่พบพาธ</string>
+    <string name="common_ui_select_valid_exe_file">โปรดเลือกไฟล์ .exe ที่ถูกต้อง</string>
+    <string name="common_ui_select_valid_icon_file">โปรดเลือกไฟล์ .ico หรือ .png ที่ถูกต้อง</string>
+    <string name="common_ui_exit">ออก</string>
+    <string name="common_ui_exit_app">ออกจากแอป</string>
+    <string name="common_ui_profile">โปรไฟล์</string>
+    <string name="common_ui_name">ชื่อ</string>
+    <string name="common_ui_ok">ตกลง</string>
+    <string name="common_ui_cancel">ยกเลิก</string>
+    <string name="common_ui_untitled">ไม่มีชื่อ</string>
+    <string name="common_ui_disabled">ปิดใช้งาน</string>
+    <string name="common_ui_container">คอนเทนเนอร์</string>
+    <string name="common_ui_value">ค่า</string>
+    <string name="common_ui_none">ไม่มี</string>
+    <string name="common_ui_custom_text">ข้อความกำหนดเอง</string>
+    <string name="common_ui_icon">ไอคอน</string>
+    <string name="common_ui_duplicate">ทำสำเนา</string>
+    <string name="common_ui_credits_and_third_party_apps">เครดิตและแอปของบุคคลที่สาม</string>
+    <string name="common_ui_loading">กำลังโหลด</string>
+    <string name="common_ui_exporting">กำลังส่งออก</string>
+    <string name="common_ui_enable">เปิดใช้งาน</string>
+    <string name="common_ui_disable">ปิดใช้งาน</string>
+    <string name="common_ui_force">บังคับ</string>
+    <string name="common_ui_version">เวอร์ชัน</string>
+    <string name="common_ui_advanced">ขั้นสูง</string>
+    <string name="common_ui_graphics">กราฟิก</string>
+    <string name="common_ui_system">ระบบ</string>
+    <string name="common_ui_width">ความกว้าง</string>
+    <string name="common_ui_height">ความสูง</string>
+    <string name="common_ui_open_file">เปิดไฟล์</string>
+    <string name="common_ui_download_file">ดาวน์โหลดไฟล์</string>
+    <string name="common_ui_downloading_file">กำลังดาวน์โหลดไฟล์</string>
+    <string name="common_ui_browse">เรียกดู</string>
+    <string name="common_ui_options">ตัวเลือก</string>
+    <string name="common_ui_export">ส่งออก</string>
+    <string name="common_ui_new_file">ไฟล์ใหม่</string>
+    <string name="common_ui_description">คำอธิบาย</string>
+    <string name="common_ui_continue">ดำเนินการต่อ</string>
+    <string name="common_ui_warning">คำเตือน</string>
+    <string name="common_ui_copy">คัดลอก</string>
+    <string name="common_ui_reset">รีเซ็ต</string>
+    <string name="common_ui_close">ปิด</string>
+    <string name="common_ui_confirm">ยืนยัน</string>
+    <string name="common_ui_unnamed">ไม่มีชื่อ</string>
+    <string name="common_ui_download">ดาวน์โหลด</string>
+    <string name="common_ui_uninstall">ถอนการติดตั้ง</string>
+    <string name="common_ui_other">อื่นๆ</string>
+    <string name="common_ui_status">สถานะ</string>
+    <string name="common_ui_size">ขนาด</string>
+    <string name="common_ui_release_date">วันที่วางจำหน่าย</string>
+    <string name="common_ui_installed">ติดตั้งแล้ว</string>
+    <string name="common_ui_available">พร้อมใช้งาน</string>
+    <string name="common_ui_settings">การตั้งค่า</string>
+    <string name="common_ui_enable_all">เปิดใช้งานทั้งหมด</string>
+    <string name="common_ui_disable_all">ปิดใช้งานทั้งหมด</string>
+    <string name="common_ui_select_all">เลือกทั้งหมด</string>
+    <string name="common_ui_deselect_all">ยกเลิกการเลือกทั้งหมด</string>
+    <string name="common_ui_on">เปิด</string>
+    <string name="common_ui_off">ปิด</string>
+    <string name="common_ui_already_set">ตั้งค่าไว้แล้ว</string>
+    <string name="common_ui_shortcut">ทางลัด</string>
+    <string name="common_ui_custom">กำหนดเอง</string>
+    <string name="common_ui_about">เกี่ยวกับ</string>
+    <string name="common_ui_back">กลับ</string>
+    <string name="common_ui_apply">ใช้</string>
+    <string name="common_ui_save">บันทึก</string>
+    <string name="common_ui_clone">โคลน</string>
+    <string name="common_ui_properties">คุณสมบัติ</string>
+    <string name="common_ui_store">ร้านค้า</string>
+    <string name="common_ui_library">คลัง</string>
+    <string name="common_ui_downloads">ดาวน์โหลด</string>
+    <string name="common_ui_import">นำเข้า</string>
+    <string name="common_ui_sync">ซิงค์</string>
+    <string name="common_ui_sign_in">เข้าสู่ระบบ</string>
+    <string name="common_ui_submit">ส่ง</string>
+    <string name="common_ui_coming_soon">เร็วๆนี้</string>
+    <string name="common_ui_signed_in">เข้าสู่ระบบแล้ว</string>
+    <string name="common_ui_required">จำเป็น</string>
+    <string name="common_ui_optional">ไม่บังคับ</string>
+    <string name="common_ui_notifications">การแจ้งเตือน</string>
+    <string name="common_ui_mode">โหมด</string>
+    <string name="common_ui_experimental">(ทดลอง)</string>
+    <string name="common_ui_current_version_label">เวอร์ชันปัจจุบัน:</string>
+    <string name="common_ui_cannot_write_folder">ไม่สามารถเขียนไปยังโฟลเดอร์ที่เลือกได้</string>
+    <string name="common_ui_failed_create_directory">สร้างไดเรกทอรีเริ่มต้นไม่สำเร็จ</string>
+    <string name="common_ui_device_not_supported">ขออภัยอุปกรณ์ของคุณอาจไม่รองรับ</string>
+    <string name="common_ui_please_wait">โปรดรอสักครู่…</string>
+    <string name="common_ui_done">เสร็จสิ้น</string>
+    <string name="common_ui_open">เปิด</string>
+    <string name="common_ui_connected">เชื่อมต่อแล้ว</string>
+    <string name="common_ui_install">ติดตั้ง</string>
+    <string name="common_ui_application">แอปพลิเคชัน</string>
+    <string name="common_ui_check">ตรวจสอบ</string>
+    <string name="store_game_check_for_update">ตรวจสอบการอัปเดต</string>
+    <string name="store_game_checking_for_update">กำลังตรวจสอบ</string>
+    <string name="store_game_download_update">ดาวน์โหลดการอัปเดต</string>
+    <string name="store_game_no_update_available">ไม่มีการอัปเดตที่พร้อมใช้งาน</string>
+    <string name="store_game_update_available">มีการอัปเดตพร้อมใช้งาน</string>
+    <string name="store_game_update_check_failed">ตรวจสอบการอัปเดตไม่สำเร็จ</string>
+    <string name="store_game_update">อัปเดต</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">ตรวจสอบไฟล์</string>
+    <string name="store_game_verify_started">กำลังตรวจสอบ %1$s — ดูที่แท็บดาวน์โหลด</string>
+    <string name="store_game_steam_options">ตัวเลือก Steam</string>
+    <string name="store_game_verify_complete">ตรวจสอบไฟล์เสร็จสมบูรณ์</string>
+    <string name="store_game_verify_failed_notice">ตรวจสอบไฟล์ไม่สำเร็จ</string>
+    <string name="store_game_progress_background_hint">คุณสามารถปิดหน้านี้ได้ — มันจะทำงานต่อไป ตรวจสอบที่แท็บดาวน์โหลดได้ตลอดเวลา</string>
+    <string name="store_game_checking_updates">กำลังตรวจสอบการอัปเดต</string>
+    <string name="store_game_no_updates_notice">ไม่มีการอัปเดตที่พร้อมใช้งาน</string>
+    <string name="store_game_update_complete">อัปเดตเสร็จสมบูรณ์</string>
+    <string name="store_game_update_failed_notice">อัปเดตไม่สำเร็จ</string>
+    <string name="store_game_update_check_failed_notice">ตรวจสอบการอัปเดตไม่สำเร็จ</string>
+    <string name="store_game_download_already_active">เกมนี้กำลังดาวน์โหลดอยู่แล้ว ยกเลิกการดาวน์โหลดปัจจุบันก่อนเพิ่ม DLC</string>
+    <string name="common_ui_select">เลือก</string>
+    <string name="common_ui_storage_roots">รูทที่เก็บข้อมูล</string>
+    <string name="common_ui_browse_local_folders_directly">เรียกดูโฟลเดอร์ในเครื่องโดยตรง</string>
+    <string name="common_ui_no_folders_available_here">ไม่มีโฟลเดอร์ที่นี่</string>
+    <string name="common_ui_grant_all_files_access_browse">ให้สิทธิ์เข้าถึงไฟล์ทั้งหมดเพื่อเรียกดูโฟลเดอร์โดยตรง</string>
+    <string name="common_ui_not_configured">ยังไม่ได้กำหนดค่า</string>
+    <string name="common_ui_reinstall">ติดตั้งใหม่</string>
+    <string name="common_ui_exit_app_confirm">ออกจาก WinNative?</string>
+    <string name="common_ui_elements_count">%1$d รายการ</string>
+    <string name="common_ui_disabled_placeholder">-- ปิดใช้งาน --</string>
+    <string name="common_ui_enabled">เปิดใช้งานแล้ว</string>
+    <string name="common_ui_unknown_error">ข้อผิดพลาดที่ไม่รู้จัก</string>
+    <string name="common_ui_auto_detected">ตรวจพบอัตโนมัติ</string>
+    <string name="common_ui_change">เปลี่ยน</string>
+    <string name="common_ui_proceed">ดำเนินการ</string>
+    <string name="common_ui_sign_out">ออกจากระบบ</string>
+    <string name="common_ui_name_cannot_be_empty">ชื่อต้องไม่ว่างเปล่า</string>
+    <string name="common_ui_error_with_message">ข้อผิดพลาด: %1$s</string>
+    <string name="common_ui_64_bit">64-BIT</string>
+    <string name="common_ui_32_bit">32-BIT</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BIT &amp; 32-BIT</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d โฟลเดอร์</item>
+        <item quantity="other">%d โฟลเดอร์</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d ไฟล์</item>
+        <item quantity="other">%d ไฟล์</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">ดึงภาพประกอบ</string>
+    <string name="library_games_scraping_artwork">กำลังดึง</string>
+    <string name="library_games_shortcut_created">สร้างทางลัดแล้ว</string>
+    <string name="library_games_failed_to_create_shortcut">สร้างทางลัดไม่สำเร็จ: %s</string>
+    <string name="library_games_install_path">เส้นทางติดตั้ง</string>
+    <string name="library_games_not_enough_space">ต้องการพื้นที่เพิ่มอีก %1$s</string>
+    <string name="library_games_download_slash_install">ดาวน์โหลด / ติดตั้ง</string>
+    <string name="library_games_save_management">การจัดการเซฟ</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • พร้อมใช้งาน: %3$s</string>
+    <string name="library_games_last_played">เล่นล่าสุด</string>
+    <string name="library_games_playtime">เวลาเล่น</string>
+    <string name="library_games_plays">จำนวนครั้งที่เล่น</string>
+    <string name="library_games_dlcs">DLC</string>
+    <string name="library_games_uninstall_game">ถอนการติดตั้งเกม</string>
+    <string name="library_games_remove_game">นำเกมออก</string>
+    <string name="library_games_uninstall_confirm">ถอนการติดตั้ง %1$s และลบโฟลเดอร์เกมที่ติดตั้งไว้อย่างถาวรหรือไม่?</string>
+    <string name="library_games_remove_confirm">นำ %1$s ออกจากคลังของคุณ ไฟล์เกมบนดิสก์จะยังคงอยู่ ดำเนินการต่อหรือไม่?</string>
+    <string name="library_games_game_uninstalled">ถอนการติดตั้ง %1$s แล้ว</string>
+    <string name="library_games_game_removed">นำ %1$s ออกแล้ว</string>
+    <string name="library_games_failed_to_uninstall">ถอนการติดตั้งไม่สำเร็จ</string>
+    <string name="library_games_failed_to_uninstall_reason">ถอนการติดตั้งไม่สำเร็จ: %1$s</string>
+    <string name="library_games_loading">กำลังโหลดคลัง…</string>
+    <string name="library_games_no_games_installed">ไม่มีเกมที่ติดตั้ง ใช้แท็บร้านค้าหรือปุ่ม + เพื่อเพิ่มเกม</string>
+    <string name="library_games_times_played_label">จำนวนครั้งที่เล่น: </string>
+    <string name="library_games_playtime_label">เวลาเล่น: </string>
+    <string name="library_games_no_games_hub">ไม่มีเกมที่ติดตั้ง\nคลิกเพื่อเปิด Winlator Backend</string>
+    <string name="library_games_installed_badge">ติดตั้งแล้ว</string>
+    <string name="library_games_unknown_game">เกมที่ไม่รู้จัก</string>
+    <string name="library_games_layouts_header">เลย์เอาต์คลัง</string>
+    <string name="library_games_layout_carousel">คารูเซล</string>
+    <string name="library_games_layout_list">รายการ</string>
+    <string name="library_games_view_options_header">ตัวเลือกมุมมอง</string>
+    <string name="library_games_immersive_mode">โหมดอิมเมอร์ซีฟ</string>
+    <string name="library_games_immersive_mode_description">ใช้ภาพเกมที่โฟกัสเป็นพื้นหลัง</string>
+    <string name="library_games_immersive_blur">เบลอพื้นหลัง</string>
+    <string name="library_games_immersive_blur_description">ใช้เอฟเฟกต์เบลอกับพื้นหลังอิมเมอร์ซีฟ</string>
+    <string name="library_games_custom_game">เกมกำหนดเอง</string>
+    <string name="library_games_play">เล่น</string>
+    <string name="hero_boot_to_desktop_title">บูตเข้าสู่เดสก์ท็อป</string>
+    <string name="hero_graphics_tests_title">ทดสอบกราฟิก</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">ทดสอบอินพุต</string>
+    <string name="library_games_add_custom_game">เพิ่มเกมกำหนดเอง</string>
+    <string name="library_games_game_name">ชื่อเกม</string>
+    <string name="library_games_game_folder_mapped_drive">โฟลเดอร์เกม (ไดรฟ์เกมที่แมป)</string>
+    <string name="library_games_select_exe_provide_name">เลือกไฟล์ exe และระบุชื่อ</string>
+    <string name="library_games_sign_in_prompt">เข้าสู่ระบบร้านค้าหรือเพิ่มเกมกำหนดเองเพื่อสร้างคลังของคุณ</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">ร้านค้า</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">โฟลเดอร์ดาวน์โหลดที่ใช้ร่วมกัน</string>
+    <string name="stores_accounts_shared_downloads_subtitle">ใช้โฟลเดอร์เดียวสำหรับร้านค้าทั้งหมด</string>
+    <string name="stores_accounts_default_downloads_folder">โฟลเดอร์ดาวน์โหลดเริ่มต้น</string>
+    <string name="stores_accounts_steam_downloads">การดาวน์โหลด Steam</string>
+    <string name="stores_accounts_epic_downloads">การดาวน์โหลด Epic</string>
+    <string name="stores_accounts_gog_downloads">การดาวน์โหลด GOG</string>
+    <string name="stores_accounts_download_speed">ความเร็วดาวน์โหลด</string>
+    <string name="stores_accounts_download_speed_subtitle">ควบคุมจำนวนเธรดดาวน์โหลดพร้อมกันของ Steam</string>
+    <string name="stores_accounts_download_server">เซิร์ฟเวอร์ดาวน์โหลด</string>
+    <string name="stores_accounts_connected_stores">ร้านค้าที่เชื่อมต่อ</string>
+    <string name="stores_accounts_download_settings">การตั้งค่าดาวน์โหลด</string>
+    <string name="stores_accounts_download_speed_conservative">ประหยัด</string>
+    <string name="stores_accounts_download_speed_balanced">สมดุล</string>
+    <string name="stores_accounts_download_speed_standard">มาตรฐาน</string>
+    <string name="stores_accounts_download_speed_performance">ประสิทธิภาพสูง</string>
+    <string name="stores_accounts_download_server_auto_detected">ตรวจพบอัตโนมัติ: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">ภูมิภาค CDN ของ Steam สำหรับดาวน์โหลดเกม</string>
+    <string name="stores_accounts_sign_out_confirm">ออกจากระบบ %1$s?</string>
+    <string name="stores_accounts_sign_out_message">คุณจะต้องเข้าสู่ระบบอีกครั้งเพื่อเข้าถึงคลังของคุณ</string>
+    <string name="stores_accounts_logged_in_epic">เข้าสู่ระบบ Epic Games แล้ว!</string>
+    <string name="stores_accounts_epic_login_failed">เข้าสู่ระบบ Epic ไม่สำเร็จ: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">เข้าสู่ระบบ GOG แล้ว!</string>
+    <string name="stores_accounts_gog_login_failed">เข้าสู่ระบบ GOG ไม่สำเร็จ: %1$s</string>
+    <string name="stores_accounts_custom_download_path">เส้นทางดาวน์โหลดกำหนดเอง</string>
+    <string name="stores_accounts_custom_download_path_description">มีการกำหนดเส้นทางดาวน์โหลดเริ่มต้นไว้แล้วใน การตั้งค่า &gt; ร้านค้า หากคุณต้องการตั้งเส้นทางกำหนดเองสำหรับการติดตั้งนี้โดยเฉพาะ ให้คลิกดำเนินการ</string>
+    <string name="stores_accounts_not_signed_in">ยังไม่ได้เข้าสู่ระบบ</string>
+    <string name="stores_accounts_status_online">ออนไลน์</string>
+    <string name="stores_accounts_status_away">ไม่อยู่</string>
+    <string name="stores_accounts_status_offline">ออฟไลน์</string>
+    <string name="stores_accounts_status_invisible">ล่องหน</string>
+    <string name="stores_accounts_status_header">สถานะ</string>
+    <string name="stores_accounts_stores_header">ร้านค้า</string>
+    <string name="stores_accounts_sign_in_store_prompt">โปรดเข้าสู่ระบบเพื่อเข้าถึงร้านค้า %1$s</string>
+    <string name="stores_accounts_manage">จัดการบัญชีร้านค้า</string>
+    <string name="stores_accounts_sign_into_store">เข้าสู่ระบบ %1$s</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">ยกเลิกทั้งหมด</string>
+    <string name="downloads_queue_preparing_download">กำลังเตรียมดาวน์โหลด</string>
+    <string name="downloads_queue_installing_package">กำลังติดตั้งแพ็กเกจ</string>
+    <string name="downloads_queue_resume_all">ดำเนินการต่อทั้งหมด</string>
+    <string name="downloads_queue_pause_all">หยุดชั่วคราวทั้งหมด</string>
+    <string name="downloads_queue_clear">ล้าง</string>
+    <string name="downloads_queue_status_label">สถานะ:</string>
+    <string name="downloads_queue_phase_downloading">กำลังดาวน์โหลด</string>
+    <string name="downloads_queue_phase_downloading_file">กำลังดาวน์โหลด [%1$s]</string>
+    <string name="downloads_queue_phase_queued">อยู่ในคิว</string>
+    <string name="downloads_queue_phase_paused">หยุดชั่วคราว</string>
+    <string name="downloads_queue_phase_preparing">กำลังเตรียม</string>
+    <string name="downloads_queue_phase_verifying">กำลังตรวจสอบ</string>
+    <string name="downloads_queue_phase_verifying_file">กำลังตรวจสอบ[%1$s]</string>
+    <string name="downloads_queue_phase_patching">กำลังแพตช์</string>
+    <string name="downloads_queue_phase_applying_data">กำลังใช้ข้อมูล</string>
+    <string name="downloads_queue_phase_finalizing">กำลังสรุปผล</string>
+    <string name="downloads_queue_phase_unpacking">กำลังแตกไฟล์</string>
+    <string name="downloads_queue_phase_updating">กำลังอัปเดต</string>
+    <string name="downloads_queue_phase_complete">เสร็จสมบูรณ์</string>
+    <string name="downloads_queue_phase_cancelled">ยกเลิกแล้ว</string>
+    <string name="downloads_queue_phase_failed">ล้มเหลว: %1$s</string>
+    <string name="downloads_queue_phase_unknown">ไม่ทราบ</string>
+    <string name="downloads_queue_paused_resume_hint">หยุดชั่วคราว - แตะเล่นต่อเพื่อดำเนินการต่อ</string>
+    <string name="downloads_queue_cancel_download">ยกเลิกการดาวน์โหลด</string>
+    <string name="downloads_queue_cancel_download_title">ยกเลิกการดาวน์โหลด?</string>
+    <string name="downloads_queue_cancel_download_confirm">ยกเลิกการดาวน์โหลด%1$sและลบไฟล์ที่ดาวน์โหลดทั้งหมดหรือไม่?</string>
+    <string name="downloads_queue_cancel_download_warning">การยกเลิกการดาวน์โหลด DLC เกม หรืออัปเดตอาจทำให้การติดตั้งเกมของคุณเสียหายได้\n\nคุณแน่ใจหรือไม่ว่าต้องการยกเลิกการดาวน์โหลดนี้และลบไฟล์ที่ดาวน์โหลดไปแล้ว?</string>
+    <string name="downloads_queue_cancel_all_title">ยกเลิกการดาวน์โหลดทั้งหมดหรือไม่?</string>
+    <string name="downloads_queue_cancel_all_warning">การยกเลิกการดาวน์โหลด DLC เกม หรืออัปเดตอาจทำให้การติดตั้งเกมของคุณเสียหายได้\n\nคุณแน่ใจหรือไม่ว่าต้องการยกเลิกการดาวน์โหลดทั้งหมดและลบไฟล์ที่ดาวน์โหลดไปแล้ว?</string>
+    <string name="downloads_queue_this_game">เกมนี้</string>
+    <string name="downloads_queue_empty">ไม่มีการดาวน์โหลดที่กำลังทำงาน</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">คอนเทนเนอร์ใหม่</string>
+    <string name="containers_list_edit">แก้ไขคอนเทนเนอร์</string>
+    <string name="containers_list_creating">กำลังสร้างคอนเทนเนอร์</string>
+    <string name="containers_list_removing">กำลังลบคอนเทนเนอร์</string>
+    <string name="containers_list_duplicating">กำลังทำสำเนาคอนเทนเนอร์</string>
+    <string name="containers_list_remove_title">ลบคอนเทนเนอร์</string>
+    <string name="containers_list_duplicate_title">ทำสำเนาคอนเทนเนอร์</string>
+    <string name="containers_list_confirm_remove">ลบคอนเทนเนอร์นี้หรือไม่? ไฟล์บันทึกเกมที่เก็บไว้ข้างในจะถูกลบอย่างถาวร ไฟล์บันทึกที่ซิงค์กับคลาวด์จะยังอยู่บนคลาวด์ แต่การเปลี่ยนแปลงในเครื่องที่ยังไม่ได้ซิงค์จะสูญหาย — ซิงค์ไฟล์บันทึกบนคลาวด์ของเกมนี้ก่อนหากต้องการเก็บไว้</string>
+    <string name="containers_list_confirm_duplicate">คุณต้องการทำสำเนาคอนเทนเนอร์นี้หรือไม่?</string>
+    <string name="containers_list_duplicate_failed">ทำสำเนาคอนเทนเนอร์ไม่สำเร็จ</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">คุณต้องการลบทางลัดนี้หรือไม่?</string>
+    <string name="shortcuts_list_add_to_home_screen">เพิ่มไปยังหน้าจอหลัก</string>
+    <string name="shortcuts_library_artwork_title">ภาพประกอบไลบรารี</string>
+    <string name="shortcuts_library_artwork_icon_title">ภาพไอคอน</string>
+    <string name="shortcuts_library_artwork_hero_title">พื้นหลัง</string>
+    <string name="shortcuts_library_artwork_set">ตั้งค่าภาพ</string>
+    <string name="shortcuts_library_artwork_failed">โหลดภาพที่เลือกไม่สำเร็จ</string>
+    <string name="shortcuts_library_artwork_open_source">เปิด SteamGridDB</string>
+    <string name="shortcuts_list_not_available">ทางลัดนี้ไม่พร้อมใช้งานอีกต่อไป โปรดลบหรือสร้างใหม่</string>
+    <string name="shortcuts_list_select_a_container">เลือกคอนเทนเนอร์</string>
+    <string name="shortcuts_list_error_opening_settings">เกิดข้อผิดพลาดในการเปิดการตั้งค่าทางลัด</string>
+    <string name="shortcuts_list_removed">ลบทางลัดสำเร็จ</string>
+    <string name="shortcuts_list_remove_failed">ลบทางลัดไม่สำเร็จ โปรดลองอีกครั้ง</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">ลบทางลัด\n%1$s</string>
+    <string name="shortcuts_list_cloned">โคลนทางลัดสำเร็จ</string>
+    <string name="shortcuts_list_clone_failed">โคลนทางลัดไม่สำเร็จ</string>
+    <string name="shortcuts_list_exported_to">ส่งออกทางลัดไปยัง %1$s</string>
+    <string name="shortcuts_list_failed_export">ส่งออกทางลัดไม่สำเร็จ</string>
+    <string name="shortcuts_export_all">ส่งออกทั้งหมด</string>
+    <string name="shortcuts_export_to_frontend">ส่งออกไปยังฟรอนต์เอนด์</string>
+    <string name="shortcuts_export_all_done">ส่งออก %1$d เกมไปยัง %2$s</string>
+    <string name="shortcuts_export_all_none">ไม่มีเกมให้ส่งออก</string>
+    <string name="shortcuts_list_added">เพิ่มทางลัดสำเร็จ</string>
+    <string name="shortcuts_list_readded_existing">เพิ่มทางลัดที่มีอยู่แล้วอีกครั้ง</string>
+    <string name="shortcuts_list_failed_add">เพิ่มทางลัดไม่สำเร็จ</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">อาร์กิวเมนต์การเรียกใช้</string>
+    <string name="shortcuts_properties_target_path">เส้นทางเป้าหมาย</string>
+    <string name="shortcuts_properties_disable_xinput">ปิดใช้งาน Xinput (สำหรับการควบคุมด้วยเมาส์/คีย์บอร์ดโดยเฉพาะ)</string>
+    <string name="num_controllers">จำนวนคอนโทรลเลอร์</string>
+    <string name="shortcuts_properties_exclusive_input">อินพุตเฉพาะ</string>
+    <string name="shortcuts_properties_custom_game_settings">การตั้งค่าเกมแบบกำหนดเอง</string>
+    <string name="shortcuts_properties_use_legacy_launcher">ใช้ตัวเรียกใช้แบบเก่า</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">การจำลอง Steam แบบเก่า: รันเกมผ่านตัวเรียกใช้ ColdClient และถอด SteamStub DRM ออกจากไฟล์ exe ใช้เฉพาะกับเกมเก่าที่ไม่ทำงานกับ Steam Launcher</string>
+    <string name="shortcuts_properties_runtime_patcher">ตัวแพตช์ DRM ขณะรัน</string>
+    <string name="shortcuts_properties_runtime_patcher_description">แทรก DLL ตัวแพตช์ DRM ขณะเปิดใช้งาน ลด FPS — ใช้เฉพาะเมื่อตัวเรียกใช้แบบเก่าเพียงอย่างเดียวล้มเหลว</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">ไคลเอนต์ Steam จริงของ WinNative</string>
+    <string name="steam_section_emulator">ตัวจำลอง Steam แบบเก่า</string>
+    <string name="shortcuts_properties_use_steam_input">ใช้ Steam Input</string>
+    <string name="shortcuts_properties_steam_offline_mode">โหมดออฟไลน์ Steam</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">ทำให้ไคลเอนต์ Steam ที่จำลองรายงานว่าออฟไลน์ เพื่อให้เกมไม่พยายามเชื่อมต่อออนไลน์ ใช้กับเกมที่ค้างเมื่อตรวจสอบเครือข่ายของ Steam</string>
+    <string name="shortcuts_properties_reset">รีเซ็ตคุณสมบัติ</string>
+    <string name="shortcuts_properties_updated_at">อัปเดตทางลัดเมื่อ %1$s</string>
+    <string name="shortcuts_properties_properties_reset">รีเซ็ตคุณสมบัติสำเร็จ</string>
+    <string name="shortcuts_properties_reset_per_game">รีเซ็ตการตั้งค่าเฉพาะเกม</string>
+    <string name="shortcuts_properties_reset_per_game_message">รีเซ็ตเกมนี้ให้ใช้ค่าเริ่มต้นของคอนเทนเนอร์ที่เลือกหรือไม่?</string>
+    <string name="shortcuts_properties_per_game_reset">รีเซ็ตการตั้งค่าเฉพาะเกมเป็นค่าเริ่มต้นของคอนเทนเนอร์ที่เลือกแล้ว</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">ไม่ได้เลือกองค์ประกอบการควบคุม</string>
+    <string name="input_controls_editor_scale">สเกล</string>
+    <string name="input_controls_editor_shape">รูปทรง</string>
+    <string name="input_controls_editor_type">ประเภท</string>
+    <string name="input_controls_editor_binding">การผูกปุ่ม</string>
+    <string name="binding_primary">การผูกปุ่มหลัก</string>
+    <string name="binding_secondary">การผูกปุ่มรอง</string>
+    <string name="binding_third">การผูกปุ่มที่สาม</string>
+    <string name="binding_fourth">การผูกปุ่มที่สี่</string>
+    <string name="input_controls_editor_binding_up">การผูกปุ่มขึ้น</string>
+    <string name="input_controls_editor_binding_right">การผูกปุ่มขวา</string>
+    <string name="input_controls_editor_binding_down">การผูกปุ่มลง</string>
+    <string name="input_controls_editor_binding_left">การผูกปุ่มซ้าย</string>
+    <string name="input_controls_editor_overlay_opacity">ความทึบของโอเวอร์เลย์</string>
+    <string name="input_controls_editor_opacity">ความทึบ</string>
+    <string name="input_controls_editor_radial_menu">เมนูแบบวงกลม</string>
+    <string name="input_controls_editor_radial_menu_options">ตัวเลือกเมนูแบบวงกลม</string>
+    <string name="input_controls_editor_number_of_bindings">จำนวนการผูกปุ่ม</string>
+    <string name="input_controls_editor_select_profile">เลือกโปรไฟล์</string>
+    <string name="input_controls_select_style">เลือกสไตล์</string>
+    <string name="input_controls_style_original">ต้นฉบับ</string>
+    <string name="input_controls_style_gamehub">กระจก</string>
+    <string name="input_controls_style_slate">สเลท</string>
+    <string name="input_controls_style_halo">ฮาโล</string>
+    <string name="input_controls_style_glint">ประกาย</string>
+    <string name="input_controls_style_shadow">เงา</string>
+    <string name="input_controls_style_reticle">เรติเคิล</string>
+    <string name="input_controls_style_neon">นีออน</string>
+    <string name="input_controls_style_lumina">ลูมินา</string>
+    <string name="input_controls_accent_theme">ธีมสี</string>
+    <string name="input_controls_edit_duplicating_builtin">โปรไฟล์ในตัว — สร้างสำเนาที่คุณสามารถแก้ไขได้แล้ว</string>
+    <string name="input_controls_editor_profile_name">ชื่อโปรไฟล์</string>
+    <string name="input_controls_editor_no_profile_selected">ไม่ได้เลือกโปรไฟล์</string>
+    <string name="input_controls_editor_no_profile_found">ไม่พบโปรไฟล์</string>
+    <string name="input_controls_editor_tap_to_switch">แตะเพื่อสลับ</string>
+    <string name="input_controls_editor_confirm_remove_profile">คุณต้องการลบโปรไฟล์นี้หรือไม่?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">คุณต้องการทำสำเนาโปรไฟล์นี้หรือไม่?</string>
+    <string name="input_controls_editor_confirm_reset_profile">รีเซ็ตโปรไฟล์นี้เป็นเลย์เอาต์ต้นฉบับหรือไม่? การเปลี่ยนแปลงที่คุณทำจะสูญหาย</string>
+    <string name="input_controls_editor_profile_reset">รีเซ็ตโปรไฟล์เป็นเลย์เอาต์ต้นฉบับแล้ว</string>
+    <string name="input_controls_editor_reset_unavailable">ไม่มีสแนปช็อตต้นฉบับสำหรับโปรไฟล์นี้</string>
+    <string name="input_controls_editor_title">ตัวแก้ไขการควบคุม</string>
+    <string name="input_controls_editor_toggle_switch">สวิตช์เปิด/ปิด</string>
+    <string name="input_controls_editor_swipeable">ปัดได้</string>
+    <string name="input_controls_editor_profile_exported_to">ส่งออกโปรไฟล์ไปยัง</string>
+    <string name="input_controls_editor_unable_to_import">ไม่สามารถนำเข้าโปรไฟล์</string>
+    <string name="input_controls_editor_import_profile">นำเข้าโปรไฟล์</string>
+    <string name="input_controls_editor_download_profile">ดาวน์โหลดโปรไฟล์</string>
+    <string name="input_controls_editor_export_profile">ส่งออกโปรไฟล์</string>
+    <string name="input_controls_editor_range">ช่วง</string>
+    <string name="input_controls_editor_confirm_download_profiles">คุณต้องการดาวน์โหลดโปรไฟล์ที่เลือกหรือไม่?</string>
+    <string name="input_controls_editor_unable_to_load_list">ไม่สามารถโหลดรายการโปรไฟล์</string>
+    <string name="input_controls_editor_osc_transparency">ความโปร่งใสของปุ่มควบคุมบนหน้าจอ</string>
+    <string name="input_controls_editor_osc_transparency_description">ปรับความโปร่งใสของปุ่มควบคุมบนหน้าจอ</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">ขนาดหน้าจอ</string>
+    <string name="container_config_new_env_var">ตัวแปรสภาพแวดล้อมใหม่</string>
+    <string name="container_config_env_vars">ตัวแปรสภาพแวดล้อม</string>
+    <string name="container_config_processor_affinity">ความสัมพันธ์ของโปรเซสเซอร์</string>
+    <string name="container_config_processor_affinity_32bit">ความสัมพันธ์ของโปรเซสเซอร์ (แอป 32-bit)</string>
+    <string name="container_config_audio_driver">ไดรเวอร์เสียง</string>
+    <string name="container_config_win_components">คอมโพเนนต์ Win</string>
+    <string name="container_config_drives">ไดรฟ์</string>
+    <string name="container_config_arch">สถาปัตยกรรม</string>
+    <string name="container_config_storage_info">ข้อมูลพื้นที่จัดเก็บ</string>
+    <string name="container_config_drive_c">ไดรฟ์ C:</string>
+    <string name="container_config_cache">แคช</string>
+    <string name="container_config_total">รวม</string>
+    <string name="container_config_clear_cache">ล้างแคช</string>
+    <string name="container_config_estimated_used_space">พื้นที่ที่ใช้โดยประมาณ</string>
+    <string name="settings_containers_error_saving_wallpaper">เกิดข้อผิดพลาดในการบันทึกวอลเปเปอร์</string>
+    <string name="container_config_directinput_mapper_type">ประเภทตัวแมป DirectInput</string>
+    <string name="container_config_title">การกำหนดค่า</string>
+    <string name="container_config_startup_selection">การเลือกเมื่อเริ่มต้น</string>
+    <string name="container_config_glibc_exp_edition">อ้างอิงจาก</string>
+    <string name="container_config_refresh_rate_default_global">ค่าเริ่มต้น (ส่วนกลาง)</string>
+    <string name="container_config_enable_dinput">เปิดใช้งาน DInput สำหรับเกมใน Wine</string>
+    <string name="container_config_enable_xinput">เปิดใช้งาน XInput สำหรับเกมใน Wine</string>
+    <string name="container_config_dinput_legacy">แบบเก่า (เกมแพดรุ่นเก่า)</string>
+    <string name="container_config_dinput_modern">แบบใหม่ (คล้าย Xinput)</string>
+    <string name="container_config_help_xinput">
+        หากเกมของคุณใช้ &lt;i&gt;&lt;b&gt;XInput API&lt;/b&gt;&lt;/i&gt; สำหรับการรองรับคอนโทรลเลอร์เกม โปรดเปิดใช้งานตัวเลือกนี้&lt;br/&gt;&lt;br/&gt;
+        ตัวเลือกนี้จะมีผลกับคอนโทรลเลอร์เกมทั้งแบบ &lt;i&gt;&lt;b&gt;เสมือน&lt;/b&gt;&lt;/i&gt; (จาก Input Controls) และแบบ &lt;i&gt;&lt;b&gt;กายภาพ&lt;/b&gt;&lt;/i&gt;
+    </string>
+    <string name="container_config_help_dinput">
+        หากเกมของคุณใช้ &lt;i&gt;&lt;b&gt;DInput API&lt;/b&gt;&lt;/i&gt; สำหรับการรองรับคอนโทรลเลอร์เกม โปรดเปิดใช้งานตัวเลือกนี้&lt;br/&gt;&lt;br/&gt;
+        ตัวเลือกนี้จะมีผลกับคอนโทรลเลอร์เกมทั้งแบบ &lt;i&gt;&lt;b&gt;เสมือน&lt;/b&gt;&lt;/i&gt; (จาก Input Controls) และแบบ &lt;i&gt;&lt;b&gt;กายภาพ&lt;/b&gt;&lt;/i&gt;
+    </string>
+    <string name="container_config_xinput_dinput_warning">บางเกมอาจรองรับทั้งสอง API การเปิดใช้งานทั้ง XInput และ DInput พร้อมกันในเกมเหล่านั้นอาจทำให้เกิดปัญหาการควบคุม ดังที่พบในเกมอย่าง The Binding of Isaac และซีรีส์ Resident Evil</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">ตัวจำลอง 32bit</string>
+    <string name="container_config_emulator_wine_hint">ตัวจำลองถูกกำหนดโดยเวอร์ชัน wine ARM64EC ใช้ FEXCore, x86_64 ใช้ Box64</string>
+    <string name="container_config_label">การกำหนดค่า</string>
+    <string name="container_config_restart_required">รีสตาร์ทคอนเทนเนอร์เพื่อให้การเปลี่ยนแปลงมีผล</string>
+    <string name="container_config_renderer">ตัวเรนเดอร์</string>
+    <string name="container_config_variables">ตัวแปร</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">อินพุต</string>
+    <string name="container_config_tab">การตั้งค่า</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">ตัวจำลอง 64bit</string>
+    <string name="container_config_emulator_section">ตัวจำลอง</string>
+    <string name="container_config_sdl2_compatibility">เปิดใช้งานความเข้ากันได้ SDL2</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">การกำหนดค่า Wine</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">ชื่อ GPU</string>
+    <string name="container_wine_offscreen_rendering_mode">โหมดการเรนเดอร์นอกหน้าจอ</string>
+    <string name="container_wine_strict_shader_math">การคำนวณเชดเดอร์แบบเข้มงวด</string>
+    <string name="container_wine_video_memory_size">ขนาดหน่วยความจำวิดีโอ</string>
+    <string name="container_wine_dxwrapper">ตัวห่อหุ้ม DX</string>
+    <string name="container_wine_mouse_warp_override">การแทนที่ Mouse Warp</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">เวอร์ชัน DXVK</string>
+    <string name="container_wine_dxvk_config_title">การกำหนดค่า DXVK</string>
+    <string name="container_wine_wined3d_config_title">การกำหนดค่า WineD3D</string>
+    <string name="container_wine_vkd3d_version">เวอร์ชัน VKD3D</string>
+    <string name="container_wine_version">เวอร์ชัน Wine</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; เป็นเลเยอร์การแปลสำหรับ DirectX 1-11 เป็น OpenGL&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; เป็นเลเยอร์การแปลสำหรับ Direct3D 9-11 เป็น Vulkan&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; เป็นเลเยอร์การแปลสำหรับ Direct3D 12 API เป็น Vulkan&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; เป็นการนำ DirectDraw มาใช้เพื่อความเข้ากันได้ที่ดีขึ้นกับเกมคลาสสิก
+    </string>
+    <string name="container_wine_enabled_async">เปิดใช้งาน Async</string>
+    <string name="container_wine_enabled_async_cache">เปิดใช้งาน Async Cache</string>
+    <string name="container_wine_vkd3d_feature_level">ระดับฟีเจอร์ VKD3D</string>
+    <string name="container_wine_ddraw_wrapper">ตัวห่อหุ้ม DDraw</string>
+    <string name="container_wine_error_not_installed">แพ็กเกจ Wine/Proton \'%1$s\' ไม่ได้ติดตั้งและไม่สามารถดาวน์โหลดได้</string>
+    <string name="container_no_wine_installed">ไม่มี Wine หรือ Proton ที่ติดตั้ง โปรดติดตั้งก่อน</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">เอฟเฟกต์พื้นผิว</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">พรีเซ็ต Box64</string>
+    <string name="container_box64_version">เวอร์ชัน Box64</string>
+    <string name="container_box64_stability">ความเสถียร</string>
+    <string name="container_box64_compatibility">ความเข้ากันได้</string>
+    <string name="container_box64_intermediate">ระดับกลาง</string>
+    <string name="container_box64_performance">ประสิทธิภาพ</string>
+    <string name="container_fexcore_performance_tso">ประสิทธิภาพ TSO</string>
+    <string name="container_fexcore_extreme">สุดขีด</string>
+    <string name="container_fexcore_extreme_tso">สุดขีด TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">เปิดหรือปิดใช้งานตัวรีคอมไพล์แบบไดนามิกของ Box64</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        การจัดการแฟล็กบน opcode CALL/RET&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ปฏิบัติต่อ CALL/RET เสมือนไม่ต้องใช้แฟล็ก (เร็วกว่า ไม่เสถียร)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : RET ส่วนใหญ่ต้องใช้แฟล็ก CALL ส่วนใหญ่ไม่ต้อง&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : CALL/RET ทั้งหมดต้องใช้แฟล็ก (ช้ากว่า)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">การสร้าง -NAN แบบเดียวกับบน x86</string>
+    <string name="box64_env_var_help__dynarec_fastround">การสร้างการปัดเศษ x86 ที่แม่นยำ</string>
+    <string name="box64_env_var_help__dynarec_x87double">การใช้ Float/Double สำหรับการจำลอง x87</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec สร้าง BigBlock&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ไม่พยายามสร้างบล็อกให้ใหญ่ที่สุดเท่าที่จะทำได้&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : สร้างบล็อก Dynarec ให้ใหญ่ที่สุดเท่าที่จะทำได้&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : สร้างบล็อก Dynarec ให้ใหญ่ขึ้น (ดำเนินการต่อเมื่อบล็อกซ้อนทับ แต่เฉพาะบล็อกในหน่วยความจำ elf)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : สร้างบล็อก Dynarec ให้ใหญ่ขึ้น (ดำเนินการต่อเมื่อบล็อกซ้อนทับ สำหรับหน่วยความจำทุกประเภท)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        การจำลองโมเดล Strong Memory&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ไม่ทำอะไรเป็นพิเศษ&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : เปิดใช้งาน Memory Barrier บางส่วนเมื่อเขียนลงหน่วยความจำ (บน opcode MOV บางตัว)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : ทั้งหมดของ 1 บวกกับ Memory Barrier ในทุกการเขียนลงหน่วยความจำโดยใช้ MOV&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : ทั้งหมดของ 2 บวกกับ Memory Barrier เมื่ออ่านจากหน่วยความจำและบน opcode SSE/SSE2 บางตัว&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : เลียนแบบ x86 TSO คล้ายกับ QEMU
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">กำหนดค่า forward สูงสุดที่อนุญาตเมื่อสร้างบล็อก</string>
+    <string name="box64_env_var_help__dynarec_callret">การปรับแต่ง opcode CALL/RET ให้เหมาะสม</string>
+    <string name="box64_env_var_help__dynarec_sep">เพิ่มจุดเข้าใช้งานรองเพื่อปรับแต่ง CALL/RET ให้เหมาะสมเมื่อเปิดใช้งาน CALLRET</string>
+    <string name="box64_env_var_help__dynarec_wait">กำหนดว่า Dynarec จะรอให้ FillBlock พร้อมหรือไม่</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        ปรับแต่ง memory barrier เพื่อลดผลกระทบด้านประสิทธิภาพจากการจำลอง strong memory&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ใช้ barrier ที่ปลอดภัยแบบปกติ&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ใช้ weak barrier เพื่อเพิ่มประสิทธิภาพเล็กน้อย&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : ใช้ weak barrier และปิดใช้งาน last write barrier เพิ่มเติม</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        สร้างเฉพาะ aligned atomics (ขณะนี้ใช้ได้เฉพาะบน Arm64)&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : สร้างโค้ดจัดการ unaligned atomics&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : สร้างเฉพาะ aligned atomics ซึ่งเร็วกว่าและขนาดโค้ดเล็กกว่า แต่จะทำให้เกิด SIGBUS สำหรับ opcode ที่มี prefix LOCK ที่ทำงานบนที่อยู่ข้อมูลแบบ aligned</string>
+    <string name="box64_env_var_help__dynarec_df">
+        เปิดหรือปิดการใช้ deferred flags&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ปิดการใช้ deferred flags&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : เปิดการใช้ deferred flags</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        อนุญาตให้รันบล็อกที่ไม่ได้รับการป้องกันและอาจมีข้อมูลไม่สะอาดต่อไปได้&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ไม่อนุญาตให้รันบล็อกที่ไม่ได้รับการป้องกันและอาจมีข้อมูลไม่สะอาดต่อไป&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : อนุญาตให้รัน dynablock ที่เขียนข้อมูลในหน้าเดียวกับโค้ดต่อไปได้ อาจทำให้บางเกมโหลดเร็วขึ้นแต่ก็อาจทำให้เกิดการแครชที่ไม่คาดคิดได้เช่นกัน&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : เมื่อตรวจพบ HotPage จะทำเครื่องหมายหน้านั้นเป็น NEVERCLEAN ด้วย ดังนั้นจะไม่ถูกป้องกันการเขียนแต่บล็อกที่สร้างจากหน้านั้นจะถูกทดสอบเสมอ วิธีนี้อาจเร็วกว่า (แต่บางกรณีของ SMC อาจไม่ถูกดักจับ)</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        เปิดหรือปิดการใช้ native flags&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ไม่ใช้ native flags&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ใช้ native flags เมื่อทำได้</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        เปิดการจำลอง x86 PAUSE อาจช่วยประสิทธิภาพของ spinlock&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : เพิกเฉยคำสั่ง x86 PAUSE&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : ใช้ YIELD เพื่อจำลองคำสั่ง x86 PAUSE&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : ใช้ WFI เพื่อจำลองคำสั่ง x86 PAUSE&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : ใช้ SEVL+WFE เพื่อจำลองคำสั่ง x86 PAUSE
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">ลดข้อมูลเมตาของบล็อก dynarec เพื่อประหยัดหน่วยความจำ โดยแลกกับความเข้ากันได้</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">ใช้ข้อมูลเมตา volatile ของ PE เพื่อชี้นำการจำลองหน่วยความจำแบบ strong สำหรับเกม Windows 64 บิต</string>
+    <string name="box64_env_var_help__dynacache">ควบคุมการแคชบล็อก dynarec ที่สร้างขึ้นระหว่างการรันเพื่อเร่งการเริ่มต้น</string>
+    <string name="box64_env_var_help__avx">
+        เปิดเผยความสามารถ AVX ให้กับ guest&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : ปิดส่วนขยาย AVX&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : เปิดส่วนขยาย AVX, BMI1, F16C และ VAES&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : ทั้งหมดของ 1 พร้อมเปิด AVX2, BMI2, FMA, ADX, VPCLMULQDQ และ RDRAND&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">เปิดเผยความสามารถ CPU ของ AES ให้กับ guest</string>
+    <string name="box64_env_var_help__pclmulqdq">เปิดเผยความสามารถ CPU ของ PCLMULQDQ ให้กับ guest</string>
+    <string name="box64_env_var_help__shaext">เปิดเผยความสามารถ CPU ของส่วนขยาย SHA ให้กับ guest</string>
+    <string name="box64_env_var_help__sse42">เปิดเผยความสามารถ CPU ของ SSE4.2 ให้กับ guest</string>
+    <string name="box64_env_var_help__sse_flushto0">ควบคุมพฤติกรรม flush-to-zero ของ SSE และการติดตามแฟลกข้อยกเว้น</string>
+    <string name="box64_env_var_help__x87_no80bits">ใช้ double precision 64 บิตแทน long double 80 บิตสำหรับ x87</string>
+    <string name="box64_env_var_help__cputype">เลือกรุ่น CPU ของ Intel หรือ AMD ที่เปิดเผยให้กับ guest</string>
+    <string name="box64_env_var_help__maxcpu">จำนวน CPU สูงสุดที่ Box64 แสดงให้กับโปรแกรม</string>
+    <string name="box64_env_var_help__unityplayer">ตรวจจับ UnityPlayer และทำเครื่องหมายแอปเป็นเกม Unity</string>
+    <string name="box64_env_var_help__unity">ทำเครื่องหมายแอปเป็นเกม Unity และเปิดการจัดการความเข้ากันได้เฉพาะสำหรับ Unity</string>
+    <string name="box64_env_var_help__mmap32">บังคับให้การจัดสรรหน่วยความจำทุกครั้งอยู่ในพื้นที่ที่อยู่ 32 บิต</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">เปิดใช้ TSO IR ops (จำเป็นสำหรับแอปแบบมัลติเธรด)</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">ทำให้ vector load/store เป็นแบบ atomic เมื่อเปิด TSO</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">ใช้ half-barrier atomics สำหรับ load/store ที่ไม่จัดแนวภายใต้ TSO</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">ทำให้ REP MOVS / REP STOS เป็นแบบ atomic ภายใต้ TSO</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">ใช้ล็อกแบบเข้มงวดทั้งโปรเซสสำหรับการเข้าถึง atomic ที่ไม่จัดแนวแบบแยกส่วน</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">แพตช์ย้อนหลัง atomics ที่ไม่จัดแนวซึ่งเคอร์เนลจัดการ เพื่อลดการสลับบริบทของเคอร์เนล</string>
+    <string name="fexcore_env_var_help__multiblock">เปิดใช้การคอมไพล์โค้ดแบบ multiblock อาจทำให้การคอมไพล์ JIT นานขึ้นและกระตุก</string>
+    <string name="fexcore_env_var_help__maxinst">จำนวนคำสั่งสูงสุดที่เก็บในบล็อกที่คอมไพล์แล้ว</string>
+    <string name="fexcore_env_var_help__hostfeatures">ควบคุมการบังคับใช้คุณสมบัติ CPU</string>
+    <string name="fexcore_env_var_help__smalltscscale">ปรับสเกล TSC บนระบบที่มีความถี่ต่ำ</string>
+    <string name="fexcore_env_var_help__hidehybrid">ซ่อนเลย์เอาต์คอร์ CPU แบบไฮบริดจาก guest</string>
+    <string name="fexcore_env_var_help__smc_checks">ตรวจสอบการแก้ไขโค้ดก่อนการเรียกใช้งาน</string>
+    <string name="fexcore_env_var_help__volatilemetadata">ใช้ข้อมูลเมตา volatile จากไฟล์ PE สำหรับ TSO เมื่อมี</string>
+    <string name="fexcore_env_var_help__monohacks">แฮ็ก SMC + JIT block พิเศษสำหรับการตรวจจับ Mono</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">ซ่อนบิต hypervisor ของ CPUID (มีประโยชน์สำหรับแอปที่แครชเมื่อมีบิตนี้)</string>
+    <string name="fexcore_env_var_help__disablel2cache">ปิดการค้นหาแคช L2 ของ FEXCore JIT ประหยัดหน่วยความจำแต่ทำให้เกิดอาการกระตุก</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">เปลี่ยนแคช L1 ของ FEXCore JIT ให้ปรับขนาดแบบไดนามิก ประหยัดหน่วยความจำแต่ทำให้เกิดอาการกระตุก</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">เกณฑ์การค้นหาต่อวินาทีสำหรับการขยายแคช L1 แบบไดนามิก</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">เกณฑ์การค้นหาต่อวินาทีสำหรับการลดขนาดแคช L1 แบบไดนามิก</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">จำลองการคำนวณทศนิยม X87 โดยใช้ความแม่นยำ 64 บิต ซึ่งลดความแม่นยำของการจำลองและอาจทำให้เกิดข้อผิดพลาดในการเรนเดอร์</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">พรีเซ็ต FEXCore</string>
+    <string name="container_fexcore_version">เวอร์ชัน FEXCore</string>
+    <string name="use_unix_libs">ใช้ UnixLibs</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">ไดรเวอร์กราฟิก</string>
+    <string name="container_zink_mode">โหมด Zink</string>
+    <string name="container_graphics_configuration">การกำหนดค่าไดรเวอร์กราฟิก</string>
+    <string name="container_graphics_version">เวอร์ชันไดรเวอร์กราฟิก</string>
+    <string name="container_graphics_available_extensions">ส่วนขยายที่ใช้ได้</string>
+    <string name="container_graphics_extensions_enabled_summary">เปิดใช้ %1$d / %2$d</string>
+    <string name="container_graphics_max_device_memory">หน่วยความจำอุปกรณ์สูงสุด</string>
+    <string name="container_graphics_sync_frame">ซิงค์ทุกเฟรม</string>
+    <string name="container_graphics_disable_present_wait">ปิด KHR_present_wait</string>
+    <string name="container_graphics_present_modes">โหมด Present</string>
+    <string name="container_graphics_compositor_present_mode">การซิงค์การแสดงผลของ Vulkan</string>
+    <string name="container_graphics_resource_type">ประเภททรัพยากรหน่วยความจำ</string>
+    <string name="container_graphics_vulkan_version">เวอร์ชัน Vulkan</string>
+    <string name="container_graphics_bcn_emulation">การจำลอง BCn</string>
+    <string name="container_graphics_bcn_emulation_type">ประเภทการจำลอง BCn</string>
+    <string name="container_graphics_bcn_emulation_cache">แคชการจำลอง BCn</string>
+    <string name="container_graphics_transcoder">ตัวถอดรหัส BCn</string>
+    <string name="container_graphics_quality">คุณภาพ BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">คุณต้องการทำสำเนาพรีเซ็ตนี้หรือไม่?</string>
+    <string name="container_presets_confirm_remove">คุณต้องการลบพรีเซ็ตนี้หรือไม่?</string>
+    <string name="container_presets_title">พรีเซ็ต</string>
+    <string name="container_presets_preset">พรีเซ็ต</string>
+    <string name="container_presets_new">พรีเซ็ตใหม่</string>
+    <string name="container_presets_rename">เปลี่ยนชื่อพรีเซ็ต</string>
+    <string name="container_presets_import">นำเข้าพรีเซ็ต</string>
+    <string name="container_presets_custom">กำหนดเอง</string>
+    <string name="container_presets_built_in">ค่าเริ่มต้น</string>
+    <string name="container_presets_changes_auto_saved">การเปลี่ยนแปลงจะบันทึกอัตโนมัติขณะแก้ไขพรีเซ็ตแบบกำหนดเองนี้</string>
+    <string name="container_presets_cannot_rename">ไม่สามารถเปลี่ยนชื่อพรีเซ็ตในตัวได้</string>
+    <string name="container_presets_unable_to_import">ไม่สามารถนำเข้าพรีเซ็ตได้</string>
+    <string name="container_presets_no_description">ไม่มีคำอธิบาย</string>
+    <string name="container_presets_cannot_remove">คุณไม่สามารถลบพรีเซ็ตนี้ได้</string>
+    <string name="container_presets_cannot_export">ไม่สามารถส่งออกพรีเซ็ตนี้ได้</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">จำลองหน้าจอสัมผัส</string>
+    <string name="session_xserver_preferences_button_text">   การตั้งค่า   </string>
+    <string name="session_xserver_extra_keys_config_desc">ที่นี่คุณสามารถตั้งค่าตัวแปร extra-keys ได้เหมือนในแอป Termux (อ่าน <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">ที่นี่</a>) และอื่นๆ \n
+เช่น <b>META</b> สำหรับ <i>ปุ่ม META</i>, \n
+<b>KEYBOARD</b> สำหรับ <i>ปุ่มสลับคีย์บอร์ดซอฟต์แวร์</i>, \n
+<b>PREFERENCES</b> สำหรับ <i>ปุ่มเปิดการตั้งค่า</i>, \n
+<b>MOUSE_HELPER</b> สำหรับ <i>ปุ่มสลับตัวช่วยเมาส์</i>, \n
+<b>STYLUS_HELPER</b> สำหรับ <i>ปุ่มสลับโอเวอร์เลย์แทนที่การคลิกด้วยสไตลัส</i>, \n
+<b>EXIT</b> สำหรับ <i>ปุ่มออกจากแอปพลิเคชัน</i></string>
+    <string name="session_xserver_pref_main">การตั้งค่า</string>
+    <string name="session_xserver_pref_output">เอาต์พุต</string>
+    <string name="session_xserver_pref_pointer">ตัวชี้</string>
+    <string name="session_xserver_pref_kbd">คีย์บอร์ด</string>
+    <string name="session_xserver_pref_other">อื่นๆ</string>
+    <string name="session_xserver_pref_version">เวอร์ชัน</string>
+    <string name="session_xserver_notification_description">ข้อความ WinNative XServer</string>
+    <string name="session_xserver_notification_content">WinNative กำลังทำงานอยู่ อย่าปิดหรือปัดการแจ้งเตือนนี้</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">คีย์บอร์ด</string>
+    <string name="session_drawer_fps_monitor">มอนิเตอร์ FPS</string>
+    <string name="session_drawer_fps_monitor_subtitle">แสดงสถิติประสิทธิภาพแบบเรียลไทม์</string>
+    <string name="session_drawer_dual_series_battery">แบตเตอรี่แบบสองชุด</string>
+    <string name="session_drawer_hud_frametime_numeric">แสดง Frametime เป็นตัวเลข</string>
+    <string name="session_drawer_toggle_fullscreen">สลับเต็มหน้าจอ</string>
+    <string name="session_drawer_refactor_size">ปรับขนาดใหม่</string>
+    <string name="session_drawer_show_touchscreen_controls">แสดงปุ่มควบคุมหน้าจอสัมผัส</string>
+    <string name="session_drawer_magnifier">แว่นขยาย</string>
+    <string name="session_drawer_logs">บันทึก</string>
+    <string name="session_drawer_pip_mode">โหมด PiP</string>
+    <string name="session_drawer_toggle_relative_mouse">สลับการเคลื่อนเมาส์แบบสัมพัทธ์</string>
+    <string name="session_drawer_toggle_mouse">สลับเมาส์</string>
+    <string name="session_drawer_pause_resume">หยุดชั่วคราว/ทำต่อ</string>
+    <string name="session_drawer_relative_mouse_movement">การเคลื่อนเมาส์แบบสัมพัทธ์</string>
+    <string name="session_drawer_mouse_input">อินพุตเมาส์</string>
+    <string name="session_drawer_touch">สัมผัส</string>
+    <string name="session_drawer_touch_trackpad">แทร็คแพด</string>
+    <string name="session_drawer_touch_touchscreen">โหมดหน้าจอสัมผัส</string>
+    <string name="session_drawer_touch_map_right_stick">แมปกับสติ๊กขวา</string>
+    <string name="session_drawer_rts_gestures">ท่าทาง RTS</string>
+    <string name="session_drawer_rts_gestures_edit">แก้ไข</string>
+    <string name="session_drawer_right_stick_sensitivity">ความไวสติ๊กขวา</string>
+    <string name="session_rts_action">การทำงาน</string>
+    <string name="session_rts_behavior">พฤติกรรม</string>
+    <string name="session_rts_tap1">แตะ 1 นิ้ว</string>
+    <string name="session_rts_tap2">แตะ 2 นิ้ว</string>
+    <string name="session_rts_tap3">แตะ 3 นิ้ว</string>
+    <string name="session_rts_tap4">แตะ 4 นิ้ว</string>
+    <string name="session_rts_double_tap">แตะสองครั้ง (ดับเบิลคลิกซ้าย)</string>
+    <string name="session_rts_long_press">กดค้าง</string>
+    <string name="session_rts_hold2">กดค้าง 2 นิ้ว</string>
+    <string name="session_rts_hold3">กดค้าง 3 นิ้ว</string>
+    <string name="session_rts_hold4">กดค้าง 4 นิ้ว</string>
+    <string name="session_rts_swipe3">ปัด 3 นิ้ว</string>
+    <string name="session_rts_swipe4">ปัด 4 นิ้ว</string>
+    <string name="session_rts_up">ขึ้น</string>
+    <string name="session_rts_down">ลง</string>
+    <string name="session_rts_left">ซ้าย</string>
+    <string name="session_rts_right">ขวา</string>
+    <string name="session_rts_pan">เลื่อน 2 นิ้ว</string>
+    <string name="session_rts_pan1">เลื่อน 1 นิ้ว</string>
+    <string name="session_rts_zoom">บีบซูม</string>
+    <string name="session_rts_drag">ลาก 1 นิ้ว</string>
+    <string name="session_rts_drag2">ลาก 2 นิ้ว</string>
+    <string name="session_rts_long_press_delay">หน่วงเวลากดค้าง (ms)</string>
+    <string name="session_rts_hold_delay">หน่วงเวลาการกดค้าง (ms)</string>
+    <string name="session_rts_swipe_threshold">เกณฑ์การปัด (px)</string>
+    <string name="session_rts_gesture_threshold">เกณฑ์ท่าทาง (px)</string>
+    <string name="session_rts_double_tap_delay">หน่วงเวลาแตะสองครั้ง (ms)</string>
+    <string name="session_rts_drag_threshold">เกณฑ์การลาก (px)</string>
+    <string name="session_rts_pan_threshold">จุดเริ่มเลื่อน/บีบ (px)</string>
+    <string name="common_ui_rename">เปลี่ยนชื่อ</string>
+    <string name="common_ui_new">ใหม่</string>
+    <string name="input_controls_editor_input_profiles_section">โปรไฟล์อินพุต</string>
+    <string name="session_gesture_profile_section">โปรไฟล์ท่าทาง</string>
+    <string name="gesture_profile_new">โปรไฟล์ท่าทางใหม่</string>
+    <string name="gesture_profile_import">นำเข้าโปรไฟล์ท่าทาง</string>
+    <string name="gesture_profile_export">ส่งออกโปรไฟล์ท่าทาง</string>
+    <string name="gesture_profile_none">ไม่มีโปรไฟล์ท่าทาง</string>
+    <string name="session_drawer_screen_effects">เอฟเฟกต์หน้าจอ</string>
+    <string name="session_drawer_screen_effects_subtitle">การอัปสเกลและเอฟเฟกต์สี</string>
+    <string name="session_drawer_super_resolution">Super Resolution</string>
+    <string name="session_drawer_upscaler_mode">ตัวอัปสเกล</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">ความคมของขอบ</string>
+    <string name="session_drawer_vivid">สดใส</string>
+    <string name="session_drawer_vivid_strength">ระดับความสดใส</string>
+    <string name="session_drawer_color_profile">เอฟเฟกต์สี</string>
+    <string name="session_drawer_picture_in_picture">ภาพซ้อนภาพ</string>
+    <string name="session_drawer_exit_subtitle">ปิดเซสชันที่กำลังทำงานอยู่</string>
+    <string name="session_drawer_touchscreen_overlay">โอเวอร์เลย์หน้าจอสัมผัส</string>
+    <string name="session_drawer_resume">ทำต่อ</string>
+    <string name="session_drawer_retry">ลองใหม่</string>
+    <string name="downloads_no_internet">ไม่มีการเชื่อมต่ออินเทอร์เน็ต</string>
+    <string name="session_drawer_pause">หยุดชั่วคราว</string>
+    <string name="session_drawer_wine_processes_paused">โปรเซส Wine ถูกหยุดชั่วคราว</string>
+    <string name="session_drawer_pause_all_wine_processes">หยุดโปรเซส Wine ทั้งหมดชั่วคราว</string>
+    <string name="session_drawer_controls_section">ปุ่มควบคุม</string>
+    <string name="session_drawer_session_section">เซสชัน</string>
+    <string name="session_drawer_header_subtitle">เข้าถึงปุ่มควบคุม โอเวอร์เลย์ และเครื่องมือเซสชันอย่างรวดเร็ว</string>
+    <string name="session_drawer_swipe_hint">ปัดออกเพื่อกลับเข้าสู่เกม</string>
+    <string name="session_drawer_main_menu_title">เมนู</string>
+    <string name="session_drawer_hud_summary">ปรับการมองเห็นโอเวอร์เลย์และจุดข้อมูล</string>
+    <string name="session_drawer_hud_disabled_hint">เปิดโอเวอร์เลย์เพื่อปรับแต่ง</string>
+    <string name="session_drawer_hud_alpha">อัลฟา</string>
+    <string name="session_drawer_hud_background_alpha">อัลฟาพื้นหลัง</string>
+    <string name="session_drawer_hud_background">พื้นหลัง</string>
+    <string name="session_drawer_hud_scale">ขนาด</string>
+    <string name="session_drawer_hud_elements">องค์ประกอบ HUD</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_hud_element_graph">กราฟ</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD สไตล์ Mango</string>
+    <string name="session_drawer_hud_mango_settings">การตั้งค่า Mango HUD</string>
+    <string name="mango_hud_element_gpu_load">โหลด GPU</string>
+    <string name="mango_hud_element_gpu_temp">อุณหภูมิ GPU</string>
+    <string name="mango_hud_element_cpu_load">โหลด CPU</string>
+    <string name="mango_hud_element_cpu_temp">อุณหภูมิ CPU</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">แบตเตอรี่</string>
+    <string name="mango_hud_element_lows" formatted="false">ค่าต่ำสุด 1%</string>
+    <string name="mango_hud_element_graph">กราฟเฟรมไทม์</string>
+    <string name="mango_hud_element_engine">เอนจิน</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">คล็อก CPU</string>
+    <string name="mango_hud_element_gpu_clock">คล็อก GPU</string>
+    <string name="mango_hud_element_cores">รายคอร์</string>
+    <string name="mango_hud_element_network">เครือข่าย</string>
+    <string name="mango_hud_element_swap">สวอป</string>
+    <string name="mango_hud_element_resolution">ความละเอียด</string>
+    <string name="mango_hud_element_wine">เวอร์ชัน Wine</string>
+    <string name="mango_hud_element_duration">เวลาเซสชัน</string>
+    <string name="mango_hud_element_clock">นาฬิกา</string>
+    <string name="mango_hud_element_throttle">สถานะควบคุมความร้อน</string>
+    <string name="mango_hud_group_memory">หน่วยความจำ</string>
+    <string name="mango_hud_group_system">ระบบ</string>
+    <string name="mango_hud_lock">ล็อก HUD</string>
+    <string name="mango_hud_lock_subtitle">ให้การสัมผัสผ่านไปยังปุ่มควบคุมด้านหลัง HUD กด HUD ค้างไว้เพื่อล็อก (5s)</string>
+    <string name="hud_position_menu_title">ย้าย HUD ไปที่</string>
+    <string name="hud_position_top_left">บนซ้าย</string>
+    <string name="hud_position_top_center">บนกลาง</string>
+    <string name="hud_position_top_right">บนขวา</string>
+    <string name="hud_position_left_center">ซ้ายกลาง</string>
+    <string name="hud_position_right_center">ขวากลาง</string>
+    <string name="hud_position_bottom_left">ล่างซ้าย</string>
+    <string name="hud_position_bottom_center">ล่างกลาง</string>
+    <string name="hud_position_bottom_right">ล่างขวา</string>
+    <string name="session_drawer_hud_alpha_input_title">ตั้งค่าอัลฟา</string>
+    <string name="session_drawer_hud_background_alpha_input_title">ตั้งค่าอัลฟาพื้นหลัง</string>
+    <string name="session_drawer_hud_scale_input_title">ตั้งค่าขนาด</string>
+    <string name="session_drawer_hud_input_hint">ป้อนค่าตั้งแต่ %1$d ถึง %2$d ค่าที่เกินขีดจำกัดจะถูกจำกัดไว้</string>
+    <string name="session_drawer_command_center">ศูนย์ควบคุม</string>
+    <string name="session_drawer_command_center_input">อินพุต</string>
+    <string name="session_drawer_command_center_display">การแสดงผล</string>
+    <string name="session_drawer_command_center_system">ระบบ</string>
+    <string name="session_drawer_fps_limiter">ตัวจำกัด FPS</string>
+    <string name="session_drawer_fps_limiter_off">ปิด</string>
+    <string name="session_drawer_color_profile_disabled">ปิดใช้งาน</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">ธรรมชาติ</string>
+    <string name="session_drawer_color_profile_crt">เอฟเฟกต์ CRT</string>
+    <string name="session_drawer_color_profile_toon">การ์ตูน</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">ความสว่าง</string>
+    <string name="session_drawer_contrast">คอนทราสต์</string>
+    <string name="session_drawer_gamma">แกมมา</string>
+    <string name="session_drawer_scale">ขนาด</string>
+    <string name="session_drawer_scale_nearest">Nearest</string>
+    <string name="session_drawer_scale_linear">Linear</string>
+    <string name="session_drawer_scale_bicubic">Bicubic</string>
+    <string name="session_drawer_saturation">ความอิ่มตัวสี</string>
+    <string name="session_drawer_temperature">อุณหภูมิสี</string>
+    <string name="session_drawer_tint">โทนสี</string>
+    <string name="session_drawer_sharpen">ความคม</string>
+    <string name="session_drawer_scanlines">เส้นสแกน</string>
+    <string name="session_drawer_pixelate">พิกเซล</string>
+    <string name="session_drawer_block_size">ขนาดบล็อก</string>
+    <string name="session_drawer_strength">ความแรง</string>
+    <string name="session_drawer_intensity">ความเข้ม</string>
+    <string name="session_drawer_color_blind">ตาบอดสี</string>
+    <string name="session_drawer_color_blind_protan">โปรแทน</string>
+    <string name="session_drawer_color_blind_deutan">ดิวแทน</string>
+    <string name="session_drawer_color_blind_tritan">ไทรแทน</string>
+    <string name="session_drawer_reset_effects">รีเซ็ตเอฟเฟกต์</string>
+    <string name="session_drawer_calibrate_advanced">การปรับเทียบขั้นสูง</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">ไจโร</string>
+    <string name="session_drawer_rail_label_effects">เอฟเฟกต์</string>
+    <string name="session_drawer_rail_label_output">เอาต์พุต</string>
+    <string name="session_drawer_rail_label_apps">เพิ่มเติม</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">ตรวจพบจอแสดงผลภายนอก</string>
+    <string name="display_output_prompt_message">ส่งเกมไปยังจอที่เชื่อมต่อหรือไม่? ปุ่มควบคุมบนหน้าจอและเมนูจะยังอยู่บนโทรศัพท์เครื่องนี้</string>
+    <string name="display_output_prompt_swap">สลับจอแสดงผล</string>
+    <string name="display_output_prompt_mirror">มิเรอร์</string>
+    <string name="display_output_swapped_toast">ย้ายเกมไปยังจอแสดงผลภายนอกแล้ว ปุ่มควบคุมยังอยู่บนโทรศัพท์ของคุณ</string>
+    <string name="display_output_cast_unavailable">การตั้งค่าจอแสดงผลไร้สายใช้ไม่ได้บนอุปกรณ์นี้</string>
+    <string name="display_output_restored_toast">ตัดการเชื่อมต่อจอแสดงผลภายนอกแล้ว — เกมกลับมาที่โทรศัพท์</string>
+    <string name="session_drawer_output_title">เอาต์พุตการแสดงผล</string>
+    <string name="session_drawer_output_subtitle">เกมกำลังแสดงบนจอแสดงผลภายนอก</string>
+    <string name="session_drawer_output_device">จอที่เชื่อมต่อ</string>
+    <string name="session_drawer_output_resolution">ความละเอียด</string>
+    <string name="session_drawer_output_refresh_rate">อัตรารีเฟรช</string>
+    <string name="session_drawer_output_aspect_ratio">อัตราส่วนภาพ</string>
+    <string name="session_drawer_output_aspect_fit">พอดี (อัตราส่วน)</string>
+    <string name="session_drawer_output_aspect_stretch">ยืด (เต็มจอ)</string>
+    <string name="session_drawer_output_aspect_zoom">ซูม (ครอบตัด)</string>
+    <string name="session_drawer_output_return_to_phone">กลับไปที่โทรศัพท์</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">แคสต์ไปยังทีวี</string>
+    <string name="session_drawer_output_cast_body">เชื่อมต่ออะแดปเตอร์ USB-C / HDMI หรือแตะด้านล่างเพื่อเชื่อมต่อจอแสดงผลไร้สาย (Miracast / Wi-Fi Direct) เกมจะแสดงบนทีวีขณะที่ปุ่มควบคุมเหล่านี้ยังอยู่บนโทรศัพท์ของคุณ</string>
+    <string name="session_drawer_output_cast_button">เชื่อมต่อจอแสดงผลไร้สาย</string>
+    <string name="session_drawer_output_cast_note">ทีวีที่รองรับเฉพาะ Chromecast ไม่สามารถแสดงการเล่นเกมสดพร้อมปุ่มควบคุมส่วนตัวได้ — ใช้จอแสดงผลไร้สายหรืออะแดปเตอร์ USB-C/HDMI เพื่อผลลัพธ์ที่ดีที่สุด</string>
+    <string name="session_drawer_output_render_note">โหมดที่จอแสดงผลของคุณรายงานจะสลับเอาต์พุตจริง (อาจดำวูบสั้นๆ ขณะกำลังเริ่มต้นใหม่) ความละเอียดอื่นๆ จะเรนเดอร์ที่ขนาดนั้นและถูกปรับขนาดด้วยฮาร์ดแวร์ให้พอดีกับหน้าจอ — สูงกว่าความละเอียดดั้งเดิมจะคมชัดขึ้น (ซูเปอร์แซมพลิง) ต่ำกว่าจะทำงานเร็วขึ้น</string>
+    <string name="session_drawer_output_scaling_note">โทรศัพท์เครื่องนี้ส่งภาพออกที่ความละเอียดดั้งเดิม %1$s และจะไม่สลับโหมด ตัวเลือกนี้จึงกำหนดความละเอียดการเรนเดอร์ — ถูกปรับขนาดด้วยฮาร์ดแวร์ให้พอดีกับหน้าจอ (สูงกว่าดั้งเดิมจะคมชัดขึ้น ต่ำกว่าจะทำงานเร็วขึ้น)</string>
+    <string name="session_drawer_output_game_mode">โหมดเกม (ความหน่วงต่ำ)</string>
+    <string name="session_drawer_output_game_mode_on">เปิด</string>
+    <string name="session_drawer_output_game_mode_off">ปิด</string>
+    <string name="session_drawer_output_game_mode_note">ร้องขอโหมดความหน่วงต่ำ / โหมดเกมของทีวี (HDMI ALLM) เพื่อลดความหน่วงของอินพุต แสดงเฉพาะเมื่อจอที่เชื่อมต่อรองรับเท่านั้น</string>
+    <string name="session_drawer_output_send_to_display">ส่งเกมไปยังจอแสดงผล</string>
+    <string name="session_drawer_output_to_display">ส่งออกไปยังจอแสดงผลภายนอก</string>
+    <string name="session_drawer_output_send_note">มีจอแสดงผลเชื่อมต่ออยู่ ส่งเกมไปยังจอนั้น — ปุ่มควบคุมและเมนูของคุณยังอยู่บนโทรศัพท์เครื่องนี้ คุณสามารถนำกลับมาที่นี่ได้ทุกเมื่อ</string>
+    <string name="session_drawer_output_display">จอแสดงผล</string>
+    <string name="session_drawer_output_glasses">แว่นตา</string>
+    <string name="session_drawer_output_brightness">ความสว่าง</string>
+    <string name="session_drawer_output_shade">แรเงา (หรี่แสง)</string>
+    <string name="session_drawer_output_3d">3D (แบบเคียงข้าง)</string>
+    <string name="glasses_panel_refresh">อัตรารีเฟรช</string>
+    <string name="glasses_panel_sunblock">กันแดด</string>
+    <string name="session_drawer_output_volume">ระดับเสียง</string>
+    <string name="session_drawer_output_glasses_note">ส่งตรงไปยังแว่นตา Viture ของคุณผ่าน USB</string>
+    <string name="session_drawer_rail_label_keyboard">แป้นพิมพ์</string>
+    <string name="session_drawer_rail_label_input_controls">ปุ่มควบคุม</string>
+    <string name="session_drawer_rail_label_relative_mouse">เมาส์สัมพัทธ์</string>
+    <string name="session_drawer_rail_label_mouse">เมาส์</string>
+    <string name="session_drawer_rail_label_fullscreen">เต็มจอ</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">ซูม</string>
+    <string name="session_drawer_rail_label_task_manager">งาน</string>
+    <string name="session_drawer_rail_label_record">บันทึก</string>
+    <string name="session_drawer_rail_label_logs">ล็อก</string>
+    <string name="session_record_started">เริ่มบันทึกแล้ว</string>
+    <string name="session_record_saved">บันทึกวิดีโอไปยัง WinNative/Recordings แล้ว</string>
+    <string name="session_record_failed">ไม่สามารถเริ่มบันทึกได้</string>
+    <string name="session_record_settings_title">การตั้งค่าการบันทึก</string>
+    <string name="session_record_fps">อัตราเฟรม</string>
+    <string name="session_record_resolution">ความละเอียด</string>
+    <string name="session_record_quality">คุณภาพ</string>
+    <string name="session_record_include_ui">บันทึก UI</string>
+    <string name="session_record_include_ui_subtitle">รวม HUD และปุ่มควบคุมบนหน้าจอ</string>
+    <string name="session_record_now">บันทึกตอนนี้</string>
+    <string name="session_drawer_logs_clear">ล้าง</string>
+    <string name="session_drawer_logs_pause">หยุดชั่วคราว</string>
+    <string name="session_drawer_logs_resume">ทำต่อ</string>
+    <string name="session_drawer_logs_paused_indicator">หยุดชั่วคราว</string>
+    <string name="session_drawer_logs_line_count">%1$d บรรทัด</string>
+    <string name="session_drawer_logs_share">แชร์</string>
+    <string name="session_drawer_logs_share_subject">ล็อกเซสชัน</string>
+    <string name="session_drawer_logs_share_chooser">แชร์ล็อกเซสชัน</string>
+    <string name="session_drawer_logs_share_failed">แชร์ล็อกไม่สำเร็จ</string>
+    <string name="session_drawer_logs_share_empty">ไม่มีบรรทัดล็อกให้แชร์</string>
+    <string name="session_gyroscope_activator">ตัวเปิดใช้งาน</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">คุณต้องการสิ้นสุดกระบวนการนี้หรือไม่?</string>
+    <string name="session_task_title">ตัวจัดการงาน</string>
+    <string name="session_task_process_name">ชื่อกระบวนการ</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">หน่วยความจำ</string>
+    <string name="session_task_end_process">สิ้นสุดกระบวนการ</string>
+    <string name="session_task_set_affinity">ตั้งค่า Affinity</string>
+    <string name="session_task_affinity_title">Affinity ของหน่วยประมวลผล</string>
+    <string name="session_task_affinity_all_cores">ทุกคอร์</string>
+    <string name="session_task_new_task">งานใหม่</string>
+    <string name="session_task_bring_to_front">นำมาไว้ด้านหน้า</string>
+    <string name="session_task_custom_value">ค่ากำหนดเอง</string>
+    <string name="session_task_processes">กระบวนการ</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">การใช้งานต่อคอร์</string>
+    <string name="session_task_core_label">คอร์ %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d คอร์</item>
+        <item quantity="other">%d คอร์</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">การวางแนว</string>
+    <string name="session_display_horizontal">แนวนอน</string>
+    <string name="session_display_vertical">แนวตั้ง</string>
+    <string name="session_display_columns">คอลัมน์</string>
+    <string name="session_display_frame_rate">อัตราเฟรม</string>
+    <string name="session_display_title">จอแสดงผล</string>
+    <string name="session_display_fullscreen_stretched">เปิดเต็มจอ (ยืด)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">ตัวเรนเดอร์:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">ใช้ไป %1$s GB / ทั้งหมด %2$s</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">คุณต้องการนำคอนโทรลเลอร์นี้ออกหรือไม่?</string>
+    <string name="session_gamepad_external_controllers">คอนโทรลเลอร์ภายนอก</string>
+    <string name="session_gamepad_press_any_button">กดปุ่มใดก็ได้บนคอนโทรลเลอร์ของคุณ</string>
+    <string name="session_gamepad_bindings">การผูกปุ่ม</string>
+    <string name="session_gamepad_control_bindings">การผูกปุ่มควบคุม</string>
+    <string name="session_gamepad_game_controller">คอนโทรลเลอร์เกม</string>
+    <string name="session_gamepad_as_button">เป็นปุ่ม</string>
+    <string name="session_gamepad_as_axis">เป็นแกน</string>
+    <string name="session_gamepad_trigger_type">ประเภท</string>
+    <string name="session_gamepad_help_trigger_mode">ขึ้นอยู่กับ&lt;b&gt;คอนโทรลเลอร์จริง&lt;/b&gt;ของคุณ:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;เป็นแกน&lt;/b&gt; — ทริกเกอร์มีช่วงการเคลื่อนไหวแบบเชิงเส้น&lt;br/&gt;&#x2022; &lt;b&gt;เป็นปุ่ม&lt;/b&gt; — ทริกเกอร์ทำงานเหมือนสวิตช์ธรรมดา&lt;br/&gt;&lt;br/&gt;&lt;i&gt;หมายเหตุ: การใช้ \"เป็นปุ่ม\" กับทริกเกอร์เชิงเส้นจะสูญเสียข้อมูลแอนะล็อก&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">ปุ่ม A</string>
+    <string name="session_gamepad_button_b">ปุ่ม B</string>
+    <string name="session_gamepad_button_x">ปุ่ม X</string>
+    <string name="session_gamepad_button_y">ปุ่ม Y</string>
+    <string name="session_gamepad_button_grip">ปุ่ม Grip</string>
+    <string name="session_gamepad_button_trigger">ปุ่มทริกเกอร์</string>
+    <string name="session_gamepad_thumbstick_left">ทัมบ์สติกซ้าย</string>
+    <string name="session_gamepad_thumbstick_right">ทัมบ์สติกขวา</string>
+    <string name="session_gamepad_thumbstick_up">ทัมบ์สติกขึ้น</string>
+    <string name="session_gamepad_thumbstick_down">ทัมบ์สติกลง</string>
+    <string name="session_gamepad_configure_analog_sticks">กำหนดค่าอนาล็อกสติก</string>
+    <string name="session_gamepad_left_stick">สติกซ้าย</string>
+    <string name="session_gamepad_right_stick">สติกขวา</string>
+    <string name="session_gamepad_controller_manager">ตัวจัดการคอนโทรลเลอร์</string>
+    <string name="session_gamepad_enable_vibration">เปิดการสั่น</string>
+    <string name="session_gamepad_player_1">ผู้เล่น 1</string>
+    <string name="session_gamepad_player_2">ผู้เล่น 2</string>
+    <string name="session_gamepad_player_3">ผู้เล่น 3</string>
+    <string name="session_gamepad_player_4">ผู้เล่น 4</string>
+    <string name="session_gamepad_not_assigned">ยังไม่ได้กำหนด</string>
+    <string name="session_gamepad_assign">กำหนด</string>
+    <string name="session_gamepad_press_any_button_for_player">กดปุ่มใดก็ได้บนคอนโทรลเลอร์สำหรับ</string>
+    <string name="session_gamepad_vibrate">การสั่น</string>
+    <string name="session_gamepad_macros_hint">สลับปุ่มเพื่อเปิดใช้งานยิงอัตโนมัติ</string>
+    <string name="session_gamepad_macros">มาโคร</string>
+    <string name="session_gamepad_include_triggers_note">ใช้เทอร์โบกับ L2/R2 เป็นการกดแบบดิจิทัลด้วย</string>
+    <string name="session_gamepad_square_deadzone">เดดโซนสี่เหลี่ยม</string>
+    <string name="session_gamepad_invert_x">กลับแกน X</string>
+    <string name="session_gamepad_invert_y">กลับแกน Y</string>
+    <string name="session_gamepad_save_profile">บันทึกโปรไฟล์</string>
+    <string name="session_gamepad_load_profile">โหลดโปรไฟล์</string>
+    <string name="session_gamepad_button_start">ปุ่ม Start</string>
+    <string name="session_gamepad_button_select">ปุ่ม Select</string>
+    <string name="session_gamepad_button_l1">ปุ่ม L1</string>
+    <string name="session_gamepad_button_r1">ปุ่ม R1</string>
+    <string name="session_gamepad_button_l2">ปุ่ม L2</string>
+    <string name="session_gamepad_button_r2">ปุ่ม R2</string>
+    <string name="session_gamepad_button_l3">ปุ่ม L3</string>
+    <string name="session_gamepad_button_r3">ปุ่ม R3</string>
+    <string name="session_gamepad_dpad_up">D-pad ขึ้น</string>
+    <string name="session_gamepad_dpad_down">D-pad ลง</string>
+    <string name="session_gamepad_dpad_left">D-pad ซ้าย</string>
+    <string name="session_gamepad_dpad_right">D-pad ขวา</string>
+    <string name="session_gamepad_overwrite">เขียนทับ</string>
+    <string name="session_gamepad_save_as_new">บันทึกเป็นใหม่</string>
+    <string name="session_gamepad_overwrite_profile_message">คุณต้องการเขียนทับโปรไฟล์ปัจจุบันหรือบันทึกเป็นโปรไฟล์ใหม่?</string>
+    <string name="session_gamepad_enter_profile_name">ป้อนชื่อโปรไฟล์</string>
+    <string name="session_gamepad_mappings_saved">บันทึกการแมปแล้ว!</string>
+    <string name="session_gamepad_profile_saved">บันทึกโปรไฟล์แล้ว!</string>
+    <string name="session_gamepad_profile_saved_as_new">บันทึกโปรไฟล์เป็นใหม่แล้ว!</string>
+    <string name="session_gamepad_profile_loaded">โหลดโปรไฟล์แล้ว!</string>
+    <string name="session_gamepad_profile_name_empty">ชื่อโปรไฟล์ต้องไม่ว่างเปล่า</string>
+    <string name="session_gamepad_no_profiles">-- ไม่มีโปรไฟล์ --</string>
+    <string name="session_gamepad_error_loading_profile">เกิดข้อผิดพลาดในการโหลดโปรไฟล์</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">ปุ่มควบคุมบนหน้าจอสัมผัส</string>
+    <string name="input_controls_auto_hide_on_controller_title">ซ่อนอัตโนมัติเมื่อมีคอนโทรลเลอร์</string>
+    <string name="input_controls_auto_hide_on_controller_summary">ซ่อนปุ่มควบคุมบนหน้าจอสัมผัสเมื่อเชื่อมต่อคอนโทรลเลอร์</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">ไจโรสโคป</string>
+    <string name="session_gyroscope_calibrate">ปรับเทียบไจโรสโคป</string>
+    <string name="session_gyroscope_enable_right_stick">เปิดการเคลื่อนไหวไจโรของสติกขวา</string>
+    <string name="session_gyroscope_activator_button">ปุ่มเปิดใช้งานไจโรสโคป</string>
+    <string name="session_gyroscope_hold">กดค้าง</string>
+    <string name="session_gyroscope_toggle">สลับ</string>
+    <string name="session_gyroscope_orientation_mode">เอียงเพื่อเล็ง (การวางแนว)</string>
+    <string name="session_gyroscope_x_sensitivity">ความไวแกน X</string>
+    <string name="session_gyroscope_y_sensitivity">ความไวแกน Y</string>
+    <string name="session_gyroscope_smoothing">การปรับให้เนียน</string>
+    <string name="session_gyroscope_invert_x">กลับแกน X</string>
+    <string name="session_gyroscope_invert_y">กลับแกน Y</string>
+    <string name="session_gyroscope_filtering">การกรอง</string>
+    <string name="session_gyroscope_deadzone">เดดโซน</string>
+    <string name="session_gyroscope_sensitivity">ความไว</string>
+    <string name="session_gyroscope_direction">ทิศทาง</string>
+    <string name="session_gyroscope_mode">โหมดเปิดใช้งานไจโรสโคป</string>
+    <string name="session_gyroscope_target_stick">ใช้ไจโรกับ</string>
+    <string name="session_gyroscope_enable_stick">เปิดการเคลื่อนไหวไจโรของอนาล็อกสติก</string>
+    <string name="session_gyroscope_reset_stick">รีเซ็ตสติก</string>
+    <string name="session_gyroscope_reset_stick_to_center">รีเซ็ตสติกไปกึ่งกลาง</string>
+    <string name="session_gyroscope_configuration">การกำหนดค่าไจโรสโคป</string>
+    <string name="session_gyroscope_experimental_mouse_movement">การเคลื่อนไหวเมาส์ (ทดลอง)</string>
+    <string name="session_gyroscope_x_sensitivity_format">ความไว X: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">ความไว Y: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">การปรับให้เนียน: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">เดดโซน: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">ความไว: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">สเกลเมาส์</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">สเกลเมาส์: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">ความเร็วเคอร์เซอร์</string>
+    <string name="settings_general_theme">ธีม</string>
+    <string name="settings_general_background">พื้นหลัง</string>
+    <string name="settings_general_background_color_hex">สี (hex)</string>
+    <string name="settings_general_wallpaper_selected">เลือกวอลเปเปอร์แล้ว</string>
+    <string name="settings_general_select_wallpaper">เลือกวอลเปเปอร์</string>
+    <string name="settings_general_title">ทั่วไป</string>
+    <string name="settings_general_enable_file_provider">เปิดใช้งาน File Provider</string>
+    <string name="settings_general_enable_auto_scraping">เปิดใช้งานการดึงอัตโนมัติ</string>
+    <string name="settings_general_take_effect_next_startup">ตัวเลือกนี้จะมีผลเมื่อเริ่มต้นครั้งถัดไป</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">ติดตั้ง Imagefs ใหม่</string>
+    <string name="settings_general_confirm_reinstall_imagefs">คุณต้องการติดตั้ง imagefs ใหม่หรือไม่? การดำเนินการนี้จะกู้คืนไฟล์ระบบ คอนเทนเนอร์ของคุณจะไม่ถูกเปลี่ยนแปลง</string>
+    <string name="settings_general_refresh_rate">อัตรารีเฟรช</string>
+    <string name="settings_general_refresh_rate_auto_max">สูงสุด</string>
+    <string name="settings_general_refresh_rate_summary">ตั้งค่าอัตรารีเฟรชการแสดงผลและขีดจำกัดเฟรมของ DXVK</string>
+    <string name="settings_general_touchscreen_timeout">หมดเวลาหน้าจอสัมผัส (ต้องรีสตาร์ท)</string>
+    <string name="settings_general_touchscreen_haptics">เปิดการตอบสนองแบบสั่นของหน้าจอสัมผัส</string>
+    <string name="settings_general_open_with_android_browser">เปิดเบราว์เซอร์ Android ใน Wine</string>
+    <string name="settings_general_share_android_clipboard">แชร์คลิปบอร์ด Android กับ Wine</string>
+    <string name="settings_general_paths_title">การตั้งค่าเส้นทาง</string>
+    <string name="settings_general_paths_summary">จัดการตำแหน่งที่ Winlator เก็บข้อมูลการทำงานและตำแหน่งที่เขียนทางลัดที่ส่งออก</string>
+    <string name="settings_general_winlator_path_title">เส้นทางที่จัดเก็บ</string>
+    <string name="settings_general_shortcut_export_path_title">เส้นทางส่งออกทางลัด</string>
+    <string name="settings_general_choose_path">เลือกเส้นทาง</string>
+    <string name="settings_general_xserver_cursor_summary">ปรับความเร็วตัวชี้สำหรับการสัมผัส แทร็กแพด และเมาส์ภายในเซสชัน XServer</string>
+    <string name="settings_general_cursor_lock_title">การควบคุมเมาส์จริง</string>
+    <string name="settings_general_cursor_lock_summary">เปิดการจับเมาส์โดยตรงไว้สำหรับเกมที่ต้องการอินพุตตัวชี้แบบดิบ ปิดใช้งานด้วยปุ่มลดเสียง</string>
+    <string name="settings_general_xinput_toggle_title">ปิดใช้งาน XInput</string>
+    <string name="settings_general_xinput_toggle_summary">ปิดการจัดการ XInput เมื่อคุณต้องการควบคุมเมาส์และแป้นพิมพ์แบบเฉพาะ</string>
+    <string name="settings_external_display_output_summary">ย้ายเกมไปยังจอแสดงผลภายนอกที่เชื่อมต่อแทนการมิเรอร์หน้าจอนี้ แว่นตาจะใช้จอแสดงผลของตัวเองเสมอ</string>
+    <string name="settings_general_file_provider_summary">เปิดให้ตัวเลือกเอกสารและตัวจัดการไฟล์ของ Android เข้าถึงไฟล์ WinNative ได้</string>
+    <string name="settings_general_auto_scraping_summary">การตั้งค่านี้ให้ WinNative ดึงภาพประกอบเกมกำหนดเองโดยอัตโนมัติ</string>
+    <string name="settings_general_open_browser_summary">เปิดลิงก์เว็บที่รองรับในเบราว์เซอร์ของ Android แทนที่จะเปิดใน Wine</string>
+    <string name="settings_general_clipboard_summary">อนุญาตให้คัดลอกและวางระหว่าง Android กับเซสชัน Wine</string>
+    <string name="settings_general_imagefs_summary">คืนค่าไฟล์ระบบที่มาพร้อมเครื่องโดยไม่ลบคอนเทนเนอร์ที่มีอยู่</string>
+    <string name="settings_general_check_for_updates">ตรวจหาการอัปเดต</string>
+    <string name="settings_general_check_for_updates_summary">ตรวจหาแอปเวอร์ชันใหม่โดยอัตโนมัติเมื่อเปิดแอปและเป็นระยะ</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI SoundFont</string>
+    <string name="settings_audio_sound">เสียง</string>
+    <string name="settings_audio_confirm_remove_sound_font">คุณต้องการลบ soundfont นี้หรือไม่?</string>
+    <string name="settings_audio_sound_font_removed_success">ลบ soundfont สำเร็จ!</string>
+    <string name="settings_audio_sound_font_removed_failed">ลบ soundfont ล้มเหลว!</string>
+    <string name="settings_audio_sound_font_installed_success">ติดตั้ง soundfont สำเร็จ!</string>
+    <string name="settings_audio_sound_font_installed_failed">ติดตั้ง soundfont ล้มเหลว!</string>
+    <string name="settings_audio_sound_font_already_exist">soundfont ที่คุณต้องการติดตั้งมีอยู่แล้ว</string>
+    <string name="settings_audio_unable_to_install_soundfont">ไม่สามารถติดตั้ง soundfont ได้</string>
+    <string name="settings_audio_installing_soundfont">กำลังติดตั้ง SoundFont</string>
+    <string name="settings_audio_sound_font_bad_format">รูปแบบ SoundFont ไม่ถูกต้อง</string>
+    <string name="settings_audio_cannot_remove_default">ไม่สามารถลบ soundfont เริ่มต้นได้</string>
+    <string name="settings_audio_summary">ติดตั้ง ลบ และเลือก SoundFont ที่ใช้สำหรับการเล่น MIDI</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">ช่องดีบัก Wine</string>
+    <string name="settings_debug_title">ดีบัก</string>
+    <string name="settings_debug_wine_logs_title">เปิดใช้บันทึกดีบัก Wine</string>
+    <string name="settings_debug_wine_logs_subtitle">เขียนผลลัพธ์ดีบัก Wine ลงไฟล์</string>
+    <string name="settings_debug_box_logs_title">เปิดใช้บันทึก Box86/64</string>
+    <string name="settings_debug_box_logs_subtitle">เขียนผลลัพธ์ดีบัก Box86 &amp; Box64 ลงไฟล์</string>
+    <string name="settings_debug_fex_logs_title">เปิดใช้บันทึก FEXCore</string>
+    <string name="settings_debug_fex_logs_subtitle">เขียนผลลัพธ์ดีบัก FEXCore ลงไฟล์</string>
+    <string name="settings_debug_emulator_logs_title">บันทึกการจำลอง Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">บันทึกตัวจำลองที่คอนเทนเนอร์ของคุณใช้ลงไฟล์</string>
+    <string name="settings_debug_steam_logs_title">เปิดใช้บันทึก Steam</string>
+    <string name="settings_debug_steam_logs_subtitle">บันทึกเหตุการณ์การยืนยันตัวตนและเซสชันของ Steam สำหรับการดีบัก</string>
+    <string name="settings_debug_wine_channels_title">ช่องดีบัก Wine</string>
+    <string name="settings_debug_wine_channels_summary">เลือกช่อง Wine ที่จะรวมไว้เมื่อเปิดใช้การบันทึกดีบัก Wine</string>
+    <string name="settings_debug_wine_classes_title">ระดับบันทึก Wine</string>
+    <string name="settings_debug_wine_classes_summary">เลือกประเภทข้อความที่จะบันทึก Trace มีรายละเอียดมากเป็นพิเศษ</string>
+    <string name="settings_debug_input_logs">บันทึกอินพุต</string>
+    <string name="settings_debug_input_logs_description">บันทึกเหตุการณ์อินพุตของเกมแพด สัมผัส และคีย์บอร์ด</string>
+    <string name="settings_debug_download_logs">บันทึกการดาวน์โหลด</string>
+    <string name="settings_debug_download_logs_description">บันทึกเหตุการณ์ตัวแก้ไขการดาวน์โหลดและ WinNative fallback</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan Validation Layers</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">รีสตาร์ทการแสดงผลเพื่อนำไปใช้</string>
+    <string name="settings_debug_share_logs">แชร์บันทึก</string>
+    <string name="settings_debug_delete_logs">ลบบันทึก</string>
+    <string name="settings_debug_share_all_logs_short">แชร์ทั้งหมด</string>
+    <string name="settings_debug_download_all_logs_short">ดาวน์โหลดทั้งหมด</string>
+    <string name="settings_debug_logs_saved">บันทึกไว้ที่ %1$s</string>
+    <string name="settings_debug_delete_logs_short">ลบ</string>
+    <string name="settings_debug_delete_all_logs_short">ลบทั้งหมด</string>
+    <string name="settings_debug_open_logs_folder_short">เปิดตัวจัดการบันทึก</string>
+    <string name="settings_debug_logs_deleted">ลบบันทึกแล้ว</string>
+    <string name="settings_debug_delete_logs_confirm_title">ลบบันทึกหรือไม่?</string>
+    <string name="settings_debug_delete_logs_confirm_message">การดำเนินการนี้จะลบไฟล์บันทึกที่จัดเก็บไว้ทั้งหมดอย่างถาวร (%1$s) ไม่สามารถยกเลิกได้</string>
+    <string name="settings_debug_logs_browser_title">บันทึก</string>
+    <string name="settings_debug_log_truncated">กำลังแสดง %1$s ล่าสุดของบันทึกนี้</string>
+    <string name="settings_debug_logs_subject">บันทึก WinNative (%1$s)</string>
+    <string name="settings_debug_no_logs_available">ไม่มีบันทึกดีบัก เปิดใช้ตัวเลือกการดีบักก่อนแล้วเปิดเกม</string>
+    <string name="settings_debug_capture_failed">ไม่สามารถบันทึกได้: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">บันทึกข้อผิดพลาด คำเตือน และการขัดข้องของกระบวนการ WinNative ลงไฟล์</string>
+    <string name="settings_debug_section_emulation">การจำลอง</string>
+    <string name="settings_debug_section_subsystems">ระบบย่อย</string>
+    <string name="settings_debug_section_tools">เครื่องมือ</string>
+    <string name="settings_debug_no_channels_selected">ไม่ได้เลือกช่อง</string>
+    <string name="settings_debug_no_channels_available">ไม่มีช่องที่ใช้ได้</string>
+    <string name="settings_debug_channel_toggle_hint">แตะเพื่อสลับช่อง ช่องที่เปิดใช้จะรวมอยู่ในผลลัพธ์ดีบัก Wine</string>
+    <string name="settings_debug_remove_channel_desc">ลบ %1$s</string>
+
+    <string name="settings_other_language_title">ภาษา</string>
+    <string name="settings_other_language_summary">เลือกภาษาที่แสดง</string>
+    <string name="settings_other_language_system_default">ค่าเริ่มต้นของระบบ</string>
+    <string name="settings_other_game_language_title">ภาษาเกม</string>
+    <string name="settings_other_game_language_summary">ภาษาที่ต้องการสำหรับการดาวน์โหลด Steam/Epic/GOG</string>
+
+    <string name="settings_other_section_integration">การผสานรวม</string>
+    <string name="settings_other_setup_wizard_title">ตัวช่วยตั้งค่า</string>
+    <string name="settings_other_setup_wizard_summary">เปิดตัวช่วยตั้งค่าอีกครั้งเพื่อตรวจสอบสิทธิ์ ไฟล์ระบบ และคอนเทนเนอร์เริ่มต้น</string>
+    <string name="settings_other_checking_for_updates">กำลังตรวจหาการอัปเดต…</string>
+    <string name="settings_other_update_check_cooldown">โปรดรอ %1$d วินาทีก่อนตรวจสอบอีกครั้ง</string>
+    <string name="settings_other_persistable_permission_failed">ไม่สามารถรับสิทธิ์แบบถาวรได้: %1$s</string>
+    <string name="settings_other_keep_app_open">โปรดเปิดแอปไว้จนกว่าจะเสร็จสิ้น</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">ติดตั้งเนื้อหา</string>
+    <string name="settings_content_type">หมวดหมู่</string>
+    <string name="settings_content_components">คอมโพเนนต์</string>
+    <string name="settings_content_auto_create_container">สร้างคอนเทนเนอร์อัตโนมัติ</string>
+    <string name="settings_content_remove_title">ลบคอมโพเนนต์หรือไม่?</string>
+    <string name="settings_content_empty_subtitle">ติดตั้งแพ็กเกจหรือสลับประเภทเพื่อเริ่มต้น</string>
+    <string name="settings_content_container_created">สร้างคอนเทนเนอร์แล้ว: %1$s</string>
+    <string name="settings_content_download_failed">ดาวน์โหลดล้มเหลว</string>
+    <string name="common_ui_working">กำลังทำงาน</string>
+    <string name="settings_content_desc_wine">สร้างโดยโปรเจกต์ Wine แปลการเรียก Win32 เป็นบริการเนทีฟของ Linux/Android</string>
+    <string name="settings_content_desc_proton">สร้างโดย Valve รันไทม์ที่ใช้ Wine พร้อมแพตช์เกมสำหรับเกม Windows</string>
+    <string name="settings_content_desc_dxvk">แปลการเรียกกราฟิก Direct3D 9, 10 และ 11 เป็น Vulkan</string>
+    <string name="settings_content_desc_vkd3d">แปลการเรียกกราฟิก Direct3D 12 เป็น Vulkan</string>
+    <string name="settings_content_desc_box64">แปลโค้ด x86_64 Linux เพื่อให้ทำงานบนอุปกรณ์ ARM64 ได้</string>
+    <string name="settings_content_desc_wowbox64">บิลด์ Box64 ที่ WoW64 ใช้เพื่อรันแอป Windows 32 บิตภายใน Wine 64 บิต</string>
+    <string name="settings_content_desc_fexcore">แปลโค้ด x86 และ x86_64 เพื่อให้ทำงานบนอุปกรณ์ ARM64 ได้</string>
+    <string name="settings_content_desc_d7vk">แปลการเรียกกราฟิก DirectDraw (Direct3D 7 และก่อนหน้า) เป็น Vulkan</string>
+    <string name="settings_content_unable_to_install">ไม่สามารถติดตั้งเนื้อหาได้</string>
+    <string name="settings_content_install_failed">ติดตั้งล้มเหลว</string>
+    <string name="settings_content_file_cannot_be_recognized">ไม่รู้จักไฟล์</string>
+    <string name="settings_content_profile_not_found">ไม่พบโปรไฟล์ในเนื้อหา</string>
+    <string name="settings_content_profile_cannot_be_recognized">ไม่รู้จักโปรไฟล์</string>
+    <string name="settings_content_file_list">รายการไฟล์</string>
+    <string name="settings_content_install_directory">ไดเรกทอรีติดตั้ง</string>
+    <string name="settings_content_installed_success">ติดตั้งเนื้อหาสำเร็จ!</string>
+    <string name="settings_content_downloading_title">กำลังดาวน์โหลดเนื้อหา</string>
+    <string name="settings_content_installing_title">กำลังติดตั้งเนื้อหา</string>
+    <string name="settings_content_extracting_title">กำลังแตกเนื้อหา</string>
+    <string name="settings_content_extracting_detail">กำลังแตก (%1$d ไฟล์)</string>
+    <string name="settings_content_preparing_package">กำลังเตรียมแพ็กเกจ</string>
+    <string name="settings_content_download_complete">ดาวน์โหลดเสร็จสิ้น</string>
+    <string name="settings_content_already_installed_title">ติดตั้งคอมโพเนนต์แล้ว</string>
+    <string name="settings_content_already_installed_message">คอมโพเนนต์นี้ติดตั้งไว้แล้ว ลบสำเนาที่ติดตั้งก่อนดาวน์โหลดอีกครั้ง
+
+เส้นทางที่ติดตั้ง:
+%1$s</string>
+    <string name="settings_content_conflicting_title">ติดตั้งเนื้อหาที่ขัดแย้งกัน</string>
+    <string name="settings_content_conflicting_message">โปรดถอนการติดตั้งเนื้อหาที่ขัดแย้งกันก่อนดาวน์โหลดแพ็กเกจนี้
+
+เส้นทางที่ติดตั้ง:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">ไม่สามารถเชื่อถือเนื้อหาได้</string>
+    <string name="settings_content_is_incomplete">เนื้อหาไม่สมบูรณ์</string>
+    <string name="settings_content_untrusted_files_warning">คำเตือน: เนื้อหาเพิ่มเติมมีไฟล์ที่ไม่น่าเชื่อถือ โดยทั่วไปไม่ควรแก้ไขไฟล์ต่อไปนี้ โปรดตัดสินใจว่าจะดำเนินการติดตั้งต่อหรือไม่</string>
+    <string name="settings_content_confirm_remove">การดำเนินการนี้จะลบคอมโพเนนต์ออกจากอุปกรณ์ของคุณ</string>
+    <string name="settings_content_unable_to_remove_in_use">ไม่สามารถลบเนื้อหานี้ได้ เนื่องจากมีคอนเทนเนอร์กำลังใช้ Wine นี้อยู่</string>
+    <string name="settings_content_download_in_components">ไม่ได้ดาวน์โหลด โปรดดาวน์โหลดในคอมโพเนนต์</string>
+    <string name="settings_content_types_header">ประเภทเนื้อหา</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">ไดรเวอร์</string>
+    <string name="settings_drivers_manager_header">ตัวจัดการไดรเวอร์</string>
+    <string name="settings_drivers_github_repos">ที่เก็บ GitHub</string>
+    <string name="settings_drivers_install">ติดตั้งไดรเวอร์</string>
+    <string name="settings_drivers_installed_success">ติดตั้งไดรเวอร์สำเร็จ</string>
+    <string name="settings_drivers_install_failed">ติดตั้งไดรเวอร์ล้มเหลว</string>
+    <string name="settings_drivers_remove_title">ลบไดรเวอร์หรือไม่?</string>
+    <string name="settings_drivers_confirm_remove">การดำเนินการนี้จะลบไดรเวอร์ออกจากอุปกรณ์ของคุณ</string>
+    <string name="settings_drivers_remove_repo_title">ลบที่เก็บหรือไม่?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s จะถูกลบออกจากรายการที่เก็บของคุณ</string>
+    <string name="settings_drivers_repo_tap_to_load">แตะเพื่อโหลดรุ่นที่เผยแพร่</string>
+    <string name="settings_drivers_repo_loading_releases">กำลังโหลดรุ่นที่เผยแพร่</string>
+    <string name="settings_drivers_repo_release_count">โหลด %1$d รุ่นที่เผยแพร่แล้ว</string>
+    <string name="settings_drivers_repo_no_release_assets">ไม่พบไฟล์ ZIP ที่ดาวน์โหลดได้ในรุ่นที่เผยแพร่ที่ดึงมา</string>
+    <string name="settings_drivers_repo_fetch_failed">ไม่สามารถโหลดรุ่นที่เผยแพร่ของ GitHub ได้</string>
+    <string name="settings_drivers_repo_download_failed">ดาวน์โหลดล้มเหลว</string>
+    <string name="settings_drivers_repo_no_version">ไม่มีเวอร์ชัน</string>
+    <string name="settings_drivers_repo_unknown_size">ไม่ทราบขนาด</string>
+    <string name="settings_drivers_manager">ตัวจัดการไดรเวอร์</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">กำลังติดตั้งไฟล์ระบบ</string>
+    <string name="setup_wizard_unable_to_install_system_files">ไม่สามารถติดตั้งไฟล์ระบบได้</string>
+    <string name="setup_wizard_system_image_not_installed">ยังไม่ได้ติดตั้งอิมเมจระบบ โปรดติดตั้งคอมโพเนนต์ก่อน</string>
+    <string name="setup_wizard_recommended_components">คอมโพเนนต์ที่แนะนำ</string>
+    <string name="setup_wizard_step_format">ขั้นตอนที่ %1$d จาก %2$d</string>
+    <string name="setup_wizard_allow_file_access">อนุญาตการเข้าถึงไฟล์ทั้งหมด</string>
+    <string name="setup_wizard_install_system_files">ติดตั้งไฟล์ระบบ</string>
+    <string name="setup_wizard_recommended_components_description">คอมโพเนนต์ที่แนะนำจะดาวน์โหลดและติดตั้งแพ็กเกจ DXVK, VKD3D, FEX, Box64 และ Wowbox64 ที่รองรับโดยอัตโนมัติ</string>
+    <string name="setup_wizard_each_button_downloads_description">แต่ละปุ่มจะดาวน์โหลดแพ็กเกจ ติดตั้ง และสร้างคอนเทนเนอร์เริ่มต้นโดยอัตโนมัติ</string>
+    <string name="setup_wizard_recommended_x86_64">แนะนำ x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">แนะนำ ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">เลือกคอมโพเนนต์ที่จะติดตั้ง Wine/Proton จะสร้างคอนเทนเนอร์อัตโนมัติ</string>
+    <string name="setup_wizard_loading_components">กำลังโหลดคอมโพเนนต์…</string>
+    <string name="setup_wizard_no_components_available">ไม่มีคอมโพเนนต์สำหรับหมวดหมู่นี้</string>
+    <string name="setup_wizard_default_settings">การตั้งค่าเริ่มต้น</string>
+    <string name="setup_wizard_containers">การตั้งค่าคอนเทนเนอร์</string>
+    <string name="setup_wizard_containers_description">เปิดแต่ละคอนเทนเนอร์และตั้งค่าเริ่มต้นที่คุณต้องการให้เกมใหม่ทุกเกมสืบทอด เกมใหม่จะใช้คอนเทนเนอร์ x86-64 เป็นค่าเริ่มต้น</string>
+    <string name="setup_wizard_store_sign_in_optional">การลงชื่อเข้าใช้ร้านค้าเป็นตัวเลือกเสริม การลงชื่อเข้าใช้แต่ละครั้งจะกลับมาที่นี่เมื่อเสร็จสิ้น</string>
+    <string name="setup_wizard_granted">ได้รับสิทธิ์แล้ว</string>
+    <string name="setup_wizard_grant">ให้สิทธิ์</string>
+    <string name="setup_wizard_denied">ปฏิเสธ</string>
+    <string name="setup_wizard_allow">อนุญาต</string>
+    <string name="setup_wizard_installing">กำลังติดตั้ง</string>
+    <string name="setup_wizard_install_failed_reason">ติดตั้งล้มเหลว: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">การเข้าถึงที่จำเป็น</string>
+    <string name="setup_wizard_select_components">เลือกคอมโพเนนต์</string>
+    <string name="setup_wizard_recommended_wine_proton">แนะนำ Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">การตั้งค่าขั้นสูง</string>
+    <string name="setup_wizard_title">ตัวช่วยตั้งค่า</string>
+    <string name="setup_wizard_advanced_user">ผู้ใช้ขั้นสูง</string>
+    <string name="setup_wizard_next">ถัดไป</string>
+    <string name="setup_wizard_finish">เสร็จสิ้น</string>
+    <string name="setup_wizard_download_and_install">ดาวน์โหลด + ติดตั้ง</string>
+    <string name="setup_wizard_open_drivers">เปิดไดรเวอร์</string>
+    <string name="setup_wizard_ready">พร้อม</string>
+    <string name="setup_wizard_download_and_create">ดาวน์โหลด + สร้าง</string>
+    <string name="setup_wizard_configured">กำหนดค่าแล้ว</string>
+    <string name="setup_wizard_downloading">กำลังดาวน์โหลด %1$s</string>
+    <string name="setup_wizard_installing_package">กำลังติดตั้ง %1$s</string>
+    <string name="setup_wizard_no_runtime_installed">ยังไม่ได้ติดตั้งแพ็กเกจ Wine หรือ Proton</string>
+    <string name="setup_wizard_no_runtime_hint">ติดตั้งแพ็กเกจ Wine หรือ Proton จากขั้นตอนก่อนหน้า หรือข้ามไปก่อน</string>
+    <string name="setup_wizard_recommended_label">แนะนำ</string>
+    <string name="setup_wizard_install_all_recommended">ติดตั้งที่แนะนำทั้งหมด</string>
+    <string name="setup_wizard_create_container">สร้างคอนเทนเนอร์</string>
+    <string name="setup_wizard_creating_container">กำลังสร้าง…</string>
+
+    <string name="input_controls_tap_to_click">แตะเพื่อคลิก</string>
+    <string name="input_controls_reverse_binding_order">สลับลำดับการผูกปุ่ม</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">การอนุญาต</string>
+    <string name="steam_login_sign_in_to_your_account">ลงชื่อเข้าใช้บัญชีของคุณ</string>
+    <string name="steam_login_username">ชื่อผู้ใช้</string>
+    <string name="steam_login_password">รหัสผ่าน</string>
+    <string name="steam_login_invalid_username_or_password">ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง</string>
+    <string name="steam_login_remember_me">จดจำฉันไว้</string>
+    <string name="steam_login_sign_in_with_qr_code">ลงชื่อเข้าใช้ด้วยรหัส QR</string>
+    <string name="steam_login_open_steam_app_qr_hint">เปิดแอป Steam → แตะไอคอน QR</string>
+    <string name="steam_login_failed_to_load_qr_code">โหลดรหัส QR ล้มเหลว</string>
+    <string name="steam_login_retry">ลองใหม่</string>
+    <string name="steam_login_generating_code">กำลังสร้างรหัส…</string>
+    <string name="steam_login_two_factor_auth">การยืนยันตัวตนสองปัจจัย</string>
+    <string name="steam_login_approve_login_steam_app">อนุมัติการเข้าสู่ระบบนี้จาก\nแอป Steam บนมือถือของคุณ</string>
+    <string name="steam_login_enter_code_sent_to">ป้อนรหัสที่ส่งไปยัง\n%1$s</string>
+    <string name="steam_login_enter_steam_guard_code">ป้อนรหัส Steam Guard ของคุณ</string>
+    <string name="steam_login_code">รหัส</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">การซิงค์คลาวด์</string>
+    <string name="google_cloud_sync_started">เริ่มการซิงค์คลาวด์แล้ว</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">บริการ Google</string>
+    <string name="google_auto_signin_title">ลงชื่อเข้าใช้ Google เมื่อเปิดแอป</string>
+    <string name="google_auto_signin_summary">เชื่อมต่อกับ Google Play Games โดยอัตโนมัติเมื่อแอปเริ่มทำงาน เพื่อให้การสำรองข้อมูลเซฟและการซิงค์พร้อมใช้งานเสมอ เมื่อปิด แอปจะไม่ลงชื่อเข้าใช้เองเลย</string>
+    <string name="google_auto_signin_section">เมื่อเปิดแอป</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">กำลังซิงค์</string>
+    <string name="google_cloud_status_connected">เชื่อมต่อแล้ว</string>
+    <string name="google_cloud_status_not_signed_in">ยังไม่ได้ลงชื่อเข้าใช้</string>
+    <string name="google_cloud_working">กำลังทำงาน…</string>
+    <string name="google_cloud_sign_in">ลงชื่อเข้าใช้</string>
+    <string name="google_cloud_disable_sync">ปิดการซิงค์</string>
+    <string name="google_cloud_store_logins">การเข้าสู่ระบบร้านค้า</string>
+    <string name="google_cloud_store_login_sync_busy">กำลังซิงค์การเข้าสู่ระบบร้านค้าของคุณ…</string>
+    <string name="google_cloud_saved_games_unavailable">Google Saved Games ไม่พร้อมใช้งาน</string>
+    <string name="google_cloud_snapshot_ready">สแนปช็อตคลาวด์พร้อมแล้ว</string>
+    <string name="google_cloud_waiting_first_backup">กำลังรอการสำรองข้อมูลครั้งแรก</string>
+    <string name="google_cloud_no_store_logins_detected">ไม่พบการเข้าสู่ระบบร้านค้า</string>
+    <string name="google_cloud_last_synced">ซิงค์ล่าสุด %1$s</string>
+    <string name="google_cloud_backup">สำรองข้อมูล</string>
+    <string name="google_cloud_restore">คืนค่า</string>
+    <string name="google_cloud_sign_in_to_sync">ลงชื่อเข้าใช้ Google Play Games เพื่อซิงค์การเข้าสู่ระบบร้านค้า</string>
+    <string name="google_cloud_sign_in_failed">การลงชื่อเข้าใช้ Google Play Games ล้มเหลว</string>
+    <string name="google_cloud_sign_in_finishing">การลงชื่อเข้าใช้ Google Play Games ยังไม่เสร็จสิ้น รอสักครู่แล้วลองซิงค์คลาวด์อีกครั้ง</string>
+    <string name="google_cloud_connected_restore_available">เชื่อมต่อ Google Play Games แล้ว สามารถคืนค่าสำหรับ %1$s ได้</string>
+    <string name="google_cloud_connected_tap_backup">เชื่อมต่อ Google Play Games แล้ว แตะสำรองข้อมูลเพื่อบันทึกการเข้าสู่ระบบ %1$s</string>
+    <string name="google_cloud_connected_ready">เชื่อมต่อ Google Play Games แล้ว การสำรองข้อมูลและการคืนค่าพร้อมใช้งาน</string>
+    <string name="google_cloud_sync_disabled">ปิดการซิงค์ Google Play Games สำหรับแอปนี้แล้ว</string>
+    <string name="google_cloud_sign_in_first">ลงชื่อเข้าใช้ Google Play Games ก่อน</string>
+    <string name="google_cloud_no_saved_logins_found">ไม่พบการเข้าสู่ระบบร้านค้าที่บันทึกไว้ในการซิงค์คลาวด์ของ Google</string>
+    <string name="google_cloud_backup_already_matches">การสำรองข้อมูลคลาวด์ตรงกับการเข้าสู่ระบบร้านค้าปัจจุบันอยู่แล้ว</string>
+    <string name="google_cloud_no_local_logins">ไม่มีการเข้าสู่ระบบร้านค้าในเครื่องที่จะสำรองข้อมูล</string>
+    <string name="google_cloud_logins_restored_and_synced">คืนค่าและซิงค์การเข้าสู่ระบบร้านค้าสำหรับ %1$s แล้ว</string>
+    <string name="google_cloud_logins_restored">คืนค่าการเข้าสู่ระบบร้านค้าสำหรับ %1$s แล้ว</string>
+    <string name="google_cloud_logins_backed_up">สำรองข้อมูลการเข้าสู่ระบบร้านค้าสำหรับ %1$s แล้ว</string>
+    <string name="google_cloud_sync_ready">การซิงค์การเข้าสู่ระบบร้านค้าพร้อมแล้ว</string>
+    <string name="google_cloud_no_logins_to_sync">ยังไม่มีการเข้าสู่ระบบร้านค้าที่จะซิงค์</string>
+    <string name="google_cloud_sign_in_to_backup">ลงชื่อเข้าใช้เพื่อสำรองข้อมูลโทเคนการเข้าสู่ระบบ %1$s</string>
+    <string name="google_cloud_no_backed_up_logins">ยังไม่พบข้อมูลการเข้าสู่ระบบร้านค้าที่สำรองไว้</string>
+    <string name="google_cloud_local_cloud_differ">ข้อมูลการเข้าสู่ระบบร้านค้าในเครื่องกับบนคลาวด์ไม่ตรงกัน ใช้สำรองข้อมูลเพื่อเขียนทับข้อมูลบนคลาวด์ หรือใช้กู้คืนเพื่อดึงโทเคนที่บันทึกไว้</string>
+    <string name="google_cloud_local_ready_to_backup">ข้อมูลการเข้าสู่ระบบร้านค้าในเครื่องพร้อมสำรองสำหรับ %1$s แล้ว</string>
+    <string name="google_cloud_backup_ready">การสำรองข้อมูลการเข้าสู่ระบบร้านค้าพร้อมแล้ว</string>
+    <string name="google_cloud_restore_available">สามารถกู้คืนข้อมูลการเข้าสู่ระบบจากคลาวด์สำหรับ %1$s ได้</string>
+    <string name="google_cloud_logins_synced">ข้อมูลการเข้าสู่ระบบร้านค้าซิงค์กับ Google Play Games แล้ว</string>
+    <string name="google_cloud_sync_problem">การซิงค์ข้อมูลการเข้าสู่ระบบร้านค้าพบปัญหา</string>
+    <string name="google_cloud_error_auth_needed">Google Play Games ต้องยืนยันตัวตนให้เสร็จก่อน การซิงค์บนคลาวด์จึงจะเข้าถึง Saved Games ได้ เปิดหน้าต่างโปรไฟล์ Play Games หากปรากฏขึ้น แล้วลองอีกครั้ง</string>
+    <string name="google_cloud_error_developer">Google Play Games Saved Games ปฏิเสธบิลด์นี้ ตรวจสอบ Play Games app ID ชื่อแพ็กเกจที่เชื่อมโยง และใบรับรองการลงนามใน Play Console</string>
+    <string name="google_cloud_error_build_rejected">เชื่อมต่อบัญชี Google แล้ว แต่ Google Play Games Saved Games ปฏิเสธบิลด์นี้ ตรวจสอบ Play Games app ID แพ็กเกจที่เชื่อมโยง และใบรับรองการลงนาม</string>
+    <string name="google_cloud_error_network">การซิงค์คลาวด์ของ Google ล้มเหลวเนื่องจากคำขอเครือข่ายไม่เสร็จสมบูรณ์ หรือ Google Play services ต้องการการดำเนินการ</string>
+    <string name="google_cloud_error_no_snapshot">ยังไม่พบข้อมูลการเข้าสู่ระบบร้านค้าที่บันทึกไว้ในการซิงค์คลาวด์ของ Google</string>
+    <string name="google_cloud_error_generic">การซิงค์คลาวด์ของ Google ล้มเหลว: %1$s</string>
+    <string name="google_cloud_error_before_open">การซิงค์คลาวด์ของ Google ล้มเหลวก่อนที่ Google Saved Games จะเปิดได้</string>
+    <string name="cloud_saves_title">เซฟบนคลาวด์</string>
+    <string name="cloud_saves_title_for_provider">%1$s เซฟบนคลาวด์ - %2$s</string>
+    <string name="cloud_saves_sync_summary">ดึงเวอร์ชันที่ %1$s มีอยู่ตอนนี้</string>
+    <string name="cloud_saves_sync_summary_generic">ดึงเวอร์ชันปัจจุบันจากคลาวด์</string>
+    <string name="cloud_saves_no_backups">ยังไม่มีข้อมูลสำรองสำหรับเกมนี้</string>
+    <string name="cloud_sync_title">เซฟบนคลาวด์</string>
+    <string name="cloud_sync_disable_title">ปิดเซฟบนคลาวด์</string>
+    <string name="cloud_saves_steam_push_label">ส่งขึ้น Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">บังคับอัปโหลดเซฟในเครื่อง</string>
+    <string name="cloud_saves_steam_push_success">ส่งเซฟขึ้น Steam Cloud แล้ว</string>
+    <string name="cloud_saves_steam_push_failed">ไม่สามารถส่งเซฟขึ้น Steam Cloud ได้</string>
+    <string name="cloud_saves_history_steam_unreachable">ไม่สามารถเชื่อมต่อ Steam Cloud ได้ในตอนนี้ กำลังเชื่อมต่อใหม่ในเบื้องหลัง แตะรีเฟรชเมื่อคุณกลับมาออนไลน์</string>
+    <string name="steam_session_refused_event">Steam ปฏิเสธเซสชันที่แคชไว้ (EResult=%1$d) โปรดลงชื่อเข้าใช้อีกครั้ง</string>
+    <string name="cloud_sync_enabled_summary">ดาวน์โหลดเมื่อเริ่ม ส่งขึ้นเมื่อออก</string>
+    <string name="cloud_sync_disabled_summary">เริ่มโดยไม่ดาวน์โหลดเซฟจากคลาวด์หรือซิงค์เมื่อออก</string>
+    <string name="cloud_saves_offline_mode">ปิดการซิงค์คลาวด์</string>
+    <string name="cloud_saves_offline_mode_summary">หยุดกิจกรรมคลาวด์อัตโนมัติทั้งหมดสำหรับเกมนี้</string>
+    <string name="cloud_saves_backing_up">กำลังสำรองเซฟบนคลาวด์…</string>
+    <string name="cloud_saves_restoring">กำลังกู้คืนเซฟบนคลาวด์…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">ซิงค์จาก %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_generic">ซิงค์จากคลาวด์</string>
+    <string name="cloud_saves_syncing_from_provider">กำลังดาวน์โหลดเซฟจาก %1$s…</string>
+    <string name="cloud_saves_sync_from_provider_success">ดาวน์โหลดเซฟบนคลาวด์ %1$s แล้ว</string>
+    <string name="cloud_saves_sync_from_provider_failed">ไม่สามารถดาวน์โหลดเซฟจาก %1$s ได้</string>
+    <string name="cloud_saves_gog_manage_label">จัดการ GOG Cloud Saves</string>
+    <string name="cloud_saves_gog_manage_helper">เปิดเว็บไซต์ GOG อย่างเป็นทางการ</string>
+    <string name="cloud_saves_gog_manage_no_browser">ไม่มีเบราว์เซอร์สำหรับเปิดหน้าเซฟบนคลาวด์ของ GOG</string>
+    <string name="cloud_saves_gog_zip_label">ดาวน์โหลด GOG Cloud Zip</string>
+    <string name="cloud_saves_gog_zip_helper">บันทึกไฟล์บนคลาวด์ปัจจุบัน</string>
+    <string name="cloud_saves_gog_zip_success">บันทึก zip เซฟบนคลาวด์ของ GOG แล้ว</string>
+    <string name="cloud_saves_gog_zip_failed">ไม่สามารถบันทึก zip เซฟบนคลาวด์ของ GOG ได้</string>
+    <string name="cloud_saves_gog_zip_empty">ไม่พบไฟล์เซฟบนคลาวด์ของ GOG</string>
+    <string name="cloud_saves_google_backup_label">สำรองไปยัง Google</string>
+    <string name="cloud_saves_google_backup_helper">บันทึกสำเนาไปยัง Google Play Games</string>
+    <string name="cloud_saves_google_backup_no_save">ไม่พบไฟล์เซฟที่จะสำรอง</string>
+    <string name="cloud_saves_history_title">ประวัติเซฟ</string>
+    <string name="cloud_saves_history_empty">ยังไม่มีเซฟก่อนหน้าที่สำรองไว้ เซฟที่ถูกแทนที่และการสำรองข้อมูลด้วยตนเองจะปรากฏที่นี่เป็นเวลา 30 วัน</string>
+    <string name="cloud_saves_history_loading">กำลังโหลดประวัติเซฟ…</string>
+    <string name="cloud_saves_history_sign_in">ลงชื่อเข้าใช้ Google เพื่อดูประวัติเซฟของคุณ</string>
+    <string name="cloud_saves_history_origin_local">ในเครื่อง</string>
+    <string name="cloud_saves_history_origin_cloud">คลาวด์</string>
+    <string name="cloud_saves_history_origin_manual">ด้วยตนเอง</string>
+    <string name="cloud_saves_history_origin_auto">อัตโนมัติ</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">กู้คืน</string>
+    <string name="cloud_saves_history_download">ดาวน์โหลด</string>
+    <string name="cloud_saves_history_download_success">ดาวน์โหลดไฟล์แล้ว</string>
+    <string name="cloud_saves_history_download_failed">ดาวน์โหลดล้มเหลว</string>
+    <string name="cloud_saves_history_cloud_readonly">อ่านอย่างเดียว</string>
+    <string name="cloud_saves_history_restore_confirm_title">กู้คืนข้อมูลสำรองนี้หรือไม่?</string>
+    <string name="cloud_saves_history_restore_confirm_body">การกระทำนี้จะแทนที่เซฟในเครื่องปัจจุบันของคุณด้วยข้อมูลสำรองจาก %1$s</string>
+    <string name="cloud_saves_history_restore_success">กู้คืนเซฟจากข้อมูลสำรองแล้ว</string>
+    <string name="cloud_saves_history_restore_failed">ไม่สามารถกู้คืนข้อมูลสำรองนี้ได้</string>
+    <string name="cloud_saves_keep_replaced_backup">เก็บข้อมูลสำรองของเซฟที่ถูกแทนที่</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">หากคุณเปลี่ยนใจ คุณสามารถกู้คืนได้จากประวัติเซฟ</string>
+    <string name="cloud_saves_history_refresh">รีเฟรช</string>
+    <string name="cloud_saves_history_rename">เปลี่ยนชื่อ</string>
+    <string name="cloud_saves_history_rename_title">ตั้งชื่อข้อมูลสำรองนี้</string>
+    <string name="cloud_saves_history_rename_hint">เช่น สู้บอส ก่อนจบเกม</string>
+    <string name="cloud_saves_history_rename_save">บันทึก</string>
+    <string name="cloud_saves_history_rename_clear">ล้าง</string>
+    <string name="cloud_saves_history_rename_success">เปลี่ยนชื่อข้อมูลสำรองแล้ว</string>
+    <string name="cloud_saves_history_rename_failed">ไม่สามารถเปลี่ยนชื่อข้อมูลสำรองได้</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">เลือกโฟลเดอร์เซฟ</string>
+    <string name="cloud_saves_custom_folder_label">โฟลเดอร์เซฟ</string>
+    <string name="cloud_saves_custom_select_folder_summary">ชี้ไปยังไดเรกทอรีเซฟภายในคอนเทนเนอร์</string>
+    <string name="cloud_saves_custom_no_container">ไม่มีคอนเทนเนอร์สำหรับทางลัดนี้</string>
+    <string name="cloud_saves_custom_picker_title">เลือกโฟลเดอร์เซฟ</string>
+    <string name="cloud_saves_custom_outside_drive_c">โฟลเดอร์ที่เลือกต้องอยู่ในไดรฟ์ C: ของคอนเทนเนอร์</string>
+    <string name="cloud_saves_custom_path_map_failed">ไม่สามารถแมปโฟลเดอร์ที่เลือกไปยังพาธ Windows ได้</string>
+    <string name="cloud_saves_custom_folder_set">ตั้งค่าโฟลเดอร์เซฟเป็น %1$s แล้ว</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">ซิงค์จาก Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">ดาวน์โหลดเซฟล่าสุด</string>
+    <string name="cloud_saves_steam_sync_success">ซิงค์จาก Steam Cloud แล้ว</string>
+    <string name="cloud_saves_steam_sync_failed">การซิงค์ Steam Cloud ล้มเหลว</string>
+    <string name="cloud_saves_steam_browse_label">ดูเซฟบน Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">เปิดที่เก็บข้อมูลบนคลาวด์</string>
+    <string name="cloud_saves_steam_browse_no_browser">ไม่มีเบราว์เซอร์สำหรับเปิดหน้า Steam</string>
+    <string name="cloud_saves_steam_import_label">นำเข้าไฟล์</string>
+    <string name="cloud_saves_steam_import_helper">กู้คืนไฟล์ที่ดาวน์โหลด</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">ตัวเลือกไฟล์ไม่พร้อมใช้งาน</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">การกระทำนี้จะดาวน์โหลดไฟล์เซฟปัจจุบันของ Steam Cloud และเขียนทับไฟล์เซฟปัจจุบัน</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">app ID ไม่ถูกต้อง</string>
+    <string name="cloud_saves_label_saved">บันทึกป้ายกำกับแล้ว</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">เซฟ</string>
+    <string name="saves_import_export_confirm_selection">ยืนยันการเลือก</string>
+    <string name="saves_import_export_select_directory">เลือกไดเรกทอรีเซฟของคุณ</string>
+    <string name="saves_import_export_up_directory">ขึ้นไดเรกทอรี</string>
+    <string name="saves_import_export_select_container">คอนเทนเนอร์เป้าหมาย:</string>
+    <string name="saves_import_export_exported">ส่งออกเซฟสำเร็จ</string>
+    <string name="saves_import_export_exported_failed">ส่งออกเซฟล้มเหลว: %1$s</string>
+    <string name="saves_import_export_imported">นำเข้าเซฟสำเร็จ</string>
+    <string name="saves_import_export_imported_failed">นำเข้าเซฟล้มเหลว: %1$s</string>
+    <string name="saves_export_path_summary">เซฟจะถูกส่งออกไปยัง /WinNative/saves</string>
+    <string name="saves_export_success_path">ส่งออกไปยัง %1$s แล้ว</string>
+    <string name="saves_export_warning_title">ใช้กับเกมที่กำหนดเองเท่านั้น</string>
+    <string name="saves_export_warning_body">การส่งออกอาจรวมเซฟจากเกมที่ติดตั้งจากร้านค้าหรือเกมที่ซิงค์คลาวด์</string>
+    <string name="saves_import_warning_title">การกระทำนี้จะเขียนทับเซฟที่มีอยู่ในคอนเทนเนอร์นี้</string>
+    <string name="saves_import_warning_body">เมื่อกู้คืนข้อมูลสำรองเก่าที่มีหลายเกม ให้คัดลอกเซฟที่ใหม่กว่าเข้าไปในไฟล์ zip ด้วยตัวจัดการไฟล์ก่อน เฉพาะเซฟที่มีอยู่ในไฟล์ .zip เท่านั้นที่จะได้รับผลกระทบ จัดการเซฟอย่างชาญฉลาด</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">คอนเทนเนอร์</string>
+    <string name="preloader_initializing">กำลังเริ่มต้น</string>
+    <string name="preloader_launching">กำลังเปิด</string>
+    <string name="preloader_closing">กำลังปิด %1$s</string>
+    <string name="preloader_preparing_steam_environment">กำลังเตรียมสภาพแวดล้อม Steam</string>
+    <string name="preloader_starting_wine">กำลังเริ่ม Wine</string>
+    <string name="preloader_starting_steam_launcher">กำลังเริ่ม Steam Launcher</string>
+    <string name="preloader_loading_steam_client">กำลังโหลดไคลเอนต์ Steam</string>
+    <string name="preloader_connecting_to_steam">กำลังเชื่อมต่อกับ Steam</string>
+    <string name="preloader_signing_in_to_steam">กำลังลงชื่อเข้าใช้ Steam</string>
+    <string name="preloader_fetching_game_info">ลงชื่อเข้าใช้แล้ว — กำลังดึงข้อมูลเกม</string>
+    <string name="preloader_steam_ready">Steam พร้อมแล้ว</string>
+    <string name="preloader_updating_game_info">กำลังอัปเดตข้อมูลเกม</string>
+    <string name="preloader_verifying_install">กำลังตรวจสอบการติดตั้ง</string>
+    <string name="preloader_scanning_redists">กำลังสแกน redistributables</string>
+    <string name="preloader_installing_redist_single">กำลังติดตั้ง redistributable</string>
+    <string name="preloader_installing_named_redist">กำลังติดตั้ง %1$s</string>
+    <string name="preloader_installing_named_redist_progress">กำลังติดตั้ง %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistributables พร้อมแล้ว</string>
+    <string name="preloader_no_redists">ไม่มี redistributables ที่จะติดตั้ง</string>
+    <string name="preloader_steam_service_running">บริการ Steam กำลังทำงาน</string>
+    <string name="preloader_launching_game">กำลังเปิด %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher ล้มเหลว — กำลังจัดเตรียมทรัพยากรใหม่</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher ไม่สามารถเริ่มได้ กำลังจัดเตรียมใหม่ — โปรดเปิดใหม่อีกครั้ง</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher ไปถึงเกมแล้วแต่เกมไม่เคยเริ่มทำงาน</string>
+    <string name="preloader_setup_environment">กำลังตั้งค่าสภาพแวดล้อม</string>
+    <string name="preloader_retrying_steam_client_download">กำลังลองดาวน์โหลดไคลเอนต์ Steam อีกครั้ง</string>
+    <string name="preloader_installing_mono">กำลังติดตั้ง Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">กำลังติดตั้ง redistributables</string>
+    <string name="preloader_unpacking_exe">กำลังแตกไฟล์ปฏิบัติการของเกม</string>
+    <string name="preloader_downloading_cloud">กำลังดาวน์โหลดเซฟบนคลาวด์</string>
+    <string name="preloader_syncing_cloud">กำลังซิงค์เซฟบนคลาวด์</string>
+    <string name="preloader_uploading_cloud">กำลังอัปโหลดเซฟบนคลาวด์</string>
+    <string name="preloader_checking_cloud">กำลังตรวจสอบเซฟบนคลาวด์</string>
+    <string name="preloader_cloud_sync_retry">%1$s ลองใหม่ %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">กำลังดาวน์โหลดการซิงค์คลาวด์</string>
+    <string name="cloud_sync_failed_provider">การซิงค์เซฟบนคลาวด์ %1$s ล้มเหลว</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">เกมที่กำหนดเอง</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">บันทึกประสิทธิภาพลงไฟล์</string>
+    <string name="settings_hud_record_to_file_summary">ส่งออกข้อมูล FPS, CPU, GPU, อุณหภูมิ และแบตเตอรี่ต่อวินาทีไปยัง /WinNative/logs/ ระหว่างเล่นเกม</string>
+    <string name="settings_leaderboard_category">ประสิทธิภาพ</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">กำลังโหลดรายการ Workshop</string>
+    <string name="workshop_search_items">ค้นหารายการ Workshop</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">กำลังดึงรายการที่คุณติดตามจาก Steam</string>
+    <string name="workshop_error_title">ไม่สามารถโหลดรายการ Workshop ได้</string>
+    <string name="workshop_error_subtitle">มีบางอย่างผิดพลาด ลองอีกครั้ง</string>
+    <string name="workshop_empty_title">ไม่มีรายการ Workshop ที่ติดตาม</string>
+    <string name="workshop_empty_subtitle">ติดตามรายการบน Steam Workshop แล้วเปิดหน้าต่างนี้อีกครั้ง</string>
+    <string name="workshop_search_empty_title">ไม่มีรายการที่ตรงกับ \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">ลองใช้คำค้นหาอื่น</string>
+    <string name="workshop_clear_search">ล้างการค้นหา</string>
+    <string name="workshop_item_fallback">รายการ Workshop</string>
+    <string name="common_ui_failed">ล้มเหลว</string>
+    <string name="steam_presence_snooze">งีบหลับ</string>
+    <string name="steam_presence_busy">ไม่ว่าง</string>
+    <string name="steam_presence_looking_to_trade">ต้องการแลกเปลี่ยน</string>
+    <string name="steam_presence_looking_to_play">ต้องการเล่น</string>
+    <string name="steam_friends_count">เพื่อน — ออนไลน์ %1$d คน</string>
+    <string name="steam_friends_section_in_game">ในเกม (%1$d)</string>
+    <string name="steam_friends_section_online">ออนไลน์ (%1$d)</string>
+    <string name="steam_friends_section_offline">ออฟไลน์ (%1$d)</string>
+    <string name="steam_friends_none_loaded">ยังไม่ได้โหลดเพื่อน</string>
+    <string name="steam_friends_chat_off">แชทถูกปิดอยู่ เปิดบริการแชทอีกครั้งเพื่อดูเพื่อนของคุณ</string>
+    <string name="steam_friends_self_you">คุณ</string>
+    <string name="steam_friends_in_game">ในเกม</string>
+    <string name="steam_friends_join">เข้าร่วม</string>
+    <string name="steam_friends_play">เล่น</string>
+    <string name="steam_chat_image_failed">(ส่งรูปภาพไม่สำเร็จ)</string>
+    <string name="steam_chat_empty">ยังไม่มีข้อความ ทักทายกันหน่อย!</string>
+    <string name="steam_chat_uploading_image">กำลังอัปโหลดรูปภาพ…</string>
+    <string name="steam_chat_send_image">ส่งรูปภาพ</string>
+    <string name="steam_chat_message_hint">ข้อความ…</string>
+    <string name="steam_chat_send">ส่ง</string>
+    <string name="steam_chat_image">รูปภาพ</string>
+    <string name="steam_common_back">ย้อนกลับ</string>
+    <string name="steam_achievements_title">ความสำเร็จ</string>
+    <string name="steam_achievements_empty">ไม่พบความสำเร็จสำหรับเกมนี้\nหรือลงชื่อเข้าใช้ Steam เพื่อโหลด</string>
+    <string name="steam_achievements_hidden">ความสำเร็จที่ซ่อนอยู่</string>
+    <string name="steam_achievements_hidden_desc">เล่นต่อไปเพื่อเปิดเผยความสำเร็จนี้</string>
+    <string name="steam_achievements_unlocked_on">ปลดล็อกเมื่อ %1$s</string>
+    <string name="steam_achievements_unlocked">ปลดล็อกแล้ว</string>
+    <string name="steam_join_joining">กำลังเข้าร่วม %1$s ใน %2$s…</string>
+    <string name="steam_join_install">ติดตั้ง %1$s เพื่อเข้าร่วม %2$s</string>
+    <string name="steam_join_not_owned">คุณไม่ได้เป็นเจ้าของ %1$s</string>
+    <string name="steam_chat_not_sent">(ยังไม่ได้ส่ง)</string>
+    <string name="steam_join_the_game">เกม</string>
+    <string name="steam_friends_settings">การตั้งค่า</string>
+    <string name="steam_chat_settings_title">การตั้งค่าแชท</string>
+    <string name="steam_chat_setting_service">บริการแชท</string>
+    <string name="steam_chat_setting_service_desc">เข้าสู่ระบบเพื่อดูเพื่อนและแชท ปิดเพื่อออฟไลน์</string>
+    <string name="steam_chat_setting_notifications">การแจ้งเตือนแชท</string>
+    <string name="steam_chat_setting_notifications_desc">แสดงการแจ้งเตือนเมื่อคุณได้รับข้อความ</string>
+    <string name="steam_chat_setting_heads">หัวแชท</string>
+    <string name="steam_chat_setting_heads_desc">ฟองลอยสำหรับอ่านและตอบข้อความ</string>
+    <string name="steam_chat_setting_ingame">เปิดใช้งานแชทในเกม</string>
+    <string name="steam_chat_setting_ingame_desc">รับและส่งข้อความขณะเล่น</string>
+    <string name="steam_chat_setting_stay_running">ทำงานในเบื้องหลัง</string>
+    <string name="steam_chat_setting_stay_running_desc">ให้แชททำงานต่อหลังจากคุณออกจาก WinNative</string>
+    <string name="steam_chat_settings_overlay_needed">อนุญาตให้แสดงทับแอปอื่นเพื่อใช้หัวแชท</string>
+    <string name="steam_chat_heads_title">ข้อความ</string>
+    <string name="steam_chat_heads_recent_title">ล่าสุด</string>
+    <string name="steam_chat_heads_online_title">ออนไลน์</string>
+    <string name="steam_chat_heads_new_chat">ข้อความใหม่</string>
+    <string name="steam_chat_setting_autohide">ซ่อนอัตโนมัติ</string>
+    <string name="steam_chat_setting_autohide_desc">จางหัวแชทหลังไม่มีการใช้งาน 10 วินาที</string>
+    <string name="steam_chat_heads_friends_title">เพื่อน</string>
+    <!-- File manager -->
+    <string name="file_manager_title">ไฟล์</string>
+    <string name="file_manager_copy">คัดลอก</string>
+    <string name="file_manager_cut">ตัด</string>
+    <string name="file_manager_paste">วาง</string>
+    <string name="file_manager_paste_here">วางที่นี่</string>
+    <string name="file_manager_new_folder">โฟลเดอร์ใหม่</string>
+    <string name="file_manager_new_folder_short">โฟลเดอร์</string>
+    <string name="file_manager_multi_select">เลือก</string>
+    <string name="file_manager_create">สร้าง</string>
+    <string name="file_manager_delete">ลบ</string>
+    <string name="file_manager_copy_count">คัดลอก (%1$d)</string>
+    <string name="file_manager_cut_count">ตัด (%1$d)</string>
+    <string name="file_manager_delete_count">ลบ (%1$d)</string>
+    <string name="file_manager_extract">แตกไฟล์</string>
+    <string name="file_manager_extract_here">แตกไฟล์ที่นี่</string>
+    <string name="file_manager_extract_to">แตกไฟล์ไปที่…</string>
+    <string name="file_manager_extracting">กำลังแตกไฟล์ %1$s</string>
+    <string name="file_manager_extract_failed">แตกไฟล์ไม่สำเร็จ</string>
+    <string name="file_manager_run_boot">รัน / บูต</string>
+    <string name="file_manager_create_shortcut">สร้างทางลัด</string>
+    <string name="file_manager_run_in_container">รันในคอนเทนเนอร์</string>
+    <string name="file_manager_no_containers">ไม่มีคอนเทนเนอร์ที่พร้อมใช้งาน</string>
+    <string name="file_manager_delete_confirm">ลบ \"%1$s\" หรือไม่? การกระทำนี้ไม่สามารถยกเลิกได้</string>
+    <string name="file_manager_delete_confirm_multi">ลบ %1$d รายการหรือไม่? การกระทำนี้ไม่สามารถยกเลิกได้</string>
+    <string name="file_manager_copying">กำลังคัดลอก %1$s</string>
+    <string name="file_manager_moving">กำลังย้าย %1$s</string>
+    <string name="file_manager_copying_count">กำลังคัดลอก %1$d รายการ</string>
+    <string name="file_manager_moving_count">กำลังย้าย %1$d รายการ</string>
+    <string name="file_manager_paste_into_itself">ไม่สามารถวางโฟลเดอร์ลงในตัวมันเองได้</string>
+    <string name="file_manager_operation_failed">การดำเนินการล้มเหลว</string>
+    <string name="file_manager_delete_failed">ลบล้มเหลว</string>
+    <string name="file_manager_rename_failed">เปลี่ยนชื่อล้มเหลว</string>
+    <string name="file_manager_create_folder_failed">สร้างโฟลเดอร์ล้มเหลว</string>
+
+    <string name="settings_content_refresh">รีเฟรช</string>
+    <string name="settings_retro_title">เรโทร</string>
+    <string name="retro_save_transfer_title">ถ่ายโอนเซฟ</string>
+    <string name="retro_save_transfer_message">นำเข้าไฟล์เซฟในเครื่องสำหรับเกมนี้ หรือส่งออกเซฟปัจจุบันของเกม</string>
+    <string name="retro_save_transfer_import">นำเข้าเซฟ</string>
+    <string name="retro_save_transfer_export">ส่งออกเซฟ</string>
+    <string name="retro_save_transfer_import_ok">นำเข้าเซฟแล้ว</string>
+    <string name="retro_save_transfer_import_failed">ไม่สามารถนำเข้าเซฟได้</string>
+    <string name="retro_save_transfer_export_ok">ส่งออกเซฟแล้ว</string>
+    <string name="retro_save_transfer_export_failed">ไม่สามารถส่งออกเซฟได้</string>
+    <string name="retro_save_transfer_none">ยังไม่มีเซฟสำหรับเกมนี้</string>
+    <string name="retro_cheats_title">สูตรโกง</string>
+    <string name="retro_cheats_hardcore_blocked">สูตรโกงถูกปิดใช้งานในโหมดฮาร์ดคอร์</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">บันทึก</string>
+    <string name="retro_ps2_cancel">ยกเลิก</string>
+    <string name="retro_ps2_save_state">บันทึกสเตต</string>
+    <string name="retro_ps2_load_save_state">โหลดสเตตที่บันทึก</string>
+    <string name="retro_ps2_achievements">ความสำเร็จ</string>
+    <string name="retro_ps2_cheats">สูตรโกง</string>
+    <string name="retro_ps2_memory_cards">การ์ดหน่วยความจำ</string>
+    <string name="retro_ps2_fast_forward">กรอไปข้างหน้า</string>
+    <string name="retro_ps2_reset">รีเซ็ต</string>
+    <string name="retro_ps2_swap_disc">สลับแผ่น</string>
+    <string name="retro_ps2_slot">ช่อง %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">แตะเพื่อโหลด</string>
+    <string name="retro_ps2_slot_empty">ว่าง</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">แตะเพื่อเขียนทับ</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">ว่าง — แตะเพื่อบันทึก</string>
+    <string name="retro_ps2_slot_is_empty">ช่อง %1$d ว่าง</string>
+    <string name="retro_ps2_loaded_slot">โหลดช่อง %1$d แล้ว</string>
+    <string name="retro_ps2_could_not_load_slot">ไม่สามารถโหลดช่อง %1$d</string>
+    <string name="retro_ps2_saved_to_slot">บันทึกไปยังช่อง %1$d</string>
+    <string name="retro_ps2_save_failed">บันทึกไม่สำเร็จ</string>
+    <string name="retro_ps2_slot_1_suffix">  •  ช่อง 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  ช่อง 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  แตะเพื่อใช้</string>
+    <string name="retro_ps2_new_memory_card">การ์ดหน่วยความจำใหม่</string>
+    <string name="retro_ps2_import_card">นำเข้าการ์ด</string>
+    <string name="retro_ps2_enable_online_dev9">เปิดใช้งานออนไลน์ (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">อะแดปเตอร์เครือข่าย PS2 — รีสตาร์ตเกมเพื่อเชื่อมต่อ</string>
+    <string name="retro_ps2_ethernet_device">อุปกรณ์อีเทอร์เน็ต</string>
+    <string name="retro_ps2_dns_mode">โหมด DNS</string>
+    <string name="retro_ps2_primary_dns">DNS หลัก</string>
+    <string name="retro_ps2_secondary_dns">DNS รอง</string>
+    <string name="retro_ps2_optional">ไม่บังคับ</string>
+    <string name="retro_ps2_auto_ip_dhcp">IP อัตโนมัติ (DHCP)</string>
+    <string name="retro_ps2_server_host">เซิร์ฟเวอร์: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">แตะเพื่อตั้ง IP (เว้นว่างเพื่อลบ)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">เพิ่มโฮสต์เซิร์ฟเวอร์</string>
+    <string name="retro_ps2_new_server_hostname">ชื่อโฮสต์เซิร์ฟเวอร์ใหม่</string>
+    <string name="retro_ps2_server_hostname_hint">เช่น bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">ปุ่มควบคุมบนหน้าจอ</string>
+    <string name="retro_ps2_edit_layout">แก้ไขเลย์เอาต์</string>
+    <string name="retro_ps2_reset_layout">รีเซ็ตเลย์เอาต์</string>
+    <string name="retro_ps2_layout_reset">รีเซ็ตเลย์เอาต์แล้ว</string>
+    <string name="retro_ps2_left_stick_invert_x">สติกซ้าย: กลับด้าน X</string>
+    <string name="retro_ps2_left_stick_invert_y">สติกซ้าย: กลับด้าน Y</string>
+    <string name="retro_ps2_right_stick_invert_x">สติกขวา: กลับด้าน X</string>
+    <string name="retro_ps2_right_stick_invert_y">สติกขวา: กลับด้าน Y</string>
+    <string name="retro_ps2_button_color">สีปุ่ม</string>
+    <string name="retro_ps2_letter_color">สีตัวอักษร</string>
+    <string name="retro_ps2_shadow_color">สีเงา</string>
+    <string name="retro_ps2_background_color">สีพื้นหลัง</string>
+    <string name="retro_ps2_reset_colors">รีเซ็ตสี</string>
+    <string name="retro_ps2_renderer">ตัวเรนเดอร์</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">สเกลความละเอียด</string>
+    <string name="retro_ps2_scale_1x_native">1x (เนทีฟ)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">อัตราส่วนภาพ</string>
+    <string name="retro_ps2_aspect_stretch">ยืด</string>
+    <string name="retro_ps2_aspect_auto_standard">อัตโนมัติ (มาตรฐาน)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">ฟิลเตอร์การแสดงผล</string>
+    <string name="retro_ps2_filter_nearest">ใกล้สุด</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinear (เนียน)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinear (คม)</string>
+    <string name="retro_ps2_texture_filter">ฟิลเตอร์พื้นผิว</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinear (บังคับ)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinear (สไปรต์)</string>
+    <string name="retro_ps2_blending_accuracy">ความแม่นยำการผสม</string>
+    <string name="retro_ps2_blend_minimum">ต่ำสุด</string>
+    <string name="retro_ps2_blend_basic">พื้นฐาน</string>
+    <string name="retro_ps2_blend_medium">ปานกลาง</string>
+    <string name="retro_ps2_blend_high">สูง</string>
+    <string name="retro_ps2_blend_full">เต็ม</string>
+    <string name="retro_ps2_blend_maximum">สูงสุด</string>
+    <string name="retro_ps2_crt_tv_shader">เชดเดอร์ CRT / TV</string>
+    <string name="retro_ps2_shader_off">ปิด</string>
+    <string name="retro_ps2_shader_scanline">สแกนไลน์</string>
+    <string name="retro_ps2_shader_diagonal">แนวทแยง</string>
+    <string name="retro_ps2_shader_triangular">สามเหลี่ยม</string>
+    <string name="retro_ps2_shader_wave">คลื่น</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">ข้ามเฟรม</string>
+    <string name="retro_ps2_frameskip_off">ปิด</string>
+    <string name="retro_ps2_frameskip_1">ข้าม 1</string>
+    <string name="retro_ps2_frameskip_2">ข้าม 2</string>
+    <string name="retro_ps2_frameskip_3">ข้าม 3</string>
+    <string name="retro_ps2_mipmapping">มิปแมปปิง</string>
+    <string name="retro_ps2_volume">ระดับเสียง</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">ปิดเสียง</string>
+    <string name="retro_ps2_swap_stereo_channels">สลับช่องสเตอริโอ</string>
+    <string name="retro_ps2_ee_cycle_rate">อัตรารอบ EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (ค่าเริ่มต้น)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">ข้ามรอบ EE</string>
+    <string name="retro_ps2_skip_off">ปิด</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">VU1 ทันที</string>
+    <string name="retro_ps2_mtvu">VU หลายเธรด (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">CDVD เร็ว</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">ความเร็วการจำลอง</string>
+    <string name="retro_ps2_hud_cpu_usage">การใช้ CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">การใช้ GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">ความละเอียดภายใน</string>
+    <string name="retro_ps2_deinterlace_mode">โหมดดีอินเตอร์เลซ</string>
+    <string name="retro_ps2_deint_auto">อัตโนมัติ</string>
+    <string name="retro_ps2_deint_off">ปิด</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">อัตราส่วนภาพ FMV</string>
+    <string name="retro_ps2_anti_blur">ป้องกันภาพเบลอ</string>
+    <string name="retro_ps2_widescreen_patches">แพตช์จอกว้าง</string>
+    <string name="retro_ps2_no_interlace_patches">แพตช์ไม่อินเตอร์เลซ</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">การตรวจจับ INTC Spin</string>
+    <string name="retro_ps2_wait_loop">การตรวจจับลูปรอ</string>
+    <string name="retro_ps2_time_stretch">การยืดเวลาเสียง</string>
+    <string name="retro_ps2_audio_buffer">บัฟเฟอร์เสียง</string>
+    <string name="retro_ps2_audio_latency">ความหน่วงเอาต์พุต</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">เวลาต่อเฟรม</string>
+    <string name="retro_ps2_hud_gs_stats">สถิติ GS</string>
+    <string name="retro_ps2_hud_hw_info">ข้อมูลฮาร์ดแวร์</string>
+    <string name="retro_ps2_hud_version">เวอร์ชัน</string>
+    <string name="retro_ps2_hud_input_display">การแสดงอินพุต</string>
+    <string name="retro_ps2_tab_menu">เมนู</string>
+    <string name="retro_ps2_tab_display">การแสดงผล</string>
+    <string name="retro_ps2_tab_performance">ประสิทธิภาพ</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">เสียง</string>
+    <string name="retro_ps2_tab_online">ออนไลน์</string>
+    <string name="retro_ps2_tab_controls">การควบคุม</string>
+    <string name="retro_ps2_resume">เล่นต่อ</string>
+    <string name="retro_ps2_pause">หยุดชั่วคราว</string>
+    <string name="retro_ps2_exit">ออก</string>
+    <string name="retro_lr_bios_imported">นำเข้า BIOS แล้ว: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">ไฟล์ BIOS ไม่ถูกต้อง</string>
+    <string name="retro_lr_invalid_retro_game">เกมเรโทรไม่ถูกต้อง</string>
+    <string name="retro_lr_rom_not_found">ไม่พบ ROM: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">ไม่สามารถอ่าน ROM ภายในไฟล์เก็บถาวรนี้</string>
+    <string name="retro_lr_core_not_installed">ยังไม่ได้ติดตั้งคอร์: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">เปิดสูตรโกง — ความสำเร็จถูกปิดในเซสชันนี้</string>
+    <string name="retro_lr_cloud_save_restored">กู้คืนการบันทึกบนคลาวด์แล้ว</string>
+    <string name="retro_lr_restore_failed">กู้คืนไม่สำเร็จ</string>
+    <string name="retro_lr_cloud_conflict_message">มีการบันทึกบนคลาวด์ที่ใหม่กว่าสำหรับ %1$s คุณต้องการซิงค์หรือไม่ และต้องการเก็บการบันทึกบนคลาวด์ใด?</string>
+    <string name="retro_lr_cloud_save">การบันทึกบนคลาวด์</string>
+    <string name="retro_lr_renderer_default">เรโทร</string>
+    <string name="retro_lr_failed_load_core">โหลดคอร์อีมูเลเตอร์ไม่สำเร็จ</string>
+    <string name="retro_lr_failed_load_rom">โหลด ROM ไม่สำเร็จ</string>
+    <string name="retro_lr_graphics_not_supported">คอร์นี้ไม่รองรับกราฟิก</string>
+    <string name="retro_lr_emulator_error">ข้อผิดพลาดอีมูเลเตอร์</string>
+    <string name="retro_lr_shader_default">ค่าเริ่มต้น</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">คม</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR อัปสเกล</string>
+    <string name="retro_lr_upscale_native">เนทีฟ</string>
+    <string name="retro_lr_sound">เสียง</string>
+    <string name="retro_lr_left_stick_invert_x">สติกซ้าย: กลับด้าน X</string>
+    <string name="retro_lr_left_stick_invert_y">สติกซ้าย: กลับด้าน Y</string>
+    <string name="retro_lr_right_stick_invert_x">สติกขวา: กลับด้าน X</string>
+    <string name="retro_lr_right_stick_invert_y">สติกขวา: กลับด้าน Y</string>
+    <string name="retro_lr_on_screen_controls">ปุ่มควบคุมบนหน้าจอ</string>
+    <string name="retro_lr_haptic_feedback">การสั่นตอบสนอง</string>
+    <string name="retro_lr_portrait">แนวตั้ง</string>
+    <string name="retro_lr_landscape">แนวนอน</string>
+    <string name="retro_lr_edit_layout">แก้ไขเลย์เอาต์ (%1$s)</string>
+    <string name="retro_lr_reset_layout">รีเซ็ตเลย์เอาต์ %1$s</string>
+    <string name="retro_lr_layout_reset">รีเซ็ตเลย์เอาต์ %1$s แล้ว</string>
+    <string name="retro_lr_button_color">สีปุ่ม</string>
+    <string name="retro_lr_letter_color">สีตัวอักษร</string>
+    <string name="retro_lr_shadow_color">สีเงา</string>
+    <string name="retro_lr_background_color">สีพื้นหลัง</string>
+    <string name="retro_lr_reset_colors">รีเซ็ตสี</string>
+    <string name="retro_lr_colors_reset">รีเซ็ตสีแล้ว</string>
+    <string name="retro_lr_performance_hud">HUD ประสิทธิภาพ</string>
+    <string name="retro_lr_alpha">อัลฟา</string>
+    <string name="retro_lr_background_alpha">อัลฟาพื้นหลัง</string>
+    <string name="retro_lr_background">พื้นหลัง</string>
+    <string name="retro_lr_scale">สเกล</string>
+    <string name="retro_lr_numeric_frametime">เฟรมไทม์แบบตัวเลข</string>
+    <string name="retro_lr_dual_series_battery">แบตเตอรีสองชุด</string>
+    <string name="retro_lr_hud_elements">องค์ประกอบ HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">คอนโซล</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">แบตเตอรี</string>
+    <string name="retro_lr_hud_temp">อุณหภูมิ</string>
+    <string name="retro_lr_hud_graph">กราฟ</string>
+    <string name="retro_lr_hud_cpu_temp">อุณหภูมิ CPU</string>
+    <string name="retro_lr_save_state">บันทึกสเตต</string>
+    <string name="retro_lr_load_save_state">โหลดสเตตที่บันทึก</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">การโหลดสเตตถูกปิดในโหมดฮาร์ดคอร์</string>
+    <string name="retro_lr_achievements">ความสำเร็จ</string>
+    <string name="retro_lr_cheats">สูตรโกง</string>
+    <string name="retro_lr_cheats_disabled_hardcore">สูตรโกงถูกปิดในโหมดฮาร์ดคอร์</string>
+    <string name="retro_lr_reset">รีเซ็ต</string>
+    <string name="retro_lr_fast_forward">กรอไปข้างหน้า</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">การกรอไปข้างหน้าถูกปิดในโหมดฮาร์ดคอร์</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">แผ่น %1$d/%2$d</string>
+    <string name="retro_lr_resume">เล่นต่อ</string>
+    <string name="retro_lr_pause">หยุดชั่วคราว</string>
+    <string name="retro_lr_exit">ออก</string>
+    <string name="retro_lr_saved_to_slot">บันทึกไปยังช่อง %1$d</string>
+    <string name="retro_lr_could_not_save_state">ไม่สามารถบันทึกสเตต</string>
+    <string name="retro_lr_bios_required_title">ต้องใช้ BIOS ของ %1$s</string>
+    <string name="retro_lr_bios_required_message">เกม PlayStation ต้องใช้ไฟล์ BIOS ของคอนโซลจริงที่คุณต้องจัดหาเอง นำเข้า BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin หรือ scph7001.bin) เพื่อดำเนินการต่อ</string>
+    <string name="retro_lr_import_bios">นำเข้า BIOS…</string>
+    <string name="retro_lr_cancel">ยกเลิก</string>
+    <string name="retro_lr_slot_empty">ช่อง %1$d ว่าง</string>
+    <string name="retro_lr_loaded_slot">โหลดช่อง %1$d แล้ว</string>
+    <string name="retro_lr_could_not_load_state">ไม่สามารถโหลดสเตต</string>
+    <string name="retro_lr_slot_title">ช่อง %1$d</string>
+    <string name="retro_lr_rename_slot">เปลี่ยนชื่อช่อง %1$d</string>
+    <string name="retro_gs_section_general">ทั่วไป</string>
+    <string name="retro_gs_section_graphics">กราฟิก</string>
+    <string name="retro_gs_section_performance">ประสิทธิภาพ</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">อินพุต</string>
+    <string name="retro_gs_section_audio">เสียง</string>
+    <string name="retro_gs_section_online">ออนไลน์</string>
+    <string name="retro_gs_cancel">ยกเลิก</string>
+    <string name="retro_gs_save">บันทึก</string>
+    <string name="retro_gs_shader_default">ค่าเริ่มต้น</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">คม</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">เนทีฟ</string>
+    <string name="retro_gs_group_game">เกม</string>
+    <string name="retro_gs_label_name">ชื่อ</string>
+    <string name="retro_gs_label_system">ระบบ</string>
+    <string name="retro_gs_label_emulator_core">คอร์อีมูเลเตอร์</string>
+    <string name="retro_gs_label_rom_path">เส้นทาง ROM</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">ติดตั้งแล้ว</string>
+    <string name="retro_gs_bios_none">ไม่มี — จำเป็นสำหรับการรันเกม %1$s</string>
+    <string name="retro_gs_import_bios">นำเข้า BIOS…</string>
+    <string name="retro_gs_remove_bios">ลบ BIOS</string>
+    <string name="retro_gs_group_library_artwork">อาร์ตเวิร์กคลังเกม</string>
+    <string name="retro_gs_artwork_game_card">ภาพการ์ดเกม</string>
+    <string name="retro_gs_artwork_grid">ภาพกริด</string>
+    <string name="retro_gs_artwork_carousel">ภาพคาโรเซล</string>
+    <string name="retro_gs_artwork_list">ภาพรายการ</string>
+    <string name="retro_gs_artwork_custom_set">ตั้งภาพกำหนดเอง</string>
+    <string name="retro_gs_artwork_set_image">ตั้งภาพ</string>
+    <string name="retro_gs_artwork_remove">ลบ</string>
+    <string name="retro_gs_group_video">วิดีโอ</string>
+    <string name="retro_gs_video_filter">ฟิลเตอร์วิดีโอ</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR อัปสเกล</string>
+    <string name="retro_gs_performance_hud">HUD ประสิทธิภาพ</string>
+    <string name="retro_gs_group_core">คอร์</string>
+    <string name="retro_gs_renderer">ตัวเรนเดอร์</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">สเกลความละเอียด</string>
+    <string name="retro_gs_scale_1x_native">1x (เนทีฟ)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">อัตราส่วนภาพ</string>
+    <string name="retro_gs_aspect_stretch">ยืด</string>
+    <string name="retro_gs_aspect_auto_standard">อัตโนมัติ (มาตรฐาน)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">ฟิลเตอร์การแสดงผล</string>
+    <string name="retro_gs_filter_nearest">ใกล้สุด</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinear (เนียน)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinear (คม)</string>
+    <string name="retro_gs_texture_filter">ฟิลเตอร์พื้นผิว</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinear (บังคับ)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinear (สไปรต์)</string>
+    <string name="retro_gs_blending_accuracy">ความแม่นยำการผสม</string>
+    <string name="retro_gs_blend_minimum">ต่ำสุด</string>
+    <string name="retro_gs_blend_basic">พื้นฐาน</string>
+    <string name="retro_gs_blend_medium">ปานกลาง</string>
+    <string name="retro_gs_blend_high">สูง</string>
+    <string name="retro_gs_blend_full">เต็ม</string>
+    <string name="retro_gs_blend_maximum">สูงสุด</string>
+    <string name="retro_gs_crt_tv_shader">เชดเดอร์ CRT / TV</string>
+    <string name="retro_gs_off">ปิด</string>
+    <string name="retro_gs_tvshader_scanline">สแกนไลน์</string>
+    <string name="retro_gs_tvshader_diagonal">แนวทแยง</string>
+    <string name="retro_gs_tvshader_triangular">สามเหลี่ยม</string>
+    <string name="retro_gs_tvshader_wave">คลื่น</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">ข้ามเฟรม</string>
+    <string name="retro_gs_frameskip_1">ข้าม 1</string>
+    <string name="retro_gs_frameskip_2">ข้าม 2</string>
+    <string name="retro_gs_frameskip_3">ข้าม 3</string>
+    <string name="retro_gs_mipmapping">มิปแมปปิง</string>
+    <string name="retro_gs_group_performance">ประสิทธิภาพ</string>
+    <string name="retro_gs_ee_cycle_rate">อัตรารอบ EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (ค่าเริ่มต้น)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">ข้ามรอบ EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">VU1 ทันที</string>
+    <string name="retro_gs_mtvu">VU หลายเธรด (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">CDVD เร็ว</string>
+    <string name="retro_gs_group_performance_hud">HUD ประสิทธิภาพ</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">ความเร็วการจำลอง</string>
+    <string name="retro_gs_hud_cpu_usage">การใช้ CPU</string>
+    <string name="retro_gs_hud_gpu_usage">การใช้ GPU</string>
+    <string name="retro_gs_hud_internal_resolution">ความละเอียดภายใน</string>
+    <string name="retro_gs_deinterlace_mode">โหมดดีอินเตอร์เลซ</string>
+    <string name="retro_gs_deint_auto">อัตโนมัติ</string>
+    <string name="retro_gs_deint_off">ปิด</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">อัตราส่วนภาพ FMV</string>
+    <string name="retro_gs_anti_blur">ป้องกันภาพเบลอ</string>
+    <string name="retro_gs_widescreen_patches">แพตช์จอกว้าง</string>
+    <string name="retro_gs_no_interlace_patches">แพตช์ไม่อินเตอร์เลซ</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">การตรวจจับ INTC Spin</string>
+    <string name="retro_gs_wait_loop">การตรวจจับลูปรอ</string>
+    <string name="retro_gs_time_stretch">การยืดเวลาเสียง</string>
+    <string name="retro_gs_audio_buffer">บัฟเฟอร์เสียง</string>
+    <string name="retro_gs_audio_latency">ความหน่วงเอาต์พุต</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">เวลาต่อเฟรม</string>
+    <string name="retro_gs_hud_gs_stats">สถิติ GS</string>
+    <string name="retro_gs_hud_hw_info">ข้อมูลฮาร์ดแวร์</string>
+    <string name="retro_gs_hud_version">เวอร์ชัน</string>
+    <string name="retro_gs_hud_input_display">การแสดงอินพุต</string>
+    <string name="retro_gs_fast_boot">บูตด่วน</string>
+    <string name="retro_gs_group_online_dev9">ออนไลน์ (DEV9)</string>
+    <string name="retro_gs_enable_online">เปิดใช้งานออนไลน์</string>
+    <string name="retro_gs_ethernet_device">อุปกรณ์อีเทอร์เน็ต</string>
+    <string name="retro_gs_net_auto">อัตโนมัติ</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">โหมด DNS</string>
+    <string name="retro_gs_dns_manual">กำหนดเอง</string>
+    <string name="retro_gs_dns_internal">ภายใน</string>
+    <string name="retro_gs_primary_dns">DNS หลัก</string>
+    <string name="retro_gs_secondary_dns">DNS รอง</string>
+    <string name="retro_gs_dns_optional">ไม่บังคับ</string>
+    <string name="retro_gs_auto_ip_dhcp">IP อัตโนมัติ (DHCP)</string>
+    <string name="retro_gs_group_input">อินพุต</string>
+    <string name="retro_engine_save">บันทึก</string>
+    <string name="retro_engine_saved">บันทึกเกมแล้ว</string>
+    <string name="retro_engine_loading">กำลังโหลด…</string>
+    <string name="retro_engine_load">โหลด</string>
+    <string name="retro_engine_saved_to">บันทึกไปยัง %1$s แล้ว</string>
+    <string name="retro_engine_slot_active_only">ใช้งานอยู่</string>
+    <string name="retro_engine_rename_slot">เปลี่ยนชื่อช่องบันทึก</string>
+    <string name="retro_engine_caught">จับได้ %1$d ตัว</string>
+    <string name="retro_engine_no_slots">ยังไม่มีช่องบันทึก</string>
+    <string name="retro_engine_new_slot">ช่องบันทึกใหม่</string>
+    <string name="retro_engine_achievements_unavailable">ไม่บันทึกในโหมด 3D</string>
+    <string name="retro_engine_fullscreen">เต็มหน้าจอ</string>
+    <string name="retro_engine_loaded_from">โหลด %1$s แล้ว</string>
+    <string name="retro_engine_slot_empty">ช่องนั้นว่างเปล่า</string>
+    <string name="retro_engine_loading_subtitle">กำลังเตรียมข้อมูลเกมเป็นครั้งแรก</string>
+    <string name="retro_gs_engine_3d">วอกเซล 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">เล่นเกมนี้ด้วยเอนจินวอกเซล 3D แทนคอร์มาตรฐาน</string>
+    <string name="retro_gs_on_screen_controls">ปุ่มควบคุมบนหน้าจอ</string>
+    <string name="retro_gs_haptic_feedback">การสั่นตอบสนอง</string>
+    <string name="retro_gs_group_audio">เสียง</string>
+    <string name="retro_gs_volume">ระดับเสียง</string>
+    <string name="retro_gs_mute">ปิดเสียง</string>
+    <string name="retro_gs_swap_stereo">สลับช่องสเตอริโอ</string>
+    <string name="retro_gs_sound">เสียง</string>
+    <string name="retro_scr_retro_defaults">ค่าเริ่มต้นเรโทร</string>
+    <string name="retro_scr_retro_defaults_desc">ค่าเริ่มต้นที่ใช้กับเกมของแต่ละคอนโซล เว้นแต่จะถูกแทนที่ในการตั้งค่าเฉพาะของเกม</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">บัญชี</string>
+    <string name="retro_scr_signed_in">ลงชื่อเข้าใช้แล้ว</string>
+    <string name="retro_scr_not_signed_in_hint">ยังไม่ได้ลงชื่อเข้าใช้ — เปิดความสำเร็จของเกมเพื่อลงชื่อเข้าใช้</string>
+    <string name="retro_scr_achievements_enabled">เปิดใช้งานความสำเร็จ</string>
+    <string name="retro_scr_hardcore_default">โหมดฮาร์ดคอร์โดยค่าเริ่มต้น (ไม่มีสเตตบันทึก)</string>
+    <string name="retro_scr_sign_out">ออกจากระบบ</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">ติดตั้งแล้ว</string>
+    <string name="retro_scr_none_ps1_bios">ไม่มี — เกม PS1 ต้องใช้ BIOS</string>
+    <string name="retro_scr_import_ps1_bios">นำเข้า PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">ลบ PS1 BIOS แล้ว</string>
+    <string name="retro_scr_no_bios_to_remove">ไม่มี BIOS ให้ลบ</string>
+    <string name="retro_scr_remove_ps1_bios">ลบ PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">ไม่มี — เกม PS2 ต้องใช้ BIOS</string>
+    <string name="retro_scr_format">รูปแบบ</string>
+    <string name="retro_scr_ps2_bios_format">ดัมป์ไฟล์เดียวที่รวมกัน (.bin ติดแท็กภูมิภาค, ~4MB) ไม่รับชุด ROM0/MEC/NVM ที่แยกไฟล์</string>
+    <string name="retro_scr_import_ps2_bios">นำเข้า PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">ลบ PS2 BIOS แล้ว</string>
+    <string name="retro_scr_remove_ps2_bios">ลบ PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">อาร์ตเวิร์กคลังเกม</string>
+    <string name="retro_scr_retro_case_art">อาร์ตเคสเรโทร (ตลับ / เคส CD)</string>
+    <string name="retro_scr_box_art">อาร์ตกล่อง</string>
+    <string name="retro_scr_box_art_desc">ดึงอัตโนมัติจาก thumbnails.libretro.com เมื่อนำเข้า; ภาพกำหนดเองจะแทนที่เสมอ</string>
+    <string name="retro_scr_roms_folder">โฟลเดอร์ ROMS</string>
+    <string name="retro_scr_folder">โฟลเดอร์</string>
+    <string name="retro_scr_roms_not_set">ยังไม่ได้ตั้ง — เลือกโฟลเดอร์เพื่อนำเข้าเกมอัตโนมัติ</string>
+    <string name="retro_scr_auto_import">นำเข้าอัตโนมัติ</string>
+    <string name="retro_scr_auto_import_desc">เกมใหม่ในโฟลเดอร์นี้จะถูกเพิ่มลงคลังของคุณอัตโนมัติพร้อมตรวจพบคอนโซลที่ถูกต้อง</string>
+    <string name="retro_scr_select_roms_folder_title">เลือกโฟลเดอร์ ROMs</string>
+    <string name="retro_scr_select_roms_folder_button">เลือกโฟลเดอร์ ROMs…</string>
+    <string name="retro_scr_change_roms_folder_button">เปลี่ยนโฟลเดอร์ ROMs…</string>
+    <string name="retro_scr_scan_now">สแกนทันที</string>
+    <string name="retro_scr_console_defaults">ค่าเริ่มต้นคอนโซล</string>
+    <string name="retro_scr_console_defaults_desc">แตะคอนโซลเพื่อตั้งค่าเริ่มต้น</string>
+    <string name="retro_scr_renderer">ตัวเรนเดอร์</string>
+    <string name="retro_scr_upscale_resolution">อัปสเกลความละเอียด</string>
+    <string name="retro_scr_aspect_ratio">อัตราส่วนภาพ</string>
+    <string name="retro_scr_aspect_stretch">ยืด</string>
+    <string name="retro_scr_aspect_auto_standard">อัตโนมัติ (มาตรฐาน)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">ฟิลเตอร์การแสดงผล</string>
+    <string name="retro_scr_filter_nearest">ใกล้สุด</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinear (เนียน)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinear (คม)</string>
+    <string name="retro_scr_texture_filter">ฟิลเตอร์พื้นผิว</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinear (บังคับ)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinear (สไปรต์)</string>
+    <string name="retro_scr_blending_accuracy">ความแม่นยำการผสม</string>
+    <string name="retro_scr_blend_minimum">ต่ำสุด</string>
+    <string name="retro_scr_blend_basic">พื้นฐาน</string>
+    <string name="retro_scr_blend_medium">ปานกลาง</string>
+    <string name="retro_scr_blend_high">สูง</string>
+    <string name="retro_scr_blend_full">เต็ม</string>
+    <string name="retro_scr_blend_maximum">สูงสุด</string>
+    <string name="retro_scr_crt_tv_shader">เชดเดอร์ CRT / TV</string>
+    <string name="retro_scr_shader_off">ปิด</string>
+    <string name="retro_scr_shader_scanline">สแกนไลน์</string>
+    <string name="retro_scr_shader_diagonal">แนวทแยง</string>
+    <string name="retro_scr_shader_triangular">สามเหลี่ยม</string>
+    <string name="retro_scr_shader_wave">คลื่น</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">ข้ามเฟรม</string>
+    <string name="retro_scr_skip_1">ข้าม 1</string>
+    <string name="retro_scr_skip_2">ข้าม 2</string>
+    <string name="retro_scr_skip_3">ข้าม 3</string>
+    <string name="retro_scr_mipmapping">มิปแมปปิง</string>
+    <string name="retro_scr_ee_cycle_rate">อัตรารอบ EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (ค่าเริ่มต้น)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">ข้ามรอบ EE</string>
+    <string name="retro_scr_skip_off">ปิด</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">VU1 ทันที</string>
+    <string name="retro_scr_mtvu">VU หลายเธรด (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">CDVD เร็ว</string>
+    <string name="retro_scr_touch_controls">ปุ่มควบคุมสัมผัสบนหน้าจอ</string>
+    <string name="retro_scr_sound">เสียง</string>
+    <string name="retro_scr_swap_stereo">สลับช่องสเตอริโอ</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: ความเร็วการจำลอง</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: การใช้ CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: การใช้ GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: ความละเอียดภายใน</string>
+    <string name="retro_scr_enable_online_dev9">เปิดใช้งานออนไลน์ (DEV9)</string>
+    <string name="retro_scr_ethernet_device">อุปกรณ์อีเทอร์เน็ต</string>
+    <string name="retro_scr_net_auto">อัตโนมัติ</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">โหมด DNS</string>
+    <string name="retro_scr_dns_manual">กำหนดเอง</string>
+    <string name="retro_scr_dns_internal">ภายใน</string>
+    <string name="retro_scr_primary_dns">DNS หลัก</string>
+    <string name="retro_scr_secondary_dns">DNS รอง</string>
+    <string name="retro_scr_optional">ไม่บังคับ</string>
+    <string name="retro_scr_auto_ip_dhcp">IP อัตโนมัติ (DHCP)</string>
+    <string name="retro_scr_shader">เชดเดอร์</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR อัปสเกลลิง</string>
+    <string name="retro_scr_performance_hud">HUD ประสิทธิภาพ</string>
+    <string name="retro_scr_credits_licenses">เครดิต &amp; ลิขสิทธิ์</string>
+    <string name="retro_scr_credits_desc">ฟีเจอร์บางอย่างของ WinNative สร้างขึ้นบนโปรเจกต์โอเพนซอร์สเหล่านี้ แตะเพื่อดูแต่ละแหล่งที่มา</string>
+    <string name="retro_scr_tab_defaults">ค่าเริ่มต้น</string>
+    <string name="retro_scr_tab_credits">เครดิต</string>
+    <string name="retro_scr_enable_hardcore_title">เปิดโหมดฮาร์ดคอร์?</string>
+    <string name="retro_scr_enable_hardcore_body">โหมดฮาร์ดคอร์จะรีเซ็ตเกมทันทีและปิดการโหลดสเตตบันทึก การกรอไปข้างหน้า และสูตรโกง ความคืบหน้าที่ยังไม่ได้บันทึกจะสูญหาย ดำเนินการต่อ?</string>
+    <string name="retro_scr_cancel">ยกเลิก</string>
+    <string name="retro_scr_enable">เปิดใช้งาน</string>
+    <string name="retro_scr_bios_imported">นำเข้า BIOS แล้ว: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">ไฟล์ BIOS ไม่ถูกต้อง</string>
+    <string name="retro_scr_ps2_bios_imported">นำเข้า PS2 BIOS แล้ว: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">ไฟล์ PS2 BIOS ไม่ถูกต้อง</string>
+    <string name="retro_scr_no_game_serial">ไม่มีซีเรียลเกมสำหรับค้นหาสูตรโกง</string>
+    <string name="retro_scr_applied_cheats">ใช้สูตรโกง %1$d รายการแล้ว</string>
+    <string name="retro_scr_couldnt_apply_cheats">ไม่สามารถใช้สูตรโกง</string>
+    <string name="retro_scr_cheats">สูตรโกง</string>
+    <string name="retro_scr_apply">ใช้</string>
+    <string name="retro_scr_no_cheats_found">ไม่พบสูตรโกงสำหรับเกมนี้</string>
+    <string name="retro_scr_achievements">ความสำเร็จ</string>
+    <string name="retro_scr_sign_in_ra">ลงชื่อเข้าใช้ RetroAchievements</string>
+    <string name="retro_scr_username">ชื่อผู้ใช้</string>
+    <string name="retro_scr_password">รหัสผ่าน</string>
+    <string name="retro_scr_login_failed">เข้าสู่ระบบไม่สำเร็จ</string>
+    <string name="retro_scr_signing_in">กำลังลงชื่อเข้าใช้…</string>
+    <string name="retro_scr_sign_in">ลงชื่อเข้าใช้</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d คะแนน</string>
+    <string name="retro_scr_no_achievements">ไม่มีความสำเร็จสำหรับเกมนี้</string>
+    <string name="retro_scr_back">กลับ</string>
+    <string name="retro_scr_enabled">เปิดใช้งาน</string>
+    <string name="retro_scr_disabled">ปิดใช้งาน</string>
+    <string name="retro_scr_rename">เปลี่ยนชื่อ</string>
+    <string name="retro_scr_save">บันทึก</string>
+    <string name="retro_scr_cloud_save_conflict">ความขัดแย้งการบันทึกบนคลาวด์</string>
+    <string name="retro_scr_keep_local_save">เก็บการบันทึกในเครื่อง</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">เมนู</string>
+    <string name="retro_tab_display">การแสดงผล</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">เสียง</string>
+    <string name="retro_tab_controls">การควบคุม</string>
+    <string name="retro_scan_up_to_date">คลังเป็นปัจจุบัน</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">เพิ่ม %1$d</string>
+    <string name="retro_scan_removed">ลบ %1$d</string>
+    <string name="retro_scr_shader_default">ค่าเริ่มต้น</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">คม</string>
+    <string name="retro_scr_upscale_native">เนทีฟ</string>
+    <string name="retro_co_aspect_ratio">อัตราส่วนภาพ</string>
+    <string name="retro_co_ntsc_filter">ฟิลเตอร์ NTSC</string>
+    <string name="retro_co_colorization">การลงสี</string>
+    <string name="retro_co_color_correction">การแก้สี</string>
+    <string name="retro_co_remove_sprite_limit">ลบขีดจำกัดสไปรต์</string>
+    <string name="retro_co_resolution">ความละเอียด</string>
+    <string name="retro_co_framebuffer_emulation">การจำลองเฟรมบัฟเฟอร์</string>
+    <string name="retro_co_dithering">ดิเทอริง</string>
+    <string name="retro_co_widescreen_hack">แฮกไวด์สกรีน</string>
+    <string name="retro_co_val_8_7_native">8:7 (เนทีฟ)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">ปิด</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">คอมโพสิต</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">อัตโนมัติ</string>
+    <string name="retro_co_val_gba_screen">จอ GBA</string>
+    <string name="retro_co_val_gbc_screen">จอ GBC</string>
+    <string name="retro_co_val_on">เปิด</string>
+    <string name="retro_co_val_320x240_native">320x240 (เนทีฟ)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 ปรับแล้ว</string>
+    <string name="retro_co_val_native">เนทีฟ</string>
+    <string name="retro_co_val_internal">ภายใน</string>
+    <string name="retro_co_val_on_16_9">เปิด (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">ลงชื่อเข้าใช้ด้วยบัญชี RetroAchievements ของคุณเพื่อรับและติดตามความสำเร็จของเกมเรโทร</string>
+    <string name="retro_ach_username">ชื่อผู้ใช้</string>
+    <string name="retro_ach_password">รหัสผ่าน</string>
+    <string name="retro_ach_enter_credentials">ป้อนชื่อผู้ใช้และรหัสผ่านของคุณ</string>
+    <string name="retro_ach_login_failed">เข้าสู่ระบบไม่สำเร็จ</string>
+    <string name="retro_ach_sign_in">ลงชื่อเข้าใช้</string>
+    <string name="retro_ach_password_disclaimer">รหัสผ่านของคุณถูกใช้เพียงครั้งเดียวเพื่อรับโทเคนเข้าสู่ระบบ ซึ่งจัดเก็บอย่างปลอดภัยบนอุปกรณ์</string>
+    <string name="retro_ach_achievements_enabled">เปิดใช้งานความสำเร็จ</string>
+    <string name="retro_ach_hardcore_mode">โหมดฮาร์ดคอร์ (ไม่มีสเตตบันทึก)</string>
+    <string name="retro_ach_points">%1$d / %2$d คะแนน</string>
+    <string name="retro_ach_none_found">ไม่พบความสำเร็จสำหรับเกมนี้</string>
+    <string name="retro_ach_sign_out">ออกจากระบบ</string>
+    <string name="retro_che_brand">สูตรโกง</string>
+    <string name="retro_che_name">ชื่อ</string>
+    <string name="retro_che_code">โค้ด</string>
+    <string name="retro_che_cancel">ยกเลิก</string>
+    <string name="retro_che_save">บันทึก</string>
+    <string name="retro_che_default_name">สูตรโกง %1$d</string>
+    <string name="retro_che_empty">ยังไม่มีสูตรโกง เพิ่มโค้ดสูตรโกงสำหรับเกมนี้</string>
+    <string name="retro_che_add">เพิ่มสูตรโกง</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">ไดรเวอร์ GPU</string>
+    <string name="retro_gpu_driver_system">ระบบ (ค่าเริ่มต้น)</string>
+    <string name="retro_gpu_driver_hint">ติดตั้งไดรเวอร์ Turnip ใน การตั้งค่า \u2192 ไดรเวอร์ ไดรเวอร์เดียวกันใช้ได้ทั้งเกม PC และ PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">ไดรฟ์ภายในเสมือนสำหรับเกมที่ใช้ HDD เช่น Final Fantasy XI รีสตาร์ทเกม</string>
+    <string name="retro_ps2_hdd_desc">ไดรฟ์ภายในเสมือนสำหรับเกมที่ใช้ HDD เช่น Final Fantasy XI</string>
+    <string name="retro_ps2_dns_auto_internal">ตั้งค่าโหมด DNS เป็น Internal เพื่อให้โฮสต์เซิร์ฟเวอร์ที่กำหนดเองของคุณมีผล</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">แกน CPU</string>
+<string name="retro_co_dual_core">แกนคู่</string>
+<string name="retro_co_internal_cheats">เกมโกงภายใน</string>
+<string name="retro_co_internal_resolution">ความละเอียดภายใน</string>
+<string name="retro_co_renderer">ตัวเรนเดอร์</string>
+<string name="retro_co_sensor_bar">ตำแหน่งแถบเซนเซอร์</string>
+<string name="retro_co_skip_gc_bios">ข้ามอินโทร BIOS</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">ล่าง</string>
+<string name="retro_co_val_cached_interpreter">ตัวแปลคำสั่งแบบแคช</string>
+<string name="retro_co_val_hardware">ฮาร์ดแวร์</string>
+<string name="retro_co_val_interpreter">ตัวแปลคำสั่ง</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">เมาส์ / สัมผัส</string>
+<string name="retro_co_val_right_stick_absolute">อนาล็อกขวา (สัมบูรณ์)</string>
+<string name="retro_co_val_right_stick_relative">อนาล็อกขวา (สัมพัทธ์)</string>
+<string name="retro_co_val_software">ซอฟต์แวร์</string>
+<string name="retro_co_val_stretch">ยืดเต็มจอ</string>
+<string name="retro_co_val_top">บน</string>
+<string name="retro_co_vbi_skip">ข้าม VBI (ข้ามเฟรมอัตโนมัติ)</string>
+<string name="retro_co_widescreen">จอกว้าง</string>
+<string name="retro_co_wiimote_pointer">ตัวชี้ Wiimote</string>
+<string name="retro_gs_cheats_apply_note">การเปลี่ยนแปลงจะมีผลในครั้งถัดไปที่คุณเปิดเกมนี้</string>
+<string name="retro_gs_cheats_detect_hint">เปิดเกมนี้หนึ่งครั้งเพื่อให้ตรวจพบซีเรียลของแผ่นดิสก์ จากนั้นเกมโกงและแพตช์จะปรากฏที่นี่</string>
+<string name="retro_gs_dnas_entry_desc">ข้ามการยืนยันตัวตน DNAS — จำเป็นสำหรับการเล่นออนไลน์</string>
+<string name="retro_gs_dnas_group">ใช้อัตโนมัติ (ออนไลน์)</string>
+<string name="retro_gs_group_cheats">เกมโกง &amp; แพตช์</string>
+<string name="retro_gs_hdd_image_size">ขนาด: %1$s</string>
+<string name="retro_gs_hdd_import">นำเข้าอิมเมจ HDD</string>
+<string name="retro_gs_hdd_remove_short">ลบ</string>
+<string name="retro_gs_netplay_enable">เปิดใช้ NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">ปิดอยู่โดยค่าเริ่มต้น เปิดใช้ แล้วเลือกเป็นโฮสต์หรือเข้าร่วมก่อนเริ่มเกม\nจะปิดอีกครั้งเมื่อคุณออกจากเกม</string>
+<string name="retro_gs_netplay_host">ที่อยู่โฮสต์</string>
+<string name="retro_gs_netplay_host_hint">IP หรือชื่อโฮสต์</string>
+<string name="retro_gs_netplay_host_mode">เซสชันโฮสต์</string>
+<string name="retro_gs_netplay_host_mode_subtitle">เปิด = รอผู้เล่น ปิด = เข้าร่วมที่อยู่โฮสต์</string>
+<string name="retro_gs_netplay_not_ready">NetPlay ใช้พอร์ตผู้เล่นหลายคนในเครือข่ายท้องถิ่นผ่าน TCP (ผู้เล่น 1 เป็นโฮสต์ / ผู้เล่น 2 เป็นไคลเอนต์) การเล่นออนไลน์ของ PS2 ใช้ DEV9 Ethernet แทน</string>
+<string name="retro_gs_netplay_port">พอร์ต</string>
+<string name="retro_lr_memory_card_slot">การ์ดความจำ %1$d</string>
+<string name="retro_lr_screenshot">ภาพหน้าจอ</string>
+<string name="retro_lr_use_cloud_save">ใช้เซฟบนคลาวด์</string>
+<string name="retro_netplay_conn_direct">LAN (IP โดยตรง)</string>
+<string name="retro_netplay_connecting">กำลังเชื่อมต่อ…</string>
+<string name="retro_netplay_connection">การเชื่อมต่อ</string>
+<string name="retro_netplay_conn_traversal">ออนไลน์ (รหัสโฮสต์)</string>
+<string name="retro_netplay_dismiss">ปิด</string>
+<string name="retro_netplay_dolphin_help">NetPlay ของ GameCube/Wii ใช้เอนจินของ Dolphin เอง โฮสต์ = ผู้เล่น 1, เข้าร่วม = ผู้เล่น 2 เลือกโฮสต์หรือเข้าร่วมและประเภทการเชื่อมต่อก่อนเริ่มเกม อุปกรณ์ทั้งสองจะบูตเกมเดียวกันพร้อมกัน</string>
+<string name="retro_netplay_dolphin_host_lan_hint">แชร์ IP Wi‑Fi ของอุปกรณ์คุณและพอร์ตนี้ให้ผู้เล่น 2 เกมจะเริ่มโดยอัตโนมัติเมื่อพวกเขาเชื่อมต่อ</string>
+<string name="retro_netplay_dolphin_host_online_hint">รหัสโฮสต์จะแสดงเมื่อเกมบูต — แชร์ให้ผู้เล่น 2 เกมจะเริ่มโดยอัตโนมัติเมื่อพวกเขาเชื่อมต่อ</string>
+<string name="retro_netplay_dolphin_join_lan_hint">ป้อน IP Wi‑Fi และพอร์ตของโฮสต์ จากนั้นเริ่มเกมเพื่อเชื่อมต่อ</string>
+<string name="retro_netplay_dolphin_join_online_hint">ป้อนรหัสโฮสต์จากผู้เล่น 1 จากนั้นเริ่มเกมเพื่อเชื่อมต่อ</string>
+<string name="retro_netplay_enable_before_launch">เปิดใช้ NetPlay ในการตั้งค่าเกมและเลือกโฮสต์หรือเข้าร่วมก่อนเริ่มเกม</string>
+<string name="retro_netplay_find_rooms">ค้นหาห้องบน Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · แต่ละหน้าจอเป็นเครื่องพกพาของตัวเอง</string>
+<string name="retro_netplay_gba_not_ready">การเล่นหลายคนของ GBA ใช้ gpSP + อะแดปเตอร์ไร้สาย ตรวจสอบให้แน่ใจว่าติดตั้ง libgpsp แล้ว</string>
+<string name="retro_netplay_help">การเล่นหลายคนแบบแชร์หน้าจอผ่าน Wi‑Fi (เหมือน RetroArch)\nโฮสต์ = ผู้เล่น 1, เข้าร่วม = ผู้เล่น 2 อุปกรณ์ทั้งสองแสดงเกมเดียวกัน</string>
+<string name="retro_netplay_help_game_link">Game Link ผ่าน Wi‑Fi — แต่ละอุปกรณ์รันเกมของตัวเอง\nGB/GBC: การเชื่อมต่อแบบซีเรียลของ Gambatte (Pokémon เจน 1–2)\nGBA: อะแดปเตอร์ไร้สาย gpSP (การต่อสู้ Pokémon FR/LG/Emerald)</string>
+<string name="retro_netplay_host_action">สร้างห้อง</string>
+<string name="retro_netplay_host_code">รหัสโฮสต์</string>
+<string name="retro_netplay_host_code_hint">รหัสโฮสต์ traversal จากโฮสต์</string>
+<string name="retro_netplay_hosting_room">กำลังเป็นโฮสต์ห้อง</string>
+<string name="retro_netplay_host_mode_hint">แตะโฮสต์เพื่อเปิดห้องสำหรับเซสชันการเล่นนี้ จากนั้นเริ่มเกม NetPlay จะปิดเมื่อคุณออก</string>
+<string name="retro_netplay_in_room">อยู่ในห้อง</string>
+<string name="retro_netplay_join_action">เข้าร่วมด้วย IP</string>
+<string name="retro_netplay_joined">เข้าร่วมแล้ว</string>
+<string name="retro_netplay_join_room">เข้าร่วม</string>
+<string name="retro_netplay_launch_mode">เมื่อเริ่มเกม</string>
+<string name="retro_netplay_leave">ออก</string>
+<string name="retro_netplay_menu_hint">โฮสต์ = P1 · เข้าร่วม = P2 · เกมเดียวกันบนทั้งสองหน้าจอ</string>
+<string name="retro_netplay_mode_host">โฮสต์</string>
+<string name="retro_netplay_mode_join">เข้าร่วม</string>
+<string name="retro_netplay_mode_manual">กำหนดเอง</string>
+<string name="retro_netplay_no_rooms">ไม่พบห้อง ตรวจสอบให้แน่ใจว่าโฮสต์อยู่บน Wi‑Fi เดียวกันและกำลังเป็นโฮสต์ห้อง</string>
+<string name="retro_netplay_player_name">ชื่อที่แสดง</string>
+<string name="retro_netplay_player_name_hint">แสดงให้ผู้เล่นคนอื่นเห็น</string>
+<string name="retro_netplay_players_count">เชื่อมต่อแล้ว %1$d</string>
+<string name="retro_netplay_prelaunch_hint">ห้องเปิดสำหรับเซสชันนี้เท่านั้น เริ่มเกมเมื่อพร้อม การออกจากเกมจะปิด NetPlay</string>
+<string name="retro_netplay_room_players">ผู้เล่น</string>
+<string name="retro_netplay_scan_action">สแกน Wi‑Fi</string>
+<string name="retro_netplay_scan_again">สแกนอีกครั้ง</string>
+<string name="retro_netplay_scan_hint">สแกน Wi‑Fi เดียวกันเพื่อหาห้องที่เปิดอยู่ หรือเข้าร่วมด้วยที่อยู่ IP</string>
+<string name="retro_netplay_scanning">กำลังสแกน Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">ผลการสแกน</string>
+<string name="retro_netplay_select_room_hint">แตะห้องเพื่อเข้าร่วมทันที (จะไม่บันทึก IP ไว้สำหรับการเริ่มเกมครั้งถัดไป)</string>
+<string name="retro_netplay_stop_scan">หยุดสแกน</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s เชื่อมต่อแล้ว</string>
+<string name="retro_netplay_user_disconnected">%1$s ตัดการเชื่อมต่อแล้ว</string>
+<string name="retro_netplay_waiting_players">กำลังรอผู้เล่น…</string>
+<string name="retro_ps2_coming_soon">การรองรับ PlayStation 2 กำลังจะมาเร็วๆ นี้</string>
+<string name="retro_ps2_show_l3r3">แสดงปุ่ม L3 / R3</string>
+<string name="retro_ps2_show_l3r3_subtitle">เมื่อปิด ให้แตะอนาล็อกสองครั้งเพื่อคลิก L3 / R3</string>
+<string name="retro_ps2_turnip_flags">แฟล็กไดรเวอร์ TURNIP</string>
+<string name="retro_ps2_turnip_flags_note">ใช้เฉพาะเมื่อเลือกไดรเวอร์ GPU แบบกำหนดเองด้านบน</string>
+<string name="retro_rom_missing">ไม่พบไฟล์เกม</string>
+<string name="retro_scr_delete">ลบ</string>
+<string name="retro_scr_import_from_file">นำเข้าจากไฟล์…</string>
+<string name="retro_scr_loading">กำลังโหลด…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">เปลี่ยนคอนโซล</string>
+    <string name="retro_gs_identify_as">ระบุเป็นคอนโซล</string>
+    <string name="retro_gs_console_changed">ตอนนี้ระบุเป็น %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">ใช้เอฟเฟกต์ ReShade (.fx) กับเกม DXVK/VKD3D (Vulkan) ผ่านเลเยอร์ vkBasalt ที่มาพร้อมในตัว วางเอฟเฟกต์แต่ละรายการไว้ในโฟลเดอร์ของตัวเองภายใต้ Android/data/&lt;package&gt;/files/ReShade/ การปรับพารามิเตอร์แบบเรียลไทม์และสวิตช์ในเกมจะมาพร้อมกับการอัปเดตเลเยอร์แบบโหลดซ้ำทันที</string>
+    <string name="reshade_catalog_title">เอฟเฟกต์ ReShade</string>
+    <string name="reshade_catalog_search">ค้นหาเอฟเฟกต์…</string>
+    <string name="reshade_catalog_installed">ติดตั้งแล้ว (%1$d)</string>
+    <string name="reshade_catalog_available">พร้อมใช้งาน (%1$d)</string>
+    <string name="reshade_catalog_downloading">กำลังดาวน์โหลด</string>
+    <string name="reshade_catalog_installing">กำลังติดตั้ง</string>
+    <string name="reshade_catalog_offline_cache">ออฟไลน์ — กำลังแสดงรายการที่แคชไว้ เชื่อมต่อเพื่อดาวน์โหลดเอฟเฟกต์ใหม่</string>
+    <string name="reshade_catalog_offline_none">ออฟไลน์ — กำลังแสดงเฉพาะเอฟเฟกต์ที่ติดตั้งไว้ เชื่อมต่อเพื่อเรียกดูแคตตาล็อก</string>
+    <string name="reshade_catalog_needs_connection">เชื่อมต่ออินเทอร์เน็ตเพื่อดาวน์โหลดเอฟเฟกต์</string>
+    <string name="reshade_catalog_download_failed">ดาวน์โหลด %1$s ไม่สำเร็จ</string>
+    <string name="reshade_catalog_empty_query">ไม่มีเอฟเฟกต์ที่ตรงกับ \"%1$s\"</string>
+    <string name="reshade_catalog_empty">ไม่มีเอฟเฟกต์ที่พร้อมใช้งาน เชื่อมต่ออินเทอร์เน็ตเพื่อเรียกดูแคตตาล็อก</string>
+    <string name="reshade_catalog_done">เสร็จสิ้น</string>
+    <string name="reshade_catalog_delete_cd">ลบ %1$s</string>
+    <string name="reshade_catalog_delete_title">ลบ %1$s หรือไม่?</string>
+    <string name="reshade_catalog_delete_body">การดำเนินการนี้จะลบเอฟเฟกต์ออกจากที่จัดเก็บและจากชุดใดก็ตามที่ใช้เอฟเฟกต์นี้ คุณสามารถดาวน์โหลดได้อีกครั้งในภายหลัง</string>
+    <string name="reshade_catalog_delete_confirm">ลบ</string>
+    <string name="reshade_catalog_delete_cancel">ยกเลิก</string>
+    <string name="reshade_catalog_delete_failed">ไม่สามารถลบ %1$s ได้</string>
+    <string name="reshade_params_title">พารามิเตอร์เอฟเฟกต์</string>
+    <string name="reshade_params_reset">รีเซ็ต</string>
+    <string name="reshade_loadout_empty">ยังไม่มีเอฟเฟกต์ เพิ่มเอฟเฟกต์อย่างน้อยหนึ่งรายการเพื่อสร้างชุด</string>
+    <string name="reshade_loadout_add">เพิ่มเอฟเฟกต์</string>
+    <string name="reshade_loadout_full">ชุดเต็มแล้ว — ลบเอฟเฟกต์หนึ่งรายการเพื่อเพิ่มรายการอื่น</string>
+    <string name="reshade_effect_active">ใช้งานอยู่</string>
+    <string name="reshade_mode_solo">เดี่ยว</string>
+    <string name="reshade_mode_stack">ซ้อน</string>
+    <string name="reshade_mode_solo_hint">ใช้งานได้ครั้งละหนึ่งเอฟเฟกต์ (เปรียบเทียบ A/B สลับแบบสดในเกม)</string>
+    <string name="reshade_mode_stack_hint">ซ้อนเอฟเฟกต์ชุดย่อยใดก็ได้ โดยใช้ตามลำดับ</string>
+    <string name="reshade_drawer_enable">เปิดใช้ ReShade</string>
+    <string name="reshade_drawer_empty">ไม่มีเอฟเฟกต์ ReShade ในชุดนี้ เพิ่มเอฟเฟกต์ในการตั้งค่าของเกมนี้ (หรือของคอนเทนเนอร์) เพื่อสลับและปรับแต่งที่นี่</string>
+    <string name="reshade_drawer_no_params">เอฟเฟกต์นี้ไม่มีพารามิเตอร์ที่ปรับได้</string>
+    <string name="cloud_saves_deleting">กำลังลบเซฟ…</string>
+    <string name="cloud_saves_history_delete">ลบ</string>
+    <string name="cloud_saves_history_delete_confirm_body">ลบเซฟบนคลาวด์จาก %1$s อย่างถาวรหรือไม่ การกระทำนี้ย้อนกลับไม่ได้</string>
+    <string name="cloud_saves_history_delete_confirm_title">ลบเซฟบนคลาวด์</string>
+    <string name="cloud_saves_history_delete_failed">ไม่สามารถลบเซฟบนคลาวด์ได้</string>
+    <string name="cloud_saves_history_delete_success">ลบเซฟบนคลาวด์แล้ว</string>
+    <string name="retro_bundle_required">ดาวน์โหลดคอร์คอนโซลก่อน — การตั้งค่า › เรโทร</string>
+    <string name="retro_ps2_device_unsupported">อุปกรณ์นี้ไม่รองรับการจำลอง PS2 — ต้องใช้ OpenGL ES 3.1 ขึ้นไป</string>
+    <string name="retro_scr_consoles_check">ตรวจหาการอัปเดต</string>
+    <string name="retro_scr_consoles_checking">กำลังตรวจหาการอัปเดต…</string>
+    <string name="retro_scr_consoles_download">ดาวน์โหลดคอร์คอนโซล</string>
+    <string name="retro_scr_consoles_downloading">กำลังดาวน์โหลด… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">คอร์คอนโซล</string>
+    <string name="retro_scr_consoles_installed">ติดตั้งแล้ว — บิลด์ %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">ติดตั้งแล้ว — บิลด์ %1$s (ตรวจหาการอัปเดตไม่สำเร็จ)</string>
+    <string name="retro_scr_consoles_installing">กำลังติดตั้ง…</string>
+    <string name="retro_scr_consoles_missing">ยังไม่ได้ติดตั้ง — ดาวน์โหลดเพื่อเล่นเกมเรโทร</string>
+    <string name="retro_scr_consoles_state">สถานะ</string>
+    <string name="retro_scr_consoles_update">อัปเดตคอร์คอนโซล</string>
+    <string name="retro_scr_consoles_update_available">มีการอัปเดต — บิลด์ %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">กำลังตรวจสอบไฟล์ที่ดาวน์โหลด…</string>
+    <string name="retro_scr_consoles_working">กำลังดำเนินการ…</string>
+    <string name="retro_tab_system">ระบบ</string>
+</resources>
diff --git a/app/src/main/res/values-tr/arrays.xml b/app/src/main/res/values-tr/arrays.xml
new file mode 100644
index 000000000..411a446f9
--- /dev/null
+++ b/app/src/main/res/values-tr/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Resim</item>
+        <item>Orijinal</item>
+        <item>Düz Renk</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-tr/plurals.xml b/app/src/main/res/values-tr/plurals.xml
new file mode 100644
index 000000000..59509a9c5
--- /dev/null
+++ b/app/src/main/res/values-tr/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="github_repo_asset_count">
+        <item quantity="one">%d ZIP öğesi</item>
+        <item quantity="other">%d ZIP öğesi</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
new file mode 100644
index 000000000..a0e1385cf
--- /dev/null
+++ b/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,2475 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common > UI Labels -->
+    <string name="common_ui_app_name">WinNative</string>
+    <string name="common_ui_run">Çalıştır</string>
+    <string name="common_ui_edit">Düzenle</string>
+    <string name="common_ui_remove">Kaldır</string>
+    <string name="common_ui_add">Ekle</string>
+    <string name="common_ui_shortcuts">Kısayollar</string>
+    <string name="common_ui_containers">Konteynerler</string>
+    <string name="common_ui_input_controls">Giriş Kontrolleri</string>
+    <string name="common_ui_no_items_to_display">Görüntülenecek öğe yok</string>
+    <string name="common_ui_select_icon">Simge Seç</string>
+    <string name="common_ui_revert_icon">Simgeyi Geri Al</string>
+    <string name="common_ui_select_exe">EXE Seç</string>
+    <string name="common_ui_select_folder">Klasör Seç</string>
+    <string name="common_ui_current_folder">Geçerli Klasör</string>
+    <string name="common_ui_enter_path">Yol girin</string>
+    <string name="common_ui_path_not_found">Yol bulunamadı</string>
+    <string name="common_ui_select_valid_exe_file">Lütfen geçerli bir .exe dosyası seçin</string>
+    <string name="common_ui_select_valid_icon_file">Lütfen geçerli bir .ico veya .png dosyası seçin.</string>
+    <string name="common_ui_exit">Çıkış</string>
+    <string name="common_ui_exit_app">Uygulamadan Çık</string>
+    <string name="common_ui_profile">Profil</string>
+    <string name="common_ui_name">Ad</string>
+    <string name="common_ui_ok">Tamam</string>
+    <string name="common_ui_cancel">İptal</string>
+    <string name="common_ui_untitled">Adsız</string>
+    <string name="common_ui_disabled">Devre dışı</string>
+    <string name="common_ui_container">Konteyner</string>
+    <string name="common_ui_value">Değer</string>
+    <string name="common_ui_none">Yok</string>
+    <string name="common_ui_custom_text">Özel Metin</string>
+    <string name="common_ui_icon">Simge</string>
+    <string name="common_ui_duplicate">Çoğalt</string>
+    <string name="common_ui_credits_and_third_party_apps">Katkıda bulunanlar ve Üçüncü taraf uygulamalar</string>
+    <string name="common_ui_loading">Yükleniyor</string>
+    <string name="common_ui_exporting">Dışa aktarılıyor</string>
+    <string name="common_ui_enable">Etkinleştir</string>
+    <string name="common_ui_disable">Devre dışı bırak</string>
+    <string name="common_ui_force">Zorla</string>
+    <string name="common_ui_version">Sürüm</string>
+    <string name="common_ui_advanced">Gelişmiş</string>
+    <string name="common_ui_graphics">Grafik</string>
+    <string name="common_ui_system">Sistem</string>
+    <string name="common_ui_width">Genişlik</string>
+    <string name="common_ui_height">Yükseklik</string>
+    <string name="common_ui_open_file">Dosya Aç</string>
+    <string name="common_ui_download_file">Dosya İndir</string>
+    <string name="common_ui_downloading_file">Dosya İndiriliyor</string>
+    <string name="common_ui_browse">Gözat</string>
+    <string name="common_ui_options">Seçenekler</string>
+    <string name="common_ui_export">Dışa Aktar</string>
+    <string name="common_ui_new_file">Yeni Dosya</string>
+    <string name="common_ui_description">Açıklama</string>
+    <string name="common_ui_continue">Devam Et</string>
+    <string name="common_ui_warning">Uyarı</string>
+    <string name="common_ui_copy">kopyala</string>
+    <string name="common_ui_reset">Sıfırla</string>
+    <string name="common_ui_close">Kapat</string>
+    <string name="common_ui_confirm">Onayla</string>
+    <string name="common_ui_unnamed">İsimsiz</string>
+    <string name="common_ui_download">İndir</string>
+    <string name="common_ui_uninstall">Kaldır</string>
+    <string name="common_ui_other">Diğer</string>
+    <string name="common_ui_status">Durum</string>
+    <string name="common_ui_size">Boyut</string>
+    <string name="common_ui_release_date">Çıkış Tarihi</string>
+    <string name="common_ui_installed">Yüklü</string>
+    <string name="common_ui_available">Mevcut</string>
+    <string name="common_ui_settings">Ayarlar</string>
+    <string name="common_ui_enable_all">Tümünü etkinleştir</string>
+    <string name="common_ui_disable_all">Tümünü devre dışı bırak</string>
+    <string name="common_ui_select_all">Tümünü seç</string>
+    <string name="common_ui_deselect_all">Tüm seçimi kaldır</string>
+    <string name="common_ui_on">Açık</string>
+    <string name="common_ui_off">Kapalı</string>
+    <string name="common_ui_already_set">Zaten Ayarlı</string>
+    <string name="common_ui_shortcut">Kısayol</string>
+    <string name="common_ui_custom">Özel</string>
+    <string name="common_ui_about">Hakkında</string>
+    <string name="common_ui_back">Geri</string>
+    <string name="common_ui_apply">Uygula</string>
+    <string name="common_ui_save">Kaydet</string>
+    <string name="common_ui_clone">Klonla</string>
+    <string name="common_ui_properties">Özellikler</string>
+    <string name="common_ui_store">Mağaza</string>
+    <string name="common_ui_library">Kütüphane</string>
+    <string name="common_ui_downloads">İndirilenler</string>
+    <string name="common_ui_import">İçe Aktar</string>
+    <string name="common_ui_sync">Eşitle</string>
+    <string name="common_ui_sign_in">Giriş Yap</string>
+    <string name="common_ui_submit">Gönder</string>
+    <string name="common_ui_coming_soon">Yakında</string>
+    <string name="common_ui_signed_in">Giriş Yapıldı</string>
+    <string name="common_ui_required">Gerekli</string>
+    <string name="common_ui_optional">İsteğe Bağlı</string>
+    <string name="common_ui_notifications">Bildirimler</string>
+    <string name="common_ui_mode">Mod</string>
+    <string name="common_ui_experimental">(Deneysel)</string>
+    <string name="common_ui_current_version_label">Geçerli Sürüm:</string>
+    <string name="common_ui_cannot_write_folder">Seçilen klasöre yazılamıyor</string>
+    <string name="common_ui_failed_create_directory">Varsayılan dizin oluşturulamadı</string>
+    <string name="common_ui_device_not_supported">Üzgünüz, cihazınız desteklenmiyor olabilir</string>
+    <string name="common_ui_please_wait">Lütfen bekleyin…</string>
+    <string name="common_ui_done">Tamamlandı</string>
+    <string name="common_ui_open">Aç</string>
+    <string name="common_ui_connected">Bağlı</string>
+    <string name="common_ui_install">Yükle</string>
+    <string name="common_ui_application">Uygulama</string>
+    <string name="common_ui_check">Kontrol Et</string>
+    <string name="store_game_check_for_update">Güncelleme Denetle</string>
+    <string name="store_game_checking_for_update">Denetleniyor</string>
+    <string name="store_game_download_update">Güncellemeyi İndir</string>
+    <string name="store_game_no_update_available">Güncelleme mevcut değil</string>
+    <string name="store_game_update_available">Güncelleme mevcut</string>
+    <string name="store_game_update_check_failed">Güncelleme denetimi başarısız</string>
+    <string name="store_game_update">Güncelle</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Dosyaları Doğrula</string>
+    <string name="store_game_verify_started">%1$s doğrulanıyor — İndirilenler sekmesini denetleyin</string>
+    <string name="store_game_steam_options">Steam seçenekleri</string>
+    <string name="store_game_verify_complete">Dosya Doğrulama Tamamlandı</string>
+    <string name="store_game_verify_failed_notice">Dosya Doğrulama Başarısız</string>
+    <string name="store_game_progress_background_hint">Bunu kapatabilirsiniz — çalışmaya devam eder. İstediğiniz zaman İndirilenler sekmesini denetleyin.</string>
+    <string name="store_game_checking_updates">Güncellemeler denetleniyor</string>
+    <string name="store_game_no_updates_notice">Güncelleme Mevcut Değil</string>
+    <string name="store_game_update_complete">Güncelleme Tamamlandı</string>
+    <string name="store_game_update_failed_notice">Güncelleme Başarısız</string>
+    <string name="store_game_update_check_failed_notice">Güncelleme Denetimi Başarısız</string>
+    <string name="store_game_download_already_active">Bu oyun zaten indiriliyor. DLC eklemeden önce geçerli indirmeyi iptal edin.</string>
+    <string name="common_ui_select">Seç</string>
+    <string name="common_ui_storage_roots">Depolama Kökleri</string>
+    <string name="common_ui_browse_local_folders_directly">Yerel klasörlere doğrudan gözat</string>
+    <string name="common_ui_no_folders_available_here">Burada mevcut klasör yok</string>
+    <string name="common_ui_grant_all_files_access_browse">Klasörlere doğrudan gözatmak için tüm dosyalara erişim izni verin.</string>
+    <string name="common_ui_not_configured">Yapılandırılmadı</string>
+    <string name="common_ui_reinstall">Yeniden Yükle</string>
+    <string name="common_ui_exit_app_confirm">WinNative uygulamasından çıkılsın mı?</string>
+    <string name="common_ui_elements_count">%1$d öğe</string>
+    <string name="common_ui_disabled_placeholder">-- Devre dışı --</string>
+    <string name="common_ui_enabled">Etkin</string>
+    <string name="common_ui_unknown_error">Bilinmeyen hata</string>
+    <string name="common_ui_auto_detected">Otomatik algılandı</string>
+    <string name="common_ui_change">Değiştir</string>
+    <string name="common_ui_proceed">Devam Et</string>
+    <string name="common_ui_sign_out">Çıkış Yap</string>
+    <string name="common_ui_name_cannot_be_empty">Ad boş olamaz</string>
+    <string name="common_ui_error_with_message">Hata: %1$s</string>
+    <string name="common_ui_64_bit">64-BİT</string>
+    <string name="common_ui_32_bit">32-BİT</string>
+    <string name="common_ui_64_bit_and_32_bit">64-BİT &amp; 32-BİT</string>
+    <plurals name="common_ui_folder_count">
+        <item quantity="one">%d klasör</item>
+        <item quantity="other">%d klasör</item>
+    </plurals>
+    <plurals name="common_ui_file_count">
+        <item quantity="one">%d dosya</item>
+        <item quantity="other">%d dosya</item>
+    </plurals>
+
+    <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Görselleri Getir</string>
+    <string name="library_games_scraping_artwork">Getiriliyor</string>
+    <string name="library_games_shortcut_created">Kısayol oluşturuldu</string>
+    <string name="library_games_failed_to_create_shortcut">Kısayol oluşturulamadı: %s</string>
+    <string name="library_games_install_path">Yükleme Yolu</string>
+    <string name="library_games_not_enough_space">%1$s daha fazla alan gerekli</string>
+    <string name="library_games_download_slash_install">İndir / Yükle</string>
+    <string name="library_games_save_management">KAYIT YÖNETİMİ</string>
+    <string name="library_games_download_install_available">%1$s / %2$s • Mevcut: %3$s</string>
+    <string name="library_games_last_played">Son Oynanma</string>
+    <string name="library_games_playtime">Oynanma Süresi</string>
+    <string name="library_games_plays">Oynanma</string>
+    <string name="library_games_dlcs">DLC\'ler</string>
+    <string name="library_games_uninstall_game">OYUNU KALDIR</string>
+    <string name="library_games_remove_game">OYUNU ÇIKAR</string>
+    <string name="library_games_uninstall_confirm">%1$s kaldırılsın ve yüklü oyun klasörü kalıcı olarak silinsin mi?</string>
+    <string name="library_games_remove_confirm">%1$s kütüphanenizden çıkarılsın. Diskteki oyun dosyalarına dokunulmayacak mı?</string>
+    <string name="library_games_game_uninstalled">%1$s kaldırıldı.</string>
+    <string name="library_games_game_removed">%1$s çıkarıldı.</string>
+    <string name="library_games_failed_to_uninstall">Kaldırma başarısız.</string>
+    <string name="library_games_failed_to_uninstall_reason">Kaldırma başarısız: %1$s</string>
+    <string name="library_games_loading">Kütüphane yükleniyor…</string>
+    <string name="library_games_no_games_installed">Yüklü oyun yok. Oyun eklemek için bir Mağaza sekmesini veya + düğmesini kullanın.</string>
+    <string name="library_games_times_played_label">Oynanma sayısı: </string>
+    <string name="library_games_playtime_label">Oynanma süresi: </string>
+    <string name="library_games_no_games_hub">Yüklü Oyun Yok\nWinlator Arka Ucunu açmak için tıklayın</string>
+    <string name="library_games_installed_badge">YÜKLÜ</string>
+    <string name="library_games_unknown_game">Bilinmeyen Oyun</string>
+    <string name="library_games_layouts_header">KÜTÜPHANE DÜZENLERİ</string>
+    <string name="library_games_layout_carousel">Atlıkarınca</string>
+    <string name="library_games_layout_list">Liste</string>
+    <string name="library_games_view_options_header">GÖRÜNÜM SEÇENEKLERİ</string>
+    <string name="library_games_immersive_mode">Sürükleyici Mod</string>
+    <string name="library_games_immersive_mode_description">Odaklanılan oyun görselini arka plan olarak kullan</string>
+    <string name="library_games_immersive_blur">Arka Planı Bulanıklaştır</string>
+    <string name="library_games_immersive_blur_description">Sürükleyici arka plana bulanıklık efekti uygula</string>
+    <string name="library_games_custom_game">Özel Oyun</string>
+    <string name="library_games_play">Oyna</string>
+    <string name="hero_boot_to_desktop_title">Masaüstünü Başlat</string>
+    <string name="hero_graphics_tests_title">Grafik Testleri</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Giriş Testleri</string>
+    <string name="library_games_add_custom_game">Özel Oyun Ekle</string>
+    <string name="library_games_game_name">Oyun Adı</string>
+    <string name="library_games_game_folder_mapped_drive">Oyun Klasörü (Eşlenmiş Oyun Sürücüsü)</string>
+    <string name="library_games_select_exe_provide_name">Bir exe seçin ve bir ad girin</string>
+    <string name="library_games_sign_in_prompt">Kütüphanenizi oluşturmak için bir mağazaya giriş yapın veya özel bir oyun ekleyin.</string>
+
+    <!-- Stores > Accounts -->
+    <string name="stores_accounts_title">Mağazalar</string>
+    <string name="stores_accounts_steam_integration_title">Steam</string>
+    <string name="stores_accounts_shared_downloads_folder">Paylaşılan İndirilenler Klasörü</string>
+    <string name="stores_accounts_shared_downloads_subtitle">Tüm mağazalarda tek bir klasör kullan</string>
+    <string name="stores_accounts_default_downloads_folder">Varsayılan İndirilenler Klasörü</string>
+    <string name="stores_accounts_steam_downloads">Steam İndirilenleri</string>
+    <string name="stores_accounts_epic_downloads">Epic İndirilenleri</string>
+    <string name="stores_accounts_gog_downloads">GOG İndirilenleri</string>
+    <string name="stores_accounts_download_speed">İndirme Hızı</string>
+    <string name="stores_accounts_download_speed_subtitle">Steam indirme iş parçacığı eşzamanlılığını denetler</string>
+    <string name="stores_accounts_download_server">İndirme Sunucusu</string>
+    <string name="stores_accounts_connected_stores">Bağlı Mağazalar</string>
+    <string name="stores_accounts_download_settings">İndirme Ayarları</string>
+    <string name="stores_accounts_download_speed_conservative">Tutumlu</string>
+    <string name="stores_accounts_download_speed_balanced">Dengeli</string>
+    <string name="stores_accounts_download_speed_standard">Standart</string>
+    <string name="stores_accounts_download_speed_performance">Performans</string>
+    <string name="stores_accounts_download_server_auto_detected">Otomatik algılandı: %1$s</string>
+    <string name="stores_accounts_download_server_subtitle">Oyun indirmeleri için Steam CDN bölgesi</string>
+    <string name="stores_accounts_sign_out_confirm">%1$s hesabından çıkış yapılsın mı?</string>
+    <string name="stores_accounts_sign_out_message">Kütüphanenize erişmek için yeniden giriş yapmanız gerekecek.</string>
+    <string name="stores_accounts_logged_in_epic">Epic Games hesabına giriş yapıldı!</string>
+    <string name="stores_accounts_epic_login_failed">Epic Girişi başarısız: %1$s</string>
+    <string name="stores_accounts_logged_in_gog">GOG hesabına giriş yapıldı!</string>
+    <string name="stores_accounts_gog_login_failed">GOG Girişi başarısız: %1$s</string>
+    <string name="stores_accounts_custom_download_path">Özel İndirme Yolu</string>
+    <string name="stores_accounts_custom_download_path_description">Ayarlar &gt; Mağazalar bölümünde varsayılan bir indirme yolu zaten yapılandırıldı. Bu belirli yükleme için benzersiz bir özel yol ayarlamak istiyorsanız Devam Et\'e tıklayın.</string>
+    <string name="stores_accounts_not_signed_in">Giriş yapılmadı</string>
+    <string name="stores_accounts_status_online">Çevrimiçi</string>
+    <string name="stores_accounts_status_away">Uzakta</string>
+    <string name="stores_accounts_status_offline">Çevrimdışı</string>
+    <string name="stores_accounts_status_invisible">Görünmez</string>
+    <string name="stores_accounts_status_header">DURUM</string>
+    <string name="stores_accounts_stores_header">MAĞAZALAR</string>
+    <string name="stores_accounts_sign_in_store_prompt">%1$s mağazasına erişmek için lütfen giriş yapın.</string>
+    <string name="stores_accounts_manage">Mağaza Hesaplarını Yönet</string>
+    <string name="stores_accounts_sign_into_store">%1$s hesabına giriş yap</string>
+
+    <!-- Downloads > Queue -->
+    <string name="downloads_queue_cancel_all">Tümünü İptal Et</string>
+    <string name="downloads_queue_preparing_download">İndirme hazırlanıyor</string>
+    <string name="downloads_queue_installing_package">Paket yükleniyor</string>
+    <string name="downloads_queue_resume_all">Tümünü Sürdür</string>
+    <string name="downloads_queue_pause_all">Tümünü Duraklat</string>
+    <string name="downloads_queue_clear">Temizle</string>
+    <string name="downloads_queue_status_label">Durum:</string>
+    <string name="downloads_queue_phase_downloading">İndiriliyor</string>
+    <string name="downloads_queue_phase_downloading_file">İndiriliyor [%1$s]</string>
+    <string name="downloads_queue_phase_queued">Sıraya Alındı</string>
+    <string name="downloads_queue_phase_paused">Duraklatıldı</string>
+    <string name="downloads_queue_phase_preparing">Hazırlanıyor</string>
+    <string name="downloads_queue_phase_verifying">Doğrulanıyor</string>
+    <string name="downloads_queue_phase_verifying_file">Doğrulanıyor [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Yama uygulanıyor</string>
+    <string name="downloads_queue_phase_applying_data">Veriler uygulanıyor</string>
+    <string name="downloads_queue_phase_finalizing">Tamamlanıyor</string>
+    <string name="downloads_queue_phase_unpacking">Ayıklanıyor</string>
+    <string name="downloads_queue_phase_updating">Güncelleniyor</string>
+    <string name="downloads_queue_phase_complete">Tamamlandı</string>
+    <string name="downloads_queue_phase_cancelled">İptal edildi</string>
+    <string name="downloads_queue_phase_failed">Başarısız: %1$s</string>
+    <string name="downloads_queue_phase_unknown">Bilinmiyor</string>
+    <string name="downloads_queue_paused_resume_hint">Duraklatıldı - devam etmek için Devam Et\'e dokunun</string>
+    <string name="downloads_queue_cancel_download">İndirmeyi İptal Et</string>
+    <string name="downloads_queue_cancel_download_title">İndirme İptal Edilsin mi?</string>
+    <string name="downloads_queue_cancel_download_confirm">%1$s indirmesi iptal edilip indirilen tüm dosyalar silinsin mi?</string>
+    <string name="downloads_queue_cancel_download_warning">Bir DLC, Oyun veya Güncelleme indirmesini iptal etmek oyun kurulumunuzu bozabilir.\n\nBu indirmeyi iptal edip şimdiye kadar indirilen dosyaları silmek istediğinizden emin misiniz?</string>
+    <string name="downloads_queue_cancel_all_title">Tüm İndirmeler İptal Edilsin mi?</string>
+    <string name="downloads_queue_cancel_all_warning">DLC, Oyun veya Güncelleme indirmelerini iptal etmek oyun kurulumlarınızı bozabilir.\n\nTüm indirmeleri iptal edip şimdiye kadar indirilen dosyaları silmek istediğinizden emin misiniz?</string>
+    <string name="downloads_queue_this_game">bu oyun</string>
+    <string name="downloads_queue_empty">Etkin indirme yok.</string>
+
+    <!-- Containers > List -->
+    <string name="containers_list_new">Yeni Konteyner</string>
+    <string name="containers_list_edit">Konteyneri Düzenle</string>
+    <string name="containers_list_creating">Konteyner Oluşturuluyor</string>
+    <string name="containers_list_removing">Konteyner Kaldırılıyor</string>
+    <string name="containers_list_duplicating">Konteyner Çoğaltılıyor</string>
+    <string name="containers_list_remove_title">Konteyneri kaldır</string>
+    <string name="containers_list_duplicate_title">Konteyneri çoğalt</string>
+    <string name="containers_list_confirm_remove">Bu konteyner kaldırılsın mı? İçinde saklanan tüm oyun kayıtları kalıcı olarak silinecek. Buluta eşitlenmiş kayıtlar bulutta kalır, ancak henüz eşitlenmemiş yerel değişiklikler kaybolur — korumak istiyorsanız önce bu oyunun bulut kayıtlarını eşitleyin.</string>
+    <string name="containers_list_confirm_duplicate">Bu konteyneri çoğaltmak istiyor musunuz?</string>
+    <string name="containers_list_duplicate_failed">Konteyner çoğaltılamadı</string>
+
+    <!-- Shortcuts > List -->
+    <string name="shortcuts_list_confirm_remove">Bu kısayolu kaldırmak istiyor musunuz?</string>
+    <string name="shortcuts_list_add_to_home_screen">Ana Ekrana Ekle</string>
+    <string name="shortcuts_library_artwork_title">Kütüphane Görseli</string>
+    <string name="shortcuts_library_artwork_icon_title">Simge Görseli</string>
+    <string name="shortcuts_library_artwork_hero_title">Arka Plan</string>
+    <string name="shortcuts_library_artwork_set">Görseli ayarla</string>
+    <string name="shortcuts_library_artwork_failed">Seçilen görsel yüklenemedi.</string>
+    <string name="shortcuts_library_artwork_open_source">SteamGridDB\'yi Aç</string>
+    <string name="shortcuts_list_not_available">Bu kısayol artık kullanılamıyor. Lütfen silin veya yeniden oluşturun.</string>
+    <string name="shortcuts_list_select_a_container">Bir konteyner seçin</string>
+    <string name="shortcuts_list_error_opening_settings">Kısayol ayarları açılırken hata oluştu</string>
+    <string name="shortcuts_list_removed">Kısayol başarıyla kaldırıldı.</string>
+    <string name="shortcuts_list_remove_failed">Kısayol kaldırılamadı. Lütfen tekrar deneyin.</string>
+    <string name="shortcuts_list_remove_game_shortcut_message">Kısayolu kaldır\n%1$s</string>
+    <string name="shortcuts_list_cloned">Kısayol başarıyla kopyalandı.</string>
+    <string name="shortcuts_list_clone_failed">Kısayol kopyalanamadı.</string>
+    <string name="shortcuts_list_exported_to">Kısayol %1$s Konumuna Dışa Aktarıldı</string>
+    <string name="shortcuts_list_failed_export">Kısayol dışa aktarılamadı</string>
+    <string name="shortcuts_export_all">Tümünü Dışa Aktar</string>
+    <string name="shortcuts_export_to_frontend">Ön Uça Dışa Aktar</string>
+    <string name="shortcuts_export_all_done">%1$d oyun %2$s konumuna dışa aktarıldı</string>
+    <string name="shortcuts_export_all_none">Dışa aktarılacak oyun yok</string>
+    <string name="shortcuts_list_added">Kısayol başarıyla eklendi.</string>
+    <string name="shortcuts_list_readded_existing">Mevcut kısayol yeniden eklendi</string>
+    <string name="shortcuts_list_failed_add">Kısayol eklenemedi.</string>
+
+    <!-- Shortcuts > Properties -->
+    <string name="shortcuts_properties_exec_arguments">Çalıştırma Argümanları</string>
+    <string name="shortcuts_properties_target_path">Hedef Yol</string>
+    <string name="shortcuts_properties_disable_xinput">Xinput\'u Devre Dışı Bırak (Özel M/KB Kontrolü İçin)</string>
+    <string name="num_controllers">Kontrolcü Sayısı</string>
+    <string name="shortcuts_properties_exclusive_input">Özel Giriş</string>
+    <string name="shortcuts_properties_custom_game_settings">Özel Oyun Ayarları</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Eski Başlatıcıyı Kullan</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Eski Steam emülasyonu: oyunu ColdClient başlatıcısı üzerinden çalıştırır ve exe\'den SteamStub DRM\'yi kaldırır. Yalnızca Steam Başlatıcısıyla çalışmayan eski oyunlar için kullanın.</string>
+    <string name="shortcuts_properties_runtime_patcher">Çalışma Zamanı DRM Yamalayıcısı</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Başlatma sırasında bir DRM yamalayıcı DLL\'i enjekte eder. FPS\'yi düşürür — yalnızca Eski Başlatıcı tek başına başarısız olursa kullanın.</string>
+    <string name="steam_section_title">Steam</string>
+    <string name="steam_section_real_client">WinNative Gerçek Steam İstemcisi</string>
+    <string name="steam_section_emulator">Eski Steam Emülatörü</string>
+    <string name="shortcuts_properties_use_steam_input">Steam Input\'u Kullan</string>
+    <string name="shortcuts_properties_steam_offline_mode">Steam Çevrimdışı Modu</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Emüle edilen Steam istemcisinin çevrimdışı olarak görünmesini sağlar, böylece oyun çevrimiçi bağlantı denemez. Steam\'in ağ kontrolünde takılan oyunlar için kullanın.</string>
+    <string name="shortcuts_properties_reset">Özellikleri Sıfırla</string>
+    <string name="shortcuts_properties_updated_at">Kısayol %1$s Tarihinde Güncellendi</string>
+    <string name="shortcuts_properties_properties_reset">Özellikler başarıyla sıfırlandı.</string>
+    <string name="shortcuts_properties_reset_per_game">Oyuna Özel Ayarları Sıfırla</string>
+    <string name="shortcuts_properties_reset_per_game_message">Bu oyun, seçili konteyner varsayılanlarını kullanacak şekilde sıfırlansın mı?</string>
+    <string name="shortcuts_properties_per_game_reset">Oyuna özel ayarlar seçili konteyner varsayılanlarına sıfırlandı</string>
+
+    <!-- Input Controls > Editor -->
+    <string name="input_controls_editor_no_element_selected">Seçili kontrol öğesi yok</string>
+    <string name="input_controls_editor_scale">Ölçek</string>
+    <string name="input_controls_editor_shape">Şekil</string>
+    <string name="input_controls_editor_type">Tür</string>
+    <string name="input_controls_editor_binding">Bağlama</string>
+    <string name="binding_primary">Birincil bağlama</string>
+    <string name="binding_secondary">İkincil bağlama</string>
+    <string name="binding_third">Üçüncül bağlama</string>
+    <string name="binding_fourth">Dördüncül bağlama</string>
+    <string name="input_controls_editor_binding_up">Bağlama Yukarı</string>
+    <string name="input_controls_editor_binding_right">Bağlama Sağ</string>
+    <string name="input_controls_editor_binding_down">Bağlama Aşağı</string>
+    <string name="input_controls_editor_binding_left">Bağlama Sol</string>
+    <string name="input_controls_editor_overlay_opacity">Kaplama Opaklığı</string>
+    <string name="input_controls_editor_opacity">Opaklık</string>
+    <string name="input_controls_editor_radial_menu">Dairesel Menü</string>
+    <string name="input_controls_editor_radial_menu_options">Dairesel Menü Seçenekleri</string>
+    <string name="input_controls_editor_number_of_bindings">Bağlama Sayısı</string>
+    <string name="input_controls_editor_select_profile">Profil Seç</string>
+    <string name="input_controls_select_style">Stil Seç</string>
+    <string name="input_controls_style_original">Orijinal</string>
+    <string name="input_controls_style_gamehub">Cam</string>
+    <string name="input_controls_style_slate">Arduvaz</string>
+    <string name="input_controls_style_halo">Hale</string>
+    <string name="input_controls_style_glint">Parıltı</string>
+    <string name="input_controls_style_shadow">Gölge</string>
+    <string name="input_controls_style_reticle">Retikül</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Renk teması</string>
+    <string name="input_controls_edit_duplicating_builtin">Yerleşik profil — düzenleyebileceğiniz bir kopya oluşturuldu.</string>
+    <string name="input_controls_editor_profile_name">Profil Adı</string>
+    <string name="input_controls_editor_no_profile_selected">Seçili profil yok</string>
+    <string name="input_controls_editor_no_profile_found">Profil bulunamadı</string>
+    <string name="input_controls_editor_tap_to_switch">Değiştirmek için dokunun</string>
+    <string name="input_controls_editor_confirm_remove_profile">Bu profili kaldırmak istiyor musunuz?</string>
+    <string name="input_controls_editor_confirm_duplicate_profile">Bu profili çoğaltmak istiyor musunuz?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Bu profil orijinal düzenine sıfırlansın mı? Yaptığınız tüm değişiklikler kaybolacak.</string>
+    <string name="input_controls_editor_profile_reset">Profil orijinal düzenine sıfırlandı.</string>
+    <string name="input_controls_editor_reset_unavailable">Bu profil için orijinal anlık görüntü mevcut değil.</string>
+    <string name="input_controls_editor_title">Kontrol Düzenleyicisi</string>
+    <string name="input_controls_editor_toggle_switch">Açma/Kapama Anahtarı</string>
+    <string name="input_controls_editor_swipeable">Kaydırılabilir</string>
+    <string name="input_controls_editor_profile_exported_to">Profil şuraya dışa aktarıldı</string>
+    <string name="input_controls_editor_unable_to_import">Profil içe aktarılamıyor</string>
+    <string name="input_controls_editor_import_profile">Profili İçe Aktar</string>
+    <string name="input_controls_editor_download_profile">Profili İndir</string>
+    <string name="input_controls_editor_export_profile">Profili Dışa Aktar</string>
+    <string name="input_controls_editor_range">Aralık</string>
+    <string name="input_controls_editor_confirm_download_profiles">Seçili profilleri indirmek istiyor musunuz?</string>
+    <string name="input_controls_editor_unable_to_load_list">Profil listesi yüklenemiyor</string>
+    <string name="input_controls_editor_osc_transparency">Ekran Üstü Kontrollerin Şeffaflığı</string>
+    <string name="input_controls_editor_osc_transparency_description">Ekran üstü kontrollerin şeffaflığını ayarlayın.</string>
+
+    <!-- Container > Configuration -->
+    <string name="container_config_screen_size">Ekran Boyutu</string>
+    <string name="container_config_new_env_var">Yeni Ortam Değişkeni</string>
+    <string name="container_config_env_vars">Ortam Değişkenleri</string>
+    <string name="container_config_processor_affinity">İşlemci Benzeşimi</string>
+    <string name="container_config_processor_affinity_32bit">İşlemci Benzeşimi (32-bit uygulamalar)</string>
+    <string name="container_config_audio_driver">Ses Sürücüsü</string>
+    <string name="container_config_win_components">Win Bileşenleri</string>
+    <string name="container_config_drives">Sürücüler</string>
+    <string name="container_config_arch">Mimari</string>
+    <string name="container_config_storage_info">Depolama Bilgisi</string>
+    <string name="container_config_drive_c">C: Sürücüsü</string>
+    <string name="container_config_cache">Önbellek</string>
+    <string name="container_config_total">Toplam</string>
+    <string name="container_config_clear_cache">Önbelleği Temizle</string>
+    <string name="container_config_estimated_used_space">Tahmini Kullanılan Alan</string>
+    <string name="settings_containers_error_saving_wallpaper">Duvar kağıdı kaydedilirken hata oluştu</string>
+    <string name="container_config_directinput_mapper_type">DirectInput Eşleyici Türü</string>
+    <string name="container_config_title">Yapılandırma</string>
+    <string name="container_config_startup_selection">Başlangıç Seçimi</string>
+    <string name="container_config_glibc_exp_edition">Temel Alınan</string>
+    <string name="container_config_refresh_rate_default_global">Varsayılan (Genel)</string>
+    <string name="container_config_enable_dinput">Wine\'daki Oyunlar İçin DInput\'u Etkinleştir</string>
+    <string name="container_config_enable_xinput">Wine\'daki Oyunlar İçin XInput\'u Etkinleştir</string>
+    <string name="container_config_dinput_legacy">Eski (Eski Gamepad\'ler)</string>
+    <string name="container_config_dinput_modern">Modern (Xinput benzeri)</string>
+    <string name="container_config_help_xinput">
+        Oyununuz oyun kumandası desteği için &lt;i&gt;&lt;b&gt;XInput API&lt;/b&gt;&lt;/i&gt; kullanıyorsa lütfen bu seçeneği etkinleştirin.&lt;br/&gt;&lt;br/&gt;
+        Bu seçenek hem &lt;i&gt;&lt;b&gt;sanal&lt;/b&gt;&lt;/i&gt; (Giriş Kontrolleri tarafından sağlanan) hem de &lt;i&gt;&lt;b&gt;fiziksel&lt;/b&gt;&lt;/i&gt; oyun kumandalarını etkiler.
+    </string>
+    <string name="container_config_help_dinput">
+        Oyununuz oyun kumandası desteği için &lt;i&gt;&lt;b&gt;DInput API&lt;/b&gt;&lt;/i&gt; kullanıyorsa lütfen bu seçeneği etkinleştirin.&lt;br/&gt;&lt;br/&gt;
+        Bu seçenek hem &lt;i&gt;&lt;b&gt;sanal&lt;/b&gt;&lt;/i&gt; (Giriş Kontrolleri tarafından sağlanan) hem de &lt;i&gt;&lt;b&gt;fiziksel&lt;/b&gt;&lt;/i&gt; oyun kumandalarını etkiler.
+    </string>
+    <string name="container_config_xinput_dinput_warning">Bazı oyunlar her iki API\'yi de destekleyebilir. Bu tür oyunlarda XInput ve DInput\'u aynı anda etkinleştirmek, The Binding of Isaac ve Resident Evil serisi gibi oyunlarda görüldüğü üzere kontrol sorunlarına neden olabilir.</string>
+    <string name="container_config_lc_all" translatable="false">LC_ALL</string>
+    <string name="container_config_dll_emulator">32bit Emülatör</string>
+    <string name="container_config_emulator_wine_hint">Emülatör wine sürümüne göre belirlenir. ARM64EC, FEXCore kullanır; x86_64, Box64 kullanır.</string>
+    <string name="container_config_label">Yapılandırma</string>
+    <string name="container_config_restart_required">Değişikliklerin geçerli olması için konteyneri yeniden başlatın</string>
+    <string name="container_config_renderer">Oluşturucu</string>
+    <string name="container_config_variables">Değişkenler</string>
+    <string name="container_config_windows">Windows</string>
+    <string name="container_config_inputs">Girişler</string>
+    <string name="container_config_tab">Yapılandırma</string>
+    <string name="container_config_av_tab">A/V</string>
+    <string name="container_config_emulator_64bit">64bit Emülatör</string>
+    <string name="container_config_emulator_section">Emülatör</string>
+    <string name="container_config_sdl2_compatibility">SDL2 Uyumluluğunu Etkinleştir</string>
+
+    <!-- Container > Wine and DirectX -->
+    <string name="container_wine_configuration">Wine Yapılandırması</string>
+    <string name="container_wine_csmt">CSMT (Command Stream Multi-Thread)</string>
+    <string name="container_wine_gpu_name">GPU Adı</string>
+    <string name="container_wine_offscreen_rendering_mode">Ekran Dışı Oluşturma Modu</string>
+    <string name="container_wine_strict_shader_math">Katı Shader Matematiği</string>
+    <string name="container_wine_video_memory_size">Video Bellek Boyutu</string>
+    <string name="container_wine_dxwrapper">DX Sarmalayıcı</string>
+    <string name="container_wine_mouse_warp_override">Fare Işınlama Geçersiz Kılma</string>
+    <string name="container_wine_directx">DirectX</string>
+    <string name="container_wine_dxvk_version">DXVK Sürümü</string>
+    <string name="container_wine_dxvk_config_title">DXVK Yapılandırması</string>
+    <string name="container_wine_wined3d_config_title">WineD3D Yapılandırması</string>
+    <string name="container_wine_vkd3d_version">VKD3D Sürümü</string>
+    <string name="container_wine_version">Wine Sürümü</string>
+    <string name="container_wine_dxwrapper_help_content">
+        &lt;i&gt;&lt;b&gt;WineD3D&lt;/b&gt;&lt;/i&gt; DirectX 1-11\'i OpenGL\'e çeviren bir çeviri katmanıdır.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;DXVK&lt;/b&gt;&lt;/i&gt; Direct3D 9-11\'i Vulkan\'a çeviren bir çeviri katmanıdır.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;VKD3D&lt;/b&gt;&lt;/i&gt; Direct3D 12 API\'sini Vulkan\'a çeviren bir çeviri katmanıdır.&lt;br /&gt;&lt;br /&gt;
+        &lt;i&gt;&lt;b&gt;CNC DDraw&lt;/b&gt;&lt;/i&gt; klasik oyunlarla daha iyi uyumluluk için bir DirectDraw uygulamasıdır.
+    </string>
+    <string name="container_wine_enabled_async">Async\'i Etkinleştir</string>
+    <string name="container_wine_enabled_async_cache">Async Önbelleğini Etkinleştir</string>
+    <string name="container_wine_vkd3d_feature_level">VKD3D Özellik Düzeyi</string>
+    <string name="container_wine_ddraw_wrapper">DDraw Sarmalayıcı</string>
+    <string name="container_wine_error_not_installed">Wine/Proton paketi \'%1$s\' kurulu değil ve indirilemedi.</string>
+    <string name="container_no_wine_installed">Kurulu Wine veya Proton yok. Önce birini kurun.</string>
+    <string name="container_wine_title">Wine</string>
+    <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Yüzey Efekti</string>
+
+    <!-- Container > Box64 -->
+    <string name="container_box64_title">Box64</string>
+    <string name="container_box64_wowbox64_title">Box64 / Wowbox64</string>
+    <string name="container_wowbox64_title">Wowbox64</string>
+    <string name="container_box64_preset">Box64 Ön Ayarı</string>
+    <string name="container_box64_version">Box64 Sürümü</string>
+    <string name="container_box64_stability">Kararlılık</string>
+    <string name="container_box64_compatibility">Uyumluluk</string>
+    <string name="container_box64_intermediate">Orta</string>
+    <string name="container_box64_performance">Performans</string>
+    <string name="container_fexcore_performance_tso">Performans TSO</string>
+    <string name="container_fexcore_extreme">Ekstrem</string>
+    <string name="container_fexcore_extreme_tso">Ekstrem TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
+    <string name="box64_env_var_help__dynarec">Box64 dinamik yeniden derleyicisini etkinleştirir veya devre dışı bırakır.</string>
+    <string name="box64_env_var_help__dynarec_safeflags">
+        CALL/RET opcode\'larında bayrakların işlenmesi&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : CALL/RET\'i hiç bayrağa ihtiyaç duymamış gibi işler (daha hızlı, kararsız)&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Çoğu RET bayrağa ihtiyaç duyar, çoğu CALL duymaz&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Tüm CALL/RET bayrağa ihtiyaç duyar (daha yavaş)
+    </string>
+    <string name="box64_env_var_help__dynarec_fastnan">x86\'daki gibi -NAN üretimi</string>
+    <string name="box64_env_var_help__dynarec_fastround">Hassas x86 yuvarlama üretimi</string>
+    <string name="box64_env_var_help__dynarec_x87double">x87 emülasyonu için Float/Double kullanımı</string>
+    <string name="box64_env_var_help__dynarec_bigblock">
+        Dynarec BigBlock oluşturma&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Bloğu mümkün olduğunca büyük oluşturmaya çalışma&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Dynarec bloğunu mümkün olduğunca büyük oluştur&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Dynarec bloğunu daha büyük oluştur (blok çakıştığında devam et, ancak yalnızca elf belleğindeki bloklar için)&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Dynarec bloğunu daha büyük oluştur (blok çakıştığında devam et, tüm bellek türleri için)
+    </string>
+    <string name="box64_env_var_help__dynarec_strongmem">
+        Güçlü Bellek modeli simülasyonu&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Özel bir şey deneme&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Belleğe yazarken bazı Bellek Bariyerlerini etkinleştir (bazı MOV opcode\'larında)&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Tüm 1 artı MOV kullanarak belleğe her yazışta bir Bellek Bariyeri&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : Tüm 2 artı bellekten okurken ve bazı SSE/SSE2 opcode\'larında Bellek Bariyeri&lt;br /&gt;
+        &lt;b&gt;4&lt;/b&gt; : QEMU\'ya benzer şekilde x86 TSO\'yu taklit eder.
+    </string>
+    <string name="box64_env_var_help__dynarec_forward">Blok oluştururken izin verilen maksimum ileri değeri tanımlar</string>
+    <string name="box64_env_var_help__dynarec_callret">CALL/RET opcode\'larının optimizasyonu</string>
+    <string name="box64_env_var_help__dynarec_sep">CALLRET etkinken CALL/RET\'i optimize etmek için ikincil giriş noktaları ekler.</string>
+    <string name="box64_env_var_help__dynarec_wait">Dynarec\'in FillBlock\'un hazır olmasını bekleyip beklemeyeceğini tanımlar</string>
+    <string name="box64_env_var_help__dynarec_weakbarrier">
+        Güçlü bellek emülasyonunun performans etkisini azaltmak için bellek bariyerlerini ayarlar&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Normal güvenli bariyerleri kullan&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Hafif performans artışı için zayıf bariyerleri kullan&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Zayıf bariyerleri kullan, ayrıca son yazma bariyerlerini devre dışı bırak</string>
+    <string name="box64_env_var_help__dynarec_aligned_atomics">
+        Yalnızca hizalanmış atomikler üret (şimdilik yalnızca Arm64\'te kullanılabilir).&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Hizalanmamış atomik işleme kodu üret.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Yalnızca hizalanmış atomikler üret; bu daha hızlı ve daha küçük kod boyutu sağlar, ancak hizalanmış veri adreslerinde çalışan LOCK önekli opcode\'lar için SIGBUS\'a neden olur.</string>
+    <string name="box64_env_var_help__dynarec_df">
+        Ertelenmiş bayrakların kullanımını etkinleştirin veya devre dışı bırakın.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Ertelenmiş bayrakların kullanımını devre dışı bırakır.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Ertelenmiş bayrakların kullanımını etkinleştirir.</string>
+    <string name="box64_env_var_help__dynarec_dirty">
+        Korumasız ve olası kirli bir bloğun çalışmaya devam etmesine izin verir.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Korumasız ve olası kirli bir bloğun çalışmaya devam etmesine izin vermez.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Koduyla aynı sayfaya veri yazan bir dynablock\'un çalışmaya devam etmesine izin verir. Bazı oyunların yükleme süresini hızlandırabilir ancak beklenmedik çökmelere de yol açabilir.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Ayrıca bir HotPage algıladığında o sayfayı NEVERCLEAN olarak işaretler, böylece yazmaya karşı korunmaz ancak o sayfadan oluşturulan bloklar her zaman test edilir. Bu şekilde daha hızlı olabilir (ancak bazı SMC durumları yakalanmayabilir).</string>
+    <string name="box64_env_var_help__dynarec_nativeflags">
+        Yerel bayrakların kullanımını etkinleştirin veya devre dışı bırakın.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : Yerel bayrakları kullanmaz.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : Mümkün olduğunda yerel bayrakları kullanır.</string>
+    <string name="box64_env_var_help__dynarec_pause">
+        x86 PAUSE öykünmesini etkinleştirir, spinlock\'ların performansına yardımcı olabilir.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : x86 PAUSE komutunu yok sayar.&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : x86 PAUSE komutuna öykünmek için YIELD kullanır.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : x86 PAUSE komutuna öykünmek için WFI kullanır.&lt;br /&gt;
+        &lt;b&gt;3&lt;/b&gt; : x86 PAUSE komutuna öykünmek için SEVL+WFE kullanır.
+    </string>
+    <string name="box64_env_var_help__dynarec_noarch">Dynarec blok meta verilerini azaltarak bellek tasarrufu sağlar, uyumluluktan ödün verir.</string>
+    <string name="box64_env_var_help__dynarec_volatile_metadata">64 bit Windows oyunları için güçlü bellek öykünmesine yön vermek üzere PE oynak meta verilerini kullanır.</string>
+    <string name="box64_env_var_help__dynacache">Başlatmayı hızlandırmak için çalıştırmalar arasında üretilen dynarec bloklarının önbelleğe alınmasını denetler.</string>
+    <string name="box64_env_var_help__avx">
+        Konuğa AVX yeteneklerini sunar.&lt;br /&gt;&lt;br /&gt;
+        &lt;b&gt;0&lt;/b&gt; : AVX uzantısını devre dışı bırakır&lt;br /&gt;
+        &lt;b&gt;1&lt;/b&gt; : AVX, BMI1, F16C ve VAES uzantılarını etkinleştirir.&lt;br /&gt;
+        &lt;b&gt;2&lt;/b&gt; : Tüm 1 ayarlarına ek olarak AVX2, BMI2, FMA, ADX, VPCLMULQDQ ve RDRAND etkinleştirir.&lt;br /&gt;
+    </string>
+    <string name="box64_env_var_help__aes">Konuğa AES CPU yeteneklerini sunar.</string>
+    <string name="box64_env_var_help__pclmulqdq">Konuğa PCLMULQDQ CPU yeteneklerini sunar.</string>
+    <string name="box64_env_var_help__shaext">Konuğa SHA uzantısı CPU yeteneklerini sunar.</string>
+    <string name="box64_env_var_help__sse42">Konuğa SSE4.2 CPU yeteneklerini sunar.</string>
+    <string name="box64_env_var_help__sse_flushto0">SSE sıfıra-boşaltma davranışını ve istisna bayrağı izlemeyi denetler.</string>
+    <string name="box64_env_var_help__x87_no80bits">x87 için 80 bit uzun ondalık yerine 64 bit çift duyarlık kullanır.</string>
+    <string name="box64_env_var_help__cputype">Konuğa sunulan Intel veya AMD CPU modelini seçer.</string>
+    <string name="box64_env_var_help__maxcpu">Box64 tarafından programlara sunulan azami CPU sayısı</string>
+    <string name="box64_env_var_help__unityplayer">UnityPlayer\'ı algılar ve uygulamayı Unity oyunu olarak işaretler.</string>
+    <string name="box64_env_var_help__unity">Uygulamayı Unity oyunu olarak işaretler ve Unity\'ye özgü uyumluluk işlemesini etkinleştirir.</string>
+    <string name="box64_env_var_help__mmap32">Her bellek ayırmayı 32 bit adres alanlarında yapmaya zorlar</string>
+
+    <!-- Container > FEXCore -->
+    <string name="fexcore_env_var_help__tsoenabled">TSO IR işlemlerini etkinleştirir (çok iş parçacıklı uygulamalar için gereklidir).</string>
+    <string name="fexcore_env_var_help__vectortsoenabled">TSO etkinken vektör yükleme/depolama işlemlerini atomik yapar.</string>
+    <string name="fexcore_env_var_help__halfbarriertsoenabled">TSO altında hizalanmamış yükleme/depolama işlemleri için yarı bariyer atomikleri kullanır.</string>
+    <string name="fexcore_env_var_help__memcpysettsoenabled">TSO altında REP MOVS / REP STOS işlemlerini atomik yapar.</string>
+    <string name="fexcore_env_var_help__strictinprocesssplitlocks">Bölünmüş hizalanmamış atomik erişimler için işlem genelinde katı bir kilit kullanır.</string>
+    <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Çekirdek bağlam değiştirmelerini azaltmak için çekirdek tarafından işlenen hizalanmamış atomikleri geri yamalar.</string>
+    <string name="fexcore_env_var_help__multiblock">Çok bloklu kod derlemesini etkinleştirir. Daha uzun JIT derlemesine ve takılmaya yol açabilir.</string>
+    <string name="fexcore_env_var_help__maxinst">Derlenmiş bir blokta saklanan azami komut sayısı.</string>
+    <string name="fexcore_env_var_help__hostfeatures">CPU özelliği zorlamasını denetler.</string>
+    <string name="fexcore_env_var_help__smalltscscale">Düşük frekanslı sistemlerde TSC\'yi ölçekler.</string>
+    <string name="fexcore_env_var_help__hidehybrid">Hibrit CPU çekirdek düzenini konuktan gizler.</string>
+    <string name="fexcore_env_var_help__smc_checks">Kodu yürütmeden önce değişikliğe karşı denetler.</string>
+    <string name="fexcore_env_var_help__volatilemetadata">Mevcut olduğunda TSO için PE dosyalarından oynak meta verileri kullanır.</string>
+    <string name="fexcore_env_var_help__monohacks">Mono algılaması için özel SMC + JIT blok hilesi.</string>
+    <string name="fexcore_env_var_help__hidehypervisorbit">CPUID hipervizör bitini gizler (bununla çöken uygulamalar için yararlıdır).</string>
+    <string name="fexcore_env_var_help__disablel2cache">FEXCore JIT L2 önbellek aramasını devre dışı bırakır, bellek tasarrufu sağlar ancak takılmalara neden olur.</string>
+    <string name="fexcore_env_var_help__dynamicl1cache">FEXCore JIT L1 önbelleğini dinamik boyutlu hale getirir, bellek tasarrufu sağlar ancak takılmalara neden olur.</string>
+    <string name="fexcore_env_var_help__dynamicl1cacheincreasecountheuristic">Dinamik L1 önbelleğini büyütmek için saniye başına arama eşiği.</string>
+    <string name="fexcore_env_var_help__dynamicl1cachedecreasecountheuristic">Dinamik L1 önbelleğini küçültmek için saniye başına arama eşiği.</string>
+    <string name="fexcore_env_var_help__x87reducedprecision">X87 kayan noktaya 64 bit duyarlık kullanarak öykünür. Bu, öykünme doğruluğunu azaltır ve işleme hatalarına yol açabilir.</string>
+    <string name="container_fexcore_config">FEXCore</string>
+    <string name="container_fexcore_preset">FEXCore Ön Ayarı</string>
+    <string name="container_fexcore_version">FEXCore Sürümü</string>
+    <string name="use_unix_libs">UnixLibs Kullan</string>
+
+    <!-- Container > Graphics Driver -->
+    <string name="container_graphics_driver">Grafik Sürücüsü</string>
+    <string name="container_zink_mode">Zink Modu</string>
+    <string name="container_graphics_configuration">Grafik Sürücüsü Yapılandırması</string>
+    <string name="container_graphics_version">Grafik Sürücüsü Sürümü</string>
+    <string name="container_graphics_available_extensions">Kullanılabilir Uzantılar</string>
+    <string name="container_graphics_extensions_enabled_summary">%1$d / %2$d etkin</string>
+    <string name="container_graphics_max_device_memory">Azami Aygıt Belleği</string>
+    <string name="container_graphics_sync_frame">Her Kareyi Eşitle</string>
+    <string name="container_graphics_disable_present_wait">KHR_present_wait\'i Devre Dışı Bırak</string>
+    <string name="container_graphics_present_modes">Sunum Modları</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan Ekran Eşitleme</string>
+    <string name="container_graphics_resource_type">Bellek Kaynağı Türü</string>
+    <string name="container_graphics_vulkan_version">Vulkan Sürümü</string>
+    <string name="container_graphics_bcn_emulation">BCn Öykünmesi</string>
+    <string name="container_graphics_bcn_emulation_type">BCn Öykünme Türü</string>
+    <string name="container_graphics_bcn_emulation_cache">BCn Öykünme Önbelleği</string>
+    <string name="container_graphics_transcoder">BCn Kod Dönüştürücü</string>
+    <string name="container_graphics_quality">BCn Kalitesi</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
+    <!-- Container > Presets -->
+    <string name="container_presets_confirm_duplicate">Bu ön ayarı çoğaltmak istiyor musunuz?</string>
+    <string name="container_presets_confirm_remove">Bu ön ayarı kaldırmak istiyor musunuz?</string>
+    <string name="container_presets_title">Ön Ayarlar</string>
+    <string name="container_presets_preset">Ön Ayar</string>
+    <string name="container_presets_new">Yeni Ön Ayar</string>
+    <string name="container_presets_rename">Ön Ayarı Yeniden Adlandır</string>
+    <string name="container_presets_import">Ön Ayarı İçe Aktar</string>
+    <string name="container_presets_custom">Özel</string>
+    <string name="container_presets_built_in">Varsayılan</string>
+    <string name="container_presets_changes_auto_saved">Bu özel ön ayarı düzenlerken değişiklikler otomatik olarak kaydedilir.</string>
+    <string name="container_presets_cannot_rename">Yerleşik ön ayarlar yeniden adlandırılamaz</string>
+    <string name="container_presets_unable_to_import">Ön ayar içe aktarılamıyor</string>
+    <string name="container_presets_no_description">Açıklama mevcut değil</string>
+    <string name="container_presets_cannot_remove">Bu ön ayarı kaldıramazsınız</string>
+    <string name="container_presets_cannot_export">Bu ön ayar dışa aktarılamıyor</string>
+
+    <!-- Session > XServer -->
+    <string name="session_xserver_title">XServer</string>
+    <string name="session_xserver_simulate_touch_screen">Dokunmatik ekranı simüle et</string>
+    <string name="session_xserver_preferences_button_text">   TERCİHLER   </string>
+    <string name="session_xserver_extra_keys_config_desc">Burada Termux uygulamasındaki gibi extra-keys değişkeninin değerini ayarlayabilirsiniz (<a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">bunu</a> okuyun) ve daha fazlası \n
+E.g. <b>META</b> için <i>META tuşu</i>, \n
+<b>KEYBOARD</b> için <i>sanal klavye açma/kapama tuşu</i>, \n
+<b>PREFERENCES</b> için <i>tercihleri açma tuşu</i>, \n
+<b>MOUSE_HELPER</b> için <i>fare yardımcısı açma/kapama tuşu</i>, \n
+<b>STYLUS_HELPER</b> için <i>kalem tıklaması geçersiz kılma katmanı açma/kapama tuşu</i>, \n
+<b>EXIT</b> için <i>uygulama çıkış tuşu</i>.</string>
+    <string name="session_xserver_pref_main">Tercihler</string>
+    <string name="session_xserver_pref_output">Çıkış</string>
+    <string name="session_xserver_pref_pointer">İşaretçi</string>
+    <string name="session_xserver_pref_kbd">Klavye</string>
+    <string name="session_xserver_pref_other">Diğer</string>
+    <string name="session_xserver_pref_version">Sürüm</string>
+    <string name="session_xserver_notification_description">WinNative XServer Mesajları</string>
+    <string name="session_xserver_notification_content">WinNative çalışıyor, bu bildirimi kapatmayın veya kaydırmayın</string>
+
+    <!-- Session > Drawer Menu -->
+    <string name="session_drawer_keyboard">Klavye</string>
+    <string name="session_drawer_fps_monitor">FPS İzleyici</string>
+    <string name="session_drawer_fps_monitor_subtitle">Gerçek zamanlı performans istatistiklerini göster</string>
+    <string name="session_drawer_dual_series_battery">Çift Seri Pil</string>
+    <string name="session_drawer_hud_frametime_numeric">Kare Süresini Sayı Olarak Göster</string>
+    <string name="session_drawer_toggle_fullscreen">Tam Ekranı Aç/Kapat</string>
+    <string name="session_drawer_refactor_size">Boyutu Yeniden Düzenle</string>
+    <string name="session_drawer_show_touchscreen_controls">Dokunmatik Ekran Denetimlerini Göster</string>
+    <string name="session_drawer_magnifier">Büyüteç</string>
+    <string name="session_drawer_logs">Günlükler</string>
+    <string name="session_drawer_pip_mode">PiP Modu</string>
+    <string name="session_drawer_toggle_relative_mouse">Göreli Fare Hareketini Aç/Kapat</string>
+    <string name="session_drawer_toggle_mouse">Fareyi Aç/Kapat</string>
+    <string name="session_drawer_pause_resume">Duraklat/Devam Et</string>
+    <string name="session_drawer_relative_mouse_movement">Göreli Fare Hareketi</string>
+    <string name="session_drawer_mouse_input">Fare Girişi</string>
+    <string name="session_drawer_touch">Dokunma</string>
+    <string name="session_drawer_touch_trackpad">Dokunmatik Yüzey</string>
+    <string name="session_drawer_touch_touchscreen">Dokunmatik Ekran Modu</string>
+    <string name="session_drawer_touch_map_right_stick">Sağ Çubuğa Eşle</string>
+    <string name="session_drawer_rts_gestures">RTS Hareketleri</string>
+    <string name="session_drawer_rts_gestures_edit">Düzenle</string>
+    <string name="session_drawer_right_stick_sensitivity">Sağ çubuk hassasiyeti</string>
+    <string name="session_rts_action">Eylem</string>
+    <string name="session_rts_behavior">Davranış</string>
+    <string name="session_rts_tap1">1 parmakla dokunma</string>
+    <string name="session_rts_tap2">2 parmakla dokunma</string>
+    <string name="session_rts_tap3">3 parmakla dokunma</string>
+    <string name="session_rts_tap4">4 parmakla dokunma</string>
+    <string name="session_rts_double_tap">Çift dokunma (çift sol tıklama)</string>
+    <string name="session_rts_long_press">Uzun basma</string>
+    <string name="session_rts_hold2">2 parmakla tutma</string>
+    <string name="session_rts_hold3">3 parmakla tutma</string>
+    <string name="session_rts_hold4">4 parmakla tutma</string>
+    <string name="session_rts_swipe3">3 parmakla kaydırma</string>
+    <string name="session_rts_swipe4">4 parmakla kaydırma</string>
+    <string name="session_rts_up">Yukarı</string>
+    <string name="session_rts_down">Aşağı</string>
+    <string name="session_rts_left">Sol</string>
+    <string name="session_rts_right">Sağ</string>
+    <string name="session_rts_pan">2 parmakla kaydırma</string>
+    <string name="session_rts_pan1">1 parmakla kaydırma</string>
+    <string name="session_rts_zoom">Kıstırarak yakınlaştırma</string>
+    <string name="session_rts_drag">1 parmakla sürükleme</string>
+    <string name="session_rts_drag2">2 parmakla sürükleme</string>
+    <string name="session_rts_long_press_delay">Uzun basma gecikmesi (ms)</string>
+    <string name="session_rts_hold_delay">Tutma gecikmesi (ms)</string>
+    <string name="session_rts_swipe_threshold">Kaydırma eşiği (px)</string>
+    <string name="session_rts_gesture_threshold">Hareket eşiği (px)</string>
+    <string name="session_rts_double_tap_delay">Çift dokunma gecikmesi (ms)</string>
+    <string name="session_rts_drag_threshold">Sürükleme eşiği (px)</string>
+    <string name="session_rts_pan_threshold">Kaydırma/kıstırma başlangıcı (px)</string>
+    <string name="common_ui_rename">Yeniden Adlandır</string>
+    <string name="common_ui_new">Yeni</string>
+    <string name="input_controls_editor_input_profiles_section">Giriş Profilleri</string>
+    <string name="session_gesture_profile_section">Hareket Profili</string>
+    <string name="gesture_profile_new">Yeni Hareket Profili</string>
+    <string name="gesture_profile_import">Hareket Profilini İçe Aktar</string>
+    <string name="gesture_profile_export">Hareket Profilini Dışa Aktar</string>
+    <string name="gesture_profile_none">Hareket profili yok</string>
+    <string name="session_drawer_screen_effects">Ekran Efektleri</string>
+    <string name="session_drawer_screen_effects_subtitle">Ölçek büyütme ve renk efektleri</string>
+    <string name="session_drawer_super_resolution">Süper Çözünürlük</string>
+    <string name="session_drawer_upscaler_mode">Ölçek Büyütücü</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Kenar Keskinliği</string>
+    <string name="session_drawer_vivid">Canlı</string>
+    <string name="session_drawer_vivid_strength">Canlılık Gücü</string>
+    <string name="session_drawer_color_profile">Renk Efekti</string>
+    <string name="session_drawer_picture_in_picture">Resim İçinde Resim</string>
+    <string name="session_drawer_exit_subtitle">Çalışan oturumu kapat</string>
+    <string name="session_drawer_touchscreen_overlay">Dokunmatik Ekran Katmanı</string>
+    <string name="session_drawer_resume">Devam Et</string>
+    <string name="session_drawer_retry">Yeniden Dene</string>
+    <string name="downloads_no_internet">İnternet bağlantısı yok</string>
+    <string name="session_drawer_pause">Duraklat</string>
+    <string name="session_drawer_wine_processes_paused">Wine işlemleri duraklatıldı</string>
+    <string name="session_drawer_pause_all_wine_processes">Tüm Wine işlemlerini duraklat</string>
+    <string name="session_drawer_controls_section">Denetimler</string>
+    <string name="session_drawer_session_section">Oturum</string>
+    <string name="session_drawer_header_subtitle">Denetimlere, katmanlara ve oturum araçlarına hızlı erişim</string>
+    <string name="session_drawer_swipe_hint">Oyuna geri dönmek için kaydırıp kapatın</string>
+    <string name="session_drawer_main_menu_title">Menü</string>
+    <string name="session_drawer_hud_summary">Katman görünürlüğünü ve veri noktalarını ayarlayın</string>
+    <string name="session_drawer_hud_disabled_hint">Özelleştirmek için katmanı açın</string>
+    <string name="session_drawer_hud_alpha">Alfa</string>
+    <string name="session_drawer_hud_background_alpha">Arka Plan Alfası</string>
+    <string name="session_drawer_hud_background">Arka Plan</string>
+    <string name="session_drawer_hud_scale">Ölçek</string>
+    <string name="session_drawer_hud_elements">HUD Öğeleri</string>
+    <string name="session_drawer_hud_element_fps">FPS</string>
+    <string name="session_drawer_hud_element_api">GFX</string>
+    <string name="session_drawer_hud_element_gpu">GPU</string>
+    <string name="session_drawer_hud_element_cpu">CPU</string>
+    <string name="session_drawer_hud_element_ram">RAM</string>
+    <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.SIC</string>
+    <string name="session_drawer_hud_element_graph">Grafik</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.SIC</string>
+    <string name="session_drawer_hud_mango_style">Mango Tarzı HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD Ayarları</string>
+    <string name="mango_hud_element_gpu_load">GPU Yükü</string>
+    <string name="mango_hud_element_gpu_temp">GPU Sıcaklığı</string>
+    <string name="mango_hud_element_cpu_load">CPU Yükü</string>
+    <string name="mango_hud_element_cpu_temp">CPU Sıcaklığı</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Pil</string>
+    <string name="mango_hud_element_lows" formatted="false">%1 Düşükler</string>
+    <string name="mango_hud_element_graph">Frametime Grafiği</string>
+    <string name="mango_hud_element_engine">Motor</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU Hızı</string>
+    <string name="mango_hud_element_gpu_clock">GPU Hızı</string>
+    <string name="mango_hud_element_cores">Çekirdek Başına</string>
+    <string name="mango_hud_element_network">Ağ</string>
+    <string name="mango_hud_element_swap">Takas</string>
+    <string name="mango_hud_element_resolution">Çözünürlük</string>
+    <string name="mango_hud_element_wine">Wine Sürümü</string>
+    <string name="mango_hud_element_duration">Oturum Süresi</string>
+    <string name="mango_hud_element_clock">Saat</string>
+    <string name="mango_hud_element_throttle">Kısıtlama Durumu</string>
+    <string name="mango_hud_group_memory">Bellek</string>
+    <string name="mango_hud_group_system">Sistem</string>
+    <string name="mango_hud_lock">HUD\'u Kilitle</string>
+    <string name="mango_hud_lock_subtitle">Dokunuşların HUD arkasındaki kontrollere geçmesini sağlar. Kilitlemek için HUD\'a basılı tutun. (5s)</string>
+    <string name="hud_position_menu_title">HUD\'u şuraya taşı</string>
+    <string name="hud_position_top_left">Sol Üst</string>
+    <string name="hud_position_top_center">Üst Orta</string>
+    <string name="hud_position_top_right">Sağ Üst</string>
+    <string name="hud_position_left_center">Sol Orta</string>
+    <string name="hud_position_right_center">Sağ Orta</string>
+    <string name="hud_position_bottom_left">Sol Alt</string>
+    <string name="hud_position_bottom_center">Alt Orta</string>
+    <string name="hud_position_bottom_right">Sağ Alt</string>
+    <string name="session_drawer_hud_alpha_input_title">Alfayı Ayarla</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Arka Plan Alfasını Ayarla</string>
+    <string name="session_drawer_hud_scale_input_title">Ölçeği Ayarla</string>
+    <string name="session_drawer_hud_input_hint">%1$d ile %2$d arasında bir değer girin. Sınırın üstündeki değerler kırpılır.</string>
+    <string name="session_drawer_command_center">Komuta Merkezi</string>
+    <string name="session_drawer_command_center_input">Giriş</string>
+    <string name="session_drawer_command_center_display">Ekran</string>
+    <string name="session_drawer_command_center_system">Sistem</string>
+    <string name="session_drawer_fps_limiter">FPS Sınırlayıcı</string>
+    <string name="session_drawer_fps_limiter_off">Kapalı</string>
+    <string name="session_drawer_color_profile_disabled">Devre dışı</string>
+    <string name="session_drawer_color_profile_hdr">HDR</string>
+    <string name="session_drawer_color_profile_natural">Doğal</string>
+    <string name="session_drawer_color_profile_crt">CRT Efekti</string>
+    <string name="session_drawer_color_profile_toon">Çizgi Film</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Parlaklık</string>
+    <string name="session_drawer_contrast">Karşıtlık</string>
+    <string name="session_drawer_gamma">Gama</string>
+    <string name="session_drawer_scale">Ölçek</string>
+    <string name="session_drawer_scale_nearest">En Yakın</string>
+    <string name="session_drawer_scale_linear">Doğrusal</string>
+    <string name="session_drawer_scale_bicubic">Çift Kübik</string>
+    <string name="session_drawer_saturation">Doygunluk</string>
+    <string name="session_drawer_temperature">Sıcaklık</string>
+    <string name="session_drawer_tint">Ton</string>
+    <string name="session_drawer_sharpen">Keskinleştir</string>
+    <string name="session_drawer_scanlines">Tarama Çizgileri</string>
+    <string name="session_drawer_pixelate">Pikselleştir</string>
+    <string name="session_drawer_block_size">Blok boyutu</string>
+    <string name="session_drawer_strength">Güç</string>
+    <string name="session_drawer_intensity">Yoğunluk</string>
+    <string name="session_drawer_color_blind">Renk Körlüğü</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Efektleri sıfırla</string>
+    <string name="session_drawer_calibrate_advanced">Gelişmiş kalibrasyon</string>
+    <string name="session_drawer_rail_label_hud">HUD</string>
+    <string name="session_drawer_rail_label_gyro">Jiro</string>
+    <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Çıkış</string>
+    <string name="session_drawer_rail_label_apps">Daha Fazla</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">Harici ekran algılandı</string>
+    <string name="display_output_prompt_message">Oyun bağlı ekrana gönderilsin mi? Ekran denetimleriniz ve menünüz bu telefonda kalır.</string>
+    <string name="display_output_prompt_swap">Ekranları Değiştir</string>
+    <string name="display_output_prompt_mirror">Yansıt</string>
+    <string name="display_output_swapped_toast">Oyun harici ekrana taşındı. Denetimler telefonunuzda kalır.</string>
+    <string name="display_output_cast_unavailable">Kablosuz ekran ayarları bu cihazda kullanılamıyor.</string>
+    <string name="display_output_restored_toast">Harici ekran bağlantısı kesildi — oyun telefona döndü.</string>
+    <string name="session_drawer_output_title">Ekran Çıkışı</string>
+    <string name="session_drawer_output_subtitle">Oyun harici ekranda gösteriliyor.</string>
+    <string name="session_drawer_output_device">Bağlı ekran</string>
+    <string name="session_drawer_output_resolution">Çözünürlük</string>
+    <string name="session_drawer_output_refresh_rate">Yenileme Hızı</string>
+    <string name="session_drawer_output_aspect_ratio">En Boy Oranı</string>
+    <string name="session_drawer_output_aspect_fit">Sığdır (En Boy)</string>
+    <string name="session_drawer_output_aspect_stretch">Uzat (Doldur)</string>
+    <string name="session_drawer_output_aspect_zoom">Yakınlaştır (Kırp)</string>
+    <string name="session_drawer_output_return_to_phone">Telefona dön</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Bir TV\'ye Yayınla</string>
+    <string name="session_drawer_output_cast_body">Bir USB-C / HDMI adaptörü bağlayın veya kablosuz bir ekran (Miracast / Wi-Fi Direct) bağlamak için aşağıya dokunun. Bu denetimler telefonunuzda kalırken oyun TV\'de gösterilir.</string>
+    <string name="session_drawer_output_cast_button">Kablosuz Ekran Bağla</string>
+    <string name="session_drawer_output_cast_note">Yalnızca Chromecast destekli TV\'ler özel denetimlerle canlı oyunu gösteremez — en iyi sonuç için kablosuz bir ekran ya da USB‑C/HDMI adaptörü kullanın.</string>
+    <string name="session_drawer_output_render_note">Ekranınızın bildirdiği modlar gerçek çıkışını değiştirir (yeniden başlatılırken kısa süre siyah olabilir). Diğer çözünürlükler o boyutta işlenir ve panele donanımsal olarak ölçeklenir — yerelden yüksek olması keskinleştirir (süper örnekleme), düşük olması daha hızlı çalışır.</string>
+    <string name="session_drawer_output_scaling_note">Bu telefon ekranı kendi yerel %1$s değerinde çıkarır ve modunu değiştirmez, bu nedenle bu ayar işleme çözünürlüğünü belirler — panele donanımsal olarak ölçeklenir (yerelden yüksek keskinleştirir, düşük daha hızlı çalışır).</string>
+    <string name="session_drawer_output_game_mode">Oyun Modu (Düşük Gecikme)</string>
+    <string name="session_drawer_output_game_mode_on">Açık</string>
+    <string name="session_drawer_output_game_mode_off">Kapalı</string>
+    <string name="session_drawer_output_game_mode_note">Giriş gecikmesini en aza indirmek için TV\'nin düşük gecikme / oyun modunu (HDMI ALLM) ister. Yalnızca bağlı ekran bunu desteklediğinde gösterilir.</string>
+    <string name="session_drawer_output_send_to_display">Oyunu ekrana gönder</string>
+    <string name="session_drawer_output_to_display">Harici Ekrana Çıkış</string>
+    <string name="session_drawer_output_send_note">Bir ekran bağlı. Oyunu ona gönderin — denetimleriniz ve menünüz bu telefonda kalır. İstediğiniz zaman buraya geri getirebilirsiniz.</string>
+    <string name="session_drawer_output_display">Ekran</string>
+    <string name="session_drawer_output_glasses">Gözlük</string>
+    <string name="session_drawer_output_brightness">Parlaklık</string>
+    <string name="session_drawer_output_shade">Gölge (karartma)</string>
+    <string name="session_drawer_output_3d">3D (yan yana)</string>
+    <string name="glasses_panel_refresh">Yenileme Hızı</string>
+    <string name="glasses_panel_sunblock">Güneş Koruması</string>
+    <string name="session_drawer_output_volume">Ses</string>
+    <string name="session_drawer_output_glasses_note">Viture gözlüğünüze USB üzerinden doğrudan gönderilir.</string>
+    <string name="session_drawer_rail_label_keyboard">Klavye</string>
+    <string name="session_drawer_rail_label_input_controls">Denetimler</string>
+    <string name="session_drawer_rail_label_relative_mouse">GörFare</string>
+    <string name="session_drawer_rail_label_mouse">Fare</string>
+    <string name="session_drawer_rail_label_fullscreen">Tam Ekran</string>
+    <string name="session_drawer_rail_label_pip">PiP</string>
+    <string name="session_drawer_rail_label_magnifier">Yakınlaştır</string>
+    <string name="session_drawer_rail_label_task_manager">Görevler</string>
+    <string name="session_drawer_rail_label_record">Kaydet</string>
+    <string name="session_drawer_rail_label_logs">Günlükler</string>
+    <string name="session_record_started">Kayıt başladı</string>
+    <string name="session_record_saved">Kayıt WinNative/Recordings konumuna kaydedildi</string>
+    <string name="session_record_failed">Kayıt başlatılamadı</string>
+    <string name="session_record_settings_title">Kayıt Ayarları</string>
+    <string name="session_record_fps">Kare Hızı</string>
+    <string name="session_record_resolution">Çözünürlük</string>
+    <string name="session_record_quality">Kalite</string>
+    <string name="session_record_include_ui">Arayüzü Kaydet</string>
+    <string name="session_record_include_ui_subtitle">HUD ve ekran denetimlerini dahil et</string>
+    <string name="session_record_now">Şimdi Kaydet</string>
+    <string name="session_drawer_logs_clear">Temizle</string>
+    <string name="session_drawer_logs_pause">Duraklat</string>
+    <string name="session_drawer_logs_resume">Sürdür</string>
+    <string name="session_drawer_logs_paused_indicator">Duraklatıldı</string>
+    <string name="session_drawer_logs_line_count">%1$d satır</string>
+    <string name="session_drawer_logs_share">Paylaş</string>
+    <string name="session_drawer_logs_share_subject">Oturum günlükleri</string>
+    <string name="session_drawer_logs_share_chooser">Oturum günlüklerini paylaş</string>
+    <string name="session_drawer_logs_share_failed">Günlükler paylaşılamadı</string>
+    <string name="session_drawer_logs_share_empty">Paylaşılacak günlük satırı yok</string>
+    <string name="session_gyroscope_activator">Etkinleştirici</string>
+
+    <!-- Session > Task Manager -->
+    <string name="session_task_confirm_end_process">Bu işlemi sonlandırmak istiyor musunuz?</string>
+    <string name="session_task_title">Görev Yöneticisi</string>
+    <string name="session_task_process_name">İşlem Adı</string>
+    <string name="session_task_pid">PID</string>
+    <string name="session_task_memory">Bellek</string>
+    <string name="session_task_end_process">İşlemi Sonlandır</string>
+    <string name="session_task_set_affinity">Benzeşim Ayarla</string>
+    <string name="session_task_affinity_title">İşlemci Benzeşimi</string>
+    <string name="session_task_affinity_all_cores">Tüm çekirdekler</string>
+    <string name="session_task_new_task">Yeni Görev</string>
+    <string name="session_task_bring_to_front">Öne Getir</string>
+    <string name="session_task_custom_value">Özel Değer</string>
+    <string name="session_task_processes">İşlemler</string>
+    <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
+    <string name="session_task_per_core_usage">Çekirdek başına kullanım</string>
+    <string name="session_task_core_label">Çekirdek %1$d</string>
+    <plurals name="session_task_core_count">
+        <item quantity="one">%d çekirdek</item>
+        <item quantity="other">%d çekirdek</item>
+    </plurals>
+
+    <!-- Session > Display -->
+    <string name="session_display_orientation">Yönlendirme</string>
+    <string name="session_display_horizontal">Yatay</string>
+    <string name="session_display_vertical">Dikey</string>
+    <string name="session_display_columns">Sütunlar</string>
+    <string name="session_display_frame_rate">Kare Hızı</string>
+    <string name="session_display_title">Ekran</string>
+    <string name="session_display_fullscreen_stretched">Tam Ekranı Etkinleştir (Uzatılmış)</string>
+    <string name="session_display_fps_label">FPS:</string>
+    <string name="session_display_renderer_label">Oluşturucu:</string>
+    <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_ram_label">RAM:</string>
+    <string name="session_display_ram_usage_format">%1$s GB Kullanılan / %2$s Toplam</string>
+
+    <!-- Session > Gamepad -->
+    <string name="session_gamepad_confirm_remove_controller">Bu kumandayı kaldırmak istiyor musunuz?</string>
+    <string name="session_gamepad_external_controllers">Harici Kumandalar</string>
+    <string name="session_gamepad_press_any_button">Kumandanızda herhangi bir düğmeye basın</string>
+    <string name="session_gamepad_bindings">bağlamalar</string>
+    <string name="session_gamepad_control_bindings">Denetim Bağlamaları</string>
+    <string name="session_gamepad_game_controller">Oyun Kumandası</string>
+    <string name="session_gamepad_as_button">Düğmedir</string>
+    <string name="session_gamepad_as_axis">Eksendir</string>
+    <string name="session_gamepad_trigger_type">Tür</string>
+    <string name="session_gamepad_help_trigger_mode">&lt;b&gt;Fiziksel Kumandanıza&lt;/b&gt; bağlıdır:&lt;br/&gt;&lt;br/&gt;&#x2022; &lt;b&gt;Eksendir&lt;/b&gt; — tetik doğrusal bir hareket aralığına sahiptir&lt;br/&gt;&#x2022; &lt;b&gt;Düğmedir&lt;/b&gt; — tetik basit bir anahtar gibi çalışır&lt;br/&gt;&lt;br/&gt;&lt;i&gt;Not: doğrusal bir tetikte Düğmedir seçeneğini kullanmak analog veriyi kaybeder.&lt;/i&gt;
+    </string>
+    <string name="session_gamepad_button_a">A Düğmesi</string>
+    <string name="session_gamepad_button_b">B Düğmesi</string>
+    <string name="session_gamepad_button_x">X Düğmesi</string>
+    <string name="session_gamepad_button_y">Y Düğmesi</string>
+    <string name="session_gamepad_button_grip">Kavrama düğmesi</string>
+    <string name="session_gamepad_button_trigger">Tetik düğmesi</string>
+    <string name="session_gamepad_thumbstick_left">Çubuk sol</string>
+    <string name="session_gamepad_thumbstick_right">Çubuk sağ</string>
+    <string name="session_gamepad_thumbstick_up">Çubuk yukarı</string>
+    <string name="session_gamepad_thumbstick_down">Çubuk aşağı</string>
+    <string name="session_gamepad_configure_analog_sticks">Analog Çubukları Yapılandır</string>
+    <string name="session_gamepad_left_stick">Sol Çubuk</string>
+    <string name="session_gamepad_right_stick">Sağ Çubuk</string>
+    <string name="session_gamepad_controller_manager">Kumanda Yöneticisi</string>
+    <string name="session_gamepad_enable_vibration">Titreşimi Etkinleştir</string>
+    <string name="session_gamepad_player_1">1. Oyuncu</string>
+    <string name="session_gamepad_player_2">2. Oyuncu</string>
+    <string name="session_gamepad_player_3">3. Oyuncu</string>
+    <string name="session_gamepad_player_4">4. Oyuncu</string>
+    <string name="session_gamepad_not_assigned">Atanmadı</string>
+    <string name="session_gamepad_assign">Ata</string>
+    <string name="session_gamepad_press_any_button_for_player">Şunun için kumandada herhangi bir düğmeye basın:</string>
+    <string name="session_gamepad_vibrate">Titreşim</string>
+    <string name="session_gamepad_macros_hint">Otomatik ateşlemeyi etkinleştirmek için düğmeleri açın.</string>
+    <string name="session_gamepad_macros">Makrolar</string>
+    <string name="session_gamepad_include_triggers_note">Turboyu dijital basış olarak L2/R2\'ye de uygula</string>
+    <string name="session_gamepad_square_deadzone">Kare Ölü Bölge</string>
+    <string name="session_gamepad_invert_x">X\'i Ters Çevir</string>
+    <string name="session_gamepad_invert_y">Y\'yi Ters Çevir</string>
+    <string name="session_gamepad_save_profile">Profili Kaydet</string>
+    <string name="session_gamepad_load_profile">Profil Yükle</string>
+    <string name="session_gamepad_button_start">Start Düğmesi</string>
+    <string name="session_gamepad_button_select">Select Düğmesi</string>
+    <string name="session_gamepad_button_l1">L1 Düğmesi</string>
+    <string name="session_gamepad_button_r1">R1 Düğmesi</string>
+    <string name="session_gamepad_button_l2">L2 Düğmesi</string>
+    <string name="session_gamepad_button_r2">R2 Düğmesi</string>
+    <string name="session_gamepad_button_l3">L3 Düğmesi</string>
+    <string name="session_gamepad_button_r3">R3 Düğmesi</string>
+    <string name="session_gamepad_dpad_up">Yön Tuşu Yukarı</string>
+    <string name="session_gamepad_dpad_down">Yön Tuşu Aşağı</string>
+    <string name="session_gamepad_dpad_left">Yön Tuşu Sol</string>
+    <string name="session_gamepad_dpad_right">Yön Tuşu Sağ</string>
+    <string name="session_gamepad_overwrite">Üzerine Yaz</string>
+    <string name="session_gamepad_save_as_new">Yeni Olarak Kaydet</string>
+    <string name="session_gamepad_overwrite_profile_message">Geçerli profilin üzerine mi yazmak yoksa yeni bir profil olarak mı kaydetmek istiyorsunuz?</string>
+    <string name="session_gamepad_enter_profile_name">Profil Adı Girin</string>
+    <string name="session_gamepad_mappings_saved">Eşlemeler kaydedildi!</string>
+    <string name="session_gamepad_profile_saved">Profil kaydedildi!</string>
+    <string name="session_gamepad_profile_saved_as_new">Profil yeni olarak kaydedildi!</string>
+    <string name="session_gamepad_profile_loaded">Profil yüklendi!</string>
+    <string name="session_gamepad_profile_name_empty">Profil adı boş olamaz</string>
+    <string name="session_gamepad_no_profiles">-- Profil Yok --</string>
+    <string name="session_gamepad_error_loading_profile">Profil yüklenirken hata</string>
+
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Dokunmatik Ekran Denetimleri</string>
+    <string name="input_controls_auto_hide_on_controller_title">Kumandada Otomatik Gizle</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Bir kumanda bağlıyken dokunmatik ekran denetimlerini gizle</string>
+
+    <!-- Session > Gyroscope -->
+    <string name="session_gyroscope_title">Jiroskop</string>
+    <string name="session_gyroscope_calibrate">Jiroskopu Kalibre Et</string>
+    <string name="session_gyroscope_enable_right_stick">Sağ Çubuk Jiroskopik Hareketi Etkinleştir</string>
+    <string name="session_gyroscope_activator_button">Jiroskop Etkinleştirme Düğmesi</string>
+    <string name="session_gyroscope_hold">Basılı Tut</string>
+    <string name="session_gyroscope_toggle">Aç/Kapat</string>
+    <string name="session_gyroscope_orientation_mode">Nişan Almak İçin Eğ (Yönlendirme)</string>
+    <string name="session_gyroscope_x_sensitivity">X Ekseni Hassasiyeti</string>
+    <string name="session_gyroscope_y_sensitivity">Y Ekseni Hassasiyeti</string>
+    <string name="session_gyroscope_smoothing">Yumuşatma</string>
+    <string name="session_gyroscope_invert_x">X Eksenini Ters Çevir</string>
+    <string name="session_gyroscope_invert_y">Y Eksenini Ters Çevir</string>
+    <string name="session_gyroscope_filtering">Filtreleme</string>
+    <string name="session_gyroscope_deadzone">Ölü Bölge</string>
+    <string name="session_gyroscope_sensitivity">Hassasiyet</string>
+    <string name="session_gyroscope_direction">Yön</string>
+    <string name="session_gyroscope_mode">Jiroskop Etkinleştirme Modu</string>
+    <string name="session_gyroscope_target_stick">Jiroyu şuna uygula</string>
+    <string name="session_gyroscope_enable_stick">Analog Çubuk Jiroskopik Hareketi Etkinleştir</string>
+    <string name="session_gyroscope_reset_stick">Çubuğu Sıfırla</string>
+    <string name="session_gyroscope_reset_stick_to_center">Çubuğu Merkeze Sıfırla</string>
+    <string name="session_gyroscope_configuration">Jiroskop Yapılandırması</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Deneysel Fare Hareketi</string>
+    <string name="session_gyroscope_x_sensitivity_format">X Hassasiyeti: %1$d%%</string>
+    <string name="session_gyroscope_y_sensitivity_format">Y Hassasiyeti: %1$d%%</string>
+    <string name="session_gyroscope_smoothing_format">Yumuşatma: %1$d%%</string>
+    <string name="session_gyroscope_deadzone_format">Ölü Bölge: %1$d%%</string>
+    <string name="session_gyroscope_sensitivity_format">Hassasiyet: %1$d%%</string>
+    <string name="session_gyroscope_mouse_scale">Fare Ölçeği</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Fare Ölçeği: %1$d%%</string>
+
+    <!-- Settings > General -->
+    <string name="settings_general_cursor_speed">İmleç Hızı</string>
+    <string name="settings_general_theme">Tema</string>
+    <string name="settings_general_background">Arka Plan</string>
+    <string name="settings_general_background_color_hex">Renk (hex)</string>
+    <string name="settings_general_wallpaper_selected">Duvar kağıdı seçildi</string>
+    <string name="settings_general_select_wallpaper">Duvar kağıdı seç</string>
+    <string name="settings_general_title">Genel</string>
+    <string name="settings_general_enable_file_provider">Dosya Sağlayıcısını Etkinleştir</string>
+    <string name="settings_general_enable_auto_scraping">Otomatik Görsel Getirmeyi Etkinleştir</string>
+    <string name="settings_general_take_effect_next_startup">Bu seçenek bir sonraki başlatmada etkin olacaktır.</string>
+    <string name="settings_general_imagefs">Imagefs</string>
+    <string name="settings_general_reinstall_imagefs">Imagefs\'i Yeniden Kur</string>
+    <string name="settings_general_confirm_reinstall_imagefs">Imagefs\'i yeniden kurmak istiyor musunuz? Bu işlem sistem dosyalarını geri yükler, kapsayıcılarınız değişmez.</string>
+    <string name="settings_general_refresh_rate">Yenileme Hızı</string>
+    <string name="settings_general_refresh_rate_auto_max">Maks</string>
+    <string name="settings_general_refresh_rate_summary">Ekran yenileme hızını ve DXVK kare sınırını ayarla</string>
+    <string name="settings_general_touchscreen_timeout">Dokunmatik Ekran Zaman Aşımı (Yeniden Başlatma Gerektirir)</string>
+    <string name="settings_general_touchscreen_haptics">Dokunmatik Ekran Dokunsal Geri Bildirimini Etkinleştir</string>
+    <string name="settings_general_open_with_android_browser">Android Tarayıcısını Wine\'da Aç</string>
+    <string name="settings_general_share_android_clipboard">Android Panosunu Wine ile Paylaş</string>
+    <string name="settings_general_paths_title">Yol Ayarları</string>
+    <string name="settings_general_paths_summary">Winlator\'ın çalışma verilerini nerede sakladığını ve dışa aktarılan kısayolların nereye yazıldığını yönetin.</string>
+    <string name="settings_general_winlator_path_title">Depolama Yolu</string>
+    <string name="settings_general_shortcut_export_path_title">Kısayol Dışa Aktarma Yolu</string>
+    <string name="settings_general_choose_path">Yol Seç</string>
+    <string name="settings_general_xserver_cursor_summary">XServer oturumu içinde dokunmatik, izleme dörtgeni ve fare girişi için işaretçi hızını ayarlayın.</string>
+    <string name="settings_general_cursor_lock_title">Gerçek Fare Denetimi</string>
+    <string name="settings_general_cursor_lock_summary">Ham işaretçi girişine ihtiyaç duyan oyunlar için doğrudan fare yakalamayı etkin tutar. Ses Kısma ile devre dışı bırakın.</string>
+    <string name="settings_general_xinput_toggle_title">XInput\'u Devre Dışı Bırak</string>
+    <string name="settings_general_xinput_toggle_summary">Özel fare ve klavye denetimi istediğinizde XInput işlemeyi kapatır.</string>
+    <string name="settings_external_display_output_summary">Bu ekranı yansıtmak yerine oyunu bağlı bir harici ekrana taşıyın. Gözlükler her zaman kendi ekranlarını kullanır.</string>
+    <string name="settings_general_file_provider_summary">WinNative dosyalarını Android belge seçicilerine ve dosya yöneticilerine açar.</string>
+    <string name="settings_general_auto_scraping_summary">Bu ayar, WinNative\'in özel oyun görsellerini otomatik olarak getirmesine olanak tanır.</string>
+    <string name="settings_general_open_browser_summary">Desteklenen web bağlantılarını Wine yerine Android tarayıcısında açar.</string>
+    <string name="settings_general_clipboard_summary">Android ile Wine oturumları arasında kopyalama ve yapıştırmaya izin verir.</string>
+    <string name="settings_general_imagefs_summary">Mevcut kapsayıcılarınızı kaldırmadan paket sistem dosyalarını geri yükler.</string>
+    <string name="settings_general_check_for_updates">Güncellemeleri Denetle</string>
+    <string name="settings_general_check_for_updates_summary">Başlangıçta ve düzenli aralıklarla yeni uygulama sürümlerini otomatik denetler.</string>
+
+    <!-- Settings > Audio -->
+    <string name="settings_audio_midi_sound_font">MIDI SoundFont</string>
+    <string name="settings_audio_sound">Ses</string>
+    <string name="settings_audio_confirm_remove_sound_font">Bu soundfont\'u kaldırmak istiyor musunuz?</string>
+    <string name="settings_audio_sound_font_removed_success">Soundfont başarıyla kaldırıldı!</string>
+    <string name="settings_audio_sound_font_removed_failed">Soundfont kaldırılamadı!</string>
+    <string name="settings_audio_sound_font_installed_success">Soundfont başarıyla yüklendi!</string>
+    <string name="settings_audio_sound_font_installed_failed">Soundfont yüklenemedi!</string>
+    <string name="settings_audio_sound_font_already_exist">Yüklemek istediğiniz soundfont zaten mevcut.</string>
+    <string name="settings_audio_unable_to_install_soundfont">Soundfont yüklenemiyor</string>
+    <string name="settings_audio_installing_soundfont">SoundFont yükleniyor</string>
+    <string name="settings_audio_sound_font_bad_format">Hatalı SoundFont Biçimi.</string>
+    <string name="settings_audio_cannot_remove_default">Varsayılan soundfont kaldırılamaz</string>
+    <string name="settings_audio_summary">MIDI oynatımı için kullanılan SoundFont\'u yükleyin, kaldırın ve seçin.</string>
+
+    <!-- Settings > Debug -->
+    <string name="settings_debug_wine_debug_channel">Wine Hata Ayıklama Kanalı</string>
+    <string name="settings_debug_title">Hata Ayıklama</string>
+    <string name="settings_debug_wine_logs_title">Wine Hata Ayıklama Günlüklerini Etkinleştir</string>
+    <string name="settings_debug_wine_logs_subtitle">Wine hata ayıklama çıktısını dosyaya yaz</string>
+    <string name="settings_debug_box_logs_title">Box86/64 Günlüklerini Etkinleştir</string>
+    <string name="settings_debug_box_logs_subtitle">Box86 &amp; Box64 hata ayıklama çıktısını dosyaya yaz</string>
+    <string name="settings_debug_fex_logs_title">FEXCore Günlüklerini Etkinleştir</string>
+    <string name="settings_debug_fex_logs_subtitle">FEXCore hata ayıklama çıktısını dosyaya yaz</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX Öykünme günlükleri</string>
+    <string name="settings_debug_emulator_logs_subtitle">Kapsayıcınızın kullandığı öykünücüyü dosyaya kaydeder.</string>
+    <string name="settings_debug_steam_logs_title">Steam Günlüklerini Etkinleştir</string>
+    <string name="settings_debug_steam_logs_subtitle">Hata ayıklama için Steam kimlik doğrulama ve oturum olaylarını kaydet.</string>
+    <string name="settings_debug_wine_channels_title">Wine Hata Ayıklama Kanalları</string>
+    <string name="settings_debug_wine_channels_summary">Wine hata ayıklama günlüğü etkinken hangi Wine kanallarının dahil edileceğini seçin.</string>
+    <string name="settings_debug_wine_classes_title">Wine Günlük Düzeyleri</string>
+    <string name="settings_debug_wine_classes_summary">Hangi ileti türlerinin kaydedileceğini seçin. Trace son derece ayrıntılıdır.</string>
+    <string name="settings_debug_input_logs">Giriş Günlükleri</string>
+    <string name="settings_debug_input_logs_description">Oyun kumandası, dokunma ve klavye giriş olaylarını kaydet</string>
+    <string name="settings_debug_download_logs">İndirme Günlükleri</string>
+    <string name="settings_debug_download_logs_description">İndirme çözümleyici ve WinNative geri dönüş olaylarını kaydet</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan Doğrulama Katmanları</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Uygulamak için ekranı yeniden başlatın.</string>
+    <string name="settings_debug_share_logs">Günlükleri Paylaş</string>
+    <string name="settings_debug_delete_logs">Günlükleri Sil</string>
+    <string name="settings_debug_share_all_logs_short">Tümünü paylaş</string>
+    <string name="settings_debug_download_all_logs_short">Tümünü indir</string>
+    <string name="settings_debug_logs_saved">%1$s konumuna kaydedildi</string>
+    <string name="settings_debug_delete_logs_short">Sil</string>
+    <string name="settings_debug_delete_all_logs_short">Tümünü sil</string>
+    <string name="settings_debug_open_logs_folder_short">Günlük Yöneticisini Aç</string>
+    <string name="settings_debug_logs_deleted">Günlükler silindi</string>
+    <string name="settings_debug_delete_logs_confirm_title">Günlükler Silinsin mi?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Bu işlem, kaydedilen tüm günlük dosyalarını (%1$s) kalıcı olarak siler. Bu geri alınamaz.</string>
+    <string name="settings_debug_logs_browser_title">Günlükler</string>
+    <string name="settings_debug_log_truncated">Bu günlüğün son %1$s kısmı gösteriliyor</string>
+    <string name="settings_debug_logs_subject">WinNative Günlükleri (%1$s)</string>
+    <string name="settings_debug_no_logs_available">Kullanılabilir hata ayıklama günlüğü yok. Önce hata ayıklama seçeneklerini etkinleştirin ve bir oyun başlatın.</string>
+    <string name="settings_debug_capture_failed">Günlükler yakalanamadı: %1$s</string>
+    <string name="settings_debug_log_to_file_desc">WinNative işlem hatalarını, uyarılarını ve çökmelerini dosyaya kaydet</string>
+    <string name="settings_debug_section_emulation">Öykünme</string>
+    <string name="settings_debug_section_subsystems">Alt Sistemler</string>
+    <string name="settings_debug_section_tools">Araçlar</string>
+    <string name="settings_debug_no_channels_selected">Kanal seçilmedi</string>
+    <string name="settings_debug_no_channels_available">Kullanılabilir kanal yok</string>
+    <string name="settings_debug_channel_toggle_hint">Kanalları açıp kapatmak için dokunun. Etkin kanallar Wine hata ayıklama çıktısına dahil edilir.</string>
+    <string name="settings_debug_remove_channel_desc">%1$s öğesini kaldır</string>
+
+    <string name="settings_other_language_title">Dil</string>
+    <string name="settings_other_language_summary">Görüntüleme dilini seçin</string>
+    <string name="settings_other_language_system_default">Sistem varsayılanı</string>
+    <string name="settings_other_game_language_title">Oyun Dili</string>
+    <string name="settings_other_game_language_summary">Steam/Epic/GOG indirmeleri için tercih edilen dil</string>
+
+    <string name="settings_other_section_integration">Entegrasyon</string>
+    <string name="settings_other_setup_wizard_title">Kurulum Sihirbazı</string>
+    <string name="settings_other_setup_wizard_summary">İzinleri, sistem dosyalarını ve varsayılan kapsayıcıları gözden geçirmek için kurulum sihirbazını yeniden açın.</string>
+    <string name="settings_other_checking_for_updates">Güncellemeler denetleniyor…</string>
+    <string name="settings_other_update_check_cooldown">Tekrar denetlemeden önce lütfen %1$d sn bekleyin</string>
+    <string name="settings_other_persistable_permission_failed">Kalıcı izinler alınamadı: %1$s</string>
+    <string name="settings_other_keep_app_open">Bu işlem bitene kadar lütfen uygulamayı açık tutun.</string>
+
+    <!-- Settings > Content Packages -->
+    <string name="settings_content_install">İçerik Yükle</string>
+    <string name="settings_content_type">Kategori</string>
+    <string name="settings_content_components">Bileşenler</string>
+    <string name="settings_content_auto_create_container">Kapsayıcıyı otomatik oluştur</string>
+    <string name="settings_content_remove_title">Bileşen kaldırılsın mı?</string>
+    <string name="settings_content_empty_subtitle">Başlamak için bir paket yükleyin veya türü değiştirin.</string>
+    <string name="settings_content_container_created">Kapsayıcı oluşturuldu: %1$s</string>
+    <string name="settings_content_download_failed">İndirme başarısız.</string>
+    <string name="common_ui_working">Çalışıyor</string>
+    <string name="settings_content_desc_wine">Wine projesi tarafından yapıldı; Win32 çağrılarını yerel Linux/Android hizmetlerine çevirir.</string>
+    <string name="settings_content_desc_proton">Valve tarafından yapıldı; Windows oyunları için oyun yamaları içeren Wine tabanlı bir çalışma zamanı.</string>
+    <string name="settings_content_desc_dxvk">Direct3D 9, 10 ve 11 grafik çağrılarını Vulkan\'a çevirir.</string>
+    <string name="settings_content_desc_vkd3d">Direct3D 12 grafik çağrılarını Vulkan\'a çevirir.</string>
+    <string name="settings_content_desc_box64">x86_64 Linux kodunu ARM64 cihazlarda çalışabilmesi için çevirir.</string>
+    <string name="settings_content_desc_wowbox64">32 bit Windows uygulamalarını 64 bit Wine içinde çalıştırmak üzere WoW64 tarafından kullanılan Box64 yapısı.</string>
+    <string name="settings_content_desc_fexcore">x86 ve x86_64 kodunu ARM64 cihazlarda çalışabilmesi için çevirir.</string>
+    <string name="settings_content_desc_d7vk">DirectDraw (Direct3D 7 ve öncesi) grafik çağrılarını Vulkan\'a çevirir.</string>
+    <string name="settings_content_unable_to_install">İçerik yüklenemiyor.</string>
+    <string name="settings_content_install_failed">Yükleme Başarısız</string>
+    <string name="settings_content_file_cannot_be_recognized">Dosya tanınamıyor.</string>
+    <string name="settings_content_profile_not_found">Profil içerikte bulunamadı.</string>
+    <string name="settings_content_profile_cannot_be_recognized">Profil tanınamıyor</string>
+    <string name="settings_content_file_list">Dosya Listesi</string>
+    <string name="settings_content_install_directory">Yükleme Dizini</string>
+    <string name="settings_content_installed_success">İçerik başarıyla yüklendi!</string>
+    <string name="settings_content_downloading_title">İçerik İndiriliyor</string>
+    <string name="settings_content_installing_title">İçerik Yükleniyor</string>
+    <string name="settings_content_extracting_title">İçerik Çıkarılıyor</string>
+    <string name="settings_content_extracting_detail">Çıkarılıyor (%1$d dosya)</string>
+    <string name="settings_content_preparing_package">Paket hazırlanıyor</string>
+    <string name="settings_content_download_complete">İndirme tamamlandı</string>
+    <string name="settings_content_already_installed_title">Bileşen Zaten Yüklü</string>
+    <string name="settings_content_already_installed_message">Bu bileşen zaten yüklü. Tekrar indirmeden önce yüklü kopyayı kaldırın.
+
+Yüklü konum:
+%1$s</string>
+    <string name="settings_content_conflicting_title">Çakışan İçerik Yüklü</string>
+    <string name="settings_content_conflicting_message">Bu paketi indirmeden önce lütfen çakışan içeriği kaldırın.
+
+Yüklü konum:
+%1$s</string>
+    <string name="settings_content_cannot_be_trusted">İçeriğe güvenilemiyor.</string>
+    <string name="settings_content_is_incomplete">İçerik eksik.</string>
+    <string name="settings_content_untrusted_files_warning">Uyarı: Ek içerik güvenilmeyen dosyalar içeriyor. Genellikle aşağıdaki dosyaların değiştirilmemesi gerekir. Lütfen yüklemeye devam edip etmeyeceğinize karar verin.</string>
+    <string name="settings_content_confirm_remove">Bu işlem, bileşeni cihazınızdan siler.</string>
+    <string name="settings_content_unable_to_remove_in_use">Bir kapsayıcı şu anda bu Wine\'ı kullandığından bu içerik kaldırılamıyor.</string>
+    <string name="settings_content_download_in_components">Hiçbiri indirilmedi. Lütfen Bileşenler\'den bir tane indirin.</string>
+    <string name="settings_content_types_header">İÇERİK TÜRLERİ</string>
+
+    <!-- Settings > Drivers -->
+    <string name="settings_drivers_title">Sürücüler</string>
+    <string name="settings_drivers_manager_header">Sürücü Yöneticisi</string>
+    <string name="settings_drivers_github_repos">GitHub Depoları</string>
+    <string name="settings_drivers_install">Sürücü Yükle</string>
+    <string name="settings_drivers_installed_success">Sürücü başarıyla yüklendi.</string>
+    <string name="settings_drivers_install_failed">Sürücü yüklenemedi.</string>
+    <string name="settings_drivers_remove_title">Sürücü kaldırılsın mı?</string>
+    <string name="settings_drivers_confirm_remove">Bu işlem, sürücüyü cihazınızdan siler.</string>
+    <string name="settings_drivers_remove_repo_title">Depo kaldırılsın mı?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s depo listenizden kaldırılacak.</string>
+    <string name="settings_drivers_repo_tap_to_load">Sürümleri yüklemek için dokunun</string>
+    <string name="settings_drivers_repo_loading_releases">Sürümler yükleniyor</string>
+    <string name="settings_drivers_repo_release_count">%1$d sürüm yüklendi</string>
+    <string name="settings_drivers_repo_no_release_assets">Alınan sürümlerde indirilebilir ZIP dosyası bulunamadı.</string>
+    <string name="settings_drivers_repo_fetch_failed">GitHub sürümleri yüklenemedi.</string>
+    <string name="settings_drivers_repo_download_failed">İndirme başarısız.</string>
+    <string name="settings_drivers_repo_no_version">Sürüm kullanılamıyor</string>
+    <string name="settings_drivers_repo_unknown_size">Bilinmeyen boyut</string>
+    <string name="settings_drivers_manager">Sürücü Yöneticisi</string>
+
+    <!-- Setup > Wizard -->
+    <string name="setup_wizard_installing_system_files">Sistem Dosyaları Yükleniyor</string>
+    <string name="setup_wizard_unable_to_install_system_files">Sistem dosyaları yüklenemiyor</string>
+    <string name="setup_wizard_system_image_not_installed">Sistem görüntüsü yüklü değil. Lütfen önce bileşenleri yükleyin.</string>
+    <string name="setup_wizard_recommended_components">Önerilen Bileşenler</string>
+    <string name="setup_wizard_step_format">Adım %1$d / %2$d</string>
+    <string name="setup_wizard_allow_file_access">Tüm dosya erişimine izin ver</string>
+    <string name="setup_wizard_install_system_files">Sistem Dosyalarını Yükle</string>
+    <string name="setup_wizard_recommended_components_description">Önerilen Bileşenler, desteklenen DXVK, VKD3D, FEX, Box64 ve Wowbox64 paketlerini otomatik olarak indirir ve yükler.</string>
+    <string name="setup_wizard_each_button_downloads_description">Her düğme paketi indirir, yükler ve varsayılan kapsayıcısını otomatik olarak oluşturur.</string>
+    <string name="setup_wizard_recommended_x86_64">Önerilen x86-64</string>
+    <string name="setup_wizard_recommended_arm64ec">Önerilen ARM64EC</string>
+    <string name="setup_wizard_choose_components_description">Hangi bileşenlerin yükleneceğini seçin. Wine/Proton otomatik olarak bir kapsayıcı oluşturur.</string>
+    <string name="setup_wizard_loading_components">Bileşenler yükleniyor…</string>
+    <string name="setup_wizard_no_components_available">Bu kategori için kullanılabilir bileşen yok.</string>
+    <string name="setup_wizard_default_settings">Varsayılan Ayarlar</string>
+    <string name="setup_wizard_containers">Kapsayıcı Kurulumu</string>
+    <string name="setup_wizard_containers_description">Her kapsayıcıyı açın ve her yeni oyunun devralmasını istediğiniz varsayılanları ayarlayın. Yeni oyunlar varsayılan olarak x86-64 kapsayıcısını hedefler.</string>
+    <string name="setup_wizard_store_sign_in_optional">Mağaza girişi isteğe bağlıdır. Her giriş, tamamlandığında buraya döner.</string>
+    <string name="setup_wizard_granted">Verildi</string>
+    <string name="setup_wizard_grant">Ver</string>
+    <string name="setup_wizard_denied">Reddedildi</string>
+    <string name="setup_wizard_allow">İzin Ver</string>
+    <string name="setup_wizard_installing">Yükleniyor</string>
+    <string name="setup_wizard_install_failed_reason">Yükleme başarısız: %1$s</string>
+    <string name="setup_wizard_install_failed_detail">%1$s - %2$s</string>
+    <string name="setup_wizard_required_access">Gerekli Erişim</string>
+    <string name="setup_wizard_select_components">Bileşenleri Seç</string>
+    <string name="setup_wizard_recommended_wine_proton">Önerilen Wine / Proton</string>
+    <string name="setup_wizard_advanced_setup">Gelişmiş Kurulum</string>
+    <string name="setup_wizard_title">Kurulum Sihirbazı</string>
+    <string name="setup_wizard_advanced_user">Gelişmiş Kullanıcı</string>
+    <string name="setup_wizard_next">İleri</string>
+    <string name="setup_wizard_finish">Bitir</string>
+    <string name="setup_wizard_download_and_install">İndir + Yükle</string>
+    <string name="setup_wizard_open_drivers">Sürücüleri Aç</string>
+    <string name="setup_wizard_ready">Hazır</string>
+    <string name="setup_wizard_download_and_create">İndir + Oluştur</string>
+    <string name="setup_wizard_configured">Yapılandırıldı</string>
+    <string name="setup_wizard_downloading">%1$s indiriliyor</string>
+    <string name="setup_wizard_installing_package">%1$s yükleniyor</string>
+    <string name="setup_wizard_no_runtime_installed">Henüz yüklü Wine veya Proton paketi yok.</string>
+    <string name="setup_wizard_no_runtime_hint">Önceki adımdan bir Wine veya Proton paketi yükleyin ya da şimdilik bunu atlayın.</string>
+    <string name="setup_wizard_recommended_label">Önerilen</string>
+    <string name="setup_wizard_install_all_recommended">Tüm Önerilenleri Yükle</string>
+    <string name="setup_wizard_create_container">Kapsayıcı Oluştur</string>
+    <string name="setup_wizard_creating_container">Oluşturuluyor…</string>
+
+    <string name="input_controls_tap_to_click">Tıklamak İçin Dokun</string>
+    <string name="input_controls_reverse_binding_order">Bağlama sırasını tersine çevir</string>
+    <!-- Steam > Login -->
+    <string name="steam_login_auth_webview_title">Yetkilendirme</string>
+    <string name="steam_login_sign_in_to_your_account">Hesabınızda oturum açın</string>
+    <string name="steam_login_username">Kullanıcı Adı</string>
+    <string name="steam_login_password">Parola</string>
+    <string name="steam_login_invalid_username_or_password">Geçersiz kullanıcı adı veya parola</string>
+    <string name="steam_login_remember_me">Beni Hatırla</string>
+    <string name="steam_login_sign_in_with_qr_code">QR Kodu ile oturum aç</string>
+    <string name="steam_login_open_steam_app_qr_hint">Steam uygulamasını açın → QR simgesine dokunun</string>
+    <string name="steam_login_failed_to_load_qr_code">QR kodu yüklenemedi</string>
+    <string name="steam_login_retry">Yeniden Dene</string>
+    <string name="steam_login_generating_code">Kod oluşturuluyor…</string>
+    <string name="steam_login_two_factor_auth">İki Aşamalı Kimlik Doğrulama</string>
+    <string name="steam_login_approve_login_steam_app">Bu oturum açmayı\nSteam mobil uygulamanızdan onaylayın</string>
+    <string name="steam_login_enter_code_sent_to">%1$s adresine gönderilen\nkodu girin</string>
+    <string name="steam_login_enter_steam_guard_code">Steam Guard kodunuzu girin</string>
+    <string name="steam_login_code">Kod</string>
+
+    <!-- Google > Cloud Sync -->
+    <string name="google_cloud_title">Bulut Eşitleme</string>
+    <string name="google_cloud_sync_started">Bulut eşitleme başladı.</string>
+    <string name="google_cloud_google">Google</string>
+    <string name="google_cloud_services">Google Hizmetleri</string>
+    <string name="google_auto_signin_title">Başlangıçta Google\'da oturum aç</string>
+    <string name="google_auto_signin_summary">Kayıt yedekleri ve eşitleme her zaman hazır olsun diye uygulama başladığında Google Play Games\'e otomatik bağlanır. Kapalıyken uygulama kendi başına asla oturum açmaz.</string>
+    <string name="google_auto_signin_section">Başlangıçta</string>
+    <string name="google_cloud_play_games">Google Play Games</string>
+    <string name="google_cloud_status_syncing">Eşitleniyor</string>
+    <string name="google_cloud_status_connected">Bağlı</string>
+    <string name="google_cloud_status_not_signed_in">Oturum Açılmadı</string>
+    <string name="google_cloud_working">Çalışıyor…</string>
+    <string name="google_cloud_sign_in">Oturum Aç</string>
+    <string name="google_cloud_disable_sync">Eşitlemeyi Devre Dışı Bırak</string>
+    <string name="google_cloud_store_logins">Mağaza Girişleri</string>
+    <string name="google_cloud_store_login_sync_busy">Mağaza girişi eşitlemeniz üzerinde çalışılıyor…</string>
+    <string name="google_cloud_saved_games_unavailable">Google Kayıtlı Oyunlar kullanılamıyor</string>
+    <string name="google_cloud_snapshot_ready">Bulut anlık görüntüsü hazır</string>
+    <string name="google_cloud_waiting_first_backup">İlk yedekleme bekleniyor</string>
+    <string name="google_cloud_no_store_logins_detected">Mağaza girişi algılanmadı</string>
+    <string name="google_cloud_last_synced">Son eşitleme: %1$s</string>
+    <string name="google_cloud_backup">Yedekle</string>
+    <string name="google_cloud_restore">Geri Yükle</string>
+    <string name="google_cloud_sign_in_to_sync">Mağaza girişlerini eşitlemek için Google Play Games\'te oturum açın.</string>
+    <string name="google_cloud_sign_in_failed">Google Play Games oturum açma başarısız.</string>
+    <string name="google_cloud_sign_in_finishing">Google Play Games oturum açma hâlâ tamamlanıyor. Bir an bekleyip bulut eşitlemeyi tekrar deneyin.</string>
+    <string name="google_cloud_connected_restore_available">Google Play Games bağlandı. %1$s için geri yükleme kullanılabilir.</string>
+    <string name="google_cloud_connected_tap_backup">Google Play Games bağlandı. %1$s girişlerini kaydetmek için Yedekle\'ye dokunun.</string>
+    <string name="google_cloud_connected_ready">Google Play Games bağlandı. Yedekleme ve Geri Yükleme hazır.</string>
+    <string name="google_cloud_sync_disabled">Bu uygulama için Google Play Games eşitlemesi devre dışı.</string>
+    <string name="google_cloud_sign_in_first">Önce Google Play Games\'te oturum açın.</string>
+    <string name="google_cloud_no_saved_logins_found">Google bulut eşitlemesinde kayıtlı mağaza girişi bulunamadı.</string>
+    <string name="google_cloud_backup_already_matches">Bulut yedeği zaten mevcut mağaza girişleriyle eşleşiyor.</string>
+    <string name="google_cloud_no_local_logins">Yedeklenecek yerel mağaza girişi yok.</string>
+    <string name="google_cloud_logins_restored_and_synced">%1$s için mağaza girişleri geri yüklendi ve eşitlendi.</string>
+    <string name="google_cloud_logins_restored">%1$s için mağaza girişleri geri yüklendi.</string>
+    <string name="google_cloud_logins_backed_up">%1$s için mağaza girişleri yedeklendi.</string>
+    <string name="google_cloud_sync_ready">Mağaza girişi eşitlemesi hazır.</string>
+    <string name="google_cloud_no_logins_to_sync">Henüz eşitlenecek mağaza girişi yok.</string>
+    <string name="google_cloud_sign_in_to_backup">%1$s giriş jetonlarını yedeklemek için oturum açın.</string>
+    <string name="google_cloud_no_backed_up_logins">Henüz yedeklenmiş mağaza girişi bulunamadı.</string>
+    <string name="google_cloud_local_cloud_differ">Yerel ve bulut mağaza girişleri farklı. Bulut verilerinin üzerine yazmak için Yedekle\'yi, kayıtlı jetonları çekmek için Geri Yükle\'yi kullanın.</string>
+    <string name="google_cloud_local_ready_to_backup">Yerel mağaza girişleri %1$s için yedeklenmeye hazır.</string>
+    <string name="google_cloud_backup_ready">Mağaza girişi yedeği hazır.</string>
+    <string name="google_cloud_restore_available">%1$s için bulut girişi geri yükleme mevcut.</string>
+    <string name="google_cloud_logins_synced">Mağaza girişleri Google Play Games ile eşitlendi.</string>
+    <string name="google_cloud_sync_problem">Mağaza girişi eşitlemesinde bir sorun oluştu.</string>
+    <string name="google_cloud_error_auth_needed">Bulut eşitlemesinin Kayıtlı Oyunlar\'a erişebilmesi için Google Play Games\'in kimlik doğrulamasını tamamlaması gerekiyor. Görünürse Play Games profil istemini açın, ardından tekrar deneyin.</string>
+    <string name="google_cloud_error_developer">Google Play Games Kayıtlı Oyunlar bu derlemeyi reddetti. Play Console\'da Play Games uygulama kimliğini, bağlı paket adını ve imzalama sertifikasını kontrol edin.</string>
+    <string name="google_cloud_error_build_rejected">Google hesabı bağlı, ancak Google Play Games Kayıtlı Oyunlar bu derlemeyi reddetti. Play Games uygulama kimliğini, bağlı paketi ve imzalama sertifikasını kontrol edin.</string>
+    <string name="google_cloud_error_network">Ağ isteği tamamlanmadığı veya Google Play services ilgi gerektirdiği için Google bulut eşitlemesi başarısız oldu.</string>
+    <string name="google_cloud_error_no_snapshot">Google bulut eşitlemesinde henüz kayıtlı mağaza girişi bulunamadı.</string>
+    <string name="google_cloud_error_generic">Google bulut eşitlemesi başarısız oldu: %1$s</string>
+    <string name="google_cloud_error_before_open">Google bulut eşitlemesi, Google Kayıtlı Oyunlar açılamadan başarısız oldu.</string>
+    <string name="cloud_saves_title">Bulut Kayıtları</string>
+    <string name="cloud_saves_title_for_provider">%1$s Bulut Kayıtları - %2$s</string>
+    <string name="cloud_saves_sync_summary">%1$s uygulamasının şu anki sürümünü çekin.</string>
+    <string name="cloud_saves_sync_summary_generic">Geçerli bulut sürümünü çekin.</string>
+    <string name="cloud_saves_no_backups">Bu oyun için henüz yedek yok.</string>
+    <string name="cloud_sync_title">Bulut Kayıtları</string>
+    <string name="cloud_sync_disable_title">Bulut Kayıtlarını Devre Dışı Bırak</string>
+    <string name="cloud_saves_steam_push_label">Steam Cloud\'a Gönder</string>
+    <string name="cloud_saves_steam_push_helper">Yerel kaydı zorla yükle</string>
+    <string name="cloud_saves_steam_push_success">Kayıt Steam Cloud\'a gönderildi.</string>
+    <string name="cloud_saves_steam_push_failed">Kayıt Steam Cloud\'a gönderilemedi.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud şu anda erişilemiyor. Arka planda yeniden bağlanılıyor; çevrimiçi olunca yenilemeye dokunun.</string>
+    <string name="steam_session_refused_event">Steam önbelleğe alınmış oturumu reddetti (EResult=%1$d). Lütfen tekrar oturum açın.</string>
+    <string name="cloud_sync_enabled_summary">Başlatıldığında indir, çıkışta gönder.</string>
+    <string name="cloud_sync_disabled_summary">Bulut kaydı indirmeden veya çıkış eşitlemesi olmadan başlat.</string>
+    <string name="cloud_saves_offline_mode">Bulut Eşitlemesini Devre Dışı Bırak</string>
+    <string name="cloud_saves_offline_mode_summary">Bu oyun için tüm otomatik bulut etkinliğini durdurur.</string>
+    <string name="cloud_saves_backing_up">Bulut kaydı yedekleniyor…</string>
+    <string name="cloud_saves_restoring">Bulut kaydı geri yükleniyor…</string>
+
+    <!-- Cloud Saves > Provider sync & backup history -->
+    <string name="cloud_saves_sync_from_provider">%1$s Cloud\'dan eşitle</string>
+    <string name="cloud_saves_sync_from_provider_generic">Bulut\'tan eşitle</string>
+    <string name="cloud_saves_syncing_from_provider">%1$s uygulamasından kayıt indiriliyor…</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s bulut kaydı indirildi.</string>
+    <string name="cloud_saves_sync_from_provider_failed">%1$s uygulamasından kayıt indirilemedi.</string>
+    <string name="cloud_saves_gog_manage_label">GOG Bulut Kayıtlarını Yönet</string>
+    <string name="cloud_saves_gog_manage_helper">Resmi GOG Web Sitesini açar</string>
+    <string name="cloud_saves_gog_manage_no_browser">GOG bulut kayıtları sayfasını açacak tarayıcı yok</string>
+    <string name="cloud_saves_gog_zip_label">GOG Bulut Zip\'i İndir</string>
+    <string name="cloud_saves_gog_zip_helper">Geçerli bulut dosyalarını kaydet</string>
+    <string name="cloud_saves_gog_zip_success">GOG bulut kayıtları zip\'i kaydedildi.</string>
+    <string name="cloud_saves_gog_zip_failed">GOG bulut kayıtları zip\'i kaydedilemedi.</string>
+    <string name="cloud_saves_gog_zip_empty">GOG bulut kaydı dosyası bulunamadı.</string>
+    <string name="cloud_saves_google_backup_label">Google\'a Yedekle</string>
+    <string name="cloud_saves_google_backup_helper">Google Play Games\'e bir kopya kaydet</string>
+    <string name="cloud_saves_google_backup_no_save">Yedeklenecek kayıt dosyası bulunamadı.</string>
+    <string name="cloud_saves_history_title">Kayıt Geçmişi</string>
+    <string name="cloud_saves_history_empty">Henüz yedeklenmiş önceki kayıt yok. Değiştirilen kayıtlar ve manuel yedekler burada 30 gün boyunca görünür.</string>
+    <string name="cloud_saves_history_loading">Kayıt geçmişi yükleniyor…</string>
+    <string name="cloud_saves_history_sign_in">Kayıt geçmişinizi görüntülemek için Google\'da oturum açın.</string>
+    <string name="cloud_saves_history_origin_local">yerel</string>
+    <string name="cloud_saves_history_origin_cloud">bulut</string>
+    <string name="cloud_saves_history_origin_manual">manuel</string>
+    <string name="cloud_saves_history_origin_auto">otomatik</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_restore">Geri Yükle</string>
+    <string name="cloud_saves_history_download">İndir</string>
+    <string name="cloud_saves_history_download_success">Dosya indirildi.</string>
+    <string name="cloud_saves_history_download_failed">İndirme başarısız oldu.</string>
+    <string name="cloud_saves_history_cloud_readonly">Salt okunur</string>
+    <string name="cloud_saves_history_restore_confirm_title">Bu yedek geri yüklensin mi?</string>
+    <string name="cloud_saves_history_restore_confirm_body">Bu, mevcut yerel kaydınızı %1$s tarihli yedekle değiştirir.</string>
+    <string name="cloud_saves_history_restore_success">Kayıt yedekten geri yüklendi.</string>
+    <string name="cloud_saves_history_restore_failed">Bu yedek geri yüklenemedi.</string>
+    <string name="cloud_saves_keep_replaced_backup">Değiştirilen kaydın bir yedeğini tut</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Fikrinizi değiştirirseniz, Kayıt Geçmişi\'nden geri yükleyebilirsiniz.</string>
+    <string name="cloud_saves_history_refresh">Yenile</string>
+    <string name="cloud_saves_history_rename">Yeniden Adlandır</string>
+    <string name="cloud_saves_history_rename_title">Bu yedeği adlandırın</string>
+    <string name="cloud_saves_history_rename_hint">örn. Boss savaşı, Bitiş öncesi</string>
+    <string name="cloud_saves_history_rename_save">Kaydet</string>
+    <string name="cloud_saves_history_rename_clear">Temizle</string>
+    <string name="cloud_saves_history_rename_success">Yedek yeniden adlandırıldı.</string>
+    <string name="cloud_saves_history_rename_failed">Yedek yeniden adlandırılamadı.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Kayıt Klasörü Seç</string>
+    <string name="cloud_saves_custom_folder_label">Kayıt Klasörü</string>
+    <string name="cloud_saves_custom_select_folder_summary">Kapsayıcı içindeki kayıt dizinini işaret edin</string>
+    <string name="cloud_saves_custom_no_container">Bu kısayol için kapsayıcı mevcut değil</string>
+    <string name="cloud_saves_custom_picker_title">Kayıt klasörünü seç</string>
+    <string name="cloud_saves_custom_outside_drive_c">Seçilen klasör, kapsayıcının C: sürücüsünün içinde olmalıdır</string>
+    <string name="cloud_saves_custom_path_map_failed">Seçilen klasör bir Windows yoluna eşlenemedi.</string>
+    <string name="cloud_saves_custom_folder_set">Kayıt klasörü %1$s olarak ayarlandı</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Steam Cloud\'dan eşitle</string>
+    <string name="cloud_saves_steam_sync_helper">En son kaydı indir</string>
+    <string name="cloud_saves_steam_sync_success">Steam Cloud\'dan eşitlendi</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud eşitlemesi başarısız oldu</string>
+    <string name="cloud_saves_steam_browse_label">Steam Cloud Kayıtlarını Görüntüle</string>
+    <string name="cloud_saves_steam_browse_helper">Bulut depolamasını aç</string>
+    <string name="cloud_saves_steam_browse_no_browser">Steam sayfasını açacak tarayıcı yok</string>
+    <string name="cloud_saves_steam_import_label">Dosyaları İçe Aktar</string>
+    <string name="cloud_saves_steam_import_helper">İndirilen dosyaları geri yükle</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Dosya seçici kullanılamıyor</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Bu, Steam Cloud\'un geçerli kayıt dosyalarını indirir ve mevcut kayıt dosyalarının üzerine yazar.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Geçersiz uygulama kimliği</string>
+    <string name="cloud_saves_label_saved">Etiket kaydedildi</string>
+
+    <!-- Saves > Import and Export -->
+    <string name="saves_import_export_title">Kayıtlar</string>
+    <string name="saves_import_export_confirm_selection">Seçimi Onayla</string>
+    <string name="saves_import_export_select_directory">Kayıt dizininizi seçin</string>
+    <string name="saves_import_export_up_directory">Üst Dizin</string>
+    <string name="saves_import_export_select_container">Hedef Kapsayıcı:</string>
+    <string name="saves_import_export_exported">Kayıtlar başarıyla dışa aktarıldı</string>
+    <string name="saves_import_export_exported_failed">Kayıtlar dışa aktarılamadı: %1$s</string>
+    <string name="saves_import_export_imported">Kayıtlar başarıyla içe aktarıldı</string>
+    <string name="saves_import_export_imported_failed">Kayıtlar içe aktarılamadı: %1$s</string>
+    <string name="saves_export_path_summary">Kayıtlar /WinNative/saves konumuna dışa aktarılacak</string>
+    <string name="saves_export_success_path">%1$s konumuna dışa aktarıldı</string>
+    <string name="saves_export_warning_title">Bunu yalnızca özel oyunlarla kullanın</string>
+    <string name="saves_export_warning_body">Dışa aktarma, mağazadan yüklenen veya bulut eşitlemeli oyunların kayıtlarını içerebilir.</string>
+    <string name="saves_import_warning_title">Bu, bu kapsayıcıdaki mevcut kayıtların üzerine yazar</string>
+    <string name="saves_import_warning_body">Birden fazla oyun içeren eski bir yedeği geri yüklerken, önce dosya yöneticinizle daha yeni kayıtları zip\'e kopyalayın. Yalnızca .zip içinde bulunan Kayıtlar etkilenir. Kayıtları akıllıca yönetin.</string>
+
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_default_name">Kapsayıcı</string>
+    <string name="preloader_initializing">Başlatılıyor</string>
+    <string name="preloader_launching">Başlatılıyor</string>
+    <string name="preloader_closing">%1$s kapatılıyor</string>
+    <string name="preloader_preparing_steam_environment">Steam ortamı hazırlanıyor</string>
+    <string name="preloader_starting_wine">Wine başlatılıyor</string>
+    <string name="preloader_starting_steam_launcher">Steam Launcher başlatılıyor</string>
+    <string name="preloader_loading_steam_client">Steam istemcisi yükleniyor</string>
+    <string name="preloader_connecting_to_steam">Steam\'e bağlanılıyor</string>
+    <string name="preloader_signing_in_to_steam">Steam\'de oturum açılıyor</string>
+    <string name="preloader_fetching_game_info">Oturum açıldı — oyun bilgisi alınıyor</string>
+    <string name="preloader_steam_ready">Steam hazır</string>
+    <string name="preloader_updating_game_info">Oyun bilgisi güncelleniyor</string>
+    <string name="preloader_verifying_install">Kurulum doğrulanıyor</string>
+    <string name="preloader_scanning_redists">Yeniden dağıtılabilir bileşenler taranıyor</string>
+    <string name="preloader_installing_redist_single">Yeniden dağıtılabilir bileşen yükleniyor</string>
+    <string name="preloader_installing_named_redist">%1$s yükleniyor</string>
+    <string name="preloader_installing_named_redist_progress">%1$s yükleniyor (%2$s)</string>
+    <string name="preloader_redists_ready">Yeniden dağıtılabilir bileşenler hazır</string>
+    <string name="preloader_no_redists">Yüklenecek yeniden dağıtılabilir bileşen yok</string>
+    <string name="preloader_steam_service_running">Steam hizmeti çalışıyor</string>
+    <string name="preloader_launching_game">%1$s başlatılıyor</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher başarısız oldu — varlıklar yeniden hazırlanıyor</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher başlatılamadı. Yeniden hazırlanıyor — lütfen yeniden başlatın</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher oyuna ulaştı ancak oyun hiç başlamadı</string>
+    <string name="preloader_setup_environment">Ortam kuruluyor</string>
+    <string name="preloader_retrying_steam_client_download">Steam istemcisi indirmesi yeniden deneniyor</string>
+    <string name="preloader_installing_mono">Wine Mono v%1$s yükleniyor</string>
+    <string name="preloader_installing_redist">Yeniden dağıtılabilir bileşenler yükleniyor</string>
+    <string name="preloader_unpacking_exe">Oyun yürütülebilir dosyası açılıyor</string>
+    <string name="preloader_downloading_cloud">Bulut kayıtları indiriliyor</string>
+    <string name="preloader_syncing_cloud">Bulut kayıtları eşitleniyor</string>
+    <string name="preloader_uploading_cloud">Bulut kayıtları yükleniyor</string>
+    <string name="preloader_checking_cloud">Bulut kayıtları kontrol ediliyor</string>
+    <string name="preloader_cloud_sync_retry">%1$s Yeniden deneme %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Bulut Eşitlemesi İndiriliyor</string>
+    <string name="cloud_sync_failed_provider">%1$s bulut kaydı eşitlemesi başarısız oldu.</string>
+    <string name="preloader_platform_steam">Steam</string>
+    <string name="preloader_platform_epic">Epic Games</string>
+    <string name="preloader_platform_gog">GOG</string>
+    <string name="preloader_platform_custom">Özel Oyun</string>
+
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Performansı dosyaya kaydet</string>
+    <string name="settings_hud_record_to_file_summary">Oyun sırasında saniye başına FPS, CPU, GPU, sıcaklık ve pil ölçümlerini /WinNative/logs/ konumuna dışa aktarır.</string>
+    <string name="settings_leaderboard_category">Performans</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Workshop öğeleri yükleniyor</string>
+    <string name="workshop_search_items">Workshop öğelerinde ara</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Abone olduğunuz öğeler Steam\'den alınıyor.</string>
+    <string name="workshop_error_title">Workshop öğeleri yüklenemedi</string>
+    <string name="workshop_error_subtitle">Bir şeyler ters gitti. Tekrar deneyin.</string>
+    <string name="workshop_empty_title">Abone olunmuş Workshop öğesi yok</string>
+    <string name="workshop_empty_subtitle">Steam Workshop\'ta öğelere abone olun, ardından bu pencereyi yeniden açın.</string>
+    <string name="workshop_search_empty_title">\"%1$s\" ile eşleşen öğe yok</string>
+    <string name="workshop_search_empty_subtitle">Farklı bir arama terimi deneyin.</string>
+    <string name="workshop_clear_search">Aramayı temizle</string>
+    <string name="workshop_item_fallback">Workshop öğesi</string>
+    <string name="common_ui_failed">Başarısız</string>
+    <string name="steam_presence_snooze">Ertele</string>
+    <string name="steam_presence_busy">Meşgul</string>
+    <string name="steam_presence_looking_to_trade">Takas Arıyor</string>
+    <string name="steam_presence_looking_to_play">Oynamak İstiyor</string>
+    <string name="steam_friends_count">Arkadaşlar — %1$d çevrimiçi</string>
+    <string name="steam_friends_section_in_game">Oyunda (%1$d)</string>
+    <string name="steam_friends_section_online">Çevrimiçi (%1$d)</string>
+    <string name="steam_friends_section_offline">Çevrimdışı (%1$d)</string>
+    <string name="steam_friends_none_loaded">Henüz arkadaş yüklenmedi.</string>
+    <string name="steam_friends_chat_off">Sohbet kapalı. Arkadaşlarınızı görmek için Sohbet Servisini yeniden açın.</string>
+    <string name="steam_friends_self_you">Sen</string>
+    <string name="steam_friends_in_game">Oyunda</string>
+    <string name="steam_friends_join">Katıl</string>
+    <string name="steam_friends_play">Oyna</string>
+    <string name="steam_chat_image_failed">(resim gönderilemedi)</string>
+    <string name="steam_chat_empty">Henüz mesaj yok. Merhaba deyin!</string>
+    <string name="steam_chat_uploading_image">Resim yükleniyor…</string>
+    <string name="steam_chat_send_image">Resim gönder</string>
+    <string name="steam_chat_message_hint">Mesaj…</string>
+    <string name="steam_chat_send">Gönder</string>
+    <string name="steam_chat_image">Resim</string>
+    <string name="steam_common_back">Geri</string>
+    <string name="steam_achievements_title">Başarımlar</string>
+    <string name="steam_achievements_empty">Bu oyun için başarım bulunamadı,\nveya yüklemek için Steam\'de oturum açın.</string>
+    <string name="steam_achievements_hidden">Gizli başarım</string>
+    <string name="steam_achievements_hidden_desc">Bu başarımı açığa çıkarmak için oynamaya devam edin.</string>
+    <string name="steam_achievements_unlocked_on">%1$s tarihinde açıldı</string>
+    <string name="steam_achievements_unlocked">Açıldı</string>
+    <string name="steam_join_joining">%2$s içinde %1$s oyununa katılınıyor…</string>
+    <string name="steam_join_install">%2$s oyununa katılmak için %1$s yükleyin</string>
+    <string name="steam_join_not_owned">%1$s size ait değil</string>
+    <string name="steam_chat_not_sent">(gönderilmedi)</string>
+    <string name="steam_join_the_game">oyun</string>
+    <string name="steam_friends_settings">Ayarlar</string>
+    <string name="steam_chat_settings_title">Sohbet Ayarları</string>
+    <string name="steam_chat_setting_service">Sohbet Servisi</string>
+    <string name="steam_chat_setting_service_desc">Arkadaşlarınızı görmek ve sohbet etmek için giriş yapın; çevrimdışı olmak için kapatın</string>
+    <string name="steam_chat_setting_notifications">Sohbet Bildirimleri</string>
+    <string name="steam_chat_setting_notifications_desc">Bir mesaj aldığınızda bildirim göster</string>
+    <string name="steam_chat_setting_heads">Sohbet Balonları</string>
+    <string name="steam_chat_setting_heads_desc">Mesajları okumak ve yanıtlamak için kayan balonlar</string>
+    <string name="steam_chat_setting_ingame">Oyunda Sohbeti Etkinleştir</string>
+    <string name="steam_chat_setting_ingame_desc">Oynarken mesaj alın ve gönderin</string>
+    <string name="steam_chat_setting_stay_running">Arka Planda Çalıştır</string>
+    <string name="steam_chat_setting_stay_running_desc">WinNative\'den çıktıktan sonra sohbeti çalışır durumda tut</string>
+    <string name="steam_chat_settings_overlay_needed">Sohbet balonlarını kullanmak için diğer uygulamaların üzerinde göstermeye izin verin</string>
+    <string name="steam_chat_heads_title">Mesajlar</string>
+    <string name="steam_chat_heads_recent_title">Son</string>
+    <string name="steam_chat_heads_online_title">Çevrimiçi</string>
+    <string name="steam_chat_heads_new_chat">Yeni mesaj</string>
+    <string name="steam_chat_setting_autohide">Otomatik Gizle</string>
+    <string name="steam_chat_setting_autohide_desc">10 sn hareketsizlikten sonra sohbet balonunu soldur</string>
+    <string name="steam_chat_heads_friends_title">Arkadaşlar</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Dosyalar</string>
+    <string name="file_manager_copy">Kopyala</string>
+    <string name="file_manager_cut">Kes</string>
+    <string name="file_manager_paste">Yapıştır</string>
+    <string name="file_manager_paste_here">Buraya yapıştır</string>
+    <string name="file_manager_new_folder">Yeni Klasör</string>
+    <string name="file_manager_new_folder_short">Klasör</string>
+    <string name="file_manager_multi_select">Seç</string>
+    <string name="file_manager_create">Oluştur</string>
+    <string name="file_manager_delete">Sil</string>
+    <string name="file_manager_copy_count">Kopyala (%1$d)</string>
+    <string name="file_manager_cut_count">Kes (%1$d)</string>
+    <string name="file_manager_delete_count">Sil (%1$d)</string>
+    <string name="file_manager_extract">Çıkar</string>
+    <string name="file_manager_extract_here">Buraya çıkar</string>
+    <string name="file_manager_extract_to">Şuraya çıkar…</string>
+    <string name="file_manager_extracting">%1$s çıkarılıyor</string>
+    <string name="file_manager_extract_failed">Çıkarma başarısız</string>
+    <string name="file_manager_run_boot">Çalıştır / Başlat</string>
+    <string name="file_manager_create_shortcut">Kısayol Oluştur</string>
+    <string name="file_manager_run_in_container">Kapsayıcıda çalıştır</string>
+    <string name="file_manager_no_containers">Kullanılabilir kapsayıcı yok</string>
+    <string name="file_manager_delete_confirm">\"%1$s\" silinsin mi? Bu geri alınamaz.</string>
+    <string name="file_manager_delete_confirm_multi">%1$d öğe silinsin mi? Bu geri alınamaz.</string>
+    <string name="file_manager_copying">%1$s kopyalanıyor</string>
+    <string name="file_manager_moving">%1$s taşınıyor</string>
+    <string name="file_manager_copying_count">%1$d öğe kopyalanıyor</string>
+    <string name="file_manager_moving_count">%1$d öğe taşınıyor</string>
+    <string name="file_manager_paste_into_itself">Bir klasör kendi içine yapıştırılamaz</string>
+    <string name="file_manager_operation_failed">İşlem başarısız oldu</string>
+    <string name="file_manager_delete_failed">Silme başarısız oldu</string>
+    <string name="file_manager_rename_failed">Yeniden adlandırma başarısız oldu</string>
+    <string name="file_manager_create_folder_failed">Klasör oluşturma başarısız oldu</string>
+
+    <string name="settings_content_refresh">Yenile</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Kaydı aktar</string>
+    <string name="retro_save_transfer_message">Bu oyuna yerel bir kayıt içe aktarın veya oyunun mevcut kaydını dışa aktarın.</string>
+    <string name="retro_save_transfer_import">Kaydı içe aktar</string>
+    <string name="retro_save_transfer_export">Kaydı dışa aktar</string>
+    <string name="retro_save_transfer_import_ok">Kayıt içe aktarıldı</string>
+    <string name="retro_save_transfer_import_failed">Kayıt içe aktarılamadı</string>
+    <string name="retro_save_transfer_export_ok">Kayıt dışa aktarıldı</string>
+    <string name="retro_save_transfer_export_failed">Kayıt dışa aktarılamadı</string>
+    <string name="retro_save_transfer_none">Bu oyun için henüz bir kayıt yok</string>
+    <string name="retro_cheats_title">Hileler</string>
+    <string name="retro_cheats_hardcore_blocked">Hileler Hardcore modunda devre dışı</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Kaydet</string>
+    <string name="retro_ps2_cancel">İptal</string>
+    <string name="retro_ps2_save_state">Durumu Kaydet</string>
+    <string name="retro_ps2_load_save_state">Durumu Yükle</string>
+    <string name="retro_ps2_achievements">Başarımlar</string>
+    <string name="retro_ps2_cheats">Hileler</string>
+    <string name="retro_ps2_memory_cards">Hafıza Kartları</string>
+    <string name="retro_ps2_fast_forward">İleri Sarma</string>
+    <string name="retro_ps2_reset">Sıfırla</string>
+    <string name="retro_ps2_swap_disc">Disk Değiştir</string>
+    <string name="retro_ps2_slot">Yuva %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Yüklemek için dokunun</string>
+    <string name="retro_ps2_slot_empty">Boş</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Üzerine yazmak için dokunun</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Boş — kaydetmek için dokunun</string>
+    <string name="retro_ps2_slot_is_empty">Yuva %1$d boş</string>
+    <string name="retro_ps2_loaded_slot">Yuva %1$d yüklendi</string>
+    <string name="retro_ps2_could_not_load_slot">Yuva %1$d yüklenemedi</string>
+    <string name="retro_ps2_saved_to_slot">Yuva %1$d\'e kaydedildi</string>
+    <string name="retro_ps2_save_failed">Kaydetme başarısız</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Yuva 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Yuva 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Kullanmak için dokunun</string>
+    <string name="retro_ps2_new_memory_card">Yeni Hafıza Kartı</string>
+    <string name="retro_ps2_import_card">Kart İçe Aktar</string>
+    <string name="retro_ps2_enable_online_dev9">Çevrimiçi Etkinleştir (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 ağ adaptörü — bağlamak için oyunu yeniden başlatır</string>
+    <string name="retro_ps2_ethernet_device">Ethernet Aygıtı</string>
+    <string name="retro_ps2_dns_mode">DNS Modu</string>
+    <string name="retro_ps2_primary_dns">Birincil DNS</string>
+    <string name="retro_ps2_secondary_dns">İkincil DNS</string>
+    <string name="retro_ps2_optional">isteğe bağlı</string>
+    <string name="retro_ps2_auto_ip_dhcp">Otomatik IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Sunucu: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">IP ayarlamak için dokunun (boş bırakınca kaldırılır)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Sunucu Ana Bilgisayarı Ekle</string>
+    <string name="retro_ps2_new_server_hostname">Yeni Sunucu Ana Bilgisayar Adı</string>
+    <string name="retro_ps2_server_hostname_hint">örn. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Ekran Kontrolleri</string>
+    <string name="retro_ps2_edit_layout">Düzeni Düzenle</string>
+    <string name="retro_ps2_reset_layout">Düzeni Sıfırla</string>
+    <string name="retro_ps2_layout_reset">Düzen sıfırlandı</string>
+    <string name="retro_ps2_left_stick_invert_x">Sol Çubuk: X Ters Çevir</string>
+    <string name="retro_ps2_left_stick_invert_y">Sol Çubuk: Y Ters Çevir</string>
+    <string name="retro_ps2_right_stick_invert_x">Sağ Çubuk: X Ters Çevir</string>
+    <string name="retro_ps2_right_stick_invert_y">Sağ Çubuk: Y Ters Çevir</string>
+    <string name="retro_ps2_button_color">Düğme Rengi</string>
+    <string name="retro_ps2_letter_color">Harf Rengi</string>
+    <string name="retro_ps2_shadow_color">Gölge Rengi</string>
+    <string name="retro_ps2_background_color">Arka Plan Rengi</string>
+    <string name="retro_ps2_reset_colors">Renkleri Sıfırla</string>
+    <string name="retro_ps2_renderer">İşleyici</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Çözünürlük Ölçeği</string>
+    <string name="retro_ps2_scale_1x_native">1x (Yerel)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">En Boy Oranı</string>
+    <string name="retro_ps2_aspect_stretch">Uzat</string>
+    <string name="retro_ps2_aspect_auto_standard">Otomatik (Standart)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Ekran Filtresi</string>
+    <string name="retro_ps2_filter_nearest">En Yakın</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinear (Yumuşak)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinear (Keskin)</string>
+    <string name="retro_ps2_texture_filter">Doku Filtresi</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinear (Zorunlu)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinear (Spritelar)</string>
+    <string name="retro_ps2_blending_accuracy">Karıştırma Doğruluğu</string>
+    <string name="retro_ps2_blend_minimum">En Az</string>
+    <string name="retro_ps2_blend_basic">Temel</string>
+    <string name="retro_ps2_blend_medium">Orta</string>
+    <string name="retro_ps2_blend_high">Yüksek</string>
+    <string name="retro_ps2_blend_full">Tam</string>
+    <string name="retro_ps2_blend_maximum">En Fazla</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV Gölgelendirici</string>
+    <string name="retro_ps2_shader_off">Kapalı</string>
+    <string name="retro_ps2_shader_scanline">Tarama Çizgisi</string>
+    <string name="retro_ps2_shader_diagonal">Çapraz</string>
+    <string name="retro_ps2_shader_triangular">Üçgen</string>
+    <string name="retro_ps2_shader_wave">Dalga</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Kare Atlama</string>
+    <string name="retro_ps2_frameskip_off">Kapalı</string>
+    <string name="retro_ps2_frameskip_1">1 Atla</string>
+    <string name="retro_ps2_frameskip_2">2 Atla</string>
+    <string name="retro_ps2_frameskip_3">3 Atla</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Ses</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Sessiz</string>
+    <string name="retro_ps2_swap_stereo_channels">Stereo Kanalları Değiştir</string>
+    <string name="retro_ps2_ee_cycle_rate">EE Döngü Oranı</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (Varsayılan)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE Döngü Atlama</string>
+    <string name="retro_ps2_skip_off">Kapalı</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Anında VU1</string>
+    <string name="retro_ps2_mtvu">Çok İş Parçacıklı VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Hızlı CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emülasyon Hızı</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU Kullanımı</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU Kullanımı</string>
+    <string name="retro_ps2_hud_internal_resolution">Dahili Çözünürlük</string>
+    <string name="retro_ps2_deinterlace_mode">Deinterlace Modu</string>
+    <string name="retro_ps2_deint_auto">Otomatik</string>
+    <string name="retro_ps2_deint_off">Kapalı</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV En-Boy Oranı</string>
+    <string name="retro_ps2_anti_blur">Bulanıklık Önleme</string>
+    <string name="retro_ps2_widescreen_patches">Geniş Ekran Yamaları</string>
+    <string name="retro_ps2_no_interlace_patches">Taramasız Yamalar</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC Döngü Algılama</string>
+    <string name="retro_ps2_wait_loop">Bekleme Döngüsü Algılama</string>
+    <string name="retro_ps2_time_stretch">Ses Zaman Esnetme</string>
+    <string name="retro_ps2_audio_buffer">Ses Arabelleği</string>
+    <string name="retro_ps2_audio_latency">Çıkış Gecikmesi</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Kare Süreleri</string>
+    <string name="retro_ps2_hud_gs_stats">GS İstatistikleri</string>
+    <string name="retro_ps2_hud_hw_info">Donanım Bilgisi</string>
+    <string name="retro_ps2_hud_version">Sürüm</string>
+    <string name="retro_ps2_hud_input_display">Giriş Göstergesi</string>
+    <string name="retro_ps2_tab_menu">Menü</string>
+    <string name="retro_ps2_tab_display">Ekran</string>
+    <string name="retro_ps2_tab_performance">Performans</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Ses</string>
+    <string name="retro_ps2_tab_online">Çevrimiçi</string>
+    <string name="retro_ps2_tab_controls">Kontroller</string>
+    <string name="retro_ps2_resume">Devam Et</string>
+    <string name="retro_ps2_pause">Duraklat</string>
+    <string name="retro_ps2_exit">Çıkış</string>
+    <string name="retro_lr_bios_imported">BIOS içe aktarıldı: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Geçersiz BIOS dosyası</string>
+    <string name="retro_lr_invalid_retro_game">Geçersiz retro oyun</string>
+    <string name="retro_lr_rom_not_found">ROM bulunamadı: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Bu arşivdeki ROM okunamadı</string>
+    <string name="retro_lr_core_not_installed">Çekirdek yüklü değil: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Hileler etkin — bu oturumda başarımlar devre dışı</string>
+    <string name="retro_lr_cloud_save_restored">Bulut kaydı geri yüklendi</string>
+    <string name="retro_lr_restore_failed">Geri yükleme başarısız</string>
+    <string name="retro_lr_cloud_conflict_message">%1$s için daha yeni bir bulut kaydı var. Eşitlemek ister misiniz ve hangi bulut kaydını tutmayı tercih edersiniz?</string>
+    <string name="retro_lr_cloud_save">Bulut kaydı</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Emülatör çekirdeği yüklenemedi</string>
+    <string name="retro_lr_failed_load_rom">ROM yüklenemedi</string>
+    <string name="retro_lr_graphics_not_supported">Bu çekirdek için grafik desteklenmiyor</string>
+    <string name="retro_lr_emulator_error">Emülatör hatası</string>
+    <string name="retro_lr_shader_default">Varsayılan</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Keskin</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR Ölçekleme</string>
+    <string name="retro_lr_upscale_native">Yerel</string>
+    <string name="retro_lr_sound">Ses</string>
+    <string name="retro_lr_left_stick_invert_x">Sol Çubuk: X Ters Çevir</string>
+    <string name="retro_lr_left_stick_invert_y">Sol Çubuk: Y Ters Çevir</string>
+    <string name="retro_lr_right_stick_invert_x">Sağ Çubuk: X Ters Çevir</string>
+    <string name="retro_lr_right_stick_invert_y">Sağ Çubuk: Y Ters Çevir</string>
+    <string name="retro_lr_on_screen_controls">Ekran Kontrolleri</string>
+    <string name="retro_lr_haptic_feedback">Dokunsal Geri Bildirim</string>
+    <string name="retro_lr_portrait">Dikey</string>
+    <string name="retro_lr_landscape">Yatay</string>
+    <string name="retro_lr_edit_layout">Düzeni Düzenle (%1$s)</string>
+    <string name="retro_lr_reset_layout">%1$s Düzenini Sıfırla</string>
+    <string name="retro_lr_layout_reset">%1$s düzeni sıfırlandı</string>
+    <string name="retro_lr_button_color">Düğme Rengi</string>
+    <string name="retro_lr_letter_color">Harf Rengi</string>
+    <string name="retro_lr_shadow_color">Gölge Rengi</string>
+    <string name="retro_lr_background_color">Arka Plan Rengi</string>
+    <string name="retro_lr_reset_colors">Renkleri Sıfırla</string>
+    <string name="retro_lr_colors_reset">Renkler sıfırlandı</string>
+    <string name="retro_lr_performance_hud">Performans HUD</string>
+    <string name="retro_lr_alpha">Alfa</string>
+    <string name="retro_lr_background_alpha">Arka Plan Alfası</string>
+    <string name="retro_lr_background">Arka Plan</string>
+    <string name="retro_lr_scale">Ölçek</string>
+    <string name="retro_lr_numeric_frametime">Sayısal Kare Süresi</string>
+    <string name="retro_lr_dual_series_battery">Çift Seri Pil</string>
+    <string name="retro_lr_hud_elements">HUD ÖĞELERİ</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Konsol</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Pil</string>
+    <string name="retro_lr_hud_temp">Sıcaklık</string>
+    <string name="retro_lr_hud_graph">Grafik</string>
+    <string name="retro_lr_hud_cpu_temp">CPU Sıcaklığı</string>
+    <string name="retro_lr_save_state">Durumu Kaydet</string>
+    <string name="retro_lr_load_save_state">Durumu Yükle</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Durum yükleme Hardcore modunda devre dışı</string>
+    <string name="retro_lr_achievements">Başarımlar</string>
+    <string name="retro_lr_cheats">Hileler</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Hileler Hardcore modunda devre dışı</string>
+    <string name="retro_lr_reset">Sıfırla</string>
+    <string name="retro_lr_fast_forward">İleri Sarma</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">İleri sarma Hardcore modunda devre dışı</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disk %1$d/%2$d</string>
+    <string name="retro_lr_resume">Devam Et</string>
+    <string name="retro_lr_pause">Duraklat</string>
+    <string name="retro_lr_exit">Çıkış</string>
+    <string name="retro_lr_saved_to_slot">Yuva %1$d\'e kaydedildi</string>
+    <string name="retro_lr_could_not_save_state">Durum kaydedilemedi</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS gerekli</string>
+    <string name="retro_lr_bios_required_message">PlayStation oyunları, sizin sağlamanız gereken gerçek bir konsol BIOS dosyasına ihtiyaç duyar. Devam etmek için bir BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin veya scph7001.bin) içe aktarın.</string>
+    <string name="retro_lr_import_bios">BIOS İçe Aktar…</string>
+    <string name="retro_lr_cancel">İptal</string>
+    <string name="retro_lr_slot_empty">Yuva %1$d boş</string>
+    <string name="retro_lr_loaded_slot">Yuva %1$d yüklendi</string>
+    <string name="retro_lr_could_not_load_state">Durum yüklenemedi</string>
+    <string name="retro_lr_slot_title">Yuva %1$d</string>
+    <string name="retro_lr_rename_slot">Yuva %1$d\'i Yeniden Adlandır</string>
+    <string name="retro_gs_section_general">Genel</string>
+    <string name="retro_gs_section_graphics">Grafik</string>
+    <string name="retro_gs_section_performance">Performans</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Giriş</string>
+    <string name="retro_gs_section_audio">Ses</string>
+    <string name="retro_gs_section_online">Çevrimiçi</string>
+    <string name="retro_gs_cancel">İptal</string>
+    <string name="retro_gs_save">Kaydet</string>
+    <string name="retro_gs_shader_default">Varsayılan</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Keskin</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Yerel</string>
+    <string name="retro_gs_group_game">OYUN</string>
+    <string name="retro_gs_label_name">Ad</string>
+    <string name="retro_gs_label_system">Sistem</string>
+    <string name="retro_gs_label_emulator_core">Emülatör Çekirdeği</string>
+    <string name="retro_gs_label_rom_path">ROM Yolu</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">Yüklü</string>
+    <string name="retro_gs_bios_none">Yok — %1$s oyunlarını çalıştırmak için gerekli</string>
+    <string name="retro_gs_import_bios">BIOS İçe Aktar…</string>
+    <string name="retro_gs_remove_bios">BIOS Kaldır</string>
+    <string name="retro_gs_group_library_artwork">KİTAPLIK GÖRSELİ</string>
+    <string name="retro_gs_artwork_game_card">Oyun Kartı Görseli</string>
+    <string name="retro_gs_artwork_grid">Izgara Görseli</string>
+    <string name="retro_gs_artwork_carousel">Atlıkarınca Görseli</string>
+    <string name="retro_gs_artwork_list">Liste Görseli</string>
+    <string name="retro_gs_artwork_custom_set">Özel görsel ayarlandı</string>
+    <string name="retro_gs_artwork_set_image">Görsel ayarla</string>
+    <string name="retro_gs_artwork_remove">Kaldır</string>
+    <string name="retro_gs_group_video">VİDEO</string>
+    <string name="retro_gs_video_filter">Video Filtresi</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR Ölçekleme</string>
+    <string name="retro_gs_performance_hud">Performans HUD</string>
+    <string name="retro_gs_group_core">ÇEKİRDEK</string>
+    <string name="retro_gs_renderer">İşleyici</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Çözünürlük Ölçeği</string>
+    <string name="retro_gs_scale_1x_native">1x (Yerel)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">En Boy Oranı</string>
+    <string name="retro_gs_aspect_stretch">Uzat</string>
+    <string name="retro_gs_aspect_auto_standard">Otomatik (Standart)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Ekran Filtresi</string>
+    <string name="retro_gs_filter_nearest">En Yakın</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinear (Yumuşak)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinear (Keskin)</string>
+    <string name="retro_gs_texture_filter">Doku Filtresi</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinear (Zorunlu)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinear (Spritelar)</string>
+    <string name="retro_gs_blending_accuracy">Karıştırma Doğruluğu</string>
+    <string name="retro_gs_blend_minimum">En Az</string>
+    <string name="retro_gs_blend_basic">Temel</string>
+    <string name="retro_gs_blend_medium">Orta</string>
+    <string name="retro_gs_blend_high">Yüksek</string>
+    <string name="retro_gs_blend_full">Tam</string>
+    <string name="retro_gs_blend_maximum">En Fazla</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV Gölgelendirici</string>
+    <string name="retro_gs_off">Kapalı</string>
+    <string name="retro_gs_tvshader_scanline">Tarama Çizgisi</string>
+    <string name="retro_gs_tvshader_diagonal">Çapraz</string>
+    <string name="retro_gs_tvshader_triangular">Üçgen</string>
+    <string name="retro_gs_tvshader_wave">Dalga</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Kare Atlama</string>
+    <string name="retro_gs_frameskip_1">1 Atla</string>
+    <string name="retro_gs_frameskip_2">2 Atla</string>
+    <string name="retro_gs_frameskip_3">3 Atla</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">PERFORMANS</string>
+    <string name="retro_gs_ee_cycle_rate">EE Döngü Oranı</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (Varsayılan)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE Döngü Atlama</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Anında VU1</string>
+    <string name="retro_gs_mtvu">Çok İş Parçacıklı VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Hızlı CDVD</string>
+    <string name="retro_gs_group_performance_hud">PERFORMANS HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emülasyon Hızı</string>
+    <string name="retro_gs_hud_cpu_usage">CPU Kullanımı</string>
+    <string name="retro_gs_hud_gpu_usage">GPU Kullanımı</string>
+    <string name="retro_gs_hud_internal_resolution">Dahili Çözünürlük</string>
+    <string name="retro_gs_deinterlace_mode">Deinterlace Modu</string>
+    <string name="retro_gs_deint_auto">Otomatik</string>
+    <string name="retro_gs_deint_off">Kapalı</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV En-Boy Oranı</string>
+    <string name="retro_gs_anti_blur">Bulanıklık Önleme</string>
+    <string name="retro_gs_widescreen_patches">Geniş Ekran Yamaları</string>
+    <string name="retro_gs_no_interlace_patches">Taramasız Yamalar</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC Döngü Algılama</string>
+    <string name="retro_gs_wait_loop">Bekleme Döngüsü Algılama</string>
+    <string name="retro_gs_time_stretch">Ses Zaman Esnetme</string>
+    <string name="retro_gs_audio_buffer">Ses Arabelleği</string>
+    <string name="retro_gs_audio_latency">Çıkış Gecikmesi</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Kare Süreleri</string>
+    <string name="retro_gs_hud_gs_stats">GS İstatistikleri</string>
+    <string name="retro_gs_hud_hw_info">Donanım Bilgisi</string>
+    <string name="retro_gs_hud_version">Sürüm</string>
+    <string name="retro_gs_hud_input_display">Giriş Göstergesi</string>
+    <string name="retro_gs_fast_boot">Hızlı Başlatma</string>
+    <string name="retro_gs_group_online_dev9">ÇEVRİMİÇİ (DEV9)</string>
+    <string name="retro_gs_enable_online">Çevrimiçi Etkinleştir</string>
+    <string name="retro_gs_ethernet_device">Ethernet Aygıtı</string>
+    <string name="retro_gs_net_auto">Otomatik</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS Modu</string>
+    <string name="retro_gs_dns_manual">Manuel</string>
+    <string name="retro_gs_dns_internal">Dahili</string>
+    <string name="retro_gs_primary_dns">Birincil DNS</string>
+    <string name="retro_gs_secondary_dns">İkincil DNS</string>
+    <string name="retro_gs_dns_optional">isteğe bağlı</string>
+    <string name="retro_gs_auto_ip_dhcp">Otomatik IP (DHCP)</string>
+    <string name="retro_gs_group_input">GİRİŞ</string>
+    <string name="retro_engine_save">Kaydet</string>
+    <string name="retro_engine_saved">Oyun kaydedildi</string>
+    <string name="retro_engine_loading">Yükleniyor…</string>
+    <string name="retro_engine_load">Yükle</string>
+    <string name="retro_engine_saved_to">%1$s konumuna kaydedildi</string>
+    <string name="retro_engine_slot_active_only">Etkin</string>
+    <string name="retro_engine_rename_slot">Kayıt yuvasını yeniden adlandır</string>
+    <string name="retro_engine_caught">%1$d yakalandı</string>
+    <string name="retro_engine_no_slots">Henüz kayıt yuvası yok</string>
+    <string name="retro_engine_new_slot">Yeni kayıt yuvası</string>
+    <string name="retro_engine_achievements_unavailable">3D modunda takip edilmez</string>
+    <string name="retro_engine_fullscreen">Tam ekran</string>
+    <string name="retro_engine_loaded_from">%1$s yüklendi</string>
+    <string name="retro_engine_slot_empty">Bu yuva boş</string>
+    <string name="retro_engine_loading_subtitle">Oyun verileri ilk kez hazırlanıyor</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Bu oyunu standart çekirdek yerine 3D voxel motorunda oynayın</string>
+    <string name="retro_gs_on_screen_controls">Ekran kontrolleri</string>
+    <string name="retro_gs_haptic_feedback">Dokunsal Geri Bildirim</string>
+    <string name="retro_gs_group_audio">SES</string>
+    <string name="retro_gs_volume">Ses</string>
+    <string name="retro_gs_mute">Sessiz</string>
+    <string name="retro_gs_swap_stereo">Stereo Kanalları Değiştir</string>
+    <string name="retro_gs_sound">Ses</string>
+    <string name="retro_scr_retro_defaults">RETRO VARSAYILANLARI</string>
+    <string name="retro_scr_retro_defaults_desc">Bir oyunun kendi ayarlarında geçersiz kılınmadıkça her konsolun oyunlarına uygulanan varsayılanlar.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Hesap</string>
+    <string name="retro_scr_signed_in">Giriş yapıldı</string>
+    <string name="retro_scr_not_signed_in_hint">Giriş yapılmadı — giriş yapmak için bir oyunun Başarımlarını açın</string>
+    <string name="retro_scr_achievements_enabled">Başarımlar etkin</string>
+    <string name="retro_scr_hardcore_default">Varsayılan olarak Hardcore modu (durum kaydı yok)</string>
+    <string name="retro_scr_sign_out">Çıkış Yap</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">Yüklü</string>
+    <string name="retro_scr_none_ps1_bios">Yok — PS1 oyunları BIOS gerektirir</string>
+    <string name="retro_scr_import_ps1_bios">PS1 BIOS İçe Aktar…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS kaldırıldı</string>
+    <string name="retro_scr_no_bios_to_remove">Kaldırılacak BIOS yok</string>
+    <string name="retro_scr_remove_ps1_bios">PS1 BIOS Kaldır</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">Yok — PS2 oyunları BIOS gerektirir</string>
+    <string name="retro_scr_format">Biçim</string>
+    <string name="retro_scr_ps2_bios_format">Birleştirilmiş tek dosyalık döküm (bölge etiketli .bin, ~4MB). Bölünmüş ROM0/MEC/NVM setleri kabul edilmez.</string>
+    <string name="retro_scr_import_ps2_bios">PS2 BIOS İçe Aktar…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS kaldırıldı</string>
+    <string name="retro_scr_remove_ps2_bios">PS2 BIOS Kaldır</string>
+    <string name="retro_scr_library_artwork">KİTAPLIK GÖRSELİ</string>
+    <string name="retro_scr_retro_case_art">Retro kutu görseli (kartuş / CD kutusu)</string>
+    <string name="retro_scr_box_art">Kutu görseli</string>
+    <string name="retro_scr_box_art_desc">İçe aktarımda thumbnails.libretro.com adresinden otomatik olarak alınır; özel bir görsel her zaman onu geçersiz kılar.</string>
+    <string name="retro_scr_roms_folder">ROM KLASÖRÜ</string>
+    <string name="retro_scr_folder">Klasör</string>
+    <string name="retro_scr_roms_not_set">Ayarlanmadı — oyunları otomatik içe aktarmak için bir klasör seçin</string>
+    <string name="retro_scr_auto_import">Otomatik içe aktar</string>
+    <string name="retro_scr_auto_import_desc">Bu klasördeki yeni oyunlar, doğru konsol algılanarak kitaplığınıza otomatik olarak eklenir.</string>
+    <string name="retro_scr_select_roms_folder_title">ROM Klasörü Seç</string>
+    <string name="retro_scr_select_roms_folder_button">ROM Klasörü Seç…</string>
+    <string name="retro_scr_change_roms_folder_button">ROM Klasörünü Değiştir…</string>
+    <string name="retro_scr_scan_now">Şimdi Tara</string>
+    <string name="retro_scr_console_defaults">KONSOL VARSAYILANLARI</string>
+    <string name="retro_scr_console_defaults_desc">Varsayılan ayarlarını yapmak için bir konsola dokunun.</string>
+    <string name="retro_scr_renderer">İşleyici</string>
+    <string name="retro_scr_upscale_resolution">Çözünürlüğü ölçekle</string>
+    <string name="retro_scr_aspect_ratio">En Boy Oranı</string>
+    <string name="retro_scr_aspect_stretch">Uzat</string>
+    <string name="retro_scr_aspect_auto_standard">Otomatik (Standart)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Ekran Filtresi</string>
+    <string name="retro_scr_filter_nearest">En Yakın</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinear (Yumuşak)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinear (Keskin)</string>
+    <string name="retro_scr_texture_filter">Doku Filtresi</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinear (Zorunlu)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinear (Spritelar)</string>
+    <string name="retro_scr_blending_accuracy">Karıştırma Doğruluğu</string>
+    <string name="retro_scr_blend_minimum">En Az</string>
+    <string name="retro_scr_blend_basic">Temel</string>
+    <string name="retro_scr_blend_medium">Orta</string>
+    <string name="retro_scr_blend_high">Yüksek</string>
+    <string name="retro_scr_blend_full">Tam</string>
+    <string name="retro_scr_blend_maximum">En Fazla</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV Gölgelendirici</string>
+    <string name="retro_scr_shader_off">Kapalı</string>
+    <string name="retro_scr_shader_scanline">Tarama Çizgisi</string>
+    <string name="retro_scr_shader_diagonal">Çapraz</string>
+    <string name="retro_scr_shader_triangular">Üçgen</string>
+    <string name="retro_scr_shader_wave">Dalga</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Kare Atlama</string>
+    <string name="retro_scr_skip_1">1 Atla</string>
+    <string name="retro_scr_skip_2">2 Atla</string>
+    <string name="retro_scr_skip_3">3 Atla</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">EE Döngü Oranı</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (Varsayılan)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE Döngü Atlama</string>
+    <string name="retro_scr_skip_off">Kapalı</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Anında VU1</string>
+    <string name="retro_scr_mtvu">Çok İş Parçacıklı VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Hızlı CDVD</string>
+    <string name="retro_scr_touch_controls">Ekran dokunmatik kontrolleri</string>
+    <string name="retro_scr_sound">Ses</string>
+    <string name="retro_scr_swap_stereo">Stereo Kanalları Değiştir</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: Emülasyon Hızı</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU Kullanımı</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU Kullanımı</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: Dahili Çözünürlük</string>
+    <string name="retro_scr_enable_online_dev9">Çevrimiçi Etkinleştir (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet Aygıtı</string>
+    <string name="retro_scr_net_auto">Otomatik</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS Modu</string>
+    <string name="retro_scr_dns_manual">Manuel</string>
+    <string name="retro_scr_dns_internal">Dahili</string>
+    <string name="retro_scr_primary_dns">Birincil DNS</string>
+    <string name="retro_scr_secondary_dns">İkincil DNS</string>
+    <string name="retro_scr_optional">isteğe bağlı</string>
+    <string name="retro_scr_auto_ip_dhcp">Otomatik IP (DHCP)</string>
+    <string name="retro_scr_shader">Gölgelendirici</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR ölçekleme</string>
+    <string name="retro_scr_performance_hud">Performans HUD</string>
+    <string name="retro_scr_credits_licenses">KATKIDA BULUNANLAR &amp; LİSANSLAR</string>
+    <string name="retro_scr_credits_desc">WinNative\'in bazı özellikleri bu açık kaynaklı projeler üzerine kuruludur. Her kaynağı görüntülemek için dokunun.</string>
+    <string name="retro_scr_tab_defaults">Varsayılanlar</string>
+    <string name="retro_scr_tab_credits">Katkıda Bulunanlar</string>
+    <string name="retro_scr_enable_hardcore_title">Hardcore modu etkinleştirilsin mi?</string>
+    <string name="retro_scr_enable_hardcore_body">Hardcore modu oyunu şimdi sıfırlar ve durum kaydı yükleme, ileri sarma ile hileleri devre dışı bırakır. Kaydedilmemiş tüm ilerleme kaybolur. Devam edilsin mi?</string>
+    <string name="retro_scr_cancel">İptal</string>
+    <string name="retro_scr_enable">Etkinleştir</string>
+    <string name="retro_scr_bios_imported">BIOS içe aktarıldı: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Geçersiz BIOS dosyası</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS içe aktarıldı: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Geçersiz PS2 BIOS dosyası</string>
+    <string name="retro_scr_no_game_serial">Hile aranacak oyun seri numarası yok.</string>
+    <string name="retro_scr_applied_cheats">%1$d hile uygulandı.</string>
+    <string name="retro_scr_couldnt_apply_cheats">Hileler uygulanamadı.</string>
+    <string name="retro_scr_cheats">Hileler</string>
+    <string name="retro_scr_apply">Uygula</string>
+    <string name="retro_scr_no_cheats_found">Bu oyun için hile bulunamadı.</string>
+    <string name="retro_scr_achievements">Başarımlar</string>
+    <string name="retro_scr_sign_in_ra">RetroAchievements\'e giriş yap</string>
+    <string name="retro_scr_username">Kullanıcı adı</string>
+    <string name="retro_scr_password">Parola</string>
+    <string name="retro_scr_login_failed">Giriş başarısız</string>
+    <string name="retro_scr_signing_in">Giriş yapılıyor…</string>
+    <string name="retro_scr_sign_in">Giriş Yap</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d puan</string>
+    <string name="retro_scr_no_achievements">Bu oyun için başarım yok.</string>
+    <string name="retro_scr_back">Geri</string>
+    <string name="retro_scr_enabled">Etkin</string>
+    <string name="retro_scr_disabled">Devre dışı</string>
+    <string name="retro_scr_rename">Yeniden Adlandır</string>
+    <string name="retro_scr_save">Kaydet</string>
+    <string name="retro_scr_cloud_save_conflict">Bulut Kaydı Çakışması</string>
+    <string name="retro_scr_keep_local_save">Yerel Kaydı Tut</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Menü</string>
+    <string name="retro_tab_display">Ekran</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Ses</string>
+    <string name="retro_tab_controls">Kontroller</string>
+    <string name="retro_scan_up_to_date">Kitaplık güncel</string>
+    <string name="retro_scan_roms">ROM: %1$s</string>
+    <string name="retro_scan_added">%1$d eklendi</string>
+    <string name="retro_scan_removed">%1$d kaldırıldı</string>
+    <string name="retro_scr_shader_default">Varsayılan</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Keskin</string>
+    <string name="retro_scr_upscale_native">Yerel</string>
+    <string name="retro_co_aspect_ratio">En Boy Oranı</string>
+    <string name="retro_co_ntsc_filter">NTSC Filtresi</string>
+    <string name="retro_co_colorization">Renklendirme</string>
+    <string name="retro_co_color_correction">Renk Düzeltme</string>
+    <string name="retro_co_remove_sprite_limit">Sprite Sınırını Kaldır</string>
+    <string name="retro_co_resolution">Çözünürlük</string>
+    <string name="retro_co_framebuffer_emulation">Kare Arabelleği Emülasyonu</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Geniş Ekran Hilesi</string>
+    <string name="retro_co_val_8_7_native">8:7 (Yerel)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Kapalı</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Kompozit</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Otomatik</string>
+    <string name="retro_co_val_gba_screen">GBA Ekranı</string>
+    <string name="retro_co_val_gbc_screen">GBC Ekranı</string>
+    <string name="retro_co_val_on">Açık</string>
+    <string name="retro_co_val_320x240_native">320x240 (Yerel)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 Ayarlı</string>
+    <string name="retro_co_val_native">Yerel</string>
+    <string name="retro_co_val_internal">Dahili</string>
+    <string name="retro_co_val_on_16_9">Açık (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Retro oyunlar için başarım kazanmak ve takip etmek için RetroAchievements hesabınızla giriş yapın.</string>
+    <string name="retro_ach_username">Kullanıcı adı</string>
+    <string name="retro_ach_password">Parola</string>
+    <string name="retro_ach_enter_credentials">Kullanıcı adınızı ve parolanızı girin</string>
+    <string name="retro_ach_login_failed">Giriş başarısız</string>
+    <string name="retro_ach_sign_in">Giriş Yap</string>
+    <string name="retro_ach_password_disclaimer">Parolanız yalnızca bir kez giriş belirteci almak için kullanılır ve bu belirteç aygıtta güvenli şekilde saklanır.</string>
+    <string name="retro_ach_achievements_enabled">Başarımlar etkin</string>
+    <string name="retro_ach_hardcore_mode">Hardcore modu (durum kaydı yok)</string>
+    <string name="retro_ach_points">%1$d / %2$d puan</string>
+    <string name="retro_ach_none_found">Bu oyun için başarım bulunamadı.</string>
+    <string name="retro_ach_sign_out">Çıkış Yap</string>
+    <string name="retro_che_brand">HİLELER</string>
+    <string name="retro_che_name">Ad</string>
+    <string name="retro_che_code">Kod</string>
+    <string name="retro_che_cancel">İptal</string>
+    <string name="retro_che_save">Kaydet</string>
+    <string name="retro_che_default_name">Hile %1$d</string>
+    <string name="retro_che_empty">Henüz hile yok. Bu oyun için bir hile kodu ekleyin.</string>
+    <string name="retro_che_add">Hile Ekle</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU Sürücüsü</string>
+    <string name="retro_gpu_driver_system">Sistem (Varsayılan)</string>
+    <string name="retro_gpu_driver_hint">Turnip sürücülerini Ayarlar \u2192 Sürücüler altından yükleyin. Aynı sürücüler hem PC hem de PS2 oyunları için çalışır.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Final Fantasy XI gibi HDD tabanlı oyunlar için sanal dahili sürücü. Oyunu yeniden başlatır.</string>
+    <string name="retro_ps2_hdd_desc">Final Fantasy XI gibi HDD tabanlı oyunlar için sanal dahili sürücü.</string>
+    <string name="retro_ps2_dns_auto_internal">Özel sunucu ana bilgisayarlarınızın etkili olması için DNS Modu Internal olarak ayarlandı.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">CPU Çekirdeği</string>
+<string name="retro_co_dual_core">Çift Çekirdek</string>
+<string name="retro_co_internal_cheats">Dahili Hileler</string>
+<string name="retro_co_internal_resolution">Dahili Çözünürlük</string>
+<string name="retro_co_renderer">İşleyici</string>
+<string name="retro_co_sensor_bar">Sensör Çubuğu Konumu</string>
+<string name="retro_co_skip_gc_bios">BIOS Girişini Atla</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Alt</string>
+<string name="retro_co_val_cached_interpreter">Önbelleğe Alınmış Yorumlayıcı</string>
+<string name="retro_co_val_hardware">Donanım</string>
+<string name="retro_co_val_interpreter">Yorumlayıcı</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Fare / Dokunma</string>
+<string name="retro_co_val_right_stick_absolute">Sağ Çubuk (Mutlak)</string>
+<string name="retro_co_val_right_stick_relative">Sağ Çubuk (Göreceli)</string>
+<string name="retro_co_val_software">Yazılım</string>
+<string name="retro_co_val_stretch">Uzat</string>
+<string name="retro_co_val_top">Üst</string>
+<string name="retro_co_vbi_skip">VBI Atlama (Otomatik Kare Atlama)</string>
+<string name="retro_co_widescreen">Geniş Ekran</string>
+<string name="retro_co_wiimote_pointer">Wiimote İşaretçisi</string>
+<string name="retro_gs_cheats_apply_note">Değişiklikler bu oyunu bir sonraki başlatışınızda uygulanır.</string>
+<string name="retro_gs_cheats_detect_hint">Disk seri numarasının algılanabilmesi için bu oyunu bir kez başlatın; ardından hileler ve yamalar burada görünecek.</string>
+<string name="retro_gs_dnas_entry_desc">DNAS kimlik doğrulama atlaması — çevrimiçi oynamak için gereklidir</string>
+<string name="retro_gs_dnas_group">Otomatik Uygulanan (Çevrimiçi)</string>
+<string name="retro_gs_group_cheats">Hileler &amp; Yamalar</string>
+<string name="retro_gs_hdd_image_size">Boyut: %1$s</string>
+<string name="retro_gs_hdd_import">HDD İmajını İçe Aktar</string>
+<string name="retro_gs_hdd_remove_short">Kaldır</string>
+<string name="retro_gs_netplay_enable">NetPlay\'i Etkinleştir</string>
+<string name="retro_gs_netplay_enable_subtitle">Varsayılan olarak kapalı. Etkinleştirin, ardından başlatmadan önce Sunucu veya Katıl seçin.\nOyundan çıktığınızda tekrar kapanır.</string>
+<string name="retro_gs_netplay_host">Sunucu adresi</string>
+<string name="retro_gs_netplay_host_hint">IP veya ana bilgisayar adı</string>
+<string name="retro_gs_netplay_host_mode">Sunucu oturumu</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Açık = bir oyuncu bekle. Kapalı = sunucu adresine katıl</string>
+<string name="retro_gs_netplay_not_ready">NetPlay, TCP üzerinden yerel çok oyunculu bağlantı noktalarını kullanır (oyuncu 1 sunucu / oyuncu 2 istemci). PS2 çevrimiçi oyun bunun yerine DEV9 Ethernet kullanır.</string>
+<string name="retro_gs_netplay_port">Bağlantı Noktası</string>
+<string name="retro_lr_memory_card_slot">Hafıza Kartı %1$d</string>
+<string name="retro_lr_screenshot">Ekran Görüntüsü</string>
+<string name="retro_lr_use_cloud_save">Bulut Kaydını Kullan</string>
+<string name="retro_netplay_conn_direct">LAN (doğrudan IP)</string>
+<string name="retro_netplay_connecting">Bağlanıyor…</string>
+<string name="retro_netplay_connection">Bağlantı</string>
+<string name="retro_netplay_conn_traversal">Çevrimiçi (sunucu kodu)</string>
+<string name="retro_netplay_dismiss">Kapat</string>
+<string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay, Dolphin\'in kendi motorunu kullanır. Sunucu = Oyuncu 1, Katıl = Oyuncu 2. Başlatmadan önce Sunucu veya Katıl ile bir bağlantı türü seçin; her iki cihaz da aynı oyunu birlikte başlatır.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Cihazınızın Wi‑Fi IP adresini ve bu bağlantı noktasını Oyuncu 2 ile paylaşın. Bağlandıklarında oyun otomatik olarak başlar.</string>
+<string name="retro_netplay_dolphin_host_online_hint">Oyun başlatıldığında bir sunucu kodu gösterilir — bunu Oyuncu 2 ile paylaşın. Bağlandıklarında oyun otomatik olarak başlar.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Sunucunun Wi‑Fi IP adresini ve bağlantı noktasını girin, ardından bağlanmak için başlatın.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Oyuncu 1\'den gelen sunucu kodunu girin, ardından bağlanmak için başlatın.</string>
+<string name="retro_netplay_enable_before_launch">Oyun ayarlarında NetPlay\'i etkinleştirin ve başlatmadan önce Sunucu veya Katıl seçin</string>
+<string name="retro_netplay_find_rooms">Wi‑Fi üzerinde oda bul</string>
+<string name="retro_netplay_game_link_hint">Game Link · her ekran kendi el konsolu</string>
+<string name="retro_netplay_gba_not_ready">GBA çok oyunculu oyun gpSP + Kablosuz Adaptör kullanır. libgpsp\'nin yüklü olduğundan emin olun.</string>
+<string name="retro_netplay_help">Wi‑Fi üzerinden paylaşımlı ekran çok oyunculu (RetroArch gibi).\nSunucu = Oyuncu 1, Katıl = Oyuncu 2. Her iki cihaz da aynı oyunu gösterir.</string>
+<string name="retro_netplay_help_game_link">Wi‑Fi üzerinden Game Link — her cihaz kendi oyununu çalıştırır.\nGB/GBC: Gambatte seri bağlantı (Pokémon 1–2. Nesil).\nGBA: gpSP Kablosuz Adaptör (Pokémon FR/LG/Emerald savaşları).</string>
+<string name="retro_netplay_host_action">Oda oluştur</string>
+<string name="retro_netplay_host_code">Sunucu kodu</string>
+<string name="retro_netplay_host_code_hint">Sunucudan gelen geçiş sunucu kodu</string>
+<string name="retro_netplay_hosting_room">Oda barındırılıyor</string>
+<string name="retro_netplay_host_mode_hint">Bu oyun oturumu için bir oda açmak üzere Sunucu\'ya dokunun, ardından oyunu başlatın. Oyundan çıktığınızda NetPlay kapanır.</string>
+<string name="retro_netplay_in_room">Odada</string>
+<string name="retro_netplay_join_action">IP ile katıl</string>
+<string name="retro_netplay_joined">Katıldı</string>
+<string name="retro_netplay_join_room">Katıl</string>
+<string name="retro_netplay_launch_mode">Başlatıldığında</string>
+<string name="retro_netplay_leave">Ayrıl</string>
+<string name="retro_netplay_menu_hint">Sunucu = O1 · Katıl = O2 · her iki ekranda aynı oyun</string>
+<string name="retro_netplay_mode_host">Sunucu</string>
+<string name="retro_netplay_mode_join">Katıl</string>
+<string name="retro_netplay_mode_manual">Manuel</string>
+<string name="retro_netplay_no_rooms">Oda bulunamadı. Sunucunun aynı Wi‑Fi ağında olduğundan ve bir oda barındırdığından emin olun.</string>
+<string name="retro_netplay_player_name">Görünen ad</string>
+<string name="retro_netplay_player_name_hint">Diğer oyunculara gösterilir</string>
+<string name="retro_netplay_players_count">%1$d bağlı</string>
+<string name="retro_netplay_prelaunch_hint">Oda yalnızca bu oturum için açık. Hazır olduğunuzda başlatın. Oyundan çıkmak NetPlay\'i kapatır.</string>
+<string name="retro_netplay_room_players">Oyuncular</string>
+<string name="retro_netplay_scan_action">Wi‑Fi Tara</string>
+<string name="retro_netplay_scan_again">Tekrar tara</string>
+<string name="retro_netplay_scan_hint">Açık odalar için aynı Wi‑Fi ağını tarayın veya IP adresiyle katılın.</string>
+<string name="retro_netplay_scanning">Wi‑Fi taranıyor…</string>
+<string name="retro_netplay_scan_results">Tarama sonuçları</string>
+<string name="retro_netplay_select_room_hint">Şimdi katılmak için bir odaya dokunun (IP\'yi bir sonraki başlatma için kaydetmez).</string>
+<string name="retro_netplay_stop_scan">Taramayı durdur</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s bağlandı</string>
+<string name="retro_netplay_user_disconnected">%1$s bağlantısı kesildi</string>
+<string name="retro_netplay_waiting_players">Oyuncular bekleniyor…</string>
+<string name="retro_ps2_coming_soon">PlayStation 2 desteği yakında geliyor</string>
+<string name="retro_ps2_show_l3r3">L3 / R3 Düğmelerini Göster</string>
+<string name="retro_ps2_show_l3r3_subtitle">Kapalıyken, L3 / R3\'e tıklamak için bir çubuğa çift dokunun</string>
+<string name="retro_ps2_turnip_flags">TURNIP SÜRÜCÜ BAYRAKLARI</string>
+<string name="retro_ps2_turnip_flags_note">Yalnızca yukarıda özel bir GPU sürücüsü seçildiğinde uygulanır.</string>
+<string name="retro_rom_missing">Oyun dosyası bulunamadı</string>
+<string name="retro_scr_delete">Sil</string>
+<string name="retro_scr_import_from_file">Dosyadan içe aktar…</string>
+<string name="retro_scr_loading">Yükleniyor…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Konsolu değiştir</string>
+    <string name="retro_gs_identify_as">Konsol olarak tanımla</string>
+    <string name="retro_gs_console_changed">Artık %1$s olarak tanımlandı</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Yerleşik vkBasalt katmanı aracılığıyla DXVK/VKD3D (Vulkan) oyunlarına bir ReShade efekti (.fx) uygulayın. Her efekti Android/data/&lt;package&gt;/files/ReShade/ altında kendi klasörüne yerleştirin. Canlı parametre ayarı ve oyun içi anahtar, canlı yeniden yükleme katmanı güncellemesiyle gelecek.</string>
+    <string name="reshade_catalog_title">ReShade efektleri</string>
+    <string name="reshade_catalog_search">Efekt ara…</string>
+    <string name="reshade_catalog_installed">Yüklü (%1$d)</string>
+    <string name="reshade_catalog_available">Kullanılabilir (%1$d)</string>
+    <string name="reshade_catalog_downloading">İndiriliyor</string>
+    <string name="reshade_catalog_installing">Yükleniyor</string>
+    <string name="reshade_catalog_offline_cache">Çevrimdışı — önbelleğe alınmış bir liste gösteriliyor. Yeni efektler indirmek için bağlanın.</string>
+    <string name="reshade_catalog_offline_none">Çevrimdışı — yalnızca yüklü efektler gösteriliyor. Kataloğa göz atmak için bağlanın.</string>
+    <string name="reshade_catalog_needs_connection">Efekt indirmek için internete bağlanın.</string>
+    <string name="reshade_catalog_download_failed">%1$s indirilemedi.</string>
+    <string name="reshade_catalog_empty_query">\"%1$s\" ile eşleşen efekt yok.</string>
+    <string name="reshade_catalog_empty">Kullanılabilir efekt yok. Kataloğa göz atmak için internete bağlanın.</string>
+    <string name="reshade_catalog_done">Bitti</string>
+    <string name="reshade_catalog_delete_cd">%1$s sil</string>
+    <string name="reshade_catalog_delete_title">%1$s silinsin mi?</string>
+    <string name="reshade_catalog_delete_body">Bu, efekti depolamadan ve onu kullanan tüm setlerden kaldırır. Daha sonra tekrar indirebilirsiniz.</string>
+    <string name="reshade_catalog_delete_confirm">Sil</string>
+    <string name="reshade_catalog_delete_cancel">İptal</string>
+    <string name="reshade_catalog_delete_failed">%1$s silinemedi.</string>
+    <string name="reshade_params_title">EFEKT PARAMETRELERİ</string>
+    <string name="reshade_params_reset">Sıfırla</string>
+    <string name="reshade_loadout_empty">Henüz efekt yok. Bir set oluşturmak için bir veya daha fazla efekt ekleyin.</string>
+    <string name="reshade_loadout_add">Efekt ekle</string>
+    <string name="reshade_loadout_full">Set dolu — başka bir efekt eklemek için birini kaldırın.</string>
+    <string name="reshade_effect_active">etkin</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Yığın</string>
+    <string name="reshade_mode_solo_hint">Aynı anda tek efekt etkin (A/B karşılaştırması, oyun içinde canlı geçiş yapın).</string>
+    <string name="reshade_mode_stack_hint">Herhangi bir efekt alt kümesini katmanlayın, sırayla uygulanır.</string>
+    <string name="reshade_drawer_enable">ReShade\'i etkinleştir</string>
+    <string name="reshade_drawer_empty">Bu sette ReShade efekti yok. Burada değiştirmek ve ayarlamak için bu oyunun (veya kapsayıcının) ayarlarına efekt ekleyin.</string>
+    <string name="reshade_drawer_no_params">Bu efektin ayarlanabilir parametresi yok.</string>
+    <string name="cloud_saves_deleting">Kayıt siliniyor…</string>
+    <string name="cloud_saves_history_delete">Sil</string>
+    <string name="cloud_saves_history_delete_confirm_body">%1$s üzerindeki bulut kaydı kalıcı olarak silinsin mi? Bu işlem geri alınamaz.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Bulut Kaydını Sil</string>
+    <string name="cloud_saves_history_delete_failed">Bulut kaydı silinemedi</string>
+    <string name="cloud_saves_history_delete_success">Bulut kaydı silindi</string>
+    <string name="retro_bundle_required">Önce konsol çekirdeklerini indirin — Ayarlar › Retro</string>
+    <string name="retro_ps2_device_unsupported">Bu cihaz PS2 emülasyonunu çalıştıramıyor — OpenGL ES 3.1 veya üstü gerekiyor.</string>
+    <string name="retro_scr_consoles_check">Güncellemeleri denetle</string>
+    <string name="retro_scr_consoles_checking">Güncellemeler denetleniyor…</string>
+    <string name="retro_scr_consoles_download">Konsol çekirdeklerini indir</string>
+    <string name="retro_scr_consoles_downloading">İndiriliyor… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">Konsol Çekirdekleri</string>
+    <string name="retro_scr_consoles_installed">Yüklü — sürüm %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Yüklü — sürüm %1$s (güncelleme denetimi başarısız)</string>
+    <string name="retro_scr_consoles_installing">Yükleniyor…</string>
+    <string name="retro_scr_consoles_missing">Yüklü değil — retro oyunları oynamak için indirin</string>
+    <string name="retro_scr_consoles_state">Durum</string>
+    <string name="retro_scr_consoles_update">Konsol çekirdeklerini güncelle</string>
+    <string name="retro_scr_consoles_update_available">Güncelleme mevcut — sürüm %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_verifying">İndirme doğrulanıyor…</string>
+    <string name="retro_scr_consoles_working">Çalışıyor…</string>
+    <string name="retro_tab_system">Sistem</string>
+</resources>
diff --git a/app/src/main/res/values-uk/arrays.xml b/app/src/main/res/values-uk/arrays.xml
new file mode 100644
index 000000000..3f58f032e
--- /dev/null
+++ b/app/src/main/res/values-uk/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>Зображення</item>
+        <item>Оригінал</item>
+        <item>Суцільний колір</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 1b141d0c8..1cd58dd2c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">Будь ласка, виберіть дійсний файл .exe</string>
     <string name="common_ui_select_valid_icon_file">Будь ласка, виберіть дійсний файл .ico або .png.</string>
     <string name="common_ui_exit">Вийти</string>
+    <string name="common_ui_exit_app">Вийти із застосунку</string>
     <string name="common_ui_profile">Профіль</string>
     <string name="common_ui_name">Назва</string>
     <string name="common_ui_ok">OK</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">Іконка</string>
     <string name="common_ui_duplicate">Дублювати</string>
     <string name="common_ui_credits_and_third_party_apps">Подяки та сторонні додатки</string>
-    <string name="common_ui_loading">Завантаження…</string>
+    <string name="common_ui_loading">Завантаження</string>
+    <string name="common_ui_exporting">Експорт</string>
     <string name="common_ui_enable">Увімкнути</string>
     <string name="common_ui_disable">Вимкнути</string>
     <string name="common_ui_force">Примусово</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">Висота</string>
     <string name="common_ui_open_file">Відкрити файл</string>
     <string name="common_ui_download_file">Завантажити файл</string>
-    <string name="common_ui_downloading_file">Завантаження файлу...</string>
+    <string name="common_ui_downloading_file">Завантаження файлу</string>
     <string name="common_ui_browse">Огляд</string>
     <string name="common_ui_options">Параметри</string>
     <string name="common_ui_export">Експортувати</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">Налаштування</string>
     <string name="common_ui_enable_all">Увімкнути все</string>
     <string name="common_ui_disable_all">Вимкнути все</string>
+    <string name="common_ui_select_all">Вибрати все</string>
+    <string name="common_ui_deselect_all">Скасувати вибір усього</string>
     <string name="common_ui_on">Увімк.</string>
     <string name="common_ui_off">Вимк.</string>
     <string name="common_ui_already_set">Вже встановлено</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">Встановити</string>
     <string name="common_ui_application">Застосунок</string>
     <string name="common_ui_check">Перевірити</string>
+    <string name="store_game_check_for_update">Перевірити оновлення</string>
+    <string name="store_game_checking_for_update">Перевірка</string>
+    <string name="store_game_download_update">Завантажити оновлення</string>
+    <string name="store_game_no_update_available">Немає доступних оновлень</string>
+    <string name="store_game_update_available">Доступне оновлення</string>
+    <string name="store_game_update_check_failed">Не вдалося перевірити оновлення</string>
+    <string name="store_game_update">Оновити</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Перевірити файли</string>
+    <string name="store_game_verify_started">Перевірка %1$s — дивіться вкладку Завантаження</string>
+    <string name="store_game_steam_options">Параметри Steam</string>
+    <string name="store_game_verify_complete">Перевірку файлів завершено</string>
+    <string name="store_game_verify_failed_notice">Не вдалося перевірити файли</string>
+    <string name="store_game_progress_background_hint">Це можна закрити — процес продовжить роботу. Перевіряйте вкладку Завантаження будь-коли.</string>
+    <string name="store_game_checking_updates">Перевірка оновлень</string>
+    <string name="store_game_no_updates_notice">Оновлень немає</string>
+    <string name="store_game_update_complete">Оновлення завершено</string>
+    <string name="store_game_update_failed_notice">Не вдалося оновити</string>
+    <string name="store_game_update_check_failed_notice">Не вдалося перевірити оновлення</string>
+    <string name="store_game_download_already_active">Ця гра вже завантажується. Скасуйте поточне завантаження, перш ніж додавати DLC.</string>
     <string name="common_ui_select">Вибрати</string>
     <string name="common_ui_select_folder">Вибрати теку</string>
     <string name="common_ui_current_folder">Поточна тека</string>
+    <string name="common_ui_enter_path">Введіть шлях</string>
+    <string name="common_ui_path_not_found">Шлях не знайдено</string>
     <string name="common_ui_storage_roots">Сховища</string>
     <string name="common_ui_browse_local_folders_directly">Переглядати локальні теки безпосередньо</string>
     <string name="common_ui_no_folders_available_here">Тут немає доступних тек</string>
     <string name="common_ui_grant_all_files_access_browse">Надайте повний доступ до файлів, щоб безпосередньо переглядати локальні теки.</string>
     <string name="common_ui_not_configured">Не налаштовано</string>
     <string name="common_ui_reinstall">Перевстановити</string>
-    <string name="common_ui_exit_app_confirm">Вийти з WinNative?</string>
     <string name="common_ui_elements_count">%1$d елементів</string>
     <string name="common_ui_disabled_placeholder">-- Вимкнено --</string>
     <string name="common_ui_enabled">Увімкнено</string>
@@ -138,9 +163,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Завантажити зображення</string>
+    <string name="library_games_scraping_artwork">Завантаження</string>
     <string name="library_games_shortcut_created">Ярлик створено</string>
     <string name="library_games_failed_to_create_shortcut">Не вдалося створити ярлик: %s</string>
     <string name="library_games_install_path">Шлях встановлення</string>
+    <string name="library_games_not_enough_space">Потрібно ще %1$s місця</string>
     <string name="library_games_download_slash_install">Завантажити / Встановити</string>
     <string name="library_games_save_management">КЕРУВАННЯ ЗБЕРЕЖЕННЯМИ</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Доступно: %3$s</string>
@@ -163,11 +191,21 @@
     <string name="library_games_no_games_hub">Ігор не встановлено\nНатисніть, щоб відкрити Winlator Backend</string>
     <string name="library_games_installed_badge">ВСТАНОВЛЕНО</string>
     <string name="library_games_unknown_game">Невідома гра</string>
-    <string name="library_games_layouts_header">МАКЕТИ</string>
+    <string name="library_games_layouts_header">МАКЕТИ БІБЛІОТЕКИ</string>
     <string name="library_games_layout_carousel">Карусель</string>
     <string name="library_games_layout_list">Список</string>
+    <string name="library_games_view_options_header">ПАРАМЕТРИ ВИГЛЯДУ</string>
+    <string name="library_games_immersive_mode">Режим занурення</string>
+    <string name="library_games_immersive_mode_description">Використовувати зображення вибраної гри як фон</string>
+    <string name="library_games_immersive_blur">Розмити фон</string>
+    <string name="library_games_immersive_blur_description">Застосувати ефект розмиття до фону режиму занурення</string>
     <string name="library_games_custom_game">Користувацька гра</string>
     <string name="library_games_play">Грати</string>
+    <string name="hero_boot_to_desktop_title">Завантажити робочий стіл</string>
+    <string name="hero_graphics_tests_title">Графічні тести</string>
+    <string name="hero_graphics_test_32">32-біт</string>
+    <string name="hero_graphics_test_64">64-біт</string>
+    <string name="hero_input_tests_title">Тести введення</string>
     <string name="library_games_add_custom_game">Додати користувацьку гру</string>
     <string name="library_games_game_name">Назва гри</string>
     <string name="library_games_game_folder_mapped_drive">Папка гри (зіставлений ігровий диск)</string>
@@ -225,16 +263,21 @@
     <string name="downloads_queue_phase_cancelled">Скасовано</string>
     <string name="downloads_queue_phase_failed">Помилка: %1$s</string>
     <string name="downloads_queue_cancel_download">Скасувати завантаження</string>
+    <string name="downloads_queue_cancel_download_title">Скасувати завантаження?</string>
+    <string name="downloads_queue_cancel_download_warning">Скасування завантаження DLC, гри або оновлення може пошкодити встановлену гру.\n\nВи впевнені, що хочете скасувати?</string>
     <string name="downloads_queue_empty">Немає активних завантажень.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">Новий контейнер</string>
     <string name="containers_list_edit">Редагувати контейнер</string>
-    <string name="containers_list_creating">Створення контейнера…</string>
-    <string name="containers_list_removing">Видалення контейнера…</string>
-    <string name="containers_list_duplicating">Дублювання контейнера…</string>
+    <string name="containers_list_creating">Створення контейнера</string>
+    <string name="containers_list_removing">Видалення контейнера</string>
+    <string name="containers_list_duplicating">Дублювання контейнера</string>
+    <string name="containers_list_remove_title">Видалити контейнер</string>
+    <string name="containers_list_duplicate_title">Дублювати контейнер</string>
     <string name="containers_list_confirm_remove">Ви хочете видалити цей контейнер?</string>
     <string name="containers_list_confirm_duplicate">Ви хочете дублювати цей контейнер?</string>
+    <string name="containers_list_duplicate_failed">Не вдалося дублювати контейнер</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Ви хочете видалити цей ярлик?</string>
@@ -249,6 +292,10 @@
     <string name="shortcuts_list_clone_failed">Не вдалося клонувати ярлик.</string>
     <string name="shortcuts_list_exported_to">Ярлик експортовано до %1$s</string>
     <string name="shortcuts_list_failed_export">Не вдалося експортувати ярлик</string>
+    <string name="shortcuts_export_all">Експортувати все</string>
+    <string name="shortcuts_export_to_frontend">Експортувати до фронтенду</string>
+    <string name="shortcuts_export_all_done">Експортовано %1$d ігор до %2$s</string>
+    <string name="shortcuts_export_all_none">Немає ігор для експорту</string>
     <string name="shortcuts_list_added">Ярлик успішно додано.</string>
     <string name="shortcuts_list_failed_add">Не вдалося додати ярлик.</string>
 
@@ -258,17 +305,6 @@
     <string name="shortcuts_properties_disable_xinput">Вимкнути XInput (для ексклюзивного керування миша/клавіатура)</string>
     <string name="shortcuts_properties_exclusive_input">Ексклюзивне введення</string>
     <string name="shortcuts_properties_custom_game_settings">Користувацькі налаштування гри</string>
-    <string name="shortcuts_properties_use_cold_client">Використовувати ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient — це рекомендований спосіб обробки емуляції Steam та DRM. Він патчить DRM під час виконання без зміни файлів гри.</string>
-    <string name="shortcuts_properties_unpack_files">Застарілий DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">Видаляє SteamStub DRM з exe на диску. Вмикайте лише якщо гра не запускається без цього. Патчер часу виконання ColdClient обробляє більшість ігор автоматично.</string>
-    <string name="shortcuts_properties_force_dlc">Примусово увімкнути DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Увімкніть лише якщо DLC не виявлено або збереження з DLC не працюють</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Запустити клієнт Steam (бета)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Запускає справжній клієнт Steam у Wine\nПотрібен обліковий запис Steam, може знизити продуктивність\nПрацює не з усіма іграми</string>
-    <string name="shortcuts_properties_steam_type">Продуктивність клієнта Steam</string>
-    <string name="steam_section_emulator">Емулятор Steam (Goldberg)</string>
-    <string name="steam_section_real_client">Справжній клієнт Steam</string>
     <string name="shortcuts_properties_use_steam_input">Використовувати Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Офлайн-режим Steam</string>
     <string name="shortcuts_properties_reset">Скинути властивості</string>
@@ -297,6 +333,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">Ви хочете дублювати цей профіль?</string>
     <string name="input_controls_editor_title">Редактор керування</string>
     <string name="input_controls_editor_toggle_switch">Перемикач</string>
+    <string name="input_controls_editor_swipeable">Активація свайпом</string>
     <string name="input_controls_editor_profile_exported_to">Профіль експортовано до</string>
     <string name="input_controls_editor_unable_to_import">Неможливо імпортувати профіль</string>
     <string name="input_controls_editor_import_profile">Імпортувати профіль</string>
@@ -395,6 +432,10 @@
     <string name="container_box64_compatibility">Сумісність</string>
     <string name="container_box64_intermediate">Проміжний</string>
     <string name="container_box64_performance">Продуктивність</string>
+    <string name="container_fexcore_performance_tso">Продуктивність TSO</string>
+    <string name="container_fexcore_extreme">Екстремальний</string>
+    <string name="container_fexcore_extreme_tso">Екстремальний TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Обробка прапорців для операцій CALL/RET&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Вважає, що CALL/RET ніколи не потребують прапорців (швидше, нестабільно)&lt;br /&gt;
@@ -479,9 +520,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">Пресет FEXCore</string>
     <string name="container_fexcore_version">Версія FEXCore</string>
+    <string name="use_unix_libs">Використовувати UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Графічний драйвер</string>
+    <string name="container_zink_mode">Режим Zink</string>
+    <string name="container_graphics_transcoder">Транскодер BCn</string>
+    <string name="container_graphics_quality">Якість BCn</string>
     <string name="container_graphics_configuration">Конфігурація графічного драйвера</string>
     <string name="container_graphics_version">Версія графічного драйвера</string>
     <string name="container_graphics_available_extensions">Доступні розширення</string>
@@ -495,6 +540,8 @@
     <string name="container_graphics_bcn_emulation">Емуляція BCn</string>
     <string name="container_graphics_bcn_emulation_type">Тип емуляції BCn</string>
     <string name="container_graphics_bcn_emulation_cache">Кеш емуляції BCn</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Суперроздільність для ігор 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Різкість країв</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Ви хочете дублювати цей пресет?</string>
     <string name="container_presets_confirm_remove">Ви хочете видалити цей пресет?</string>
@@ -514,7 +561,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Використовувати розширення DRI3</string>
     <string name="session_xserver_simulate_touch_screen">Імітувати сенсорний екран</string>
     <string name="session_xserver_preferences_button_text">   НАЛАШТУВАННЯ   </string>
     <string name="session_xserver_extra_keys_config_desc">Тут ви можете встановити значення змінної extra-keys, як у додатку Termux (читайте <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">тут</a>) та інше \n
@@ -530,12 +576,6 @@
     <string name="session_xserver_pref_kbd">Клавіатура</string>
     <string name="session_xserver_pref_other">Інше</string>
     <string name="session_xserver_pref_version">Версія</string>
-    <string name="session_xserver_use_dri3_description">Вимкнення може виправити графічні артефакти на деяких пристроях</string>
-    <string name="session_xserver_native_rendering">Нативний рендеринг</string>
-    <string name="session_xserver_native_rendering_enabled">Апаратний рендеринг DRI3</string>
-    <string name="session_xserver_native_rendering_disabled">Програмний WSI-резерв</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Нативний рендеринг увімкнено (набуде чинності при наступному запуску)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Нативний рендеринг вимкнено (набуде чинності при наступному запуску)</string>
     <string name="session_xserver_notification_description">Повідомлення WinNative XServer</string>
     <string name="session_xserver_notification_content">WinNative працює, не закривайте та не змахуйте це сповіщення</string>
 
@@ -555,6 +595,8 @@
     <string name="session_drawer_exit_subtitle">Закрити поточну сесію</string>
     <string name="session_drawer_touchscreen_overlay">Сенсорне накладання</string>
     <string name="session_drawer_resume">Продовжити</string>
+    <string name="session_drawer_retry">Повторити</string>
+    <string name="downloads_no_internet">Немає підключення до інтернету</string>
     <string name="session_drawer_pause">Пауза</string>
     <string name="session_drawer_wine_processes_paused">Процеси Wine призупинені</string>
     <string name="session_drawer_pause_all_wine_processes">Призупинити всі процеси Wine</string>
@@ -565,6 +607,33 @@
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">Бат.</string>
     <string name="session_drawer_hud_element_graph">Графік</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">HUD у стилі Mango</string>
+    <string name="session_drawer_hud_mango_settings">Налаштування Mango HUD</string>
+    <string name="mango_hud_element_gpu_load">Навантаження GPU</string>
+    <string name="mango_hud_element_gpu_temp">Темп. GPU</string>
+    <string name="mango_hud_element_cpu_load">Навантаження CPU</string>
+    <string name="mango_hud_element_cpu_temp">Темп. CPU</string>
+    <string name="mango_hud_element_ram">ОЗП</string>
+    <string name="mango_hud_element_battery">Батарея</string>
+    <string name="mango_hud_element_lows" formatted="false">1% мінімуми</string>
+    <string name="mango_hud_element_graph">Графік фреймтайму</string>
+    <string name="mango_hud_element_engine">Рушій</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">Частота CPU</string>
+    <string name="mango_hud_element_gpu_clock">Частота GPU</string>
+    <string name="mango_hud_element_cores">По ядрах</string>
+    <string name="mango_hud_element_network">Мережа</string>
+    <string name="mango_hud_element_swap">Підкачка</string>
+    <string name="mango_hud_element_resolution">Роздільність</string>
+    <string name="mango_hud_element_wine">Версія Wine</string>
+    <string name="mango_hud_element_duration">Час сесії</string>
+    <string name="mango_hud_element_clock">Годинник</string>
+    <string name="mango_hud_element_throttle">Тротлінг</string>
+    <string name="mango_hud_group_memory">Пам\'ять</string>
+    <string name="mango_hud_group_system">Система</string>
+    <string name="mango_hud_lock">Заблокувати HUD</string>
+    <string name="mango_hud_lock_subtitle">Дотики проходять до елементів керування за HUD. Утримуйте HUD, щоб заблокувати. (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">Ви хочете завершити цей процес?</string>
@@ -597,6 +666,7 @@
     <string name="session_display_frame_rate">Частота кадрів</string>
     <string name="session_display_title">Дисплей</string>
     <string name="session_display_fullscreen_stretched">Увімкнути повноекранний режим (розтягнутий)</string>
+    <string name="session_display_direct_composition">Пряма композиція (без копіювання)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Рендерер:</string>
     <string name="session_display_gpu_label">GPU:</string>
@@ -670,6 +740,9 @@
     <string name="session_gamepad_error_loading_profile">Помилка завантаження профілю</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">Сенсорне керування</string>
+    <string name="input_controls_auto_hide_on_controller_title">Автоприховування з контролером</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Приховувати сенсорне керування, коли під\'єднано контролер</string>
     <string name="session_gyroscope_title">Гіроскоп</string>
     <string name="session_gyroscope_calibrate">Калібрувати гіроскоп</string>
     <string name="session_gyroscope_enable_right_stick">Увімкнути гіроскопічний рух правого стіка</string>
@@ -706,6 +779,7 @@
     <string name="settings_general_select_wallpaper">Вибрати шпалери</string>
     <string name="settings_general_title">Загальні</string>
     <string name="settings_general_enable_file_provider">Увімкнути файловий провайдер</string>
+    <string name="settings_general_enable_auto_scraping">Увімкнути автоматичне завантаження зображень</string>
     <string name="settings_general_take_effect_next_startup">Ця опція набуде чинності при наступному запуску.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Перевстановити Imagefs</string>
@@ -719,7 +793,7 @@
     <string name="settings_general_share_android_clipboard">Спільний буфер обміну Android з Wine</string>
     <string name="settings_general_paths_title">Налаштування шляхів</string>
     <string name="settings_general_paths_summary">Керувати місцем зберігання робочих даних Winlator та шляхом експорту ярликів.</string>
-    <string name="settings_general_winlator_path_title">Шлях Winlator</string>
+    <string name="settings_general_winlator_path_title">Шлях сховища</string>
     <string name="settings_general_shortcut_export_path_title">Шлях експорту ярликів</string>
     <string name="settings_general_choose_path">Вибрати шлях</string>
     <string name="settings_general_xserver_cursor_summary">Налаштуйте швидкість вказівника для сенсорного, трекпада та миші у сесії XServer.</string>
@@ -727,7 +801,9 @@
     <string name="settings_general_cursor_lock_summary">Підтримує пряме захоплення миші для ігор, що потребують необробленого введення вказівника. Вимкніть кнопкою гучності вниз.</string>
     <string name="settings_general_xinput_toggle_title">Вимкнути XInput</string>
     <string name="settings_general_xinput_toggle_summary">Вимикає обробку XInput, коли потрібне ексклюзивне керування мишею та клавіатурою.</string>
-    <string name="settings_general_file_provider_summary">Надати доступ до файлів Winlator для засобів вибору документів та файлових менеджерів Android.</string>
+    <string name="settings_external_display_output_summary">Переносить гру на під\'єднаний зовнішній дисплей замість дублювання цього екрана. Окуляри завжди використовують власний дисплей.</string>
+    <string name="settings_general_file_provider_summary">Надати доступ до файлів WinNative для засобів вибору документів та файлових менеджерів Android.</string>
+    <string name="settings_general_auto_scraping_summary">Цей параметр дозволяє WinNative автоматично завантажувати зображення користувацьких ігор.</string>
     <string name="settings_general_open_browser_summary">Відкривати підтримувані веб-посилання у браузері Android замість Wine.</string>
     <string name="settings_general_clipboard_summary">Дозволити копіювання та вставку між Android та сесіями Wine.</string>
     <string name="settings_general_imagefs_summary">Відновити системні файли з пакета без видалення існуючих контейнерів.</string>
@@ -742,7 +818,7 @@
     <string name="settings_audio_sound_font_installed_failed">Не вдалося встановити SoundFont!</string>
     <string name="settings_audio_sound_font_already_exist">SoundFont, який ви хочете встановити, вже існує.</string>
     <string name="settings_audio_unable_to_install_soundfont">Неможливо встановити SoundFont</string>
-    <string name="settings_audio_installing_soundfont">Встановлення SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Встановлення SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Невірний формат SoundFont.</string>
     <string name="settings_audio_cannot_remove_default">Неможливо видалити типовий SoundFont</string>
     <string name="settings_audio_summary">Встановити, видалити та вибрати SoundFont для відтворення MIDI.</string>
@@ -756,15 +832,33 @@
     <string name="settings_debug_box_logs_subtitle">Записувати вивід налагодження Box86 та Box64 у файл</string>
     <string name="settings_debug_fex_logs_title">Увімкнути журнали FEXCore</string>
     <string name="settings_debug_fex_logs_subtitle">Записувати вивід налагодження FEXCore у файл</string>
+    <string name="settings_debug_emulator_logs_title">Журнали емуляції Box64/FEX</string>
+    <string name="settings_debug_emulator_logs_subtitle">Записує у файл емулятор, який використовує ваш контейнер.</string>
     <string name="settings_debug_steam_logs_title">Увімкнути журнали Steam</string>
     <string name="settings_debug_steam_logs_subtitle">Журналювати події автентифікації та сесій Steam для налагодження.</string>
     <string name="settings_debug_wine_channels_title">Канали налагодження Wine</string>
     <string name="settings_debug_wine_channels_summary">Виберіть, які канали Wine включати при увімкненому журналюванні Wine.</string>
+    <string name="settings_debug_wine_classes_title">Рівні журналу Wine</string>
+    <string name="settings_debug_wine_classes_summary">Виберіть, які типи повідомлень записувати. Trace дуже докладний.</string>
     <string name="settings_debug_input_logs">Журнали введення</string>
     <string name="settings_debug_input_logs_description">Журналювати події геймпада, дотиків та клавіатури</string>
     <string name="settings_debug_download_logs">Журнали завантажень</string>
     <string name="settings_debug_download_logs_description">Журналювати події засобу розв\'язування завантажень та резервного механізму WinNative</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Рівні перевірки Vulkan</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Перезапустіть дисплей, щоб застосувати.</string>
     <string name="settings_debug_share_logs">Поділитися журналами</string>
+    <string name="settings_debug_delete_logs">Видалити журнали</string>
+    <string name="settings_debug_share_all_logs_short">Поділитися всіма</string>
+    <string name="settings_debug_download_all_logs_short">Завантажити все</string>
+    <string name="settings_debug_logs_saved">Збережено в %1$s</string>
+    <string name="settings_debug_delete_logs_short">Видалити</string>
+    <string name="settings_debug_delete_all_logs_short">Видалити всі</string>
+    <string name="settings_debug_open_logs_folder_short">Відкрити менеджер журналів</string>
+    <string name="settings_debug_logs_deleted">Журнали видалено</string>
+    <string name="settings_debug_delete_logs_confirm_title">Видалити журнали?</string>
+    <string name="settings_debug_delete_logs_confirm_message">Це назавжди видалить усі збережені файли журналів (%1$s). Дію не можна скасувати.</string>
+    <string name="settings_debug_logs_browser_title">Журнали</string>
+    <string name="settings_debug_log_truncated">Показано останні %1$s цього журналу</string>
     <string name="settings_debug_logs_subject">Журнали WinNative (%1$s)</string>
     <string name="settings_debug_no_logs_available">Немає доступних журналів налагодження. Спочатку увімкніть параметри налагодження та запустіть гру.</string>
     <string name="settings_debug_capture_failed">Не вдалося захопити журнали: %1$s</string>
@@ -779,6 +873,8 @@
 
     <string name="settings_other_language_title">Мова</string>
     <string name="settings_other_language_summary">Виберіть мову інтерфейсу</string>
+    <string name="settings_other_game_language_title">Мова гри</string>
+    <string name="settings_other_game_language_summary">Бажана мова для завантажень Steam/Epic/GOG</string>
     <string name="settings_other_language_system_default">За замовчуванням системи</string>
 
     <string name="settings_other_section_integration">Інтеграція</string>
@@ -796,7 +892,7 @@
     <string name="settings_content_empty_subtitle">Встановіть пакет або змініть тип, щоб почати.</string>
     <string name="settings_content_container_created">Створено контейнер: %1$s</string>
     <string name="settings_content_download_failed">Помилка завантаження.</string>
-    <string name="common_ui_working">Зачекайте…</string>
+    <string name="common_ui_working">Зачекайте</string>
     <string name="settings_content_desc_wine">Створено проєктом Wine; транслює виклики Win32 у нативні служби Linux/Android.</string>
     <string name="settings_content_desc_proton">Створено Valve; runtime на основі Wine з патчами для Windows-ігор.</string>
     <string name="settings_content_desc_dxvk">Транслює графічні виклики Direct3D 9, 10 та 11 у Vulkan.</string>
@@ -804,6 +900,7 @@
     <string name="settings_content_desc_box64">Транслює Linux-код x86_64 для запуску на пристроях ARM64.</string>
     <string name="settings_content_desc_wowbox64">Збірка Box64, яку WoW64 використовує для запуску 32-бітних Windows-застосунків у 64-бітному Wine.</string>
     <string name="settings_content_desc_fexcore">Транслює код x86 і x86_64 для запуску на пристроях ARM64.</string>
+    <string name="settings_content_desc_d7vk">Транслює графічні виклики DirectDraw (Direct3D 7 та раніших версій) у Vulkan.</string>
     <string name="settings_content_unable_to_install">Неможливо встановити контент.</string>
     <string name="settings_content_install_failed">Помилка встановлення</string>
     <string name="settings_content_file_cannot_be_recognized">Файл не розпізнано.</string>
@@ -815,9 +912,14 @@
     <string name="settings_content_downloading_title">Завантаження контенту</string>
     <string name="settings_content_installing_title">Встановлення контенту</string>
     <string name="settings_content_extracting_title">Розпакування контенту</string>
-    <string name="settings_content_extracting_detail">Розпакування… (%1$d файлів)</string>
-    <string name="settings_content_preparing_package">Підготовка пакета…</string>
+    <string name="settings_content_extracting_detail">Розпакування (%1$d файлів)</string>
+    <string name="settings_content_preparing_package">Підготовка пакета</string>
     <string name="settings_content_download_complete">Завантаження завершено</string>
+    <string name="settings_content_already_installed_title">Компонент уже встановлено</string>
+    <string name="settings_content_already_installed_message">Цей компонент уже встановлено. Видаліть встановлену копію, перш ніж завантажувати його знову.
+
+Встановлений шлях:
+%1$s</string>
     <string name="settings_content_conflicting_title">Встановлено конфліктуючий контент</string>
     <string name="settings_content_conflicting_message">Будь ласка, видаліть конфліктуючий контент перед завантаженням цього пакета.
 
@@ -826,7 +928,7 @@
     <string name="settings_content_cannot_be_trusted">Контент не можна довіряти.</string>
     <string name="settings_content_is_incomplete">Контент неповний.</string>
     <string name="settings_content_untrusted_files_warning">Попередження: додатковий контент містить ненадійні файли. Зазвичай наступні файли не повинні змінюватися. Вирішіть, чи продовжувати встановлення.</string>
-    <string name="settings_content_confirm_remove">Ви хочете видалити цей контент?</string>
+    <string name="settings_content_confirm_remove">Це видалить компонент з вашого пристрою.</string>
     <string name="settings_content_unable_to_remove_in_use">Неможливо видалити цей контент, тому що контейнер наразі використовує цю версію Wine.</string>
     <string name="settings_content_download_in_components">Нічого не завантажено. Будь ласка, завантажте в розділі Компоненти.</string>
     <string name="settings_content_types_header">ТИПИ КОНТЕНТУ</string>
@@ -838,9 +940,12 @@
     <string name="settings_drivers_install">Встановити драйвери</string>
     <string name="settings_drivers_installed_success">Драйвер успішно встановлено.</string>
     <string name="settings_drivers_install_failed">Не вдалося встановити драйвер.</string>
-    <string name="settings_drivers_confirm_remove">Ви хочете видалити цей драйвер?</string>
+    <string name="settings_drivers_remove_title">Видалити драйвер?</string>
+    <string name="settings_drivers_confirm_remove">Це видалить драйвер з вашого пристрою.</string>
+    <string name="settings_drivers_remove_repo_title">Видалити репозиторій?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s буде видалено зі списку репозиторіїв.</string>
     <string name="settings_drivers_repo_tap_to_load">Натисніть для завантаження релізів</string>
-    <string name="settings_drivers_repo_loading_releases">Завантаження релізів…</string>
+    <string name="settings_drivers_repo_loading_releases">Завантаження релізів</string>
     <string name="settings_drivers_repo_release_count">%1$d релізів завантажено</string>
     <string name="settings_drivers_repo_no_release_assets">Серед отриманих релізів не знайдено ZIP-файлів для завантаження.</string>
     <string name="settings_drivers_repo_fetch_failed">Не вдалося завантажити релізи GitHub.</string>
@@ -850,7 +955,7 @@
     <string name="settings_drivers_manager">Менеджер драйверів</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Встановлення системних файлів…</string>
+    <string name="setup_wizard_installing_system_files">Встановлення системних файлів</string>
     <string name="setup_wizard_unable_to_install_system_files">Неможливо встановити системні файли</string>
     <string name="setup_wizard_system_image_not_installed">Системний образ не встановлено. Будь ласка, спочатку встановіть компоненти.</string>
     <string name="setup_wizard_recommended_components">Рекомендовані компоненти</string>
@@ -919,6 +1024,9 @@
     <string name="google_cloud_sync_started">Хмарну синхронізацію розпочато.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Сервіси Google</string>
+    <string name="google_auto_signin_title">Вхід у Google під час запуску</string>
+    <string name="google_auto_signin_summary">Автоматично підключатися до Google Play Ігри під час запуску додатка, щоб резервні копії збережень і синхронізація завжди були готові. Коли вимкнено, додаток ніколи не входить самостійно.</string>
+    <string name="google_auto_signin_section">Під час запуску</string>
     <string name="google_cloud_play_games">Google Play Ігри</string>
     <string name="google_cloud_status_syncing">Синхронізація</string>
     <string name="google_cloud_status_connected">Підключено</string>
@@ -977,22 +1085,30 @@
     <string name="saves_import_export_exported_failed">Не вдалося експортувати збереження: %1$s</string>
     <string name="saves_import_export_imported">Збереження успішно імпортовано</string>
     <string name="saves_import_export_imported_failed">Не вдалося імпортувати збереження: %1$s</string>
+    <string name="saves_export_path_summary">Збереження буде експортовано до /WinNative/saves</string>
+    <string name="saves_export_success_path">Експортовано до %1$s</string>
+    <string name="saves_export_warning_title">Використовуйте це лише з користувацькими іграми</string>
+    <string name="saves_export_warning_body">Експорт може містити збереження з ігор, встановлених із магазинів, або ігор із хмарною синхронізацією.</string>
+    <string name="saves_import_warning_title">Це перезапише наявні збереження в цьому контейнері</string>
+    <string name="saves_import_warning_body">Під час відновлення старішої резервної копії з кількома іграми спочатку скопіюйте новіші збереження в zip-файл за допомогою файлового менеджера. Будуть змінені лише збереження, наявні у .zip-файлі. Керуйте збереженнями розважливо.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Контейнер</string>
-    <string name="preloader_initializing">Ініціалізація…</string>
-    <string name="preloader_launching">Запуск…</string>
-    <string name="preloader_closing">Закриття %1$s…</string>
-    <string name="preloader_setup_environment">Налаштування середовища…</string>
-    <string name="preloader_installing_mono">Встановлення Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Встановлення поширюваних компонентів…</string>
-    <string name="preloader_unpacking_exe">Розпакування виконуваного файлу гри…</string>
-    <string name="preloader_downloading_cloud">Завантаження хмарних збережень…</string>
-    <string name="preloader_syncing_cloud">Синхронізація хмарних збережень…</string>
-    <string name="preloader_cloud_downloading">Завантаження Cloud Sync…</string>
-    <string name="preloader_cloud_backup">Резервне копіювання на Google Диск…</string>
+    <string name="preloader_initializing">Ініціалізація</string>
+    <string name="preloader_launching">Запуск</string>
+    <string name="preloader_closing">Закриття %1$s</string>
+    <string name="preloader_setup_environment">Налаштування середовища</string>
+    <string name="preloader_retrying_steam_client_download">Повторне завантаження клієнта Steam</string>
+    <string name="preloader_installing_mono">Встановлення Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Встановлення поширюваних компонентів</string>
+    <string name="preloader_unpacking_exe">Розпакування виконуваного файлу гри</string>
+    <string name="preloader_downloading_cloud">Завантаження хмарних збережень</string>
+    <string name="preloader_syncing_cloud">Синхронізація хмарних збережень</string>
+    <string name="preloader_uploading_cloud">Вивантаження хмарних збережень</string>
+    <string name="preloader_checking_cloud">Перевірка хмарних збережень</string>
+    <string name="preloader_cloud_sync_retry">%1$s Повтор %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Завантаження Cloud Sync</string>
     <string name="cloud_sync_failed_provider">Хмарна синхронізація %1$s не вдалася.</string>
-    <string name="google_cloud_backup_failed">Резервне копіювання на Google Диск не вдалося.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -1000,15 +1116,11 @@
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">Графіка</string>
-    <string name="container_backups_title">Резервні копії</string>
-    <string name="container_backups_prompt">Виберіть дію для цієї резервної копії контейнера.</string>
-    <string name="container_backups_backing_up">Створення резервної копії контейнера…</string>
-    <string name="container_backups_restoring">Відновлення контейнера…</string>
-    <string name="container_backups_checking">Перевірка резервних копій контейнера…</string>
-    <string name="container_backups_select_title">Виберіть резервну копію для відновлення</string>
-    <string name="container_backups_no_files">У Google Drive не знайдено резервних копій контейнера.</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">Первинне призначення</string>
     <string name="binding_secondary">Вторинне призначення</string>
+    <string name="binding_third">Третинне призначення</string>
+    <string name="binding_fourth">Четвертинне призначення</string>
     <string name="input_controls_editor_tap_to_switch">Торкніться, щоб перемкнути</string>
     <string name="input_controls_editor_download_profile">Завантажити профіль</string>
     <string name="container_config_emulator_section">Емулятор</string>
@@ -1016,6 +1128,7 @@
     <string name="session_drawer_fps_monitor">Монітор FPS</string>
     <string name="session_drawer_fps_monitor_subtitle">Показувати статистику продуктивності в реальному часі</string>
     <string name="session_drawer_dual_series_battery">Батарея Dual Series</string>
+    <string name="session_drawer_hud_frametime_numeric">Показувати час кадру як число</string>
     <string name="session_drawer_command_center">Центр керування</string>
     <string name="session_drawer_command_center_input">Ввід</string>
     <string name="session_drawer_command_center_display">Дисплей</string>
@@ -1028,7 +1141,6 @@
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Природний</string>
     <string name="session_drawer_color_profile_crt">Ефект CRT</string>
-    <string name="session_drawer_upscaler_dls">Яскравий</string>
     <string name="session_drawer_calibrate_advanced">Розширене калібрування</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Гіро</string>
@@ -1040,7 +1152,6 @@
     <string name="session_drawer_rail_label_mouse">Миша</string>
     <string name="session_drawer_rail_label_fullscreen">Повний екран</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Натив.</string>
     <string name="session_drawer_rail_label_magnifier">Лупа</string>
     <string name="session_drawer_rail_label_task_manager">Задачі</string>
     <string name="session_drawer_rail_label_logs">Логи</string>
@@ -1054,24 +1165,23 @@
     <string name="session_drawer_logs_share_chooser">Поділитися логами сеансу</string>
     <string name="session_drawer_logs_share_failed">Не вдалося поділитися логами</string>
     <string name="session_drawer_logs_share_empty">Немає рядків логу для надсилання</string>
-    <string name="session_drawer_super_resolution">Фільтри Чіткості</string>
-    <string name="session_drawer_upscaler_mode">Фільтр</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">Суперроздільність</string>
+    <string name="session_drawer_upscaler_mode">Апскейлер</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">Яскравий</string>
+    <string name="session_drawer_vivid_strength">Інтенсивність яскравості</string>
     <string name="session_drawer_main_menu_title">Меню</string>
     <string name="session_gyroscope_activator">Активатор</string>
     <string name="settings_general_check_for_updates">Перевірити оновлення</string>
     <string name="settings_general_check_for_updates_summary">Автоматично перевіряти нові версії застосунку під час запуску та періодично.</string>
     <string name="setup_wizard_containers">Налаштування контейнера</string>
-    <string name="google_cloud_auto_backup">Автоматичне резервне копіювання Cloud Sync</string>
-    <string name="google_cloud_auto_backup_summary">Автоматично створювати резервні копії збережень гри в Google Drive щоразу після виходу з гри.</string>
     <string name="cloud_saves_title">Хмарні збереження</string>
-    <string name="cloud_saves_backup">Створити резервну копію хмарного збереження</string>
-    <string name="cloud_saves_restore">Відновити хмарне збереження</string>
+    <string name="cloud_saves_title_for_provider">Хмарні збереження %1$s - %2$s</string>
     <string name="cloud_sync_title">Хмарна синхронізація</string>
     <string name="cloud_sync_enabled_summary">Завантажувати хмарні збереження під час запуску та синхронізувати/резервувати їх під час виходу.</string>
     <string name="cloud_sync_disabled_summary">Запустити цю гру без завантаження хмарних збережень і синхронізації при виході.</string>
-    <string name="cloud_saves_backing_up">Створення резервної копії хмарного збереження…</string>
-    <string name="cloud_saves_restoring">Відновлення хмарного збереження…</string>
+    <string name="cloud_saves_backing_up">Створення резервної копії хмарного збереження</string>
+    <string name="cloud_saves_restoring">Відновлення хмарного збереження</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1079,6 +1189,7 @@
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Керує кешуванням згенерованих блоків dynarec між запусками для пришвидшення запуску.</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1092,4 +1203,1282 @@
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">Попередніх збережень ще немає. Замінені збереження та ручні резервні копії з\'являтимуться тут протягом 30 днів.</string>
+    <string name="cloud_saves_history_loading">Завантаження історії збережень\u2026</string>
+    <string name="cloud_saves_history_origin_auto">авто</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">хмара</string>
+    <string name="cloud_saves_history_origin_local">локально</string>
+    <string name="cloud_saves_history_origin_manual">вручну</string>
+    <string name="cloud_saves_history_refresh">Оновити</string>
+    <string name="cloud_saves_history_rename">Перейменувати</string>
+    <string name="cloud_saves_history_rename_clear">Очистити</string>
+    <string name="cloud_saves_history_rename_failed">Не вдалося перейменувати резервну копію.</string>
+    <string name="cloud_saves_history_rename_hint">напр. Бій з босом, Перед фіналом</string>
+    <string name="cloud_saves_history_rename_save">Зберегти</string>
+    <string name="cloud_saves_history_rename_success">Резервну копію перейменовано.</string>
+    <string name="cloud_saves_history_rename_title">Назвіть цю резервну копію</string>
+    <string name="cloud_saves_history_restore">Відновити</string>
+    <string name="cloud_saves_history_restore_confirm_body">Це замінить ваше поточне локальне збереження резервною копією від %1$s.</string>
+    <string name="cloud_saves_history_restore_confirm_title">Відновити цю резервну копію?</string>
+    <string name="cloud_saves_history_restore_failed">Не вдалося відновити цю резервну копію.</string>
+    <string name="cloud_saves_history_restore_success">Збереження відновлено з резервної копії.</string>
+    <string name="cloud_saves_history_sign_in">Увійдіть у Google, щоб переглянути історію збережень.</string>
+    <string name="cloud_saves_history_title">Історія збережень</string>
+    <string name="cloud_saves_history_download">Завантажити</string>
+    <string name="cloud_saves_history_download_success">Файл завантажено.</string>
+    <string name="cloud_saves_history_download_failed">Не вдалося завантажити.</string>
+    <string name="cloud_saves_keep_replaced_backup">Зберігати резервну копію замінених збережень</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">Якщо передумаєте, можна відновити їх з Історії збережень.</string>
+    <string name="cloud_saves_no_backups">Для цієї гри ще немає резервних копій.</string>
+    <string name="cloud_saves_offline_mode">Вимкнути хмарну синхронізацію</string>
+    <string name="cloud_saves_offline_mode_summary">Вимикає будь-яку автоматичну хмарну активність для цієї гри.</string>
+    <string name="cloud_saves_sync_from_provider">Синхронізувати з %1$s Cloud</string>
+    <string name="cloud_saves_sync_from_provider_failed">Не вдалося завантажити збереження від %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Керувати хмарними збереженнями GOG</string>
+    <string name="cloud_saves_gog_manage_helper">Відкриває офіційний сайт GOG</string>
+    <string name="cloud_saves_gog_manage_no_browser">Немає доступного браузера, щоб відкрити сторінку хмарних збережень GOG</string>
+    <string name="cloud_saves_gog_zip_label">Завантажити ZIP хмарних збережень GOG</string>
+    <string name="cloud_saves_gog_zip_helper">Зберегти поточні хмарні файли</string>
+    <string name="cloud_saves_gog_zip_success">ZIP хмарних збережень GOG збережено.</string>
+    <string name="cloud_saves_gog_zip_failed">Не вдалося зберегти ZIP хмарних збережень GOG.</string>
+    <string name="cloud_saves_gog_zip_empty">Файли хмарних збережень GOG не знайдено.</string>
+    <string name="cloud_saves_sync_from_provider_generic">Синхронізувати з хмари</string>
+    <string name="cloud_saves_sync_from_provider_success">Хмарне збереження %1$s завантажено.</string>
+    <string name="cloud_saves_syncing_from_provider">Завантаження збереження від %1$s\u2026</string>
+    <string name="cloud_saves_sync_summary">Отримати версію, яка зараз є у %1$s.</string>
+    <string name="cloud_saves_sync_summary_generic">Отримати поточну хмарну версію.</string>
+    <string name="common_ui_exit_app_confirm">Вийти з WinNative?</string>
+    <string name="container_surface_effect">Ефект поверхні</string>
+    <string name="downloads_queue_cancel_download_confirm">Скасувати завантаження %1$s і видалити всі завантажені файли?</string>
+    <string name="downloads_queue_paused_resume_hint">Призупинено — натисніть «Продовжити» для відновлення</string>
+    <string name="downloads_queue_phase_applying_data">Застосування даних</string>
+    <string name="downloads_queue_phase_downloading">Завантаження</string>
+    <string name="downloads_queue_phase_downloading_file">Завантаження [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">Завершення</string>
+    <string name="downloads_queue_phase_patching">Патчинг</string>
+    <string name="downloads_queue_phase_preparing">Підготовка</string>
+    <string name="downloads_queue_phase_queued">У черзі</string>
+    <string name="downloads_queue_phase_unknown">Невідомо</string>
+    <string name="downloads_queue_phase_unpacking">Розпакування</string>
+    <string name="downloads_queue_phase_updating">Оновлення</string>
+    <string name="downloads_queue_phase_verifying">Перевірка</string>
+    <string name="downloads_queue_phase_verifying_file">Перевірка [%1$s]</string>
+    <string name="downloads_queue_status_label">Статус:</string>
+    <string name="downloads_queue_this_game">цю гру</string>
+    <string name="hud_position_bottom_center">Знизу по центру</string>
+    <string name="hud_position_bottom_left">Знизу ліворуч</string>
+    <string name="hud_position_bottom_right">Знизу праворуч</string>
+    <string name="hud_position_left_center">Ліворуч по центру</string>
+    <string name="hud_position_menu_title">Перемістити HUD до</string>
+    <string name="hud_position_right_center">Праворуч по центру</string>
+    <string name="hud_position_top_center">Угорі по центру</string>
+    <string name="hud_position_top_left">Угорі ліворуч</string>
+    <string name="hud_position_top_right">Угорі праворуч</string>
+    <string name="input_controls_editor_number_of_bindings">Кількість прив\'язок</string>
+    <string name="input_controls_editor_opacity">Непрозорість</string>
+    <string name="input_controls_editor_radial_menu">Радіальне меню</string>
+    <string name="input_controls_editor_radial_menu_options">Параметри радіального меню</string>
+    <string name="input_controls_tap_to_click">Торкання для кліку</string>
+    <string name="input_controls_reverse_binding_order">Зворотний порядок призначень</string>
+    <string name="num_controllers">Кількість контролерів</string>
+    <string name="session_drawer_controls_section">Керування</string>
+    <string name="session_drawer_header_subtitle">Швидкий доступ до керування, накладень та інструментів сесії</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">Встановити Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">Увімкніть накладення, щоб налаштувати його</string>
+    <string name="session_drawer_hud_elements">Елементи HUD</string>
+    <string name="session_drawer_hud_input_hint">Введіть значення від %1$d до %2$d. Значення вище ліміту обрізаються.</string>
+    <string name="session_drawer_hud_scale">Масштаб</string>
+    <string name="session_drawer_hud_scale_input_title">Встановити масштаб</string>
+    <string name="session_drawer_hud_summary">Налаштуйте видимість накладення та відображувані дані</string>
+    <string name="session_drawer_screen_effects">Ефекти екрана</string>
+    <string name="session_drawer_session_section">Сесія</string>
+    <string name="session_drawer_swipe_hint">Проведіть убік, щоб повернутися до гри</string>
+    <string name="session_gamepad_enable_vibration">Увімкнути вібрацію</string>
+    <string name="session_gyroscope_experimental_mouse_movement">Експериментальний рух миші</string>
+    <string name="session_gyroscope_mouse_scale">Масштаб миші</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">Масштаб миші: %1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">Відкрийте майстер налаштування знову, щоб перевірити дозволи, системні файли та стандартні контейнери.</string>
+    <string name="settings_other_setup_wizard_title">Майстер налаштування</string>
+    <string name="shortcuts_library_artwork_failed">Не вдалося завантажити вибране зображення.</string>
+    <string name="shortcuts_library_artwork_open_source">Відкрити SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">Встановити зображення</string>
+    <string name="shortcuts_library_artwork_title">Зображення бібліотеки</string>
+    <string name="shortcuts_library_artwork_icon_title">Зображення піктограми</string>
+    <string name="shortcuts_library_artwork_hero_title">Фон</string>
+    <string name="shortcuts_list_readded_existing">Повторно додано наявний ярлик</string>
+    <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Вставляє DLL DRM-патчера під час запуску. Знижує FPS — використовуйте лише якщо сам застарілий лаунчер не допомагає.</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Вибрати папку збережень</string>
+    <string name="cloud_saves_custom_folder_label">Папка збережень</string>
+    <string name="cloud_saves_custom_select_folder_summary">Укажіть каталог збережень усередині контейнера</string>
+    <string name="cloud_saves_custom_no_container">Контейнер недоступний для цього ярлика</string>
+    <string name="cloud_saves_custom_picker_title">Вибрати папку збережень</string>
+    <string name="cloud_saves_custom_outside_drive_c">Вибрана папка має бути всередині диска C: контейнера</string>
+    <string name="cloud_saves_custom_path_map_failed">Не вдалося зіставити вибрану папку зі шляхом Windows.</string>
+    <string name="cloud_saves_custom_folder_set">Папку збережень установлено на %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Синхронізувати зі Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Завантажити найновіше збереження</string>
+    <string name="cloud_saves_steam_sync_success">Синхронізовано зі Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Помилка синхронізації Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_label">Переглянути збереження Steam Cloud</string>
+    <string name="cloud_saves_steam_browse_helper">Відкрити хмарне сховище</string>
+    <string name="cloud_saves_steam_browse_no_browser">Немає доступного браузера, щоб відкрити сторінку Steam</string>
+    <string name="cloud_saves_steam_import_label">Імпортувати файли</string>
+    <string name="cloud_saves_steam_import_helper">Відновити завантажені файли</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">Вибір файлів недоступний</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">Це завантажить поточні файли збережень зі Steam Cloud і перезапише поточні файли збережень.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Недійсний ID застосунку</string>
+    <string name="cloud_saves_label_saved">Мітку збережено</string>
+    <string name="downloads_queue_cancel_all_title">Скасувати всі завантаження?</string>
+    <string name="downloads_queue_cancel_all_warning">Скасування завантажень DLC, гри або оновлення може пошкодити встановлені ігри.\n\nСправді скасувати всі завантаження й видалити вже завантажені файли?</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Використовувати застарілий лаунчер</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Застаріла емуляція Steam: запускає гру через лаунчер ColdClient і видаляє SteamStub DRM з exe. Використовуйте лише для старих ігор, які не працюють зі Steam Launcher.</string>
+    <string name="steam_section_real_client">Справжній клієнт Steam WinNative</string>
+    <string name="steam_section_emulator">Застарілий емулятор Steam</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Змушує емульований клієнт Steam повідомляти, що він офлайн, щоб гра не намагалася підключатися до мережі. Використовуйте для ігор, які зависають на мережевій перевірці Steam.</string>
+    <string name="input_controls_select_style">Виберіть стиль</string>
+    <string name="input_controls_style_original">Оригінальний</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Сланець</string>
+    <string name="input_controls_style_halo">Ореол</string>
+    <string name="input_controls_style_glint">Відблиск</string>
+    <string name="input_controls_style_shadow">Тінь</string>
+    <string name="input_controls_style_reticle">Приціл</string>
+    <string name="input_controls_style_neon">Неон</string>
+    <string name="input_controls_style_lumina">Люміна</string>
+    <string name="input_controls_accent_theme">Колірна тема</string>
+    <string name="input_controls_edit_duplicating_builtin">Вбудований профіль — створено копію, яку можна редагувати.</string>
+    <string name="input_controls_editor_confirm_reset_profile">Скинути цей профіль до початкового макета? Усі внесені зміни буде втрачено.</string>
+    <string name="input_controls_editor_profile_reset">Профіль скинуто до початкового макета.</string>
+    <string name="input_controls_editor_reset_unavailable">Для цього профілю немає початкового знімка.</string>
+    <string name="container_graphics_compositor_present_mode">Синхронізація дисплея Vulkan</string>
+    <string name="cloud_sync_disable_title">Вимкнути хмарні збереження</string>
+    <string name="cloud_saves_steam_push_label">Надіслати до Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Примусово завантажити локальне збереження</string>
+    <string name="cloud_saves_steam_push_success">Збереження надіслано до Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Не вдалося надіслати збереження до Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud зараз недоступний. Повторне підключення виконується у фоні натисніть оновити, коли знову будете онлайн.</string>
+    <string name="steam_session_refused_event">Steam відхилив кешований сеанс (EResult=%1$d). Увійдіть знову.</string>
+    <string name="settings_hud_record_to_file_title">Записувати продуктивність у файл</string>
+    <string name="settings_hud_record_to_file_summary">Експортує щосекундні показники FPS, CPU, GPU, температури й батареї до /WinNative/logs/ під час гри.</string>
+    <string name="settings_leaderboard_category">Продуктивність</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">Підготовка середовища Steam</string>
+    <string name="preloader_starting_wine">Запуск Wine</string>
+    <string name="preloader_starting_steam_launcher">Запуск Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Завантаження клієнта Steam</string>
+    <string name="preloader_connecting_to_steam">Підключення до Steam</string>
+    <string name="preloader_signing_in_to_steam">Вхід у Steam</string>
+    <string name="preloader_fetching_game_info">Вхід виконано — отримання інформації про гру</string>
+    <string name="preloader_steam_ready">Steam готовий</string>
+    <string name="preloader_updating_game_info">Оновлення інформації про гру</string>
+    <string name="preloader_verifying_install">Перевірка встановлення</string>
+    <string name="preloader_scanning_redists">Сканування компонентів для розповсюдження</string>
+    <string name="preloader_installing_redist_single">Встановлення компонента для розповсюдження</string>
+    <string name="preloader_installing_named_redist">Встановлення %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Встановлення %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Компоненти для розповсюдження готові</string>
+    <string name="preloader_no_redists">Немає компонентів для розповсюдження для встановлення</string>
+    <string name="preloader_steam_service_running">Служба Steam працює</string>
+    <string name="preloader_launching_game">Запуск %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Збій Steam Launcher — повторна підготовка ресурсів</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher не вдалося запустити. Повторна підготовка — запустіть ще раз</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher дістався гри, але вона не запустилася</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Завантаження елементів Workshop</string>
+    <string name="workshop_search_items">Пошук елементів Workshop</string>
+    <string name="workshop_title">МАЙСТЕРНЯ STEAM</string>
+    <string name="workshop_loading_subtitle">Отримання предметів, на які ви підписані, зі Steam.</string>
+    <string name="workshop_error_title">Не вдалося завантажити предмети Майстерні</string>
+    <string name="workshop_error_subtitle">Щось пішло не так. Повторіть спробу.</string>
+    <string name="workshop_empty_title">Немає предметів Майстерні, на які ви підписані</string>
+    <string name="workshop_empty_subtitle">Підпишіться на предмети в Майстерні Steam, а потім знову відкрийте це вікно.</string>
+    <string name="workshop_search_empty_title">Немає предметів, що відповідають \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Спробуйте інший пошуковий запит.</string>
+    <string name="workshop_clear_search">Очистити пошук</string>
+    <string name="workshop_item_fallback">Предмет Майстерні</string>
+    <string name="common_ui_failed">Помилка</string>
+    <string name="steam_presence_snooze">Сплячий режим</string>
+    <string name="steam_presence_busy">Зайнятий</string>
+    <string name="steam_presence_looking_to_trade">Хоче обмін</string>
+    <string name="steam_presence_looking_to_play">Хоче грати</string>
+    <string name="steam_friends_count">Друзі — %1$d у мережі</string>
+    <string name="steam_friends_section_in_game">У грі (%1$d)</string>
+    <string name="steam_friends_section_online">У мережі (%1$d)</string>
+    <string name="steam_friends_section_offline">Не в мережі (%1$d)</string>
+    <string name="steam_friends_none_loaded">Друзів ще не завантажено.</string>
+    <string name="steam_friends_chat_off">Чат вимкнено. Знову ввімкніть Службу чату, щоб бачити друзів.</string>
+    <string name="steam_friends_self_you">Ви</string>
+    <string name="steam_friends_in_game">У грі</string>
+    <string name="steam_friends_join">Приєднатися</string>
+    <string name="steam_friends_play">Грати</string>
+    <string name="steam_chat_image_failed">(не вдалося надіслати зображення)</string>
+    <string name="steam_chat_empty">Повідомлень ще немає. Привітайтеся!</string>
+    <string name="steam_chat_uploading_image">Завантаження зображення…</string>
+    <string name="steam_chat_send_image">Надіслати зображення</string>
+    <string name="steam_chat_message_hint">Повідомлення…</string>
+    <string name="steam_chat_send">Надіслати</string>
+    <string name="steam_chat_image">Зображення</string>
+    <string name="steam_common_back">Назад</string>
+    <string name="steam_achievements_title">Досягнення</string>
+    <string name="steam_achievements_empty">Досягнень для цієї гри не знайдено,\nабо увійдіть у Steam, щоб завантажити їх.</string>
+    <string name="steam_achievements_hidden">Приховане досягнення</string>
+    <string name="steam_achievements_hidden_desc">Продовжуйте грати, щоб відкрити це досягнення.</string>
+    <string name="steam_achievements_unlocked_on">Отримано %1$s</string>
+    <string name="steam_achievements_unlocked">Отримано</string>
+    <string name="steam_join_joining">Приєднання до %1$s у %2$s…</string>
+    <string name="steam_join_install">Встановіть %1$s, щоб приєднатися до %2$s</string>
+    <string name="steam_join_not_owned">У вас немає %1$s</string>
+    <string name="steam_chat_not_sent">(не надіслано)</string>
+    <string name="steam_join_the_game">гру</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Служба чату</string>
+    <string name="steam_chat_setting_service_desc">Увійдіть, щоб бачити друзів і спілкуватися в чаті; вимкніть, щоб перейти в офлайн</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">Вивід</string>
+    <string name="display_output_prompt_title">Виявлено зовнішній дисплей</string>
+    <string name="display_output_prompt_message">Надіслати гру на підключений дисплей? Екранні елементи керування та меню залишаться на цьому телефоні.</string>
+    <string name="display_output_prompt_swap">Перемкнути дисплеї</string>
+    <string name="display_output_prompt_mirror">Дублювати</string>
+    <string name="display_output_swapped_toast">Гру переміщено на зовнішній дисплей. Керування залишається на телефоні.</string>
+    <string name="display_output_cast_unavailable">Налаштування бездротового дисплея недоступні на цьому пристрої.</string>
+    <string name="display_output_restored_toast">Зовнішній дисплей відключено — гра повернулася на телефон.</string>
+    <string name="session_drawer_output_title">Вивід зображення</string>
+    <string name="session_drawer_output_subtitle">Гра відображається на зовнішньому дисплеї.</string>
+    <string name="session_drawer_output_device">Підключений дисплей</string>
+    <string name="session_drawer_output_resolution">Роздільна здатність</string>
+    <string name="session_drawer_output_refresh_rate">Частота оновлення</string>
+    <string name="session_drawer_output_aspect_ratio">Співвідношення сторін</string>
+    <string name="session_drawer_output_aspect_fit">Вписати (пропорції)</string>
+    <string name="session_drawer_output_aspect_stretch">Розтягнути (заповнити)</string>
+    <string name="session_drawer_output_aspect_zoom">Збільшити (обрізати)</string>
+    <string name="session_drawer_output_return_to_phone">Повернути на телефон</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Транслювати на телевізор</string>
+    <string name="session_drawer_output_cast_body">Підключіть адаптер USB-C / HDMI або торкніться нижче, щоб підключити бездротовий дисплей (Miracast / Wi-Fi Direct). Гра відображається на телевізорі, а це керування залишається на телефоні.</string>
+    <string name="session_drawer_output_cast_button">Підключити бездротовий дисплей</string>
+    <string name="session_drawer_output_cast_note">Телевізори лише з Chromecast не можуть показувати гру в реальному часі з приватним керуванням — для найкращого результату використовуйте бездротовий дисплей або адаптер USB‑C/HDMI.</string>
+    <string name="session_drawer_output_render_note">Режими, про які повідомляє дисплей, змінюють його реальний вивід (він може ненадовго згаснути під час повторної ініціалізації). Інші роздільні здатності рендеряться в цьому розмірі й апаратно масштабуються на панель — вище за нативну різкіше (суперсемплінг), нижче швидше.</string>
+    <string name="session_drawer_output_scaling_note">Цей телефон виводить зображення у власній роздільності %1$s і не змінює режим, тож тут задається роздільність рендерингу — вона апаратно масштабується під панель (вище за нативну — різкіше, нижче — швидше).</string>
+    <string name="session_drawer_output_game_mode">Ігровий режим (низька затримка)</string>
+    <string name="session_drawer_output_game_mode_on">Увімк.</string>
+    <string name="session_drawer_output_game_mode_off">Вимк.</string>
+    <string name="session_drawer_output_game_mode_note">Запитує ігровий режим / низьку затримку телевізора (HDMI ALLM), щоб зменшити затримку вводу. Показується лише коли підключений дисплей це підтримує.</string>
+    <string name="session_drawer_output_send_to_display">Надіслати гру на дисплей</string>
+    <string name="session_drawer_output_to_display">Виведення на зовнішній дисплей</string>
+    <string name="session_drawer_output_send_note">Дисплей підключено. Надішліть гру на нього — керування та меню залишаться на цьому телефоні. Ви можете будь-коли повернути її сюди.</string>
+    <string name="session_drawer_output_display">Екран</string>
+    <string name="session_drawer_output_glasses">Окуляри</string>
+    <string name="session_drawer_output_brightness">Яскравість</string>
+    <string name="session_drawer_output_shade">Затемнення</string>
+    <string name="session_drawer_output_3d">3D (поруч)</string>
+    <string name="glasses_panel_refresh">Частота оновлення</string>
+    <string name="glasses_panel_sunblock">Світлофільтр</string>
+    <string name="session_drawer_output_volume">Гучність</string>
+    <string name="session_drawer_output_glasses_note">Надсилається напряму на окуляри Viture через USB.</string>
+
+    <!-- Touch Input & Gesture Profiles -->
+    <string name="common_ui_new">Створити</string>
+    <string name="common_ui_rename">Перейменувати</string>
+    <string name="gesture_profile_export">Експортувати профіль жестів</string>
+    <string name="gesture_profile_import">Імпортувати профіль жестів</string>
+    <string name="gesture_profile_new">Новий профіль жестів</string>
+    <string name="gesture_profile_none">Немає профілів жестів</string>
+    <string name="input_controls_editor_input_profiles_section">Профілі введення</string>
+    <string name="session_drawer_right_stick_sensitivity">Чутливість правого стіка</string>
+    <string name="session_drawer_rts_gestures">RTS-жести</string>
+    <string name="session_drawer_rts_gestures_edit">Редагувати</string>
+    <string name="session_drawer_touch">Дотик</string>
+    <string name="session_drawer_touch_map_right_stick">Призначити на правий стік</string>
+    <string name="session_drawer_touch_touchscreen">Режим сенсорного екрана</string>
+    <string name="session_drawer_touch_trackpad">Тачпад</string>
+    <string name="session_gesture_profile_section">Профіль жестів</string>
+    <string name="session_rts_action">Дія</string>
+    <string name="session_rts_behavior">Поведінка</string>
+    <string name="session_rts_double_tap">Подвійний дотик (подвійний лівий клік)</string>
+    <string name="session_rts_double_tap_delay">Затримка подвійного дотику (ms)</string>
+    <string name="session_rts_down">Вниз</string>
+    <string name="session_rts_drag">Перетягування 1 пальцем</string>
+    <string name="session_rts_pan1">Панорамування 1 пальцем</string>
+    <string name="session_rts_drag2">Перетягування 2 пальцями</string>
+    <string name="session_rts_drag_threshold">Поріг перетягування (px)</string>
+    <string name="session_rts_gesture_threshold">Поріг жесту (px)</string>
+    <string name="session_rts_hold2">Утримання 2 пальцями</string>
+    <string name="session_rts_hold3">Утримання 3 пальцями</string>
+    <string name="session_rts_hold4">Утримання 4 пальцями</string>
+    <string name="session_rts_hold_delay">Затримка утримання (ms)</string>
+    <string name="session_rts_left">Вліво</string>
+    <string name="session_rts_long_press">Довге натискання</string>
+    <string name="session_rts_long_press_delay">Затримка довгого натискання (ms)</string>
+    <string name="session_rts_pan">Панорамування 2 пальцями</string>
+    <string name="session_rts_pan_threshold">Початок панорамування/щипка (px)</string>
+    <string name="session_rts_right">Вправо</string>
+    <string name="session_rts_swipe3">Свайп 3 пальцями</string>
+    <string name="session_rts_swipe4">Свайп 4 пальцями</string>
+    <string name="session_rts_swipe_threshold">Поріг свайпу (px)</string>
+    <string name="session_rts_tap1">Дотик 1 пальцем</string>
+    <string name="session_rts_tap2">Дотик 2 пальцями</string>
+    <string name="session_rts_tap3">Дотик 3 пальцями</string>
+    <string name="session_rts_tap4">Дотик 4 пальцями</string>
+    <string name="session_rts_up">Вгору</string>
+    <string name="session_rts_zoom">Масштабування щипком</string>
+    <string name="session_drawer_brightness">Яскравість</string>
+    <string name="session_drawer_contrast">Контраст</string>
+    <string name="session_drawer_gamma">Гамма</string>
+    <string name="session_drawer_saturation">Насиченість</string>
+    <string name="session_drawer_temperature">Температура</string>
+    <string name="session_drawer_tint">Відтінок</string>
+    <string name="session_drawer_intensity">Інтенсивність</string>
+    <string name="session_drawer_strength">Сила</string>
+    <string name="session_drawer_sharpen">Різкість</string>
+    <string name="session_drawer_scanlines">Рядки розгортки</string>
+    <string name="session_drawer_pixelate">Пікселізація</string>
+    <string name="session_drawer_block_size">Розмір блока</string>
+    <string name="session_drawer_scale">Масштабування</string>
+    <string name="session_drawer_scale_nearest">Найближчий</string>
+    <string name="session_drawer_scale_linear">Лінійний</string>
+    <string name="session_drawer_scale_bicubic">Бікубічний</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">Мультяшний</string>
+    <string name="session_drawer_color_blind">Дальтонізм</string>
+    <string name="session_drawer_color_blind_protan">Протан</string>
+    <string name="session_drawer_color_blind_deutan">Дейтан</string>
+    <string name="session_drawer_color_blind_tritan">Тритан</string>
+    <string name="session_drawer_reset_effects">Скинути ефекти</string>
+    <string name="session_drawer_hud_background">Фон</string>
+    <string name="session_drawer_hud_background_alpha">Альфа фону</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Задати альфу фону</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">Змінити розмір</string>
+    <string name="session_task_bring_to_front">На передній план</string>
+    <string name="session_task_custom_value">Власне значення</string>
+    <string name="session_gyroscope_orientation_mode">Нахил для прицілювання (орієнтація)</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Файли</string>
+    <string name="file_manager_copy">Копіювати</string>
+    <string name="file_manager_cut">Вирізати</string>
+    <string name="file_manager_paste">Вставити</string>
+    <string name="file_manager_paste_here">Вставити сюди</string>
+    <string name="file_manager_new_folder">Нова тека</string>
+    <string name="file_manager_new_folder_short">Тека</string>
+    <string name="file_manager_multi_select">Вибір</string>
+    <string name="file_manager_create">Створити</string>
+    <string name="file_manager_delete">Видалити</string>
+    <string name="file_manager_copy_count">Копіювати (%1$d)</string>
+    <string name="file_manager_cut_count">Вирізати (%1$d)</string>
+    <string name="file_manager_delete_count">Видалити (%1$d)</string>
+    <string name="file_manager_extract">Видобути</string>
+    <string name="file_manager_extract_here">Розпакувати сюди</string>
+    <string name="file_manager_extract_to">Видобути до…</string>
+    <string name="file_manager_extracting">Розпакування %1$s</string>
+    <string name="file_manager_extract_failed">Не вдалося розпакувати</string>
+    <string name="file_manager_run_boot">Запустити / Завантажити</string>
+    <string name="file_manager_create_shortcut">Створити ярлик</string>
+    <string name="file_manager_run_in_container">Запустити в контейнері</string>
+    <string name="file_manager_no_containers">Немає доступних контейнерів</string>
+    <string name="file_manager_delete_confirm">Видалити \"%1$s\"? Цю дію неможливо скасувати.</string>
+    <string name="file_manager_delete_confirm_multi">Видалити %1$d елементів? Цю дію неможливо скасувати.</string>
+    <string name="file_manager_copying">Копіювання %1$s</string>
+    <string name="file_manager_moving">Переміщення %1$s</string>
+    <string name="file_manager_copying_count">Копіювання %1$d елементів</string>
+    <string name="file_manager_moving_count">Переміщення %1$d елементів</string>
+    <string name="file_manager_paste_into_itself">Неможливо вставити теку саму в себе</string>
+    <string name="file_manager_operation_failed">Не вдалося виконати операцію</string>
+    <string name="file_manager_delete_failed">Не вдалося видалити</string>
+    <string name="file_manager_rename_failed">Не вдалося перейменувати</string>
+    <string name="file_manager_create_folder_failed">Не вдалося створити теку</string>
+    <string name="cloud_saves_google_backup_helper">Зберегти копію в Google Play Games</string>
+    <string name="cloud_saves_google_backup_label">Резервна копія в Google</string>
+    <string name="cloud_saves_google_backup_no_save">Не знайдено файлів збереження для резервного копіювання.</string>
+    <string name="cloud_saves_history_cloud_readonly">Лише читання</string>
+    <string name="session_drawer_rail_label_record">Запис</string>
+    <string name="session_record_failed">Не вдалося почати запис</string>
+    <string name="session_record_fps">Частота кадрів</string>
+    <string name="session_record_include_ui">Записувати інтерфейс</string>
+    <string name="session_record_include_ui_subtitle">Включити HUD та екранні елементи керування</string>
+    <string name="session_record_now">Записати зараз</string>
+    <string name="session_record_quality">Якість</string>
+    <string name="session_record_resolution">Роздільна здатність</string>
+    <string name="session_record_saved">Запис збережено в WinNative/Recordings</string>
+    <string name="session_record_settings_title">Налаштування запису</string>
+    <string name="session_record_started">Запис розпочато</string>
+    <string name="steam_chat_setting_stay_running">Працювати у фоні</string>
+    <string name="steam_chat_setting_stay_running_desc">Залишати чат активним після виходу з WinNative</string>
+    <string name="settings_content_refresh">Оновити</string>
+    <string name="settings_retro_title">Ретро</string>
+    <string name="retro_save_transfer_title">Перенесення збереження</string>
+    <string name="retro_save_transfer_message">Імпортуйте локальне збереження для цієї гри або експортуйте поточне збереження.</string>
+    <string name="retro_save_transfer_import">Імпортувати збереження</string>
+    <string name="retro_save_transfer_export">Експортувати збереження</string>
+    <string name="retro_save_transfer_import_ok">Збереження імпортовано</string>
+    <string name="retro_save_transfer_import_failed">Не вдалося імпортувати збереження</string>
+    <string name="retro_save_transfer_export_ok">Збереження експортовано</string>
+    <string name="retro_save_transfer_export_failed">Не вдалося експортувати збереження</string>
+    <string name="retro_save_transfer_none">Для цієї гри ще немає збереження</string>
+    <string name="retro_cheats_title">Чити</string>
+    <string name="retro_cheats_hardcore_blocked">Чити вимкнено в режимі Hardcore</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">Зберегти</string>
+    <string name="retro_ps2_cancel">Скасувати</string>
+    <string name="retro_ps2_save_state">Зберегти стан</string>
+    <string name="retro_ps2_load_save_state">Завантажити стан</string>
+    <string name="retro_ps2_achievements">Досягнення</string>
+    <string name="retro_ps2_cheats">Чити</string>
+    <string name="retro_ps2_memory_cards">Карти пам\'яті</string>
+    <string name="retro_ps2_fast_forward">Прискорення</string>
+    <string name="retro_ps2_reset">Скинути</string>
+    <string name="retro_ps2_swap_disc">Змінити диск</string>
+    <string name="retro_ps2_slot">Слот %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Торкніться, щоб завантажити</string>
+    <string name="retro_ps2_slot_empty">Порожньо</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Торкніться, щоб перезаписати</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Порожньо — торкніться, щоб зберегти</string>
+    <string name="retro_ps2_slot_is_empty">Слот %1$d порожній</string>
+    <string name="retro_ps2_loaded_slot">Завантажено слот %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Не вдалося завантажити слот %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Збережено в слот %1$d</string>
+    <string name="retro_ps2_save_failed">Не вдалося зберегти</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Слот 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Слот 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Торкніться, щоб використати</string>
+    <string name="retro_ps2_new_memory_card">Нова карта пам\'яті</string>
+    <string name="retro_ps2_import_card">Імпортувати карту</string>
+    <string name="retro_ps2_enable_online_dev9">Увімкнути мережу (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">Мережевий адаптер PS2 — перезапускає гру, щоб під\'єднати його</string>
+    <string name="retro_ps2_ethernet_device">Пристрій Ethernet</string>
+    <string name="retro_ps2_dns_mode">Режим DNS</string>
+    <string name="retro_ps2_primary_dns">Основний DNS</string>
+    <string name="retro_ps2_secondary_dns">Додатковий DNS</string>
+    <string name="retro_ps2_optional">необов\'язково</string>
+    <string name="retro_ps2_auto_ip_dhcp">Авто IP (DHCP)</string>
+    <string name="retro_ps2_server_host">Сервер: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">торкніться, щоб задати IP (порожнє видаляє)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Додати хост сервера</string>
+    <string name="retro_ps2_new_server_hostname">Нове ім\'я хоста сервера</string>
+    <string name="retro_ps2_server_hostname_hint">напр. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">Екранне керування</string>
+    <string name="retro_ps2_edit_layout">Редагувати розкладку</string>
+    <string name="retro_ps2_reset_layout">Скинути розкладку</string>
+    <string name="retro_ps2_layout_reset">Розкладку скинуто</string>
+    <string name="retro_ps2_left_stick_invert_x">Ліва ручка: інвертувати X</string>
+    <string name="retro_ps2_left_stick_invert_y">Ліва ручка: інвертувати Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Права ручка: інвертувати X</string>
+    <string name="retro_ps2_right_stick_invert_y">Права ручка: інвертувати Y</string>
+    <string name="retro_ps2_button_color">Колір кнопки</string>
+    <string name="retro_ps2_letter_color">Колір літери</string>
+    <string name="retro_ps2_shadow_color">Колір тіні</string>
+    <string name="retro_ps2_background_color">Колір фону</string>
+    <string name="retro_ps2_reset_colors">Скинути кольори</string>
+    <string name="retro_ps2_renderer">Рендерер</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Масштаб роздільності</string>
+    <string name="retro_ps2_scale_1x_native">1x (нативний)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Співвідношення сторін</string>
+    <string name="retro_ps2_aspect_stretch">Розтягнути</string>
+    <string name="retro_ps2_aspect_auto_standard">Авто (стандарт)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Фільтр зображення</string>
+    <string name="retro_ps2_filter_nearest">Найближчий</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Білінійний (гладкий)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Білінійний (чіткий)</string>
+    <string name="retro_ps2_texture_filter">Фільтр текстур</string>
+    <string name="retro_ps2_filter_bilinear_forced">Білінійний (примусовий)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Білінійний (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Білінійний (спрайти)</string>
+    <string name="retro_ps2_blending_accuracy">Точність змішування</string>
+    <string name="retro_ps2_blend_minimum">Мінімальна</string>
+    <string name="retro_ps2_blend_basic">Базова</string>
+    <string name="retro_ps2_blend_medium">Середня</string>
+    <string name="retro_ps2_blend_high">Висока</string>
+    <string name="retro_ps2_blend_full">Повна</string>
+    <string name="retro_ps2_blend_maximum">Максимальна</string>
+    <string name="retro_ps2_crt_tv_shader">Шейдер CRT / TV</string>
+    <string name="retro_ps2_shader_off">Вимк.</string>
+    <string name="retro_ps2_shader_scanline">Рядки розгортки</string>
+    <string name="retro_ps2_shader_diagonal">Діагональний</string>
+    <string name="retro_ps2_shader_triangular">Трикутний</string>
+    <string name="retro_ps2_shader_wave">Хвиля</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Пропуск кадрів</string>
+    <string name="retro_ps2_frameskip_off">Вимк.</string>
+    <string name="retro_ps2_frameskip_1">Пропуск 1</string>
+    <string name="retro_ps2_frameskip_2">Пропуск 2</string>
+    <string name="retro_ps2_frameskip_3">Пропуск 3</string>
+    <string name="retro_ps2_mipmapping">Міпмапінг</string>
+    <string name="retro_ps2_volume">Гучність</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Без звуку</string>
+    <string name="retro_ps2_swap_stereo_channels">Поміняти стереоканали</string>
+    <string name="retro_ps2_ee_cycle_rate">Частота циклів EE</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (за замовч.)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">Пропуск циклів EE</string>
+    <string name="retro_ps2_skip_off">Вимк.</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Миттєвий VU1</string>
+    <string name="retro_ps2_mtvu">Багатопотоковий VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Швидкий CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Швидкість емуляції</string>
+    <string name="retro_ps2_hud_cpu_usage">Використання CPU</string>
+    <string name="retro_ps2_hud_gpu_usage">Використання GPU</string>
+    <string name="retro_ps2_hud_internal_resolution">Внутрішня роздільність</string>
+    <string name="retro_ps2_deinterlace_mode">Режим деінтерлейсингу</string>
+    <string name="retro_ps2_deint_auto">Авто</string>
+    <string name="retro_ps2_deint_off">Вимк.</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">Співвідношення сторін FMV</string>
+    <string name="retro_ps2_anti_blur">Антирозмиття</string>
+    <string name="retro_ps2_widescreen_patches">Широкоекранні патчі</string>
+    <string name="retro_ps2_no_interlace_patches">Патчі без черезрядковості</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">Виявлення циклу INTC</string>
+    <string name="retro_ps2_wait_loop">Виявлення циклу очікування</string>
+    <string name="retro_ps2_time_stretch">Розтягнення звуку в часі</string>
+    <string name="retro_ps2_audio_buffer">Аудіобуфер</string>
+    <string name="retro_ps2_audio_latency">Затримка виводу</string>
+    <string name="retro_ps2_ms">%1$d мс</string>
+    <string name="retro_ps2_hud_frame_times">Час кадрів</string>
+    <string name="retro_ps2_hud_gs_stats">Статистика GS</string>
+    <string name="retro_ps2_hud_hw_info">Інформація про обладнання</string>
+    <string name="retro_ps2_hud_version">Версія</string>
+    <string name="retro_ps2_hud_input_display">Відображення вводу</string>
+    <string name="retro_ps2_tab_menu">Меню</string>
+    <string name="retro_ps2_tab_display">Екран</string>
+    <string name="retro_ps2_tab_performance">Продуктивність</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Звук</string>
+    <string name="retro_ps2_tab_online">Мережа</string>
+    <string name="retro_ps2_tab_controls">Керування</string>
+    <string name="retro_ps2_resume">Продовжити</string>
+    <string name="retro_ps2_pause">Пауза</string>
+    <string name="retro_ps2_exit">Вийти</string>
+    <string name="retro_lr_bios_imported">BIOS імпортовано: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Недійсний файл BIOS</string>
+    <string name="retro_lr_invalid_retro_game">Недійсна ретрогра</string>
+    <string name="retro_lr_rom_not_found">ROM не знайдено: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Не вдалося прочитати ROM у цьому архіві</string>
+    <string name="retro_lr_core_not_installed">Ядро не встановлено: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Чити увімкнено — досягнення вимкнено для цього сеансу</string>
+    <string name="retro_lr_cloud_save_restored">Хмарне збереження відновлено</string>
+    <string name="retro_lr_restore_failed">Не вдалося відновити</string>
+    <string name="retro_lr_cloud_conflict_message">Для %1$s існує новіше хмарне збереження. Бажаєте синхронізувати, і яке хмарне збереження залишити?</string>
+    <string name="retro_lr_cloud_save">Хмарне збереження</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Не вдалося завантажити ядро емулятора</string>
+    <string name="retro_lr_failed_load_rom">Не вдалося завантажити ROM</string>
+    <string name="retro_lr_graphics_not_supported">Графіка не підтримується для цього ядра</string>
+    <string name="retro_lr_emulator_error">Помилка емулятора</string>
+    <string name="retro_lr_shader_default">За замовчуванням</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Чіткий</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">Масштабування SGSR</string>
+    <string name="retro_lr_upscale_native">Нативний</string>
+    <string name="retro_lr_sound">Звук</string>
+    <string name="retro_lr_left_stick_invert_x">Ліва ручка: інвертувати X</string>
+    <string name="retro_lr_left_stick_invert_y">Ліва ручка: інвертувати Y</string>
+    <string name="retro_lr_right_stick_invert_x">Права ручка: інвертувати X</string>
+    <string name="retro_lr_right_stick_invert_y">Права ручка: інвертувати Y</string>
+    <string name="retro_lr_on_screen_controls">Екранне керування</string>
+    <string name="retro_lr_haptic_feedback">Тактильний відгук</string>
+    <string name="retro_lr_portrait">Портрет</string>
+    <string name="retro_lr_landscape">Ландшафт</string>
+    <string name="retro_lr_edit_layout">Редагувати розкладку (%1$s)</string>
+    <string name="retro_lr_reset_layout">Скинути розкладку %1$s</string>
+    <string name="retro_lr_layout_reset">Розкладку %1$s скинуто</string>
+    <string name="retro_lr_button_color">Колір кнопки</string>
+    <string name="retro_lr_letter_color">Колір літери</string>
+    <string name="retro_lr_shadow_color">Колір тіні</string>
+    <string name="retro_lr_background_color">Колір фону</string>
+    <string name="retro_lr_reset_colors">Скинути кольори</string>
+    <string name="retro_lr_colors_reset">Кольори скинуто</string>
+    <string name="retro_lr_performance_hud">HUD продуктивності</string>
+    <string name="retro_lr_alpha">Альфа</string>
+    <string name="retro_lr_background_alpha">Альфа фону</string>
+    <string name="retro_lr_background">Фон</string>
+    <string name="retro_lr_scale">Масштаб</string>
+    <string name="retro_lr_numeric_frametime">Числовий час кадру</string>
+    <string name="retro_lr_dual_series_battery">Батарея двох рядів</string>
+    <string name="retro_lr_hud_elements">ЕЛЕМЕНТИ HUD</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Консоль</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Батарея</string>
+    <string name="retro_lr_hud_temp">Темп.</string>
+    <string name="retro_lr_hud_graph">Графік</string>
+    <string name="retro_lr_hud_cpu_temp">Темп. CPU</string>
+    <string name="retro_lr_save_state">Зберегти стан</string>
+    <string name="retro_lr_load_save_state">Завантажити стан</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Завантаження станів вимкнено в режимі Hardcore</string>
+    <string name="retro_lr_achievements">Досягнення</string>
+    <string name="retro_lr_cheats">Чити</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Чити вимкнено в режимі Hardcore</string>
+    <string name="retro_lr_reset">Скинути</string>
+    <string name="retro_lr_fast_forward">Прискорення</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Прискорення вимкнено в режимі Hardcore</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Диск %1$d/%2$d</string>
+    <string name="retro_lr_resume">Продовжити</string>
+    <string name="retro_lr_pause">Пауза</string>
+    <string name="retro_lr_exit">Вийти</string>
+    <string name="retro_lr_saved_to_slot">Збережено в слот %1$d</string>
+    <string name="retro_lr_could_not_save_state">Не вдалося зберегти стан</string>
+    <string name="retro_lr_bios_required_title">Потрібен BIOS %1$s</string>
+    <string name="retro_lr_bios_required_message">Ігри PlayStation потребують справжнього файлу BIOS консолі, який ви маєте надати. Імпортуйте BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin або scph7001.bin), щоб продовжити.</string>
+    <string name="retro_lr_import_bios">Імпортувати BIOS…</string>
+    <string name="retro_lr_cancel">Скасувати</string>
+    <string name="retro_lr_slot_empty">Слот %1$d порожній</string>
+    <string name="retro_lr_loaded_slot">Завантажено слот %1$d</string>
+    <string name="retro_lr_could_not_load_state">Не вдалося завантажити стан</string>
+    <string name="retro_lr_slot_title">Слот %1$d</string>
+    <string name="retro_lr_rename_slot">Перейменувати слот %1$d</string>
+    <string name="retro_gs_section_general">Загальні</string>
+    <string name="retro_gs_section_graphics">Графіка</string>
+    <string name="retro_gs_section_performance">Продуктивність</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Введення</string>
+    <string name="retro_gs_section_audio">Аудіо</string>
+    <string name="retro_gs_section_online">Мережа</string>
+    <string name="retro_gs_cancel">Скасувати</string>
+    <string name="retro_gs_save">Зберегти</string>
+    <string name="retro_gs_shader_default">За замовчуванням</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Чіткий</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Нативний</string>
+    <string name="retro_gs_group_game">ГРА</string>
+    <string name="retro_gs_label_name">Назва</string>
+    <string name="retro_gs_label_system">Система</string>
+    <string name="retro_gs_label_emulator_core">Ядро емулятора</string>
+    <string name="retro_gs_label_rom_path">Шлях до ROM</string>
+    <string name="retro_gs_group_bios">BIOS %1$s</string>
+    <string name="retro_gs_label_installed">Встановлено</string>
+    <string name="retro_gs_bios_none">Немає — потрібен для запуску ігор %1$s</string>
+    <string name="retro_gs_import_bios">Імпортувати BIOS…</string>
+    <string name="retro_gs_remove_bios">Видалити BIOS</string>
+    <string name="retro_gs_group_library_artwork">ОБКЛАДИНКИ БІБЛІОТЕКИ</string>
+    <string name="retro_gs_artwork_game_card">Зображення картки гри</string>
+    <string name="retro_gs_artwork_grid">Зображення сітки</string>
+    <string name="retro_gs_artwork_carousel">Зображення каруселі</string>
+    <string name="retro_gs_artwork_list">Зображення списку</string>
+    <string name="retro_gs_artwork_custom_set">Власне зображення задано</string>
+    <string name="retro_gs_artwork_set_image">Задати зображення</string>
+    <string name="retro_gs_artwork_remove">Видалити</string>
+    <string name="retro_gs_group_video">ВІДЕО</string>
+    <string name="retro_gs_video_filter">Відеофільтр</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">Масштабування SGSR</string>
+    <string name="retro_gs_performance_hud">HUD продуктивності</string>
+    <string name="retro_gs_group_core">ЯДРО</string>
+    <string name="retro_gs_renderer">Рендерер</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Масштаб роздільності</string>
+    <string name="retro_gs_scale_1x_native">1x (нативний)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Співвідношення сторін</string>
+    <string name="retro_gs_aspect_stretch">Розтягнути</string>
+    <string name="retro_gs_aspect_auto_standard">Авто (стандарт)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Фільтр зображення</string>
+    <string name="retro_gs_filter_nearest">Найближчий</string>
+    <string name="retro_gs_filter_bilinear_smooth">Білінійний (гладкий)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Білінійний (чіткий)</string>
+    <string name="retro_gs_texture_filter">Фільтр текстур</string>
+    <string name="retro_gs_filter_bilinear_forced">Білінійний (примусовий)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Білінійний (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Білінійний (спрайти)</string>
+    <string name="retro_gs_blending_accuracy">Точність змішування</string>
+    <string name="retro_gs_blend_minimum">Мінімальна</string>
+    <string name="retro_gs_blend_basic">Базова</string>
+    <string name="retro_gs_blend_medium">Середня</string>
+    <string name="retro_gs_blend_high">Висока</string>
+    <string name="retro_gs_blend_full">Повна</string>
+    <string name="retro_gs_blend_maximum">Максимальна</string>
+    <string name="retro_gs_crt_tv_shader">Шейдер CRT / TV</string>
+    <string name="retro_gs_off">Вимк.</string>
+    <string name="retro_gs_tvshader_scanline">Рядки розгортки</string>
+    <string name="retro_gs_tvshader_diagonal">Діагональний</string>
+    <string name="retro_gs_tvshader_triangular">Трикутний</string>
+    <string name="retro_gs_tvshader_wave">Хвиля</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Пропуск кадрів</string>
+    <string name="retro_gs_frameskip_1">Пропуск 1</string>
+    <string name="retro_gs_frameskip_2">Пропуск 2</string>
+    <string name="retro_gs_frameskip_3">Пропуск 3</string>
+    <string name="retro_gs_mipmapping">Міпмапінг</string>
+    <string name="retro_gs_group_performance">ПРОДУКТИВНІСТЬ</string>
+    <string name="retro_gs_ee_cycle_rate">Частота циклів EE</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (за замовч.)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">Пропуск циклів EE</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Миттєвий VU1</string>
+    <string name="retro_gs_mtvu">Багатопотоковий VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Швидкий CDVD</string>
+    <string name="retro_gs_group_performance_hud">HUD ПРОДУКТИВНОСТІ</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Швидкість емуляції</string>
+    <string name="retro_gs_hud_cpu_usage">Використання CPU</string>
+    <string name="retro_gs_hud_gpu_usage">Використання GPU</string>
+    <string name="retro_gs_hud_internal_resolution">Внутрішня роздільність</string>
+    <string name="retro_gs_deinterlace_mode">Режим деінтерлейсингу</string>
+    <string name="retro_gs_deint_auto">Авто</string>
+    <string name="retro_gs_deint_off">Вимк.</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">Співвідношення сторін FMV</string>
+    <string name="retro_gs_anti_blur">Антирозмиття</string>
+    <string name="retro_gs_widescreen_patches">Широкоекранні патчі</string>
+    <string name="retro_gs_no_interlace_patches">Патчі без черезрядковості</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">Виявлення циклу INTC</string>
+    <string name="retro_gs_wait_loop">Виявлення циклу очікування</string>
+    <string name="retro_gs_time_stretch">Розтягнення звуку в часі</string>
+    <string name="retro_gs_audio_buffer">Аудіобуфер</string>
+    <string name="retro_gs_audio_latency">Затримка виводу</string>
+    <string name="retro_gs_ms">%1$d мс</string>
+    <string name="retro_gs_hud_frame_times">Час кадрів</string>
+    <string name="retro_gs_hud_gs_stats">Статистика GS</string>
+    <string name="retro_gs_hud_hw_info">Інформація про обладнання</string>
+    <string name="retro_gs_hud_version">Версія</string>
+    <string name="retro_gs_hud_input_display">Відображення вводу</string>
+    <string name="retro_gs_fast_boot">Швидке завантаження</string>
+    <string name="retro_gs_group_online_dev9">МЕРЕЖА (DEV9)</string>
+    <string name="retro_gs_enable_online">Увімкнути мережу</string>
+    <string name="retro_gs_ethernet_device">Пристрій Ethernet</string>
+    <string name="retro_gs_net_auto">Авто</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">Режим DNS</string>
+    <string name="retro_gs_dns_manual">Вручну</string>
+    <string name="retro_gs_dns_internal">Внутрішній</string>
+    <string name="retro_gs_primary_dns">Основний DNS</string>
+    <string name="retro_gs_secondary_dns">Додатковий DNS</string>
+    <string name="retro_gs_dns_optional">необов\'язково</string>
+    <string name="retro_gs_auto_ip_dhcp">Авто IP (DHCP)</string>
+    <string name="retro_gs_group_input">ВВЕДЕННЯ</string>
+    <string name="retro_engine_save">Зберегти</string>
+    <string name="retro_engine_saved">Гру збережено</string>
+    <string name="retro_engine_loading">Завантаження…</string>
+    <string name="retro_engine_load">Завантажити</string>
+    <string name="retro_engine_saved_to">Збережено в %1$s</string>
+    <string name="retro_engine_slot_active_only">Активний</string>
+    <string name="retro_engine_rename_slot">Перейменувати слот збереження</string>
+    <string name="retro_engine_caught">Спіймано: %1$d</string>
+    <string name="retro_engine_no_slots">Слотів збереження ще немає</string>
+    <string name="retro_engine_new_slot">Новий слот збереження</string>
+    <string name="retro_engine_achievements_unavailable">Не відстежується в режимі 3D</string>
+    <string name="retro_engine_fullscreen">Повний екран</string>
+    <string name="retro_engine_loaded_from">Завантажено: %1$s</string>
+    <string name="retro_engine_slot_empty">Цей слот порожній</string>
+    <string name="retro_engine_loading_subtitle">Перша підготовка даних гри</string>
+    <string name="retro_gs_engine_3d">Воксельний 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Грати в цю гру у воксельному 3D-рушії замість стандартного ядра</string>
+    <string name="retro_gs_on_screen_controls">Екранне керування</string>
+    <string name="retro_gs_haptic_feedback">Тактильний відгук</string>
+    <string name="retro_gs_group_audio">АУДІО</string>
+    <string name="retro_gs_volume">Гучність</string>
+    <string name="retro_gs_mute">Без звуку</string>
+    <string name="retro_gs_swap_stereo">Поміняти стереоканали</string>
+    <string name="retro_gs_sound">Звук</string>
+    <string name="retro_scr_retro_defaults">СТАНДАРТНІ НАЛАШТУВАННЯ RETRO</string>
+    <string name="retro_scr_retro_defaults_desc">Стандартні налаштування застосовуються до ігор кожної консолі, якщо не змінені у власних налаштуваннях гри.</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Обліковий запис</string>
+    <string name="retro_scr_signed_in">Виконано вхід</string>
+    <string name="retro_scr_not_signed_in_hint">Вхід не виконано — відкрийте Досягнення гри, щоб увійти</string>
+    <string name="retro_scr_achievements_enabled">Досягнення увімкнено</string>
+    <string name="retro_scr_hardcore_default">Режим Hardcore за замовчуванням (без станів)</string>
+    <string name="retro_scr_sign_out">Вийти</string>
+    <string name="retro_scr_playstation_bios">BIOS PLAYSTATION</string>
+    <string name="retro_scr_installed">Встановлено</string>
+    <string name="retro_scr_none_ps1_bios">Немає — ігри PS1 потребують BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Імпортувати BIOS PS1…</string>
+    <string name="retro_scr_ps1_bios_removed">BIOS PS1 видалено</string>
+    <string name="retro_scr_no_bios_to_remove">Немає BIOS для видалення</string>
+    <string name="retro_scr_remove_ps1_bios">Видалити BIOS PS1</string>
+    <string name="retro_scr_playstation_2_bios">BIOS PLAYSTATION 2</string>
+    <string name="retro_scr_none_ps2_bios">Немає — ігри PS2 потребують BIOS</string>
+    <string name="retro_scr_format">Формат</string>
+    <string name="retro_scr_ps2_bios_format">Об\'єднаний однофайловий дамп (.bin з тегом регіону, ~4 МБ). Розділені набори ROM0/MEC/NVM не приймаються.</string>
+    <string name="retro_scr_import_ps2_bios">Імпортувати BIOS PS2…</string>
+    <string name="retro_scr_ps2_bios_removed">BIOS PS2 видалено</string>
+    <string name="retro_scr_remove_ps2_bios">Видалити BIOS PS2</string>
+    <string name="retro_scr_library_artwork">ОБКЛАДИНКИ БІБЛІОТЕКИ</string>
+    <string name="retro_scr_retro_case_art">Ретрообкладинка (картридж / CD-бокс)</string>
+    <string name="retro_scr_box_art">Обкладинка</string>
+    <string name="retro_scr_box_art_desc">Отримується автоматично з thumbnails.libretro.com під час імпорту; власне зображення завжди має пріоритет.</string>
+    <string name="retro_scr_roms_folder">ПАПКА ROM</string>
+    <string name="retro_scr_folder">Папка</string>
+    <string name="retro_scr_roms_not_set">Не задано — виберіть папку для автоімпорту ігор</string>
+    <string name="retro_scr_auto_import">Автоімпорт</string>
+    <string name="retro_scr_auto_import_desc">Нові ігри в цій папці автоматично додаються до вашої бібліотеки з визначенням правильної консолі.</string>
+    <string name="retro_scr_select_roms_folder_title">Виберіть папку ROM</string>
+    <string name="retro_scr_select_roms_folder_button">Виберіть папку ROM…</string>
+    <string name="retro_scr_change_roms_folder_button">Змінити папку ROM…</string>
+    <string name="retro_scr_scan_now">Сканувати зараз</string>
+    <string name="retro_scr_console_defaults">СТАНДАРТНІ НАЛАШТУВАННЯ КОНСОЛІ</string>
+    <string name="retro_scr_console_defaults_desc">Торкніться консолі, щоб задати її стандартні налаштування.</string>
+    <string name="retro_scr_renderer">Рендерер</string>
+    <string name="retro_scr_upscale_resolution">Масштабувати роздільність</string>
+    <string name="retro_scr_aspect_ratio">Співвідношення сторін</string>
+    <string name="retro_scr_aspect_stretch">Розтягнути</string>
+    <string name="retro_scr_aspect_auto_standard">Авто (стандарт)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Фільтр зображення</string>
+    <string name="retro_scr_filter_nearest">Найближчий</string>
+    <string name="retro_scr_filter_bilinear_smooth">Білінійний (гладкий)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Білінійний (чіткий)</string>
+    <string name="retro_scr_texture_filter">Фільтр текстур</string>
+    <string name="retro_scr_filter_bilinear_forced">Білінійний (примусовий)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Білінійний (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Білінійний (спрайти)</string>
+    <string name="retro_scr_blending_accuracy">Точність змішування</string>
+    <string name="retro_scr_blend_minimum">Мінімальна</string>
+    <string name="retro_scr_blend_basic">Базова</string>
+    <string name="retro_scr_blend_medium">Середня</string>
+    <string name="retro_scr_blend_high">Висока</string>
+    <string name="retro_scr_blend_full">Повна</string>
+    <string name="retro_scr_blend_maximum">Максимальна</string>
+    <string name="retro_scr_crt_tv_shader">Шейдер CRT / TV</string>
+    <string name="retro_scr_shader_off">Вимк.</string>
+    <string name="retro_scr_shader_scanline">Рядки розгортки</string>
+    <string name="retro_scr_shader_diagonal">Діагональний</string>
+    <string name="retro_scr_shader_triangular">Трикутний</string>
+    <string name="retro_scr_shader_wave">Хвиля</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Пропуск кадрів</string>
+    <string name="retro_scr_skip_1">Пропуск 1</string>
+    <string name="retro_scr_skip_2">Пропуск 2</string>
+    <string name="retro_scr_skip_3">Пропуск 3</string>
+    <string name="retro_scr_mipmapping">Міпмапінг</string>
+    <string name="retro_scr_ee_cycle_rate">Частота циклів EE</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (за замовч.)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">Пропуск циклів EE</string>
+    <string name="retro_scr_skip_off">Вимк.</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Миттєвий VU1</string>
+    <string name="retro_scr_mtvu">Багатопотоковий VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Швидкий CDVD</string>
+    <string name="retro_scr_touch_controls">Екранне сенсорне керування</string>
+    <string name="retro_scr_sound">Звук</string>
+    <string name="retro_scr_swap_stereo">Поміняти стереоканали</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: швидкість емуляції</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: використання CPU</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: використання GPU</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: внутрішня роздільність</string>
+    <string name="retro_scr_enable_online_dev9">Увімкнути мережу (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Пристрій Ethernet</string>
+    <string name="retro_scr_net_auto">Авто</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">Режим DNS</string>
+    <string name="retro_scr_dns_manual">Вручну</string>
+    <string name="retro_scr_dns_internal">Внутрішній</string>
+    <string name="retro_scr_primary_dns">Основний DNS</string>
+    <string name="retro_scr_secondary_dns">Додатковий DNS</string>
+    <string name="retro_scr_optional">необов\'язково</string>
+    <string name="retro_scr_auto_ip_dhcp">Авто IP (DHCP)</string>
+    <string name="retro_scr_shader">Шейдер</string>
+    <string name="retro_scr_sgsr_upscaling">Масштабування SGSR</string>
+    <string name="retro_scr_performance_hud">HUD продуктивності</string>
+    <string name="retro_scr_credits_licenses">АВТОРИ &amp; ЛІЦЕНЗІЇ</string>
+    <string name="retro_scr_credits_desc">Деякі функції WinNative побудовані на цих проєктах з відкритим кодом. Торкніться, щоб переглянути кожне джерело.</string>
+    <string name="retro_scr_tab_defaults">Стандартні</string>
+    <string name="retro_scr_tab_credits">Автори</string>
+    <string name="retro_scr_enable_hardcore_title">Увімкнути режим Hardcore?</string>
+    <string name="retro_scr_enable_hardcore_body">Режим Hardcore зараз скидає гру та вимикає завантаження станів, прискорення й чити. Будь-який незбережений прогрес буде втрачено. Продовжити?</string>
+    <string name="retro_scr_cancel">Скасувати</string>
+    <string name="retro_scr_enable">Увімкнути</string>
+    <string name="retro_scr_bios_imported">BIOS імпортовано: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Недійсний файл BIOS</string>
+    <string name="retro_scr_ps2_bios_imported">BIOS PS2 імпортовано: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Недійсний файл BIOS PS2</string>
+    <string name="retro_scr_no_game_serial">Немає серійного номера гри для пошуку читів.</string>
+    <string name="retro_scr_applied_cheats">Застосовано %1$d чит(ів).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Не вдалося застосувати чити.</string>
+    <string name="retro_scr_cheats">Чити</string>
+    <string name="retro_scr_apply">Застосувати</string>
+    <string name="retro_scr_no_cheats_found">Читів для цієї гри не знайдено.</string>
+    <string name="retro_scr_achievements">Досягнення</string>
+    <string name="retro_scr_sign_in_ra">Увійти в RetroAchievements</string>
+    <string name="retro_scr_username">Ім\'я користувача</string>
+    <string name="retro_scr_password">Пароль</string>
+    <string name="retro_scr_login_failed">Не вдалося увійти</string>
+    <string name="retro_scr_signing_in">Вхід…</string>
+    <string name="retro_scr_sign_in">Увійти</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d очок</string>
+    <string name="retro_scr_no_achievements">Для цієї гри немає досягнень.</string>
+    <string name="retro_scr_back">Назад</string>
+    <string name="retro_scr_enabled">Увімкнено</string>
+    <string name="retro_scr_disabled">Вимкнено</string>
+    <string name="retro_scr_rename">Перейменувати</string>
+    <string name="retro_scr_save">Зберегти</string>
+    <string name="retro_scr_cloud_save_conflict">Конфлікт хмарного збереження</string>
+    <string name="retro_scr_keep_local_save">Залишити локальне збереження</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <string name="retro_tab_menu">Меню</string>
+    <string name="retro_tab_display">Екран</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Звук</string>
+    <string name="retro_tab_controls">Керування</string>
+    <string name="retro_scan_up_to_date">Бібліотека актуальна</string>
+    <string name="retro_scan_roms">ROM: %1$s</string>
+    <string name="retro_scan_added">додано %1$d</string>
+    <string name="retro_scan_removed">видалено %1$d</string>
+    <string name="retro_scr_shader_default">За замовчуванням</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Чіткий</string>
+    <string name="retro_scr_upscale_native">Нативний</string>
+    <string name="retro_co_aspect_ratio">Співвідношення сторін</string>
+    <string name="retro_co_ntsc_filter">Фільтр NTSC</string>
+    <string name="retro_co_colorization">Колоризація</string>
+    <string name="retro_co_color_correction">Корекція кольору</string>
+    <string name="retro_co_remove_sprite_limit">Зняти ліміт спрайтів</string>
+    <string name="retro_co_resolution">Роздільність</string>
+    <string name="retro_co_framebuffer_emulation">Емуляція буфера кадрів</string>
+    <string name="retro_co_dithering">Дизеринг</string>
+    <string name="retro_co_widescreen_hack">Широкоекранний хак</string>
+    <string name="retro_co_val_8_7_native">8:7 (нативний)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Вимк.</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Авто</string>
+    <string name="retro_co_val_gba_screen">Екран GBA</string>
+    <string name="retro_co_val_gbc_screen">Екран GBC</string>
+    <string name="retro_co_val_on">Увімк.</string>
+    <string name="retro_co_val_320x240_native">320x240 (нативний)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 скориговане</string>
+    <string name="retro_co_val_native">Нативний</string>
+    <string name="retro_co_val_internal">Внутрішній</string>
+    <string name="retro_co_val_on_16_9">Увімк. (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Увійдіть за допомогою облікового запису RetroAchievements, щоб заробляти та відстежувати досягнення в ретроіграх.</string>
+    <string name="retro_ach_username">Ім\'я користувача</string>
+    <string name="retro_ach_password">Пароль</string>
+    <string name="retro_ach_enter_credentials">Введіть ім\'я користувача та пароль</string>
+    <string name="retro_ach_login_failed">Не вдалося увійти</string>
+    <string name="retro_ach_sign_in">Увійти</string>
+    <string name="retro_ach_password_disclaimer">Ваш пароль використовується лише один раз для отримання токена входу, який надійно зберігається на пристрої.</string>
+    <string name="retro_ach_achievements_enabled">Досягнення увімкнено</string>
+    <string name="retro_ach_hardcore_mode">Режим Hardcore (без станів)</string>
+    <string name="retro_ach_points">%1$d / %2$d очок</string>
+    <string name="retro_ach_none_found">Досягнень для цієї гри не знайдено.</string>
+    <string name="retro_ach_sign_out">Вийти</string>
+    <string name="retro_che_brand">ЧИТИ</string>
+    <string name="retro_che_name">Назва</string>
+    <string name="retro_che_code">Код</string>
+    <string name="retro_che_cancel">Скасувати</string>
+    <string name="retro_che_save">Зберегти</string>
+    <string name="retro_che_default_name">Чит %1$d</string>
+    <string name="retro_che_empty">Читів ще немає. Додайте чит-код для цієї гри.</string>
+    <string name="retro_che_add">Додати чит</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">Драйвер GPU</string>
+    <string name="retro_gpu_driver_system">Системний (За замовчуванням)</string>
+    <string name="retro_gpu_driver_hint">Встановіть драйвери Turnip у розділі Налаштування \u2192 Драйвери. Одні й ті самі драйвери працюють для ігор PC та PS2.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">HDD PS2 (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Віртуальний внутрішній диск для ігор на HDD, як-от Final Fantasy XI. Перезапускає гру.</string>
+    <string name="retro_ps2_hdd_desc">Віртуальний внутрішній диск для ігор на HDD, як-от Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">Режим DNS встановлено на Internal, щоб ваші власні хости сервера набули чинності.</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">Ядро CPU</string>
+<string name="retro_co_dual_core">Два ядра</string>
+<string name="retro_co_internal_cheats">Внутрішні чити</string>
+<string name="retro_co_internal_resolution">Внутрішня роздільна здатність</string>
+<string name="retro_co_renderer">Рендерер</string>
+<string name="retro_co_sensor_bar">Положення сенсорної панелі</string>
+<string name="retro_co_skip_gc_bios">Пропустити заставку BIOS</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">Знизу</string>
+<string name="retro_co_val_cached_interpreter">Кешований інтерпретатор</string>
+<string name="retro_co_val_hardware">Апаратний</string>
+<string name="retro_co_val_interpreter">Інтерпретатор</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">Миша / дотик</string>
+<string name="retro_co_val_right_stick_absolute">Правий стік (абсолютний)</string>
+<string name="retro_co_val_right_stick_relative">Правий стік (відносний)</string>
+<string name="retro_co_val_software">Програмний</string>
+<string name="retro_co_val_stretch">Розтягнути</string>
+<string name="retro_co_val_top">Зверху</string>
+<string name="retro_co_vbi_skip">Пропуск VBI (авто пропуск кадрів)</string>
+<string name="retro_co_widescreen">Широкий екран</string>
+<string name="retro_co_wiimote_pointer">Вказівник Wiimote</string>
+<string name="retro_gs_cheats_apply_note">Зміни застосуються під час наступного запуску цієї гри.</string>
+<string name="retro_gs_cheats_detect_hint">Запустіть цю гру один раз, щоб визначити серійний номер диска, тоді тут з\'являться чити та патчі.</string>
+<string name="retro_gs_dnas_entry_desc">Обхід автентифікації DNAS — потрібен для гри онлайн</string>
+<string name="retro_gs_dnas_group">Автоматично застосовано (онлайн)</string>
+<string name="retro_gs_group_cheats">Чити &amp; патчі</string>
+<string name="retro_gs_hdd_image_size">Розмір: %1$s</string>
+<string name="retro_gs_hdd_import">Імпортувати образ HDD</string>
+<string name="retro_gs_hdd_remove_short">Видалити</string>
+<string name="retro_gs_netplay_enable">Увімкнути NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">Вимкнено за замовчуванням. Увімкніть, потім виберіть «Хост» або «Приєднатися» перед запуском.\nЗнову вимикається, коли ви виходите з гри.</string>
+<string name="retro_gs_netplay_host">Адреса хоста</string>
+<string name="retro_gs_netplay_host_hint">IP або ім\'я хоста</string>
+<string name="retro_gs_netplay_host_mode">Сеанс хоста</string>
+<string name="retro_gs_netplay_host_mode_subtitle">Увімк = чекати на гравця. Вимк = приєднатися до адреси хоста</string>
+<string name="retro_gs_netplay_not_ready">NetPlay використовує локальні порти для кількох гравців через TCP (гравець 1 — хост / гравець 2 — клієнт). Онлайн-гра PS2 натомість використовує Ethernet DEV9.</string>
+<string name="retro_gs_netplay_port">Порт</string>
+<string name="retro_lr_memory_card_slot">Карта пам\'яті %1$d</string>
+<string name="retro_lr_screenshot">Знімок екрана</string>
+<string name="retro_lr_use_cloud_save">Використати хмарне збереження</string>
+<string name="retro_netplay_conn_direct">LAN (пряма IP)</string>
+<string name="retro_netplay_connecting">Підключення…</string>
+<string name="retro_netplay_connection">Підключення</string>
+<string name="retro_netplay_conn_traversal">Онлайн (код хоста)</string>
+<string name="retro_netplay_dismiss">Закрити</string>
+<string name="retro_netplay_dolphin_help">NetPlay для GameCube/Wii використовує власний рушій Dolphin. Хост = гравець 1, приєднання = гравець 2. Виберіть «Хост» або «Приєднатися» та тип підключення перед запуском; обидва пристрої запускають ту саму гру разом.</string>
+<string name="retro_netplay_dolphin_host_lan_hint">Поділіться Wi‑Fi IP свого пристрою та цим портом з гравцем 2. Гра запускається автоматично, щойно вони підключаться.</string>
+<string name="retro_netplay_dolphin_host_online_hint">Код хоста показується під час завантаження гри — поділіться ним з гравцем 2. Гра запускається автоматично, щойно вони підключаться.</string>
+<string name="retro_netplay_dolphin_join_lan_hint">Введіть Wi‑Fi IP та порт хоста, потім запустіть, щоб підключитися.</string>
+<string name="retro_netplay_dolphin_join_online_hint">Введіть код хоста від гравця 1, потім запустіть, щоб підключитися.</string>
+<string name="retro_netplay_enable_before_launch">Увімкніть NetPlay у налаштуваннях гри та виберіть «Хост» або «Приєднатися» перед запуском</string>
+<string name="retro_netplay_find_rooms">Знайти кімнати у Wi‑Fi</string>
+<string name="retro_netplay_game_link_hint">Game Link · кожен екран — окрема консоль</string>
+<string name="retro_netplay_gba_not_ready">Багатокористувацька гра GBA використовує gpSP + бездротовий адаптер. Переконайтеся, що libgpsp встановлено.</string>
+<string name="retro_netplay_help">Багатокористувацька гра зі спільним екраном через Wi‑Fi (як RetroArch).\nХост = гравець 1, приєднання = гравець 2. Обидва пристрої показують ту саму гру.</string>
+<string name="retro_netplay_help_game_link">Game Link через Wi‑Fi — кожен пристрій запускає власну гру.\nGB/GBC: послідовне з\'єднання Gambatte (Pokémon Gen 1–2).\nGBA: бездротовий адаптер gpSP (битви Pokémon FR/LG/Emerald).</string>
+<string name="retro_netplay_host_action">Створити кімнату</string>
+<string name="retro_netplay_host_code">Код хоста</string>
+<string name="retro_netplay_host_code_hint">Код хоста traversal від хоста</string>
+<string name="retro_netplay_hosting_room">Хостинг кімнати</string>
+<string name="retro_netplay_host_mode_hint">Натисніть «Хост», щоб відкрити кімнату для цього сеансу гри, потім запустіть гру. NetPlay вимикається, коли ви виходите.</string>
+<string name="retro_netplay_in_room">У кімнаті</string>
+<string name="retro_netplay_join_action">Приєднатися за IP</string>
+<string name="retro_netplay_joined">Приєднано</string>
+<string name="retro_netplay_join_room">Приєднатися</string>
+<string name="retro_netplay_launch_mode">Під час запуску</string>
+<string name="retro_netplay_leave">Вийти</string>
+<string name="retro_netplay_menu_hint">Хост = P1 · Приєднання = P2 · та сама гра на обох екранах</string>
+<string name="retro_netplay_mode_host">Хост</string>
+<string name="retro_netplay_mode_join">Приєднатися</string>
+<string name="retro_netplay_mode_manual">Вручну</string>
+<string name="retro_netplay_no_rooms">Кімнат не знайдено. Переконайтеся, що хост у тій самій мережі Wi‑Fi та хостить кімнату.</string>
+<string name="retro_netplay_player_name">Ім\'я для відображення</string>
+<string name="retro_netplay_player_name_hint">Показується іншим гравцям</string>
+<string name="retro_netplay_players_count">%1$d підключено</string>
+<string name="retro_netplay_prelaunch_hint">Кімната відкрита лише для цього сеансу. Запустіть, коли будете готові. Вихід із гри вимикає NetPlay.</string>
+<string name="retro_netplay_room_players">Гравці</string>
+<string name="retro_netplay_scan_action">Сканувати Wi‑Fi</string>
+<string name="retro_netplay_scan_again">Сканувати знову</string>
+<string name="retro_netplay_scan_hint">Скануйте ту саму мережу Wi‑Fi на наявність відкритих кімнат або приєднайтеся за IP-адресою.</string>
+<string name="retro_netplay_scanning">Сканування Wi‑Fi…</string>
+<string name="retro_netplay_scan_results">Результати сканування</string>
+<string name="retro_netplay_select_room_hint">Натисніть кімнату, щоб приєднатися зараз (IP не зберігається для наступного запуску).</string>
+<string name="retro_netplay_stop_scan">Зупинити сканування</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s підключився</string>
+<string name="retro_netplay_user_disconnected">%1$s відключився</string>
+<string name="retro_netplay_waiting_players">Очікування гравців…</string>
+<string name="retro_ps2_coming_soon">Підтримка PlayStation 2 незабаром</string>
+<string name="retro_ps2_show_l3r3">Показати кнопки L3 / R3</string>
+<string name="retro_ps2_show_l3r3_subtitle">Коли вимкнено, двічі торкніться стіка, щоб натиснути L3 / R3</string>
+<string name="retro_ps2_turnip_flags">ПРАПОРЦІ ДРАЙВЕРА TURNIP</string>
+<string name="retro_ps2_turnip_flags_note">Застосовується лише коли вибрано власний драйвер GPU вище.</string>
+<string name="retro_rom_missing">Файл гри не знайдено</string>
+<string name="retro_scr_delete">Видалити</string>
+<string name="retro_scr_import_from_file">Імпортувати з файлу…</string>
+<string name="retro_scr_loading">Завантаження…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">Змінити консоль</string>
+    <string name="retro_gs_identify_as">Ідентифікувати як консоль</string>
+    <string name="retro_gs_console_changed">Тепер ідентифіковано як %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Застосовуйте ефект ReShade (.fx) до ігор DXVK/VKD3D (Vulkan) через вбудований шар vkBasalt. Помістіть кожен ефект в окрему папку в Android/data/&lt;package&gt;/files/ReShade/. Налаштування параметрів у реальному часі та перемикач у грі з’являться з оновленням шару з гарячим перезавантаженням.</string>
+    <string name="reshade_catalog_title">Ефекти ReShade</string>
+    <string name="reshade_catalog_search">Пошук ефектів…</string>
+    <string name="reshade_catalog_installed">Встановлено (%1$d)</string>
+    <string name="reshade_catalog_available">Доступно (%1$d)</string>
+    <string name="reshade_catalog_downloading">Завантаження</string>
+    <string name="reshade_catalog_installing">Встановлення</string>
+    <string name="reshade_catalog_offline_cache">Не в мережі — показано кешований список. Підключіться, щоб завантажити нові ефекти.</string>
+    <string name="reshade_catalog_offline_none">Не в мережі — показано лише встановлені ефекти. Підключіться, щоб переглянути каталог.</string>
+    <string name="reshade_catalog_needs_connection">Підключіться до інтернету, щоб завантажити ефекти.</string>
+    <string name="reshade_catalog_download_failed">Не вдалося завантажити %1$s.</string>
+    <string name="reshade_catalog_empty_query">Немає ефектів, що відповідають \"%1$s\".</string>
+    <string name="reshade_catalog_empty">Немає доступних ефектів. Підключіться до інтернету, щоб переглянути каталог.</string>
+    <string name="reshade_catalog_done">Готово</string>
+    <string name="reshade_catalog_delete_cd">Видалити %1$s</string>
+    <string name="reshade_catalog_delete_title">Видалити %1$s?</string>
+    <string name="reshade_catalog_delete_body">Це видалить ефект зі сховища та з усіх наборів, де він використовується. Пізніше ви зможете завантажити його знову.</string>
+    <string name="reshade_catalog_delete_confirm">Видалити</string>
+    <string name="reshade_catalog_delete_cancel">Скасувати</string>
+    <string name="reshade_catalog_delete_failed">Не вдалося видалити %1$s.</string>
+    <string name="reshade_params_title">ПАРАМЕТРИ ЕФЕКТУ</string>
+    <string name="reshade_params_reset">Скинути</string>
+    <string name="reshade_loadout_empty">Ефектів ще немає. Додайте один або кілька ефектів, щоб створити набір.</string>
+    <string name="reshade_loadout_add">Додати ефект</string>
+    <string name="reshade_loadout_full">Набір заповнений — видаліть ефект, щоб додати інший.</string>
+    <string name="reshade_effect_active">активний</string>
+    <string name="reshade_mode_solo">Соло</string>
+    <string name="reshade_mode_stack">Стек</string>
+    <string name="reshade_mode_solo_hint">Одночасно активний один ефект (порівняння A/B, перемикання наживо у грі).</string>
+    <string name="reshade_mode_stack_hint">Накладайте будь-яку підмножину ефектів, застосовуються по порядку.</string>
+    <string name="reshade_drawer_enable">Увімкнути ReShade</string>
+    <string name="reshade_drawer_empty">У цьому наборі немає ефектів ReShade. Додайте ефекти в налаштуваннях цієї гри (або контейнера), щоб перемикати та налаштовувати їх тут.</string>
+    <string name="reshade_drawer_no_params">Цей ефект не має регульованих параметрів.</string>
+    <string name="cloud_saves_deleting">Видалення збереження…</string>
+    <string name="cloud_saves_history_delete">Видалити</string>
+    <string name="cloud_saves_history_delete_confirm_body">Остаточно видалити хмарне збереження з %1$s? Цю дію не можна скасувати.</string>
+    <string name="cloud_saves_history_delete_confirm_title">Видалити хмарне збереження</string>
+    <string name="cloud_saves_history_delete_failed">Не вдалося видалити хмарне збереження</string>
+    <string name="cloud_saves_history_delete_success">Хмарне збереження видалено</string>
+    <string name="retro_bundle_required">Спочатку завантажте ядра консолей — Налаштування › Ретро</string>
+    <string name="retro_ps2_device_unsupported">Цей пристрій не може запустити емуляцію PS2 — потрібен OpenGL ES 3.1 або новіший.</string>
+    <string name="retro_scr_consoles_check">Перевірити оновлення</string>
+    <string name="retro_scr_consoles_checking">Перевірка оновлень…</string>
+    <string name="retro_scr_consoles_download">Завантажити ядра консолей</string>
+    <string name="retro_scr_consoles_downloading">Завантаження… %1$d / %2$d МБ</string>
+    <string name="retro_scr_consoles_group">Ядра консолей</string>
+    <string name="retro_scr_consoles_installed">Встановлено — збірка %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Встановлено — збірка %1$s (не вдалося перевірити оновлення)</string>
+    <string name="retro_scr_consoles_installing">Встановлення…</string>
+    <string name="retro_scr_consoles_missing">Не встановлено — завантажте, щоб грати в ретроігри</string>
+    <string name="retro_scr_consoles_state">Стан</string>
+    <string name="retro_scr_consoles_update">Оновити ядра консолей</string>
+    <string name="retro_scr_consoles_update_available">Доступне оновлення — збірка %1$s (%2$d МБ)</string>
+    <string name="retro_scr_consoles_verifying">Перевірка завантаження…</string>
+    <string name="retro_scr_consoles_working">Виконується…</string>
+    <string name="retro_tab_system">Система</string>
 </resources>
+
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
new file mode 100644
index 000000000..3c1d2ced0
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>图片</item>
+        <item>原始</item>
+        <item>纯色</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4292de664..386f6e281 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">请选择一个有效的 .exe 文件</string>
     <string name="common_ui_select_valid_icon_file">请选择一个有效的 .ico 或 .png 文件。</string>
     <string name="common_ui_exit">退出</string>
+    <string name="common_ui_exit_app">退出应用</string>
     <string name="common_ui_profile">配置文件</string>
     <string name="common_ui_name">名称</string>
     <string name="common_ui_ok">确定</string>
@@ -30,7 +31,8 @@
     <string name="common_ui_icon">图标</string>
     <string name="common_ui_duplicate">复制</string>
     <string name="common_ui_credits_and_third_party_apps">鸣谢与第三方应用</string>
-    <string name="common_ui_loading">加载中…</string>
+    <string name="common_ui_loading">加载中</string>
+    <string name="common_ui_exporting">正在导出</string>
     <string name="common_ui_enable">启用</string>
     <string name="common_ui_disable">禁用</string>
     <string name="common_ui_force">强制</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">高度</string>
     <string name="common_ui_open_file">打开文件</string>
     <string name="common_ui_download_file">下载文件</string>
-    <string name="common_ui_downloading_file">正在下载文件...</string>
+    <string name="common_ui_downloading_file">正在下载文件</string>
     <string name="common_ui_browse">浏览</string>
     <string name="common_ui_options">选项</string>
     <string name="common_ui_export">导出</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">设置</string>
     <string name="common_ui_enable_all">全部启用</string>
     <string name="common_ui_disable_all">全部禁用</string>
+    <string name="common_ui_select_all">全选</string>
+    <string name="common_ui_deselect_all">取消全选</string>
     <string name="common_ui_on">开</string>
     <string name="common_ui_off">关</string>
     <string name="common_ui_already_set">已设置</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">安装</string>
     <string name="common_ui_application">应用程序</string>
     <string name="common_ui_check">检查</string>
+    <string name="store_game_check_for_update">检查更新</string>
+    <string name="store_game_checking_for_update">正在检查</string>
+    <string name="store_game_download_update">下载更新</string>
+    <string name="store_game_no_update_available">没有可用更新</string>
+    <string name="store_game_update_available">有可用更新</string>
+    <string name="store_game_update_check_failed">更新检查失败</string>
+    <string name="store_game_update">更新</string>
+    <string name="store_game_workshop">创意工坊</string>
+    <string name="store_game_verify_files">验证文件</string>
+    <string name="store_game_verify_started">正在验证 %1$s — 请查看下载标签页</string>
+    <string name="store_game_steam_options">Steam 选项</string>
+    <string name="store_game_verify_complete">文件验证完成</string>
+    <string name="store_game_verify_failed_notice">文件验证失败</string>
+    <string name="store_game_progress_background_hint">你可以关闭此窗口 — 它会继续运行。可随时在下载标签页查看。</string>
+    <string name="store_game_checking_updates">正在检查更新</string>
+    <string name="store_game_no_updates_notice">没有可用更新</string>
+    <string name="store_game_update_complete">更新完成</string>
+    <string name="store_game_update_failed_notice">更新失败</string>
+    <string name="store_game_update_check_failed_notice">检查更新失败</string>
+    <string name="store_game_download_already_active">此游戏已在下载。请先取消当前下载，然后再添加 DLC。</string>
     <string name="common_ui_select">选择</string>
     <string name="common_ui_select_folder">选择文件夹</string>
     <string name="common_ui_current_folder">当前文件夹</string>
+    <string name="common_ui_enter_path">输入路径</string>
+    <string name="common_ui_path_not_found">找不到路径</string>
     <string name="common_ui_storage_roots">存储根目录</string>
     <string name="common_ui_browse_local_folders_directly">直接浏览本地文件夹</string>
     <string name="common_ui_no_folders_available_here">此处没有可用的文件夹</string>
     <string name="common_ui_grant_all_files_access_browse">请授予所有文件访问权限以直接浏览本地文件夹。</string>
     <string name="common_ui_not_configured">未配置</string>
     <string name="common_ui_reinstall">重新安装</string>
-    <string name="common_ui_exit_app_confirm">退出 WinNative？</string>
     <string name="common_ui_elements_count">%1$d 个元素</string>
     <string name="common_ui_disabled_placeholder">-- 已禁用 --</string>
     <string name="common_ui_enabled">已启用</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">抓取封面</string>
+    <string name="library_games_scraping_artwork">抓取中</string>
     <string name="library_games_shortcut_created">快捷方式已创建</string>
     <string name="library_games_failed_to_create_shortcut">创建快捷方式失败：%s</string>
     <string name="library_games_install_path">安装路径</string>
+    <string name="library_games_not_enough_space">还需要 %1$s 空间</string>
     <string name="library_games_download_slash_install">下载 / 安装</string>
     <string name="library_games_save_management">存档管理</string>
     <string name="library_games_download_install_available">%1$s / %2$s · 可用：%3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">未安装游戏\n点击打开 Winlator 后端</string>
     <string name="library_games_installed_badge">已安装</string>
     <string name="library_games_unknown_game">未知游戏</string>
-    <string name="library_games_layouts_header">布局</string>
+    <string name="library_games_layouts_header">游戏库布局</string>
     <string name="library_games_layout_carousel">轮播</string>
     <string name="library_games_layout_list">列表</string>
+    <string name="library_games_view_options_header">视图选项</string>
+    <string name="library_games_immersive_mode">沉浸模式</string>
+    <string name="library_games_immersive_mode_description">将当前聚焦游戏的美术图用作背景</string>
+    <string name="library_games_immersive_blur">模糊背景</string>
+    <string name="library_games_immersive_blur_description">对沉浸背景应用模糊效果</string>
     <string name="library_games_custom_game">自定义游戏</string>
     <string name="library_games_play">开始游戏</string>
+    <string name="hero_boot_to_desktop_title">启动到桌面</string>
+    <string name="hero_graphics_tests_title">图形测试</string>
+    <string name="hero_graphics_test_32">32 位</string>
+    <string name="hero_graphics_test_64">64 位</string>
+    <string name="hero_input_tests_title">输入测试</string>
     <string name="library_games_add_custom_game">添加自定义游戏</string>
     <string name="library_games_game_name">游戏名称</string>
     <string name="library_games_game_folder_mapped_drive">游戏文件夹（映射的游戏驱动器）</string>
@@ -221,16 +259,21 @@
     <string name="downloads_queue_phase_cancelled">已取消</string>
     <string name="downloads_queue_phase_failed">失败：%1$s</string>
     <string name="downloads_queue_cancel_download">取消下载</string>
+    <string name="downloads_queue_cancel_download_title">取消下载？</string>
+    <string name="downloads_queue_cancel_download_warning">取消 DLC、游戏或更新下载可能会损坏游戏安装。\n\n确定要取消吗？</string>
     <string name="downloads_queue_empty">没有活动下载。</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">新建容器</string>
     <string name="containers_list_edit">编辑容器</string>
-    <string name="containers_list_creating">正在创建容器…</string>
-    <string name="containers_list_removing">正在移除容器…</string>
-    <string name="containers_list_duplicating">正在复制容器…</string>
+    <string name="containers_list_creating">正在创建容器</string>
+    <string name="containers_list_removing">正在移除容器</string>
+    <string name="containers_list_duplicating">正在复制容器</string>
+    <string name="containers_list_remove_title">移除容器</string>
+    <string name="containers_list_duplicate_title">复制容器</string>
     <string name="containers_list_confirm_remove">您要移除此容器吗？</string>
     <string name="containers_list_confirm_duplicate">您要复制此容器吗？</string>
+    <string name="containers_list_duplicate_failed">复制容器失败</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">您要移除此快捷方式吗？</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">克隆快捷方式失败。</string>
     <string name="shortcuts_list_exported_to">快捷方式已导出到 %1$s</string>
     <string name="shortcuts_list_failed_export">导出快捷方式失败</string>
+    <string name="shortcuts_export_all">全部导出</string>
+    <string name="shortcuts_export_to_frontend">导出到前端</string>
+    <string name="shortcuts_export_all_done">已将 %1$d 个游戏导出到 %2$s</string>
+    <string name="shortcuts_export_all_none">没有可导出的游戏</string>
     <string name="shortcuts_list_added">快捷方式已成功添加。</string>
     <string name="shortcuts_list_failed_add">添加快捷方式失败。</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">禁用 XInput（独占鼠标/键盘控制）</string>
     <string name="shortcuts_properties_exclusive_input">独占输入</string>
     <string name="shortcuts_properties_custom_game_settings">自定义游戏设置</string>
-    <string name="shortcuts_properties_use_cold_client">使用 ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient 是处理 Steam 模拟和 DRM 的首选方式。它在运行时修补 DRM，无需修改游戏文件。</string>
-    <string name="shortcuts_properties_unpack_files">旧版 DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">从磁盘上的 exe 中移除 SteamStub DRM。仅在游戏无法正常启动时启用。ColdClient 的运行时补丁程序会自动处理大多数游戏。</string>
-    <string name="shortcuts_properties_force_dlc">强制 DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">仅在 DLC 未被检测到或含 DLC 的存档无法正常工作时启用</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">启动 Steam 客户端（测试版）</string>
-    <string name="shortcuts_properties_launch_steam_client_description">在 Wine 中启动真实 Steam 客户端\n需要 Steam 账号，可能会降低性能\n并非所有游戏都支持</string>
-    <string name="shortcuts_properties_steam_type">Steam 客户端性能</string>
-    <string name="steam_section_emulator">Steam 模拟器 (Goldberg)</string>
-    <string name="steam_section_real_client">真实 Steam 客户端</string>
     <string name="shortcuts_properties_use_steam_input">使用 Steam 输入</string>
     <string name="shortcuts_properties_steam_offline_mode">Steam 离线模式</string>
     <string name="shortcuts_properties_reset">重置属性</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">您要复制此配置文件吗？</string>
     <string name="input_controls_editor_title">控制编辑器</string>
     <string name="input_controls_editor_toggle_switch">切换开关</string>
+    <string name="input_controls_editor_swipeable">可滑动触发</string>
     <string name="input_controls_editor_profile_exported_to">配置文件已导出到</string>
     <string name="input_controls_editor_unable_to_import">无法导入配置文件</string>
     <string name="input_controls_editor_import_profile">导入配置文件</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">兼容性</string>
     <string name="container_box64_intermediate">中等</string>
     <string name="container_box64_performance">性能</string>
+    <string name="container_fexcore_performance_tso">性能 TSO</string>
+    <string name="container_fexcore_extreme">极限</string>
+    <string name="container_fexcore_extreme_tso">极限 TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         CALL/RET 操作码的标志处理&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt;：将 CALL/RET 视为从不需要标志（更快，不稳定）&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">FEXCore 预设</string>
     <string name="container_fexcore_version">FEXCore 版本</string>
+    <string name="use_unix_libs">使用 UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">图形驱动</string>
+    <string name="container_zink_mode">Zink 模式</string>
+    <string name="container_graphics_transcoder">BCn 转码器</string>
+    <string name="container_graphics_quality">BCn 质量</string>
     <string name="container_graphics_configuration">图形驱动配置</string>
     <string name="container_graphics_version">图形驱动版本</string>
     <string name="container_graphics_available_extensions">可用扩展</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">BCn 模拟</string>
     <string name="container_graphics_bcn_emulation_type">BCn 模拟类型</string>
     <string name="container_graphics_bcn_emulation_cache">BCn 模拟缓存</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ 游戏超分辨率 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">边缘锐度</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">您要复制此预设吗？</string>
     <string name="container_presets_confirm_remove">您要移除此预设吗？</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">使用 DRI3 扩展</string>
     <string name="session_xserver_simulate_touch_screen">模拟触摸屏</string>
     <string name="session_xserver_preferences_button_text">   偏好设置   </string>
     <string name="session_xserver_extra_keys_config_desc">您可以在此设置 extra-keys 变量的值，类似于 Termux 应用（请阅读 <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">此文档</a>）及更多内容 \n
@@ -526,12 +572,6 @@
     <string name="session_xserver_pref_kbd">键盘</string>
     <string name="session_xserver_pref_other">其他</string>
     <string name="session_xserver_pref_version">版本</string>
-    <string name="session_xserver_use_dri3_description">禁用可能修复某些设备上的图形故障</string>
-    <string name="session_xserver_native_rendering">原生渲染</string>
-    <string name="session_xserver_native_rendering_enabled">DRI3 硬件渲染</string>
-    <string name="session_xserver_native_rendering_disabled">软件 WSI 回退</string>
-    <string name="session_xserver_native_rendering_enabled_toast">原生渲染已启用（下次启动时生效）</string>
-    <string name="session_xserver_native_rendering_disabled_toast">原生渲染已禁用（下次启动时生效）</string>
     <string name="session_xserver_notification_description">WinNative XServer 消息</string>
     <string name="session_xserver_notification_content">WinNative 正在运行，请勿关闭或滑动移除此通知</string>
 
@@ -551,6 +591,8 @@
     <string name="session_drawer_exit_subtitle">关闭当前会话</string>
     <string name="session_drawer_touchscreen_overlay">触屏覆盖层</string>
     <string name="session_drawer_resume">恢复</string>
+    <string name="session_drawer_retry">重试</string>
+    <string name="downloads_no_internet">无互联网连接</string>
     <string name="session_drawer_pause">暂停</string>
     <string name="session_drawer_wine_processes_paused">Wine 进程已暂停</string>
     <string name="session_drawer_pause_all_wine_processes">暂停所有 Wine 进程</string>
@@ -561,6 +603,33 @@
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">电量</string>
     <string name="session_drawer_hud_element_graph">图表</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango 风格 HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD 设置</string>
+    <string name="mango_hud_element_gpu_load">GPU 负载</string>
+    <string name="mango_hud_element_gpu_temp">GPU 温度</string>
+    <string name="mango_hud_element_cpu_load">CPU 负载</string>
+    <string name="mango_hud_element_cpu_temp">CPU 温度</string>
+    <string name="mango_hud_element_ram">内存</string>
+    <string name="mango_hud_element_battery">电池</string>
+    <string name="mango_hud_element_lows" formatted="false">1% 最低帧</string>
+    <string name="mango_hud_element_graph">帧生成时间图表</string>
+    <string name="mango_hud_element_engine">引擎</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU 频率</string>
+    <string name="mango_hud_element_gpu_clock">GPU 频率</string>
+    <string name="mango_hud_element_cores">每核心</string>
+    <string name="mango_hud_element_network">网络</string>
+    <string name="mango_hud_element_swap">交换内存</string>
+    <string name="mango_hud_element_resolution">分辨率</string>
+    <string name="mango_hud_element_wine">Wine 版本</string>
+    <string name="mango_hud_element_duration">会话时长</string>
+    <string name="mango_hud_element_clock">时钟</string>
+    <string name="mango_hud_element_throttle">温控状态</string>
+    <string name="mango_hud_group_memory">内存</string>
+    <string name="mango_hud_group_system">系统</string>
+    <string name="mango_hud_lock">锁定 HUD</string>
+    <string name="mango_hud_lock_subtitle">让触摸穿透到 HUD 后面的控件。长按 HUD 即可锁定。 (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">您要结束此进程吗？</string>
@@ -591,6 +660,7 @@
     <string name="session_display_frame_rate">帧率</string>
     <string name="session_display_title">显示</string>
     <string name="session_display_fullscreen_stretched">启用全屏（拉伸）</string>
+    <string name="session_display_direct_composition">直接合成（零拷贝）</string>
     <string name="session_display_fps_label">FPS：</string>
     <string name="session_display_renderer_label">渲染器：</string>
     <string name="session_display_gpu_label">GPU：</string>
@@ -664,6 +734,9 @@
     <string name="session_gamepad_error_loading_profile">加载配置文件时出错</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">触摸屏控制</string>
+    <string name="input_controls_auto_hide_on_controller_title">连接手柄时自动隐藏</string>
+    <string name="input_controls_auto_hide_on_controller_summary">连接手柄时隐藏触摸屏控制</string>
     <string name="session_gyroscope_title">陀螺仪</string>
     <string name="session_gyroscope_calibrate">校准陀螺仪</string>
     <string name="session_gyroscope_enable_right_stick">启用右摇杆陀螺仪运动</string>
@@ -700,6 +773,7 @@
     <string name="settings_general_select_wallpaper">选择壁纸</string>
     <string name="settings_general_title">通用</string>
     <string name="settings_general_enable_file_provider">启用文件提供程序</string>
+    <string name="settings_general_enable_auto_scraping">启用自动抓取</string>
     <string name="settings_general_take_effect_next_startup">此选项将在下次启动时生效。</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">重新安装 Imagefs</string>
@@ -713,7 +787,7 @@
     <string name="settings_general_share_android_clipboard">与 Wine 共享 Android 剪贴板</string>
     <string name="settings_general_paths_title">路径设置</string>
     <string name="settings_general_paths_summary">管理 Winlator 存储工作数据的位置以及导出快捷方式的写入位置。</string>
-    <string name="settings_general_winlator_path_title">Winlator 路径</string>
+    <string name="settings_general_winlator_path_title">存储路径</string>
     <string name="settings_general_shortcut_export_path_title">快捷方式导出路径</string>
     <string name="settings_general_choose_path">选择路径</string>
     <string name="settings_general_xserver_cursor_summary">调整 XServer 会话中触摸、触控板和鼠标输入的指针速度。</string>
@@ -721,7 +795,9 @@
     <string name="settings_general_cursor_lock_summary">为需要原始指针输入的游戏保持直接鼠标捕获。按音量减键禁用。</string>
     <string name="settings_general_xinput_toggle_title">禁用 XInput</string>
     <string name="settings_general_xinput_toggle_summary">在需要独占鼠标和键盘控制时关闭 XInput 处理。</string>
-    <string name="settings_general_file_provider_summary">向 Android 文档选择器和文件管理器公开 Winlator 文件。</string>
+    <string name="settings_external_display_output_summary">将游戏移到已连接的外部显示器，而不是镜像此屏幕。眼镜始终使用自己的显示屏。</string>
+    <string name="settings_general_file_provider_summary">向 Android 文档选择器和文件管理器公开 WinNative 文件。</string>
+    <string name="settings_general_auto_scraping_summary">让 WinNative 自动抓取自定义游戏封面。</string>
     <string name="settings_general_open_browser_summary">在 Android 浏览器中打开支持的网页链接，而非在 Wine 内部打开。</string>
     <string name="settings_general_clipboard_summary">允许在 Android 和 Wine 会话之间复制和粘贴。</string>
     <string name="settings_general_imagefs_summary">恢复捆绑的系统文件而不删除现有容器。</string>
@@ -736,7 +812,7 @@
     <string name="settings_audio_sound_font_installed_failed">SoundFont 安装失败！</string>
     <string name="settings_audio_sound_font_already_exist">您要安装的 SoundFont 已存在。</string>
     <string name="settings_audio_unable_to_install_soundfont">无法安装 SoundFont</string>
-    <string name="settings_audio_installing_soundfont">正在安装 SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">正在安装 SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">SoundFont 格式错误。</string>
     <string name="settings_audio_cannot_remove_default">无法移除默认 SoundFont</string>
     <string name="settings_audio_summary">安装、移除和选择用于 MIDI 播放的 SoundFont。</string>
@@ -750,15 +826,33 @@
     <string name="settings_debug_box_logs_subtitle">将 Box86 和 Box64 调试输出写入文件</string>
     <string name="settings_debug_fex_logs_title">启用 FEXCore 日志</string>
     <string name="settings_debug_fex_logs_subtitle">将 FEXCore 调试输出写入文件</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX 模拟日志</string>
+    <string name="settings_debug_emulator_logs_subtitle">将容器使用的模拟器记录到文件。</string>
     <string name="settings_debug_steam_logs_title">启用 Steam 日志</string>
     <string name="settings_debug_steam_logs_subtitle">记录 Steam 认证和会话事件以便调试。</string>
     <string name="settings_debug_wine_channels_title">Wine 调试通道</string>
     <string name="settings_debug_wine_channels_summary">选择启用 Wine 调试日志时包含哪些 Wine 通道。</string>
+    <string name="settings_debug_wine_classes_title">Wine 日志级别</string>
+    <string name="settings_debug_wine_classes_summary">选择要记录的消息类型。Trace 非常详细。</string>
     <string name="settings_debug_input_logs">输入日志</string>
     <string name="settings_debug_input_logs_description">记录手柄、触摸和键盘输入事件</string>
     <string name="settings_debug_download_logs">下载日志</string>
     <string name="settings_debug_download_logs_description">记录下载解析器和 WinNative 回退事件</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan 验证层</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">重启显示以应用。</string>
     <string name="settings_debug_share_logs">分享日志</string>
+    <string name="settings_debug_delete_logs">删除日志</string>
+    <string name="settings_debug_share_all_logs_short">全部分享</string>
+    <string name="settings_debug_download_all_logs_short">全部下载</string>
+    <string name="settings_debug_logs_saved">已保存到 %1$s</string>
+    <string name="settings_debug_delete_logs_short">删除</string>
+    <string name="settings_debug_delete_all_logs_short">全部删除</string>
+    <string name="settings_debug_open_logs_folder_short">打开日志管理器</string>
+    <string name="settings_debug_logs_deleted">日志已删除</string>
+    <string name="settings_debug_delete_logs_confirm_title">删除日志？</string>
+    <string name="settings_debug_delete_logs_confirm_message">这将永久删除所有已保存的日志文件（%1$s）。此操作无法撤销。</string>
+    <string name="settings_debug_logs_browser_title">日志</string>
+    <string name="settings_debug_log_truncated">正在显示此日志的最后 %1$s</string>
     <string name="settings_debug_logs_subject">WinNative 日志 (%1$s)</string>
     <string name="settings_debug_no_logs_available">没有可用的调试日志。请先启用调试选项并启动游戏。</string>
     <string name="settings_debug_capture_failed">无法捕获日志：%1$s</string>
@@ -773,6 +867,8 @@
 
     <string name="settings_other_language_title">语言</string>
     <string name="settings_other_language_summary">选择显示语言</string>
+    <string name="settings_other_game_language_title">游戏语言</string>
+    <string name="settings_other_game_language_summary">Steam/Epic/GOG 下载的首选语言</string>
     <string name="settings_other_language_system_default">系统默认</string>
 
     <string name="settings_other_section_integration">集成</string>
@@ -790,7 +886,7 @@
     <string name="settings_content_empty_subtitle">安装一个包或切换类型以开始。</string>
     <string name="settings_content_container_created">已创建容器：%1$s</string>
     <string name="settings_content_download_failed">下载失败。</string>
-    <string name="common_ui_working">处理中…</string>
+    <string name="common_ui_working">处理中</string>
     <string name="settings_content_desc_wine">由 Wine 项目制作；将 Win32 调用转换为原生 Linux/Android 服务。</string>
     <string name="settings_content_desc_proton">由 Valve 制作；基于 Wine 的运行时，带有 Windows 游戏补丁。</string>
     <string name="settings_content_desc_dxvk">将 Direct3D 9、10 和 11 图形调用转换为 Vulkan。</string>
@@ -798,6 +894,7 @@
     <string name="settings_content_desc_box64">转换 x86_64 Linux 代码，使其可在 ARM64 设备上运行。</string>
     <string name="settings_content_desc_wowbox64">WoW64 使用的 Box64 构建，用于在 64 位 Wine 中运行 32 位 Windows 应用。</string>
     <string name="settings_content_desc_fexcore">转换 x86 和 x86_64 代码，使其可在 ARM64 设备上运行。</string>
+    <string name="settings_content_desc_d7vk">将 DirectDraw（Direct3D 7 及更早版本）图形调用转换为 Vulkan。</string>
     <string name="settings_content_unable_to_install">无法安装内容。</string>
     <string name="settings_content_install_failed">安装失败</string>
     <string name="settings_content_file_cannot_be_recognized">无法识别此文件。</string>
@@ -809,9 +906,14 @@
     <string name="settings_content_downloading_title">正在下载内容</string>
     <string name="settings_content_installing_title">正在安装内容</string>
     <string name="settings_content_extracting_title">正在解压内容</string>
-    <string name="settings_content_extracting_detail">正在解压…（%1$d 个文件）</string>
-    <string name="settings_content_preparing_package">正在准备包…</string>
+    <string name="settings_content_extracting_detail">正在解压（%1$d 个文件）</string>
+    <string name="settings_content_preparing_package">正在准备包</string>
     <string name="settings_content_download_complete">下载完成</string>
+    <string name="settings_content_already_installed_title">组件已安装</string>
+    <string name="settings_content_already_installed_message">此组件已安装。再次下载前请先移除已安装的副本。
+
+安装路径：
+%1$s</string>
     <string name="settings_content_conflicting_title">存在冲突的已安装内容</string>
     <string name="settings_content_conflicting_message">请在下载此包之前卸载冲突的内容。
 
@@ -820,7 +922,7 @@
     <string name="settings_content_cannot_be_trusted">内容不可信。</string>
     <string name="settings_content_is_incomplete">内容不完整。</string>
     <string name="settings_content_untrusted_files_warning">警告：附加内容包含不可信的文件。通常以下文件不应被修改。请决定是否继续安装。</string>
-    <string name="settings_content_confirm_remove">您要移除此内容吗？</string>
+    <string name="settings_content_confirm_remove">这会从您的设备中删除该组件。</string>
     <string name="settings_content_unable_to_remove_in_use">无法移除此内容，因为有容器正在使用此 Wine。</string>
     <string name="settings_content_download_in_components">未下载任何内容。请在组件中下载。</string>
     <string name="settings_content_types_header">内容类型</string>
@@ -832,9 +934,12 @@
     <string name="settings_drivers_install">安装驱动</string>
     <string name="settings_drivers_installed_success">驱动安装成功。</string>
     <string name="settings_drivers_install_failed">驱动安装失败。</string>
-    <string name="settings_drivers_confirm_remove">您要移除此驱动吗？</string>
+    <string name="settings_drivers_remove_title">移除驱动？</string>
+    <string name="settings_drivers_confirm_remove">这会从您的设备中删除该驱动。</string>
+    <string name="settings_drivers_remove_repo_title">移除仓库？</string>
+    <string name="settings_drivers_remove_repo_message">%1$s 将从您的仓库列表中移除。</string>
     <string name="settings_drivers_repo_tap_to_load">点击加载版本</string>
-    <string name="settings_drivers_repo_loading_releases">正在加载版本…</string>
+    <string name="settings_drivers_repo_loading_releases">正在加载版本</string>
     <string name="settings_drivers_repo_release_count">已加载 %1$d 个版本</string>
     <string name="settings_drivers_repo_no_release_assets">在获取的版本中未找到可下载的 ZIP 资源。</string>
     <string name="settings_drivers_repo_fetch_failed">无法加载 GitHub 版本。</string>
@@ -844,7 +949,7 @@
     <string name="settings_drivers_manager">驱动管理器</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">正在安装系统文件…</string>
+    <string name="setup_wizard_installing_system_files">正在安装系统文件</string>
     <string name="setup_wizard_unable_to_install_system_files">无法安装系统文件</string>
     <string name="setup_wizard_system_image_not_installed">系统镜像未安装。请先安装组件。</string>
     <string name="setup_wizard_recommended_components">推荐组件</string>
@@ -913,6 +1018,9 @@
     <string name="google_cloud_sync_started">云同步已开始。</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Google 服务</string>
+    <string name="google_auto_signin_title">启动时登录 Google</string>
+    <string name="google_auto_signin_summary">应用启动时自动连接到 Google Play 游戏，让存档备份和同步始终就绪。关闭后，应用绝不会自行登录。</string>
+    <string name="google_auto_signin_section">启动时</string>
     <string name="google_cloud_play_games">Google Play 游戏</string>
     <string name="google_cloud_status_syncing">同步中</string>
     <string name="google_cloud_status_connected">已连接</string>
@@ -971,22 +1079,30 @@
     <string name="saves_import_export_exported_failed">存档导出失败：%1$s</string>
     <string name="saves_import_export_imported">存档导入成功</string>
     <string name="saves_import_export_imported_failed">存档导入失败：%1$s</string>
+    <string name="saves_export_path_summary">存档将导出到 /WinNative/saves</string>
+    <string name="saves_export_success_path">已导出到 %1$s</string>
+    <string name="saves_export_warning_title">仅用于自定义游戏</string>
+    <string name="saves_export_warning_body">导出可能包含从商店安装或启用云同步的游戏存档。</string>
+    <string name="saves_import_warning_title">这将覆盖此容器中的现有存档</string>
+    <string name="saves_import_warning_body">还原包含多个游戏的旧备份时，请先使用文件管理器将较新的存档复制到该 zip 文件中。只有 .zip 中存在的存档会受到影响。请谨慎管理你的存档。</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">容器</string>
-    <string name="preloader_initializing">正在初始化…</string>
-    <string name="preloader_launching">正在启动…</string>
-    <string name="preloader_closing">正在关闭 %1$s…</string>
-    <string name="preloader_setup_environment">正在设置环境…</string>
-    <string name="preloader_installing_mono">正在安装 Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">正在安装运行库…</string>
-    <string name="preloader_unpacking_exe">正在解压游戏可执行文件…</string>
-    <string name="preloader_downloading_cloud">正在下载云存档…</string>
-    <string name="preloader_syncing_cloud">正在同步云存档…</string>
-    <string name="preloader_cloud_downloading">云同步下载中…</string>
-    <string name="preloader_cloud_backup">正在备份存档到 Google 云端硬盘…</string>
+    <string name="preloader_initializing">正在初始化</string>
+    <string name="preloader_launching">正在启动</string>
+    <string name="preloader_closing">正在关闭 %1$s</string>
+    <string name="preloader_setup_environment">正在设置环境</string>
+    <string name="preloader_retrying_steam_client_download">正在重试下载 Steam 客户端</string>
+    <string name="preloader_installing_mono">正在安装 Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">正在安装运行库</string>
+    <string name="preloader_unpacking_exe">正在解压游戏可执行文件</string>
+    <string name="preloader_downloading_cloud">正在下载云存档</string>
+    <string name="preloader_syncing_cloud">正在同步云存档</string>
+    <string name="preloader_uploading_cloud">正在上传云存档</string>
+    <string name="preloader_checking_cloud">正在检查云存档</string>
+    <string name="preloader_cloud_sync_retry">%1$s 重试 %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">云同步下载中</string>
     <string name="cloud_sync_failed_provider">%1$s 云同步失败。</string>
-    <string name="google_cloud_backup_failed">Google 云端硬盘备份失败。</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">图形</string>
-    <string name="container_backups_title">备份</string>
-    <string name="container_backups_prompt">选择对此容器备份执行的操作。</string>
-    <string name="container_backups_backing_up">正在备份容器…</string>
-    <string name="container_backups_restoring">正在恢复容器…</string>
-    <string name="container_backups_checking">正在检查容器备份…</string>
-    <string name="container_backups_select_title">选择要恢复的备份</string>
-    <string name="container_backups_no_files">未在 Google Drive 中找到容器备份。</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">主要绑定</string>
     <string name="binding_secondary">次要绑定</string>
+    <string name="binding_third">第三绑定</string>
+    <string name="binding_fourth">第四绑定</string>
     <string name="input_controls_editor_tap_to_switch">点按切换</string>
     <string name="input_controls_editor_download_profile">下载配置文件</string>
     <string name="container_config_emulator_section">模拟器</string>
@@ -1010,6 +1122,7 @@
     <string name="session_drawer_fps_monitor">FPS 监视器</string>
     <string name="session_drawer_fps_monitor_subtitle">显示实时性能统计信息</string>
     <string name="session_drawer_dual_series_battery">Dual Series 电量</string>
+    <string name="session_drawer_hud_frametime_numeric">将帧时间显示为数字</string>
     <string name="session_drawer_command_center">控制中心</string>
     <string name="session_drawer_command_center_input">输入</string>
     <string name="session_drawer_command_center_display">显示</string>
@@ -1022,7 +1135,6 @@
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">自然</string>
     <string name="session_drawer_color_profile_crt">CRT 效果</string>
-    <string name="session_drawer_upscaler_dls">鲜艳</string>
     <string name="session_drawer_calibrate_advanced">高级校准</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">陀螺仪</string>
@@ -1034,7 +1146,6 @@
     <string name="session_drawer_rail_label_mouse">鼠标</string>
     <string name="session_drawer_rail_label_fullscreen">全屏</string>
     <string name="session_drawer_rail_label_pip">画中画</string>
-    <string name="session_drawer_rail_label_native">原生</string>
     <string name="session_drawer_rail_label_magnifier">缩放</string>
     <string name="session_drawer_rail_label_task_manager">任务</string>
     <string name="session_drawer_rail_label_logs">日志</string>
@@ -1048,24 +1159,23 @@
     <string name="session_drawer_logs_share_chooser">分享会话日志</string>
     <string name="session_drawer_logs_share_failed">无法分享日志</string>
     <string name="session_drawer_logs_share_empty">没有可分享的日志行</string>
-    <string name="session_drawer_super_resolution">锐化滤镜</string>
-    <string name="session_drawer_upscaler_mode">滤镜</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">超分辨率</string>
+    <string name="session_drawer_upscaler_mode">升尺度器</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">鲜艳</string>
+    <string name="session_drawer_vivid_strength">鲜艳强度</string>
     <string name="session_drawer_main_menu_title">菜单</string>
     <string name="session_gyroscope_activator">激活器</string>
     <string name="settings_general_check_for_updates">检查更新</string>
     <string name="settings_general_check_for_updates_summary">在启动时和定期自动检查新版本。</string>
     <string name="setup_wizard_containers">容器设置</string>
-    <string name="google_cloud_auto_backup">云同步自动备份</string>
-    <string name="google_cloud_auto_backup_summary">每次退出游戏时自动将游戏存档备份到 Google Drive。</string>
     <string name="cloud_saves_title">云存档</string>
-    <string name="cloud_saves_backup">备份云存档</string>
-    <string name="cloud_saves_restore">恢复云存档</string>
+    <string name="cloud_saves_title_for_provider">%1$s 云存档 - %2$s</string>
     <string name="cloud_sync_title">云同步</string>
     <string name="cloud_sync_enabled_summary">启动时下载云存档，并在退出时同步/备份。</string>
     <string name="cloud_sync_disabled_summary">启动此游戏时不下载云存档，也不在退出时同步。</string>
-    <string name="cloud_saves_backing_up">正在备份云存档…</string>
-    <string name="cloud_saves_restoring">正在恢复云存档…</string>
+    <string name="cloud_saves_backing_up">正在备份云存档</string>
+    <string name="cloud_saves_restoring">正在恢复云存档</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">控制在多次运行之间缓存生成的动态重编译块，以加快启动速度。</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1282 @@
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">暂无已备份的历史存档。被替换的存档和手动备份将在此处保留 30 天。</string>
+    <string name="cloud_saves_history_loading">正在加载存档历史\u2026</string>
+    <string name="cloud_saves_history_origin_auto">自动</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">云端</string>
+    <string name="cloud_saves_history_origin_local">本地</string>
+    <string name="cloud_saves_history_origin_manual">手动</string>
+    <string name="cloud_saves_history_refresh">刷新</string>
+    <string name="cloud_saves_history_rename">重命名</string>
+    <string name="cloud_saves_history_rename_clear">清除</string>
+    <string name="cloud_saves_history_rename_failed">无法重命名备份。</string>
+    <string name="cloud_saves_history_rename_hint">例如：Boss 战、结局前</string>
+    <string name="cloud_saves_history_rename_save">保存</string>
+    <string name="cloud_saves_history_rename_success">备份已重命名。</string>
+    <string name="cloud_saves_history_rename_title">为此备份命名</string>
+    <string name="cloud_saves_history_restore">还原</string>
+    <string name="cloud_saves_history_restore_confirm_body">此操作将把当前本地存档替换为来自 %1$s 的备份。</string>
+    <string name="cloud_saves_history_restore_confirm_title">还原此备份？</string>
+    <string name="cloud_saves_history_restore_failed">无法还原此备份。</string>
+    <string name="cloud_saves_history_restore_success">已从备份还原存档。</string>
+    <string name="cloud_saves_history_sign_in">登录 Google 以查看存档历史。</string>
+    <string name="cloud_saves_history_title">存档历史</string>
+    <string name="cloud_saves_history_download">下载</string>
+    <string name="cloud_saves_history_download_success">文件已下载。</string>
+    <string name="cloud_saves_history_download_failed">下载失败。</string>
+    <string name="cloud_saves_keep_replaced_backup">保留被替换存档的备份</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">如果您改变主意，可从存档历史中还原。</string>
+    <string name="cloud_saves_no_backups">此游戏暂无备份。</string>
+    <string name="cloud_saves_offline_mode">禁用云同步</string>
+    <string name="cloud_saves_offline_mode_summary">停止此游戏的所有自动云端活动。</string>
+    <string name="cloud_saves_sync_from_provider">从 %1$s 云端同步</string>
+    <string name="cloud_saves_sync_from_provider_failed">无法从 %1$s 下载存档。</string>
+    <string name="cloud_saves_gog_manage_label">管理 GOG 云存档</string>
+    <string name="cloud_saves_gog_manage_helper">打开 GOG 官方网站</string>
+    <string name="cloud_saves_gog_manage_no_browser">没有可用的浏览器来打开 GOG 云存档页面</string>
+    <string name="cloud_saves_gog_zip_label">下载 GOG 云端 Zip</string>
+    <string name="cloud_saves_gog_zip_helper">保存当前云端文件</string>
+    <string name="cloud_saves_gog_zip_success">GOG 云存档 zip 已保存。</string>
+    <string name="cloud_saves_gog_zip_failed">无法保存 GOG 云存档 zip。</string>
+    <string name="cloud_saves_gog_zip_empty">未找到 GOG 云存档文件。</string>
+    <string name="cloud_saves_sync_from_provider_generic">从云端同步</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s 云端存档已下载。</string>
+    <string name="cloud_saves_syncing_from_provider">正在从 %1$s 下载存档\u2026</string>
+    <string name="cloud_saves_sync_summary">拉取 %1$s 当前的版本。</string>
+    <string name="cloud_saves_sync_summary_generic">拉取当前云端版本。</string>
+    <string name="common_ui_exit_app_confirm">退出 WinNative？</string>
+    <string name="container_surface_effect">画面效果</string>
+    <string name="downloads_queue_cancel_download_confirm">取消 %1$s 的下载并删除所有已下载文件？</string>
+    <string name="downloads_queue_paused_resume_hint">已暂停 - 点击"继续"以恢复</string>
+    <string name="downloads_queue_phase_applying_data">正在应用数据</string>
+    <string name="downloads_queue_phase_downloading">正在下载</string>
+    <string name="downloads_queue_phase_downloading_file">正在下载 [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">正在收尾</string>
+    <string name="downloads_queue_phase_patching">正在打补丁</string>
+    <string name="downloads_queue_phase_preparing">正在准备</string>
+    <string name="downloads_queue_phase_queued">队列中</string>
+    <string name="downloads_queue_phase_unknown">未知</string>
+    <string name="downloads_queue_phase_unpacking">正在解压</string>
+    <string name="downloads_queue_phase_updating">正在更新</string>
+    <string name="downloads_queue_phase_verifying">正在验证</string>
+    <string name="downloads_queue_phase_verifying_file">正在验证 [%1$s]</string>
+    <string name="downloads_queue_status_label">状态：</string>
+    <string name="downloads_queue_this_game">此游戏</string>
+    <string name="hud_position_bottom_center">底部居中</string>
+    <string name="hud_position_bottom_left">左下角</string>
+    <string name="hud_position_bottom_right">右下角</string>
+    <string name="hud_position_left_center">左侧居中</string>
+    <string name="hud_position_menu_title">移动 HUD 至</string>
+    <string name="hud_position_right_center">右侧居中</string>
+    <string name="hud_position_top_center">顶部居中</string>
+    <string name="hud_position_top_left">左上角</string>
+    <string name="hud_position_top_right">右上角</string>
+    <string name="input_controls_editor_number_of_bindings">绑定数量</string>
+    <string name="input_controls_editor_opacity">不透明度</string>
+    <string name="input_controls_editor_radial_menu">径向菜单</string>
+    <string name="input_controls_editor_radial_menu_options">径向菜单选项</string>
+    <string name="input_controls_tap_to_click">轻触点击</string>
+    <string name="input_controls_reverse_binding_order">反向绑定顺序</string>
+    <string name="num_controllers">手柄数量</string>
+    <string name="session_drawer_controls_section">控制</string>
+    <string name="session_drawer_header_subtitle">快速访问控制、悬浮层和会话工具</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">设置 Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">开启悬浮层后即可自定义</string>
+    <string name="session_drawer_hud_elements">HUD 元素</string>
+    <string name="session_drawer_hud_input_hint">输入 %1$d 至 %2$d 之间的值，超出范围将被自动截断。</string>
+    <string name="session_drawer_hud_scale">缩放</string>
+    <string name="session_drawer_hud_scale_input_title">设置缩放</string>
+    <string name="session_drawer_hud_summary">调整悬浮层可见性与数据点</string>
+    <string name="session_drawer_screen_effects">屏幕效果</string>
+    <string name="session_drawer_session_section">会话</string>
+    <string name="session_drawer_swipe_hint">向外滑动即可返回游戏</string>
+    <string name="session_gamepad_enable_vibration">启用振动</string>
+    <string name="session_gyroscope_experimental_mouse_movement">实验性鼠标移动</string>
+    <string name="session_gyroscope_mouse_scale">鼠标缩放</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">鼠标缩放：%1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">再次打开设置向导，检查权限、系统文件和默认容器。</string>
+    <string name="settings_other_setup_wizard_title">设置向导</string>
+    <string name="shortcuts_library_artwork_failed">加载所选图片失败。</string>
+    <string name="shortcuts_library_artwork_open_source">打开 SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">设置图片</string>
+    <string name="shortcuts_library_artwork_title">库封面</string>
+    <string name="shortcuts_library_artwork_icon_title">图标图片</string>
+    <string name="shortcuts_library_artwork_hero_title">背景</string>
+    <string name="shortcuts_list_readded_existing">已重新添加现有快捷方式</string>
+    <string name="shortcuts_properties_runtime_patcher">运行时 DRM 破解器</string>
+    <string name="shortcuts_properties_runtime_patcher_description">启动时注入 DRM 补丁 DLL。会降低 FPS——仅在单独使用旧版启动器失败时使用。</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">选择存档文件夹</string>
+    <string name="cloud_saves_custom_folder_label">存档文件夹</string>
+    <string name="cloud_saves_custom_select_folder_summary">指向容器内的存档目录</string>
+    <string name="cloud_saves_custom_no_container">此快捷方式没有可用容器</string>
+    <string name="cloud_saves_custom_picker_title">选择存档文件夹</string>
+    <string name="cloud_saves_custom_outside_drive_c">所选文件夹必须位于容器的 C: 盘内</string>
+    <string name="cloud_saves_custom_path_map_failed">无法将所选文件夹映射为 Windows 路径。</string>
+    <string name="cloud_saves_custom_folder_set">存档文件夹已设为 %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">从 Steam Cloud 同步</string>
+    <string name="cloud_saves_steam_sync_helper">下载最新存档</string>
+    <string name="cloud_saves_steam_sync_success">已从 Steam Cloud 同步</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud 同步失败</string>
+    <string name="cloud_saves_steam_browse_label">查看 Steam Cloud 存档</string>
+    <string name="cloud_saves_steam_browse_helper">打开云存储</string>
+    <string name="cloud_saves_steam_browse_no_browser">没有可用于打开 Steam 页面浏览器</string>
+    <string name="cloud_saves_steam_import_label">导入文件</string>
+    <string name="cloud_saves_steam_import_helper">恢复已下载的文件</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">文件选择器不可用</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">这将下载 Steam Cloud 当前的存档文件，并覆盖当前存档文件。</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">应用 ID 无效</string>
+    <string name="cloud_saves_label_saved">标签已保存</string>
+    <string name="downloads_queue_cancel_all_title">取消所有下载？</string>
+    <string name="downloads_queue_cancel_all_warning">取消 DLC、游戏或更新下载可能会损坏你的游戏安装。\n\n确定要取消所有下载并删除目前已下载的文件吗？</string>
+    <string name="shortcuts_properties_use_legacy_launcher">使用旧版启动器</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">旧版 Steam 模拟：通过 ColdClient 启动器运行游戏，并从 exe 中移除 SteamStub DRM。仅用于无法使用 Steam Launcher 的旧游戏。</string>
+    <string name="steam_section_real_client">WinNative 真实 Steam 客户端</string>
+    <string name="steam_section_emulator">旧版 Steam 模拟器</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">让模拟的 Steam 客户端报告为离线，这样游戏就不会尝试在线连接。适用于在 Steam 网络检查时卡住的游戏。</string>
+    <string name="input_controls_select_style">选择样式</string>
+    <string name="input_controls_style_original">原版</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">石板</string>
+    <string name="input_controls_style_halo">光环</string>
+    <string name="input_controls_style_glint">微光</string>
+    <string name="input_controls_style_shadow">暗影</string>
+    <string name="input_controls_style_reticle">准星</string>
+    <string name="input_controls_style_neon">霓虹</string>
+    <string name="input_controls_style_lumina">流光</string>
+    <string name="input_controls_accent_theme">颜色主题</string>
+    <string name="input_controls_edit_duplicating_builtin">内置配置文件 - 已创建可编辑副本。</string>
+    <string name="input_controls_editor_confirm_reset_profile">将此配置文件重置为原始布局？你所做的任何更改都会丢失。</string>
+    <string name="input_controls_editor_profile_reset">配置文件已重置为原始布局。</string>
+    <string name="input_controls_editor_reset_unavailable">此配置文件没有可用的原始快照。</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan 显示同步</string>
+    <string name="cloud_sync_disable_title">禁用云存档</string>
+    <string name="cloud_saves_steam_push_label">推送到 Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">强制上传本地存档</string>
+    <string name="cloud_saves_steam_push_success">存档已推送到 Steam Cloud。</string>
+    <string name="cloud_saves_steam_push_failed">无法将存档推送到 Steam Cloud。</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud 目前无法访问。正在后台重新连接重新上线后点按刷新。</string>
+    <string name="steam_session_refused_event">Steam 拒绝了缓存的会话 (EResult=%1$d)。请重新登录。</string>
+    <string name="settings_hud_record_to_file_title">将性能记录到文件</string>
+    <string name="settings_hud_record_to_file_summary">游戏过程中每秒将 FPS、CPU、GPU、温度和电池指标导出到 /WinNative/logs/。</string>
+    <string name="settings_leaderboard_category">性能</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">正在准备 Steam 环境</string>
+    <string name="preloader_starting_wine">正在启动 Wine</string>
+    <string name="preloader_starting_steam_launcher">正在启动 Steam Launcher</string>
+    <string name="preloader_loading_steam_client">正在加载 Steam 客户端</string>
+    <string name="preloader_connecting_to_steam">正在连接 Steam</string>
+    <string name="preloader_signing_in_to_steam">正在登录 Steam</string>
+    <string name="preloader_fetching_game_info">已登录 — 正在获取游戏信息</string>
+    <string name="preloader_steam_ready">Steam 已就绪</string>
+    <string name="preloader_updating_game_info">正在更新游戏信息</string>
+    <string name="preloader_verifying_install">正在验证安装</string>
+    <string name="preloader_scanning_redists">正在扫描运行库</string>
+    <string name="preloader_installing_redist_single">正在安装运行库</string>
+    <string name="preloader_installing_named_redist">正在安装 %1$s</string>
+    <string name="preloader_installing_named_redist_progress">正在安装 %1$s（%2$s）</string>
+    <string name="preloader_redists_ready">运行库已就绪</string>
+    <string name="preloader_no_redists">没有要安装的运行库</string>
+    <string name="preloader_steam_service_running">Steam 服务正在运行</string>
+    <string name="preloader_launching_game">正在启动 %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher 失败 — 正在重新准备资源</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher 无法启动。正在重新准备资源 — 请重新启动</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher 已到达游戏，但游戏未启动</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">正在加载 Workshop 项目</string>
+    <string name="workshop_search_items">搜索 Workshop 项目</string>
+    <string name="workshop_title">STEAM 创意工坊</string>
+    <string name="workshop_loading_subtitle">正在从 Steam 获取您订阅的物品。</string>
+    <string name="workshop_error_title">无法加载创意工坊物品</string>
+    <string name="workshop_error_subtitle">出错了。请重试。</string>
+    <string name="workshop_empty_title">没有已订阅的创意工坊物品</string>
+    <string name="workshop_empty_subtitle">在 Steam 创意工坊订阅物品，然后重新打开此窗口。</string>
+    <string name="workshop_search_empty_title">没有与 \"%1$s\" 匹配的物品</string>
+    <string name="workshop_search_empty_subtitle">请尝试其他搜索词。</string>
+    <string name="workshop_clear_search">清除搜索</string>
+    <string name="workshop_item_fallback">创意工坊物品</string>
+    <string name="common_ui_failed">失败</string>
+    <string name="steam_presence_snooze">小憩</string>
+    <string name="steam_presence_busy">忙碌</string>
+    <string name="steam_presence_looking_to_trade">想交易</string>
+    <string name="steam_presence_looking_to_play">想一起玩</string>
+    <string name="steam_friends_count">好友 — %1$d 在线</string>
+    <string name="steam_friends_section_in_game">游戏中 (%1$d)</string>
+    <string name="steam_friends_section_online">在线 (%1$d)</string>
+    <string name="steam_friends_section_offline">离线 (%1$d)</string>
+    <string name="steam_friends_none_loaded">尚未加载好友。</string>
+    <string name="steam_friends_chat_off">聊天已关闭。重新开启聊天服务以查看好友。</string>
+    <string name="steam_friends_self_you">你</string>
+    <string name="steam_friends_in_game">游戏中</string>
+    <string name="steam_friends_join">加入</string>
+    <string name="steam_friends_play">开始游戏</string>
+    <string name="steam_chat_image_failed">（图片发送失败）</string>
+    <string name="steam_chat_empty">还没有消息。打个招呼吧！</string>
+    <string name="steam_chat_uploading_image">正在上传图片…</string>
+    <string name="steam_chat_send_image">发送图片</string>
+    <string name="steam_chat_message_hint">消息…</string>
+    <string name="steam_chat_send">发送</string>
+    <string name="steam_chat_image">图片</string>
+    <string name="steam_common_back">返回</string>
+    <string name="steam_achievements_title">成就</string>
+    <string name="steam_achievements_empty">未找到此游戏的成就，\n或登录 Steam 以加载它们。</string>
+    <string name="steam_achievements_hidden">隐藏成就</string>
+    <string name="steam_achievements_hidden_desc">继续游戏以揭示此成就。</string>
+    <string name="steam_achievements_unlocked_on">已解锁 %1$s</string>
+    <string name="steam_achievements_unlocked">已解锁</string>
+    <string name="steam_join_joining">正在加入 %1$s 的 %2$s…</string>
+    <string name="steam_join_install">安装 %1$s 以加入 %2$s</string>
+    <string name="steam_join_not_owned">你未拥有 %1$s</string>
+    <string name="steam_chat_not_sent">（未发送）</string>
+    <string name="steam_join_the_game">游戏</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">聊天服务</string>
+    <string name="steam_chat_setting_service_desc">登录以使用好友和聊天；关闭则显示为离线。</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">输出</string>
+    <string name="display_output_prompt_title">检测到外部显示器</string>
+    <string name="display_output_prompt_message">将游戏发送到已连接的显示器？你的屏幕控制和菜单仍保留在本手机上。</string>
+    <string name="display_output_prompt_swap">切换显示器</string>
+    <string name="display_output_prompt_mirror">镜像</string>
+    <string name="display_output_swapped_toast">游戏已移至外部显示器。控制仍保留在你的手机上。</string>
+    <string name="display_output_cast_unavailable">此设备上无法使用无线显示设置。</string>
+    <string name="display_output_restored_toast">外部显示器已断开——游戏已返回手机。</string>
+    <string name="session_drawer_output_title">显示输出</string>
+    <string name="session_drawer_output_subtitle">游戏正在外部显示器上显示。</string>
+    <string name="session_drawer_output_device">已连接的显示器</string>
+    <string name="session_drawer_output_resolution">分辨率</string>
+    <string name="session_drawer_output_refresh_rate">刷新率</string>
+    <string name="session_drawer_output_aspect_ratio">宽高比</string>
+    <string name="session_drawer_output_aspect_fit">适应（按比例）</string>
+    <string name="session_drawer_output_aspect_stretch">拉伸（填满）</string>
+    <string name="session_drawer_output_aspect_zoom">缩放（裁剪）</string>
+    <string name="session_drawer_output_return_to_phone">返回手机</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">投射到电视</string>
+    <string name="session_drawer_output_cast_body">连接 USB-C / HDMI 适配器，或点按下方连接无线显示器（Miracast / Wi-Fi Direct）。游戏将在电视上显示，而这些控制仍保留在你的手机上。</string>
+    <string name="session_drawer_output_cast_button">连接无线显示器</string>
+    <string name="session_drawer_output_cast_note">仅支持 Chromecast 的电视无法以私有控制显示实时游戏画面——为获得最佳效果，请使用无线显示器或 USB‑C/HDMI 适配器。</string>
+    <string name="session_drawer_output_render_note">显示器报告的模式会改变其实际输出（重新初始化时可能短暂黑屏）。其他分辨率会以该尺寸渲染并由硬件缩放到面板——高于原生更清晰（超采样），低于原生更流畅。</string>
+    <string name="session_drawer_output_scaling_note">此手机以原生 %1$s 输出显示，且不会切换模式，因此这里设置的是渲染分辨率 —— 会由硬件缩放到面板（高于原生更锐利，低于原生更流畅）。</string>
+    <string name="session_drawer_output_game_mode">游戏模式（低延迟）</string>
+    <string name="session_drawer_output_game_mode_on">开</string>
+    <string name="session_drawer_output_game_mode_off">关</string>
+    <string name="session_drawer_output_game_mode_note">请求电视的游戏/低延迟模式（HDMI ALLM）以尽量减少输入延迟。仅在已连接的显示器支持时显示。</string>
+    <string name="session_drawer_output_send_to_display">将游戏发送到显示器</string>
+    <string name="session_drawer_output_to_display">输出到外部显示器</string>
+    <string name="session_drawer_output_send_note">已连接显示器。将游戏发送到该显示器——你的控制和菜单仍保留在本手机上。你可以随时将其取回这里。</string>
+    <string name="session_drawer_output_display">显示</string>
+    <string name="session_drawer_output_glasses">眼镜</string>
+    <string name="session_drawer_output_brightness">亮度</string>
+    <string name="session_drawer_output_shade">遮光（变暗）</string>
+    <string name="session_drawer_output_3d">3D（左右）</string>
+    <string name="glasses_panel_refresh">刷新率</string>
+    <string name="glasses_panel_sunblock">遮光</string>
+    <string name="session_drawer_output_volume">音量</string>
+    <string name="session_drawer_output_glasses_note">通过 USB 直接发送到你的 Viture 眼镜。</string>
+
+    <!-- Touch Input & Gesture Profiles -->
+    <string name="common_ui_new">新建</string>
+    <string name="common_ui_rename">重命名</string>
+    <string name="gesture_profile_export">导出手势配置文件</string>
+    <string name="gesture_profile_import">导入手势配置文件</string>
+    <string name="gesture_profile_new">新建手势配置文件</string>
+    <string name="gesture_profile_none">没有手势配置文件</string>
+    <string name="input_controls_editor_input_profiles_section">输入配置文件</string>
+    <string name="session_drawer_right_stick_sensitivity">右摇杆灵敏度</string>
+    <string name="session_drawer_rts_gestures">RTS 手势</string>
+    <string name="session_drawer_rts_gestures_edit">编辑</string>
+    <string name="session_drawer_touch">触摸</string>
+    <string name="session_drawer_touch_map_right_stick">映射到右摇杆</string>
+    <string name="session_drawer_touch_touchscreen">触摸屏模式</string>
+    <string name="session_drawer_touch_trackpad">触控板</string>
+    <string name="session_gesture_profile_section">手势配置文件</string>
+    <string name="session_rts_action">操作</string>
+    <string name="session_rts_behavior">行为</string>
+    <string name="session_rts_double_tap">双击（双击左键）</string>
+    <string name="session_rts_double_tap_delay">双击延迟 (ms)</string>
+    <string name="session_rts_down">下</string>
+    <string name="session_rts_drag">单指拖动</string>
+    <string name="session_rts_pan1">单指平移</string>
+    <string name="session_rts_drag2">双指拖动</string>
+    <string name="session_rts_drag_threshold">拖动阈值 (px)</string>
+    <string name="session_rts_gesture_threshold">手势阈值 (px)</string>
+    <string name="session_rts_hold2">双指长按</string>
+    <string name="session_rts_hold3">三指长按</string>
+    <string name="session_rts_hold4">四指长按</string>
+    <string name="session_rts_hold_delay">长按延迟 (ms)</string>
+    <string name="session_rts_left">左</string>
+    <string name="session_rts_long_press">长按</string>
+    <string name="session_rts_long_press_delay">长按延迟 (ms)</string>
+    <string name="session_rts_pan">双指平移</string>
+    <string name="session_rts_pan_threshold">平移/缩放起始 (px)</string>
+    <string name="session_rts_right">右</string>
+    <string name="session_rts_swipe3">三指滑动</string>
+    <string name="session_rts_swipe4">四指滑动</string>
+    <string name="session_rts_swipe_threshold">滑动阈值 (px)</string>
+    <string name="session_rts_tap1">单指点按</string>
+    <string name="session_rts_tap2">双指点按</string>
+    <string name="session_rts_tap3">三指点按</string>
+    <string name="session_rts_tap4">四指点按</string>
+    <string name="session_rts_up">上</string>
+    <string name="session_rts_zoom">捏合缩放</string>
+    <string name="session_drawer_brightness">亮度</string>
+    <string name="session_drawer_contrast">对比度</string>
+    <string name="session_drawer_gamma">伽马</string>
+    <string name="session_drawer_saturation">饱和度</string>
+    <string name="session_drawer_temperature">色温</string>
+    <string name="session_drawer_tint">色调</string>
+    <string name="session_drawer_intensity">强度</string>
+    <string name="session_drawer_strength">力度</string>
+    <string name="session_drawer_sharpen">锐化</string>
+    <string name="session_drawer_scanlines">扫描线</string>
+    <string name="session_drawer_pixelate">像素化</string>
+    <string name="session_drawer_block_size">块大小</string>
+    <string name="session_drawer_scale">缩放</string>
+    <string name="session_drawer_scale_nearest">最近邻</string>
+    <string name="session_drawer_scale_linear">线性</string>
+    <string name="session_drawer_scale_bicubic">双三次</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">卡通</string>
+    <string name="session_drawer_color_blind">色盲</string>
+    <string name="session_drawer_color_blind_protan">红色盲</string>
+    <string name="session_drawer_color_blind_deutan">绿色盲</string>
+    <string name="session_drawer_color_blind_tritan">蓝色盲</string>
+    <string name="session_drawer_reset_effects">重置效果</string>
+    <string name="session_drawer_hud_background">背景</string>
+    <string name="session_drawer_hud_background_alpha">背景透明度</string>
+    <string name="session_drawer_hud_background_alpha_input_title">设置背景透明度</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">调整大小</string>
+    <string name="session_task_bring_to_front">置于顶层</string>
+    <string name="session_task_custom_value">自定义值</string>
+    <string name="session_gyroscope_orientation_mode">倾斜瞄准（方向）</string>
+    <!-- File manager -->
+    <string name="file_manager_title">文件</string>
+    <string name="file_manager_copy">复制</string>
+    <string name="file_manager_cut">剪切</string>
+    <string name="file_manager_paste">粘贴</string>
+    <string name="file_manager_paste_here">粘贴到此处</string>
+    <string name="file_manager_new_folder">新建文件夹</string>
+    <string name="file_manager_new_folder_short">文件夹</string>
+    <string name="file_manager_multi_select">多选</string>
+    <string name="file_manager_create">创建</string>
+    <string name="file_manager_delete">删除</string>
+    <string name="file_manager_copy_count">复制 (%1$d)</string>
+    <string name="file_manager_cut_count">剪切 (%1$d)</string>
+    <string name="file_manager_delete_count">删除 (%1$d)</string>
+    <string name="file_manager_extract">解压</string>
+    <string name="file_manager_extract_here">解压到此处</string>
+    <string name="file_manager_extract_to">解压到…</string>
+    <string name="file_manager_extracting">正在解压 %1$s</string>
+    <string name="file_manager_extract_failed">解压失败</string>
+    <string name="file_manager_run_boot">运行 / 启动</string>
+    <string name="file_manager_create_shortcut">创建快捷方式</string>
+    <string name="file_manager_run_in_container">在容器中运行</string>
+    <string name="file_manager_no_containers">没有可用的容器</string>
+    <string name="file_manager_delete_confirm">删除 \"%1$s\"？此操作无法撤消。</string>
+    <string name="file_manager_delete_confirm_multi">删除 %1$d 个项目？此操作无法撤消。</string>
+    <string name="file_manager_copying">正在复制 %1$s</string>
+    <string name="file_manager_moving">正在移动 %1$s</string>
+    <string name="file_manager_copying_count">正在复制 %1$d 个项目</string>
+    <string name="file_manager_moving_count">正在移动 %1$d 个项目</string>
+    <string name="file_manager_paste_into_itself">无法将文件夹粘贴到其自身</string>
+    <string name="file_manager_operation_failed">操作失败</string>
+    <string name="file_manager_delete_failed">删除失败</string>
+    <string name="file_manager_rename_failed">重命名失败</string>
+    <string name="file_manager_create_folder_failed">创建文件夹失败</string>
+    <string name="cloud_saves_google_backup_helper">将副本保存到 Google Play 游戏</string>
+    <string name="cloud_saves_google_backup_label">备份到 Google</string>
+    <string name="cloud_saves_google_backup_no_save">未找到可备份的存档文件。</string>
+    <string name="cloud_saves_history_cloud_readonly">只读</string>
+    <string name="session_drawer_rail_label_record">录制</string>
+    <string name="session_record_failed">无法开始录制</string>
+    <string name="session_record_fps">帧率</string>
+    <string name="session_record_include_ui">录制界面</string>
+    <string name="session_record_include_ui_subtitle">包含 HUD 和屏幕控件</string>
+    <string name="session_record_now">立即录制</string>
+    <string name="session_record_quality">质量</string>
+    <string name="session_record_resolution">分辨率</string>
+    <string name="session_record_saved">录制已保存到 WinNative/Recordings</string>
+    <string name="session_record_settings_title">录制设置</string>
+    <string name="session_record_started">已开始录制</string>
+    <string name="steam_chat_setting_stay_running">在后台运行</string>
+    <string name="steam_chat_setting_stay_running_desc">退出 WinNative 后保持聊天运行</string>
+    <string name="settings_content_refresh">刷新</string>
+    <string name="settings_retro_title">复古</string>
+    <string name="retro_save_transfer_title">传输存档</string>
+    <string name="retro_save_transfer_message">为此游戏导入本地存档，或导出当前存档。</string>
+    <string name="retro_save_transfer_import">导入存档</string>
+    <string name="retro_save_transfer_export">导出存档</string>
+    <string name="retro_save_transfer_import_ok">存档已导入</string>
+    <string name="retro_save_transfer_import_failed">无法导入存档</string>
+    <string name="retro_save_transfer_export_ok">存档已导出</string>
+    <string name="retro_save_transfer_export_failed">无法导出存档</string>
+    <string name="retro_save_transfer_none">此游戏尚无存档</string>
+    <string name="retro_cheats_title">金手指</string>
+    <string name="retro_cheats_hardcore_blocked">硬核模式下已禁用金手指</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">保存</string>
+    <string name="retro_ps2_cancel">取消</string>
+    <string name="retro_ps2_save_state">保存即时存档</string>
+    <string name="retro_ps2_load_save_state">加载即时存档</string>
+    <string name="retro_ps2_achievements">成就</string>
+    <string name="retro_ps2_cheats">金手指</string>
+    <string name="retro_ps2_memory_cards">记忆卡</string>
+    <string name="retro_ps2_fast_forward">快进</string>
+    <string name="retro_ps2_reset">重置</string>
+    <string name="retro_ps2_swap_disc">更换光盘</string>
+    <string name="retro_ps2_slot">插槽 %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">点按加载</string>
+    <string name="retro_ps2_slot_empty">空</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">点按覆盖</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">空 — 点按保存</string>
+    <string name="retro_ps2_slot_is_empty">插槽 %1$d 为空</string>
+    <string name="retro_ps2_loaded_slot">已加载插槽 %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">无法加载插槽 %1$d</string>
+    <string name="retro_ps2_saved_to_slot">已保存至插槽 %1$d</string>
+    <string name="retro_ps2_save_failed">保存失败</string>
+    <string name="retro_ps2_slot_1_suffix">  •  插槽 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  插槽 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  点按使用</string>
+    <string name="retro_ps2_new_memory_card">新建记忆卡</string>
+    <string name="retro_ps2_import_card">导入记忆卡</string>
+    <string name="retro_ps2_enable_online_dev9">启用联机 (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 网络适配器 — 重启游戏以接入</string>
+    <string name="retro_ps2_ethernet_device">以太网设备</string>
+    <string name="retro_ps2_dns_mode">DNS 模式</string>
+    <string name="retro_ps2_primary_dns">首选 DNS</string>
+    <string name="retro_ps2_secondary_dns">备用 DNS</string>
+    <string name="retro_ps2_optional">可选</string>
+    <string name="retro_ps2_auto_ip_dhcp">自动 IP (DHCP)</string>
+    <string name="retro_ps2_server_host">服务器：%1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">点按设置 IP（留空则移除）</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">添加服务器主机</string>
+    <string name="retro_ps2_new_server_hostname">新服务器主机名</string>
+    <string name="retro_ps2_server_hostname_hint">例如 bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">屏幕控制</string>
+    <string name="retro_ps2_edit_layout">编辑布局</string>
+    <string name="retro_ps2_reset_layout">重置布局</string>
+    <string name="retro_ps2_layout_reset">布局已重置</string>
+    <string name="retro_ps2_left_stick_invert_x">左摇杆：反转 X 轴</string>
+    <string name="retro_ps2_left_stick_invert_y">左摇杆：反转 Y 轴</string>
+    <string name="retro_ps2_right_stick_invert_x">右摇杆：反转 X 轴</string>
+    <string name="retro_ps2_right_stick_invert_y">右摇杆：反转 Y 轴</string>
+    <string name="retro_ps2_button_color">按钮颜色</string>
+    <string name="retro_ps2_letter_color">字母颜色</string>
+    <string name="retro_ps2_shadow_color">阴影颜色</string>
+    <string name="retro_ps2_background_color">背景颜色</string>
+    <string name="retro_ps2_reset_colors">重置颜色</string>
+    <string name="retro_ps2_renderer">渲染器</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">分辨率缩放</string>
+    <string name="retro_ps2_scale_1x_native">1x（原生）</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">宽高比</string>
+    <string name="retro_ps2_aspect_stretch">拉伸</string>
+    <string name="retro_ps2_aspect_auto_standard">自动（标准）</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">显示滤镜</string>
+    <string name="retro_ps2_filter_nearest">最近邻</string>
+    <string name="retro_ps2_filter_bilinear_smooth">双线性（平滑）</string>
+    <string name="retro_ps2_filter_bilinear_sharp">双线性（锐利）</string>
+    <string name="retro_ps2_texture_filter">纹理滤镜</string>
+    <string name="retro_ps2_filter_bilinear_forced">双线性（强制）</string>
+    <string name="retro_ps2_filter_bilinear_ps2">双线性 (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">双线性（精灵）</string>
+    <string name="retro_ps2_blending_accuracy">混合精度</string>
+    <string name="retro_ps2_blend_minimum">最低</string>
+    <string name="retro_ps2_blend_basic">基本</string>
+    <string name="retro_ps2_blend_medium">中等</string>
+    <string name="retro_ps2_blend_high">高</string>
+    <string name="retro_ps2_blend_full">完整</string>
+    <string name="retro_ps2_blend_maximum">最高</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV 着色器</string>
+    <string name="retro_ps2_shader_off">关闭</string>
+    <string name="retro_ps2_shader_scanline">扫描线</string>
+    <string name="retro_ps2_shader_diagonal">对角线</string>
+    <string name="retro_ps2_shader_triangular">三角形</string>
+    <string name="retro_ps2_shader_wave">波纹</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">跳帧</string>
+    <string name="retro_ps2_frameskip_off">关闭</string>
+    <string name="retro_ps2_frameskip_1">跳 1</string>
+    <string name="retro_ps2_frameskip_2">跳 2</string>
+    <string name="retro_ps2_frameskip_3">跳 3</string>
+    <string name="retro_ps2_mipmapping">Mipmap 贴图</string>
+    <string name="retro_ps2_volume">音量</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">静音</string>
+    <string name="retro_ps2_swap_stereo_channels">交换立体声声道</string>
+    <string name="retro_ps2_ee_cycle_rate">EE 周期速率</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100%（默认）</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE 周期跳过</string>
+    <string name="retro_ps2_skip_off">关闭</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">即时 VU1</string>
+    <string name="retro_ps2_mtvu">多线程 VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">快速 CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">模拟速度</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU 占用</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU 占用</string>
+    <string name="retro_ps2_hud_internal_resolution">内部分辨率</string>
+    <string name="retro_ps2_deinterlace_mode">反交错模式</string>
+    <string name="retro_ps2_deint_auto">自动</string>
+    <string name="retro_ps2_deint_off">关闭</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV 宽高比</string>
+    <string name="retro_ps2_anti_blur">抗模糊</string>
+    <string name="retro_ps2_widescreen_patches">宽屏补丁</string>
+    <string name="retro_ps2_no_interlace_patches">逐行扫描补丁</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC 自旋检测</string>
+    <string name="retro_ps2_wait_loop">等待循环检测</string>
+    <string name="retro_ps2_time_stretch">音频时间拉伸</string>
+    <string name="retro_ps2_audio_buffer">音频缓冲</string>
+    <string name="retro_ps2_audio_latency">输出延迟</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">帧时间</string>
+    <string name="retro_ps2_hud_gs_stats">GS 统计</string>
+    <string name="retro_ps2_hud_hw_info">硬件信息</string>
+    <string name="retro_ps2_hud_version">版本</string>
+    <string name="retro_ps2_hud_input_display">输入显示</string>
+    <string name="retro_ps2_tab_menu">菜单</string>
+    <string name="retro_ps2_tab_display">显示</string>
+    <string name="retro_ps2_tab_performance">性能</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">声音</string>
+    <string name="retro_ps2_tab_online">联机</string>
+    <string name="retro_ps2_tab_controls">控制</string>
+    <string name="retro_ps2_resume">继续</string>
+    <string name="retro_ps2_pause">暂停</string>
+    <string name="retro_ps2_exit">退出</string>
+    <string name="retro_lr_bios_imported">已导入 BIOS：%1$s</string>
+    <string name="retro_lr_invalid_bios_file">无效的 BIOS 文件</string>
+    <string name="retro_lr_invalid_retro_game">无效的复古游戏</string>
+    <string name="retro_lr_rom_not_found">未找到 ROM：%1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">无法读取此压缩包内的 ROM</string>
+    <string name="retro_lr_core_not_installed">核心未安装：%1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">已启用金手指 — 本次会话已禁用成就</string>
+    <string name="retro_lr_cloud_save_restored">已恢复云存档</string>
+    <string name="retro_lr_restore_failed">恢复失败</string>
+    <string name="retro_lr_cloud_conflict_message">%1$s 存在更新的云存档。是否要同步？您希望保留哪个云存档？</string>
+    <string name="retro_lr_cloud_save">云存档</string>
+    <string name="retro_lr_renderer_default">复古</string>
+    <string name="retro_lr_failed_load_core">加载模拟器核心失败</string>
+    <string name="retro_lr_failed_load_rom">加载 ROM 失败</string>
+    <string name="retro_lr_graphics_not_supported">此核心不支持图形显示</string>
+    <string name="retro_lr_emulator_error">模拟器错误</string>
+    <string name="retro_lr_shader_default">默认</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">锐利</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR 放大</string>
+    <string name="retro_lr_upscale_native">原生</string>
+    <string name="retro_lr_sound">声音</string>
+    <string name="retro_lr_left_stick_invert_x">左摇杆：反转 X 轴</string>
+    <string name="retro_lr_left_stick_invert_y">左摇杆：反转 Y 轴</string>
+    <string name="retro_lr_right_stick_invert_x">右摇杆：反转 X 轴</string>
+    <string name="retro_lr_right_stick_invert_y">右摇杆：反转 Y 轴</string>
+    <string name="retro_lr_on_screen_controls">屏幕控制</string>
+    <string name="retro_lr_haptic_feedback">触觉反馈</string>
+    <string name="retro_lr_portrait">竖屏</string>
+    <string name="retro_lr_landscape">横屏</string>
+    <string name="retro_lr_edit_layout">编辑布局 (%1$s)</string>
+    <string name="retro_lr_reset_layout">重置 %1$s 布局</string>
+    <string name="retro_lr_layout_reset">%1$s 布局已重置</string>
+    <string name="retro_lr_button_color">按钮颜色</string>
+    <string name="retro_lr_letter_color">字母颜色</string>
+    <string name="retro_lr_shadow_color">阴影颜色</string>
+    <string name="retro_lr_background_color">背景颜色</string>
+    <string name="retro_lr_reset_colors">重置颜色</string>
+    <string name="retro_lr_colors_reset">颜色已重置</string>
+    <string name="retro_lr_performance_hud">性能 HUD</string>
+    <string name="retro_lr_alpha">透明度</string>
+    <string name="retro_lr_background_alpha">背景透明度</string>
+    <string name="retro_lr_background">背景</string>
+    <string name="retro_lr_scale">缩放</string>
+    <string name="retro_lr_numeric_frametime">数字帧时间</string>
+    <string name="retro_lr_dual_series_battery">双系列电池</string>
+    <string name="retro_lr_hud_elements">HUD 元素</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">主机</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">电池</string>
+    <string name="retro_lr_hud_temp">温度</string>
+    <string name="retro_lr_hud_graph">图表</string>
+    <string name="retro_lr_hud_cpu_temp">CPU 温度</string>
+    <string name="retro_lr_save_state">保存即时存档</string>
+    <string name="retro_lr_load_save_state">加载即时存档</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">硬核模式下禁用加载存档</string>
+    <string name="retro_lr_achievements">成就</string>
+    <string name="retro_lr_cheats">金手指</string>
+    <string name="retro_lr_cheats_disabled_hardcore">硬核模式下禁用金手指</string>
+    <string name="retro_lr_reset">重置</string>
+    <string name="retro_lr_fast_forward">快进</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">硬核模式下禁用快进</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">光盘 %1$d/%2$d</string>
+    <string name="retro_lr_resume">继续</string>
+    <string name="retro_lr_pause">暂停</string>
+    <string name="retro_lr_exit">退出</string>
+    <string name="retro_lr_saved_to_slot">已保存至插槽 %1$d</string>
+    <string name="retro_lr_could_not_save_state">无法保存即时存档</string>
+    <string name="retro_lr_bios_required_title">需要 %1$s BIOS</string>
+    <string name="retro_lr_bios_required_message">PlayStation 游戏需要您提供真实主机的 BIOS 文件。请导入 BIOS（scph5501.bin、scph5500.bin、scph5502.bin、scph1001.bin 或 scph7001.bin）以继续。</string>
+    <string name="retro_lr_import_bios">导入 BIOS…</string>
+    <string name="retro_lr_cancel">取消</string>
+    <string name="retro_lr_slot_empty">插槽 %1$d 为空</string>
+    <string name="retro_lr_loaded_slot">已加载插槽 %1$d</string>
+    <string name="retro_lr_could_not_load_state">无法加载即时存档</string>
+    <string name="retro_lr_slot_title">插槽 %1$d</string>
+    <string name="retro_lr_rename_slot">重命名插槽 %1$d</string>
+    <string name="retro_gs_section_general">常规</string>
+    <string name="retro_gs_section_graphics">图形</string>
+    <string name="retro_gs_section_performance">性能</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">输入</string>
+    <string name="retro_gs_section_audio">音频</string>
+    <string name="retro_gs_section_online">联机</string>
+    <string name="retro_gs_cancel">取消</string>
+    <string name="retro_gs_save">保存</string>
+    <string name="retro_gs_shader_default">默认</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">锐利</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">原生</string>
+    <string name="retro_gs_group_game">游戏</string>
+    <string name="retro_gs_label_name">名称</string>
+    <string name="retro_gs_label_system">系统</string>
+    <string name="retro_gs_label_emulator_core">模拟器核心</string>
+    <string name="retro_gs_label_rom_path">ROM 路径</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">已安装</string>
+    <string name="retro_gs_bios_none">无 — 运行 %1$s 游戏所需</string>
+    <string name="retro_gs_import_bios">导入 BIOS…</string>
+    <string name="retro_gs_remove_bios">移除 BIOS</string>
+    <string name="retro_gs_group_library_artwork">库封面</string>
+    <string name="retro_gs_artwork_game_card">游戏卡片图片</string>
+    <string name="retro_gs_artwork_grid">网格图片</string>
+    <string name="retro_gs_artwork_carousel">轮播图片</string>
+    <string name="retro_gs_artwork_list">列表图片</string>
+    <string name="retro_gs_artwork_custom_set">已设置自定义图片</string>
+    <string name="retro_gs_artwork_set_image">设置图片</string>
+    <string name="retro_gs_artwork_remove">移除</string>
+    <string name="retro_gs_group_video">视频</string>
+    <string name="retro_gs_video_filter">视频滤镜</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR 放大</string>
+    <string name="retro_gs_performance_hud">性能 HUD</string>
+    <string name="retro_gs_group_core">核心</string>
+    <string name="retro_gs_renderer">渲染器</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">分辨率缩放</string>
+    <string name="retro_gs_scale_1x_native">1x（原生）</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">宽高比</string>
+    <string name="retro_gs_aspect_stretch">拉伸</string>
+    <string name="retro_gs_aspect_auto_standard">自动（标准）</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">显示滤镜</string>
+    <string name="retro_gs_filter_nearest">最近邻</string>
+    <string name="retro_gs_filter_bilinear_smooth">双线性（平滑）</string>
+    <string name="retro_gs_filter_bilinear_sharp">双线性（锐利）</string>
+    <string name="retro_gs_texture_filter">纹理滤镜</string>
+    <string name="retro_gs_filter_bilinear_forced">双线性（强制）</string>
+    <string name="retro_gs_filter_bilinear_ps2">双线性 (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">双线性（精灵）</string>
+    <string name="retro_gs_blending_accuracy">混合精度</string>
+    <string name="retro_gs_blend_minimum">最低</string>
+    <string name="retro_gs_blend_basic">基本</string>
+    <string name="retro_gs_blend_medium">中等</string>
+    <string name="retro_gs_blend_high">高</string>
+    <string name="retro_gs_blend_full">完整</string>
+    <string name="retro_gs_blend_maximum">最高</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV 着色器</string>
+    <string name="retro_gs_off">关闭</string>
+    <string name="retro_gs_tvshader_scanline">扫描线</string>
+    <string name="retro_gs_tvshader_diagonal">对角线</string>
+    <string name="retro_gs_tvshader_triangular">三角形</string>
+    <string name="retro_gs_tvshader_wave">波纹</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">跳帧</string>
+    <string name="retro_gs_frameskip_1">跳 1</string>
+    <string name="retro_gs_frameskip_2">跳 2</string>
+    <string name="retro_gs_frameskip_3">跳 3</string>
+    <string name="retro_gs_mipmapping">Mipmap 贴图</string>
+    <string name="retro_gs_group_performance">性能</string>
+    <string name="retro_gs_ee_cycle_rate">EE 周期速率</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100%（默认）</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE 周期跳过</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">即时 VU1</string>
+    <string name="retro_gs_mtvu">多线程 VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">快速 CDVD</string>
+    <string name="retro_gs_group_performance_hud">性能 HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">模拟速度</string>
+    <string name="retro_gs_hud_cpu_usage">CPU 占用</string>
+    <string name="retro_gs_hud_gpu_usage">GPU 占用</string>
+    <string name="retro_gs_hud_internal_resolution">内部分辨率</string>
+    <string name="retro_gs_deinterlace_mode">反交错模式</string>
+    <string name="retro_gs_deint_auto">自动</string>
+    <string name="retro_gs_deint_off">关闭</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV 宽高比</string>
+    <string name="retro_gs_anti_blur">抗模糊</string>
+    <string name="retro_gs_widescreen_patches">宽屏补丁</string>
+    <string name="retro_gs_no_interlace_patches">逐行扫描补丁</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC 自旋检测</string>
+    <string name="retro_gs_wait_loop">等待循环检测</string>
+    <string name="retro_gs_time_stretch">音频时间拉伸</string>
+    <string name="retro_gs_audio_buffer">音频缓冲</string>
+    <string name="retro_gs_audio_latency">输出延迟</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">帧时间</string>
+    <string name="retro_gs_hud_gs_stats">GS 统计</string>
+    <string name="retro_gs_hud_hw_info">硬件信息</string>
+    <string name="retro_gs_hud_version">版本</string>
+    <string name="retro_gs_hud_input_display">输入显示</string>
+    <string name="retro_gs_fast_boot">快速启动</string>
+    <string name="retro_gs_group_online_dev9">联机 (DEV9)</string>
+    <string name="retro_gs_enable_online">启用联机</string>
+    <string name="retro_gs_ethernet_device">以太网设备</string>
+    <string name="retro_gs_net_auto">自动</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS 模式</string>
+    <string name="retro_gs_dns_manual">手动</string>
+    <string name="retro_gs_dns_internal">内部</string>
+    <string name="retro_gs_primary_dns">首选 DNS</string>
+    <string name="retro_gs_secondary_dns">备用 DNS</string>
+    <string name="retro_gs_dns_optional">可选</string>
+    <string name="retro_gs_auto_ip_dhcp">自动 IP (DHCP)</string>
+    <string name="retro_gs_group_input">输入</string>
+    <string name="retro_engine_save">保存</string>
+    <string name="retro_engine_saved">游戏已保存</string>
+    <string name="retro_engine_loading">正在加载…</string>
+    <string name="retro_engine_load">读取</string>
+    <string name="retro_engine_saved_to">已保存到 %1$s</string>
+    <string name="retro_engine_slot_active_only">使用中</string>
+    <string name="retro_engine_rename_slot">重命名存档位</string>
+    <string name="retro_engine_caught">已捕捉 %1$d 只</string>
+    <string name="retro_engine_no_slots">暂无存档位</string>
+    <string name="retro_engine_new_slot">新建存档位</string>
+    <string name="retro_engine_achievements_unavailable">3D 模式下不记录</string>
+    <string name="retro_engine_fullscreen">全屏</string>
+    <string name="retro_engine_loaded_from">已读取 %1$s</string>
+    <string name="retro_engine_slot_empty">该存档位为空</string>
+    <string name="retro_engine_loading_subtitle">正在首次准备游戏数据</string>
+    <string name="retro_gs_engine_3d">体素 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">使用 3D 体素引擎运行此游戏，而非标准核心</string>
+    <string name="retro_gs_on_screen_controls">屏幕控制</string>
+    <string name="retro_gs_haptic_feedback">触觉反馈</string>
+    <string name="retro_gs_group_audio">音频</string>
+    <string name="retro_gs_volume">音量</string>
+    <string name="retro_gs_mute">静音</string>
+    <string name="retro_gs_swap_stereo">交换立体声声道</string>
+    <string name="retro_gs_sound">声音</string>
+    <string name="retro_scr_retro_defaults">复古默认设置</string>
+    <string name="retro_scr_retro_defaults_desc">除非在游戏自身设置中覆盖，否则将应用到各主机的游戏。</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">账户</string>
+    <string name="retro_scr_signed_in">已登录</string>
+    <string name="retro_scr_not_signed_in_hint">未登录 — 打开游戏的成就以登录</string>
+    <string name="retro_scr_achievements_enabled">已启用成就</string>
+    <string name="retro_scr_hardcore_default">默认硬核模式（无即时存档）</string>
+    <string name="retro_scr_sign_out">退出登录</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">已安装</string>
+    <string name="retro_scr_none_ps1_bios">无 — PS1 游戏需要 BIOS</string>
+    <string name="retro_scr_import_ps1_bios">导入 PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">已移除 PS1 BIOS</string>
+    <string name="retro_scr_no_bios_to_remove">没有可移除的 BIOS</string>
+    <string name="retro_scr_remove_ps1_bios">移除 PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">无 — PS2 游戏需要 BIOS</string>
+    <string name="retro_scr_format">格式</string>
+    <string name="retro_scr_ps2_bios_format">合并的单文件转储（带区域标记的 .bin，约 4MB）。不接受拆分的 ROM0/MEC/NVM 组。</string>
+    <string name="retro_scr_import_ps2_bios">导入 PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">已移除 PS2 BIOS</string>
+    <string name="retro_scr_remove_ps2_bios">移除 PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">库封面</string>
+    <string name="retro_scr_retro_case_art">复古外壳图（卡带 / CD 盒）</string>
+    <string name="retro_scr_box_art">封面图</string>
+    <string name="retro_scr_box_art_desc">导入时自动从 thumbnails.libretro.com 获取；自定义图片始终会覆盖它。</string>
+    <string name="retro_scr_roms_folder">ROM 文件夹</string>
+    <string name="retro_scr_folder">文件夹</string>
+    <string name="retro_scr_roms_not_set">未设置 — 选择文件夹以自动导入游戏</string>
+    <string name="retro_scr_auto_import">自动导入</string>
+    <string name="retro_scr_auto_import_desc">此文件夹中的新游戏会自动添加到您的库中，并检测出正确的主机。</string>
+    <string name="retro_scr_select_roms_folder_title">选择 ROM 文件夹</string>
+    <string name="retro_scr_select_roms_folder_button">选择 ROM 文件夹…</string>
+    <string name="retro_scr_change_roms_folder_button">更改 ROM 文件夹…</string>
+    <string name="retro_scr_scan_now">立即扫描</string>
+    <string name="retro_scr_console_defaults">主机默认设置</string>
+    <string name="retro_scr_console_defaults_desc">点按主机以设置其默认设置。</string>
+    <string name="retro_scr_renderer">渲染器</string>
+    <string name="retro_scr_upscale_resolution">放大分辨率</string>
+    <string name="retro_scr_aspect_ratio">宽高比</string>
+    <string name="retro_scr_aspect_stretch">拉伸</string>
+    <string name="retro_scr_aspect_auto_standard">自动（标准）</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">显示滤镜</string>
+    <string name="retro_scr_filter_nearest">最近邻</string>
+    <string name="retro_scr_filter_bilinear_smooth">双线性（平滑）</string>
+    <string name="retro_scr_filter_bilinear_sharp">双线性（锐利）</string>
+    <string name="retro_scr_texture_filter">纹理滤镜</string>
+    <string name="retro_scr_filter_bilinear_forced">双线性（强制）</string>
+    <string name="retro_scr_filter_bilinear_ps2">双线性 (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">双线性（精灵）</string>
+    <string name="retro_scr_blending_accuracy">混合精度</string>
+    <string name="retro_scr_blend_minimum">最低</string>
+    <string name="retro_scr_blend_basic">基本</string>
+    <string name="retro_scr_blend_medium">中等</string>
+    <string name="retro_scr_blend_high">高</string>
+    <string name="retro_scr_blend_full">完整</string>
+    <string name="retro_scr_blend_maximum">最高</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV 着色器</string>
+    <string name="retro_scr_shader_off">关闭</string>
+    <string name="retro_scr_shader_scanline">扫描线</string>
+    <string name="retro_scr_shader_diagonal">对角线</string>
+    <string name="retro_scr_shader_triangular">三角形</string>
+    <string name="retro_scr_shader_wave">波纹</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">跳帧</string>
+    <string name="retro_scr_skip_1">跳 1</string>
+    <string name="retro_scr_skip_2">跳 2</string>
+    <string name="retro_scr_skip_3">跳 3</string>
+    <string name="retro_scr_mipmapping">Mipmap 贴图</string>
+    <string name="retro_scr_ee_cycle_rate">EE 周期速率</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100%（默认）</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE 周期跳过</string>
+    <string name="retro_scr_skip_off">关闭</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">即时 VU1</string>
+    <string name="retro_scr_mtvu">多线程 VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">快速 CDVD</string>
+    <string name="retro_scr_touch_controls">屏幕触摸控制</string>
+    <string name="retro_scr_sound">声音</string>
+    <string name="retro_scr_swap_stereo">交换立体声声道</string>
+    <string name="retro_scr_hud_fps">HUD：FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD：模拟速度</string>
+    <string name="retro_scr_hud_cpu_usage">HUD：CPU 占用</string>
+    <string name="retro_scr_hud_gpu_usage">HUD：GPU 占用</string>
+    <string name="retro_scr_hud_internal_resolution">HUD：内部分辨率</string>
+    <string name="retro_scr_enable_online_dev9">启用联机 (DEV9)</string>
+    <string name="retro_scr_ethernet_device">以太网设备</string>
+    <string name="retro_scr_net_auto">自动</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS 模式</string>
+    <string name="retro_scr_dns_manual">手动</string>
+    <string name="retro_scr_dns_internal">内部</string>
+    <string name="retro_scr_primary_dns">首选 DNS</string>
+    <string name="retro_scr_secondary_dns">备用 DNS</string>
+    <string name="retro_scr_optional">可选</string>
+    <string name="retro_scr_auto_ip_dhcp">自动 IP (DHCP)</string>
+    <string name="retro_scr_shader">着色器</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR 放大</string>
+    <string name="retro_scr_performance_hud">性能 HUD</string>
+    <string name="retro_scr_credits_licenses">鸣谢 &amp; 许可</string>
+    <string name="retro_scr_credits_desc">WinNative 的部分功能基于这些开源项目构建。点按可查看各来源。</string>
+    <string name="retro_scr_tab_defaults">默认</string>
+    <string name="retro_scr_tab_credits">鸣谢</string>
+    <string name="retro_scr_enable_hardcore_title">启用硬核模式？</string>
+    <string name="retro_scr_enable_hardcore_body">硬核模式将立即重置游戏，并禁用加载即时存档、快进和金手指。任何未保存的进度都将丢失。是否继续？</string>
+    <string name="retro_scr_cancel">取消</string>
+    <string name="retro_scr_enable">启用</string>
+    <string name="retro_scr_bios_imported">已导入 BIOS：%1$s</string>
+    <string name="retro_scr_invalid_bios_file">无效的 BIOS 文件</string>
+    <string name="retro_scr_ps2_bios_imported">已导入 PS2 BIOS：%1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">无效的 PS2 BIOS 文件</string>
+    <string name="retro_scr_no_game_serial">没有可用于查找金手指的游戏序列号。</string>
+    <string name="retro_scr_applied_cheats">已应用 %1$d 个金手指。</string>
+    <string name="retro_scr_couldnt_apply_cheats">无法应用金手指。</string>
+    <string name="retro_scr_cheats">金手指</string>
+    <string name="retro_scr_apply">应用</string>
+    <string name="retro_scr_no_cheats_found">未找到此游戏的金手指。</string>
+    <string name="retro_scr_achievements">成就</string>
+    <string name="retro_scr_sign_in_ra">登录 RetroAchievements</string>
+    <string name="retro_scr_username">用户名</string>
+    <string name="retro_scr_password">密码</string>
+    <string name="retro_scr_login_failed">登录失败</string>
+    <string name="retro_scr_signing_in">正在登录…</string>
+    <string name="retro_scr_sign_in">登录</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d 分</string>
+    <string name="retro_scr_no_achievements">此游戏没有成就。</string>
+    <string name="retro_scr_back">返回</string>
+    <string name="retro_scr_enabled">已启用</string>
+    <string name="retro_scr_disabled">已禁用</string>
+    <string name="retro_scr_rename">重命名</string>
+    <string name="retro_scr_save">保存</string>
+    <string name="retro_scr_cloud_save_conflict">云存档冲突</string>
+    <string name="retro_scr_keep_local_save">保留本地存档</string>
+    <string name="retro_scr_auto_color_abbrev">自</string>
+    <string name="retro_tab_menu">菜单</string>
+    <string name="retro_tab_display">显示</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">声音</string>
+    <string name="retro_tab_controls">控制</string>
+    <string name="retro_scan_up_to_date">库已是最新</string>
+    <string name="retro_scan_roms">ROM：%1$s</string>
+    <string name="retro_scan_added">新增 %1$d</string>
+    <string name="retro_scan_removed">移除 %1$d</string>
+    <string name="retro_scr_shader_default">默认</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">锐利</string>
+    <string name="retro_scr_upscale_native">原生</string>
+    <string name="retro_co_aspect_ratio">宽高比</string>
+    <string name="retro_co_ntsc_filter">NTSC 滤镜</string>
+    <string name="retro_co_colorization">着色</string>
+    <string name="retro_co_color_correction">色彩校正</string>
+    <string name="retro_co_remove_sprite_limit">移除精灵数量限制</string>
+    <string name="retro_co_resolution">分辨率</string>
+    <string name="retro_co_framebuffer_emulation">帧缓冲模拟</string>
+    <string name="retro_co_dithering">抖动</string>
+    <string name="retro_co_widescreen_hack">宽屏修改</string>
+    <string name="retro_co_val_8_7_native">8:7（原生）</string>
+    <string name="retro_co_val_4_3_tv">4:3（电视）</string>
+    <string name="retro_co_val_off">关闭</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">复合</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">自动</string>
+    <string name="retro_co_val_gba_screen">GBA 屏幕</string>
+    <string name="retro_co_val_gbc_screen">GBC 屏幕</string>
+    <string name="retro_co_val_on">开启</string>
+    <string name="retro_co_val_320x240_native">320x240（原生）</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 调整</string>
+    <string name="retro_co_val_native">原生</string>
+    <string name="retro_co_val_internal">内部</string>
+    <string name="retro_co_val_on_16_9">开启 (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">使用您的 RetroAchievements 账户登录，以获取并追踪复古游戏的成就。</string>
+    <string name="retro_ach_username">用户名</string>
+    <string name="retro_ach_password">密码</string>
+    <string name="retro_ach_enter_credentials">请输入您的用户名和密码</string>
+    <string name="retro_ach_login_failed">登录失败</string>
+    <string name="retro_ach_sign_in">登录</string>
+    <string name="retro_ach_password_disclaimer">您的密码仅使用一次以获取登录令牌，该令牌安全存储在设备上。</string>
+    <string name="retro_ach_achievements_enabled">已启用成就</string>
+    <string name="retro_ach_hardcore_mode">硬核模式（无即时存档）</string>
+    <string name="retro_ach_points">%1$d / %2$d 分</string>
+    <string name="retro_ach_none_found">未找到此游戏的成就。</string>
+    <string name="retro_ach_sign_out">退出登录</string>
+    <string name="retro_che_brand">金手指</string>
+    <string name="retro_che_name">名称</string>
+    <string name="retro_che_code">代码</string>
+    <string name="retro_che_cancel">取消</string>
+    <string name="retro_che_save">保存</string>
+    <string name="retro_che_default_name">金手指 %1$d</string>
+    <string name="retro_che_empty">暂无金手指。为此游戏添加金手指代码。</string>
+    <string name="retro_che_add">添加金手指</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU 驱动</string>
+    <string name="retro_gpu_driver_system">系统（默认）</string>
+    <string name="retro_gpu_driver_hint">在设置 \u2192 驱动中安装 Turnip 驱动。同一驱动适用于 PC 和 PS2 游戏。</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">用于 Final Fantasy XI 等基于 HDD 的游戏的虚拟内置驱动器。将重启游戏。</string>
+    <string name="retro_ps2_hdd_desc">用于 Final Fantasy XI 等基于 HDD 的游戏的虚拟内置驱动器。</string>
+    <string name="retro_ps2_dns_auto_internal">DNS 模式已设为 Internal，以便你的自定义服务器主机生效。</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_co_cpu_core">CPU 核心</string>
+    <string name="retro_co_dual_core">双核心</string>
+    <string name="retro_co_internal_cheats">内置金手指</string>
+    <string name="retro_co_internal_resolution">内部分辨率</string>
+    <string name="retro_co_renderer">渲染器</string>
+    <string name="retro_co_sensor_bar">感应条位置</string>
+    <string name="retro_co_skip_gc_bios">跳过 BIOS 开场</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_bottom">底部</string>
+    <string name="retro_co_val_cached_interpreter">缓存解释器</string>
+    <string name="retro_co_val_hardware">硬件</string>
+    <string name="retro_co_val_interpreter">解释器</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_mouse_pointer">鼠标 / 触摸</string>
+    <string name="retro_co_val_right_stick_absolute">右摇杆（绝对）</string>
+    <string name="retro_co_val_right_stick_relative">右摇杆（相对）</string>
+    <string name="retro_co_val_software">软件</string>
+    <string name="retro_co_val_stretch">拉伸</string>
+    <string name="retro_co_val_top">顶部</string>
+    <string name="retro_co_vbi_skip">VBI 跳过（自动跳帧）</string>
+    <string name="retro_co_widescreen">宽屏</string>
+    <string name="retro_co_wiimote_pointer">Wiimote 指针</string>
+    <string name="retro_gs_cheats_apply_note">更改将在下次启动此游戏时生效。</string>
+    <string name="retro_gs_cheats_detect_hint">先启动此游戏一次以便检测其光盘序列号，之后金手指和补丁将显示在此处。</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS 认证绕过 — 联机游玩所需</string>
+    <string name="retro_gs_dnas_group">自动应用（联机）</string>
+    <string name="retro_gs_group_cheats">金手指 &amp; 补丁</string>
+    <string name="retro_gs_hdd_image_size">大小：%1$s</string>
+    <string name="retro_gs_hdd_import">导入 HDD 镜像</string>
+    <string name="retro_gs_hdd_remove_short">移除</string>
+    <string name="retro_gs_netplay_enable">启用 NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">默认关闭。启用后，在启动前选择主机或加入。\n退出游戏时会再次关闭。</string>
+    <string name="retro_gs_netplay_host">主机地址</string>
+    <string name="retro_gs_netplay_host_hint">IP 或主机名</string>
+    <string name="retro_gs_netplay_host_mode">主持会话</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">开 = 等待玩家。关 = 加入主机地址</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay 通过 TCP 使用本地多人游戏端口（玩家 1 主机 / 玩家 2 客户端）。PS2 联机改用 DEV9 以太网。</string>
+    <string name="retro_gs_netplay_port">端口</string>
+    <string name="retro_lr_memory_card_slot">记忆卡 %1$d</string>
+    <string name="retro_lr_screenshot">截图</string>
+    <string name="retro_lr_use_cloud_save">使用云存档</string>
+    <string name="retro_netplay_conn_direct">局域网（直连 IP）</string>
+    <string name="retro_netplay_connecting">正在连接…</string>
+    <string name="retro_netplay_connection">连接</string>
+    <string name="retro_netplay_conn_traversal">联机（主机代码）</string>
+    <string name="retro_netplay_dismiss">关闭</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay 使用 Dolphin 自己的引擎。主机 = 玩家 1，加入 = 玩家 2。在启动前选择主机或加入以及连接类型；两台设备将一起启动同一游戏。</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">与玩家 2 分享你设备的 Wi‑Fi IP 和此端口。他们连接后游戏会自动开始。</string>
+    <string name="retro_netplay_dolphin_host_online_hint">游戏启动时会显示主机代码 — 与玩家 2 分享它。他们连接后游戏会自动开始。</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">输入主机的 Wi‑Fi IP 和端口，然后启动以连接。</string>
+    <string name="retro_netplay_dolphin_join_online_hint">输入来自玩家 1 的主机代码，然后启动以连接。</string>
+    <string name="retro_netplay_enable_before_launch">在游戏设置中启用 NetPlay，并在启动前选择主机或加入</string>
+    <string name="retro_netplay_find_rooms">在 Wi‑Fi 上查找房间</string>
+    <string name="retro_netplay_game_link_hint">Game Link · 每个屏幕都是独立的掌机</string>
+    <string name="retro_netplay_gba_not_ready">GBA 多人游戏使用 gpSP + 无线适配器。请确保已安装 libgpsp。</string>
+    <string name="retro_netplay_help">通过 Wi‑Fi 的共享屏幕多人游戏（类似 RetroArch）。\n主机 = 玩家 1，加入 = 玩家 2。两台设备显示同一游戏。</string>
+    <string name="retro_netplay_help_game_link">通过 Wi‑Fi 的 Game Link — 每台设备运行自己的游戏。\nGB/GBC：Gambatte 串行连接（Pokémon 第 1–2 世代）。\nGBA：gpSP 无线适配器（Pokémon FR/LG/Emerald 对战）。</string>
+    <string name="retro_netplay_host_action">主持房间</string>
+    <string name="retro_netplay_host_code">主机代码</string>
+    <string name="retro_netplay_host_code_hint">来自主机的穿透主机代码</string>
+    <string name="retro_netplay_hosting_room">正在主持房间</string>
+    <string name="retro_netplay_host_mode_hint">点按主机为此游玩会话开启一个房间，然后启动游戏。退出时 NetPlay 会关闭。</string>
+    <string name="retro_netplay_in_room">在房间中</string>
+    <string name="retro_netplay_join_action">通过 IP 加入</string>
+    <string name="retro_netplay_joined">已加入</string>
+    <string name="retro_netplay_join_room">加入</string>
+    <string name="retro_netplay_launch_mode">启动时</string>
+    <string name="retro_netplay_leave">离开</string>
+    <string name="retro_netplay_menu_hint">主机 = P1 · 加入 = P2 · 两个屏幕显示同一游戏</string>
+    <string name="retro_netplay_mode_host">主机</string>
+    <string name="retro_netplay_mode_join">加入</string>
+    <string name="retro_netplay_mode_manual">手动</string>
+    <string name="retro_netplay_no_rooms">未找到房间。请确保主机在同一 Wi‑Fi 上并正在主持房间。</string>
+    <string name="retro_netplay_player_name">显示名称</string>
+    <string name="retro_netplay_player_name_hint">向其他玩家显示</string>
+    <string name="retro_netplay_players_count">已连接 %1$d 人</string>
+    <string name="retro_netplay_prelaunch_hint">房间仅在此会话中开放。准备好后启动。退出游戏会关闭 NetPlay。</string>
+    <string name="retro_netplay_room_players">玩家</string>
+    <string name="retro_netplay_scan_action">扫描 Wi‑Fi</string>
+    <string name="retro_netplay_scan_again">再次扫描</string>
+    <string name="retro_netplay_scan_hint">扫描同一 Wi‑Fi 以查找开放的房间，或通过 IP 地址加入。</string>
+    <string name="retro_netplay_scanning">正在扫描 Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">扫描结果</string>
+    <string name="retro_netplay_select_room_hint">点按一个房间立即加入（不会为下次启动保存该 IP）。</string>
+    <string name="retro_netplay_stop_scan">停止扫描</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_user_connected">%1$s 已连接</string>
+    <string name="retro_netplay_user_disconnected">%1$s 已断开连接</string>
+    <string name="retro_netplay_waiting_players">正在等待玩家…</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2 支持即将推出</string>
+    <string name="retro_ps2_show_l3r3">显示 L3 / R3 按钮</string>
+    <string name="retro_ps2_show_l3r3_subtitle">关闭时，双击摇杆以点击 L3 / R3</string>
+    <string name="retro_ps2_turnip_flags">TURNIP 驱动标志</string>
+    <string name="retro_ps2_turnip_flags_note">仅在上方选择了自定义 GPU 驱动时应用。</string>
+    <string name="retro_rom_missing">未找到游戏文件</string>
+    <string name="retro_scr_delete">删除</string>
+    <string name="retro_scr_import_from_file">从文件导入…</string>
+    <string name="retro_scr_loading">正在加载…</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">切换主机</string>
+    <string name="retro_gs_identify_as">识别为主机</string>
+    <string name="retro_gs_console_changed">现已识别为 %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">通过内置的 vkBasalt 层将 ReShade 效果（.fx）应用于 DXVK/VKD3D（Vulkan）游戏。将每个效果放入 Android/data/&lt;package&gt;/files/ReShade/ 下各自的文件夹中。实时参数调整和游戏内开关将随实时重载层更新一起提供。</string>
+    <string name="reshade_catalog_title">ReShade 效果</string>
+    <string name="reshade_catalog_search">搜索效果…</string>
+    <string name="reshade_catalog_installed">已安装 (%1$d)</string>
+    <string name="reshade_catalog_available">可用 (%1$d)</string>
+    <string name="reshade_catalog_downloading">正在下载</string>
+    <string name="reshade_catalog_installing">正在安装</string>
+    <string name="reshade_catalog_offline_cache">离线 — 显示缓存列表。连接以下载新效果。</string>
+    <string name="reshade_catalog_offline_none">离线 — 仅显示已安装的效果。连接以浏览目录。</string>
+    <string name="reshade_catalog_needs_connection">连接到互联网以下载效果。</string>
+    <string name="reshade_catalog_download_failed">下载 %1$s 失败。</string>
+    <string name="reshade_catalog_empty_query">没有与 \"%1$s\" 匹配的效果。</string>
+    <string name="reshade_catalog_empty">没有可用的效果。连接到互联网以浏览目录。</string>
+    <string name="reshade_catalog_done">完成</string>
+    <string name="reshade_catalog_delete_cd">删除 %1$s</string>
+    <string name="reshade_catalog_delete_title">删除 %1$s？</string>
+    <string name="reshade_catalog_delete_body">这将从存储中以及使用该效果的所有配置中移除该效果。你可以稍后重新下载。</string>
+    <string name="reshade_catalog_delete_confirm">删除</string>
+    <string name="reshade_catalog_delete_cancel">取消</string>
+    <string name="reshade_catalog_delete_failed">无法删除 %1$s。</string>
+    <string name="reshade_params_title">效果参数</string>
+    <string name="reshade_params_reset">重置</string>
+    <string name="reshade_loadout_empty">还没有效果。添加一个或多个效果以创建配置。</string>
+    <string name="reshade_loadout_add">添加效果</string>
+    <string name="reshade_loadout_full">配置已满 — 移除一个效果才能再添加。</string>
+    <string name="reshade_effect_active">已启用</string>
+    <string name="reshade_mode_solo">单独</string>
+    <string name="reshade_mode_stack">叠加</string>
+    <string name="reshade_mode_solo_hint">一次仅激活一个效果（A/B 对比，可在游戏中实时切换）。</string>
+    <string name="reshade_mode_stack_hint">叠加任意效果子集，按顺序应用。</string>
+    <string name="reshade_drawer_enable">启用 ReShade</string>
+    <string name="reshade_drawer_empty">此配置中没有 ReShade 效果。在此游戏（或容器）的设置中添加效果，即可在此切换和调整。</string>
+    <string name="reshade_drawer_no_params">此效果没有可调整的参数。</string>
+    <string name="cloud_saves_deleting">正在删除存档…</string>
+    <string name="cloud_saves_history_delete">删除</string>
+    <string name="cloud_saves_history_delete_confirm_body">永久删除来自 %1$s 的云存档？此操作无法撤销。</string>
+    <string name="cloud_saves_history_delete_confirm_title">删除云存档</string>
+    <string name="cloud_saves_history_delete_failed">无法删除云存档</string>
+    <string name="cloud_saves_history_delete_success">云存档已删除</string>
+    <string name="retro_bundle_required">请先下载主机核心 — 设置 › 复古</string>
+    <string name="retro_ps2_device_unsupported">此设备无法运行 PS2 模拟 — 需要 OpenGL ES 3.1 或更高版本。</string>
+    <string name="retro_scr_consoles_check">检查更新</string>
+    <string name="retro_scr_consoles_checking">正在检查更新…</string>
+    <string name="retro_scr_consoles_download">下载主机核心</string>
+    <string name="retro_scr_consoles_downloading">正在下载… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">主机核心</string>
+    <string name="retro_scr_consoles_installed">已安装 — 版本 %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">已安装 — 版本 %1$s（检查更新失败）</string>
+    <string name="retro_scr_consoles_installing">正在安装…</string>
+    <string name="retro_scr_consoles_missing">未安装 — 下载后即可畅玩复古游戏</string>
+    <string name="retro_scr_consoles_state">状态</string>
+    <string name="retro_scr_consoles_update">更新主机核心</string>
+    <string name="retro_scr_consoles_update_available">有可用更新 — 版本 %1$s（%2$d MB）</string>
+    <string name="retro_scr_consoles_verifying">正在校验下载…</string>
+    <string name="retro_scr_consoles_working">处理中…</string>
+    <string name="retro_tab_system">系统</string>
 </resources>
+
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
new file mode 100644
index 000000000..627256590
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="desktop_background_type_entries">
+        <item>圖片</item>
+        <item>原始</item>
+        <item>純色</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d29c69274..163a565a0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -17,6 +17,7 @@
     <string name="common_ui_select_valid_exe_file">請選擇有效的 .exe 檔案</string>
     <string name="common_ui_select_valid_icon_file">請選擇有效的 .ico 或 .png 檔案。</string>
     <string name="common_ui_exit">離開</string>
+    <string name="common_ui_exit_app">離開應用程式</string>
     <string name="common_ui_profile">設定檔</string>
     <string name="common_ui_name">名稱</string>
     <string name="common_ui_ok">確定</string>
@@ -31,6 +32,7 @@
     <string name="common_ui_duplicate">複製</string>
     <string name="common_ui_credits_and_third_party_apps">致謝與第三方應用程式</string>
     <string name="common_ui_loading">載入中\u2026</string>
+    <string name="common_ui_exporting">正在匯出</string>
     <string name="common_ui_enable">啟用</string>
     <string name="common_ui_disable">停用</string>
     <string name="common_ui_force">強制</string>
@@ -41,7 +43,7 @@
     <string name="common_ui_height">高度</string>
     <string name="common_ui_open_file">開啟檔案</string>
     <string name="common_ui_download_file">下載檔案</string>
-    <string name="common_ui_downloading_file">正在下載檔案...</string>
+    <string name="common_ui_downloading_file">正在下載檔案</string>
     <string name="common_ui_browse">瀏覽</string>
     <string name="common_ui_options">選項</string>
     <string name="common_ui_export">匯出</string>
@@ -65,6 +67,8 @@
     <string name="common_ui_settings">設定</string>
     <string name="common_ui_enable_all">全部啟用</string>
     <string name="common_ui_disable_all">全部停用</string>
+    <string name="common_ui_select_all">全選</string>
+    <string name="common_ui_deselect_all">取消全選</string>
     <string name="common_ui_on">開啟</string>
     <string name="common_ui_off">關閉</string>
     <string name="common_ui_already_set">已設定</string>
@@ -101,16 +105,37 @@
     <string name="common_ui_install">安裝</string>
     <string name="common_ui_application">應用程式</string>
     <string name="common_ui_check">檢查</string>
+    <string name="store_game_check_for_update">檢查更新</string>
+    <string name="store_game_checking_for_update">正在檢查</string>
+    <string name="store_game_download_update">下載更新</string>
+    <string name="store_game_no_update_available">沒有可用更新</string>
+    <string name="store_game_update_available">有可用更新</string>
+    <string name="store_game_update_check_failed">更新檢查失敗</string>
+    <string name="store_game_update">更新</string>
+    <string name="store_game_workshop">工作坊</string>
+    <string name="store_game_verify_files">驗證檔案</string>
+    <string name="store_game_verify_started">正在驗證 %1$s — 請查看下載分頁</string>
+    <string name="store_game_steam_options">Steam 選項</string>
+    <string name="store_game_verify_complete">檔案驗證完成</string>
+    <string name="store_game_verify_failed_notice">檔案驗證失敗</string>
+    <string name="store_game_progress_background_hint">你可以關閉此視窗 — 它會繼續執行。可隨時在下載分頁查看。</string>
+    <string name="store_game_checking_updates">正在檢查更新</string>
+    <string name="store_game_no_updates_notice">沒有可用更新</string>
+    <string name="store_game_update_complete">更新完成</string>
+    <string name="store_game_update_failed_notice">更新失敗</string>
+    <string name="store_game_update_check_failed_notice">檢查更新失敗</string>
+    <string name="store_game_download_already_active">此遊戲已在下載。請先取消目前的下載，然後再新增 DLC。</string>
     <string name="common_ui_select">選擇</string>
     <string name="common_ui_select_folder">選擇資料夾</string>
     <string name="common_ui_current_folder">目前資料夾</string>
+    <string name="common_ui_enter_path">輸入路徑</string>
+    <string name="common_ui_path_not_found">找不到路徑</string>
     <string name="common_ui_storage_roots">儲存根目錄</string>
     <string name="common_ui_browse_local_folders_directly">直接瀏覽本機資料夾</string>
     <string name="common_ui_no_folders_available_here">這裡沒有可用的資料夾</string>
     <string name="common_ui_grant_all_files_access_browse">請授予所有檔案存取權限，以直接瀏覽本機資料夾。</string>
     <string name="common_ui_not_configured">未設定</string>
     <string name="common_ui_reinstall">重新安裝</string>
-    <string name="common_ui_exit_app_confirm">離開 WinNative？</string>
     <string name="common_ui_elements_count">%1$d 個元素</string>
     <string name="common_ui_disabled_placeholder">-- 已停用 --</string>
     <string name="common_ui_enabled">已啟用</string>
@@ -134,9 +159,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">擷取美術圖</string>
+    <string name="library_games_scraping_artwork">擷取中</string>
     <string name="library_games_shortcut_created">捷徑已建立</string>
     <string name="library_games_failed_to_create_shortcut">無法建立捷徑：%s</string>
     <string name="library_games_install_path">安裝路徑</string>
+    <string name="library_games_not_enough_space">還需要 %1$s 空間</string>
     <string name="library_games_download_slash_install">下載 / 安裝</string>
     <string name="library_games_save_management">存檔管理</string>
     <string name="library_games_download_install_available">%1$s / %2$s・可用：%3$s</string>
@@ -159,11 +187,21 @@
     <string name="library_games_no_games_hub">尚未安裝任何遊戲\n點擊以開啟 Winlator 後端</string>
     <string name="library_games_installed_badge">已安裝</string>
     <string name="library_games_unknown_game">未知遊戲</string>
-    <string name="library_games_layouts_header">版面配置</string>
+    <string name="library_games_layouts_header">遊戲庫版面配置</string>
     <string name="library_games_layout_carousel">輪播</string>
     <string name="library_games_layout_list">清單</string>
+    <string name="library_games_view_options_header">檢視選項</string>
+    <string name="library_games_immersive_mode">沉浸模式</string>
+    <string name="library_games_immersive_mode_description">將目前聚焦遊戲的美術圖用作背景</string>
+    <string name="library_games_immersive_blur">模糊背景</string>
+    <string name="library_games_immersive_blur_description">對沉浸背景套用模糊效果</string>
     <string name="library_games_custom_game">自訂遊戲</string>
     <string name="library_games_play">遊玩</string>
+    <string name="hero_boot_to_desktop_title">啟動到桌面</string>
+    <string name="hero_graphics_tests_title">圖形測試</string>
+    <string name="hero_graphics_test_32">32 位元</string>
+    <string name="hero_graphics_test_64">64 位元</string>
+    <string name="hero_input_tests_title">輸入測試</string>
     <string name="library_games_add_custom_game">新增自訂遊戲</string>
     <string name="library_games_game_name">遊戲名稱</string>
     <string name="library_games_game_folder_mapped_drive">遊戲資料夾（映射的遊戲磁碟機）</string>
@@ -221,6 +259,8 @@
     <string name="downloads_queue_phase_cancelled">已取消</string>
     <string name="downloads_queue_phase_failed">失敗：%1$s</string>
     <string name="downloads_queue_cancel_download">取消下載</string>
+    <string name="downloads_queue_cancel_download_title">取消下載？</string>
+    <string name="downloads_queue_cancel_download_warning">取消 DLC、遊戲或更新下載可能會損壞遊戲安裝。\n\n確定要取消嗎？</string>
     <string name="downloads_queue_empty">沒有進行中的下載。</string>
 
     <!-- Containers > List -->
@@ -229,8 +269,11 @@
     <string name="containers_list_creating">正在建立容器\u2026</string>
     <string name="containers_list_removing">正在移除容器\u2026</string>
     <string name="containers_list_duplicating">正在複製容器\u2026</string>
+    <string name="containers_list_remove_title">移除容器</string>
+    <string name="containers_list_duplicate_title">複製容器</string>
     <string name="containers_list_confirm_remove">您要移除此容器嗎？</string>
     <string name="containers_list_confirm_duplicate">您要複製此容器嗎？</string>
+    <string name="containers_list_duplicate_failed">複製容器失敗</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">您要移除此捷徑嗎？</string>
@@ -245,6 +288,10 @@
     <string name="shortcuts_list_clone_failed">無法複製捷徑。</string>
     <string name="shortcuts_list_exported_to">捷徑已匯出至 %1$s</string>
     <string name="shortcuts_list_failed_export">無法匯出捷徑</string>
+    <string name="shortcuts_export_all">全部匯出</string>
+    <string name="shortcuts_export_to_frontend">匯出到前端</string>
+    <string name="shortcuts_export_all_done">已將 %1$d 個遊戲匯出至 %2$s</string>
+    <string name="shortcuts_export_all_none">沒有可匯出的遊戲</string>
     <string name="shortcuts_list_added">捷徑已成功新增。</string>
     <string name="shortcuts_list_failed_add">無法新增捷徑。</string>
 
@@ -254,17 +301,6 @@
     <string name="shortcuts_properties_disable_xinput">停用 XInput（僅使用滑鼠/鍵盤控制）</string>
     <string name="shortcuts_properties_exclusive_input">獨佔輸入</string>
     <string name="shortcuts_properties_custom_game_settings">自訂遊戲設定</string>
-    <string name="shortcuts_properties_use_cold_client">使用 ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient 是處理 Steam 模擬和 DRM 的首選方式。它在執行時修補 DRM，無需修改遊戲檔案。</string>
-    <string name="shortcuts_properties_unpack_files">舊版 DRM</string>
-    <string name="shortcuts_properties_unpack_files_description">從磁碟上的 exe 中移除 SteamStub DRM。僅在遊戲無法正常啟動時啟用。ColdClient 的執行階段修補程式會自動處理大多數遊戲。</string>
-    <string name="shortcuts_properties_force_dlc">強制 DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">僅在 DLC 未被偵測到或含 DLC 的存檔無法正常運作時啟用</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">啟動 Steam 用戶端（測試版）</string>
-    <string name="shortcuts_properties_launch_steam_client_description">在 Wine 中啟動真實 Steam 客戶端\n需要 Steam 帳號，可能會降低效能\n並非所有遊戲都適用</string>
-    <string name="shortcuts_properties_steam_type">Steam 客戶端效能</string>
-    <string name="steam_section_emulator">Steam 模擬器 (Goldberg)</string>
-    <string name="steam_section_real_client">真實 Steam 客戶端</string>
     <string name="shortcuts_properties_use_steam_input">使用 Steam 輸入</string>
     <string name="shortcuts_properties_steam_offline_mode">Steam 離線模式</string>
     <string name="shortcuts_properties_reset">重設屬性</string>
@@ -293,6 +329,7 @@
     <string name="input_controls_editor_confirm_duplicate_profile">您要複製此設定檔嗎？</string>
     <string name="input_controls_editor_title">控制編輯器</string>
     <string name="input_controls_editor_toggle_switch">切換開關</string>
+    <string name="input_controls_editor_swipeable">可滑動觸發</string>
     <string name="input_controls_editor_profile_exported_to">設定檔已匯出至</string>
     <string name="input_controls_editor_unable_to_import">無法匯入設定檔</string>
     <string name="input_controls_editor_import_profile">匯入設定檔</string>
@@ -391,6 +428,10 @@
     <string name="container_box64_compatibility">相容性</string>
     <string name="container_box64_intermediate">中等</string>
     <string name="container_box64_performance">效能</string>
+    <string name="container_fexcore_performance_tso">效能 TSO</string>
+    <string name="container_fexcore_extreme">極限</string>
+    <string name="container_fexcore_extreme_tso">極限 TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         CALL/RET 運算碼的旗標處理&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt;：將 CALL/RET 視為永遠不需要旗標（較快，不穩定）&lt;br /&gt;
@@ -475,9 +516,13 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">FEXCore 預設</string>
     <string name="container_fexcore_version">FEXCore 版本</string>
+    <string name="use_unix_libs">使用 UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">圖形驅動程式</string>
+    <string name="container_zink_mode">Zink 模式</string>
+    <string name="container_graphics_transcoder">BCn 轉碼器</string>
+    <string name="container_graphics_quality">BCn 品質</string>
     <string name="container_graphics_configuration">圖形驅動程式設定</string>
     <string name="container_graphics_version">圖形驅動程式版本</string>
     <string name="container_graphics_available_extensions">可用擴充</string>
@@ -491,6 +536,8 @@
     <string name="container_graphics_bcn_emulation">BCn 模擬</string>
     <string name="container_graphics_bcn_emulation_type">BCn 模擬類型</string>
     <string name="container_graphics_bcn_emulation_cache">BCn 模擬快取</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ 遊戲超解析度 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">邊緣銳利度</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">您要複製此預設嗎？</string>
     <string name="container_presets_confirm_remove">您要移除此預設嗎？</string>
@@ -510,7 +557,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">使用 DRI3 擴充</string>
     <string name="session_xserver_simulate_touch_screen">模擬觸控螢幕</string>
     <string name="session_xserver_preferences_button_text">   偏好設定   </string>
     <string name="session_xserver_extra_keys_config_desc">您可以在此設定額外按鍵變數的值，就像在 Termux 應用程式中一樣（請閱讀<a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">此文</a>）以及更多\n
@@ -526,12 +572,6 @@
     <string name="session_xserver_pref_kbd">鍵盤</string>
     <string name="session_xserver_pref_other">其他</string>
     <string name="session_xserver_pref_version">版本</string>
-    <string name="session_xserver_use_dri3_description">停用可能修復某些裝置上的圖形故障</string>
-    <string name="session_xserver_native_rendering">原生渲染</string>
-    <string name="session_xserver_native_rendering_enabled">DRI3 硬體渲染</string>
-    <string name="session_xserver_native_rendering_disabled">軟體 WSI 備援</string>
-    <string name="session_xserver_native_rendering_enabled_toast">原生渲染已啟用（下次啟動時生效）</string>
-    <string name="session_xserver_native_rendering_disabled_toast">原生渲染已停用（下次啟動時生效）</string>
     <string name="session_xserver_notification_description">WinNative XServer 訊息</string>
     <string name="session_xserver_notification_content">WinNative 正在運行，請勿關閉或滑動移除此通知</string>
 
@@ -551,6 +591,8 @@
     <string name="session_drawer_exit_subtitle">關閉執行中的工作階段</string>
     <string name="session_drawer_touchscreen_overlay">觸控螢幕覆蓋層</string>
     <string name="session_drawer_resume">繼續</string>
+    <string name="session_drawer_retry">重試</string>
+    <string name="downloads_no_internet">無網際網路連線</string>
     <string name="session_drawer_pause">暫停</string>
     <string name="session_drawer_wine_processes_paused">Wine 程序已暫停</string>
     <string name="session_drawer_pause_all_wine_processes">暫停所有 Wine 程序</string>
@@ -561,6 +603,33 @@
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">電量</string>
     <string name="session_drawer_hud_element_graph">圖表</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango 風格 HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD 設定</string>
+    <string name="mango_hud_element_gpu_load">GPU 負載</string>
+    <string name="mango_hud_element_gpu_temp">GPU 溫度</string>
+    <string name="mango_hud_element_cpu_load">CPU 負載</string>
+    <string name="mango_hud_element_cpu_temp">CPU 溫度</string>
+    <string name="mango_hud_element_ram">記憶體</string>
+    <string name="mango_hud_element_battery">電池</string>
+    <string name="mango_hud_element_lows" formatted="false">1% 最低幀</string>
+    <string name="mango_hud_element_graph">幀生成時間圖表</string>
+    <string name="mango_hud_element_engine">引擎</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU 頻率</string>
+    <string name="mango_hud_element_gpu_clock">GPU 頻率</string>
+    <string name="mango_hud_element_cores">每核心</string>
+    <string name="mango_hud_element_network">網路</string>
+    <string name="mango_hud_element_swap">交換記憶體</string>
+    <string name="mango_hud_element_resolution">解析度</string>
+    <string name="mango_hud_element_wine">Wine 版本</string>
+    <string name="mango_hud_element_duration">工作階段時長</string>
+    <string name="mango_hud_element_clock">時鐘</string>
+    <string name="mango_hud_element_throttle">溫控狀態</string>
+    <string name="mango_hud_group_memory">記憶體</string>
+    <string name="mango_hud_group_system">系統</string>
+    <string name="mango_hud_lock">鎖定 HUD</string>
+    <string name="mango_hud_lock_subtitle">讓觸控穿透至 HUD 後方的控制項。長按 HUD 即可鎖定。 (5s)</string>
 
     <!-- Session > Task Manager -->
     <string name="session_task_confirm_end_process">您要結束此程序嗎？</string>
@@ -591,6 +660,7 @@
     <string name="session_display_frame_rate">幀率</string>
     <string name="session_display_title">顯示</string>
     <string name="session_display_fullscreen_stretched">啟用全螢幕（拉伸）</string>
+    <string name="session_display_direct_composition">直接合成（零複製）</string>
     <string name="session_display_fps_label">FPS：</string>
     <string name="session_display_renderer_label">渲染器：</string>
     <string name="session_display_gpu_label">GPU：</string>
@@ -664,6 +734,9 @@
     <string name="session_gamepad_error_loading_profile">載入設定檔時發生錯誤</string>
 
     <!-- Session > Gyroscope -->
+    <string name="input_controls_auto_hide_section">觸控螢幕控制</string>
+    <string name="input_controls_auto_hide_on_controller_title">連接控制器時自動隱藏</string>
+    <string name="input_controls_auto_hide_on_controller_summary">連接控制器時隱藏觸控螢幕控制</string>
     <string name="session_gyroscope_title">陀螺儀</string>
     <string name="session_gyroscope_calibrate">校準陀螺儀</string>
     <string name="session_gyroscope_enable_right_stick">啟用右搖桿陀螺儀動態感應</string>
@@ -700,6 +773,7 @@
     <string name="settings_general_select_wallpaper">選取桌布</string>
     <string name="settings_general_title">一般</string>
     <string name="settings_general_enable_file_provider">啟用檔案提供者</string>
+    <string name="settings_general_enable_auto_scraping">啟用自動擷取</string>
     <string name="settings_general_take_effect_next_startup">此選項將在下次啟動時生效。</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">重新安裝 Imagefs</string>
@@ -713,7 +787,7 @@
     <string name="settings_general_share_android_clipboard">與 Wine 共用 Android 剪貼簿</string>
     <string name="settings_general_paths_title">路徑設定</string>
     <string name="settings_general_paths_summary">管理 Winlator 儲存工作資料的位置以及匯出捷徑的寫入位置。</string>
-    <string name="settings_general_winlator_path_title">Winlator 路徑</string>
+    <string name="settings_general_winlator_path_title">儲存路徑</string>
     <string name="settings_general_shortcut_export_path_title">捷徑匯出路徑</string>
     <string name="settings_general_choose_path">選擇路徑</string>
     <string name="settings_general_xserver_cursor_summary">調整 XServer 工作階段中觸控、觸控板和滑鼠輸入的指標速度。</string>
@@ -721,7 +795,9 @@
     <string name="settings_general_cursor_lock_summary">為需要原始指標輸入的遊戲保持直接滑鼠擷取。使用音量降低鍵停用。</string>
     <string name="settings_general_xinput_toggle_title">停用 XInput</string>
     <string name="settings_general_xinput_toggle_summary">當您想要獨佔滑鼠和鍵盤控制時，關閉 XInput 處理。</string>
-    <string name="settings_general_file_provider_summary">將 Winlator 檔案公開給 Android 文件選取器和檔案管理員。</string>
+    <string name="settings_external_display_output_summary">將遊戲移至已連接的外部顯示器，而非鏡像此螢幕。眼鏡一律使用自己的顯示器。</string>
+    <string name="settings_general_file_provider_summary">將 WinNative 檔案公開給 Android 文件選取器和檔案管理員。</string>
+    <string name="settings_general_auto_scraping_summary">讓 WinNative 自動擷取自訂遊戲美術圖。</string>
     <string name="settings_general_open_browser_summary">在 Android 瀏覽器中開啟支援的網頁連結，而非在 Wine 內開啟。</string>
     <string name="settings_general_clipboard_summary">允許在 Android 和 Wine 工作階段之間複製和貼上。</string>
     <string name="settings_general_imagefs_summary">還原捆綁的系統檔案，而不移除您現有的容器。</string>
@@ -750,15 +826,33 @@
     <string name="settings_debug_box_logs_subtitle">將 Box86 &amp; Box64 除錯輸出寫入檔案</string>
     <string name="settings_debug_fex_logs_title">啟用 FEXCore 日誌</string>
     <string name="settings_debug_fex_logs_subtitle">將 FEXCore 除錯輸出寫入檔案</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX 模擬記錄</string>
+    <string name="settings_debug_emulator_logs_subtitle">將容器使用的模擬器記錄到檔案。</string>
     <string name="settings_debug_steam_logs_title">啟用 Steam 日誌</string>
     <string name="settings_debug_steam_logs_subtitle">記錄 Steam 認證和工作階段事件以供除錯。</string>
     <string name="settings_debug_wine_channels_title">Wine 除錯頻道</string>
     <string name="settings_debug_wine_channels_summary">選擇啟用 Wine 除錯記錄時要包含的 Wine 頻道。</string>
+    <string name="settings_debug_wine_classes_title">Wine 記錄層級</string>
+    <string name="settings_debug_wine_classes_summary">選擇要記錄的訊息類型。Trace 極為詳細。</string>
     <string name="settings_debug_input_logs">輸入日誌</string>
     <string name="settings_debug_input_logs_description">記錄手把、觸控和鍵盤輸入事件</string>
     <string name="settings_debug_download_logs">下載日誌</string>
     <string name="settings_debug_download_logs_description">記錄下載解析器和 WinNative 備援事件</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan 驗證層</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">重新啟動顯示以套用。</string>
     <string name="settings_debug_share_logs">分享日誌</string>
+    <string name="settings_debug_delete_logs">刪除日誌</string>
+    <string name="settings_debug_share_all_logs_short">全部分享</string>
+    <string name="settings_debug_download_all_logs_short">全部下載</string>
+    <string name="settings_debug_logs_saved">已儲存至 %1$s</string>
+    <string name="settings_debug_delete_logs_short">刪除</string>
+    <string name="settings_debug_delete_all_logs_short">全部刪除</string>
+    <string name="settings_debug_open_logs_folder_short">開啟日誌管理器</string>
+    <string name="settings_debug_logs_deleted">日誌已刪除</string>
+    <string name="settings_debug_delete_logs_confirm_title">刪除日誌？</string>
+    <string name="settings_debug_delete_logs_confirm_message">這會永久刪除所有已儲存的日誌檔案（%1$s）。此操作無法復原。</string>
+    <string name="settings_debug_logs_browser_title">日誌</string>
+    <string name="settings_debug_log_truncated">正在顯示此日誌的最後 %1$s</string>
     <string name="settings_debug_logs_subject">WinNative 日誌 (%1$s)</string>
     <string name="settings_debug_no_logs_available">沒有可用的除錯日誌。請先啟用除錯選項並啟動遊戲。</string>
     <string name="settings_debug_capture_failed">無法擷取日誌：%1$s</string>
@@ -773,6 +867,8 @@
 
     <string name="settings_other_language_title">語言</string>
     <string name="settings_other_language_summary">選擇顯示語言</string>
+    <string name="settings_other_game_language_title">遊戲語言</string>
+    <string name="settings_other_game_language_summary">Steam/Epic/GOG 下載的偏好語言</string>
     <string name="settings_other_language_system_default">系統預設</string>
 
     <string name="settings_other_section_integration">整合</string>
@@ -790,7 +886,7 @@
     <string name="settings_content_empty_subtitle">安裝套件或切換類型以開始。</string>
     <string name="settings_content_container_created">已建立容器：%1$s</string>
     <string name="settings_content_download_failed">下載失敗。</string>
-    <string name="common_ui_working">處理中…</string>
+    <string name="common_ui_working">處理中</string>
     <string name="settings_content_desc_wine">由 Wine 專案製作；將 Win32 呼叫轉譯為原生 Linux/Android 服務。</string>
     <string name="settings_content_desc_proton">由 Valve 製作；基於 Wine 的執行階段，包含 Windows 遊戲修補程式。</string>
     <string name="settings_content_desc_dxvk">將 Direct3D 9、10 與 11 圖形呼叫轉譯為 Vulkan。</string>
@@ -798,6 +894,7 @@
     <string name="settings_content_desc_box64">轉譯 x86_64 Linux 程式碼，使其可在 ARM64 裝置上執行。</string>
     <string name="settings_content_desc_wowbox64">WoW64 使用的 Box64 建置，用於在 64 位元 Wine 中執行 32 位元 Windows 應用程式。</string>
     <string name="settings_content_desc_fexcore">轉譯 x86 與 x86_64 程式碼，使其可在 ARM64 裝置上執行。</string>
+    <string name="settings_content_desc_d7vk">將 DirectDraw（Direct3D 7 與更早版本）圖形呼叫轉譯為 Vulkan。</string>
     <string name="settings_content_unable_to_install">無法安裝內容。</string>
     <string name="settings_content_install_failed">安裝失敗</string>
     <string name="settings_content_file_cannot_be_recognized">無法識別檔案。</string>
@@ -812,6 +909,11 @@
     <string name="settings_content_extracting_detail">正在解壓\u2026（%1$d 個檔案）</string>
     <string name="settings_content_preparing_package">正在準備套件\u2026</string>
     <string name="settings_content_download_complete">下載完成</string>
+    <string name="settings_content_already_installed_title">元件已安裝</string>
+    <string name="settings_content_already_installed_message">此元件已安裝。再次下載前請先移除已安裝的副本。
+
+安裝路徑：
+%1$s</string>
     <string name="settings_content_conflicting_title">已安裝衝突的內容</string>
     <string name="settings_content_conflicting_message">請先解除安裝衝突的內容再下載此套件。
 
@@ -820,7 +922,7 @@
     <string name="settings_content_cannot_be_trusted">內容無法被信任。</string>
     <string name="settings_content_is_incomplete">內容不完整。</string>
     <string name="settings_content_untrusted_files_warning">警告：附加內容包含不受信任的檔案。通常以下檔案不應被修改。請決定是否繼續安裝。</string>
-    <string name="settings_content_confirm_remove">您要移除此內容嗎？</string>
+    <string name="settings_content_confirm_remove">這會從您的裝置中刪除此元件。</string>
     <string name="settings_content_unable_to_remove_in_use">無法移除此內容，因為有容器正在使用此 Wine。</string>
     <string name="settings_content_download_in_components">尚未下載。請在元件中下載一個。</string>
     <string name="settings_content_types_header">內容類型</string>
@@ -832,7 +934,10 @@
     <string name="settings_drivers_install">安裝驅動程式</string>
     <string name="settings_drivers_installed_success">驅動程式已成功安裝。</string>
     <string name="settings_drivers_install_failed">驅動程式安裝失敗。</string>
-    <string name="settings_drivers_confirm_remove">您要移除此驅動程式嗎？</string>
+    <string name="settings_drivers_remove_title">移除驅動程式？</string>
+    <string name="settings_drivers_confirm_remove">這會從您的裝置中刪除此驅動程式。</string>
+    <string name="settings_drivers_remove_repo_title">移除儲存庫？</string>
+    <string name="settings_drivers_remove_repo_message">%1$s 將從您的儲存庫清單中移除。</string>
     <string name="settings_drivers_repo_tap_to_load">點擊以載入版本</string>
     <string name="settings_drivers_repo_loading_releases">正在載入版本\u2026</string>
     <string name="settings_drivers_repo_release_count">已載入 %1$d 個版本</string>
@@ -913,6 +1018,9 @@
     <string name="google_cloud_sync_started">雲端同步已開始。</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Google 服務</string>
+    <string name="google_auto_signin_title">啟動時登入 Google</string>
+    <string name="google_auto_signin_summary">應用程式啟動時自動連線到 Google Play 遊戲，讓存檔備份與同步隨時就緒。關閉時，應用程式絕不會自行登入。</string>
+    <string name="google_auto_signin_section">啟動時</string>
     <string name="google_cloud_play_games">Google Play 遊戲</string>
     <string name="google_cloud_status_syncing">同步中</string>
     <string name="google_cloud_status_connected">已連線</string>
@@ -971,22 +1079,30 @@
     <string name="saves_import_export_exported_failed">匯出存檔失敗：%1$s</string>
     <string name="saves_import_export_imported">存檔已成功匯入</string>
     <string name="saves_import_export_imported_failed">匯入存檔失敗：%1$s</string>
+    <string name="saves_export_path_summary">存檔將匯出到 /WinNative/saves</string>
+    <string name="saves_export_success_path">已匯出到 %1$s</string>
+    <string name="saves_export_warning_title">僅用於自訂遊戲</string>
+    <string name="saves_export_warning_body">匯出可能包含從商店安裝或啟用雲端同步的遊戲存檔。</string>
+    <string name="saves_import_warning_title">這將覆寫此容器中的現有存檔</string>
+    <string name="saves_import_warning_body">還原包含多個遊戲的舊備份時，請先使用檔案管理員將較新的存檔複製到該 zip 檔案中。只有 .zip 中存在的存檔會受到影響。請謹慎管理你的存檔。</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">容器</string>
-    <string name="preloader_initializing">正在初始化…</string>
-    <string name="preloader_launching">正在啟動…</string>
-    <string name="preloader_closing">正在關閉 %1$s…</string>
-    <string name="preloader_setup_environment">正在設定環境…</string>
-    <string name="preloader_installing_mono">正在安裝 Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">正在安裝可轉散發套件…</string>
-    <string name="preloader_unpacking_exe">正在解壓遊戲執行檔…</string>
-    <string name="preloader_downloading_cloud">正在下載雲端存檔…</string>
-    <string name="preloader_syncing_cloud">正在同步雲端存檔…</string>
-    <string name="preloader_cloud_downloading">雲端同步下載中…</string>
-    <string name="preloader_cloud_backup">正在備份存檔至 Google 雲端硬碟…</string>
+    <string name="preloader_initializing">正在初始化</string>
+    <string name="preloader_launching">正在啟動</string>
+    <string name="preloader_closing">正在關閉 %1$s</string>
+    <string name="preloader_setup_environment">正在設定環境</string>
+    <string name="preloader_retrying_steam_client_download">正在重試下載 Steam 用戶端</string>
+    <string name="preloader_installing_mono">正在安裝 Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">正在安裝可轉散發套件</string>
+    <string name="preloader_unpacking_exe">正在解壓遊戲執行檔</string>
+    <string name="preloader_downloading_cloud">正在下載雲端存檔</string>
+    <string name="preloader_syncing_cloud">正在同步雲端存檔</string>
+    <string name="preloader_uploading_cloud">正在上傳雲端存檔</string>
+    <string name="preloader_checking_cloud">正在檢查雲端存檔</string>
+    <string name="preloader_cloud_sync_retry">%1$s 重試 %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">雲端同步下載中</string>
     <string name="cloud_sync_failed_provider">%1$s 雲端同步失敗。</string>
-    <string name="google_cloud_backup_failed">Google 雲端硬碟備份失敗。</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
@@ -994,15 +1110,11 @@
 
     <!-- Missing translations -->
     <string name="common_ui_graphics">圖形</string>
-    <string name="container_backups_title">備份</string>
-    <string name="container_backups_prompt">選擇要對此容器備份執行的操作。</string>
-    <string name="container_backups_backing_up">正在備份容器…</string>
-    <string name="container_backups_restoring">正在還原容器…</string>
-    <string name="container_backups_checking">正在檢查容器備份…</string>
-    <string name="container_backups_select_title">選擇要還原的備份</string>
-    <string name="container_backups_no_files">未在 Google Drive 中找到容器備份。</string>
     <string name="steam_section_title">Steam</string>
+    <string name="binding_primary">主要綁定</string>
     <string name="binding_secondary">次要綁定</string>
+    <string name="binding_third">第三綁定</string>
+    <string name="binding_fourth">第四綁定</string>
     <string name="input_controls_editor_tap_to_switch">點按切換</string>
     <string name="input_controls_editor_download_profile">下載設定檔</string>
     <string name="container_config_emulator_section">模擬器</string>
@@ -1010,6 +1122,7 @@
     <string name="session_drawer_fps_monitor">FPS 監視器</string>
     <string name="session_drawer_fps_monitor_subtitle">顯示即時效能統計資料</string>
     <string name="session_drawer_dual_series_battery">Dual Series 電量</string>
+    <string name="session_drawer_hud_frametime_numeric">將影格時間顯示為數字</string>
     <string name="session_drawer_command_center">控制中心</string>
     <string name="session_drawer_command_center_input">輸入</string>
     <string name="session_drawer_command_center_display">顯示</string>
@@ -1022,7 +1135,6 @@
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">自然</string>
     <string name="session_drawer_color_profile_crt">CRT 效果</string>
-    <string name="session_drawer_upscaler_dls">鮮豔</string>
     <string name="session_drawer_calibrate_advanced">進階校準</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">陀螺儀</string>
@@ -1034,7 +1146,6 @@
     <string name="session_drawer_rail_label_mouse">滑鼠</string>
     <string name="session_drawer_rail_label_fullscreen">全螢幕</string>
     <string name="session_drawer_rail_label_pip">子母</string>
-    <string name="session_drawer_rail_label_native">原生</string>
     <string name="session_drawer_rail_label_magnifier">縮放</string>
     <string name="session_drawer_rail_label_task_manager">工作</string>
     <string name="session_drawer_rail_label_logs">日誌</string>
@@ -1048,24 +1159,23 @@
     <string name="session_drawer_logs_share_chooser">分享工作階段日誌</string>
     <string name="session_drawer_logs_share_failed">無法分享日誌</string>
     <string name="session_drawer_logs_share_empty">沒有可分享的日誌行</string>
-    <string name="session_drawer_super_resolution">銳化濾鏡</string>
-    <string name="session_drawer_upscaler_mode">濾鏡</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
+    <string name="session_drawer_super_resolution">超解析度</string>
+    <string name="session_drawer_upscaler_mode">升尺度器</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_vivid">鮮豔</string>
+    <string name="session_drawer_vivid_strength">鮮豔強度</string>
     <string name="session_drawer_main_menu_title">選單</string>
     <string name="session_gyroscope_activator">啟動器</string>
     <string name="settings_general_check_for_updates">檢查更新</string>
     <string name="settings_general_check_for_updates_summary">啟動時及定期自動檢查新版本。</string>
     <string name="setup_wizard_containers">容器設定</string>
-    <string name="google_cloud_auto_backup">雲端同步自動備份</string>
-    <string name="google_cloud_auto_backup_summary">每次退出遊戲時自動將遊戲存檔備份到 Google Drive。</string>
     <string name="cloud_saves_title">雲端存檔</string>
-    <string name="cloud_saves_backup">備份雲端存檔</string>
-    <string name="cloud_saves_restore">還原雲端存檔</string>
+    <string name="cloud_saves_title_for_provider">%1$s 雲端存檔 - %2$s</string>
     <string name="cloud_sync_title">雲端同步</string>
     <string name="cloud_sync_enabled_summary">啟動時下載雲端存檔，並在退出時同步/備份。</string>
     <string name="cloud_sync_disabled_summary">啟動此遊戲時不下載雲端存檔，也不在退出時同步。</string>
-    <string name="cloud_saves_backing_up">正在備份雲端存檔…</string>
-    <string name="cloud_saves_restoring">正在還原雲端存檔…</string>
+    <string name="cloud_saves_backing_up">正在備份雲端存檔</string>
+    <string name="cloud_saves_restoring">正在還原雲端存檔</string>
 
     <!-- Synced Box64/FEXCore environment help strings -->
     <string name="box64_env_var_help__aes">Exposes AES CPU capabilities to the guest.</string>
@@ -1073,6 +1183,7 @@
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_sep">Adds secondary entry points to optimize CALL/RET when CALLRET is enabled.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">控制在多次執行之間快取產生的動態重編譯區塊，以加快啟動速度。</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__pclmulqdq">Exposes PCLMULQDQ CPU capabilities to the guest.</string>
     <string name="box64_env_var_help__shaext">Exposes SHA extension CPU capabilities to the guest.</string>
@@ -1086,4 +1197,1281 @@
     <string name="fexcore_env_var_help__kernelunalignedatomicbackpatching">Backpatches kernel-handled unaligned atomics to reduce kernel context switches.</string>
     <string name="fexcore_env_var_help__maxinst">Maximum number of instructions stored in a compiled block.</string>
     <string name="fexcore_env_var_help__strictinprocesssplitlocks">Uses a strict process-wide lock for split unaligned atomic accesses.</string>
+    <!-- Translated batch (110 strings) -->
+    <string name="cloud_saves_history_empty">尚無先前的存檔備份。被取代的存檔和手動備份將在此顯示 30 天。</string>
+    <string name="cloud_saves_history_loading">正在載入存檔歷史紀錄\u2026</string>
+    <string name="cloud_saves_history_origin_auto">自動</string>
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
+    <string name="cloud_saves_history_origin_cloud">雲端</string>
+    <string name="cloud_saves_history_origin_local">本機</string>
+    <string name="cloud_saves_history_origin_manual">手動</string>
+    <string name="cloud_saves_history_refresh">重新整理</string>
+    <string name="cloud_saves_history_rename">重新命名</string>
+    <string name="cloud_saves_history_rename_clear">清除</string>
+    <string name="cloud_saves_history_rename_failed">無法重新命名備份。</string>
+    <string name="cloud_saves_history_rename_hint">例如：Boss 戰、結局前</string>
+    <string name="cloud_saves_history_rename_save">儲存</string>
+    <string name="cloud_saves_history_rename_success">備份已重新命名。</string>
+    <string name="cloud_saves_history_rename_title">為此備份命名</string>
+    <string name="cloud_saves_history_restore">還原</string>
+    <string name="cloud_saves_history_restore_confirm_body">這將以 %1$s 的備份取代您目前的本機存檔。</string>
+    <string name="cloud_saves_history_restore_confirm_title">還原此備份？</string>
+    <string name="cloud_saves_history_restore_failed">無法還原此備份。</string>
+    <string name="cloud_saves_history_restore_success">存檔已從備份還原。</string>
+    <string name="cloud_saves_history_sign_in">請登入 Google 以檢視您的存檔歷史紀錄。</string>
+    <string name="cloud_saves_history_title">存檔歷史紀錄</string>
+    <string name="cloud_saves_history_download">下載</string>
+    <string name="cloud_saves_history_download_success">檔案已下載。</string>
+    <string name="cloud_saves_history_download_failed">下載失敗。</string>
+    <string name="cloud_saves_keep_replaced_backup">保留被取代存檔的備份</string>
+    <string name="cloud_saves_keep_replaced_backup_summary">若您改變心意，可從存檔歷史紀錄中還原。</string>
+    <string name="cloud_saves_no_backups">此遊戲尚無備份。</string>
+    <string name="cloud_saves_offline_mode">停用雲端同步</string>
+    <string name="cloud_saves_offline_mode_summary">停止此遊戲的所有自動雲端活動。</string>
+    <string name="cloud_saves_sync_from_provider">從 %1$s 雲端同步</string>
+    <string name="cloud_saves_sync_from_provider_failed">無法從 %1$s 下載存檔。</string>
+    <string name="cloud_saves_gog_manage_label">管理 GOG 雲端存檔</string>
+    <string name="cloud_saves_gog_manage_helper">開啟 GOG 官方網站</string>
+    <string name="cloud_saves_gog_manage_no_browser">沒有可用的瀏覽器可開啟 GOG 雲端存檔頁面</string>
+    <string name="cloud_saves_gog_zip_label">下載 GOG 雲端 Zip</string>
+    <string name="cloud_saves_gog_zip_helper">儲存目前的雲端檔案</string>
+    <string name="cloud_saves_gog_zip_success">GOG 雲端存檔 zip 已儲存。</string>
+    <string name="cloud_saves_gog_zip_failed">無法儲存 GOG 雲端存檔 zip。</string>
+    <string name="cloud_saves_gog_zip_empty">找不到 GOG 雲端存檔檔案。</string>
+    <string name="cloud_saves_sync_from_provider_generic">從雲端同步</string>
+    <string name="cloud_saves_sync_from_provider_success">%1$s 雲端存檔已下載。</string>
+    <string name="cloud_saves_syncing_from_provider">正在從 %1$s 下載存檔\u2026</string>
+    <string name="cloud_saves_sync_summary">取得 %1$s 目前擁有的版本。</string>
+    <string name="cloud_saves_sync_summary_generic">取得目前的雲端版本。</string>
+    <string name="common_ui_exit_app_confirm">結束 WinNative？</string>
+    <string name="container_surface_effect">介面效果</string>
+    <string name="downloads_queue_cancel_download_confirm">取消 %1$s 的下載並刪除所有已下載的檔案？</string>
+    <string name="downloads_queue_paused_resume_hint">已暫停 - 點選「繼續」以繼續下載</string>
+    <string name="downloads_queue_phase_applying_data">正在套用資料</string>
+    <string name="downloads_queue_phase_downloading">正在下載</string>
+    <string name="downloads_queue_phase_downloading_file">正在下載 [%1$s]</string>
+    <string name="downloads_queue_phase_finalizing">正在完成</string>
+    <string name="downloads_queue_phase_patching">正在修補</string>
+    <string name="downloads_queue_phase_preparing">正在準備</string>
+    <string name="downloads_queue_phase_queued">已排隊</string>
+    <string name="downloads_queue_phase_unknown">未知</string>
+    <string name="downloads_queue_phase_unpacking">正在解壓縮</string>
+    <string name="downloads_queue_phase_updating">正在更新</string>
+    <string name="downloads_queue_phase_verifying">正在驗證</string>
+    <string name="downloads_queue_phase_verifying_file">正在驗證 [%1$s]</string>
+    <string name="downloads_queue_status_label">狀態：</string>
+    <string name="downloads_queue_this_game">此遊戲</string>
+    <string name="hud_position_bottom_center">底部置中</string>
+    <string name="hud_position_bottom_left">左下角</string>
+    <string name="hud_position_bottom_right">右下角</string>
+    <string name="hud_position_left_center">左側置中</string>
+    <string name="hud_position_menu_title">移動 HUD 至</string>
+    <string name="hud_position_right_center">右側置中</string>
+    <string name="hud_position_top_center">頂部置中</string>
+    <string name="hud_position_top_left">左上角</string>
+    <string name="hud_position_top_right">右上角</string>
+    <string name="input_controls_editor_number_of_bindings">按鍵綁定數量</string>
+    <string name="input_controls_editor_opacity">不透明度</string>
+    <string name="input_controls_editor_radial_menu">放射狀選單</string>
+    <string name="input_controls_editor_radial_menu_options">放射狀選單選項</string>
+    <string name="input_controls_tap_to_click">點觸即按</string>
+    <string name="input_controls_reverse_binding_order">反向綁定顺序</string>
+    <string name="num_controllers">控制器數量</string>
+    <string name="session_drawer_controls_section">控制</string>
+    <string name="session_drawer_header_subtitle">快速存取控制、覆蓋層及工作階段工具</string>
+    <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_alpha_input_title">設定 Alpha</string>
+    <string name="session_drawer_hud_disabled_hint">開啟覆蓋層以進行自訂</string>
+    <string name="session_drawer_hud_elements">HUD 元素</string>
+    <string name="session_drawer_hud_input_hint">請輸入 %1$d 到 %2$d 之間的值。超出限制的值將被截斷。</string>
+    <string name="session_drawer_hud_scale">縮放</string>
+    <string name="session_drawer_hud_scale_input_title">設定縮放</string>
+    <string name="session_drawer_hud_summary">調整覆蓋層可見性與資料顯示點</string>
+    <string name="session_drawer_screen_effects">螢幕效果</string>
+    <string name="session_drawer_session_section">工作階段</string>
+    <string name="session_drawer_swipe_hint">向外滑動即可返回遊戲</string>
+    <string name="session_gamepad_enable_vibration">啟用震動</string>
+    <string name="session_gyroscope_experimental_mouse_movement">實驗性滑鼠移動</string>
+    <string name="session_gyroscope_mouse_scale">滑鼠縮放</string>
+    <string name="session_gyroscope_mouse_sensitivity_format">滑鼠縮放：%1$d%%</string>
+    <string name="settings_other_setup_wizard_summary">再次開啟設定精靈以檢視權限、系統檔案與預設容器。</string>
+    <string name="settings_other_setup_wizard_title">設定精靈</string>
+    <string name="shortcuts_library_artwork_failed">載入所選圖片失敗。</string>
+    <string name="shortcuts_library_artwork_open_source">開啟 SteamGridDB</string>
+    <string name="shortcuts_library_artwork_set">設定圖片</string>
+    <string name="shortcuts_library_artwork_title">遊戲庫美術圖</string>
+    <string name="shortcuts_library_artwork_icon_title">圖示圖片</string>
+    <string name="shortcuts_library_artwork_hero_title">背景</string>
+    <string name="shortcuts_list_readded_existing">已重新新增現有捷徑</string>
+    <string name="shortcuts_properties_runtime_patcher">執行時期 DRM 修補程式</string>
+    <string name="shortcuts_properties_runtime_patcher_description">啟動時注入 DRM 修補 DLL。會降低 FPS——僅在單獨使用舊版啟動器失敗時使用。</string>
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">選擇存檔資料夾</string>
+    <string name="cloud_saves_custom_folder_label">存檔資料夾</string>
+    <string name="cloud_saves_custom_select_folder_summary">指向容器內的存檔目錄</string>
+    <string name="cloud_saves_custom_no_container">此捷徑沒有可用的容器</string>
+    <string name="cloud_saves_custom_picker_title">選擇存檔資料夾</string>
+    <string name="cloud_saves_custom_outside_drive_c">所選資料夾必須位於容器的 C: 磁碟內</string>
+    <string name="cloud_saves_custom_path_map_failed">無法將所選資料夾對應為 Windows 路徑。</string>
+    <string name="cloud_saves_custom_folder_set">存檔資料夾已設為 %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">從 Steam Cloud 同步</string>
+    <string name="cloud_saves_steam_sync_helper">下載最新存檔</string>
+    <string name="cloud_saves_steam_sync_success">已從 Steam Cloud 同步</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud 同步失敗</string>
+    <string name="cloud_saves_steam_browse_label">查看 Steam Cloud 雲端存檔</string>
+    <string name="cloud_saves_steam_browse_helper">開啟雲端儲存空間</string>
+    <string name="cloud_saves_steam_browse_no_browser">沒有可用的瀏覽器可開啟 Steam 頁面</string>
+    <string name="cloud_saves_steam_import_label">匯入檔案</string>
+    <string name="cloud_saves_steam_import_helper">還原已下載的檔案</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">檔案選擇器無法使用</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">這會下載 Steam Cloud 目前的存檔檔案，並覆寫目前的存檔檔案。</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">應用程式 ID 無效</string>
+    <string name="cloud_saves_label_saved">標籤已儲存</string>
+    <string name="downloads_queue_cancel_all_title">取消所有下載？</string>
+    <string name="downloads_queue_cancel_all_warning">取消 DLC、遊戲或更新下載可能會損壞你的遊戲安裝。\n\n確定要取消所有下載並刪除目前已下載的檔案嗎？</string>
+    <string name="shortcuts_properties_use_legacy_launcher">使用舊版啟動器</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">舊版 Steam 模擬：透過 ColdClient 啟動器執行遊戲，並從 exe 中移除 SteamStub DRM。僅用於無法使用 Steam Launcher 的舊遊戲。</string>
+    <string name="steam_section_real_client">WinNative 真實 Steam 用戶端</string>
+    <string name="steam_section_emulator">舊版 Steam 模擬器</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">讓模擬的 Steam 用戶端回報為離線，讓遊戲不會嘗試線上連線。適用於在 Steam 網路檢查時卡住的遊戲。</string>
+    <string name="input_controls_select_style">選擇樣式</string>
+    <string name="input_controls_style_original">原版</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">石板</string>
+    <string name="input_controls_style_halo">光環</string>
+    <string name="input_controls_style_glint">微光</string>
+    <string name="input_controls_style_shadow">暗影</string>
+    <string name="input_controls_style_reticle">準星</string>
+    <string name="input_controls_style_neon">霓虹</string>
+    <string name="input_controls_style_lumina">流光</string>
+    <string name="input_controls_accent_theme">顏色主題</string>
+    <string name="input_controls_edit_duplicating_builtin">內建設定檔 - 已建立可編輯副本。</string>
+    <string name="input_controls_editor_confirm_reset_profile">將此設定檔重設為原始版面配置？你所做的任何變更都會遺失。</string>
+    <string name="input_controls_editor_profile_reset">設定檔已重設為原始版面配置。</string>
+    <string name="input_controls_editor_reset_unavailable">此設定檔沒有可用的原始快照。</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan 顯示同步</string>
+    <string name="cloud_sync_disable_title">停用雲端存檔</string>
+    <string name="cloud_saves_steam_push_label">推送到 Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">強制上傳本機存檔</string>
+    <string name="cloud_saves_steam_push_success">存檔已推送到 Steam Cloud。</string>
+    <string name="cloud_saves_steam_push_failed">無法將存檔推送到 Steam Cloud。</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud 目前無法存取。正在背景重新連線重新上線後點按重新整理。</string>
+    <string name="steam_session_refused_event">Steam 拒絕了快取的工作階段 (EResult=%1$d)。請重新登入。</string>
+    <string name="settings_hud_record_to_file_title">將效能記錄到檔案</string>
+    <string name="settings_hud_record_to_file_summary">遊戲過程中每秒將 FPS、CPU、GPU、溫度和電池指標匯出到 /WinNative/logs/。</string>
+    <string name="settings_leaderboard_category">效能</string>
+    <!-- Preloader > Launch Screen -->
+    <string name="preloader_preparing_steam_environment">正在準備 Steam 環境</string>
+    <string name="preloader_starting_wine">正在啟動 Wine</string>
+    <string name="preloader_starting_steam_launcher">正在啟動 Steam Launcher</string>
+    <string name="preloader_loading_steam_client">正在載入 Steam 用戶端</string>
+    <string name="preloader_connecting_to_steam">正在連線至 Steam</string>
+    <string name="preloader_signing_in_to_steam">正在登入 Steam</string>
+    <string name="preloader_fetching_game_info">已登入 — 正在取得遊戲資訊</string>
+    <string name="preloader_steam_ready">Steam 已就緒</string>
+    <string name="preloader_updating_game_info">正在更新遊戲資訊</string>
+    <string name="preloader_verifying_install">正在驗證安裝</string>
+    <string name="preloader_scanning_redists">正在掃描執行階段元件</string>
+    <string name="preloader_installing_redist_single">正在安裝執行階段元件</string>
+    <string name="preloader_installing_named_redist">正在安裝 %1$s</string>
+    <string name="preloader_installing_named_redist_progress">正在安裝 %1$s（%2$s）</string>
+    <string name="preloader_redists_ready">執行階段元件已就緒</string>
+    <string name="preloader_no_redists">沒有要安裝的執行階段元件</string>
+    <string name="preloader_steam_service_running">Steam 服務正在執行</string>
+    <string name="preloader_launching_game">正在啟動 %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher 失敗 — 正在重新準備資源</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher 無法啟動。正在重新準備資源 — 請重新啟動</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher 已到達遊戲，但遊戲未啟動</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">正在載入 Workshop 項目</string>
+    <string name="workshop_search_items">搜尋 Workshop 項目</string>
+    <string name="workshop_title">STEAM 創意工坊</string>
+    <string name="workshop_loading_subtitle">正在從 Steam 取得您訂閱的物品。</string>
+    <string name="workshop_error_title">無法載入創意工坊物品</string>
+    <string name="workshop_error_subtitle">發生錯誤。請重試。</string>
+    <string name="workshop_empty_title">沒有已訂閱的創意工坊物品</string>
+    <string name="workshop_empty_subtitle">在 Steam 創意工坊訂閱物品，然後重新開啟此視窗。</string>
+    <string name="workshop_search_empty_title">沒有符合 \"%1$s\" 的物品</string>
+    <string name="workshop_search_empty_subtitle">請嘗試其他搜尋字詞。</string>
+    <string name="workshop_clear_search">清除搜尋</string>
+    <string name="workshop_item_fallback">創意工坊物品</string>
+    <string name="common_ui_failed">失敗</string>
+    <string name="steam_presence_snooze">小憩</string>
+    <string name="steam_presence_busy">忙碌</string>
+    <string name="steam_presence_looking_to_trade">想交易</string>
+    <string name="steam_presence_looking_to_play">想一起玩</string>
+    <string name="steam_friends_count">好友 — %1$d 在線</string>
+    <string name="steam_friends_section_in_game">遊戲中 (%1$d)</string>
+    <string name="steam_friends_section_online">在線 (%1$d)</string>
+    <string name="steam_friends_section_offline">離線 (%1$d)</string>
+    <string name="steam_friends_none_loaded">尚未載入好友。</string>
+    <string name="steam_friends_chat_off">聊天已關閉。重新開啟聊天服務以查看好友。</string>
+    <string name="steam_friends_self_you">你</string>
+    <string name="steam_friends_in_game">遊戲中</string>
+    <string name="steam_friends_join">加入</string>
+    <string name="steam_friends_play">開始遊戲</string>
+    <string name="steam_chat_image_failed">（圖片傳送失敗）</string>
+    <string name="steam_chat_empty">還沒有訊息。打個招呼吧！</string>
+    <string name="steam_chat_uploading_image">正在上傳圖片…</string>
+    <string name="steam_chat_send_image">傳送圖片</string>
+    <string name="steam_chat_message_hint">訊息…</string>
+    <string name="steam_chat_send">傳送</string>
+    <string name="steam_chat_image">圖片</string>
+    <string name="steam_common_back">返回</string>
+    <string name="steam_achievements_title">成就</string>
+    <string name="steam_achievements_empty">找不到此遊戲的成就，\n或登入 Steam 以載入它們。</string>
+    <string name="steam_achievements_hidden">隱藏成就</string>
+    <string name="steam_achievements_hidden_desc">繼續遊玩以揭示此成就。</string>
+    <string name="steam_achievements_unlocked_on">已解鎖 %1$s</string>
+    <string name="steam_achievements_unlocked">已解鎖</string>
+    <string name="steam_join_joining">正在加入 %1$s 的 %2$s…</string>
+    <string name="steam_join_install">安裝 %1$s 以加入 %2$s</string>
+    <string name="steam_join_not_owned">你未擁有 %1$s</string>
+    <string name="steam_chat_not_sent">（未傳送）</string>
+    <string name="steam_join_the_game">遊戲</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">聊天服務</string>
+    <string name="steam_chat_setting_service_desc">登入以使用好友和聊天；關閉則顯示為離線。</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- Display output / external display -->
+    <string name="session_drawer_rail_label_output">輸出</string>
+    <string name="display_output_prompt_title">偵測到外部顯示器</string>
+    <string name="display_output_prompt_message">將遊戲傳送到已連接的顯示器？你的螢幕控制與選單仍保留在本手機上。</string>
+    <string name="display_output_prompt_swap">切換顯示器</string>
+    <string name="display_output_prompt_mirror">鏡像</string>
+    <string name="display_output_swapped_toast">遊戲已移至外部顯示器。控制仍保留在你的手機上。</string>
+    <string name="display_output_cast_unavailable">此裝置上無法使用無線顯示設定。</string>
+    <string name="display_output_restored_toast">外部顯示器已中斷連線——遊戲已返回手機。</string>
+    <string name="session_drawer_output_title">顯示輸出</string>
+    <string name="session_drawer_output_subtitle">遊戲正在外部顯示器上顯示。</string>
+    <string name="session_drawer_output_device">已連接的顯示器</string>
+    <string name="session_drawer_output_resolution">解析度</string>
+    <string name="session_drawer_output_refresh_rate">更新率</string>
+    <string name="session_drawer_output_aspect_ratio">長寬比</string>
+    <string name="session_drawer_output_aspect_fit">符合（比例）</string>
+    <string name="session_drawer_output_aspect_stretch">拉伸（填滿）</string>
+    <string name="session_drawer_output_aspect_zoom">縮放（裁切）</string>
+    <string name="session_drawer_output_return_to_phone">返回手機</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">投放到電視</string>
+    <string name="session_drawer_output_cast_body">連接 USB-C / HDMI 轉接器，或點選下方連接無線顯示器（Miracast / Wi-Fi Direct）。遊戲將在電視上顯示，而這些控制仍保留在你的手機上。</string>
+    <string name="session_drawer_output_cast_button">連接無線顯示器</string>
+    <string name="session_drawer_output_cast_note">僅支援 Chromecast 的電視無法以私人控制顯示即時遊戲畫面——為獲得最佳效果，請使用無線顯示器或 USB‑C/HDMI 轉接器。</string>
+    <string name="session_drawer_output_render_note">顯示器回報的模式會改變其實際輸出（重新初始化時可能短暫黑屏）。其他解析度會以該尺寸算繪並由硬體縮放到面板——高於原生更清晰（超取樣），低於原生更流暢。</string>
+    <string name="session_drawer_output_scaling_note">此手機以原生 %1$s 輸出顯示，且不會切換模式，因此這裡設定的是算繪解析度 —— 會由硬體縮放至面板（高於原生更銳利，低於原生更流暢）。</string>
+    <string name="session_drawer_output_game_mode">遊戲模式（低延遲）</string>
+    <string name="session_drawer_output_game_mode_on">開</string>
+    <string name="session_drawer_output_game_mode_off">關</string>
+    <string name="session_drawer_output_game_mode_note">請求電視的遊戲/低延遲模式（HDMI ALLM）以盡量減少輸入延遲。僅在已連接的顯示器支援時顯示。</string>
+    <string name="session_drawer_output_send_to_display">將遊戲傳送到顯示器</string>
+    <string name="session_drawer_output_to_display">輸出到外部顯示器</string>
+    <string name="session_drawer_output_send_note">已連接顯示器。將遊戲傳送到該顯示器——你的控制與選單仍保留在本手機上。你可以隨時將其取回這裡。</string>
+    <string name="session_drawer_output_display">顯示</string>
+    <string name="session_drawer_output_glasses">眼鏡</string>
+    <string name="session_drawer_output_brightness">亮度</string>
+    <string name="session_drawer_output_shade">遮光（變暗）</string>
+    <string name="session_drawer_output_3d">3D（左右）</string>
+    <string name="glasses_panel_refresh">更新率</string>
+    <string name="glasses_panel_sunblock">遮光</string>
+    <string name="session_drawer_output_volume">音量</string>
+    <string name="session_drawer_output_glasses_note">透過 USB 直接傳送到你的 Viture 眼鏡。</string>
+
+    <string name="common_ui_new">新增</string>
+    <string name="common_ui_rename">重新命名</string>
+    <string name="gesture_profile_export">匯出手勢設定檔</string>
+    <string name="gesture_profile_import">匯入手勢設定檔</string>
+    <string name="gesture_profile_new">新增手勢設定檔</string>
+    <string name="gesture_profile_none">沒有手勢設定檔</string>
+    <string name="input_controls_editor_input_profiles_section">輸入設定檔</string>
+    <string name="session_drawer_right_stick_sensitivity">右搖桿靈敏度</string>
+    <string name="session_drawer_rts_gestures">RTS 手勢</string>
+    <string name="session_drawer_rts_gestures_edit">編輯</string>
+    <string name="session_drawer_touch">觸控</string>
+    <string name="session_drawer_touch_map_right_stick">對應至右搖桿</string>
+    <string name="session_drawer_touch_touchscreen">觸控螢幕模式</string>
+    <string name="session_drawer_touch_trackpad">觸控板</string>
+    <string name="session_gesture_profile_section">手勢設定檔</string>
+    <string name="session_rts_action">動作</string>
+    <string name="session_rts_behavior">行為</string>
+    <string name="session_rts_double_tap">雙擊（連按兩下左鍵）</string>
+    <string name="session_rts_double_tap_delay">雙擊延遲 (ms)</string>
+    <string name="session_rts_down">下</string>
+    <string name="session_rts_drag">1 指拖曳</string>
+    <string name="session_rts_pan1">1 指平移</string>
+    <string name="session_rts_drag2">2 指拖曳</string>
+    <string name="session_rts_drag_threshold">拖曳閾值 (px)</string>
+    <string name="session_rts_gesture_threshold">手勢閾值 (px)</string>
+    <string name="session_rts_hold2">2 指長按</string>
+    <string name="session_rts_hold3">3 指長按</string>
+    <string name="session_rts_hold4">4 指長按</string>
+    <string name="session_rts_hold_delay">長按延遲 (ms)</string>
+    <string name="session_rts_left">左</string>
+    <string name="session_rts_long_press">長按</string>
+    <string name="session_rts_long_press_delay">長按延遲 (ms)</string>
+    <string name="session_rts_pan">2 指平移</string>
+    <string name="session_rts_pan_threshold">平移/縮放起始 (px)</string>
+    <string name="session_rts_right">右</string>
+    <string name="session_rts_swipe3">3 指滑動</string>
+    <string name="session_rts_swipe4">4 指滑動</string>
+    <string name="session_rts_swipe_threshold">滑動閾值 (px)</string>
+    <string name="session_rts_tap1">1 指輕觸</string>
+    <string name="session_rts_tap2">2 指輕觸</string>
+    <string name="session_rts_tap3">3 指輕觸</string>
+    <string name="session_rts_tap4">4 指輕觸</string>
+    <string name="session_rts_up">上</string>
+    <string name="session_rts_zoom">雙指縮放</string>
+    <string name="session_drawer_brightness">亮度</string>
+    <string name="session_drawer_contrast">對比度</string>
+    <string name="session_drawer_gamma">伽瑪</string>
+    <string name="session_drawer_saturation">飽和度</string>
+    <string name="session_drawer_temperature">色溫</string>
+    <string name="session_drawer_tint">色調</string>
+    <string name="session_drawer_intensity">強度</string>
+    <string name="session_drawer_strength">力度</string>
+    <string name="session_drawer_sharpen">銳化</string>
+    <string name="session_drawer_scanlines">掃描線</string>
+    <string name="session_drawer_pixelate">像素化</string>
+    <string name="session_drawer_block_size">區塊大小</string>
+    <string name="session_drawer_scale">縮放</string>
+    <string name="session_drawer_scale_nearest">最近鄰</string>
+    <string name="session_drawer_scale_linear">線性</string>
+    <string name="session_drawer_scale_bicubic">雙三次</string>
+    <string name="session_drawer_color_profile_ntsc">NTSC</string>
+    <string name="session_drawer_color_profile_ntsc2">NTSC2</string>
+    <string name="session_drawer_color_profile_toon">卡通</string>
+    <string name="session_drawer_color_blind">色盲</string>
+    <string name="session_drawer_color_blind_protan">紅色盲</string>
+    <string name="session_drawer_color_blind_deutan">綠色盲</string>
+    <string name="session_drawer_color_blind_tritan">藍色盲</string>
+    <string name="session_drawer_reset_effects">重置效果</string>
+    <string name="session_drawer_hud_background">背景</string>
+    <string name="session_drawer_hud_background_alpha">背景透明度</string>
+    <string name="session_drawer_hud_background_alpha_input_title">設定背景透明度</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
+    <string name="session_drawer_refactor_size">調整大小</string>
+    <string name="session_task_bring_to_front">置於最上層</string>
+    <string name="session_task_custom_value">自訂值</string>
+    <string name="session_gyroscope_orientation_mode">傾斜瞄準（方向）</string>
+    <!-- File manager -->
+    <string name="file_manager_title">檔案</string>
+    <string name="file_manager_copy">複製</string>
+    <string name="file_manager_cut">剪下</string>
+    <string name="file_manager_paste">貼上</string>
+    <string name="file_manager_paste_here">貼到這裡</string>
+    <string name="file_manager_new_folder">新增資料夾</string>
+    <string name="file_manager_new_folder_short">資料夾</string>
+    <string name="file_manager_multi_select">多選</string>
+    <string name="file_manager_create">建立</string>
+    <string name="file_manager_delete">刪除</string>
+    <string name="file_manager_copy_count">複製 (%1$d)</string>
+    <string name="file_manager_cut_count">剪下 (%1$d)</string>
+    <string name="file_manager_delete_count">刪除 (%1$d)</string>
+    <string name="file_manager_extract">解壓縮</string>
+    <string name="file_manager_extract_here">解壓縮至此</string>
+    <string name="file_manager_extract_to">解壓縮至…</string>
+    <string name="file_manager_extracting">正在解壓縮 %1$s</string>
+    <string name="file_manager_extract_failed">解壓縮失敗</string>
+    <string name="file_manager_run_boot">執行 / 啟動</string>
+    <string name="file_manager_create_shortcut">建立捷徑</string>
+    <string name="file_manager_run_in_container">在容器中執行</string>
+    <string name="file_manager_no_containers">沒有可用的容器</string>
+    <string name="file_manager_delete_confirm">要刪除 \"%1$s\" 嗎？此操作無法復原。</string>
+    <string name="file_manager_delete_confirm_multi">要刪除 %1$d 個項目嗎？此操作無法復原。</string>
+    <string name="file_manager_copying">正在複製 %1$s</string>
+    <string name="file_manager_moving">正在移動 %1$s</string>
+    <string name="file_manager_copying_count">正在複製 %1$d 個項目</string>
+    <string name="file_manager_moving_count">正在移動 %1$d 個項目</string>
+    <string name="file_manager_paste_into_itself">無法將資料夾貼到其本身</string>
+    <string name="file_manager_operation_failed">操作失敗</string>
+    <string name="file_manager_delete_failed">刪除失敗</string>
+    <string name="file_manager_rename_failed">重新命名失敗</string>
+    <string name="file_manager_create_folder_failed">建立資料夾失敗</string>
+    <string name="cloud_saves_google_backup_helper">將副本儲存到 Google Play 遊戲</string>
+    <string name="cloud_saves_google_backup_label">備份到 Google</string>
+    <string name="cloud_saves_google_backup_no_save">找不到可備份的存檔檔案。</string>
+    <string name="cloud_saves_history_cloud_readonly">唯讀</string>
+    <string name="session_drawer_rail_label_record">錄製</string>
+    <string name="session_record_failed">無法開始錄製</string>
+    <string name="session_record_fps">幀率</string>
+    <string name="session_record_include_ui">錄製介面</string>
+    <string name="session_record_include_ui_subtitle">包含 HUD 和螢幕控制項</string>
+    <string name="session_record_now">立即錄製</string>
+    <string name="session_record_quality">品質</string>
+    <string name="session_record_resolution">解析度</string>
+    <string name="session_record_saved">錄製已儲存至 WinNative/Recordings</string>
+    <string name="session_record_settings_title">錄製設定</string>
+    <string name="session_record_started">已開始錄製</string>
+    <string name="steam_chat_setting_stay_running">在背景執行</string>
+    <string name="steam_chat_setting_stay_running_desc">離開 WinNative 後保持聊天執行</string>
+    <string name="settings_content_refresh">重新整理</string>
+    <string name="settings_retro_title">復古</string>
+    <string name="retro_save_transfer_title">傳輸存檔</string>
+    <string name="retro_save_transfer_message">為此遊戲匯入本機存檔，或匯出目前的存檔。</string>
+    <string name="retro_save_transfer_import">匯入存檔</string>
+    <string name="retro_save_transfer_export">匯出存檔</string>
+    <string name="retro_save_transfer_import_ok">已匯入存檔</string>
+    <string name="retro_save_transfer_import_failed">無法匯入存檔</string>
+    <string name="retro_save_transfer_export_ok">已匯出存檔</string>
+    <string name="retro_save_transfer_export_failed">無法匯出存檔</string>
+    <string name="retro_save_transfer_none">此遊戲尚無存檔</string>
+    <string name="retro_cheats_title">金手指</string>
+    <string name="retro_cheats_hardcore_blocked">硬派模式下已停用金手指</string>
+
+    <!-- Retro console menus (translated) -->
+    <string name="retro_ps2_save">儲存</string>
+    <string name="retro_ps2_cancel">取消</string>
+    <string name="retro_ps2_save_state">儲存即時存檔</string>
+    <string name="retro_ps2_load_save_state">載入即時存檔</string>
+    <string name="retro_ps2_achievements">成就</string>
+    <string name="retro_ps2_cheats">金手指</string>
+    <string name="retro_ps2_memory_cards">記憶卡</string>
+    <string name="retro_ps2_fast_forward">快轉</string>
+    <string name="retro_ps2_reset">重置</string>
+    <string name="retro_ps2_swap_disc">更換光碟</string>
+    <string name="retro_ps2_slot">插槽 %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">點按載入</string>
+    <string name="retro_ps2_slot_empty">空</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">點按覆寫</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">空 — 點按儲存</string>
+    <string name="retro_ps2_slot_is_empty">插槽 %1$d 為空</string>
+    <string name="retro_ps2_loaded_slot">已載入插槽 %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">無法載入插槽 %1$d</string>
+    <string name="retro_ps2_saved_to_slot">已儲存至插槽 %1$d</string>
+    <string name="retro_ps2_save_failed">儲存失敗</string>
+    <string name="retro_ps2_slot_1_suffix">  •  插槽 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  插槽 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  點按使用</string>
+    <string name="retro_ps2_new_memory_card">新增記憶卡</string>
+    <string name="retro_ps2_import_card">匯入記憶卡</string>
+    <string name="retro_ps2_enable_online_dev9">啟用連線 (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 網路轉接器 — 重新啟動遊戲以接入</string>
+    <string name="retro_ps2_ethernet_device">乙太網路裝置</string>
+    <string name="retro_ps2_dns_mode">DNS 模式</string>
+    <string name="retro_ps2_primary_dns">主要 DNS</string>
+    <string name="retro_ps2_secondary_dns">次要 DNS</string>
+    <string name="retro_ps2_optional">選填</string>
+    <string name="retro_ps2_auto_ip_dhcp">自動 IP (DHCP)</string>
+    <string name="retro_ps2_server_host">伺服器：%1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">點按設定 IP（留空則移除）</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">新增伺服器主機</string>
+    <string name="retro_ps2_new_server_hostname">新伺服器主機名稱</string>
+    <string name="retro_ps2_server_hostname_hint">例如 bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">螢幕控制</string>
+    <string name="retro_ps2_edit_layout">編輯配置</string>
+    <string name="retro_ps2_reset_layout">重置配置</string>
+    <string name="retro_ps2_layout_reset">配置已重置</string>
+    <string name="retro_ps2_left_stick_invert_x">左搖桿：反轉 X 軸</string>
+    <string name="retro_ps2_left_stick_invert_y">左搖桿：反轉 Y 軸</string>
+    <string name="retro_ps2_right_stick_invert_x">右搖桿：反轉 X 軸</string>
+    <string name="retro_ps2_right_stick_invert_y">右搖桿：反轉 Y 軸</string>
+    <string name="retro_ps2_button_color">按鈕顏色</string>
+    <string name="retro_ps2_letter_color">字母顏色</string>
+    <string name="retro_ps2_shadow_color">陰影顏色</string>
+    <string name="retro_ps2_background_color">背景顏色</string>
+    <string name="retro_ps2_reset_colors">重置顏色</string>
+    <string name="retro_ps2_renderer">渲染器</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">解析度縮放</string>
+    <string name="retro_ps2_scale_1x_native">1x（原生）</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">長寬比</string>
+    <string name="retro_ps2_aspect_stretch">拉伸</string>
+    <string name="retro_ps2_aspect_auto_standard">自動（標準）</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">顯示濾鏡</string>
+    <string name="retro_ps2_filter_nearest">最近鄰</string>
+    <string name="retro_ps2_filter_bilinear_smooth">雙線性（平滑）</string>
+    <string name="retro_ps2_filter_bilinear_sharp">雙線性（銳利）</string>
+    <string name="retro_ps2_texture_filter">紋理濾鏡</string>
+    <string name="retro_ps2_filter_bilinear_forced">雙線性（強制）</string>
+    <string name="retro_ps2_filter_bilinear_ps2">雙線性 (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">雙線性（精靈）</string>
+    <string name="retro_ps2_blending_accuracy">混合精度</string>
+    <string name="retro_ps2_blend_minimum">最低</string>
+    <string name="retro_ps2_blend_basic">基本</string>
+    <string name="retro_ps2_blend_medium">中等</string>
+    <string name="retro_ps2_blend_high">高</string>
+    <string name="retro_ps2_blend_full">完整</string>
+    <string name="retro_ps2_blend_maximum">最高</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV 著色器</string>
+    <string name="retro_ps2_shader_off">關閉</string>
+    <string name="retro_ps2_shader_scanline">掃描線</string>
+    <string name="retro_ps2_shader_diagonal">對角線</string>
+    <string name="retro_ps2_shader_triangular">三角形</string>
+    <string name="retro_ps2_shader_wave">波紋</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">跳格</string>
+    <string name="retro_ps2_frameskip_off">關閉</string>
+    <string name="retro_ps2_frameskip_1">跳 1</string>
+    <string name="retro_ps2_frameskip_2">跳 2</string>
+    <string name="retro_ps2_frameskip_3">跳 3</string>
+    <string name="retro_ps2_mipmapping">Mipmap 貼圖</string>
+    <string name="retro_ps2_volume">音量</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">靜音</string>
+    <string name="retro_ps2_swap_stereo_channels">交換立體聲聲道</string>
+    <string name="retro_ps2_ee_cycle_rate">EE 週期速率</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100%（預設）</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE 週期跳過</string>
+    <string name="retro_ps2_skip_off">關閉</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">即時 VU1</string>
+    <string name="retro_ps2_mtvu">多執行緒 VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">快速 CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">模擬速度</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU 使用率</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU 使用率</string>
+    <string name="retro_ps2_hud_internal_resolution">內部解析度</string>
+    <string name="retro_ps2_deinterlace_mode">反交錯模式</string>
+    <string name="retro_ps2_deint_auto">自動</string>
+    <string name="retro_ps2_deint_off">關閉</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV 長寬比</string>
+    <string name="retro_ps2_anti_blur">抗模糊</string>
+    <string name="retro_ps2_widescreen_patches">寬螢幕補丁</string>
+    <string name="retro_ps2_no_interlace_patches">逐行掃描補丁</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC 自旋偵測</string>
+    <string name="retro_ps2_wait_loop">等待迴圈偵測</string>
+    <string name="retro_ps2_time_stretch">音訊時間延展</string>
+    <string name="retro_ps2_audio_buffer">音訊緩衝</string>
+    <string name="retro_ps2_audio_latency">輸出延遲</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">影格時間</string>
+    <string name="retro_ps2_hud_gs_stats">GS 統計</string>
+    <string name="retro_ps2_hud_hw_info">硬體資訊</string>
+    <string name="retro_ps2_hud_version">版本</string>
+    <string name="retro_ps2_hud_input_display">輸入顯示</string>
+    <string name="retro_ps2_tab_menu">選單</string>
+    <string name="retro_ps2_tab_display">顯示</string>
+    <string name="retro_ps2_tab_performance">效能</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">聲音</string>
+    <string name="retro_ps2_tab_online">連線</string>
+    <string name="retro_ps2_tab_controls">控制</string>
+    <string name="retro_ps2_resume">繼續</string>
+    <string name="retro_ps2_pause">暫停</string>
+    <string name="retro_ps2_exit">離開</string>
+    <string name="retro_lr_bios_imported">已匯入 BIOS：%1$s</string>
+    <string name="retro_lr_invalid_bios_file">無效的 BIOS 檔案</string>
+    <string name="retro_lr_invalid_retro_game">無效的復古遊戲</string>
+    <string name="retro_lr_rom_not_found">找不到 ROM：%1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">無法讀取此壓縮檔內的 ROM</string>
+    <string name="retro_lr_core_not_installed">核心未安裝：%1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">已啟用金手指 — 本次工作階段已停用成就</string>
+    <string name="retro_lr_cloud_save_restored">已還原雲端存檔</string>
+    <string name="retro_lr_restore_failed">還原失敗</string>
+    <string name="retro_lr_cloud_conflict_message">%1$s 有更新的雲端存檔。是否要同步？您希望保留哪個雲端存檔？</string>
+    <string name="retro_lr_cloud_save">雲端存檔</string>
+    <string name="retro_lr_renderer_default">復古</string>
+    <string name="retro_lr_failed_load_core">載入模擬器核心失敗</string>
+    <string name="retro_lr_failed_load_rom">載入 ROM 失敗</string>
+    <string name="retro_lr_graphics_not_supported">此核心不支援圖形顯示</string>
+    <string name="retro_lr_emulator_error">模擬器錯誤</string>
+    <string name="retro_lr_shader_default">預設</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">銳利</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR 放大</string>
+    <string name="retro_lr_upscale_native">原生</string>
+    <string name="retro_lr_sound">聲音</string>
+    <string name="retro_lr_left_stick_invert_x">左搖桿：反轉 X 軸</string>
+    <string name="retro_lr_left_stick_invert_y">左搖桿：反轉 Y 軸</string>
+    <string name="retro_lr_right_stick_invert_x">右搖桿：反轉 X 軸</string>
+    <string name="retro_lr_right_stick_invert_y">右搖桿：反轉 Y 軸</string>
+    <string name="retro_lr_on_screen_controls">螢幕控制</string>
+    <string name="retro_lr_haptic_feedback">觸覺回饋</string>
+    <string name="retro_lr_portrait">直向</string>
+    <string name="retro_lr_landscape">橫向</string>
+    <string name="retro_lr_edit_layout">編輯配置 (%1$s)</string>
+    <string name="retro_lr_reset_layout">重置 %1$s 配置</string>
+    <string name="retro_lr_layout_reset">%1$s 配置已重置</string>
+    <string name="retro_lr_button_color">按鈕顏色</string>
+    <string name="retro_lr_letter_color">字母顏色</string>
+    <string name="retro_lr_shadow_color">陰影顏色</string>
+    <string name="retro_lr_background_color">背景顏色</string>
+    <string name="retro_lr_reset_colors">重置顏色</string>
+    <string name="retro_lr_colors_reset">顏色已重置</string>
+    <string name="retro_lr_performance_hud">效能 HUD</string>
+    <string name="retro_lr_alpha">透明度</string>
+    <string name="retro_lr_background_alpha">背景透明度</string>
+    <string name="retro_lr_background">背景</string>
+    <string name="retro_lr_scale">縮放</string>
+    <string name="retro_lr_numeric_frametime">數字影格時間</string>
+    <string name="retro_lr_dual_series_battery">雙系列電池</string>
+    <string name="retro_lr_hud_elements">HUD 元素</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">主機</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">電池</string>
+    <string name="retro_lr_hud_temp">溫度</string>
+    <string name="retro_lr_hud_graph">圖表</string>
+    <string name="retro_lr_hud_cpu_temp">CPU 溫度</string>
+    <string name="retro_lr_save_state">儲存即時存檔</string>
+    <string name="retro_lr_load_save_state">載入即時存檔</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">硬派模式下停用載入存檔</string>
+    <string name="retro_lr_achievements">成就</string>
+    <string name="retro_lr_cheats">金手指</string>
+    <string name="retro_lr_cheats_disabled_hardcore">硬派模式下停用金手指</string>
+    <string name="retro_lr_reset">重置</string>
+    <string name="retro_lr_fast_forward">快轉</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">硬派模式下停用快轉</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">光碟 %1$d/%2$d</string>
+    <string name="retro_lr_resume">繼續</string>
+    <string name="retro_lr_pause">暫停</string>
+    <string name="retro_lr_exit">離開</string>
+    <string name="retro_lr_saved_to_slot">已儲存至插槽 %1$d</string>
+    <string name="retro_lr_could_not_save_state">無法儲存即時存檔</string>
+    <string name="retro_lr_bios_required_title">需要 %1$s BIOS</string>
+    <string name="retro_lr_bios_required_message">PlayStation 遊戲需要您提供真實主機的 BIOS 檔案。請匯入 BIOS（scph5501.bin、scph5500.bin、scph5502.bin、scph1001.bin 或 scph7001.bin）以繼續。</string>
+    <string name="retro_lr_import_bios">匯入 BIOS…</string>
+    <string name="retro_lr_cancel">取消</string>
+    <string name="retro_lr_slot_empty">插槽 %1$d 為空</string>
+    <string name="retro_lr_loaded_slot">已載入插槽 %1$d</string>
+    <string name="retro_lr_could_not_load_state">無法載入即時存檔</string>
+    <string name="retro_lr_slot_title">插槽 %1$d</string>
+    <string name="retro_lr_rename_slot">重新命名插槽 %1$d</string>
+    <string name="retro_gs_section_general">一般</string>
+    <string name="retro_gs_section_graphics">圖形</string>
+    <string name="retro_gs_section_performance">效能</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">輸入</string>
+    <string name="retro_gs_section_audio">音訊</string>
+    <string name="retro_gs_section_online">連線</string>
+    <string name="retro_gs_cancel">取消</string>
+    <string name="retro_gs_save">儲存</string>
+    <string name="retro_gs_shader_default">預設</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">銳利</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">原生</string>
+    <string name="retro_gs_group_game">遊戲</string>
+    <string name="retro_gs_label_name">名稱</string>
+    <string name="retro_gs_label_system">系統</string>
+    <string name="retro_gs_label_emulator_core">模擬器核心</string>
+    <string name="retro_gs_label_rom_path">ROM 路徑</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">已安裝</string>
+    <string name="retro_gs_bios_none">無 — 執行 %1$s 遊戲所需</string>
+    <string name="retro_gs_import_bios">匯入 BIOS…</string>
+    <string name="retro_gs_remove_bios">移除 BIOS</string>
+    <string name="retro_gs_group_library_artwork">遊戲庫封面</string>
+    <string name="retro_gs_artwork_game_card">遊戲卡片圖片</string>
+    <string name="retro_gs_artwork_grid">網格圖片</string>
+    <string name="retro_gs_artwork_carousel">輪播圖片</string>
+    <string name="retro_gs_artwork_list">清單圖片</string>
+    <string name="retro_gs_artwork_custom_set">已設定自訂圖片</string>
+    <string name="retro_gs_artwork_set_image">設定圖片</string>
+    <string name="retro_gs_artwork_remove">移除</string>
+    <string name="retro_gs_group_video">視訊</string>
+    <string name="retro_gs_video_filter">視訊濾鏡</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR 放大</string>
+    <string name="retro_gs_performance_hud">效能 HUD</string>
+    <string name="retro_gs_group_core">核心</string>
+    <string name="retro_gs_renderer">渲染器</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">解析度縮放</string>
+    <string name="retro_gs_scale_1x_native">1x（原生）</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">長寬比</string>
+    <string name="retro_gs_aspect_stretch">拉伸</string>
+    <string name="retro_gs_aspect_auto_standard">自動（標準）</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">顯示濾鏡</string>
+    <string name="retro_gs_filter_nearest">最近鄰</string>
+    <string name="retro_gs_filter_bilinear_smooth">雙線性（平滑）</string>
+    <string name="retro_gs_filter_bilinear_sharp">雙線性（銳利）</string>
+    <string name="retro_gs_texture_filter">紋理濾鏡</string>
+    <string name="retro_gs_filter_bilinear_forced">雙線性（強制）</string>
+    <string name="retro_gs_filter_bilinear_ps2">雙線性 (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">雙線性（精靈）</string>
+    <string name="retro_gs_blending_accuracy">混合精度</string>
+    <string name="retro_gs_blend_minimum">最低</string>
+    <string name="retro_gs_blend_basic">基本</string>
+    <string name="retro_gs_blend_medium">中等</string>
+    <string name="retro_gs_blend_high">高</string>
+    <string name="retro_gs_blend_full">完整</string>
+    <string name="retro_gs_blend_maximum">最高</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV 著色器</string>
+    <string name="retro_gs_off">關閉</string>
+    <string name="retro_gs_tvshader_scanline">掃描線</string>
+    <string name="retro_gs_tvshader_diagonal">對角線</string>
+    <string name="retro_gs_tvshader_triangular">三角形</string>
+    <string name="retro_gs_tvshader_wave">波紋</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">跳格</string>
+    <string name="retro_gs_frameskip_1">跳 1</string>
+    <string name="retro_gs_frameskip_2">跳 2</string>
+    <string name="retro_gs_frameskip_3">跳 3</string>
+    <string name="retro_gs_mipmapping">Mipmap 貼圖</string>
+    <string name="retro_gs_group_performance">效能</string>
+    <string name="retro_gs_ee_cycle_rate">EE 週期速率</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100%（預設）</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE 週期跳過</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">即時 VU1</string>
+    <string name="retro_gs_mtvu">多執行緒 VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">快速 CDVD</string>
+    <string name="retro_gs_group_performance_hud">效能 HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">模擬速度</string>
+    <string name="retro_gs_hud_cpu_usage">CPU 使用率</string>
+    <string name="retro_gs_hud_gpu_usage">GPU 使用率</string>
+    <string name="retro_gs_hud_internal_resolution">內部解析度</string>
+    <string name="retro_gs_deinterlace_mode">反交錯模式</string>
+    <string name="retro_gs_deint_auto">自動</string>
+    <string name="retro_gs_deint_off">關閉</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV 長寬比</string>
+    <string name="retro_gs_anti_blur">抗模糊</string>
+    <string name="retro_gs_widescreen_patches">寬螢幕補丁</string>
+    <string name="retro_gs_no_interlace_patches">逐行掃描補丁</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC 自旋偵測</string>
+    <string name="retro_gs_wait_loop">等待迴圈偵測</string>
+    <string name="retro_gs_time_stretch">音訊時間延展</string>
+    <string name="retro_gs_audio_buffer">音訊緩衝</string>
+    <string name="retro_gs_audio_latency">輸出延遲</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">影格時間</string>
+    <string name="retro_gs_hud_gs_stats">GS 統計</string>
+    <string name="retro_gs_hud_hw_info">硬體資訊</string>
+    <string name="retro_gs_hud_version">版本</string>
+    <string name="retro_gs_hud_input_display">輸入顯示</string>
+    <string name="retro_gs_fast_boot">快速開機</string>
+    <string name="retro_gs_group_online_dev9">連線 (DEV9)</string>
+    <string name="retro_gs_enable_online">啟用連線</string>
+    <string name="retro_gs_ethernet_device">乙太網路裝置</string>
+    <string name="retro_gs_net_auto">自動</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS 模式</string>
+    <string name="retro_gs_dns_manual">手動</string>
+    <string name="retro_gs_dns_internal">內部</string>
+    <string name="retro_gs_primary_dns">主要 DNS</string>
+    <string name="retro_gs_secondary_dns">次要 DNS</string>
+    <string name="retro_gs_dns_optional">選填</string>
+    <string name="retro_gs_auto_ip_dhcp">自動 IP (DHCP)</string>
+    <string name="retro_gs_group_input">輸入</string>
+    <string name="retro_engine_save">儲存</string>
+    <string name="retro_engine_saved">遊戲已儲存</string>
+    <string name="retro_engine_loading">正在載入…</string>
+    <string name="retro_engine_load">讀取</string>
+    <string name="retro_engine_saved_to">已儲存至 %1$s</string>
+    <string name="retro_engine_slot_active_only">使用中</string>
+    <string name="retro_engine_rename_slot">重新命名存檔欄位</string>
+    <string name="retro_engine_caught">已捕捉 %1$d 隻</string>
+    <string name="retro_engine_no_slots">尚無存檔欄位</string>
+    <string name="retro_engine_new_slot">新增存檔欄位</string>
+    <string name="retro_engine_achievements_unavailable">3D 模式下不記錄</string>
+    <string name="retro_engine_fullscreen">全螢幕</string>
+    <string name="retro_engine_loaded_from">已讀取 %1$s</string>
+    <string name="retro_engine_slot_empty">該存檔欄位是空的</string>
+    <string name="retro_engine_loading_subtitle">正在首次準備遊戲資料</string>
+    <string name="retro_gs_engine_3d">體素 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">使用 3D 體素引擎執行此遊戲，而非標準核心</string>
+    <string name="retro_gs_on_screen_controls">螢幕控制</string>
+    <string name="retro_gs_haptic_feedback">觸覺回饋</string>
+    <string name="retro_gs_group_audio">音訊</string>
+    <string name="retro_gs_volume">音量</string>
+    <string name="retro_gs_mute">靜音</string>
+    <string name="retro_gs_swap_stereo">交換立體聲聲道</string>
+    <string name="retro_gs_sound">聲音</string>
+    <string name="retro_scr_retro_defaults">復古預設設定</string>
+    <string name="retro_scr_retro_defaults_desc">除非在遊戲本身的設定中覆寫，否則將套用至各主機的遊戲。</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">帳戶</string>
+    <string name="retro_scr_signed_in">已登入</string>
+    <string name="retro_scr_not_signed_in_hint">未登入 — 開啟遊戲的成就以登入</string>
+    <string name="retro_scr_achievements_enabled">已啟用成就</string>
+    <string name="retro_scr_hardcore_default">預設硬派模式（無即時存檔）</string>
+    <string name="retro_scr_sign_out">登出</string>
+    <string name="retro_scr_playstation_bios">PLAYSTATION BIOS</string>
+    <string name="retro_scr_installed">已安裝</string>
+    <string name="retro_scr_none_ps1_bios">無 — PS1 遊戲需要 BIOS</string>
+    <string name="retro_scr_import_ps1_bios">匯入 PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">已移除 PS1 BIOS</string>
+    <string name="retro_scr_no_bios_to_remove">沒有可移除的 BIOS</string>
+    <string name="retro_scr_remove_ps1_bios">移除 PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PLAYSTATION 2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">無 — PS2 遊戲需要 BIOS</string>
+    <string name="retro_scr_format">格式</string>
+    <string name="retro_scr_ps2_bios_format">合併的單一檔案傾印（帶區域標記的 .bin，約 4MB）。不接受拆分的 ROM0/MEC/NVM 組。</string>
+    <string name="retro_scr_import_ps2_bios">匯入 PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">已移除 PS2 BIOS</string>
+    <string name="retro_scr_remove_ps2_bios">移除 PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">遊戲庫封面</string>
+    <string name="retro_scr_retro_case_art">復古外殼圖（卡帶 / CD 盒）</string>
+    <string name="retro_scr_box_art">封面圖</string>
+    <string name="retro_scr_box_art_desc">匯入時自動從 thumbnails.libretro.com 取得；自訂圖片一律會覆寫它。</string>
+    <string name="retro_scr_roms_folder">ROM 資料夾</string>
+    <string name="retro_scr_folder">資料夾</string>
+    <string name="retro_scr_roms_not_set">未設定 — 選擇資料夾以自動匯入遊戲</string>
+    <string name="retro_scr_auto_import">自動匯入</string>
+    <string name="retro_scr_auto_import_desc">此資料夾中的新遊戲會自動加入您的遊戲庫，並偵測出正確的主機。</string>
+    <string name="retro_scr_select_roms_folder_title">選擇 ROM 資料夾</string>
+    <string name="retro_scr_select_roms_folder_button">選擇 ROM 資料夾…</string>
+    <string name="retro_scr_change_roms_folder_button">變更 ROM 資料夾…</string>
+    <string name="retro_scr_scan_now">立即掃描</string>
+    <string name="retro_scr_console_defaults">主機預設設定</string>
+    <string name="retro_scr_console_defaults_desc">點按主機以設定其預設設定。</string>
+    <string name="retro_scr_renderer">渲染器</string>
+    <string name="retro_scr_upscale_resolution">放大解析度</string>
+    <string name="retro_scr_aspect_ratio">長寬比</string>
+    <string name="retro_scr_aspect_stretch">拉伸</string>
+    <string name="retro_scr_aspect_auto_standard">自動（標準）</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">顯示濾鏡</string>
+    <string name="retro_scr_filter_nearest">最近鄰</string>
+    <string name="retro_scr_filter_bilinear_smooth">雙線性（平滑）</string>
+    <string name="retro_scr_filter_bilinear_sharp">雙線性（銳利）</string>
+    <string name="retro_scr_texture_filter">紋理濾鏡</string>
+    <string name="retro_scr_filter_bilinear_forced">雙線性（強制）</string>
+    <string name="retro_scr_filter_bilinear_ps2">雙線性 (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">雙線性（精靈）</string>
+    <string name="retro_scr_blending_accuracy">混合精度</string>
+    <string name="retro_scr_blend_minimum">最低</string>
+    <string name="retro_scr_blend_basic">基本</string>
+    <string name="retro_scr_blend_medium">中等</string>
+    <string name="retro_scr_blend_high">高</string>
+    <string name="retro_scr_blend_full">完整</string>
+    <string name="retro_scr_blend_maximum">最高</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV 著色器</string>
+    <string name="retro_scr_shader_off">關閉</string>
+    <string name="retro_scr_shader_scanline">掃描線</string>
+    <string name="retro_scr_shader_diagonal">對角線</string>
+    <string name="retro_scr_shader_triangular">三角形</string>
+    <string name="retro_scr_shader_wave">波紋</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">跳格</string>
+    <string name="retro_scr_skip_1">跳 1</string>
+    <string name="retro_scr_skip_2">跳 2</string>
+    <string name="retro_scr_skip_3">跳 3</string>
+    <string name="retro_scr_mipmapping">Mipmap 貼圖</string>
+    <string name="retro_scr_ee_cycle_rate">EE 週期速率</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100%（預設）</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE 週期跳過</string>
+    <string name="retro_scr_skip_off">關閉</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">即時 VU1</string>
+    <string name="retro_scr_mtvu">多執行緒 VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">快速 CDVD</string>
+    <string name="retro_scr_touch_controls">螢幕觸控</string>
+    <string name="retro_scr_sound">聲音</string>
+    <string name="retro_scr_swap_stereo">交換立體聲聲道</string>
+    <string name="retro_scr_hud_fps">HUD：FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD：模擬速度</string>
+    <string name="retro_scr_hud_cpu_usage">HUD：CPU 使用率</string>
+    <string name="retro_scr_hud_gpu_usage">HUD：GPU 使用率</string>
+    <string name="retro_scr_hud_internal_resolution">HUD：內部解析度</string>
+    <string name="retro_scr_enable_online_dev9">啟用連線 (DEV9)</string>
+    <string name="retro_scr_ethernet_device">乙太網路裝置</string>
+    <string name="retro_scr_net_auto">自動</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS 模式</string>
+    <string name="retro_scr_dns_manual">手動</string>
+    <string name="retro_scr_dns_internal">內部</string>
+    <string name="retro_scr_primary_dns">主要 DNS</string>
+    <string name="retro_scr_secondary_dns">次要 DNS</string>
+    <string name="retro_scr_optional">選填</string>
+    <string name="retro_scr_auto_ip_dhcp">自動 IP (DHCP)</string>
+    <string name="retro_scr_shader">著色器</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR 放大</string>
+    <string name="retro_scr_performance_hud">效能 HUD</string>
+    <string name="retro_scr_credits_licenses">鳴謝 &amp; 授權</string>
+    <string name="retro_scr_credits_desc">WinNative 的部分功能建置於這些開源專案之上。點按即可檢視各來源。</string>
+    <string name="retro_scr_tab_defaults">預設</string>
+    <string name="retro_scr_tab_credits">鳴謝</string>
+    <string name="retro_scr_enable_hardcore_title">啟用硬派模式？</string>
+    <string name="retro_scr_enable_hardcore_body">硬派模式將立即重置遊戲，並停用載入即時存檔、快轉和金手指。任何未儲存的進度都將遺失。是否繼續？</string>
+    <string name="retro_scr_cancel">取消</string>
+    <string name="retro_scr_enable">啟用</string>
+    <string name="retro_scr_bios_imported">已匯入 BIOS：%1$s</string>
+    <string name="retro_scr_invalid_bios_file">無效的 BIOS 檔案</string>
+    <string name="retro_scr_ps2_bios_imported">已匯入 PS2 BIOS：%1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">無效的 PS2 BIOS 檔案</string>
+    <string name="retro_scr_no_game_serial">沒有可用於查詢金手指的遊戲序號。</string>
+    <string name="retro_scr_applied_cheats">已套用 %1$d 個金手指。</string>
+    <string name="retro_scr_couldnt_apply_cheats">無法套用金手指。</string>
+    <string name="retro_scr_cheats">金手指</string>
+    <string name="retro_scr_apply">套用</string>
+    <string name="retro_scr_no_cheats_found">找不到此遊戲的金手指。</string>
+    <string name="retro_scr_achievements">成就</string>
+    <string name="retro_scr_sign_in_ra">登入 RetroAchievements</string>
+    <string name="retro_scr_username">使用者名稱</string>
+    <string name="retro_scr_password">密碼</string>
+    <string name="retro_scr_login_failed">登入失敗</string>
+    <string name="retro_scr_signing_in">正在登入…</string>
+    <string name="retro_scr_sign_in">登入</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d 分</string>
+    <string name="retro_scr_no_achievements">此遊戲沒有成就。</string>
+    <string name="retro_scr_back">返回</string>
+    <string name="retro_scr_enabled">已啟用</string>
+    <string name="retro_scr_disabled">已停用</string>
+    <string name="retro_scr_rename">重新命名</string>
+    <string name="retro_scr_save">儲存</string>
+    <string name="retro_scr_cloud_save_conflict">雲端存檔衝突</string>
+    <string name="retro_scr_keep_local_save">保留本機存檔</string>
+    <string name="retro_scr_auto_color_abbrev">自</string>
+    <string name="retro_tab_menu">選單</string>
+    <string name="retro_tab_display">顯示</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">聲音</string>
+    <string name="retro_tab_controls">控制</string>
+    <string name="retro_scan_up_to_date">遊戲庫已是最新</string>
+    <string name="retro_scan_roms">ROM：%1$s</string>
+    <string name="retro_scan_added">新增 %1$d</string>
+    <string name="retro_scan_removed">移除 %1$d</string>
+    <string name="retro_scr_shader_default">預設</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">銳利</string>
+    <string name="retro_scr_upscale_native">原生</string>
+    <string name="retro_co_aspect_ratio">長寬比</string>
+    <string name="retro_co_ntsc_filter">NTSC 濾鏡</string>
+    <string name="retro_co_colorization">上色</string>
+    <string name="retro_co_color_correction">色彩校正</string>
+    <string name="retro_co_remove_sprite_limit">移除精靈數量限制</string>
+    <string name="retro_co_resolution">解析度</string>
+    <string name="retro_co_framebuffer_emulation">影格緩衝模擬</string>
+    <string name="retro_co_dithering">抖動</string>
+    <string name="retro_co_widescreen_hack">寬螢幕修改</string>
+    <string name="retro_co_val_8_7_native">8:7（原生）</string>
+    <string name="retro_co_val_4_3_tv">4:3（電視）</string>
+    <string name="retro_co_val_off">關閉</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">複合</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">自動</string>
+    <string name="retro_co_val_gba_screen">GBA 螢幕</string>
+    <string name="retro_co_val_gbc_screen">GBC 螢幕</string>
+    <string name="retro_co_val_on">開啟</string>
+    <string name="retro_co_val_320x240_native">320x240（原生）</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 調整</string>
+    <string name="retro_co_val_native">原生</string>
+    <string name="retro_co_val_internal">內部</string>
+    <string name="retro_co_val_on_16_9">開啟 (16:9)</string>
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">使用您的 RetroAchievements 帳戶登入，以獲取並追蹤復古遊戲的成就。</string>
+    <string name="retro_ach_username">使用者名稱</string>
+    <string name="retro_ach_password">密碼</string>
+    <string name="retro_ach_enter_credentials">請輸入您的使用者名稱和密碼</string>
+    <string name="retro_ach_login_failed">登入失敗</string>
+    <string name="retro_ach_sign_in">登入</string>
+    <string name="retro_ach_password_disclaimer">您的密碼僅使用一次以取得登入權杖，該權杖安全儲存在裝置上。</string>
+    <string name="retro_ach_achievements_enabled">已啟用成就</string>
+    <string name="retro_ach_hardcore_mode">硬派模式（無即時存檔）</string>
+    <string name="retro_ach_points">%1$d / %2$d 分</string>
+    <string name="retro_ach_none_found">找不到此遊戲的成就。</string>
+    <string name="retro_ach_sign_out">登出</string>
+    <string name="retro_che_brand">金手指</string>
+    <string name="retro_che_name">名稱</string>
+    <string name="retro_che_code">代碼</string>
+    <string name="retro_che_cancel">取消</string>
+    <string name="retro_che_save">儲存</string>
+    <string name="retro_che_default_name">金手指 %1$d</string>
+    <string name="retro_che_empty">尚無金手指。為此遊戲新增金手指代碼。</string>
+    <string name="retro_che_add">新增金手指</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU 驅動程式</string>
+    <string name="retro_gpu_driver_system">系統（預設）</string>
+    <string name="retro_gpu_driver_hint">在設定 \u2192 驅動程式中安裝 Turnip 驅動程式。同一驅動程式適用於 PC 和 PS2 遊戲。</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">用於 Final Fantasy XI 等基於 HDD 的遊戲的虛擬內建磁碟機。將重新啟動遊戲。</string>
+    <string name="retro_ps2_hdd_desc">用於 Final Fantasy XI 等基於 HDD 的遊戲的虛擬內建磁碟機。</string>
+    <string name="retro_ps2_dns_auto_internal">DNS 模式已設為 Internal，讓你的自訂伺服器主機生效。</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_none">None</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_add_item">Add</string>
+<string name="retro_co_cpu_core">CPU 核心</string>
+<string name="retro_co_dual_core">雙核心</string>
+<string name="retro_co_internal_cheats">內建作弊碼</string>
+<string name="retro_co_internal_resolution">內部解析度</string>
+<string name="retro_co_renderer">算繪器</string>
+<string name="retro_co_sensor_bar">感應棒位置</string>
+<string name="retro_co_skip_gc_bios">略過 BIOS 開場</string>
+<string name="retro_co_val_1x">1×</string>
+<string name="retro_co_val_2x">2×</string>
+<string name="retro_co_val_3x">3×</string>
+<string name="retro_co_val_4x">4×</string>
+<string name="retro_co_val_5x">5×</string>
+<string name="retro_co_val_6x">6×</string>
+<string name="retro_co_val_bottom">下方</string>
+<string name="retro_co_val_cached_interpreter">快取直譯器</string>
+<string name="retro_co_val_hardware">硬體</string>
+<string name="retro_co_val_interpreter">直譯器</string>
+<string name="retro_co_val_jit">JIT</string>
+<string name="retro_co_val_mouse_pointer">滑鼠／觸控</string>
+<string name="retro_co_val_right_stick_absolute">右搖桿（絕對）</string>
+<string name="retro_co_val_right_stick_relative">右搖桿（相對）</string>
+<string name="retro_co_val_software">軟體</string>
+<string name="retro_co_val_stretch">拉伸</string>
+<string name="retro_co_val_top">上方</string>
+<string name="retro_co_vbi_skip">VBI 跳過（自動跳幀）</string>
+<string name="retro_co_widescreen">寬螢幕</string>
+<string name="retro_co_wiimote_pointer">Wiimote 指標</string>
+<string name="retro_gs_cheats_apply_note">變更將於下次啟動此遊戲時套用。</string>
+<string name="retro_gs_cheats_detect_hint">先啟動此遊戲一次以偵測其光碟序號，之後作弊碼與修補檔便會顯示於此。</string>
+<string name="retro_gs_dnas_entry_desc">DNAS 認證繞過 — 線上遊玩所需</string>
+<string name="retro_gs_dnas_group">自動套用（線上）</string>
+<string name="retro_gs_group_cheats">作弊碼與修補檔</string>
+<string name="retro_gs_hdd_image_size">大小：%1$s</string>
+<string name="retro_gs_hdd_import">匯入 HDD 映像</string>
+<string name="retro_gs_hdd_remove_short">移除</string>
+<string name="retro_gs_netplay_enable">啟用 NetPlay</string>
+<string name="retro_gs_netplay_enable_subtitle">預設關閉。啟用後，於啟動前選擇 Host 或 Join。\n退出遊戲時會再次關閉。</string>
+<string name="retro_gs_netplay_host">主機位址</string>
+<string name="retro_gs_netplay_host_hint">IP 或主機名稱</string>
+<string name="retro_gs_netplay_host_mode">主持工作階段</string>
+<string name="retro_gs_netplay_host_mode_subtitle">開 = 等待玩家。關 = 加入主機位址</string>
+<string name="retro_gs_netplay_not_ready">NetPlay 使用透過 TCP 的本機多人遊戲連接埠（玩家 1 為主機／玩家 2 為用戶端）。PS2 線上則改用 DEV9 乙太網路。</string>
+<string name="retro_gs_netplay_port">連接埠</string>
+<string name="retro_lr_memory_card_slot">記憶卡 %1$d</string>
+<string name="retro_lr_screenshot">螢幕截圖</string>
+<string name="retro_lr_use_cloud_save">使用雲端存檔</string>
+<string name="retro_netplay_conn_direct">區域網路（直接 IP）</string>
+<string name="retro_netplay_connecting">連線中…</string>
+<string name="retro_netplay_connection">連線</string>
+<string name="retro_netplay_conn_traversal">線上（主機代碼）</string>
+<string name="retro_netplay_dismiss">關閉</string>
+<string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay 使用 Dolphin 自己的引擎。Host = 玩家 1，Join = 玩家 2。啟動前先選擇 Host 或 Join 以及連線類型；兩台裝置會一起啟動同一款遊戲。</string>
+<string name="retro_netplay_dolphin_host_lan_hint">將你裝置的 Wi‑Fi IP 與此連接埠分享給玩家 2。對方連線後遊戲會自動開始。</string>
+<string name="retro_netplay_dolphin_host_online_hint">遊戲啟動時會顯示主機代碼 — 將它分享給玩家 2。對方連線後遊戲會自動開始。</string>
+<string name="retro_netplay_dolphin_join_lan_hint">輸入主機的 Wi‑Fi IP 與連接埠，然後啟動以連線。</string>
+<string name="retro_netplay_dolphin_join_online_hint">輸入玩家 1 的主機代碼，然後啟動以連線。</string>
+<string name="retro_netplay_enable_before_launch">於遊戲設定中啟用 NetPlay，並在啟動前選擇 Host 或 Join</string>
+<string name="retro_netplay_find_rooms">在 Wi‑Fi 上尋找房間</string>
+<string name="retro_netplay_game_link_hint">Game Link · 每個螢幕都是獨立的掌機</string>
+<string name="retro_netplay_gba_not_ready">GBA 多人遊戲使用 gpSP + 無線轉接器。請確認已安裝 libgpsp。</string>
+<string name="retro_netplay_help">透過 Wi‑Fi 的共享螢幕多人遊戲（類似 RetroArch）。\nHost = 玩家 1，Join = 玩家 2。兩台裝置顯示同一款遊戲。</string>
+<string name="retro_netplay_help_game_link">透過 Wi‑Fi 的 Game Link — 每台裝置執行自己的遊戲。\nGB/GBC：Gambatte 序列連線（Pokémon 第 1–2 世代）。\nGBA：gpSP 無線轉接器（Pokémon FR/LG/綠寶石對戰）。</string>
+<string name="retro_netplay_host_action">主持房間</string>
+<string name="retro_netplay_host_code">主機代碼</string>
+<string name="retro_netplay_host_code_hint">來自主機的穿透主機代碼</string>
+<string name="retro_netplay_hosting_room">主持房間中</string>
+<string name="retro_netplay_host_mode_hint">點選 Host 為此次遊玩開啟房間，然後啟動遊戲。退出時 NetPlay 會關閉。</string>
+<string name="retro_netplay_in_room">在房間中</string>
+<string name="retro_netplay_join_action">依 IP 加入</string>
+<string name="retro_netplay_joined">已加入</string>
+<string name="retro_netplay_join_room">Join</string>
+<string name="retro_netplay_launch_mode">啟動時</string>
+<string name="retro_netplay_leave">離開</string>
+<string name="retro_netplay_menu_hint">Host = P1 · Join = P2 · 兩個螢幕上為同一款遊戲</string>
+<string name="retro_netplay_mode_host">Host</string>
+<string name="retro_netplay_mode_join">Join</string>
+<string name="retro_netplay_mode_manual">手動</string>
+<string name="retro_netplay_no_rooms">找不到房間。請確認主機位於同一個 Wi‑Fi 並正在主持房間。</string>
+<string name="retro_netplay_player_name">顯示名稱</string>
+<string name="retro_netplay_player_name_hint">顯示給其他玩家</string>
+<string name="retro_netplay_players_count">%1$d 位已連線</string>
+<string name="retro_netplay_prelaunch_hint">房間僅於此工作階段開啟。準備好即可啟動。退出遊戲會關閉 NetPlay。</string>
+<string name="retro_netplay_room_players">玩家</string>
+<string name="retro_netplay_scan_action">掃描 Wi‑Fi</string>
+<string name="retro_netplay_scan_again">重新掃描</string>
+<string name="retro_netplay_scan_hint">掃描同一個 Wi‑Fi 以尋找開放的房間，或依 IP 位址加入。</string>
+<string name="retro_netplay_scanning">掃描 Wi‑Fi 中…</string>
+<string name="retro_netplay_scan_results">掃描結果</string>
+<string name="retro_netplay_select_room_hint">點選房間立即加入（不會為下次啟動儲存該 IP）。</string>
+<string name="retro_netplay_stop_scan">停止掃描</string>
+<string name="retro_netplay_title">NetPlay</string>
+<string name="retro_netplay_user_connected">%1$s 已連線</string>
+<string name="retro_netplay_user_disconnected">%1$s 已中斷連線</string>
+<string name="retro_netplay_waiting_players">等待玩家中…</string>
+<string name="retro_ps2_coming_soon">PlayStation 2 支援即將推出</string>
+<string name="retro_ps2_show_l3r3">顯示 L3 / R3 按鈕</string>
+<string name="retro_ps2_show_l3r3_subtitle">關閉時，連點兩下搖桿即可點擊 L3 / R3</string>
+<string name="retro_ps2_turnip_flags">TURNIP 驅動程式旗標</string>
+<string name="retro_ps2_turnip_flags_note">僅在上方選擇了自訂 GPU 驅動程式時才會套用。</string>
+<string name="retro_rom_missing">找不到遊戲檔案</string>
+<string name="retro_scr_delete">刪除</string>
+<string name="retro_scr_import_from_file">從檔案匯入…</string>
+<string name="retro_scr_loading">載入中…</string>
+<string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_gs_change_console">變更主機</string>
+    <string name="retro_gs_identify_as">識別為主機</string>
+    <string name="retro_gs_console_changed">現在識別為 %1$s</string>
+    <!-- ReShade -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">透過內建的 vkBasalt 層將 ReShade 效果（.fx）套用至 DXVK/VKD3D（Vulkan）遊戲。將每個效果放入 Android/data/&lt;package&gt;/files/ReShade/ 下各自的資料夾中。即時參數調整和遊戲內開關將隨即時重新載入層更新一起提供。</string>
+    <string name="reshade_catalog_title">ReShade 效果</string>
+    <string name="reshade_catalog_search">搜尋效果…</string>
+    <string name="reshade_catalog_installed">已安裝 (%1$d)</string>
+    <string name="reshade_catalog_available">可用 (%1$d)</string>
+    <string name="reshade_catalog_downloading">正在下載</string>
+    <string name="reshade_catalog_installing">正在安裝</string>
+    <string name="reshade_catalog_offline_cache">離線 — 顯示快取清單。連線以下載新效果。</string>
+    <string name="reshade_catalog_offline_none">離線 — 僅顯示已安裝的效果。連線以瀏覽目錄。</string>
+    <string name="reshade_catalog_needs_connection">連線至網際網路以下載效果。</string>
+    <string name="reshade_catalog_download_failed">下載 %1$s 失敗。</string>
+    <string name="reshade_catalog_empty_query">沒有與 \"%1$s\" 相符的效果。</string>
+    <string name="reshade_catalog_empty">沒有可用的效果。連線至網際網路以瀏覽目錄。</string>
+    <string name="reshade_catalog_done">完成</string>
+    <string name="reshade_catalog_delete_cd">刪除 %1$s</string>
+    <string name="reshade_catalog_delete_title">刪除 %1$s？</string>
+    <string name="reshade_catalog_delete_body">這會從儲存空間以及使用該效果的所有配置中移除該效果。你可以稍後重新下載。</string>
+    <string name="reshade_catalog_delete_confirm">刪除</string>
+    <string name="reshade_catalog_delete_cancel">取消</string>
+    <string name="reshade_catalog_delete_failed">無法刪除 %1$s。</string>
+    <string name="reshade_params_title">效果參數</string>
+    <string name="reshade_params_reset">重設</string>
+    <string name="reshade_loadout_empty">還沒有效果。新增一個或多個效果以建立配置。</string>
+    <string name="reshade_loadout_add">新增效果</string>
+    <string name="reshade_loadout_full">配置已滿 — 移除一個效果才能再新增。</string>
+    <string name="reshade_effect_active">已啟用</string>
+    <string name="reshade_mode_solo">單獨</string>
+    <string name="reshade_mode_stack">疊加</string>
+    <string name="reshade_mode_solo_hint">一次僅啟用一個效果（A/B 比較，可在遊戲中即時切換）。</string>
+    <string name="reshade_mode_stack_hint">疊加任意效果子集，依序套用。</string>
+    <string name="reshade_drawer_enable">啟用 ReShade</string>
+    <string name="reshade_drawer_empty">此配置中沒有 ReShade 效果。在此遊戲（或容器）的設定中新增效果，即可在此切換與調整。</string>
+    <string name="reshade_drawer_no_params">此效果沒有可調整的參數。</string>
+    <string name="cloud_saves_deleting">正在刪除存檔…</string>
+    <string name="cloud_saves_history_delete">刪除</string>
+    <string name="cloud_saves_history_delete_confirm_body">永久刪除來自 %1$s 的雲端存檔？此操作無法復原。</string>
+    <string name="cloud_saves_history_delete_confirm_title">刪除雲端存檔</string>
+    <string name="cloud_saves_history_delete_failed">無法刪除雲端存檔</string>
+    <string name="cloud_saves_history_delete_success">雲端存檔已刪除</string>
+    <string name="retro_bundle_required">請先下載主機核心 — 設定 › 復古</string>
+    <string name="retro_ps2_device_unsupported">此裝置無法執行 PS2 模擬 — 需要 OpenGL ES 3.1 或更新版本。</string>
+    <string name="retro_scr_consoles_check">檢查更新</string>
+    <string name="retro_scr_consoles_checking">正在檢查更新…</string>
+    <string name="retro_scr_consoles_download">下載主機核心</string>
+    <string name="retro_scr_consoles_downloading">正在下載… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_group">主機核心</string>
+    <string name="retro_scr_consoles_installed">已安裝 — 版本 %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">已安裝 — 版本 %1$s（檢查更新失敗）</string>
+    <string name="retro_scr_consoles_installing">正在安裝…</string>
+    <string name="retro_scr_consoles_missing">未安裝 — 下載後即可遊玩復古遊戲</string>
+    <string name="retro_scr_consoles_state">狀態</string>
+    <string name="retro_scr_consoles_update">更新主機核心</string>
+    <string name="retro_scr_consoles_update_available">有可用更新 — 版本 %1$s（%2$d MB）</string>
+    <string name="retro_scr_consoles_verifying">正在驗證下載…</string>
+    <string name="retro_scr_consoles_working">處理中…</string>
+    <string name="retro_tab_system">系統</string>
 </resources>
+
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 541142be8..e361952f7 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -20,6 +20,12 @@
     </string-array>
     <string-array name="graphics_driver_entries">
         <item>Wrapper</item>
+        <item>Wrapper-Leegao</item>
+        <item>Wrapper-Gamenative</item>
+    </string-array>
+    <string-array name="zink_mode_entries">
+        <item>Unix Zink</item>
+        <item>Windows Zink</item>
     </string-array>
     <string-array name="wrapper_graphics_driver_version_entries">
         <item>System</item>
@@ -37,12 +43,19 @@
         <item>WineD3D</item>
         <item>DXVK+VKD3D</item>
     </string-array>
+    <string-array name="surface_effect_entries">
+        <item>RGBA</item>
+        <item>BGRA</item>
+    </string-array>
     <string-array name="ddrawrapper_entries">
         <item>CnC-DDraw</item>
         <item>Dd7To9</item>
+        <item>ddraw-4.21</item>
+        <item>ddraw-11.8</item>
         <item>None</item>
     </string-array>
     <string-array name="dxvk_version_entries">
+        <item>None</item>
     </string-array>
     <string-array name="device_memory_entries">
     <item>0 (Default)</item>
@@ -60,6 +73,11 @@
         <item>immediate</item>
         <item>relaxed</item>
     </string-array>
+    <string-array name="compositor_present_mode_entries">
+        <item>fifo</item>
+        <item>mailbox</item>
+        <item>immediate</item>
+    </string-array>
     <string-array name="resource_type_entries">
         <item>auto</item>
         <item>dmabuf</item>
@@ -70,6 +88,7 @@
         <item>1.1</item>
         <item>1.2</item>
         <item>1.3</item>
+        <item>1.4</item>
     </string-array>
     <string-array name="bcn_emulation_entries">
         <item>none</item>
@@ -85,6 +104,14 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+    <string-array name="wrapper_transcoder_entries">
+        <item>cpu</item>
+        <item>gpu</item>
+    </string-array>
+    <string-array name="wrapper_quality_entries">
+        <item>low</item>
+        <item>high</item>
+    </string-array>
     <string-array name="video_memory_size_entries">
         <item>32 MB</item>
         <item>64 MB</item>
@@ -105,11 +132,6 @@
     </string-array>
     <string-array name="fexcore_version_entries">
     </string-array>
-    <string-array name="steam_type_entries">
-        <item>Normal - No optimizations</item>
-        <item>Light - Disables overlay, shaders, UI extras</item>
-        <item>Ultralight - Maximum performance, minimal features</item>
-    </string-array>
     <string-array name="dinput_mapper_type_entries">
         <item>@string/container_config_dinput_legacy</item>
         <item>@string/container_config_dinput_modern</item>
@@ -120,6 +142,7 @@
     </string-array>
     <string-array name="desktop_background_type_entries">
         <item>Image</item>
+        <item>Original</item>
         <item>Solid Color</item>
     </string-array>
     <string-array name="startup_selection_entries">
@@ -133,6 +156,7 @@
     <string-array name="some_lc_all">
         <item>ar_EG</item>
         <item>ar_SA</item>
+        <item>da_DK</item>
         <item>de_AT</item>
         <item>de_CH</item>
         <item>de_DE</item>
@@ -153,10 +177,13 @@
         <item>it_IT</item>
         <item>ja_JP</item>
         <item>ko_KR</item>
+        <item>pl_PL</item>
         <item>pt_BR</item>
         <item>pt_PT</item>
+        <item>ro_RO</item>
         <item>ru_RU</item>
         <item>ru_UA</item>
+        <item>uk_UA</item>
         <item>zh_CN</item>
         <item>zh_HK</item>
         <item>zh_SG</item>
diff --git a/app/src/main/res/values/engine_love.xml b/app/src/main/res/values/engine_love.xml
new file mode 100644
index 000000000..cd311a7cb
--- /dev/null
+++ b/app/src/main/res/values/engine_love.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- love-android's GameActivity reads this to decide where the game comes
+         from. false means it does not look for a game.love in the APK's assets
+         and instead takes the path from the launch Intent's file:// data, which
+         is what lets the engine live in the retro bundle and update on its own
+         schedule rather than being frozen into the APK. -->
+    <bool name="embed">false</bool>
+</resources>
diff --git a/app/src/main/res/values/games_ids.xml b/app/src/main/res/values/games_ids.xml
index 3c8445589..75b17a5c2 100644
--- a/app/src/main/res/values/games_ids.xml
+++ b/app/src/main/res/values/games_ids.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Replace this with your actual Play Games App ID (12-digit number) from the Google Play Console! -->
+    <!-- Still used by CloudSyncManager for Google Play Games-backed Save Game sync. -->
     <string name="play_games_app_id" translatable="false">468699745768</string>
 </resources>
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
index ad553e802..07618c5f0 100644
--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@@ -4,4 +4,9 @@
         <item quantity="one">%d ZIP asset</item>
         <item quantity="other">%d ZIP assets</item>
     </plurals>
+    <!-- Progress on a save slot in the 3D engine's Retro menu. -->
+    <plurals name="retro_engine_badges">
+        <item quantity="one">%d badge</item>
+        <item quantity="other">%d badges</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
index f8aefd6cc..af4194ce9 100644
--- a/app/src/main/res/values/refs.xml
+++ b/app/src/main/res/values/refs.xml
@@ -9,7 +9,9 @@
     <item type="id" name="main_menu_adrenotools_gpu_drivers" />
     <item type="id" name="main_menu_input_controls" />
     <item type="id" name="main_menu_advanced" />
+    <item type="id" name="main_menu_credits" />
     <item type="id" name="main_menu_other" />
+    <item type="id" name="main_menu_retro" />
 
     <item type="id" name="main_menu_gyroscope" />
     <item type="id" name="main_menu_gyroscope_reset" />
@@ -18,12 +20,17 @@
     <item type="id" name="main_menu_controller_manager" />
     <item type="id" name="main_menu_relative_mouse_movement" />
     <item type="id" name="main_menu_disable_mouse" />
+    <item type="id" name="main_menu_touch" />
     <item type="id" name="main_menu_toggle_fullscreen" />
     <item type="id" name="main_menu_screen_effects" />
+    <item type="id" name="main_menu_reshade" />
+    <item type="id" name="main_menu_output" />
     <item type="id" name="main_menu_native_rendering" />
     <item type="id" name="main_menu_pause" />
     <item type="id" name="main_menu_pip_mode" />
+    <item type="id" name="main_menu_refactor_size" />
     <item type="id" name="main_menu_task_manager" />
+    <item type="id" name="main_menu_record" />
     <item type="id" name="main_menu_magnifier" />
     <item type="id" name="main_menu_logs" />
     <item type="id" name="main_menu_exit" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a6cdddfb..2ca2fdab1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,9 +16,12 @@
     <string name="common_ui_select_exe">Select EXE</string>
     <string name="common_ui_select_folder">Select Folder</string>
     <string name="common_ui_current_folder">Current Folder</string>
+    <string name="common_ui_enter_path">Enter Path</string>
+    <string name="common_ui_path_not_found">Path not found</string>
     <string name="common_ui_select_valid_exe_file">Please select a valid .exe file</string>
     <string name="common_ui_select_valid_icon_file">Please select a valid .ico or .png file.</string>
     <string name="common_ui_exit">Exit</string>
+    <string name="common_ui_exit_app">Exit App</string>
     <string name="common_ui_profile">Profile</string>
     <string name="common_ui_name">Name</string>
     <string name="common_ui_ok">OK</string>
@@ -32,7 +35,8 @@
     <string name="common_ui_icon">Icon</string>
     <string name="common_ui_duplicate">Duplicate</string>
     <string name="common_ui_credits_and_third_party_apps">Credits and Third-party apps</string>
-    <string name="common_ui_loading">Loading…</string>
+    <string name="common_ui_loading">Loading</string>
+    <string name="common_ui_exporting">Exporting</string>
     <string name="common_ui_enable">Enable</string>
     <string name="common_ui_disable">Disable</string>
     <string name="common_ui_force">Force</string>
@@ -44,7 +48,7 @@
     <string name="common_ui_height">Height</string>
     <string name="common_ui_open_file">Open File</string>
     <string name="common_ui_download_file">Download File</string>
-    <string name="common_ui_downloading_file">Downloading File...</string>
+    <string name="common_ui_downloading_file">Downloading File</string>
     <string name="common_ui_browse">Browse</string>
     <string name="common_ui_options">Options</string>
     <string name="common_ui_export">Export</string>
@@ -68,6 +72,8 @@
     <string name="common_ui_settings">Settings</string>
     <string name="common_ui_enable_all">Enable all</string>
     <string name="common_ui_disable_all">Disable all</string>
+    <string name="common_ui_select_all">Select all</string>
+    <string name="common_ui_deselect_all">Deselect all</string>
     <string name="common_ui_on">On</string>
     <string name="common_ui_off">Off</string>
     <string name="common_ui_already_set">Already Set</string>
@@ -104,6 +110,26 @@
     <string name="common_ui_install">Install</string>
     <string name="common_ui_application">Application</string>
     <string name="common_ui_check">Check</string>
+    <string name="store_game_check_for_update">Check for Update</string>
+    <string name="store_game_checking_for_update">Checking</string>
+    <string name="store_game_download_update">Download Update</string>
+    <string name="store_game_no_update_available">No update available</string>
+    <string name="store_game_update_available">Update available</string>
+    <string name="store_game_update_check_failed">Update check failed</string>
+    <string name="store_game_update">Update</string>
+    <string name="store_game_workshop">Workshop</string>
+    <string name="store_game_verify_files">Verify Files</string>
+    <string name="store_game_verify_started">Verifying %1$s — check the Downloads tab</string>
+    <string name="store_game_steam_options">Steam options</string>
+    <string name="store_game_verify_complete">Verify Files Complete</string>
+    <string name="store_game_verify_failed_notice">Verify Files Failed</string>
+    <string name="store_game_progress_background_hint">You can close this — it keeps running. Check the Downloads tab any time.</string>
+    <string name="store_game_checking_updates">Checking for updates</string>
+    <string name="store_game_no_updates_notice">No Updates Available</string>
+    <string name="store_game_update_complete">Update Complete</string>
+    <string name="store_game_update_failed_notice">Update Failed</string>
+    <string name="store_game_update_check_failed_notice">Update Check Failed</string>
+    <string name="store_game_download_already_active">This game is already downloading. Cancel the current download before adding DLC.</string>
     <string name="common_ui_select">Select</string>
     <string name="common_ui_storage_roots">Storage Roots</string>
     <string name="common_ui_browse_local_folders_directly">Browse local folders directly</string>
@@ -135,9 +161,12 @@
     </plurals>
 
     <!-- Library > Games -->
+    <string name="library_games_scrape_artwork">Scrape Artwork</string>
+    <string name="library_games_scraping_artwork">Scraping</string>
     <string name="library_games_shortcut_created">Shortcut created</string>
     <string name="library_games_failed_to_create_shortcut">Failed to create shortcut: %s</string>
     <string name="library_games_install_path">Install Path</string>
+    <string name="library_games_not_enough_space">Need %1$s more space</string>
     <string name="library_games_download_slash_install">Download / Install</string>
     <string name="library_games_save_management">SAVE MANAGEMENT</string>
     <string name="library_games_download_install_available">%1$s / %2$s • Available: %3$s</string>
@@ -160,11 +189,21 @@
     <string name="library_games_no_games_hub">No Games Installed\nClick to open Winlator Backend</string>
     <string name="library_games_installed_badge">INSTALLED</string>
     <string name="library_games_unknown_game">Unknown Game</string>
-    <string name="library_games_layouts_header">LAYOUTS</string>
+    <string name="library_games_layouts_header">LIBRARY LAYOUTS</string>
     <string name="library_games_layout_carousel">Carousel</string>
     <string name="library_games_layout_list">List</string>
+    <string name="library_games_view_options_header">VIEW OPTIONS</string>
+    <string name="library_games_immersive_mode">Immersive Mode</string>
+    <string name="library_games_immersive_mode_description">Use focused game art as background</string>
+    <string name="library_games_immersive_blur">Blur Background</string>
+    <string name="library_games_immersive_blur_description">Apply a blur effect to the immersive background</string>
     <string name="library_games_custom_game">Custom Game</string>
     <string name="library_games_play">Play</string>
+    <string name="hero_boot_to_desktop_title">Boot to Desktop</string>
+    <string name="hero_graphics_tests_title">Graphics Tests</string>
+    <string name="hero_graphics_test_32">32-bit</string>
+    <string name="hero_graphics_test_64">64-bit</string>
+    <string name="hero_input_tests_title">Input Tests</string>
     <string name="library_games_add_custom_game">Add Custom Game</string>
     <string name="library_games_game_name">Game Name</string>
     <string name="library_games_game_folder_mapped_drive">Game Folder (Mapped Game Drive)</string>
@@ -218,54 +257,51 @@
     <string name="downloads_queue_pause_all">Pause All</string>
     <string name="downloads_queue_clear">Clear</string>
     <string name="downloads_queue_status_label">Status:</string>
-    <string name="downloads_queue_phase_downloading">Downloading…</string>
-    <string name="downloads_queue_phase_downloading_file">Downloading… [%1$s]</string>
+    <string name="downloads_queue_phase_downloading">Downloading</string>
+    <string name="downloads_queue_phase_downloading_file">Downloading [%1$s]</string>
     <string name="downloads_queue_phase_queued">Queued</string>
     <string name="downloads_queue_phase_paused">Paused</string>
-    <string name="downloads_queue_phase_preparing">Preparing…</string>
-    <string name="downloads_queue_phase_verifying">Verifying…</string>
-    <string name="downloads_queue_phase_verifying_file">Verifying… [%1$s]</string>
-    <string name="downloads_queue_phase_patching">Patching…</string>
-    <string name="downloads_queue_phase_applying_data">Applying data…</string>
-    <string name="downloads_queue_phase_finalizing">Finalizing…</string>
-    <string name="downloads_queue_phase_unpacking">Unpacking…</string>
+    <string name="downloads_queue_phase_preparing">Preparing</string>
+    <string name="downloads_queue_phase_verifying">Verifying</string>
+    <string name="downloads_queue_phase_verifying_file">Verifying [%1$s]</string>
+    <string name="downloads_queue_phase_patching">Patching</string>
+    <string name="downloads_queue_phase_applying_data">Applying data</string>
+    <string name="downloads_queue_phase_finalizing">Finalizing</string>
+    <string name="downloads_queue_phase_unpacking">Unpacking</string>
+    <string name="downloads_queue_phase_updating">Updating</string>
     <string name="downloads_queue_phase_complete">Complete</string>
     <string name="downloads_queue_phase_cancelled">Cancelled</string>
     <string name="downloads_queue_phase_failed">Failed: %1$s</string>
     <string name="downloads_queue_phase_unknown">Unknown</string>
     <string name="downloads_queue_paused_resume_hint">Paused - tap Resume to continue</string>
     <string name="downloads_queue_cancel_download">Cancel Download</string>
-    <string name="downloads_queue_cancel_download_confirm">Cancel the download for %1$s and delete all downloaded files?</string>
+    <string name="downloads_queue_cancel_download_title">Cancel Download?</string>
+    <string name="downloads_queue_cancel_download_confirm">Cancel the download of %1$s and delete all downloaded files?</string>
+    <string name="downloads_queue_cancel_download_warning">Cancelling a DLC, Game, or Update download can potentially corrupt your game install.\n\nAre you sure you want to cancel this Download and delete the files downloaded so far?</string>
+    <string name="downloads_queue_cancel_all_title">Cancel All Downloads?</string>
+    <string name="downloads_queue_cancel_all_warning">Cancelling DLC, Game, or Update downloads can potentially corrupt your game installs.\n\nAre you sure you want to cancel all Downloads and delete the files downloaded so far?</string>
     <string name="downloads_queue_this_game">this game</string>
     <string name="downloads_queue_empty">No active downloads.</string>
 
     <!-- Containers > List -->
     <string name="containers_list_new">New Container</string>
     <string name="containers_list_edit">Edit Container</string>
-    <string name="containers_list_creating">Creating Container…</string>
-    <string name="containers_list_removing">Removing Container…</string>
-    <string name="containers_list_duplicating">Duplicating Container…</string>
-    <string name="containers_list_confirm_remove">Do you want to remove this container?</string>
+    <string name="containers_list_creating">Creating Container</string>
+    <string name="containers_list_removing">Removing Container</string>
+    <string name="containers_list_duplicating">Duplicating Container</string>
+    <string name="containers_list_remove_title">Remove container</string>
+    <string name="containers_list_duplicate_title">Duplicate container</string>
+    <string name="containers_list_confirm_remove">Remove this container? Any game saves stored inside it will be permanently deleted. Cloud-synced saves stay in the cloud, but local changes that haven\'t synced yet will be lost — sync this game\'s cloud saves first if you want to keep them.</string>
     <string name="containers_list_confirm_duplicate">Do you want to duplicate this container?</string>
-    <string name="container_backups_title">Backups</string>
-    <string name="container_backups_prompt">Choose an action for this container backup.</string>
-    <string name="container_backups_backing_up">Backing up container…</string>
-    <string name="container_backups_restoring">Restoring container…</string>
-    <string name="container_backups_checking">Checking container backups…</string>
-    <string name="container_backups_select_title">Select Backup to Restore</string>
-    <string name="container_backups_no_files">No container backups were found in Google Drive.</string>
+    <string name="containers_list_duplicate_failed">Failed to duplicate container</string>
 
     <!-- Shortcuts > List -->
     <string name="shortcuts_list_confirm_remove">Do you want to remove this shortcut?</string>
     <string name="shortcuts_list_add_to_home_screen">Add to Home Screen</string>
     <string name="shortcuts_library_artwork_title">Library Artwork</string>
-    <string name="shortcuts_library_artwork_game_card_title">Game Card Image</string>
-    <string name="shortcuts_library_artwork_grid_title">Grid Image</string>
-    <string name="shortcuts_library_artwork_carousel_title">Carousel Image</string>
-    <string name="shortcuts_library_artwork_list_title">List Image</string>
-    <string name="shortcuts_library_artwork_selected">Selected: %1$s</string>
+    <string name="shortcuts_library_artwork_icon_title">Icon Art</string>
+    <string name="shortcuts_library_artwork_hero_title">Background</string>
     <string name="shortcuts_library_artwork_set">Set image</string>
-    <string name="shortcuts_library_artwork_change">Change image</string>
     <string name="shortcuts_library_artwork_failed">Failed to load the selected image.</string>
     <string name="shortcuts_library_artwork_open_source">Open SteamGridDB</string>
     <string name="shortcuts_list_not_available">This shortcut is no longer available. Please delete or recreate it.</string>
@@ -278,6 +314,10 @@
     <string name="shortcuts_list_clone_failed">Failed to clone shortcut.</string>
     <string name="shortcuts_list_exported_to">Shortcut Exported to %1$s</string>
     <string name="shortcuts_list_failed_export">Failed to export shortcut</string>
+    <string name="shortcuts_export_all">Export All</string>
+    <string name="shortcuts_export_to_frontend">Export to Frontend</string>
+    <string name="shortcuts_export_all_done">Exported %1$d games to %2$s</string>
+    <string name="shortcuts_export_all_none">No games to export</string>
     <string name="shortcuts_list_added">Shortcut added successfully.</string>
     <string name="shortcuts_list_readded_existing">Re-added existing shortcut</string>
     <string name="shortcuts_list_failed_add">Failed to add shortcut.</string>
@@ -289,22 +329,16 @@
     <string name="num_controllers">Number of Controllers</string>
     <string name="shortcuts_properties_exclusive_input">Exclusive Input</string>
     <string name="shortcuts_properties_custom_game_settings">Custom Game Settings</string>
-    <string name="shortcuts_properties_use_cold_client">Use ColdClient Launcher</string>
-    <string name="shortcuts_properties_use_cold_client_description">ColdClient is the preferred way to handle Steam emulation and DRM. It patches DRM at runtime without modifying game files.</string>
-    <string name="shortcuts_properties_unpack_files">Unpack Files</string>
-    <string name="shortcuts_properties_unpack_files_description">Strip SteamStub DRM from the game exe on disk. One-time operation — once the exe has been unpacked, this has no runtime cost. Leave enabled by default; turn off only if a specific game breaks because of the strip.</string>
+    <string name="shortcuts_properties_use_legacy_launcher">Use Legacy Launcher</string>
+    <string name="shortcuts_properties_use_legacy_launcher_description">Legacy Steam emulation: runs the game through the ColdClient launcher and strips SteamStub DRM from the exe. Use only for older games that don\'t work with the Steam Launcher.</string>
     <string name="shortcuts_properties_runtime_patcher">Runtime DRM Patcher</string>
-    <string name="shortcuts_properties_runtime_patcher_description">Inject Goldberg\'s runtime DRM patcher DLL into the game on every launch. Works around anti-tamper checks that survive the Unpack Files strip. Significantly reduces FPS — only enable if a game still fails to launch with Unpack Files alone.</string>
-    <string name="shortcuts_properties_force_dlc">Force DLC</string>
-    <string name="shortcuts_properties_force_dlc_description">Only enable if DLCs are not detected or saves with DLC are not working</string>
-    <string name="shortcuts_properties_launch_steam_client_beta">Launch Steam Client (Beta)</string>
-    <string name="shortcuts_properties_launch_steam_client_description">Launches the real Steam client in Wine\nRequires a Steam account and may reduce performance\nNot all games work</string>
-    <string name="shortcuts_properties_steam_type">Steam Client Performance</string>
+    <string name="shortcuts_properties_runtime_patcher_description">Injects a DRM patcher DLL at launch. Reduces FPS — only use if the Legacy Launcher alone fails.</string>
     <string name="steam_section_title">Steam</string>
-    <string name="steam_section_emulator">Steam Emulator (Goldberg)</string>
-    <string name="steam_section_real_client">Real Steam Client</string>
+    <string name="steam_section_real_client">WinNative Real Steam Client</string>
+    <string name="steam_section_emulator">Legacy Steam Emulator</string>
     <string name="shortcuts_properties_use_steam_input">Use Steam Input</string>
     <string name="shortcuts_properties_steam_offline_mode">Steam Offline Mode</string>
+    <string name="shortcuts_properties_steam_offline_mode_description">Makes the emulated Steam client report as offline, so the game won\'t attempt online connections. Use for games that hang on Steam\'s network check.</string>
     <string name="shortcuts_properties_reset">Reset Properties</string>
     <string name="shortcuts_properties_updated_at">Shortcut Updated at %1$s</string>
     <string name="shortcuts_properties_properties_reset">Properties reset successfully.</string>
@@ -318,7 +352,10 @@
     <string name="input_controls_editor_shape">Shape</string>
     <string name="input_controls_editor_type">Type</string>
     <string name="input_controls_editor_binding">Binding</string>
+    <string name="binding_primary">Primary binding</string>
     <string name="binding_secondary">Secondary binding</string>
+    <string name="binding_third">Third binding</string>
+    <string name="binding_fourth">Fourth binding</string>
     <string name="input_controls_editor_binding_up">Binding Up</string>
     <string name="input_controls_editor_binding_right">Binding Right</string>
     <string name="input_controls_editor_binding_down">Binding Down</string>
@@ -329,14 +366,30 @@
     <string name="input_controls_editor_radial_menu_options">Radial Menu Options</string>
     <string name="input_controls_editor_number_of_bindings">Number of Bindings</string>
     <string name="input_controls_editor_select_profile">Select Profile</string>
+    <string name="input_controls_select_style">Select Style</string>
+    <string name="input_controls_style_original">Original</string>
+    <string name="input_controls_style_gamehub">Glass</string>
+    <string name="input_controls_style_slate">Slate</string>
+    <string name="input_controls_style_halo">Halo</string>
+    <string name="input_controls_style_glint">Glint</string>
+    <string name="input_controls_style_shadow">Shadow</string>
+    <string name="input_controls_style_reticle">Reticle</string>
+    <string name="input_controls_style_neon">Neon</string>
+    <string name="input_controls_style_lumina">Lumina</string>
+    <string name="input_controls_accent_theme">Color Theme</string>
+    <string name="input_controls_edit_duplicating_builtin">Built-in profile — created a copy you can edit.</string>
     <string name="input_controls_editor_profile_name">Profile Name</string>
     <string name="input_controls_editor_no_profile_selected">No profile selected</string>
     <string name="input_controls_editor_no_profile_found">No profile found</string>
     <string name="input_controls_editor_tap_to_switch">Tap to switch</string>
     <string name="input_controls_editor_confirm_remove_profile">Do you want to remove this profile?</string>
     <string name="input_controls_editor_confirm_duplicate_profile">Do you want to duplicate this profile?</string>
+    <string name="input_controls_editor_confirm_reset_profile">Reset this profile to its original layout? Any changes you made will be lost.</string>
+    <string name="input_controls_editor_profile_reset">Profile reset to its original layout.</string>
+    <string name="input_controls_editor_reset_unavailable">No original snapshot is available for this profile.</string>
     <string name="input_controls_editor_title">Controls Editor</string>
     <string name="input_controls_editor_toggle_switch">Toggle Switch</string>
+    <string name="input_controls_editor_swipeable">Swipeable</string>
     <string name="input_controls_editor_profile_exported_to">Profile exported to</string>
     <string name="input_controls_editor_unable_to_import">Unable to import profile</string>
     <string name="input_controls_editor_import_profile">Import Profile</string>
@@ -427,6 +480,45 @@
     <string name="container_no_wine_installed">No Wine or Proton installed. Install one first.</string>
     <string name="container_wine_title">Wine</string>
     <string name="container_wine_opengl">OpenGL</string>
+    <string name="container_surface_effect">Surface Effect</string>
+
+    <!-- ReShade drop-in effects (vkBasalt) -->
+    <string name="reshade_section_title">ReShade</string>
+    <string name="reshade_section_hint">Apply a ReShade (.fx) effect to DXVK/VKD3D (Vulkan) games via the bundled vkBasalt layer. Drop each effect into its own folder under Android/data/&lt;package&gt;/files/ReShade/. Live parameter tuning and the in-game toggle arrive with the live-reload layer update.</string>
+    <string name="reshade_catalog_title">ReShade effects</string>
+    <string name="reshade_catalog_search">Search effects…</string>
+    <string name="reshade_catalog_installed">Installed (%1$d)</string>
+    <string name="reshade_catalog_available">Available (%1$d)</string>
+    <string name="reshade_catalog_downloading">Downloading</string>
+    <string name="reshade_catalog_installing">Installing</string>
+    <string name="reshade_catalog_offline_cache">Offline — showing a cached list. Connect to download new effects.</string>
+    <string name="reshade_catalog_offline_none">Offline — showing installed effects only. Connect to browse the catalog.</string>
+    <string name="reshade_catalog_needs_connection">Connect to the internet to download effects.</string>
+    <string name="reshade_catalog_download_failed">Failed to download %1$s.</string>
+    <string name="reshade_catalog_empty_query">No effects match \"%1$s\".</string>
+    <string name="reshade_catalog_empty">No effects available. Connect to the internet to browse the catalog.</string>
+    <string name="reshade_catalog_done">Done</string>
+    <string name="reshade_catalog_delete_cd">Delete %1$s</string>
+    <string name="reshade_catalog_delete_title">Delete %1$s?</string>
+    <string name="reshade_catalog_delete_body">This removes the effect from storage and from any loadout using it. You can download it again later.</string>
+    <string name="reshade_catalog_delete_confirm">Delete</string>
+    <string name="reshade_catalog_delete_cancel">Cancel</string>
+    <string name="reshade_catalog_delete_failed">Couldn\'t delete %1$s.</string>
+    <string name="reshade_params_title">EFFECT PARAMETERS</string>
+    <string name="reshade_params_reset">Reset</string>
+    <!-- Multi-effect ReShade loadout (pre-launch editor) -->
+    <string name="reshade_loadout_empty">No effects yet. Add one or more effects to build a loadout.</string>
+    <string name="reshade_loadout_add">Add effect</string>
+    <string name="reshade_loadout_full">Loadout full — remove an effect to add another.</string>
+    <string name="reshade_effect_active">active</string>
+    <string name="reshade_mode_solo">Solo</string>
+    <string name="reshade_mode_stack">Stack</string>
+    <string name="reshade_mode_solo_hint">One effect active at a time (A/B compare, switch live in-game).</string>
+    <string name="reshade_mode_stack_hint">Layer any subset of effects, applied in order.</string>
+    <!-- In-game ReShade drawer pane (live control) -->
+    <string name="reshade_drawer_enable">Enable ReShade</string>
+    <string name="reshade_drawer_empty">No ReShade effects in this loadout. Add effects in this game\'s settings (or the container\'s) to switch and tune them here.</string>
+    <string name="reshade_drawer_no_params">This effect exposes no adjustable parameters.</string>
 
     <!-- Container > Box64 -->
     <string name="container_box64_title">Box64</string>
@@ -438,6 +530,10 @@
     <string name="container_box64_compatibility">Compatibility</string>
     <string name="container_box64_intermediate">Intermediate</string>
     <string name="container_box64_performance">Performance</string>
+    <string name="container_fexcore_performance_tso">Performance TSO</string>
+    <string name="container_fexcore_extreme">Extreme</string>
+    <string name="container_fexcore_extreme_tso">Extreme TSO</string>
+    <string name="container_fexcore_denuvo">Denuvo</string>
     <string name="box64_env_var_help__dynarec">Enables or disables the Box64 dynamic recompiler.</string>
     <string name="box64_env_var_help__dynarec_safeflags">
         Handling of flags on CALL/RET opcodes&lt;br /&gt;&lt;br /&gt;
@@ -498,6 +594,7 @@
     </string>
     <string name="box64_env_var_help__dynarec_noarch">Reduces dynarec block metadata to save memory, with compatibility tradeoffs.</string>
     <string name="box64_env_var_help__dynarec_volatile_metadata">Uses PE volatile metadata to guide strong memory emulation for 64-bit Windows games.</string>
+    <string name="box64_env_var_help__dynacache">Controls caching of generated dynarec blocks between runs to speed up startup.</string>
     <string name="box64_env_var_help__avx">
         Exposes AVX capabilities to the guest.&lt;br /&gt;&lt;br /&gt;
         &lt;b&gt;0&lt;/b&gt; : Disable AVX extension&lt;br /&gt;
@@ -540,9 +637,11 @@
     <string name="container_fexcore_config">FEXCore</string>
     <string name="container_fexcore_preset">FEXCore Preset</string>
     <string name="container_fexcore_version">FEXCore Version</string>
+    <string name="use_unix_libs">Use UnixLibs</string>
 
     <!-- Container > Graphics Driver -->
     <string name="container_graphics_driver">Graphics Driver</string>
+    <string name="container_zink_mode">Zink Mode</string>
     <string name="container_graphics_configuration">Graphics Driver Configuration</string>
     <string name="container_graphics_version">Graphics Driver Version</string>
     <string name="container_graphics_available_extensions">Available Extensions</string>
@@ -551,11 +650,15 @@
     <string name="container_graphics_sync_frame">Sync Every Frame</string>
     <string name="container_graphics_disable_present_wait">Disable KHR_present_wait</string>
     <string name="container_graphics_present_modes">Present Modes</string>
+    <string name="container_graphics_compositor_present_mode">Vulkan Display Sync</string>
     <string name="container_graphics_resource_type">Memory Resource Type</string>
     <string name="container_graphics_vulkan_version">Vulkan Version</string>
     <string name="container_graphics_bcn_emulation">BCn Emulation</string>
     <string name="container_graphics_bcn_emulation_type">BCn Emulation Type</string>
     <string name="container_graphics_bcn_emulation_cache">BCn Emulation Cache</string>
+    <string name="container_graphics_transcoder">BCn Transcoder</string>
+    <string name="container_graphics_quality">BCn Quality</string>
+    <string name="shortcuts_graphics_sgsr_full_title">Snapdragon™ Game Super Resolution 1</string>
     <!-- Container > Presets -->
     <string name="container_presets_confirm_duplicate">Do you want to duplicate this preset?</string>
     <string name="container_presets_confirm_remove">Do you want to remove this preset?</string>
@@ -575,7 +678,6 @@
 
     <!-- Session > XServer -->
     <string name="session_xserver_title">XServer</string>
-    <string name="session_xserver_use_dri3_extension">Use DRI3 extension</string>
     <string name="session_xserver_simulate_touch_screen">Simulate touch screen</string>
     <string name="session_xserver_preferences_button_text">   PREFERENCES   </string>
     <string name="session_xserver_extra_keys_config_desc">Here you can set value of extra-keys variable like in Termux app (read <a href="http://wiki.termux.com/wiki/Touch_Keyboard#Extra_Keys_Row">this</a>) and more \n
@@ -591,12 +693,6 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_xserver_pref_kbd">Keyboard</string>
     <string name="session_xserver_pref_other">Other</string>
     <string name="session_xserver_pref_version">Version</string>
-    <string name="session_xserver_use_dri3_description">Disabling may fix graphical glitches on some devices</string>
-    <string name="session_xserver_native_rendering">Native Rendering</string>
-    <string name="session_xserver_native_rendering_enabled">DRI3 hardware rendering</string>
-    <string name="session_xserver_native_rendering_disabled">Software WSI fallback</string>
-    <string name="session_xserver_native_rendering_enabled_toast">Native rendering enabled (takes effect on next launch)</string>
-    <string name="session_xserver_native_rendering_disabled_toast">Native rendering disabled (takes effect on next launch)</string>
     <string name="session_xserver_notification_description">WinNative XServer Messages</string>
     <string name="session_xserver_notification_content">WinNative is running, do not kill or swipe this notification</string>
 
@@ -605,7 +701,9 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_drawer_fps_monitor">FPS Monitor</string>
     <string name="session_drawer_fps_monitor_subtitle">Show real-time performance stats</string>
     <string name="session_drawer_dual_series_battery">Dual Series Battery</string>
+    <string name="session_drawer_hud_frametime_numeric">Show Frametime as Number</string>
     <string name="session_drawer_toggle_fullscreen">Toggle Fullscreen</string>
+    <string name="session_drawer_refactor_size">Refactor Size</string>
     <string name="session_drawer_show_touchscreen_controls">Show Touchscreen Controls</string>
     <string name="session_drawer_magnifier">Magnifier</string>
     <string name="session_drawer_logs">Logs</string>
@@ -615,17 +713,65 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_drawer_pause_resume">Pause/Resume</string>
     <string name="session_drawer_relative_mouse_movement">Relative Mouse Movement</string>
     <string name="session_drawer_mouse_input">Mouse Input</string>
+    <string name="session_drawer_touch">Touch</string>
+    <string name="session_drawer_touch_trackpad">Trackpad</string>
+    <string name="session_drawer_touch_touchscreen">Touchscreen Mode</string>
+    <string name="session_drawer_touch_map_right_stick">Map to Right Stick</string>
+    <string name="session_drawer_rts_gestures">RTS Gestures</string>
+    <string name="session_drawer_rts_gestures_edit">Edit</string>
+    <string name="session_drawer_right_stick_sensitivity">Right stick sensitivity</string>
+    <string name="session_rts_action">Action</string>
+    <string name="session_rts_behavior">Behavior</string>
+    <string name="session_rts_tap1">1-finger tap</string>
+    <string name="session_rts_tap2">2-finger tap</string>
+    <string name="session_rts_tap3">3-finger tap</string>
+    <string name="session_rts_tap4">4-finger tap</string>
+    <string name="session_rts_double_tap">Double tap (double left-click)</string>
+    <string name="session_rts_long_press">Long press</string>
+    <string name="session_rts_hold2">2-finger hold</string>
+    <string name="session_rts_hold3">3-finger hold</string>
+    <string name="session_rts_hold4">4-finger hold</string>
+    <string name="session_rts_swipe3">3-finger swipe</string>
+    <string name="session_rts_swipe4">4-finger swipe</string>
+    <string name="session_rts_up">Up</string>
+    <string name="session_rts_down">Down</string>
+    <string name="session_rts_left">Left</string>
+    <string name="session_rts_right">Right</string>
+    <string name="session_rts_pan">2-finger pan</string>
+    <string name="session_rts_pan1">1-finger pan</string>
+    <string name="session_rts_zoom">Pinch zoom</string>
+    <string name="session_rts_drag">1-finger drag</string>
+    <string name="session_rts_drag2">2-finger drag</string>
+    <string name="session_rts_long_press_delay">Long press delay (ms)</string>
+    <string name="session_rts_hold_delay">Hold delay (ms)</string>
+    <string name="session_rts_swipe_threshold">Swipe threshold (px)</string>
+    <string name="session_rts_gesture_threshold">Gesture threshold (px)</string>
+    <string name="session_rts_double_tap_delay">Double tap delay (ms)</string>
+    <string name="session_rts_drag_threshold">Drag threshold (px)</string>
+    <string name="session_rts_pan_threshold">Pan/pinch start (px)</string>
+    <string name="common_ui_rename">Rename</string>
+    <string name="common_ui_new">New</string>
+    <string name="input_controls_editor_input_profiles_section">Input Profiles</string>
+    <string name="session_gesture_profile_section">Gesture Profile</string>
+    <string name="gesture_profile_new">New Gesture Profile</string>
+    <string name="gesture_profile_import">Import Gesture Profile</string>
+    <string name="gesture_profile_export">Export Gesture Profile</string>
+    <string name="gesture_profile_none">No gesture profiles</string>
     <string name="session_drawer_screen_effects">Screen Effects</string>
     <string name="session_drawer_screen_effects_subtitle">Upscaling and color effects</string>
-    <string name="session_drawer_super_resolution">Sharpening Filters</string>
-    <string name="session_drawer_upscaler_mode">Filter</string>
-    <string name="session_drawer_upscaler_fsr">FSR 1</string>
-    <string name="session_drawer_sharpness">Sharpness</string>
+    <string name="session_drawer_super_resolution">Super Resolution</string>
+    <string name="session_drawer_upscaler_mode">Upscaler</string>
+    <string name="session_drawer_upscaler_fsr">SGSR 1</string>
+    <string name="session_drawer_sgsr_edge_sharpness">Edge Sharpness</string>
+    <string name="session_drawer_vivid">Vivid</string>
+    <string name="session_drawer_vivid_strength">Vivid Strength</string>
     <string name="session_drawer_color_profile">Color Effect</string>
     <string name="session_drawer_picture_in_picture">Picture in Picture</string>
     <string name="session_drawer_exit_subtitle">Close the running session</string>
     <string name="session_drawer_touchscreen_overlay">Touchscreen Overlay</string>
     <string name="session_drawer_resume">Resume</string>
+    <string name="session_drawer_retry">Retry</string>
+    <string name="downloads_no_internet">No internet connection</string>
     <string name="session_drawer_pause">Pause</string>
     <string name="session_drawer_wine_processes_paused">Wine processes are paused</string>
     <string name="session_drawer_pause_all_wine_processes">Pause all Wine processes</string>
@@ -637,6 +783,8 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_drawer_hud_summary">Tune overlay visibility and data points</string>
     <string name="session_drawer_hud_disabled_hint">Turn on the overlay to customize it</string>
     <string name="session_drawer_hud_alpha">Alpha</string>
+    <string name="session_drawer_hud_background_alpha">Background Alpha</string>
+    <string name="session_drawer_hud_background">Background</string>
     <string name="session_drawer_hud_scale">Scale</string>
     <string name="session_drawer_hud_elements">HUD Elements</string>
     <string name="session_drawer_hud_element_fps">FPS</string>
@@ -645,7 +793,35 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_drawer_hud_element_cpu">CPU</string>
     <string name="session_drawer_hud_element_ram">RAM</string>
     <string name="session_drawer_hud_element_battery">BAT</string>
+    <string name="session_drawer_hud_element_temp">B.TMP</string>
     <string name="session_drawer_hud_element_graph">Graph</string>
+    <string name="session_drawer_hud_element_cpu_temp">C.TMP</string>
+    <string name="session_drawer_hud_mango_style">Mango Style HUD</string>
+    <string name="session_drawer_hud_mango_settings">Mango HUD Settings</string>
+    <string name="mango_hud_element_gpu_load">GPU Load</string>
+    <string name="mango_hud_element_gpu_temp">GPU Temp</string>
+    <string name="mango_hud_element_cpu_load">CPU Load</string>
+    <string name="mango_hud_element_cpu_temp">CPU Temp</string>
+    <string name="mango_hud_element_ram">RAM</string>
+    <string name="mango_hud_element_battery">Battery</string>
+    <string name="mango_hud_element_lows" formatted="false">1% Lows</string>
+    <string name="mango_hud_element_graph">Frametime Graph</string>
+    <string name="mango_hud_element_engine">Engine</string>
+    <string name="mango_hud_element_vram">VRAM</string>
+    <string name="mango_hud_element_cpu_mhz">CPU Clock</string>
+    <string name="mango_hud_element_gpu_clock">GPU Clock</string>
+    <string name="mango_hud_element_cores">Per-Core</string>
+    <string name="mango_hud_element_network">Network</string>
+    <string name="mango_hud_element_swap">Swap</string>
+    <string name="mango_hud_element_resolution">Resolution</string>
+    <string name="mango_hud_element_wine">Wine Version</string>
+    <string name="mango_hud_element_duration">Session Time</string>
+    <string name="mango_hud_element_clock">Clock</string>
+    <string name="mango_hud_element_throttle">Throttle Status</string>
+    <string name="mango_hud_group_memory">Memory</string>
+    <string name="mango_hud_group_system">System</string>
+    <string name="mango_hud_lock">Lock HUD</string>
+    <string name="mango_hud_lock_subtitle">Let touches pass through to the controls behind the HUD. Press and hold the HUD to lock it. (5s)</string>
     <string name="hud_position_menu_title">Move HUD to</string>
     <string name="hud_position_top_left">Top Left</string>
     <string name="hud_position_top_center">Top Center</string>
@@ -656,6 +832,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="hud_position_bottom_center">Bottom Center</string>
     <string name="hud_position_bottom_right">Bottom Right</string>
     <string name="session_drawer_hud_alpha_input_title">Set Alpha</string>
+    <string name="session_drawer_hud_background_alpha_input_title">Set Background Alpha</string>
     <string name="session_drawer_hud_scale_input_title">Set Scale</string>
     <string name="session_drawer_hud_input_hint">Enter a value from %1$d to %2$d. Values above the limit are clamped.</string>
     <string name="session_drawer_command_center">Command Center</string>
@@ -668,22 +845,97 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_drawer_color_profile_hdr">HDR</string>
     <string name="session_drawer_color_profile_natural">Natural</string>
     <string name="session_drawer_color_profile_crt">CRT Effect</string>
-    <string name="session_drawer_upscaler_dls">Vivid</string>
+    <string name="session_drawer_color_profile_toon">Toon</string>
+    <string name="session_drawer_color_profile_ntsc">Ntsc</string>
+    <string name="session_drawer_color_profile_ntsc2">Ntsc2</string>
+    <string name="session_drawer_brightness">Brightness</string>
+    <string name="session_drawer_contrast">Contrast</string>
+    <string name="session_drawer_gamma">Gamma</string>
+    <string name="session_drawer_scale">Scale</string>
+    <string name="session_drawer_scale_nearest">Nearest</string>
+    <string name="session_drawer_scale_linear">Linear</string>
+    <string name="session_drawer_scale_bicubic">Bicubic</string>
+    <string name="session_drawer_saturation">Saturation</string>
+    <string name="session_drawer_temperature">Temperature</string>
+    <string name="session_drawer_tint">Tint</string>
+    <string name="session_drawer_sharpen">Sharpen</string>
+    <string name="session_drawer_scanlines">Scanlines</string>
+    <string name="session_drawer_pixelate">Pixelate</string>
+    <string name="session_drawer_block_size">Block size</string>
+    <string name="session_drawer_strength">Strength</string>
+    <string name="session_drawer_intensity">Intensity</string>
+    <string name="session_drawer_color_blind">Color Blind</string>
+    <string name="session_drawer_color_blind_protan">Protan</string>
+    <string name="session_drawer_color_blind_deutan">Deutan</string>
+    <string name="session_drawer_color_blind_tritan">Tritan</string>
+    <string name="session_drawer_reset_effects">Reset effects</string>
     <string name="session_drawer_calibrate_advanced">Advanced calibration</string>
     <string name="session_drawer_rail_label_hud">HUD</string>
     <string name="session_drawer_rail_label_gyro">Gyro</string>
     <string name="session_drawer_rail_label_effects">FX</string>
+    <string name="session_drawer_rail_label_output">Output</string>
     <string name="session_drawer_rail_label_apps">More</string>
+    <!-- External display / video-out (USB-C, HDMI, DisplayPort) -->
+    <string name="display_output_prompt_title">External display detected</string>
+    <string name="display_output_prompt_message">Send the game to the connected display? Your on‑screen controls and menu stay on this phone.</string>
+    <string name="display_output_prompt_swap">Swap Displays</string>
+    <string name="display_output_prompt_mirror">Mirror</string>
+    <string name="display_output_swapped_toast">Game moved to external display. Controls stay on your phone.</string>
+    <string name="display_output_cast_unavailable">Wireless display settings are unavailable on this device.</string>
+    <string name="display_output_restored_toast">External display disconnected — game returned to phone.</string>
+    <string name="session_drawer_output_title">Display Output</string>
+    <string name="session_drawer_output_subtitle">Game is showing on the external display.</string>
+    <string name="session_drawer_output_device">Connected display</string>
+    <string name="session_drawer_output_resolution">Resolution</string>
+    <string name="session_drawer_output_refresh_rate">Refresh Rate</string>
+    <string name="session_drawer_output_aspect_ratio">Aspect Ratio</string>
+    <string name="session_drawer_output_aspect_fit">Fit (Aspect)</string>
+    <string name="session_drawer_output_aspect_stretch">Stretch (Fill)</string>
+    <string name="session_drawer_output_aspect_zoom">Zoom (Crop)</string>
+    <string name="session_drawer_output_return_to_phone">Return to phone</string>
+    <string name="session_drawer_output_refresh_hz">%1$d Hz</string>
+    <string name="session_drawer_output_cast_title">Cast to a TV</string>
+    <string name="session_drawer_output_cast_body">Connect a USB-C / HDMI adapter, or tap below to connect a wireless display (Miracast / Wi-Fi Direct). The game shows on the TV while these controls stay on your phone.</string>
+    <string name="session_drawer_output_cast_button">Connect Wireless Display</string>
+    <string name="session_drawer_output_cast_note">Chromecast‑only TVs can\'t show live gameplay with private controls — use a wireless display or a USB‑C/HDMI adapter for the best result.</string>
+    <string name="session_drawer_output_render_note">Modes your display reports switch its actual output (it may briefly go black while it re‑initializes). Other resolutions render at that size and are hardware‑scaled to the panel — higher than native sharpens (supersampling), lower runs faster.</string>
+    <string name="session_drawer_output_scaling_note">This phone outputs the display at its native %1$s and won\'t switch its mode, so this sets the render resolution — it\'s hardware‑scaled to the panel (higher than native sharpens, lower runs faster).</string>
+    <string name="session_drawer_output_game_mode">Game Mode (Low Latency)</string>
+    <string name="session_drawer_output_game_mode_on">On</string>
+    <string name="session_drawer_output_game_mode_off">Off</string>
+    <string name="session_drawer_output_game_mode_note">Requests the TV\'s low‑latency / game mode (HDMI ALLM) to minimize input lag. Shown only when the connected display supports it.</string>
+    <string name="session_drawer_output_send_to_display">Send game to display</string>
+    <string name="session_drawer_output_to_display">Output to External Display</string>
+    <string name="session_drawer_output_send_note">A display is connected. Send the game to it — your controls and menu stay on this phone. You can return it here any time.</string>
+    <string name="session_drawer_output_display">Display</string>
+    <string name="session_drawer_output_glasses">Glasses</string>
+    <string name="session_drawer_output_brightness">Brightness</string>
+    <string name="session_drawer_output_shade">Shade (dimming)</string>
+    <string name="session_drawer_output_3d">3D (side‑by‑side)</string>
+    <string name="glasses_panel_refresh">Refresh Rate</string>
+    <string name="glasses_panel_sunblock">Sunblock</string>
+    <string name="session_drawer_output_volume">Volume</string>
+    <string name="session_drawer_output_glasses_note">Sent directly to your Viture glasses over USB.</string>
     <string name="session_drawer_rail_label_keyboard">Keyboard</string>
     <string name="session_drawer_rail_label_input_controls">Controls</string>
     <string name="session_drawer_rail_label_relative_mouse">RelMouse</string>
     <string name="session_drawer_rail_label_mouse">Mouse</string>
     <string name="session_drawer_rail_label_fullscreen">Fullscreen</string>
     <string name="session_drawer_rail_label_pip">PiP</string>
-    <string name="session_drawer_rail_label_native">Native</string>
     <string name="session_drawer_rail_label_magnifier">Zoom</string>
     <string name="session_drawer_rail_label_task_manager">Tasks</string>
+    <string name="session_drawer_rail_label_record">Record</string>
     <string name="session_drawer_rail_label_logs">Logs</string>
+    <string name="session_record_started">Recording started</string>
+    <string name="session_record_saved">Recording saved to WinNative/Recordings</string>
+    <string name="session_record_failed">Couldn\'t start recording</string>
+    <string name="session_record_settings_title">Record Settings</string>
+    <string name="session_record_fps">Frame Rate</string>
+    <string name="session_record_resolution">Resolution</string>
+    <string name="session_record_quality">Quality</string>
+    <string name="session_record_include_ui">Record UI</string>
+    <string name="session_record_include_ui_subtitle">Include HUD and on-screen controls</string>
+    <string name="session_record_now">Record Now</string>
     <string name="session_drawer_logs_clear">Clear</string>
     <string name="session_drawer_logs_pause">Pause</string>
     <string name="session_drawer_logs_resume">Resume</string>
@@ -707,6 +959,8 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_task_affinity_title">Processor Affinity</string>
     <string name="session_task_affinity_all_cores">All cores</string>
     <string name="session_task_new_task">New Task</string>
+    <string name="session_task_bring_to_front">Bring to Front</string>
+    <string name="session_task_custom_value">Custom Value</string>
     <string name="session_task_processes">Processes</string>
     <string name="session_task_cpu_usage_format">CPU (%1$d%%)</string>
     <string name="session_task_per_core_usage">Per-core usage</string>
@@ -724,11 +978,10 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_display_frame_rate">Frame Rate</string>
     <string name="session_display_title">Display</string>
     <string name="session_display_fullscreen_stretched">Enable Fullscreen (Stretched)</string>
-    <string name="session_display_direct_composition">Direct Composition (experimental)</string>
-    <string name="session_display_direct_composition_summary">Route fullscreen game frames straight to an Android SurfaceControl layer (HWC/DPU overlay) instead of compositing them in-process. Lower latency and battery use when supported. Applies on next launch.</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_direct_composition">Direct Composition (zero-copy)</string>
     <string name="session_display_ram_label">RAM:</string>
     <string name="session_display_ram_usage_format">%1$s GB Used / %2$s Total</string>
 
@@ -799,6 +1052,11 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_gamepad_no_profiles">-- No Profiles --</string>
     <string name="session_gamepad_error_loading_profile">Error loading profile</string>
 
+    <!-- Input controls > Auto-hide on controller -->
+    <string name="input_controls_auto_hide_section">Touchscreen Controls</string>
+    <string name="input_controls_auto_hide_on_controller_title">Auto-hide on Controller</string>
+    <string name="input_controls_auto_hide_on_controller_summary">Hide touchscreen controls when a controller is connected</string>
+
     <!-- Session > Gyroscope -->
     <string name="session_gyroscope_title">Gyroscope</string>
     <string name="session_gyroscope_calibrate">Calibrate Gyroscope</string>
@@ -806,6 +1064,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_gyroscope_activator_button">Gyroscope Activation Button</string>
     <string name="session_gyroscope_hold">Hold</string>
     <string name="session_gyroscope_toggle">Toggle</string>
+    <string name="session_gyroscope_orientation_mode">Tilt to Aim (Orientation)</string>
     <string name="session_gyroscope_x_sensitivity">X-Axis Sensitivity</string>
     <string name="session_gyroscope_y_sensitivity">Y-Axis Sensitivity</string>
     <string name="session_gyroscope_smoothing">Smoothing</string>
@@ -839,6 +1098,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_general_select_wallpaper">Select wallpaper</string>
     <string name="settings_general_title">General</string>
     <string name="settings_general_enable_file_provider">Enable File Provider</string>
+    <string name="settings_general_enable_auto_scraping">Enable Auto Scraping</string>
     <string name="settings_general_take_effect_next_startup">This option will take effect at the next startup.</string>
     <string name="settings_general_imagefs">Imagefs</string>
     <string name="settings_general_reinstall_imagefs">Reinstall Imagefs</string>
@@ -852,7 +1112,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_general_share_android_clipboard">Share Android Clipboard with Wine</string>
     <string name="settings_general_paths_title">Path Settings</string>
     <string name="settings_general_paths_summary">Manage where Winlator stores its working data and where exported shortcuts are written.</string>
-    <string name="settings_general_winlator_path_title">Winlator Path</string>
+    <string name="settings_general_winlator_path_title">Storage Path</string>
     <string name="settings_general_shortcut_export_path_title">Shortcut Export Path</string>
     <string name="settings_general_choose_path">Choose Path</string>
     <string name="settings_general_xserver_cursor_summary">Adjust pointer speed for touch, trackpad, and mouse input inside the XServer session.</string>
@@ -860,7 +1120,9 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_general_cursor_lock_summary">Keeps direct mouse capture enabled for games that need raw pointer input. Disable it with Volume Down.</string>
     <string name="settings_general_xinput_toggle_title">Disable XInput</string>
     <string name="settings_general_xinput_toggle_summary">Turns off XInput handling when you want exclusive mouse and keyboard control.</string>
-    <string name="settings_general_file_provider_summary">Expose Winlator files to Android document pickers and file managers.</string>
+    <string name="settings_external_display_output_summary">Move the game to a connected external display instead of mirroring this screen. Glasses always use their own display.</string>
+    <string name="settings_general_file_provider_summary">Expose WinNative files to Android document pickers and file managers.</string>
+    <string name="settings_general_auto_scraping_summary">This setting allows WinNative to automatically pull custom game artwork.</string>
     <string name="settings_general_open_browser_summary">Open supported web links in the Android browser instead of inside Wine.</string>
     <string name="settings_general_clipboard_summary">Allow copy and paste between Android and Wine sessions.</string>
     <string name="settings_general_imagefs_summary">Restore bundled system files without removing your existing containers.</string>
@@ -877,7 +1139,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_audio_sound_font_installed_failed">Soundfont installed failed!</string>
     <string name="settings_audio_sound_font_already_exist">Soundfont you want to install is already exist.</string>
     <string name="settings_audio_unable_to_install_soundfont">Unable to install soundfont</string>
-    <string name="settings_audio_installing_soundfont">Installing SoundFont…</string>
+    <string name="settings_audio_installing_soundfont">Installing SoundFont</string>
     <string name="settings_audio_sound_font_bad_format">Bad SoundFont Format.</string>
     <string name="settings_audio_cannot_remove_default">Cannot remove default soundfont</string>
     <string name="settings_audio_summary">Install, remove, and choose the SoundFont used for MIDI playback.</string>
@@ -885,21 +1147,53 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <!-- Settings > Debug -->
     <string name="settings_debug_wine_debug_channel">Wine Debug Channel</string>
     <string name="settings_debug_title">Debug</string>
+    <string name="settings_retro_title">Retro</string>
+    <string name="retro_save_transfer_title">Transfer Save</string>
+    <string name="retro_save_transfer_message">Import a local save file to this game, or export this game\'s current save.</string>
+    <string name="retro_save_transfer_import">Import Save</string>
+    <string name="retro_save_transfer_export">Export Save</string>
+    <string name="retro_save_transfer_import_ok">Save imported</string>
+    <string name="retro_save_transfer_import_failed">Could not import save</string>
+    <string name="retro_save_transfer_export_ok">Save exported</string>
+    <string name="retro_save_transfer_export_failed">Could not export save</string>
+    <string name="retro_save_transfer_none">No save exists yet for this game</string>
+    <string name="retro_cheats_title">Cheats</string>
+    <string name="retro_cheats_hardcore_blocked">Cheats are disabled in Hardcore mode</string>
+    <string name="retro_ps2_coming_soon">PlayStation 2 support is coming soon</string>
+    <string name="retro_rom_missing">Game file not found</string>
     <string name="settings_debug_wine_logs_title">Enable Wine Debug Logs</string>
     <string name="settings_debug_wine_logs_subtitle">Write Wine debug output to file</string>
     <string name="settings_debug_box_logs_title">Enable Box86/64 Logs</string>
     <string name="settings_debug_box_logs_subtitle">Write Box86 &amp; Box64 debug output to file</string>
     <string name="settings_debug_fex_logs_title">Enable FEXCore Logs</string>
     <string name="settings_debug_fex_logs_subtitle">Write FEXCore debug output to file</string>
+    <string name="settings_debug_emulator_logs_title">Box64/FEX Emulation logs</string>
+    <string name="settings_debug_emulator_logs_subtitle">Logs whichever emulator your container uses, to file.</string>
     <string name="settings_debug_steam_logs_title">Enable Steam Logs</string>
     <string name="settings_debug_steam_logs_subtitle">Log Steam authentication and session events for debugging.</string>
     <string name="settings_debug_wine_channels_title">Wine Debug Channels</string>
     <string name="settings_debug_wine_channels_summary">Choose which Wine channels are included when Wine debug logging is enabled.</string>
+    <string name="settings_debug_wine_classes_title">Wine Log Levels</string>
+    <string name="settings_debug_wine_classes_summary">Pick which message types are logged. Trace is extremely verbose.</string>
     <string name="settings_debug_input_logs">Input Logs</string>
     <string name="settings_debug_input_logs_description">Log gamepad, touch, and keyboard input events</string>
     <string name="settings_debug_download_logs">Download Logs</string>
     <string name="settings_debug_download_logs_description">Log download resolver and WinNative fallback events</string>
+    <string name="settings_debug_vulkan_validation_layers_title">Vulkan Validation Layers</string>
+    <string name="settings_debug_vulkan_validation_layers_subtitle">Restart display to apply.</string>
     <string name="settings_debug_share_logs">Share Logs</string>
+    <string name="settings_debug_delete_logs">Delete Logs</string>
+    <string name="settings_debug_share_all_logs_short">Share all</string>
+    <string name="settings_debug_download_all_logs_short">Download all</string>
+    <string name="settings_debug_logs_saved">Saved to %1$s</string>
+    <string name="settings_debug_delete_logs_short">Delete</string>
+    <string name="settings_debug_delete_all_logs_short">Delete all</string>
+    <string name="settings_debug_open_logs_folder_short">Open Logs Manager</string>
+    <string name="settings_debug_logs_deleted">Logs deleted</string>
+    <string name="settings_debug_delete_logs_confirm_title">Delete Logs?</string>
+    <string name="settings_debug_delete_logs_confirm_message">This permanently deletes all saved log files (%1$s). This can\'t be undone.</string>
+    <string name="settings_debug_logs_browser_title">Logs</string>
+    <string name="settings_debug_log_truncated">Showing last %1$s of this log</string>
     <string name="settings_debug_logs_subject">WinNative Logs (%1$s)</string>
     <string name="settings_debug_no_logs_available">No debug logs available. Enable debugging options first and launch a game.</string>
     <string name="settings_debug_capture_failed">Failed to capture logs: %1$s</string>
@@ -915,6 +1209,8 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_other_language_title">Language</string>
     <string name="settings_other_language_summary">Choose the display language</string>
     <string name="settings_other_language_system_default">System default</string>
+    <string name="settings_other_game_language_title">Game Language</string>
+    <string name="settings_other_game_language_summary">Preferred language for Steam/Epic/GOG downloads</string>
 
     <string name="settings_other_section_integration">Integration</string>
     <string name="settings_other_setup_wizard_title">Setup Wizard</string>
@@ -933,7 +1229,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_content_empty_subtitle">Install a package or switch type to get started.</string>
     <string name="settings_content_container_created">Created container: %1$s</string>
     <string name="settings_content_download_failed">Download failed.</string>
-    <string name="common_ui_working">Working…</string>
+    <string name="common_ui_working">Working</string>
     <string name="settings_content_desc_wine">Made by the Wine project; translates Win32 calls to native Linux/Android services.</string>
     <string name="settings_content_desc_proton">Made by Valve; a Wine-based runtime with game patches for Windows games.</string>
     <string name="settings_content_desc_dxvk">Translates Direct3D 9, 10, and 11 graphics calls to Vulkan.</string>
@@ -941,6 +1237,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_content_desc_box64">Translates x86_64 Linux code so it can run on ARM64 devices.</string>
     <string name="settings_content_desc_wowbox64">Box64 build used by WoW64 to run 32-bit Windows apps inside 64-bit Wine.</string>
     <string name="settings_content_desc_fexcore">Translates x86 and x86_64 code so it can run on ARM64 devices.</string>
+    <string name="settings_content_desc_d7vk">Translates DirectDraw (Direct3D 7 and earlier) graphics calls to Vulkan.</string>
     <string name="settings_content_unable_to_install">Unable to install content.</string>
     <string name="settings_content_install_failed">Install Failed</string>
     <string name="settings_content_file_cannot_be_recognized">File cannot be recognized.</string>
@@ -952,9 +1249,14 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="settings_content_downloading_title">Downloading Content</string>
     <string name="settings_content_installing_title">Installing Content</string>
     <string name="settings_content_extracting_title">Extracting Content</string>
-    <string name="settings_content_extracting_detail">Extracting… (%1$d files)</string>
-    <string name="settings_content_preparing_package">Preparing package…</string>
+    <string name="settings_content_extracting_detail">Extracting (%1$d files)</string>
+    <string name="settings_content_preparing_package">Preparing package</string>
     <string name="settings_content_download_complete">Download complete</string>
+    <string name="settings_content_already_installed_title">Component Already Installed</string>
+    <string name="settings_content_already_installed_message">This component is already installed. Remove the installed copy before downloading it again.
+
+Installed path:
+%1$s</string>
     <string name="settings_content_conflicting_title">Conflicting Content Installed</string>
     <string name="settings_content_conflicting_message">Please uninstall the conflicting content before downloading this package.
 
@@ -963,7 +1265,7 @@ Installed path:
     <string name="settings_content_cannot_be_trusted">Content cannot be trusted.</string>
     <string name="settings_content_is_incomplete">Content is incomplete.</string>
     <string name="settings_content_untrusted_files_warning">Warning: The additional content contains untrusted files. Generally, the following files should not be modified. Please decide whether to proceed with the installation.</string>
-    <string name="settings_content_confirm_remove">Do you want to remove this content?</string>
+    <string name="settings_content_confirm_remove">This will delete the component from your device.</string>
     <string name="settings_content_unable_to_remove_in_use">Unable to remove this content, because a container is currently using this Wine.</string>
     <string name="settings_content_download_in_components">None downloaded. Please download one in Components.</string>
     <string name="settings_content_types_header">CONTENT TYPES</string>
@@ -975,9 +1277,12 @@ Installed path:
     <string name="settings_drivers_install">Install Drivers</string>
     <string name="settings_drivers_installed_success">Driver installed successfully.</string>
     <string name="settings_drivers_install_failed">Failed to install driver.</string>
-    <string name="settings_drivers_confirm_remove">Do you want to remove this driver?</string>
+    <string name="settings_drivers_remove_title">Remove driver?</string>
+    <string name="settings_drivers_confirm_remove">This will delete the driver from your device.</string>
+    <string name="settings_drivers_remove_repo_title">Remove repository?</string>
+    <string name="settings_drivers_remove_repo_message">%1$s will be removed from your repository list.</string>
     <string name="settings_drivers_repo_tap_to_load">Tap to load releases</string>
-    <string name="settings_drivers_repo_loading_releases">Loading releases…</string>
+    <string name="settings_drivers_repo_loading_releases">Loading releases</string>
     <string name="settings_drivers_repo_release_count">%1$d releases loaded</string>
     <string name="settings_drivers_repo_no_release_assets">No downloadable ZIP assets were found in the fetched releases.</string>
     <string name="settings_drivers_repo_fetch_failed">Could not load GitHub releases.</string>
@@ -987,7 +1292,7 @@ Installed path:
     <string name="settings_drivers_manager">Driver Manager</string>
 
     <!-- Setup > Wizard -->
-    <string name="setup_wizard_installing_system_files">Installing System Files…</string>
+    <string name="setup_wizard_installing_system_files">Installing System Files</string>
     <string name="setup_wizard_unable_to_install_system_files">Unable to install system files</string>
     <string name="setup_wizard_system_image_not_installed">System image not installed. Please install components first.</string>
     <string name="setup_wizard_recommended_components">Recommended Components</string>
@@ -1035,6 +1340,7 @@ Installed path:
     <string name="setup_wizard_creating_container">Creating\u2026</string>
 
     <string name="input_controls_tap_to_click">Tap to Click</string>
+    <string name="input_controls_reverse_binding_order">Reverse order bindings</string>
     <!-- Steam > Login -->
     <string name="steam_login_auth_webview_title">Authorization</string>
     <string name="steam_login_sign_in_to_your_account">Sign in to your account</string>
@@ -1058,6 +1364,9 @@ Installed path:
     <string name="google_cloud_sync_started">Cloud sync started.</string>
     <string name="google_cloud_google">Google</string>
     <string name="google_cloud_services">Google Services</string>
+    <string name="google_auto_signin_title">Sign in to Google on launch</string>
+    <string name="google_auto_signin_summary">Automatically connect to Google Play Games when the app starts so save backups and sync are always ready. When off, the app never signs in on its own.</string>
+    <string name="google_auto_signin_section">On Launch</string>
     <string name="google_cloud_play_games">Google Play Games</string>
     <string name="google_cloud_status_syncing">Syncing</string>
     <string name="google_cloud_status_connected">Connected</string>
@@ -1105,17 +1414,19 @@ Installed path:
     <string name="google_cloud_error_no_snapshot">No saved store logins were found in Google cloud sync yet.</string>
     <string name="google_cloud_error_generic">Google cloud sync failed: %1$s</string>
     <string name="google_cloud_error_before_open">Google cloud sync failed before Google Saved Games could open.</string>
-    <string name="google_cloud_auto_backup">Cloud Sync Auto Backup</string>
-    <string name="google_cloud_auto_backup_summary">Automatically back up game saves to Google Drive each time you exit a game.</string>
     <string name="cloud_saves_title">Cloud Saves</string>
-    <string name="cloud_saves_backup">Back up save</string>
-    <string name="cloud_saves_restore">Restore cloud save</string>
-    <string name="cloud_saves_backup_summary">Saves the current version to history for 30 days.</string>
-    <string name="cloud_saves_restore_summary">Pushes your current save to the cloud provider.</string>
+    <string name="cloud_saves_title_for_provider">%1$s Cloud Saves - %2$s</string>
     <string name="cloud_saves_sync_summary">Pull the version %1$s has right now.</string>
     <string name="cloud_saves_sync_summary_generic">Pull the current cloud version.</string>
     <string name="cloud_saves_no_backups">No backups yet for this game.</string>
-    <string name="cloud_sync_title">Auto Cloud Sync</string>
+    <string name="cloud_sync_title">Cloud Saves</string>
+    <string name="cloud_sync_disable_title">Disable Cloud Saves</string>
+    <string name="cloud_saves_steam_push_label">Push to Steam Cloud</string>
+    <string name="cloud_saves_steam_push_helper">Force-upload local save</string>
+    <string name="cloud_saves_steam_push_success">Save pushed to Steam Cloud.</string>
+    <string name="cloud_saves_steam_push_failed">Could not push save to Steam Cloud.</string>
+    <string name="cloud_saves_history_steam_unreachable">Steam Cloud is unreachable right now. Reconnecting in the background tap refresh once you’re back online.</string>
+    <string name="steam_session_refused_event">Steam refused the cached session (EResult=%1$d). Please sign in again.</string>
     <string name="cloud_sync_enabled_summary">Download on launch, push on exit.</string>
     <string name="cloud_sync_disabled_summary">Launch without cloud save download or exit sync.</string>
     <string name="cloud_saves_offline_mode">Disable Cloud Sync</string>
@@ -1129,6 +1440,17 @@ Installed path:
     <string name="cloud_saves_syncing_from_provider">Downloading save from %1$s\u2026</string>
     <string name="cloud_saves_sync_from_provider_success">%1$s cloud save downloaded.</string>
     <string name="cloud_saves_sync_from_provider_failed">Could not download save from %1$s.</string>
+    <string name="cloud_saves_gog_manage_label">Manage GOG Cloud Saves</string>
+    <string name="cloud_saves_gog_manage_helper">Opens the Official GOG Website</string>
+    <string name="cloud_saves_gog_manage_no_browser">No browser available to open the GOG cloud saves page</string>
+    <string name="cloud_saves_gog_zip_label">Download GOG Cloud Zip</string>
+    <string name="cloud_saves_gog_zip_helper">Save current cloud files</string>
+    <string name="cloud_saves_gog_zip_success">GOG cloud saves zip saved.</string>
+    <string name="cloud_saves_gog_zip_failed">Could not save GOG cloud saves zip.</string>
+    <string name="cloud_saves_gog_zip_empty">No GOG cloud save files found.</string>
+    <string name="cloud_saves_google_backup_label">Backup To Google</string>
+    <string name="cloud_saves_google_backup_helper">Save a copy to Google Play Games</string>
+    <string name="cloud_saves_google_backup_no_save">No save files found to back up.</string>
     <string name="cloud_saves_history_title">Save History</string>
     <string name="cloud_saves_history_empty">No previous saves backed up yet. Replaced saves and manual backups will appear here for 30 days.</string>
     <string name="cloud_saves_history_loading">Loading save history\u2026</string>
@@ -1137,7 +1459,16 @@ Installed path:
     <string name="cloud_saves_history_origin_cloud">cloud</string>
     <string name="cloud_saves_history_origin_manual">manual</string>
     <string name="cloud_saves_history_origin_auto">auto</string>
+    <!-- Save History badge: where the backup is stored. -->
+    <string name="cloud_saves_history_storage_steam">Steam</string>
+    <string name="cloud_saves_history_storage_google">Google</string>
+    <string name="cloud_saves_history_storage_epic">Epic</string>
+    <string name="cloud_saves_history_storage_gog">GOG</string>
     <string name="cloud_saves_history_restore">Restore</string>
+    <string name="cloud_saves_history_download">Download</string>
+    <string name="cloud_saves_history_download_success">File downloaded.</string>
+    <string name="cloud_saves_history_download_failed">Download failed.</string>
+    <string name="cloud_saves_history_cloud_readonly">Read-only</string>
     <string name="cloud_saves_history_restore_confirm_title">Restore this backup?</string>
     <string name="cloud_saves_history_restore_confirm_body">This will replace your current local save with the backup from %1$s.</string>
     <string name="cloud_saves_history_restore_success">Save restored from backup.</string>
@@ -1146,17 +1477,45 @@ Installed path:
     <string name="cloud_saves_keep_replaced_backup_summary">If you change your mind, you can restore it from Save History.</string>
     <string name="cloud_saves_history_refresh">Refresh</string>
     <string name="cloud_saves_history_rename">Rename</string>
+    <string name="cloud_saves_history_delete">Delete</string>
+    <string name="cloud_saves_history_delete_confirm_title">Delete Cloud Save</string>
+    <string name="cloud_saves_history_delete_confirm_body">Permanently delete the cloud save from %1$s? This cannot be undone.</string>
+    <string name="cloud_saves_history_delete_success">Cloud save deleted</string>
+    <string name="cloud_saves_history_delete_failed">Could not delete cloud save</string>
+    <string name="cloud_saves_deleting">Deleting save…</string>
     <string name="cloud_saves_history_rename_title">Name this backup</string>
     <string name="cloud_saves_history_rename_hint">e.g. Boss fight, Before ending</string>
     <string name="cloud_saves_history_rename_save">Save</string>
     <string name="cloud_saves_history_rename_clear">Clear</string>
     <string name="cloud_saves_history_rename_success">Backup renamed.</string>
     <string name="cloud_saves_history_rename_failed">Could not rename backup.</string>
-    <string name="cloud_saves_history_delete">Delete</string>
-    <string name="cloud_saves_history_delete_confirm_title">Delete this backup?</string>
-    <string name="cloud_saves_history_delete_confirm_body">Permanently remove this backup from Google Drive. This can\'t be undone.</string>
-    <string name="cloud_saves_history_delete_success">Backup deleted.</string>
-    <string name="cloud_saves_history_delete_failed">Could not delete backup.</string>
+
+    <!-- Cloud Saves > Custom save folder picker -->
+    <string name="cloud_saves_custom_select_folder">Select Save Folder</string>
+    <string name="cloud_saves_custom_folder_label">Save Folder</string>
+    <string name="cloud_saves_custom_select_folder_summary">Point to the in-container save directory</string>
+    <string name="cloud_saves_custom_no_container">Container not available for this shortcut</string>
+    <string name="cloud_saves_custom_picker_title">Select save folder</string>
+    <string name="cloud_saves_custom_outside_drive_c">Selected folder must be inside the container\'s C: drive</string>
+    <string name="cloud_saves_custom_path_map_failed">Could not map the selected folder to a Windows path.</string>
+    <string name="cloud_saves_custom_folder_set">Save folder set to %1$s</string>
+
+    <!-- Cloud Saves > Steam Cloud actions -->
+    <string name="cloud_saves_steam_sync_label">Sync from Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_helper">Download latest save</string>
+    <string name="cloud_saves_steam_sync_success">Synced from Steam Cloud</string>
+    <string name="cloud_saves_steam_sync_failed">Steam Cloud sync failed</string>
+    <string name="cloud_saves_steam_browse_label">View Steam Cloud Saves</string>
+    <string name="cloud_saves_steam_browse_helper">Open cloud storage</string>
+    <string name="cloud_saves_steam_browse_no_browser">No browser available to open the Steam page</string>
+    <string name="cloud_saves_steam_import_label">Import Files</string>
+    <string name="cloud_saves_steam_import_helper">Restore downloaded files</string>
+    <string name="cloud_saves_steam_import_picker_unavailable">File picker unavailable</string>
+    <string name="cloud_saves_steam_restore_overwrite_body">This will download Steam Cloud\'s current save files and overwrite the current save files.</string>
+
+    <!-- Cloud Saves > Internal result messages -->
+    <string name="cloud_saves_invalid_app_id">Invalid app ID</string>
+    <string name="cloud_saves_label_saved">Label saved</string>
 
     <!-- Saves > Import and Export -->
     <string name="saves_import_export_title">Saves</string>
@@ -1168,25 +1527,960 @@ Installed path:
     <string name="saves_import_export_exported_failed">Failed to export saves: %1$s</string>
     <string name="saves_import_export_imported">Saves imported successfully</string>
     <string name="saves_import_export_imported_failed">Failed to import saves: %1$s</string>
+    <string name="saves_export_path_summary">Saves will be exported to /WinNative/saves</string>
+    <string name="saves_export_success_path">Exported to %1$s</string>
+    <string name="saves_export_warning_title">Only use this with custom games</string>
+    <string name="saves_export_warning_body">Export may include saves from store-installed or cloud-sync games.</string>
+    <string name="saves_import_warning_title">This will overwrite existing saves in this container</string>
+    <string name="saves_import_warning_body">When restoring an older backup with multiple games, copy any newer saves into the zip with your file manager first. Only Saves existing in the .zip will be effected. Manage Saves wisely.</string>
 
     <!-- Preloader > Launch Screen -->
     <string name="preloader_default_name">Container</string>
-    <string name="preloader_initializing">Initializing…</string>
-    <string name="preloader_launching">Launching…</string>
-    <string name="preloader_closing">Closing %1$s…</string>
-    <string name="preloader_setup_environment">Setting up environment…</string>
-    <string name="preloader_installing_mono">Installing Wine Mono v%1$s…</string>
-    <string name="preloader_installing_redist">Installing redistributables…</string>
-    <string name="preloader_unpacking_exe">Unpacking game executable…</string>
-    <string name="preloader_downloading_cloud">Downloading cloud saves…</string>
-    <string name="preloader_syncing_cloud">Syncing cloud saves…</string>
-    <string name="preloader_cloud_downloading">Cloud Sync Downloading…</string>
-    <string name="preloader_cloud_backup">Backing up save to Google Drive…</string>
+    <string name="preloader_initializing">Initializing</string>
+    <string name="preloader_launching">Launching</string>
+    <string name="preloader_closing">Closing %1$s</string>
+    <string name="preloader_preparing_steam_environment">Preparing Steam environment</string>
+    <string name="preloader_starting_wine">Starting Wine</string>
+    <string name="preloader_starting_steam_launcher">Starting Steam Launcher</string>
+    <string name="preloader_loading_steam_client">Loading Steam client</string>
+    <string name="preloader_connecting_to_steam">Connecting to Steam</string>
+    <string name="preloader_signing_in_to_steam">Signing in to Steam</string>
+    <string name="preloader_fetching_game_info">Signed in — fetching game info</string>
+    <string name="preloader_steam_ready">Steam ready</string>
+    <string name="preloader_updating_game_info">Updating game info</string>
+    <string name="preloader_verifying_install">Verifying install</string>
+    <string name="preloader_scanning_redists">Scanning redistributables</string>
+    <string name="preloader_installing_redist_single">Installing redistributable</string>
+    <string name="preloader_installing_named_redist">Installing %1$s</string>
+    <string name="preloader_installing_named_redist_progress">Installing %1$s (%2$s)</string>
+    <string name="preloader_redists_ready">Redistributables ready</string>
+    <string name="preloader_no_redists">No redistributables to install</string>
+    <string name="preloader_steam_service_running">Steam service running</string>
+    <string name="preloader_launching_game">Launching %1$s</string>
+    <string name="preloader_steam_launcher_failed_restaging">Steam Launcher failed — re-staging assets</string>
+    <string name="preloader_steam_launcher_start_failed">Steam Launcher could not start. Re-staging — please relaunch</string>
+    <string name="preloader_steam_launcher_game_never_started">Steam Launcher reached the game but it never started</string>
+    <string name="preloader_setup_environment">Setting up environment</string>
+    <string name="preloader_retrying_steam_client_download">Retrying Steam client download</string>
+    <string name="preloader_installing_mono">Installing Wine Mono v%1$s</string>
+    <string name="preloader_installing_redist">Installing redistributables</string>
+    <string name="preloader_unpacking_exe">Unpacking game executable</string>
+    <string name="preloader_downloading_cloud">Downloading cloud saves</string>
+    <string name="preloader_syncing_cloud">Syncing cloud saves</string>
+    <string name="preloader_uploading_cloud">Uploading cloud saves</string>
+    <string name="preloader_checking_cloud">Checking cloud saves</string>
+    <string name="preloader_cloud_sync_retry">%1$s Retry %2$d/%3$d</string>
+    <string name="preloader_cloud_downloading">Cloud Sync Downloading</string>
     <string name="cloud_sync_failed_provider">%1$s cloud save sync failed.</string>
-    <string name="google_cloud_backup_failed">Google Drive backup failed.</string>
     <string name="preloader_platform_steam">Steam</string>
     <string name="preloader_platform_epic">Epic Games</string>
     <string name="preloader_platform_gog">GOG</string>
     <string name="preloader_platform_custom">Custom Game</string>
 
+    <!-- Performance recording settings -->
+    <string name="settings_hud_record_to_file_title">Record performance to file</string>
+    <string name="settings_hud_record_to_file_summary">Exports per-second FPS, CPU, GPU, temperature, and battery metrics to /WinNative/logs/ during gameplay.</string>
+    <string name="settings_leaderboard_category">Performance</string>
+    <!-- Workshop -->
+    <string name="workshop_loading_items">Loading Workshop items</string>
+    <string name="workshop_search_items">Search Workshop items</string>
+    <string name="workshop_title">STEAM WORKSHOP</string>
+    <string name="workshop_loading_subtitle">Fetching your subscribed items from Steam.</string>
+    <string name="workshop_error_title">Couldn\'t load Workshop items</string>
+    <string name="workshop_error_subtitle">Something went wrong. Try again.</string>
+    <string name="workshop_empty_title">No subscribed Workshop items</string>
+    <string name="workshop_empty_subtitle">Subscribe to items on the Steam Workshop, then reopen this window.</string>
+    <string name="workshop_search_empty_title">No items match \"%1$s\"</string>
+    <string name="workshop_search_empty_subtitle">Try a different search term.</string>
+    <string name="workshop_clear_search">Clear search</string>
+    <string name="workshop_item_fallback">Workshop item</string>
+    <string name="common_ui_failed">Failed</string>
+    <string name="steam_presence_snooze">Snooze</string>
+    <string name="steam_presence_busy">Busy</string>
+    <string name="steam_presence_looking_to_trade">Looking to Trade</string>
+    <string name="steam_presence_looking_to_play">Looking to Play</string>
+    <string name="steam_friends_count">Friends — %1$d online</string>
+    <string name="steam_friends_section_in_game">In-Game (%1$d)</string>
+    <string name="steam_friends_section_online">Online (%1$d)</string>
+    <string name="steam_friends_section_offline">Offline (%1$d)</string>
+    <string name="steam_friends_none_loaded">No friends loaded yet.</string>
+    <string name="steam_friends_chat_off">Chat is off. Turn Chat Service back on to see your friends.</string>
+    <string name="steam_friends_self_you">You</string>
+    <string name="steam_friends_in_game">In game</string>
+    <string name="steam_friends_join">Join</string>
+    <string name="steam_friends_play">Play</string>
+    <string name="steam_chat_image_failed">(image failed to send)</string>
+    <string name="steam_chat_empty">No messages yet. Say hi!</string>
+    <string name="steam_chat_uploading_image">Uploading image…</string>
+    <string name="steam_chat_send_image">Send image</string>
+    <string name="steam_chat_message_hint">Message…</string>
+    <string name="steam_chat_send">Send</string>
+    <string name="steam_chat_image">Image</string>
+    <string name="steam_common_back">Back</string>
+    <string name="steam_achievements_title">Achievements</string>
+    <string name="steam_achievements_empty">No achievements found for this game,\nor sign in to Steam to load them.</string>
+    <string name="steam_achievements_hidden">Hidden achievement</string>
+    <string name="steam_achievements_hidden_desc">Keep playing to reveal this achievement.</string>
+    <string name="steam_achievements_unlocked_on">Unlocked %1$s</string>
+    <string name="steam_achievements_unlocked">Unlocked</string>
+    <string name="steam_join_joining">Joining %1$s in %2$s…</string>
+    <string name="steam_join_install">Install %1$s to join %2$s</string>
+    <string name="steam_join_not_owned">You don\'t own %1$s</string>
+    <string name="steam_chat_not_sent">(not sent)</string>
+    <string name="steam_join_the_game">the game</string>
+    <string name="steam_friends_settings">Settings</string>
+    <string name="steam_chat_settings_title">Chat Settings</string>
+    <string name="steam_chat_setting_service">Chat Service</string>
+    <string name="steam_chat_setting_service_desc">Sign in to friends and chat; turn off to go offline</string>
+    <string name="steam_chat_setting_notifications">Chat Notifications</string>
+    <string name="steam_chat_setting_notifications_desc">Show a notification when you receive a message</string>
+    <string name="steam_chat_setting_heads">Chat Heads</string>
+    <string name="steam_chat_setting_heads_desc">Floating bubbles to read and reply to messages</string>
+    <string name="steam_chat_setting_ingame">Enable Chat in Game</string>
+    <string name="steam_chat_setting_ingame_desc">Receive and send messages while playing</string>
+    <string name="steam_chat_setting_stay_running">Run in Background</string>
+    <string name="steam_chat_setting_stay_running_desc">Keep chat running after you exit WinNative</string>
+    <string name="steam_chat_settings_overlay_needed">Allow display over other apps to use chat heads</string>
+    <string name="steam_chat_heads_title">Messages</string>
+    <string name="steam_chat_heads_recent_title">Recent</string>
+    <string name="steam_chat_heads_online_title">Online</string>
+    <string name="steam_chat_heads_new_chat">New message</string>
+    <string name="steam_chat_setting_autohide">Auto-Hide</string>
+    <string name="steam_chat_setting_autohide_desc">Fade the chat head after 10s of inactivity</string>
+    <string name="steam_chat_heads_friends_title">Friends</string>
+    <!-- File manager -->
+    <string name="file_manager_title">Files</string>
+    <string name="file_manager_copy">Copy</string>
+    <string name="file_manager_cut">Cut</string>
+    <string name="file_manager_paste">Paste</string>
+    <string name="file_manager_paste_here">Paste here</string>
+    <string name="file_manager_new_folder">New Folder</string>
+    <string name="file_manager_new_folder_short">Folder</string>
+    <string name="file_manager_multi_select">Select</string>
+    <string name="file_manager_create">Create</string>
+    <string name="file_manager_delete">Delete</string>
+    <string name="file_manager_copy_count">Copy (%1$d)</string>
+    <string name="file_manager_cut_count">Cut (%1$d)</string>
+    <string name="file_manager_delete_count">Delete (%1$d)</string>
+    <string name="file_manager_extract">Extract</string>
+    <string name="file_manager_extract_here">Extract here</string>
+    <string name="file_manager_extract_to">Extract to…</string>
+    <string name="file_manager_extracting">Extracting %1$s</string>
+    <string name="file_manager_extract_failed">Extraction failed</string>
+    <string name="file_manager_run_boot">Run / Boot</string>
+    <string name="file_manager_create_shortcut">Create Shortcut</string>
+    <string name="file_manager_run_in_container">Run in container</string>
+    <string name="file_manager_no_containers">No containers available</string>
+    <string name="file_manager_delete_confirm">Delete \"%1$s\"? This cannot be undone.</string>
+    <string name="file_manager_delete_confirm_multi">Delete %1$d items? This cannot be undone.</string>
+    <string name="file_manager_copying">Copying %1$s</string>
+    <string name="file_manager_moving">Moving %1$s</string>
+    <string name="file_manager_copying_count">Copying %1$d items</string>
+    <string name="file_manager_moving_count">Moving %1$d items</string>
+    <string name="file_manager_paste_into_itself">Can\'t paste a folder into itself</string>
+    <string name="file_manager_operation_failed">Operation failed</string>
+    <string name="file_manager_delete_failed">Delete failed</string>
+    <string name="file_manager_rename_failed">Rename failed</string>
+    <string name="file_manager_create_folder_failed">Create folder failed</string>
+    <string name="settings_content_refresh">Refresh</string>
+
+    <!-- ===== Retro console menus (auto-externalized) ===== -->
+    <!-- PS2 in-game overlay menu -->
+    <string name="retro_ps2_save">Save</string>
+    <string name="retro_ps2_cancel">Cancel</string>
+    <string name="retro_ps2_save_state">Save State</string>
+    <string name="retro_ps2_load_save_state">Load Save State</string>
+    <string name="retro_ps2_achievements">Achievements</string>
+    <string name="retro_ps2_cheats">Cheats</string>
+    <string name="retro_ps2_memory_cards">Memory Cards</string>
+    <string name="retro_ps2_fast_forward">Fast Forward</string>
+    <string name="retro_ps2_reset">Reset</string>
+    <string name="retro_ps2_swap_disc">Swap Disc</string>
+    <string name="retro_ps2_slot">Slot %1$d</string>
+    <string name="retro_ps2_slot_tap_to_load">Tap to load</string>
+    <string name="retro_ps2_slot_empty">Empty</string>
+    <string name="retro_ps2_slot_tap_to_overwrite">Tap to overwrite</string>
+    <string name="retro_ps2_slot_empty_tap_to_save">Empty — tap to save</string>
+    <string name="retro_ps2_slot_is_empty">Slot %1$d is empty</string>
+    <string name="retro_ps2_loaded_slot">Loaded slot %1$d</string>
+    <string name="retro_ps2_could_not_load_slot">Could not load slot %1$d</string>
+    <string name="retro_ps2_saved_to_slot">Saved to slot %1$d</string>
+    <string name="retro_ps2_save_failed">Save failed</string>
+    <string name="retro_ps2_slot_1_suffix">  •  Slot 1</string>
+    <string name="retro_ps2_slot_2_suffix">  •  Slot 2</string>
+    <string name="retro_ps2_tap_to_use_suffix">  •  Tap to use</string>
+    <string name="retro_ps2_new_memory_card">New Memory Card</string>
+    <string name="retro_ps2_import_card">Import Card</string>
+    <string name="retro_ps2_enable_online_dev9">Enable Online (DEV9)</string>
+    <string name="retro_ps2_enable_online_subtitle">PS2 network adapter — restarts the game to attach it</string>
+    <string name="retro_ps2_ethernet_device">Ethernet Device</string>
+    <string name="retro_ps2_dns_mode">DNS Mode</string>
+    <string name="retro_ps2_primary_dns">Primary DNS</string>
+    <string name="retro_ps2_secondary_dns">Secondary DNS</string>
+    <string name="retro_ps2_optional">optional</string>
+    <string name="retro_ps2_auto_ip_dhcp">Auto IP (DHCP)</string>
+    <string name="retro_ps2_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_ps2_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_ps2_server_host">Server: %1$s</string>
+    <string name="retro_ps2_tap_to_set_ip">tap to set IP (blank removes)</string>
+    <string name="retro_ps2_host_to_ip">%1$s → IP</string>
+    <string name="retro_ps2_add_server_host">Add Server Host</string>
+    <string name="retro_ps2_new_server_hostname">New Server Hostname</string>
+    <string name="retro_ps2_server_hostname_hint">e.g. bf2.playbattlefront.com</string>
+    <string name="retro_ps2_onscreen_controls">On-screen Controls</string>
+    <string name="retro_ps2_edit_layout">Edit Layout</string>
+    <string name="retro_ps2_reset_layout">Reset Layout</string>
+    <string name="retro_ps2_layout_reset">Layout reset</string>
+    <string name="retro_ps2_left_stick_invert_x">Left Stick: Invert X</string>
+    <string name="retro_ps2_left_stick_invert_y">Left Stick: Invert Y</string>
+    <string name="retro_ps2_right_stick_invert_x">Right Stick: Invert X</string>
+    <string name="retro_ps2_right_stick_invert_y">Right Stick: Invert Y</string>
+    <string name="retro_ps2_button_color">Button Color</string>
+    <string name="retro_ps2_letter_color">Letter Color</string>
+    <string name="retro_ps2_shadow_color">Shadow Color</string>
+    <string name="retro_ps2_background_color">Background Color</string>
+    <string name="retro_ps2_reset_colors">Reset Colors</string>
+    <string name="retro_ps2_renderer">Renderer</string>
+    <string name="retro_ps2_renderer_vulkan">Vulkan</string>
+    <string name="retro_ps2_renderer_opengl">OpenGL</string>
+    <string name="retro_ps2_renderer_software">Software</string>
+    <string name="retro_ps2_resolution_scale">Resolution Scale</string>
+    <string name="retro_ps2_scale_1x_native">1x (Native)</string>
+    <string name="retro_ps2_scale_1_5x">1.5x</string>
+    <string name="retro_ps2_scale_2x">2x</string>
+    <string name="retro_ps2_scale_3x">3x</string>
+    <string name="retro_ps2_scale_4x">4x</string>
+    <string name="retro_ps2_aspect_ratio">Aspect Ratio</string>
+    <string name="retro_ps2_aspect_stretch">Stretch</string>
+    <string name="retro_ps2_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_ps2_aspect_4_3">4:3</string>
+    <string name="retro_ps2_aspect_16_9">16:9</string>
+    <string name="retro_ps2_display_filter">Display Filter</string>
+    <string name="retro_ps2_filter_nearest">Nearest</string>
+    <string name="retro_ps2_filter_bilinear_smooth">Bilinear (Smooth)</string>
+    <string name="retro_ps2_filter_bilinear_sharp">Bilinear (Sharp)</string>
+    <string name="retro_ps2_texture_filter">Texture Filter</string>
+    <string name="retro_ps2_filter_bilinear_forced">Bilinear (Forced)</string>
+    <string name="retro_ps2_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_ps2_filter_bilinear_sprites">Bilinear (Sprites)</string>
+    <string name="retro_ps2_blending_accuracy">Blending Accuracy</string>
+    <string name="retro_ps2_blend_minimum">Minimum</string>
+    <string name="retro_ps2_blend_basic">Basic</string>
+    <string name="retro_ps2_blend_medium">Medium</string>
+    <string name="retro_ps2_blend_high">High</string>
+    <string name="retro_ps2_blend_full">Full</string>
+    <string name="retro_ps2_blend_maximum">Maximum</string>
+    <string name="retro_ps2_crt_tv_shader">CRT / TV Shader</string>
+    <string name="retro_ps2_shader_off">Off</string>
+    <string name="retro_ps2_shader_scanline">Scanline</string>
+    <string name="retro_ps2_shader_diagonal">Diagonal</string>
+    <string name="retro_ps2_shader_triangular">Triangular</string>
+    <string name="retro_ps2_shader_wave">Wave</string>
+    <string name="retro_ps2_shader_lottes">Lottes</string>
+    <string name="retro_ps2_shader_4xrgss">4xRGSS</string>
+    <string name="retro_ps2_shader_nxagss">NxAGSS</string>
+    <string name="retro_ps2_frame_skip">Frame Skip</string>
+    <string name="retro_ps2_frameskip_off">Off</string>
+    <string name="retro_ps2_frameskip_1">Skip 1</string>
+    <string name="retro_ps2_frameskip_2">Skip 2</string>
+    <string name="retro_ps2_frameskip_3">Skip 3</string>
+    <string name="retro_ps2_mipmapping">Mipmapping</string>
+    <string name="retro_ps2_volume">Volume</string>
+    <string name="retro_ps2_volume_percent">%1$d%%</string>
+    <string name="retro_ps2_mute">Mute</string>
+    <string name="retro_ps2_swap_stereo_channels">Swap Stereo Channels</string>
+    <string name="retro_ps2_ee_cycle_rate">EE Cycle Rate</string>
+    <string name="retro_ps2_rate_50">50%</string>
+    <string name="retro_ps2_rate_60">60%</string>
+    <string name="retro_ps2_rate_75">75%</string>
+    <string name="retro_ps2_rate_100_default">100% (Default)</string>
+    <string name="retro_ps2_rate_130">130%</string>
+    <string name="retro_ps2_rate_180">180%</string>
+    <string name="retro_ps2_rate_300">300%</string>
+    <string name="retro_ps2_ee_cycle_skip">EE Cycle Skip</string>
+    <string name="retro_ps2_skip_off">Off</string>
+    <string name="retro_ps2_skip_1">1</string>
+    <string name="retro_ps2_skip_2">2</string>
+    <string name="retro_ps2_skip_3">3</string>
+    <string name="retro_ps2_instant_vu1">Instant VU1</string>
+    <string name="retro_ps2_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_ps2_fast_cdvd">Fast CDVD</string>
+    <string name="retro_ps2_hud_fps">FPS</string>
+    <string name="retro_ps2_hud_emulation_speed">Emulation Speed</string>
+    <string name="retro_ps2_hud_cpu_usage">CPU Usage</string>
+    <string name="retro_ps2_hud_gpu_usage">GPU Usage</string>
+    <string name="retro_ps2_hud_internal_resolution">Internal Resolution</string>
+    <string name="retro_ps2_deinterlace_mode">Deinterlace Mode</string>
+    <string name="retro_ps2_deint_auto">Auto</string>
+    <string name="retro_ps2_deint_off">Off</string>
+    <string name="retro_ps2_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_ps2_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_ps2_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_ps2_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_ps2_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_ps2_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_ps2_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_ps2_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_ps2_fmv_aspect_ratio">FMV Aspect Ratio</string>
+    <string name="retro_ps2_anti_blur">Anti-Blur</string>
+    <string name="retro_ps2_widescreen_patches">Widescreen Patches</string>
+    <string name="retro_ps2_no_interlace_patches">No-Interlace Patches</string>
+    <string name="retro_ps2_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_ps2_intc_spin">INTC Spin Detection</string>
+    <string name="retro_ps2_wait_loop">Wait Loop Detection</string>
+    <string name="retro_ps2_time_stretch">Audio Time Stretch</string>
+    <string name="retro_ps2_audio_buffer">Audio Buffer</string>
+    <string name="retro_ps2_audio_latency">Output Latency</string>
+    <string name="retro_ps2_ms">%1$d ms</string>
+    <string name="retro_ps2_hud_frame_times">Frame Times</string>
+    <string name="retro_ps2_hud_gs_stats">GS Statistics</string>
+    <string name="retro_ps2_hud_hw_info">Hardware Info</string>
+    <string name="retro_ps2_hud_version">Version</string>
+    <string name="retro_ps2_hud_input_display">Input Display</string>
+    <string name="retro_ps2_tab_menu">Menu</string>
+    <string name="retro_ps2_tab_display">Display</string>
+    <string name="retro_ps2_tab_performance">Performance</string>
+    <string name="retro_ps2_tab_hud">HUD</string>
+    <string name="retro_ps2_tab_sound">Sound</string>
+    <string name="retro_ps2_tab_online">Online</string>
+    <string name="retro_ps2_tab_controls">Controls</string>
+    <string name="retro_ps2_resume">Resume</string>
+    <string name="retro_ps2_pause">Pause</string>
+    <string name="retro_ps2_exit">Exit</string>
+    <!-- Libretro in-game menu -->
+    <string name="retro_lr_bios_imported">BIOS imported: %1$s</string>
+    <string name="retro_lr_invalid_bios_file">Invalid BIOS file</string>
+    <string name="retro_lr_invalid_retro_game">Invalid retro game</string>
+    <string name="retro_lr_rom_not_found">ROM not found: %1$s</string>
+    <string name="retro_lr_could_not_read_rom_archive">Could not read the ROM inside this archive</string>
+    <string name="retro_lr_core_not_installed">Core not installed: %1$s</string>
+    <string name="retro_lr_cheats_enabled_achievements_disabled">Cheats enabled — achievements are disabled for this session</string>
+    <string name="retro_lr_cloud_save_restored">Cloud save restored</string>
+    <string name="retro_lr_restore_failed">Restore failed</string>
+    <string name="retro_lr_cloud_conflict_message">A newer cloud save exists for %1$s. Do you wish to sync, and which cloud save would you prefer to keep?</string>
+    <string name="retro_lr_cloud_save">Cloud save</string>
+    <string name="retro_lr_use_cloud_save">Use Cloud Save</string>
+    <string name="retro_lr_renderer_default">Retro</string>
+    <string name="retro_lr_failed_load_core">Failed to load emulator core</string>
+    <string name="retro_lr_failed_load_rom">Failed to load ROM</string>
+    <string name="retro_lr_graphics_not_supported">Graphics not supported for this core</string>
+    <string name="retro_ps2_device_unsupported">This device can\'t run PS2 emulation — it needs OpenGL ES 3.1 or newer.</string>
+    <string name="retro_lr_emulator_error">Emulator error</string>
+    <string name="retro_lr_shader_default">Default</string>
+    <string name="retro_lr_shader_crt">CRT</string>
+    <string name="retro_lr_shader_lcd">LCD</string>
+    <string name="retro_lr_shader_sharp">Sharp</string>
+    <string name="retro_lr_sgsr">SGSR</string>
+    <string name="retro_lr_sgsr_upscale">SGSR Upscale</string>
+    <string name="retro_lr_upscale_native">Native</string>
+    <string name="retro_lr_sound">Sound</string>
+    <string name="retro_lr_left_stick_invert_x">Left Stick: Invert X</string>
+    <string name="retro_lr_left_stick_invert_y">Left Stick: Invert Y</string>
+    <string name="retro_lr_right_stick_invert_x">Right Stick: Invert X</string>
+    <string name="retro_lr_right_stick_invert_y">Right Stick: Invert Y</string>
+    <string name="retro_lr_on_screen_controls">On-screen Controls</string>
+    <string name="retro_lr_haptic_feedback">Haptic Feedback</string>
+    <string name="retro_lr_portrait">Portrait</string>
+    <string name="retro_lr_landscape">Landscape</string>
+    <string name="retro_lr_edit_layout">Edit Layout (%1$s)</string>
+    <string name="retro_lr_reset_layout">Reset %1$s Layout</string>
+    <string name="retro_lr_layout_reset">%1$s layout reset</string>
+    <string name="retro_lr_button_color">Button Color</string>
+    <string name="retro_lr_letter_color">Letter Color</string>
+    <string name="retro_lr_shadow_color">Shadow Color</string>
+    <string name="retro_lr_background_color">Background Color</string>
+    <string name="retro_lr_reset_colors">Reset Colors</string>
+    <string name="retro_lr_colors_reset">Colors reset</string>
+    <string name="retro_lr_performance_hud">Performance HUD</string>
+    <string name="retro_lr_alpha">Alpha</string>
+    <string name="retro_lr_background_alpha">Background Alpha</string>
+    <string name="retro_lr_background">Background</string>
+    <string name="retro_lr_scale">Scale</string>
+    <string name="retro_lr_numeric_frametime">Numeric Frametime</string>
+    <string name="retro_lr_dual_series_battery">Dual-series Battery</string>
+    <string name="retro_lr_hud_elements">HUD ELEMENTS</string>
+    <string name="retro_lr_hud_fps">FPS</string>
+    <string name="retro_lr_hud_console">Console</string>
+    <string name="retro_lr_hud_gpu">GPU</string>
+    <string name="retro_lr_hud_cpu">CPU</string>
+    <string name="retro_lr_hud_ram">RAM</string>
+    <string name="retro_lr_hud_battery">Battery</string>
+    <string name="retro_lr_hud_temp">Temp</string>
+    <string name="retro_lr_hud_graph">Graph</string>
+    <string name="retro_lr_hud_cpu_temp">CPU Temp</string>
+    <string name="retro_lr_save_state">Save State</string>
+    <string name="retro_lr_load_save_state">Load Save State</string>
+    <string name="retro_lr_loading_states_disabled_hardcore">Loading states is disabled in Hardcore mode</string>
+    <string name="retro_lr_achievements">Achievements</string>
+    <string name="retro_lr_cheats">Cheats</string>
+    <string name="retro_lr_cheats_disabled_hardcore">Cheats are disabled in Hardcore mode</string>
+    <string name="retro_lr_reset">Reset</string>
+    <string name="retro_lr_fast_forward">Fast Forward</string>
+    <string name="retro_lr_fast_forward_disabled_hardcore">Fast forward is disabled in Hardcore mode</string>
+    <string name="retro_lr_hud">HUD</string>
+    <string name="retro_lr_disc">Disc %1$d/%2$d</string>
+    <string name="retro_lr_resume">Resume</string>
+    <string name="retro_lr_pause">Pause</string>
+    <string name="retro_lr_exit">Exit</string>
+    <string name="retro_lr_saved_to_slot">Saved to slot %1$d</string>
+    <string name="retro_lr_could_not_save_state">Could not save state</string>
+    <string name="retro_lr_bios_required_title">%1$s BIOS required</string>
+    <string name="retro_lr_bios_required_message">PlayStation games need a real console BIOS file that you must provide. Import a BIOS (scph5501.bin, scph5500.bin, scph5502.bin, scph1001.bin or scph7001.bin) to continue.</string>
+    <string name="retro_lr_import_bios">Import BIOS…</string>
+    <string name="retro_lr_cancel">Cancel</string>
+    <string name="retro_lr_slot_empty">Slot %1$d is empty</string>
+    <string name="retro_lr_loaded_slot">Loaded slot %1$d</string>
+    <string name="retro_lr_could_not_load_state">Could not load state</string>
+    <string name="retro_lr_slot_title">Slot %1$d</string>
+    <string name="retro_lr_rename_slot">Rename Slot %1$d</string>
+    <!-- Retro game settings screen -->
+    <string name="retro_gs_section_general">General</string>
+    <string name="retro_gs_section_graphics">Graphics</string>
+    <string name="retro_gs_section_performance">Performance</string>
+    <string name="retro_gs_section_hud">HUD</string>
+    <string name="retro_gs_section_input">Input</string>
+    <string name="retro_gs_section_audio">Audio</string>
+    <string name="retro_gs_section_online">Online</string>
+    <string name="retro_gs_cancel">Cancel</string>
+    <string name="retro_gs_save">Save</string>
+    <string name="retro_gs_shader_default">Default</string>
+    <string name="retro_gs_shader_crt">CRT</string>
+    <string name="retro_gs_shader_lcd">LCD</string>
+    <string name="retro_gs_shader_sharp">Sharp</string>
+    <string name="retro_gs_upscale_2x">2x</string>
+    <string name="retro_gs_upscale_4x">4x</string>
+    <string name="retro_gs_upscale_native">Native</string>
+    <string name="retro_gs_group_game">GAME</string>
+    <string name="retro_gs_label_name">Name</string>
+    <string name="retro_gs_label_system">System</string>
+    <string name="retro_gs_label_emulator_core">Emulator Core</string>
+    <string name="retro_gs_change_console">Change console</string>
+    <string name="retro_gs_identify_as">Identify as console</string>
+    <string name="retro_gs_console_changed">Now identified as %1$s</string>
+    <string name="retro_gs_label_rom_path">ROM Path</string>
+    <string name="retro_gs_group_bios">%1$s BIOS</string>
+    <string name="retro_gs_label_installed">Installed</string>
+    <string name="retro_gs_bios_none">None — required to run %1$s games</string>
+    <string name="retro_gs_import_bios">Import BIOS…</string>
+    <string name="retro_gs_remove_bios">Remove BIOS</string>
+    <string name="retro_gs_group_library_artwork">LIBRARY ARTWORK</string>
+    <string name="retro_gs_artwork_game_card">Game Card Image</string>
+    <string name="retro_gs_artwork_grid">Grid Image</string>
+    <string name="retro_gs_artwork_carousel">Carousel Image</string>
+    <string name="retro_gs_artwork_list">List Image</string>
+    <string name="retro_gs_artwork_custom_set">Custom image set</string>
+    <string name="retro_gs_artwork_set_image">Set image</string>
+    <string name="retro_gs_artwork_remove">Remove</string>
+    <string name="retro_gs_group_video">VIDEO</string>
+    <string name="retro_gs_video_filter">Video Filter</string>
+    <string name="retro_gs_sgsr">SGSR</string>
+    <string name="retro_gs_sgsr_upscale">SGSR Upscale</string>
+    <string name="retro_gs_performance_hud">Performance HUD</string>
+    <string name="retro_gs_group_core">CORE</string>
+    <string name="retro_gs_renderer">Renderer</string>
+    <string name="retro_gs_renderer_vulkan">Vulkan</string>
+    <string name="retro_gs_renderer_opengl">OpenGL</string>
+    <string name="retro_gs_renderer_software">Software</string>
+    <string name="retro_gs_resolution_scale">Resolution Scale</string>
+    <string name="retro_gs_scale_1x_native">1x (Native)</string>
+    <string name="retro_gs_scale_1_5x">1.5x</string>
+    <string name="retro_gs_scale_2x">2x</string>
+    <string name="retro_gs_scale_3x">3x</string>
+    <string name="retro_gs_scale_4x">4x</string>
+    <string name="retro_gs_aspect_ratio">Aspect Ratio</string>
+    <string name="retro_gs_aspect_stretch">Stretch</string>
+    <string name="retro_gs_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_gs_aspect_4_3">4:3</string>
+    <string name="retro_gs_aspect_16_9">16:9</string>
+    <string name="retro_gs_display_filter">Display Filter</string>
+    <string name="retro_gs_filter_nearest">Nearest</string>
+    <string name="retro_gs_filter_bilinear_smooth">Bilinear (Smooth)</string>
+    <string name="retro_gs_filter_bilinear_sharp">Bilinear (Sharp)</string>
+    <string name="retro_gs_texture_filter">Texture Filter</string>
+    <string name="retro_gs_filter_bilinear_forced">Bilinear (Forced)</string>
+    <string name="retro_gs_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_gs_filter_bilinear_sprites">Bilinear (Sprites)</string>
+    <string name="retro_gs_blending_accuracy">Blending Accuracy</string>
+    <string name="retro_gs_blend_minimum">Minimum</string>
+    <string name="retro_gs_blend_basic">Basic</string>
+    <string name="retro_gs_blend_medium">Medium</string>
+    <string name="retro_gs_blend_high">High</string>
+    <string name="retro_gs_blend_full">Full</string>
+    <string name="retro_gs_blend_maximum">Maximum</string>
+    <string name="retro_gs_crt_tv_shader">CRT / TV Shader</string>
+    <string name="retro_gs_off">Off</string>
+    <string name="retro_gs_tvshader_scanline">Scanline</string>
+    <string name="retro_gs_tvshader_diagonal">Diagonal</string>
+    <string name="retro_gs_tvshader_triangular">Triangular</string>
+    <string name="retro_gs_tvshader_wave">Wave</string>
+    <string name="retro_gs_tvshader_lottes">Lottes</string>
+    <string name="retro_gs_tvshader_4xrgss">4xRGSS</string>
+    <string name="retro_gs_tvshader_nxagss">NxAGSS</string>
+    <string name="retro_gs_frame_skip">Frame Skip</string>
+    <string name="retro_gs_frameskip_1">Skip 1</string>
+    <string name="retro_gs_frameskip_2">Skip 2</string>
+    <string name="retro_gs_frameskip_3">Skip 3</string>
+    <string name="retro_gs_mipmapping">Mipmapping</string>
+    <string name="retro_gs_group_performance">PERFORMANCE</string>
+    <string name="retro_gs_ee_cycle_rate">EE Cycle Rate</string>
+    <string name="retro_gs_rate_50">50%</string>
+    <string name="retro_gs_rate_60">60%</string>
+    <string name="retro_gs_rate_75">75%</string>
+    <string name="retro_gs_rate_100_default">100% (Default)</string>
+    <string name="retro_gs_rate_130">130%</string>
+    <string name="retro_gs_rate_180">180%</string>
+    <string name="retro_gs_rate_300">300%</string>
+    <string name="retro_gs_ee_cycle_skip">EE Cycle Skip</string>
+    <string name="retro_gs_num_1">1</string>
+    <string name="retro_gs_num_2">2</string>
+    <string name="retro_gs_num_3">3</string>
+    <string name="retro_gs_instant_vu1">Instant VU1</string>
+    <string name="retro_gs_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_gs_fast_cdvd">Fast CDVD</string>
+    <string name="retro_gs_group_performance_hud">PERFORMANCE HUD</string>
+    <string name="retro_gs_hud_fps">FPS</string>
+    <string name="retro_gs_hud_emulation_speed">Emulation Speed</string>
+    <string name="retro_gs_hud_cpu_usage">CPU Usage</string>
+    <string name="retro_gs_hud_gpu_usage">GPU Usage</string>
+    <string name="retro_gs_hud_internal_resolution">Internal Resolution</string>
+    <string name="retro_gs_deinterlace_mode">Deinterlace Mode</string>
+    <string name="retro_gs_deint_auto">Auto</string>
+    <string name="retro_gs_deint_off">Off</string>
+    <string name="retro_gs_deint_weave_tff">Weave (TFF)</string>
+    <string name="retro_gs_deint_weave_bff">Weave (BFF)</string>
+    <string name="retro_gs_deint_bob_tff">Bob (TFF)</string>
+    <string name="retro_gs_deint_bob_bff">Bob (BFF)</string>
+    <string name="retro_gs_deint_blend_tff">Blend (TFF)</string>
+    <string name="retro_gs_deint_blend_bff">Blend (BFF)</string>
+    <string name="retro_gs_deint_adaptive_tff">Adaptive (TFF)</string>
+    <string name="retro_gs_deint_adaptive_bff">Adaptive (BFF)</string>
+    <string name="retro_gs_fmv_aspect_ratio">FMV Aspect Ratio</string>
+    <string name="retro_gs_anti_blur">Anti-Blur</string>
+    <string name="retro_gs_widescreen_patches">Widescreen Patches</string>
+    <string name="retro_gs_no_interlace_patches">No-Interlace Patches</string>
+    <string name="retro_gs_vu_flag_hack">VU Flag Hack</string>
+    <string name="retro_gs_intc_spin">INTC Spin Detection</string>
+    <string name="retro_gs_wait_loop">Wait Loop Detection</string>
+    <string name="retro_gs_time_stretch">Audio Time Stretch</string>
+    <string name="retro_gs_audio_buffer">Audio Buffer</string>
+    <string name="retro_gs_audio_latency">Output Latency</string>
+    <string name="retro_gs_ms">%1$d ms</string>
+    <string name="retro_gs_hud_frame_times">Frame Times</string>
+    <string name="retro_gs_hud_gs_stats">GS Statistics</string>
+    <string name="retro_gs_hud_hw_info">Hardware Info</string>
+    <string name="retro_gs_hud_version">Version</string>
+    <string name="retro_gs_hud_input_display">Input Display</string>
+    <string name="retro_gs_fast_boot">Fast Boot</string>
+    <string name="retro_gs_group_online_dev9">ONLINE (DEV9)</string>
+    <string name="retro_gs_enable_online">Enable Online</string>
+    <string name="retro_gs_netplay_enable">Enable NetPlay</string>
+    <string name="retro_gs_netplay_enable_subtitle">Off by default. Enable, then choose Host or Join before launch.\nTurns off again when you exit the game.</string>
+    <string name="retro_netplay_enable_before_launch">Enable NetPlay in game settings and pick Host or Join before launch</string>
+    <string name="retro_gs_netplay_host_mode">Host session</string>
+    <string name="retro_gs_netplay_host_mode_subtitle">On = wait for a player. Off = join host address</string>
+    <string name="retro_gs_netplay_host">Host address</string>
+    <string name="retro_gs_netplay_host_hint">IP or hostname</string>
+    <string name="retro_gs_netplay_port">Port</string>
+    <string name="retro_gs_netplay_not_ready">NetPlay uses local multiplayer ports over TCP (player 1 host / player 2 client). PS2 online uses DEV9 Ethernet instead.</string>
+    <string name="retro_netplay_title">NetPlay</string>
+    <string name="retro_netplay_help">Shared-screen multiplayer over Wi‑Fi (like RetroArch).\nHost = Player 1, Join = Player 2. Both devices show the same game.</string>
+    <string name="retro_netplay_help_game_link">Game Link over Wi‑Fi — each device runs its own game.\nGB/GBC: Gambatte serial link (Pokémon Gen 1–2).\nGBA: gpSP Wireless Adapter (Pokémon FR/LG/Emerald battles).</string>
+    <string name="retro_netplay_menu_hint">Host = P1 · Join = P2 · same game on both screens</string>
+    <string name="retro_netplay_game_link_hint">Game Link · each screen is its own handheld</string>
+    <string name="retro_netplay_gba_not_ready">GBA multiplayer uses gpSP + Wireless Adapter. Ensure libgpsp is installed.</string>
+    <string name="retro_netplay_player_name">Display name</string>
+    <string name="retro_netplay_player_name_hint">Shown to other players</string>
+    <string name="retro_netplay_launch_mode">On launch</string>
+    <string name="retro_netplay_mode_host">Host</string>
+    <string name="retro_netplay_mode_join">Join</string>
+    <string name="retro_netplay_mode_manual">Manual</string>
+    <string name="retro_netplay_host_mode_hint">Tap Host to open a room for this play session, then launch the game. NetPlay turns off when you exit.</string>
+    <string name="retro_netplay_prelaunch_hint">Room is open for this session only. Launch when ready. Exiting the game turns NetPlay off.</string>
+    <string name="retro_netplay_user_connected">%1$s connected</string>
+    <string name="retro_netplay_user_disconnected">%1$s disconnected</string>
+    <string name="retro_netplay_scan_hint">Scan the same Wi‑Fi for open rooms, or join by IP address.</string>
+    <string name="retro_netplay_find_rooms">Find rooms on Wi‑Fi</string>
+    <string name="retro_netplay_hosting_room">Hosting room</string>
+    <string name="retro_netplay_waiting_players">Waiting for players…</string>
+    <string name="retro_netplay_scanning">Scanning Wi‑Fi…</string>
+    <string name="retro_netplay_scan_results">Scan results</string>
+    <string name="retro_netplay_scan_again">Scan again</string>
+    <string name="retro_netplay_no_rooms">No rooms found. Make sure the host is on the same Wi‑Fi and hosting a room.</string>
+    <string name="retro_netplay_select_room_hint">Tap a room to join now (does not save the IP for next launch).</string>
+    <string name="retro_netplay_connecting">Connecting…</string>
+    <string name="retro_netplay_in_room">In room</string>
+    <string name="retro_netplay_leave">Leave</string>
+    <string name="retro_netplay_dismiss">Dismiss</string>
+    <string name="retro_netplay_host_action">Host room</string>
+    <string name="retro_netplay_join_action">Join by IP</string>
+    <string name="retro_netplay_scan_action">Scan Wi‑Fi</string>
+    <string name="retro_netplay_stop_scan">Stop scan</string>
+    <string name="retro_netplay_join_room">Join</string>
+    <string name="retro_netplay_room_players">Players</string>
+    <string name="retro_netplay_players_count">%1$d connected</string>
+    <string name="retro_netplay_joined">Joined</string>
+    <string name="retro_dolphin_wii_home">Wii Home</string>
+    <string name="retro_netplay_dolphin_help">GameCube/Wii NetPlay uses Dolphin\'s own engine. Host = Player 1, Join = Player 2. Pick Host or Join and a connection type before launch; both devices boot the same game together.</string>
+    <string name="retro_netplay_connection">Connection</string>
+    <string name="retro_netplay_conn_direct">LAN (direct IP)</string>
+    <string name="retro_netplay_conn_traversal">Online (host code)</string>
+    <string name="retro_netplay_host_code">Host code</string>
+    <string name="retro_netplay_host_code_hint">Traversal host code from the host</string>
+    <string name="retro_netplay_dolphin_host_lan_hint">Share your device\'s Wi‑Fi IP and this port with Player 2. The game starts automatically once they connect.</string>
+    <string name="retro_netplay_dolphin_host_online_hint">A host code is shown when the game boots — share it with Player 2. The game starts automatically once they connect.</string>
+    <string name="retro_netplay_dolphin_join_lan_hint">Enter the host\'s Wi‑Fi IP and port, then launch to connect.</string>
+    <string name="retro_netplay_dolphin_join_online_hint">Enter the host code from Player 1, then launch to connect.</string>
+    <string name="retro_tab_netplay">NetPlay</string>
+    <string name="retro_gs_ethernet_device">Ethernet Device</string>
+    <string name="retro_gs_net_auto">Auto</string>
+    <string name="retro_gs_net_wifi">Wi-Fi</string>
+    <string name="retro_gs_dns_mode">DNS Mode</string>
+    <string name="retro_gs_dns_manual">Manual</string>
+    <string name="retro_gs_dns_internal">Internal</string>
+    <string name="retro_gs_primary_dns">Primary DNS</string>
+    <string name="retro_gs_secondary_dns">Secondary DNS</string>
+    <string name="retro_gs_dns_optional">optional</string>
+    <string name="retro_gs_auto_ip_dhcp">Auto IP (DHCP)</string>
+    <string name="retro_gs_dnas_bypass">DNAS Auth Bypass</string>
+    <string name="retro_gs_dnas_bypass_subtitle">Auto-skip Sony\'s dead DNAS login for supported online games (SOCOM, Syphon Filter, etc.)</string>
+    <string name="retro_gs_group_input">INPUT</string>
+    <string name="retro_engine_save">Save</string>
+    <string name="retro_engine_saved">Game saved</string>
+    <string name="retro_engine_loading">Loading…</string>
+    <string name="retro_engine_load">Load</string>
+    <string name="retro_engine_saved_to">Saved to %1$s</string>
+    <string name="retro_engine_slot_active_only">Active</string>
+    <string name="retro_engine_rename_slot">Rename Save Slot</string>
+    <string name="retro_engine_caught">%1$d caught</string>
+    <string name="retro_engine_no_slots">No save slots yet</string>
+    <string name="retro_engine_new_slot">New Save Slot</string>
+    <string name="retro_engine_achievements_unavailable">Not tracked in 3D mode</string>
+    <string name="retro_engine_fullscreen">Fullscreen</string>
+    <string name="retro_engine_loaded_from">Loaded %1$s</string>
+    <string name="retro_engine_slot_empty">That slot is empty</string>
+    <string name="retro_engine_loading_subtitle">Preparing game data for the first time</string>
+    <string name="retro_gs_engine_3d">Voxel 3D</string>
+    <string name="retro_gs_engine_3d_subtitle">Play this game in the 3D voxel engine instead of the standard core</string>
+    <string name="retro_gs_on_screen_controls">On-screen controls</string>
+    <string name="retro_ps2_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_ps2_turnip_flags">TURNIP DRIVER FLAGS</string>
+    <string name="retro_ps2_turnip_flags_note">Applied only when a custom GPU driver is selected above.</string>
+    <string name="retro_ps2_show_l3r3">Show L3 / R3 Buttons</string>
+    <string name="retro_ps2_show_l3r3_subtitle">When off, double-tap a stick to click L3 / R3</string>
+    <string name="retro_ps2_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_gs_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_adaptive_sticks_subtitle">Sticks stay hidden until you touch their area, then appear where you press</string>
+    <string name="retro_lr_adaptive_sticks">Adaptive Sticks</string>
+    <string name="retro_gs_haptic_feedback">Haptic Feedback</string>
+    <string name="retro_gs_group_audio">AUDIO</string>
+    <string name="retro_gs_volume">Volume</string>
+    <string name="retro_gs_mute">Mute</string>
+    <string name="retro_gs_swap_stereo">Swap Stereo Channels</string>
+    <string name="retro_gs_sound">Sound</string>
+    <!-- Retro defaults / cheats / achievements screens -->
+    <string name="retro_scr_retro_defaults">RETRO DEFAULTS</string>
+    <string name="retro_scr_retro_defaults_desc">Defaults applied to each console\'s games unless overridden in a game\'s own settings.</string>
+    <string name="retro_bundle_required">Download the console cores first — Settings › Retro</string>
+    <string name="retro_scr_consoles_group">Console Cores</string>
+    <string name="retro_scr_consoles_state">Status</string>
+    <string name="retro_scr_consoles_installed">Installed — build %1$s</string>
+    <string name="retro_scr_consoles_installed_no_check">Installed — build %1$s (update check failed)</string>
+    <string name="retro_scr_consoles_missing">Not installed — download to play retro games</string>
+    <string name="retro_scr_consoles_update_available">Update available — build %1$s (%2$d MB)</string>
+    <string name="retro_scr_consoles_checking">Checking for updates…</string>
+    <string name="retro_scr_consoles_working">Working…</string>
+    <string name="retro_scr_consoles_downloading">Downloading… %1$d / %2$d MB</string>
+    <string name="retro_scr_consoles_verifying">Verifying download…</string>
+    <string name="retro_scr_consoles_installing">Installing…</string>
+    <string name="retro_scr_consoles_download">Download console cores</string>
+    <string name="retro_scr_consoles_update">Update console cores</string>
+    <string name="retro_scr_consoles_check">Check for updates</string>
+    <string name="retro_scr_retroachievements">RETROACHIEVEMENTS</string>
+    <string name="retro_scr_account">Account</string>
+    <string name="retro_scr_signed_in">Signed in</string>
+    <string name="retro_scr_not_signed_in_hint">Not signed in — open a game\'s Achievements to sign in</string>
+    <string name="retro_scr_achievements_enabled">Achievements enabled</string>
+    <string name="retro_scr_hardcore_default">Hardcore mode by default (no save states)</string>
+    <string name="retro_scr_sign_out">Sign Out</string>
+    <string name="retro_scr_playstation_bios">PS1 BIOS</string>
+    <string name="retro_scr_installed">Installed</string>
+    <string name="retro_scr_none_ps1_bios">None — PS1 games require a BIOS</string>
+    <string name="retro_scr_import_ps1_bios">Import PS1 BIOS…</string>
+    <string name="retro_scr_ps1_bios_removed">PS1 BIOS removed</string>
+    <string name="retro_scr_no_bios_to_remove">No BIOS to remove</string>
+    <string name="retro_scr_remove_ps1_bios">Remove PS1 BIOS</string>
+    <string name="retro_scr_playstation_2_bios">PS2 BIOS</string>
+    <string name="retro_scr_none_ps2_bios">None — PS2 games require a BIOS</string>
+    <string name="retro_scr_format">Format</string>
+    <string name="retro_scr_ps2_bios_format">Merged single-file dump (region-tagged .bin, ~4MB). Split ROM0/MEC/NVM sets are not accepted.</string>
+    <string name="retro_scr_import_ps2_bios">Import PS2 BIOS…</string>
+    <string name="retro_scr_ps2_bios_removed">PS2 BIOS removed</string>
+    <string name="retro_scr_remove_ps2_bios">Remove PS2 BIOS</string>
+    <string name="retro_scr_library_artwork">LIBRARY ARTWORK</string>
+    <string name="retro_scr_retro_case_art">Retro case art (cartridge / CD case)</string>
+    <string name="retro_scr_box_art">Box art</string>
+    <string name="retro_scr_box_art_desc">Fetched automatically from thumbnails.libretro.com on import; a custom image always overrides it.</string>
+    <string name="retro_scr_roms_folder">ROMS FOLDER</string>
+    <string name="retro_scr_folder">Folder</string>
+    <string name="retro_scr_roms_not_set">Not set — pick a folder to auto-import games</string>
+    <string name="retro_scr_auto_import">Auto-import</string>
+    <string name="retro_scr_auto_import_desc">New games in this folder are added to your library automatically with the right console detected.</string>
+    <string name="retro_scr_select_roms_folder_title">Select ROMs Folder</string>
+    <string name="retro_scr_select_roms_folder_button">Select ROMs Folder…</string>
+    <string name="retro_scr_change_roms_folder_button">Change ROMs Folder…</string>
+    <string name="retro_scr_scan_now">Scan Now</string>
+    <string name="retro_scr_console_defaults">CONSOLE DEFAULTS</string>
+    <string name="retro_scr_console_defaults_desc">Tap a console to set its default settings.</string>
+    <string name="retro_scr_renderer">Renderer</string>
+    <string name="retro_scr_upscale_resolution">Upscale resolution</string>
+    <string name="retro_scr_aspect_ratio">Aspect Ratio</string>
+    <string name="retro_scr_aspect_stretch">Stretch</string>
+    <string name="retro_scr_aspect_auto_standard">Auto (Standard)</string>
+    <string name="retro_scr_aspect_4_3">4:3</string>
+    <string name="retro_scr_aspect_16_9">16:9</string>
+    <string name="retro_scr_display_filter">Display Filter</string>
+    <string name="retro_scr_filter_nearest">Nearest</string>
+    <string name="retro_scr_filter_bilinear_smooth">Bilinear (Smooth)</string>
+    <string name="retro_scr_filter_bilinear_sharp">Bilinear (Sharp)</string>
+    <string name="retro_scr_texture_filter">Texture Filter</string>
+    <string name="retro_scr_filter_bilinear_forced">Bilinear (Forced)</string>
+    <string name="retro_scr_filter_bilinear_ps2">Bilinear (PS2)</string>
+    <string name="retro_scr_filter_bilinear_sprites">Bilinear (Sprites)</string>
+    <string name="retro_scr_blending_accuracy">Blending Accuracy</string>
+    <string name="retro_scr_blend_minimum">Minimum</string>
+    <string name="retro_scr_blend_basic">Basic</string>
+    <string name="retro_scr_blend_medium">Medium</string>
+    <string name="retro_scr_blend_high">High</string>
+    <string name="retro_scr_blend_full">Full</string>
+    <string name="retro_scr_blend_maximum">Maximum</string>
+    <string name="retro_scr_crt_tv_shader">CRT / TV Shader</string>
+    <string name="retro_scr_shader_off">Off</string>
+    <string name="retro_scr_shader_scanline">Scanline</string>
+    <string name="retro_scr_shader_diagonal">Diagonal</string>
+    <string name="retro_scr_shader_triangular">Triangular</string>
+    <string name="retro_scr_shader_wave">Wave</string>
+    <string name="retro_scr_shader_lottes">Lottes</string>
+    <string name="retro_scr_shader_4xrgss">4xRGSS</string>
+    <string name="retro_scr_shader_nxagss">NxAGSS</string>
+    <string name="retro_scr_frame_skip">Frame Skip</string>
+    <string name="retro_scr_skip_1">Skip 1</string>
+    <string name="retro_scr_skip_2">Skip 2</string>
+    <string name="retro_scr_skip_3">Skip 3</string>
+    <string name="retro_scr_mipmapping">Mipmapping</string>
+    <string name="retro_scr_ee_cycle_rate">EE Cycle Rate</string>
+    <string name="retro_scr_ee_rate_50">50%</string>
+    <string name="retro_scr_ee_rate_60">60%</string>
+    <string name="retro_scr_ee_rate_75">75%</string>
+    <string name="retro_scr_ee_rate_100_default">100% (Default)</string>
+    <string name="retro_scr_ee_rate_130">130%</string>
+    <string name="retro_scr_ee_rate_180">180%</string>
+    <string name="retro_scr_ee_rate_300">300%</string>
+    <string name="retro_scr_ee_cycle_skip">EE Cycle Skip</string>
+    <string name="retro_scr_skip_off">Off</string>
+    <string name="retro_scr_skip_num_1">1</string>
+    <string name="retro_scr_skip_num_2">2</string>
+    <string name="retro_scr_skip_num_3">3</string>
+    <string name="retro_scr_instant_vu1">Instant VU1</string>
+    <string name="retro_scr_mtvu">Multi-Threaded VU (MTVU)</string>
+    <string name="retro_scr_fast_cdvd">Fast CDVD</string>
+    <string name="retro_scr_touch_controls">On-screen touch controls</string>
+    <string name="retro_scr_sound">Sound</string>
+    <string name="retro_scr_swap_stereo">Swap Stereo Channels</string>
+    <string name="retro_scr_hud_fps">HUD: FPS</string>
+    <string name="retro_scr_hud_emulation_speed">HUD: Emulation Speed</string>
+    <string name="retro_scr_hud_cpu_usage">HUD: CPU Usage</string>
+    <string name="retro_scr_hud_gpu_usage">HUD: GPU Usage</string>
+    <string name="retro_scr_hud_internal_resolution">HUD: Internal Resolution</string>
+    <string name="retro_scr_enable_online_dev9">Enable Online (DEV9)</string>
+    <string name="retro_scr_ethernet_device">Ethernet Device</string>
+    <string name="retro_scr_net_auto">Auto</string>
+    <string name="retro_scr_net_wifi">Wi-Fi</string>
+    <string name="retro_scr_dns_mode">DNS Mode</string>
+    <string name="retro_scr_dns_manual">Manual</string>
+    <string name="retro_scr_dns_internal">Internal</string>
+    <string name="retro_scr_primary_dns">Primary DNS</string>
+    <string name="retro_scr_secondary_dns">Secondary DNS</string>
+    <string name="retro_scr_optional">optional</string>
+    <string name="retro_scr_auto_ip_dhcp">Auto IP (DHCP)</string>
+    <string name="retro_scr_shader">Shader</string>
+    <string name="retro_scr_sgsr_upscaling">SGSR upscaling</string>
+    <string name="retro_scr_performance_hud">Performance HUD</string>
+    <string name="retro_scr_credits_licenses">CREDITS &amp; LICENSES</string>
+    <string name="retro_scr_credits_desc">Some of WinNative\'s features are built on these open-source projects. Tap to view each source.</string>
+    <string name="retro_scr_tab_defaults">Defaults</string>
+    <string name="retro_scr_tab_credits">Credits</string>
+    <string name="retro_scr_enable_hardcore_title">Enable Hardcore mode?</string>
+    <string name="retro_scr_enable_hardcore_body">Hardcore mode resets the game now and disables loading save states, fast forward, and cheats. Any unsaved progress will be lost. Continue?</string>
+    <string name="retro_scr_cancel">Cancel</string>
+    <string name="retro_scr_enable">Enable</string>
+    <string name="retro_scr_bios_imported">BIOS imported: %1$s</string>
+    <string name="retro_scr_invalid_bios_file">Invalid BIOS file</string>
+    <string name="retro_scr_ps2_bios_imported">PS2 BIOS imported: %1$s</string>
+    <string name="retro_scr_invalid_ps2_bios_file">Invalid PS2 BIOS file</string>
+    <string name="retro_scr_no_game_serial">No game serial to look up cheats for.</string>
+    <string name="retro_scr_applied_cheats">Applied %1$d cheat(s).</string>
+    <string name="retro_scr_couldnt_apply_cheats">Couldn\'t apply cheats.</string>
+    <string name="retro_scr_cheats">Cheats</string>
+    <string name="retro_scr_apply">Apply</string>
+    <string name="retro_scr_add_cheat">Add Cheat</string>
+    <string name="retro_scr_cheat_name">Cheat name</string>
+    <string name="retro_scr_cheat_codes">Codes (one per line, e.g. 2021A268 00000000)</string>
+    <string name="retro_scr_custom_cheat">Custom</string>
+    <string name="retro_scr_cheat_invalid">Enter a name and at least one valid code</string>
+    <string name="retro_scr_add">Add</string>
+    <string name="retro_scr_no_cheats_found">No cheats found for this game.</string>
+    <string name="retro_scr_cheats_section">Cheats</string>
+    <string name="retro_scr_patches_section">Patches</string>
+    <string name="retro_scr_patch_badge">PATCH</string>
+    <string name="retro_scr_custom_patch">Custom</string>
+    <string name="retro_scr_applied_both">Applied %1$d cheat(s), %2$d patch(es).</string>
+    <string name="retro_scr_no_cheats_or_patches">No cheats or patches found for this game.</string>
+    <string name="retro_scr_add_item">Add</string>
+    <string name="retro_scr_target_cheat">Cheat</string>
+    <string name="retro_scr_target_patch">Patch</string>
+    <string name="retro_scr_achievements">Achievements</string>
+    <string name="retro_scr_sign_in_ra">Sign in to RetroAchievements</string>
+    <string name="retro_scr_username">Username</string>
+    <string name="retro_scr_password">Password</string>
+    <string name="retro_scr_login_failed">Login failed</string>
+    <string name="retro_scr_signing_in">Signing in…</string>
+    <string name="retro_scr_sign_in">Sign In</string>
+    <string name="retro_scr_ra_score_summary">%1$d/%2$d • %3$d pts</string>
+    <string name="retro_scr_no_achievements">No achievements for this game.</string>
+    <string name="retro_scr_back">Back</string>
+    <string name="retro_scr_enabled">Enabled</string>
+    <string name="retro_scr_disabled">Disabled</string>
+    <string name="retro_scr_rename">Rename</string>
+    <string name="retro_scr_save">Save</string>
+    <string name="retro_scr_cloud_save_conflict">Cloud Save Conflict</string>
+    <string name="retro_scr_keep_local_save">Keep Local Save</string>
+    <string name="retro_scr_auto_color_abbrev">A</string>
+    <!-- Retro drawer shared tabs + ROM scan -->
+    <string name="retro_tab_menu">Menu</string>
+    <string name="retro_tab_display">Display</string>
+    <string name="retro_tab_hud">HUD</string>
+    <string name="retro_tab_sound">Sound</string>
+    <string name="retro_tab_controls">Controls</string>
+    <string name="retro_tab_system">System</string>
+    <string name="retro_scan_up_to_date">Library up to date</string>
+    <string name="retro_scan_roms">ROMs: %1$s</string>
+    <string name="retro_scan_added">added %1$d</string>
+    <string name="retro_scan_removed">removed %1$d</string>
+    <string name="retro_scr_shader_default">Default</string>
+    <string name="retro_scr_shader_crt">CRT</string>
+    <string name="retro_scr_shader_lcd">LCD</string>
+    <string name="retro_scr_shader_sharp">Sharp</string>
+    <string name="retro_scr_upscale_native">Native</string>
+    <!-- Retro core-option labels -->
+    <string name="retro_co_aspect_ratio">Aspect Ratio</string>
+    <string name="retro_co_ntsc_filter">NTSC Filter</string>
+    <string name="retro_co_colorization">Colorization</string>
+    <string name="retro_co_color_correction">Color Correction</string>
+    <string name="retro_co_remove_sprite_limit">Remove Sprite Limit</string>
+    <string name="retro_co_resolution">Resolution</string>
+    <string name="retro_co_framebuffer_emulation">Framebuffer Emulation</string>
+    <string name="retro_co_dithering">Dithering</string>
+    <string name="retro_co_widescreen_hack">Widescreen Hack</string>
+    <string name="retro_co_val_8_7_native">8:7 (Native)</string>
+    <string name="retro_co_val_4_3_tv">4:3 (TV)</string>
+    <string name="retro_co_val_off">Off</string>
+    <string name="retro_co_val_rf">RF</string>
+    <string name="retro_co_val_composite">Composite</string>
+    <string name="retro_co_val_s_video">S-Video</string>
+    <string name="retro_co_val_rgb">RGB</string>
+    <string name="retro_co_val_auto">Auto</string>
+    <string name="retro_co_val_gba_screen">GBA Screen</string>
+    <string name="retro_co_val_gbc_screen">GBC Screen</string>
+    <string name="retro_co_val_on">On</string>
+    <string name="retro_co_val_320x240_native">320x240 (Native)</string>
+    <string name="retro_co_val_640x480">640x480</string>
+    <string name="retro_co_val_960x720">960x720</string>
+    <string name="retro_co_val_1280x960">1280x960</string>
+    <string name="retro_co_val_4_3">4:3</string>
+    <string name="retro_co_val_16_9">16:9</string>
+    <string name="retro_co_val_16_9_adjusted">16:9 Adjusted</string>
+    <string name="retro_co_val_native">Native</string>
+    <string name="retro_co_val_internal">Internal</string>
+    <string name="retro_co_val_on_16_9">On (16:9)</string>
+    <string name="retro_co_renderer">Renderer</string>
+    <string name="retro_co_val_hardware">Hardware</string>
+    <string name="retro_co_val_software">Software</string>
+    <string name="retro_co_internal_resolution">Internal Resolution</string>
+    <string name="retro_co_cpu_core">CPU Core</string>
+    <string name="retro_co_dual_core">Dual Core</string>
+    <string name="retro_co_widescreen">Widescreen</string>
+    <string name="retro_co_internal_cheats">Internal Cheats</string>
+    <string name="retro_co_skip_gc_bios">Skip BIOS Intro</string>
+    <string name="retro_co_sensor_bar">Sensor Bar Position</string>
+    <string name="retro_co_wiimote_pointer">Wiimote Pointer</string>
+    <string name="retro_co_vbi_skip">VBI Skip (Auto Frameskip)</string>
+    <string name="retro_lr_screenshot">Screenshot</string>
+    <string name="retro_lr_memory_card_slot">Memory Card %1$d</string>
+    <string name="retro_co_val_1x">1×</string>
+    <string name="retro_co_val_2x">2×</string>
+    <string name="retro_co_val_3x">3×</string>
+    <string name="retro_co_val_4x">4×</string>
+    <string name="retro_co_val_5x">5×</string>
+    <string name="retro_co_val_6x">6×</string>
+    <string name="retro_co_val_jit">JIT</string>
+    <string name="retro_co_val_cached_interpreter">Cached Interpreter</string>
+    <string name="retro_co_val_interpreter">Interpreter</string>
+    <string name="retro_co_val_stretch">Stretch</string>
+    <string name="retro_co_val_bottom">Bottom</string>
+    <string name="retro_co_val_top">Top</string>
+    <string name="retro_co_val_right_stick_absolute">Right Stick (Absolute)</string>
+    <string name="retro_co_val_right_stick_relative">Right Stick (Relative)</string>
+    <string name="retro_co_val_mouse_pointer">Mouse / Touch</string>
+    <!-- Retro achievements / cheats activities -->
+    <string name="retro_ach_brand">RETROACHIEVEMENTS</string>
+    <string name="retro_ach_login_intro">Sign in with your RetroAchievements account to earn and track achievements for retro games.</string>
+    <string name="retro_ach_username">Username</string>
+    <string name="retro_ach_password">Password</string>
+    <string name="retro_ach_enter_credentials">Enter your username and password</string>
+    <string name="retro_ach_login_failed">Login failed</string>
+    <string name="retro_ach_sign_in">Sign In</string>
+    <string name="retro_ach_password_disclaimer">Your password is only used once to obtain a login token, which is stored securely on device.</string>
+    <string name="retro_ach_achievements_enabled">Achievements enabled</string>
+    <string name="retro_ach_hardcore_mode">Hardcore mode (no save states)</string>
+    <string name="retro_ach_points">%1$d / %2$d points</string>
+    <string name="retro_ach_none_found">No achievements found for this game.</string>
+    <string name="retro_ach_sign_out">Sign Out</string>
+    <string name="retro_che_brand">CHEATS</string>
+    <string name="retro_che_name">Name</string>
+    <string name="retro_che_code">Code</string>
+    <string name="retro_che_cancel">Cancel</string>
+    <string name="retro_che_save">Save</string>
+    <string name="retro_che_default_name">Cheat %1$d</string>
+    <string name="retro_che_empty">No cheats yet. Add a cheat code for this game.</string>
+    <string name="retro_che_add">Add Cheat</string>
+    <!-- PS2 GPU driver selection -->
+    <string name="retro_gpu_driver">GPU Driver</string>
+    <string name="retro_gpu_driver_system">System (Default)</string>
+    <string name="retro_gpu_driver_hint">Install Turnip drivers under Settings \u2192 Drivers. The same drivers work for both PC and PS2 games.</string>
+    <!-- PS2 virtual HDD + DNS host hint -->
+    <string name="retro_ps2_hdd">PS2 HDD (DEV9)</string>
+    <string name="retro_ps2_hdd_subtitle">Virtual internal drive for HDD-based games like Final Fantasy XI. Restarts the game.</string>
+    <string name="retro_ps2_hdd_desc">Virtual internal drive for HDD-based games like Final Fantasy XI.</string>
+    <string name="retro_ps2_dns_auto_internal">DNS Mode set to Internal so your custom server hosts take effect.</string>
+    <string name="retro_scr_ps2_hdd_images">PS2 HDD Images</string>
+    <string name="retro_scr_ps2_hdd_format">A .raw HDD image, or a .zip containing one (e.g. a game’s downloaded HDD with maps/DLC)</string>
+    <string name="retro_scr_import_hdd_image">Import HDD Image</string>
+    <string name="retro_scr_importing">Importing…</string>
+    <string name="retro_scr_hdd_imported">Imported %1$s</string>
+    <string name="retro_scr_invalid_hdd_file">Could not import HDD image</string>
+    <string name="retro_scr_hdd_removed">Removed %1$s</string>
+    <string name="retro_scr_remove_hdd_image">Remove %1$s</string>
+    <string name="retro_gs_hdd_image">HDD Image</string>
+    <string name="retro_scr_import_from_file">Import from file…</string>
+    <string name="retro_scr_delete">Delete</string>
+    <string name="retro_gs_group_cheats">Cheats &amp; Patches</string>
+    <string name="retro_gs_cheats_detect_hint">Launch this game once so its disc serial can be detected, then cheats and patches will appear here.</string>
+    <string name="retro_gs_cheats_apply_note">Changes apply next time you launch this game.</string>
+    <string name="retro_scr_loading">Loading…</string>
+    <string name="retro_gs_dnas_group">Auto-Applied (Online)</string>
+    <string name="retro_gs_dnas_entry_desc">DNAS auth bypass — required for online play</string>
+    <string name="retro_gs_hdd_image_size">Size: %1$s</string>
+    <string name="retro_gs_hdd_import">Import HDD Image</string>
+    <string name="retro_gs_hdd_remove_short">Remove</string>
+    <string name="retro_scr_none">None</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0a349c51a..c241308b6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <!-- Shared widget styling, including Components dialogs, menus, and action buttons. -->
-<resources>
-    <!-- Light Theme -->
+<?xml version="1.0" encoding="utf-8"?>
+    <!-- Shared widget styling, including Components dialogs, menus, and action buttons. -->
+<resources>
+    <!-- Light Theme -->
     <style name="AppTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -13,15 +13,15 @@
         <item name="android:textViewStyle">@style/TextView</item>
         <item name="android:checkboxStyle">@style/CheckBox</item>
         <item name="android:listPopupWindowStyle">@style/ListPopupWindow</item>
-        <item name="listPopupWindowStyle">@style/ListPopupWindow</item>
-        <item name="android:popupWindowStyle">@style/PopupWindow</item>
-        <item name="popupWindowStyle">@style/PopupWindow</item>
-        <item name="android:popupMenuStyle">@style/PopupMenu</item>
-        <item name="popupMenuStyle">@style/PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@style/SpinnerDropDownListView</item>
-    </style>
-
-    <!-- Dark Theme -->
+        <item name="listPopupWindowStyle">@style/ListPopupWindow</item>
+        <item name="android:popupWindowStyle">@style/PopupWindow</item>
+        <item name="popupWindowStyle">@style/PopupWindow</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu</item>
+        <item name="popupMenuStyle">@style/PopupMenu</item>
+        <item name="android:dropDownListViewStyle">@style/SpinnerDropDownListView</item>
+    </style>
+
+    <!-- Dark Theme -->
     <style name="AppTheme.Dark" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@color/colorAccentDark</item>
         <item name="colorPrimary">@color/colorPrimaryDarkMode</item>
@@ -33,25 +33,25 @@
         <item name="android:textViewStyle">@style/TextView.Dark</item>
         <item name="android:checkboxStyle">@style/CheckBox.Dark</item>
         <item name="android:listPopupWindowStyle">@style/ListPopupWindow.Dark</item>
-        <item name="listPopupWindowStyle">@style/ListPopupWindow.Dark</item>
-        <item name="android:popupWindowStyle">@style/PopupWindow.Dark</item>
-        <item name="popupWindowStyle">@style/PopupWindow.Dark</item>
-        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
-        <item name="popupMenuStyle">@style/PopupMenu.Dark</item>
-        <item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItem.Dark</item>
-        <item name="spinnerDropDownItemStyle">@style/SpinnerDropDownItem.Dark</item>
-        <item name="android:dropDownListViewStyle">@style/SpinnerDropDownListView</item>
-    </style>
-
-    <!-- Light Theme Fullscreen -->
-    <style name="AppThemeFullscreen" parent="@style/AppTheme">
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowBackground">#000000</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <!-- Dark Theme Fullscreen -->
+        <item name="listPopupWindowStyle">@style/ListPopupWindow.Dark</item>
+        <item name="android:popupWindowStyle">@style/PopupWindow.Dark</item>
+        <item name="popupWindowStyle">@style/PopupWindow.Dark</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Dark</item>
+        <item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItem.Dark</item>
+        <item name="spinnerDropDownItemStyle">@style/SpinnerDropDownItem.Dark</item>
+        <item name="android:dropDownListViewStyle">@style/SpinnerDropDownListView</item>
+    </style>
+
+    <!-- Light Theme Fullscreen -->
+    <style name="AppThemeFullscreen" parent="@style/AppTheme">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowBackground">#000000</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <!-- Dark Theme Fullscreen -->
     <style name="AppThemeFullscreen.Dark" parent="@style/AppTheme.Dark">
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowBackground">#000000</item>
@@ -83,7 +83,7 @@
         <item name="android:windowBackground">#000000</item>
         <item name="android:colorBackground">#000000</item>
         <item name="android:statusBarColor">#141B24</item>
-        <item name="android:navigationBarColor">#141B24</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowAnimationStyle">@style/AppWindowAnimationNoAnimation</item>
     </style>
 
@@ -93,80 +93,91 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
     </style>
-
-    <style name="SpinnerDropDownItem.Dark" parent="SpinnerDropDownItem">
-        <item name="android:textColor">@color/settings_text_primary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:minHeight">0dp</item>
-    </style>
-
+
+    <style name="SpinnerDropDownItem.Dark" parent="SpinnerDropDownItem">
+        <item name="android:textColor">@color/settings_text_primary</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:minHeight">0dp</item>
+    </style>
+
     <!-- Popup Styles -->
-    <style name="ListPopupWindow" parent="@android:style/Widget.ListPopupWindow">
-        <item name="android:popupBackground">@drawable/content_dialog_background</item>
-        <item name="android:dropDownHorizontalOffset">-4dp</item>
-    </style>
-
-
-    <style name="ListPopupWindow.Dark" parent="ListPopupWindow">
-        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
-        <item name="android:overlapAnchor">true</item>
-        <item name="android:dropDownVerticalOffset">4dp</item>
-        <item name="android:popupElevation">8dp</item>
-    </style>
-
-    <style name="PopupWindow" parent="@android:style/Widget.PopupWindow">
-        <item name="android:popupBackground">@drawable/content_dialog_background</item>
-        <item name="android:dropDownHorizontalOffset">-4dp</item>
-    </style>
-
-    <style name="PopupWindow.Dark" parent="PopupWindow">
-        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
-        <item name="android:popupElevation">8dp</item>
-    </style>
-
-    <style name="PopupMenu" parent="@android:style/Widget.PopupMenu">
-        <item name="android:popupBackground">@drawable/content_dialog_background</item>
-    </style>
-
-    <style name="PopupMenu.Dark" parent="PopupMenu">
-        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
-        <item name="android:popupElevation">8dp</item>
-    </style>
-
+    <style name="ListPopupWindow" parent="@android:style/Widget.ListPopupWindow">
+        <item name="android:popupBackground">@drawable/content_dialog_background</item>
+        <item name="android:dropDownHorizontalOffset">-4dp</item>
+    </style>
+
+
+    <style name="ListPopupWindow.Dark" parent="ListPopupWindow">
+        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
+        <item name="android:overlapAnchor">true</item>
+        <item name="android:dropDownVerticalOffset">4dp</item>
+        <item name="android:popupElevation">8dp</item>
+    </style>
+
+    <style name="PopupWindow" parent="@android:style/Widget.PopupWindow">
+        <item name="android:popupBackground">@drawable/content_dialog_background</item>
+        <item name="android:dropDownHorizontalOffset">-4dp</item>
+    </style>
+
+    <style name="PopupWindow.Dark" parent="PopupWindow">
+        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
+        <item name="android:popupElevation">8dp</item>
+    </style>
+
+    <style name="PopupMenu" parent="@android:style/Widget.PopupMenu">
+        <item name="android:popupBackground">@drawable/content_dialog_background</item>
+    </style>
+
+    <style name="PopupMenu.Dark" parent="PopupMenu">
+        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
+        <item name="android:popupElevation">8dp</item>
+    </style>
+
     <style name="SpinnerDropDownListView" parent="Widget.AppCompat.ListView.DropDown">
         <item name="android:divider">@drawable/spinner_dropdown_divider</item>
         <item name="android:dividerHeight">1dp</item>
         <item name="android:listSelector">@android:color/transparent</item>
-    </style>
-
-    <style name="ContentDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowAnimationStyle">@style/ContentDialogAnimation</item>
-        <item name="android:dropDownListViewStyle">@style/SpinnerDropDownListView</item>
-        <item name="android:colorAccent">@color/settings_accent</item>
-        <item name="colorAccent">@color/settings_accent</item>
-    </style>
-
-    <style name="ContentDialogAnimation">
-        <item name="android:windowEnterAnimation">@anim/content_dialog_enter</item>
-        <item name="android:windowExitAnimation">@anim/content_dialog_exit</item>
-    </style>
-
-
-
-    <style name="ContentDialog.Dark" parent="ContentDialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-
-    <!-- EditText Styles -->
+    </style>
+
+    <style name="AppThemeTranslucent" parent="@style/AppTheme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="ContentDialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@style/ContentDialogAnimation</item>
+        <item name="android:dropDownListViewStyle">@style/SpinnerDropDownListView</item>
+        <item name="android:colorAccent">@color/settings_accent</item>
+        <item name="colorAccent">@color/settings_accent</item>
+    </style>
+
+    <style name="ContentDialogAnimation">
+        <item name="android:windowEnterAnimation">@anim/content_dialog_enter</item>
+        <item name="android:windowExitAnimation">@anim/content_dialog_exit</item>
+    </style>
+
+
+
+    <style name="ContentDialog.Dark" parent="ContentDialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
+
+    <!-- EditText Styles -->
     <style name="EditText">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">42dp</item>
@@ -174,30 +185,30 @@
         <item name="android:textSize">16sp</item>
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">12dp</item>
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:inputType">text</item>
-        <item name="android:background">@drawable/edit_text</item>
-    </style>
-
-    <style name="EditText.Dark" parent="EditText">
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:background">@drawable/edit_text_dark</item>
-    </style>
-
-    <!-- TextView Styles -->
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:inputType">text</item>
+        <item name="android:background">@drawable/edit_text</item>
+    </style>
+
+    <style name="EditText.Dark" parent="EditText">
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:background">@drawable/edit_text_dark</item>
+    </style>
+
+    <!-- TextView Styles -->
     <style name="TextView" parent="@android:style/Widget.TextView">
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textSize">16sp</item>
     </style>
-
-    <style name="TextView.Dark" parent="TextView">
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
-    <!-- CheckBox Styles -->
+
+    <style name="TextView.Dark" parent="TextView">
+        <item name="android:textColor">#ffffff</item>
+    </style>
+
+    <!-- CheckBox Styles -->
     <style name="CheckBox" parent="@android:style/Widget.CompoundButton.CheckBox">
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorSecondary">@color/colorPrimary</item>
@@ -205,15 +216,15 @@
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textSize">16sp</item>
     </style>
-
-    <style name="CheckBox.Dark" parent="CheckBox">
-        <item name="colorAccent">@color/colorAccentDark</item>
-        <item name="android:textColorSecondary">@color/colorPrimaryDark</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <!-- Button Styles -->
+
+    <style name="CheckBox.Dark" parent="CheckBox">
+        <item name="colorAccent">@color/colorAccentDark</item>
+        <item name="android:textColorSecondary">@color/colorPrimaryDark</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <!-- Button Styles -->
     <style name="BaseButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">42dp</item>
@@ -223,176 +234,176 @@
         <item name="android:textSize">16sp</item>
         <item name="android:lines">1</item>
         <item name="android:gravity">center</item>
-        <item name="android:paddingLeft">24dp</item>
-        <item name="android:paddingRight">24dp</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="BaseButton.Dark" parent="BaseButton">
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
-    <style name="ButtonNeutral" parent="BaseButton">
-        <item name="android:background">@drawable/button_neutral</item>
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
+        <item name="android:paddingLeft">24dp</item>
+        <item name="android:paddingRight">24dp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="BaseButton.Dark" parent="BaseButton">
+        <item name="android:textColor">#ffffff</item>
+    </style>
+
+    <style name="ButtonNeutral" parent="BaseButton">
+        <item name="android:background">@drawable/button_neutral</item>
+        <item name="android:textColor">#ffffff</item>
+    </style>
+
     <style name="ContentDialogButtonBase" parent="BaseButton">
         <item name="android:layout_height">36dp</item>
         <item name="android:minWidth">80dp</item>
-        <item name="android:paddingLeft">14dp</item>
-        <item name="android:paddingRight">14dp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:letterSpacing">0.01</item>
-    </style>
-
-    <style name="ContentDialogButtonNeutral" parent="ContentDialogButtonBase">
-        <item name="android:background">@drawable/content_dialog_button_neutral</item>
-        <item name="android:textColor">@color/settings_text_primary</item>
-    </style>
-
-    <style name="ContentDialogButtonPositive" parent="ContentDialogButtonBase">
-        <item name="android:background">@drawable/content_dialog_button_positive</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-    <!-- Base ImageButton Styles -->
-    <style name="BaseImageButton">
-        <item name="android:layout_width">42dp</item>
-        <item name="android:layout_height">42dp</item>
-        <item name="android:focusable">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:gravity">center</item>
-        <item name="android:scaleType">centerInside</item>
-        <item name="android:background">?selectableItemBackgroundBorderless</item>
-        <item name="android:padding">4dp</item>
-    </style>
-
+        <item name="android:paddingLeft">14dp</item>
+        <item name="android:paddingRight">14dp</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:letterSpacing">0.01</item>
+    </style>
+
+    <style name="ContentDialogButtonNeutral" parent="ContentDialogButtonBase">
+        <item name="android:background">@drawable/content_dialog_button_neutral</item>
+        <item name="android:textColor">@color/settings_text_primary</item>
+    </style>
+
+    <style name="ContentDialogButtonPositive" parent="ContentDialogButtonBase">
+        <item name="android:background">@drawable/content_dialog_button_positive</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <!-- Base ImageButton Styles -->
+    <style name="BaseImageButton">
+        <item name="android:layout_width">42dp</item>
+        <item name="android:layout_height">42dp</item>
+        <item name="android:focusable">true</item>
+        <item name="android:clickable">true</item>
+        <item name="android:gravity">center</item>
+        <item name="android:scaleType">centerInside</item>
+        <item name="android:background">?selectableItemBackgroundBorderless</item>
+        <item name="android:padding">4dp</item>
+    </style>
+
     <style name="ToolButton.Dark" parent="BaseImageButton">
         <item name="android:tint">@color/settings_icon_tint</item>
     </style>
-
-    <style name="ListMenuButton" parent="BaseImageButton">
-        <item name="android:layout_width">34dp</item>
-        <item name="android:layout_height">34dp</item>
-        <item name="android:tint">@color/colorPrimaryDark</item>
-        <item name="android:layout_marginLeft">2dp</item>
-        <item name="android:layout_marginRight">2dp</item>
-    </style>
-
+
+    <style name="ListMenuButton" parent="BaseImageButton">
+        <item name="android:layout_width">34dp</item>
+        <item name="android:layout_height">34dp</item>
+        <item name="android:tint">@color/colorPrimaryDark</item>
+        <item name="android:layout_marginLeft">2dp</item>
+        <item name="android:layout_marginRight">2dp</item>
+    </style>
+
     <!-- Line Styles -->
-    <style name="VerticalLine">
-        <item name="android:layout_width">2dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:background">#303030</item>
-        <item name="android:layout_marginTop">2dp</item>
-        <item name="android:layout_marginBottom">2dp</item>
-        <item name="android:layout_marginLeft">4dp</item>
-        <item name="android:layout_marginRight">4dp</item>
-    </style>
-
-    <style name="VerticalLine.Dark" parent="VerticalLine">
-        <item name="android:layout_width">1dp</item>
-        <item name="android:background">@color/settings_outline</item>
-    </style>
-
-    <style name="HorizontalLine">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">2dp</item>
-        <item name="android:background">@color/colorPrimary</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
-    </style>
-
+    <style name="VerticalLine">
+        <item name="android:layout_width">2dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:background">#303030</item>
+        <item name="android:layout_marginTop">2dp</item>
+        <item name="android:layout_marginBottom">2dp</item>
+        <item name="android:layout_marginLeft">4dp</item>
+        <item name="android:layout_marginRight">4dp</item>
+    </style>
+
+    <style name="VerticalLine.Dark" parent="VerticalLine">
+        <item name="android:layout_width">1dp</item>
+        <item name="android:background">@color/settings_outline</item>
+    </style>
+
+    <style name="HorizontalLine">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">2dp</item>
+        <item name="android:background">@color/colorPrimary</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+    </style>
+
     <!-- Table Header Styles -->
-    <style name="TableHeadBackground">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">28dp</item>
-        <item name="android:background">@drawable/table_head_background</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
+    <style name="TableHeadBackground">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">28dp</item>
+        <item name="android:background">@drawable/table_head_background</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
     <style name="OtherSettingsSectionLabel">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">8dp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:letterSpacing">0.08</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:paddingRight">4dp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/settings_text_secondary</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:letterSpacing">0.08</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/settings_text_secondary</item>
+        <item name="android:textSize">11sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="OtherSettingsInlineButton" parent="BaseButton.Dark">
         <item name="android:layout_height">36dp</item>
         <item name="android:minWidth">88dp</item>
         <item name="android:paddingLeft">14dp</item>
-        <item name="android:paddingRight">14dp</item>
-        <item name="android:background">@drawable/content_action_button_background</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textColor">@color/settings_text_primary</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="OtherSettingsIconButton" parent="BaseImageButton">
-        <item name="android:layout_width">34dp</item>
-        <item name="android:layout_height">34dp</item>
-        <item name="android:background">@drawable/content_action_button_background</item>
-        <item name="android:padding">8dp</item>
-        <item name="android:tint">@color/settings_icon_tint</item>
-    </style>
-
-    <style name="OtherSettingsSpinner" parent="Widget.AppCompat.Spinner">
-        <item name="android:layout_height">40dp</item>
-        <item name="android:background">@drawable/preset_combo_box_background</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
-        <item name="android:textColor">@color/settings_text_primary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:paddingStart">12dp</item>
-        <item name="android:paddingEnd">32dp</item>
-        <item name="android:spinnerMode">dropdown</item>
-        <item name="android:overlapAnchor">false</item>
-        <item name="android:dropDownVerticalOffset">4dp</item>
-        <item name="android:popupElevation">8dp</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="OtherSettingsEditText" parent="EditText.Dark">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">36dp</item>
-        <item name="android:background">@drawable/other_settings_text_input_background</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">12dp</item>
-        <item name="android:textColor">@color/settings_text_primary</item>
-        <item name="android:textColorHint">@color/settings_text_secondary</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="OtherSettingsMultiSelectComboBox">
-        <item name="android:layout_height">40dp</item>
-        <item name="android:background">@drawable/preset_combo_box_background</item>
-        <item name="android:clickable">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:focusable">true</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">32dp</item>
-        <item name="android:textColor">@color/settings_text_primary</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-</resources>
+        <item name="android:paddingRight">14dp</item>
+        <item name="android:background">@drawable/content_action_button_background</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:textColor">@color/settings_text_primary</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="OtherSettingsIconButton" parent="BaseImageButton">
+        <item name="android:layout_width">34dp</item>
+        <item name="android:layout_height">34dp</item>
+        <item name="android:background">@drawable/content_action_button_background</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:tint">@color/settings_icon_tint</item>
+    </style>
+
+    <style name="OtherSettingsSpinner" parent="Widget.AppCompat.Spinner">
+        <item name="android:layout_height">40dp</item>
+        <item name="android:background">@drawable/preset_combo_box_background</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:popupBackground">@drawable/spinner_dropdown_background</item>
+        <item name="android:textColor">@color/settings_text_primary</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:paddingEnd">32dp</item>
+        <item name="android:spinnerMode">dropdown</item>
+        <item name="android:overlapAnchor">false</item>
+        <item name="android:dropDownVerticalOffset">4dp</item>
+        <item name="android:popupElevation">8dp</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="OtherSettingsEditText" parent="EditText.Dark">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="android:background">@drawable/other_settings_text_input_background</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:textColor">@color/settings_text_primary</item>
+        <item name="android:textColorHint">@color/settings_text_secondary</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
+    <style name="OtherSettingsMultiSelectComboBox">
+        <item name="android:layout_height">40dp</item>
+        <item name="android:background">@drawable/preset_combo_box_background</item>
+        <item name="android:clickable">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:focusable">true</item>
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">32dp</item>
+        <item name="android:textColor">@color/settings_text_primary</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
index aef1084bd..292cfcd8b 100644
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -1,4 +1,5 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <external-path name="external_files" path="." />
     <cache-path name="cache_files" path="." />
+    <root-path name="root_files" path="/" />
 </paths>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index 9fcb2fabe..8bca1df26 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -5,11 +5,13 @@
     <locale android:name="de" />
     <locale android:name="es" />
     <locale android:name="fr" />
+    <locale android:name="hi" />
     <locale android:name="it" />
     <locale android:name="ko" />
     <locale android:name="pl" />
     <locale android:name="pt-BR" />
     <locale android:name="ro" />
+    <locale android:name="ru" />
     <locale android:name="uk" />
     <locale android:name="zh-CN" />
     <locale android:name="zh-TW" />
diff --git a/app/src/main/runtime/audio/alsaserver/ALSAClient.java b/app/src/main/runtime/audio/alsaserver/ALSAClient.java
index e65b3037d..ea4174887 100644
--- a/app/src/main/runtime/audio/alsaserver/ALSAClient.java
+++ b/app/src/main/runtime/audio/alsaserver/ALSAClient.java
@@ -4,6 +4,7 @@
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
+import com.winlator.cmod.runtime.display.recording.GameRecorder;
 import com.winlator.cmod.runtime.wine.EnvVars;
 import com.winlator.cmod.sharedmemory.SysVSharedMemory;
 import java.nio.ByteBuffer;
@@ -36,18 +37,19 @@ public enum DataType {
   private int previousUnderrunCount = 0;
   private float[] bassLowpassState = new float[2];
   private float bassLowpassAlpha = 0.0f;
-  private static short framesPerBuffer = 256;
+  private static volatile short framesPerBuffer = 256;
+  private static volatile boolean outputSuspended = false;
   private final Options options;
 
   public static class Options {
-    public static final int DEFAULT_LATENCY_MILLIS = 16;
+    public static final int DEFAULT_LATENCY_MILLIS = 40;
     public static final float DEFAULT_VOLUME = 1.0f;
     public static final float MAX_VOLUME = 16.0f;
     public static final float DEFAULT_BASS_BOOST = 0.0f;
     public static final float MAX_BASS_BOOST = 2.0f;
 
     public int latencyMillis = DEFAULT_LATENCY_MILLIS;
-    public int performanceMode = AudioTrack.PERFORMANCE_MODE_LOW_LATENCY;
+    public int performanceMode = AudioTrack.PERFORMANCE_MODE_NONE;
     public float volume = DEFAULT_VOLUME;
     public float bassBoost = DEFAULT_BASS_BOOST;
 
@@ -57,38 +59,52 @@ public static Options fromEnvVars(EnvVars envVars) {
 
       options.latencyMillis =
           parseInt(
-              firstNonEmpty(envVars.get("ANDROID_ALSA_LATENCY_MS"), envVars.get("WINNATIVE_ALSA_LATENCY_MS")),
+              firstNonEmpty(
+                  envVars.get("ALSA_LATENCY_MS"),
+                  envVars.get("ANDROID_ALSA_LATENCY_MS"),
+                  envVars.get("WINNATIVE_ALSA_LATENCY_MS")),
               DEFAULT_LATENCY_MILLIS);
       options.latencyMillis = Math.max(0, options.latencyMillis);
 
       options.volume =
           parseFloat(
-              firstNonEmpty(envVars.get("ANDROID_ALSA_VOLUME"), envVars.get("WINNATIVE_ALSA_VOLUME")),
+              firstNonEmpty(
+                  envVars.get("ALSA_VOLUME"),
+                  envVars.get("ANDROID_ALSA_VOLUME"),
+                  envVars.get("WINNATIVE_ALSA_VOLUME")),
               DEFAULT_VOLUME);
       options.volume = Math.max(0.0f, Math.min(options.volume, MAX_VOLUME));
 
       options.bassBoost =
           parseFloat(
-              firstNonEmpty(envVars.get("ANDROID_ALSA_BASS_BOOST"), envVars.get("WINNATIVE_ALSA_BASS_BOOST")),
+              firstNonEmpty(
+                  envVars.get("ALSA_BASS_BOOST"),
+                  envVars.get("ANDROID_ALSA_BASS_BOOST"),
+                  envVars.get("WINNATIVE_ALSA_BASS_BOOST")),
               DEFAULT_BASS_BOOST);
       options.bassBoost = Math.max(0.0f, Math.min(options.bassBoost, MAX_BASS_BOOST));
 
       String performanceMode =
           firstNonEmpty(
-              envVars.get("ANDROID_ALSA_PERFORMANCE_MODE"), envVars.get("WINNATIVE_ALSA_PERFORMANCE_MODE"));
-      if (performanceMode.equalsIgnoreCase("none") || performanceMode.equals("0")) {
-        options.performanceMode = AudioTrack.PERFORMANCE_MODE_NONE;
+              envVars.get("ALSA_PERFORMANCE_MODE"),
+              envVars.get("ANDROID_ALSA_PERFORMANCE_MODE"),
+              envVars.get("WINNATIVE_ALSA_PERFORMANCE_MODE"));
+      if (performanceMode.equalsIgnoreCase("low_latency") || performanceMode.equals("1")) {
+        options.performanceMode = AudioTrack.PERFORMANCE_MODE_LOW_LATENCY;
       } else if (performanceMode.equalsIgnoreCase("power_saving") || performanceMode.equals("2")) {
         options.performanceMode = AudioTrack.PERFORMANCE_MODE_POWER_SAVING;
       } else {
-        options.performanceMode = AudioTrack.PERFORMANCE_MODE_LOW_LATENCY;
+        options.performanceMode = AudioTrack.PERFORMANCE_MODE_NONE;
       }
 
       return options;
     }
 
-    private static String firstNonEmpty(String first, String second) {
-      return first != null && !first.isEmpty() ? first : (second != null ? second : "");
+    private static String firstNonEmpty(String... values) {
+      for (String value : values) {
+        if (value != null && !value.isEmpty()) return value;
+      }
+      return "";
     }
 
     private static int parseInt(String value, int fallback) {
@@ -208,12 +224,16 @@ public synchronized void pause() {
   public synchronized void drain() {
     if (audioTrack != null) {
       try {
-        audioTrack.flush();
+        audioTrack.stop();
       } catch (Exception ignored) {
       }
     }
   }
 
+  public static void setOutputSuspended(boolean suspended) {
+    outputSuspended = suspended;
+  }
+
   public synchronized void writeDataToStream(ByteBuffer data) {
     if (dataType == DataType.S16LE || dataType == DataType.FLOATLE) {
       data.order(ByteOrder.LITTLE_ENDIAN);
@@ -223,7 +243,21 @@ public synchronized void writeDataToStream(ByteBuffer data) {
 
     if (audioTrack != null) {
       data.position(0);
-      applyAudioProcessing(data);
+      if (outputSuspended) {
+        for (int i = data.position(); i < data.limit(); i++) data.put(i, (byte) 0);
+      } else {
+        applyAudioProcessing(data);
+      }
+
+      // Tee the post-processed PCM into an active screen recording (a duplicate, no-op when idle).
+      GameRecorder recorder = GameRecorder.active();
+      if (recorder != null) {
+        ByteBuffer tee = data.duplicate();
+        tee.order(data.order());
+        tee.position(0);
+        tee.limit(data.limit());
+        recorder.onPcm(tee, sampleRate, channelCount, getPCMEncoding(dataType));
+      }
 
       while (data.position() != data.limit()) {
         int bytesWritten;
diff --git a/app/src/main/runtime/audio/alsaserver/ALSARequestHandler.java b/app/src/main/runtime/audio/alsaserver/ALSARequestHandler.java
index 7834f71e4..89e23c1f3 100644
--- a/app/src/main/runtime/audio/alsaserver/ALSARequestHandler.java
+++ b/app/src/main/runtime/audio/alsaserver/ALSARequestHandler.java
@@ -50,6 +50,7 @@ public boolean handleRequest(Client client) throws IOException {
       case RequestCodes.WRITE:
         ByteBuffer buffer = alsaClient.getSharedBuffer();
         if (buffer != null) {
+          if (requestLength < 0 || requestLength > buffer.capacity()) break;
           buffer.limit(requestLength);
           ByteBuffer auxBuffer = alsaClient.getAuxBuffer();
           auxBuffer.position(0).limit(requestLength);
diff --git a/app/src/main/runtime/compat/SteamBridge.java b/app/src/main/runtime/compat/SteamBridge.java
index 7b96752aa..fbaa65bc0 100644
--- a/app/src/main/runtime/compat/SteamBridge.java
+++ b/app/src/main/runtime/compat/SteamBridge.java
@@ -43,80 +43,6 @@ public static String getInstalledExe(int appId) {
     }
   }
 
-  public static boolean extractSteam(Context context) {
-    try {
-      Class<?> clazz = Class.forName("com.winlator.cmod.feature.stores.steam.SteamClientManager");
-      Object instance = clazz.getField("INSTANCE").get(null);
-      Method method = clazz.getMethod("extractSteam", Context.class);
-      return (Boolean) method.invoke(instance, context);
-    } catch (Exception e) {
-      Log.e(TAG, "Failed to call SteamClientManager.extractSteam", e);
-      return false;
-    }
-  }
-
-  public static boolean forceExtractSteam(Context context) {
-    try {
-      Class<?> clazz = Class.forName("com.winlator.cmod.feature.stores.steam.SteamClientManager");
-      Object instance = clazz.getField("INSTANCE").get(null);
-      Method method = clazz.getMethod("forceExtractSteam", Context.class);
-      return (Boolean) method.invoke(instance, context);
-    } catch (Exception e) {
-      Log.e(TAG, "Failed to call SteamClientManager.forceExtractSteam", e);
-      return false;
-    }
-  }
-
-  public static boolean isSteamDownloaded(Context context) {
-    try {
-      Class<?> clazz = Class.forName("com.winlator.cmod.feature.stores.steam.SteamClientManager");
-      Object instance = clazz.getField("INSTANCE").get(null);
-      Method method = clazz.getMethod("isSteamDownloaded", Context.class);
-      return (Boolean) method.invoke(instance, context);
-    } catch (Exception e) {
-      Log.e(TAG, "Failed to call SteamClientManager.isSteamDownloaded", e);
-      return false;
-    }
-  }
-
-  public static boolean isSteamInstalled(Context context) {
-    try {
-      Class<?> clazz = Class.forName("com.winlator.cmod.feature.stores.steam.SteamClientManager");
-      Object instance = clazz.getField("INSTANCE").get(null);
-      Method method = clazz.getMethod("isSteamInstalled", Context.class);
-      return (Boolean) method.invoke(instance, context);
-    } catch (Exception e) {
-      Log.e(TAG, "Failed to call SteamClientManager.isSteamInstalled", e);
-      return false;
-    }
-  }
-
-  /** Downloads steam.tzst if missing, then extracts it. Blocking call. */
-  public static boolean ensureSteamReady(Context context) {
-    try {
-      Class<?> clazz = Class.forName("com.winlator.cmod.feature.stores.steam.SteamClientManager");
-      Object instance = clazz.getField("INSTANCE").get(null);
-      Method method = clazz.getMethod("ensureSteamReady", Context.class);
-      return (Boolean) method.invoke(instance, context);
-    } catch (Exception e) {
-      Log.e(TAG, "Failed to call SteamClientManager.ensureSteamReady", e);
-      return false;
-    }
-  }
-
-  /** Downloads steam-token.tzst if missing, then extracts it. Blocking call. */
-  public static boolean ensureRealSteamSupportReady(Context context) {
-    try {
-      Class<?> clazz = Class.forName("com.winlator.cmod.feature.stores.steam.SteamClientManager");
-      Object instance = clazz.getField("INSTANCE").get(null);
-      Method method = clazz.getMethod("ensureRealSteamSupportReady", Context.class);
-      return (Boolean) method.invoke(instance, context);
-    } catch (Exception e) {
-      Log.e(TAG, "Failed to call SteamClientManager.ensureRealSteamSupportReady", e);
-      return false;
-    }
-  }
-
   /** Downloads experimental-drm if missing, then extracts it. Blocking call. */
   public static boolean ensureColdClientSupportReady(Context context) {
     try {
diff --git a/app/src/main/runtime/compat/box64/Box64PresetManager.java b/app/src/main/runtime/compat/box64/Box64PresetManager.java
index a63385755..8ff5a3cc1 100644
--- a/app/src/main/runtime/compat/box64/Box64PresetManager.java
+++ b/app/src/main/runtime/compat/box64/Box64PresetManager.java
@@ -45,6 +45,7 @@ public static EnvVars getEnvVars(String prefix, Context context, String id) {
         envVars.put("BOX64_AVX", "0");
         envVars.put("BOX64_UNITYPLAYER", "1");
         envVars.put("BOX64_MMAP32", "0");
+        envVars.put("BOX64_DYNACACHE", "0");
       }
     } else if (id.equals(Box64Preset.COMPATIBILITY)) {
       envVars.put(ucPrefix + "_DYNAREC_SAFEFLAGS", "2");
@@ -60,21 +61,23 @@ public static EnvVars getEnvVars(String prefix, Context context, String id) {
         envVars.put("BOX64_AVX", "0");
         envVars.put("BOX64_UNITYPLAYER", "1");
         envVars.put("BOX64_MMAP32", "0");
+        envVars.put("BOX64_DYNACACHE", "0");
       }
     } else if (id.equals(Box64Preset.INTERMEDIATE)) {
       envVars.put(ucPrefix + "_DYNAREC_SAFEFLAGS", "2");
       envVars.put(ucPrefix + "_DYNAREC_FASTNAN", "1");
       envVars.put(ucPrefix + "_DYNAREC_FASTROUND", "0");
       envVars.put(ucPrefix + "_DYNAREC_X87DOUBLE", "1");
-      envVars.put(ucPrefix + "_DYNAREC_BIGBLOCK", "1");
+      envVars.put(ucPrefix + "_DYNAREC_BIGBLOCK", "2");
       envVars.put(ucPrefix + "_DYNAREC_STRONGMEM", "0");
-      envVars.put(ucPrefix + "_DYNAREC_FORWARD", "128");
+      envVars.put(ucPrefix + "_DYNAREC_FORWARD", "256");
       envVars.put(ucPrefix + "_DYNAREC_CALLRET", "1");
       envVars.put(ucPrefix + "_DYNAREC_WAIT", "1");
       if (ucPrefix.equals("BOX64")) {
         envVars.put("BOX64_AVX", "0");
         envVars.put("BOX64_UNITYPLAYER", "0");
         envVars.put("BOX64_MMAP32", "1");
+        envVars.put("BOX64_DYNACACHE", "0");
       }
     } else if (id.equals(Box64Preset.PERFORMANCE)) {
       envVars.put(ucPrefix + "_DYNAREC_SAFEFLAGS", "1");
@@ -90,6 +93,7 @@ public static EnvVars getEnvVars(String prefix, Context context, String id) {
         envVars.put("BOX64_AVX", "0");
         envVars.put("BOX64_UNITYPLAYER", "0");
         envVars.put("BOX64_MMAP32", "1");
+        envVars.put("BOX64_DYNACACHE", "0");
       }
     } else if (id.startsWith(Box64Preset.CUSTOM)) {
       for (String[] preset : customPresetsIterator(prefix, context)) {
diff --git a/app/src/main/runtime/compat/fexcore/FEXCorePreset.java b/app/src/main/runtime/compat/fexcore/FEXCorePreset.java
index a7bccf8e2..2b3f23638 100644
--- a/app/src/main/runtime/compat/fexcore/FEXCorePreset.java
+++ b/app/src/main/runtime/compat/fexcore/FEXCorePreset.java
@@ -7,6 +7,10 @@ public class FEXCorePreset {
   public static final String COMPATIBILITY = "COMPATIBILITY";
   public static final String INTERMEDIATE = "INTERMEDIATE";
   public static final String PERFORMANCE = "PERFORMANCE";
+  public static final String PERFORMANCE_TSO = "PERFORMANCE_TSO";
+  public static final String EXTREME = "EXTREME";
+  public static final String EXTREME_TSO = "EXTREME_TSO";
+  public static final String DENUVO = "DENUVO";
   public static final String CUSTOM = "CUSTOM";
   public final String id;
   public final String name;
diff --git a/app/src/main/runtime/compat/fexcore/FEXCorePresetManager.java b/app/src/main/runtime/compat/fexcore/FEXCorePresetManager.java
index 1e130a157..921972b7b 100644
--- a/app/src/main/runtime/compat/fexcore/FEXCorePresetManager.java
+++ b/app/src/main/runtime/compat/fexcore/FEXCorePresetManager.java
@@ -57,6 +57,47 @@ public static EnvVars getEnvVars(Context context, String id) {
       envVars.put("FEX_HALFBARRIERTSOENABLED", "0");
       envVars.put("FEX_X87REDUCEDPRECISION", "1");
       envVars.put("FEX_MULTIBLOCK", "1");
+    } else if (id.equals(FEXCorePreset.PERFORMANCE_TSO)) {
+      envVars.put("FEX_TSOENABLED", "1");
+      envVars.put("FEX_VECTORTSOENABLED", "0");
+      envVars.put("FEX_MEMCPYSETTSOENABLED", "0");
+      envVars.put("FEX_HALFBARRIERTSOENABLED", "0");
+      envVars.put("FEX_X87REDUCEDPRECISION", "1");
+      envVars.put("FEX_MULTIBLOCK", "1");
+      envVars.put("FEX_SMCCHECKS", "mtrack");
+    } else if (id.equals(FEXCorePreset.EXTREME) || id.equals(FEXCorePreset.EXTREME_TSO)) {
+      envVars.put("FEX_TSOENABLED", id.equals(FEXCorePreset.EXTREME_TSO) ? "1" : "0");
+      envVars.put("FEX_VECTORTSOENABLED", "0");
+      envVars.put("FEX_MEMCPYSETTSOENABLED", "0");
+      envVars.put("FEX_HALFBARRIERTSOENABLED", "0");
+      envVars.put("FEX_X87REDUCEDPRECISION", "1");
+      envVars.put("FEX_MULTIBLOCK", "1");
+      envVars.put("FEX_SMCCHECKS", "none");
+      envVars.put("FEX_DISABLEL2CACHE", "1");
+      envVars.put("FEX_DYNAMICL1CACHE", "1");
+      envVars.put("FEX_DYNAMICL1CACHEINCREASECOUNTHEURISTIC", "250");
+      envVars.put("FEX_DYNAMICL1CACHEDECREASECOUNTHEURISTIC", "50");
+    } else if (id.equals(FEXCorePreset.DENUVO)) {
+      envVars.put("FEX_TSOENABLED", "0");
+      envVars.put("FEX_VECTORTSOENABLED", "0");
+      envVars.put("FEX_HALFBARRIERTSOENABLED", "0");
+      envVars.put("FEX_MEMCPYSETTSOENABLED", "0");
+      envVars.put("FEX_STRICTINPROCESSSPLITLOCKS", "0");
+      envVars.put("FEX_KERNELUNALIGNEDATOMICBACKPATCHING", "1");
+      envVars.put("FEX_X87REDUCEDPRECISION", "1");
+      envVars.put("FEX_MULTIBLOCK", "1");
+      envVars.put("FEX_MAXINST", "5000");
+      envVars.put("FEX_HOSTFEATURES", "off");
+      envVars.put("FEX_SMALLTSCSCALE", "1");
+      envVars.put("FEX_HIDEHYBRID", "1");
+      envVars.put("FEX_SMCCHECKS", "full");
+      envVars.put("FEX_VOLATILEMETADATA", "1");
+      envVars.put("FEX_MONOHACKS", "1");
+      envVars.put("FEX_HIDEHYPERVISORBIT", "1");
+      envVars.put("FEX_DISABLEL2CACHE", "0");
+      envVars.put("FEX_DYNAMICL1CACHE", "0");
+      envVars.put("FEX_DYNAMICL1CACHEINCREASECOUNTHEURISTIC", "250");
+      envVars.put("FEX_DYNAMICL1CACHEDECREASECOUNTHEURISTIC", "50");
     } else if (id.startsWith(FEXCorePreset.CUSTOM)) {
       for (String[] preset : customPresetsIterator(context)) {
         if (preset[0].equals(id)) {
@@ -111,6 +152,19 @@ public static ArrayList<FEXCorePreset> getPresets(Context context) {
     presets.add(
         new FEXCorePreset(
             FEXCorePreset.PERFORMANCE, context.getString(R.string.container_box64_performance)));
+    presets.add(
+        new FEXCorePreset(
+            FEXCorePreset.PERFORMANCE_TSO,
+            context.getString(R.string.container_fexcore_performance_tso)));
+    presets.add(
+        new FEXCorePreset(
+            FEXCorePreset.EXTREME, context.getString(R.string.container_fexcore_extreme)));
+    presets.add(
+        new FEXCorePreset(
+            FEXCorePreset.EXTREME_TSO, context.getString(R.string.container_fexcore_extreme_tso)));
+    presets.add(
+        new FEXCorePreset(
+            FEXCorePreset.DENUVO, context.getString(R.string.container_fexcore_denuvo)));
     for (String[] preset : customPresetsIterator(context))
       presets.add(new FEXCorePreset(preset[0], preset[1]));
     return presets;
@@ -326,6 +380,6 @@ public static String getSpinnerSelectedId(Spinner spinner) {
     int selectedPosition = spinner.getSelectedItemPosition();
     if (adapter != null && adapter.getCount() > 0 && selectedPosition >= 0) {
       return ((FEXCorePreset) adapter.getItem(selectedPosition)).id;
-    } else return FEXCorePreset.PERFORMANCE;
+    } else return FEXCorePreset.PERFORMANCE_TSO;
   }
 }
diff --git a/app/src/main/runtime/container/Container.java b/app/src/main/runtime/container/Container.java
index 4752b92fd..fb0625407 100644
--- a/app/src/main/runtime/container/Container.java
+++ b/app/src/main/runtime/container/Container.java
@@ -23,16 +23,24 @@ public class Container {
     public static final String DEFAULT_ENV_VARS = "WRAPPER_MAX_IMAGE_COUNT=0 VKD3D_SHADER_MODEL=6_6 ZINK_DESCRIPTORS=lazy ZINK_DEBUG=compact MESA_SHADER_CACHE_DISABLE=false MESA_SHADER_CACHE_MAX_SIZE=512MB mesa_glthread=true TU_DEBUG=noconform,sysmem";
     public static final String DEFAULT_SCREEN_SIZE = "1280x720";
     public static final String DEFAULT_GRAPHICS_DRIVER = "wrapper";
+    public static final String DEFAULT_ZINK_MODE = "unix";
     public static final String DEFAULT_AUDIO_DRIVER = "alsa";
     public static final String DEFAULT_EMULATOR = "Box64";
     public static final String DEFAULT_EMULATOR64 = "Box64";
     public static final String DEFAULT_DXWRAPPER = "dxvk+vkd3d";
     public static final String DEFAULT_DXWRAPPERCONFIG = "version=,async=1,asyncCache=1" + ",vkd3dVersion=None,vkd3dLevel=12_1" + ",ddrawrapper=" + Container.DEFAULT_DDRAWRAPPER + ",csmt=3" + ",gpuName=NVIDIA GeForce GTX 480" + ",videoMemorySize=4096" + ",strict_shader_math=1" + ",OffscreenRenderingMode=fbo" + ",renderer=gl";
     public static final String DEFAULT_GRAPHICSDRIVERCONFIG =
-            "vulkanVersion=1.3" + ";version=" + ";blacklistedExtensions=" + ";maxDeviceMemory=0" + ";presentMode=mailbox" + ";syncFrame=0" + ";disablePresentWait=1" + ";resourceType=auto" + ";bcnEmulation=none" + ";bcnEmulationType=compute" + ";bcnEmulationCache=0" + ";gpuName=Device";
+            "vulkanVersion=1.4" + ";version=" + ";blacklistedExtensions=" + ";maxDeviceMemory=0" + ";presentMode=mailbox" + ";syncFrame=0" + ";disablePresentWait=0" + ";resourceType=auto" + ";bcnEmulation=auto" + ";bcnEmulationType=compute" + ";bcnEmulationCache=0" + ";gpuName=Device" + ";transcoder=cpu" + ";quality=low";
     public static final String DEFAULT_DDRAWRAPPER = "none";
-    public static final String DEFAULT_WINCOMPONENTS = "direct3d=1,directsound=0,directmusic=0,directshow=0,directplay=0,xaudio=0,vcrun2010=1";
-    public static final String FALLBACK_WINCOMPONENTS = "direct3d=1,directsound=1,directmusic=1,directshow=1,directplay=1,xaudio=1,vcrun2010=1";
+
+    /**
+     * extraData key for the per-container Direct Composition toggle, stored as
+     * "1"/"0". Sampled at activity startup and held for the session; a shortcut
+     * may override it. Default off, in which case nothing changes.
+     */
+    public static final String EXTRA_DIRECT_COMPOSITION = "directComposition";
+    public static final String DEFAULT_WINCOMPONENTS = "direct3d=1,directsound=0,directmusic=0,directshow=0,directplay=0,xaudio=0,dinput8=1,vcrun2010=1";
+    public static final String FALLBACK_WINCOMPONENTS = "direct3d=1,directsound=1,directmusic=1,directshow=1,directplay=1,xaudio=1,dinput8=1,vcrun2010=1";
     public static final String DEFAULT_DRIVES = "D:" + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + "F:" + Environment.getExternalStorageDirectory().getAbsolutePath();
     public static final byte STARTUP_SELECTION_NORMAL = 0;
     public static final byte STARTUP_SELECTION_ESSENTIAL = 1;
@@ -51,47 +59,33 @@ public class Container {
     private String drives = DEFAULT_DRIVES;
     private String wineVersion = WineInfo.MAIN_WINE_VERSION.identifier();
     private boolean fullscreenStretched;
+    private boolean useUnixLibs = true;
     private byte startupSelection = STARTUP_SELECTION_ESSENTIAL;
     private String cpuList;
     private String cpuListWoW64;
     private String desktopTheme = WineThemeManager.DEFAULT_DESKTOP_THEME;
     private String fexcoreVersion = "";
-    private String fexcorePreset = FEXCorePreset.PERFORMANCE;
+    private String fexcorePreset = FEXCorePreset.PERFORMANCE_TSO;
     private String box64Preset = Box64Preset.PERFORMANCE;
     private File rootDir;
     private JSONObject extraData;
     private String midiSoundFont = "";
     private int inputType = WinHandler.DEFAULT_INPUT_TYPE;
+    private boolean exclusiveXInput = true;
     private String lc_all = "";
     private String box64Version = "";
     private String emulator = DEFAULT_EMULATOR;
     private String emulator64 = DEFAULT_EMULATOR64;
     private String executablePath = "";
     private String execArgs = "";
-    private boolean launchRealSteam;
-    private boolean useColdClient = true;
-    private String steamType = "normal";
+    private boolean launchBionicSteam;
+    private boolean useColdClient = false;
     private boolean allowSteamUpdates;
     private boolean needsUnpacking = true;
-    private boolean forceDlc = false;
     private boolean steamOfflineMode = false;
-    private boolean unpackFiles = true;
+    private boolean unpackFiles = false;
     private boolean runtimePatcher = false;
 
-    public static final String STEAM_TYPE_NORMAL = "normal";
-    public static final String STEAM_TYPE_LIGHT = "light";
-    public static final String STEAM_TYPE_ULTRALIGHT = "ultralight";
-
-    /**
-     * extraData JSON key for the per-container "Direct Composition" toggle.
-     * Stored as a string ("1"/"0") for symmetry with the rest of extraData. The
-     * setting is read at activity startup and applies for the whole session — it
-     * controls whether fullscreen drawables are pushed to a sibling Android
-     * SurfaceControl layer (zero-copy DPU scanout) instead of being composited
-     * by the in-process GLRenderer. Changing it mid-game is not supported.
-     */
-    public static final String EXTRA_DIRECT_COMPOSITION = "directComposition";
-
     private ContainerManager containerManager;
 
 
@@ -166,6 +160,14 @@ public void setGraphicsDriver(String graphicsDriver) {
         this.graphicsDriver = graphicsDriver;
     }
 
+    public String getZinkMode() {
+        return getExtra("zinkMode", DEFAULT_ZINK_MODE);
+    }
+
+    public void setZinkMode(String zinkMode) {
+        putExtra("zinkMode", zinkMode);
+    }
+
     public String getGraphicsDriverConfig() { return this.graphicsDriverConfig; }
 
     public void setGraphicsDriverConfig(String graphicsDriverConfig) { this.graphicsDriverConfig = graphicsDriverConfig; }
@@ -222,6 +224,10 @@ public void setLC_ALL(String lc_all) {
 
     public void setFullscreenStretched(boolean fullscreenStretched) { this.fullscreenStretched = fullscreenStretched; }
 
+    public boolean isUseUnixLibs() { return useUnixLibs; }
+
+    public void setUseUnixLibs(boolean useUnixLibs) { this.useUnixLibs = useUnixLibs; }
+
     public byte getStartupSelection() {
         return startupSelection;
     }
@@ -314,6 +320,22 @@ public String getLanguage() {
         return getExtra("containerLanguage", "english");
     }
 
+    /**
+     * Whether this container should route fullscreen direct-scanout drawables
+     * to a sibling Android SurfaceControl layer (HWC overlay plane / DPU
+     * scanout) instead of having VulkanRenderer composite them. Default off.
+     *
+     * <p>Sampled once at activity startup and held for the session. Toggling
+     * has no effect on a running game; the user must relaunch the container.
+     */
+    public boolean isDirectCompositionEnabled() {
+        return "1".equals(getExtra(EXTRA_DIRECT_COMPOSITION, "0"));
+    }
+
+    public void setDirectCompositionEnabled(boolean enabled) {
+        putExtra(EXTRA_DIRECT_COMPOSITION, enabled ? "1" : "0");
+    }
+
     public String getExtra(String key) {
         return getExtra(key, "");
     }
@@ -338,22 +360,6 @@ public void putExtra(String name, Object value) {
         catch (JSONException e) {}
     }
 
-    /**
-     * Whether this container should route fullscreen direct-scanout drawables to a
-     * sibling Android `SurfaceControl` layer (HWC overlay plane / DPU scanout)
-     * instead of having `GLRenderer` composite them on the EGL surface. Default off.
-     *
-     * The setting is sampled once at activity startup and held for the session. Toggling
-     * it has no effect on a running game; the user must relaunch the container.
-     */
-    public boolean isDirectCompositionEnabled() {
-        return "1".equals(getExtra(EXTRA_DIRECT_COMPOSITION, "0"));
-    }
-
-    public void setDirectCompositionEnabled(boolean enabled) {
-        putExtra(EXTRA_DIRECT_COMPOSITION, enabled ? "1" : "0");
-    }
-
     public String getWineVersion() {
         return wineVersion;
     }
@@ -402,6 +408,14 @@ public void setInputType(int inputType) {
         this.inputType = inputType;
     }
 
+    public boolean isExclusiveXInput() {
+        return exclusiveXInput;
+    }
+
+    public void setExclusiveXInput(boolean exclusiveXInput) {
+        this.exclusiveXInput = exclusiveXInput;
+    }
+
     public Iterable<String[]> drivesIterator() {
         return drivesIterator(drives);
     }
@@ -447,7 +461,9 @@ public void saveData() {
             data.put("wincomponents", wincomponents);
             data.put("drives", drives);
             data.put("fullscreenStretched", fullscreenStretched);
+            data.put("useUnixLibs", useUnixLibs);
             data.put("inputType", inputType);
+            data.put("exclusiveXInput", exclusiveXInput);
             data.put("startupSelection", startupSelection);
             data.put("box64Version", box64Version);
             data.put("fexcorePreset", fexcorePreset);
@@ -457,13 +473,11 @@ public void saveData() {
             data.put("extraData", extraData);
             data.put("midiSoundFont", midiSoundFont);
             data.put("lc_all", lc_all);
-            data.put("launchRealSteam", launchRealSteam);
+            data.put("launchBionicSteam", launchBionicSteam);
             data.put("useColdClient", useColdClient);
             data.put("coldClientMigrated", true);
-            data.put("steamType", steamType);
             data.put("allowSteamUpdates", allowSteamUpdates);
             data.put("needsUnpacking", needsUnpacking);
-            data.put("forceDlc", forceDlc);
             data.put("steamOfflineMode", steamOfflineMode);
             data.put("unpackFiles", unpackFiles);
             data.put("runtimePatcher", runtimePatcher);
@@ -532,9 +546,15 @@ public void loadData(JSONObject data) throws JSONException {
                 case "fullscreenStretched" :
                     setFullscreenStretched(data.getBoolean(key));
                     break;
+                case "useUnixLibs" :
+                    setUseUnixLibs(data.getBoolean(key));
+                    break;
                 case "inputType" :
                     setInputType(data.getInt(key));
                     break;
+                case "exclusiveXInput" :
+                    setExclusiveXInput(data.getBoolean(key));
+                    break;
                 case "startupSelection" :
                     setStartupSelection((byte)data.getInt(key));
                     break;
@@ -571,8 +591,8 @@ public void loadData(JSONObject data) throws JSONException {
                 case "lc_all" :
                     setLC_ALL(data.getString(key));
                     break;
-                case "launchRealSteam" :
-                    setLaunchRealSteam(data.getBoolean(key));
+                case "launchBionicSteam" :
+                    setLaunchBionicSteam(data.getBoolean(key));
                     break;
                 case "useColdClient" :
                     // Only respect explicit user choice if coldClientMigrated flag is set
@@ -584,18 +604,12 @@ public void loadData(JSONObject data) throws JSONException {
                 case "useLegacyDRM" :
                     // Old field — always default to ColdClient on
                     break;
-                case "steamType" :
-                    setSteamType(data.getString(key));
-                    break;
                 case "allowSteamUpdates" :
                     setAllowSteamUpdates(data.getBoolean(key));
                     break;
                 case "needsUnpacking" :
                     setNeedsUnpacking(data.getBoolean(key));
                     break;
-                case "forceDlc":
-                    setForceDlc(data.getBoolean(key));
-                    break;
                 case "steamOfflineMode":
                     setSteamOfflineMode(data.getBoolean(key));
                     break;
@@ -677,7 +691,7 @@ else if (graphicsDriver.equals("llvmpipe")) {
                 if (appVersion < 16) {
                     EnvVars defaultEnvVars = new EnvVars(DEFAULT_ENV_VARS);
                     EnvVars envVars = new EnvVars(data.getString("envVars"));
-                    for (String name : defaultEnvVars) if (!envVars.has(name)) envVars.put(name, defaultEnvVars.get(name));
+                    for (String name : defaultEnvVars) if (!name.equals("VKD3D_SHADER_MODEL") && !envVars.has(name)) envVars.put(name, defaultEnvVars.get(name));
                     data.put("envVars", envVars.toString());
                 }
             }
@@ -730,12 +744,14 @@ public boolean hasEnvVar(String keyValue) {
         return false;
     }
 
-    public boolean isLaunchRealSteam() {
-        return launchRealSteam;
+    /** Bionic Steam mode: wine launches steam.exe + game.exe and our embedded
+     *  libsteamclient.so via wn-steam-bootstrap handles the SteamWorks IPC. */
+    public boolean isLaunchBionicSteam() {
+        return launchBionicSteam;
     }
 
-    public void setLaunchRealSteam(boolean launchRealSteam) {
-        this.launchRealSteam = launchRealSteam;
+    public void setLaunchBionicSteam(boolean launchBionicSteam) {
+        this.launchBionicSteam = launchBionicSteam;
     }
 
     public boolean isUseColdClient() {
@@ -746,24 +762,6 @@ public void setUseColdClient(boolean useColdClient) {
         this.useColdClient = useColdClient;
     }
 
-    public String getSteamType() {
-        return steamType;
-    }
-
-    public void setSteamType(String steamType) {
-        String normalized = (steamType == null) ? "" : steamType.toLowerCase();
-        switch (normalized) {
-            case STEAM_TYPE_LIGHT:
-                this.steamType = STEAM_TYPE_LIGHT;
-                break;
-            case STEAM_TYPE_ULTRALIGHT:
-                this.steamType = STEAM_TYPE_ULTRALIGHT;
-                break;
-            default:
-                this.steamType = STEAM_TYPE_NORMAL;
-        }
-    }
-
     public boolean isAllowSteamUpdates() {
         return allowSteamUpdates;
     }
@@ -780,14 +778,6 @@ public void setNeedsUnpacking(boolean needsUnpacking) {
         this.needsUnpacking = needsUnpacking;
     }
 
-    public boolean isForceDlc() {
-        return forceDlc;
-    }
-
-    public void setForceDlc(boolean forceDlc) {
-        this.forceDlc = forceDlc;
-    }
-
     public boolean isSteamOfflineMode() {
         return steamOfflineMode;
     }
diff --git a/app/src/main/runtime/container/ContainerCreation.kt b/app/src/main/runtime/container/ContainerCreation.kt
new file mode 100644
index 000000000..6d7dc9350
--- /dev/null
+++ b/app/src/main/runtime/container/ContainerCreation.kt
@@ -0,0 +1,459 @@
+package com.winlator.cmod.runtime.container
+
+import android.content.Context
+import com.winlator.cmod.runtime.compat.box64.Box64Preset
+import com.winlator.cmod.runtime.compat.fexcore.FEXCorePreset
+import com.winlator.cmod.runtime.content.ContentProfile
+import com.winlator.cmod.runtime.content.ContentsManager
+import com.winlator.cmod.runtime.display.winhandler.WinHandler
+import com.winlator.cmod.runtime.wine.WineInfo
+import com.winlator.cmod.runtime.wine.WineThemeManager
+import com.winlator.cmod.runtime.wine.WineUtils
+import com.winlator.cmod.feature.setup.SetupWizardActivity
+import com.winlator.cmod.shared.util.Callback
+import org.json.JSONObject
+
+object ContainerCreation {
+    private const val WINE_DISPLAY_NAME = "Wine"
+    private const val PROTON_DISPLAY_NAME = "Proton"
+    private const val BOX64_EMULATOR = "box64"
+    private const val FEXCORE_EMULATOR = "fexcore"
+
+    private val displayNameUnsafeChars = Regex("[^a-zA-Z0-9._\\- ]")
+    private val whitespace = Regex("\\s+")
+    private val arm64EcPattern = Regex("arm64ec", RegexOption.IGNORE_CASE)
+
+    private data class LaunchReadyDefaults(
+        val emulator: String,
+        val box64Version: String,
+        val fexcoreVersion: String,
+        val dxWrapperConfig: String,
+    )
+
+    @JvmStatic
+    fun displayNameForProfile(profile: ContentProfile): String {
+        val prefix =
+            when (profile.type) {
+                ContentProfile.ContentType.CONTENT_TYPE_WINE -> WINE_DISPLAY_NAME
+                ContentProfile.ContentType.CONTENT_TYPE_PROTON -> PROTON_DISPLAY_NAME
+                else -> profile.type.toString()
+            }
+        val withoutPrefix =
+            removeLeadingRuntimePrefix(profile.verName)
+                .trim()
+        return sanitizeDisplayName("$prefix $withoutPrefix").ifBlank { prefix }
+    }
+
+    @JvmStatic
+    fun displayNameForWineVersion(
+        context: Context,
+        contentsManager: ContentsManager,
+        wineVersion: String,
+    ): String {
+        findRuntimeProfile(contentsManager, wineVersion)?.let {
+            return displayNameForProfile(it)
+        }
+        displayNameFromWineVersionIdentifier(wineVersion)?.let {
+            return it
+        }
+
+        val wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersion)
+        return sanitizeDisplayName(wineInfo.toString()).ifBlank { wineVersion }
+    }
+
+    private fun displayNameFromWineVersionIdentifier(wineVersion: String): String? {
+        val trimmed = wineVersion.trim()
+        if (trimmed.isEmpty()) return null
+
+        val lower = trimmed.lowercase()
+        val runtimeName =
+            when {
+                lower.startsWith("proton-") -> PROTON_DISPLAY_NAME
+                lower.startsWith("wine-") -> WINE_DISPLAY_NAME
+                else -> return null
+            }
+        val contentTypePrefix =
+            when (runtimeName) {
+                PROTON_DISPLAY_NAME -> ContentProfile.ContentType.CONTENT_TYPE_PROTON.toString() + "-"
+                else -> ContentProfile.ContentType.CONTENT_TYPE_WINE.toString() + "-"
+            }
+        var versionPart =
+            if (trimmed.startsWith(contentTypePrefix, ignoreCase = true)) {
+                trimmed.substring(contentTypePrefix.length)
+            } else {
+                removeLeadingRuntimePrefix(trimmed)
+            }
+        versionPart = removeLeadingRuntimePrefix(versionPart)
+
+        val lastDash = versionPart.lastIndexOf('-')
+        if (lastDash > 0 && versionPart.substring(lastDash + 1).all { it.isDigit() }) {
+            versionPart = versionPart.substring(0, lastDash)
+        }
+
+        return sanitizeDisplayName("$runtimeName $versionPart").ifBlank { null }
+    }
+
+    private fun findRuntimeProfile(
+        contentsManager: ContentsManager,
+        entryName: String,
+    ): ContentProfile? =
+        (
+            contentsManager.getProfiles(ContentProfile.ContentType.CONTENT_TYPE_WINE).orEmpty() +
+                contentsManager.getProfiles(ContentProfile.ContentType.CONTENT_TYPE_PROTON).orEmpty()
+            ).firstOrNull { ContentsManager.getEntryName(it) == entryName }
+
+    private fun removeLeadingRuntimePrefix(versionName: String): String {
+        val trimmed = versionName.trim()
+        val prefixEnd =
+            when {
+                trimmed.regionMatches(0, "wine", 0, "wine".length, ignoreCase = true) -> "wine".length
+                trimmed.regionMatches(0, "proton", 0, "proton".length, ignoreCase = true) -> "proton".length
+                else -> return trimmed
+            }
+        val next = trimmed.getOrNull(prefixEnd)
+        return if (next == null || next == '-' || next == '_' || next.isWhitespace()) {
+            trimmed.drop(prefixEnd).dropWhile { it == '-' || it == '_' || it.isWhitespace() }
+        } else {
+            trimmed
+        }
+    }
+
+    @JvmStatic
+    fun uniqueName(
+        containerManager: ContainerManager,
+        desiredName: String,
+    ): String {
+        containerManager.loadContainers()
+        // Strip any existing "-number" suffix (e.g., "Proton 10-1" -> "Proton 10")
+        val baseName = desiredName.trim().replace(Regex("-\\d+$"), "").ifBlank { "Container" }
+        
+        var maxNumber = 0
+        val suffixRegex = Regex("^" + Regex.escape(baseName) + "-(\\d+)$", RegexOption.IGNORE_CASE)
+        
+        for (container in containerManager.containers) {
+            val name = container.name
+            if (name.equals(baseName, ignoreCase = true) && maxNumber < 1) {
+                maxNumber = 0 // Base name exists without suffix
+            }
+            suffixRegex.find(name)?.let { match ->
+                val num = match.groupValues[1].toIntOrNull() ?: 0
+                if (num > maxNumber) maxNumber = num
+            }
+        }
+        
+        return "$baseName-${maxNumber + 1}"
+    }
+
+    @JvmStatic
+    fun buildLaunchReadyData(
+        context: Context,
+        contentsManager: ContentsManager,
+        name: String,
+        wineVersion: String,
+    ): JSONObject {
+        val defaults = resolveLaunchReadyDefaults(context, contentsManager, wineVersion)
+
+        val preferredDriver = SetupWizardActivity.getLastInstalledDriverId(context)
+
+        return JSONObject().apply {
+            put("name", name)
+            put("wineVersion", wineVersion)
+            put("screenSize", Container.DEFAULT_SCREEN_SIZE)
+            put("envVars", Container.DEFAULT_ENV_VARS)
+            put("cpuList", Container.getFallbackCPUList())
+            put("cpuListWoW64", Container.getFallbackCPUListWoW64())
+            put("graphicsDriver", preferredDriver.ifBlank { Container.DEFAULT_GRAPHICS_DRIVER })
+            put("graphicsDriverConfig", replaceDelimitedConfigValue(
+                Container.DEFAULT_GRAPHICSDRIVERCONFIG,
+                ';',
+                "version",
+                preferredDriver.ifBlank { "System" },
+            ))
+            put("dxwrapper", Container.DEFAULT_DXWRAPPER)
+            put("dxwrapperConfig", defaults.dxWrapperConfig)
+            put("audioDriver", Container.DEFAULT_AUDIO_DRIVER)
+            put("emulator", defaults.emulator)
+            put("emulator64", defaults.emulator)
+            put("wincomponents", Container.DEFAULT_WINCOMPONENTS)
+            put("drives", WineUtils.normalizePersistentDrives(context, Container.DEFAULT_DRIVES))
+            put("fullscreenStretched", false)
+            put("inputType", WinHandler.DEFAULT_INPUT_TYPE.toInt())
+            put("startupSelection", Container.STARTUP_SELECTION_ESSENTIAL.toInt())
+            put("box64Version", defaults.box64Version)
+            put("box64Preset", Box64Preset.PERFORMANCE)
+            put("fexcoreVersion", defaults.fexcoreVersion)
+            put("fexcorePreset", FEXCorePreset.PERFORMANCE_TSO)
+            put("desktopTheme", WineThemeManager.DEFAULT_DESKTOP_THEME)
+            put("midiSoundFont", "")
+            put("lc_all", "")
+            put("execArgs", "")
+        }
+    }
+
+    @JvmStatic
+    fun createContainer(
+        context: Context,
+        containerManager: ContainerManager,
+        contentsManager: ContentsManager,
+        name: String,
+        wineVersion: String,
+    ): Container? {
+        val data = buildLaunchReadyData(context, contentsManager, name, wineVersion)
+        return containerManager.createContainer(data, contentsManager)?.also {
+            applyLaunchReadyDefaults(context, contentsManager, it)
+        }
+    }
+
+    @JvmStatic
+    fun createContainerForProfile(
+        context: Context,
+        containerManager: ContainerManager,
+        contentsManager: ContentsManager,
+        profile: ContentProfile,
+        desiredName: String = displayNameForProfile(profile),
+    ): Container? =
+        createContainer(
+            context,
+            containerManager,
+            contentsManager,
+            uniqueName(containerManager, desiredName),
+            ContentsManager.getEntryName(profile),
+        )
+
+    @JvmStatic
+    fun createContainerAsync(
+        context: Context,
+        containerManager: ContainerManager,
+        contentsManager: ContentsManager,
+        name: String,
+        wineVersion: String,
+        callback: Callback<Container?>,
+    ) {
+        val data = buildLaunchReadyData(context, contentsManager, name, wineVersion)
+        containerManager.createContainerAsync(data, contentsManager) { container ->
+            if (container != null) {
+                applyLaunchReadyDefaults(context, contentsManager, container)
+            }
+            callback.call(container)
+        }
+    }
+
+    @JvmStatic
+    fun createContainerAsync(
+        containerManager: ContainerManager,
+        contentsManager: ContentsManager,
+        data: JSONObject,
+        callback: Callback<Container?>,
+    ) {
+        containerManager.createContainerAsync(data, contentsManager) { container ->
+            callback.call(container)
+        }
+    }
+
+    @JvmStatic
+    fun createContainerForProfileAsync(
+        context: Context,
+        containerManager: ContainerManager,
+        contentsManager: ContentsManager,
+        profile: ContentProfile,
+        callback: Callback<Container?>,
+    ) {
+        val uniqueName = uniqueName(containerManager, displayNameForProfile(profile))
+        createContainerAsync(
+            context,
+            containerManager,
+            contentsManager,
+            uniqueName,
+            ContentsManager.getEntryName(profile),
+            callback,
+        )
+    }
+
+    @JvmStatic
+    fun getOrCreateContainerForProfile(
+        context: Context,
+        containerManager: ContainerManager,
+        contentsManager: ContentsManager,
+        profile: ContentProfile,
+        desiredName: String = displayNameForProfile(profile),
+    ): Container? {
+        val wineVersion = ContentsManager.getEntryName(profile)
+        containerManager.containers.firstOrNull { it.name.equals(desiredName, ignoreCase = true) }?.let {
+            if (it.wineVersion != wineVersion) {
+                it.setWineVersion(wineVersion)
+                it.putExtra("wineprefixNeedsUpdate", "t")
+            }
+            applyLaunchReadyDefaults(context, contentsManager, it)
+            return it
+        }
+        // If not found, create a new one using the smart unique naming logic (Name-1)
+        val uniqueName = uniqueName(containerManager, desiredName)
+        return createContainerForProfile(context, containerManager, contentsManager, profile, uniqueName)
+    }
+
+    @JvmStatic
+    fun applyLaunchReadyDefaults(
+        context: Context,
+        contentsManager: ContentsManager,
+        container: Container,
+    ) {
+        val defaults = resolveLaunchReadyDefaults(context, contentsManager, container.wineVersion)
+        val preferredDriver = SetupWizardActivity.getLastInstalledDriverId(context)
+
+        container.setGraphicsDriver(preferredDriver.ifBlank { Container.DEFAULT_GRAPHICS_DRIVER })
+        container.setCPUList(Container.getFallbackCPUList())
+        container.setCPUListWoW64(Container.getFallbackCPUListWoW64())
+        container.setDrives(WineUtils.normalizePersistentDrives(
+            context,
+            container.drives ?: Container.DEFAULT_DRIVES,
+        ))
+        container.setGraphicsDriverConfig(replaceDelimitedConfigValue(
+            Container.DEFAULT_GRAPHICSDRIVERCONFIG,
+            ';',
+            "version",
+            preferredDriver.ifBlank { "System" },
+        ))
+        container.setDXWrapper(Container.DEFAULT_DXWRAPPER)
+        container.setDXWrapperConfig(defaults.dxWrapperConfig)
+        container.setEmulator(defaults.emulator)
+        container.setEmulator64(defaults.emulator)
+        container.setBox64Version(defaults.box64Version)
+        container.setFEXCoreVersion(defaults.fexcoreVersion)
+        container.setBox64Preset(Box64Preset.PERFORMANCE)
+        container.setFEXCorePreset(FEXCorePreset.PERFORMANCE_TSO)
+        container.saveData()
+    }
+
+    private fun sanitizeDisplayName(value: String): String =
+        value
+            .replace(displayNameUnsafeChars, " ")
+            .trim()
+            .replace(whitespace, " ")
+
+    private fun resolveLaunchReadyDefaults(
+        context: Context,
+        contentsManager: ContentsManager,
+        wineVersion: String,
+    ): LaunchReadyDefaults {
+        contentsManager.syncContents()
+
+        val wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersion)
+        val isArm64Ec = wineInfo.isArm64EC
+        return LaunchReadyDefaults(
+            emulator = emulatorFor(isArm64Ec),
+            box64Version = resolvePreferredContentVersion(
+                contentsManager,
+                box64ContentTypeFor(isArm64Ec),
+                "",
+            ),
+            fexcoreVersion = resolvePreferredContentVersion(
+                contentsManager,
+                ContentProfile.ContentType.CONTENT_TYPE_FEXCORE,
+                "",
+            ),
+            dxWrapperConfig = buildDefaultDxWrapperConfig(contentsManager, isArm64Ec),
+        )
+    }
+
+    private fun emulatorFor(isArm64Ec: Boolean): String =
+        if (isArm64Ec) FEXCORE_EMULATOR else BOX64_EMULATOR
+
+    private fun box64ContentTypeFor(isArm64Ec: Boolean): ContentProfile.ContentType =
+        if (isArm64Ec) {
+            ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64
+        } else {
+            ContentProfile.ContentType.CONTENT_TYPE_BOX64
+        }
+
+    @JvmStatic
+    fun defaultDxWrapperConfig(
+        contentsManager: ContentsManager,
+        isArm64Ec: Boolean,
+    ): String = buildDefaultDxWrapperConfig(contentsManager, isArm64Ec)
+
+    private fun buildDefaultDxWrapperConfig(
+        contentsManager: ContentsManager,
+        isArm64Ec: Boolean,
+    ): String {
+        val dxvkVersion =
+            resolvePreferredContentVersion(
+                contentsManager,
+                ContentProfile.ContentType.CONTENT_TYPE_DXVK,
+                "",
+                includePattern = if (isArm64Ec) arm64EcPattern else null,
+                excludePattern = if (isArm64Ec) null else arm64EcPattern,
+            )
+        val vkd3dVersion =
+            resolvePreferredContentVersion(
+                contentsManager,
+                ContentProfile.ContentType.CONTENT_TYPE_VKD3D,
+                "None",
+                includePattern = if (isArm64Ec) arm64EcPattern else null,
+                excludePattern = if (isArm64Ec) null else arm64EcPattern,
+            )
+
+        return replaceDelimitedConfigValue(
+            replaceDelimitedConfigValue(
+                Container.DEFAULT_DXWRAPPERCONFIG,
+                ',',
+                "version",
+                dxvkVersion,
+            ),
+            ',',
+            "vkd3dVersion",
+            vkd3dVersion,
+        )
+    }
+
+    private fun resolvePreferredContentVersion(
+        manager: ContentsManager,
+        type: ContentProfile.ContentType,
+        fallback: String,
+        includePattern: Regex? = null,
+        excludePattern: Regex? = null,
+    ): String {
+        val installedProfiles =
+            manager.getProfiles(type)
+                .orEmpty()
+                .filter { it.isInstalled }
+        val matchingProfiles =
+            installedProfiles
+                .filter { profile ->
+                    val versionName = profile.verName
+                    (includePattern == null || includePattern.containsMatchIn(versionName)) &&
+                        (excludePattern == null || !excludePattern.containsMatchIn(versionName))
+                }.ifEmpty { installedProfiles }
+
+        val newestInstalled =
+            matchingProfiles.maxWithOrNull(
+                compareBy<ContentProfile> { it.verCode }.thenBy { it.verName.lowercase() },
+            )
+        return newestInstalled?.let(::contentVersionIdentifier) ?: fallback
+    }
+
+    private fun contentVersionIdentifier(profile: ContentProfile): String {
+        val entryName = ContentsManager.getEntryName(profile)
+        val firstDash = entryName.indexOf('-')
+        return if (firstDash >= 0) entryName.substring(firstDash + 1) else entryName
+    }
+
+    private fun replaceDelimitedConfigValue(
+        config: String,
+        delimiter: Char,
+        key: String,
+        value: String,
+    ): String {
+        val parts = config.split(delimiter).toMutableList()
+        var replaced = false
+        for (index in parts.indices) {
+            if (parts[index].startsWith("$key=")) {
+                parts[index] = "$key=$value"
+                replaced = true
+            }
+        }
+        if (!replaced) {
+            parts += "$key=$value"
+        }
+        return parts.joinToString(delimiter.toString())
+    }
+}
diff --git a/app/src/main/runtime/container/ContainerManager.java b/app/src/main/runtime/container/ContainerManager.java
index 84e8bbbb1..db765aeca 100644
--- a/app/src/main/runtime/container/ContainerManager.java
+++ b/app/src/main/runtime/container/ContainerManager.java
@@ -34,7 +34,7 @@ public class ContainerManager {
   private final File homeDir;
   private final Context context;
 
-  private boolean isInitialized = false; // New flag to track initialization
+  private boolean isInitialized = false;
 
   public ContainerManager(Context context) {
     this.context = context;
@@ -44,7 +44,6 @@ public ContainerManager(Context context) {
     isInitialized = true;
   }
 
-  // Check if the ContainerManager is fully initialized
   public boolean isInitialized() {
     return isInitialized;
   }
@@ -53,8 +52,19 @@ public ArrayList<Container> getContainers() {
     return containers;
   }
 
-  // Load containers from the home directory
-  private void loadContainers() {
+  public static final int RETRO_CONTAINER_ID = 0;
+
+  public File getRetroHomeDir() {
+    return new File(context.getFilesDir(), "retro-home");
+  }
+
+  public Container getRetroContainer() {
+    Container container = new Container(RETRO_CONTAINER_ID, this);
+    container.setRootDir(getRetroHomeDir());
+    return container;
+  }
+
+  public void loadContainers() {
     containers.clear();
     maxContainerId = 0;
 
@@ -70,10 +80,11 @@ private void loadContainers() {
 
               container.setRootDir(new File(homeDir, ImageFs.USER + "-" + container.id));
               String configStr = FileUtils.readString(container.getConfigFile());
-              if (configStr == null) {
+              if (configStr == null || configStr.trim().isEmpty()) {
+                // Empty can happen transiently when another thread is mid-save (fopen("w") truncates first); skip quietly — the next loadContainers picks it up.
                 Log.w(
                     "ContainerManager",
-                    "Skipping container " + container.id + ": missing or unreadable config file");
+                    "Skipping container " + container.id + ": config file empty or unreadable");
                 continue;
               }
               JSONObject data = new JSONObject(configStr);
@@ -93,11 +104,12 @@ public Context getContext() {
     return context;
   }
 
-  public void activateContainer(Container container) {
+  public boolean activateContainer(Container container) {
     Log.d("ContainerManager", "activateContainer: id=" + container.id);
     File containerDir = new File(homeDir, ImageFs.USER + "-" + container.id);
     container.setRootDir(containerDir);
     File file = new File(homeDir, ImageFs.USER);
+    String linkTarget = "./" + ImageFs.USER + "-" + container.id;
 
     // Make C: Drive accessible — 0771 not 0777 to prevent other apps reading file contents
     try {
@@ -109,9 +121,7 @@ public void activateContainer(Container container) {
     } catch (Exception e) {
     }
 
-    // Replace the real "xuser" dir (from imagefs.txz) with a symlink to the active
-    // container. Migrate winhandler.exe/wfm.exe first since they aren't in container
-    // pattern archives. Only runs once — after that xuser is already a symlink.
+    // Replace the real "xuser" dir with a symlink to the active container, migrating winhandler.exe/wfm.exe first (not in container pattern archives). Runs once — after that xuser is already a symlink.
     if (file.exists() && !FileUtils.isSymlink(file)) {
       Log.w(
           "ContainerManager",
@@ -120,6 +130,20 @@ public void activateContainer(Container container) {
       migrateEssentialFiles(file, containerDir);
       boolean deleted = FileUtils.delete(file);
       Log.d("ContainerManager", "activateContainer: real xuser dir delete=" + deleted);
+      if (!deleted && file.exists()) {
+        File backup = new File(homeDir, ImageFs.USER + ".inactive-" + System.currentTimeMillis());
+        boolean renamed = file.renameTo(backup);
+        Log.w(
+            "ContainerManager",
+            "activateContainer: real xuser delete failed, rename to "
+                + backup.getName()
+                + "="
+                + renamed);
+        if (!renamed && file.exists()) {
+          Log.e("ContainerManager", "activateContainer: unable to replace real xuser directory");
+          return false;
+        }
+      }
     } else {
       boolean deleted = file.delete();
       Log.d(
@@ -129,15 +153,21 @@ public void activateContainer(Container container) {
               + " existed="
               + file.exists());
     }
-    FileUtils.symlink("./" + ImageFs.USER + "-" + container.id, file.getPath());
+    FileUtils.symlink(linkTarget, file.getPath());
+    boolean symlinkReady = FileUtils.isSymlink(file) && linkTarget.equals(FileUtils.readSymlink(file));
     Log.d(
         "ContainerManager",
         "activateContainer: xuser symlink created, isSymlink="
             + FileUtils.isSymlink(file)
-            + " target=./"
-            + ImageFs.USER
-            + "-"
-            + container.id);
+            + " target="
+            + FileUtils.readSymlink(file));
+    if (!symlinkReady) {
+      Log.e(
+          "ContainerManager",
+          "activateContainer: active xuser does not point to selected container "
+              + container.id);
+    }
+    return symlinkReady;
   }
 
   private void migrateEssentialFiles(File sourceDir, File destDir) {
@@ -166,12 +196,8 @@ public void createContainerAsync(
             });
   }
 
-  public void duplicateContainerAsync(Container container, Runnable callback) {
-    duplicateContainerAsync(container, null, callback);
-  }
-
   public void duplicateContainerAsync(
-      Container container, Callback<Integer> progressCallback, Runnable callback) {
+      Container container, Callback<Integer> progressCallback, Callback<Boolean> callback) {
     final Handler handler = new Handler(Looper.getMainLooper());
     Executors.newSingleThreadExecutor()
         .execute(
@@ -180,8 +206,8 @@ public void duplicateContainerAsync(
                   progressCallback != null
                       ? progress -> handler.post(() -> progressCallback.call(progress))
                       : null;
-              duplicateContainer(container, uiProgress);
-              handler.post(callback);
+              final boolean success = duplicateContainer(container, uiProgress);
+              handler.post(() -> callback.call(success));
             });
   }
 
@@ -215,7 +241,6 @@ public Container createContainer(JSONObject data, ContentsManager contentsManage
         Log.e(
             "ContainerManager",
             "createContainer: FAILED to create dir: " + containerDir.getAbsolutePath());
-        // Try creating parent dirs first
         if (!homeDir.exists()) {
           Log.d("ContainerManager", "createContainer: homeDir does not exist, creating...");
           homeDir.mkdirs();
@@ -236,10 +261,7 @@ public Container createContainer(JSONObject data, ContentsManager contentsManage
       Log.d("ContainerManager", "createContainer: wineVersion=" + wineVersion);
       container.setWineVersion(wineVersion);
 
-      // Set the correct emulators based on the wine architecture, unless the
-      // caller already specified them in the JSON data.  This ensures every
-      // creation path (manual, contents download, store integration) gets the
-      // right emulator: box64 for x86_64, fexcore for arm64ec.
+      // Pick emulators by wine arch unless the caller set them: box64 for x86_64, fexcore for arm64ec.
       if (!data.has("emulator") || !data.has("emulator64")) {
           WineInfo wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersion);
           if (wineInfo.isArm64EC()) {
@@ -254,12 +276,7 @@ public Container createContainer(JSONObject data, ContentsManager contentsManage
               + " emulator64=" + container.getEmulator64());
       }
 
-      // Auto-fill emulator versions when the caller didn't provide them. The
-      // "Profiles -> Create Container" path passes only name+wineVersion, so
-      // without this the container ends up with empty FEXCore/WowBox64/Box64
-      // versions and GuestProgramLauncherComponent skips DLL extraction at
-      // launch ("No FEXCore version selected"), leaving libarm64ecfex.dll out
-      // of system32 and crashing wineboot.
+      // Auto-fill emulator versions when the caller omits them, or DLL extraction is skipped at launch ("No FEXCore version selected") and wineboot crashes.
       if (!data.has("fexcoreVersion") && container.getFEXCoreVersion().isEmpty()) {
           String v = pickNewestInstalledVersion(contentsManager, ContentProfile.ContentType.CONTENT_TYPE_FEXCORE);
           if (!v.isEmpty()) container.setFEXCoreVersion(v);
@@ -289,20 +306,10 @@ public Container createContainer(JSONObject data, ContentsManager contentsManage
       container.putExtra("wineprefixArch", wineInfoForArch.getArch());
       container.putExtra("wineprefixNeedsUpdate", null);
 
-      // Record the VC++ 2015-2022 runtime as installed when the proton wcp has
-      // laid down the DLLs. Without this Burn-based vc_redist sees "not installed"
-      // and tries to run its installer UI, which crashes on Wine ARM64EC's theme
-      // init (and on x86_64 just wastes time). Game prereq checks pass too.
+      // Mark the VC++ 2015-2022 runtime installed once the DLLs are present, or vc_redist runs its installer UI (crashes on ARM64EC theme init, wastes time on x86_64).
       com.winlator.cmod.runtime.wine.WineUtils.seedVcRedistRegistryIfDllsPresent(
           containerDir, wineInfoForArch.isArm64EC());
 
-      //            // Extract the selected graphics driver files
-      //            String driverVersion = container.getGraphicsDriverVersion();
-      //            if (!extractGraphicsDriverFiles(driverVersion, containerDir, null)) {
-      //                FileUtils.delete(containerDir);
-      //                return null;
-      //            }
-
       container.saveData();
       maxContainerId++;
       containers.add(container);
@@ -313,8 +320,7 @@ public Container createContainer(JSONObject data, ContentsManager contentsManage
     return null;
   }
 
-  // Returns "<verName>" of the newest installed profile of the given type, or "" if none.
-  // Mirrors SetupWizardActivity.resolvePreferredContentVersion's "newest installed" path.
+  // Newest installed profile's version suffix, or "" if none. The launcher rebuilds names as "<type>-<suffix>", so keep the version code.
   private String pickNewestInstalledVersion(ContentsManager contentsManager, ContentProfile.ContentType type) {
     if (contentsManager == null) return "";
     java.util.List<ContentProfile> profiles = contentsManager.getProfiles(type);
@@ -331,18 +337,28 @@ private String pickNewestInstalledVersion(ContentsManager contentsManager, Conte
         best = p;
       }
     }
-    return best != null && best.verName != null ? best.verName : "";
+    if (best == null) return "";
+    String entryName = ContentsManager.getEntryName(best);
+    int firstDash = entryName.indexOf('-');
+    return firstDash >= 0 ? entryName.substring(firstDash + 1) : entryName;
   }
 
-  private void duplicateContainer(Container srcContainer) {
-    duplicateContainer(srcContainer, null);
-  }
-
-  private void duplicateContainer(Container srcContainer, Callback<Integer> progressCallback) {
+  private boolean duplicateContainer(Container srcContainer, Callback<Integer> progressCallback) {
     int id = maxContainerId + 1;
-
     File dstDir = new File(homeDir, ImageFs.USER + "-" + id);
-    if (!dstDir.mkdirs()) return;
+
+    // A crashed create/duplicate can leave an unregistered dir behind; skip past it.
+    while (dstDir.exists()) {
+      id++;
+      dstDir = new File(homeDir, ImageFs.USER + "-" + id);
+    }
+
+    if (!dstDir.mkdirs()) {
+      Log.e(
+          "ContainerManager",
+          "duplicateContainer: failed to create dir " + dstDir.getAbsolutePath());
+      return false;
+    }
 
     final int totalFiles = FileUtils.countFiles(srcContainer.getRootDir());
     final int[] copiedFiles = {0};
@@ -358,35 +374,78 @@ private void duplicateContainer(Container srcContainer, Callback<Integer> progre
             progressCallback.call(pct);
           }
         })) {
+      Log.e(
+          "ContainerManager",
+          "duplicateContainer: file copy failed for container " + srcContainer.id);
       FileUtils.delete(dstDir);
-      return;
+      return false;
     }
 
+    // Runtime socket dir; the copy's 0771 makes wineserver refuse to start ("accessible by other users").
+    FileUtils.delete(new File(dstDir, ".wine/.wineserver"));
+
+    // Load the source config wholesale; hand-picking fields reset the rest to defaults.
     Container dstContainer = new Container(id, this);
     dstContainer.setRootDir(dstDir);
+    String configStr = FileUtils.readString(srcContainer.getConfigFile());
+    if (configStr == null || configStr.trim().isEmpty()) {
+      Log.e(
+          "ContainerManager",
+          "duplicateContainer: config empty or unreadable for container " + srcContainer.id);
+      FileUtils.delete(dstDir);
+      return false;
+    }
+    try {
+      JSONObject data = new JSONObject(configStr);
+      data.put("id", id);
+      dstContainer.loadData(data);
+    } catch (JSONException e) {
+      Log.e(
+          "ContainerManager",
+          "duplicateContainer: bad config JSON for container " + srcContainer.id, e);
+      FileUtils.delete(dstDir);
+      return false;
+    }
     dstContainer.setName(
         srcContainer.getName() + " (" + context.getString(R.string.common_ui_copy) + ")");
-    dstContainer.setScreenSize(srcContainer.getScreenSize());
-    dstContainer.setEnvVars(srcContainer.getEnvVars());
-    dstContainer.setCPUList(srcContainer.getCPUList());
-    dstContainer.setCPUListWoW64(srcContainer.getCPUListWoW64());
-    dstContainer.setGraphicsDriver(srcContainer.getGraphicsDriver());
-    dstContainer.setDXWrapper(srcContainer.getDXWrapper());
-    dstContainer.setDXWrapperConfig(srcContainer.getDXWrapperConfig());
-    dstContainer.setAudioDriver(srcContainer.getAudioDriver());
-    dstContainer.setWinComponents(srcContainer.getWinComponents());
-    dstContainer.setDrives(srcContainer.getDrives());
-    dstContainer.setStartupSelection(srcContainer.getStartupSelection());
-    dstContainer.setBox64Preset(srcContainer.getBox64Preset());
-    dstContainer.setDesktopTheme(srcContainer.getDesktopTheme());
-    dstContainer.setWineVersion(srcContainer.getWineVersion());
     dstContainer.saveData();
+    rewriteShortcutContainerIds(dstContainer.getDesktopDir(), id);
 
-    maxContainerId++;
+    maxContainerId = id;
     containers.add(dstContainer);
+    return true;
+  }
+
+  // Copied shortcuts keep the source's container_id, which overrides the owning container at launch.
+  static void rewriteShortcutContainerIds(File desktopDir, int newId) {
+    File[] files = desktopDir.listFiles((dir, name) -> name.endsWith(".desktop"));
+    if (files == null) return;
+
+    for (File file : files) {
+      StringBuilder updated = new StringBuilder();
+      boolean changed = false;
+
+      for (String line : FileUtils.readLines(file)) {
+        String trimmed = line.trim();
+        boolean colon = trimmed.startsWith("container_id:");
+        if (colon || trimmed.startsWith("container_id=")) {
+          updated.append("container_id").append(colon ? ':' : '=').append(newId).append("\n");
+          changed = true;
+        } else updated.append(line).append("\n");
+      }
+
+      if (changed && !FileUtils.writeString(file, updated.toString())) {
+        Log.e("ContainerManager", "rewriteShortcutContainerIds: failed to write " + file);
+      }
+    }
   }
 
   private void removeContainer(Container container) {
+    // MN-2: deletes the whole container including in-prefix game saves (drive_c/users, Steam userdata); log here so the deletion is visible even on the non-interactive deleteContainer path.
+    Log.w(
+        "ContainerManager",
+        "removeContainer: deleting container " + container.id + " and ALL in-prefix saves at "
+            + container.getRootDir());
     if (FileUtils.delete(container.getRootDir())) containers.remove(container);
   }
 
@@ -414,6 +473,17 @@ public ArrayList<Shortcut> loadShortcuts() {
       }
     }
 
+    Container retroContainer = getRetroContainer();
+    File retroDesktop = retroContainer.getDesktopDir();
+    if (retroDesktop.exists()) {
+      File[] retroFiles = retroDesktop.listFiles();
+      if (retroFiles != null) {
+        for (File file : retroFiles) {
+          if (file.getName().endsWith(".desktop")) shortcuts.add(new Shortcut(retroContainer, file));
+        }
+      }
+    }
+
     shortcuts.sort(Comparator.comparing(a -> a.name));
     return shortcuts;
   }
@@ -456,10 +526,6 @@ public void upgradeShortcuts(final Runnable onDone) {
     }, "ShortcutUpgrade").start();
   }
 
-  public int getNextContainerId() {
-    return maxContainerId + 1;
-  }
-
   public Container getContainerById(int id) {
     for (Container container : containers) if (container.id == id) return container;
     return null;
@@ -501,14 +567,7 @@ private void extractCommonDlls(
     }
   }
 
-  /**
-   * Reads the PE <code>Machine</code> field and logs a loud warning if it is not ARM64
-   * ({@code 0xAA64}) or ARM64EC ({@code 0xA641}). Missing files are treated as non-fatal.
-   *
-   * <p>Guardrail against mis-packaged tzsts like the Mar-2026 <code>xinput_virtual_arm64ec.tzst</code>,
-   * which carried AMD64 PE binaries under an arm64ec filename. Silent mismatch manifested as
-   * joy.cpl failing to load xinput and "Game Controllers" disappearing from the Start Menu.
-   */
+  /** Warn loudly if the PE Machine field isn't ARM64 (0xAA64) or ARM64EC (0xA641); missing files are non-fatal. Guards against mis-packaged arm64ec tzsts carrying AMD64 binaries (silent mismatch = joy.cpl fails to load xinput, "Game Controllers" vanishes). */
   private static void assertArm64PEMachine(File dir, String dllName) {
     File f = new File(dir, dllName);
     if (!f.isFile()) return;
@@ -554,8 +613,7 @@ public boolean extractContainerPatternFile(
             + " path="
             + (wineInfo != null ? wineInfo.path : "null"));
 
-    // Step 1: Try to extract the versioned container pattern from bundled assets
-    // e.g. "proton-9.0-x86_64_container_pattern.tzst"
+    // Step 1: try the versioned container pattern from bundled assets (e.g. "<wineVersion>_container_pattern.tzst").
     String containerPattern = wineVersion + "_container_pattern.tzst";
     boolean result = false;
     try {
@@ -587,8 +645,7 @@ public boolean extractContainerPatternFile(
               + (profile != null ? profile.verName : "null"));
 
       if (profile != null) {
-        // Use the ContentsManager's install dir directly — this is always correct
-        // for custom installed protons, unlike wineInfo.path which may fall back to default
+        // Use ContentsManager's install dir — always correct for custom installed protons, unlike wineInfo.path which may fall back to default.
         File profileInstallDir = ContentsManager.getInstallDir(context, profile);
         Log.d(
             "ContainerManager",
@@ -737,20 +794,50 @@ public boolean repairContainerWinePrefix(
         return false;
       }
 
+      // Move the (possibly corrupt) prefix ASIDE, not delete — games store saves inside it and this repair auto-runs at launch, so deleting would destroy saves. Rename old->backup, copy in the repaired prefix, migrate saves across; one backup kept per container as a recovery copy.
       File targetPrefixDir = new File(containerDir, ".wine");
-      if (targetPrefixDir.exists() && !FileUtils.delete(targetPrefixDir)) {
-        Log.e(
-            "ContainerManager",
-            "repairContainerWinePrefix: failed to clear existing prefix "
-                + targetPrefixDir.getAbsolutePath());
-        return false;
+      File backupPrefixDir = new File(containerDir, ".wine.broken-backup");
+      boolean movedAside = false;
+      if (targetPrefixDir.exists()) {
+        if (backupPrefixDir.exists() && !FileUtils.delete(backupPrefixDir)) {
+          Log.e(
+              "ContainerManager",
+              "repairContainerWinePrefix: failed to clear previous prefix backup "
+                  + backupPrefixDir.getAbsolutePath());
+          return false;
+        }
+        if (!targetPrefixDir.renameTo(backupPrefixDir)) {
+          // Do NOT delete as a fallback — that would destroy in-prefix saves; abort the repair so the container keeps its original prefix (safer failure).
+          Log.e(
+              "ContainerManager",
+              "repairContainerWinePrefix: failed to move existing prefix aside; aborting "
+                  + "repair to avoid save-data loss " + targetPrefixDir.getAbsolutePath());
+          return false;
+        }
+        movedAside = true;
       }
 
-      if (!FileUtils.copy(repairedPrefixDir, targetPrefixDir)) {
+      if (!copyWinePrefixTree(repairedPrefixDir, targetPrefixDir)) {
         Log.e("ContainerManager", "repairContainerWinePrefix: failed to copy repaired prefix");
+        // Roll back so the container keeps its original prefix rather than a half-written one.
+        if (movedAside) {
+          FileUtils.delete(targetPrefixDir);
+          if (!backupPrefixDir.renameTo(targetPrefixDir)) {
+            Log.e(
+                "ContainerManager",
+                "repairContainerWinePrefix: CRITICAL — failed to restore prefix after copy "
+                    + "failure; original prefix preserved at "
+                    + backupPrefixDir.getAbsolutePath());
+          }
+        }
         return false;
       }
 
+      // Best-effort: carry in-prefix save data over to the repaired prefix so saves survive without manual recovery.
+      if (movedAside) {
+        migrateInPrefixSaveData(backupPrefixDir, targetPrefixDir);
+      }
+
       WineInfo wineInfo = WineInfo.fromIdentifier(context, contentsManager, wineVersion);
       container.putExtra("wineprefixArch", wineInfo.getArch());
       container.putExtra("wineprefixNeedsUpdate", null);
@@ -763,23 +850,71 @@ public boolean repairContainerWinePrefix(
       container.putExtra("mono_installed", null);
       container.putExtra("mono_version", null);
       container.saveData();
+      if (movedAside) {
+        Log.i(
+            "ContainerManager",
+            "repairContainerWinePrefix: original prefix preserved for save recovery at "
+                + backupPrefixDir.getAbsolutePath());
+      }
       return true;
     } finally {
       FileUtils.delete(tempDir);
     }
   }
 
+  /** Copy in-prefix save data from the moved-aside old prefix into the repaired one. Best-effort/non-fatal — the old prefix is kept as backup, so failure means manual recovery, not data loss. */
+  private void migrateInPrefixSaveData(File oldPrefixDir, File newPrefixDir) {
+    String[] saveSubPaths = {
+      "drive_c/users",
+      "drive_c/ProgramData",
+      "drive_c/Program Files (x86)/Steam/userdata",
+    };
+    for (String sub : saveSubPaths) {
+      File src = new File(oldPrefixDir, sub);
+      if (!src.exists()) continue;
+      File dst = new File(newPrefixDir, sub);
+      try {
+        if (!copyWinePrefixTree(src, dst)) {
+          Log.w("ContainerManager", "migrateInPrefixSaveData: failed to migrate " + sub);
+        }
+      } catch (Exception e) {
+        Log.w("ContainerManager", "migrateInPrefixSaveData: error migrating " + sub, e);
+      }
+    }
+  }
+
+  private boolean copyWinePrefixTree(File source, File target) {
+    if (source == null || target == null || !source.exists()) return false;
+
+    if (FileUtils.isSymlink(source)) {
+      File parent = target.getParentFile();
+      if (parent != null && !parent.isDirectory() && !parent.mkdirs()) return false;
+      FileUtils.symlink(FileUtils.readSymlink(source), target.getAbsolutePath());
+      return FileUtils.isSymlink(target);
+    }
+
+    if (source.isDirectory()) {
+      if (!target.isDirectory() && !target.mkdirs()) return false;
+      File[] children = source.listFiles();
+      if (children == null) return true;
+      for (File child : children) {
+        if (!copyWinePrefixTree(child, new File(target, child.getName()))) return false;
+      }
+      return true;
+    }
+
+    return FileUtils.copy(source, target);
+  }
+
   public Container getContainerForShortcut(Shortcut shortcut) {
-    // Search for the container by its ID
     for (Container container : containers) {
       if (container.id == shortcut.getContainerId()) {
         return container;
       }
     }
-    return null; // Return null if no matching container is found
+    return null;
   }
 
-  // Utility method to run on UI thread
   private void runOnUiThread(Runnable action) {
     new Handler(Looper.getMainLooper()).post(action);
   }
diff --git a/app/src/main/runtime/container/Shortcut.java b/app/src/main/runtime/container/Shortcut.java
index 894a2b838..ffae664ed 100644
--- a/app/src/main/runtime/container/Shortcut.java
+++ b/app/src/main/runtime/container/Shortcut.java
@@ -177,26 +177,6 @@ private void loadCoverArt() {
         saveData(); // Save it to the file so we don't have to extract it again
         return;
       }
-
-      // B. Fallback: If the EXE has no icon, scan the game folder for any .jpg or .png
-      File gameDir = exeFile.isDirectory() ? exeFile : exeFile.getParentFile();
-      if (gameDir != null && gameDir.exists()) {
-        File[] candidates =
-            gameDir.listFiles(
-                (dir, name) -> {
-                  String lower = name.toLowerCase();
-                  return lower.endsWith(".jpg")
-                      || lower.endsWith(".jpeg")
-                      || lower.endsWith(".png");
-                });
-        if (candidates != null && candidates.length > 0) {
-          this.customCoverArtPath = candidates[0].getAbsolutePath();
-          this.coverArt = BitmapFactory.decodeFile(customCoverArtPath);
-          putExtra("customCoverArtPath", customCoverArtPath);
-          saveData();
-          return;
-        }
-      }
     }
 
     // 4. Final Fallback: standard cover art location
@@ -404,9 +384,12 @@ public boolean cloneToContainer(Container newContainer) {
       boolean containerIdFound = false;
 
       for (String line : lines) {
-        if (line.startsWith("container_id:")) {
-          // Update the container_id to the new container
-          updatedContent.append("container_id:").append(newContainer.id).append("\n");
+        String trimmed = line.trim();
+        // MSLink writes the '=' form, which the ':'-only match missed.
+        boolean colon = trimmed.startsWith("container_id:");
+        if (colon || trimmed.startsWith("container_id=")) {
+          updatedContent.append("container_id").append(colon ? ':' : '=')
+              .append(newContainer.id).append("\n");
           containerIdFound = true;
         } else {
           updatedContent.append(line).append("\n");
diff --git a/app/src/main/runtime/container/WinComponentSetup.kt b/app/src/main/runtime/container/WinComponentSetup.kt
new file mode 100644
index 000000000..8c811c7d0
--- /dev/null
+++ b/app/src/main/runtime/container/WinComponentSetup.kt
@@ -0,0 +1,145 @@
+package com.winlator.cmod.runtime.container
+
+import android.content.Context
+import android.util.Log
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.wine.WineInfo
+import com.winlator.cmod.runtime.wine.WineUtils
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.io.TarCompressorUtils
+import com.winlator.cmod.shared.util.KeyValueSet
+import com.winlator.cmod.shared.util.OnExtractFileListener
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.File
+
+object WinComponentSetup {
+    private const val TAG = "WinComponentSetup"
+
+    @JvmStatic
+    fun applyWinComponents(
+        context: Context,
+        imageFs: ImageFs,
+        wineInfo: WineInfo,
+        container: Container,
+        wincomponents: String,
+        previousWincomponents: String,
+        firstTimeBoot: Boolean,
+        onExtractFileListener: OnExtractFileListener?,
+    ) {
+        Log.d(TAG, "Applying WinComponents")
+
+        val rootDir = imageFs.rootDir
+        val windowsDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+        val systemRegFile = File(rootDir, ImageFs.WINEPREFIX + "/system.reg")
+
+        try {
+            val wincomponentsStr = FileUtils.readString(context, "wincomponents/wincomponents.json")
+            val wincomponentsJson = JSONObject(wincomponentsStr ?: "{}")
+            val dlls = ArrayList<String>()
+            val oldValues = HashMap<String, String>()
+            for (old in KeyValueSet(previousWincomponents.ifEmpty { Container.FALLBACK_WINCOMPONENTS })) {
+                oldValues[old[0]] = old[1]
+            }
+
+            for (wincomponent in KeyValueSet(wincomponents)) {
+                val identifier = wincomponent[0]
+                val useNative = wincomponent[1] == "1"
+                val oldValue = oldValues[identifier]
+                if (wincomponent[1] == oldValue && !firstTimeBoot) continue
+
+                if (useNative) {
+                    extractNativeWinComponent(context, identifier, windowsDir, onExtractFileListener)
+                } else {
+                    dlls.addAll(wineDllsForComponentRestore(wincomponentsJson, identifier))
+                }
+
+                Log.d(TAG, "Setting wincomponent $identifier to $useNative")
+                WineUtils.overrideWinComponentDlls(context, container, identifier, useNative)
+                WineUtils.setWinComponentRegistryKeys(systemRegFile, identifier, useNative, context)
+            }
+
+            if (dlls.isNotEmpty()) restoreWineBuiltinDllFiles(imageFs, wineInfo, *dlls.toTypedArray())
+        } catch (e: JSONException) {
+            Log.w(TAG, "Failed to parse WinComponents metadata", e)
+        }
+    }
+
+    @JvmStatic
+    fun restoreWineBuiltinDllFiles(
+        imageFs: ImageFs,
+        wineInfo: WineInfo,
+        vararg dlls: String,
+    ) {
+        val windowsDir = File(imageFs.rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+
+        // Pick the Wine DLL directory that matches system32 for this prefix:
+        // x86_64 Wine uses x86_64-windows, ARM64EC Wine uses aarch64-windows.
+        val wineSystem32Dlls = wineSystem32DllDir(imageFs, wineInfo)
+        val wineSyswow64Dlls = File(imageFs.winePath + "/lib/wine/i386-windows")
+
+        for (dll in dlls) {
+            restoreOneWineDll(File(wineSystem32Dlls, dll), File(windowsDir, "system32/$dll"))
+            restoreOneWineDll(File(wineSyswow64Dlls, dll), File(windowsDir, "syswow64/$dll"))
+        }
+    }
+
+    private fun extractNativeWinComponent(
+        context: Context,
+        identifier: String,
+        windowsDir: File,
+        onExtractFileListener: OnExtractFileListener?,
+    ) {
+        TarCompressorUtils.extract(
+            TarCompressorUtils.Type.ZSTD,
+            context,
+            "wincomponents/$identifier.tzst",
+            windowsDir,
+            onExtractFileListener,
+        )
+    }
+
+    private fun wineDllsForComponentRestore(
+        wincomponentsJson: JSONObject,
+        identifier: String,
+    ): List<String> {
+        val dlnames = wincomponentsJson.getJSONArray(identifier)
+        val dlls = ArrayList<String>(dlnames.length())
+        for (i in 0 until dlnames.length()) {
+            val dlname = dlnames.getString(i)
+            dlls.add(if (dlname.endsWith(".exe")) dlname else "$dlname.dll")
+        }
+        return dlls
+    }
+
+    private fun wineSystem32DllDir(
+        imageFs: ImageFs,
+        wineInfo: WineInfo,
+    ): File =
+        // ARM64EC Wine keeps ARM64/ARM64EC DLLs in aarch64-windows; regular
+        // x86_64 Wine keeps x64 DLLs in x86_64-windows.
+        if (wineInfo.isArm64EC) {
+            File(imageFs.winePath + "/lib/wine/aarch64-windows")
+        } else {
+            File(imageFs.winePath + "/lib/wine/x86_64-windows")
+        }
+
+    private fun restoreOneWineDll(
+        srcFile: File,
+        dstFile: File,
+    ) {
+        if (srcFile.exists()) {
+            if (!FileUtils.copy(srcFile, dstFile)) {
+                Log.w(TAG, "restoreWineBuiltinDllFiles: copy failed $srcFile -> $dstFile")
+            }
+            return
+        }
+        if (dstFile.exists()) {
+            if (dstFile.delete()) {
+                Log.w(TAG, "restoreWineBuiltinDllFiles: no source for $srcFile, deleted stale $dstFile")
+            } else {
+                Log.e(TAG, "restoreWineBuiltinDllFiles: no source for $srcFile and failed to delete stale $dstFile")
+            }
+        }
+    }
+}
diff --git a/app/src/main/runtime/content/ContentProfile.java b/app/src/main/runtime/content/ContentProfile.java
index a868c6978..cd4ada3d3 100644
--- a/app/src/main/runtime/content/ContentProfile.java
+++ b/app/src/main/runtime/content/ContentProfile.java
@@ -17,11 +17,13 @@ public class ContentProfile {
   public static final String MARK_WINE_BINPATH = "binPath";
   public static final String MARK_WINE_LIBPATH = "libPath";
   public static final String MARK_WINE_PREFIX_PACK = "prefixPack";
+  public static final String MARK_OFFICIAL = "official";
 
   public enum ContentType {
     CONTENT_TYPE_WINE("Wine"),
     CONTENT_TYPE_PROTON("Proton"),
     CONTENT_TYPE_DXVK("DXVK"),
+    CONTENT_TYPE_D7VK("D7VK"),
     CONTENT_TYPE_VKD3D("VKD3D"),
     CONTENT_TYPE_BOX64("Box64"),
     CONTENT_TYPE_WOWBOX64("WOWBox64"),
@@ -60,4 +62,6 @@ public static class ContentFile {
   public String winePrefixPack;
   public String remoteUrl;
   public boolean isInstalled;
+  /** True for first-party "WinNative" builds, flagged via "official" in contents.json. */
+  public boolean isOfficial;
 }
diff --git a/app/src/main/runtime/content/ContentsManager.java b/app/src/main/runtime/content/ContentsManager.java
index 08eac113c..c9d22b057 100644
--- a/app/src/main/runtime/content/ContentsManager.java
+++ b/app/src/main/runtime/content/ContentsManager.java
@@ -17,6 +17,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -25,7 +26,7 @@
 public class ContentsManager {
   public static final String PROFILE_NAME = "profile.json";
   public static final String REMOTE_PROFILES =
-      "https://raw.githubusercontent.com/Xnick417x/winlator-nightly-wcp/refs/heads/main/contents.json";
+      "https://raw.githubusercontent.com/nicholasx417/WinNative-Components/refs/heads/main/contents.json";
   private static final long EXTRACTION_PROGRESS_INTERVAL_MS = 120L;
   public static final String[] DXVK_TRUST_FILES = {
     "${system32}/d3d8.dll",
@@ -116,6 +117,12 @@ public interface OnInstallFinishedCallback {
    */
   public interface OnExtractionProgressListener {
     void onProgress(int filesExtracted, String currentFileName);
+
+    default boolean prefersByteProgress() {
+      return false;
+    }
+
+    default void onByteProgress(long bytesExtracted) {}
   }
 
   public void setRemoteProfiles(String json) {
@@ -130,6 +137,8 @@ public void setRemoteProfiles(String json) {
           remoteProfile.type = ContentProfile.ContentType.getTypeByName(object.getString("type"));
           remoteProfile.verName = object.getString("verName");
           remoteProfile.verCode = object.getInt("verCode");
+          remoteProfile.isOfficial =
+              parseOfficialFlag(object.opt(ContentProfile.MARK_OFFICIAL));
           remoteProfiles.add(remoteProfile);
         } catch (JSONException e) {
           e.printStackTrace();
@@ -141,6 +150,18 @@ public void setRemoteProfiles(String json) {
     syncContents();
   }
 
+  /**
+   * Interprets the optional "official" marker. Accepts a string ("1"/"true"/"yes"), a number
+   * (non-zero), or a boolean so the contents.json author can use whichever form is convenient.
+   */
+  private static boolean parseOfficialFlag(Object value) {
+    if (value == null) return false;
+    if (value instanceof Boolean) return (Boolean) value;
+    if (value instanceof Number) return ((Number) value).intValue() != 0;
+    String s = value.toString().trim();
+    return s.equals("1") || s.equalsIgnoreCase("true") || s.equalsIgnoreCase("yes");
+  }
+
   public void syncContents() {
     profilesMap = new HashMap<>();
 
@@ -223,22 +244,12 @@ public void extraContentFile(
 
     File file = getTmpDir(context);
 
-    // Count extracted files for progress
     final int[] fileCount = {0};
+    final long[] extractedBytes = {0L};
     final long[] lastProgressUpdateMs = {0L};
     OnExtractFileListener extractListener =
-        progressListener != null
-            ? (destination, size) -> {
-              fileCount[0]++;
-              long now = System.currentTimeMillis();
-              if (fileCount[0] <= 3
-                  || now - lastProgressUpdateMs[0] >= EXTRACTION_PROGRESS_INTERVAL_MS) {
-                progressListener.onProgress(fileCount[0], destination.getName());
-                lastProgressUpdateMs[0] = now;
-              }
-              return destination;
-            }
-            : null;
+        createExtractionProgressListener(
+            progressListener, fileCount, extractedBytes, lastProgressUpdateMs);
 
     boolean ret;
     TarCompressorUtils.Type primaryType = detectCompressionType(context, uri);
@@ -250,6 +261,7 @@ public void extraContentFile(
     ret = TarCompressorUtils.extract(primaryType, context, uri, file, extractListener);
     if (!ret) {
       fileCount[0] = 0;
+      extractedBytes[0] = 0L;
       lastProgressUpdateMs[0] = 0L;
       ret = TarCompressorUtils.extract(fallbackType, context, uri, file, extractListener);
     }
@@ -309,6 +321,50 @@ public void extraContentFile(
     callback.onSucceed(profile);
   }
 
+  private static OnExtractFileListener createExtractionProgressListener(
+      OnExtractionProgressListener progressListener,
+      int[] fileCount,
+      long[] extractedBytes,
+      long[] lastProgressUpdateMs) {
+    if (progressListener == null) return null;
+
+    if (progressListener.prefersByteProgress()) {
+      return new OnExtractFileListener() {
+        @Override
+        public File onExtractFile(File destination, long size) {
+          return destination;
+        }
+
+        @Override
+        public boolean mapsExtractedFiles() {
+          return false;
+        }
+
+        @Override
+        public boolean reportsExtractedBytesOnly() {
+          return true;
+        }
+
+        @Override
+        public void onExtractedBytes(long size) {
+          if (size <= 0) return;
+          extractedBytes[0] += size;
+          progressListener.onByteProgress(extractedBytes[0]);
+        }
+      };
+    }
+
+    return (destination, size) -> {
+      fileCount[0]++;
+      long now = System.currentTimeMillis();
+      if (fileCount[0] <= 3 || now - lastProgressUpdateMs[0] >= EXTRACTION_PROGRESS_INTERVAL_MS) {
+        progressListener.onProgress(fileCount[0], destination.getName());
+        lastProgressUpdateMs[0] = now;
+      }
+      return destination;
+    };
+  }
+
   public void finishInstallContent(ContentProfile profile, OnInstallFinishedCallback callback) {
     File installPath = getInstallDir(context, profile);
     if (installPath.exists()) {
@@ -403,6 +459,7 @@ public ContentProfile readProfile(File file) {
       profile.verCode = verCode;
       profile.desc = desc;
       profile.fileList = fileList;
+      profile.isOfficial = parseOfficialFlag(profileJSONObject.opt(ContentProfile.MARK_OFFICIAL));
       profile.isInstalled = isInstalled(context, profile);
       return profile;
     } catch (Exception e) {
@@ -620,6 +677,9 @@ private void mergeRemoteMetadata(ContentProfile localProfile, ContentProfile rem
     if (localProfile.remoteUrl == null) {
       localProfile.remoteUrl = remoteProfile.remoteUrl;
     }
+    if (remoteProfile.isOfficial) {
+      localProfile.isOfficial = true;
+    }
     localProfile.isInstalled = true;
   }
 
@@ -691,6 +751,69 @@ public ContentProfile getProfileByEntryName(String entryName) {
     return null;
   }
 
+  public boolean profileHasUnixLibs(ContentProfile profile) {
+    if (profile == null) return false;
+    return dirContainsSharedObject(getInstallDir(context, profile));
+  }
+
+  public boolean fexcoreVersionHasUnixLibs(String fexcoreVersion) {
+    if (fexcoreVersion == null || fexcoreVersion.isEmpty()) return false;
+    return profileHasUnixLibs(getProfileByEntryName("fexcore-" + fexcoreVersion));
+  }
+
+  private static boolean dirContainsSharedObject(File dir) {
+    if (dir == null) return false;
+    File[] files = dir.listFiles();
+    if (files == null) return false;
+    for (File file : files) {
+      if (file.isDirectory()) {
+        if (dirContainsSharedObject(file)) return true;
+      } else if (isSharedObject(file.getName())) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static boolean isSharedObject(String name) {
+    String lower = name.toLowerCase(Locale.ROOT);
+    return lower.endsWith(".so") || lower.contains(".so.");
+  }
+
+  public void removeAppliedUnixLibs(ContentProfile profile) {
+    if (profile == null || profile.fileList == null) return;
+    for (ContentProfile.ContentFile contentFile : profile.fileList) {
+      if (!isSharedObject(new File(contentFile.target).getName())) continue;
+      File targetFile = new File(getPathFromTemplate(contentFile.target));
+      if (targetFile.exists() && targetFile.delete()) {
+        Log.i("ContentsManager", "UnixLibs: removed " + targetFile.getName());
+      }
+    }
+  }
+
+  public void copyUnixLibsToDir(ContentProfile profile, File destDir) {
+    if (profile == null || profile.fileList == null) return;
+    for (ContentProfile.ContentFile contentFile : profile.fileList) {
+      String name = new File(contentFile.target).getName();
+      if (!isSharedObject(name)) continue;
+      File sourceFile = new File(getInstallDir(context, profile), contentFile.source);
+      if (!sourceFile.exists()) continue;
+      File destFile = new File(destDir, name);
+      FileUtils.copy(sourceFile, destFile);
+      FileUtils.chmod(destFile, 0771);
+    }
+  }
+
+  public void deleteUnixLibsFromDir(ContentProfile profile, File destDir) {
+    if (profile == null || profile.fileList == null) return;
+    for (ContentProfile.ContentFile contentFile : profile.fileList) {
+      String name = new File(contentFile.target).getName();
+      if (!isSharedObject(name)) continue;
+      File destFile = new File(destDir, name);
+      if (destFile.exists()) destFile.delete();
+    }
+  }
+
   public boolean applyContent(ContentProfile profile) {
     if (profile.type != ContentProfile.ContentType.CONTENT_TYPE_WINE
         && profile.type != ContentProfile.ContentType.CONTENT_TYPE_PROTON) {
@@ -701,7 +824,8 @@ public boolean applyContent(ContentProfile profile) {
         targetFile.delete();
         FileUtils.copy(sourceFile, targetFile);
 
-        if (profile.type == ContentProfile.ContentType.CONTENT_TYPE_BOX64) {
+        if (profile.type == ContentProfile.ContentType.CONTENT_TYPE_BOX64
+            || isSharedObject(targetFile.getName())) {
           FileUtils.chmod(targetFile, 0771);
         }
       }
diff --git a/app/src/main/runtime/content/Downloader.java b/app/src/main/runtime/content/Downloader.java
deleted file mode 100644
index 5aa5d22dd..000000000
--- a/app/src/main/runtime/content/Downloader.java
+++ /dev/null
@@ -1,520 +0,0 @@
-package com.winlator.cmod.runtime.content;
-
-/**
- * Shared download helper with WinNative.dev-first resolution.
- *
- * <p>On first use the class loads a cached filename → full-URL map from app storage when it is
- * still fresh enough; otherwise it recursively crawls https://WinNative.dev/Downloads/ and every
- * subdirectory it finds to rebuild that map. When any download is requested, the filename from the
- * original (GitHub) URL is looked up in the map. If the file exists on WinNative.dev the download
- * is attempted from there first; only if it fails does it fall back to the original URL.
- */
-import android.content.Context;
-import android.util.Log;
-import androidx.preference.PreferenceManager;
-import com.winlator.cmod.app.PluviaApp;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-import okio.BufferedSource;
-
-public class Downloader {
-
-  private static final String TAG = "Downloader";
-  private static final String WINNATIVE_ROOT = "https://WinNative.dev/Downloads/";
-  private static final int MAX_CRAWL_DEPTH = 10;
-  private static final int READ_BUFFER_SIZE = 256 * 1024; // 256 KB — fewer syscalls per read cycle
-
-  /**
-   * Shared OkHttpClient for file downloads. - HTTP/2 + connection pooling so the 2nd+ downloads to
-   * the same host skip TCP handshake and slow-start entirely - Connections stay warm for 5 minutes
-   * across sequential component installs
-   */
-  private static final OkHttpClient FILE_CLIENT =
-      new OkHttpClient.Builder()
-          .connectTimeout(15, TimeUnit.SECONDS)
-          .readTimeout(30, TimeUnit.SECONDS)
-          .connectionPool(new ConnectionPool(8, 5, TimeUnit.MINUTES))
-          .retryOnConnectionFailure(true)
-          .followRedirects(true)
-          .followSslRedirects(true)
-          .build();
-
-  /**
-   * Lightweight client for short string fetches (JSON, directory listings). Shares the same
-   * connection pool as file downloads so that a directory crawl warms up connections for subsequent
-   * file downloads.
-   */
-  private static final OkHttpClient STRING_CLIENT =
-      FILE_CLIENT
-          .newBuilder()
-          .connectTimeout(5, TimeUnit.SECONDS)
-          .readTimeout(10, TimeUnit.SECONDS)
-          .build();
-
-  private static final Pattern HREF_PATTERN = Pattern.compile("href=\"([^\"?]+)\"");
-  private static final String FILE_MAP_CACHE_NAME = "winnative_file_map_v1.txt";
-  private static final String FILE_MAP_CACHE_HEADER_PREFIX = "# timestamp=";
-  private static final long FILE_MAP_CACHE_TTL_MS = 24L * 60L * 60L * 1000L;
-
-  private static volatile boolean logEnabledCached = false;
-  private static volatile boolean logEnabledResolved = false;
-
-  /** Returns true only if the user has enabled download logging in Debug settings. */
-  private static boolean logEnabled() {
-    if (logEnabledResolved) return logEnabledCached;
-    try {
-      Context ctx = getAppContext();
-      if (ctx == null) return false;
-      logEnabledCached =
-          PreferenceManager.getDefaultSharedPreferences(ctx)
-              .getBoolean("enable_download_logs", false);
-      logEnabledResolved = true;
-      return logEnabledCached;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  static void refreshLogEnabled() {
-    logEnabledResolved = false;
-  }
-
-  private static Context getAppContext() {
-    try {
-      return PluviaApp.Companion.getInstance().getApplicationContext();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  private static File getFileMapCacheFile() {
-    Context context = getAppContext();
-    return context != null ? new File(context.getFilesDir(), FILE_MAP_CACHE_NAME) : null;
-  }
-
-  // ---- Global file map (filename-lowercase → full download URL) ----
-  private static final ConcurrentHashMap<String, String> fileMap = new ConcurrentHashMap<>();
-  private static volatile boolean fileMapReady = false;
-  private static final Object mapLock = new Object();
-
-  // ----------------------------------------------------------------
-  //  Public listener
-  // ----------------------------------------------------------------
-  public interface DownloadListener {
-    void onProgress(long downloadedBytes, long totalBytes);
-  }
-
-  // ----------------------------------------------------------------
-  //  WinNative-first download  (primary API)
-  // ----------------------------------------------------------------
-
-  /**
-   * Downloads a file, trying WinNative.dev first for the same filename, falling back to the
-   * original URL if WinNative.dev fails or does not host the file.
-   *
-   * @param originalUrl The original (typically GitHub) download URL.
-   * @param file Destination file.
-   * @param listener Optional progress callback.
-   * @return true if the file was downloaded successfully from either source.
-   */
-  public static boolean downloadFileWinNativeFirst(
-      String originalUrl, File file, DownloadListener listener) {
-    String filename = extractFilename(originalUrl);
-    if (filename != null) {
-      ensureFileMap();
-      String winUrl = fileMap.get(filename.toLowerCase(Locale.ROOT));
-      if (winUrl != null) {
-        if (logEnabled()) Log.d(TAG, "WinNative URL resolved: " + winUrl);
-        if (downloadFile(winUrl, file, listener)) {
-          if (logEnabled()) Log.d(TAG, "Download succeeded from WinNative.dev");
-          return true;
-        }
-        if (logEnabled()) Log.w(TAG, "WinNative download failed, falling back to: " + originalUrl);
-        file.delete();
-      } else {
-        if (logEnabled())
-          Log.d(TAG, "File not found on WinNative.dev, using original: " + originalUrl);
-      }
-    }
-    return downloadFile(originalUrl, file, listener);
-  }
-
-  /**
-   * Legacy wrapper – delegates to {@link #downloadFileWinNativeFirst}. Kept for call-sites that
-   * still pass a contentType (ignored now).
-   */
-  public static boolean downloadFileWithFallback(
-      String contentType, String originalUrl, File file, DownloadListener listener) {
-    return downloadFileWinNativeFirst(originalUrl, file, listener);
-  }
-
-  // ----------------------------------------------------------------
-  //  File-map build / lookup
-  // ----------------------------------------------------------------
-
-  /**
-   * Ensures the file map has been built at least once this session. Safe to call from any thread;
-   * only the first caller actually crawls.
-   */
-  public static void ensureFileMap() {
-    if (fileMapReady) return;
-    synchronized (mapLock) {
-      if (fileMapReady) return;
-      refreshLogEnabled();
-      if (!loadFileMapFromDisk()) {
-        buildFileMap();
-        persistFileMap();
-      }
-      fileMapReady = true;
-    }
-  }
-
-  /**
-   * Forces a fresh crawl of WinNative.dev/Downloads/ on next access. Call at the start of a wizard
-   * session so newly-uploaded files are found.
-   */
-  public static void clearFileMap() {
-    synchronized (mapLock) {
-      fileMap.clear();
-      fileMapReady = false;
-      File cacheFile = getFileMapCacheFile();
-      if (cacheFile != null && cacheFile.exists() && !cacheFile.delete() && logEnabled()) {
-        Log.w(TAG, "Unable to delete WinNative file map cache: " + cacheFile.getAbsolutePath());
-      }
-    }
-  }
-
-  /**
-   * @deprecated Use {@link #clearFileMap()} instead.
-   */
-  @Deprecated
-  public static void clearDirectoryCache() {
-    clearFileMap();
-  }
-
-  /** Returns the resolved WinNative URL for a given filename, or null if not hosted. */
-  public static String resolveWinNativeUrl(String filename) {
-    if (filename == null) return null;
-    ensureFileMap();
-    return fileMap.get(filename.toLowerCase(Locale.ROOT));
-  }
-
-  /** Variant that accepts (and ignores) a contentType for back-compat. */
-  public static String resolveWinNativeUrl(String contentType, String filename) {
-    return resolveWinNativeUrl(filename);
-  }
-
-  // ----------------------------------------------------------------
-  //  Recursive directory crawler
-  // ----------------------------------------------------------------
-
-  /**
-   * Recursively crawls {@link #WINNATIVE_ROOT} and populates {@link #fileMap} with every
-   * downloadable file found (filename-lowercase → full URL).
-   */
-  private static void buildFileMap() {
-    if (logEnabled()) Log.d(TAG, "Building WinNative file map from " + WINNATIVE_ROOT);
-    long start = System.currentTimeMillis();
-    fileMap.clear();
-    crawlDirectory(WINNATIVE_ROOT, 0);
-    if (logEnabled())
-      Log.d(
-          TAG,
-          "WinNative file map built: "
-              + fileMap.size()
-              + " files in "
-              + (System.currentTimeMillis() - start)
-              + "ms");
-  }
-
-  private static boolean loadFileMapFromDisk() {
-    File cacheFile = getFileMapCacheFile();
-    if (cacheFile == null || !cacheFile.isFile()) {
-      return false;
-    }
-
-    fileMap.clear();
-    try (BufferedReader reader =
-        new BufferedReader(
-            new InputStreamReader(new FileInputStream(cacheFile), StandardCharsets.UTF_8))) {
-      String header = reader.readLine();
-      if (header == null || !header.startsWith(FILE_MAP_CACHE_HEADER_PREFIX)) {
-        return false;
-      }
-
-      long timestamp =
-          Long.parseLong(header.substring(FILE_MAP_CACHE_HEADER_PREFIX.length()).trim());
-      long ageMs = System.currentTimeMillis() - timestamp;
-      if (ageMs > FILE_MAP_CACHE_TTL_MS) {
-        if (!cacheFile.delete() && logEnabled()) {
-          Log.w(TAG, "Unable to delete expired WinNative file map cache");
-        }
-        return false;
-      }
-
-      String line;
-      while ((line = reader.readLine()) != null) {
-        int separatorIndex = line.indexOf('\t');
-        if (separatorIndex <= 0 || separatorIndex >= line.length() - 1) {
-          continue;
-        }
-        fileMap.putIfAbsent(line.substring(0, separatorIndex), line.substring(separatorIndex + 1));
-      }
-    } catch (Exception e) {
-      if (logEnabled()) Log.w(TAG, "Failed to load WinNative file map cache", e);
-      fileMap.clear();
-      return false;
-    }
-
-    if (fileMap.isEmpty()) {
-      return false;
-    }
-
-    if (logEnabled()) {
-      Log.d(TAG, "Loaded WinNative file map cache: " + fileMap.size() + " files");
-    }
-    return true;
-  }
-
-  private static void persistFileMap() {
-    if (fileMap.isEmpty()) {
-      return;
-    }
-
-    File cacheFile = getFileMapCacheFile();
-    if (cacheFile == null) {
-      return;
-    }
-
-    File tempFile = new File(cacheFile.getParentFile(), cacheFile.getName() + ".tmp");
-    try (BufferedWriter writer =
-        new BufferedWriter(
-            new OutputStreamWriter(new FileOutputStream(tempFile), StandardCharsets.UTF_8))) {
-      writer.write(FILE_MAP_CACHE_HEADER_PREFIX);
-      writer.write(Long.toString(System.currentTimeMillis()));
-      writer.newLine();
-
-      for (Map.Entry<String, String> entry : fileMap.entrySet()) {
-        String value = entry.getValue();
-        if (value == null || value.isEmpty()) {
-          continue;
-        }
-        writer.write(entry.getKey());
-        writer.write('\t');
-        writer.write(value);
-        writer.newLine();
-      }
-    } catch (Exception e) {
-      if (logEnabled()) Log.w(TAG, "Failed to persist WinNative file map cache", e);
-      tempFile.delete();
-      return;
-    }
-
-    if (cacheFile.exists() && !cacheFile.delete() && logEnabled()) {
-      Log.w(TAG, "Unable to replace existing WinNative file map cache");
-    }
-    if (!tempFile.renameTo(cacheFile) && logEnabled()) {
-      Log.w(TAG, "Unable to finalize WinNative file map cache write");
-    }
-  }
-
-  /**
-   * Fetches a single directory listing page, adds any file entries to the map, and recurses into
-   * subdirectories up to {@link #MAX_CRAWL_DEPTH}.
-   */
-  private static void crawlDirectory(String dirUrl, int depth) {
-    if (depth > MAX_CRAWL_DEPTH) return;
-
-    String html;
-    try {
-      html = downloadString(dirUrl);
-    } catch (Exception e) {
-      if (logEnabled()) Log.w(TAG, "Crawl failed for " + dirUrl + ": " + e.getMessage());
-      return;
-    }
-    if (html == null) return;
-
-    // Parse href entries from Apache-style "Index of" listing
-    Matcher matcher = HREF_PATTERN.matcher(html);
-    List<String> subdirs = new ArrayList<>();
-
-    while (matcher.find()) {
-      String href = matcher.group(1);
-      // Skip absolute paths, parent directory, and sorting query links
-      if (href.startsWith("/")
-          || href.startsWith("..")
-          || href.startsWith("?")
-          || href.startsWith("http")) {
-        continue;
-      }
-
-      if (href.endsWith("/")) {
-        // It's a subdirectory – queue for recursive crawl
-        subdirs.add(dirUrl + href);
-      } else {
-        // It's a file – add to the map (lowercase key for case-insensitive lookup)
-        String key = href.toLowerCase(Locale.ROOT);
-        String fullUrl = dirUrl + href;
-        // If duplicate filename across folders, keep the first one found
-        // (closest to root = most likely the canonical location)
-        fileMap.putIfAbsent(key, fullUrl);
-      }
-    }
-
-    // Recurse into subdirectories
-    for (String subdir : subdirs) {
-      crawlDirectory(subdir, depth + 1);
-    }
-  }
-
-  // ----------------------------------------------------------------
-  //  Core download methods
-  // ----------------------------------------------------------------
-
-  /** Extracts the filename (last path segment) from a URL. */
-  public static String extractFilename(String url) {
-    if (url == null) return null;
-    try {
-      String path = new URL(url).getPath();
-      int lastSlash = path.lastIndexOf('/');
-      if (lastSlash >= 0 && lastSlash < path.length() - 1) {
-        return path.substring(lastSlash + 1);
-      }
-    } catch (Exception ignored) {
-      int queryStart = url.indexOf('?');
-      String pathOnly = queryStart >= 0 ? url.substring(0, queryStart) : url;
-      int lastSlash = pathOnly.lastIndexOf('/');
-      if (lastSlash >= 0 && lastSlash < pathOnly.length() - 1) {
-        return pathOnly.substring(lastSlash + 1);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Downloads a file from the given address with progress reporting. Uses OkHttp with HTTP/2 and
-   * connection pooling for fast ramp-up.
-   */
-  public static boolean downloadFile(String address, File file, DownloadListener listener) {
-    try {
-      File parent = file.getParentFile();
-      if (parent != null && !parent.exists() && !parent.mkdirs()) {
-        if (logEnabled())
-          Log.w(TAG, "Unable to create download directory: " + parent.getAbsolutePath());
-        return false;
-      }
-
-      Request request =
-          new Request.Builder().url(address).header("Accept-Encoding", "identity").build();
-
-      try (Response response = FILE_CLIENT.newCall(request).execute()) {
-        if (!response.isSuccessful()) {
-          throw new IllegalStateException("HTTP " + response.code() + " for " + address);
-        }
-
-        ResponseBody body = response.body();
-        if (body == null) {
-          throw new IllegalStateException("Empty response body for " + address);
-        }
-
-        long lengthOfFile = body.contentLength();
-        long total = 0;
-        long lastUpdateTime = 0;
-
-        if (listener != null) {
-          listener.onProgress(0, lengthOfFile);
-        }
-
-        try (BufferedSource source = body.source();
-            FileOutputStream fos = new FileOutputStream(file)) {
-          Buffer buffer = new Buffer();
-          long bytesRead;
-
-          while ((bytesRead = source.read(buffer, READ_BUFFER_SIZE)) != -1) {
-            buffer.writeTo(fos);
-            total += bytesRead;
-            if (listener != null) {
-              long currentTime = System.currentTimeMillis();
-              if (currentTime - lastUpdateTime > 80 || total == lengthOfFile) {
-                listener.onProgress(total, lengthOfFile);
-                lastUpdateTime = currentTime;
-              }
-            }
-          }
-
-          fos.flush();
-        }
-
-        if (listener != null) {
-          listener.onProgress(total, total);
-        }
-        return true;
-      }
-    } catch (Exception e) {
-      if (logEnabled()) Log.w(TAG, "Download failed for " + address, e);
-      if (file.exists() && !file.delete() && logEnabled()) {
-        Log.w(TAG, "Unable to delete partial download: " + file.getAbsolutePath());
-      }
-      return false;
-    }
-  }
-
-  public static long fetchContentLength(String address) {
-    if (address == null || address.isEmpty()) return -1L;
-    Request request = new Request.Builder().url(address).head().build();
-    try (Response response = STRING_CLIENT.newCall(request).execute()) {
-      if (!response.isSuccessful()) return -1L;
-      String header = response.header("Content-Length");
-      if (header == null || header.isEmpty()) return -1L;
-      try {
-        return Long.parseLong(header);
-      } catch (NumberFormatException nfe) {
-        return -1L;
-      }
-    } catch (Exception e) {
-      if (logEnabled()) Log.w(TAG, "HEAD failed for " + address, e);
-      return -1L;
-    }
-  }
-
-  /**
-   * Downloads a URL as a String (used for JSON fetches and directory listings). Shares the
-   * connection pool with file downloads so directory crawling warms up connections for subsequent
-   * file downloads.
-   */
-  public static String downloadString(String address) {
-    Request request = new Request.Builder().url(address).build();
-
-    try (Response response = STRING_CLIENT.newCall(request).execute()) {
-      if (!response.isSuccessful()) {
-        throw new IllegalStateException("HTTP " + response.code() + " for " + address);
-      }
-      ResponseBody body = response.body();
-      return body != null ? body.string() : null;
-    } catch (Exception e) {
-      if (logEnabled()) Log.w(TAG, "String download failed for " + address, e);
-      return null;
-    }
-  }
-}
diff --git a/app/src/main/runtime/content/Downloader.kt b/app/src/main/runtime/content/Downloader.kt
new file mode 100644
index 000000000..1acb2d19a
--- /dev/null
+++ b/app/src/main/runtime/content/Downloader.kt
@@ -0,0 +1,386 @@
+package com.winlator.cmod.runtime.content
+
+import android.content.Context
+import android.util.Log
+import androidx.preference.PreferenceManager
+import com.winlator.cmod.app.PluviaApp
+import com.winlator.cmod.shared.io.NativeContentIO
+import okhttp3.ConnectionPool
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.io.BufferedReader
+import java.io.BufferedWriter
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.InputStreamReader
+import java.io.OutputStreamWriter
+import java.net.URL
+import java.nio.charset.StandardCharsets
+import java.util.Locale
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
+
+/**
+ * Native-backed component download helper with WinNative.dev-first URL resolution.
+ *
+ * Large file transfers use [NativeContentIO] / libcurl. OkHttp is retained only for small metadata
+ * requests such as remote JSON and WinNative.dev directory listings.
+ */
+object Downloader {
+    private const val TAG = "Downloader"
+    private const val WINNATIVE_ROOT = "https://WinNative.dev/Downloads/"
+    private const val MAX_CRAWL_DEPTH = 10
+    private const val FILE_MAP_CACHE_NAME = "winnative_file_map_v1.txt"
+    private const val FILE_MAP_CACHE_HEADER_PREFIX = "# timestamp="
+    private const val FILE_MAP_CACHE_TTL_MS = 24L * 60L * 60L * 1000L
+    private const val NATIVE_CA_BUNDLE_NAME = "native_curl_cacert.pem"
+    private const val SYSTEM_CA_DIR = "/system/etc/security/cacerts"
+
+    private val metadataClient =
+        OkHttpClient
+            .Builder()
+            .connectTimeout(5, TimeUnit.SECONDS)
+            .readTimeout(10, TimeUnit.SECONDS)
+            .connectionPool(ConnectionPool(8, 5, TimeUnit.MINUTES))
+            .retryOnConnectionFailure(true)
+            .followRedirects(true)
+            .followSslRedirects(true)
+            .build()
+
+    private val hrefPattern = Pattern.compile("href=\"([^\"?]+)\"")
+    private val fileMap = ConcurrentHashMap<String, String>()
+    private val mapLock = Any()
+
+    @Volatile private var fileMapReady = false
+    @Volatile private var logEnabledCached = false
+    @Volatile private var logEnabledResolved = false
+    @Volatile private var nativeCaBundlePath: String? = null
+
+    fun interface DownloadListener {
+        fun onProgress(
+            downloadedBytes: Long,
+            totalBytes: Long,
+        )
+    }
+
+    @JvmStatic
+    fun downloadFileWinNativeFirst(
+        originalUrl: String,
+        file: File,
+        listener: DownloadListener?,
+    ): Boolean {
+        val filename = extractFilename(originalUrl)
+        if (filename != null) {
+            ensureFileMap()
+            val winUrl = fileMap[filename.lowercase(Locale.ROOT)]
+            if (winUrl != null) {
+                if (logEnabled()) Log.d(TAG, "WinNative URL resolved: $winUrl")
+                if (downloadFile(winUrl, file, listener)) {
+                    if (logEnabled()) Log.d(TAG, "Download succeeded from WinNative.dev")
+                    return true
+                }
+                if (logEnabled()) Log.w(TAG, "WinNative download failed, falling back to: $originalUrl")
+                file.delete()
+            } else if (logEnabled()) {
+                Log.d(TAG, "File not found on WinNative.dev, using original: $originalUrl")
+            }
+        }
+        return downloadFile(originalUrl, file, listener)
+    }
+
+    @JvmStatic
+    fun resolveWinNativeUrl(filename: String?): String? {
+        if (filename == null) return null
+        ensureFileMap()
+        return fileMap[filename.lowercase(Locale.ROOT)]
+    }
+
+    @JvmStatic
+    fun resolveWinNativeUrl(contentType: String?, filename: String?): String? = resolveWinNativeUrl(filename)
+
+    @JvmStatic
+    fun clearFileMap() {
+        synchronized(mapLock) {
+            fileMap.clear()
+            fileMapReady = false
+            fileMapCacheFile()?.let {
+                if (it.exists() && !it.delete() && logEnabled()) {
+                    Log.w(TAG, "Unable to delete WinNative file map cache: ${it.absolutePath}")
+                }
+            }
+        }
+    }
+
+    @JvmStatic
+    @Deprecated("Use clearFileMap() instead.", ReplaceWith("clearFileMap()"))
+    fun clearDirectoryCache() = clearFileMap()
+
+    @JvmStatic
+    fun ensureFileMap() {
+        if (fileMapReady) return
+        synchronized(mapLock) {
+            if (fileMapReady) return
+            refreshLogEnabled()
+            if (!loadFileMapFromDisk()) {
+                buildFileMap()
+                persistFileMap()
+            }
+            fileMapReady = true
+        }
+    }
+
+    private fun extractFilename(url: String?): String? {
+        if (url == null) return null
+        return try {
+            val path = URL(url).path
+            path.substringAfterLast('/').takeIf { it.isNotEmpty() }
+        } catch (_: Exception) {
+            val pathOnly = url.substringBefore('?')
+            pathOnly.substringAfterLast('/').takeIf { it.isNotEmpty() }
+        }
+    }
+
+    @JvmStatic
+    fun downloadFile(
+        address: String,
+        file: File,
+        listener: DownloadListener?,
+    ): Boolean {
+        try {
+            val parent = file.parentFile
+            if (parent != null && !parent.exists() && !parent.mkdirs()) {
+                if (logEnabled()) Log.w(TAG, "Unable to create download directory: ${parent.absolutePath}")
+                return false
+            }
+
+            if (NativeContentIO.downloadFile(address, file, ensureNativeCaBundle(), listener)) {
+                return true
+            }
+        } catch (e: Throwable) {
+            if (logEnabled()) Log.w(TAG, "Download failed for $address", e)
+        }
+
+        if (file.exists() && !file.delete() && logEnabled()) {
+            Log.w(TAG, "Unable to delete partial download: ${file.absolutePath}")
+        }
+        return false
+    }
+
+    @JvmStatic
+    fun fetchContentLength(address: String?): Long {
+        if (address.isNullOrEmpty()) return -1L
+        return try {
+            NativeContentIO.fetchContentLength(address, ensureNativeCaBundle())
+        } catch (e: Throwable) {
+            if (logEnabled()) Log.w(TAG, "Native HEAD failed for $address", e)
+            -1L
+        }
+    }
+
+    @JvmStatic
+    fun downloadString(address: String): String? {
+        val request = Request.Builder().url(address).build()
+        return try {
+            metadataClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    throw IllegalStateException("HTTP ${response.code} for $address")
+                }
+                response.body?.string()
+            }
+        } catch (e: Exception) {
+            if (logEnabled()) Log.w(TAG, "String download failed for $address", e)
+            null
+        }
+    }
+
+    private fun buildFileMap() {
+        if (logEnabled()) Log.d(TAG, "Building WinNative file map from $WINNATIVE_ROOT")
+        val start = System.currentTimeMillis()
+        fileMap.clear()
+        crawlDirectory(WINNATIVE_ROOT, 0)
+        if (logEnabled()) {
+            Log.d(TAG, "WinNative file map built: ${fileMap.size} files in ${System.currentTimeMillis() - start}ms")
+        }
+    }
+
+    private fun crawlDirectory(
+        dirUrl: String,
+        depth: Int,
+    ) {
+        if (depth > MAX_CRAWL_DEPTH) return
+        val html = downloadString(dirUrl) ?: return
+        val matcher = hrefPattern.matcher(html)
+        val subdirs = ArrayList<String>()
+
+        while (matcher.find()) {
+            val href = matcher.group(1) ?: continue
+            if (href.startsWith("/") || href.startsWith("..") || href.startsWith("?") || href.startsWith("http")) {
+                continue
+            }
+
+            if (href.endsWith("/")) {
+                subdirs.add(dirUrl + href)
+            } else {
+                fileMap.putIfAbsent(href.lowercase(Locale.ROOT), dirUrl + href)
+            }
+        }
+
+        subdirs.forEach { crawlDirectory(it, depth + 1) }
+    }
+
+    private fun loadFileMapFromDisk(): Boolean {
+        val cacheFile = fileMapCacheFile()
+        if (cacheFile?.isFile != true) return false
+
+        fileMap.clear()
+        try {
+            BufferedReader(InputStreamReader(FileInputStream(cacheFile), StandardCharsets.UTF_8)).use { reader ->
+                val header = reader.readLine()
+                if (header == null || !header.startsWith(FILE_MAP_CACHE_HEADER_PREFIX)) return false
+
+                val timestamp = header.removePrefix(FILE_MAP_CACHE_HEADER_PREFIX).trim().toLong()
+                if (System.currentTimeMillis() - timestamp > FILE_MAP_CACHE_TTL_MS) {
+                    if (!cacheFile.delete() && logEnabled()) {
+                        Log.w(TAG, "Unable to delete expired WinNative file map cache")
+                    }
+                    return false
+                }
+
+                reader.lineSequence().forEach { line ->
+                    val separator = line.indexOf('\t')
+                    if (separator > 0 && separator < line.length - 1) {
+                        fileMap.putIfAbsent(line.substring(0, separator), line.substring(separator + 1))
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            if (logEnabled()) Log.w(TAG, "Failed to load WinNative file map cache", e)
+            fileMap.clear()
+            return false
+        }
+
+        if (fileMap.isEmpty()) return false
+        if (logEnabled()) Log.d(TAG, "Loaded WinNative file map cache: ${fileMap.size} files")
+        return true
+    }
+
+    private fun persistFileMap() {
+        if (fileMap.isEmpty()) return
+        val cacheFile = fileMapCacheFile() ?: return
+        val tempFile = File(cacheFile.parentFile, "${cacheFile.name}.tmp")
+
+        try {
+            BufferedWriter(OutputStreamWriter(FileOutputStream(tempFile), StandardCharsets.UTF_8)).use { writer ->
+                writer.write(FILE_MAP_CACHE_HEADER_PREFIX)
+                writer.write(System.currentTimeMillis().toString())
+                writer.newLine()
+
+                fileMap.forEach { (key, value) ->
+                    if (value.isNotEmpty()) {
+                        writer.write(key)
+                        writer.write('\t'.code)
+                        writer.write(value)
+                        writer.newLine()
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            if (logEnabled()) Log.w(TAG, "Failed to persist WinNative file map cache", e)
+            tempFile.delete()
+            return
+        }
+
+        if (cacheFile.exists() && !cacheFile.delete() && logEnabled()) {
+            Log.w(TAG, "Unable to replace existing WinNative file map cache")
+        }
+        if (!tempFile.renameTo(cacheFile) && logEnabled()) {
+            Log.w(TAG, "Unable to finalize WinNative file map cache write")
+        }
+    }
+
+    private fun ensureNativeCaBundle(): String {
+        nativeCaBundlePath?.let { return it }
+
+        synchronized(this) {
+            nativeCaBundlePath?.let { return it }
+            val context = appContext()
+            if (context == null) {
+                nativeCaBundlePath = ""
+                return ""
+            }
+
+            val out = File(context.filesDir, NATIVE_CA_BUNDLE_NAME)
+            if (out.isFile && out.length() > 1024L) {
+                nativeCaBundlePath = out.absolutePath
+                return out.absolutePath
+            }
+
+            val certs = File(SYSTEM_CA_DIR).listFiles { file -> file.isFile && file.name.endsWith(".0") }
+            if (certs.isNullOrEmpty()) {
+                if (logEnabled()) Log.w(TAG, "No Android CA certificates found for native curl")
+                nativeCaBundlePath = ""
+                return ""
+            }
+
+            val tmp = File(out.parentFile, "${out.name}.tmp")
+            try {
+                BufferedWriter(OutputStreamWriter(FileOutputStream(tmp), StandardCharsets.UTF_8)).use { writer ->
+                    certs.forEach { cert ->
+                        try {
+                            BufferedReader(InputStreamReader(FileInputStream(cert), StandardCharsets.UTF_8)).use { reader ->
+                                reader.lineSequence().forEach { line ->
+                                    writer.write(line)
+                                    writer.newLine()
+                                }
+                                writer.newLine()
+                            }
+                        } catch (e: Exception) {
+                            if (logEnabled()) Log.w(TAG, "Skipped CA certificate: ${cert.name}", e)
+                        }
+                    }
+                }
+            } catch (e: Exception) {
+                if (logEnabled()) Log.w(TAG, "Failed to create native curl CA bundle", e)
+                tmp.delete()
+                nativeCaBundlePath = ""
+                return ""
+            }
+
+            if (out.exists() && !out.delete() && logEnabled()) {
+                Log.w(TAG, "Unable to replace native curl CA bundle")
+            }
+            nativeCaBundlePath = if (tmp.renameTo(out)) out.absolutePath else ""
+            return nativeCaBundlePath.orEmpty()
+        }
+    }
+
+    private fun refreshLogEnabled() {
+        logEnabledResolved = false
+    }
+
+    private fun logEnabled(): Boolean {
+        if (logEnabledResolved) return logEnabledCached
+        return try {
+            val context = appContext() ?: return false
+            logEnabledCached =
+                PreferenceManager
+                    .getDefaultSharedPreferences(context)
+                    .getBoolean("enable_download_logs", false)
+            logEnabledResolved = true
+            logEnabledCached
+        } catch (_: Exception) {
+            false
+        }
+    }
+
+    private fun fileMapCacheFile(): File? = appContext()?.let { File(it.filesDir, FILE_MAP_CACHE_NAME) }
+
+    private fun appContext(): Context? =
+        try {
+            PluviaApp.instance.applicationContext
+        } catch (_: Exception) {
+            null
+        }
+}
diff --git a/app/src/main/runtime/content/component/ComponentInstaller.kt b/app/src/main/runtime/content/component/ComponentInstaller.kt
new file mode 100644
index 000000000..83c4cbd5f
--- /dev/null
+++ b/app/src/main/runtime/content/component/ComponentInstaller.kt
@@ -0,0 +1,486 @@
+package com.winlator.cmod.runtime.content.component
+
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.winlator.cmod.runtime.container.Container
+import com.winlator.cmod.runtime.content.Downloader
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.display.environment.ImageFs
+import com.winlator.cmod.runtime.system.SessionKeepAliveService
+import com.winlator.cmod.runtime.wine.WineRegistryEditor
+import com.winlator.cmod.shared.io.FileUtils
+import com.winlator.cmod.shared.io.TarCompressorUtils
+import org.yaml.snakeyaml.Yaml
+import java.io.File
+import java.security.MessageDigest
+import java.util.Locale
+
+/**
+ * Executes a HuggingFace component manifest (the `.yml` recipe) into a specific [Container].
+ * Mirrors the step semantics of the reference dependency installer.
+ *
+ * Phase-3 scope: download -> archive_extract -> copy_dll/copy_file -> override_dll + registry.
+ * Verbs that require a running Wine process (install_exe/msi, register_dll/regsvr32, CAB extraction,
+ * font registration, set_windows) throw [InstallException] so the UI can report them clearly.
+ *
+ * Run on a background thread.
+ */
+class ComponentInstaller(
+    private val context: Context,
+    private val container: Container,
+    private val componentName: String,
+    private val manifestYaml: String,
+    private val listener: Listener,
+) {
+    interface Listener {
+        fun onStatus(text: String)
+
+        /** [fraction] in 0..1, or negative for indeterminate. */
+        fun onProgress(fraction: Float)
+    }
+
+    class InstallException(
+        message: String,
+    ) : Exception(message)
+
+    private val componentDir = File(context.cacheDir, "wn-components/$componentName")
+    private val workingDir = File(componentDir, "installed") // "temp/" + extraction scratch
+    private val driveC = File(container.rootDir, ".wine/drive_c")
+    private val userReg = File(container.rootDir, ".wine/user.reg")
+    private val systemReg = File(container.rootDir, ".wine/system.reg")
+
+    @Suppress("UNCHECKED_CAST")
+    fun run() {
+        if (!driveC.isDirectory) {
+            throw InstallException("Container isn't set up yet — boot it once first.")
+        }
+        componentDir.mkdirs()
+        workingDir.mkdirs()
+
+        val doc = Yaml().load<Map<String, Any?>>(manifestYaml)
+            ?: throw InstallException("Empty manifest")
+        val steps = (doc["Steps"] as? List<Map<String, Any?>>)
+            ?: throw InstallException("Manifest has no steps")
+
+        try {
+            checkCancel()
+            download(steps)
+            checkCancel()
+            extractArchives(steps)
+            checkCancel()
+            runSteps(steps)
+            markInstalled()
+        } finally {
+            File(driveC, "wn-install").deleteRecursively()
+        }
+    }
+
+    // Abort if the worker thread was interrupted (the install sheet was closed).
+    private fun checkCancel() {
+        if (Thread.currentThread().isInterrupted) throw InstallException("Cancelled")
+    }
+
+    private fun markInstalled() {
+        val dir = File(container.rootDir, INSTALLED_DIR)
+        dir.mkdirs()
+        try {
+            File(dir, componentName).writeText(System.currentTimeMillis().toString())
+        } catch (e: Exception) {
+            Log.w(TAG, "couldn't write installed marker for $componentName", e)
+        }
+    }
+
+    // ---- phase 1: download the referenced files ----
+    private fun download(steps: List<Map<String, Any?>>) {
+        val dlActions = setOf("download_archive", "install_exe", "install_msi", "cab_extract", "archive_extract")
+        val toDownload = steps.filter { (it["action"] as? String) in dlActions && it["url"] is String }
+        toDownload.forEachIndexed { i, step ->
+            checkCancel()
+            val url = step["url"] as String
+            val name = (step["rename"] as? String) ?: (step["file_name"] as String)
+            val dst = File(componentDir, name)
+            val checksum = (step["file_checksum"] as? String)?.lowercase(Locale.ROOT)
+            if (dst.isFile && dst.length() > 0 && (checksum == null || md5(dst) == checksum)) {
+                return@forEachIndexed // already cached + verified
+            }
+            listener.onStatus("Downloading $name (${i + 1}/${toDownload.size})")
+            listener.onProgress(0f)
+            val ok =
+                Downloader.downloadFile(url, dst) { done, total ->
+                    if (total > 0) listener.onProgress(done.toFloat() / total)
+                }
+            if (!ok) throw InstallException("Download failed: $name")
+            if (checksum != null && md5(dst) != checksum) {
+                throw InstallException("Checksum mismatch: $name")
+            }
+        }
+    }
+
+    // ---- phase 2: extract archives into the working dir ----
+    private fun extractArchives(steps: List<Map<String, Any?>>) {
+        for (step in steps) {
+            checkCancel()
+            when (step["action"] as? String) {
+                "archive_extract" -> {
+                    val name = (step["rename"] as? String) ?: (step["file_name"] as String)
+                    val src = File(componentDir, name)
+                    val outDir = File(workingDir, name.substringBeforeLast("."))
+                    outDir.mkdirs()
+                    listener.onStatus("Extracting $name")
+                    listener.onProgress(-1f)
+                    when {
+                        name.endsWith(".zip") -> extractZip(src, outDir)
+                        name.endsWith(".tar.xz") || name.endsWith(".xz") ->
+                            if (!TarCompressorUtils.extract(TarCompressorUtils.Type.XZ, src, outDir)) {
+                                throw InstallException("Extract failed: $name")
+                            }
+                        name.endsWith(".tar.zst") || name.endsWith(".zst") || name.endsWith(".tzst") ->
+                            if (!TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, src, outDir)) {
+                                throw InstallException("Extract failed: $name")
+                            }
+                        else -> throw InstallException("Unsupported archive format: $name")
+                    }
+                }
+
+                "cab_extract" -> {
+                    val name = (step["rename"] as? String) ?: (step["file_name"] as String)
+                    val dest = resolveDest(step["dest"] as? String ?: "temp/")
+                    listener.onStatus("Extracting $name")
+                    listener.onProgress(-1f)
+                    extractCab(resolveSource(name), dest, null)
+                }
+
+                "get_from_cab" -> {
+                    val source = step["source"] as? String ?: continue
+                    val pattern = step["file_name"] as? String
+                    val dest = resolveDest(step["dest"] as? String ?: "temp/")
+                    listener.onStatus("Extracting from CAB")
+                    listener.onProgress(-1f)
+                    for (cab in resolveCabSources(source)) extractCab(cab, dest, pattern)
+                }
+            }
+        }
+    }
+
+    private fun extractZip(
+        zip: File,
+        outDir: File,
+    ) {
+        java.util.zip.ZipInputStream(zip.inputStream().buffered()).use { zis ->
+            var entry = zis.nextEntry
+            while (entry != null) {
+                val out = File(outDir, entry.name)
+                if (entry.isDirectory) {
+                    out.mkdirs()
+                } else {
+                    out.parentFile?.mkdirs()
+                    out.outputStream().use { o -> zis.copyTo(o) }
+                }
+                zis.closeEntry()
+                entry = zis.nextEntry
+            }
+        }
+    }
+
+    /** Runs the bionic-native cabextract shipped in the system image, blocking until it finishes. */
+    private fun extractCab(
+        cab: File,
+        destDir: File,
+        pattern: String?,
+    ) {
+        if (!cab.isFile) throw InstallException("CAB not found: ${cab.name}")
+        destDir.mkdirs()
+        val rootDir = ImageFs.find(context).rootDir
+        val cabextract = File(rootDir, "usr/bin/cabextract")
+        if (!cabextract.isFile) throw InstallException("cabextract is missing from the system image.")
+        FileUtils.chmod(cabextract, "755".toInt(8))
+
+        val args = ArrayList<String>()
+        args.add(cabextract.absolutePath)
+        if (pattern != null) {
+            args.add("-F")
+            args.add(pattern)
+        }
+        args.add("-d")
+        args.add(destDir.absolutePath)
+        args.add(cab.absolutePath)
+
+        val pb = ProcessBuilder(args)
+        pb.environment()["LD_LIBRARY_PATH"] = File(rootDir, "usr/lib").absolutePath + ":/system/lib64"
+        val devNull = File("/dev/null")
+        pb.redirectOutput(ProcessBuilder.Redirect.to(devNull))
+        pb.redirectError(ProcessBuilder.Redirect.to(devNull))
+        val proc = pb.start()
+        try {
+            val exit = proc.waitFor()
+            if (exit != 0) throw InstallException("CAB extract failed (exit $exit): ${cab.name}")
+        } catch (e: InterruptedException) {
+            proc.destroy()
+            throw InstallException("Cancelled")
+        } catch (e: java.io.IOException) {
+            throw InstallException("Couldn't run cabextract: ${e.message}")
+        }
+    }
+
+    /** Resolves a get_from_cab source, expanding a `*` glob in the filename to the matching cab files. */
+    private fun resolveCabSources(source: String): List<File> {
+        if (!source.contains("*")) return listOf(resolveSource(source))
+        val resolved = resolveSource(source)
+        val parent = resolved.parentFile ?: return emptyList()
+        val nameGlob = globToRegex(resolved.name)
+        return parent.listFiles()?.filter { it.isFile && nameGlob.matches(it.name) } ?: emptyList()
+    }
+
+    // ---- phase 3: apply the install steps ----
+    private fun runSteps(steps: List<Map<String, Any?>>) {
+        listener.onStatus("Installing into ${container.name}")
+        listener.onProgress(-1f)
+        for (step in steps) {
+            checkCancel()
+            when (val action = step["action"] as? String) {
+                "download_archive", "archive_extract" -> {} // already handled
+                "copy_dll", "copy_file", "link_dir" -> copyFiles(step)
+                "override_dll" -> overrideDll(step)
+                "set_register_key" -> setRegisterKey(step)
+                "delete_dlls" -> deleteDlls(step)
+                "install_exe" -> runInstaller(step, isMsi = false)
+                "install_msi" -> runInstaller(step, isMsi = true)
+                "register_font" -> registerFont(step)
+                "replace_font" -> replaceFont(step)
+                "install_fonts", "install_cab_fonts" -> installFonts(step)
+                "register_dll" -> registerDlls(step)
+                "uninstall" -> Log.w(TAG, "skipping uninstall for $componentName (installer handles replacement)")
+                "set_windows", "use_windows" ->
+                    throw InstallException("Needs '$action' — not supported yet.")
+                else -> Log.w(TAG, "Unknown action: $action")
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun copyFiles(step: Map<String, Any?>) {
+        val name = step["file_name"] as? String ?: return
+        val srcDir = resolveSource(step["url"] as? String ?: return)
+        val dstDir = resolveDest(step["dest"] as? String ?: return)
+        dstDir.mkdirs()
+        if (name.contains("*")) {
+            val regex = globToRegex(name)
+            val files = srcDir.listFiles() ?: throw InstallException("Source not found: $srcDir")
+            var copied = 0
+            for (f in files) {
+                if (f.isFile && regex.matches(f.name)) {
+                    if (!FileUtils.copy(f, File(dstDir, f.name))) throw InstallException("Copy failed: ${f.name}")
+                    copied++
+                }
+            }
+            if (copied == 0) Log.w(TAG, "copy: no files matched '$name' in $srcDir")
+        } else {
+            val src = File(srcDir, name)
+            if (!src.exists()) throw InstallException("Missing file: $name")
+            if (!FileUtils.copy(src, File(dstDir, name))) throw InstallException("Copy failed: $name")
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun overrideDll(step: Map<String, Any?>) {
+        WineRegistryEditor(userReg).use { reg ->
+            reg.setCreateKeyIfNotExist(true)
+            val bundle = step["bundle"] as? List<Map<String, Any?>>
+            if (bundle != null) {
+                for (b in bundle) {
+                    val dll = (b["value"] ?: continue).toString()
+                    val data = (b["data"] ?: "native,builtin").toString()
+                    reg.setStringValue(DLL_OVERRIDES, dll, data)
+                }
+            } else {
+                val dll = (step["dll"] ?: return@use).toString()
+                val type = (step["type"] ?: "native,builtin").toString()
+                reg.setStringValue(DLL_OVERRIDES, dll, type)
+            }
+        }
+    }
+
+    private fun setRegisterKey(step: Map<String, Any?>) {
+        val key = step["key"] as? String ?: return
+        val value = step["value"] as? String ?: return
+        val hklm = key.startsWith("HKLM", ignoreCase = true)
+        val regFile = if (hklm) systemReg else userReg
+        val subKey = key.substringAfter('\\').trimStart('\\')
+        WineRegistryEditor(regFile).use { reg ->
+            reg.setCreateKeyIfNotExist(true)
+            when (step["type"] as? String) {
+                "REG_DWORD" -> {
+                    val data = step["data"]
+                    val intVal = (data as? Int) ?: data?.toString()?.toIntOrNull() ?: 0
+                    reg.setDwordValue(subKey, value, intVal)
+                }
+                "REG_SZ" -> reg.setStringValue(subKey, value, (step["data"] ?: "").toString())
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun deleteDlls(step: Map<String, Any?>) {
+        val dir = resolveDest(step["dest"] as? String ?: return)
+        val dlls = step["dlls"] as? List<String> ?: return
+        for (d in dlls) File(dir, d).delete()
+    }
+
+    private fun registerFont(step: Map<String, Any?>) {
+        val name = step["name"] as? String ?: return
+        val file = step["file"] as? String ?: return
+        WineRegistryEditor(systemReg).use { reg ->
+            reg.setCreateKeyIfNotExist(true)
+            reg.setStringValue("Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", name, file)
+        }
+    }
+
+    private fun replaceFont(step: Map<String, Any?>) {
+        val font = step["font"] as? String ?: return
+        val replacement = (step["replace"] as? List<*>)?.firstOrNull()?.toString() ?: return
+        WineRegistryEditor(userReg).use { reg ->
+            reg.setCreateKeyIfNotExist(true)
+            reg.setStringValue("Software\\Wine\\Fonts\\Replacements", font, replacement)
+        }
+    }
+
+    private fun installFonts(step: Map<String, Any?>) {
+        val srcDir = resolveDest(step["url"] as? String ?: return)
+        val fonts = step["fonts"] as? List<*> ?: return
+        val fontsDir = File(driveC, "windows/Fonts")
+        fontsDir.mkdirs()
+        for (f in fonts) {
+            val fn = f?.toString() ?: continue
+            val src = File(srcDir, fn)
+            if (src.isFile) FileUtils.copy(src, File(fontsDir, fn))
+        }
+    }
+
+    /** Stages the installer into the container and runs it inside Wine (via the boot session), waiting. */
+    private fun runInstaller(
+        step: Map<String, Any?>,
+        isMsi: Boolean,
+    ) {
+        val fileName = (step["rename"] as? String) ?: (step["file_name"] as String)
+        val src = File(componentDir, fileName)
+        if (!src.isFile) throw InstallException("Installer not found: $fileName")
+        val stageDir = File(driveC, "wn-install")
+        stageDir.mkdirs()
+        val staged = File(stageDir, fileName)
+        if (!FileUtils.copy(src, staged)) throw InstallException("Couldn't stage installer: $fileName")
+
+        val winPath = "C:\\wn-install\\$fileName"
+        val arguments = (step["arguments"] as? String).orEmpty()
+        listener.onStatus("Running installer: $fileName")
+        listener.onProgress(-1f)
+
+        val bootExe: String
+        val bootArgs: String
+        if (isMsi) {
+            bootExe = "C:\\windows\\system32\\msiexec.exe"
+            bootArgs = "/i \"$winPath\" ${arguments.ifBlank { "/passive" }} /norestart".trim()
+        } else {
+            bootExe = winPath
+            bootArgs = arguments
+        }
+        val code = launchInContainerAndWait(bootExe, bootArgs)
+        // 0 = success, 3010 = success but reboot required (common for redists/MSI).
+        if (code != 0 && code != 3010) throw InstallException("Installer exited with code $code: $fileName")
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun registerDlls(step: Map<String, Any?>) {
+        val dlls = (step["dlls"] as? List<String>)?.filter { it.isNotBlank() } ?: return
+        if (dlls.isEmpty()) return
+        listener.onStatus("Registering ${dlls.size} DLL(s)")
+        listener.onProgress(-1f)
+        val batch = dlls.joinToString(" & ") { "regsvr32 /s $it" }
+        val code = launchInContainerAndWait("C:\\windows\\system32\\cmd.exe", "/c \"$batch\"")
+        // regsvr32 /s exit codes are unreliable; the DLLs are already placed + overridden, so don't hard-fail.
+        if (code != 0) Log.w(TAG, "register_dll batch for $componentName exited $code")
+    }
+
+    /** Boots the container with the given Wine program (gated dependency mode) and blocks for its exit code. */
+    private fun launchInContainerAndWait(
+        bootExe: String,
+        bootArgs: String,
+    ): Int {
+        if (SessionKeepAliveService.isSessionActive() && SessionKeepAliveService.getActiveEnvironment() != null) {
+            throw InstallException("A session is still running — close it before installing components.")
+        }
+        DependencyInstallBridge.begin()
+        val intent =
+            Intent(context, XServerDisplayActivity::class.java).apply {
+                putExtra("container_id", container.id)
+                putExtra("boot_exe", bootExe)
+                putExtra("boot_exe_args", bootArgs)
+                putExtra("is_dependency_installer", true)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+        context.startActivity(intent)
+        return DependencyInstallBridge.await(INSTALL_TIMEOUT_MS)
+            ?: throw InstallException("Installer timed out or the session was closed.")
+    }
+
+    // ---- path templates ----
+    // q(): where a source file currently lives (downloads in componentDir, extracted under temp/=workingDir).
+    private fun resolveSource(path: String): File {
+        if (path.startsWith("temp/")) return File(workingDir, path.removePrefix("temp/"))
+        val inComp = File(componentDir, path)
+        return if (inComp.exists()) inComp else File(workingDir, path)
+    }
+
+    // l(): where a file should land. win32->syswow64, win64->system32, windows/->drive_c/windows, temp/->workingDir.
+    private fun resolveDest(dest: String): File =
+        when {
+            dest.startsWith("temp/") -> File(workingDir, dest.removePrefix("temp/"))
+            dest.startsWith("windows/") -> File(driveC, dest)
+            dest == "win32" || dest.startsWith("win32/") ->
+                File(File(driveC, "windows/syswow64"), dest.removePrefix("win32").trimStart('/'))
+            dest == "win64" || dest.startsWith("win64/") ->
+                File(File(driveC, "windows/system32"), dest.removePrefix("win64").trimStart('/'))
+            else -> File(dest)
+        }
+
+    private fun globToRegex(glob: String): Regex {
+        val p =
+            buildString {
+                for (c in glob) {
+                    when (c) {
+                        '*' -> append(".*")
+                        '?' -> append('.')
+                        else -> if (c.isLetterOrDigit() || c == '_' || c == '-') append(c) else append("\\$c")
+                    }
+                }
+            }
+        return Regex("^$p$", RegexOption.IGNORE_CASE)
+    }
+
+    private fun md5(file: File): String {
+        val md = MessageDigest.getInstance("MD5")
+        file.inputStream().use { ins ->
+            val buf = ByteArray(1 shl 16)
+            while (true) {
+                val n = ins.read(buf)
+                if (n < 0) break
+                md.update(buf, 0, n)
+            }
+        }
+        return md.digest().joinToString("") { "%02x".format(it) }
+    }
+
+    companion object {
+        private const val TAG = "ComponentInstaller"
+        private const val DLL_OVERRIDES = "Software\\Wine\\DllOverrides"
+        private const val INSTALL_TIMEOUT_MS = 20L * 60L * 1000L
+        private const val INSTALLED_DIR = ".wn-components"
+
+        /** Names of components already installed into [container] (persisted per container). */
+        @JvmStatic
+        fun installedComponents(container: Container): Set<String> {
+            val dir = File(container.rootDir, INSTALLED_DIR)
+            return dir.listFiles()?.filter { it.isFile }?.map { it.name }?.toSet() ?: emptySet()
+        }
+    }
+}
diff --git a/app/src/main/runtime/content/component/DependencyInstallBridge.kt b/app/src/main/runtime/content/component/DependencyInstallBridge.kt
new file mode 100644
index 000000000..6042f2f29
--- /dev/null
+++ b/app/src/main/runtime/content/component/DependencyInstallBridge.kt
@@ -0,0 +1,47 @@
+package com.winlator.cmod.runtime.content.component
+
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/**
+ * One-at-a-time handoff between [ComponentInstaller] (running on a background thread) and the
+ * XServer session that is launched to run an installer / regsvr32 inside the container.
+ *
+ * The installer thread calls [begin] then [await]; the session, when its dependency guest program
+ * terminates, calls [complete] with the exit code (see XServerDisplayActivity terminationCallback).
+ */
+object DependencyInstallBridge {
+    private val lock = Any()
+
+    @Volatile private var latch: CountDownLatch? = null
+
+    @Volatile private var exitCode: Int = -1
+
+    fun begin() {
+        synchronized(lock) {
+            latch = CountDownLatch(1)
+            exitCode = -1
+        }
+    }
+
+    /** Called by the boot session when the dependency program terminates. */
+    @JvmStatic
+    fun complete(code: Int) {
+        synchronized(lock) {
+            val l = latch ?: return
+            if (l.count == 0L) return
+            exitCode = code
+            l.countDown()
+        }
+    }
+
+    /** Blocks up to [timeoutMs]; returns the program's exit code, or null on timeout. */
+    fun await(timeoutMs: Long): Int? {
+        val l = synchronized(lock) { latch } ?: return null
+        val finished = l.await(timeoutMs, TimeUnit.MILLISECONDS)
+        return synchronized(lock) {
+            latch = null
+            if (finished) exitCode else null
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/ExitUploadTypes.java b/app/src/main/runtime/display/ExitUploadTypes.java
new file mode 100644
index 000000000..43f3d8f4e
--- /dev/null
+++ b/app/src/main/runtime/display/ExitUploadTypes.java
@@ -0,0 +1,28 @@
+package com.winlator.cmod.runtime.display;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+// Exit cloud-sync callback/result types split out of XServerDisplayActivity.
+interface ExitUploadAction {
+    void start(ExitUploadCallback callback);
+}
+
+interface ExitUploadCallback {
+    void onComplete(ExitUploadResult result);
+}
+
+interface ExitUploadBlockingAction {
+    ExitUploadResult run() throws Exception;
+}
+
+final class ExitUploadResult {
+    final boolean success;
+    @NonNull final String message;
+    final boolean retryable;
+
+    ExitUploadResult(boolean success, @Nullable String message, boolean retryable) {
+        this.success = success;
+        this.message = message == null ? "" : message;
+        this.retryable = retryable;
+    }
+}
diff --git a/app/src/main/runtime/display/ExternalDisplayController.java b/app/src/main/runtime/display/ExternalDisplayController.java
new file mode 100644
index 000000000..5d5908df8
--- /dev/null
+++ b/app/src/main/runtime/display/ExternalDisplayController.java
@@ -0,0 +1,884 @@
+package com.winlator.cmod.runtime.display;
+
+import android.app.Activity;
+import android.app.Presentation;
+import android.content.Context;
+import android.graphics.Color;
+import android.hardware.display.DeviceProductInfo;
+import android.hardware.display.DisplayManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.Display;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import com.winlator.cmod.runtime.display.renderer.ViewTransformation;
+import com.winlator.cmod.runtime.display.renderer.VulkanRenderer;
+import com.winlator.cmod.runtime.display.ui.XServerSurfaceView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Moves the game's {@link XServerSurfaceView} onto a connected external display (USB-C/HDMI/Miracast/XR glasses) via a {@link Presentation}; controls/menu stay on the phone. Real {@link Display.Mode}s switch the panel via preferredDisplayModeId, other tiers render via SurfaceHolder.setFixedSize and are hardware-scaled. */
+public final class ExternalDisplayController {
+    private static final String TAG = "ExternalDisplay";
+
+    // Standard render-resolution tiers (by height); width is derived from the panel aspect ratio.
+    private static final int[] STANDARD_TIER_HEIGHTS = {2160, 1440, 1080, 720, 480};
+    // Standard refresh tiers offered alongside the panel's detected rates (best-effort if unmatched).
+    private static final float[] STANDARD_REFRESH_RATES = {165f, 144f, 120f, 90f, 60f, 50f, 30f};
+    private static final float REFRESH_EPSILON = 0.5f; // tolerates 59.94 vs 60.0
+
+    public interface Callbacks {
+        void onExternalDisplayConnected(Display display);
+
+        void onExternalDisplayDisconnected();
+
+        /** Refresh the drawer menu (Output tab visibility/controls). */
+        void onSwapStateChanged(boolean swapActive);
+    }
+
+    // A selectable resolution. physical=true switches the panel mode; otherwise it's a render tier.
+    private static final class ResEntry {
+        final int w;
+        final int h;
+        final boolean physical;
+        final String label;
+
+        ResEntry(int w, int h, boolean physical, String label) {
+            this.w = w;
+            this.h = h;
+            this.physical = physical;
+            this.label = label;
+        }
+    }
+
+    private final Activity activity;
+    private final FrameLayout phoneFrame;
+    private final XServerSurfaceView gameView;
+    private final Callbacks callbacks;
+    private final DisplayManager displayManager;
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+
+    private GamePresentation presentation;
+    private Display externalDisplay;
+    private boolean swapActive;
+    private boolean listenerRegistered;
+    private int promptedDisplayId = -1; // guards against re-prompting for the same connection
+
+    // Output-tab selections (only meaningful while swapped).
+    private final List<ResEntry> resolutions = new ArrayList<>();
+    private int selectedResolutionIndex = 0;
+    private final List<Float> refreshOptions = new ArrayList<>();
+    private int selectedRefreshIndex = 0;
+    private boolean renderActive = false; // a setFixedSize render buffer is currently in effect
+    private boolean panelScalerLocked = false; // sink ignored a real mode switch — render-scale instead
+    private int modeRequestGen = 0;            // guards a verify against a newer selection superseding it
+    private boolean gameMode = true;      // request HDMI ALLM when the sink supports it
+    private String lastModesSignature = ""; // detects EDID re-advertisement (e.g. glasses unlocking 120Hz)
+
+    private int fillMode = ViewTransformation.FILL_MODE_FIT;
+    private int savedPresentMode = VulkanRenderer.PRESENT_MODE_FIFO;
+    private float savedPhoneRefreshRate = 0f;
+
+    // Phone surface size captured before the swap, to restore it exactly on return.
+    private int savedPhoneViewWidth = 0;
+    private int savedPhoneViewHeight = 0;
+
+    // Shared Viture controller + settings (owned by GlassesManager so library and in-game swap never double-claim the USB); values persist across both.
+    private final VitureGlasses viture;
+    private final GlassesManager.Listener glassesListener;
+
+    public ExternalDisplayController(Activity activity, FrameLayout phoneFrame,
+                                     XServerSurfaceView gameView, Callbacks callbacks) {
+        this.activity = activity;
+        this.phoneFrame = phoneFrame;
+        this.gameView = gameView;
+        this.callbacks = callbacks;
+        this.displayManager = (DisplayManager) activity.getSystemService(Context.DISPLAY_SERVICE);
+        GlassesManager.INSTANCE.init(activity);
+        this.viture = GlassesManager.INSTANCE.glasses();
+        this.glassesListener = (connectionChanged) -> {
+            // Only re-apply on (re)connect, not on every slider tick (which would storm recompose + the display-mode command while dragging).
+            if (connectionChanged) {
+                if (viture != null && viture.isConnected() && swapActive) applyOutputMode();
+                callbacks.onSwapStateChanged(swapActive);
+            }
+        };
+        GlassesManager.INSTANCE.addListener(glassesListener);
+    }
+
+    // ── Lifecycle ──────────────────────────────────────────────────────────
+
+    public void start() {
+        if (displayManager == null) return;
+        if (!listenerRegistered) {
+            displayManager.registerDisplayListener(displayListener, mainHandler);
+            listenerRegistered = true;
+        }
+        maybePromptForDisplay();
+    }
+
+    // Offer the swap prompt at most once per connection (and never while swapped).
+    private void maybePromptForDisplay() {
+        Display d = findExternalDisplay();
+        if (d != null && !swapActive && d.getDisplayId() != promptedDisplayId) {
+            promptedDisplayId = d.getDisplayId();
+            callbacks.onExternalDisplayConnected(d);
+        }
+    }
+
+    public void stop() {
+        if (displayManager != null && listenerRegistered) {
+            displayManager.unregisterDisplayListener(displayListener);
+            listenerRegistered = false;
+        }
+    }
+
+    public void release() {
+        stop();
+        GlassesManager.INSTANCE.removeListener(glassesListener);
+        exitSwap();
+    }
+
+    private final DisplayManager.DisplayListener displayListener = new DisplayManager.DisplayListener() {
+        @Override
+        public void onDisplayAdded(int displayId) {
+            maybePromptForDisplay();
+        }
+
+        @Override
+        public void onDisplayRemoved(int displayId) {
+            if (displayId == promptedDisplayId) promptedDisplayId = -1;
+            if (swapActive && externalDisplay != null && externalDisplay.getDisplayId() == displayId) {
+                exitSwap();
+                callbacks.onExternalDisplayDisconnected();
+            }
+        }
+
+        @Override
+        public void onDisplayChanged(int displayId) {
+            if (swapActive && externalDisplay != null && externalDisplay.getDisplayId() == displayId) {
+                Display fresh = displayManager != null ? displayManager.getDisplay(displayId) : null;
+                if (fresh != null) externalDisplay = fresh;
+                if (!renderActive) {
+                    // Re-scan if the sink re-advertised modes (glasses unlocking 120Hz, 2D↔3D toggle).
+                    if (!modesSignature(externalDisplay).equals(lastModesSignature)) {
+                        rebuildModeTables();
+                    }
+                    syncSelectionToActiveMode();
+                }
+                callbacks.onSwapStateChanged(true);
+            }
+        }
+    };
+
+    private static String modesSignature(Display d) {
+        if (d == null) return "";
+        StringBuilder sb = new StringBuilder();
+        try {
+            for (Display.Mode m : d.getSupportedModes()) {
+                sb.append(m.getPhysicalWidth()).append('x').append(m.getPhysicalHeight())
+                        .append('@').append(Math.round(m.getRefreshRate())).append(';');
+            }
+        } catch (Exception ignore) {}
+        return sb.toString();
+    }
+
+    // Reflect the actual active panel mode in the selection (physical selections only).
+    private void syncSelectionToActiveMode() {
+        if (externalDisplay == null || resolutions.isEmpty()) return;
+        Display.Mode active;
+        try {
+            active = externalDisplay.getMode();
+        } catch (Exception e) {
+            return; // display may be invalidated mid-change
+        }
+        if (active == null) return;
+        for (int i = 0; i < resolutions.size(); i++) {
+            ResEntry r = resolutions.get(i);
+            if (r.physical && r.w == active.getPhysicalWidth() && r.h == active.getPhysicalHeight()) {
+                selectedResolutionIndex = i;
+                break;
+            }
+        }
+        // Keep the glasses' persisted rate; don't snap back to the panel's transient 60Hz boot mode.
+        if (!isVitureSink()) selectedRefreshIndex = closestRateIndex(round1(active.getRefreshRate()));
+    }
+
+    // ── Discovery ──────────────────────────────────────────────────────────
+
+    public boolean hasExternalDisplay() {
+        return findExternalDisplay() != null;
+    }
+
+    public boolean isSwapActive() {
+        return swapActive;
+    }
+
+    public Display findExternalDisplay() {
+        if (displayManager == null) return null;
+        Display[] presentationDisplays =
+                displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
+        for (Display d : presentationDisplays) {
+            if (d != null && d.getDisplayId() != Display.DEFAULT_DISPLAY && d.isValid()) return d;
+        }
+        for (Display d : displayManager.getDisplays()) {
+            if (d != null && d.getDisplayId() != Display.DEFAULT_DISPLAY && d.isValid()
+                    && (d.getFlags() & Display.FLAG_PRESENTATION) != 0) {
+                return d;
+            }
+        }
+        return null;
+    }
+
+    public String getDisplayName() {
+        return describeDisplay(externalDisplay);
+    }
+
+    public String getAvailableDisplayName() {
+        return describeDisplay(findExternalDisplay());
+    }
+
+    // Prefer the EDID product name (the actual model); fall back to the framework display name.
+    private static String describeDisplay(Display d) {
+        if (d == null) return "";
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            try {
+                DeviceProductInfo info = d.getDeviceProductInfo();
+                if (info != null) {
+                    String product = info.getName();
+                    if (product != null && !product.trim().isEmpty()) return product.trim();
+                }
+            } catch (Exception ignore) {}
+        }
+        String name = d.getName();
+        return name != null ? name.trim() : "";
+    }
+
+    // True when the active sink is Viture glasses (USB control up, or the EDID product name says VITURE).
+    private boolean isVitureSink() {
+        if (viture.isConnected()) return true;
+        String name = describeDisplay(externalDisplay);
+        return !name.isEmpty() && name.toUpperCase(java.util.Locale.ROOT).contains("VITURE");
+    }
+
+    // ── Swap / restore ─────────────────────────────────────────────────────
+
+    public void enterSwap() {
+        if (swapActive) return;
+        Display d = findExternalDisplay();
+        if (d == null) return;
+        externalDisplay = d;
+
+        // Capture the phone surface size before reparenting, so swap-back can restore it exactly.
+        savedPhoneViewWidth = phoneFrame != null && phoneFrame.getWidth() > 0
+                ? phoneFrame.getWidth() : gameView.getWidth();
+        savedPhoneViewHeight = phoneFrame != null && phoneFrame.getHeight() > 0
+                ? phoneFrame.getHeight() : gameView.getHeight();
+
+        GamePresentation pres = new GamePresentation(activity, d);
+        pres.setOnDismissListener(dialog -> {
+            if (swapActive) {
+                exitSwap();
+                callbacks.onExternalDisplayDisconnected();
+            }
+        });
+        try {
+            pres.show();
+        } catch (Exception e) {
+            // InvalidDisplayException / BadTokenException — abort the swap cleanly instead of crashing.
+            Log.w(TAG, "Could not show presentation on external display", e);
+            pres.setOnDismissListener(null);
+            try { pres.dismiss(); } catch (Exception ignore) {}
+            externalDisplay = null;
+            return;
+        }
+        presentation = pres;
+
+        // Move only the render surface; controls/menu/HUD remain on the phone.
+        if (gameView.getParent() instanceof ViewGroup) {
+            ((ViewGroup) gameView.getParent()).removeView(gameView);
+        }
+        pres.getContainer().addView(gameView, new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+        swapActive = true;
+        renderActive = false;
+        fillMode = ViewTransformation.FILL_MODE_FIT;
+        rebuildModeTables();
+        applyFillModeToRenderer();
+        applyGameMode();
+        applyHighRefreshToPhone();   // reduce phone touch lag
+        applyExternalPresentMode();  // non-blocking present so a slow sink can't stall the render thread
+
+        // Glasses already under USB control: push the persisted mode (default 120Hz) now via the MCU.
+        if (viture.isConnected()) applyOutputMode();
+
+        callbacks.onSwapStateChanged(true);
+    }
+
+    // Return the game to the phone and dismiss the presentation. Idempotent.
+    public void exitSwap() {
+        if (!swapActive && presentation == null) return;
+        boolean wasActive = swapActive;
+        swapActive = false;
+        renderActive = false;
+        panelScalerLocked = false;
+
+        // Clear any render buffer so the phone surface follows the phone layout again.
+        fillMode = ViewTransformation.FILL_MODE_FIT;
+        VulkanRenderer renderer = gameView.getRenderer();
+        try { gameView.getHolder().setSizeFromLayout(); } catch (Exception ignore) {}
+        if (renderer != null) {
+            renderer.setFillModeQuiet(ViewTransformation.FILL_MODE_FIT);
+            renderer.invalidateSurfaceSize();
+        }
+        restorePhoneRefresh();
+        restorePresentMode();
+
+        if (gameView.getParent() instanceof ViewGroup) {
+            ((ViewGroup) gameView.getParent()).removeView(gameView);
+        }
+        GamePresentation pres = presentation;
+        presentation = null;
+        if (pres != null) {
+            pres.setOnDismissListener(null);
+            try { pres.dismiss(); } catch (Exception ignore) {}
+        }
+        externalDisplay = null;
+
+        // Re-add behind the on-screen controls (index 0 = lowest z-order).
+        if (gameView.getParent() == null && phoneFrame != null) {
+            phoneFrame.addView(gameView, 0, new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            // Compose's empty AndroidView update={} won't re-measure the reparented view, so size it explicitly; posted/delayed retries cover the async surface.
+            restorePhoneSurfaceSize();
+            gameView.requestLayout();
+            phoneFrame.requestLayout();
+            mainHandler.post(this::restorePhoneSurfaceSize);
+            mainHandler.postDelayed(this::syncViewportToPhoneSurface, 250L);
+            mainHandler.postDelayed(this::syncViewportToPhoneSurface, 600L);
+        }
+        if (wasActive) callbacks.onSwapStateChanged(false);
+    }
+
+    // Measure + layout the reparented SurfaceView at the phone frame's size and recompute the viewport.
+    private void restorePhoneSurfaceSize() {
+        if (swapActive || phoneFrame == null) return;
+        int w = phoneFrame.getWidth();
+        int h = phoneFrame.getHeight();
+        if (w <= 0 || h <= 0) { w = savedPhoneViewWidth; h = savedPhoneViewHeight; }
+        if (w <= 0 || h <= 0) return;
+        gameView.measure(
+                View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY),
+                View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY));
+        gameView.layout(0, 0, w, h);
+        VulkanRenderer r = gameView.getRenderer();
+        if (r != null) r.forceViewportRecompute(w, h);
+    }
+
+    private void syncViewportToPhoneSurface() {
+        if (swapActive) return;
+        VulkanRenderer r = gameView.getRenderer();
+        if (r == null) return;
+        int w = gameView.getSurfaceWidth();
+        int h = gameView.getSurfaceHeight();
+        if (w <= 0 || h <= 0) {
+            w = phoneFrame != null ? phoneFrame.getWidth() : 0;
+            h = phoneFrame != null ? phoneFrame.getHeight() : 0;
+        }
+        if (w > 0 && h > 0) r.forceViewportRecompute(w, h);
+    }
+
+    // ── Output tab: resolution / refresh / aspect / game mode ──────────────
+
+    // Build the hybrid resolution list (physical modes ∪ render tiers) and refresh options.
+    private void rebuildModeTables() {
+        resolutions.clear();
+        refreshOptions.clear();
+        selectedResolutionIndex = 0;
+        selectedRefreshIndex = 0;
+        renderActive = false;
+        panelScalerLocked = false;
+        if (externalDisplay == null) return;
+
+        Display.Mode current;
+        try {
+            current = externalDisplay.getMode();
+        } catch (Exception e) {
+            current = null;
+        }
+        int nativeW = current != null ? current.getPhysicalWidth() : 0;
+        int nativeH = current != null ? current.getPhysicalHeight() : 0;
+        float panelAspect = (nativeW > 0 && nativeH > 0) ? (float) nativeW / nativeH : 16f / 9f;
+
+        Display.Mode[] modes;
+        try {
+            modes = externalDisplay.getSupportedModes();
+        } catch (Exception e) {
+            modes = new Display.Mode[0];
+        }
+
+        // Physical resolutions reported by the panel.
+        List<int[]> physical = new ArrayList<>();
+        for (Display.Mode m : modes) {
+            int w = m.getPhysicalWidth();
+            int h = m.getPhysicalHeight();
+            if (!containsRes(physical, w, h)) physical.add(new int[]{w, h});
+        }
+        for (int[] p : physical) {
+            boolean isNative = p[0] == nativeW && p[1] == nativeH;
+            resolutions.add(new ResEntry(p[0], p[1], true, resLabel(p[0], p[1], isNative)));
+        }
+
+        // Standard render tiers (aspect-matched), so single-mode sinks still get 4K/2K/1080/720/480.
+        int maxH = Math.max(2160, nativeH);
+        for (int tierH : STANDARD_TIER_HEIGHTS) {
+            if (tierH > maxH) continue;
+            int tierW = Math.round(tierH * panelAspect);
+            tierW -= (tierW & 1); // keep even
+            if (tierW <= 0 || containsResEntry(tierW, tierH)) continue;
+            resolutions.add(new ResEntry(tierW, tierH, false, resLabel(tierW, tierH, false)));
+        }
+        resolutions.sort((a, b) -> Long.compare((long) b.w * b.h, (long) a.w * a.h));
+
+        for (int i = 0; i < resolutions.size(); i++) {
+            ResEntry r = resolutions.get(i);
+            if (r.physical && r.w == nativeW && r.h == nativeH) {
+                selectedResolutionIndex = i;
+                break;
+            }
+        }
+
+        // Detected rates first (so 59.94 wins over 60.0), then standard tiers.
+        for (Display.Mode m : modes) addRate(refreshOptions, round1(m.getRefreshRate()));
+        for (float r : STANDARD_REFRESH_RATES) addRate(refreshOptions, r);
+        refreshOptions.sort((a, b) -> Float.compare(b, a));
+        float nativeRate = current != null ? round1(current.getRefreshRate()) : 60f;
+        // Glasses default to the persisted rate (120 out of the box); other sinks to their native rate.
+        selectedRefreshIndex = closestRateIndex(
+                isVitureSink() ? GlassesManager.INSTANCE.currentRefreshHz() : nativeRate);
+
+        lastModesSignature = modesSignature(externalDisplay);
+    }
+
+    public List<String> getResolutionLabels() {
+        List<String> out = new ArrayList<>();
+        for (ResEntry r : resolutions) out.add(r.label);
+        return out;
+    }
+
+    public int getSelectedResolutionIndex() {
+        return clampIndex(selectedResolutionIndex, resolutions.size());
+    }
+
+    public List<String> getRefreshRateLabels() {
+        List<String> out = new ArrayList<>();
+        for (Float r : refreshOptions) out.add(Math.round(r) + " Hz");
+        return out;
+    }
+
+    public int getSelectedRefreshRateIndex() {
+        return clampIndex(selectedRefreshIndex, refreshOptions.size());
+    }
+
+    public void selectResolution(int index) {
+        if (index < 0 || index >= resolutions.size()) return;
+        selectedResolutionIndex = index;
+        applyOutputMode();
+    }
+
+    public void selectRefreshRate(int index) {
+        if (index < 0 || index >= refreshOptions.size()) return;
+        selectedRefreshIndex = index;
+        if (isVitureSink()) GlassesManager.INSTANCE.persistRefreshHz(Math.round(refreshOptions.get(index)));
+        applyOutputMode();
+    }
+
+    private float currentSelectedRefresh() {
+        if (refreshOptions.isEmpty()) return 0f;
+        return refreshOptions.get(clampIndex(selectedRefreshIndex, refreshOptions.size()));
+    }
+
+    // Physical resolution with a matching mode switches the panel; otherwise drive the render buffer.
+    private void applyOutputMode() {
+        if (!swapActive || externalDisplay == null || presentation == null
+                || presentation.getWindow() == null || resolutions.isEmpty()) {
+            return;
+        }
+        ResEntry res = resolutions.get(clampIndex(selectedResolutionIndex, resolutions.size()));
+        float hz = currentSelectedRefresh();
+        WindowManager.LayoutParams lp = presentation.getWindow().getAttributes();
+        final int gen = ++modeRequestGen;
+
+        // Viture panel timing is driven over USB (Android may not enumerate the mode), so force it via the MCU; the Android calls below then lock the Presentation onto it.
+        if (viture.isConnected()) viture.forceRefreshHz(Math.round(hz));
+
+        if (res.physical && !panelScalerLocked) {
+            Display.Mode best = bestPhysicalMode(res.w, res.h, hz);
+            if (best != null) {
+                clearRenderBuffer();
+                lp.preferredRefreshRate = 0f; // must be 0 when a modeId is set
+                lp.preferredDisplayModeId = best.getModeId();
+                presentation.getWindow().setAttributes(lp);
+                requestSurfaceFrameRate(best.getRefreshRate()); // reinforce on the surface
+                renderActive = false;
+                Log.i(TAG, "Physical mode " + res.w + "x" + res.h + "@"
+                        + Math.round(best.getRefreshRate()) + " (modeId=" + best.getModeId() + ")");
+                verifyPhysicalSwitch(best, gen);
+                return;
+            }
+        }
+
+        // Render path: panel stays at native, the scaler maps our buffer onto it.
+        lp.preferredDisplayModeId = 0;
+        lp.preferredRefreshRate = hz > 0f ? hz : 0f;
+        presentation.getWindow().setAttributes(lp);
+        setRenderBuffer(res.w, res.h);
+        requestSurfaceFrameRate(hz);
+        renderActive = true;
+        Log.i(TAG, "Render buffer " + res.w + "x" + res.h + " @~" + Math.round(hz)
+                + "Hz (hardware-scaled to panel)");
+    }
+
+    private Display.Mode bestPhysicalMode(int w, int h, float hz) {
+        if (externalDisplay == null) return null;
+        Display.Mode best = null;
+        float bestDiff = Float.MAX_VALUE;
+        Display.Mode[] modes;
+        try {
+            modes = externalDisplay.getSupportedModes();
+        } catch (Exception e) {
+            return null;
+        }
+        for (Display.Mode m : modes) {
+            if (m.getPhysicalWidth() == w && m.getPhysicalHeight() == h) {
+                float diff = Math.abs(m.getRefreshRate() - hz);
+                if (diff < bestDiff) { bestDiff = diff; best = m; }
+            }
+        }
+        return best;
+    }
+
+    // Confirm the panel actually moved: some pipelines silently hold native timing and hardware-scale, so latch into render scaling instead of implying a switch that never landed.
+    private void verifyPhysicalSwitch(Display.Mode requested, final int gen) {
+        final int wantW = requested.getPhysicalWidth();
+        final int wantH = requested.getPhysicalHeight();
+        final float wantHz = requested.getRefreshRate();
+        mainHandler.postDelayed(() -> {
+            if (gen != modeRequestGen || !swapActive || externalDisplay == null || panelScalerLocked) {
+                return; // superseded by a newer selection, swap ended, or already known to scale
+            }
+            if (displayManager != null) {
+                Display fresh = displayManager.getDisplay(externalDisplay.getDisplayId());
+                if (fresh != null) externalDisplay = fresh;
+            }
+            Display.Mode now;
+            try {
+                now = externalDisplay.getMode();
+            } catch (Exception e) {
+                return;
+            }
+            if (now == null) return;
+            boolean moved = now.getPhysicalWidth() == wantW && now.getPhysicalHeight() == wantH
+                    && Math.abs(now.getRefreshRate() - wantHz) < 1.5f;
+            if (moved) return;
+            panelScalerLocked = true;
+            Log.i(TAG, "Sink ignored mode switch; native " + now.getPhysicalWidth() + "x"
+                    + now.getPhysicalHeight() + "@" + Math.round(now.getRefreshRate())
+                    + " held — using render scaling");
+            applyOutputMode();
+            callbacks.onSwapStateChanged(true);
+        }, 2500L);
+    }
+
+    // True once the connected sink has been observed to ignore a real mode switch (phone is scaling).
+    public boolean isPanelScaling() {
+        return panelScalerLocked;
+    }
+
+    // The panel's actual output mode, e.g. "3440 × 1440 · 60 Hz" — shown when the phone is scaling.
+    public String getPanelNativeSummary() {
+        if (externalDisplay == null) return "";
+        try {
+            Display.Mode m = externalDisplay.getMode();
+            if (m == null) return "";
+            return m.getPhysicalWidth() + " × " + m.getPhysicalHeight()
+                    + " · " + Math.round(m.getRefreshRate()) + " Hz";
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    private void setRenderBuffer(int w, int h) {
+        if (w <= 0 || h <= 0) return;
+        try { gameView.getHolder().setFixedSize(w, h); } catch (Exception ignore) {}
+    }
+
+    private void clearRenderBuffer() {
+        try { gameView.getHolder().setSizeFromLayout(); } catch (Exception ignore) {}
+    }
+
+    // Push the external surface toward a refresh rate (API 30+). FIXED_SOURCE + CHANGE_FRAME_RATE_ALWAYS requests a non-seamless switch to the nearest mode; still only a vote (no-op if the panel can't produce it).
+    private void requestSurfaceFrameRate(float hz) {
+        if (hz <= 0f || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return;
+        try {
+            Surface s = gameView.getHolder().getSurface();
+            if (s == null || !s.isValid()) return;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                s.setFrameRate(hz, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
+                        Surface.CHANGE_FRAME_RATE_ALWAYS);
+            } else {
+                s.setFrameRate(hz, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE);
+            }
+        } catch (Exception ignore) {}
+    }
+
+    // ── Game mode (HDMI ALLM / minimal post-processing) ────────────────────
+
+    public boolean isGameModeSupported() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R || externalDisplay == null) return false;
+        try {
+            return externalDisplay.isMinimalPostProcessingSupported();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public boolean isGameModeEnabled() {
+        return gameMode;
+    }
+
+    public void setGameMode(boolean enabled) {
+        gameMode = enabled;
+        applyGameMode();
+    }
+
+    private void applyGameMode() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return;
+        if (presentation == null || presentation.getWindow() == null) return;
+        try {
+            if (isGameModeSupported()) {
+                presentation.getWindow().setPreferMinimalPostProcessing(gameMode);
+            }
+        } catch (Exception ignore) {}
+    }
+
+    // ── Viture XR glasses (USB control, only when Viture glasses are connected) ──
+
+    public boolean isVitureConnected() {
+        return viture.isConnected();
+    }
+
+    // Viture sink check usable before a swap: USB control up, or the available display's EDID says VITURE.
+    public boolean isVitureSinkAvailable() {
+        if (viture.isConnected()) return true;
+        String name = describeDisplay(findExternalDisplay());
+        return !name.isEmpty() && name.toUpperCase(java.util.Locale.ROOT).contains("VITURE");
+    }
+
+    public String getVitureName() {
+        return viture.modelName();
+    }
+
+    public boolean vitureSupportsBrightness() {
+        return viture.supportsBrightness();
+    }
+
+    public boolean vitureSupportsFilm() {
+        return viture.supportsFilm();
+    }
+
+    public boolean vitureFilmStepped() {
+        return viture.filmIsStepped();
+    }
+
+    public boolean vitureSupports3D() {
+        return viture.supports3D();
+    }
+
+    public int getVitureBrightnessMax() {
+        return viture.brightnessMax();
+    }
+
+    public int getVitureBrightness() {
+        return GlassesManager.INSTANCE.currentBrightness();
+    }
+
+    public int getVitureFilm() {
+        return GlassesManager.INSTANCE.isSunblock() ? 1 : 0;
+    }
+
+    public boolean isViture3D() {
+        return GlassesManager.INSTANCE.is3D();
+    }
+
+    public boolean vitureSupportsVolume() {
+        return viture.supportsVolume();
+    }
+
+    public int getVitureVolumeMax() {
+        return viture.volumeMax();
+    }
+
+    public int getVitureVolume() {
+        return GlassesManager.INSTANCE.currentVolume();
+    }
+
+    public void setVitureVolume(int level) {
+        GlassesManager.INSTANCE.setVolume(level);
+    }
+
+    public void setVitureBrightness(int level) {
+        GlassesManager.INSTANCE.setBrightness(level);
+    }
+
+    public void setVitureFilm(int level) {
+        GlassesManager.INSTANCE.setSunblock(level > 0);
+    }
+
+    public void setViture3D(boolean enabled) {
+        GlassesManager.INSTANCE.set3D(enabled);
+    }
+
+    // ── Phone refresh / present mode (touch-lag mitigation) ────────────────
+
+    // Keep the phone panel at its max refresh while an external display is attached.
+    private void applyHighRefreshToPhone() {
+        if (activity.getWindow() == null || displayManager == null) return;
+        Display def = displayManager.getDisplay(Display.DEFAULT_DISPLAY);
+        if (def == null) return;
+        float maxRate = 0f;
+        for (Display.Mode m : def.getSupportedModes()) maxRate = Math.max(maxRate, m.getRefreshRate());
+        if (maxRate <= 0f) return;
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        savedPhoneRefreshRate = lp.preferredRefreshRate;
+        lp.preferredRefreshRate = maxRate;
+        activity.getWindow().setAttributes(lp);
+    }
+
+    private void restorePhoneRefresh() {
+        if (activity.getWindow() == null) return;
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.preferredRefreshRate = savedPhoneRefreshRate;
+        activity.getWindow().setAttributes(lp);
+    }
+
+    private void applyExternalPresentMode() {
+        VulkanRenderer r = gameView.getRenderer();
+        if (r == null) return;
+        savedPresentMode = r.getPresentMode();
+        r.setPresentMode(VulkanRenderer.PRESENT_MODE_MAILBOX);
+    }
+
+    private void restorePresentMode() {
+        VulkanRenderer r = gameView.getRenderer();
+        if (r != null) r.setPresentMode(savedPresentMode);
+    }
+
+    // ── Aspect ratio (fill mode) ───────────────────────────────────────────
+
+    public int getFillMode() {
+        return fillMode;
+    }
+
+    public void selectFillMode(int mode) {
+        fillMode = mode;
+        applyFillModeToRenderer();
+    }
+
+    private void applyFillModeToRenderer() {
+        VulkanRenderer renderer = gameView.getRenderer();
+        if (renderer != null) renderer.setFillMode(fillMode);
+    }
+
+    // ── Small helpers ──────────────────────────────────────────────────────
+
+    private static boolean containsRes(List<int[]> list, int w, int h) {
+        for (int[] r : list) if (r[0] == w && r[1] == h) return true;
+        return false;
+    }
+
+    private boolean containsResEntry(int w, int h) {
+        for (ResEntry r : resolutions) if (r.w == w && r.h == h) return true;
+        return false;
+    }
+
+    private static void addRate(List<Float> list, float r) {
+        if (r <= 0f) return;
+        for (float e : list) if (Math.abs(e - r) < REFRESH_EPSILON) return;
+        list.add(r);
+    }
+
+    private int closestRateIndex(float target) {
+        int best = 0;
+        float bestDiff = Float.MAX_VALUE;
+        for (int i = 0; i < refreshOptions.size(); i++) {
+            float diff = Math.abs(refreshOptions.get(i) - target);
+            if (diff < bestDiff) { bestDiff = diff; best = i; }
+        }
+        return best;
+    }
+
+    private static String resLabel(int w, int h, boolean isNative) {
+        String base;
+        switch (h) {
+            case 2160: base = "2160p · 4K"; break;
+            case 1440: base = "1440p · 2K"; break;
+            case 1080: base = "1080p"; break;
+            case 720:  base = "720p"; break;
+            case 480:  base = "480p"; break;
+            default:   base = w + " × " + h; break;
+        }
+        return isNative ? base + " · native" : base;
+    }
+
+    private static int clampIndex(int index, int size) {
+        if (size <= 0) return 0;
+        return Math.max(0, Math.min(index, size - 1));
+    }
+
+    private static float round1(float v) {
+        return Math.round(v * 10f) / 10f;
+    }
+
+    // Black full-screen presentation whose container holds the moved game view.
+    private static final class GamePresentation extends Presentation {
+        private FrameLayout container;
+
+        GamePresentation(Context outerContext, Display display) {
+            super(outerContext, display);
+        }
+
+        FrameLayout getContainer() {
+            return container;
+        }
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            container = new FrameLayout(getContext());
+            container.setBackgroundColor(Color.BLACK);
+            container.setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            setContentView(container);
+            View decor = getWindow() != null ? getWindow().getDecorView() : null;
+            if (decor != null) {
+                decor.setSystemUiVisibility(
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+            }
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/GlassesManager.kt b/app/src/main/runtime/display/GlassesManager.kt
new file mode 100644
index 000000000..31532def8
--- /dev/null
+++ b/app/src/main/runtime/display/GlassesManager.kt
@@ -0,0 +1,126 @@
+package com.winlator.cmod.runtime.display
+
+import android.content.Context
+import android.content.SharedPreferences
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import java.util.concurrent.CopyOnWriteArrayList
+
+// App-wide owner of the single Viture USB controller + persisted settings, shared by the library and the in-game swap so only one component claims the USB. Settings persist and re-apply on every (re)connect.
+object GlassesManager {
+
+    data class Settings(
+        val refreshHz: Int = 120,
+        val brightness: Int = -1, // -1 = full (100%) until the user picks a level
+        val volume: Int = -1,     // -1 = full (100%) until the user picks a level
+        val sunblock: Boolean = true, // glasses ship with the film on; match that by default
+        val threeD: Boolean = false,
+        val renderHeight: Int = 0, // 0 = native panel resolution; otherwise a render-scaling height
+    )
+
+    fun interface Listener { fun onGlassesChanged(connectionChanged: Boolean) }
+
+    private var viture: VitureGlasses? = null
+    private var prefs: SharedPreferences? = null
+    private val listeners = CopyOnWriteArrayList<Listener>()
+
+    private val _connected = MutableStateFlow(false)
+    val connected: StateFlow<Boolean> = _connected.asStateFlow()
+    private val _settings = MutableStateFlow(Settings())
+    val settings: StateFlow<Settings> = _settings.asStateFlow()
+
+    @Synchronized
+    fun init(context: Context) {
+        if (viture != null) return
+        val app = context.applicationContext
+        prefs = app.getSharedPreferences("viture_glasses", Context.MODE_PRIVATE)
+        _settings.value = load()
+        viture = VitureGlasses(app).also { v ->
+            v.setConnectionListener { c -> onConnectionChanged(c) }
+            v.attach()
+        }
+    }
+
+    fun glasses(): VitureGlasses? = viture
+    fun isConnected(): Boolean = viture?.isConnected() == true
+    fun modelName(): String = viture?.modelName() ?: "Viture"
+    fun supportsBrightness(): Boolean = viture?.supportsBrightness() == true
+    fun supportsVolume(): Boolean = viture?.supportsVolume() == true
+    fun supportsFilm(): Boolean = viture?.supportsFilm() == true
+    fun supports3D(): Boolean = viture?.supports3D() == true
+    fun brightnessMax(): Int = viture?.brightnessMax() ?: 8
+    fun volumeMax(): Int = viture?.volumeMax() ?: 8
+
+    fun currentRefreshHz(): Int = _settings.value.refreshHz
+    fun currentBrightness(): Int = _settings.value.brightness.let { if (it >= 0) it else brightnessMax() }
+    fun currentVolume(): Int = _settings.value.volume.let { if (it >= 0) it else volumeMax() }
+    fun isSunblock(): Boolean = _settings.value.sunblock
+    fun is3D(): Boolean = _settings.value.threeD
+    fun currentRenderHeight(): Int = _settings.value.renderHeight
+
+    fun addListener(l: Listener) { listeners.add(l) }
+    fun removeListener(l: Listener) { listeners.remove(l) }
+
+    private fun onConnectionChanged(c: Boolean) {
+        _connected.value = c
+        if (c) applyAll()
+        notifyListeners(true)
+    }
+
+    private fun applyAll() {
+        val s = _settings.value
+        viture?.let { v ->
+            v.forceRefreshHz(s.refreshHz)
+            v.setBrightness(if (s.brightness < 0) v.brightnessMax() else s.brightness)
+            v.setVolume(if (s.volume < 0) v.volumeMax() else s.volume)
+            v.setFilm(if (s.sunblock) 1 else 0)
+            if (s.threeD) v.set3D(true)
+        }
+    }
+
+    fun setRefreshHz(hz: Int) { update { it.copy(refreshHz = hz) }; viture?.forceRefreshHz(hz) }
+    fun persistRefreshHz(hz: Int) { update { it.copy(refreshHz = hz) } } // caller already applied the mode
+    fun setBrightness(value: Int) { update { it.copy(brightness = value) }; viture?.setBrightness(value) }
+    fun setVolume(value: Int) { update { it.copy(volume = value) }; viture?.setVolume(value) }
+    fun setSunblock(on: Boolean) { update { it.copy(sunblock = on) }; viture?.setFilm(if (on) 1 else 0) }
+    fun set3D(on: Boolean) {
+        update { it.copy(threeD = on) }
+        if (on) viture?.set3D(true) else viture?.forceRefreshHz(currentRefreshHz())
+    }
+    fun setRenderHeight(height: Int) { update { it.copy(renderHeight = height) } }
+
+    private fun update(transform: (Settings) -> Settings) {
+        val next = transform(_settings.value)
+        _settings.value = next
+        save(next)
+        notifyListeners(false)
+    }
+
+    private fun notifyListeners(connectionChanged: Boolean) {
+        listeners.forEach { it.onGlassesChanged(connectionChanged) }
+    }
+
+    private fun load(): Settings {
+        val p = prefs ?: return Settings()
+        return Settings(
+            p.getInt("refreshHz", 120),
+            p.getInt("brightness", -1),
+            p.getInt("volume", -1),
+            p.getBoolean("sunblock", true),
+            p.getBoolean("threeD", false),
+            p.getInt("renderHeight", 0),
+        )
+    }
+
+    private fun save(s: Settings) {
+        prefs?.edit()?.apply {
+            putInt("refreshHz", s.refreshHz)
+            putInt("brightness", s.brightness)
+            putInt("volume", s.volume)
+            putBoolean("sunblock", s.sunblock)
+            putBoolean("threeD", s.threeD)
+            putInt("renderHeight", s.renderHeight)
+        }?.apply()
+    }
+}
diff --git a/app/src/main/runtime/display/PerformanceHud.kt b/app/src/main/runtime/display/PerformanceHud.kt
new file mode 100644
index 000000000..257e03cfe
--- /dev/null
+++ b/app/src/main/runtime/display/PerformanceHud.kt
@@ -0,0 +1,200 @@
+package com.winlator.cmod.runtime.display
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+// Single source of truth for the perf HUD (FrameRating pushes values, the menu pushes the enabled set). Element indices: 0 FPS, 1 renderer, 2 GPU, 3 CPU, 4 RAM, 5 battery+temp, 6 frametime.
+object PerformanceHudState {
+    data class Snapshot(
+        val enabled: BooleanArray = BooleanArray(7),
+        val fps: Float = 0f,
+        val frametimeMs: Float = 0f,
+        val gpuLoad: Int = -1,
+        val cpuPercent: Int = -1,
+        val ramPercent: Int = -1,
+        val batteryWatts: Float = 0f,
+        val tempC: Int = -1,
+        val renderer: String = "",
+    )
+
+    private val _state = MutableStateFlow(Snapshot())
+    val state: StateFlow<Snapshot> = _state.asStateFlow()
+    private val _visible = MutableStateFlow(false)
+    val visible: StateFlow<Boolean> = _visible.asStateFlow()
+
+    @JvmStatic
+    fun setVisible(v: Boolean) { _visible.value = v }
+
+    @JvmStatic
+    fun updateEnabled(enabled: BooleanArray) {
+        _state.value = _state.value.copy(enabled = enabled.copyOf())
+    }
+
+    @JvmStatic
+    fun updateValues(
+        fps: Float, frametimeMs: Float, gpuLoad: Int, cpuPercent: Int,
+        ramPercent: Int, batteryWatts: Float, tempC: Int, renderer: String,
+    ) {
+        _state.value = _state.value.copy(
+            fps = fps, frametimeMs = frametimeMs, gpuLoad = gpuLoad, cpuPercent = cpuPercent,
+            ramPercent = ramPercent, batteryWatts = batteryWatts, tempC = tempC, renderer = renderer,
+        )
+    }
+}
+
+private val HudAccent = Color(0xFF1A9FFF)
+private val HudGood = Color(0xFF35D0BA)
+private val HudWarn = Color(0xFFFFB020)
+private val HudBad = Color(0xFFFF5A5A)
+private val HudText = Color(0xFFF0F4FF)
+private val HudSub = Color(0xFF7A8FA8)
+private val HudTrack = Color(0x33FFFFFF)
+
+private data class GaugeSpec(
+    val label: String,
+    val value: String,
+    val fraction: Float,
+    val color: Color,
+    val sublabel: String? = null,
+    val sublabelColor: Color = HudSub,
+)
+
+@Composable
+fun PerformanceHudOverlay(modifier: Modifier = Modifier) {
+    val s by PerformanceHudState.state.collectAsState()
+    // A gauge stays while its element is enabled; a momentarily-unavailable value shows N/A rather than dropping the gauge (which would make the row jump).
+    val gauges = ArrayList<GaugeSpec>(8)
+    if (s.enabled.getOrElse(0) { false }) {
+        gauges.add(GaugeSpec("FPS", s.fps.toInt().toString(), s.fps / 120f, HudAccent))
+    }
+    if (s.enabled.getOrElse(2) { false }) {
+        gauges.add(GaugeSpec("GPU", pctText(s.gpuLoad), pctFraction(s.gpuLoad), loadColor(maxOf(s.gpuLoad, 0))))
+    }
+    if (s.enabled.getOrElse(3) { false }) {
+        gauges.add(GaugeSpec("CPU", pctText(maxOf(s.cpuPercent, 0)), pctFraction(maxOf(s.cpuPercent, 0)), loadColor(maxOf(s.cpuPercent, 0))))
+    }
+    if (s.enabled.getOrElse(4) { false }) {
+        gauges.add(GaugeSpec("RAM", pctText(s.ramPercent), pctFraction(s.ramPercent), loadColor(maxOf(s.ramPercent, 0))))
+    }
+    if (s.enabled.getOrElse(6) { false }) {
+        gauges.add(GaugeSpec("ms", String.format("%.1f", s.frametimeMs), 1f - (s.frametimeMs / 33.3f), HudGood))
+    }
+    if (s.enabled.getOrElse(5) { false }) {
+        // Battery + temperature is a single HUD element: watts is the gauge value, temp the sublabel.
+        gauges.add(GaugeSpec(
+            "WATT", if (s.batteryWatts >= 0f) String.format("%.1f", s.batteryWatts) else "N/A",
+            if (s.batteryWatts >= 0f) s.batteryWatts / 12f else 0f, HudAccent,
+            sublabel = if (s.tempC >= 0) "${s.tempC}°C" else null,
+            sublabelColor = if (s.tempC >= 0) tempColor(s.tempC) else HudSub,
+        ))
+    }
+    val showRenderer = s.enabled.getOrElse(1) { false } && s.renderer.isNotEmpty()
+    Box(
+        modifier = modifier.fillMaxSize().background(Color(0xF00A0D13)),
+    ) {
+        Column(
+            modifier = Modifier
+                .align(Alignment.Center)
+                .padding(horizontal = 16.dp)
+                .padding(bottom = if (showRenderer) 48.dp else 0.dp),
+            verticalArrangement = Arrangement.spacedBy(18.dp, Alignment.CenterVertically),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            gauges.chunked(3).forEach { rowGauges ->
+                Row(horizontalArrangement = Arrangement.spacedBy(18.dp, Alignment.CenterHorizontally)) {
+                    rowGauges.forEach { g -> HudGauge(g.label, g.value, g.fraction, g.color, g.sublabel, g.sublabelColor) }
+                }
+            }
+        }
+        if (showRenderer) {
+            // Pinned just above the bottom edge so it is never clipped, regardless of gauge count.
+            Text(
+                s.renderer,
+                color = HudAccent,
+                fontSize = 18.sp,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .padding(bottom = 18.dp)
+                    .clip(RoundedCornerShape(9.dp))
+                    .background(Color(0x1A1A9FFF))
+                    .padding(horizontal = 16.dp, vertical = 6.dp),
+            )
+        }
+    }
+}
+
+private fun pctText(v: Int): String = if (v >= 0) "$v%" else "N/A"
+
+private fun pctFraction(v: Int): Float = if (v >= 0) v / 100f else 0f
+
+private fun loadColor(pct: Int): Color =
+    if (pct >= 90) HudBad else if (pct >= 70) HudWarn else HudGood
+
+private fun tempColor(c: Int): Color =
+    if (c >= 45) HudBad else if (c >= 40) HudWarn else HudGood
+
+@Composable
+private fun HudGauge(
+    label: String,
+    valueText: String,
+    fraction: Float,
+    accent: Color,
+    sublabel: String? = null,
+    sublabelColor: Color = HudSub,
+) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(4.dp),
+    ) {
+        Box(contentAlignment = Alignment.Center, modifier = Modifier.size(86.dp)) {
+            Canvas(modifier = Modifier.fillMaxSize()) {
+                val stroke = 7.dp.toPx()
+                val inset = stroke / 2f
+                val arcSize = Size(size.width - stroke, size.height - stroke)
+                drawArc(
+                    color = HudTrack, startAngle = 135f, sweepAngle = 270f, useCenter = false,
+                    topLeft = Offset(inset, inset), size = arcSize,
+                    style = Stroke(width = stroke, cap = StrokeCap.Round),
+                )
+                drawArc(
+                    color = accent, startAngle = 135f, sweepAngle = 270f * fraction.coerceIn(0f, 1f),
+                    useCenter = false, topLeft = Offset(inset, inset), size = arcSize,
+                    style = Stroke(width = stroke, cap = StrokeCap.Round),
+                )
+            }
+            Text(valueText, color = HudText, fontSize = 21.sp, fontWeight = FontWeight.Bold)
+        }
+        Text(label, color = HudSub, fontSize = 13.sp, fontWeight = FontWeight.Medium)
+        if (sublabel != null) {
+            Text(sublabel, color = sublabelColor, fontSize = 12.sp, fontWeight = FontWeight.Medium)
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/ReshadeLoadoutItem.kt b/app/src/main/runtime/display/ReshadeLoadoutItem.kt
new file mode 100644
index 000000000..9f27f3185
--- /dev/null
+++ b/app/src/main/runtime/display/ReshadeLoadoutItem.kt
@@ -0,0 +1,11 @@
+package com.winlator.cmod.runtime.display
+
+import com.winlator.cmod.runtime.reshade.ReshadeManager
+
+// values keys: "<uniform>", or "<uniform>_<c>" per channel for COLOR params
+data class ReshadeLoadoutItem(
+    val name: String,
+    val enabled: Boolean,
+    val params: List<ReshadeManager.ReshadeParam>,
+    val values: Map<String, Float>,
+)
diff --git a/app/src/main/runtime/display/SGSRResolutionUtils.java b/app/src/main/runtime/display/SGSRResolutionUtils.java
new file mode 100644
index 000000000..0ae0a8f46
--- /dev/null
+++ b/app/src/main/runtime/display/SGSRResolutionUtils.java
@@ -0,0 +1,63 @@
+package com.winlator.cmod.runtime.display;
+
+public final class SGSRResolutionUtils {
+    private SGSRResolutionUtils() {}
+
+    public static float getUpscaleFactor(int mode) {
+        switch (mode) {
+            case 1: return 1.0f;
+            case 2: return 1.25f;
+            case 3: return 1.3333334f;
+            case 4: return 1.5f;
+            case 5: return 1.6666667f;
+            case 6: return 2.0f;
+            default: return 1.0f;
+        }
+    }
+
+    public static int clampUpscaleMode(int mode) {
+        return Math.max(1, Math.min(6, mode));
+    }
+
+    public static int normalizeShortcutUpscaleMode(int mode) {
+        return clampUpscaleMode(mode);
+    }
+
+    public static boolean modeAdjustsScreenSize(int mode) {
+        return mode >= 2 && mode <= 6;
+    }
+
+    public static int[] parseScreenSize(String value) {
+        if (value == null || value.isEmpty()) return null;
+        String[] parts = value.split("x");
+        if (parts.length != 2) return null;
+        try {
+            int width = Integer.parseInt(parts[0].trim());
+            int height = Integer.parseInt(parts[1].trim());
+            if (width <= 0 || height <= 0) return null;
+            return new int[]{width, height};
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    public static String applyRenderScale(String baseScreenSize, boolean sgsrEnabled, int mode) {
+        if (baseScreenSize == null || baseScreenSize.isEmpty()) return baseScreenSize;
+        if (!sgsrEnabled) return baseScreenSize;
+        if (!modeAdjustsScreenSize(mode)) return baseScreenSize;
+
+        float factor = getUpscaleFactor(mode);
+        if (factor <= 1.0f) return baseScreenSize;
+
+        int[] base = parseScreenSize(baseScreenSize);
+        if (base == null) return baseScreenSize;
+
+        int scaledW = Math.max(320, Math.round((float) base[0] / factor));
+        int scaledH = Math.max(180, Math.round((float) base[1] / factor));
+        return evenDimension(scaledW) + "x" + evenDimension(scaledH);
+    }
+
+    private static int evenDimension(int value) {
+        return (value & 1) == 0 ? value : value + 1;
+    }
+}
diff --git a/app/src/main/runtime/display/SteamExecutableInfo.java b/app/src/main/runtime/display/SteamExecutableInfo.java
new file mode 100644
index 000000000..2db2eda75
--- /dev/null
+++ b/app/src/main/runtime/display/SteamExecutableInfo.java
@@ -0,0 +1,13 @@
+package com.winlator.cmod.runtime.display;
+import java.io.File;
+
+// Steam executable descriptor split out of XServerDisplayActivity.
+class SteamExecutableInfo {
+    final String relativePath;
+    final File file;
+
+    SteamExecutableInfo(String relativePath, File file) {
+        this.relativePath = relativePath;
+        this.file = file;
+    }
+}
diff --git a/app/src/main/runtime/display/VitureGlasses.kt b/app/src/main/runtime/display/VitureGlasses.kt
new file mode 100644
index 000000000..97c280d69
--- /dev/null
+++ b/app/src/main/runtime/display/VitureGlasses.kt
@@ -0,0 +1,369 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.usb.UsbConstants
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.hardware.usb.UsbInterface
+import android.hardware.usb.UsbManager
+import android.os.Build
+import android.util.Log
+
+// Controls Viture XR glasses over their USB MCU interface: force panel refresh/3D, set brightness/electrochromic shade. Active only for real Viture glasses (vendor 0x35CA); TVs/monitors use the Android path.
+class VitureGlasses(private val context: Context) {
+
+    fun interface ConnectionListener {
+        fun onVitureConnectionChanged(connected: Boolean)
+    }
+
+    companion object {
+        private const val TAG = "VitureGlasses"
+        const val VENDOR_ID = 0x35CA
+        private const val ACTION_PERMISSION = "com.winlator.cmod.USB_PERMISSION_VITURE"
+
+        // Product ids grouped by the command dialect the firmware speaks.
+        private val PID_ONE = intArrayOf(0x1011, 0x1013, 0x1015, 0x1017, 0x101b)
+        private val PID_BEAST = intArrayOf(0x1201, 0x1211)
+
+        // MCU command ids (msgId). Display/3D are the high-confidence path; the rest vary per model.
+        private const val MSG_DISPLAY = 0x0008
+        private const val MSG_DISPLAY_BEAST = 0x0124
+        private const val MSG_BRIGHTNESS = 0x0006
+        private const val MSG_BRIGHTNESS_BEAST = 0x0122
+        private const val MSG_FILM_BINARY = 0x000E     // One: clear/dark only
+        private const val MSG_FILM_STEPPED = 0x0330    // newer: 0..8 steps
+        private const val MSG_VOLUME = 0x0033
+        private const val MSG_VOLUME_BEAST = 0x0201
+
+        // Display-mode bytes the firmware accepts (1080p family).
+        const val MODE_1080P_60 = 0x31
+        const val MODE_3840X1080_60 = 0x32 // side-by-side / 3D
+        const val MODE_1080P_90 = 0x33
+        const val MODE_1080P_120 = 0x34
+
+        private const val PACKET_SIZE = 64
+
+        // CRC-16/XMODEM table (poly 0x1021, init 0).
+        private val CRC_TABLE = IntArray(256).also { t ->
+            for (i in 0 until 256) {
+                var c = i shl 8
+                repeat(8) { c = if (c and 0x8000 != 0) (c shl 1) xor 0x1021 else c shl 1 }
+                t[i] = c and 0xFFFF
+            }
+        }
+    }
+
+    private val usbManager = context.getSystemService(Context.USB_SERVICE) as UsbManager
+    private var connection: UsbDeviceConnection? = null
+    private var commandInterface: UsbInterface? = null
+    private var controlInterface: UsbInterface? = null
+    private var outEndpoint: UsbEndpoint? = null
+    private var inEndpoint: UsbEndpoint? = null   // MCU INT-IN (ep 0x82) — state reports / verify
+    private var productId = 0
+    private var permissionPending = false
+    private var listener: ConnectionListener? = null
+    private var receiversRegistered = false
+
+    private val receiver = object : BroadcastReceiver() {
+        override fun onReceive(c: Context, intent: Intent) {
+            when (intent.action) {
+                ACTION_PERMISSION -> {
+                    permissionPending = false
+                    val device = intent.deviceExtra()
+                    if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false) && device != null) {
+                        openDevice(device)
+                    }
+                }
+                UsbManager.ACTION_USB_DEVICE_ATTACHED -> attach()
+                UsbManager.ACTION_USB_DEVICE_DETACHED ->
+                    if (intent.deviceExtra()?.vendorId == VENDOR_ID) closeConnection()
+            }
+        }
+    }
+
+    fun setConnectionListener(l: ConnectionListener?) {
+        listener = l
+    }
+
+    // Detect connected Viture glasses and open the command interface (requesting USB permission if needed).
+    fun attach() {
+        registerReceivers()
+        if (connection != null) return
+        val device = findVitureDevice() ?: return
+        productId = device.productId
+        if (usbManager.hasPermission(device)) {
+            openDevice(device)
+        } else if (!permissionPending) {
+            requestPermission(device)
+        }
+    }
+
+    fun detach() {
+        closeConnection()
+        if (receiversRegistered) {
+            try { context.unregisterReceiver(receiver) } catch (ignore: Exception) {}
+            receiversRegistered = false
+        }
+    }
+
+    private fun closeConnection() {
+        val wasConnected = connection != null
+        connection?.let { c ->
+            commandInterface?.let { c.releaseInterface(it) }
+            controlInterface?.let { c.releaseInterface(it) }
+            c.close()
+        }
+        connection = null
+        commandInterface = null
+        controlInterface = null
+        outEndpoint = null
+        inEndpoint = null
+        if (wasConnected) listener?.onVitureConnectionChanged(false)
+    }
+
+    fun isConnected(): Boolean = connection != null && outEndpoint != null
+
+    fun modelName(): String = when {
+        productId == 0 -> "Viture"
+        isBeast() -> "Viture Beast"
+        isOne() -> "Viture One"
+        else -> "Viture"
+    }
+
+    // ── Capabilities (all gated on a real connection) ──────────────────────
+
+    fun supportsBrightness(): Boolean = isConnected()
+    fun supports3D(): Boolean = isConnected()
+    fun supportsFilm(): Boolean = isConnected()
+    // Only Beast uses the stepped 0..8 film (msgId 0x0330); every other model is binary on/off (0x000E).
+    fun filmIsStepped(): Boolean = isBeast()
+    fun brightnessMax(): Int = if (isOne()) 6 else 8
+
+    // ── High-level controls ────────────────────────────────────────────────
+
+    /** Force the panel timing. hz 120/90/60 maps to the 1080p mode bytes (0x34/0x33/0x31). */
+    fun forceRefreshHz(hz: Int): Boolean {
+        val mode = when {
+            hz >= 120 -> MODE_1080P_120
+            hz >= 90 -> MODE_1080P_90
+            else -> MODE_1080P_60
+        }
+        return setDisplayMode(mode)
+    }
+
+    fun setDisplayMode(modeByte: Int): Boolean {
+        val msg = if (isBeast()) MSG_DISPLAY_BEAST else MSG_DISPLAY
+        return send(msg, byteArrayOf(modeByte.toByte()))
+    }
+
+    /** 3D/SBS is the same display-mode command (0x32 = side-by-side on, 0x31 = off). */
+    fun set3D(enabled: Boolean): Boolean =
+        setDisplayMode(if (enabled) MODE_3840X1080_60 else MODE_1080P_60)
+
+    fun setBrightness(level: Int): Boolean {
+        val msg = if (isBeast()) MSG_BRIGHTNESS_BEAST else MSG_BRIGHTNESS
+        val v = level.coerceIn(0, brightnessMax())
+        return send(msg, byteArrayOf(v.toByte(), 0))
+    }
+
+    // Electrochromic shade — stepped 0..8 (newer) or binary 0/1 (One).
+    fun setFilm(level: Int): Boolean {
+        return if (filmIsStepped()) {
+            send(MSG_FILM_STEPPED, byteArrayOf(level.coerceIn(0, 8).toByte()))
+        } else {
+            send(MSG_FILM_BINARY, byteArrayOf(if (level > 0) 1 else 0))
+        }
+    }
+
+    // Glasses hardware volume (0..15 on Beast, else 0..8).
+    fun setVolume(level: Int): Boolean {
+        val msg = if (isBeast()) MSG_VOLUME_BEAST else MSG_VOLUME
+        return send(msg, byteArrayOf(level.coerceIn(0, volumeMax()).toByte(), 0))
+    }
+
+    fun supportsVolume(): Boolean = isConnected()
+    fun volumeMax(): Int = if (isBeast()) 15 else 8
+
+    // ── USB plumbing ───────────────────────────────────────────────────────
+
+    private fun findVitureDevice(): UsbDevice? =
+        usbManager.deviceList.values.firstOrNull { it.vendorId == VENDOR_ID }
+
+    private fun registerReceivers() {
+        if (receiversRegistered) return
+        val filter = IntentFilter(ACTION_PERMISSION).apply {
+            addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
+            addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            context.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            context.registerReceiver(receiver, filter)
+        }
+        receiversRegistered = true
+    }
+
+    private fun requestPermission(device: UsbDevice) {
+        registerReceivers()
+        permissionPending = true
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0
+        val pi = PendingIntent.getBroadcast(context, 0, Intent(ACTION_PERMISSION).setPackage(context.packageName), flags)
+        usbManager.requestPermission(device, pi)
+    }
+
+    private fun openDevice(device: UsbDevice) {
+        logInterfaces(device)
+        val cmd = findCommandInterface(device) ?: run {
+            Log.w(TAG, "No OUT endpoint found on ${device.productId.toHex16()}")
+            return
+        }
+        val conn = usbManager.openDevice(device) ?: run { Log.w(TAG, "openDevice failed"); return }
+        if (!conn.claimInterface(cmd.first, true)) {
+            conn.close()
+            Log.w(TAG, "claimInterface ${cmd.first.id} failed")
+            return
+        }
+        // CDC-Data (class 10) usually needs the paired CDC control interface claimed and DTR/RTS asserted (SET_CONTROL_LINE_STATE) before the bulk pipe carries data.
+        var ctrl: UsbInterface? = null
+        if (cmd.first.interfaceClass == 10) {
+            ctrl = findInterfaceByClass(device, 2)
+            if (ctrl != null && conn.claimInterface(ctrl, true)) {
+                conn.controlTransfer(0x21, 0x22, 0x03, ctrl.id, null, 0, 200)
+            }
+        }
+        connection = conn
+        commandInterface = cmd.first
+        controlInterface = ctrl
+        outEndpoint = cmd.second
+        inEndpoint = findInEndpoint(cmd.first)
+        productId = device.productId
+        Log.i(TAG, "Viture ${modelName()} opened: pid=${productId.toHex16()} cmdIface=${cmd.first.id} class=${cmd.first.interfaceClass} outEp=0x%02X(%s) ctrlIface=%s"
+            .format(cmd.second.address, epType(cmd.second.type), ctrl?.id?.toString() ?: "-"))
+        listener?.onVitureConnectionChanged(true)
+    }
+
+    // The MCU is the highest-numbered HID interface with an interrupt-OUT endpoint (the lower one is the IMU); falls back to bulk/any OUT.
+    private fun findCommandInterface(device: UsbDevice): Pair<UsbInterface, UsbEndpoint>? {
+        var hidMcu: Pair<UsbInterface, UsbEndpoint>? = null
+        var bulk: Pair<UsbInterface, UsbEndpoint>? = null
+        var intr: Pair<UsbInterface, UsbEndpoint>? = null
+        for (i in 0 until device.interfaceCount) {
+            val intf = device.getInterface(i)
+            for (e in 0 until intf.endpointCount) {
+                val ep = intf.getEndpoint(e)
+                if (ep.direction != UsbConstants.USB_DIR_OUT) continue
+                when (ep.type) {
+                    UsbConstants.USB_ENDPOINT_XFER_INT -> {
+                        if (intf.interfaceClass == UsbConstants.USB_CLASS_HID &&
+                            (hidMcu == null || intf.id > hidMcu!!.first.id)
+                        ) hidMcu = intf to ep
+                        if (intr == null) intr = intf to ep
+                    }
+                    UsbConstants.USB_ENDPOINT_XFER_BULK -> if (bulk == null) bulk = intf to ep
+                }
+            }
+        }
+        return hidMcu ?: bulk ?: intr
+    }
+
+    private fun findInterfaceByClass(device: UsbDevice, cls: Int): UsbInterface? {
+        for (i in 0 until device.interfaceCount) {
+            val intf = device.getInterface(i)
+            if (intf.interfaceClass == cls) return intf
+        }
+        return null
+    }
+
+    // The command interface's interrupt-IN endpoint (ep 0x82) — carries MCU state reports.
+    private fun findInEndpoint(intf: UsbInterface): UsbEndpoint? {
+        for (e in 0 until intf.endpointCount) {
+            val ep = intf.getEndpoint(e)
+            if (ep.direction == UsbConstants.USB_DIR_IN) return ep
+        }
+        return null
+    }
+
+    // Read one MCU report (FF FD | crc | len | 0000 | seq | msgId | flag | value) if one is queued.
+    fun readState(timeoutMs: Int = 200): ByteArray? {
+        val conn = connection ?: return null
+        val ep = inEndpoint ?: return null
+        val buf = ByteArray(PACKET_SIZE)
+        val n = conn.bulkTransfer(ep, buf, buf.size, timeoutMs)
+        return if (n > 0) buf.copyOf(n) else null
+    }
+
+    private fun logInterfaces(device: UsbDevice) {
+        for (i in 0 until device.interfaceCount) {
+            val intf = device.getInterface(i)
+            val eps = (0 until intf.endpointCount).joinToString {
+                val ep = intf.getEndpoint(it)
+                "0x%02X/%s/%s".format(ep.address, if (ep.direction == UsbConstants.USB_DIR_OUT) "OUT" else "IN", epType(ep.type))
+            }
+            Log.i(TAG, "iface ${intf.id} class=${intf.interfaceClass} eps=[$eps]")
+        }
+    }
+
+    private fun epType(t: Int): String = when (t) {
+        UsbConstants.USB_ENDPOINT_XFER_BULK -> "BULK"
+        UsbConstants.USB_ENDPOINT_XFER_INT -> "INT"
+        UsbConstants.USB_ENDPOINT_XFER_ISOC -> "ISO"
+        else -> "CTRL"
+    }
+
+    // Build the V1 packet (FF FE | CRC16 | len | 8-byte header | msgId | 00 00 | payload) and send it.
+    private fun send(msgId: Int, payload: ByteArray): Boolean {
+        val conn = connection
+        val ep = outEndpoint
+        if (conn == null || ep == null) {
+            Log.w(TAG, "send 0x%04X dropped — not connected".format(msgId))
+            return false
+        }
+        val pkt = buildPacket(msgId, payload)
+        val n = conn.bulkTransfer(ep, pkt, pkt.size, 250)
+        Log.i(TAG, "send msgId=0x%04X payload=%s -> %d".format(msgId, payload.toHex(), n))
+        return n >= 0
+    }
+
+    private fun buildPacket(msgId: Int, payload: ByteArray): ByteArray {
+        val buf = ByteArray(PACKET_SIZE)
+        buf[0] = 0xFF.toByte()
+        buf[1] = 0xFE.toByte()
+        val len = if (payload.isEmpty()) 0x0C else payload.size + 0x0C
+        buf[4] = (len and 0xFF).toByte()
+        buf[5] = ((len shr 8) and 0xFF).toByte()
+        buf[14] = (msgId and 0xFF).toByte()
+        buf[15] = ((msgId shr 8) and 0xFF).toByte()
+        if (payload.isNotEmpty()) System.arraycopy(payload, 0, buf, 18, payload.size)
+        val crc = crc16(buf, 4, len + 2)
+        buf[2] = (crc and 0xFF).toByte()
+        buf[3] = ((crc shr 8) and 0xFF).toByte()
+        return buf
+    }
+
+    private fun crc16(data: ByteArray, offset: Int, length: Int): Int {
+        var crc = 0
+        for (i in offset until offset + length) {
+            val b = data[i].toInt() and 0xFF
+            crc = (CRC_TABLE[(b xor (crc ushr 8)) and 0xFF] xor (crc shl 8)) and 0xFFFF
+        }
+        return crc
+    }
+
+    private fun isOne(): Boolean = productId in PID_ONE
+    private fun isBeast(): Boolean = productId in PID_BEAST
+
+    private fun Intent.deviceExtra(): UsbDevice? =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
+        } else {
+            @Suppress("DEPRECATION") getParcelableExtra(UsbManager.EXTRA_DEVICE)
+        }
+
+    private fun Int.toHex16(): String = "0x%04X".format(this)
+    private fun ByteArray.toHex(): String = joinToString("") { "%02X".format(it) }
+}
diff --git a/app/src/main/runtime/display/XServerDisplayActivity.java b/app/src/main/runtime/display/XServerDisplayActivity.java
index 72fb9fefe..ab54da91c 100644
--- a/app/src/main/runtime/display/XServerDisplayActivity.java
+++ b/app/src/main/runtime/display/XServerDisplayActivity.java
@@ -1,12 +1,7 @@
 package com.winlator.cmod.runtime.display;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.ActivityManager;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutManager;
@@ -26,6 +21,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -50,15 +46,12 @@
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.FileProvider;
 import androidx.compose.ui.platform.ComposeView;
 import androidx.core.view.WindowInsetsCompat;
 import com.winlator.cmod.BuildConfig;
+import com.winlator.cmod.feature.leaderboard.SessionRecordingController;
 import com.winlator.cmod.feature.stores.steam.enums.Marker;
 import com.winlator.cmod.feature.stores.steam.utils.MarkerUtils;
 import com.winlator.cmod.feature.stores.steam.utils.PrefManager;
@@ -74,13 +67,15 @@
 import com.winlator.cmod.runtime.container.Container;
 import com.winlator.cmod.runtime.container.ContainerManager;
 import com.winlator.cmod.runtime.container.Shortcut;
+import com.winlator.cmod.runtime.container.WinComponentSetup;
 import com.winlator.cmod.feature.settings.DXVKConfigUtils;
 import com.winlator.cmod.feature.settings.GraphicsDriverConfigUtils;
 import com.winlator.cmod.feature.shortcuts.ShortcutsFragment;
-import com.winlator.cmod.feature.sync.CloudSyncConflictDialog;
-import com.winlator.cmod.feature.sync.CloudSyncConflictTimestamps;
 import com.winlator.cmod.feature.sync.CloudSyncHelper;
-import com.winlator.cmod.feature.stores.steam.ui.SteamClientDownloadFailureDialog;
+import com.winlator.cmod.feature.sync.EpicLaunchCloudSync;
+import com.winlator.cmod.feature.sync.GogLaunchCloudSync;
+import com.winlator.cmod.feature.steamcloudsync.SteamExitCloudSync;
+import com.winlator.cmod.feature.steamcloudsync.SteamLaunchCloudSync;
 import com.winlator.cmod.feature.settings.WineD3DConfigUtils;
 import com.winlator.cmod.runtime.compat.SteamBridge;
 import com.winlator.cmod.runtime.content.ContentProfile;
@@ -90,6 +85,9 @@
 import com.winlator.cmod.shared.android.AppTerminationHelper;
 import com.winlator.cmod.shared.ui.toast.WinToast;
 import com.winlator.cmod.runtime.wine.EnvVars;
+import com.winlator.cmod.runtime.reshade.ReshadeConfigWriter;
+import com.winlator.cmod.runtime.reshade.ReshadeManager;
+import com.winlator.cmod.runtime.wine.LocaleEnv;
 import com.winlator.cmod.shared.io.FileUtils;
 import com.winlator.cmod.runtime.system.CPUStatus;
 import com.winlator.cmod.runtime.system.GPUInformation;
@@ -98,14 +96,25 @@
 import com.winlator.cmod.shared.util.OnExtractFileListener;
 import com.winlator.cmod.shared.ui.dialog.PreloaderDialog;
 import com.winlator.cmod.runtime.system.ProcessHelper;
+import com.winlator.cmod.runtime.system.SessionKeepAliveService;
 import com.winlator.cmod.shared.android.RefreshRateUtils;
 import com.winlator.cmod.shared.util.StringUtils;
 import com.winlator.cmod.shared.io.TarCompressorUtils;
 import com.winlator.cmod.runtime.display.renderer.EffectComposer;
+import com.winlator.cmod.runtime.display.renderer.effects.ColorAdjustEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.ColorBlindEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.ColorGradeEffect;
 import com.winlator.cmod.runtime.display.renderer.effects.CRTEffect;
-import com.winlator.cmod.runtime.display.renderer.effects.FSREffect;
 import com.winlator.cmod.runtime.display.renderer.effects.HDREffect;
 import com.winlator.cmod.runtime.display.renderer.effects.NaturalEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.NTSC2Effect;
+import com.winlator.cmod.runtime.display.renderer.effects.NTSCEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.PixelateEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.ScanlinesEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.SGSRUpscaler;
+import com.winlator.cmod.runtime.display.renderer.effects.SharpenEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.ToonEffect;
+import com.winlator.cmod.runtime.display.renderer.effects.VividEffect;
 import com.winlator.cmod.runtime.wine.WineInfo;
 import com.winlator.cmod.runtime.wine.WineRegistryEditor;
 import com.winlator.cmod.runtime.wine.WineRequestHandler;
@@ -119,19 +128,23 @@
 import com.winlator.cmod.runtime.input.controls.ControlsProfile;
 import com.winlator.cmod.runtime.input.controls.ControllerManager;
 import com.winlator.cmod.runtime.input.controls.ExternalController;
+import com.winlator.cmod.runtime.input.controls.GestureProfile;
+import com.winlator.cmod.runtime.input.controls.GestureProfileManager;
 import com.winlator.cmod.runtime.input.controls.InputControlsManager;
+import com.winlator.cmod.runtime.input.controls.AccentTheme;
+import com.winlator.cmod.runtime.input.controls.VisualStyle;
 import com.winlator.cmod.shared.math.Mathf;
 import com.winlator.cmod.shared.math.XForm;
 import com.winlator.cmod.runtime.audio.midi.MidiHandler;
 import com.winlator.cmod.runtime.audio.midi.MidiManager;
-import com.winlator.cmod.runtime.display.renderer.GLRenderer;
+import com.winlator.cmod.runtime.display.renderer.VulkanRenderer;
 import com.winlator.cmod.runtime.display.ui.FrameRating;
 import com.winlator.cmod.runtime.display.ui.MagnifierView;
-import com.winlator.cmod.runtime.display.ui.XServerView;
+import com.winlator.cmod.runtime.display.ui.MangoHudView;
+import com.winlator.cmod.runtime.display.ui.XServerSurfaceView;
 import com.winlator.cmod.shared.android.FixedFontScaleAppCompatActivity;
 import com.winlator.cmod.runtime.input.ui.InputControlsView;
 import com.winlator.cmod.runtime.input.ui.TouchpadView;
-import com.winlator.cmod.runtime.system.LogFileUtils;
 import com.winlator.cmod.runtime.display.winhandler.MouseEventFlags;
 import com.winlator.cmod.runtime.display.winhandler.OnGetProcessInfoListener;
 import com.winlator.cmod.runtime.display.winhandler.ProcessInfo;
@@ -142,6 +155,7 @@
 import com.winlator.cmod.feature.stores.steam.SteamClientManager;
 import com.winlator.cmod.runtime.display.environment.components.ALSAServerComponent;
 import com.winlator.cmod.runtime.display.environment.components.GuestProgramLauncherComponent;
+import com.winlator.cmod.runtime.display.environment.components.NetworkInfoUpdateComponent;
 import com.winlator.cmod.runtime.display.environment.components.PulseAudioComponent;
 import com.winlator.cmod.runtime.display.environment.components.SteamClientComponent;
 import com.winlator.cmod.runtime.display.environment.components.SysVSharedMemoryComponent;
@@ -183,10 +197,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import cn.sherlock.com.sun.media.sound.SF2Soundbank;
+import static com.winlator.cmod.runtime.display.XServerDisplayUtils.*;
 
 public class XServerDisplayActivity extends FixedFontScaleAppCompatActivity {
-    public static String NOTIFICATION_CHANNEL_ID = "Winlator";
-    public static int NOTIFICATION_ID = -1;
     private static final long STEAM_TERMINATION_GRACE_MS = 10000L;
     private static final long STEAM_TERMINATION_POLL_MS = 1000L;
     private static final long STEAM_PROCESS_RESPONSE_TIMEOUT_MS = 2000L;
@@ -195,6 +208,8 @@ public class XServerDisplayActivity extends FixedFontScaleAppCompatActivity {
     private static final String STEAM_ROOT_PATH = "C:\\Program Files (x86)\\Steam";
     private static final String STEAM_EXE_PATH = STEAM_ROOT_PATH + "\\steam.exe";
     private static final String D8VK_ASSET_PATH = "dxwrapper/d8vk-1.0.tzst";
+    // bump when extra_libs.tzst is repacked so existing containers re-extract (marker usr/lib/.extra_libs_version)
+    private static final int EXTRA_LIBS_VERSION = 1;
     private static final String STEAM_USER_REGISTRY_BACKUP_FILE = "steam_registry_backup.reg";
     private static final String STEAM_SYSTEM_REGISTRY_BACKUP_FILE = "steam_system_registry_backup.reg";
     private static final String STEAM_CLIENT_STORE_RELATIVE_PATH = ".shared/steam-client-store";
@@ -204,10 +219,7 @@ public class XServerDisplayActivity extends FixedFontScaleAppCompatActivity {
     private static final String LEGACY_STEAM_CLIENT_STORE_RELATIVE_PATH = ".wine/drive_c/WinNative/SteamClient";
     public static final String EXTRA_LAUNCHED_FROM_PINNED_SHORTCUT = "launched_from_pinned_shortcut";
 
-    // Real Steam launch flags. Keep this minimal set; CEF-workaround flags (-no-cef-sandbox,
-    // -cef-single-process, -no-browser) all made things worse in testing (V8 proxy errors
-    // under single-process, dead flag on modern Steam, etc.).
-    //   -silent -vgui -tcp -nobigpicture -nofriendsui -nochatui -nointro -applaunch <id>
+    // CEF GPU flags avoid steamwebhelper taking DXVK's dxgi path in FEX.
     private static final String[] STEAM_SYSTEM_REGISTRY_KEYS = new String[] {
             "Software\\Classes\\steam",
             "Software\\Wow6432Node\\Valve\\Steam"
@@ -223,6 +235,7 @@ public class XServerDisplayActivity extends FixedFontScaleAppCompatActivity {
             ".shared\\\\steam-client-store",
             ".shared/steam-client-store",
             "steamclient_loader_x64.exe",
+            "steamclient_loader_x86.exe",
             "steamclient_loader_x32.exe"
     };
 
@@ -243,49 +256,48 @@ public class XServerDisplayActivity extends FixedFontScaleAppCompatActivity {
             "rundll32",
             "cmd"
     ));
-    private XServerView xServerView;
-    /** Per-activity Direct Composition layer (Phase 2.1 — lifecycle only).
-     *  Allocated when the host SurfaceView reports surfaceCreated AND the per-container
-     *  toggle + NDK availability check both pass. Released in surfaceDestroyed.
-     *  <p>volatile because Phase 2.2+ will read this from the GLRenderer / GLThread
-     *  while the SurfaceHolder.Callback writes it from the UI thread. The field's
-     *  only writer remains the UI thread; volatile establishes the happens-before
-     *  relationship for cross-thread reads. */
-    private volatile com.winlator.cmod.runtime.display.composition.DirectCompositionLayer directCompositionLayer;
-    /** Anonymous {@link SurfaceHolder.Callback} retained so it can be removed in
-     *  {@code onDestroy} — otherwise the SurfaceHolder retains the activity through
-     *  the implicit outer-class reference held by the inner class. */
-    private SurfaceHolder.Callback directCompositionCallback;
-    /** Phase 2.2 smoke-test AHardwareBuffer pointer. Allocated once after
-     *  successful attach so we can verify the SurfaceControl path is alive
-     *  end-to-end (visible magenta swatch in the bottom-right corner). Phase
-     *  2.3 replaces the test buffer with real Wine frames; this field and its
-     *  lifecycle plumbing should be removed when the real path is wired up. */
-    private long directCompositionTestBufferPtr = 0L;
-    /** Mirrors {@link Container#isDirectCompositionEnabled()} sampled once at activity setup. */
-    private boolean directCompositionRequested;
-    /** Set by {@link com.winlator.cmod.runtime.display.composition.SurfaceCompositor#isAvailable()}. */
-    private boolean directCompositionSupported;
+    private XServerSurfaceView xServerView;
+    // DC: per-activity SurfaceControl layer.
+    private com.winlator.cmod.runtime.display.composition.DirectCompositionLayer directCompositionLayer;
+    private boolean directCompositionInstalled = false;
     private InputControlsView inputControlsView;
+    private boolean inputControlsRevealAllowed = false;
     private TouchpadView touchpadView;
+
+    // Auto-hide touchscreen controls while a game controller is connected.
+    private InputManager autoHideInputManager;
+    private InputManager.InputDeviceListener autoHideDeviceListener;
+    private boolean controllerAutoHidden = false;
+    private boolean userOverrodeAutoHide = false;
     private XEnvironment environment;
+    private com.winlator.cmod.runtime.display.environment.AudioFocusHandler audioFocusHandler;
     private ComposeView displayHostComposeView;
     private FrameLayout xServerDisplayFrame;
     private ContainerManager containerManager;
     protected Container container;
     private XServer xServer;
     private InputControlsManager inputControlsManager;
+    private GestureProfileManager gestureProfileManager;
+    private int currentGestureProfileId = 0;
     private ImageFs imageFs;
     private FrameRating frameRating = null;
+    private MangoHudView mangoHud = null;
     private boolean effectiveShowFPS = false;
+    // Phone gauge HUD (Compose host) shown with touch controls disabled while a physical controller + external display are active.
+    private boolean controllerHudMode = false;
+    private android.hardware.input.InputManager.InputDeviceListener hudControllerListener;
     private boolean isTapToClickEnabled = true;
     private int runtimeFpsLimit = 0;
-    private String lastRendererName = "OpenGL";
+    private String lastRendererName = "Vulkan";
     private String lastGpuName = null;
+    private boolean gameWindowSeen;
+    private int rendererWindowId = -1;
+    private boolean rendererWindowPresented;
     private Runnable editInputControlsCallback;
     private Shortcut shortcut;
     private boolean launchedFromPinnedShortcut = false;
     private String graphicsDriver = Container.DEFAULT_GRAPHICS_DRIVER;
+    private String zinkMode = Container.DEFAULT_ZINK_MODE;
     private HashMap<String, String> graphicsDriverConfig;
     private String audioDriver = Container.DEFAULT_AUDIO_DRIVER;
     private String emulator = Container.DEFAULT_EMULATOR;
@@ -295,26 +307,79 @@ public class XServerDisplayActivity extends FixedFontScaleAppCompatActivity {
     private String startupSelection;
     private WineInfo wineInfo;
     private final EnvVars envVars = new EnvVars();
+    // True when the chosen launch exe differs from Steam's configured entry: launcher skips Steam LaunchApp and CreateProcess'es the selected exe directly. Recomputed per launch.
+    private boolean wnSteamDirectExeOverride = false;
     private boolean firstTimeBoot = false;
     private SharedPreferences preferences;
     private boolean isMouseDisabled = false;
     private boolean isPointerCaptureForcedOff = false;
     private boolean isVolumeUpPressed = false;
     private boolean isVolumeDownPressed = false;
+    private boolean guideHoldPending = false;
+    private long guideMenuOpenedAt = 0L;
+    private static final long GUIDE_HOLD_OPEN_MS = 450L;
+    private static final long GUIDE_HOLD_TAIL_MS = 1200L;
+    private final Runnable guideHoldOpenRunnable = new Runnable() {
+        @Override
+        public void run() {
+            guideHoldPending = false;
+            if (drawerStateHolder == null || !drawerStateHolder.isDrawerOpen()) {
+                guideMenuOpenedAt = SystemClock.uptimeMillis();
+                openDrawerMenu();
+            }
+        }
+    };
     private OnExtractFileListener onExtractFileListener;
     private WinHandler winHandler;
     private WineRequestHandler wineRequestHandler;
     private float globalCursorSpeed = 1.0f;
     private MagnifierView magnifierView;
     private Callback<String> logStreamSink;
-    private BufferedWriter logStreamWriter;
-    private File logStreamFile;
+    private com.winlator.cmod.runtime.system.SessionLogWriter sessionLogWriter;
     private int taskAffinityMask = 0;
     private int taskAffinityMaskWoW64 = 0;
+    private final HashSet<Integer> guestAffinityCheckedPids = new HashSet<>();
+    private volatile boolean serviceAffinityStarted = false;
+    private static final String[] SERVICE_AFFINITY_PROCESSES = {
+        "services.exe", "rpcss.exe", "svchost.exe", "winedevice.exe",
+        "plugplay.exe", "conhost.exe", "start.exe"
+    };
+    private static final String[] SHELL_AFFINITY_PROCESSES = {
+        "explorer.exe", "steamwebhelper.exe"
+    };
     private int frameRatingWindowId = -1;
+    private android.net.wifi.WifiManager.MulticastLock multicastLock;
     private final float[] xform = XForm.getInstance();
     private ContentsManager contentsManager;
     private boolean navigationFocused = false;
+    private int drawerStickDir = 0;
+    private final android.os.Handler drawerStickHandler = new android.os.Handler(android.os.Looper.getMainLooper());
+    private final Runnable drawerStickRepeat = new Runnable() {
+        @Override
+        public void run() {
+            if (drawerStickDir == 0 || drawerStateHolder == null
+                    || !(drawerStateHolder.isDrawerOpen() || drawerStateHolder.isPaneOpen())) {
+                return;
+            }
+            fireDrawerStickDir(drawerStickDir);
+            drawerStickHandler.postDelayed(this, 110);
+        }
+    };
+
+    private void fireDrawerStickDir(int dir) {
+        if (drawerStateHolder == null) return;
+        if (!drawerStateHolder.isPaneOpen()) {
+            if (dir == 1) drawerStateHolder.menuNavLeft();
+            else if (dir == 2) drawerStateHolder.menuNavRight();
+            else if (dir == 3) drawerStateHolder.menuNavUp();
+            else drawerStateHolder.menuNavDown();
+        } else {
+            if (dir == 1) drawerStateHolder.paneNavLeft();
+            else if (dir == 2) drawerStateHolder.paneNavRight();
+            else if (dir == 3) drawerStateHolder.paneNavUp();
+            else drawerStateHolder.paneNavDown();
+        }
+    }
 
     private boolean hasExternalMouse() {
         InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
@@ -328,7 +393,7 @@ private boolean hasExternalMouse() {
     }
 
     private void tryCapturePointer() {
-        if (touchpadView != null && hasExternalMouse() && (drawerStateHolder == null || !drawerStateHolder.isDrawerOpen())) {
+        if (touchpadView != null && (drawerStateHolder == null || !drawerStateHolder.isDrawerOpen())) {
             touchpadView.postDelayed(() -> {
                 if (touchpadView != null) {
                     updatePointerCapture();
@@ -341,67 +406,169 @@ private void tryCapturePointer() {
     private String midiSoundFont = "";
     private String lc_all = "";
     PreloaderDialog preloaderDialog = null;
+    private com.winlator.cmod.feature.stores.steam.wnsteam.WnLauncherStatusTailer wnLauncherStatusTailer = null;
+    private final java.util.concurrent.atomic.AtomicBoolean wnLauncherDrivesDismiss =
+            new java.util.concurrent.atomic.AtomicBoolean(false);
     private Runnable configChangedCallback = null;
     private boolean isPaused = false;
+    private boolean reusingSession = false;
     private boolean isRelativeMouseMovement = false;
+    private boolean isRefactorSizeEnabled = false;
+    private int screenTouchMode = 0;
+    private boolean rtsGesturesEnabled = false;
+    private static final long REFACTOR_SIZE_EXE_BYTES = 17408L;
+    private static final long REFACTOR_SIZE_UNSTAGE_DELAY_MS = 3000L;
+    private static final long GRAPHICS_TEST_32_EXE_BYTES = 2333245L;
+    private static final long GRAPHICS_TEST_64_EXE_BYTES = 2361407L;
+    private static final long INPUT_TEST_32_EXE_BYTES = 289656L;
+    private static final long INPUT_TEST_64_EXE_BYTES = 280952L;
+    private String bootExePath;
+    private String bootExeArgs;
+    private boolean isDependencyInstall;
+    private volatile int dependencyExitStatus = 0;
+
+    public boolean isPaused() { return isPaused; }
+    public boolean isInputSuspended() {
+        return isPaused;
+    }
+
+    private boolean isAnyControllerConnected() {
+        for (int id : android.view.InputDevice.getDeviceIds()) {
+            android.view.InputDevice dev = android.view.InputDevice.getDevice(id);
+            if (dev != null && ExternalController.isGameController(dev)) return true;
+        }
+        return false;
+    }
     private boolean isNativeRenderingEnabled = true;
 
     private float hudTransparency = 1.0f;
+    private boolean hudBackgroundAlphaDecoupled = false;
+    private float hudBackgroundTransparency = 1.0f;
     private float hudScale = 1.0f;
-    private boolean[] hudElements = new boolean[]{true, true, true, true, true, true, true};
+    private boolean[] hudElements = new boolean[]{true, true, true, true, true, true, true, true, false};
     private boolean dualSeriesBattery = false;
+    private boolean frametimeNumericMode = false;
     private boolean hudCardExpanded = false;
     private boolean screenEffectsCardExpanded = false;
-    private boolean fsrEnabled = false;
-    private int fsrMode = 0;
-    private int fsrSharpness = 100;
+    private boolean sgsrEnabled = false;
+    private boolean sgsrRuntimeEnabled = false;
+    private int sgsrUpscaleMode = 1;
+    private int sgsrSharpness = 100;
+    private String sgsrBaseScreenSize = Container.DEFAULT_SCREEN_SIZE;
+    private boolean vividEnabled = false;
+    private int vividStrength = 100;
     private int colorProfile = 0;
+    private int brightness = 0;
+    private int contrast = 0;
+    private int gammaPercent = 100;
+    private int scaleFilter = 0;
+    private int saturation = 100;
+    private int temperature = 0;
+    private int tint = 0;
+    private boolean sharpenEnabled = false;
+    private int sharpenStrength = 50;
+    private boolean scanlinesEnabled = false;
+    private int scanlinesIntensity = 50;
+    private boolean pixelateEnabled = false;
+    private int pixelateBlock = 6;
+    private int colorBlind = 0;
+    // loadout membership is fixed at launch; toggling enabled only flips a live gate, no recompile
+    private boolean reshadeSessionAvailable = false;
+    private boolean reshadeMasterEnabled = true;
+    private String reshadeMode = com.winlator.cmod.runtime.reshade.ReshadeLoadout.MODE_SOLO;
+    private final java.util.ArrayList<ReshadeLiveEffect> reshadeLive = new java.util.ArrayList<>();
+
+    private static final long RESHADE_LIVE_DEBOUNCE_MS = 120;
+    private android.os.HandlerThread reshadeLiveThread;
+    private android.os.Handler reshadeLiveHandler;
+    private volatile ReshadeLiveSnapshot pendingReshadeWrite;
+
+    private static final class ReshadeLiveSnapshot {
+        final java.util.ArrayList<com.winlator.cmod.runtime.reshade.ReshadeLoadout.Entry> entries;
+        final String loadoutJson;
+        final String paramsJson;
+        final String firstEffect;
+        final String mode;
+        final boolean masterEnabled;
+
+        ReshadeLiveSnapshot(java.util.ArrayList<com.winlator.cmod.runtime.reshade.ReshadeLoadout.Entry> entries,
+                            String loadoutJson, String paramsJson, String firstEffect, String mode, boolean masterEnabled) {
+            this.entries = entries;
+            this.loadoutJson = loadoutJson;
+            this.paramsJson = paramsJson;
+            this.firstEffect = firstEffect;
+            this.mode = mode;
+            this.masterEnabled = masterEnabled;
+        }
+    }
+
+    // values keys follow ReshadeManager.seedValues: "<uniform>", or "<uniform>_<c>" for COLOR
+    private static class ReshadeLiveEffect {
+        final String name;
+        boolean enabled;
+        final java.util.List<ReshadeManager.ReshadeParam> defs;
+        final java.util.LinkedHashMap<String, Float> values;
+        ReshadeLiveEffect(String name, boolean enabled, java.util.List<ReshadeManager.ReshadeParam> defs,
+                          java.util.LinkedHashMap<String, Float> values) {
+            this.name = name; this.enabled = enabled; this.defs = defs; this.values = values;
+        }
+    }
     private boolean gyroscopeCardExpanded = false;
     private XServerDrawerStateHolder drawerStateHolder;
     private XServerDrawerActionListener drawerActionListener;
+    private ExternalDisplayController externalDisplayController;
+    private com.winlator.cmod.runtime.display.recording.GameRecorder screenRecorder;
+    private int savedRenderMode = XServerSurfaceView.RENDERMODE_WHEN_DIRTY;
     private Timer taskManagerTimer;
     private final ArrayList<TaskManagerProcess> taskManagerAccum = new ArrayList<>();
     private boolean taskManagerCpuExpanded = false;
     private boolean taskManagerPaneVisible = false;
-    private short[] cachedMaxClockSpeeds;
+    private CPUStatus.AppCpuSample prevTaskCpuSample;
     private boolean drawerEdgeGesturePossible = false;
     private float drawerEdgeGestureStartX = 0f;
     private float drawerEdgeGestureStartY = 0f;
     private int drawerEdgeGesturePointerId = -1;
 
-    // Inside the XServerDisplayActivity class
     private SensorManager sensorManager;
     private Sensor gyroSensor;
+    private Sensor gyroRotationSensor;
+    private final float[] gyroRotationMatrix = new float[9];
+    private final float[] gyroRemappedMatrix = new float[9];
+    private final float[] gyroOrientationAngles = new float[3];
     private ExternalController controller;
 
-    // Playtime stats tracking
     private long startTime;
     private SharedPreferences playtimePrefs;
     private String shortcutName;
-    private String cachedDisplayName = "";
-    private String cachedPlatform = "";
-    private String cachedContainerLabel = "";
+    private String cachedPreloaderTitle = "";
+    private String cachedPreloaderBadge = "";
+    private String cachedPreloaderSubtitle = "";
     private Handler handler;
     private Runnable savePlaytimeRunnable;
+    private android.hardware.display.DisplayManager displayManager;
+    private android.hardware.display.DisplayManager.DisplayListener displayListener;
+    private int lastKnownMaxRefreshRate;
     private static final long SAVE_INTERVAL_MS = 1000;
     private static final int EXIT_CLOUD_UPLOAD_MAX_ATTEMPTS = 3;
     private static final long EXIT_CLOUD_UPLOAD_RETRY_DELAY_MS = 1000L;
 
     private Handler  timeoutHandler = new Handler(Looper.getMainLooper());
+    private static final long POINTER_ACTIVITY_REARM_MS = 1000L;
+    private long lastPointerActivityAt = 0L;
     private Runnable hideControlsRunnable;
 
-    // Real Steam watchdog: flipped true once an application window registers with the X server.
-    // The 75s watchdog timer reads this to decide whether steam.exe hung without producing a game window.
-    private final java.util.concurrent.atomic.AtomicBoolean firstAppWindowAppeared =
-            new java.util.concurrent.atomic.AtomicBoolean(false);
-    private Runnable realSteamWatchdogRunnable;
+    private volatile boolean startFullscreenStretched;
+
     private final AtomicBoolean exitRequested = new AtomicBoolean(false);
     private final AtomicBoolean steamExitWatchRunning = new AtomicBoolean(false);
     private final AtomicBoolean activityDestroyed = new AtomicBoolean(false);
+    private final AtomicBoolean steamStateSanitizedForClose = new AtomicBoolean(false);
     private final AtomicBoolean sessionCleanupStarted = new AtomicBoolean(false);
     private final AtomicBoolean switchLaunchInProgress = new AtomicBoolean(false);
     private final AtomicBoolean winHandlerStopped = new AtomicBoolean(false);
 
+    private SessionRecordingController perfController;
+
     private boolean isDarkMode;
     private boolean enableLogsMenu;
 
@@ -413,39 +580,109 @@ private void tryCapturePointer() {
     private final SensorEventListener gyroListener = new SensorEventListener() {
         @Override
         public void onSensorChanged(SensorEvent event) {
-            if (event.sensor.getType() == Sensor.TYPE_GYROSCOPE) {
-                float gyroX = event.values[0]; // Rotation around the X-axis
-                float gyroY = event.values[1]; // Rotation around the Y-axis
-
-                winHandler.updateGyroData(gyroX, gyroY); // Send gyro data to WinHandler
+            if (winHandler == null) {
+                return;
+            }
+            int type = event.sensor.getType();
+            if (type == Sensor.TYPE_GYROSCOPE) {
+                winHandler.updateGyroData(event.values[0], event.values[1]);
+            } else if (type == Sensor.TYPE_GAME_ROTATION_VECTOR) {
+                computeGyroOrientation(event.values);
             }
         }
 
         @Override
         public void onAccuracyChanged(Sensor sensor, int accuracy) {
-            // No action needed
         }
     };
 
     private final SharedPreferences.OnSharedPreferenceChangeListener prefListener = (sharedPreferences, key) -> {
-        if ("gyro_enabled".equals(key) || "mouse_gyro_enabled".equals(key)) {
+        if ("gyro_enabled".equals(key) || "mouse_gyro_enabled".equals(key) || "gyro_orientation_enabled".equals(key)) {
             boolean gyroEnabled = sharedPreferences.getBoolean("gyro_enabled", false);
             if (gyroEnabled) {
-                sensorManager.registerListener(gyroListener, gyroSensor, SensorManager.SENSOR_DELAY_GAME);
-            } else {
+                registerGyroSensorIfEnabled();
+            } else if (sensorManager != null) {
                 sensorManager.unregisterListener(gyroListener);
             }
+        } else if ("cursor_speed".equals(key)) {
+            globalCursorSpeed = sharedPreferences.getFloat("cursor_speed", 1.0f);
+            if (touchpadView != null) {
+                float profileSpeed = 1.0f;
+                if (inputControlsView != null) {
+                    ControlsProfile profile = inputControlsView.getProfile();
+                    if (profile != null) profileSpeed = profile.getCursorSpeed();
+                }
+                touchpadView.setSensitivity(profileSpeed * globalCursorSpeed);
+            }
+        } else if ("touchscreen_toggle".equals(key)) {
+            if (touchpadView != null) {
+                touchpadView.setSimTouchScreen(sharedPreferences.getBoolean("touchscreen_toggle", false));
+            }
         }
     };
 
-    private void createNotifcationChannel() {
-        String name = "WinNative";
-        String description = getString(R.string.session_xserver_notification_description);
-        int importance = NotificationManager.IMPORTANCE_LOW;
-        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance);
-        channel.setDescription(description);
-        NotificationManager notificationManager = getSystemService(NotificationManager.class);
-        notificationManager.createNotificationChannel(channel);
+    // Registers rotation-vector (orientation mode) or gyroscope (rate mode); unregisters first.
+    private void registerGyroSensorIfEnabled() {
+        if (sensorManager == null) {
+            return;
+        }
+        if (!preferences.getBoolean("gyro_enabled", false)) {
+            return;
+        }
+        sensorManager.unregisterListener(gyroListener);
+        boolean orientationMode = preferences.getBoolean("gyro_orientation_enabled", false);
+        boolean mouseMode = preferences.getBoolean("mouse_gyro_enabled", false);
+        // Gyro-mouse (rate-based) needs the gyroscope and wins over orientation mode; orientation uses the rotation vector, falling back to gyroscope if absent.
+        Sensor sensor =
+                (orientationMode && !mouseMode && gyroRotationSensor != null)
+                        ? gyroRotationSensor
+                        : gyroSensor;
+        if (sensor != null) {
+            sensorManager.registerListener(gyroListener, sensor, SensorManager.SENSOR_DELAY_GAME);
+        }
+    }
+
+    // Rotation-vector sample -> yaw/pitch (radians), remapped for display rotation (landscape).
+    private void computeGyroOrientation(float[] rotationVector) {
+        if (winHandler == null) {
+            return;
+        }
+        SensorManager.getRotationMatrixFromVector(gyroRotationMatrix, rotationVector);
+        int axisX = SensorManager.AXIS_X;
+        int axisY = SensorManager.AXIS_Y;
+        switch (getDisplayRotationForSensors()) {
+            case android.view.Surface.ROTATION_90:
+                axisX = SensorManager.AXIS_Y;
+                axisY = SensorManager.AXIS_MINUS_X;
+                break;
+            case android.view.Surface.ROTATION_180:
+                axisX = SensorManager.AXIS_MINUS_X;
+                axisY = SensorManager.AXIS_MINUS_Y;
+                break;
+            case android.view.Surface.ROTATION_270:
+                axisX = SensorManager.AXIS_MINUS_Y;
+                axisY = SensorManager.AXIS_X;
+                break;
+            default:
+                break;
+        }
+        SensorManager.remapCoordinateSystem(gyroRotationMatrix, axisX, axisY, gyroRemappedMatrix);
+        SensorManager.getOrientation(gyroRemappedMatrix, gyroOrientationAngles);
+        // gyroOrientationAngles = [azimuth(yaw), pitch, roll]
+        winHandler.updateGyroOrientation(gyroOrientationAngles[0], gyroOrientationAngles[1]);
+    }
+
+    private int getDisplayRotationForSensors() {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                android.view.Display display = getDisplay();
+                if (display != null) {
+                    return display.getRotation();
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return getWindowManager().getDefaultDisplay().getRotation();
     }
 
     @Override
@@ -457,13 +694,11 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
         }
     }
 
-    /**
-     * Returns the effective display refresh rate override.
-     * Priority: per-game shortcut > global setting > 0 (meaning use device max).
-     */
     private int getRefreshRateOverride() {
         int perGameRate = getPerGameRefreshRateOverride();
-        return perGameRate > 0 ? perGameRate : getGlobalRefreshRateOverride();
+        if (perGameRate > 0) return perGameRate;
+        int containerRate = getContainerRefreshRateOverride();
+        return containerRate > 0 ? containerRate : getGlobalRefreshRateOverride();
     }
 
     private int getPerGameRefreshRateOverride() {
@@ -471,31 +706,16 @@ private int getPerGameRefreshRateOverride() {
         return parsePositiveInt(shortcut.getExtra("refreshRate", ""));
     }
 
+    private int getContainerRefreshRateOverride() {
+        if (container == null) return 0;
+        return parsePositiveInt(container.getExtra("refreshRate", ""));
+    }
+
     private int getGlobalRefreshRateOverride() {
         if (preferences == null) return 0;
         return Math.max(0, preferences.getInt("refresh_rate_override", 0));
     }
 
-    /**
-     * Per-game settings always win over the global refresh rate when determining DXVK frame limit.
-     * Returns 0 (no override) when no explicit user preference is set, matching Ludashi behavior.
-     * The old code fell back to the device's max refresh rate which always injected
-     * dxgi.syncInterval=0 and DXVK_FRAME_RATE, interfering with VKD3D frame pacing
-     * and causing significant FPS drops in DX12 games.
-     */
-    private int getDxvkFrameRateOverride() {
-        int perGameRate = getPerGameRefreshRateOverride();
-        if (perGameRate > 0) {
-            return perGameRate;
-        }
-
-        int globalRate = getGlobalRefreshRateOverride();
-        if (globalRate > 0) {
-            return globalRate;
-        }
-        return 0;
-    }
-
     private int parsePositiveInt(String value) {
         if (value == null || value.isEmpty()) return 0;
         try {
@@ -514,6 +734,160 @@ private String getShortcutSetting(String key, String containerValue) {
         return shortcut != null ? shortcut.getSettingExtra(key, containerValue) : containerValue;
     }
 
+    // paramsJson is nested {"<effect>":{uniform:value}} when nested, else the flat legacy map
+    private static class ResolvedReshade {
+        java.util.List<com.winlator.cmod.runtime.reshade.ReshadeLoadout.Entry> loadout;
+        String mode;
+        String paramsJson;
+        boolean nested;
+        String legacyEffect;
+        boolean masterEnabled = true;
+    }
+
+    // container config stays authoritative until the shortcut has both own-settings and a reshade extra,
+    // so a loadout is never mixed half-shortcut half-container
+    private boolean reshadeShortcutOwns() {
+        if (shortcut == null || shortcut.usesContainerDefaults()) return false;
+        return shortcut.getExtra(ReshadeConfigWriter.EXTRA_LOADOUT, null) != null
+                || shortcut.getExtra(ReshadeConfigWriter.EXTRA_EFFECT, null) != null;
+    }
+
+    // read as one unit from a single source; ReshadeLoadout.parse migrates legacy single-effect saves
+    private ResolvedReshade resolveReshade() {
+        ResolvedReshade r = new ResolvedReshade();
+        r.mode = com.winlator.cmod.runtime.reshade.ReshadeLoadout.MODE_SOLO;
+        r.legacyEffect = "None";
+        if (container == null) {
+            r.loadout = new java.util.ArrayList<>();
+            r.nested = false;
+            return r;
+        }
+        String loadoutJson, mode, paramsJson, legacyEffect;
+        if (reshadeShortcutOwns()) {
+            loadoutJson  = emptyToNull(shortcut.getExtra(ReshadeConfigWriter.EXTRA_LOADOUT, null));
+            mode         = shortcut.getExtra(ReshadeConfigWriter.EXTRA_MODE, "solo");
+            paramsJson   = emptyToNull(shortcut.getExtra(ReshadeConfigWriter.EXTRA_PARAMS, null));
+            legacyEffect = shortcut.getExtra(ReshadeConfigWriter.EXTRA_EFFECT, "None");
+            r.masterEnabled = !"0".equals(shortcut.getExtra(ReshadeConfigWriter.EXTRA_MASTER, "1"));
+        } else {
+            loadoutJson  = emptyToNull(container.getExtra(ReshadeConfigWriter.EXTRA_LOADOUT, null));
+            mode         = container.getExtra(ReshadeConfigWriter.EXTRA_MODE, "solo");
+            paramsJson   = emptyToNull(container.getExtra(ReshadeConfigWriter.EXTRA_PARAMS, null));
+            legacyEffect = container.getExtra(ReshadeConfigWriter.EXTRA_EFFECT, "None");
+            r.masterEnabled = !"0".equals(container.getExtra(ReshadeConfigWriter.EXTRA_MASTER, "1"));
+        }
+        r.nested = loadoutJson != null && !loadoutJson.isEmpty();
+        r.loadout = com.winlator.cmod.runtime.reshade.ReshadeLoadout.parse(loadoutJson, legacyEffect);
+        r.mode = com.winlator.cmod.runtime.reshade.ReshadeLoadout.normalizeMode(mode);
+        r.paramsJson = paramsJson;
+        r.legacyEffect = legacyEffect;
+        com.winlator.cmod.runtime.reshade.ReshadeLoadout.enforceSolo(r.loadout, r.mode);
+        return r;
+    }
+
+    private static String emptyToNull(String s) { return (s == null || s.isEmpty()) ? null : s; }
+
+    // swallowed: a reshade failure must never break a launch
+    private void applyReshadeEnv(EnvVars envVars) {
+        try {
+            if (container == null || imageFs == null) return;
+            ResolvedReshade rr = resolveReshade();
+            boolean vulkanWrapper = ReshadeConfigWriter.supportedFor(this.dxwrapper);
+            boolean applied = ReshadeConfigWriter.applyLoadout(this, imageFs, rr.loadout, rr.paramsJson,
+                    rr.nested, rr.legacyEffect, rr.masterEnabled, vulkanWrapper, envVars);
+            reshadeSessionAvailable = applied;
+            reshadeMasterEnabled = rr.masterEnabled;
+            reshadeMode = rr.mode;
+            if (applied) seedReshadeLive(rr);
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "ReShade env injection failed (ignored)", e);
+        }
+    }
+
+    // only effects present in the drop-in folder become tunable
+    private void seedReshadeLive(ResolvedReshade rr) {
+        reshadeLive.clear();
+        for (com.winlator.cmod.runtime.reshade.ReshadeLoadout.Entry entry : rr.loadout) {
+            ReshadeManager.ReshadeEffect effect = ReshadeManager.findEffect(this, entry.name);
+            if (effect == null) continue;
+            org.json.JSONObject saved = com.winlator.cmod.runtime.reshade.ReshadeLoadout.paramsForEffect(
+                    rr.paramsJson, effect.name, rr.nested, rr.legacyEffect);
+            java.util.LinkedHashMap<String, Float> values = new java.util.LinkedHashMap<>();
+            for (ReshadeManager.ReshadeParam p : effect.params) ReshadeManager.seedValues(p, saved, values);
+            reshadeLive.add(new ReshadeLiveEffect(effect.name, entry.enabled, effect.params, values));
+        }
+    }
+
+    private java.util.ArrayList<ReshadeLoadoutItem> buildReshadeItems() {
+        java.util.ArrayList<ReshadeLoadoutItem> items = new java.util.ArrayList<>();
+        for (ReshadeLiveEffect e : reshadeLive) {
+            items.add(new ReshadeLoadoutItem(e.name, e.enabled, e.defs, new java.util.LinkedHashMap<>(e.values)));
+        }
+        return items;
+    }
+
+    // conf rewrite bumps mtime -> live reload without restage; a defaults-following shortcut must persist
+    // to the container so use_container_defaults is not flipped mid-session
+    private void applyReshadeLive() {
+        try {
+            if (imageFs == null) return;
+            java.util.ArrayList<com.winlator.cmod.runtime.reshade.ReshadeLoadout.Entry> entries = new java.util.ArrayList<>();
+            org.json.JSONObject nestedParams = new org.json.JSONObject();
+            for (ReshadeLiveEffect e : reshadeLive) {
+                entries.add(new com.winlator.cmod.runtime.reshade.ReshadeLoadout.Entry(e.name, e.enabled));
+                if (!e.values.isEmpty()) {
+                    org.json.JSONObject eff = new org.json.JSONObject();
+                    for (java.util.Map.Entry<String, Float> v : e.values.entrySet()) eff.put(v.getKey(), v.getValue().doubleValue());
+                    nestedParams.put(e.name, eff);
+                }
+            }
+            String loadoutJson = com.winlator.cmod.runtime.reshade.ReshadeLoadout.serialize(entries);
+            String paramsJson = nestedParams.length() == 0 ? null : nestedParams.toString();
+            String firstEffect = entries.isEmpty() ? null : entries.get(0).name;
+
+            pendingReshadeWrite = new ReshadeLiveSnapshot(entries, loadoutJson, paramsJson, firstEffect,
+                    reshadeMode, reshadeMasterEnabled);
+
+            if (reshadeLiveHandler == null) {
+                reshadeLiveThread = new android.os.HandlerThread("reshade-live");
+                reshadeLiveThread.start();
+                reshadeLiveHandler = new android.os.Handler(reshadeLiveThread.getLooper());
+            }
+            reshadeLiveHandler.removeCallbacks(reshadeLiveWriteTask);
+            reshadeLiveHandler.postDelayed(reshadeLiveWriteTask, RESHADE_LIVE_DEBOUNCE_MS);
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "applyReshadeLive failed (ignored)", e);
+        }
+    }
+
+    private final Runnable reshadeLiveWriteTask = () -> {
+        ReshadeLiveSnapshot s = pendingReshadeWrite;
+        if (s == null || imageFs == null) return;
+        try {
+            if (shortcut != null && !shortcut.usesContainerDefaults()) {
+                shortcut.putExtra(ReshadeConfigWriter.EXTRA_LOADOUT, s.entries.isEmpty() ? null : s.loadoutJson);
+                shortcut.putExtra(ReshadeConfigWriter.EXTRA_MODE, s.mode);
+                shortcut.putExtra(ReshadeConfigWriter.EXTRA_PARAMS, s.paramsJson);
+                shortcut.putExtra(ReshadeConfigWriter.EXTRA_EFFECT, s.firstEffect);
+                shortcut.putExtra(ReshadeConfigWriter.EXTRA_MASTER, s.masterEnabled ? null : "0");
+                shortcut.saveData();
+            } else if (container != null) {
+                container.putExtra(ReshadeConfigWriter.EXTRA_LOADOUT, s.entries.isEmpty() ? null : s.loadoutJson);
+                container.putExtra(ReshadeConfigWriter.EXTRA_MODE, s.mode);
+                container.putExtra(ReshadeConfigWriter.EXTRA_PARAMS, s.paramsJson);
+                container.putExtra(ReshadeConfigWriter.EXTRA_EFFECT, s.firstEffect);
+                container.putExtra(ReshadeConfigWriter.EXTRA_MASTER, s.masterEnabled ? "1" : "0");
+                container.saveData();
+            }
+
+            // masterEnabled writes enableOnLaunch; per-effect flags ride each <ei>_enabled gate
+            ReshadeConfigWriter.writeMergedConfig(this, imageFs, s.entries, s.paramsJson, s.paramsJson != null,
+                    s.firstEffect, s.masterEnabled, false);
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "applyReshadeLive failed (ignored)", e);
+        }
+    };
+
     private boolean getBooleanSessionOption(String key, boolean defaultValue) {
         boolean fallback = preferences != null ? preferences.getBoolean(key, defaultValue) : defaultValue;
         if (shortcut == null) return fallback;
@@ -549,20 +923,91 @@ private void applyPreferredRefreshRate() {
         }
     }
 
+    /** Watch for display refresh-rate / mode changes while a game runs so the FPS-limiter ceiling and chosen limit aren't stranded above what the panel can present. */
+    private void registerDisplayChangeListener() {
+        if (displayListener != null) return;
+        displayManager = (android.hardware.display.DisplayManager) getSystemService(Context.DISPLAY_SERVICE);
+        if (displayManager == null) return;
+        lastKnownMaxRefreshRate = RefreshRateUtils.getMaxSupportedRefreshRate(this);
+        displayListener = new android.hardware.display.DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayAdded(int displayId) {
+                handleDisplayCapabilitiesChanged();
+            }
+
+            @Override
+            public void onDisplayRemoved(int displayId) {
+                handleDisplayCapabilitiesChanged();
+            }
+
+            @Override
+            public void onDisplayChanged(int displayId) {
+                handleDisplayCapabilitiesChanged();
+            }
+        };
+        // Callbacks are delivered on the main thread via this handler.
+        displayManager.registerDisplayListener(displayListener, handler);
+    }
+
+    private void unregisterDisplayChangeListener() {
+        if (displayManager != null && displayListener != null) {
+            try {
+                displayManager.unregisterDisplayListener(displayListener);
+            } catch (Exception ignored) {}
+        }
+        displayListener = null;
+    }
+
+    private void handleDisplayCapabilitiesChanged() {
+        if (isFinishing() || isDestroyed()) return;
+
+        int maxRate = RefreshRateUtils.getMaxSupportedRefreshRate(this);
+        boolean maxChanged = maxRate != lastKnownMaxRefreshRate;
+        lastKnownMaxRefreshRate = maxRate;
+
+        // If the panel can no longer reach the configured limit, cap it so we don't render above what it can show.
+        if (runtimeFpsLimit > 0 && runtimeFpsLimit > maxRate) {
+            runtimeFpsLimit = maxRate;
+            if (xServerView != null && xServerView.getRenderer() != null) {
+                xServerView.getRenderer().setFpsLimit(runtimeFpsLimit);
+            }
+            if (shortcut != null) {
+                shortcut.putExtra("fpsLimit", String.valueOf(runtimeFpsLimit));
+                shortcut.saveData();
+            }
+            applyPreferredRefreshRate();
+        }
+
+        // Sync the in-drawer slider ceiling, but only if the drawer was opened (otherwise the next open rebuilds state fresh).
+        if (maxChanged && drawerStateHolder != null) {
+            renderDrawerMenu();
+        }
+    }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         if (intent == null) return;
 
+        if ("com.winnative.cmod.DEBUG_INJECT_TAP".equals(intent.getAction())) {
+            handleDebugInjectTap(intent);
+            return;
+        }
+
+        if ("com.winnative.cmod.DEBUG_INJECT_KEY".equals(intent.getAction())) {
+            handleDebugInjectKey(intent);
+            return;
+        }
+
         String incomingShortcutPath = intent.getStringExtra("shortcut_path");
         String incomingShortcutUuid = intent.getStringExtra("shortcut_uuid");
         int incomingContainerId = intent.getIntExtra("container_id", 0);
+        String incomingBootExe = intent.getStringExtra("boot_exe");
         String currentShortcutPath = shortcut != null ? shortcut.file.getAbsolutePath() : "";
         String currentShortcutUuid = shortcut != null ? shortcut.getExtra("uuid") : "";
         int currentContainerId = container != null ? container.id : 0;
+        String currentBootExe = bootExePath != null ? bootExePath : "";
 
-        // Ensure all later getIntent() reads use the latest launch intent.
         setIntent(intent);
         launchedFromPinnedShortcut = isPinnedShortcutLaunchIntent(intent);
 
@@ -573,13 +1018,99 @@ protected void onNewIntent(Intent intent) {
                 && !incomingShortcutUuid.isEmpty()
                 && !incomingShortcutUuid.equals(currentShortcutUuid);
         boolean containerChanged = incomingContainerId != 0 && incomingContainerId != currentContainerId;
+        boolean bootExeChanged = !(incomingBootExe != null ? incomingBootExe : "").equals(currentBootExe);
 
-        if (shortcutChanged || shortcutUuidChanged || containerChanged) {
+        if (shortcutChanged || shortcutUuidChanged || containerChanged || bootExeChanged) {
             Log.d("XServerDisplayActivity", "onNewIntent: launch target changed, cleaning up before recreation");
             switchLaunchTargetAfterCleanup(intent);
         }
     }
 
+    private void handleDebugInjectKey(Intent intent) {
+        if (xServer == null) {
+            Log.w("XServerDisplayActivity", "DEBUG_INJECT_KEY: xServer not ready");
+            return;
+        }
+        String key = intent.getStringExtra("key");
+        if (key == null || key.isEmpty()) {
+            Log.w("XServerDisplayActivity", "DEBUG_INJECT_KEY: missing `key` extra");
+            return;
+        }
+        com.winlator.cmod.runtime.display.xserver.XKeycode kc;
+        try {
+            kc = com.winlator.cmod.runtime.display.xserver.XKeycode
+                    .valueOf("KEY_" + key.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            Log.w("XServerDisplayActivity", "DEBUG_INJECT_KEY: unknown key " + key);
+            return;
+        }
+        int holdMs = intent.getIntExtra("hold_ms", 80);
+        Log.i("XServerDisplayActivity", "DEBUG_INJECT_KEY: " + kc + " hold=" + holdMs);
+        xServer.injectKeyPress(kc);
+        final com.winlator.cmod.runtime.display.xserver.XKeycode finalKc = kc;
+        new android.os.Handler(android.os.Looper.getMainLooper())
+                .postDelayed(() -> xServer.injectKeyRelease(finalKc), holdMs);
+    }
+
+    private void handleDebugInjectTap(Intent intent) {
+        if (xServer == null) {
+            Log.w("XServerDisplayActivity", "DEBUG_INJECT_TAP: xServer not ready");
+            return;
+        }
+        int x = intent.getIntExtra("x", -1);
+        int y = intent.getIntExtra("y", -1);
+        float nx = intent.getFloatExtra("nx", -1f);
+        float ny = intent.getFloatExtra("ny", -1f);
+        if (nx >= 0f && ny >= 0f) {
+            x = (int) (nx * xServer.screenInfo.width);
+            y = (int) (ny * xServer.screenInfo.height);
+        }
+        String button = intent.getStringExtra("button");
+        if (x < 0 || y < 0) {
+            Log.w("XServerDisplayActivity", "DEBUG_INJECT_TAP: bad coords x=" + x + " y=" + y);
+            return;
+        }
+        final Pointer.Button btn = "right".equalsIgnoreCase(button)
+                ? Pointer.Button.BUTTON_RIGHT
+                : Pointer.Button.BUTTON_LEFT;
+        int pressDelay = intent.getIntExtra("press_delay", 80);
+        int holdMs = intent.getIntExtra("hold_ms", 80);
+        boolean useWinHandler = intent.getBooleanExtra("winhandler", true);
+        final int btnDown = btn == Pointer.Button.BUTTON_RIGHT
+                ? MouseEventFlags.RIGHTDOWN
+                : MouseEventFlags.LEFTDOWN;
+        final int btnUp = btn == Pointer.Button.BUTTON_RIGHT
+                ? MouseEventFlags.RIGHTUP
+                : MouseEventFlags.LEFTUP;
+        Log.i("XServerDisplayActivity",
+                "DEBUG_INJECT_TAP: x=" + x + " y=" + y + " btn=" + btn
+                        + " screen=" + xServer.screenInfo.width + "x" + xServer.screenInfo.height
+                        + " press_delay=" + pressDelay + " hold_ms=" + holdMs
+                        + " winhandler=" + useWinHandler);
+        xServer.injectPointerMove(x, y);
+        if (useWinHandler && xServer.getWinHandler() != null) {
+            xServer.getWinHandler().mouseEvent(
+                    MouseEventFlags.MOVE | MouseEventFlags.ABSOLUTE, x, y, 0);
+        }
+        final int finalX = x;
+        final int finalY = y;
+        final android.os.Handler h = new android.os.Handler(android.os.Looper.getMainLooper());
+        h.postDelayed(() -> {
+            xServer.injectPointerButtonPress(btn);
+            if (useWinHandler && xServer.getWinHandler() != null) {
+                xServer.getWinHandler().mouseEvent(
+                        btnDown | MouseEventFlags.ABSOLUTE, finalX, finalY, 0);
+            }
+            h.postDelayed(() -> {
+                xServer.injectPointerButtonRelease(btn);
+                if (useWinHandler && xServer.getWinHandler() != null) {
+                    xServer.getWinHandler().mouseEvent(
+                            btnUp | MouseEventFlags.ABSOLUTE, finalX, finalY, 0);
+                }
+            }, holdMs);
+        }, pressDelay);
+    }
+
     private void switchLaunchTargetAfterCleanup(Intent intent) {
         if (!switchLaunchInProgress.compareAndSet(false, true)) {
             Log.d("XServerDisplayActivity", "Switch launch already in progress; ignoring duplicate target intent");
@@ -610,15 +1141,36 @@ private void switchLaunchTargetAfterCleanup(Intent intent) {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState != null) isPaused = savedInstanceState.getBoolean("isPaused", false);
         super.onCreate(savedInstanceState);
         AppUtils.hideSystemUI(this);
         AppUtils.keepScreenOn(this);
-        // Clean up any shared debug logs and prepare for fresh session logging
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true);
+            setTurnScreenOn(true);
+        } else {
+            getWindow().addFlags(
+                android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                | android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+        }
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            try {
+                android.app.KeyguardManager km = (android.app.KeyguardManager)
+                    getSystemService(Context.KEYGUARD_SERVICE);
+                if (km != null && km.isKeyguardLocked()) {
+                    km.requestDismissKeyguard(this, null);
+                }
+            } catch (Throwable t) {
+                Log.w("XServerDisplayActivity",
+                    "requestDismissKeyguard failed: " + t.getMessage());
+            }
+        }
         DebugFragment.Companion.cleanupSharedLogs();
         com.winlator.cmod.runtime.system.LogManager.prepareForNewSession(this);
 
-        // Initialize preferences early so pickHighestRefreshRate can read global override
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        com.winlator.cmod.runtime.system.ApplicationLogGate.refresh(this);
         applyPreferredRefreshRate();
         launchedFromPinnedShortcut = isPinnedShortcutLaunchIntent(getIntent());
         
@@ -629,20 +1181,33 @@ public void onCreate(Bundle savedInstanceState) {
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
 
-        // Initialize ControllerManager for multi-controller support
         ControllerManager.getInstance().init(this);
+        registerControllerAutoHideListener();
 
         preloaderDialog = new PreloaderDialog(this);
 
+        try {
+            android.net.wifi.WifiManager wifiManager = (android.net.wifi.WifiManager)
+                    getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+            if (wifiManager != null) {
+                multicastLock = wifiManager.createMulticastLock("winnative-xserver");
+                multicastLock.setReferenceCounted(false);
+                multicastLock.acquire();
+            }
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity", "Failed to acquire MulticastLock", e);
+        }
+
         dualSeriesBattery = preferences.getBoolean(FrameRating.PREF_HUD_DUAL_SERIES_BATTERY, false);
+        frametimeNumericMode = preferences.getBoolean(FrameRating.PREF_HUD_FRAMETIME_NUMERIC, false);
 
-        // Check for Dark Mode
         isDarkMode = preferences.getBoolean("dark_mode", false);
         isTapToClickEnabled = true;
+        // Force the touchscreen-controls overlay on at each session start (profile default stays none).
+        preferences.edit().putBoolean("show_touchscreen_controls_enabled", true).apply();
         boolean isOpenWithAndroidBrowser = preferences.getBoolean("open_with_android_browser", false);
         boolean isShareAndroidClipboard = preferences.getBoolean("share_android_clipboard", false);
 
-        // Initialize the WinHandler after context is set up
         winHandler = new WinHandler(this);
         winHandlerStopped.set(false);
         winHandler.initializeController();
@@ -652,36 +1217,31 @@ public void onCreate(Bundle savedInstanceState) {
             wineRequestHandler = new WineRequestHandler(this);
 
         if (controller != null) {
-            int triggerType = preferences.getInt("trigger_type", ExternalController.TRIGGER_IS_AXIS); // Default to TRIGGER_IS_AXIS
-            controller.setTriggerType((byte) triggerType); // Cast to byte if needed
+            // Only force a type when explicitly chosen; else keep the auto-detected value.
+            int triggerType = preferences.getInt("trigger_type", -1);
+            if (triggerType != -1) {
+                controller.setTriggerType((byte) triggerType);
+            }
         }
 
 
 
-        // Check if xinputDisabled extra is passed
         boolean xinputDisabledFromShortcut = false;
 
 
 
 
-        // Initialize SensorManager
         sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         gyroSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
+        gyroRotationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR);
         preferences.registerOnSharedPreferenceChangeListener(prefListener);
 
-        boolean gyroEnabled = preferences.getBoolean("gyro_enabled", false);
-
-        if (gyroEnabled) {
-            // Register the sensor event listener
-            sensorManager.registerListener(gyroListener, gyroSensor, SensorManager.SENSOR_DELAY_GAME);
-        }
+        registerGyroSensorIfEnabled();
 
 
 
-        // Record the start time
         startTime = System.currentTimeMillis();
 
-        // Initialize handler for periodic saving
         handler = new Handler(Looper.getMainLooper());
 
         savePlaytimeRunnable = new Runnable() {
@@ -693,8 +1253,8 @@ public void run() {
         };
         handler.postDelayed(savePlaytimeRunnable, SAVE_INTERVAL_MS);
 
+        registerDisplayChangeListener();
 
-        // Handler and Runnable to manage mouse cursor auto-hide
         hideControlsRunnable = () -> {
             if (!isMouseDisabled && xServer != null && xServer.getRenderer() != null
                     && xServer.getRenderer().isCursorVisible()) {
@@ -717,8 +1277,10 @@ public void run() {
             return platformInsets != null ? platformInsets : windowInsets;
         });
 
-        enableLogsMenu = preferences.getBoolean("enable_wine_debug", false) || preferences.getBoolean("enable_box64_logs", false);
-        isNativeRenderingEnabled = preferences.getBoolean("use_dri3", true);
+        enableLogsMenu = preferences.getBoolean("enable_wine_debug", false)
+                || preferences.getBoolean("enable_emulator_logs", false);
+        // Native rendering (DRI3) is always on; the toggle was removed. Hardcoded so stale "use_dri3=false" prefs can't disable it.
+        isNativeRenderingEnabled = true;
         displayHostComposeView.setPointerIcon(PointerIcon.getSystemIcon(this, PointerIcon.TYPE_ARROW));
         displayHostComposeView.setFocusable(true);
         displayHostComposeView.setFocusableInTouchMode(true);
@@ -731,8 +1293,7 @@ public void handleOnBackPressed() {
             }
         });
 
-        // Keep the drawer edge swipe available on gesture-navigation devices without
-        // letting Compose compete with normal container drags across the whole display.
+        // Limit Android gesture exclusion to the drawer edge swipe zone.
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
             final android.view.View gestureExclusionView = displayHostComposeView;
             final int edgePx = (int) (XServerDisplayHostKt.XSERVER_DRAWER_EDGE_SWIPE_DP * getResources().getDisplayMetrics().density);
@@ -750,11 +1311,17 @@ public void handleOnBackPressed() {
         GuestProgramLauncherComponent.ensureImageFsNativeLibrary(this, imageFs, "libfakeinput.so");
         GuestProgramLauncherComponent.ensureImageFsNativeLibrary(this, imageFs, "libandroid-sysvshm.so");
         File devInputDir = new File(imageFs.getRootDir(), "dev/input");
+        boolean reattachingLiveSession = SessionKeepAliveService.isSessionActive()
+                && SessionKeepAliveService.getActiveEnvironment() != null
+                && SessionKeepAliveService.getActiveXServer() != null;
         if (devInputDir.exists() || devInputDir.mkdirs()) {
-            for (int i = 0; i < 4; i++) {
-                File eventFile = new File(devInputDir, "event" + i);
-                if (eventFile.exists()) {
-                    eventFile.delete();
+            // On reattach the running guest still holds these nodes; deleting them breaks its live input mapping.
+            if (!reattachingLiveSession) {
+                for (int i = 0; i < 4; i++) {
+                    File eventFile = new File(devInputDir, "event" + i);
+                    if (eventFile.exists()) {
+                        eventFile.delete();
+                    }
                 }
             }
         }
@@ -764,13 +1331,14 @@ public void handleOnBackPressed() {
         containerManager = new ContainerManager(this);
         container = containerManager.getContainerById(getIntent().getIntExtra("container_id", 0));
         loadHUDSettings();
-        loadScreenEffectsSettings();
 
-        // Determine launch target from intent extras and URI fallback.
         int containerId = getIntent().getIntExtra("container_id", 0);
         String shortcutPath = getIntent().getStringExtra("shortcut_path");
         String shortcutUuid = getIntent().getStringExtra("shortcut_uuid");
         int shortcutPathHash = getIntent().getIntExtra("shortcut_path_hash", 0);
+        bootExePath = getIntent().getStringExtra("boot_exe");
+        bootExeArgs = getIntent().getStringExtra("boot_exe_args");
+        isDependencyInstall = getIntent().getBooleanExtra("is_dependency_installer", false);
 
         android.net.Uri launchData = getIntent().getData();
         if (launchData != null) {
@@ -797,6 +1365,14 @@ public void handleOnBackPressed() {
             }
         }
 
+        if ((shortcutPath == null || shortcutPath.isEmpty()) && launchData != null) {
+            String dataPath = resolveDesktopPathFromUri(launchData);
+            if (dataPath != null && !dataPath.isEmpty()) {
+                shortcutPath = dataPath;
+                Log.d("XServerDisplayActivity", "Resolved shortcut path from VIEW data: " + shortcutPath);
+            }
+        }
+
         Shortcut resolvedShortcut = null;
         if (shortcutUuid != null && !shortcutUuid.isEmpty()) {
             resolvedShortcut = findShortcutByUuid(shortcutUuid, containerId);
@@ -828,28 +1404,23 @@ public void handleOnBackPressed() {
             }
         }
 
-        // Log shortcut identity data
         Log.d("XServerDisplayActivity", "Shortcut Path: " + shortcutPath);
         Log.d("XServerDisplayActivity", "Shortcut UUID: " + shortcutUuid + ", pathHash=" + shortcutPathHash);
         Log.d("XServerDisplayActivity", "Container ID from Intent: " + containerId);
         if (containerId == 0) {
             Log.d("XServerDisplayActivity", "Container ID is 0, attempting to parse from .desktop file");
-            // Proceed with .desktop file parsing
         }
 
 
-        // If container_id is 0, read from the .desktop file
         if (containerId == 0 && shortcutPath != null && !shortcutPath.isEmpty()) {
             File shortcutFile = new File(shortcutPath);
             containerId = parseContainerIdFromDesktopFile(shortcutFile);
             Log.d("XServerDisplayActivity", "Parsed Container ID from .desktop file: " + containerId);
         }
 
-        // Initialize playtime tracking
         playtimePrefs = getSharedPreferences("playtime_stats", MODE_PRIVATE);
         shortcutName = getIntent().getStringExtra("shortcut_name");
 
-        // Ensure shortcutPath is not null before proceeding
         if (shortcutPath != null && !shortcutPath.isEmpty()) {
             if (shortcutName == null || shortcutName.isEmpty()) {
                 shortcutName = parseShortcutNameFromDesktopFile(new File(shortcutPath));
@@ -859,35 +1430,46 @@ public void handleOnBackPressed() {
             Log.d("XServerDisplayActivity", "No shortcut path provided, skipping shortcut parsing.");
         }
 
-        // Sanitize shortcutName to match the library sorting key format.
-        // The library uses LIBRARY_NAME_SANITIZE_REGEX = "[^A-Za-z0-9 _-]" to strip
-        // special characters before looking up playtime stats. We must apply the
-        // same sanitization here so the written keys match the read keys.
         if (shortcutName != null) {
             shortcutName = shortcutName.replaceAll("[^A-Za-z0-9 _-]", "");
         }
 
-        // Increment play count at the start of a session
         incrementPlayCount();
 
-        // Log the final container_id
         Log.d("XServerDisplayActivity", "Final Container ID: " + containerId);
 
-        // Retrieve the container and check if it's null
         container = containerManager.getContainerById(containerId);
 
         if (container == null) {
             Log.e("XServerDisplayActivity", "Failed to retrieve container with ID: " + containerId);
-            finish();  // Gracefully exit the activity to avoid crashing
+            finish();
             return;
         }
 
-        containerManager.activateContainer(container);
+        if (!containerManager.activateContainer(container)) {
+            Log.e("XServerDisplayActivity", "Failed to activate container with ID: " + containerId);
+            finish();
+            return;
+        }
 
         if (shortcutPath != null && !shortcutPath.isEmpty()) {
             shortcut = new Shortcut(container, new File(shortcutPath));
         }
 
+        if (shortcut != null
+                && com.winlator.cmod.feature.retro.RetroShortcuts.isRetroShortcut(shortcut)) {
+            com.winlator.cmod.feature.retro.RetroShortcuts.launch(this, shortcut);
+            finish();
+            return;
+        }
+
+        loadScreenEffectsSettings();
+
+        boolean recordToFile = preferences.getBoolean("hud_record_to_file", false);
+        perfController = new SessionRecordingController(this);
+        // Only sample per-frame stats when recording to file is on; nothing else consumes them.
+        if (recordToFile) perfController.start(shortcut, container, recordToFile);
+
         int numControllers = 1;
         if (shortcut != null) {
             try {
@@ -931,7 +1513,6 @@ public void handleOnBackPressed() {
                 "' effective='" + effectiveCpuListWoW64 + "' affinityMask=0x" +
                 Integer.toHexString(taskAffinityMaskWoW64 & 0xFFFF));
 
-        // Determine the class name for the startup workarounds
         String wmClass = shortcut != null ? shortcut.getExtra("wmClass", "") : "";
         Log.d("XServerDisplayActivity", "Startup wmClass: " + wmClass);
 
@@ -939,7 +1520,6 @@ public void handleOnBackPressed() {
 
         String containerWineVersion = container.getWineVersion();
         wineVersion = containerWineVersion;
-        // Override wine version from per-game shortcut settings if available
         String rawShortcutWineVersion = "";
         if (shortcut != null) {
             String shortcutWineVersion = getShortcutWineVersionOverride();
@@ -960,11 +1540,11 @@ public void handleOnBackPressed() {
 
         ProcessHelper.removeAllDebugCallbacks();
         if (enableLogsMenu) {
-            LogFileUtils.setFilename(getExecutable());
             attachLogStreamSink();
         }
 
         graphicsDriver = container.getGraphicsDriver();
+        zinkMode = container.getZinkMode();
         String graphicsDriverConfig = container.getGraphicsDriverConfig();
         audioDriver = container.getAudioDriver();
         emulator = container.getEmulator();
@@ -975,7 +1555,6 @@ public void handleOnBackPressed() {
         winHandler.setInputType((byte) container.getInputType());
         lc_all = container.getLC_ALL();
 
-        // Log the entire intent to verify the extras
         Intent intent = getIntent();
         Log.d("XServerDisplayActivity", "Intent Extras: " + intent.getExtras());
 
@@ -990,10 +1569,13 @@ public void handleOnBackPressed() {
                         finish();
                         return;
                     }
-                    containerManager.activateContainer(container);
+                    if (!containerManager.activateContainer(container)) {
+                        Log.e("XServerDisplayActivity", "Failed to activate overridden container with ID: " + newContainerId);
+                        finish();
+                        return;
+                    }
                     Log.d("XServerDisplayActivity", "Container overridden to ID: " + newContainerId);
 
-                    // RE-EVALUATE wineVersion and wineInfo after container override!
                     String reevalContainerWineVersion = container.getWineVersion();
                     wineVersion = reevalContainerWineVersion;
                     String shortcutWineVersion = getShortcutWineVersionOverride();
@@ -1012,7 +1594,6 @@ public void handleOnBackPressed() {
                 }
             }
 
-            // Refresh stored host install paths for shortcut-based launches.
             String gameSource = shortcut.getExtra("game_source");
             if ("STEAM".equals(gameSource)) {
                 String appIdStr = shortcut.getExtra("app_id");
@@ -1025,7 +1606,6 @@ public void handleOnBackPressed() {
                 }
             } else if ("EPIC".equals(gameSource)) {
                 String gameInstallPath = shortcut.getExtra("game_install_path");
-                // Fallback: resolve install path from Epic service if missing from shortcut
                 if (gameInstallPath.isEmpty()) {
                     String appIdStr = shortcut.getExtra("app_id");
                     if (!appIdStr.isEmpty()) {
@@ -1038,7 +1618,6 @@ public void handleOnBackPressed() {
                                 }
                                 if (resolved != null && !resolved.isEmpty()) {
                                     gameInstallPath = resolved;
-                                    // Persist so future launches don't need this fallback
                                     shortcut.putExtra("game_install_path", gameInstallPath);
                                     shortcut.saveData();
                                     Log.d("XServerDisplayActivity", "Resolved missing Epic install path from service: " + gameInstallPath);
@@ -1112,6 +1691,7 @@ public void handleOnBackPressed() {
             String rawShortcutDxwrapper = shortcutUsesDefaults ? "" : shortcut.getExtra("dxwrapper");
 
             graphicsDriver = getShortcutSetting("graphicsDriver", container.getGraphicsDriver());
+            zinkMode = getShortcutSetting("zinkMode", container.getZinkMode());
             graphicsDriverConfig = getShortcutSetting("graphicsDriverConfig", container.getGraphicsDriverConfig());
             audioDriver = getShortcutSetting("audioDriver", container.getAudioDriver());
             emulator = getShortcutSetting("emulator", container.getEmulator());
@@ -1160,7 +1740,6 @@ public void handleOnBackPressed() {
             if (!inputType.isEmpty()) winHandler.setInputType((byte)Integer.parseInt(inputType));
             String xinputDisabledString = getShortcutSetting("disableXinput", "false");
             xinputDisabledFromShortcut = parseBoolean(xinputDisabledString);
-            // Pass the value to WinHandler
             winHandler.setXInputDisabled(xinputDisabledFromShortcut);
             Log.d("XServerDisplayActivity", "XInput Disabled from Shortcut: " + xinputDisabledFromShortcut);
 
@@ -1168,7 +1747,6 @@ public void handleOnBackPressed() {
             Log.d("XServerDisplayActivity", "StartupSelection source=shortcutOrContainer shortcutRaw='" +
                     rawShortcutStartupSelection + "' container='" + container.getStartupSelection() +
                     "' effective='" + startupSelection + "'");
-            // Per-game refresh rate override is read in getRefreshRateOverride()
         } else {
             startupSelection = String.valueOf(container.getStartupSelection());
             Log.d("XServerDisplayActivity", "StartupSelection source=container (no shortcut) effective='" +
@@ -1191,21 +1769,34 @@ public void handleOnBackPressed() {
             };
         }
 
-        cachedPlatform = shortcut != null ? shortcut.getExtra("game_source") : "";
-        if (cachedPlatform == null) cachedPlatform = "";
-        cachedDisplayName = (shortcutName != null && !shortcutName.isEmpty())
+        cachedPreloaderBadge = shortcut != null ? shortcut.getExtra("game_source") : "";
+        if (cachedPreloaderBadge == null) cachedPreloaderBadge = "";
+        cachedPreloaderTitle = (shortcutName != null && !shortcutName.isEmpty())
                 ? shortcutName
                 : getString(R.string.preloader_default_name);
-        cachedContainerLabel = container != null ? container.getName() : "";
+        cachedPreloaderSubtitle = container != null ? container.getName() : "";
         showLaunchPreloader(getString(R.string.preloader_initializing));
 
+        // Dependency-install sessions must not become background/reattachable sessions.
+        if (!isDependencyInstall && preferences.getBoolean("enable_background_session", false)) {
+            SessionKeepAliveService.startSession(this);
+        }
+
         inputControlsManager = new InputControlsManager(this);
-        xServer = new XServer(new ScreenInfo(screenSize), isNativeRenderingEnabled);
+        gestureProfileManager = new GestureProfileManager(this);
+        sgsrBaseScreenSize = screenSize;
+        String effectiveScreenSize =
+                SGSRResolutionUtils.applyRenderScale(screenSize, sgsrEnabled, sgsrUpscaleMode);
+        if (!effectiveScreenSize.equals(screenSize)) {
+            Log.i("XServerDisplayActivity", "SGSR render scale active: container='" + screenSize +
+                    "' effective='" + effectiveScreenSize + "' mode=" + sgsrUpscaleMode);
+        }
+        xServer = new XServer(new ScreenInfo(effectiveScreenSize), isNativeRenderingEnabled);
+        sgsrRuntimeEnabled = sgsrEnabled;
         xServer.setWinHandler(winHandler);
 
         boolean[] winStarted = {false};
 
-        // Add the OnWindowModificationListener for dynamic workarounds
         xServer.windowManager.addOnWindowModificationListener(new WindowManager.OnWindowModificationListener() {
             @Override
             public void onUpdateWindowContent(Window window) {
@@ -1215,19 +1806,40 @@ public void onUpdateWindowContent(Window window) {
                     } else {
                         xServerView.getRenderer().setCursorVisible(false);
                     }
-                    preloaderDialog.closeOnUiThread();
+                    if (!wnLauncherDrivesDismiss.get()) {
+                        preloaderDialog.closeOnUiThread();
+                        stopWnLauncherStatusTailer();
+                    }
                     winStarted[0] = true;
-                    firstAppWindowAppeared.set(true);
-                    cancelRealSteamWatchdog();
-                }
-                if (frameRating != null && frameRatingWindowId == window.id) {
-                    frameRating.update();
+                    runOnUiThread(() -> {
+                        inputControlsRevealAllowed = true;
+                        if (inputControlsView != null) {
+                            ControlsProfile activeProfile = inputControlsView.getProfile();
+                            if (activeProfile != null) showInputControls(activeProfile);
+                            else startTouchscreenTimeout();
+                        }
+                    });
+                    if (startFullscreenStretched) {
+                        timeoutHandler.post(() -> {
+                            if (activityDestroyed.get()) return;
+                            VulkanRenderer r = xServerView != null ? xServerView.getRenderer() : null;
+                            if (r != null && !r.isFullscreen()) {
+                                r.toggleFullscreen();
+                                touchpadView.toggleFullscreen();
+                                renderDrawerMenu();
+                            }
+                        });
+                    }
                 }
             }
            
             @Override
             public void onMapWindow(Window window) {
                 assignTaskAffinity(window);
+                pinServiceAffinity();
+                if ((effectiveShowFPS || controllerHudMode) && frameRating != null) {
+                    syncFrameRatingWithExistingWindows();
+                }
             }
 
             @Override
@@ -1235,6 +1847,15 @@ public void onModifyWindowProperty(Window window, Property property) {
                 changeFrameRatingVisibility(window, property);
             }    
 
+            @Override
+            public void onFramePresented(Window window, WindowManager.FrameSource source, int serial) {
+                if (window != null && window.id == rendererWindowId) rendererWindowPresented = true;
+                if (shouldRecordFpsFrame(window, source)) {
+                    frameRating.recordGameFrame(source == WindowManager.FrameSource.PRESENT, serial);
+                    if (mangoHud != null) mangoHud.recordGameFrame(source == WindowManager.FrameSource.PRESENT);
+                }
+            }
+
             @Override
             public void onDestroyWindow(Window window) {
                 changeFrameRatingVisibility(window, null);
@@ -1268,93 +1889,85 @@ public void onFailed(Exception e) {
             } catch (Exception e) {}
         }
 
-        // Check if a profile is defined by the shortcut
         String controlsProfile = shortcut != null ? shortcut.getExtra("controlsProfile", "") : "";
 
-        createNotifcationChannel();
-
-        Intent notificationIntent = new Intent(this, XServerDisplayActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-                .setSmallIcon(R.drawable.ic_stat_ab_gear_0011)
-                .setContentTitle("WinNative")
-                .setContentText(getString(R.string.session_xserver_notification_content))
-                .setPriority(NotificationCompat.PRIORITY_LOW)
-                .setContentIntent(pendingIntent)
-                .setAutoCancel(false);
-
-        NotificationManagerCompat.from(this).notify(NOTIFICATION_ID, builder.build());
-
         Runnable runnable = () -> {
             setupUI();
             if (controlsProfile.isEmpty()) {
-                // No profile defined, run the simulated dialog confirmation for input controls
                 simulateConfirmInputControlsDialog();
             }
             Executors.newSingleThreadExecutor().execute(() -> {
-                // Cancel any pending post-game update check since we're launching a new game
+                boolean sessionToReuse = SessionKeepAliveService.isSessionActive() &&
+                        SessionKeepAliveService.getActiveEnvironment() != null &&
+                        SessionKeepAliveService.getActiveXServer() != null;
+
                 UpdateChecker.INSTANCE.cancelPostGameCheck();
 
-                if (shortcut != null) {
-                    if (isCloudSyncEnabledForShortcut() && !CloudSyncHelper.isOfflineMode(shortcut)) {
-                        CloudSyncHelper.forceDownloadOnContainerSwap(this, shortcut);
-
-                        // Cloud save sync on every store-game launch
-                        if (CloudSyncHelper.isStoreGame(shortcut)) {
-                            if (!CloudSyncHelper.hasLocalCloudSaves(this, shortcut)) {
-                                // First launch — download silently
-                                showLaunchPreloader(getString(R.string.preloader_downloading_cloud));
-                                CloudSyncHelper.downloadCloudSaves(this, shortcut);
-                                showLaunchPreloader(getString(R.string.preloader_initializing));
-                            } else if (CloudSyncHelper.cloudSavesDiffer(this, shortcut)) {
-                                // Cloud differs from local — ask the user what to do
-                                final CountDownLatch dialogLatch = new CountDownLatch(1);
-                                final boolean[] useCloud = {false};
-                                final boolean[] keepBackup = {false};
-                                final CloudSyncConflictTimestamps timestamps = CloudSyncHelper.getConflictTimestamps(this, shortcut);
-                                runOnUiThread(() -> {
-                                    CloudSyncConflictDialog.show(
-                                        XServerDisplayActivity.this,
-                                        timestamps,
-                                        (boolean keep) -> {
-                                            useCloud[0] = true;
-                                            keepBackup[0] = keep;
-                                            dialogLatch.countDown();
-                                        },
-                                        (boolean keep) -> {
-                                            useCloud[0] = false;
-                                            keepBackup[0] = keep;
-                                            dialogLatch.countDown();
-                                        }
-                                    );
-                                });
-                                try {
-                                    dialogLatch.await();
-                                } catch (InterruptedException ignored) {}
+                if (!sessionToReuse) {
+                    if (isSteamShortcut()) {
+                        try {
+                            setSteamClientVisibility(true, isColdClientEnabledForShortcut());
+                        } catch (Throwable t) {
+                            Log.w("XServerDisplayActivity",
+                                    "Failed to select Steam client store before cloud sync", t);
+                        }
+                    }
 
-                                if (useCloud[0]) {
-                                    // Archive the local save that's about to be overwritten
-                                    if (keepBackup[0]) {
-                                        try {
-                                            backupDiscardedSaveForShortcut(shortcut,
-                                                com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupOrigin.LOCAL);
-                                        } catch (Throwable t) {
-                                            android.util.Log.w("CloudSync", "Pre-overwrite local backup failed", t);
-                                        }
-                                    }
-                                    showLaunchPreloader(getString(R.string.preloader_syncing_cloud));
-                                    CloudSyncHelper.downloadCloudSaves(this, shortcut);
-                                    showLaunchPreloader(getString(R.string.preloader_initializing));
-                                }
-                                // Keep Local: cloud version is about to be overwritten on next exit.
-                                // Capturing it would require a separate provider download — deferred for now.
-                            }
+                    // Parallel prep (cloud sync + Steam prefix DLL/asset setup), joined before setupXEnvironment so the launcher sees a complete prefix.
+                    java.util.concurrent.ExecutorService prepExec =
+                            java.util.concurrent.Executors.newFixedThreadPool(2);
+                    java.util.concurrent.Future<?> cloudFuture = prepExec.submit(() -> {
+                        try {
+                            SteamLaunchCloudSync.syncBeforeLaunch(
+                                    this, shortcut, isCloudSyncEnabledForShortcut(),
+                                    this::showLaunchPreloader);
+                            EpicLaunchCloudSync.syncBeforeLaunch(
+                                    this, shortcut, isCloudSyncEnabledForShortcut(),
+                                    this::showLaunchPreloader);
+                            GogLaunchCloudSync.syncBeforeLaunch(
+                                    this, shortcut, isCloudSyncEnabledForShortcut(),
+                                    this::showLaunchPreloader);
+                        } catch (Throwable t) {
+                            Log.w("XServerDisplayActivity",
+                                    "Pre-launch cloud sync failed", t);
                         }
+                    });
+                    java.util.concurrent.Future<?> steamFuture = isSteamShortcut()
+                            ? prepExec.submit(() -> {
+                                try {
+                                    setupSteamGameFiles();
+                                } catch (Throwable t) {
+                                    Log.w("XServerDisplayActivity",
+                                            "Pre-launch Steam game setup failed", t);
+                                }
+                            })
+                            : null;
+                    prepExec.shutdown();
+
+                    if (preloaderDialog != null && isSteamShortcut()) {
+                        preloaderDialog.setStepOnUiThread(R.string.preloader_preparing_steam_environment);
                     }
+                    setupWineSystemFiles();
+                    extractGraphicsDriverFiles();
+                    changeWineAudioDriver();
+
+                    try {
+                        if (steamFuture != null) steamFuture.get();
+                    } catch (Throwable t) {
+                        Log.w("XServerDisplayActivity",
+                                "Steam game setup wait interrupted", t);
+                    }
+                    try {
+                        cloudFuture.get();
+                    } catch (Throwable t) {
+                        Log.w("XServerDisplayActivity",
+                                "Cloud sync wait interrupted", t);
+                    }
+                } else {
+                    Log.i("XServerDisplayActivity", "Skipping pre-game setup for active background session");
+                    applyPreferredRefreshRate();
                 }
-                setupWineSystemFiles();
-                extractGraphicsDriverFiles();
-                changeWineAudioDriver();
+
                 try {
                     setupXEnvironment();
                 } catch (PackageManager.NameNotFoundException e) {
@@ -1363,14 +1976,45 @@ public void onFailed(Exception e) {
             });
         };
 
-        if (xServer.screenInfo.height > xServer.screenInfo.width) {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        boolean targetPortrait = xServer.screenInfo.height > xServer.screenInfo.width;
+        int targetOrientation = targetPortrait
+                ? ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
+        int currentOrientation = getResources().getConfiguration().orientation;
+        boolean alreadyTargetOrientation = targetPortrait
+                ? currentOrientation == Configuration.ORIENTATION_PORTRAIT
+                : currentOrientation == Configuration.ORIENTATION_LANDSCAPE;
+
+        setRequestedOrientation(targetOrientation);
+        if (alreadyTargetOrientation) {
+            runnable.run();
+        } else {
             configChangedCallback = runnable;
-        } else
-              runnable.run();
+            new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                if (configChangedCallback == runnable) {
+                    configChangedCallback.run();
+                    configChangedCallback = null;
+                }
+            }, 1000);
+        }
+    }
+
+    private String resolveDesktopPathFromUri(android.net.Uri uri) {
+        if (uri == null) return null;
+        try {
+            String scheme = uri.getScheme();
+            if ("file".equalsIgnoreCase(scheme)) {
+                return uri.getPath();
+            }
+            if ("content".equalsIgnoreCase(scheme)) {
+                return com.winlator.cmod.shared.io.FileUtils.getFilePathFromUri(this, uri);
+            }
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "Failed to resolve .desktop path from URI", e);
+        }
+        return null;
     }
 
-    // Method to parse container_id from .desktop file
     private int parseContainerIdFromDesktopFile(File desktopFile) {
         int containerId = 0;
         if (desktopFile.exists()) {
@@ -1660,21 +2304,197 @@ private String getActiveGameDirectoryPath() {
         return null;
     }
 
-    private String resolveSteamGameInstallPath(int appId) {
-        if (shortcut != null) {
-            String shortcutInstallPath = shortcut.getExtra("game_install_path");
-            if (shortcutInstallPath != null && !shortcutInstallPath.isEmpty()) {
-                File shortcutInstallDir = new File(shortcutInstallPath);
-                if (shortcutInstallDir.isDirectory()) {
-                    return getCanonicalPathOrAbsolute(shortcutInstallDir);
-                }
-            }
+    private boolean isSuspiciousSteamGameInstallDir(String path) {
+        if (path == null || path.isEmpty()) return false;
+
+        String normalized = path.replace('\\', '/');
+        while (normalized.endsWith("/")) {
+            normalized = normalized.substring(0, normalized.length() - 1);
         }
 
-        String serviceInstallPath = SteamBridge.getAppDirPath(appId);
-        if (serviceInstallPath == null || serviceInstallPath.isEmpty()) return serviceInstallPath;
+        String lower = normalized.toLowerCase(java.util.Locale.ROOT);
+        return lower.endsWith("/steamapps/common") || lower.endsWith("/steamapps");
+    }
 
-        File serviceInstallDir = new File(serviceInstallPath);
+    private boolean isSuspiciousSteamInstallLeaf(String value) {
+        if (value == null || value.isEmpty()) return false;
+
+        String normalized = value.replace('\\', '/');
+        while (normalized.endsWith("/")) {
+            normalized = normalized.substring(0, normalized.length() - 1);
+        }
+
+        int lastSlash = normalized.lastIndexOf('/');
+        if (lastSlash >= 0 && lastSlash + 1 < normalized.length()) {
+            normalized = normalized.substring(lastSlash + 1);
+        }
+
+        return "common".equalsIgnoreCase(normalized) || "steamapps".equalsIgnoreCase(normalized);
+    }
+
+    private String normalizeRelativeExeCandidate(String value) {
+        if (value == null) return "";
+
+        String normalized = value.trim().replace('\\', '/');
+        while (normalized.startsWith("/")) {
+            normalized = normalized.substring(1);
+        }
+        if (normalized.matches("^[A-Za-z]:/.*")) {
+            normalized = normalized.substring(3);
+        }
+        return normalized;
+    }
+
+    private File resolveImmediateChildCaseInsensitive(File parent, String childName) {
+        if (parent == null || childName == null || childName.isEmpty() || !parent.isDirectory()) {
+            return null;
+        }
+
+        File directChild = new File(parent, childName);
+        if (directChild.exists()) return directChild;
+
+        File[] children = parent.listFiles();
+        if (children == null) return null;
+
+        for (File child : children) {
+            if (childName.equalsIgnoreCase(child.getName())) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    private boolean hasKnownGameExeUnderDir(File dir, java.util.List<String> relativeExeCandidates) {
+        if (dir == null || !dir.isDirectory()) return false;
+
+        for (String relativeExe : relativeExeCandidates) {
+            File candidateExe = resolvePathCaseInsensitive(dir, relativeExe);
+            if (candidateExe != null && candidateExe.isFile()) {
+                return true;
+            }
+        }
+
+        return findGameExe(dir) != null;
+    }
+
+    private String recoverSteamGameInstallPath(int appId, String libraryRootPath) {
+        if (libraryRootPath == null || libraryRootPath.isEmpty()) return null;
+
+        File libraryRoot = new File(libraryRootPath);
+        if (!libraryRoot.isDirectory()) return null;
+
+        java.util.LinkedHashSet<String> relativeExeCandidates = new java.util.LinkedHashSet<>();
+        String shortcutLaunchExe = shortcut != null ? shortcut.getExtra("launch_exe_path") : "";
+        String containerLaunchExe = container != null ? container.getExecutablePath() : "";
+        String installedExe = SteamBridge.getInstalledExe(appId);
+
+        for (String candidate : new String[]{shortcutLaunchExe, containerLaunchExe, installedExe}) {
+            String normalized = normalizeRelativeExeCandidate(candidate);
+            if (!normalized.isEmpty()) {
+                relativeExeCandidates.add(normalized);
+            }
+        }
+
+        java.util.LinkedHashSet<String> preferredDirNames = new java.util.LinkedHashSet<>();
+        if (shortcut != null && shortcut.name != null && !shortcut.name.trim().isEmpty()) {
+            preferredDirNames.add(shortcut.name.trim());
+        }
+
+        String serviceInstallPath = SteamBridge.getAppDirPath(appId);
+        if (serviceInstallPath != null && !serviceInstallPath.isEmpty()) {
+            String serviceLeaf = new File(serviceInstallPath).getName();
+            if (!serviceLeaf.isEmpty()) {
+                preferredDirNames.add(serviceLeaf);
+            }
+        }
+
+        java.util.ArrayList<String> relativeExeList = new java.util.ArrayList<>(relativeExeCandidates);
+        for (String preferredDirName : preferredDirNames) {
+            if (isSuspiciousSteamInstallLeaf(preferredDirName)) continue;
+
+            File preferredDir = resolveImmediateChildCaseInsensitive(libraryRoot, preferredDirName);
+            if (preferredDir != null && preferredDir.isDirectory()
+                    && hasKnownGameExeUnderDir(preferredDir, relativeExeList)) {
+                return getCanonicalPathOrAbsolute(preferredDir);
+            }
+        }
+
+        if (relativeExeList.isEmpty()) return null;
+
+        java.util.ArrayList<File> matches = new java.util.ArrayList<>();
+        File[] children = libraryRoot.listFiles();
+        if (children == null) return null;
+
+        for (File child : children) {
+            if (!child.isDirectory()) continue;
+            if (hasKnownGameExeUnderDir(child, relativeExeList)) {
+                matches.add(child);
+            }
+        }
+
+        if (matches.size() == 1) {
+            return getCanonicalPathOrAbsolute(matches.get(0));
+        }
+
+        if (matches.size() > 1) {
+            Log.w("XServerDisplayActivity",
+                    "Ambiguous Steam install-path recovery for appId=" + appId
+                            + " libraryRoot=" + libraryRootPath
+                            + " matches=" + matches.size());
+        }
+        return null;
+    }
+
+    private String sanitizeSteamGameInstallPath(int appId, String candidatePath, String source) {
+        if (candidatePath == null || candidatePath.isEmpty()) return candidatePath;
+
+        File candidateDir = new File(candidatePath);
+        if (!candidateDir.isDirectory()) return candidatePath;
+
+        String canonicalPath = getCanonicalPathOrAbsolute(candidateDir);
+        if (!isSuspiciousSteamGameInstallDir(canonicalPath)) {
+            return canonicalPath;
+        }
+
+        String recoveredPath = recoverSteamGameInstallPath(appId, canonicalPath);
+        if (recoveredPath != null && !recoveredPath.isEmpty()) {
+            Log.w("XServerDisplayActivity",
+                    "Recovered Steam game install path from " + source
+                            + " root " + canonicalPath + " -> " + recoveredPath
+                            + " for appId=" + appId);
+            return recoveredPath;
+        }
+
+        Log.w("XServerDisplayActivity",
+                "Ignoring suspicious Steam game install path from " + source
+                        + " for appId=" + appId + ": " + canonicalPath);
+        return null;
+    }
+
+    private String resolveSteamGameInstallPath(int appId) {
+        if (shortcut != null) {
+            String shortcutInstallPath = shortcut.getExtra("game_install_path");
+            String resolvedShortcutInstallPath =
+                    sanitizeSteamGameInstallPath(appId, shortcutInstallPath, "shortcut");
+            if (resolvedShortcutInstallPath != null && !resolvedShortcutInstallPath.isEmpty()) {
+                if (!resolvedShortcutInstallPath.equals(shortcutInstallPath)) {
+                    shortcut.putExtra("game_install_path", resolvedShortcutInstallPath);
+                    shortcut.saveData();
+                }
+                return resolvedShortcutInstallPath;
+            }
+        }
+
+        String serviceInstallPath = SteamBridge.getAppDirPath(appId);
+        if (serviceInstallPath == null || serviceInstallPath.isEmpty()) return serviceInstallPath;
+
+        String resolvedServiceInstallPath =
+                sanitizeSteamGameInstallPath(appId, serviceInstallPath, "service");
+        if (resolvedServiceInstallPath == null || resolvedServiceInstallPath.isEmpty()) {
+            return serviceInstallPath;
+        }
+
+        File serviceInstallDir = new File(resolvedServiceInstallPath);
         if (serviceInstallDir.isDirectory() && shortcut != null) {
             String shortcutInstallPath = shortcut.getExtra("game_install_path");
             String canonicalInstallPath = getCanonicalPathOrAbsolute(serviceInstallDir);
@@ -1687,15 +2507,12 @@ private String resolveSteamGameInstallPath(int appId) {
     }
 
     private boolean parseBoolean(String value) {
-        // Return true for "true", "1", "yes" (case-insensitive)
         if ("true".equalsIgnoreCase(value) || "1".equals(value) || "yes".equalsIgnoreCase(value)) {
             return true;
         }
-        // Return false for any other value, including "false", "0", "no"
         return false;
     }
 
-    // Inside XServerDisplayActivity class
     private void handleCapturedPointer(MotionEvent event) {
         if (isMouseDisabled) {
             return;
@@ -1713,39 +2530,21 @@ private void handleCapturedPointer(MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_BUTTON_PRESS:
                 if (actionButton == MotionEvent.BUTTON_PRIMARY) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.LEFTDOWN, 0, 0, 0);
-                    else
-                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT);
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT);
                 } else if (actionButton == MotionEvent.BUTTON_SECONDARY) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.RIGHTDOWN, 0, 0, 0);
-                    else
-                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_RIGHT);
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_RIGHT);
                 } else if (actionButton == MotionEvent.BUTTON_TERTIARY) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.MIDDLEDOWN, 0, 0, 0);
-                    else
-                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_MIDDLE); // Add this line for middle mouse button press
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_MIDDLE);
                 }
                 handled = true;
                 break;
             case MotionEvent.ACTION_BUTTON_RELEASE:
                 if (actionButton == MotionEvent.BUTTON_PRIMARY) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.LEFTUP, 0, 0, 0);
-                    else
-                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT);
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT);
                 } else if (actionButton == MotionEvent.BUTTON_SECONDARY) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.RIGHTUP, 0, 0, 0);
-                    else
-                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT);
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT);
                 } else if (actionButton == MotionEvent.BUTTON_TERTIARY) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.MIDDLEUP, 0, 0, 0);
-                    else
-                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_MIDDLE); // Add this line for middle mouse button release
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_MIDDLE);
                 }
                 handled = true;
                 break;
@@ -1753,28 +2552,22 @@ private void handleCapturedPointer(MotionEvent event) {
             case MotionEvent.ACTION_HOVER_MOVE:
                 int[] delta = getCapturedPointerDelta(event);
                 if (delta[0] == 0 && delta[1] == 0) break;
-                if (xServer.isRelativeMouseMovement())
-                    xServer.getWinHandler().mouseEvent(MouseEventFlags.MOVE, delta[0], delta[1], 0);
-                else
+                if (xServer.isRelativeMouseMovement()) {
+                    xServer.updatePointerForDisplayDelta(delta[0], delta[1]);
+                    xServer.getWinHandler().mouseMoveDelta(delta[0], delta[1]);
+                } else {
                     xServer.injectPointerMoveDelta(delta[0], delta[1]);
+                }
                 handled = true;
                 break;
             case MotionEvent.ACTION_SCROLL:
                 float scrollY = event.getAxisValue(MotionEvent.AXIS_VSCROLL);
                 if (scrollY <= -1.0f) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.WHEEL, 0, 0, (int)scrollY * 270);
-                    else {
-                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_DOWN);
-                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_DOWN);
-                    }
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_DOWN);
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_DOWN);
                 } else if (scrollY >= 1.0f) {
-                    if (xServer.isRelativeMouseMovement())
-                        xServer.getWinHandler().mouseEvent(MouseEventFlags.WHEEL, 0, 0,(int)scrollY * 270);
-                    else {
-                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_UP);
-                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_UP);
-                    }
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_UP);
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_UP);
                 }
                 handled = true;
                 break;
@@ -1782,51 +2575,78 @@ private void handleCapturedPointer(MotionEvent event) {
     }
 
     private int[] getCapturedPointerDelta(MotionEvent event) {
-        float dx = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
-        float dy = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+        // Sum batched samples; skipping history drops movement at low refresh rates.
+        final int historySize = event.getHistorySize();
+        float dx = 0.0f;
+        float dy = 0.0f;
+        for (int i = 0; i < historySize; i++) {
+            dx += event.getHistoricalAxisValue(MotionEvent.AXIS_RELATIVE_X, i);
+            dy += event.getHistoricalAxisValue(MotionEvent.AXIS_RELATIVE_Y, i);
+        }
+        dx += event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+        dy += event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
         if (dx == 0.0f && dy == 0.0f) {
-            dx = event.getX();
-            dy = event.getY();
+            for (int i = 0; i < historySize; i++) {
+                dx += event.getHistoricalX(i);
+                dy += event.getHistoricalY(i);
+            }
+            dx += event.getX();
+            dy += event.getY();
         }
+        dx *= globalCursorSpeed;
+        dy *= globalCursorSpeed;
         return new int[]{
                 (int)(xform[0] * dx + xform[2] * dy),
                 (int)(xform[1] * dx + xform[3] * dy)
         };
     }
 
+    private void ensureAudioFocusHandler() {
+        if (audioFocusHandler != null) return;
+        audioFocusHandler =
+                new com.winlator.cmod.runtime.display.environment.AudioFocusHandler(
+                        this,
+                        () -> { if (environment != null) environment.onPause(); },
+                        () -> { if (environment != null) environment.onResume(); });
+    }
+
     @Override
     public void onResume() {
         super.onResume();
+        com.winlator.cmod.feature.stores.steam.service.GameSessionState.setInGame(this, true);
         applyPreferredRefreshRate();
-        boolean gyroEnabled = preferences.getBoolean("gyro_enabled", false);
-
-        if (gyroEnabled) {
-            // Re-register the sensor listener when the activity is resumed
-            sensorManager.registerListener(gyroListener, gyroSensor, SensorManager.SENSOR_DELAY_GAME);
-        }
+        registerGyroSensorIfEnabled();
 
         boolean cleaningUp = exitRequested.get() || sessionCleanupStarted.get() || activityDestroyed.get();
 
         if (!cleaningUp && environment != null) {
             xServerView.onResume();
             environment.onResume();
+            ensureAudioFocusHandler();
+            if (audioFocusHandler != null) audioFocusHandler.request();
         }
+
         if (inputControlsView != null && touchpadView != null) {
             ControlsProfile activeProfile = inputControlsView.getProfile();
             if (activeProfile == null) activeProfile = resolvePreferredStartupProfile();
             if (activeProfile != null) showInputControls(activeProfile);
             else startTouchscreenTimeout();
+            evaluateControllerAutoHide();
         }
+
         startTime = System.currentTimeMillis();
         handler.postDelayed(savePlaytimeRunnable, SAVE_INTERVAL_MS);
-        if (!cleaningUp) {
+
+        if (!cleaningUp && !isPaused) {
             ProcessHelper.resumeAllWineProcesses();
+            SessionKeepAliveService.onResumeSession(this);
         }
 
-        // Resume task-manager polling only if the pane is still the active selection.
         if (taskManagerPaneVisible && taskManagerTimer == null) {
             startTaskManagerPolling();
         }
+
+        if (externalDisplayController != null) externalDisplayController.start();
     }
 
     @Override
@@ -1834,18 +2654,17 @@ public void onPause() {
         super.onPause();
         isVolumeUpPressed = false;
         isVolumeDownPressed = false;
+        guideHoldPending = false;
+        handler.removeCallbacks(guideHoldOpenRunnable);
         boolean gyroEnabled = preferences.getBoolean("gyro_enabled", false);
 
         if (gyroEnabled) {
-            // Unregister the sensor listener when the activity is paused
             sensorManager.unregisterListener(gyroListener);
         }
 
-        // Check if we are entering Picture-in-Picture mode
         boolean cleaningUp = exitRequested.get() || sessionCleanupStarted.get() || activityDestroyed.get();
 
         if (!cleaningUp && !isInPictureInPictureMode()) {
-            // Only pause environment and xServerView if not in PiP mode
             if (environment != null) {
                 environment.onPause();
                 xServerView.onPause();
@@ -1861,20 +2680,22 @@ public void onPause() {
 
         savePlaytimeData();
         handler.removeCallbacks(savePlaytimeRunnable);
-        if (!cleaningUp) {
-            ProcessHelper.pauseAllWineProcesses();
-        }
 
-        // Suspend task-manager polling while backgrounded; onResume restarts it
-        // if the pane is still the active selection.
         if (taskManagerTimer != null) {
             taskManagerTimer.cancel();
             taskManagerTimer = null;
             if (winHandler != null) winHandler.setOnGetProcessInfoListener(null);
             taskManagerAccum.clear();
         }
+
+        if (externalDisplayController != null) externalDisplayController.stop();
     }
 
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean("isPaused", isPaused);
+    }
 
     private void savePlaytimeData() {
         savePlaytimeData(false);
@@ -1884,7 +2705,6 @@ private void savePlaytimeData(boolean synchronous) {
         long endTime = System.currentTimeMillis();
         long playtime = endTime - startTime;
 
-        // Ensure that playtime is not negative
         if (playtime < 0) {
             playtime = 0;
         }
@@ -1892,7 +2712,6 @@ private void savePlaytimeData(boolean synchronous) {
         SharedPreferences.Editor editor = playtimePrefs.edit();
         String playtimeKey = shortcutName + "_playtime";
 
-        // Accumulate the playtime into totalPlaytime
         long totalPlaytime = playtimePrefs.getLong(playtimeKey, 0) + playtime;
         editor.putLong(playtimeKey, totalPlaytime);
         if (synchronous) {
@@ -1901,7 +2720,6 @@ private void savePlaytimeData(boolean synchronous) {
             editor.apply();
         }
 
-        // Reset startTime to the current time for the next interval
         startTime = System.currentTimeMillis();
     }
 
@@ -2010,7 +2828,15 @@ private boolean shouldWatchSteamTermination(int status) {
 
                 while (!exitRequested.get()
                         && !activityDestroyed.get()
-                        && System.currentTimeMillis() - startTime < STEAM_TERMINATION_TIMEOUT_MS) {
+                        && (System.currentTimeMillis() - startTime) < STEAM_TERMINATION_TIMEOUT_MS) {
+                    
+                    if (isPaused) {
+                        startTime += STEAM_TERMINATION_POLL_MS;
+                        if (lastNonCoreSeenAt > 0) lastNonCoreSeenAt += STEAM_TERMINATION_POLL_MS;
+                        Thread.sleep(STEAM_TERMINATION_POLL_MS);
+                        continue;
+                    }
+
                     ArrayList<ProcessInfo> snapshot = captureWinHandlerProcessSnapshot();
                     if (snapshot != null) {
                         ArrayList<String> activeNames = new ArrayList<>();
@@ -2065,6 +2891,10 @@ private boolean shouldWatchSteamTermination(int status) {
     }
 
     private void cleanupLingeringSessionProcesses(String reason) {
+        if (SessionKeepAliveService.isSessionActive()) {
+            Log.d("XServerDisplayActivity", "Skipping lingering process cleanup from " + reason + " — session is active in background");
+            return;
+        }
         ArrayList<String> before = ProcessHelper.listRunningWineProcesses();
         if (before.isEmpty()) return;
 
@@ -2094,6 +2924,11 @@ private void requestExitOnUiThread(String reason) {
     private boolean beginSessionCleanup(String trigger) {
         if (sessionCleanupStarted.compareAndSet(false, true)) {
             Log.d("XServerDisplayActivity", "Starting session cleanup from " + trigger);
+            try {
+                if (perfController != null) perfController.stop();
+            } catch (Throwable t) {
+                Log.w("XServerDisplayActivity", "perfController.stop() failed", t);
+            }
             return true;
         }
         Log.d("XServerDisplayActivity", "Session cleanup already in progress; ignoring " + trigger);
@@ -2111,12 +2946,6 @@ private void cleanupActivityCallbacks(String trigger) {
             Log.w("XServerLeakCheck", "Failed to unregister preference listener during " + trigger, e);
         }
 
-        try {
-            cancelRealSteamWatchdog();
-        } catch (Exception e) {
-            Log.w("XServerLeakCheck", "Failed to cancel Steam watchdog during " + trigger, e);
-        }
-
         try {
             if (handler != null) {
                 if (savePlaytimeRunnable != null) {
@@ -2149,7 +2978,7 @@ private void cleanupActivityCallbacks(String trigger) {
         try {
             if (touchpadView != null) {
                 touchpadView.resetInputState();
-                touchpadView.releasePointerCapture();
+                if (touchpadView.hasPointerCapture()) touchpadView.releasePointerCapture();
                 touchpadView.setOnCapturedPointerListener(null);
             }
         } catch (Exception e) {
@@ -2181,30 +3010,41 @@ private void stopWinHandler(String trigger) {
     }
 
     private void attachLogStreamSink() {
-        try {
-            logStreamFile = LogFileUtils.getLogFile(this);
-            logStreamWriter = new BufferedWriter(new FileWriter(logStreamFile));
-        } catch (IOException e) {
-            Log.w("XServerLogs", "Failed to open log file writer", e);
-            logStreamWriter = null;
-            logStreamFile = null;
-        }
+        boolean wineDebugEnabled = preferences.getBoolean("enable_wine_debug", false);
+        boolean emulatorLogsEnabled = preferences.getBoolean("enable_emulator_logs", false);
+        boolean arm64ec = wineInfo != null && wineInfo.isArm64EC();
+        String emulator = container != null ? container.getEmulator() : null;
+        boolean usesWowbox64 = emulator != null && emulator.equalsIgnoreCase("wowbox64");
+        boolean fexActive = arm64ec && !usesWowbox64;
+        boolean box64Active = !fexActive;
+        boolean box64LogsEnabled = emulatorLogsEnabled && box64Active;
+        boolean fexLogsEnabled = emulatorLogsEnabled && fexActive;
+
+        sessionLogWriter = com.winlator.cmod.runtime.system.SessionLogWriter.create(
+                this,
+                getExecutable(),
+                box64LogsEnabled,
+                fexLogsEnabled,
+                wineDebugEnabled,
+                box64Active,
+                fexActive);
+
         Callback<String> sink = new Callback<String>() {
+            private long cachedSecond = -1;
+            private String cachedPrefix = "";
+
             @Override
             public synchronized void call(String line) {
-                String stamped = "[" + DateFormat.format("HH:mm:ss", System.currentTimeMillis())
-                        + "]  " + line.replace("\n", "");
+                long second = System.currentTimeMillis() / 1000L;
+                if (second != cachedSecond) {
+                    cachedSecond = second;
+                    cachedPrefix = "[" + DateFormat.format("HH:mm:ss", second * 1000L) + "]  ";
+                }
+                String stamped = cachedPrefix + line.replace("\n", "");
                 XServerDrawerStateHolder holder = drawerStateHolder;
                 if (holder != null) holder.appendLogLine(stamped);
-                BufferedWriter writer = logStreamWriter;
-                if (writer != null) {
-                    try {
-                        writer.write(stamped);
-                        writer.write("\n");
-                        writer.flush();
-                    } catch (IOException ignored) {
-                    }
-                }
+                com.winlator.cmod.runtime.system.SessionLogWriter writer = sessionLogWriter;
+                if (writer != null) writer.write(stamped);
             }
         };
         logStreamSink = sink;
@@ -2212,60 +3052,77 @@ public synchronized void call(String line) {
     }
 
     private void shareLogStream() {
-        try {
-            File shareDir = new File(getCacheDir(), "log_shares");
-            if (!shareDir.exists()) shareDir.mkdirs();
-            String stamp = (String) DateFormat.format("yyyy-MM-dd_HH-mm-ss", new Date());
-            File shareFile = new File(shareDir, "session_logs_" + stamp + ".txt");
-
-            BufferedWriter writer = logStreamWriter;
-            if (writer != null) {
-                try {
-                    writer.flush();
-                } catch (IOException ignored) {
-                }
-            }
-
-            File source = logStreamFile;
-            boolean wrote = false;
-            if (source != null && source.exists() && source.length() > 0) {
-                try (java.io.InputStream in = new java.io.FileInputStream(source);
-                     java.io.OutputStream out = new java.io.FileOutputStream(shareFile)) {
-                    byte[] buf = new byte[8192];
-                    int n;
-                    while ((n = in.read(buf)) > 0) out.write(buf, 0, n);
-                    out.flush();
-                    wrote = true;
+        new Thread(() -> {
+            try {
+                com.winlator.cmod.runtime.system.SessionLogWriter writer = sessionLogWriter;
+                if (writer != null) writer.flush();
+
+                File shareDir = new File(getCacheDir(), "log_shares");
+                if (!shareDir.exists()) shareDir.mkdirs();
+                String stamp = (String) DateFormat.format("yyyy-MM-dd_HH-mm-ss", new Date());
+
+                File[] logFiles = com.winlator.cmod.runtime.system.LogManager.getShareableLogFiles(this);
+
+                final File shareFile;
+                final String mimeType;
+
+                if (logFiles != null && logFiles.length > 0) {
+                    File zipFile = new File(shareDir, "session_logs_" + stamp + ".zip");
+                    try (java.util.zip.ZipOutputStream zos =
+                                 new java.util.zip.ZipOutputStream(new java.io.FileOutputStream(zipFile))) {
+                        for (File file : logFiles) {
+                            if (file == null || !file.isFile()) continue;
+                            zos.putNextEntry(new java.util.zip.ZipEntry(file.getName()));
+                            try (java.io.InputStream in = new java.io.FileInputStream(file)) {
+                                byte[] buf = new byte[8192];
+                                int n;
+                                while ((n = in.read(buf)) > 0) zos.write(buf, 0, n);
+                            }
+                            zos.closeEntry();
+                        }
+                    }
+                    shareFile = zipFile;
+                    mimeType = "application/zip";
+                } else {
+                    XServerDrawerStateHolder holder = drawerStateHolder;
+                    List<String> lines = holder != null ? holder.snapshotLogLines() : new ArrayList<>();
+                    if (lines.isEmpty()) {
+                        runOnUiThread(() ->
+                                WinToast.show(this, getString(R.string.session_drawer_logs_share_empty)));
+                        return;
+                    }
+                    File textFile = new File(shareDir, "session_logs_" + stamp + ".txt");
+                    try (BufferedWriter out = new BufferedWriter(new FileWriter(textFile))) {
+                        for (String line : lines) {
+                            out.write(line);
+                            out.write("\n");
+                        }
+                    }
+                    shareFile = textFile;
+                    mimeType = "text/plain";
                 }
-            }
 
-            if (!wrote) {
-                XServerDrawerStateHolder holder = drawerStateHolder;
-                List<String> lines = holder != null ? holder.snapshotLogLines() : new ArrayList<>();
-                if (lines.isEmpty()) {
-                    WinToast.show(this, getString(R.string.session_drawer_logs_share_empty));
-                    return;
-                }
-                try (BufferedWriter out = new BufferedWriter(new FileWriter(shareFile))) {
-                    for (String line : lines) {
-                        out.write(line);
-                        out.write("\n");
+                runOnUiThread(() -> {
+                    try {
+                        String authority = getPackageName() + ".tileprovider";
+                        Uri uri = FileProvider.getUriForFile(this, authority, shareFile);
+                        Intent shareIntent = new Intent(Intent.ACTION_SEND);
+                        shareIntent.setType(mimeType);
+                        shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
+                        shareIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.session_drawer_logs_share_subject));
+                        shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                        startActivity(Intent.createChooser(shareIntent, getString(R.string.session_drawer_logs_share_chooser)));
+                    } catch (Exception e) {
+                        Log.w("XServerLogs", "Failed to share log stream", e);
+                        WinToast.show(this, getString(R.string.session_drawer_logs_share_failed));
                     }
-                }
+                });
+            } catch (Exception e) {
+                Log.w("XServerLogs", "Failed to share log stream", e);
+                runOnUiThread(() ->
+                        WinToast.show(this, getString(R.string.session_drawer_logs_share_failed)));
             }
-
-            String authority = getPackageName() + ".tileprovider";
-            Uri uri = FileProvider.getUriForFile(this, authority, shareFile);
-            Intent shareIntent = new Intent(Intent.ACTION_SEND);
-            shareIntent.setType("text/plain");
-            shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
-            shareIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.session_drawer_logs_share_subject));
-            shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            startActivity(Intent.createChooser(shareIntent, getString(R.string.session_drawer_logs_share_chooser)));
-        } catch (Exception e) {
-            Log.w("XServerLogs", "Failed to share log stream", e);
-            WinToast.show(this, getString(R.string.session_drawer_logs_share_failed));
-        }
+        }).start();
     }
 
     private void cleanupDebugDialog(String trigger) {
@@ -2278,16 +3135,11 @@ private void cleanupDebugDialog(String trigger) {
             }
             logStreamSink = null;
         }
-        BufferedWriter writer = logStreamWriter;
+        com.winlator.cmod.runtime.system.SessionLogWriter writer = sessionLogWriter;
         if (writer != null) {
-            try {
-                writer.close();
-            } catch (IOException ignored) {
-            } finally {
-                logStreamWriter = null;
-            }
+            writer.close();
+            sessionLogWriter = null;
         }
-        logStreamFile = null;
     }
 
     private void stopXServer(String trigger) {
@@ -2300,6 +3152,17 @@ private void stopXServer(String trigger) {
         }
     }
 
+    private long sessionTerminateGraceMs() {
+        try {
+            if (isSteamShortcut()
+                    && com.winlator.cmod.feature.stores.steam.utils.PrefManager
+                            .INSTANCE.getWnPlanW()) {
+                return 800L;
+            }
+        } catch (Throwable ignored) {}
+        return 2000L;
+    }
+
     private void performForcedSessionCleanup(String trigger) {
         if (!beginSessionCleanup(trigger)) {
             Log.d("XServerLeakCheck", "Forced session cleanup already ran; skipping duplicate request from " + trigger);
@@ -2309,6 +3172,7 @@ private void performForcedSessionCleanup(String trigger) {
         Log.w("XServerLeakCheck", "Starting forced session cleanup from " + trigger);
         Log.d("XServerLeakCheck", "Forced cleanup initial process snapshot: "
                 + ProcessHelper.listRunningWineProcessDetails());
+
         try {
             if (playtimePrefs != null) {
                 savePlaytimeData(true);
@@ -2318,68 +3182,73 @@ private void performForcedSessionCleanup(String trigger) {
         }
         cleanupActivityCallbacks("forced cleanup (" + trigger + ")");
 
-        try {
-            AppTerminationHelper.stopManagedServices(getApplicationContext(), "xserver_forced_cleanup_" + trigger);
-        } catch (Exception e) {
-            Log.w("XServerLeakCheck", "Failed to stop managed services during forced cleanup", e);
-        }
-
         try {
             if (preloaderDialog != null) preloaderDialog.close();
         } catch (Exception e) {
             Log.w("XServerLeakCheck", "Failed to close preloader during forced cleanup", e);
         }
 
-        try {
-            if (midiHandler != null) {
-                midiHandler.stop();
-                midiHandler = null;
+        new Thread(() -> {
+            performForcedEpicCloudUpload("forced cleanup (" + trigger + ")");
+            performForcedGogCloudUpload("forced cleanup (" + trigger + ")");
+            sanitizeSteamStateForNextSession("forced cleanup (" + trigger + ")", true);
+
+            try {
+                AppTerminationHelper.stopManagedServices(getApplicationContext(), "xserver_forced_cleanup_" + trigger);
+            } catch (Exception e) {
+                Log.w("XServerLeakCheck", "Failed to stop managed services during forced cleanup", e);
             }
-        } catch (Exception e) {
-            Log.e("XServerLeakCheck", "Failed to stop MidiHandler during forced cleanup", e);
-        }
 
-        try {
-            stopWinHandler("forced cleanup (" + trigger + ")");
-        } catch (Exception e) {
-            Log.e("XServerLeakCheck", "Failed to stop WinHandler during forced cleanup", e);
-        }
+            try {
+                if (midiHandler != null) {
+                    midiHandler.stop();
+                    midiHandler = null;
+                }
+            } catch (Exception e) {
+                Log.e("XServerLeakCheck", "Failed to stop MidiHandler during forced cleanup", e);
+            }
 
-        try {
-            if (wineRequestHandler != null) {
-                wineRequestHandler.stop();
-                wineRequestHandler = null;
+            try {
+                stopWinHandler("forced cleanup (" + trigger + ")");
+            } catch (Exception e) {
+                Log.e("XServerLeakCheck", "Failed to stop WinHandler during forced cleanup", e);
             }
-        } catch (Exception e) {
-            Log.e("XServerLeakCheck", "Failed to stop WineRequestHandler during forced cleanup", e);
-        }
 
-        ArrayList<String> remaining = ProcessHelper.terminateSessionProcessesAndWait(2000, true);
-        ProcessHelper.drainDeadChildren("forced cleanup (" + trigger + ")");
-        ProcessHelper.scheduleDeadChildReapSweep("forced cleanup (" + trigger + ")", 4000, 200);
+            try {
+                if (wineRequestHandler != null) {
+                    wineRequestHandler.stop();
+                    wineRequestHandler = null;
+                }
+            } catch (Exception e) {
+                Log.e("XServerLeakCheck", "Failed to stop WineRequestHandler during forced cleanup", e);
+            }
 
-        try {
-            if (environment != null) {
-                environment.stopEnvironmentComponents();
-                environment = null;
+            ArrayList<String> remaining = ProcessHelper.terminateSessionProcessesAndWait(sessionTerminateGraceMs(), true);
+            ProcessHelper.drainDeadChildren("forced cleanup (" + trigger + ")");
+            ProcessHelper.scheduleDeadChildReapSweep("forced cleanup (" + trigger + ")", 4000, 200);
+
+            try {
+                if (environment != null) {
+                    environment.stopEnvironmentComponents();
+                    environment = null;
+                }
+            } catch (Exception e) {
+                Log.e("XServerLeakCheck", "Failed to stop environment during forced cleanup", e);
             }
-        } catch (Exception e) {
-            Log.e("XServerLeakCheck", "Failed to stop environment during forced cleanup", e);
-        }
 
-        stopXServer("forced cleanup (" + trigger + ")");
-        xServer = null;
-        xServerView = null;
+            stopXServer("forced cleanup (" + trigger + ")");
+            xServer = null;
+            xServerView = null;
 
-        if (remaining.isEmpty()) {
-            Log.i("XServerLeakCheck", "Forced session cleanup finished cleanly after " + trigger);
-        } else {
-            Log.e("XServerLeakCheck", "Remaining leaked session processes after forced cleanup from " + trigger + ": "
-                    + ProcessHelper.listRunningWineProcessDetails());
-        }
-        Log.d("XServerLeakCheck", "Forced cleanup final process snapshot: "
-                + ProcessHelper.listRunningWineProcessDetails());
-        cleanupDebugDialog("forced cleanup (" + trigger + ")");
+            if (remaining.isEmpty()) {
+                Log.i("XServerLeakCheck", "Forced session cleanup finished cleanly after " + trigger);
+            } else {
+                Log.e("XServerLeakCheck", "Remaining leaked session processes after forced cleanup from " + trigger + ": "
+                        + ProcessHelper.listRunningWineProcessDetails());
+            }
+            
+            runOnUiThread(() -> cleanupDebugDialog("forced cleanup (" + trigger + ")"));
+        }, "XServerForcedCleanup").start();
     }
 
     private void exit() {
@@ -2392,36 +3261,32 @@ private void exit() {
             return;
         }
 
-        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID);
         if (shortcutName != null && !shortcutName.isEmpty()) {
-            preloaderDialog.showOnUiThread("Closing " + shortcutName + "...");
+            preloaderDialog.showOnUiThread(getString(R.string.preloader_closing, shortcutName));
         } else {
-            preloaderDialog.showOnUiThread("Closing Container...");
+            preloaderDialog.showOnUiThread(
+                    getString(R.string.preloader_closing, getString(R.string.preloader_default_name)));
         }
         
-        // Sync store cloud saves before shutting down
         syncStoreCloudOnExit(() -> {
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (!beginSessionCleanup("exit")) {
-                        return;
-                    }
-                    savePlaytimeData(true);
-                    cleanupActivityCallbacks("exit");
+            handler.postDelayed(() -> {
+                if (!beginSessionCleanup("exit")) {
+                    return;
+                }
+                savePlaytimeData(true);
+                cleanupActivityCallbacks("exit");
+                // Teardown blocks for seconds (cloud upload + clean-shutdown wait); run off the UI thread or the closing splash freezes. UI-touching calls are marshalled back.
+                new Thread(() -> {
+                    sanitizeSteamStateForNextSession("exit", true);
                     if (midiHandler != null) midiHandler.stop();
                     stopWinHandler("exit");
                     if (wineRequestHandler != null) wineRequestHandler.stop();
-                    /* Gracefully terminate all running wine processes first, so ALSA/audio
-                     * threads are no longer fed data before we tear down their sockets. */
-                    ArrayList<String> remaining = ProcessHelper.terminateSessionProcessesAndWait(2000, true);
+                    ArrayList<String> remaining = ProcessHelper.terminateSessionProcessesAndWait(sessionTerminateGraceMs(), true);
                     ProcessHelper.drainDeadChildren("activity exit cleanup");
                     ProcessHelper.scheduleDeadChildReapSweep("activity exit cleanup", 4000, 200);
                     if (!remaining.isEmpty()) {
                         Log.e("XServerDisplayActivity", "Exit cleanup still has remaining session processes: " + remaining);
                     }
-                    /* Now safe to tear down environment components (ALSA, PulseAudio, XServer, etc.)
-                     * since Wine processes are no longer writing to their sockets. */
                     if (environment != null) {
                         environment.stopEnvironmentComponents();
                         environment = null;
@@ -2433,10 +3298,13 @@ public void run() {
                     midiHandler = null;
                     xServer = null;
                     xServerView = null;
-                    if (preloaderDialog != null && preloaderDialog.isShowing()) preloaderDialog.closeOnUiThread();
-                    cleanupDebugDialog("exit");
-                    closeAfterSessionExit();
-                }
+                    SessionKeepAliveService.stopSession(XServerDisplayActivity.this);
+                    runOnUiThread(() -> {
+                        if (preloaderDialog != null && preloaderDialog.isShowing()) preloaderDialog.closeOnUiThread();
+                        cleanupDebugDialog("exit");
+                        closeAfterSessionExit();
+                    });
+                }, "XServerExitCleanup").start();
             }, 1000);
         });
     }
@@ -2469,9 +3337,6 @@ private boolean isPinnedShortcutLaunchIntent(@Nullable Intent intent) {
                 && data.getPathSegments().contains("shortcut");
     }
     
-    /**
-     * Syncs cloud saves for supported stores when exiting a game.
-     */
     private void syncStoreCloudOnExit(Runnable onComplete) {
         if (shortcut == null) {
             onComplete.run();
@@ -2483,8 +3348,7 @@ private void syncStoreCloudOnExit(Runnable onComplete) {
             return;
         }
 
-        // Wrap onComplete to chain auto backup to Google Drive after store sync finishes
-        Runnable afterStoreSync = () -> runAutoBackupIfEnabled(onComplete);
+        Runnable afterStoreSync = onComplete;
 
         String gameSource = shortcut.getExtra("game_source");
         if ("STEAM".equals(gameSource)) {
@@ -2505,30 +3369,6 @@ private void syncStoreCloudOnExit(Runnable onComplete) {
         onComplete.run();
     }
 
-    private interface ExitUploadAction {
-        void start(ExitUploadCallback callback);
-    }
-
-    private interface ExitUploadCallback {
-        void onComplete(ExitUploadResult result);
-    }
-
-    private interface ExitUploadBlockingAction {
-        ExitUploadResult run() throws Exception;
-    }
-
-    private static final class ExitUploadResult {
-        final boolean success;
-        @NonNull final String message;
-        final boolean retryable;
-
-        ExitUploadResult(boolean success, @Nullable String message, boolean retryable) {
-            this.success = success;
-            this.message = message == null ? "" : message;
-            this.retryable = retryable;
-        }
-    }
-
     private void runExitUploadWithRetries(
             String uploadName,
             String retryStatusMessage,
@@ -2581,7 +3421,11 @@ private void runExitUploadWithRetries(
                                     + "ms.");
                     if (preloaderDialog != null && retryStatusMessage != null && !retryStatusMessage.isEmpty()) {
                         preloaderDialog.showOnUiThread(
-                                retryStatusMessage + " Retry " + nextAttempt + "/" + EXIT_CLOUD_UPLOAD_MAX_ATTEMPTS + "...");
+                                getString(
+                                        R.string.preloader_cloud_sync_retry,
+                                        retryStatusMessage,
+                                        nextAttempt,
+                                        EXIT_CLOUD_UPLOAD_MAX_ATTEMPTS));
                     }
                     Handler activeHandler = handler != null ? handler : new Handler(Looper.getMainLooper());
                     activeHandler.postDelayed(
@@ -2632,248 +3476,100 @@ private void runBlockingExitUpload(
         }, workerName).start();
     }
 
-    private boolean isRetryableSteamExitSyncMessage(@Nullable String message) {
-        if (message == null || message.isEmpty()) {
-            return true;
-        }
-        String normalized = message.toLowerCase(java.util.Locale.US);
-        return !normalized.contains("offline");
-    }
-
-    private boolean isRetryableGoogleDriveBackupMessage(@Nullable String message) {
-        if (message == null || message.isEmpty()) {
-            return true;
-        }
-        String normalized = message.toLowerCase(java.util.Locale.US);
-        return !normalized.contains("not enabled")
-                && !normalized.contains("not signed in")
-                && !normalized.contains("authorization required")
-                && !normalized.contains("no local save files")
-                && !normalized.contains("save files are empty")
-                && !normalized.contains("cannot determine save directory");
+    private boolean isCloudSyncEnabledForShortcut() {
+        return shortcut == null || !"1".equals(shortcut.getExtra("cloud_sync_disabled", "0"));
     }
 
-    /**
-     * If Cloud Sync Auto Backup is enabled, zips the local save and uploads to Google Drive.
-     * Reuses GameSaveBackupManager but skips downloading from the store provider.
-     */
-    private void runAutoBackupIfEnabled(Runnable onComplete) {
-        if (shortcut == null) {
+    private void syncSteamCloudOnExit(Runnable onComplete) {
+        String appId = shortcut.getExtra("app_id");
+        if (appId == null || appId.isEmpty()) {
             onComplete.run();
             return;
         }
 
-        if (!isCloudSyncEnabledForShortcut() || com.winlator.cmod.feature.sync.CloudSyncHelper.isOfflineMode(shortcut)) {
+        runExitUploadWithRetries(
+                "Steam cloud sync for appId=" + appId,
+                getString(R.string.preloader_uploading_cloud),
+                callback ->
+                        SteamExitCloudSync.syncOnExit(
+                                this,
+                                shortcut,
+                                container,
+                                text -> preloaderDialog.showOnUiThread(text),
+                                result ->
+                                        callback.onComplete(
+                                                new ExitUploadResult(
+                                                        result.getSuccess(),
+                                                        result.getMessage(),
+                                                        result.getRetryable()))),
+                onComplete);
+    }
+
+    private void syncEpicCloudOnExit(Runnable onComplete) {
+        if (shortcut != null && !shortcut.getExtra("cloud_force_download").isEmpty()) {
+            Log.i("XServerDisplayActivity",
+                    "Epic cloud sync skipped because a container-swap download is pending");
             onComplete.run();
             return;
         }
 
-        if (!com.winlator.cmod.feature.sync.google.GameSaveBackupManager.INSTANCE.isAutoBackupEnabled(this)) {
+        String appIdStr = shortcut.getExtra("app_id");
+        if (appIdStr == null || appIdStr.isEmpty()) {
             onComplete.run();
             return;
         }
 
-        String gameSource = shortcut.getExtra("game_source");
-        String gameId;
-        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource source;
-
-        if ("STEAM".equals(gameSource)) {
-            gameId = shortcut.getExtra("app_id");
-            source = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.STEAM;
-        } else if ("EPIC".equals(gameSource)) {
-            gameId = shortcut.getExtra("app_id");
-            source = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.EPIC;
-        } else if ("GOG".equals(gameSource)) {
-            gameId = shortcut.getExtra("gog_id");
-            source = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.GOG;
-        } else {
+        final int appId;
+        try {
+            appId = Integer.parseInt(appIdStr);
+        } catch (NumberFormatException e) {
+            Log.w("XServerDisplayActivity", "Failed to parse Epic app_id for cloud sync", e);
             onComplete.run();
             return;
         }
 
-        if (gameId == null || gameId.isEmpty()) {
-            onComplete.run();
-            return;
-        }
-
-        String gameName = shortcutName != null && !shortcutName.isEmpty() ? shortcutName : (shortcut.name != null ? shortcut.name : "Unknown");
-
-        Log.d("XServerDisplayActivity", "Starting auto backup to Google Drive for " + gameSource + "/" + gameId);
-        preloaderDialog.showOnUiThread("Backing up save to Google Drive...");
-
-        runExitUploadWithRetries(
-                "Google Drive auto backup",
-                "Backing up save to Google Drive...",
-                callback -> runBlockingExitUpload(
-                        "GoogleDriveExitBackup",
-                        () -> {
-                            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult result =
-                                    (com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult)
-                                            kotlinx.coroutines.BuildersKt.runBlocking(
-                                                    kotlinx.coroutines.Dispatchers.getIO(),
-                                                    (scope, continuation) ->
-                                                            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.INSTANCE.autoBackupToGoogle(
-                                                                    this,
-                                                                    source,
-                                                                    gameId,
-                                                                    gameName,
-                                                                    continuation));
-                            return new ExitUploadResult(
-                                    result.getSuccess(),
-                                    result.getMessage(),
-                                    isRetryableGoogleDriveBackupMessage(result.getMessage()));
-                        },
-                        callback),
-                onComplete);
-    }
-
-    private boolean isCloudSyncEnabledForShortcut() {
-        return shortcut == null || !"1".equals(shortcut.getExtra("cloud_sync_disabled", "0"));
-    }
-
-    /**
-     * Synchronously zip the current local save and upload it to the game's Save History folder.
-     * Called when the user is about to overwrite local with a cloud version and opted in to
-     * keeping a backup of the replaced side.
-     */
-    private void backupDiscardedSaveForShortcut(
-        com.winlator.cmod.runtime.container.Shortcut shortcut,
-        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupOrigin origin
-    ) {
-        if (shortcut == null) return;
-        String gameSource = shortcut.getExtra("game_source");
-        String gameId;
-        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource source;
-        if ("STEAM".equals(gameSource)) {
-            gameId = shortcut.getExtra("app_id");
-            source = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.STEAM;
-        } else if ("EPIC".equals(gameSource)) {
-            gameId = shortcut.getExtra("app_id");
-            source = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.EPIC;
-        } else if ("GOG".equals(gameSource)) {
-            gameId = shortcut.getExtra("gog_id");
-            source = com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource.GOG;
-        } else {
-            return;
-        }
-        if (gameId == null || gameId.isEmpty()) return;
-
-        String gameName = shortcut.name != null ? shortcut.name : "Unknown";
-        final String gameIdFinal = gameId;
-        final com.winlator.cmod.feature.sync.google.GameSaveBackupManager.GameSource sourceFinal = source;
-        final String gameNameFinal = gameName;
-
-        try {
-            com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult result =
-                (com.winlator.cmod.feature.sync.google.GameSaveBackupManager.BackupResult) kotlinx.coroutines.BuildersKt.runBlocking(
-                    kotlinx.coroutines.Dispatchers.getIO(),
-                    (scope, continuation) ->
-                        com.winlator.cmod.feature.sync.google.GameSaveBackupManager.INSTANCE.backupDiscardedSave(
-                            this, sourceFinal, gameIdFinal, gameNameFinal, origin, continuation
-                        )
-                );
-            android.util.Log.i("CloudSync", "Discarded save backup: " + result.getMessage());
-        } catch (Exception e) {
-            android.util.Log.w("CloudSync", "Failed to back up discarded save", e);
-        }
-    }
-
-    /**
-     * Syncs Steam cloud saves when exiting a Steam game.
-     * Calls SteamService.closeApp() which runs SteamAutoCloud.syncUserFiles()
-     * to upload modified save files to Steam Cloud.
-     */
-    private void syncSteamCloudOnExit(Runnable onComplete) {
-        boolean isSteamGame = "STEAM".equals(shortcut.getExtra("game_source"));
-        if (!isSteamGame) {
-            onComplete.run();
-            return;
-        }
-        
-        try {
-            int appId = Integer.parseInt(shortcut.getExtra("app_id"));
-            Log.d("XServerDisplayActivity", "Syncing Steam cloud saves for appId=" + appId);
-            
-            preloaderDialog.showOnUiThread("Cloud Sync Uploading...");
-
-            runExitUploadWithRetries(
-                    "Steam cloud sync for appId=" + appId,
-                    "Cloud Sync Uploading...",
-                    callback ->
-                            com.winlator.cmod.feature.stores.steam.service.SteamService.syncCloudOnExit(
-                                    this,
-                                    appId,
-                                    new com.winlator.cmod.feature.stores.steam.service.SteamService.Companion.CloudSyncCallback() {
-                                        @Override
-                                        public void onProgress(String message, float progress) {
-                                            runOnUiThread(() -> {
-                                                int pct = (int) (progress * 100);
-                                                preloaderDialog.showOnUiThread(message + " (" + pct + "%)");
-                                            });
-                                        }
-
-                                        @Override
-                                        public void onComplete(boolean success, String message) {
-                                            callback.onComplete(
-                                                    new ExitUploadResult(
-                                                            success,
-                                                            message,
-                                                            isRetryableSteamExitSyncMessage(message)));
-                                        }
-                                    }),
-                    onComplete);
-        } catch (Exception e) {
-            Log.w("XServerDisplayActivity", "Failed to initiate Steam cloud sync", e);
-            onComplete.run();
-        }
-    }
-
-    private void syncEpicCloudOnExit(Runnable onComplete) {
-        String appIdStr = shortcut.getExtra("app_id");
-        if (appIdStr == null || appIdStr.isEmpty()) {
-            onComplete.run();
-            return;
-        }
-
-        final int appId;
-        try {
-            appId = Integer.parseInt(appIdStr);
-        } catch (NumberFormatException e) {
-            Log.w("XServerDisplayActivity", "Failed to parse Epic app_id for cloud sync", e);
-            onComplete.run();
-            return;
-        }
-
-        // Skip silently when an upload can't possibly succeed — the game doesn't opt
-        // into Epic cloud saves (most don't), the user isn't signed in, or there are
-        // no local save files yet. Otherwise the retry-with-backoff loop below would
-        // run three full rounds showing "Cloud Sync Uploading… Retry 3/3" for a
-        // permanent no-op.
-        if (!com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
-                .canAttemptExitUpload(this, appId)) {
-            Log.i("XServerDisplayActivity",
-                    "Epic cloud sync skipped for appId=" + appId
-                            + " (game does not support cloud saves, user signed out, or no local save files)");
+        final Integer targetContainerId = container != null ? Integer.valueOf(container.id) : null;
+
+        // Skip permanent no-ops: unsupported cloud saves, signed-out user, or no saves.
+        if (!com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+                .canAttemptExitUpload(this, appId, targetContainerId)) {
+            Log.i("XServerDisplayActivity",
+                    "Epic cloud sync skipped for appId=" + appId
+                            + " (game does not support cloud saves, user signed out, or no local save files)");
             onComplete.run();
             return;
         }
 
         try {
             Log.d("XServerDisplayActivity", "Syncing Epic cloud saves for appId=" + appId);
-            preloaderDialog.showOnUiThread("Cloud Sync Uploading...");
+            preloaderDialog.showOnUiThread(getString(R.string.preloader_checking_cloud));
 
             runExitUploadWithRetries(
                     "Epic cloud sync for appId=" + appId,
-                    "Cloud Sync Uploading...",
+                    getString(R.string.preloader_checking_cloud),
                     callback -> runBlockingExitUpload(
                             "EpicExitCloudSync",
                             () -> {
+                                Object pendingAction = kotlinx.coroutines.BuildersKt.runBlocking(
+                                        kotlinx.coroutines.Dispatchers.getIO(),
+                                        (scope, continuation) -> com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager.INSTANCE.getPendingExitSyncAction(
+                                                this,
+                                                appId,
+                                                targetContainerId,
+                                                continuation
+                                        )
+                                );
+                                if (pendingAction == com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager.SyncAction.UPLOAD) {
+                                    runOnUiThread(() -> preloaderDialog.showOnUiThread(getString(R.string.preloader_uploading_cloud)));
+                                }
+
                                 Boolean syncSuccess = (Boolean) kotlinx.coroutines.BuildersKt.runBlocking(
                                         kotlinx.coroutines.Dispatchers.getIO(),
                                         (scope, continuation) -> com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager.INSTANCE.syncCloudSaves(
                                                 this,
                                                 appId,
-                                                "upload",
+                                                "exit_upload",
+                                                targetContainerId,
                                                 continuation
                                         )
                                 );
@@ -2881,8 +3577,8 @@ private void syncEpicCloudOnExit(Runnable onComplete) {
                                 return new ExitUploadResult(
                                         success,
                                         success
-                                                ? "Epic cloud upload completed."
-                                                : "Epic cloud upload reported failure.",
+                                                ? "Epic cloud sync completed."
+                                                : "Epic cloud sync reported failure.",
                                         true);
                             },
                             callback),
@@ -2893,28 +3589,106 @@ private void syncEpicCloudOnExit(Runnable onComplete) {
         }
     }
 
+    private void performForcedEpicCloudUpload(String reason) {
+        if (shortcut == null || !"EPIC".equals(shortcut.getExtra("game_source"))) return;
+        if (!isCloudSyncEnabledForShortcut() || CloudSyncHelper.isOfflineMode(shortcut)) return;
+        if (!shortcut.getExtra("cloud_force_download").isEmpty()) {
+            Log.i("XServerDisplayActivity",
+                    "Forced Epic cloud upload skipped because a container-swap download is pending during " + reason);
+            return;
+        }
+
+        String appIdStr = shortcut.getExtra("app_id");
+        if (appIdStr == null || appIdStr.isEmpty()) return;
+
+        final int appId;
+        try {
+            appId = Integer.parseInt(appIdStr);
+        } catch (NumberFormatException e) {
+            Log.w("XServerDisplayActivity", "Failed to parse Epic app_id for forced cloud sync", e);
+            return;
+        }
+
+        try {
+            final Integer targetContainerId = container != null ? Integer.valueOf(container.id) : null;
+            if (!com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager
+                    .canAttemptExitUpload(this, appId, targetContainerId)) {
+                Log.i("XServerDisplayActivity", "Forced Epic cloud upload skipped for appId=" + appId + " during " + reason);
+                return;
+            }
+
+            Log.i("XServerDisplayActivity", "Attempting forced Epic cloud upload for appId=" + appId + " during " + reason);
+            Boolean syncSuccess = (Boolean) kotlinx.coroutines.BuildersKt.runBlocking(
+                    kotlinx.coroutines.Dispatchers.getIO(),
+                    (scope, continuation) -> com.winlator.cmod.feature.stores.epic.service.EpicCloudSavesManager.INSTANCE.syncCloudSaves(
+                            this,
+                            appId,
+                            "exit_upload",
+                            targetContainerId,
+                            continuation
+                    )
+            );
+            Log.i("XServerDisplayActivity", "Forced Epic cloud upload result for appId=" + appId + ": " + syncSuccess);
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity", "Forced Epic cloud upload failed during " + reason, e);
+        }
+    }
+
     private void syncGogCloudOnExit(Runnable onComplete) {
+        if (shortcut != null && !shortcut.getExtra("cloud_force_download").isEmpty()) {
+            Log.i("XServerDisplayActivity",
+                    "GOG cloud sync skipped because a container-swap download is pending");
+            onComplete.run();
+            return;
+        }
+
         String gogId = shortcut.getExtra("gog_id");
         if (gogId == null || gogId.isEmpty()) {
             onComplete.run();
             return;
         }
+        final String appId = "GOG_" + gogId;
+        final Integer targetContainerId = container != null ? Integer.valueOf(container.id) : null;
+
+        if (!com.winlator.cmod.feature.stores.gog.service.GOGService
+                .canAttemptExitUpload(this, appId, targetContainerId)) {
+            Log.i("XServerDisplayActivity",
+                    "GOG cloud sync skipped for " + appId
+                            + " (no cloud-save locations, user signed out, or no local save files)");
+            onComplete.run();
+            return;
+        }
 
         Log.d("XServerDisplayActivity", "Syncing GOG cloud saves for gogId=" + gogId);
-        preloaderDialog.showOnUiThread("Cloud Sync Uploading...");
+        preloaderDialog.showOnUiThread(getString(R.string.preloader_checking_cloud));
 
         runExitUploadWithRetries(
                 "GOG cloud sync for gogId=" + gogId,
-                "Cloud Sync Uploading...",
+                getString(R.string.preloader_checking_cloud),
                 callback -> runBlockingExitUpload(
                         "GogExitCloudSync",
                         () -> {
+                            Object pendingAction = kotlinx.coroutines.BuildersKt.runBlocking(
+                                    kotlinx.coroutines.Dispatchers.getIO(),
+                                    (scope, continuation) -> com.winlator.cmod.feature.stores.gog.service.GOGService.Companion
+                                            .getPendingExitSyncAction(
+                                                    this,
+                                                    appId,
+                                                    targetContainerId,
+                                                    continuation
+                                            )
+                            );
+                            if (pendingAction == com.winlator.cmod.feature.stores.gog.service.GOGCloudSavesManager.SyncAction.UPLOAD) {
+                                runOnUiThread(() -> preloaderDialog.showOnUiThread(getString(R.string.preloader_uploading_cloud)));
+                            }
+
                             Boolean syncSuccess = (Boolean) kotlinx.coroutines.BuildersKt.runBlocking(
                                     kotlinx.coroutines.Dispatchers.getIO(),
                                     (scope, continuation) -> com.winlator.cmod.feature.stores.gog.service.GOGService.Companion.syncCloudSaves(
                                             this,
-                                            "GOG_" + gogId,
-                                            "upload",
+                                            appId,
+                                            "exit_upload",
+                                            targetContainerId,
                                             continuation
                                     )
                             );
@@ -2930,69 +3704,300 @@ private void syncGogCloudOnExit(Runnable onComplete) {
                 onComplete);
     }
 
+    private void performForcedGogCloudUpload(String reason) {
+        if (shortcut == null || !"GOG".equals(shortcut.getExtra("game_source"))) return;
+        if (!isCloudSyncEnabledForShortcut() || CloudSyncHelper.isOfflineMode(shortcut)) return;
+        if (!shortcut.getExtra("cloud_force_download").isEmpty()) {
+            Log.i("XServerDisplayActivity",
+                    "Forced GOG cloud upload skipped because a container-swap download is pending during " + reason);
+            return;
+        }
+
+        String gogId = shortcut.getExtra("gog_id");
+        if (gogId == null || gogId.isEmpty()) return;
+        final String appId = "GOG_" + gogId;
+
+        try {
+            final Integer targetContainerId = container != null ? Integer.valueOf(container.id) : null;
+            if (!com.winlator.cmod.feature.stores.gog.service.GOGService
+                    .canAttemptExitUpload(this, appId, targetContainerId)) {
+                Log.i("XServerDisplayActivity", "Forced GOG cloud upload skipped for " + appId + " during " + reason);
+                return;
+            }
+
+            Log.i("XServerDisplayActivity", "Attempting forced GOG cloud upload for " + appId + " during " + reason);
+            Boolean syncSuccess = (Boolean) kotlinx.coroutines.BuildersKt.runBlocking(
+                    kotlinx.coroutines.Dispatchers.getIO(),
+                    (scope, continuation) -> com.winlator.cmod.feature.stores.gog.service.GOGService.Companion.syncCloudSaves(
+                            this,
+                            appId,
+                            "exit_upload",
+                            targetContainerId,
+                            continuation
+                    )
+            );
+            Log.i("XServerDisplayActivity", "Forced GOG cloud upload result for " + appId + ": " + syncSuccess);
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity", "Forced GOG cloud upload failed during " + reason, e);
+        }
+    }
+
     private void showLaunchPreloader(String text) {
         if (preloaderDialog == null) return;
-        preloaderDialog.showOnUiThread(text, cachedDisplayName, cachedPlatform, cachedContainerLabel);
+        preloaderDialog.showOnUiThread(
+                text,
+                cachedPreloaderTitle,
+                cachedPreloaderBadge,
+                cachedPreloaderSubtitle);
     }
 
     private void showLaunchPreloaderProgress(String text, int percent) {
         if (preloaderDialog == null) return;
         preloaderDialog.showProgressOnUiThread(
                 text,
-                cachedDisplayName,
-                cachedPlatform,
-                cachedContainerLabel,
+                cachedPreloaderTitle,
+                cachedPreloaderBadge,
+                cachedPreloaderSubtitle,
                 Math.max(0, Math.min(100, percent))
         );
     }
 
+    private void stopWnLauncherStatusTailer() {
+        wnLauncherDrivesDismiss.set(false);
+        if (wnLauncherStatusTailer == null) return;
+        wnLauncherStatusTailer.stop();
+        wnLauncherStatusTailer = null;
+    }
+
+    private void resetWnLauncherLog(File launcherLog) {
+        if (launcherLog == null) return;
+        try {
+            File parent = launcherLog.getParentFile();
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+            if (launcherLog.exists() && !launcherLog.delete()) {
+                new FileWriter(launcherLog, false).close();
+            }
+            Log.d("XServerDisplayActivity",
+                    "Steam Launcher: reset launch log at " + launcherLog.getPath());
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity",
+                    "Steam Launcher: failed to reset launch log at "
+                            + launcherLog.getPath(), e);
+        }
+    }
+
+    private void scrubPlanWBridgeFilesForNextSession() {
+        if (container == null) return;
+        try {
+            int scrubbed = 0;
+            File sys32Bridge = new File(container.getRootDir(),
+                    ".wine/drive_c/windows/system32/lsteamclient.dll");
+            File syswow64Bridge = new File(container.getRootDir(),
+                    ".wine/drive_c/windows/syswow64/lsteamclient.dll");
+            if (sys32Bridge.exists() && sys32Bridge.delete()) scrubbed++;
+            if (syswow64Bridge.exists() && syswow64Bridge.delete()) scrubbed++;
+            Log.i("XServerDisplayActivity",
+                    "Steam Launcher: scrubbed " + scrubbed
+                            + " bridge file(s) during close cleanup");
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity",
+                    "Steam Launcher: failed to scrub bridge files during close cleanup", e);
+        }
+    }
+
+    private void sanitizeSteamStateForNextSession(String trigger, boolean waitForPlayingSessionClear) {
+        if (!steamStateSanitizedForClose.compareAndSet(false, true)) {
+            Log.d("XServerDisplayActivity",
+                    "Steam cleanup already ran; skipping duplicate request from " + trigger);
+            return;
+        }
+
+        stopWnLauncherStatusTailer();
+        if (!isSteamShortcut()) return;
+
+        boolean bionicSteam = false;
+        try {
+            bionicSteam = isBionicSteamEnabledForShortcut();
+        } catch (Throwable t) {
+            Log.w("XServerDisplayActivity",
+                    "Steam cleanup: failed to resolve bionic/PlanW state during " + trigger, t);
+        }
+
+        boolean planWActive = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.INSTANCE.getWnPlanW();
+
+        // Ask the launcher to log off Steam cleanly before kill; a SIGKILL'd launcher stays registered "running" (~40s) so the next launch hits AlreadyRunning. No-op until the armed marker is advertised.
+        if (bionicSteam && planWActive) {
+            try {
+                signalPlanWLauncherCleanShutdown(trigger);
+            } catch (Throwable t) {
+                Log.w("XServerDisplayActivity",
+                        "Steam cleanup: launcher clean-shutdown handshake failed during "
+                                + trigger, t);
+            }
+        }
+
+        if (!bionicSteam) return;
+
+        try {
+            if (waitForPlayingSessionClear) {
+                // Fire-and-forget: blocking on the kick wasted ~4s every exit; the release is synchronous and the kick retries in the background after reconnect.
+                com.winlator.cmod.feature.stores.steam.service.SteamService
+                        .Companion.bionicHandoffReleaseAndKickPlayingSessionAsync(true);
+            } else {
+                com.winlator.cmod.feature.stores.steam.service.SteamService
+                        .Companion.bionicHandoffRelease();
+            }
+            Log.i("XServerDisplayActivity",
+                    "Steam cleanup: release issued from " + trigger
+                            + " planW=" + planWActive
+                            + " (playing-session kick dispatched async)");
+        } catch (Throwable t) {
+            Log.w("XServerDisplayActivity",
+                    "Steam cleanup: release/kick failed during " + trigger, t);
+        }
+
+        try {
+            clearBionicActiveProcessRegistry();
+        } catch (Throwable t) {
+            Log.w("XServerDisplayActivity",
+                    "Steam cleanup: failed to clear ActiveProcess registry during "
+                            + trigger, t);
+        }
+
+        if (planWActive) {
+            scrubPlanWBridgeFilesForNextSession();
+        }
+    }
+
+    // ---- Plan-W launcher clean-shutdown handshake ---------------------------
+    // Hand the launcher a file sentinel; on seeing it the launcher does a clean Steam_LogOff + teardown and exits, reaping the session so the next launch doesn't hit AlreadyRunning. No-op until the armed marker appears in wn-launcher.log.
+    private static final String WN_LAUNCHER_SHUTDOWN_SENTINEL = "wn-launcher.shutdown";
+    private static final String WN_LAUNCHER_ARMED_MARKER = "[wn-launcher] clean-shutdown armed";
+    private static final String WN_LAUNCHER_LOGOFF_DONE_MARKER = "[wn-launcher] clean logoff complete";
+    // Ceiling; returns early once the "clean logoff complete" marker appears. Covers the cloud exit upload (~15s) plus the logoff flush.
+    private static final long WN_LAUNCHER_SHUTDOWN_TIMEOUT_MS = 20000L;
+    private static final long WN_LAUNCHER_SHUTDOWN_POLL_MS = 150L;
+
+    private void signalPlanWLauncherCleanShutdown(String trigger) {
+        if (container == null) return;
+        File driveC = new File(container.getRootDir(), ".wine/drive_c");
+        File log = new File(driveC, "wn-launcher.log");
+        if (!wnLauncherLogContains(log, WN_LAUNCHER_ARMED_MARKER)) {
+            Log.i("XServerDisplayActivity",
+                    "Plan-W launcher clean-shutdown: launcher did not advertise support ("
+                            + WN_LAUNCHER_ARMED_MARKER + " absent) — skipping handshake from "
+                            + trigger);
+            return;
+        }
+        File sentinel = new File(driveC, WN_LAUNCHER_SHUTDOWN_SENTINEL);
+        try {
+            FileUtils.writeString(sentinel, Long.toString(System.currentTimeMillis()));
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity",
+                    "Plan-W launcher clean-shutdown: failed to write sentinel "
+                            + sentinel.getAbsolutePath(), e);
+            return;
+        }
+        Log.i("XServerDisplayActivity",
+                "Plan-W launcher clean-shutdown: wrote " + sentinel.getAbsolutePath()
+                        + " from " + trigger + " — waiting up to "
+                        + WN_LAUNCHER_SHUTDOWN_TIMEOUT_MS + "ms for clean logoff");
+
+        long deadline = System.currentTimeMillis() + WN_LAUNCHER_SHUTDOWN_TIMEOUT_MS;
+        boolean cleanLogoff = false;
+        boolean launcherExited = false;
+        while (System.currentTimeMillis() < deadline) {
+            if (wnLauncherLogContains(log, WN_LAUNCHER_LOGOFF_DONE_MARKER)) {
+                cleanLogoff = true;
+                break;
+            }
+            if (!isSteamExeRunning()) {
+                launcherExited = true;
+                break;
+            }
+            try {
+                Thread.sleep(WN_LAUNCHER_SHUTDOWN_POLL_MS);
+            } catch (InterruptedException ie) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+        }
+        Log.i("XServerDisplayActivity",
+                "Plan-W launcher clean-shutdown: done from " + trigger
+                        + " (cleanLogoff=" + cleanLogoff + " launcherExited=" + launcherExited
+                        + " elapsedMs=" + (WN_LAUNCHER_SHUTDOWN_TIMEOUT_MS
+                                - Math.max(0, deadline - System.currentTimeMillis())) + ")");
+        try {
+            if (sentinel.exists()) sentinel.delete();
+        } catch (Exception ignored) {}
+    }
+
     @Override
     protected void onDestroy() {
         activityDestroyed.set(true);
+        if (reshadeLiveHandler != null) {
+            reshadeLiveHandler.removeCallbacks(reshadeLiveWriteTask);
+            reshadeLiveHandler.post(reshadeLiveWriteTask);
+            reshadeLiveThread.quitSafely();
+            reshadeLiveHandler = null;
+            reshadeLiveThread = null;
+        }
+        releaseDirectCompositionLayer();
+        com.winlator.cmod.runtime.display.composition.SurfaceCompositor.closeDiagnosticFile();
+        com.winlator.cmod.feature.stores.steam.service.GameSessionState.setInGame(this, false);
+        // Finalize any in-progress recording before the renderer tears down.
+        if (screenRecorder != null && screenRecorder.isRecording()) {
+            stopScreenRecording();
+        }
+        if (hudControllerListener != null) {
+            android.hardware.input.InputManager im =
+                    (android.hardware.input.InputManager) getSystemService(Context.INPUT_SERVICE);
+            if (im != null) im.unregisterInputDeviceListener(hudControllerListener);
+            hudControllerListener = null;
+        }
+        if (externalDisplayController != null) {
+            externalDisplayController.release();
+            externalDisplayController = null;
+        }
+        if (audioFocusHandler != null) {
+            audioFocusHandler.release();
+            audioFocusHandler = null;
+        }
+        if (isDependencyInstall) {
+            com.winlator.cmod.runtime.content.component.DependencyInstallBridge.complete(dependencyExitStatus);
+        }
+        unregisterDisplayChangeListener();
+        unregisterControllerAutoHideListener();
         if (preloaderDialog != null) {
             preloaderDialog.close();
         }
-        // Tear down the Direct Composition layer before super.onDestroy() — this
-        // path covers process-death-style activity teardown where the SurfaceView's
-        // surfaceDestroyed callback may not fire (or fired already). Removing the
-        // SurfaceHolder.Callback also drops the implicit outer-class reference
-        // the anonymous callback holds on this activity.
-        if (xServerView != null && directCompositionCallback != null) {
-            SurfaceHolder holder = xServerView.getHolder();
-            if (holder != null) {
-                holder.removeCallback(directCompositionCallback);
-            }
-            directCompositionCallback = null;
-        }
-        // Clear the renderer's pointer first — same reason as in
-        // surfaceDestroyed: the GLThread must see null before the layer is
-        // released, otherwise a frame in flight could dereference a freed SC.
-        if (xServerView != null && xServerView.getRenderer() != null) {
-            xServerView.getRenderer().setDirectCompositionTarget(null);
-        }
-        com.winlator.cmod.runtime.display.composition.DirectCompositionLayer dcLayer =
-                directCompositionLayer;
-        directCompositionLayer = null;
-        if (dcLayer != null) {
-            dcLayer.release();
+        stopWnLauncherStatusTailer();
+        if (multicastLock != null && multicastLock.isHeld()) {
+            try {
+                multicastLock.release();
+            } catch (Exception ignored) {}
         }
-        // Phase 2.2 smoke-test buffer cleanup.
-        if (directCompositionTestBufferPtr != 0L) {
-            com.winlator.cmod.runtime.display.composition
-                    .DirectCompositionLayer.releaseBuffer(directCompositionTestBufferPtr);
-            directCompositionTestBufferPtr = 0L;
+
+        // Don't call renderer.destroy() here — onSurfaceDestroyed already drives nativeDestroy; a UI-thread destroy races and SIGABRTs in Surface::disconnect.
+
+        if (exitRequested.get()) {
+            SessionKeepAliveService.stopSession(this);
         }
+
         super.onDestroy();
-        // Schedule a deferred update check 10 s after game exit
         if (!switchLaunchInProgress.get()) {
             UpdateChecker.INSTANCE.schedulePostGameCheck(this);
         }
 
         if (!sessionCleanupStarted.get()) {
-            performForcedSessionCleanup("onDestroy");
+            if (exitRequested.get() || !preferences.getBoolean("enable_background_session", false)) {
+                performForcedSessionCleanup("onDestroy");
+            }
         }
 
-        // Leak detection: log warnings if resources were not cleaned up by exit()
         String tag = "XServerLeakCheck";
         if (!exitRequested.get()) {
             Log.w(tag, "onDestroy called without exit() — activity may have been killed by system");
@@ -3017,10 +4022,7 @@ protected void onDestroy() {
         }
         cleanupDebugDialog("onDestroy");
 
-        // Epic ownership tokens are short-lived (~30 minutes server-side) and personally scoped
-        // to the running session. Clear them on game exit so we don't leave them sitting in the
-        // Wine prefix between launches; the next launch fetches a fresh token via the cache
-        // (still valid for ~25 minutes).
+        // Ownership tokens are session-scoped.
         if (shortcut != null && "EPIC".equals(shortcut.getExtra("game_source"))) {
             try {
                 com.winlator.cmod.feature.stores.epic.service.EpicService.Companion
@@ -3038,12 +4040,42 @@ private boolean isCustomShortcut() {
     }
 
     private boolean isRealSteamLaunchEnabledForShortcut() {
-        if (!isSteamShortcut()) {
-            return false;
+        return false;
+    }
+
+    private boolean isBionicSteamEnabledForShortcut() {
+        if (!isSteamShortcut()) return false;
+        if (isRealSteamLaunchEnabledForShortcut()) return false;
+        boolean cold = shortcut != null
+                ? parseBoolean(getShortcutSetting("useColdClient", container.isUseColdClient() ? "1" : "0"))
+                : container != null && container.isUseColdClient();
+        if (cold) return false;
+        boolean explicit = shortcut != null
+                ? parseBoolean(getShortcutSetting("launchBionicSteam", container.isLaunchBionicSteam() ? "1" : "0"))
+                : container != null && container.isLaunchBionicSteam();
+        if (explicit) return true;
+
+        boolean planW = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.INSTANCE.getWnPlanW();
+        if (planW) {
+            String tok = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.INSTANCE.getRefreshToken();
+            long sid = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.INSTANCE.getSteamUserSteamId64();
+            if (tok != null && !tok.isEmpty() && sid > 0) {
+                Log.i("XServerDisplayActivity",
+                        "Steam Launcher auto-promote: Steam shortcut without explicit "
+                        + "Bionic flag, user signed in — routing through Steam Launcher "
+                        + "(set wn_plan_w=false to opt out)");
+                return true;
+            } else {
+                Log.w("XServerDisplayActivity",
+                        "Steam Launcher auto-promote: skipped (signed-in check failed) "
+                        + "tokEmpty=" + (tok == null || tok.isEmpty())
+                        + " sidIsZero=" + (sid == 0));
+            }
         }
-        return shortcut != null
-                ? parseBoolean(getShortcutSetting("launchRealSteam", container.isLaunchRealSteam() ? "1" : "0"))
-                : container != null && container.isLaunchRealSteam();
+        return false;
     }
 
     private boolean isColdClientEnabledForShortcut() {
@@ -3066,6 +4098,9 @@ protected void onStop() {
 
     private void handleNavigationBackPressed() {
         if (environment != null) {
+            if (drawerStateHolder != null && drawerStateHolder.consumeOverlayBack()) {
+                return;
+            }
             if (drawerStateHolder != null && drawerStateHolder.isPaneOpen()) {
                 drawerStateHolder.closeOpenPane();
                 return;
@@ -3084,7 +4119,6 @@ private void openDrawerMenu() {
             drawerStateHolder.openDrawer();
         }
         if (touchpadView != null) {
-            touchpadView.releasePointerCapture();
             touchpadView.setOnCapturedPointerListener(null);
         }
     }
@@ -3097,6 +4131,9 @@ private void closeDrawerMenu() {
     }
 
     private String currentGyroActivatorLabel() {
+        if (preferences.getBoolean("mouse_gyro_enabled", false)) {
+            return WinHandler.getGyroMouseActivator(preferences).toString();
+        }
         String[] names = getResources().getStringArray(R.array.button_options);
         int[] keycodes = getResources().getIntArray(R.array.button_keycodes);
         int currentKeycode = preferences.getInt("gyro_trigger_button", KeyEvent.KEYCODE_BUTTON_L1);
@@ -3114,17 +4151,49 @@ private String currentGyroActivatorLabel() {
     private void renderDrawerMenu() {
         if (displayHostComposeView == null || xServerDisplayFrame == null) return;
 
-        ArrayList<ControlsProfile> inputProfiles = inputControlsManager != null ? inputControlsManager.getProfiles(true) : new ArrayList<>();
+        ControlsProfile activeProfile = inputControlsView != null ? inputControlsView.getProfile() : null;
+        ArrayList<ControlsProfile> inputProfiles = getVisibleControlsProfiles();
         ArrayList<String> inputProfileNames = new ArrayList<>();
         int inputSelectedIndex = 0;
         inputProfileNames.add("-- " + getString(R.string.common_ui_disabled) + " --");
-        ControlsProfile activeProfile = inputControlsView != null ? inputControlsView.getProfile() : null;
         for (int i = 0; i < inputProfiles.size(); i++) {
             ControlsProfile profile = inputProfiles.get(i);
             if (activeProfile != null && profile.id == activeProfile.id) inputSelectedIndex = i + 1;
             inputProfileNames.add(profile.getName());
         }
 
+        ArrayList<String> styleNames = new ArrayList<>();
+        if (activeProfile != null) {
+            styleNames.add(getString(R.string.input_controls_style_slate));
+            styleNames.add(getString(R.string.input_controls_style_gamehub));
+            styleNames.add(getString(R.string.input_controls_style_halo));
+            styleNames.add(getString(R.string.input_controls_style_glint));
+            styleNames.add(getString(R.string.input_controls_style_shadow));
+            styleNames.add(getString(R.string.input_controls_style_reticle));
+            styleNames.add(getString(R.string.input_controls_style_neon));
+            styleNames.add(getString(R.string.input_controls_style_lumina));
+            styleNames.add(getString(R.string.input_controls_style_original));
+        }
+        VisualStyle currentStyle = inputControlsView != null && inputControlsView.getVisualStyle() != null
+                ? inputControlsView.getVisualStyle() : VisualStyle.SLATE;
+        int selectedStyleIndex = currentStyle.ordinal();
+
+        ArrayList<String> accentThemeNames = new ArrayList<>();
+        int selectedAccentThemeIndex = 0;
+        if (activeProfile != null && inputControlsView != null) {
+            accentThemeNames.addAll(Arrays.asList(AccentTheme.displayNames()));
+            selectedAccentThemeIndex = inputControlsView.getAccentTheme().ordinal();
+        }
+
+        List<String> gestureProfileNames = new ArrayList<>();
+        int gestureSelectedIndex = 0;
+        try {
+            gestureProfileNames = gestureProfileManager.getProfileNames();
+            gestureSelectedIndex = Math.max(0, gestureProfileManager.indexOfProfile(selectedGestureProfileId()));
+        } catch (Throwable t) {
+            android.util.Log.e("XServerDisplayActivity", "gesture drawer names failed", t);
+        }
+
         XServerDrawerState state = XServerDrawerMenuKt.buildXServerDrawerState(
                 this,
                 isRelativeMouseMovement,
@@ -3134,43 +4203,131 @@ private void renderDrawerMenu() {
                 true,
                 magnifierView != null,
                 enableLogsMenu,
-                isNativeRenderingEnabled,
-                getString(R.string.session_xserver_native_rendering),
-                getString(isNativeRenderingEnabled ? R.string.session_xserver_native_rendering_enabled : R.string.session_xserver_native_rendering_disabled),
                 hudTransparency,
+                hudBackgroundAlphaDecoupled,
+                hudBackgroundTransparency,
                 hudScale,
-                hudElements,
+                // Fresh array each build so a toggled HUD element yields a changed state and the chips recompose.
+                hudElements.clone(),
                 dualSeriesBattery,
+                frametimeNumericMode,
                 hudCardExpanded,
                 preferences.getBoolean("gyro_enabled", false),
                 preferences.getInt("gyro_mode", 0),
+                preferences.getBoolean("gyro_orientation_enabled", false),
                 currentGyroActivatorLabel(),
                 preferences.getBoolean("process_gyro_with_left_trigger", false),
                 preferences.getBoolean("mouse_gyro_enabled", false),
                 preferences.getFloat("gyro_mouse_scale", 50.0f),
                 preferences.getFloat("gyro_x_sensitivity", 1.0f),
                 preferences.getFloat("gyro_y_sensitivity", 1.0f),
-                preferences.getFloat("gyro_smoothing", 0.9f),
+                preferences.getFloat("gyro_smoothing", 0.5f),
                 preferences.getFloat("gyro_deadzone", 0.05f),
                 preferences.getBoolean("invert_gyro_x", false),
                 preferences.getBoolean("invert_gyro_y", false),
                 gyroscopeCardExpanded,
                 xServerView != null ? xServerView.getRenderer().getFpsLimit() : 0,
                 screenEffectsCardExpanded,
-                fsrEnabled,
-                fsrMode,
-                fsrSharpness,
+                sgsrEnabled,
+                sgsrSharpness,
+                vividEnabled,
+                vividStrength,
                 colorProfile,
+                brightness,
+                contrast,
+                gammaPercent,
+                scaleFilter,
+                saturation,
+                temperature,
+                tint,
+                sharpenEnabled,
+                sharpenStrength,
+                scanlinesEnabled,
+                scanlinesIntensity,
+                pixelateEnabled,
+                pixelateBlock,
+                colorBlind,
                 inputProfileNames,
                 inputSelectedIndex,
+                styleNames,
+                selectedStyleIndex,
+                accentThemeNames,
+                selectedAccentThemeIndex,
                 preferences.getBoolean("show_touchscreen_controls_enabled", false),
                 isTapToClickEnabled,
                 preferences.getFloat("overlay_opacity", InputControlsView.DEFAULT_OVERLAY_OPACITY),
                 preferences.getBoolean("touchscreen_haptics_enabled", false),
                 preferences.getBoolean(ControllerManager.PREF_VIBRATION_GLOBAL, true),
-                xServerView != null && xServerView.getRenderer() != null && xServerView.getRenderer().isFullscreen()
+                preferences.getString(
+                    com.winlator.cmod.runtime.input.rumble.GcmRumbleMode.PREF_KEY,
+                    com.winlator.cmod.runtime.input.rumble.GcmRumbleMode.DISABLED.toPrefValue()),
+                preferences.getBoolean("reverse_binding_order", false),
+                globalCursorSpeed,
+                xServerView != null && xServerView.getRenderer() != null && xServerView.getRenderer().isFullscreen(),
+                RefreshRateUtils.getMaxSupportedRefreshRate(this),
+                isRefactorSizeEnabled,
+                screenRecorder != null && screenRecorder.isRecording(),
+                buildRecordConfig(),
+                screenTouchMode,
+                rtsGesturesEnabled,
+                gestureProfileNames,
+                gestureSelectedIndex,
+                preferences.getFloat("right_stick_sensitivity", 1.0f),
+                preferences.getFloat("screen_touch_rs_sensitivity", 1.25f),
+                preferences.getBoolean(MangoHudView.PREF_ENABLED, false),
+                MangoHudView.elementsFromPrefs(preferences),
+                MangoHudView.alphaFromPrefs(preferences),
+                MangoHudView.bgAlphaFromPrefs(preferences),
+                MangoHudView.scaleFromPrefs(preferences),
+                MangoHudView.lockedFromPrefs(preferences)
         );
 
+        // Always-present "Output" tab (live controls while swapped, otherwise a Cast entry point).
+        if (externalDisplayController != null) {
+            boolean swapped = externalDisplayController.isSwapActive();
+            state = XServerDrawerMenuKt.withOutputState(
+                    state,
+                    swapped,
+                    swapped ? externalDisplayController.getDisplayName()
+                            : externalDisplayController.getAvailableDisplayName(),
+                    externalDisplayController.getResolutionLabels(),
+                    externalDisplayController.getSelectedResolutionIndex(),
+                    externalDisplayController.getRefreshRateLabels(),
+                    externalDisplayController.getSelectedRefreshRateIndex(),
+                    externalDisplayController.getFillMode(),
+                    externalDisplayController.isGameModeSupported(),
+                    externalDisplayController.isGameModeEnabled(),
+                    externalDisplayController.isPanelScaling(),
+                    externalDisplayController.getPanelNativeSummary(),
+                    externalDisplayController.hasExternalDisplay(),
+                    getString(R.string.session_drawer_rail_label_output));
+            if (externalDisplayController.isVitureConnected()) {
+                state = XServerDrawerMenuKt.withVitureState(
+                        state,
+                        externalDisplayController.getVitureName(),
+                        externalDisplayController.vitureSupportsBrightness(),
+                        externalDisplayController.getVitureBrightness(),
+                        externalDisplayController.getVitureBrightnessMax(),
+                        externalDisplayController.vitureSupportsFilm(),
+                        externalDisplayController.vitureFilmStepped(),
+                        externalDisplayController.getVitureFilm(),
+                        externalDisplayController.vitureSupports3D(),
+                        externalDisplayController.isViture3D(),
+                        externalDisplayController.vitureSupportsVolume(),
+                        externalDisplayController.getVitureVolume(),
+                        externalDisplayController.getVitureVolumeMax());
+            }
+        }
+
+        if (reshadeSessionAvailable) {
+            state = XServerDrawerMenuKt.withReshadeState(
+                    state,
+                    reshadeMasterEnabled,
+                    reshadeMode,
+                    buildReshadeItems(),
+                    getString(R.string.reshade_section_title));
+        }
+
         if (drawerActionListener == null) {
             drawerActionListener = new XServerDrawerActionListener() {
                     @Override
@@ -3182,6 +4339,7 @@ public void onActionSelected(int itemId) {
                     public void onHUDElementToggled(int index, boolean enabled) {
                         hudElements[index] = enabled;
                         if (frameRating != null) frameRating.toggleElement(index, enabled);
+                        com.winlator.cmod.runtime.display.PerformanceHudState.updateEnabled(hudElements);
                         saveHUDSettings();
                         renderDrawerMenu();
                     }
@@ -3189,11 +4347,34 @@ public void onHUDElementToggled(int index, boolean enabled) {
                     @Override
                     public void onHUDTransparencyChanged(float transparency) {
                         hudTransparency = transparency;
+                        if (!hudBackgroundAlphaDecoupled) {
+                            hudBackgroundTransparency = clampHudAlpha(transparency * FrameRating.BACKDROP_BASE_ALPHA);
+                        }
                         if (frameRating != null) frameRating.setHudAlpha(transparency);
                         saveHUDSettings();
                         renderDrawerMenu();
                     }
 
+                    @Override
+                    public void onHUDBackgroundAlphaDecoupledChanged(boolean enabled) {
+                        hudBackgroundAlphaDecoupled = enabled;
+                        hudBackgroundTransparency = clampHudAlpha(hudTransparency * FrameRating.BACKDROP_BASE_ALPHA);
+                        if (frameRating != null) {
+                            frameRating.setHudBackgroundAlpha(hudBackgroundTransparency);
+                            frameRating.setBackgroundAlphaDecoupled(enabled);
+                        }
+                        saveHUDSettings();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onHUDBackgroundTransparencyChanged(float transparency) {
+                        hudBackgroundTransparency = transparency;
+                        if (frameRating != null) frameRating.setHudBackgroundAlpha(transparency);
+                        saveHUDSettings();
+                        renderDrawerMenu();
+                    }
+
                     @Override
                     public void onHUDScaleChanged(float scale) {
                         hudScale = scale;
@@ -3210,6 +4391,66 @@ public void onDualSeriesBatteryChanged(boolean enabled) {
                         renderDrawerMenu();
                     }
 
+                    @Override
+                    public void onFrametimeNumericChanged(boolean enabled) {
+                        frametimeNumericMode = enabled;
+                        preferences.edit().putBoolean(FrameRating.PREF_HUD_FRAMETIME_NUMERIC, enabled).apply();
+                        if (frameRating != null) frameRating.setFrametimeNumericMode(enabled);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onMangoHudChanged(boolean enabled) {
+                        preferences.edit().putBoolean(MangoHudView.PREF_ENABLED, enabled).apply();
+                        if (enabled && mangoHud == null && xServerDisplayFrame != null) {
+                            mangoHud = new MangoHudView(XServerDisplayActivity.this);
+                            xServerDisplayFrame.addView(mangoHud);
+                        }
+                        if (mangoHud != null) {
+                            mangoHud.setEngineName(mangoEngineLabel());
+                            mangoHud.setSessionInfo(
+                                    xServer != null ? xServer.screenInfo.width + "x" + xServer.screenInfo.height : null,
+                                    wineInfo != null ? String.valueOf(wineInfo) : null);
+                            mangoHud.setHudVisible(enabled);
+                        }
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onMangoHudElementToggled(int index, boolean enabled) {
+                        MangoHudView.saveElement(preferences, index, enabled);
+                        if (mangoHud != null) mangoHud.setElementEnabled(index, enabled);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onMangoHudAlphaChanged(float alpha) {
+                        MangoHudView.saveAlpha(preferences, alpha);
+                        if (mangoHud != null) mangoHud.setTextAlphaValue(alpha);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onMangoHudBackgroundAlphaChanged(float alpha) {
+                        MangoHudView.saveBgAlpha(preferences, alpha);
+                        if (mangoHud != null) mangoHud.setBackgroundAlphaValue(alpha);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onMangoHudLockChanged(boolean locked) {
+                        MangoHudView.saveLocked(preferences, locked);
+                        if (mangoHud != null) mangoHud.setLockedValue(locked);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onMangoHudScaleChanged(float scale) {
+                        // No drawer rebuild: the slider owns its value while dragging.
+                        MangoHudView.saveScale(preferences, scale);
+                        if (mangoHud != null) mangoHud.setScaleValue(scale);
+                    }
+
                     @Override
                     public void onHUDCardExpandedChanged(boolean expanded) {
                         hudCardExpanded = expanded;
@@ -3230,12 +4471,26 @@ public void onGyroscopeModeSelected(int mode) {
                         renderDrawerMenu();
                     }
 
+                    @Override
+                    public void onGyroOrientationModeChanged(boolean enabled) {
+                        preferences.edit().putBoolean("gyro_orientation_enabled", enabled).apply();
+                        // Swap the active sensor (rate <-> orientation) live.
+                        registerGyroSensorIfEnabled();
+                        renderDrawerMenu();
+                    }
+
                     @Override
                     public void onGyroscopeActivatorSelected(int keycode) {
                         preferences.edit().putInt("gyro_trigger_button", keycode).apply();
                         renderDrawerMenu();
                     }
 
+                    @Override
+                    public void onGyroscopeActivatorBindingSelected(String bindingName) {
+                        preferences.edit().putString("gyro_mouse_trigger_binding", bindingName).apply();
+                        renderDrawerMenu();
+                    }
+
                     @Override
                     public void onRightStickGyroChanged(boolean enabled) {
                         preferences.edit().putBoolean("process_gyro_with_left_trigger", enabled).apply();
@@ -3317,25 +4572,128 @@ public void onScreenEffectsCardExpandedChanged(boolean expanded) {
                     }
 
                     @Override
-                    public void onFSREnabledChanged(boolean enabled) {
-                        fsrEnabled = enabled;
-                        preferences.edit().putBoolean("fsr_enabled", enabled).apply();
+                    public void onOutputResolutionSelected(int index) {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.selectResolution(index);
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputRefreshRateSelected(int index) {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.selectRefreshRate(index);
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputAspectModeSelected(int mode) {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.selectFillMode(mode);
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputGameModeToggled(boolean enabled) {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.setGameMode(enabled);
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputVitureBrightness(int level) {
+                        if (externalDisplayController != null) externalDisplayController.setVitureBrightness(level);
+                    }
+
+                    @Override
+                    public void onOutputVitureFilm(int level) {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.setVitureFilm(level);
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputViture3D(boolean enabled) {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.setViture3D(enabled);
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputVitureVolume(int level) {
+                        if (externalDisplayController != null) externalDisplayController.setVitureVolume(level);
+                    }
+
+                    @Override
+                    public void onOutputReturnToPhone() {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.exitSwap();
+                            renderDrawerMenu();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputSwapToDisplay() {
+                        if (externalDisplayController != null) {
+                            externalDisplayController.enterSwap();
+                            renderDrawerMenu();
+                            android.widget.Toast.makeText(XServerDisplayActivity.this,
+                                    R.string.display_output_swapped_toast,
+                                    android.widget.Toast.LENGTH_SHORT).show();
+                        }
+                    }
+
+                    @Override
+                    public void onOutputCastClick() {
+                        launchWirelessDisplayPicker();
+                    }
+
+                    @Override
+                    public void onSGSREnabledChanged(boolean enabled) {
+                        boolean wasEnabled = sgsrEnabled;
+                        boolean wasRuntimeEnabled = sgsrRuntimeEnabled;
+                        sgsrEnabled = enabled;
+                        saveSGSRShortcutSettings();
+                        if (!enabled) {
+                            sgsrRuntimeEnabled = false;
+                            logDeferredSGSRRestoreIfNeeded(wasEnabled || wasRuntimeEnabled);
+                        } else if (!wasEnabled) {
+                            sgsrRuntimeEnabled = canEnableSGSRLiveWithoutResize();
+                            if (sgsrRuntimeEnabled) {
+                                Log.i("SGSRResize", "SGSR enabled mid-session without XServer resize");
+                            } else {
+                                Log.i("SGSRResize", "SGSR enabled mid-session; live SGSR pass and render-size reduction are deferred until next launch");
+                            }
+                        }
                         applyScreenEffects();
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onFSRModeSelected(int mode) {
-                        fsrMode = mode;
-                        preferences.edit().putInt("fsr_mode", mode).apply();
+                    public void onSGSRSharpnessChanged(int sharpness) {
+                        sgsrSharpness = Math.max(0, Math.min(100, sharpness));
+                        saveSGSRShortcutSettings();
                         applyScreenEffects();
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onFSRSharpnessChanged(int sharpness) {
-                        fsrSharpness = sharpness;
-                        preferences.edit().putInt("fsr_sharpness", sharpness).apply();
+                    public void onVividEnabledChanged(boolean enabled) {
+                        vividEnabled = enabled;
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onVividStrengthChanged(int strength) {
+                        vividStrength = strength;
+                        saveScreenEffectsSettings();
                         applyScreenEffects();
                         renderDrawerMenu();
                     }
@@ -3343,73 +4701,417 @@ public void onFSRSharpnessChanged(int sharpness) {
                     @Override
                     public void onColorProfileSelected(int profile) {
                         colorProfile = profile;
-                        preferences.edit().putInt("color_profile", profile).apply();
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onBrightnessChanged(int value) {
+                        brightness = Math.max(-100, Math.min(100, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onContrastChanged(int value) {
+                        contrast = Math.max(-100, Math.min(100, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onGammaChanged(int value) {
+                        gammaPercent = Math.max(50, Math.min(250, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onScaleFilterSelected(int mode) {
+                        scaleFilter = mode;
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onSaturationChanged(int value) {
+                        saturation = Math.max(0, Math.min(200, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onTemperatureChanged(int value) {
+                        temperature = Math.max(-100, Math.min(100, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onTintChanged(int value) {
+                        tint = Math.max(-100, Math.min(100, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onSharpenEnabledChanged(boolean enabled) {
+                        sharpenEnabled = enabled;
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onSharpenStrengthChanged(int value) {
+                        sharpenStrength = Math.max(0, Math.min(100, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onScanlinesEnabledChanged(boolean enabled) {
+                        scanlinesEnabled = enabled;
+                        if (enabled) pixelateEnabled = false;
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onScanlinesIntensityChanged(int value) {
+                        scanlinesIntensity = Math.max(0, Math.min(100, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onPixelateEnabledChanged(boolean enabled) {
+                        pixelateEnabled = enabled;
+                        if (enabled) scanlinesEnabled = false;
+                        saveScreenEffectsSettings();
                         applyScreenEffects();
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsProfileSelected(int index) {
-                        if (index <= 0) {
-                            hideInputControls();
-                        } else {
-                            ArrayList<ControlsProfile> profiles = inputControlsManager != null ? inputControlsManager.getProfiles(true) : new ArrayList<>();
-                            if (index - 1 < profiles.size()) showInputControls(profiles.get(index - 1));
+                    public void onPixelateBlockChanged(int value) {
+                        pixelateBlock = Math.max(2, Math.min(14, value));
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onColorBlindSelected(int mode) {
+                        colorBlind = mode;
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onResetEffects() {
+                        vividEnabled = false;
+                        vividStrength = 100;
+                        colorProfile = 0;
+                        brightness = 0;
+                        contrast = 0;
+                        gammaPercent = 100;
+                        scaleFilter = 0;
+                        saturation = 100;
+                        temperature = 0;
+                        tint = 0;
+                        sharpenEnabled = false;
+                        sharpenStrength = 50;
+                        scanlinesEnabled = false;
+                        scanlinesIntensity = 50;
+                        pixelateEnabled = false;
+                        pixelateBlock = 6;
+                        colorBlind = 0;
+                        saveScreenEffectsSettings();
+                        applyScreenEffects();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onReshadeMasterEnabledChanged(boolean enabled) {
+                        // compiled loadout untouched; only enableOnLaunch flips
+                        reshadeMasterEnabled = enabled;
+                        applyReshadeLive();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onReshadeEffectEnabledChanged(int index, boolean enabled) {
+                        if (index < 0 || index >= reshadeLive.size()) return;
+                        if (com.winlator.cmod.runtime.reshade.ReshadeLoadout.MODE_SOLO.equals(reshadeMode) && enabled) {
+                            for (int i = 0; i < reshadeLive.size(); i++) reshadeLive.get(i).enabled = (i == index);
+                        } else {
+                            reshadeLive.get(index).enabled = enabled;
+                        }
+                        applyReshadeLive();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onReshadeModeChanged(String mode) {
+                        reshadeMode = com.winlator.cmod.runtime.reshade.ReshadeLoadout.normalizeMode(mode);
+                        if (com.winlator.cmod.runtime.reshade.ReshadeLoadout.MODE_SOLO.equals(reshadeMode)) {
+                            // Collapse to a single active effect (keep the first enabled one).
+                            boolean seen = false;
+                            for (ReshadeLiveEffect e : reshadeLive) {
+                                if (e.enabled && !seen) seen = true; else e.enabled = false;
+                            }
+                        }
+                        applyReshadeLive();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onReshadeParamChanged(int index, String key, float value) {
+                        if (index < 0 || index >= reshadeLive.size()) return;
+                        reshadeLive.get(index).values.put(key, value);
+                        applyReshadeLive();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onReshadeReset(int index) {
+                        if (index < 0 || index >= reshadeLive.size()) return;
+                        ReshadeLiveEffect e = reshadeLive.get(index);
+                        e.values.clear();
+                        for (ReshadeManager.ReshadeParam p : e.defs) ReshadeManager.seedValues(p, null, e.values);
+                        applyReshadeLive();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsProfileSelected(int index) {
+                        if (index <= 0) {
+                            hideInputControls();
+                        } else {
+                            ArrayList<ControlsProfile> profiles = getVisibleControlsProfiles();
+                            if (index - 1 < profiles.size()) {
+                                ControlsProfile profile = profiles.get(index - 1);
+                                showInputControls(profile);
+                            }
+                        }
+                        renderDrawerMenu();
+                    }
+                    @Override
+                    public void onInputControlsStyleSelected(int index) {
+                        VisualStyle[] all = VisualStyle.values();
+                        if (index < 0 || index >= all.length) return;
+                        VisualStyle chosen = all[index];
+                        if (inputControlsView != null) inputControlsView.setVisualStyle(chosen);
+                        persistSelectedStyle(chosen);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsAccentThemeSelected(int index) {
+                        AccentTheme[] all = AccentTheme.values();
+                        if (index < 0 || index >= all.length) return;
+                        AccentTheme chosen = all[index];
+                        if (inputControlsView != null) inputControlsView.setAccentTheme(chosen);
+                        persistSelectedAccentTheme(chosen);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsShowOverlayChanged(boolean enabled) {
+                        preferences.edit().putBoolean("show_touchscreen_controls_enabled", enabled).commit();
+                        // Manual re-enable while a controller is connected wins over auto-hide.
+                        if (enabled && isAnyGameControllerConnected()) {
+                            userOverrodeAutoHide = true;
+                            controllerAutoHidden = false;
+                        }
+                        applyTouchscreenOverlayPreference();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsTapToClickChanged(boolean enabled) {
+                        isTapToClickEnabled = enabled;
+                        if (touchpadView != null) touchpadView.setTapToClickEnabled(enabled);
+                        preferences.edit().putBoolean("tap_to_click_enabled", enabled).commit();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsOverlayOpacityChanged(float opacity) {
+                        if (inputControlsView != null) inputControlsView.setOverlayOpacity(opacity);
+                        preferences.edit().putFloat("overlay_opacity", opacity).commit();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsTouchscreenHapticsChanged(boolean enabled) {
+                        preferences.edit().putBoolean("touchscreen_haptics_enabled", enabled).commit();
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onInputControlsGamepadVibrationChanged(boolean enabled) {
+                        preferences.edit().putBoolean(ControllerManager.PREF_VIBRATION_GLOBAL, enabled).commit();
+                        if (winHandler != null) winHandler.setGlobalVibrationEnabled(enabled);
+                        renderDrawerMenu();
+                    }
+
+                    @Override
+                    public void onCursorSpeedChanged(float speed) {
+                        globalCursorSpeed = speed;
+                        preferences.edit().putFloat("cursor_speed", speed).apply();
+                        if (touchpadView != null) {
+                            float profileSpeed = 1.0f;
+                            if (inputControlsView != null) {
+                                ControlsProfile profile = inputControlsView.getProfile();
+                                if (profile != null) profileSpeed = profile.getCursorSpeed();
+                            }
+                            touchpadView.setSensitivity(profileSpeed * globalCursorSpeed);
                         }
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsShowOverlayChanged(boolean enabled) {
-                        if (inputControlsView != null) inputControlsView.setShowTouchscreenControls(enabled);
-                        preferences.edit().putBoolean("show_touchscreen_controls_enabled", enabled).apply();
+                    public void onInputControlsGcmRumbleModeChanged(String mode) {
+                        com.winlator.cmod.runtime.input.rumble.GcmRumbleMode gcmMode =
+                            com.winlator.cmod.runtime.input.rumble.GcmRumbleMode.fromPrefValue(mode);
+                        preferences
+                            .edit()
+                            .putString(
+                                com.winlator.cmod.runtime.input.rumble.GcmRumbleMode.PREF_KEY,
+                                gcmMode.toPrefValue())
+                            .commit();
+                        if (winHandler != null) winHandler.setGcmRumbleMode(gcmMode);
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsTapToClickChanged(boolean enabled) {
-                        isTapToClickEnabled = enabled;
-                        if (touchpadView != null) touchpadView.setTapToClickEnabled(enabled);
+                    public void onInputControlsReverseBindingOrderChanged(boolean enabled) {
+                        preferences.edit().putBoolean("reverse_binding_order", enabled).commit();
+                        if (inputControlsView != null) inputControlsView.setReverseBindingOrder(enabled);
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsOverlayOpacityChanged(float opacity) {
-                        if (inputControlsView != null) inputControlsView.setOverlayOpacity(opacity);
-                        preferences.edit().putFloat("overlay_opacity", opacity).apply();
+                    public void onInputControlsEditClick() {
+                        ControlsProfile activeProfile = inputControlsView != null ? inputControlsView.getProfile() : null;
+                        Intent intent = new Intent(XServerDisplayActivity.this, UnifiedActivity.class);
+                        intent.putExtra("edit_input_controls", true);
+                        intent.putExtra("selected_profile_id", activeProfile != null ? activeProfile.id : 0);
+                        intent.putExtra("return_to_game_on_back", true);
+                        final ControlsProfile editingProfile = activeProfile;
+                        editInputControlsCallback = () -> {
+                            boolean wasShowingTouch = preferences.getBoolean("show_touchscreen_controls_enabled", false);
+                            hideInputControls();
+                            if (inputControlsManager != null) inputControlsManager.loadProfiles(true);
+                            ControlsProfile reactivated = editingProfile != null && inputControlsManager != null ? inputControlsManager.getProfile(editingProfile.id) : null;
+                            if (reactivated != null) {
+                                showInputControls(reactivated);
+                                if (wasShowingTouch) {
+                                    preferences.edit().putBoolean("show_touchscreen_controls_enabled", true).apply();
+                                    applyTouchscreenOverlayPreference();
+                                }
+                            }
+                            renderDrawerMenu();
+                        };
+                        controlsEditorActivityResultLauncher.launch(intent);
+                    }
+
+                    @Override
+                    public void onScreenTouchModeChanged(int mode) {
+                        screenTouchMode = mode;
+                        rtsGesturesEnabled = false;
+                        if (touchpadView != null) {
+                            touchpadView.setScreenTouchMode(mode);
+                            touchpadView.setRtsGesturesEnabled(false);
+                        }
+                        if (winHandler != null) winHandler.setScreenTouchStickActive(mode == 2);
+                        if (shortcut != null) {
+                            shortcut.putExtra("screenTouchMode", String.valueOf(mode));
+                            shortcut.putExtra("simTouchScreen", mode == 1 ? "1" : "0");
+                            shortcut.putExtra("rtsGestures", "0");
+                            shortcut.saveData();
+                        }
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsTouchscreenHapticsChanged(boolean enabled) {
-                        preferences.edit().putBoolean("touchscreen_haptics_enabled", enabled).apply();
+                    public void onRtsGesturesToggled(boolean enabled) {
+                        rtsGesturesEnabled = enabled;
+                        screenTouchMode = 0;
+                        if (touchpadView != null) {
+                            touchpadView.setRtsGesturesEnabled(enabled);
+                            touchpadView.setScreenTouchMode(0);
+                        }
+                        if (winHandler != null) winHandler.setScreenTouchStickActive(false);
+                        if (enabled) pushSelectedGestureConfig();
+                        if (shortcut != null) {
+                            shortcut.putExtra("rtsGestures", enabled ? "1" : "0");
+                            shortcut.putExtra("screenTouchMode", "0");
+                            shortcut.putExtra("simTouchScreen", "0");
+                            shortcut.saveData();
+                        }
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsGamepadVibrationChanged(boolean enabled) {
-                        preferences.edit().putBoolean(ControllerManager.PREF_VIBRATION_GLOBAL, enabled).apply();
-                        if (winHandler != null) winHandler.setGlobalVibrationEnabled(enabled);
+                    public void onGestureProfileSelected(int index) {
+                        ArrayList<GestureProfile> profiles = gestureProfileManager.getProfiles();
+                        if (index < 0 || index >= profiles.size()) return;
+                        GestureProfile p = profiles.get(index);
+                        currentGestureProfileId = p.id;
+                        if (touchpadView != null) touchpadView.setGestureConfig(p.getConfigJson());
                         renderDrawerMenu();
                     }
 
                     @Override
-                    public void onInputControlsEditClick() {
+                    public void onRtsGesturesEditClick() {
                         ControlsProfile activeProfile = inputControlsView != null ? inputControlsView.getProfile() : null;
                         Intent intent = new Intent(XServerDisplayActivity.this, UnifiedActivity.class);
                         intent.putExtra("edit_input_controls", true);
                         intent.putExtra("selected_profile_id", activeProfile != null ? activeProfile.id : 0);
+                        intent.putExtra("gesture_profile_id", selectedGestureProfileId());
                         intent.putExtra("return_to_game_on_back", true);
+                        final ControlsProfile editingProfile = activeProfile;
                         editInputControlsCallback = () -> {
+                            gestureProfileManager.loadProfiles();
+                            int gid = selectedGestureProfileId();
+                            GestureProfile gp = gid != 0 ? gestureProfileManager.getProfile(gid) : gestureProfileManager.getDefaultProfile();
+                            if (gp == null) gp = gestureProfileManager.getDefaultProfile();
+                            if (touchpadView != null) touchpadView.setGestureConfig(gp.getConfigJson());
                             hideInputControls();
                             if (inputControlsManager != null) inputControlsManager.loadProfiles(true);
-                            ControlsProfile reactivated = activeProfile != null && inputControlsManager != null ? inputControlsManager.getProfile(activeProfile.id) : null;
+                            ControlsProfile reactivated = editingProfile != null && inputControlsManager != null ? inputControlsManager.getProfile(editingProfile.id) : null;
                             if (reactivated != null) showInputControls(reactivated);
                             renderDrawerMenu();
                         };
                         controlsEditorActivityResultLauncher.launch(intent);
                     }
 
+                    @Override
+                    public void onRightStickSensitivityChanged(float sensitivity) {
+                        if (screenTouchMode == 2) {
+                            preferences.edit().putFloat("screen_touch_rs_sensitivity", sensitivity).apply();
+                        } else {
+                            preferences.edit().putFloat("right_stick_sensitivity", sensitivity).apply();
+                            if (winHandler != null) winHandler.setRightStickSensitivity(sensitivity);
+                        }
+                        renderDrawerMenu();
+                    }
+
                     @Override
                     public void onTaskManagerVisibilityChanged(boolean visible) {
                         taskManagerPaneVisible = visible;
@@ -3428,6 +5130,12 @@ public void onTaskManagerEndProcess(String name) {
                         if (winHandler != null) winHandler.killProcess(name);
                     }
 
+                    @Override
+                    public void onTaskManagerBringToFront(String name) {
+                        if (winHandler != null) winHandler.bringToFront(name);
+                        closeDrawerMenu();
+                    }
+
                     @Override
                     public void onTaskManagerSetAffinity(int pid, int affinityMask) {
                         if (winHandler != null) {
@@ -3460,6 +5168,11 @@ public void onLogsPaneVisibilityChanged(boolean visible) {
                     public void onLogsShare() {
                         shareLogStream();
                     }
+
+                    @Override
+                    public void onRecordStart(int fpsIndex, int resolutionIndex, int quality, boolean recordUI) {
+                        startRecordingWithSettings(fpsIndex, resolutionIndex, quality, recordUI);
+                    }
                 };
         }
 
@@ -3473,19 +5186,28 @@ public void onLogsShare() {
                     new XServerDisplayHostCallbacks() {
                         @Override
                         public void onDrawerSlide() {
-                            AppUtils.hideSystemUI(XServerDisplayActivity.this);
+                            // Per frame: avoid hideSystemUI's relayout unless bars actually showed.
+                            AppUtils.hideSystemUIIfVisible(XServerDisplayActivity.this);
                         }
 
                         @Override
                         public void onDrawerOpened() {
                             releasePointerCapture();
+                            if (winHandler != null) {
+                                winHandler.neutralizeControllers();
+                            }
                             renderDrawerMenu();
-                            if (displayHostComposeView != null) displayHostComposeView.requestFocus();
+                            if (drawerStateHolder != null) {
+                                drawerStateHolder.resetMenuNav();
+                                drawerStateHolder.updateControllerConnected(isAnyControllerConnected());
+                            }
                             AppUtils.hideSystemUI(XServerDisplayActivity.this);
                         }
 
                         @Override
                         public void onDrawerClosed() {
+                            drawerStickHandler.removeCallbacks(drawerStickRepeat);
+                            drawerStickDir = 0;
                             if (hudCardExpanded) {
                                 hudCardExpanded = false;
                                 renderDrawerMenu();
@@ -3510,6 +5232,11 @@ public void onDialogVisibilityChanged(boolean visible) {
                                 displayHostComposeView.requestFocus();
                             }
                         }
+
+                        @Override
+                        public boolean isControllerConnected() {
+                            return isAnyControllerConnected();
+                        }
                     }
             );
             return;
@@ -3549,6 +5276,7 @@ private void stopTaskManagerPolling() {
         if (winHandler != null) winHandler.setOnGetProcessInfoListener(null);
         taskManagerAccum.clear();
         taskManagerCpuExpanded = false;
+        prevTaskCpuSample = null;
         if (drawerStateHolder != null) {
             drawerStateHolder.setTaskManagerState(new TaskManagerPaneState(
                     new ArrayList<>(), 0, 0, new ArrayList<>(), 0, ""));
@@ -3595,35 +5323,24 @@ private void handleTaskManagerProcessInfo(int index, int numProcesses, ProcessIn
     private void pushTaskManagerSystemStats() {
         if (drawerStateHolder == null) return;
 
-        short[] clockSpeeds = CPUStatus.getCurrentClockSpeeds();
-        if (cachedMaxClockSpeeds == null || cachedMaxClockSpeeds.length != clockSpeeds.length) {
-            short[] maxes = new short[clockSpeeds.length];
-            for (int i = 0; i < clockSpeeds.length; i++) maxes[i] = CPUStatus.getMaxClockSpeed(i);
-            cachedMaxClockSpeeds = maxes;
-        }
-
-        int totalClock = 0;
-        short maxClock = 0;
-        for (int i = 0; i < clockSpeeds.length; i++) {
-            totalClock += clockSpeeds[i];
-            if (cachedMaxClockSpeeds[i] > maxClock) maxClock = cachedMaxClockSpeeds[i];
-        }
-        int cpuPercent = 0;
-        if (clockSpeeds.length > 0 && maxClock > 0) {
-            int avg = totalClock / clockSpeeds.length;
-            cpuPercent = (int) (((float) avg / maxClock) * 100.0f);
+        CPUStatus.AppCpuSample cpuSample = CPUStatus.readAppCpuSample();
+        int cpuPercent = -1;
+        if (cpuSample != null) {
+            if (prevTaskCpuSample != null) cpuPercent = cpuSample.percentSince(prevTaskCpuSample);
+            prevTaskCpuSample = cpuSample;
+        } else {
+            prevTaskCpuSample = null;
         }
+        if (cpuPercent < 0) cpuPercent = CPUStatus.getClockFreqLoadPercent();
+        if (cpuPercent < 0) cpuPercent = 0;
 
-        ArrayList<Integer> corePercents;
+        short[] clocks = CPUStatus.getCurrentClockSpeeds();
+        int coreCount = clocks != null ? clocks.length : 0;
+        ArrayList<Integer> corePercents = new ArrayList<>();
         if (taskManagerCpuExpanded) {
-            corePercents = new ArrayList<>(clockSpeeds.length);
-            for (int i = 0; i < clockSpeeds.length; i++) {
-                short maxFor = cachedMaxClockSpeeds[i];
-                int corePercent = maxFor > 0 ? (int) (((float) clockSpeeds[i] / maxFor) * 100.0f) : 0;
-                corePercents.add(corePercent);
+            for (int i = 0; i < coreCount; i++) {
+                corePercents.add(CPUStatus.getClockFreqCorePercent(i));
             }
-        } else {
-            corePercents = new ArrayList<>();
         }
 
         ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
@@ -3637,55 +5354,255 @@ private void pushTaskManagerSystemStats() {
         drawerStateHolder.setTaskManagerState(new TaskManagerPaneState(
                 current.getProcesses(),
                 cpuPercent,
-                clockSpeeds.length,
+                coreCount,
                 corePercents,
                 memPercent,
                 memDetail));
     }
 
+    private void saveSGSRShortcutSettings() {
+        if (shortcut != null) {
+            if (sgsrEnabled) {
+                shortcut.putExtra("sgsrEnabled", "1");
+                shortcut.putExtra("sgsrUpscaleMode", String.valueOf(normalizeSGSRShortcutUpscaleMode(sgsrUpscaleMode)));
+                shortcut.putExtra("sgsrSharpness", String.valueOf(Math.max(0, Math.min(100, sgsrSharpness))));
+            } else {
+                shortcut.putExtra("sgsrEnabled", null);
+                shortcut.putExtra("sgsrUpscaleMode", null);
+                shortcut.putExtra("sgsrSharpness", null);
+            }
+            shortcut.saveData();
+        } else if (preferences != null) {
+            preferences.edit()
+                    .putBoolean("sgsr_enabled", sgsrEnabled)
+                    .putInt("sgsr_upscale_mode", clampSGSRUpscaleMode(sgsrUpscaleMode))
+                    .putInt("sgsr_sharpness", Math.max(0, Math.min(100, sgsrSharpness)))
+                    .apply();
+        }
+    }
+
+    private boolean canEnableSGSRLiveWithoutResize() {
+        if (xServer == null || sgsrBaseScreenSize == null || sgsrBaseScreenSize.isEmpty()) {
+            return false;
+        }
+
+        String targetScreenSize =
+                SGSRResolutionUtils.applyRenderScale(sgsrBaseScreenSize, true, sgsrUpscaleMode);
+        String currentScreenSize = xServer.screenInfo.toString();
+        boolean canEnable = targetScreenSize.equals(currentScreenSize);
+        if (!canEnable) {
+            Log.i("SGSRResize", "SGSR live enable blocked: current='" + currentScreenSize +
+                    "' target='" + targetScreenSize + "' base='" + sgsrBaseScreenSize +
+                    "' mode=" + sgsrUpscaleMode);
+        }
+        return canEnable;
+    }
+
+    private void logDeferredSGSRRestoreIfNeeded(boolean wasActive) {
+        if (!wasActive || xServer == null || sgsrBaseScreenSize == null || sgsrBaseScreenSize.isEmpty()) {
+            return;
+        }
+        final String currentScreenSize = xServer.screenInfo.toString();
+        if (!sgsrBaseScreenSize.equals(currentScreenSize)) {
+            Log.i("SGSRResize", "SGSR disabled mid-session; native XServer restore is deferred until next launch: current='" +
+                    currentScreenSize + "' base='" + sgsrBaseScreenSize + "' mode=" + sgsrUpscaleMode);
+        } else {
+            Log.i("SGSRResize", "SGSR disabled mid-session; XServer already at native size '" +
+                    currentScreenSize + "'");
+        }
+    }
+
     private void applyScreenEffects() {
-        GLRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
+        VulkanRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
         if (renderer == null) return;
         EffectComposer composer = renderer.getEffectComposer();
         if (composer == null) return;
 
-        // Handle FSR
-        FSREffect fsr = composer.getEffect(FSREffect.class);
-        if (fsrEnabled) {
-            if (fsr == null) {
-                fsr = new FSREffect();
-                composer.addEffect(fsr);
-            }
-            fsr.setMode(fsrMode);
-            fsr.setLevel((fsrSharpness / 25.0f) + 1.0f);
-        } else if (fsr != null) {
-            composer.removeEffect(fsr);
-        }
-
-        // Handle Color Profiles
+        SGSRUpscaler sgsr = composer.getEffect(SGSRUpscaler.class);
+        if (sgsrRuntimeEnabled) {
+            if (sgsr == null) {
+                sgsr = new SGSRUpscaler();
+            }
+            sgsr.setSharpness(sgsrSharpness / 100.0f);
+            composer.addEffectFirst(sgsr);
+            Log.d("XServerDisplayActivity", "SGSR active mode=" + sgsrUpscaleMode
+                    + " sharpness=" + sgsrSharpness);
+        } else if (sgsr != null) {
+            composer.removeEffect(sgsr);
+            Log.d("XServerDisplayActivity", "SGSR inactive");
+        }
+
+        // Rebuilt in a fixed order each call so toggle sequence can't reorder the chain.
+        composer.removeEffect(composer.getEffect(ColorAdjustEffect.class));
+        composer.removeEffect(composer.getEffect(ColorGradeEffect.class));
+        composer.removeEffect(composer.getEffect(PixelateEffect.class));
+        composer.removeEffect(composer.getEffect(SharpenEffect.class));
         composer.removeEffect(composer.getEffect(HDREffect.class));
         composer.removeEffect(composer.getEffect(NaturalEffect.class));
         composer.removeEffect(composer.getEffect(CRTEffect.class));
+        composer.removeEffect(composer.getEffect(ToonEffect.class));
+        composer.removeEffect(composer.getEffect(NTSCEffect.class));
+        composer.removeEffect(composer.getEffect(NTSC2Effect.class));
+        composer.removeEffect(composer.getEffect(VividEffect.class));
+        composer.removeEffect(composer.getEffect(ColorBlindEffect.class));
+        composer.removeEffect(composer.getEffect(ScanlinesEffect.class));
+
+        if (brightness != 0 || contrast != 0 || gammaPercent != 100) {
+            ColorAdjustEffect colorAdj = new ColorAdjustEffect();
+            colorAdj.set(brightness / 100.0f, contrast / 100.0f, gammaPercent / 100.0f);
+            composer.addEffect(colorAdj);
+        }
+
+        if (saturation != 100 || temperature != 0 || tint != 0) {
+            ColorGradeEffect colorGrade = new ColorGradeEffect();
+            colorGrade.set(saturation / 100.0f, temperature / 100.0f, tint / 100.0f);
+            composer.addEffect(colorGrade);
+        }
+
+        if (pixelateEnabled) {
+            PixelateEffect pixelate = new PixelateEffect();
+            pixelate.setBlockSize(pixelateBlock);
+            composer.addEffect(pixelate);
+        }
+
+        if (sharpenEnabled) {
+            SharpenEffect sharpen = new SharpenEffect();
+            sharpen.setStrength(sharpenStrength / 100.0f);
+            composer.addEffect(sharpen);
+        }
 
         switch (colorProfile) {
-            case 1: // HDR
-                composer.addEffect(new HDREffect());
-                break;
-            case 2: // Natural
-                composer.addEffect(new NaturalEffect());
-                break;
-            case 3: // CRT Effect
-                composer.addEffect(new CRTEffect());
-                break;
+            case 1: composer.addEffect(new HDREffect()); break;
+            case 2: composer.addEffect(new NaturalEffect()); break;
+            case 3: composer.addEffect(new CRTEffect()); break;
+            case 4: composer.addEffect(new ToonEffect()); break;
+            case 5: composer.addEffect(new NTSCEffect()); break;
+            case 6: composer.addEffect(new NTSC2Effect()); break;
+        }
+
+        if (vividEnabled) {
+            VividEffect vivid = new VividEffect();
+            vivid.setLevel((vividStrength / 25.0f) + 1.0f);
+            composer.addEffect(vivid);
+        }
+
+        if (colorBlind != 0) {
+            ColorBlindEffect colorBlindEffect = new ColorBlindEffect();
+            colorBlindEffect.setMode(colorBlind);
+            composer.addEffect(colorBlindEffect);
         }
+
+        if (scanlinesEnabled) {
+            ScanlinesEffect scanlines = new ScanlinesEffect();
+            scanlines.setIntensity(scanlinesIntensity / 100.0f);
+            composer.addEffect(scanlines);
+        }
+
+        renderer.setScaleFilter(scaleFilter);
     }
 
     private void loadScreenEffectsSettings() {
         if (preferences == null) return;
-        fsrEnabled = preferences.getBoolean("fsr_enabled", false);
-        fsrMode = preferences.getInt("fsr_mode", 0);
-        fsrSharpness = preferences.getInt("fsr_sharpness", 100);
-        colorProfile = preferences.getInt("color_profile", 0);
+        boolean legacyEnabled = preferences.getBoolean("fsr_enabled", false);
+        int legacyMode = preferences.getInt("fsr_mode", 0);
+        int legacyStrength = preferences.getInt("fsr_sharpness", 100);
+        if (shortcut != null) {
+            sgsrEnabled = parseBoolean(shortcut.getExtra("sgsrEnabled", shortcut.getExtra("sgsr_enabled", "0")));
+            sgsrUpscaleMode = normalizeSGSRShortcutUpscaleMode(parsePositiveInt(
+                    shortcut.getExtra("sgsrUpscaleMode", shortcut.getExtra("sgsr_upscale_mode", "1"))));
+            sgsrSharpness = Math.max(0, Math.min(100, parsePositiveInt(
+                    shortcut.getExtra("sgsrSharpness", shortcut.getExtra("sgsr_sharpness", "100")))));
+        } else {
+            sgsrEnabled = preferences.contains("sgsr_enabled")
+                    ? preferences.getBoolean("sgsr_enabled", false)
+                    : legacyEnabled && legacyMode == 0;
+            sgsrUpscaleMode = clampSGSRUpscaleMode(preferences.getInt("sgsr_upscale_mode", 1));
+            sgsrSharpness = preferences.getInt("sgsr_sharpness", legacyStrength);
+        }
+        loadScreenEffects();
+    }
+
+    private void loadScreenEffects() {
+        vividEnabled = false;
+        vividStrength = 100;
+        colorProfile = 0;
+        brightness = 0;
+        contrast = 0;
+        gammaPercent = 100;
+        scaleFilter = 0;
+        saturation = 100;
+        temperature = 0;
+        tint = 0;
+        sharpenEnabled = false;
+        sharpenStrength = 50;
+        scanlinesEnabled = false;
+        scanlinesIntensity = 50;
+        pixelateEnabled = false;
+        pixelateBlock = 6;
+        colorBlind = 0;
+        String json = null;
+        if (shortcut != null) {
+            String fromShortcut = shortcut.getExtra("screenEffectsSettings", "");
+            if (!fromShortcut.isEmpty()) json = fromShortcut;
+        } else if (preferences != null) {
+            json = preferences.getString("screenEffectsSettings", null);
+        }
+        if (json == null || json.isEmpty()) return;
+        try {
+            JSONObject o = new JSONObject(json);
+            vividEnabled = o.optBoolean("vividEnabled", false);
+            vividStrength = Math.max(0, Math.min(100, o.optInt("vividStrength", 100)));
+            colorProfile = o.optInt("colorProfile", 0);
+            brightness = Math.max(-100, Math.min(100, o.optInt("brightness", 0)));
+            contrast = Math.max(-100, Math.min(100, o.optInt("contrast", 0)));
+            gammaPercent = Math.max(50, Math.min(250, o.optInt("gammaPercent", 100)));
+            scaleFilter = o.optInt("scaleFilter", 0);
+            saturation = Math.max(0, Math.min(200, o.optInt("saturation", 100)));
+            temperature = Math.max(-100, Math.min(100, o.optInt("temperature", 0)));
+            tint = Math.max(-100, Math.min(100, o.optInt("tint", 0)));
+            sharpenEnabled = o.optBoolean("sharpenEnabled", false);
+            sharpenStrength = Math.max(0, Math.min(100, o.optInt("sharpenStrength", 50)));
+            scanlinesEnabled = o.optBoolean("scanlinesEnabled", false);
+            scanlinesIntensity = Math.max(0, Math.min(100, o.optInt("scanlinesIntensity", 50)));
+            pixelateEnabled = o.optBoolean("pixelateEnabled", false);
+            pixelateBlock = Math.max(2, Math.min(14, o.optInt("pixelateBlock", 6)));
+            colorBlind = Math.max(0, Math.min(3, o.optInt("colorBlind", 0)));
+        } catch (JSONException e) {
+            Log.e("XServerDisplayActivity", "Failed to load screen effects", e);
+        }
+    }
+
+    private void saveScreenEffectsSettings() {
+        if (shortcut == null && preferences == null) return;
+        try {
+            JSONObject o = new JSONObject();
+            o.put("vividEnabled", vividEnabled);
+            o.put("vividStrength", vividStrength);
+            o.put("colorProfile", colorProfile);
+            o.put("brightness", brightness);
+            o.put("contrast", contrast);
+            o.put("gammaPercent", gammaPercent);
+            o.put("scaleFilter", scaleFilter);
+            o.put("saturation", saturation);
+            o.put("temperature", temperature);
+            o.put("tint", tint);
+            o.put("sharpenEnabled", sharpenEnabled);
+            o.put("sharpenStrength", sharpenStrength);
+            o.put("scanlinesEnabled", scanlinesEnabled);
+            o.put("scanlinesIntensity", scanlinesIntensity);
+            o.put("pixelateEnabled", pixelateEnabled);
+            o.put("pixelateBlock", pixelateBlock);
+            o.put("colorBlind", colorBlind);
+            String json = o.toString();
+            if (shortcut != null) {
+                shortcut.putExtra("screenEffectsSettings", json);
+                shortcut.saveData();
+            } else if (preferences != null) {
+                preferences.edit().putString("screenEffectsSettings", json).apply();
+            }
+        } catch (JSONException e) {
+            Log.e("XServerDisplayActivity", "Failed to save screen effects", e);
+        }
     }
 
     private void loadHUDSettings() {
@@ -3695,19 +5612,29 @@ private void loadHUDSettings() {
             try {
                 JSONObject obj = new JSONObject(json);
                 hudTransparency = (float) obj.optDouble("transparency", 1.0);
+                hudBackgroundAlphaDecoupled = obj.optBoolean("backgroundAlphaDecoupled", false);
+                hudBackgroundTransparency = (float) obj.optDouble("backgroundTransparency",
+                        clampHudAlpha(hudTransparency * FrameRating.BACKDROP_BASE_ALPHA));
+                if (!hudBackgroundAlphaDecoupled) {
+                    hudBackgroundTransparency = clampHudAlpha(hudTransparency * FrameRating.BACKDROP_BASE_ALPHA);
+                }
                 hudScale = (float) obj.optDouble("scale", 1.0);
+                boolean legacyCpuRam = obj.optBoolean("showCpuRam", true);
+                boolean legacyBattTemp = obj.optBoolean("showBattTemp", true);
                 hudElements[0] = obj.optBoolean("showFPS", true);
                 hudElements[1] = obj.optBoolean("showRenderer", true);
                 hudElements[2] = obj.optBoolean("showGPU", true);
-                boolean legacyCpuRam = obj.optBoolean("showCpuRam", true);
                 hudElements[3] = obj.optBoolean("showCPU", legacyCpuRam);
                 hudElements[4] = obj.optBoolean("showRAM", legacyCpuRam);
-                hudElements[5] = obj.optBoolean("showBattTemp", true);
-                hudElements[6] = obj.optBoolean("showGraph", true);
+                hudElements[5] = obj.optBoolean("showBattery", legacyBattTemp);
+                hudElements[6] = obj.optBoolean("showTemp", legacyBattTemp);
+                hudElements[7] = obj.optBoolean("showGraph", true);
+                hudElements[8] = obj.optBoolean("showCpuTemp", false);
             } catch (JSONException e) {
                 Log.e("XServerDisplayActivity", "Failed to load HUD settings", e);
             }
         }
+        com.winlator.cmod.runtime.display.PerformanceHudState.updateEnabled(hudElements);
     }
 
     private void saveHUDSettings() {
@@ -3715,14 +5642,18 @@ private void saveHUDSettings() {
         try {
             JSONObject obj = new JSONObject();
             obj.put("transparency", hudTransparency);
+            obj.put("backgroundAlphaDecoupled", hudBackgroundAlphaDecoupled);
+            obj.put("backgroundTransparency", hudBackgroundTransparency);
             obj.put("scale", hudScale);
             obj.put("showFPS", hudElements[0]);
             obj.put("showRenderer", hudElements[1]);
             obj.put("showGPU", hudElements[2]);
             obj.put("showCPU", hudElements[3]);
             obj.put("showRAM", hudElements[4]);
-            obj.put("showBattTemp", hudElements[5]);
-            obj.put("showGraph", hudElements[6]);
+            obj.put("showBattery", hudElements[5]);
+            obj.put("showTemp", hudElements[6]);
+            obj.put("showGraph", hudElements[7]);
+            obj.put("showCpuTemp", hudElements[8]);
             container.putExtra("hudSettings", obj.toString());
             container.saveData();
         } catch (JSONException e) {
@@ -3733,8 +5664,11 @@ private void saveHUDSettings() {
     private void applyHUDSettings() {
         if (frameRating != null) {
             frameRating.setHudAlpha(hudTransparency);
+            frameRating.setHudBackgroundAlpha(hudBackgroundTransparency);
+            frameRating.setBackgroundAlphaDecoupled(hudBackgroundAlphaDecoupled);
             frameRating.setHudScale(hudScale);
             frameRating.setDualSeriesBattery(dualSeriesBattery);
+            frameRating.setFrametimeNumericMode(frametimeNumericMode);
             frameRating.setIsNative(isNativeRenderingEnabled);
             for (int i = 0; i < hudElements.length; i++) {
                 frameRating.toggleElement(i, hudElements[i]);
@@ -3744,18 +5678,18 @@ private void applyHUDSettings() {
 
     @SuppressLint("SourceLockedOrientationActivity")
     private boolean handleDrawerAction(int itemId) {
-        // The drawer can be opened during startup before setupUI() attaches the display
-        // and input views. Ignore display-dependent actions until those views exist.
+        // Startup can open the drawer before display and input views exist.
         if (requiresDisplayReady(itemId) && !isDisplayReady()) {
             renderDrawerMenu();
             return false;
         }
 
-        final GLRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
+        final VulkanRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
         switch (itemId) {
             case R.id.main_menu_gyroscope_reset:
                 if (winHandler != null) {
-                    winHandler.updateGyroData(0, 0); // This effectively resets it
+                    winHandler.recenterGyroOrientation();
+                    winHandler.updateGyroData(0, 0);
                 }
                 break;
             case R.id.main_menu_keyboard:
@@ -3775,17 +5709,18 @@ private boolean handleDrawerAction(int itemId) {
                     frameRating.setVisibility(View.GONE);
                     applyHUDSettings();
                     rootView.addView(frameRating);
+                    if (perfController != null) perfController.attachToFrameRating(frameRating);
                 }
                 boolean isFpsVisible = frameRating.getVisibility() == View.VISIBLE;
                 boolean becomingVisible = !isFpsVisible;
                 frameRating.setVisibility(becomingVisible ? View.VISIBLE : View.GONE);
                 if (becomingVisible) {
+                    frameRating.reset();
                     syncFrameRatingWithExistingWindows();
                     applyHUDSettings();
                 }
                 updateHUDRenderMode();
                 
-                // Save FPS monitor state globally so it persists across all games/containers
                 preferences.edit().putBoolean("fps_monitor_enabled", becomingVisible).apply();
                 effectiveShowFPS = becomingVisible;
                 renderDrawerMenu();
@@ -3806,12 +5741,21 @@ private boolean handleDrawerAction(int itemId) {
                 touchpadView.toggleFullscreen();
                 renderDrawerMenu();
                 break;
+            case R.id.main_menu_refactor_size:
+                isRefactorSizeEnabled = !isRefactorSizeEnabled;
+                applyRefactorSize(isRefactorSizeEnabled);
+                renderDrawerMenu();
+                break;
             case R.id.main_menu_pause:
                 if (isPaused) {
                     ProcessHelper.resumeAllWineProcesses();
+                    SessionKeepAliveService.onResumeSession(this);
                 }
                 else {
                     ProcessHelper.pauseAllWineProcesses();
+                    SessionKeepAliveService.onPauseSession(this);
+                    if (touchpadView != null) touchpadView.resetInputState();
+                    if (inputControlsView != null) inputControlsView.cancelActiveTouches();
                 }
                 isPaused = !isPaused;
                 renderDrawerMenu();
@@ -3846,14 +5790,10 @@ private boolean handleDrawerAction(int itemId) {
                 }
                 renderDrawerMenu();
                 break;
-            case R.id.main_menu_native_rendering:
-                isNativeRenderingEnabled = !isNativeRenderingEnabled;
-                preferences.edit().putBoolean("use_dri3", isNativeRenderingEnabled).apply();
-                if (frameRating != null) frameRating.setIsNative(isNativeRenderingEnabled);
+            case R.id.main_menu_record:
+                // Starting is handled by the popup (onRecordStart); reaching here means stop.
+                if (screenRecorder != null && screenRecorder.isRecording()) stopScreenRecording();
                 renderDrawerMenu();
-                WinToast.show(this, getString(isNativeRenderingEnabled
-                    ? R.string.session_xserver_native_rendering_enabled_toast
-                    : R.string.session_xserver_native_rendering_disabled_toast));
                 break;
             case R.id.main_menu_exit:
                 closeDrawerMenu();
@@ -3863,6 +5803,280 @@ private boolean handleDrawerAction(int itemId) {
         return true;
     }
 
+    private static final int[] RECORD_FPS_TIERS = {30, 60, 90, 120, 144, 165};
+    private static final int[] RECORD_RES_TIERS = {2160, 1440, 1080, 720}; // short-side heights
+
+    /** FPS options the panel supports (ascending), e.g. a 120Hz panel → [30,60,90,120]. */
+    private java.util.List<Integer> recordFpsOptions() {
+        int max = Math.max(30, RefreshRateUtils.getMaxSupportedRefreshRate(this));
+        java.util.List<Integer> out = new java.util.ArrayList<>();
+        for (int f : RECORD_FPS_TIERS) if (f <= max + 1) out.add(f);
+        if (out.isEmpty()) out.add(60);
+        return out;
+    }
+
+    /** The native (full-res) capture short side — min of the composited image dimensions. */
+    private int recordNativeShortSide() {
+        VulkanRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
+        int w = renderer != null ? renderer.getRecordWidth() : 0;
+        int h = renderer != null ? renderer.getRecordHeight() : 0;
+        if (w <= 0 || h <= 0) {
+            w = xServerView != null ? xServerView.getSurfaceWidth() : 0;
+            h = xServerView != null ? xServerView.getSurfaceHeight() : 0;
+        }
+        if (w <= 0 || h <= 0) return 0;
+        return Math.min(w, h);
+    }
+
+    /** Resolution labels: Native first, then standard tiers strictly below the panel's native res. */
+    private java.util.List<String> recordResolutionLabels(int nativeShort) {
+        java.util.List<String> out = new java.util.ArrayList<>();
+        out.add("Native");
+        if (nativeShort > 0) {
+            for (int t : RECORD_RES_TIERS) {
+                if (t < nativeShort) out.add(resTierLabel(t));
+            }
+        }
+        return out;
+    }
+
+    // Build the popup config with persisted selections mapped to current indices.
+    private RecordUiConfig buildRecordConfig() {
+        java.util.List<Integer> fps = recordFpsOptions();
+        int nativeShort = recordNativeShortSide();
+        java.util.List<String> res = recordResolutionLabels(nativeShort);
+
+        int savedFps = preferences.getInt("record_fps", 60);
+        int fpsIndex = fps.indexOf(savedFps);
+        if (fpsIndex < 0) { // nearest supported
+            fpsIndex = 0;
+            int best = Integer.MAX_VALUE;
+            for (int i = 0; i < fps.size(); i++) {
+                int d = Math.abs(fps.get(i) - savedFps);
+                if (d < best) { best = d; fpsIndex = i; }
+            }
+        }
+        int resIndex = preferences.getInt("record_res_index", 0);
+        if (resIndex < 0 || resIndex >= res.size()) resIndex = 0;
+        int quality = preferences.getInt("record_quality", 2);
+        boolean recordUI = preferences.getBoolean("record_ui", false);
+        return new RecordUiConfig(fps, res, fpsIndex, resIndex, quality, recordUI);
+    }
+
+    // Start recording with the popup's chosen settings, persisting them for next time.
+    private void startRecordingWithSettings(int fpsIndex, int resolutionIndex, int quality, boolean recordUI) {
+        if (screenRecorder != null && screenRecorder.isRecording()) return;
+        VulkanRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
+        if (renderer == null || xServerView == null) {
+            android.widget.Toast.makeText(this, R.string.session_record_failed, android.widget.Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // Native composited size (swapchain extent), else the SurfaceView size.
+        int nativeW = renderer.getRecordWidth();
+        int nativeH = renderer.getRecordHeight();
+        if (nativeW <= 0 || nativeH <= 0) {
+            nativeW = xServerView.getSurfaceWidth();
+            nativeH = xServerView.getSurfaceHeight();
+        }
+        if (nativeW <= 0 || nativeH <= 0) {
+            android.widget.Toast.makeText(this, R.string.session_record_failed, android.widget.Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        java.util.List<Integer> fpsOptions = recordFpsOptions();
+        int nativeShort = Math.min(nativeW, nativeH);
+        java.util.List<String> resLabels = recordResolutionLabels(nativeShort);
+        fpsIndex = Math.max(0, Math.min(fpsIndex, fpsOptions.size() - 1));
+        resolutionIndex = Math.max(0, Math.min(resolutionIndex, resLabels.size() - 1));
+        quality = Math.max(0, Math.min(quality, 2));
+
+        int fps = fpsOptions.get(fpsIndex);
+
+        // Resolution: index 0 = Native; otherwise scale so the short side hits the chosen tier.
+        int encW = nativeW, encH = nativeH;
+        if (resolutionIndex > 0) {
+            int tierShort = tierShortForLabel(resLabels.get(resolutionIndex));
+            if (tierShort > 0 && tierShort < nativeShort) {
+                double scale = (double) tierShort / nativeShort;
+                encW = (int) Math.round(nativeW * scale) & ~1;
+                encH = (int) Math.round(nativeH * scale) & ~1;
+            }
+        }
+
+        int orientationHint = renderer.getRecordOrientationHint();
+        int bitRate = recordBitrate(encW, encH, fps, quality);
+
+        // Persist selections for next time.
+        preferences.edit()
+                .putInt("record_fps", fps)
+                .putInt("record_res_index", resolutionIndex)
+                .putInt("record_quality", quality)
+                .putBoolean("record_ui", recordUI)
+                .apply();
+
+        screenRecorder = new com.winlator.cmod.runtime.display.recording.GameRecorder(this);
+        android.view.Surface encoderSurface = screenRecorder.start(encW, encH, fps, orientationHint, bitRate);
+        if (encoderSurface == null || !renderer.startRecording(encoderSurface, fps, recordUI)) {
+            screenRecorder.stop();
+            screenRecorder = null;
+            android.widget.Toast.makeText(this, R.string.session_record_failed, android.widget.Toast.LENGTH_SHORT).show();
+            return;
+        }
+        // Force continuous frames while recording (renderer is otherwise on-demand).
+        savedRenderMode = xServerView.getRenderMode();
+        xServerView.setRenderMode(XServerSurfaceView.RENDERMODE_CONTINUOUSLY);
+        if (recordUI) startRecordUiCapture(encW, encH, orientationHint);
+        renderDrawerMenu();
+        android.widget.Toast.makeText(this, R.string.session_record_started, android.widget.Toast.LENGTH_SHORT).show();
+    }
+
+    // Record UI: snapshot the overlay views and feed them to the native composite.
+    private android.os.Handler recordUiHandler;
+    private Runnable recordUiSnapshot;
+    private android.graphics.Bitmap recordUiBitmap;
+    private int[] recordUiPixels;
+    private java.nio.ByteBuffer recordUiBuffer;
+    private int recordUiW, recordUiH, recordUiRotation;
+
+    private void startRecordUiCapture(int w, int h, int orientationHint) {
+        stopRecordUiCapture();
+        recordUiW = w;
+        recordUiH = h;
+        // Pre-rotate the upright screen-space UI into the recording's frame to match the game.
+        recordUiRotation = ((360 - (orientationHint % 360)) % 360);
+        try {
+            recordUiBitmap = android.graphics.Bitmap.createBitmap(w, h, android.graphics.Bitmap.Config.ARGB_8888);
+            recordUiPixels = new int[w * h];
+            recordUiBuffer = java.nio.ByteBuffer.allocateDirect(w * h * 4).order(java.nio.ByteOrder.LITTLE_ENDIAN);
+        } catch (Throwable t) {
+            Log.e("XServerDisplayActivity", "Record UI buffer alloc failed", t);
+            return;
+        }
+        recordUiHandler = new android.os.Handler(android.os.Looper.getMainLooper());
+        recordUiSnapshot = new Runnable() {
+            @Override
+            public void run() {
+                if (screenRecorder == null || !screenRecorder.isRecording()) return;
+                snapshotRecordUi();
+                if (recordUiHandler != null) recordUiHandler.postDelayed(this, 100); // ~10 fps overlay refresh
+            }
+        };
+        recordUiHandler.post(recordUiSnapshot);
+    }
+
+    private void snapshotRecordUi() {
+        try {
+            VulkanRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
+            View root = xServerView != null ? xServerView.getRootView() : null;
+            if (renderer == null || root == null || recordUiBitmap == null) return;
+            int sw = root.getWidth();
+            int sh = root.getHeight();
+            if (sw <= 0 || sh <= 0) return;
+
+            recordUiBitmap.eraseColor(0); // transparent — the game area (SurfaceView) stays see-through
+            android.graphics.Canvas c = new android.graphics.Canvas(recordUiBitmap);
+            android.graphics.Matrix m = new android.graphics.Matrix();
+            m.postRotate(recordUiRotation, sw / 2f, sh / 2f);
+            android.graphics.RectF r = new android.graphics.RectF(0, 0, sw, sh);
+            m.mapRect(r);
+            m.postTranslate(-r.left, -r.top);
+            float s = Math.min(recordUiW / r.width(), recordUiH / r.height());
+            m.postScale(s, s);
+            c.setMatrix(m);
+            root.draw(c);
+
+            recordUiBitmap.getPixels(recordUiPixels, 0, recordUiW, 0, 0, recordUiW, recordUiH);
+            recordUiBuffer.clear();
+            recordUiBuffer.asIntBuffer().put(recordUiPixels); // little-endian int → BGRA bytes
+            recordUiBuffer.position(0);
+            renderer.updateRecordUITexture(recordUiBuffer, recordUiW, recordUiH);
+        } catch (Throwable t) {
+            Log.e("XServerDisplayActivity", "Record UI snapshot failed", t);
+        }
+    }
+
+    private void stopRecordUiCapture() {
+        if (recordUiHandler != null && recordUiSnapshot != null) {
+            recordUiHandler.removeCallbacks(recordUiSnapshot);
+        }
+        recordUiHandler = null;
+        recordUiSnapshot = null;
+        if (recordUiBitmap != null) {
+            try { recordUiBitmap.recycle(); } catch (Exception ignore) {}
+        }
+        recordUiBitmap = null;
+        recordUiPixels = null;
+        recordUiBuffer = null;
+    }
+
+    private void stopScreenRecording() {
+        if (screenRecorder == null) return;
+        stopRecordUiCapture();
+        if (xServerView != null) xServerView.setRenderMode(savedRenderMode);
+        VulkanRenderer renderer = xServerView != null ? xServerView.getRenderer() : null;
+        if (renderer != null) renderer.stopRecording();
+        screenRecorder.stop();
+        screenRecorder = null;
+        android.widget.Toast.makeText(this, R.string.session_record_saved, android.widget.Toast.LENGTH_SHORT).show();
+    }
+
+    private void applyRefactorSize(boolean enabled) {
+        if (winHandler == null || container == null) return;
+        if (enabled) stageRefactorSizeHelper();
+        winHandler.exec("\"C:\\WinNative\\refactorsize.exe\" " + (enabled ? "on" : "off"));
+        if (!enabled) unstageRefactorSizeHelper();
+    }
+
+    private void stageRefactorSizeHelper() {
+        try {
+            File dir = new File(container.getRootDir(), ".wine/drive_c/WinNative");
+            if (!dir.isDirectory() && !dir.mkdirs()) return;
+            File dst = new File(dir, "refactorsize.exe");
+            if (dst.exists() && dst.length() == REFACTOR_SIZE_EXE_BYTES) return;
+            try (java.io.InputStream in = getAssets().open("winnative/refactorsize.exe");
+                 java.io.FileOutputStream out = new java.io.FileOutputStream(dst)) {
+                byte[] buf = new byte[64 * 1024];
+                int n;
+                while ((n = in.read(buf)) > 0) out.write(buf, 0, n);
+            }
+            Log.i("XServerDisplayActivity",
+                  "Refactor Size: staged refactorsize.exe (" + dst.length() + " B) at " + dst.getPath());
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "Refactor Size: helper staging failed", e);
+        }
+    }
+
+    private void stageBundledTestExes() {
+        if (container == null) return;
+        File dir = new File(container.getRootDir(), ".wine/drive_c/ProgramData/Microsoft/Windows");
+        if (!dir.isDirectory() && !dir.mkdirs()) return;
+        stageBundledExe(dir, "Graphics-Test-32bit.exe", GRAPHICS_TEST_32_EXE_BYTES);
+        stageBundledExe(dir, "Graphics-Test-64bit.exe", GRAPHICS_TEST_64_EXE_BYTES);
+        stageBundledExe(dir, "InputControl32.exe", INPUT_TEST_32_EXE_BYTES);
+        stageBundledExe(dir, "InputControl64.exe", INPUT_TEST_64_EXE_BYTES);
+    }
+
+    private void stageBundledExe(File dir, String name, long expectedBytes) {
+        File dst = new File(dir, name);
+        if (dst.exists() && dst.length() == expectedBytes) return;
+        try (java.io.InputStream in = getAssets().open("winnative/" + name);
+             java.io.FileOutputStream out = new java.io.FileOutputStream(dst)) {
+            byte[] buf = new byte[64 * 1024];
+            int n;
+            while ((n = in.read(buf)) > 0) out.write(buf, 0, n);
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "Failed to stage " + name, e);
+        }
+    }
+
+    private void unstageRefactorSizeHelper() {
+        final File dst = new File(container.getRootDir(), ".wine/drive_c/WinNative/refactorsize.exe");
+        new android.os.Handler(android.os.Looper.getMainLooper()).postDelayed(() -> {
+            if (!isRefactorSizeEnabled && dst.exists()) dst.delete();
+        }, REFACTOR_SIZE_UNSTAGE_DELAY_MS);
+    }
+
     private boolean isDisplayReady() {
         return xServer != null
                 && xServerView != null
@@ -3906,7 +6120,7 @@ public void onPointerCaptureChanged(boolean hasCapture) {
     }
 
     private boolean shouldUsePointerCapture() {
-        return !isPointerCaptureForcedOff && hasExternalMouse() && (drawerStateHolder == null || !drawerStateHolder.isDrawerOpen());
+        return !isPointerCaptureForcedOff && (drawerStateHolder == null || !drawerStateHolder.isDrawerOpen());
     }
 
     private void updatePointerCapture() {
@@ -3934,13 +6148,16 @@ private void releasePointerCapture() {
             if (hadPointerCapture) {
                 touchpadView.resetInputState();
                 touchpadView.releasePointerCapture();
-                touchpadView.setOnCapturedPointerListener(null);
             }
-            touchpadView.releasePointerCapture();
             touchpadView.setOnCapturedPointerListener(null);
         }
-        if (hadPointerCapture && inputControlsView != null) {
-            inputControlsView.cancelActiveTouches();
+        if (inputControlsView != null) {
+            if (hadPointerCapture) {
+                inputControlsView.cancelActiveTouches();
+            }
+            else {
+                inputControlsView.cancelContinuousMouseMove();
+            }
         }
     }
 
@@ -3950,6 +6167,20 @@ private void cancelMousePointerTimeout() {
         }
     }
 
+    // Pointer movement that bypasses touch/mouse events (gyro) still counts as activity.
+    public void notifyPointerActivity() {
+        if (isMouseDisabled || xServer == null || xServer.getRenderer() == null) return;
+        boolean hidden = !xServer.getRenderer().isCursorVisible();
+        long now = SystemClock.uptimeMillis();
+        if (!hidden && now - lastPointerActivityAt < POINTER_ACTIVITY_REARM_MS) return;
+        lastPointerActivityAt = now;
+        if (hidden) xServer.getRenderer().setCursorVisible(true);
+        if (timeoutHandler != null && hideControlsRunnable != null) {
+            timeoutHandler.removeCallbacks(hideControlsRunnable);
+            timeoutHandler.postDelayed(hideControlsRunnable, 5000);
+        }
+    }
+
     private boolean isPointerMotionEvent(MotionEvent event) {
         int source = event.getSource();
         boolean isPointerClass =
@@ -3966,12 +6197,232 @@ private boolean isControllerMotionEvent(MotionEvent event) {
         return (isGamepad || isJoystick) && !isPointerMotionEvent(event);
     }
 
+    // Steam prefix setup (DLL injection / bridge install / asset staging); independent of setupWineSystemFiles so it runs as a parallel Future.
+    private void setupSteamGameFiles() {
+        if (!isSteamShortcut()) return;
+        try {
+            int appId = Integer.parseInt(shortcut.getExtra("app_id"));
+            String gameInstallPath = resolveSteamGameInstallPath(appId);
+            File gameDir = new File(gameInstallPath);
+            String language = PrefManager.INSTANCE.getContainerLanguage();
+            String containerLang = container.getExtra("containerLanguage", null);
+            if (containerLang != null && !containerLang.isEmpty()) {
+                language = containerLang;
+            }
+            boolean isOfflineMode = parseBoolean(
+                    getShortcutSetting("steamOfflineMode",
+                            container.isSteamOfflineMode() ? "1" : "0"));
+            boolean useSteamInput = parseBoolean(
+                    getShortcutSetting("useSteamInput",
+                            container.getExtra("useSteamInput", "0")));
+            boolean unpackFiles = parseBoolean(
+                    getShortcutSetting("unpackFiles",
+                            container.isUnpackFiles() ? "1" : "0"));
+            boolean runtimePatcher = parseBoolean(
+                    getShortcutSetting("runtimePatcher",
+                            container.isRuntimePatcher() ? "1" : "0"));
+
+            boolean wnPlanWActive = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.INSTANCE.getWnPlanW();
+            String ticketBase64 = null;
+            if (!wnPlanWActive) {
+                try {
+                    ticketBase64 = SteamBridge.getEncryptedAppTicketBase64(appId);
+                } catch (Exception e) {
+                    Log.w("XServerDisplayActivity", "Failed to get encrypted app ticket", e);
+                }
+            }
+
+            if (!gameDir.exists()) return;
+
+            syncContainerSteamExecutableFromShortcut(appId, gameInstallPath);
+            boolean useColdClient = isColdClientEnabledForShortcut();
+
+            if (useColdClient) {
+                clearBionicActiveProcessRegistry();
+                new File(container.getRootDir(),
+                        ".wine/drive_c/windows/system32/lsteamclient.dll").delete();
+                new File(container.getRootDir(),
+                        ".wine/drive_c/windows/syswow64/lsteamclient.dll").delete();
+
+                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
+                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_RESTORED);
+
+                boolean sidecarReady = ensureColdClientStore();
+                if (!sidecarReady) {
+                    Log.w("XServerDisplayActivity", "ColdClient sidecar store not ready — loader/Goldberg stubs missing");
+                }
+
+                boolean coldClientProvisioned =
+                        MarkerUtils.INSTANCE.hasMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
+                if (!coldClientProvisioned) {
+                    SteamUtils.putBackSteamDlls(gameInstallPath);
+                    SteamUtils.restoreUnpackedExecutable(this, appId);
+                    generateSteamInterfacesForGame(gameDir);
+                } else {
+                    Log.d("XServerDisplayActivity", "ColdClient prefix already provisioned for appId=" + appId);
+                }
+
+                File steamDir = new File(container.getRootDir(), ".wine/drive_c/Program Files (x86)/Steam");
+                steamDir.mkdirs();
+                SteamUtils.writeCompleteSettingsDir(steamDir, appId, language, isOfflineMode, useSteamInput, ticketBase64);
+                SteamUtils.enrichSteamSettings(this, appId, new File(steamDir, "steam_settings"));
+                setupSteamSettingsForAllDirs(gameDir, appId, language, isOfflineMode, useSteamInput, ticketBase64);
+
+                File steamappsDir = new File(steamDir, "steamapps");
+                new File(steamappsDir, "common").mkdirs();
+                WineUtils.ensureSteamappsCommonSymlink(container, gameInstallPath);
+
+                String relativeExeForIni = resolveRelativeGameExe(appId, gameInstallPath);
+                if (!relativeExeForIni.isEmpty()) {
+                    String gameDirNameForIni = new File(gameInstallPath).getName();
+                    writeColdClientIniDirect(appId, gameDirNameForIni, relativeExeForIni, runtimePatcher);
+                    Log.d("XServerDisplayActivity", "ColdClient INI: exe=" + relativeExeForIni);
+                } else {
+                    Log.w("XServerDisplayActivity", "Could not find game exe for ColdClient INI, appId=" + appId);
+                }
+
+                MarkerUtils.INSTANCE.addMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
+            } else if (isBionicSteamEnabledForShortcut()) {
+                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
+                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
+                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DRM_PATCHED);
+                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DRM_UNPACK_CHECKED);
+
+                SteamUtils.restoreOriginalExecutable(this, appId);
+
+                boolean bionicRuntimeOk = com.winlator.cmod.feature.stores.steam.wnsteam
+                        .WnSteamAssetsInstaller.INSTANCE.installBionicRuntime(this);
+                boolean bionicBridgeOk;
+                if (wnPlanWActive) {
+                    File sys32Bridge = new File(container.getRootDir(),
+                            ".wine/drive_c/windows/system32/lsteamclient.dll");
+                    File syswow64Bridge = new File(container.getRootDir(),
+                            ".wine/drive_c/windows/syswow64/lsteamclient.dll");
+                    int scrubbed = 0;
+                    if (sys32Bridge.exists() && sys32Bridge.delete()) scrubbed++;
+                    if (syswow64Bridge.exists() && syswow64Bridge.delete()) scrubbed++;
+                    Log.i("XServerDisplayActivity",
+                            "Steam Launcher: scrubbed " + scrubbed
+                            + " stale lsteamclient.dll bridge file(s) from system32/syswow64");
+                    bionicBridgeOk = false;
+                } else {
+                    bionicBridgeOk = com.winlator.cmod.feature.stores.steam.wnsteam
+                            .WnSteamAssetsInstaller.INSTANCE
+                            .installSteamclientBridgeIntoContainer(this, container);
+                }
+
+                if (wnPlanWActive) {
+                    restoreSteamApiDlls(gameDir);
+                } else {
+                    int steampipeSwapped = com.winlator.cmod.feature.stores.steam.wnsteam
+                            .WnSteamAssetsInstaller.INSTANCE
+                            .installSteampipeBridgeIntoApp(this, gameDir);
+                    Log.d("XServerDisplayActivity",
+                            "Bionic Steam: " + steampipeSwapped
+                            + " steam_api*.dll(s) replaced with steampipe bridge");
+                }
+
+                writeBionicActiveProcessRegistry();
+
+                File bionicSteamDir = new File(container.getRootDir(),
+                        ".wine/drive_c/Program Files (x86)/Steam");
+                bionicSteamDir.mkdirs();
+                WineUtils.ensureSteamappsCommonSymlink(container, gameInstallPath);
+
+                boolean bionicOverlayOk = false;
+                if (!wnPlanWActive) {
+                    bionicOverlayOk = installBionicSteamPathOverlay(container, bionicSteamDir);
+                }
+
+                boolean planWValveOk = false;
+                boolean planWLauncherOk = false;
+                boolean planWServiceOk = false;
+                if (wnPlanWActive) {
+                    try {
+                        planWValveOk = com.winlator.cmod.feature.stores.steam.wnsteam
+                                .WnSteamAssetsInstaller.INSTANCE
+                                .installPlanWValveSteam(this, container);
+                        planWLauncherOk = com.winlator.cmod.feature.stores.steam.wnsteam
+                                .WnSteamAssetsInstaller.INSTANCE
+                                .installPlanWLauncher(this, container);
+                        planWServiceOk = com.winlator.cmod.feature.stores.steam.wnsteam
+                                .WnSteamAssetsInstaller.INSTANCE
+                                .installPlanWSteamService(this, container);
+                        Log.i("XServerDisplayActivity",
+                                "Steam Launcher asset stage: valveSteam=" + planWValveOk
+                                + " launcher=" + planWLauncherOk
+                                + " service=" + planWServiceOk);
+                    } catch (Exception e) {
+                        Log.e("XServerDisplayActivity",
+                                "Steam Launcher asset stage failed", e);
+                    }
+                }
+
+                Log.d("XServerDisplayActivity",
+                        "Bionic Steam game-side setup complete for appId=" + appId
+                                + " runtime=" + bionicRuntimeOk
+                                + " bridge=" + bionicBridgeOk
+                                + " steamPathOverlay=" + bionicOverlayOk
+                                + " planWValve=" + planWValveOk
+                                + " planWLauncher=" + planWLauncherOk);
+            } else {
+                if (MarkerUtils.INSTANCE.hasMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED)) {
+                    SteamUtils.restoreSteamclientFiles(this, appId);
+                    MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
+                    Log.d("XServerDisplayActivity", "Restored steamclient DLLs from prior ColdClient mode");
+                }
+
+                if (!MarkerUtils.INSTANCE.hasMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED)) {
+                    MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_RESTORED);
+
+                    replaceSteamApiDlls(gameDir, gameInstallPath, language, isOfflineMode, useSteamInput, ticketBase64);
+
+                    if (unpackFiles) {
+                        SteamUtils.restoreUnpackedExecutable(this, appId);
+                    } else {
+                        SteamUtils.restoreOriginalExecutable(this, appId);
+                    }
+
+                    SteamUtils.restoreSteamclientFiles(this, appId);
+                    SteamUtils.enrichSteamSettings(this, appId,
+                            new File(gameInstallPath, "steam_settings"));
+
+                    MarkerUtils.INSTANCE.addMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
+                } else {
+                    boolean hasSteamApiDll = hasSteamApiDllInTree(gameDir);
+                    if (!hasSteamApiDll) {
+                        Log.w("XServerDisplayActivity",
+                                "STEAM_DLL_REPLACED marker set but no steam_api DLL found — clearing marker and re-injecting");
+                        MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
+                        replaceSteamApiDlls(gameDir, gameInstallPath, language, isOfflineMode, useSteamInput, ticketBase64);
+                        MarkerUtils.INSTANCE.addMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
+                    } else {
+                        setupSteamSettingsForAllDirs(gameDir, appId, language, isOfflineMode, useSteamInput, ticketBase64);
+                    }
+                    SteamUtils.enrichSteamSettings(this, appId,
+                            new File(gameInstallPath, "steam_settings"));
+                    copySteamclientStubs(gameDir);
+                }
+            }
+
+            setupSteamEnvironment(appId, gameDir);
+            SteamUtils.syncGoldbergAchievementsAndStats(this, appId);
+            cleanupEmbeddedSteamRuntime(gameDir);
+
+            Log.d("XServerDisplayActivity", "Steam environment physical readiness verified for appId=" + appId);
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "Failed to set up Steam environment", e);
+        }
+    }
+
     private void setupWineSystemFiles() {
         Log.d("ContainerLaunch", "=== setupWineSystemFiles START === container=" + container.id +
                 " wine=" + wineVersion + " arch=" + (wineInfo != null ? wineInfo.getArch() : "null") +
                 " rootDir=" + container.getRootDir().getAbsolutePath());
 
         ensureWinePrefixReady();
+        ensureLaunchRuntimeFilesReady();
 
         String appVersion = String.valueOf(AppUtils.getVersionCode(this));
         String imgVersion = String.valueOf(imageFs.getVersion());
@@ -3982,18 +6433,20 @@ private void setupWineSystemFiles() {
             applyGeneralPatches(container);
             container.putExtra("appVersion", appVersion);
             container.putExtra("imgVersion", imgVersion);
-            firstTimeBoot = true; // force wincomponent DLLs re-extraction on app update
+            firstTimeBoot = true;
             containerDataChanged = true;
         }
 
-        // Check after applyGeneralPatches — container_pattern_common.tzst provides these files
         ensureWinePrefixEssentialFiles();
 
         String dxwrapper = shortcut != null ? getShortcutSetting("dxwrapper", this.dxwrapper) : this.dxwrapper;
+        String dxwrapperConfig =
+                shortcut != null
+                        ? getShortcutSetting("dxwrapperConfig", this.dxwrapperConfig.toString())
+                        : this.dxwrapperConfig.toString();
+        KeyValueSet currentDXWrapperConfig = DXVKConfigUtils.parseConfig(dxwrapperConfig);
 
         if (dxwrapper.contains("dxvk")) {
-            String dxwrapperConfig = shortcut != null ? getShortcutSetting("dxwrapperConfig", this.dxwrapperConfig.toString()) : this.dxwrapperConfig.toString();
-            KeyValueSet currentDXWrapperConfig = DXVKConfigUtils.parseConfig(dxwrapperConfig);
             String dxvkWrapper = "dxvk-" + currentDXWrapperConfig.get("version");
             String vkd3dWrapper = "vkd3d-" + currentDXWrapperConfig.get("vkd3dVersion");
             String ddrawrapper = currentDXWrapperConfig.get("ddrawrapper");
@@ -4001,275 +6454,72 @@ private void setupWineSystemFiles() {
                     dxvkWrapper + "' vkd3d='" + vkd3dWrapper + "' ddrawrapper='" +
                     ddrawrapper + "'");
             dxwrapper = dxvkWrapper + ";" + vkd3dWrapper + ";" + ddrawrapper;
+        } else {
+            String vkd3dVersion = currentDXWrapperConfig.get("vkd3dVersion");
+            if (hasSelectedVkd3dVersion(vkd3dVersion)) {
+                String vkd3dWrapper = "vkd3d-" + vkd3dVersion;
+                Log.i("XServerDisplayActivity", "Launch VKD3D-only wrapper files selected: vkd3d='" +
+                        vkd3dWrapper + "'");
+                dxwrapper = dxwrapper + ";" + vkd3dWrapper;
+            }
         }
 
         String wincomponents = shortcut != null ? getShortcutSetting("wincomponents", container.getWinComponents()) : container.getWinComponents();
         if (!wincomponents.equals(container.getExtra("wincomponents")) || firstTimeBoot) {
-            extractWinComponentFiles();
+            WinComponentSetup.applyWinComponents(
+                    this,
+                    imageFs,
+                    wineInfo,
+                    container,
+                    wincomponents,
+                    container.getExtra("wincomponents", Container.FALLBACK_WINCOMPONENTS),
+                    firstTimeBoot,
+                    onExtractFileListener);
             container.putExtra("wincomponents", wincomponents);
             containerDataChanged = true;
         }
 
-        if (!dxwrapper.equals(container.getExtra("dxwrapper")) || firstTimeBoot) {
+        String wineArchKey = wineVersion != null && wineVersion.contains("arm64ec") ? "arm64ec" : "x86_64";
+        String dxwrapperGateKey = dxwrapper + "|arch=" + wineArchKey;
+        boolean forceWrapperApply = bootExePath != null && !bootExePath.isEmpty();
+        if (!dxwrapperGateKey.equals(container.getExtra("dxwrapper")) || firstTimeBoot || forceWrapperApply) {
+            Log.i("XServerDisplayActivity",
+                    "DXVK/VKD3D extract: gate fired (key='" + dxwrapperGateKey
+                            + "' prev='" + container.getExtra("dxwrapper")
+                            + "' firstTimeBoot=" + firstTimeBoot + " forced=" + forceWrapperApply + ")");
+            wipeDxwrapperDllsForReextract();
             extractDXWrapperFiles(dxwrapper);
-            container.putExtra("dxwrapper", dxwrapper);
+            container.putExtra("dxwrapper", dxwrapperGateKey);
             containerDataChanged = true;
         }
 
-        // Ensure Steam client files are present (download + extract if needed) for Steam games
         boolean isSteamGame = isSteamShortcut();
         boolean isCustomGame = isCustomShortcut();
-        boolean launchRealSteamSetup = isRealSteamLaunchEnabledForShortcut();
         boolean coldClientSetup = isColdClientEnabledForShortcut();
 
-        // Point the container's Steam symlink at the correct sidecar:
-        //   - Launch Steam Client → .shared/steam-client-store/ (pristine real Steam)
-        //   - Cold Client         → .shared/coldclient-store/   (Goldberg stubs + loader)
-        //   - Custom Games        → no Steam dir exposed
-        // The two stores are completely separate — ColdClient never contaminates Real Steam.
-        if (isSteamGame || launchRealSteamSetup) {
+        if (isSteamGame) {
             setSteamClientVisibility(true, coldClientSetup);
         } else if (isCustomGame) {
             setSteamClientVisibility(false);
         }
 
-        if (launchRealSteamSetup) {
-            Log.d("XServerDisplayActivity", "Ensuring real Steam client is ready...");
-            boolean steamReady = false;
-            while (!steamReady) {
-                steamReady = SteamBridge.ensureSteamReady(this);
-                Log.d("XServerDisplayActivity", "Steam client ready: " + steamReady);
-                if (!steamReady) {
-                    boolean shouldRetry = promptSteamClientDownloadRetry();
-                    if (!shouldRetry) {
-                        closeLaunchAttempt();
-                        return;
-                    }
-                    preloaderDialog.showOnUiThread("Retrying Steam client download...");
-                }
-            }
-
-            SteamBridge.ensureRealSteamSupportReady(this);
-
-            // Verify essential Steam client DLLs exist in the wine prefix
-            verifySteamClientFiles(false);
-        } else if (isSteamGame) {
-            Log.d("XServerDisplayActivity", "Real Steam client disabled; preparing ColdClient support only");
+        boolean steamLauncherActive = com.winlator.cmod.feature.stores.steam.utils
+                .PrefManager.INSTANCE.getWnPlanW();
+        if (isSteamGame && !steamLauncherActive) {
+            Log.d("XServerDisplayActivity", "Preparing Steam support");
             SteamBridge.ensureColdClientSupportReady(this);
-
-            // Verify ColdClient loader/support files without downloading or extracting steam.tzst.
             verifySteamClientFiles(true);
         }
 
-        if (launchRealSteamSetup || isSteamGame) {
-            // Replace the game's steam_api DLLs and set up steam_settings for auth
-            if (isSteamGame) {
-                try {
-                    int appId = Integer.parseInt(shortcut.getExtra("app_id"));
-                    String gameInstallPath = resolveSteamGameInstallPath(appId);
-                    File gameDir = new File(gameInstallPath);
-                    String language = container.getExtra("containerLanguage", "english");
-                    if (language == null || language.isEmpty()) language = "english";
-                    boolean isOfflineMode = shortcut != null
-                            ? parseBoolean(getShortcutSetting("steamOfflineMode", container.isSteamOfflineMode() ? "1" : "0"))
-                            : container.isSteamOfflineMode();
-                    boolean forceDlc = shortcut != null
-                            ? parseBoolean(getShortcutSetting("forceDlc", container.isForceDlc() ? "1" : "0"))
-                            : container.isForceDlc();
-                    boolean useSteamInput = shortcut != null
-                            ? parseBoolean(getShortcutSetting("useSteamInput", container.getExtra("useSteamInput", "0")))
-                            : parseBoolean(container.getExtra("useSteamInput", "0"));
-                    boolean unpackFiles = shortcut != null
-                            ? parseBoolean(getShortcutSetting("unpackFiles", container.isUnpackFiles() ? "1" : "0"))
-                            : container.isUnpackFiles();
-                    boolean runtimePatcher = shortcut != null
-                            ? parseBoolean(getShortcutSetting("runtimePatcher", container.isRuntimePatcher() ? "1" : "0"))
-                            : container.isRuntimePatcher();
-
-                    // Get encrypted app ticket once for all setup
-                    String ticketBase64 = null;
-                    try {
-                        ticketBase64 = SteamBridge.getEncryptedAppTicketBase64(appId);
-                    } catch (Exception e) {
-                        Log.w("XServerDisplayActivity", "Failed to get encrypted app ticket", e);
-                    }
-
-                    if (gameDir.exists()) {
-                        syncContainerSteamExecutableFromShortcut(appId, gameInstallPath);
-                        boolean useColdClient = shortcut != null
-                                ? parseBoolean(getShortcutSetting("useColdClient", container.isUseColdClient() ? "1" : "0"))
-                                : container.isUseColdClient();
-                        
-                        if (launchRealSteamSetup) {
-                            // ── Real Steam Mode ──────────────────────────────────────────────────
-                            // The shared Steam store (.shared/steam-client-store/) is permanently
-                            // pristine because ColdClient writes to its own sidecar. No need to
-                            // undo DLL swaps in the Steam dir — just undo the GAME-side swaps
-                            // (steam_api DLL and the exe) that Goldberg/Steamless applied.
-                            MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
-                            MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
-                            MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DRM_PATCHED);
-                            MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DRM_UNPACK_CHECKED);
-
-                            // Clean up a side-effect of an old "MoveSteamExe" hack: if a game
-                            // dir still has a local steam.exe copy, real Steam's integrity
-                            // check crashes.
-                            File copiedSteamExe = new File(gameInstallPath, "steam.exe");
-                            if (copiedSteamExe.exists()) {
-                                copiedSteamExe.delete();
-                                Log.d("XServerDisplayActivity",
-                                        "Real Steam Setup: Purged orphaned local steam.exe from "
-                                                + copiedSteamExe.getAbsolutePath());
-                            }
-                            cleanupEmbeddedSteamRuntime(gameDir);
-
-                            // Undo Goldberg's steam_api replacement in the game dir and restore
-                            // the original .exe if Steamless had swapped in an unpacked copy.
-                            restoreSteamApiDlls(gameDir);
-                            SteamUtils.restoreOriginalExecutable(this, appId);
-
-                            Log.d("XServerDisplayActivity",
-                                    "Real Steam Setup: Game-side state restored for appId=" + appId);
-                        } else if (useColdClient) {
-                            // ── ColdClient launcher mode ──────
-                            // ColdClientLoader handles Steam emulation by loading Goldberg's
-                            // steamclient.dll/steamclient64.dll. The game's ORIGINAL steam_api.dll
-                            // must stay intact — ColdClientLoader routes its calls through the
-                            // emulated steamclient.
-
-                            // Remove conflicting Goldberg markers/state
-                            MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
-                            MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_RESTORED);
-
-                            // Populate the ColdClient sidecar store on first use. This is fully
-                            // decoupled from the pristine Real Steam store — ColdClient's Goldberg
-                            // stubs + loader live in .shared/coldclient-store/, not in the real
-                            // Steam dir, so switching back to Launch Steam Client later doesn't
-                            // need to restore anything.
-                            //
-                            // The container's Steam symlink was already pointed at the coldclient
-                            // store by setSteamClientVisibility(true, coldClientMode=true) above,
-                            // so any writes through drive_c/Program Files (x86)/Steam land in the
-                            // sidecar automatically.
-                            boolean sidecarReady = ensureColdClientStore();
-                            if (!sidecarReady) {
-                                Log.w("XServerDisplayActivity", "ColdClient sidecar store not ready — loader/Goldberg stubs missing");
-                            }
-
-                            // Restore game-side state (steam_api DLLs + exe) once per-prefix
-                            boolean coldClientProvisioned =
-                                    MarkerUtils.INSTANCE.hasMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
-                            if (!coldClientProvisioned) {
-                                SteamUtils.putBackSteamDlls(gameInstallPath);
-                                SteamUtils.restoreUnpackedExecutable(this, appId);
-                                generateSteamInterfacesForGame(gameDir);
-                            } else {
-                                Log.d("XServerDisplayActivity", "ColdClient prefix already provisioned for appId=" + appId);
-                            }
-
-                            // Per-launch config: picks up any toggles the user changed between launches
-                            File steamDir = new File(container.getRootDir(), ".wine/drive_c/Program Files (x86)/Steam");
-                            steamDir.mkdirs();
-                            SteamUtils.writeCompleteSettingsDir(steamDir, appId, language, isOfflineMode, forceDlc, useSteamInput, ticketBase64);
-                            SteamUtils.enrichSteamSettings(this, appId, new File(steamDir, "steam_settings"));
-                            setupSteamSettingsForAllDirs(gameDir, appId, language, isOfflineMode, forceDlc, useSteamInput, ticketBase64);
-
-                            // Ensure steamapps/common symlink exists — ColdClientLoader's ExeRunDir depends on it
-                            File steamappsDir = new File(steamDir, "steamapps");
-                            new File(steamappsDir, "common").mkdirs();
-                            WineUtils.ensureSteamappsCommonSymlink(container, gameInstallPath);
-
-                            // Write ColdClientLoader.ini using robust relative exe resolution
-                            String relativeExeForIni = resolveRelativeGameExe(appId, gameInstallPath);
-                            if (!relativeExeForIni.isEmpty()) {
-                                String gameDirNameForIni = new File(gameInstallPath).getName();
-                                writeColdClientIniDirect(appId, gameDirNameForIni, relativeExeForIni, runtimePatcher);
-                                Log.d("XServerDisplayActivity", "ColdClient INI: exe=" + relativeExeForIni);
-                            } else {
-                                Log.w("XServerDisplayActivity", "Could not find game exe for ColdClient INI, appId=" + appId);
-                            }
-
-                            MarkerUtils.INSTANCE.addMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
-                        } else {
-                            // ── Goldberg mode (default) ─────────────────────────
-                            // Replace steam_api DLLs with Goldberg/steampipe stubs.
-                            // Guard with STEAM_DLL_REPLACED marker so we never double-replace.
-
-                            // Restore ColdClient artifacts if switching from ColdClient mode
-                            if (MarkerUtils.INSTANCE.hasMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED)) {
-                                SteamUtils.restoreSteamclientFiles(this, appId);
-                                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_COLDCLIENT_USED);
-                                Log.d("XServerDisplayActivity", "Restored steamclient DLLs from prior ColdClient mode");
-                            }
-
-                            if (!MarkerUtils.INSTANCE.hasMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED)) {
-                                MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_RESTORED);
-
-                                // Replace steam_api*.dll with steampipe stubs
-                                replaceSteamApiDlls(gameDir, gameInstallPath, language, isOfflineMode, forceDlc, useSteamInput, ticketBase64);
-
-                                // Restore the appropriate exe based on Legacy DRM toggle.
-                                if (unpackFiles) {
-                                    SteamUtils.restoreUnpackedExecutable(this, appId);
-                                } else {
-                                    SteamUtils.restoreOriginalExecutable(this, appId);
-                                }
-
-                                // FIX #4: Restore original steamclient*.dll (undo any prior ColdClient injection)
-                                SteamUtils.restoreSteamclientFiles(this, appId);
-
-                                // FIX #8: Generate achievements.json and save-location symlinks
-                                SteamUtils.enrichSteamSettings(this, appId,
-                                        new File(gameInstallPath, "steam_settings"));
-
-                                MarkerUtils.INSTANCE.addMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
-                                Log.d("XServerDisplayActivity", "Goldberg Steam setup complete for appId=" + appId);
-                            } else {
-                                // DLLs already replaced; verify they actually exist.
-                                // If a game never had steam_api DLLs (e.g. Monster Hunter Stories),
-                                // the marker was set but no DLLs were ever placed. Re-run injection.
-                                boolean hasSteamApiDll = hasSteamApiDllInTree(gameDir);
-                                if (!hasSteamApiDll) {
-                                    Log.w("XServerDisplayActivity",
-                                            "STEAM_DLL_REPLACED marker set but no steam_api DLL found — clearing marker and re-injecting");
-                                    MarkerUtils.INSTANCE.removeMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
-                                    replaceSteamApiDlls(gameDir, gameInstallPath, language, isOfflineMode, forceDlc, useSteamInput, ticketBase64);
-                                    MarkerUtils.INSTANCE.addMarker(gameInstallPath, Marker.STEAM_DLL_REPLACED);
-                                } else {
-                                    // DLLs genuinely exist; just refresh steam_settings in case ticket changed
-                                    setupSteamSettingsForAllDirs(gameDir, appId, language, isOfflineMode, forceDlc, useSteamInput, ticketBase64);
-                                }
-                                // FIX #8: Refresh achievements/save locations too
-                                SteamUtils.enrichSteamSettings(this, appId,
-                                        new File(gameInstallPath, "steam_settings"));
-                                // Ensure experimental steamclient stubs exist (may be missing from older installs)
-                                copySteamclientStubs(gameDir);
-                                Log.d("XServerDisplayActivity", "Goldberg: refreshed steam_settings for appId=" + appId);
-                            }
-                        }
-
-                        // Common setup for both modes
-                        setupSteamEnvironment(appId, gameDir);
-
-                        // Sync achievements from Goldberg back to Steam (best-effort)
-                        SteamUtils.syncGoldbergAchievementsAndStats(this, appId);
-
-                        // Do not clone the full Steam runtime into the game directory for Steam titles.
-                        // A copied GameDir/Steam tree can override the intended global Steam root
-                        // or per-game Goldberg stubs and break repeated launches, especially on
-                        // titles with custom Steam loaders.
-                        cleanupEmbeddedSteamRuntime(gameDir);
-
-                        Log.d("XServerDisplayActivity", "Steam environment physical readiness verified for appId=" + appId);
-                    }
-                } catch (Exception e) {
-                    Log.e("XServerDisplayActivity", "Failed to set up Steam environment", e);
-                }
-            }
+        if (xServer == null || isFinishing() || isDestroyed()) {
+            Log.w("XServerDisplayActivity",
+                    "setupWineSystemFiles: activity torn down mid-setup (xServer="
+                    + (xServer == null ? "null" : "ok")
+                    + " finishing=" + isFinishing()
+                    + " destroyed=" + isDestroyed()
+                    + ") — aborting stale background setup, no crash");
+            return;
         }
-        // Custom Games run unmodified — no Steam directory, no ini cleanup, no DLL/settings
-        // injection. Anything the user's patch (Goldberg, OnlineFix, CreamAPI, etc.) ships
-        // inside the game directory is its own and stays intact.
 
         String desktopTheme = shortcut != null ? getShortcutSetting("desktopTheme", container.getDesktopTheme()) : container.getDesktopTheme();
         if (!(desktopTheme+","+xServer.screenInfo).equals(container.getExtra("desktopTheme"))) {
@@ -4279,6 +6529,7 @@ private void setupWineSystemFiles() {
         }
 
         WineStartMenuCreator.create(this, container);
+        stageBundledTestExes();
         WineUtils.createDosdevicesSymlinks(container, getActiveGameDirectoryPath(), isSteamShortcut());
 
         int inputType = container.getInputType();
@@ -4289,16 +6540,13 @@ private void setupWineSystemFiles() {
             }
         }
         boolean dinputEnabled = (inputType & WinHandler.FLAG_INPUT_TYPE_DINPUT) == WinHandler.FLAG_INPUT_TYPE_DINPUT;
-        boolean exclusiveXInput = false;
+        boolean exclusiveXInput = container.isExclusiveXInput();
         if (shortcut != null) {
             String extra = shortcut.getExtra("exclusiveXInput");
             if (!extra.isEmpty()) {
                 exclusiveXInput = extra.equals("1");
             }
         }
-        // Proton-version flips repair controller detection because they rebuild the prefix and
-        // restore controller DllOverrides. Keep that correction narrow and explicit here.
-        WineUtils.ensureControllerDllOverrides(container);
         WineUtils.setJoystickRegistryKeys(container, dinputEnabled, exclusiveXInput);
         WineUtils.ensureWinebusConfig(container);
 
@@ -4321,25 +6569,198 @@ private void setupWineSystemFiles() {
         Log.d("ContainerLaunch", "=== setupWineSystemFiles END === container=" + container.id + " firstTimeBoot=" + firstTimeBoot);
     }
 
+    private void ensureLaunchRuntimeFilesReady() {
+        if (container == null || wineInfo == null || imageFs == null || contentsManager == null) return;
+
+        if (wineInfo.isArm64EC()) {
+            ensureArm64EcRuntimeDllsReady();
+        } else {
+            ensureBox64RuntimeReady();
+        }
+    }
+
+    private void ensureBox64RuntimeReady() {
+        File rootDir = imageFs.getRootDir();
+        boolean box64Missing = !new File(rootDir, "usr/bin/box64").exists();
+        String box64Version = shortcut != null
+                ? getShortcutSetting("box64Version", container.getBox64Version())
+                : container.getBox64Version();
+        if (box64Version == null || box64Version.isEmpty()) {
+            box64Version = pickNewestInstalledContentVersion(ContentProfile.ContentType.CONTENT_TYPE_BOX64);
+            if (!box64Version.isEmpty()) container.setBox64Version(box64Version);
+        }
+
+        if (!box64Missing && box64Version.equals(container.getExtra("box64Version"))) return;
+
+        if (box64Version.isEmpty()) {
+            Log.w("ContainerLaunch", "No Box64 version selected before first boot; runtime extraction skipped");
+            return;
+        }
+
+        ContentProfile profile = resolveContentProfile(ContentProfile.ContentType.CONTENT_TYPE_BOX64, box64Version);
+        if (profile == null) {
+            Log.w("ContainerLaunch", "Box64 content profile not installed for version: " + box64Version);
+            return;
+        }
+
+        Log.i("ContainerLaunch", "Preparing Box64 before Wine setup: version=" + box64Version);
+        contentsManager.applyContent(profile);
+        container.putExtra("box64Version", box64Version);
+        container.saveData();
+    }
+
+    private void ensureArm64EcRuntimeDllsReady() {
+        File system32Dir = new File(imageFs.getRootDir(), ImageFs.WINEPREFIX + "/drive_c/windows/system32");
+        boolean fexcoreDllsMissing =
+                !new File(system32Dir, "libwow64fex.dll").exists()
+                        || !new File(system32Dir, "libarm64ecfex.dll").exists();
+        boolean wowbox64DllMissing = !new File(system32Dir, "wowbox64.dll").exists();
+
+        String emulator = shortcut != null
+                ? getShortcutSetting("emulator", container.getEmulator())
+                : container.getEmulator();
+        String emulator64 = shortcut != null
+                ? getShortcutSetting("emulator64", container.getEmulator64())
+                : container.getEmulator64();
+        String wowbox64Version = shortcut != null
+                ? getShortcutSetting("box64Version", container.getBox64Version())
+                : container.getBox64Version();
+        String fexcoreVersion = shortcut != null
+                ? getShortcutSetting("fexcoreVersion", container.getFEXCoreVersion())
+                : container.getFEXCoreVersion();
+
+        boolean usesWowbox64 = "wowbox64".equalsIgnoreCase(emulator);
+        boolean usesFexcore =
+                "fexcore".equalsIgnoreCase(emulator)
+                        || "fexcore".equalsIgnoreCase(emulator64)
+                        || !usesWowbox64;
+
+        boolean changed = false;
+        if (usesWowbox64 && (wowbox64DllMissing || !safeEquals(wowbox64Version, container.getExtra("box64Version")))) {
+            if (wowbox64Version == null || wowbox64Version.isEmpty()) {
+                wowbox64Version = pickNewestInstalledContentVersion(ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64);
+                if (!wowbox64Version.isEmpty()) container.setBox64Version(wowbox64Version);
+            }
+            changed |= applyRuntimeContentBeforeBoot(
+                    ContentProfile.ContentType.CONTENT_TYPE_WOWBOX64,
+                    wowbox64Version,
+                    "WowBox64",
+                    "box64Version"
+            );
+        }
+
+        if (usesFexcore && (fexcoreDllsMissing || !safeEquals(fexcoreVersion, container.getExtra("fexcoreVersion")))) {
+            if (fexcoreVersion == null || fexcoreVersion.isEmpty()) {
+                fexcoreVersion = pickNewestInstalledContentVersion(ContentProfile.ContentType.CONTENT_TYPE_FEXCORE);
+                if (!fexcoreVersion.isEmpty()) container.setFEXCoreVersion(fexcoreVersion);
+            }
+            changed |= applyRuntimeContentBeforeBoot(
+                    ContentProfile.ContentType.CONTENT_TYPE_FEXCORE,
+                    fexcoreVersion,
+                    "FEXCore",
+                    "fexcoreVersion"
+            );
+        }
+
+        if (changed) container.saveData();
+    }
+
+    private boolean applyRuntimeContentBeforeBoot(
+            ContentProfile.ContentType type,
+            String version,
+            String label,
+            String extraKey) {
+        if (version == null || version.isEmpty()) {
+            Log.w("ContainerLaunch", "No " + label + " version selected before first boot; runtime extraction skipped");
+            return false;
+        }
+
+        ContentProfile profile = resolveContentProfile(type, version);
+        if (profile == null) {
+            Log.w("ContainerLaunch", label + " content profile not installed for version: " + version);
+            return false;
+        }
+
+        Log.i("ContainerLaunch", "Preparing " + label + " before Wine setup: version=" + version);
+        contentsManager.applyContent(profile);
+        container.putExtra(extraKey, version);
+        return true;
+    }
+
+    private ContentProfile resolveContentProfile(ContentProfile.ContentType type, String version) {
+        ContentProfile profile = contentsManager.getProfileByEntryName(type.toString() + "-" + version);
+        if (profile != null) return profile;
+
+        List<ContentProfile> profiles = contentsManager.getProfiles(type);
+        if (profiles == null) return null;
+        for (ContentProfile candidate : profiles) {
+            if (version.equals(contentVersionIdentifier(candidate))) return candidate;
+        }
+        return null;
+    }
+
+    private String pickNewestInstalledContentVersion(ContentProfile.ContentType type) {
+        List<ContentProfile> profiles = contentsManager.getProfiles(type);
+        if (profiles == null || profiles.isEmpty()) return "";
+
+        ContentProfile best = null;
+        for (ContentProfile profile : profiles) {
+            if (!profile.isInstalled) continue;
+            if (best == null
+                    || profile.verCode > best.verCode
+                    || (profile.verCode == best.verCode
+                    && profile.verName != null
+                    && best.verName != null
+                    && profile.verName.compareToIgnoreCase(best.verName) > 0)) {
+                best = profile;
+            }
+        }
+        return best != null ? contentVersionIdentifier(best) : "";
+    }
+
     private void setupXEnvironment() throws PackageManager.NameNotFoundException {
+        // Never reattach for a dependency install: the boot exe must run in a fresh
+        // environment, and a stale activeEnvironment from a just-closed session would
+        // swallow the launch (black screen, bridge never completes).
+        if (!isDependencyInstall && SessionKeepAliveService.isSessionActive()) {
+            XEnvironment existingEnv = SessionKeepAliveService.getActiveEnvironment();
+            XServer existingXServer = SessionKeepAliveService.getActiveXServer();
+            if (existingEnv != null && existingXServer != null) {
+                Log.i("XServerDisplayActivity", "Re-attaching to existing background session environment");
+                this.environment = existingEnv;
+                this.xServer = existingXServer;
+                this.environment.setContext(this);
+                this.reusingSession = true;
+
+                // Free the old handler's socket (keep its writers/rings) and mark the fresh one initialized so the guest's input keeps flowing.
+                WinHandler previousWinHandler = this.xServer.getWinHandler();
+                if (previousWinHandler != null && previousWinHandler != winHandler) {
+                    previousWinHandler.stopForReattach();
+                }
+                this.xServer.setWinHandler(winHandler);
+                winHandler.markSessionInitialized();
+
+                this.guestProgramLauncherComponent = environment.getComponent(GuestProgramLauncherComponent.class);
+                return;
+            }
+        }
+
         cleanupLingeringSessionProcesses("new launch");
 
-        // Set environment variables
-        envVars.put("LC_ALL", lc_all);
+        envVars.put("LC_ALL", LocaleEnv.normalize(lc_all));
         String winePrefix = (shortcut != null && container != null && shortcut.path != null && shortcut.path.matches("^[cC]:.*")) ? new File(container.getRootDir(), ".wine").getAbsolutePath() : imageFs.wineprefix;
         envVars.put("WINEPREFIX", winePrefix);
 
         boolean enableWineDebug = preferences.getBoolean("enable_wine_debug", false);
         String wineDebugChannels = preferences.getString("wine_debug_channels", SettingsConfig.DEFAULT_WINE_DEBUG_CHANNELS);
-        String wineDebugValue;
-        if (enableWineDebug && !wineDebugChannels.isEmpty()) {
-            wineDebugValue = "+" + wineDebugChannels.replace(",", ",+");
-        } else {
-            wineDebugValue = "-all";
-        }
+        String wineDebugClasses = preferences.getString("wine_debug_classes", SettingsConfig.DEFAULT_WINE_DEBUG_CLASSES);
+        String wineDebugValue = enableWineDebug ? buildWineDebug(wineDebugClasses, wineDebugChannels) : "-all";
         envVars.put("WINEDEBUG", wineDebugValue);
+        Log.i("XServerDisplayActivity",
+                "WINEDEBUG resolved: enable=" + enableWineDebug
+                        + " classes='" + wineDebugClasses + "' channels='" + wineDebugChannels
+                        + "' value='" + wineDebugValue + "'");
 
-        // Clear any temporary directory
         String rootPath = imageFs.getRootDir().getPath();
         FileUtils.clear(imageFs.getTmpDir());
 
@@ -4350,23 +6771,16 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                 shortcut
         );
 
-        // Additional container checks and environment configuration
         if (container != null) {
                 guestProgramLauncherComponent.setContainer(this.container);
                 guestProgramLauncherComponent.setWineInfo(this.wineInfo);
 
-                // P1: Wire steamType for box64rc preset selection (Normal/Light/Ultralight)
-                String steamType = isSteamShortcut()
-                        ? (shortcut != null ? getShortcutSetting("steamType", container.getSteamType()) : container.getSteamType())
-                        : Container.STEAM_TYPE_NORMAL;
-                guestProgramLauncherComponent.setSteamType(steamType);
                 GameFixes.applyForLaunch(container, shortcut);
 
                 String wineStartCmd = getWineStartCommand(guestProgramLauncherComponent);
                 String guestExecutable;
             
-            // Use wine explorer for all containers - GuestProgramLauncherComponent handles
-            // the architecture difference (winePath for arm64ec, box64 for x86_64)
+            // Launcher resolves Wine vs ARM64EC execution internally.
             guestExecutable = "wine explorer /desktop=shell," + xServer.screenInfo + " " + wineStartCmd;
 
             Log.d("XServerDisplayActivity", "=== GAME LAUNCH DEBUG ===");
@@ -4392,12 +6806,24 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                     "' effective='" + effectiveCustomEnvVars + "'");
             envVars.putAll(effectiveCustomEnvVars);
 
-            // Normalize synchronization environment variables (NTSync / ESync).
-            // This auto-detects NTSync and falls back to ESync when unavailable.
+            // must run after custom env: a user-set ENABLE_VKBASALT wins and this backs off
+            applyReshadeEnv(envVars);
+
+            // Steam-style launch options: KEY=VALUE tokens before %command% become env vars.
+            String launchOptsForEnv = shortcut != null
+                    ? getShortcutSetting("execArgs", container.getExecArgs())
+                    : container.getExecArgs();
+            java.util.Map<String, String> steamOptEnv =
+                    com.winlator.cmod.feature.stores.steam.utils.SteamLaunchOptions.parseEnvVars(launchOptsForEnv);
+            for (java.util.Map.Entry<String, String> e : steamOptEnv.entrySet()) {
+                envVars.put(e.getKey(), e.getValue());
+            }
+
             normalizeSyncEnvVars(envVars);
 
             ArrayList<String> bindingPaths = new ArrayList<>();
-            String drives = shortcut != null ? getShortcutSetting("drives", container.getDrives()) : container.getDrives();
+            String drives = WineUtils.readDrivesFromPrefix(container);
+            if (drives.isEmpty()) drives = container.getDrives();
             for (String[] drive : Container.drivesIterator(drives)) {
                 bindingPaths.add(drive[1]);
             }
@@ -4424,17 +6850,13 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                     "' effective='" + effectiveFEXCorePreset + "'");
             guestProgramLauncherComponent.setFEXCorePreset(effectiveFEXCorePreset);
 
-                // P2: Wire preUnpack callback for Mono, redistributables, and Steamless DRM
-                // This runs after box64/Wine is ready but before the game exe launches.
-                // Always wired for Steam games so per-container prerequisites install correctly.
-                boolean isSteamGameForUnpack = shortcut != null && "STEAM".equals(shortcut.getExtra("game_source"));
+                // Steam preUnpack installs prerequisites before game launch.
+                String prereqGameSource = shortcut != null ? shortcut.getExtra("game_source") : null;
+                boolean isSteamGameForUnpack = "STEAM".equals(prereqGameSource);
                 if (isSteamGameForUnpack) {
                     guestProgramLauncherComponent.setPreUnpack(() -> {
                         try {
-                            boolean currentLaunchRealSteam = shortcut != null
-                                    ? parseBoolean(getShortcutSetting("launchRealSteam", container.isLaunchRealSteam() ? "1" : "0"))
-                                    : container.isLaunchRealSteam();
-                            if (currentLaunchRealSteam) {
+                            if (isBionicSteamEnabledForShortcut()) {
                                 return;
                             }
 
@@ -4444,8 +6866,16 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                             runPreGameSetup(
                                     guestProgramLauncherComponent,
                                     container.isNeedsUnpacking(),
-                                    currentUnpackFiles,
-                                    false);
+                                    currentUnpackFiles);
+                        } catch (Exception e) {
+                            Log.e("XServerDisplayActivity", "preUnpack failed", e);
+                        }
+                    });
+                } else if ("GOG".equals(prereqGameSource) || "EPIC".equals(prereqGameSource)) {
+                    guestProgramLauncherComponent.setPreUnpack(() -> {
+                        try {
+                            installMonoIfNeeded(guestProgramLauncherComponent);
+                            installGeckoIfNeeded(guestProgramLauncherComponent);
                         } catch (Exception e) {
                             Log.e("XServerDisplayActivity", "preUnpack failed", e);
                         }
@@ -4453,13 +6883,11 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                 }
         }
 
-        // Merge overrideEnvVars if present
         if (overrideEnvVars != null) {
             envVars.putAll(overrideEnvVars);
-            overrideEnvVars.clear(); // Clear overrideEnvVars as per smali logic
+            overrideEnvVars.clear();
         }
 
-        // Create our overall XEnvironment with various components
         environment = new XEnvironment(this, imageFs);
         environment.addComponent(
                 new SysVSharedMemoryComponent(
@@ -4474,7 +6902,6 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                 )
         );
 
-        // Audio driver logic
         if (audioDriver.equals("alsa")) {
             envVars.put("ANDROID_ALSA_SERVER", rootPath + UnixSocketConfig.ALSA_SERVER_PATH);
             envVars.put("ANDROID_ASERVER_USE_SHM", "true");
@@ -4485,31 +6912,454 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
                     )
             );
         } else if (audioDriver.equals("pulseaudio")) {
+            PulseAudioComponent.Options pulseOptions = PulseAudioComponent.Options.fromEnvVars(envVars);
+            if (!envVars.has("PULSE_LATENCY_MSEC")) {
+                envVars.put("PULSE_LATENCY_MSEC", pulseOptions.latencyMillis);
+            }
             envVars.put("PULSE_SERVER", rootPath + UnixSocketConfig.PULSE_SERVER_PATH);
             environment.addComponent(
                     new PulseAudioComponent(
-                            UnixSocketConfig.createSocket(rootPath, UnixSocketConfig.PULSE_SERVER_PATH)
+                            UnixSocketConfig.createSocket(rootPath, UnixSocketConfig.PULSE_SERVER_PATH),
+                            pulseOptions
                     )
             );
         }
 
-        // Add Steam client component for Steam games (Goldberg emulator support)
-        boolean launchRealSteamMode = shortcut != null
-                ? parseBoolean(getShortcutSetting("launchRealSteam", container.isLaunchRealSteam() ? "1" : "0"))
-                : (container != null && container.isLaunchRealSteam());
-        if (shortcut != null && "STEAM".equals(shortcut.getExtra("game_source")) && !launchRealSteamMode) {
+        // Wine cannot enumerate Android network interfaces; Steam treats that as offline.
+        environment.addComponent(new NetworkInfoUpdateComponent());
+
+        if (shortcut != null && "STEAM".equals(shortcut.getExtra("game_source"))) {
             Log.d("XServerDisplayActivity", "Adding SteamClientComponent for Steam game");
             environment.addComponent(new SteamClientComponent());
         }
 
-        // Pass final envVars to the launcher
+        if (isBionicSteamEnabledForShortcut()) {
+            try {
+                long bsSteamId = com.winlator.cmod.feature.stores.steam.utils
+                        .PrefManager.INSTANCE.getSteamUserSteamId64();
+                String bsUser = com.winlator.cmod.feature.stores.steam.utils
+                        .PrefManager.INSTANCE.getUsername();
+                int bsAppId = -1;
+                try {
+                    if (shortcut != null) bsAppId = Integer.parseInt(shortcut.getExtra("app_id"));
+                } catch (Exception ignored) {}
+                envVars.put("Steam3Master", "127.0.0.1:57343");
+                envVars.put("SteamClientService", "127.0.0.1:57344");
+                String bridgeLib = com.winlator.cmod.feature.stores.steam.wnsteam
+                        .WnSteamAssetsInstaller.INSTANCE.bridgeLibPath(this).getAbsolutePath();
+                envVars.put("WINESTEAMCLIENTPATH64", bridgeLib);
+                envVars.put("WINESTEAMCLIENTPATH", bridgeLib);
+                envVars.put("_STEAM_SETENV_MANAGER", "1");
+                String steamRootLinux = imageFs.wineprefix
+                        + "/drive_c/Program Files (x86)/Steam";
+                envVars.put("STEAM_BASE_FOLDER", steamRootLinux);
+                File bsBreakpad = new File(imageFs.getRootDir(), "usr/tmp/breakpad");
+                bsBreakpad.mkdirs();
+                envVars.put("BREAKPAD_DUMP_LOCATION", bsBreakpad.getAbsolutePath());
+                envVars.put("STEAMVIDEOTOKEN", "1");
+                envVars.put("ENABLE_VK_LAYER_VALVE_steam_overlay_1", "0");
+                envVars.put("SteamEnv", "1");
+                envVars.put("SteamClientLaunch", "1");
+                if (bsUser != null && !bsUser.isEmpty()) {
+                    envVars.put("SteamUser", bsUser);
+                    envVars.put("SteamAppUser", bsUser);
+                }
+                if (bsSteamId > 0) envVars.put("STEAMID", String.valueOf(bsSteamId));
+                if (bsAppId > 0) {
+                    envVars.put("SteamAppId", String.valueOf(bsAppId));
+                    envVars.put("SteamGameId", String.valueOf(bsAppId));
+                }
+                envVars.put("SteamPath", "C:\\Program Files (x86)\\Steam");
+                envVars.put("ValvePlatformMutex", "c:\\Program Files (x86)\\Steam/");
+                String currentWineDebug = envVars.get("WINEDEBUG");
+                if (currentWineDebug == null || currentWineDebug.equals("-all")) {
+                    String steamClasses = preferences.getString(
+                            "wine_debug_classes", SettingsConfig.DEFAULT_WINE_DEBUG_CLASSES);
+                    envVars.put("WINEDEBUG", buildWineDebug(steamClasses, "module,loaddll"));
+                }
+                Log.i("XServerDisplayActivity",
+                        "Bionic Steam: published bridge env (Steam3Master=127.0.0.1:57343, appId="
+                                + bsAppId + ", steamBase=" + steamRootLinux
+                                + ", WINEDEBUG=" + envVars.get("WINEDEBUG") + ")");
+
+                try {
+                    File steamDirPrefix = new File(container.getRootDir(),
+                            ".wine/drive_c/Program Files (x86)/Steam");
+                    if (steamDirPrefix.isDirectory()) {
+                        File helperDst = new File(steamDirPrefix, "wn-steam-helper.exe");
+                        if (!helperDst.exists() || helperDst.length() != 176128) {
+                            try (java.io.InputStream in = getAssets().open(
+                                        "wnsteam/bionic/wn-steam-helper.exe");
+                                 java.io.FileOutputStream out =
+                                        new java.io.FileOutputStream(helperDst)) {
+                                byte[] buf = new byte[64 * 1024];
+                                int n; while ((n = in.read(buf)) > 0) out.write(buf, 0, n);
+                            }
+                            Log.i("XServerDisplayActivity",
+                                  "Bionic Steam: installed wn-steam-helper.exe ("
+                                  + helperDst.length() + " B) at " + helperDst.getPath());
+                        }
+                    } else {
+                        Log.w("XServerDisplayActivity",
+                              "Bionic Steam: container Steam dir missing, helper not staged: "
+                              + steamDirPrefix.getPath());
+                    }
+                } catch (Exception e) {
+                    Log.e("XServerDisplayActivity",
+                          "Bionic Steam: helper install failed", e);
+                }
+
+                if (com.winlator.cmod.feature.stores.steam.utils
+                        .PrefManager.INSTANCE.getWnPlanW()) {
+                    String currentOverrides = envVars.get("WINEDLLOVERRIDES");
+                    String planWOverride = "lsteamclient=";
+                    if (currentOverrides == null || currentOverrides.isEmpty()) {
+                        envVars.put("WINEDLLOVERRIDES", planWOverride);
+                    } else if (!currentOverrides.contains("lsteamclient=")) {
+                        envVars.put("WINEDLLOVERRIDES",
+                                currentOverrides + ";" + planWOverride);
+                    }
+                    Log.i("XServerDisplayActivity",
+                            "Steam Launcher: WINEDLLOVERRIDES set to '"
+                            + envVars.get("WINEDLLOVERRIDES")
+                            + "' to disable lsteamclient export-hijack");
+                    envVars.put("PROTON_DISABLE_LSTEAMCLIENT", "1");
+                    Log.i("XServerDisplayActivity",
+                            "Steam Launcher: PROTON_DISABLE_LSTEAMCLIENT=1 "
+                            + "(bypass ntdll lsteamclient hooks for Proton 10+)");
+                    String planWUser = com.winlator.cmod.feature.stores.steam.utils
+                            .PrefManager.INSTANCE.getUsername();
+                    String planWSid  = String.valueOf(com.winlator.cmod.feature.stores.steam.utils
+                            .PrefManager.INSTANCE.getSteamUserSteamId64());
+                    String planWTok = com.winlator.cmod.feature.stores.steam.utils
+                            .PrefManager.INSTANCE.getRefreshToken();
+                    if (planWTok != null && !planWTok.isEmpty()
+                            && planWUser != null && !planWUser.isEmpty()
+                            && !planWSid.equals("0")
+                            && bsAppId > 0) {
+                        envVars.put("WN_STEAM_USERNAME", planWUser);
+                        envVars.put("WN_STEAM_STEAMID", planWSid);
+                        envVars.put("WN_STEAM_TOKEN", planWTok);
+                        envVars.put("WN_STEAM_APPID", String.valueOf(bsAppId));
+                        // Pass language for native launcher ACF UserConfig/MountedConfig
+                        String acfLang = PrefManager.INSTANCE.getContainerLanguage();
+                        String acfContainerLang = container.getExtra("containerLanguage", null);
+                        if (acfContainerLang != null && !acfContainerLang.isEmpty()) {
+                            acfLang = acfContainerLang;
+                        }
+                        if (acfLang != null && !acfLang.isEmpty()) {
+                            envVars.put("WN_STEAM_LANGUAGE", acfLang);
+                        }
+                        // Pass DLC depot data for native launcher ACF
+                        try {
+                            com.winlator.cmod.feature.stores.steam.data.SteamApp depotAppInfo =
+                                com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
+                                    .getAppInfoOf(bsAppId);
+                            if (depotAppInfo != null) {
+                                envVars.put("WN_STEAM_APP_NAME", depotAppInfo.getName());
+                                String installScript = depotAppInfo.getInstallScript();
+                                if (installScript != null && !installScript.isEmpty()) {
+                                    StringBuilder installScriptsSb = new StringBuilder();
+                                    java.util.Map<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> allDepots =
+                                        depotAppInfo.getDepots();
+                                    for (java.util.Map.Entry<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> entry : allDepots.entrySet()) {
+                                        com.winlator.cmod.feature.stores.steam.data.DepotInfo di = entry.getValue();
+                                        if (di.getDlcAppId() == com.winlator.cmod.feature.stores.steam.service.SteamService.INVALID_APP_ID
+                                            && di.getDepotFromApp() == com.winlator.cmod.feature.stores.steam.service.SteamService.INVALID_APP_ID) {
+                                            if (installScriptsSb.length() > 0) installScriptsSb.append(",");
+                                            installScriptsSb.append(entry.getKey()).append(":").append(installScript);
+                                        }
+                                    }
+                                    if (installScriptsSb.length() > 0) {
+                                        envVars.put("WN_STEAM_INSTALL_SCRIPTS", installScriptsSb.toString());
+                                    }
+                                }
+                                java.util.Map<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> depots =
+                                    depotAppInfo.getDepots();
+                                String branch = com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
+                                    .resolveSelectedBetaName(bsAppId);
+                                if (branch == null || branch.isEmpty()) branch = "public";
+
+                                // Resolve buildId from branch info
+                                java.util.Map<String, com.winlator.cmod.feature.stores.steam.data.BranchInfo> branches =
+                                    depotAppInfo.getBranches();
+                                long buildId = 0L;
+                                if (branches != null) {
+                                    com.winlator.cmod.feature.stores.steam.data.BranchInfo branchInfo = branches.get(branch);
+                                    if (branchInfo != null) {
+                                        buildId = branchInfo.getBuildId();
+                                    } else if (branches.containsKey("public")) {
+                                        buildId = branches.get("public").getBuildId();
+                                    }
+                                }
+                                envVars.put("WN_STEAM_BUILD_ID", String.valueOf(buildId));
+
+                                // Compute sizeOnDisk recursively from game directory (match Kotlin
+                                // calculateDirectorySize); null-guard listFiles() so a transient I/O
+                                // error never NPEs and silently drops all depot data.
+                                String gameInstallPath = resolveSteamGameInstallPath(bsAppId);
+                                long sizeOnDisk = 0L;
+                                if (gameInstallPath != null) {
+                                    java.util.ArrayDeque<java.io.File> stack = new java.util.ArrayDeque<>();
+                                    stack.push(new java.io.File(gameInstallPath));
+                                    while (!stack.isEmpty()) {
+                                        java.io.File cur = stack.pop();
+                                        if (cur.isDirectory()) {
+                                            java.io.File[] children = cur.listFiles();
+                                            if (children != null) {
+                                                for (java.io.File c : children) stack.push(c);
+                                            }
+                                        } else if (cur.isFile()) {
+                                            sizeOnDisk += cur.length();
+                                        }
+                                    }
+                                }
+                                envVars.put("WN_STEAM_SIZE_ON_DISK", String.valueOf(sizeOnDisk));
+
+                                // Collect installed depot IDs and DLC app IDs (same as Kotlin collectInstalledDepotManifests)
+                                java.util.Set<Integer> installedDepotIds = new java.util.HashSet<>();
+                                java.util.List<Integer> installedDepotsList = com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
+                                    .getInstalledDepotsOf(bsAppId);
+                                if (installedDepotsList != null) installedDepotIds.addAll(installedDepotsList);
+
+                                java.util.Set<Integer> installedDlcAppIds = new java.util.HashSet<>();
+                                java.util.List<Integer> installedDlcList = com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
+                                    .getInstalledDlcDepotsOf(bsAppId);
+                                if (installedDlcList != null) installedDlcAppIds.addAll(installedDlcList);
+
+                                // Collect all known depots (app depots + downloadable depots)
+                                java.util.LinkedHashMap<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> allKnownDepots = new java.util.LinkedHashMap<>();
+                                allKnownDepots.putAll(depots);
+                                java.util.Map<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> downloadableDepots = com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
+                                    .getDownloadableDepots(bsAppId, acfLang != null ? acfLang : "");
+                                if (downloadableDepots != null) allKnownDepots.putAll(downloadableDepots);
+
+                                // Also add DLC depots from getOwnedAppDlc (matches Kotlin collectInstalledDepotManifests)
+                                if (installedDlcList != null) {
+                                    for (Integer dlcAppId : installedDlcList) {
+                                        try {
+                                            @SuppressWarnings("unchecked")
+                                            java.util.Map<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> ownedDlc =
+                                                (java.util.Map<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo>)
+                                                    kotlinx.coroutines.BuildersKt.runBlocking(
+                                                        kotlinx.coroutines.Dispatchers.getIO(),
+                                                        (scope, continuation) -> com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
+                                                            .getOwnedAppDlc(dlcAppId, continuation)
+                                                    );
+                                            if (ownedDlc != null) allKnownDepots.putAll(ownedDlc);
+                                        } catch (InterruptedException ie) {
+                                            Thread.currentThread().interrupt();
+                                        } catch (Exception ignored) {}
+                                    }
+                                }
+
+                                StringBuilder depotSb = new StringBuilder();
+                                StringBuilder sharedSb = new StringBuilder();
+                                long totalBytesToDownload = 0L;
+                                long totalBytesToStage = 0L;
+                                for (java.util.Map.Entry<Integer, com.winlator.cmod.feature.stores.steam.data.DepotInfo> entry : allKnownDepots.entrySet()) {
+                                    int depotId = entry.getKey();
+                                    com.winlator.cmod.feature.stores.steam.data.DepotInfo di = entry.getValue();
+
+                                    // Shared depots are excluded from InstalledDepots entirely (match Kotlin
+                                    // collectInstalledDepotManifests); emit to SharedDepots only when the source app is known.
+                                    if (di.getSharedInstall()) {
+                                        if (di.getDepotFromApp() != com.winlator.cmod.feature.stores.steam.service.SteamService.INVALID_APP_ID) {
+                                            if (sharedSb.length() > 0) sharedSb.append(",");
+                                            sharedSb.append(depotId).append(":").append(di.getDepotFromApp());
+                                        }
+                                        continue;
+                                    }
+
+                                    // Match Kotlin collectInstalledDepotManifests: include if depot is installed,
+                                    // or its DLC is installed
+                                    boolean shouldInclude = installedDepotIds.contains(depotId)
+                                        || (di.getDlcAppId() != com.winlator.cmod.feature.stores.steam.service.SteamService.INVALID_APP_ID
+                                            && installedDlcAppIds.contains(di.getDlcAppId()));
+                                    if (!shouldInclude) continue;
+
+                                    com.winlator.cmod.feature.stores.steam.data.ManifestInfo manifest = null;
+                                    java.util.Map<String, com.winlator.cmod.feature.stores.steam.data.ManifestInfo> manifests = di.getManifests();
+                                    if (manifests.containsKey(branch)) manifest = manifests.get(branch);
+                                    else if (!branch.equals("public") && manifests.containsKey("public")) manifest = manifests.get("public");
+                                    if (manifest != null && manifest.getGid() != 0L) {
+                                        if (depotSb.length() > 0) depotSb.append(",");
+                                        depotSb.append(depotId).append(":").append(manifest.getGid()).append(":").append(manifest.getSize());
+                                        int dlcAppId = di.getDlcAppId();
+                                        if (dlcAppId != com.winlator.cmod.feature.stores.steam.service.SteamService.INVALID_APP_ID) {
+                                            depotSb.append(":").append(dlcAppId);
+                                        } else if (installedDlcAppIds.contains(depotId)) {
+                                            // Mirror Kotlin createAppManifest: fall back to depotId as the dlcappid
+                                            // when the depot carries no dlcAppId but is itself a tracked DLC.
+                                            depotSb.append(":").append(depotId);
+                                        }
+                                        totalBytesToDownload += manifest.getDownload();
+                                        totalBytesToStage += manifest.getSize();
+                                    }
+                                }
+                                if (depotSb.length() > 0) {
+                                    envVars.put("WN_STEAM_DEPOTS", depotSb.toString());
+                                }
+                                if (sharedSb.length() > 0) {
+                                    envVars.put("WN_STEAM_SHARED_DEPOTS", sharedSb.toString());
+                                }
+                                envVars.put("WN_STEAM_BYTES_TO_DOWNLOAD", String.valueOf(totalBytesToDownload));
+                                envVars.put("WN_STEAM_BYTES_TO_STAGE", String.valueOf(totalBytesToStage));
+                                Log.i("XServerDisplayActivity",
+                                    "Steam Launcher: depots=" + depotSb + " shared=" + sharedSb
+                                    + " buildId=" + buildId + " sizeOnDisk=" + sizeOnDisk
+                                    + " dlBytes=" + totalBytesToDownload + " stageBytes=" + totalBytesToStage);
+                            }
+                        } catch (Exception depotIgnored) {
+                            Log.w("XServerDisplayActivity",
+                                    "Steam Launcher: Could not query depot data", depotIgnored);
+                        }
+                        if (wnSteamDirectExeOverride) {
+                            envVars.put("WN_STEAM_DIRECT_EXE", "1");
+                            Log.i("XServerDisplayActivity",
+                                    "Steam Launcher: WN_STEAM_DIRECT_EXE=1 — user-overridden "
+                                    + "launch exe; launcher will CreateProcess the selected exe "
+                                    + "directly (Steam LaunchApp skipped)");
+                        }
+                        File planWCa = new File(container.getRootDir(),
+                                ".wine/drive_c/Program Files (x86)/Steam/wnsteam_cacert.pem");
+                        if (planWCa.exists() && planWCa.length() > 0) {
+                            envVars.put("STEAM_SSL_CERT_FILE",
+                                    "C:\\Program Files (x86)\\Steam\\wnsteam_cacert.pem");
+                            Log.i("XServerDisplayActivity",
+                                    "Steam Launcher: STEAM_SSL_CERT_FILE -> staged CA bundle ("
+                                    + planWCa.length() + " bytes)");
+                        } else {
+                            Log.w("XServerDisplayActivity",
+                                    "Steam Launcher: CA bundle not staged at " + planWCa.getPath()
+                                    + " — launcher CM logon may fail TLS verification");
+                        }
+                        Log.i("XServerDisplayActivity",
+                                "Steam Launcher: token+identity published (user=" + planWUser
+                                + " sid=" + planWSid
+                                + " appId=" + bsAppId
+                                + " tokenLen=" + planWTok.length() + ")");
+                    } else {
+                        Log.w("XServerDisplayActivity",
+                                "Steam Launcher: refresh token / user / steamId missing "
+                                + "(user='" + planWUser + "' sidIsZero="
+                                + planWSid.equals("0") + " tokenEmpty="
+                                + (planWTok == null || planWTok.isEmpty())
+                                + " bsAppId=" + bsAppId
+                                + ") — launcher will refuse to start; "
+                                + "sign into Steam first");
+                    }
+                }
+            } catch (Exception e) {
+                Log.e("XServerDisplayActivity", "Bionic Steam: failed to publish bridge env", e);
+            }
+        }
+
+        if (com.winlator.cmod.feature.stores.steam.utils.PrefManager.INSTANCE.getWnPlanW()
+                && shortcut != null && "STEAM".equals(shortcut.getExtra("game_source"))) {
+            try {
+                java.io.File launcherLog = new java.io.File(
+                        container.getRootDir(), ".wine/drive_c/wn-launcher.log");
+                String gameName = shortcut != null && !shortcut.name.isEmpty()
+                        ? shortcut.name : "game";
+                resetWnLauncherLog(launcherLog);
+                stopWnLauncherStatusTailer();
+                wnLauncherStatusTailer = new com.winlator.cmod.feature.stores.steam.wnsteam
+                        .WnLauncherStatusTailer(
+                            this,
+                            launcherLog,
+                            gameName,
+                            100L,
+                            (phaseText) -> {
+                                if (preloaderDialog != null) {
+                                    preloaderDialog.setStepOnUiThread(phaseText);
+                                }
+                                return kotlin.Unit.INSTANCE;
+                            },
+                            () -> {
+                                stopWnLauncherStatusTailer();
+                                if (preloaderDialog != null) {
+                                    preloaderDialog.closeOnUiThread();
+                                }
+                                return kotlin.Unit.INSTANCE;
+                            },
+                            (reason) -> {
+                                // Invalidate the broken Steam-dir staging so the next launch re-runs installPlanW* through a fresh symlink, restoring shared-store DLL visibility.
+                                try {
+                                    File brokenStage = new File(container.getRootDir(),
+                                            ".wine/drive_c/Program Files (x86)/Steam/.wn-planw-stage.stamp");
+                                    if (brokenStage.exists()) brokenStage.delete();
+                                    File brokenLauncher = new File(container.getRootDir(),
+                                            ".wine/drive_c/Program Files (x86)/Steam/.wn-planw-launcher.stamp");
+                                    if (brokenLauncher.exists()) brokenLauncher.delete();
+                                } catch (Exception ignored) {}
+                                try {
+                                    com.winlator.cmod.feature.stores.steam.service.SteamService
+                                            .Companion.bionicHandoffRelease();
+                                } catch (Throwable t) {
+                                    Log.w("XServerDisplayActivity",
+                                            "Steam Launcher: Bionic hand-off release failed after launch failure", t);
+                                }
+                                runOnUiThread(() -> {
+                                    stopWnLauncherStatusTailer();
+                                    WinToast.show(this, reason);
+                                    if (preloaderDialog != null) preloaderDialog.closeWithDelay(0L);
+                                    exit();
+                                });
+                                return kotlin.Unit.INSTANCE;
+                            });
+                wnLauncherStatusTailer.start();
+                wnLauncherDrivesDismiss.set(true);
+                Log.i("XServerDisplayActivity",
+                        "Steam Launcher: status tailer attached to " + launcherLog.getPath());
+            } catch (Exception e) {
+                stopWnLauncherStatusTailer();
+                Log.w("XServerDisplayActivity",
+                        "Steam Launcher: failed to start status tailer: " + e.getMessage());
+            }
+        }
+
         guestProgramLauncherComponent.setEnvVars(envVars);
         guestProgramLauncherComponent.setTerminationCallback((status) -> {
             Log.d("XServerDisplayActivity", "Guest process terminated with status: " + status);
+            stopWnLauncherStatusTailer();
+
+            if (isDependencyInstall) {
+                // Signal completion only after the session window is fully torn down (onDestroy); releasing early would let the next queued install launch into this still-alive activity.
+                dependencyExitStatus = status;
+                exit();
+                return;
+            }
 
-            // Keep A:\Steam persistence for Android 16 testing
-            // User expressly requested: "don't remove the A:\Steam\ Folder unless the next game has the toggle off to not move it."
-            // Removed MoveSteamExe cleanup hook from termination callback.
+
+            boolean planWActiveTerm = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.INSTANCE.getWnPlanW();
+            if (isBionicSteamEnabledForShortcut() && planWActiveTerm) {
+                try {
+                    com.winlator.cmod.feature.stores.steam.service.SteamService
+                            .Companion.bionicHandoffReleaseAndKickPlayingSessionAsync(true);
+                    Log.d("XServerDisplayActivity",
+                            "Steam Launcher: game exited — released Bionic hand-off "
+                                    + "and scheduled kickPlayingSessionIfReady");
+                } catch (Throwable t) {
+                    Log.w("XServerDisplayActivity",
+                            "Steam Launcher: Bionic hand-off release/kick failed", t);
+                }
+            } else if (isBionicSteamEnabledForShortcut()
+                    && !com.winlator.cmod.feature.stores.steam.utils
+                            .PrefManager.INSTANCE.getWnHybridMode()) {
+                try {
+                    com.winlator.cmod.feature.stores.steam.service.SteamService
+                            .Companion.bionicHandoffRelease();
+                } catch (Throwable t) {
+                    Log.w("XServerDisplayActivity", "Bionic hand-off release failed", t);
+                }
+            } else if (isBionicSteamEnabledForShortcut()) {
+                Log.d("XServerDisplayActivity",
+                        "Hybrid mode: keeping bootstrap alive past game end "
+                                + "(release skipped — bootstrap is the SOLE "
+                                + "Steam session for this app run)");
+            }
 
             if (shouldWatchSteamTermination(status)) {
                 return;
@@ -4518,42 +7368,26 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
             exit();
         });
 
-        // Add the launcher to our environment
         environment.addComponent(guestProgramLauncherComponent);
 
         FEXCoreManager.ensureAppConfigOverrides(this);
 
-        // Set up Steam token login for real Steam mode (must be after guestProgramLauncherComponent is added)
-        if (container != null && launchRealSteamMode) {
-            try {
-                String steamId64 = String.valueOf(com.winlator.cmod.feature.stores.steam.utils.PrefManager.INSTANCE.getSteamUserSteamId64());
-                String username = com.winlator.cmod.feature.stores.steam.utils.PrefManager.INSTANCE.getUsername();
-                String refreshToken = com.winlator.cmod.feature.stores.steam.utils.PrefManager.INSTANCE.getRefreshToken();
-                if (refreshToken != null && !refreshToken.isEmpty()) {
-                    com.winlator.cmod.feature.stores.steam.utils.SteamTokenLogin tokenLogin =
-                            new com.winlator.cmod.feature.stores.steam.utils.SteamTokenLogin(
-                                    steamId64, username, refreshToken, imageFs, guestProgramLauncherComponent);
-                    tokenLogin.setupSteamFiles(true);
-                    Log.d("XServerDisplayActivity", "SteamTokenLogin set up for real Steam mode");
-                }
-            } catch (Exception e) {
-                Log.w("XServerDisplayActivity", "Failed to set up SteamTokenLogin", e);
-            }
-        }
-
-        // Reserve controller slots before Wine starts so connected pads are
-        // visible immediately without waiting for a first input event.
         winHandler.preAssignConnectedControllers();
 
-        // Start all environment components (XServer, Audio, etc.)
-        environment.startEnvironmentComponents();
+        if (!reusingSession) {
+            if (preloaderDialog != null) {
+                preloaderDialog.setStepOnUiThread(R.string.preloader_starting_wine);
+            }
+            environment.startEnvironmentComponents();
+            if (!isDependencyInstall) {
+                SessionKeepAliveService.setActiveEnvironment(environment);
+                SessionKeepAliveService.setActiveXServer(xServer);
+            }
+        }
 
-        // Start the WinHandler
         winHandler.start();
-
         if (wineRequestHandler != null) wineRequestHandler.start();
 
-        // Reset dxwrapper config
         dxwrapperConfig = null;
         
     }
@@ -4566,44 +7400,48 @@ private void createWrapperScript(String path, String content) {
 
     private void setupUI() {
         FrameLayout rootView = xServerDisplayFrame;
-        xServerView = new XServerView(this, xServer);
-        final GLRenderer renderer = xServerView.getRenderer();
+        xServerView = new XServerSurfaceView(this, xServer);
+        final VulkanRenderer renderer = xServerView.getRenderer();
+        // Match guest libvulkan so imported AHB tiling matches the producer.
+        String compositorGraphicsDriver =
+                graphicsDriverConfig != null ? graphicsDriverConfig.get("version") : null;
+        if (compositorGraphicsDriver == null || compositorGraphicsDriver.isEmpty()) {
+            compositorGraphicsDriver = "System";
+        }
+        Log.i("XServerDisplayActivity", "Compositor graphics driver='"
+                + compositorGraphicsDriver + "' from graphicsDriver='" + graphicsDriver + "'");
+        renderer.setGraphicsDriver(compositorGraphicsDriver);
         renderer.setCursorVisible(false);
         renderer.setNativeMode(isNativeRenderingEnabled);
+        renderer.setPresentMode(VulkanRenderer.parsePresentMode(
+                graphicsDriverConfig != null ? graphicsDriverConfig.get("compositorPresentMode") : null));
 
-        // Sample the per-container "Direct Composition" toggle once at UI setup
-        // and stash the result on `this` so the SurfaceHolder.Callback below
-        // (and Phase 2.3+ render hooks) can read it without re-querying.
-        directCompositionRequested = container != null && container.isDirectCompositionEnabled();
-        directCompositionSupported =
-                com.winlator.cmod.runtime.display.composition.SurfaceCompositor.isAvailable();
-        if (directCompositionRequested && !directCompositionSupported) {
-            Log.w("XServerDisplayActivity",
-                    "Direct Composition requested but SurfaceControl NDK is unavailable on this device — "
-                            + "falling back to GLRenderer composition");
-        } else {
-            Log.i("XServerDisplayActivity",
-                    "Direct Composition mode: requested=" + directCompositionRequested
-                            + " available=" + directCompositionSupported
-                            + " active=" + (directCompositionRequested && directCompositionSupported));
-        }
+        String containerSwapRB = container != null ? container.getExtra("swapRB", "0") : "0";
+        renderer.setSwapRB("1".equals(getShortcutSetting("swapRB", containerSwapRB)));
 
-        if (shortcut != null) {
+        if (shortcut != null || (bootExePath != null && !bootExePath.isEmpty())) {
             renderer.setUnviewableWMClasses("explorer.exe");
+        }
+        if (shortcut != null) {
             String savedFpsLimit = shortcut.getExtra("fpsLimit", "0");
             try {
                 runtimeFpsLimit = Integer.parseInt(savedFpsLimit);
-                renderer.setFpsLimit(runtimeFpsLimit);
             } catch (NumberFormatException e) {
                 runtimeFpsLimit = 0;
             }
         }
+        renderer.setFpsLimit(runtimeFpsLimit);
 
         applyScreenEffects();
         xServer.setRenderer(renderer);
         rootView.addView(xServerView);
 
+        // DC: install lifecycle + HUD indicator listener.
         installDirectCompositionLifecycle();
+        renderer.setDirectCompositionStateListener(active -> {
+            final FrameRating fr = frameRating;
+            if (fr != null) runOnUiThread(() -> fr.setDirectCompositionActive(active));
+        });
 
         globalCursorSpeed = preferences.getFloat("cursor_speed", 1.0f);
         touchpadView = new TouchpadView(this, xServer, timeoutHandler, hideControlsRunnable);
@@ -4618,35 +7456,47 @@ private void setupUI() {
         rootView.addView(touchpadView);
 
         inputControlsView = new InputControlsView(this, timeoutHandler, hideControlsRunnable);
+        inputControlsView.setInputControlsManager(inputControlsManager);
         inputControlsView.setOverlayOpacity(preferences.getFloat("overlay_opacity", InputControlsView.DEFAULT_OVERLAY_OPACITY));
+        inputControlsView.setReverseBindingOrder(preferences.getBoolean("reverse_binding_order", false));
         inputControlsView.setTouchpadView(touchpadView);
         inputControlsView.setXServer(xServer);
         applyTouchscreenOverlayPreference();
+        applyInputVisualStylePreferences();
         inputControlsView.setVisibility(View.GONE);
         rootView.addView(inputControlsView);
 
 
-        // FPS monitor is a global sticky preference - persists across all games/containers
         effectiveShowFPS = preferences.getBoolean("fps_monitor_enabled", false);
-        if (effectiveShowFPS) {
-            frameRating = new FrameRating(this, graphicsDriverConfig);
-            frameRating.setRenderer(lastRendererName);
-            if (lastGpuName != null) frameRating.setGpuName(lastGpuName);
-            frameRating.setVisibility(View.VISIBLE);
-            applyHUDSettings();
-            updateHUDRenderMode();
-            rootView.addView(frameRating);
+        // Always create FrameRating so it feeds the phone gauge HUD; its on-screen overlay shows only when the FPS monitor is enabled.
+        frameRating = new FrameRating(this, graphicsDriverConfig);
+        frameRating.setRenderer(lastRendererName);
+        if (lastGpuName != null) frameRating.setGpuName(lastGpuName);
+        frameRating.setVisibility(effectiveShowFPS ? View.VISIBLE : View.GONE);
+        applyHUDSettings();
+        updateHUDRenderMode();
+        rootView.addView(frameRating);
+        if (perfController != null) perfController.attachToFrameRating(frameRating);
+
+        if (preferences.getBoolean(MangoHudView.PREF_ENABLED, false)) {
+            mangoHud = new MangoHudView(this);
+            mangoHud.setEngineName(mangoEngineLabel());
+            mangoHud.setSessionInfo(
+                    xServer != null ? xServer.screenInfo.width + "x" + xServer.screenInfo.height : null,
+                    wineInfo != null ? String.valueOf(wineInfo) : null);
+            // Deferred: adding while the frame is detached puts this view inside the frame's later
+            // attach walk, which FrameRating's onAttachedToWindow bringToFront() reorders mid-walk —
+            // the child that slides into the already-visited slot never gets attached. post() runs
+            // after that walk completes, so the add always lands on an attached parent.
+            rootView.post(() -> {
+                if (mangoHud != null && mangoHud.getParent() == null) rootView.addView(mangoHud);
+            });
         }
 
-        // Use getShortcutSetting for proper fallback to container defaults
-        boolean shouldStretch = "1".equals(getShortcutSetting("fullscreenStretched",
-                container != null && container.isFullscreenStretched() ? "1" : "0"));
+        setupControllerHudDetection();
 
-        if (shouldStretch) {
-            // Toggle fullscreen mode based on the final decision
-            renderer.toggleFullscreen();
-            touchpadView.toggleFullscreen();
-        }
+        startFullscreenStretched = "1".equals(getShortcutSetting("fullscreenStretched",
+                container != null && container.isFullscreenStretched() ? "1" : "0"));
 
         if (shortcut != null) {
             String controlsProfile = shortcut.getExtra("controlsProfile");
@@ -4656,209 +7506,86 @@ private void setupUI() {
             }
 
             String simTouchScreen = shortcut.getExtra("simTouchScreen");
-            touchpadView.setSimTouchScreen(simTouchScreen.equals("1"));
+            screenTouchMode = Integer.parseInt(shortcut.getExtra("screenTouchMode", simTouchScreen.equals("1") ? "1" : "0"));
+            touchpadView.setScreenTouchMode(screenTouchMode);
+            if (winHandler != null) winHandler.setScreenTouchStickActive(screenTouchMode == 2);
+            rtsGesturesEnabled = shortcut.getExtra("rtsGestures", "0").equals("1");
+            touchpadView.setRtsGesturesEnabled(rtsGesturesEnabled);
         }
 
-        startTouchscreenTimeout();
+        if (rtsGesturesEnabled) pushSelectedGestureConfig();
 
-        AppUtils.observeSoftKeyboardVisibility(displayHostComposeView, renderer::setScreenOffsetYRelativeToCursor);
-    }
+        if (winHandler != null) winHandler.setRightStickSensitivity(preferences.getFloat("right_stick_sensitivity", 1.0f));
 
-    /**
-     * Phase 2.1 lifecycle wiring for the per-container Direct Composition path.
-     *
-     * No-op when the toggle is off OR the device's libandroid.so doesn't expose
-     * the API-29 SurfaceControl symbols. Otherwise registers a SurfaceHolder
-     * callback against the XServerView's surface so the {@link
-     * com.winlator.cmod.runtime.display.composition.DirectCompositionLayer}
-     * is created the moment the host Surface becomes valid and torn down
-     * cleanly when the Surface is destroyed (e.g. activity backgrounded).
-     *
-     * The lifecycle has to be tied to the SurfaceHolder rather than to
-     * onCreate/onDestroy because {@code ANativeWindow_fromSurface} returns
-     * null until the SurfaceView's surface is realised — which is async on
-     * GLSurfaceView.
-     */
-    private void installDirectCompositionLifecycle() {
-        if (!directCompositionRequested || !directCompositionSupported) return;
-        if (xServerView == null) return;
+        startTouchscreenTimeout();
 
-        final SurfaceHolder holder = xServerView.getHolder();
-        if (holder == null) {
-            Log.w("XServerDisplayActivity",
-                    "installDirectCompositionLifecycle: XServerView has no SurfaceHolder; skipping");
-            return;
-        }
-        Log.i("XServerDisplayActivity",
-                "installDirectCompositionLifecycle: registering SurfaceHolder.Callback for Direct Composition");
+        // Detect a connected external display and offer to move the game onto it (controls stay here).
+        externalDisplayController = new ExternalDisplayController(
+                this, xServerDisplayFrame, xServerView,
+                new ExternalDisplayController.Callbacks() {
+                    @Override
+                    public void onExternalDisplayConnected(android.view.Display display) {
+                        // Automatic swap: the game shows only on the external display, controls stay on the phone.
+                        runOnUiThread(() -> {
+                            if (isFinishing() || isDestroyed() || externalDisplayController == null) return;
+                            boolean outputEnabled = preferences != null
+                                    && preferences.getBoolean("external_display_output", false);
+                            boolean swap = !externalDisplayController.isSwapActive()
+                                    && (externalDisplayController.isVitureSinkAvailable() || outputEnabled);
+                            if (swap) {
+                                externalDisplayController.enterSwap();
+                                android.widget.Toast.makeText(XServerDisplayActivity.this,
+                                        R.string.display_output_swapped_toast,
+                                        android.widget.Toast.LENGTH_SHORT).show();
+                            }
+                            // Re-render even when not swapping so an open Output pane shows the toggle.
+                            renderDrawerMenu();
+                        });
+                    }
 
-        directCompositionCallback = new SurfaceHolder.Callback() {
-            @Override
-            public void surfaceCreated(SurfaceHolder h) {
-                // Always release any prior layer AND any prior smoke-test
-                // buffer first — on activity recreation (or in the rare path
-                // where surfaceCreated fires twice without an intervening
-                // surfaceDestroyed) the old resources are bound to the
-                // destroyed parent. Failure to clean up here leaks both the
-                // SurfaceControl AND the AHardwareBuffer.
-                com.winlator.cmod.runtime.display.composition.DirectCompositionLayer prior =
-                        directCompositionLayer;
-                if (prior != null) {
-                    prior.release();
-                    directCompositionLayer = null;
-                }
-                if (directCompositionTestBufferPtr != 0L) {
-                    com.winlator.cmod.runtime.display.composition
-                            .DirectCompositionLayer.releaseBuffer(directCompositionTestBufferPtr);
-                    directCompositionTestBufferPtr = 0L;
-                }
-                directCompositionLayer =
-                        com.winlator.cmod.runtime.display.composition
-                                .DirectCompositionLayer.attach(xServerView);
-                if (directCompositionLayer == null) {
-                    Log.w("XServerDisplayActivity",
-                            "DirectCompositionLayer.attach returned null — falling back to GL path for this session");
-                    return;
-                }
+                    @Override
+                    public void onExternalDisplayDisconnected() {
+                        runOnUiThread(() -> {
+                            android.widget.Toast.makeText(XServerDisplayActivity.this,
+                                    R.string.display_output_restored_toast,
+                                    android.widget.Toast.LENGTH_SHORT).show();
+                            renderDrawerMenu();
+                            AppUtils.hideSystemUI(XServerDisplayActivity.this);
+                        });
+                    }
 
-                // Phase 2.3: hand the layer to the GLRenderer so per-frame
-                // push happens automatically when a fullscreen direct-scanout
-                // drawable is active. xServerView may not have its renderer
-                // exposed via a getter pre-this-phase; getRenderer() exists
-                // on XServerView (returns the GLRenderer constructed in its
-                // ctor).
-                if (xServerView != null && xServerView.getRenderer() != null) {
-                    xServerView.getRenderer().setDirectCompositionTarget(directCompositionLayer);
-                }
-
-                // Defer the smoke test until after the SurfaceView has been
-                // laid out. surfaceCreated can fire before the View tree's
-                // onLayout — running pushDirectCompositionSmokeTest now would
-                // see width=0/height=0 and place the swatch in the top-left
-                // corner over the X-server menu instead of the bottom-right.
-                //
-                // The smoke test stays in Phase 2.3 too: it provides
-                // visible confirmation that the SC path is alive even when
-                // no AHardwareBuffer-backed game frame is yet flowing
-                // (e.g. before Wine starts rendering, or while a non-DXVK
-                // app is up). Once a real fullscreen frame is pushed by the
-                // renderer, the magenta swatch is replaced — same SC, new
-                // setBuffer.
-                if (xServerView != null) {
-                    xServerView.post(XServerDisplayActivity.this::pushDirectCompositionSmokeTest);
-                } else {
-                    pushDirectCompositionSmokeTest();
-                }
-            }
+                    @Override
+                    public void onSwapStateChanged(boolean swapActive) {
+                        runOnUiThread(() -> {
+                            // On return-to-phone, re-measure the display frame to reclaim full size.
+                            if (!swapActive && drawerStateHolder != null) {
+                                drawerStateHolder.requestPhoneRelayout();
+                            }
+                            evaluateControllerHudMode();
+                            renderDrawerMenu();
+                        });
+                    }
+                });
+        externalDisplayController.start();
 
-            @Override
-            public void surfaceChanged(SurfaceHolder h, int format, int width, int height) {
-                // Phase 2.1: nothing to do — geometry handling lives in Phase 2.2's
-                // setBuffer transaction. We re-evaluate position/size when a buffer
-                // is pushed.
-            }
+        AppUtils.observeSoftKeyboardVisibility(displayHostComposeView, renderer::setScreenOffsetYRelativeToCursor);
+    }
 
-            @Override
-            public void surfaceDestroyed(SurfaceHolder h) {
-                // Clear the renderer's pointer FIRST so the GLThread doesn't
-                // dereference a layer that's about to be released. The
-                // setter is volatile-write; the GLThread's per-frame read
-                // happens-before the next frame and will see null.
-                if (xServerView != null && xServerView.getRenderer() != null) {
-                    xServerView.getRenderer().setDirectCompositionTarget(null);
-                }
-                com.winlator.cmod.runtime.display.composition.DirectCompositionLayer layer =
-                        directCompositionLayer;
-                directCompositionLayer = null;
-                if (layer != null) {
-                    layer.release();
-                }
-                // Also drop the smoke-test AHB here — we'll allocate a fresh
-                // one if surfaceCreated fires again. SurfaceFlinger may still
-                // hold its own ref to the buffer (released by the layer's
-                // reparent-to-null transaction above), so this is safe per
-                // the AHardwareBuffer ref semantics.
-                if (directCompositionTestBufferPtr != 0L) {
-                    com.winlator.cmod.runtime.display.composition
-                            .DirectCompositionLayer.releaseBuffer(directCompositionTestBufferPtr);
-                    directCompositionTestBufferPtr = 0L;
-                }
+    // Open the system Cast / wireless-display picker; a connected display flows through the swap path.
+    private void launchWirelessDisplayPicker() {
+        try {
+            startActivity(new Intent(android.provider.Settings.ACTION_CAST_SETTINGS));
+        } catch (Exception e) {
+            try {
+                startActivity(new Intent(android.provider.Settings.ACTION_DISPLAY_SETTINGS));
+            } catch (Exception ignore) {
+                android.widget.Toast.makeText(this, R.string.display_output_cast_unavailable,
+                        android.widget.Toast.LENGTH_SHORT).show();
             }
-        };
-        holder.addCallback(directCompositionCallback);
-
-        // SurfaceHolder.addCallback only delivers FUTURE lifecycle callbacks. If
-        // the SurfaceView's surface is *already* valid by the time we register
-        // (common: GLSurfaceView's GLThread fires surfaceCreated before
-        // setupUI returns), the callback would silently miss the initial
-        // create and Direct Composition would never attach for this session.
-        // Synthesize the first surfaceCreated when the surface is already live.
-        Surface existing = holder.getSurface();
-        if (existing != null && existing.isValid()) {
-            Log.i("XServerDisplayActivity",
-                    "installDirectCompositionLifecycle: surface already valid — dispatching synthetic surfaceCreated");
-            directCompositionCallback.surfaceCreated(holder);
-        }
-    }
-
-    /**
-     * Phase 2.2 smoke-test: push a small magenta AHardwareBuffer to the
-     * bottom-right corner of the SurfaceControl layer to visually confirm
-     * the Direct Composition path is alive and stacked on top of the
-     * GLRenderer's output.
-     *
-     * <p>Phase 2.3 will replace this with real Wine-frame routing. When that
-     * happens, this method, the {@code directCompositionTestBufferPtr} field,
-     * and the corresponding {@code releaseBuffer} call in {@code onDestroy}
-     * should all be removed.
-     */
-    private void pushDirectCompositionSmokeTest() {
-        if (directCompositionLayer == null) return;
-        // Defensive: if we somehow re-enter (shouldn't, but guard against
-        // any future caller), release the prior test buffer before
-        // overwriting the field — otherwise the previous AHB leaks.
-        if (directCompositionTestBufferPtr != 0L) {
-            com.winlator.cmod.runtime.display.composition
-                    .DirectCompositionLayer.releaseBuffer(directCompositionTestBufferPtr);
-            directCompositionTestBufferPtr = 0L;
-        }
-        // 0xFFFF00FF = opaque magenta. 128x128 swatch — small visual
-        // confirmation that the SC layer is alive without obscuring useful
-        // game UI. (Was 256x256; user wanted ~50% smaller.) Still well
-        // above any plausible HWC overlay-plane minimum-size threshold.
-        // Phase 2.3 replaces this with real Wine frames once a fullscreen
-        // direct-scanout candidate is detected.
-        final int testWidth = 128;
-        final int testHeight = 128;
-        final int testColorArgb = 0xFFFF00FF;
-
-        directCompositionTestBufferPtr =
-                com.winlator.cmod.runtime.display.composition
-                        .DirectCompositionLayer.allocateTestBuffer(testWidth, testHeight, testColorArgb);
-        if (directCompositionTestBufferPtr == 0L) {
-            Log.w("XServerDisplayActivity",
-                    "Direct Composition smoke test: allocateTestBuffer returned 0 — skipping smoke test");
-            return;
         }
+    }
 
-        // Position the swatch in the bottom-right of the SurfaceView. We're
-        // posted via xServerView.post(), so the View tree's onLayout has
-        // already run and getWidth/getHeight return real pixel values.
-        int viewW = xServerView != null ? xServerView.getWidth() : 0;
-        int viewH = xServerView != null ? xServerView.getHeight() : 0;
-        int dstX = viewW > testWidth ? viewW - testWidth - 16 : 16;
-        int dstY = viewH > testHeight ? viewH - testHeight - 16 : 16;
 
-        boolean ok = directCompositionLayer.pushBuffer(
-                directCompositionTestBufferPtr,
-                dstX, dstY, testWidth, testHeight,
-                /* fenceFd */ -1,
-                /* opaque  */ true /* magenta swatch is fully opaque */);
-        Log.i("XServerDisplayActivity",
-                "Direct Composition smoke test pushBuffer returned " + ok
-                        + " (dst=" + dstX + "," + dstY + " " + testWidth + "x" + testHeight
-                        + " viewW=" + viewW + " viewH=" + viewH + ")");
-    }
 
     private ActivityResultLauncher<Intent> controlsEditorActivityResultLauncher = registerForActivityResult(
             new ActivityResultContracts.StartActivityForResult(),
@@ -4888,14 +7615,72 @@ private String parseShortcutNameFromDesktopFile(File desktopFile) {
         return shortcutName;
     }
 
+    // DC: check if enabled for this session.
+    private boolean isDirectCompositionEnabledForSession() {
+        String containerValue = container != null && container.isDirectCompositionEnabled() ? "1" : "0";
+        return getShortcutSetting(
+                com.winlator.cmod.runtime.container.Container.EXTRA_DIRECT_COMPOSITION,
+                containerValue).equals("1");
+    }
+
+    // DC: install SurfaceHolder lifecycle.
+    private void installDirectCompositionLifecycle() {
+        if (directCompositionInstalled) return;
+        if (xServerView == null) return;
+        com.winlator.cmod.runtime.display.composition.SurfaceCompositor.initDiagnosticFile(
+                com.winlator.cmod.runtime.system.LogManager.getLogsDir(this));
+        boolean enabled = isDirectCompositionEnabledForSession();
+        com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent("installDirectCompositionLifecycle: enabled=" + enabled);
+        if (!enabled) return;
+        boolean available = com.winlator.cmod.runtime.display.composition.SurfaceCompositor.isAvailable();
+        com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent("isAvailable() = " + available);
+        if (!available) return;
+        directCompositionInstalled = true;
+        xServerView.getHolder().addCallback(new SurfaceHolder.Callback() {
+            @Override
+            public void surfaceCreated(SurfaceHolder holder) {
+                if (directCompositionLayer != null) return;
+                Surface surface = holder.getSurface();
+                if (surface == null || !surface.isValid()) return;
+                directCompositionLayer = new com.winlator.cmod.runtime.display.composition.DirectCompositionLayer();
+                if (!directCompositionLayer.attach(surface)) {
+                    directCompositionLayer.release();
+                    directCompositionLayer = null;
+                    return;
+                }
+                VulkanRenderer r = xServerView != null ? xServerView.getRenderer() : null;
+                if (r != null) r.setDirectCompositionTarget(directCompositionLayer);
+            }
+            @Override
+            public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {}
+            @Override
+            public void surfaceDestroyed(SurfaceHolder holder) { releaseDirectCompositionLayer(); }
+        });
+        if (xServerView.getHolder().getSurface() != null && xServerView.getHolder().getSurface().isValid()) {
+            Surface surface = xServerView.getHolder().getSurface();
+            directCompositionLayer = new com.winlator.cmod.runtime.display.composition.DirectCompositionLayer();
+            if (directCompositionLayer.attach(surface)) {
+                VulkanRenderer r = xServerView.getRenderer();
+                if (r != null) r.setDirectCompositionTarget(directCompositionLayer);
+            } else { directCompositionLayer.release(); directCompositionLayer = null; }
+        }
+    }
+
+    // DC: release layer.
+    private void releaseDirectCompositionLayer() {
+        if (directCompositionLayer == null) return;
+        VulkanRenderer r = xServerView != null ? xServerView.getRenderer() : null;
+        if (r != null) r.setDirectCompositionTarget(null);
+        directCompositionLayer.release();
+        directCompositionLayer = null;
+    }
+
     private void setTextColorForDialog(ViewGroup viewGroup, int color) {
         for (int i = 0; i < viewGroup.getChildCount(); i++) {
             View child = viewGroup.getChildAt(i);
             if (child instanceof ViewGroup) {
-                // If the child is a ViewGroup, recursively apply the color
                 setTextColorForDialog((ViewGroup) child, color);
             } else if (child instanceof TextView) {
-                // If the child is a TextView, set its text color
                 ((TextView) child).setTextColor(color);
             }
         }
@@ -4953,7 +7738,6 @@ private void ensureWinePrefixEssentialFiles() {
         Log.d("ContainerLaunch", status.toString());
 
         if (anyMissing) {
-            // Try to find the files from another container that has them
             File homeDir = new File(imageFs.getRootDir(), "home");
             File[] homeDirs = homeDir.listFiles();
             File sourceWindowsDir = null;
@@ -4961,7 +7745,6 @@ private void ensureWinePrefixEssentialFiles() {
                 Log.d("ContainerLaunch", "Searching " + homeDirs.length + " dirs in home/ for essential files");
                 for (File dir : homeDirs) {
                     if (!dir.isDirectory()) continue;
-                    // Skip the active xuser symlink and the current container itself
                     if (dir.getName().equals(ImageFs.USER)) continue;
                     if (dir.getAbsolutePath().equals(container.getRootDir().getAbsolutePath())) continue;
                     File candidate = new File(dir, ".wine/drive_c/windows");
@@ -4985,7 +7768,6 @@ private void ensureWinePrefixEssentialFiles() {
                     }
                 }
             } else {
-                // No other container has the files — extract from container_pattern_common.tzst
                 Log.w("ContainerLaunch", "No source container found, extracting from container_pattern_common.tzst");
                 containerWindowsDir.mkdirs();
                 TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this,
@@ -5007,38 +7789,6 @@ private boolean ensureRequestedWineVersionInstalled() {
         return false;
     }
 
-    private boolean promptSteamClientDownloadRetry() {
-        final CountDownLatch dialogLatch = new CountDownLatch(1);
-        final boolean[] retry = {false};
-
-        runOnUiThread(() -> {
-            if (preloaderDialog != null && preloaderDialog.isShowing()) {
-                preloaderDialog.close();
-            }
-            SteamClientDownloadFailureDialog.show(
-                    this,
-                    "Steam Client Download Failed",
-                    "WinNative couldn't download the Steam client files needed for this launch.\n\nRetry will try the download again. Close will cancel this launch and return to your library.",
-                    () -> {
-                        retry[0] = true;
-                        dialogLatch.countDown();
-                    },
-                    () -> {
-                        retry[0] = false;
-                        dialogLatch.countDown();
-                    }
-            );
-        });
-
-        try {
-            dialogLatch.await();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
-        return retry[0];
-    }
-
     private void closeLaunchAttempt() {
         runOnUiThread(() -> {
             if (preloaderDialog != null && preloaderDialog.isShowing()) {
@@ -5069,46 +7819,207 @@ private boolean hasActiveTouchscreenProfile() {
         return inputControlsView != null && inputControlsView.getProfile() != null;
     }
 
+    private void setupControllerHudDetection() {
+        android.hardware.input.InputManager im =
+                (android.hardware.input.InputManager) getSystemService(Context.INPUT_SERVICE);
+        if (im == null) return;
+        hudControllerListener = new android.hardware.input.InputManager.InputDeviceListener() {
+            @Override public void onInputDeviceAdded(int id) { evaluateControllerHudMode(); }
+            @Override public void onInputDeviceRemoved(int id) { evaluateControllerHudMode(); }
+            @Override public void onInputDeviceChanged(int id) { evaluateControllerHudMode(); }
+        };
+        im.registerInputDeviceListener(hudControllerListener,
+                new android.os.Handler(android.os.Looper.getMainLooper()));
+        evaluateControllerHudMode();
+    }
+
+    private void evaluateControllerHudMode() {
+        boolean controller =
+                com.winlator.cmod.runtime.input.ControllerHelper.INSTANCE.isControllerConnected();
+        boolean externalDisplay =
+                externalDisplayController != null && externalDisplayController.isSwapActive();
+        updateControllerHudMode(controller && externalDisplay);
+    }
+
+    // Physical controller present -> hide touch controls and show the gauge HUD, else restore them; the trackpad (touchpadView) stays either way.
+    private void updateControllerHudMode(boolean connected) {
+        if (connected == controllerHudMode) return;
+        controllerHudMode = connected;
+        runOnUiThread(() -> {
+            com.winlator.cmod.runtime.display.PerformanceHudState.setVisible(connected);
+            if (frameRating != null) frameRating.setHudMirrorActive(connected);
+            if (connected) {
+                if (inputControlsView != null) inputControlsView.setVisibility(View.GONE);
+                if (frameRating != null) frameRating.setVisibility(View.GONE);
+                // Lock onto the game window now so FPS/renderer come from it (it's on the external display).
+                syncFrameRatingWithExistingWindows();
+            } else {
+                if (effectiveShowFPS && frameRating != null) frameRating.setVisibility(View.VISIBLE);
+                if (inputControlsView != null && hasActiveTouchscreenProfile()
+                        && preferences.getBoolean("show_touchscreen_controls_enabled", false)) {
+                    inputControlsView.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+    }
+
     private void applyTouchscreenOverlayPreference() {
         if (inputControlsView == null || touchpadView == null) return;
 
         boolean showTouchscreenControls =
                 preferences.getBoolean("show_touchscreen_controls_enabled", false);
-        inputControlsView.setShowTouchscreenControls(showTouchscreenControls);
+        inputControlsView.setShowTouchscreenControls(showTouchscreenControls && !controllerAutoHidden);
+    }
+
+    private void registerControllerAutoHideListener() {
+        if (autoHideDeviceListener != null) return;
+        autoHideInputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
+        if (autoHideInputManager == null) return;
+
+        autoHideDeviceListener = new InputManager.InputDeviceListener() {
+            @Override
+            public void onInputDeviceAdded(int deviceId) {
+                evaluateControllerAutoHide();
+            }
+
+            @Override
+            public void onInputDeviceRemoved(int deviceId) {
+                evaluateControllerAutoHide();
+            }
+
+            @Override
+            public void onInputDeviceChanged(int deviceId) {}
+        };
+        autoHideInputManager.registerInputDeviceListener(autoHideDeviceListener, null);
+    }
+
+    private void unregisterControllerAutoHideListener() {
+        if (autoHideInputManager != null && autoHideDeviceListener != null) {
+            autoHideInputManager.unregisterInputDeviceListener(autoHideDeviceListener);
+        }
+        autoHideDeviceListener = null;
+    }
+
+    private boolean isAnyGameControllerConnected() {
+        InputManager im = autoHideInputManager != null
+                ? autoHideInputManager
+                : (InputManager) getSystemService(Context.INPUT_SERVICE);
+        if (im == null) return false;
+        for (int deviceId : im.getInputDeviceIds()) {
+            if (ExternalController.isGameController(im.getInputDevice(deviceId))) return true;
+        }
+        return false;
+    }
+
+    private void evaluateControllerAutoHide() {
+        if (inputControlsView == null) return;
+
+        if (!preferences.getBoolean("auto_hide_touch_on_controller", false)) {
+            if (controllerAutoHidden) {
+                controllerAutoHidden = false;
+                applyTouchscreenOverlayPreference();
+            }
+            return;
+        }
+
+        if (isAnyGameControllerConnected()) {
+            if (userOverrodeAutoHide) return;
+            if (!controllerAutoHidden) {
+                controllerAutoHidden = true;
+                applyTouchscreenOverlayPreference();
+            }
+        } else {
+            userOverrodeAutoHide = false;
+            if (controllerAutoHidden) {
+                controllerAutoHidden = false;
+                applyTouchscreenOverlayPreference();
+            }
+        }
     }
 
     private void persistSelectedProfile(ControlsProfile profile) {
-        SharedPreferences.Editor editor = preferences.edit();
-        if (profile != null) {
-            int selectedProfileIndex = -1;
-            ArrayList<ControlsProfile> profiles = inputControlsManager.getProfiles(true);
-            for (int i = 0; i < profiles.size(); i++) {
-                ControlsProfile storedProfile = profiles.get(i);
-                if (storedProfile != null && storedProfile.id == profile.id) {
-                    selectedProfileIndex = i;
-                    break;
-                }
+        if (shortcut == null) return;
+        String newVal = profile != null ? String.valueOf(profile.id) : "";
+        if (!newVal.equals(shortcut.getExtra("controlsProfile", ""))) {
+            shortcut.putExtra("controlsProfile", newVal.isEmpty() ? null : newVal);
+            shortcut.saveData();
+        }
+    }
+
+    // Style/theme picks persist like controlsProfile: on the shortcut if present, else globally.
+    private void persistSelectedStyle(VisualStyle style) {
+        if (shortcut != null) {
+            if (!style.name().equals(shortcut.getExtra("controlsStyle", ""))) {
+                shortcut.putExtra("controlsStyle", style.name());
+                shortcut.saveData();
             }
-            editor.putInt("selected_profile_id", profile.id);
-            editor.putInt("selected_profile_index", selectedProfileIndex);
         } else {
-            editor.remove("selected_profile_id");
-            editor.putInt("selected_profile_index", -1);
+            preferences.edit().putString("input_visual_style", style.name()).apply();
         }
-        editor.apply();
     }
 
-    private ControlsProfile resolvePreferredStartupProfile() {
-        ArrayList<ControlsProfile> profiles = inputControlsManager.getProfiles(true);
-        int selectedProfileId = preferences.getInt("selected_profile_id", 0);
-        int selectedProfileIndex = preferences.getInt("selected_profile_index", -1);
-        ControlsProfile selectedProfile =
-                selectedProfileId != 0 ? inputControlsManager.getProfile(selectedProfileId) : null;
+    private void persistSelectedAccentTheme(AccentTheme theme) {
+        if (shortcut != null) {
+            if (!theme.name().equals(shortcut.getExtra("controlsAccentTheme", ""))) {
+                shortcut.putExtra("controlsAccentTheme", theme.name());
+                shortcut.saveData();
+            }
+        } else {
+            preferences.edit().putString("input_accent_theme", theme.name()).apply();
+        }
+    }
+
+    private void pushSelectedGestureConfig() {
+        try {
+            int gid = selectedGestureProfileId();
+            GestureProfile gp = gid != 0 ? gestureProfileManager.getProfile(gid) : gestureProfileManager.getDefaultProfile();
+            if (gp == null) gp = gestureProfileManager.getDefaultProfile();
+            if (gp != null && touchpadView != null) touchpadView.setGestureConfig(gp.getConfigJson());
+        } catch (Throwable t) {
+            android.util.Log.e("XServerDisplayActivity", "gesture resolve failed", t);
+        }
+    }
+
+    private int selectedGestureProfileId() {
+        if (currentGestureProfileId != 0) return currentGestureProfileId;
+        int id = 0;
+        if (shortcut != null) {
+            try {
+                id = Integer.parseInt(shortcut.getExtra("gestureProfileId", "0"));
+            } catch (NumberFormatException e) {
+                id = 0;
+            }
+        }
+        if (id != 0) return id;
+        GestureProfile def = gestureProfileManager != null ? gestureProfileManager.getDefaultProfile() : null;
+        return def != null ? def.id : 0;
+    }
+
+    private ArrayList<ControlsProfile> getVisibleControlsProfiles() {
+        return inputControlsManager != null
+                ? inputControlsManager.getProfiles(true)
+                : new ArrayList<>();
+    }
+
+    private void applyInputVisualStylePreferences() {
+        if (inputControlsView == null || preferences == null) return;
+        String style = shortcut != null ? shortcut.getExtra("controlsStyle", "") : "";
+        if (style.isEmpty()) style = preferences.getString("input_visual_style", VisualStyle.SLATE.name());
+        inputControlsView.setVisualStyle(VisualStyle.fromPreference(style));
+        String theme = shortcut != null ? shortcut.getExtra("controlsAccentTheme", "") : "";
+        if (theme.isEmpty()) theme = preferences.getString("input_accent_theme", AccentTheme.CYAN.name());
+        inputControlsView.setAccentTheme(AccentTheme.fromPreference(theme));
+    }
 
-        if (selectedProfile == null
-                && selectedProfileIndex >= 0
-                && selectedProfileIndex < profiles.size()) {
-            selectedProfile = profiles.get(selectedProfileIndex);
+    private ControlsProfile resolvePreferredStartupProfile() {
+        if (shortcut == null) return null;
+        String cp = shortcut.getExtra("controlsProfile", "");
+        if (cp.isEmpty()) return null;
+        ControlsProfile selectedProfile;
+        try {
+            selectedProfile = inputControlsManager.getProfile(Integer.parseInt(cp));
+        } catch (NumberFormatException e) {
+            return null;
         }
 
         if (selectedProfile != null) {
@@ -5125,14 +8036,11 @@ private ControlsProfile resolvePreferredStartupProfile() {
     }
 
     private void simulateConfirmInputControlsDialog() {
-        // Simulate setting the relative mouse movement and touchscreen controls from preferences
-
-        boolean isShowTouchscreenControls = preferences.getBoolean("show_touchscreen_controls_enabled", false); // default is false (hidden)
+        boolean isShowTouchscreenControls = preferences.getBoolean("show_touchscreen_controls_enabled", false);
         inputControlsView.setShowTouchscreenControls(isShowTouchscreenControls);
 
         boolean isHapticsEnabled = preferences.getBoolean("touchscreen_haptics_enabled", false);
 
-        // Apply these settings as if the user confirmed the dialog
         SharedPreferences.Editor editor = preferences.edit();
         editor.putBoolean("touchscreen_haptics_enabled", isHapticsEnabled);
         editor.apply();
@@ -5145,13 +8053,14 @@ private void simulateConfirmInputControlsDialog() {
 
         Log.d("XServerDisplayActivity", "Input controls simulated confirmation executed. startupProfile=" + (startupProfile != null ? startupProfile.getName() : "none"));
 
+        evaluateControllerAutoHide();
         controllerAutoSwitchRunnable = null;
     }
 
     private void startTouchscreenTimeout() {
         if (inputControlsView == null || touchpadView == null) return;
         touchpadView.setOnTouchListener(null);
-        if (hasActiveTouchscreenProfile()) {
+        if (!controllerHudMode && inputControlsRevealAllowed && hasActiveTouchscreenProfile()) {
             inputControlsView.setVisibility(View.VISIBLE);
         }
     }
@@ -5161,8 +8070,10 @@ private void showInputControls(ControlsProfile profile) {
             hideInputControls();
             return;
         }
-        inputControlsView.setVisibility(View.VISIBLE);
-        inputControlsView.requestFocus();
+        if (inputControlsRevealAllowed) {
+            inputControlsView.setVisibility(View.VISIBLE);
+            inputControlsView.requestFocus();
+        }
         inputControlsView.setProfile(profile);
         applyTouchscreenOverlayPreference();
         persistSelectedProfile(profile);
@@ -5177,6 +8088,8 @@ private void showInputControls(ControlsProfile profile) {
             winHandler.sendGamepadState();
         }
         startTouchscreenTimeout();
+        // In controller-HUD mode the on-screen controls stay hidden even though the profile is set.
+        if (controllerHudMode) inputControlsView.setVisibility(View.GONE);
     }
 
     private void hideInputControls() {
@@ -5201,14 +8114,12 @@ private void extractGraphicsDriverFiles() {
         Log.i("GraphicsDriverExtraction", "Launch graphics driver selected: graphicsDriver='" +
                 graphicsDriver + "' driverId='" + adrenoToolsDriverId + "'");
 
-        // Re-apply refresh rate now that shortcut is loaded (per-game override may apply)
         applyPreferredRefreshRate();
 
         File rootDir = imageFs.getRootDir();
 
         if (dxwrapper.contains("dxvk")) {
-            int refreshRateOverride = getDxvkFrameRateOverride();
-            DXVKConfigUtils.setEnvVars(this, dxwrapperConfig, envVars, refreshRateOverride);
+            DXVKConfigUtils.setEnvVars(this, dxwrapperConfig, envVars);
             String version = dxwrapperConfig.get("version");
             if (version.equals("1.11.1-sarek")) {
                 Log.d("GraphicsDriverExtraction", "Disabling Wrapper PATCH_OPCONSTCOMP SPIR-V pass");
@@ -5220,19 +8131,82 @@ private void extractGraphicsDriverFiles() {
         }
 
         envVars.put("GALLIUM_DRIVER", "zink");
-        envVars.put("LIBGL_KOPPER_DISABLE", "true");
+        // Kopper off only on the Steam path; normal GL needs it on to present.
+        if (isSteamShortcut()) {
+            envVars.put("LIBGL_KOPPER_DISABLE", "true");
+        }
 
         if (firstTimeBoot) {
             Log.d("XServerDisplayActivity", "First time container boot, re-extracting libs");
             TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/wrapper" + ".tzst", rootDir);
             TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "layers" + ".tzst", rootDir);
-            TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/extra_libs" + ".tzst", rootDir);
-            if (wineInfo != null && wineInfo.isArm64EC() && !GPUInformation.getRenderer(null, null).contains("Mali")) {
-                try {
-                    TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/zink_dlls.tzst", new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows"));
-                } catch (Exception e) {
-                    Log.w("XServerDisplayActivity", "zink_dlls.tzst not found or extraction failed", e);
+            // extra_libs.tzst handled by the version-aware block below (covers first boot too).
+        }
+
+        // safe to re-extract: the tzst holds only usr/lib/*.so + usr/share/vulkan/*, no home/drive_c
+        try {
+            File extraLibsMarker = new File(rootDir, "usr/lib/.extra_libs_version");
+            int installedExtraLibsVer = -1;
+            if (extraLibsMarker.exists()) {
+                try { installedExtraLibsVer = Integer.parseInt(FileUtils.readString(extraLibsMarker).trim()); }
+                catch (Exception ignored) {}
+            }
+            if (installedExtraLibsVer != EXTRA_LIBS_VERSION) {
+                Log.i("XServerDisplayActivity", "extra_libs outdated (installed=" + installedExtraLibsVer
+                        + " bundled=" + EXTRA_LIBS_VERSION + ") — re-extracting");
+                TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/extra_libs.tzst", rootDir);
+                FileUtils.writeString(extraLibsMarker, String.valueOf(EXTRA_LIBS_VERSION));
+            }
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity", "extra_libs version check failed", e);
+        }
+
+        // FFmpeg 8 libs for Wine's winedmo media path (arm64ec native Wine only; these
+        // aarch64 libs are inert under x86_64/box64). Extract into usr/lib when absent
+        // so existing containers get it without a full imagefs reinstall.
+        if (wineInfo != null && wineInfo.isArm64EC()
+                && !new File(rootDir, "usr/lib/libavcodec.so.62").exists()) {
+            try {
+                TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "ffmpeg8.tzst", rootDir);
+            } catch (Exception e) {
+                Log.w("XServerDisplayActivity", "ffmpeg8.tzst extraction failed", e);
+            }
+        }
+
+        boolean wantLeegao = "wrapper-leegao".equals(graphicsDriver);
+        boolean wantGamenative = "wrapper-gamenative".equals(graphicsDriver);
+        File leegaoMarker = new File(rootDir, "usr/lib/.wrapper_leegao");
+        File gamenativeMarker = new File(rootDir, "usr/lib/.wrapper_gamenative");
+        if (wantLeegao) {
+            TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/wrapper-leegao.tzst", rootDir);
+            try { leegaoMarker.createNewFile(); } catch (IOException ignored) {}
+            gamenativeMarker.delete();
+        } else if (wantGamenative) {
+            TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/wrapper-gamenative.tzst", rootDir);
+            try { gamenativeMarker.createNewFile(); } catch (IOException ignored) {}
+            leegaoMarker.delete();
+        } else if (leegaoMarker.exists() || gamenativeMarker.exists()) {
+            TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/wrapper" + ".tzst", rootDir);
+            TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "layers" + ".tzst", rootDir);
+            leegaoMarker.delete();
+            gamenativeMarker.delete();
+        }
+
+        // libgallium_wgl.dll is present only while Windows Zink is installed — use as marker.
+        if (wineInfo != null && wineInfo.isArm64EC()
+                && !GPUInformation.getRenderer(null, null).contains("Mali")) {
+            File winWindowsDir = new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows");
+            File zinkMarker = new File(winWindowsDir, "system32/libgallium_wgl.dll");
+            if ("windows".equals(zinkMode)) {
+                if (!zinkMarker.exists()) {
+                    try {
+                        TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "graphics_driver/zink_dlls.tzst", winWindowsDir);
+                    } catch (Exception e) {
+                        Log.w("XServerDisplayActivity", "zink_dlls.tzst extraction failed", e);
+                    }
                 }
+            } else if (zinkMarker.exists()) {
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, "opengl32.dll", "libgallium_wgl.dll");
             }
         }
 
@@ -5246,6 +8220,7 @@ private void extractGraphicsDriverFiles() {
                     adrenoToolsDriverId + "' name='" + driverDisplayName +
                     "' version='" + driverVersion + "' library='" + driverLibrary + "'");
             adrenotoolsManager.setDriverById(envVars, imageFs, adrenoToolsDriverId);
+            if (wantLeegao) envVars.put("ADRENOTOOLS_HOOKS_PATH", imageFs.getLibDir().getPath());
             Log.i("GraphicsDriverExtraction", "Loaded graphics/Turnip driver env: id='" +
                     adrenoToolsDriverId + "' path=" +
                     envVars.get("ADRENOTOOLS_DRIVER_PATH") + " name=" +
@@ -5261,12 +8236,18 @@ private void extractGraphicsDriverFiles() {
         envVars.put("VK_ICD_FILENAMES", imageFs.getShareDir() + "/vulkan/icd.d/wrapper_icd.aarch64.json");
 
         String vulkanVersion = graphicsDriverConfig.get("vulkanVersion");
-        if (vulkanVersion == null) vulkanVersion = "1.3";
+        if (vulkanVersion == null) vulkanVersion = "1.4";
         try {
             String fullVkVersion = GPUInformation.getVulkanVersion(adrenoToolsDriverId, this);
             if (fullVkVersion != null && fullVkVersion.contains(".")) {
                 String[] parts = fullVkVersion.split("\\.");
                 if (parts.length >= 3) {
+                    // Never advertise a minor the driver does not implement.
+                    if (Integer.parseInt(parts[1]) < Integer.parseInt(vulkanVersion.split("\\.")[1])) {
+                        Log.i("GraphicsDriverExtraction", "Clamping Vulkan " + vulkanVersion
+                                + " to driver-supported " + parts[0] + "." + parts[1]);
+                        vulkanVersion = parts[0] + "." + parts[1];
+                    }
                     vulkanVersion = vulkanVersion + "." + parts[2];
                 }
             }
@@ -5301,10 +8282,6 @@ private void extractGraphicsDriverFiles() {
         envVars.put("WRAPPER_RESOURCE_TYPE", resourceType);
 
         ArrayList<String> wsiDebugFlags = new ArrayList<>();
-        if (!isNativeRenderingEnabled) {
-            wsiDebugFlags.add("sw");
-            envVars.put("LIBGL_DRI3_DISABLE", "1");
-        }
         String syncFrame = graphicsDriverConfig.get("syncFrame");
         if ("1".equals(syncFrame)) {
             wsiDebugFlags.add("forcesync");
@@ -5312,7 +8289,6 @@ private void extractGraphicsDriverFiles() {
         if (!wsiDebugFlags.isEmpty()) {
             envVars.put("MESA_VK_WSI_DEBUG", String.join(",", wsiDebugFlags));
         }
-        Log.d("NativeRendering", "use_dri3=" + isNativeRenderingEnabled + " MESA_VK_WSI_DEBUG=" + envVars.get("MESA_VK_WSI_DEBUG"));
 
         String disablePresentWait = graphicsDriverConfig.get("disablePresentWait");
         envVars.put("WRAPPER_DISABLE_PRESENT_WAIT", disablePresentWait);
@@ -5320,16 +8296,20 @@ private void extractGraphicsDriverFiles() {
         String bcnEmulation = graphicsDriverConfig.get("bcnEmulation");
         String bcnEmulationType = graphicsDriverConfig.get("bcnEmulationType");
 
+        int gpuVendorId = GPUInformation.getVendorID(null, null);
+        // BCn compute shaders are unsupported on Adreno and crash on Xclipse with this wrapper
+        boolean excludeBcnCompute = gpuVendorId == 20803 || (wantGamenative && gpuVendorId == 0x144D);
+
         switch (bcnEmulation) {
             case "auto" -> {
-                if ("compute".equals(bcnEmulationType)) {
+                if ("compute".equals(bcnEmulationType) && !excludeBcnCompute) {
                     envVars.put("ENABLE_BCN_COMPUTE", "1");
                     envVars.put("BCN_COMPUTE_AUTO", "1");
                 }
                 envVars.put("WRAPPER_EMULATE_BCN", "3");
             }
             case "full" -> {
-                if ("compute".equals(bcnEmulationType)) {
+                if ("compute".equals(bcnEmulationType) && !excludeBcnCompute) {
                     envVars.put("ENABLE_BCN_COMPUTE", "1");
                     envVars.put("BCN_COMPUTE_AUTO", "0");
                 }
@@ -5339,6 +8319,13 @@ private void extractGraphicsDriverFiles() {
             default -> envVars.put("WRAPPER_EMULATE_BCN", "1");
         }
 
+        if (wantGamenative) {
+            String transcoder = graphicsDriverConfig.get("transcoder");
+            envVars.put("WRAPPER_BCN_GPU", "gpu".equalsIgnoreCase(transcoder) ? "1" : "0");
+            String wrapperQuality = graphicsDriverConfig.get("quality");
+            envVars.put("WRAPPER_ASTC_BLOCK", "high".equalsIgnoreCase(wrapperQuality) ? "4x4" : "8x8");
+        }
+
         String bcnEmulationCache = graphicsDriverConfig.get("bcnEmulationCache");
         envVars.put("WRAPPER_USE_BCN_CACHE", bcnEmulationCache);
 
@@ -5346,6 +8333,15 @@ private void extractGraphicsDriverFiles() {
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
+        handleDrawerEdgeSwipe(event);
+
+        // Drop paused input after the drawer edge-swipe check to avoid ANRs.
+        if (isInputSuspended() && (drawerStateHolder == null ||
+                (!drawerStateHolder.isDrawerOpen() && !drawerStateHolder.isPaneOpen()))) {
+
+            return true;
+        }
+
         return super.dispatchTouchEvent(event);
     }
 
@@ -5379,7 +8375,8 @@ private void handleDrawerEdgeSwipe(MotionEvent event) {
                 float dy = event.getY(pointerIndex) - drawerEdgeGestureStartY;
                 int slop = android.view.ViewConfiguration.get(this).getScaledTouchSlop();
 
-                if (dx > slop && dx > Math.abs(dy)) {
+                if (dx > getDrawerOpenTriggerPx()
+                        && dx > Math.abs(dy) * XServerDisplayHostKt.XSERVER_DRAWER_OPEN_HORIZONTAL_RATIO) {
                     if (touchpadView != null) {
                         touchpadView.resetInputState();
                     }
@@ -5404,6 +8401,10 @@ private int getDrawerEdgeSwipePx() {
         return (int) (XServerDisplayHostKt.XSERVER_DRAWER_EDGE_SWIPE_DP * getResources().getDisplayMetrics().density);
     }
 
+    private int getDrawerOpenTriggerPx() {
+        return (int) (XServerDisplayHostKt.XSERVER_DRAWER_OPEN_TRIGGER_DP * getResources().getDisplayMetrics().density);
+    }
+
     private boolean isTouchInsideMagnifier(float x, float y) {
         return magnifierView != null
                 && magnifierView.getParent() != null
@@ -5420,10 +8421,37 @@ private void resetDrawerEdgeGesture() {
 
     @Override
     public boolean dispatchGenericMotionEvent(MotionEvent event) {
+        if (drawerStateHolder != null && (drawerStateHolder.isDrawerOpen() || drawerStateHolder.isPaneOpen())
+                && isControllerMotionEvent(event)) {
+            float ax = event.getAxisValue(MotionEvent.AXIS_X);
+            float ay = event.getAxisValue(MotionEvent.AXIS_Y);
+            float hx = event.getAxisValue(MotionEvent.AXIS_HAT_X);
+            float hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
+            int dir = 0;
+            if (ax < -0.5f || hx < -0.5f) dir = 1;
+            else if (ax > 0.5f || hx > 0.5f) dir = 2;
+            else if (ay < -0.5f || hy < -0.5f) dir = 3;
+            else if (ay > 0.5f || hy > 0.5f) dir = 4;
+            if (dir != drawerStickDir) {
+                drawerStickDir = dir;
+                drawerStickHandler.removeCallbacks(drawerStickRepeat);
+                if (dir != 0) {
+                    fireDrawerStickDir(dir);
+                    drawerStickHandler.postDelayed(drawerStickRepeat, 350);
+                }
+            }
+            return true;
+        }
+        if (isInputSuspended() && (drawerStateHolder == null ||
+                (!drawerStateHolder.isDrawerOpen() && !drawerStateHolder.isPaneOpen()))) {
+
+            return true;
+        }
+
         boolean handledByWinHandler = false;
         boolean handledByTouchpadView = false;
 
-        if (isPointerMotionEvent(event) && touchpadView != null) {
+        if (!isInputSuspended() && isPointerMotionEvent(event) && touchpadView != null) {
             if (shouldUsePointerCapture() && !touchpadView.hasPointerCapture()) {
                 updatePointerCapture();
             }
@@ -5434,7 +8462,7 @@ public boolean dispatchGenericMotionEvent(MotionEvent event) {
             return true;
         }
 
-        if (isControllerMotionEvent(event)) {
+        if (!isInputSuspended() && isControllerMotionEvent(event)) {
             cancelMousePointerTimeout();
             if (touchpadView != null) {
                 touchpadView.cancelMousePointerTimeout();
@@ -5448,10 +8476,8 @@ public boolean dispatchGenericMotionEvent(MotionEvent event) {
             if (handledByWinHandler) return true;
         }
 
-        // Pass the event to the super method to ensure system-level handling
         boolean handledBySuper = super.dispatchGenericMotionEvent(event);
 
-        // Combine the results: any handler consuming the event indicates it was handled
         return handledByWinHandler || handledByTouchpadView || handledBySuper;
     }
 
@@ -5460,6 +8486,55 @@ public boolean dispatchGenericMotionEvent(MotionEvent event) {
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
+        if (drawerStateHolder != null && (drawerStateHolder.isDrawerOpen() || drawerStateHolder.isPaneOpen())
+                && ExternalController.isGameController(event.getDevice())) {
+            drawerStateHolder.updateControllerConnected(true);
+            int kc = event.getKeyCode();
+            boolean down = event.getAction() == KeyEvent.ACTION_DOWN;
+            if (kc == KeyEvent.KEYCODE_BUTTON_MODE) {
+                // Menu open: a fresh press closes it; suppress the tail of the hold that opened it.
+                if (down && event.getEventTime() - guideMenuOpenedAt > GUIDE_HOLD_TAIL_MS) {
+                    guideMenuOpenedAt = 0L;
+                    handleNavigationBackPressed();
+                }
+                return true;
+            }
+            if (kc == KeyEvent.KEYCODE_BUTTON_B) {
+                if (down) handleNavigationBackPressed();
+                return true;
+            }
+            if (down) {
+                if (!drawerStateHolder.isPaneOpen()) {
+                    if (kc == KeyEvent.KEYCODE_DPAD_LEFT) {
+                        drawerStateHolder.menuNavLeft();
+                    } else if (kc == KeyEvent.KEYCODE_DPAD_RIGHT) {
+                        drawerStateHolder.menuNavRight();
+                    } else if (kc == KeyEvent.KEYCODE_DPAD_UP) {
+                        drawerStateHolder.menuNavUp();
+                    } else if (kc == KeyEvent.KEYCODE_DPAD_DOWN) {
+                        drawerStateHolder.menuNavDown();
+                    } else if (kc == KeyEvent.KEYCODE_BUTTON_A || kc == KeyEvent.KEYCODE_DPAD_CENTER) {
+                        drawerStateHolder.menuActivate();
+                    }
+                } else {
+                    if (kc == KeyEvent.KEYCODE_DPAD_UP) {
+                        drawerStateHolder.paneNavUp();
+                    } else if (kc == KeyEvent.KEYCODE_DPAD_DOWN) {
+                        drawerStateHolder.paneNavDown();
+                    } else if (kc == KeyEvent.KEYCODE_DPAD_LEFT) {
+                        drawerStateHolder.paneNavLeft();
+                    } else if (kc == KeyEvent.KEYCODE_DPAD_RIGHT) {
+                        drawerStateHolder.paneNavRight();
+                    } else if (kc == KeyEvent.KEYCODE_BUTTON_A || kc == KeyEvent.KEYCODE_DPAD_CENTER) {
+                        drawerStateHolder.paneActivate();
+                    } else if (kc == KeyEvent.KEYCODE_BUTTON_X) {
+                        drawerStateHolder.paneSecondary();
+                    }
+                }
+            }
+            return true;
+        }
+        if (isInputSuspended()) return super.dispatchKeyEvent(event);
         if (ExternalController.isGameController(event.getDevice())) {
             cancelMousePointerTimeout();
             if (touchpadView != null) {
@@ -5494,9 +8569,25 @@ public boolean dispatchKeyEvent(KeyEvent event) {
             }
         }
 
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BUTTON_MODE) {
+            // Menu closed: hold the guide button to open (a quick tap does nothing). Timer-based, so a
+            // missed release can never leave it stuck.
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (!guideHoldPending) {
+                    guideHoldPending = true;
+                    handler.removeCallbacks(guideHoldOpenRunnable);
+                    handler.postDelayed(guideHoldOpenRunnable, GUIDE_HOLD_OPEN_MS);
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                guideHoldPending = false;
+                handler.removeCallbacks(guideHoldOpenRunnable);
+            }
+            return true;
+        }
+
+
         if (event.getAction() == KeyEvent.ACTION_DOWN &&
-                (event.getKeyCode() == KeyEvent.KEYCODE_BUTTON_MODE ||
-                 event.getKeyCode() == KeyEvent.KEYCODE_HOME ||
+                (event.getKeyCode() == KeyEvent.KEYCODE_HOME ||
                  event.getKeyCode() == KeyEvent.KEYCODE_BUTTON_SELECT)) {
             return true;
         }
@@ -5510,8 +8601,37 @@ public InputControlsView getInputControlsView() {
 
     private static final String TAG = "DXWrapperExtraction";
 
+    private static final String[] DXWRAPPER_DLLS = {
+            "d3d10.dll", "d3d10_1.dll", "d3d10core.dll",
+            "d3d11.dll", "d3d12.dll", "d3d12core.dll",
+            "d3d8.dll", "d3d9.dll", "dxgi.dll",
+            "ddraw.dll", "d3dimm.dll"
+    };
+
+    private void wipeDxwrapperDllsForReextract() {
+        if (imageFs == null) return;
+        File rootDir = imageFs.getRootDir();
+        File system32 = new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows/system32");
+        File syswow64 = new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows/syswow64");
+        int deleted = 0;
+        for (String name : DXWRAPPER_DLLS) {
+            if (name.equals("d3d10.dll") || name.equals("d3d10_1.dll")
+                    || name.equals("d3d8.dll") || name.equals("d3dimm.dll")) continue;
+            File a = new File(system32, name);
+            File b = new File(syswow64, name);
+            if (a.exists() && a.delete()) deleted++;
+            if (b.exists() && b.delete()) deleted++;
+        }
+        if (deleted > 0) {
+            Log.i("XServerDisplayActivity",
+                    "DXVK/VKD3D pre-extract wipe removed " + deleted + " stale DLL(s) from system32/syswow64");
+        }
+    }
+
     private void extractDXWrapperFiles(String dxwrapper) {
-        final String[] dlls = {"d3d10.dll", "d3d10_1.dll", "d3d10core.dll", "d3d11.dll", "d3d12.dll", "d3d12core.dll", "d3d8.dll", "d3d9.dll", "dxgi.dll", "ddraw.dll", "d3dimm.dll"};
+        final String[] dlls = DXWRAPPER_DLLS;
+        final String[] d3d12Dlls = {"d3d12.dll", "d3d12core.dll"};
+        final String[] nonD3D12WrapperDlls = {"d3d10.dll", "d3d10_1.dll", "d3d10core.dll", "d3d11.dll", "d3d8.dll", "d3d9.dll", "dxgi.dll", "ddraw.dll", "d3dimm.dll"};
 
         File rootDir = imageFs.getRootDir();
         File windowsDir = new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows");
@@ -5523,35 +8643,49 @@ private void extractDXWrapperFiles(String dxwrapper) {
             String vkd3dWrapper = dxwrapper.split(";")[1];
             String ddrawrapper = dxwrapper.split(";")[2];
             
-            ContentProfile dxvkProfile = contentsManager.getProfileByEntryName(dxvkWrapper);
-            if (dxvkProfile != null) {
-                Log.d(TAG, "Applying user-defined DXVK content profile: " + dxvkWrapper);
-                contentsManager.applyContent(dxvkProfile);
-                extractD8VKIfNeeded(dxvkWrapper, windowsDir);
+            if (hasSelectedDxvkWrapper(dxvkWrapper)) {
+                ContentProfile dxvkProfile = contentsManager.getProfileByEntryName(dxvkWrapper);
+                if (dxvkProfile != null) {
+                    Log.d(TAG, "Applying user-defined DXVK content profile: " + dxvkWrapper);
+                    contentsManager.applyContent(dxvkProfile);
+                    extractD8VKIfNeeded(dxvkWrapper, windowsDir);
+                } else {
+                    Log.w(TAG, "DXVK content profile not installed; no bundled DXVK archive will be loaded: " + dxvkWrapper);
+                }
             } else {
-                Log.w(TAG, "DXVK content profile not installed; no bundled DXVK archive will be loaded: " + dxvkWrapper);
+                Log.i(TAG, "Launch DXVK selected: None; restoring non-D3D12 wrapper files");
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, nonD3D12WrapperDlls);
             }
 
             if (vkd3dWrapper.contains("None")) {
                 Log.i(TAG, "Launch VKD3D selected: None; restoring original d3d12");
-                restoreOriginalDllFiles(new String[]{"d3d12.dll", "d3d12core.dll"});
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, d3d12Dlls);
             }
             else {
-                ContentProfile vkd3dProfile = contentsManager.getProfileByEntryName(vkd3dWrapper);
-                if (vkd3dProfile != null) {
-                    Log.i(TAG, "Loading VKD3D content profile: " + vkd3dWrapper);
-                    contentsManager.applyContent(vkd3dProfile);
-                } else {
-                    Log.w(TAG, "VKD3D content profile not installed; no bundled VKD3D archive will be loaded: " + vkd3dWrapper);
-                }
+                applyVkd3dWrapper(vkd3dWrapper);
             }
 
             Log.d(TAG, "Extracting nglide wrapper");
             TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "ddrawrapper/nglide.tzst", windowsDir, onExtractFileListener);
 
-            if (ddrawrapper.equalsIgnoreCase("none") || ddrawrapper.contains("None")) {
+            // Clear any stale D7VK passthrough DLL left from a previous selection.
+            File syswow64Dir = new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows/syswow64");
+            File system32Dir = new File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows/system32");
+            new File(syswow64Dir, "ddraw_.dll").delete();
+            new File(system32Dir, "ddraw_.dll").delete();
+
+            ContentProfile d7vkProfile = findD7vkProfileForDdrawrapper(ddrawrapper);
+            if (d7vkProfile != null) {
+                Log.d(TAG, "Applying D7VK ddraw wrapper: " + ddrawrapper);
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, "ddraw.dll", "d3dimm.dll");
+                File origDdraw = new File(syswow64Dir, "ddraw.dll");
+                File renamedDdraw = new File(syswow64Dir, "ddraw_.dll");
+                if (origDdraw.exists()) FileUtils.copy(origDdraw, renamedDdraw);
+                contentsManager.applyContent(d7vkProfile);
+            }
+            else if (ddrawrapper.equalsIgnoreCase("none") || ddrawrapper.contains("None")) {
                 Log.d(TAG, "No DDRaw wrapper has been selected, restoring original ddraw files");
-                restoreOriginalDllFiles(new String[]{ "ddraw.dll", "d3dimm.dll" });
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, "ddraw.dll", "d3dimm.dll");
             }
             else {
                 if (ddrawrapper.equals("cnc-ddraw"))
@@ -5563,9 +8697,43 @@ private void extractDXWrapperFiles(String dxwrapper) {
 
             Log.d(TAG, "Finished extraction of DXVK wrapper files, version: " + dxwrapper);
         } else if (dxwrapper.contains("wined3d")) {
-            Log.d(TAG, "Restoring original DLL files for wined3d.");
-            restoreOriginalDllFiles(dlls);
+            String vkd3dWrapper = findDelimitedWrapper(dxwrapper, "vkd3d-");
+            if (vkd3dWrapper != null) {
+                Log.d(TAG, "Restoring non-D3D12 wrapper files for WineD3D+VKD3D.");
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, nonD3D12WrapperDlls);
+                applyVkd3dWrapper(vkd3dWrapper);
+            } else {
+                Log.d(TAG, "Restoring original DLL files for wined3d.");
+                WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, dlls);
+            }
+        }
+    }
+
+    private void applyVkd3dWrapper(String vkd3dWrapper) {
+        if (vkd3dWrapper == null || vkd3dWrapper.contains("None")) {
+            Log.i(TAG, "Launch VKD3D selected: None; restoring original d3d12");
+            WinComponentSetup.restoreWineBuiltinDllFiles(imageFs, wineInfo, "d3d12.dll", "d3d12core.dll");
+            return;
+        }
+
+        ContentProfile vkd3dProfile = contentsManager.getProfileByEntryName(vkd3dWrapper);
+        if (vkd3dProfile != null) {
+            Log.i(TAG, "Loading VKD3D content profile: " + vkd3dWrapper);
+            contentsManager.applyContent(vkd3dProfile);
+        } else {
+            Log.w(TAG, "VKD3D content profile not installed; no bundled VKD3D archive will be loaded: " + vkd3dWrapper);
+        }
+    }
+
+    private ContentProfile findD7vkProfileForDdrawrapper(String ddrawrapper) {
+        if (ddrawrapper == null || contentsManager == null) return null;
+        List<ContentProfile> profiles = contentsManager.getProfiles(ContentProfile.ContentType.CONTENT_TYPE_D7VK);
+        if (profiles == null) return null;
+        for (ContentProfile profile : profiles) {
+            if (StringUtils.parseIdentifier(ContentsManager.getEntryName(profile)).equals(ddrawrapper))
+                return profile;
         }
+        return null;
     }
 
     private void extractD8VKIfNeeded(String dxvkWrapper, File windowsDir) {
@@ -5581,192 +8749,61 @@ private void extractD8VKIfNeeded(String dxvkWrapper, File windowsDir) {
         );
     }
 
-    private static int compareVersion(String varA, String varB) {
-        int[] a = parseSemverLoose(varA);
-        int[] b = parseSemverLoose(varB);
-
-        if (a[0] != b[0]) return a[0] - b[0];
-        if (a[1] != b[1]) return a[1] - b[1];
-        return a[2] - b[2];
-    }
-
-    private static final Pattern SEMVER_LOOSE =
-            Pattern.compile("(\\d+)\\.(\\d+)(?:\\.(\\d+))?");
-
-    private static int[] parseSemverLoose(String s) {
-        if (s == null) return new int[]{0, 0, 0};
-
-        Matcher m = SEMVER_LOOSE.matcher(s);
-
-        String g1 = null, g2 = null, g3 = null;
-        while (m.find()) {
-            g1 = m.group(1);
-            g2 = m.group(2);
-            g3 = m.group(3);
-        }
-
-        if (g1 == null || g2 == null) {
-            return new int[]{0, 0, 0};
-        }
-
-        int major = safeParseInt(g1);
-        int minor = safeParseInt(g2);
-        int patch = safeParseInt(g3);
-        return new int[]{major, minor, patch};
-    }
-
-    private static int safeParseInt(String s) {
-        if (s == null || s.isEmpty()) return 0;
-        try {
-            return Integer.parseInt(s);
-        } catch (NumberFormatException ignored) {
-            return 0;
+    // .msi and .bat/.cmd aren't PE images, so CreateProcess can't start them; run them through their interpreter.
+    private static String buildGuestProgramArgs(String windowsPath) {
+        String lower = windowsPath.toLowerCase(java.util.Locale.ROOT);
+        if (lower.endsWith(".msi")) {
+            return "\"C:\\windows\\system32\\msiexec.exe\" /i \"" + windowsPath + "\" /passive /norestart";
         }
-    }
-
-    private void extractWinComponentFiles() {
-        Log.d("XServerDisplayActivity", "Extracting WinComponents");
-        File rootDir = imageFs.getRootDir();
-        File windowsDir = new File(rootDir, ImageFs.WINEPREFIX+"/drive_c/windows");
-        File systemRegFile = new File(rootDir, ImageFs.WINEPREFIX+"/system.reg");
-
-        try {
-            String wincomponentsStr = FileUtils.readString(this, "wincomponents/wincomponents.json");
-            JSONObject wincomponentsJSONObject = new JSONObject(wincomponentsStr != null ? wincomponentsStr : "{}");
-            ArrayList<String> dlls = new ArrayList<>();
-            String wincomponents = shortcut != null ? getShortcutSetting("wincomponents", container.getWinComponents()) : container.getWinComponents();
-
-            Iterator<String[]> oldWinComponentsIter = new KeyValueSet(container.getExtra("wincomponents", Container.FALLBACK_WINCOMPONENTS)).iterator();
-
-            // Bundled wincomponents/*.tzst archives only carry x86_64 PEs in system32/
-            // (and i386 in syswow64/). Extracting them into an ARM64EC prefix poisons
-            // system32 with wrong-arch DLLs, which kills the PE loader for any process
-            // that imports them — e.g. vc_redist refusing to launch.
-            boolean isArm64EC = wineInfo != null && wineInfo.isArm64EC();
-
-            for (String[] wincomponent : new KeyValueSet(wincomponents)) {
-                if (wincomponent[1].equals(oldWinComponentsIter.next()[1]) && !firstTimeBoot) continue;
-                String identifier = wincomponent[0];
-                boolean useNative = wincomponent[1].equals("1");
-
-                if (useNative && !isArm64EC) {
-                    TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, this, "wincomponents/"+identifier+".tzst", windowsDir, onExtractFileListener);
-                }
-                else {
-                    JSONArray dlnames = wincomponentsJSONObject.getJSONArray(identifier);
-                    for (int i = 0; i < dlnames.length(); i++) {
-                        String dlname = dlnames.getString(i);
-                        dlls.add(!dlname.endsWith(".exe") ? dlname+".dll" : dlname);
-                    }
-                }
-                Log.d("XServerDisplayActivity", "Setting wincomponent " + identifier + " to " + useNative
-                        + (useNative && isArm64EC ? " (arm64ec: tzst skipped, restoring arch-correct DLLs)" : ""));
-                WineUtils.overrideWinComponentDlls(this, container, identifier, useNative);
-                WineUtils.setWinComponentRegistryKeys(systemRegFile, identifier, useNative, this);
-            }
-
-            if (!dlls.isEmpty()) restoreOriginalDllFiles(dlls.toArray(new String[0]));
+        if (lower.endsWith(".bat") || lower.endsWith(".cmd")) {
+            return "\"C:\\windows\\system32\\cmd.exe\" /c \"" + windowsPath + "\"";
         }
-        catch (JSONException e) {}
+        return "\"" + windowsPath + "\"";
     }
 
-    private void restoreOriginalDllFiles(final String... dlls) {
-        File rootDir = imageFs.getRootDir();
-        File windowsDir = new File(rootDir, ImageFs.WINEPREFIX+"/drive_c/windows");
-
-        File system32dlls = wineInfo.isArm64EC()
-                ? new File(imageFs.getWinePath() + "/lib/wine/aarch64-windows")
-                : new File(imageFs.getWinePath() + "/lib/wine/x86_64-windows");
-        File syswow64dlls = new File(imageFs.getWinePath() + "/lib/wine/i386-windows");
-
-        for (String dll : dlls) {
-            restoreOneDll(new File(system32dlls, dll), new File(windowsDir, "system32/" + dll));
-            restoreOneDll(new File(syswow64dlls, dll), new File(windowsDir, "syswow64/" + dll));
-        }
-   }
-
-    // Copy src→dst. If src is missing we MUST delete dst; otherwise a stale wrong-arch
-    // PE (e.g. an x86_64 atl100.dll left over from a prior native overlay on an
-    // ARM64EC prefix) sticks around and breaks the PE loader for every process that
-    // imports it.
-    private static void restoreOneDll(File srcFile, File dstFile) {
-        if (srcFile.exists()) {
-            if (!FileUtils.copy(srcFile, dstFile))
-                Log.w("XServerDisplayActivity", "restoreOriginalDllFiles: copy failed " + srcFile + " -> " + dstFile);
-            return;
-        }
-        if (dstFile.exists()) {
-            if (dstFile.delete())
-                Log.w("XServerDisplayActivity", "restoreOriginalDllFiles: no source for " + srcFile + ", deleted stale " + dstFile);
-            else
-                Log.e("XServerDisplayActivity", "restoreOriginalDllFiles: no source for " + srcFile + " and failed to delete stale " + dstFile);
-        }
-   }
-
-    /**
-     * Mount the A: drive on a container, pointing to the given game install path.
-     * Removes any existing A: mapping first.
-     */
-    /**
-     * Mount the A: drive on a container using an ephemeral dosdevices symlink.
-     * This avoids polluting the container's persistent drives setting, so multiple
-     * games sharing a container don't overwrite each other's A: mapping.
-     */
     private String getWineStartCommand(GuestProgramLauncherComponent launcherComponent) {
-        // Initialize overrideEnvVars if not already done
         EnvVars envVars = getOverrideEnvVars();
-
-        // Define default arguments
         String args = "";
 
-        if (shortcut != null) {
+        if (bootExePath != null && !bootExePath.isEmpty()) {
+            args = buildGuestProgramArgs(bootExePath);
+            if (bootExeArgs != null && !bootExeArgs.isEmpty()) args += " " + bootExeArgs;
+        } else if (shortcut != null) {
             String path = shortcut.path;
             String gameSource = shortcut.getExtra("game_source", "CUSTOM");
             Log.d("XServerDisplayActivity", "getWineStartCommand: gameSource=" + gameSource + " shortcut.path=" + path);
 
-            // Normalize DOS paths like A:EOSBootstrapper.exe to A:\EOSBootstrapper.exe
             if (path != null && path.matches("^[A-Z]:[^\\\\/].*")) {
                 path = path.substring(0, 2) + "\\" + path.substring(2);
             }
 
             if (gameSource.equals("STEAM")) {
                 int appId = Integer.parseInt(shortcut.getExtra("app_id"));
-                String steamExtraArgs = shortcut.getSettingExtra("execArgs", container.getExecArgs());
+                // Reset per launch; set below once the launch exe is resolved.
+                wnSteamDirectExeOverride = false;
+                String steamExtraArgs = appendSteamJoinConnect(
+                        com.winlator.cmod.feature.stores.steam.utils.SteamLaunchOptions
+                                .gameArgs(shortcut.getSettingExtra("execArgs", container.getExecArgs())));
                 steamExtraArgs = (steamExtraArgs != null && !steamExtraArgs.isEmpty()) ? " " + steamExtraArgs : "";
 
                 boolean useColdClient = parseBoolean(getShortcutSetting("useColdClient", container.isUseColdClient() ? "1" : "0"));
-                boolean launchRealSteam = parseBoolean(getShortcutSetting("launchRealSteam", container.isLaunchRealSteam() ? "1" : "0"));
+                boolean launchBionicSteam = isBionicSteamEnabledForShortcut();
+                if (useColdClient) {
+                    launchBionicSteam = false;
+                } else if (launchBionicSteam) {
+                    useColdClient = false;
+                }
 
-                // Pre-resolve: ensure game install path and steamapps/common symlink exist
-                // before ANY launch mode so the Steam directory structure is always valid.
                 String gameInstPath = resolveSteamGameInstallPath(appId);
                 if (gameInstPath != null && new File(gameInstPath).exists()) {
                     WineUtils.ensureSteamappsCommonSymlink(container, gameInstPath);
                 }
 
-                // Resolve working dir through the container's actual filesystem path
-                // (not through getNativePath which can resolve to a different prefix).
                 File containerSteamDir = new File(container.getRootDir(),
                         ".wine/drive_c/Program Files (x86)/Steam");
 
-                if (launchRealSteam) {
-                    // Real Steam mode: launch steam.exe with -applaunch <appId> and let
-                    // Steam handle the game launch normally (update check, cloud sync, exe
-                    // spawn). Cloud pending-ops are cleared pre-launch via javasteam's
-                    // signalAppLaunchIntent(ignorePendingOperations=true) (see
-                    // setupSteamEnvironment). No env var / DLL override hacks — matches the
-                    // reference implementation exactly.
-                    if (containerSteamDir.exists()) launcherComponent.setWorkingDir(containerSteamDir);
-                    args = "\"C:\\Program Files (x86)\\Steam\\steam.exe\" -silent -vgui -tcp "
-                            + "-nobigpicture -nofriendsui -nochatui -nointro -applaunch " + appId;
-                    Log.d("XServerDisplayActivity", "Real Steam launch via steam.exe for appId=" + appId);
-                    scheduleRealSteamWatchdog(launcherComponent);
-                } else if (useColdClient) {
-                    // ColdClient mode: always use x64 loader — IgnoreLoaderArchDifference=1
-                    // in ColdClientLoader.ini handles architecture differences.
-                    // cwd goes to the actual game dir (not Steam root) so games that resolve
-                    // assets/configs relative to cwd find them. The loader itself is path-agnostic;
-                    // it reads ColdClientLoader.ini from the Steam dir by absolute Windows path.
+                if (useColdClient) {
+                    // ColdClient needs the game exe dir for relative assets.
                     File coldClientWorkDir = null;
                     String gameDirNameCC = (gameInstPath != null) ? new File(gameInstPath).getName() : "";
                     String relativeExeCC = resolveRelativeGameExe(appId, gameInstPath);
@@ -5793,18 +8830,16 @@ private String getWineStartCommand(GuestProgramLauncherComponent launcherCompone
                     args = "\"C:\\Program Files (x86)\\Steam\\steamclient_loader_x64.exe\"";
                     Log.d("XServerDisplayActivity", "ColdClient launch via steamclient_loader_x64.exe for appId=" + appId);
                 } else {
-                    // Goldberg mode (default): launch game exe through the Steam directory
-                    // structure. The symlink chain resolves automatically:
-                    //   C:\...\Steam → shared store → steamapps/common/<Game> → actual game dir
-                    // This avoids fragile drive-letter resolution and works for all games.
+                    // Goldberg launches through steamapps/common to avoid drive-letter drift.
                     String gameDirName = (gameInstPath != null) ? new File(gameInstPath).getName() : "";
                     String relativeExe = resolveRelativeGameExe(appId, gameInstPath);
+                    // If the resolved exe isn't Steam's configured launch entry the user overrode it; tell the launcher to skip LaunchApp and start the selected exe directly.
+                    wnSteamDirectExeOverride = isUserOverriddenSteamExe(appId, relativeExe);
 
                     if (!relativeExe.isEmpty() && !gameDirName.isEmpty()) {
                         String steamGameExe = "C:\\Program Files (x86)\\Steam\\steamapps\\common\\"
                                 + gameDirName + "\\" + relativeExe.replace("/", "\\");
 
-                        // Set working dir via container filesystem path (follows symlinks to actual game dir)
                         File containerGameDir = new File(containerSteamDir, "steamapps/common/" + gameDirName);
                         File actualWorkDir;
                         try { actualWorkDir = containerGameDir.getCanonicalFile(); }
@@ -5820,14 +8855,25 @@ private String getWineStartCommand(GuestProgramLauncherComponent launcherCompone
                             Log.d("XServerDisplayActivity", "Goldberg working dir: " + actualWorkDir.getPath());
                         }
 
-                        args = "\"" + steamGameExe + "\"" + steamExtraArgs;
                         int lastBackslash = steamGameExe.lastIndexOf("\\");
                         if (lastBackslash > 0) {
                             envVars.put("WINEPATH", steamGameExe.substring(0, lastBackslash));
                         }
-                        Log.d("XServerDisplayActivity", "Goldberg launch: " + steamGameExe);
+                        if (launchBionicSteam) {
+                            boolean planW = com.winlator.cmod.feature.stores.steam.utils
+                                    .PrefManager.INSTANCE.getWnPlanW();
+                            String wrapperExe = planW
+                                    ? "steam.exe" : "wn-steam-helper.exe";
+                            args = "\"C:\\Program Files (x86)\\Steam\\" + wrapperExe
+                                    + "\" \"" + steamGameExe + "\"" + steamExtraArgs;
+                            Log.d("XServerDisplayActivity",
+                                    "Bionic Steam launch via " + wrapperExe
+                                    + " (planW=" + planW + "): " + steamGameExe);
+                        } else {
+                            args = "\"" + steamGameExe + "\"" + steamExtraArgs;
+                            Log.d("XServerDisplayActivity", "Goldberg launch: " + steamGameExe);
+                        }
                     } else {
-                        // Fallback: try direct drive-letter path via findGameExeWinPath
                         String gameExeWinPath = findGameExeWinPath(appId,
                                 new File(gameInstPath != null ? gameInstPath : ""));
                         if (gameExeWinPath != null) {
@@ -5851,11 +8897,6 @@ private String getWineStartCommand(GuestProgramLauncherComponent launcherCompone
                 extraArgs = (extraArgs != null && !extraArgs.isEmpty()) ? " " + extraArgs : "";
                 String gameInstallPath = shortcut.getExtra("game_install_path");
 
-                // Re-provision the per-container C:\WinNative\Games\<source>\<game> symlink in
-                // the CURRENT container. Needed after a user changes the shortcut's container
-                // via Settings — the symlink was only created in the original container, so the
-                // healthy C:\WinNative\... Exec would otherwise resolve to nothing in the new
-                // prefix. Mirrors Steam's ensureSteamappsCommonSymlink call above.
                 String storeInstallPath = shortcut.getExtra("game_install_path");
                 if (storeInstallPath != null && !storeInstallPath.isEmpty()
                         && new File(storeInstallPath).exists()) {
@@ -5920,16 +8961,10 @@ && new File(storeInstallPath).exists()) {
                     Log.d("XServerDisplayActivity", "Set native working dir for store process: " + nativeDir.getPath());
                 }
 
-                if (wineInfo != null && wineInfo.isArm64EC()) {
-                    String epicCommand = dir + (dir.endsWith("\\") ? "" : "\\") + filename;
-                    args = "\"" + epicCommand + "\"" + extraArgs;
-                } else {
-                    // Avoid StringUtils.escapeDOSPath here as it might double-escape
-                    args = "/dir \"" + dir + "\" \"" + filename + "\"" + extraArgs;
-                }
+                String storeCommand = dir + (dir.endsWith("\\") ? "" : "\\") + filename;
+                args = "\"" + storeCommand + "\"" + extraArgs;
                 Log.d("XServerDisplayActivity", gameSource + " game launch: " + args);
             } else {
-                // Custom shortcut
                 String extraArgs = shortcut.getSettingExtra("execArgs", container.getExecArgs());
                 extraArgs = (extraArgs != null && !extraArgs.isEmpty()) ? " " + extraArgs : "";
                 String customResolvedPath = resolveCustomExecutableWinPath(shortcut);
@@ -5959,13 +8994,12 @@ && new File(storeInstallPath).exists()) {
                         }
                     }
 
-                    args = "\"" + path + "\"" + extraArgs;
+                    args = buildGuestProgramArgs(path) + extraArgs;
                 } else {
                     args = "\"wfm.exe\"";
                 }
             }
         } else {
-            // No shortcut, check for override args or launch file manager
             if (envVars.has("EXTRA_EXEC_ARGS")) {
                 args = envVars.get("EXTRA_EXEC_ARGS");
                 envVars.remove("EXTRA_EXEC_ARGS");
@@ -5974,7 +9008,6 @@ && new File(storeInstallPath).exists()) {
             }
         }
 
-        // Apply winhandler.exe wrapper ONLY IF we have arguments for it and it's not already a command
         if (!args.isEmpty() && !args.startsWith("winhandler.exe") && !args.startsWith("explorer")) {
             return "winhandler.exe " + args;
         } else {
@@ -5992,11 +9025,6 @@ private String getExecutable() {
         return filename;
     }
 
-    /**
-     * Verifies essential Steam client files exist in the wine prefix.
-     * The xuser symlink ensures extraction goes to the active container,
-     * but if files are missing (e.g. after prefix repair), force re-extraction.
-     */
     private boolean verifySteamClientFiles(boolean requireColdClientSupport) {
         File steamDir = new File(container.getRootDir(), ".wine/drive_c/Program Files (x86)/Steam");
         String[] criticalFiles = requireColdClientSupport
@@ -6008,7 +9036,7 @@ private boolean verifySteamClientFiles(boolean requireColdClientSupport) {
                     "SteamUI.dll",
                     "steam.signatures",
                     "steamclient_loader_x64.exe",
-                    "extra_dlls/steamclient_extra_x64.dll"
+                    "extra_dlls/StubDRM64.dll"
                 }
                 : new String[] {
                     "steam.exe",
@@ -6027,9 +9055,6 @@ private boolean verifySteamClientFiles(boolean requireColdClientSupport) {
 
         if (!allPresent) {
             Log.w("XServerDisplayActivity", "Steam client files missing in container, forcing re-extraction");
-            // Force re-extraction by extracting the archive required by the active mode.
-            // Real Steam mode uses steam.tzst. ColdClient mode uses only experimental-drm.tzst
-            // so normal Steam game launches do not download or unpack the full Steam client.
             try {
                 File steamFile = new File(getFilesDir(), "steam.tzst");
                 File expFile = new File(getFilesDir(), "experimental-drm.tzst");
@@ -6069,11 +9094,6 @@ private boolean areSteamFilesPresent(File steamDir, String[] relativePaths) {
         return true;
     }
 
-    /**
-     * Generates steam_interfaces.txt for all steam_api DLLs in the game directory.
-     * Used in ColdClient mode where the original DLLs remain but Goldberg steamclient
-     * still needs to know which interfaces the game expects.
-     */
     private void generateSteamInterfacesForGame(File gameDir) {
         if (gameDir == null || !gameDir.exists()) return;
         File[] files = gameDir.listFiles();
@@ -6085,18 +9105,12 @@ private void generateSteamInterfacesForGame(File gameDir) {
             } else if (file.isFile()) {
                 String name = file.getName().toLowerCase();
                 if (name.equals("steam_api.dll") || name.equals("steam_api64.dll")) {
-                    // In ColdClient mode the DLL is the original (not replaced),
-                    // so scan it directly for interface strings
                     generateSteamInterfacesFromDll(file.getParentFile(), file);
                 }
             }
         }
     }
 
-    /**
-     * Generates steam_interfaces.txt by scanning a DLL (original or backup) for
-     * Steam interface version strings (e.g., SteamUser023, SteamApps008).
-     */
     private void generateSteamInterfacesFromDll(File dir, File dllFile) {
         File interfacesFile = new File(dir, "steam_interfaces.txt");
         if (interfacesFile.exists()) return;
@@ -6142,10 +9156,6 @@ private void generateSteamInterfacesFromDll(File dir, File dllFile) {
         }
     }
 
-    /**
-     * Writes ColdClientLoader.ini from a known relative exe path and game directory name.
-     * This avoids the fragile Windows-path-to-relative conversion in writeColdClientIniForLaunch.
-     */
     private void writeColdClientIniDirect(int appId, String gameDirName, String relativeExe, boolean runtimePatcher) {
         File iniFile = new File(container.getRootDir(), ".wine/drive_c/Program Files (x86)/Steam/ColdClientLoader.ini");
         iniFile.getParentFile().mkdirs();
@@ -6158,44 +9168,68 @@ private void writeColdClientIniDirect(int appId, String gameDirName, String rela
         }
 
         String perGameExecArgs = shortcut != null ? shortcut.getSettingExtra("execArgs", container.getExecArgs()) : container.getExecArgs();
-        String exeCommandLine = perGameExecArgs != null ? perGameExecArgs : "";
-
-        // IgnoreLoaderArchDifference=1 is always needed so the x64 loader can spawn
-        // x86 games. DllsToInjectFolder is only included when the user opts into the
-        // Runtime DRM Patcher — that's when extra_dlls/steamclient_extra_{x32,x64}.dll
-        // (Goldberg's runtime DRM patcher) is injected. Non-DRM games don't benefit
-        // from injection and pay per-frame hook overhead, hence the opt-in toggle.
-        StringBuilder injectionBuilder = new StringBuilder("[Injection]\nIgnoreLoaderArchDifference=1\n");
-        if (runtimePatcher) {
-            injectionBuilder.append("DllsToInjectFolder=extra_dlls\n");
-        }
-        String injectionSection = injectionBuilder.toString();
-
-        String iniContent = "[SteamClient]\n" +
-                "\n" +
-                "Exe=" + exePath + "\n" +
-                "ExeRunDir=" + exeRunDir + "\n" +
-                "ExeCommandLine=" + exeCommandLine + "\n" +
-                "AppId=" + appId + "\n" +
-                "\n" +
-                "# path to the steamclient dlls, both must be set, absolute paths or relative to the loader directory\n" +
-                "SteamClientDll=steamclient.dll\n" +
-                "SteamClient64Dll=steamclient64.dll\n" +
-                "\n" +
-                injectionSection;
+        String exeCommandLine = appendSteamJoinConnect(com.winlator.cmod.feature.stores.steam.utils.SteamLaunchOptions.gameArgs(perGameExecArgs));
+
+        String iniContent = buildColdClientIni(appId, exePath, exeRunDir, exeCommandLine, runtimePatcher);
 
         FileUtils.writeString(iniFile, iniContent);
+        if (runtimePatcher) ensureExtraDllsLoadOrder();
         Log.d("XServerDisplayActivity",
                 "Wrote ColdClientLoader.ini: Exe=" + exePath + " ExeRunDir=" + exeRunDir
                         + " AppId=" + appId + " runtimePatcher=" + runtimePatcher);
     }
 
-    /**
-     * Writes ColdClientLoader.ini with the correct game exe path for the Goldberg Steam emulator.
-     * Uses a relative path through the steamapps/common symlink so the loader resolves correctly.
-     * @param appId Steam app ID
-     * @param gameExeWinPath Windows-style path to the game exe (e.g. A:\SubDir\game.exe)
-     */
+    // Appends a friend's join connect string to the game's launch arguments.
+    private String appendSteamJoinConnect(String args) {
+        String joinConnect = getIntent().getStringExtra("steam_join_connect");
+        if (joinConnect == null || joinConnect.trim().isEmpty()) return args != null ? args : "";
+        joinConnect = joinConnect.trim();
+        if (args == null || args.trim().isEmpty()) return joinConnect;
+        return args.trim() + " " + joinConnect;
+    }
+
+    private String buildColdClientIni(int appId, String exePath, String exeRunDir,
+                                       String exeCommandLine, boolean runtimePatcher) {
+        StringBuilder sb = new StringBuilder(1024);
+        sb.append("[SteamClient]\n\n");
+        sb.append("Exe=").append(exePath).append('\n');
+        sb.append("ExeRunDir=").append(exeRunDir).append('\n');
+        sb.append("ExeCommandLine=").append(exeCommandLine).append('\n');
+        sb.append("AppId=").append(appId).append('\n');
+        sb.append('\n');
+        sb.append("# path to the steamclient dlls, both must be set, absolute paths or relative to the loader directory\n");
+        sb.append("SteamClientDll=steamclient.dll\n");
+        sb.append("SteamClient64Dll=steamclient64.dll\n");
+        sb.append('\n');
+        sb.append("[Injection]\n");
+        sb.append("ForceInjectSteamClient=0\n");
+        sb.append("ForceInjectGameOverlayRenderer=0\n");
+        if (runtimePatcher) {
+            sb.append("DllsToInjectFolder=C:\\Program Files (x86)\\Steam\\extra_dlls\n");
+        }
+        sb.append("IgnoreInjectionError=1\n");
+        sb.append("IgnoreLoaderArchDifference=1\n");
+        sb.append('\n');
+        sb.append("[Persistence]\n");
+        sb.append("Mode=0\n");
+        sb.append('\n');
+        sb.append("[Debug]\n");
+        sb.append("ResumeByDebugger=0\n");
+        return sb.toString();
+    }
+
+    private void ensureExtraDllsLoadOrder() {
+        File extraDlls = new File(container.getRootDir(),
+                ".wine/drive_c/Program Files (x86)/Steam/extra_dlls");
+        File stubDrm = new File(extraDlls, "StubDRM64.dll");
+        if (!stubDrm.exists()) return;
+        File loadOrder = new File(extraDlls, "load_order.txt");
+        String body = "StubDRM64.dll\n";
+        if (loadOrder.exists() && body.equals(FileUtils.readString(loadOrder))) return;
+        FileUtils.writeString(loadOrder, body);
+        Log.d("XServerDisplayActivity", "Wrote " + loadOrder.getAbsolutePath());
+    }
+
     private void writeColdClientIniForLaunch(int appId, String gameInstallPath, String gameExeWinPath, boolean runtimePatcher) {
         File iniFile = new File(container.getRootDir(), ".wine/drive_c/Program Files (x86)/Steam/ColdClientLoader.ini");
         iniFile.getParentFile().mkdirs();
@@ -6210,9 +9244,6 @@ private void writeColdClientIniForLaunch(int appId, String gameInstallPath, Stri
             exePath = "";
         }
 
-        // ExeRunDir must match the executable's actual directory inside steamapps/common.
-        // Some Steam games place the launch exe in a nested subdirectory; forcing the game root
-        // causes the loader to start successfully but fail to hand off to the real process.
         String exeRunDir = "steamapps\\common\\" + gameDirName;
         if (!exePath.isEmpty()) {
             int lastSeparator = exePath.lastIndexOf("\\");
@@ -6222,39 +9253,15 @@ private void writeColdClientIniForLaunch(int appId, String gameInstallPath, Stri
         }
 
         String perGameExecArgs = shortcut != null ? shortcut.getSettingExtra("execArgs", container.getExecArgs()) : container.getExecArgs();
-        String exeCommandLine = perGameExecArgs != null ? perGameExecArgs : "";
-
-        // IgnoreLoaderArchDifference=1 is always needed so the x64 loader can spawn
-        // x86 games. DllsToInjectFolder is only included when the user opts into the
-        // Runtime DRM Patcher — that's when extra_dlls/steamclient_extra_{x32,x64}.dll
-        // (Goldberg's runtime DRM patcher) is injected. Non-DRM games don't benefit
-        // from injection and pay per-frame hook overhead, hence the opt-in toggle.
-        StringBuilder injectionBuilder = new StringBuilder("[Injection]\nIgnoreLoaderArchDifference=1\n");
-        if (runtimePatcher) {
-            injectionBuilder.append("DllsToInjectFolder=extra_dlls\n");
-        }
-        String injectionSection = injectionBuilder.toString();
-
-        String iniContent = "[SteamClient]\n" +
-                "\n" +
-                "Exe=" + exePath + "\n" +
-                "ExeRunDir=" + exeRunDir + "\n" +
-                "ExeCommandLine=" + exeCommandLine + "\n" +
-                "AppId=" + appId + "\n" +
-                "\n" +
-                "# path to the steamclient dlls, both must be set, absolute paths or relative to the loader directory\n" +
-                "SteamClientDll=steamclient.dll\n" +
-                "SteamClient64Dll=steamclient64.dll\n" +
-                "\n" +
-                injectionSection;
+        String exeCommandLine = appendSteamJoinConnect(com.winlator.cmod.feature.stores.steam.utils.SteamLaunchOptions.gameArgs(perGameExecArgs));
+
+        String iniContent = buildColdClientIni(appId, exePath, exeRunDir, exeCommandLine, runtimePatcher);
 
         FileUtils.writeString(iniFile, iniContent);
-        Log.d("XServerDisplayActivity", "Wrote ColdClientLoader.ini: Exe=" + exePath + " ExeRunDir=" + exeRunDir + " AppId=" + appId);
+        if (runtimePatcher) ensureExtraDllsLoadOrder();
+        Log.d("XServerDisplayActivity", "Wrote ColdClientLoader.ini: Exe=" + exePath + " ExeRunDir=" + exeRunDir + " AppId=" + appId + " runtimePatcher=" + runtimePatcher);
 
-        // Also update any ColdClientLoader.ini inside the game directory's embedded Steam/ folder.
-        // The experimental-drm extraction creates a full Steam directory inside the game folder
-        // (e.g., Fallout New Vegas/Steam/) with its own ColdClientLoader.ini. If that copy has
-        // a stale/empty ExeRunDir, the loader will pick it up and fail with "Application Load Error".
+        // Embedded Steam/ copies can shadow the main loader config.
         if (gameInstallPath != null) {
             File gameSteamDir = new File(gameInstallPath, "Steam");
             File gameSteamIni = new File(gameSteamDir, "ColdClientLoader.ini");
@@ -6345,14 +9352,19 @@ private String resolveShortcutSteamExecutablePath(String gameInstallPath) {
                 .replace(File.separatorChar, '/');
     }
 
-    /**
-     * Resolves the game executable as a RELATIVE path within the game install directory.
-     * Tries multiple strategies with caching so subsequent launches are fast.
-     * Returns "" if no exe can be found.
-     */
+    /** True when the resolved launch exe differs from Steam's configured entry ({@link SteamBridge#getInstalledExe}); the launcher then skips LaunchApp and CreateProcesses the selected exe. False when the entry is unknown, preserving the default LaunchApp path. */
+    private boolean isUserOverriddenSteamExe(int appId, String resolvedRelativeExe) {
+        if (resolvedRelativeExe == null || resolvedRelativeExe.isEmpty()) return false;
+        String steamDefaultExe = SteamBridge.getInstalledExe(appId);
+        if (steamDefaultExe == null || steamDefaultExe.isEmpty()) return false;
+        String resolved = exeBaseName(resolvedRelativeExe);
+        String configured = exeBaseName(steamDefaultExe);
+        return !resolved.isEmpty() && !configured.isEmpty()
+                && !resolved.equalsIgnoreCase(configured);
+    }
+
     private String resolveRelativeGameExe(int appId, String gameInstPath) {
-        // Strategy 1: shortcut launch_exe_path. This is the user's per-game selection
-        // and must win over the shared container cache.
+        // Per-game launch_exe_path wins over the shared container cache.
         String shortcutExePath = resolveShortcutSteamExecutablePath(gameInstPath);
         if (!shortcutExePath.isEmpty()) {
             if (container != null && !shortcutExePath.equals(container.getExecutablePath())) {
@@ -6363,7 +9375,6 @@ private String resolveRelativeGameExe(int appId, String gameInstPath) {
             return shortcutExePath;
         }
 
-        // Strategy 2: container.executablePath (cached from previous launch or container setup)
         String exePath = container.getExecutablePath();
         if (exePath != null && !exePath.isEmpty() && gameInstPath != null) {
             File test = new File(gameInstPath, exePath.replace("\\", "/"));
@@ -6373,7 +9384,6 @@ private String resolveRelativeGameExe(int appId, String gameInstPath) {
             }
         }
 
-        // Strategy 3: SteamService.getInstalledExe (queries Steam app metadata)
         String steamExe = SteamBridge.getInstalledExe(appId);
         if (steamExe != null && !steamExe.isEmpty() && gameInstPath != null) {
             File test = new File(gameInstPath, steamExe.replace("\\", "/"));
@@ -6389,14 +9399,20 @@ private String resolveRelativeGameExe(int appId, String gameInstPath) {
             }
         }
 
-        // Strategy 4: Auto-detect from game directory using BFS heuristic
         if (gameInstPath != null) {
             File gameDir = new File(gameInstPath);
             if (gameDir.exists()) {
+                String canonicalGameDir = getCanonicalPathOrAbsolute(gameDir);
+                if (isSuspiciousSteamGameInstallDir(canonicalGameDir)) {
+                    Log.w("XServerDisplayActivity",
+                            "resolveRelativeGameExe: refusing auto-detect inside shared Steam library root: "
+                                    + canonicalGameDir + " for appId=" + appId);
+                    return "";
+                }
                 File detected = findGameExe(gameDir);
                 if (detected != null) {
                     String absPath = getCanonicalPathOrAbsolute(detected);
-                    String basePath = getCanonicalPathOrAbsolute(gameDir);
+                    String basePath = canonicalGameDir;
                     if (absPath.startsWith(basePath)) {
                         String relative = absPath.substring(basePath.length());
                         if (relative.startsWith(File.separator)) relative = relative.substring(1);
@@ -6418,10 +9434,6 @@ private String resolveRelativeGameExe(int appId, String gameInstPath) {
         return "";
     }
 
-    /**
-     * Finds the game exe and returns its Windows-style mapped path.
-     * Uses shortcut.path if available, otherwise auto-detects from game install directory.
-     */
     private String findGameExeWinPath(int appId, File gameDir) {
         if (gameDir == null || !gameDir.exists()) return null;
 
@@ -6519,17 +9531,10 @@ private File resolvePathCaseInsensitive(File baseDir, String relativePath) {
         return currentDir;
     }
 
-    /**
-     * Replaces all steam_api.dll / steam_api64.dll in the game directory tree with
-     * steampipe stubs. Generates steam_interfaces.txt BEFORE replacing (from the original),
-     * backs up originals as .orig, writes orig_dll_path.txt,
-     * and calls writeCompleteSettingsDir next to each DLL found.
-     */
     private void injectSteamApiIfMissing(File gameDir, String appDirPath, String language,
-            boolean isOffline, boolean forceDlc, boolean useSteamInput, String ticketBase64, java.util.List<String> backupPaths) {
+            boolean isOffline, boolean useSteamInput, String ticketBase64, java.util.List<String> backupPaths) {
         Log.w("XServerDisplayActivity", "No steam_api DLLs found in game directory — injecting Goldberg steam_api next to game exe");
         try {
-            // Find the game exe to determine architecture
             String exePath = resolveShortcutSteamExecutablePath(getCanonicalPathOrAbsolute(gameDir));
             if ((exePath == null || exePath.isEmpty()) && shortcut != null) {
                 exePath = shortcut.getExtra("launch_exe_path");
@@ -6540,7 +9545,6 @@ private void injectSteamApiIfMissing(File gameDir, String appDirPath, String lan
                 if (!candidate.isAbsolute()) candidate = new File(gameDir, exePath);
                 if (candidate.exists()) gameExe = candidate;
             }
-            // Fallback: find the first .exe in the game root (skip crash reporters etc.)
             if (gameExe == null) {
                 File[] rootFiles = gameDir.listFiles();
                 if (rootFiles != null) {
@@ -6564,7 +9568,6 @@ private void injectSteamApiIfMissing(File gameDir, String appDirPath, String lan
                 String stubAsset = isX64 ? "steampipe/steamclient64.dll" : "steampipe/steamclient.dll";
                 String stubName = isX64 ? "steamclient64.dll" : "steamclient.dll";
 
-                // Place Goldberg steam_api DLL next to the game exe
                 File targetDll = new File(exeDir, dllName);
                 if (!targetDll.exists()) {
                     try (InputStream is = getAssets().open(assetName);
@@ -6573,13 +9576,12 @@ private void injectSteamApiIfMissing(File gameDir, String appDirPath, String lan
                         int len;
                         while ((len = is.read(buf)) >= 0) fos.write(buf, 0, len);
                     }
-                    // Create empty .orig so restoreSteamApiDlls knows this was injected
+                    // Empty .orig means restore should delete this injected DLL.
                     new File(targetDll.getAbsolutePath() + ".orig").createNewFile();
                     Log.d("XServerDisplayActivity",
                             "Injected Goldberg " + dllName + " next to " + gameExe.getName());
                 }
 
-                // Also place the matching steamclient stub
                 File stubFile = new File(exeDir, stubName);
                 if (!stubFile.exists()) {
                     try (InputStream is = getAssets().open(stubAsset);
@@ -6592,9 +9594,7 @@ private void injectSteamApiIfMissing(File gameDir, String appDirPath, String lan
                             "Injected steamclient stub " + stubName + " next to " + gameExe.getName());
                 }
 
-                // Check for Capcom-style embedded Steam directory (e.g. Steam/steamclient64.dll).
-                // They use explicit relative paths (LoadLibrary("Steam\\steamclient64.dll")), which bypasses
-                // the standard directory search order. We must replace the file inside the Steam dir itself.
+                // Some games bypass search order with LoadLibrary("Steam\\steamclient64.dll").
                 File gameSteamDir = new File(exeDir, "Steam");
                 if (gameSteamDir.exists() && gameSteamDir.isDirectory()) {
                     File embeddedClient = new File(gameSteamDir, stubName);
@@ -6622,19 +9622,16 @@ private void injectSteamApiIfMissing(File gameDir, String appDirPath, String lan
                             backupPaths.add(relPath);
                         }
                         
-                        // Drop settings there too
                         SteamUtils.writeCompleteSettingsDir(gameSteamDir,
                                 Integer.parseInt(shortcut.getExtra("app_id")),
-                                language, isOffline, forceDlc, useSteamInput, ticketBase64);
+                                language, isOffline, useSteamInput, ticketBase64);
                     }
                 }
 
-                // Write steam_settings next to the injected DLL
                 SteamUtils.writeCompleteSettingsDir(exeDir,
                         Integer.parseInt(shortcut.getExtra("app_id")),
-                        language, isOffline, forceDlc, useSteamInput, ticketBase64);
+                        language, isOffline, useSteamInput, ticketBase64);
 
-                // Track the injected DLL as a backup path so we can clean it up later
                 if (backupPaths != null && appDirPath != null) {
                     String relPath = targetDll.getAbsolutePath();
                     if (relPath.startsWith(appDirPath)) {
@@ -6652,23 +9649,18 @@ private void injectSteamApiIfMissing(File gameDir, String appDirPath, String lan
     }
 
     private void replaceSteamApiDlls(File gameDir, String appDirPath, String language,
-            boolean isOffline, boolean forceDlc, boolean useSteamInput, String ticketBase64) {
+            boolean isOffline, boolean useSteamInput, String ticketBase64) {
         if (gameDir == null || !gameDir.exists()) return;
 
         java.util.List<String> backupPaths = new java.util.ArrayList<>();
-        replaceSteamApiDllsRecursive(gameDir, appDirPath, language, isOffline, forceDlc,
+        replaceSteamApiDllsRecursive(gameDir, appDirPath, language, isOffline,
                 useSteamInput, ticketBase64, backupPaths);
 
-        // ── Handle games with NO steam_api*.dll at all ──────────────────────────
-        // Games like Monster Hunter Stories (MHST.exe) don't ship with steam_api64.dll.
-        // They communicate with Steam through the embedded Steam/ directory's
-        // steamclient64.dll directly. Without a steam_api64.dll for Goldberg to hook
-        // into, the game fails with "Application Load Error 3:0000065432".
+        // Games without steam_api*.dll need an injected hook next to the exe.
         if (backupPaths.isEmpty()) {
-            injectSteamApiIfMissing(gameDir, appDirPath, language, isOffline, forceDlc, useSteamInput, ticketBase64, backupPaths);
+            injectSteamApiIfMissing(gameDir, appDirPath, language, isOffline, useSteamInput, ticketBase64, backupPaths);
         }
 
-        // Write orig_dll_path.txt listing all .orig backup paths
         if (!backupPaths.isEmpty()) {
             try {
                 java.util.Collections.sort(backupPaths);
@@ -6681,10 +9673,6 @@ private void replaceSteamApiDlls(File gameDir, String appDirPath, String languag
         }
     }
 
-    /**
-     * Checks if any steam_api.dll or steam_api64.dll exists anywhere in the game directory tree.
-     * Used to validate that the STEAM_DLL_REPLACED marker is not stale.
-     */
     private boolean hasSteamApiDllInTree(File dir) {
         if (dir == null || !dir.exists()) return false;
         File[] files = dir.listFiles();
@@ -6700,28 +9688,21 @@ private boolean hasSteamApiDllInTree(File dir) {
         return false;
     }
 
-    /**
-     * Reads the PE header of an exe to determine if it targets x64 (PE32+).
-     * Returns true for x86_64/ARM64, false for x86/unknown.
-     */
     private boolean isExe64Bit(File exeFile) {
         try (java.io.RandomAccessFile raf = new java.io.RandomAccessFile(exeFile, "r")) {
-            // Read DOS header e_lfanew (offset to PE header) at offset 0x3C
             raf.seek(0x3C);
-            int peOffset = Integer.reverseBytes(raf.readInt()); // little-endian
-            // Read PE signature (4 bytes) + Machine field (2 bytes)
-            raf.seek(peOffset + 4); // skip "PE\0\0"
-            int machine = Short.reverseBytes(raf.readShort()) & 0xFFFF; // unsigned little-endian
-            // 0x8664 = AMD64, 0xAA64 = ARM64
+            int peOffset = Integer.reverseBytes(raf.readInt());
+            raf.seek(peOffset + 4);
+            int machine = Short.reverseBytes(raf.readShort()) & 0xFFFF;
             return machine == 0x8664 || machine == 0xAA64;
         } catch (Exception e) {
             Log.w("XServerDisplayActivity", "Could not determine exe architecture, assuming x64", e);
-            return true; // Default to x64 as most modern Steam games are 64-bit
+            return true;
         }
     }
 
     private void replaceSteamApiDllsRecursive(File dir, String appDirPath, String language,
-            boolean isOffline, boolean forceDlc, boolean useSteamInput, String ticketBase64,
+            boolean isOffline, boolean useSteamInput, String ticketBase64,
             java.util.List<String> backupPaths) {
         if (dir == null || !dir.exists()) return;
 
@@ -6740,16 +9721,13 @@ private void replaceSteamApiDllsRecursive(File dir, String appDirPath, String la
                     : "steampipe/steam_api.dll";
 
             try {
-                // Generate steam_interfaces.txt BEFORE replacing (scans the original DLL)
                 generateSteamInterfacesFromDll(dir, file);
 
-                // Backup as .orig if not already done
                 File backup = new File(file.getParent(), file.getName() + ".orig");
                 if (!backup.exists()) {
                     FileUtils.copy(file, backup);
                     Log.d("XServerDisplayActivity", "Backed up original: " + file.getName() + " as .orig");
                 }
-                // Record relative backup path for orig_dll_path.txt
                 String relPath = backup.getAbsolutePath();
                 if (relPath.startsWith(appDirPath)) {
                     relPath = relPath.substring(appDirPath.length());
@@ -6757,7 +9735,6 @@ private void replaceSteamApiDllsRecursive(File dir, String appDirPath, String la
                 }
                 backupPaths.add(relPath);
 
-                // Replace with steampipe version
                 file.delete();
                 file.createNewFile();
                 try (InputStream is = getAssets().open(assetName);
@@ -6768,9 +9745,7 @@ private void replaceSteamApiDllsRecursive(File dir, String appDirPath, String la
                 }
                 Log.d("XServerDisplayActivity", "Replaced " + file.getName() + " at " + file.getAbsolutePath());
 
-                // Copy the matching experimental steamclient stub next to the replaced DLL.
-                // The experimental steam_api DLLs expect this stub to prevent the game from
-                // loading the real steamclient.dll, which would cause the game to hang.
+                // Experimental steam_api DLLs need matching steamclient stubs.
                 String stubAsset = name.equals("steam_api64.dll")
                         ? "steampipe/steamclient64.dll"
                         : "steampipe/steamclient.dll";
@@ -6792,29 +9767,22 @@ private void replaceSteamApiDllsRecursive(File dir, String appDirPath, String la
             }
         }
 
-        // Write complete steam_settings next to this dir if it contained a steam_api DLL
         if (hasSteamDll) {
             SteamUtils.writeCompleteSettingsDir(dir,
                     Integer.parseInt(shortcut.getExtra("app_id")),
-                    language, isOffline, forceDlc, useSteamInput, ticketBase64);
+                    language, isOffline, useSteamInput, ticketBase64);
         }
 
-        // Recurse into subdirectories (skip steam_settings to avoid infinite recursion)
         for (File file : files) {
             if (file.isDirectory() && !file.getName().equals("steam_settings")) {
-                replaceSteamApiDllsRecursive(file, appDirPath, language, isOffline, forceDlc,
+                replaceSteamApiDllsRecursive(file, appDirPath, language, isOffline,
                         useSteamInput, ticketBase64, backupPaths);
             }
         }
     }
 
-    /**
-     * Walks the game directory and calls writeCompleteSettingsDir next to every directory
-     * that contains a steam_api.dll or steam_api64.dll.
-     * Used in ColdClient mode where we don't replace DLLs but still need settings.
-     */
     private void setupSteamSettingsForAllDirs(File dir, int appId, String language,
-            boolean isOffline, boolean forceDlc, boolean useSteamInput, String ticketBase64) {
+            boolean isOffline, boolean useSteamInput, String ticketBase64) {
         if (dir == null || !dir.exists()) return;
 
         File[] files = dir.listFiles();
@@ -6831,20 +9799,17 @@ private void setupSteamSettingsForAllDirs(File dir, int appId, String language,
         }
 
         if (hasSteamDll) {
-            SteamUtils.writeCompleteSettingsDir(dir, appId, language, isOffline, forceDlc, useSteamInput, ticketBase64);
+            SteamUtils.writeCompleteSettingsDir(dir, appId, language, isOffline, useSteamInput, ticketBase64);
         }
 
         for (File file : files) {
             if (file.isDirectory() && !file.getName().equals("steam_settings")) {
-                setupSteamSettingsForAllDirs(file, appId, language, isOffline, forceDlc, useSteamInput, ticketBase64);
+                setupSteamSettingsForAllDirs(file, appId, language, isOffline, useSteamInput, ticketBase64);
             }
         }
     }
 
-    /**
-     * Ensures experimental steamclient stubs exist next to any replaced steam_api DLLs.
-     * Needed for games where DLLs were replaced before the stubs were bundled.
-     */
+    // Backfill steamclient stubs for older steam_api replacements.
     private void copySteamclientStubs(File dir) {
         if (dir == null || !dir.exists()) return;
         File[] files = dir.listFiles();
@@ -6877,12 +9842,7 @@ private void copySteamclientStubs(File dir) {
         }
     }
 
-    /**
-     * Restores the original steam_api.dll and steam_api64.dll in the game directory.
-     * Required if a game was previously launched in Goldberg mode (which swaps them with stubs),
-     * but is now being launched in ColdClient mode (which requires the real DLLs).
-     * Backups are stored as .orig (e.g. steam_api64.dll.orig) by replaceSteamApiDllsRecursive.
-     */
+    // Restore real steam_api DLLs when leaving Goldberg for ColdClient.
     private void restoreSteamApiDlls(File gameDir) {
         if (gameDir == null || !gameDir.exists()) return;
 
@@ -6896,7 +9856,6 @@ private void restoreSteamApiDlls(File gameDir) {
                 }
             } else {
                 String name = file.getName().toLowerCase();
-                // Backups are written as .orig
                 if (name.equals("steam_api.dll.orig") || name.equals("steam_api64.dll.orig")) {
                     try {
                         String originalName = file.getName().substring(0, file.getName().length() - ".orig".length());
@@ -6904,14 +9863,12 @@ private void restoreSteamApiDlls(File gameDir) {
 
                         if (target.exists()) target.delete();
                         if (file.length() == 0) {
-                            // 0-byte .orig means the file was injected (didn't exist originally).
-                            // Leave it deleted, don't copy a 0-byte file.
+                            // 0-byte .orig means delete the injected DLL.
                             Log.d("XServerDisplayActivity", "Removed injected target " + originalName);
                         } else {
                             FileUtils.copy(file, target);
                         }
 
-                        // Remove the experimental steamclient stub that was placed alongside
                         String stubName = name.equals("steam_api64.dll.orig")
                                 ? "steamclient64.dll" : "steamclient.dll";
                         File stub = new File(file.getParent(), stubName);
@@ -6929,118 +9886,44 @@ private void restoreSteamApiDlls(File gameDir) {
         }
     }
 
-    /**
-     * Checks whether the /dev/ntsync device node exists and is accessible.
-     * On many Android devices (especially custom kernels) the node may exist
-     * but lack the permissions needed by the app to open it.
-     */
-    private boolean canAccessNtsyncDevice() {
-        java.io.File ntsyncDev = new java.io.File("/dev/ntsync");
-        if (!ntsyncDev.exists()) {
-            Log.d("XServerDisplayActivity", "NTSync: /dev/ntsync does not exist");
-            return false;
-        }
-        try (java.io.FileInputStream fis = new java.io.FileInputStream(ntsyncDev)) {
-            Log.d("XServerDisplayActivity", "NTSync: /dev/ntsync is accessible");
-            return true;
-        } catch (Exception e) {
-            Log.d("XServerDisplayActivity", "NTSync: /dev/ntsync exists but is not accessible: " + e.getMessage());
-            return false;
-        }
-    }
-
-    /**
-     * Normalizes synchronization environment variables.
-     *
-     * NTSync and ESync are the two synchronization methods available on Android.
-     * FSync is compiled out of the Android Wine build (futex_waitv not reliable
-     * on Android bionic), so it is always disabled here.
-     *
-     * Priority logic:
-     *
-     * 1. If the user explicitly set WINEESYNC=1 (without any NTSync variable):
-     *    bypass NTSync detection entirely, use ESync.
-     *
-     * 2. If the user explicitly set WINENTSYNC=1 or PROTON_USE_NTSYNC=1:
-     *    try NTSync. If /dev/ntsync is not accessible, fall back to ESync
-     *    automatically (never drop to plain wineserver sync).
-     *
-     * 3. If no sync variables are set at all:
-     *    auto-detect NTSync — use it if /dev/ntsync is accessible,
-     *    otherwise fall back to ESync.
-     */
     private void normalizeSyncEnvVars(com.winlator.cmod.runtime.wine.EnvVars envVars) {
-        boolean esyncExplicit = "1".equals(envVars.get("WINEESYNC"));
-        boolean ntSyncExplicit = "1".equals(envVars.get("WINENTSYNC"))
-                || "1".equals(envVars.get("PROTON_USE_NTSYNC"));
-
-        // FSync is always disabled on Android (compiled out of Wine build).
         envVars.remove("WINEFSYNC");
         envVars.put("PROTON_NO_FSYNC", "1");
 
-        if (esyncExplicit && !ntSyncExplicit) {
-            // User explicitly chose ESync — honour that, skip NTSync detection.
+        String esyncVal = envVars.get("WINEESYNC");
+        boolean esyncOff = "0".equals(esyncVal) || "false".equalsIgnoreCase(esyncVal);
+        boolean ntSync = "1".equals(envVars.get("WINENTSYNC"))
+                || "1".equals(envVars.get("PROTON_USE_NTSYNC"));
+
+        if (ntSync) {
+            envVars.put("WINENTSYNC", "1");
+            envVars.put("PROTON_USE_NTSYNC", "1");
+        } else {
             envVars.remove("WINENTSYNC");
             envVars.remove("PROTON_USE_NTSYNC");
-            envVars.put("WINEESYNC", "1");
-            envVars.remove("PROTON_NO_ESYNC");
-            Log.d("XServerDisplayActivity",
-                    "Sync: user selected ESync — using ESync, skipping NTSync detection");
-            return;
         }
 
-        // Either NTSync was explicitly requested, or no sync vars are set at all.
-        // In both cases: try NTSync first, fall back to ESync if unavailable.
-        if (canAccessNtsyncDevice()) {
-            // NTSync available — enable it, disable ESync (mutually exclusive).
-            envVars.put("WINENTSYNC", "1");
-            envVars.put("PROTON_USE_NTSYNC", "1");
+        if (esyncOff) {
             envVars.remove("WINEESYNC");
+            envVars.remove("WINEESYNC_WINLATOR");
             envVars.put("PROTON_NO_ESYNC", "1");
-            Log.d("XServerDisplayActivity",
-                    "Sync: NTSync enabled (/dev/ntsync accessible) — disabled ESync");
         } else {
-            // NTSync not available — fall back to ESync automatically.
-            envVars.remove("WINENTSYNC");
-            envVars.remove("PROTON_USE_NTSYNC");
             envVars.put("WINEESYNC", "1");
             envVars.remove("PROTON_NO_ESYNC");
-            if (ntSyncExplicit) {
-                Log.w("XServerDisplayActivity",
-                        "Sync: NTSync requested but /dev/ntsync not accessible — falling back to ESync");
-            } else {
-                Log.d("XServerDisplayActivity",
-                        "Sync: NTSync not available (no /dev/ntsync) — using ESync");
-            }
         }
     }
 
-    /**
-     * Runs all pre-game setup: Mono installation, redistributables, and Steamless.
-     * Each step is tracked per-container via container extras, so switching containers
-     * will correctly re-install only what's missing for each master container.
-     *
-     * @param launcher The guest program launcher for running Wine commands
-     * @param needsUnpacking Whether Steamless DRM stripping is needed
-     * @param unpackFiles Whether to scan for additional exes to unpack
-     */
     private void runPreGameSetup(GuestProgramLauncherComponent launcher,
-                                  boolean needsUnpacking, boolean unpackFiles, boolean launchRealSteam) {
-        // Step 1: Install Wine Mono if not already installed in this container
+                                  boolean needsUnpacking, boolean unpackFiles) {
         boolean monoReady = installMonoIfNeeded(launcher);
 
-        // Step 2: Install redistributables for this game if not already done in this container
+        installGeckoIfNeeded(launcher);
+
         installRedistributablesIfNeeded(launcher);
 
-        // Step 3: Run Steamless DRM stripping.
-        // Runtime DRM Patcher (extra_dlls) handles most games automatically when
-        // enabled, but Steamless is needed as a fallback for stubborn SteamStub
-        // variants. Single-exe unpacking runs by default for Steam games when
-        // needsUnpacking is set; the "Unpack Files" toggle also enables multi-exe
-        // scanning so additional exes/dlls in the game dir are unpacked too.
-        if (launchRealSteam) {
+        if (!unpackFiles) {
             Log.d("XServerDisplayActivity",
-                    "Skipping Steamless/unpack flow because Launch Steam Client is enabled");
+                    "Skipping Steamless: 'Unpack Files' shortcut toggle is OFF");
             return;
         }
         if (!monoReady) {
@@ -7051,15 +9934,10 @@ private void runPreGameSetup(GuestProgramLauncherComponent launcher,
             Log.d("XServerDisplayActivity", "Skipping Steamless/unpack check; executable already handled");
             return;
         }
-        boolean unpackedExeExists = doesUnpackedExeExist();
-        if (needsUnpacking || unpackFiles || !unpackedExeExists) {
-            if (needsUnpacking || !unpackedExeExists) {
-                runSteamlessOnExe(launcher);
-            } else {
-                // Steamless already ran on a prior launch. Ensure the unpacked exe is active
-                // in case something (e.g. mode switch) restored the original.
-                ensureUnpackedExeActive();
-            }
+        if (doesUnpackedExeExist()) {
+            ensureUnpackedExeActive();
+        } else {
+            runSteamlessOnExe(launcher);
         }
     }
 
@@ -7127,21 +10005,6 @@ private String buildSteamUnpackSignature(SteamExecutableInfo executableInfo) {
                 + executableInfo.file.lastModified() + "\n";
     }
 
-    private static class SteamExecutableInfo {
-        final String relativePath;
-        final File file;
-
-        SteamExecutableInfo(String relativePath, File file) {
-            this.relativePath = relativePath;
-            this.file = file;
-        }
-    }
-
-    /**
-     * If Steamless has previously unpacked the exe, ensure the unpacked version is the active one.
-     * This handles cases where the original exe was restored (e.g. switching between modes)
-     * but Steamless doesn't need to run again since .unpacked.exe already exists.
-     */
     private void ensureUnpackedExeActive() {
         if (shortcut == null || !"STEAM".equals(shortcut.getExtra("game_source"))) return;
         try {
@@ -7163,10 +10026,7 @@ private void ensureUnpackedExeActive() {
             File unpackedExe = new File(gameInstallPath, unixPath + ".unpacked.exe");
             File originalExe = new File(gameInstallPath, unixPath + ".original.exe");
 
-            // If both the unpacked exe and the original backup exist, the unpack was valid.
-            // Always re-apply the unpacked version — a prior mode switch may have restored
-            // the original, and comparing solely by file size is unreliable (some SteamStub
-            // variants produce unpacked files of identical size).
+            // Mode switches can restore the original; file-size checks are unreliable here.
             if (unpackedExe.exists() && originalExe.exists()) {
                 java.nio.file.Files.copy(unpackedExe.toPath(), exe.toPath(),
                         java.nio.file.StandardCopyOption.REPLACE_EXISTING);
@@ -7177,9 +10037,6 @@ private void ensureUnpackedExeActive() {
         }
     }
 
-    /**
-     * Checks whether a .unpacked.exe exists for the current game's executable.
-     */
     private boolean doesUnpackedExeExist() {
         if (shortcut == null || !"STEAM".equals(shortcut.getExtra("game_source"))) return false;
         try {
@@ -7204,50 +10061,51 @@ private boolean doesUnpackedExeExist() {
         }
     }
 
-    /**
-     * Installs Wine Mono in this container if not already installed.
-     * Tracked via container extra "mono_installed" so each master container
-     * only installs Mono once.
-     */
     private boolean installMonoIfNeeded(GuestProgramLauncherComponent launcher) {
+        // Any installed Mono is kept as-is; prefix repair clears the marker to force a reinstall.
+        String installedVersion = container.getExtra("mono_version", null);
+        if (installedVersion != null) {
+            Log.d("XServerDisplayActivity", "Mono v" + installedVersion + " already installed in container " + container.id + ", skipping");
+            return true;
+        }
+        if (hasInstalledComponentPrefix("mono")) {
+            Log.d("XServerDisplayActivity", "Mono already installed via components in container " + container.id + ", skipping");
+            return true;
+        }
+
         String winePath = wineInfo != null ? wineInfo.path : null;
 
-        // Detect the required Mono version for this container's Wine build
         String requiredVersion = SteamClientManager.detectRequiredMonoVersion(this, winePath);
         if (requiredVersion == null) {
             Log.w("XServerDisplayActivity", "Could not detect required Mono version, skipping");
             return false;
         }
 
-        // Check if the correct version is already installed in this container
-        String installedVersion = container.getExtra("mono_version", null);
-        if (requiredVersion.equals(installedVersion)) {
-            Log.d("XServerDisplayActivity", "Mono v" + installedVersion + " already installed in container " + container.id + ", skipping");
-            return true;
-        }
-
-        // Version mismatch or not installed — need to (re)install
-        if (installedVersion != null) {
-            Log.w("XServerDisplayActivity", "Mono version mismatch in container " + container.id
-                    + ": installed v" + installedVersion + " but need v" + requiredVersion + " — reinstalling");
-        }
-
-        // Ensure the correct MSI is downloaded
         String monoWinePath = SteamClientManager.getMonoMsiWinePath(this, winePath);
         if (monoWinePath == null) {
             Log.w("XServerDisplayActivity", "Mono MSI not available (no internet?), will retry next launch");
             return false;
         }
 
+        // The MSI actually resolved may be a fallback version; record what really got installed.
+        String actualVersion = requiredVersion;
+        java.util.regex.Matcher monoMsiMatcher =
+                java.util.regex.Pattern.compile("wine-mono-(\\d+\\.\\d+\\.\\d+)").matcher(monoWinePath);
+        if (monoMsiMatcher.find()) actualVersion = monoMsiMatcher.group(1);
+        if (!actualVersion.equals(requiredVersion)) {
+            Log.w("XServerDisplayActivity", "Mono fallback: required v" + requiredVersion
+                    + " but installing v" + actualVersion + " (" + monoWinePath + ")");
+        }
+
         try {
-            Log.d("XServerDisplayActivity", "Installing Wine Mono v" + requiredVersion
+            Log.d("XServerDisplayActivity", "Installing Wine Mono v" + actualVersion
                     + " (" + monoWinePath + ") in container " + container.id + "...");
             String monoCmd = "wine msiexec /i " + monoWinePath + " && wineserver -k";
             launcher.execShellCommand(monoCmd);
             container.putExtra("mono_installed", "true");
-            container.putExtra("mono_version", requiredVersion);
+            container.putExtra("mono_version", actualVersion);
             container.saveData();
-            Log.d("XServerDisplayActivity", "Mono v" + requiredVersion + " installed in container " + container.id);
+            Log.d("XServerDisplayActivity", "Mono v" + actualVersion + " installed in container " + container.id);
             return true;
         } catch (Exception e) {
             Log.w("XServerDisplayActivity", "Mono msiexec failed, will retry next launch", e);
@@ -7255,13 +10113,53 @@ private boolean installMonoIfNeeded(GuestProgramLauncherComponent launcher) {
         }
     }
 
-    /**
-     * Installs _CommonRedist redistributables for the current game if not already done.
-     * Tracked per game+container via container extra "redist_<appId>" so each
-     * master container installs redistributables independently.
-     *
-     * Uses SteamBridge.getAppDirPath() for custom download folder paths.
-     */
+    private boolean hasInstalledComponentPrefix(String prefix) {
+        for (String name : com.winlator.cmod.runtime.content.component.ComponentInstaller
+                .installedComponents(container)) {
+            if (name.startsWith(prefix)) return true;
+        }
+        return false;
+    }
+
+    private void installGeckoIfNeeded(GuestProgramLauncherComponent launcher) {
+        String installedGecko = container.getExtra("gecko_version", null);
+        if (installedGecko != null) {
+            Log.d("XServerDisplayActivity", "Gecko v" + installedGecko + " already installed in container "
+                    + container.id + ", skipping");
+            return;
+        }
+        if (hasInstalledComponentPrefix("gecko")) {
+            Log.d("XServerDisplayActivity", "Gecko already installed via components in container "
+                    + container.id + ", skipping");
+            return;
+        }
+        String geckoVersion = SteamClientManager.GECKO_VERSION;
+
+        java.util.List<String> geckoWinePaths = SteamClientManager.getGeckoMsiWinePaths(this);
+        if (geckoWinePaths.size() < 2) {
+            Log.w("XServerDisplayActivity", "Gecko MSIs not available (no internet?), will retry next launch");
+            return;
+        }
+
+        try {
+            Log.d("XServerDisplayActivity", "Installing Wine Gecko v" + geckoVersion
+                    + " in container " + container.id + "...");
+            StringBuilder geckoCmd = new StringBuilder();
+            for (String p : geckoWinePaths) {
+                if (geckoCmd.length() > 0) geckoCmd.append(" && ");
+                geckoCmd.append("wine msiexec /i ").append(p);
+            }
+            geckoCmd.append(" && wineserver -k");
+            launcher.execShellCommand(geckoCmd.toString());
+            container.putExtra("gecko_version", geckoVersion);
+            container.saveData();
+            Log.d("XServerDisplayActivity", "Gecko v" + geckoVersion + " installed in container " + container.id);
+        } catch (Exception e) {
+            Log.w("XServerDisplayActivity", "Gecko msiexec failed, will retry next launch", e);
+        }
+    }
+
+    // Installs _CommonRedist once per game/container.
     private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launcher) {
         if (shortcut == null || !"STEAM".equals(shortcut.getExtra("game_source"))) return;
 
@@ -7280,7 +10178,6 @@ private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launc
             return;
         }
 
-        // Find the game's _CommonRedist directory using custom download path
         String gameInstallPath = resolveSteamGameInstallPath(appId);
         if (gameInstallPath == null || gameInstallPath.isEmpty()) return;
 
@@ -7288,7 +10185,6 @@ private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launc
         if (!commonRedistDir.exists() || !commonRedistDir.isDirectory()) {
             Log.d("XServerDisplayActivity", "No _CommonRedist found for appId=" + appId
                     + " at " + commonRedistDir.getPath());
-            // Mark as done even if no redist found (skip on future launches)
             container.putExtra(redistKey, "true");
             container.saveData();
             return;
@@ -7297,9 +10193,6 @@ private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launc
         Log.d("XServerDisplayActivity", "Installing redistributables for appId=" + appId
                 + " in container " + container.id + "...");
 
-        // Walk _CommonRedist subdirs and find installer executables
-        // Typical structure: _CommonRedist/vcredist/2019/vc_redist.x64.exe
-        //                    _CommonRedist/DirectX/Jun2010/DXSETUP.exe
         int installed = 0;
         try {
             File[] categories = commonRedistDir.listFiles();
@@ -7310,21 +10203,18 @@ private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launc
                     if (versions == null) continue;
                     for (File versionDir : versions) {
                         if (!versionDir.isDirectory()) continue;
-                        // Find the main installer exe in this version dir
                         File[] exes = versionDir.listFiles((dir, name) ->
                                 name.toLowerCase().endsWith(".exe"));
                         if (exes == null || exes.length == 0) continue;
 
                         for (File exe : exes) {
                             String exeName = exe.getName().toLowerCase();
-                            // Skip known non-installer files
                             if (exeName.startsWith("unins") || exeName.equals("detect.exe")) continue;
 
                             String winPath = WineUtils.getWindowsPath(container, exe.getAbsolutePath());
 
                             try {
                                 Log.d("XServerDisplayActivity", "Running redistributable: " + winPath);
-                                // Run with /quiet /norestart flags for silent install
                                 String cmd;
                                 if (exeName.contains("dxsetup")) {
                                     cmd = "wine \"" + winPath + "\" /silent";
@@ -7346,7 +10236,6 @@ private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launc
                 }
             }
 
-            // Kill wineserver after installing redists
             if (installed > 0) {
                 try {
                     launcher.execShellCommand("wineserver -k");
@@ -7361,27 +10250,10 @@ private void installRedistributablesIfNeeded(GuestProgramLauncherComponent launc
             Log.e("XServerDisplayActivity", "Redistributable installation failed", e);
         }
 
-        // Mark as done for this game+container combo
         container.putExtra(redistKey, "true");
         container.saveData();
     }
 
-    /**
-     * P2: Runs Steamless DRM stripping on the game executable.
-     * Called via the preUnpack callback after box64 is ready.
-     *
-     * Follows the official Steamless CLI flow (https://github.com/atom0s/Steamless):
-     *   1. Loads unpacker plugins from Plugins/ subdirectory
-     *   2. Each plugin attempts to detect and unpack SteamStub variants (v1.0-v3.1)
-     *   3. On success, writes "{filename}.unpacked.exe" next to the original
-     *   4. Returns exit code 0 on success, 1 on failure
-     *
-     * We pass --realign and --recalcchecksum to produce a valid PE post-unpack,
-     * matching best-practice usage documented in Steamless.
-     *
-     * Wine Mono must be installed first (handled by installMonoIfNeeded() in the
-     * pre-game setup flow) since Steamless.CLI.exe is a .NET Framework application.
-     */
     private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
         if (shortcut == null || !"STEAM".equals(shortcut.getExtra("game_source"))) return;
         int appId;
@@ -7395,7 +10267,6 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
         String gameInstallPath = resolveSteamGameInstallPath(appId);
         if (gameInstallPath == null || gameInstallPath.isEmpty()) return;
 
-        // Extract Steamless.CLI.exe + Plugins/ if not present
         File steamlessDir = new File(imageFs.getRootDir(), "Steamless");
         File steamlessCli = new File(steamlessDir, "Steamless.CLI.exe");
         File pluginsDir = new File(steamlessDir, "Plugins");
@@ -7405,7 +10276,6 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
                 TarCompressorUtils.extract(
                         TarCompressorUtils.Type.ZSTD,
                         this, "extras.tzst", imageFs.getRootDir());
-                // Ensure extracted binaries are executable
                 com.winlator.cmod.shared.io.FileUtils.chmod(steamlessCli, 0755);
                 Log.d("XServerDisplayActivity", "Extracted Steamless CLI + Plugins to " + steamlessDir);
             } catch (Exception e) {
@@ -7414,14 +10284,11 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
             }
         }
 
-        // Validate Plugins directory has unpacker DLLs — Steamless CLI will fail
-        // with "No plugins were loaded" if this directory is missing or empty
         if (!pluginsDir.exists() || pluginsDir.list() == null || pluginsDir.list().length == 0) {
             Log.e("XServerDisplayActivity", "Steamless Plugins/ directory is missing or empty — cannot unpack");
             return;
         }
 
-        // Find the game executable and run Steamless on it
         String executablePath = resolveShortcutSteamExecutablePath(gameInstallPath);
         if (executablePath == null || executablePath.isEmpty()) {
             executablePath = container.getExecutablePath();
@@ -7438,19 +10305,14 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
         try {
             File hostExe = new File(gameInstallPath, executablePath.replace('\\', '/'));
 
-            // Build Windows path for Steamless using the C:\WinNative\Games symlink
-            // (most reliable — avoids drive-mapping gaps where hostPathToRootWinePath
-            // skips the A: drive and falls through to Z:\).
             String windowsPath = com.winlator.cmod.runtime.wine.WineUtils.getDriveCGameWindowsPath(
                     container, "STEAM", gameInstallPath, hostExe.getAbsolutePath());
             if (windowsPath == null || windowsPath.isEmpty()) {
-                // Fallback to generic drive-mapped path resolution
                 windowsPath = com.winlator.cmod.runtime.wine.WineUtils.hostPathToRootWinePath(container, hostExe.getAbsolutePath());
             }
             Log.d("XServerDisplayActivity", "Steamless: resolved windowsPath=" + windowsPath
                     + " (hostExe=" + hostExe.getAbsolutePath() + ")");
 
-            // Create batch file to handle paths with spaces.
             batchFile = new File(imageFs.getRootDir(), "tmp/steamless_wrapper.bat");
             batchFile.getParentFile().mkdirs();
             String batchContent = "@echo off\r\n"
@@ -7463,12 +10325,9 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
             String slOutput = launcher.execShellCommand(slCmd);
             Log.d("XServerDisplayActivity", "Steamless CLI output: " + slOutput);
 
-            // Steamless CLI prints "Successfully unpacked file!" on success (exit code 0).
-            // If this string is absent, the unpacking failed — do NOT swap files.
             boolean steamlessSuccess = slOutput != null
                     && slOutput.toLowerCase().contains("successfully unpacked");
 
-            // Handle file swap: .unpacked.exe -> exe, exe -> .original.exe
             String unixPath = executablePath.replace('\\', '/');
             File exe = new File(gameInstallPath, unixPath);
             File unpackedExe = new File(gameInstallPath, unixPath + ".unpacked.exe");
@@ -7479,30 +10338,23 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
                     + " exists=" + unpackedExe.exists() + " cliSuccess=" + steamlessSuccess);
 
             if (steamlessSuccess && exe.exists() && unpackedExe.exists()) {
-                // Backup the original DRM-protected exe before overwriting
                 if (!originalExe.exists()) {
                     java.nio.file.Files.copy(exe.toPath(), originalExe.toPath(),
                             java.nio.file.StandardCopyOption.REPLACE_EXISTING);
                     Log.d("XServerDisplayActivity", "Steamless: backed up original exe as " + originalExe.getName());
                 }
-                // Replace the active exe with the unpacked version
                 java.nio.file.Files.copy(unpackedExe.toPath(), exe.toPath(),
                         java.nio.file.StandardCopyOption.REPLACE_EXISTING);
                 Log.d("XServerDisplayActivity", "Steamless: swapped exe with unpacked version");
 
-                // Set the STEAM_DRM_PATCHED marker so mode switches know we've patched
                 com.winlator.cmod.feature.stores.steam.utils.MarkerUtils.INSTANCE.addMarker(
                         gameInstallPath, com.winlator.cmod.feature.stores.steam.enums.Marker.STEAM_DRM_PATCHED);
 
-                // Unpacking succeeded — clear the flag and persist
                 launcher.execShellCommand("wineserver -k");
                 container.setNeedsUnpacking(false);
                 container.saveData();
             } else if (!steamlessSuccess && !unpackedExe.exists()) {
-                // Steamless ran but couldn't unpack. Distinguish between:
-                //  - Definitive: "All unpackers failed" = game doesn't use SteamStub DRM.
-                //    Stop retrying to avoid wasting ~5s on every launch.
-                //  - Transient: Wine/Mono crash, missing deps, etc. = keep retrying.
+                // Stop retrying only when Steamless confirms no unpacker applies.
                 boolean allUnpackersFailed = slOutput != null
                         && slOutput.toLowerCase().contains("all unpackers failed");
 
@@ -7519,8 +10371,6 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
                             "Steamless: transient failure (CLI ran but no .unpacked.exe), will retry next launch");
                 }
             } else if (!steamlessSuccess && unpackedExe.exists()) {
-                // Edge case: .unpacked.exe exists from a prior run but CLI reported failure
-                // this time (e.g., file was already unpacked). Use the existing unpacked file.
                 if (!originalExe.exists() && exe.exists()) {
                     java.nio.file.Files.copy(exe.toPath(), originalExe.toPath(),
                             java.nio.file.StandardCopyOption.REPLACE_EXISTING);
@@ -7536,10 +10386,8 @@ private void runSteamlessOnExe(GuestProgramLauncherComponent launcher) {
                 container.saveData();
             }
         } catch (Exception e) {
-            // Don't set needsUnpacking=false — allow retry on next launch
             Log.e("XServerDisplayActivity", "Steamless execution failed, will retry next launch", e);
         } finally {
-            // Always clean up the batch wrapper
             if (batchFile != null && batchFile.exists()) batchFile.delete();
         }
     }
@@ -7548,19 +10396,12 @@ public XServer getXServer() {
         return xServer;
     }
 
-    /**
-     * Generates steam_interfaces.txt by scanning the backed-up original DLL for
-     * Steam interface version strings (e.g., SteamUser023, SteamApps008).
-     * Checks .orig backup first, then falls back to the DLL itself.
-     */
     private void generateSteamInterfacesFile(File dir, String dllName) {
         File interfacesFile = new File(dir, "steam_interfaces.txt");
         if (interfacesFile.exists()) return;
 
-        // Prefer the .orig backup (original DLL before steampipe replacement)
         File dllToScan = new File(dir, dllName + ".orig");
         if (!dllToScan.exists()) {
-            // Fall back to .original (legacy naming from older WinNative builds)
             dllToScan = new File(dir, dllName + ".original");
         }
         if (!dllToScan.exists()) {
@@ -7606,8 +10447,6 @@ private void updateSteamDirectoryVisibility(boolean visible, boolean coldClientM
                 if (!target.exists()) {
                     target.mkdirs();
                 }
-                // Unconditionally re-point the symlink. Cheap, and guarantees the target
-                // matches the current mode (ColdClient sidecar vs. pristine Steam store).
                 if (steamLink.exists()) {
                     FileUtils.delete(steamLink);
                 }
@@ -7640,17 +10479,6 @@ private File getSharedColdClientStore() {
         return new File(getFilesDir(), "imagefs/" + COLDCLIENT_STORE_RELATIVE_PATH);
     }
 
-    /**
-     * Populate the ColdClient sidecar store (.shared/coldclient-store/) by extracting
-     * experimental-drm.tzst into it. Idempotent: returns true immediately if the loader
-     * is already present.
-     *
-     * The archive is laid out for extraction to imageFs.rootDir with the Goldberg/loader
-     * files under home/xuser/.wine/drive_c/Program Files (x86)/Steam/. Since the container's
-     * Steam symlink is pointed at the coldclient store before this is called, extraction
-     * writes through the symlink directly into the sidecar — keeping the real steam-client-store
-     * pristine forever.
-     */
     private boolean ensureColdClientStore() {
         File cstore = getSharedColdClientStore();
         File loader = new File(cstore, "steamclient_loader_x64.exe");
@@ -7659,7 +10487,6 @@ private boolean ensureColdClientStore() {
             return true;
         }
 
-        // Make sure the archive is on disk (downloaded from components if necessary)
         if (!SteamBridge.ensureColdClientSupportReady(this)) {
             Log.w("XServerDisplayActivity", "ensureColdClientStore: experimental-drm.tzst not available");
             return false;
@@ -7763,12 +10590,6 @@ private void moveSteamDirectoryIntoBackingStore(File steamLink, File steamStore)
 
     private void updateSteamRegistryVisibility(boolean visible) {
         if (container == null) return;
-        // container.getRootDir() already points at the per-container home dir
-        // (.../imagefs/home/xuser-N). ImageFs.WINEPREFIX is the default absolute
-        // path "/home/xuser/.wine" and concatenating the two produces a bogus
-        // .../home/xuser-N/home/xuser/.wine path that never exists — writes
-        // there throw ENOENT and silently swallow, making this whole routine a
-        // no-op. The wine prefix lives directly at "<rootDir>/.wine".
         File userRegFile = new File(container.getRootDir(), ".wine/user.reg");
         File systemRegFile = new File(container.getRootDir(), ".wine/system.reg");
         File userBackupFile = new File(container.getRootDir(), ".wine/" + STEAM_USER_REGISTRY_BACKUP_FILE);
@@ -7975,75 +10796,151 @@ private String removeRegistrySubtree(String registryContent, String key) {
         return rebuilt.toString();
     }
 
-    /**
-     * Sets up the Steam environment: steamapps/common symlink, ACF manifest,
-     * Wine registry entries for Steam paths, and steam.cfg for bootstrap inhibit.
-     */
-    private void setupSteamEnvironment(int appId, File gameDir) {
+    private void writeBionicActiveProcessRegistry() {
         try {
-            File winePrefix = container.getRootDir();
-            File steamDir = new File(winePrefix, ".wine/drive_c/Program Files (x86)/Steam");
-            steamDir.mkdirs();
-            boolean launchRealSteamMode = shortcut != null
-                    ? parseBoolean(getShortcutSetting("launchRealSteam", container.isLaunchRealSteam() ? "1" : "0"))
-                    : container.isLaunchRealSteam();
-
-            if (launchRealSteamMode) {
-                // Seed or heal the shared Steam client store before launch.
-                // isSteamInstalled() only verifies file existence; isSharedSteamStorePristine()
-                // adds a size check that catches a Goldberg-stub overwrite (the #1 cause of
-                // Steam's "please reinstall" dialog after switching from ColdClient).
-                boolean needsSeed = !SteamBridge.isSteamInstalled(this);
-                boolean contaminated = !needsSeed && !SteamUtils.isSharedSteamStorePristine(this);
-                if (needsSeed || contaminated) {
-                    Log.d("XServerDisplayActivity",
-                            "Real Steam mode: " + (contaminated
-                                    ? "shared store contaminated (Goldberg stubs detected), force-extracting steam.tzst"
-                                    : "seeding shared Steam client store (one-shot)"));
-                    if (!SteamBridge.forceExtractSteam(this)) {
-                        Log.w("XServerDisplayActivity", "Real Steam mode: failed to seed/heal Steam client store");
-                    }
-                }
-
-                // Unconditionally inhibit Steam's bootstrapper. This is what keeps the client
-                // from trying to self-update over the network on launch (the cause of the long
-                // cryptnet hangs we've seen in Wine).
-                File steamCfg = new File(steamDir, "steam.cfg");
-                FileUtils.writeString(steamCfg, "BootStrapperInhibitAll=Enable\nBootStrapperForceSelfUpdate=False\n");
+            long steamId64 = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.INSTANCE.getSteamUserSteamId64();
+            int accountId = (int) (steamId64 & 0xFFFFFFFFL);
+            File userReg = new File(container.getRootDir(), ".wine/user.reg");
+            int steamPid = android.os.Process.myPid();
+            try (com.winlator.cmod.runtime.wine.WineRegistryEditor editor =
+                         new com.winlator.cmod.runtime.wine.WineRegistryEditor(userReg)) {
+                editor.setCreateKeyIfNotExist(true);
+                String key = "Software\\Valve\\Steam\\ActiveProcess";
+                editor.setDwordValue(key, "ActiveUser", accountId);
+                editor.setDwordValue(key, "pid", steamPid);
+                editor.setStringValue(key, "SteamClientDll",
+                        "C:\\windows\\syswow64\\lsteamclient.dll");
+                editor.setStringValue(key, "SteamClientDll64",
+                        "C:\\windows\\system32\\lsteamclient.dll");
+                editor.setStringValue(key, "Universe", "Public");
+            }
+            Log.d("XServerDisplayActivity",
+                    "Bionic: wrote ActiveProcess registry (ActiveUser=" + accountId
+                            + " pid=" + steamPid + ")");
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "Bionic: ActiveProcess registry write failed", e);
+        }
+    }
 
-                // Seed the package/.installed completion markers so the Steam bootstrap stub,
-                // if it runs at all, sees a finished install and doesn't try to re-download.
-                File packageDir = new File(steamDir, "package");
-                if (!packageDir.exists()) packageDir.mkdirs();
-                for (String marker : new String[]{"steam_client_win32.installed", "steam_client_win64.installed"}) {
-                    File mf = new File(packageDir, marker);
-                    if (!mf.exists() || mf.length() == 0) {
-                        FileUtils.writeString(mf, "1\n");
+    private boolean installBionicSteamPathOverlay(Container container, File bionicSteamDir) {
+        try {
+            File sharedStore = getSharedSteamStore();
+            if (!sharedStore.isDirectory()) {
+                Log.w("XServerDisplayActivity",
+                        "installBionicSteamPathOverlay: shared steam-client-store missing at "
+                                + sharedStore.getAbsolutePath()
+                                + " — falling back to bridge-in-system32 only (game may fail to "
+                                + "find steamclient64.dll because stock steam_api64.dll searches "
+                                + "SteamPath first)");
+                return false;
+            }
+            File bridge64Src = new File(container.getRootDir(),
+                    ".wine/drive_c/windows/system32/lsteamclient.dll");
+            File bridge32Src = new File(container.getRootDir(),
+                    ".wine/drive_c/windows/syswow64/lsteamclient.dll");
+            if (!bridge64Src.exists()) {
+                Log.w("XServerDisplayActivity",
+                        "installBionicSteamPathOverlay: bridge missing at "
+                                + bridge64Src.getAbsolutePath());
+                return false;
+            }
+            java.nio.file.Path bionicPath = bionicSteamDir.toPath();
+            if (java.nio.file.Files.isSymbolicLink(bionicPath)) {
+                java.nio.file.Files.delete(bionicPath);
+            }
+            if (!bionicSteamDir.exists()) {
+                bionicSteamDir.mkdirs();
+            }
+            File[] storeEntries = sharedStore.listFiles();
+            int symlinkedCount = 0;
+            if (storeEntries != null) {
+                for (File entry : storeEntries) {
+                    String name = entry.getName();
+                    if (name.equalsIgnoreCase("steamclient.dll")
+                            || name.equalsIgnoreCase("steamclient64.dll")
+                            || name.equalsIgnoreCase("steamapps")) {
+                        continue;
                     }
+                    File dest = new File(bionicSteamDir, name);
+                    if (dest.exists() || java.nio.file.Files.isSymbolicLink(dest.toPath())) {
+                        continue;
+                    }
+                    java.nio.file.Files.createSymbolicLink(
+                            dest.toPath(), entry.toPath().toAbsolutePath());
+                    ++symlinkedCount;
                 }
             }
+            File dest64 = new File(bionicSteamDir, "steamclient64.dll");
+            FileUtils.copy(bridge64Src, dest64);
+            File dest32 = new File(bionicSteamDir, "steamclient.dll");
+            if (bridge32Src.exists()) {
+                FileUtils.copy(bridge32Src, dest32);
+            } else {
+                FileUtils.copy(bridge64Src, dest32);
+            }
+            Log.d("XServerDisplayActivity",
+                    "installBionicSteamPathOverlay: " + symlinkedCount + " store entries"
+                            + " symlinked, bridge written as steamclient64.dll ("
+                            + dest64.length() + "B) + steamclient.dll ("
+                            + dest32.length() + "B)");
+            return true;
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity",
+                    "installBionicSteamPathOverlay failed", e);
+            return false;
+        }
+    }
+
+    private void clearBionicActiveProcessRegistry() {
+        try {
+            File userReg = new File(container.getRootDir(), ".wine/user.reg");
+            if (!userReg.exists()) return;
+            try (com.winlator.cmod.runtime.wine.WineRegistryEditor editor =
+                         new com.winlator.cmod.runtime.wine.WineRegistryEditor(userReg)) {
+                String key = "Software\\Valve\\Steam\\ActiveProcess";
+                editor.removeValue(key, "SteamClientDll");
+                editor.removeValue(key, "SteamClientDll64");
+                editor.removeValue(key, "ActiveUser");
+                editor.removeValue(key, "pid");
+                editor.removeValue(key, "Universe");
+            }
+            Log.d("XServerDisplayActivity", "Cleared Bionic ActiveProcess registry redirector");
+        } catch (Exception e) {
+            Log.e("XServerDisplayActivity", "Failed to clear Bionic ActiveProcess registry", e);
+        }
+    }
+
+    private void setupSteamEnvironment(int appId, File gameDir) {
+        try {
+            File winePrefix = container.getRootDir();
+            File steamDir = new File(winePrefix, ".wine/drive_c/Program Files (x86)/Steam");
+            steamDir.mkdirs();
 
             File steamappsDir = new File(steamDir, "steamapps");
             File commonDir = new File(steamappsDir, "common");
             commonDir.mkdirs();
             WineUtils.ensureSteamappsCommonSymlink(container, gameDir.getAbsolutePath());
 
-            // Create full ACF manifest via SteamUtils.createAppManifest which includes
-            // InstalledDepots, buildId, SizeOnDisk, UserConfig/language.
-            // Falls back gracefully if SteamService has no appInfo for this game.
-            SteamUtils.createAppManifest(this, appId);
+            String acfLanguage = PrefManager.INSTANCE.getContainerLanguage();
+            String containerLang = container.getExtra("containerLanguage", null);
+            if (containerLang != null && !containerLang.isEmpty()) {
+                acfLanguage = containerLang;
+            }
+            SteamUtils.createAppManifest(this, appId, acfLanguage);
 
-            // SteamUtils.createAppManifest writes the ACF to imageFs.wineprefix which may differ
-            // from the container's Steam dir (which symlinks to .shared/steam-client-store).
-            // Real Steam reads from the shared store, so ensure the ACF also exists there.
             File defaultAcf = new File(imageFs.getRootDir(),
                     ImageFs.WINEPREFIX + "/drive_c/Program Files (x86)/Steam/steamapps/appmanifest_" + appId + ".acf");
             File containerAcf = new File(steamappsDir, "appmanifest_" + appId + ".acf");
-            if (defaultAcf.exists() && !containerAcf.exists()) {
+            // Refresh the container manifest from the freshly generated one on every launch so
+            // newly installed DLC / language changes propagate. The generated manifest is the
+            // source of truth (the native launcher rewrites this same file too), so a stale
+            // container copy must not be left in place.
+            if (defaultAcf.exists()) {
                 try {
                     java.nio.file.Files.copy(defaultAcf.toPath(), containerAcf.toPath(),
                             java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-                    Log.d("XServerDisplayActivity", "Copied ACF manifest to container steamapps dir");
+                    Log.d("XServerDisplayActivity", "Synced ACF manifest to container steamapps dir");
                 } catch (Exception e) {
                     Log.w("XServerDisplayActivity", "Failed to copy ACF to container steamapps", e);
                 }
@@ -8051,14 +10948,12 @@ private void setupSteamEnvironment(int appId, File gameDir) {
 
             ensureSteamLibraryFoldersConfig(steamDir, steamappsDir);
 
-            // Ensure the Steamworks Common Redistributables ACF always exists as a fallback
-            // (createAppManifest only creates it when there are shared depots in the manifest).
             File steamworksAcf = new File(steamappsDir, "appmanifest_228980.acf");
             if (!steamworksAcf.exists()) {
                 String steamworksAcfContent = "\"AppState\"\n" +
                         "{\n" +
                         "\t\"appid\"\t\t\"228980\"\n" +
-                        "\t\"Universe\"\t\t\"1\"\n" +
+                        "\t\"universe\"\t\t\"1\"\n" +
                         "\t\"name\"\t\t\"Steamworks Common Redistributables\"\n" +
                         "\t\"StateFlags\"\t\t\"4\"\n" +
                         "\t\"installdir\"\t\t\"Steamworks Shared\"\n" +
@@ -8069,95 +10964,193 @@ private void setupSteamEnvironment(int appId, File gameDir) {
                 FileUtils.writeString(steamworksAcf, steamworksAcfContent);
             }
 
-            // Write loginusers.vdf with full OAuth tokens and set Wine registry for Steam paths.
-            // autoLoginUserChanges uses SteamService for proper token format.
-            try {
-                SteamUtils.autoLoginUserChanges(imageFs);
-                Log.d("XServerDisplayActivity", "autoLoginUserChanges complete");
-            } catch (Exception e) {
-                Log.w("XServerDisplayActivity", "autoLoginUserChanges failed, falling back", e);
-            }
-
-            // Skip first-time redistributable setup by marking them installed in system.reg
-            skipFirstTimeSteamSetup(winePrefix);
-
-            // Derive account info from encrypted PrefManager storage and refresh localconfig/acf.
             long steamIdLong = com.winlator.cmod.feature.stores.steam.utils.PrefManager.INSTANCE.getSteamUserSteamId64();
             String steamId64 = steamIdLong > 0 ? String.valueOf(steamIdLong) : "76561198000000000";
             int steamAccountId = com.winlator.cmod.feature.stores.steam.utils.PrefManager.INSTANCE.getSteamUserAccountId();
             String steamUserDataId = steamAccountId > 0 ? String.valueOf(steamAccountId) : steamId64;
-            reconcileSteamUserdata(steamDir, steamUserDataId, steamId64);
-
-            SteamUtils.updateOrModifyLocalConfig(imageFs, container, String.valueOf(appId), steamUserDataId);
-
-            // Create lightweight Steam config to reduce resource usage
-            setupLightweightSteamConfig(steamDir, steamUserDataId);
-
-            // Pre-launch Steam Cloud handshake via javasteam. This is the key fix for
-            // arm64ec Wine: the reference implementation calls beginLaunchApp BEFORE
-            // invoking steam.exe, which triggers SteamAutoCloud.syncUserFiles + the
-            // server-side signalAppLaunchIntent(ignorePendingOperations=true). That tells
-            // Valve's servers "I'm launching, ignore/clear any pending ops from this
-            // machine" — so when Steam's own AutoCloud runs at -applaunch time, it sees
-            // no pending operations and skips the CEF-dependent conflict dialog.
-            //
-            // Runs on this background thread (setupSteamEnvironment is called off the
-            // UI thread). Timeout guards against network-stall; failure falls through to
-            // launch-as-before.
-            if (launchRealSteamMode) {
-                java.util.concurrent.CountDownLatch syncLatch = new java.util.concurrent.CountDownLatch(1);
-                final int appIdForSync = appId;
-                Thread preLaunchSync = new Thread(() -> {
-                    try {
-                        com.winlator.cmod.feature.stores.steam.service.SteamService.Companion
-                                .beginLaunchAppBlocking(
-                                        XServerDisplayActivity.this,
-                                        appIdForSync,
-                                        true, /* ignorePendingOperations */
-                                        com.winlator.cmod.feature.stores.steam.enums.SaveLocation.None,
-                                        false, /* isOffline */
-                                        null /* callback */);
-                        Log.d("XServerDisplayActivity",
-                                "Pre-launch javasteam cloud sync complete for appId=" + appIdForSync);
-                    } catch (Throwable t) {
-                        Log.w("XServerDisplayActivity",
-                                "Pre-launch javasteam cloud sync failed (continuing)", t);
-                    } finally {
-                        syncLatch.countDown();
-                    }
-                }, "SteamPreLaunchCloudSync");
-                preLaunchSync.start();
+
+            // Stamp-cache the registry/userdata/local-config edits so warm launches skip the per-launch file-copy / VDF-parse work. Stamp key appId|userDataId — change either and it re-runs.
+            File steamEnvStamp = new File(winePrefix,
+                    ".wine/drive_c/.wn-steamenv-" + appId + "-" + steamUserDataId + ".stamp");
+            String expectedStamp = "v1|" + appId + "|" + steamUserDataId;
+            String existingStamp = steamEnvStamp.exists()
+                    ? FileUtils.readString(steamEnvStamp).trim() : "";
+            boolean steamEnvWarm = expectedStamp.equals(existingStamp);
+
+            if (!steamEnvWarm) {
                 try {
-                    if (!syncLatch.await(45, java.util.concurrent.TimeUnit.SECONDS)) {
-                        Log.w("XServerDisplayActivity",
-                                "Pre-launch javasteam cloud sync timed out after 45s, proceeding");
-                    }
-                } catch (InterruptedException ie) {
-                    Thread.currentThread().interrupt();
+                    SteamUtils.autoLoginUserChanges(imageFs);
+                    Log.d("XServerDisplayActivity", "autoLoginUserChanges complete");
+                } catch (Exception e) {
+                    Log.w("XServerDisplayActivity", "autoLoginUserChanges failed, falling back", e);
+                }
+
+                skipFirstTimeSteamSetup(winePrefix);
+                reconcileSteamUserdata(steamDir, steamUserDataId, steamId64);
+                SteamUtils.updateOrModifyLocalConfig(imageFs, container, String.valueOf(appId), steamUserDataId);
+                setupLightweightSteamConfig(steamDir, steamUserDataId);
+
+                try {
+                    FileUtils.writeString(steamEnvStamp, expectedStamp);
+                } catch (Exception e) {
+                    Log.w("XServerDisplayActivity",
+                            "Failed to write steam-env stamp at " + steamEnvStamp.getPath(), e);
                 }
+            } else {
+                Log.d("XServerDisplayActivity",
+                        "Steam env warm-cache hit (appId=" + appId
+                                + ", userId=" + steamUserDataId + ") — skipping reconcile + autoLogin");
             }
 
-            // Local metadata cleanup — after javasteam has synced, Steam may still have
-            // stale local state from previous sessions. Wipe both the metadata cache and
-            // the remote/ save directory so Steam re-reads cleanly from the sync results.
-            if (launchRealSteamMode && steamAccountId > 0) {
-                File userAppDir = new File(steamDir,
-                        "userdata/" + steamAccountId + "/" + appId);
-                File remoteCache = new File(userAppDir, "remotecache.vdf");
-                if (remoteCache.exists() && remoteCache.delete()) {
-                    Log.d("XServerDisplayActivity",
-                            "Cleared remotecache.vdf for appId=" + appId);
+            boolean planWActiveBootstrapSkip = com.winlator.cmod.feature.stores.steam.utils
+                    .PrefManager.INSTANCE.getWnPlanW();
+            if (isBionicSteamEnabledForShortcut() && planWActiveBootstrapSkip) {
+                try {
+                    boolean kicked = com.winlator.cmod.feature.stores.steam.service.SteamService
+                            .Companion.kickPlayingSessionIfReadyBlocking(true);
+                    Log.i("XServerDisplayActivity",
+                            "Steam Launcher: pre-launch kickPlayingSessionIfReady fired="
+                                    + kicked);
+                } catch (Throwable t) {
+                    Log.w("XServerDisplayActivity",
+                            "Steam Launcher: pre-launch kickPlayingSessionIfReady failed", t);
                 }
-                File remoteSaves = new File(userAppDir, "remote");
-                if (remoteSaves.exists() && remoteSaves.isDirectory()) {
-                    if (FileUtils.delete(remoteSaves)) {
+                try {
+                    com.winlator.cmod.feature.stores.steam.service.SteamService
+                            .Companion.bionicHandoffAcquire();
+                    Log.i("XServerDisplayActivity",
+                            "Steam Launcher: suspended Android wn-session before PlanW launch");
+                } catch (Throwable t) {
+                    Log.w("XServerDisplayActivity",
+                            "Steam Launcher: failed to suspend Android wn-session", t);
+                }
+                Log.i("XServerDisplayActivity",
+                        "Steam Launcher: skipping Android-side WnSteamBootstrap + stage2 "
+                        + "diagnostics — Wine-side steam.exe is the sole Steam "
+                        + "session (avoids double-logon + the listAchievements "
+                        + "native crash)");
+            } else if (isBionicSteamEnabledForShortcut()) {
+                try {
+                    boolean staged = com.winlator.cmod.feature.stores.steam.wnsteam
+                            .WnSteamAssetsInstaller.INSTANCE.install(this, container);
+                    File libSteamClientSo =
+                            new File(imageFs.getRootDir(), "usr/lib/libsteamclient.so");
+                    Log.d("XServerDisplayActivity",
+                            "Bionic Steam bootstrap: staged=" + staged
+                                    + " libsteamclient.so exists=" + libSteamClientSo.exists()
+                                    + " (" + libSteamClientSo.getAbsolutePath() + ")");
+                    if (libSteamClientSo.exists()) {
+                        String bsAccount = com.winlator.cmod.feature.stores.steam.utils
+                                .PrefManager.INSTANCE.getUsername();
+                        String bsToken = com.winlator.cmod.feature.stores.steam.utils
+                                .PrefManager.INSTANCE.getRefreshToken();
+                        long bsSteamId = com.winlator.cmod.feature.stores.steam.utils
+                                .PrefManager.INSTANCE.getSteamUserSteamId64();
+                        File bsHome = new File(imageFs.getRootDir(), "home");
+                        Log.d("XServerDisplayActivity",
+                                "Bionic Steam bootstrap: account=" + bsAccount
+                                        + " tokenLen="
+                                        + (bsToken == null ? 0 : bsToken.length())
+                                        + " steamId=" + bsSteamId);
+                        int rc = com.winlator.cmod.feature.stores.steam.wnsteam
+                                .WnSteamBootstrap.INSTANCE.start(
+                                        this,
+                                        libSteamClientSo.getAbsolutePath(),
+                                        bsHome.getAbsolutePath(),
+                                        "127.0.0.1:57343",
+                                        "127.0.0.1:57344",
+                                        new String[0],
+                                        bsAccount,
+                                        bsToken,
+                                        bsSteamId,
+                                        appId);
                         Log.d("XServerDisplayActivity",
-                                "Cleared remote/ save directory for appId=" + appId
-                                        + " — Steam will re-download from cloud");
+                                "Bionic Steam bootstrap: start() rc=" + rc
+                                        + " appId=" + appId);
+                        com.winlator.cmod.feature.stores.steam.wnsteam
+                                .WnLibSteamClient.INSTANCE.setAppId(appId);
+                        try {
+                            com.winlator.cmod.feature.stores.steam.service.SteamService
+                                    .prepareLibSteamClientForLaunchBlocking(appId);
+                        } catch (Throwable t) {
+                            Log.w("XServerDisplayActivity",
+                                    "Bionic Steam: prepareLibSteamClientForLaunch failed for app "
+                                            + appId, t);
+                        }
+                        com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamBootstrap bs =
+                                com.winlator.cmod.feature.stores.steam.wnsteam.WnSteamBootstrap.INSTANCE;
+                        long liveSid = bs.liveSteamId();
+                        int  liveApp = bs.currentAppId();
+                        Log.d("XServerDisplayActivity",
+                                "Bionic Steam bootstrap: live ISteamUser.steamId="
+                                        + liveSid + " (prefmgr=" + bsSteamId
+                                        + " match=" + (liveSid == bsSteamId)
+                                        + ") ISteamUtils.appId=" + liveApp);
+
+                        try {
+                            boolean subscribed = bs.isSubscribedApp(appId);
+                            int     license   = bs.userHasLicenseForApp(liveSid, appId);
+                            boolean installed = bs.isAppInstalled(appId);
+                            String  installDir = bs.appInstallDir(appId);
+                            int[]   depots    = bs.installedDepots(appId);
+                            String  lang      = bs.currentGameLanguage();
+                            boolean publicLogged = bs.loggedOnPublic();
+                            Log.d("XServerDisplayActivity",
+                                    "Bionic stage2 apps/user: subscribed=" + subscribed
+                                            + " license=" + license + " (0=ok 1=no 2=noauth)"
+                                            + " installed=" + installed
+                                            + " installDir=" + installDir
+                                            + " depots=" + (depots == null ? 0 : depots.length)
+                                            + " lang=" + lang
+                                            + " loggedOnPublic=" + publicLogged);
+
+                            boolean cloudAcct = bs.cloudEnabledForAccount();
+                            boolean cloudApp  = bs.cloudEnabledForApp();
+                            int     cloudCnt  = bs.cloudFileCount();
+                            long[]  cloudQ    = bs.cloudQuota();
+                            Log.d("XServerDisplayActivity",
+                                    "Bionic stage2 cloud: account=" + cloudAcct
+                                            + " app=" + cloudApp
+                                            + " files=" + cloudCnt
+                                            + " quota=" + cloudQ[1] + "/" + cloudQ[0]);
+
+                            int numAch = bs.numAchievements();
+                            java.util.List<String> achNames = bs.listAchievements();
+                            String firstAch = achNames.isEmpty() ? "(none)" : achNames.get(0);
+                            Log.d("XServerDisplayActivity",
+                                    "Bionic stage2 stats: numAch=" + numAch
+                                            + " firstName=" + firstAch);
+
+                            String  pname  = bs.personaName();
+                            int     pstate = bs.personaState();
+                            int     fcount = bs.friendCount(
+                                    com.winlator.cmod.feature.stores.steam.wnsteam
+                                            .WnSteamBootstrap.FriendFlags.Immediate);
+                            Log.d("XServerDisplayActivity",
+                                    "Bionic stage2 friends: personaName=" + pname
+                                            + " personaState=" + pstate
+                                            + " friendCount(immediate)=" + fcount);
+
+                            int  purchaseTime = bs.earliestPurchaseUnixTime(appId);
+                            int  numDlc       = bs.dlcCount(appId);
+                            long owner        = bs.appOwner();
+                            boolean famShared = bs.isSubscribedFromFamilySharing();
+                            Log.d("XServerDisplayActivity",
+                                    "Bionic stage2 perApp: earliestPurchase=" + purchaseTime
+                                            + " dlcCount=" + numDlc
+                                            + " appOwner=" + owner
+                                            + " (familySharing=" + famShared + ")");
+                        } catch (Throwable t) {
+                            Log.w("XServerDisplayActivity",
+                                    "Bionic stage2 diagnostic failed", t);
+                        }
                     } else {
                         Log.w("XServerDisplayActivity",
-                                "Failed to clear remote/ save directory for appId=" + appId);
+                                "Bionic Steam bootstrap: libsteamclient.so missing, "
+                                        + "skipping nativeInit");
                     }
+                } catch (Throwable t) {
+                    Log.e("XServerDisplayActivity", "Bionic Steam bootstrap failed", t);
                 }
             }
 
@@ -8167,10 +11160,6 @@ private void setupSteamEnvironment(int appId, File gameDir) {
         }
     }
 
-    /**
-     * Creates lightweight Steam configuration files to reduce resource usage.
-     * Disables community content, friends, and enables small mode.
-     */
     private void setupLightweightSteamConfig(File steamDir, String steamId64) {
         try {
             File userDataPath = new File(steamDir, "userdata/" + steamId64);
@@ -8230,42 +11219,6 @@ private void setupLightweightSteamConfig(File steamDir, String steamId64) {
         }
     }
 
-    // Real Steam launch watchdog. If steam.exe hangs during startup (classic cryptnet/CRL
-    // stall in Wine) the user sees a blank screen because -silent hides everything. This
-    // schedules a timer that, if no application window has registered with the X server by
-    // the deadline, kills wineserver and surfaces a toast.
-    private static final long REAL_STEAM_WATCHDOG_MS = 75_000L;
-
-    private void scheduleRealSteamWatchdog(GuestProgramLauncherComponent launcherComponent) {
-        cancelRealSteamWatchdog();
-        firstAppWindowAppeared.set(false);
-        realSteamWatchdogRunnable = () -> {
-            if (firstAppWindowAppeared.get()) return;
-            Log.w("XServerDisplayActivity",
-                    "Real Steam watchdog: no game window after " + (REAL_STEAM_WATCHDOG_MS / 1000)
-                            + "s — assuming steam.exe hung, killing wineserver");
-            try {
-                if (launcherComponent != null) launcherComponent.execShellCommand("wineserver -k");
-            } catch (Exception e) {
-                Log.w("XServerDisplayActivity", "Real Steam watchdog: wineserver -k failed", e);
-            }
-            runOnUiThread(() -> WinToast.show(
-                    XServerDisplayActivity.this,
-                    "Steam client failed to start. Try toggling Launch Steam Client off.",
-                    android.widget.Toast.LENGTH_LONG));
-        };
-        new Handler(Looper.getMainLooper()).postDelayed(realSteamWatchdogRunnable, REAL_STEAM_WATCHDOG_MS);
-        Log.d("XServerDisplayActivity",
-                "Real Steam watchdog: armed for " + (REAL_STEAM_WATCHDOG_MS / 1000) + "s");
-    }
-
-    private void cancelRealSteamWatchdog() {
-        if (realSteamWatchdogRunnable != null) {
-            new Handler(Looper.getMainLooper()).removeCallbacks(realSteamWatchdogRunnable);
-            realSteamWatchdogRunnable = null;
-        }
-    }
-
     private void reconcileSteamUserdata(File steamDir, String steamUserDataId, String steamId64) {
         if (steamDir == null || !steamDir.exists() || steamUserDataId == null || steamUserDataId.isEmpty()) {
             return;
@@ -8345,7 +11298,9 @@ private void ensureSteamLibraryFoldersConfig(File steamDir, File steamappsDir) {
             content.append("\t\t\"contentid\"\t\t\"0\"\n");
             content.append("\t\t\"totalsize\"\t\t\"0\"\n");
             content.append("\t\t\"update_clean_bytes_tally\"\t\t\"0\"\n");
-            content.append("\t\t\"time_last_update_verified\"\t\t\"0\"\n");
+            content.append("\t\t\"time_last_update_verified\"\t\t\"")
+                    .append(System.currentTimeMillis() / 1000L)
+                    .append("\"\n");
             content.append("\t\t\"apps\"\n");
             content.append("\t\t{\n");
             for (String appId : installedAppIds) {
@@ -8414,10 +11369,6 @@ private void cleanupEmbeddedSteamRuntime(File gameDir) {
         }
     }
 
-    /**
-     * Marks common redistributables (DirectX, .NET, XNA, OpenAL) as already installed
-     * in the system registry to prevent games from running first-time setup that would fail.
-     */
     private void skipFirstTimeSteamSetup(File containerDir) {
         File systemRegFile = new File(containerDir, ".wine/system.reg");
         if (!systemRegFile.exists()) return;
@@ -8461,7 +11412,7 @@ public WinHandler getWinHandler() {
         return winHandler;
     }
 
-    public XServerView getXServerView() {
+    public XServerSurfaceView getXServerView() {
         return xServerView;
     }
 
@@ -8510,16 +11461,121 @@ private void assignTaskAffinity(Window window) {
         if (taskAffinityMask == 0 && taskAffinityMaskWoW64 == 0) return;
         int processId = window.getProcessId();
         String className = window.getClassName();
-        int processAffinity = window.isWoW64() ? taskAffinityMaskWoW64 : taskAffinityMask;
-
-        if (processAffinity == 0) return;
 
         if (processId > 0) {
-            winHandler.setProcessAffinity(processId, processAffinity);
+            if (taskAffinityMask == taskAffinityMaskWoW64) {
+                winHandler.setProcessAffinity(processId, taskAffinityMask);
+            } else {
+                applyGuestResolvedAffinity(processId, window.isWoW64());
+            }
         }
         else if (!className.isEmpty()) {
-            winHandler.setProcessAffinity(window.getClassName(), processAffinity);
+            int processAffinity = window.isWoW64() ? taskAffinityMaskWoW64 : taskAffinityMask;
+            if (processAffinity != 0) winHandler.setProcessAffinity(className, processAffinity);
+        }
+    }
+
+    // Background service processes have no windows and never pass through
+    // assignTaskAffinity. One complete pass over the guest process list at the
+    // first window map pins every matching instance BY PID (by-name requests
+    // can't address duplicates like the two winedevice hosts). Children spawned
+    // afterwards inherit their parent's mask, so a single early pass keeps the
+    // policy without ever re-sending — manual task manager changes stick.
+    // Services go to the efficiency cores (lower half), shell/UI to the 64-bit
+    // list, winhandler to all cores.
+    private void pinServiceAffinity() {
+        if (serviceAffinityStarted || winHandler == null) return;
+        serviceAffinityStarted = true;
+        new Thread(() -> {
+            final WinHandler wh = winHandler;
+            if (wh == null) return;
+            int coreCount = Runtime.getRuntime().availableProcessors();
+            final int littleMask = ProcessHelper.getAffinityMask(0, coreCount / 2);
+            final int fullMask = ProcessHelper.getAffinityMask(0, coreCount);
+            final CountDownLatch latch = new CountDownLatch(1);
+            final OnGetProcessInfoListener previous = wh.getOnGetProcessInfoListener();
+            final OnGetProcessInfoListener pinner = (index, numProcesses, processInfo) -> {
+                if (previous != null) previous.onGetProcessInfo(index, numProcesses, processInfo);
+                if (processInfo != null) {
+                    int desired = serviceMaskForProcess(processInfo.name, littleMask, fullMask);
+                    if (desired != 0 && processInfo.affinityMask != desired) {
+                        wh.setProcessAffinity(processInfo.pid, desired);
+                    }
+                }
+                if (processInfo == null || index == numProcesses - 1) latch.countDown();
+            };
+            wh.setOnGetProcessInfoListener(pinner);
+            try {
+                wh.listProcesses();
+                if (!latch.await(3000, TimeUnit.MILLISECONDS)) serviceAffinityStarted = false;
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } finally {
+                if (wh.getOnGetProcessInfoListener() == pinner) {
+                    wh.setOnGetProcessInfoListener(previous);
+                }
+            }
+        }, "ServiceAffinityPin").start();
+    }
+
+    private int serviceMaskForProcess(String name, int littleMask, int fullMask) {
+        if (name == null) return 0;
+        if (name.equalsIgnoreCase("winhandler.exe")) return fullMask;
+        for (String service : SERVICE_AFFINITY_PROCESSES) {
+            if (name.equalsIgnoreCase(service)) return littleMask;
+        }
+        for (String shell : SHELL_AFFINITY_PROCESSES) {
+            if (name.equalsIgnoreCase(shell)) return taskAffinityMask;
+        }
+        return 0;
+    }
+
+    // _NET_WM_WOW64 can be absent on 32-bit guest windows, so when the two masks
+    // differ, resolve the wow64 flag from the guest process list and apply once.
+    // The window property is only the fallback if the guest doesn't answer.
+    private void applyGuestResolvedAffinity(final int pid, final boolean windowSaysWoW64) {
+        synchronized (guestAffinityCheckedPids) {
+            if (!guestAffinityCheckedPids.add(pid)) return;
         }
+        new Thread(() -> {
+            final WinHandler handler = winHandler;
+            if (handler == null) return;
+            final CountDownLatch latch = new CountDownLatch(1);
+            final boolean[] resolved = new boolean[1];
+            final OnGetProcessInfoListener previous = handler.getOnGetProcessInfoListener();
+            final OnGetProcessInfoListener resolver = (index, numProcesses, processInfo) -> {
+                if (previous != null) previous.onGetProcessInfo(index, numProcesses, processInfo);
+                if (processInfo != null && processInfo.pid == pid) {
+                    int desired = processInfo.wow64Process ? taskAffinityMaskWoW64 : taskAffinityMask;
+                    Log.d("XServerDisplayActivity", "Guest affinity resolve pid=" + pid
+                            + " wow64=" + processInfo.wow64Process
+                            + " mask=0x" + Integer.toHexString(desired));
+                    if (desired != 0) handler.setProcessAffinity(pid, desired);
+                    resolved[0] = true;
+                    latch.countDown();
+                } else if (processInfo == null || index == numProcesses - 1) {
+                    latch.countDown();
+                }
+            };
+            handler.setOnGetProcessInfoListener(resolver);
+            try {
+                handler.listProcesses();
+                latch.await(3000, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } finally {
+                if (handler.getOnGetProcessInfoListener() == resolver) {
+                    handler.setOnGetProcessInfoListener(previous);
+                }
+            }
+            if (!resolved[0]) {
+                int fallback = windowSaysWoW64 ? taskAffinityMaskWoW64 : taskAffinityMask;
+                if (fallback != 0) handler.setProcessAffinity(pid, fallback);
+                synchronized (guestAffinityCheckedPids) {
+                    guestAffinityCheckedPids.remove(pid);
+                }
+            }
+        }, "GuestAffinityResolve").start();
     }
 
     private void changeFrameRatingVisibility(Window window, Property property) {
@@ -8532,15 +11588,7 @@ private void changeFrameRatingVisibility(Window window, Property property) {
                 return;
             }
 
-            if (frameRating != null && frameRatingWindowId == window.id) {
-                if (effectiveShowFPS) {
-                    if (propName.contains("_MESA_DRV") || propName.contains("_UTIL_LAYER")) {
-                        frameRating.update();
-                    }
-                }
-            }
         } else {
-            // If window is being destroyed, sync/reset regardless of which window it was
             syncFrameRatingWithExistingWindows();
             if (frameRatingWindowId == -1 && !effectiveShowFPS) {
                 Log.d("XServerDisplayActivity", "Hiding hud as no renderer windows remain.");
@@ -8572,22 +11620,25 @@ private void syncFrameRatingWithExistingWindows() {
                 boolean isApp = window.isApplicationWindow();
                 boolean isMapped = window.attributes.isMapped();
                 int area = window.getWidth() * window.getHeight();
-                
+
                 int score = 0;
                 if (isApp) score += 100000000;
                 if (isMapped) score += 10000000;
-                
+
                 String rName = prop.toString().toLowerCase();
                 if (rName.contains("vkd3d")) {
                     score += 6000000;
                 } else if (rName.contains("dxvk")) {
                     score += 5000000;
+                } else if (rName.contains("zink")) {
+                    // Prefer the GL renderer window over a bare-Vulkan probe window.
+                    score += 4500000;
                 } else if (rName.contains("vulkan") || rName.contains("turnip")) {
                     score += 4000000;
                 }
-                
+
                 score += Math.min(area, 3000000);
-                
+
                 if (score > bestScore) {
                     bestScore = score;
                     bestWindow = window;
@@ -8598,35 +11649,108 @@ private void syncFrameRatingWithExistingWindows() {
             }
         }
 
+        boolean hasApp = hasNonShellAppWindow();
+        if (hasApp) gameWindowSeen = true;
+
+        boolean windowChanged = bestWindow != null && frameRatingWindowId != bestWindow.id;
         if (bestWindow != null) {
             lastRendererName = bestRenderer;
             lastGpuName = bestGpu;
+            if (bestWindow.id != rendererWindowId) {
+                rendererWindowId = bestWindow.id;
+                rendererWindowPresented = false;
+            }
             frameRatingWindowId = bestWindow.id;
         } else {
-            lastRendererName = "OpenGL";
-            lastGpuName = null;
+            if (rendererWindowPresented || (gameWindowSeen && !hasApp)) {
+                lastRendererName = "Vulkan";
+                lastGpuName = null;
+                gameWindowSeen = false;
+                rendererWindowId = -1;
+                rendererWindowPresented = false;
+            }
             frameRatingWindowId = -1;
         }
 
         runOnUiThread(() -> {
             frameRating.setRenderer(lastRendererName);
             frameRating.setGpuName(lastGpuName);
+            if (mangoHud != null) {
+                mangoHud.setEngineName(mangoEngineLabel());
+                // New game window: drop loading/menu frames from the averages.
+                if (windowChanged) mangoHud.resetMetrics();
+            }
             updateHUDRenderMode();
         });
     }
 
+    /** True while an application window other than the desktop shell is mapped. */
+    private boolean hasNonShellAppWindow() {
+        if (xServer == null) return false;
+        for (Window w : xServer.windowManager.getWindows()) {
+            if (w.id == xServer.windowManager.rootWindow.id) continue;
+            if (!w.isApplicationWindow()) continue;
+            String cls = w.getClassName();
+            if (cls == null || !cls.toLowerCase().contains("explorer")) return true;
+        }
+        return false;
+    }
+
+    /** Engine label for the Mango HUD: renderer name plus the DXVK version when running DXVK. */
+    private String mangoEngineLabel() {
+        String name = lastRendererName != null ? lastRendererName : "Vulkan";
+        if (name.toLowerCase().contains("dxvk") && dxwrapperConfig != null) {
+            String version = dxwrapperConfig.get("version");
+            if (version != null && !version.isEmpty()) return "DXVK " + version;
+        }
+        return name;
+    }
+
+    private boolean shouldRecordFpsFrame(Window window, WindowManager.FrameSource source) {
+        // Perf recording is driven solely by the record-to-file toggle, independent of HUD/controller.
+        boolean recording = perfController != null && perfController.isActive();
+        boolean mangoVisible = mangoHud != null && mangoHud.getVisibility() == View.VISIBLE;
+        if ((!effectiveShowFPS && !controllerHudMode && !recording && !mangoVisible) || frameRating == null || window == null) return false;
+        if (source == WindowManager.FrameSource.UNKNOWN) return false;
+        if (frameRatingWindowId == window.id) return true;
+        if (isRelatedToFrameRatingWindow(window)) return true;
+        return frameRatingWindowId == -1 || isLikelyGameFrameWindow(window);
+    }
+
+    private boolean isRelatedToFrameRatingWindow(Window window) {
+        if (xServer == null || frameRatingWindowId == -1 || window == null) return false;
+        Window target = xServer.windowManager.getWindow(frameRatingWindowId);
+        if (target == null) return false;
+
+        Window cursor = window;
+        while (cursor != null) {
+            if (cursor == target) return true;
+            cursor = cursor.getParent();
+        }
+
+        cursor = target;
+        while (cursor != null) {
+            if (cursor == window) return true;
+            cursor = cursor.getParent();
+        }
+
+        return false;
+    }
+
+    private boolean isLikelyGameFrameWindow(Window window) {
+        if (xServer == null || window == null || window == xServer.windowManager.rootWindow) return false;
+        if (!window.isInputOutput() || !window.attributes.isMapped()) return false;
+        int area = window.getWidth() * window.getHeight();
+        int screenArea = xServer.screenInfo.width * xServer.screenInfo.height;
+        return window.isApplicationWindow() || area >= Math.max(1, screenArea / 4);
+    }
+
     private void updateHUDRenderMode() {
-        // Render mode is always CONTINUOUSLY for best game performance
     }
 
-    /**
-     * Find the primary game executable in a directory.
-     * Uses breadth-first search to prefer root-level exes over deeply nested ones.
-     */
     private File findGameExe(File dir) {
         if (dir == null || !dir.exists()) return null;
         
-        // BFS: check each level fully before going deeper
         java.util.LinkedList<File[]> queue = new java.util.LinkedList<>();
         queue.add(new File[]{dir});
         int depth = 0;
@@ -8661,7 +11785,6 @@ private File findGameExe(File dir) {
                 }
             }
 
-            // Prefer 64-bit executable candidates at the current depth
             for (File cand : candidates) {
                 if (cand.getName().toLowerCase().contains("64") || 
                     (cand.getParentFile() != null && cand.getParentFile().getName().toLowerCase().contains("64"))) {
@@ -8669,7 +11792,6 @@ private File findGameExe(File dir) {
                 }
             }
 
-            // Collect the first valid candidate as a fallback
             if (fallbackExe == null && !candidates.isEmpty()) {
                 fallbackExe = candidates.get(0);
             }
diff --git a/app/src/main/runtime/display/XServerDisplayHost.kt b/app/src/main/runtime/display/XServerDisplayHost.kt
index 4758aa8a7..b93475a2b 100644
--- a/app/src/main/runtime/display/XServerDisplayHost.kt
+++ b/app/src/main/runtime/display/XServerDisplayHost.kt
@@ -7,14 +7,25 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.collectAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
 import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -29,16 +40,17 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.changedToUpIgnoreConsumed
 import androidx.compose.ui.input.pointer.positionChange
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalViewConfiguration
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.zIndex
+import com.winlator.cmod.R
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import kotlinx.coroutines.launch
 import kotlin.math.abs
@@ -46,7 +58,13 @@ import kotlin.math.roundToInt
 
 const val XSERVER_DRAWER_EDGE_SWIPE_DP = 35
 
-private val DrawerWidth = 340.dp
+// Horizontal swipe distance to open the drawer; shared with XServerDisplayActivity.
+const val XSERVER_DRAWER_OPEN_TRIGGER_DP = 32
+
+// Open only on a clearly rightward swipe: dx must exceed this * |dy| (~27deg of horizontal).
+const val XSERVER_DRAWER_OPEN_HORIZONTAL_RATIO = 2f
+
+private val DrawerWidth = 300.dp
 private val DrawerStartPadding = 6.dp
 private val DrawerVerticalPadding = 6.dp
 private const val DrawerSettleAnimationMs = 200
@@ -68,6 +86,8 @@ interface XServerDisplayHostCallbacks {
     fun onDrawerGestureClaimed()
 
     fun onDialogVisibilityChanged(visible: Boolean)
+
+    fun isControllerConnected(): Boolean
 }
 
 fun setupXServerDisplayHost(
@@ -98,18 +118,22 @@ private fun XServerDisplayHost(
     val animationScope = rememberCoroutineScope()
     val density = LocalDensity.current
     val viewConfiguration = LocalViewConfiguration.current
-    var drawerOffsetPx by remember { mutableFloatStateOf(0f) }
+    val closedFallbackPx = with(density) { -(DrawerWidth + DrawerStartPadding).toPx() }
+    var drawerOffsetPx by remember { mutableFloatStateOf(closedFallbackPx) }
     var drawerWidthPx by remember { mutableFloatStateOf(0f) }
     val drawerClosedOffset =
         if (drawerWidthPx > 0f) {
             -drawerWidthPx - with(density) { DrawerStartPadding.toPx() }
         } else {
-            0f
+            closedFallbackPx
         }
     val drawerOpenOffset = 0f
-    val drawerSheetVisible = drawerWidthPx <= 0f ||
+    // "Engaged" = on or sliding onto the screen; drives the card-reveal animation (the content itself is always composed).
+    val drawerEngaged = drawerWidthPx <= 0f ||
         drawerOffsetPx > drawerClosedOffset + 1f ||
         stateHolder.isDrawerOpen
+    val drawerContentComposed = stateHolder.isDrawerOpen ||
+        (drawerWidthPx > 0f && drawerOffsetPx > drawerClosedOffset + 1f)
     val dialogVisible = false
 
     DisposableEffect(stateHolder) {
@@ -120,7 +144,7 @@ private fun XServerDisplayHost(
     }
 
     LaunchedEffect(drawerWidthPx) {
-        if (drawerWidthPx > 0f && drawerOffsetPx == 0f && !stateHolder.isDrawerOpen) {
+        if (drawerWidthPx > 0f && drawerOffsetPx < 0f && !stateHolder.isDrawerOpen) {
             drawerOffsetPx = drawerClosedOffset
         }
     }
@@ -150,8 +174,13 @@ private fun XServerDisplayHost(
         callbacks.onDialogVisibilityChanged(dialogVisible)
     }
 
+    // On swap-back, re-measure the hosted display frame so the reparented surface reclaims full size.
+    LaunchedEffect(stateHolder.phoneRelayoutTick) {
+        if (stateHolder.phoneRelayoutTick > 0) displayFrame.requestLayout()
+    }
+
     WinNativeTheme {
-        Box(
+        BoxWithConstraints(
             modifier =
                 Modifier
                     .fillMaxSize()
@@ -161,6 +190,7 @@ private fun XServerDisplayHost(
                             if (dialogVisible || drawerWidthPx <= 0f) return@awaitEachGesture
 
                             val edgeWidthPx = XSERVER_DRAWER_EDGE_SWIPE_DP.dp.toPx()
+                            val openTriggerPx = XSERVER_DRAWER_OPEN_TRIGGER_DP.dp.toPx()
                             val canStartFromHere =
                                 if (stateHolder.isDrawerOpen) {
                                     down.position.x >= drawerWidthPx &&
@@ -169,7 +199,8 @@ private fun XServerDisplayHost(
                                     down.position.x <= edgeWidthPx
                                 }
                             if (!canStartFromHere) {
-                                if (stateHolder.isDrawerOpen && down.position.x > drawerWidthPx) {
+                                if (stateHolder.isDrawerOpen && down.position.x > drawerWidthPx
+                                    && !callbacks.isControllerConnected()) {
                                     stateHolder.closeDrawer()
                                 }
                                 return@awaitEachGesture
@@ -199,7 +230,8 @@ private fun XServerDisplayHost(
                                         if (stateHolder.isDrawerOpen) {
                                             totalDx < -viewConfiguration.touchSlop && abs(totalDx) > abs(totalDy)
                                         } else {
-                                            totalDx > viewConfiguration.touchSlop && totalDx > abs(totalDy)
+                                            totalDx > openTriggerPx &&
+                                                totalDx > abs(totalDy) * XSERVER_DRAWER_OPEN_HORIZONTAL_RATIO
                                         }
                                     if (horizontalDragClaimed) {
                                         gestureClaimed = true
@@ -255,6 +287,22 @@ private fun XServerDisplayHost(
                         }
                     },
         ) {
+            val drawerTopInset = DrawerVerticalPadding
+            val originalHeight = maxHeight - DrawerVerticalPadding * 2
+            val drawerHeight = maxHeight - drawerTopInset - DrawerVerticalPadding
+            val evenScale =
+                if (originalHeight > 0.dp) {
+                    (drawerHeight / originalHeight).coerceIn(0.6f, 1f)
+                } else {
+                    1f
+                }
+            val scaledDrawerWidth = DrawerWidth * evenScale
+            // Derived, not measured, so the sheet need not exist while closed.
+            val scaledDrawerWidthPx = with(density) { scaledDrawerWidth.toPx() }
+            LaunchedEffect(scaledDrawerWidthPx) {
+                drawerWidthPx = scaledDrawerWidthPx
+            }
+
             CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
                 AndroidView(
                     factory = { displayFrame },
@@ -266,29 +314,55 @@ private fun XServerDisplayHost(
                 )
             }
 
-            ModalDrawerSheet(
-                drawerShape = RoundedCornerShape(20.dp),
-                drawerContainerColor = PaneSurfaceColor,
-                drawerContentColor = Color.Unspecified,
-                drawerTonalElevation = 0.dp,
-                windowInsets = WindowInsets(0, 0, 0, 0),
-                modifier =
-                    Modifier
-                        .zIndex(2f)
-                        .padding(start = DrawerStartPadding, top = DrawerVerticalPadding, bottom = DrawerVerticalPadding)
-                        .fillMaxHeight()
-                        .width(DrawerWidth)
-                        .onSizeChanged { size ->
-                            drawerWidthPx = size.width.toFloat()
-                        }
-                        .offset {
-                            androidx.compose.ui.unit.IntOffset(
-                                drawerOffsetPx.roundToInt(),
-                                0,
+            // Performance HUD: half the screen (left in landscape, top in portrait), consuming its own touches so the rest stays a trackpad. Hosted here, not a nested ComposeView.
+            val perfHudVisible by PerformanceHudState.visible.collectAsState()
+            if (perfHudVisible) {
+                val landscape =
+                    LocalConfiguration.current.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
+                Box(
+                    modifier =
+                        Modifier
+                            .zIndex(1f)
+                            .then(
+                                if (landscape) {
+                                    Modifier.fillMaxHeight().fillMaxWidth(0.5f).align(Alignment.CenterStart)
+                                } else {
+                                    Modifier.fillMaxWidth().fillMaxHeight(0.5f).align(Alignment.TopCenter)
+                                },
                             )
-                        },
-            ) {
-                if (drawerSheetVisible) {
+                            .pointerInput(Unit) {
+                                awaitPointerEventScope {
+                                    while (true) {
+                                        awaitPointerEvent().changes.forEach { it.consume() }
+                                    }
+                                }
+                            },
+                ) {
+                    PerformanceHudOverlay()
+                }
+            }
+
+            // Closed, the sheet sits flush on the edge and its rounded corners leak a hairline.
+            if (drawerContentComposed) {
+                ModalDrawerSheet(
+                    drawerShape = RoundedCornerShape(20.dp),
+                    drawerContainerColor = PaneSurfaceColor,
+                    drawerContentColor = Color.Unspecified,
+                    drawerTonalElevation = 0.dp,
+                    windowInsets = WindowInsets(0, 0, 0, 0),
+                    modifier =
+                        Modifier
+                            .zIndex(2f)
+                            .padding(start = DrawerStartPadding, top = drawerTopInset, bottom = DrawerVerticalPadding)
+                            .fillMaxHeight()
+                            .width(scaledDrawerWidth)
+                            .offset {
+                                androidx.compose.ui.unit.IntOffset(
+                                    drawerOffsetPx.roundToInt(),
+                                    0,
+                                )
+                            },
+                ) {
                     XServerDrawerContent(
                         state = stateHolder.state,
                         taskManagerState = stateHolder.taskManagerState,
@@ -297,6 +371,18 @@ private fun XServerDisplayHost(
                         onOpenPaneChange = { stateHolder.setOpenPaneAndNotify(it) },
                         listener = listener,
                         onDismiss = { stateHolder.closeDrawer() },
+                        revealCards = drawerEngaged,
+                        menuNavRegion = stateHolder.menuNavRegion,
+                        menuNavIndex = stateHolder.menuNavIndex,
+                        menuActivateSignal = stateHolder.menuActivateSignal,
+                        onSetTabCount = { stateHolder.setMenuTabCount(it) },
+                        onSetCardLayout = { c, cols -> stateHolder.setMenuCardLayout(c, cols) },
+                        onSetBottomCount = { stateHolder.setMenuBottomCount(it) },
+                        onCursor = { r, i -> stateHolder.setMenuNav(r, i) },
+                        paneNavSignal = stateHolder.paneNavSignal,
+                        paneNavDir = stateHolder.paneNavDir,
+                        controllerActive = stateHolder.controllerConnected,
+                        onOverlayCloserChange = { stateHolder.paneOverlayCloser = it },
                     )
                 }
             }
diff --git a/app/src/main/runtime/display/XServerDisplayUtils.java b/app/src/main/runtime/display/XServerDisplayUtils.java
new file mode 100644
index 000000000..1edc335ed
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDisplayUtils.java
@@ -0,0 +1,183 @@
+package com.winlator.cmod.runtime.display;
+import com.winlator.cmod.runtime.content.ContentProfile;
+import com.winlator.cmod.runtime.content.ContentsManager;
+import com.winlator.cmod.runtime.system.ProcessHelper;
+import java.io.File;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+// Pure stateless helpers split out of XServerDisplayActivity (behavior-identical).
+final class XServerDisplayUtils {
+    private XServerDisplayUtils() {}
+
+    // Builds a WINEDEBUG value enabling only the chosen message classes on the
+    // chosen channels. "-all" first zeroes every class so unchosen ones (notably
+    // trace) stay off, then each "class+channel" turns one class on.
+    static String buildWineDebug(String classesCsv, String channelsCsv) {
+        java.util.List<String> classes = splitCsv(classesCsv);
+        java.util.List<String> channels = splitCsv(channelsCsv);
+        if (classes.isEmpty() || channels.isEmpty()) return "-all";
+        StringBuilder sb = new StringBuilder("-all");
+        for (String channel : channels) {
+            for (String cls : classes) {
+                sb.append(',').append(cls).append('+').append(channel);
+            }
+        }
+        return sb.toString();
+    }
+
+    static java.util.List<String> splitCsv(String value) {
+        java.util.List<String> out = new java.util.ArrayList<>();
+        if (value == null) return out;
+        for (String part : value.split(",")) {
+            String token = part.trim();
+            if (!token.isEmpty()) out.add(token);
+        }
+        return out;
+    }
+
+    static boolean isSteamExeRunning() {
+        for (String detail : ProcessHelper.listRunningWineProcessDetails()) {
+            if (detail.toLowerCase().contains("steam.exe")) return true;
+        }
+        return false;
+    }
+
+    static boolean wnLauncherLogContains(File log, String marker) {
+        if (log == null || !log.isFile()) return false;
+        try (java.io.BufferedReader reader = new java.io.BufferedReader(
+                new java.io.InputStreamReader(new java.io.FileInputStream(log)))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.contains(marker)) return true;
+            }
+        } catch (Exception ignored) {}
+        return false;
+    }
+
+    static int clampSGSRUpscaleMode(int mode) {
+        return SGSRResolutionUtils.clampUpscaleMode(mode);
+    }
+
+    static int normalizeSGSRShortcutUpscaleMode(int mode) {
+        return SGSRResolutionUtils.normalizeShortcutUpscaleMode(mode);
+    }
+
+    static float clampHudAlpha(float v) {
+        return Math.max(0.1f, Math.min(1.0f, v));
+    }
+
+    static String resTierLabel(int shortSide) {
+        switch (shortSide) {
+            case 2160: return "4K";
+            case 1440: return "2K";
+            case 1080: return "1080p";
+            case 720:  return "720p";
+            default:   return shortSide + "p";
+        }
+    }
+
+    static int tierShortForLabel(String label) {
+        switch (label) {
+            case "4K":    return 2160;
+            case "2K":    return 1440;
+            case "1080p": return 1080;
+            case "720p":  return 720;
+            default:      return 0;
+        }
+    }
+
+    // Quality preset → bits-per-pixel·frame, then bitrate, clamped to a sane window.
+    static int recordBitrate(int w, int h, int fps, int quality) {
+        double bpp;
+        switch (quality) {
+            case 0:  bpp = 0.035; break; // Performance
+            case 1:  bpp = 0.075; break; // Balance
+            default: bpp = 0.15;  break; // Quality
+        }
+        long bps = (long) (w * (long) h * fps * bpp);
+        return (int) Math.max(2_000_000L, Math.min(bps, 80_000_000L));
+    }
+
+    static String contentVersionIdentifier(ContentProfile profile) {
+        String entryName = ContentsManager.getEntryName(profile);
+        int firstDash = entryName.indexOf('-');
+        return firstDash >= 0 ? entryName.substring(firstDash + 1) : entryName;
+    }
+
+    static boolean safeEquals(String a, String b) {
+        return a != null && a.equals(b);
+    }
+
+    static String findDelimitedWrapper(String value, String prefix) {
+        if (value == null) return null;
+        for (String part : value.split(";")) {
+            if (part.startsWith(prefix)) return part;
+        }
+        return null;
+    }
+
+    static boolean hasSelectedVkd3dVersion(String version) {
+        return version != null && !version.isEmpty() && !version.equalsIgnoreCase("None");
+    }
+
+    static boolean hasSelectedDxvkWrapper(String dxvkWrapper) {
+        if (dxvkWrapper == null) return false;
+        String version = dxvkWrapper.startsWith("dxvk-")
+                ? dxvkWrapper.substring("dxvk-".length())
+                : dxvkWrapper;
+        return !version.trim().isEmpty() && !version.equalsIgnoreCase("None");
+    }
+
+    static int compareVersion(String varA, String varB) {
+        int[] a = parseSemverLoose(varA);
+        int[] b = parseSemverLoose(varB);
+
+        if (a[0] != b[0]) return a[0] - b[0];
+        if (a[1] != b[1]) return a[1] - b[1];
+        return a[2] - b[2];
+    }
+
+    static final Pattern SEMVER_LOOSE =
+            Pattern.compile("(\\d+)\\.(\\d+)(?:\\.(\\d+))?");
+
+    static int[] parseSemverLoose(String s) {
+        if (s == null) return new int[]{0, 0, 0};
+
+        Matcher m = SEMVER_LOOSE.matcher(s);
+
+        String g1 = null, g2 = null, g3 = null;
+        while (m.find()) {
+            g1 = m.group(1);
+            g2 = m.group(2);
+            g3 = m.group(3);
+        }
+
+        if (g1 == null || g2 == null) {
+            return new int[]{0, 0, 0};
+        }
+
+        int major = safeParseInt(g1);
+        int minor = safeParseInt(g2);
+        int patch = safeParseInt(g3);
+        return new int[]{major, minor, patch};
+    }
+
+    static int safeParseInt(String s) {
+        if (s == null || s.isEmpty()) return 0;
+        try {
+            return Integer.parseInt(s);
+        } catch (NumberFormatException ignored) {
+            return 0;
+        }
+    }
+
+    /** Base file name of a Windows/Unix exe path (handles both '\\' and '/' separators). */
+    static String exeBaseName(String path) {
+        if (path == null) return "";
+        String normalized = path.replace('\\', '/');
+        int slash = normalized.lastIndexOf('/');
+        if (slash >= 0) normalized = normalized.substring(slash + 1);
+        return normalized.trim();
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerControlsPane.kt b/app/src/main/runtime/display/XServerDrawerControlsPane.kt
new file mode 100644
index 000000000..858fc3e22
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerControlsPane.kt
@@ -0,0 +1,720 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Input-controls pane composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun InputControlsPaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+) {
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight, ControlsPaneScaleMin)
+        val scrollState = rememberScrollState()
+        val gcmEnabled = state.inputControlsGcmRumbleMode != "disabled"
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(scrollState)
+                        .padding(
+                            start = (12f * paneScale).dp,
+                            end = (12f * paneScale).dp,
+                            top = (4f * paneScale).dp,
+                            bottom = (12f * paneScale).dp,
+                        ),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.input_controls_editor_select_profile))
+                    InputControlsProfileSelector(
+                        profileNames = state.inputControlsProfileNames,
+                        selectedIndex = state.inputControlsSelectedProfileIndex,
+                        onProfileSelected = listener::onInputControlsProfileSelected,
+                        onEditClick = listener::onInputControlsEditClick,
+                    )
+                }
+
+                if (state.inputControlsStyleNames.isNotEmpty()) {
+                    Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                        PaneSectionLabel(stringResource(R.string.input_controls_select_style))
+                        InputControlsSimpleDropdown(
+                            options = state.inputControlsStyleNames,
+                            selectedIndex = state.inputControlsSelectedStyleIndex,
+                            onSelected = listener::onInputControlsStyleSelected,
+                        )
+                    }
+                }
+
+                if (state.inputControlsAccentThemeNames.isNotEmpty()) {
+                    Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                        PaneSectionLabel(stringResource(R.string.input_controls_accent_theme))
+                        InputControlsSimpleDropdown(
+                            options = state.inputControlsAccentThemeNames,
+                            selectedIndex = state.inputControlsSelectedAccentThemeIndex,
+                            onSelected = listener::onInputControlsAccentThemeSelected,
+                        )
+                    }
+                }
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_drawer_show_touchscreen_controls),
+                    checked = state.inputControlsShowOverlay,
+                    onCheckedChange = listener::onInputControlsShowOverlayChanged,
+                )
+
+                if (state.inputControlsShowOverlay) {
+                    NavSliderRow(
+                        label = stringResource(R.string.input_controls_editor_overlay_opacity),
+                        valueText = "${(state.inputControlsOverlayOpacity * 100).toInt()}%",
+                        value = state.inputControlsOverlayOpacity,
+                        valueRange = 0.1f..1.0f,
+                        steps = 17,
+                        onValueChange = listener::onInputControlsOverlayOpacityChanged,
+                    )
+                    Spacer(Modifier.height(4.dp))
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.input_controls_tap_to_click),
+                        checked = state.inputControlsTapToClick,
+                        onCheckedChange = listener::onInputControlsTapToClickChanged,
+                    )
+                }
+
+                NavBooleanRow(
+                    title = stringResource(R.string.settings_general_touchscreen_haptics),
+                    checked = state.inputControlsTouchscreenHaptics,
+                    onCheckedChange = listener::onInputControlsTouchscreenHapticsChanged,
+                )
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_gamepad_enable_vibration),
+                    checked = state.inputControlsGamepadVibration,
+                    onCheckedChange = listener::onInputControlsGamepadVibrationChanged,
+                )
+
+                NavSliderRow(
+                    label = "Mouse sensitivity scale",
+                    valueText = "${Math.round(state.cursorSpeed * 100)}%",
+                    value = state.cursorSpeed * 100f,
+                    valueRange = 10f..300f,
+                    steps = 0,
+                    onValueChange = { listener.onCursorSpeedChanged(it / 100f) },
+                    adjustStep = 5f,
+                )
+
+                val rsMapMode = state.screenTouchMode == 2
+                val rsValue = if (rsMapMode) state.screenTouchRsSensitivity else state.rightStickSensitivity
+                NavSliderRow(
+                    label = stringResource(R.string.session_drawer_right_stick_sensitivity),
+                    valueText = "${Math.round(rsValue * 100)}%",
+                    value = rsValue * 100f,
+                    valueRange = (if (rsMapMode) 25f else 10f)..200f,
+                    steps = 0,
+                    onValueChange = { listener.onRightStickSensitivityChanged(it / 100f) },
+                    adjustStep = 5f,
+                )
+
+                LaunchedEffect(gcmEnabled) {
+                    if (gcmEnabled) scrollState.animateScrollTo(Int.MAX_VALUE)
+                }
+
+                NavBooleanRow(
+                    title = "GameSir Controller Rumble",
+                    subtitle = "For Android-mode GameSir controllers only",
+                    checked = gcmEnabled,
+                    onCheckedChange = { enabled ->
+                        listener.onInputControlsGcmRumbleModeChanged(if (enabled) "known" else "disabled")
+                    },
+                )
+
+                if (gcmEnabled) {
+                    Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+                        ) {
+                            HUDToggleChip(
+                                label = "Known",
+                                checked = state.inputControlsGcmRumbleMode == "known",
+                                onClick = { listener.onInputControlsGcmRumbleModeChanged("known") },
+                                modifier = Modifier.weight(1f).paneNavItem(
+                                    cornerRadius = (16f * paneScale).dp,
+                                    onActivate = { listener.onInputControlsGcmRumbleModeChanged("known") },
+                                ),
+                            )
+                            HUDToggleChip(
+                                label = "All (experimental)",
+                                checked = state.inputControlsGcmRumbleMode == "all",
+                                onClick = { listener.onInputControlsGcmRumbleModeChanged("all") },
+                                modifier = Modifier.weight(1f).paneNavItem(
+                                    cornerRadius = (16f * paneScale).dp,
+                                    onActivate = { listener.onInputControlsGcmRumbleModeChanged("all") },
+                                ),
+                            )
+                        }
+                        Text(
+                            text = if (state.inputControlsGcmRumbleMode == "all")
+                                "All GameSir devices"
+                            else
+                                "G8+ MFi, X5s, X3 Pro",
+                            color = DrawerTextSecondary,
+                            fontSize = (11f * paneScale).sp,
+                        )
+                    }
+                }
+
+                NavBooleanRow(
+                    title = stringResource(R.string.input_controls_reverse_binding_order),
+                    checked = state.inputControlsReverseBindingOrder,
+                    onCheckedChange = listener::onInputControlsReverseBindingOrderChanged,
+                )
+            }
+        }
+    }
+}
+
+/** Compact dropdown for the Controls Style/Label-Theme rows; like [InputControlsProfileSelector] but without the edit button (built-in, non-editable choices). */
+@Composable
+internal fun InputControlsSimpleDropdown(
+    options: List<String>,
+    selectedIndex: Int,
+    onSelected: (Int) -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    var expanded by remember { mutableStateOf(false) }
+    val selectedText = options.getOrElse(selectedIndex) { options.firstOrNull() ?: "" }
+    val parentNav = LocalPaneNav.current
+    val optionRegistry = remember { PaneNavRegistry() }
+    LaunchedEffect(expanded) {
+        if (expanded) {
+            optionRegistry.reset()
+            optionRegistry.controllerActive = true
+            parentNav?.overlay = optionRegistry
+            parentNav?.overlayClose = { expanded = false }
+        } else if (parentNav?.overlay === optionRegistry) {
+            parentNav.overlay = null
+            parentNav.overlayClose = null
+        }
+    }
+
+    val cornerRadius = (14f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
+        animationSpec = tween(140),
+        label = "inputControlsSimpleBg",
+    )
+
+    Box(modifier = Modifier.fillMaxWidth()) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(shape)
+                    .background(bgColor)
+                    .border(1.dp, RestingCardBorder, shape)
+                    .paneNavItem(
+                        cornerRadius = cornerRadius,
+                        onActivate = { expanded = true },
+                        onAdjust = { dir ->
+                            if (options.isNotEmpty()) {
+                                onSelected(((selectedIndex + dir) % options.size + options.size) % options.size)
+                            }
+                        },
+                    )
+                    .clickable(
+                        interactionSource = interactionSource,
+                        indication = null,
+                    ) { expanded = true }
+                    .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = selectedText,
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f),
+            )
+            Icon(
+                imageVector = Icons.Outlined.ArrowDropDown,
+                contentDescription = null,
+                tint = DrawerTextSecondary,
+                modifier = Modifier.size((22f * paneScale).dp),
+            )
+        }
+
+        InputControlsOptionsPopup(
+            expanded = expanded,
+            options = options,
+            selectedIndex = selectedIndex,
+            onSelected = onSelected,
+            onDismiss = { expanded = false },
+            optionRegistry = optionRegistry,
+        )
+    }
+}
+
+@Composable
+internal fun InputControlsProfileSelector(
+    profileNames: List<String>,
+    selectedIndex: Int,
+    onProfileSelected: (Int) -> Unit,
+    onEditClick: () -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    var expanded by remember { mutableStateOf(false) }
+    val disabledPlaceholder = stringResource(R.string.common_ui_disabled_placeholder)
+    val selectedText = profileNames.getOrElse(selectedIndex) { disabledPlaceholder }
+    val parentNav = LocalPaneNav.current
+    val optionRegistry = remember { PaneNavRegistry() }
+    LaunchedEffect(expanded) {
+        if (expanded) {
+            optionRegistry.reset()
+            optionRegistry.controllerActive = true
+            parentNav?.overlay = optionRegistry
+            parentNav?.overlayClose = { expanded = false }
+        } else if (parentNav?.overlay === optionRegistry) {
+            parentNav.overlay = null
+            parentNav.overlayClose = null
+        }
+    }
+
+    val cornerRadius = (14f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
+        animationSpec = tween(140),
+        label = "inputControlsProfileBg",
+    )
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(modifier = Modifier.weight(1f)) {
+            Row(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .clip(shape)
+                        .background(bgColor)
+                        .border(1.dp, RestingCardBorder, shape)
+                        .paneNavItem(cornerRadius = cornerRadius, onActivate = { expanded = true })
+                        .clickable(
+                            interactionSource = interactionSource,
+                            indication = null,
+                        ) { expanded = true }
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = selectedText,
+                    color = DrawerTextPrimary,
+                    fontSize = (14f * paneScale).sp,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f),
+                )
+                Icon(
+                    imageVector = Icons.Outlined.ArrowDropDown,
+                    contentDescription = null,
+                    tint = DrawerTextSecondary,
+                    modifier = Modifier.size((22f * paneScale).dp),
+                )
+            }
+
+            InputControlsOptionsPopup(
+                expanded = expanded,
+                options = profileNames,
+                selectedIndex = selectedIndex,
+                onSelected = onProfileSelected,
+                onDismiss = { expanded = false },
+                optionRegistry = optionRegistry,
+            )
+        }
+
+        Box(
+            modifier =
+                Modifier
+                    .size((44f * paneScale).dp)
+                    .clip(shape)
+                    .background(PaneInnerResting)
+                    .border(1.dp, RestingCardBorder, shape)
+                    .paneNavItem(cornerRadius = cornerRadius, onActivate = onEditClick)
+                    .clickable(onClick = onEditClick),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Settings,
+                contentDescription = stringResource(R.string.common_ui_settings),
+                tint = DrawerTextPrimary,
+                modifier = Modifier.size((20f * paneScale).dp),
+            )
+        }
+    }
+}
+
+// Drawer-styled dropdown for the Controls selectors.
+@Composable
+internal fun InputControlsOptionsPopup(
+    expanded: Boolean,
+    options: List<String>,
+    selectedIndex: Int,
+    onSelected: (Int) -> Unit,
+    onDismiss: () -> Unit,
+    optionRegistry: PaneNavRegistry,
+) {
+    if (!expanded) return
+    val paneScale = LocalPaneScale.current
+    val density = LocalDensity.current
+    val gapPx = with(density) { (4f * paneScale).dp.roundToPx() }
+    val shape = RoundedCornerShape((12f * paneScale).dp)
+    val scrollState = rememberScrollState()
+    Popup(
+        popupPositionProvider = remember(gapPx) { TaskManagerPopupPositionProvider(gapPx) },
+        onDismissRequest = onDismiss,
+        properties = PopupProperties(focusable = false),
+    ) {
+        CompositionLocalProvider(LocalPaneNav provides optionRegistry) {
+            Column(
+                modifier =
+                    Modifier
+                        .widthIn(min = (160f * paneScale).dp, max = (280f * paneScale).dp)
+                        .clip(shape)
+                        .background(PaneSurfaceColor)
+                        .border(1.dp, RestingCardBorder, shape)
+                        .heightIn(max = (260f * paneScale).dp)
+                        .verticalScroll(scrollState)
+                        .padding((5f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
+            ) {
+                options.forEachIndexed { index, name ->
+                    InputControlsOptionItem(
+                        label = name,
+                        selected = index == selectedIndex,
+                        onClick = {
+                            onSelected(index)
+                            onDismiss()
+                        },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun InputControlsOptionItem(
+    label: String,
+    selected: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) DrawerAccent.copy(alpha = 0.16f) else PaneInnerResting,
+        animationSpec = tween(120),
+        label = "inputControlsOptionItem",
+    )
+    val shape = RoundedCornerShape((8f * paneScale).dp)
+    Row(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, if (selected) ActiveCardBorder else RestingCardBorder, shape)
+                .paneNavItem(cornerRadius = (8f * paneScale).dp, onActivate = onClick)
+                .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+                .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+    ) {
+        Text(
+            text = label,
+            color = if (selected) DrawerAccent else DrawerTextPrimary,
+            fontSize = (13f * paneScale).sp,
+            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.weight(1f),
+        )
+        if (selected) {
+            Icon(
+                imageVector = Icons.Outlined.Check,
+                contentDescription = null,
+                tint = DrawerAccent,
+                modifier = Modifier.size((16f * paneScale).dp),
+            )
+        }
+    }
+}
+
+@Composable
+internal fun ExpandableSection(
+    title: String,
+    expanded: Boolean,
+    onToggle: () -> Unit,
+    content: @Composable () -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    val rotation by animateFloatAsState(
+        targetValue = if (expanded) 180f else 0f,
+        animationSpec = tween(180, easing = FastOutSlowInEasing),
+        label = "expandableRotation",
+    )
+    val headerInteractionSource = remember { MutableInteractionSource() }
+    val headerPressed = headerInteractionSource.collectIsPressedAsState().value
+    val headerBg by animateColorAsState(
+        targetValue =
+            when {
+                headerPressed -> PaneInnerPressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(140),
+        label = "expandableHeaderBg",
+    )
+    val headerBorder by animateColorAsState(
+        targetValue = if (expanded) DrawerAccent else RestingCardBorder,
+        animationSpec = tween(140),
+        label = "expandableHeaderBorder",
+    )
+    val headerShape = RoundedCornerShape((12f * paneScale).dp)
+    Column(verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp)) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(headerShape)
+                    .background(headerBg)
+                    .border(1.dp, headerBorder, headerShape)
+                    .paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = onToggle)
+                    .clickable(
+                        interactionSource = headerInteractionSource,
+                        indication = null,
+                        onClick = onToggle,
+                    )
+                    .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = title,
+                color = if (expanded) DrawerAccent else DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+                letterSpacing = 0.3.sp,
+                modifier = Modifier.weight(1f),
+            )
+            Icon(
+                imageVector = Icons.Outlined.ExpandMore,
+                contentDescription = null,
+                tint = if (expanded) DrawerAccent else DrawerTextSecondary,
+                modifier =
+                    Modifier
+                        .size((18f * paneScale).dp)
+                        .graphicsLayer { rotationZ = rotation },
+            )
+        }
+        AnimatedVisibility(visible = expanded) {
+            Column(verticalArrangement = Arrangement.spacedBy((12f * paneScale).dp)) {
+                content()
+            }
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerEffectsPane.kt b/app/src/main/runtime/display/XServerDrawerEffectsPane.kt
new file mode 100644
index 000000000..fda9ebd6a
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerEffectsPane.kt
@@ -0,0 +1,466 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Screen-effects pane composable, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun ScreenEffectsPaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+) {
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.shortcuts_graphics_sgsr_full_title))
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_upscaler_fsr),
+                        checked = state.sgsrEnabled,
+                        onCheckedChange = listener::onSGSREnabledChanged,
+                    )
+
+                    AnimatedVisibility(
+                        visible = state.sgsrEnabled,
+                        enter =
+                            expandVertically(
+                                animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing),
+                                expandFrom = Alignment.Top,
+                            ) + fadeIn(animationSpec = tween(durationMillis = 160, easing = FastOutSlowInEasing)),
+                        exit =
+                            shrinkVertically(
+                                animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
+                                shrinkTowards = Alignment.Top,
+                            ) + fadeOut(animationSpec = tween(durationMillis = 120, easing = FastOutSlowInEasing)),
+                    ) {
+                        Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                            NavSliderRow(
+                                label = stringResource(R.string.session_drawer_sgsr_edge_sharpness),
+                                valueText = "${state.sgsrSharpness}%",
+                                value = state.sgsrSharpness.toFloat(),
+                                valueRange = 0f..100f,
+                                steps = 99,
+                                onValueChange = { listener.onSGSRSharpnessChanged(it.roundToInt().coerceIn(0, 100)) },
+                            )
+                        }
+                    }
+                }
+
+                ThinDivider()
+
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.session_drawer_color_profile))
+
+                    val profiles =
+                        listOf(
+                            0 to stringResource(R.string.session_drawer_color_profile_disabled),
+                            1 to stringResource(R.string.session_drawer_color_profile_hdr),
+                            2 to stringResource(R.string.session_drawer_color_profile_natural),
+                            4 to stringResource(R.string.session_drawer_color_profile_toon),
+                            3 to stringResource(R.string.session_drawer_color_profile_crt),
+                            5 to stringResource(R.string.session_drawer_color_profile_ntsc),
+                            6 to stringResource(R.string.session_drawer_color_profile_ntsc2),
+                        )
+
+                    ChipFlow {
+                        profiles.forEach { (id, label) ->
+                            HUDToggleChip(
+                                label = label,
+                                checked = state.colorProfile == id,
+                                onClick = { listener.onColorProfileSelected(id) },
+                                modifier = Modifier.paneNavItem(
+                                    cornerRadius = (16f * paneScale).dp,
+                                    onActivate = { listener.onColorProfileSelected(id) },
+                                ),
+                            )
+                        }
+                    }
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_vivid),
+                        checked = state.vividEnabled,
+                        onCheckedChange = listener::onVividEnabledChanged,
+                    )
+
+                    if (state.vividEnabled) {
+                        NavSliderRow(
+                            label = stringResource(R.string.session_drawer_vivid_strength),
+                            valueText = "${state.vividStrength}%",
+                            value = state.vividStrength.toFloat(),
+                            valueRange = 0f..100f,
+                            steps = 99,
+                            onValueChange = { listener.onVividStrengthChanged(it.roundToInt()) },
+                        )
+                    }
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_sharpen),
+                        checked = state.sharpenEnabled,
+                        onCheckedChange = listener::onSharpenEnabledChanged,
+                    )
+
+                    if (state.sharpenEnabled) {
+                        NavSliderRow(
+                            label = stringResource(R.string.session_drawer_strength),
+                            valueText = "${state.sharpenStrength}%",
+                            value = state.sharpenStrength.toFloat(),
+                            valueRange = 0f..100f,
+                            steps = 99,
+                            onValueChange = { listener.onSharpenStrengthChanged(it.roundToInt().coerceIn(0, 100)) },
+                        )
+                    }
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_scanlines),
+                        checked = state.scanlinesEnabled,
+                        onCheckedChange = listener::onScanlinesEnabledChanged,
+                    )
+
+                    if (state.scanlinesEnabled) {
+                        NavSliderRow(
+                            label = stringResource(R.string.session_drawer_intensity),
+                            valueText = "${state.scanlinesIntensity}%",
+                            value = state.scanlinesIntensity.toFloat(),
+                            valueRange = 0f..100f,
+                            steps = 99,
+                            onValueChange = { listener.onScanlinesIntensityChanged(it.roundToInt().coerceIn(0, 100)) },
+                        )
+                    }
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_pixelate),
+                        checked = state.pixelateEnabled,
+                        onCheckedChange = listener::onPixelateEnabledChanged,
+                    )
+
+                    if (state.pixelateEnabled) {
+                        NavSliderRow(
+                            label = stringResource(R.string.session_drawer_block_size),
+                            valueText = "${state.pixelateBlock}px",
+                            value = state.pixelateBlock.toFloat(),
+                            valueRange = 2f..14f,
+                            steps = 11,
+                            onValueChange = { listener.onPixelateBlockChanged(it.roundToInt().coerceIn(2, 14)) },
+                        )
+                    }
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_brightness),
+                        valueText = "${state.brightness}",
+                        value = state.brightness.toFloat(),
+                        valueRange = -100f..100f,
+                        steps = 39,
+                        onValueChange = { listener.onBrightnessChanged(it.roundToInt().coerceIn(-100, 100)) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_contrast),
+                        valueText = "${state.contrast}",
+                        value = state.contrast.toFloat(),
+                        valueRange = -100f..100f,
+                        steps = 39,
+                        onValueChange = { listener.onContrastChanged(it.roundToInt().coerceIn(-100, 100)) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_gamma),
+                        valueText = String.format("%.2fx", state.gammaPercent / 100f),
+                        value = state.gammaPercent.toFloat(),
+                        valueRange = 50f..250f,
+                        steps = 19,
+                        onValueChange = { listener.onGammaChanged(it.roundToInt().coerceIn(50, 250)) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_saturation),
+                        valueText = "${state.saturation}%",
+                        value = state.saturation.toFloat(),
+                        valueRange = 0f..200f,
+                        steps = 39,
+                        onValueChange = { listener.onSaturationChanged(it.roundToInt().coerceIn(0, 200)) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_temperature),
+                        valueText = "${state.temperature}",
+                        value = state.temperature.toFloat(),
+                        valueRange = -100f..100f,
+                        steps = 39,
+                        onValueChange = { listener.onTemperatureChanged(it.roundToInt().coerceIn(-100, 100)) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_tint),
+                        valueText = "${state.tint}",
+                        value = state.tint.toFloat(),
+                        valueRange = -100f..100f,
+                        steps = 39,
+                        onValueChange = { listener.onTintChanged(it.roundToInt().coerceIn(-100, 100)) },
+                    )
+
+                    Box(
+                        Modifier.fillMaxWidth().paneNavItem(
+                            cornerRadius = (12f * paneScale).dp,
+                            onActivate = { listener.onResetEffects() },
+                        ),
+                    ) {
+                        DrawerResetRow(
+                            label = stringResource(R.string.session_drawer_reset_effects),
+                            onClick = listener::onResetEffects,
+                        )
+                    }
+                }
+
+                ThinDivider()
+
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.session_drawer_color_blind))
+
+                    Row(horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_drawer_color_blind_protan),
+                            checked = state.colorBlind == 1,
+                            onClick = { listener.onColorBlindSelected(if (state.colorBlind == 1) 0 else 1) },
+                            modifier = Modifier.weight(1f).paneNavItem(
+                                cornerRadius = (16f * paneScale).dp,
+                                onActivate = { listener.onColorBlindSelected(if (state.colorBlind == 1) 0 else 1) },
+                            ),
+                        )
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_drawer_color_blind_deutan),
+                            checked = state.colorBlind == 2,
+                            onClick = { listener.onColorBlindSelected(if (state.colorBlind == 2) 0 else 2) },
+                            modifier = Modifier.weight(1f).paneNavItem(
+                                cornerRadius = (16f * paneScale).dp,
+                                onActivate = { listener.onColorBlindSelected(if (state.colorBlind == 2) 0 else 2) },
+                            ),
+                        )
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_drawer_color_blind_tritan),
+                            checked = state.colorBlind == 3,
+                            onClick = { listener.onColorBlindSelected(if (state.colorBlind == 3) 0 else 3) },
+                            modifier = Modifier.weight(1f).paneNavItem(
+                                cornerRadius = (16f * paneScale).dp,
+                                onActivate = { listener.onColorBlindSelected(if (state.colorBlind == 3) 0 else 3) },
+                            ),
+                        )
+                    }
+                }
+
+                ThinDivider()
+
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.session_drawer_scale))
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_scale_nearest),
+                        checked = state.scaleFilter == 1,
+                        onCheckedChange = { on -> listener.onScaleFilterSelected(if (on) 1 else 0) },
+                    )
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_scale_linear),
+                        checked = state.scaleFilter == 2,
+                        onCheckedChange = { on -> listener.onScaleFilterSelected(if (on) 2 else 0) },
+                    )
+
+                    NavBooleanRow(
+                        title = stringResource(R.string.session_drawer_scale_bicubic),
+                        checked = state.scaleFilter == 3,
+                        onCheckedChange = { on -> listener.onScaleFilterSelected(if (on) 3 else 0) },
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerHudPane.kt b/app/src/main/runtime/display/XServerDrawerHudPane.kt
new file mode 100644
index 000000000..883712942
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerHudPane.kt
@@ -0,0 +1,807 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// HUD pane composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun HUDPaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+) {
+    var activeEditor by remember { mutableStateOf<HUDMetricEditor?>(null) }
+    var fpsLimitMemory by remember {
+        mutableStateOf(if (state.fpsLimit > 0) state.fpsLimit else FPS_LIMITER_DEFAULT)
+    }
+    LaunchedEffect(state.fpsLimit) {
+        if (state.fpsLimit > 0) fpsLimitMemory = state.fpsLimit
+    }
+    val elementNames =
+        listOf(
+            stringResource(R.string.session_drawer_hud_element_fps),
+            stringResource(R.string.session_drawer_hud_element_api),
+            stringResource(R.string.session_drawer_hud_element_gpu),
+            stringResource(R.string.session_drawer_hud_element_cpu),
+            stringResource(R.string.session_drawer_hud_element_ram),
+            stringResource(R.string.session_drawer_hud_element_battery),
+            stringResource(R.string.session_drawer_hud_element_temp),
+            stringResource(R.string.session_drawer_hud_element_graph),
+            stringResource(R.string.session_drawer_hud_element_cpu_temp),
+        )
+    val elementOrder = listOf(1, 2, 3, 8, 4, 5, 6, 0, 7)
+    val active =
+        state.items.firstOrNull { it.itemId == R.id.main_menu_fps_monitor }?.active ?: false
+
+    activeEditor?.let { editor ->
+        HUDMetricInputDialog(
+            editor = editor,
+            initialPercent =
+                when (editor) {
+                    HUDMetricEditor.ALPHA -> (state.hudTransparency * 100).roundToInt()
+                    HUDMetricEditor.BACKGROUND_ALPHA -> (state.hudBackgroundTransparency * 100).roundToInt()
+                    HUDMetricEditor.SCALE -> (state.hudScale * 100).roundToInt()
+                },
+            onDismiss = { activeEditor = null },
+            onConfirm = { enteredPercent ->
+                activeEditor = null
+                when (editor) {
+                    HUDMetricEditor.ALPHA -> {
+                        listener.onHUDTransparencyChanged(enteredPercent.coerceIn(editor.minPercent, editor.maxPercent) / 100f)
+                    }
+                    HUDMetricEditor.BACKGROUND_ALPHA -> {
+                        listener.onHUDBackgroundTransparencyChanged(enteredPercent.coerceIn(editor.minPercent, editor.maxPercent) / 100f)
+                    }
+                    HUDMetricEditor.SCALE -> {
+                        listener.onHUDScaleChanged(enteredPercent.coerceIn(editor.minPercent, editor.maxPercent) / 100f)
+                    }
+                }
+            },
+        )
+    }
+
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+            NavEnableRow(
+                title = stringResource(R.string.session_drawer_fps_monitor),
+                checked = active,
+                onCheckedChange = { listener.onActionSelected(R.id.main_menu_fps_monitor) },
+            )
+
+            // FPS limiter sits directly under the HUD toggle, shown whether the HUD is on or off.
+            Box(
+                Modifier.fillMaxWidth().paneNavItem(
+                    cornerRadius = (12f * paneScale).dp,
+                    onActivate = { listener.onFPSLimitChanged(if (state.fpsLimit > 0) 0 else fpsLimitMemory.coerceIn(FPS_LIMITER_MIN, state.maxRefreshRate)) },
+                    onAdjust = { dir ->
+                        val base = if (state.fpsLimit > 0) state.fpsLimit else fpsLimitMemory
+                        val q = base / 5.0
+                        val units = if (dir > 0) Math.floor(q + 1e-4) + 1 else Math.ceil(q - 1e-4) - 1
+                        listener.onFPSLimitChanged((units * 5).toInt().coerceIn(FPS_LIMITER_MIN, state.maxRefreshRate))
+                    },
+                ),
+            ) {
+                FPSLimiterCard(
+                    currentLimit = state.fpsLimit,
+                    maxRefreshRate = state.maxRefreshRate,
+                    onLimitChanged = listener::onFPSLimitChanged,
+                )
+            }
+
+            // Mango-style HUD toggle + settings gear, shown like the limiter whether the HUD is on or off.
+            var mangoSettingsOpen by remember { mutableStateOf(false) }
+            Row(
+                horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+                // Top-aligned so the gear's slot shares the toggle row's top edge:
+                // same nav row (right selects the gear, down skips past it) and the
+                // highlight hugs the gear itself like the Controls pane gear.
+                verticalAlignment = Alignment.Top,
+            ) {
+                Box(
+                    Modifier.weight(1f).paneNavItem(
+                        cornerRadius = (14f * paneScale).dp,
+                        onActivate = { listener.onMangoHudChanged(!state.mangoHudEnabled) },
+                    ),
+                ) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_hud_mango_style),
+                        checked = state.mangoHudEnabled,
+                        onCheckedChange = listener::onMangoHudChanged,
+                    )
+                }
+                val gearShape = RoundedCornerShape((12f * paneScale).dp)
+                Box(
+                    modifier =
+                        Modifier
+                            .size((44f * paneScale).dp)
+                            .clip(gearShape)
+                            .background(PaneInnerResting)
+                            .border(1.dp, RestingCardBorder, gearShape)
+                            .paneNavItem(
+                                cornerRadius = (12f * paneScale).dp,
+                                onActivate = { mangoSettingsOpen = true },
+                            )
+                            .clickable { mangoSettingsOpen = true },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Settings,
+                        contentDescription = stringResource(R.string.common_ui_settings),
+                        tint = DrawerTextPrimary,
+                        modifier = Modifier.size((20f * paneScale).dp),
+                    )
+                }
+            }
+            if (mangoSettingsOpen) {
+                MangoHudSettingsDialog(
+                    elements = state.mangoHudElements,
+                    hudAlpha = state.mangoHudAlpha,
+                    bgAlpha = state.mangoHudBgAlpha,
+                    hudScale = state.mangoHudScale,
+                    locked = state.mangoHudLocked,
+                    onToggle = listener::onMangoHudElementToggled,
+                    onAlphaChanged = listener::onMangoHudAlphaChanged,
+                    onBgAlphaChanged = listener::onMangoHudBackgroundAlphaChanged,
+                    onScaleChanged = listener::onMangoHudScaleChanged,
+                    onLockChanged = listener::onMangoHudLockChanged,
+                    onDismiss = { mangoSettingsOpen = false },
+                )
+            }
+
+            if (active) {
+                NavSliderRow(
+                    label = stringResource(R.string.session_drawer_hud_alpha),
+                    valueText = "${(state.hudTransparency * 100).toInt()}%",
+                    value = state.hudTransparency,
+                    valueRange = 0.1f..1f,
+                    steps = 17,
+                    onValueClick = { activeEditor = HUDMetricEditor.ALPHA },
+                    onValueChange = { listener.onHUDTransparencyChanged(it.snapToStep(0.05f, 0.1f, 1f)) },
+                )
+
+                if (state.hudBackgroundAlphaEnabled) {
+                    NavSliderRow(
+                        label = stringResource(R.string.session_drawer_hud_background),
+                        valueText = "${(state.hudBackgroundTransparency * 100).toInt()}%",
+                        value = state.hudBackgroundTransparency,
+                        valueRange = 0.1f..1f,
+                        steps = 17,
+                        onValueClick = { activeEditor = HUDMetricEditor.BACKGROUND_ALPHA },
+                        onValueChange = { listener.onHUDBackgroundTransparencyChanged(it.snapToStep(0.05f, 0.1f, 1f)) },
+                    )
+                }
+
+                NavSliderRow(
+                    label = stringResource(R.string.session_drawer_hud_scale),
+                    valueText = "${Math.round(state.hudScale * 100)}%",
+                    value = state.hudScale,
+                    valueRange = 0.3f..2.0f,
+                    steps = 33,
+                    onValueClick = { activeEditor = HUDMetricEditor.SCALE },
+                    onValueChange = { listener.onHUDScaleChanged(it.snapToStep(0.05f, 0.3f, 2.0f)) },
+                    adjustStep = 0.05f,
+                )
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_drawer_hud_background_alpha),
+                    checked = state.hudBackgroundAlphaEnabled,
+                    onCheckedChange = listener::onHUDBackgroundAlphaDecoupledChanged,
+                )
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_drawer_hud_frametime_numeric),
+                    checked = state.frametimeNumericEnabled,
+                    onCheckedChange = listener::onFrametimeNumericChanged,
+                )
+
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.session_drawer_hud_elements))
+                    ChipFlow {
+                        elementOrder.forEach { index ->
+                            HUDToggleChip(
+                                label = elementNames[index],
+                                checked = state.hudElements[index],
+                                onClick = { listener.onHUDElementToggled(index, !state.hudElements[index]) },
+                                modifier = Modifier.paneNavItem(
+                                    cornerRadius = (16f * paneScale).dp,
+                                    onActivate = { listener.onHUDElementToggled(index, !state.hudElements[index]) },
+                                ),
+                            )
+                        }
+                    }
+                }
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_drawer_dual_series_battery),
+                    checked = state.dualSeriesBatteryEnabled,
+                    onCheckedChange = listener::onDualSeriesBatteryChanged,
+                )
+            }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun HUDMetricInputDialog(
+    editor: HUDMetricEditor,
+    initialPercent: Int,
+    onDismiss: () -> Unit,
+    onConfirm: (Int) -> Unit,
+) {
+    var value by remember { mutableStateOf(initialPercent.toString()) }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    fun submit() {
+        val parsed = value.toIntOrNull() ?: initialPercent
+        onConfirm(parsed.coerceIn(editor.minPercent, editor.maxPercent))
+    }
+
+    val focusRequester = remember { FocusRequester() }
+    WinNativeDialogShell(
+        onDismiss = onDismiss,
+        title =
+            when (editor) {
+                HUDMetricEditor.ALPHA -> stringResource(R.string.session_drawer_hud_alpha_input_title)
+                HUDMetricEditor.BACKGROUND_ALPHA -> stringResource(R.string.session_drawer_hud_background_alpha_input_title)
+                HUDMetricEditor.SCALE -> stringResource(R.string.session_drawer_hud_scale_input_title)
+            },
+        maxWidth = 380.dp,
+    ) {
+      LaunchedEffect(Unit) { runCatching { focusRequester.requestFocus() } }
+      Column(
+          modifier =
+              Modifier
+                  .controllerMenuInput(
+                      onDismiss = onDismiss,
+                      onStart = {
+                          keyboardController?.hide()
+                          submit()
+                      },
+                  ),
+      ) {
+        Text(
+            text = stringResource(R.string.session_drawer_hud_input_hint, editor.minPercent, editor.maxPercent),
+            color = DrawerTextSecondary,
+            fontSize = 13.sp,
+            lineHeight = 18.sp,
+        )
+        Spacer(Modifier.height(14.dp))
+        OutlinedTextField(
+            value = value,
+            onValueChange = { incoming -> value = incoming.filter(Char::isDigit) },
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+            suffix = {
+                Text(
+                    text = "%",
+                    color = DrawerTextSecondary,
+                    fontSize = 13.sp,
+                )
+            },
+            textStyle = androidx.compose.material3.MaterialTheme.typography.bodyMedium.copy(color = DrawerTextPrimary),
+            colors =
+                OutlinedTextFieldDefaults.colors(
+                    focusedBorderColor = DrawerAccent,
+                    unfocusedBorderColor = DrawerOutline,
+                    focusedTextColor = DrawerTextPrimary,
+                    unfocusedTextColor = DrawerTextPrimary,
+                    focusedContainerColor = DrawerBackground,
+                    unfocusedContainerColor = DrawerBackground,
+                    focusedLabelColor = DrawerTextSecondary,
+                    unfocusedLabelColor = DrawerTextSecondary,
+                    cursorColor = DrawerAccent,
+                ),
+            keyboardOptions =
+                KeyboardOptions(
+                    keyboardType = KeyboardType.Number,
+                    imeAction = ImeAction.Done,
+                ),
+            keyboardActions =
+                KeyboardActions(
+                    onDone = {
+                        keyboardController?.hide()
+                        submit()
+                    },
+                ),
+        )
+        Spacer(Modifier.height(16.dp))
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .height(1.dp)
+                    .background(DrawerOutline),
+        )
+        Spacer(Modifier.height(16.dp))
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
+        ) {
+            DialogFocusButton(
+                label = stringResource(R.string.common_ui_cancel),
+                textColor = DrawerTextPrimary,
+                backgroundColor = PaneInnerResting,
+                borderColor = RestingCardBorder,
+                onClick = onDismiss,
+            )
+            DialogFocusButton(
+                label = stringResource(R.string.common_ui_apply),
+                textColor = DrawerAccent,
+                backgroundColor = DrawerAccent.copy(alpha = 0.12f),
+                borderColor = DrawerAccent.copy(alpha = 0.3f),
+                focusRequester = focusRequester,
+                onClick = {
+                    keyboardController?.hide()
+                    submit()
+                },
+            )
+        }
+      }
+    }
+}
+
+@Composable
+internal fun MangoHudSettingsDialog(
+    elements: BooleanArray,
+    hudAlpha: Float,
+    bgAlpha: Float,
+    hudScale: Float,
+    locked: Boolean,
+    onToggle: (Int, Boolean) -> Unit,
+    onAlphaChanged: (Float) -> Unit,
+    onBgAlphaChanged: (Float) -> Unit,
+    onScaleChanged: (Float) -> Unit,
+    onLockChanged: (Boolean) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    // Chip label position matches MangoHudView element indices.
+    val labels =
+        listOf(
+            stringResource(R.string.mango_hud_element_gpu_load),
+            stringResource(R.string.mango_hud_element_gpu_temp),
+            stringResource(R.string.mango_hud_element_cpu_load),
+            stringResource(R.string.mango_hud_element_cpu_temp),
+            stringResource(R.string.mango_hud_element_ram),
+            stringResource(R.string.mango_hud_element_battery),
+            stringResource(R.string.mango_hud_element_lows),
+            stringResource(R.string.mango_hud_element_graph),
+            stringResource(R.string.mango_hud_element_engine),
+            stringResource(R.string.mango_hud_element_vram),
+            stringResource(R.string.mango_hud_element_cpu_mhz),
+            stringResource(R.string.mango_hud_element_gpu_clock),
+            stringResource(R.string.mango_hud_element_cores),
+            stringResource(R.string.mango_hud_element_network),
+            stringResource(R.string.mango_hud_element_swap),
+            stringResource(R.string.mango_hud_element_resolution),
+            stringResource(R.string.mango_hud_element_wine),
+            stringResource(R.string.mango_hud_element_duration),
+            stringResource(R.string.mango_hud_element_clock),
+            stringResource(R.string.mango_hud_element_throttle),
+        )
+    // Display groups (label res -> element indices), decoupled from index order.
+    val groups =
+        listOf(
+            R.string.session_drawer_hud_element_gpu to listOf(0, 1, 11, 9),
+            R.string.session_drawer_hud_element_cpu to listOf(2, 3, 10, 12),
+            R.string.mango_hud_group_memory to listOf(4, 14),
+            R.string.session_drawer_hud_element_fps to listOf(6, 7, 8),
+            R.string.mango_hud_group_system to listOf(5, 13, 15, 16, 17, 18, 19),
+        )
+
+    // stableCursor: track the selected slot by identity, not by spatial index —
+    // scrolling reshuffles item positions and index-based tracking jumps to the
+    // pinned header mid-scroll.
+    val mangoNav = remember { SharedPaneNavRegistry().apply { stableCursor = true } }
+    val shape = RoundedCornerShape(16.dp)
+    val maxCardHeight = (LocalConfiguration.current.screenHeightDp * 0.92f).dp
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
+    ) {
+        CompositionLocalProvider(SharedLocalPaneNav provides mangoNav) {
+            DialogPaneNav(mangoNav, onDismiss = onDismiss, onStart = onDismiss)
+            Box(
+                modifier = Modifier.fillMaxSize().safeDrawingPadding().padding(horizontal = 14.dp, vertical = 8.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                Column(
+                    modifier =
+                        Modifier
+                            .widthIn(max = 400.dp)
+                            .fillMaxWidth()
+                            .heightIn(max = maxCardHeight)
+                            .clip(shape)
+                            .background(WinNativeSurface)
+                            .border(1.dp, WinNativeOutline, shape)
+                            .padding(horizontal = 16.dp, vertical = 14.dp),
+                    verticalArrangement = Arrangement.spacedBy(12.dp),
+                ) {
+                    // Pinned header: title + always-visible close, no scrolling needed to exit.
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.spacedBy(10.dp),
+                    ) {
+                        Icon(
+                            imageVector = Icons.Outlined.Settings,
+                            contentDescription = null,
+                            tint = WinNativeTextPrimary,
+                            modifier = Modifier.size(20.dp),
+                        )
+                        Text(
+                            text = stringResource(R.string.session_drawer_hud_mango_settings),
+                            color = DrawerTextPrimary,
+                            fontSize = 15.sp,
+                            fontWeight = FontWeight.SemiBold,
+                            modifier = Modifier.weight(1f),
+                        )
+                        val closeShape = RoundedCornerShape(10.dp)
+                        // Touch-only: a pinned slot inside a scrolling nav set makes the
+                        // spatial rows reshuffle mid-scroll; controllers close with B.
+                        Box(
+                            modifier =
+                                Modifier
+                                    .size(32.dp)
+                                    .clip(closeShape)
+                                    .background(PaneInnerResting)
+                                    .border(1.dp, RestingCardBorder, closeShape)
+                                    .clickable(onClick = onDismiss),
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            Icon(
+                                imageVector = Icons.Outlined.Close,
+                                contentDescription = stringResource(R.string.common_ui_close),
+                                tint = DrawerTextPrimary,
+                                modifier = Modifier.size(18.dp),
+                            )
+                        }
+                    }
+                    Box(Modifier.fillMaxWidth().height(1.dp).background(WinNativeOutline))
+
+                    Column(
+                        modifier = Modifier.weight(1f, fill = false).verticalScroll(rememberScrollState()),
+                        verticalArrangement = Arrangement.spacedBy(12.dp),
+                    ) {
+                        Box(
+                            modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                                onActivate = { onLockChanged(!locked) },
+                            ),
+                        ) {
+                            DrawerBooleanRow(
+                                title = stringResource(R.string.mango_hud_lock),
+                                subtitle = stringResource(R.string.mango_hud_lock_subtitle),
+                                checked = locked,
+                                onCheckedChange = onLockChanged,
+                            )
+                        }
+
+                        groups.forEach { (labelRes, indices) ->
+                            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                                PaneSectionLabel(stringResource(labelRes))
+                                ChipFlow {
+                                    indices.forEach { index ->
+                                        HUDToggleChip(
+                                            label = labels[index],
+                                            checked = elements[index],
+                                            onClick = { onToggle(index, !elements[index]) },
+                                            modifier = Modifier.sharedPaneNavItem(
+                                                onActivate = { onToggle(index, !elements[index]) },
+                                                isEntry = index == 0,
+                                            ),
+                                        )
+                                    }
+                                }
+                            }
+                        }
+
+                        // Local value drives the drag so a 1% move doesn't rebuild the whole drawer state.
+                        var scaleLocal by remember(hudScale) { mutableStateOf(hudScale) }
+                        Box(
+                            modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                                onAdjust = { dir ->
+                                    scaleLocal = (scaleLocal + dir * 0.05f).coerceIn(0.5f, 1.5f)
+                                    onScaleChanged(scaleLocal)
+                                },
+                            ),
+                        ) {
+                            DrawerSliderRow(
+                                label = stringResource(R.string.session_drawer_hud_scale),
+                                valueText = "${Math.round(scaleLocal * 100)}%",
+                                value = scaleLocal,
+                                valueRange = 0.5f..1.5f,
+                                steps = 0,
+                                onValueChange = {
+                                    scaleLocal = Math.round(it * 100) / 100f
+                                    onScaleChanged(scaleLocal)
+                                },
+                            )
+                        }
+                        Box(
+                            modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                                onAdjust = { dir ->
+                                    onAlphaChanged((hudAlpha + dir * 0.05f).coerceIn(0.1f, 1f))
+                                },
+                            ),
+                        ) {
+                            DrawerSliderRow(
+                                label = stringResource(R.string.session_drawer_hud_alpha),
+                                valueText = "${(hudAlpha * 100).toInt()}%",
+                                value = hudAlpha,
+                                valueRange = 0.1f..1f,
+                                steps = 17,
+                                onValueChange = { onAlphaChanged(it.snapToStep(0.05f, 0.1f, 1f)) },
+                            )
+                        }
+                        Box(
+                            modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                                onAdjust = { dir ->
+                                    onBgAlphaChanged((bgAlpha + dir * 0.05f).coerceIn(0f, 1f))
+                                },
+                            ),
+                        ) {
+                            DrawerSliderRow(
+                                label = stringResource(R.string.session_drawer_hud_background),
+                                valueText = "${(bgAlpha * 100).toInt()}%",
+                                value = bgAlpha,
+                                valueRange = 0f..1f,
+                                steps = 19,
+                                onValueChange = { onBgAlphaChanged(it.snapToStep(0.05f, 0f, 1f)) },
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun HUDToggleChip(
+    label: String,
+    checked: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                pressed -> PaneInnerPressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(140),
+        label = "hudChipBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (checked) DrawerAccent else RestingCardBorder,
+        animationSpec = tween(140),
+        label = "hudChipBorder",
+    )
+    val cornerRadius = (12f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    val indicatorSize = (10f * paneScale).dp
+
+    Row(
+        modifier =
+            modifier
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, borderColor, shape)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                ).padding(horizontal = (10f * paneScale).dp, vertical = (9f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size(indicatorSize)
+                    .clip(CircleShape)
+                    .background(if (checked) DrawerAccent else Color(0x14FFFFFF)),
+        )
+        Spacer(Modifier.width((8f * paneScale).dp))
+        Text(
+            text = label,
+            color = DrawerTextPrimary,
+            fontSize = (13f * paneScale).sp,
+            fontWeight = if (checked) FontWeight.SemiBold else FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerInputPanes.kt b/app/src/main/runtime/display/XServerDrawerInputPanes.kt
new file mode 100644
index 000000000..970252ef1
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerInputPanes.kt
@@ -0,0 +1,534 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.runtime.input.controls.Binding
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Touch + gyroscope pane composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun TouchPaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+    onClose: () -> Unit,
+) {
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                Box(
+                    modifier =
+                        Modifier
+                            .size((30f * paneScale).dp)
+                            .clip(RoundedCornerShape((8f * paneScale).dp))
+                            .paneNavItem(cornerRadius = (8f * paneScale).dp, onActivate = onClose)
+                            .clickable(
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null,
+                                onClick = onClose,
+                            ),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+                        contentDescription = stringResource(R.string.common_ui_back),
+                        tint = DrawerTextSecondary,
+                        modifier = Modifier.size((20f * paneScale).dp),
+                    )
+                }
+                Box(Modifier.fillMaxWidth().paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = { listener.onActionSelected(R.id.main_menu_disable_mouse) })) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_mouse_input),
+                        checked = state.mouseEnabled,
+                        onCheckedChange = { listener.onActionSelected(R.id.main_menu_disable_mouse) },
+                    )
+                }
+                Box(Modifier.fillMaxWidth().paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = { listener.onActionSelected(R.id.main_menu_relative_mouse_movement) })) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_relative_mouse_movement),
+                        checked = state.relativeMouseEnabled,
+                        onCheckedChange = { listener.onActionSelected(R.id.main_menu_relative_mouse_movement) },
+                    )
+                }
+                Box(Modifier.fillMaxWidth().paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = { listener.onScreenTouchModeChanged(0) })) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_touch_trackpad),
+                        checked = state.screenTouchMode == 0 && !state.rtsGesturesEnabled,
+                        onCheckedChange = { if (it) listener.onScreenTouchModeChanged(0) },
+                    )
+                }
+                Box(Modifier.fillMaxWidth().paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = { listener.onScreenTouchModeChanged(1) })) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_touch_touchscreen),
+                        checked = state.screenTouchMode == 1 && !state.rtsGesturesEnabled,
+                        onCheckedChange = { listener.onScreenTouchModeChanged(if (it) 1 else 0) },
+                    )
+                }
+                Box(Modifier.fillMaxWidth().paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = { listener.onScreenTouchModeChanged(2) })) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_touch_map_right_stick),
+                        checked = state.screenTouchMode == 2 && !state.rtsGesturesEnabled,
+                        onCheckedChange = { listener.onScreenTouchModeChanged(if (it) 2 else 0) },
+                    )
+                }
+                Box(Modifier.fillMaxWidth().paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = { listener.onRtsGesturesToggled(!state.rtsGesturesEnabled) })) {
+                    DrawerBooleanRow(
+                        title = stringResource(R.string.session_drawer_rts_gestures),
+                        checked = state.rtsGesturesEnabled,
+                        onCheckedChange = { listener.onRtsGesturesToggled(it) },
+                    )
+                }
+                if (state.rtsGesturesEnabled) {
+                    Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                        PaneSectionLabel(stringResource(R.string.session_gesture_profile_section))
+                        InputControlsProfileSelector(
+                            profileNames = state.gestureProfileNames,
+                            selectedIndex = state.gestureSelectedProfileIndex,
+                            onProfileSelected = listener::onGestureProfileSelected,
+                            onEditClick = listener::onRtsGesturesEditClick,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun GyroscopePaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+) {
+    var calibrateExpanded by remember { mutableStateOf(false) }
+
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+            NavEnableRow(
+                title = stringResource(R.string.session_gyroscope_title),
+                checked = state.gyroscopeEnabled,
+                onCheckedChange = listener::onGyroscopeEnabledChanged,
+            )
+
+            if (state.gyroscopeEnabled) {
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.session_gyroscope_mode))
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+                    ) {
+                        listOf(
+                            stringResource(R.string.session_gyroscope_hold),
+                            stringResource(R.string.session_gyroscope_toggle),
+                        ).forEachIndexed { index, label ->
+                            HUDToggleChip(
+                                label = label,
+                                checked = state.gyroscopeModeIndex == index,
+                                onClick = { listener.onGyroscopeModeSelected(index) },
+                                modifier = Modifier.weight(1f).paneNavItem(
+                                    cornerRadius = (16f * paneScale).dp,
+                                    onActivate = { listener.onGyroscopeModeSelected(index) },
+                                ),
+                            )
+                        }
+                    }
+                }
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_gyroscope_orientation_mode),
+                    checked = state.gyroOrientationEnabled,
+                    onCheckedChange = listener::onGyroOrientationModeChanged,
+                )
+
+                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+                    PaneSectionLabel(stringResource(R.string.session_gyroscope_activator_button))
+                    if (state.gyroMouseEnabled) {
+                        val bindings = remember { Binding.activatorBindingValues() }
+                        GyroscopeActivatorDropdown(
+                            currentLabel = state.gyroscopeActivatorLabel,
+                            options = remember(bindings) { bindings.map { it.toString() } },
+                            onSelectedIndex = { listener.onGyroscopeActivatorBindingSelected(bindings[it].name) },
+                        )
+                    } else {
+                        val names = stringArrayResource(R.array.button_options)
+                        val keycodes = integerArrayResource(R.array.button_keycodes)
+                        GyroscopeActivatorDropdown(
+                            currentLabel = state.gyroscopeActivatorLabel,
+                            options = remember(names) { names.toList() },
+                            onSelectedIndex = { listener.onGyroscopeActivatorSelected(keycodes[it]) },
+                        )
+                    }
+                }
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_gyroscope_enable_right_stick),
+                    checked = state.rightStickGyroEnabled,
+                    onCheckedChange = listener::onRightStickGyroChanged,
+                )
+
+                NavBooleanRow(
+                    title = stringResource(R.string.session_gyroscope_experimental_mouse_movement),
+                    checked = state.gyroMouseEnabled,
+                    onCheckedChange = listener::onGyroMouseEnabledChanged,
+                )
+
+                if (state.gyroMouseEnabled) {
+                    NavSliderRow(
+                        label = stringResource(R.string.session_gyroscope_mouse_scale),
+                        valueText = "${state.gyroMouseScale.toInt()}%",
+                        value = state.gyroMouseScale,
+                        valueRange = 0f..200f,
+                        steps = 199,
+                        onValueChange = { listener.onGyroMouseScaleChanged(it.roundToInt().toFloat()) },
+                    )
+                }
+
+                ExpandableSection(
+                    title = stringResource(R.string.session_drawer_calibrate_advanced),
+                    expanded = calibrateExpanded,
+                    onToggle = { calibrateExpanded = !calibrateExpanded },
+                ) {
+                    NavSliderRow(
+                        label = stringResource(R.string.session_gyroscope_x_sensitivity),
+                        valueText = "${(state.gyroXSensitivity * 100).roundToInt()}%",
+                        value = state.gyroXSensitivity,
+                        valueRange = 0.01f..3f,
+                        steps = 0,
+                        onValueChange = { listener.onGyroXSensitivityChanged(it) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_gyroscope_y_sensitivity),
+                        valueText = "${(state.gyroYSensitivity * 100).roundToInt()}%",
+                        value = state.gyroYSensitivity,
+                        valueRange = 0.01f..3f,
+                        steps = 0,
+                        onValueChange = { listener.onGyroYSensitivityChanged(it) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_gyroscope_smoothing),
+                        valueText = "${(state.gyroSmoothing * 100).toInt()}%",
+                        value = state.gyroSmoothing,
+                        valueRange = 0f..1f,
+                        steps = 99,
+                        onValueChange = { listener.onGyroSmoothingChanged(it) },
+                    )
+
+                    NavSliderRow(
+                        label = stringResource(R.string.session_gyroscope_deadzone),
+                        valueText = "${(state.gyroDeadzone * 100).toInt()}%",
+                        value = state.gyroDeadzone,
+                        valueRange = 0f..1f,
+                        steps = 99,
+                        onValueChange = { listener.onGyroDeadzoneChanged(it) },
+                    )
+
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+                    ) {
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_gyroscope_invert_x),
+                            checked = state.invertGyroX,
+                            onClick = { listener.onInvertGyroXChanged(!state.invertGyroX) },
+                            modifier = Modifier.weight(1f).paneNavItem(cornerRadius = (16f * paneScale).dp, onActivate = { listener.onInvertGyroXChanged(!state.invertGyroX) }),
+                        )
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_gyroscope_invert_y),
+                            checked = state.invertGyroY,
+                            onClick = { listener.onInvertGyroYChanged(!state.invertGyroY) },
+                            modifier = Modifier.weight(1f).paneNavItem(cornerRadius = (16f * paneScale).dp, onActivate = { listener.onInvertGyroYChanged(!state.invertGyroY) }),
+                        )
+                    }
+
+                    Box(
+                        Modifier.paneNavItem(
+                            cornerRadius = 10.dp,
+                            onActivate = { listener.onActionSelected(R.id.main_menu_gyroscope_reset) },
+                        ),
+                    ) {
+                        WinNativeDialogButton(
+                            label = stringResource(R.string.session_gyroscope_reset_stick),
+                            textColor = DrawerAccent,
+                            backgroundColor = DrawerAccent.copy(alpha = 0.12f),
+                            borderColor = DrawerAccent.copy(alpha = 0.3f),
+                            onClick = { listener.onActionSelected(R.id.main_menu_gyroscope_reset) },
+                        )
+                    }
+                }
+            }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun GyroscopeActivatorDropdown(
+    currentLabel: String,
+    options: List<String>,
+    onSelectedIndex: (Int) -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    var expanded by remember { mutableStateOf(false) }
+    val parentNav = LocalPaneNav.current
+    val optionRegistry = remember { PaneNavRegistry() }
+    LaunchedEffect(expanded) {
+        if (expanded) {
+            optionRegistry.reset()
+            optionRegistry.controllerActive = true
+            parentNav?.overlay = optionRegistry
+            parentNav?.overlayClose = { expanded = false }
+        } else if (parentNav?.overlay === optionRegistry) {
+            parentNav.overlay = null
+            parentNav.overlayClose = null
+        }
+    }
+
+    val cornerRadius = (14f * paneScale).dp
+    val shape = RoundedCornerShape(cornerRadius)
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
+        animationSpec = tween(140),
+        label = "gyroActivatorDropdownBg",
+    )
+
+    Box(modifier = Modifier.fillMaxWidth()) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(shape)
+                    .background(bgColor)
+                    .border(1.dp, RestingCardBorder, shape)
+                    .paneNavItem(cornerRadius = cornerRadius, onActivate = { expanded = true })
+                    .clickable(
+                        interactionSource = interactionSource,
+                        indication = null,
+                    ) { expanded = true }
+                    .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = currentLabel,
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+                modifier = Modifier.weight(1f),
+            )
+            Icon(
+                imageVector = Icons.Outlined.ArrowDropDown,
+                contentDescription = null,
+                tint = DrawerTextSecondary,
+                modifier = Modifier.size((22f * paneScale).dp),
+            )
+        }
+
+        InputControlsOptionsPopup(
+            expanded = expanded,
+            options = options,
+            selectedIndex = options.indexOfFirst { it == currentLabel }.coerceAtLeast(0),
+            onSelected = { index -> onSelectedIndex(index) },
+            onDismiss = { expanded = false },
+            optionRegistry = optionRegistry,
+        )
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerLogsPane.kt b/app/src/main/runtime/display/XServerDrawerLogsPane.kt
new file mode 100644
index 000000000..2776657c3
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerLogsPane.kt
@@ -0,0 +1,387 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Logs pane composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun LogsPaneContent(
+    logsState: LogsPaneState,
+    listener: XServerDrawerActionListener,
+    onClose: () -> Unit,
+) {
+    DisposableEffect(Unit) {
+        listener.onLogsPaneVisibilityChanged(true)
+        onDispose { listener.onLogsPaneVisibilityChanged(false) }
+    }
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                LogsPaneHeader(
+                    paused = logsState.paused,
+                    lineCount = logsState.lines.size,
+                    onClear = { listener.onLogsClear() },
+                    onTogglePause = { listener.onLogsPauseChanged(!logsState.paused) },
+                    onShare = { listener.onLogsShare() },
+                    onClose = onClose,
+                )
+
+                LogsPaneList(
+                    lines = logsState.lines,
+                    paused = logsState.paused,
+                    modifier = Modifier.weight(1f, fill = true).fillMaxWidth(),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun LogsPaneHeader(
+    paused: Boolean,
+    lineCount: Int,
+    onClear: () -> Unit,
+    onTogglePause: () -> Unit,
+    onShare: () -> Unit,
+    onClose: () -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = stringResource(R.string.session_drawer_logs),
+                color = DrawerTextPrimary,
+                fontSize = (16f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+            Text(
+                text =
+                    if (paused) {
+                        stringResource(R.string.session_drawer_logs_paused_indicator) +
+                            " · " +
+                            stringResource(R.string.session_drawer_logs_line_count, lineCount)
+                    } else {
+                        stringResource(R.string.session_drawer_logs_line_count, lineCount)
+                    },
+                color = if (paused) DrawerAccent else DrawerTextSecondary,
+                fontSize = (11f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+            )
+        }
+
+        LogsPaneActionTile(
+            icon = if (paused) Icons.Outlined.PlayArrow else Icons.Outlined.Pause,
+            contentDescription =
+                if (paused) {
+                    stringResource(R.string.session_drawer_logs_resume)
+                } else {
+                    stringResource(R.string.session_drawer_logs_pause)
+                },
+            onClick = onTogglePause,
+        )
+        LogsPaneActionTile(
+            icon = Icons.Outlined.DeleteSweep,
+            contentDescription = stringResource(R.string.session_drawer_logs_clear),
+            onClick = onClear,
+        )
+        LogsPaneActionTile(
+            icon = Icons.Outlined.Share,
+            contentDescription = stringResource(R.string.session_drawer_logs_share),
+            onClick = onShare,
+        )
+
+        Spacer(Modifier.width((16f * paneScale).dp))
+
+        TaskManagerCloseButton(onClick = onClose)
+    }
+}
+
+@Composable
+internal fun LogsPaneActionTile(
+    icon: ImageVector,
+    contentDescription: String,
+    onClick: () -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val tint by animateColorAsState(
+        targetValue = if (pressed) DrawerAccent else DrawerTextPrimary,
+        animationSpec = tween(120),
+        label = "logsActionTileTint",
+    )
+    Box(
+        modifier =
+            Modifier
+                .size((38f * paneScale).dp)
+                .clip(CircleShape)
+                .paneNavItem(cornerRadius = (19f * paneScale).dp, onActivate = onClick)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = contentDescription,
+            tint = tint,
+            modifier = Modifier.size((24f * paneScale).dp),
+        )
+    }
+}
+
+@Composable
+internal fun LogsPaneList(
+    lines: List<String>,
+    paused: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    val paneScale = LocalPaneScale.current
+    val shape = RoundedCornerShape((10f * paneScale).dp)
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(lines.size, paused) {
+        if (!paused && lines.isNotEmpty()) {
+            listState.scrollToItem((lines.size - 1).coerceAtLeast(0))
+        }
+    }
+
+    Box(
+        modifier =
+            modifier
+                .clip(shape)
+                .background(PaneInnerResting)
+                .border(1.dp, RestingCardBorder, shape),
+    ) {
+        if (lines.isEmpty()) {
+            Text(
+                text = stringResource(R.string.common_ui_no_items_to_display),
+                color = DrawerTextSecondary,
+                fontSize = (12f * paneScale).sp,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(top = (24f * paneScale).dp),
+                textAlign = TextAlign.Center,
+            )
+        } else {
+            LazyColumn(
+                state = listState,
+                modifier = Modifier.fillMaxSize(),
+                contentPadding =
+                    PaddingValues(
+                        horizontal = (10f * paneScale).dp,
+                        vertical = (8f * paneScale).dp,
+                    ),
+                verticalArrangement = Arrangement.spacedBy((1f * paneScale).dp),
+            ) {
+                items(lines) { line ->
+                    Text(
+                        text = line,
+                        color = DrawerTextPrimary,
+                        fontSize = (11f * paneScale).sp,
+                        fontFamily = FontFamily.Monospace,
+                        lineHeight = (14f * paneScale).sp,
+                        letterSpacing = 0.sp,
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerMenu.kt b/app/src/main/runtime/display/XServerDrawerMenu.kt
index d0be4e598..f6b4b68ba 100644
--- a/app/src/main/runtime/display/XServerDrawerMenu.kt
+++ b/app/src/main/runtime/display/XServerDrawerMenu.kt
@@ -22,13 +22,20 @@ import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
@@ -59,18 +66,20 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.automirrored.outlined.ExitToApp
 import androidx.compose.material.icons.automirrored.outlined.ViewList
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Apps
 import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.AutoAwesome
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.DeleteSweep
 import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
 import androidx.compose.material.icons.outlined.Fullscreen
 import androidx.compose.material.icons.outlined.Keyboard
-import androidx.compose.material.icons.outlined.Memory
 import androidx.compose.material.icons.outlined.Monitor
 import androidx.compose.material.icons.outlined.Mouse
 import androidx.compose.material.icons.outlined.Pause
@@ -81,12 +90,16 @@ import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.outlined.Share
 import androidx.compose.material.icons.outlined.SportsEsports
 import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
 import androidx.compose.material.icons.outlined.Tune
 import androidx.compose.material.icons.outlined.ZoomIn
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.LocalRippleConfiguration
 import androidx.compose.material3.MenuDefaults
 import androidx.compose.material3.OutlinedTextField
@@ -99,6 +112,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
@@ -119,7 +133,15 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.boundsInParent
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.ViewCompositionStrategy
@@ -134,72 +156,321 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
 import com.winlator.cmod.R
-import com.winlator.cmod.shared.theme.WinNativeBackground
-import com.winlator.cmod.shared.theme.WinNativeOutline
-import com.winlator.cmod.shared.theme.WinNativePanel
-import com.winlator.cmod.shared.theme.WinNativeSurface
-import com.winlator.cmod.shared.theme.WinNativeTextPrimary
-import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.SessionDrawerStyle
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
 import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
 import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
 import kotlin.math.roundToInt
 
-// Drawer-local colors.
-private const val DrawerSheetAlpha = 0.86f
-private const val DrawerSurfaceAlpha = 0.72f
-private const val DrawerPressedAlpha = 0.88f
-private const val DrawerGradientLift = 0.014f
-
-private val DrawerAccent = Color(0xFF2196F3)
-private val DrawerActiveAccent = Color(0xFF29B6F6)
-private val DrawerTextPrimary = WinNativeTextPrimary.copy(alpha = 0.88f)
-private val DrawerTextSecondary = WinNativeTextSecondary.copy(alpha = 0.82f)
-private val DrawerOutline = WinNativeOutline
-private val DrawerBackground = WinNativeBackground.copy(alpha = DrawerSheetAlpha)
-
-internal val PaneSurfaceColor = WinNativeBackground.copy(alpha = DrawerSheetAlpha)
-private val PaneSurfacePressed = Color(0xFF232B3A).copy(alpha = DrawerPressedAlpha)
-
-private val TopRailSurfaceColor = WinNativeSurface.copy(alpha = DrawerSheetAlpha)
-
-private val TileResting = Color(0xFF20283A).copy(alpha = DrawerSurfaceAlpha)
-private val TileExitResting = Color(0xFF3A2125).copy(alpha = DrawerSurfaceAlpha)
-private val TileExitPressed = Color(0xFF4A2A30).copy(alpha = DrawerPressedAlpha)
-private val PaneInnerResting = WinNativePanel.copy(alpha = DrawerSurfaceAlpha)
-private val PaneInnerPressed = Color(0xFF242B3A).copy(alpha = DrawerPressedAlpha)
-private val RestingCardBorder = WinNativeOutline.copy(alpha = 0.72f)
-private val DisabledCardBorder = Color(0xFF202033).copy(alpha = 0.58f)
-private val ActiveCardBorder = DrawerActiveAccent
-private val BottomDividerColor = WinNativeOutline
-private val GlassExitTint = Color(0xFFE07B6B)
+private const val DrawerGradientLift = SessionDrawerStyle.GradientLift
+
+internal val DrawerAccent = SessionDrawerStyle.Accent
+private val DrawerActiveAccent = SessionDrawerStyle.ActiveAccent
+private val DrawerFocusFill = SessionDrawerStyle.FocusFill
+internal val DrawerTextPrimary = SessionDrawerStyle.TextPrimary
+internal val DrawerTextSecondary = SessionDrawerStyle.TextSecondary
+internal val DrawerOutline = SessionDrawerStyle.Outline
+internal val DrawerBackground = SessionDrawerStyle.Background
+
+internal val PaneSurfaceColor = SessionDrawerStyle.PaneSurface
+private val PaneSurfacePressed = SessionDrawerStyle.PaneSurfacePressed
+
+private val TopRailSurfaceColor = SessionDrawerStyle.TopRailSurface
+
+private val TileResting = SessionDrawerStyle.TileResting
+internal val TileExitResting = SessionDrawerStyle.TileExitResting
+internal val TileExitPressed = SessionDrawerStyle.TileExitPressed
+internal val PaneInnerResting = SessionDrawerStyle.PaneInnerResting
+internal val PaneInnerPressed = SessionDrawerStyle.PaneInnerPressed
+internal val RestingCardBorder = SessionDrawerStyle.RestingCardBorder
+private val DisabledCardBorder = SessionDrawerStyle.DisabledCardBorder
+internal val ActiveCardBorder = SessionDrawerStyle.ActiveCardBorder
+private val BottomDividerColor = SessionDrawerStyle.Outline
+internal val GlassExitTint = SessionDrawerStyle.GlassExitTint
+internal val RecordRed = Color(0xFFE53935)
 
 // Pane content scales down on short displays.
-private val LocalPaneScale = staticCompositionLocalOf { 1f }
-private const val PaneScaleMin = 0.78f
-private const val PaneScaleReferenceHeightDp = 520f
-private const val PendingTaskAffinityTimeoutMs = 2500L
+internal val LocalPaneScale = staticCompositionLocalOf { 1f }
+
+private const val PANE_DIR_LEFT = 1
+private const val PANE_DIR_RIGHT = 2
+private const val PANE_DIR_UP = 3
+private const val PANE_DIR_DOWN = 4
+private const val PANE_DIR_ACTIVATE = 5
+private const val PANE_DIR_SECONDARY = 6
+private const val PANE_ROW_Y_THRESHOLD = 24f
+
+private class PaneNavEntry(
+    var x: Float,
+    var y: Float,
+    var onActivate: () -> Unit,
+    var onAdjust: (Int) -> Unit,
+    var onSecondary: () -> Unit,
+)
+
+@Stable
+internal class PaneNavRegistry {
+    private val items = mutableStateMapOf<Int, PaneNavEntry>()
+    private var slotCounter = 0
+    private var lastSignal = -1
+    var controllerActive by mutableStateOf(false)
+    var overlay by mutableStateOf<PaneNavRegistry?>(null)
+    var overlayClose: (() -> Unit)? = null
+    var activeRow by mutableStateOf(0)
+        private set
+    var activeCol by mutableStateOf(0)
+        private set
+
+    fun nextSlot(): Int = slotCounter++
+
+    fun reset() {
+        activeRow = 0
+        activeCol = 0
+    }
+
+    fun reportCallbacks(slot: Int, onActivate: () -> Unit, onAdjust: (Int) -> Unit, onSecondary: () -> Unit) {
+        val e = items[slot]
+        if (e == null) {
+            items[slot] = PaneNavEntry(0f, 0f, onActivate, onAdjust, onSecondary)
+        } else {
+            e.onActivate = onActivate
+            e.onAdjust = onAdjust
+            e.onSecondary = onSecondary
+        }
+    }
+
+    fun reportPosition(slot: Int, x: Float, y: Float) {
+        val e = items[slot] ?: return
+        if (e.x != x || e.y != y) {
+            items[slot] = PaneNavEntry(x, y, e.onActivate, e.onAdjust, e.onSecondary)
+        }
+    }
+
+    fun unregister(slot: Int) { items.remove(slot) }
+
+    val rows: List<List<Int>>
+        get() {
+            val sorted = items.entries.sortedWith(compareBy({ it.value.y }, { it.value.x }))
+            val result = mutableListOf<MutableList<Int>>()
+            var prevY = Float.NaN
+            for (entry in sorted) {
+                val y = entry.value.y
+                if (result.isEmpty() || kotlin.math.abs(y - prevY) > PANE_ROW_Y_THRESHOLD) {
+                    result.add(mutableListOf(entry.key))
+                } else {
+                    result.last().add(entry.key)
+                }
+                prevY = y
+            }
+            return result
+        }
+
+    fun isActive(slot: Int): Boolean {
+        if (!controllerActive) return false
+        val r = rows
+        if (r.isEmpty()) return false
+        val row = r[activeRow.coerceIn(0, r.size - 1)]
+        return row[activeCol.coerceIn(0, row.size - 1)] == slot
+    }
+
+    fun processNav(signal: Int, dir: Int) {
+        if (lastSignal == -1) {
+            lastSignal = signal
+            return
+        }
+        if (signal == lastSignal) return
+        lastSignal = signal
+        handleNav(dir)
+    }
+
+    private fun handleNav(dir: Int) {
+        overlay?.let { ov ->
+            ov.controllerActive = true
+            ov.handleNav(dir)
+            return
+        }
+        val r = rows
+        if (r.isEmpty()) return
+        var row = activeRow.coerceIn(0, r.size - 1)
+        var col = activeCol.coerceIn(0, r[row].size - 1)
+        when (dir) {
+            PANE_DIR_UP -> if (row > 0) { row--; col = col.coerceAtMost(r[row].size - 1) }
+            PANE_DIR_DOWN -> if (row < r.size - 1) { row++; col = col.coerceAtMost(r[row].size - 1) }
+            PANE_DIR_LEFT ->
+                if (r[row].size <= 1) items[r[row][0]]?.onAdjust?.invoke(-1) else if (col > 0) col--
+            PANE_DIR_RIGHT ->
+                if (r[row].size <= 1) items[r[row][0]]?.onAdjust?.invoke(1) else if (col < r[row].size - 1) col++
+            PANE_DIR_ACTIVATE -> items[r[row][col]]?.onActivate?.invoke()
+            PANE_DIR_SECONDARY -> items[r[row][col]]?.onSecondary?.invoke()
+        }
+        activeRow = row
+        activeCol = col
+    }
+}
+
+internal val LocalPaneNav = staticCompositionLocalOf<PaneNavRegistry?> { null }
+
+internal fun Modifier.paneHighlight(highlighted: Boolean, cornerRadius: Dp): Modifier =
+    drawWithContent {
+        val cr = cornerRadius.toPx()
+        if (highlighted) {
+            drawRoundRect(color = DrawerAccent.copy(alpha = 0.20f), cornerRadius = CornerRadius(cr, cr))
+        }
+        drawContent()
+        if (highlighted) {
+            drawRoundRect(
+                color = DrawerAccent,
+                cornerRadius = CornerRadius(cr, cr),
+                style = Stroke(width = 1.5.dp.toPx()),
+            )
+        }
+    }
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun Modifier.paneNavItem(
+    cornerRadius: Dp = 10.dp,
+    onActivate: () -> Unit = {},
+    onAdjust: (Int) -> Unit = {},
+    onSecondary: () -> Unit = {},
+): Modifier {
+    val nav = LocalPaneNav.current ?: return this
+    val slot = remember { nav.nextSlot() }
+    DisposableEffect(slot) { onDispose { nav.unregister(slot) } }
+    SideEffect { nav.reportCallbacks(slot, onActivate, onAdjust, onSecondary) }
+    val highlighted = nav.isActive(slot)
+
+    val bring = remember { BringIntoViewRequester() }
+    LaunchedEffect(highlighted) { if (highlighted) runCatching { bring.bringIntoView() } }
+
+    return this
+        .onGloballyPositioned {
+            val p = it.positionInWindow()
+            nav.reportPosition(slot, p.x, p.y)
+        }
+        .bringIntoViewRequester(bring)
+        .paneHighlight(highlighted, cornerRadius)
+}
+
+@Composable
+internal fun NavBooleanRow(
+    title: String,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    subtitle: String? = null,
+) {
+    val paneScale = LocalPaneScale.current
+    Box(
+        Modifier.fillMaxWidth().paneNavItem(
+            cornerRadius = (12f * paneScale).dp,
+            onActivate = { onCheckedChange(!checked) },
+        ),
+    ) {
+        DrawerBooleanRow(title = title, checked = checked, onCheckedChange = onCheckedChange, subtitle = subtitle)
+    }
+}
+
+@Composable
+internal fun NavEnableRow(
+    title: String,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    Box(
+        Modifier.fillMaxWidth().paneNavItem(
+            cornerRadius = (12f * paneScale).dp,
+            onActivate = { onCheckedChange(!checked) },
+        ),
+    ) {
+        PaneEnableRow(title = title, checked = checked, onCheckedChange = onCheckedChange)
+    }
+}
+
+@Composable
+internal fun NavSliderRow(
+    label: String,
+    valueText: String,
+    value: Float,
+    valueRange: ClosedFloatingPointRange<Float>,
+    steps: Int,
+    onValueChange: (Float) -> Unit,
+    onValueClick: (() -> Unit)? = null,
+    onValueChangeFinished: (() -> Unit)? = null,
+    adjustStep: Float? = null,
+) {
+    val paneScale = LocalPaneScale.current
+    Box(
+        Modifier.fillMaxWidth().paneNavItem(
+            cornerRadius = (12f * paneScale).dp,
+            onActivate = { onValueClick?.invoke() },
+            onAdjust = { dir ->
+                val next =
+                    if (adjustStep != null) {
+                        val q = (value / adjustStep).toDouble()
+                        val units = if (dir > 0) Math.floor(q + 1e-4) + 1 else Math.ceil(q - 1e-4) - 1
+                        (units * adjustStep).toFloat()
+                    } else {
+                        val divisions = if (steps > 0) steps + 1 else 20
+                        value + dir * (valueRange.endInclusive - valueRange.start) / divisions
+                    }
+                onValueChange(next.coerceIn(valueRange.start, valueRange.endInclusive))
+                onValueChangeFinished?.invoke()
+            },
+        ),
+    ) {
+        DrawerSliderRow(
+            label = label,
+            valueText = valueText,
+            value = value,
+            valueRange = valueRange,
+            steps = steps,
+            onValueChange = onValueChange,
+            onValueClick = onValueClick,
+            onValueChangeFinished = onValueChangeFinished,
+        )
+    }
+}
+
+private const val PaneScaleMin = SessionDrawerStyle.PaneScaleMin
+internal const val ControlsPaneScaleMin = 0.62f
+private const val PaneScaleReferenceHeightDp = SessionDrawerStyle.PaneScaleReferenceHeightDp
+internal const val PendingTaskAffinityTimeoutMs = 2500L
 
-private fun computePaneScale(availableHeight: Dp): Float =
-    (availableHeight.value / PaneScaleReferenceHeightDp).coerceIn(PaneScaleMin, 1f)
+internal fun computePaneScale(availableHeight: Dp, minScale: Float = PaneScaleMin): Float =
+    (availableHeight.value / PaneScaleReferenceHeightDp).coerceIn(minScale, 1f)
 
-private enum class HUDMetricEditor(
+internal enum class HUDMetricEditor(
     val minPercent: Int,
     val maxPercent: Int,
 ) {
     ALPHA(minPercent = 10, maxPercent = 100),
-    SCALE(minPercent = 50, maxPercent = 200),
+    SCALE(minPercent = 30, maxPercent = 200),
+    BACKGROUND_ALPHA(minPercent = 10, maxPercent = 100),
 }
 
-internal enum class DrawerPane { INPUT_CONTROLS, HUD, GYROSCOPE, SCREEN_EFFECTS, TASK_MANAGER, LOGS }
+internal enum class DrawerPane { INPUT_CONTROLS, HUD, GYROSCOPE, SCREEN_EFFECTS, RESHADE, OUTPUT, TASK_MANAGER, LOGS, TOUCH }
 
 internal const val LogsPaneMaxLines = 2000
+internal const val LogsFlushIntervalMs = 200L
 
 data class LogsPaneState(
     val lines: List<String> = emptyList(),
@@ -223,7 +494,7 @@ data class TaskManagerPaneState(
     val memoryDetail: String = "",
 )
 
-private data class PendingTaskAffinity(
+internal data class PendingTaskAffinity(
     val affinityMask: Int,
     val requestedAtMillis: Long,
 )
@@ -260,16 +531,30 @@ private val RAIL_PANES =
             itemId = R.id.main_menu_screen_effects,
             labelRes = R.string.session_drawer_rail_label_effects,
         ),
+        // Shown only when the host adds a main_menu_reshade item to state.items.
+        RailPaneSpec(
+            pane = DrawerPane.RESHADE,
+            itemId = R.id.main_menu_reshade,
+            labelRes = R.string.reshade_section_title,
+            iconOverride = Icons.Outlined.AutoAwesome,
+        ),
+        // Shown only when the host adds a main_menu_output item to state.items.
+        RailPaneSpec(
+            pane = DrawerPane.OUTPUT,
+            itemId = R.id.main_menu_output,
+            labelRes = R.string.session_drawer_rail_label_output,
+            iconOverride = Icons.Outlined.Monitor,
+        ),
     )
 
 private val RAIL_PANE_ITEM_IDS = RAIL_PANES.map { it.itemId }.toSet()
 private val PINNED_BOTTOM_ITEM_IDS = setOf(R.id.main_menu_pause, R.id.main_menu_exit)
 
-private val TopRailTileMinWidth = 64.dp
+private val TopRailTileMinWidth = 60.dp
 private val TopRailTileHorizontalPadding = 10.dp
-private val TopRailTileTopPadding = 6.dp
-private val TopRailTileBottomPadding = 4.dp
-private val TopRailTileSpacing = 6.dp
+private val TopRailTileTopPadding = 10.dp
+private val TopRailTileBottomPadding = 7.dp
+private val TopRailTileSpacing = 10.dp
 
 private const val ActionCardColumns = 3
 private val ActionCardMinHeight = 72.dp
@@ -287,39 +572,124 @@ data class XServerDrawerItem(
     val enabled: Boolean = true,
 )
 
+/** Device-filtered options + persisted selections for the Record popup. Quality: 0=Perf,1=Balance,2=Quality. */
+data class RecordUiConfig(
+    val fpsOptions: List<Int> = emptyList(),
+    val resolutionLabels: List<String> = emptyList(),
+    val fpsIndex: Int = 0,
+    val resolutionIndex: Int = 0,
+    val quality: Int = 2,
+    val recordUI: Boolean = false,
+)
+
 data class XServerDrawerState(
     val items: List<XServerDrawerItem>,
     val hudTransparency: Float = 1.0f,
+    val hudBackgroundAlphaEnabled: Boolean = false,
+    val hudBackgroundTransparency: Float = 1.0f,
     val hudScale: Float = 1.0f,
-    val hudElements: BooleanArray = booleanArrayOf(true, true, true, true, true, true, true),
+    val hudElements: BooleanArray = booleanArrayOf(true, true, true, true, true, true, true, true, false),
     val dualSeriesBatteryEnabled: Boolean = false,
+    val frametimeNumericEnabled: Boolean = false,
     val hudCardExpanded: Boolean = false,
     val gyroscopeEnabled: Boolean = false,
     val gyroscopeModeIndex: Int = 0,
+    val gyroOrientationEnabled: Boolean = false,
     val gyroscopeActivatorLabel: String = "",
     val rightStickGyroEnabled: Boolean = false,
     val gyroMouseEnabled: Boolean = false,
     val gyroMouseScale: Float = 50.0f,
     val gyroXSensitivity: Float = 1.0f,
     val gyroYSensitivity: Float = 1.0f,
-    val gyroSmoothing: Float = 0.9f,
+    val gyroSmoothing: Float = 0.1f,
     val gyroDeadzone: Float = 0.05f,
     val invertGyroX: Boolean = false,
     val invertGyroY: Boolean = false,
     val gyroscopeCardExpanded: Boolean = false,
     val fpsLimit: Int = 0,
+    val maxRefreshRate: Int = 60,
     val screenEffectsCardExpanded: Boolean = false,
-    val fsrEnabled: Boolean = false,
-    val fsrMode: Int = 0,
-    val fsrSharpness: Int = 100,
+    val sgsrEnabled: Boolean = false,
+    val sgsrSharpness: Int = 100,
+    val vividEnabled: Boolean = false,
+    val vividStrength: Int = 100,
     val colorProfile: Int = 0,
+    val brightness: Int = 0,
+    val contrast: Int = 0,
+    val gammaPercent: Int = 100,
+    val scaleFilter: Int = 0,
+    val saturation: Int = 100,
+    val temperature: Int = 0,
+    val tint: Int = 0,
+    val sharpenEnabled: Boolean = false,
+    val sharpenStrength: Int = 50,
+    val scanlinesEnabled: Boolean = false,
+    val scanlinesIntensity: Int = 50,
+    val pixelateEnabled: Boolean = false,
+    val pixelateBlock: Int = 6,
+    val colorBlind: Int = 0,
+    // reshadeMode is "solo" (one effect bypasses the rest) or "stack"; param keys follow ReshadeManager.seedValues.
+    val reshadeMasterEnabled: Boolean = false,
+    val reshadeMode: String = "solo",
+    val reshadeLoadout: List<ReshadeLoadoutItem> = emptyList(),
     val inputControlsProfileNames: List<String> = emptyList(),
     val inputControlsSelectedProfileIndex: Int = 0,
+    val inputControlsStyleNames: List<String> = emptyList(),
+    val inputControlsSelectedStyleIndex: Int = 0,
+    val inputControlsAccentThemeNames: List<String> = emptyList(),
+    val inputControlsSelectedAccentThemeIndex: Int = 0,
     val inputControlsShowOverlay: Boolean = false,
     val inputControlsTapToClick: Boolean = true,
     val inputControlsOverlayOpacity: Float = 0.4f,
     val inputControlsTouchscreenHaptics: Boolean = false,
     val inputControlsGamepadVibration: Boolean = true,
+    val inputControlsGcmRumbleMode: String = "disabled",
+    val inputControlsReverseBindingOrder: Boolean = false,
+    val cursorSpeed: Float = 1.0f,
+    // External display / cast "Output" pane.
+    val outputSwapActive: Boolean = false,
+    val outputDisplayName: String = "",
+    val outputResolutionLabels: List<String> = emptyList(),
+    val outputSelectedResolutionIndex: Int = 0,
+    val outputRefreshLabels: List<String> = emptyList(),
+    val outputSelectedRefreshIndex: Int = 0,
+    val outputAspectMode: Int = 0,
+    val outputGameModeSupported: Boolean = false,
+    val outputGameModeEnabled: Boolean = false,
+    // Sink ignored real mode switches — phone is scaling; resolution becomes a render-size control.
+    val outputPanelScaling: Boolean = false,
+    val outputPanelNative: String = "",
+    // Display connected but game still on the phone — show the "Send to display" button.
+    val outputDisplayAvailable: Boolean = false,
+    // Viture XR glasses controls (USB), present only when Viture glasses are connected.
+    val outputVitureConnected: Boolean = false,
+    val outputVitureName: String = "",
+    val outputVitureSupportsBrightness: Boolean = false,
+    val outputVitureBrightness: Int = 0,
+    val outputVitureBrightnessMax: Int = 8,
+    val outputVitureSupportsFilm: Boolean = false,
+    val outputVitureFilmStepped: Boolean = false,
+    val outputVitureFilm: Int = 0,
+    val outputVitureSupports3D: Boolean = false,
+    val outputViture3D: Boolean = false,
+    val outputVitureSupportsVolume: Boolean = false,
+    val outputVitureVolume: Int = 0,
+    val outputVitureVolumeMax: Int = 8,
+    val recordConfig: RecordUiConfig = RecordUiConfig(),
+    val mouseEnabled: Boolean = true,
+    val relativeMouseEnabled: Boolean = false,
+    val screenTouchMode: Int = 0,
+    val rtsGesturesEnabled: Boolean = false,
+    val gestureProfileNames: List<String> = emptyList(),
+    val gestureSelectedProfileIndex: Int = 0,
+    val rightStickSensitivity: Float = 1.0f,
+    val screenTouchRsSensitivity: Float = 1.25f,
+    val mangoHudEnabled: Boolean = false,
+    val mangoHudElements: BooleanArray = BooleanArray(20) { it < 12 },
+    val mangoHudAlpha: Float = 1.0f,
+    val mangoHudBgAlpha: Float = 0.5f,
+    val mangoHudScale: Float = 0.735f,
+    val mangoHudLocked: Boolean = false,
 )
 
 class XServerDrawerStateHolder(
@@ -340,8 +710,32 @@ class XServerDrawerStateHolder(
     }
     private var drawerOpen by mutableStateOf(false)
     internal var openPane by mutableStateOf<DrawerPane?>(null)
+    var menuNavRegion by mutableStateOf(0)
+        private set
+    var menuNavIndex by mutableStateOf(0)
+        private set
+    var menuActivateSignal by mutableStateOf(0)
+        private set
+    private var tabCount = 1
+    private var cardCount = 0
+    private var cardColumns = 3
+    private var bottomCount = 0
+    var paneNavSignal by mutableStateOf(0)
+        private set
+    var paneNavDir by mutableStateOf(0)
+        private set
+    var controllerConnected by mutableStateOf(false)
+        private set
     private var paneVisibilityListener: ((Boolean) -> Unit)? = null
 
+    // Bumped on swap-back so the host re-requests a layout pass on the Compose-hosted display frame.
+    var phoneRelayoutTick by mutableStateOf(0)
+        private set
+
+    fun requestPhoneRelayout() {
+        phoneRelayoutTick++
+    }
+
     val isDrawerOpen: Boolean
         get() = drawerOpen
 
@@ -349,6 +743,130 @@ class XServerDrawerStateHolder(
         drawerOpen = true
     }
 
+    private fun regionSize(r: Int) = when (r) {
+        0 -> tabCount
+        1 -> cardCount
+        2 -> bottomCount
+        else -> 0
+    }
+
+    private fun clampNav() {
+        val max = (regionSize(menuNavRegion) - 1).coerceAtLeast(0)
+        if (menuNavIndex > max) menuNavIndex = max
+    }
+
+    fun menuActivate() { menuActivateSignal++ }
+
+    fun resetMenuNav() {
+        menuNavRegion = 0
+        menuNavIndex = 0
+    }
+
+    fun menuNavLeft() { if (menuNavIndex > 0) menuNavIndex-- }
+
+    fun menuNavRight() { if (menuNavIndex < regionSize(menuNavRegion) - 1) menuNavIndex++ }
+
+    fun setMenuNav(region: Int, index: Int) {
+        menuNavRegion = region
+        menuNavIndex = index.coerceAtLeast(0)
+        clampNav()
+    }
+
+    fun menuNavUp() {
+        when (menuNavRegion) {
+            1 ->
+                if (menuNavIndex < cardColumns) {
+                    if (tabCount > 0) {
+                        menuNavRegion = 0
+                        menuNavIndex = menuNavIndex.coerceAtMost(tabCount - 1)
+                    }
+                } else {
+                    menuNavIndex -= cardColumns
+                }
+            2 ->
+                when {
+                    cardCount > 0 -> {
+                        menuNavRegion = 1
+                        menuNavIndex = cardCount - 1
+                    }
+                    tabCount > 0 -> {
+                        menuNavRegion = 0
+                        menuNavIndex = menuNavIndex.coerceAtMost(tabCount - 1)
+                    }
+                }
+        }
+    }
+
+    fun menuNavDown() {
+        when (menuNavRegion) {
+            0 ->
+                when {
+                    cardCount > 0 -> {
+                        menuNavRegion = 1
+                        menuNavIndex = 0
+                    }
+                    bottomCount > 0 -> {
+                        menuNavRegion = 2
+                        menuNavIndex = 0
+                    }
+                }
+            1 -> {
+                val below = menuNavIndex + cardColumns
+                if (below < cardCount) {
+                    menuNavIndex = below
+                } else if (bottomCount > 0) {
+                    menuNavRegion = 2
+                    menuNavIndex = 0
+                }
+            }
+        }
+    }
+
+    fun setMenuTabCount(n: Int) {
+        tabCount = n.coerceAtLeast(0)
+        clampNav()
+    }
+
+    fun setMenuCardLayout(count: Int, columns: Int) {
+        cardCount = count.coerceAtLeast(0)
+        cardColumns = columns.coerceAtLeast(1)
+        clampNav()
+    }
+
+    fun setMenuBottomCount(n: Int) {
+        bottomCount = n.coerceAtLeast(0)
+        clampNav()
+    }
+
+    private fun paneNav(dir: Int) {
+        paneNavDir = dir
+        paneNavSignal++
+    }
+
+    fun paneNavLeft() = paneNav(PANE_DIR_LEFT)
+
+    fun paneNavRight() = paneNav(PANE_DIR_RIGHT)
+
+    fun paneNavUp() = paneNav(PANE_DIR_UP)
+
+    fun paneNavDown() = paneNav(PANE_DIR_DOWN)
+
+    fun paneActivate() = paneNav(PANE_DIR_ACTIVATE)
+
+    fun paneSecondary() = paneNav(PANE_DIR_SECONDARY)
+
+    fun resetPaneNav() {}
+
+    fun updateControllerConnected(connected: Boolean) { controllerConnected = connected }
+
+    var paneOverlayCloser: (() -> Unit)? = null
+
+    fun consumeOverlayBack(): Boolean {
+        val c = paneOverlayCloser ?: return false
+        c()
+        return true
+    }
+
     fun closeDrawer() {
         drawerOpen = false
         openPane = null
@@ -375,6 +893,7 @@ class XServerDrawerStateHolder(
         val wasVisible = openPane != null
         val nowVisible = newPane != null
         openPane = newPane
+        if (newPane != null) resetPaneNav()
         if (wasVisible != nowVisible) paneVisibilityListener?.invoke(nowVisible)
     }
 
@@ -382,13 +901,7 @@ class XServerDrawerStateHolder(
         setOpenPaneAndNotify(DrawerPane.LOGS)
     }
 
-    /**
-     * Append a log line. Safe to call from any thread. When the logs pane is not
-     * visible, this only stores the line in an off-thread ring buffer — no
-     * recomposition or main-thread work is scheduled. The buffer is flushed into
-     * observable state when the pane becomes visible (and live while visible,
-     * coalesced through a single posted runnable).
-     */
+    /** Append a log line (any thread). Buffers off-thread when the pane is hidden (no recomposition); flushes to state when the pane is visible. */
     fun appendLogLine(line: String) {
         if (logsPausedFlag) return
         synchronized(logsBuffer) {
@@ -396,7 +909,7 @@ class XServerDrawerStateHolder(
             while (logsBuffer.size > LogsPaneMaxLines) logsBuffer.removeAt(0)
         }
         if (logsPaneVisibleFlag && logsFlushPending.compareAndSet(false, true)) {
-            logsMainHandler.post(logsFlushRunnable)
+            logsMainHandler.postDelayed(logsFlushRunnable, LogsFlushIntervalMs)
         }
     }
 
@@ -443,18 +956,43 @@ interface XServerDrawerActionListener {
 
     fun onHUDTransparencyChanged(transparency: Float)
 
+    fun onHUDBackgroundAlphaDecoupledChanged(enabled: Boolean)
+
+    fun onHUDBackgroundTransparencyChanged(transparency: Float)
+
     fun onHUDScaleChanged(scale: Float)
 
     fun onDualSeriesBatteryChanged(enabled: Boolean)
 
+    fun onFrametimeNumericChanged(enabled: Boolean)
+
+    fun onMangoHudChanged(enabled: Boolean)
+
+    fun onMangoHudElementToggled(
+        index: Int,
+        enabled: Boolean,
+    )
+
+    fun onMangoHudAlphaChanged(alpha: Float)
+
+    fun onMangoHudBackgroundAlphaChanged(alpha: Float)
+
+    fun onMangoHudScaleChanged(scale: Float)
+
+    fun onMangoHudLockChanged(locked: Boolean)
+
     fun onHUDCardExpandedChanged(expanded: Boolean)
 
     fun onGyroscopeEnabledChanged(enabled: Boolean)
 
     fun onGyroscopeModeSelected(mode: Int)
 
+    fun onGyroOrientationModeChanged(enabled: Boolean)
+
     fun onGyroscopeActivatorSelected(keycode: Int)
 
+    fun onGyroscopeActivatorBindingSelected(bindingName: String)
+
     fun onRightStickGyroChanged(enabled: Boolean)
 
     fun onGyroMouseEnabledChanged(enabled: Boolean)
@@ -479,16 +1017,86 @@ interface XServerDrawerActionListener {
 
     fun onScreenEffectsCardExpandedChanged(expanded: Boolean)
 
-    fun onFSREnabledChanged(enabled: Boolean)
+    fun onOutputResolutionSelected(index: Int)
+
+    fun onOutputRefreshRateSelected(index: Int)
+
+    fun onOutputAspectModeSelected(mode: Int)
+
+    fun onOutputGameModeToggled(enabled: Boolean)
+
+    fun onOutputVitureBrightness(level: Int)
+
+    fun onOutputVitureFilm(level: Int)
+
+    fun onOutputViture3D(enabled: Boolean)
+
+    fun onOutputVitureVolume(level: Int)
+
+    fun onOutputReturnToPhone()
+
+    fun onOutputSwapToDisplay()
 
-    fun onFSRModeSelected(mode: Int)
+    fun onOutputCastClick()
 
-    fun onFSRSharpnessChanged(sharpness: Int)
+    fun onSGSREnabledChanged(enabled: Boolean)
+
+    fun onSGSRSharpnessChanged(sharpness: Int)
+
+    fun onVividEnabledChanged(enabled: Boolean)
+
+    fun onVividStrengthChanged(strength: Int)
 
     fun onColorProfileSelected(profile: Int)
 
+    fun onBrightnessChanged(value: Int)
+
+    fun onContrastChanged(value: Int)
+
+    fun onGammaChanged(value: Int)
+
+    fun onScaleFilterSelected(mode: Int)
+
+    fun onSaturationChanged(value: Int)
+
+    fun onTemperatureChanged(value: Int)
+
+    fun onTintChanged(value: Int)
+
+    fun onSharpenEnabledChanged(enabled: Boolean)
+
+    fun onSharpenStrengthChanged(value: Int)
+
+    fun onScanlinesEnabledChanged(enabled: Boolean)
+
+    fun onScanlinesIntensityChanged(value: Int)
+
+    fun onPixelateEnabledChanged(enabled: Boolean)
+
+    fun onPixelateBlockChanged(value: Int)
+
+    fun onColorBlindSelected(mode: Int)
+
+    fun onResetEffects()
+
+    fun onReshadeMasterEnabledChanged(enabled: Boolean)
+
+    // In solo mode enabling one effect bypasses the others (host-side).
+    fun onReshadeEffectEnabledChanged(index: Int, enabled: Boolean)
+
+    fun onReshadeModeChanged(mode: String)
+
+    // key = ReshadeManager.seedValues scheme.
+    fun onReshadeParamChanged(index: Int, key: String, value: Float)
+
+    fun onReshadeReset(index: Int)
+
     fun onInputControlsProfileSelected(index: Int)
 
+    fun onInputControlsStyleSelected(index: Int)
+
+    fun onInputControlsAccentThemeSelected(index: Int)
+
     fun onInputControlsShowOverlayChanged(enabled: Boolean)
 
     fun onInputControlsTapToClickChanged(enabled: Boolean)
@@ -499,14 +1107,32 @@ interface XServerDrawerActionListener {
 
     fun onInputControlsGamepadVibrationChanged(enabled: Boolean)
 
+    fun onCursorSpeedChanged(speed: Float)
+
+    fun onInputControlsGcmRumbleModeChanged(mode: String)
+
+    fun onInputControlsReverseBindingOrderChanged(enabled: Boolean)
+
     fun onInputControlsEditClick()
 
+    fun onScreenTouchModeChanged(mode: Int)
+
+    fun onRtsGesturesToggled(enabled: Boolean)
+
+    fun onGestureProfileSelected(index: Int)
+
+    fun onRtsGesturesEditClick()
+
+    fun onRightStickSensitivityChanged(sensitivity: Float)
+
     fun onTaskManagerVisibilityChanged(visible: Boolean)
 
     fun onTaskManagerCpuExpandedChanged(expanded: Boolean)
 
     fun onTaskManagerEndProcess(name: String)
 
+    fun onTaskManagerBringToFront(name: String)
+
     fun onTaskManagerSetAffinity(pid: Int, affinityMask: Int)
 
     fun onTaskManagerNewTask(command: String)
@@ -518,6 +1144,9 @@ interface XServerDrawerActionListener {
     fun onLogsPaneVisibilityChanged(visible: Boolean)
 
     fun onLogsShare()
+
+    /** Start recording with the chosen settings (indices into the option lists in RecordUiConfig). */
+    fun onRecordStart(fpsIndex: Int, resolutionIndex: Int, quality: Int, recordUI: Boolean)
 }
 
 fun buildXServerDrawerState(
@@ -529,41 +1158,80 @@ fun buildXServerDrawerState(
     showMagnifier: Boolean,
     magnifierActive: Boolean,
     showLogs: Boolean,
-    nativeRenderingEnabled: Boolean,
-    nativeRenderingTitle: String,
-    nativeRenderingSubtitle: String,
     hudTransparency: Float = 1.0f,
+    hudBackgroundAlphaEnabled: Boolean = false,
+    hudBackgroundTransparency: Float = 1.0f,
     hudScale: Float = 1.0f,
-    hudElements: BooleanArray = booleanArrayOf(true, true, true, true, true, true, true),
+    hudElements: BooleanArray = booleanArrayOf(true, true, true, true, true, true, true, true, false),
     dualSeriesBatteryEnabled: Boolean = false,
+    frametimeNumericEnabled: Boolean = false,
     hudCardExpanded: Boolean = false,
     gyroscopeEnabled: Boolean = false,
     gyroscopeModeIndex: Int = 0,
+    gyroOrientationEnabled: Boolean = false,
     gyroscopeActivatorLabel: String = "",
     rightStickGyroEnabled: Boolean = false,
     gyroMouseEnabled: Boolean = false,
     gyroMouseScale: Float = 50.0f,
     gyroXSensitivity: Float = 1.0f,
     gyroYSensitivity: Float = 1.0f,
-    gyroSmoothing: Float = 0.9f,
+    gyroSmoothing: Float = 0.1f,
     gyroDeadzone: Float = 0.05f,
     invertGyroX: Boolean = false,
     invertGyroY: Boolean = false,
     gyroscopeCardExpanded: Boolean = false,
     fpsLimit: Int = 0,
     screenEffectsCardExpanded: Boolean = false,
-    fsrEnabled: Boolean = false,
-    fsrMode: Int = 0,
-    fsrSharpness: Int = 100,
+    sgsrEnabled: Boolean = false,
+    sgsrSharpness: Int = 100,
+    vividEnabled: Boolean = false,
+    vividStrength: Int = 100,
     colorProfile: Int = 0,
+    brightness: Int = 0,
+    contrast: Int = 0,
+    gammaPercent: Int = 100,
+    scaleFilter: Int = 0,
+    saturation: Int = 100,
+    temperature: Int = 0,
+    tint: Int = 0,
+    sharpenEnabled: Boolean = false,
+    sharpenStrength: Int = 50,
+    scanlinesEnabled: Boolean = false,
+    scanlinesIntensity: Int = 50,
+    pixelateEnabled: Boolean = false,
+    pixelateBlock: Int = 6,
+    colorBlind: Int = 0,
     inputControlsProfileNames: List<String> = emptyList(),
     inputControlsSelectedProfileIndex: Int = 0,
+    inputControlsStyleNames: List<String> = emptyList(),
+    inputControlsSelectedStyleIndex: Int = 0,
+    inputControlsAccentThemeNames: List<String> = emptyList(),
+    inputControlsSelectedAccentThemeIndex: Int = 0,
     inputControlsShowOverlay: Boolean = false,
     inputControlsTapToClick: Boolean = true,
     inputControlsOverlayOpacity: Float = 0.4f,
     inputControlsTouchscreenHaptics: Boolean = false,
     inputControlsGamepadVibration: Boolean = true,
+    inputControlsGcmRumbleMode: String = "disabled",
+    inputControlsReverseBindingOrder: Boolean = false,
+    cursorSpeed: Float = 1.0f,
     fullscreenEnabled: Boolean = false,
+    maxRefreshRate: Int = 60,
+    refactorSizeEnabled: Boolean = false,
+    recordingActive: Boolean = false,
+    recordConfig: RecordUiConfig = RecordUiConfig(),
+    screenTouchMode: Int = 0,
+    rtsGesturesEnabled: Boolean = false,
+    gestureProfileNames: List<String> = emptyList(),
+    gestureSelectedProfileIndex: Int = 0,
+    rightStickSensitivity: Float = 1.0f,
+    screenTouchRsSensitivity: Float = 1.25f,
+    mangoHudEnabled: Boolean = false,
+    mangoHudElements: BooleanArray = BooleanArray(20) { it < 12 },
+    mangoHudAlpha: Float = 1.0f,
+    mangoHudBgAlpha: Float = 0.5f,
+    mangoHudScale: Float = 0.735f,
+    mangoHudLocked: Boolean = false,
 ): XServerDrawerState {
     val items =
         mutableListOf(
@@ -590,26 +1258,17 @@ fun buildXServerDrawerState(
             ),
             XServerDrawerItem(
                 itemId = R.id.main_menu_gyroscope,
-                title = "Gyroscope",
+                title = context.getString(R.string.session_gyroscope_title),
                 subtitle = "",
                 icon = Icons.Outlined.SportsEsports,
                 active = gyroscopeEnabled,
             ),
             XServerDrawerItem(
-                itemId = R.id.main_menu_relative_mouse_movement,
-                title = context.getString(R.string.session_drawer_relative_mouse_movement),
-                subtitle =
-                    if (relativeMouseEnabled) context.getString(R.string.common_ui_enabled) else context.getString(R.string.common_ui_disabled),
-                icon = Icons.Outlined.Mouse,
-                active = relativeMouseEnabled,
-            ),
-            XServerDrawerItem(
-                itemId = R.id.main_menu_disable_mouse,
-                title = context.getString(R.string.session_drawer_mouse_input),
-                subtitle =
-                    if (mouseDisabled) context.getString(R.string.common_ui_disabled) else context.getString(R.string.common_ui_enabled),
-                icon = Icons.Outlined.Mouse,
-                active = !mouseDisabled,
+                itemId = R.id.main_menu_touch,
+                title = context.getString(R.string.session_drawer_touch),
+                subtitle = "",
+                icon = Icons.Outlined.TouchApp,
+                active = screenTouchMode != 0 || rtsGesturesEnabled || !mouseDisabled,
             ),
             XServerDrawerItem(
                 itemId = R.id.main_menu_toggle_fullscreen,
@@ -623,14 +1282,10 @@ fun buildXServerDrawerState(
                 title = context.getString(R.string.session_drawer_screen_effects),
                 subtitle = context.getString(R.string.session_drawer_screen_effects_subtitle),
                 icon = Icons.Outlined.Tune,
-                active = fsrEnabled || colorProfile > 0,
-            ),
-            XServerDrawerItem(
-                itemId = R.id.main_menu_native_rendering,
-                title = nativeRenderingTitle,
-                subtitle = nativeRenderingSubtitle,
-                icon = Icons.Outlined.Memory,
-                active = nativeRenderingEnabled,
+                active = sgsrEnabled || vividEnabled || colorProfile > 0 ||
+                    brightness != 0 || contrast != 0 || gammaPercent != 100 || scaleFilter != 0 ||
+                    saturation != 100 || temperature != 0 || tint != 0 ||
+                    sharpenEnabled || scanlinesEnabled || pixelateEnabled || colorBlind != 0,
             ),
             XServerDrawerItem(
                 itemId = R.id.main_menu_pause,
@@ -646,12 +1301,6 @@ fun buildXServerDrawerState(
                 subtitle = "",
                 icon = Icons.Outlined.PictureInPictureAlt,
             ),
-            XServerDrawerItem(
-                itemId = R.id.main_menu_task_manager,
-                title = context.getString(R.string.session_task_title),
-                subtitle = "",
-                icon = Icons.AutoMirrored.Outlined.ViewList,
-            ),
         )
 
     if (showMagnifier) {
@@ -665,9 +1314,34 @@ fun buildXServerDrawerState(
             )
     }
 
+    items +=
+        XServerDrawerItem(
+            itemId = R.id.main_menu_refactor_size,
+            title = context.getString(R.string.session_drawer_refactor_size),
+            subtitle = "",
+            icon = Icons.Outlined.PictureInPictureAlt,
+            active = refactorSizeEnabled,
+        )
+
+    items +=
+        XServerDrawerItem(
+            itemId = R.id.main_menu_task_manager,
+            title = context.getString(R.string.session_task_title),
+            subtitle = "",
+            icon = Icons.AutoMirrored.Outlined.ViewList,
+        )
+
+    items +=
+        XServerDrawerItem(
+            itemId = R.id.main_menu_record,
+            title = context.getString(R.string.session_drawer_rail_label_record),
+            subtitle = "",
+            icon = Icons.Outlined.FiberManualRecord,
+            active = recordingActive,
+        )
+
     if (showLogs) {
         items.add(
-            0,
             XServerDrawerItem(
                 itemId = R.id.main_menu_logs,
                 title = context.getString(R.string.session_drawer_logs),
@@ -686,14 +1360,19 @@ fun buildXServerDrawerState(
         )
 
     return XServerDrawerState(
+        recordConfig = recordConfig,
         items = items,
         hudTransparency = hudTransparency,
+        hudBackgroundAlphaEnabled = hudBackgroundAlphaEnabled,
+        hudBackgroundTransparency = hudBackgroundTransparency,
         hudScale = hudScale,
         hudElements = hudElements,
         dualSeriesBatteryEnabled = dualSeriesBatteryEnabled,
+        frametimeNumericEnabled = frametimeNumericEnabled,
         hudCardExpanded = hudCardExpanded,
         gyroscopeEnabled = gyroscopeEnabled,
         gyroscopeModeIndex = gyroscopeModeIndex,
+        gyroOrientationEnabled = gyroOrientationEnabled,
         gyroscopeActivatorLabel = gyroscopeActivatorLabel,
         rightStickGyroEnabled = rightStickGyroEnabled,
         gyroMouseEnabled = gyroMouseEnabled,
@@ -706,18 +1385,55 @@ fun buildXServerDrawerState(
         invertGyroY = invertGyroY,
         gyroscopeCardExpanded = gyroscopeCardExpanded,
         fpsLimit = fpsLimit,
+        maxRefreshRate = maxRefreshRate,
         screenEffectsCardExpanded = screenEffectsCardExpanded,
-        fsrEnabled = fsrEnabled,
-        fsrMode = fsrMode,
-        fsrSharpness = fsrSharpness,
+        sgsrEnabled = sgsrEnabled,
+        sgsrSharpness = sgsrSharpness,
+        vividEnabled = vividEnabled,
+        vividStrength = vividStrength,
         colorProfile = colorProfile,
+        brightness = brightness,
+        contrast = contrast,
+        gammaPercent = gammaPercent,
+        scaleFilter = scaleFilter,
+        saturation = saturation,
+        temperature = temperature,
+        tint = tint,
+        sharpenEnabled = sharpenEnabled,
+        sharpenStrength = sharpenStrength,
+        scanlinesEnabled = scanlinesEnabled,
+        scanlinesIntensity = scanlinesIntensity,
+        pixelateEnabled = pixelateEnabled,
+        pixelateBlock = pixelateBlock,
+        colorBlind = colorBlind,
         inputControlsProfileNames = inputControlsProfileNames,
         inputControlsSelectedProfileIndex = inputControlsSelectedProfileIndex,
+        inputControlsStyleNames = inputControlsStyleNames,
+        inputControlsSelectedStyleIndex = inputControlsSelectedStyleIndex,
+        inputControlsAccentThemeNames = inputControlsAccentThemeNames,
+        inputControlsSelectedAccentThemeIndex = inputControlsSelectedAccentThemeIndex,
         inputControlsShowOverlay = inputControlsShowOverlay,
         inputControlsTapToClick = inputControlsTapToClick,
         inputControlsOverlayOpacity = inputControlsOverlayOpacity,
         inputControlsTouchscreenHaptics = inputControlsTouchscreenHaptics,
         inputControlsGamepadVibration = inputControlsGamepadVibration,
+        inputControlsGcmRumbleMode = inputControlsGcmRumbleMode,
+        inputControlsReverseBindingOrder = inputControlsReverseBindingOrder,
+        cursorSpeed = cursorSpeed,
+        mouseEnabled = !mouseDisabled,
+        relativeMouseEnabled = relativeMouseEnabled,
+        screenTouchMode = screenTouchMode,
+        rtsGesturesEnabled = rtsGesturesEnabled,
+        gestureProfileNames = gestureProfileNames,
+        gestureSelectedProfileIndex = gestureSelectedProfileIndex,
+        rightStickSensitivity = rightStickSensitivity,
+        screenTouchRsSensitivity = screenTouchRsSensitivity,
+        mangoHudEnabled = mangoHudEnabled,
+        mangoHudElements = mangoHudElements,
+        mangoHudAlpha = mangoHudAlpha,
+        mangoHudBgAlpha = mangoHudBgAlpha,
+        mangoHudScale = mangoHudScale,
+        mangoHudLocked = mangoHudLocked,
     )
 }
 
@@ -746,6 +1462,103 @@ fun setupXServerDrawerComposeView(
     }
 }
 
+// Append the always-present "Output" tab item and its state to the drawer state.
+fun withOutputState(
+    state: XServerDrawerState,
+    swapActive: Boolean,
+    displayName: String,
+    resolutionLabels: List<String>,
+    selectedResolutionIndex: Int,
+    refreshLabels: List<String>,
+    selectedRefreshIndex: Int,
+    aspectMode: Int,
+    gameModeSupported: Boolean,
+    gameModeEnabled: Boolean,
+    panelScaling: Boolean,
+    panelNative: String,
+    displayAvailable: Boolean,
+    outputTitle: String,
+): XServerDrawerState {
+    val outputItem =
+        XServerDrawerItem(
+            itemId = R.id.main_menu_output,
+            title = outputTitle,
+            subtitle = "",
+            icon = Icons.Outlined.Monitor,
+        )
+    return state.copy(
+        items = state.items + outputItem,
+        outputSwapActive = swapActive,
+        outputDisplayName = displayName,
+        outputResolutionLabels = resolutionLabels,
+        outputSelectedResolutionIndex = selectedResolutionIndex,
+        outputRefreshLabels = refreshLabels,
+        outputSelectedRefreshIndex = selectedRefreshIndex,
+        outputAspectMode = aspectMode,
+        outputGameModeSupported = gameModeSupported,
+        outputGameModeEnabled = gameModeEnabled,
+        outputPanelScaling = panelScaling,
+        outputPanelNative = panelNative,
+        outputDisplayAvailable = displayAvailable,
+    )
+}
+
+// Overlay Viture-glasses control state onto the output state (only when Viture glasses are connected).
+fun withVitureState(
+    state: XServerDrawerState,
+    name: String,
+    supportsBrightness: Boolean,
+    brightness: Int,
+    brightnessMax: Int,
+    supportsFilm: Boolean,
+    filmStepped: Boolean,
+    film: Int,
+    supports3D: Boolean,
+    threeD: Boolean,
+    supportsVolume: Boolean,
+    volume: Int,
+    volumeMax: Int,
+): XServerDrawerState =
+    state.copy(
+        outputVitureConnected = true,
+        outputVitureName = name,
+        outputVitureSupportsBrightness = supportsBrightness,
+        outputVitureBrightness = brightness,
+        outputVitureBrightnessMax = brightnessMax,
+        outputVitureSupportsFilm = supportsFilm,
+        outputVitureFilmStepped = filmStepped,
+        outputVitureFilm = film,
+        outputVitureSupports3D = supports3D,
+        outputViture3D = threeD,
+        outputVitureSupportsVolume = supportsVolume,
+        outputVitureVolume = volume,
+        outputVitureVolumeMax = volumeMax,
+    )
+
+// Call only when a ReShade effect was applied at launch (Vulkan wrapper) so the vkBasalt layer is loaded.
+fun withReshadeState(
+    state: XServerDrawerState,
+    masterEnabled: Boolean,
+    mode: String,
+    loadout: List<ReshadeLoadoutItem>,
+    reshadeTitle: String,
+): XServerDrawerState {
+    val reshadeItem =
+        XServerDrawerItem(
+            itemId = R.id.main_menu_reshade,
+            title = reshadeTitle,
+            subtitle = "",
+            icon = Icons.Outlined.AutoAwesome,
+            active = masterEnabled,
+        )
+    return state.copy(
+        items = state.items + reshadeItem,
+        reshadeMasterEnabled = masterEnabled,
+        reshadeMode = mode,
+        reshadeLoadout = loadout,
+    )
+}
+
 @Composable
 internal fun XServerDrawerContent(
     state: XServerDrawerState,
@@ -755,10 +1568,31 @@ internal fun XServerDrawerContent(
     onOpenPaneChange: (DrawerPane?) -> Unit,
     listener: XServerDrawerActionListener,
     onDismiss: () -> Unit,
+    revealCards: Boolean = true,
+    menuNavRegion: Int = 0,
+    menuNavIndex: Int = 0,
+    menuActivateSignal: Int = 0,
+    onSetTabCount: (Int) -> Unit = {},
+    onSetCardLayout: (Int, Int) -> Unit = { _, _ -> },
+    onSetBottomCount: (Int) -> Unit = {},
+    onCursor: (Int, Int) -> Unit = { _, _ -> },
+    paneNavSignal: Int = 0,
+    paneNavDir: Int = 0,
+    controllerActive: Boolean = false,
+    onOverlayCloserChange: ((() -> Unit)?) -> Unit = {},
 ) {
-    // Keep card reveal state stable while switching between panes.
+    // Content stays composed while the sheet is closed (host translates it off-screen) to avoid a first-composition cost on open; the staggered card reveal is driven from the sheet's engaged state so it replays on each open.
     val cardsRevealed = remember { mutableStateOf(false) }
-    LaunchedEffect(Unit) { cardsRevealed.value = true }
+    LaunchedEffect(revealCards) { cardsRevealed.value = revealCards }
+
+    val paneNav = remember(openPane) { PaneNavRegistry() }
+    paneNav.controllerActive = controllerActive
+    LaunchedEffect(paneNav, paneNavSignal) {
+        paneNav.processNav(paneNavSignal, paneNavDir)
+    }
+    LaunchedEffect(paneNav, paneNav.overlay) {
+        onOverlayCloserChange(if (paneNav.overlay != null) paneNav.overlayClose else null)
+    }
 
     Surface(
         modifier = Modifier.fillMaxSize(),
@@ -794,6 +1628,12 @@ internal fun XServerDrawerContent(
                                     onOpenPaneChange(if (openPane == spec.pane) null else spec.pane)
                                 },
                                 onMenuClick = { onOpenPaneChange(null) },
+                                region = menuNavRegion,
+                                navIndex = menuNavIndex,
+                                activateSignal = menuActivateSignal,
+                                onSetNavCount = onSetTabCount,
+                                onCursor = onCursor,
+                                controllerActive = controllerActive,
                             )
 
                             ThinDivider()
@@ -829,11 +1669,15 @@ internal fun XServerDrawerContent(
                             },
                             label = "drawerBody",
                         ) { pane ->
+                            CompositionLocalProvider(LocalPaneNav provides paneNav) {
                             when (pane) {
                                 DrawerPane.INPUT_CONTROLS -> InputControlsPaneContent(state = state, listener = listener)
                                 DrawerPane.HUD -> HUDPaneContent(state = state, listener = listener)
                                 DrawerPane.GYROSCOPE -> GyroscopePaneContent(state = state, listener = listener)
+                                DrawerPane.TOUCH -> TouchPaneContent(state = state, listener = listener, onClose = { onOpenPaneChange(null) })
                                 DrawerPane.SCREEN_EFFECTS -> ScreenEffectsPaneContent(state = state, listener = listener)
+                                DrawerPane.RESHADE -> ReshadePaneContent(state = state, listener = listener)
+                                DrawerPane.OUTPUT -> OutputPaneContent(state = state, listener = listener)
                                 DrawerPane.TASK_MANAGER ->
                                     TaskManagerPaneContent(
                                         taskManagerState = taskManagerState,
@@ -853,8 +1697,16 @@ internal fun XServerDrawerContent(
                                         cardsRevealed = cardsRevealed.value,
                                         onOpenTaskManager = { onOpenPaneChange(DrawerPane.TASK_MANAGER) },
                                         onOpenLogs = { onOpenPaneChange(DrawerPane.LOGS) },
+                                        onOpenTouch = { onOpenPaneChange(DrawerPane.TOUCH) },
+                                        region = menuNavRegion,
+                                        navIndex = menuNavIndex,
+                                        activateSignal = menuActivateSignal,
+                                        onSetCardLayout = onSetCardLayout,
+                                        onCursor = onCursor,
+                                        controllerActive = controllerActive,
                                     )
                             }
+                            }
                         }
                     }
 
@@ -869,6 +1721,12 @@ internal fun XServerDrawerContent(
                             BottomActions(
                                 state = state,
                                 listener = listener,
+                                region = menuNavRegion,
+                                navIndex = menuNavIndex,
+                                activateSignal = menuActivateSignal,
+                                onSetCount = onSetBottomCount,
+                                onCursor = onCursor,
+                                controllerActive = controllerActive,
                             )
                         }
                     }
@@ -886,17 +1744,40 @@ private fun TopRail(
     openPane: DrawerPane?,
     onTabClick: (RailPaneSpec) -> Unit,
     onMenuClick: () -> Unit,
+    region: Int = 0,
+    navIndex: Int = 0,
+    activateSignal: Int = 0,
+    onSetNavCount: (Int) -> Unit = {},
+    onCursor: (Int, Int) -> Unit = { _, _ -> },
+    controllerActive: Boolean = false,
 ) {
     val paneScale = LocalPaneScale.current
     val density = LocalDensity.current
     val activeSpecs = RAIL_PANES.filter { spec -> state.items.any { it.itemId == spec.itemId } }
 
-    val tileBounds = remember { mutableStateMapOf<String, RailTileBounds>() }
-
+    val tabCount = activeSpecs.size + 1
+    LaunchedEffect(tabCount) { onSetNavCount(tabCount) }
+    val lastActivate = remember { mutableStateOf(activateSignal) }
+    LaunchedEffect(activateSignal) {
+        if (activateSignal != lastActivate.value) {
+            lastActivate.value = activateSignal
+            if (region == 0) {
+                if (navIndex <= 0) onMenuClick() else activeSpecs.getOrNull(navIndex - 1)?.let { onTabClick(it) }
+            }
+        }
+    }
+
+    val tileBounds = remember { mutableStateMapOf<String, RailTileBounds>() }
+    val railScroll = rememberScrollState()
+
     val selectedKey =
-        when (openPane) {
-            null -> "menu"
-            else -> activeSpecs.firstOrNull { it.pane == openPane }?.itemId?.toString() ?: "menu"
+        if (controllerActive && region == 0) {
+            if (navIndex <= 0) "menu" else activeSpecs.getOrNull(navIndex - 1)?.itemId?.toString() ?: "menu"
+        } else {
+            when (openPane) {
+                null -> "menu"
+                else -> activeSpecs.firstOrNull { it.pane == openPane }?.itemId?.toString() ?: "menu"
+            }
         }
     val selectedBounds = tileBounds[selectedKey]
 
@@ -942,7 +1823,7 @@ private fun TopRail(
                 modifier =
                     Modifier
                         .offset(
-                            x = indicatorX + underlineHorizontalInset,
+                            x = indicatorX - with(density) { railScroll.value.toDp() } + underlineHorizontalInset,
                             y = indicatorTileHeight - underlineThickness,
                         )
                         .width((indicatorWidth - underlineHorizontalInset * 2).coerceAtLeast(0.dp))
@@ -954,6 +1835,7 @@ private fun TopRail(
         }
 
         Row(
+            modifier = Modifier.horizontalScroll(railScroll),
             horizontalArrangement = Arrangement.spacedBy(TopRailTileSpacing),
             verticalAlignment = Alignment.CenterVertically,
         ) {
@@ -962,11 +1844,12 @@ private fun TopRail(
                 label = stringResource(R.string.session_drawer_main_menu_title),
                 active = false,
                 selected = openPane == null,
-                onClick = onMenuClick,
+                onClick = { onCursor(0, 0); onMenuClick() },
                 tileKey = "menu",
                 onBoundsChanged = { tileBounds["menu"] = it },
+                highlighted = controllerActive && region == 0 && navIndex == 0,
             )
-            activeSpecs.forEach { spec ->
+            activeSpecs.forEachIndexed { index, spec ->
                 val item = state.items.first { it.itemId == spec.itemId }
                 val key = item.itemId.toString()
                 TopRailTile(
@@ -974,9 +1857,10 @@ private fun TopRail(
                     label = stringResource(spec.labelRes),
                     active = item.active,
                     selected = openPane == spec.pane,
-                    onClick = { onTabClick(spec) },
+                    onClick = { onCursor(0, index + 1); onTabClick(spec) },
                     tileKey = key,
                     onBoundsChanged = { tileBounds[key] = it },
+                    highlighted = controllerActive && region == 0 && navIndex == index + 1,
                 )
             }
         }
@@ -992,6 +1876,7 @@ private fun TopRailTile(
     onClick: () -> Unit,
     tileKey: String,
     onBoundsChanged: (RailTileBounds) -> Unit,
+    highlighted: Boolean = false,
 ) {
     val paneScale = LocalPaneScale.current
     val interactionSource = remember { MutableInteractionSource() }
@@ -1015,6 +1900,7 @@ private fun TopRailTile(
     val bgColor by animateColorAsState(
         targetValue =
             when {
+                highlighted -> DrawerFocusFill
                 pressed && !selected -> PaneSurfacePressed
                 else -> Color.Transparent
             },
@@ -1033,10 +1919,15 @@ private fun TopRailTile(
     )
 
     val shape = RoundedCornerShape(cornerRadius)
+    val bring = remember { BringIntoViewRequester() }
+    LaunchedEffect(highlighted, selected) {
+        if (highlighted || selected) runCatching { bring.bringIntoView() }
+    }
     Column(
         modifier =
             Modifier
                 .defaultMinSize(minWidth = minWidth)
+                .bringIntoViewRequester(bring)
                 .onGloballyPositioned { coords ->
                     val bounds = coords.boundsInParent()
                     onBoundsChanged(
@@ -1053,6 +1944,17 @@ private fun TopRailTile(
                 }
                 .clip(shape)
                 .background(bgColor)
+                .then(
+                    if (highlighted) {
+                        Modifier.chasingBorder(
+                            cornerRadius = cornerRadius,
+                            borderWidth = 1.5.dp,
+                            animationDurationMs = 8200,
+                        )
+                    } else {
+                        Modifier
+                    },
+                )
                 .clickable(
                     interactionSource = interactionSource,
                     indication = null,
@@ -1094,55 +1996,95 @@ private fun ActionCardGrid(
     cardsRevealed: Boolean,
     onOpenTaskManager: () -> Unit,
     onOpenLogs: () -> Unit,
+    onOpenTouch: () -> Unit,
+    region: Int = 0,
+    navIndex: Int = 0,
+    activateSignal: Int = 0,
+    onSetCardLayout: (Int, Int) -> Unit = { _, _ -> },
+    onCursor: (Int, Int) -> Unit = { _, _ -> },
+    controllerActive: Boolean = false,
 ) {
     val paneScale = LocalPaneScale.current
     val cards =
         state.items.filter {
             it.itemId !in RAIL_PANE_ITEM_IDS && it.itemId !in PINNED_BOTTOM_ITEM_IDS
         }
+    var showRecordSettings by remember { mutableStateOf(false) }
+
+    fun cardClick(item: XServerDrawerItem) {
+        when (item.itemId) {
+            R.id.main_menu_task_manager -> onOpenTaskManager()
+            R.id.main_menu_logs -> onOpenLogs()
+            // Recording: stop if active, otherwise open the settings popup.
+            R.id.main_menu_record ->
+                if (item.active) listener.onActionSelected(item.itemId)
+                else showRecordSettings = true
+            R.id.main_menu_touch -> onOpenTouch()
+            else -> listener.onActionSelected(item.itemId)
+        }
+    }
+
+    LaunchedEffect(cards.size) { onSetCardLayout(cards.size, ActionCardColumns) }
+    val lastActivate = remember { mutableStateOf(activateSignal) }
+    LaunchedEffect(activateSignal) {
+        if (activateSignal != lastActivate.value) {
+            lastActivate.value = activateSignal
+            if (region == 1) cards.getOrNull(navIndex)?.let { cardClick(it) }
+        }
+    }
 
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = (10f * paneScale).dp, vertical = (10f * paneScale).dp),
-    ) {
-        FlowRow(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(ActionCardSpacing),
-            verticalArrangement = Arrangement.spacedBy(ActionCardSpacing),
-            maxItemsInEachRow = ActionCardColumns,
+    val verticalPadding = (10f * paneScale).dp
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val rows = ((cards.size + ActionCardColumns - 1) / ActionCardColumns).coerceAtLeast(1)
+        val rowHeight =
+            ((maxHeight - verticalPadding * 2 - ActionCardSpacing * (rows - 1)) / rows)
+                .coerceAtLeast(ActionCardMinHeight * paneScale)
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = (10f * paneScale).dp, vertical = verticalPadding),
         ) {
-            cards.forEachIndexed { index, item ->
-                val label = railLabelResFor(item.itemId)?.let { stringResource(it) } ?: item.title
-                ActionCard(
-                    item = item,
-                    label = label,
-                    revealIndex = index,
-                    revealed = cardsRevealed,
-                    modifier =
-                        Modifier
-                            .weight(1f)
-                            .heightIn(min = ActionCardMinHeight * paneScale),
-                    onClick = {
-                        when (item.itemId) {
-                            R.id.main_menu_task_manager -> onOpenTaskManager()
-                            R.id.main_menu_logs -> onOpenLogs()
-                            R.id.main_menu_relative_mouse_movement,
-                            R.id.main_menu_disable_mouse,
-                            R.id.main_menu_toggle_fullscreen -> listener.onActionSelected(item.itemId)
-                            else -> listener.onActionSelected(item.itemId)
-                        }
-                    },
-                )
-            }
-            val trailing = (ActionCardColumns - cards.size % ActionCardColumns) % ActionCardColumns
-            repeat(trailing) {
-                Spacer(modifier = Modifier.weight(1f))
+            FlowRow(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(ActionCardSpacing),
+                verticalArrangement = Arrangement.spacedBy(ActionCardSpacing),
+                maxItemsInEachRow = ActionCardColumns,
+            ) {
+                cards.forEachIndexed { index, item ->
+                    val label = railLabelResFor(item.itemId)?.let { stringResource(it) } ?: item.title
+                    ActionCard(
+                        item = item,
+                        label = label,
+                        revealIndex = index,
+                        revealed = cardsRevealed,
+                        highlighted = controllerActive && region == 1 && navIndex == index,
+                        modifier =
+                            Modifier
+                                .weight(1f)
+                                .height(rowHeight),
+                        onClick = { onCursor(1, index); cardClick(item) },
+                    )
+                }
+                val trailing = (ActionCardColumns - cards.size % ActionCardColumns) % ActionCardColumns
+                repeat(trailing) {
+                    Spacer(modifier = Modifier.weight(1f))
+                }
             }
         }
     }
+
+    if (showRecordSettings) {
+        RecordSettingsDialog(
+            config = state.recordConfig,
+            onDismiss = { showRecordSettings = false },
+            onRecordNow = { fpsIndex, resIndex, quality, recordUI ->
+                showRecordSettings = false
+                listener.onRecordStart(fpsIndex, resIndex, quality, recordUI)
+            },
+        )
+    }
 }
 
 @Composable
@@ -1151,6 +2093,7 @@ private fun ActionCard(
     label: String,
     revealIndex: Int,
     revealed: Boolean,
+    highlighted: Boolean = false,
     modifier: Modifier = Modifier,
     onClick: () -> Unit,
 ) {
@@ -1194,6 +2137,7 @@ private fun ActionCard(
         targetValue =
             when {
                 !enabled -> Color(0x05FFFFFF)
+                highlighted -> DrawerFocusFill
                 pressed -> PaneInnerPressed
                 else -> PaneInnerResting
             },
@@ -1243,6 +2187,17 @@ private fun ActionCard(
                 .clip(shape)
                 .background(cardBrush)
                 .border(1.dp, borderColor, shape)
+                .then(
+                    if (highlighted) {
+                        Modifier.chasingBorder(
+                            cornerRadius = cornerRadius,
+                            borderWidth = 1.5.dp,
+                            animationDurationMs = 8200,
+                        )
+                    } else {
+                        Modifier
+                    },
+                )
                 .clickable(
                     enabled = enabled,
                     interactionSource = interactionSource,
@@ -1277,10 +2232,32 @@ private fun ActionCard(
 private fun BottomActions(
     state: XServerDrawerState,
     listener: XServerDrawerActionListener,
+    region: Int = 0,
+    navIndex: Int = 0,
+    activateSignal: Int = 0,
+    onSetCount: (Int) -> Unit = {},
+    onCursor: (Int, Int) -> Unit = { _, _ -> },
+    controllerActive: Boolean = false,
 ) {
     val paneScale = LocalPaneScale.current
     val pause = state.items.firstOrNull { it.itemId == R.id.main_menu_pause }
     val exit = state.items.firstOrNull { it.itemId == R.id.main_menu_exit }
+    val pauseIndex = if (pause != null) 0 else -1
+    val exitIndex = if (exit != null) (if (pause != null) 1 else 0) else -1
+    val count = (if (pause != null) 1 else 0) + (if (exit != null) 1 else 0)
+    LaunchedEffect(count) { onSetCount(count) }
+    val lastActivate = remember { mutableStateOf(activateSignal) }
+    LaunchedEffect(activateSignal) {
+        if (activateSignal != lastActivate.value) {
+            lastActivate.value = activateSignal
+            if (region == 2) {
+                when (navIndex) {
+                    pauseIndex -> pause?.let { listener.onActionSelected(it.itemId) }
+                    exitIndex -> exit?.let { listener.onActionSelected(it.itemId) }
+                }
+            }
+        }
+    }
     if (pause == null && exit == null) return
     Row(
         modifier =
@@ -1293,10 +2270,11 @@ private fun BottomActions(
         if (pause != null) {
             BottomActionButton(
                 item = pause,
-                label = stringResource(if (pause.active) R.string.session_drawer_resume else R.string.session_drawer_pause),
+                label = pause.title,
                 isExit = false,
+                highlighted = controllerActive && region == 2 && navIndex == pauseIndex,
                 modifier = Modifier.weight(1f),
-                onClick = { listener.onActionSelected(pause.itemId) },
+                onClick = { onCursor(2, pauseIndex); listener.onActionSelected(pause.itemId) },
             )
         }
         if (exit != null) {
@@ -1304,8 +2282,9 @@ private fun BottomActions(
                 item = exit,
                 label = stringResource(R.string.common_ui_exit),
                 isExit = true,
+                highlighted = controllerActive && region == 2 && navIndex == exitIndex,
                 modifier = Modifier.weight(1f),
-                onClick = { listener.onActionSelected(exit.itemId) },
+                onClick = { onCursor(2, exitIndex); listener.onActionSelected(exit.itemId) },
             )
         }
     }
@@ -1316,6 +2295,7 @@ private fun BottomActionButton(
     item: XServerDrawerItem,
     label: String,
     isExit: Boolean,
+    highlighted: Boolean = false,
     modifier: Modifier = Modifier,
     onClick: () -> Unit,
 ) {
@@ -1326,6 +2306,7 @@ private fun BottomActionButton(
     val bgColor by animateColorAsState(
         targetValue =
             when {
+                highlighted -> DrawerFocusFill
                 isExit && pressed -> TileExitPressed
                 isExit -> TileExitResting
                 pressed -> PaneSurfacePressed
@@ -1355,6 +2336,17 @@ private fun BottomActionButton(
                 .clip(shape)
                 .background(bgColor)
                 .border(1.dp, borderColor, shape)
+                .then(
+                    if (highlighted) {
+                        Modifier.chasingBorder(
+                            cornerRadius = cornerRadius,
+                            borderWidth = 1.5.dp,
+                            animationDurationMs = 8200,
+                        )
+                    } else {
+                        Modifier
+                    },
+                )
                 .clickable(
                     interactionSource = interactionSource,
                     indication = null,
@@ -1383,7 +2375,7 @@ private fun BottomActionButton(
 }
 
 @Composable
-private fun ThinDivider() {
+internal fun ThinDivider() {
     Box(
         modifier =
             Modifier
@@ -1393,6 +2385,31 @@ private fun ThinDivider() {
     )
 }
 
+@Composable
+internal fun DrawerResetRow(label: String, onClick: () -> Unit) {
+    val paneScale = LocalPaneScale.current
+    val shape = RoundedCornerShape((14f * paneScale).dp)
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(PaneInnerResting)
+                .border(1.dp, RestingCardBorder, shape)
+                .clickable(onClick = onClick)
+                .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+    ) {
+        Text(
+            text = label,
+            color = DrawerAccent,
+            fontSize = (14f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
 private fun railLabelResFor(itemId: Int): Int? =
     when (itemId) {
         R.id.main_menu_keyboard -> R.string.session_drawer_rail_label_keyboard
@@ -1401,9 +2418,9 @@ private fun railLabelResFor(itemId: Int): Int? =
         R.id.main_menu_disable_mouse -> R.string.session_drawer_rail_label_mouse
         R.id.main_menu_toggle_fullscreen -> R.string.session_drawer_rail_label_fullscreen
         R.id.main_menu_pip_mode -> R.string.session_drawer_rail_label_pip
-        R.id.main_menu_native_rendering -> R.string.session_drawer_rail_label_native
         R.id.main_menu_magnifier -> R.string.session_drawer_rail_label_magnifier
         R.id.main_menu_task_manager -> R.string.session_drawer_rail_label_task_manager
+        R.id.main_menu_record -> R.string.session_drawer_rail_label_record
         R.id.main_menu_logs -> R.string.session_drawer_rail_label_logs
         else -> null
     }
@@ -1421,1959 +2438,122 @@ private fun PaneEnableRow(
     )
 }
 
-@Composable
-private fun HUDPaneContent(
-    state: XServerDrawerState,
-    listener: XServerDrawerActionListener,
-) {
-    var activeEditor by remember { mutableStateOf<HUDMetricEditor?>(null) }
-    val elementNames =
-        listOf(
-            stringResource(R.string.session_drawer_hud_element_fps),
-            stringResource(R.string.session_drawer_hud_element_api),
-            stringResource(R.string.session_drawer_hud_element_gpu),
-            stringResource(R.string.session_drawer_hud_element_cpu),
-            stringResource(R.string.session_drawer_hud_element_ram),
-            stringResource(R.string.session_drawer_hud_element_battery),
-            stringResource(R.string.session_drawer_hud_element_graph),
-        )
-    val active =
-        state.items.firstOrNull { it.itemId == R.id.main_menu_fps_monitor }?.active ?: false
-
-    activeEditor?.let { editor ->
-        HUDMetricInputDialog(
-            editor = editor,
-            initialPercent =
-                when (editor) {
-                    HUDMetricEditor.ALPHA -> (state.hudTransparency * 100).roundToInt()
-                    HUDMetricEditor.SCALE -> (state.hudScale * 100).roundToInt()
-                },
-            onDismiss = { activeEditor = null },
-            onConfirm = { enteredPercent ->
-                activeEditor = null
-                when (editor) {
-                    HUDMetricEditor.ALPHA -> {
-                        listener.onHUDTransparencyChanged(enteredPercent.coerceIn(editor.minPercent, editor.maxPercent) / 100f)
-                    }
-                    HUDMetricEditor.SCALE -> {
-                        listener.onHUDScaleChanged(enteredPercent.coerceIn(editor.minPercent, editor.maxPercent) / 100f)
-                    }
-                }
-            },
-        )
-    }
-
-    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
-        val paneScale = computePaneScale(maxHeight)
-        CompositionLocalProvider(LocalPaneScale provides paneScale) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .verticalScroll(rememberScrollState())
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
-                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
-            ) {
-            PaneEnableRow(
-                title = stringResource(R.string.session_drawer_fps_monitor),
-                checked = active,
-                onCheckedChange = { listener.onActionSelected(R.id.main_menu_fps_monitor) },
-            )
-
-            if (active) {
-                DrawerSliderRow(
-                    label = stringResource(R.string.session_drawer_hud_alpha),
-                    valueText = "${(state.hudTransparency * 100).toInt()}%",
-                    value = state.hudTransparency,
-                    valueRange = 0.1f..1f,
-                    steps = 8,
-                    onValueClick = { activeEditor = HUDMetricEditor.ALPHA },
-                    onValueChange = { listener.onHUDTransparencyChanged(it.snapToStep(0.1f, 0.1f, 1f)) },
-                )
-
-                DrawerSliderRow(
-                    label = stringResource(R.string.session_drawer_hud_scale),
-                    valueText = "${(state.hudScale * 100).toInt()}%",
-                    value = state.hudScale,
-                    valueRange = 0.5f..2.0f,
-                    steps = 14,
-                    onValueClick = { activeEditor = HUDMetricEditor.SCALE },
-                    onValueChange = { listener.onHUDScaleChanged(it.snapToStep(0.1f, 0.5f, 2.0f)) },
-                )
-
-                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-                    PaneSectionLabel(stringResource(R.string.session_drawer_hud_elements))
-                    ChipFlow {
-                        elementNames.forEachIndexed { index, name ->
-                            HUDToggleChip(
-                                label = name,
-                                checked = state.hudElements[index],
-                                onClick = { listener.onHUDElementToggled(index, !state.hudElements[index]) },
-                            )
-                        }
-                    }
-                }
-
-                DrawerBooleanRow(
-                    title = stringResource(R.string.session_drawer_dual_series_battery),
-                    checked = state.dualSeriesBatteryEnabled,
-                    onCheckedChange = listener::onDualSeriesBatteryChanged,
-                )
 
-                FPSLimiterSelection(
-                    currentLimit = state.fpsLimit,
-                    onLimitSelected = listener::onFPSLimitChanged,
-                )
-            }
+internal class TaskManagerPopupPositionProvider(private val gapPx: Int) : PopupPositionProvider {
+    override fun calculatePosition(
+        anchorBounds: IntRect,
+        windowSize: IntSize,
+        layoutDirection: LayoutDirection,
+        popupContentSize: IntSize,
+    ): IntOffset {
+        val x = anchorBounds.left.coerceIn(0, (windowSize.width - popupContentSize.width).coerceAtLeast(0))
+        val below = anchorBounds.bottom + gapPx
+        val y =
+            if (below + popupContentSize.height <= windowSize.height) {
+                below
+            } else {
+                (anchorBounds.top - popupContentSize.height - gapPx).coerceAtLeast(0)
             }
-        }
+        return IntOffset(x, y)
     }
 }
 
-@Composable
-private fun GyroscopePaneContent(
-    state: XServerDrawerState,
-    listener: XServerDrawerActionListener,
-) {
-    var calibrateExpanded by remember { mutableStateOf(false) }
-
-    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
-        val paneScale = computePaneScale(maxHeight)
-        CompositionLocalProvider(LocalPaneScale provides paneScale) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .verticalScroll(rememberScrollState())
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
-                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
-            ) {
-            PaneEnableRow(
-                title = stringResource(R.string.session_gyroscope_title),
-                checked = state.gyroscopeEnabled,
-                onCheckedChange = listener::onGyroscopeEnabledChanged,
-            )
-
-            if (state.gyroscopeEnabled) {
-                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-                    PaneSectionLabel(stringResource(R.string.session_gyroscope_mode))
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
-                    ) {
-                        listOf(
-                            stringResource(R.string.session_gyroscope_hold),
-                            stringResource(R.string.session_gyroscope_toggle),
-                        ).forEachIndexed { index, label ->
-                            HUDToggleChip(
-                                label = label,
-                                checked = state.gyroscopeModeIndex == index,
-                                onClick = { listener.onGyroscopeModeSelected(index) },
-                                modifier = Modifier.weight(1f),
-                            )
-                        }
-                    }
-                }
-
-                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-                    PaneSectionLabel(stringResource(R.string.session_gyroscope_activator_button))
-                    GyroscopeActivatorDropdown(
-                        currentLabel = state.gyroscopeActivatorLabel,
-                        onSelected = listener::onGyroscopeActivatorSelected,
-                    )
-                }
-
-                DrawerBooleanRow(
-                    title = stringResource(R.string.session_gyroscope_enable_right_stick),
-                    checked = state.rightStickGyroEnabled,
-                    onCheckedChange = listener::onRightStickGyroChanged,
-                )
-
-                DrawerBooleanRow(
-                    title = stringResource(R.string.session_gyroscope_experimental_mouse_movement),
-                    checked = state.gyroMouseEnabled,
-                    onCheckedChange = listener::onGyroMouseEnabledChanged,
-                )
-
-                if (state.gyroMouseEnabled) {
-                    DrawerSliderRow(
-                        label = stringResource(R.string.session_gyroscope_mouse_scale),
-                        valueText = "${state.gyroMouseScale.toInt()}%",
-                        value = state.gyroMouseScale,
-                        valueRange = 0f..200f,
-                        steps = 199,
-                        onValueChange = { listener.onGyroMouseScaleChanged(it.roundToInt().toFloat()) },
-                    )
-                }
-
-                ExpandableSection(
-                    title = stringResource(R.string.session_drawer_calibrate_advanced),
-                    expanded = calibrateExpanded,
-                    onToggle = { calibrateExpanded = !calibrateExpanded },
-                ) {
-                    DrawerSliderRow(
-                        label = stringResource(R.string.session_gyroscope_x_sensitivity),
-                        valueText = "${(state.gyroXSensitivity * 100).toInt()}%",
-                        value = state.gyroXSensitivity,
-                        valueRange = 0f..2f,
-                        steps = 199,
-                        onValueChange = { listener.onGyroXSensitivityChanged(it) },
-                    )
-
-                    DrawerSliderRow(
-                        label = stringResource(R.string.session_gyroscope_y_sensitivity),
-                        valueText = "${(state.gyroYSensitivity * 100).toInt()}%",
-                        value = state.gyroYSensitivity,
-                        valueRange = 0f..2f,
-                        steps = 199,
-                        onValueChange = { listener.onGyroYSensitivityChanged(it) },
-                    )
-
-                    DrawerSliderRow(
-                        label = stringResource(R.string.session_gyroscope_smoothing),
-                        valueText = "${(state.gyroSmoothing * 100).toInt()}%",
-                        value = state.gyroSmoothing,
-                        valueRange = 0f..1f,
-                        steps = 99,
-                        onValueChange = { listener.onGyroSmoothingChanged(it) },
-                    )
-
-                    DrawerSliderRow(
-                        label = stringResource(R.string.session_gyroscope_deadzone),
-                        valueText = "${(state.gyroDeadzone * 100).toInt()}%",
-                        value = state.gyroDeadzone,
-                        valueRange = 0f..1f,
-                        steps = 99,
-                        onValueChange = { listener.onGyroDeadzoneChanged(it) },
-                    )
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
-                    ) {
-                        HUDToggleChip(
-                            label = stringResource(R.string.session_gyroscope_invert_x),
-                            checked = state.invertGyroX,
-                            onClick = { listener.onInvertGyroXChanged(!state.invertGyroX) },
-                            modifier = Modifier.weight(1f),
-                        )
-                        HUDToggleChip(
-                            label = stringResource(R.string.session_gyroscope_invert_y),
-                            checked = state.invertGyroY,
-                            onClick = { listener.onInvertGyroYChanged(!state.invertGyroY) },
-                            modifier = Modifier.weight(1f),
-                        )
-                    }
-
-                    WinNativeDialogButton(
-                        label = stringResource(R.string.session_gyroscope_reset_stick),
-                        textColor = DrawerAccent,
-                        backgroundColor = DrawerAccent.copy(alpha = 0.12f),
-                        borderColor = DrawerAccent.copy(alpha = 0.3f),
-                        onClick = { listener.onActionSelected(R.id.main_menu_gyroscope_reset) },
-                    )
-                }
-            }
-            }
-        }
-    }
-}
+internal val NEW_TASK_PRESETS = listOf("Wfm.exe", "Winecfg.exe", "Regedit.exe", "Taskmgr.exe", "Services.exe")
 
 @Composable
-private fun InputControlsPaneContent(
-    state: XServerDrawerState,
-    listener: XServerDrawerActionListener,
-) {
-    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
-        val paneScale = computePaneScale(maxHeight)
-        CompositionLocalProvider(LocalPaneScale provides paneScale) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .verticalScroll(rememberScrollState())
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
-                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
-            ) {
-                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-                    PaneSectionLabel(stringResource(R.string.input_controls_editor_select_profile))
-                    InputControlsProfileSelector(
-                        profileNames = state.inputControlsProfileNames,
-                        selectedIndex = state.inputControlsSelectedProfileIndex,
-                        onProfileSelected = listener::onInputControlsProfileSelected,
-                        onEditClick = listener::onInputControlsEditClick,
-                    )
-                }
-
-                DrawerBooleanRow(
-                    title = stringResource(R.string.session_drawer_show_touchscreen_controls),
-                    checked = state.inputControlsShowOverlay,
-                    onCheckedChange = listener::onInputControlsShowOverlayChanged,
-                )
-
-                if (state.inputControlsShowOverlay) {
-                    DrawerSliderRow(
-                        label = stringResource(R.string.input_controls_editor_overlay_opacity),
-                        valueText = "${(state.inputControlsOverlayOpacity * 100).toInt()}%",
-                        value = state.inputControlsOverlayOpacity,
-                        valueRange = 0.1f..1.0f,
-                        steps = 8,
-                        onValueChange = listener::onInputControlsOverlayOpacityChanged,
-                    )
-                    Spacer(Modifier.height(4.dp))
-
-                    DrawerBooleanRow(
-                        title = stringResource(R.string.input_controls_tap_to_click),
-                        checked = state.inputControlsTapToClick,
-                        onCheckedChange = listener::onInputControlsTapToClickChanged,
-                    )
-                }
-
-                DrawerBooleanRow(
-                    title = stringResource(R.string.settings_general_touchscreen_haptics),
-                    checked = state.inputControlsTouchscreenHaptics,
-                    onCheckedChange = listener::onInputControlsTouchscreenHapticsChanged,
-                )
-
-                DrawerBooleanRow(
-                    title = stringResource(R.string.session_gamepad_enable_vibration),
-                    checked = state.inputControlsGamepadVibration,
-                    onCheckedChange = listener::onInputControlsGamepadVibrationChanged,
-                )
-            }
-        }
-    }
+internal fun PaneSectionLabel(text: String) {
+    val paneScale = LocalPaneScale.current
+    Text(
+        text = text,
+        color = DrawerTextPrimary,
+        fontSize = (14f * paneScale).sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = 0.3.sp,
+    )
 }
 
 @Composable
-private fun InputControlsProfileSelector(
-    profileNames: List<String>,
-    selectedIndex: Int,
-    onProfileSelected: (Int) -> Unit,
-    onEditClick: () -> Unit,
+private fun DrawerMetricChip(
+    label: String,
+    value: String,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
 ) {
     val paneScale = LocalPaneScale.current
-    var expanded by remember { mutableStateOf(false) }
-    val disabledPlaceholder = stringResource(R.string.common_ui_disabled_placeholder)
-    val selectedText = profileNames.getOrElse(selectedIndex) { disabledPlaceholder }
-
-    val cornerRadius = (14f * paneScale).dp
-    val shape = RoundedCornerShape(cornerRadius)
     val interactionSource = remember { MutableInteractionSource() }
     val pressed = interactionSource.collectIsPressedAsState().value
+    val scale by animateFloatAsState(
+        targetValue = if (pressed) 0.985f else 1f,
+        animationSpec = tween(durationMillis = 140, easing = FastOutSlowInEasing),
+        label = "drawerMetricScale_$label",
+    )
     val bgColor by animateColorAsState(
         targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
         animationSpec = tween(140),
-        label = "inputControlsProfileBg",
+        label = "drawerMetricBg",
     )
 
+    Column(
+        modifier =
+            modifier
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }
+                .fillMaxWidth()
+                .clip(RoundedCornerShape((12f * paneScale).dp))
+                .background(bgColor)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = (10f * paneScale).dp, vertical = (7f * paneScale).dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Text(
+            text = label.uppercase(),
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+            letterSpacing = 0.6.sp,
+        )
+        Spacer(Modifier.height(2.dp))
+        Text(
+            text = value,
+            color = DrawerTextPrimary,
+            fontSize = (13f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
+@Composable
+private fun DrawerReadOnlyValueRow(
+    label: String,
+    valueText: String,
+) {
+    val paneScale = LocalPaneScale.current
     Row(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape((10f * paneScale).dp))
+                .background(PaneInnerResting)
+                .border(1.dp, RestingCardBorder, RoundedCornerShape((10f * paneScale).dp))
+                .padding(horizontal = (12f * paneScale).dp, vertical = (8f * paneScale).dp),
         verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Box(modifier = Modifier.weight(1f)) {
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clip(shape)
-                        .background(bgColor)
-                        .border(1.dp, RestingCardBorder, shape)
-                        .clickable(
-                            interactionSource = interactionSource,
-                            indication = null,
-                        ) { expanded = true }
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = selectedText,
-                    color = DrawerTextPrimary,
-                    fontSize = (14f * paneScale).sp,
-                    fontWeight = FontWeight.Medium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.weight(1f),
-                )
-                Icon(
-                    imageVector = Icons.Outlined.ArrowDropDown,
-                    contentDescription = null,
-                    tint = DrawerTextSecondary,
-                    modifier = Modifier.size((22f * paneScale).dp),
-                )
-            }
-
-            DropdownMenu(
-                expanded = expanded,
-                onDismissRequest = { expanded = false },
-                modifier =
-                    Modifier
-                        .background(PaneSurfaceColor)
-                        .heightIn(max = 280.dp),
-            ) {
-                profileNames.forEachIndexed { index, name ->
-                    val isSelected = index == selectedIndex
-                    DropdownMenuItem(
-                        text = {
-                            Text(
-                                text = name,
-                                color = if (isSelected) DrawerAccent else DrawerTextPrimary,
-                                fontSize = 14.sp,
-                                fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium,
-                            )
-                        },
-                        trailingIcon =
-                            if (isSelected) {
-                                {
-                                    Icon(
-                                        imageVector = Icons.Outlined.Check,
-                                        contentDescription = null,
-                                        tint = DrawerAccent,
-                                        modifier = Modifier.size(18.dp),
-                                    )
-                                }
-                            } else {
-                                null
-                            },
-                        onClick = {
-                            onProfileSelected(index)
-                            expanded = false
-                        },
-                        colors =
-                            MenuDefaults.itemColors(
-                                textColor = DrawerTextPrimary,
-                            ),
-                    )
-                }
-            }
-        }
-
-        Box(
-            modifier =
-                Modifier
-                    .size((44f * paneScale).dp)
-                    .clip(shape)
-                    .background(PaneInnerResting)
-                    .border(1.dp, RestingCardBorder, shape)
-                    .clickable(onClick = onEditClick),
-            contentAlignment = Alignment.Center,
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Settings,
-                contentDescription = stringResource(R.string.common_ui_settings),
-                tint = DrawerTextPrimary,
-                modifier = Modifier.size((20f * paneScale).dp),
-            )
-        }
-    }
-}
-
-@Composable
-private fun ExpandableSection(
-    title: String,
-    expanded: Boolean,
-    onToggle: () -> Unit,
-    content: @Composable () -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val rotation by animateFloatAsState(
-        targetValue = if (expanded) 180f else 0f,
-        animationSpec = tween(180, easing = FastOutSlowInEasing),
-        label = "expandableRotation",
-    )
-    val headerInteractionSource = remember { MutableInteractionSource() }
-    val headerPressed = headerInteractionSource.collectIsPressedAsState().value
-    val headerBg by animateColorAsState(
-        targetValue =
-            when {
-                headerPressed -> PaneInnerPressed
-                else -> PaneInnerResting
-            },
-        animationSpec = tween(140),
-        label = "expandableHeaderBg",
-    )
-    val headerBorder by animateColorAsState(
-        targetValue = if (expanded) DrawerAccent else RestingCardBorder,
-        animationSpec = tween(140),
-        label = "expandableHeaderBorder",
-    )
-    val headerShape = RoundedCornerShape((12f * paneScale).dp)
-    Column(verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp)) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(headerShape)
-                    .background(headerBg)
-                    .border(1.dp, headerBorder, headerShape)
-                    .clickable(
-                        interactionSource = headerInteractionSource,
-                        indication = null,
-                        onClick = onToggle,
-                    )
-                    .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = title,
-                color = if (expanded) DrawerAccent else DrawerTextPrimary,
-                fontSize = (14f * paneScale).sp,
-                fontWeight = FontWeight.SemiBold,
-                letterSpacing = 0.3.sp,
-                modifier = Modifier.weight(1f),
-            )
-            Icon(
-                imageVector = Icons.Outlined.ExpandMore,
-                contentDescription = null,
-                tint = if (expanded) DrawerAccent else DrawerTextSecondary,
-                modifier =
-                    Modifier
-                        .size((18f * paneScale).dp)
-                        .graphicsLayer { rotationZ = rotation },
-            )
-        }
-        AnimatedVisibility(visible = expanded) {
-            Column(verticalArrangement = Arrangement.spacedBy((12f * paneScale).dp)) {
-                content()
-            }
-        }
-    }
-}
-
-@Composable
-private fun ScreenEffectsPaneContent(
-    state: XServerDrawerState,
-    listener: XServerDrawerActionListener,
-) {
-    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
-        val paneScale = computePaneScale(maxHeight)
-        CompositionLocalProvider(LocalPaneScale provides paneScale) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .verticalScroll(rememberScrollState())
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
-                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
-            ) {
-            DrawerBooleanRow(
-                title = stringResource(R.string.session_drawer_super_resolution),
-                checked = state.fsrEnabled,
-                onCheckedChange = listener::onFSREnabledChanged,
-            )
-
-            if (state.fsrEnabled) {
-                Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-                    PaneSectionLabel(stringResource(R.string.session_drawer_upscaler_mode))
-                    val upscaleLabels =
-                        listOf(
-                            stringResource(R.string.session_drawer_upscaler_fsr),
-                            stringResource(R.string.session_drawer_upscaler_dls),
-                        )
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
-                    ) {
-                        upscaleLabels.forEachIndexed { index, label ->
-                            HUDToggleChip(
-                                label = label,
-                                checked = state.fsrMode == index,
-                                onClick = { listener.onFSRModeSelected(index) },
-                                modifier = Modifier.weight(1f),
-                            )
-                        }
-                    }
-
-                    DrawerSliderRow(
-                        label = stringResource(R.string.session_drawer_sharpness),
-                        valueText = "${state.fsrSharpness}%",
-                        value = state.fsrSharpness.toFloat(),
-                        valueRange = 0f..100f,
-                        steps = 99,
-                        onValueChange = { listener.onFSRSharpnessChanged(it.roundToInt()) },
-                    )
-                }
-            }
-
-            Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-                PaneSectionLabel(stringResource(R.string.session_drawer_color_profile))
-
-                val profiles =
-                    listOf(
-                        stringResource(R.string.session_drawer_color_profile_disabled),
-                        stringResource(R.string.session_drawer_color_profile_hdr),
-                        stringResource(R.string.session_drawer_color_profile_natural),
-                        stringResource(R.string.session_drawer_color_profile_crt),
-                    )
-
-                ChipFlow {
-                    profiles.forEachIndexed { index, label ->
-                        HUDToggleChip(
-                            label = label,
-                            checked = state.colorProfile == index,
-                            onClick = { listener.onColorProfileSelected(index) },
-                        )
-                    }
-                }
-            }
-            }
-        }
-    }
-}
-
-
-@Composable
-private fun TaskManagerPaneContent(
-    taskManagerState: TaskManagerPaneState,
-    listener: XServerDrawerActionListener,
-    onClose: () -> Unit,
-) {
-    var showNewTaskDialog by remember { mutableStateOf(false) }
-    var processPendingEnd by remember { mutableStateOf<TaskManagerProcess?>(null) }
-    var expandedAffinityPid by remember { mutableStateOf<Int?>(null) }
-    val pendingAffinities = remember { mutableStateMapOf<Int, PendingTaskAffinity>() }
-
-    DisposableEffect(Unit) {
-        listener.onTaskManagerVisibilityChanged(true)
-        onDispose { listener.onTaskManagerVisibilityChanged(false) }
-    }
-
-    LaunchedEffect(taskManagerState.processes) {
-        val visibleProcessPids = taskManagerState.processes.map { it.pid }.toSet()
-        val now = System.currentTimeMillis()
-        pendingAffinities.keys.toList().forEach { pid ->
-            if (pid !in visibleProcessPids) pendingAffinities.remove(pid)
-        }
-        taskManagerState.processes.forEach { process ->
-            val pending = pendingAffinities[process.pid]
-            if (
-                pending != null &&
-                    (pending.affinityMask == process.affinityMask ||
-                        now - pending.requestedAtMillis > PendingTaskAffinityTimeoutMs)
-            ) {
-                pendingAffinities.remove(process.pid)
-            }
-        }
-        if (expandedAffinityPid != null && expandedAffinityPid !in visibleProcessPids) {
-            expandedAffinityPid = null
-        }
-    }
-
-    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
-        val paneScale = computePaneScale(maxHeight)
-        val affinityCoreCount =
-            if (taskManagerState.cpuCoreCount > 0) {
-                taskManagerState.cpuCoreCount
-            } else {
-                Runtime.getRuntime().availableProcessors()
-            }
-        CompositionLocalProvider(LocalPaneScale provides paneScale) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
-                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
-            ) {
-                TaskManagerHeader(
-                    cpuPercent = taskManagerState.cpuPercent,
-                    cpuCoreCount = taskManagerState.cpuCoreCount,
-                    cpuCorePercents = taskManagerState.cpuCorePercents,
-                    memoryPercent = taskManagerState.memoryPercent,
-                    memoryDetail = taskManagerState.memoryDetail,
-                    onNewTask = { showNewTaskDialog = true },
-                    onClose = onClose,
-                    onCpuExpandedChanged = listener::onTaskManagerCpuExpandedChanged,
-                )
-
-                TaskManagerProcessHeader()
-
-                Box(modifier = Modifier.weight(1f, fill = true).fillMaxWidth()) {
-                    if (taskManagerState.processes.isEmpty()) {
-                        Text(
-                            text = stringResource(R.string.common_ui_no_items_to_display),
-                            color = DrawerTextSecondary,
-                            fontSize = (13f * paneScale).sp,
-                            modifier = Modifier.fillMaxWidth().padding(top = (24f * paneScale).dp),
-                            textAlign = TextAlign.Center,
-                        )
-                    } else {
-                        Column(
-                            modifier =
-                                Modifier
-                                    .fillMaxSize()
-                                    .verticalScroll(rememberScrollState()),
-                            verticalArrangement = Arrangement.spacedBy((12f * paneScale).dp),
-                        ) {
-                            taskManagerState.processes.forEach { process ->
-                                key(process.pid) {
-                                    val selectedAffinityMask =
-                                        pendingAffinities[process.pid]?.affinityMask ?: process.affinityMask
-                                    TaskManagerProcessCard(
-                                        process = process,
-                                        expanded = expandedAffinityPid == process.pid,
-                                        affinityMask = selectedAffinityMask,
-                                        coreCount = affinityCoreCount,
-                                        onToggleAffinity = {
-                                            expandedAffinityPid =
-                                                if (expandedAffinityPid == process.pid) null else process.pid
-                                        },
-                                        onAffinityMaskChanged = { affinityMask ->
-                                            pendingAffinities[process.pid] =
-                                                PendingTaskAffinity(affinityMask, System.currentTimeMillis())
-                                            listener.onTaskManagerSetAffinity(process.pid, affinityMask)
-                                        },
-                                        onEndProcess = { processPendingEnd = process },
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (showNewTaskDialog) {
-        TaskManagerNewTaskDialog(
-            onDismiss = { showNewTaskDialog = false },
-            onConfirm = { command ->
-                showNewTaskDialog = false
-                listener.onTaskManagerNewTask(command)
-            },
-        )
-    }
-
-    processPendingEnd?.let { process ->
-        TaskManagerEndProcessDialog(
-            process = process,
-            onDismiss = { processPendingEnd = null },
-            onConfirm = {
-                processPendingEnd = null
-                listener.onTaskManagerEndProcess(process.name)
-            },
-        )
-    }
-}
-
-@Composable
-private fun LogsPaneContent(
-    logsState: LogsPaneState,
-    listener: XServerDrawerActionListener,
-    onClose: () -> Unit,
-) {
-    DisposableEffect(Unit) {
-        listener.onLogsPaneVisibilityChanged(true)
-        onDispose { listener.onLogsPaneVisibilityChanged(false) }
-    }
-    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
-        val paneScale = computePaneScale(maxHeight)
-        CompositionLocalProvider(LocalPaneScale provides paneScale) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
-                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
-            ) {
-                LogsPaneHeader(
-                    paused = logsState.paused,
-                    lineCount = logsState.lines.size,
-                    onClear = { listener.onLogsClear() },
-                    onTogglePause = { listener.onLogsPauseChanged(!logsState.paused) },
-                    onShare = { listener.onLogsShare() },
-                    onClose = onClose,
-                )
-
-                LogsPaneList(
-                    lines = logsState.lines,
-                    paused = logsState.paused,
-                    modifier = Modifier.weight(1f, fill = true).fillMaxWidth(),
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun LogsPaneHeader(
-    paused: Boolean,
-    lineCount: Int,
-    onClear: () -> Unit,
-    onTogglePause: () -> Unit,
-    onShare: () -> Unit,
-    onClose: () -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
-    ) {
-        Column(modifier = Modifier.weight(1f)) {
-            Text(
-                text = stringResource(R.string.session_drawer_logs),
-                color = DrawerTextPrimary,
-                fontSize = (16f * paneScale).sp,
-                fontWeight = FontWeight.SemiBold,
-            )
-            Text(
-                text =
-                    if (paused) {
-                        stringResource(R.string.session_drawer_logs_paused_indicator) +
-                            " · " +
-                            stringResource(R.string.session_drawer_logs_line_count, lineCount)
-                    } else {
-                        stringResource(R.string.session_drawer_logs_line_count, lineCount)
-                    },
-                color = if (paused) DrawerAccent else DrawerTextSecondary,
-                fontSize = (11f * paneScale).sp,
-                fontWeight = FontWeight.Medium,
-            )
-        }
-
-        LogsPaneActionTile(
-            icon = if (paused) Icons.Outlined.PlayArrow else Icons.Outlined.Pause,
-            contentDescription =
-                if (paused) {
-                    stringResource(R.string.session_drawer_logs_resume)
-                } else {
-                    stringResource(R.string.session_drawer_logs_pause)
-                },
-            onClick = onTogglePause,
-        )
-        LogsPaneActionTile(
-            icon = Icons.Outlined.DeleteSweep,
-            contentDescription = stringResource(R.string.session_drawer_logs_clear),
-            onClick = onClear,
-        )
-        LogsPaneActionTile(
-            icon = Icons.Outlined.Share,
-            contentDescription = stringResource(R.string.session_drawer_logs_share),
-            onClick = onShare,
-        )
-
-        Spacer(Modifier.width((16f * paneScale).dp))
-
-        TaskManagerCloseButton(onClick = onClose)
-    }
-}
-
-@Composable
-private fun LogsPaneActionTile(
-    icon: ImageVector,
-    contentDescription: String,
-    onClick: () -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val tint by animateColorAsState(
-        targetValue = if (pressed) DrawerAccent else DrawerTextPrimary,
-        animationSpec = tween(120),
-        label = "logsActionTileTint",
-    )
-    Box(
-        modifier =
-            Modifier
-                .size((38f * paneScale).dp)
-                .clip(CircleShape)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                ),
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = contentDescription,
-            tint = tint,
-            modifier = Modifier.size((24f * paneScale).dp),
-        )
-    }
-}
-
-@Composable
-private fun LogsPaneList(
-    lines: List<String>,
-    paused: Boolean,
-    modifier: Modifier = Modifier,
-) {
-    val paneScale = LocalPaneScale.current
-    val shape = RoundedCornerShape((10f * paneScale).dp)
-    val listState = rememberLazyListState()
-
-    LaunchedEffect(lines.size, paused) {
-        if (!paused && lines.isNotEmpty()) {
-            listState.scrollToItem((lines.size - 1).coerceAtLeast(0))
-        }
-    }
-
-    Box(
-        modifier =
-            modifier
-                .clip(shape)
-                .background(PaneInnerResting)
-                .border(1.dp, RestingCardBorder, shape),
-    ) {
-        if (lines.isEmpty()) {
-            Text(
-                text = stringResource(R.string.common_ui_no_items_to_display),
-                color = DrawerTextSecondary,
-                fontSize = (12f * paneScale).sp,
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(top = (24f * paneScale).dp),
-                textAlign = TextAlign.Center,
-            )
-        } else {
-            LazyColumn(
-                state = listState,
-                modifier = Modifier.fillMaxSize(),
-                contentPadding =
-                    PaddingValues(
-                        horizontal = (10f * paneScale).dp,
-                        vertical = (8f * paneScale).dp,
-                    ),
-                verticalArrangement = Arrangement.spacedBy((1f * paneScale).dp),
-            ) {
-                items(lines) { line ->
-                    Text(
-                        text = line,
-                        color = DrawerTextPrimary,
-                        fontSize = (11f * paneScale).sp,
-                        fontFamily = FontFamily.Monospace,
-                        lineHeight = (14f * paneScale).sp,
-                        letterSpacing = 0.sp,
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun TaskManagerHeader(
-    cpuPercent: Int,
-    cpuCoreCount: Int,
-    cpuCorePercents: List<Int>,
-    memoryPercent: Int,
-    memoryDetail: String,
-    onNewTask: () -> Unit,
-    onClose: () -> Unit,
-    onCpuExpandedChanged: (Boolean) -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    var cpuExpanded by remember { mutableStateOf(false) }
-    DisposableEffect(cpuExpanded) {
-        onCpuExpandedChanged(cpuExpanded)
-        onDispose { if (cpuExpanded) onCpuExpandedChanged(false) }
-    }
-
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            text = stringResource(R.string.session_task_title),
-            color = DrawerTextPrimary,
-            fontSize = (16f * paneScale).sp,
-            fontWeight = FontWeight.SemiBold,
-            modifier = Modifier.weight(1f),
-        )
-
-        TaskManagerCloseButton(onClick = onClose)
-    }
-
-    Row(
-        modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Max),
-        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        TaskManagerStatTile(
-            title = stringResource(R.string.session_task_cpu_usage_format, cpuPercent),
-            detail =
-                if (cpuCoreCount > 0) {
-                    pluralStringResource(R.plurals.session_task_core_count, cpuCoreCount, cpuCoreCount)
-                } else {
-                    ""
-                },
-            modifier = Modifier.weight(1f).fillMaxHeight(),
-            selected = cpuExpanded,
-            onClick = { cpuExpanded = !cpuExpanded },
-        )
-        TaskManagerStatTile(
-            title = stringResource(R.string.session_task_memory) + " ($memoryPercent%)",
-            detail = memoryDetail,
-            modifier = Modifier.weight(1f).fillMaxHeight(),
-        )
-    }
-
-    AnimatedVisibility(
-        visible = cpuExpanded && cpuCorePercents.isNotEmpty(),
-        enter =
-            fadeIn(animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing)) +
-                expandVertically(
-                    animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing),
-                    expandFrom = Alignment.Top,
-                ),
-        exit =
-            fadeOut(animationSpec = tween(durationMillis = 140, easing = FastOutSlowInEasing)) +
-                shrinkVertically(
-                    animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
-                    shrinkTowards = Alignment.Top,
-                ),
-    ) {
-        TaskManagerCpuCoreGrid(cpuCorePercents = cpuCorePercents)
-    }
-
-    TaskManagerNewTaskButton(onClick = onNewTask)
-}
-
-@Composable
-private fun TaskManagerCloseButton(onClick: () -> Unit) {
-    val paneScale = LocalPaneScale.current
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
-        animationSpec = tween(120),
-        label = "taskManagerCloseBg",
-    )
-    val size = (38f * paneScale).dp
-    val shape = RoundedCornerShape((10f * paneScale).dp)
-    Box(
-        modifier =
-            Modifier
-                .size(size)
-                .clip(shape)
-                .background(bgColor)
-                .border(1.dp, RestingCardBorder, shape)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                ),
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            imageVector = Icons.Outlined.Close,
-            contentDescription = stringResource(R.string.common_ui_close),
-            tint = DrawerTextPrimary,
-            modifier = Modifier.size((22f * paneScale).dp),
-        )
-    }
-}
-
-@Composable
-private fun TaskManagerStatTile(
-    title: String,
-    detail: String,
-    modifier: Modifier = Modifier,
-    selected: Boolean = false,
-    onClick: (() -> Unit)? = null,
-) {
-    val paneScale = LocalPaneScale.current
-    val shape = RoundedCornerShape((10f * paneScale).dp)
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue =
-            when {
-                pressed -> PaneInnerPressed
-                else -> PaneInnerResting
-            },
-        animationSpec = tween(120),
-        label = "taskManagerStatTileBg",
-    )
-    val borderColor by animateColorAsState(
-        targetValue = if (selected) DrawerAccent else RestingCardBorder,
-        animationSpec = tween(120),
-        label = "taskManagerStatTileBorder",
-    )
-    val clickModifier =
-        if (onClick != null) {
-            Modifier.clickable(
-                interactionSource = interactionSource,
-                indication = null,
-                onClick = onClick,
-            )
-        } else {
-            Modifier
-        }
-
-    Column(
-        modifier =
-            modifier
-                .clip(shape)
-                .background(bgColor)
-                .border(1.dp, borderColor, shape)
-                .then(clickModifier)
-                .padding(horizontal = (8f * paneScale).dp, vertical = (6f * paneScale).dp),
-        verticalArrangement = Arrangement.spacedBy((1f * paneScale).dp),
-    ) {
-        Text(
-            text = title,
-            color = DrawerAccent,
-            fontSize = (11f * paneScale).sp,
-            fontWeight = FontWeight.SemiBold,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth(),
-        )
-        Text(
-            text = detail,
-            color = DrawerTextSecondary,
-            fontSize = (10f * paneScale).sp,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth(),
-        )
-    }
-}
-
-@OptIn(ExperimentalLayoutApi::class)
-@Composable
-private fun TaskManagerCpuCoreGrid(cpuCorePercents: List<Int>) {
-    val paneScale = LocalPaneScale.current
-    val shape = RoundedCornerShape((10f * paneScale).dp)
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(shape)
-                .background(PaneInnerResting)
-                .border(1.dp, RestingCardBorder, shape)
-                .padding(horizontal = (8f * paneScale).dp, vertical = (6f * paneScale).dp),
-        verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
-    ) {
-        Text(
-            text = stringResource(R.string.session_task_per_core_usage),
-            color = DrawerTextPrimary,
-            fontSize = (11f * paneScale).sp,
-            fontWeight = FontWeight.SemiBold,
-        )
-        FlowRow(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
-            verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
-        ) {
-            cpuCorePercents.forEachIndexed { index, percent ->
-                TaskManagerCpuCoreChip(coreIndex = index, percent = percent)
-            }
-        }
-    }
-}
-
-@Composable
-private fun TaskManagerCpuCoreChip(coreIndex: Int, percent: Int) {
-    val paneScale = LocalPaneScale.current
-    val shape = RoundedCornerShape((6f * paneScale).dp)
-    Row(
-        modifier =
-            Modifier
-                .clip(shape)
-                .background(PaneSurfaceColor)
-                .border(1.dp, RestingCardBorder, shape)
-                .padding(horizontal = (6f * paneScale).dp, vertical = (3f * paneScale).dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
-    ) {
-        Text(
-            text = stringResource(R.string.session_task_core_label, coreIndex),
-            color = DrawerTextSecondary,
-            fontSize = (10f * paneScale).sp,
-            fontWeight = FontWeight.Medium,
-        )
-        Text(
-            text = "$percent%",
-            color = DrawerAccent,
-            fontSize = (10f * paneScale).sp,
-            fontWeight = FontWeight.SemiBold,
-        )
-    }
-}
-
-@Composable
-private fun TaskManagerNewTaskButton(onClick: () -> Unit) {
-    val paneScale = LocalPaneScale.current
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
-        animationSpec = tween(120),
-        label = "taskManagerNewTaskBg",
-    )
-    val tint = if (pressed) DrawerAccent.copy(alpha = 0.76f) else DrawerAccent
-    val shape = RoundedCornerShape((12f * paneScale).dp)
-    Row(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(shape)
-                .background(bgColor)
-                .border(1.dp, RestingCardBorder, shape)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                )
-                .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
-        horizontalArrangement = Arrangement.Center,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            imageVector = Icons.Outlined.Add,
-            contentDescription = null,
-            tint = tint,
-            modifier = Modifier.size((18f * paneScale).dp),
-        )
-        Spacer(Modifier.width((6f * paneScale).dp))
-        Text(
-            text = stringResource(R.string.session_task_new_task),
-            color = tint,
-            fontSize = (14f * paneScale).sp,
-            fontWeight = FontWeight.Medium,
-        )
-    }
-}
-
-@OptIn(ExperimentalLayoutApi::class)
-@Composable
-private fun TaskManagerAffinityOptions(
-    affinityMask: Int,
-    coreCount: Int,
-    onAffinityMaskChanged: (Int) -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val effectiveCoreCount = coreCount.coerceAtLeast(1).coerceAtMost(32)
-    val selectedMask = sanitizeTaskAffinityMask(affinityMask, effectiveCoreCount)
-    val fullMask = taskAffinityFullMask(effectiveCoreCount)
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(
-                    start = (8f * paneScale).dp,
-                    end = (8f * paneScale).dp,
-                    bottom = (8f * paneScale).dp,
-                ),
-        verticalArrangement = Arrangement.spacedBy((7f * paneScale).dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy((6f * paneScale).dp),
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Tune,
-                contentDescription = null,
-                tint = DrawerAccent,
-                modifier = Modifier.size((15f * paneScale).dp),
-            )
-            Text(
-                text = stringResource(R.string.session_task_affinity_title),
-                color = DrawerTextPrimary,
-                fontSize = (12f * paneScale).sp,
-                fontWeight = FontWeight.SemiBold,
-                modifier = Modifier.weight(1f),
-            )
-        }
-
-        FlowRow(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy((5f * paneScale).dp),
-            verticalArrangement = Arrangement.spacedBy((5f * paneScale).dp),
-        ) {
-            TaskManagerAffinityChip(
-                label = stringResource(R.string.session_task_affinity_all_cores),
-                selected = selectedMask == fullMask,
-                onClick = { onAffinityMaskChanged(fullMask) },
-            )
-            for (coreIndex in 0 until effectiveCoreCount) {
-                val bit = 1 shl coreIndex
-                TaskManagerAffinityChip(
-                    label = stringResource(R.string.session_task_core_label, coreIndex),
-                    selected = (selectedMask and bit) != 0,
-                    onClick = {
-                        val nextMask =
-                            if ((selectedMask and bit) != 0) {
-                                selectedMask and bit.inv()
-                            } else {
-                                selectedMask or bit
-                            }
-                        if ((nextMask and fullMask) != 0) {
-                            onAffinityMaskChanged(nextMask and fullMask)
-                        }
-                    },
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun TaskManagerAffinityChip(
-    label: String,
-    selected: Boolean,
-    onClick: () -> Unit,
-) {
-    val bgColor =
-        if (selected) {
-            DrawerAccent.copy(alpha = 0.16f)
-        } else {
-            PaneInnerResting
-        }
-    val borderColor = if (selected) DrawerAccent.copy(alpha = 0.56f) else RestingCardBorder
-    val textColor = if (selected) DrawerAccent else DrawerTextPrimary
-    Row(
-        modifier =
-            Modifier
-                .clip(RoundedCornerShape(8.dp))
-                .background(bgColor)
-                .border(1.dp, borderColor, RoundedCornerShape(8.dp))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
-                )
-                .padding(horizontal = 8.dp, vertical = 5.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(4.dp),
-    ) {
-        Icon(
-            imageVector = Icons.Outlined.Check,
-            contentDescription = null,
-            tint = DrawerAccent.copy(alpha = if (selected) 1f else 0f),
-            modifier = Modifier.size(13.dp),
-        )
-        Text(
-            text = label,
-            color = textColor,
-            fontSize = 11.sp,
-            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
-        )
-    }
-}
-
-private fun taskAffinityFullMask(coreCount: Int): Int {
-    var mask = 0
-    for (index in 0 until coreCount.coerceAtLeast(1).coerceAtMost(32)) {
-        mask = mask or (1 shl index)
-    }
-    return mask
-}
-
-private fun sanitizeTaskAffinityMask(affinityMask: Int, coreCount: Int): Int {
-    val fullMask = taskAffinityFullMask(coreCount)
-    val sanitizedMask = affinityMask and fullMask
-    return if (sanitizedMask != 0) sanitizedMask else fullMask
-}
-
-@Composable
-private fun TaskManagerEndProcessDialog(
-    process: TaskManagerProcess,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-) {
-    val displayName = if (process.isWow64) "${process.name} *32" else process.name
-    val shape = RoundedCornerShape(12.dp)
-
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                decorFitsSystemWindows = false,
-            ),
-    ) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .safeDrawingPadding()
-                    .padding(horizontal = 14.dp, vertical = 10.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .widthIn(max = 292.dp)
-                        .fillMaxWidth()
-                        .clip(shape)
-                        .background(PaneSurfaceColor)
-                        .border(1.dp, GlassExitTint.copy(alpha = 0.32f), shape)
-                        .padding(horizontal = 12.dp, vertical = 10.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Icon(
-                        imageVector = Icons.Outlined.Close,
-                        contentDescription = null,
-                        tint = GlassExitTint,
-                        modifier = Modifier.size(17.dp),
-                    )
-                    Text(
-                        text = stringResource(R.string.session_task_end_process),
-                        color = DrawerTextPrimary,
-                        fontSize = 13.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        modifier = Modifier.weight(1f),
-                    )
-                }
-
-                Text(
-                    text = displayName,
-                    color = DrawerTextPrimary,
-                    fontSize = 12.sp,
-                    fontWeight = FontWeight.Medium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth(),
-                )
-                Text(
-                    text = stringResource(R.string.session_task_confirm_end_process),
-                    color = DrawerTextPrimary,
-                    fontSize = 11.sp,
-                    lineHeight = 14.sp,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth().padding(bottom = 4.dp),
-                )
-
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    TaskManagerDialogButton(
-                        label = stringResource(R.string.common_ui_cancel),
-                        textColor = DrawerTextPrimary,
-                        modifier = Modifier.height(34.dp),
-                        verticalPadding = 0.dp,
-                        onClick = onDismiss,
-                    )
-                    TaskManagerDialogButton(
-                        label = stringResource(R.string.session_task_end_process),
-                        textColor = GlassExitTint,
-                        modifier = Modifier.height(34.dp),
-                        verticalPadding = 0.dp,
-                        fontWeight = FontWeight.Medium,
-                        backgroundColor = GlassExitTint.copy(alpha = 0.12f),
-                        borderColor = GlassExitTint.copy(alpha = 0.34f),
-                        onClick = onConfirm,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun TaskManagerNewTaskDialog(
-    onDismiss: () -> Unit,
-    onConfirm: (String) -> Unit,
-) {
-    var command by remember { mutableStateOf("taskmgr.exe") }
-    val focusRequester = remember { FocusRequester() }
-    val keyboardController = LocalSoftwareKeyboardController.current
-    val shape = RoundedCornerShape(14.dp)
-
-    fun submit() {
-        val trimmed = command.trim()
-        if (trimmed.isNotEmpty()) onConfirm(trimmed)
-    }
-
-    LaunchedEffect(Unit) {
-        focusRequester.requestFocus()
-        keyboardController?.show()
-    }
-
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                decorFitsSystemWindows = false,
-            ),
-    ) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .safeDrawingPadding()
-                    .imePadding()
-                    .padding(horizontal = 14.dp, vertical = 10.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .widthIn(max = 310.dp)
-                        .fillMaxWidth()
-                        .clip(shape)
-                        .background(PaneSurfaceColor)
-                        .border(1.dp, RestingCardBorder, shape)
-                        .padding(horizontal = 14.dp, vertical = 12.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Icon(
-                        imageVector = Icons.Outlined.Add,
-                        contentDescription = null,
-                        tint = DrawerAccent,
-                        modifier = Modifier.size(18.dp),
-                    )
-                    Text(
-                        text = stringResource(R.string.session_task_new_task),
-                        color = DrawerTextPrimary,
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                }
-
-                OutlinedTextField(
-                    value = command,
-                    onValueChange = { command = it },
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(48.dp)
-                            .focusRequester(focusRequester),
-                    singleLine = true,
-                    textStyle =
-                        androidx.compose.material3.MaterialTheme.typography.bodyMedium.copy(
-                            color = DrawerTextPrimary,
-                            fontSize = 13.sp,
-                        ),
-                    colors =
-                        OutlinedTextFieldDefaults.colors(
-                            focusedBorderColor = DrawerAccent,
-                            unfocusedBorderColor = RestingCardBorder,
-                            focusedTextColor = DrawerTextPrimary,
-                            unfocusedTextColor = DrawerTextPrimary,
-                            focusedContainerColor = PaneInnerResting,
-                            unfocusedContainerColor = PaneInnerResting,
-                            cursorColor = DrawerAccent,
-                        ),
-                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-                    keyboardActions =
-                        KeyboardActions(
-                            onDone = {
-                                keyboardController?.hide()
-                                submit()
-                            },
-                        ),
-                )
-
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    TaskManagerDialogButton(
-                        label = stringResource(R.string.common_ui_cancel),
-                        textColor = DrawerTextPrimary,
-                        modifier = Modifier.height(34.dp),
-                        verticalPadding = 0.dp,
-                        onClick = onDismiss,
-                    )
-                    TaskManagerDialogButton(
-                        label = stringResource(R.string.common_ui_ok),
-                        textColor = DrawerAccent,
-                        modifier = Modifier.height(34.dp),
-                        verticalPadding = 0.dp,
-                        backgroundColor = DrawerAccent.copy(alpha = 0.12f),
-                        borderColor = DrawerAccent.copy(alpha = 0.34f),
-                        onClick = {
-                            keyboardController?.hide()
-                            submit()
-                        },
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun TaskManagerDialogButton(
-    label: String,
-    textColor: Color,
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    backgroundColor: Color = PaneInnerResting,
-    borderColor: Color = RestingCardBorder,
-    fontWeight: FontWeight = FontWeight.SemiBold,
-    verticalPadding: Dp = 8.dp,
-) {
-    Box(
-        modifier =
-            modifier
-                .widthIn(min = 72.dp)
-                .clip(RoundedCornerShape(9.dp))
-                .background(backgroundColor)
-                .border(1.dp, borderColor, RoundedCornerShape(9.dp))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onClick,
-                )
-                .padding(horizontal = 14.dp, vertical = verticalPadding),
-        contentAlignment = Alignment.Center,
-    ) {
-        Text(
-            text = label,
-            color = textColor,
-            fontSize = 12.sp,
-            fontWeight = fontWeight,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-        )
-    }
-}
-
-@Composable
-private fun TaskManagerProcessHeader() {
-    val paneScale = LocalPaneScale.current
-    Row(
-        modifier = Modifier.fillMaxWidth().padding(horizontal = (4f * paneScale).dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            text = stringResource(R.string.session_task_process_name),
-            color = DrawerTextSecondary,
-            fontSize = (11f * paneScale).sp,
-            fontWeight = FontWeight.Medium,
-            modifier = Modifier.weight(1f),
-        )
-        Text(
-            text = stringResource(R.string.session_task_pid),
-            color = DrawerTextSecondary,
-            fontSize = (11f * paneScale).sp,
-            fontWeight = FontWeight.Medium,
-            textAlign = TextAlign.End,
-            modifier = Modifier.width((54f * paneScale).dp),
-        )
-        Text(
-            text = stringResource(R.string.session_task_memory),
-            color = DrawerTextSecondary,
-            fontSize = (11f * paneScale).sp,
-            fontWeight = FontWeight.Medium,
-            textAlign = TextAlign.End,
-            modifier = Modifier.width((78f * paneScale).dp),
-        )
-        Spacer(modifier = Modifier.width((46f * paneScale).dp))
-    }
-}
-
-@Composable
-private fun TaskManagerProcessCard(
-    process: TaskManagerProcess,
-    expanded: Boolean,
-    affinityMask: Int,
-    coreCount: Int,
-    onToggleAffinity: () -> Unit,
-    onAffinityMaskChanged: (Int) -> Unit,
-    onEndProcess: () -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val shape = RoundedCornerShape((8f * paneScale).dp)
-    val displayName = if (process.isWow64) "${process.name} *32" else process.name
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
-        animationSpec = tween(120),
-        label = "taskManagerProcessRowBg",
-    )
-    val borderColor by animateColorAsState(
-        targetValue = if (expanded) DrawerAccent.copy(alpha = 0.62f) else RestingCardBorder,
-        animationSpec = tween(160),
-        label = "taskManagerProcessCardBorder",
-    )
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(shape)
-                .background(bgColor)
-                .border(1.dp, borderColor, shape),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                        onClick = onToggleAffinity,
-                    )
-                    .padding(horizontal = (8f * paneScale).dp, vertical = (6f * paneScale).dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = displayName,
-                color = DrawerTextPrimary,
-                fontSize = (12f * paneScale).sp,
-                fontWeight = FontWeight.Medium,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier.weight(1f),
-            )
-            Text(
-                text = process.pid.toString(),
-                color = DrawerTextSecondary,
-                fontSize = (12f * paneScale).sp,
-                textAlign = TextAlign.End,
-                modifier = Modifier.width((54f * paneScale).dp),
-            )
-            Text(
-                text = process.memoryFormatted,
-                color = DrawerTextSecondary,
-                fontSize = (12f * paneScale).sp,
-                textAlign = TextAlign.End,
-                modifier = Modifier.width((78f * paneScale).dp),
-            )
-            Spacer(modifier = Modifier.width((10f * paneScale).dp))
-            TaskManagerEndButton(onClick = onEndProcess)
-        }
-
-        AnimatedVisibility(
-            visible = expanded,
-            enter =
-                fadeIn(animationSpec = tween(durationMillis = 150, easing = FastOutSlowInEasing)) +
-                    expandVertically(
-                        animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing),
-                        expandFrom = Alignment.Top,
-                    ),
-            exit =
-                fadeOut(animationSpec = tween(durationMillis = 120, easing = FastOutSlowInEasing)) +
-                    shrinkVertically(
-                        animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
-                        shrinkTowards = Alignment.Top,
-                    ),
-        ) {
-            TaskManagerAffinityOptions(
-                affinityMask = affinityMask,
-                coreCount = coreCount,
-                onAffinityMaskChanged = onAffinityMaskChanged,
-            )
-        }
-    }
-}
-
-@Composable
-private fun TaskManagerEndButton(onClick: () -> Unit) {
-    val paneScale = LocalPaneScale.current
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue = if (pressed) TileExitPressed else TileExitResting,
-        animationSpec = tween(120),
-        label = "taskManagerEndBtn",
-    )
-    val size = (32f * paneScale).dp
-    val shape = RoundedCornerShape((8f * paneScale).dp)
-    Box(
-        modifier =
-            Modifier
-                .size(size)
-                .clip(shape)
-                .background(bgColor)
-                .border(1.dp, GlassExitTint.copy(alpha = 0.34f), shape)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                ),
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            imageVector = Icons.Outlined.Close,
-            contentDescription = stringResource(R.string.session_task_end_process),
-            tint = GlassExitTint,
-            modifier = Modifier.size((16f * paneScale).dp),
-        )
-    }
-}
-
-@Composable
-private fun PaneSectionLabel(text: String) {
-    val paneScale = LocalPaneScale.current
-    Text(
-        text = text,
-        color = DrawerTextPrimary,
-        fontSize = (14f * paneScale).sp,
-        fontWeight = FontWeight.Medium,
-        letterSpacing = 0.3.sp,
-    )
-}
-
-@Composable
-private fun GyroscopeActivatorDropdown(
-    currentLabel: String,
-    onSelected: (Int) -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val names = stringArrayResource(R.array.button_options)
-    val keycodes = integerArrayResource(R.array.button_keycodes)
-    var expanded by remember { mutableStateOf(false) }
-
-    val cornerRadius = (14f * paneScale).dp
-    val shape = RoundedCornerShape(cornerRadius)
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
-        animationSpec = tween(140),
-        label = "gyroActivatorDropdownBg",
-    )
-
-    Box(modifier = Modifier.fillMaxWidth()) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(shape)
-                    .background(bgColor)
-                    .border(1.dp, RestingCardBorder, shape)
-                    .clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
-                    ) { expanded = true }
-                    .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = currentLabel,
-                color = DrawerTextPrimary,
-                fontSize = (14f * paneScale).sp,
-                fontWeight = FontWeight.Medium,
-                modifier = Modifier.weight(1f),
-            )
-            Icon(
-                imageVector = Icons.Outlined.ArrowDropDown,
-                contentDescription = null,
-                tint = DrawerTextSecondary,
-                modifier = Modifier.size((22f * paneScale).dp),
-            )
-        }
-
-        DropdownMenu(
-            expanded = expanded,
-            onDismissRequest = { expanded = false },
-            modifier =
-                Modifier
-                    .background(PaneSurfaceColor)
-                    .heightIn(max = 280.dp),
-        ) {
-            names.forEachIndexed { index, name ->
-                val isSelected = name == currentLabel
-                DropdownMenuItem(
-                    text = {
-                        Text(
-                            text = name,
-                            color = if (isSelected) DrawerAccent else DrawerTextPrimary,
-                            fontSize = 14.sp,
-                            fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium,
-                        )
-                    },
-                    trailingIcon =
-                        if (isSelected) {
-                            {
-                                Icon(
-                                    imageVector = Icons.Outlined.Check,
-                                    contentDescription = null,
-                                    tint = DrawerAccent,
-                                    modifier = Modifier.size(18.dp),
-                                )
-                            }
-                        } else {
-                            null
-                        },
-                    onClick = {
-                        onSelected(keycodes[index])
-                        expanded = false
-                    },
-                    colors =
-                        MenuDefaults.itemColors(
-                            textColor = DrawerTextPrimary,
-                        ),
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun DrawerMetricChip(
-    label: String,
-    value: String,
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val scale by animateFloatAsState(
-        targetValue = if (pressed) 0.985f else 1f,
-        animationSpec = tween(durationMillis = 140, easing = FastOutSlowInEasing),
-        label = "drawerMetricScale_$label",
-    )
-    val bgColor by animateColorAsState(
-        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
-        animationSpec = tween(140),
-        label = "drawerMetricBg",
-    )
-
-    Column(
-        modifier =
-            modifier
-                .graphicsLayer {
-                    scaleX = scale
-                    scaleY = scale
-                }
-                .fillMaxWidth()
-                .clip(RoundedCornerShape((12f * paneScale).dp))
-                .background(bgColor)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                )
-                .padding(horizontal = (10f * paneScale).dp, vertical = (7f * paneScale).dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Text(
-            text = label.uppercase(),
-            color = DrawerTextSecondary,
-            fontSize = (11f * paneScale).sp,
+            text = label,
+            color = DrawerTextPrimary,
+            fontSize = (14f * paneScale).sp,
             fontWeight = FontWeight.Medium,
-            letterSpacing = 0.6.sp,
+            modifier = Modifier.weight(1f),
         )
-        Spacer(Modifier.height(2.dp))
         Text(
-            text = value,
-            color = DrawerTextPrimary,
+            text = valueText,
+            color = DrawerAccent,
             fontSize = (13f * paneScale).sp,
             fontWeight = FontWeight.SemiBold,
         )
@@ -3381,7 +2561,7 @@ private fun DrawerMetricChip(
 }
 
 @Composable
-private fun DrawerSliderRow(
+internal fun DrawerSliderRow(
     label: String,
     valueText: String,
     value: Float,
@@ -3389,6 +2569,7 @@ private fun DrawerSliderRow(
     steps: Int,
     onValueChange: (Float) -> Unit,
     onValueClick: (() -> Unit)? = null,
+    onValueChangeFinished: (() -> Unit)? = null,
 ) {
     val paneScale = LocalPaneScale.current
     Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
@@ -3430,18 +2611,22 @@ private fun DrawerSliderRow(
             onValueChange = onValueChange,
             valueRange = valueRange,
             steps = steps,
+            onValueChangeFinished = onValueChangeFinished,
         )
     }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun CompactSlider(
+internal fun CompactSlider(
     value: Float,
     onValueChange: (Float) -> Unit,
     valueRange: ClosedFloatingPointRange<Float>,
     steps: Int,
+    onValueChangeFinished: (() -> Unit)? = null,
 ) {
+    var sliderValue by remember(value) { mutableStateOf(value) }
+
     val sliderColors =
         SliderDefaults.colors(
             thumbColor = DrawerAccent,
@@ -3455,8 +2640,12 @@ private fun CompactSlider(
         contentAlignment = Alignment.Center,
     ) {
         Slider(
-            value = value,
-            onValueChange = onValueChange,
+            value = sliderValue,
+            onValueChange = {
+                sliderValue = it
+                onValueChange(it)
+            },
+            onValueChangeFinished = onValueChangeFinished,
             valueRange = valueRange,
             steps = steps,
             modifier = Modifier.fillMaxWidth(0.96f).requiredHeight(20.dp),
@@ -3496,180 +2685,52 @@ private fun CompactSlider(
     }
 }
 
-private fun Float.snapToStep(
+internal fun Float.snapToStep(
     step: Float,
     min: Float,
     max: Float,
 ): Float = (min + (((this - min) / step).roundToInt() * step)).coerceIn(min, max)
 
 @Composable
-private fun HUDMetricInputDialog(
-    editor: HUDMetricEditor,
-    initialPercent: Int,
-    onDismiss: () -> Unit,
-    onConfirm: (Int) -> Unit,
-) {
-    var value by remember { mutableStateOf(initialPercent.toString()) }
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    fun submit() {
-        val parsed = value.toIntOrNull() ?: initialPercent
-        onConfirm(parsed.coerceIn(editor.minPercent, editor.maxPercent))
-    }
-
-    WinNativeDialogShell(
-        onDismiss = onDismiss,
-        title =
-            when (editor) {
-                HUDMetricEditor.ALPHA -> stringResource(R.string.session_drawer_hud_alpha_input_title)
-                HUDMetricEditor.SCALE -> stringResource(R.string.session_drawer_hud_scale_input_title)
-            },
-        maxWidth = 380.dp,
-    ) {
-        Text(
-            text = stringResource(R.string.session_drawer_hud_input_hint, editor.minPercent, editor.maxPercent),
-            color = DrawerTextSecondary,
-            fontSize = 13.sp,
-            lineHeight = 18.sp,
-        )
-        Spacer(Modifier.height(14.dp))
-        OutlinedTextField(
-            value = value,
-            onValueChange = { incoming -> value = incoming.filter(Char::isDigit) },
-            modifier = Modifier.fillMaxWidth(),
-            singleLine = true,
-            suffix = {
-                Text(
-                    text = "%",
-                    color = DrawerTextSecondary,
-                    fontSize = 13.sp,
-                )
-            },
-            textStyle = androidx.compose.material3.MaterialTheme.typography.bodyMedium.copy(color = DrawerTextPrimary),
-            colors =
-                OutlinedTextFieldDefaults.colors(
-                    focusedBorderColor = DrawerAccent,
-                    unfocusedBorderColor = DrawerOutline,
-                    focusedTextColor = DrawerTextPrimary,
-                    unfocusedTextColor = DrawerTextPrimary,
-                    focusedContainerColor = DrawerBackground,
-                    unfocusedContainerColor = DrawerBackground,
-                    focusedLabelColor = DrawerTextSecondary,
-                    unfocusedLabelColor = DrawerTextSecondary,
-                    cursorColor = DrawerAccent,
-                ),
-            keyboardOptions =
-                KeyboardOptions(
-                    keyboardType = KeyboardType.Number,
-                    imeAction = ImeAction.Done,
-                ),
-            keyboardActions =
-                KeyboardActions(
-                    onDone = {
-                        keyboardController?.hide()
-                        submit()
-                    },
-                ),
-        )
-        Spacer(Modifier.height(16.dp))
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(DrawerOutline),
-        )
-        Spacer(Modifier.height(16.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End),
-        ) {
-            WinNativeDialogButton(
-                label = stringResource(R.string.common_ui_cancel),
-                textColor = DrawerTextPrimary,
-                onClick = onDismiss,
-            )
-            WinNativeDialogButton(
-                label = stringResource(R.string.common_ui_apply),
-                textColor = DrawerAccent,
-                backgroundColor = DrawerAccent.copy(alpha = 0.12f),
-                borderColor = DrawerAccent.copy(alpha = 0.3f),
-                onClick = {
-                    keyboardController?.hide()
-                    submit()
-                },
-            )
-        }
-    }
-}
-
-@Composable
-private fun HUDToggleChip(
+internal fun DialogFocusButton(
     label: String,
-    checked: Boolean,
+    textColor: Color,
+    backgroundColor: Color,
+    borderColor: Color,
+    focusRequester: FocusRequester? = null,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    val paneScale = LocalPaneScale.current
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed = interactionSource.collectIsPressedAsState().value
-    val bgColor by animateColorAsState(
-        targetValue =
-            when {
-                pressed -> PaneInnerPressed
-                else -> PaneInnerResting
-            },
-        animationSpec = tween(140),
-        label = "hudChipBg",
-    )
-    val borderColor by animateColorAsState(
-        targetValue = if (checked) DrawerAccent else RestingCardBorder,
-        animationSpec = tween(140),
-        label = "hudChipBorder",
-    )
-    val cornerRadius = (12f * paneScale).dp
-    val shape = RoundedCornerShape(cornerRadius)
-    val indicatorSize = (10f * paneScale).dp
-
-    Row(
+    Box(
         modifier =
-            modifier
-                .clip(shape)
-                .background(bgColor)
-                .border(1.dp, borderColor, shape)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                ).padding(horizontal = (10f * paneScale).dp, vertical = (9f * paneScale).dp),
-        verticalAlignment = Alignment.CenterVertically,
+            Modifier
+                .then(if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier)
+                .widthIn(min = 84.dp)
+                .clip(RoundedCornerShape(10.dp))
+                .background(backgroundColor)
+                .border(1.dp, borderColor, RoundedCornerShape(10.dp))
+                .controllerFocusBorder(cornerRadius = 10.dp)
+                .clickable(onClick = onClick)
+                .padding(horizontal = 18.dp, vertical = 11.dp),
+        contentAlignment = Alignment.Center,
     ) {
-        Box(
-            modifier =
-                Modifier
-                    .size(indicatorSize)
-                    .clip(CircleShape)
-                    .background(if (checked) DrawerAccent else Color(0x14FFFFFF)),
-        )
-        Spacer(Modifier.width((8f * paneScale).dp))
         Text(
             text = label,
-            color = DrawerTextPrimary,
-            fontSize = (13f * paneScale).sp,
-            fontWeight = if (checked) FontWeight.SemiBold else FontWeight.Medium,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Bold,
         )
     }
 }
 
 @Composable
-private fun DrawerBooleanRow(
+internal fun DrawerBooleanRow(
     title: String,
     checked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
+    subtitle: String? = null,
 ) {
     val paneScale = LocalPaneScale.current
+    val compact = paneScale < PaneScaleMin
     val rowInteractionSource = remember { MutableInteractionSource() }
     val pressed = rowInteractionSource.collectIsPressedAsState().value
     val switchInteractionSource = remember { MutableInteractionSource() }
@@ -3713,17 +2774,19 @@ private fun DrawerBooleanRow(
             )
             Spacer(Modifier.height(2.dp))
             Text(
-                text =
-                    if (checked) {
-                        stringResource(R.string.common_ui_enabled)
-                    } else {
-                        stringResource(R.string.common_ui_disabled)
-                    },
+                text = subtitle ?: if (checked) {
+                    stringResource(R.string.common_ui_enabled)
+                } else {
+                    stringResource(R.string.common_ui_disabled)
+                },
                 color = DrawerTextSecondary,
                 fontSize = (12f * paneScale).sp,
             )
         }
-        CompositionLocalProvider(LocalRippleConfiguration provides null) {
+        CompositionLocalProvider(
+            LocalRippleConfiguration provides null,
+            LocalMinimumInteractiveComponentSize provides if (compact) Dp.Unspecified else 48.dp,
+        ) {
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
@@ -3734,34 +2797,14 @@ private fun DrawerBooleanRow(
     }
 }
 
-@Composable
-private fun FPSLimiterSelection(
-    currentLimit: Int,
-    onLimitSelected: (Int) -> Unit,
-) {
-    val paneScale = LocalPaneScale.current
-    val limits = listOf(0, 30, 45, 60, 90, 120)
-    val offLabel = stringResource(R.string.session_drawer_fps_limiter_off)
-
-    Column(verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
-        PaneSectionLabel(stringResource(R.string.session_drawer_fps_limiter))
-
-        ChipFlow {
-            limits.forEach { limit ->
-                val label = if (limit == 0) offLabel else "$limit"
-                HUDToggleChip(
-                    label = label,
-                    checked = currentLimit == limit,
-                    onClick = { onLimitSelected(limit) },
-                )
-            }
-        }
-    }
-}
+internal val RECORD_QUALITY_LABELS = listOf("Performance", "Balance", "Quality")
+
+internal const val FPS_LIMITER_MIN = 30
+internal const val FPS_LIMITER_DEFAULT = 60
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-private fun ChipFlow(content: @Composable () -> Unit) {
+internal fun ChipFlow(content: @Composable () -> Unit) {
     val paneScale = LocalPaneScale.current
     val gap = (8f * paneScale).dp
     FlowRow(
diff --git a/app/src/main/runtime/display/XServerDrawerOutputPane.kt b/app/src/main/runtime/display/XServerDrawerOutputPane.kt
new file mode 100644
index 000000000..4ec47fd4d
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerOutputPane.kt
@@ -0,0 +1,550 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Output/display pane composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun OutputPaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+) {
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                if (state.outputSwapActive) {
+                    OutputActiveControls(state = state, listener = listener, paneScale = paneScale)
+                } else if (state.outputDisplayAvailable) {
+                    OutputSendToDisplay(state = state, listener = listener, paneScale = paneScale)
+                } else {
+                    OutputCastEntry(listener = listener, paneScale = paneScale)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun OutputActiveControls(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+    paneScale: Float,
+) {
+    OutputDeviceHeader(state = state, paneScale = paneScale)
+
+    OutputCard(paneScale = paneScale, title = stringResource(R.string.session_drawer_output_display)) {
+        if (state.outputResolutionLabels.isNotEmpty()) {
+            Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
+                OutputFieldLabel(stringResource(R.string.session_drawer_output_resolution), paneScale)
+                InputControlsSimpleDropdown(
+                    options = state.outputResolutionLabels,
+                    selectedIndex = state.outputSelectedResolutionIndex,
+                    onSelected = listener::onOutputResolutionSelected,
+                )
+                Text(
+                    text = if (state.outputPanelScaling) {
+                        stringResource(R.string.session_drawer_output_scaling_note, state.outputPanelNative)
+                    } else {
+                        stringResource(R.string.session_drawer_output_render_note)
+                    },
+                    color = DrawerTextSecondary,
+                    fontSize = (11f * paneScale).sp,
+                    lineHeight = (15f * paneScale).sp,
+                )
+            }
+        }
+        if (!state.outputPanelScaling && state.outputRefreshLabels.isNotEmpty()) {
+            Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
+                OutputFieldLabel(stringResource(R.string.session_drawer_output_refresh_rate), paneScale)
+                InputControlsSimpleDropdown(
+                    options = state.outputRefreshLabels,
+                    selectedIndex = state.outputSelectedRefreshIndex,
+                    onSelected = listener::onOutputRefreshRateSelected,
+                )
+            }
+        }
+        Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
+            OutputFieldLabel(stringResource(R.string.session_drawer_output_aspect_ratio), paneScale)
+            val aspectLabels =
+                listOf(
+                    stringResource(R.string.session_drawer_output_aspect_fit),
+                    stringResource(R.string.session_drawer_output_aspect_stretch),
+                    stringResource(R.string.session_drawer_output_aspect_zoom),
+                )
+            ChipFlow {
+                aspectLabels.forEachIndexed { index, label ->
+                    HUDToggleChip(
+                        label = label,
+                        checked = state.outputAspectMode == index,
+                        onClick = { listener.onOutputAspectModeSelected(index) },
+                        modifier = Modifier.paneNavItem(
+                            cornerRadius = (12f * paneScale).dp,
+                            onActivate = { listener.onOutputAspectModeSelected(index) },
+                        ),
+                    )
+                }
+            }
+        }
+    }
+
+    if (state.outputGameModeSupported) {
+        OutputCard(paneScale = paneScale, title = stringResource(R.string.session_drawer_output_game_mode)) {
+            ChipFlow {
+                HUDToggleChip(
+                    label = stringResource(R.string.session_drawer_output_game_mode_on),
+                    checked = state.outputGameModeEnabled,
+                    onClick = { listener.onOutputGameModeToggled(true) },
+                    modifier = Modifier.paneNavItem(
+                        cornerRadius = (12f * paneScale).dp,
+                        onActivate = { listener.onOutputGameModeToggled(true) },
+                    ),
+                )
+                HUDToggleChip(
+                    label = stringResource(R.string.session_drawer_output_game_mode_off),
+                    checked = !state.outputGameModeEnabled,
+                    onClick = { listener.onOutputGameModeToggled(false) },
+                    modifier = Modifier.paneNavItem(
+                        cornerRadius = (12f * paneScale).dp,
+                        onActivate = { listener.onOutputGameModeToggled(false) },
+                    ),
+                )
+            }
+            Text(
+                text = stringResource(R.string.session_drawer_output_game_mode_note),
+                color = DrawerTextSecondary,
+                fontSize = (11f * paneScale).sp,
+                lineHeight = (15f * paneScale).sp,
+            )
+        }
+    }
+
+    if (state.outputVitureConnected) {
+        OutputGlassesCard(state = state, listener = listener, paneScale = paneScale)
+    }
+
+    OutputPaneButton(
+        label = stringResource(R.string.session_drawer_output_return_to_phone),
+        paneScale = paneScale,
+        onClick = listener::onOutputReturnToPhone,
+    )
+}
+
+@Composable
+internal fun OutputGlassesCard(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+    paneScale: Float,
+) {
+    OutputCard(
+        paneScale = paneScale,
+        title = state.outputVitureName.ifEmpty { stringResource(R.string.session_drawer_output_glasses) },
+    ) {
+        if (state.outputVitureSupportsBrightness) {
+            DrawerSliderRow(
+                label = stringResource(R.string.session_drawer_output_brightness),
+                valueText = "${state.outputVitureBrightness}/${state.outputVitureBrightnessMax}",
+                value = state.outputVitureBrightness.toFloat(),
+                valueRange = 0f..state.outputVitureBrightnessMax.toFloat(),
+                steps = (state.outputVitureBrightnessMax - 1).coerceAtLeast(0),
+                onValueChange = { listener.onOutputVitureBrightness(it.roundToInt()) },
+            )
+        }
+        if (state.outputVitureSupportsFilm) {
+            if (state.outputVitureFilmStepped) {
+                DrawerSliderRow(
+                    label = stringResource(R.string.session_drawer_output_shade),
+                    valueText = "${state.outputVitureFilm}/8",
+                    value = state.outputVitureFilm.toFloat(),
+                    valueRange = 0f..8f,
+                    steps = 7,
+                    onValueChange = { listener.onOutputVitureFilm(it.roundToInt()) },
+                )
+            } else {
+                Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
+                    OutputFieldLabel(stringResource(R.string.session_drawer_output_shade), paneScale)
+                    ChipFlow {
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_drawer_output_game_mode_on),
+                            checked = state.outputVitureFilm > 0,
+                            onClick = { listener.onOutputVitureFilm(1) },
+                            modifier = Modifier.paneNavItem(
+                                cornerRadius = (12f * paneScale).dp,
+                                onActivate = { listener.onOutputVitureFilm(1) },
+                            ),
+                        )
+                        HUDToggleChip(
+                            label = stringResource(R.string.session_drawer_output_game_mode_off),
+                            checked = state.outputVitureFilm == 0,
+                            onClick = { listener.onOutputVitureFilm(0) },
+                            modifier = Modifier.paneNavItem(
+                                cornerRadius = (12f * paneScale).dp,
+                                onActivate = { listener.onOutputVitureFilm(0) },
+                            ),
+                        )
+                    }
+                }
+            }
+        }
+        if (state.outputVitureSupportsVolume) {
+            DrawerSliderRow(
+                label = stringResource(R.string.session_drawer_output_volume),
+                valueText = "${state.outputVitureVolume}/${state.outputVitureVolumeMax}",
+                value = state.outputVitureVolume.toFloat(),
+                valueRange = 0f..state.outputVitureVolumeMax.toFloat(),
+                steps = (state.outputVitureVolumeMax - 1).coerceAtLeast(0),
+                onValueChange = { listener.onOutputVitureVolume(it.roundToInt()) },
+            )
+        }
+        if (state.outputVitureSupports3D) {
+            Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
+                OutputFieldLabel(stringResource(R.string.session_drawer_output_3d), paneScale)
+                ChipFlow {
+                    HUDToggleChip(
+                        label = stringResource(R.string.session_drawer_output_game_mode_on),
+                        checked = state.outputViture3D,
+                        onClick = { listener.onOutputViture3D(true) },
+                        modifier = Modifier.paneNavItem(
+                            cornerRadius = (12f * paneScale).dp,
+                            onActivate = { listener.onOutputViture3D(true) },
+                        ),
+                    )
+                    HUDToggleChip(
+                        label = stringResource(R.string.session_drawer_output_game_mode_off),
+                        checked = !state.outputViture3D,
+                        onClick = { listener.onOutputViture3D(false) },
+                        modifier = Modifier.paneNavItem(
+                            cornerRadius = (12f * paneScale).dp,
+                            onActivate = { listener.onOutputViture3D(false) },
+                        ),
+                    )
+                }
+            }
+        }
+        Text(
+            text = stringResource(R.string.session_drawer_output_glasses_note),
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+            lineHeight = (15f * paneScale).sp,
+        )
+    }
+}
+
+@Composable
+internal fun OutputCard(
+    paneScale: Float,
+    title: String,
+    content: @Composable () -> Unit,
+) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape((14f * paneScale).dp))
+                .background(PaneInnerResting)
+                .border(1.dp, RestingCardBorder, RoundedCornerShape((14f * paneScale).dp))
+                .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+        verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+    ) {
+        PaneSectionLabel(title)
+        content()
+    }
+}
+
+@Composable
+internal fun OutputFieldLabel(text: String, paneScale: Float) {
+    Text(
+        text = text,
+        color = DrawerTextSecondary,
+        fontSize = (12f * paneScale).sp,
+        fontWeight = FontWeight.Medium,
+    )
+}
+
+@Composable
+internal fun OutputDeviceHeader(state: XServerDrawerState, paneScale: Float) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+        modifier = Modifier.padding(horizontal = (2f * paneScale).dp),
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Monitor,
+            contentDescription = null,
+            tint = DrawerAccent,
+            modifier = Modifier.size((22f * paneScale).dp),
+        )
+        Text(
+            text = state.outputDisplayName.ifEmpty { stringResource(R.string.session_drawer_output_title) },
+            color = DrawerTextPrimary,
+            fontSize = (15f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+internal fun OutputSendToDisplay(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+    paneScale: Float,
+) {
+    OutputDeviceHeader(state = state, paneScale = paneScale)
+    OutputPaneButton(
+        label = stringResource(R.string.session_drawer_output_send_to_display),
+        paneScale = paneScale,
+        onClick = listener::onOutputSwapToDisplay,
+    )
+    Text(
+        text = stringResource(R.string.session_drawer_output_send_note),
+        color = DrawerTextSecondary,
+        fontSize = (11f * paneScale).sp,
+        lineHeight = (15f * paneScale).sp,
+    )
+}
+
+@Composable
+internal fun OutputCastEntry(
+    listener: XServerDrawerActionListener,
+    paneScale: Float,
+) {
+    Column(verticalArrangement = Arrangement.spacedBy((6f * paneScale).dp)) {
+        PaneSectionLabel(stringResource(R.string.session_drawer_output_cast_title))
+        Text(
+            text = stringResource(R.string.session_drawer_output_cast_body),
+            color = DrawerTextSecondary,
+            fontSize = (12f * paneScale).sp,
+            lineHeight = (16f * paneScale).sp,
+        )
+    }
+    OutputPaneButton(
+        label = stringResource(R.string.session_drawer_output_cast_button),
+        paneScale = paneScale,
+        onClick = listener::onOutputCastClick,
+    )
+    Text(
+        text = stringResource(R.string.session_drawer_output_cast_note),
+        color = DrawerTextSecondary,
+        fontSize = (11f * paneScale).sp,
+        lineHeight = (15f * paneScale).sp,
+    )
+}
+
+@Composable
+internal fun OutputPaneButton(
+    label: String,
+    paneScale: Float,
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape((14f * paneScale).dp))
+                .background(PaneInnerResting)
+                .border(1.dp, RestingCardBorder, RoundedCornerShape((14f * paneScale).dp))
+                .paneNavItem(cornerRadius = (14f * paneScale).dp, onActivate = onClick)
+                .clickable { onClick() }
+                .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+    ) {
+        Text(
+            text = label,
+            color = DrawerTextPrimary,
+            fontSize = (14f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerRecordDialogs.kt b/app/src/main/runtime/display/XServerDrawerRecordDialogs.kt
new file mode 100644
index 000000000..c3aa5f1a7
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerRecordDialogs.kt
@@ -0,0 +1,454 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Record-settings + FPS-limiter dialog composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+/** Centered popup for choosing recording fps / resolution / quality (+ Record UI), then Record Now. */
+@Composable
+internal fun RecordSettingsDialog(
+    config: RecordUiConfig,
+    onDismiss: () -> Unit,
+    onRecordNow: (fpsIndex: Int, resolutionIndex: Int, quality: Int, recordUI: Boolean) -> Unit,
+) {
+    val fpsOptions = config.fpsOptions.ifEmpty { listOf(60) }
+    val resOptions = config.resolutionLabels.ifEmpty { listOf("Native") }
+
+    var fpsIndex by remember { mutableStateOf(config.fpsIndex.coerceIn(0, fpsOptions.lastIndex)) }
+    var resIndex by remember { mutableStateOf(config.resolutionIndex.coerceIn(0, resOptions.lastIndex)) }
+    var quality by remember { mutableStateOf(config.quality.coerceIn(0, RECORD_QUALITY_LABELS.lastIndex)) }
+    var recordUI by remember { mutableStateOf(config.recordUI) }
+
+    val recordNav = remember { SharedPaneNavRegistry() }
+    val doRecord = { onRecordNow(fpsIndex, resIndex, quality, recordUI) }
+
+    val shape = RoundedCornerShape(16.dp)
+    // Cap card height (landscape is short); settings scroll, the Record Now button stays pinned.
+    val maxCardHeight = (LocalConfiguration.current.screenHeightDp * 0.92f).dp
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
+    ) {
+        CompositionLocalProvider(SharedLocalPaneNav provides recordNav) {
+        DialogPaneNav(recordNav, onDismiss = onDismiss, onStart = doRecord)
+        Box(
+            modifier = Modifier.fillMaxSize().safeDrawingPadding().padding(horizontal = 14.dp, vertical = 8.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .widthIn(max = 360.dp)
+                        .fillMaxWidth()
+                        .heightIn(max = maxCardHeight)
+                        .clip(shape)
+                        .background(PaneSurfaceColor)
+                        .border(1.dp, RestingCardBorder, shape)
+                        .padding(horizontal = 16.dp, vertical = 14.dp),
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.FiberManualRecord,
+                        contentDescription = null,
+                        tint = RecordRed,
+                        modifier = Modifier.size(18.dp),
+                    )
+                    Text(
+                        text = stringResource(R.string.session_record_settings_title),
+                        color = DrawerTextPrimary,
+                        fontSize = 15.sp,
+                        fontWeight = FontWeight.SemiBold,
+                    )
+                }
+
+                Column(
+                    modifier = Modifier.weight(1f, fill = false).verticalScroll(rememberScrollState()),
+                    verticalArrangement = Arrangement.spacedBy(12.dp),
+                ) {
+                    Box(
+                        modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                            onAdjust = { dir -> if (fpsOptions.size > 1) fpsIndex = (fpsIndex + dir).coerceIn(0, fpsOptions.lastIndex) },
+                        ),
+                    ) {
+                        DrawerSliderRow(
+                            label = stringResource(R.string.session_record_fps),
+                            valueText = "${fpsOptions[fpsIndex]} fps",
+                            value = fpsIndex.toFloat(),
+                            valueRange = 0f..(fpsOptions.lastIndex.coerceAtLeast(1)).toFloat(),
+                            steps = (fpsOptions.size - 2).coerceAtLeast(0),
+                            onValueChange = { if (fpsOptions.size > 1) fpsIndex = it.roundToInt().coerceIn(0, fpsOptions.lastIndex) },
+                        )
+                    }
+
+                    Box(
+                        modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                            onAdjust = { dir -> if (resOptions.size > 1) resIndex = (resIndex + dir).coerceIn(0, resOptions.lastIndex) },
+                        ),
+                    ) {
+                        DrawerSliderRow(
+                            label = stringResource(R.string.session_record_resolution),
+                            valueText = resOptions[resIndex],
+                            value = resIndex.toFloat(),
+                            valueRange = 0f..(resOptions.lastIndex.coerceAtLeast(1)).toFloat(),
+                            steps = (resOptions.size - 2).coerceAtLeast(0),
+                            onValueChange = { if (resOptions.size > 1) resIndex = it.roundToInt().coerceIn(0, resOptions.lastIndex) },
+                        )
+                    }
+
+                    Box(
+                        modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                            onAdjust = { dir -> quality = (quality + dir).coerceIn(0, RECORD_QUALITY_LABELS.lastIndex) },
+                        ),
+                    ) {
+                        DrawerSliderRow(
+                            label = stringResource(R.string.session_record_quality),
+                            valueText = RECORD_QUALITY_LABELS[quality],
+                            value = quality.toFloat(),
+                            valueRange = 0f..(RECORD_QUALITY_LABELS.lastIndex).toFloat(),
+                            steps = (RECORD_QUALITY_LABELS.size - 2).coerceAtLeast(0),
+                            onValueChange = { quality = it.roundToInt().coerceIn(0, RECORD_QUALITY_LABELS.lastIndex) },
+                        )
+                    }
+
+                    Box(
+                        modifier = Modifier.fillMaxWidth().sharedPaneNavItem(
+                            onActivate = { recordUI = !recordUI },
+                        ),
+                    ) {
+                        DrawerBooleanRow(
+                            title = stringResource(R.string.session_record_include_ui),
+                            checked = recordUI,
+                            onCheckedChange = { recordUI = it },
+                            subtitle = stringResource(R.string.session_record_include_ui_subtitle),
+                        )
+                    }
+                }
+
+                Button(
+                    onClick = doRecord,
+                    modifier = Modifier.fillMaxWidth().height(48.dp).sharedPaneNavItem(
+                        cornerRadius = 12.dp,
+                        onActivate = doRecord,
+                        isEntry = true,
+                    ),
+                    shape = RoundedCornerShape(12.dp),
+                    colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = RecordRed,
+                            contentColor = Color.White,
+                        ),
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.FiberManualRecord,
+                        contentDescription = null,
+                        tint = Color.White,
+                        modifier = Modifier.size(18.dp),
+                    )
+                    Spacer(Modifier.width(8.dp))
+                    Text(
+                        text = stringResource(R.string.session_record_now),
+                        color = Color.White,
+                        fontSize = 15.sp,
+                        fontWeight = FontWeight.Bold,
+                    )
+                }
+            }
+        }
+        }
+    }
+}
+
+@Composable
+internal fun FPSLimiterCard(
+    currentLimit: Int,
+    maxRefreshRate: Int,
+    onLimitChanged: (Int) -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    val enabled = currentLimit > 0
+    val maxFps = maxRefreshRate.coerceAtLeast(FPS_LIMITER_MIN)
+    val steps = (maxFps - FPS_LIMITER_MIN - 1).coerceAtLeast(0)
+
+    // Slider position tracked locally (readout follows the drag, value survives an off/on toggle); the commit is deferred to release and re-seeds when maxFps changes (e.g. a mid-game refresh-rate change that clamps the limit).
+    var sliderValue by remember(maxFps) {
+        mutableStateOf(
+            (if (currentLimit > 0) currentLimit else FPS_LIMITER_DEFAULT)
+                .coerceIn(FPS_LIMITER_MIN, maxFps)
+                .toFloat(),
+        )
+    }
+
+    LaunchedEffect(currentLimit) {
+        if (currentLimit > 0) {
+            val target = currentLimit.coerceIn(FPS_LIMITER_MIN, maxFps).toFloat()
+            if (target != sliderValue) sliderValue = target
+        }
+    }
+
+    val borderColor by animateColorAsState(
+        targetValue = if (enabled) ActiveCardBorder else RestingCardBorder,
+        animationSpec = tween(140),
+        label = "fpsLimiterCardBorder",
+    )
+    val shape = RoundedCornerShape((14f * paneScale).dp)
+
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(PaneInnerResting)
+                .border(1.dp, borderColor, shape)
+                .padding(horizontal = (12f * paneScale).dp, vertical = (8f * paneScale).dp),
+    ) {
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                    ) { onLimitChanged(if (enabled) 0 else sliderValue.roundToInt()) },
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = stringResource(R.string.session_drawer_fps_limiter),
+                color = DrawerTextPrimary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = FontWeight.Medium,
+            )
+            Text(
+                text =
+                    if (enabled) {
+                        "${sliderValue.roundToInt()} FPS"
+                    } else {
+                        stringResource(R.string.session_drawer_fps_limiter_off)
+                    },
+                color = if (enabled) DrawerAccent else DrawerTextSecondary,
+                fontSize = (14f * paneScale).sp,
+                fontWeight = if (enabled) FontWeight.SemiBold else FontWeight.Normal,
+                textAlign = TextAlign.Center,
+                modifier = Modifier.weight(1f).padding(horizontal = (8f * paneScale).dp),
+            )
+            CompositionLocalProvider(LocalRippleConfiguration provides null) {
+                Switch(
+                    checked = enabled,
+                    onCheckedChange = { on -> onLimitChanged(if (on) sliderValue.roundToInt() else 0) },
+                    colors = outlinedSwitchColors(DrawerAccent, DrawerTextSecondary),
+                )
+            }
+        }
+
+        AnimatedVisibility(
+            visible = enabled,
+            enter =
+                expandVertically(
+                    animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing),
+                    expandFrom = Alignment.Top,
+                ) + fadeIn(animationSpec = tween(durationMillis = 160, easing = FastOutSlowInEasing)),
+            exit =
+                shrinkVertically(
+                    animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
+                    shrinkTowards = Alignment.Top,
+                ) + fadeOut(animationSpec = tween(durationMillis = 120, easing = FastOutSlowInEasing)),
+        ) {
+            Column {
+                Spacer(Modifier.height((6f * paneScale).dp))
+                CompactSlider(
+                    value = sliderValue,
+                    onValueChange = { sliderValue = it },
+                    valueRange = FPS_LIMITER_MIN.toFloat()..maxFps.toFloat(),
+                    steps = steps,
+                    onValueChangeFinished = { onLimitChanged(sliderValue.roundToInt()) },
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/XServerDrawerReshadePane.kt b/app/src/main/runtime/display/XServerDrawerReshadePane.kt
new file mode 100644
index 000000000..f6124e903
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerReshadePane.kt
@@ -0,0 +1,370 @@
+package com.winlator.cmod.runtime.display
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.KeyboardArrowDown
+import androidx.compose.material.icons.outlined.KeyboardArrowUp
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.runtime.reshade.ReshadeLoadout
+import com.winlator.cmod.runtime.reshade.ReshadeManager
+import kotlin.math.roundToInt
+
+// switches/stacks effects already compiled into the vkBasalt chain at launch; adding effects is pre-launch only.
+
+@Composable
+internal fun ReshadePaneContent(
+    state: XServerDrawerState,
+    listener: XServerDrawerActionListener,
+) {
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (12f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                NavBooleanRow(
+                    title = stringResource(R.string.reshade_drawer_enable),
+                    checked = state.reshadeMasterEnabled,
+                    onCheckedChange = listener::onReshadeMasterEnabledChanged,
+                )
+
+                if (state.reshadeLoadout.isEmpty()) {
+                    Text(
+                        text = stringResource(R.string.reshade_drawer_empty),
+                        color = DrawerTextSecondary,
+                        fontSize = (13f * paneScale).sp,
+                    )
+                    return@Column
+                }
+
+                if (state.reshadeMasterEnabled) {
+                    ReshadeModeRow(mode = state.reshadeMode, onChange = listener::onReshadeModeChanged)
+
+                    state.reshadeLoadout.forEachIndexed { index, item ->
+                        ReshadeEffectRow(index = index, item = item, mode = state.reshadeMode, listener = listener)
+                    }
+                }
+            }
+        }
+    }
+}
+
+// solo = one effect active at a time; stack = layer any subset.
+@Composable
+private fun ReshadeModeRow(mode: String, onChange: (String) -> Unit) {
+    val paneScale = LocalPaneScale.current
+    Column(verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp)) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp)) {
+            listOf(
+                ReshadeLoadout.MODE_SOLO to stringResource(R.string.reshade_mode_solo),
+                ReshadeLoadout.MODE_STACK to stringResource(R.string.reshade_mode_stack),
+            ).forEach { (value, label) ->
+                val selected = mode == value
+                Box(
+                    modifier =
+                        Modifier
+                            .weight(1f)
+                            .clip(RoundedCornerShape((10f * paneScale).dp))
+                            .background(if (selected) DrawerAccent.copy(alpha = 0.18f) else Color.Transparent)
+                            .border(
+                                1.dp,
+                                if (selected) DrawerAccent else RestingCardBorder,
+                                RoundedCornerShape((10f * paneScale).dp),
+                            )
+                            .paneNavItem(
+                                cornerRadius = (10f * paneScale).dp,
+                                onActivate = { onChange(value) },
+                            )
+                            .clickable { onChange(value) }
+                            .padding(vertical = (8f * paneScale).dp),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Text(
+                        text = label,
+                        color = if (selected) DrawerAccent else DrawerTextPrimary,
+                        fontSize = (13f * paneScale).sp,
+                        fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Normal,
+                    )
+                }
+            }
+        }
+        Text(
+            text =
+                if (mode == ReshadeLoadout.MODE_SOLO) stringResource(R.string.reshade_mode_solo_hint)
+                else stringResource(R.string.reshade_mode_stack_hint),
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+        )
+    }
+}
+
+// in solo mode the host makes this enable gate exclusive.
+@Composable
+private fun ReshadeEffectRow(
+    index: Int,
+    item: ReshadeLoadoutItem,
+    mode: String,
+    listener: XServerDrawerActionListener,
+) {
+    val paneScale = LocalPaneScale.current
+    var expanded by remember(item.name) { mutableStateOf(false) }
+
+    val soloActive = mode == ReshadeLoadout.MODE_SOLO && item.enabled
+    val title = if (soloActive) item.name + "  •  " + stringResource(R.string.reshade_effect_active) else item.name
+
+    NavBooleanRow(
+        title = title,
+        checked = item.enabled,
+        onCheckedChange = { listener.onReshadeEffectEnabledChanged(index, it) },
+    )
+
+    if (item.params.isNotEmpty()) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape((10f * paneScale).dp))
+                    .paneNavItem(
+                        cornerRadius = (10f * paneScale).dp,
+                        onActivate = { expanded = !expanded },
+                    )
+                    .clickable { expanded = !expanded }
+                    .padding(start = (10f * paneScale).dp, top = (2f * paneScale).dp, bottom = (2f * paneScale).dp),
+        ) {
+            Text(
+                text = stringResource(R.string.reshade_params_title),
+                color = DrawerTextSecondary,
+                fontSize = (12f * paneScale).sp,
+                modifier = Modifier.weight(1f),
+            )
+            Icon(
+                imageVector = if (expanded) Icons.Outlined.KeyboardArrowUp else Icons.Outlined.KeyboardArrowDown,
+                contentDescription = null,
+                tint = DrawerTextSecondary,
+            )
+        }
+        if (expanded) {
+            Column(
+                modifier = Modifier.padding(start = (8f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+            ) {
+                for (p in item.params) ReshadeParamRow(index = index, item = item, param = p, listener = listener)
+                Box(
+                    Modifier.fillMaxWidth().paneNavItem(
+                        cornerRadius = (12f * paneScale).dp,
+                        onActivate = { listener.onReshadeReset(index) },
+                    ),
+                ) {
+                    DrawerResetRow(
+                        label = stringResource(R.string.reshade_params_reset),
+                        onClick = { listener.onReshadeReset(index) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+// param keys must follow the shared seedValues scheme or the live conf rewrite and the pre-launch save diverge.
+@Composable
+private fun ReshadeParamRow(
+    index: Int,
+    item: ReshadeLoadoutItem,
+    param: ReshadeManager.ReshadeParam,
+    listener: XServerDrawerActionListener,
+) {
+    when (param.type) {
+        ReshadeManager.ParamType.BOOL -> {
+            val v = item.values[param.name] ?: param.defaultValue
+            NavBooleanRow(
+                title = param.label,
+                checked = v != 0f,
+                onCheckedChange = { listener.onReshadeParamChanged(index, param.name, if (it) 1f else 0f) },
+            )
+        }
+        ReshadeManager.ParamType.COMBO -> {
+            val options = param.options ?: emptyList()
+            val v = (item.values[param.name] ?: param.defaultValue).roundToInt()
+            Column(verticalArrangement = Arrangement.spacedBy((6f * LocalPaneScale.current).dp)) {
+                PaneSectionLabel(param.label)
+                InputControlsSimpleDropdown(
+                    options = options,
+                    selectedIndex = v.coerceIn(0, (options.size - 1).coerceAtLeast(0)),
+                    onSelected = { listener.onReshadeParamChanged(index, param.name, it.toFloat()) },
+                )
+            }
+        }
+        ReshadeManager.ParamType.COLOR -> ReshadeColorRow(index, item, param, listener)
+        ReshadeManager.ParamType.INT ->
+            ReshadeSliderRow(
+                label = param.label,
+                value = item.values[param.name] ?: param.defaultValue,
+                min = param.min,
+                max = param.max,
+                step = if (param.step > 0f) param.step else 1f,
+                whole = true,
+                onValueChange = { listener.onReshadeParamChanged(index, param.name, it) },
+            )
+        else -> // FLOAT
+            ReshadeSliderRow(
+                label = param.label,
+                value = item.values[param.name] ?: param.defaultValue,
+                min = param.min,
+                max = param.max,
+                step = param.step,
+                whole = false,
+                onValueChange = { listener.onReshadeParamChanged(index, param.name, it) },
+            )
+    }
+}
+
+@Composable
+private fun ReshadeColorRow(
+    index: Int,
+    item: ReshadeLoadoutItem,
+    param: ReshadeManager.ReshadeParam,
+    listener: XServerDrawerActionListener,
+) {
+    val paneScale = LocalPaneScale.current
+    var expanded by remember(param.name) { mutableStateOf(false) }
+
+    fun comp(c: Int): Float =
+        item.values[param.name + "_" + c] ?: (param.componentDefaults?.getOrNull(c) ?: 0f)
+    val r = comp(0)
+    val g = if (param.components > 1) comp(1) else r
+    val b = if (param.components > 2) comp(2) else r
+    val swatch = Color(r.coerceIn(0f, 1f), g.coerceIn(0f, 1f), b.coerceIn(0f, 1f))
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape((10f * paneScale).dp))
+                .paneNavItem(
+                    cornerRadius = (10f * paneScale).dp,
+                    onActivate = { expanded = !expanded },
+                )
+                .clickable { expanded = !expanded }
+                .padding(vertical = (4f * paneScale).dp),
+    ) {
+        Box(
+            Modifier
+                .size((22f * paneScale).dp)
+                .clip(RoundedCornerShape((5f * paneScale).dp))
+                .background(swatch)
+                .border(1.dp, RestingCardBorder, RoundedCornerShape((5f * paneScale).dp)),
+        )
+        Spacer(Modifier.width((10f * paneScale).dp))
+        Text(
+            text = param.label,
+            color = DrawerTextPrimary,
+            fontSize = (14f * paneScale).sp,
+            modifier = Modifier.weight(1f),
+        )
+        Icon(
+            imageVector = if (expanded) Icons.Outlined.KeyboardArrowUp else Icons.Outlined.KeyboardArrowDown,
+            contentDescription = null,
+            tint = DrawerTextSecondary,
+        )
+    }
+    if (expanded) {
+        for (c in 0 until param.components) {
+            val key = param.name + "_" + c
+            ReshadeSliderRow(
+                label = reshadeColorComponentLabel(c, param.components),
+                value = item.values[key] ?: (param.componentDefaults?.getOrNull(c) ?: 0f),
+                min = 0f,
+                max = 1f,
+                step = 0.01f,
+                whole = false,
+                onValueChange = { listener.onReshadeParamChanged(index, key, it) },
+            )
+        }
+    }
+}
+
+private fun reshadeColorComponentLabel(c: Int, components: Int): String = when {
+    components >= 4 && c == 3 -> "A"
+    c == 0 -> "R"
+    c == 1 -> "G"
+    c == 2 -> "B"
+    else -> (c + 1).toString()
+}
+
+// snaps to [step] (or integers when [whole]) to keep the value written into vkBasalt.conf clean.
+@Composable
+private fun ReshadeSliderRow(
+    label: String,
+    value: Float,
+    min: Float,
+    max: Float,
+    step: Float,
+    whole: Boolean,
+    onValueChange: (Float) -> Unit,
+) {
+    val lo = min
+    val hi = if (max > min) max else min + 1f
+    val inc = if (whole) 1f else (if (step > 0f) step else (hi - lo) / 100f)
+    val valueText =
+        if (whole) value.roundToInt().toString()
+        else String.format(java.util.Locale.US, "%.2f", value)
+
+    fun snap(raw: Float): Float {
+        val v =
+            when {
+                whole -> raw.roundToInt().toFloat()
+                step > 0f -> lo + Math.round((raw - lo) / step) * step
+                else -> raw
+            }
+        return v.coerceIn(lo, hi)
+    }
+
+    NavSliderRow(
+        label = label,
+        valueText = valueText,
+        value = value.coerceIn(lo, hi),
+        valueRange = lo..hi,
+        steps = 0,
+        onValueChange = { onValueChange(snap(it)) },
+        adjustStep = inc,
+    )
+}
diff --git a/app/src/main/runtime/display/XServerDrawerTaskManagerPane.kt b/app/src/main/runtime/display/XServerDrawerTaskManagerPane.kt
new file mode 100644
index 000000000..00aea57a1
--- /dev/null
+++ b/app/src/main/runtime/display/XServerDrawerTaskManagerPane.kt
@@ -0,0 +1,1363 @@
+package com.winlator.cmod.runtime.display
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.focusable
+import com.winlator.cmod.shared.ui.focus.controllerMenuInput
+import com.winlator.cmod.shared.ui.focus.controllerFocusBorder
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.outlined.ViewList
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material.icons.outlined.FiberManualRecord
+import androidx.compose.material.icons.outlined.Fullscreen
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.Monitor
+import androidx.compose.material.icons.outlined.Mouse
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.PictureInPictureAlt
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material.icons.outlined.ScreenRotation
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.SportsEsports
+import androidx.compose.material.icons.outlined.Terminal
+import androidx.compose.material.icons.outlined.TouchApp
+import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.ZoomIn
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.integerArrayResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeBackground
+import com.winlator.cmod.shared.theme.WinNativeOutline
+import com.winlator.cmod.shared.theme.WinNativePanel
+import com.winlator.cmod.shared.theme.WinNativeSurface
+import com.winlator.cmod.shared.theme.WinNativeTextPrimary
+import com.winlator.cmod.shared.theme.WinNativeTextSecondary
+import com.winlator.cmod.shared.theme.WinNativeTheme
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogButton
+import com.winlator.cmod.shared.ui.dialog.WinNativeDialogShell
+import com.winlator.cmod.shared.ui.nav.DialogPaneNav
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav as SharedLocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry as SharedPaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.paneNavItem as sharedPaneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+import com.winlator.cmod.shared.ui.widget.chasingBorder
+import kotlin.math.roundToInt
+
+// Task-manager pane composables, split out of XServerDrawerMenu.kt (behavior-identical).
+
+@Composable
+internal fun TaskManagerPaneContent(
+    taskManagerState: TaskManagerPaneState,
+    listener: XServerDrawerActionListener,
+    onClose: () -> Unit,
+) {
+    var showNewTaskDialog by remember { mutableStateOf(false) }
+    var processPendingEnd by remember { mutableStateOf<TaskManagerProcess?>(null) }
+    var expandedAffinityPid by remember { mutableStateOf<Int?>(null) }
+    val pendingAffinities = remember { mutableStateMapOf<Int, PendingTaskAffinity>() }
+
+    DisposableEffect(Unit) {
+        listener.onTaskManagerVisibilityChanged(true)
+        onDispose { listener.onTaskManagerVisibilityChanged(false) }
+    }
+
+    LaunchedEffect(taskManagerState.processes) {
+        val visibleProcessPids = taskManagerState.processes.map { it.pid }.toSet()
+        val now = System.currentTimeMillis()
+        pendingAffinities.keys.toList().forEach { pid ->
+            if (pid !in visibleProcessPids) pendingAffinities.remove(pid)
+        }
+        taskManagerState.processes.forEach { process ->
+            val pending = pendingAffinities[process.pid]
+            if (
+                pending != null &&
+                    (pending.affinityMask == process.affinityMask ||
+                        now - pending.requestedAtMillis > PendingTaskAffinityTimeoutMs)
+            ) {
+                pendingAffinities.remove(process.pid)
+            }
+        }
+        if (expandedAffinityPid != null && expandedAffinityPid !in visibleProcessPids) {
+            expandedAffinityPid = null
+        }
+    }
+
+    BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+        val paneScale = computePaneScale(maxHeight)
+        val affinityCoreCount =
+            if (taskManagerState.cpuCoreCount > 0) {
+                taskManagerState.cpuCoreCount
+            } else {
+                Runtime.getRuntime().availableProcessors()
+            }
+        CompositionLocalProvider(LocalPaneScale provides paneScale) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+                verticalArrangement = Arrangement.spacedBy((10f * paneScale).dp),
+            ) {
+                TaskManagerHeader(
+                    cpuPercent = taskManagerState.cpuPercent,
+                    cpuCoreCount = taskManagerState.cpuCoreCount,
+                    cpuCorePercents = taskManagerState.cpuCorePercents,
+                    memoryPercent = taskManagerState.memoryPercent,
+                    memoryDetail = taskManagerState.memoryDetail,
+                    onNewTask = { showNewTaskDialog = true },
+                    onClose = onClose,
+                    onCpuExpandedChanged = listener::onTaskManagerCpuExpandedChanged,
+                )
+
+                TaskManagerProcessHeader()
+
+                Box(modifier = Modifier.weight(1f, fill = true).fillMaxWidth()) {
+                    if (taskManagerState.processes.isEmpty()) {
+                        Text(
+                            text = stringResource(R.string.common_ui_no_items_to_display),
+                            color = DrawerTextSecondary,
+                            fontSize = (13f * paneScale).sp,
+                            modifier = Modifier.fillMaxWidth().padding(top = (24f * paneScale).dp),
+                            textAlign = TextAlign.Center,
+                        )
+                    } else {
+                        Column(
+                            modifier =
+                                Modifier
+                                    .fillMaxSize()
+                                    .verticalScroll(rememberScrollState()),
+                            verticalArrangement = Arrangement.spacedBy((12f * paneScale).dp),
+                        ) {
+                            taskManagerState.processes.forEach { process ->
+                                key(process.pid) {
+                                    val selectedAffinityMask =
+                                        pendingAffinities[process.pid]?.affinityMask ?: process.affinityMask
+                                    TaskManagerProcessCard(
+                                        process = process,
+                                        expanded = expandedAffinityPid == process.pid,
+                                        affinityMask = selectedAffinityMask,
+                                        coreCount = affinityCoreCount,
+                                        onToggleAffinity = {
+                                            expandedAffinityPid =
+                                                if (expandedAffinityPid == process.pid) null else process.pid
+                                        },
+                                        onAffinityMaskChanged = { affinityMask ->
+                                            pendingAffinities[process.pid] =
+                                                PendingTaskAffinity(affinityMask, System.currentTimeMillis())
+                                            listener.onTaskManagerSetAffinity(process.pid, affinityMask)
+                                        },
+                                        onEndProcess = { processPendingEnd = process },
+                                        onBringToFront = { listener.onTaskManagerBringToFront(process.name) },
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (showNewTaskDialog) {
+        TaskManagerNewTaskDialog(
+            onDismiss = { showNewTaskDialog = false },
+            onConfirm = { command ->
+                showNewTaskDialog = false
+                listener.onTaskManagerNewTask(command)
+            },
+        )
+    }
+
+    processPendingEnd?.let { process ->
+        TaskManagerEndProcessDialog(
+            process = process,
+            onDismiss = { processPendingEnd = null },
+            onConfirm = {
+                processPendingEnd = null
+                listener.onTaskManagerEndProcess(process.name)
+            },
+        )
+    }
+}
+
+@Composable
+internal fun TaskManagerHeader(
+    cpuPercent: Int,
+    cpuCoreCount: Int,
+    cpuCorePercents: List<Int>,
+    memoryPercent: Int,
+    memoryDetail: String,
+    onNewTask: () -> Unit,
+    onClose: () -> Unit,
+    onCpuExpandedChanged: (Boolean) -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    var cpuExpanded by remember { mutableStateOf(false) }
+    DisposableEffect(cpuExpanded) {
+        onCpuExpandedChanged(cpuExpanded)
+        onDispose { if (cpuExpanded) onCpuExpandedChanged(false) }
+    }
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = stringResource(R.string.session_task_title),
+            color = DrawerTextPrimary,
+            fontSize = (16f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+            modifier = Modifier.weight(1f),
+        )
+
+        TaskManagerCloseButton(onClick = onClose)
+    }
+
+    Row(
+        modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Max),
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        TaskManagerStatTile(
+            title = stringResource(R.string.session_task_cpu_usage_format, cpuPercent),
+            detail =
+                if (cpuCoreCount > 0) {
+                    pluralStringResource(R.plurals.session_task_core_count, cpuCoreCount, cpuCoreCount)
+                } else {
+                    ""
+                },
+            modifier = Modifier.weight(1f).fillMaxHeight(),
+            selected = cpuExpanded,
+            onClick = { cpuExpanded = !cpuExpanded },
+        )
+        TaskManagerStatTile(
+            title = stringResource(R.string.session_task_memory) + " ($memoryPercent%)",
+            detail = memoryDetail,
+            modifier = Modifier.weight(1f).fillMaxHeight(),
+        )
+    }
+
+    AnimatedVisibility(
+        visible = cpuExpanded && cpuCorePercents.isNotEmpty(),
+        enter =
+            fadeIn(animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing)) +
+                expandVertically(
+                    animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing),
+                    expandFrom = Alignment.Top,
+                ),
+        exit =
+            fadeOut(animationSpec = tween(durationMillis = 140, easing = FastOutSlowInEasing)) +
+                shrinkVertically(
+                    animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
+                    shrinkTowards = Alignment.Top,
+                ),
+    ) {
+        TaskManagerCpuCoreGrid(cpuCorePercents = cpuCorePercents)
+    }
+
+    TaskManagerNewTaskButton(onClick = onNewTask)
+}
+
+@Composable
+internal fun TaskManagerCloseButton(onClick: () -> Unit) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
+        animationSpec = tween(120),
+        label = "taskManagerCloseBg",
+    )
+    val size = (38f * paneScale).dp
+    val shape = RoundedCornerShape((10f * paneScale).dp)
+    Box(
+        modifier =
+            Modifier
+                .size(size)
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, RestingCardBorder, shape)
+                .paneNavItem(cornerRadius = (10f * paneScale).dp, onActivate = onClick)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Close,
+            contentDescription = stringResource(R.string.common_ui_close),
+            tint = DrawerTextPrimary,
+            modifier = Modifier.size((22f * paneScale).dp),
+        )
+    }
+}
+
+@Composable
+internal fun TaskManagerStatTile(
+    title: String,
+    detail: String,
+    modifier: Modifier = Modifier,
+    selected: Boolean = false,
+    onClick: (() -> Unit)? = null,
+) {
+    val paneScale = LocalPaneScale.current
+    val shape = RoundedCornerShape((10f * paneScale).dp)
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue =
+            when {
+                pressed -> PaneInnerPressed
+                else -> PaneInnerResting
+            },
+        animationSpec = tween(120),
+        label = "taskManagerStatTileBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (selected) DrawerAccent else RestingCardBorder,
+        animationSpec = tween(120),
+        label = "taskManagerStatTileBorder",
+    )
+    val clickModifier =
+        if (onClick != null) {
+            Modifier.clickable(
+                interactionSource = interactionSource,
+                indication = null,
+                onClick = onClick,
+            )
+        } else {
+            Modifier
+        }
+
+    Column(
+        modifier =
+            modifier
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, borderColor, shape)
+                .then(clickModifier)
+                .padding(horizontal = (8f * paneScale).dp, vertical = (6f * paneScale).dp),
+        verticalArrangement = Arrangement.spacedBy((1f * paneScale).dp),
+    ) {
+        Text(
+            text = title,
+            color = DrawerAccent,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth(),
+        )
+        Text(
+            text = detail,
+            color = DrawerTextSecondary,
+            fontSize = (10f * paneScale).sp,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+internal fun TaskManagerCpuCoreGrid(cpuCorePercents: List<Int>) {
+    val paneScale = LocalPaneScale.current
+    val shape = RoundedCornerShape((10f * paneScale).dp)
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(PaneInnerResting)
+                .border(1.dp, RestingCardBorder, shape)
+                .padding(horizontal = (8f * paneScale).dp, vertical = (6f * paneScale).dp),
+        verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
+    ) {
+        Text(
+            text = stringResource(R.string.session_task_per_core_usage),
+            color = DrawerTextPrimary,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+        FlowRow(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
+            verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
+        ) {
+            cpuCorePercents.forEachIndexed { index, percent ->
+                TaskManagerCpuCoreChip(coreIndex = index, percent = percent)
+            }
+        }
+    }
+}
+
+@Composable
+internal fun TaskManagerCpuCoreChip(coreIndex: Int, percent: Int) {
+    val paneScale = LocalPaneScale.current
+    val shape = RoundedCornerShape((6f * paneScale).dp)
+    Row(
+        modifier =
+            Modifier
+                .clip(shape)
+                .background(PaneSurfaceColor)
+                .border(1.dp, RestingCardBorder, shape)
+                .padding(horizontal = (6f * paneScale).dp, vertical = (3f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
+    ) {
+        Text(
+            text = stringResource(R.string.session_task_core_label, coreIndex),
+            color = DrawerTextSecondary,
+            fontSize = (10f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+        )
+        Text(
+            text = "$percent%",
+            color = DrawerAccent,
+            fontSize = (10f * paneScale).sp,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
+@Composable
+internal fun TaskManagerNewTaskButton(onClick: () -> Unit) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
+        animationSpec = tween(120),
+        label = "taskManagerNewTaskBg",
+    )
+    val tint = if (pressed) DrawerAccent.copy(alpha = 0.76f) else DrawerAccent
+    val shape = RoundedCornerShape((12f * paneScale).dp)
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, RestingCardBorder, shape)
+                .paneNavItem(cornerRadius = (12f * paneScale).dp, onActivate = onClick)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Add,
+            contentDescription = null,
+            tint = tint,
+            modifier = Modifier.size((18f * paneScale).dp),
+        )
+        Spacer(Modifier.width((6f * paneScale).dp))
+        Text(
+            text = stringResource(R.string.session_task_new_task),
+            color = tint,
+            fontSize = (14f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+        )
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+internal fun TaskManagerAffinityOptions(
+    affinityMask: Int,
+    coreCount: Int,
+    onAffinityMaskChanged: (Int) -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    val effectiveCoreCount = coreCount.coerceAtLeast(1).coerceAtMost(32)
+    val selectedMask = sanitizeTaskAffinityMask(affinityMask, effectiveCoreCount)
+    val fullMask = taskAffinityFullMask(effectiveCoreCount)
+
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(
+                    start = (8f * paneScale).dp,
+                    end = (8f * paneScale).dp,
+                    bottom = (8f * paneScale).dp,
+                ),
+        verticalArrangement = Arrangement.spacedBy((7f * paneScale).dp),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy((6f * paneScale).dp),
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Tune,
+                contentDescription = null,
+                tint = DrawerAccent,
+                modifier = Modifier.size((15f * paneScale).dp),
+            )
+            Text(
+                text = stringResource(R.string.session_task_affinity_title),
+                color = DrawerTextPrimary,
+                fontSize = (12f * paneScale).sp,
+                fontWeight = FontWeight.SemiBold,
+                modifier = Modifier.weight(1f),
+            )
+        }
+
+        FlowRow(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy((5f * paneScale).dp),
+            verticalArrangement = Arrangement.spacedBy((5f * paneScale).dp),
+        ) {
+            TaskManagerAffinityChip(
+                label = stringResource(R.string.session_task_affinity_all_cores),
+                selected = selectedMask == fullMask,
+                onClick = { onAffinityMaskChanged(fullMask) },
+            )
+            for (coreIndex in 0 until effectiveCoreCount) {
+                val bit = 1 shl coreIndex
+                TaskManagerAffinityChip(
+                    label = stringResource(R.string.session_task_core_label, coreIndex),
+                    selected = (selectedMask and bit) != 0,
+                    onClick = {
+                        val nextMask =
+                            if ((selectedMask and bit) != 0) {
+                                selectedMask and bit.inv()
+                            } else {
+                                selectedMask or bit
+                            }
+                        if ((nextMask and fullMask) != 0) {
+                            onAffinityMaskChanged(nextMask and fullMask)
+                        }
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun TaskManagerAffinityChip(
+    label: String,
+    selected: Boolean,
+    onClick: () -> Unit,
+) {
+    val bgColor =
+        if (selected) {
+            DrawerAccent.copy(alpha = 0.16f)
+        } else {
+            PaneInnerResting
+        }
+    val borderColor = if (selected) DrawerAccent.copy(alpha = 0.56f) else RestingCardBorder
+    val textColor = if (selected) DrawerAccent else DrawerTextPrimary
+    Row(
+        modifier =
+            Modifier
+                .clip(RoundedCornerShape(8.dp))
+                .background(bgColor)
+                .border(1.dp, borderColor, RoundedCornerShape(8.dp))
+                .paneNavItem(cornerRadius = 8.dp, onActivate = onClick)
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = 8.dp, vertical = 5.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Check,
+            contentDescription = null,
+            tint = DrawerAccent.copy(alpha = if (selected) 1f else 0f),
+            modifier = Modifier.size(13.dp),
+        )
+        Text(
+            text = label,
+            color = textColor,
+            fontSize = 11.sp,
+            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
+        )
+    }
+}
+
+internal fun taskAffinityFullMask(coreCount: Int): Int {
+    var mask = 0
+    for (index in 0 until coreCount.coerceAtLeast(1).coerceAtMost(32)) {
+        mask = mask or (1 shl index)
+    }
+    return mask
+}
+
+internal fun sanitizeTaskAffinityMask(affinityMask: Int, coreCount: Int): Int {
+    val fullMask = taskAffinityFullMask(coreCount)
+    val sanitizedMask = affinityMask and fullMask
+    return if (sanitizedMask != 0) sanitizedMask else fullMask
+}
+
+@Composable
+internal fun TaskManagerActionPopup(
+    expanded: Boolean,
+    onDismiss: () -> Unit,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    if (!expanded) return
+    val paneScale = LocalPaneScale.current
+    val density = LocalDensity.current
+    val gapPx = with(density) { (4f * paneScale).dp.roundToPx() }
+    val shape = RoundedCornerShape((12f * paneScale).dp)
+    Popup(
+        popupPositionProvider = remember(gapPx) { TaskManagerPopupPositionProvider(gapPx) },
+        onDismissRequest = onDismiss,
+        properties = PopupProperties(focusable = true),
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .width(IntrinsicSize.Max)
+                    .widthIn(min = (150f * paneScale).dp, max = (240f * paneScale).dp)
+                    .clip(shape)
+                    .background(PaneSurfaceColor)
+                    .border(1.dp, RestingCardBorder, shape)
+                    .padding((5f * paneScale).dp),
+            verticalArrangement = Arrangement.spacedBy((4f * paneScale).dp),
+            content = content,
+        )
+    }
+}
+
+@Composable
+internal fun TaskManagerActionPopupItem(
+    label: String,
+    onClick: () -> Unit,
+    icon: ImageVector? = null,
+) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) DrawerAccent.copy(alpha = 0.16f) else PaneInnerResting,
+        animationSpec = tween(120),
+        label = "taskManagerPopupItem",
+    )
+    val shape = RoundedCornerShape((8f * paneScale).dp)
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, RestingCardBorder, shape)
+                .clickable(interactionSource = interactionSource, indication = null, onClick = onClick)
+                .padding(horizontal = (12f * paneScale).dp, vertical = (10f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy((8f * paneScale).dp),
+    ) {
+        if (icon != null) {
+            Icon(
+                imageVector = icon,
+                contentDescription = null,
+                tint = DrawerAccent,
+                modifier = Modifier.size((16f * paneScale).dp),
+            )
+        }
+        Text(
+            text = label,
+            color = DrawerTextPrimary,
+            fontSize = (13f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+internal fun TaskManagerEndProcessDialog(
+    process: TaskManagerProcess,
+    onDismiss: () -> Unit,
+    onConfirm: () -> Unit,
+) {
+    val displayName = if (process.isWow64) "${process.name} *32" else process.name
+    val shape = RoundedCornerShape(12.dp)
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .safeDrawingPadding()
+                    .padding(horizontal = 14.dp, vertical = 10.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .widthIn(max = 292.dp)
+                        .fillMaxWidth()
+                        .clip(shape)
+                        .background(PaneSurfaceColor)
+                        .border(1.dp, GlassExitTint.copy(alpha = 0.32f), shape)
+                        .padding(horizontal = 12.dp, vertical = 10.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Close,
+                        contentDescription = null,
+                        tint = GlassExitTint,
+                        modifier = Modifier.size(17.dp),
+                    )
+                    Text(
+                        text = stringResource(R.string.session_task_end_process),
+                        color = DrawerTextPrimary,
+                        fontSize = 13.sp,
+                        fontWeight = FontWeight.SemiBold,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier.weight(1f),
+                    )
+                }
+
+                Text(
+                    text = displayName,
+                    color = DrawerTextPrimary,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                Text(
+                    text = stringResource(R.string.session_task_confirm_end_process),
+                    color = DrawerTextPrimary,
+                    fontSize = 11.sp,
+                    lineHeight = 14.sp,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth().padding(bottom = 4.dp),
+                )
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    TaskManagerDialogButton(
+                        label = stringResource(R.string.common_ui_cancel),
+                        textColor = DrawerTextPrimary,
+                        modifier = Modifier.height(34.dp),
+                        verticalPadding = 0.dp,
+                        onClick = onDismiss,
+                    )
+                    TaskManagerDialogButton(
+                        label = stringResource(R.string.session_task_end_process),
+                        textColor = GlassExitTint,
+                        modifier = Modifier.height(34.dp),
+                        verticalPadding = 0.dp,
+                        fontWeight = FontWeight.Medium,
+                        backgroundColor = GlassExitTint.copy(alpha = 0.12f),
+                        borderColor = GlassExitTint.copy(alpha = 0.34f),
+                        onClick = onConfirm,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun TaskManagerNewTaskDialog(
+    onDismiss: () -> Unit,
+    onConfirm: (String) -> Unit,
+) {
+    val customLabel = stringResource(R.string.session_task_custom_value)
+    var selectedLabel by remember { mutableStateOf(NEW_TASK_PRESETS.first()) }
+    var customMode by remember { mutableStateOf(false) }
+    var customText by remember { mutableStateOf("") }
+    var dropdownExpanded by remember { mutableStateOf(false) }
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val shape = RoundedCornerShape(14.dp)
+    val fieldShape = RoundedCornerShape(10.dp)
+
+    fun submit() {
+        val command = if (customMode) customText.trim() else selectedLabel.trim().lowercase()
+        if (command.isNotEmpty()) onConfirm(command)
+    }
+
+    LaunchedEffect(customMode) {
+        if (customMode) {
+            focusRequester.requestFocus()
+            keyboardController?.show()
+        }
+    }
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .safeDrawingPadding()
+                    .imePadding()
+                    .padding(horizontal = 14.dp, vertical = 10.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .widthIn(max = 310.dp)
+                        .fillMaxWidth()
+                        .clip(shape)
+                        .background(PaneSurfaceColor)
+                        .border(1.dp, RestingCardBorder, shape)
+                        .padding(horizontal = 14.dp, vertical = 12.dp),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Add,
+                        contentDescription = null,
+                        tint = DrawerAccent,
+                        modifier = Modifier.size(18.dp),
+                    )
+                    Text(
+                        text = stringResource(R.string.session_task_new_task),
+                        color = DrawerTextPrimary,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.SemiBold,
+                    )
+                }
+
+                Box(modifier = Modifier.fillMaxWidth()) {
+                    if (customMode) {
+                        OutlinedTextField(
+                            value = customText,
+                            onValueChange = { customText = it },
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .height(48.dp)
+                                    .focusRequester(focusRequester),
+                            singleLine = true,
+                            textStyle =
+                                androidx.compose.material3.MaterialTheme.typography.bodyMedium.copy(
+                                    color = DrawerTextPrimary,
+                                    fontSize = 13.sp,
+                                ),
+                            colors =
+                                OutlinedTextFieldDefaults.colors(
+                                    focusedBorderColor = DrawerAccent,
+                                    unfocusedBorderColor = RestingCardBorder,
+                                    focusedTextColor = DrawerTextPrimary,
+                                    unfocusedTextColor = DrawerTextPrimary,
+                                    focusedContainerColor = PaneInnerResting,
+                                    unfocusedContainerColor = PaneInnerResting,
+                                    cursorColor = DrawerAccent,
+                                ),
+                            trailingIcon = {
+                                Icon(
+                                    imageVector = Icons.Outlined.ArrowDropDown,
+                                    contentDescription = null,
+                                    tint = DrawerTextSecondary,
+                                    modifier =
+                                        Modifier
+                                            .size(22.dp)
+                                            .clickable(
+                                                interactionSource = remember { MutableInteractionSource() },
+                                                indication = null,
+                                            ) { dropdownExpanded = true },
+                                )
+                            },
+                            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                            keyboardActions =
+                                KeyboardActions(
+                                    onDone = {
+                                        keyboardController?.hide()
+                                        submit()
+                                    },
+                                ),
+                        )
+                    } else {
+                        Row(
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .clip(fieldShape)
+                                    .background(PaneInnerResting)
+                                    .border(1.dp, RestingCardBorder, fieldShape)
+                                    .clickable { dropdownExpanded = true }
+                                    .padding(horizontal = 12.dp, vertical = 12.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Text(
+                                text = selectedLabel,
+                                color = DrawerTextPrimary,
+                                fontSize = 13.sp,
+                                modifier = Modifier.weight(1f),
+                            )
+                            Icon(
+                                imageVector = Icons.Outlined.ArrowDropDown,
+                                contentDescription = null,
+                                tint = DrawerTextSecondary,
+                                modifier = Modifier.size(22.dp),
+                            )
+                        }
+                    }
+                    TaskManagerActionPopup(
+                        expanded = dropdownExpanded,
+                        onDismiss = { dropdownExpanded = false },
+                    ) {
+                        NEW_TASK_PRESETS.forEach { item ->
+                            TaskManagerActionPopupItem(
+                                label = item,
+                                onClick = {
+                                    selectedLabel = item
+                                    customMode = false
+                                    dropdownExpanded = false
+                                },
+                            )
+                        }
+                        TaskManagerActionPopupItem(
+                            label = customLabel,
+                            onClick = {
+                                customMode = true
+                                dropdownExpanded = false
+                            },
+                        )
+                    }
+                }
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    TaskManagerDialogButton(
+                        label = stringResource(R.string.common_ui_cancel),
+                        textColor = DrawerTextPrimary,
+                        modifier = Modifier.height(34.dp),
+                        verticalPadding = 0.dp,
+                        onClick = onDismiss,
+                    )
+                    TaskManagerDialogButton(
+                        label = stringResource(R.string.common_ui_ok),
+                        textColor = DrawerAccent,
+                        modifier = Modifier.height(34.dp),
+                        verticalPadding = 0.dp,
+                        backgroundColor = DrawerAccent.copy(alpha = 0.12f),
+                        borderColor = DrawerAccent.copy(alpha = 0.34f),
+                        onClick = {
+                            keyboardController?.hide()
+                            submit()
+                        },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun TaskManagerDialogButton(
+    label: String,
+    textColor: Color,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = PaneInnerResting,
+    borderColor: Color = RestingCardBorder,
+    fontWeight: FontWeight = FontWeight.SemiBold,
+    verticalPadding: Dp = 8.dp,
+) {
+    Box(
+        modifier =
+            modifier
+                .widthIn(min = 72.dp)
+                .clip(RoundedCornerShape(9.dp))
+                .background(backgroundColor)
+                .border(1.dp, borderColor, RoundedCornerShape(9.dp))
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onClick,
+                )
+                .padding(horizontal = 14.dp, vertical = verticalPadding),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = fontWeight,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+    }
+}
+
+@Composable
+internal fun TaskManagerProcessHeader() {
+    val paneScale = LocalPaneScale.current
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(horizontal = (4f * paneScale).dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = stringResource(R.string.session_task_process_name),
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+            modifier = Modifier.weight(1f),
+        )
+        Text(
+            text = stringResource(R.string.session_task_pid),
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+            textAlign = TextAlign.End,
+            modifier = Modifier.width((54f * paneScale).dp),
+        )
+        Text(
+            text = stringResource(R.string.session_task_memory),
+            color = DrawerTextSecondary,
+            fontSize = (11f * paneScale).sp,
+            fontWeight = FontWeight.Medium,
+            textAlign = TextAlign.End,
+            modifier = Modifier.width((78f * paneScale).dp),
+        )
+        Spacer(modifier = Modifier.width((46f * paneScale).dp))
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun TaskManagerProcessCard(
+    process: TaskManagerProcess,
+    expanded: Boolean,
+    affinityMask: Int,
+    coreCount: Int,
+    onToggleAffinity: () -> Unit,
+    onAffinityMaskChanged: (Int) -> Unit,
+    onEndProcess: () -> Unit,
+    onBringToFront: () -> Unit,
+) {
+    val paneScale = LocalPaneScale.current
+    val shape = RoundedCornerShape((8f * paneScale).dp)
+    val displayName = if (process.isWow64) "${process.name} *32" else process.name
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    var menuExpanded by remember { mutableStateOf(false) }
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) PaneInnerPressed else PaneInnerResting,
+        animationSpec = tween(120),
+        label = "taskManagerProcessRowBg",
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (expanded) DrawerAccent.copy(alpha = 0.62f) else RestingCardBorder,
+        animationSpec = tween(160),
+        label = "taskManagerProcessCardBorder",
+    )
+
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, borderColor, shape),
+    ) {
+        Box {
+            Row(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .paneNavItem(
+                            cornerRadius = (8f * paneScale).dp,
+                            onActivate = onToggleAffinity,
+                            onSecondary = onBringToFront,
+                        )
+                        .combinedClickable(
+                            interactionSource = interactionSource,
+                            indication = null,
+                            onClick = onToggleAffinity,
+                            onLongClick = { menuExpanded = true },
+                        )
+                        .padding(horizontal = (8f * paneScale).dp, vertical = (6f * paneScale).dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = displayName,
+                    color = DrawerTextPrimary,
+                    fontSize = (12f * paneScale).sp,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f),
+                )
+                Text(
+                    text = process.pid.toString(),
+                    color = DrawerTextSecondary,
+                    fontSize = (12f * paneScale).sp,
+                    textAlign = TextAlign.End,
+                    modifier = Modifier.width((54f * paneScale).dp),
+                )
+                Text(
+                    text = process.memoryFormatted,
+                    color = DrawerTextSecondary,
+                    fontSize = (12f * paneScale).sp,
+                    textAlign = TextAlign.End,
+                    modifier = Modifier.width((78f * paneScale).dp),
+                )
+                Spacer(modifier = Modifier.width((10f * paneScale).dp))
+                Box(
+                    Modifier.paneNavItem(cornerRadius = (8f * paneScale).dp, onActivate = onEndProcess),
+                ) {
+                    TaskManagerEndButton(onClick = onEndProcess)
+                }
+            }
+
+            TaskManagerActionPopup(
+                expanded = menuExpanded,
+                onDismiss = { menuExpanded = false },
+            ) {
+                TaskManagerActionPopupItem(
+                    label = stringResource(R.string.session_task_bring_to_front),
+                    icon = Icons.Outlined.Monitor,
+                    onClick = {
+                        menuExpanded = false
+                        onBringToFront()
+                    },
+                )
+            }
+        }
+
+        AnimatedVisibility(
+            visible = expanded,
+            enter =
+                fadeIn(animationSpec = tween(durationMillis = 150, easing = FastOutSlowInEasing)) +
+                    expandVertically(
+                        animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing),
+                        expandFrom = Alignment.Top,
+                    ),
+            exit =
+                fadeOut(animationSpec = tween(durationMillis = 120, easing = FastOutSlowInEasing)) +
+                    shrinkVertically(
+                        animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
+                        shrinkTowards = Alignment.Top,
+                    ),
+        ) {
+            TaskManagerAffinityOptions(
+                affinityMask = affinityMask,
+                coreCount = coreCount,
+                onAffinityMaskChanged = onAffinityMaskChanged,
+            )
+        }
+    }
+}
+
+@Composable
+internal fun TaskManagerEndButton(onClick: () -> Unit) {
+    val paneScale = LocalPaneScale.current
+    val interactionSource = remember { MutableInteractionSource() }
+    val pressed = interactionSource.collectIsPressedAsState().value
+    val bgColor by animateColorAsState(
+        targetValue = if (pressed) TileExitPressed else TileExitResting,
+        animationSpec = tween(120),
+        label = "taskManagerEndBtn",
+    )
+    val size = (32f * paneScale).dp
+    val shape = RoundedCornerShape((8f * paneScale).dp)
+    Box(
+        modifier =
+            Modifier
+                .size(size)
+                .clip(shape)
+                .background(bgColor)
+                .border(1.dp, GlassExitTint.copy(alpha = 0.34f), shape)
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Close,
+            contentDescription = stringResource(R.string.session_task_end_process),
+            tint = GlassExitTint,
+            modifier = Modifier.size((16f * paneScale).dp),
+        )
+    }
+}
diff --git a/app/src/main/runtime/display/composition/DirectCompositionLayer.java b/app/src/main/runtime/display/composition/DirectCompositionLayer.java
index e7901f82e..6036eac62 100644
--- a/app/src/main/runtime/display/composition/DirectCompositionLayer.java
+++ b/app/src/main/runtime/display/composition/DirectCompositionLayer.java
@@ -2,236 +2,100 @@
 
 import android.util.Log;
 import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
 
 /**
- * Per-activity wrapper around a single {@code ASurfaceControl} child layer
- * that's bound to an {@link XServerView}'s underlying {@link SurfaceView}.
- *
- * <h3>Lifecycle</h3>
- * The layer is allocated when the host SurfaceView reports
- * {@link SurfaceHolder.Callback#surfaceCreated} (or in Phase 2.1's case, the
- * activity attaches once after {@code rootView.addView(xServerView)} as a
- * one-shot probe — see {@code XServerDisplayActivity.setupDirectComposition})
- * and freed in {@link SurfaceHolder.Callback#surfaceDestroyed}. Operating on a
- * released layer is a no-op (defensive: the native side guards against
- * {@code sc == 0}).
- *
- * <h3>Phase 2.1 capabilities</h3>
- * Lifecycle only — attach, set a solid color (proof-of-life), hide, release.
- * No buffer push, no fence handling, no game-frame routing yet. The toggle is
- * still consumed by {@code XServerDisplayActivity} only for logging.
- *
- * <h3>Threading</h3>
- * All public methods serialise on {@code this} so concurrent calls from the
- * UI thread (lifecycle) and the renderer thread (future buffer pushes) can't
- * race the native pointer. The native pointer is read inside the lock and
- * passed to JNI, where libandroid.so's own synchronisation takes over.
+ * A single {@code ASurfaceControl} child layer bound to the XServerSurfaceView's
+ * Surface. Every public method is synchronized so the UI thread's
+ * {@link #release()} can't race the render thread's {@link #pushBuffer}.
  */
 public final class DirectCompositionLayer {
 
-    static {
-        // Same pattern as SurfaceCompositor / GPUImage / etc. Idempotent.
-        System.loadLibrary("winlator");
-    }
-
     private static final String TAG = "DirectCompositionLayer";
 
-    /** Native {@code ASurfaceControl*} reinterpreted as a {@code jlong}. 0 == released. */
-    private long nativeSc;
-
-    private DirectCompositionLayer(long nativeSc) {
-        this.nativeSc = nativeSc;
-    }
+    /** Native ASurfaceControl* pointer. 0 = not attached / released. */
+    private long nativeSc = 0;
+    private boolean attached = false;
 
-    /**
-     * Attach a hidden child SurfaceControl above the given SurfaceView's primary
-     * buffer queue. Caller must invoke {@link #release()} when the host surface
-     * is destroyed.
-     *
-     * @return a layer handle, or {@code null} if the underlying NDK call failed
-     *         (caller should fall back to the GLRenderer composition path).
-     */
-    public static DirectCompositionLayer attach(SurfaceView host) {
-        if (host == null) return null;
-        if (!SurfaceCompositor.isAvailable()) {
-            // Shouldn't normally happen — the activity is supposed to call
-            // SurfaceCompositor.isAvailable() before instantiating this class —
-            // but be defensive.
-            Log.w(TAG, "attach() called but SurfaceCompositor is unavailable");
-            return null;
-        }
-        SurfaceHolder holder = host.getHolder();
-        if (holder == null) {
-            Log.w(TAG, "attach() — SurfaceView has no holder");
-            return null;
+    /** Creates the layer, hidden until the first successful {@link #pushBuffer}. */
+    public synchronized boolean attach(Surface surface) {
+        if (attached) {
+            Log.w(TAG, "attach: already attached, ignoring");
+            return true;
         }
-        Surface surface = holder.getSurface();
         if (surface == null || !surface.isValid()) {
-            Log.w(TAG, "attach() — SurfaceView's Surface is not valid yet (surfaceCreated not fired)");
-            return null;
-        }
-        long sc;
-        try {
-            sc = nativeAttachToSurface(surface);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativeAttachToSurface threw", e);
-            return null;
-        }
-        if (sc == 0L) {
-            return null;
-        }
-        Log.i(TAG, "Direct Composition layer attached (sc=" + Long.toHexString(sc) + ")");
-        return new DirectCompositionLayer(sc);
-    }
-
-    /**
-     * Phase 2.1 proof-of-life: paint a solid color and unhide. Used by the
-     * {@code DirectCompositionTestPattern} smoke test in Phase 2.2 only —
-     * production code paths never call this.
-     */
-    public synchronized void setColor(float r, float g, float b, float a) {
-        if (nativeSc == 0L) return;
-        try {
-            nativeSetColor(nativeSc, r, g, b, a);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativeSetColor threw", e);
+            Log.w(TAG, "attach: surface is null or invalid");
+            return false;
         }
-    }
-
-    /**
-     * Phase 2.2: hand an AHardwareBuffer to the layer in one transaction.
-     *
-     * @param ahbPtr      raw {@code AHardwareBuffer*} (typically obtained from
-     *                    {@code GPUImage.getHardwareBufferPtr()} in Phase 2.3
-     *                    or from {@link #allocateTestBuffer} in Phase 2.2's
-     *                    smoke test).
-     * @param dstX/dstY   layer position in the SurfaceView's coordinate space.
-     * @param dstW/dstH   destination size; if it differs from the buffer's
-     *                    native extents the layer is scaled (modern API path)
-     *                    or stretched (deprecated setGeometry fallback).
-     * @param fenceFd     POSIX sync_file FD that signals when GPU writes are
-     *                    complete; pass -1 if no fence is needed (the framework
-     *                    will read the buffer immediately). The framework
-     *                    <em>takes ownership</em> of this FD per
-     *                    surface_control.h:343-348 — the caller MUST NOT close
-     *                    it after this call. Phase 2.2 always passes -1; real
-     *                    fence threading lives in Phase 2.4.
-     * @param opaque      Whether the buffer's pixels are fully opaque
-     *                    (alpha=1.0 throughout). Game swap-chain frames are
-     *                    by convention; pass {@code true} to let HWC mark the
-     *                    layer OPAQUE and skip per-pixel alpha blending,
-     *                    which on Snapdragon DPUs avoids the SDR-on-HDR
-     *                    panel routing that boosts layer brightness vs the
-     *                    legacy GL composition path. Pass {@code false} when
-     *                    the buffer may contain translucency (overlays, UI).
-     * @return true if the transaction was queued; false on any failure (in
-     *         which case the caller should fall back to the GL composition
-     *         path for this frame).
-     */
-    public synchronized boolean pushBuffer(long ahbPtr,
-                                           int dstX, int dstY, int dstW, int dstH,
-                                           int fenceFd,
-                                           boolean opaque) {
-        // Always enter JNI so the native side has a single, consistent place
-        // to consume / close the fence FD. The native code's first action is
-        // to validate sc / ahb / extents and close the fence on any error
-        // path before returning JNI_FALSE — so callers never have to worry
-        // about FD leaks regardless of which check trips. Phase 2.2 always
-        // passes -1, so this is a no-op today, but the invariant matters
-        // for Phase 2.4 when real fences arrive.
-        try {
-            return nativePushBuffer(nativeSc, ahbPtr, dstX, dstY, dstW, dstH, fenceFd, opaque);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativePushBuffer threw", e);
-            // FD ownership on a thrown JNI call is undefined — best-effort:
-            // leak rather than risk a double-close. Phase 2.4 callers should
-            // wrap pushBuffer in a try/finally that owns the FD lifecycle
-            // explicitly when this matters.
+        nativeSc = nativeCreateFromWindow(surface, "winnative-direct-composition");
+        if (nativeSc == 0) {
+            Log.e(TAG, "attach: nativeCreateFromWindow returned 0");
             return false;
         }
+        attached = true;
+        Log.i(TAG, "Direct Composition layer attached: sc=" + nativeSc);
+        return true;
     }
 
     /**
-     * Phase 2.2 smoke-test helper: allocate an AHardwareBuffer and CPU-fill it
-     * with a single ARGB color. Returns a raw {@code AHardwareBuffer*} (held
-     * by the JVM as a {@code long}) — caller is responsible for eventually
-     * calling {@link #releaseBuffer}.
+     * Shows an AHardwareBuffer on the layer, atomically with the buffer set.
      *
-     * @param argb 0xAARRGGBB packed colour.
-     * @return native pointer, or 0 on failure.
+     * @param acquireFenceFd producer fence, or -1. Ownership passes to the
+     *                       framework on success and is closed here otherwise.
+     * @param opaque         declares alpha=1.0 throughout, letting HWC skip
+     *                       blending and avoid the Snapdragon SDR-on-HDR
+     *                       brightness boost.
+     * @return false on any failure; the caller self-detaches after
+     *         DC_FAIL_LIMIT consecutive failures.
      */
-    public static long allocateTestBuffer(int width, int height, int argb) {
-        if (width <= 0 || height <= 0) return 0L;
-        if (!SurfaceCompositor.isAvailable()) return 0L;
-        try {
-            return nativeAllocateTestBuffer(width, height, argb);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativeAllocateTestBuffer threw", e);
-            return 0L;
-        }
-    }
-
-    /** Drop our refcount on a test AHardwareBuffer allocated with {@link #allocateTestBuffer}. */
-    public static void releaseBuffer(long ahbPtr) {
-        if (ahbPtr == 0L) return;
-        try {
-            nativeReleaseBuffer(ahbPtr);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativeReleaseBuffer threw", e);
+    public synchronized boolean pushBuffer(long ahbPtr, int dstX, int dstY,
+                                            int dstW, int dstH,
+                                            int acquireFenceFd, boolean opaque, boolean pace) {
+        if (!attached || nativeSc == 0) {
+            if (acquireFenceFd >= 0) {
+                try { android.os.ParcelFileDescriptor.adoptFd(acquireFenceFd).close(); }
+                catch (java.io.IOException ignored) {}
+            }
+            return false;
         }
+        return nativePushBuffer(nativeSc, ahbPtr, dstX, dstY, dstW, dstH,
+                                acquireFenceFd, opaque, pace);
     }
 
-    /**
-     * Hide the layer — used when the current frame doesn't qualify for the
-     * direct-scanout fast path and the GLRenderer is going to composite
-     * normally. Idempotent.
-     */
+    /** Hides the layer. Idempotent. */
     public synchronized void hide() {
-        if (nativeSc == 0L) return;
-        try {
-            nativeHide(nativeSc);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativeHide threw", e);
-        }
+        if (!attached || nativeSc == 0) return;
+        nativeHide(nativeSc);
     }
 
     /**
-     * Reparent the layer to null and release the underlying ASurfaceControl.
-     * Safe to call multiple times. After this returns, every other method on
-     * the layer is a no-op.
+     * Reparents to null, drains in-flight transactions, then releases the
+     * native layer. The instance is unusable afterwards.
      */
     public synchronized void release() {
-        if (nativeSc == 0L) return;
-        long sc = nativeSc;
-        nativeSc = 0L;
-        try {
-            nativeDetachAndRelease(sc);
-        } catch (UnsatisfiedLinkError | RuntimeException e) {
-            Log.w(TAG, "nativeDetachAndRelease threw", e);
-        }
-        Log.i(TAG, "Direct Composition layer released (sc=" + Long.toHexString(sc) + ")");
+        if (!attached) return;
+        nativeDetachAndRelease(nativeSc);
+        nativeSc = 0;
+        attached = false;
+        Log.i(TAG, "Direct Composition layer released");
     }
 
-    /** True if this handle still references a live native ASurfaceControl. */
     public synchronized boolean isAttached() {
-        return nativeSc != 0L;
+        return attached;
     }
 
-    private static native long nativeAttachToSurface(Surface surface);
-
-    private static native void nativeDetachAndRelease(long sc);
+    // --- Native methods ---
 
-    private static native void nativeSetColor(long sc, float r, float g, float b, float a);
+    private native long nativeCreateFromWindow(Surface surface, String debugName);
 
-    private static native void nativeHide(long sc);
+    private native void nativeDetachAndRelease(long scPtr);
 
-    private static native boolean nativePushBuffer(long sc, long ahbPtr,
-                                                   int dstX, int dstY, int dstW, int dstH,
-                                                   int fenceFd, boolean opaque);
+    private native void nativeHide(long scPtr);
 
-    private static native long nativeAllocateTestBuffer(int width, int height, int argb);
+    private native boolean nativePushBuffer(long scPtr, long ahbPtr,
+                                             int dstX, int dstY,
+                                             int dstW, int dstH,
+                                             int acquireFenceFd, boolean opaque, boolean pace);
 
-    private static native void nativeReleaseBuffer(long ahbPtr);
+    // Blocks until SF finishes the previous frame (hardware signal, no CPU polling).
+    public native boolean nativeWaitForPreviousFrame(long timeoutMs);
 }
diff --git a/app/src/main/runtime/display/composition/SurfaceCompositor.java b/app/src/main/runtime/display/composition/SurfaceCompositor.java
index 158f92267..ccbe14b91 100644
--- a/app/src/main/runtime/display/composition/SurfaceCompositor.java
+++ b/app/src/main/runtime/display/composition/SurfaceCompositor.java
@@ -1,88 +1,129 @@
 package com.winlator.cmod.runtime.display.composition;
 
+import android.content.Context;
 import android.os.Build;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
 
 /**
- * Bridge to the native {@code surface_compositor.c} module — gives the rest of
- * the app a stable Java entry point for the per-container "Direct Composition"
- * path without any caller having to know whether the underlying NDK
- * {@code ASurfaceControl} / {@code ASurfaceTransaction} symbols are actually
- * resolvable on this device.
- *
- * <h3>Phase 1 (current)</h3>
- * Only {@link #isAvailable()} is wired up. The result is cached after the first
- * call so subsequent checks are free. Code that wants to use the Direct
- * Composition fast path should:
- * <ol>
- *   <li>Read the per-container toggle ({@code Container#isDirectCompositionEnabled()}).</li>
- *   <li>Confirm runtime support with {@link #isAvailable()}.</li>
- *   <li>Otherwise fall back to the existing GLRenderer composition path.</li>
- * </ol>
+ * Java entry point for the native Direct Composition module.
  *
- * <h3>Why dlopen rather than direct linking</h3>
- * {@code minSdk} is 26 but {@code ASurfaceControl_*} arrived in API 29; linking
- * statically would fail to resolve at library-load time on Android 8/9. The
- * native side resolves symbols via {@code dlopen("libandroid.so")} +
- * {@code dlsym} so the shared library still loads everywhere and we degrade to
- * the GLRenderer path when the symbols are missing.
+ * <p>{@link #isAvailable()} requires API 29+ and that the libandroid.so symbols
+ * resolve. Beyond that, device eligibility is left to the per-container opt-in
+ * toggle rather than a static brand blocklist.
  */
 public final class SurfaceCompositor {
 
     static {
         // Same pattern used by SysVSharedMemory, GPUImage, ClientSocket, etc.
-        // — every class that calls into the `winlator` shared lib loads it in
-        // its static init. Repeated System.loadLibrary calls are no-ops once
-        // the library is already mapped into the process.
         System.loadLibrary("winlator");
     }
 
     private static final String TAG = "SurfaceCompositor";
 
-    /**
-     * Cached probe result. {@code null} until {@link #isAvailable()} is first
-     * called; thereafter the boxed Boolean is final-state. Read-after-write is
-     * safe because {@code Boolean} writes are atomic on every supported VM and
-     * the cache is intentionally racy: if two threads probe simultaneously they
-     * will both call into the JNI layer once, which is itself idempotent and
-     * mutex-guarded.
-     */
+    /** Cached probe result. null until first call; thereafter final-state. */
     private static volatile Boolean cachedAvailability;
 
     private SurfaceCompositor() {
         // Static-only utility.
     }
 
-    /**
-     * @return {@code true} when the device exposes the API 29+ SurfaceControl
-     *         + SurfaceTransaction NDK symbols and the {@code winlator} native
-     *         library was loaded successfully. {@code false} on any earlier
-     *         Android version, on any device where libandroid.so is missing
-     *         the symbol, or if the JNI lookup itself fails.
-     */
+    /** @return true when the API 29+ SurfaceControl symbols are usable here. */
     public static boolean isAvailable() {
         Boolean cached = cachedAvailability;
         if (cached != null) {
             return cached;
         }
-        // Hard short-circuit on platforms where the native call would always
-        // resolve to the API-< 29 fallback. Keeps logcat noise off old devices.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             cachedAvailability = Boolean.FALSE;
             return false;
         }
+
         boolean result;
         try {
             result = nativeIsAvailable();
         } catch (UnsatisfiedLinkError | RuntimeException e) {
-            // Bridge load failure (e.g. winlator native lib not yet loaded
-            // from this classloader) — treat as "not available" rather than
-            // crashing the activity. The caller falls back to the GL path.
-            android.util.Log.w(TAG, "nativeIsAvailable threw, treating as unavailable", e);
+            Log.w(TAG, "nativeIsAvailable threw, treating as unavailable", e);
             result = false;
         }
         cachedAvailability = result;
+        if (result) {
+            Log.i(TAG, "Direct Composition is available on this device");
+        }
         return result;
     }
 
     private static native boolean nativeIsAvailable();
+
+    // Shared wine_*.txt logs only capture Wine/FEX stderr, not logcat, so DC
+    // events go to their own direct-composition.log in the logs directory —
+    // LogManager includes it automatically when the user shares logs.
+
+    private static volatile File diagFile = null;
+    private static volatile FileWriter diagWriter = null;
+    private static final Object diagLock = new Object();
+    private static final SimpleDateFormat diagDateFormat =
+            new SimpleDateFormat("HH:mm:ss.SSS", Locale.US);
+
+    /** Called once at session start, before any DC code runs. */
+    public static void initDiagnosticFile(File logsDir) {
+        synchronized (diagLock) {
+            try {
+                if (diagWriter != null) {
+                    diagWriter.flush();
+                    diagWriter.close();
+                }
+                if (logsDir != null && !logsDir.exists()) logsDir.mkdirs();
+                diagFile = new File(logsDir, "direct-composition.log");
+                diagWriter = new FileWriter(diagFile, /*append=*/false);
+                logEvent("=== Direct Composition diagnostic log started ===");
+                logEvent("Device: " + Build.MANUFACTURER + " " + Build.MODEL
+                        + " (API " + Build.VERSION.SDK_INT + ")");
+                logEvent("isAvailable() = " + isAvailable());
+            } catch (IOException e) {
+                Log.w(TAG, "Failed to init diagnostic file", e);
+                diagWriter = null;
+            }
+        }
+    }
+
+    /** Appends a timestamped line to the diagnostic file and logcat. Thread-safe. */
+    public static void logEvent(String message) {
+        String timestamped = "[" + diagDateFormat.format(new Date()) + "] " + message;
+        Log.i(TAG, message);
+        synchronized (diagLock) {
+            if (diagWriter != null) {
+                // Flush every line: this log exists to diagnose SurfaceFlinger
+                // crashes and soft reboots, and anything still buffered when the
+                // device goes down is exactly the part worth having.
+                try {
+                    diagWriter.write(timestamped + "\n");
+                    diagWriter.flush();
+                } catch (IOException ignored) {}
+            }
+        }
+    }
+
+    /** Called from XServerDisplayActivity.onDestroy. */
+    public static void closeDiagnosticFile() {
+        synchronized (diagLock) {
+            try {
+                if (diagWriter != null) {
+                    logEvent("=== Direct Composition diagnostic log closed ===");
+                    diagWriter.flush();
+                    diagWriter.close();
+                }
+            } catch (IOException ignored) {
+            } finally {
+                diagWriter = null;
+                diagFile = null;
+            }
+        }
+    }
 }
diff --git a/app/src/main/runtime/display/connector/ClientSocket.java b/app/src/main/runtime/display/connector/ClientSocket.java
index 81bab81be..f3c6bd2cc 100644
--- a/app/src/main/runtime/display/connector/ClientSocket.java
+++ b/app/src/main/runtime/display/connector/ClientSocket.java
@@ -1,6 +1,5 @@
 package com.winlator.cmod.runtime.display.connector;
 
-import android.util.Log;
 import androidx.annotation.Keep;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -53,7 +52,7 @@ public void write(ByteBuffer data) throws IOException {
     int bytesWritten = write(fd, data, data.limit());
     if (bytesWritten >= 0) {
       data.position(bytesWritten);
-    } else Log.d("ClientSocket", "Failed to write data.");
+    } else throw new IOException("Failed to write data.");
   }
 
   public int recvAncillaryMsg(ByteBuffer data) throws IOException {
diff --git a/app/src/main/runtime/display/connector/SyncFenceFd.java b/app/src/main/runtime/display/connector/SyncFenceFd.java
new file mode 100644
index 000000000..36fd1c768
--- /dev/null
+++ b/app/src/main/runtime/display/connector/SyncFenceFd.java
@@ -0,0 +1,38 @@
+package com.winlator.cmod.runtime.display.connector;
+
+/**
+ * Native helpers for kernel sync_file FDs (dma_fence) and eventfd signaling.
+ *
+ * <p>Used by {@link com.winlator.cmod.runtime.display.xserver.extensions.SyncExtension SyncExtension}
+ * to back X11 SYNC fences with kernel sync_files imported via DRI3 FenceFromFD, and to export
+ * eventfds that signal when a SYNC fence triggers (DRI3 FDFromFence).
+ */
+public final class SyncFenceFd {
+  static {
+    System.loadLibrary("winlator");
+  }
+
+  private SyncFenceFd() {}
+
+  /**
+   * Batched poll(2) over POLLIN with a single timeout (-1 = infinite). Returns an int[] parallel
+   * to {@code fds} containing each fd's revents (0 means no event); returns null on allocation
+   * failure or if {@code fds} is null. EINTR is retried internally.
+   */
+  public static native int[] pollFds(int[] fds, int timeoutMs);
+
+  /** Allocate a fresh non-blocking eventfd with initial count 0. */
+  public static native int createSignalEventFd();
+
+  /** Duplicate an FD with close-on-exec set. */
+  public static native int dupFd(int fd);
+
+  /** Write 1 to an eventfd so a peer waiting on it becomes ready. */
+  public static native void signalEventFd(int fd);
+
+  /** Read-and-discard the accumulated counter on a non-blocking eventfd. */
+  public static native void drainEventFd(int fd);
+
+  /** close(2) the FD. */
+  public static native void closeFd(int fd);
+}
diff --git a/app/src/main/runtime/display/connector/UnixSocketConfig.java b/app/src/main/runtime/display/connector/UnixSocketConfig.java
index a102c535b..c434071b5 100644
--- a/app/src/main/runtime/display/connector/UnixSocketConfig.java
+++ b/app/src/main/runtime/display/connector/UnixSocketConfig.java
@@ -8,7 +8,6 @@ public class UnixSocketConfig {
   public static final String ALSA_SERVER_PATH = "/usr/tmp/.sound/AS0";
   public static final String PULSE_SERVER_PATH = "/usr/tmp/.sound/PS0";
   public static final String XSERVER_PATH = "/usr/tmp/.X11-unix/X0";
-  public static final String VIRGL_SERVER_PATH = "/tmp/.virgl/V0";
   public final String path;
 
   private UnixSocketConfig(String path) {
diff --git a/app/src/main/runtime/display/connector/XConnectorEpoll.java b/app/src/main/runtime/display/connector/XConnectorEpoll.java
index f6fbb845b..b794e761b 100644
--- a/app/src/main/runtime/display/connector/XConnectorEpoll.java
+++ b/app/src/main/runtime/display/connector/XConnectorEpoll.java
@@ -102,12 +102,17 @@ && waitForSocketRead(client.clientSocket.fd, client.shutdownFd)) {
               });
       client.pollThread.start();
     } else connectionHandler.handleNewConnection(client);
-    connectedClients.put(fd, client);
+    synchronized (connectedClients) {
+      connectedClients.put(fd, client);
+    }
   }
 
   @Keep
   private void handleExistingConnection(int fd) {
-    Client client = connectedClients.get(fd);
+    Client client;
+    synchronized (connectedClients) {
+      client = connectedClients.get(fd);
+    }
     if (client == null) return;
 
     XInputStream inputStream = client.getInputStream();
@@ -126,7 +131,9 @@ private void handleExistingConnection(int fd) {
   }
 
   public Client getClient(int fd) {
-    return connectedClients.get(fd);
+    synchronized (connectedClients) {
+      return connectedClients.get(fd);
+    }
   }
 
   public void killConnection(Client client) {
@@ -151,12 +158,18 @@ public void killConnection(Client client) {
     client.releaseIOStreams();
     client.clientSocket.closeAncillaryFds();
     closeFd(client.clientSocket.fd);
-    connectedClients.remove(client.clientSocket.fd);
+    synchronized (connectedClients) {
+      connectedClients.remove(client.clientSocket.fd);
+    }
   }
 
   private void shutdown() {
-    while (connectedClients.size() > 0) {
-      Client client = connectedClients.valueAt(connectedClients.size() - 1);
+    while (true) {
+      Client client;
+      synchronized (connectedClients) {
+        if (connectedClients.size() == 0) break;
+        client = connectedClients.valueAt(connectedClients.size() - 1);
+      }
       killConnection(client);
     }
 
diff --git a/app/src/main/runtime/display/connector/XOutputStream.java b/app/src/main/runtime/display/connector/XOutputStream.java
index 64cca3a40..ee110d642 100644
--- a/app/src/main/runtime/display/connector/XOutputStream.java
+++ b/app/src/main/runtime/display/connector/XOutputStream.java
@@ -8,6 +8,7 @@
 
 public class XOutputStream {
   private static final byte[] ZERO = new byte[64];
+  private static final double FP3232_SCALE = 4.294967296E9d;
   public ByteBuffer buffer;
   public final ClientSocket clientSocket;
   private final ReentrantLock lock = new ReentrantLock();
@@ -50,9 +51,14 @@ public void writeLong(long value) {
     buffer.putLong(value);
   }
 
+  public void writeFP3232(double value) {
+    if (Double.isNaN(value) || Double.isInfinite(value)) throw new IllegalArgumentException("FP3232 value must be finite");
+    writeLong(Math.round(value * FP3232_SCALE));
+  }
+
   public void writeString8(String str) {
     byte[] bytes = str.getBytes(XServer.LATIN1_CHARSET);
-    int length = -str.length() & 3;
+    int length = -bytes.length & 3;
     ensureSpaceIsAvailable(bytes.length + length);
     buffer.put(bytes);
     if (length > 0) writePad(length);
diff --git a/app/src/main/runtime/display/environment/AudioFocusHandler.java b/app/src/main/runtime/display/environment/AudioFocusHandler.java
new file mode 100644
index 000000000..d9bb1afd1
--- /dev/null
+++ b/app/src/main/runtime/display/environment/AudioFocusHandler.java
@@ -0,0 +1,107 @@
+package com.winlator.cmod.runtime.display.environment;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
+import android.media.AudioManager;
+import android.util.Log;
+
+/**
+ * Complements the activity lifecycle for suspending/resuming guest audio around interruptions that
+ * do not cleanly pause the activity — most importantly incoming phone calls and VoIP calls.
+ *
+ * <p>The activity's onPause/onResume already suspend/resume audio, but a phone call arrives as a
+ * transient audio-focus loss and, when it ends, we get a precise focus-gain callback which is a more
+ * reliable "the call is over, restore audio now" signal than waiting for the activity to be brought
+ * back to the foreground. The suspend/resume callbacks here are idempotent with the lifecycle ones,
+ * so firing from both paths is safe.
+ *
+ * <p>Focus callbacks are delivered on the main thread; the suspend/resume work touches unix sockets,
+ * so it is dispatched to a background thread to keep the UI responsive.
+ */
+public class AudioFocusHandler {
+  private static final String TAG = "AudioFocusHandler";
+
+  private final AudioManager audioManager;
+  private final Runnable onSuspend;
+  private final Runnable onResume;
+  private final AudioFocusRequest focusRequest;
+
+  private boolean requested = false;
+  private boolean suspendedByFocusLoss = false;
+
+  public AudioFocusHandler(Context context, Runnable onSuspend, Runnable onResume) {
+    this.audioManager = (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+    this.onSuspend = onSuspend;
+    this.onResume = onResume;
+
+    AudioAttributes attributes =
+        new AudioAttributes.Builder()
+            .setUsage(AudioAttributes.USAGE_GAME)
+            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+            .build();
+    this.focusRequest =
+        new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+            .setAudioAttributes(attributes)
+            .setWillPauseWhenDucked(false)
+            .setOnAudioFocusChangeListener(this::onFocusChange)
+            .build();
+  }
+
+  /** Requests audio focus so we start receiving focus-change callbacks. Safe to call repeatedly. */
+  public synchronized void request() {
+    if (audioManager == null || requested) return;
+    try {
+      int result = audioManager.requestAudioFocus(focusRequest);
+      requested = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED;
+    } catch (Exception e) {
+      Log.w(TAG, "requestAudioFocus failed: " + e.getMessage());
+    }
+  }
+
+  /** Abandons audio focus and stops callbacks. Call on teardown. */
+  public synchronized void release() {
+    if (audioManager == null || !requested) return;
+    try {
+      audioManager.abandonAudioFocusRequest(focusRequest);
+    } catch (Exception e) {
+      Log.w(TAG, "abandonAudioFocus failed: " + e.getMessage());
+    }
+    requested = false;
+    suspendedByFocusLoss = false;
+  }
+
+  private void onFocusChange(int focusChange) {
+    switch (focusChange) {
+      case AudioManager.AUDIOFOCUS_LOSS:
+      case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+        // Phone call / another app took over playback. Release the AAudio device.
+        synchronized (this) {
+          suspendedByFocusLoss = true;
+        }
+        dispatch(onSuspend);
+        break;
+      case AudioManager.AUDIOFOCUS_GAIN:
+        // Interruption ended; restore output. Only if we were the ones who suspended, so we
+        // don't fight a resume the activity lifecycle is already driving.
+        boolean shouldResume;
+        synchronized (this) {
+          shouldResume = suspendedByFocusLoss;
+          suspendedByFocusLoss = false;
+        }
+        if (shouldResume) dispatch(onResume);
+        break;
+      case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+      default:
+        // Ducking / unknown: leave playback alone.
+        break;
+    }
+  }
+
+  private static void dispatch(Runnable task) {
+    if (task == null) return;
+    Thread thread = new Thread(task, "AudioFocusDispatch");
+    thread.setDaemon(true);
+    thread.start();
+  }
+}
diff --git a/app/src/main/runtime/display/environment/ImageFs.java b/app/src/main/runtime/display/environment/ImageFs.java
index b7680983a..fefa3adbb 100644
--- a/app/src/main/runtime/display/environment/ImageFs.java
+++ b/app/src/main/runtime/display/environment/ImageFs.java
@@ -6,6 +6,7 @@
 import com.winlator.cmod.shared.io.FileUtils;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Locale;
 
 public class ImageFs {
@@ -43,14 +44,28 @@ public File getRootDir() {
   }
 
   public boolean isValid() {
-    return rootDir.isDirectory() && getImgVersionFile().exists();
+    return rootDir.isDirectory()
+        && getImgVersionFile().exists()
+        && getBinDir().isDirectory()
+        && getLibDir().isDirectory()
+        && getEtcDir().isDirectory()
+        && getShareDir().isDirectory()
+        && new File(rootDir, "opt").isDirectory();
+  }
+
+  public boolean isUpToDate() {
+    return isValid() && getVersion() >= ImageFsInstaller.LATEST_VERSION;
   }
 
   public int getVersion() {
     File imgVersionFile = getImgVersionFile();
-    return imgVersionFile.exists()
-        ? Integer.parseInt(FileUtils.readLines(imgVersionFile).get(0))
-        : 0;
+    if (!imgVersionFile.exists()) return 0;
+    try {
+      ArrayList<String> lines = FileUtils.readLines(imgVersionFile);
+      return lines.isEmpty() ? 0 : Integer.parseInt(lines.get(0).trim());
+    } catch (Exception e) {
+      return 0;
+    }
   }
 
   public String getFormattedVersion() {
diff --git a/app/src/main/runtime/display/environment/ImageFsInstaller.java b/app/src/main/runtime/display/environment/ImageFsInstaller.java
index 2be80db68..b3d1e9ea4 100644
--- a/app/src/main/runtime/display/environment/ImageFsInstaller.java
+++ b/app/src/main/runtime/display/environment/ImageFsInstaller.java
@@ -16,14 +16,28 @@
 import com.winlator.cmod.shared.io.FileUtils;
 import com.winlator.cmod.shared.io.TarCompressorUtils;
 import com.winlator.cmod.shared.ui.dialog.DownloadProgressDialog;
+import com.winlator.cmod.shared.util.OnExtractFileListener;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
 public abstract class ImageFsInstaller {
   public static final byte LATEST_VERSION = 22;
+  private static final String IMAGEFS_ARCHIVE = "imagefs.tzst";
+  private static final TarCompressorUtils.Type IMAGEFS_ARCHIVE_TYPE = TarCompressorUtils.Type.ZSTD;
+  private static final long IMAGEFS_EXTRACTED_BYTES = 869024992L;
+  private static final int XZ_PROGRESS_COMPRESSION_RATIO = 22;
+  private static final long DEFAULT_WINE_EXTRACTED_BYTES = 100000000L;
+  private static final long DEFAULT_GUEST_EXTRAS_EXTRACTED_BYTES = 30000000L;
+  private static final long DRIVER_INSTALL_PROGRESS_BYTES = 25000000L;
+  private static final long FINALIZE_PROGRESS_BYTES = 5000000L;
+  private static final long PROGRESS_STEP_DELAY_MS = 10L;
 
   /**
    * Progress callback for installing ImageFS from assets. Lets callers drive a custom UI (e.g.
@@ -53,13 +67,136 @@ private static void resetContainerImgVersions(Context context) {
   }
 
   public static void installWineFromAssets(final android.app.Activity activity) {
+    installWineFromAssetsAsync(activity, null);
+  }
+
+  private static boolean installWineFromAssetsAsync(
+      final android.app.Activity activity, OnExtractFileListener listener) {
     String[] versions = activity.getResources().getStringArray(R.array.wine_entries);
     File rootDir = ImageFs.find(activity).getRootDir();
+    List<Future<Boolean>> futures = new ArrayList<>();
     for (String version : versions) {
       File outFile = new File(rootDir, "/opt/" + version);
       outFile.mkdirs();
-      TarCompressorUtils.extract(TarCompressorUtils.Type.XZ, activity, version + ".txz", outFile);
+      futures.add(
+          TarCompressorUtils.extractAsync(
+              TarCompressorUtils.Type.XZ, activity, version + ".txz", outFile, listener));
     }
+    return waitForExtractions(futures);
+  }
+
+  private static final class InstallProgressTracker {
+    private final ProgressListener listener;
+    private final long totalWorkBytes;
+    private final AtomicLong completedBytes = new AtomicLong();
+    private int lastPercent = -1;
+
+    InstallProgressTracker(long totalWorkBytes, ProgressListener listener) {
+      this.totalWorkBytes = Math.max(1L, totalWorkBytes);
+      this.listener = listener;
+    }
+
+    void start() {
+      emit(0L, false);
+    }
+
+    OnExtractFileListener asExtractListener() {
+      return new OnExtractFileListener() {
+        @Override
+        public File onExtractFile(File file, long size) {
+          return file;
+        }
+
+        @Override
+        public void onExtractFileProgress(File file, long size) {
+          addWork(size);
+        }
+
+        @Override
+        public boolean mapsExtractedFiles() {
+          return false;
+        }
+
+        @Override
+        public boolean reportsExtractedBytesOnly() {
+          return true;
+        }
+
+        @Override
+        public void onExtractedBytes(long size) {
+          addWork(size);
+        }
+      };
+    }
+
+    void addWork(long bytes) {
+      if (bytes <= 0) return;
+      emit(completedBytes.addAndGet(bytes), false);
+    }
+
+    void finish() {
+      emit(totalWorkBytes, true);
+    }
+
+    private synchronized void emit(long completed, boolean complete) {
+      if (listener == null) return;
+      int maxPercent = complete ? 100 : 99;
+      int percent =
+          (int) Math.min(maxPercent, Math.floor((completed * 100.0) / totalWorkBytes));
+      if (percent <= lastPercent) return;
+      for (int nextPercent = lastPercent + 1; nextPercent <= percent; nextPercent++) {
+        lastPercent = nextPercent;
+        listener.onProgress(nextPercent);
+        if (nextPercent < percent) {
+          try {
+            Thread.sleep(PROGRESS_STEP_DELAY_MS);
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return;
+          }
+        }
+      }
+    }
+  }
+
+  private static long estimateXzExtractedBytes(Context context, String assetFile, long fallback) {
+    long compressedSize = FileUtils.getSize(context, assetFile);
+    if (compressedSize <= 0) return fallback;
+    return Math.max(1L, (compressedSize * 100L) / XZ_PROGRESS_COMPRESSION_RATIO);
+  }
+
+  private static long estimateZstdExtractedBytes(Context context, String assetFile, long fallback) {
+    long compressedSize = FileUtils.getSize(context, assetFile);
+    if (compressedSize <= 0) return fallback;
+    return Math.max(compressedSize, compressedSize * 4L);
+  }
+
+  private static long estimateOptionalZstdExtractedBytes(Context context, String assetFile) {
+    return FileUtils.getSize(context, assetFile) > 0
+        ? estimateZstdExtractedBytes(context, assetFile, 0L)
+        : 0L;
+  }
+
+  private static long estimateWineAssetsExtractedBytes(Context context) {
+    long total = 0L;
+    String[] versions = context.getResources().getStringArray(R.array.wine_entries);
+    for (String version : versions) {
+      total += estimateXzExtractedBytes(context, version + ".txz", DEFAULT_WINE_EXTRACTED_BYTES);
+    }
+    return total;
+  }
+
+  private static long estimateGuestExtrasExtractedBytes(Context context) {
+    return estimateOptionalZstdExtractedBytes(context, "redirect.tzst")
+        + estimateZstdExtractedBytes(context, "extras.tzst", DEFAULT_GUEST_EXTRAS_EXTRACTED_BYTES);
+  }
+
+  private static long estimateInstallWorkBytes(Context context, boolean includeDrivers) {
+    return IMAGEFS_EXTRACTED_BYTES
+        + estimateWineAssetsExtractedBytes(context)
+        + estimateGuestExtrasExtractedBytes(context)
+        + (includeDrivers ? DRIVER_INSTALL_PROGRESS_BYTES : 0L)
+        + FINALIZE_PROGRESS_BYTES;
   }
 
   public static void installDriversFromAssets(final android.app.Activity activity) {
@@ -84,7 +221,14 @@ public void onProgress(int percent) {
 
           @Override
           public void onFinished(boolean success) {
-            dialog.closeOnUiThread();
+            activity.runOnUiThread(
+                () -> {
+                  if (success) {
+                    activity.getWindow().getDecorView().postDelayed(dialog::close, 500L);
+                  } else {
+                    dialog.close();
+                  }
+                });
           }
         });
   }
@@ -94,40 +238,30 @@ public static void installFromAssets(
     AppUtils.keepScreenOn(activity);
     ImageFs imageFs = ImageFs.find(activity);
     File rootDir = imageFs.getRootDir();
+    InstallProgressTracker progressTracker =
+        new InstallProgressTracker(estimateInstallWorkBytes(activity, true), listener);
 
     SettingsConfig.resetEmulatorsVersion(activity);
 
     Executors.newSingleThreadExecutor()
         .execute(
             () -> {
+              progressTracker.start();
               clearRootDir(rootDir);
-              final byte compressionRatio = 22;
-              final long contentLength =
-                  (long) (FileUtils.getSize(activity, "imagefs.txz") * (100.0f / compressionRatio));
-              AtomicLong totalSizeRef = new AtomicLong();
 
               boolean success =
-                  TarCompressorUtils.extract(
-                      TarCompressorUtils.Type.XZ,
-                      activity,
-                      "imagefs.txz",
-                      rootDir,
-                      (file, size) -> {
-                        if (size > 0) {
-                          long totalSize = totalSizeRef.addAndGet(size);
-                          final int progress = (int) (((float) totalSize / contentLength) * 100);
-                          if (listener != null) listener.onProgress(progress);
-                        }
-                        return file;
-                      });
+                  extractImageFs(activity, rootDir, progressTracker.asExtractListener());
 
               if (success) {
                 ExecutorService pool = Executors.newFixedThreadPool(3);
                 CountDownLatch latch = new CountDownLatch(3);
+                AtomicBoolean postInstallSuccess = new AtomicBoolean(true);
                 pool.execute(
                     () -> {
                       try {
-                        installWineFromAssets(activity);
+                        postInstallSuccess.compareAndSet(
+                            true,
+                            installWineFromAssetsAsync(activity, progressTracker.asExtractListener()));
                       } finally {
                         latch.countDown();
                       }
@@ -137,13 +271,14 @@ public static void installFromAssets(
                       try {
                         installDriversFromAssets(activity);
                       } finally {
+                        progressTracker.addWork(DRIVER_INSTALL_PROGRESS_BYTES);
                         latch.countDown();
                       }
                     });
                 pool.execute(
                     () -> {
                       try {
-                        installGuestExtras(activity, rootDir);
+                        installGuestExtras(activity, rootDir, progressTracker.asExtractListener());
                       } finally {
                         latch.countDown();
                       }
@@ -153,10 +288,18 @@ public static void installFromAssets(
                 } catch (InterruptedException ignored) {
                 }
                 pool.shutdown();
-                imageFs.createImgVersionFile(LATEST_VERSION);
-                resetContainerImgVersions(activity);
-              } else
-                WinToast.show(activity, R.string.setup_wizard_unable_to_install_system_files);
+                success = postInstallSuccess.get();
+                if (success) {
+                  clearSteamDllMarkers(activity);
+                  imageFs.createImgVersionFile(LATEST_VERSION);
+                  resetContainerImgVersions(activity);
+                  progressTracker.addWork(FINALIZE_PROGRESS_BYTES);
+                  progressTracker.finish();
+                }
+              } else {
+                activity.runOnUiThread(
+                    () -> WinToast.show(activity, R.string.setup_wizard_unable_to_install_system_files));
+              }
 
               if (listener != null) listener.onFinished(success);
             });
@@ -164,7 +307,7 @@ public static void installFromAssets(
 
   public static void installIfNeeded(final android.app.Activity activity) {
     ImageFs imageFs = ImageFs.find(activity);
-    if (!imageFs.isValid() || imageFs.getVersion() < LATEST_VERSION) installFromAssets(activity);
+    if (!imageFs.isUpToDate()) installFromAssets(activity);
   }
 
   /**
@@ -173,82 +316,7 @@ public static void installIfNeeded(final android.app.Activity activity) {
    */
   public static void installIfNeededFromAny(final android.app.Activity activity) {
     ImageFs imageFs = ImageFs.find(activity);
-    if (imageFs.isValid() && imageFs.getVersion() >= LATEST_VERSION) return;
-
-    final DownloadProgressDialog dialog = new DownloadProgressDialog(activity);
-    activity.runOnUiThread(() -> dialog.show(R.string.setup_wizard_installing_system_files));
-
-    File rootDir = imageFs.getRootDir();
-    Executors.newSingleThreadExecutor()
-        .execute(
-            () -> {
-              clearRootDir(rootDir);
-              final byte compressionRatio = 22;
-              final long contentLength =
-                  (long) (FileUtils.getSize(activity, "imagefs.txz") * (100.0f / compressionRatio));
-              AtomicLong totalSizeRef = new AtomicLong();
-
-              boolean success =
-                  TarCompressorUtils.extract(
-                      TarCompressorUtils.Type.XZ,
-                      activity,
-                      "imagefs.txz",
-                      rootDir,
-                      (file, size) -> {
-                        if (size > 0) {
-                          long totalSize = totalSizeRef.addAndGet(size);
-                          final int progress = (int) (((float) totalSize / contentLength) * 100);
-                          activity.runOnUiThread(() -> dialog.setProgress(progress));
-                        }
-                        return file;
-                      });
-
-              if (success) {
-                ExecutorService pool = Executors.newFixedThreadPool(2);
-                CountDownLatch latch = new CountDownLatch(2);
-                pool.execute(
-                    () -> {
-                      try {
-                        String[] versions =
-                            activity.getResources().getStringArray(R.array.wine_entries);
-                        for (String version : versions) {
-                          File outFile = new File(rootDir, "/opt/" + version);
-                          outFile.mkdirs();
-                          TarCompressorUtils.extract(
-                              TarCompressorUtils.Type.XZ, activity, version + ".txz", outFile);
-                        }
-                      } catch (Exception e) {
-                        /* wine assets may not exist */
-                      } finally {
-                        latch.countDown();
-                      }
-                    });
-                pool.execute(
-                    () -> {
-                      try {
-                        installGuestExtras(activity, rootDir);
-                      } finally {
-                        latch.countDown();
-                      }
-                    });
-                try {
-                  latch.await();
-                } catch (InterruptedException ignored) {
-                }
-                pool.shutdown();
-                clearSteamDllMarkers(activity);
-                imageFs.createImgVersionFile(LATEST_VERSION);
-              } else {
-                activity.runOnUiThread(
-                    () ->
-                        WinToast.show(
-                            activity,
-                            R.string.setup_wizard_unable_to_install_system_files,
-                            android.widget.Toast.LENGTH_LONG));
-              }
-
-              dialog.closeOnUiThread();
-            });
+    if (!imageFs.isUpToDate()) installFromAssets(activity);
   }
 
   private static void clearOptDir(File optDir) {
@@ -279,8 +347,14 @@ private static void clearRootDir(File rootDir) {
   }
 
   private static void installGuestExtras(Context context, File rootDir) {
+    installGuestExtras(context, rootDir, null);
+  }
+
+  private static void installGuestExtras(
+      Context context, File rootDir, OnExtractFileListener listener) {
     try {
-      TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, context, "redirect.tzst", rootDir);
+      TarCompressorUtils.extract(
+          TarCompressorUtils.Type.ZSTD, context, "redirect.tzst", rootDir, listener);
     } catch (Exception e) {
       Log.w(
           "ImageFsInstaller",
@@ -288,7 +362,8 @@ private static void installGuestExtras(Context context, File rootDir) {
     }
 
     try {
-      TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, context, "extras.tzst", rootDir);
+      TarCompressorUtils.extract(
+          TarCompressorUtils.Type.ZSTD, context, "extras.tzst", rootDir, listener);
     } catch (Exception e) {
       Log.w(
           "ImageFsInstaller",
@@ -320,6 +395,63 @@ private static void chmodIfExists(File file) {
     }
   }
 
+  private static boolean waitForExtractions(List<Future<Boolean>> futures) {
+    boolean success = true;
+    for (Future<Boolean> future : futures) {
+      success &= waitForExtraction(future);
+    }
+    return success;
+  }
+
+  private static boolean waitForExtraction(Future<Boolean> future) {
+    try {
+      return Boolean.TRUE.equals(future.get());
+    } catch (Exception e) {
+      Log.e("ImageFsInstaller", "Async extraction failed", e);
+      return false;
+    }
+  }
+
+  private static boolean extractImageFs(
+      android.app.Activity activity, File rootDir, OnExtractFileListener listener) {
+    String[] shards = listImageFsShards(activity);
+    if (shards.length == 0) {
+      return waitForExtraction(
+          TarCompressorUtils.extractAsync(
+              IMAGEFS_ARCHIVE_TYPE, activity, IMAGEFS_ARCHIVE, rootDir, listener));
+    }
+    int threads = Math.max(2, Math.min(shards.length, Runtime.getRuntime().availableProcessors()));
+    ExecutorService pool = Executors.newFixedThreadPool(threads);
+    try {
+      List<Future<Boolean>> futures = new ArrayList<>();
+      for (String shard : shards) {
+        futures.add(
+            pool.submit(
+                () ->
+                    TarCompressorUtils.extract(
+                        IMAGEFS_ARCHIVE_TYPE, activity, shard, rootDir, listener)));
+      }
+      return waitForExtractions(futures);
+    } finally {
+      pool.shutdown();
+    }
+  }
+
+  private static String[] listImageFsShards(Context context) {
+    List<String> shards = new ArrayList<>();
+    try {
+      String[] names = context.getAssets().list("");
+      if (names != null) {
+        for (String name : names) {
+          if (name.startsWith("imagefs.part") && name.endsWith(".tzst")) shards.add(name);
+        }
+      }
+    } catch (Exception e) {
+      Log.e("ImageFsInstaller", "Failed to list imagefs shards", e);
+    }
+    return shards.toArray(new String[0]);
+  }
+
   /**
    * Remove Steam DLL state markers after reinstalling ImageFS so future launches re-apply
    * replacements when needed.
diff --git a/app/src/main/runtime/display/environment/XEnvironment.java b/app/src/main/runtime/display/environment/XEnvironment.java
index 035336613..ea34ccd1c 100644
--- a/app/src/main/runtime/display/environment/XEnvironment.java
+++ b/app/src/main/runtime/display/environment/XEnvironment.java
@@ -2,15 +2,20 @@
 
 import android.content.Context;
 import android.util.Log;
+import com.winlator.cmod.runtime.audio.alsaserver.ALSAClient;
 import com.winlator.cmod.runtime.display.environment.components.GuestProgramLauncherComponent;
+import com.winlator.cmod.runtime.display.environment.components.PulseAudioComponent;
 import com.winlator.cmod.shared.io.FileUtils;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 public class XEnvironment implements Iterable<EnvironmentComponent> {
   private static final String TAG = "XEnvironment";
-  private final Context context;
+  private Context context;
   private final ImageFs imageFs;
   private final ArrayList<EnvironmentComponent> components = new ArrayList<>();
 
@@ -23,6 +28,10 @@ public Context getContext() {
     return context;
   }
 
+  public void setContext(Context context) {
+    this.context = context;
+  }
+
   public ImageFs getImageFs() {
     return imageFs;
   }
@@ -56,9 +65,47 @@ public File getTmpDir() {
   public void startEnvironmentComponents() {
     FileUtils.clear(getTmpDir());
     Log.d(TAG, "Starting " + components.size() + " environment component(s)");
-    for (EnvironmentComponent environmentComponent : this) {
-      Log.d(TAG, "Starting component " + environmentComponent.getClass().getSimpleName());
-      environmentComponent.start();
+
+    // GuestProgramLauncherComponent forks the game process and reads every
+    // other component's sockets/state — it must start LAST and remain serial.
+    // Every preceding component (XServer, audio, shm, network info, Steam
+    // client) is a self-contained service; start them in parallel.
+    ArrayList<EnvironmentComponent> parallelStart = new ArrayList<>();
+    EnvironmentComponent launcher = null;
+    for (EnvironmentComponent c : components) {
+      if (c instanceof GuestProgramLauncherComponent) {
+        launcher = c;
+      } else {
+        parallelStart.add(c);
+      }
+    }
+
+    if (parallelStart.size() <= 1) {
+      for (EnvironmentComponent c : parallelStart) {
+        Log.d(TAG, "Starting component " + c.getClass().getSimpleName());
+        c.start();
+      }
+    } else {
+      ExecutorService pool = Executors.newFixedThreadPool(parallelStart.size());
+      ArrayList<Future<?>> futures = new ArrayList<>(parallelStart.size());
+      for (EnvironmentComponent c : parallelStart) {
+        final EnvironmentComponent comp = c;
+        futures.add(pool.submit(() -> {
+          Log.d(TAG, "Starting component " + comp.getClass().getSimpleName());
+          comp.start();
+        }));
+      }
+      pool.shutdown();
+      for (Future<?> f : futures) {
+        try { f.get(); } catch (Throwable t) {
+          Log.e(TAG, "Component start failed", t);
+        }
+      }
+    }
+
+    if (launcher != null) {
+      Log.d(TAG, "Starting component " + launcher.getClass().getSimpleName());
+      launcher.start();
     }
     Log.d(TAG, "Environment component startup finished");
   }
@@ -87,14 +134,14 @@ public void stopEnvironmentComponents() {
   }
 
   public void onPause() {
-    GuestProgramLauncherComponent guestProgramLauncherComponent =
-        getComponent(GuestProgramLauncherComponent.class);
-    if (guestProgramLauncherComponent != null) guestProgramLauncherComponent.suspendProcess();
+    ALSAClient.setOutputSuspended(true);
+    PulseAudioComponent pulseAudio = getComponent(PulseAudioComponent.class);
+    if (pulseAudio != null) pulseAudio.suspend();
   }
 
   public void onResume() {
-    GuestProgramLauncherComponent guestProgramLauncherComponent =
-        getComponent(GuestProgramLauncherComponent.class);
-    if (guestProgramLauncherComponent != null) guestProgramLauncherComponent.resumeProcess();
+    PulseAudioComponent pulseAudio = getComponent(PulseAudioComponent.class);
+    if (pulseAudio != null) pulseAudio.resume();
+    ALSAClient.setOutputSuspended(false);
   }
 }
diff --git a/app/src/main/runtime/display/environment/components/GuestProgramLauncherComponent.java b/app/src/main/runtime/display/environment/components/GuestProgramLauncherComponent.java
index 47e41c5a5..0e3e76f15 100644
--- a/app/src/main/runtime/display/environment/components/GuestProgramLauncherComponent.java
+++ b/app/src/main/runtime/display/environment/components/GuestProgramLauncherComponent.java
@@ -27,28 +27,35 @@
 import com.winlator.cmod.shared.util.Callback;
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class GuestProgramLauncherComponent extends EnvironmentComponent {
+  private static final String TAG = "GuestProgramLauncherComponent";
+  private static final String DEPENDENCY_LOG_TAG = "CurlDeps";
+  private static final long DEPENDENCY_CHECK_TIMEOUT_MS = 1500L;
+  private static final Object lock = new Object();
+  private static final AtomicBoolean dependencyCheckScheduled = new AtomicBoolean(false);
   private String guestExecutable;
   private int pid = -1;
+  private int launchGeneration = 0;
   private String[] bindingPaths;
   private EnvVars envVars;
   private WineInfo wineInfo;
   private String box64Preset = Box64Preset.PERFORMANCE;
-  private String fexcorePreset = FEXCorePreset.PERFORMANCE;
+  private String fexcorePreset = FEXCorePreset.PERFORMANCE_TSO;
   private Callback<Integer> terminationCallback;
-  private static final Object lock = new Object();
   private final ContentsManager contentsManager;
   private final ContentProfile wineProfile;
   private Container container;
   private final Shortcut shortcut;
   private File workingDir;
-  private String steamType = Container.STEAM_TYPE_NORMAL;
   private Runnable preUnpackCallback;
+  private boolean fexUnixLibsActive = false;
 
   public static File ensureImageFsNativeLibrary(
       Context context, ImageFs imageFs, String libraryName) {
@@ -143,28 +150,6 @@ public void setContainer(Container container) {
     this.container = container;
   }
 
-  public String getSteamType() {
-    return steamType;
-  }
-
-  public void setSteamType(String steamType) {
-    if (steamType == null) {
-      this.steamType = Container.STEAM_TYPE_NORMAL;
-      return;
-    }
-    String normalized = steamType.toLowerCase();
-    switch (normalized) {
-      case Container.STEAM_TYPE_LIGHT:
-        this.steamType = Container.STEAM_TYPE_LIGHT;
-        break;
-      case Container.STEAM_TYPE_ULTRALIGHT:
-        this.steamType = Container.STEAM_TYPE_ULTRALIGHT;
-        break;
-      default:
-        this.steamType = Container.STEAM_TYPE_NORMAL;
-    }
-  }
-
   public String execShellCommand(String command) {
     return execShellCommand(command, true);
   }
@@ -236,7 +221,7 @@ public String execShellCommand(String command, boolean includeStderr) {
       envVars.put("LD_PRELOAD", ldPreload.toString());
       Log.d("GuestLauncher", "execShellCommand LD_PRELOAD=" + ldPreload.toString());
     }
-    envVars.put("WINEESYNC_WINLATOR", "1");
+    if (!"1".equals(envVars.get("PROTON_NO_ESYNC"))) envVars.put("WINEESYNC_WINLATOR", "1");
     mergeExternalEnvVars(
         envVars,
         envVars.get("LD_PRELOAD"),
@@ -268,27 +253,54 @@ public String execShellCommand(String command, boolean includeStderr) {
     }
     try {
       Log.d("GuestProgramLauncherComponent", "Shell command is " + finalCommand);
-      java.lang.Process process =
+      final java.lang.Process process =
           Runtime.getRuntime()
               .exec(
                   finalCommand,
                   envVars.toStringArray(),
                   workingDir != null ? workingDir : imageFs.getRootDir());
+
+      // stderr MUST be drained concurrently with stdout. Wine emits a steady
+      // stream of `fixme:`/`err:` lines; if nothing reads stderr, the kernel
+      // pipe buffer (64 KiB) fills and the child blocks forever on its next
+      // stderr write — even if we're only interested in stdout. Sequential
+      // "drain stdout, then stderr" deadlocks the same way, just less often.
+      final boolean captureStderr = includeStderr;
+      Thread stderrPump =
+          new Thread(
+              () -> {
+                try (BufferedReader er =
+                    new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+                  String l;
+                  while ((l = er.readLine()) != null) {
+                    if (captureStderr) {
+                      synchronized (output) {
+                        output.append(l).append('\n');
+                      }
+                    }
+                  }
+                } catch (IOException ignored) {
+                  // child closed stderr or we were interrupted — both are fine
+                }
+              },
+              "execShellCommand-stderr-pump");
+      stderrPump.setDaemon(true);
+      stderrPump.start();
+
       try (BufferedReader reader =
-              new BufferedReader(new InputStreamReader(process.getInputStream()));
-          BufferedReader errorReader =
-              new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+          new BufferedReader(new InputStreamReader(process.getInputStream()))) {
         String line;
         while ((line = reader.readLine()) != null) {
-          output.append(line).append("\n");
-        }
-        if (includeStderr) {
-          while ((line = errorReader.readLine()) != null) {
-            output.append(line).append("\n");
+          synchronized (output) {
+            output.append(line).append('\n');
           }
         }
       }
       process.waitFor();
+      // Stderr pump exits on its own when the child closes its stderr fd
+      // (which happens at process exit). Give it a brief grace period to
+      // append any tail lines before we return.
+      stderrPump.join(200);
     } catch (Exception e) {
       output.append("Error: ").append(e.getMessage());
     }
@@ -303,14 +315,14 @@ private void extractBox64Files() {
     String box64Version = container.getBox64Version();
     if (box64Version == null) box64Version = "";
 
-    if (shortcut != null) box64Version = shortcut.getExtra("box64Version", box64Version);
+    if (shortcut != null) box64Version = shortcut.getSettingExtra("box64Version", box64Version);
 
     Log.i(
         "GuestProgramLauncherComponent",
         "Launch runtime selected: Box64 version=" + box64Version);
 
     File rootDir = imageFs.getRootDir();
-    boolean box64Missing = !new File(rootDir, "/usr/bin/box64").exists();
+    boolean box64Missing = !new File(rootDir, "usr/bin/box64").exists();
 
     if (box64Missing || !box64Version.equals(container.getExtra("box64Version"))) {
       if (box64Version.isEmpty()) {
@@ -338,7 +350,7 @@ private void extractBox64Files() {
     }
 
     // Set execute permissions for box64 just in case
-    File box64File = new File(rootDir, "/usr/bin/box64");
+    File box64File = new File(rootDir, "usr/bin/box64");
     if (box64File.exists()) {
       FileUtils.chmod(box64File, 0755);
     }
@@ -360,11 +372,13 @@ private void extractEmulatorsDlls() {
     if (wowbox64Version == null) wowbox64Version = "";
     if (fexcoreVersion == null) fexcoreVersion = "";
 
+    boolean unixLibsPref = container.isUseUnixLibs();
     if (shortcut != null) {
-      emulator = shortcut.getExtra("emulator", emulator);
-      emulator64 = shortcut.getExtra("emulator64", emulator64);
-      wowbox64Version = shortcut.getExtra("box64Version", wowbox64Version);
-      fexcoreVersion = shortcut.getExtra("fexcoreVersion", fexcoreVersion);
+      emulator = shortcut.getSettingExtra("emulator", emulator);
+      emulator64 = shortcut.getSettingExtra("emulator64", emulator64);
+      wowbox64Version = shortcut.getSettingExtra("box64Version", wowbox64Version);
+      fexcoreVersion = shortcut.getSettingExtra("fexcoreVersion", fexcoreVersion);
+      unixLibsPref = "1".equals(shortcut.getSettingExtra("useUnixLibs", unixLibsPref ? "1" : "0"));
     }
 
     boolean usesWowbox64 = emulator.equalsIgnoreCase("wowbox64");
@@ -373,6 +387,9 @@ private void extractEmulatorsDlls() {
             || emulator64.equalsIgnoreCase("fexcore")
             || !usesWowbox64;
 
+    fexUnixLibsActive =
+        usesFexcore && unixLibsPref && contentsManager.fexcoreVersionHasUnixLibs(fexcoreVersion);
+
     Log.i(
         "GuestProgramLauncherComponent",
         "Launch runtime selected: emulator="
@@ -428,30 +445,44 @@ private void extractEmulatorsDlls() {
           "WowBox64 already loaded for launch: version=" + wowbox64Version);
     }
 
-    if (usesFexcore
-        && (fexcoreDllsMissing || !fexcoreVersion.equals(container.getExtra("fexcoreVersion")))) {
-      if (fexcoreVersion.isEmpty()) {
-        Log.w("GuestProgramLauncherComponent", "No FEXCore version selected; skipping content extraction");
-      } else {
-        ContentProfile profile = contentsManager.getProfileByEntryName("fexcore-" + fexcoreVersion);
-        if (profile != null) {
+    if (usesFexcore) {
+      ContentProfile profile =
+          fexcoreVersion.isEmpty() ? null : contentsManager.getProfileByEntryName("fexcore-" + fexcoreVersion);
+      String wantMode = fexUnixLibsActive ? "unixlibs" : "dll";
+      boolean modeChanged = !wantMode.equals(container.getExtra("fexcoreMode"));
+      boolean versionChanged = !fexcoreVersion.equals(container.getExtra("fexcoreVersion"));
+      boolean needsExtraction =
+          versionChanged || modeChanged || (!fexUnixLibsActive && fexcoreDllsMissing);
+
+      if (needsExtraction) {
+        if (fexcoreVersion.isEmpty()) {
+          Log.w("GuestProgramLauncherComponent", "No FEXCore version selected; skipping content extraction");
+        } else if (profile != null) {
           Log.i(
               "GuestProgramLauncherComponent",
-              "Loading FEXCore content profile: version=" + fexcoreVersion);
+              "Loading FEXCore content profile: version=" + fexcoreVersion + " mode=" + wantMode);
           contentsManager.applyContent(profile);
+          if (!fexUnixLibsActive) contentsManager.removeAppliedUnixLibs(profile);
         } else {
           Log.w(
               "GuestProgramLauncherComponent",
               "FEXCore content profile not installed; no bundled FEXCore archive will be loaded: version="
                   + fexcoreVersion);
         }
+        container.putExtra("fexcoreVersion", fexcoreVersion);
+        container.putExtra("fexcoreMode", wantMode);
+        containerDataChanged = true;
+      } else {
+        Log.i(
+            "GuestProgramLauncherComponent",
+            "FEXCore already loaded for launch: version=" + fexcoreVersion + " mode=" + wantMode);
+      }
+
+      if (profile != null) {
+        File wineUnixDir = new File(environment.getImageFs().getWinePath(), "lib/wine/aarch64-unix");
+        if (fexUnixLibsActive) contentsManager.copyUnixLibsToDir(profile, wineUnixDir);
+        else contentsManager.deleteUnixLibsFromDir(profile, wineUnixDir);
       }
-      container.putExtra("fexcoreVersion", fexcoreVersion);
-      containerDataChanged = true;
-    } else if (usesFexcore) {
-      Log.i(
-          "GuestProgramLauncherComponent",
-          "FEXCore already loaded for launch: version=" + fexcoreVersion);
     }
     if (containerDataChanged) container.saveData();
   }
@@ -478,78 +509,143 @@ private int getConfiguredControllerCount() {
   @Override
   public void start() {
     synchronized (lock) {
+      long startTime = System.currentTimeMillis();
       if (wineInfo.isArm64EC()) {
         extractEmulatorsDlls();
       } else extractBox64Files();
       copyDefaultBox64RCFile();
-      checkDependencies();
+      scheduleDependencyCheck();
 
       // Run Steamless DRM stripping if configured (must happen after box64 is ready
       // but before the game exe is launched)
       if (preUnpackCallback != null) {
         try {
-          Log.d(
-              "GuestProgramLauncherComponent",
-              "Running preUnpack callback (Steamless DRM stripping)");
+          Log.d(TAG, "Running preUnpack callback (Steamless DRM stripping)");
           preUnpackCallback.run();
         } catch (Exception e) {
-          Log.e("GuestProgramLauncherComponent", "preUnpack callback failed", e);
+          Log.e(TAG, "preUnpack callback failed", e);
         }
       }
 
+      launchGeneration++;
       pid = execGuestProgram();
-      Log.d("GuestProgramLauncherComponent", "Guest process started with pid=" + pid);
+      Log.d(
+          TAG,
+          "Guest process started with pid="
+              + pid
+              + " after launch prep "
+              + (System.currentTimeMillis() - startTime)
+              + "ms");
     }
   }
 
+  private void scheduleDependencyCheck() {
+    if (!dependencyCheckScheduled.compareAndSet(false, true)) return;
+
+    Thread thread =
+        new Thread(
+            () -> Log.d(DEPENDENCY_LOG_TAG, checkDependencies()),
+            "GuestDependencyCheck");
+    thread.setDaemon(true);
+    thread.start();
+  }
+
   private void copyDefaultBox64RCFile() {
     Context context = environment.getContext();
     ImageFs imageFs = ImageFs.find(context);
     File rootDir = imageFs.getRootDir();
-    String assetPath;
-    switch (steamType) {
-      case Container.STEAM_TYPE_LIGHT:
-        assetPath = "box86_64/lightsteam.box64rc";
-        break;
-      case Container.STEAM_TYPE_ULTRALIGHT:
-        assetPath = "box86_64/ultralightsteam.box64rc";
-        break;
-      default:
-        assetPath = "box86_64/default.box64rc";
-        break;
-    }
+    String assetPath = "box86_64/default.box64rc";
     FileUtils.copy(context, assetPath, new File(rootDir, "/etc/config.box64rc"));
   }
 
   private String checkDependencies() {
     String curlPath = environment.getImageFs().getRootDir().getPath() + "/usr/lib/libXau.so";
-    String lddCommand = "ldd " + curlPath;
-
     StringBuilder output = new StringBuilder("Checking Curl dependencies...\n");
+    java.lang.Process process = null;
+    Thread stdoutPump = null;
+    Thread stderrPump = null;
 
     try {
-      java.lang.Process process = Runtime.getRuntime().exec(lddCommand);
-      try (BufferedReader reader =
-              new BufferedReader(new InputStreamReader(process.getInputStream()));
-          BufferedReader errorReader =
-              new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
-        String line;
-        while ((line = reader.readLine()) != null) {
-          output.append(line).append("\n");
-        }
-        while ((line = errorReader.readLine()) != null) {
-          output.append(line).append("\n");
+      process = Runtime.getRuntime().exec(new String[] {"ldd", curlPath});
+      stdoutPump = createDependencyPump(process.getInputStream(), output);
+      stderrPump = createDependencyPump(process.getErrorStream(), output);
+
+      stdoutPump.start();
+      stderrPump.start();
+
+      long deadline = System.currentTimeMillis() + DEPENDENCY_CHECK_TIMEOUT_MS;
+      while (true) {
+        try {
+          int exitCode = process.exitValue();
+          synchronized (output) {
+            output.append("ldd exit code: ").append(exitCode).append("\n");
+          }
+          break;
+        } catch (IllegalThreadStateException ignored) {
+          if (System.currentTimeMillis() >= deadline) {
+            synchronized (output) {
+              output
+                  .append("Timed out after ")
+                  .append(DEPENDENCY_CHECK_TIMEOUT_MS)
+                  .append("ms; skipping blocking dependency probe\n");
+            }
+            process.destroy();
+            break;
+          }
+
+          try {
+            Thread.sleep(50L);
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            synchronized (output) {
+              output.append("Dependency probe interrupted\n");
+            }
+            process.destroy();
+            break;
+          }
         }
       }
-      process.waitFor();
     } catch (Exception e) {
       output.append("Error running ldd: ").append(e.getMessage());
+    } finally {
+      joinDependencyPump(stdoutPump);
+      joinDependencyPump(stderrPump);
     }
 
-    Log.d("CurlDeps", output.toString()); // Log the full dependency output
     return output.toString();
   }
 
+  private Thread createDependencyPump(InputStream stream, StringBuilder output) {
+    Thread pump =
+        new Thread(
+            () -> {
+              try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                  synchronized (output) {
+                    output.append(line).append("\n");
+                  }
+                }
+              } catch (IOException e) {
+                synchronized (output) {
+                  output.append("Error reading dependency output: ").append(e.getMessage()).append("\n");
+                }
+              }
+            },
+            "GuestDependencyPump");
+    pump.setDaemon(true);
+    return pump;
+  }
+
+  private void joinDependencyPump(Thread pump) {
+    if (pump == null) return;
+    try {
+      pump.join(200L);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+    }
+  }
+
   @Override
   public void stop() {
     synchronized (lock) {
@@ -560,6 +656,7 @@ public void stop() {
       } else {
         Log.d("GuestProgramLauncherComponent", "Stop requested with no tracked guest process");
       }
+      dependencyCheckScheduled.set(false);
     }
   }
 
@@ -624,6 +721,15 @@ private static String mergePreloadValue(String baseValue, String overrideValue)
     return baseValue + ":" + overrideValue;
   }
 
+  private static String appendFirstExistingPreload(String ldPreload, File[] candidates) {
+    for (File candidate : candidates) {
+      if (candidate.exists()) {
+        return mergePreloadValue(ldPreload, candidate.getAbsolutePath());
+      }
+    }
+    return ldPreload;
+  }
+
   private void mergeExternalEnvVars(
       EnvVars envVars,
       String protectedLdPreload,
@@ -751,12 +857,17 @@ private void prepareFakeInputUdevMetadata(ImageFs imageFs, File devInputDir, Env
   }
 
   private int execGuestProgram() {
+    final int gen = launchGeneration;
     Context context = environment.getContext();
     ImageFs imageFs = environment.getImageFs();
     File rootDir = imageFs.getRootDir();
 
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-    boolean enableBox64Logs = preferences.getBoolean("enable_box64_logs", false);
+    boolean emulatorLogs = preferences.getBoolean("enable_emulator_logs", false);
+    boolean fexLogActive = wineInfo != null && wineInfo.isArm64EC()
+        && (container == null || !"wowbox64".equalsIgnoreCase(container.getEmulator()));
+    boolean enableBox64Logs = emulatorLogs && !fexLogActive;
+    boolean enableFexcoreLogs = emulatorLogs && fexLogActive;
     boolean openWithAndroidBrowser = preferences.getBoolean("open_with_android_browser", false);
     boolean shareAndroidClipboard = preferences.getBoolean("share_android_clipboard", false);
 
@@ -771,6 +882,13 @@ private int execGuestProgram() {
     addBox64EnvVars(envVars, enableBox64Logs);
     envVars.putAll(FEXCorePresetManager.getEnvVars(context, fexcorePreset));
 
+    if (enableFexcoreLogs) {
+      // FEXCore is silent by default. Enable logging to stderr so its output is
+      // captured by the in-game logs pane and the per-session fexcore_*.txt log.
+      envVars.put("FEX_SILENTLOG", "0");
+      envVars.put("FEX_OUTPUTLOG", "stderr");
+    }
+
     String renderer = GPUInformation.getRenderer(null, null);
 
     if (renderer.contains("Mali")) envVars.put("BOX64_MMAP32", "0");
@@ -830,19 +948,73 @@ private int execGuestProgram() {
     envVars.put("ANDROID_SYSVSHM_SERVER", rootDir.getPath() + UnixSocketConfig.SYSVSHM_SERVER_PATH);
 
     String primaryDNS = "8.8.4.4";
-    ConnectivityManager connectivityManager =
-        (ConnectivityManager) context.getSystemService(Service.CONNECTIVITY_SERVICE);
-    if (connectivityManager.getActiveNetwork() != null) {
-      ArrayList<InetAddress> dnsServers =
-          new ArrayList<>(
-              connectivityManager
-                  .getLinkProperties(connectivityManager.getActiveNetwork())
-                  .getDnsServers());
-      primaryDNS = dnsServers.get(0).toString().substring(1);
+    java.util.List<String> orderedDns = new java.util.ArrayList<>();
+    try {
+      ConnectivityManager connectivityManager =
+          (ConnectivityManager) context.getSystemService(Service.CONNECTIVITY_SERVICE);
+      android.net.Network activeNetwork =
+          connectivityManager != null ? connectivityManager.getActiveNetwork() : null;
+      android.net.LinkProperties linkProps =
+          activeNetwork != null ? connectivityManager.getLinkProperties(activeNetwork) : null;
+      java.util.List<InetAddress> dnsServers =
+          linkProps != null ? linkProps.getDnsServers() : null;
+      if (dnsServers != null && !dnsServers.isEmpty()) {
+        for (InetAddress dns : dnsServers) {
+          if (dns instanceof java.net.Inet4Address) {
+            String a = dns.getHostAddress();
+            if (a != null && !a.isEmpty()) orderedDns.add(a);
+          }
+        }
+        for (InetAddress dns : dnsServers) {
+          if (!(dns instanceof java.net.Inet4Address)) {
+            String a = dns.getHostAddress();
+            if (a != null && !a.isEmpty()) {
+              int pct = a.indexOf('%');
+              if (pct >= 0) a = a.substring(0, pct);
+              orderedDns.add(a);
+            }
+          }
+        }
+        if (!orderedDns.isEmpty()) primaryDNS = orderedDns.get(0);
+      }
+    } catch (Exception e) {
+      Log.w("GuestLauncher", "DNS capture failed, using fallback " + primaryDNS, e);
+    }
+    if (orderedDns.isEmpty()) {
+      orderedDns.add("8.8.4.4");
+      orderedDns.add("1.1.1.1");
     }
     envVars.put("ANDROID_RESOLV_DNS", primaryDNS);
     envVars.put("WINE_NEW_NDIS", "1");
 
+    // Refresh /usr/etc/resolv.conf and /usr/etc/hosts on every launch.
+    // The shipped imagefs ships stale DNS and a broken localhost mapping; rewrite
+    // them here so Linux-side tools inside the prefix (curl, openssl, busybox) and
+    // anything else that consults hosts/resolv.conf see the correct values.
+    try {
+      File etcDir = imageFs.getEtcDir();
+      if (etcDir.isDirectory() || etcDir.mkdirs()) {
+        StringBuilder resolv = new StringBuilder();
+        resolv.append("# Generated at launch by WinNative from Android DNS.\n");
+        for (String dns : orderedDns) {
+          resolv.append("nameserver ").append(dns).append('\n');
+        }
+        resolv.append("options edns0 timeout:2 attempts:2\n");
+        FileUtils.writeString(new File(etcDir, "resolv.conf"), resolv.toString());
+
+        FileUtils.writeString(
+            new File(etcDir, "hosts"),
+            "127.0.0.1\tlocalhost\n"
+                + "::1\t\tlocalhost ip6-localhost ip6-loopback\n"
+                + "fe00::0\t\tip6-localnet\n"
+                + "ff00::0\t\tip6-mcastprefix\n"
+                + "ff02::1\t\tip6-allnodes\n"
+                + "ff02::2\t\tip6-allrouters\n");
+      }
+    } catch (Exception e) {
+      Log.w("GuestLauncher", "Failed to refresh resolv.conf/hosts in imagefs", e);
+    }
+
     String ld_preload;
     if (!new File(imageFs.getLibDir(), "libandroid-sysvshm.so").exists()) {
       ld_preload = "";
@@ -855,20 +1027,20 @@ private int execGuestProgram() {
     Log.d("GuestLauncher", "nativeLibDir: " + nativeLibDir);
     Log.d("GuestLauncher", "fakeinputSrc exists: " + fakeinputSrc.exists());
     Log.d("GuestLauncher", "fakeinputDest: " + fakeinputDest.getAbsolutePath());
-    if (!fakeinputDest.exists()) {
-      try {
-        if (fakeinputSrc.exists()) {
-          FileUtils.copy(fakeinputSrc, fakeinputDest);
-          Log.d("GuestLauncher", "Copied libfakeinput.so to imagefs");
-        } else {
-          Log.e(
-              "GuestLauncher",
-              "libfakeinput.so NOT FOUND in APK: " + fakeinputSrc.getAbsolutePath());
-        }
-      } catch (Exception e) {
-        Log.e("GuestLauncher", "Failed to copy libfakeinput.so: " + e.getMessage());
-        e.printStackTrace();
+    try {
+      if (fakeinputSrc.exists()) {
+        // Refresh every launch so the guest reader can never skew from the
+        // app-side ring writer (a same-size rebuild defeats length checks).
+        FileUtils.copy(fakeinputSrc, fakeinputDest);
+        Log.d("GuestLauncher", "Copied libfakeinput.so to imagefs");
+      } else if (!fakeinputDest.exists()) {
+        Log.e(
+            "GuestLauncher",
+            "libfakeinput.so NOT FOUND in APK: " + fakeinputSrc.getAbsolutePath());
       }
+    } catch (Exception e) {
+      Log.e("GuestLauncher", "Failed to copy libfakeinput.so: " + e.getMessage());
+      e.printStackTrace();
     }
     Log.d("GuestLauncher", "fakeinputDest exists after copy: " + fakeinputDest.exists());
 
@@ -889,27 +1061,21 @@ private int execGuestProgram() {
       ld_preload = ld_preload + fakeinputDest.getAbsolutePath();
     }
 
-    // Samsung and some other OEMs ship a Vulkan ICD dep chain ending in
-    // /system_ext/lib64/libvendorutils.so that references OpenSSL's BIO_flush.
-    // Without libcrypto already mapped, vkCreateInstance fails with res=-9 and
-    // DXVK aborts with "Required Vulkan extension VK_KHR_surface not supported".
-    //
-    // Only /system and /system_ext are in the default linker namespace's
-    // permitted_paths; the conscrypt APEX is not, so preloading from it
-    // blocks the whole execve with a linker namespace error. Fall back to
-    // the imagefs copy as a last resort.
+    // Preload OEM Vulkan ICD deps that otherwise fail lazy symbol resolution.
+    // Keep paths within default linker namespace permitted_paths.
+    File[] jpegCandidates = new File[] {
+        new File("/system/lib64/libjpeg.so"),
+        new File("/system_ext/lib64/libjpeg.so"),
+    };
+    ld_preload = appendFirstExistingPreload(ld_preload, jpegCandidates);
+
     File[] cryptoCandidates = new File[] {
         new File("/system/lib64/libcrypto.so"),
         new File("/system_ext/lib64/libcrypto.so"),
         new File(imageFs.getLibDir(), "libcrypto.so.3"),
     };
-    for (File c : cryptoCandidates) {
-      if (c.exists()) {
-        if (!ld_preload.isEmpty()) ld_preload = ld_preload + ":";
-        ld_preload = ld_preload + c.getAbsolutePath();
-        break;
-      }
-    }
+    ld_preload = appendFirstExistingPreload(ld_preload, cryptoCandidates);
+
 
     File devInputDir = new File(imageFs.getRootDir(), "dev/input");
     devInputDir.mkdirs();
@@ -944,14 +1110,14 @@ private int execGuestProgram() {
     String emulator = container.getEmulator();
     String emulator64 = container.getEmulator64();
     if (shortcut != null) {
-      emulator = shortcut.getExtra("emulator", container.getEmulator());
-      emulator64 = shortcut.getExtra("emulator64", container.getEmulator64());
+      emulator = shortcut.getSettingExtra("emulator", container.getEmulator());
+      emulator64 = shortcut.getSettingExtra("emulator64", container.getEmulator64());
     }
 
     if (wineInfo.isArm64EC()) {
       emulator64 = container.getEmulator64();
       if (shortcut != null) {
-        emulator64 = shortcut.getExtra("emulator64", container.getEmulator64());
+        emulator64 = shortcut.getSettingExtra("emulator64", container.getEmulator64());
       }
     }
 
@@ -1020,7 +1186,7 @@ private int execGuestProgram() {
         workingDir != null ? workingDir : rootDir,
         (status) -> {
           synchronized (lock) {
-            pid = -1;
+            if (gen == launchGeneration) pid = -1;
           }
 
           ProcessHelper.drainDeadChildren("guest process termination callback");
diff --git a/app/src/main/runtime/display/environment/components/NetworkHelper.java b/app/src/main/runtime/display/environment/components/NetworkHelper.java
new file mode 100644
index 000000000..6d69c3738
--- /dev/null
+++ b/app/src/main/runtime/display/environment/components/NetworkHelper.java
@@ -0,0 +1,106 @@
+package com.winlator.cmod.runtime.display.environment.components;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkInfo;
+import android.system.OsConstants;
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Exposes Android's active network addresses to Wine. Wine cannot enumerate
+ * Android interfaces directly, so NetworkInfoUpdateComponent writes these
+ * values into the prefix for iphlpapi/ws2_32.
+ */
+public class NetworkHelper {
+    private final ConnectivityManager connectivityManager;
+
+    public static class IFAddress {
+        public String name = "eth0";
+        public int flags = 0;
+        public int family = OsConstants.AF_INET;
+        public int scopeId = 0;
+        public String address = "0";
+        public String netmask = "0";
+
+        @Override
+        public String toString() {
+            return name + "," + flags + "," + family + "," + scopeId + "," + address + "," + netmask;
+        }
+    }
+
+    public NetworkHelper(Context context) {
+        this.connectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    }
+
+    public String getIPv4Address() {
+        if (!isConnected()) return null;
+        Network activeNetwork = connectivityManager.getActiveNetwork();
+        LinkProperties linkProperties = connectivityManager.getLinkProperties(activeNetwork);
+        if (linkProperties == null) return null;
+        for (LinkAddress linkAddress : linkProperties.getLinkAddresses()) {
+            InetAddress address = linkAddress.getAddress();
+            if (address instanceof Inet4Address) return address.getHostAddress();
+        }
+        return null;
+    }
+
+    public List<IFAddress> getIFAddresses() {
+        ArrayList<IFAddress> result = new ArrayList<>();
+        Network activeNetwork = connectivityManager.getActiveNetwork();
+        LinkProperties linkProperties =
+                activeNetwork != null ? connectivityManager.getLinkProperties(activeNetwork) : null;
+        if (linkProperties == null) return result;
+        for (LinkAddress linkAddress : linkProperties.getLinkAddresses()) {
+            InetAddress address = linkAddress.getAddress();
+            if ((address instanceof Inet4Address) || (address instanceof Inet6Address)) {
+                IFAddress ifAddress = new IFAddress();
+                if (address instanceof Inet6Address) {
+                    ifAddress.family = OsConstants.AF_INET6;
+                    ifAddress.scopeId = ((Inet6Address) address).getScopeId();
+                }
+                ifAddress.address = address.getHostAddress();
+                ifAddress.netmask = formatNetmask(linkAddress.getPrefixLength());
+                ifAddress.flags = OsConstants.IFF_UP | OsConstants.IFF_RUNNING;
+                result.add(ifAddress);
+            }
+        }
+        return result;
+    }
+
+    public static String formatIpAddress(int ipAddress) {
+        return (ipAddress & 255) + "." + ((ipAddress >> 8) & 255) + "."
+                + ((ipAddress >> 16) & 255) + "." + ((ipAddress >> 24) & 255);
+    }
+
+    public static String formatNetmask(int prefixLength) {
+        switch (prefixLength) {
+            case 8:  return "255.0.0.0";
+            case 16: return "255.255.0.0";
+            case 24: return "255.255.255.0";
+            case 32: return "255.255.255.255";
+            case 64: return "ffff:ffff:ffff:ffff::";
+            default: return "";
+        }
+    }
+
+    public boolean isConnected() {
+        NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+        if (networkInfo == null) return false;
+        int type = networkInfo.getType();
+        if (networkInfo.isAvailable() && networkInfo.isConnectedOrConnecting()) {
+            return type == ConnectivityManager.TYPE_WIFI
+                    || type == ConnectivityManager.TYPE_ETHERNET
+                    || type == ConnectivityManager.TYPE_MOBILE;
+        }
+        return false;
+    }
+}
diff --git a/app/src/main/runtime/display/environment/components/NetworkInfoUpdateComponent.java b/app/src/main/runtime/display/environment/components/NetworkInfoUpdateComponent.java
new file mode 100644
index 000000000..af2bdd529
--- /dev/null
+++ b/app/src/main/runtime/display/environment/components/NetworkInfoUpdateComponent.java
@@ -0,0 +1,77 @@
+package com.winlator.cmod.runtime.display.environment.components;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.util.Log;
+
+import com.winlator.cmod.runtime.display.environment.EnvironmentComponent;
+import com.winlator.cmod.shared.io.FileUtils;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Writes active Android network info into the Wine prefix. Wine reads
+ * {@code <tmpDir>/ifaddrs} because Android sandboxes direct interface
+ * enumeration. CONNECTIVITY_ACTION refreshes the files mid-session.
+ */
+public class NetworkInfoUpdateComponent extends EnvironmentComponent {
+    private static final String TAG = "NetworkInfoUpdateComponent";
+    private BroadcastReceiver broadcastReceiver;
+
+    @Override
+    public void start() {
+        Log.d(TAG, "Starting...");
+        Context context = environment.getContext();
+        final NetworkHelper networkHelper = new NetworkHelper(context);
+        updateIFAddrsFile(networkHelper.getIFAddresses());
+        updateEtcHostsFile(networkHelper.getIPv4Address());
+
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context ctx, Intent intent) {
+                updateIFAddrsFile(networkHelper.getIFAddresses());
+                updateEtcHostsFile(networkHelper.getIPv4Address());
+            }
+        };
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(broadcastReceiver, filter);
+    }
+
+    @Override
+    public void stop() {
+        Log.d(TAG, "Stopping...");
+        if (broadcastReceiver != null) {
+            try {
+                environment.getContext().unregisterReceiver(broadcastReceiver);
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to unregister broadcast receiver: " + e);
+            }
+            broadcastReceiver = null;
+        }
+    }
+
+    public void updateIFAddrsFile(List<NetworkHelper.IFAddress> ifAddresses) {
+        File file = new File(environment.getImageFs().getTmpDir(), "ifaddrs");
+        StringBuilder content = new StringBuilder();
+        if (!ifAddresses.isEmpty()) {
+            for (NetworkHelper.IFAddress ifAddress : ifAddresses) {
+                if (content.length() > 0) content.append("\n");
+                content.append(ifAddress.toString());
+            }
+        } else {
+            content.append(new NetworkHelper.IFAddress().toString());
+        }
+        FileUtils.writeString(file, content.toString());
+    }
+
+    public void updateEtcHostsFile(String ipAddress) {
+        String ip = ipAddress != null ? ipAddress : "127.0.0.1";
+        File file = new File(environment.getImageFs().getRootDir(), "etc/hosts");
+        FileUtils.writeString(file, ip + "\tlocalhost\n");
+    }
+}
diff --git a/app/src/main/runtime/display/environment/components/PulseAudioComponent.java b/app/src/main/runtime/display/environment/components/PulseAudioComponent.java
index d0662b5c0..e30cd7b47 100644
--- a/app/src/main/runtime/display/environment/components/PulseAudioComponent.java
+++ b/app/src/main/runtime/display/environment/components/PulseAudioComponent.java
@@ -1,112 +1,351 @@
 package com.winlator.cmod.runtime.display.environment.components;
 
 import android.content.Context;
-import android.os.Process;
+import android.util.Log;
 import com.winlator.cmod.runtime.display.connector.UnixSocketConfig;
 import com.winlator.cmod.runtime.display.environment.EnvironmentComponent;
 import com.winlator.cmod.runtime.system.ProcessHelper;
-import com.winlator.cmod.shared.android.AppUtils;
+import com.winlator.cmod.runtime.wine.EnvVars;
 import com.winlator.cmod.shared.io.FileUtils;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
+/**
+ * PulseAudio server management.
+ *
+ * <p>This mirrors the GameNative PulseAudio stack, which is the coherent, maintained build that
+ * reliably resumes audio after interruptions such as phone calls. The pieces that make resume work
+ * live in the native binaries, not here:
+ *
+ * <ul>
+ *   <li>{@code libpulseaudio.so} + the PulseAudio libs ship as jniLibs and run from
+ *       {@code nativeLibraryDir}.
+ *   <li>The {@code pulseaudio.tzst} asset provides a real {@code pactl} plus a minimal, matched
+ *       module set ({@code module-native-protocol-unix}, {@code module-aaudio-sink},
+ *       {@code libprotocol-native}). The {@code module-aaudio-sink} registers an AAudio error
+ *       callback and reopens its output stream when Android disconnects it during a call — the
+ *       actual recovery mechanism the previous build lacked.
+ * </ul>
+ *
+ * <p>Pause/resume simply suspend and un-suspend the sink via {@code pactl suspend-sink}; the module
+ * closes the AAudio device on suspend and reopens it on resume.
+ */
 public class PulseAudioComponent extends EnvironmentComponent {
+  private static final String TAG = "PulseAudioComponent";
+  private static final String SINK_NAME = "AAudioSink";
+
   private final UnixSocketConfig socketConfig;
-  private static int pid = -1;
+  private final Options options;
   private static final Object lock = new Object();
+  private boolean isPaused = false;
 
   public PulseAudioComponent(UnixSocketConfig socketConfig) {
+    this(socketConfig, new Options());
+  }
+
+  public PulseAudioComponent(UnixSocketConfig socketConfig, Options options) {
     this.socketConfig = socketConfig;
+    this.options = options != null ? options : new Options();
+  }
+
+  public static class Options {
+    public static final int DEFAULT_LATENCY_MILLIS = 40;
+    public static final int DEFAULT_FRAGMENT_MILLIS = 10;
+    public static final int DEFAULT_SAMPLE_RATE = 48000;
+    public static final int DEFAULT_ALTERNATE_SAMPLE_RATE = 44100;
+    public static final int DEFAULT_CHANNELS = 2;
+    public static final float DEFAULT_VOLUME = 1.0f;
+    public static final float MAX_VOLUME = 2.0f;
+    public static final String PERFORMANCE_MODE_NONE = "none";
+    public static final String PERFORMANCE_MODE_POWER_SAVING = "power_saving";
+    public static final String PERFORMANCE_MODE_LOW_LATENCY = "low_latency";
+
+    public int latencyMillis = DEFAULT_LATENCY_MILLIS;
+    public int fragmentMillis = DEFAULT_FRAGMENT_MILLIS;
+    public int sampleRate = DEFAULT_SAMPLE_RATE;
+    public int alternateSampleRate = DEFAULT_ALTERNATE_SAMPLE_RATE;
+    public int channels = DEFAULT_CHANNELS;
+    public float volume = DEFAULT_VOLUME;
+    public String performanceMode = PERFORMANCE_MODE_NONE;
+    public boolean sampleRateOverridden = false;
+    public boolean alternateSampleRateOverridden = false;
+
+    public static Options fromEnvVars(EnvVars envVars) {
+      Options options = new Options();
+      if (envVars == null) return options;
+
+      options.latencyMillis =
+          Math.max(
+              0,
+              parseInt(
+                  firstNonEmpty(
+                      envVars.get("WINNATIVE_PULSE_LATENCY_MS"),
+                      envVars.get("PULSE_LATENCY_MSEC")),
+                  DEFAULT_LATENCY_MILLIS));
+      options.fragmentMillis =
+          Math.max(
+              1,
+              parseInt(
+                  firstNonEmpty(
+                      envVars.get("WINNATIVE_PULSE_FRAGMENT_MS"),
+                      envVars.get("ANDROID_PULSE_FRAGMENT_MS")),
+                  DEFAULT_FRAGMENT_MILLIS));
+      String sampleRate =
+          firstNonEmpty(
+              envVars.get("WINNATIVE_PULSE_SAMPLE_RATE"),
+              envVars.get("ANDROID_PULSE_SAMPLE_RATE"));
+      options.sampleRateOverridden = !sampleRate.isEmpty();
+      options.sampleRate =
+          Math.max(
+              8000,
+              parseInt(sampleRate, DEFAULT_SAMPLE_RATE));
+
+      String alternateSampleRate =
+          firstNonEmpty(
+              envVars.get("WINNATIVE_PULSE_ALTERNATE_SAMPLE_RATE"),
+              envVars.get("ANDROID_PULSE_ALTERNATE_SAMPLE_RATE"));
+      options.alternateSampleRateOverridden = !alternateSampleRate.isEmpty();
+      options.alternateSampleRate =
+          Math.max(
+              8000,
+              parseInt(alternateSampleRate, DEFAULT_ALTERNATE_SAMPLE_RATE));
+      options.channels =
+          Math.max(
+              1,
+              Math.min(
+                  2,
+                  parseInt(
+                      firstNonEmpty(
+                          envVars.get("WINNATIVE_PULSE_CHANNELS"),
+                          envVars.get("ANDROID_PULSE_CHANNELS")),
+                      DEFAULT_CHANNELS)));
+      options.volume =
+          Math.max(
+              0.0f,
+              Math.min(
+                  parseFloat(
+                      firstNonEmpty(
+                          envVars.get("WINNATIVE_PULSE_VOLUME"),
+                          envVars.get("ANDROID_PULSE_VOLUME")),
+                      DEFAULT_VOLUME),
+                  MAX_VOLUME));
+
+      String performanceMode =
+          firstNonEmpty(
+              envVars.get("WINNATIVE_PULSE_AAUDIO_PERFORMANCE_MODE"),
+              envVars.get("ANDROID_PULSE_AAUDIO_PERFORMANCE_MODE"));
+      if (performanceMode.equalsIgnoreCase(PERFORMANCE_MODE_LOW_LATENCY)
+          || performanceMode.equals("12")) {
+        options.performanceMode = PERFORMANCE_MODE_LOW_LATENCY;
+      } else if (performanceMode.equalsIgnoreCase(PERFORMANCE_MODE_POWER_SAVING)
+          || performanceMode.equals("11")) {
+        options.performanceMode = PERFORMANCE_MODE_POWER_SAVING;
+      } else {
+        options.performanceMode = PERFORMANCE_MODE_NONE;
+      }
+
+      return options;
+    }
+
+    private static String firstNonEmpty(String first, String second) {
+      return first != null && !first.isEmpty() ? first : (second != null ? second : "");
+    }
+
+    private static int parseInt(String value, int fallback) {
+      try {
+        if (value != null && !value.isEmpty()) return Integer.parseInt(value);
+      } catch (NumberFormatException ignored) {
+      }
+      return fallback;
+    }
+
+    private static float parseFloat(String value, float fallback) {
+      try {
+        if (value != null && !value.isEmpty()) return Float.parseFloat(value);
+      } catch (NumberFormatException ignored) {
+      }
+      return fallback;
+    }
   }
 
   @Override
   public void start() {
     synchronized (lock) {
-      stop();
-      pid = execPulseAudio();
+      if (!isServerRunning()) {
+        killAllPulseAudioProcesses();
+        startPulseAudio();
+        isPaused = false;
+      }
     }
   }
 
   @Override
   public void stop() {
     synchronized (lock) {
-      if (pid != -1) {
-        Process.killProcess(pid);
-        pid = -1;
+      updateSink(true);
+      isPaused = false;
+      killAllPulseAudioProcesses();
+    }
+  }
+
+  public void suspend() {
+    synchronized (lock) {
+      if (!isPaused && isServerRunning()) {
+        isPaused = true;
+        updateSink(true);
       }
     }
   }
 
-  private void copyFromLibraryDir(File dst) {
-    String[] libs =
-        new String[] {
-          "libltdl.so",
-          "libpulseaudio.so",
-          "libpulse.so",
-          "libpulsecommon-13.0.so",
-          "libpulsecore-13.0.so",
-          "libsndfile.so"
-        };
-    for (int i = 0; i < libs.length; i++) {
-      Path dstDir = Paths.get(dst.getAbsolutePath() + "/" + libs[i]);
-      try (InputStream is =
-          environment.getContext().getAssets().open("pulseaudio-bin/" + libs[i])) {
-        if (is != null) {
-          Files.copy(is, dstDir, StandardCopyOption.REPLACE_EXISTING);
-          FileUtils.chmod(dstDir.toFile(), 0771);
+  public void resume() {
+    synchronized (lock) {
+      if (isPaused) {
+        if (isServerRunning()) {
+          isPaused = false;
+          updateSink(false);
+        } else {
+          // Daemon died while backgrounded; relaunch it. default.pa re-creates the sink.
+          start();
         }
-      } catch (IOException e) {
-        throw new RuntimeException(e);
       }
     }
   }
 
-  private int execPulseAudio() {
+  public boolean isServerRunning() {
+    String info = execPactlCommand("info").toLowerCase(java.util.Locale.ROOT);
+    return info.contains("server name:") && !info.contains("connection failure");
+  }
+
+  private void updateSink(boolean suspend) {
+    execPactlCommand("suspend-sink " + SINK_NAME + " " + (suspend ? "true" : "false"));
+  }
+
+  private void killAllPulseAudioProcesses() {
+    File proc = new File("/proc");
+    String[] allPids =
+        proc.list((dir, name) -> new File(dir, name).isDirectory() && name.matches("[0-9]+"));
+    if (allPids == null) return;
+    boolean killed = false;
+    for (String pidStr : allPids) {
+      String cmdline = readProcCmdline(pidStr);
+      if (cmdline.contains("libpulseaudio.so")) {
+        try {
+          ProcessHelper.killProcess(Integer.parseInt(pidStr));
+          killed = true;
+        } catch (NumberFormatException ignored) {
+        }
+      }
+    }
+    if (killed) {
+      try {
+        Thread.sleep(200);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  private static String readProcCmdline(String pid) {
+    try (FileInputStream fr = new FileInputStream("/proc/" + pid + "/cmdline")) {
+      byte[] bytes = fr.readAllBytes();
+      return new String(bytes, StandardCharsets.UTF_8).replace('\0', ' ');
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private void startPulseAudio() {
     Context context = environment.getContext();
+    String nativeLibraryDir = context.getApplicationInfo().nativeLibraryDir;
+
     File workingDir = new File(context.getFilesDir(), "/pulseaudio");
     if (!workingDir.isDirectory()) {
       workingDir.mkdirs();
       FileUtils.chmod(workingDir, 0771);
     }
 
+    // Clear any stale runtime state (e.g. cookie) from a previous run.
+    File configDir = new File(workingDir, ".config");
+    if (configDir.exists()) FileUtils.delete(configDir);
+
+    boolean lowLatency = Options.PERFORMANCE_MODE_LOW_LATENCY.equals(options.performanceMode);
+    String sinkParams = "volume=" + options.volume + " performance_mode=1";
+    if (lowLatency) sinkParams += " low_latency=true";
+
     File configFile = new File(workingDir, "default.pa");
     FileUtils.writeString(
         configFile,
         String.join(
             "\n",
-            "load-module module-native-protocol-unix auth-anonymous=1 auth-cookie-enabled=0 socket=\""
+            "load-module module-native-protocol-unix auth-anonymous=1 auth-cookie-enabled=false socket=\""
                 + socketConfig.path
                 + "\"",
-            "load-module module-aaudio-sink",
-            "set-default-sink AAudioSink"));
+            "load-module module-aaudio-sink " + sinkParams,
+            ""));
 
-    String archName = AppUtils.getArchName();
-    File modulesDir = new File(workingDir, "modules/" + archName);
-    String systemLibPath = archName.equals("arm64") ? "/system/lib64" : "system/lib";
+    File modulesDir = new File(workingDir, "modules");
 
     ArrayList<String> envVars = new ArrayList<>();
-    envVars.add(
-        "LD_LIBRARY_PATH=" + systemLibPath + ":" + modulesDir + ":" + workingDir.getAbsolutePath());
+    envVars.add("LD_LIBRARY_PATH=/system/lib64:" + nativeLibraryDir + ":" + modulesDir);
     envVars.add("HOME=" + workingDir);
     envVars.add("TMPDIR=" + environment.getTmpDir());
 
-    copyFromLibraryDir(workingDir);
-
-    String command = workingDir.getAbsolutePath() + "/libpulseaudio.so";
+    String command = nativeLibraryDir + "/libpulseaudio.so";
     command += " --system=false";
     command += " --disable-shm=true";
     command += " --fail=false";
     command += " -n --file=default.pa";
-    command += " --daemonize=false";
+    command += " --daemonize=true";
     command += " --use-pid-file=false";
     command += " --exit-idle-time=-1";
 
-    return ProcessHelper.exec(command, envVars.toArray(new String[0]), workingDir);
+    ProcessHelper.exec(command, envVars.toArray(new String[0]), workingDir);
+  }
+
+  private String execPactlCommand(String command) {
+    Context context = environment.getContext();
+    String nativeLibraryDir = context.getApplicationInfo().nativeLibraryDir;
+    File workingDir = new File(context.getFilesDir(), "/pulseaudio");
+    if (!workingDir.isDirectory()) return "";
+
+    File pactl = new File(workingDir, "pactl");
+    if (!pactl.isFile()) {
+      Log.w(TAG, "pactl not found at " + pactl.getAbsolutePath());
+      return "";
+    }
+    if (!pactl.canExecute()) FileUtils.chmod(pactl, 0755);
+
+    File modulesDir = new File(workingDir, "modules");
+    StringBuilder output = new StringBuilder();
+    try {
+      String[] envp =
+          new String[] {
+            "LD_LIBRARY_PATH=/system/lib64:" + nativeLibraryDir + ":" + modulesDir,
+            "HOME=" + workingDir,
+            "PULSE_SERVER=" + socketConfig.path,
+            "TMPDIR=" + environment.getTmpDir()
+          };
+      Process process =
+          Runtime.getRuntime().exec(pactl.getAbsolutePath() + " " + command, envp, workingDir);
+      try (BufferedReader reader =
+          new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+        String line;
+        while ((line = reader.readLine()) != null) {
+          output.append(line).append('\n');
+        }
+      }
+      process.waitFor();
+    } catch (IOException e) {
+      return "";
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      return "";
+    }
+    return output.toString();
   }
 }
diff --git a/app/src/main/runtime/display/environment/components/VirGLRendererComponent.java b/app/src/main/runtime/display/environment/components/VirGLRendererComponent.java
deleted file mode 100644
index c3855e0c9..000000000
--- a/app/src/main/runtime/display/environment/components/VirGLRendererComponent.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.winlator.cmod.runtime.display.environment.components;
-
-import android.util.Log;
-import androidx.annotation.Keep;
-import com.winlator.cmod.runtime.display.connector.Client;
-import com.winlator.cmod.runtime.display.connector.ConnectionHandler;
-import com.winlator.cmod.runtime.display.connector.RequestHandler;
-import com.winlator.cmod.runtime.display.connector.UnixSocketConfig;
-import com.winlator.cmod.runtime.display.connector.XConnectorEpoll;
-import com.winlator.cmod.runtime.display.environment.EnvironmentComponent;
-import com.winlator.cmod.runtime.display.renderer.GLRenderer;
-import com.winlator.cmod.runtime.display.renderer.Texture;
-import com.winlator.cmod.runtime.display.xserver.Drawable;
-import com.winlator.cmod.runtime.display.xserver.XServer;
-import java.io.IOException;
-
-public class VirGLRendererComponent extends EnvironmentComponent
-    implements ConnectionHandler, RequestHandler {
-  private final XServer xServer;
-  private final UnixSocketConfig socketConfig;
-  private XConnectorEpoll connector;
-  private long sharedEGLContextPtr;
-
-  static {
-    System.loadLibrary("virglrenderer");
-  }
-
-  public VirGLRendererComponent(XServer xServer, UnixSocketConfig socketConfig) {
-    this.xServer = xServer;
-    this.socketConfig = socketConfig;
-  }
-
-  @Override
-  public void start() {
-    if (connector != null) return;
-    connector = new XConnectorEpoll(socketConfig, this, this);
-    connector.start();
-  }
-
-  @Override
-  public void stop() {
-    if (connector != null) {
-      connector.stop();
-      connector = null;
-    }
-  }
-
-  @Keep
-  private void killConnection(int fd) {
-    connector.killConnection(connector.getClient(fd));
-  }
-
-  @Keep
-  private long getSharedEGLContext() {
-    if (sharedEGLContextPtr != 0) return sharedEGLContextPtr;
-    final Thread thread = Thread.currentThread();
-    try {
-      GLRenderer renderer = xServer.getRenderer();
-      renderer.xServerView.queueEvent(
-          () -> {
-            sharedEGLContextPtr = getCurrentEGLContextPtr();
-
-            synchronized (thread) {
-              thread.notify();
-            }
-          });
-      synchronized (thread) {
-        thread.wait();
-      }
-    } catch (Exception e) {
-      return 0;
-    }
-    return sharedEGLContextPtr;
-  }
-
-  @Override
-  public void handleConnectionShutdown(Client client) {
-    long clientPtr = (long) client.getTag();
-    destroyClient(clientPtr);
-  }
-
-  @Override
-  public void handleNewConnection(Client client) {
-    getSharedEGLContext();
-    long clientPtr = handleNewConnection(client.clientSocket.fd);
-    client.setTag(clientPtr);
-  }
-
-  @Override
-  public boolean handleRequest(Client client) throws IOException {
-    long clientPtr = (long) client.getTag();
-    handleRequest(clientPtr);
-    return true;
-  }
-
-  @Keep
-  private void flushFrontbuffer(int drawableId, int framebuffer) {
-    Drawable drawable = xServer.drawableManager.getDrawable(drawableId);
-    if (drawable == null) {
-      Log.e("VirGLRendererComponent", "Drawable not found for drawableId=" + drawableId);
-      return;
-    }
-
-    synchronized (drawable.renderLock) {
-      if (framebuffer == 0) {
-        Log.e("VirGLRendererComponent", "Framebuffer is invalid for drawableId=" + drawableId);
-        return;
-      }
-
-      drawable.clearScanoutSource();
-      Texture texture = drawable.getTexture();
-      if (texture == null) {
-        Log.e("VirGLRendererComponent", "Texture is null for drawableId=" + drawableId);
-        return;
-      }
-
-      // Ensure existing data is valid before resetting
-      try {
-        texture.copyFromFramebuffer(framebuffer, drawable.width, drawable.height);
-      } catch (Exception e) {
-        Log.e("VirGLRendererComponent", "Error during framebuffer copy: " + e.getMessage(), e);
-        return;
-      }
-    }
-
-    Runnable onDrawListener = drawable.getOnDrawListener();
-    if (onDrawListener != null) {
-      onDrawListener.run();
-    }
-  }
-
-  private native long handleNewConnection(int fd);
-
-  private native void handleRequest(long clientPtr);
-
-  private native long getCurrentEGLContextPtr();
-
-  private native void destroyClient(long clientPtr);
-
-  private native void destroyRenderer(long clientPtr);
-}
diff --git a/app/src/main/runtime/display/recording/GameRecorder.java b/app/src/main/runtime/display/recording/GameRecorder.java
new file mode 100644
index 000000000..5e9c2fcb5
--- /dev/null
+++ b/app/src/main/runtime/display/recording/GameRecorder.java
@@ -0,0 +1,506 @@
+package com.winlator.cmod.runtime.display.recording;
+
+import android.content.Context;
+import android.media.AudioFormat;
+import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaFormat;
+import android.media.MediaMuxer;
+import android.media.MediaScannerConnection;
+import android.os.Build;
+import android.os.Environment;
+import android.util.Log;
+import android.view.Surface;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/** Records the game's composited output to MP4 (H.264 + AAC). Video frames mirror-present into {@link #getInputSurface()}; audio is teed in via {@link #onPcm}. A background thread drains both encoders into the muxer. */
+public final class GameRecorder {
+    private static final String TAG = "GameRecorder";
+
+    private static final String VIDEO_MIME = MediaFormat.MIMETYPE_VIDEO_AVC;
+    private static final String AUDIO_MIME = MediaFormat.MIMETYPE_AUDIO_AAC;
+    private static final int AUDIO_BITRATE = 128_000;
+    private static final long DEQUEUE_TIMEOUT_US = 10_000;
+
+    // The active recorder the audio bridge tees PCM into (one recording session at a time).
+    private static volatile GameRecorder activeRecorder;
+
+    public static GameRecorder active() {
+        return activeRecorder;
+    }
+
+    private final Context appContext;
+
+    // Video
+    private MediaCodec videoCodec;
+    private Surface inputSurface;
+    private int videoTrackIndex = -1;
+
+    // Audio (lazily configured from the first PCM buffer so we match the game's real format)
+    private MediaCodec audioCodec;
+    private int audioTrackIndex = -1;
+    private int audioSampleRate;
+    private int audioChannelCount;
+    private long audioFramesSubmitted; // advances the audio sample clock
+    private long audioBasePtsUs = -1;  // wall-clock anchor of the first PCM, shared with video base
+
+    private MediaMuxer muxer;
+    private boolean muxerStarted;
+    private File outputFile;
+    private int orientationHint; // clockwise degrees players rotate playback to upright
+
+    private Thread drainThread;
+    private final AtomicBoolean recording = new AtomicBoolean(false);
+    private final AtomicBoolean stopRequested = new AtomicBoolean(false);
+    private long baseTimeNs;
+    // If no game audio has appeared by this deadline, start the muxer video-only rather than stall.
+    private long audioGraceDeadlineNs;
+    private static final long AUDIO_GRACE_NS = 1_000_000_000L;
+
+    // Samples that arrive before both tracks are added + muxer is started.
+    private final List<PendingSample> pending = new ArrayList<>();
+
+    private static final class PendingSample {
+        final boolean video;
+        final ByteBuffer data;
+        final MediaCodec.BufferInfo info;
+
+        PendingSample(boolean video, ByteBuffer data, MediaCodec.BufferInfo info) {
+            this.video = video;
+            this.data = data;
+            this.info = info;
+        }
+    }
+
+    public GameRecorder(Context context) {
+        this.appContext = context.getApplicationContext();
+    }
+
+    public boolean isRecording() {
+        return recording.get();
+    }
+
+    /** Configure the encoder + muxer and start draining. Returns the input Surface, or null on failure. */
+    public synchronized Surface start(int width, int height, int fps, int orientationHint, int bitRate) {
+        if (recording.get()) return inputSurface;
+        width &= ~1; // encoders want even dimensions
+        height &= ~1;
+        if (width <= 0 || height <= 0) {
+            Log.e(TAG, "Refusing to record invalid size " + width + "x" + height);
+            return null;
+        }
+        if (fps <= 0 || fps > 240) fps = 60;
+        if (bitRate <= 0) bitRate = estimateVideoBitrate(width, height, fps);
+        this.orientationHint = ((orientationHint % 360) + 360) % 360;
+
+        try {
+            if (!openOutput()) {
+                abortOutput();
+                return null;
+            }
+
+            MediaFormat fmt = MediaFormat.createVideoFormat(VIDEO_MIME, width, height);
+            fmt.setInteger(MediaFormat.KEY_COLOR_FORMAT,
+                    MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
+            fmt.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
+            fmt.setInteger(MediaFormat.KEY_FRAME_RATE, fps);
+            fmt.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 1);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                fmt.setInteger(MediaFormat.KEY_BITRATE_MODE,
+                        MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR);
+            }
+
+            videoCodec = MediaCodec.createEncoderByType(VIDEO_MIME);
+            videoCodec.configure(fmt, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+            inputSurface = videoCodec.createInputSurface();
+            videoCodec.start();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to start video encoder", e);
+            releaseQuietly();
+            abortOutput();
+            return null;
+        }
+
+        baseTimeNs = System.nanoTime();
+        audioGraceDeadlineNs = baseTimeNs + AUDIO_GRACE_NS;
+        stopRequested.set(false);
+        recording.set(true);
+        activeRecorder = this;
+
+        drainThread = new Thread(this::drainLoop, "GameRecorderDrain");
+        drainThread.start();
+        Log.i(TAG, "Recording started " + width + "x" + height + "@" + fps);
+        return inputSurface;
+    }
+
+    public Surface getInputSurface() {
+        return inputSurface;
+    }
+
+    /** Tee a buffer of already-played game PCM into the recording (non-blocking; does not consume it). */
+    public void onPcm(ByteBuffer data, int sampleRate, int channelCount, int pcmEncoding) {
+        if (!recording.get() || stopRequested.get()) return;
+        try {
+            ensureAudioEncoder(sampleRate, channelCount);
+        } catch (Exception e) {
+            Log.e(TAG, "Audio encoder init failed; continuing video-only", e);
+            audioCodec = null; // give up on audio, keep recording video
+            return;
+        }
+        MediaCodec codec = audioCodec;
+        if (codec == null) return;
+
+        ByteBuffer pcm16 = toPcm16(data, pcmEncoding);
+        if (pcm16 == null || pcm16.remaining() == 0) return;
+
+        // Anchor the audio clock to the same base as the video Surface timestamps, then advance by samples.
+        if (audioBasePtsUs < 0) {
+            audioBasePtsUs = Math.max(0L, (System.nanoTime() - baseTimeNs) / 1000L);
+        }
+        try {
+            while (pcm16.hasRemaining()) {
+                int inIndex = codec.dequeueInputBuffer(0);
+                if (inIndex < 0) break; // no input buffer free right now — drop the rest this tick
+                ByteBuffer in = codec.getInputBuffer(inIndex);
+                if (in == null) break;
+                in.clear();
+                int chunk = Math.min(in.remaining(), pcm16.remaining());
+                int oldLimit = pcm16.limit();
+                pcm16.limit(pcm16.position() + chunk);
+                in.put(pcm16);
+                pcm16.limit(oldLimit);
+
+                long ptsUs = audioBasePtsUs
+                        + audioFramesSubmitted * 1_000_000L / Math.max(1, audioSampleRate);
+                int bytesPerFrame = audioChannelCount * 2;
+                audioFramesSubmitted += chunk / Math.max(1, bytesPerFrame);
+                codec.queueInputBuffer(inIndex, 0, chunk, ptsUs, 0);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "queue audio failed", e);
+        }
+    }
+
+    public synchronized void stop() {
+        if (!recording.get()) return;
+        stopRequested.set(true);
+        try {
+            if (videoCodec != null) videoCodec.signalEndOfInputStream();
+        } catch (Exception ignore) {}
+        if (audioCodec != null) {
+            try {
+                int inIndex = audioCodec.dequeueInputBuffer(DEQUEUE_TIMEOUT_US);
+                if (inIndex >= 0) {
+                    long base = audioBasePtsUs < 0 ? 0L : audioBasePtsUs;
+                    long ptsUs = base
+                            + audioFramesSubmitted * 1_000_000L / Math.max(1, audioSampleRate);
+                    audioCodec.queueInputBuffer(inIndex, 0, 0, ptsUs,
+                            MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+                }
+            } catch (Exception ignore) {}
+        }
+
+        // Wait for the drain thread to exit before finishOutput() releases the muxer.
+        Thread t = drainThread;
+        if (t != null) {
+            try {
+                t.join(4_000);
+            } catch (InterruptedException ignore) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        recording.set(false);
+        if (activeRecorder == this) activeRecorder = null;
+        finishOutput();
+        releaseQuietly();
+        Log.i(TAG, "Recording stopped");
+    }
+
+    // ── Draining ─────────────────────────────────────────────────────────────
+
+    private void drainLoop() {
+        MediaCodec.BufferInfo videoInfo = new MediaCodec.BufferInfo();
+        MediaCodec.BufferInfo audioInfo = new MediaCodec.BufferInfo();
+        boolean videoDone = false;
+        boolean audioDone = false;
+
+        long stopDeadlineNs = 0;
+        while (!videoDone) {
+            videoDone = drainEncoder(videoCodec, videoInfo, true);
+            if (audioCodec != null && !audioDone) { // appears partway through (lazy init)
+                audioDone = drainEncoder(audioCodec, audioInfo, false);
+            }
+            synchronized (this) { maybeStartMuxer(); }
+            if (stopRequested.get()) {
+                // Bound the wait for EOS so stop() can finalize without nulling the muxer mid-drain.
+                if (stopDeadlineNs == 0) stopDeadlineNs = System.nanoTime() + 1_500_000_000L;
+                else if (System.nanoTime() > stopDeadlineNs) break;
+            } else if (!videoDone) {
+                try { Thread.sleep(2); } catch (InterruptedException e) { break; }
+            }
+        }
+        // After video EOS, flush any remaining audio so trailing sound isn't truncated.
+        if (audioCodec != null) {
+            long deadline = System.nanoTime() + 500_000_000L;
+            while (!audioDone && System.nanoTime() < deadline) {
+                audioDone = drainEncoder(audioCodec, audioInfo, false);
+            }
+        }
+    }
+
+    /** Returns true when this encoder has emitted end-of-stream. */
+    private boolean drainEncoder(MediaCodec codec, MediaCodec.BufferInfo info, boolean video) {
+        if (codec == null) return true;
+        try {
+            int index = codec.dequeueOutputBuffer(info, DEQUEUE_TIMEOUT_US);
+            if (index == MediaCodec.INFO_TRY_AGAIN_LATER) {
+                return false;
+            } else if (index == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                MediaFormat newFormat = codec.getOutputFormat();
+                synchronized (this) {
+                    // Tracks can only be added before the muxer starts; a late stream is dropped.
+                    if (!muxerStarted && muxer != null) {
+                        if (video) videoTrackIndex = muxer.addTrack(newFormat);
+                        else audioTrackIndex = muxer.addTrack(newFormat);
+                        maybeStartMuxer();
+                    }
+                }
+                return false;
+            } else if (index >= 0) {
+                ByteBuffer out = codec.getOutputBuffer(index);
+                if ((info.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
+                    info.size = 0; // config already consumed by addTrack
+                }
+                if (video && info.size > 0) {
+                    // Rebase Surface timestamps to the recording start (shared origin with audio).
+                    info.presentationTimeUs = Math.max(0L,
+                            info.presentationTimeUs - baseTimeNs / 1000L);
+                }
+                if (out != null && info.size > 0) {
+                    out.position(info.offset);
+                    out.limit(info.offset + info.size);
+                    writeSample(video, out, info);
+                }
+                boolean eos = (info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
+                codec.releaseOutputBuffer(index, false);
+                return eos;
+            }
+        } catch (IllegalStateException e) {
+            // Codec released underneath us during stop().
+            return true;
+        }
+        return false;
+    }
+
+    private synchronized void writeSample(boolean video, ByteBuffer data,
+                                          MediaCodec.BufferInfo info) {
+        int track = video ? videoTrackIndex : audioTrackIndex;
+        if (muxerStarted) {
+            if (track < 0) return; // stream not in the muxer (e.g. late audio) — drop, don't buffer
+            try {
+                muxer.writeSampleData(track, data, info);
+            } catch (Exception e) {
+                Log.e(TAG, "writeSampleData failed", e);
+            }
+            return;
+        }
+        // Muxer not started yet: hold a copy until both tracks are added.
+        ByteBuffer copy = ByteBuffer.allocate(info.size);
+        copy.put(data);
+        copy.flip();
+        MediaCodec.BufferInfo ci = new MediaCodec.BufferInfo();
+        ci.set(0, info.size, info.presentationTimeUs, info.flags);
+        pending.add(new PendingSample(video, copy, ci));
+    }
+
+    /** Start the muxer once the video track is known; include audio if it has appeared. */
+    private void maybeStartMuxer() {
+        if (muxerStarted || muxer == null) return;
+        if (videoTrackIndex < 0) return;
+        // If audio exists, wait for its track; if none has appeared, give it a grace window first.
+        boolean audioTrackPending = audioCodec != null && audioTrackIndex < 0;
+        boolean audioMightStillAppear = audioCodec == null && System.nanoTime() < audioGraceDeadlineNs;
+        if (audioTrackPending || audioMightStillAppear) return;
+        try {
+            muxer.start();
+            muxerStarted = true;
+            for (PendingSample s : pending) {
+                int track = s.video ? videoTrackIndex : audioTrackIndex;
+                if (track >= 0) muxer.writeSampleData(track, s.data, s.info);
+            }
+            pending.clear();
+        } catch (Exception e) {
+            Log.e(TAG, "muxer.start failed", e);
+        }
+    }
+
+    // ── Audio helpers ────────────────────────────────────────────────────────
+
+    private synchronized void ensureAudioEncoder(int sampleRate, int channelCount) throws Exception {
+        if (audioCodec != null || sampleRate <= 0 || channelCount <= 0) return;
+        channelCount = Math.min(channelCount, 2); // AAC-LC: encode stereo at most
+        MediaFormat fmt = MediaFormat.createAudioFormat(AUDIO_MIME, sampleRate, channelCount);
+        fmt.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
+        fmt.setInteger(MediaFormat.KEY_BIT_RATE, AUDIO_BITRATE);
+        fmt.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, 16 * 1024);
+        MediaCodec codec = MediaCodec.createEncoderByType(AUDIO_MIME);
+        codec.configure(fmt, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+        codec.start();
+        audioSampleRate = sampleRate;
+        audioChannelCount = channelCount;
+        audioCodec = codec;
+    }
+
+    /** Convert source PCM to interleaved 16-bit little-endian (the AAC encoder's input format). */
+    private static ByteBuffer toPcm16(ByteBuffer src, int pcmEncoding) {
+        int pos = src.position();
+        try {
+            if (pcmEncoding == AudioFormat.ENCODING_PCM_16BIT) {
+                if (src.order() == ByteOrder.LITTLE_ENDIAN) {
+                    ByteBuffer out = ByteBuffer.allocate(src.remaining());
+                    out.put(src.duplicate());
+                    out.flip();
+                    return out.order(ByteOrder.LITTLE_ENDIAN);
+                }
+                // Big-endian source: read shorts in source order, write little-endian.
+                ByteBuffer s = src.duplicate();
+                s.order(src.order());
+                int shorts = s.remaining() / 2;
+                ByteBuffer out = ByteBuffer.allocate(shorts * 2).order(ByteOrder.LITTLE_ENDIAN);
+                for (int i = 0; i < shorts; i++) out.putShort(s.getShort());
+                out.flip();
+                return out;
+            } else if (pcmEncoding == AudioFormat.ENCODING_PCM_FLOAT) {
+                ByteBuffer s = src.duplicate();
+                s.order(src.order());
+                int floats = s.remaining() / 4;
+                ByteBuffer out = ByteBuffer.allocate(floats * 2).order(ByteOrder.LITTLE_ENDIAN);
+                for (int i = 0; i < floats; i++) {
+                    float f = s.getFloat();
+                    int v = Math.round(f * 32767f);
+                    if (v > 32767) v = 32767; else if (v < -32768) v = -32768;
+                    out.putShort((short) v);
+                }
+                out.flip();
+                return out;
+            } else if (pcmEncoding == AudioFormat.ENCODING_PCM_8BIT) {
+                ByteBuffer s = src.duplicate();
+                int n = s.remaining();
+                ByteBuffer out = ByteBuffer.allocate(n * 2).order(ByteOrder.LITTLE_ENDIAN);
+                for (int i = 0; i < n; i++) {
+                    int u = s.get() & 0xFF;       // unsigned 8-bit
+                    out.putShort((short) ((u - 128) << 8));
+                }
+                out.flip();
+                return out;
+            }
+            return null;
+        } finally {
+            src.position(pos);
+        }
+    }
+
+    private static int estimateVideoBitrate(int width, int height, int fps) {
+        // ~0.07 bits per pixel·frame, clamped to a sane window for shareable clips.
+        long bps = (long) (width * (long) height * fps * 0.07);
+        return (int) Math.max(4_000_000L, Math.min(bps, 50_000_000L));
+    }
+
+    // ── Output (WinNative/Recordings in the app's external files dir) ────────
+
+    /** /sdcard/WinNative/Recordings (alongside logs/profiles/saves; needs MANAGE_EXTERNAL_STORAGE). */
+    private File recordingsDir() {
+        File ext = Environment.getExternalStorageDirectory();
+        if (ext != null) return new File(ext, "WinNative/Recordings");
+        File base = appContext.getExternalFilesDir(null);
+        if (base == null) base = appContext.getFilesDir();
+        return new File(base, "Recordings");
+    }
+
+    private boolean openOutput() {
+        String name = "WinNative_" + System.currentTimeMillis() + ".mp4";
+        try {
+            File dir = recordingsDir();
+            if (!dir.isDirectory() && !dir.mkdirs() && !dir.isDirectory()) {
+                Log.e(TAG, "Could not create " + dir);
+                return false;
+            }
+            outputFile = new File(dir, name);
+            muxer = new MediaMuxer(outputFile.getAbsolutePath(),
+                    MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+            // Must be set before the muxer starts; rotates playback to upright on any player.
+            if (orientationHint != 0) muxer.setOrientationHint(orientationHint);
+            return true;
+        } catch (Exception e) {
+            Log.e(TAG, "openOutput failed", e);
+            return false;
+        }
+    }
+
+    private void finishOutput() {
+        if (muxer != null) {
+            try {
+                if (muxerStarted) muxer.stop();
+            } catch (Exception ignore) {}
+            try {
+                muxer.release();
+            } catch (Exception ignore) {}
+            muxer = null;
+        }
+        muxerStarted = false;
+        // Make the new file visible to media scanners / file managers right away.
+        if (outputFile != null && outputFile.length() > 0) {
+            try {
+                MediaScannerConnection.scanFile(appContext,
+                        new String[]{outputFile.getAbsolutePath()}, new String[]{"video/mp4"}, null);
+            } catch (Exception ignore) {}
+        }
+        outputFile = null;
+    }
+
+    /** Release output without finalizing, and delete the empty file — used when start() fails. */
+    private void abortOutput() {
+        if (muxer != null) {
+            try { muxer.release(); } catch (Exception ignore) {}
+            muxer = null;
+        }
+        muxerStarted = false;
+        try {
+            if (outputFile != null) //noinspection ResultOfMethodCallIgnored
+                outputFile.delete();
+        } catch (Exception ignore) {}
+        outputFile = null;
+    }
+
+    private void releaseQuietly() {
+        try {
+            if (videoCodec != null) videoCodec.stop();
+        } catch (Exception ignore) {}
+        try {
+            if (videoCodec != null) videoCodec.release();
+        } catch (Exception ignore) {}
+        videoCodec = null;
+        try {
+            if (inputSurface != null) inputSurface.release();
+        } catch (Exception ignore) {}
+        inputSurface = null;
+        try {
+            if (audioCodec != null) audioCodec.stop();
+        } catch (Exception ignore) {}
+        try {
+            if (audioCodec != null) audioCodec.release();
+        } catch (Exception ignore) {}
+        audioCodec = null;
+        drainThread = null;
+        videoTrackIndex = -1;
+        audioTrackIndex = -1;
+        audioFramesSubmitted = 0;
+        audioBasePtsUs = -1;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/EffectComposer.java b/app/src/main/runtime/display/renderer/EffectComposer.java
index a657a1e6d..7cfdb0912 100644
--- a/app/src/main/runtime/display/renderer/EffectComposer.java
+++ b/app/src/main/runtime/display/renderer/EffectComposer.java
@@ -1,121 +1,77 @@
 package com.winlator.cmod.runtime.display.renderer;
 
-import android.opengl.GLES20;
 import com.winlator.cmod.runtime.display.renderer.effects.Effect;
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Holds the active list of post-process effects in the order they should be applied.
+ * The Vulkan renderer reads this list each frame and runs the corresponding shader pipelines.
+ *
+ * <p>Public API is unchanged from the previous OpenGL implementation so callers
+ * (e.g. {@code XServerDisplayActivity}) continue to work without modification.
+ */
 public class EffectComposer {
-    private static final String TAG = "EffectComposer";
-    private boolean isRendering = false;
     private final List<Effect> effects = new ArrayList<>();
-    private RenderTarget readBuffer;
-    private RenderTarget writeBuffer;
-    private final GLRenderer renderer;
-    private int lastWidth = 0;
-    private int lastHeight = 0;
+    private final VulkanRenderer renderer;
+    private Effect[] cachedSnapshot = new Effect[0];
 
-    public EffectComposer(GLRenderer renderer) {
+    public EffectComposer(VulkanRenderer renderer) {
         this.renderer = renderer;
     }
 
-    private void initBuffers(int width, int height) {
-        if (readBuffer == null || width != lastWidth || height != lastHeight) {
-            if (readBuffer != null) {
-                GLES20.glDeleteFramebuffers(1, new int[]{readBuffer.getFramebuffer()}, 0);
-            }
-            if (writeBuffer != null) {
-                GLES20.glDeleteFramebuffers(1, new int[]{writeBuffer.getFramebuffer()}, 0);
-            }
-            readBuffer = new RenderTarget();
-            readBuffer.allocateFramebuffer(width, height);
-            writeBuffer = new RenderTarget();
-            writeBuffer.allocateFramebuffer(width, height);
-            lastWidth = width;
-            lastHeight = height;
-        }
-    }
-
     public synchronized void addEffect(Effect effect) {
+        if (effect == null) return;
         if (!effects.contains(effect)) {
             effects.add(effect);
+            cachedSnapshot = effects.toArray(new Effect[0]);
         }
-        renderer.xServerView.requestRender();
+        requestRender();
     }
 
-    public synchronized <T extends Effect> T getEffect(Class<T> effectClass) {
-        for (Effect effect : effects) {
-            if (effect.getClass() == effectClass) {
-                return effectClass.cast(effect);
-            }
+    public synchronized void addEffectFirst(Effect effect) {
+        if (effect == null) return;
+        int existingIndex = effects.indexOf(effect);
+        if (existingIndex == 0) {
+            requestRender();
+            return;
         }
-        return null;
-    }
-
-    public synchronized boolean hasEffects() {
-        return !effects.isEmpty();
+        if (existingIndex > 0) {
+            effects.remove(existingIndex);
+        }
+        effects.add(0, effect);
+        cachedSnapshot = effects.toArray(new Effect[0]);
+        requestRender();
     }
 
     public synchronized void removeEffect(Effect effect) {
-        effects.remove(effect);
-        renderer.xServerView.requestRender();
+        if (effect == null) return;
+        if (effects.remove(effect)) {
+            cachedSnapshot = effects.toArray(new Effect[0]);
+        }
+        requestRender();
     }
 
-    public synchronized void render() {
-        if (isRendering) return;
-        isRendering = true;
-
-        try {
-            int width = renderer.getSurfaceWidth();
-            int height = renderer.getSurfaceHeight();
-            initBuffers(width, height);
-
-            if (hasEffects()) {
-                GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, readBuffer.getFramebuffer());
-            } else {
-                GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
-            }
-
-            renderer.drawFrame();
-
-            for (int i = 0; i < effects.size(); i++) {
-                Effect effect = effects.get(i);
-                boolean renderToScreen = (i == effects.size() - 1);
-                int targetFramebuffer = renderToScreen ? 0 : writeBuffer.getFramebuffer();
-
-                GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, targetFramebuffer);
-                GLES20.glViewport(0, 0, width, height);
-                renderer.setViewportNeedsUpdate(true);
-                GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-
-                renderEffect(effect);
-                swapBuffers();
-            }
-        } finally {
-            isRendering = false;
+    @SuppressWarnings("unchecked")
+    public synchronized <T extends Effect> T getEffect(Class<T> effectClass) {
+        for (Effect e : effects) {
+            if (e.getClass() == effectClass) return (T) e;
         }
+        return null;
     }
 
-    private void renderEffect(Effect effect) {
-        ShaderMaterial material = effect.getMaterial();
-        if (material == null) return;
-
-        material.use();
-        renderer.getQuadVertices().bind(material.programId);
-
-        material.setUniformVec2("resolution", renderer.surfaceWidth, renderer.surfaceHeight);
-        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, readBuffer.getTextureId());
-        material.setUniformInt("screenTexture", 0);
+    public synchronized boolean hasEffects() {
+        return !effects.isEmpty();
+    }
 
-        GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, renderer.quadVertices.count());
-        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
+    /** Snapshot the active effects for the renderer's per-frame consumption. */
+    public synchronized Effect[] snapshot() {
+        return cachedSnapshot;
     }
 
-    private void swapBuffers() {
-        RenderTarget tmp = writeBuffer;
-        writeBuffer = readBuffer;
-        readBuffer = tmp;
+    private void requestRender() {
+        if (renderer != null && renderer.xServerView != null) {
+            renderer.xServerView.requestRender();
+        }
     }
 }
diff --git a/app/src/main/runtime/display/renderer/GLRenderer.java b/app/src/main/runtime/display/renderer/GLRenderer.java
deleted file mode 100644
index 090411196..000000000
--- a/app/src/main/runtime/display/renderer/GLRenderer.java
+++ /dev/null
@@ -1,929 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.util.Log;
-import com.winlator.cmod.R;
-import com.winlator.cmod.runtime.display.renderer.material.CursorMaterial;
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
-import com.winlator.cmod.runtime.display.renderer.material.WindowMaterial;
-import com.winlator.cmod.runtime.display.ui.XServerView;
-import com.winlator.cmod.runtime.display.xserver.Bitmask;
-import com.winlator.cmod.runtime.display.xserver.Cursor;
-import com.winlator.cmod.runtime.display.xserver.Drawable;
-import com.winlator.cmod.runtime.display.xserver.Pointer;
-import com.winlator.cmod.runtime.display.xserver.Window;
-import com.winlator.cmod.runtime.display.xserver.WindowAttributes;
-import com.winlator.cmod.runtime.display.xserver.WindowManager;
-import com.winlator.cmod.runtime.display.xserver.XLock;
-import com.winlator.cmod.runtime.display.xserver.XServer;
-import com.winlator.cmod.shared.android.AppUtils;
-import com.winlator.cmod.shared.math.Mathf;
-import com.winlator.cmod.shared.math.XForm;
-import java.util.ArrayList;
-import java.util.concurrent.locks.LockSupport;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-public class GLRenderer
-    implements GLSurfaceView.Renderer,
-        WindowManager.OnWindowModificationListener,
-        Pointer.OnPointerMotionListener {
-  public final XServerView xServerView;
-  private final XServer xServer;
-  public final VertexAttribute quadVertices = new VertexAttribute("position", 2);
-  private final float[] tmpXForm1 = XForm.getInstance();
-  private final float[] tmpXForm2 = XForm.getInstance();
-  private final CursorMaterial cursorMaterial = new CursorMaterial();
-  private final WindowMaterial windowMaterial = new WindowMaterial();
-  public final ViewTransformation viewTransformation = new ViewTransformation();
-  private final Drawable rootCursorDrawable;
-  private final ArrayList<RenderableWindow> renderableWindows = new ArrayList<>();
-  private boolean fullscreen = false;
-  public boolean viewportNeedsUpdate = true;
-  private boolean cursorVisible = true;
-  private boolean screenOffsetYRelativeToCursor = false;
-  private String[] unviewableWMClasses = null;
-  private float magnifierZoom = 1.0f;
-  private boolean magnifierEnabled = true;
-  private boolean magnifierUIActive = false;
-  private float magnifierPanX = 0f;
-  private float magnifierPanY = 0f;
-  private boolean magnifierPanInitialized = false;
-  private static final float MAGNIFIER_DEADZONE_FRACTION = 0.6f;
-  public int surfaceWidth;
-  public int surfaceHeight;
-  private boolean cpuSaverMode = false;
-  private static final int MAX_FPS_LIMIT = 1000;
-  public static final long FPS_LIMIT_SPIN_THRESHOLD_NS = 2_000_000L;
-  private volatile int currentFpsLimit = 0;
-  private boolean wasDirectMode = false;
-  private final android.os.Handler mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
-  private final java.util.concurrent.atomic.AtomicBoolean renderRequested = new java.util.concurrent.atomic.AtomicBoolean(false);
-
-  private final EffectComposer effectComposer;
-
-  /**
-   * Phase 2.3: when non-null and the current frame qualifies as a fullscreen
-   * direct-scanout candidate, the AHardwareBuffer backing that drawable is
-   * pushed to this layer in addition to (Phase 2.3) or instead of (Phase
-   * 2.5+) the GL composition. Set/cleared by the activity from the UI thread
-   * via {@link #setDirectCompositionTarget(com.winlator.cmod.runtime.display.composition.DirectCompositionLayer)};
-   * read here on the GLThread, hence volatile.
-   *
-   * <p><b>Cross-thread safety</b> doesn't come from the volatile alone — the
-   * volatile only suppresses NEW frames from entering the SC push after the
-   * UI thread writes null. In-flight frames already past that read are
-   * protected by the layer's own {@code synchronized} methods: when the UI
-   * thread's {@code release()} executes, it serializes on the same monitor
-   * as {@code pushBuffer}, then zeroes the native pointer. A
-   * {@code pushBuffer} that won the race sees the live SC; a later one sees
-   * {@code nativeSc == 0} and short-circuits in JNI.
-   */
-  private volatile com.winlator.cmod.runtime.display.composition.DirectCompositionLayer
-          directCompositionTarget;
-
-  /**
-   * Last AHardwareBuffer pointer + geometry pushed to {@code directCompositionTarget}.
-   * Per-frame `pushBuffer` calls allocate a SurfaceFlinger transaction, which
-   * is wasted work when neither the buffer pointer nor the destination geometry
-   * has changed since the previous frame. DRI3 in this project allocates a
-   * fresh GPUImage per Present cycle, so AHB-pointer identity is a sufficient
-   * "dirty" check; if a future codepath recycles AHBs in place this cache
-   * misses harmlessly (correctness preserved, just reverts to per-frame push).
-   * GLThread-only — no synchronization needed.
-   */
-  private long dcLastPushedAhb = 0L;
-  private int dcLastPushedW = 0;
-  private int dcLastPushedH = 0;
-
-  /** Consecutive {@code pushBuffer == false} returns. After enough failures
-   *  the renderer detaches itself from the SC layer to avoid wasting JNI
-   *  calls every frame on a permanent failure (e.g. SC was reparented away).
-   *  GLThread-only. */
-  private int dcConsecutiveFailures = 0;
-  private static final int DC_FAIL_LIMIT = 8;
-
-  /** Phase 2.5 — true when the most recent frame successfully pushed an AHB
-   *  to the SurfaceControl, so the SC layer is currently visible and showing
-   *  game content. Used to (a) skip the GL render of the direct candidate
-   *  for the perf win, (b) detect transitions to the windowed/multi-drawable
-   *  case so we can hide the SC layer cleanly. GLThread-only. */
-  private boolean dcLayerActive = false;
-
-  public GLRenderer(XServerView xServerView, XServer xServer) {
-    this.xServerView = xServerView;
-    this.xServer = xServer;
-    this.effectComposer = new EffectComposer(this);
-    rootCursorDrawable = createRootCursorDrawable();
-
-    quadVertices.put(
-        new float[] {
-          0.0f, 0.0f,
-          0.0f, 1.0f,
-          1.0f, 0.0f,
-          1.0f, 1.0f
-        });
-
-    xServer.windowManager.addOnWindowModificationListener(this);
-    xServer.pointer.addOnPointerMotionListener(this);
-  }
-
-  public void requestRenderCoalesced() {
-    if (renderRequested.compareAndSet(false, true)) {
-      mainHandler.post(
-          () -> {
-            android.view.Choreographer.getInstance()
-                .postFrameCallback(
-                    frameTimeNanos -> {
-                      renderRequested.set(false);
-                      xServerView.requestRender();
-                    });
-          });
-    }
-  }
-
-  @Override
-  public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-    if (xServer.isDri3Enabled()) {
-      GPUImage.checkIsSupported();
-    }
-
-    GLES20.glFrontFace(GLES20.GL_CCW);
-    GLES20.glDisable(GLES20.GL_CULL_FACE);
-
-    GLES20.glDisable(GLES20.GL_DEPTH_TEST);
-    GLES20.glDepthMask(false);
-
-    GLES20.glEnable(GLES20.GL_BLEND);
-    GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
-    GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-  }
-
-  @Override
-  public void onSurfaceChanged(GL10 gl, int width, int height) {
-    surfaceWidth = width;
-    surfaceHeight = height;
-    viewTransformation.update(width, height, xServer.screenInfo.width, xServer.screenInfo.height);
-    viewportNeedsUpdate = true;
-  }
-
-  @Override
-  public void onDrawFrame(GL10 gl) {
-    if (effectComposer.hasEffects()) {
-      effectComposer.render();
-    } else if (cpuSaverMode) {
-      drawFrameOptimized();
-    } else {
-      drawFrame();
-    }
-  }
-
-  public EffectComposer getEffectComposer() {
-    return effectComposer;
-  }
-
-  public void drawFrame() {
-    resetFrameState();
-
-    // Update the viewport if necessary
-    if (viewportNeedsUpdate && magnifierEnabled) {
-      if (fullscreen) {
-        GLES20.glViewport(0, 0, surfaceWidth, surfaceHeight);
-      } else {
-        GLES20.glViewport(
-            viewTransformation.viewOffsetX,
-            viewTransformation.viewOffsetY,
-            viewTransformation.viewWidth,
-            viewTransformation.viewHeight);
-      }
-      viewportNeedsUpdate = false;
-    }
-
-    // Clear the screen before drawing
-    GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-
-    // Apply basic transformations and draw windows
-    if (magnifierEnabled) {
-      computeMagnifierPan(tmpXForm2);
-    } else {
-      if (!fullscreen) {
-        int pointerY = 0;
-        if (screenOffsetYRelativeToCursor) {
-          short halfScreenHeight = (short) (xServer.screenInfo.height / 2);
-          pointerY =
-              Mathf.clamp(xServer.pointer.getY() - halfScreenHeight / 2, 0, halfScreenHeight);
-        }
-
-        XForm.makeTransform(
-            tmpXForm2,
-            viewTransformation.sceneOffsetX,
-            viewTransformation.sceneOffsetY - pointerY,
-            viewTransformation.sceneScaleX,
-            viewTransformation.sceneScaleY,
-            0);
-
-        GLES20.glEnable(GLES20.GL_SCISSOR_TEST);
-        GLES20.glScissor(
-            viewTransformation.viewOffsetX,
-            viewTransformation.viewOffsetY,
-            viewTransformation.viewWidth,
-            viewTransformation.viewHeight);
-      } else {
-        XForm.identity(tmpXForm2);
-      }
-    }
-
-    renderWindows();
-
-    // Render cursor if enabled
-    if (cursorVisible) {
-      GLES20.glEnable(GLES20.GL_BLEND);
-      GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
-      renderCursor();
-    }
-
-    // Disable scissor test if magnifier is disabled and not in fullscreen mode
-    if (!magnifierEnabled && !fullscreen) {
-      GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
-    }
-  }
-
-  @Override
-  public void onMapWindow(Window window) {
-    xServerView.queueEvent(this::updateScene);
-    requestRenderCoalesced();
-  }
-
-  @Override
-  public void onUnmapWindow(Window window) {
-    xServerView.queueEvent(this::updateScene);
-    requestRenderCoalesced();
-  }
-
-  @Override
-  public void onChangeWindowZOrder(Window window) {
-    xServerView.queueEvent(this::updateScene);
-    requestRenderCoalesced();
-  }
-
-  @Override
-  public void onUpdateWindowContent(Window window) {
-    requestRenderCoalesced();
-  }
-
-  @Override
-  public void onUpdateWindowGeometry(final Window window, boolean resized) {
-    if (resized) {
-      xServerView.queueEvent(this::updateScene);
-    } else {
-      xServerView.queueEvent(() -> updateWindowPosition(window));
-    }
-    requestRenderCoalesced();
-  }
-
-  @Override
-  public void onUpdateWindowAttributes(Window window, Bitmask mask) {
-    if (mask.isSet(WindowAttributes.FLAG_CURSOR)) requestRenderCoalesced();
-  }
-
-  @Override
-  public void onPointerMove(short x, short y) {
-    requestRenderCoalesced();
-  }
-
-  private void renderDrawable(Drawable drawable, int x, int y, ShaderMaterial material) {
-    if (drawable == null) return;
-    synchronized (drawable.renderLock) {
-      Drawable textureDrawable =
-          drawable.getScanoutSource() != null ? drawable.getScanoutSource() : drawable;
-      Texture texture = textureDrawable.getTexture();
-      if (texture == null) return;
-      texture.updateFromDrawable(textureDrawable);
-      if (!texture.isAllocated()) return;
-
-      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texture.getTextureId());
-      GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
-      GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
-
-      XForm.set(tmpXForm1, x, y, drawable.width, drawable.height);
-      XForm.multiply(tmpXForm1, tmpXForm1, tmpXForm2);
-
-      GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texture.getTextureId());
-      GLES20.glUniform1i(material.getUniformLocation("texture"), 0);
-      GLES20.glUniform1fv(material.getUniformLocation("xform"), tmpXForm1.length, tmpXForm1, 0);
-      GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, quadVertices.count());
-      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
-    }
-  }
-
-  private void renderWindows() {
-    windowMaterial.use();
-    GLES20.glUniform2f(
-        windowMaterial.getUniformLocation("viewSize"),
-        xServer.screenInfo.width,
-        xServer.screenInfo.height);
-    quadVertices.bind(windowMaterial.programId);
-
-    try (XLock lock = xServer.lock(XServer.Lockable.DRAWABLE_MANAGER)) {
-      int startIndex = 0;
-      int screenWidth = xServer.screenInfo.width;
-      int screenHeight = xServer.screenInfo.height;
-
-      // Skip occluded windows behind a fullscreen one
-      for (int i = renderableWindows.size() - 1; i >= 0; i--) {
-        RenderableWindow rWin = renderableWindows.get(i);
-        if (rWin.content != null
-            && rWin.content.width >= screenWidth
-            && rWin.content.height >= screenHeight) {
-          startIndex = i;
-          break;
-        }
-      }
-
-      for (int i = startIndex; i < renderableWindows.size(); i++) {
-        RenderableWindow window = renderableWindows.get(i);
-        renderDrawable(window.content, window.rootX, window.rootY, windowMaterial);
-      }
-    }
-
-    quadVertices.disable();
-  }
-
-  private void renderCursor() {
-    cursorMaterial.use();
-    GLES20.glUniform2f(
-        cursorMaterial.getUniformLocation("viewSize"),
-        xServer.screenInfo.width,
-        xServer.screenInfo.height);
-    quadVertices.bind(cursorMaterial.programId);
-
-    try (XLock lock = xServer.lock(XServer.Lockable.DRAWABLE_MANAGER)) {
-      Window pointWindow = xServer.inputDeviceManager.getPointWindow();
-      Cursor cursor = pointWindow != null ? pointWindow.attributes.getCursor() : null;
-      short x = xServer.pointer.getClampedX();
-      short y = xServer.pointer.getClampedY();
-
-      if (cursor != null) {
-        if (cursor.isVisible())
-          renderDrawable(
-              cursor.cursorImage, x - cursor.hotSpotX, y - cursor.hotSpotY, cursorMaterial);
-      } else renderDrawable(rootCursorDrawable, x, y, cursorMaterial);
-    }
-
-    quadVertices.disable();
-  }
-
-  public void toggleFullscreen() {
-    fullscreen = !fullscreen;
-    viewportNeedsUpdate = true;
-    requestRenderCoalesced();
-  }
-
-  private Drawable createRootCursorDrawable() {
-    Context context = xServerView.getContext();
-    BitmapFactory.Options options = new BitmapFactory.Options();
-    options.inScaled = false;
-    Bitmap bitmap =
-        BitmapFactory.decodeResource(context.getResources(), R.drawable.cursor, options);
-    return Drawable.fromBitmap(bitmap);
-  }
-
-  private void updateScene() {
-    try (XLock lock =
-        xServer.lock(XServer.Lockable.WINDOW_MANAGER, XServer.Lockable.DRAWABLE_MANAGER)) {
-      renderableWindows.clear();
-      collectRenderableWindows(
-          xServer.windowManager.rootWindow,
-          xServer.windowManager.rootWindow.getX(),
-          xServer.windowManager.rootWindow.getY());
-    }
-  }
-
-  private void collectRenderableWindows(Window window, int x, int y) {
-    if (!window.attributes.isMapped()) return;
-    if (window != xServer.windowManager.rootWindow) {
-      boolean viewable = true;
-
-      if (unviewableWMClasses != null) {
-        String wmClass = window.getClassName();
-        for (String unviewableWMClass : unviewableWMClasses) {
-          if (wmClass.contains(unviewableWMClass)) {
-            if (window.attributes.isEnabled()) window.disableAllDescendants();
-            viewable = false;
-            break;
-          }
-        }
-      }
-
-      if (viewable) renderableWindows.add(new RenderableWindow(window.getContent(), x, y));
-    }
-
-    for (Window child : window.getChildren()) {
-      collectRenderableWindows(child, child.getX() + x, child.getY() + y);
-    }
-  }
-
-  private void removeRenderableWindow(Window window) {
-    for (int i = 0; i < renderableWindows.size(); i++) {
-      if (renderableWindows.get(i).content == window.getContent()) {
-        renderableWindows.remove(i);
-        break;
-      }
-    }
-  }
-
-  private void updateWindowPosition(Window window) {
-    for (RenderableWindow renderableWindow : renderableWindows) {
-      if (renderableWindow.content == window.getContent()) {
-        renderableWindow.rootX = window.getRootX();
-        renderableWindow.rootY = window.getRootY();
-        break;
-      }
-    }
-  }
-
-  public void setCursorVisible(boolean cursorVisible) {
-    if (this.cursorVisible == cursorVisible) {
-      return;
-    }
-    this.cursorVisible = cursorVisible;
-    requestRenderCoalesced();
-  }
-
-  public boolean isCursorVisible() {
-    return cursorVisible;
-  }
-
-  public boolean isScreenOffsetYRelativeToCursor() {
-    return screenOffsetYRelativeToCursor;
-  }
-
-  public void setScreenOffsetYRelativeToCursor(boolean screenOffsetYRelativeToCursor) {
-    this.screenOffsetYRelativeToCursor = screenOffsetYRelativeToCursor;
-    requestRenderCoalesced();
-  }
-
-  public boolean isFullscreen() {
-    return fullscreen;
-  }
-
-  public float getMagnifierZoom() {
-    return magnifierZoom;
-  }
-
-  public void setMagnifierZoom(float magnifierZoom) {
-    if (this.magnifierZoom != magnifierZoom) {
-      this.magnifierZoom = magnifierZoom;
-      magnifierPanInitialized = false;
-    }
-    requestRenderCoalesced();
-  }
-
-  private void computeMagnifierPan(float[] outXForm) {
-    float currentZoom = !screenOffsetYRelativeToCursor ? this.magnifierZoom : 1.0f;
-    if (currentZoom <= 1.0f && !screenOffsetYRelativeToCursor) {
-      magnifierPanX = 0;
-      magnifierPanY = 0;
-      magnifierPanInitialized = false;
-      XForm.identity(outXForm);
-      return;
-    }
-
-    int screenW = xServer.screenInfo.width;
-    int screenH = xServer.screenInfo.height;
-    float cursorX = xServer.pointer.getX();
-    float cursorY = xServer.pointer.getY();
-
-    if (currentZoom > 1.0f) {
-      float maxPanX = screenW * (currentZoom - 1.0f);
-      float maxPanY = screenH * (currentZoom - 1.0f);
-
-      if (!magnifierPanInitialized) {
-        magnifierPanX = Mathf.clamp(cursorX * currentZoom - screenW * 0.5f, 0, maxPanX);
-        magnifierPanY = Mathf.clamp(cursorY * currentZoom - screenH * 0.5f, 0, maxPanY);
-        magnifierPanInitialized = true;
-      }
-
-      float visibleW = screenW / currentZoom;
-      float visibleH = screenH / currentZoom;
-      float marginX = visibleW * (1.0f - MAGNIFIER_DEADZONE_FRACTION) * 0.5f;
-      float marginY = visibleH * (1.0f - MAGNIFIER_DEADZONE_FRACTION) * 0.5f;
-
-      float visibleLeft = magnifierPanX / currentZoom;
-      float visibleTop = magnifierPanY / currentZoom;
-      float visibleRight = visibleLeft + visibleW;
-      float visibleBottom = visibleTop + visibleH;
-
-      if (cursorX < visibleLeft + marginX) {
-        magnifierPanX = (cursorX - marginX) * currentZoom;
-      } else if (cursorX > visibleRight - marginX) {
-        magnifierPanX = (cursorX - visibleW + marginX) * currentZoom;
-      }
-      if (cursorY < visibleTop + marginY) {
-        magnifierPanY = (cursorY - marginY) * currentZoom;
-      } else if (cursorY > visibleBottom - marginY) {
-        magnifierPanY = (cursorY - visibleH + marginY) * currentZoom;
-      }
-
-      magnifierPanX = Mathf.clamp(magnifierPanX, 0, maxPanX);
-      magnifierPanY = Mathf.clamp(magnifierPanY, 0, maxPanY);
-    } else {
-      magnifierPanX = 0;
-      magnifierPanY = 0;
-      magnifierPanInitialized = false;
-    }
-
-    float panY = magnifierPanY;
-    if (currentZoom == 1.0f && screenOffsetYRelativeToCursor) {
-      panY =
-          Mathf.clamp(
-              xServer.pointer.getY() * 1.0f - screenH * 0.25f,
-              0,
-              screenH * 0.5f);
-    }
-
-    XForm.makeTransform(outXForm, -magnifierPanX, -panY, currentZoom, currentZoom, 0);
-  }
-
-  public int getSurfaceWidth() {
-    return surfaceWidth;
-  }
-
-  public int getSurfaceHeight() {
-    return surfaceHeight;
-  }
-
-  public boolean isViewportNeedsUpdate() {
-    return viewportNeedsUpdate;
-  }
-
-  public void setViewportNeedsUpdate(boolean viewportNeedsUpdate) {
-    this.viewportNeedsUpdate = viewportNeedsUpdate;
-  }
-
-  public VertexAttribute getQuadVertices() {
-    return quadVertices;
-  }
-
-  public void setNativeMode(boolean enable) {
-    if (cpuSaverMode != enable) {
-      cpuSaverMode = enable;
-      viewportNeedsUpdate = true;
-      applyRenderMode();
-      requestRenderCoalesced();
-    }
-  }
-
-  public boolean isNativeMode() {
-    return cpuSaverMode;
-  }
-
-  public void setMagnifierUIActive(boolean active) {
-    if (magnifierUIActive == active) return;
-    magnifierUIActive = active;
-    magnifierPanInitialized = false;
-    viewportNeedsUpdate = true;
-    applyRenderMode();
-    requestRenderCoalesced();
-  }
-
-  public boolean isMagnifierUIActive() {
-    return magnifierUIActive;
-  }
-
-  private void applyRenderMode() {
-    xServerView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
-  }
-
-  public void setFpsLimit(int fps) {
-    currentFpsLimit = Math.max(0, Math.min(fps, MAX_FPS_LIMIT));
-  }
-
-  public int getFpsLimit() {
-    return currentFpsLimit;
-  }
-
-  private void resetFrameState() {
-    GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
-    GLES20.glEnable(GLES20.GL_BLEND);
-    GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
-  }
-
-  private void drawFrameOptimized() {
-    resetFrameState();
-
-    RenderableWindow directCandidate = null;
-    int screenW = xServer.screenInfo.width;
-    int screenH = xServer.screenInfo.height;
-
-    try (XLock lock = xServer.lock(XServer.Lockable.DRAWABLE_MANAGER)) {
-      for (int i = renderableWindows.size() - 1; i >= 0; i--) {
-        RenderableWindow rWin = renderableWindows.get(i);
-        if (rWin.content != null
-            && isDirectScanoutContent(rWin.content)
-            && rWin.content.width >= screenW * 0.95f
-            && rWin.content.height >= screenH * 0.95f) {
-          directCandidate = rWin;
-          break;
-        }
-      }
-    }
-
-    boolean isDirect = directCandidate != null;
-    if (isDirect != wasDirectMode) {
-      viewportNeedsUpdate = true;
-      wasDirectMode = isDirect;
-    }
-
-    if (isDirect) {
-      // Phase 2.3/2.5 — Direct Composition push + GL skip.
-      //
-      // When the activity has wired up a SurfaceControl target AND the
-      // candidate's scanoutSource is a GPUImage (AHardwareBuffer-backed),
-      // hand the buffer directly to the SC layer. If the push succeeded
-      // (or the cache hit), the SC layer at z=1 covers the SurfaceView's
-      // primary BufferQueue at z=0, so we can SKIP the GL render of the
-      // direct candidate entirely — that's the actual perf win this whole
-      // path is for. The GL clear + cursor render still run so the
-      // fallback for the next non-eligible frame is a clean state.
-      //
-      // If the push failed (returned false), we keep the GL render as
-      // defence in depth — the SC layer was hidden by maybePushDirectComposition's
-      // fail-out path, so the GL composition is what the user sees.
-      boolean dcOwnsFrame = maybePushDirectComposition(directCandidate);
-      dcLayerActive = dcOwnsFrame;
-
-      if (viewportNeedsUpdate) {
-        if (fullscreen) {
-          GLES20.glViewport(0, 0, surfaceWidth, surfaceHeight);
-        } else {
-          GLES20.glViewport(
-              viewTransformation.viewOffsetX,
-              viewTransformation.viewOffsetY,
-              viewTransformation.viewWidth,
-              viewTransformation.viewHeight);
-        }
-        viewportNeedsUpdate = false;
-      }
-
-      GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-      GLES20.glDisable(GLES20.GL_BLEND);
-
-      if (magnifierEnabled) {
-        computeMagnifierPan(tmpXForm2);
-      } else if (!fullscreen) {
-        int pointerY = 0;
-        if (screenOffsetYRelativeToCursor) {
-          short halfScreenHeight = (short) (xServer.screenInfo.height / 2);
-          pointerY =
-              Mathf.clamp(xServer.pointer.getY() - halfScreenHeight / 2, 0, halfScreenHeight);
-        }
-        XForm.makeTransform(
-            tmpXForm2,
-            viewTransformation.sceneOffsetX,
-            viewTransformation.sceneOffsetY - pointerY,
-            viewTransformation.sceneScaleX,
-            viewTransformation.sceneScaleY,
-            0);
-        GLES20.glEnable(GLES20.GL_SCISSOR_TEST);
-        GLES20.glScissor(
-            viewTransformation.viewOffsetX,
-            viewTransformation.viewOffsetY,
-            viewTransformation.viewWidth,
-            viewTransformation.viewHeight);
-      } else {
-        XForm.identity(tmpXForm2);
-      }
-
-      windowMaterial.use();
-      GLES20.glUniform2f(
-          windowMaterial.getUniformLocation("viewSize"),
-          xServer.screenInfo.width,
-          xServer.screenInfo.height);
-      quadVertices.bind(windowMaterial.programId);
-      // Phase 3.3 (replaces 2.5's GL-skip): always render the GL
-      // composition, even when the SurfaceControl layer is showing the
-      // same content. Reasoning:
-      //
-      //  * The actual Direct Composition perf win is HWC promoting the SC
-      //    layer to a DPU overlay plane (zero GPU compositing cost) —
-      //    NOT the GLThread skipping its draw. The GL work was already
-      //    happening pre-DC and the GPU handles it without measurable
-      //    impact on frame time.
-      //  * Skipping the GL render produced a black GLSurfaceView backing
-      //    buffer underneath the SC layer. On any direct→fallback
-      //    transition where SF applied the SC-hide before the next GL
-      //    composition (one-frame async race), the user briefly saw the
-      //    black backbuffer — visible flicker.
-      //  * Always-render keeps the GL backbuffer in lockstep with the SC
-      //    content, so a stale-frame reveal is never possible: whatever
-      //    SF reveals when SC hides is the same frame the user is
-      //    already seeing through SC.
-      //
-      // Cost: one extra SF transaction per frame plus the GL composition
-      // (which was already paid pre-DC). The transaction is microseconds;
-      // the GL composition is offloaded to Adreno and runs concurrently
-      // with HWC's DPU plane composition.
-      renderDrawable(
-          directCandidate.content, directCandidate.rootX, directCandidate.rootY, windowMaterial);
-
-      if (cursorVisible) {
-        GLES20.glEnable(GLES20.GL_BLEND);
-        GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
-        renderCursor();
-      }
-      if (!magnifierEnabled && !fullscreen) {
-        GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
-      }
-      GLES20.glEnable(GLES20.GL_BLEND);
-      GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
-      quadVertices.disable();
-    } else {
-      // No fullscreen direct-scanout candidate — fall back to normal GL
-      // composition AND hide the SC layer (it might still be showing a
-      // stale frame from when we WERE in direct mode). maybeHideDirectComposition
-      // is idempotent, so this is cheap on subsequent fallback frames.
-      maybeHideDirectComposition();
-      drawFrame();
-    }
-  }
-
-  private boolean isDirectScanoutContent(Drawable drawable) {
-    Drawable scanoutSource = drawable.getScanoutSource();
-    return scanoutSource != null && scanoutSource.isDirectScanout();
-  }
-
-  /**
-   * Phase 2.3 hot path: extract the AHardwareBuffer for the candidate's
-   * scanoutSource and hand it to the per-activity {@code DirectCompositionLayer}.
-   *
-   * <p>Holds {@code candidate.content.renderLock} for the lookup so we can't
-   * race against {@code DRI3Extension.tryPixmapFromHardwareBuffer} replacing
-   * the texture or {@code GPUImage.destroy()} releasing the underlying AHB
-   * mid-read. The JNI {@code pushBuffer} runs INSIDE the lock too — short
-   * call, SurfaceFlinger takes its own ref on the AHB inside
-   * {@code ASurfaceTransaction_setBuffer apply}, so the buffer is safe to
-   * release on the X-server thread the moment we exit the lock.
-   *
-   * <p>Per-frame waste suppression: caches the last successfully-pushed
-   * (ahbPtr, dstW, dstH) and skips the JNI call when nothing has changed.
-   * DRI3 allocates a fresh GPUImage each Present, so AHB-pointer identity
-   * is a sufficient "buffer changed" signal.
-   *
-   * <p>Failure counter: after {@code DC_FAIL_LIMIT} consecutive {@code false}
-   * returns from pushBuffer (e.g. SurfaceFlinger reparented the layer for
-   * us, or libandroid is mis-resolved on this build), nulls
-   * {@code directCompositionTarget} so subsequent frames don't keep paying
-   * the JNI cost for a permanent failure.
-   */
-  /**
-   * @return true if a fresh AHB was pushed to the SC layer this frame OR if
-   *         the cache hit (SC is still showing a valid prior frame). Used by
-   *         the caller to skip the redundant GL composition of the direct
-   *         candidate (Phase 2.5 perf win).
-   */
-  private boolean maybePushDirectComposition(RenderableWindow directCandidate) {
-    final com.winlator.cmod.runtime.display.composition.DirectCompositionLayer dcTarget =
-            directCompositionTarget;
-    if (dcTarget == null) return false;
-    if (surfaceWidth <= 0 || surfaceHeight <= 0) return false;
-    // Force fallback to GL composition when an in-process overlay needs to be
-    // visible on top of the game frame. The SC layer at z=1 covers the
-    // GLSurfaceView's primary BQ at z=0, so anything we render via GL
-    // (magnifier UI, debug HUDs, picker dialogs that draw into the GL
-    // surface) would otherwise be invisible. Hide the SC NOW (not later)
-    // so the next vsync shows the GL overlay instead of the stale buffer.
-    if (magnifierUIActive) {
-      if (dcLayerActive) {
-        dcTarget.hide();
-        dcLayerActive = false;
-        dcLastPushedAhb = 0L;
-        dcLastPushedW = 0;
-        dcLastPushedH = 0;
-      }
-      return false;
-    }
-
-    final Drawable content = directCandidate.content;
-    synchronized (content.renderLock) {
-      Drawable scanoutSource = content.getScanoutSource();
-      if (scanoutSource == null) return false;
-      com.winlator.cmod.runtime.display.renderer.Texture tex = scanoutSource.getTexture();
-      if (!(tex instanceof GPUImage)) return false;
-      long ahbPtr = ((GPUImage) tex).getHardwareBufferPtr();
-      if (ahbPtr == 0L) return false;
-      // Skip JNI when nothing has changed since the last push. SurfaceFlinger
-      // is still showing the layer; no point queueing a no-op transaction.
-      if (ahbPtr == dcLastPushedAhb
-              && surfaceWidth == dcLastPushedW
-              && surfaceHeight == dcLastPushedH) {
-        return true;
-      }
-      // Producer-acquire fence: TAKE the FD from the scanout source under
-      // the renderLock, atomically clearing it on the Drawable. We are now
-      // the single owner; if pushBuffer succeeds, the framework closes
-      // the FD via setBuffer; if pushBuffer fails, the JNI layer closes
-      // the FD on its own error paths.
-      //
-      // Today this is always -1 because the X server's PRESENT/DRI3 parser
-      // doesn't yet extract a `wait_fence` from the wire request. We
-      // empirically observe no tearing without it: the in-process Java
-      // X server processes PIXMAP_FROM_BUFFERS only after the Wine client
-      // has already submitted its Vulkan commands, and that CPU-side
-      // handoff latency exceeds GPU-write completion time on the SoCs
-      // we've tested. This is an observation about this specific pipeline,
-      // not a Vulkan or Mesa contract — when the parser gains real
-      // wait_fence support, it'll call Drawable.setAcquireFenceFd and the
-      // following takeAcquireFenceFd() will return a real FD.
-      int fenceFd = scanoutSource.takeAcquireFenceFd();
-      // Game swap-chain frames from DXVK / vkd3d-proton are RGBA8888 with
-      // alpha=1.0 throughout — declaring OPAQUE lets HWC skip the alpha-blend
-      // stage that engages the SDR-on-HDR-panel routing on Snapdragon DPUs
-      // (the visible-brightness mismatch vs the GL composition path).
-      boolean ok = dcTarget.pushBuffer(ahbPtr, 0, 0, surfaceWidth, surfaceHeight, fenceFd,
-              /* opaque */ true);
-      if (ok) {
-        dcLastPushedAhb = ahbPtr;
-        dcLastPushedW = surfaceWidth;
-        dcLastPushedH = surfaceHeight;
-        dcConsecutiveFailures = 0;
-        return true;
-      } else {
-        dcConsecutiveFailures++;
-        if (dcConsecutiveFailures >= DC_FAIL_LIMIT) {
-          android.util.Log.w(
-                  "GLRenderer",
-                  "DirectComposition push failed " + dcConsecutiveFailures
-                          + " frames in a row — disabling target for this session");
-          // Hide the SC layer BEFORE nulling the field — once the field is
-          // null, maybeHideDirectComposition has nothing to call hide() on,
-          // and SurfaceFlinger would keep showing the last successfully-pushed
-          // buffer over the GL output forever (until activity teardown
-          // released the SC). Use the local dcTarget — still live in this
-          // scope even after we null the field.
-          dcTarget.hide();
-          dcLayerActive = false;
-          directCompositionTarget = null;
-          dcLastPushedAhb = 0L;
-          dcLastPushedW = 0;
-          dcLastPushedH = 0;
-          dcConsecutiveFailures = 0;
-        }
-        return false;
-      }
-    }
-  }
-
-  /**
-   * Phase 2.5 — hide the Direct Composition layer when the current frame
-   * doesn't qualify for the SC fast path (windowed app, multi-drawable,
-   * cursor visible over a non-fullscreen scene, etc.). Idempotent and cheap
-   * after the first call: tracks {@link #dcLayerActive} so we only queue
-   * a hide-transaction once per direct→fallback transition.
-   */
-  private void maybeHideDirectComposition() {
-    if (!dcLayerActive) return;
-    com.winlator.cmod.runtime.display.composition.DirectCompositionLayer dcTarget =
-            directCompositionTarget;
-    if (dcTarget != null) {
-      dcTarget.hide();
-    }
-    dcLayerActive = false;
-    // Invalidate the cache so the next pushBuffer re-shows with a fresh
-    // setBuffer + setVisibility(SHOW) transaction, even if the same AHB
-    // pointer happens to be active.
-    dcLastPushedAhb = 0L;
-    dcLastPushedW = 0;
-    dcLastPushedH = 0;
-  }
-
-  public void setUnviewableWMClasses(String... unviewableWMNames) {
-    this.unviewableWMClasses = unviewableWMNames;
-  }
-
-  /**
-   * Hand the renderer the per-activity Direct Composition layer (or null to
-   * detach). Safe to call from the UI thread; the GLThread reads the field
-   * volatile-ly each frame inside {@link #drawFrameOptimized()}.
-   *
-   * <p>When the layer is set AND the frame is a fullscreen direct-scanout
-   * candidate, the drawable's underlying AHardwareBuffer is also pushed to
-   * the SurfaceControl. The GLRenderer keeps drawing the same frame for
-   * Phase 2.3 (defence-in-depth: if the SurfaceControl path fails for any
-   * reason, the GL output is still visible underneath the SC layer).
-   * Phase 2.5 will skip the GL render to capture the actual perf win.
-   */
-  public void setDirectCompositionTarget(
-          com.winlator.cmod.runtime.display.composition.DirectCompositionLayer layer) {
-    this.directCompositionTarget = layer;
-  }
-
-  @Override
-  public void onFramePresented(com.winlator.cmod.runtime.display.xserver.Window window) {
-  }
-}
diff --git a/app/src/main/runtime/display/renderer/GPUImage.java b/app/src/main/runtime/display/renderer/GPUImage.java
index 9c928ed6d..8be69a73e 100644
--- a/app/src/main/runtime/display/renderer/GPUImage.java
+++ b/app/src/main/runtime/display/renderer/GPUImage.java
@@ -1,167 +1,181 @@
 package com.winlator.cmod.runtime.display.renderer;
 
+import android.util.Log;
 import androidx.annotation.Keep;
+import com.winlator.cmod.runtime.system.ApplicationLogGate;
 import com.winlator.cmod.runtime.display.xserver.Drawable;
 import java.nio.ByteBuffer;
 
+/*
+ * Vulkan-backed AHardwareBuffer texture.
+ *
+ * Local images create a CPU-mappable BGRA buffer for X server pixel writes,
+ * then import it as a sampleable Vulkan image on demand.
+ *
+ * Imported images use an existing DRI3 buffer from a Unix socket without CPU mapping.
+ */
 public class GPUImage extends Texture {
-  private long hardwareBufferPtr;
-  private long imageKHRPtr;
-  private ByteBuffer virtualData;
-  private short stride;
-  private boolean locked;
-  private boolean cpuAccessible;
-  private boolean samplingFailed;
-  private static boolean supported = false;
-
-  static {
-    System.loadLibrary("winlator");
-  }
-
-  public GPUImage(short width, short height) {
-    try {
-      cpuAccessible = true;
-      hardwareBufferPtr = createHardwareBuffer(width, height);
-      initializeCpuMapping();
-    } catch (Throwable e) {
-      System.err.println("Error: Failed to create GPUImage: " + e.getMessage());
-      destroy();
+    private static final String TAG = "GPUImage";
+
+    private long ahbPtr = 0;
+    private ByteBuffer virtualData;
+    private short stride;
+    private boolean locked;
+    private boolean cpuAccessible;
+    private boolean samplingFailed;
+    private static boolean supported = false;
+
+    public GPUImage(short width, short height) {
+        try {
+            cpuAccessible = true;
+            ahbPtr = nativeAhbCreate(width, height);
+            if (ahbPtr == 0) {
+                Log.w(TAG, "AHB allocation returned null for " + width + "x" + height);
+                return;
+            }
+            virtualData = nativeAhbLock(ahbPtr);
+            locked = virtualData != null && stride > 0;
+            if (!locked) {
+                Log.w(TAG, "AHB CPU mapping failed for " + width + "x" + height);
+                nativeAhbDestroy(ahbPtr, false);
+                ahbPtr = 0;
+                virtualData = null;
+            } else {
+                if (ApplicationLogGate.isEnabled()) {
+                    Log.i(TAG, "AHB allocated and CPU mapped: " + width + "x" + height
+                            + " stride=" + Short.toUnsignedInt(stride)
+                            + " ptr=0x" + Long.toHexString(ahbPtr));
+                }
+            }
+        } catch (Throwable e) {
+            Log.e(TAG, "Failed to create AHB-backed GPUImage", e);
+            destroy();
+        }
     }
-  }
-
-  public GPUImage(int socketFd) {
-    try {
-      cpuAccessible = false;
-      hardwareBufferPtr = hardwareBufferFromSocket(socketFd);
-    } catch (Throwable e) {
-      System.err.println("Error: Failed to import GPUImage: " + e.getMessage());
-      destroy();
+
+    public GPUImage(int socketFd) {
+        try {
+            cpuAccessible = false;
+            ahbPtr = nativeAhbImportFromSocket(socketFd);
+            if (ahbPtr != 0) {
+                if (ApplicationLogGate.isEnabled()) {
+                    Log.i(TAG, "AHB loaded from DRI3 socket fd=" + socketFd
+                            + " ptr=0x" + Long.toHexString(ahbPtr));
+                }
+            } else {
+                Log.w(TAG, "AHB import from DRI3 socket failed for fd=" + socketFd);
+            }
+        } catch (Throwable e) {
+            Log.e(TAG, "Failed to import AHB-backed GPUImage", e);
+            destroy();
+        }
     }
-  }
 
-  private void initializeCpuMapping() {
-    if (hardwareBufferPtr == 0) {
-      System.err.println("Error: Failed to create hardware buffer");
-      return;
+    @Override
+    public void allocateTexture(short width, short height, ByteBuffer data) {
+        if (isAllocated()) return;
+        long renderer = getRendererHandle();
+        if (renderer == 0 || ahbPtr == 0) {
+            Log.w(TAG, "Skipping AHB Vulkan import: renderer=0x" + Long.toHexString(renderer)
+                    + " ahb=0x" + Long.toHexString(ahbPtr));
+            return;
+        }
+        nativeHandle = nativeImportAhbToVulkan(renderer, ahbPtr, true);
+        if (nativeHandle == 0) {
+            samplingFailed = true;
+            Log.w(TAG, "AHB Vulkan import failed: " + width + "x" + height
+                    + " ahb=0x" + Long.toHexString(ahbPtr));
+        } else {
+            handleGeneration = getRendererGeneration();
+            if (ApplicationLogGate.isEnabled()) {
+                Log.i(TAG, "AHB imported into Vulkan texture: " + width + "x" + height
+                        + " tex=0x" + Long.toHexString(nativeHandle));
+            }
+        }
     }
 
-    virtualData = lockHardwareBuffer(hardwareBufferPtr);
-    if (virtualData == null) {
-      System.err.println("Error: Failed to lock hardware buffer");
-      destroyHardwareBuffer(hardwareBufferPtr, false);
-      hardwareBufferPtr = 0;
-    } else {
-      locked = true;
+    @Override
+    public void updateFromDrawable(Drawable drawable) {
+        if (!isAllocated()) allocateTexture(drawable.width, drawable.height, null);
+        // The producer already shares this AHB with the GPU, so there is no CPU upload.
+        needsUpdate = false;
     }
-  }
-
-  @Override
-  public void allocateTexture(short width, short height, ByteBuffer data) {
-    if (isAllocated()) return;
-    super.allocateTexture(width, height, null);
-    if (hardwareBufferPtr != 0) {
-      imageKHRPtr = createImageKHR(hardwareBufferPtr, textureId);
-      if (imageKHRPtr == 0) {
-        System.err.println("Error: Failed to create EGL image");
-        samplingFailed = true;
-        destroyHardwareBuffer(hardwareBufferPtr, locked);
-        hardwareBufferPtr = 0;
-        locked = false;
-        virtualData = null;
-        super.destroy();
-      }
+
+    @Override
+    boolean appendUploadFromDrawable(Drawable drawable, UploadBatch batch) {
+        updateFromDrawable(drawable);
+        return false;
     }
-  }
-
-  @Override
-  public void updateFromDrawable(Drawable drawable) {
-    if (!isAllocated()) allocateTexture(drawable.width, drawable.height, null);
-    if (!isAllocated()) return;
-    needsUpdate = false;
-  }
-
-  public short getStride() {
-    return stride;
-  }
-
-  @Keep
-  private void setStride(short stride) {
-    this.stride = stride;
-  }
-
-  public ByteBuffer getVirtualData() {
-    return virtualData;
-  }
-
-  public boolean isValid() {
-    return hardwareBufferPtr != 0 && (!cpuAccessible || (virtualData != null && stride > 0));
-  }
-
-  /**
-   * Raw {@code AHardwareBuffer*} pointer (a JNI-returned {@code long}). Used by
-   * the Direct Composition path to hand this image directly to a child
-   * {@code ASurfaceControl} via {@code ASurfaceTransaction_setBuffer}, bypassing
-   * the in-process GLRenderer composition. Returns {@code 0} if the buffer
-   * was never imported / has been destroyed — callers MUST treat 0 as
-   * "no buffer available, fall back to GL path".
-   *
-   * <p>The pointer remains valid only for the lifetime of this {@code GPUImage}.
-   * SurfaceFlinger takes its own reference when the AHB is set on a layer, so
-   * holding the pointer past {@link #destroy()} is illegal — release any
-   * SurfaceControl reference first.
-   */
-  public long getHardwareBufferPtr() {
-    return hardwareBufferPtr;
-  }
-
-  public boolean hasSamplingFailed() {
-    return samplingFailed;
-  }
-
-  @Override
-  public void destroy() {
-    if (imageKHRPtr != 0) {
-      destroyImageKHR(imageKHRPtr);
-      imageKHRPtr = 0;
+
+    public short getStride() {
+        return stride;
     }
-    if (hardwareBufferPtr != 0) {
-      destroyHardwareBuffer(hardwareBufferPtr, locked);
-      hardwareBufferPtr = 0;
+
+    @Keep
+    private void setStride(short stride) {
+        this.stride = stride;
     }
-    locked = false;
-    virtualData = null;
-    samplingFailed = false;
-    super.destroy();
-  }
-
-  public static boolean isSupported() {
-    return supported;
-  }
-
-  public static void checkIsSupported() {
-    final short size = 8;
-    GPUImage gpuImage = null;
-    try {
-      gpuImage = new GPUImage(size, size);
-      gpuImage.allocateTexture(size, size, null);
-      supported = gpuImage.isValid() && gpuImage.imageKHRPtr != 0;
-    } catch (Throwable e) {
-      supported = false;
-      System.err.println("Error: GPUImage support probe failed: " + e.getMessage());
-    } finally {
-      if (gpuImage != null) gpuImage.destroy();
+
+    public ByteBuffer getVirtualData() {
+        return virtualData;
     }
-  }
 
-  private native long hardwareBufferFromSocket(int fd);
+    /**
+     * Raw {@code AHardwareBuffer*} for the Direct Composition path. Returns 0
+     * once destroyed, which callers must treat as "fall back to compositing".
+     * Valid only for this GPUImage's lifetime.
+     */
+    public long getHardwareBufferPtr() {
+        return ahbPtr;
+    }
 
-  private native long createHardwareBuffer(short width, short height);
+    public boolean isValid() {
+        return ahbPtr != 0 && (!cpuAccessible || (virtualData != null && stride > 0));
+    }
 
-  private native void destroyHardwareBuffer(long hardwareBufferPtr, boolean locked);
+    public boolean hasSamplingFailed() {
+        return samplingFailed;
+    }
 
-  private native ByteBuffer lockHardwareBuffer(long hardwareBufferPtr);
+    @Override
+    public void destroy() {
+        super.destroy();
+        if (ahbPtr != 0) {
+            nativeAhbDestroy(ahbPtr, locked);
+            ahbPtr = 0;
+        }
+        locked = false;
+        virtualData = null;
+        samplingFailed = false;
+    }
+
+    public static boolean isSupported() {
+        return supported;
+    }
+
+    public static void checkIsSupported() {
+        final short size = 8;
+        GPUImage probe = null;
+        try {
+            if (ApplicationLogGate.isEnabled()) Log.i(TAG, "Probing AHB Vulkan support");
+            probe = new GPUImage(size, size);
+            probe.allocateTexture(size, size, null);
+            supported = probe.isValid() && probe.getNativeHandle() != 0;
+            if (ApplicationLogGate.isEnabled()) {
+                Log.i(TAG, "AHB Vulkan support probe result: supported=" + supported);
+            }
+        } catch (Throwable e) {
+            supported = false;
+            Log.e(TAG, "AHB Vulkan support probe failed", e);
+        } finally {
+            if (probe != null) probe.destroy();
+        }
+    }
 
-  private native long createImageKHR(long hardwareBufferPtr, int textureId);
+    private native long nativeAhbCreate(short width, short height);
+    private native long nativeAhbImportFromSocket(int socketFd);
+    private native ByteBuffer nativeAhbLock(long ahbPtr);
+    private native void nativeAhbDestroy(long ahbPtr, boolean locked);
 
-  private native void destroyImageKHR(long imageKHRPtr);
+    private static native long nativeImportAhbToVulkan(long rendererHandle, long ahbPtr, boolean transferOwnership);
 }
diff --git a/app/src/main/runtime/display/renderer/RenderCallback.java b/app/src/main/runtime/display/renderer/RenderCallback.java
new file mode 100644
index 000000000..bb26df5ab
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/RenderCallback.java
@@ -0,0 +1,10 @@
+package com.winlator.cmod.runtime.display.renderer;
+
+/** Generic surface-driven render callback. The Vulkan renderer implements this. */
+public interface RenderCallback {
+    void onSurfaceCreated();
+    void onSurfaceChanged(int width, int height);
+    void onSurfaceDestroyed();
+    /** Called on the render thread for each frame to build and submit. */
+    void onDrawFrame();
+}
diff --git a/app/src/main/runtime/display/renderer/RenderTarget.java b/app/src/main/runtime/display/renderer/RenderTarget.java
deleted file mode 100644
index ee03b3753..000000000
--- a/app/src/main/runtime/display/renderer/RenderTarget.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer;
-
-import android.opengl.GLES20;
-
-// This class extends the Texture class and manages a framebuffer object (FBO).
-public class RenderTarget extends Texture {
-  // Field to store the OpenGL framebuffer ID.
-  private int framebuffer;
-
-  // Constructor
-  public RenderTarget() {
-    // Call the superclass constructor to initialize the texture.
-    super();
-  }
-
-  // Generates a new framebuffer and stores its ID in the framebuffer field.
-  private void generateFramebuffer() {
-    // Create a new array to hold the framebuffer ID.
-    int[] framebuffers = new int[1];
-    // Generate a framebuffer and store its ID in the array.
-    GLES20.glGenFramebuffers(1, framebuffers, 0);
-    // Set the framebuffer field to the generated framebuffer ID.
-    framebuffer = framebuffers[0];
-  }
-
-  // Allocates and initializes the framebuffer and texture with the specified width and height.
-  public void allocateFramebuffer(int width, int height) {
-    // Check if the framebuffer is already allocated.
-    if (framebuffer != 0) {
-      return; // If the framebuffer is already allocated, return.
-    }
-
-    // Generate the framebuffer if not already done.
-    generateFramebuffer();
-
-    // Generate a texture ID using the superclass method.
-    generateTextureId();
-
-    // Bind the framebuffer.
-    GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, framebuffer);
-
-    // Activate texture unit 0.
-    GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-
-    // Set pixel storage mode for unpacking pixel data from memory.
-    GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, unpackAlignment);
-
-    // Bind the texture to the 2D texture target.
-    GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId);
-
-    // Allocate memory for the texture image with the specified width, height, and format.
-    GLES20.glTexImage2D(
-        GLES20.GL_TEXTURE_2D, 0, format, width, height, 0, format, GLES20.GL_UNSIGNED_BYTE, null);
-
-    // Set texture parameters (like filtering and wrapping modes).
-    setTextureParameters();
-
-    // Attach the texture to the framebuffer as a color attachment.
-    GLES20.glFramebufferTexture2D(
-        GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0, GLES20.GL_TEXTURE_2D, textureId, 0);
-
-    // Unbind the texture.
-    GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
-
-    // Unbind the framebuffer.
-    GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
-  }
-
-  // Returns the framebuffer ID.
-  public int getFramebuffer() {
-    return framebuffer;
-  }
-}
diff --git a/app/src/main/runtime/display/renderer/Texture.java b/app/src/main/runtime/display/renderer/Texture.java
index aeaf98271..ecea07b88 100644
--- a/app/src/main/runtime/display/renderer/Texture.java
+++ b/app/src/main/runtime/display/renderer/Texture.java
@@ -1,149 +1,337 @@
 package com.winlator.cmod.runtime.display.renderer;
 
-import android.opengl.GLES11Ext;
-import android.opengl.GLES20;
 import com.winlator.cmod.runtime.display.xserver.Drawable;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
+/**
+ * Vulkan-backed texture. The underlying VkImage / VkImageView / VkSampler / descriptor set
+ * are owned by native code; Java holds a pointer plus the renderer pointer needed to free it.
+ *
+ * <p>Lifecycle:
+ * <ul>
+ *   <li>{@link #allocateTexture(short, short, ByteBuffer)} synchronously creates and uploads
+ *       to a VkImage. Blocks the calling thread for a one-shot transfer submit.</li>
+ *   <li>{@link #updateFromDrawable(Drawable)} re-uploads the drawable's data when {@code needsUpdate}.</li>
+ *   <li>{@link #destroy()} schedules deferred destruction via the renderer's graveyard.</li>
+ * </ul>
+ */
 public class Texture {
-  protected int textureId = 0;
-  private int wrapS = GLES20.GL_CLAMP_TO_EDGE;
-  private int wrapT = GLES20.GL_CLAMP_TO_EDGE;
-  private int magFilter = GLES20.GL_LINEAR;
-  private int minFilter = GLES20.GL_LINEAR;
-  protected int format = GLES11Ext.GL_BGRA;
-  protected boolean needsUpdate = true;
-  protected byte unpackAlignment = 4; // or add a getter method
-
-  public void allocateTexture(short width, short height, ByteBuffer data) {
-    int[] textureIds = new int[1];
-    GLES20.glGenTextures(1, textureIds, 0);
-    textureId = textureIds[0];
-
-    GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-    GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 4);
-    GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId);
-
-    if (data != null) {
-      GLES20.glTexImage2D(
-          GLES20.GL_TEXTURE_2D, 0, format, width, height, 0, format, GLES20.GL_UNSIGNED_BYTE, data);
-    }
-
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, wrapS);
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, wrapT);
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, magFilter);
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, minFilter);
-
-    GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
-  }
-
-  public int getWrapS() {
-    return wrapS;
-  }
-
-  public void setWrapS(int wrapS) {
-    this.wrapS = wrapS;
-  }
-
-  public int getWrapT() {
-    return wrapT;
-  }
-
-  public void setWrapT(int wrapT) {
-    this.wrapT = wrapT;
-  }
-
-  public int getMagFilter() {
-    return magFilter;
-  }
-
-  public void setMagFilter(int magFilter) {
-    this.magFilter = magFilter;
-  }
-
-  public int getMinFilter() {
-    return minFilter;
-  }
-
-  public void setMinFilter(int minFilter) {
-    this.minFilter = minFilter;
-  }
-
-  public int getFormat() {
-    return format;
-  }
-
-  public void setFormat(int format) {
-    this.format = format;
-  }
-
-  public boolean isNeedsUpdate() {
-    return needsUpdate;
-  }
-
-  public void setNeedsUpdate(boolean needsUpdate) {
-    this.needsUpdate = needsUpdate;
-  }
-
-  public void updateFromDrawable(Drawable drawable) {
-    ByteBuffer data = drawable.getData();
-    if (data == null) return;
-
-    if (!isAllocated()) {
-      allocateTexture(drawable.width, drawable.height, data);
-    } else if (needsUpdate) {
-      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId);
-      GLES20.glTexSubImage2D(
-          GLES20.GL_TEXTURE_2D,
-          0,
-          0,
-          0,
-          drawable.width,
-          drawable.height,
-          format,
-          GLES20.GL_UNSIGNED_BYTE,
-          data);
-      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
-      needsUpdate = false;
-    }
-  }
-
-  public boolean isAllocated() {
-    return textureId > 0;
-  }
-
-  public int getTextureId() {
-    return textureId;
-  }
-
-  public void copyFromFramebuffer(int framebuffer, short width, short height) {
-    if (!isAllocated()) allocateTexture(width, height, null);
-    GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, framebuffer);
-    GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-    GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId);
-    GLES20.glCopyTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, 0, 0, width, height, 0);
-    GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
-    GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
-  }
-
-  public void destroy() {
-    if (textureId > 0) {
-      int[] textureIds = new int[] {textureId};
-      GLES20.glDeleteTextures(textureIds.length, textureIds, 0);
-      textureId = 0;
-    }
-  }
-
-  protected void generateTextureId() {
-    int[] textureIds = new int[1];
-    GLES20.glGenTextures(1, textureIds, 0);
-    textureId = textureIds[0];
-  }
-
-  protected void setTextureParameters() {
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, wrapS);
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, wrapT);
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, magFilter);
-    GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, minFilter);
-  }
+    public static final int MAX_UPLOAD_RECTS = 8;
+    private static final int BATCH_ENTRY_SIZE = 48;
+    private static final long MAX_BATCH_BYTES = 16L * 1024L * 1024L;
+
+    static {
+        System.loadLibrary("winlator");
+    }
+
+    protected long nativeHandle = 0;
+    protected boolean needsUpdate = true;
+    protected long handleGeneration = 0;
+    private final int[] dirtyRects = new int[MAX_UPLOAD_RECTS * 4];
+    private int dirtyRectCount = 0;
+    private boolean dirtyFull = true;
+    private long dirtySerial = 1;
+
+    private static long sRendererHandle = 0;
+    private static long sRendererGeneration = 0;
+
+    /** Called by the renderer at startup so static texture create/destroy methods know which device to use. */
+    public static void setRendererHandle(long handle) {
+        if (handle != sRendererHandle) {
+            sRendererGeneration++;
+            sRendererHandle = handle;
+        }
+    }
+
+    public static long getRendererHandle() {
+        return sRendererHandle;
+    }
+
+    public static long getRendererGeneration() {
+        return sRendererGeneration;
+    }
+
+    public Texture() {}
+
+    // A renderer teardown frees every VkTexture it owns. Java handles from that generation
+    // are dangling pointers; drop them so the next access reallocates against the live renderer.
+    protected void invalidateIfStale() {
+        if (nativeHandle != 0 && handleGeneration != sRendererGeneration) {
+            nativeHandle = 0;
+            needsUpdate = true;
+            dirtyFull = true;
+            dirtyRectCount = 0;
+            dirtySerial++;
+        }
+    }
+
+    public void allocateTexture(short width, short height, ByteBuffer data) {
+        invalidateIfStale();
+        if (nativeHandle != 0 || sRendererHandle == 0) return;
+        int strideBytes = data != null ? data.capacity() / Math.max(1, height) : width * 4;
+        int stridePixels = Math.max(1, strideBytes / 4);
+        nativeHandle = nativeAllocate(sRendererHandle, width, height, data, stridePixels);
+        if (nativeHandle != 0) {
+            handleGeneration = sRendererGeneration;
+            needsUpdate = false;
+            clearDirtyRect();
+        }
+    }
+
+    public void updateFromDrawable(Drawable drawable) {
+        if (sRendererHandle == 0) return;
+        invalidateIfStale();
+        ByteBuffer data = drawable.getData();
+        if (data == null) return;
+
+        if (nativeHandle == 0) {
+            allocateTexture(drawable.width, drawable.height, data);
+            return;
+        }
+        if (needsUpdate) {
+            int stridePixels = stridePixels(data, drawable.height);
+            int[] bounds = dirtyBounds(drawable.width, drawable.height);
+            int x = bounds[0];
+            int y = bounds[1];
+            int w = bounds[2];
+            int h = bounds[3];
+            if (nativeUpdate(sRendererHandle, nativeHandle, drawable.width, drawable.height,
+                             data, stridePixels, x, y, w, h)) {
+                needsUpdate = false;
+                clearDirtyRect();
+            }
+        }
+    }
+
+    public boolean isAllocated() {
+        invalidateIfStale();
+        return nativeHandle != 0;
+    }
+
+    public boolean isNeedsUpdate() {
+        return needsUpdate;
+    }
+
+    public void setNeedsUpdate(boolean needsUpdate) {
+        this.needsUpdate = needsUpdate;
+        dirtySerial++;
+        if (needsUpdate) {
+            dirtyFull = true;
+            dirtyRectCount = 0;
+        } else {
+            clearDirtyRect();
+        }
+    }
+
+    public void markDirty(int x, int y, int width, int height, int textureWidth, int textureHeight) {
+        if (width <= 0 || height <= 0) return;
+        int x0 = Math.max(0, x);
+        int y0 = Math.max(0, y);
+        int x1 = Math.min(textureWidth, x + width);
+        int y1 = Math.min(textureHeight, y + height);
+        if (x1 <= x0 || y1 <= y0) return;
+
+        needsUpdate = true;
+        dirtySerial++;
+        if (dirtyFull) return;
+
+        if (dirtyRectCount < MAX_UPLOAD_RECTS) {
+            int off = dirtyRectCount * 4;
+            dirtyRects[off] = x0;
+            dirtyRects[off + 1] = y0;
+            dirtyRects[off + 2] = x1 - x0;
+            dirtyRects[off + 3] = y1 - y0;
+            dirtyRectCount++;
+            return;
+        }
+
+        int minX = x0;
+        int minY = y0;
+        int maxX = x1;
+        int maxY = y1;
+        for (int i = 0; i < dirtyRectCount; i++) {
+            int off = i * 4;
+            minX = Math.min(minX, dirtyRects[off]);
+            minY = Math.min(minY, dirtyRects[off + 1]);
+            maxX = Math.max(maxX, dirtyRects[off] + dirtyRects[off + 2]);
+            maxY = Math.max(maxY, dirtyRects[off + 1] + dirtyRects[off + 3]);
+        }
+        dirtyRects[0] = minX;
+        dirtyRects[1] = minY;
+        dirtyRects[2] = maxX - minX;
+        dirtyRects[3] = maxY - minY;
+        dirtyRectCount = 1;
+    }
+
+    boolean appendUploadFromDrawable(Drawable drawable, UploadBatch batch) {
+        if (sRendererHandle == 0) return false;
+        invalidateIfStale();
+        ByteBuffer data = drawable.getData();
+        if (data == null) return false;
+
+        if (nativeHandle == 0) {
+            allocateTexture(drawable.width, drawable.height, data);
+            return false;
+        }
+        if (!needsUpdate) return false;
+
+        int stridePixels = stridePixels(data, drawable.height);
+        long serial = dirtySerial;
+        if (dirtyFull || dirtyRectCount == 0) {
+            if (!batch.add(this, drawable, serial, data, drawable.width, drawable.height,
+                    stridePixels, 0, 0, drawable.width, drawable.height)) {
+                updateFromDrawable(drawable);
+                return false;
+            }
+            return true;
+        }
+
+        for (int i = 0; i < dirtyRectCount; i++) {
+            int off = i * 4;
+            if (!batch.add(this, drawable, serial, data, drawable.width, drawable.height,
+                    stridePixels, dirtyRects[off], dirtyRects[off + 1],
+                    dirtyRects[off + 2], dirtyRects[off + 3])) {
+                updateFromDrawable(drawable);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void markUploaded(long serial) {
+        if (dirtySerial != serial) return;
+        needsUpdate = false;
+        clearDirtyRect();
+    }
+
+    private int[] dirtyBounds(int textureWidth, int textureHeight) {
+        if (dirtyFull || dirtyRectCount == 0) {
+            return new int[]{0, 0, textureWidth, textureHeight};
+        }
+
+        int minX = textureWidth;
+        int minY = textureHeight;
+        int maxX = 0;
+        int maxY = 0;
+        for (int i = 0; i < dirtyRectCount; i++) {
+            int off = i * 4;
+            minX = Math.min(minX, dirtyRects[off]);
+            minY = Math.min(minY, dirtyRects[off + 1]);
+            maxX = Math.max(maxX, dirtyRects[off] + dirtyRects[off + 2]);
+            maxY = Math.max(maxY, dirtyRects[off + 1] + dirtyRects[off + 3]);
+        }
+        return new int[]{minX, minY, Math.max(0, maxX - minX), Math.max(0, maxY - minY)};
+    }
+
+    private static int stridePixels(ByteBuffer data, int height) {
+        int strideBytes = data.capacity() / Math.max(1, height);
+        return Math.max(1, strideBytes / 4);
+    }
+
+    private void clearDirtyRect() {
+        dirtyFull = false;
+        dirtyRectCount = 0;
+    }
+
+    public void destroy() {
+        invalidateIfStale();
+        if (nativeHandle != 0 && sRendererHandle != 0) {
+            nativeDestroy(sRendererHandle, nativeHandle);
+            nativeHandle = 0;
+        }
+    }
+
+    public long getNativeHandle() {
+        invalidateIfStale();
+        return nativeHandle;
+    }
+
+    private static native long nativeAllocate(long rendererHandle, int width, int height,
+                                              ByteBuffer data, int stridePixels);
+    private static native boolean nativeUpdate(long rendererHandle, long texHandle, int width,
+                                               int height, ByteBuffer data, int stridePixels,
+                                               int dirtyX, int dirtyY, int dirtyWidth,
+                                               int dirtyHeight);
+    private static native boolean nativeBatchUpdate(long rendererHandle, ByteBuffer entries,
+                                                    Object[] buffers, int count);
+    private static native void nativeDestroy(long rendererHandle, long texHandle);
+
+    public static final class UploadBatch {
+        private final ByteBuffer entries;
+        private final Object[] buffers;
+        private final Texture[] textures;
+        private final Drawable[] drawables;
+        private final long[] serials;
+        private int count;
+        private long totalBytes;
+
+        public UploadBatch(int capacity) {
+            entries = ByteBuffer.allocateDirect(capacity * BATCH_ENTRY_SIZE)
+                    .order(ByteOrder.nativeOrder());
+            buffers = new Object[capacity];
+            textures = new Texture[capacity];
+            drawables = new Drawable[capacity];
+            serials = new long[capacity];
+        }
+
+        public void reset() {
+            for (int i = 0; i < count; i++) {
+                buffers[i] = null;
+                textures[i] = null;
+                drawables[i] = null;
+            }
+            count = 0;
+            totalBytes = 0;
+        }
+
+        private boolean add(Texture texture, Drawable drawable, long serial, ByteBuffer data,
+                            int width, int height, int stridePixels,
+                            int dirtyX, int dirtyY, int dirtyWidth, int dirtyHeight) {
+            if (count >= buffers.length) return false;
+            int off = count * BATCH_ENTRY_SIZE;
+            entries.putLong(off, texture.nativeHandle);
+            entries.putInt(off + 8, width);
+            entries.putInt(off + 12, height);
+            entries.putInt(off + 16, stridePixels);
+            entries.putInt(off + 20, dirtyX);
+            entries.putInt(off + 24, dirtyY);
+            entries.putInt(off + 28, dirtyWidth);
+            entries.putInt(off + 32, dirtyHeight);
+            entries.putInt(off + 36, count);
+            buffers[count] = data;
+            textures[count] = texture;
+            drawables[count] = drawable;
+            serials[count] = serial;
+            count++;
+            totalBytes += (long) dirtyWidth * Math.max(0, dirtyHeight) * 4L;
+            return true;
+        }
+
+        public void flush(long rendererHandle) {
+            if (count == 0 || rendererHandle == 0) return;
+            if (count == 1 || totalBytes > MAX_BATCH_BYTES) {
+                for (int i = 0; i < count; i++) {
+                    synchronized (drawables[i].renderLock) {
+                        textures[i].updateFromDrawable(drawables[i]);
+                    }
+                }
+                return;
+            }
+            boolean ok = nativeBatchUpdate(rendererHandle, entries, buffers, count);
+            if (ok) {
+                for (int i = 0; i < count; i++) {
+                    synchronized (drawables[i].renderLock) {
+                        textures[i].markUploaded(serials[i]);
+                    }
+                }
+            } else {
+                for (int i = 0; i < count; i++) {
+                    synchronized (drawables[i].renderLock) {
+                        textures[i].updateFromDrawable(drawables[i]);
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/runtime/display/renderer/VertexAttribute.java b/app/src/main/runtime/display/renderer/VertexAttribute.java
deleted file mode 100644
index 185638016..000000000
--- a/app/src/main/runtime/display/renderer/VertexAttribute.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer;
-
-import android.opengl.GLES20;
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-
-public class VertexAttribute {
-  private Buffer buffer;
-  private int bufferId = 0;
-  private int location = -1;
-  private final String name;
-  private final byte itemSize;
-  private boolean needsUpdate = true;
-
-  public VertexAttribute(String name, int itemSize) {
-    this.name = name;
-    this.itemSize = (byte) itemSize;
-  }
-
-  public int getLocation() {
-    return location;
-  }
-
-  public void put(float[] array) {
-    buffer = FloatBuffer.wrap(array);
-    needsUpdate = true;
-  }
-
-  public void update() {
-    if (!needsUpdate || buffer == null) return;
-    if (bufferId == 0) {
-      int[] bufferIds = new int[1];
-      GLES20.glGenBuffers(1, bufferIds, 0);
-      bufferId = bufferIds[0];
-    }
-
-    int size = buffer.limit() * 4;
-    GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, bufferId);
-    GLES20.glBufferData(GLES20.GL_ARRAY_BUFFER, size, buffer, GLES20.GL_STATIC_DRAW);
-
-    GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0);
-    needsUpdate = false;
-  }
-
-  public void bind(int programId) {
-    update();
-    if (location == -1) location = GLES20.glGetAttribLocation(programId, name);
-    GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, bufferId);
-    GLES20.glEnableVertexAttribArray(location);
-    GLES20.glVertexAttribPointer(location, itemSize, GLES20.GL_FLOAT, false, 0, 0);
-  }
-
-  public void disable() {
-    if (location == -1) return;
-    GLES20.glDisableVertexAttribArray(location);
-  }
-
-  public void destroy() {
-    clear();
-
-    if (bufferId > 0) {
-      int[] bufferIds = new int[] {bufferId};
-      GLES20.glDeleteBuffers(bufferIds.length, bufferIds, 0);
-      bufferId = 0;
-    }
-  }
-
-  public void clear() {
-    if (buffer != null) {
-      buffer.limit(0);
-      buffer = null;
-    }
-  }
-
-  public int count() {
-    return buffer != null ? buffer.limit() / itemSize : 0;
-  }
-}
diff --git a/app/src/main/runtime/display/renderer/ViewTransformation.java b/app/src/main/runtime/display/renderer/ViewTransformation.java
index 4a83faf4c..e8144e3a9 100644
--- a/app/src/main/runtime/display/renderer/ViewTransformation.java
+++ b/app/src/main/runtime/display/renderer/ViewTransformation.java
@@ -1,6 +1,15 @@
 package com.winlator.cmod.runtime.display.renderer;
 
 public class ViewTransformation {
+  /** Letterbox: preserve the game's aspect ratio, centering it with black bars (default). */
+  public static final int FILL_MODE_FIT = 0;
+  /** Stretch the game to fill the whole surface, ignoring aspect ratio. */
+  public static final int FILL_MODE_STRETCH = 1;
+  /** Zoom/crop: fill the surface preserving aspect, cropping the overflowing edges. */
+  public static final int FILL_MODE_ZOOM = 2;
+
+  public int mode = FILL_MODE_FIT;
+
   public int viewOffsetX;
   public int viewOffsetY;
   public int viewWidth;
@@ -12,7 +21,26 @@ public class ViewTransformation {
   public float sceneOffsetY;
 
   public void update(int outerWidth, int outerHeight, int innerWidth, int innerHeight) {
-    aspect = Math.min((float) outerWidth / innerWidth, (float) outerHeight / innerHeight);
+    if (outerWidth <= 0 || outerHeight <= 0 || innerWidth <= 0 || innerHeight <= 0) return;
+
+    if (mode == FILL_MODE_STRETCH) {
+      // Game scene fills the entire surface; no centering, no aspect preservation.
+      aspect = (float) outerWidth / innerWidth;
+      viewOffsetX = 0;
+      viewOffsetY = 0;
+      viewWidth = outerWidth;
+      viewHeight = outerHeight;
+      sceneScaleX = 1f;
+      sceneScaleY = 1f;
+      sceneOffsetX = 0f;
+      sceneOffsetY = 0f;
+      return;
+    }
+
+    // FIT uses the smaller scale (letterbox); ZOOM uses the larger scale (fill + crop).
+    aspect = (mode == FILL_MODE_ZOOM)
+        ? Math.max((float) outerWidth / innerWidth, (float) outerHeight / innerHeight)
+        : Math.min((float) outerWidth / innerWidth, (float) outerHeight / innerHeight);
     viewWidth = (int) Math.ceil(innerWidth * aspect);
     viewHeight = (int) Math.ceil(innerHeight * aspect);
     viewOffsetX = (int) ((outerWidth - innerWidth * aspect) * 0.5f);
diff --git a/app/src/main/runtime/display/renderer/VulkanRenderer.java b/app/src/main/runtime/display/renderer/VulkanRenderer.java
new file mode 100644
index 000000000..51e3a4ceb
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/VulkanRenderer.java
@@ -0,0 +1,1213 @@
+package com.winlator.cmod.runtime.display.renderer;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.Surface;
+import androidx.preference.PreferenceManager;
+import com.winlator.cmod.BuildConfig;
+import com.winlator.cmod.R;
+import com.winlator.cmod.runtime.system.ApplicationLogGate;
+import com.winlator.cmod.runtime.display.renderer.effects.Effect;
+import com.winlator.cmod.runtime.display.ui.XServerSurfaceView;
+import com.winlator.cmod.runtime.display.xserver.Bitmask;
+import com.winlator.cmod.runtime.display.xserver.Cursor;
+import com.winlator.cmod.runtime.display.xserver.Drawable;
+import com.winlator.cmod.runtime.display.xserver.Pointer;
+import com.winlator.cmod.runtime.display.xserver.Window;
+import com.winlator.cmod.runtime.display.xserver.WindowAttributes;
+import com.winlator.cmod.runtime.display.xserver.WindowManager;
+import com.winlator.cmod.runtime.display.xserver.XLock;
+import com.winlator.cmod.runtime.display.xserver.XServer;
+import com.winlator.cmod.shared.math.Mathf;
+import com.winlator.cmod.shared.math.XForm;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/** Native Vulkan compositor: owns the C-side renderer handle and pushes a scene snapshot per frame. */
+public class VulkanRenderer
+        implements RenderCallback,
+                   WindowManager.OnWindowModificationListener,
+                   Pointer.OnPointerMotionListener {
+
+    private static final String TAG = "VulkanRenderer";
+    private static final String PREF_VULKAN_VALIDATION_LAYERS =
+            "enable_vulkan_validation_layers";
+
+    static {
+        System.loadLibrary("winlator");
+    }
+
+    public final XServerSurfaceView xServerView;
+    private final XServer xServer;
+
+    private long nativeHandle = 0;
+    private boolean supportProbed = false;
+    private boolean loggedAhbSceneUse = false;
+    // Must be set before attachSurface — nativeCreate reads it once at instance creation.
+    private volatile String graphicsDriverName = null;
+
+    private final EffectComposer effectComposer;
+    public final ViewTransformation viewTransformation = new ViewTransformation();
+
+    private final Drawable rootCursorDrawable;
+    private final ArrayList<RenderableWindow> renderableWindows = new ArrayList<>();
+    private final Texture.UploadBatch textureUploadBatch =
+            new Texture.UploadBatch((64 + 1) * Texture.MAX_UPLOAD_RECTS);
+    private boolean fullscreen = false;
+    public boolean viewportNeedsUpdate = true;
+    private boolean cursorVisible = true;
+    public boolean swapRB = false;
+
+    public void setSwapRB(boolean v) {
+        this.swapRB = v;
+        requestRenderCoalesced();
+    }
+
+    // === DIRECT COMPOSITION (zero-copy AHB -> SurfaceControl) ===
+    //
+    // The SC layer sits at z=1, above the SurfaceView's own layer, so HWC can
+    // promote it to a DPU overlay plane instead of us blitting the frame.
+    //
+    // Written by the activity on the UI thread, read here on the render thread.
+    // The volatile only stops NEW frames from entering the push after a null is
+    // written; frames already inside are covered by DirectCompositionLayer's
+    // own synchronized methods.
+    private volatile com.winlator.cmod.runtime.display.composition.DirectCompositionLayer
+            directCompositionTarget;
+
+    // Skips redundant SurfaceFlinger transactions. DRI3 allocates a fresh
+    // GPUImage per Present, so AHB-pointer identity is a sufficient dirty check.
+    private volatile long dcLastPushedAhb = 0L;
+    private volatile int dcLastPushedW = 0;
+    private volatile int dcLastPushedH = 0;
+
+    // After enough consecutive failures the renderer detaches itself rather
+    // than paying the JNI cost every frame for a permanent failure.
+    private volatile int dcConsecutiveFailures = 0;
+    private static final int DC_FAIL_LIMIT = 8;
+    // Hysteresis: stay active for a few non-qualifying frames before hiding, to prevent flapping.
+    private int dcDisengageStreak = 0;
+    private static final int DC_DISENGAGE_FRAMES = 4;
+    // While recording, keep compositing so the encoder is fed even when DC owns the display.
+    private volatile boolean recordingActive = false;
+
+    // True while the SC layer is showing game content; drives the HUD badge and
+    // the direct->fallback hide.
+    private volatile boolean dcLayerActive = false;
+    // Diagnostic throttling: only log when the reason changes, not per frame.
+    private String dcLastSkipReason = "";
+
+    private String dcLastCandidateState = "";
+
+    private boolean screenOffsetYRelativeToCursor = false;
+    private String[] unviewableWMClasses = null;
+    private float magnifierZoom = 1.0f;
+    private boolean magnifierEnabled = true;
+    private boolean magnifierUIActive = false;
+    private float magnifierPanX = 0f;
+    private float magnifierPanY = 0f;
+    private boolean magnifierPanInitialized = false;
+    private static final float MAGNIFIER_DEADZONE_FRACTION = 0.6f;
+    // volatile: written on the main thread, read on the render thread (buildAndSubmitFrame self-heal).
+    public volatile int surfaceWidth;
+    public volatile int surfaceHeight;
+    private boolean cpuSaverMode = false;
+    private static final long CURSOR_ACTIVE_NS = 100_000_000L;
+    private volatile long cursorActiveUntilNs = 0L;
+
+    private static final int MAX_FPS_LIMIT = 1000;
+    private volatile int currentFpsLimit = 0;
+
+    // Must mirror VK_MAX_RENDERABLE_WINDOWS / VK_MAX_EFFECTS in vk_state.h.
+    private static final int MAX_WINDOWS = 64;
+    private static final int MAX_EFFECTS = 8;
+
+    private static final int OFF_CURSOR_HANDLE   = 0;
+    private static final int OFF_WINDOW_HANDLES  = 8;
+    private static final int OFF_WINDOW_COUNT    = 520;
+    private static final int OFF_CURSOR_VISIBLE  = 524;
+    private static final int OFF_CURSOR_GEOM     = 528;
+    private static final int OFF_XFORM           = 544;
+    private static final int OFF_VIEWPORT        = 568;
+    private static final int OFF_SCISSOR_ENABLED = 584;
+    private static final int OFF_SCISSOR         = 588;
+    private static final int OFF_SCREEN_W        = 604;
+    private static final int OFF_SCREEN_H        = 608;
+    private static final int OFF_EFFECT_COUNT    = 612;
+    private static final int OFF_EFFECT_TYPES    = 616;
+    private static final int OFF_EFFECT_PARAMS   = 648;
+    private static final int OFF_WINDOW_GEOM     = 776;
+    private static final int OFF_WINDOW_UV       = 1800;
+    private static final int OFF_SWAP_RB         = 2824;
+    private static final int OFF_SOURCE_W        = 2828;
+    private static final int OFF_SOURCE_H        = 2832;
+    private static final int SCENE_BUF_SIZE      = 2836;
+
+    private final ByteBuffer sceneBuf =
+            ByteBuffer.allocateDirect(SCENE_BUF_SIZE).order(ByteOrder.nativeOrder());
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+
+    // Reusable scratch — sized once, refilled per frame.
+    private final float[] sceneXform = XForm.getInstance();
+    // Effect.writeParams writes into a float[]; we copy into the ByteBuffer afterwards.
+    private final float[] effectParamsScratch = new float[MAX_EFFECTS * 4];
+
+    private final AtomicBoolean destroyed = new AtomicBoolean(false);
+
+    public VulkanRenderer(XServerSurfaceView view, XServer xServer) {
+        this.xServerView = view;
+        this.xServer = xServer;
+        this.effectComposer = new EffectComposer(this);
+        this.rootCursorDrawable = createRootCursorDrawable();
+    }
+
+    public void destroy() {
+        if (destroyed.compareAndSet(false, true)) {
+            // Unregister from the persistent XServer to avoid leaking listeners.
+            xServer.windowManager.removeOnWindowModificationListener(this);
+            xServer.pointer.removeOnPointerMotionListener(this);
+
+            if (nativeHandle != 0) {
+                // On the UI thread, run nativeDestroy off-thread — it may block on vkDeviceWaitIdle.
+                if (Looper.myLooper() == Looper.getMainLooper()) {
+                    new Thread(() -> {
+                        synchronized (this) {
+                            if (nativeHandle != 0) {
+                                nativeDestroy(nativeHandle);
+                                nativeHandle = 0;
+                                Texture.setRendererHandle(0);
+                            }
+                        }
+                    }, "Vulkan-Cleanup").start();
+                } else {
+                    synchronized (this) {
+                        if (nativeHandle != 0) {
+                            nativeDestroy(nativeHandle);
+                            nativeHandle = 0;
+                            Texture.setRendererHandle(0);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public void requestRenderCoalesced() {
+        xServerView.requestRender();
+    }
+
+    private Drawable createRootCursorDrawable() {
+        Context context = xServerView.getContext();
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inScaled = false;
+        Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.cursor, options);
+        return Drawable.fromBitmap(bitmap);
+    }
+
+    // ----- Surface lifecycle (called from XServerSurfaceView) ----------------
+
+    public void setGraphicsDriver(String driverName) {
+        this.graphicsDriverName = driverName;
+    }
+
+    public void attachSurface(Surface surface) {
+        // Serialize with detachSurface()/destroy() so a re-attach can't overlap a native teardown.
+        synchronized (this) {
+            if (nativeHandle == 0) {
+                nativeHandle = nativeCreate(shouldEnableValidationLayers(),
+                        graphicsDriverName, xServerView.getContext().getApplicationContext());
+                if (nativeHandle == 0) {
+                    Log.e(TAG, "nativeCreate failed");
+                    return;
+                }
+                Texture.setRendererHandle(nativeHandle);
+                // Apply the cached present-mode request (no-op if it equals the native default FIFO).
+                if (requestedPresentMode != PRESENT_MODE_FIFO) {
+                    nativeSetPresentMode(nativeHandle, requestedPresentMode);
+                }
+                if (requestedScaleFilter != SCALE_FILTER_OFF) {
+                    nativeSetScaleFilter(nativeHandle, requestedScaleFilter);
+                }
+                destroyed.set(false);
+                xServer.windowManager.addOnWindowModificationListener(this);
+                xServer.pointer.addOnPointerMotionListener(this);
+            }
+            nativeSurfaceCreated(nativeHandle, surface);
+        }
+    }
+
+    private boolean shouldEnableValidationLayers() {
+        Context context = xServerView.getContext();
+        return BuildConfig.DEBUG
+                && PreferenceManager.getDefaultSharedPreferences(context)
+                        .getBoolean(PREF_VULKAN_VALIDATION_LAYERS, false);
+    }
+
+    public void notifySurfaceChanged(int w, int h) {
+        if (nativeHandle == 0) return;
+        nativeSurfaceChanged(nativeHandle, w, h);
+        if (!supportProbed && xServer.isDri3Enabled()) {
+            GPUImage.checkIsSupported();
+            supportProbed = true;
+        }
+    }
+
+    public void detachSurface() {
+        // Same monitor as destroy()/attachSurface; re-check the handle under the lock.
+        synchronized (this) {
+            if (nativeHandle != 0) nativeSurfaceDestroyed(nativeHandle);
+        }
+    }
+
+    /** Start mirroring the composited output into {@code encoderSurface}; false if the native setup failed. */
+    public boolean startRecording(Surface encoderSurface, int fps, boolean recordUI) {
+        synchronized (this) {
+            if (nativeHandle == 0 || encoderSurface == null) return false;
+            boolean ok = nativeStartRecording(nativeHandle, encoderSurface, fps, recordUI);
+            recordingActive = ok;
+            return ok;
+        }
+    }
+
+    /** Upload the latest overlay snapshot (direct ByteBuffer of BGRA pixels) for the Record-UI composite. */
+    public void updateRecordUITexture(java.nio.ByteBuffer bgra, int width, int height) {
+        long handle = nativeHandle;
+        if (handle != 0 && bgra != null && bgra.isDirect()) {
+            nativeUpdateRecordUITexture(handle, bgra, width, height);
+        }
+    }
+
+    public void stopRecording() {
+        synchronized (this) {
+            recordingActive = false;
+            if (nativeHandle != 0) nativeStopRecording(nativeHandle);
+        }
+    }
+
+    /** Width of the actual composited image (may differ from the SurfaceView size under rotation). */
+    public int getRecordWidth() {
+        synchronized (this) {
+            return nativeHandle != 0 ? nativeGetRecordWidth(nativeHandle) : 0;
+        }
+    }
+
+    public int getRecordHeight() {
+        synchronized (this) {
+            return nativeHandle != 0 ? nativeGetRecordHeight(nativeHandle) : 0;
+        }
+    }
+
+    /** Clockwise degrees to rotate captured frames to appear upright (undoes the display rotation). */
+    public int getRecordOrientationHint() {
+        synchronized (this) {
+            return nativeHandle != 0 ? nativeGetRecordOrientationHint(nativeHandle) : 0;
+        }
+    }
+
+    @Override
+    public void onSurfaceCreated() {
+        // Surface already attached in attachSurface().
+    }
+
+    @Override
+    public void onSurfaceChanged(int width, int height) {
+        surfaceWidth = width;
+        surfaceHeight = height;
+        viewTransformation.update(width, height,
+                xServer.screenInfo.width, xServer.screenInfo.height);
+        viewportNeedsUpdate = true;
+    }
+
+    @Override
+    public void onSurfaceDestroyed() {
+        destroy();
+    }
+
+    @Override
+    public void onDrawFrame() {
+        if (nativeHandle == 0) return;
+        buildAndSubmitFrame();
+    }
+
+    // ----- Scene assembly ----------------------------------------------------
+
+    private void buildAndSubmitFrame() {
+        // Self-heal: if the real surface size differs from our cache (display reparent), recompute the viewport.
+        if (xServerView != null) {
+            int actualW = xServerView.getSurfaceWidth();
+            int actualH = xServerView.getSurfaceHeight();
+            if (actualW > 0 && actualH > 0 && (actualW != surfaceWidth || actualH != surfaceHeight)) {
+                surfaceWidth = actualW;
+                surfaceHeight = actualH;
+                viewTransformation.update(actualW, actualH,
+                        xServer.screenInfo.width, xServer.screenInfo.height);
+                viewportNeedsUpdate = true;
+            }
+        }
+
+        Drawable directCandidate = findDirectCompositionCandidate();
+        boolean dcOwnsFrame = false;
+        if (directCompositionTarget != null) {
+            String candidateState = (directCandidate != null) ? "present" : "null";
+            if (!candidateState.equals(dcLastCandidateState)) {
+                dcLastCandidateState = candidateState;
+                com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent(
+                        directCandidate == null
+                                ? "DC: no fullscreen candidate"
+                                : "DC: fullscreen candidate " + directCandidate.width + "x" + directCandidate.height);
+            }
+            if (maybePushDirectComposition(directCandidate)) {
+                dcOwnsFrame = true;
+                dcDisengageStreak = 0;
+            } else if (dcLayerActive && ++dcDisengageStreak < DC_DISENGAGE_FRAMES) {
+                dcOwnsFrame = true;
+            } else {
+                maybeHideDirectComposition();
+                dcDisengageStreak = 0;
+            }
+        }
+        if (dcOwnsFrame && !recordingActive) {
+            return;
+        }
+
+        textureUploadBatch.reset();
+        boolean useScissor = false;
+
+        if (magnifierEnabled) {
+            computeMagnifierPan(sceneXform);
+        } else if (!fullscreen) {
+            int pointerY = 0;
+            if (screenOffsetYRelativeToCursor) {
+                short halfScreenHeight = (short) (xServer.screenInfo.height / 2);
+                pointerY = Mathf.clamp(xServer.pointer.getY() - halfScreenHeight / 2, 0, halfScreenHeight);
+            }
+            XForm.makeTransform(sceneXform,
+                    viewTransformation.sceneOffsetX,
+                    viewTransformation.sceneOffsetY - pointerY,
+                    viewTransformation.sceneScaleX,
+                    viewTransformation.sceneScaleY,
+                    0);
+            useScissor = true;
+        } else {
+            XForm.identity(sceneXform);
+        }
+
+        final ByteBuffer buf = sceneBuf;
+
+        int viewX, viewY, viewW, viewH;
+        if (fullscreen) {
+            viewX = 0;
+            viewY = 0;
+            viewW = surfaceWidth;
+            viewH = surfaceHeight;
+        } else {
+            viewX = viewTransformation.viewOffsetX;
+            viewY = viewTransformation.viewOffsetY;
+            viewW = viewTransformation.viewWidth;
+            viewH = viewTransformation.viewHeight;
+        }
+        buf.putInt(OFF_VIEWPORT,      viewX);
+        buf.putInt(OFF_VIEWPORT + 4,  viewY);
+        buf.putInt(OFF_VIEWPORT + 8,  viewW);
+        buf.putInt(OFF_VIEWPORT + 12, viewH);
+
+        // Scissor (non-magnifier non-fullscreen): clamp to the framebuffer so a ZOOM/crop viewport overflow never yields an out-of-bounds scissor.
+        if (useScissor) {
+            int sX = Math.max(0, viewTransformation.viewOffsetX);
+            int sY = Math.max(0, viewTransformation.viewOffsetY);
+            int sRight = Math.min(surfaceWidth, viewTransformation.viewOffsetX + viewTransformation.viewWidth);
+            int sBottom = Math.min(surfaceHeight, viewTransformation.viewOffsetY + viewTransformation.viewHeight);
+            int sW = Math.max(0, sRight - sX);
+            int sH = Math.max(0, sBottom - sY);
+            buf.putInt(OFF_SCISSOR_ENABLED, 1);
+            buf.putInt(OFF_SCISSOR,      sX);
+            buf.putInt(OFF_SCISSOR + 4,  sY);
+            buf.putInt(OFF_SCISSOR + 8,  sW);
+            buf.putInt(OFF_SCISSOR + 12, sH);
+        } else {
+            buf.putInt(OFF_SCISSOR_ENABLED, 0);
+            // Native gates on scissor_enabled anyway; zero the rect for cleanliness.
+            buf.putInt(OFF_SCISSOR,      0);
+            buf.putInt(OFF_SCISSOR + 4,  0);
+            buf.putInt(OFF_SCISSOR + 8,  0);
+            buf.putInt(OFF_SCISSOR + 12, 0);
+        }
+
+        buf.putFloat(OFF_XFORM,      sceneXform[0]);
+        buf.putFloat(OFF_XFORM + 4,  sceneXform[1]);
+        buf.putFloat(OFF_XFORM + 8,  sceneXform[2]);
+        buf.putFloat(OFF_XFORM + 12, sceneXform[3]);
+        buf.putFloat(OFF_XFORM + 16, sceneXform[4]);
+        buf.putFloat(OFF_XFORM + 20, sceneXform[5]);
+
+        viewportNeedsUpdate = false;
+
+        // Collect renderable windows (occlusion skipping).
+        int winCount = 0;
+        long cursorHandle = 0;
+        boolean cursorOnscreen = false;
+        int cursorPosX = 0, cursorPosY = 0, cursorW = 0, cursorH = 0;
+        int sourceW = 0;
+        int sourceH = 0;
+        int sourceArea = 0;
+
+        try (XLock lock = xServer.lock(XServer.Lockable.WINDOW_MANAGER, XServer.Lockable.DRAWABLE_MANAGER)) {
+            int screenW = xServer.screenInfo.width;
+            int screenH = xServer.screenInfo.height;
+            int startIndex = 0;
+            for (int i = renderableWindows.size() - 1; i >= 0; i--) {
+                RenderableWindow rWin = renderableWindows.get(i);
+                if (rWin.content != null
+                        && rWin.content.width >= screenW
+                        && rWin.content.height >= screenH) {
+                    startIndex = i;
+                    break;
+                }
+            }
+
+            for (int i = startIndex; i < renderableWindows.size() && winCount < MAX_WINDOWS; i++) {
+                RenderableWindow rw = renderableWindows.get(i);
+                if (rw.content == null) continue;
+                Drawable drawable = rw.content;
+                Drawable textureSrc;
+                int scanoutX;
+                int scanoutY;
+                Texture tex;
+                synchronized (drawable.renderLock) {
+                    textureSrc = drawable.getScanoutSource();
+                    if (textureSrc != null) {
+                        scanoutX = drawable.getScanoutX();
+                        scanoutY = drawable.getScanoutY();
+                    } else {
+                        textureSrc = drawable;
+                        scanoutX = 0;
+                        scanoutY = 0;
+                    }
+                    if (textureSrc == drawable && !drawable.hasContent()) continue;
+                    tex = textureSrc.getTexture();
+                    if (tex != null) {
+                        tex.appendUploadFromDrawable(textureSrc, textureUploadBatch);
+                    }
+                }
+                if (tex == null || !tex.isAllocated()) continue;
+                int candidateW = 0;
+                int candidateH = 0;
+                if (drawable.hasPresentedSourceSize()) {
+                    candidateW = Short.toUnsignedInt(drawable.getPresentedSourceWidth());
+                    candidateH = Short.toUnsignedInt(drawable.getPresentedSourceHeight());
+                } else {
+                    int drawableW = Short.toUnsignedInt(drawable.width);
+                    int drawableH = Short.toUnsignedInt(drawable.height);
+                    if ((long)drawableW * (long)drawableH >= ((long)screenW * (long)screenH) / 4L) {
+                        candidateW = drawableW;
+                        candidateH = drawableH;
+                    }
+                }
+                int candidateArea = candidateW * candidateH;
+                if (candidateW > 0 && candidateH > 0 && candidateArea > sourceArea) {
+                    sourceW = candidateW;
+                    sourceH = candidateH;
+                    sourceArea = candidateArea;
+                }
+                if (!loggedAhbSceneUse && tex instanceof GPUImage && ApplicationLogGate.isEnabled()) {
+                    Log.i(TAG, "Submitting AHB-backed texture in Vulkan scene: windowCount="
+                            + (winCount + 1)
+                            + " tex=0x"
+                            + Long.toHexString(tex.getNativeHandle()));
+                    loggedAhbSceneUse = true;
+                }
+                buf.putLong(OFF_WINDOW_HANDLES + winCount * 8, tex.getNativeHandle());
+                int gOff = OFF_WINDOW_GEOM + winCount * 16;
+                buf.putInt(gOff,      rw.rootX);
+                buf.putInt(gOff + 4,  rw.rootY);
+                buf.putInt(gOff + 8,  drawable.width);
+                buf.putInt(gOff + 12, drawable.height);
+                int uvOff = OFF_WINDOW_UV + winCount * 16;
+                if (textureSrc != drawable) {
+                    float invW = 1.0f / Math.max(1, textureSrc.width);
+                    float invH = 1.0f / Math.max(1, textureSrc.height);
+                    buf.putFloat(uvOff,      -scanoutX * invW);
+                    buf.putFloat(uvOff + 4,  -scanoutY * invH);
+                    buf.putFloat(uvOff + 8,  (drawable.width - scanoutX) * invW);
+                    buf.putFloat(uvOff + 12, (drawable.height - scanoutY) * invH);
+                } else {
+                    buf.putFloat(uvOff,      0.0f);
+                    buf.putFloat(uvOff + 4,  0.0f);
+                    buf.putFloat(uvOff + 8,  1.0f);
+                    buf.putFloat(uvOff + 12, 1.0f);
+                }
+                winCount++;
+            }
+
+            if (cursorVisible) {
+                Window pointWindow = xServer.inputDeviceManager.getPointWindow();
+                Cursor cursor = pointWindow != null ? pointWindow.attributes.getCursor() : null;
+                short x = xServer.pointer.getClampedX();
+                short y = xServer.pointer.getClampedY();
+
+                Drawable cursorDrawable = null;
+                int hotX = 0, hotY = 0;
+                if (cursor != null) {
+                    if (cursor.isVisible()) {
+                        cursorDrawable = cursor.cursorImage;
+                        hotX = cursor.hotSpotX;
+                        hotY = cursor.hotSpotY;
+                    }
+                } else {
+                    cursorDrawable = rootCursorDrawable;
+                }
+
+                if (cursorDrawable != null) {
+                    Texture tex = cursorDrawable.getTexture();
+                    synchronized (cursorDrawable.renderLock) {
+                        if (tex != null) tex.appendUploadFromDrawable(cursorDrawable, textureUploadBatch);
+                    }
+                    if (tex != null && tex.isAllocated()) {
+                        cursorHandle = tex.getNativeHandle();
+                        cursorPosX = x - hotX;
+                        cursorPosY = y - hotY;
+                        cursorW = cursorDrawable.width;
+                        cursorH = cursorDrawable.height;
+                        cursorOnscreen = true;
+                    }
+                }
+            }
+
+        }
+
+        textureUploadBatch.flush(nativeHandle);
+
+        buf.putInt(OFF_WINDOW_COUNT, winCount);
+        buf.putLong(OFF_CURSOR_HANDLE, cursorHandle);
+        buf.putInt(OFF_CURSOR_VISIBLE, cursorOnscreen ? 1 : 0);
+        buf.putInt(OFF_CURSOR_GEOM,      cursorPosX);
+        buf.putInt(OFF_CURSOR_GEOM + 4,  cursorPosY);
+        buf.putInt(OFF_CURSOR_GEOM + 8,  cursorW);
+        buf.putInt(OFF_CURSOR_GEOM + 12, cursorH);
+
+        buf.putInt(OFF_SCREEN_W, xServer.screenInfo.width);
+        buf.putInt(OFF_SCREEN_H, xServer.screenInfo.height);
+        buf.putInt(OFF_SWAP_RB, swapRB ? 1 : 0);
+        buf.putInt(OFF_SOURCE_W, sourceW);
+        buf.putInt(OFF_SOURCE_H, sourceH);
+
+        Effect[] active = effectComposer.snapshot();
+        int effectCount = Math.min(active.length, MAX_EFFECTS);
+        buf.putInt(OFF_EFFECT_COUNT, effectCount);
+        for (int i = 0; i < effectCount; i++) {
+            buf.putInt(OFF_EFFECT_TYPES + i * 4, active[i].getNativeType());
+            active[i].writeParams(effectParamsScratch, i * 4);
+            int pOff = OFF_EFFECT_PARAMS + i * 16;
+            buf.putFloat(pOff,      effectParamsScratch[i * 4]);
+            buf.putFloat(pOff + 4,  effectParamsScratch[i * 4 + 1]);
+            buf.putFloat(pOff + 8,  effectParamsScratch[i * 4 + 2]);
+            buf.putFloat(pOff + 12, effectParamsScratch[i * 4 + 3]);
+        }
+
+        nativeSetScene(nativeHandle, buf);
+        nativeRenderFrame(nativeHandle);
+    }
+
+    // Geometry-only scan for the fullscreen DC candidate (no Vulkan import).
+    private Drawable findDirectCompositionCandidate() {
+        Drawable candidate = null;
+        try (XLock lock = xServer.lock(XServer.Lockable.WINDOW_MANAGER, XServer.Lockable.DRAWABLE_MANAGER)) {
+            int screenW = xServer.screenInfo.width;
+            int screenH = xServer.screenInfo.height;
+            for (int i = 0; i < renderableWindows.size(); i++) {
+                RenderableWindow rw = renderableWindows.get(i);
+                Drawable d = rw.content;
+                if (d != null && rw.rootX == 0 && rw.rootY == 0
+                        && Short.toUnsignedInt(d.width) >= screenW
+                        && Short.toUnsignedInt(d.height) >= screenH) {
+                    candidate = d;
+                }
+            }
+        }
+        return candidate;
+    }
+
+    /**
+     * Hands the candidate's AHardwareBuffer to the DirectCompositionLayer.
+     *
+     * <p>Holds {@code renderLock} across the lookup and the JNI call so DRI3
+     * can't swap the texture or destroy the AHB mid-read. SurfaceFlinger takes
+     * its own reference inside setBuffer, so the buffer is safe to release as
+     * soon as we leave the lock.
+     *
+     * @return true if a buffer was pushed or the cache still holds, false if
+     *         the caller should hide the layer.
+     */
+    private boolean maybePushDirectComposition(Drawable directCandidate) {
+        final com.winlator.cmod.runtime.display.composition.DirectCompositionLayer dcTarget =
+                directCompositionTarget;
+        if (dcTarget == null) return false;
+        if (surfaceWidth <= 0 || surfaceHeight <= 0) return false;
+
+        // Force fallback to VulkanRenderer composition when the magnifier UI is
+        // active — the z=1 SC layer would otherwise cover it.
+        if (magnifierUIActive) {
+            return false;
+        }
+        // Same for the cursor: it is drawn in the Vulkan scene, and a frame
+        // owned by DC skips that composition entirely, so engaging DC while the
+        // cursor is visible would make it disappear. Fullscreen sessions hide
+        // the cursor at setup, so this only defers DC for windowed/touchpad use.
+        if (cursorVisible) {
+            return false;
+        }
+        // No fullscreen candidate — fall back to VulkanRenderer.
+        if (directCandidate == null) {
+            return false;
+        }
+        // Only direct-scan a screen-covering window (don't stretch a sub-window fullscreen).
+        if (Short.toUnsignedInt(directCandidate.width) < xServer.screenInfo.width
+                || Short.toUnsignedInt(directCandidate.height) < xServer.screenInfo.height) {
+            return false;
+        }
+
+        final Drawable content = directCandidate;
+        synchronized (content.renderLock) {
+            Drawable scanoutSource = content.getScanoutSource();
+            if (scanoutSource == null) {
+                // No scanout source — the drawable itself is the source.
+                scanoutSource = content;
+            }
+            Texture tex = scanoutSource.getTexture();
+
+            // === DIAGNOSTIC: log why we might skip this candidate ===
+            // Throttle: only log when the situation CHANGES, to avoid per-frame
+            // spam. We use a simple "last logged state" tracker.
+            String currentState;
+            if (tex == null) {
+                currentState = "no-texture";
+            } else if (!(tex instanceof GPUImage)) {
+                currentState = "texture-not-gpuimage(" + tex.getClass().getSimpleName() + ")";
+            } else if (((GPUImage) tex).getHardwareBufferPtr() == 0L) {
+                currentState = "gpuimage-ahb-null";
+            } else {
+                currentState = "ok";
+            }
+            if (!currentState.equals(dcLastSkipReason)) {
+                dcLastSkipReason = currentState;
+                if (!currentState.equals("ok")) {
+                    com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent(
+                            "DC skip: candidate " + currentState
+                                    + " (drawable=" + content.width + "x" + content.height
+                                    + " scanoutSource=" + (content.getScanoutSource() != null
+                                            ? (scanoutSource.width + "x" + scanoutSource.height)
+                                            : "self")
+                                    + " directScanout=" + content.isDirectScanout() + ")");
+                }
+            }
+
+            if (!(tex instanceof GPUImage)) {
+                drainFenceFd(scanoutSource);
+                return false;
+            }
+            long ahbPtr = ((GPUImage) tex).getHardwareBufferPtr();
+            if (ahbPtr == 0L) {
+                drainFenceFd(scanoutSource);
+                return false;
+            }
+
+            // Nothing changed and SF is still showing the layer.
+            if (ahbPtr == dcLastPushedAhb
+                    && surfaceWidth == dcLastPushedW
+                    && surfaceHeight == dcLastPushedH) {
+                return true;
+            }
+
+            int fenceFd = scanoutSource.takeAcquireFenceFd();
+            boolean ok = dcTarget.pushBuffer(ahbPtr, 0, 0,
+                    surfaceWidth, surfaceHeight, fenceFd, /*opaque=*/true, /*pace=*/true);
+            if (ok) {
+                dcLastPushedAhb = ahbPtr;
+                dcLastPushedW = surfaceWidth;
+                dcLastPushedH = surfaceHeight;
+                dcConsecutiveFailures = 0;
+                if (!dcLayerActive) {
+                    dcLayerActive = true;
+                    com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent(
+                            "DC ACTIVE — first frame pushed to SurfaceControl (ahb=0x"
+                                    + Long.toHexString(ahbPtr) + " " + surfaceWidth + "x" + surfaceHeight
+                                    + " drawable=" + content.width + "x" + content.height + ")");
+                    notifyDirectCompositionStateListener();
+                }
+                return true;
+            } else {
+                dcConsecutiveFailures++;
+                com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent(
+                        "DC pushBuffer FAILED (#" + dcConsecutiveFailures + ") — ahb=0x"
+                                + Long.toHexString(ahbPtr));
+                if (dcConsecutiveFailures >= DC_FAIL_LIMIT) {
+                    Log.w(TAG, "DirectComposition push failed " + dcConsecutiveFailures
+                            + " frames in a row — disabling target for this session");
+                    com.winlator.cmod.runtime.display.composition.SurfaceCompositor.logEvent(
+                            "DC DISABLED — " + DC_FAIL_LIMIT + " consecutive failures, self-detaching");
+                    // Hide before nulling the field: afterwards
+                    // maybeHideDirectComposition has nothing to hide, and SF
+                    // would keep the last pushed buffer on screen forever.
+                    dcTarget.hide();
+                    if (dcLayerActive) {
+                        dcLayerActive = false;
+                        notifyDirectCompositionStateListener();
+                    }
+                    directCompositionTarget = null;
+                    dcLastPushedAhb = 0L;
+                    dcLastPushedW = 0;
+                    dcLastPushedH = 0;
+                    dcConsecutiveFailures = 0;
+                }
+                return false;
+            }
+        }
+    }
+
+    /** Hides the layer once per direct->fallback transition. Idempotent. */
+    // Drain unconsumed fence FD to prevent FD leak when DC can't handle a frame.
+    private void drainFenceFd(Drawable scanoutSource) {
+        if (scanoutSource == null) return;
+        int fd = scanoutSource.takeAcquireFenceFd();
+        if (fd >= 0) {
+            try { android.os.ParcelFileDescriptor.adoptFd(fd).close(); }
+            catch (java.io.IOException ignored) {}
+        }
+    }
+
+    private void maybeHideDirectComposition() {
+        if (!dcLayerActive) return;
+        com.winlator.cmod.runtime.display.composition.DirectCompositionLayer dcTarget =
+                directCompositionTarget;
+        if (dcTarget != null) {
+            dcTarget.hide();
+        }
+        dcLayerActive = false;
+        notifyDirectCompositionStateListener();
+        // Invalidate the cache so the next push re-shows even if the same AHB
+        // pointer is still current.
+        dcLastPushedAhb = 0L;
+        dcLastPushedW = 0;
+        dcLastPushedH = 0;
+    }
+
+    /**
+     * Hand the renderer the per-activity Direct Composition layer (or null to
+     * detach). Safe to call from the UI thread; the render thread reads the
+     * field volatile-ly each frame inside buildAndSubmitFrame().
+     */
+    public void setDirectCompositionTarget(
+            com.winlator.cmod.runtime.display.composition.DirectCompositionLayer layer) {
+        // Hide old layer before swapping to prevent stale frame on screen.
+        com.winlator.cmod.runtime.display.composition.DirectCompositionLayer old = directCompositionTarget;
+        if (dcLayerActive && old != null) {
+            old.hide();
+        }
+        this.directCompositionTarget = layer;
+        dcLastPushedAhb = 0L;
+        dcLastPushedW = 0;
+        dcLastPushedH = 0;
+        dcConsecutiveFailures = 0;
+        dcLayerActive = false;
+        dcLastSkipReason = "";
+        notifyDirectCompositionStateListener();
+    }
+
+    // Drives the FrameRating HUD's "+ DC" badge.
+    public interface DirectCompositionStateListener {
+        void onDirectCompositionStateChanged(boolean active);
+    }
+    private volatile DirectCompositionStateListener dcStateListener;
+    public void setDirectCompositionStateListener(DirectCompositionStateListener listener) {
+        this.dcStateListener = listener;
+    }
+    private void notifyDirectCompositionStateListener() {
+        DirectCompositionStateListener l = dcStateListener;
+        if (l != null) l.onDirectCompositionStateChanged(dcLayerActive);
+    }
+
+    // ----- WindowManager / Pointer listeners --------------------------------
+
+    @Override
+    public void onMapWindow(Window window) {
+        xServerView.queueEvent(this::updateScene);
+        requestRenderCoalesced();
+    }
+
+    @Override
+    public void onUnmapWindow(Window window) {
+        xServerView.queueEvent(this::updateScene);
+        requestRenderCoalesced();
+    }
+
+    @Override
+    public void onChangeWindowZOrder(Window window) {
+        xServerView.queueEvent(this::updateScene);
+        requestRenderCoalesced();
+    }
+
+    @Override
+    public void onUpdateWindowContent(Window window) {
+        requestRenderCoalesced();
+    }
+
+    @Override
+    public void onUpdateWindowGeometry(final Window window, boolean resized) {
+        if (resized) {
+            // Graphics preset change: flush DC state, invalidate cache, force re-evaluation.
+            com.winlator.cmod.runtime.display.composition.DirectCompositionLayer dcGeom = directCompositionTarget;
+            if (dcLayerActive && dcGeom != null) {
+                dcGeom.hide();
+                dcLayerActive = false;
+                notifyDirectCompositionStateListener();
+            }
+            dcLastPushedAhb = 0L;
+            dcLastPushedW = 0;
+            dcLastPushedH = 0;
+            dcLastSkipReason = "";
+            xServerView.queueEvent(this::updateScene);
+        } else {
+            xServerView.queueEvent(() -> updateWindowPosition(window));
+            xServerView.queueEvent(this::updateScene);
+        }
+        requestRenderCoalesced();
+    }
+
+    @Override
+    public void onUpdateWindowAttributes(Window window, Bitmask mask) {
+        if (mask.isSet(WindowAttributes.FLAG_CURSOR)) requestRenderCoalesced();
+    }
+
+    public void requestCursorRender() {
+        cursorActiveUntilNs = System.nanoTime() + CURSOR_ACTIVE_NS;
+        xServerView.requestTransientRender(100);
+    }
+
+    public void updateVisualCursorPosition(int x, int y) {
+        requestCursorRender();
+    }
+
+    @Override
+    public void onPointerMove(short x, short y) {
+        requestCursorRender();
+    }
+
+    @Override
+    public void onFramePresented(Window window, WindowManager.FrameSource source, int serial) {
+        // DRI3_BUFFER fires at pixmap allocation, not a visible change; the real present already wakes us. Skip it.
+        if (source == WindowManager.FrameSource.DRI3_BUFFER) return;
+        requestRenderCoalesced();
+    }
+
+    private void updateScene() {
+        try (XLock lock = xServer.lock(XServer.Lockable.WINDOW_MANAGER, XServer.Lockable.DRAWABLE_MANAGER)) {
+            renderableWindows.clear();
+            collectRenderableWindows(
+                    xServer.windowManager.rootWindow,
+                    xServer.windowManager.rootWindow.getX(),
+                    xServer.windowManager.rootWindow.getY());
+        }
+    }
+
+    private void collectRenderableWindows(Window window, int x, int y) {
+        if (!window.attributes.isMapped()) return;
+        if (window != xServer.windowManager.rootWindow) {
+            boolean viewable = true;
+            if (unviewableWMClasses != null) {
+                String wmClass = window.getClassName();
+                for (String unviewable : unviewableWMClasses) {
+                    if (wmClass.contains(unviewable)) {
+                        if (window.attributes.isEnabled()) window.disableAllDescendants();
+                        viewable = false;
+                        break;
+                    }
+                }
+            }
+            if (viewable) renderableWindows.add(new RenderableWindow(window.getContent(), x, y));
+        }
+        for (Window child : window.getChildren()) {
+            collectRenderableWindows(child, child.getX() + x, child.getY() + y);
+        }
+    }
+
+    private void updateWindowPosition(Window window) {
+        for (RenderableWindow rw : renderableWindows) {
+            if (rw.content == window.getContent()) {
+                rw.rootX = (short) window.getRootX();
+                rw.rootY = (short) window.getRootY();
+                break;
+            }
+        }
+    }
+
+    // ----- Public API -------------------------------------------------------
+
+    public EffectComposer getEffectComposer() { return effectComposer; }
+
+    public void onXServerScreenChanged() {
+        int oldViewWidth = viewTransformation.viewWidth;
+        int oldViewHeight = viewTransformation.viewHeight;
+        int oldViewOffsetX = viewTransformation.viewOffsetX;
+        int oldViewOffsetY = viewTransformation.viewOffsetY;
+        if (surfaceWidth > 0 && surfaceHeight > 0) {
+            viewTransformation.update(surfaceWidth, surfaceHeight,
+                    xServer.screenInfo.width, xServer.screenInfo.height);
+        }
+        viewportNeedsUpdate = true;
+        magnifierPanInitialized = false;
+        updateScene();
+        if (ApplicationLogGate.isEnabled()) {
+            Log.i(TAG, "XServer screen changed: screen=" + xServer.screenInfo +
+                    " surface=" + surfaceWidth + "x" + surfaceHeight +
+                    " view=" + oldViewWidth + "x" + oldViewHeight + "@" +
+                    oldViewOffsetX + "," + oldViewOffsetY + " -> " +
+                    viewTransformation.viewWidth + "x" + viewTransformation.viewHeight +
+                    "@" + viewTransformation.viewOffsetX + "," + viewTransformation.viewOffsetY);
+        }
+        requestRenderCoalesced();
+    }
+
+    public void toggleFullscreen() {
+        fullscreen = !fullscreen;
+        viewportNeedsUpdate = true;
+        requestRenderCoalesced();
+    }
+
+    public boolean isFullscreen() { return fullscreen; }
+
+    public void setCursorVisible(boolean v) {
+        if (this.cursorVisible == v) return;
+        this.cursorVisible = v;
+        requestRenderCoalesced();
+    }
+
+    public boolean isCursorVisible() { return cursorVisible; }
+
+    public boolean isScreenOffsetYRelativeToCursor() { return screenOffsetYRelativeToCursor; }
+
+    public void setScreenOffsetYRelativeToCursor(boolean v) {
+        this.screenOffsetYRelativeToCursor = v;
+        requestRenderCoalesced();
+    }
+
+    public float getMagnifierZoom() { return magnifierZoom; }
+
+    public void setMagnifierZoom(float v) {
+        if (this.magnifierZoom != v) {
+            this.magnifierZoom = v;
+            magnifierPanInitialized = false;
+        }
+        requestRenderCoalesced();
+    }
+
+    private void computeMagnifierPan(float[] outXForm) {
+        float currentZoom = !screenOffsetYRelativeToCursor ? this.magnifierZoom : 1.0f;
+        if (currentZoom <= 1.0f && !screenOffsetYRelativeToCursor) {
+            magnifierPanX = 0;
+            magnifierPanY = 0;
+            magnifierPanInitialized = false;
+            XForm.identity(outXForm);
+            return;
+        }
+
+        int screenW = xServer.screenInfo.width;
+        int screenH = xServer.screenInfo.height;
+        float cursorX = xServer.pointer.getX();
+        float cursorY = xServer.pointer.getY();
+
+        if (currentZoom > 1.0f) {
+            float maxPanX = screenW * (currentZoom - 1.0f);
+            float maxPanY = screenH * (currentZoom - 1.0f);
+
+            if (!magnifierPanInitialized) {
+                magnifierPanX = Mathf.clamp(cursorX * currentZoom - screenW * 0.5f, 0, maxPanX);
+                magnifierPanY = Mathf.clamp(cursorY * currentZoom - screenH * 0.5f, 0, maxPanY);
+                magnifierPanInitialized = true;
+            }
+
+            float visibleW = screenW / currentZoom;
+            float visibleH = screenH / currentZoom;
+            float marginX = visibleW * (1.0f - MAGNIFIER_DEADZONE_FRACTION) * 0.5f;
+            float marginY = visibleH * (1.0f - MAGNIFIER_DEADZONE_FRACTION) * 0.5f;
+
+            float visibleLeft = magnifierPanX / currentZoom;
+            float visibleTop = magnifierPanY / currentZoom;
+            float visibleRight = visibleLeft + visibleW;
+            float visibleBottom = visibleTop + visibleH;
+
+            if (cursorX < visibleLeft + marginX) {
+                magnifierPanX = (cursorX - marginX) * currentZoom;
+            } else if (cursorX > visibleRight - marginX) {
+                magnifierPanX = (cursorX - visibleW + marginX) * currentZoom;
+            }
+            if (cursorY < visibleTop + marginY) {
+                magnifierPanY = (cursorY - marginY) * currentZoom;
+            } else if (cursorY > visibleBottom - marginY) {
+                magnifierPanY = (cursorY - visibleH + marginY) * currentZoom;
+            }
+
+            magnifierPanX = Mathf.clamp(magnifierPanX, 0, maxPanX);
+            magnifierPanY = Mathf.clamp(magnifierPanY, 0, maxPanY);
+        } else {
+            magnifierPanX = 0;
+            magnifierPanY = 0;
+            magnifierPanInitialized = false;
+        }
+
+        float panY = magnifierPanY;
+        if (currentZoom == 1.0f && screenOffsetYRelativeToCursor) {
+            panY = Mathf.clamp(
+                    xServer.pointer.getY() * 1.0f - screenH * 0.25f,
+                    0,
+                    screenH * 0.5f);
+        }
+
+        XForm.makeTransform(outXForm, -magnifierPanX, -panY, currentZoom, currentZoom, 0);
+    }
+
+    public int getSurfaceWidth() { return surfaceWidth; }
+    public int getSurfaceHeight() { return surfaceHeight; }
+
+    public boolean isViewportNeedsUpdate() { return viewportNeedsUpdate; }
+    public void setViewportNeedsUpdate(boolean v) { this.viewportNeedsUpdate = v; }
+
+    // Fill mode (FIT/STRETCH/ZOOM), applied live: recompute the viewport and request a frame.
+    public void setFillMode(int mode) {
+        if (viewTransformation.mode == mode) return;
+        viewTransformation.mode = mode;
+        if (surfaceWidth > 0 && surfaceHeight > 0) {
+            viewTransformation.update(surfaceWidth, surfaceHeight,
+                    xServer.screenInfo.width, xServer.screenInfo.height);
+        }
+        viewportNeedsUpdate = true;
+        if (xServerView != null) xServerView.requestRender();
+    }
+
+    public int getFillMode() { return viewTransformation.mode; }
+
+    // Set the fill mode without recomputing the viewport (cached size may be stale mid-reparent).
+    public void setFillModeQuiet(int mode) {
+        viewTransformation.mode = mode;
+        viewportNeedsUpdate = true;
+    }
+
+    public int getPresentMode() { return requestedPresentMode; }
+
+    // Wipe the cached surface size so the next surfaceChanged/self-heal recomputes from scratch.
+    public void invalidateSurfaceSize() {
+        surfaceWidth = 0;
+        surfaceHeight = 0;
+        viewportNeedsUpdate = true;
+    }
+
+    /** Force the viewport to recompute against a known surface size (used after a display reparent). */
+    public void forceViewportRecompute(int w, int h) {
+        if (w <= 0 || h <= 0) return;
+        surfaceWidth = w;
+        surfaceHeight = h;
+        viewTransformation.update(w, h, xServer.screenInfo.width, xServer.screenInfo.height);
+        viewportNeedsUpdate = true;
+        if (xServerView != null) xServerView.requestRender();
+    }
+
+    public void setNativeMode(boolean enable) {
+        if (cpuSaverMode != enable) {
+            cpuSaverMode = enable;
+            viewportNeedsUpdate = true;
+            xServerView.setRenderMode(XServerSurfaceView.RENDERMODE_WHEN_DIRTY);
+            requestRenderCoalesced();
+        }
+    }
+
+    public boolean isNativeMode() { return cpuSaverMode; }
+
+    public void setMagnifierUIActive(boolean active) {
+        if (magnifierUIActive == active) return;
+        magnifierUIActive = active;
+        magnifierPanInitialized = false;
+        viewportNeedsUpdate = true;
+        xServerView.setRenderMode(XServerSurfaceView.RENDERMODE_WHEN_DIRTY);
+        requestRenderCoalesced();
+    }
+
+    public boolean isMagnifierUIActive() { return magnifierUIActive; }
+
+    public void setFpsLimit(int fps) {
+        currentFpsLimit = Math.max(0, Math.min(fps, MAX_FPS_LIMIT));
+    }
+
+    public int getFpsLimit() { return currentFpsLimit; }
+
+    // Compositor present-mode constants must mirror the switch in nativeSetPresentMode.
+    public static final int PRESENT_MODE_FIFO      = 0;
+    public static final int PRESENT_MODE_MAILBOX   = 1;
+    public static final int PRESENT_MODE_IMMEDIATE = 2;
+
+    // Cached so a mode can be set before the native renderer exists (applied in attachSurface).
+    private int requestedPresentMode = PRESENT_MODE_FIFO;
+
+    public void setPresentMode(int mode) {
+        requestedPresentMode = mode;
+        if (nativeHandle != 0) nativeSetPresentMode(nativeHandle, mode);
+    }
+
+    public static int parsePresentMode(String name) {
+        if (name == null) return PRESENT_MODE_FIFO;
+        switch (name.trim().toLowerCase()) {
+            case "mailbox":   return PRESENT_MODE_MAILBOX;
+            case "immediate": return PRESENT_MODE_IMMEDIATE;
+            default:          return PRESENT_MODE_FIFO;
+        }
+    }
+
+    // Scale-filter constants must mirror the switch in nativeSetScaleFilter.
+    public static final int SCALE_FILTER_OFF     = 0;
+    public static final int SCALE_FILTER_NEAREST = 1;
+    public static final int SCALE_FILTER_LINEAR  = 2;
+    public static final int SCALE_FILTER_BICUBIC = 3;
+
+    private int requestedScaleFilter = SCALE_FILTER_OFF;
+
+    public void setScaleFilter(int mode) {
+        requestedScaleFilter = mode;
+        if (nativeHandle != 0) {
+            nativeSetScaleFilter(nativeHandle, mode);
+            if (xServerView != null) xServerView.requestRender();
+        }
+    }
+
+    public void setUnviewableWMClasses(String... names) {
+        this.unviewableWMClasses = names;
+    }
+
+    public void enforceFpsLimit() {
+        // No-op: FPS limiting now runs in native (after submit/present); kept for source compatibility.
+    }
+
+    // ---- JNI ---------------------------------------------------------------
+
+    private static native long nativeCreate(boolean enableValidationLayers,
+                                            String driverName,
+                                            android.content.Context context);
+    private static native void nativeDestroy(long handle);
+    private static native void nativeSurfaceCreated(long handle, Surface surface);
+    private static native void nativeSurfaceChanged(long handle, int w, int h);
+    private static native void nativeSurfaceDestroyed(long handle);
+    private static native boolean nativeStartRecording(long handle, Surface encoderSurface, int fps, boolean recordUI);
+    private static native void nativeStopRecording(long handle);
+    private static native void nativeUpdateRecordUITexture(long handle, java.nio.ByteBuffer bgra, int width, int height);
+    private static native int nativeGetRecordWidth(long handle);
+    private static native int nativeGetRecordHeight(long handle);
+    private static native int nativeGetRecordOrientationHint(long handle);
+    private static native boolean nativeRenderFrame(long handle);
+    private static native void nativeSetScene(long handle, ByteBuffer sceneBuf);
+    private static native void nativeSetFpsLimit(long handle, int fps);
+    private static native void nativeSetPresentMode(long handle, int mode);
+    private static native void nativeSetScaleFilter(long handle, int mode);
+}
diff --git a/app/src/main/runtime/display/renderer/effects/CRTEffect.java b/app/src/main/runtime/display/renderer/effects/CRTEffect.java
index 8e9218c6b..8a790d1f2 100644
--- a/app/src/main/runtime/display/renderer/effects/CRTEffect.java
+++ b/app/src/main/runtime/display/renderer/effects/CRTEffect.java
@@ -1,55 +1,8 @@
 package com.winlator.cmod.runtime.display.renderer.effects;
 
-import com.winlator.cmod.runtime.display.renderer.material.ScreenMaterial;
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
-
 public class CRTEffect extends Effect {
-  // Constructor for CRTEffect
-  public CRTEffect() {
-    super(); // Calls the constructor of the superclass Effect
-  }
-
-  @Override
-  protected ShaderMaterial createMaterial() {
-    // Returns an instance of the inner class which extends ScreenMaterial and implements the CRT
-    // shader
-    return new CRTEffectMaterial();
-  }
-
-  // Inner class implementing the CRT shader material
-  private class CRTEffectMaterial extends ScreenMaterial {
-    // Constructor for the inner class, calls the superclass constructor
-    public CRTEffectMaterial() {
-      super();
-    }
-
     @Override
-    protected String getFragmentShader() {
-      // Returns the GLSL fragment shader as a string.
-      // This shader applies the CRT effect using chromatic aberration and scanline effects.
-
-      return String.join(
-          "\n",
-          new CharSequence[] {
-            "precision highp float;",
-            "#define CA_AMOUNT 1.0025",
-            "#define SCANLINE_INTENSITY_X 0.125",
-            "#define SCANLINE_INTENSITY_Y 0.375",
-            "#define SCANLINE_SIZE 1024.0",
-            "uniform sampler2D screenTexture;",
-            "varying vec2 vUV;",
-            "void main() {",
-            "    vec4 finalColor = texture2D(screenTexture, vUV);",
-            "    finalColor.rgb = vec3(",
-            "        texture2D(screenTexture, (vUV - 0.5) * CA_AMOUNT + 0.5).r,",
-            "        finalColor.g,",
-            "        texture2D(screenTexture, (vUV - 0.5) / CA_AMOUNT + 0.5).b",
-            "    );",
-            "    float scanlineX = abs(sin(vUV.x * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_X);",
-            "    float scanlineY = abs(sin(vUV.y * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_Y);",
-            "    gl_FragColor = vec4(mix(finalColor.rgb, vec3(0.0), scanlineX + scanlineY), finalColor.a);",
-            "}"
-          });
+    public int getNativeType() {
+        return TYPE_CRT;
     }
-  }
 }
diff --git a/app/src/main/runtime/display/renderer/effects/ColorAdjustEffect.java b/app/src/main/runtime/display/renderer/effects/ColorAdjustEffect.java
new file mode 100644
index 000000000..fa7f8681c
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/ColorAdjustEffect.java
@@ -0,0 +1,31 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class ColorAdjustEffect extends Effect {
+    private float brightness = 0.0f;
+    private float contrast = 0.0f;
+    private float gamma = 1.0f;
+
+    public void set(float brightness, float contrast, float gamma) {
+        this.brightness = brightness;
+        this.contrast = contrast;
+        this.gamma = gamma;
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_COLORADJ;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, brightness, contrast, gamma};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = brightness;
+        out[offset + 2] = contrast;
+        out[offset + 3] = gamma;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/ColorBlindEffect.java b/app/src/main/runtime/display/renderer/effects/ColorBlindEffect.java
new file mode 100644
index 000000000..18380e383
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/ColorBlindEffect.java
@@ -0,0 +1,27 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class ColorBlindEffect extends Effect {
+    private float mode = 1.0f;
+
+    public void setMode(int mode) {
+        this.mode = mode;
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_COLORBLIND;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, mode, 0f, 0f};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = mode;
+        out[offset + 2] = 0f;
+        out[offset + 3] = 0f;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/ColorGradeEffect.java b/app/src/main/runtime/display/renderer/effects/ColorGradeEffect.java
new file mode 100644
index 000000000..fb8f76006
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/ColorGradeEffect.java
@@ -0,0 +1,31 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class ColorGradeEffect extends Effect {
+    private float saturation = 1.0f;
+    private float temperature = 0.0f;
+    private float tint = 0.0f;
+
+    public void set(float saturation, float temperature, float tint) {
+        this.saturation = saturation;
+        this.temperature = temperature;
+        this.tint = tint;
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_COLORGRADE;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, saturation, temperature, tint};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = saturation;
+        out[offset + 2] = temperature;
+        out[offset + 3] = tint;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/Effect.java b/app/src/main/runtime/display/renderer/effects/Effect.java
index fc75b81d5..6d575edf7 100644
--- a/app/src/main/runtime/display/renderer/effects/Effect.java
+++ b/app/src/main/runtime/display/renderer/effects/Effect.java
@@ -1,28 +1,38 @@
 package com.winlator.cmod.runtime.display.renderer.effects;
 
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
-
 public abstract class Effect {
-  // Instance field for the shader material
-  private ShaderMaterial material;
+    public static final int TYPE_CRT      = 0;
+    public static final int TYPE_VIVID    = 1;
+    public static final int TYPE_HDR      = 2;
+    public static final int TYPE_NATURAL  = 3;
+    public static final int TYPE_SGSR1    = 4;
+    public static final int TYPE_TOON      = 5;
+    public static final int TYPE_NTSC      = 6;
+    public static final int TYPE_COLORADJ  = 7;
+    public static final int TYPE_COLORGRADE = 8;
+    public static final int TYPE_SHARPEN   = 9;
+    public static final int TYPE_SCANLINES = 10;
+    public static final int TYPE_NTSC2     = 11;
+    public static final int TYPE_COLORBLIND = 12;
+    public static final int TYPE_PIXELATE  = 13;
 
-  // Constructor
-  public Effect() {
-    // Initialize the material (if needed)
-  }
+    public abstract int getNativeType();
 
-  // Abstract method to be implemented by subclasses for creating the material
-  protected ShaderMaterial createMaterial() {
-    // Returning null indicates that the subclass is responsible for creating the material
-    return null;
-  }
+    /**
+     * Up to four floats forwarded to the native effect path:
+     * [0] mode/reserved,
+     * [1] param0 (e.g. SGSR upscale factor, saturation, strength),
+     * [2] param1 (e.g. contrast),
+     * [3] param2 (e.g. sharpness).
+     */
+    public float[] getParams() {
+        return new float[]{0f, 0f, 0f, 0f};
+    }
 
-  // Returns the material associated with this effect
-  public ShaderMaterial getMaterial() {
-    // If material is not initialized, create it using the abstract method
-    if (material == null) {
-      material = createMaterial();
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = 0f;
+        out[offset + 2] = 0f;
+        out[offset + 3] = 0f;
     }
-    return material;
-  }
 }
diff --git a/app/src/main/runtime/display/renderer/effects/FSREffect.java b/app/src/main/runtime/display/renderer/effects/FSREffect.java
deleted file mode 100644
index a428bc0dd..000000000
--- a/app/src/main/runtime/display/renderer/effects/FSREffect.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer.effects;
-
-import com.winlator.cmod.runtime.display.renderer.material.ScreenMaterial;
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
-import java.util.Locale;
-
-public class FSREffect extends Effect {
-    public static final int MODE_DLS = 1;
-    public static final int MODE_SUPER_RESOLUTION = 0;
-    private int currentMode = 0;
-    private float strengthLevel = 1.0f;
-
-    public void setMode(int mode) {
-        this.currentMode = mode;
-    }
-
-    public int getMode() {
-        return this.currentMode;
-    }
-
-    public void setLevel(float level) {
-        this.strengthLevel = level;
-    }
-
-    public float getLevel() {
-        return this.strengthLevel;
-    }
-
-    @Override
-    protected ShaderMaterial createMaterial() {
-        return new FSRMaterial();
-    }
-
-    private class FSRMaterial extends ScreenMaterial {
-        private FSRMaterial() {
-        }
-
-        @Override
-        protected String getFragmentShader() {
-            float sharp_strength;
-            float saturation = 1.0f;
-            float contrast = 1.0f;
-            if (FSREffect.this.currentMode == 1) {
-                saturation = (FSREffect.this.strengthLevel * 0.05f) + 1.0f;
-                contrast = (FSREffect.this.strengthLevel * 0.02f) + 1.0f;
-                sharp_strength = FSREffect.this.strengthLevel * 0.3f;
-            } else {
-                sharp_strength = FSREffect.this.strengthLevel * 0.5f;
-            }
-            String sSat = String.format(Locale.US, "%.4f", saturation);
-            String sCon = String.format(Locale.US, "%.4f", contrast);
-            String sSharp = String.format(Locale.US, "%.4f", sharp_strength);
-            StringBuilder shader = new StringBuilder();
-            shader.append("precision highp float;\n");
-            shader.append("uniform sampler2D screenTexture;\n");
-            shader.append("uniform vec2 resolution;\n");
-            shader.append("varying vec2 vUV;\n");
-            shader.append("const float SAT = ").append(sSat).append(";\n");
-            shader.append("const float CON = ").append(sCon).append(";\n");
-            shader.append("const float SHARP = ").append(sSharp).append(";\n");
-            shader.append("const int MODE = ").append(FSREffect.this.currentMode).append(";\n");
-            shader.append("void main() {\n");
-            shader.append("    vec2 uv = vUV;\n");
-            shader.append("    vec2 res = resolution.x > 0.0 ? resolution : vec2(1280.0, 720.0);\n");
-            shader.append("    vec2 step = 1.0 / res;\n");
-            shader.append("    if (MODE == 0) {\n");
-            shader.append("        vec3 c = texture2D(screenTexture, uv).rgb;\n");
-            shader.append("        vec3 t = texture2D(screenTexture, uv + vec2(0.0, -step.y)).rgb;\n");
-            shader.append("        vec3 b = texture2D(screenTexture, uv + vec2(0.0, step.y)).rgb;\n");
-            shader.append("        vec3 l = texture2D(screenTexture, uv + vec2(-step.x, 0.0)).rgb;\n");
-            shader.append("        vec3 r = texture2D(screenTexture, uv + vec2(step.x, 0.0)).rgb;\n");
-            shader.append("        float cL = dot(c, vec3(0.299, 0.587, 0.114));\n");
-            shader.append("        float tL = dot(t, vec3(0.299, 0.587, 0.114));\n");
-            shader.append("        float bL = dot(b, vec3(0.299, 0.587, 0.114));\n");
-            shader.append("        float lL = dot(l, vec3(0.299, 0.587, 0.114));\n");
-            shader.append("        float rL = dot(r, vec3(0.299, 0.587, 0.114));\n");
-            shader.append("        float mnL = min(cL, min(tL, min(bL, min(lL, rL))));\n");
-            shader.append("        float mxL = max(cL, max(tL, max(bL, max(lL, rL))));\n");
-            shader.append("        float hitMin = mnL / max(4.0 * mxL, 0.0001);\n");
-            shader.append("        float hitMax = (1.0 - mxL) / min(4.0 * mnL - 4.0, -0.0001);\n");
-            shader.append("        float lobe = max(-hitMin, hitMax);\n");
-            shader.append("        lobe = clamp(lobe * SHARP, -0.1875, 0.0);\n");
-            shader.append("        vec3 resolved = (lobe * (t + b + l + r) + c) / (4.0 * lobe + 1.0);\n");
-            shader.append("        gl_FragColor = vec4(clamp(resolved, 0.0, 1.0), 1.0);\n");
-            shader.append("    } else if (MODE == 1) {\n");
-            shader.append("        vec3 center = texture2D(screenTexture, uv).rgb;\n");
-            shader.append("        center = (center - 0.5) * CON + 0.5;\n");
-            shader.append("        float gray = dot(center, vec3(0.299, 0.587, 0.114));\n");
-            shader.append("        center = mix(vec3(gray), center, SAT);\n");
-            shader.append("        vec3 blur = (texture2D(screenTexture, uv + vec2(0.0, -step.y)).rgb + texture2D(screenTexture, uv + vec2(0.0, step.y)).rgb + texture2D(screenTexture, uv + vec2(-step.x, 0.0)).rgb + texture2D(screenTexture, uv + vec2(step.x, 0.0)).rgb) * 0.25;\n");
-            shader.append("        center = center + (center - blur) * SHARP;\n");
-            shader.append("        gl_FragColor = vec4(clamp(center, 0.0, 1.0), 1.0);\n");
-            shader.append("    }\n");
-            shader.append("}\n");
-            return shader.toString();
-        }
-    }
-}
diff --git a/app/src/main/runtime/display/renderer/effects/HDREffect.java b/app/src/main/runtime/display/renderer/effects/HDREffect.java
index fcad72a3a..591a5fa05 100644
--- a/app/src/main/runtime/display/renderer/effects/HDREffect.java
+++ b/app/src/main/runtime/display/renderer/effects/HDREffect.java
@@ -1,8 +1,5 @@
 package com.winlator.cmod.runtime.display.renderer.effects;
 
-import com.winlator.cmod.runtime.display.renderer.material.ScreenMaterial;
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
-
 public class HDREffect extends Effect {
     private boolean enabled = true;
 
@@ -10,60 +7,12 @@ public void setStrength(float s) {
         this.enabled = s > 0.5f;
     }
 
-    @Override
-    protected ShaderMaterial createMaterial() {
-        return new HDRMaterial();
+    public boolean isEnabled() {
+        return enabled;
     }
 
-    private class HDRMaterial extends ScreenMaterial {
-        private HDRMaterial() {
-        }
-
-        @Override
-        protected String getFragmentShader() {
-            return String.join("\n",
-                "precision mediump float;",
-                "uniform sampler2D screenTexture;",
-                "uniform vec2 resolution;",
-                "const float HDRPower = 1.30;",
-                "const float radius1 = 0.793;",
-                "const float radius2 = 0.870;",
-                "void main() {",
-                "    vec2 texcoord = gl_FragCoord.xy / resolution;",
-                "    vec2 px = 1.0 / resolution;",
-                "    vec3 color = texture2D(screenTexture, texcoord).rgb;",
-                "    // --- BLOOM PASS 1 (Radius 1) ---",
-                "    vec3 bloom_sum1 = texture2D(screenTexture, texcoord + vec2(1.5, -1.5) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2(-1.5, -1.5) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2( 1.5,  1.5) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2(-1.5,  1.5) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2( 0.0, -2.5) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2( 0.0,  2.5) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2(-2.5,  0.0) * radius1 * px).rgb;",
-                "    bloom_sum1 += texture2D(screenTexture, texcoord + vec2( 2.5,  0.0) * radius1 * px).rgb;",
-                "    bloom_sum1 *= 0.005;",
-                "    // --- BLOOM PASS 2 (Radius 2) ---",
-                "    vec3 bloom_sum2 = texture2D(screenTexture, texcoord + vec2(1.5, -1.5) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2(-1.5, -1.5) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2( 1.5,  1.5) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2(-1.5,  1.5) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2( 0.0, -2.5) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2( 0.0,  2.5) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2(-2.5,  0.0) * radius2 * px).rgb;",
-                "    bloom_sum2 += texture2D(screenTexture, texcoord + vec2( 2.5,  0.0) * radius2 * px).rgb;",
-                "    bloom_sum2 *= 0.010;",
-                "    // --- FAKE HDR CALCULATION ---",
-                "    float dist = radius2 - radius1;",
-                "    vec3 HDR = (color + (bloom_sum2 - bloom_sum1)) * dist;",
-                "    vec3 blend = HDR + color;",
-                "    ",
-                "    // Pow() aplica o contraste forte característico desse shader",
-                "    // Abs() protege contra valores negativos que causam glitch visual",
-                "    color = pow(abs(blend), vec3(abs(HDRPower))) + HDR;",
-                "    ",
-                "    gl_FragColor = vec4(clamp(color, 0.0, 1.0), 1.0);",
-                "}"
-            );
-        }
+    @Override
+    public int getNativeType() {
+        return TYPE_HDR;
     }
 }
diff --git a/app/src/main/runtime/display/renderer/effects/NTSC2Effect.java b/app/src/main/runtime/display/renderer/effects/NTSC2Effect.java
new file mode 100644
index 000000000..5e1c2e872
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/NTSC2Effect.java
@@ -0,0 +1,8 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class NTSC2Effect extends Effect {
+    @Override
+    public int getNativeType() {
+        return TYPE_NTSC2;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/NTSCEffect.java b/app/src/main/runtime/display/renderer/effects/NTSCEffect.java
new file mode 100644
index 000000000..5ed9b7f05
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/NTSCEffect.java
@@ -0,0 +1,8 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class NTSCEffect extends Effect {
+    @Override
+    public int getNativeType() {
+        return TYPE_NTSC;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/NaturalEffect.java b/app/src/main/runtime/display/renderer/effects/NaturalEffect.java
index 888d98046..183fb0cf7 100644
--- a/app/src/main/runtime/display/renderer/effects/NaturalEffect.java
+++ b/app/src/main/runtime/display/renderer/effects/NaturalEffect.java
@@ -1,40 +1,8 @@
 package com.winlator.cmod.runtime.display.renderer.effects;
 
-import com.winlator.cmod.runtime.display.renderer.material.ScreenMaterial;
-import com.winlator.cmod.runtime.display.renderer.material.ShaderMaterial;
-
 public class NaturalEffect extends Effect {
     @Override
-    protected ShaderMaterial createMaterial() {
-        return new NaturalMaterial();
-    }
-
-    private class NaturalMaterial extends ScreenMaterial {
-        private NaturalMaterial() {
-        }
-
-        @Override
-        protected String getFragmentShader() {
-            return String.join("\n",
-                "precision mediump float;",
-                "uniform sampler2D screenTexture;",
-                "uniform vec2 resolution;",
-                "const mat3 RGBtoYIQ = mat3(0.299, 0.596, 0.212, ",
-                "                           0.587,-0.275,-0.523, ",
-                "                           0.114,-0.321, 0.311);",
-                "const mat3 YIQtoRGB = mat3(1.0, 1.0, 1.0,",
-                "                           0.95568806,-0.27158179,-1.10817732,",
-                "                           0.61985809,-0.64687381, 1.70506455);",
-                "const vec3 val00 = vec3(1.2, 1.2, 1.2);",
-                "void main() {",
-                "    vec2 uv = gl_FragCoord.xy / resolution;",
-                "    vec3 c0 = texture2D(screenTexture, uv).rgb;",
-                "    vec3 t0 = c0 * RGBtoYIQ;",
-                "    t0 = vec3(pow(t0.r, 1.12), t0.gb * val00.gb);",
-                "    vec3 cFinal = t0 * YIQtoRGB;",
-                "    gl_FragColor = vec4(cFinal, 1.0);",
-                "}"
-            );
-        }
+    public int getNativeType() {
+        return TYPE_NATURAL;
     }
 }
diff --git a/app/src/main/runtime/display/renderer/effects/PixelateEffect.java b/app/src/main/runtime/display/renderer/effects/PixelateEffect.java
new file mode 100644
index 000000000..21330c195
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/PixelateEffect.java
@@ -0,0 +1,27 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class PixelateEffect extends Effect {
+    private float blockSize = 6.0f;
+
+    public void setBlockSize(float blockSize) {
+        this.blockSize = Math.max(1.0f, blockSize);
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_PIXELATE;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, blockSize, 0f, 0f};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = blockSize;
+        out[offset + 2] = 0f;
+        out[offset + 3] = 0f;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/SGSRUpscaler.java b/app/src/main/runtime/display/renderer/effects/SGSRUpscaler.java
new file mode 100644
index 000000000..a1e688060
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/SGSRUpscaler.java
@@ -0,0 +1,37 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+/*
+ * Runtime wrapper for Snapdragon Game Super Resolution 1.
+ * The SGSR1 shader implementation is adapted from Qualcomm's SGSR v1 reference:
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+public class SGSRUpscaler extends Effect {
+    private float sharpness = 1.0f;
+
+    public void setSharpness(float sharpness) {
+        this.sharpness = Math.min(1.0f, Math.max(0.0f, sharpness));
+    }
+
+    public float getSharpness() {
+        return sharpness;
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_SGSR1;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, 0f, 0f, sharpness};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = 0f;
+        out[offset + 2] = 0f;
+        out[offset + 3] = sharpness;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/ScanlinesEffect.java b/app/src/main/runtime/display/renderer/effects/ScanlinesEffect.java
new file mode 100644
index 000000000..a5ec304e9
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/ScanlinesEffect.java
@@ -0,0 +1,27 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class ScanlinesEffect extends Effect {
+    private float intensity = 0.5f;
+
+    public void setIntensity(float intensity) {
+        this.intensity = Math.min(1.0f, Math.max(0.0f, intensity));
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_SCANLINES;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, intensity, 0f, 0f};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = intensity;
+        out[offset + 2] = 0f;
+        out[offset + 3] = 0f;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/SharpenEffect.java b/app/src/main/runtime/display/renderer/effects/SharpenEffect.java
new file mode 100644
index 000000000..720b5b4fc
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/SharpenEffect.java
@@ -0,0 +1,27 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class SharpenEffect extends Effect {
+    private float strength = 0.5f;
+
+    public void setStrength(float strength) {
+        this.strength = Math.min(1.0f, Math.max(0.0f, strength));
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_SHARPEN;
+    }
+
+    @Override
+    public float[] getParams() {
+        return new float[]{0f, strength, 0f, 0f};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = strength;
+        out[offset + 2] = 0f;
+        out[offset + 3] = 0f;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/ToonEffect.java b/app/src/main/runtime/display/renderer/effects/ToonEffect.java
new file mode 100644
index 000000000..3285eb487
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/ToonEffect.java
@@ -0,0 +1,8 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class ToonEffect extends Effect {
+    @Override
+    public int getNativeType() {
+        return TYPE_TOON;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/effects/VividEffect.java b/app/src/main/runtime/display/renderer/effects/VividEffect.java
new file mode 100644
index 000000000..27cca9d48
--- /dev/null
+++ b/app/src/main/runtime/display/renderer/effects/VividEffect.java
@@ -0,0 +1,34 @@
+package com.winlator.cmod.runtime.display.renderer.effects;
+
+public class VividEffect extends Effect {
+    private float strengthLevel = 1.0f;
+
+    public void setLevel(float level) {
+        this.strengthLevel = level;
+    }
+
+    public float getLevel() {
+        return strengthLevel;
+    }
+
+    @Override
+    public int getNativeType() {
+        return TYPE_VIVID;
+    }
+
+    @Override
+    public float[] getParams() {
+        float saturation = strengthLevel * 0.05f + 1.0f;
+        float contrast = strengthLevel * 0.02f + 1.0f;
+        float sharpness = strengthLevel * 0.2f;
+        return new float[]{0f, saturation, contrast, sharpness};
+    }
+
+    @Override
+    public void writeParams(float[] out, int offset) {
+        out[offset] = 0f;
+        out[offset + 1] = strengthLevel * 0.05f + 1.0f;
+        out[offset + 2] = strengthLevel * 0.02f + 1.0f;
+        out[offset + 3] = strengthLevel * 0.2f;
+    }
+}
diff --git a/app/src/main/runtime/display/renderer/material/CursorMaterial.java b/app/src/main/runtime/display/renderer/material/CursorMaterial.java
deleted file mode 100644
index 26d65f49e..000000000
--- a/app/src/main/runtime/display/renderer/material/CursorMaterial.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer.material;
-
-public class CursorMaterial extends ShaderMaterial {
-  public CursorMaterial() {
-    setUniformNames("xform", "viewSize", "texture");
-  }
-
-  @Override
-  protected String getVertexShader() {
-    return "uniform float xform[6];\n"
-        + "uniform vec2 viewSize;\n"
-        + "attribute vec2 position;\n"
-        + "varying vec2 vUV;\n"
-        + "void main() {\n"
-        + "vUV = position;\n"
-        + "vec2 transformedPos = applyXForm(position, xform);\n"
-        + "gl_Position = vec4(2.0 * transformedPos.x / viewSize.x - 1.0, 1.0 - 2.0 * transformedPos.y / viewSize.y, 0.0, 1.0);\n"
-        + "}";
-  }
-
-  @Override
-  protected String getFragmentShader() {
-    return "precision mediump float;\n"
-        + "uniform sampler2D texture;\n"
-        + "varying vec2 vUV;\n"
-        + "void main() {\n"
-        + "gl_FragColor = texture2D(texture, vUV);\n"
-        + "}";
-  }
-}
diff --git a/app/src/main/runtime/display/renderer/material/ScreenMaterial.java b/app/src/main/runtime/display/renderer/material/ScreenMaterial.java
deleted file mode 100644
index 31480dc0f..000000000
--- a/app/src/main/runtime/display/renderer/material/ScreenMaterial.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer.material;
-
-public class ScreenMaterial extends ShaderMaterial {
-  // Constructor for ScreenMaterial
-  public ScreenMaterial() {
-    super(); // Calls the constructor of the superclass ShaderMaterial
-    // Sets the uniform names that will be used in the shaders
-    setUniformNames(new String[] {"resolution", "screenTexture"});
-  }
-
-  @Override
-  protected String getVertexShader() {
-    // Returns the GLSL vertex shader as a string.
-    // This shader calculates the position and texture coordinates for rendering the screen quad.
-    return String.join(
-        "\n",
-        new CharSequence[] {
-          "attribute vec2 position;",
-          "varying vec2 vUV;",
-          "void main() {",
-          "    vUV = position;",
-          "    gl_Position = vec4(2.0 * position.x - 1.0, 2.0 * position.y - 1.0, 0.0, 1.0);",
-          "}"
-        });
-  }
-}
diff --git a/app/src/main/runtime/display/renderer/material/ShaderMaterial.java b/app/src/main/runtime/display/renderer/material/ShaderMaterial.java
deleted file mode 100644
index d64b8a7f7..000000000
--- a/app/src/main/runtime/display/renderer/material/ShaderMaterial.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer.material;
-
-import android.graphics.Color;
-import android.opengl.GLES20;
-import android.util.Log;
-import androidx.collection.ArrayMap;
-
-public class ShaderMaterial {
-  public int programId;
-  private final ArrayMap<String, Integer> uniforms = new ArrayMap<>();
-
-  public void setUniformNames(String... names) {
-    uniforms.clear();
-    for (String name : names) uniforms.put(name, -1);
-  }
-
-  protected static int compileShaders(String vertexShader, String fragmentShader) {
-    int beginIndex = vertexShader.indexOf("void main() {");
-    vertexShader =
-        vertexShader.substring(0, beginIndex)
-            + "vec2 applyXForm(vec2 p, float xform[6]) {\n"
-            + "return vec2(xform[0] * p.x + xform[2] * p.y + xform[4], xform[1] * p.x + xform[3] * p.y + xform[5]);\n"
-            + "}\n"
-            + vertexShader.substring(beginIndex);
-
-    int programId = GLES20.glCreateProgram();
-    int[] compiled = new int[1];
-
-    int vertexShaderId = GLES20.glCreateShader(GLES20.GL_VERTEX_SHADER);
-    GLES20.glShaderSource(vertexShaderId, vertexShader);
-    GLES20.glCompileShader(vertexShaderId);
-
-    GLES20.glGetShaderiv(vertexShaderId, GLES20.GL_COMPILE_STATUS, compiled, 0);
-    if (compiled[0] == 0) {
-      throw new RuntimeException(
-          "Could not compile vertex shader: \n" + GLES20.glGetShaderInfoLog(vertexShaderId));
-    }
-    GLES20.glAttachShader(programId, vertexShaderId);
-
-    int fragmentShaderId = GLES20.glCreateShader(GLES20.GL_FRAGMENT_SHADER);
-    GLES20.glShaderSource(fragmentShaderId, fragmentShader);
-    GLES20.glCompileShader(fragmentShaderId);
-
-    GLES20.glGetShaderiv(fragmentShaderId, GLES20.GL_COMPILE_STATUS, compiled, 0);
-    if (compiled[0] == 0) {
-      throw new RuntimeException(
-          "Could not compile fragment shader: \n" + GLES20.glGetShaderInfoLog(fragmentShaderId));
-    }
-    GLES20.glAttachShader(programId, fragmentShaderId);
-
-    GLES20.glLinkProgram(programId);
-
-    GLES20.glDeleteShader(vertexShaderId);
-    GLES20.glDeleteShader(fragmentShaderId);
-    return programId;
-  }
-
-  protected String getVertexShader() {
-    return "";
-  }
-
-  protected String getFragmentShader() {
-    return "";
-  }
-
-  public void use() {
-    if (programId == 0) programId = compileShaders(getVertexShader(), getFragmentShader());
-    GLES20.glUseProgram(programId);
-
-    for (int i = 0; i < uniforms.size(); i++) {
-      int location = uniforms.valueAt(i);
-      if (location == -1) {
-        String name = uniforms.keyAt(i);
-        uniforms.put(name, GLES20.glGetUniformLocation(programId, name));
-      }
-    }
-  }
-
-  public int getUniformLocation(String name) {
-    Integer location = uniforms.get(name);
-    if (location == null) {
-      Log.e("ShaderMaterial", "Uniform " + name + " is not registered in setUniformNames().");
-      return -1;
-    }
-    if (location == -1) {
-      Log.e("ShaderMaterial", "Uniform " + name + " location not found in shader program.");
-    }
-    return location;
-  }
-
-  public void destroy() {
-    GLES20.glDeleteProgram(programId);
-    programId = 0;
-  }
-
-  public void setUniformVec2(String uniformName, float x, float y) {
-    int location = getUniformLocation(uniformName);
-    if (location != -1) {
-      GLES20.glUniform2f(location, x, y);
-    }
-  }
-
-  public void setUniformInt(String uniformName, int value) {
-    int location = getUniformLocation(uniformName);
-    if (location != -1) {
-      GLES20.glUniform1i(location, value);
-    }
-  }
-
-  public void setUniformFloat(String name, float value) {
-    int location = getUniformLocation(name);
-    if (location >= 0) {
-      GLES20.glUniform1f(location, value);
-    } else {
-      Log.e("ScreenMaterial", "Uniform location for " + name + " not found!");
-    }
-  }
-
-  public void setUniformFloatArray(String uniformName, float[] values) {
-    int location = getUniformLocation(uniformName);
-    if (location != -1) {
-      GLES20.glUniform1fv(location, values.length, values, 0);
-    }
-  }
-
-  public void setUniformColor(String uniformName, int color) {
-    int location = getUniformLocation(uniformName);
-    if (location != -1) {
-      float red = Color.red(color) / 255.0f;
-      float green = Color.green(color) / 255.0f;
-      float blue = Color.blue(color) / 255.0f;
-      GLES20.glUniform3f(location, red, green, blue);
-    }
-  }
-
-  public void setUniformVec3(String uniformName, float x, float y, float z) {
-    int location = getUniformLocation(uniformName);
-    if (location != -1) {
-      GLES20.glUniform3f(location, x, y, z);
-    } else {
-      Log.e("ShaderMaterial", "Uniform location for " + uniformName + " not found!");
-    }
-  }
-}
diff --git a/app/src/main/runtime/display/renderer/material/WindowMaterial.java b/app/src/main/runtime/display/renderer/material/WindowMaterial.java
deleted file mode 100644
index 305777e8b..000000000
--- a/app/src/main/runtime/display/renderer/material/WindowMaterial.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.winlator.cmod.runtime.display.renderer.material;
-
-public class WindowMaterial extends ShaderMaterial {
-  public WindowMaterial() {
-    setUniformNames("xform", "viewSize", "texture");
-  }
-
-  @Override
-  protected String getVertexShader() {
-    return "uniform float xform[6];\n"
-        + "uniform vec2 viewSize;\n"
-        + "attribute vec2 position;\n"
-        + "varying vec2 vUV;\n"
-        + "void main() {\n"
-        + "vUV = position;\n"
-        + "vec2 transformedPos = applyXForm(position, xform);\n"
-        + "gl_Position = vec4(2.0 * transformedPos.x / viewSize.x - 1.0, 1.0 - 2.0 * transformedPos.y / viewSize.y, 0.0, 1.0);\n"
-        + "}";
-  }
-
-  @Override
-  protected String getFragmentShader() {
-    return "precision mediump float;\n"
-        + "uniform sampler2D texture;\n"
-        + "varying vec2 vUV;\n"
-        + "void main() {\n"
-        + "gl_FragColor = vec4(texture2D(texture, vUV).rgb, 1.0);\n"
-        + "}";
-  }
-}
diff --git a/app/src/main/runtime/display/ui/FrameRating.java b/app/src/main/runtime/display/ui/FrameRating.java
index d22f910a9..d62af91f4 100644
--- a/app/src/main/runtime/display/ui/FrameRating.java
+++ b/app/src/main/runtime/display/ui/FrameRating.java
@@ -10,6 +10,7 @@
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.RippleDrawable;
 import android.os.BatteryManager;
@@ -17,8 +18,12 @@
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.SystemClock;
+import android.text.Spannable;
 import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
 import android.text.style.ForegroundColorSpan;
+import android.text.style.ImageSpan;
+import android.text.style.MetricAffectingSpan;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -50,7 +55,10 @@ public class FrameRating extends LinearLayout implements Runnable {
   public static final String PREF_HUD_POS_Y = "hud_position_y";
   public static final String PREF_HUD_HAS_POSITION = "hud_has_position";
   public static final String PREF_HUD_DUAL_SERIES_BATTERY = "hud_dual_series_battery";
+  public static final String PREF_HUD_FRAMETIME_NUMERIC = "hud_frametime_numeric";
   public static final String PREF_HUD_SCALE = "hud_scale";
+  // Rebase: a stored scale of 1.0 (slider 100%) renders at 1.2x.
+  private static final float HUD_SCALE_BASE = 1.2f;
   public static final String PREF_HUD_ALPHA = "hud_alpha";
   public static final String PREF_HUD_ELEMENTS = "hud_elements";
   public static final String PREF_HUD_ANCHOR = "hud_anchor";
@@ -66,15 +74,24 @@ public class FrameRating extends LinearLayout implements Runnable {
   private static final int ANCHOR_LEFT_CENTER = 6;
   private static final int ANCHOR_RIGHT_CENTER = 7;
   private int currentAnchor = ANCHOR_NONE;
+
+  public static final float DEFAULT_HUD_ELEVATION = 1000.0f;
+
+  private float hudElevation = DEFAULT_HUD_ELEVATION;
   private PopupWindow positionPopup;
   private ViewTreeObserver.OnGlobalLayoutListener parentLayoutListener;
   private final int C_BAT;
   private final int C_CPU;
   private final int C_DIVISOR;
   private final int C_FPS_OK;
+  /** Darker green for the "+ DC" badge, distinct from the bright FPS green. */
+  private static final int C_DC_ACTIVE = 0xFF2E7D32;
+  private final int C_WARM;
+  private final int C_HOT;
   private final int C_GPU;
   private final int C_RAM;
   private final int C_TEMP;
+  private final int C_CPU_TEMP;
   private final int C_VALUE;
   private int battFailCount;
   private BatteryManager batteryManager;
@@ -84,37 +101,63 @@ public class FrameRating extends LinearLayout implements Runnable {
   private boolean canReadGpu;
   private Context context;
   private int cpuFailCount;
+  private CPUStatus.AppCpuSample prevCpuSample;
+  private boolean cpuWarmedUp;
   private volatile int cpuPercent;
   private volatile int cpuTemp;
-  private float currentMs;
-  private boolean enableBattTemp;
+  private volatile int cpuSensorTemp;
+  private volatile float currentMs;
+  private boolean enableBatt;
+  private boolean enableTemp;
+  private boolean enableCpuTemp;
   private boolean enableCpu;
   private boolean enableRam;
   private boolean enableFps;
   private boolean enableGpu;
   private boolean enableGraph;
   private boolean enableRenderer;
-  private int frameCount;
+  // Volatile: written from the render thread, read on the UI thread.
+  private volatile boolean directCompositionActive = false;
+  private volatile FrameObserver frameObserver;
   private int gpuFailCount;
+  private int statsParity;
   private volatile int gpuLoad;
+
+  /** Raw per-present frame events on the render thread, fired regardless of HUD visibility so perf recording/leaderboard stats keep working when hidden. Must be cheap (atomic op + array write). */
+  public interface FrameObserver {
+    void onFramePresent(long nanoTime);
+  }
+
+  /** Install/remove the frame observer (null clears it); replacing is allowed (last-writer-wins) for when the activity swaps the FrameRating instance mid-session. */
+  public void setFrameObserver(FrameObserver observer) {
+    this.frameObserver = observer;
+  }
   private FrametimeGraphView graphView;
   private boolean isNativeActive;
   private boolean isStatsRunning;
-  private float lastFPS;
-  private long lastFrameNano;
+  private volatile boolean isCharging;
+  // When values are mirrored to the Compose overlay the on-screen view is GONE, but we must still compute FPS/frametime so the mirrored gauges stay live.
+  private volatile boolean hudMirrorActive;
+  private volatile float lastFPS;
+  private volatile long lastFrameNano;
+  private long lastPrimaryFrameNano;
   private long lastGraphRedraw;
-  private long lastTime;
   private volatile String ramText;
+  private final long[] frameTimesNano = new long[MAX_FRAME_SAMPLES];
+  private int frameTimesStart;
+  private int frameTimesCount;
   private String rendererName;
   private String gpuName;
-  private final View sep0, sep1, sep2, sep3, sep4, sep5;
+  private final View sep0, sep1, sep2, sep3, sep4, sep5, sep6;
   private final TextView tvRenderer;
   private final TextView tvGpuLoad;
   private final TextView tvCpu;
+  private final TextView tvCpuTemp;
   private final TextView tvRam;
   private final TextView tvBat;
   private final TextView tvTemp;
   private final TextView tvFpsBig;
+  private final TextView tvFrametime;
   private final FrameLayout graphContainer;
   private Handler statsHandler;
   private Runnable statsRunnable;
@@ -125,18 +168,32 @@ public class FrameRating extends LinearLayout implements Runnable {
 
   // ── GPU load caching (prevents N/A flickering from transient sysfs failures)
   private int lastGoodGpuLoad = -1;
-  private long lastGoodGpuTime = 0;
-  private static final long GPU_CACHE_DURATION_MS = 5000;
+  private static final long FALLBACK_SUPPRESSION_NS = 2000000000L;
+  private static final long FPS_CALC_INTERVAL_NS = 1000000000L;
+  private static final long HUD_REFRESH_MS = 500L;
+  private static final long CPU_WARMUP_POLL_MS = 500L;
+  private static final int MAX_FRAME_SAMPLES = 1024;
 
   // ── Tap-cycle display modes ──────────────────────────────────────
-  // Mode 0: horizontal, no backdrop
-  // Mode 1: horizontal, 50% shadow backdrop
-  // Mode 2: vertical, 50% shadow backdrop
-  // Mode 3: vertical, no backdrop
+  // 0/1 horizontal (no-backdrop/backdrop), 2/3 vertical (no-backdrop/backdrop)
   private int displayMode = 0;
   private static final int MODE_COUNT = 4;
   private GradientDrawable backdropDrawable;
+  private static final int BACKDROP_BASE_COLOR = 0xA6000000;
+  public static final float BACKDROP_BASE_ALPHA = ((BACKDROP_BASE_COLOR >>> 24) & 0xFF) / 255f;
+  private boolean bgAlphaDecoupled = false;
+  private float readoutAlpha = 1.0f;
+  private float backgroundAlpha = 1.0f;
+  // Outlined plug glyph shown next to the battery wattage while charging (lazily loaded + tinted).
+  private Drawable plugIcon;
   private boolean dualSeriesBattery;
+  private boolean frametimeNumericMode;
+  private final java.util.ArrayList<View> hudOrderedViews = new java.util.ArrayList<>();
+  private LinearLayout wrapRowTop;
+  private LinearLayout wrapRowBottom;
+  private boolean hudWrapped = false;
+  private View wrapHiddenSeparator;
+  private int wrapHiddenSeparatorVisibility = View.VISIBLE;
 
   public FrameRating(Context context, HashMap graphicsDriverConfig) {
     this(context, graphicsDriverConfig, null);
@@ -149,25 +206,31 @@ public FrameRating(Context context, HashMap graphicsDriverConfig, AttributeSet a
   public FrameRating(
       Context context, HashMap graphicsDriverConfig, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    this.lastTime = 0L;
     this.lastGraphRedraw = 0L;
     this.lastFrameNano = 0L;
-    this.frameCount = 0;
+    this.lastPrimaryFrameNano = 0L;
+    this.frameTimesStart = 0;
+    this.frameTimesCount = 0;
     this.lastFPS = 0.0f;
     this.currentMs = 0.0f;
     this.enableFps = true;
     this.enableGraph = true;
     this.enableGpu = true;
     this.enableCpu = true;
+    this.enableCpuTemp = false;
     this.enableRam = true;
-    this.enableBattTemp = true;
+    this.enableBatt = true;
+    this.enableTemp = true;
     this.enableRenderer = true;
     this.cpuPercent = -1;
+    this.prevCpuSample = null;
+    this.cpuWarmedUp = false;
     this.gpuLoad = -1;
     this.batteryWatts = -1.0f;
     this.cpuTemp = -1;
+    this.cpuSensorTemp = -1;
     this.ramText = "N/A";
-    this.rendererName = "OpenGL";
+    this.rendererName = "Vulkan";
     this.gpuName = null;
     this.canReadGpu = true;
     this.canReadCpu = true;
@@ -176,19 +239,22 @@ public FrameRating(
     this.cpuFailCount = 0;
     this.battFailCount = 0;
     this.lastGoodGpuLoad = -1;
-    this.lastGoodGpuTime = 0;
     this.isStatsRunning = false;
     this.C_VALUE = Color.parseColor("#FFFFFF");
-    this.C_CPU = Color.parseColor("#FFAB91");
-    this.C_RAM = Color.parseColor("#90CAF9");
-    this.C_BAT = Color.parseColor("#EF5350");
-    this.C_TEMP = Color.parseColor("#EF5350");
+    this.C_CPU = Color.parseColor("#FF8200");
+    this.C_RAM = Color.parseColor("#26C6DA");
+    this.C_BAT = Color.parseColor("#E03A94");
+    this.C_TEMP = Color.parseColor("#E53935");
+    this.C_CPU_TEMP = Color.parseColor("#9E9E9E");
     this.C_GPU = Color.parseColor("#E040FB");
     this.C_FPS_OK = Color.parseColor("#76FF03");
+    this.C_WARM = Color.parseColor("#FFC107"); // TMP value when battery is warm (40-44C)
+    this.C_HOT = Color.parseColor("#FF1744"); // TMP value when battery is hot (>=45C)
     this.C_DIVISOR = Color.parseColor("#616161");
     this.context = context;
     this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
-    this.isNativeActive = this.preferences.getBoolean("use_dri3", true);
+    // Native rendering (DRI3) is always on; the toggle was removed.
+    this.isNativeActive = true;
     this.batteryManager = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE);
     setOrientation(LinearLayout.HORIZONTAL);
     setLayoutParams(
@@ -199,10 +265,12 @@ public FrameRating(
     this.tvRenderer = view.findViewById(R.id.TVRenderer);
     this.tvGpuLoad = view.findViewById(R.id.TVGpuLoad);
     this.tvCpu = view.findViewById(R.id.TVCpu);
+    this.tvCpuTemp = view.findViewById(R.id.TVCpuTemp);
     this.tvRam = view.findViewById(R.id.TVRam);
     this.tvBat = view.findViewById(R.id.TVBat);
     this.tvTemp = view.findViewById(R.id.TVTemp);
     this.tvFpsBig = view.findViewById(R.id.TVFpsBig);
+    this.tvFrametime = view.findViewById(R.id.TVFrametime);
     this.graphContainer = view.findViewById(R.id.FLGraphContainer);
     this.sep0 = view.findViewById(R.id.Sep0);
     this.sep1 = view.findViewById(R.id.Sep1);
@@ -210,26 +278,26 @@ public FrameRating(
     this.sep3 = view.findViewById(R.id.Sep3);
     this.sep4 = view.findViewById(R.id.Sep4);
     this.sep5 = view.findViewById(R.id.Sep5);
+    this.sep6 = view.findViewById(R.id.Sep6);
+    for (int i = 0; i < getChildCount(); i++) hudOrderedViews.add(getChildAt(i));
     this.graphView = new FrametimeGraphView(context);
     if (this.graphContainer != null) {
       this.graphContainer.addView(this.graphView);
     }
     if (this.tvRenderer != null) {
-      this.tvRenderer.setText("OpenGL");
+      this.tvRenderer.setText("Vulkan");
     }
     if (this.tvFpsBig != null) {
       this.tvFpsBig.setText("60");
     }
 
-    // Create backdrop drawable (rounded, semi-transparent black)
     this.backdropDrawable = new GradientDrawable();
-    this.backdropDrawable.setColor(0x80000000); // 50% black
+    this.backdropDrawable.setColor(BACKDROP_BASE_COLOR);
     this.backdropDrawable.setCornerRadius(8f);
 
     loadPersistedHudPreferences();
     applyDisplayMode();
 
-    // Detect GPU name from sysfs on init
     if (this.gpuName == null) {
       detectGpuNameFromSysfs();
     }
@@ -246,7 +314,8 @@ public void run() {
             if (isStatsRunning) {
               calculateStats();
               if (statsHandler != null) {
-                statsHandler.postDelayed(this, 1000L);
+                long next = (prevCpuSample != null && !cpuWarmedUp) ? CPU_WARMUP_POLL_MS : 500L;
+                statsHandler.postDelayed(this, next);
               }
             }
           }
@@ -258,13 +327,14 @@ private void startStatsUpdate() {
       return;
     }
     this.isStatsRunning = true;
+    this.prevCpuSample = null;
+    this.cpuWarmedUp = false;
     this.statsThread = new HandlerThread("HardwareStatsThread");
     this.statsThread.start();
     this.statsHandler = new Handler(this.statsThread.getLooper());
     this.statsHandler.post(this.statsRunnable);
 
-    // Independent UI refresh timer — ensures hardware stats always refresh
-    // on screen even if update() is not called (e.g. frameRatingWindowId mismatch).
+    // Independent UI refresh timer so hardware stats refresh on screen even if update() is never called (e.g. frameRatingWindowId mismatch).
     this.uiRefreshHandler = new Handler(android.os.Looper.getMainLooper());
     this.uiRefreshRunnable =
         new Runnable() {
@@ -272,11 +342,11 @@ private void startStatsUpdate() {
           public void run() {
             if (isStatsRunning) {
               FrameRating.this.run();
-              uiRefreshHandler.postDelayed(this, 500L);
+              uiRefreshHandler.postDelayed(this, HUD_REFRESH_MS);
             }
           }
         };
-    this.uiRefreshHandler.postDelayed(this.uiRefreshRunnable, 500L);
+    this.uiRefreshHandler.postDelayed(this.uiRefreshRunnable, HUD_REFRESH_MS);
   }
 
   private void stopStatsUpdate() {
@@ -299,8 +369,11 @@ private void stopStatsUpdate() {
   @Override
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();
-    bringToFront();
-    setElevation(1000.0f);
+    // Deferred: bringToFront() reorders the parent's child array; called inside the parent's
+    // attach walk it makes the walker skip the sibling that shifts into this view's old slot,
+    // leaving that sibling permanently unattached. Z-order is held by the elevation either way.
+    post(this::bringToFront);
+    setElevation(this.hudElevation);
     restorePersistedPosition();
     installParentLayoutListener();
     removeCallbacks(this);
@@ -360,6 +433,11 @@ private void removeParentLayoutListener() {
     this.parentLayoutListener = null;
   }
 
+  public void setHudElevation(float elevation) {
+    this.hudElevation = elevation;
+    setElevation(elevation);
+  }
+
   // ── Touch: tap cycles display mode, drag moves HUD, long-press shows menu ──
   private void setupTapAndDragListener() {
     setOnTouchListener(
@@ -455,9 +533,10 @@ private void cycleDisplayMode() {
   }
 
   private void loadPersistedHudPreferences() {
-    this.displayMode = this.preferences.getInt(PREF_HUD_DISPLAY_MODE, 0);
+    this.displayMode = this.preferences.getInt(PREF_HUD_DISPLAY_MODE, 1);
     this.dualSeriesBattery = this.preferences.getBoolean(PREF_HUD_DUAL_SERIES_BATTERY, false);
-    this.currentAnchor = this.preferences.getInt(PREF_HUD_ANCHOR, ANCHOR_NONE);
+    this.frametimeNumericMode = this.preferences.getBoolean(PREF_HUD_FRAMETIME_NUMERIC, false);
+    this.currentAnchor = this.preferences.getInt(PREF_HUD_ANCHOR, ANCHOR_TOP_CENTER);
   }
 
   private void restorePersistedPosition() {
@@ -737,6 +816,7 @@ private void applyAnchor(int anchor, boolean persist) {
   }
 
   private void applyDisplayMode() {
+    if (hudWrapped) unwrapStructure();
     boolean horizontal;
     boolean showBackdrop;
     switch (displayMode) {
@@ -784,6 +864,7 @@ private void applyDisplayMode() {
       tvTemp,
       sep5,
       tvFpsBig,
+      tvFrametime,
       graphContainer
     };
     for (View v : views) {
@@ -793,6 +874,16 @@ private void applyDisplayMode() {
           lp.width = graphW;
           lp.height = graphH;
           lp.setMargins(horizontal ? 4 : 0, horizontal ? 0 : 4, 0, 0);
+        } else if (v == tvFrametime) {
+          lp.width = LayoutParams.WRAP_CONTENT;
+          lp.height = LayoutParams.WRAP_CONTENT;
+          lp.setMargins(horizontal ? 4 : 0, horizontal ? 0 : 4, 0, 0);
+        } else if (v == tvFpsBig) {
+          lp.width = LayoutParams.WRAP_CONTENT;
+          lp.height = LayoutParams.WRAP_CONTENT;
+          lp.setMargins(0, 0, 0, 0);
+          // Centre the big FPS number when stacked vertically; inherit container gravity when horizontal (-1).
+          lp.gravity = horizontal ? -1 : Gravity.CENTER_HORIZONTAL;
         } else {
           lp.width = LayoutParams.WRAP_CONTENT;
           lp.height = LayoutParams.WRAP_CONTENT;
@@ -802,8 +893,180 @@ private void applyDisplayMode() {
       }
     }
 
+    applyFrametimeDisplayVisibility();
     updateSeparators(horizontal);
     requestLayout();
+    post(this::updateWrapState);
+  }
+
+  private boolean isHorizontalDisplayMode() {
+    return displayMode != 2 && displayMode != 3;
+  }
+
+  private boolean isSeparatorView(View v) {
+    return v == sep0 || v == sep1 || v == sep2 || v == sep3 || v == sep4 || v == sep5 || v == sep6;
+  }
+
+  private int measureViewRowWidth(View v) {
+    ViewGroup.LayoutParams lp = v.getLayoutParams();
+    int wSpec =
+        lp != null && lp.width > 0
+            ? MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY)
+            : MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+    int hSpec =
+        lp != null && lp.height > 0
+            ? MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY)
+            : MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+    v.measure(wSpec, hSpec);
+    int margins = 0;
+    if (lp instanceof MarginLayoutParams) {
+      margins = ((MarginLayoutParams) lp).leftMargin + ((MarginLayoutParams) lp).rightMargin;
+    }
+    return v.getMeasuredWidth() + margins;
+  }
+
+  private int measureNaturalRowWidth() {
+    int total = getPaddingLeft() + getPaddingRight();
+    for (View v : hudOrderedViews) {
+      if (v == null || v.getVisibility() == View.GONE) continue;
+      total += measureViewRowWidth(v);
+    }
+    return total;
+  }
+
+  public void updateWrapState() {
+    if (!(getParent() instanceof View)) return;
+    int limit = ((View) getParent()).getWidth();
+    if (limit <= 0) return;
+    float scale = Math.max(getScaleX(), 0.01f);
+    int natural = (int) (measureNaturalRowWidth() * scale);
+    boolean shouldWrap;
+    if (hudWrapped) {
+      shouldWrap = natural >= (int) (limit * 0.95f);
+    } else {
+      shouldWrap = natural > limit;
+    }
+    if (!isHorizontalDisplayMode()) shouldWrap = false;
+    if (shouldWrap == hudWrapped) return;
+    if (shouldWrap) {
+      wrapStructure();
+    } else {
+      unwrapStructure();
+      setOrientation(LinearLayout.HORIZONTAL);
+      setGravity(android.view.Gravity.CENTER_VERTICAL);
+      requestLayout();
+    }
+  }
+
+  private void rewrap() {
+    if (hudWrapped) {
+      unwrapStructure();
+      setOrientation(LinearLayout.HORIZONTAL);
+      setGravity(android.view.Gravity.CENTER_VERTICAL);
+    }
+    updateWrapState();
+  }
+
+  private void wrapStructure() {
+    java.util.ArrayList<java.util.ArrayList<View>> groups = new java.util.ArrayList<>();
+    java.util.ArrayList<View> pendingSeps = new java.util.ArrayList<>();
+    for (View v : hudOrderedViews) {
+      if (v == null) continue;
+      if (isSeparatorView(v)) {
+        pendingSeps.add(v);
+        continue;
+      }
+      java.util.ArrayList<View> group = new java.util.ArrayList<>(pendingSeps);
+      pendingSeps.clear();
+      group.add(v);
+      groups.add(group);
+    }
+    if (!pendingSeps.isEmpty()) {
+      if (groups.isEmpty()) groups.add(new java.util.ArrayList<>());
+      groups.get(groups.size() - 1).addAll(pendingSeps);
+    }
+    if (groups.size() < 2) return;
+
+    int totalWidth = 0;
+    int[] groupWidths = new int[groups.size()];
+    for (int i = 0; i < groups.size(); i++) {
+      int w = 0;
+      for (View v : groups.get(i)) {
+        if (v.getVisibility() == View.GONE) continue;
+        w += measureViewRowWidth(v);
+      }
+      groupWidths[i] = w;
+      totalWidth += w;
+    }
+
+    int firstRowWidth = 0;
+    int splitIndex = groups.size() - 1;
+    for (int i = 0; i < groups.size() - 1; i++) {
+      if (firstRowWidth + groupWidths[i] * 0.5f > totalWidth * 0.5f && i > 0) {
+        splitIndex = i;
+        break;
+      }
+      firstRowWidth += groupWidths[i];
+    }
+
+    removeAllViews();
+    wrapRowTop = new LinearLayout(getContext());
+    wrapRowTop.setOrientation(LinearLayout.HORIZONTAL);
+    wrapRowTop.setGravity(android.view.Gravity.CENTER_VERTICAL);
+    wrapRowBottom = new LinearLayout(getContext());
+    wrapRowBottom.setOrientation(LinearLayout.HORIZONTAL);
+    wrapRowBottom.setGravity(android.view.Gravity.CENTER_VERTICAL);
+    for (int i = 0; i < groups.size(); i++) {
+      LinearLayout row = i < splitIndex ? wrapRowTop : wrapRowBottom;
+      for (View v : groups.get(i)) row.addView(v);
+    }
+
+    restoreWrapHiddenSeparator();
+    for (int i = 0; i < wrapRowBottom.getChildCount(); i++) {
+      View child = wrapRowBottom.getChildAt(i);
+      if (!isSeparatorView(child)) break;
+      if (child.getVisibility() != View.GONE) {
+        wrapHiddenSeparator = child;
+        wrapHiddenSeparatorVisibility = child.getVisibility();
+        child.setVisibility(View.GONE);
+        break;
+      }
+    }
+
+    setOrientation(LinearLayout.VERTICAL);
+    setGravity(android.view.Gravity.CENTER_HORIZONTAL);
+    LinearLayout.LayoutParams topLp =
+        new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+    topLp.gravity = android.view.Gravity.CENTER_HORIZONTAL;
+    LinearLayout.LayoutParams bottomLp =
+        new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+    bottomLp.gravity = android.view.Gravity.CENTER_HORIZONTAL;
+    bottomLp.topMargin = 2;
+    addView(wrapRowTop, topLp);
+    addView(wrapRowBottom, bottomLp);
+    hudWrapped = true;
+    requestLayout();
+  }
+
+  private void restoreWrapHiddenSeparator() {
+    if (wrapHiddenSeparator != null) {
+      wrapHiddenSeparator.setVisibility(wrapHiddenSeparatorVisibility);
+      wrapHiddenSeparator = null;
+    }
+  }
+
+  private void unwrapStructure() {
+    if (!hudWrapped) return;
+    restoreWrapHiddenSeparator();
+    if (wrapRowTop != null) wrapRowTop.removeAllViews();
+    if (wrapRowBottom != null) wrapRowBottom.removeAllViews();
+    removeAllViews();
+    for (View v : hudOrderedViews) {
+      if (v != null) addView(v);
+    }
+    wrapRowTop = null;
+    wrapRowBottom = null;
+    hudWrapped = false;
   }
 
   public void setRenderer(String renderer) {
@@ -817,8 +1080,6 @@ public void setRenderer(String renderer) {
       this.rendererName = "DXVK";
     } else if (r.contains("turnip")) {
       this.rendererName = "Turnip";
-    } else if (r.contains("virgl")) {
-      this.rendererName = "VirGL";
     } else if (r.contains("zink")) {
       this.rendererName = "Zink";
     } else if (r.contains("llvmpipe") || r.contains("software")) {
@@ -853,13 +1114,32 @@ public void run() {
 
   private void updateRendererText() {
     if (this.tvRenderer != null) {
-      String text = this.rendererName + (this.isNativeActive ? "+" : "");
-      this.tvRenderer.setText(text);
+      if (directCompositionActive) {
+        // "+ DC" in a darker green than the HUD's bright FPS green, so it reads
+        // as a state badge on the renderer rather than another metric.
+        SpannableStringBuilder sb = new SpannableStringBuilder();
+        sb.append(this.rendererName);
+        sb.append(" ");
+        int badgeStart = sb.length();
+        sb.append("+ DC");
+        sb.setSpan(new ForegroundColorSpan(C_DC_ACTIVE), badgeStart, sb.length(),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        this.tvRenderer.setText(sb);
+      } else {
+        this.tvRenderer.setText(this.rendererName);
+      }
       this.tvRenderer.setVisibility(this.enableRenderer ? View.VISIBLE : View.GONE);
       updateSeparators(getOrientation() == LinearLayout.HORIZONTAL);
     }
   }
 
+  /** Toggles the HUD's "+ DC" badge. Safe to call from any thread. */
+  public void setDirectCompositionActive(boolean active) {
+    if (this.directCompositionActive == active) return;
+    this.directCompositionActive = active;
+    post(this::updateRendererText);
+  }
+
   public void setGpuName(String name) {
     if (name != null && !name.isEmpty()) {
       // Clean up property format "name = value" and remove quotes
@@ -924,10 +1204,11 @@ private void detectGpuNameFromSysfs() {
     }
   }
 
-  public void reset() {
-    this.frameCount = 0;
-    this.lastTime = 0L;
+  public synchronized void reset() {
     this.lastFrameNano = 0L;
+    this.lastPrimaryFrameNano = 0L;
+    this.frameTimesStart = 0;
+    this.frameTimesCount = 0;
     this.lastFPS = 0.0f;
     this.currentMs = 0.0f;
     post(this);
@@ -944,15 +1225,46 @@ public void setLayoutOrientation(boolean z) {
   }
 
   public void setHudAlpha(float alpha) {
-    setAlpha(alpha);
+    this.readoutAlpha = alpha;
+    applyAlpha();
+  }
+
+  public void setHudBackgroundAlpha(float alpha) {
+    this.backgroundAlpha = alpha;
+    applyAlpha();
+  }
+
+  public void setBackgroundAlphaDecoupled(boolean decoupled) {
+    this.bgAlphaDecoupled = decoupled;
+    applyAlpha();
+  }
+
+  private void applyAlpha() {
+    if (bgAlphaDecoupled) {
+      setAlpha(1.0f);
+      setChildrenAlpha(readoutAlpha);
+      int a = Math.max(0, Math.min(255, Math.round(backgroundAlpha * 255f)));
+      backdropDrawable.setColor((a << 24) | (BACKDROP_BASE_COLOR & 0x00FFFFFF));
+    } else {
+      setChildrenAlpha(1.0f);
+      backdropDrawable.setColor(BACKDROP_BASE_COLOR);
+      setAlpha(readoutAlpha);
+    }
+  }
+
+  private void setChildrenAlpha(float alpha) {
+    for (int i = 0; i < getChildCount(); i++) {
+      getChildAt(i).setAlpha(alpha);
+    }
   }
 
   public void setHudScale(float scale) {
-    setScaleX(scale);
-    setScaleY(scale);
+    setScaleX(scale * HUD_SCALE_BASE);
+    setScaleY(scale * HUD_SCALE_BASE);
     setPivotX(0);
     setPivotY(0);
     this.preferences.edit().putFloat(PREF_HUD_SCALE, scale).apply();
+    post(this::rewrap);
   }
 
   public void setDualSeriesBattery(boolean dualSeriesBattery) {
@@ -961,6 +1273,24 @@ public void setDualSeriesBattery(boolean dualSeriesBattery) {
     post(this);
   }
 
+  public void setFrametimeNumericMode(boolean numeric) {
+    this.frametimeNumericMode = numeric;
+    this.preferences.edit().putBoolean(PREF_HUD_FRAMETIME_NUMERIC, numeric).apply();
+    post(this::applyFrametimeDisplayVisibility);
+    post(this);
+  }
+
+  private void applyFrametimeDisplayVisibility() {
+    boolean showNumeric = this.enableGraph && this.frametimeNumericMode;
+    boolean showGraph = this.enableGraph && !this.frametimeNumericMode;
+    if (this.tvFrametime != null) {
+      this.tvFrametime.setVisibility(showNumeric ? View.VISIBLE : View.GONE);
+    }
+    if (this.graphContainer != null) {
+      this.graphContainer.setVisibility(showGraph ? View.VISIBLE : View.GONE);
+    }
+  }
+
   public void toggleElement(int elementIndex, boolean visible) {
     int v = visible ? View.VISIBLE : View.GONE;
     switch (elementIndex) {
@@ -991,23 +1321,29 @@ public void toggleElement(int elementIndex, boolean visible) {
         if (this.tvRam != null) this.tvRam.setVisibility(v);
         break;
       case 5:
-        this.enableBattTemp = visible;
+        this.enableBatt = visible;
         if (this.tvBat != null) this.tvBat.setVisibility(v);
-        if (this.tvTemp != null) this.tvTemp.setVisibility(v);
         break;
       case 6:
+        this.enableTemp = visible;
+        if (this.tvTemp != null) this.tvTemp.setVisibility(v);
+        break;
+      case 7:
         this.enableGraph = visible;
-        if (this.graphContainer != null) {
-          this.graphContainer.setVisibility(v);
-        }
+        applyFrametimeDisplayVisibility();
+        break;
+      case 8:
+        this.enableCpuTemp = visible;
+        if (this.tvCpuTemp != null) this.tvCpuTemp.setVisibility(v);
         break;
     }
-    updateSeparators(getOrientation() == LinearLayout.HORIZONTAL);
+    updateSeparators(isHorizontalDisplayMode());
+    post(this::rewrap);
   }
 
   private void updateSeparators(boolean horizontal) {
     if (!horizontal) {
-      View[] seps = {sep0, sep1, sep2, sep3, sep4, sep5};
+      View[] seps = {sep0, sep1, sep2, sep3, sep4, sep5, sep6};
       for (View s : seps) if (s != null) s.setVisibility(View.GONE);
       return;
     }
@@ -1015,6 +1351,7 @@ private void updateSeparators(boolean horizontal) {
     boolean vRen = tvRenderer != null && tvRenderer.getVisibility() == View.VISIBLE;
     boolean vGpu = tvGpuLoad != null && tvGpuLoad.getVisibility() == View.VISIBLE;
     boolean vCpu = tvCpu != null && tvCpu.getVisibility() == View.VISIBLE;
+    boolean vCTmp = tvCpuTemp != null && tvCpuTemp.getVisibility() == View.VISIBLE;
     boolean vRam = tvRam != null && tvRam.getVisibility() == View.VISIBLE;
     boolean vBat = tvBat != null && tvBat.getVisibility() == View.VISIBLE;
     boolean vTmp = tvTemp != null && tvTemp.getVisibility() == View.VISIBLE;
@@ -1022,55 +1359,111 @@ private void updateSeparators(boolean horizontal) {
 
     if (sep0 != null)
       sep0.setVisibility(
-          vRen && (vGpu || vCpu || vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
+          vRen && (vGpu || vCpu || vCTmp || vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
     if (sep1 != null)
-      sep1.setVisibility(vGpu && (vCpu || vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
+      sep1.setVisibility(
+          vGpu && (vCpu || vCTmp || vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
     if (sep2 != null)
-      sep2.setVisibility(vCpu && (vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
+      sep2.setVisibility(
+          vCpu && (vCTmp || vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
+    if (sep6 != null)
+      sep6.setVisibility(vCTmp && (vRam || vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
     if (sep3 != null) sep3.setVisibility(vRam && (vBat || vTmp || vFps) ? View.VISIBLE : View.GONE);
     if (sep4 != null) sep4.setVisibility(vBat && (vTmp || vFps) ? View.VISIBLE : View.GONE);
     if (sep5 != null) sep5.setVisibility(vTmp && vFps ? View.VISIBLE : View.GONE);
+    if (hudWrapped && wrapHiddenSeparator != null) wrapHiddenSeparator.setVisibility(View.GONE);
   }
 
-  /**
-   * Called by the X server rendering loop for each application window content change. This is the
-   * primary FPS source — counts actual game frame updates.
-   */
-  public void update() {
-    if (getVisibility() != View.VISIBLE) {
-      return;
-    }
-    if (this.lastTime == 0) {
-      this.lastTime = SystemClock.elapsedRealtime();
+  /** Called when the guest submits a new frame to the X presentation path. */
+  public void setHudMirrorActive(boolean active) {
+    this.hudMirrorActive = active;
+  }
+
+  public void recordGameFrame(boolean primarySource, int serial) {
+    // Notify the observer before visibility gating so perf recording/leaderboard stats keep working when the HUD is hidden.
+    FrameObserver obs = this.frameObserver;
+    if (obs != null) {
+      obs.onFramePresent(System.nanoTime());
     }
-    long time = SystemClock.elapsedRealtime();
-    if (time >= this.lastTime + 500) {
-      this.lastFPS = (this.frameCount * 1000f) / (time - this.lastTime);
-      post(this);
-      this.lastTime = time;
-      this.frameCount = 0;
+    if (getVisibility() != View.VISIBLE && !this.hudMirrorActive) {
+      return;
     }
-    this.frameCount++;
     long nowNano = System.nanoTime();
-    if (this.lastFrameNano == 0) {
+
+    synchronized (this) {
+      if (primarySource) {
+        if (this.lastPrimaryFrameNano == 0
+            || nowNano - this.lastPrimaryFrameNano >= FALLBACK_SUPPRESSION_NS) {
+          this.lastFrameNano = 0L;
+          this.frameTimesStart = 0;
+          this.frameTimesCount = 0;
+        }
+        this.lastPrimaryFrameNano = nowNano;
+      } else if (this.lastPrimaryFrameNano > 0
+          && nowNano - this.lastPrimaryFrameNano < FALLBACK_SUPPRESSION_NS) {
+        return;
+      }
+
+      if (this.lastFrameNano == 0) {
+        this.lastFrameNano = nowNano;
+      }
+      float ms = (nowNano - this.lastFrameNano) / 1000000.0f;
       this.lastFrameNano = nowNano;
-    }
-    float ms = (nowNano - this.lastFrameNano) / 1000000.0f;
-    this.lastFrameNano = nowNano;
-    if (this.enableGraph && ms > 0.0f && ms < 500.0f) {
-      this.currentMs = ms;
-      if (time - this.lastGraphRedraw >= 50) {
-        if (this.graphView != null) {
+
+      // Ring write only; window trimming, FPS math, and text refresh run on the 1s UI tick.
+      appendFrameTimeLocked(nowNano);
+      if (ms > 0.0f && ms < 500.0f) {
+        this.currentMs = ms;
+      }
+      if (this.enableGraph && !this.frametimeNumericMode && this.graphView != null
+          && ms > 0.0f && ms < 500.0f) {
+        long time = SystemClock.elapsedRealtime();
+        if (time - this.lastGraphRedraw >= 50L) {
           this.graphView.addFrame(ms);
           this.graphView.postInvalidate();
+          this.lastGraphRedraw = time;
         }
-        this.lastGraphRedraw = time;
       }
-    } else if (!this.enableGraph && ms > 0.0f && ms < 500.0f) {
-      this.currentMs = ms;
     }
   }
 
+  public void recordGameFrame() {
+    recordGameFrame(false, 0);
+  }
+
+  private void appendFrameTimeLocked(long nowNano) {
+    int index = (this.frameTimesStart + this.frameTimesCount) % MAX_FRAME_SAMPLES;
+    if (this.frameTimesCount == MAX_FRAME_SAMPLES) {
+      this.frameTimesStart = (this.frameTimesStart + 1) % MAX_FRAME_SAMPLES;
+      index = (this.frameTimesStart + this.frameTimesCount - 1) % MAX_FRAME_SAMPLES;
+    } else {
+      this.frameTimesCount++;
+    }
+    this.frameTimesNano[index] = nowNano;
+  }
+
+  private void trimFrameTimesLocked(long oldestAllowedNano) {
+    while (this.frameTimesCount > 0
+        && this.frameTimesNano[this.frameTimesStart] < oldestAllowedNano) {
+      this.frameTimesStart = (this.frameTimesStart + 1) % MAX_FRAME_SAMPLES;
+      this.frameTimesCount--;
+    }
+  }
+
+  private void updateRollingFpsLocked() {
+    if (this.frameTimesCount <= 1) {
+      this.lastFPS = 0.0f;
+      return;
+    }
+
+    long first = this.frameTimesNano[this.frameTimesStart];
+    int lastIndex = (this.frameTimesStart + this.frameTimesCount - 1) % MAX_FRAME_SAMPLES;
+    long last = this.frameTimesNano[lastIndex];
+    long elapsedNano = last - first;
+    this.lastFPS =
+        elapsedNano > 0 ? ((this.frameTimesCount - 1) * 1000000000.0f) / elapsedNano : 0.0f;
+  }
+
   private long readSysFs(String path) {
     try {
       File f = new File(path);
@@ -1110,10 +1503,27 @@ private float getBatteryCurrentAmps() {
   }
 
   private int calculateGPULoad() throws Exception {
+    File gpubusy = new File("/sys/class/kgsl/kgsl-3d0/gpubusy");
+    if (gpubusy.exists() && gpubusy.canRead()) {
+      try (BufferedReader reader = new BufferedReader(new FileReader(gpubusy))) {
+        String line = reader.readLine();
+        if (line != null) {
+          String[] parts = line.trim().split("\\s+");
+          if (parts.length >= 2) {
+            long busy = Long.parseLong(parts[0]);
+            long total = Long.parseLong(parts[1]);
+            if (total > 0) return (int) ((100 * busy) / total);
+          }
+        }
+      } catch (Exception ignored) {
+      }
+    }
+
     File[] gpuFiles = {
       new File("/sys/class/kgsl/kgsl-3d0/gpu_busy_percentage"),
       new File("/sys/class/kgsl/kgsl-3d0/devfreq/gpu_load"),
-      new File("/sys/class/misc/mali0/device/utilisation")
+      new File("/sys/class/misc/mali0/device/utilisation"),
+      new File("/sys/kernel/gpu/gpu_busy")
     };
 
     for (File f : gpuFiles) {
@@ -1128,64 +1538,75 @@ private int calculateGPULoad() throws Exception {
       }
     }
 
-    File gpubusy = new File("/sys/class/kgsl/kgsl-3d0/gpubusy");
-    if (gpubusy.exists() && gpubusy.canRead()) {
-      try (BufferedReader reader = new BufferedReader(new FileReader(gpubusy))) {
-        String line = reader.readLine();
-        if (line != null) {
-          String[] parts = line.trim().split("\\s+");
-          if (parts.length >= 2) {
-            long busy = Long.parseLong(parts[0]);
-            long total = Long.parseLong(parts[1]);
-            if (total != 0) return (int) ((100 * busy) / total);
+    File mtkMali = new File("/proc/mtk_mali/utilization");
+    if (mtkMali.exists() && mtkMali.canRead()) {
+      try (BufferedReader reader = new BufferedReader(new FileReader(mtkMali))) {
+        String line;
+        while ((line = reader.readLine()) != null) {
+          int idx = line.indexOf("ACTIVE=");
+          if (idx >= 0) {
+            int start = idx + 7;
+            int end = line.indexOf(' ', start);
+            String num = (end > start ? line.substring(start, end) : line.substring(start))
+                .replaceAll("[^0-9]", "");
+            if (!num.isEmpty()) return Integer.parseInt(num);
           }
         }
       } catch (Exception ignored) {
       }
     }
+
     throw new Exception("Failed to read GPU usage.");
   }
 
   private void calculateStats() {
+    // Loads sample every 500ms (matching the Mango HUD window); heavier reads alternate at 1s.
+    boolean slow = (this.statsParity++ & 1) == 0;
     if (this.enableGpu && this.canReadGpu) {
       try {
         int load = calculateGPULoad();
         this.gpuLoad = load;
         this.lastGoodGpuLoad = load;
-        this.lastGoodGpuTime = SystemClock.elapsedRealtime();
         this.gpuFailCount = 0;
       } catch (Exception e) {
-        // Use cached value if recent enough, otherwise show -1
-        long elapsed = SystemClock.elapsedRealtime() - this.lastGoodGpuTime;
-        if (this.lastGoodGpuLoad >= 0 && elapsed < GPU_CACHE_DURATION_MS) {
-          this.gpuLoad = this.lastGoodGpuLoad;
-        } else {
-          this.gpuLoad = -1;
-        }
+        // Hold the last good reading through transient sysfs failures, like the Mango HUD.
+        if (this.lastGoodGpuLoad >= 0) this.gpuLoad = this.lastGoodGpuLoad;
         this.gpuFailCount++;
       }
     }
     if (this.enableCpu && this.canReadCpu) {
       try {
-        short[] clocks = CPUStatus.getCurrentClockSpeeds();
-        if (clocks != null && clocks.length > 0) {
-          long cur = 0;
-          long max = 0;
-          for (int i = 0; i < clocks.length; i++) {
-            cur += clocks[i];
-            max += CPUStatus.getMaxClockSpeed(i);
-          }
-          if (max > 0) {
-            this.cpuPercent = (int) ((cur * 100) / max);
-            this.cpuFailCount = 0;
+        CPUStatus.AppCpuSample sample = CPUStatus.readAppCpuSample();
+        int pct = -1;
+        if (sample != null) {
+          if (this.prevCpuSample != null) pct = sample.percentSince(this.prevCpuSample);
+          this.prevCpuSample = sample;
+        }
+        if (pct >= 0) {
+          this.cpuPercent = pct;
+          this.cpuFailCount = 0;
+          if (!this.cpuWarmedUp) {
+            this.cpuWarmedUp = true;
+            Handler refresh = this.uiRefreshHandler;
+            if (refresh != null) refresh.post(this);
           }
+        } else if (!this.cpuWarmedUp) {
+          int freq = CPUStatus.getClockFreqLoadPercent();
+          if (freq >= 0) this.cpuPercent = freq;
         }
       } catch (Exception e) {
         this.cpuPercent = -1;
         this.cpuFailCount++;
       }
     }
-    if (this.enableRam) {
+    if (slow && this.enableCpuTemp) {
+      try {
+        this.cpuSensorTemp = CPUStatus.getCpuTempC();
+      } catch (Exception e) {
+        this.cpuSensorTemp = -1;
+      }
+    }
+    if (slow && this.enableRam) {
       try {
         ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
         ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE)).getMemoryInfo(mi);
@@ -1195,7 +1616,7 @@ private void calculateStats() {
         this.ramText = "N/A";
       }
     }
-    if (this.enableBattTemp && this.canReadBatt) {
+    if (slow && (this.enableBatt || this.enableTemp) && this.canReadBatt) {
       try {
         float amps = getBatteryCurrentAmps();
         Intent intent =
@@ -1207,6 +1628,9 @@ private void calculateStats() {
           int temp = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0);
           if (temp > 0) this.cpuTemp = temp / 10;
           else this.cpuTemp = -1;
+
+          int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+          this.isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL;
         }
         this.battFailCount = 0;
       } catch (Exception e) {
@@ -1217,16 +1641,37 @@ private void calculateStats() {
     }
   }
 
+  private int ramPercentValue() {
+    try {
+      return Integer.parseInt(this.ramText.replace("%", "").trim());
+    } catch (Exception e) {
+      return -1;
+    }
+  }
+
   @Override
   public void run() {
-    if (getVisibility() != View.VISIBLE) return;
-
-    // Watchdog: reset FPS if no frames arrived for > 1.5s
+    // Watchdog first so a stalled game drops to 0 on the mirrored HUD too: reset FPS if no frame arrived for > 1.5s, then publish.
     long nowNano = System.nanoTime();
+    synchronized (this) {
+      // Moved off the present path: maintain the 1s rolling window at display cadence.
+      trimFrameTimesLocked(nowNano - FPS_CALC_INTERVAL_NS);
+      updateRollingFpsLocked();
+    }
     if (this.lastFrameNano > 0 && nowNano - this.lastFrameNano > 1500000000L) {
-      this.lastFPS = 0.0f;
-      this.currentMs = 0.0f;
+      synchronized (this) {
+        this.lastFPS = 0.0f;
+        this.currentMs = 0.0f;
+        this.frameTimesStart = 0;
+        this.frameTimesCount = 0;
+      }
     }
+    // Feed the phone gauge HUD (single source of truth) even while the on-screen overlay is hidden.
+    com.winlator.cmod.runtime.display.PerformanceHudState.updateValues(
+        this.lastFPS, this.currentMs, this.gpuLoad, this.cpuPercent, ramPercentValue(),
+        (this.dualSeriesBattery && this.batteryWatts >= 0.0f) ? this.batteryWatts * 2.0f : this.batteryWatts,
+        this.cpuTemp, this.rendererName != null ? this.rendererName : "");
+    if (getVisibility() != View.VISIBLE) return;
 
     if (this.enableGpu && this.tvGpuLoad != null) {
       SpannableStringBuilder b = new SpannableStringBuilder();
@@ -1239,13 +1684,32 @@ public void run() {
     if (this.enableCpu && this.tvCpu != null) {
       SpannableStringBuilder b = new SpannableStringBuilder();
       append(b, "CPU ", this.C_CPU);
-      append(b, this.cpuPercent >= 0 ? this.cpuPercent + "%" : "N/A", this.C_VALUE);
+      append(b, Math.max(this.cpuPercent, 0) + "%", this.C_VALUE);
       this.tvCpu.setText(b);
       this.tvCpu.setVisibility(View.VISIBLE);
     } else if (this.tvCpu != null) {
       this.tvCpu.setVisibility(View.GONE);
     }
 
+    if (this.enableCpuTemp && this.tvCpuTemp != null) {
+      SpannableStringBuilder b = new SpannableStringBuilder();
+      append(b, "C.TMP ", this.C_CPU_TEMP);
+      if (this.cpuSensorTemp >= 0) {
+        int tempColor =
+            this.cpuSensorTemp >= 90
+                ? this.C_HOT
+                : this.cpuSensorTemp >= 80 ? this.C_WARM : this.C_VALUE;
+        append(b, this.cpuSensorTemp + "°", tempColor);
+        appendSmall(b, "C", tempColor, 0.7f);
+      } else {
+        append(b, "N/A", this.C_VALUE);
+      }
+      this.tvCpuTemp.setText(b);
+      this.tvCpuTemp.setVisibility(View.VISIBLE);
+    } else if (this.tvCpuTemp != null) {
+      this.tvCpuTemp.setVisibility(View.GONE);
+    }
+
     if (this.enableRam && this.tvRam != null) {
       SpannableStringBuilder b = new SpannableStringBuilder();
       append(b, "RAM ", this.C_RAM);
@@ -1256,33 +1720,43 @@ public void run() {
       this.tvRam.setVisibility(View.GONE);
     }
 
-    if (this.enableBattTemp) {
-      if (this.tvBat != null) {
-        float displayedBatteryWatts =
-            this.batteryWatts >= 0.0f && this.dualSeriesBattery
-                ? this.batteryWatts * 2.0f
-                : this.batteryWatts;
-        SpannableStringBuilder b = new SpannableStringBuilder();
-        append(b, "BAT ", this.C_BAT);
-        append(
-            b,
-            displayedBatteryWatts >= 0.0f
-                ? String.format(Locale.US, "%.1fW", displayedBatteryWatts)
-                : "N/A",
-            this.C_VALUE);
-        this.tvBat.setText(b);
-        this.tvBat.setVisibility(View.VISIBLE);
+    if (this.enableBatt && this.tvBat != null) {
+      float displayedBatteryWatts =
+          this.batteryWatts >= 0.0f && this.dualSeriesBattery
+              ? this.batteryWatts * 2.0f
+              : this.batteryWatts;
+      SpannableStringBuilder b = new SpannableStringBuilder();
+      append(b, "BAT ", this.C_BAT);
+      if (this.isCharging) {
+        appendPlugIcon(b);
       }
-      if (this.tvTemp != null) {
-        SpannableStringBuilder b = new SpannableStringBuilder();
-        append(b, "TMP ", this.C_TEMP);
-        append(b, this.cpuTemp >= 0 ? this.cpuTemp + "°C" : "N/A", this.C_VALUE);
-        this.tvTemp.setText(b);
-        this.tvTemp.setVisibility(View.VISIBLE);
+      append(
+          b,
+          displayedBatteryWatts >= 0.0f
+              ? String.format(Locale.US, "%.1fw", displayedBatteryWatts)
+              : "N/A",
+          this.C_VALUE);
+      this.tvBat.setText(b);
+      this.tvBat.setVisibility(View.VISIBLE);
+    } else if (this.tvBat != null) {
+      this.tvBat.setVisibility(View.GONE);
+    }
+
+    if (this.enableTemp && this.tvTemp != null) {
+      SpannableStringBuilder b = new SpannableStringBuilder();
+      append(b, "B.TMP ", this.C_TEMP);
+      if (this.cpuTemp >= 0) {
+        int tempColor =
+            this.cpuTemp >= 45 ? this.C_HOT : this.cpuTemp >= 40 ? this.C_WARM : this.C_VALUE;
+        append(b, this.cpuTemp + "°", tempColor);
+        appendSmall(b, "C", tempColor, 0.7f);
+      } else {
+        append(b, "N/A", this.C_VALUE);
       }
-    } else {
-      if (this.tvBat != null) this.tvBat.setVisibility(View.GONE);
-      if (this.tvTemp != null) this.tvTemp.setVisibility(View.GONE);
+      this.tvTemp.setText(b);
+      this.tvTemp.setVisibility(View.VISIBLE);
+    } else if (this.tvTemp != null) {
+      this.tvTemp.setVisibility(View.GONE);
     }
 
     if (this.enableFps && this.tvFpsBig != null) {
@@ -1291,7 +1765,16 @@ public void run() {
       this.tvFpsBig.setVisibility(View.VISIBLE);
     } else if (this.tvFpsBig != null) this.tvFpsBig.setVisibility(View.GONE);
 
-    if (getOrientation() == LinearLayout.HORIZONTAL) updateSeparators(true);
+    if (this.enableGraph && this.frametimeNumericMode && this.tvFrametime != null) {
+      this.tvFrametime.setText(String.format(Locale.US, "%.1f ms", this.currentMs));
+      this.tvFrametime.setTextColor(this.C_FPS_OK);
+      this.tvFrametime.setVisibility(View.VISIBLE);
+    } else if (this.tvFrametime != null) {
+      this.tvFrametime.setVisibility(View.GONE);
+    }
+
+    if (isHorizontalDisplayMode()) updateSeparators(true);
+    updateWrapState();
   }
 
   private void append(SpannableStringBuilder b, String t, int c) {
@@ -1300,6 +1783,102 @@ private void append(SpannableStringBuilder b, String t, int c) {
     b.setSpan(new ForegroundColorSpan(c), start, b.length(), 33);
   }
 
+  /** Like {@link #append} but renders text at {@code scale} of the surrounding size, raised so the smaller glyph's top lines up with the full-size text (used for the "C" unit). */
+  private void appendSmall(SpannableStringBuilder b, String t, int c, float scale) {
+    int start = b.length();
+    b.append(t);
+    b.setSpan(new ForegroundColorSpan(c), start, b.length(), 33);
+    b.setSpan(new SmallRaisedSpan(scale), start, b.length(), 33);
+  }
+
+  /** Renders text at a reduced size, shifted up so its top aligns with the surrounding cap height instead of resting on the shared baseline. */
+  private static class SmallRaisedSpan extends MetricAffectingSpan {
+    private final float scale;
+
+    SmallRaisedSpan(float scale) {
+      this.scale = scale;
+    }
+
+    @Override
+    public void updateDrawState(TextPaint tp) {
+      apply(tp);
+    }
+
+    @Override
+    public void updateMeasureState(TextPaint tp) {
+      apply(tp);
+    }
+
+    private void apply(TextPaint tp) {
+      float fullAscent = tp.ascent(); // negative: distance from baseline to top of full text
+      tp.setTextSize(tp.getTextSize() * scale);
+      // Negative baselineShift moves the glyph up; align the smaller top with the full-size top.
+      tp.baselineShift += (int) (fullAscent - tp.ascent());
+    }
+  }
+
+  /** Append the tinted plug glyph then a gap: it rides on a placeholder space the {@link ImageSpan} draws over, with a second space before the wattage. Falls back to a textual "⚡" if the drawable can't load. */
+  private void appendPlugIcon(SpannableStringBuilder b) {
+    Drawable plug = getPlugIcon();
+    if (plug == null) {
+      append(b, "⚡ ", this.C_FPS_OK);
+      return;
+    }
+    int start = b.length();
+    b.append(" "); // placeholder rendered as the plug icon
+    b.setSpan(new CenteredImageSpan(plug), start, b.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+    b.append(" "); // gap before the wattage
+  }
+
+  /** Lazily load, size (to the battery text height) and tint the plug drawable; cached. */
+  private Drawable getPlugIcon() {
+    if (this.plugIcon == null && this.context != null) {
+      Drawable d = this.context.getDrawable(R.drawable.ic_hud_plug);
+      if (d != null) {
+        d = d.mutate();
+        // Render the glyph slightly larger than the battery text so it reads clearly.
+        final float scale = 1.3f;
+        float base =
+            this.tvBat != null && this.tvBat.getTextSize() > 0
+                ? this.tvBat.getTextSize()
+                : TypedValue.applyDimension(
+                    TypedValue.COMPLEX_UNIT_SP, 10f, getResources().getDisplayMetrics());
+        int size = Math.round(base * scale);
+        d.setBounds(0, 0, size, size);
+        d.setTint(this.C_FPS_OK);
+        this.plugIcon = d;
+      }
+    }
+    return this.plugIcon;
+  }
+
+  /** {@link ImageSpan} that vertically centres its drawable on the text instead of the baseline. */
+  private static class CenteredImageSpan extends ImageSpan {
+    CenteredImageSpan(Drawable drawable) {
+      super(drawable, ImageSpan.ALIGN_BOTTOM);
+    }
+
+    @Override
+    public void draw(
+        Canvas canvas,
+        CharSequence text,
+        int start,
+        int end,
+        float x,
+        int top,
+        int y,
+        int bottom,
+        Paint paint) {
+      Drawable d = getDrawable();
+      Paint.FontMetricsInt fm = paint.getFontMetricsInt();
+      int transY = y + (fm.descent + fm.ascent) / 2 - d.getBounds().height() / 2;
+      canvas.save();
+      canvas.translate(x, transY);
+      d.draw(canvas);
+      canvas.restore();
+    }
+  }
+
   private class FrametimeGraphView extends View {
     private final int MAX_SAMPLES = 60;
     private final float[] history = new float[MAX_SAMPLES];
diff --git a/app/src/main/runtime/display/ui/MangoHudView.java b/app/src/main/runtime/display/ui/MangoHudView.java
new file mode 100644
index 000000000..5cff40e1d
--- /dev/null
+++ b/app/src/main/runtime/display/ui/MangoHudView.java
@@ -0,0 +1,1543 @@
+package com.winlator.cmod.runtime.display.ui;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.net.TrafficStats;
+import android.os.BatteryManager;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.preference.PreferenceManager;
+import com.winlator.cmod.runtime.system.CPUStatus;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * Mango Style HUD: performance overlay with a classic table layout (accent label
+ * column, white right-aligned values with small units), frametime graph and
+ * 1%/0.1% lows. Frame events are ring-buffered with zero allocation; text is
+ * formatted at 2 Hz on a private stats thread into reusable buffers, so the
+ * present path stays free of formatting, logging and garbage.
+ */
+public class MangoHudView extends View {
+  public static final String PREF_ENABLED = "mango_hud_enabled";
+  private static final String PREF_ELEMENTS = "mango_hud_elements2";
+  private static final String PREF_POS_X = "mango_hud_position_x";
+  private static final String PREF_POS_Y = "mango_hud_position_y";
+  private static final String PREF_HAS_POSITION = "mango_hud_has_position";
+  private static final String PREF_SCALE = "mango_hud_scale";
+  private static final String PREF_LOCKED = "mango_hud_locked";
+  private static final String PREF_ALPHA = "mango_hud_alpha";
+  private static final String PREF_BG_ALPHA = "mango_hud_bg_alpha";
+  private static final float DEFAULT_ALPHA = 1.0f;
+  private static final float DEFAULT_BG_ALPHA = 0.7f;
+  public static final float SCALE_MIN = 0.5f;
+  public static final float SCALE_MAX = 1.5f;
+
+  // Element indices (bitmask in PREF_ELEMENTS).
+  public static final int EL_GPU_LOAD = 0;
+  public static final int EL_GPU_TEMP = 1;
+  public static final int EL_CPU_LOAD = 2;
+  public static final int EL_CPU_TEMP = 3;
+  public static final int EL_RAM = 4;
+  public static final int EL_BATTERY = 5;
+  public static final int EL_LOWS = 6;
+  public static final int EL_GRAPH = 7;
+  public static final int EL_ENGINE = 8;
+  public static final int EL_VRAM = 9;
+  public static final int EL_CPU_MHZ = 10;
+  public static final int EL_GPU_CLOCK = 11;
+  public static final int EL_CORES = 12;
+  public static final int EL_NET = 13;
+  public static final int EL_SWAP = 14;
+  public static final int EL_RES = 15;
+  public static final int EL_WINE = 16;
+  public static final int EL_DURATION = 17;
+  public static final int EL_CLOCK = 18;
+  public static final int EL_THROTTLE = 19;
+  public static final int ELEMENT_COUNT = 20;
+  // Original ten elements plus both clock cells on; the rest opt-in.
+  private static final int DEFAULT_ELEMENTS_MASK = 0xFFF;
+
+  // Overlay palette; accents pass through vivid() for punchier labels.
+  private static final int C_BG = 0x00020202;
+  private static final int C_TEXT = 0xFFFFFFFF;
+  private static final int C_GPU = vivid(0xFF2E9762);
+  private static final int C_CPU = vivid(0xFF2E97CB);
+  private static final int C_VRAM = vivid(0xFFAD64C1);
+  private static final int C_RAM = vivid(0xFFC26693);
+  private static final int C_BAT = vivid(0xFFFF9078);
+  private static final int C_ENGINE = vivid(0xFFEB5B5B);
+  private static final int C_NET = vivid(0xFFE07B85);
+  private static final int C_GRAPH = 0xFF00FF00;
+  private static final int C_OUTLINE = 0xFF000000;
+
+  private static int vivid(int color) {
+    float[] hsv = new float[3];
+    android.graphics.Color.colorToHSV(color, hsv);
+    hsv[1] = Math.min(1f, hsv[1] * 1.45f);
+    hsv[2] = Math.min(1f, hsv[2] * 1.2f);
+    return android.graphics.Color.HSVToColor(0xFF, hsv);
+  }
+  private static final int C_THROTTLE_WARN = 0xFFFDFD09;
+  private static final int C_THROTTLE_HOT = 0xFFB22222;
+  private static final String[] THROTTLE_TEXT = {
+    "", "throttle: light", "throttle: moderate", "throttle: severe",
+    "throttle: critical", "throttle: emergency", "throttle: shutdown"
+  };
+
+  // Double-tap snap targets; the settings slider sets any value between MIN and MAX.
+  private static final float[] SCALE_STEPS = {0.735f, 0.98f, 1.225f, 1.5f};
+  public static final float DEFAULT_SCALE = 0.735f;
+  private static final float BASE_TEXT_DP = 14f;
+  private static final long TICK_MS = 500L;
+  private static final long HIDDEN_TICK_MS = 2000L;
+  private static final long FALLBACK_SUPPRESSION_NS = 2000000000L;
+  private static final long FPS_WINDOW_NS = 1000000000L;
+  private static final long IDLE_TIMEOUT_NS = 1500000000L;
+  private static final long GRAPH_REDRAW_MS = 100L;
+  private static final int STAMP_CAPACITY = 1024;
+  private static final int LOWS_CAPACITY = 5000;
+  private static final int GRAPH_SAMPLES = 200;
+  private static final float GRAPH_CEIL_MS = 50f;
+
+  private final SharedPreferences preferences;
+  private final BatteryManager batteryManager;
+  private final IntentFilter batteryFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+  private final float density;
+
+  // ── frame rings, guarded by frameLock; written on the present thread ──
+  private final Object frameLock = new Object();
+  private final long[] stampsNano = new long[STAMP_CAPACITY];
+  private int stampsStart, stampsCount;
+  private final float[] lowsMs = new float[LOWS_CAPACITY];
+  private int lowsIndex, lowsCount;
+  private final float[] graphMs = new float[GRAPH_SAMPLES];
+  private int graphIndex, graphCount;
+  private long lastFrameNano, lastPrimaryNano;
+  private float currentMs;
+  private volatile long lastGraphInvalidate;
+
+  // ── formatted cells + layout, guarded by uiLock ──
+  private final Object uiLock = new Object();
+  private final StringBuilder sbGpuLoad = new StringBuilder(8);
+  private final StringBuilder sbGpuTemp = new StringBuilder(8);
+  private final StringBuilder sbCpuLoad = new StringBuilder(8);
+  private final StringBuilder sbCpuTemp = new StringBuilder(8);
+  private final StringBuilder sbVram = new StringBuilder(8);
+  private final StringBuilder sbRam = new StringBuilder(8);
+  private final StringBuilder sbRamPct = new StringBuilder(8);
+  private final StringBuilder sbBatPct = new StringBuilder(8);
+  private final StringBuilder sbBatW = new StringBuilder(8);
+  private final StringBuilder sbBatTemp = new StringBuilder(8);
+  private final StringBuilder sbFps = new StringBuilder(8);
+  private final StringBuilder sbMs = new StringBuilder(8);
+  private final StringBuilder sbAvg = new StringBuilder(8);
+  private final StringBuilder sbLow1 = new StringBuilder(8);
+  private final StringBuilder sbLow01 = new StringBuilder(8);
+  private final StringBuilder sbMinMax = new StringBuilder(24);
+  private final StringBuilder sbCpuMhz = new StringBuilder(8);
+  private final StringBuilder sbGpuClk = new StringBuilder(8);
+  private final StringBuilder sbNetRx = new StringBuilder(8);
+  private final StringBuilder sbNetTx = new StringBuilder(8);
+  private final StringBuilder sbSwap = new StringBuilder(8);
+  private final StringBuilder sbRes = new StringBuilder(24);
+  private final StringBuilder sbDuration = new StringBuilder(20);
+  private final StringBuilder sbClock = new StringBuilder(8);
+  private final StringBuilder[] sbCorePct;
+  private final StringBuilder[] sbCoreMhz;
+  private final String[] coreLabels;
+  private final int coreCount;
+  private String engineBase = "VULKAN";
+  private String engineVersion = "";
+  private String resolutionText = "";
+  private String wineText = "";
+  private final boolean[] elements = new boolean[ELEMENT_COUNT];
+  private float scaleFactor = DEFAULT_SCALE;
+  private boolean locked;
+  private float textAlpha = DEFAULT_ALPHA;
+  private float bgAlpha = DEFAULT_BG_ALPHA;
+  private int panelW = 1, panelH = 1;
+  private float textSize, smallSize, rowH, smallRowH, baseline, smallBaseline;
+  private float pad, charW, smallCharW, labelColW, fpsLabelColW, graphH;
+
+  private final Paint bgPaint = new Paint();
+  private final Paint valuePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+  private final Paint labelPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+  private final Paint smallPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+  private final Paint outlinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+  private final Paint graphPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+  private final float[] graphLines = new float[(GRAPH_SAMPLES - 1) * 4];
+  private final float[] graphSnapshot = new float[GRAPH_SAMPLES];
+
+  // ── stats thread state ──
+  private volatile HandlerThread statsThread;
+  private volatile Handler statsHandler;
+  private final float[] lowsScratch = new float[LOWS_CAPACITY];
+  private CPUStatus.AppCpuSample prevCpuSample;
+  private boolean cpuWarmedUp;
+  private int slowTickParity;
+  private int gpuLoad = -1, gpuTemp = -1, cpuLoad = -1, cpuTemp = -1, batteryPct = -1, ramPct = -1, batTempC = -1;
+  private float ramGib = -1f, vramGib = -1f, batteryWatts = -1f;
+  private String[] gpuTempPaths;
+  private String vramPath;
+  private int vramMode = -1; // -1 probe, 1 kgsl own-pid sum, 2 single file, 3 own-process graphics
+  private String gpuClkPath;
+  private boolean gpuClkSearched;
+  private short[] coreMaxMhz;
+  private int cpuMhz = -1, gpuClkMhz = -1, netRxKbs = -1, netTxKbs = -1, throttleStatus;
+  private float swapGib = -1f;
+  private final int[] corePct;
+  private final int[] coreMhz;
+  private long prevRxBytes = -1, prevTxBytes = -1, prevNetMs;
+  private final long sessionStartMs = SystemClock.elapsedRealtime();
+  // Self-reposting like FrameRating's loop: runs while attached, independent of frame events; near-free while hidden.
+  private final Runnable tickRunnable = new Runnable() {
+    @Override
+    public void run() {
+      Handler handler = statsHandler;
+      if (handler == null) return;
+      boolean visible = getVisibility() == VISIBLE;
+      if (visible) tick();
+      handler.postDelayed(this, visible ? TICK_MS : HIDDEN_TICK_MS);
+    }
+  };
+
+  public MangoHudView(Context context) {
+    super(context);
+    this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    this.batteryManager = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE);
+    this.density = getResources().getDisplayMetrics().density;
+    this.coreCount = Math.min(Runtime.getRuntime().availableProcessors(), 10);
+    this.corePct = new int[coreCount];
+    this.coreMhz = new int[coreCount];
+    this.sbCorePct = new StringBuilder[coreCount];
+    this.sbCoreMhz = new StringBuilder[coreCount];
+    this.coreLabels = new String[coreCount];
+    for (int i = 0; i < coreCount; i++) {
+      sbCorePct[i] = new StringBuilder(8);
+      sbCoreMhz[i] = new StringBuilder(8);
+      coreLabels[i] = "C" + i;
+      corePct[i] = -1;
+      coreMhz[i] = -1;
+    }
+
+    int mask = preferences.getInt(PREF_ELEMENTS, DEFAULT_ELEMENTS_MASK);
+    for (int i = 0; i < ELEMENT_COUNT; i++) elements[i] = (mask & (1 << i)) != 0;
+    this.scaleFactor = clampScale(preferences.getFloat(PREF_SCALE, DEFAULT_SCALE));
+    this.locked = preferences.getBoolean(PREF_LOCKED, false);
+    this.textAlpha = preferences.getFloat(PREF_ALPHA, DEFAULT_ALPHA);
+    this.bgAlpha = preferences.getFloat(PREF_BG_ALPHA, DEFAULT_BG_ALPHA);
+
+    // Stock mono by file: font packs and app themes can reroute the "monospace" alias for raw Paints.
+    Typeface mono;
+    try {
+      mono = Typeface.create(Typeface.createFromFile("/system/fonts/DroidSansMono.ttf"), Typeface.BOLD);
+    } catch (Exception e) {
+      mono = Typeface.create("monospace", Typeface.BOLD);
+    }
+    bgPaint.setColor(C_BG);
+    valuePaint.setTypeface(mono);
+    valuePaint.setColor(C_TEXT);
+    labelPaint.setTypeface(mono);
+    smallPaint.setTypeface(mono);
+    smallPaint.setColor(C_TEXT);
+    outlinePaint.setTypeface(mono);
+    outlinePaint.setColor(C_OUTLINE);
+    outlinePaint.setStyle(Paint.Style.STROKE);
+    graphPaint.setColor(C_GRAPH);
+    graphPaint.setStyle(Paint.Style.STROKE);
+
+    setLayoutParams(new ViewGroup.LayoutParams(
+        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+    synchronized (uiLock) {
+      applyScaleLocked();
+      applyAlphasLocked();
+      computeLayoutLocked();
+    }
+    setVisibility(VISIBLE);
+  }
+
+  public static boolean[] elementsFromPrefs(SharedPreferences preferences) {
+    int mask = preferences.getInt(PREF_ELEMENTS, DEFAULT_ELEMENTS_MASK);
+    boolean[] out = new boolean[ELEMENT_COUNT];
+    for (int i = 0; i < ELEMENT_COUNT; i++) out[i] = (mask & (1 << i)) != 0;
+    return out;
+  }
+
+  public static void saveElement(SharedPreferences preferences, int index, boolean enabled) {
+    if (index < 0 || index >= ELEMENT_COUNT) return;
+    int mask = preferences.getInt(PREF_ELEMENTS, DEFAULT_ELEMENTS_MASK);
+    mask = enabled ? mask | (1 << index) : mask & ~(1 << index);
+    preferences.edit().putInt(PREF_ELEMENTS, mask).apply();
+  }
+
+  public static float alphaFromPrefs(SharedPreferences preferences) {
+    return preferences.getFloat(PREF_ALPHA, DEFAULT_ALPHA);
+  }
+
+  public static float bgAlphaFromPrefs(SharedPreferences preferences) {
+    return preferences.getFloat(PREF_BG_ALPHA, DEFAULT_BG_ALPHA);
+  }
+
+  public static void saveAlpha(SharedPreferences preferences, float alpha) {
+    preferences.edit().putFloat(PREF_ALPHA, alpha).apply();
+  }
+
+  public static void saveBgAlpha(SharedPreferences preferences, float alpha) {
+    preferences.edit().putFloat(PREF_BG_ALPHA, alpha).apply();
+  }
+
+  public void setTextAlphaValue(float alpha) {
+    synchronized (uiLock) {
+      textAlpha = alpha;
+      applyAlphasLocked();
+    }
+    postInvalidate();
+  }
+
+  public void setBackgroundAlphaValue(float alpha) {
+    synchronized (uiLock) {
+      bgAlpha = alpha;
+      applyAlphasLocked();
+    }
+    postInvalidate();
+  }
+
+  public void setElementEnabled(int index, boolean enabled) {
+    if (index < 0 || index >= ELEMENT_COUNT) return;
+    synchronized (uiLock) {
+      elements[index] = enabled;
+      computeLayoutLocked();
+    }
+    post(() -> {
+      requestLayout();
+      invalidate();
+    });
+  }
+
+  public void setEngineName(String name) {
+    if (name == null || name.isEmpty()) return;
+    String upper = name.toUpperCase(Locale.US);
+    if (upper.length() > 16) upper = upper.substring(0, 16);
+    // Base name draws full-size; anything after the first space (version) draws
+    // small so a long engine string doesn't widen the panel.
+    int space = upper.indexOf(' ');
+    synchronized (uiLock) {
+      if (space > 0) {
+        engineBase = upper.substring(0, space);
+        engineVersion = upper.substring(space + 1).trim();
+      } else {
+        engineBase = upper;
+        engineVersion = "";
+      }
+      computeLayoutLocked();
+    }
+    post(() -> {
+      requestLayout();
+      invalidate();
+    });
+  }
+
+  /** Drop accumulated frametimes so loading screens and menus stay out of the averages. */
+  public void resetMetrics() {
+    synchronized (frameLock) {
+      lowsIndex = 0;
+      lowsCount = 0;
+    }
+  }
+
+  /** Static per-session rows: game resolution and wine/proton build. */
+  public void setSessionInfo(String resolution, String wineVersion) {
+    synchronized (uiLock) {
+      if (resolution != null) resolutionText = resolution.length() > 16 ? resolution.substring(0, 16) : resolution;
+      if (wineVersion != null) wineText = wineVersion.length() > 28 ? wineVersion.substring(0, 28) : wineVersion;
+      computeLayoutLocked();
+    }
+    post(() -> {
+      requestLayout();
+      invalidate();
+    });
+  }
+
+  public void setHudVisible(boolean visible) {
+    if (visible) {
+      synchronized (frameLock) {
+        resetFrameDataLocked();
+      }
+      setVisibility(VISIBLE);
+      bringToFront();
+      // Populate immediately instead of waiting out a hidden-interval delay.
+      Handler handler = statsHandler;
+      if (handler != null) {
+        handler.removeCallbacks(tickRunnable);
+        handler.post(tickRunnable);
+      }
+    } else {
+      setVisibility(GONE);
+    }
+  }
+
+  /** Present-path hook: one call per game frame; ring writes only, no allocation. */
+  public void recordGameFrame(boolean primarySource) {
+    if (getVisibility() != VISIBLE) return;
+    long nowNano = System.nanoTime();
+    synchronized (frameLock) {
+      if (primarySource) {
+        if (lastPrimaryNano == 0 || nowNano - lastPrimaryNano >= FALLBACK_SUPPRESSION_NS) {
+          resetFrameDataLocked();
+        }
+        lastPrimaryNano = nowNano;
+      } else if (lastPrimaryNano > 0 && nowNano - lastPrimaryNano < FALLBACK_SUPPRESSION_NS) {
+        return;
+      }
+
+      if (lastFrameNano != 0) {
+        float ms = (nowNano - lastFrameNano) / 1000000.0f;
+        if (ms > 0f && ms < 1000f) {
+          currentMs = ms;
+          lowsMs[lowsIndex] = ms;
+          lowsIndex = (lowsIndex + 1) % LOWS_CAPACITY;
+          if (lowsCount < LOWS_CAPACITY) lowsCount++;
+          graphMs[graphIndex] = ms;
+          graphIndex = (graphIndex + 1) % GRAPH_SAMPLES;
+          if (graphCount < GRAPH_SAMPLES) graphCount++;
+        }
+      }
+      lastFrameNano = nowNano;
+
+      int index = (stampsStart + stampsCount) % STAMP_CAPACITY;
+      if (stampsCount == STAMP_CAPACITY) {
+        stampsStart = (stampsStart + 1) % STAMP_CAPACITY;
+      } else {
+        stampsCount++;
+      }
+      stampsNano[index] = nowNano;
+    }
+
+    if (elements[EL_GRAPH]) {
+      long time = SystemClock.elapsedRealtime();
+      if (time - lastGraphInvalidate >= GRAPH_REDRAW_MS) {
+        lastGraphInvalidate = time;
+        postInvalidate();
+      }
+    }
+  }
+
+  private void resetFrameDataLocked() {
+    stampsStart = 0;
+    stampsCount = 0;
+    lowsIndex = 0;
+    lowsCount = 0;
+    graphIndex = 0;
+    graphCount = 0;
+    lastFrameNano = 0;
+    currentMs = 0f;
+  }
+
+  // ── stats thread ─────────────────────────────────────────────────
+
+  private void startStats() {
+    if (statsThread != null) return;
+    statsThread = new HandlerThread("MangoHudStats");
+    statsThread.start();
+    statsHandler = new Handler(statsThread.getLooper());
+    statsHandler.post(tickRunnable);
+  }
+
+  private void stopStats() {
+    Handler handler = statsHandler;
+    HandlerThread thread = statsThread;
+    statsHandler = null;
+    statsThread = null;
+    if (handler != null) handler.removeCallbacksAndMessages(null);
+    if (thread != null) {
+      thread.quitSafely();
+    }
+    prevCpuSample = null;
+    cpuWarmedUp = false;
+  }
+
+  private void tick() {
+    long nowNano = System.nanoTime();
+    float fps;
+    float ms;
+    int lowsN;
+    float graphMin = 0f, graphMax = 0f;
+    synchronized (frameLock) {
+      // Trim the rolling FPS window here so the present path stays write-only.
+      long oldest = nowNano - FPS_WINDOW_NS;
+      while (stampsCount > 0 && stampsNano[stampsStart] < oldest) {
+        stampsStart = (stampsStart + 1) % STAMP_CAPACITY;
+        stampsCount--;
+      }
+      boolean idle = lastFrameNano == 0 || nowNano - lastFrameNano > IDLE_TIMEOUT_NS;
+      if (idle || stampsCount <= 1) {
+        fps = 0f;
+      } else {
+        long first = stampsNano[stampsStart];
+        long last = stampsNano[(stampsStart + stampsCount - 1) % STAMP_CAPACITY];
+        fps = last > first ? (stampsCount - 1) * 1000000000.0f / (last - first) : 0f;
+      }
+      ms = idle ? 0f : currentMs;
+      lowsN = lowsCount;
+      System.arraycopy(lowsMs, 0, lowsScratch, 0, lowsN);
+      for (int i = 0; i < graphCount; i++) {
+        float v = graphMs[i];
+        if (i == 0) {
+          graphMin = graphMax = v;
+        } else {
+          if (v < graphMin) graphMin = v;
+          if (v > graphMax) graphMax = v;
+        }
+      }
+    }
+
+    // 1%/0.1% lows: percentile over the last 10k frametimes, converted to FPS.
+    float avgFps = 0f, low1Fps = 0f, low01Fps = 0f;
+    if (elements[EL_LOWS] && lowsN > 0) {
+      Arrays.sort(lowsScratch, 0, lowsN);
+      float sum = 0f;
+      for (int i = 0; i < lowsN; i++) sum += lowsScratch[i];
+      if (sum > 0f) avgFps = lowsN * 1000.0f / sum;
+      low1Fps = percentileLowFps(lowsScratch, lowsN, 0.01f);
+      low01Fps = percentileLowFps(lowsScratch, lowsN, 0.001f);
+    }
+
+    boolean slowTick = (slowTickParity++ & 1) == 0;
+    if (elements[EL_GPU_LOAD]) readGpuLoad();
+    if (elements[EL_CPU_LOAD]) readCpuLoad();
+    if (elements[EL_CPU_MHZ] || elements[EL_CORES]) readCpuClocks();
+    if (slowTick) {
+      if (elements[EL_GPU_TEMP]) gpuTemp = readGpuTempC();
+      if (elements[EL_CPU_TEMP]) cpuTemp = CPUStatus.getCpuTempC();
+      if (elements[EL_GPU_CLOCK]) readGpuClock();
+      if (elements[EL_VRAM]) readVram();
+      if (elements[EL_RAM]) readRam();
+      if (elements[EL_SWAP]) readSwap();
+      if (elements[EL_NET]) readNet();
+      if (elements[EL_BATTERY]) readBattery();
+      if (elements[EL_THROTTLE]) readThrottle();
+    }
+
+    synchronized (uiLock) {
+      formatInt(sbFps, Math.round(fps));
+      formatMs(sbMs, ms);
+      formatInt(sbGpuLoad, gpuLoad);
+      formatInt(sbGpuTemp, gpuTemp);
+      formatInt(sbCpuLoad, cpuLoad);
+      formatInt(sbCpuTemp, cpuTemp);
+      formatTenths(sbVram, vramGib);
+      formatTenths(sbRam, ramGib);
+      formatInt(sbRamPct, ramPct);
+      formatInt(sbBatPct, batteryPct);
+      formatInt(sbBatTemp, batTempC);
+      formatTenths(sbBatW, batteryWatts);
+      formatInt(sbAvg, Math.round(avgFps));
+      formatInt(sbLow1, Math.round(low1Fps));
+      formatInt(sbLow01, Math.round(low01Fps));
+      formatInt(sbCpuMhz, cpuMhz);
+      formatInt(sbGpuClk, gpuClkMhz);
+      formatNetCell(sbNetRx, netRxKbs);
+      formatNetCell(sbNetTx, netTxKbs);
+      formatTenths(sbSwap, swapGib);
+      if (elements[EL_CORES]) {
+        for (int i = 0; i < coreCount; i++) {
+          formatInt(sbCorePct[i], corePct[i]);
+          formatInt(sbCoreMhz[i], coreMhz[i]);
+        }
+      }
+      if (elements[EL_RES]) {
+        sbRes.setLength(0);
+        sbRes.append(resolutionText);
+        float hz = getDisplayRefreshRate();
+        if (hz > 0f) {
+          sbRes.append(" @ ").append(Math.round(hz)).append("Hz");
+        }
+      }
+      if (elements[EL_DURATION]) {
+        formatDuration(sbDuration, SystemClock.elapsedRealtime() - sessionStartMs);
+      }
+      if (elements[EL_CLOCK]) {
+        formatClock(sbClock);
+      }
+      sbMinMax.setLength(0);
+      sbMinMax.append("min:");
+      appendTenths(sbMinMax, graphMin);
+      sbMinMax.append(" max:");
+      appendTenths(sbMinMax, graphMax);
+      computeLayoutLocked();
+    }
+
+    int w = panelW, h = panelH;
+    post(() -> {
+      if (getMeasuredWidth() != w || getMeasuredHeight() != h) requestLayout();
+      invalidate();
+    });
+  }
+
+  private static float percentileLowFps(float[] sortedAsc, int n, float p) {
+    int idx = (int) (p * n) - 1;
+    if (idx < 0) idx = 0;
+    float ft = sortedAsc[n - 1 - idx];
+    return ft > 0f ? 1000.0f / ft : 0f;
+  }
+
+  // ── system stat readers (silent; sysfs paths mirror FrameRating) ──
+
+  private void readGpuLoad() {
+    int load = -1;
+    try {
+      File gpubusy = new File("/sys/class/kgsl/kgsl-3d0/gpubusy");
+      if (gpubusy.exists() && gpubusy.canRead()) {
+        try (BufferedReader reader = new BufferedReader(new FileReader(gpubusy))) {
+          String line = reader.readLine();
+          if (line != null) {
+            String[] parts = line.trim().split("\\s+");
+            if (parts.length >= 2) {
+              long busy = Long.parseLong(parts[0]);
+              long total = Long.parseLong(parts[1]);
+              if (total > 0) load = (int) ((100 * busy) / total);
+            }
+          }
+        }
+      }
+      if (load < 0) {
+        String[] paths = {
+          "/sys/class/kgsl/kgsl-3d0/gpu_busy_percentage",
+          "/sys/class/kgsl/kgsl-3d0/devfreq/gpu_load",
+          "/sys/class/misc/mali0/device/utilisation",
+          "/sys/kernel/gpu/gpu_busy"
+        };
+        for (String path : paths) {
+          File f = new File(path);
+          if (f.exists() && f.canRead()) {
+            try (BufferedReader reader = new BufferedReader(new FileReader(f))) {
+              String line = reader.readLine();
+              if (line != null) {
+                load = Integer.parseInt(line.trim().replaceAll("[^0-9]", ""));
+                break;
+              }
+            } catch (Exception ignored) {
+            }
+          }
+        }
+      }
+    } catch (Exception ignored) {
+    }
+    if (load >= 0) gpuLoad = Math.min(load, 100);
+  }
+
+  private int readGpuTempC() {
+    String[] paths = gpuTempPaths;
+    if (paths == null) {
+      paths = discoverGpuTempPaths();
+      gpuTempPaths = paths;
+    }
+    for (String path : paths) {
+      try (BufferedReader reader = new BufferedReader(new FileReader(path))) {
+        String line = reader.readLine();
+        if (line != null) {
+          int raw = Integer.parseInt(line.trim());
+          int celsius = raw > 1000 ? (raw + 500) / 1000 : raw;
+          if (celsius >= 1 && celsius <= 150) return celsius;
+        }
+      } catch (Exception ignored) {
+      }
+    }
+    return -1;
+  }
+
+  private static String[] discoverGpuTempPaths() {
+    java.util.ArrayList<String> found = new java.util.ArrayList<>();
+    File kgsl = new File("/sys/class/kgsl/kgsl-3d0/temp");
+    if (kgsl.exists() && kgsl.canRead()) found.add(kgsl.getAbsolutePath());
+    File[] roots = {new File("/sys/class/thermal"), new File("/sys/devices/virtual/thermal")};
+    for (File root : roots) {
+      File[] zones = root.listFiles(
+          (dir, name) -> name.startsWith("thermal_zone") && new File(dir, name).isDirectory());
+      if (zones == null) continue;
+      for (File zone : zones) {
+        try (BufferedReader reader = new BufferedReader(new FileReader(new File(zone, "type")))) {
+          String type = reader.readLine();
+          if (type != null && type.trim().toLowerCase(Locale.US).contains("gpu")) {
+            File temp = new File(zone, "temp");
+            if (temp.exists() && temp.canRead()) found.add(temp.getAbsolutePath());
+          }
+        } catch (Exception ignored) {
+        }
+      }
+    }
+    return found.toArray(new String[0]);
+  }
+
+  private void readCpuLoad() {
+    try {
+      CPUStatus.AppCpuSample sample = CPUStatus.readAppCpuSample();
+      int pct = -1;
+      if (sample != null) {
+        if (prevCpuSample != null) pct = sample.percentSince(prevCpuSample);
+        prevCpuSample = sample;
+      }
+      if (pct >= 0) {
+        cpuLoad = pct;
+        cpuWarmedUp = true;
+      } else if (!cpuWarmedUp) {
+        int freq = CPUStatus.getClockFreqLoadPercent();
+        if (freq >= 0) cpuLoad = freq;
+      }
+    } catch (Exception e) {
+      cpuLoad = -1;
+    }
+  }
+
+  private void readRam() {
+    try {
+      ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
+      ActivityManager am = (ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE);
+      am.getMemoryInfo(mi);
+      long used = mi.totalMem - mi.availMem;
+      ramGib = used / 1073741824.0f;
+      ramPct = mi.totalMem > 0 ? (int) (100 * used / mi.totalMem) : -1;
+    } catch (Exception e) {
+      ramGib = -1f;
+      ramPct = -1;
+    }
+  }
+
+  /** Best-effort GPU memory in use: per-pid kgsl sum, global counters, else own-process graphics stat. */
+  private void readVram() {
+    if (vramMode == -1) {
+      vramMode = 3;
+      // Dir listing may be SELinux-denied while direct per-pid opens still work.
+      if (readOwnPidsGpuMem() >= 0) {
+        vramMode = 1;
+      } else {
+        String[] candidates = {
+          "/sys/class/kgsl/kgsl/page_alloc",
+          "/sys/class/kgsl/kgsl-3d0/page_alloc",
+          "/sys/kernel/gpu/gpu_memory",
+          "/proc/mali/memory_usage"
+        };
+        for (String path : candidates) {
+          if (readLongFile(new File(path)) > 0) {
+            vramPath = path;
+            vramMode = 2;
+            break;
+          }
+        }
+      }
+    }
+    long bytes = -1;
+    if (vramMode == 1) {
+      bytes = readOwnPidsGpuMem();
+    } else if (vramMode == 2) {
+      bytes = readLongFile(new File(vramPath));
+    }
+    if (bytes < 0) {
+      // Own-process graphics allocations — always readable, never blank.
+      try {
+        android.os.Debug.MemoryInfo mi = new android.os.Debug.MemoryInfo();
+        android.os.Debug.getMemoryInfo(mi);
+        String kb = mi.getMemoryStat("summary.graphics");
+        if (kb != null) bytes = Long.parseLong(kb) * 1024L;
+      } catch (Exception ignored) {
+      }
+    }
+    vramGib = bytes >= 0 ? bytes / 1073741824.0f : -1f;
+  }
+
+  /** Sum GPU memory of every process in our uid via direct kgsl per-pid paths. */
+  private static long readOwnPidsGpuMem() {
+    String[] names = new File("/proc").list();
+    if (names == null) return -1;
+    int myUid = android.os.Process.myUid();
+    long total = 0;
+    boolean any = false;
+    for (String name : names) {
+      if (name.isEmpty() || !Character.isDigit(name.charAt(0))) continue;
+      try {
+        if (android.system.Os.stat("/proc/" + name).st_uid != myUid) continue;
+      } catch (Exception e) {
+        continue;
+      }
+      long v = readLongFile(new File("/sys/class/kgsl/kgsl/proc/" + name + "/gpumem_mapped"));
+      if (v >= 0) {
+        total += v;
+        any = true;
+      }
+    }
+    return any ? total : -1;
+  }
+
+  private static long readLongFile(File f) {
+    // No pre-checks: SELinux can fail access() on sysfs while the open succeeds.
+    try (BufferedReader reader = new BufferedReader(new FileReader(f))) {
+      String line = reader.readLine();
+      if (line != null) {
+        String digits = line.trim().replaceAll("[^0-9]", "");
+        if (!digits.isEmpty()) return Long.parseLong(digits);
+      }
+    } catch (Exception ignored) {
+    }
+    return -1;
+  }
+
+  private void readCpuClocks() {
+    try {
+      short[] speeds = CPUStatus.getCurrentClockSpeeds();
+      if (speeds == null || speeds.length == 0) return;
+      if (coreMaxMhz == null) {
+        coreMaxMhz = new short[speeds.length];
+        for (int i = 0; i < speeds.length; i++) coreMaxMhz[i] = CPUStatus.getMaxClockSpeed(i);
+      }
+      long sum = 0;
+      int counted = 0;
+      for (int i = 0; i < speeds.length; i++) {
+        if (speeds[i] > 0) {
+          sum += speeds[i];
+          counted++;
+        }
+        if (i < coreCount) {
+          coreMhz[i] = speeds[i] > 0 ? speeds[i] : -1;
+          corePct[i] = speeds[i] > 0 && i < coreMaxMhz.length && coreMaxMhz[i] > 0
+              ? Math.min(100, speeds[i] * 100 / coreMaxMhz[i]) : -1;
+        }
+      }
+      cpuMhz = counted > 0 ? (int) (sum / counted) : -1;
+    } catch (Exception e) {
+      cpuMhz = -1;
+    }
+  }
+
+  private void readGpuClock() {
+    if (!gpuClkSearched) {
+      gpuClkSearched = true;
+      java.util.ArrayList<String> candidates = new java.util.ArrayList<>(Arrays.asList(
+          "/sys/class/kgsl/kgsl-3d0/gpuclk",
+          "/sys/class/kgsl/kgsl-3d0/devfreq/cur_freq",
+          "/sys/class/kgsl/kgsl-3d0/gpu_clock",
+          "/sys/class/kgsl/kgsl-3d0/clock_mhz",
+          "/sys/kernel/gpu/gpu_clock",
+          // Devfreq listing may be SELinux-denied; try known Adreno node names directly.
+          "/sys/class/devfreq/kgsl-3d0/cur_freq",
+          "/sys/class/devfreq/3d00000.qcom,kgsl-3d0/cur_freq",
+          "/sys/class/devfreq/2c00000.qcom,kgsl-3d0/cur_freq",
+          "/sys/class/devfreq/5000000.qcom,kgsl-3d0/cur_freq",
+          "/sys/class/devfreq/5900000.qcom,kgsl-3d0/cur_freq"));
+      File devfreqRoot = new File("/sys/class/devfreq");
+      File[] nodes = devfreqRoot.listFiles();
+      if (nodes != null) {
+        for (File node : nodes) {
+          String name = node.getName().toLowerCase(Locale.US);
+          if (name.contains("kgsl") || name.contains("gpu") || name.contains("mali")) {
+            candidates.add(new File(node, "cur_freq").getAbsolutePath());
+          }
+        }
+      }
+      for (String path : candidates) {
+        if (readLongFile(new File(path)) > 0) {
+          gpuClkPath = path;
+          break;
+        }
+      }
+    }
+    if (gpuClkPath == null) {
+      gpuClkMhz = -1;
+      return;
+    }
+    long raw = readLongFile(new File(gpuClkPath));
+    if (raw <= 0) {
+      gpuClkMhz = -1;
+    } else if (raw > 10000000) {
+      gpuClkMhz = (int) (raw / 1000000); // Hz
+    } else if (raw > 10000) {
+      gpuClkMhz = (int) (raw / 1000); // kHz
+    } else {
+      gpuClkMhz = (int) raw; // already MHz
+    }
+  }
+
+  private void readNet() {
+    try {
+      long rx = TrafficStats.getTotalRxBytes();
+      long tx = TrafficStats.getTotalTxBytes();
+      long now = SystemClock.elapsedRealtime();
+      if (rx == TrafficStats.UNSUPPORTED || tx == TrafficStats.UNSUPPORTED) {
+        netRxKbs = -1;
+        netTxKbs = -1;
+        return;
+      }
+      if (prevRxBytes >= 0 && now > prevNetMs) {
+        long elapsed = now - prevNetMs;
+        netRxKbs = (int) ((rx - prevRxBytes) * 1000 / elapsed / 1024);
+        netTxKbs = (int) ((tx - prevTxBytes) * 1000 / elapsed / 1024);
+      }
+      prevRxBytes = rx;
+      prevTxBytes = tx;
+      prevNetMs = now;
+    } catch (Exception e) {
+      netRxKbs = -1;
+      netTxKbs = -1;
+    }
+  }
+
+  private void readSwap() {
+    try (BufferedReader reader = new BufferedReader(new FileReader("/proc/meminfo"))) {
+      long swapTotalKb = -1, swapFreeKb = -1;
+      String line;
+      while ((line = reader.readLine()) != null && (swapTotalKb < 0 || swapFreeKb < 0)) {
+        if (line.startsWith("SwapTotal:")) {
+          swapTotalKb = parseMeminfoKb(line);
+        } else if (line.startsWith("SwapFree:")) {
+          swapFreeKb = parseMeminfoKb(line);
+        }
+      }
+      swapGib = swapTotalKb >= 0 && swapFreeKb >= 0
+          ? (swapTotalKb - swapFreeKb) / 1048576.0f : -1f;
+    } catch (Exception e) {
+      swapGib = -1f;
+    }
+  }
+
+  private static long parseMeminfoKb(String line) {
+    String digits = line.replaceAll("[^0-9]", "");
+    return digits.isEmpty() ? -1 : Long.parseLong(digits);
+  }
+
+  private void readThrottle() {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+      throttleStatus = 0;
+      return;
+    }
+    try {
+      PowerManager pm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
+      int status = pm != null ? pm.getCurrentThermalStatus() : 0;
+      throttleStatus = Math.max(0, Math.min(status, THROTTLE_TEXT.length - 1));
+    } catch (Exception e) {
+      throttleStatus = 0;
+    }
+  }
+
+  private float getDisplayRefreshRate() {
+    try {
+      android.view.Display display = getDisplay();
+      return display != null ? display.getRefreshRate() : -1f;
+    } catch (Exception e) {
+      return -1f;
+    }
+  }
+
+  private void readBattery() {
+    try {
+      int pct = batteryManager != null
+          ? batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) : -1;
+      batteryPct = pct > 0 ? pct : -1;
+      long currentUa = batteryManager != null
+          ? batteryManager.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW) : 0;
+      float amps = -1f;
+      if (currentUa != 0 && currentUa != Long.MIN_VALUE) {
+        long abs = Math.abs(currentUa);
+        amps = abs < 20000 ? abs / 1000.0f : abs / 1000000.0f;
+      }
+      Intent intent = getContext().registerReceiver(null, batteryFilter);
+      int mv = intent != null ? intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0) : 0;
+      batteryWatts = mv > 0 && amps > 0f ? (mv / 1000.0f) * amps : -1f;
+      int tenths = intent != null ? intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) : 0;
+      batTempC = tenths > 0 ? tenths / 10 : -1;
+    } catch (Exception e) {
+      batteryPct = -1;
+      batteryWatts = -1f;
+      batTempC = -1;
+    }
+  }
+
+  // ── allocation-free formatting into reusable builders ──
+
+  private static void formatInt(StringBuilder sb, int value) {
+    sb.setLength(0);
+    if (value < 0) {
+      sb.append('-');
+      return;
+    }
+    sb.append(value);
+  }
+
+  private static void formatTenths(StringBuilder sb, float value) {
+    sb.setLength(0);
+    if (value < 0f) {
+      sb.append('-');
+      return;
+    }
+    appendTenths(sb, value);
+  }
+
+  private static void formatMs(StringBuilder sb, float ms) {
+    sb.setLength(0);
+    if (ms <= 0f) {
+      sb.append('-');
+    } else if (ms >= 100f) {
+      sb.append(Math.round(ms));
+    } else {
+      appendTenths(sb, ms);
+    }
+  }
+
+  private static void appendTenths(StringBuilder sb, float value) {
+    if (value < 0f) value = 0f;
+    int tenths = Math.round(value * 10f);
+    sb.append(tenths / 10).append('.').append(tenths % 10);
+  }
+
+  /** KB/s up to 4 digits, then whole MB/s (unit glyph stays "K"/"M" via the suffix cell). */
+  private static void formatNetCell(StringBuilder sb, int kbs) {
+    sb.setLength(0);
+    if (kbs < 0) {
+      sb.append('-');
+    } else if (kbs > 9999) {
+      sb.append(kbs / 1024).append('M');
+    } else {
+      sb.append(kbs);
+    }
+  }
+
+  private static void formatDuration(StringBuilder sb, long elapsedMs) {
+    sb.setLength(0);
+    long totalSec = elapsedMs / 1000;
+    sb.append("elapsed ");
+    appendTwoDigits(sb, (int) (totalSec / 3600));
+    sb.append(':');
+    appendTwoDigits(sb, (int) ((totalSec / 60) % 60));
+    sb.append(':');
+    appendTwoDigits(sb, (int) (totalSec % 60));
+  }
+
+  private static void formatClock(StringBuilder sb) {
+    sb.setLength(0);
+    long nowMs = System.currentTimeMillis();
+    int offset = java.util.TimeZone.getDefault().getOffset(nowMs);
+    long dayMin = ((nowMs + offset) / 60000) % 1440;
+    appendTwoDigits(sb, (int) (dayMin / 60));
+    sb.append(':');
+    appendTwoDigits(sb, (int) (dayMin % 60));
+  }
+
+  private static void appendTwoDigits(StringBuilder sb, int value) {
+    if (value < 10) sb.append('0');
+    sb.append(value);
+  }
+
+  // ── layout & drawing ─────────────────────────────────────────────
+
+  private void applyScaleLocked() {
+    float scale = scaleFactor;
+    textSize = BASE_TEXT_DP * density * scale;
+    smallSize = textSize * 0.55f;
+    valuePaint.setTextSize(textSize);
+    labelPaint.setTextSize(textSize);
+    smallPaint.setTextSize(smallSize);
+    outlinePaint.setStrokeWidth(Math.max(1.5f, textSize * 0.08f));
+    graphPaint.setStrokeWidth(Math.max(1.5f, textSize * 0.07f));
+    Paint.FontMetrics fm = valuePaint.getFontMetrics();
+    rowH = (fm.descent - fm.ascent) * 1.02f;
+    baseline = -fm.ascent;
+    Paint.FontMetrics sfm = smallPaint.getFontMetrics();
+    smallRowH = (sfm.descent - sfm.ascent) * 1.1f;
+    smallBaseline = -sfm.ascent;
+    pad = textSize * 0.25f;
+    charW = valuePaint.measureText("0");
+    smallCharW = smallPaint.measureText("0");
+    graphH = textSize * 2.0f;
+  }
+
+  private void applyAlphasLocked() {
+    int bg = Math.round(Math.max(0f, Math.min(bgAlpha, 1f)) * 255f);
+    bgPaint.setColor((bg << 24) | (C_BG & 0x00FFFFFF));
+    int text = Math.round(Math.max(0f, Math.min(textAlpha, 1f)) * 255f);
+    valuePaint.setAlpha(text);
+    graphPaint.setAlpha(text);
+    outlinePaint.setAlpha(text);
+  }
+
+  private int textAlphaInt() {
+    return Math.round(Math.max(0f, Math.min(textAlpha, 1f)) * 255f);
+  }
+
+  // Per-cell value reservation: 3 chars for bounded ints (%/°C), 4 for the rest.
+  private float statCellW(int valueChars, int unitChars) {
+    return charW * valueChars + smallCharW * (unitChars + 0.2f);
+  }
+
+  private void computeLayoutLocked() {
+    labelColW = charW * 4.2f;
+    fpsLabelColW = labelColW;
+    if (elements[EL_ENGINE]) {
+      float engineW = valuePaint.measureText(engineBase);
+      if (!engineVersion.isEmpty()) {
+        engineW += smallCharW * 0.3f + smallPaint.measureText(engineVersion);
+      }
+      fpsLabelColW = Math.max(labelColW, engineW + charW * 0.4f);
+    }
+    float w = 0f;
+    int rows = 0;
+    int smallRows = 0;
+    if (elements[EL_GPU_LOAD] || elements[EL_GPU_TEMP] || elements[EL_GPU_CLOCK]) {
+      rows++;
+      float rw = labelColW
+          + (elements[EL_GPU_LOAD] ? statCellW(3, 1) : 0f)
+          + (elements[EL_GPU_TEMP] ? statCellW(3, 2) : 0f)
+          + (elements[EL_GPU_CLOCK] ? statCellW(4, 3) : 0f);
+      w = Math.max(w, rw);
+    }
+    if (elements[EL_CPU_LOAD] || elements[EL_CPU_TEMP] || elements[EL_CPU_MHZ]) {
+      rows++;
+      float rw = labelColW
+          + (elements[EL_CPU_LOAD] ? statCellW(3, 1) : 0f)
+          + (elements[EL_CPU_TEMP] ? statCellW(3, 2) : 0f)
+          + (elements[EL_CPU_MHZ] ? statCellW(4, 3) : 0f);
+      w = Math.max(w, rw);
+    }
+    if (elements[EL_CORES]) {
+      rows += coreCount;
+      w = Math.max(w, labelColW + statCellW(3, 1) + statCellW(4, 3));
+    }
+    if (elements[EL_VRAM]) {
+      rows++;
+      w = Math.max(w, labelColW + statCellW(4, 3));
+    }
+    if (elements[EL_RAM]) {
+      rows++;
+      w = Math.max(w, labelColW + statCellW(4, 3) + statCellW(3, 1));
+    }
+    if (elements[EL_SWAP]) {
+      rows++;
+      w = Math.max(w, labelColW + statCellW(4, 3));
+    }
+    if (elements[EL_NET]) {
+      rows++;
+      w = Math.max(w, labelColW + statCellW(4, 2) + statCellW(4, 2));
+    }
+    if (elements[EL_BATTERY]) {
+      rows++;
+      w = Math.max(w, labelColW + statCellW(3, 1) + statCellW(3, 2) + statCellW(4, 1));
+    }
+    rows++; // FPS row is the HUD core, always shown
+    w = Math.max(w, fpsLabelColW + statCellW(4, 3) + statCellW(4, 2));
+    if (elements[EL_LOWS]) {
+      rows += 3;
+      w = Math.max(w, labelColW + statCellW(4, 3));
+    }
+    // Small rows: only value-stable strings contribute to width so the panel never relayouts mid-session.
+    if (elements[EL_RES] && !resolutionText.isEmpty()) {
+      smallRows++;
+      w = Math.max(w, smallCharW * (resolutionText.length() + 8));
+    }
+    if (elements[EL_WINE] && !wineText.isEmpty()) {
+      smallRows++;
+      w = Math.max(w, smallCharW * wineText.length());
+    }
+    if (elements[EL_DURATION]) {
+      smallRows++;
+      w = Math.max(w, smallCharW * 16);
+    }
+    if (elements[EL_CLOCK]) smallRows++;
+    if (elements[EL_THROTTLE] && throttleStatus > 0) smallRows++;
+    w = Math.max(w, charW * 13f);
+    float h = rows * rowH + smallRows * smallRowH;
+    if (elements[EL_GRAPH]) {
+      h += smallRowH + graphH + pad * 0.5f;
+    }
+    panelW = (int) Math.ceil(w + pad * 2);
+    panelH = (int) Math.ceil(h + pad * 2);
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    synchronized (uiLock) {
+      setMeasuredDimension(panelW, panelH);
+    }
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    synchronized (uiLock) {
+      canvas.drawRect(0, 0, panelW, panelH, bgPaint);
+      float y = pad;
+      if (elements[EL_GPU_LOAD] || elements[EL_GPU_TEMP] || elements[EL_GPU_CLOCK]) {
+        float x = drawLabel(canvas, "GPU", C_GPU, y);
+        if (elements[EL_GPU_LOAD]) x = drawStatCell(canvas, sbGpuLoad, "%", x, y, 3);
+        if (elements[EL_GPU_TEMP]) x = drawStatCell(canvas, sbGpuTemp, "°C", x, y, 3);
+        if (elements[EL_GPU_CLOCK]) drawStatCell(canvas, sbGpuClk, "MHz", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_CPU_LOAD] || elements[EL_CPU_TEMP] || elements[EL_CPU_MHZ]) {
+        float x = drawLabel(canvas, "CPU", C_CPU, y);
+        if (elements[EL_CPU_LOAD]) x = drawStatCell(canvas, sbCpuLoad, "%", x, y, 3);
+        if (elements[EL_CPU_TEMP]) x = drawStatCell(canvas, sbCpuTemp, "°C", x, y, 3);
+        if (elements[EL_CPU_MHZ]) drawStatCell(canvas, sbCpuMhz, "MHz", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_CORES]) {
+        for (int i = 0; i < coreCount; i++) {
+          float x = drawLabel(canvas, coreLabels[i], C_CPU, y);
+          x = drawStatCell(canvas, sbCorePct[i], "%", x, y, 3);
+          drawStatCell(canvas, sbCoreMhz[i], "MHz", x, y, 4);
+          y += rowH;
+        }
+      }
+      if (elements[EL_VRAM]) {
+        float x = drawLabel(canvas, "VRAM", C_VRAM, y);
+        drawStatCell(canvas, sbVram, "GiB", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_RAM]) {
+        float x = drawLabel(canvas, "RAM", C_RAM, y);
+        x = drawStatCell(canvas, sbRam, "GiB", x, y, 4);
+        drawStatCell(canvas, sbRamPct, "%", x, y, 3);
+        y += rowH;
+      }
+      if (elements[EL_SWAP]) {
+        float x = drawLabel(canvas, "SWP", C_RAM, y);
+        drawStatCell(canvas, sbSwap, "GiB", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_NET]) {
+        float x = drawLabel(canvas, "NET", C_NET, y);
+        x = drawStatCell(canvas, sbNetRx, "K↓", x, y, 4);
+        drawStatCell(canvas, sbNetTx, "K↑", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_BATTERY]) {
+        float x = drawLabel(canvas, "BAT", C_BAT, y);
+        x = drawStatCell(canvas, sbBatPct, "%", x, y, 3);
+        // Temp sits in the same column as the GPU/CPU temps.
+        x = drawStatCell(canvas, sbBatTemp, "°C", x, y, 3);
+        drawStatCell(canvas, sbBatW, "W", x, y, 4);
+        y += rowH;
+      }
+      {
+        float x;
+        if (elements[EL_ENGINE]) {
+          drawLabel(canvas, engineBase, C_ENGINE, y);
+          if (!engineVersion.isEmpty()) {
+            float vxs = pad + valuePaint.measureText(engineBase) + smallCharW * 0.3f;
+            drawOutlinedSmall(
+                canvas, engineVersion, 0, engineVersion.length(), vxs, y + baseline, C_ENGINE);
+          }
+          x = pad + fpsLabelColW;
+        } else {
+          x = pad + labelColW;
+        }
+        x = drawStatCell(canvas, sbFps, "FPS", x, y, 4);
+        drawStatCell(canvas, sbMs, "ms", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_LOWS]) {
+        float x = drawLabel(canvas, "AVG", C_TEXT, y);
+        drawStatCell(canvas, sbAvg, "FPS", x, y, 4);
+        y += rowH;
+        x = drawLabel(canvas, "1%", C_TEXT, y);
+        drawStatCell(canvas, sbLow1, "FPS", x, y, 4);
+        y += rowH;
+        x = drawLabel(canvas, "0.1%", C_TEXT, y);
+        drawStatCell(canvas, sbLow01, "FPS", x, y, 4);
+        y += rowH;
+      }
+      if (elements[EL_RES] && !resolutionText.isEmpty()) {
+        drawOutlinedSmall(canvas, sbRes, 0, sbRes.length(), pad, y + smallBaseline, C_TEXT);
+        y += smallRowH;
+      }
+      if (elements[EL_WINE] && !wineText.isEmpty()) {
+        drawOutlinedSmall(canvas, wineText, 0, wineText.length(), pad, y + smallBaseline, C_ENGINE);
+        y += smallRowH;
+      }
+      if (elements[EL_DURATION]) {
+        drawOutlinedSmall(canvas, sbDuration, 0, sbDuration.length(), pad, y + smallBaseline, C_TEXT);
+        y += smallRowH;
+      }
+      if (elements[EL_CLOCK]) {
+        drawOutlinedSmall(canvas, sbClock, 0, sbClock.length(), pad, y + smallBaseline, C_TEXT);
+        y += smallRowH;
+      }
+      if (elements[EL_THROTTLE] && throttleStatus > 0) {
+        String text = THROTTLE_TEXT[throttleStatus];
+        int color = throttleStatus >= 3 ? C_THROTTLE_HOT : C_THROTTLE_WARN;
+        drawOutlinedSmall(canvas, text, 0, text.length(), pad, y + smallBaseline, color);
+        y += smallRowH;
+      }
+      if (elements[EL_GRAPH]) {
+        float sy = y + smallBaseline;
+        drawOutlinedSmall(canvas, "Frametime", 0, 9, pad, sy, C_ENGINE);
+        float mmW = sbMinMax.length() * smallCharW;
+        drawOutlinedSmall(canvas, sbMinMax, 0, sbMinMax.length(), panelW - pad - mmW, sy, C_TEXT);
+        y += smallRowH + pad * 0.5f;
+        drawGraph(canvas, pad, y, panelW - pad * 2, graphH);
+      }
+    }
+  }
+
+  private float drawLabel(Canvas canvas, CharSequence text, int color, float rowTop) {
+    float y = rowTop + baseline;
+    outlinePaint.setTextSize(textSize);
+    canvas.drawText(text, 0, text.length(), pad, y, outlinePaint);
+    labelPaint.setColor(color);
+    labelPaint.setAlpha(textAlphaInt());
+    canvas.drawText(text, 0, text.length(), pad, y, labelPaint);
+    return pad + labelColW;
+  }
+
+  private float drawStatCell(
+      Canvas canvas, StringBuilder value, String unit, float x, float rowTop, int valueChars) {
+    float y = rowTop + baseline;
+    float vx = x + charW * valueChars - value.length() * charW;
+    outlinePaint.setTextSize(textSize);
+    canvas.drawText(value, 0, value.length(), vx, y, outlinePaint);
+    canvas.drawText(value, 0, value.length(), vx, y, valuePaint);
+    float ux = x + charW * valueChars + smallCharW * 0.1f;
+    drawOutlinedSmall(canvas, unit, 0, unit.length(), ux, y, C_TEXT);
+    return x + statCellW(valueChars, unit.length());
+  }
+
+  private void drawOutlinedSmall(Canvas canvas, CharSequence text, int start, int end,
+      float x, float y, int color) {
+    outlinePaint.setTextSize(smallSize);
+    canvas.drawText(text, start, end, x, y, outlinePaint);
+    smallPaint.setColor(color);
+    smallPaint.setAlpha(textAlphaInt());
+    canvas.drawText(text, start, end, x, y, smallPaint);
+  }
+
+  private void drawGraph(Canvas canvas, float left, float top, float width, float height) {
+    int count;
+    synchronized (frameLock) {
+      count = graphCount;
+      for (int i = 0; i < count; i++) {
+        graphSnapshot[i] = graphMs[(graphIndex - count + i + GRAPH_SAMPLES) % GRAPH_SAMPLES];
+      }
+    }
+    if (count < 2) return;
+    float stepX = width / (GRAPH_SAMPLES - 1);
+    float startX = left + (GRAPH_SAMPLES - count) * stepX;
+    int segments = 0;
+    float prevX = startX;
+    float prevY = graphY(graphSnapshot[0], top, height);
+    for (int i = 1; i < count; i++) {
+      float cx = startX + i * stepX;
+      float cy = graphY(graphSnapshot[i], top, height);
+      int base = segments * 4;
+      graphLines[base] = prevX;
+      graphLines[base + 1] = prevY;
+      graphLines[base + 2] = cx;
+      graphLines[base + 3] = cy;
+      segments++;
+      prevX = cx;
+      prevY = cy;
+    }
+    canvas.drawLines(graphLines, 0, segments * 4, graphPaint);
+  }
+
+  private static float graphY(float ms, float top, float height) {
+    if (ms > GRAPH_CEIL_MS - 0.1f) ms = GRAPH_CEIL_MS - 0.1f;
+    if (ms < 0f) ms = 0f;
+    return top + height - (ms / GRAPH_CEIL_MS) * height;
+  }
+
+  // ── touch: drag to move, double-tap to cycle size ──
+
+  private int activePointerId = -1;
+  private float touchOffsetX, touchOffsetY, downRawX, downRawY;
+  private float lastTapX, lastTapY;
+  private long downTime, lastTapTime;
+  private boolean dragging;
+  private static final long LOCK_HOLD_MS = 3500L;
+  private final Runnable lockRunnable = new Runnable() {
+    @Override
+    public void run() {
+      locked = true;
+      activePointerId = -1;
+      saveLocked(preferences, true);
+      performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS);
+    }
+  };
+  private static final float TAP_SLOP = 20f;
+  private static final float DOUBLE_TAP_SLOP = 48f;
+  private static final long TAP_MS = 300L;
+
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    if (locked) return false;
+    if (event.getPointerCount() > 1) {
+      activePointerId = -1;
+      removeCallbacks(lockRunnable);
+      return false;
+    }
+    switch (event.getActionMasked()) {
+      case MotionEvent.ACTION_DOWN:
+        activePointerId = event.getPointerId(0);
+        touchOffsetX = getX() - event.getRawX();
+        touchOffsetY = getY() - event.getRawY();
+        downRawX = event.getRawX();
+        downRawY = event.getRawY();
+        downTime = SystemClock.elapsedRealtime();
+        dragging = false;
+        bringToFront();
+        postDelayed(lockRunnable, LOCK_HOLD_MS);
+        return true;
+      case MotionEvent.ACTION_MOVE:
+        if (activePointerId != -1) {
+          if (Math.abs(event.getRawX() - downRawX) > TAP_SLOP
+              || Math.abs(event.getRawY() - downRawY) > TAP_SLOP) {
+            dragging = true;
+          }
+          if (dragging) {
+            removeCallbacks(lockRunnable);
+            setX(event.getRawX() + touchOffsetX);
+            setY(event.getRawY() + touchOffsetY);
+            clampToParentBounds();
+          }
+          return true;
+        }
+        break;
+      case MotionEvent.ACTION_UP:
+      case MotionEvent.ACTION_CANCEL:
+        removeCallbacks(lockRunnable);
+        if (activePointerId != -1) {
+          long now = SystemClock.elapsedRealtime();
+          if (dragging) {
+            clampToParentBounds();
+            preferences.edit()
+                .putBoolean(PREF_HAS_POSITION, true)
+                .putFloat(PREF_POS_X, getX())
+                .putFloat(PREF_POS_Y, getY())
+                .apply();
+            lastTapTime = 0;
+          } else if (now - downTime < 400) {
+            boolean nearLastTap = Math.abs(downRawX - lastTapX) < DOUBLE_TAP_SLOP * density
+                && Math.abs(downRawY - lastTapY) < DOUBLE_TAP_SLOP * density;
+            if (lastTapTime != 0 && now - lastTapTime < TAP_MS && nearLastTap) {
+              lastTapTime = 0;
+              cycleScale();
+            } else {
+              lastTapTime = now;
+              lastTapX = downRawX;
+              lastTapY = downRawY;
+            }
+          }
+          activePointerId = -1;
+          return true;
+        }
+        return false;
+    }
+    return false;
+  }
+
+  /** Double-tap: snap up to the next preset (wrapping), persisting so the settings slider follows. */
+  private void cycleScale() {
+    synchronized (uiLock) {
+      scaleFactor = nextPresetAbove(scaleFactor);
+      preferences.edit().putFloat(PREF_SCALE, scaleFactor).apply();
+      applyScaleLocked();
+      computeLayoutLocked();
+    }
+    requestLayout();
+    invalidate();
+    post(this::clampToParentBounds);
+  }
+
+  private static float nextPresetAbove(float current) {
+    for (float step : SCALE_STEPS) {
+      if (step > current + 0.01f) return step;
+    }
+    return SCALE_STEPS[0];
+  }
+
+  private static float clampScale(float scale) {
+    return Math.max(SCALE_MIN, Math.min(scale, SCALE_MAX));
+  }
+
+  public static boolean lockedFromPrefs(SharedPreferences preferences) {
+    return preferences.getBoolean(PREF_LOCKED, false);
+  }
+
+  public static void saveLocked(SharedPreferences preferences, boolean locked) {
+    preferences.edit().putBoolean(PREF_LOCKED, locked).apply();
+  }
+
+  /** Locked: touches fall through to the controls underneath; unlock from HUD settings. */
+  public void setLockedValue(boolean value) {
+    this.locked = value;
+    if (value) {
+      removeCallbacks(lockRunnable);
+      activePointerId = -1;
+    }
+  }
+
+  public static float scaleFromPrefs(SharedPreferences preferences) {
+    return preferences.getFloat(PREF_SCALE, DEFAULT_SCALE);
+  }
+
+  public static void saveScale(SharedPreferences preferences, float scale) {
+    preferences.edit().putFloat(PREF_SCALE, scale).apply();
+  }
+
+  public void setScaleValue(float scale) {
+    synchronized (uiLock) {
+      scaleFactor = clampScale(scale);
+      applyScaleLocked();
+      computeLayoutLocked();
+    }
+    post(() -> {
+      requestLayout();
+      invalidate();
+      clampToParentBounds();
+    });
+  }
+
+  private void clampToParentBounds() {
+    View parentView = (View) getParent();
+    if (parentView == null || parentView.getWidth() <= 0 || parentView.getHeight() <= 0
+        || getWidth() <= 0 || getHeight() <= 0) {
+      return;
+    }
+    float maxX = Math.max(0f, parentView.getWidth() - getWidth());
+    float maxY = Math.max(0f, parentView.getHeight() - getHeight());
+    setX(Math.max(0f, Math.min(getX(), maxX)));
+    setY(Math.max(0f, Math.min(getY(), maxY)));
+  }
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    setElevation(1000.0f);
+    if (preferences.getBoolean(PREF_HAS_POSITION, false)) {
+      post(() -> {
+        setX(preferences.getFloat(PREF_POS_X, getX()));
+        setY(preferences.getFloat(PREF_POS_Y, getY()));
+        clampToParentBounds();
+      });
+    }
+    // Attached ⇒ loop running: a rendered view is always attached, so the HUD can never sit on screen dead.
+    startStats();
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    removeCallbacks(lockRunnable);
+    stopStats();
+    super.onDetachedFromWindow();
+  }
+}
diff --git a/app/src/main/runtime/display/ui/XServerSurfaceView.java b/app/src/main/runtime/display/ui/XServerSurfaceView.java
new file mode 100644
index 000000000..2f8ae7688
--- /dev/null
+++ b/app/src/main/runtime/display/ui/XServerSurfaceView.java
@@ -0,0 +1,269 @@
+package com.winlator.cmod.runtime.display.ui;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import com.winlator.cmod.runtime.display.renderer.RenderCallback;
+import com.winlator.cmod.runtime.display.renderer.VulkanRenderer;
+import com.winlator.cmod.runtime.display.xserver.XServer;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+/** SurfaceView that drives a {@link VulkanRenderer} on a dedicated render thread, preserving the public API: {@link #queueEvent(Runnable)}, {@link #requestRender()}, {@link #setRenderMode(int)}, {@link #onResume()}, {@link #onPause()}, {@link #getRenderer()}. */
+@SuppressLint("ViewConstructor")
+public class XServerSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
+    public static final int RENDERMODE_WHEN_DIRTY  = 0;
+    public static final int RENDERMODE_CONTINUOUSLY = 1;
+    private static final long TRANSIENT_FRAME_INTERVAL_NS = 1_000_000_000L / 120L;
+
+    private final VulkanRenderer renderer;
+
+    private final Object renderLock = new Object();
+    private final Deque<Runnable> eventQueue = new ArrayDeque<>();
+    private Thread renderThread;
+    // Outgoing render thread finishing teardown; the next surfaceCreated joins it first so a stale destroy() can't free the handle the new surface re-attaches to.
+    private Thread retiringRenderThread;
+    private volatile boolean running;
+    private volatile boolean renderRequested;
+    private volatile boolean transientRenderRequested;
+    private volatile boolean paused;
+    private volatile boolean surfaceReady;
+    private volatile long transientRenderUntilNs;
+    private long nextContinuousFrameNs;
+    private int renderMode = RENDERMODE_WHEN_DIRTY;
+
+    private volatile int width;
+    private volatile int height;
+
+    public XServerSurfaceView(Context context, XServer xServer) {
+        super(context);
+        setLayoutParams(new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        renderer = new VulkanRenderer(this, xServer);
+        getHolder().addCallback(this);
+    }
+
+    public VulkanRenderer getRenderer() {
+        return renderer;
+    }
+
+    public void queueEvent(Runnable r) {
+        if (r == null) return;
+        synchronized (renderLock) {
+            eventQueue.add(r);
+            renderRequested = true;
+            renderLock.notifyAll();
+        }
+    }
+
+    public void requestRender() {
+        synchronized (renderLock) {
+            renderRequested = true;
+            renderLock.notifyAll();
+        }
+    }
+
+    public void requestTransientRender(long durationMs) {
+        long untilNs = System.nanoTime() + Math.max(1L, durationMs) * 1_000_000L;
+        synchronized (renderLock) {
+            if (untilNs > transientRenderUntilNs) transientRenderUntilNs = untilNs;
+            transientRenderRequested = true;
+            renderLock.notifyAll();
+        }
+    }
+
+    public void setRenderMode(int mode) {
+        if (mode != RENDERMODE_WHEN_DIRTY && mode != RENDERMODE_CONTINUOUSLY) return;
+        synchronized (renderLock) {
+            renderMode = mode;
+            if (mode == RENDERMODE_CONTINUOUSLY) {
+                renderRequested = true;
+                renderLock.notifyAll();
+            }
+        }
+    }
+
+    public int getRenderMode() {
+        return renderMode;
+    }
+
+    public void onResume() {
+        synchronized (renderLock) {
+            paused = false;
+            renderRequested = true;
+            renderLock.notifyAll();
+        }
+    }
+
+    public void onPause() {
+        synchronized (renderLock) {
+            paused = true;
+            renderLock.notifyAll();
+        }
+    }
+
+    // --- SurfaceHolder.Callback ----------------------------------------------
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        // Let any retiring render thread finish freeing the renderer before attaching the new surface.
+        joinRetiringRenderThread();
+        synchronized (renderLock) {
+            surfaceReady = false;
+            width = 0;
+            height = 0;
+        }
+        renderer.attachSurface(holder.getSurface());
+        startRenderThreadIfNeeded();
+    }
+
+    private void joinRetiringRenderThread() {
+        Thread t;
+        synchronized (renderLock) {
+            t = retiringRenderThread;
+            retiringRenderThread = null;
+        }
+        if (t != null && t != Thread.currentThread() && t.isAlive()) {
+            try { t.join(3000); } catch (InterruptedException ignore) {}
+        }
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
+        if (w <= 0 || h <= 0) {
+            synchronized (renderLock) {
+                surfaceReady = false;
+                width = 0;
+                height = 0;
+                renderLock.notifyAll();
+            }
+            return;
+        }
+
+        renderer.notifySurfaceChanged(w, h);
+        synchronized (renderLock) {
+            width = w;
+            height = h;
+            eventQueue.add(() -> renderer.onSurfaceChanged(w, h));
+            surfaceReady = true;
+            renderRequested = true;
+            renderLock.notifyAll();
+        }
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        synchronized (renderLock) {
+            surfaceReady = false;
+            width = 0;
+            height = 0;
+            renderLock.notifyAll();
+        }
+        // Run the render thread one more iteration so it sees surfaceReady=false and exits.
+        stopRenderThread();
+        renderer.detachSurface();
+    }
+
+    // --- Render thread -------------------------------------------------------
+
+    private void startRenderThreadIfNeeded() {
+        if (renderThread != null && renderThread.isAlive()) return;
+        running = true;
+        renderThread = new Thread(this::renderLoop, "VkRenderer");
+        renderThread.start();
+    }
+
+    private void stopRenderThread() {
+        synchronized (renderLock) {
+            running = false;
+            renderLock.notifyAll();
+            if (renderThread != null) retiringRenderThread = renderThread;
+            renderThread = null;
+        }
+    }
+
+    private void renderLoop() {
+        renderer.onSurfaceCreated();
+        if (width > 0 && height > 0) renderer.onSurfaceChanged(width, height);
+
+        while (true) {
+            Runnable event = null;
+            boolean draw = false;
+            synchronized (renderLock) {
+                while (true) {
+                    if (!running) break;
+                    if (paused || !surfaceReady) {
+                        nextContinuousFrameNs = 0;
+                        try { renderLock.wait(50); } catch (InterruptedException ignore) {}
+                        continue;
+                    }
+
+                    long now = System.nanoTime();
+                    boolean transientActive = transientRenderUntilNs > now;
+
+                    if (!eventQueue.isEmpty()) {
+                        event = eventQueue.poll();
+                        break;
+                    }
+
+                    if (renderRequested) {
+                        draw = true;
+                        renderRequested = false;
+                        transientRenderRequested = false;
+                        if (!transientActive) nextContinuousFrameNs = 0;
+                        break;
+                    }
+
+                    if (renderMode == RENDERMODE_CONTINUOUSLY) {
+                        draw = true;
+                        transientRenderRequested = false;
+                        nextContinuousFrameNs = 0;
+                        break;
+                    }
+
+                    if (transientRenderRequested) {
+                        draw = true;
+                        transientRenderRequested = false;
+                        nextContinuousFrameNs = now + TRANSIENT_FRAME_INTERVAL_NS;
+                        break;
+                    }
+
+                    if (transientActive) {
+                        if (nextContinuousFrameNs == 0 || now >= nextContinuousFrameNs) {
+                            draw = true;
+                            nextContinuousFrameNs = now + TRANSIENT_FRAME_INTERVAL_NS;
+                            break;
+                        }
+                        waitNanosLocked(nextContinuousFrameNs - now);
+                        continue;
+                    }
+
+                    nextContinuousFrameNs = 0;
+                    try { renderLock.wait(); } catch (InterruptedException ignore) {}
+                }
+            }
+            if (!running) break;
+            if (event != null) {
+                try { event.run(); } catch (Throwable ignore) {}
+            } else if (draw) {
+                try { renderer.onDrawFrame(); } catch (Throwable ignore) {}
+            }
+        }
+        renderer.onSurfaceDestroyed();
+    }
+
+    private void waitNanosLocked(long nanos) {
+        if (nanos <= 0) return;
+        long millis = nanos / 1_000_000L;
+        int extraNanos = (int) (nanos % 1_000_000L);
+        try { renderLock.wait(millis, extraNanos); } catch (InterruptedException ignore) {}
+    }
+
+    // ---- Convenience accessors used by VulkanRenderer ----------------------
+
+    public int getSurfaceWidth() { return width; }
+    public int getSurfaceHeight() { return height; }
+}
diff --git a/app/src/main/runtime/display/ui/XServerView.java b/app/src/main/runtime/display/ui/XServerView.java
deleted file mode 100644
index dfc192c9e..000000000
--- a/app/src/main/runtime/display/ui/XServerView.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.winlator.cmod.runtime.display.ui;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import com.winlator.cmod.runtime.display.renderer.GLRenderer;
-import com.winlator.cmod.runtime.display.xserver.XServer;
-
-@SuppressLint("ViewConstructor")
-public class XServerView extends GLSurfaceView {
-  private final GLRenderer renderer;
-
-  public XServerView(Context context, XServer xServer) {
-    super(context);
-    setLayoutParams(
-        new FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-    setEGLContextClientVersion(3);
-    setEGLConfigChooser(8, 8, 8, 8, 0, 0);
-    setPreserveEGLContextOnPause(true);
-    renderer = new GLRenderer(this, xServer);
-    setRenderer(renderer);
-    setRenderMode(RENDERMODE_WHEN_DIRTY);
-  }
-
-  public GLRenderer getRenderer() {
-    return renderer;
-  }
-}
diff --git a/app/src/main/runtime/display/winhandler/WinHandler.java b/app/src/main/runtime/display/winhandler/WinHandler.java
index a6766a484..7434bf41b 100644
--- a/app/src/main/runtime/display/winhandler/WinHandler.java
+++ b/app/src/main/runtime/display/winhandler/WinHandler.java
@@ -10,16 +10,22 @@
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.util.Log;
+import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import androidx.preference.PreferenceManager;
 import com.winlator.cmod.runtime.display.XServerDisplayActivity;
+import com.winlator.cmod.runtime.display.xserver.Pointer;
+import com.winlator.cmod.runtime.display.xserver.XKeycode;
 import com.winlator.cmod.runtime.display.xserver.XServer;
 import com.winlator.cmod.runtime.input.controls.ControllerManager;
+import com.winlator.cmod.runtime.input.controls.Binding;
 import com.winlator.cmod.runtime.input.controls.ControlsProfile;
 import com.winlator.cmod.runtime.input.controls.ExternalController;
 import com.winlator.cmod.runtime.input.controls.FakeInputWriter;
 import com.winlator.cmod.runtime.input.controls.GamepadState;
+import com.winlator.cmod.runtime.input.rumble.GamepadRumbleManager;
+import com.winlator.cmod.runtime.input.rumble.GcmRumbleMode;
 import com.winlator.cmod.shared.util.StringUtils;
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -60,8 +66,13 @@ public class WinHandler {
   private static final int OSC_DEVICE_ID = -1;
   private static final short SERVER_PORT = 7947;
   private static final long VIRTUAL_REBALANCE_AFTER_PHYSICAL_DISCONNECT_MS = 200;
+  private static final long PHYSICAL_DISCONNECT_DEBOUNCE_MS = 400;
   private static final float GYRO_AXIS_EPSILON = 0.001f;
   private static final float GYRO_TRIGGER_PRESS_THRESHOLD = 0.15f;
+  // Orientation stick gain: ~14 deg tilt = full deflection before per-axis sensitivity.
+  private static final float GYRO_ORIENTATION_STICK_GAIN = 4.0f;
+  // Sensitivity offset: a displayed slider value of 100% acts as 200% effective.
+  private static final float GYRO_SENSITIVITY_OFFSET = 1.0f;
   private final XServerDisplayActivity activity;
   private String fakeInputBasePath;
   private final InputManager inputManager;
@@ -85,7 +96,8 @@ public class WinHandler {
   private byte inputType = 4;
   private final List<Integer> gamepadClients = new CopyOnWriteArrayList();
   private FakeInputWriter[] writers = new FakeInputWriter[MAX_CONTROLLERS];
-  private Map<Integer, Integer> deviceToSlot = new HashMap();
+  // ConcurrentHashMap: input thread mutates while the vibration thread iterates (avoid CME).
+  private Map<Integer, Integer> deviceToSlot = new java.util.concurrent.ConcurrentHashMap<>();
   private Map<String, Integer> descriptorToSlot = new HashMap<>(); // physical device → slot
   private Map<Integer, String> deviceToDescriptor = new HashMap<>(); // deviceId → descriptor
   private Set<Integer> usedSlots = new HashSet();
@@ -93,7 +105,9 @@ public class WinHandler {
   private LocalServerSocket vibrationServer;
   private volatile boolean vibrationRunning = false;
   private final boolean[] vibrationEnabledSlots = new boolean[MAX_CONTROLLERS];
-  private boolean globalVibrationEnabled = true;
+  // volatile: UI thread writes, vibration thread reads.
+  private volatile boolean globalVibrationEnabled = true;
+  private volatile GcmRumbleMode gcmRumbleMode = GcmRumbleMode.DISABLED;
   private int fallbackSlot = -1;
   private ExternalController currentController;
   private final GamepadState outputGamepadState = new GamepadState();
@@ -102,23 +116,37 @@ public class WinHandler {
   private float smoothedGyroY = 0.0f;
   private float currentGyroStickX = 0.0f;
   private float currentGyroStickY = 0.0f;
+  private float currentTouchStickX = 0.0f;
+  private float currentTouchStickY = 0.0f;
+  private boolean screenTouchStickActive = false;
+  private float rightStickSensitivity = 1.0f;
   private float accumulatedGyroX = 0.0f;
   private float accumulatedGyroY = 0.0f;
   private boolean gyroToggleEnabled = false;
   private boolean gyroActivatorPressed = false;
+  private boolean gyroMouseActivatorPressed = false;
   private int lastGyroTargetSource = 0;
   private ExternalController lastGyroTargetController;
+  // Cached activation; read by shouldApplyGyroToTarget so the query stays side-effect free.
+  private boolean lastGyroActive = false;
+  // Orientation recenter reference, captured on the rising edge of activation.
+  private boolean gyroOrientationCalibrated = false;
+  private float orientationYaw0 = 0.0f;
+  private float orientationPitch0 = 0.0f;
   private Runnable pendingVirtualGamepadRebalance;
+  private final Map<Integer, Runnable> pendingDeviceReleases = new HashMap<>();
+  private final GamepadRumbleManager gamepadRumbleManager;
   private final InputManager.InputDeviceListener inputDeviceListener =
       new InputManager.InputDeviceListener() {
         @Override
         public void onInputDeviceAdded(int deviceId) {
+          WinHandler.this.cancelPendingDeviceRelease(deviceId);
           WinHandler.this.assignConnectedDeviceIfPossible(deviceId, "hotplug");
         }
 
         @Override
         public void onInputDeviceRemoved(int deviceId) {
-          WinHandler.this.releaseSlot(deviceId);
+          WinHandler.this.scheduleDeviceRelease(deviceId);
         }
 
         @Override
@@ -128,8 +156,10 @@ public void onInputDeviceChanged(int deviceId) {}
   public WinHandler(XServerDisplayActivity activity) {
     this.activity = activity;
     this.inputManager = (InputManager) activity.getSystemService(Context.INPUT_SERVICE);
+    this.gamepadRumbleManager = new GamepadRumbleManager(activity, this.inputHandler);
     this.inputManager.registerInputDeviceListener(this.inputDeviceListener, null);
     this.preferences = PreferenceManager.getDefaultSharedPreferences(activity.getBaseContext());
+    boolean anySlotEnabled = false;
     for (int i = 0; i < MAX_CONTROLLERS; i++) {
       String key = "vibration_slot_" + i;
       String legacyKey = "vibrate_slot_" + i;
@@ -138,9 +168,26 @@ public WinHandler(XServerDisplayActivity activity) {
       } else {
         this.vibrationEnabledSlots[i] = this.preferences.getBoolean(legacyKey, true);
       }
+      if (this.vibrationEnabledSlots[i]) {
+        anySlotEnabled = true;
+      }
     }
     this.globalVibrationEnabled =
         this.preferences.getBoolean(ControllerManager.PREF_VIBRATION_GLOBAL, true);
+    // Heal stale #403 prefs: master on + all slots off → re-enable all.
+    if (this.globalVibrationEnabled && !anySlotEnabled) {
+      SharedPreferences.Editor editor = this.preferences.edit();
+      for (int i = 0; i < MAX_CONTROLLERS; i++) {
+        this.vibrationEnabledSlots[i] = true;
+        editor.putBoolean("vibration_slot_" + i, true);
+        editor.putBoolean("vibrate_slot_" + i, true);
+      }
+      editor.apply();
+    }
+    this.gcmRumbleMode =
+        GcmRumbleMode.fromPrefValue(
+            this.preferences.getString(GcmRumbleMode.PREF_KEY, GcmRumbleMode.DISABLED.toPrefValue()));
+    this.gamepadRumbleManager.setMode(this.gcmRumbleMode);
   }
 
   public int preAssignConnectedControllers() {
@@ -200,9 +247,17 @@ private boolean assignConnectedDeviceIfPossible(int deviceId, String source) {
     }
 
     if (this.usedSlots.size() >= MAX_CONTROLLERS) {
-      Log.d(
-          "WinHandler", "Ignoring device " + deviceId + " from " + source + ": slot limit reached.");
-      return false;
+      // Still allow a reconnecting / sub-device that will reuse an existing
+      // physical controller's slot instead of consuming a new one. Without this,
+      // a transient remove/add while all four slots are full would be dropped.
+      android.view.InputDevice probe = android.view.InputDevice.getDevice(deviceId);
+      String descriptor = probe != null ? probe.getDescriptor() : null;
+      if (descriptor == null || !this.descriptorToSlot.containsKey(descriptor)) {
+        Log.d(
+            "WinHandler",
+            "Ignoring device " + deviceId + " from " + source + ": slot limit reached.");
+        return false;
+      }
     }
 
     android.view.InputDevice device = android.view.InputDevice.getDevice(deviceId);
@@ -357,26 +412,38 @@ public void setProcessAffinity(final int pid, final int affinityMask) {
   }
 
   public void mouseEvent(final int flags, final int dx, final int dy, final int wheelDelta) {
+    checkGyroActivatorMouseFlags(flags);
     if (!this.initReceived) {
       return;
     }
     addAction(
         () -> {
-          try {
-            this.sendData.rewind();
-            this.sendData.put((byte) 7);
-            this.sendData.putInt(10);
-            this.sendData.putInt(flags);
-            this.sendData.putShort((short) dx);
-            this.sendData.putShort((short) dy);
-            this.sendData.putShort((short) wheelDelta);
-            this.sendData.put((byte) ((flags & 1) != 0 ? 1 : 0));
-            sendPacket(CLIENT_PORT);
-          } catch (IOException ignored) {
-          }
+          sendMouseEventPacket(flags, dx, dy, wheelDelta);
+          XServer xServer = activity.getXServer();
+          if (xServer != null && xServer.getRenderer() != null)
+            xServer.getRenderer().requestRenderCoalesced();
         });
   }
 
+  public void mouseMoveDelta(final int dx, final int dy) {
+    mouseEvent(MouseEventFlags.MOVE, dx, dy, 0);
+  }
+
+  private void sendMouseEventPacket(final int flags, final int dx, final int dy, final int wheelDelta) {
+    try {
+      this.sendData.rewind();
+      this.sendData.put((byte) 7);
+      this.sendData.putInt(10);
+      this.sendData.putInt(flags);
+      this.sendData.putShort((short) dx);
+      this.sendData.putShort((short) dy);
+      this.sendData.putShort((short) wheelDelta);
+      this.sendData.put((byte) ((flags & 1) != 0 ? 1 : 0));
+      sendPacket(CLIENT_PORT);
+    } catch (IOException ignored) {
+    }
+  }
+
   public void keyboardEvent(final byte vkey, final int flags) {
     if (!this.initReceived) {
       return;
@@ -440,17 +507,21 @@ private void startSendThread() {
     this.sendExecutor.execute(
         () -> {
           while (true) {
+            Runnable action;
             synchronized (this.actions) {
-              while (this.running && this.initReceived && !this.actions.isEmpty()) {
-                this.actions.poll().run();
+              while (this.running && (!this.initReceived || this.actions.isEmpty())) {
+                try {
+                  this.actions.wait();
+                } catch (InterruptedException e) {
+                  Thread.currentThread().interrupt();
+                  return;
+                }
               }
               if (!this.running) return;
-              try {
-                this.actions.wait();
-              } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                return;
-              }
+              action = this.actions.poll();
+            }
+            if (action != null) {
+              action.run();
             }
           }
         });
@@ -480,18 +551,51 @@ public void stop() {
     if (this.vibrationExecutor != null) this.vibrationExecutor.shutdownNow();
   }
 
+  // Hand the socket/threads to a replacement handler while keeping the fake-input writers/rings the running guest is mapped to (unlike stop()).
+  public void stopForReattach() {
+    synchronized (this.actions) {
+      this.running = false;
+      this.actions.clear();
+      this.actions.notifyAll();
+    }
+    this.vibrationRunning = false;
+    if (this.socket != null) {
+      this.socket.close();
+      this.socket = null;
+    }
+    if (this.vibrationServer != null) {
+      try {
+        this.vibrationServer.close();
+      } catch (IOException ignored) {
+      }
+      this.vibrationServer = null;
+    }
+    if (this.sendExecutor != null) this.sendExecutor.shutdownNow();
+    if (this.receiveExecutor != null) this.receiveExecutor.shutdownNow();
+    if (this.vibrationExecutor != null) this.vibrationExecutor.shutdownNow();
+  }
+
+  private void applyInitHandshake() {
+    this.initReceived = true;
+    this.preferences =
+        PreferenceManager.getDefaultSharedPreferences(this.activity.getBaseContext());
+    if (!this.xinputDisabledInitialized) {
+      this.xinputDisabled = this.preferences.getBoolean("xinput_toggle", false);
+    }
+    synchronized (this.actions) {
+      this.actions.notifyAll();
+    }
+  }
+
+  // Reused session: the guest already handshook and won't repeat it, so adopt init state or mouse/keyboard input stays gated off.
+  public void markSessionInitialized() {
+    applyInitHandshake();
+  }
+
   private void handleRequest(byte requestCode, int port) {
     switch (requestCode) {
       case 1:
-        this.initReceived = true;
-        this.preferences =
-            PreferenceManager.getDefaultSharedPreferences(this.activity.getBaseContext());
-        if (!this.xinputDisabledInitialized) {
-          this.xinputDisabled = this.preferences.getBoolean("xinput_toggle", false);
-        }
-        synchronized (this.actions) {
-          this.actions.notifyAll();
-        }
+        applyInitHandshake();
         return;
       case 5:
         if (this.onGetProcessInfoListener != null) {
@@ -516,15 +620,23 @@ private void handleRequest(byte requestCode, int port) {
         short x = this.receiveData.getShort();
         short y = this.receiveData.getShort();
         XServer xServer = this.activity.getXServer();
-        xServer.pointer.setX(x);
-        xServer.pointer.setY(y);
+        if (xServer != null) {
+          xServer.pointer.setX(x);
+          xServer.pointer.setY(y);
+          if (xServer.getRenderer() != null) {
+            xServer.getRenderer().requestCursorRender();
+          } else if (this.activity.getXServerView() != null) {
+            this.activity.getXServerView().requestTransientRender(100);
+          }
+        }
         return;
       default:
         return;
     }
   }
 
-  public void start() {
+  public synchronized void start() {
+    if (running) return;
     try {
       this.localhost = InetAddress.getLocalHost();
     } catch (UnknownHostException e) {
@@ -560,9 +672,67 @@ public void sendGamepadState() {
     setLastGamepadSource(GAMEPAD_SOURCE_VIRTUAL, null);
     maybeClearGyroTarget(GAMEPAD_SOURCE_VIRTUAL, null);
     writeVirtualGamepadState(shouldApplyGyroToTarget(GAMEPAD_SOURCE_VIRTUAL, null));
+    XServer xServer = activity.getXServer();
+    if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
+  }
+
+  public boolean canUseScreenTouchStick() {
+    ControlsProfile profile = this.activity.getInputControlsView().getProfile();
+    return profile != null && profile.isVirtualGamepad();
+  }
+
+  public void setScreenTouchStickActive(boolean active) {
+    if (this.screenTouchStickActive == active) return;
+    this.screenTouchStickActive = active;
+    this.currentTouchStickX = 0.0f;
+    this.currentTouchStickY = 0.0f;
+    writeScreenTouchStickFrame();
+    requestScreenTouchRender();
+  }
+
+  public void setRightStickSensitivity(float sensitivity) {
+    this.rightStickSensitivity = sensitivity;
+  }
+
+  public void setScreenTouchRightStick(float x, float y) {
+    if (!this.screenTouchStickActive) return;
+    this.currentTouchStickX = x;
+    this.currentTouchStickY = y;
+    writeScreenTouchStickFrame();
+    requestScreenTouchRender();
+  }
+
+  private void writeScreenTouchStickFrame() {
+    if (this.lastGamepadSource == GAMEPAD_SOURCE_CONTROLLER && this.currentController != null) {
+      writeControllerGamepadState(
+          this.currentController, shouldApplyGyroToTarget(GAMEPAD_SOURCE_CONTROLLER, this.currentController));
+    } else {
+      writeVirtualGamepadState(shouldApplyGyroToTarget(GAMEPAD_SOURCE_VIRTUAL, null), true);
+    }
+  }
+
+  private void requestScreenTouchRender() {
+    XServer xServer = activity.getXServer();
+    if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
   }
 
   private void writeVirtualGamepadState(boolean applyGyroOverlay) {
+    writeVirtualGamepadState(applyGyroOverlay, false);
+  }
+
+  // allowHiddenControls relaxes the on-screen-controls gate for gesture-driven gamepad output.
+  public void injectGestureGamepad(Binding binding, boolean pressed) {
+    if (binding == null || !binding.isGamepad()) return;
+    ControlsProfile profile = this.activity.getInputControlsView().getProfile();
+    if (profile == null || !profile.isVirtualGamepad()) return;
+    this.activity.getInputControlsView().handleInputEvent(null, binding, pressed, 0f, false);
+    setLastGamepadSource(GAMEPAD_SOURCE_VIRTUAL, null);
+    writeVirtualGamepadState(shouldApplyGyroToTarget(GAMEPAD_SOURCE_VIRTUAL, null), true);
+    XServer xServer = activity.getXServer();
+    if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
+  }
+
+  private void writeVirtualGamepadState(boolean applyGyroOverlay, boolean allowHiddenControls) {
     ControlsProfile profile = this.activity.getInputControlsView().getProfile();
     if (profile == null) {
       return;
@@ -570,7 +740,7 @@ private void writeVirtualGamepadState(boolean applyGyroOverlay) {
     GamepadState gamepadState = profile.getGamepadState();
     boolean useVirtualGamepad =
         profile.isVirtualGamepad()
-            && this.activity.getInputControlsView().isShowTouchscreenControls();
+            && (allowHiddenControls || this.activity.getInputControlsView().isShowTouchscreenControls());
     if (useVirtualGamepad) {
       int slot = assignSlot(-1);
       if (slot >= 0 && this.writers[slot] != null) {
@@ -594,6 +764,37 @@ public void sendGamepadState(ExternalController controller) {
     maybeClearGyroTarget(GAMEPAD_SOURCE_CONTROLLER, controller);
     writeControllerGamepadState(
         controller, shouldApplyGyroToTarget(GAMEPAD_SOURCE_CONTROLLER, controller));
+    XServer xServer = activity.getXServer();
+    if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
+  }
+
+  // Menu owns the controller while open; zero tracked state and push it once so nothing stays held in the guest.
+  public void neutralizeControllers() {
+    for (ExternalController controller : this.controllers.values()) {
+      if (controller == null) {
+        continue;
+      }
+      clearGamepadState(controller.state);
+      clearGamepadState(controller.remappedState);
+      int slot = assignSlot(controller.getDeviceId());
+      if (slot >= 0 && this.writers[slot] != null) {
+        try {
+          this.writers[slot].writeGamepadState(controller.state);
+        } catch (IOException ignored) {
+        }
+      }
+    }
+  }
+
+  private static void clearGamepadState(GamepadState state) {
+    state.thumbLX = 0;
+    state.thumbLY = 0;
+    state.thumbRX = 0;
+    state.thumbRY = 0;
+    state.triggerL = 0;
+    state.triggerR = 0;
+    state.buttons = 0;
+    state.dpad[0] = state.dpad[1] = state.dpad[2] = state.dpad[3] = false;
   }
 
   private void writeControllerGamepadState(
@@ -685,7 +886,7 @@ private void bindDeviceToSlot(int deviceId, String descriptor, int slot) {
     ensureWriterForSlot(slot);
   }
 
-  private boolean moveVirtualGamepadToSlot(int targetSlot) {
+  private boolean moveVirtualGamepadToSlot(int targetSlot, boolean releaseVacatedSlot) {
     Integer currentSlot = this.deviceToSlot.get(OSC_DEVICE_ID);
     if (currentSlot == null) {
       return false;
@@ -700,7 +901,15 @@ private boolean moveVirtualGamepadToSlot(int targetSlot) {
 
     ensureWriterForSlot(targetSlot);
     if (this.writers[currentSlot] != null) {
-      this.writers[currentSlot].reset();
+      if (releaseVacatedSlot && !isPhysicalSlotOccupied(currentSlot)) {
+        // The virtual pad is leaving this slot for good (consolidation, not a
+        // hand-off to an incoming physical pad). Tear it down so winebus sees the
+        // device disappear instead of a phantom stuck-at-neutral controller.
+        this.writers[currentSlot].destroy();
+        this.writers[currentSlot] = null;
+      } else {
+        this.writers[currentSlot].reset();
+      }
     }
 
     this.deviceToSlot.put(OSC_DEVICE_ID, targetSlot);
@@ -726,7 +935,7 @@ private void rebalanceVirtualGamepadSlot() {
     if (preferredVirtualSlot == -1) {
       releaseSlot(OSC_DEVICE_ID);
     } else if (preferredVirtualSlot != virtualSlot) {
-      moveVirtualGamepadToSlot(preferredVirtualSlot);
+      moveVirtualGamepadToSlot(preferredVirtualSlot, true);
     }
   }
 
@@ -776,7 +985,7 @@ private int assignSlot(int deviceId) {
           if (this.pendingVirtualGamepadRebalance != null) {
             return existing;
           }
-          moveVirtualGamepadToSlot(preferredVirtualSlot);
+          moveVirtualGamepadToSlot(preferredVirtualSlot, true);
           Integer updatedSlot = this.deviceToSlot.get(deviceId);
           return updatedSlot != null ? updatedSlot : -1;
         }
@@ -831,7 +1040,7 @@ private int assignSlot(int deviceId) {
     Integer virtualSlot = this.deviceToSlot.get(OSC_DEVICE_ID);
     if (virtualSlot != null && virtualSlot == preferredPhysicalSlot) {
       int relocatedVirtualSlot = findPreferredVirtualSlot(null);
-      moveVirtualGamepadToSlot(relocatedVirtualSlot);
+      moveVirtualGamepadToSlot(relocatedVirtualSlot, false);
     }
 
     bindDeviceToSlot(deviceId, descriptor, preferredPhysicalSlot);
@@ -899,6 +1108,49 @@ private void releaseSlot(int deviceId) {
     }
   }
 
+  private void scheduleDeviceRelease(int deviceId) {
+    if (deviceId == OSC_DEVICE_ID) {
+      releaseSlot(deviceId);
+      return;
+    }
+    // Debounce transient Android remove/add churn (Bluetooth flaps, sub-device
+    // re-enumeration). A real unplug stays gone and is released after the delay;
+    // a quick reconnect re-seats onto the same slot via descriptorToSlot before
+    // the writer is ever torn down, so the guest never sees a disconnect.
+    cancelPendingDeviceRelease(deviceId);
+    Runnable release =
+        new Runnable() {
+          @Override
+          public void run() {
+            pendingDeviceReleases.remove(deviceId);
+            releaseSlot(deviceId);
+          }
+        };
+    pendingDeviceReleases.put(deviceId, release);
+    this.inputHandler.postDelayed(release, PHYSICAL_DISCONNECT_DEBOUNCE_MS);
+    Log.d(
+        "WinHandler",
+        "Device "
+            + deviceId
+            + " removed; scheduling slot release in "
+            + PHYSICAL_DISCONNECT_DEBOUNCE_MS
+            + "ms (debounce). Reconnect within window keeps the slot.");
+  }
+
+  private void cancelPendingDeviceRelease(int deviceId) {
+    Runnable pending = pendingDeviceReleases.remove(deviceId);
+    if (pending != null) {
+      this.inputHandler.removeCallbacks(pending);
+    }
+  }
+
+  private void cancelAllPendingDeviceReleases() {
+    for (Runnable pending : pendingDeviceReleases.values()) {
+      this.inputHandler.removeCallbacks(pending);
+    }
+    pendingDeviceReleases.clear();
+  }
+
   public void setXInputDisabled(boolean disabled) {
     this.xinputDisabled = disabled;
     this.xinputDisabledInitialized = true;
@@ -910,6 +1162,9 @@ public void setFakeInputPath(String fakeInputPath) {
       this.fakeInputBasePath = fakeInputPath;
       Log.d("WinHandler", "FakeInputWriter base path set: " + fakeInputPath);
       startVibrationListener();
+      if (this.gcmRumbleMode != GcmRumbleMode.DISABLED) {
+        this.gamepadRumbleManager.requestPermissionIfNeeded();
+      }
     }
   }
 
@@ -962,6 +1217,19 @@ private void triggerVibration(int strong, int weak, int durationMs, int slot) {
       return;
     }
 
+    // GameSir GCM-mode pads expose no Android vibrator; route them through the GCM manager first.
+    InputDevice physicalInputDevice = getPhysicalInputDeviceForSlot(slot);
+    if (this.gcmRumbleMode != GcmRumbleMode.DISABLED
+        && this.gamepadRumbleManager.handleRumble(
+            slot, physicalInputDevice, strong, weak, durationMs)) {
+      return;
+    }
+
+    // Suppress the phone fallback for GCM-owned devices so they don't double-rumble.
+    if (this.gcmRumbleMode != GcmRumbleMode.DISABLED && isGcmManagedDevice(physicalInputDevice)) {
+      return;
+    }
+
     Vibrator vibrator = null;
     Integer slotOwner = null;
     for (Map.Entry<Integer, Integer> entry : this.deviceToSlot.entrySet()) {
@@ -1020,6 +1288,38 @@ private void triggerVibration(int strong, int weak, int durationMs, int slot) {
     }
   }
 
+  private InputDevice getPhysicalInputDeviceForSlot(int slot) {
+    for (Map.Entry<Integer, Integer> entry : this.deviceToSlot.entrySet()) {
+      if (entry.getValue() != slot || entry.getKey() == OSC_DEVICE_ID) {
+        continue;
+      }
+      InputDevice device = InputDevice.getDevice(entry.getKey());
+      if (device != null) {
+        return device;
+      }
+    }
+    return null;
+  }
+
+  private boolean isGcmManagedDevice(InputDevice device) {
+    if (device == null) return false; // OSC/virtual slot: keep the phone fallback
+    if (device.getVendorId() != GamepadRumbleManager.GAMESIR_VENDOR_ID) return false;
+    if (gcmRumbleMode == GcmRumbleMode.ALL) return true;
+    // KNOWN: models with a driver — X5s (BLE), G8+ MFi (USB), X3 Pro (BLE).
+    int pid = device.getProductId();
+    return pid == 0x1119 || pid == 274 || pid == 0x0106;
+  }
+
+  public GcmRumbleMode getGcmRumbleMode() {
+    return this.gcmRumbleMode;
+  }
+
+  public void setGcmRumbleMode(GcmRumbleMode mode) {
+    this.gcmRumbleMode = mode;
+    this.preferences.edit().putString(GcmRumbleMode.PREF_KEY, mode.toPrefValue()).apply();
+    this.gamepadRumbleManager.setMode(mode);
+  }
+
   public boolean isVibrationEnabledForSlot(int slot) {
     return slot >= 0 && slot < MAX_CONTROLLERS && this.vibrationEnabledSlots[slot];
   }
@@ -1042,7 +1342,17 @@ public boolean isGlobalVibrationEnabled() {
 
   public void setGlobalVibrationEnabled(boolean enabled) {
     this.globalVibrationEnabled = enabled;
-    this.preferences.edit().putBoolean(ControllerManager.PREF_VIBRATION_GLOBAL, enabled).apply();
+    SharedPreferences.Editor editor = this.preferences.edit();
+    editor.putBoolean(ControllerManager.PREF_VIBRATION_GLOBAL, enabled);
+    if (enabled) {
+      // Master switch enables every slot, overriding stale per-slot prefs.
+      for (int i = 0; i < MAX_CONTROLLERS; i++) {
+        this.vibrationEnabledSlots[i] = true;
+        editor.putBoolean("vibration_slot_" + i, true);
+        editor.putBoolean("vibrate_slot_" + i, true);
+      }
+    }
+    editor.apply();
   }
 
   public int getMaxControllers() {
@@ -1051,6 +1361,7 @@ public int getMaxControllers() {
 
   public void closeFakeInputWriter() {
     cancelPendingVirtualGamepadRebalance();
+    cancelAllPendingDeviceReleases();
     if (this.inputManager != null && this.inputDeviceListener != null) {
       this.inputManager.unregisterInputDeviceListener(this.inputDeviceListener);
     }
@@ -1083,6 +1394,10 @@ public void closeFakeInputWriter() {
     this.currentGyroStickY = 0.0f;
     this.gyroToggleEnabled = false;
     this.gyroActivatorPressed = false;
+    this.lastGyroActive = false;
+    this.gyroOrientationCalibrated = false;
+    this.accumulatedGyroX = 0.0f;
+    this.accumulatedGyroY = 0.0f;
     this.lastGyroTargetSource = GAMEPAD_SOURCE_NONE;
     this.lastGyroTargetController = null;
   }
@@ -1163,14 +1478,7 @@ public void initializeController() {
   public void updateGyroData(float rawGyroX, float rawGyroY) {
     GyroSettings gyroSettings = getGyroSettings();
     if (!gyroSettings.enabled) {
-      this.smoothedGyroX = 0.0f;
-      this.smoothedGyroY = 0.0f;
-      this.currentGyroStickX = 0.0f;
-      this.currentGyroStickY = 0.0f;
-      this.gyroToggleEnabled = false;
-      this.gyroActivatorPressed = false;
-      this.accumulatedGyroX = 0.0f;
-      this.accumulatedGyroY = 0.0f;
+      resetGyroRuntimeState();
       clearLastGyroTarget();
       return;
     }
@@ -1195,28 +1503,114 @@ public void updateGyroData(float rawGyroX, float rawGyroY) {
         (this.smoothedGyroY * gyroSettings.smoothing)
             + (rawGyroY * (1.0f - gyroSettings.smoothing));
 
-    int targetSource = resolveGyroTargetSource();
-    ExternalController targetController =
-        targetSource == GAMEPAD_SOURCE_CONTROLLER ? getPreferredGyroController() : null;
-    if (targetSource == GAMEPAD_SOURCE_NONE) {
-      clearLastGyroTarget();
+    GyroTarget target = resolveActiveGyroTarget(gyroSettings);
+    if (target == null) {
       return;
     }
 
-    if (targetSource == GAMEPAD_SOURCE_CONTROLLER && targetController == null) {
+    float nextGyroStickX = target.active ? clamp(this.smoothedGyroX, -1.0f, 1.0f) : 0.0f;
+    float nextGyroStickY = target.active ? clamp(this.smoothedGyroY, -1.0f, 1.0f) : 0.0f;
+    applyGyroStickToTarget(target, nextGyroStickX, nextGyroStickY);
+  }
+
+  // Tilt-to-position path: drives the stick from absolute yaw/pitch offset, so a held tilt sustains.
+  public void updateGyroOrientation(float yaw, float pitch) {
+    GyroSettings gyroSettings = getGyroSettings();
+    if (!gyroSettings.enabled) {
+      resetGyroRuntimeState();
       clearLastGyroTarget();
       return;
     }
 
+    GyroTarget target = resolveActiveGyroTarget(gyroSettings);
+    if (target == null) {
+      this.gyroOrientationCalibrated = false;
+      return;
+    }
+
+    if (target.active) {
+      if (!this.gyroOrientationCalibrated) {
+        // Rising edge: current pose becomes stick-center.
+        this.orientationYaw0 = yaw;
+        this.orientationPitch0 = pitch;
+        this.gyroOrientationCalibrated = true;
+      }
+    } else {
+      this.gyroOrientationCalibrated = false;
+    }
+
+    float deltaX = target.active ? wrapAngle(yaw - this.orientationYaw0) : 0.0f;
+    float deltaY = target.active ? wrapAngle(pitch - this.orientationPitch0) : 0.0f;
+
+    if (Math.abs(deltaX) < gyroSettings.deadzone) deltaX = 0.0f;
+    if (Math.abs(deltaY) < gyroSettings.deadzone) deltaY = 0.0f;
+    if (gyroSettings.invertX) deltaX = -deltaX;
+    if (gyroSettings.invertY) deltaY = -deltaY;
+
+    deltaX *= gyroSettings.sensitivityX * GYRO_ORIENTATION_STICK_GAIN;
+    deltaY *= gyroSettings.sensitivityY * GYRO_ORIENTATION_STICK_GAIN;
+
+    this.smoothedGyroX =
+        (this.smoothedGyroX * gyroSettings.smoothing) + (deltaX * (1.0f - gyroSettings.smoothing));
+    this.smoothedGyroY =
+        (this.smoothedGyroY * gyroSettings.smoothing) + (deltaY * (1.0f - gyroSettings.smoothing));
+
+    float nextGyroStickX = target.active ? clamp(this.smoothedGyroX, -1.0f, 1.0f) : 0.0f;
+    float nextGyroStickY = target.active ? clamp(this.smoothedGyroY, -1.0f, 1.0f) : 0.0f;
+    applyGyroStickToTarget(target, nextGyroStickX, nextGyroStickY);
+  }
+
+  // Recenters orientation mode: next sample recaptures the current pose as stick-center.
+  public void recenterGyroOrientation() {
+    this.gyroOrientationCalibrated = false;
+    this.smoothedGyroX = 0.0f;
+    this.smoothedGyroY = 0.0f;
+  }
+
+  private void resetGyroRuntimeState() {
+    this.smoothedGyroX = 0.0f;
+    this.smoothedGyroY = 0.0f;
+    this.currentGyroStickX = 0.0f;
+    this.currentGyroStickY = 0.0f;
+    this.gyroToggleEnabled = false;
+    this.gyroActivatorPressed = false;
+    this.gyroMouseActivatorPressed = false;
+    this.accumulatedGyroX = 0.0f;
+    this.accumulatedGyroY = 0.0f;
+    this.lastGyroActive = false;
+    this.gyroOrientationCalibrated = false;
+  }
+
+  // Resolves the target and evaluates activation once per sample (sole updateGyroActivation caller).
+  private GyroTarget resolveActiveGyroTarget(GyroSettings gyroSettings) {
+    int targetSource = resolveGyroTargetSource();
+    ExternalController targetController =
+        targetSource == GAMEPAD_SOURCE_CONTROLLER ? getPreferredGyroController() : null;
+    if (targetSource == GAMEPAD_SOURCE_NONE
+        || (targetSource == GAMEPAD_SOURCE_CONTROLLER && targetController == null)) {
+      clearLastGyroTarget();
+      this.lastGyroActive = false;
+      return null;
+    }
     GamepadState targetState = getTargetGamepadState(targetSource, targetController);
     if (targetState == null) {
       clearLastGyroTarget();
-      return;
+      this.lastGyroActive = false;
+      return null;
     }
+    boolean active =
+        updateGyroActivation(
+            targetState, targetController != null ? targetController.state : null, gyroSettings);
+    this.lastGyroActive = active;
+    return new GyroTarget(targetSource, targetController, active);
+  }
 
-    boolean gyroActive = updateGyroActivation(targetState, targetController != null ? targetController.state : null, gyroSettings);
-    float nextGyroStickX = gyroActive ? clamp(this.smoothedGyroX, -1.0f, 1.0f) : 0.0f;
-    float nextGyroStickY = gyroActive ? clamp(this.smoothedGyroY, -1.0f, 1.0f) : 0.0f;
+  // Writes the stick value to the target. Must stay a leaf (no sendGamepadState/updateGyro* calls).
+  private void applyGyroStickToTarget(
+      GyroTarget target, float nextGyroStickX, float nextGyroStickY) {
+    int targetSource = target.source;
+    ExternalController targetController = target.controller;
+    boolean gyroActive = target.active;
 
     boolean targetChanged =
         targetSource != this.lastGyroTargetSource
@@ -1243,14 +1637,57 @@ public void updateGyroData(float rawGyroX, float rawGyroY) {
       writeControllerGamepadState(targetController, gyroActive);
     }
 
+    XServer xServer = activity.getXServer();
+    if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
+
     this.lastGyroTargetSource = gyroActive ? targetSource : GAMEPAD_SOURCE_NONE;
     this.lastGyroTargetController =
         gyroActive && targetSource == GAMEPAD_SOURCE_CONTROLLER ? targetController : null;
   }
 
+  // Normalizes to [-pi, pi] so the yaw wrap at +/-pi doesn't cause a full-scale jump.
+  private static float wrapAngle(float radians) {
+    return (float) Math.IEEEremainder(radians, 2.0 * Math.PI);
+  }
+
+  private static final class GyroTarget {
+    final int source;
+    final ExternalController controller;
+    final boolean active;
+
+    GyroTarget(int source, ExternalController controller, boolean active) {
+      this.source = source;
+      this.controller = controller;
+      this.active = active;
+    }
+  }
+
   public void refreshControllerMappings() {}
 
   private void updateGyroDataMouse(float rawGyroX, float rawGyroY, GyroSettings gyroSettings) {
+    // Mouse mode doesn't use the stick: clear any overlay left by a prior stick session.
+    if (this.lastGyroTargetSource != GAMEPAD_SOURCE_NONE) {
+      clearLastGyroTarget();
+    }
+    this.currentGyroStickX = 0.0f;
+    this.currentGyroStickY = 0.0f;
+
+    Binding activator = getGyroMouseActivator();
+    boolean active;
+    if (activator.isMouse() || activator.isKeyboard()) {
+      active = gyroSettings.mode == 1 ? this.gyroToggleEnabled : this.gyroMouseActivatorPressed;
+      this.lastGyroActive = active;
+    } else {
+      // Gate on the activator; stay always-on when no controller target exists (controllerless use).
+      GyroTarget target = resolveActiveGyroTarget(gyroSettings);
+      active = target == null || target.active;
+    }
+    if (!active) {
+      this.accumulatedGyroX = 0.0f;
+      this.accumulatedGyroY = 0.0f;
+      return;
+    }
+
     if (Math.abs(rawGyroX) < gyroSettings.deadzone) rawGyroX = 0.0f;
     if (Math.abs(rawGyroY) < gyroSettings.deadzone) rawGyroY = 0.0f;
     if (gyroSettings.invertX) rawGyroX = -rawGyroX;
@@ -1266,7 +1703,8 @@ private void updateGyroDataMouse(float rawGyroX, float rawGyroY, GyroSettings gy
     int dx = (int) this.accumulatedGyroX;
     int dy = (int) this.accumulatedGyroY;
     if (dx != 0 || dy != 0) {
-      mouseEvent(MouseEventFlags.MOVE, dx, dy, 0);
+      mouseMoveDelta(dx, dy);
+      this.activity.notifyPointerActivity();
       this.accumulatedGyroX -= dx;
       this.accumulatedGyroY -= dy;
     }
@@ -1278,12 +1716,18 @@ private GyroSettings getGyroSettings() {
     settings.mode = this.preferences.getInt("gyro_mode", 0);
     settings.activatorKeyCode =
         this.preferences.getInt("gyro_trigger_button", KeyEvent.KEYCODE_BUTTON_L1);
+    if (this.preferences.getBoolean("mouse_gyro_enabled", false)) {
+      Binding activator = getGyroMouseActivator();
+      settings.activatorBinding = activator.isGamepad() ? activator : null;
+    }
     settings.applyToRightStick =
         this.preferences.getBoolean("process_gyro_with_left_trigger", false);
-    settings.sensitivityX = getFloatPreference("gyro_x_sensitivity", 1.0f);
-    settings.sensitivityY = getFloatPreference("gyro_y_sensitivity", 1.0f);
-    settings.smoothing = clamp(getFloatPreference("gyro_smoothing", 0.9f), 0.0f, 0.99f);
-    settings.deadzone = clamp(getFloatPreference("gyro_deadzone", 0.05f), 0.0f, 1.0f);
+    float sensitivityOffset =
+        this.preferences.getBoolean("gyro_orientation_enabled", false) ? 0.0f : GYRO_SENSITIVITY_OFFSET;
+    settings.sensitivityX = getFloatPreference("gyro_x_sensitivity", 1.0f) + sensitivityOffset;
+    settings.sensitivityY = getFloatPreference("gyro_y_sensitivity", 1.0f) + sensitivityOffset;
+    settings.smoothing = clamp(getFloatPreference("gyro_smoothing", 0.5f), 0.0f, 0.99f);
+    settings.deadzone = getFloatPreference("gyro_deadzone", 0.05f);
     settings.invertX = this.preferences.getBoolean("invert_gyro_x", false);
     settings.invertY = this.preferences.getBoolean("invert_gyro_y", false);
     return settings;
@@ -1350,10 +1794,7 @@ private boolean canUseVirtualGamepad() {
   }
 
   private void setLastGamepadSource(int source, ExternalController controller) {
-    if (source != this.lastGamepadSource) {
-      this.gyroToggleEnabled = false;
-      this.gyroActivatorPressed = false;
-    }
+    // Don't reset gyroToggleEnabled here: the toggle is global and was dying on source changes.
     this.lastGamepadSource = source;
     if (controller != null) {
       this.currentController = controller;
@@ -1388,6 +1829,9 @@ private boolean shouldApplyGyroToTarget(int source, ExternalController controlle
     if (!gyroSettings.enabled) {
       return false;
     }
+    if (this.preferences.getBoolean("mouse_gyro_enabled", false)) {
+      return false; // mouse mode doesn't overlay the stick
+    }
     int preferredSource = resolveGyroTargetSource();
     if (source != preferredSource) {
       return false;
@@ -1397,8 +1841,8 @@ private boolean shouldApplyGyroToTarget(int source, ExternalController controlle
       return false;
     }
     GamepadState targetState = getTargetGamepadState(source, controller);
-    // Pass both remapped and raw state to activation check
-    return targetState != null && updateGyroActivation(targetState, controller != null ? controller.state : null, gyroSettings);
+    // Use cached activation (no mutation here) to keep this query side-effect free.
+    return targetState != null && this.lastGyroActive;
   }
 
   private GamepadState getTargetGamepadState(int source, ExternalController controller) {
@@ -1420,9 +1864,13 @@ private GamepadState getTargetGamepadState(int source, ExternalController contro
 
   private boolean updateGyroActivation(GamepadState targetState, GamepadState rawState, GyroSettings gyroSettings) {
     // Check both remapped and raw state for the activator
-    boolean activatorPressed = isActivatorPressed(targetState, gyroSettings.activatorKeyCode) ||
-                               isActivatorPressed(rawState, gyroSettings.activatorKeyCode);
-    
+    boolean activatorPressed =
+        gyroSettings.activatorBinding != null
+            ? isActivatorPressed(targetState, gyroSettings.activatorBinding)
+                || isActivatorPressed(rawState, gyroSettings.activatorBinding)
+            : isActivatorPressed(targetState, gyroSettings.activatorKeyCode)
+                || isActivatorPressed(rawState, gyroSettings.activatorKeyCode);
+
     if (gyroSettings.mode == 1 && activatorPressed && !this.gyroActivatorPressed) {
       this.gyroToggleEnabled = !this.gyroToggleEnabled;
     }
@@ -1446,23 +1894,140 @@ private boolean isActivatorPressed(GamepadState state, int keyCode) {
     return buttonIdx != -1 && state.isButtonPressed(buttonIdx);
   }
 
+  private boolean isActivatorPressed(GamepadState state, Binding binding) {
+    if (state == null || !binding.isGamepad()) {
+      return false;
+    }
+    int buttonIdx = gamepadButtonIdxOf(binding);
+    if (buttonIdx == GamepadState.BUTTON_L2) {
+      return state.triggerL > GYRO_TRIGGER_PRESS_THRESHOLD
+          || state.isButtonPressed(GamepadState.BUTTON_L2);
+    }
+    if (buttonIdx == GamepadState.BUTTON_R2) {
+      return state.triggerR > GYRO_TRIGGER_PRESS_THRESHOLD
+          || state.isButtonPressed(GamepadState.BUTTON_R2);
+    }
+    return state.isButtonPressed(buttonIdx);
+  }
+
+  // Binding gamepad ordinals line up with GamepadState button indices, except the d-pad.
+  private static int gamepadButtonIdxOf(Binding binding) {
+    switch (binding) {
+      case GAMEPAD_DPAD_UP:
+        return GamepadState.BUTTON_DPAD_UP;
+      case GAMEPAD_DPAD_DOWN:
+        return GamepadState.BUTTON_DPAD_DOWN;
+      case GAMEPAD_DPAD_LEFT:
+        return GamepadState.BUTTON_DPAD_LEFT;
+      case GAMEPAD_DPAD_RIGHT:
+        return GamepadState.BUTTON_DPAD_RIGHT;
+      default:
+        return binding.ordinal() - Binding.GAMEPAD_BUTTON_A.ordinal();
+    }
+  }
+
+  public static Binding getGyroMouseActivator(SharedPreferences preferences) {
+    try {
+      return Binding.valueOf(
+          preferences.getString("gyro_mouse_trigger_binding", Binding.MOUSE_RIGHT_BUTTON.name()));
+    } catch (Exception e) {
+      return Binding.MOUSE_RIGHT_BUTTON;
+    }
+  }
+
+  private Binding getGyroMouseActivator() {
+    return getGyroMouseActivator(this.preferences);
+  }
+
+  // Called for every pointer button heading to the guest, from any source.
+  public void onPointerButtonInjected(Pointer.Button button, boolean pressed) {
+    if (button == null || !isGyroMouseGated()) {
+      return;
+    }
+    if (getGyroMouseActivator().getPointerButton() == button) {
+      updateGyroMouseActivation(pressed);
+    }
+  }
+
+  // Called for every key heading to the guest, from any source.
+  public void onKeyInjected(XKeycode keycode, boolean pressed) {
+    if (keycode == null || !isGyroMouseGated()) {
+      return;
+    }
+    Binding activator = getGyroMouseActivator();
+    if (activator.isKeyboard() && activator.keycode == keycode) {
+      updateGyroMouseActivation(pressed);
+    }
+  }
+
+  private boolean isGyroMouseGated() {
+    return this.preferences.getBoolean("gyro_enabled", false)
+        && this.preferences.getBoolean("mouse_gyro_enabled", false);
+  }
+
+  // Rising-edge guarded, so the same press arriving on more than one path stays idempotent.
+  private void updateGyroMouseActivation(boolean pressed) {
+    if (pressed
+        && !this.gyroMouseActivatorPressed
+        && this.preferences.getInt("gyro_mode", 0) == 1) {
+      this.gyroToggleEnabled = !this.gyroToggleEnabled;
+    }
+    this.gyroMouseActivatorPressed = pressed;
+  }
+
+  private void checkGyroActivatorMouseFlags(int flags) {
+    if ((flags & MouseEventFlags.LEFTDOWN) != 0) {
+      onPointerButtonInjected(Pointer.Button.BUTTON_LEFT, true);
+    } else if ((flags & MouseEventFlags.LEFTUP) != 0) {
+      onPointerButtonInjected(Pointer.Button.BUTTON_LEFT, false);
+    } else if ((flags & MouseEventFlags.RIGHTDOWN) != 0) {
+      onPointerButtonInjected(Pointer.Button.BUTTON_RIGHT, true);
+    } else if ((flags & MouseEventFlags.RIGHTUP) != 0) {
+      onPointerButtonInjected(Pointer.Button.BUTTON_RIGHT, false);
+    } else if ((flags & MouseEventFlags.MIDDLEDOWN) != 0) {
+      onPointerButtonInjected(Pointer.Button.BUTTON_MIDDLE, true);
+    } else if ((flags & MouseEventFlags.MIDDLEUP) != 0) {
+      onPointerButtonInjected(Pointer.Button.BUTTON_MIDDLE, false);
+    }
+  }
+
   private GamepadState getOutputGamepadState(GamepadState baseState, boolean applyGyroOverlay) {
-    if (!applyGyroOverlay || baseState == null) {
+    boolean applyTouch = this.screenTouchStickActive;
+    boolean applyRsScale = !applyTouch && this.rightStickSensitivity != 1.0f;
+    if ((!applyGyroOverlay && !applyTouch && !applyRsScale) || baseState == null) {
       return baseState;
     }
 
-    GyroSettings gyroSettings = getGyroSettings();
     this.outputGamepadState.copy(baseState);
-    if (gyroSettings.applyToRightStick) {
+    if (applyGyroOverlay) {
+      GyroSettings gyroSettings = getGyroSettings();
+      if (gyroSettings.applyToRightStick) {
+        this.outputGamepadState.thumbRX =
+            clamp(baseState.thumbRX + this.currentGyroStickX, -1.0f, 1.0f);
+        this.outputGamepadState.thumbRY =
+            clamp(baseState.thumbRY + this.currentGyroStickY, -1.0f, 1.0f);
+      } else {
+        this.outputGamepadState.thumbLX =
+            clamp(baseState.thumbLX + this.currentGyroStickX, -1.0f, 1.0f);
+        this.outputGamepadState.thumbLY =
+            clamp(baseState.thumbLY + this.currentGyroStickY, -1.0f, 1.0f);
+      }
+    }
+    if (applyTouch) {
       this.outputGamepadState.thumbRX =
-          clamp(baseState.thumbRX + this.currentGyroStickX, -1.0f, 1.0f);
+          clamp(this.outputGamepadState.thumbRX + this.currentTouchStickX, -1.0f, 1.0f);
       this.outputGamepadState.thumbRY =
-          clamp(baseState.thumbRY + this.currentGyroStickY, -1.0f, 1.0f);
-    } else {
-      this.outputGamepadState.thumbLX =
-          clamp(baseState.thumbLX + this.currentGyroStickX, -1.0f, 1.0f);
-      this.outputGamepadState.thumbLY =
-          clamp(baseState.thumbLY + this.currentGyroStickY, -1.0f, 1.0f);
+          clamp(this.outputGamepadState.thumbRY + this.currentTouchStickY, -1.0f, 1.0f);
+    }
+    if (applyRsScale) {
+      float rx = this.outputGamepadState.thumbRX;
+      float ry = this.outputGamepadState.thumbRY;
+      float mag = (float) Math.sqrt(rx * rx + ry * ry);
+      if (mag > 0.0f) {
+        float k = Math.min(mag * this.rightStickSensitivity, 1.0f) / mag;
+        this.outputGamepadState.thumbRX = rx * k;
+        this.outputGamepadState.thumbRY = ry * k;
+      }
     }
     return this.outputGamepadState;
   }
@@ -1490,6 +2055,7 @@ private static class GyroSettings {
     boolean enabled;
     int mode;
     int activatorKeyCode;
+    Binding activatorBinding;
     boolean applyToRightStick;
     float sensitivityX;
     float sensitivityY;
diff --git a/app/src/main/runtime/display/xserver/Bitmask.java b/app/src/main/runtime/display/xserver/Bitmask.java
index 32d5829e6..771e273e9 100644
--- a/app/src/main/runtime/display/xserver/Bitmask.java
+++ b/app/src/main/runtime/display/xserver/Bitmask.java
@@ -4,15 +4,15 @@
 import java.util.Iterator;
 
 public class Bitmask implements Iterable<Integer> {
-  private int bits = 0;
+  private long bits = 0;
 
   public Bitmask() {}
 
-  public Bitmask(int bits) {
+  public Bitmask(long bits) {
     this.bits = bits;
   }
 
-  public boolean isSet(int flag) {
+  public boolean isSet(long flag) {
     return (flag & this.bits) != 0;
   }
 
@@ -20,17 +20,17 @@ public boolean intersects(Bitmask mask) {
     return (mask.bits & this.bits) != 0;
   }
 
-  public void set(int flag) {
+  public void set(long flag) {
     bits |= flag;
   }
 
-  public void set(int flag, boolean value) {
+  public void set(long flag, boolean value) {
     if (value) {
       set(flag);
     } else unset(flag);
   }
 
-  public void unset(int flag) {
+  public void unset(long flag) {
     bits &= ~flag;
   }
 
@@ -38,7 +38,7 @@ public boolean isEmpty() {
     return bits == 0;
   }
 
-  public int getBits() {
+  public long getBits() {
     return bits;
   }
 
@@ -48,7 +48,7 @@ public void join(Bitmask mask) {
 
   @NonNull @Override
   public Iterator<Integer> iterator() {
-    final int[] bits = {this.bits};
+    final long[] bits = {this.bits};
     return new Iterator<Integer>() {
       @Override
       public boolean hasNext() {
@@ -57,15 +57,15 @@ public boolean hasNext() {
 
       @Override
       public Integer next() {
-        int index = Integer.lowestOneBit(bits[0]);
+        long index = Long.lowestOneBit(bits[0]);
         bits[0] &= ~index;
-        return index;
+        return (int) index;
       }
     };
   }
 
   @Override
   public int hashCode() {
-    return bits;
+    return Long.hashCode(bits);
   }
 }
diff --git a/app/src/main/runtime/display/xserver/Drawable.java b/app/src/main/runtime/display/xserver/Drawable.java
index d89596eeb..6fddabed4 100644
--- a/app/src/main/runtime/display/xserver/Drawable.java
+++ b/app/src/main/runtime/display/xserver/Drawable.java
@@ -7,6 +7,7 @@
 import com.winlator.cmod.shared.util.Callback;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class Drawable extends XResource {
   public final short width;
@@ -14,49 +15,31 @@ public class Drawable extends XResource {
   public final Visual visual;
   private Texture texture = new Texture();
   private ByteBuffer data;
-  // volatile because the GLThread reads these in `isDirectScanoutContent`
-  // (called outside renderLock for the candidate-search pass) while the
-  // X-server worker thread mutates them via setDirectScanout/setScanoutSource
-  // from PresentExtension and DRI3Extension. Without volatile, the GLThread
-  // can observe stale values across frames. Long-form mutations of texture
-  // / scanoutSource still serialize on `renderLock` for atomicity with reads
-  // that take the lock (see `renderDrawable`, the Direct-Composition path).
+  // volatile: the render thread reads these outside renderLock during the
+  // direct-scanout candidate scan while the X-server worker mutates them.
   private volatile boolean directScanout = false;
   private volatile Drawable scanoutSource;
+  private short scanoutX;
+  private short scanoutY;
+  private short presentedSourceWidth;
+  private short presentedSourceHeight;
+  private boolean presentedSourceValid = false;
+  private boolean hasContent = false;
+  private Runnable onDrawListener;
+  private Callback<Drawable> onDestroyListener;
+  public final Object renderLock = new Object();
+
   /**
-   * Producer-side acquire fence FD. -1 means "no fence; buffer is ready for
-   * immediate read."
+   * Producer-side acquire fence FD, or -1 when the buffer needs no wait.
    *
-   * <p>Today in this fork the value is always -1: the in-process Java X server
-   * receives the {@code AHardwareBuffer} from the Wine client over the DRI3
-   * {@code PIXMAP_FROM_BUFFERS} unix-socket path, which the X-server worker
-   * thread processes only after the client has already submitted its Vulkan
-   * command buffer. Empirically this CPU-side handoff latency exceeds the
-   * GPU-write completion time, so we observe no tearing without an explicit
-   * fence — but this is an observation about THIS pipeline, not a Vulkan or
-   * Mesa contract. If a future codepath drives presents at a higher rate or
-   * skips that handoff cost, an explicit acquire fence will become necessary.
+   * <p>Usually -1: the X-server worker only processes DRI3 PIXMAP_FROM_BUFFERS
+   * after the client has already submitted its Vulkan commands, and that
+   * handoff latency has empirically exceeded GPU-write completion.
    *
-   * <p>Forward-compatible plumbing: when the X-server PRESENT/DRI3 parsing
-   * gains real {@code wait_fence} support, that code calls
-   * {@link #setAcquireFenceFd}. The Direct Composition push at
-   * {@code GLRenderer.maybePushDirectComposition} consumes the value under
-   * {@link #renderLock} via {@link #takeAcquireFenceFd} (atomic
-   * read-and-clear), and forwards it to
-   * {@code DirectCompositionLayer.pushBuffer} which transfers ownership to
-   * the framework via {@code ASurfaceTransaction_setBuffer}.
-   *
-   * <p>Stored as {@link java.util.concurrent.atomic.AtomicInteger} so the
-   * "consume" semantic is atomic with respect to concurrent
-   * setAcquireFenceFd writes — without it, a producer could overwrite a
-   * still-pending FD between the consumer's read and clear, leaking the
-   * old FD.
+   * <p>AtomicInteger so take-and-clear is atomic against a concurrent producer
+   * write, which would otherwise leak the previous FD.
    */
-  private final java.util.concurrent.atomic.AtomicInteger acquireFenceFd =
-      new java.util.concurrent.atomic.AtomicInteger(-1);
-  private Runnable onDrawListener;
-  private Callback<Drawable> onDestroyListener;
-  public final Object renderLock = new Object();
+  private final AtomicInteger acquireFenceFd = new AtomicInteger(-1);
 
   static {
     System.loadLibrary("winlator");
@@ -71,11 +54,14 @@ public Drawable(int id, int width, int height, Visual visual) {
     if (this.data == null) {
       throw new IllegalStateException("Drawable.data initialized as null!");
     }
+    this.presentedSourceWidth = (short) Math.max(0, Math.min(Short.MAX_VALUE, width));
+    this.presentedSourceHeight = (short) Math.max(0, Math.min(Short.MAX_VALUE, height));
   }
 
   public static Drawable fromBitmap(Bitmap bitmap) {
     Drawable drawable = new Drawable(0, bitmap.getWidth(), bitmap.getHeight(), null);
     fromBitmap(bitmap, drawable.data);
+    drawable.hasContent = true;
     return drawable;
   }
 
@@ -87,6 +73,7 @@ public void setTexture(Texture texture) {
     if (texture instanceof GPUImage) {
       ByteBuffer virtualData = ((GPUImage) texture).getVirtualData();
       if (virtualData != null) data = virtualData;
+      hasContent = true;
     }
     this.texture = texture;
   }
@@ -96,64 +83,70 @@ public Drawable getScanoutSource() {
   }
 
   public void setScanoutSource(Drawable scanoutSource) {
+    setScanoutSource(scanoutSource, (short) 0, (short) 0);
+  }
+
+  public void setScanoutSource(Drawable scanoutSource, short x, short y) {
     this.scanoutSource = scanoutSource;
-    if (texture != null) texture.setNeedsUpdate(true);
+    this.scanoutX = x;
+    this.scanoutY = y;
+    markTextureDirty(0, 0, width, height);
     if (onDrawListener != null) onDrawListener.run();
   }
 
   public void clearScanoutSource() {
     if (scanoutSource == null) return;
     scanoutSource = null;
-    if (texture != null) texture.setNeedsUpdate(true);
+    scanoutX = 0;
+    scanoutY = 0;
+    markTextureDirty(0, 0, width, height);
   }
 
-  /**
-   * Atomic read-and-clear of the acquire fence FD: returns the current value
-   * (or -1 if none) AND resets the field to -1 in a single CAS.
-   *
-   * <p>This is single-consumer "take" semantics: the caller now owns the FD
-   * and is responsible for either closing it or transferring ownership
-   * elsewhere (e.g. by passing it to {@code ASurfaceTransaction_setBuffer},
-   * which closes it via the framework). A second concurrent caller of
-   * {@code takeAcquireFenceFd} will get -1 — they did not own the original
-   * fence.
-   *
-   * <p>Returns -1 today because no producer code currently calls
-   * {@link #setAcquireFenceFd}.
-   */
-  public int takeAcquireFenceFd() {
-    return acquireFenceFd.getAndSet(-1);
+  public short getScanoutX() {
+    return scanoutX;
   }
 
-  /**
-   * Sets the producer acquire fence FD. Should be called by Present/DRI3
-   * extension code immediately before the buffer is published to the GLRenderer
-   * (i.e. before {@link #setScanoutSource}). Ownership transfers to the
-   * Drawable; the next consumer of {@link #takeAcquireFenceFd} takes
-   * ownership in turn. If the previous fence is still set (consumer hasn't
-   * taken it yet), this method closes the previous fence to avoid a leak.
-   * Pass {@code -1} to clear without setting a new fence.
-   */
-  public void setAcquireFenceFd(int fd) {
-    int prior = acquireFenceFd.getAndSet(fd);
-    if (prior >= 0 && prior != fd) {
-      try {
-        android.os.ParcelFileDescriptor.adoptFd(prior).close();
-      } catch (java.io.IOException ignored) {
-        // best-effort close; the FD is still leaked but we did our part
-      }
-    }
+  public short getScanoutY() {
+    return scanoutY;
+  }
+
+  public void setPresentedSourceSize(int width, int height) {
+    this.presentedSourceWidth = (short) Math.max(0, Math.min(Short.MAX_VALUE, width));
+    this.presentedSourceHeight = (short) Math.max(0, Math.min(Short.MAX_VALUE, height));
+    this.presentedSourceValid = this.presentedSourceWidth > 0 && this.presentedSourceHeight > 0;
+  }
+
+  public boolean hasPresentedSourceSize() {
+    return presentedSourceValid;
+  }
+
+  public short getPresentedSourceWidth() {
+    return presentedSourceWidth;
+  }
+
+  public short getPresentedSourceHeight() {
+    return presentedSourceHeight;
+  }
+
+  private void markTextureDirty(int x, int y, int width, int height) {
+    hasContent = true;
+    if (texture != null) texture.markDirty(x, y, width, height, this.width, this.height);
   }
 
   public ByteBuffer getData() {
     return data;
   }
 
+  public boolean hasContent() {
+    return hasContent;
+  }
+
   public void setData(ByteBuffer data) {
     if (data == null) {
       throw new IllegalArgumentException("Attempting to set Drawable.data to null!");
     }
     this.data = data;
+    hasContent = true;
   }
 
   public void setDirectScanout(boolean value) {
@@ -164,6 +157,36 @@ public boolean isDirectScanout() {
     return directScanout;
   }
 
+  /**
+   * Atomic read-and-clear of the acquire fence FD: returns the current value
+   * (or -1 if none) AND resets the field to -1 in a single CAS. Single-consumer
+   * "take" semantics — the caller now owns the FD and is responsible for
+   * either closing it or transferring ownership (e.g. to
+   * ASurfaceTransaction_setBuffer, which closes it via the framework).
+   */
+  public int takeAcquireFenceFd() {
+    return acquireFenceFd.getAndSet(-1);
+  }
+
+  /**
+   * Sets the producer acquire fence FD. Should be called by Present/DRI3
+   * extension code immediately before the buffer is published. Ownership
+   * transfers to this Drawable; the next consumer of
+   * {@link #takeAcquireFenceFd} takes ownership in turn. If the previous fence
+   * is still set (consumer hasn't taken it yet), this method closes the
+   * previous fence to avoid a leak. Pass {@code -1} to clear without setting.
+   */
+  public void setAcquireFenceFd(int fd) {
+    int prior = acquireFenceFd.getAndSet(fd);
+    if (prior >= 0 && prior != fd) {
+      try {
+        android.os.ParcelFileDescriptor.adoptFd(prior).close();
+      } catch (java.io.IOException ignored) {
+        // best-effort close
+      }
+    }
+  }
+
   private short getStride() {
     return texture instanceof GPUImage ? ((GPUImage) texture).getStride() : width;
   }
@@ -211,7 +234,11 @@ public void drawImage(
     this.data.rewind();
     data.rewind();
 
-    texture.setNeedsUpdate(true);
+    if (depth == 1) {
+      markTextureDirty(0, 0, width, height);
+    } else {
+      markTextureDirty(dstX, dstY, width, height);
+    }
     if (onDrawListener != null) onDrawListener.run();
   }
 
@@ -287,7 +314,7 @@ public void copyArea(
     this.data.rewind();
     drawable.data.rewind();
 
-    texture.setNeedsUpdate(true);
+    markTextureDirty(dstX, dstY, width, height);
     if (onDrawListener != null) onDrawListener.run();
   }
 
@@ -306,7 +333,7 @@ public void fillRect(int x, int y, int width, int height, int color) {
         (short) x, (short) y, (short) width, (short) height, color, this.getStride(), this.data);
     this.data.rewind();
 
-    texture.setNeedsUpdate(true);
+    markTextureDirty(x, y, width, height);
     if (onDrawListener != null) onDrawListener.run();
   }
 
@@ -336,7 +363,11 @@ public void drawLine(int x0, int y0, int x1, int y1, int color, int lineWidth) {
 
     this.data.rewind();
 
-    texture.setNeedsUpdate(true);
+    int minX = Math.min(x0, x1);
+    int minY = Math.min(y0, y1);
+    int maxX = Math.max(x0, x1) + lineWidth;
+    int maxY = Math.max(y0, y1) + lineWidth;
+    markTextureDirty(minX, minY, maxX - minX, maxY - minY);
     if (onDrawListener != null) onDrawListener.run();
   }
 
@@ -362,7 +393,7 @@ public void drawAlphaMaskedBitmap(
         this.data);
     this.data.rewind();
 
-    texture.setNeedsUpdate(true);
+    markTextureDirty(0, 0, width, height);
     if (onDrawListener != null) onDrawListener.run();
   }
 
diff --git a/app/src/main/runtime/display/xserver/DrawableManager.java b/app/src/main/runtime/display/xserver/DrawableManager.java
index 112b60041..705a7bfda 100644
--- a/app/src/main/runtime/display/xserver/DrawableManager.java
+++ b/app/src/main/runtime/display/xserver/DrawableManager.java
@@ -2,8 +2,8 @@
 
 import android.util.SparseArray;
 import android.util.Log;
-import com.winlator.cmod.runtime.display.renderer.GLRenderer;
 import com.winlator.cmod.runtime.display.renderer.Texture;
+import com.winlator.cmod.runtime.display.renderer.VulkanRenderer;
 import com.winlator.cmod.shared.util.Callback;
 
 public class DrawableManager extends XResourceManager
@@ -61,7 +61,7 @@ public void removeDrawable(int id) {
     detachScanoutUsers(drawable);
 
     final Texture texture = drawable.getTexture();
-    GLRenderer renderer = xServer.getRenderer();
+    VulkanRenderer renderer = xServer.getRenderer();
     if (texture != null && renderer != null) renderer.xServerView.queueEvent(texture::destroy);
 
     Callback<Drawable> onDestroyListener = drawable.getOnDestroyListener();
@@ -99,14 +99,10 @@ private void detachScanoutUsers(Drawable source) {
         if (source.getData() != null
             && source.visual != null
             && content.visual.depth == source.visual.depth) {
-          content.copyArea(
-              (short) 0,
-              (short) 0,
-              (short) 0,
-              (short) 0,
-              source.width,
-              source.height,
-              source);
+          if (!copyScanoutRegion(content, source)) {
+            content.clearScanoutSource();
+            xServer.windowManager.triggerOnUpdateWindowContent(window);
+          }
         } else {
           content.clearScanoutSource();
           xServer.windowManager.triggerOnUpdateWindowContent(window);
@@ -114,123 +110,26 @@ private void detachScanoutUsers(Drawable source) {
       }
     }
   }
-}
 
-// package com.winlator.cmod.runtime.display.xserver;
-//
-// import android.util.SparseArray;
-//
-// import com.winlator.cmod.shared.util.Callback;
-// import com.winlator.cmod.runtime.display.renderer.GLRenderer;
-// import com.winlator.cmod.runtime.display.renderer.Texture;
-// import com.winlator.cmod.shared.ui.widget.XServerView;
-//
-// import java.util.Objects;
-//
-/// **
-// * Merged version of DrawableManager based on original Java code and new Smali changes.
-// */
-// public class DrawableManager extends XResourceManager
-//        implements XResourceManager.OnResourceLifecycleListener {
-//
-//    private final XServer xServer;
-//
-//    /**
-//     * A SparseArray mapping resource IDs to their corresponding Drawables.
-//     */
-//    private final SparseArray<Drawable> drawables = new SparseArray<>();
-//
-//    public DrawableManager(XServer xServer) {
-//        this.xServer = xServer;
-//        xServer.pixmapManager.addOnResourceLifecycleListener(this);
-//    }
-//
-//    /**
-//     * Returns the Drawable with a given ID.
-//     */
-//    public Drawable getDrawable(int id) {
-//        return drawables.get(id);
-//    }
-//
-//    /**
-//     * Creates a Drawable using a specified depth, which is mapped to a Visual.
-//     */
-//    public Drawable createDrawable(int id, short width, short height, byte depth) {
-//        Visual visual = xServer.pixmapManager.getVisualForDepth(depth);
-//        return createDrawable(id, width, height, visual);
-//    }
-//
-//    /**
-//     * Creates a Drawable with the given visual, or returns null if it already exists.
-//     * If id == 0, returns a new Drawable without putting it in the array.
-//     */
-//    public Drawable createDrawable(int id, short width, short height, Visual visual) {
-//        if (id == 0) {
-//            // Just create an ephemeral Drawable (not tracked in 'drawables')
-//            return new Drawable(id, width, height, visual);
-//        }
-//        // If a Drawable already exists under this ID, return null
-//        if (drawables.indexOfKey(id) >= 0) {
-//            return null;
-//        }
-//        // Otherwise, create and store a new Drawable
-//        Drawable drawable = new Drawable(id, width, height, visual);
-//        drawables.put(id, drawable);
-//        return drawable;
-//    }
-//
-//    /**
-//     * Removes a Drawable from the manager by ID, cleaning up texture and calling
-// onDestroyListener.
-//     */
-//    public void removeDrawable(int id) {
-//        Drawable drawable = drawables.get(id);
-//        if (drawable == null) {
-//            return; // Already removed or never existed
-//        }
-//
-//        // Clean up the Texture on the GL thread
-//        Texture texture = drawable.getTexture();
-//        if (texture != null) {
-//            // The new Smali code calls a synthetic lambda from VortekRendererComponent
-//            // which presumably destroys or cleans up the texture. Here, we replicate that:
-//            GLRenderer renderer = xServer.getRenderer();
-//            XServerView xServerView = renderer.xServerView;
-//
-//            Objects.requireNonNull(texture);
-//            xServerView.queueEvent(() -> {
-//                // In the original code, it was simply `texture.destroy()`
-//                // We'll keep that logic unless the synthetic lambda does something extra.
-//                texture.destroy();
-//            });
-//        }
-//
-//        // Fire any onDestroy callback
-//        Callback<Drawable> onDestroyListener = drawable.getOnDestroyListener();
-//        if (onDestroyListener != null) {
-//            onDestroyListener.call(drawable);
-//        }
-//
-//        // Clear the onDrawListener and remove from our tracking
-//        drawable.setOnDrawListener(null);
-//        drawables.remove(id);
-//    }
-//
-//    /**
-//     * If a resource is freed from the PixmapManager (e.g., a Pixmap), remove its Drawable.
-//     */
-//    @Override
-//    public void onFreeResource(XResource resource) {
-//        if (resource instanceof Pixmap) {
-//            Pixmap pixmap = (Pixmap) resource;
-//            removeDrawable(pixmap.drawable.id);
-//        }
-//    }
-//
-//    /**
-//     * Convenience method to get the manager's default visual.
-//     */
-//    public Visual getVisual() {
-//        return xServer.pixmapManager.visual;
-//    }
-// }
+  private static boolean copyScanoutRegion(Drawable content, Drawable source) {
+    int xOff = content.getScanoutX();
+    int yOff = content.getScanoutY();
+    int srcX = Math.max(0, -xOff);
+    int srcY = Math.max(0, -yOff);
+    int dstX = Math.max(0, xOff);
+    int dstY = Math.max(0, yOff);
+    int width = Math.min(source.width - srcX, content.width - dstX);
+    int height = Math.min(source.height - srcY, content.height - dstY);
+    if (width <= 0 || height <= 0) return false;
+
+    content.copyArea(
+        (short) srcX,
+        (short) srcY,
+        (short) dstX,
+        (short) dstY,
+        (short) width,
+        (short) height,
+        source);
+    return true;
+  }
+}
diff --git a/app/src/main/runtime/display/xserver/GrabManager.java b/app/src/main/runtime/display/xserver/GrabManager.java
index 2c24d1b7c..780022ba2 100644
--- a/app/src/main/runtime/display/xserver/GrabManager.java
+++ b/app/src/main/runtime/display/xserver/GrabManager.java
@@ -8,6 +8,7 @@ public class GrabManager implements WindowManager.OnWindowModificationListener {
   private boolean ownerEvents;
   private boolean releaseWithButtons;
   private EventListener eventListener;
+  private Window confineToWindow;
   private final XServer xServer;
 
   public GrabManager(XServer xServer) {
@@ -42,18 +43,22 @@ public XClient getClient() {
     return eventListener != null ? eventListener.client : null;
   }
 
+  public android.graphics.Rect getConfinementBounds() {
+    return confineToWindow != null ? confineToWindow.getAbsoluteBounds() : null;
+  }
+
   public void deactivatePointerGrab() {
     if (window != null) {
       xServer.inputDeviceManager.sendEnterLeaveNotify(
           window, xServer.inputDeviceManager.getPointWindow(), PointerWindowEvent.Mode.UNGRAB);
       window = null;
       eventListener = null;
-      xServer.windowManager.setConfinedWindow(null);
+      confineToWindow = null;
     }
   }
 
   private void activatePointerGrab(
-      Window window, EventListener eventListener, boolean ownerEvents, boolean releaseWithButtons) {
+      Window window, EventListener eventListener, boolean ownerEvents, boolean releaseWithButtons, Window confineToWindow) {
     if (this.window == null) {
       xServer.inputDeviceManager.sendEnterLeaveNotify(
           xServer.inputDeviceManager.getPointWindow(), window, PointerWindowEvent.Mode.GRAB);
@@ -62,16 +67,22 @@ private void activatePointerGrab(
     this.releaseWithButtons = releaseWithButtons;
     this.ownerEvents = ownerEvents;
     this.eventListener = eventListener;
+    this.confineToWindow = confineToWindow;
   }
 
   public void activatePointerGrab(
       Window window, boolean ownerEvents, Bitmask eventMask, XClient client) {
-    activatePointerGrab(window, new EventListener(client, eventMask), ownerEvents, false);
+    activatePointerGrab(window, ownerEvents, eventMask, client, null);
+  }
+
+  public void activatePointerGrab(
+      Window window, boolean ownerEvents, Bitmask eventMask, XClient client, Window confineToWindow) {
+    activatePointerGrab(window, new EventListener(client, eventMask), ownerEvents, false, confineToWindow);
   }
 
   public void activatePointerGrab(Window window) {
     EventListener eventListener = window.getButtonPressListener();
     activatePointerGrab(
-        window, eventListener, eventListener.isInterestedIn(Event.OWNER_GRAB_BUTTON), true);
+        window, eventListener, eventListener.isInterestedIn(Event.OWNER_GRAB_BUTTON), true, null);
   }
 }
diff --git a/app/src/main/runtime/display/xserver/GraphicsContextManager.java b/app/src/main/runtime/display/xserver/GraphicsContextManager.java
index 65614765d..2a9b2e495 100644
--- a/app/src/main/runtime/display/xserver/GraphicsContextManager.java
+++ b/app/src/main/runtime/display/xserver/GraphicsContextManager.java
@@ -29,8 +29,8 @@ public void freeGraphicsContext(int id) {
 
   public void updateGraphicsContext(
       GraphicsContext dstContext, GraphicsContext srcContext, Bitmask valueMask) {
-    for (int index : valueMask) {
-      switch (index) {
+    for (long index : valueMask) {
+      switch ((int) index) {
         case GraphicsContext.FLAG_FUNCTION:
           dstContext.setFunction(srcContext.getFunction());
           break;
@@ -73,8 +73,8 @@ public void updateGraphicsContext(
 
   public void updateGraphicsContext(
       GraphicsContext graphicsContext, Bitmask valueMask, XInputStream inputStream) {
-    for (int index : valueMask) {
-      switch (index) {
+    for (long index : valueMask) {
+      switch ((int) index) {
         case GraphicsContext.FLAG_FUNCTION:
           graphicsContext.setFunction(GraphicsContext.Function.values()[inputStream.readInt()]);
           break;
diff --git a/app/src/main/runtime/display/xserver/InputDeviceManager.java b/app/src/main/runtime/display/xserver/InputDeviceManager.java
index a85ad7bf9..55db3439b 100644
--- a/app/src/main/runtime/display/xserver/InputDeviceManager.java
+++ b/app/src/main/runtime/display/xserver/InputDeviceManager.java
@@ -65,7 +65,8 @@ private void updatePointWindow() {
     Window pointWindow =
         xServer.windowManager.findPointWindow(
             xServer.pointer.getClampedX(), xServer.pointer.getClampedY());
-    this.pointWindow = pointWindow != null ? pointWindow : xServer.windowManager.rootWindow;
+    Window resolved = pointWindow != null ? pointWindow : xServer.windowManager.rootWindow;
+    this.pointWindow = resolved;
   }
 
   public Window getPointWindow() {
@@ -238,6 +239,7 @@ public void onPointerButtonRelease(Pointer.Button button) {
   @Override
   public void onPointerMove(short x, short y) {
     updatePointWindow();
+
     Bitmask eventMask = createPointerEventMask();
     Window grabWindow = xServer.grabManager.getWindow();
     Window window =
diff --git a/app/src/main/runtime/display/xserver/Pointer.java b/app/src/main/runtime/display/xserver/Pointer.java
index abc4f1a88..46c380111 100644
--- a/app/src/main/runtime/display/xserver/Pointer.java
+++ b/app/src/main/runtime/display/xserver/Pointer.java
@@ -66,13 +66,6 @@ public short getClampedY() {
   }
 
   public void setPosition(int x, int y) {
-    Window confinedWindow = xServer.windowManager.getConfinedWindow();
-    if (confinedWindow != null) {
-      short rootX = confinedWindow.getRootX();
-      short rootY = confinedWindow.getRootY();
-      x = Mathf.clamp(x, rootX, rootX + confinedWindow.getWidth() - 1);
-      y = Mathf.clamp(y, rootY, rootY + confinedWindow.getHeight() - 1);
-    }
     setX(x);
     setY(y);
     triggerOnPointerMove(this.x, this.y);
diff --git a/app/src/main/runtime/display/xserver/ScreenInfo.java b/app/src/main/runtime/display/xserver/ScreenInfo.java
index 20e090e27..c46b2ae3e 100644
--- a/app/src/main/runtime/display/xserver/ScreenInfo.java
+++ b/app/src/main/runtime/display/xserver/ScreenInfo.java
@@ -1,16 +1,27 @@
 package com.winlator.cmod.runtime.display.xserver;
 
 public class ScreenInfo {
-  public final short width;
-  public final short height;
+  public volatile short width;
+  public volatile short height;
 
   public ScreenInfo(String value) {
     String[] parts = value.split("x");
-    width = Short.parseShort(parts[0]);
-    height = Short.parseShort(parts[1]);
+    setSize(Integer.parseInt(parts[0]), Integer.parseInt(parts[1]));
   }
 
   public ScreenInfo(int width, int height) {
+    setSize(width, height);
+  }
+
+  public void setSize(ScreenInfo other) {
+    if (other == null) return;
+    setSize(other.width, other.height);
+  }
+
+  public void setSize(int width, int height) {
+    if (width <= 0 || height <= 0 || width > Short.MAX_VALUE || height > Short.MAX_VALUE) {
+      throw new IllegalArgumentException("Invalid screen size " + width + "x" + height);
+    }
     this.width = (short) width;
     this.height = (short) height;
   }
diff --git a/app/src/main/runtime/display/xserver/Window.java b/app/src/main/runtime/display/xserver/Window.java
index 972019f66..87735ab06 100644
--- a/app/src/main/runtime/display/xserver/Window.java
+++ b/app/src/main/runtime/display/xserver/Window.java
@@ -50,7 +50,6 @@ public enum WMHints {
   private short height;
   private short borderWidth;
   private Window parent;
-  private boolean confined = false;
   public final XClient originClient;
   public final WindowAttributes attributes = new WindowAttributes(this);
   private final SparseArray<Property> properties = new SparseArray<>();
@@ -125,14 +124,6 @@ public void setParent(Window parent) {
     this.parent = parent;
   }
 
-  public boolean isConfined() {
-    return confined;
-  }
-
-  public void setConfined(boolean confined) {
-    this.confined = confined;
-  }
-
   public Property getProperty(int id) {
     return properties.get(id);
   }
@@ -362,6 +353,12 @@ public short getRootY() {
     return rootY;
   }
 
+  public android.graphics.Rect getAbsoluteBounds() {
+    short rootX = getRootX();
+    short rootY = getRootY();
+    return new android.graphics.Rect(rootX, rootY, width + rootX, height + rootY);
+  }
+
   public Window getAncestorWithEventMask(Bitmask eventMask) {
     Window window = this;
     while (window != null) {
diff --git a/app/src/main/runtime/display/xserver/WindowAttributes.java b/app/src/main/runtime/display/xserver/WindowAttributes.java
index 72102273b..6fef540f2 100644
--- a/app/src/main/runtime/display/xserver/WindowAttributes.java
+++ b/app/src/main/runtime/display/xserver/WindowAttributes.java
@@ -148,8 +148,8 @@ public void setEnabled(boolean enabled) {
   }
 
   public void update(Bitmask valueMask, XInputStream inputStream, XClient client) {
-    for (int index : valueMask) {
-      switch (index) {
+    for (long index : valueMask) {
+      switch ((int) index) {
         case FLAG_BACKGROUND_PIXEL:
           window.getContent().fillColor(inputStream.readInt());
           break;
diff --git a/app/src/main/runtime/display/xserver/WindowManager.java b/app/src/main/runtime/display/xserver/WindowManager.java
index 7c6efbe2e..2c60c9594 100644
--- a/app/src/main/runtime/display/xserver/WindowManager.java
+++ b/app/src/main/runtime/display/xserver/WindowManager.java
@@ -1,5 +1,6 @@
 package com.winlator.cmod.runtime.display.xserver;
 
+import android.util.Log;
 import android.util.SparseArray;
 import com.winlator.cmod.runtime.display.connector.XInputStream;
 import com.winlator.cmod.runtime.display.xserver.errors.BadIdChoice;
@@ -18,14 +19,23 @@
 import java.util.List;
 
 public class WindowManager extends XResourceManager {
+  private static final String SGSR_RESIZE_TAG = "SGSRResize";
+
   public enum FocusRevertTo {
     NONE,
     POINTER_ROOT,
     PARENT
   }
 
+  public enum FrameSource {
+    UNKNOWN,
+    PRESENT,
+    PUT_IMAGE,
+    MIT_SHM,
+    DRI3_BUFFER
+  }
+
   public final Window rootWindow;
-  private Window confinedWindow;
   private final SparseArray<Window> windows = new SparseArray<>();
   public final DrawableManager drawableManager;
   private Window focusedWindow;
@@ -51,6 +61,10 @@ default void onUpdateWindowAttributes(Window window, Bitmask mask) {}
     default void onModifyWindowProperty(Window window, Property property) {}
 
     default void onFramePresented(Window window) {}
+
+    default void onFramePresented(Window window, FrameSource source, int serial) {
+      onFramePresented(window);
+    }
   }
 
   public WindowManager(ScreenInfo screenInfo, DrawableManager drawableManager) {
@@ -68,6 +82,19 @@ public Window getWindow(int id) {
     return windows.get(id);
   }
 
+  public boolean resizeRootWindow(short width, short height) {
+    if (width <= 0 || height <= 0) return false;
+    short oldWidth = rootWindow.getWidth();
+    short oldHeight = rootWindow.getHeight();
+    if (oldWidth == width && oldHeight == height) return false;
+
+    Log.i(SGSR_RESIZE_TAG, "resizeRootWindow: " + oldWidth + "x" + oldHeight +
+        " -> " + width + "x" + height);
+    resizeWindowForScreenChange(rootWindow, (short) 0, (short) 0, width, height);
+    resizeFullscreenDescendants(rootWindow, oldWidth, oldHeight, width, height);
+    return true;
+  }
+
   public List<Window> getWindows() {
     ArrayList<Window> list = new ArrayList<>();
     for (int i = 0; i < windows.size(); i++) list.add(windows.valueAt(i));
@@ -134,16 +161,6 @@ public Window getFocusedWindow() {
     return focusedWindow;
   }
 
-  public Window getConfinedWindow() {
-    return confinedWindow;
-  }
-
-  public void setConfinedWindow(Window window) {
-    if (confinedWindow != null) confinedWindow.setConfined(false);
-    confinedWindow = window;
-    if (confinedWindow != null) confinedWindow.setConfined(true);
-  }
-
   public void revertFocus() {
     switch (focusRevertTo) {
       case NONE:
@@ -153,7 +170,8 @@ public void revertFocus() {
         focusedWindow = rootWindow;
         break;
       case PARENT:
-        if (focusedWindow.getParent() != null) focusedWindow = focusedWindow.getParent();
+        if (focusedWindow != null && focusedWindow.getParent() != null)
+          focusedWindow = focusedWindow.getParent();
         break;
     }
   }
@@ -249,6 +267,74 @@ private void changeWindowGeometry(Window window, short x, short y, short width,
     }
   }
 
+  private void resizeWindowForScreenChange(Window window, short x, short y, short width, short height) {
+    short oldX = window.getX();
+    short oldY = window.getY();
+    short oldWidth = window.getWidth();
+    short oldHeight = window.getHeight();
+    boolean resized = window.getWidth() != width || window.getHeight() != height;
+    boolean moved = window.getX() != x || window.getY() != y;
+    if (!resized && !moved) return;
+
+    Log.i(SGSR_RESIZE_TAG, "resizeWindow id=" + window.id +
+        (window == rootWindow ? " root" : "") + ": " +
+        oldWidth + "x" + oldHeight + "@" + oldX + "," + oldY + " -> " +
+        width + "x" + height + "@" + x + "," + y +
+        " mapped=" + window.attributes.isMapped());
+
+    if (resized && window.isInputOutput()) {
+      Drawable oldContent = window.getContent();
+      drawableManager.removeDrawable(oldContent.id);
+      Drawable newContent =
+          drawableManager.createDrawable(oldContent.id, width, height, oldContent.visual);
+      newContent.setOnDrawListener(() -> triggerOnUpdateWindowContent(window));
+      window.setContent(newContent);
+    }
+
+    window.setX(x);
+    window.setY(y);
+    window.setWidth(width);
+    window.setHeight(height);
+
+    Window parent = window.getParent();
+    Window previousSibling = window.previousSibling();
+    window.sendEvent(
+        Event.STRUCTURE_NOTIFY,
+        new ConfigureNotify(
+            window, window, previousSibling, x, y, width, height, window.getBorderWidth(),
+            window.attributes.isOverrideRedirect()));
+    if (parent != null) {
+      parent.sendEvent(
+          Event.SUBSTRUCTURE_NOTIFY,
+          new ConfigureNotify(
+              parent, window, previousSibling, x, y, width, height, window.getBorderWidth(),
+              window.attributes.isOverrideRedirect()));
+    }
+
+    triggerOnUpdateWindowGeometry(window, resized);
+    if (resized && window.isInputOutput() && window.attributes.isMapped()) {
+      window.sendEvent(new Expose(window));
+    }
+  }
+
+  private void resizeFullscreenDescendants(Window parent, short oldWidth, short oldHeight,
+                                           short width, short height) {
+    List<Window> children = new ArrayList<>(parent.getChildren());
+    for (Window child : children) {
+      boolean coveredOldScreen =
+          child.getX() <= 0
+              && child.getY() <= 0
+              && child.getX() + child.getWidth() >= oldWidth
+              && child.getY() + child.getHeight() >= oldHeight;
+      if (coveredOldScreen) {
+        Log.i(SGSR_RESIZE_TAG, "resizeFullscreenDescendant id=" + child.id +
+            ": covered old screen " + oldWidth + "x" + oldHeight);
+        resizeWindowForScreenChange(child, (short) 0, (short) 0, width, height);
+      }
+      resizeFullscreenDescendants(child, oldWidth, oldHeight, width, height);
+    }
+  }
+
   private void changeWindowZOrder(Window.StackMode stackMode, Window window, Window sibling) {
     Window parent = window.getParent();
     switch (stackMode) {
@@ -271,8 +357,8 @@ public void configureWindow(Window window, Bitmask valueMask, XInputStream input
     Window sibling = null;
     Window.StackMode stackMode = null;
 
-    for (int index : valueMask) {
-      switch (index) {
+    for (long index : valueMask) {
+      switch ((int) index) {
         case Window.FLAG_X:
           x = (short) inputStream.readInt();
           break;
@@ -348,65 +434,95 @@ private Window findPointWindow(Window window, short rootX, short rootY) {
 
   public void addOnWindowModificationListener(
       OnWindowModificationListener onWindowModificationListener) {
-    onWindowModificationListeners.add(onWindowModificationListener);
+    synchronized (onWindowModificationListeners) {
+      onWindowModificationListeners.add(onWindowModificationListener);
+    }
   }
 
   public void removeOnWindowModificationListener(
       OnWindowModificationListener onWindowModificationListener) {
-    onWindowModificationListeners.remove(onWindowModificationListener);
+    synchronized (onWindowModificationListeners) {
+      onWindowModificationListeners.remove(onWindowModificationListener);
+    }
   }
 
   private void triggerOnMapWindow(Window window) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onMapWindow(window);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onMapWindow(window);
+      }
     }
   }
 
   private void triggerOnUnmapWindow(Window window) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onUnmapWindow(window);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onUnmapWindow(window);
+      }
     }
   }
 
   public void triggerOnDestroyWindow(Window window) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onDestroyWindow(window);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onDestroyWindow(window);
+      }
     }
   }
 
   private void triggerOnChangeWindowZOrder(Window window) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onChangeWindowZOrder(window);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onChangeWindowZOrder(window);
+      }
     }
   }
 
   protected void triggerOnUpdateWindowContent(Window window) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onUpdateWindowContent(window);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        try {
+          onWindowModificationListeners.get(i).onUpdateWindowContent(window);
+        } catch (Throwable t) {
+          Log.e("WindowManager", "onUpdateWindowContent listener threw", t);
+        }
+      }
     }
   }
 
   protected void triggerOnUpdateWindowGeometry(Window window, boolean resized) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onUpdateWindowGeometry(window, resized);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onUpdateWindowGeometry(window, resized);
+      }
     }
   }
 
   public void triggerOnUpdateWindowAttributes(Window window, Bitmask mask) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onUpdateWindowAttributes(window, mask);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onUpdateWindowAttributes(window, mask);
+      }
     }
   }
 
   public void triggerOnModifyWindowProperty(Window window, Property property) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onModifyWindowProperty(window, property);
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onModifyWindowProperty(window, property);
+      }
     }
   }
 
   public void triggerOnFramePresented(Window window) {
-    for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
-      onWindowModificationListeners.get(i).onFramePresented(window);
+    triggerOnFramePresented(window, FrameSource.UNKNOWN, 0);
+  }
+
+  public void triggerOnFramePresented(Window window, FrameSource source, int serial) {
+    synchronized (onWindowModificationListeners) {
+      for (int i = onWindowModificationListeners.size() - 1; i >= 0; i--) {
+        onWindowModificationListeners.get(i).onFramePresented(window, source, serial);
+      }
     }
   }
 }
diff --git a/app/src/main/runtime/display/xserver/XClient.java b/app/src/main/runtime/display/xserver/XClient.java
index 95fa17dd6..de8633f1b 100644
--- a/app/src/main/runtime/display/xserver/XClient.java
+++ b/app/src/main/runtime/display/xserver/XClient.java
@@ -19,7 +19,6 @@ public class XClient implements XResourceManager.OnResourceLifecycleListener {
   private final XOutputStream outputStream;
   private final ArrayMap<Window, EventListener> eventListeners = new ArrayMap<>();
   private final ArrayList<XResource> resources = new ArrayList<>();
-  private long nextFrameTimeNanos = 0;
 
   public XClient(XServer xServer, XInputStream inputStream, XOutputStream outputStream) {
 
@@ -154,47 +153,4 @@ public void onFreeResource(XResource resource) {
   public boolean isValidResourceId(int id) {
     return xServer.resourceIDs.isInInterval(id, resourceIDBase);
   }
-
-  public void enforceAbsoluteFramerate() {
-    com.winlator.cmod.runtime.display.renderer.GLRenderer renderer = xServer.getRenderer();
-    if (renderer == null) return;
-
-    int targetFps = renderer.getFpsLimit();
-    if (targetFps <= 0) {
-      nextFrameTimeNanos = 0;
-      return;
-    }
-
-    long targetFrameTime = 1_000_000_000L / targetFps;
-    long now = System.nanoTime();
-
-    // HARD RESYNC: If we are more than 100ms late, reset the clock heartbeat.
-    // This prevents "speed-up" stutters after loading screens.
-    if (nextFrameTimeNanos == 0 || now > nextFrameTimeNanos + 100_000_000L) {
-      nextFrameTimeNanos = now + targetFrameTime;
-    }
-
-    long sleepTime = nextFrameTimeNanos - now;
-
-    // Only sleep if we are actually early by more than 0.5ms (VSync Bias)
-    if (sleepTime > 500_000L) {
-      // Deep sleep for the bulk of the time.
-      // 4ms buffer provides maximum stability against Android OS jitter.
-      if (sleepTime > 4_000_000L) {
-        long sleepMs = (sleepTime - 4_000_000L) / 1_000_000L;
-        try {
-          Thread.sleep(sleepMs);
-        } catch (InterruptedException ignored) {}
-      }
-
-      // High-precision spin for the final 4ms.
-      // This is the "Unity Style" heart-beat that guarantees VSync alignment.
-      while (System.nanoTime() < nextFrameTimeNanos) {
-        // Spin lock for exact nanosecond precision
-      }
-    }
-
-    // Advance to the next heartbeat
-    nextFrameTimeNanos += targetFrameTime;
-  }
 }
diff --git a/app/src/main/runtime/display/xserver/XClientRequestHandler.java b/app/src/main/runtime/display/xserver/XClientRequestHandler.java
index ad71d617c..656f9a7f6 100644
--- a/app/src/main/runtime/display/xserver/XClientRequestHandler.java
+++ b/app/src/main/runtime/display/xserver/XClientRequestHandler.java
@@ -85,7 +85,7 @@ private void sendServerInformation(XClient client, XOutputStream outputStream)
       outputStream.writeInt(0);
       outputStream.writeInt(0xffffff);
       outputStream.writeInt(0x000000);
-      outputStream.writeInt(client.xServer.windowManager.rootWindow.getAllEventMasks().getBits());
+      outputStream.writeInt((int) client.xServer.windowManager.rootWindow.getAllEventMasks().getBits());
       outputStream.writeShort(client.xServer.screenInfo.width);
       outputStream.writeShort(client.xServer.screenInfo.height);
       outputStream.writeShort(client.xServer.screenInfo.getWidthInMillimeters());
@@ -213,6 +213,7 @@ private boolean handleNormalRequest(
                   XServer.Lockable.INPUT_DEVICE)) {
             WindowRequests.destroySubWindows(client, inputStream, outputStream);
           }
+          break;
         case ClientOpcodes.REPARENT_WINDOW:
           try (XLock lock = client.xServer.lock(XServer.Lockable.WINDOW_MANAGER)) {
             WindowRequests.reparentWindow(client, inputStream, outputStream);
@@ -428,14 +429,10 @@ private boolean handleNormalRequest(
           }
           break;
         case ClientOpcodes.PUT_IMAGE:
-          boolean isLargeImage = false;
           try (XLock lock =
               client.xServer.lock(
                   XServer.Lockable.DRAWABLE_MANAGER, XServer.Lockable.GRAPHIC_CONTEXT_MANAGER)) {
-            isLargeImage = DrawRequests.putImage(client, inputStream, outputStream);
-          }
-          if (isLargeImage) {
-            client.enforceAbsoluteFramerate();
+            DrawRequests.putImage(client, inputStream, outputStream);
           }
           break;
         case ClientOpcodes.GET_IMAGE:
diff --git a/app/src/main/runtime/display/xserver/XServer.java b/app/src/main/runtime/display/xserver/XServer.java
index 609f0aea9..4877170d7 100644
--- a/app/src/main/runtime/display/xserver/XServer.java
+++ b/app/src/main/runtime/display/xserver/XServer.java
@@ -1,7 +1,10 @@
 package com.winlator.cmod.runtime.display.xserver;
 
+import android.util.Log;
 import android.util.SparseArray;
-import com.winlator.cmod.runtime.display.renderer.GLRenderer;
+import com.winlator.cmod.shared.math.Mathf;
+import com.winlator.cmod.runtime.display.renderer.VulkanRenderer;
+import com.winlator.cmod.runtime.display.winhandler.MouseEventFlags;
 import com.winlator.cmod.runtime.display.winhandler.WinHandler;
 import com.winlator.cmod.runtime.display.xserver.extensions.BigReqExtension;
 import com.winlator.cmod.runtime.display.xserver.extensions.DRI3Extension;
@@ -9,12 +12,15 @@
 import com.winlator.cmod.runtime.display.xserver.extensions.MITSHMExtension;
 import com.winlator.cmod.runtime.display.xserver.extensions.PresentExtension;
 import com.winlator.cmod.runtime.display.xserver.extensions.SyncExtension;
+import com.winlator.cmod.runtime.display.xserver.extensions.XInput2Extension;
 import com.winlator.cmod.shared.android.CursorLocker;
 import java.nio.charset.Charset;
 import java.util.EnumMap;
 import java.util.concurrent.locks.ReentrantLock;
 
 public class XServer {
+  private static final String SGSR_RESIZE_TAG = "SGSRResize";
+
   public enum Lockable {
     WINDOW_MANAGER,
     PIXMAP_MANAGER,
@@ -43,7 +49,7 @@ public enum Lockable {
   public final GrabManager grabManager;
   public final CursorLocker cursorLocker;
   private SHMSegmentManager shmSegmentManager;
-  private GLRenderer renderer;
+  private VulkanRenderer renderer;
   private WinHandler winHandler;
   private final EnumMap<Lockable, ReentrantLock> locks = new EnumMap<>(Lockable.class);
   private boolean relativeMouseMovement = false;
@@ -106,11 +112,15 @@ public void setSimulateTouchScreen(boolean simulateTouchScreen) {
     this.simulateTouchScreen = simulateTouchScreen;
   }
 
-  public GLRenderer getRenderer() {
+  public VulkanRenderer getRenderer() {
     return renderer;
   }
 
-  public void setRenderer(GLRenderer renderer) {
+  public GrabManager getGrabManager() {
+    return grabManager;
+  }
+
+  public void setRenderer(VulkanRenderer renderer) {
     this.renderer = renderer;
   }
 
@@ -130,6 +140,25 @@ public void setSHMSegmentManager(SHMSegmentManager shmSegmentManager) {
     this.shmSegmentManager = shmSegmentManager;
   }
 
+  public boolean resizeScreen(ScreenInfo newScreenInfo) {
+    if (newScreenInfo == null) return false;
+    try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.DRAWABLE_MANAGER, Lockable.INPUT_DEVICE)) {
+      String oldScreenInfo = screenInfo.toString();
+      Log.i(SGSR_RESIZE_TAG, "resizeScreen requested: current='" + oldScreenInfo +
+          "' target='" + newScreenInfo + "'");
+      if (screenInfo.width == newScreenInfo.width && screenInfo.height == newScreenInfo.height) {
+        Log.i(SGSR_RESIZE_TAG, "resizeScreen no-op: screen already " + oldScreenInfo);
+        return false;
+      }
+      screenInfo.setSize(newScreenInfo);
+      windowManager.resizeRootWindow(screenInfo.width, screenInfo.height);
+      pointer.setPosition(pointer.getClampedX(), pointer.getClampedY());
+      Log.i(SGSR_RESIZE_TAG, "resizeScreen applied: '" + oldScreenInfo + "' -> '" +
+          screenInfo + "' pointer=" + pointer.getX() + "," + pointer.getY());
+      return true;
+    }
+  }
+
   public void stop() {
     cursorLocker.stop();
     renderer = null;
@@ -194,19 +223,90 @@ public void injectPointerMove(int x, int y) {
 
   public void injectPointerMoveDelta(int dx, int dy) {
     try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
-      pointer.setPosition(pointer.getX() + dx, pointer.getY() + dy);
+      int beforeX = pointer.getX();
+      int beforeY = pointer.getY();
+      int x = beforeX + dx;
+      int y = beforeY + dy;
+
+      int maxX = screenInfo.width - 1;
+      int maxY = screenInfo.height - 1;
+      android.graphics.Rect confinement = grabManager.getConfinementBounds();
+      if (confinement != null) {
+        int minX = Math.max(0, confinement.left);
+        int minY = Math.max(0, confinement.top);
+        int maxX2 = Math.min(maxX, confinement.right - 1);
+        int maxY2 = Math.min(maxY, confinement.bottom - 1);
+        x = Mathf.clamp(x, minX, maxX2);
+        y = Mathf.clamp(y, minY, maxY2);
+        pointer.setPosition(x, y);
+      } else {
+        short softMarginX = (short) (screenInfo.width * 0.05f);
+        short softMarginY = (short) (screenInfo.height * 0.05f);
+        x = Mathf.clamp(x, -softMarginX, (screenInfo.width - 1) + softMarginX);
+        y = Mathf.clamp(y, -softMarginY, (screenInfo.height - 1) + softMarginY);
+        pointer.setPosition(x, y);
+
+        int clampedX = x;
+        int clampedY = y;
+        if (x < 0) clampedX = 0;
+        else if (x > screenInfo.width - 1) clampedX = screenInfo.width - 1;
+        if (y < 0) clampedY = 0;
+        else if (y > screenInfo.height - 1) clampedY = screenInfo.height - 1;
+        pointer.setX(clampedX);
+        pointer.setY(clampedY);
+      }
+
+      XInput2Extension xi = getExtension(XInput2Extension.MAJOR_OPCODE);
+      if (xi != null) xi.emitRawMotion(2, (double)dx, (double)dy);
+    }
+    if (renderer != null) renderer.requestCursorRender();
+  }
+
+  public void updatePointerForDisplay(int x, int y) {
+    try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
+      pointer.setX(x);
+      pointer.setY(y);
     }
+    if (renderer != null) renderer.requestCursorRender();
+  }
+
+  public void updatePointerForDisplayDelta(int dx, int dy) {
+    try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
+      short softMarginX = (short) (screenInfo.width * 0.05f);
+      short softMarginY = (short) (screenInfo.height * 0.05f);
+      int x = Mathf.clamp(pointer.getX() + dx, -softMarginX, (screenInfo.width - 1) + softMarginX);
+      int y = Mathf.clamp(pointer.getY() + dy, -softMarginY, (screenInfo.height - 1) + softMarginY);
+      pointer.setPosition(x, y);
+
+      int clampedX = x;
+      int clampedY = y;
+      if (x < 0) clampedX = 0;
+      else if (x > screenInfo.width - 1) clampedX = screenInfo.width - 1;
+      if (y < 0) clampedY = 0;
+      else if (y > screenInfo.height - 1) clampedY = screenInfo.height - 1;
+      pointer.setX(clampedX);
+      pointer.setY(clampedY);
+    }
+    if (renderer != null) renderer.requestCursorRender();
   }
 
   public void injectPointerButtonPress(Pointer.Button buttonCode) {
+    if (winHandler != null) winHandler.onPointerButtonInjected(buttonCode, true);
     try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
       pointer.setButton(buttonCode, true);
+
+      XInput2Extension xInput2Extension = getExtension(XInput2Extension.MAJOR_OPCODE);
+      if (xInput2Extension != null) xInput2Extension.emitRawButton(2, buttonCode.ordinal() + 1, true);
     }
   }
 
   public void injectPointerButtonRelease(Pointer.Button buttonCode) {
+    if (winHandler != null) winHandler.onPointerButtonInjected(buttonCode, false);
     try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
       pointer.setButton(buttonCode, false);
+
+      XInput2Extension xInput2Extension = getExtension(XInput2Extension.MAJOR_OPCODE);
+      if (xInput2Extension != null) xInput2Extension.emitRawButton(2, buttonCode.ordinal() + 1, false);
     }
   }
 
@@ -215,25 +315,42 @@ public void injectKeyPress(XKeycode xKeycode) {
   }
 
   public void injectKeyPress(XKeycode xKeycode, int keysym) {
+    if (winHandler != null) winHandler.onKeyInjected(xKeycode, true);
     try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
       keyboard.setKeyPress(xKeycode.id, keysym);
     }
   }
 
   public void injectKeyRelease(XKeycode xKeycode) {
+    if (winHandler != null) winHandler.onKeyInjected(xKeycode, false);
     try (XLock lock = lock(Lockable.WINDOW_MANAGER, Lockable.INPUT_DEVICE)) {
       keyboard.setKeyRelease(xKeycode.id);
     }
   }
 
+  private void registerExtension(Extension ext, int[] nextEventId, int[] nextErrorId) {
+    if (ext.getNumEvents() > 0) {
+      ext.setFirstEventId((byte) nextEventId[0]);
+      nextEventId[0] += ext.getNumEvents();
+    }
+    if (ext.getNumErrors() > 0) {
+      ext.setFirstErrorId((byte) nextErrorId[0]);
+      nextErrorId[0] += ext.getNumErrors();
+    }
+    extensions.put(ext.getMajorOpcode(), ext);
+  }
+
   private void setupExtensions() {
-    extensions.put(BigReqExtension.MAJOR_OPCODE, new BigReqExtension());
-    extensions.put(MITSHMExtension.MAJOR_OPCODE, new MITSHMExtension());
+    int[] nextEventId = {64};
+    int[] nextErrorId = {128};
+    registerExtension(new BigReqExtension(), nextEventId, nextErrorId);
+    registerExtension(new MITSHMExtension(), nextEventId, nextErrorId);
     if (dri3Enabled) {
-      extensions.put(DRI3Extension.MAJOR_OPCODE, new DRI3Extension());
+      registerExtension(new DRI3Extension(), nextEventId, nextErrorId);
     }
-    extensions.put(PresentExtension.MAJOR_OPCODE, new PresentExtension());
-    extensions.put(SyncExtension.MAJOR_OPCODE, new SyncExtension());
+    registerExtension(new PresentExtension(), nextEventId, nextErrorId);
+    registerExtension(new SyncExtension(), nextEventId, nextErrorId);
+    registerExtension(new XInput2Extension(), nextEventId, nextErrorId);
   }
 
   public <T extends Extension> T getExtension(int opcode) {
diff --git a/app/src/main/runtime/display/xserver/events/XIRawButtonPressNotify.java b/app/src/main/runtime/display/xserver/events/XIRawButtonPressNotify.java
new file mode 100644
index 000000000..9b5fb1161
--- /dev/null
+++ b/app/src/main/runtime/display/xserver/events/XIRawButtonPressNotify.java
@@ -0,0 +1,51 @@
+package com.winlator.cmod.runtime.display.xserver.events;
+
+import com.winlator.cmod.runtime.display.connector.XOutputStream;
+import com.winlator.cmod.runtime.display.connector.XStreamLock;
+import java.io.IOException;
+
+public class XIRawButtonPressNotify extends Event {
+    public static final int GENERIC_EVENT_CODE = 35;
+    private static final short XI_RAWBUTTONPRESS_EVTYPE = 15;
+    private final int buttonNumber;
+    private final int deviceId;
+    private final byte extensionOpcode;
+
+    public XIRawButtonPressNotify(int deviceId, byte extensionOpcode, int buttonNumber) {
+        super(35);
+        this.deviceId = deviceId;
+        this.extensionOpcode = extensionOpcode;
+        this.buttonNumber = buttonNumber;
+    }
+
+    @Override
+    public void send(short sequenceNumber, XOutputStream outputStream) throws IOException {
+        XStreamLock lock = outputStream.lock();
+        try {
+            outputStream.writeByte(this.code);
+            outputStream.writeByte(this.extensionOpcode);
+            outputStream.writeShort(sequenceNumber);
+            outputStream.writeInt(0);
+            outputStream.writeShort((short) 15);
+            outputStream.writeShort((short) this.deviceId);
+            outputStream.writeInt((int) System.currentTimeMillis());
+            outputStream.writeInt(this.buttonNumber);
+            outputStream.writeShort((short) this.deviceId);
+            outputStream.writeShort((short) 0);
+            outputStream.writeInt(0);
+            outputStream.writePad(4);
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/xserver/events/XIRawButtonReleaseNotify.java b/app/src/main/runtime/display/xserver/events/XIRawButtonReleaseNotify.java
new file mode 100644
index 000000000..79e6afdc6
--- /dev/null
+++ b/app/src/main/runtime/display/xserver/events/XIRawButtonReleaseNotify.java
@@ -0,0 +1,51 @@
+package com.winlator.cmod.runtime.display.xserver.events;
+
+import com.winlator.cmod.runtime.display.connector.XOutputStream;
+import com.winlator.cmod.runtime.display.connector.XStreamLock;
+import java.io.IOException;
+
+public class XIRawButtonReleaseNotify extends Event {
+    public static final int GENERIC_EVENT_CODE = 35;
+    private static final short XI_RAWBUTTONRELEASE_EVTYPE = 16;
+    private final int buttonNumber;
+    private final int deviceId;
+    private final byte extensionOpcode;
+
+    public XIRawButtonReleaseNotify(int deviceId, byte extensionOpcode, int buttonNumber) {
+        super(35);
+        this.deviceId = deviceId;
+        this.extensionOpcode = extensionOpcode;
+        this.buttonNumber = buttonNumber;
+    }
+
+    @Override
+    public void send(short sequenceNumber, XOutputStream outputStream) throws IOException {
+        XStreamLock lock = outputStream.lock();
+        try {
+            outputStream.writeByte(this.code);
+            outputStream.writeByte(this.extensionOpcode);
+            outputStream.writeShort(sequenceNumber);
+            outputStream.writeInt(0);
+            outputStream.writeShort((short) 16);
+            outputStream.writeShort((short) this.deviceId);
+            outputStream.writeInt((int) System.currentTimeMillis());
+            outputStream.writeInt(this.buttonNumber);
+            outputStream.writeShort((short) this.deviceId);
+            outputStream.writeShort((short) 0);
+            outputStream.writeInt(0);
+            outputStream.writePad(4);
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/xserver/events/XIRawMotionNotify.java b/app/src/main/runtime/display/xserver/events/XIRawMotionNotify.java
new file mode 100644
index 000000000..3aee13c50
--- /dev/null
+++ b/app/src/main/runtime/display/xserver/events/XIRawMotionNotify.java
@@ -0,0 +1,63 @@
+package com.winlator.cmod.runtime.display.xserver.events;
+
+import com.winlator.cmod.runtime.display.connector.XOutputStream;
+import com.winlator.cmod.runtime.display.connector.XStreamLock;
+import java.io.IOException;
+
+public class XIRawMotionNotify extends Event {
+    public static final int GENERIC_EVENT_CODE = 35;
+    private static final short XI_RAWMOTION_EVTYPE = 17;
+    private final int deviceId;
+    private final byte extensionOpcode;
+    private final int valuatorMask;
+    private final double[] valuators;
+
+    public XIRawMotionNotify(int deviceId, byte extensionOpcode, double[] valuators, int valuatorMask) {
+        super(35);
+        this.deviceId = deviceId;
+        this.extensionOpcode = extensionOpcode;
+        this.valuators = valuators;
+        this.valuatorMask = valuatorMask;
+    }
+
+    @Override
+    public void send(short sequenceNumber, XOutputStream outputStream) throws IOException {
+        XStreamLock lock = outputStream.lock();
+        try {
+            int numAxes = this.valuators.length;
+            int payloadBytes = (numAxes * 8) + 4 + (numAxes * 8);
+            int payloadLengthUnits = payloadBytes / 4;
+            outputStream.writeByte(this.code);
+            outputStream.writeByte(this.extensionOpcode);
+            outputStream.writeShort(sequenceNumber);
+            outputStream.writeInt(payloadLengthUnits);
+            outputStream.writeShort((short) 17);
+            outputStream.writeShort((short) this.deviceId);
+            outputStream.writeInt((int) System.currentTimeMillis());
+            outputStream.writeInt(0);
+            outputStream.writeShort((short) this.deviceId);
+            outputStream.writeShort((short) 1);
+            outputStream.writeInt(0);
+            outputStream.writePad(4);
+            outputStream.writeInt(this.valuatorMask);
+            for (double v : this.valuators) {
+                outputStream.writeFP3232(v);
+            }
+            for (double v2 : this.valuators) {
+                outputStream.writeFP3232(v2);
+            }
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/xserver/extensions/BigReqExtension.java b/app/src/main/runtime/display/xserver/extensions/BigReqExtension.java
index 773ac83d9..eece1b26e 100644
--- a/app/src/main/runtime/display/xserver/extensions/BigReqExtension.java
+++ b/app/src/main/runtime/display/xserver/extensions/BigReqExtension.java
@@ -32,6 +32,22 @@ public byte getFirstEventId() {
     return 0;
   }
 
+  @Override
+  public int getNumEvents() {
+    return 0;
+  }
+
+  @Override
+  public int getNumErrors() {
+    return 0;
+  }
+
+  @Override
+  public void setFirstEventId(byte id) {}
+
+  @Override
+  public void setFirstErrorId(byte id) {}
+
   @Override
   public void handleRequest(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException {
diff --git a/app/src/main/runtime/display/xserver/extensions/DRI3Extension.java b/app/src/main/runtime/display/xserver/extensions/DRI3Extension.java
index d616eb534..eac035aaf 100644
--- a/app/src/main/runtime/display/xserver/extensions/DRI3Extension.java
+++ b/app/src/main/runtime/display/xserver/extensions/DRI3Extension.java
@@ -2,6 +2,8 @@
 
 import static com.winlator.cmod.runtime.display.xserver.XClientRequestHandler.RESPONSE_CODE_SUCCESS;
 
+import android.util.Log;
+import com.winlator.cmod.runtime.system.ApplicationLogGate;
 import com.winlator.cmod.runtime.display.connector.XConnectorEpoll;
 import com.winlator.cmod.runtime.display.connector.XInputStream;
 import com.winlator.cmod.runtime.display.connector.XOutputStream;
@@ -10,6 +12,7 @@
 import com.winlator.cmod.runtime.display.xserver.Drawable;
 import com.winlator.cmod.runtime.display.xserver.Pixmap;
 import com.winlator.cmod.runtime.display.xserver.Window;
+import com.winlator.cmod.runtime.display.xserver.WindowManager;
 import com.winlator.cmod.runtime.display.xserver.XClient;
 import com.winlator.cmod.runtime.display.xserver.XLock;
 import com.winlator.cmod.runtime.display.xserver.XServer;
@@ -25,21 +28,36 @@
 import java.nio.ByteBuffer;
 
 public class DRI3Extension implements Extension {
+  private static final String TAG = "DRI3Extension";
   public static final byte MAJOR_OPCODE = -102;
   private static final int MAX_BUFFERS = 4;
-  // Mesa's Android WSI path uses this private modifier to pass an AHardwareBuffer socket.
+  // Mesa's Android WSI path uses these private modifiers to pass an AHardwareBuffer socket.
+  // Both variants carry a single AHB fd; treat them identically for zero-copy scanout.
   private static final long ANDROID_NATIVE_BUFFER_MODIFIER = 1255L;
+  private static final long ANDROID_NATIVE_BUFFER_MODIFIER_2 = 1256L;
+  // Standard DRM modifier for plain linear buffers (CPU-shm fallback path).
+  private static final long DRM_FORMAT_MOD_LINEAR = 0L;
+
+  private static boolean isHardwareBufferModifier(long modifier) {
+    return modifier == ANDROID_NATIVE_BUFFER_MODIFIER
+        || modifier == ANDROID_NATIVE_BUFFER_MODIFIER_2;
+  }
   private final Callback<Drawable> onDestroyDrawableListener =
       (drawable) -> {
         ByteBuffer data = drawable.getData();
         if (data != null) SysVSharedMemory.unmapSHMSegment(data, data.capacity());
       };
+  private boolean loggedAhbAdvertised;
+  private boolean loggedAhbUnavailable;
 
   private abstract static class ClientOpcodes {
     private static final byte QUERY_VERSION = 0;
     private static final byte OPEN = 1;
     private static final byte PIXMAP_FROM_BUFFER = 2;
+    private static final byte GET_SUPPORTED_MODIFIERS = 6;
     private static final byte PIXMAP_FROM_BUFFERS = 7;
+    // BuffersFromPixmap (8) intentionally not implemented; AHB re-export over X is rare and
+    // requires a worker pool to drive AHardwareBuffer_sendHandleToUnixSocket asynchronously.
   }
 
   @Override
@@ -62,17 +80,45 @@ public byte getFirstEventId() {
     return 0;
   }
 
+  @Override
+  public int getNumEvents() {
+    return 0;
+  }
+
+  @Override
+  public int getNumErrors() {
+    return 0;
+  }
+
+  @Override
+  public void setFirstEventId(byte id) {}
+
+  @Override
+  public void setFirstErrorId(byte id) {}
+
   private void queryVersion(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException, XRequestError {
-    inputStream.skip(8);
+    int clientMajor = inputStream.readInt();
+    int clientMinor = inputStream.readInt();
+    // Cap at 1.2 — advertising 1.3 makes DXVK use FenceFromFD/FDFromFence per back-buffer,
+    // which adds a SyncExtension poll() dispatcher thread that contends with the X dispatch
+    // thread on fenceLock every frame. Pre-PR #424 advertised 1.0 with no observable issues;
+    // 1.2 keeps PixmapFromBuffers (multi-FD modifiers) which DXVK still uses, while turning
+    // off the sync-fence machinery that regressed in-game vsync 60 cap stability.
+    int major = 1;
+    int minor = 2;
+    if (clientMajor < major || (clientMajor == major && clientMinor < minor)) {
+      major = clientMajor;
+      minor = clientMinor;
+    }
 
     try (XStreamLock lock = outputStream.lock()) {
       outputStream.writeByte(RESPONSE_CODE_SUCCESS);
       outputStream.writeByte((byte) 0);
       outputStream.writeShort(client.getSequenceNumber());
       outputStream.writeInt(0);
-      outputStream.writeInt(1);
-      outputStream.writeInt(0);
+      outputStream.writeInt(major);
+      outputStream.writeInt(minor);
       outputStream.writePad(16);
     }
   }
@@ -80,11 +126,15 @@ private void queryVersion(XClient client, XInputStream inputStream, XOutputStrea
   private void open(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException, XRequestError {
     int drawableId = inputStream.readInt();
-    inputStream.skip(4);
+    inputStream.skip(4); // provider
 
     Drawable drawable = client.xServer.drawableManager.getDrawable(drawableId);
     if (drawable == null) throw new BadDrawable(drawableId);
 
+    // We deliberately reply with nfd=0. On Android, render-node access (/dev/dri/render*)
+    // is not available to unprivileged apps, and substituting /dev/null risks tripping Mesa
+    // into trying DRM ioctls on a non-DRM FD. Mesa's Android WSI path does not need this FD
+    // anyway - it goes directly to PixmapFromBuffers with the AHB-socket modifier.
     try (XStreamLock lock = outputStream.lock()) {
       outputStream.writeByte(RESPONSE_CODE_SUCCESS);
       outputStream.writeByte((byte) 0);
@@ -115,6 +165,8 @@ private void pixmapFromBuffer(
     int fd = inputStream.getAncillaryFd();
     if (fd < 0) throw new BadAlloc();
     pixmapFromFd(client, pixmapId, width, height, stride, 0, depth, bpp, fd, size);
+    client.xServer.windowManager.triggerOnFramePresented(
+        window, WindowManager.FrameSource.DRI3_BUFFER, 0);
   }
 
   private void pixmapFromBuffers(
@@ -148,21 +200,84 @@ private void pixmapFromBuffers(
     long size = (long) stride * height;
 
     try {
-      if (modifier == ANDROID_NATIVE_BUFFER_MODIFIER
+      if (isHardwareBufferModifier(modifier)
           && numBuffers == 1
           && tryPixmapFromHardwareBuffer(client, pixmapId, width, height, depth, fds[0])) {
+        // fds[0] stays non-negative so the finally block closes the AHB socket.
+        client.xServer.windowManager.triggerOnFramePresented(
+            window, WindowManager.FrameSource.DRI3_BUFFER, 0);
         return;
       }
 
+      if (isHardwareBufferModifier(modifier)) {
+        Log.w(
+            TAG,
+            "AHB pixmap import failed; falling back to linear SHM path: pixmap="
+                + pixmapId
+                + " numBuffers="
+                + numBuffers
+                + " size="
+                + Short.toUnsignedInt(width)
+                + "x"
+                + Short.toUnsignedInt(height));
+      }
+
       if (numBuffers != 1 || stride <= 0 || size <= 0) throw new BadImplementation();
       int fd = fds[0];
       fds[0] = -1;
       pixmapFromFd(client, pixmapId, width, height, stride, offset, depth, bpp, fd, size);
+      client.xServer.windowManager.triggerOnFramePresented(
+          window, WindowManager.FrameSource.DRI3_BUFFER, 0);
     } finally {
       closeFds(fds);
     }
   }
 
+  /**
+   * DRI3 1.2 GetSupportedModifiers (opcode 6). Advertises ANDROID_NATIVE_BUFFER_MODIFIER for
+   * window pixmaps (zero-copy AHB) and DRM_FORMAT_MOD_LINEAR for screen pixmaps (CPU/SHM).
+   */
+  private void getSupportedModifiers(
+      XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException {
+    inputStream.readInt(); // window (we do not vary modifiers per window)
+    int depth = inputStream.readUnsignedByte();
+    int bpp = inputStream.readUnsignedByte();
+    inputStream.skip(2);
+
+    boolean ahbSupported = GPUImage.isSupported() && bpp == 32 && (depth == 24 || depth == 32);
+    int numWindow = ahbSupported ? 1 : 0;
+    int numScreen = 1; // always advertise LINEAR for the CPU/SHM path
+    if (ahbSupported && !loggedAhbAdvertised && ApplicationLogGate.isEnabled()) {
+      Log.i(
+          TAG,
+          "Advertising DRI3 AHB modifier for window pixmaps: depth=" + depth + " bpp=" + bpp);
+      loggedAhbAdvertised = true;
+    } else if (!ahbSupported && !loggedAhbUnavailable && ApplicationLogGate.isEnabled()) {
+      Log.i(
+          TAG,
+          "DRI3 AHB modifier unavailable: gpuImageSupported="
+              + GPUImage.isSupported()
+              + " depth="
+              + depth
+              + " bpp="
+              + bpp);
+      loggedAhbUnavailable = true;
+    }
+
+    int extraBytes = (numWindow + numScreen) * 8;
+    try (XStreamLock lock = outputStream.lock()) {
+      outputStream.writeByte(RESPONSE_CODE_SUCCESS);
+      outputStream.writeByte((byte) 0);
+      outputStream.writeShort(client.getSequenceNumber());
+      outputStream.writeInt(extraBytes / 4);
+      outputStream.writeInt(numWindow);
+      outputStream.writeInt(numScreen);
+      outputStream.writePad(16);
+      if (ahbSupported) outputStream.writeLong(ANDROID_NATIVE_BUFFER_MODIFIER);
+      outputStream.writeLong(DRM_FORMAT_MOD_LINEAR);
+    }
+  }
+
   private int[] readAncillaryFds(XInputStream inputStream, int numBuffers) throws XRequestError {
     if (numBuffers < 1 || numBuffers > MAX_BUFFERS) throw new BadAlloc();
 
@@ -193,6 +308,16 @@ private boolean tryPixmapFromHardwareBuffer(
       throws IOException, XRequestError {
     GPUImage gpuImage = new GPUImage(fd);
     if (!gpuImage.isValid()) {
+      Log.w(
+          TAG,
+          "Rejected DRI3 AHB pixmap: pixmap="
+              + pixmapId
+              + " size="
+              + Short.toUnsignedInt(width)
+              + "x"
+              + Short.toUnsignedInt(height)
+              + " depth="
+              + Byte.toUnsignedInt(depth));
       gpuImage.destroy();
       return false;
     }
@@ -203,9 +328,23 @@ private boolean tryPixmapFromHardwareBuffer(
       gpuImage.destroy();
       throw new BadIdChoice(pixmapId);
     }
+    drawable.setPresentedSourceSize(width, height);
     drawable.setTexture(gpuImage);
     drawable.setDirectScanout(true);
-    client.xServer.pixmapManager.createPixmap(drawable);
+    Pixmap pixmap = client.xServer.pixmapManager.createPixmap(drawable);
+    client.registerAsOwnerOfResource(pixmap);
+    if (ApplicationLogGate.isEnabled()) {
+      Log.i(
+          TAG,
+          "Loaded DRI3 AHB pixmap for direct scanout: pixmap="
+              + pixmapId
+              + " size="
+              + Short.toUnsignedInt(width)
+              + "x"
+              + Short.toUnsignedInt(height)
+              + " depth="
+              + Byte.toUnsignedInt(depth));
+    }
     return true;
   }
 
@@ -229,10 +368,12 @@ private void pixmapFromFd(
       short totalWidth = (short) (stride / 4);
       Drawable drawable =
           client.xServer.drawableManager.createDrawable(pixmapId, totalWidth, height, depth);
+      drawable.setPresentedSourceSize(width, height);
       drawable.setData(buffer);
       drawable.setTexture(null);
       drawable.setOnDestroyListener(onDestroyDrawableListener);
-      client.xServer.pixmapManager.createPixmap(drawable);
+      Pixmap pixmap = client.xServer.pixmapManager.createPixmap(drawable);
+      client.registerAsOwnerOfResource(pixmap);
     } finally {
       XConnectorEpoll.closeFd(fd);
     }
@@ -260,6 +401,9 @@ public void handleRequest(XClient client, XInputStream inputStream, XOutputStrea
           pixmapFromBuffer(client, inputStream, outputStream);
         }
         break;
+      case ClientOpcodes.GET_SUPPORTED_MODIFIERS:
+        getSupportedModifiers(client, inputStream, outputStream);
+        break;
       case ClientOpcodes.PIXMAP_FROM_BUFFERS:
         try (XLock lock =
             client.xServer.lock(
diff --git a/app/src/main/runtime/display/xserver/extensions/Extension.java b/app/src/main/runtime/display/xserver/extensions/Extension.java
index 78aeb5c26..dc5d6d635 100644
--- a/app/src/main/runtime/display/xserver/extensions/Extension.java
+++ b/app/src/main/runtime/display/xserver/extensions/Extension.java
@@ -15,6 +15,14 @@ public interface Extension {
 
   byte getFirstEventId();
 
+  int getNumEvents();
+
+  int getNumErrors();
+
+  void setFirstEventId(byte id);
+
+  void setFirstErrorId(byte id);
+
   void handleRequest(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException, XRequestError;
 }
diff --git a/app/src/main/runtime/display/xserver/extensions/MITSHMExtension.java b/app/src/main/runtime/display/xserver/extensions/MITSHMExtension.java
index 0093c7b68..9b2c5c0fa 100644
--- a/app/src/main/runtime/display/xserver/extensions/MITSHMExtension.java
+++ b/app/src/main/runtime/display/xserver/extensions/MITSHMExtension.java
@@ -20,6 +20,8 @@
 
 public class MITSHMExtension implements Extension {
   public static final byte MAJOR_OPCODE = -101;
+  private byte firstEventId = 0;
+  private byte firstErrorId = 0;
 
   private abstract static class ClientOpcodes {
     private static final byte QUERY_VERSION = 0;
@@ -40,12 +42,32 @@ public byte getMajorOpcode() {
 
   @Override
   public byte getFirstErrorId() {
-    return Byte.MIN_VALUE;
+    return firstErrorId;
   }
 
   @Override
   public byte getFirstEventId() {
-    return 64;
+    return firstEventId;
+  }
+
+  @Override
+  public int getNumEvents() {
+    return 1;
+  }
+
+  @Override
+  public int getNumErrors() {
+    return 1;
+  }
+
+  @Override
+  public void setFirstEventId(byte id) {
+    this.firstEventId = id;
+  }
+
+  @Override
+  public void setFirstErrorId(byte id) {
+    this.firstErrorId = id;
   }
 
   private static void queryVersion(
@@ -111,6 +133,13 @@ private static boolean putImage(XClient client, XInputStream inputStream, XOutpu
     drawable.drawImage(
         srcX, srcY, dstX, dstY, srcWidth, srcHeight, depth, data, totalWidth, totalHeight);
 
+    com.winlator.cmod.runtime.display.xserver.Window window =
+        client.xServer.windowManager.getWindow(drawableId);
+    if (window != null) {
+      client.xServer.windowManager.triggerOnFramePresented(
+          window, com.winlator.cmod.runtime.display.xserver.WindowManager.FrameSource.MIT_SHM, 0);
+    }
+
     return totalWidth > client.xServer.screenInfo.width / 2;
   }
 
@@ -133,16 +162,12 @@ public void handleRequest(XClient client, XInputStream inputStream, XOutputStrea
         }
         break;
       case ClientOpcodes.PUT_IMAGE:
-        boolean isLargeImage = false;
         try (XLock lock =
             client.xServer.lock(
                 XServer.Lockable.SHMSEGMENT_MANAGER,
                 XServer.Lockable.DRAWABLE_MANAGER,
                 XServer.Lockable.GRAPHIC_CONTEXT_MANAGER)) {
-          isLargeImage = putImage(client, inputStream, outputStream);
-        }
-        if (isLargeImage) {
-          client.enforceAbsoluteFramerate();
+          putImage(client, inputStream, outputStream);
         }
         break;
       default:
diff --git a/app/src/main/runtime/display/xserver/extensions/PresentExtension.java b/app/src/main/runtime/display/xserver/extensions/PresentExtension.java
index 985fc03c4..40b14ae2d 100644
--- a/app/src/main/runtime/display/xserver/extensions/PresentExtension.java
+++ b/app/src/main/runtime/display/xserver/extensions/PresentExtension.java
@@ -26,6 +26,10 @@
 import com.winlator.cmod.runtime.display.xserver.events.PresentCompleteNotify;
 import com.winlator.cmod.runtime.display.xserver.events.PresentIdleNotify;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.locks.LockSupport;
 
 public class PresentExtension
     implements Extension,
@@ -33,6 +37,8 @@ public class PresentExtension
         WindowManager.OnWindowModificationListener {
   public static final byte MAJOR_OPCODE = -103;
   private static final int FAKE_INTERVAL = 1000000 / 60;
+  private byte firstEventId = 0;
+  private byte firstErrorId = 0;
 
   public enum Kind {
     PIXMAP,
@@ -49,6 +55,13 @@ public enum Mode {
   private final SparseArray<PendingScanout> pendingScanouts = new SparseArray<>();
   private SyncExtension syncExtension;
   private boolean lifecycleListenersRegistered = false;
+  private XServer xServer;
+
+  private static final long FIRE_EARLY_NS = 700_000L;
+  private final ConcurrentHashMap<Integer, WindowTiming> windowTimings = new ConcurrentHashMap<>();
+  private final PriorityBlockingQueue<PendingIdle> idleQueue =
+      new PriorityBlockingQueue<>(16, (a, b) -> Long.compare(a.fireNs, b.fireNs));
+  private volatile Thread pacerThread;
 
   private abstract static class ClientOpcodes {
     private static final byte QUERY_VERSION = 0;
@@ -70,6 +83,36 @@ private static class PendingScanout {
     private int idleFence;
   }
 
+  private static class PresentPixmapParams {
+    int windowId;
+    int pixmapId;
+    int serial;
+    short xOff;
+    short yOff;
+    int waitFence;
+    int idleFence;
+  }
+
+  private static class WindowTiming {
+    long nextIdleNs;
+  }
+
+  private static class PendingIdle {
+    final Window window;
+    final Pixmap pixmap;
+    final int serial;
+    final int idleFence;
+    final long fireNs;
+
+    PendingIdle(Window window, Pixmap pixmap, int serial, int idleFence, long fireNs) {
+      this.window = window;
+      this.pixmap = pixmap;
+      this.serial = serial;
+      this.idleFence = idleFence;
+      this.fireNs = fireNs;
+    }
+  }
+
   @Override
   public String getName() {
     return "Present";
@@ -82,14 +125,34 @@ public byte getMajorOpcode() {
 
   @Override
   public byte getFirstErrorId() {
-    return 0;
+    return firstErrorId;
   }
 
   @Override
   public byte getFirstEventId() {
+    return firstEventId;
+  }
+
+  @Override
+  public int getNumEvents() {
+    return 0;
+  }
+
+  @Override
+  public int getNumErrors() {
     return 0;
   }
 
+  @Override
+  public void setFirstEventId(byte id) {
+    this.firstEventId = id;
+  }
+
+  @Override
+  public void setFirstErrorId(byte id) {
+    this.firstErrorId = id;
+  }
+
   private void sendIdleNotify(Window window, Pixmap pixmap, int serial, int idleFence) {
     if (idleFence != 0) syncExtension.setTriggered(idleFence);
 
@@ -104,6 +167,72 @@ private void sendIdleNotify(Window window, Pixmap pixmap, int serial, int idleFe
     }
   }
 
+  private int targetFps(XServer xs) {
+    com.winlator.cmod.runtime.display.renderer.VulkanRenderer renderer =
+        xs != null ? xs.getRenderer() : null;
+    return renderer != null ? renderer.getFpsLimit() : 0;
+  }
+
+  private void scheduleIdleNotify(
+      Window window, Pixmap pixmap, int serial, int idleFence, int targetFps) {
+    if (targetFps <= 0) {
+      sendIdleNotify(window, pixmap, serial, idleFence);
+      return;
+    }
+    long frameNs = 1_000_000_000L / targetFps;
+    long now = System.nanoTime();
+    WindowTiming wt = windowTimings.computeIfAbsent(window.id, k -> new WindowTiming());
+    synchronized (wt) {
+      if (wt.nextIdleNs <= now - frameNs) {
+        wt.nextIdleNs = now + frameNs;
+      } else {
+        wt.nextIdleNs += frameNs;
+      }
+      idleQueue.offer(new PendingIdle(window, pixmap, serial, idleFence, wt.nextIdleNs));
+    }
+    startPacer();
+  }
+
+  private void startPacer() {
+    if (pacerThread != null) return;
+    synchronized (this) {
+      if (pacerThread != null) return;
+      Thread t = new Thread(this::runPacer, "PresentPacer");
+      t.setDaemon(true);
+      t.setPriority(Thread.MAX_PRIORITY);
+      pacerThread = t;
+      t.start();
+    }
+  }
+
+  private void runPacer() {
+    while (!Thread.interrupted()) {
+      try {
+        PendingIdle p = idleQueue.take();
+        long remaining = p.fireNs - FIRE_EARLY_NS - System.nanoTime();
+        while (remaining > 0) {
+          LockSupport.parkNanos(remaining);
+          if (Thread.interrupted()) return;
+          remaining = p.fireNs - FIRE_EARLY_NS - System.nanoTime();
+        }
+        sendIdleNotify(p.window, p.pixmap, p.serial, p.idleFence);
+      } catch (InterruptedException e) {
+        return;
+      }
+    }
+  }
+
+  private void drainAndFire(Window window, Pixmap pixmap) {
+    if (window != null) windowTimings.remove(window.id);
+    ArrayList<PendingIdle> hit = new ArrayList<>();
+    for (PendingIdle p : idleQueue) {
+      if ((window != null && p.window == window) || (pixmap != null && p.pixmap == pixmap)) hit.add(p);
+    }
+    for (PendingIdle p : hit) {
+      if (idleQueue.remove(p)) sendIdleNotify(p.window, p.pixmap, p.serial, p.idleFence);
+    }
+  }
+
   private void sendCompleteNotify(
       Window window, int serial, Kind kind, Mode mode, long ust, long msc) {
     synchronized (events) {
@@ -133,61 +262,69 @@ private static void queryVersion(
     }
   }
 
-  private void presentPixmap(XClient client, XInputStream inputStream, XOutputStream outputStream)
-      throws IOException, XRequestError {
-    int windowId = inputStream.readInt();
-    int pixmapId = inputStream.readInt();
-    int serial = inputStream.readInt();
-    inputStream.skip(8);
-    short xOff = inputStream.readShort();
-    short yOff = inputStream.readShort();
-    inputStream.skip(8);
-    int idleFence = inputStream.readInt();
+  private static PresentPixmapParams parsePresentPixmap(XClient client, XInputStream inputStream) {
+    PresentPixmapParams p = new PresentPixmapParams();
+    p.windowId = inputStream.readInt();
+    p.pixmapId = inputStream.readInt();
+    p.serial = inputStream.readInt();
+    inputStream.skip(8); // valid-area + update-area
+    p.xOff = inputStream.readShort();
+    p.yOff = inputStream.readShort();
+    inputStream.skip(4); // target-crtc
+    p.waitFence = inputStream.readInt();
+    p.idleFence = inputStream.readInt();
     inputStream.skip(client.getRemainingRequestLength());
+    return p;
+  }
 
-    final Window window = client.xServer.windowManager.getWindow(windowId);
-    if (window == null) throw new BadWindow(windowId);
+  private boolean presentPixmap(XClient client, PresentPixmapParams p, XOutputStream outputStream)
+      throws IOException, XRequestError {
+    final Window window = client.xServer.windowManager.getWindow(p.windowId);
+    if (window == null) throw new BadWindow(p.windowId);
 
-    final Pixmap pixmap = client.xServer.pixmapManager.getPixmap(pixmapId);
-    if (pixmap == null) throw new BadPixmap(pixmapId);
+    final Pixmap pixmap = client.xServer.pixmapManager.getPixmap(p.pixmapId);
+    if (pixmap == null) throw new BadPixmap(p.pixmapId);
 
     Drawable content = window.getContent();
     if (content.visual.depth != pixmap.drawable.visual.depth) throw new BadMatch();
 
     long ust = System.nanoTime() / 1000;
     long msc = ust / FAKE_INTERVAL;
+    boolean isLargeFrame = pixmap.drawable.width > client.xServer.screenInfo.width / 2;
+    int targetFps = targetFps(client.xServer);
 
     synchronized (content.renderLock) {
       Mode mode;
-      if (canDirectScanout(content, pixmap.drawable, xOff, yOff)) {
-        releasePendingScanout(window);
-        content.setScanoutSource(pixmap.drawable);
+      content.setPresentedSourceSize(
+          pixmap.drawable.getPresentedSourceWidth(), pixmap.drawable.getPresentedSourceHeight());
+      if (canDirectScanout(content, pixmap.drawable, p.xOff, p.yOff)) {
+        releasePendingScanout(window, true);
+        content.setScanoutSource(pixmap.drawable, p.xOff, p.yOff);
         PendingScanout pendingScanout = new PendingScanout();
         pendingScanout.window = window;
         pendingScanout.pixmap = pixmap;
-        pendingScanout.serial = serial;
-        pendingScanout.idleFence = idleFence;
+        pendingScanout.serial = p.serial;
+        pendingScanout.idleFence = p.idleFence;
         pendingScanouts.put(window.id, pendingScanout);
         mode = Mode.FLIP;
       } else {
-        releasePendingScanout(window);
-        content.copyArea(
-            (short) 0,
-            (short) 0,
-            xOff,
-            yOff,
-            pixmap.drawable.width,
-            pixmap.drawable.height,
-            pixmap.drawable);
-        sendIdleNotify(window, pixmap, serial, idleFence);
+        releasePendingScanout(window, true);
+        copyPresentedRegion(content, pixmap.drawable, p.xOff, p.yOff);
+        // TODO(perf): gate on a Vulkan release fence — we mark idle on CPU return, before
+        // the GPU has actually sampled the pixmap.
+        if (isLargeFrame) scheduleIdleNotify(window, pixmap, p.serial, p.idleFence, targetFps);
+        else sendIdleNotify(window, pixmap, p.serial, p.idleFence);
         mode = Mode.COPY;
       }
-      sendCompleteNotify(window, serial, Kind.PIXMAP, mode, ust, msc);
-      client.xServer.windowManager.triggerOnFramePresented(window);
+      sendCompleteNotify(window, p.serial, Kind.PIXMAP, mode, ust, msc);
+      client.xServer.windowManager.triggerOnFramePresented(
+          window, com.winlator.cmod.runtime.display.xserver.WindowManager.FrameSource.PRESENT, p.serial);
     }
+
+    return isLargeFrame;
   }
 
-  private void releasePendingScanout(Window window) {
+  private void releasePendingScanout(Window window, boolean paced) {
     PendingScanout pendingScanout = pendingScanouts.get(window.id);
     if (pendingScanout == null) return;
 
@@ -200,18 +337,27 @@ private void releasePendingScanout(Window window) {
         }
       }
     }
-    sendIdleNotify(
-        pendingScanout.window,
-        pendingScanout.pixmap,
-        pendingScanout.serial,
-        pendingScanout.idleFence);
+    if (paced) {
+      scheduleIdleNotify(
+          pendingScanout.window,
+          pendingScanout.pixmap,
+          pendingScanout.serial,
+          pendingScanout.idleFence,
+          targetFps(xServer));
+    } else {
+      sendIdleNotify(
+          pendingScanout.window,
+          pendingScanout.pixmap,
+          pendingScanout.serial,
+          pendingScanout.idleFence);
+    }
   }
 
   private void releasePendingScanoutsForPixmap(Pixmap pixmap) {
     for (int i = pendingScanouts.size() - 1; i >= 0; i--) {
       PendingScanout pendingScanout = pendingScanouts.valueAt(i);
       if (pendingScanout.pixmap == pixmap) {
-        releasePendingScanout(pendingScanout.window);
+        releasePendingScanout(pendingScanout.window, false);
       }
     }
   }
@@ -228,6 +374,7 @@ private void registerLifecycleListeners(XServer xServer) {
     if (lifecycleListenersRegistered) return;
     synchronized (this) {
       if (lifecycleListenersRegistered) return;
+      this.xServer = xServer;
       xServer.pixmapManager.addOnResourceLifecycleListener(this);
       xServer.windowManager.addOnWindowModificationListener(this);
       lifecycleListenersRegistered = true;
@@ -238,12 +385,14 @@ private void registerLifecycleListeners(XServer xServer) {
   public void onFreeResource(XResource resource) {
     if (resource instanceof Pixmap) {
       releasePendingScanoutsForPixmap((Pixmap) resource);
+      drainAndFire(null, (Pixmap) resource);
     }
   }
 
   @Override
   public void onDestroyWindow(Window window) {
-    releasePendingScanout(window);
+    releasePendingScanout(window, false);
+    drainAndFire(window, null);
     removeEventsForWindow(window);
   }
 
@@ -254,12 +403,32 @@ private boolean canDirectScanout(Drawable content, Drawable pixmap, short xOff,
       if (!gpuImage.isValid() || gpuImage.hasSamplingFailed()) return false;
     }
 
-    return xOff == 0
-        && yOff == 0
-        && pixmap.isDirectScanout()
+    return pixmap.isDirectScanout()
         && texture != null
-        && pixmap.width >= content.width
-        && pixmap.height >= content.height;
+        && xOff <= 0
+        && yOff <= 0
+        && pixmap.width + xOff >= content.width
+        && pixmap.height + yOff >= content.height;
+  }
+
+  private static void copyPresentedRegion(
+      Drawable content, Drawable pixmap, short xOff, short yOff) {
+    int srcX = Math.max(0, -xOff);
+    int srcY = Math.max(0, -yOff);
+    int dstX = Math.max(0, xOff);
+    int dstY = Math.max(0, yOff);
+    int width = Math.min(pixmap.width - srcX, content.width - dstX);
+    int height = Math.min(pixmap.height - srcY, content.height - dstY);
+    if (width <= 0 || height <= 0) return;
+
+    content.copyArea(
+        (short) srcX,
+        (short) srcY,
+        (short) dstX,
+        (short) dstY,
+        (short) width,
+        (short) height,
+        pixmap);
   }
 
   private void selectInput(XClient client, XInputStream inputStream, XOutputStream outputStream)
@@ -271,23 +440,6 @@ private void selectInput(XClient client, XInputStream inputStream, XOutputStream
     Window window = client.xServer.windowManager.getWindow(windowId);
     if (window == null) throw new BadWindow(windowId);
 
-    if (client.xServer.isDri3Enabled() && GPUImage.isSupported() && !mask.isEmpty()) {
-      Drawable content = window.getContent();
-      if (content != null) {
-        GPUImage gpuImage = new GPUImage(content.width, content.height);
-        synchronized (content.renderLock) {
-          if (gpuImage.isValid()) {
-            final Texture oldTexture = content.getTexture();
-            if (oldTexture != null && client.xServer.getRenderer() != null)
-              client.xServer.getRenderer().xServerView.queueEvent(oldTexture::destroy);
-            content.setTexture(gpuImage);
-          } else {
-            gpuImage.destroy();
-          }
-        }
-      }
-    }
-
     synchronized (events) {
       Event event = events.get(eventId);
       if (event != null) {
@@ -319,74 +471,24 @@ public void handleRequest(XClient client, XInputStream inputStream, XOutputStrea
       case ClientOpcodes.QUERY_VERSION:
         queryVersion(client, inputStream, outputStream);
         break;
-      case ClientOpcodes.PRESENT_PIXMAP:
-        int pixmapId;
-        boolean isLargeFrame = false;
+      case ClientOpcodes.PRESENT_PIXMAP: {
+        // Wait-fence is parsed for protocol conformance but NOT awaited on the dispatch
+        // thread: blocking here stalls every subsequent X request from this client behind
+        // the GPU and was a measured FPS regression vs. pre-DRI3-1.3 behaviour. The actual
+        // sampling happens later on the renderer thread; if a GPU-side sync becomes
+        // necessary, import the sync_file as a Vulkan semaphore and chain it into the
+        // submit instead of blocking here.
+        PresentPixmapParams p = parsePresentPixmap(client, inputStream);
+
         try (XLock lock =
             client.xServer.lock(XServer.Lockable.WINDOW_MANAGER, XServer.Lockable.PIXMAP_MANAGER)) {
-          int windowId = inputStream.readInt();
-          pixmapId = inputStream.readInt();
-          int serial = inputStream.readInt();
-          inputStream.skip(8);
-          short xOff = inputStream.readShort();
-          short yOff = inputStream.readShort();
-          inputStream.skip(8);
-          int idleFence = inputStream.readInt();
-          inputStream.skip(client.getRemainingRequestLength());
-
-          final Window window = client.xServer.windowManager.getWindow(windowId);
-          if (window == null) throw new BadWindow(windowId);
-
-          final Pixmap pixmap = client.xServer.pixmapManager.getPixmap(pixmapId);
-          if (pixmap == null) throw new BadPixmap(pixmapId);
-
-          Drawable content = window.getContent();
-          if (content.visual.depth != pixmap.drawable.visual.depth) throw new BadMatch();
-
-          long ust = System.nanoTime() / 1000;
-          long msc = ust / FAKE_INTERVAL;
-
-          synchronized (content.renderLock) {
-            Mode mode;
-            if (canDirectScanout(content, pixmap.drawable, xOff, yOff)) {
-              releasePendingScanout(window);
-              content.setScanoutSource(pixmap.drawable);
-              PendingScanout pendingScanout = new PendingScanout();
-              pendingScanout.window = window;
-              pendingScanout.pixmap = pixmap;
-              pendingScanout.serial = serial;
-              pendingScanout.idleFence = idleFence;
-              pendingScanouts.put(window.id, pendingScanout);
-              mode = Mode.FLIP;
-            } else {
-              releasePendingScanout(window);
-              content.copyArea(
-                  (short) 0,
-                  (short) 0,
-                  xOff,
-                  yOff,
-                  pixmap.drawable.width,
-                  pixmap.drawable.height,
-                  pixmap.drawable);
-              sendIdleNotify(window, pixmap, serial, idleFence);
-              mode = Mode.COPY;
-            }
-            sendCompleteNotify(window, serial, Kind.PIXMAP, mode, ust, msc);
-            client.xServer.windowManager.triggerOnFramePresented(window);
-          }
-
-          if (pixmap.drawable.width > client.xServer.screenInfo.width / 2) {
-            isLargeFrame = true;
-          }
+          presentPixmap(client, p, outputStream);
         }
 
         if (client.xServer.getRenderer() != null)
           client.xServer.getRenderer().requestRenderCoalesced();
-
-        if (isLargeFrame) {
-          client.enforceAbsoluteFramerate();
-        }
         break;
+      }
       case ClientOpcodes.SELECT_INPUT:
         try (XLock lock = client.xServer.lock(XServer.Lockable.WINDOW_MANAGER)) {
           selectInput(client, inputStream, outputStream);
diff --git a/app/src/main/runtime/display/xserver/extensions/SyncExtension.java b/app/src/main/runtime/display/xserver/extensions/SyncExtension.java
index 7de76997b..07d7c23c3 100644
--- a/app/src/main/runtime/display/xserver/extensions/SyncExtension.java
+++ b/app/src/main/runtime/display/xserver/extensions/SyncExtension.java
@@ -1,21 +1,51 @@
 package com.winlator.cmod.runtime.display.xserver.extensions;
 
+import android.util.SparseArray;
 import android.util.SparseBooleanArray;
+import android.util.SparseIntArray;
+import com.winlator.cmod.runtime.display.connector.SyncFenceFd;
 import com.winlator.cmod.runtime.display.connector.XInputStream;
 import com.winlator.cmod.runtime.display.connector.XOutputStream;
+import com.winlator.cmod.runtime.display.xserver.Pixmap;
+import com.winlator.cmod.runtime.display.xserver.Window;
 import com.winlator.cmod.runtime.display.xserver.XClient;
+import com.winlator.cmod.runtime.display.xserver.XResource;
+import com.winlator.cmod.runtime.display.xserver.XResourceManager;
+import com.winlator.cmod.runtime.display.xserver.XServer;
+import com.winlator.cmod.runtime.display.xserver.errors.BadAlloc;
 import com.winlator.cmod.runtime.display.xserver.errors.BadFence;
 import com.winlator.cmod.runtime.display.xserver.errors.BadIdChoice;
 import com.winlator.cmod.runtime.display.xserver.errors.BadImplementation;
 import com.winlator.cmod.runtime.display.xserver.errors.BadMatch;
 import com.winlator.cmod.runtime.display.xserver.errors.XRequestError;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
-public class SyncExtension implements Extension {
+public class SyncExtension
+    implements Extension, XResourceManager.OnResourceLifecycleListener {
   public static final byte MAJOR_OPCODE = -104;
+  private byte firstEventId;
+  private byte firstErrorId;
   private final SparseBooleanArray fences = new SparseBooleanArray();
+  /** Fence ID -> drawable id from CreateFence. */
+  private final SparseIntArray fenceDrawables = new SparseIntArray();
+  /** Fence ID -> imported sync_file FD currently watched by the dispatcher. */
+  private final SparseIntArray waitFds = new SparseIntArray();
+  /** Fence ID -> eventfds we own, signaled when the fence triggers. */
+  private final SparseArray<List<Integer>> exportFds = new SparseArray<>();
+  /**
+   * FDs that were removed from {@link #waitFds} but cannot be closed yet because the dispatcher
+   * may still be polling them. Closed by the dispatcher after each wake, before reissuing poll.
+   */
+  private final List<Integer> pendingCloseFds = new ArrayList<>();
   private final Object fenceLock = new Object();
 
+  /** eventfd used to wake the dispatcher when its watch set changes; -1 until lazy start. */
+  private volatile int dispatcherControlFd = -1;
+  private Thread dispatcherThread = null;
+  private boolean lifecycleListenersRegistered = false;
+
   private abstract static class ClientOpcodes {
     private static final byte CREATE_FENCE = 14;
     private static final byte TRIGGER_FENCE = 15;
@@ -36,26 +66,237 @@ public byte getMajorOpcode() {
 
   @Override
   public byte getFirstErrorId() {
-    return Byte.MIN_VALUE;
+    return firstErrorId;
   }
 
   @Override
   public byte getFirstEventId() {
-    return 0;
+    return firstEventId;
+  }
+
+  @Override
+  public int getNumEvents() {
+    return 2;
+  }
+
+  @Override
+  public int getNumErrors() {
+    return 2;
+  }
+
+  @Override
+  public void setFirstEventId(byte id) {
+    this.firstEventId = id;
+  }
+
+  @Override
+  public void setFirstErrorId(byte id) {
+    this.firstErrorId = id;
   }
 
+  /**
+   * Mark fence {@code id} triggered. Signals all export eventfds and queues the imported
+   * sync_file FD for close by the dispatcher (so we don't close an FD the dispatcher may
+   * currently be polling). No-op if the fence is unknown.
+   */
   public void setTriggered(int id) {
+    List<Integer> toSignal;
+    boolean wake = false;
+    synchronized (fenceLock) {
+      if (fences.indexOfKey(id) < 0) return;
+      fences.put(id, true);
+      toSignal = exportFds.get(id);
+      if (toSignal != null) exportFds.remove(id);
+      int waitIdx = waitFds.indexOfKey(id);
+      if (waitIdx >= 0) {
+        pendingCloseFds.add(waitFds.valueAt(waitIdx));
+        waitFds.removeAt(waitIdx);
+        wake = true;
+      }
+      fenceLock.notifyAll();
+    }
+    if (toSignal != null) {
+      for (Integer fd : toSignal) {
+        SyncFenceFd.signalEventFd(fd);
+        SyncFenceFd.closeFd(fd);
+      }
+    }
+    if (wake) wakeDispatcher();
+  }
+
+  /** Blocks until at least one of {@code ids} triggers; raises BadFence for unknown IDs. */
+  public void waitForFences(int[] ids) throws XRequestError {
+    if (ids == null || ids.length == 0) return;
+    synchronized (fenceLock) {
+      while (true) {
+        for (int id : ids) {
+          if (fences.indexOfKey(id) < 0) throw new BadFence(id);
+          if (fences.get(id)) return;
+        }
+        try {
+          fenceLock.wait();
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+          return;
+        }
+      }
+    }
+  }
+
+  /**
+   * Register a fence that triggers when {@code fd} (a kernel sync_file) signals. Takes
+   * ownership of {@code fd}; closed when the fence is destroyed or the dispatcher sees the
+   * signal.
+   */
+  public void createFromFd(int id, boolean initiallyTriggered, int fd) throws XRequestError {
+    if (fd < 0) throw new BadAlloc();
     synchronized (fenceLock) {
       if (fences.indexOfKey(id) >= 0) {
-        fences.put(id, true);
+        SyncFenceFd.closeFd(fd);
+        throw new BadIdChoice(id);
+      }
+      // Make sure the dispatcher exists BEFORE recording the fence, otherwise a failure
+      // here would leave a fence that can never be polled or triggered.
+      if (!initiallyTriggered && !ensureDispatcherStarted()) {
+        SyncFenceFd.closeFd(fd);
+        throw new BadAlloc();
+      }
+      fences.put(id, initiallyTriggered);
+      if (initiallyTriggered) {
+        // No polling needed; release the FD immediately.
+        SyncFenceFd.closeFd(fd);
         fenceLock.notifyAll();
+      } else {
+        waitFds.put(id, fd);
+      }
+    }
+    if (initiallyTriggered) drainAndSignalExports(id);
+    else wakeDispatcher();
+  }
+
+  /**
+   * Create an eventfd that becomes readable when the fence triggers, or -1 on failure. We
+   * keep the original FD; the returned duplicate is for SCM_RIGHTS hand-off and the caller
+   * must close it after sendmsg.
+   */
+  public int createExportFd(int id) {
+    int serverFd = SyncFenceFd.createSignalEventFd();
+    if (serverFd < 0) return -1;
+    int replyFd = SyncFenceFd.dupFd(serverFd);
+    if (replyFd < 0) {
+      SyncFenceFd.closeFd(serverFd);
+      return -1;
+    }
+
+    boolean signalImmediately;
+    synchronized (fenceLock) {
+      int idx = fences.indexOfKey(id);
+      if (idx < 0) {
+        SyncFenceFd.closeFd(replyFd);
+        SyncFenceFd.closeFd(serverFd);
+        return -1;
+      }
+      signalImmediately = fences.valueAt(idx);
+      if (!signalImmediately) {
+        List<Integer> list = exportFds.get(id);
+        if (list == null) {
+          list = new ArrayList<>(2);
+          exportFds.put(id, list);
+        }
+        list.add(serverFd);
+      }
+    }
+    if (signalImmediately) {
+      SyncFenceFd.signalEventFd(serverFd);
+      SyncFenceFd.closeFd(serverFd);
+    }
+    return replyFd;
+  }
+
+  // --- Dispatcher ----------------------------------------------------------
+
+  /** Must be called under {@link #fenceLock}. Returns false on eventfd allocation failure. */
+  private boolean ensureDispatcherStarted() {
+    if (dispatcherThread != null) return true;
+    int fd = SyncFenceFd.createSignalEventFd();
+    if (fd < 0) return false;
+    dispatcherControlFd = fd;
+    dispatcherThread = new Thread(this::dispatcherLoop, "SyncFenceDispatcher");
+    dispatcherThread.setDaemon(true);
+    dispatcherThread.start();
+    return true;
+  }
+
+  private void wakeDispatcher() {
+    int fd = dispatcherControlFd;
+    if (fd >= 0) SyncFenceFd.signalEventFd(fd);
+  }
+
+  private void dispatcherLoop() {
+    int[] watchIds = new int[0];
+    // First slot is the control fd; remaining slots mirror watchIds.
+    int[] pollFdArr = new int[] { dispatcherControlFd };
+
+    while (!Thread.currentThread().isInterrupted()) {
+      int[] revents = SyncFenceFd.pollFds(pollFdArr, -1);
+      if (revents == null || revents.length != pollFdArr.length) {
+        // Native failure; back off briefly so we don't spin if it persists.
+        try {
+          Thread.sleep(10);
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+          return;
+        }
+        continue;
       }
+
+      if (revents[0] != 0) SyncFenceFd.drainEventFd(dispatcherControlFd);
+      for (int i = 0; i < watchIds.length; i++) {
+        // Any event (POLLIN/POLLERR/POLLHUP/POLLNVAL) means the fence is done; setTriggered
+        // is a no-op if the fence was already destroyed.
+        if (revents[i + 1] != 0) setTriggered(watchIds[i]);
+      }
+
+      // Drain pending closes and rebuild the watch snapshot under lock. setTriggered above
+      // added to pendingCloseFds for each fd that fired, so this is also where freshly-fired
+      // FDs get closed.
+      List<Integer> toClose;
+      synchronized (fenceLock) {
+        toClose = pendingCloseFds.isEmpty() ? null : new ArrayList<>(pendingCloseFds);
+        pendingCloseFds.clear();
+        int n = waitFds.size();
+        if (watchIds.length != n) watchIds = new int[n];
+        pollFdArr = new int[n + 1];
+        pollFdArr[0] = dispatcherControlFd;
+        for (int i = 0; i < n; i++) {
+          watchIds[i] = waitFds.keyAt(i);
+          pollFdArr[i + 1] = waitFds.valueAt(i);
+        }
+      }
+      if (toClose != null) {
+        for (int fd : toClose) SyncFenceFd.closeFd(fd);
+      }
+    }
+  }
+
+  // --- X SYNC opcodes ------------------------------------------------------
+
+  private void drainAndSignalExports(int id) {
+    List<Integer> toSignal;
+    synchronized (fenceLock) {
+      toSignal = exportFds.get(id);
+      if (toSignal != null) exportFds.remove(id);
+    }
+    if (toSignal == null) return;
+    for (Integer fd : toSignal) {
+      SyncFenceFd.signalEventFd(fd);
+      SyncFenceFd.closeFd(fd);
     }
   }
 
   private void createFence(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException, XRequestError {
-    inputStream.skip(4);
+    int drawableId = inputStream.readInt();
     int id = inputStream.readInt();
 
     boolean initiallyTriggered = inputStream.readByte() == 1;
@@ -65,8 +306,10 @@ private void createFence(XClient client, XInputStream inputStream, XOutputStream
       if (fences.indexOfKey(id) >= 0) throw new BadIdChoice(id);
 
       fences.put(id, initiallyTriggered);
+      fenceDrawables.put(id, drawableId);
       if (initiallyTriggered) fenceLock.notifyAll();
     }
+    if (initiallyTriggered) drainAndSignalExports(id);
   }
 
   private void triggerFence(XClient client, XInputStream inputStream, XOutputStream outputStream)
@@ -74,9 +317,8 @@ private void triggerFence(XClient client, XInputStream inputStream, XOutputStrea
     int id = inputStream.readInt();
     synchronized (fenceLock) {
       if (fences.indexOfKey(id) < 0) throw new BadFence(id);
-      fences.put(id, true);
-      fenceLock.notifyAll();
     }
+    setTriggered(id);
   }
 
   private void resetFence(XClient client, XInputStream inputStream, XOutputStream outputStream)
@@ -95,9 +337,28 @@ private void resetFence(XClient client, XInputStream inputStream, XOutputStream
   private void destroyFence(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException, XRequestError {
     int id = inputStream.readInt();
+    List<Integer> exportsToClose = null;
+    boolean wake = false;
     synchronized (fenceLock) {
       if (fences.indexOfKey(id) < 0) throw new BadFence(id);
       fences.delete(id);
+      fenceDrawables.delete(id);
+
+      int waitIdx = waitFds.indexOfKey(id);
+      if (waitIdx >= 0) {
+        pendingCloseFds.add(waitFds.valueAt(waitIdx));
+        waitFds.removeAt(waitIdx);
+        wake = true;
+      }
+      exportsToClose = exportFds.get(id);
+      if (exportsToClose != null) exportFds.remove(id);
+      // Wake any waitForFences blocked on this id so they observe the deletion and raise
+      // BadFence rather than blocking forever.
+      fenceLock.notifyAll();
+    }
+    if (wake) wakeDispatcher();
+    if (exportsToClose != null) {
+      for (Integer fd : exportsToClose) SyncFenceFd.closeFd(fd);
     }
   }
 
@@ -114,30 +375,58 @@ private void awaitFence(XClient client, XInputStream inputStream, XOutputStream
     if (remaining > 0) inputStream.skip(remaining);
     if (ids.length == 0) return;
 
-    boolean anyTriggered;
-    do {
-      anyTriggered = false;
-      synchronized (fenceLock) {
-        for (int id : ids) {
-          if (fences.indexOfKey(id) < 0) throw new BadFence(id);
-          anyTriggered = fences.get(id);
-          if (anyTriggered) break;
+    waitForFences(ids);
+  }
+
+  private void registerLifecycleListeners(XServer xServer) {
+    if (lifecycleListenersRegistered) return;
+    synchronized (this) {
+      if (lifecycleListenersRegistered) return;
+      xServer.pixmapManager.addOnResourceLifecycleListener(this);
+      xServer.windowManager.addOnResourceLifecycleListener(this);
+      lifecycleListenersRegistered = true;
+    }
+  }
+
+  /** Drop fences bound to a freed drawable the client never destroyed; mirrors destroyFence. */
+  @Override
+  public void onFreeResource(XResource resource) {
+    if (!(resource instanceof Pixmap) && !(resource instanceof Window)) return;
+    int drawableId = resource.id;
+    List<Integer> exportsToClose = null;
+    boolean wake = false;
+    synchronized (fenceLock) {
+      for (int i = fenceDrawables.size() - 1; i >= 0; i--) {
+        if (fenceDrawables.valueAt(i) != drawableId) continue;
+        int id = fenceDrawables.keyAt(i);
+        fenceDrawables.removeAt(i);
+        fences.delete(id);
+
+        int waitIdx = waitFds.indexOfKey(id);
+        if (waitIdx >= 0) {
+          pendingCloseFds.add(waitFds.valueAt(waitIdx));
+          waitFds.removeAt(waitIdx);
+          wake = true;
         }
-        if (!anyTriggered) {
-          try {
-            fenceLock.wait(2L);
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return;
-          }
+        List<Integer> exports = exportFds.get(id);
+        if (exports != null) {
+          if (exportsToClose == null) exportsToClose = new ArrayList<>();
+          exportsToClose.addAll(exports);
+          exportFds.remove(id);
         }
       }
-    } while (!anyTriggered);
+      fenceLock.notifyAll();
+    }
+    if (wake) wakeDispatcher();
+    if (exportsToClose != null) {
+      for (Integer fd : exportsToClose) SyncFenceFd.closeFd(fd);
+    }
   }
 
   @Override
   public void handleRequest(XClient client, XInputStream inputStream, XOutputStream outputStream)
       throws IOException, XRequestError {
+    registerLifecycleListeners(client.xServer);
     int opcode = client.getRequestData();
     switch (opcode) {
       case ClientOpcodes.CREATE_FENCE:
diff --git a/app/src/main/runtime/display/xserver/extensions/XInput2Extension.java b/app/src/main/runtime/display/xserver/extensions/XInput2Extension.java
new file mode 100644
index 000000000..1935980f3
--- /dev/null
+++ b/app/src/main/runtime/display/xserver/extensions/XInput2Extension.java
@@ -0,0 +1,374 @@
+package com.winlator.cmod.runtime.display.xserver.extensions;
+
+import android.util.Log;
+import com.winlator.cmod.runtime.display.connector.XInputStream;
+import com.winlator.cmod.runtime.display.connector.XOutputStream;
+import com.winlator.cmod.runtime.display.connector.XStreamLock;
+import com.winlator.cmod.runtime.display.xserver.Bitmask;
+import com.winlator.cmod.runtime.display.xserver.Window;
+import com.winlator.cmod.runtime.display.xserver.XClient;
+import com.winlator.cmod.runtime.display.xserver.XLock;
+import com.winlator.cmod.runtime.display.xserver.XServer;
+import com.winlator.cmod.runtime.display.xserver.errors.BadWindow;
+import com.winlator.cmod.runtime.display.xserver.errors.XRequestError;
+import com.winlator.cmod.runtime.display.xserver.events.XIRawButtonPressNotify;
+import com.winlator.cmod.runtime.display.xserver.events.XIRawButtonReleaseNotify;
+import com.winlator.cmod.runtime.display.xserver.events.XIRawMotionNotify;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class XInput2Extension implements Extension {
+    public static final byte MAJOR_OPCODE = -105;
+    private static final int MASTER_KEYBOARD_ID = 3;
+    private static final int MASTER_POINTER_ID = 2;
+    private static final int POINTER_BUTTON_COUNT = 7;
+    private static final int RawMotion_XY_MASK = 3;
+    private static final int XI_ALL_DEVICES = 0;
+    private static final int XI_ALL_MASTER_DEVICES = 1;
+    private static final int XI_BUTTON_CLASS = 1;
+    private static final int XI_MAJOR = 2;
+    private static final int XI_MINOR = 2;
+    private static final long XI_RawButtonPress_MASK = 32768;
+    private static final long XI_RawButtonRelease_MASK = 65536;
+    private static final long XI_RawMotion_MASK = 131072;
+    private static final int XI_VALUATOR_CLASS = 2;
+    private byte firstEventId = 0;
+    private byte firstErrorId = 0;
+    private final List<Selection> selections = new CopyOnWriteArrayList<>();
+
+    private static abstract class ClientOpcodes {
+        private static final byte GET_CLIENT_POINTER = 45;
+        private static final byte GET_EXTENSION_VERSION = 1;
+        private static final byte QUERY_DEVICE = 48;
+        private static final byte QUERY_VERSION = 47;
+        private static final byte SELECT_EVENTS = 46;
+
+        private ClientOpcodes() {
+        }
+    }
+
+    private static class Selection {
+        XClient client;
+        int deviceId;
+        int id;
+        Bitmask mask;
+        Window window;
+
+        private Selection() {
+        }
+    }
+
+    @Override
+    public String getName() {
+        return "XInputExtension";
+    }
+
+    @Override
+    public byte getMajorOpcode() {
+        return MAJOR_OPCODE;
+    }
+
+    @Override
+    public int getNumEvents() {
+        return 24;
+    }
+
+    @Override
+    public int getNumErrors() {
+        return 5;
+    }
+
+    @Override
+    public void setFirstEventId(byte id) {
+        this.firstEventId = id;
+    }
+
+    @Override
+    public void setFirstErrorId(byte id) {
+        this.firstErrorId = id;
+    }
+
+    @Override
+    public byte getFirstEventId() {
+        return this.firstEventId;
+    }
+
+    @Override
+    public byte getFirstErrorId() {
+        return this.firstErrorId;
+    }
+
+    private boolean isMasterDevice(int deviceId) {
+        return deviceId == 2 || deviceId == 3;
+    }
+
+    private boolean matchesSelection(Selection sel, int deviceId) {
+        if (sel.deviceId != 0) {
+            return (sel.deviceId == 1 && isMasterDevice(deviceId)) || sel.deviceId == deviceId;
+        }
+        return true;
+    }
+
+    private static void getExtensionVersion(XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException {
+        inputStream.skip(client.getRemainingRequestLength());
+        XStreamLock lock = outputStream.lock();
+        try {
+            outputStream.writeByte((byte) 1);
+            outputStream.writeByte((byte) 0);
+            outputStream.writeShort(client.getSequenceNumber());
+            outputStream.writeInt(0);
+            outputStream.writeShort((short) 2);
+            outputStream.writeShort((short) 0);
+            outputStream.writeByte((byte) 1);
+            outputStream.writePad(19);
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+
+    private static void getClientPointer(XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException {
+        inputStream.skip(client.getRemainingRequestLength());
+        XStreamLock lock = outputStream.lock();
+        try {
+            outputStream.writeByte((byte) 1);
+            outputStream.writeByte((byte) 0);
+            outputStream.writeShort(client.getSequenceNumber());
+            outputStream.writeInt(0);
+            outputStream.writeByte((byte) 1);
+            outputStream.writeByte((byte) 0);
+            outputStream.writeShort((short) 2);
+            outputStream.writePad(20);
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+
+    private static void queryVersion(XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException {
+        short negotiatedMajor;
+        short negotiatedMinor;
+        short clientMajor = (short) (inputStream.readShort() & 0xFFFF);
+        short clientMinor = (short) (0xFFFF & inputStream.readShort());
+        inputStream.skip(client.getRemainingRequestLength());
+        if (clientMajor < 2 || (clientMajor == 2 && clientMinor < 2)) {
+            negotiatedMajor = clientMajor;
+            negotiatedMinor = clientMinor;
+        } else {
+            negotiatedMajor = 2;
+            negotiatedMinor = 2;
+        }
+        XStreamLock lock = outputStream.lock();
+        try {
+            outputStream.writeByte((byte) 1);
+            outputStream.writeByte((byte) 0);
+            outputStream.writeShort(client.getSequenceNumber());
+            outputStream.writeInt(0);
+            outputStream.writeShort(negotiatedMajor);
+            outputStream.writeShort(negotiatedMinor);
+            outputStream.writePad(20);
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+
+    private void writeButtonClass(XOutputStream outputStream, int sourceId, int numButtons) throws IOException {
+        int stateBytes = Math.max(4, ((numButtons + 31) / 32) * 4);
+        int labelsBytes = numButtons * 4;
+        int totalBytes = stateBytes + 8 + labelsBytes;
+        int length = totalBytes / 4;
+        outputStream.writeShort((short) 1);
+        outputStream.writeShort((short) length);
+        outputStream.writeShort((short) sourceId);
+        outputStream.writeShort((short) numButtons);
+        outputStream.writeInt(0);
+        if (stateBytes > 4) {
+            outputStream.writePad(stateBytes - 4);
+        }
+        for (int i = 0; i < numButtons; i++) {
+            outputStream.writeInt(0);
+        }
+    }
+
+    private void writeValuatorClass(XOutputStream outputStream, int axisNumber) throws IOException {
+        outputStream.writeShort((short) 2);
+        outputStream.writeShort((short) 11);
+        outputStream.writeShort((short) 2);
+        outputStream.writeShort((short) axisNumber);
+        outputStream.writeInt(0);
+        outputStream.writeFP3232(0.0);
+        outputStream.writeFP3232(0.0);
+        outputStream.writeFP3232(0.0);
+        outputStream.writeInt(0);
+        outputStream.writeByte((byte) 0);
+        outputStream.writePad(3);
+    }
+
+    private void queryDevice(XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException {
+        inputStream.skip(client.getRemainingRequestLength());
+        byte[] nameBytes = "Virtual Core Pointer".getBytes();
+        int nameLen = nameBytes.length;
+        int namePad = (nameLen + 3) & (-4);
+        int buttonStateBytes = Math.max(4, 4);
+        int buttonClassBytes = buttonStateBytes + 8 + 28;
+        int deviceInfoSize = namePad + 12 + buttonClassBytes + 88;
+        int length = deviceInfoSize / 4;
+        XStreamLock lock = outputStream.lock();
+        try {
+            outputStream.writeByte((byte) 1);
+            outputStream.writeByte((byte) 0);
+            outputStream.writeShort(client.getSequenceNumber());
+            outputStream.writeInt(length);
+            outputStream.writeShort((short) 1);
+            outputStream.writePad(22);
+            outputStream.writeShort((short) 2);
+            outputStream.writeShort((short) 1);
+            outputStream.writeShort((short) 0);
+            outputStream.writeShort((short) 3);
+            outputStream.writeShort((short) nameLen);
+            outputStream.writeByte((byte) 1);
+            outputStream.writeByte((byte) 0);
+            outputStream.write(nameBytes);
+            outputStream.writePad(namePad - nameLen);
+            writeButtonClass(outputStream, 2, 7);
+            writeValuatorClass(outputStream, 0);
+            writeValuatorClass(outputStream, 1);
+            if (lock != null) {
+                lock.close();
+            }
+        } catch (Throwable th) {
+            if (lock != null) {
+                try {
+                    lock.close();
+                } catch (Throwable th2) {
+                    th.addSuppressed(th2);
+                }
+            }
+            throw th;
+        }
+    }
+
+    private void selectEvents(final XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException, XRequestError {
+        final int windowId = inputStream.readInt();
+        int numMasks = inputStream.readShort() & 0xFFFF;
+        inputStream.readShort();
+        Window window = client.xServer.windowManager.getWindow(windowId);
+        if (window == null) {
+            inputStream.skip(client.getRemainingRequestLength());
+            throw new BadWindow(windowId);
+        }
+        for (int i = 0; i < numMasks; i++) {
+            final int deviceId = inputStream.readShort() & 0xFFFF;
+            int maskLen = inputStream.readShort() & 0xFFFF;
+            Bitmask mask = new Bitmask(0);
+            for (int word = 0; word < maskLen; word++) {
+                long value = inputStream.readUnsignedInt();
+                mask.set(value << (word * 32));
+            }
+            Selection sel = new Selection();
+            sel.client = client;
+            sel.window = window;
+            sel.deviceId = deviceId;
+            sel.mask = mask;
+            sel.id = windowId;
+            this.selections.removeIf(old -> old.client == client && old.id == windowId && old.deviceId == deviceId);
+            this.selections.add(sel);
+        }
+        inputStream.skip(client.getRemainingRequestLength());
+    }
+
+    @Override
+    public void handleRequest(XClient client, XInputStream inputStream, XOutputStream outputStream) throws IOException, XRequestError {
+        int opcode = client.getRequestData();
+        switch (opcode) {
+            case 1:
+                getExtensionVersion(client, inputStream, outputStream);
+                return;
+            case 45:
+                getClientPointer(client, inputStream, outputStream);
+                return;
+            case 46:
+                try (XLock lock = client.xServer.lock(XServer.Lockable.WINDOW_MANAGER)) {
+                    selectEvents(client, inputStream, outputStream);
+                }
+                return;
+            case 47:
+                queryVersion(client, inputStream, outputStream);
+                return;
+            case 48:
+                queryDevice(client, inputStream, outputStream);
+                return;
+            default:
+                Log.w("XServer", String.format("XInput2Extension: unhandled minor opcode=%d, requestData=%d, requestLength=%d", opcode, client.getRequestData(), client.getRemainingRequestLength()));
+                inputStream.skip(client.getRemainingRequestLength());
+        }
+    }
+
+    public void onClientDisconnected(final XClient client) {
+        this.selections.removeIf(sel -> sel.client == client);
+    }
+
+    public void emitRawMotion(int deviceId, double deltaX, double deltaY) {
+        for (Selection sel : this.selections) {
+            if (matchesSelection(sel, deviceId) && sel.mask.isSet(XI_RawMotion_MASK)) {
+                try {
+                    sendXIRawMotionToClient(sel.client, deviceId, deltaX, deltaY);
+                } catch (IOException ignored) {
+                }
+            }
+        }
+    }
+
+    public void emitRawButton(int deviceId, int buttonNumber, boolean pressed) {
+        long maskBit = pressed ? XI_RawButtonPress_MASK : XI_RawButtonRelease_MASK;
+        for (Selection sel : this.selections) {
+            if (matchesSelection(sel, deviceId) && sel.mask.isSet(maskBit)) {
+                try {
+                    sendXIRawButtonToClient(sel.client, deviceId, buttonNumber, pressed);
+                } catch (IOException ignored) {
+                }
+            }
+        }
+    }
+
+    private void sendXIRawMotionToClient(XClient client, int deviceId, double deltaX, double deltaY) throws IOException {
+        client.sendEvent(new XIRawMotionNotify(deviceId, MAJOR_OPCODE, new double[]{deltaX, deltaY}, 3));
+    }
+
+    private void sendXIRawButtonToClient(XClient client, int deviceId, int buttonNumber, boolean pressed) throws IOException {
+        if (pressed) {
+            client.sendEvent(new XIRawButtonPressNotify(deviceId, MAJOR_OPCODE, buttonNumber));
+        } else {
+            client.sendEvent(new XIRawButtonReleaseNotify(deviceId, MAJOR_OPCODE, buttonNumber));
+        }
+    }
+}
diff --git a/app/src/main/runtime/display/xserver/requests/DrawRequests.java b/app/src/main/runtime/display/xserver/requests/DrawRequests.java
index 8d17503a3..52b1cb9a1 100644
--- a/app/src/main/runtime/display/xserver/requests/DrawRequests.java
+++ b/app/src/main/runtime/display/xserver/requests/DrawRequests.java
@@ -54,6 +54,7 @@ public static boolean putImage(XClient client, XInputStream inputStream, XOutput
       throw new UnsupportedOperationException("GC Function other than COPY is not supported.");
     }
 
+    boolean didDraw = false;
     switch (format) {
       case BITMAP:
         if (leftPad != 0)
@@ -61,6 +62,7 @@ public static boolean putImage(XClient client, XInputStream inputStream, XOutput
         if (depth == 1) {
           drawable.drawImage(
               (short) 0, (short) 0, dstX, dstY, width, height, (byte) 1, data, width, height);
+          didDraw = true;
         } else throw new BadMatch();
         break;
       case XY_PIXMAP:
@@ -70,14 +72,16 @@ public static boolean putImage(XClient client, XInputStream inputStream, XOutput
         if (leftPad == 0) {
           drawable.drawImage(
               (short) 0, (short) 0, dstX, dstY, width, height, depth, data, width, height);
+          didDraw = true;
         } else throw new BadMatch();
         break;
     }
 
     com.winlator.cmod.runtime.display.xserver.Window window =
         client.xServer.windowManager.getWindow(drawableId);
-    if (window != null) {
-      client.xServer.windowManager.triggerOnFramePresented(window);
+    if (window != null && didDraw) {
+      client.xServer.windowManager.triggerOnFramePresented(
+          window, com.winlator.cmod.runtime.display.xserver.WindowManager.FrameSource.PUT_IMAGE, 0);
     }
 
     return width > client.xServer.screenInfo.width / 2;
diff --git a/app/src/main/runtime/display/xserver/requests/GrabRequests.java b/app/src/main/runtime/display/xserver/requests/GrabRequests.java
index 1ac763b10..d4f17ca99 100644
--- a/app/src/main/runtime/display/xserver/requests/GrabRequests.java
+++ b/app/src/main/runtime/display/xserver/requests/GrabRequests.java
@@ -54,11 +54,15 @@ public static void grabPointer(
       status = Status.NOT_VIEWABLE;
     } else {
       status = Status.SUCCESS;
-      client.xServer.grabManager.activatePointerGrab(window, ownerEvents, eventMask, client);
+      Window confineToWindow = null;
       if (confineToId != 0) {
-        Window confineToWindow = client.xServer.windowManager.getWindow(confineToId);
-        client.xServer.windowManager.setConfinedWindow(confineToWindow);
+        confineToWindow = client.xServer.windowManager.getWindow(confineToId);
+        if (confineToWindow != null
+            && confineToWindow.getMapState() != Window.MapState.VIEWABLE) {
+          confineToWindow = null;
+        }
       }
+      client.xServer.grabManager.activatePointerGrab(window, ownerEvents, eventMask, client, confineToWindow);
     }
 
     try (XStreamLock lock = outputStream.lock()) {
@@ -74,6 +78,5 @@ public static void ungrabPointer(
       XClient client, XInputStream inputStream, XOutputStream outputStream) {
     inputStream.skip(4);
     client.xServer.grabManager.deactivatePointerGrab();
-    client.xServer.windowManager.setConfinedWindow(null);
   }
 }
diff --git a/app/src/main/runtime/display/xserver/requests/WindowRequests.java b/app/src/main/runtime/display/xserver/requests/WindowRequests.java
index ab54de863..69259e471 100644
--- a/app/src/main/runtime/display/xserver/requests/WindowRequests.java
+++ b/app/src/main/runtime/display/xserver/requests/WindowRequests.java
@@ -81,8 +81,8 @@ public static void getWindowAttributes(
       outputStream.writeByte((byte) window.getMapState().ordinal());
       outputStream.writeByte((byte) (window.attributes.isOverrideRedirect() ? 1 : 0));
       outputStream.writeInt(0);
-      outputStream.writeInt(window.getAllEventMasks().getBits());
-      outputStream.writeInt(client.getEventMaskForWindow(window).getBits());
+      outputStream.writeInt((int) window.getAllEventMasks().getBits());
+      outputStream.writeInt((int) client.getEventMaskForWindow(window).getBits());
       outputStream.writeShort((short) window.attributes.getDoNotPropagateMask().getBits());
       outputStream.writeShort((short) 0);
     }
@@ -339,28 +339,39 @@ public static void warpPointer(
     short dstX = inputStream.readShort();
     short dstY = inputStream.readShort();
 
+    short beforeX = client.xServer.pointer.getX();
+    short beforeY = client.xServer.pointer.getY();
+
     if (srcWindow != null) {
       if (srcWidth == 0) srcWidth = (short) (srcWindow.getWidth() - srcX);
       if (srcHeight == 0) srcHeight = (short) (srcWindow.getHeight() - srcY);
 
-      short[] localPoint =
-          srcWindow.rootPointToLocal(client.xServer.pointer.getX(), client.xServer.pointer.getY());
+      short[] localPoint = srcWindow.rootPointToLocal(beforeX, beforeY);
+      short x = localPoint[0];
+      short y = localPoint[1];
+      short softMarginX = (short) (client.xServer.screenInfo.width * 0.05f);
+      short softMarginY = (short) (client.xServer.screenInfo.height * 0.05f);
       boolean isContained =
-          localPoint[0] >= srcX
-              && localPoint[1] >= srcY
-              && localPoint[0] < (srcX + srcWidth)
-              && localPoint[1] < (srcY + srcHeight);
-      if (!isContained) return;
+          x >= srcX - softMarginX
+              && y >= srcY - softMarginY
+              && x < (srcX + srcWidth) + softMarginX
+              && y < (srcY + srcHeight) + softMarginY;
+      if (!isContained) {
+        return;
+      }
     }
 
+    short targetX, targetY;
     if (dstWindow == null) {
-      client.xServer.pointer.setX(client.xServer.pointer.getX() + dstX);
-      client.xServer.pointer.setY(client.xServer.pointer.getY() + dstY);
+      targetX = (short) (beforeX + dstX);
+      targetY = (short) (beforeY + dstY);
     } else {
       short[] localPoint = dstWindow.localPointToRoot(dstX, dstY);
-      client.xServer.pointer.setX(localPoint[0]);
-      client.xServer.pointer.setY(localPoint[1]);
+      targetX = localPoint[0];
+      targetY = localPoint[1];
     }
+    client.xServer.pointer.setX(targetX);
+    client.xServer.pointer.setY(targetY);
   }
 
   public static void setInputFocus(
diff --git a/app/src/main/runtime/input/ControllerAssignmentDialog.java b/app/src/main/runtime/input/ControllerAssignmentDialog.java
index 206591823..ccc6d8fa6 100644
--- a/app/src/main/runtime/input/ControllerAssignmentDialog.java
+++ b/app/src/main/runtime/input/ControllerAssignmentDialog.java
@@ -183,7 +183,13 @@ private void setupListeners() {
           });
 
       vibrateBoxes[i].setOnCheckedChangeListener(
-          (b, checked) -> controllerManager.setVibrationEnabled(slotIndex, checked));
+          (b, checked) -> {
+            controllerManager.setVibrationEnabled(slotIndex, checked);
+            // Apply live so it takes effect without an activity restart.
+            if (winHandler != null) {
+              winHandler.setVibrationEnabledForSlot(slotIndex, checked);
+            }
+          });
 
       resetButtons[i].setOnClickListener(
           v -> {
diff --git a/app/src/main/runtime/input/ControlsEditorActivity.java b/app/src/main/runtime/input/ControlsEditorActivity.java
index 6bcb995ea..12aba1563 100644
--- a/app/src/main/runtime/input/ControlsEditorActivity.java
+++ b/app/src/main/runtime/input/ControlsEditorActivity.java
@@ -2,7 +2,10 @@
 
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -18,15 +21,19 @@
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RadioGroup;
+import android.widget.ScrollView;
 import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.activity.OnBackPressedCallback;
+import androidx.preference.PreferenceManager;
 import com.winlator.cmod.R;
+import com.winlator.cmod.runtime.input.controls.AccentTheme;
 import com.winlator.cmod.runtime.input.controls.Binding;
 import com.winlator.cmod.runtime.input.controls.ControlElement;
 import com.winlator.cmod.runtime.input.controls.ControlsProfile;
 import com.winlator.cmod.runtime.input.controls.InputControlsManager;
+import com.winlator.cmod.runtime.input.controls.VisualStyle;
 import com.winlator.cmod.runtime.input.ui.InputControlsView;
 import com.winlator.cmod.shared.android.AppUtils;
 import com.winlator.cmod.shared.ui.toast.WinToast;
@@ -51,8 +58,17 @@ public void onCreate(Bundle bundle) {
     setContentView(R.layout.controls_editor_activity);
 
     inputControlsView = new InputControlsView(this);
+    inputControlsView.setInputControlsManager(new InputControlsManager(this));
     inputControlsView.setEditMode(true);
     inputControlsView.setOverlayOpacity(0.6f);
+    inputControlsView.setVisualStyle(
+        VisualStyle.fromPreference(
+            PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("input_visual_style", null)));
+    inputControlsView.setAccentTheme(
+        AccentTheme.fromPreference(
+            PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("input_accent_theme", null)));
 
     profile =
         InputControlsManager.loadProfile(
@@ -67,6 +83,8 @@ public void onCreate(Bundle bundle) {
     container.findViewById(R.id.BTRemoveElement).setOnClickListener(this);
     container.findViewById(R.id.BTElementSettings).setOnClickListener(this);
     container.findViewById(R.id.BTColorPicker).setOnClickListener(this);
+    container.findViewById(R.id.BTAccentTheme).setOnClickListener(this);
+    container.findViewById(R.id.BTVisualStyle).setOnClickListener(this);
 
     setupToolbarDragging();
 
@@ -108,7 +126,69 @@ public void onClick(View v) {
           showColorPicker(v);
         } else WinToast.show(this, R.string.input_controls_editor_no_element_selected);
         break;
+      case R.id.BTAccentTheme:
+        showAccentThemePicker(v);
+        break;
+      case R.id.BTVisualStyle:
+        showVisualStylePicker(v);
+        break;
+    }
+  }
+
+  private void showVisualStylePicker(View anchorView) {
+    LinearLayout view = new LinearLayout(this);
+    view.setOrientation(LinearLayout.VERTICAL);
+    int padding = (int) UnitUtils.dpToPx(12);
+    view.setPadding(padding, padding, padding, padding);
+
+    TextView title = new TextView(this);
+    title.setText(R.string.input_controls_select_style);
+    title.setTextColor(getColor(R.color.settings_text_primary));
+    title.setTextSize(14);
+    title.setTypeface(null, Typeface.BOLD);
+    title.setPadding(0, 0, 0, (int) UnitUtils.dpToPx(8));
+    view.addView(title);
+
+    VisualStyle current = inputControlsView.getVisualStyle();
+    final PopupWindow[] popup = new PopupWindow[1];
+    String[] names = VisualStyle.displayNames();
+    VisualStyle[] styles = VisualStyle.values();
+    int rowPadding = (int) UnitUtils.dpToPx(6);
+    LinearLayout rows = new LinearLayout(this);
+    rows.setOrientation(LinearLayout.VERTICAL);
+    for (int i = 0; i < styles.length; i++) {
+      final VisualStyle style = styles[i];
+      boolean selected = style == current;
+      TextView label = new TextView(this);
+      label.setText(names[i]);
+      label.setTextSize(13);
+      label.setTextColor(getColor(selected ? R.color.settings_accent : R.color.settings_text_primary));
+      label.setTypeface(null, selected ? Typeface.BOLD : Typeface.NORMAL);
+      label.setPadding(rowPadding, rowPadding, rowPadding, rowPadding);
+      label.setOnClickListener(
+          v -> {
+            PreferenceManager.getDefaultSharedPreferences(this)
+                .edit()
+                .putString("input_visual_style", style.name())
+                .apply();
+            inputControlsView.setVisualStyle(style);
+            if (popup[0] != null) popup[0].dismiss();
+          });
+      rows.addView(label);
     }
+
+    ScrollView scroller = new ScrollView(this);
+    scroller.setVerticalScrollBarEnabled(true);
+    scroller.addView(rows);
+    int maxListHeight =
+        (int) Math.min(UnitUtils.dpToPx(250), getResources().getDisplayMetrics().heightPixels * 0.5f);
+    view.addView(
+        scroller,
+        new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, maxListHeight));
+
+    popup[0] = AppUtils.showPopupWindow(anchorView, view, 220, 0);
+    popup[0].setFocusable(true);
+    popup[0].update();
   }
 
   private void showColorPicker(View anchorView) {
@@ -192,6 +272,79 @@ public View getView(int position, View convertView, ViewGroup parent) {
               popupWindow.dismiss();
             });
   }
+
+  private void showAccentThemePicker(View anchorView) {
+    LinearLayout view = new LinearLayout(this);
+    view.setOrientation(LinearLayout.VERTICAL);
+    int padding = (int) UnitUtils.dpToPx(12);
+    view.setPadding(padding, padding, padding, padding);
+
+    TextView title = new TextView(this);
+    title.setText(R.string.input_controls_accent_theme);
+    title.setTextColor(getColor(R.color.settings_text_primary));
+    title.setTextSize(14);
+    title.setTypeface(null, Typeface.BOLD);
+    title.setPadding(0, 0, 0, (int) UnitUtils.dpToPx(8));
+    view.addView(title);
+
+    AccentTheme current = inputControlsView.getAccentTheme();
+    final PopupWindow[] popup = new PopupWindow[1];
+    String[] names = AccentTheme.displayNames();
+    AccentTheme[] themes = AccentTheme.values();
+    int swatchSize = (int) UnitUtils.dpToPx(14);
+    int rowPadding = (int) UnitUtils.dpToPx(6);
+    LinearLayout rows = new LinearLayout(this);
+    rows.setOrientation(LinearLayout.VERTICAL);
+    for (int i = 0; i < themes.length; i++) {
+      final AccentTheme theme = themes[i];
+      LinearLayout row = new LinearLayout(this);
+      row.setGravity(Gravity.CENTER_VERTICAL);
+      row.setPadding(rowPadding, rowPadding, rowPadding, rowPadding);
+
+      GradientDrawable dot = new GradientDrawable();
+      dot.setShape(GradientDrawable.OVAL);
+      dot.setColor(theme.accent);
+      View swatch = new View(this);
+      LinearLayout.LayoutParams swatchParams = new LinearLayout.LayoutParams(swatchSize, swatchSize);
+      swatchParams.rightMargin = (int) UnitUtils.dpToPx(10);
+      swatch.setLayoutParams(swatchParams);
+      swatch.setBackground(dot);
+      row.addView(swatch);
+
+      boolean selected = theme == current;
+      TextView label = new TextView(this);
+      label.setText(names[i]);
+      label.setTextSize(13);
+      label.setTextColor(getColor(selected ? R.color.settings_accent : R.color.settings_text_primary));
+      label.setTypeface(null, selected ? Typeface.BOLD : Typeface.NORMAL);
+      row.addView(label);
+
+      row.setOnClickListener(
+          v -> {
+            PreferenceManager.getDefaultSharedPreferences(this)
+                .edit()
+                .putString("input_accent_theme", theme.name())
+                .apply();
+            inputControlsView.setAccentTheme(theme);
+            if (popup[0] != null) popup[0].dismiss();
+          });
+      rows.addView(row);
+    }
+
+    ScrollView scroller = new ScrollView(this);
+    scroller.setVerticalScrollBarEnabled(true);
+    scroller.addView(rows);
+    int maxListHeight =
+        (int) Math.min(UnitUtils.dpToPx(250), getResources().getDisplayMetrics().heightPixels * 0.5f);
+    view.addView(
+        scroller,
+        new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, maxListHeight));
+
+    popup[0] = AppUtils.showPopupWindow(anchorView, view, 220, 0);
+    popup[0].setFocusable(true);
+    popup[0].update();
+  }
+
 private void showControlElementSettings(View anchorView) {
   final ControlElement element = inputControlsView.getSelectedElement();
   View view = LayoutInflater.from(this).inflate(R.layout.control_element_settings, null);
@@ -203,6 +356,7 @@ private void showControlElementSettings(View anchorView) {
           ControlElement.Type type = element.getType();
           view.findViewById(R.id.LLShape).setVisibility(View.GONE);
           view.findViewById(R.id.CBToggleSwitch).setVisibility(View.GONE);
+          view.findViewById(R.id.CBSwipeable).setVisibility(View.GONE);
           view.findViewById(R.id.LLCustomTextIcon).setVisibility(View.GONE);
           view.findViewById(R.id.LLRangeOptions).setVisibility(View.GONE);
           view.findViewById(R.id.LLRadialMenuOptions).setVisibility(View.GONE);
@@ -212,9 +366,12 @@ private void showControlElementSettings(View anchorView) {
             if (type == ControlElement.Type.BUTTON) {
               view.findViewById(R.id.LLShape).setVisibility(View.VISIBLE);
               view.findViewById(R.id.CBToggleSwitch).setVisibility(View.VISIBLE);
+              view.findViewById(R.id.CBSwipeable).setVisibility(View.VISIBLE);
             } else {
               view.findViewById(R.id.LLRadialMenuOptions).setVisibility(View.VISIBLE);
             }
+          } else if (type == ControlElement.Type.D_PAD) {
+            view.findViewById(R.id.CBSwipeable).setVisibility(View.VISIBLE);
           } else if (type == ControlElement.Type.RANGE_BUTTON) {
             view.findViewById(R.id.LLRangeOptions).setVisibility(View.VISIBLE);
           }
@@ -308,6 +465,14 @@ public void onStopTrackingTouch(SeekBar seekBar) {}
           profile.save();
         });
 
+    CheckBox cbSwipeable = view.findViewById(R.id.CBSwipeable);
+    cbSwipeable.setChecked(element.isSwipeable());
+    cbSwipeable.setOnCheckedChangeListener(
+        (buttonView, isChecked) -> {
+          element.setSwipeable(isChecked);
+          profile.save();
+        });
+
     final EditText etCustomText = view.findViewById(R.id.ETCustomText);
     etCustomText.setText(element.getText());
     final LinearLayout llIconList = view.findViewById(R.id.LLIconList);
@@ -400,7 +565,17 @@ private void loadBindingSpinners(ControlElement element, View view) {
     if (type == ControlElement.Type.BUTTON || type == ControlElement.Type.RADIAL_MENU) {
       int count = element.getBindingCount();
       for (int i = 0; i < count; i++) {
-        String title = (type == ControlElement.Type.RADIAL_MENU) ? "Binding " + (i + 1) : (i == 0 ? getString(R.string.input_controls_editor_binding) : getString(R.string.binding_secondary));
+        String title;
+        if (type == ControlElement.Type.RADIAL_MENU) {
+          title = "Binding " + (i + 1);
+        } else {
+          switch (i) {
+            case 0: title = getString(R.string.binding_primary); break;
+            case 1: title = getString(R.string.binding_secondary); break;
+            case 2: title = getString(R.string.binding_third); break;
+            default: title = getString(R.string.binding_fourth); break;
+          }
+        }
         loadBindingSpinner(element, container, i, title);
       }
     } else if (type == ControlElement.Type.D_PAD
diff --git a/app/src/main/runtime/input/InputControlsDialog.kt b/app/src/main/runtime/input/InputControlsDialog.kt
deleted file mode 100644
index 477583d46..000000000
--- a/app/src/main/runtime/input/InputControlsDialog.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.winlator.cmod.runtime.input
-import android.app.Activity
-import android.app.Dialog
-import android.view.ViewGroup
-import android.view.Window
-import android.view.WindowManager
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.ComposeView
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.savedstate.SavedStateRegistryOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-import com.winlator.cmod.R
-import com.winlator.cmod.shared.theme.WinNativeTheme
-
-class InputControlsDialog(
-    private val activity: Activity,
-) {
-    private val dialog: Dialog
-
-    // Compose state
-    val profileNames = mutableStateOf<List<String>>(emptyList())
-    val selectedProfileIndex = mutableIntStateOf(0)
-    val showTouchscreenControls = mutableStateOf(false)
-    val tapToClickEnabled = mutableStateOf(true)
-    val overlayOpacity = mutableStateOf(0.4f)
-    val touchscreenHaptics = mutableStateOf(false)
-    val gamepadVibration = mutableStateOf(true)
-
-    var onConfirmCallback: Runnable? = null
-    var onCancelCallback: Runnable? = null
-    var onSettingsClickCallback: Runnable? = null
-
-    init {
-        dialog =
-            Dialog(activity, R.style.ContentDialog).apply {
-                requestWindowFeature(Window.FEATURE_NO_TITLE)
-                setCancelable(true)
-                setCanceledOnTouchOutside(false)
-                setOwnerActivity(activity)
-                window?.apply {
-                    setBackgroundDrawableResource(android.R.color.transparent)
-                    setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT)
-                    setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
-                }
-            }
-
-        val composeView =
-            ComposeView(activity).apply {
-                layoutParams =
-                    ViewGroup.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                    )
-                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-                setViewTreeLifecycleOwner(activity as LifecycleOwner)
-                setViewTreeSavedStateRegistryOwner(activity as SavedStateRegistryOwner)
-                setContent {
-                    WinNativeTheme {
-                        InputControlsDialogContent(
-                            state =
-                                InputControlsState(
-                                    profileNames = profileNames.value,
-                                    selectedProfileIndex = selectedProfileIndex.intValue,
-                                    showTouchscreenControls = showTouchscreenControls.value,
-                                    tapToClickEnabled = tapToClickEnabled.value,
-                                    overlayOpacity = overlayOpacity.value,
-                                    touchscreenHaptics = touchscreenHaptics.value,
-                                    gamepadVibration = gamepadVibration.value,
-                                ),
-                            onProfileSelected = { index ->
-                                selectedProfileIndex.intValue = index
-                            },
-                            onSettingsClick = { onSettingsClickCallback?.run() },
-                            onShowTouchscreenControlsChange = { showTouchscreenControls.value = it },
-                            onTapToClickChange = { tapToClickEnabled.value = it },
-                            onOverlayOpacityChange = { overlayOpacity.value = it },
-                            onTouchscreenHapticsChange = { touchscreenHaptics.value = it },
-                            onGamepadVibrationChange = { gamepadVibration.value = it },
-                            onCancel = {
-                                onCancelCallback?.run()
-                                dismiss()
-                            },
-                            onConfirm = {
-                                onConfirmCallback?.run()
-                                dismiss()
-                            },
-                        )
-                    }
-                }
-            }
-        dialog.setContentView(composeView)
-
-        // Auto-dismiss when activity is destroyed to prevent window leaks
-        (activity as LifecycleOwner).lifecycle.addObserver(
-            object : DefaultLifecycleObserver {
-                override fun onDestroy(owner: LifecycleOwner) {
-                    if (dialog.isShowing) dialog.dismiss()
-                }
-            },
-        )
-    }
-
-    fun show() {
-        dialog.show()
-        dialog.window?.apply {
-            val dm = activity.resources.displayMetrics
-            setLayout(dm.widthPixels, WindowManager.LayoutParams.WRAP_CONTENT)
-        }
-    }
-
-    fun dismiss() {
-        com.winlator.cmod.shared.android.AppUtils
-            .hideKeyboard(activity)
-        dialog.dismiss()
-    }
-}
diff --git a/app/src/main/runtime/input/InputControlsDialogContent.kt b/app/src/main/runtime/input/InputControlsDialogContent.kt
deleted file mode 100644
index 28f81a33d..000000000
--- a/app/src/main/runtime/input/InputControlsDialogContent.kt
+++ /dev/null
@@ -1,590 +0,0 @@
-package com.winlator.cmod.runtime.input
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.SportsEsports
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.CheckboxDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Slider
-import androidx.compose.material3.SliderDefaults
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.winlator.cmod.R
-import com.winlator.cmod.shared.theme.WinNativeAccent
-import com.winlator.cmod.shared.theme.WinNativeOutline
-import com.winlator.cmod.shared.theme.WinNativePanel
-import com.winlator.cmod.shared.theme.WinNativeSurface
-import com.winlator.cmod.shared.theme.WinNativeTextPrimary
-import com.winlator.cmod.shared.theme.WinNativeTextSecondary
-
-private val InputControlsSecondarySurface = Color(0xFF202635)
-private val InputControlsSecondaryOutline = Color(0xFF313A4D)
-private val InputControlsDivider = Color(0xFF30384A)
-private val InputControlsDividerStrong = Color(0xFF39445A)
-private val InputControlsMenuItemPressed = Color(0xFF2B3243)
-
-data class InputControlsState(
-    val profileNames: List<String> = emptyList(),
-    val selectedProfileIndex: Int = 0,
-    val showTouchscreenControls: Boolean = false,
-    val tapToClickEnabled: Boolean = true,
-    val overlayOpacity: Float = 0.4f,
-    val touchscreenHaptics: Boolean = false,
-    val gamepadVibration: Boolean = true,
-)
-
-@Composable
-fun InputControlsDialogContent(
-    state: InputControlsState,
-    onProfileSelected: (Int) -> Unit,
-    onSettingsClick: () -> Unit,
-    onShowTouchscreenControlsChange: (Boolean) -> Unit,
-    onTapToClickChange: (Boolean) -> Unit,
-    onOverlayOpacityChange: (Float) -> Unit,
-    onTouchscreenHapticsChange: (Boolean) -> Unit,
-    onGamepadVibrationChange: (Boolean) -> Unit,
-    onCancel: () -> Unit,
-    onConfirm: () -> Unit,
-) {
-    BoxWithConstraints(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .safeDrawingPadding()
-                .padding(horizontal = 12.dp, vertical = 10.dp),
-        contentAlignment = Alignment.Center,
-    ) {
-        val configuration = LocalConfiguration.current
-        val compactLayout = maxWidth < 380.dp
-        val dialogWidthFraction =
-            when {
-                maxWidth < 420.dp -> 0.98f
-                maxWidth < 720.dp -> 0.9f
-                else -> 0.56f
-            }
-        val dialogMaxWidth =
-            when {
-                compactLayout -> 344.dp
-                maxWidth < 720.dp -> 440.dp
-                else -> 520.dp
-            }
-        val dialogMaxHeight = (configuration.screenHeightDp.dp - if (compactLayout) 20.dp else 32.dp)
-        val contentHorizontalPadding = if (compactLayout) 11.dp else 14.dp
-        val contentVerticalPadding = if (compactLayout) 9.dp else 10.dp
-
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth(dialogWidthFraction)
-                    .widthIn(max = dialogMaxWidth)
-                    .heightIn(max = dialogMaxHeight)
-                    .clip(RoundedCornerShape(16.dp))
-                    .background(WinNativeSurface)
-                    .border(1.dp, WinNativeOutline, RoundedCornerShape(16.dp)),
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .weight(1f, fill = false)
-                        .verticalScroll(rememberScrollState())
-                        .padding(
-                            start = contentHorizontalPadding,
-                            end = contentHorizontalPadding,
-                            top = contentVerticalPadding,
-                            bottom = 6.dp,
-                        ),
-                verticalArrangement = Arrangement.spacedBy(if (compactLayout) 7.dp else 8.dp),
-            ) {
-                SectionCard {
-                    SectionLabel(stringResource(R.string.input_controls_editor_select_profile))
-                    Spacer(Modifier.height(5.dp))
-                    ProfileRow(
-                        profileNames = state.profileNames,
-                        selectedIndex = state.selectedProfileIndex,
-                        onProfileSelected = onProfileSelected,
-                        onSettingsClick = onSettingsClick,
-                    )
-                }
-
-                SectionCard {
-                    SectionLabel(stringResource(R.string.session_drawer_touchscreen_overlay))
-                    Spacer(Modifier.height(6.dp))
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                        OptionCheckbox(
-                            label = stringResource(R.string.session_drawer_show_touchscreen_controls),
-                            checked = state.showTouchscreenControls,
-                            onCheckedChange = onShowTouchscreenControlsChange,
-                        )
-
-                        if (state.showTouchscreenControls) {
-                            OverlayOpacitySlider(
-                                value = state.overlayOpacity,
-                                onValueChange = onOverlayOpacityChange
-                            )
-
-                            OptionCheckbox(
-                                label = stringResource(R.string.input_controls_tap_to_click),
-                                checked = state.tapToClickEnabled,
-                                onCheckedChange = onTapToClickChange,
-                            )
-                        }
-
-                        OptionCheckbox(
-                            label = stringResource(R.string.settings_general_touchscreen_haptics),
-                            checked = state.touchscreenHaptics,
-                            onCheckedChange = onTouchscreenHapticsChange,
-                        )
-                        OptionCheckbox(
-                            label = stringResource(R.string.session_gamepad_enable_vibration),
-                            checked = state.gamepadVibration,
-                            onCheckedChange = onGamepadVibrationChange,
-                        )
-                    }
-                }
-            }
-
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .height(1.dp)
-                        .background(InputControlsDividerStrong),
-            )
-
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = contentHorizontalPadding, vertical = 8.dp),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Row(
-                    modifier = Modifier.weight(1f),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp),
-                ) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(24.dp)
-                                .clip(RoundedCornerShape(7.dp))
-                                .background(WinNativePanel)
-                                .border(1.dp, WinNativeOutline, RoundedCornerShape(7.dp)),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Icon(
-                            imageVector = Icons.Outlined.SportsEsports,
-                            contentDescription = null,
-                            tint = WinNativeAccent,
-                            modifier = Modifier.size(16.dp),
-                        )
-                    }
-                    Text(
-                        text = stringResource(R.string.common_ui_input_controls),
-                        color = WinNativeTextPrimary,
-                        fontSize = 13.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-                Spacer(Modifier.width(7.dp))
-                Row(horizontalArrangement = Arrangement.spacedBy(7.dp)) {
-                    FooterButton(
-                        label = stringResource(R.string.common_ui_cancel),
-                        textColor = WinNativeTextPrimary,
-                        onClick = onCancel,
-                        backgroundColor = InputControlsSecondarySurface,
-                        borderColor = InputControlsSecondaryOutline,
-                    )
-                    FooterButton(
-                        label = stringResource(R.string.common_ui_ok),
-                        textColor = WinNativeAccent,
-                        onClick = onConfirm,
-                        backgroundColor = WinNativeAccent.copy(alpha = 0.14f),
-                        borderColor = WinNativeAccent.copy(alpha = 0.34f),
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SectionLabel(text: String) {
-    Text(
-        text = text,
-        color = WinNativeTextSecondary,
-        fontSize = 13.sp,
-        fontWeight = FontWeight.SemiBold,
-        letterSpacing = 0.sp,
-    )
-}
-
-@Composable
-private fun SectionCard(content: @Composable ColumnScope.() -> Unit) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(12.dp))
-                .background(WinNativePanel)
-                .border(1.dp, WinNativeOutline, RoundedCornerShape(12.dp))
-                .padding(horizontal = 9.dp, vertical = 8.dp),
-        content = content,
-    )
-}
-
-@Composable
-private fun FooterButton(
-    label: String,
-    textColor: Color,
-    onClick: () -> Unit,
-    backgroundColor: Color,
-    borderColor: Color,
-) {
-    Box(
-        modifier =
-            Modifier
-                .height(34.dp)
-                .widthIn(min = 74.dp)
-                .clip(RoundedCornerShape(11.dp))
-                .background(backgroundColor)
-                .border(1.dp, borderColor, RoundedCornerShape(11.dp))
-                .clickable(onClick = onClick)
-                .padding(horizontal = 12.dp),
-        contentAlignment = Alignment.Center,
-    ) {
-        Text(
-            text = label,
-            color = textColor,
-            fontSize = 10.sp,
-            fontWeight = FontWeight.SemiBold,
-            maxLines = 1,
-        )
-    }
-}
-
-@Composable
-private fun ProfileRow(
-    profileNames: List<String>,
-    selectedIndex: Int,
-    onProfileSelected: (Int) -> Unit,
-    onSettingsClick: () -> Unit,
-) {
-    var expanded by remember { mutableStateOf(false) }
-    val profileInteractionSource = remember { MutableInteractionSource() }
-    val configuration = LocalConfiguration.current
-    val disabledPlaceholder = stringResource(R.string.common_ui_disabled_placeholder)
-    val selectedText = profileNames.getOrElse(selectedIndex) { disabledPlaceholder }
-    val menuMaxHeight = (configuration.screenHeightDp.dp * 0.58f).coerceAtMost(400.dp)
-    val menuWidth =
-        when {
-            configuration.screenWidthDp < 420 -> 0.72f
-            else -> 0.48f
-        }
-
-    if (expanded) {
-        Dialog(
-            onDismissRequest = { expanded = false },
-            properties = DialogProperties(usePlatformDefaultWidth = false),
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth(menuWidth)
-                        .widthIn(min = 220.dp, max = 420.dp)
-                        .heightIn(max = menuMaxHeight)
-                        .clip(RoundedCornerShape(16.dp))
-                        .background(WinNativeSurface)
-                        .border(1.dp, WinNativeOutline, RoundedCornerShape(16.dp)),
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .background(WinNativePanel)
-                            .padding(horizontal = 20.dp, vertical = 9.dp),
-                ) {
-                    Text(
-                        text = stringResource(R.string.input_controls_editor_select_profile),
-                        color = WinNativeTextSecondary,
-                        fontSize = 13.sp,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                }
-
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(1.dp)
-                            .background(InputControlsDividerStrong),
-                )
-
-                Column(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .verticalScroll(rememberScrollState())
-                            .padding(vertical = 2.dp),
-                ) {
-                    profileNames.forEachIndexed { index, name ->
-                        if (index > 0) {
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .fillMaxWidth()
-                                        .padding(horizontal = 12.dp)
-                                        .height(1.dp)
-                                        .background(InputControlsDivider),
-                            )
-                        }
-                        ProfilePopupItem(
-                            label = name,
-                            selected = index == selectedIndex,
-                            onClick = {
-                                onProfileSelected(index)
-                                expanded = false
-                            },
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.spacedBy(6.dp),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .weight(1f)
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(InputControlsSecondarySurface)
-                    .border(1.dp, InputControlsSecondaryOutline, RoundedCornerShape(10.dp))
-                    .clickable(
-                        interactionSource = profileInteractionSource,
-                        indication = null,
-                    ) { expanded = true }
-                    .height(42.dp)
-                    .padding(horizontal = 11.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = selectedText,
-                color = WinNativeTextPrimary,
-                fontSize = 12.sp,
-                modifier = Modifier.weight(1f),
-                textAlign = TextAlign.Start,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-            )
-            Spacer(Modifier.width(6.dp))
-            Icon(
-                imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
-                contentDescription = null,
-                tint = WinNativeTextSecondary,
-                modifier = Modifier.size(16.dp),
-            )
-        }
-
-        Box(
-            modifier =
-                Modifier
-                    .size(42.dp)
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(InputControlsSecondarySurface)
-                    .border(1.dp, InputControlsSecondaryOutline, RoundedCornerShape(10.dp))
-                    .clickable(onClick = onSettingsClick),
-            contentAlignment = Alignment.Center,
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Settings,
-                contentDescription = stringResource(R.string.common_ui_settings),
-                tint = WinNativeTextPrimary,
-                modifier = Modifier.size(18.dp),
-            )
-        }
-    }
-}
-
-@Composable
-private fun ProfilePopupItem(
-    label: String,
-    selected: Boolean,
-    onClick: () -> Unit,
-) {
-    val interactionSource = remember { MutableInteractionSource() }
-    val pressed by interactionSource.collectIsPressedAsState()
-    val backgroundColor =
-        when {
-            pressed -> InputControlsMenuItemPressed
-            else -> Color.Transparent
-        }
-
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(10.dp))
-                .background(backgroundColor)
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = null,
-                    onClick = onClick,
-                ).defaultMinSize(minHeight = 42.dp)
-                .padding(start = 20.dp, end = 16.dp, top = 5.dp, bottom = 5.dp),
-        contentAlignment = Alignment.CenterStart,
-    ) {
-        Text(
-            text = label,
-            color = if (selected) WinNativeAccent else WinNativeTextPrimary,
-            fontSize = 12.sp,
-            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
-            textAlign = TextAlign.Start,
-            modifier = Modifier.fillMaxWidth(),
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-        )
-    }
-}
-
-@Composable
-private fun OptionCheckbox(
-    label: String,
-    checked: Boolean,
-    onCheckedChange: (Boolean) -> Unit,
-) {
-    val cardInteractionSource = remember { MutableInteractionSource() }
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(11.dp))
-                .background(InputControlsSecondarySurface)
-                .border(1.dp, InputControlsSecondaryOutline, RoundedCornerShape(11.dp))
-                .clickable(
-                    interactionSource = cardInteractionSource,
-                    indication = null,
-                ) { onCheckedChange(!checked) }
-                .height(44.dp)
-                .padding(horizontal = 9.dp),
-    ) {
-        Checkbox(
-            checked = checked,
-            onCheckedChange = onCheckedChange,
-            modifier = Modifier.size(15.dp),
-            colors =
-                CheckboxDefaults.colors(
-                    checkedColor = WinNativeAccent,
-                    uncheckedColor = InputControlsSecondaryOutline,
-                    checkmarkColor = Color.White,
-                ),
-        )
-        Spacer(Modifier.width(10.dp))
-        Text(
-            text = label,
-            color = WinNativeTextPrimary,
-            fontSize = 12.sp,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-        )
-    }
-}
-
-@Composable
-private fun OverlayOpacitySlider(
-    value: Float,
-    onValueChange: (Float) -> Unit,
-) {
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(11.dp))
-            .background(InputControlsSecondarySurface)
-            .border(1.dp, InputControlsSecondaryOutline, RoundedCornerShape(11.dp))
-            .padding(horizontal = 9.dp, vertical = 7.dp)
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 3.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Text(
-                text = stringResource(R.string.input_controls_editor_overlay_opacity),
-                color = WinNativeTextPrimary,
-                fontSize = 12.sp,
-                fontWeight = FontWeight.Medium
-            )
-            Text(
-                text = "${(value * 100).toInt()}%",
-                color = WinNativeAccent,
-                fontSize = 12.sp,
-                fontWeight = FontWeight.Bold
-            )
-        }
-        Slider(
-            value = value,
-            onValueChange = onValueChange,
-            valueRange = 0.1f..1.0f,
-            colors = SliderDefaults.colors(
-                thumbColor = WinNativeAccent,
-                activeTrackColor = WinNativeAccent,
-                inactiveTrackColor = InputControlsSecondaryOutline,
-                activeTickColor = Color.Transparent,
-                inactiveTickColor = Color.Transparent
-            ),
-            modifier = Modifier.height(32.dp).padding(horizontal = 0.dp)
-        )
-    }
-}
diff --git a/app/src/main/runtime/input/controls/AccentTheme.java b/app/src/main/runtime/input/controls/AccentTheme.java
new file mode 100644
index 000000000..7d3cc2ce0
--- /dev/null
+++ b/app/src/main/runtime/input/controls/AccentTheme.java
@@ -0,0 +1,36 @@
+package com.winlator.cmod.runtime.input.controls;
+
+/** Accent presets for the themed control styles; a per-element custom color always wins. */
+public enum AccentTheme {
+  MONO(0xFFE8ECF2),
+  AZURE(0xFF4DA3FF),
+  CYAN(0xFF37E1DC),
+  MINT(0xFF4DE3B2),
+  LIME(0xFFB9F542),
+  GOLD(0xFFFFC14D),
+  EMBER(0xFFFF9950),
+  CRIMSON(0xFFFF4655),
+  ROSE(0xFFFF6FB5),
+  VIOLET(0xFFA78BFA);
+
+  public final int accent;
+
+  AccentTheme(int accent) {
+    this.accent = accent;
+  }
+
+  public static AccentTheme fromPreference(String name) {
+    if (name == null) return CYAN;
+    try {
+      return AccentTheme.valueOf(name);
+    } catch (IllegalArgumentException e) {
+      return CYAN;
+    }
+  }
+
+  public static String[] displayNames() {
+    return new String[] {
+      "Mono", "Azure", "Cyan", "Mint", "Lime", "Gold", "Ember", "Crimson", "Rose", "Violet"
+    };
+  }
+}
diff --git a/app/src/main/runtime/input/controls/Binding.java b/app/src/main/runtime/input/controls/Binding.java
index 98e190b8d..25e6e7785 100644
--- a/app/src/main/runtime/input/controls/Binding.java
+++ b/app/src/main/runtime/input/controls/Binding.java
@@ -290,4 +290,24 @@ public static Binding[] gamepadBindingValues() {
     for (Binding binding : Binding.values()) if (binding.isGamepad()) labels.add(binding);
     return labels.toArray(new Binding[0]);
   }
+
+  // Inputs usable as a hold/toggle activator: discrete presses only, no analog directions.
+  public static Binding[] activatorBindingValues() {
+    ArrayList<Binding> values = new ArrayList<>();
+    values.add(NONE);
+    values.add(MOUSE_LEFT_BUTTON);
+    values.add(MOUSE_MIDDLE_BUTTON);
+    values.add(MOUSE_RIGHT_BUTTON);
+    for (Binding binding : Binding.values()) if (binding.isKeyboard()) values.add(binding);
+    for (Binding binding : Binding.values())
+      if (binding.isGamepad() && !binding.name().contains("_THUMB_")) values.add(binding);
+    return values.toArray(new Binding[0]);
+  }
+
+  public static String[] activatorBindingLabels() {
+    Binding[] bindings = activatorBindingValues();
+    String[] labels = new String[bindings.length];
+    for (int i = 0; i < bindings.length; i++) labels[i] = bindings[i].toString();
+    return labels;
+  }
 }
diff --git a/app/src/main/runtime/input/controls/ControlElement.java b/app/src/main/runtime/input/controls/ControlElement.java
index dc94dc8b8..9dbb77b66 100644
--- a/app/src/main/runtime/input/controls/ControlElement.java
+++ b/app/src/main/runtime/input/controls/ControlElement.java
@@ -3,11 +3,18 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.CornerPathEffect;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.RadialGradient;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Shader;
 import androidx.core.graphics.ColorUtils;
 import com.winlator.cmod.runtime.display.winhandler.MouseEventFlags;
 import com.winlator.cmod.runtime.display.xserver.XServer;
@@ -21,9 +28,10 @@
 import org.json.JSONObject;
 
 public class ControlElement {
-  public static final float STICK_DEAD_ZONE = 0.01f;
+  public static final float STICK_DEAD_ZONE = 0.15f;
   public static final float DPAD_DEAD_ZONE = 0.3f;
-  public static final float STICK_SENSITIVITY = 2.0f;
+  public static final float STICK_SENSITIVITY = 3.0f;
+  public static final float STICK_CROSS_ZONE = 0.3f;
   public static final float TRACKPAD_MIN_SPEED = 0.8f;
   public static final float TRACKPAD_MAX_SPEED = 20.0f;
   public static final byte TRACKPAD_ACCELERATION_THRESHOLD = 4;
@@ -88,6 +96,7 @@ public static String[] names() {
   private short y;
   private boolean selected = false;
   private boolean toggleSwitch = false;
+  private boolean swipeable = true;
   private boolean radialMenuExpanded = false;
   private int activeRadialBindingIndex = -1;
   private boolean isRadialBindingCurrentlyHeld = false;
@@ -103,7 +112,10 @@ public static String[] names() {
   private Range range;
   private byte orientation;
   private PointF currentPosition;
+  private PointF trackpadOrigin;
   private int customColor = -1;
+  private String displayTextCache;
+  private String[] bindingTextCache;
   private RangeScroller scroller;
   private CubicBezierInterpolator interpolator;
   private Object touchTime;
@@ -142,6 +154,7 @@ private void reset() {
     boundingBoxNeedsUpdate = true;
     radialMenuExpanded = false;
     paths = null;
+    invalidateLabelCache();
   }
 
   public Type getType() {
@@ -166,6 +179,7 @@ public void setBindingCount(int bindingCount) {
     states = new boolean[bindingCount];
     boundingBoxNeedsUpdate = true;
     paths = null;
+    invalidateLabelCache();
   }
 
   public Shape getShape() {
@@ -202,6 +216,14 @@ public void setToggleSwitch(boolean toggleSwitch) {
     this.toggleSwitch = toggleSwitch;
   }
 
+  public boolean isSwipeable() {
+    return swipeable;
+  }
+
+  public void setSwipeable(boolean swipeable) {
+    this.swipeable = swipeable;
+  }
+
   public float getOpacity() {
     return opacity;
   }
@@ -228,6 +250,10 @@ public void setCustomColor(int customColor) {
     this.boundingBoxNeedsUpdate = true;
   }
 
+  public Binding[] getBindings() {
+    return bindings;
+  }
+
   public Binding getBindingAt(int index) {
     return index < bindings.length ? bindings[index] : Binding.NONE;
   }
@@ -242,11 +268,13 @@ public void setBindingAt(int index, Binding binding) {
     }
     bindings[index] = binding;
     paths = null;
+    invalidateLabelCache();
   }
 
   public void setBinding(Binding binding) {
     Arrays.fill(bindings, binding);
     paths = null;
+    invalidateLabelCache();
   }
 
   public float getScale() {
@@ -297,6 +325,7 @@ public String getText() {
 
   public void setText(String text) {
     this.text = text != null ? text : "";
+    invalidateLabelCache();
   }
 
   public byte getIconId() {
@@ -309,9 +338,16 @@ public void setIconId(int iconId) {
 
   public Rect getBoundingBox() {
     if (boundingBoxNeedsUpdate) computeBoundingBox();
+    // Position and size always come from the ICP profile. VisualStyle (ORIGINAL vs GAMEHUB) only
+    // changes how an element is drawn, never where it sits — GameHub layouts ship as their own ICP.
     return boundingBox;
   }
 
+  /** Trigger/bumper silhouette for this element when drawn in the GameHub style, or null. */
+  private GameHubLayout.RenderShape gameHubTriggerShape() {
+    return GameHubLayout.triggerShapeFor(GameHubLayout.roleFor(this));
+  }
+
   private Rect computeBoundingBox() {
     int snappingSize = inputControlsView.getSnappingSize();
     int halfWidth = 0;
@@ -375,30 +411,82 @@ private Rect computeBoundingBox() {
 }
 
   private String getDisplayText() {
+    if (displayTextCache != null) return displayTextCache;
+    String result;
+    // Per-element text always wins (user explicit override).
     if (text != null && !text.isEmpty()) {
-      return text;
+      result = text;
     } else {
       Binding binding = getBindingAt(0);
-      String text = binding.toString().replace("NUMPAD ", "NP").replace("BUTTON ", "");
-      if (text.length() > 7) {
-        String[] parts = text.split(" ");
-        StringBuilder sb = new StringBuilder();
-        for (String part : parts) sb.append(part.charAt(0));
-        return (binding.isMouse() ? "M" : "") + sb;
-      } else return text;
+      String bumper = bumperTriggerLabel(binding);
+      if (bumper != null) {
+        result = bumper;
+      } else {
+        String s = binding.toString().replace("NUMPAD ", "NP").replace("BUTTON ", "");
+        if (s.length() > 7) {
+          String[] parts = s.split(" ");
+          StringBuilder sb = new StringBuilder();
+          for (String part : parts) sb.append(part.charAt(0));
+          result = (binding.isMouse() ? "M" : "") + sb;
+        } else result = s;
+      }
+    }
+    displayTextCache = result;
+    return result;
+  }
+
+  private void invalidateLabelCache() {
+    displayTextCache = null;
+    bindingTextCache = null;
+  }
+
+  /** Returns the per-element customColor, or {@code -1} if unset (fall back to theme accent). */
+  private int resolveAccentColor() {
+    return customColor;
+  }
+
+  /** Bumper/trigger labels follow the standard gamepad naming; null for every other binding. */
+  private static String bumperTriggerLabel(Binding binding) {
+    if (binding == null) return null;
+    switch (binding) {
+      case GAMEPAD_BUTTON_L1:
+        return "LB";
+      case GAMEPAD_BUTTON_R1:
+        return "RB";
+      case GAMEPAD_BUTTON_L2:
+        return "LT";
+      case GAMEPAD_BUTTON_R2:
+        return "RT";
+      default:
+        return null;
     }
   }
 
   private String getBindingShortText(int index) {
+    String[] cache = bindingTextCache;
+    if (cache != null && index < cache.length && cache[index] != null) return cache[index];
     Binding binding = getBindingAt(index);
-    String text = binding.toString().replace("NUMPAD ", "NP").replace("BUTTON ", "").replace("KEY_", "").replace("GAMEPAD_", "");
-    if (text.length() > 6) {
-      String[] parts = text.split("_");
-      StringBuilder sb = new StringBuilder();
-      for (String part : parts) if (!part.isEmpty()) sb.append(part.charAt(0));
-      return (binding.isMouse() ? "M" : "") + sb.toString();
+    String bumper = bumperTriggerLabel(binding);
+    String result;
+    if (bumper != null) {
+      result = bumper;
+    } else {
+      String text = binding.toString().replace("NUMPAD ", "NP").replace("BUTTON ", "").replace("KEY_", "").replace("GAMEPAD_", "");
+      if (text.length() > 6) {
+        String[] parts = text.split("_");
+        StringBuilder sb = new StringBuilder();
+        for (String part : parts) if (!part.isEmpty()) sb.append(part.charAt(0));
+        result = (binding.isMouse() ? "M" : "") + sb;
+      } else {
+        result = text.replace("_", " ");
+      }
+    }
+    if (cache == null || cache.length != bindings.length) {
+      cache = new String[bindings.length];
+      bindingTextCache = cache;
     }
-    return text.replace("_", " ");
+    if (index < cache.length) cache[index] = result;
+    return result;
   }
 
   private static float getTextSizeForWidth(Paint paint, String text, float desiredWidth) {
@@ -407,7 +495,24 @@ private static float getTextSizeForWidth(Paint paint, String text, float desired
     return testTextSize * desiredWidth / paint.measureText(text);
   }
 
+  private static final String[][] rangeTextCache = new String[Range.values().length][];
+
   private static String getRangeTextForIndex(Range range, int index) {
+    if (index < 0 || index >= range.max) return computeRangeText(range, index);
+    String[] cache = rangeTextCache[range.ordinal()];
+    if (cache == null) {
+      cache = new String[range.max];
+      rangeTextCache[range.ordinal()] = cache;
+    }
+    String cached = cache[index];
+    if (cached == null) {
+      cached = computeRangeText(range, index);
+      cache[index] = cached;
+    }
+    return cached;
+  }
+
+  private static String computeRangeText(Range range, int index) {
     String text = "";
     switch (range) {
       case FROM_A_TO_Z:
@@ -430,12 +535,114 @@ private boolean isEngaged() {
     return currentPointerId != -1 || (toggleSwitch && selected);
   }
 
+  // Shared draw caches. Drawing happens only on the UI thread, so static temps are safe.
+  private static Shader bloomShader;
+  private static Shader edgeShadeShader;
+  private static final Matrix shaderMatrix = new Matrix();
+  private static final RectF tempRect = new RectF();
+  private PorterDuffColorFilter cachedAccentFilter;
+  private int cachedAccentFilterColor = 1;
+  private CornerPathEffect cachedCornerEffect;
+  private float cachedCornerRadius = -1f;
+
+  private static Shader getBloomShader() {
+    if (bloomShader == null) {
+      bloomShader =
+          new RadialGradient(
+              0f, 0f, 1f,
+              new int[] {0x8CFFFFFF, 0x3EFFFFFF, 0x00FFFFFF},
+              new float[] {0f, 0.6f, 1f},
+              Shader.TileMode.CLAMP);
+    }
+    return bloomShader;
+  }
+
+  private static Shader getEdgeShadeShader() {
+    if (edgeShadeShader == null) {
+      edgeShadeShader =
+          new RadialGradient(0f, 0f, 1f, 0x00000000, 0xFF000000, Shader.TileMode.CLAMP);
+    }
+    return edgeShadeShader;
+  }
+
+  private static void placeShader(Shader shader, float cx, float cy, float r) {
+    shaderMatrix.reset();
+    shaderMatrix.postScale(r, r);
+    shaderMatrix.postTranslate(cx, cy);
+    shader.setLocalMatrix(shaderMatrix);
+  }
+
+  private PorterDuffColorFilter accentFilter(int color) {
+    if (cachedAccentFilterColor != color) {
+      cachedAccentFilter = new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN);
+      cachedAccentFilterColor = color;
+    }
+    return cachedAccentFilter;
+  }
+
+  private CornerPathEffect cornerEffect(float radius) {
+    if (cachedCornerEffect == null || cachedCornerRadius != radius) {
+      cachedCornerEffect = new CornerPathEffect(radius);
+      cachedCornerRadius = radius;
+    }
+    return cachedCornerEffect;
+  }
+
+  private int resolveThemedAccent() {
+    int c = resolveAccentColor();
+    return c != -1 ? c : inputControlsView.getAccentTheme().accent;
+  }
+
+  private void beginBloom(Paint paint, float cx, float cy, float r, int accent, float alpha) {
+    Shader bloom = getBloomShader();
+    placeShader(bloom, cx, cy, r);
+    paint.setStyle(Paint.Style.FILL);
+    paint.setShader(bloom);
+    paint.setColorFilter(accentFilter(accent));
+    paint.setAlpha((int) (255 * alpha));
+  }
+
+  private static void endBloom(Paint paint) {
+    paint.setShader(null);
+    paint.setColorFilter(null);
+  }
+
   public void draw(Canvas canvas) {
+    VisualStyle style = inputControlsView.getVisualStyle();
+    if (style == VisualStyle.GAMEHUB) {
+      drawGameHub(canvas);
+      return;
+    }
+    if (style == VisualStyle.SHADOW) {
+      drawShadow(canvas);
+      return;
+    }
+    if (style == VisualStyle.RETICLE) {
+      drawReticle(canvas);
+      return;
+    }
+    if (style == VisualStyle.NEON) {
+      drawNeon(canvas);
+      return;
+    }
+    if (style == VisualStyle.LUMINA) {
+      drawLumina(canvas);
+      return;
+    }
+    if (style != VisualStyle.ORIGINAL) {
+      drawClean(canvas, style);
+      return;
+    }
     int snappingSize = inputControlsView.getSnappingSize();
     Paint paint = inputControlsView.getPaint();
     float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
-    int primaryColor = customColor != -1
-        ? ColorUtils.setAlphaComponent(customColor, (int) (Math.min(1.0f,
+    int accent = resolveAccentColor();
+    if (accent == -1) {
+      AccentTheme theme = inputControlsView.getAccentTheme();
+      if (theme != AccentTheme.MONO) accent = theme.accent;
+    }
+    int primaryColor = accent != -1
+        ? ColorUtils.setAlphaComponent(accent, (int) (Math.min(1.0f,
             inputControlsView.getOverlayOpacity() * 2.0f) * 255))
         : inputControlsView.getPrimaryColor();
     int alpha = (int) (Color.alpha(primaryColor) * effectiveOpacity);
@@ -446,7 +653,7 @@ public void draw(Canvas canvas) {
     int secondaryColor = ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), highlightAlpha);
 
     paint.setColor(
-        (selected && customColor == -1) ? secondaryColor : primaryColor);
+        (selected && accent == -1) ? secondaryColor : primaryColor);
     paint.setStyle(Paint.Style.STROKE);
     float strokeWidth = snappingSize * 0.25f;
     paint.setStrokeWidth(strokeWidth);
@@ -499,7 +706,7 @@ public void draw(Canvas canvas) {
 
           paint.setStyle(Paint.Style.STROKE);
           paint.setColor(
-              (selected && customColor == -1)
+              (selected && accent == -1)
                   ? secondaryColor
                   : primaryColor);
           paint.setStrokeWidth(strokeWidth);
@@ -540,7 +747,9 @@ public void draw(Canvas canvas) {
           }
 
           if (iconId > 0) {
-            drawIcon(canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId);
+            drawIcon(
+                canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId, true,
+                accent != -1 ? accentFilter(accent) : inputControlsView.getColorFilter());
           } else {
             String text = getDisplayText();
             paint.setTextSize(
@@ -605,16 +814,15 @@ public void draw(Canvas canvas) {
 
           paint.setStyle(Paint.Style.STROKE);
           paint.setColor(
-              (selected && customColor == -1)
+              (selected && accent == -1)
                   ? secondaryColor
                   : primaryColor);
           canvas.drawCircle(cx, cy, radius, paint);
 
-          if (iconId > 0) {
-            drawIcon(canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId);
-          } else {
-            drawIcon(canvas, cx, cy, boundingBox.width(), boundingBox.height(), 34);
-          }
+          drawIcon(
+              canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+              iconId > 0 ? iconId : 34, true,
+              accent != -1 ? accentFilter(accent) : inputControlsView.getColorFilter());
           break;
         }
       case D_PAD:
@@ -835,168 +1043,2848 @@ public void draw(Canvas canvas) {
     }
   }
 
-  private void drawIcon(Canvas canvas, float cx, float cy, float width, float height, int iconId) {
-    drawIcon(canvas, cx, cy, width, height, iconId, true);
-  }
-
-  private void drawIcon(Canvas canvas, float cx, float cy, float width, float height, int iconId, boolean automargin) {
-    Bitmap icon = inputControlsView.getIcon((byte) iconId);
-    if (icon == null) return;
-    Paint paint = inputControlsView.getPaint();
-    paint.setColorFilter(inputControlsView.getColorFilter());
-    int margin = automargin ? (int) (inputControlsSize() * (shape == Shape.CIRCLE || shape == Shape.SQUARE ? 2.0f : 1.0f) * scale) : 0;
-    int halfSize = (int) ((Math.min(width, height) - margin) * 0.5f);
-
-    Rect srcRect = new Rect(0, 0, icon.getWidth(), icon.getHeight());
-    Rect dstRect =
-        new Rect(
-            (int) (cx - halfSize),
-            (int) (cy - halfSize),
-            (int) (cx + halfSize),
-            (int) (cy + halfSize));
-    canvas.drawBitmap(icon, srcRect, dstRect, paint);
-    paint.setColorFilter(null);
+  /** Builds an outward-pointing arrow triangle for D-pad direction {@code dir} (0=up..3=left). */
+  private static void buildDpadArrowPath(Path p, float ax, float ay, float t, int dir) {
+    p.reset();
+    if (dir == 0) {
+      p.moveTo(ax, ay - t);
+      p.lineTo(ax + 0.85f * t, ay + 0.65f * t);
+      p.lineTo(ax - 0.85f * t, ay + 0.65f * t);
+    } else if (dir == 1) {
+      p.moveTo(ax + t, ay);
+      p.lineTo(ax - 0.65f * t, ay + 0.85f * t);
+      p.lineTo(ax - 0.65f * t, ay - 0.85f * t);
+    } else if (dir == 2) {
+      p.moveTo(ax, ay + t);
+      p.lineTo(ax - 0.85f * t, ay - 0.65f * t);
+      p.lineTo(ax + 0.85f * t, ay - 0.65f * t);
+    } else {
+      p.moveTo(ax - t, ay);
+      p.lineTo(ax + 0.65f * t, ay - 0.85f * t);
+      p.lineTo(ax + 0.65f * t, ay + 0.85f * t);
+    }
+    p.close();
   }
 
-  private int inputControlsSize() {
-    return inputControlsView.getSnappingSize();
+  private float cleanCornerRadius(Rect bb) {
+    switch (shape) {
+      case ROUND_RECT:
+        return bb.height() * 0.5f;
+      case SQUARE:
+        return Math.min(bb.width(), bb.height()) * 0.28f;
+      case RECT:
+        return bb.height() * 0.22f;
+      default:
+        return 0f;
+    }
   }
 
-  public JSONObject toJSONObject() {
-    try {
-      JSONObject elementJSONObject = new JSONObject();
-      elementJSONObject.put("type", type.name());
-      elementJSONObject.put("shape", shape.name());
-      elementJSONObject.put("customColor", customColor);
-
-      JSONArray bindingsJSONArray = new JSONArray();
-      for (Binding binding : bindings) bindingsJSONArray.put(binding.name());
-
-      elementJSONObject.put("bindings", bindingsJSONArray);
-      elementJSONObject.put("scale", Float.valueOf(scale));
-      if (opacity < 1.0f) elementJSONObject.put("opacity", Float.valueOf(opacity));
-      elementJSONObject.put("x", (float) x / inputControlsView.getMaxWidth());
-      elementJSONObject.put("y", (float) y / inputControlsView.getMaxHeight());
-      elementJSONObject.put("toggleSwitch", toggleSwitch);
-      elementJSONObject.put("text", text);
-      elementJSONObject.put("iconId", iconId);
-
-      if (type == Type.RANGE_BUTTON && range != null) {
-        elementJSONObject.put("range", range.name());
-        if (orientation != 0) elementJSONObject.put("orientation", orientation);
-      }
-      return elementJSONObject;
-    } catch (JSONException e) {
-      return null;
+  private void drawCleanBody(Canvas canvas, Paint paint, Rect bb, float inset) {
+    if (shape == Shape.CIRCLE) {
+      canvas.drawCircle(bb.exactCenterX(), bb.exactCenterY(), bb.width() * 0.5f - inset, paint);
+    } else {
+      float r = Math.max(2f, cleanCornerRadius(bb) - inset);
+      canvas.drawRoundRect(
+          bb.left + inset, bb.top + inset, bb.right - inset, bb.bottom - inset, r, r, paint);
     }
   }
 
-  public boolean containsPoint(float x, float y) {
-    if (type == Type.RADIAL_MENU && radialMenuExpanded) {
-      float outerRadius = boundingBox.width() + (inputControlsView.getSnappingSize() * scale);
-      return Mathf.distance((float) boundingBox.centerX(), (float) boundingBox.centerY(), x, y) < outerRadius;
+  /** SLATE/HALO/GLINT — flat graphite bodies with the accent carried by outline, indicators and labels. */
+  private void drawClean(Canvas canvas, VisualStyle style) {
+    int snappingSize = inputControlsView.getSnappingSize();
+    Paint paint = inputControlsView.getPaint();
+    float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
+    float overlayOpacity = inputControlsView.getOverlayOpacity();
+    float dim = overlayOpacity <= 0.4f
+        ? 0.28f + (overlayOpacity - 0.1f) * (0.5f / 0.3f)
+        : 0.78f + (overlayOpacity - 0.4f) * (0.22f / 0.6f);
+    float a = Mathf.clamp(dim, 0f, 1f) * effectiveOpacity;
+    boolean engaged = isEngaged();
+    Rect boundingBox = getBoundingBox();
+    int accent = resolveThemedAccent();
+    int bodyColor = Color.argb((int) (150 * a), 0x14, 0x18, 0x1F);
+    float hairline = Math.max(1.5f, snappingSize * 0.09f * scale);
+    boolean halo = style == VisualStyle.HALO;
+    boolean glint = style == VisualStyle.GLINT;
+
+    paint.setStrokeJoin(Paint.Join.ROUND);
+    paint.setStrokeCap(Paint.Cap.BUTT);
+
+    int frameColor;
+    float frameWidth;
+    if (halo) {
+      frameColor = ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 250 : 215) * a));
+      frameWidth = hairline * (engaged ? 2.8f : 1.9f);
+    } else if (glint) {
+      frameColor = engaged
+          ? ColorUtils.setAlphaComponent(accent, (int) (245 * a))
+          : Color.argb((int) (55 * a), 255, 255, 255);
+      frameWidth = hairline * (engaged ? 1.8f : 1f);
+    } else {
+      frameColor = ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 240 : 150) * a));
+      frameWidth = hairline * (engaged ? 1.6f : 1f);
     }
-    return getBoundingBox().contains((int) (x + 0.5f), (int) (y + 0.5f));
-  }
+    if (selected && resolveAccentColor() == -1) {
+      frameColor =
+          ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), (int) (235 * a));
+    }
+    float frameInset = halo ? hairline * 2.5f : 0f;
+    int labelColor = (halo || engaged)
+        ? Color.argb((int) (240 * a), 255, 255, 255)
+        : ColorUtils.setAlphaComponent(accent, (int) (235 * a));
+    ColorFilter iconTint =
+        (halo || engaged) ? inputControlsView.getColorFilter() : accentFilter(accent);
 
-  private boolean isKeepButtonPressedAfterMinTime() {
-    Binding binding = getBindingAt(0);
-    return !toggleSwitch
-        && (binding == Binding.GAMEPAD_BUTTON_L3 || binding == Binding.GAMEPAD_BUTTON_R3);
-  }
+    switch (type) {
+      case BUTTON: {
+        float cx = boundingBox.centerX();
+        float cy = boundingBox.centerY();
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bodyColor);
+        drawCleanBody(canvas, paint, boundingBox, 0f);
+        if (engaged) {
+          if (!halo && !glint) {
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (105 * a)));
+            drawCleanBody(canvas, paint, boundingBox, 0f);
+          }
+          float bloomRadius = Math.min(boundingBox.width(), boundingBox.height()) * 0.52f;
+          beginBloom(paint, cx, cy, bloomRadius, accent, a * 0.9f);
+          drawCleanBody(canvas, paint, boundingBox, 0f);
+          endBloom(paint);
+        }
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(frameWidth);
+        paint.setColor(frameColor);
+        drawCleanBody(canvas, paint, boundingBox, frameInset);
+
+        if (glint && !engaged) {
+          paint.setStrokeCap(Paint.Cap.ROUND);
+          paint.setStrokeWidth(hairline * 1.9f);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (220 * a)));
+          if (shape == Shape.CIRCLE) {
+            tempRect.set(
+                boundingBox.left + hairline,
+                boundingBox.top + hairline,
+                boundingBox.right - hairline,
+                boundingBox.bottom - hairline);
+            canvas.drawArc(tempRect, 62, 56, false, paint);
+          } else {
+            float lineY = boundingBox.bottom - hairline * 2.2f;
+            float halfLength = boundingBox.width() * 0.21f;
+            canvas.drawLine(cx - halfLength, lineY, cx + halfLength, lineY, paint);
+          }
+          paint.setStrokeCap(Paint.Cap.BUTT);
+        }
 
-  private void dispatchButtonBinding(Binding primary, Binding secondary, boolean pressed) {
-    inputControlsView.handleInputEvent(primary, pressed);
-    if (secondary != Binding.NONE && secondary != primary) {
-      inputControlsView.handleInputEvent(secondary, pressed);
-    }
-  }
+        if (iconId > 0) {
+          paint.setColor(labelColor);
+          drawIcon(canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId, true, iconTint);
+        } else {
+          String label = getDisplayText();
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(labelColor);
+          paint.setTextSize(
+              Math.min(
+                  getTextSizeForWidth(paint, label, boundingBox.width() - hairline * 4),
+                  snappingSize * 2 * scale));
+          paint.setTextAlign(Paint.Align.CENTER);
+          canvas.drawText(label, x, (y - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+        }
+        break;
+      }
+      case D_PAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float base = Math.min(boundingBox.width(), boundingBox.height());
+        float half = base * 0.5f;
+        float arm = base * 0.17f;
+        path.reset();
+        path.moveTo(cx - arm, cy - half);
+        path.lineTo(cx + arm, cy - half);
+        path.lineTo(cx + arm, cy - arm);
+        path.lineTo(cx + half, cy - arm);
+        path.lineTo(cx + half, cy + arm);
+        path.lineTo(cx + arm, cy + arm);
+        path.lineTo(cx + arm, cy + half);
+        path.lineTo(cx - arm, cy + half);
+        path.lineTo(cx - arm, cy + arm);
+        path.lineTo(cx - half, cy + arm);
+        path.lineTo(cx - half, cy - arm);
+        path.lineTo(cx - arm, cy - arm);
+        path.close();
+
+        paint.setPathEffect(cornerEffect(base * 0.09f));
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bodyColor);
+        canvas.drawPath(path, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(frameWidth);
+        paint.setColor(frameColor);
+        canvas.drawPath(path, paint);
+        paint.setPathEffect(null);
+
+        boolean hasStates = engaged && states.length >= 4;
+        for (int i = 0; i < 4; i++) {
+          int dx = i == 1 ? 1 : i == 3 ? -1 : 0;
+          int dy = i == 2 ? 1 : i == 0 ? -1 : 0;
+          boolean hot = hasStates && states[i];
+          if (hot) {
+            float bx = cx + dx * half * 0.55f;
+            float by = cy + dy * half * 0.55f;
+            beginBloom(paint, bx, by, base * 0.24f, accent, a);
+            canvas.drawCircle(bx, by, base * 0.24f, paint);
+            endBloom(paint);
+          }
+          float ax = cx + dx * half * 0.62f;
+          float ay = cy + dy * half * 0.62f;
+          buildDpadArrowPath(path, ax, ay, base * 0.055f, i);
+          paint.setStyle(Paint.Style.FILL);
+          if (halo) {
+            paint.setColor(hot
+                ? ColorUtils.setAlphaComponent(accent, (int) (240 * a))
+                : Color.argb((int) (190 * a), 255, 255, 255));
+          } else {
+            paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((hot ? 250 : 220) * a)));
+          }
+          canvas.drawPath(path, paint);
+        }
 
-  public boolean handleTouchDown(int pointerId, float x, float y) {
-    if (currentPointerId == -1 && containsPoint(x, y)) {
-      if (type != Type.RANGE_BUTTON && type != Type.RADIAL_MENU) {
-        boolean hasBinding = false;
-        for (Binding binding : bindings) {
-          if (binding != Binding.NONE) {
-            hasBinding = true;
-            break;
+        if (glint) {
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(hairline * 1.9f);
+          paint.setStrokeCap(Paint.Cap.ROUND);
+          float tickInset = hairline * 1.6f;
+          float span = arm * 0.45f;
+          for (int i = 0; i < 4; i++) {
+            boolean hot = hasStates && states[i];
+            paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((hot ? 245 : 170) * a)));
+            if (i == 0) {
+              canvas.drawLine(cx - span, cy - half + tickInset, cx + span, cy - half + tickInset, paint);
+            } else if (i == 1) {
+              canvas.drawLine(cx + half - tickInset, cy - span, cx + half - tickInset, cy + span, paint);
+            } else if (i == 2) {
+              canvas.drawLine(cx - span, cy + half - tickInset, cx + span, cy + half - tickInset, paint);
+            } else {
+              canvas.drawLine(cx - half + tickInset, cy - span, cx - half + tickInset, cy + span, paint);
+            }
           }
+          paint.setStrokeCap(Paint.Cap.BUTT);
         }
-        if (!hasBinding) return false;
+        break;
       }
+      case STICK: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float r = boundingBox.height() * 0.5f;
+
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.argb((int) (120 * a), 0x14, 0x18, 0x1F));
+        canvas.drawCircle(cx, cy, r, paint);
+
+        float thumbX = getCurrentPosition().x;
+        float thumbY = getCurrentPosition().y;
+        float thumbRadius = snappingSize * 3.5f * scale;
+
+        if (engaged) {
+          beginBloom(paint, thumbX, thumbY, thumbRadius * 1.6f, accent, a * 0.8f);
+          canvas.drawCircle(thumbX, thumbY, thumbRadius * 1.6f, paint);
+          endBloom(paint);
+        }
 
-      currentPointerId = pointerId;
-      if (type == Type.BUTTON) {
-        if (isKeepButtonPressedAfterMinTime()) touchTime = System.currentTimeMillis();
-        if (!toggleSwitch || !selected) {
-          dispatchButtonBinding(getBindingAt(0), getBindingAt(1), true);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(frameWidth);
+        paint.setColor(frameColor);
+        canvas.drawCircle(cx, cy, r - frameInset, paint);
+
+        float guideWidth = Math.max(2f, snappingSize * 0.14f * scale);
+        paint.setStrokeWidth(guideWidth);
+        if (glint && !engaged) {
+          paint.setStrokeCap(Paint.Cap.ROUND);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (110 * a)));
+          float arcRadius = r - hairline;
+          tempRect.set(cx - arcRadius, cy - arcRadius, cx + arcRadius, cy + arcRadius);
+          canvas.drawArc(tempRect, 62, 56, false, paint);
+          paint.setStrokeCap(Paint.Cap.BUTT);
+        } else {
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 220 : 110) * a)));
+          canvas.drawCircle(cx, cy, r * 0.58f, paint);
         }
-        inputControlsView.invalidate();
-        return true;
-      } else if (type == Type.RADIAL_MENU) {
-        wasExpandedOnDown = radialMenuExpanded;
-        if (!radialMenuExpanded) {
-          radialMenuExpanded = true;
-          paths = null;
-          isRadialBindingCurrentlyHeld = false;
+
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.argb((int) (200 * a), 0x1C, 0x22, 0x2B));
+        canvas.drawCircle(thumbX, thumbY, thumbRadius, paint);
+        if (glint) {
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(hairline);
+          paint.setColor(Color.argb((int) (55 * a), 255, 255, 255));
+          canvas.drawCircle(thumbX, thumbY, thumbRadius, paint);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (240 * a)));
+          canvas.drawCircle(thumbX, thumbY, Math.max(2.5f, snappingSize * 0.3f), paint);
         } else {
-          activeRadialBindingIndex = getRadialBindingIndexAt(x, y);
-          boolean isInsideRadius = isPointerInsideRadialMenuRadius(x, y);
-          
-          if (activeRadialBindingIndex != -1) {
-            Binding binding = getBindingAt(activeRadialBindingIndex);
-            if (isInsideRadius) {
-              inputControlsView.handleInputEvent(binding, true);
-              isRadialBindingCurrentlyHeld = true;
-            } else if (binding != Binding.NONE) {
-              inputControlsView.handleInputEvent(binding, true);
-              inputControlsView.postDelayed(() -> inputControlsView.handleInputEvent(binding, false), 30);
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(hairline * (halo ? 2.2f : 1.4f));
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 245 : 150) * a)));
+          canvas.drawCircle(thumbX, thumbY, thumbRadius, paint);
+        }
+        break;
+      }
+      case TRACKPAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float radius = boundingBox.height() * 0.18f;
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bodyColor);
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            radius, radius, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(frameWidth);
+        paint.setColor(frameColor);
+        if (halo) {
+          float in = frameInset;
+          float fr = Math.max(2f, radius - in);
+          canvas.drawRoundRect(
+              boundingBox.left + in, boundingBox.top + in,
+              boundingBox.right - in, boundingBox.bottom - in,
+              fr, fr, paint);
+        } else {
+          canvas.drawRoundRect(
+              boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+              radius, radius, paint);
+        }
+        if (glint && !engaged) {
+          paint.setStrokeCap(Paint.Cap.ROUND);
+          paint.setStrokeWidth(hairline * 1.9f);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (220 * a)));
+          float lineY = boundingBox.bottom - hairline * 2.2f;
+          float halfLength = boundingBox.width() * 0.175f;
+          canvas.drawLine(cx - halfLength, lineY, cx + halfLength, lineY, paint);
+          paint.setStrokeCap(Paint.Cap.BUTT);
+        }
+
+        float s = Math.min(boundingBox.width(), boundingBox.height()) * 0.45f;
+        float glyphW = 0.42f * s;
+        float glyphH = 0.62f * s;
+        float glyphRadius = glyphW * 0.5f;
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(Math.max(2f, s * 0.035f));
+        paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 220 : 110) * a)));
+        canvas.drawRoundRect(
+            cx - glyphW * 0.5f, cy - glyphH * 0.5f, cx + glyphW * 0.5f, cy + glyphH * 0.5f,
+            glyphRadius, glyphRadius, paint);
+        canvas.drawLine(cx, cy - 0.30f * glyphH, cx, cy - 0.02f * glyphH, paint);
+        break;
+      }
+      case RANGE_BUTTON: {
+        Range range = getRange();
+        float rr = (orientation == 0 ? boundingBox.height() : boundingBox.width()) * 0.45f;
+        float elementSize = scroller.getElementSize();
+        float minTextSize = snappingSize * 2 * scale;
+        float scrollOffset = scroller.getScrollOffset();
+        byte[] rangeIndex = scroller.getRangeIndex();
+
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bodyColor);
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            rr, rr, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(frameWidth);
+        paint.setColor(frameColor);
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            rr, rr, paint);
+
+        canvas.save();
+        path.reset();
+        path.addRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            rr, rr, Path.Direction.CW);
+        canvas.clipPath(path);
+
+        int pressedIndex =
+            currentPointerId != -1 && !scroller.isScrolling() ? scroller.getBindingIndex() : -1;
+        int dividerColor = Color.argb((int) (45 * a), 255, 255, 255);
+        float dividerWidth = Math.max(1f, snappingSize * 0.06f);
+        int hotTextColor = Color.argb((int) (240 * a), 255, 255, 255);
+        int cellTextColor = ColorUtils.setAlphaComponent(accent, (int) (225 * a));
+
+        if (orientation == 0) {
+          float lineTop = boundingBox.top + boundingBox.height() * 0.25f;
+          float lineBottom = boundingBox.bottom - boundingBox.height() * 0.25f;
+          float startX = boundingBox.left - (scrollOffset % elementSize);
+
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(dividerWidth);
+            paint.setColor(dividerColor);
+            if (startX > boundingBox.left && startX < boundingBox.right)
+              canvas.drawLine(startX, lineTop, startX, lineBottom, paint);
+
+            if (startX < boundingBox.right && startX + elementSize > boundingBox.left) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                drawCleanHotCell(
+                    canvas, paint, style, accent, a, hairline,
+                    startX, boundingBox.top, startX + elementSize, boundingBox.bottom);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, elementSize - hairline * 4),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  startX + elementSize * 0.5f,
+                  (y - ((paint.descent() + paint.ascent()) * 0.5f)),
+                  paint);
             }
-          } else if (Mathf.distance((float) boundingBox.centerX(), (float) boundingBox.centerY(), x, y) < boundingBox.width() * 0.5f) {
-            radialMenuExpanded = false;
-            paths = null;
-            isRadialBindingCurrentlyHeld = false;
+            startX += elementSize;
+          }
+        } else {
+          float lineLeft = boundingBox.left + boundingBox.width() * 0.25f;
+          float lineRight = boundingBox.right - boundingBox.width() * 0.25f;
+          float startY = boundingBox.top - (scrollOffset % elementSize);
+
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(dividerWidth);
+            paint.setColor(dividerColor);
+            if (startY > boundingBox.top && startY < boundingBox.bottom)
+              canvas.drawLine(lineLeft, startY, lineRight, startY, paint);
+
+            if (startY < boundingBox.bottom && startY + elementSize > boundingBox.top) {
+              boolean hot = i % range.max == pressedIndex;
+              if (hot) {
+                drawCleanHotCell(
+                    canvas, paint, style, accent, a, hairline,
+                    boundingBox.left, startY, boundingBox.right, startY + elementSize);
+              }
+              String cellText = getRangeTextForIndex(range, i % range.max);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, boundingBox.width() - hairline * 4),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  x,
+                  startY + elementSize * 0.5f - ((paint.descent() + paint.ascent()) * 0.5f),
+                  paint);
+            }
+            startY += elementSize;
           }
         }
-        inputControlsView.invalidate();
-        return true;
-      } else if (type == Type.RANGE_BUTTON) {
-        scroller.handleTouchDown(x, y);
-        inputControlsView.invalidate();
-        return true;
-      } else {
-        if (type == Type.TRACKPAD) {
-          if (currentPosition == null) currentPosition = new PointF();
-          currentPosition.set(x, y);
+        canvas.restore();
+        break;
+      }
+      case RADIAL_MENU: {
+        float cx = boundingBox.centerX();
+        float cy = boundingBox.centerY();
+        float radius = boundingBox.width() * 0.5f;
+
+        if (radialMenuExpanded && bindings.length > 0 && radius > 0) {
+          float innerRadius = radius + snappingSize * 0.5f;
+          float outerRadius = boundingBox.width() + (snappingSize * scale);
+          float angleStep = 360.0f / bindings.length;
+
+          if (paths == null || paths.length != bindings.length) {
+            paths = new Path[bindings.length];
+            RectF outerRect = new RectF(cx - outerRadius, cy - outerRadius, cx + outerRadius, cy + outerRadius);
+            RectF innerRect = new RectF(cx - innerRadius, cy - innerRadius, cx + innerRadius, cy + innerRadius);
+
+            for (int i = 0; i < bindings.length; i++) {
+              float startAngle = -90.0f + i * angleStep;
+              paths[i] = new Path();
+              paths[i].arcTo(outerRect, startAngle, angleStep, true);
+              paths[i].arcTo(innerRect, startAngle + angleStep, -angleStep, false);
+              paths[i].close();
+            }
+          }
+
+          if (paths != null && paths.length == bindings.length) {
+            for (int i = 0; i < bindings.length; i++) {
+              boolean active = i == activeRadialBindingIndex;
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(
+                  active ? ColorUtils.setAlphaComponent(accent, (int) (80 * a)) : bodyColor);
+              canvas.drawPath(paths[i], paint);
+
+              paint.setStyle(Paint.Style.STROKE);
+              paint.setStrokeWidth(hairline);
+              paint.setColor(Color.argb((int) (50 * a), 255, 255, 255));
+              canvas.drawPath(paths[i], paint);
+
+              float middleAngle = (float) Math.toRadians(-90.0f + i * angleStep + angleStep * 0.5f);
+              float labelRadius = (innerRadius + outerRadius) * 0.5f;
+              float labelX = (float) (cx + Math.cos(middleAngle) * labelRadius);
+              float labelY = (float) (cy + Math.sin(middleAngle) * labelRadius);
+
+              String label = getBindingShortText(i);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? Color.argb((int) (240 * a), 255, 255, 255)
+                  : ColorUtils.setAlphaComponent(accent, (int) (215 * a)));
+              paint.setTextSize(snappingSize * 1.2f * scale);
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(label, labelX, labelY - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+          }
         }
-        return handleTouchMove(pointerId, x, y);
+
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bodyColor);
+        canvas.drawCircle(cx, cy, radius, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(frameWidth);
+        paint.setColor(frameColor);
+        canvas.drawCircle(cx, cy, radius - frameInset, paint);
+
+        paint.setColor(labelColor);
+        drawIcon(
+            canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+            iconId > 0 ? iconId : 34, true, iconTint);
+        break;
       }
-    } else return false;
+    }
+    paint.setStrokeJoin(Paint.Join.MITER);
+    paint.setStrokeCap(Paint.Cap.BUTT);
   }
 
-  public boolean handleTouchMove(int pointerId, float x, float y) {
-    if (pointerId == currentPointerId && type == Type.BUTTON) {
-      if (!containsPoint(x, y)) {
-        handleTouchUp(pointerId, x, y);
-      }
-      return true;
+  private void drawCleanHotCell(
+      Canvas canvas, Paint paint, VisualStyle style, int accent, float a, float hairline,
+      float left, float top, float right, float bottom) {
+    if (style == VisualStyle.GLINT) {
+      paint.setStyle(Paint.Style.STROKE);
+      paint.setStrokeWidth(hairline * 2.5f);
+      paint.setStrokeCap(Paint.Cap.ROUND);
+      paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (240 * a)));
+      float cx = (left + right) * 0.5f;
+      float halfBar = (right - left) * 0.275f;
+      float lineY = bottom - (bottom - top) * 0.12f;
+      canvas.drawLine(cx - halfBar, lineY, cx + halfBar, lineY, paint);
+      paint.setStrokeCap(Paint.Cap.BUTT);
+      return;
     }
+    tempRect.set(left + 4, top + 5, right - 4, bottom - 5);
+    float r = tempRect.height() * 0.5f;
+    if (style == VisualStyle.HALO) {
+      paint.setStyle(Paint.Style.STROKE);
+      paint.setStrokeWidth(hairline * 1.6f);
+      paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (235 * a)));
+    } else {
+      paint.setStyle(Paint.Style.FILL);
+      paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (70 * a)));
+    }
+    canvas.drawRoundRect(tempRect, r, r, paint);
+  }
 
-    if (pointerId == currentPointerId && type == Type.RADIAL_MENU && radialMenuExpanded) {
-      int index = getRadialBindingIndexAt(x, y);
-      boolean isInsideRadius = isPointerInsideRadialMenuRadius(x, y);
+  private static void buildChamferRectPath(Path p, float l, float t, float r, float b, float c) {
+    p.reset();
+    p.moveTo(l + c, t);
+    p.lineTo(r - c, t);
+    p.lineTo(r, t + c);
+    p.lineTo(r, b - c);
+    p.lineTo(r - c, b);
+    p.lineTo(l + c, b);
+    p.lineTo(l, b - c);
+    p.lineTo(l, t + c);
+    p.close();
+  }
 
-      if (index != activeRadialBindingIndex) {
-        if (activeRadialBindingIndex != -1 && isRadialBindingCurrentlyHeld) {
-          inputControlsView.handleInputEvent(getBindingAt(activeRadialBindingIndex), false);
-          isRadialBindingCurrentlyHeld = false;
-        }
+  /** Flat-top hexagon (vertices every 60 degrees starting at 0). */
+  private static void buildHexagonPath(Path p, float cx, float cy, float r) {
+    p.reset();
+    for (int i = 0; i < 6; i++) {
+      double angle = Math.toRadians(60 * i);
+      float px = cx + (float) (r * Math.cos(angle));
+      float py = cy + (float) (r * Math.sin(angle));
+      if (i == 0) p.moveTo(px, py);
+      else p.lineTo(px, py);
+    }
+    p.close();
+  }
 
-        activeRadialBindingIndex = index;
+  /** One faceted D-pad arm plate, built for "up" then rotated into place. */
+  private static void buildReticleArmPath(
+      Path p, float cx, float cy, float half, float armHalf, float gap, float chamfer, int dir) {
+    p.reset();
+    p.moveTo(cx - armHalf + chamfer, cy - half);
+    p.lineTo(cx + armHalf - chamfer, cy - half);
+    p.lineTo(cx + armHalf, cy - half + chamfer);
+    p.lineTo(cx + armHalf, cy - gap - armHalf);
+    p.lineTo(cx, cy - gap);
+    p.lineTo(cx - armHalf, cy - gap - armHalf);
+    p.lineTo(cx - armHalf, cy - half + chamfer);
+    p.close();
+    if (dir != 0) {
+      shaderMatrix.setRotate(90f * dir, cx, cy);
+      p.transform(shaderMatrix);
+    }
+  }
 
-        if (activeRadialBindingIndex != -1) {
-          Binding binding = getBindingAt(activeRadialBindingIndex);
-          if (isInsideRadius) {
+  /** RETICLE — open hairline linework with faceted frames and accent brackets that extend while pressed. */
+  private void drawReticle(Canvas canvas) {
+    int snappingSize = inputControlsView.getSnappingSize();
+    Paint paint = inputControlsView.getPaint();
+    float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
+    float overlayOpacity = inputControlsView.getOverlayOpacity();
+    float dim = overlayOpacity <= 0.4f
+        ? 0.28f + (overlayOpacity - 0.1f) * (0.5f / 0.3f)
+        : 0.78f + (overlayOpacity - 0.4f) * (0.22f / 0.6f);
+    float a = Mathf.clamp(dim, 0f, 1f) * effectiveOpacity;
+    boolean engaged = isEngaged();
+    Rect boundingBox = getBoundingBox();
+    int accent = resolveThemedAccent();
+    if (selected && resolveAccentColor() == -1) {
+      accent = ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), 255);
+    }
+    float hairline = Math.max(1.5f, snappingSize * 0.09f * scale);
+    float bracket = hairline * 2.2f;
+    int lineColor = Color.argb((int) (185 * a), 255, 255, 255);
+    int scrimColor = Color.argb((int) (24 * a), 0, 0, 0);
+    int accentIdle = ColorUtils.setAlphaComponent(accent, (int) (220 * a));
+    int accentFull = ColorUtils.setAlphaComponent(accent, (int) (250 * a));
+    int labelColor = engaged ? Color.argb((int) (245 * a), 255, 255, 255) : accentIdle;
+    int ghostFill = ColorUtils.setAlphaComponent(accent, (int) (46 * a));
+    float minTextSize = snappingSize * 1.9f * scale;
+    paint.setStrokeCap(Paint.Cap.BUTT);
+    paint.setStrokeJoin(Paint.Join.MITER);
+
+    switch (type) {
+      case BUTTON: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float w = boundingBox.width();
+        float h = boundingBox.height();
+        if (shape == Shape.CIRCLE) {
+          float r = w * 0.5f - hairline;
+          buildHexagonPath(path, cx, cy, r);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(scrimColor);
+          canvas.drawPath(path, paint);
+          if (engaged) {
+            paint.setColor(ghostFill);
+            canvas.drawPath(path, paint);
+          }
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(hairline);
+          paint.setColor(lineColor);
+          canvas.drawPath(path, paint);
+          if (engaged) {
+            buildHexagonPath(path, cx, cy, r - hairline * 3f);
+            paint.setColor(accentFull);
+            canvas.drawPath(path, paint);
+          }
+          float tick = r * (engaged ? 0.30f : 0.18f);
+          paint.setStrokeWidth(bracket * (engaged ? 1.3f : 1f));
+          paint.setColor(engaged ? accentFull : accentIdle);
+          canvas.drawLine(cx - r, cy, cx - r - tick, cy, paint);
+          canvas.drawLine(cx + r, cy, cx + r + tick, cy, paint);
+        } else {
+          float chamfer = shape == Shape.SQUARE
+              ? snappingSize * 0.9f * scale
+              : h * 0.35f;
+          buildChamferRectPath(
+              path, boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+              chamfer);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(scrimColor);
+          canvas.drawPath(path, paint);
+          if (engaged) {
+            paint.setColor(ghostFill);
+            canvas.drawPath(path, paint);
+          }
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(hairline);
+          paint.setColor(lineColor);
+          canvas.drawPath(path, paint);
+          float len = Math.min(w, h) * (engaged ? 0.34f : 0.22f);
+          paint.setStrokeWidth(engaged ? hairline * 3f : bracket);
+          paint.setColor(engaged ? accentFull : accentIdle);
+          if (shape == Shape.SQUARE) {
+            drawCornerBrackets(canvas, paint, boundingBox, len);
+          } else {
+            canvas.drawLine(
+                boundingBox.left, boundingBox.bottom - chamfer,
+                boundingBox.left + chamfer, boundingBox.bottom, paint);
+            canvas.drawLine(
+                boundingBox.left, boundingBox.top + chamfer,
+                boundingBox.left + chamfer, boundingBox.top, paint);
+            canvas.drawLine(
+                boundingBox.right, boundingBox.bottom - chamfer,
+                boundingBox.right - chamfer, boundingBox.bottom, paint);
+            canvas.drawLine(
+                boundingBox.right, boundingBox.top + chamfer,
+                boundingBox.right - chamfer, boundingBox.top, paint);
+          }
+        }
+        if (iconId > 0) {
+          drawIcon(
+              canvas, cx, cy, w, h, iconId, true,
+              engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        } else {
+          String label = getDisplayText();
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(labelColor);
+          paint.setLetterSpacing(0.08f);
+          paint.setTextSize(
+              Math.min(getTextSizeForWidth(paint, label, w * 0.62f), minTextSize));
+          paint.setTextAlign(Paint.Align.CENTER);
+          canvas.drawText(label, cx, (cy - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+          paint.setLetterSpacing(0f);
+        }
+        break;
+      }
+      case D_PAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float base = Math.min(boundingBox.width(), boundingBox.height());
+        float half = base * 0.5f;
+        float armHalf = base * 0.15f;
+        float gap = base * 0.10f;
+        float chamfer = armHalf * 0.56f;
+        boolean hasStates = engaged && states.length >= 4;
+        for (int i = 0; i < 4; i++) {
+          boolean hot = hasStates && states[i];
+          buildReticleArmPath(path, cx, cy, half, armHalf, gap, chamfer, i);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(hot ? ghostFill : scrimColor);
+          canvas.drawPath(path, paint);
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(hairline);
+          paint.setColor(lineColor);
+          canvas.drawPath(path, paint);
+          int dx = i == 1 ? 1 : i == 3 ? -1 : 0;
+          int dy = i == 2 ? 1 : i == 0 ? -1 : 0;
+          float pos = gap + 0.62f * (half - gap);
+          float chevSize = base * 0.045f;
+          paint.setStrokeWidth(bracket);
+          paint.setColor(hot ? Color.argb((int) (250 * a), 255, 255, 255) : accentIdle);
+          int chevrons = hot ? 2 : 1;
+          for (int k = 0; k < chevrons; k++) {
+            float off = pos + (k - (chevrons - 1) * 0.5f) * chevSize * 2.4f;
+            float ax = cx + dx * off;
+            float ay = cy + dy * off;
+            if (dy != 0) {
+              canvas.drawLine(ax - chevSize, ay - dy * chevSize, ax, ay + dy * chevSize, paint);
+              canvas.drawLine(ax + chevSize, ay - dy * chevSize, ax, ay + dy * chevSize, paint);
+            } else {
+              canvas.drawLine(ax - dx * chevSize, ay - chevSize, ax + dx * chevSize, ay, paint);
+              canvas.drawLine(ax - dx * chevSize, ay + chevSize, ax + dx * chevSize, ay, paint);
+            }
+          }
+        }
+        float dm = base * 0.045f;
+        path.reset();
+        path.moveTo(cx, cy - dm);
+        path.lineTo(cx + dm, cy);
+        path.lineTo(cx, cy + dm);
+        path.lineTo(cx - dm, cy);
+        path.close();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(accentIdle);
+        canvas.drawPath(path, paint);
+        break;
+      }
+      case STICK: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float r = boundingBox.height() * 0.5f;
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawCircle(cx, cy, r, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(lineColor);
+        canvas.drawCircle(cx, cy, r, paint);
+        PointF pos = getCurrentPosition();
+        float dxp = pos.x - cx;
+        float dyp = pos.y - cy;
+        int hotTick = -1;
+        if (engaged && (dxp != 0f || dyp != 0f)) {
+          hotTick = Math.abs(dxp) >= Math.abs(dyp) ? (dxp >= 0 ? 1 : 3) : (dyp >= 0 ? 2 : 0);
+        }
+        float tickLen = snappingSize * 0.8f * scale;
+        paint.setStrokeWidth(bracket);
+        for (int i = 0; i < 4; i++) {
+          int dx = i == 1 ? 1 : i == 3 ? -1 : 0;
+          int dy = i == 2 ? 1 : i == 0 ? -1 : 0;
+          paint.setColor(i == hotTick ? accentFull : accentIdle);
+          canvas.drawLine(
+              cx + dx * (r - tickLen * 0.5f), cy + dy * (r - tickLen * 0.5f),
+              cx + dx * (r + tickLen * 0.5f), cy + dy * (r + tickLen * 0.5f), paint);
+        }
+        tempRect.set(cx - r * 0.55f, cy - r * 0.55f, cx + r * 0.55f, cy + r * 0.55f);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(engaged ? accentFull : accentIdle);
+        for (int i = 0; i < 8; i++) {
+          canvas.drawArc(tempRect, i * 45f - 9f, 18f, false, paint);
+        }
+        if (engaged) {
+          paint.setColor(accentFull);
+          canvas.drawLine(cx, cy, pos.x, pos.y, paint);
+        }
+        float thumbR = snappingSize * 2.2f * scale;
+        buildHexagonPath(path, pos.x, pos.y, thumbR);
+        if (engaged) {
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (90 * a)));
+          canvas.drawPath(path, paint);
+        }
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(engaged ? accentFull : accentIdle);
+        canvas.drawPath(path, paint);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(lineColor);
+        canvas.drawCircle(pos.x, pos.y, hairline, paint);
+        break;
+      }
+      case TRACKPAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float chamfer = boundingBox.height() * 0.22f;
+        buildChamferRectPath(
+            path, boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            chamfer);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawPath(path, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(lineColor);
+        canvas.drawPath(path, paint);
+        float len = Math.min(boundingBox.width(), boundingBox.height()) * 0.22f;
+        paint.setStrokeWidth(bracket);
+        paint.setColor(accentIdle);
+        drawCornerBrackets(canvas, paint, boundingBox, len);
+        float gap = hairline * 2.2f;
+        float cross = snappingSize * 1.2f * scale;
+        paint.setStrokeWidth(hairline);
+        paint.setColor(engaged ? accentFull : accentIdle);
+        canvas.drawLine(cx - cross, cy, cx - gap, cy, paint);
+        canvas.drawLine(cx + gap, cy, cx + cross, cy, paint);
+        canvas.drawLine(cx, cy - cross, cx, cy - gap, paint);
+        canvas.drawLine(cx, cy + gap, cx, cy + cross, paint);
+        paint.setStyle(Paint.Style.FILL);
+        canvas.drawCircle(cx, cy, hairline, paint);
+        break;
+      }
+      case RANGE_BUTTON: {
+        Range range = getRange();
+        float chamfer = (orientation == 0 ? boundingBox.height() : boundingBox.width()) * 0.30f;
+        float elementSize = scroller.getElementSize();
+        float scrollOffset = scroller.getScrollOffset();
+        byte[] rangeIndex = scroller.getRangeIndex();
+        buildChamferRectPath(
+            path, boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            chamfer);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawPath(path, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(lineColor);
+        canvas.drawPath(path, paint);
+
+        canvas.save();
+        canvas.clipPath(path);
+        int pressedIndex =
+            currentPointerId != -1 && !scroller.isScrolling() ? scroller.getBindingIndex() : -1;
+        int dividerColor = Color.argb((int) (70 * a), 255, 255, 255);
+        int hotTextColor = Color.argb((int) (245 * a), 255, 255, 255);
+        paint.setLetterSpacing(0.08f);
+
+        if (orientation == 0) {
+          float lineTop = boundingBox.top + boundingBox.height() * 0.225f;
+          float lineBottom = boundingBox.bottom - boundingBox.height() * 0.225f;
+          float startX = boundingBox.left - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(hairline * 0.8f);
+            paint.setColor(dividerColor);
+            if (startX > boundingBox.left && startX < boundingBox.right)
+              canvas.drawLine(startX, lineTop, startX, lineBottom, paint);
+            if (startX < boundingBox.right && startX + elementSize > boundingBox.left) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStrokeWidth(hairline * 2.5f);
+                paint.setColor(accentFull);
+                float uy = boundingBox.bottom - boundingBox.height() * 0.15f;
+                canvas.drawLine(
+                    startX + elementSize * 0.2f, uy, startX + elementSize * 0.8f, uy, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : accentIdle);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, elementSize - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  startX + elementSize * 0.5f,
+                  (y - ((paint.descent() + paint.ascent()) * 0.5f)),
+                  paint);
+            }
+            startX += elementSize;
+          }
+        } else {
+          float lineLeft = boundingBox.left + boundingBox.width() * 0.225f;
+          float lineRight = boundingBox.right - boundingBox.width() * 0.225f;
+          float startY = boundingBox.top - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(hairline * 0.8f);
+            paint.setColor(dividerColor);
+            if (startY > boundingBox.top && startY < boundingBox.bottom)
+              canvas.drawLine(lineLeft, startY, lineRight, startY, paint);
+            if (startY < boundingBox.bottom && startY + elementSize > boundingBox.top) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStrokeWidth(hairline * 2.5f);
+                paint.setColor(accentFull);
+                float ux = boundingBox.right - boundingBox.width() * 0.15f;
+                canvas.drawLine(
+                    ux, startY + elementSize * 0.2f, ux, startY + elementSize * 0.8f, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : accentIdle);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, boundingBox.width() - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  x,
+                  startY + elementSize * 0.5f - ((paint.descent() + paint.ascent()) * 0.5f),
+                  paint);
+            }
+            startY += elementSize;
+          }
+        }
+        paint.setLetterSpacing(0f);
+        canvas.restore();
+        break;
+      }
+      case RADIAL_MENU: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float radius = boundingBox.width() * 0.5f;
+
+        if (radialMenuExpanded && bindings.length > 0 && radius > 0) {
+          float innerRadius = radius + snappingSize * 0.5f;
+          float outerRadius = boundingBox.width() + (snappingSize * scale);
+          float angleStep = 360.0f / bindings.length;
+
+          if (paths == null || paths.length != bindings.length) {
+            paths = new Path[bindings.length];
+            RectF outerRect = new RectF(cx - outerRadius, cy - outerRadius, cx + outerRadius, cy + outerRadius);
+            RectF innerRect = new RectF(cx - innerRadius, cy - innerRadius, cx + innerRadius, cy + innerRadius);
+            for (int i = 0; i < bindings.length; i++) {
+              float startAngle = -90.0f + i * angleStep;
+              paths[i] = new Path();
+              paths[i].arcTo(outerRect, startAngle, angleStep, true);
+              paths[i].arcTo(innerRect, startAngle + angleStep, -angleStep, false);
+              paths[i].close();
+            }
+          }
+
+          if (paths != null && paths.length == bindings.length) {
+            for (int i = 0; i < bindings.length; i++) {
+              boolean active = i == activeRadialBindingIndex;
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? ColorUtils.setAlphaComponent(accent, (int) (70 * a))
+                  : scrimColor);
+              canvas.drawPath(paths[i], paint);
+              paint.setStyle(Paint.Style.STROKE);
+              paint.setStrokeWidth(hairline);
+              paint.setColor(lineColor);
+              canvas.drawPath(paths[i], paint);
+
+              float middleAngle = (float) Math.toRadians(-90.0f + i * angleStep + angleStep * 0.5f);
+              float labelRadius = (innerRadius + outerRadius) * 0.5f;
+              float labelX = (float) (cx + Math.cos(middleAngle) * labelRadius);
+              float labelY = (float) (cy + Math.sin(middleAngle) * labelRadius);
+              String label = getBindingShortText(i);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active ? Color.argb((int) (240 * a), 255, 255, 255) : accentIdle);
+              paint.setTextSize(snappingSize * 1.2f * scale);
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(label, labelX, labelY - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+          }
+        }
+
+        buildHexagonPath(path, cx, cy, radius - hairline);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(engaged ? ghostFill : scrimColor);
+        canvas.drawPath(path, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline);
+        paint.setColor(lineColor);
+        canvas.drawPath(path, paint);
+        drawIcon(
+            canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+            iconId > 0 ? iconId : 34, true,
+            engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        break;
+      }
+    }
+  }
+
+  /** L-shaped corner brackets hugging the four corners of {@code bb}. */
+  private static void drawCornerBrackets(Canvas canvas, Paint paint, Rect bb, float len) {
+    canvas.drawLine(bb.left, bb.top, bb.left + len, bb.top, paint);
+    canvas.drawLine(bb.left, bb.top, bb.left, bb.top + len, paint);
+    canvas.drawLine(bb.right, bb.top, bb.right - len, bb.top, paint);
+    canvas.drawLine(bb.right, bb.top, bb.right, bb.top + len, paint);
+    canvas.drawLine(bb.left, bb.bottom, bb.left + len, bb.bottom, paint);
+    canvas.drawLine(bb.left, bb.bottom, bb.left, bb.bottom - len, paint);
+    canvas.drawLine(bb.right, bb.bottom, bb.right - len, bb.bottom, paint);
+    canvas.drawLine(bb.right, bb.bottom, bb.right, bb.bottom - len, paint);
+  }
+
+  private static final int NEON_SCRIM = 0xFF0A0A16;
+  private static final float[] hsvTemp = new float[3];
+
+  /** Contrasting partner color for the neon accent (hue rotated 150 degrees). */
+  private static int neonSecondary(int accent) {
+    Color.colorToHSV(accent, hsvTemp);
+    hsvTemp[0] = (hsvTemp[0] + 150f) % 360f;
+    return Color.HSVToColor(Color.alpha(accent), hsvTemp);
+  }
+
+  /** Layered-stroke glow around {@code p}: wide faint halos under a crisp core line. */
+  private void neonStrokePath(
+      Canvas canvas, Paint paint, Path p, int color, float core, float a, boolean pressed) {
+    paint.setStyle(Paint.Style.STROKE);
+    paint.setColor(ColorUtils.setAlphaComponent(color, (int) (18 * a)));
+    paint.setStrokeWidth(core * 4.2f);
+    canvas.drawPath(p, paint);
+    paint.setColor(ColorUtils.setAlphaComponent(color, (int) (36 * a)));
+    paint.setStrokeWidth(core * 2.6f);
+    canvas.drawPath(p, paint);
+    paint.setColor(ColorUtils.setAlphaComponent(color, (int) (66 * a)));
+    paint.setStrokeWidth(core * 1.6f);
+    canvas.drawPath(p, paint);
+    if (pressed) {
+      paint.setColor(ColorUtils.setAlphaComponent(color, (int) (26 * a)));
+      paint.setStrokeWidth(core * 6f);
+      canvas.drawPath(p, paint);
+    }
+    paint.setColor(ColorUtils.setAlphaComponent(color, (int) (235 * a)));
+    paint.setStrokeWidth(core);
+    canvas.drawPath(p, paint);
+    if (pressed) {
+      paint.setColor(Color.argb((int) (235 * a), 255, 255, 255));
+      paint.setStrokeWidth(core * 0.55f);
+      canvas.drawPath(p, paint);
+    }
+  }
+
+  /** NEON — hollow chamfered wireframes with a layered-stroke glow that ignites white-hot on press. */
+  private void drawNeon(Canvas canvas) {
+    int snappingSize = inputControlsView.getSnappingSize();
+    Paint paint = inputControlsView.getPaint();
+    float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
+    float overlayOpacity = inputControlsView.getOverlayOpacity();
+    float dim = overlayOpacity <= 0.4f
+        ? 0.28f + (overlayOpacity - 0.1f) * (0.5f / 0.3f)
+        : 0.78f + (overlayOpacity - 0.4f) * (0.22f / 0.6f);
+    float a = Mathf.clamp(dim, 0f, 1f) * effectiveOpacity;
+    boolean engaged = isEngaged();
+    Rect boundingBox = getBoundingBox();
+    int accent = resolveThemedAccent();
+    if (selected && resolveAccentColor() == -1) {
+      accent = ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), 255);
+    }
+    int secondary = neonSecondary(accent);
+    float core = Math.max(1.5f, snappingSize * 0.14f * scale);
+    int scrimColor = ColorUtils.setAlphaComponent(NEON_SCRIM, (int) (61 * a));
+    int washColor = ColorUtils.setAlphaComponent(accent, (int) (33 * a));
+    int labelColor = engaged
+        ? Color.argb((int) (245 * a), 255, 255, 255)
+        : ColorUtils.setAlphaComponent(accent, (int) (235 * a));
+    float minTextSize = snappingSize * 2 * scale;
+    paint.setStrokeCap(Paint.Cap.ROUND);
+    paint.setStrokeJoin(Paint.Join.ROUND);
+
+    switch (type) {
+      case BUTTON: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float w = boundingBox.width();
+        float h = boundingBox.height();
+        if (shape == Shape.CIRCLE) {
+          float r = w * 0.5f - core;
+          buildChamferRectPath(path, cx - r, cy - r, cx + r, cy + r, r * 0.586f);
+        } else {
+          float chamfer = shape == Shape.SQUARE
+              ? snappingSize * 0.8f * scale
+              : shape == Shape.RECT ? h * 0.25f : h * 0.30f;
+          buildChamferRectPath(
+              path, boundingBox.left + core, boundingBox.top + core,
+              boundingBox.right - core, boundingBox.bottom - core, chamfer);
+        }
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawPath(path, paint);
+        if (engaged) {
+          paint.setColor(washColor);
+          canvas.drawPath(path, paint);
+        }
+        neonStrokePath(canvas, paint, path, accent, core, a, engaged);
+        if (shape == Shape.CIRCLE) {
+          float r = w * 0.5f - core;
+          tempRect.set(
+              cx - r - core * 1.8f, cy - r - core * 1.8f,
+              cx + r + core * 1.8f, cy + r + core * 1.8f);
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(core * 0.7f);
+          paint.setColor(ColorUtils.setAlphaComponent(secondary, (int) (150 * a)));
+          canvas.drawArc(tempRect, -80f, 60f, false, paint);
+        }
+        if (iconId > 0) {
+          drawIcon(
+              canvas, cx, cy, w, h, iconId, true,
+              engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        } else {
+          String label = getDisplayText();
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(labelColor);
+          paint.setTextSize(
+              Math.min(getTextSizeForWidth(paint, label, w * 0.62f), minTextSize));
+          paint.setTextAlign(Paint.Align.CENTER);
+          canvas.drawText(label, cx, (cy - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+        }
+        break;
+      }
+      case D_PAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float base = Math.min(boundingBox.width(), boundingBox.height());
+        float half = base * 0.5f - core;
+        float arm = base * 0.17f;
+        float ch = base * 0.075f;
+        path.reset();
+        path.moveTo(cx - arm, cy - half + ch);
+        path.lineTo(cx - arm + ch, cy - half);
+        path.lineTo(cx + arm - ch, cy - half);
+        path.lineTo(cx + arm, cy - half + ch);
+        path.lineTo(cx + arm, cy - arm);
+        path.lineTo(cx + half - ch, cy - arm);
+        path.lineTo(cx + half, cy - arm + ch);
+        path.lineTo(cx + half, cy + arm - ch);
+        path.lineTo(cx + half - ch, cy + arm);
+        path.lineTo(cx + arm, cy + arm);
+        path.lineTo(cx + arm, cy + half - ch);
+        path.lineTo(cx + arm - ch, cy + half);
+        path.lineTo(cx - arm + ch, cy + half);
+        path.lineTo(cx - arm, cy + half - ch);
+        path.lineTo(cx - arm, cy + arm);
+        path.lineTo(cx - half + ch, cy + arm);
+        path.lineTo(cx - half, cy + arm - ch);
+        path.lineTo(cx - half, cy - arm + ch);
+        path.lineTo(cx - half + ch, cy - arm);
+        path.lineTo(cx - arm, cy - arm);
+        path.close();
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawPath(path, paint);
+        neonStrokePath(canvas, paint, path, accent, core, a, false);
+
+        boolean hasStates = engaged && states.length >= 4;
+        float chev = base * 0.043f;
+        for (int i = 0; i < 4; i++) {
+          boolean hot = hasStates && states[i];
+          int dx = i == 1 ? 1 : i == 3 ? -1 : 0;
+          int dy = i == 2 ? 1 : i == 0 ? -1 : 0;
+          float ax = cx + dx * half * 0.60f;
+          float ay = cy + dy * half * 0.60f;
+          paint.setStyle(Paint.Style.STROKE);
+          if (hot) {
+            paint.setStrokeWidth(core * 2.8f);
+            paint.setColor(ColorUtils.setAlphaComponent(secondary, (int) (90 * a)));
+            if (dy != 0) {
+              canvas.drawLine(ax - chev, ay - dy * chev, ax, ay + dy * chev, paint);
+              canvas.drawLine(ax + chev, ay - dy * chev, ax, ay + dy * chev, paint);
+            } else {
+              canvas.drawLine(ax - dx * chev, ay - chev, ax + dx * chev, ay, paint);
+              canvas.drawLine(ax - dx * chev, ay + chev, ax + dx * chev, ay, paint);
+            }
+          }
+          paint.setStrokeWidth(core);
+          paint.setColor(hot
+              ? Color.argb((int) (245 * a), 255, 255, 255)
+              : ColorUtils.setAlphaComponent(secondary, (int) (190 * a)));
+          if (dy != 0) {
+            canvas.drawLine(ax - chev, ay - dy * chev, ax, ay + dy * chev, paint);
+            canvas.drawLine(ax + chev, ay - dy * chev, ax, ay + dy * chev, paint);
+          } else {
+            canvas.drawLine(ax - dx * chev, ay - chev, ax + dx * chev, ay, paint);
+            canvas.drawLine(ax - dx * chev, ay + chev, ax + dx * chev, ay, paint);
+          }
+        }
+        float dm = base * 0.055f;
+        path.reset();
+        path.moveTo(cx, cy - dm);
+        path.lineTo(cx + dm, cy);
+        path.lineTo(cx, cy + dm);
+        path.lineTo(cx - dm, cy);
+        path.close();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(core * 0.7f);
+        paint.setColor(ColorUtils.setAlphaComponent(secondary, (int) (100 * a)));
+        canvas.drawPath(path, paint);
+        break;
+      }
+      case STICK: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float r = boundingBox.height() * 0.5f - core;
+        path.reset();
+        path.addCircle(cx, cy, r, Path.Direction.CW);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(ColorUtils.setAlphaComponent(NEON_SCRIM, (int) (46 * a)));
+        canvas.drawPath(path, paint);
+        neonStrokePath(canvas, paint, path, accent, core * 0.8f, a, false);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(core * 0.8f);
+        paint.setColor(ColorUtils.setAlphaComponent(secondary, (int) (165 * a)));
+        float tick = snappingSize * 0.5f * scale;
+        canvas.drawLine(cx, cy - r - tick, cx, cy - r + tick, paint);
+        canvas.drawLine(cx, cy + r - tick, cx, cy + r + tick, paint);
+        canvas.drawLine(cx - r - tick, cy, cx - r + tick, cy, paint);
+        canvas.drawLine(cx + r - tick, cy, cx + r + tick, cy, paint);
+        paint.setStrokeWidth(Math.max(1f, core * 0.5f));
+        paint.setColor(ColorUtils.setAlphaComponent(secondary, (int) (150 * a)));
+        canvas.drawCircle(cx, cy, r * 0.55f, paint);
+        PointF pos = getCurrentPosition();
+        float thumbR = snappingSize * 2.6f * scale;
+        path.reset();
+        path.addCircle(pos.x, pos.y, thumbR, Path.Direction.CW);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(engaged ? washColor : scrimColor);
+        canvas.drawPath(path, paint);
+        neonStrokePath(canvas, paint, path, accent, core * 0.8f, a, engaged);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.argb((int) (240 * a), 255, 255, 255));
+        canvas.drawCircle(pos.x, pos.y, core, paint);
+        break;
+      }
+      case TRACKPAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float chamfer = boundingBox.height() * 0.20f;
+        buildChamferRectPath(
+            path, boundingBox.left + core, boundingBox.top + core,
+            boundingBox.right - core, boundingBox.bottom - core, chamfer);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawPath(path, paint);
+        neonStrokePath(canvas, paint, path, accent, core, a, engaged);
+        float dm = snappingSize * 1.1f * scale;
+        path.reset();
+        path.moveTo(cx, cy - dm);
+        path.lineTo(cx + dm, cy);
+        path.lineTo(cx, cy + dm);
+        path.lineTo(cx - dm, cy);
+        path.close();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(core * 0.7f);
+        paint.setColor(ColorUtils.setAlphaComponent(secondary, (int) ((engaged ? 220 : 150) * a)));
+        canvas.drawPath(path, paint);
+        break;
+      }
+      case RANGE_BUTTON: {
+        Range range = getRange();
+        float chamfer = (orientation == 0 ? boundingBox.height() : boundingBox.width()) * 0.30f;
+        float elementSize = scroller.getElementSize();
+        float scrollOffset = scroller.getScrollOffset();
+        byte[] rangeIndex = scroller.getRangeIndex();
+        buildChamferRectPath(
+            path, boundingBox.left + core, boundingBox.top + core,
+            boundingBox.right - core, boundingBox.bottom - core, chamfer);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(scrimColor);
+        canvas.drawPath(path, paint);
+        neonStrokePath(canvas, paint, path, accent, core, a, false);
+
+        canvas.save();
+        canvas.clipPath(path);
+        int pressedIndex =
+            currentPointerId != -1 && !scroller.isScrolling() ? scroller.getBindingIndex() : -1;
+        int dividerColor = ColorUtils.setAlphaComponent(accent, (int) (80 * a));
+        int hotTextColor = Color.argb((int) (245 * a), 255, 255, 255);
+        int cellTextColor = ColorUtils.setAlphaComponent(accent, (int) (220 * a));
+        int hotFill = ColorUtils.setAlphaComponent(secondary, (int) (41 * a));
+
+        if (orientation == 0) {
+          float lineTop = boundingBox.top + boundingBox.height() * 0.2f;
+          float lineBottom = boundingBox.bottom - boundingBox.height() * 0.2f;
+          float startX = boundingBox.left - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(Math.max(1f, core * 0.4f));
+            paint.setColor(dividerColor);
+            if (startX > boundingBox.left && startX < boundingBox.right)
+              canvas.drawLine(startX, lineTop, startX, lineBottom, paint);
+            if (startX < boundingBox.right && startX + elementSize > boundingBox.left) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(hotFill);
+                canvas.drawRect(
+                    startX, boundingBox.top, startX + elementSize, boundingBox.bottom, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, elementSize - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  startX + elementSize * 0.5f,
+                  (y - ((paint.descent() + paint.ascent()) * 0.5f)),
+                  paint);
+            }
+            startX += elementSize;
+          }
+        } else {
+          float lineLeft = boundingBox.left + boundingBox.width() * 0.2f;
+          float lineRight = boundingBox.right - boundingBox.width() * 0.2f;
+          float startY = boundingBox.top - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(Math.max(1f, core * 0.4f));
+            paint.setColor(dividerColor);
+            if (startY > boundingBox.top && startY < boundingBox.bottom)
+              canvas.drawLine(lineLeft, startY, lineRight, startY, paint);
+            if (startY < boundingBox.bottom && startY + elementSize > boundingBox.top) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(hotFill);
+                canvas.drawRect(
+                    boundingBox.left, startY, boundingBox.right, startY + elementSize, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, boundingBox.width() - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  x,
+                  startY + elementSize * 0.5f - ((paint.descent() + paint.ascent()) * 0.5f),
+                  paint);
+            }
+            startY += elementSize;
+          }
+        }
+        canvas.restore();
+        break;
+      }
+      case RADIAL_MENU: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float radius = boundingBox.width() * 0.5f;
+
+        if (radialMenuExpanded && bindings.length > 0 && radius > 0) {
+          float innerRadius = radius + snappingSize * 0.5f;
+          float outerRadius = boundingBox.width() + (snappingSize * scale);
+          float angleStep = 360.0f / bindings.length;
+
+          if (paths == null || paths.length != bindings.length) {
+            paths = new Path[bindings.length];
+            RectF outerRect = new RectF(cx - outerRadius, cy - outerRadius, cx + outerRadius, cy + outerRadius);
+            RectF innerRect = new RectF(cx - innerRadius, cy - innerRadius, cx + innerRadius, cy + innerRadius);
+            for (int i = 0; i < bindings.length; i++) {
+              float startAngle = -90.0f + i * angleStep;
+              paths[i] = new Path();
+              paths[i].arcTo(outerRect, startAngle, angleStep, true);
+              paths[i].arcTo(innerRect, startAngle + angleStep, -angleStep, false);
+              paths[i].close();
+            }
+          }
+
+          if (paths != null && paths.length == bindings.length) {
+            for (int i = 0; i < bindings.length; i++) {
+              boolean active = i == activeRadialBindingIndex;
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? ColorUtils.setAlphaComponent(secondary, (int) (55 * a))
+                  : scrimColor);
+              canvas.drawPath(paths[i], paint);
+              paint.setStyle(Paint.Style.STROKE);
+              paint.setStrokeWidth(Math.max(1f, core * 0.5f));
+              paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (110 * a)));
+              canvas.drawPath(paths[i], paint);
+
+              float middleAngle = (float) Math.toRadians(-90.0f + i * angleStep + angleStep * 0.5f);
+              float labelRadius = (innerRadius + outerRadius) * 0.5f;
+              float labelX = (float) (cx + Math.cos(middleAngle) * labelRadius);
+              float labelY = (float) (cy + Math.sin(middleAngle) * labelRadius);
+              String label = getBindingShortText(i);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? Color.argb((int) (240 * a), 255, 255, 255)
+                  : ColorUtils.setAlphaComponent(accent, (int) (215 * a)));
+              paint.setTextSize(snappingSize * 1.2f * scale);
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(label, labelX, labelY - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+          }
+        }
+
+        path.reset();
+        path.addCircle(cx, cy, radius - core, Path.Direction.CW);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(engaged ? washColor : scrimColor);
+        canvas.drawPath(path, paint);
+        neonStrokePath(canvas, paint, path, accent, core, a, engaged);
+        drawIcon(
+            canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+            iconId > 0 ? iconId : 34, true,
+            engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        break;
+      }
+    }
+    paint.setStrokeCap(Paint.Cap.BUTT);
+    paint.setStrokeJoin(Paint.Join.MITER);
+  }
+
+  private static final int LUMINA_RIM = 0xFFC7D0DA;
+  private static final int LUMINA_TEXT = 0xFFF4F7FA;
+  private static Shader luminaBodyShader;
+  private static Shader luminaShadeShader;
+  private static Shader luminaSpecularShader;
+  private static Shader luminaDomeShader;
+
+  private static Shader getLuminaBodyShader() {
+    if (luminaBodyShader == null) {
+      luminaBodyShader = new android.graphics.LinearGradient(
+          0f, 0f, 0f, 1f, 0xFF2E343C, 0xB512151A, Shader.TileMode.CLAMP);
+    }
+    return luminaBodyShader;
+  }
+
+  private static Shader getLuminaShadeShader() {
+    if (luminaShadeShader == null) {
+      luminaShadeShader = new android.graphics.LinearGradient(
+          0f, 0f, 0f, 1f,
+          new int[] {0x00000000, 0x00000000, 0x4D000000},
+          new float[] {0f, 0.55f, 1f}, Shader.TileMode.CLAMP);
+    }
+    return luminaShadeShader;
+  }
+
+  private static Shader getLuminaSpecularShader() {
+    if (luminaSpecularShader == null) {
+      luminaSpecularShader = new android.graphics.LinearGradient(
+          0f, 0f, 0f, 1f,
+          new int[] {0xFFFFFFFF, 0x00FFFFFF, 0x00FFFFFF},
+          new float[] {0f, 0.55f, 1f}, Shader.TileMode.CLAMP);
+    }
+    return luminaSpecularShader;
+  }
+
+  private static Shader getLuminaDomeShader() {
+    if (luminaDomeShader == null) {
+      luminaDomeShader = new RadialGradient(
+          0f, 0f, 1f,
+          new int[] {0x64FFFFFF, 0xB92E343C, 0xE112151A},
+          new float[] {0f, 0.55f, 1f}, Shader.TileMode.CLAMP);
+    }
+    return luminaDomeShader;
+  }
+
+  /** Draws the frosted plate passes (body gradient + bottom shade) for the element's shape. */
+  private void luminaGlassBody(Canvas canvas, Paint paint, Rect bb, float a) {
+    paint.setStyle(Paint.Style.FILL);
+    placeShader(getLuminaBodyShader(), bb.left, bb.top, Math.max(1, bb.height()));
+    paint.setShader(getLuminaBodyShader());
+    paint.setAlpha((int) (170 * a));
+    drawCleanBody(canvas, paint, bb, 0f);
+    placeShader(getLuminaShadeShader(), bb.left, bb.top, Math.max(1, bb.height()));
+    paint.setShader(getLuminaShadeShader());
+    paint.setAlpha((int) (255 * a));
+    drawCleanBody(canvas, paint, bb, 0f);
+    paint.setShader(null);
+  }
+
+  /** LUMINA — frosted glass plates: gradient body, silver hairline rim, top specular, accent light on press. */
+  private void drawLumina(Canvas canvas) {
+    int snappingSize = inputControlsView.getSnappingSize();
+    Paint paint = inputControlsView.getPaint();
+    float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
+    float overlayOpacity = inputControlsView.getOverlayOpacity();
+    float dim = overlayOpacity <= 0.4f
+        ? 0.28f + (overlayOpacity - 0.1f) * (0.5f / 0.3f)
+        : 0.78f + (overlayOpacity - 0.4f) * (0.22f / 0.6f);
+    float a = Mathf.clamp(dim, 0f, 1f) * effectiveOpacity;
+    boolean engaged = isEngaged();
+    Rect boundingBox = getBoundingBox();
+    int custom = resolveAccentColor();
+    int accent = resolveThemedAccent();
+    if (selected && custom == -1) {
+      accent = ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), 255);
+    }
+    float hairline = Math.max(1.5f, snappingSize * 0.11f * scale);
+    int rimIdle = custom != -1 ? ColorUtils.blendARGB(LUMINA_RIM, custom, 0.25f) : LUMINA_RIM;
+    int rimColor = engaged
+        ? ColorUtils.setAlphaComponent(accent, (int) (235 * a))
+        : ColorUtils.setAlphaComponent(rimIdle, (int) (150 * a));
+    int labelColor = engaged
+        ? Color.argb((int) (250 * a), 255, 255, 255)
+        : ColorUtils.setAlphaComponent(accent, (int) (230 * a));
+    float minTextSize = snappingSize * 2 * scale;
+
+    switch (type) {
+      case BUTTON: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        luminaGlassBody(canvas, paint, boundingBox, a);
+        if (engaged) {
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (85 * a)));
+          drawCleanBody(canvas, paint, boundingBox, 0f);
+          beginBloom(paint, cx, cy, Math.min(boundingBox.width(), boundingBox.height()) * 0.58f,
+              accent, a);
+          drawCleanBody(canvas, paint, boundingBox, 0f);
+          endBloom(paint);
+        }
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline * 1.2f);
+        paint.setColor(rimColor);
+        drawCleanBody(canvas, paint, boundingBox, 0f);
+        placeShader(getLuminaSpecularShader(), boundingBox.left, boundingBox.top,
+            Math.max(1, boundingBox.height()));
+        paint.setShader(getLuminaSpecularShader());
+        paint.setStrokeWidth(hairline * 1.3f);
+        paint.setAlpha((int) (150 * a));
+        drawCleanBody(canvas, paint, boundingBox, hairline);
+        paint.setShader(null);
+        if (iconId > 0) {
+          drawIcon(
+              canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId, true,
+              engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        } else {
+          String label = getDisplayText();
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(labelColor);
+          paint.setTextSize(
+              Math.min(
+                  getTextSizeForWidth(paint, label, boundingBox.width() - snappingSize * 0.6f),
+                  minTextSize));
+          paint.setTextAlign(Paint.Align.CENTER);
+          canvas.drawText(label, cx, (cy - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+        }
+        break;
+      }
+      case D_PAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float base = Math.min(boundingBox.width(), boundingBox.height());
+        float half = base * 0.5f;
+        float arm = base * 0.17f;
+        path.reset();
+        path.moveTo(cx - arm, cy - half);
+        path.lineTo(cx + arm, cy - half);
+        path.lineTo(cx + arm, cy - arm);
+        path.lineTo(cx + half, cy - arm);
+        path.lineTo(cx + half, cy + arm);
+        path.lineTo(cx + arm, cy + arm);
+        path.lineTo(cx + arm, cy + half);
+        path.lineTo(cx - arm, cy + half);
+        path.lineTo(cx - arm, cy + arm);
+        path.lineTo(cx - half, cy + arm);
+        path.lineTo(cx - half, cy - arm);
+        path.lineTo(cx - arm, cy - arm);
+        path.close();
+        paint.setPathEffect(cornerEffect(base * 0.09f));
+        paint.setStyle(Paint.Style.FILL);
+        placeShader(getLuminaBodyShader(), boundingBox.left, cy - half, Math.max(1f, base));
+        paint.setShader(getLuminaBodyShader());
+        paint.setAlpha((int) (170 * a));
+        canvas.drawPath(path, paint);
+        placeShader(getLuminaShadeShader(), boundingBox.left, cy - half, Math.max(1f, base));
+        paint.setShader(getLuminaShadeShader());
+        paint.setAlpha((int) (255 * a));
+        canvas.drawPath(path, paint);
+        paint.setShader(null);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline * 1.2f);
+        paint.setColor(rimColor);
+        canvas.drawPath(path, paint);
+        paint.setPathEffect(null);
+
+        boolean hasStates = engaged && states.length >= 4;
+        float chev = base * 0.05f;
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeJoin(Paint.Join.ROUND);
+        for (int i = 0; i < 4; i++) {
+          boolean hot = hasStates && states[i];
+          int dx = i == 1 ? 1 : i == 3 ? -1 : 0;
+          int dy = i == 2 ? 1 : i == 0 ? -1 : 0;
+          if (hot) {
+            float bx = cx + dx * half * 0.6f;
+            float by = cy + dy * half * 0.6f;
+            beginBloom(paint, bx, by, base * 0.26f, accent, a);
+            canvas.drawCircle(bx, by, base * 0.26f, paint);
+            endBloom(paint);
+          }
+          float ax = cx + dx * half * 0.62f;
+          float ay = cy + dy * half * 0.62f;
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setStrokeWidth(Math.max(2f, snappingSize * 0.16f * scale));
+          paint.setColor(hot
+              ? Color.argb((int) (250 * a), 255, 255, 255)
+              : ColorUtils.setAlphaComponent(accent, (int) (160 * a)));
+          if (dy != 0) {
+            canvas.drawLine(ax - chev, ay - dy * chev * 0.4f, ax, ay + dy * chev, paint);
+            canvas.drawLine(ax + chev, ay - dy * chev * 0.4f, ax, ay + dy * chev, paint);
+          } else {
+            canvas.drawLine(ax - dx * chev * 0.4f, ay - chev, ax + dx * chev, ay, paint);
+            canvas.drawLine(ax - dx * chev * 0.4f, ay + chev, ax + dx * chev, ay, paint);
+          }
+        }
+        paint.setStrokeCap(Paint.Cap.BUTT);
+        paint.setStrokeJoin(Paint.Join.MITER);
+        break;
+      }
+      case STICK: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float r = boundingBox.height() * 0.5f;
+        paint.setStyle(Paint.Style.FILL);
+        placeShader(getLuminaBodyShader(), cx - r, cy - r, Math.max(1f, r * 2f));
+        paint.setShader(getLuminaBodyShader());
+        paint.setAlpha((int) (95 * a));
+        canvas.drawCircle(cx, cy, r, paint);
+        paint.setShader(null);
+        paint.setStyle(Paint.Style.STROKE);
+        float bezel = Math.max(2f, snappingSize * 0.3f * scale);
+        paint.setStrokeWidth(bezel);
+        paint.setColor(ColorUtils.setAlphaComponent(LUMINA_RIM, (int) (55 * a)));
+        canvas.drawCircle(cx, cy, r * 0.97f, paint);
+        tempRect.set(cx - r * 0.97f, cy - r * 0.97f, cx + r * 0.97f, cy + r * 0.97f);
+        paint.setColor(Color.argb((int) (110 * a), 255, 255, 255));
+        canvas.drawArc(tempRect, 150f, 180f, false, paint);
+        paint.setStrokeWidth(hairline * 1.3f);
+        paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 210 : 95) * a)));
+        canvas.drawCircle(cx, cy, r * 0.55f, paint);
+        PointF pos = getCurrentPosition();
+        float thumbR = snappingSize * 3.5f * scale;
+        paint.setStyle(Paint.Style.FILL);
+        placeShader(getLuminaDomeShader(),
+            pos.x - thumbR * 0.35f, pos.y - thumbR * 0.38f, Math.max(1f, thumbR * 1.6f));
+        paint.setShader(getLuminaDomeShader());
+        paint.setAlpha((int) (235 * a));
+        canvas.drawCircle(pos.x, pos.y, thumbR, paint);
+        paint.setShader(null);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline * 1.2f);
+        paint.setColor(engaged
+            ? ColorUtils.setAlphaComponent(accent, (int) (235 * a))
+            : ColorUtils.setAlphaComponent(rimIdle, (int) (170 * a)));
+        canvas.drawCircle(pos.x, pos.y, thumbR, paint);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.argb((int) (128 * a), 255, 255, 255));
+        canvas.drawCircle(pos.x - thumbR * 0.35f, pos.y - thumbR * 0.38f, thumbR * 0.14f, paint);
+        break;
+      }
+      case TRACKPAD: {
+        luminaGlassBody(canvas, paint, boundingBox, a);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline * 1.2f);
+        paint.setColor(rimColor);
+        drawCleanBody(canvas, paint, boundingBox, 0f);
+        float len = Math.min(boundingBox.width(), boundingBox.height()) * 0.08f;
+        float ins = Math.min(boundingBox.width(), boundingBox.height()) * 0.06f;
+        paint.setStrokeWidth(hairline);
+        paint.setColor(engaged
+            ? ColorUtils.setAlphaComponent(accent, (int) (200 * a))
+            : ColorUtils.setAlphaComponent(LUMINA_RIM, (int) (90 * a)));
+        canvas.drawLine(boundingBox.left + ins, boundingBox.top + ins, boundingBox.left + ins + len, boundingBox.top + ins, paint);
+        canvas.drawLine(boundingBox.left + ins, boundingBox.top + ins, boundingBox.left + ins, boundingBox.top + ins + len, paint);
+        canvas.drawLine(boundingBox.right - ins, boundingBox.top + ins, boundingBox.right - ins - len, boundingBox.top + ins, paint);
+        canvas.drawLine(boundingBox.right - ins, boundingBox.top + ins, boundingBox.right - ins, boundingBox.top + ins + len, paint);
+        canvas.drawLine(boundingBox.left + ins, boundingBox.bottom - ins, boundingBox.left + ins + len, boundingBox.bottom - ins, paint);
+        canvas.drawLine(boundingBox.left + ins, boundingBox.bottom - ins, boundingBox.left + ins, boundingBox.bottom - ins - len, paint);
+        canvas.drawLine(boundingBox.right - ins, boundingBox.bottom - ins, boundingBox.right - ins - len, boundingBox.bottom - ins, paint);
+        canvas.drawLine(boundingBox.right - ins, boundingBox.bottom - ins, boundingBox.right - ins, boundingBox.bottom - ins - len, paint);
+        break;
+      }
+      case RANGE_BUTTON: {
+        Range range = getRange();
+        float rr = (orientation == 0 ? boundingBox.height() : boundingBox.width()) * 0.45f;
+        float elementSize = scroller.getElementSize();
+        float scrollOffset = scroller.getScrollOffset();
+        byte[] rangeIndex = scroller.getRangeIndex();
+        paint.setStyle(Paint.Style.FILL);
+        placeShader(getLuminaBodyShader(), boundingBox.left, boundingBox.top, Math.max(1, boundingBox.height()));
+        paint.setShader(getLuminaBodyShader());
+        paint.setAlpha((int) (170 * a));
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom, rr, rr, paint);
+        placeShader(getLuminaShadeShader(), boundingBox.left, boundingBox.top, Math.max(1, boundingBox.height()));
+        paint.setShader(getLuminaShadeShader());
+        paint.setAlpha((int) (255 * a));
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom, rr, rr, paint);
+        paint.setShader(null);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline * 1.2f);
+        paint.setColor(rimColor);
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom, rr, rr, paint);
+
+        canvas.save();
+        path.reset();
+        path.addRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            rr, rr, Path.Direction.CW);
+        canvas.clipPath(path);
+        int pressedIndex =
+            currentPointerId != -1 && !scroller.isScrolling() ? scroller.getBindingIndex() : -1;
+        int dividerColor = ColorUtils.setAlphaComponent(LUMINA_RIM, (int) (60 * a));
+        float dividerWidth = Math.max(1f, snappingSize * 0.06f);
+        int hotTextColor = Color.argb((int) (250 * a), 255, 255, 255);
+        int cellTextColor = ColorUtils.setAlphaComponent(LUMINA_TEXT, (int) (205 * a));
+
+        if (orientation == 0) {
+          float lineTop = boundingBox.top + boundingBox.height() * 0.25f;
+          float lineBottom = boundingBox.bottom - boundingBox.height() * 0.25f;
+          float startX = boundingBox.left - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(dividerWidth);
+            paint.setColor(dividerColor);
+            if (startX > boundingBox.left && startX < boundingBox.right)
+              canvas.drawLine(startX, lineTop, startX, lineBottom, paint);
+            if (startX < boundingBox.right && startX + elementSize > boundingBox.left) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (240 * a)));
+                float uy = boundingBox.bottom - boundingBox.height() * 0.16f;
+                tempRect.set(
+                    startX + elementSize * 0.225f, uy,
+                    startX + elementSize * 0.775f, uy + hairline * 2.2f);
+                canvas.drawRoundRect(tempRect, hairline, hairline, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, elementSize - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  startX + elementSize * 0.5f,
+                  (y - ((paint.descent() + paint.ascent()) * 0.5f)),
+                  paint);
+            }
+            startX += elementSize;
+          }
+        } else {
+          float lineLeft = boundingBox.left + boundingBox.width() * 0.25f;
+          float lineRight = boundingBox.right - boundingBox.width() * 0.25f;
+          float startY = boundingBox.top - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(dividerWidth);
+            paint.setColor(dividerColor);
+            if (startY > boundingBox.top && startY < boundingBox.bottom)
+              canvas.drawLine(lineLeft, startY, lineRight, startY, paint);
+            if (startY < boundingBox.bottom && startY + elementSize > boundingBox.top) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (240 * a)));
+                float ux = boundingBox.right - boundingBox.width() * 0.16f;
+                tempRect.set(
+                    ux, startY + elementSize * 0.225f,
+                    ux + hairline * 2.2f, startY + elementSize * 0.775f);
+                canvas.drawRoundRect(tempRect, hairline, hairline, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, boundingBox.width() - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  x,
+                  startY + elementSize * 0.5f - ((paint.descent() + paint.ascent()) * 0.5f),
+                  paint);
+            }
+            startY += elementSize;
+          }
+        }
+        canvas.restore();
+        break;
+      }
+      case RADIAL_MENU: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float radius = boundingBox.width() * 0.5f;
+
+        if (radialMenuExpanded && bindings.length > 0 && radius > 0) {
+          float innerRadius = radius + snappingSize * 0.5f;
+          float outerRadius = boundingBox.width() + (snappingSize * scale);
+          float angleStep = 360.0f / bindings.length;
+
+          if (paths == null || paths.length != bindings.length) {
+            paths = new Path[bindings.length];
+            RectF outerRect = new RectF(cx - outerRadius, cy - outerRadius, cx + outerRadius, cy + outerRadius);
+            RectF innerRect = new RectF(cx - innerRadius, cy - innerRadius, cx + innerRadius, cy + innerRadius);
+            for (int i = 0; i < bindings.length; i++) {
+              float startAngle = -90.0f + i * angleStep;
+              paths[i] = new Path();
+              paths[i].arcTo(outerRect, startAngle, angleStep, true);
+              paths[i].arcTo(innerRect, startAngle + angleStep, -angleStep, false);
+              paths[i].close();
+            }
+          }
+
+          if (paths != null && paths.length == bindings.length) {
+            for (int i = 0; i < bindings.length; i++) {
+              boolean active = i == activeRadialBindingIndex;
+              paint.setStyle(Paint.Style.FILL);
+              if (active) {
+                paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (90 * a)));
+              } else {
+                placeShader(getLuminaBodyShader(), cx - outerRadius, cy - outerRadius,
+                    Math.max(1f, outerRadius * 2f));
+                paint.setShader(getLuminaBodyShader());
+                paint.setAlpha((int) (150 * a));
+              }
+              canvas.drawPath(paths[i], paint);
+              paint.setShader(null);
+              paint.setStyle(Paint.Style.STROKE);
+              paint.setStrokeWidth(hairline);
+              paint.setColor(ColorUtils.setAlphaComponent(LUMINA_RIM, (int) (80 * a)));
+              canvas.drawPath(paths[i], paint);
+
+              float middleAngle = (float) Math.toRadians(-90.0f + i * angleStep + angleStep * 0.5f);
+              float labelRadius = (innerRadius + outerRadius) * 0.5f;
+              float labelX = (float) (cx + Math.cos(middleAngle) * labelRadius);
+              float labelY = (float) (cy + Math.sin(middleAngle) * labelRadius);
+              String label = getBindingShortText(i);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? Color.argb((int) (250 * a), 255, 255, 255)
+                  : ColorUtils.setAlphaComponent(LUMINA_TEXT, (int) (205 * a)));
+              paint.setTextSize(snappingSize * 1.2f * scale);
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(label, labelX, labelY - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+          }
+        }
+
+        luminaGlassBody(canvas, paint, boundingBox, a);
+        if (engaged) {
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (85 * a)));
+          canvas.drawCircle(cx, cy, radius, paint);
+          beginBloom(paint, cx, cy, radius, accent, a);
+          canvas.drawCircle(cx, cy, radius, paint);
+          endBloom(paint);
+        }
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(hairline * 1.2f);
+        paint.setColor(rimColor);
+        canvas.drawCircle(cx, cy, radius, paint);
+        drawIcon(
+            canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+            iconId > 0 ? iconId : 34, true,
+            engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        break;
+      }
+    }
+  }
+
+  private static final int SHADOW_BODY = 0xFF0A1422;
+  private static final int SHADOW_EDGE = 0xFF84A9D4;
+
+  private void shadowSoftRect(
+      Canvas canvas, Paint paint, float l, float t, float r, float b, float radius,
+      boolean active, int accent, float a, int snappingSize) {
+    paint.setStyle(Paint.Style.STROKE);
+    paint.setStrokeWidth(Math.max(1f, snappingSize * 0.55f * scale));
+    paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((active ? 64 : 16) * a)));
+    canvas.drawRoundRect(l, t, r, b, radius, radius, paint);
+    paint.setStrokeWidth(Math.max(1f, snappingSize * 0.22f * scale));
+    paint.setColor(ColorUtils.setAlphaComponent(SHADOW_EDGE, (int) ((active ? 70 : 28) * a)));
+    canvas.drawRoundRect(l, t, r, b, radius, radius, paint);
+    paint.setStyle(Paint.Style.FILL);
+    paint.setColor(active
+        ? ColorUtils.setAlphaComponent(accent, (int) (190 * a))
+        : ColorUtils.setAlphaComponent(SHADOW_BODY, (int) (135 * a)));
+    canvas.drawRoundRect(l, t, r, b, radius, radius, paint);
+    float inset = Math.max(1f, snappingSize * 0.35f * scale);
+    paint.setStyle(Paint.Style.STROKE);
+    paint.setStrokeWidth(Math.max(1f, snappingSize * 0.08f * scale));
+    paint.setColor(Color.argb((int) ((active ? 58 : 24) * a), 255, 255, 255));
+    canvas.drawRoundRect(
+        l + inset, t + inset, r - inset, b - inset,
+        Math.max(1f, radius - inset), Math.max(1f, radius - inset), paint);
+  }
+
+  private void shadowSoftCircle(
+      Canvas canvas, Paint paint, float cx, float cy, float r,
+      boolean active, int accent, float a, int snappingSize) {
+    paint.setStyle(Paint.Style.STROKE);
+    paint.setStrokeWidth(Math.max(1f, snappingSize * 0.55f * scale));
+    paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((active ? 72 : 18) * a)));
+    canvas.drawCircle(cx, cy, r, paint);
+    paint.setStrokeWidth(Math.max(1f, snappingSize * 0.2f * scale));
+    paint.setColor(ColorUtils.setAlphaComponent(SHADOW_EDGE, (int) ((active ? 74 : 30) * a)));
+    canvas.drawCircle(cx, cy, r, paint);
+    paint.setStyle(Paint.Style.FILL);
+    paint.setColor(active
+        ? ColorUtils.setAlphaComponent(accent, (int) (190 * a))
+        : ColorUtils.setAlphaComponent(SHADOW_BODY, (int) (140 * a)));
+    canvas.drawCircle(cx, cy, r, paint);
+    paint.setStyle(Paint.Style.STROKE);
+    paint.setStrokeWidth(Math.max(1f, snappingSize * 0.08f * scale));
+    paint.setColor(Color.argb((int) ((active ? 44 : 18) * a), 255, 255, 255));
+    canvas.drawCircle(cx, cy, r * 0.88f, paint);
+  }
+
+  /** SHADOW — soft dark layered-stroke bodies that flood with the accent while pressed; four-tile D-pad. */
+  private void drawShadow(Canvas canvas) {
+    int snappingSize = inputControlsView.getSnappingSize();
+    Paint paint = inputControlsView.getPaint();
+    float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
+    float overlayOpacity = inputControlsView.getOverlayOpacity();
+    float dim = overlayOpacity <= 0.4f
+        ? 0.28f + (overlayOpacity - 0.1f) * (0.5f / 0.3f)
+        : 0.78f + (overlayOpacity - 0.4f) * (0.22f / 0.6f);
+    float a = Mathf.clamp(dim, 0f, 1f) * effectiveOpacity;
+    boolean engaged = isEngaged();
+    Rect boundingBox = getBoundingBox();
+    int accent = resolveThemedAccent();
+    if (selected && resolveAccentColor() == -1) {
+      accent = ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), 255);
+    }
+    int labelColor = engaged
+        ? Color.argb((int) (245 * a), 255, 255, 255)
+        : ColorUtils.setAlphaComponent(accent, (int) (235 * a));
+    float minTextSize = snappingSize * 2 * scale;
+
+    switch (type) {
+      case BUTTON: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        switch (shape) {
+          case CIRCLE:
+            shadowSoftCircle(
+                canvas, paint, cx, cy, boundingBox.width() * 0.5f, engaged, accent, a, snappingSize);
+            break;
+          case SQUARE:
+            shadowSoftRect(
+                canvas, paint, boundingBox.left, boundingBox.top, boundingBox.right,
+                boundingBox.bottom, snappingSize * 1.05f * scale, engaged, accent, a, snappingSize);
+            break;
+          default:
+            shadowSoftRect(
+                canvas, paint, boundingBox.left, boundingBox.top, boundingBox.right,
+                boundingBox.bottom, boundingBox.height() * 0.45f, engaged, accent, a, snappingSize);
+            break;
+        }
+        if (iconId > 0) {
+          drawIcon(
+              canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId, true,
+              engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        } else {
+          String label = getDisplayText();
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(labelColor);
+          paint.setTextSize(
+              Math.min(
+                  getTextSizeForWidth(paint, label, boundingBox.width() - snappingSize * 0.6f),
+                  minTextSize));
+          paint.setTextAlign(Paint.Align.CENTER);
+          canvas.drawText(label, cx, (cy - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+        }
+        break;
+      }
+      case D_PAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float base = Math.min(boundingBox.width(), boundingBox.height());
+        float piece = base * 0.30f;
+        float dist = piece * 1.15f;
+        float c = piece * 0.13f;
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(ColorUtils.setAlphaComponent(SHADOW_BODY, (int) (60 * a)));
+        canvas.drawRoundRect(cx - c, cy - c, cx + c, cy + c, c * 0.45f, c * 0.45f, paint);
+        boolean hasStates = engaged && states.length >= 4;
+        for (int i = 0; i < 4; i++) {
+          int dx = i == 1 ? 1 : i == 3 ? -1 : 0;
+          int dy = i == 2 ? 1 : i == 0 ? -1 : 0;
+          float px = cx + dx * dist;
+          float py = cy + dy * dist;
+          boolean hot = hasStates && states[i];
+          shadowSoftRect(
+              canvas, paint, px - piece * 0.5f, py - piece * 0.5f, px + piece * 0.5f,
+              py + piece * 0.5f, piece * 0.28f, hot, accent, a, snappingSize);
+          buildDpadArrowPath(path, px, py, piece * 0.22f, i);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((hot ? 250 : 220) * a)));
+          canvas.drawPath(path, paint);
+        }
+        break;
+      }
+      case STICK: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float r = boundingBox.height() * 0.5f;
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(ColorUtils.setAlphaComponent(SHADOW_BODY, (int) ((engaged ? 155 : 118) * a)));
+        canvas.drawCircle(cx, cy, r, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(Math.max(1f, snappingSize * 0.2f * scale));
+        paint.setColor(ColorUtils.setAlphaComponent(SHADOW_EDGE, (int) ((engaged ? 62 : 26) * a)));
+        canvas.drawCircle(cx, cy, r * 0.96f, paint);
+        paint.setStrokeWidth(Math.max(1f, snappingSize * 0.5f * scale));
+        paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 72 : 20) * a)));
+        canvas.drawCircle(cx, cy, r * 0.98f, paint);
+        paint.setStrokeWidth(Math.max(1f, snappingSize * 0.22f * scale));
+        paint.setColor(ColorUtils.setAlphaComponent(accent, (int) ((engaged ? 235 : 205) * a)));
+        canvas.drawCircle(cx, cy, r * 0.52f, paint);
+        PointF pos = getCurrentPosition();
+        float thumbRadius = snappingSize * 3.5f * scale;
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(ColorUtils.setAlphaComponent(SHADOW_BODY, (int) (190 * a)));
+        canvas.drawCircle(pos.x, pos.y, thumbRadius, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(Math.max(1f, snappingSize * 0.12f * scale));
+        paint.setColor(ColorUtils.setAlphaComponent(SHADOW_EDGE, (int) (45 * a)));
+        canvas.drawCircle(pos.x, pos.y, thumbRadius * 0.96f, paint);
+        break;
+      }
+      case TRACKPAD: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        shadowSoftRect(
+            canvas, paint, boundingBox.left, boundingBox.top, boundingBox.right,
+            boundingBox.bottom, boundingBox.height() * 0.18f, engaged, accent, a, snappingSize);
+        float glyph = Math.min(boundingBox.width(), boundingBox.height()) * 0.45f;
+        float gw = glyph * 0.42f;
+        float gh = glyph * 0.62f;
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(Math.max(1.5f, glyph * 0.035f));
+        paint.setColor(ColorUtils.setAlphaComponent(
+            engaged ? Color.WHITE : accent, (int) ((engaged ? 220 : 95) * a)));
+        canvas.drawRoundRect(
+            cx - gw * 0.5f, cy - gh * 0.5f, cx + gw * 0.5f, cy + gh * 0.5f,
+            gw * 0.5f, gw * 0.5f, paint);
+        canvas.drawLine(cx, cy - gh * 0.30f, cx, cy - gh * 0.02f, paint);
+        break;
+      }
+      case RANGE_BUTTON: {
+        Range range = getRange();
+        float rr = (orientation == 0 ? boundingBox.height() : boundingBox.width()) * 0.45f;
+        float elementSize = scroller.getElementSize();
+        float scrollOffset = scroller.getScrollOffset();
+        byte[] rangeIndex = scroller.getRangeIndex();
+        shadowSoftRect(
+            canvas, paint, boundingBox.left, boundingBox.top, boundingBox.right,
+            boundingBox.bottom, rr, false, accent, a, snappingSize);
+
+        canvas.save();
+        path.reset();
+        path.addRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            rr, rr, Path.Direction.CW);
+        canvas.clipPath(path);
+
+        int pressedIndex =
+            currentPointerId != -1 && !scroller.isScrolling() ? scroller.getBindingIndex() : -1;
+        int dividerColor = ColorUtils.setAlphaComponent(SHADOW_EDGE, (int) (35 * a));
+        float dividerWidth = Math.max(1f, snappingSize * 0.06f);
+        int hotTextColor = Color.argb((int) (245 * a), 255, 255, 255);
+        int cellTextColor = ColorUtils.setAlphaComponent(accent, (int) (225 * a));
+
+        if (orientation == 0) {
+          float lineTop = boundingBox.top + boundingBox.height() * 0.25f;
+          float lineBottom = boundingBox.bottom - boundingBox.height() * 0.25f;
+          float startX = boundingBox.left - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(dividerWidth);
+            paint.setColor(dividerColor);
+            if (startX > boundingBox.left && startX < boundingBox.right)
+              canvas.drawLine(startX, lineTop, startX, lineBottom, paint);
+            if (startX < boundingBox.right && startX + elementSize > boundingBox.left) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (150 * a)));
+                canvas.drawRect(
+                    startX, boundingBox.top, startX + elementSize, boundingBox.bottom, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, elementSize - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  startX + elementSize * 0.5f,
+                  (y - ((paint.descent() + paint.ascent()) * 0.5f)),
+                  paint);
+            }
+            startX += elementSize;
+          }
+        } else {
+          float lineLeft = boundingBox.left + boundingBox.width() * 0.25f;
+          float lineRight = boundingBox.right - boundingBox.width() * 0.25f;
+          float startY = boundingBox.top - (scrollOffset % elementSize);
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setStrokeWidth(dividerWidth);
+            paint.setColor(dividerColor);
+            if (startY > boundingBox.top && startY < boundingBox.bottom)
+              canvas.drawLine(lineLeft, startY, lineRight, startY, paint);
+            if (startY < boundingBox.bottom && startY + elementSize > boundingBox.top) {
+              boolean hot = index == pressedIndex;
+              if (hot) {
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(ColorUtils.setAlphaComponent(accent, (int) (150 * a)));
+                canvas.drawRect(
+                    boundingBox.left, startY, boundingBox.right, startY + elementSize, paint);
+              }
+              String cellText = getRangeTextForIndex(range, index);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(hot ? hotTextColor : cellTextColor);
+              paint.setTextSize(
+                  Math.min(
+                      getTextSizeForWidth(paint, cellText, boundingBox.width() - snappingSize * 0.5f),
+                      minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(
+                  cellText,
+                  x,
+                  startY + elementSize * 0.5f - ((paint.descent() + paint.ascent()) * 0.5f),
+                  paint);
+            }
+            startY += elementSize;
+          }
+        }
+        canvas.restore();
+        break;
+      }
+      case RADIAL_MENU: {
+        float cx = boundingBox.exactCenterX();
+        float cy = boundingBox.exactCenterY();
+        float radius = boundingBox.width() * 0.5f;
+
+        if (radialMenuExpanded && bindings.length > 0 && radius > 0) {
+          float innerRadius = radius + snappingSize * 0.5f;
+          float outerRadius = boundingBox.width() + (snappingSize * scale);
+          float angleStep = 360.0f / bindings.length;
+
+          if (paths == null || paths.length != bindings.length) {
+            paths = new Path[bindings.length];
+            RectF outerRect = new RectF(cx - outerRadius, cy - outerRadius, cx + outerRadius, cy + outerRadius);
+            RectF innerRect = new RectF(cx - innerRadius, cy - innerRadius, cx + innerRadius, cy + innerRadius);
+            for (int i = 0; i < bindings.length; i++) {
+              float startAngle = -90.0f + i * angleStep;
+              paths[i] = new Path();
+              paths[i].arcTo(outerRect, startAngle, angleStep, true);
+              paths[i].arcTo(innerRect, startAngle + angleStep, -angleStep, false);
+              paths[i].close();
+            }
+          }
+
+          if (paths != null && paths.length == bindings.length) {
+            for (int i = 0; i < bindings.length; i++) {
+              boolean active = i == activeRadialBindingIndex;
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? ColorUtils.setAlphaComponent(accent, (int) (150 * a))
+                  : ColorUtils.setAlphaComponent(SHADOW_BODY, (int) (135 * a)));
+              canvas.drawPath(paths[i], paint);
+              paint.setStyle(Paint.Style.STROKE);
+              paint.setStrokeWidth(Math.max(1f, snappingSize * 0.12f));
+              paint.setColor(ColorUtils.setAlphaComponent(SHADOW_EDGE, (int) (40 * a)));
+              canvas.drawPath(paths[i], paint);
+
+              float middleAngle = (float) Math.toRadians(-90.0f + i * angleStep + angleStep * 0.5f);
+              float labelRadius = (innerRadius + outerRadius) * 0.5f;
+              float labelX = (float) (cx + Math.cos(middleAngle) * labelRadius);
+              float labelY = (float) (cy + Math.sin(middleAngle) * labelRadius);
+              String label = getBindingShortText(i);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(active
+                  ? Color.argb((int) (240 * a), 255, 255, 255)
+                  : ColorUtils.setAlphaComponent(accent, (int) (215 * a)));
+              paint.setTextSize(snappingSize * 1.2f * scale);
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(label, labelX, labelY - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+          }
+        }
+
+        shadowSoftCircle(canvas, paint, cx, cy, radius, engaged, accent, a, snappingSize);
+        drawIcon(
+            canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+            iconId > 0 ? iconId : 34, true,
+            engaged ? inputControlsView.getColorFilter() : accentFilter(accent));
+        break;
+      }
+    }
+  }
+
+  /**
+   * GameHub visual style — dark translucent glass body, light white rim, brighter rim & inner glow
+   * when pressed, soft outer shadow. Used when the user picks the "GameHub" style.
+   *
+   * <p>Geometry (positions, bounding boxes, sticks, dpad arms, radial menu paths) is reused from
+   * the original code; only the paint properties differ.
+   */
+  private void drawGameHub(Canvas canvas) {
+    int snappingSize = inputControlsView.getSnappingSize();
+    Paint paint = inputControlsView.getPaint();
+    float effectiveOpacity = inputControlsView.isEditMode() ? Math.max(0.15f, opacity) : opacity;
+    float overlayOpacity = inputControlsView.getOverlayOpacity();
+    boolean engaged = isEngaged();
+    Rect boundingBox = getBoundingBox();
+
+    int custom = resolveAccentColor();
+    AccentTheme theme = inputControlsView.getAccentTheme();
+    int accent = custom != -1 ? custom : (theme != AccentTheme.MONO ? theme.accent : -1);
+    boolean hasAccent = accent != -1;
+
+    // Anchored at 40% default; steeper below, gentle to full above.
+    float gameHubDim = overlayOpacity <= 0.4f
+        ? 0.28f + (overlayOpacity - 0.1f) * (0.5f / 0.3f)
+        : 0.78f + (overlayOpacity - 0.4f) * (0.22f / 0.6f);
+    int fillAlpha = (int) (90 * gameHubDim * effectiveOpacity);
+    int strokeAlpha = (int) (150 * gameHubDim * effectiveOpacity);
+    int pressedFillAlpha = (int) (60 * gameHubDim * effectiveOpacity);
+    int pressedStrokeAlpha = (int) (220 * gameHubDim * effectiveOpacity);
+    int textAlpha = (int) (255 * gameHubDim * effectiveOpacity);
+    int glassEdgeAlpha = (int) (75 * gameHubDim * effectiveOpacity);
+    // The edge shade is modulated by the body fill's alpha so the vignette keeps its subtle weight.
+    int glassShadeAlpha = glassEdgeAlpha * fillAlpha / 255;
+    int pressedGlassShadeAlpha = glassEdgeAlpha * pressedFillAlpha / 255;
+
+    int fillColor = Color.argb(fillAlpha, 0, 0, 0);
+    int strokeColor = hasAccent
+        ? ColorUtils.setAlphaComponent(accent, Math.max(strokeAlpha, 110))
+        : Color.argb(strokeAlpha, 255, 255, 255);
+    int pressedFillBase = hasAccent ? accent : Color.WHITE;
+    int pressedFillColor = ColorUtils.setAlphaComponent(pressedFillBase, pressedFillAlpha);
+    int pressedStrokeColor = hasAccent
+        ? ColorUtils.setAlphaComponent(accent, Math.max(pressedStrokeAlpha, 160))
+        : Color.argb(pressedStrokeAlpha, 255, 255, 255);
+    int textColor = hasAccent
+        ? ColorUtils.setAlphaComponent(accent, textAlpha)
+        : Color.argb(textAlpha, 255, 255, 255);
+
+    if (selected && !hasAccent) {
+      int highlightAlpha = (int) (255 * overlayOpacity);
+      strokeColor = ColorUtils.setAlphaComponent(inputControlsView.getSecondaryColor(), highlightAlpha);
+    }
+
+    float strokeWidth = Math.max(2f, snappingSize * 0.18f);
+    paint.setStrokeWidth(strokeWidth);
+    paint.setStrokeJoin(Paint.Join.ROUND);
+    paint.setStrokeCap(Paint.Cap.ROUND);
+
+    switch (type) {
+      case BUTTON: {
+        float cx = boundingBox.centerX();
+        float cy = boundingBox.centerY();
+        GameHubLayout.RenderShape triggerShape = gameHubTriggerShape();
+        boolean isTrigger = triggerShape != null;
+
+        if (isTrigger) {
+          GameHubLayout.buildTriggerPath(
+              path, triggerShape,
+              boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(fillColor);
+          canvas.drawPath(path, paint);
+          if (engaged) {
+            paint.setColor(pressedFillColor);
+            canvas.drawPath(path, paint);
+          }
+          drawGameHubGlassOnPath(
+              canvas, paint, path, cx, cy,
+              Math.max(boundingBox.width(), boundingBox.height()) * 0.5f,
+              engaged ? pressedGlassShadeAlpha : glassShadeAlpha);
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+          canvas.drawPath(path, paint);
+        } else {
+          drawGameHubShape(canvas, paint, boundingBox, fillColor, true);
+          if (engaged) drawGameHubShape(canvas, paint, boundingBox, pressedFillColor, true);
+          drawGameHubGlassShape(
+              canvas, paint, boundingBox, engaged ? pressedGlassShadeAlpha : glassShadeAlpha);
+          paint.setStyle(Paint.Style.STROKE);
+          paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+          drawGameHubShape(canvas, paint, boundingBox, 0, false);
+        }
+
+        if (iconId > 0) {
+          drawIcon(
+              canvas, cx, cy, boundingBox.width(), boundingBox.height(), iconId, true,
+              hasAccent ? accentFilter(accent) : inputControlsView.getColorFilter());
+        } else {
+          String label = getDisplayText();
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(textColor);
+          paint.setTextSize(
+              Math.min(
+                  getTextSizeForWidth(paint, label, boundingBox.width() - strokeWidth * 2),
+                  snappingSize * 2 * scale));
+          paint.setTextAlign(Paint.Align.CENTER);
+          paint.setFakeBoldText(true);
+          canvas.drawText(label, cx, (cy - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+          paint.setFakeBoldText(false);
+        }
+        break;
+      }
+      case STICK: {
+        int cx = boundingBox.centerX();
+        int cy = boundingBox.centerY();
+        float ringRadius = boundingBox.height() * 0.5f;
+
+        // Outer ring — solid translucent dark fill matching the button fill alpha so the
+        // joystick shadowing reads with the same weight as the rest of the controls.
+        int ringFillAlpha = fillAlpha;
+        int ringFill = Color.argb(ringFillAlpha, 0, 0, 0);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(ringFill);
+        canvas.drawCircle(cx, cy, ringRadius, paint);
+
+        if (glassShadeAlpha > 0) {
+          placeShader(getEdgeShadeShader(), cx, cy, ringRadius);
+          paint.setShader(getEdgeShadeShader());
+          paint.setStyle(Paint.Style.FILL);
+          paint.setAlpha(glassShadeAlpha);
+          canvas.drawCircle(cx, cy, ringRadius, paint);
+          paint.setShader(null);
+        }
+
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+        canvas.drawCircle(cx, cy, ringRadius - strokeWidth * 0.5f, paint);
+
+        float thumbX = engaged ? getCurrentPosition().x : cx;
+        float thumbY = engaged ? getCurrentPosition().y : cy;
+        float thumbRadius = ringRadius * 0.48f;
+        int thumbFillAlpha = (int) ((engaged ? 100 : 77) * gameHubDim * effectiveOpacity);
+        int thumbFill = hasAccent
+            ? ColorUtils.setAlphaComponent(accent, thumbFillAlpha)
+            : Color.argb(thumbFillAlpha, 255, 255, 255);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(thumbFill);
+        canvas.drawCircle(thumbX, thumbY, thumbRadius, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+        canvas.drawCircle(thumbX, thumbY, thumbRadius - strokeWidth * 0.5f, paint);
+        break;
+      }
+      case D_PAD: {
+        float cx = boundingBox.centerX();
+        float cy = boundingBox.centerY();
+
+        float radius = Math.min(boundingBox.width(), boundingBox.height()) * 0.5f;
+        float[] arrowCenter = new float[2];
+        float arrowGradR = radius * 0.5f;
+        for (int side = 0; side < 4; side++) {
+          path.reset();
+          GameHubLayout.buildDpadArrow(path, side, cx, cy, radius);
+          paint.setStyle(Paint.Style.FILL);
+          paint.setColor(fillColor);
+          canvas.drawPath(path, paint);
+          if (engaged) {
+            paint.setColor(pressedFillColor);
+            canvas.drawPath(path, paint);
+          }
+          if (glassEdgeAlpha > 0) {
+            GameHubLayout.dpadArrowCenter(side, cx, cy, radius, arrowCenter);
+            drawGameHubGlassOnPath(
+                canvas, paint, path, arrowCenter[0], arrowCenter[1], arrowGradR,
+                engaged ? pressedGlassShadeAlpha : glassShadeAlpha);
+          }
+        }
+        GameHubLayout.buildDpadArrows(path, cx, cy, radius);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+        canvas.drawPath(path, paint);
+        break;
+      }
+      case TRACKPAD: {
+        float radius = boundingBox.height() * 0.18f;
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor);
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            radius, radius, paint);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+        canvas.drawRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            radius, radius, paint);
+        break;
+      }
+      case RADIAL_MENU: {
+        float cx = boundingBox.centerX();
+        float cy = boundingBox.centerY();
+        float radius = boundingBox.width() * 0.5f;
+
+        if (radialMenuExpanded && bindings.length > 0 && radius > 0) {
+          float innerRadius = radius + snappingSize * 0.5f;
+          float outerRadius = boundingBox.width() + (snappingSize * scale);
+          float angleStep = 360.0f / bindings.length;
+
+          if (paths == null || paths.length != bindings.length) {
+            paths = new Path[bindings.length];
+            RectF outerRect = new RectF(cx - outerRadius, cy - outerRadius, cx + outerRadius, cy + outerRadius);
+            RectF innerRect = new RectF(cx - innerRadius, cy - innerRadius, cx + innerRadius, cy + innerRadius);
+
+            for (int i = 0; i < bindings.length; i++) {
+              float startAngle = -90.0f + i * angleStep;
+              paths[i] = new Path();
+              paths[i].arcTo(outerRect, startAngle, angleStep, true);
+              paths[i].arcTo(innerRect, startAngle + angleStep, -angleStep, false);
+              paths[i].close();
+            }
+          }
+
+          if (paths != null && paths.length == bindings.length) {
+            for (int i = 0; i < bindings.length; i++) {
+              boolean isSegmentEngaged = i == activeRadialBindingIndex;
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(isSegmentEngaged ? pressedFillColor : fillColor);
+              canvas.drawPath(paths[i], paint);
+
+              drawGameHubGlassOnPath(
+                  canvas, paint, paths[i], cx, cy, outerRadius,
+                  isSegmentEngaged ? pressedGlassShadeAlpha : glassShadeAlpha);
+
+              paint.setStyle(Paint.Style.STROKE);
+              paint.setColor(isSegmentEngaged ? pressedStrokeColor : strokeColor);
+              canvas.drawPath(paths[i], paint);
+
+              float middleAngle = (float) Math.toRadians(-90.0f + i * angleStep + angleStep * 0.5f);
+              float labelRadius = (innerRadius + outerRadius) * 0.5f;
+              float labelX = (float) (cx + Math.cos(middleAngle) * labelRadius);
+              float labelY = (float) (cy + Math.sin(middleAngle) * labelRadius);
+
+              String label = getBindingShortText(i);
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(textColor);
+              paint.setTextSize(snappingSize * 1.2f * scale);
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(label, labelX, labelY - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+          }
+        }
+
+        drawGameHubShape(canvas, paint, boundingBox, fillColor, true);
+        if (engaged) drawGameHubShape(canvas, paint, boundingBox, pressedFillColor, true);
+        drawGameHubGlassShape(
+            canvas, paint, boundingBox, engaged ? pressedGlassShadeAlpha : glassShadeAlpha);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+        drawGameHubShape(canvas, paint, boundingBox, 0, false);
+
+        drawIcon(
+            canvas, cx, cy, boundingBox.width(), boundingBox.height(),
+            iconId > 0 ? iconId : 34, true,
+            hasAccent ? accentFilter(accent) : inputControlsView.getColorFilter());
+        break;
+      }
+      case RANGE_BUTTON: {
+        Range range = getRange();
+        float radius = snappingSize * 0.75f * scale;
+        float elementSize = scroller.getElementSize();
+        float minTextSize = snappingSize * 2 * scale;
+        float scrollOffset = scroller.getScrollOffset();
+        byte[] rangeIndex = scroller.getRangeIndex();
+        path.reset();
+
+        drawGameHubShape(canvas, paint, boundingBox, fillColor, true, Shape.ROUND_RECT);
+        if (engaged) drawGameHubShape(canvas, paint, boundingBox, pressedFillColor, true, Shape.ROUND_RECT);
+        drawGameHubGlassShape(
+            canvas, paint, boundingBox,
+            engaged ? pressedGlassShadeAlpha : glassShadeAlpha, Shape.ROUND_RECT);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(engaged ? pressedStrokeColor : strokeColor);
+        drawGameHubShape(canvas, paint, boundingBox, 0, false, Shape.ROUND_RECT);
+
+        canvas.save();
+        path.addRoundRect(
+            boundingBox.left, boundingBox.top, boundingBox.right, boundingBox.bottom,
+            radius, radius, Path.Direction.CW);
+        canvas.clipPath(path);
+
+        if (orientation == 0) {
+          float lineTop = boundingBox.top + strokeWidth * 0.5f;
+          float lineBottom = boundingBox.bottom - strokeWidth * 0.5f;
+          float startX = boundingBox.left - (scrollOffset % elementSize);
+
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            int index = i % range.max;
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor);
+            if (startX > boundingBox.left && startX < boundingBox.right)
+              canvas.drawLine(startX, lineTop, startX, lineBottom, paint);
+            String text = getRangeTextForIndex(range, index);
+            if (startX < boundingBox.right && startX + elementSize > boundingBox.left) {
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(textColor);
+              paint.setTextSize(Math.min(getTextSizeForWidth(paint, text, elementSize - strokeWidth * 2), minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(text, startX + elementSize * 0.5f, (boundingBox.centerY() - ((paint.descent() + paint.ascent()) * 0.5f)), paint);
+            }
+            startX += elementSize;
+          }
+        } else {
+          float lineLeft = boundingBox.left + strokeWidth * 0.5f;
+          float lineRight = boundingBox.right - strokeWidth * 0.5f;
+          float startY = boundingBox.top - (scrollOffset % elementSize);
+
+          for (byte i = rangeIndex[0]; i < rangeIndex[1]; i++) {
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor);
+            if (startY > boundingBox.top && startY < boundingBox.bottom)
+              canvas.drawLine(lineLeft, startY, lineRight, startY, paint);
+            String text = getRangeTextForIndex(range, i);
+            if (startY < boundingBox.bottom && startY + elementSize > boundingBox.top) {
+              paint.setStyle(Paint.Style.FILL);
+              paint.setColor(textColor);
+              paint.setTextSize(Math.min(getTextSizeForWidth(paint, text, boundingBox.width() - strokeWidth * 2), minTextSize));
+              paint.setTextAlign(Paint.Align.CENTER);
+              canvas.drawText(text, boundingBox.centerX(), startY + elementSize * 0.5f - ((paint.descent() + paint.ascent()) * 0.5f), paint);
+            }
+            startY += elementSize;
+          }
+        }
+        canvas.restore();
+        break;
+      }
+    }
+    paint.setStrokeJoin(Paint.Join.MITER);
+    paint.setStrokeCap(Paint.Cap.BUTT);
+  }
+
+  private void drawGameHubShape(Canvas canvas, Paint paint, Rect bb, int color, boolean fill) {
+    drawGameHubShape(canvas, paint, bb, color, fill, shape);
+  }
+
+  private void drawGameHubShape(Canvas canvas, Paint paint, Rect bb, int color, boolean fill, Shape overrideShape) {
+    if (fill) {
+      paint.setStyle(Paint.Style.FILL);
+      paint.setColor(color);
+    }
+    int snappingSize = inputControlsView.getSnappingSize();
+    switch (overrideShape) {
+      case CIRCLE:
+        canvas.drawCircle(bb.centerX(), bb.centerY(), bb.width() * 0.5f, paint);
+        break;
+      case RECT:
+        canvas.drawRect(bb, paint);
+        break;
+      case ROUND_RECT: {
+        float r = bb.height() * 0.5f;
+        canvas.drawRoundRect(bb.left, bb.top, bb.right, bb.bottom, r, r, paint);
+        break;
+      }
+      case SQUARE: {
+        float r = snappingSize * 0.85f * scale;
+        canvas.drawRoundRect(bb.left, bb.top, bb.right, bb.bottom, r, r, paint);
+        break;
+      }
+    }
+  }
+
+  private void drawGameHubGlassShape(Canvas canvas, Paint paint, Rect bb, int edgeAlpha) {
+    drawGameHubGlassShape(canvas, paint, bb, edgeAlpha, shape);
+  }
+
+  private void drawGameHubGlassShape(Canvas canvas, Paint paint, Rect bb, int edgeAlpha, Shape overrideShape) {
+    if (edgeAlpha <= 0) return;
+    float cx = bb.exactCenterX();
+    float cy = bb.exactCenterY();
+    float gradR = Math.max(bb.width(), bb.height()) * 0.5f;
+    placeShader(getEdgeShadeShader(), cx, cy, gradR);
+    paint.setShader(getEdgeShadeShader());
+    paint.setStyle(Paint.Style.FILL);
+    paint.setAlpha(edgeAlpha);
+    int snappingSize = inputControlsView.getSnappingSize();
+    switch (overrideShape) {
+      case CIRCLE:
+        canvas.drawCircle(cx, cy, bb.width() * 0.5f, paint);
+        break;
+      case RECT:
+        canvas.drawRect(bb, paint);
+        break;
+      case ROUND_RECT: {
+        float r = bb.height() * 0.5f;
+        canvas.drawRoundRect(bb.left, bb.top, bb.right, bb.bottom, r, r, paint);
+        break;
+      }
+      case SQUARE: {
+        float r = snappingSize * 0.85f * scale;
+        canvas.drawRoundRect(bb.left, bb.top, bb.right, bb.bottom, r, r, paint);
+        break;
+      }
+    }
+    paint.setShader(null);
+  }
+
+  private void drawGameHubGlassOnPath(
+      Canvas canvas, Paint paint, Path path, float cx, float cy, float gradR, int edgeAlpha) {
+    if (edgeAlpha <= 0 || gradR <= 0) return;
+    placeShader(getEdgeShadeShader(), cx, cy, gradR);
+    paint.setShader(getEdgeShadeShader());
+    paint.setStyle(Paint.Style.FILL);
+    paint.setAlpha(edgeAlpha);
+    canvas.drawPath(path, paint);
+    paint.setShader(null);
+  }
+
+  private static final Rect iconSrcRect = new Rect();
+  private static final Rect iconDstRect = new Rect();
+
+  private void drawIcon(Canvas canvas, float cx, float cy, float width, float height, int iconId) {
+    drawIcon(canvas, cx, cy, width, height, iconId, true);
+  }
+
+  private void drawIcon(Canvas canvas, float cx, float cy, float width, float height, int iconId, boolean automargin) {
+    drawIcon(canvas, cx, cy, width, height, iconId, automargin, inputControlsView.getColorFilter());
+  }
+
+  private void drawIcon(Canvas canvas, float cx, float cy, float width, float height, int iconId, boolean automargin, ColorFilter tint) {
+    Bitmap icon = inputControlsView.getIcon((byte) iconId);
+    if (icon == null) return;
+    Paint paint = inputControlsView.getPaint();
+    paint.setColorFilter(tint);
+    int margin = automargin ? (int) (inputControlsSize() * (shape == Shape.CIRCLE || shape == Shape.SQUARE ? 2.0f : 1.0f) * scale) : 0;
+    int halfSize = (int) ((Math.min(width, height) - margin) * 0.5f);
+
+    iconSrcRect.set(0, 0, icon.getWidth(), icon.getHeight());
+    iconDstRect.set(
+        (int) (cx - halfSize),
+        (int) (cy - halfSize),
+        (int) (cx + halfSize),
+        (int) (cy + halfSize));
+    canvas.drawBitmap(icon, iconSrcRect, iconDstRect, paint);
+    paint.setColorFilter(null);
+  }
+
+  private int inputControlsSize() {
+    return inputControlsView.getSnappingSize();
+  }
+
+  public JSONObject toJSONObject() {
+    try {
+      JSONObject elementJSONObject = new JSONObject();
+      elementJSONObject.put("type", type.name());
+      elementJSONObject.put("shape", shape.name());
+      elementJSONObject.put("customColor", customColor);
+
+      JSONArray bindingsJSONArray = new JSONArray();
+      for (Binding binding : bindings) bindingsJSONArray.put(binding.name());
+
+      elementJSONObject.put("bindings", bindingsJSONArray);
+      elementJSONObject.put("scale", Float.valueOf(scale));
+      if (opacity < 1.0f) elementJSONObject.put("opacity", Float.valueOf(opacity));
+      elementJSONObject.put("x", (float) x / inputControlsView.getMaxWidth());
+      elementJSONObject.put("y", (float) y / inputControlsView.getMaxHeight());
+      elementJSONObject.put("toggleSwitch", toggleSwitch);
+      elementJSONObject.put("swipeable", swipeable);
+      elementJSONObject.put("text", text);
+      elementJSONObject.put("iconId", iconId);
+
+      if (type == Type.RANGE_BUTTON && range != null) {
+        elementJSONObject.put("range", range.name());
+        if (orientation != 0) elementJSONObject.put("orientation", orientation);
+      }
+      return elementJSONObject;
+    } catch (JSONException e) {
+      return null;
+    }
+  }
+
+  public boolean containsPoint(float x, float y) {
+    if (type == Type.RADIAL_MENU && radialMenuExpanded) {
+      float outerRadius = boundingBox.width() + (inputControlsView.getSnappingSize() * scale);
+      return Mathf.distance((float) boundingBox.centerX(), (float) boundingBox.centerY(), x, y) < outerRadius;
+    }
+    return getBoundingBox().contains((int) (x + 0.5f), (int) (y + 0.5f));
+  }
+
+  private boolean isKeepButtonPressedAfterMinTime() {
+    Binding binding = getBindingAt(0);
+    return !toggleSwitch
+        && (binding == Binding.GAMEPAD_BUTTON_L3 || binding == Binding.GAMEPAD_BUTTON_R3);
+  }
+
+  private void dispatchButtonBinding(boolean pressed) {
+    // Fire every configured binding slot, in slot order, skipping NONE and duplicates.
+    Binding[] ordered = new Binding[bindings.length];
+    int count = 0;
+    for (int i = 0; i < bindings.length; i++) {
+      Binding binding = bindings[i];
+      if (binding == Binding.NONE) continue;
+      boolean dup = false;
+      for (int k = 0; k < count; k++) if (ordered[k] == binding) { dup = true; break; }
+      if (!dup) ordered[count++] = binding;
+    }
+    // Press keeps slot order; release reverses when the toggle is on (combo release order).
+    if (!pressed && inputControlsView.isReverseBindingOrder()) {
+      for (int i = count - 1; i >= 0; i--) inputControlsView.handleInputEvent(ordered[i], false);
+    } else {
+      for (int i = 0; i < count; i++) inputControlsView.handleInputEvent(ordered[i], pressed);
+    }
+  }
+
+  public boolean isCapturing(int pointerId) {
+    return currentPointerId == pointerId;
+  }
+
+  public boolean isSwipeTarget() {
+    if (type == Type.RADIAL_MENU) return true;
+    return (type == Type.BUTTON || type == Type.D_PAD) && swipeable;
+  }
+
+  public boolean handleTouchDown(int pointerId, float x, float y) {
+    if (currentPointerId == -1 && containsPoint(x, y)) {
+      if (type != Type.RANGE_BUTTON && type != Type.RADIAL_MENU) {
+        boolean hasBinding = false;
+        for (Binding binding : bindings) {
+          if (binding != Binding.NONE) {
+            hasBinding = true;
+            break;
+          }
+        }
+        if (!hasBinding) return false;
+      }
+
+      currentPointerId = pointerId;
+      if (type == Type.BUTTON) {
+        if (isKeepButtonPressedAfterMinTime()) touchTime = System.currentTimeMillis();
+        if (!toggleSwitch || !selected) {
+          dispatchButtonBinding(true);
+        }
+        inputControlsView.invalidate();
+        return true;
+      } else if (type == Type.RADIAL_MENU) {
+        wasExpandedOnDown = radialMenuExpanded;
+        if (!radialMenuExpanded) {
+          radialMenuExpanded = true;
+          paths = null;
+          isRadialBindingCurrentlyHeld = false;
+        } else {
+          activeRadialBindingIndex = getRadialBindingIndexAt(x, y);
+          boolean isInsideRadius = isPointerInsideRadialMenuRadius(x, y);
+          
+          if (activeRadialBindingIndex != -1) {
+            Binding binding = getBindingAt(activeRadialBindingIndex);
+            if (isInsideRadius) {
+              inputControlsView.handleInputEvent(binding, true);
+              isRadialBindingCurrentlyHeld = true;
+            } else if (binding != Binding.NONE) {
+              inputControlsView.handleInputEvent(binding, true);
+              inputControlsView.postDelayed(() -> inputControlsView.handleInputEvent(binding, false), 30);
+            }
+          } else if (Mathf.distance((float) boundingBox.centerX(), (float) boundingBox.centerY(), x, y) < boundingBox.width() * 0.5f) {
+            radialMenuExpanded = false;
+            paths = null;
+            isRadialBindingCurrentlyHeld = false;
+          }
+        }
+        inputControlsView.invalidate();
+        return true;
+      } else if (type == Type.RANGE_BUTTON) {
+        scroller.handleTouchDown(x, y);
+        inputControlsView.invalidate();
+        return true;
+      } else {
+        if (type == Type.TRACKPAD) {
+          if (currentPosition == null) currentPosition = new PointF();
+          currentPosition.set(x, y);
+          if (trackpadOrigin == null) trackpadOrigin = new PointF();
+          trackpadOrigin.set(x, y);
+        }
+        inputControlsView.invalidate();
+        return handleTouchMove(pointerId, x, y);
+      }
+    } else return false;
+  }
+
+  public boolean handleTouchMove(int pointerId, float x, float y) {
+    if (pointerId == currentPointerId && type == Type.BUTTON) {
+      if (!containsPoint(x, y)) {
+        handleTouchUp(pointerId, x, y);
+      }
+      return true;
+    }
+
+    if (pointerId == currentPointerId && type == Type.RADIAL_MENU && radialMenuExpanded) {
+      int index = getRadialBindingIndexAt(x, y);
+      boolean isInsideRadius = isPointerInsideRadialMenuRadius(x, y);
+
+      if (index != activeRadialBindingIndex) {
+        if (activeRadialBindingIndex != -1 && isRadialBindingCurrentlyHeld) {
+          inputControlsView.handleInputEvent(getBindingAt(activeRadialBindingIndex), false);
+          isRadialBindingCurrentlyHeld = false;
+        }
+
+        activeRadialBindingIndex = index;
+
+        if (activeRadialBindingIndex != -1) {
+          Binding binding = getBindingAt(activeRadialBindingIndex);
+          if (isInsideRadius) {
             inputControlsView.handleInputEvent(binding, true);
             isRadialBindingCurrentlyHeld = true;
           } else if (binding != Binding.NONE) {
@@ -1076,11 +3964,13 @@ public boolean handleTouchMove(int pointerId, float x, float y) {
             this.states[i] = true;
           }
         } else {
+          float adjDeltaX = (Math.abs(deltaX) < Math.abs(deltaY) * STICK_CROSS_ZONE) ? 0 : deltaX;
+          float adjDeltaY = (Math.abs(deltaY) < Math.abs(deltaX) * STICK_CROSS_ZONE) ? 0 : deltaY;
           final boolean[] states = {
-            deltaY <= -STICK_DEAD_ZONE,
-            deltaX >= STICK_DEAD_ZONE,
-            deltaY >= STICK_DEAD_ZONE,
-            deltaX <= -STICK_DEAD_ZONE
+            adjDeltaY <= -STICK_DEAD_ZONE,
+            adjDeltaX >= STICK_DEAD_ZONE,
+            adjDeltaY >= STICK_DEAD_ZONE,
+            adjDeltaX <= -STICK_DEAD_ZONE
           };
 
           for (byte i = 0; i < 4; i++) {
@@ -1096,18 +3986,20 @@ public boolean handleTouchMove(int pointerId, float x, float y) {
       } else if (type == Type.TRACKPAD) {
         Binding firstBinding = getBindingAt(0);
         if (firstBinding.isGamepad()) {
-          if (interpolator == null) interpolator = new CubicBezierInterpolator();
-          interpolator.set(0.075f, 0.95f, 0.45f, 0.95f);
-          float valueX = deltaX;
-          float valueY = deltaY;
-          if (Math.abs(valueX) > TRACKPAD_ACCELERATION_THRESHOLD) valueX *= STICK_SENSITIVITY;
-          if (Math.abs(valueY) > TRACKPAD_ACCELERATION_THRESHOLD) valueY *= STICK_SENSITIVITY;
-          float interpX =
-              interpolator.getInterpolation(Math.min(1.0f, Math.abs(valueX / TRACKPAD_MAX_SPEED)));
-          float interpY =
-              interpolator.getInterpolation(Math.min(1.0f, Math.abs(valueY / TRACKPAD_MAX_SPEED)));
-          float finalX = Mathf.clamp(Mathf.sign(valueX) * interpX, -1, 1);
-          float finalY = Mathf.clamp(Mathf.sign(valueY) * interpY, -1, 1);
+          if (trackpadOrigin == null) trackpadOrigin = new PointF(x, y);
+          float offsetX = x - trackpadOrigin.x;
+          float offsetY = y - trackpadOrigin.y;
+          float distance = (float) Math.sqrt(offsetX * offsetX + offsetY * offsetY);
+          float finalX = 0;
+          float finalY = 0;
+          if (distance > 0) {
+            float magnitude = Math.min(distance / radius, 1.0f);
+            if (magnitude > STICK_DEAD_ZONE) {
+              float scaled = (magnitude - STICK_DEAD_ZONE) / (1.0f - STICK_DEAD_ZONE);
+              finalX = (offsetX / distance) * scaled;
+              finalY = (offsetY / distance) * scaled;
+            }
+          }
           inputControlsView.handleStickInput(firstBinding, finalX, finalY);
           for (byte i = 0; i < 4; i++) {
             this.states[i] = true;
@@ -1119,6 +4011,7 @@ public boolean handleTouchMove(int pointerId, float x, float y) {
             deltaY >= TRACKPAD_MIN_SPEED,
             deltaX <= -TRACKPAD_MIN_SPEED
           };
+
           int cursorDx = 0;
           int cursorDy = 0;
 
@@ -1139,9 +4032,10 @@ public boolean handleTouchMove(int pointerId, float x, float y) {
 
           if (cursorDx != 0 || cursorDy != 0) {
             XServer xServer = inputControlsView.getXServer();
-            if (xServer.isRelativeMouseMovement())
-              xServer.getWinHandler().mouseEvent(MouseEventFlags.MOVE, cursorDx, cursorDy, 0);
-            else inputControlsView.getXServer().injectPointerMoveDelta(cursorDx, cursorDy);
+            if (xServer.isRelativeMouseMovement()) {
+              xServer.updatePointerForDisplayDelta(cursorDx, cursorDy);
+              xServer.getWinHandler().mouseMoveDelta(cursorDx, cursorDy);
+            } else inputControlsView.getXServer().injectPointerMoveDelta(cursorDx, cursorDy);
           }
         }
       } else {
@@ -1152,13 +4046,16 @@ public boolean handleTouchMove(int pointerId, float x, float y) {
           deltaX <= -DPAD_DEAD_ZONE
         };
 
+        boolean statesChanged = false;
         for (byte i = 0; i < 4; i++) {
           float value = i == 1 || i == 3 ? deltaX : deltaY;
           Binding binding = getBindingAt(i);
           boolean state = binding.isMouseMove() ? (states[i] || states[(i + 2) % 4]) : states[i];
           inputControlsView.handleInputEvent(binding, state, value);
+          if (this.states[i] != state) statesChanged = true;
           this.states[i] = state;
         }
+        if (statesChanged) inputControlsView.invalidate();
       }
 
       return true;
@@ -1172,21 +4069,19 @@ public boolean handleTouchUp(int pointerId, float x, float y) {
     if (pointerId != currentPointerId) return false;
 
     if (type == Type.BUTTON) {
-      final Binding binding = getBindingAt(0);
-      final Binding bindingSecondary = getBindingAt(1);
       if (isKeepButtonPressedAfterMinTime() && touchTime != null) {
         long held = System.currentTimeMillis() - (long) touchTime;
         long delay = Math.max(0L, BUTTON_MIN_TIME_TO_KEEP_PRESSED - held);
         inputControlsView.postDelayed(
             () -> {
-              dispatchButtonBinding(binding, bindingSecondary, false);
+              dispatchButtonBinding(false);
               inputControlsView.invalidate();
             },
             delay);
         touchTime = null;
       } else {
         if (!toggleSwitch || selected) {
-          dispatchButtonBinding(binding, bindingSecondary, false);
+          dispatchButtonBinding(false);
         }
         if (toggleSwitch) selected = !selected;
       }
@@ -1233,6 +4128,7 @@ public boolean handleTouchUp(int pointerId, float x, float y) {
           inputControlsView.handleStickInput(firstBinding, 0.0f, 0.0f);
         }
         currentPosition = null;
+        trackpadOrigin = null;
       }
 
       inputControlsView.invalidate();
diff --git a/app/src/main/runtime/input/controls/ControllerManager.java b/app/src/main/runtime/input/controls/ControllerManager.java
index 6ffd4facc..3305a854b 100644
--- a/app/src/main/runtime/input/controls/ControllerManager.java
+++ b/app/src/main/runtime/input/controls/ControllerManager.java
@@ -69,7 +69,7 @@ private void loadAssignments() {
       String deviceIdentifier = preferences.getString(PREF_PLAYER_SLOT_PREFIX + i, null);
       if (deviceIdentifier != null) slotAssignments.put(i, deviceIdentifier);
       enabledSlots[i] = preferences.getBoolean(PREF_ENABLED_SLOTS_PREFIX + i, i == 0);
-      vibrationEnabled[i] = preferences.getBoolean(PREF_VIBRATE_SLOT_PREFIX + i, i == 0);
+      vibrationEnabled[i] = preferences.getBoolean(PREF_VIBRATE_SLOT_PREFIX + i, true);
     }
     globalVibrationEnabled = preferences.getBoolean(PREF_VIBRATION_GLOBAL, true);
   }
diff --git a/app/src/main/runtime/input/controls/ControlsProfile.java b/app/src/main/runtime/input/controls/ControlsProfile.java
index defdaec48..e25119de9 100644
--- a/app/src/main/runtime/input/controls/ControlsProfile.java
+++ b/app/src/main/runtime/input/controls/ControlsProfile.java
@@ -17,9 +17,8 @@ public class ControlsProfile implements Comparable<ControlsProfile> {
   public final int id;
   private String name;
   private float cursorSpeed = 1.0f;
-  private final ArrayList<ControlElement> elements = new ArrayList<>();
+  private volatile List<ControlElement> elements = new ArrayList<>();
   private final ArrayList<ExternalController> controllers = new ArrayList<>();
-  private final List<ControlElement> immutableElements = Collections.unmodifiableList(elements);
   private boolean elementsLoaded = false;
   private boolean controllersLoaded = false;
   private boolean virtualGamepad = false;
@@ -192,18 +191,18 @@ public static File getProfileFile(Context context, int id) {
     return new File(InputControlsManager.getProfilesDir(context), "controls-" + id + ".icp");
   }
 
-  public void addElement(ControlElement element) {
+  public synchronized void addElement(ControlElement element) {
     elements.add(element);
     elementsLoaded = true;
   }
 
-  public void removeElement(ControlElement element) {
+  public synchronized void removeElement(ControlElement element) {
     elements.remove(element);
     elementsLoaded = true;
   }
 
   public List<ControlElement> getElements() {
-    return immutableElements;
+    return Collections.unmodifiableList(elements);
   }
 
   public int getElementCountFromFile() {
@@ -268,26 +267,32 @@ public ArrayList<ExternalController> loadControllers() {
   }
 
   public void loadElements(InputControlsView inputControlsView) {
-    elements.clear();
-    elementsLoaded = false;
-    virtualGamepad = false;
-
     File file = getProfileFile(context, id);
-    if (!file.isFile()) return;
+    if (!file.isFile()) {
+      elements = new ArrayList<>();
+      elementsLoaded = false;
+      return;
+    }
 
     try {
       String jsonStr = FileUtils.readString(file);
       if (jsonStr == null) return;
       JSONObject profileJSONObject = new JSONObject(jsonStr);
       JSONArray elementsJSONArray = profileJSONObject.getJSONArray("elements");
+      ArrayList<ControlElement> tempElements = new ArrayList<>();
+      boolean tempVirtualGamepad = false;
+
       for (int i = 0; i < elementsJSONArray.length(); i++) {
         JSONObject elementJSONObject = elementsJSONArray.getJSONObject(i);
         ControlElement element = new ControlElement(inputControlsView);
         element.setType(ControlElement.Type.valueOf(elementJSONObject.getString("type")));
         element.setShape(ControlElement.Shape.valueOf(elementJSONObject.getString("shape")));
         element.setToggleSwitch(elementJSONObject.getBoolean("toggleSwitch"));
-        element.setX((int) (elementJSONObject.getDouble("x") * inputControlsView.getMaxWidth()));
-        element.setY((int) (elementJSONObject.getDouble("y") * inputControlsView.getMaxHeight()));
+        element.setSwipeable(elementJSONObject.optBoolean("swipeable", true));
+        element.setX(
+            (int) Math.round(elementJSONObject.getDouble("x") * inputControlsView.getMaxWidth()));
+        element.setY(
+            (int) Math.round(elementJSONObject.getDouble("y") * inputControlsView.getMaxHeight()));
         element.setScale((float) elementJSONObject.getDouble("scale"));
         element.setText(elementJSONObject.getString("text"));
         element.setIconId(elementJSONObject.getInt("iconId"));
@@ -309,10 +314,15 @@ public void loadElements(InputControlsView inputControlsView) {
           if (binding.isGamepad()) hasGamepadBinding = true;
         }
 
-        if (!virtualGamepad && hasGamepadBinding) virtualGamepad = true;
-        elements.add(element);
+        if (!tempVirtualGamepad && hasGamepadBinding) tempVirtualGamepad = true;
+        tempElements.add(element);
+      }
+
+      synchronized (this) {
+        this.elements = tempElements;
+        this.virtualGamepad = tempVirtualGamepad;
+        this.elementsLoaded = true;
       }
-      elementsLoaded = true;
     } catch (JSONException e) {
       e.printStackTrace();
     }
diff --git a/app/src/main/runtime/input/controls/ExternalController.java b/app/src/main/runtime/input/controls/ExternalController.java
index 01279d10d..3dd54a9c6 100644
--- a/app/src/main/runtime/input/controls/ExternalController.java
+++ b/app/src/main/runtime/input/controls/ExternalController.java
@@ -33,6 +33,8 @@ public class ExternalController {
   public static final byte TRIGGER_IS_BUTTON = 0;
   public static final byte TRIGGER_IS_AXIS = 1;
   public static final byte TRIGGER_IS_BOTH = 2;
+  // Sentinel: user never picked a trigger type -> auto-detect.
+  private static final int TRIGGER_TYPE_UNSET = -1;
   public static final HashMap<Byte, Byte> buttonMappings = new HashMap<>();
   private XServerDisplayActivity activity;
   private Context context;
@@ -40,6 +42,9 @@ public class ExternalController {
   private String name;
   private int deviceId = -1;
   private byte triggerType = TRIGGER_IS_AXIS;
+  // Device exposes an analog trigger axis; gates the analog path so a stale "as button"
+  // pref can't kill an analog pad's triggers. Default true = historical behavior.
+  private boolean hasAnalogTriggerAxis = true;
   private final ArrayList<ExternalControllerBinding> controllerBindings = new ArrayList<>();
   public final GamepadState state = new GamepadState();
   public final GamepadState remappedState = new GamepadState();
@@ -93,6 +98,13 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
               useSquareDeadzoneLeft =
                   sharedPreferences.getBoolean(PreferenceKeys.SQUARE_DEADZONE_LEFT, false);
               break;
+            case PreferenceKeys.TRIGGER_TYPE:
+              {
+                int pref =
+                    sharedPreferences.getInt(PreferenceKeys.TRIGGER_TYPE, TRIGGER_TYPE_UNSET);
+                triggerType = pref == TRIGGER_TYPE_UNSET ? autoTriggerType() : (byte) pref;
+              }
+              break;
           }
         }
       };
@@ -129,6 +141,29 @@ private void loadPreferences() {
     this.invertRightX = prefs.getBoolean(PreferenceKeys.INVERT_RIGHT_X, false);
     this.invertRightY = prefs.getBoolean(PreferenceKeys.INVERT_RIGHT_Y, false);
     this.useSquareDeadzoneLeft = prefs.getBoolean(PreferenceKeys.SQUARE_DEADZONE_LEFT, false);
+    // Honor an explicit choice; else auto-detect. Runs per instance via setContext.
+    this.hasAnalogTriggerAxis = deviceHasAnalogTriggerAxis();
+    int triggerTypePref = prefs.getInt(PreferenceKeys.TRIGGER_TYPE, TRIGGER_TYPE_UNSET);
+    this.triggerType =
+        triggerTypePref == TRIGGER_TYPE_UNSET ? autoTriggerType() : (byte) triggerTypePref;
+  }
+
+  /** Default trigger mode (no explicit choice): derived from capability. */
+  private byte autoTriggerType() {
+    return hasAnalogTriggerAxis ? TRIGGER_IS_AXIS : TRIGGER_IS_BUTTON;
+  }
+
+  /** True if the device reports an analog trigger axis; true (historical default) when uninspectable. */
+  private boolean deviceHasAnalogTriggerAxis() {
+    int id = getDeviceId();
+    InputDevice device = id >= 0 ? InputDevice.getDevice(id) : null;
+    if (device == null) {
+      return true;
+    }
+    return device.getMotionRange(MotionEvent.AXIS_LTRIGGER) != null
+        || device.getMotionRange(MotionEvent.AXIS_RTRIGGER) != null
+        || device.getMotionRange(MotionEvent.AXIS_GAS) != null
+        || device.getMotionRange(MotionEvent.AXIS_BRAKE) != null;
   }
 
   public String getName() {
@@ -345,7 +380,11 @@ private void processXboxTriggerButton(MotionEvent event) {
 
   public boolean updateStateFromMotionEvent(MotionEvent event) {
     if (isJoystickDevice(event)) {
-      processTriggerButton(event);
+      // Capability-gated, not mode-gated: button-only pads skip this (the 0-read would
+      // clobber the digital key state); analog pads always run it.
+      if (hasAnalogTriggerAxis) {
+        processTriggerButton(event);
+      }
       int historySize = event.getHistorySize();
       for (int i = 0; i < historySize; i++) {
         processJoystickInput(event, i);
@@ -363,9 +402,20 @@ public boolean updateStateFromKeyEvent(KeyEvent event) {
     int buttonIdx = getButtonIdxByKeyCode(keyCode);
     if (buttonIdx != -1) {
       if (buttonIdx == 10 || buttonIdx == 11) {
-        // Trigger key events: don't call sendGamepadState to avoid
-        // overwriting analog trigger values from motion events
-        return false;
+        if (triggerType == TRIGGER_IS_AXIS) {
+          // Axis mode: analog path owns the value; ignore the digital key.
+          return false;
+        }
+        // Non-axis: set the button bit; synthesize analog only when there's no axis to own it.
+        this.state.setPressed(buttonIdx, pressed);
+        if (!hasAnalogTriggerAxis) {
+          if (buttonIdx == 10) {
+            this.state.triggerL = pressed ? 1.0f : 0.0f;
+          } else {
+            this.state.triggerR = pressed ? 1.0f : 0.0f;
+          }
+        }
+        return true;
       }
       this.state.setPressed(buttonIdx, pressed);
       return true;
diff --git a/app/src/main/runtime/input/controls/FakeInputWriter.java b/app/src/main/runtime/input/controls/FakeInputWriter.java
index ff3b92432..c24b81424 100644
--- a/app/src/main/runtime/input/controls/FakeInputWriter.java
+++ b/app/src/main/runtime/input/controls/FakeInputWriter.java
@@ -21,17 +21,23 @@ public class FakeInputWriter {
   private static final int BUFFER_SIZE = 768;
   private static final int EVENT_SIZE = 24;
   private static final int MAX_FAKE_INPUT_SLOTS = 4;
-  private static final int RING_CAPACITY_EVENTS = 512;
+  private static final int RING_CAPACITY_EVENTS = 4096;
   private static final int RING_HEADER_SIZE = 64;
   private static final int RING_SIZE = RING_HEADER_SIZE + (RING_CAPACITY_EVENTS * EVENT_SIZE);
   private static final int RING_MAGIC = 0x46494252; // FIBR
-  private static final int RING_VERSION = 1;
+  private static final int RING_VERSION = 2;
   private static final int RING_MAGIC_OFFSET = 0;
   private static final int RING_VERSION_OFFSET = 4;
   private static final int RING_EVENT_SIZE_OFFSET = 8;
   private static final int RING_CAPACITY_OFFSET = 12;
   private static final int RING_WRITE_SEQ_OFFSET = 16;
   private static final int RING_GENERATION_OFFSET = 24;
+  // Authoritative absolute-state snapshot the native reader replays as a full
+  // keyframe to heal any delta-stream desync. Written under a seqlock
+  // (RING_SNAPSHOT_SEQ_OFFSET: odd = write in progress).
+  private static final int RING_SNAPSHOT_SEQ_OFFSET = 32;
+  private static final int RING_SNAPSHOT_BUTTONS_OFFSET = 40;
+  private static final int RING_SNAPSHOT_AXES_OFFSET = 44; // short[8]
   private static final String RING_DIR_NAME = "fakeinput-rings";
   public static final short EV_ABS = 3;
   public static final short EV_KEY = 1;
@@ -43,6 +49,12 @@ public class FakeInputWriter {
   private static final String TAG = "FakeInputWriter";
   private static final Object RING_LOCK = new Object();
   private static final RingSlot[] RING_SLOTS = new RingSlot[MAX_FAKE_INPUT_SLOTS];
+
+  static {
+    System.loadLibrary("winlator");
+  }
+
+  private static native void nativeStoreFence();
   private final File eventFile;
   private final int slot;
   private int prevHatX;
@@ -70,6 +82,11 @@ public class FakeInputWriter {
   private volatile boolean destroyed = false;
   private final boolean[] prevButtonStates = new boolean[12];
   private boolean hasChanges = false;
+  // If a publish fails after prev* state has already advanced, the next frame
+  // must re-emit the whole state once; otherwise an unchanged control would stay
+  // silent and the ring snapshot would never catch up.
+  private boolean pendingFullResend = false;
+  private boolean forceResend = false;
   private final ByteBuffer buffer = ByteBuffer.allocateDirect(BUFFER_SIZE);
 
   public FakeInputWriter(String fakeInputPath, int slot) {
@@ -158,6 +175,11 @@ private static void initializeRingHeader(ByteBuffer data) {
     data.putInt(RING_CAPACITY_OFFSET, RING_CAPACITY_EVENTS);
     data.putLong(RING_WRITE_SEQ_OFFSET, 0L);
     data.putLong(RING_GENERATION_OFFSET, 0L);
+    data.putLong(RING_SNAPSHOT_SEQ_OFFSET, 0L);
+    data.putInt(RING_SNAPSHOT_BUTTONS_OFFSET, 0);
+    for (int i = 0; i < 8; i++) {
+      data.putShort(RING_SNAPSHOT_AXES_OFFSET + (i * 2), (short) 0);
+    }
   }
 
   private static void releaseRingSlotLocked(int slot) {
@@ -280,8 +302,12 @@ private boolean activateRingSlot() {
           ringSlot.everActivated = true;
         }
         ringSlot.data.putLong(RING_WRITE_SEQ_OFFSET, 0L);
+        clearSnapshotLocked(ringSlot.data);
         ringSlot.data.putLong(RING_GENERATION_OFFSET, ringSlot.generation);
         ringSlot.active = true;
+        Log.d(
+            TAG,
+            "Activated fake input ring for slot " + this.slot + " generation=" + ringSlot.generation);
       }
     }
     return true;
@@ -300,6 +326,7 @@ private void deactivateRingSlot() {
       if (ringSlot.active && ringSlot.data != null) {
         ringSlot.generation++;
         ringSlot.data.putLong(RING_WRITE_SEQ_OFFSET, 0L);
+        clearSnapshotLocked(ringSlot.data);
         ringSlot.data.putLong(RING_GENERATION_OFFSET, ringSlot.generation);
         Log.i(
             TAG,
@@ -318,24 +345,86 @@ private boolean flushBufferToRing() {
       return false;
     }
 
+    // Raw byte copy: endianness is irrelevant since we never interpret
+    // multi-byte fields out of the source here.
     ByteBuffer source = this.buffer.duplicate();
-    source.order(ByteOrder.LITTLE_ENDIAN);
     synchronized (ringSlot) {
       ByteBuffer ring = ringSlot.data;
       long writeSeq = ring.getLong(RING_WRITE_SEQ_OFFSET);
+      int sourceLimit = source.limit();
       while (source.remaining() >= EVENT_SIZE) {
         int eventIndex = (int) (writeSeq % RING_CAPACITY_EVENTS);
         int targetOffset = RING_HEADER_SIZE + (eventIndex * EVENT_SIZE);
-        for (int i = 0; i < EVENT_SIZE; i++) {
-          ring.put(targetOffset + i, source.get());
-        }
+        // Bulk-copy one event (EVENT_SIZE bytes) instead of byte-by-byte.
+        // Bound the source to a single event, position the ring at the slot,
+        // then let put(ByteBuffer) move the whole block. Mutating the ring's
+        // Java position is harmless: the native reader uses a raw pointer, not
+        // this position. API-26 safe (no JDK 13+ absolute bulk put).
+        source.limit(source.position() + EVENT_SIZE);
+        ring.position(targetOffset);
+        ring.put(source);
+        source.limit(sourceLimit);
         writeSeq++;
       }
+      // Publish the resulting absolute state. prev* now hold the post-update
+      // values, i.e. exactly the state the events just written transition to.
+      writeSnapshotLocked(ring);
+      nativeStoreFence();
       ring.putLong(RING_WRITE_SEQ_OFFSET, writeSeq);
     }
     return true;
   }
 
+  // Publishes the full absolute controller state for the native reader to replay
+  // as a keyframe. seqlock: bump to odd, write fields, bump to even, with
+  // store-store fences so the reader's acquire loads see consistent payloads.
+  private void writeSnapshotLocked(ByteBuffer ring) {
+    int buttons = 0;
+    for (int i = 0; i < BUTTON_MAP.length; i++) {
+      if (this.prevButtonStates[i]) {
+        buttons |= (1 << i);
+      }
+    }
+    long seq = ring.getLong(RING_SNAPSHOT_SEQ_OFFSET);
+    ring.putLong(RING_SNAPSHOT_SEQ_OFFSET, seq + 1); // odd: write in progress
+    nativeStoreFence();
+    ring.putInt(RING_SNAPSHOT_BUTTONS_OFFSET, buttons);
+    // Axis order must match the native kSnapshotAxisCodes:
+    // X, Y, RX, RY, GAS(=triggerR), BRAKE(=triggerL), HAT0X, HAT0Y.
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET, clampShort(this.prevThumbLX));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 2, clampShort(this.prevThumbLY));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 4, clampShort(this.prevThumbRX));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 6, clampShort(this.prevThumbRY));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 8, clampShort(this.prevTriggerR));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 10, clampShort(this.prevTriggerL));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 12, clampShort(this.prevHatX));
+    ring.putShort(RING_SNAPSHOT_AXES_OFFSET + 14, clampShort(this.prevHatY));
+    nativeStoreFence();
+    ring.putLong(RING_SNAPSHOT_SEQ_OFFSET, seq + 2); // even: write complete
+  }
+
+  private static short clampShort(int value) {
+    if (value > Short.MAX_VALUE) {
+      return Short.MAX_VALUE;
+    }
+    if (value < Short.MIN_VALUE) {
+      return Short.MIN_VALUE;
+    }
+    return (short) value;
+  }
+
+  private static void clearSnapshotLocked(ByteBuffer ring) {
+    long seq = ring.getLong(RING_SNAPSHOT_SEQ_OFFSET);
+    ring.putLong(RING_SNAPSHOT_SEQ_OFFSET, seq + 1);
+    nativeStoreFence();
+    ring.putInt(RING_SNAPSHOT_BUTTONS_OFFSET, 0);
+    for (int i = 0; i < 8; i++) {
+      ring.putShort(RING_SNAPSHOT_AXES_OFFSET + (i * 2), (short) 0);
+    }
+    nativeStoreFence();
+    ring.putLong(RING_SNAPSHOT_SEQ_OFFSET, seq + 2);
+  }
+
   private boolean flushBuffer() {
     return flushBufferToRing();
   }
@@ -460,7 +549,10 @@ private void writeEvent(short type, short code, int value) {
   }
 
   private void writeButton(int i, boolean z) {
-    if (i < 0 || i >= BUTTON_MAP.length || this.prevButtonStates[i] == z) {
+    if (i < 0 || i >= BUTTON_MAP.length) {
+      return;
+    }
+    if (!this.forceResend && this.prevButtonStates[i] == z) {
       return;
     }
     this.prevButtonStates[i] = z;
@@ -476,45 +568,54 @@ private void writeAxis(short code, int value, int[] prevRef, int index) {
     writeEvent((short) 3, code, value);
   }
 
-  public void writeGamepadState(GamepadState state) throws IOException {
+  public synchronized void writeGamepadState(GamepadState state) throws IOException {
     int hatX;
     if (!this.isOpen && !open()) {
       return;
     }
+    // Keep the ring delta-first for latency. Full event frames are only used as
+    // a one-shot repair after a failed publish; normal open/overflow recovery is
+    // handled by the native snapshot keyframe.
+    this.forceResend = this.pendingFullResend;
+    this.pendingFullResend = false;
+    if (this.forceResend) {
+      Log.d(TAG, "Re-emitting full gamepad state after failed publish for slot " + this.slot);
+    }
     this.buffer.clear();
     this.hasChanges = false;
     for (int i = 0; i < 10; i++) {
       writeButton(i, state.isPressed((byte) i));
     }
-    int lx = (int) (state.thumbLX * 32767.0f);
-    int ly = (int) (state.thumbLY * 32767.0f);
     int rx = (int) (state.thumbRX * 32767.0f);
     int ry = (int) (state.thumbRY * 32767.0f);
+    int lx = (int) (state.thumbLX * 32767.0f);
+    int ly = (int) (state.thumbLY * 32767.0f);
     int tl = (int) (state.triggerL * 255.0f);
     int tr = (int) (state.triggerR * 255.0f);
 
-    // The fake evdev ring is event-queue semantics, so unchanged axes must stay silent.
-    if (lx != this.prevThumbLX) {
-      this.prevThumbLX = lx;
-      writeEvent((short) 3, (short) 0, lx);
-    }
-    if (ly != this.prevThumbLY) {
-      this.prevThumbLY = ly;
-      writeEvent((short) 3, (short) 1, ly);
-    }
-    if (rx != this.prevThumbRX) {
+    // The fake evdev ring is event-queue semantics, so unchanged axes normally
+    // stay silent; forceResend overrides that to emit a complete keyframe.
+    if (this.forceResend || rx != this.prevThumbRX) {
       this.prevThumbRX = rx;
       writeEvent((short) 3, (short) 3, rx);
     }
-    if (ry != this.prevThumbRY) {
+    if (this.forceResend || ry != this.prevThumbRY) {
       this.prevThumbRY = ry;
       writeEvent((short) 3, (short) 4, ry);
     }
-    if (tl != this.prevTriggerL) {
+    if (this.forceResend || lx != this.prevThumbLX) {
+      this.prevThumbLX = lx;
+      writeEvent((short) 3, (short) 0, lx);
+    }
+    if (this.forceResend || ly != this.prevThumbLY) {
+      this.prevThumbLY = ly;
+      writeEvent((short) 3, (short) 1, ly);
+    }
+    if (this.forceResend || tl != this.prevTriggerL) {
       this.prevTriggerL = tl;
       writeEvent((short) 3, (short) 10, tl);
     }
-    if (tr != this.prevTriggerR) {
+    if (this.forceResend || tr != this.prevTriggerR) {
       this.prevTriggerR = tr;
       writeEvent((short) 3, (short) 9, tr);
     }
@@ -530,18 +631,23 @@ public void writeGamepadState(GamepadState state) throws IOException {
     } else if (!state.dpad[2]) {
       hatY = 0;
     }
-    if (hatX != this.prevHatX) {
+    if (this.forceResend || hatX != this.prevHatX) {
       this.prevHatX = hatX;
       writeEvent((short) 3, (short) 16, hatX);
     }
-    if (hatY != this.prevHatY) {
+    if (this.forceResend || hatY != this.prevHatY) {
       this.prevHatY = hatY;
       writeEvent((short) 3, (short) 17, hatY);
     }
     if (this.hasChanges) {
       writeEvent((short) 0, (short) 0, 0);
       this.buffer.flip();
-      if (!flushBuffer()) Log.e(TAG, "Gamepad write error: fake input mmap ring unavailable");
+      if (!flushBuffer()) {
+        Log.e(TAG, "Gamepad write error: fake input mmap ring unavailable");
+        // Couldn't publish; re-assert the whole state on the next frame.
+        this.pendingFullResend = true;
+      }
     }
+    this.forceResend = false;
   }
 }
diff --git a/app/src/main/runtime/input/controls/GameHubLayout.java b/app/src/main/runtime/input/controls/GameHubLayout.java
new file mode 100644
index 000000000..be60ab693
--- /dev/null
+++ b/app/src/main/runtime/input/controls/GameHubLayout.java
@@ -0,0 +1,322 @@
+package com.winlator.cmod.runtime.input.controls;
+
+import android.graphics.Path;
+import android.graphics.RectF;
+
+/**
+ * Shape helper for the {@link VisualStyle#GAMEHUB} renderer.
+ *
+ * <p>VisualStyle is strictly the <em>button shape</em>: it never moves or resizes controls — every
+ * position/size comes from the active ICP profile. This class only classifies an on-screen control
+ * by its gamepad {@link Role} (from the primary binding) so the GameHub renderer can pick the right
+ * silhouette — slanted trigger/bumper pills for L1/L2/R1/R2 and a four-arrow cross for the d-pad —
+ * and builds those silhouette {@link Path}s. Button locations live in the ICP (see the bundled
+ * "GameHub" profile <code>controls-7.icp</code>), exactly like "Virtual Gamepad" works for ORIGINAL.
+ */
+public final class GameHubLayout {
+
+  public enum Role {
+    BTN_A,
+    BTN_B,
+    BTN_X,
+    BTN_Y,
+    LB,
+    LT,
+    RB,
+    RT,
+    L3,
+    R3,
+    LSTICK,
+    RSTICK,
+    DPAD,
+    START,
+    SELECT
+  }
+
+  /**
+   * Shapes used by the GameHub renderer. Distinct from {@link ControlElement.Shape} so we don't
+   * pollute the persisted enum with values that only make sense at draw time.
+   */
+  public enum RenderShape {
+    CIRCLE,
+    ROUND_RECT,
+    TRIGGER_LT,
+    TRIGGER_LB,
+    TRIGGER_RT,
+    TRIGGER_RB,
+    DPAD_CROSS
+  }
+
+  /**
+   * Returns the trigger/bumper silhouette for a shoulder role, or {@code null} for every other
+   * role. Used by the GameHub renderer to draw L1/L2/R1/R2 buttons as slanted pills instead of
+   * plain round-rects — a pure shape decision, independent of where the ICP places the button.
+   */
+  public static RenderShape triggerShapeFor(Role role) {
+    if (role == null) return null;
+    switch (role) {
+      case LT:
+        return RenderShape.TRIGGER_LT;
+      case LB:
+        return RenderShape.TRIGGER_LB;
+      case RT:
+        return RenderShape.TRIGGER_RT;
+      case RB:
+        return RenderShape.TRIGGER_RB;
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * Maps a {@link ControlElement} to a logical role by inspecting its primary binding and type.
+   * Returns {@code null} for elements that don't correspond to a known gamepad control (custom
+   * keyboard buttons, trackpads, range buttons, radial menus, etc.) — those keep their saved
+   * positions.
+   */
+  public static Role roleFor(ControlElement element) {
+    if (element == null) return null;
+    ControlElement.Type type = element.getType();
+
+    if (type == ControlElement.Type.STICK) {
+      for (int i = 0; i < element.getBindingCount(); i++) {
+        Binding b = element.getBindingAt(i);
+        if (b == Binding.GAMEPAD_LEFT_THUMB_UP
+            || b == Binding.GAMEPAD_LEFT_THUMB_DOWN
+            || b == Binding.GAMEPAD_LEFT_THUMB_LEFT
+            || b == Binding.GAMEPAD_LEFT_THUMB_RIGHT) return Role.LSTICK;
+        if (b == Binding.GAMEPAD_RIGHT_THUMB_UP
+            || b == Binding.GAMEPAD_RIGHT_THUMB_DOWN
+            || b == Binding.GAMEPAD_RIGHT_THUMB_LEFT
+            || b == Binding.GAMEPAD_RIGHT_THUMB_RIGHT) return Role.RSTICK;
+      }
+      return null;
+    }
+    if (type == ControlElement.Type.D_PAD) return Role.DPAD;
+    if (type != ControlElement.Type.BUTTON) return null;
+
+    Binding b0 = element.getBindingAt(0);
+    switch (b0) {
+      case GAMEPAD_BUTTON_A:
+        return Role.BTN_A;
+      case GAMEPAD_BUTTON_B:
+        return Role.BTN_B;
+      case GAMEPAD_BUTTON_X:
+        return Role.BTN_X;
+      case GAMEPAD_BUTTON_Y:
+        return Role.BTN_Y;
+      case GAMEPAD_BUTTON_L1:
+        return Role.LB;
+      case GAMEPAD_BUTTON_R1:
+        return Role.RB;
+      case GAMEPAD_BUTTON_L2:
+        return Role.LT;
+      case GAMEPAD_BUTTON_R2:
+        return Role.RT;
+      case GAMEPAD_BUTTON_L3:
+        return Role.L3;
+      case GAMEPAD_BUTTON_R3:
+        return Role.R3;
+      case GAMEPAD_BUTTON_START:
+        return Role.START;
+      case GAMEPAD_BUTTON_SELECT:
+        return Role.SELECT;
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * Builds the exact GameHub shoulder/trigger silhouette in {@code out}. Geometry reverse-engineered
+   * from the decompiled GameHub asset (sources/defpackage/yhm.java) — see References/GameHub.
+   *
+   * <p>For each variant the slanted corner is on the OUTER (screen-edge) side, and is formed by a
+   * straight diagonal between two quadratic-curved "elbow" points. The opposite three corners are
+   * standard 90° arcs of radius {@code r = min(w,h) * 0.1875}.
+   */
+  public static void buildTriggerPath(
+      Path out, RenderShape shape, float left, float top, float right, float bottom) {
+    out.reset();
+    float w = right - left;
+    float h = bottom - top;
+    float r = Math.min(w, h) * 0.1875f;
+    float f = 0.2f * w;
+    float diag = (float) Math.sqrt(h * h + f * f);
+    float sx = (f / diag) * r; // horizontal inset of the slant endpoint near the slanted corner
+    float sy = (h / diag) * r; // vertical inset of the slant endpoint at the elbow
+
+    RectF tmp = new RectF();
+    switch (shape) {
+      case TRIGGER_LT: {
+        // Slant on TOP-LEFT (outer corner of the top-left trigger).
+        out.moveTo(left + sx, bottom - sy);
+        out.lineTo(left + f - sx, top + sy);
+        out.quadTo(left + f, top, left + f + r, top);
+        out.lineTo(right - r, top);
+        tmp.set(right - 2 * r, top, right, top + 2 * r);
+        out.arcTo(tmp, -90, 90, false);
+        out.lineTo(right, bottom - r);
+        tmp.set(right - 2 * r, bottom - 2 * r, right, bottom);
+        out.arcTo(tmp, 0, 90, false);
+        out.lineTo(left + r, bottom);
+        out.quadTo(left, bottom, left + sx, bottom - sy);
+        out.close();
+        break;
+      }
+      case TRIGGER_LB: {
+        // Slant on BOTTOM-LEFT (outer corner of the left bumper).
+        out.moveTo(left + r, top);
+        out.lineTo(right - r, top);
+        tmp.set(right - 2 * r, top, right, top + 2 * r);
+        out.arcTo(tmp, -90, 90, false);
+        out.lineTo(right, bottom - r);
+        tmp.set(right - 2 * r, bottom - 2 * r, right, bottom);
+        out.arcTo(tmp, 0, 90, false);
+        out.lineTo(left + f + r, bottom);
+        out.quadTo(left + f, bottom, left + f - sx, bottom - sy);
+        out.lineTo(left + sx, top + sy);
+        out.quadTo(left, top, left + r, top);
+        out.close();
+        break;
+      }
+      case TRIGGER_RT: {
+        // Slant on TOP-RIGHT (mirror of TRIGGER_LT) — symmetric with the left trigger so both
+        // upper-row triggers point their slanted "tabs" toward the outer screen corners.
+        out.moveTo(right - sx, bottom - sy);
+        out.lineTo(right - f + sx, top + sy);
+        out.quadTo(right - f, top, right - f - r, top);
+        out.lineTo(left + r, top);
+        tmp.set(left, top, left + 2 * r, top + 2 * r);
+        out.arcTo(tmp, 270, -90, false);
+        out.lineTo(left, bottom - r);
+        tmp.set(left, bottom - 2 * r, left + 2 * r, bottom);
+        out.arcTo(tmp, 180, -90, false);
+        out.lineTo(right - r, bottom);
+        out.quadTo(right, bottom, right - sx, bottom - sy);
+        out.close();
+        break;
+      }
+      case TRIGGER_RB: {
+        // Slant on BOTTOM-RIGHT (mirror of TRIGGER_LB) — bumper's outer slant.
+        out.moveTo(right - r, top);
+        out.lineTo(left + r, top);
+        tmp.set(left, top, left + 2 * r, top + 2 * r);
+        out.arcTo(tmp, 270, -90, false);
+        out.lineTo(left, bottom - r);
+        tmp.set(left, bottom - 2 * r, left + 2 * r, bottom);
+        out.arcTo(tmp, 180, -90, false);
+        out.lineTo(right - f - r, bottom);
+        out.quadTo(right - f, bottom, right - f + sx, bottom - sy);
+        out.lineTo(right - sx, top + sy);
+        out.quadTo(right, top, right - r, top);
+        out.close();
+        break;
+      }
+      default:
+        out.addRoundRect(left, top, right, bottom, r, r, Path.Direction.CW);
+        break;
+    }
+  }
+
+  /**
+   * Builds the four separate GameHub d-pad arrows into {@code out} as a single path with four
+   * sub-shapes. Each arrow is a small pentagonal "wedge" with the tip on the outer edge of a
+   * circle of radius {@code radius} centered at {@code (cx, cy)} — matching the proportions in
+   * {@code features_gamepad_config_dpad_center.xml} (128x128 viewport, tip ~1 unit from the edge
+   * and base ~9 units in).
+   */
+  public static void buildDpadArrows(Path out, float cx, float cy, float radius) {
+    out.reset();
+    for (int side = 0; side < 4; side++) buildDpadArrow(out, side, cx, cy, radius);
+  }
+
+  /** D-pad arrow sides used by {@link #buildDpadArrow} and {@link #dpadArrowCenter}. */
+  public static final int DPAD_UP = 0;
+  public static final int DPAD_DOWN = 1;
+  public static final int DPAD_LEFT = 2;
+  public static final int DPAD_RIGHT = 3;
+
+  /**
+   * Appends a single GameHub d-pad arrow ({@code side} in [0..3]) to {@code out} without resetting
+   * it. Geometry matches {@link #buildDpadArrows}; broken out so callers can render per-arrow
+   * effects (e.g. a radial glass vignette anchored at each arrow's centroid).
+   */
+  public static void buildDpadArrow(Path out, int side, float cx, float cy, float radius) {
+    // GameHub d-pad: each arrow is a "house" / "square with a pointer" — a rectangle on the
+    // outer side, then two short angled walls converging to a single point that aims AT the
+    // center of the d-pad. The two outer corners get a small radius; the inner shoulder corners
+    // and the tip stay sharp so the pointer reads clearly.
+    float outer = radius * 0.95f;
+    float shoulder = radius * 0.45f;
+    float inner = radius * 0.18f;
+    float halfOuter = radius * 0.275f;
+    float cornerR = radius * 0.05f;
+
+    switch (side) {
+      case DPAD_UP:
+        out.moveTo(cx - halfOuter + cornerR, cy - outer);
+        out.lineTo(cx + halfOuter - cornerR, cy - outer);
+        out.quadTo(cx + halfOuter, cy - outer, cx + halfOuter, cy - outer + cornerR);
+        out.lineTo(cx + halfOuter, cy - shoulder);
+        out.lineTo(cx, cy - inner);
+        out.lineTo(cx - halfOuter, cy - shoulder);
+        out.lineTo(cx - halfOuter, cy - outer + cornerR);
+        out.quadTo(cx - halfOuter, cy - outer, cx - halfOuter + cornerR, cy - outer);
+        out.close();
+        break;
+      case DPAD_DOWN:
+        out.moveTo(cx + halfOuter - cornerR, cy + outer);
+        out.lineTo(cx - halfOuter + cornerR, cy + outer);
+        out.quadTo(cx - halfOuter, cy + outer, cx - halfOuter, cy + outer - cornerR);
+        out.lineTo(cx - halfOuter, cy + shoulder);
+        out.lineTo(cx, cy + inner);
+        out.lineTo(cx + halfOuter, cy + shoulder);
+        out.lineTo(cx + halfOuter, cy + outer - cornerR);
+        out.quadTo(cx + halfOuter, cy + outer, cx + halfOuter - cornerR, cy + outer);
+        out.close();
+        break;
+      case DPAD_LEFT:
+        out.moveTo(cx - outer, cy + halfOuter - cornerR);
+        out.lineTo(cx - outer, cy - halfOuter + cornerR);
+        out.quadTo(cx - outer, cy - halfOuter, cx - outer + cornerR, cy - halfOuter);
+        out.lineTo(cx - shoulder, cy - halfOuter);
+        out.lineTo(cx - inner, cy);
+        out.lineTo(cx - shoulder, cy + halfOuter);
+        out.lineTo(cx - outer + cornerR, cy + halfOuter);
+        out.quadTo(cx - outer, cy + halfOuter, cx - outer, cy + halfOuter - cornerR);
+        out.close();
+        break;
+      case DPAD_RIGHT:
+        out.moveTo(cx + outer, cy - halfOuter + cornerR);
+        out.lineTo(cx + outer, cy + halfOuter - cornerR);
+        out.quadTo(cx + outer, cy + halfOuter, cx + outer - cornerR, cy + halfOuter);
+        out.lineTo(cx + shoulder, cy + halfOuter);
+        out.lineTo(cx + inner, cy);
+        out.lineTo(cx + shoulder, cy - halfOuter);
+        out.lineTo(cx + outer - cornerR, cy - halfOuter);
+        out.quadTo(cx + outer, cy - halfOuter, cx + outer, cy - halfOuter + cornerR);
+        out.close();
+        break;
+    }
+  }
+
+  /**
+   * Writes the approximate centroid of a single d-pad arrow into {@code outXY} (length ≥ 2).
+   * Used as the anchor point for the per-arrow radial glass vignette so each arrow lights up
+   * from its own middle outward rather than from the d-pad cluster center.
+   */
+  public static void dpadArrowCenter(int side, float cx, float cy, float radius, float[] outXY) {
+    // Midpoint between the outer flat edge (0.95r) and the pointer tip (0.18r) along the
+    // arrow's axis — close enough to the visual center for a smooth vignette.
+    float along = radius * 0.565f;
+    switch (side) {
+      case DPAD_UP:    outXY[0] = cx;          outXY[1] = cy - along; break;
+      case DPAD_DOWN:  outXY[0] = cx;          outXY[1] = cy + along; break;
+      case DPAD_LEFT:  outXY[0] = cx - along;  outXY[1] = cy;         break;
+      case DPAD_RIGHT: outXY[0] = cx + along;  outXY[1] = cy;         break;
+      default:         outXY[0] = cx;          outXY[1] = cy;         break;
+    }
+  }
+
+  private GameHubLayout() {}
+}
diff --git a/app/src/main/runtime/input/controls/GestureProfile.java b/app/src/main/runtime/input/controls/GestureProfile.java
new file mode 100644
index 000000000..bae244898
--- /dev/null
+++ b/app/src/main/runtime/input/controls/GestureProfile.java
@@ -0,0 +1,57 @@
+package com.winlator.cmod.runtime.input.controls;
+
+import android.content.Context;
+import com.winlator.cmod.runtime.input.ui.TouchGestureConfig;
+import com.winlator.cmod.shared.io.FileUtils;
+import java.io.File;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class GestureProfile implements Comparable<GestureProfile> {
+  public final int id;
+  private final Context context;
+  private String name = "";
+  private String configJson;
+
+  public GestureProfile(Context context, int id) {
+    this.context = context;
+    this.id = id;
+    this.configJson = new TouchGestureConfig().toJson();
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getConfigJson() {
+    return configJson;
+  }
+
+  public void setConfigJson(String json) {
+    this.configJson = (json == null || json.trim().isEmpty()) ? new TouchGestureConfig().toJson() : json;
+  }
+
+  public static File getProfileFile(Context context, int id) {
+    return new File(GestureProfileManager.getProfilesDir(context), "gesture-" + id + ".gcp");
+  }
+
+  public void save() {
+    try {
+      JSONObject o = new JSONObject();
+      o.put("id", id);
+      o.put("name", name);
+      o.put("config", new JSONObject(configJson));
+      FileUtils.writeString(getProfileFile(context, id), o.toString());
+    } catch (JSONException e) {
+    }
+  }
+
+  @Override
+  public int compareTo(GestureProfile other) {
+    return Integer.compare(id, other.id);
+  }
+}
diff --git a/app/src/main/runtime/input/controls/GestureProfileManager.java b/app/src/main/runtime/input/controls/GestureProfileManager.java
new file mode 100644
index 000000000..3c01c34c5
--- /dev/null
+++ b/app/src/main/runtime/input/controls/GestureProfileManager.java
@@ -0,0 +1,302 @@
+package com.winlator.cmod.runtime.input.controls;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.AssetManager;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.util.Log;
+import androidx.preference.PreferenceManager;
+import com.winlator.cmod.app.config.SettingsConfig;
+import com.winlator.cmod.runtime.input.ui.TouchGestureConfig;
+import com.winlator.cmod.shared.android.AppUtils;
+import com.winlator.cmod.shared.io.FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class GestureProfileManager {
+  private static final int ASSET_PROFILE_SYNC_REVISION = 1;
+  public static final int DEFAULT_PROFILE_ID = 1;
+  public static final String DEFAULT_PROFILE_NAME = "Default";
+
+  private final Context context;
+  private ArrayList<GestureProfile> profiles;
+  private int maxProfileId;
+  private boolean profilesLoaded = false;
+
+  public GestureProfileManager(Context context) {
+    this.context = context;
+  }
+
+  public static File getProfilesDir(Context context) {
+    File dir = new File(context.getFilesDir(), "gesture_profiles");
+    if (!dir.isDirectory()) dir.mkdir();
+    return dir;
+  }
+
+  public static File getBackupsDir(Context context) {
+    File dir = new File(context.getFilesDir(), "gesture_profile_backups");
+    if (!dir.isDirectory()) dir.mkdir();
+    return dir;
+  }
+
+  public static File getBackupFile(Context context, int id) {
+    return new File(getBackupsDir(context), "gesture-" + id + ".gcp");
+  }
+
+  public static void backupProfile(Context context, int id) {
+    File working = GestureProfile.getProfileFile(context, id);
+    if (working.isFile()) FileUtils.copy(working, getBackupFile(context, id));
+  }
+
+  public ArrayList<GestureProfile> getProfiles() {
+    if (!profilesLoaded) loadProfiles();
+    return profiles;
+  }
+
+  public List<String> getProfileNames() {
+    List<String> names = new ArrayList<>();
+    for (GestureProfile profile : getProfiles()) names.add(profile.getName());
+    return names;
+  }
+
+  public int indexOfProfile(int id) {
+    ArrayList<GestureProfile> list = getProfiles();
+    for (int i = 0; i < list.size(); i++) if (list.get(i).id == id) return i;
+    return -1;
+  }
+
+  private void copyAssetProfilesIfNeeded() {
+    getProfilesDir(context);
+
+    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    int newVersion = AppUtils.getVersionCode(context);
+    int oldVersion = preferences.getInt("gestures_app_version", 0);
+    int oldSyncRevision = preferences.getInt("gestures_asset_sync_revision", 0);
+    if (oldVersion == newVersion && oldSyncRevision >= ASSET_PROFILE_SYNC_REVISION) return;
+    preferences
+        .edit()
+        .putInt("gestures_app_version", newVersion)
+        .putInt("gestures_asset_sync_revision", ASSET_PROFILE_SYNC_REVISION)
+        .apply();
+
+    try {
+      AssetManager assetManager = context.getAssets();
+      String[] assetFiles = assetManager.list("gestures/profiles");
+      if (assetFiles == null) return;
+      for (String assetFile : assetFiles) {
+        String assetPath = "gestures/profiles/" + assetFile;
+        String json = FileUtils.readString(context, assetPath);
+        GestureProfile originProfile = loadProfileFromJson(context, json);
+        if (originProfile == null) continue;
+        File workingFile = GestureProfile.getProfileFile(context, originProfile.id);
+        if (!workingFile.isFile()) FileUtils.writeString(workingFile, json);
+        FileUtils.writeString(getBackupFile(context, originProfile.id), json);
+      }
+    } catch (IOException e) {
+    }
+  }
+
+  public void loadProfiles() {
+    File profilesDir = getProfilesDir(context);
+    copyAssetProfilesIfNeeded();
+
+    ArrayList<GestureProfile> loaded = new ArrayList<>();
+    File[] files = profilesDir.listFiles();
+    if (files != null) {
+      for (File file : files) {
+        GestureProfile profile = loadProfile(context, file);
+        if (profile != null) {
+          loaded.add(profile);
+          maxProfileId = Math.max(maxProfileId, profile.id);
+        }
+      }
+    }
+
+    Collections.sort(loaded);
+    this.profiles = loaded;
+    maxProfileId = Math.max(maxProfileId, DEFAULT_PROFILE_ID);
+    profilesLoaded = true;
+  }
+
+  public GestureProfile createProfile(String name) {
+    if (!profilesLoaded) loadProfiles();
+    int newId = ++maxProfileId;
+    GestureProfile profile = new GestureProfile(context, newId);
+    profile.setName(name);
+    profile.setConfigJson(TouchGestureConfig.blankJson());
+    profile.save();
+    backupProfile(context, newId);
+    profiles.add(profile);
+    return profile;
+  }
+
+  public GestureProfile duplicateProfile(GestureProfile source) {
+    if (!profilesLoaded) loadProfiles();
+    String newName;
+    for (int i = 1; ; i++) {
+      newName = source.getName() + " (" + i + ")";
+      boolean found = false;
+      for (GestureProfile profile : profiles) {
+        if (profile.getName().equals(newName)) {
+          found = true;
+          break;
+        }
+      }
+      if (!found) break;
+    }
+
+    int newId = ++maxProfileId;
+    GestureProfile profile = new GestureProfile(context, newId);
+    profile.setName(newName);
+    profile.setConfigJson(source.getConfigJson());
+    profile.save();
+    backupProfile(context, newId);
+    profiles.add(profile);
+    return profile;
+  }
+
+  public void renameProfile(GestureProfile profile, String newName) {
+    if (profile == null || newName == null || newName.trim().isEmpty()) return;
+    profile.setName(newName.trim());
+    profile.save();
+    backupProfile(context, profile.id);
+  }
+
+  public void removeProfile(GestureProfile profile) {
+    if (profile == null) return;
+    File file = GestureProfile.getProfileFile(context, profile.id);
+    if (file.isFile()) file.delete();
+    if (profiles != null) profiles.remove(profile);
+    File backup = getBackupFile(context, profile.id);
+    if (backup.isFile()) backup.delete();
+  }
+
+  // Live-save while editing; materializes a transient Default into a real file when first edited.
+  public void saveProfile(GestureProfile profile) {
+    if (profile == null) return;
+    if (!profilesLoaded) loadProfiles();
+    profile.save();
+    if (getProfile(profile.id) == null) {
+      profiles.add(profile);
+      maxProfileId = Math.max(maxProfileId, profile.id);
+      backupProfile(context, profile.id);
+      Collections.sort(profiles);
+    }
+  }
+
+  public synchronized GestureProfile importProfile(JSONObject data) {
+    try {
+      if (!profilesLoaded || profiles == null) loadProfiles();
+      String profileName = data.optString("name", "").trim();
+      if (profileName.isEmpty()) {
+        Log.e("GestureProfileManager", "importProfile: data missing 'name'");
+        return null;
+      }
+
+      GestureProfile existingProfile = findProfileByName(profileName);
+      int targetId = existingProfile != null ? existingProfile.id : ++maxProfileId;
+      File targetFile = GestureProfile.getProfileFile(context, targetId);
+      data.put("id", targetId);
+      FileUtils.writeString(targetFile, data.toString());
+      backupProfile(context, targetId);
+      GestureProfile newProfile = loadProfile(context, targetFile);
+      if (newProfile == null) {
+        newProfile = new GestureProfile(context, targetId);
+        newProfile.setName(profileName);
+      }
+
+      int foundIndex = existingProfile != null ? profiles.indexOf(existingProfile) : -1;
+      if (foundIndex != -1) profiles.set(foundIndex, newProfile);
+      else profiles.add(newProfile);
+      Collections.sort(profiles);
+      return newProfile;
+    } catch (JSONException e) {
+      Log.e("GestureProfileManager", "importProfile: JSONException", e);
+      return null;
+    }
+  }
+
+  private GestureProfile findProfileByName(String name) {
+    String normalizedName = normalizeProfileName(name);
+    for (GestureProfile profile : profiles) {
+      if (normalizeProfileName(profile.getName()).equals(normalizedName)) return profile;
+    }
+    return null;
+  }
+
+  private String normalizeProfileName(String name) {
+    if (name == null) return "";
+    String trimmed = name.trim();
+    if (trimmed.toLowerCase(Locale.ROOT).endsWith(".gcp")) {
+      trimmed = trimmed.substring(0, trimmed.length() - 4);
+    }
+    return trimmed.trim().toLowerCase(Locale.ROOT);
+  }
+
+  public File exportProfile(GestureProfile profile) {
+    File destination;
+    SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+    String winlatorPath = sp.getString("winlator_path_uri", null);
+    if (winlatorPath != null) {
+      Uri winlatorUri = Uri.parse(winlatorPath);
+      destination =
+          new File(
+              FileUtils.getFilePathFromUri(context, winlatorUri),
+              "Gestures/" + profile.getName() + ".gcp");
+    } else {
+      destination =
+          new File(SettingsConfig.DEFAULT_WINLATOR_PATH, "Gestures/" + profile.getName() + ".gcp");
+    }
+    File parent = destination.getParentFile();
+    if (parent != null && !parent.isDirectory()) parent.mkdirs();
+    File working = GestureProfile.getProfileFile(context, profile.id);
+    if (!working.isFile()) profile.save();
+    FileUtils.copy(working, destination);
+    MediaScannerConnection.scanFile(
+        context, new String[] {destination.getAbsolutePath()}, null, null);
+    return destination.isFile() ? destination : null;
+  }
+
+  public GestureProfile getProfile(int id) {
+    for (GestureProfile profile : getProfiles()) if (profile.id == id) return profile;
+    return null;
+  }
+
+  // Resolves the profile a game should use; falls back to a transient Default (stock config) when
+  // none exist, which materializes into a real profile the moment it is edited and saved.
+  public GestureProfile getDefaultProfile() {
+    if (!profilesLoaded) loadProfiles();
+    GestureProfile def = getProfile(DEFAULT_PROFILE_ID);
+    if (def != null) return def;
+    GestureProfile transientDefault = new GestureProfile(context, DEFAULT_PROFILE_ID);
+    transientDefault.setName(DEFAULT_PROFILE_NAME);
+    return transientDefault;
+  }
+
+  public static GestureProfile loadProfile(Context context, File file) {
+    return loadProfileFromJson(context, FileUtils.readString(file));
+  }
+
+  private static GestureProfile loadProfileFromJson(Context context, String json) {
+    if (json == null || json.trim().isEmpty()) return null;
+    try {
+      JSONObject o = new JSONObject(json);
+      if (!o.has("id") || !o.has("name")) return null;
+      GestureProfile profile = new GestureProfile(context, o.getInt("id"));
+      profile.setName(o.getString("name"));
+      JSONObject cfg = o.optJSONObject("config");
+      profile.setConfigJson(cfg != null ? cfg.toString() : "{}");
+      return profile;
+    } catch (JSONException e) {
+      return null;
+    }
+  }
+
+}
diff --git a/app/src/main/runtime/input/controls/InputControlsManager.java b/app/src/main/runtime/input/controls/InputControlsManager.java
index b6c32dd06..d299794b3 100644
--- a/app/src/main/runtime/input/controls/InputControlsManager.java
+++ b/app/src/main/runtime/input/controls/InputControlsManager.java
@@ -25,12 +25,24 @@
 import org.json.JSONObject;
 
 public class InputControlsManager {
-  private static final int ASSET_PROFILE_SYNC_REVISION = 3;
+  private static final int ASSET_PROFILE_SYNC_REVISION = 8;
+  public static final int LAST_BUILTIN_PROFILE_ID = 8;
+  public static final int VIRTUAL_GAMEPAD_BUILTIN_ID = 3;
+  public static final int GAMEHUB_LAYOUT_BUILTIN_ID = 7;
+  // Retired bundled layout ids whose installed copies are removed on sync.
+  private static final int[] RETIRED_PROFILE_IDS = {4, 5};
+  // Bundled layouts replaced in this revision: reinstall pristine copies once.
+  private static final int[] REFRESHED_PROFILE_IDS = {8};
+
   private final Context context;
   private ArrayList<ControlsProfile> profiles;
   private int maxProfileId;
   private boolean profilesLoaded = false;
 
+  public static boolean isBuiltinProfile(ControlsProfile profile) {
+    return profile != null && profile.id <= LAST_BUILTIN_PROFILE_ID;
+  }
+
   public InputControlsManager(Context context) {
     this.context = context;
   }
@@ -41,6 +53,45 @@ public static File getProfilesDir(Context context) {
     return profilesDir;
   }
 
+  public static File getBackupsDir(Context context) {
+    File backupsDir = new File(context.getFilesDir(), "profile_backups");
+    if (!backupsDir.isDirectory()) backupsDir.mkdir();
+    return backupsDir;
+  }
+
+  public static File getBackupFile(Context context, int id) {
+    return new File(getBackupsDir(context), "controls-" + id + ".icp");
+  }
+
+  public static void backupProfile(Context context, int id) {
+    File working = ControlsProfile.getProfileFile(context, id);
+    if (working.isFile()) FileUtils.copy(working, getBackupFile(context, id));
+  }
+
+  public boolean canResetProfile(ControlsProfile profile) {
+    return profile != null && getBackupFile(context, profile.id).isFile();
+  }
+
+  /**
+   * Restores {@code profile} to its pristine snapshot (the layout it had when first installed,
+   * downloaded or imported) and returns the reloaded profile. Returns the unchanged profile if no
+   * snapshot exists. Built-in profiles are editable in place — this is how a user undoes edits.
+   */
+  public ControlsProfile resetProfile(ControlsProfile profile) {
+    if (profile == null) return null;
+    File backup = getBackupFile(context, profile.id);
+    if (!backup.isFile()) return profile;
+    File working = ControlsProfile.getProfileFile(context, profile.id);
+    FileUtils.copy(backup, working);
+    ControlsProfile refreshed = loadProfile(context, working);
+    if (refreshed == null) return profile;
+    if (profiles != null) {
+      int index = profiles.indexOf(profile);
+      if (index != -1) profiles.set(index, refreshed);
+    }
+    return refreshed;
+  }
+
   public ArrayList<ControlsProfile> getProfiles() {
     return getProfiles(false);
   }
@@ -57,14 +108,9 @@ public ArrayList<ControlsProfile> getProfiles(boolean ignoreTemplates) {
   }
 
   private void copyAssetProfilesIfNeeded() {
-    File profilesDir = InputControlsManager.getProfilesDir(context);
-    if (FileUtils.isEmpty(profilesDir)) {
-      FileUtils.copy(context, "inputcontrols/profiles", profilesDir);
-      return;
-    }
+    InputControlsManager.getProfilesDir(context);
 
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-
     int newVersion = AppUtils.getVersionCode(context);
     int oldVersion = preferences.getInt("inputcontrols_app_version", 0);
     int oldSyncRevision = preferences.getInt("inputcontrols_asset_sync_revision", 0);
@@ -75,31 +121,25 @@ private void copyAssetProfilesIfNeeded() {
         .putInt("inputcontrols_asset_sync_revision", ASSET_PROFILE_SYNC_REVISION)
         .apply();
 
-    File[] files = profilesDir.listFiles();
-    if (files == null) return;
+    for (int id : RETIRED_PROFILE_IDS) {
+      ControlsProfile.getProfileFile(context, id).delete();
+      getBackupFile(context, id).delete();
+    }
+    for (int id : REFRESHED_PROFILE_IDS) {
+      ControlsProfile.getProfileFile(context, id).delete();
+    }
 
     try {
       AssetManager assetManager = context.getAssets();
       String[] assetFiles = assetManager.list("inputcontrols/profiles");
+      if (assetFiles == null) return;
       for (String assetFile : assetFiles) {
         String assetPath = "inputcontrols/profiles/" + assetFile;
         ControlsProfile originProfile = loadProfile(context, assetManager.open(assetPath));
-
-        File targetFile = null;
-        for (File file : files) {
-          ControlsProfile targetProfile = loadProfile(context, file);
-          if (originProfile.id == targetProfile.id
-              && originProfile.getName().equals(targetProfile.getName())) {
-            targetFile = file;
-            break;
-          }
-        }
-
-        if (targetFile != null) {
-          FileUtils.copy(context, assetPath, targetFile);
-        } else {
-          FileUtils.copy(context, assetPath, new File(profilesDir, assetFile));
-        }
+        if (originProfile == null) continue;
+        File workingFile = ControlsProfile.getProfileFile(context, originProfile.id);
+        if (!workingFile.isFile()) FileUtils.copy(context, assetPath, workingFile);
+        FileUtils.copy(context, assetPath, getBackupFile(context, originProfile.id));
       }
     } catch (IOException e) {
     }
@@ -134,6 +174,7 @@ public ControlsProfile createProfile(String name) {
     ControlsProfile profile = new ControlsProfile(context, newId);
     profile.setName(name);
     profile.save();
+    backupProfile(context, newId);
     profiles.add(profile);
     return profile;
   }
@@ -165,6 +206,7 @@ public ControlsProfile duplicateProfile(ControlsProfile source) {
     } catch (JSONException e) {
     }
 
+    backupProfile(context, newId);
     ControlsProfile profile = loadProfile(context, newFile);
     profiles.add(profile);
     return profile;
@@ -172,7 +214,11 @@ public ControlsProfile duplicateProfile(ControlsProfile source) {
 
   public void removeProfile(ControlsProfile profile) {
     File file = ControlsProfile.getProfileFile(context, profile.id);
-    if (file.isFile() && file.delete()) profiles.remove(profile);
+    if (file.isFile() && file.delete()) {
+      profiles.remove(profile);
+      File backup = getBackupFile(context, profile.id);
+      if (backup.isFile()) backup.delete();
+    }
   }
 
   public synchronized ControlsProfile importProfile(JSONObject data) {
@@ -191,6 +237,7 @@ public synchronized ControlsProfile importProfile(JSONObject data) {
       File targetFile = ControlsProfile.getProfileFile(context, targetId);
       data.put("id", targetId);
       FileUtils.writeString(targetFile, data.toString());
+      backupProfile(context, targetId);
       ControlsProfile newProfile = loadProfile(context, targetFile);
 
       if (newProfile == null) {
@@ -215,6 +262,11 @@ public synchronized ControlsProfile importProfile(JSONObject data) {
   private ControlsProfile findProfileByName(String name) {
     String normalizedName = normalizeProfileName(name);
     for (ControlsProfile profile : profiles) {
+      // Never match a bundled built-in profile: importing a legacy ICP whose name collides with
+      // a built-in (e.g. a Winlator "Xbox Controller.icp") must create a fresh, visible profile
+      // rather than silently overwriting the read-only asset — which would land it on a hidden
+      // legacy slot and make the import appear to do nothing.
+      if (isBuiltinProfile(profile)) continue;
       if (normalizeProfileName(profile.getName()).equals(normalizedName)) {
         return profile;
       }
diff --git a/app/src/main/runtime/input/controls/PreferenceKeys.java b/app/src/main/runtime/input/controls/PreferenceKeys.java
index fcbf5ff34..a28eaf7c2 100644
--- a/app/src/main/runtime/input/controls/PreferenceKeys.java
+++ b/app/src/main/runtime/input/controls/PreferenceKeys.java
@@ -10,4 +10,5 @@ public class PreferenceKeys {
   public static final String INVERT_RIGHT_X = "invert_right_x";
   public static final String INVERT_RIGHT_Y = "invert_right_y";
   public static final String SQUARE_DEADZONE_LEFT = "square_deadzone_left";
+  public static final String TRIGGER_TYPE = "trigger_type";
 }
diff --git a/app/src/main/runtime/input/controls/RangeScroller.java b/app/src/main/runtime/input/controls/RangeScroller.java
index dd992e36f..7cef17463 100644
--- a/app/src/main/runtime/input/controls/RangeScroller.java
+++ b/app/src/main/runtime/input/controls/RangeScroller.java
@@ -14,6 +14,7 @@ public class RangeScroller {
   private float lastPosition;
   private long touchTime;
   private Binding binding = Binding.NONE;
+  private int bindingIndex = -1;
   private boolean isActionDown = false;
   private boolean scrolling = false;
   private Timer timer;
@@ -44,16 +45,15 @@ public byte[] getRangeIndex() {
     return new byte[] {from, to};
   }
 
-  private Binding getBindingByPosition(float x, float y) {
-    Rect boundingBox = element.getBoundingBox();
-    ControlElement.Range range = element.getRange();
-    float offset =
-        element.getOrientation() == 0
-            ? x - boundingBox.left - currentOffset
-            : y - boundingBox.top - currentOffset;
-    int index = (int) Math.floor((offset / getElementSize()) % range.max);
-    if (index < 0) index = range.max + index;
+  public int getBindingIndex() {
+    return bindingIndex;
+  }
+
+  public boolean isScrolling() {
+    return scrolling;
+  }
 
+  private static Binding bindingForIndex(ControlElement.Range range, int index) {
     switch (range) {
       case FROM_A_TO_Z:
         return Binding.valueOf("KEY_" + ((char) (65 + index)));
@@ -68,6 +68,19 @@ private Binding getBindingByPosition(float x, float y) {
     }
   }
 
+  private Binding getBindingByPosition(float x, float y) {
+    Rect boundingBox = element.getBoundingBox();
+    ControlElement.Range range = element.getRange();
+    float offset =
+        element.getOrientation() == 0
+            ? x - boundingBox.left - currentOffset
+            : y - boundingBox.top - currentOffset;
+    int index = (int) Math.floor((offset / getElementSize()) % range.max);
+    if (index < 0) index = range.max + index;
+    bindingIndex = index;
+    return bindingForIndex(range, index);
+  }
+
   private boolean isTap() {
     return (System.currentTimeMillis() - touchTime) < TouchpadView.MAX_TAP_MILLISECONDS;
   }
diff --git a/app/src/main/runtime/input/controls/VisualStyle.java b/app/src/main/runtime/input/controls/VisualStyle.java
new file mode 100644
index 000000000..8282ebee5
--- /dev/null
+++ b/app/src/main/runtime/input/controls/VisualStyle.java
@@ -0,0 +1,27 @@
+package com.winlator.cmod.runtime.input.controls;
+
+/** Rendering styles for the on-screen controls; enum order is the picker order and drawing branches on this in {@link ControlElement#draw}. */
+public enum VisualStyle {
+  SLATE,
+  GAMEHUB,
+  HALO,
+  GLINT,
+  SHADOW,
+  RETICLE,
+  NEON,
+  LUMINA,
+  ORIGINAL;
+
+  public static VisualStyle fromPreference(String name) {
+    if (name == null) return SLATE;
+    try {
+      return VisualStyle.valueOf(name);
+    } catch (IllegalArgumentException e) {
+      return SLATE;
+    }
+  }
+
+  public static String[] displayNames() {
+    return new String[] {"Slate", "Glass", "Halo", "Glint", "Shadow", "Reticle", "Neon", "Lumina", "Original"};
+  }
+}
diff --git a/app/src/main/runtime/input/rumble/GameSirG8UsbRumbleDriver.java b/app/src/main/runtime/input/rumble/GameSirG8UsbRumbleDriver.java
new file mode 100644
index 000000000..d7a58b274
--- /dev/null
+++ b/app/src/main/runtime/input/rumble/GameSirG8UsbRumbleDriver.java
@@ -0,0 +1,319 @@
+package com.winlator.cmod.runtime.input.rumble;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbEndpoint;
+import android.hardware.usb.UsbInterface;
+import android.hardware.usb.UsbManager;
+import android.os.Build;
+import android.os.Handler;
+import android.util.Log;
+import android.view.InputDevice;
+
+public class GameSirG8UsbRumbleDriver implements GamepadRumbleDriver {
+  private static final int VENDOR_ID = 13623;
+  private static final int G8_MFI_PRODUCT_ID = 274;
+  // X3 Pro enumerates over USB but rumbles over BLE, so the BLE driver must own it.
+  private static final int X3_PRO_PRODUCT_ID = 0x0106;
+  private static final int VENDOR_INTERFACE_ID = 1;
+  private static final int USB_WRITE_TIMEOUT_MS = 2000;
+  private static final int RUMBLE_DEADZONE_RAW = 1;
+  private static final int MAX_CONTROLLERS = 4;
+
+  private final Context context;
+  private final Handler handler;
+  private final int[] lastLeftPower = new int[] {-1, -1, -1, -1};
+  private final int[] lastRightPower = new int[] {-1, -1, -1, -1};
+
+  private boolean permissionRequested;
+  private String requestedDeviceName;
+  private GcmRumbleMode mode = GcmRumbleMode.DISABLED;
+
+  public GameSirG8UsbRumbleDriver(Context context, Handler handler) {
+    this.context = context;
+    this.handler = handler;
+  }
+
+  @Override
+  public String getName() {
+    return "GameSir G8+ USB";
+  }
+
+  @Override
+  public void setMode(GcmRumbleMode mode) {
+    this.mode = mode;
+  }
+
+  @Override
+  public boolean supports(InputDevice device, GcmRumbleMode mode) {
+    if (device == null || mode == GcmRumbleMode.DISABLED) {
+      return false;
+    }
+    if (device.getVendorId() != VENDOR_ID) {
+      return false;
+    }
+    if (device.getProductId() == X3_PRO_PRODUCT_ID) {
+      return false; // X3 Pro rumbles over BLE; let the BLE driver handle it
+    }
+    if (mode == GcmRumbleMode.ALL) {
+      // Only claim if a USB device with this VID/PID is present (don't steal BLE-only models).
+      UsbManager usbManager = getUsbManager();
+      if (usbManager == null) return false;
+      for (UsbDevice usbDevice : usbManager.getDeviceList().values()) {
+        if (usbDevice.getVendorId() == device.getVendorId()
+            && usbDevice.getProductId() == device.getProductId()) {
+          return true;
+        }
+      }
+      return false;
+    }
+    // KNOWN: G8+ MFi by PID + name
+    String name = device.getName();
+    return device.getProductId() == G8_MFI_PRODUCT_ID && name != null && name.contains("GameSir");
+  }
+
+  @Override
+  public void requestPermissionIfNeeded() {
+    UsbManager usbManager = getUsbManager();
+    if (usbManager == null) {
+      return;
+    }
+    UsbDevice device = findDevice(usbManager);
+    if (device != null && !usbManager.hasPermission(device)) {
+      requestPermission(usbManager, device);
+    }
+  }
+
+  @Override
+  public boolean rumble(int slot, int strong, int weak) {
+    if (slot < 0 || slot >= MAX_CONTROLLERS) {
+      return false;
+    }
+
+    int leftPower = scaleMotor(strong);
+    int rightPower = scaleMotor(weak);
+    if (lastLeftPower[slot] == leftPower && lastRightPower[slot] == rightPower) {
+      Log.d(
+          "WinHandler",
+          "GameSir USB rumble unchanged slot="
+              + slot
+              + " rawStrong="
+              + strong
+              + " rawWeak="
+              + weak
+              + " left="
+              + leftPower
+              + " right="
+              + rightPower);
+      return true;
+    }
+
+    boolean sent = sendRumble(slot, strong, weak, leftPower, rightPower);
+    if (sent) {
+      lastLeftPower[slot] = leftPower;
+      lastRightPower[slot] = rightPower;
+    }
+    return sent;
+  }
+
+  private int scaleMotor(int value) {
+    if (value <= RUMBLE_DEADZONE_RAW) {
+      return 0;
+    }
+    return Math.min(255, Math.max(1, Math.round((value / 65535.0f) * 255.0f)));
+  }
+
+  private boolean sendRumble(int slot, int rawStrong, int rawWeak, int leftPower, int rightPower) {
+    UsbManager usbManager = getUsbManager();
+    if (usbManager == null) {
+      return false;
+    }
+
+    UsbDevice device = findDevice(usbManager);
+    if (device == null) {
+      resetPermissionRequest();
+      return false;
+    }
+    if (!usbManager.hasPermission(device)) {
+      requestPermission(usbManager, device);
+      Log.d(
+          "WinHandler",
+          "GameSir USB rumble waiting for permission slot="
+              + slot
+              + " rawStrong="
+              + rawStrong
+              + " rawWeak="
+              + rawWeak);
+      return true;
+    }
+
+    UsbInterface usbInterface = findInterfaceById(device, VENDOR_INTERFACE_ID);
+    UsbEndpoint outEndpoint = usbInterface != null ? findInterruptOutEndpoint(usbInterface) : null;
+    if (usbInterface == null || outEndpoint == null) {
+      return false;
+    }
+
+    UsbDeviceConnection connection = usbManager.openDevice(device);
+    if (connection == null) {
+      return false;
+    }
+
+    byte[] command = buildInstantVibrationCommand(leftPower, rightPower);
+    try {
+      boolean claimed = connection.claimInterface(usbInterface, true);
+      if (!claimed) {
+        return false;
+      }
+      int written =
+          connection.bulkTransfer(outEndpoint, command, command.length, USB_WRITE_TIMEOUT_MS);
+      Log.d(
+          "WinHandler",
+          "GameSir USB rumble written="
+              + written
+              + " slot="
+              + slot
+              + " rawStrong="
+              + rawStrong
+              + " rawWeak="
+              + rawWeak
+              + " left="
+              + leftPower
+              + " right="
+              + rightPower);
+      return written == command.length;
+    } finally {
+      try {
+        connection.releaseInterface(usbInterface);
+      } catch (Exception ignored) {
+      }
+      connection.close();
+    }
+  }
+
+  private UsbManager getUsbManager() {
+    return (UsbManager) context.getSystemService(Context.USB_SERVICE);
+  }
+
+  private UsbDevice findDevice(UsbManager usbManager) {
+    for (UsbDevice device : usbManager.getDeviceList().values()) {
+      if (device.getVendorId() != VENDOR_ID) continue;
+      if (mode == GcmRumbleMode.ALL || device.getProductId() == G8_MFI_PRODUCT_ID) {
+        return device;
+      }
+    }
+    return null;
+  }
+
+  private void requestPermission(UsbManager usbManager, UsbDevice device) {
+    if (device == null || usbManager.hasPermission(device)) {
+      resetPermissionRequest();
+      return;
+    }
+    if (permissionRequested && device.getDeviceName().equals(requestedDeviceName)) {
+      return;
+    }
+
+    permissionRequested = true;
+    requestedDeviceName = device.getDeviceName();
+    String action = context.getPackageName() + ".GAMESIR_USB_PERMISSION";
+    BroadcastReceiver receiver =
+        new BroadcastReceiver() {
+          @Override
+          public void onReceive(Context receiverContext, Intent intent) {
+            if (!action.equals(intent.getAction())) {
+              return;
+            }
+            UsbDevice grantedDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+            boolean granted =
+                intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false);
+            boolean hasPermissionNow =
+                grantedDevice != null
+                    ? usbManager.hasPermission(grantedDevice)
+                    : hasPermission(usbManager);
+            Log.d(
+                "WinHandler",
+                "GameSir USB permission result granted="
+                    + granted
+                    + " hasPermissionNow="
+                    + hasPermissionNow);
+            // Always reset so a re-enumerated device (new /dev/bus/usb address) gets a fresh request.
+            resetPermissionRequest();
+            try {
+              context.unregisterReceiver(this);
+            } catch (IllegalArgumentException ignored) {
+            }
+          }
+        };
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      context.registerReceiver(receiver, new IntentFilter(action), Context.RECEIVER_NOT_EXPORTED);
+    } else {
+      context.registerReceiver(receiver, new IntentFilter(action));
+    }
+
+    int flags = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE : 0;
+    PendingIntent pendingIntent =
+        PendingIntent.getBroadcast(
+            context, 1, new Intent(action).setPackage(context.getPackageName()), flags);
+    handler.post(() -> usbManager.requestPermission(device, pendingIntent));
+    Log.d(
+        "WinHandler",
+        "GameSir USB permission requested for "
+            + device.getDeviceName()
+            + " vendorId="
+            + device.getVendorId()
+            + " productId="
+            + device.getProductId());
+  }
+
+  private boolean hasPermission(UsbManager usbManager) {
+    UsbDevice device = findDevice(usbManager);
+    return device != null && usbManager.hasPermission(device);
+  }
+
+  private void resetPermissionRequest() {
+    permissionRequested = false;
+    requestedDeviceName = null;
+  }
+
+  private UsbInterface findInterfaceById(UsbDevice device, int interfaceId) {
+    for (int i = 0; i < device.getInterfaceCount(); i++) {
+      UsbInterface usbInterface = device.getInterface(i);
+      if (usbInterface.getId() == interfaceId) {
+        return usbInterface;
+      }
+    }
+    return null;
+  }
+
+  private UsbEndpoint findInterruptOutEndpoint(UsbInterface usbInterface) {
+    for (int e = 0; e < usbInterface.getEndpointCount(); e++) {
+      UsbEndpoint endpoint = usbInterface.getEndpoint(e);
+      if (endpoint.getDirection() == UsbConstants.USB_DIR_OUT
+          && endpoint.getType() == UsbConstants.USB_ENDPOINT_XFER_INT) {
+        return endpoint;
+      }
+    }
+    return null;
+  }
+
+  private byte[] buildInstantVibrationCommand(int leftPower, int rightPower) {
+    byte[] command = new byte[9];
+    command[0] = 0x04;
+    command[1] = (byte) Math.min(255, Math.max(0, leftPower));
+    command[2] = (byte) (leftPower > 0 ? 4 : 0);
+    command[3] = (byte) Math.min(255, Math.max(0, rightPower));
+    command[4] = (byte) (rightPower > 0 ? 4 : 0);
+    command[5] = 0;
+    command[6] = 0;
+    command[7] = 0;
+    command[8] = 0;
+    return command;
+  }
+}
diff --git a/app/src/main/runtime/input/rumble/GameSirX5sBleRumbleDriver.java b/app/src/main/runtime/input/rumble/GameSirX5sBleRumbleDriver.java
new file mode 100644
index 000000000..c8feae715
--- /dev/null
+++ b/app/src/main/runtime/input/rumble/GameSirX5sBleRumbleDriver.java
@@ -0,0 +1,756 @@
+package com.winlator.cmod.runtime.input.rumble;
+
+import android.Manifest;
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCallback;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothGattService;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanResult;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Handler;
+import android.util.Log;
+import android.view.InputDevice;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.UUID;
+
+public class GameSirX5sBleRumbleDriver implements GamepadRumbleDriver {
+  private static final String TAG = "WinHandler";
+  private static final int VENDOR_ID = 0x3537;
+  private static final int PRODUCT_ID = 0x1119; // X5s
+  // X3 Pro: wired for input, but rumbles over this same GameSir BLE protocol (char 0x865f).
+  private static final int PRODUCT_ID_X3_PRO = 0x0106;
+  private static final int RUMBLE_DEADZONE_RAW = 1;
+  private static final int MAX_CONTROLLERS = 4;
+  private static final long SCAN_TIMEOUT_MS = 8000;
+  // Matches the official app: duration=1 + ~200ms heartbeat so the motor stops promptly.
+  private static final int RUMBLE_DURATION = 1;
+  private static final long HEARTBEAT_INTERVAL_MS = 150;
+
+  private static final UUID GAMESIR_SERVICE_UUID =
+      UUID.fromString("0000ff10-0000-1000-8000-00805f9b34fb");
+  private static final UUID GAMESIR_NOTIFY_UUID =
+      UUID.fromString("0000ff11-0000-1000-8000-00805f9b34fb");
+  private static final UUID GAMESIR_WRITE_UUID =
+      UUID.fromString("0000ff12-0000-1000-8000-00805f9b34fb");
+  private static final UUID GAMESIR_OTA_WRITE_UUID =
+      UUID.fromString("0000ff15-0000-1000-8000-00805f9b34fb");
+  private static final UUID GAMESIR_BLE_SERVICE_UUID =
+      UUID.fromString("00008650-0000-1000-8000-00805f9b34fb");
+  private static final UUID GAMESIR_BLE_WRITE_UUID =
+      UUID.fromString("0000865f-0000-1000-8000-00805f9b34fb");
+  private static final UUID GAMESIR_BLE_NOTIFY_UUID =
+      UUID.fromString("00008655-0000-1000-8000-00805f9b34fb");
+  private static final UUID CLIENT_CHARACTERISTIC_CONFIG_UUID =
+      UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+
+  private final Context context;
+  private final Context permissionContext;
+  private final Handler handler;
+  private final int[] lastLeftPower = new int[] {-1, -1, -1, -1};
+  private final int[] lastRightPower = new int[] {-1, -1, -1, -1};
+
+  private BluetoothGatt gatt;
+  private BluetoothGattCharacteristic writeCharacteristic;
+  private BluetoothLeScanner scanner;
+  private ScanCallback scanCallback;
+  private byte[] pendingCommand;
+  private boolean connecting;
+  private boolean autoConnectPending;
+  private boolean scanning;
+  private boolean discoveringServices;
+  private boolean notificationsEnabled;
+  private int scanGeneration;
+  private Runnable heartbeatRunnable;
+  private byte[] heartbeatCommand;
+
+  public GameSirX5sBleRumbleDriver(Context context, Handler handler) {
+    this.context = context.getApplicationContext();
+    this.permissionContext = context;
+    this.handler = handler;
+  }
+
+  @Override
+  public String getName() {
+    return "GameSir X5s BLE";
+  }
+
+  @Override
+  public boolean supports(InputDevice device, GcmRumbleMode mode) {
+    if (device == null || mode == GcmRumbleMode.DISABLED) {
+      return false;
+    }
+    if (device.getVendorId() != VENDOR_ID) {
+      return false;
+    }
+    if (mode == GcmRumbleMode.ALL) {
+      // Any GameSir BLE device (VID 0x3537)
+      return true;
+    }
+    // KNOWN: X5s or X3 Pro by PID + name (both rumble over the GameSir BLE GATT protocol).
+    String name = device.getName();
+    if (name == null) {
+      return false;
+    }
+    int pid = device.getProductId();
+    return (pid == PRODUCT_ID && name.contains("GameSir-X5s"))
+        || (pid == PRODUCT_ID_X3_PRO && name.contains("GameSir-X3 Pro"));
+  }
+
+  @Override
+  public void requestPermissionIfNeeded() {
+    if (!hasBluetoothPermission(true)) {
+      requestBluetoothPermissionIfPossible();
+      return;
+    }
+    // Proactively start scanning so the BLE connection is ready before the first rumble request.
+    handler.post(this::ensureConnected);
+  }
+
+  @Override
+  public boolean rumble(int slot, int strong, int weak) {
+    if (slot < 0 || slot >= MAX_CONTROLLERS) {
+      return false;
+    }
+
+    int leftPower = scaleMotor(strong);
+    int rightPower = scaleMotor(weak);
+    if (lastLeftPower[slot] == leftPower && lastRightPower[slot] == rightPower) {
+      Log.d(
+          TAG,
+          "GameSir X5s BLE rumble unchanged slot="
+              + slot
+              + " rawStrong="
+              + strong
+              + " rawWeak="
+              + weak
+              + " left="
+              + leftPower
+              + " right="
+              + rightPower);
+      return true;
+    }
+
+    boolean stopping = leftPower == 0 && rightPower == 0;
+    byte[] command = buildRumbleCommand(leftPower, stopping ? 0 : RUMBLE_DURATION,
+        rightPower, stopping ? 0 : RUMBLE_DURATION);
+    boolean handled = sendCommand(command, "slot=" + slot + " rawStrong=" + strong + " rawWeak=" + weak);
+    if (handled) {
+      lastLeftPower[slot] = leftPower;
+      lastRightPower[slot] = rightPower;
+      if (stopping) {
+        stopHeartbeat();
+      } else {
+        startHeartbeat(command);
+      }
+    }
+    return handled;
+  }
+
+  // 9-byte GCM immediate-vibration: [0x04, lgStr, lgDur, rgStr, rgDur, ltStr, ltDur, rtStr, rtDur].
+  private static byte[] buildRumbleCommand(
+      int leftGrip, int lgDuration, int rightGrip, int rgDuration) {
+    return new byte[] {
+      0x04,
+      (byte) clampByte(leftGrip),
+      (byte) clampByte(lgDuration),
+      (byte) clampByte(rightGrip),
+      (byte) clampByte(rgDuration),
+      0, 0, 0, 0  // ltStrength, ltDuration, rtStrength, rtDuration (triggers unused)
+    };
+  }
+
+  private int scaleMotor(int value) {
+    if (value <= RUMBLE_DEADZONE_RAW) {
+      return 0;
+    }
+    return Math.min(255, Math.max(1, Math.round((value / 65535.0f) * 255.0f)));
+  }
+
+  private void startHeartbeat(byte[] command) {
+    stopHeartbeat();
+    heartbeatCommand = Arrays.copyOf(command, command.length);
+    heartbeatRunnable = new Runnable() {
+      @Override
+      public void run() {
+        byte[] cmd = heartbeatCommand;
+        if (cmd != null) {
+          sendCommand(cmd, "heartbeat");
+          handler.postDelayed(this, HEARTBEAT_INTERVAL_MS);
+        }
+      }
+    };
+    handler.postDelayed(heartbeatRunnable, HEARTBEAT_INTERVAL_MS);
+  }
+
+  private void stopHeartbeat() {
+    if (heartbeatRunnable != null) {
+      handler.removeCallbacks(heartbeatRunnable);
+      heartbeatRunnable = null;
+    }
+    heartbeatCommand = null;
+  }
+
+  private boolean sendCommand(byte[] command, String reason) {
+    if (!hasBluetoothPermission(true)) {
+      requestBluetoothPermissionIfPossible();
+      Log.d(TAG, "GameSir X5s BLE missing bluetooth permission " + reason);
+      return true;
+    }
+
+    if (writeCharacteristic != null && gatt != null) {
+      return writeNow(command, reason);
+    }
+
+    pendingCommand = Arrays.copyOf(command, command.length);
+    ensureConnected();
+    Log.d(TAG, "GameSir X5s BLE queued command " + reason + " command=" + bytesToHex(command));
+    return true;
+  }
+
+  private void ensureConnected() {
+    if (connecting || discoveringServices || writeCharacteristic != null) {
+      return;
+    }
+
+    BluetoothAdapter adapter = getAdapter();
+    if (adapter == null || !adapter.isEnabled()) {
+      Log.d(TAG, "GameSir X5s BLE unavailable: adapter disabled");
+      return;
+    }
+
+    if (!autoConnectPending && gatt == null) {
+      tryRegisterAutoConnect(adapter);
+    }
+
+    if (!scanning) {
+      startScan(adapter);
+    }
+  }
+
+  private void tryRegisterAutoConnect(BluetoothAdapter adapter) {
+    Set<BluetoothDevice> bonded;
+    try {
+      bonded = adapter.getBondedDevices();
+    } catch (SecurityException e) {
+      Log.d(TAG, "GameSir X5s BLE bonded list security error: " + e.getMessage());
+      return;
+    }
+    if (bonded == null) {
+      return;
+    }
+    for (BluetoothDevice device : bonded) {
+      if (isCandidate(device)) {
+        Log.d(TAG, "GameSir X5s BLE auto-connecting bonded " + describeDevice(device));
+        try {
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            gatt = device.connectGatt(context, true, gattCallback, BluetoothDevice.TRANSPORT_LE);
+          } else {
+            gatt = device.connectGatt(context, true, gattCallback);
+          }
+          autoConnectPending = true;
+        } catch (SecurityException e) {
+          Log.d(TAG, "GameSir X5s BLE auto-connect security error: " + e.getMessage());
+        }
+        return;
+      }
+    }
+  }
+
+  private void startScan(BluetoothAdapter adapter) {
+    scanner = adapter.getBluetoothLeScanner();
+    if (scanner == null) {
+      Log.d(TAG, "GameSir X5s BLE scanner unavailable");
+      return;
+    }
+
+    scanning = true;
+    int generation = ++scanGeneration;
+    scanCallback =
+        new ScanCallback() {
+          @Override
+          public void onScanResult(int callbackType, ScanResult result) {
+            BluetoothDevice device = result.getDevice();
+            if (shouldLogScanResult(device)) {
+              Log.d(TAG, "GameSir X5s BLE scan result " + describeDevice(device));
+            }
+            // Match device.getName() or the advertised name (getName() can be null on first sight).
+            String advertisedName =
+                result.getScanRecord() != null ? result.getScanRecord().getDeviceName() : null;
+            if (isCandidate(device) || matchesKnownName(advertisedName)) {
+              stopScan();
+              connect(device);
+            }
+          }
+
+          @Override
+          public void onScanFailed(int errorCode) {
+            scanning = false;
+            Log.d(TAG, "GameSir X5s BLE scan failed error=" + errorCode);
+          }
+        };
+
+    try {
+      scanner.startScan(scanCallback);
+      Log.d(TAG, "GameSir X5s BLE scan started");
+      handler.postDelayed(
+          () -> {
+            if (scanGeneration == generation) {
+              stopScan();
+            }
+          },
+          SCAN_TIMEOUT_MS);
+    } catch (SecurityException e) {
+      scanning = false;
+      Log.d(TAG, "GameSir X5s BLE scan security error: " + e.getMessage());
+    }
+  }
+
+  private void connect(BluetoothDevice device) {
+    if (device == null || connecting) {
+      return;
+    }
+    autoConnectPending = false;
+    connecting = true;
+    closeGatt();
+    Log.d(TAG, "GameSir X5s BLE connecting to " + describeDevice(device));
+    try {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        gatt = device.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE);
+      } else {
+        gatt = device.connectGatt(context, false, gattCallback);
+      }
+    } catch (SecurityException e) {
+      connecting = false;
+      Log.d(TAG, "GameSir X5s BLE connect security error: " + e.getMessage());
+    }
+  }
+
+  private final BluetoothGattCallback gattCallback =
+      new BluetoothGattCallback() {
+        @Override
+        public void onConnectionStateChange(BluetoothGatt callbackGatt, int status, int newState) {
+          Log.d(
+              TAG,
+              "GameSir X5s BLE connection status="
+                  + status
+                  + " newState="
+                  + newState);
+          if (newState == BluetoothProfile.STATE_CONNECTED) {
+            autoConnectPending = false;
+            connecting = false;
+            discoveringServices = true;
+            try {
+              callbackGatt.discoverServices();
+            } catch (SecurityException e) {
+              discoveringServices = false;
+              Log.d(TAG, "GameSir X5s BLE discover security error: " + e.getMessage());
+            }
+          } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
+            autoConnectPending = false;
+            connecting = false;
+            discoveringServices = false;
+            stopHeartbeat();
+            closeGatt();
+            if (currentMode != GcmRumbleMode.DISABLED) {
+              handler.postDelayed(GameSirX5sBleRumbleDriver.this::ensureConnected, 1000);
+            }
+          }
+        }
+
+        @Override
+        public void onServicesDiscovered(BluetoothGatt callbackGatt, int status) {
+          discoveringServices = false;
+          Log.d(TAG, "GameSir X5s BLE services discovered status=" + status);
+          logServices(callbackGatt);
+          writeCharacteristic = findWriteCharacteristic(callbackGatt);
+          if (writeCharacteristic == null) {
+            Log.d(TAG, "GameSir X5s BLE no writable characteristic found");
+            return;
+          }
+          Log.d(
+              TAG,
+              "GameSir X5s BLE selected write characteristic="
+                  + writeCharacteristic.getUuid()
+                  + " properties=0x"
+                  + Integer.toHexString(writeCharacteristic.getProperties()));
+
+          byte[] command = pendingCommand;
+          if (command != null) {
+            pendingCommand = Arrays.copyOf(command, command.length);
+            BluetoothGattCharacteristic notifyCharacteristic = findNotifyCharacteristic(callbackGatt);
+            if (!enableNotifications(callbackGatt, notifyCharacteristic)) {
+              flushPendingCommand("pending");
+            } else {
+              handler.postDelayed(() -> flushPendingCommand("pending-after-notify-delay"), 150);
+            }
+          }
+        }
+
+        @Override
+        public void onDescriptorWrite(
+            BluetoothGatt callbackGatt, BluetoothGattDescriptor descriptor, int status) {
+          Log.d(
+              TAG,
+              "GameSir X5s BLE descriptor write callback descriptor="
+                  + descriptor.getUuid()
+                  + " characteristic="
+                  + descriptor.getCharacteristic().getUuid()
+                  + " status="
+                  + status);
+          if (status == BluetoothGatt.GATT_SUCCESS) {
+            notificationsEnabled = true;
+          }
+          flushPendingCommand("pending-after-notify");
+        }
+
+        @Override
+        public void onCharacteristicWrite(
+            BluetoothGatt callbackGatt, BluetoothGattCharacteristic characteristic, int status) {
+          Log.d(
+              TAG,
+              "GameSir X5s BLE write callback characteristic="
+                  + characteristic.getUuid()
+                  + " status="
+                  + status);
+        }
+      };
+
+  private void flushPendingCommand(String reason) {
+    byte[] command = pendingCommand;
+    pendingCommand = null;
+    if (command != null) {
+      writeNow(command, reason);
+    }
+  }
+
+  private boolean writeNow(byte[] command, String reason) {
+    BluetoothGatt localGatt = gatt;
+    BluetoothGattCharacteristic characteristic = writeCharacteristic;
+    if (localGatt == null || characteristic == null) {
+      pendingCommand = Arrays.copyOf(command, command.length);
+      ensureConnected();
+      return true;
+    }
+
+    try {
+      int writeType;
+      if (GAMESIR_BLE_WRITE_UUID.equals(characteristic.getUuid())) {
+        writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE;
+      } else if ((characteristic.getProperties()
+              & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)
+          != 0) {
+        writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE;
+      } else {
+        writeType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
+      }
+      try {
+        characteristic.setWriteType(writeType);
+      } catch (IllegalArgumentException e) {
+        Log.d(
+            TAG,
+            "GameSir X5s BLE write type rejected writeType="
+                + writeType
+                + " characteristic="
+                + characteristic.getUuid()
+                + " message="
+                + e.getMessage());
+        characteristic.setWriteType(BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT);
+      }
+      characteristic.setValue(command);
+      boolean started = localGatt.writeCharacteristic(characteristic);
+      Log.d(
+          TAG,
+          "GameSir X5s BLE rumble write started="
+              + started
+              + " "
+              + reason
+              + " characteristic="
+              + characteristic.getUuid()
+              + " writeType="
+              + characteristic.getWriteType()
+              + " command="
+              + bytesToHex(command));
+      return started;
+    } catch (SecurityException e) {
+      Log.d(TAG, "GameSir X5s BLE write security error: " + e.getMessage());
+      return true;
+    }
+  }
+
+  private boolean enableNotifications(
+      BluetoothGatt localGatt, BluetoothGattCharacteristic characteristic) {
+    if (notificationsEnabled
+        || localGatt == null
+        || characteristic == null
+        || (characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) == 0) {
+      return false;
+    }
+
+    try {
+      boolean localEnabled = localGatt.setCharacteristicNotification(characteristic, true);
+      BluetoothGattDescriptor descriptor =
+          characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_UUID);
+      if (descriptor == null) {
+        Log.d(
+            TAG,
+            "GameSir X5s BLE notify set="
+                + localEnabled
+                + " descriptor missing characteristic="
+                + characteristic.getUuid());
+        notificationsEnabled = localEnabled;
+        return false;
+      }
+      descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
+      boolean started = localGatt.writeDescriptor(descriptor);
+      Log.d(
+          TAG,
+          "GameSir X5s BLE notify set="
+              + localEnabled
+              + " descriptorWriteStarted="
+              + started
+              + " characteristic="
+              + characteristic.getUuid());
+      return started;
+    } catch (SecurityException e) {
+      Log.d(TAG, "GameSir X5s BLE notify security error: " + e.getMessage());
+      return false;
+    }
+  }
+
+  private BluetoothGattCharacteristic findWriteCharacteristic(BluetoothGatt localGatt) {
+    BluetoothGattService bleService = localGatt.getService(GAMESIR_BLE_SERVICE_UUID);
+    if (bleService != null) {
+      BluetoothGattCharacteristic preferred = findWritableByUuid(bleService, GAMESIR_BLE_WRITE_UUID);
+      if (preferred != null) {
+        return preferred;
+      }
+    }
+
+    BluetoothGattService service = localGatt.getService(GAMESIR_SERVICE_UUID);
+    if (service != null) {
+      BluetoothGattCharacteristic preferred = findWritableByUuid(service, GAMESIR_WRITE_UUID);
+      if (preferred != null) {
+        return preferred;
+      }
+      preferred = findWritableByUuid(service, GAMESIR_NOTIFY_UUID);
+      if (preferred != null) {
+        return preferred;
+      }
+      preferred = findWritableByUuid(service, GAMESIR_OTA_WRITE_UUID);
+      if (preferred != null) {
+        return preferred;
+      }
+    }
+
+    for (BluetoothGattService candidateService : localGatt.getServices()) {
+      BluetoothGattCharacteristic writable = findFirstWritable(candidateService);
+      if (writable != null) {
+        return writable;
+      }
+    }
+    return null;
+  }
+
+  private BluetoothGattCharacteristic findNotifyCharacteristic(BluetoothGatt localGatt) {
+    BluetoothGattService bleService = localGatt.getService(GAMESIR_BLE_SERVICE_UUID);
+    if (bleService != null) {
+      BluetoothGattCharacteristic preferred = bleService.getCharacteristic(GAMESIR_BLE_NOTIFY_UUID);
+      if (preferred != null
+          && (preferred.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0) {
+        return preferred;
+      }
+    }
+    return writeCharacteristic;
+  }
+
+  private BluetoothGattCharacteristic findWritableByUuid(
+      BluetoothGattService service, UUID uuid) {
+    BluetoothGattCharacteristic characteristic = service.getCharacteristic(uuid);
+    if (characteristic != null && isWritable(characteristic)) {
+      return characteristic;
+    }
+    return null;
+  }
+
+  private BluetoothGattCharacteristic findFirstWritable(BluetoothGattService service) {
+    for (BluetoothGattCharacteristic characteristic : service.getCharacteristics()) {
+      if (isWritable(characteristic)) {
+        return characteristic;
+      }
+    }
+    return null;
+  }
+
+  private boolean isWritable(BluetoothGattCharacteristic characteristic) {
+    int properties = characteristic.getProperties();
+    return (properties & BluetoothGattCharacteristic.PROPERTY_WRITE) != 0
+        || (properties & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) != 0;
+  }
+
+  private void logServices(BluetoothGatt localGatt) {
+    List<BluetoothGattService> services = localGatt.getServices();
+    Log.d(TAG, "GameSir X5s BLE service count=" + services.size());
+    for (BluetoothGattService service : services) {
+      Log.d(TAG, "GameSir X5s BLE service=" + service.getUuid());
+      for (BluetoothGattCharacteristic characteristic : service.getCharacteristics()) {
+        Log.d(
+            TAG,
+            "GameSir X5s BLE characteristic="
+                + characteristic.getUuid()
+                + " properties=0x"
+                + Integer.toHexString(characteristic.getProperties()));
+      }
+    }
+  }
+
+  private GcmRumbleMode currentMode = GcmRumbleMode.DISABLED;
+
+  @Override
+  public void setMode(GcmRumbleMode mode) {
+    this.currentMode = mode;
+  }
+
+  private boolean isCandidate(BluetoothDevice device) {
+    if (device == null) {
+      return false;
+    }
+    String name = null;
+    try {
+      name = device.getName();
+    } catch (SecurityException ignored) {
+    }
+    return matchesKnownName(name);
+  }
+
+  /** Name-based match (no MAC); works for any unit since all advertise the same local name. */
+  private boolean matchesKnownName(String name) {
+    if (name == null) return false;
+    if (currentMode == GcmRumbleMode.ALL) {
+      // In ALL mode accept any GameSir BLE device
+      return name.contains("GameSir") || name.contains("Gamesir");
+    }
+    // KNOWN mode: X5s or X3 Pro BLE names
+    return name.contains("GamePad05")
+        || name.contains("GameSir-X5s")
+        || name.contains("X5s")
+        || name.contains("GameSir-X3 Pro")
+        || name.contains("X3 Pro");
+  }
+
+  private boolean shouldLogScanResult(BluetoothDevice device) {
+    if (device == null) {
+      return false;
+    }
+    String name = null;
+    try {
+      name = device.getName();
+    } catch (SecurityException ignored) {
+    }
+    if (name == null) {
+      return false;
+    }
+    return name.contains("Game")
+        || name.contains("game")
+        || name.contains("X5")
+        || name.contains("x5")
+        || name.contains("05");
+  }
+
+  private BluetoothAdapter getAdapter() {
+    BluetoothManager manager = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
+    return manager != null ? manager.getAdapter() : BluetoothAdapter.getDefaultAdapter();
+  }
+
+  private void stopScan() {
+    if (!scanning) {
+      return;
+    }
+    scanning = false;
+    if (scanner != null && scanCallback != null) {
+      try {
+        scanner.stopScan(scanCallback);
+      } catch (SecurityException e) {
+        Log.d(TAG, "GameSir X5s BLE stop scan security error: " + e.getMessage());
+      }
+    }
+    scanCallback = null;
+    scanGeneration++;
+    Log.d(TAG, "GameSir X5s BLE scan stopped");
+  }
+
+  void closeGatt() {
+    if (gatt != null) {
+      try {
+        gatt.close();
+      } catch (Exception ignored) {
+      }
+      gatt = null;
+    }
+    writeCharacteristic = null;
+    notificationsEnabled = false;
+    discoveringServices = false;
+  }
+
+  private boolean hasBluetoothPermission(boolean includeScan) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+      return true;
+    }
+    boolean connect =
+        context.checkSelfPermission(Manifest.permission.BLUETOOTH_CONNECT)
+            == PackageManager.PERMISSION_GRANTED;
+    boolean scan =
+        !includeScan
+            || context.checkSelfPermission(Manifest.permission.BLUETOOTH_SCAN)
+                == PackageManager.PERMISSION_GRANTED;
+    return connect && scan;
+  }
+
+  private void requestBluetoothPermissionIfPossible() {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || !(permissionContext instanceof Activity)) {
+      return;
+    }
+    ((Activity) permissionContext)
+        .requestPermissions(
+            new String[] {Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.BLUETOOTH_SCAN},
+            5305);
+  }
+
+  private String describeDevice(BluetoothDevice device) {
+    String name = null;
+    String address = null;
+    try {
+      name = device.getName();
+      address = device.getAddress();
+    } catch (SecurityException ignored) {
+    }
+    return String.format(Locale.US, "name=%s address=%s", name, address);
+  }
+
+  private static int clampByte(int value) {
+    return Math.max(0, Math.min(255, value));
+  }
+
+  private static String bytesToHex(byte[] bytes) {
+    StringBuilder builder = new StringBuilder();
+    for (int i = 0; i < bytes.length; i++) {
+      if (i > 0) {
+        builder.append(' ');
+      }
+      builder.append(String.format(Locale.US, "%02x", bytes[i] & 0xff));
+    }
+    return builder.toString();
+  }
+}
diff --git a/app/src/main/runtime/input/rumble/GamepadRumbleDriver.java b/app/src/main/runtime/input/rumble/GamepadRumbleDriver.java
new file mode 100644
index 000000000..e4e3d1806
--- /dev/null
+++ b/app/src/main/runtime/input/rumble/GamepadRumbleDriver.java
@@ -0,0 +1,15 @@
+package com.winlator.cmod.runtime.input.rumble;
+
+import android.view.InputDevice;
+
+public interface GamepadRumbleDriver {
+  String getName();
+
+  boolean supports(InputDevice device, GcmRumbleMode mode);
+
+  void setMode(GcmRumbleMode mode);
+
+  void requestPermissionIfNeeded();
+
+  boolean rumble(int slot, int strong, int weak);
+}
diff --git a/app/src/main/runtime/input/rumble/GamepadRumbleManager.java b/app/src/main/runtime/input/rumble/GamepadRumbleManager.java
new file mode 100644
index 000000000..e5ddf8377
--- /dev/null
+++ b/app/src/main/runtime/input/rumble/GamepadRumbleManager.java
@@ -0,0 +1,120 @@
+package com.winlator.cmod.runtime.input.rumble;
+
+import android.content.Context;
+import android.os.Handler;
+import android.util.Log;
+import android.view.InputDevice;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GamepadRumbleManager {
+  /** GameSir / Guangzhou Chicken Run USB vendor id (0x3537). */
+  public static final int GAMESIR_VENDOR_ID = 13623;
+
+  private static final int MAX_CONTROLLERS = 4;
+
+  private final Handler handler;
+  private final List<GamepadRumbleDriver> drivers = new ArrayList<>();
+  private final Runnable[] pendingStops = new Runnable[MAX_CONTROLLERS];
+  private final GamepadRumbleDriver[] activeDrivers = new GamepadRumbleDriver[MAX_CONTROLLERS];
+
+  private GcmRumbleMode mode = GcmRumbleMode.DISABLED;
+
+  public GamepadRumbleManager(Context context, Handler handler) {
+    this.handler = handler;
+    // USB driver first so it wins over BLE for USB-rumble models in ALL mode.
+    this.drivers.add(new GameSirG8UsbRumbleDriver(context, handler));
+    this.drivers.add(new GameSirX5sBleRumbleDriver(context, handler));
+  }
+
+  public void setMode(GcmRumbleMode mode) {
+    this.mode = mode;
+    for (GamepadRumbleDriver driver : drivers) {
+      driver.setMode(mode);
+    }
+    if (mode != GcmRumbleMode.DISABLED) {
+      requestPermissionIfNeeded();
+    } else {
+      stopAll();
+    }
+  }
+
+  public void requestPermissionIfNeeded() {
+    if (mode == GcmRumbleMode.DISABLED) {
+      return;
+    }
+    for (GamepadRumbleDriver driver : drivers) {
+      driver.requestPermissionIfNeeded();
+    }
+  }
+
+  public boolean handleRumble(
+      int slot, InputDevice device, int strong, int weak, int durationMs) {
+    if (mode == GcmRumbleMode.DISABLED || slot < 0 || slot >= MAX_CONTROLLERS || device == null) {
+      return false;
+    }
+
+    GamepadRumbleDriver driver = findDriver(device, mode);
+    if (driver == null) {
+      return false;
+    }
+
+    boolean handled = driver.rumble(slot, strong, weak);
+    if (!handled) {
+      return false;
+    }
+
+    activeDrivers[slot] = driver;
+    clearPendingStop(slot);
+
+    if ((strong > 0 || weak > 0) && durationMs > 0 && durationMs < 0xffff) {
+      Runnable stop =
+          () -> {
+            driver.rumble(slot, 0, 0);
+            if (activeDrivers[slot] == driver) {
+              activeDrivers[slot] = null;
+            }
+            pendingStops[slot] = null;
+          };
+      pendingStops[slot] = stop;
+      handler.postDelayed(stop, durationMs);
+    }
+    return true;
+  }
+
+  public void stopAll() {
+    for (int slot = 0; slot < MAX_CONTROLLERS; slot++) {
+      clearPendingStop(slot);
+      GamepadRumbleDriver driver = activeDrivers[slot];
+      if (driver != null) {
+        driver.rumble(slot, 0, 0);
+        activeDrivers[slot] = null;
+      }
+    }
+  }
+
+  private GamepadRumbleDriver findDriver(InputDevice device, GcmRumbleMode currentMode) {
+    for (GamepadRumbleDriver driver : drivers) {
+      if (driver.supports(device, currentMode)) {
+        return driver;
+      }
+    }
+    Log.d(
+        "WinHandler",
+        "No vendor rumble driver for device="
+            + device.getName()
+            + " vendorId="
+            + device.getVendorId()
+            + " productId="
+            + device.getProductId());
+    return null;
+  }
+
+  private void clearPendingStop(int slot) {
+    Runnable pendingStop = pendingStops[slot];
+    if (pendingStop != null) {
+      handler.removeCallbacks(pendingStop);
+      pendingStops[slot] = null;
+    }
+  }
+}
diff --git a/app/src/main/runtime/input/rumble/GcmRumbleMode.java b/app/src/main/runtime/input/rumble/GcmRumbleMode.java
new file mode 100644
index 000000000..5a6c236d6
--- /dev/null
+++ b/app/src/main/runtime/input/rumble/GcmRumbleMode.java
@@ -0,0 +1,35 @@
+package com.winlator.cmod.runtime.input.rumble;
+
+public enum GcmRumbleMode {
+  /** Off; use the normal InputDevice/system vibrator. */
+  DISABLED,
+  /** Known GameSir models only: G8+ MFi (USB), X5s & X3 Pro (BLE). */
+  KNOWN,
+  /** Any GameSir device (experimental). */
+  ALL;
+
+  public static final String PREF_KEY = "gcm_rumble_mode";
+
+  public static GcmRumbleMode fromPrefValue(String value) {
+    if (value == null) return DISABLED;
+    switch (value) {
+      case "known":
+        return KNOWN;
+      case "all":
+        return ALL;
+      default:
+        return DISABLED;
+    }
+  }
+
+  public String toPrefValue() {
+    switch (this) {
+      case DISABLED:
+        return "disabled";
+      case ALL:
+        return "all";
+      default:
+        return "known";
+    }
+  }
+}
diff --git a/app/src/main/runtime/input/ui/InputControlsView.java b/app/src/main/runtime/input/ui/InputControlsView.java
index 98aa5b890..74c5f8ad9 100644
--- a/app/src/main/runtime/input/ui/InputControlsView.java
+++ b/app/src/main/runtime/input/ui/InputControlsView.java
@@ -27,18 +27,24 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import androidx.preference.PreferenceManager;
 import com.winlator.cmod.R;
+import com.winlator.cmod.runtime.display.XServerDisplayActivity;
 import com.winlator.cmod.runtime.display.winhandler.MouseEventFlags;
 import com.winlator.cmod.runtime.display.winhandler.WinHandler;
 import com.winlator.cmod.runtime.display.xserver.Pointer;
 import com.winlator.cmod.runtime.display.xserver.XServer;
+import com.winlator.cmod.runtime.input.controls.AccentTheme;
 import com.winlator.cmod.runtime.input.controls.Binding;
 import com.winlator.cmod.runtime.input.controls.ControlElement;
 import com.winlator.cmod.runtime.input.controls.ControlsProfile;
 import com.winlator.cmod.runtime.input.controls.ExternalController;
 import com.winlator.cmod.runtime.input.controls.ExternalControllerBinding;
 import com.winlator.cmod.runtime.input.controls.GamepadState;
+import com.winlator.cmod.runtime.input.controls.InputControlsManager;
+import com.winlator.cmod.runtime.input.controls.VisualStyle;
 import com.winlator.cmod.shared.math.Mathf;
 import java.io.IOException;
 import java.io.InputStream;
@@ -69,6 +75,9 @@ public class InputControlsView extends View {
   private volatile float mouseMoveOffsetX = 0f;
   private volatile float mouseMoveOffsetY = 0f;
   private boolean showTouchscreenControls = false;
+  private VisualStyle visualStyle = VisualStyle.SLATE;
+  private AccentTheme accentTheme = AccentTheme.CYAN;
+  private InputControlsManager inputControlsManager;
 
   private Handler timeoutHandler; // Reference to the activity's timeout handler
   private Runnable hideControlsRunnable; // Runnable to hide the controls
@@ -80,6 +89,12 @@ public class InputControlsView extends View {
 
   private boolean focusOnStick = false; // A flag to determine if we are focusing on the stick
 
+  private boolean batchingUpdates = false;
+
+  public boolean isBatchingUpdates() {
+    return batchingUpdates;
+  }
+
   public boolean isFocusedOnStick() {
     return focusOnStick;
   }
@@ -89,6 +104,10 @@ public void setFocusOnStick(boolean focus) {
     invalidate(); // Redraw the view with the new focus setting
   }
 
+  public void setInputControlsManager(InputControlsManager inputControlsManager) {
+    this.inputControlsManager = inputControlsManager;
+  }
+
   @SuppressLint("ResourceType")
   public InputControlsView(Context context) {
     super(context);
@@ -147,6 +166,7 @@ public InputControlsView(Context context, boolean focusOnStick) {
 
   public void setEditMode(boolean editMode) {
     this.editMode = editMode;
+    invalidate();
   }
 
   public boolean isEditMode() {
@@ -155,12 +175,45 @@ public boolean isEditMode() {
 
   public void setOverlayOpacity(float overlayOpacity) {
     this.overlayOpacity = overlayOpacity;
+    invalidate();
   }
 
   public float getOverlayOpacity() {
     return overlayOpacity;
   }
 
+  private boolean reverseBindingOrder = false;
+
+  public boolean isReverseBindingOrder() {
+    return reverseBindingOrder;
+  }
+
+  public void setReverseBindingOrder(boolean reverseBindingOrder) {
+    this.reverseBindingOrder = reverseBindingOrder;
+  }
+
+  public VisualStyle getVisualStyle() {
+    return visualStyle;
+  }
+
+  public void setVisualStyle(VisualStyle style) {
+    this.visualStyle = style != null ? style : VisualStyle.SLATE;
+    invalidate();
+  }
+
+  public AccentTheme getAccentTheme() {
+    return accentTheme;
+  }
+
+  public void setAccentTheme(AccentTheme theme) {
+    this.accentTheme = theme != null ? theme : AccentTheme.CYAN;
+    invalidate();
+  }
+
+  public InputControlsManager getInputControlsManager() {
+    return inputControlsManager;
+  }
+
   public int getSnappingSize() {
     return snappingSize;
   }
@@ -344,6 +397,7 @@ public synchronized void setProfile(ControlsProfile profile) {
       deselectAllElements();
     } else this.profile = null;
     activeTouchElements.clear();
+    invalidate();
   }
 
   public boolean isShowTouchscreenControls() {
@@ -424,8 +478,36 @@ private void releaseActiveTouchElements() {
     activeTouchElements.clear();
   }
 
+  // Release captures whose pointer is no longer reported (missed UP/CANCEL).
+  private void releaseStaleCaptures(MotionEvent event) {
+    boolean removedAny = false;
+    for (int i = activeTouchElements.size() - 1; i >= 0; i--) {
+      int capturedId = activeTouchElements.keyAt(i);
+      boolean stillDown = false;
+      for (int p = 0, count = event.getPointerCount(); p < count; p++) {
+        if (event.getPointerId(p) == capturedId) {
+          stillDown = true;
+          break;
+        }
+      }
+      if (!stillDown) {
+        ControlElement element = activeTouchElements.valueAt(i);
+        if (element != null) element.handleTouchUp(capturedId);
+        activeTouchElements.removeAt(i);
+        removedAny = true;
+      }
+    }
+    if (removedAny) syncCapturedPointers();
+  }
+
+  public void cancelContinuousMouseMove() {
+    mouseMoveOffsetX = 0f;
+    mouseMoveOffsetY = 0f;
+  }
+
   public synchronized void cancelActiveTouches() {
     releaseActiveTouchElements();
+    cancelContinuousMouseMove();
   }
 
   public int getMaxWidth() {
@@ -434,7 +516,11 @@ public int getMaxWidth() {
 
   @Override
   protected void onDetachedFromWindow() {
-    if (mouseMoveTimer != null) mouseMoveTimer.cancel();
+    cancelContinuousMouseMove();
+    if (mouseMoveTimer != null) {
+      mouseMoveTimer.cancel();
+      mouseMoveTimer = null;
+    }
     super.onDetachedFromWindow();
   }
 
@@ -443,6 +529,7 @@ public int getMaxHeight() {
   }
 
   private void createMouseMoveTimer() {
+    if (xServer == null) return;
     WinHandler winHandler = xServer.getWinHandler();
     if (mouseMoveTimer == null && profile != null) {
       final float cursorSpeed = profile.getCursorSpeed();
@@ -451,17 +538,16 @@ private void createMouseMoveTimer() {
           new TimerTask() {
             @Override
             public void run() {
-              if (mouseMoveOffsetX != 0 || mouseMoveOffsetY != 0) {
-                if (xServer.isRelativeMouseMovement())
-                  winHandler.mouseEvent(
-                      MouseEventFlags.MOVE,
-                      (int) (mouseMoveOffsetX * cursorSpeed * 20),
-                      (int) (mouseMoveOffsetY * cursorSpeed * 20),
-                      0);
-                else
-                  xServer.injectPointerMoveDelta(
-                      (int) (mouseMoveOffsetX * cursorSpeed * 20),
-                      (int) (mouseMoveOffsetY * cursorSpeed * 20));
+              if (getContext() instanceof XServerDisplayActivity && ((XServerDisplayActivity)getContext()).isInputSuspended()) return;
+              if (mouseMoveOffsetX != 0 || mouseMoveOffsetY != 0) {                int dx = (int) (mouseMoveOffsetX * cursorSpeed * 20);
+                int dy = (int) (mouseMoveOffsetY * cursorSpeed * 20);
+                if (xServer.isRelativeMouseMovement()) {
+                  xServer.updatePointerForDisplayDelta(dx, dy);
+                  winHandler.mouseMoveDelta(dx, dy);
+                } else {
+                  xServer.injectPointerMoveDelta(dx, dy);
+                }
+                if (xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
               }
             }
           },
@@ -563,6 +649,7 @@ private void processJoystickInput(ExternalController controller) {
     WinHandler winHandler = xServer != null ? xServer.getWinHandler() : null;
     if (winHandler != null) {
       winHandler.sendGamepadState(controller);
+      if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
     }
   }
 
@@ -639,8 +726,9 @@ public boolean onGenericMotionEvent(MotionEvent event) {
 
   @Override
   public boolean onTouchEvent(MotionEvent event) {
+    if (getContext() instanceof XServerDisplayActivity && ((XServerDisplayActivity)getContext()).isInputSuspended()) return true;
 
-    boolean hapticsEnabled = preferences.getBoolean("touchscreen_haptics_enabled", true);
+    boolean hapticsEnabled = preferences.getBoolean("touchscreen_haptics_enabled", false);
 
     if (editMode && readyToDraw) {
       switch (event.getAction()) {
@@ -657,14 +745,18 @@ public boolean onTouchEvent(MotionEvent event) {
               moveCursor = false;
             }
 
+            if (moveCursor) cursor.set(Math.round(x), Math.round(y));
             selectElement(element);
             break;
           }
         case MotionEvent.ACTION_MOVE:
           {
             if (selectedElement != null) {
-              selectedElement.setX((int) Mathf.roundTo(event.getX() - offsetX, snappingSize));
-              selectedElement.setY((int) Mathf.roundTo(event.getY() - offsetY, snappingSize));
+              selectedElement.setX(Math.round(event.getX() - offsetX));
+              selectedElement.setY(Math.round(event.getY() - offsetY));
+              invalidate();
+            } else if (moveCursor) {
+              cursor.set(Math.round(event.getX()), Math.round(event.getY()));
               invalidate();
             }
             break;
@@ -673,9 +765,7 @@ public boolean onTouchEvent(MotionEvent event) {
           {
             if (selectedElement != null && profile != null) profile.save();
             if (moveCursor)
-              cursor.set(
-                  (int) Mathf.roundTo(event.getX(), snappingSize),
-                  (int) Mathf.roundTo(event.getY(), snappingSize));
+              cursor.set(Math.round(event.getX()), Math.round(event.getY()));
             invalidate();
             break;
           }
@@ -691,7 +781,7 @@ public boolean onTouchEvent(MotionEvent event) {
       int actionIndex = event.getActionIndex();
       int pointerId = event.getPointerId(actionIndex);
       int actionMasked = event.getActionMasked();
-      boolean handled = false;
+      boolean eventHandled = false;
 
       switch (actionMasked) {
         case MotionEvent.ACTION_DOWN:
@@ -700,87 +790,177 @@ public boolean onTouchEvent(MotionEvent event) {
             float x = event.getX(actionIndex);
             float y = event.getY(actionIndex);
 
-            for (ControlElement element : profile.getElements()) {
-              if (element.handleTouchDown(pointerId, x, y)) {
-                handled = true;
-                activeTouchElements.put(pointerId, element);
-
-                // Trigger haptic feedback for input controls
-                if (hapticsEnabled) {
-                  Vibrator vibrator;
-                  if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                    VibratorManager vibratorManager =
-                        getContext().getSystemService(VibratorManager.class);
-                    vibrator =
-                        vibratorManager != null ? vibratorManager.getDefaultVibrator() : null;
-                  } else {
-                    vibrator = getContext().getSystemService(Vibrator.class);
-                  }
-                  if (vibrator != null && vibrator.hasVibrator()) {
-                    vibrator.vibrate(
-                        VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
-                  }
+            if (stickElement != null && stickElement.handleTouchDown(pointerId, x, y)) {
+              eventHandled = true;
+              activeTouchElements.put(pointerId, stickElement);
+            }
+
+            if (!eventHandled) {
+              for (ControlElement element : profile.getElements()) {
+                if (element.handleTouchDown(pointerId, x, y)) {
+                  eventHandled = true;
+                  activeTouchElements.put(pointerId, element);
+
+                  if (hapticsEnabled) triggerTouchHaptic();
+                  break;
                 }
-                break;
               }
             }
-            if (!handled) dispatchUnhandledTouch(event);
+            syncCapturedPointers();
+            if (!eventHandled) dispatchUnhandledTouch(event);
             break;
           }
         case MotionEvent.ACTION_MOVE:
           {
+            batchingUpdates = true;
+            boolean anyControlHandled = false;
+            boolean unhandledPointerExists = false;
+            boolean capturesChanged = false;
+
             for (byte i = 0, count = (byte) event.getPointerCount(); i < count; i++) {
               int movePointerId = event.getPointerId(i);
               float x = event.getX(i);
               float y = event.getY(i);
 
               ControlElement activeElement = activeTouchElements.get(movePointerId);
-              handled = activeElement != null && activeElement.handleTouchMove(movePointerId, x, y);
+              boolean swipeAllowed =
+                  touchpadView == null
+                      || touchpadView.getScreenTouchMode() != TouchpadView.MODE_MAP_TO_RIGHT_STICK;
+              boolean pointerHandled = false;
+
+              if (swipeAllowed
+                  && activeElement != null
+                  && activeElement.isCapturing(movePointerId)
+                  && (activeElement.getType() == ControlElement.Type.RADIAL_MENU
+                      || activeElement.getType() == ControlElement.Type.D_PAD)
+                  && !activeElement.containsPoint(x, y)) {
+                for (ControlElement element : profile.getElements()) {
+                  if (element.isSwipeTarget() && element.handleTouchDown(movePointerId, x, y)) {
+                    activeElement.handleTouchUp(movePointerId, x, y);
+                    activeTouchElements.put(movePointerId, element);
+                    activeElement = element;
+                    pointerHandled = true;
+                    capturesChanged = true;
+                    if (hapticsEnabled) triggerTouchHaptic();
+                    break;
+                  }
+                }
+              }
 
-              if (!handled && activeElement == null) {
+              if (!pointerHandled) {
+                pointerHandled =
+                    activeElement != null && activeElement.handleTouchMove(movePointerId, x, y);
+              }
+
+              if (swipeAllowed
+                  && activeElement != null
+                  && activeElement.getType() == ControlElement.Type.BUTTON
+                  && !activeElement.isCapturing(movePointerId)) {
                 for (ControlElement element : profile.getElements()) {
-                  if (element.handleTouchMove(movePointerId, x, y)) {
+                  if (element.isSwipeTarget() && element.handleTouchDown(movePointerId, x, y)) {
                     activeTouchElements.put(movePointerId, element);
-                    handled = true;
+                    pointerHandled = true;
+                    capturesChanged = true;
+                    if (hapticsEnabled) triggerTouchHaptic();
                     break;
                   }
                 }
               }
-              if (!handled) dispatchUnhandledTouch(event);
+
+              if (!pointerHandled && activeElement == null) {
+                if (stickElement != null && stickElement.handleTouchMove(movePointerId, x, y)) {
+                  activeTouchElements.put(movePointerId, stickElement);
+                  pointerHandled = true;
+                  capturesChanged = true;
+                }
+
+                if (!pointerHandled) {
+                  for (ControlElement element : profile.getElements()) {
+                    if (element.handleTouchMove(movePointerId, x, y)) {
+                      activeTouchElements.put(movePointerId, element);
+                      pointerHandled = true;
+                      capturesChanged = true;
+                      break;
+                    }
+                  }
+                }
+              }
+
+              if (pointerHandled) anyControlHandled = true;
+              else unhandledPointerExists = true;
+            }
+
+            batchingUpdates = false;
+            WinHandler winHandler = xServer != null ? xServer.getWinHandler() : null;
+            if (anyControlHandled && winHandler != null) {
+              winHandler.sendGamepadState();
             }
+
+            if (capturesChanged) syncCapturedPointers();
+            if (unhandledPointerExists) dispatchUnhandledTouch(event);
             break;
-          }
-        case MotionEvent.ACTION_UP:
+            }        case MotionEvent.ACTION_UP:
         case MotionEvent.ACTION_POINTER_UP:
           {
             ControlElement activeElement = activeTouchElements.get(pointerId);
             float x = event.getX(actionIndex);
             float y = event.getY(actionIndex);
             if (activeElement != null) {
-              handled = activeElement.handleTouchUp(pointerId, x, y);
+              eventHandled = activeElement.handleTouchUp(pointerId, x, y);
               activeTouchElements.remove(pointerId);
             } else {
-              for (ControlElement element : profile.getElements()) {
-                if (element.handleTouchUp(pointerId, x, y)) {
-                  handled = true;
-                  break;
+              if (stickElement != null && stickElement.handleTouchUp(pointerId, x, y)) {
+                eventHandled = true;
+              }
+
+              if (!eventHandled) {
+                for (ControlElement element : profile.getElements()) {
+                  if (element.handleTouchUp(pointerId, x, y)) {
+                    eventHandled = true;
+                    break;
+                  }
                 }
               }
             }
-            if (!handled) dispatchUnhandledTouch(event);
+            syncCapturedPointers();
+            if (!eventHandled) dispatchUnhandledTouch(event);
             break;
           }
         case MotionEvent.ACTION_CANCEL:
           {
             releaseActiveTouchElements();
             dispatchUnhandledTouch(event);
+            syncCapturedPointers();
             break;
           }
       }
+
+      releaseStaleCaptures(event);
     }
     return true;
   }
 
+  private void triggerTouchHaptic() {
+    Vibrator vibrator;
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+      VibratorManager vibratorManager = getContext().getSystemService(VibratorManager.class);
+      vibrator = vibratorManager != null ? vibratorManager.getDefaultVibrator() : null;
+    } else {
+      vibrator = getContext().getSystemService(Vibrator.class);
+    }
+    if (vibrator != null && vibrator.hasVibrator()) {
+      vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
+    }
+  }
+
+  private void syncCapturedPointers() {
+    if (touchpadView != null) {
+      Set<Integer> pointerIds = new HashSet<>();
+      for (int i = 0; i < activeTouchElements.size(); i++) pointerIds.add(activeTouchElements.keyAt(i));
+      touchpadView.setPointerIdsToIgnore(pointerIds);
+    }
+  }
+
   public void invalidateControlElement(ControlElement element) {
     if (element == null) return;
 
@@ -794,6 +974,7 @@ public void invalidateControlElement(ControlElement element) {
   }
 
   public boolean onKeyEvent(KeyEvent event) {
+    if (getContext() instanceof XServerDisplayActivity && ((XServerDisplayActivity)getContext()).isInputSuspended()) return false;
     if (profile != null && event.getRepeatCount() == 0) {
       ExternalController controller = profile.getController(event.getDeviceId());
       if (controller != null) {
@@ -823,11 +1004,12 @@ public void handleInputEvent(
     handleInputEvent(controller, binding, isActionDown, 0);
   }
 
-  /**
-   * Updates both stick axes together so analog motion is dispatched as one coherent state update
-   * instead of four competing per-direction writes.
-   */
   public void handleStickInput(Binding firstBinding, float deltaX, float deltaY) {
+    handleStickInput(firstBinding, deltaX, deltaY, !batchingUpdates);
+  }
+
+  public void handleStickInput(
+      Binding firstBinding, float deltaX, float deltaY, boolean sendUpdate) {
     if (profile == null || !firstBinding.isGamepad()) return;
 
     GamepadState state = profile.getGamepadState();
@@ -847,8 +1029,9 @@ public void handleStickInput(Binding firstBinding, float deltaX, float deltaY) {
       state.thumbRY = deltaY;
     }
 
-    if (winHandler != null) {
+    if (winHandler != null && sendUpdate) {
       winHandler.sendGamepadState();
+      if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
     }
   }
 
@@ -858,7 +1041,7 @@ public void handleInputEvent(Binding binding, boolean isActionDown, float offset
 
   public void handleInputEvent(
       ExternalController controller, Binding binding, boolean isActionDown, float offset) {
-    handleInputEvent(controller, binding, isActionDown, offset, true);
+    handleInputEvent(controller, binding, isActionDown, offset, !batchingUpdates);
   }
 
   public void handleInputEvent(
@@ -926,6 +1109,7 @@ public void handleInputEvent(
       if (winHandler != null && sendUpdate && stateChanged) {
         if (controller != null) winHandler.sendGamepadState(controller);
         else winHandler.sendGamepadState();
+        if (xServer != null && xServer.getRenderer() != null) xServer.getRenderer().requestRenderCoalesced();
       }
     } else {
       if (binding == Binding.MOUSE_MOVE_LEFT || binding == Binding.MOUSE_MOVE_RIGHT) {
@@ -942,26 +1126,11 @@ public void handleInputEvent(
         Pointer.Button pointerButton = binding.getPointerButton();
         if (isActionDown) {
           if (pointerButton != null) {
-            if (xServer.isRelativeMouseMovement()) {
-              int wheelDelta =
-                  pointerButton == Pointer.Button.BUTTON_SCROLL_UP
-                      ? MOUSE_WHEEL_DELTA
-                      : (pointerButton == Pointer.Button.BUTTON_SCROLL_DOWN
-                          ? -MOUSE_WHEEL_DELTA
-                          : 0);
-              winHandler.mouseEvent(
-                  MouseEventFlags.getFlagFor(pointerButton, true), 0, 0, wheelDelta);
-            } else {
-              xServer.injectPointerButtonPress(pointerButton);
-            }
+            xServer.injectPointerButtonPress(pointerButton);
           } else xServer.injectKeyPress(binding.keycode);
         } else {
           if (pointerButton != null) {
-            if (xServer.isRelativeMouseMovement()) {
-              winHandler.mouseEvent(MouseEventFlags.getFlagFor(pointerButton, false), 0, 0, 0);
-            } else {
-              xServer.injectPointerButtonRelease(pointerButton);
-            }
+            xServer.injectPointerButtonRelease(pointerButton);
           } else xServer.injectKeyRelease(binding.keycode);
         }
       }
diff --git a/app/src/main/runtime/input/ui/RTSGestureEngine.kt b/app/src/main/runtime/input/ui/RTSGestureEngine.kt
new file mode 100644
index 000000000..409c7ef65
--- /dev/null
+++ b/app/src/main/runtime/input/ui/RTSGestureEngine.kt
@@ -0,0 +1,427 @@
+package com.winlator.cmod.runtime.input.ui
+
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
+import android.view.MotionEvent
+import com.winlator.cmod.runtime.display.xserver.Pointer
+import com.winlator.cmod.runtime.display.xserver.XKeycode
+import com.winlator.cmod.runtime.display.xserver.XServer
+import com.winlator.cmod.runtime.input.controls.Binding
+import com.winlator.cmod.shared.math.XForm
+
+// Multi-finger gesture detector -> Bindings. Isolated, opt-in; never mutates the trackpad path.
+class RTSGestureEngine(
+    private val xServer: XServer,
+    private val xform: FloatArray,
+) {
+    private enum class PanMode { NONE, PAN }
+
+    private val handler = Handler(Looper.getMainLooper())
+
+    private var config = TouchGestureConfig()
+    private val owned = ArrayList<Int>()
+    private val positions = HashMap<Int, FloatArray>()
+    private var fingerCount = 0
+    private var maxFingerCount = 0
+    private var sessionStartMs = 0L
+    private var startCx = 0f
+    private var startCy = 0f
+
+    private val pressedKeys = HashSet<XKeycode>()
+    private val pressedButtons = HashSet<Pointer.Button>()
+    private val pressedGamepad = HashSet<Binding>()
+
+    private var holdFired = false
+    private var heldBinding = Binding.NONE
+    private var heldBehavior = HoldBehavior.HOLD
+    private var movedBeyondTap = false
+
+    private var dragActive = false
+    private var panMode = PanMode.NONE
+    private var accumPan = 0f
+    private var zoomActive = false
+    private var lastDistance = 0f
+    private var lastCx = 0f
+    private var lastCy = 0f
+    private var zoomAccum = 0f
+    private val panKeys = HashSet<XKeycode>()
+
+    private var lastTapMs = 0L
+    private var lastTapX = 0f
+    private var lastTapY = 0f
+
+    private val holdRunnable = Runnable { fireHold() }
+
+    fun setConfig(newConfig: TouchGestureConfig) {
+        config = newConfig
+    }
+
+    fun onTouch(event: MotionEvent): Boolean {
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
+                val index = event.actionIndex
+                val id = event.getPointerId(index)
+                if (fingerCount == 0) startSession()
+                if (!owned.contains(id)) {
+                    owned.add(id)
+                    positions[id] = floatArrayOf(event.getX(index), event.getY(index))
+                    fingerCount++
+                    if (fingerCount > maxFingerCount) maxFingerCount = fingerCount
+                }
+                val c = centroid()
+                startCx = c[0]; startCy = c[1]
+                onFingerCountChanged()
+            }
+            MotionEvent.ACTION_MOVE -> {
+                var changed = false
+                for (id in owned) {
+                    val idx = event.findPointerIndex(id)
+                    if (idx >= 0) {
+                        positions[id]?.let { it[0] = event.getX(idx); it[1] = event.getY(idx); changed = true }
+                    }
+                }
+                if (changed) onMove()
+            }
+            MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP -> {
+                val id = event.getPointerId(event.actionIndex)
+                if (owned.contains(id)) {
+                    owned.remove(id)
+                    positions.remove(id)
+                    fingerCount--
+                    if (fingerCount <= 0) finalizeSession() else onFingerCountChanged()
+                }
+            }
+            MotionEvent.ACTION_CANCEL -> releaseAll()
+        }
+        return true
+    }
+
+    private fun startSession() {
+        owned.clear(); positions.clear()
+        maxFingerCount = 0
+        sessionStartMs = SystemClock.uptimeMillis()
+        holdFired = false; movedBeyondTap = false; dragActive = false
+        panMode = PanMode.NONE; accumPan = 0f; zoomAccum = 0f; zoomActive = false
+    }
+
+    private fun onFingerCountChanged() {
+        handler.removeCallbacks(holdRunnable)
+        // Release prior continuous state so the new finger count re-classifies cleanly.
+        if (panMode != PanMode.NONE || dragActive) {
+            releaseContinuousInputs()
+            panMode = PanMode.NONE; dragActive = false
+            accumPan = 0f; zoomAccum = 0f; zoomActive = false
+        }
+        if (holdFired) {
+            if (heldBehavior == HoldBehavior.HOLD) releaseBinding(heldBinding)
+            holdFired = false; heldBinding = Binding.NONE
+        }
+        val centroid = centroid()
+        lastCx = centroid[0]; lastCy = centroid[1]
+        if (fingerCount == 2) lastDistance = distance()
+        val delay = holdDelayFor(fingerCount)
+        if (delay > 0 && holdBindingFor(fingerCount) != Binding.NONE) {
+            handler.postDelayed(holdRunnable, delay.toLong())
+        }
+    }
+
+    private fun releaseContinuousInputs() {
+        for (k in panKeys.toList()) xServer.injectKeyRelease(k)
+        panKeys.clear()
+        if (panMode == PanMode.PAN) releaseButton(Pointer.Button.BUTTON_MIDDLE)
+        if (dragActive) releaseButton(Pointer.Button.BUTTON_LEFT)
+    }
+
+    private fun onMove() {
+        val centroid = centroid()
+        val travel = Math.hypot((centroid[0] - startCx).toDouble(), (centroid[1] - startCy).toDouble()).toFloat()
+        if (travel > TAP_TRAVEL_MAX && !movedBeyondTap) {
+            movedBeyondTap = true
+            handler.removeCallbacks(holdRunnable)
+        }
+        when (fingerCount) {
+            1 -> handleOneFingerMove(centroid)
+            2 -> handleTwoFingerMove(centroid)
+        }
+        lastCx = centroid[0]; lastCy = centroid[1]
+    }
+
+    private fun handleOneFingerMove(centroid: FloatArray) {
+        if (holdFired) return
+        if (config.dragAction != DragAction.NONE) {
+            if (!dragActive) {
+                val travel = Math.hypot((centroid[0] - startCx).toDouble(), (centroid[1] - startCy).toDouble()).toFloat()
+                if (travel < config.dragThreshold) return
+                dragActive = true
+                if (config.dragAction == DragAction.LEFT_DRAG) {
+                    moveCursorTo(centroid[0], centroid[1])
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
+                    pressedButtons.add(Pointer.Button.BUTTON_LEFT)
+                }
+            }
+            moveCursorTo(centroid[0], centroid[1])
+            return
+        }
+        if (config.pan1Action != PanAction.NONE) {
+            if (panMode == PanMode.NONE) {
+                val travel = Math.hypot((centroid[0] - startCx).toDouble(), (centroid[1] - startCy).toDouble()).toFloat()
+                if (travel < config.gestureThreshold) return
+                handler.removeCallbacks(holdRunnable)
+                panMode = PanMode.PAN
+            }
+            if (panMode == PanMode.PAN) performPan(config.pan1Action, centroid[0] - lastCx, centroid[1] - lastCy)
+        }
+    }
+
+    private fun handleTwoFingerMove(centroid: FloatArray) {
+        val dist = distance()
+        // Pinch zoom is its own function: it runs alongside any 2-finger pan/drag, driven by finger-distance change.
+        if (config.zoomAction != ZoomAction.NONE) {
+            zoomAccum += dist - lastDistance
+            while (Math.abs(zoomAccum) >= ZOOM_STEP) {
+                val zoomIn = zoomAccum > 0
+                performZoom(zoomIn)
+                zoomAccum -= if (zoomIn) ZOOM_STEP else -ZOOM_STEP
+                zoomActive = true
+                handler.removeCallbacks(holdRunnable)
+            }
+        }
+        lastDistance = dist
+        // Translation gesture: 2-finger pan (priority) or 2-finger drag.
+        if (config.panAction != PanAction.NONE) {
+            if (panMode == PanMode.NONE) {
+                accumPan += Math.hypot((centroid[0] - lastCx).toDouble(), (centroid[1] - lastCy).toDouble()).toFloat()
+                if (accumPan > config.gestureThreshold) {
+                    handler.removeCallbacks(holdRunnable)
+                    panMode = PanMode.PAN
+                }
+            }
+            if (panMode == PanMode.PAN) performPan(config.panAction, centroid[0] - lastCx, centroid[1] - lastCy)
+        } else if (config.drag2Action != DragAction.NONE) {
+            handleTwoFingerDrag(centroid)
+        }
+    }
+
+    private fun handleTwoFingerDrag(centroid: FloatArray) {
+        if (holdFired) return
+        if (!dragActive) {
+            val travel = Math.hypot((centroid[0] - startCx).toDouble(), (centroid[1] - startCy).toDouble()).toFloat()
+            if (travel < config.dragThreshold) return
+            handler.removeCallbacks(holdRunnable)
+            dragActive = true
+            if (config.drag2Action == DragAction.LEFT_DRAG) {
+                moveCursorTo(centroid[0], centroid[1])
+                xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
+                pressedButtons.add(Pointer.Button.BUTTON_LEFT)
+            }
+        }
+        moveCursorTo(centroid[0], centroid[1])
+    }
+
+    private fun finalizeSession() {
+        handler.removeCallbacks(holdRunnable)
+        val continuous = holdFired || dragActive || panMode != PanMode.NONE || zoomActive
+        if (!continuous) {
+            val centroid = lastCentroidGuess()
+            val travel = Math.hypot((centroid[0] - startCx).toDouble(), (centroid[1] - startCy).toDouble()).toFloat()
+            val count = maxFingerCount
+            val swipeOk = (count == 3 && config.swipe3Enabled && travel >= config.swipe3Threshold) ||
+                (count == 4 && config.swipe4Enabled && travel >= config.swipe4Threshold)
+            if (swipeOk) {
+                fireSwipe(count, centroid[0] - startCx, centroid[1] - startCy)
+            } else if (!movedBeyondTap) {
+                fireTap(count, centroid[0], centroid[1])
+            }
+        }
+        releaseAll()
+    }
+
+    private fun fireHold() {
+        if (movedBeyondTap || holdFired) return
+        val binding = holdBindingFor(fingerCount)
+        if (binding == Binding.NONE) return
+        holdFired = true
+        heldBinding = binding
+        heldBehavior = holdBehaviorFor(fingerCount)
+        val centroid = centroid()
+        moveCursorTo(centroid[0], centroid[1])
+        if (heldBehavior == HoldBehavior.CLICK) clickBinding(binding) else pressBinding(binding)
+    }
+
+    private fun fireTap(count: Int, x: Float, y: Float) {
+        if (count == 1) {
+            val now = SystemClock.uptimeMillis()
+            val near = Math.hypot((x - lastTapX).toDouble(), (y - lastTapY).toDouble()) < DOUBLE_TAP_DIST
+            if (config.doubleTapEnabled && now - lastTapMs < config.doubleTapDelay && near) {
+                moveCursorTo(x, y)
+                clickButton(Pointer.Button.BUTTON_LEFT)
+                lastTapMs = 0L
+                return
+            }
+            lastTapMs = now; lastTapX = x; lastTapY = y
+            if (config.tap1Enabled) { moveCursorTo(x, y); clickBinding(config.tap1) }
+            return
+        }
+        val (enabled, binding) = when (count) {
+            2 -> config.tap2Enabled to config.tap2
+            3 -> config.tap3Enabled to config.tap3
+            else -> config.tap4Enabled to config.tap4
+        }
+        if (enabled) { moveCursorTo(x, y); clickBinding(binding) }
+    }
+
+    private fun fireSwipe(count: Int, dx: Float, dy: Float) {
+        val horizontal = Math.abs(dx) > Math.abs(dy)
+        val binding = if (count == 3) {
+            if (horizontal) (if (dx > 0) config.swipe3Right else config.swipe3Left)
+            else (if (dy > 0) config.swipe3Down else config.swipe3Up)
+        } else {
+            if (horizontal) (if (dx > 0) config.swipe4Right else config.swipe4Left)
+            else (if (dy > 0) config.swipe4Down else config.swipe4Up)
+        }
+        clickBinding(binding)
+    }
+
+    private fun performPan(action: PanAction, dx: Float, dy: Float) {
+        when (action) {
+            PanAction.MIDDLE_DRAG -> {
+                if (!pressedButtons.contains(Pointer.Button.BUTTON_MIDDLE)) {
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_MIDDLE)
+                    pressedButtons.add(Pointer.Button.BUTTON_MIDDLE)
+                }
+                xServer.injectPointerMoveDelta(dx.toInt(), dy.toInt())
+            }
+            PanAction.WASD -> updatePanKeys(dx, dy, XKeycode.KEY_A, XKeycode.KEY_D, XKeycode.KEY_W, XKeycode.KEY_S)
+            PanAction.ARROWS -> updatePanKeys(dx, dy, XKeycode.KEY_LEFT, XKeycode.KEY_RIGHT, XKeycode.KEY_UP, XKeycode.KEY_DOWN)
+            PanAction.NONE -> {}
+        }
+    }
+
+    private fun updatePanKeys(dx: Float, dy: Float, left: XKeycode, right: XKeycode, up: XKeycode, down: XKeycode) {
+        val want = HashSet<XKeycode>()
+        if (Math.abs(dx) > Math.abs(dy)) {
+            if (dx > PAN_DEADZONE) want.add(right) else if (dx < -PAN_DEADZONE) want.add(left)
+        } else {
+            if (dy > PAN_DEADZONE) want.add(down) else if (dy < -PAN_DEADZONE) want.add(up)
+        }
+        val iterator = panKeys.iterator()
+        while (iterator.hasNext()) {
+            val k = iterator.next()
+            if (!want.contains(k)) { xServer.injectKeyRelease(k); iterator.remove() }
+        }
+        for (k in want) if (panKeys.add(k)) xServer.injectKeyPress(k)
+    }
+
+    private fun performZoom(zoomIn: Boolean) {
+        when (config.zoomAction) {
+            ZoomAction.SCROLL -> clickButton(if (zoomIn) Pointer.Button.BUTTON_SCROLL_UP else Pointer.Button.BUTTON_SCROLL_DOWN)
+            ZoomAction.ZOOM_KEYS -> { val k = if (zoomIn) XKeycode.KEY_EQUAL else XKeycode.KEY_MINUS; xServer.injectKeyPress(k); xServer.injectKeyRelease(k) }
+            ZoomAction.NONE -> {}
+        }
+    }
+
+    fun releaseAll() {
+        handler.removeCallbacks(holdRunnable)
+        for (k in pressedKeys.toList()) xServer.injectKeyRelease(k)
+        for (b in pressedButtons.toList()) xServer.injectPointerButtonRelease(b)
+        for (k in panKeys.toList()) xServer.injectKeyRelease(k)
+        for (b in pressedGamepad.toList()) injectGamepad(b, false)
+        pressedKeys.clear(); pressedButtons.clear(); panKeys.clear(); pressedGamepad.clear()
+        resetSession()
+    }
+
+    private fun resetSession() {
+        owned.clear(); positions.clear()
+        fingerCount = 0; maxFingerCount = 0
+        holdFired = false; movedBeyondTap = false; dragActive = false
+        panMode = PanMode.NONE; accumPan = 0f; zoomAccum = 0f; zoomActive = false
+    }
+
+    private fun centroid(): FloatArray {
+        if (positions.isEmpty()) return floatArrayOf(lastCx, lastCy)
+        var sx = 0f; var sy = 0f
+        for (p in positions.values) { sx += p[0]; sy += p[1] }
+        return floatArrayOf(sx / positions.size, sy / positions.size)
+    }
+
+    private fun lastCentroidGuess(): FloatArray = floatArrayOf(lastCx, lastCy)
+
+    private fun distance(): Float {
+        if (positions.size < 2) return lastDistance
+        val it = positions.values.iterator()
+        val a = it.next(); val b = it.next()
+        return Math.hypot((a[0] - b[0]).toDouble(), (a[1] - b[1]).toDouble()).toFloat()
+    }
+
+    private fun moveCursorTo(x: Float, y: Float) {
+        val p = XForm.transformPoint(xform, x, y)
+        xServer.injectPointerMove(p[0].toInt(), p[1].toInt())
+    }
+
+    private fun pressBinding(b: Binding) {
+        if (b == Binding.NONE) return
+        if (b.isGamepad()) { injectGamepad(b, true); pressedGamepad.add(b); return }
+        val btn = b.getPointerButton()
+        if (btn != null) { xServer.injectPointerButtonPress(btn); pressedButtons.add(btn) }
+        else if (b.isKeyboard()) { xServer.injectKeyPress(b.keycode); pressedKeys.add(b.keycode) }
+    }
+
+    private fun releaseBinding(b: Binding) {
+        if (b == Binding.NONE) return
+        if (b.isGamepad()) { if (pressedGamepad.remove(b)) injectGamepad(b, false); return }
+        val btn = b.getPointerButton()
+        if (btn != null) releaseButton(btn)
+        else if (b.isKeyboard()) { if (pressedKeys.remove(b.keycode)) xServer.injectKeyRelease(b.keycode) }
+    }
+
+    private fun clickBinding(b: Binding) {
+        if (b == Binding.NONE) return
+        if (b.isGamepad()) { injectGamepad(b, true); injectGamepad(b, false); return }
+        val btn = b.getPointerButton()
+        if (btn != null) clickButton(btn)
+        else if (b.isKeyboard()) { xServer.injectKeyPress(b.keycode); xServer.injectKeyRelease(b.keycode) }
+    }
+
+    private fun injectGamepad(b: Binding, pressed: Boolean) {
+        xServer.winHandler?.injectGestureGamepad(b, pressed)
+    }
+
+    private fun clickButton(btn: Pointer.Button) {
+        xServer.injectPointerButtonPress(btn)
+        xServer.injectPointerButtonRelease(btn)
+    }
+
+    private fun releaseButton(btn: Pointer.Button) {
+        if (pressedButtons.remove(btn)) xServer.injectPointerButtonRelease(btn)
+    }
+
+    private fun holdBindingFor(count: Int): Binding = when (count) {
+        1 -> if (config.longPressEnabled) config.longPress else Binding.NONE
+        2 -> if (config.hold2Enabled) config.hold2 else Binding.NONE
+        3 -> if (config.hold3Enabled) config.hold3 else Binding.NONE
+        4 -> if (config.hold4Enabled) config.hold4 else Binding.NONE
+        else -> Binding.NONE
+    }
+
+    private fun holdBehaviorFor(count: Int): HoldBehavior = when (count) {
+        1 -> config.longPressBehavior
+        2 -> config.hold2Behavior
+        3 -> config.hold3Behavior
+        else -> config.hold4Behavior
+    }
+
+    private fun holdDelayFor(count: Int): Int = when (count) {
+        1 -> config.longPressDelay
+        2 -> config.hold2Delay
+        3 -> config.hold3Delay
+        else -> config.hold4Delay
+    }
+
+    companion object {
+        private const val TAP_TRAVEL_MAX = 30f
+        private const val DOUBLE_TAP_DIST = 100.0
+        private const val ZOOM_STEP = 40f
+        private const val PAN_DEADZONE = 3f
+    }
+}
diff --git a/app/src/main/runtime/input/ui/ScreenTouchStick.kt b/app/src/main/runtime/input/ui/ScreenTouchStick.kt
new file mode 100644
index 000000000..249d6830b
--- /dev/null
+++ b/app/src/main/runtime/input/ui/ScreenTouchStick.kt
@@ -0,0 +1,90 @@
+package com.winlator.cmod.runtime.input.ui
+
+import android.content.Context
+import android.view.MotionEvent
+import androidx.preference.PreferenceManager
+import com.winlator.cmod.runtime.display.xserver.XServer
+
+class ScreenTouchStick(context: Context, private val xServer: XServer) {
+    private val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+    private var activePointerId = -1
+    private var originX = 0f
+    private var originY = 0f
+    private var sensitivity = DEFAULT_SENSITIVITY
+    private var surfaceMin = DEFAULT_SURFACE_MIN
+
+    fun setSurfaceSize(w: Int, h: Int) {
+        if (w > 0 && h > 0) surfaceMin = Math.min(w, h).toFloat()
+    }
+
+    fun onTouch(event: MotionEvent): Boolean {
+        if (activePointerId != -1
+            && event.actionMasked != MotionEvent.ACTION_CANCEL
+            && event.findPointerIndex(activePointerId) < 0) {
+            releaseAll()
+        }
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
+                if (activePointerId == -1) {
+                    val index = event.actionIndex
+                    activePointerId = event.getPointerId(index)
+                    originX = event.getX(index)
+                    originY = event.getY(index)
+                    sensitivity = readSensitivity()
+                    push(0f, 0f)
+                }
+            }
+            MotionEvent.ACTION_MOVE -> {
+                if (activePointerId != -1) {
+                    val index = event.findPointerIndex(activePointerId)
+                    if (index >= 0) {
+                        val offsetX = event.getX(index) - originX
+                        val offsetY = event.getY(index) - originY
+                        val distance = Math.hypot(offsetX.toDouble(), offsetY.toDouble()).toFloat()
+                        var stickX = 0f
+                        var stickY = 0f
+                        if (distance > 0f) {
+                            val radius = surfaceMin * RADIUS_FRACTION / (sensitivity + STRENGTH_BIAS)
+                            val magnitude = Math.min(distance / radius, 1.0f)
+                            if (magnitude > DEAD_ZONE) {
+                                val scaled = (magnitude - DEAD_ZONE) / (1.0f - DEAD_ZONE)
+                                stickX = offsetX / distance * scaled
+                                stickY = offsetY / distance * scaled
+                            }
+                        }
+                        push(stickX, stickY)
+                    }
+                }
+            }
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP ->
+                if (event.getPointerId(event.actionIndex) == activePointerId) releaseAll()
+            MotionEvent.ACTION_CANCEL -> releaseAll()
+        }
+        return true
+    }
+
+    fun releaseAll() {
+        if (activePointerId != -1) {
+            activePointerId = -1
+            push(0f, 0f)
+        }
+    }
+
+    private fun push(x: Float, y: Float) {
+        xServer.winHandler?.setScreenTouchRightStick(x, y)
+    }
+
+    private fun readSensitivity(): Float =
+        preferences.getFloat("screen_touch_rs_sensitivity", DEFAULT_SENSITIVITY)
+            .coerceIn(MIN_SENSITIVITY, MAX_SENSITIVITY)
+
+    companion object {
+        private const val DEFAULT_SENSITIVITY = 1.25f
+        private const val MIN_SENSITIVITY = 0.25f
+        private const val MAX_SENSITIVITY = 2.0f
+        private const val STRENGTH_BIAS = 0.5f
+        private const val RADIUS_FRACTION = 0.20f
+        private const val DEAD_ZONE = 0.08f
+        private const val DEFAULT_SURFACE_MIN = 1080f
+    }
+}
diff --git a/app/src/main/runtime/input/ui/TouchGestureConfig.kt b/app/src/main/runtime/input/ui/TouchGestureConfig.kt
new file mode 100644
index 000000000..b96aaead6
--- /dev/null
+++ b/app/src/main/runtime/input/ui/TouchGestureConfig.kt
@@ -0,0 +1,193 @@
+package com.winlator.cmod.runtime.input.ui
+
+import com.winlator.cmod.runtime.input.controls.Binding
+import org.json.JSONObject
+
+enum class PanAction { NONE, MIDDLE_DRAG, WASD, ARROWS }
+
+enum class ZoomAction { NONE, SCROLL, ZOOM_KEYS }
+
+enum class HoldBehavior { HOLD, CLICK }
+
+enum class DragAction { NONE, MOVE, LEFT_DRAG }
+
+class TouchGestureConfig {
+    var tap1Enabled = true
+    var tap1 = Binding.MOUSE_LEFT_BUTTON
+    var tap2Enabled = true
+    var tap2 = Binding.MOUSE_RIGHT_BUTTON
+    var tap3Enabled = false
+    var tap3 = Binding.MOUSE_MIDDLE_BUTTON
+    var tap4Enabled = false
+    var tap4 = Binding.NONE
+
+    var doubleTapEnabled = false
+    var doubleTapDelay = 300
+
+    var longPressEnabled = false
+    var longPress = Binding.MOUSE_RIGHT_BUTTON
+    var longPressBehavior = HoldBehavior.CLICK
+    var longPressDelay = 500
+
+    var hold2Enabled = false
+    var hold2 = Binding.MOUSE_MIDDLE_BUTTON
+    var hold2Behavior = HoldBehavior.HOLD
+    var hold3Enabled = false
+    var hold3 = Binding.NONE
+    var hold3Behavior = HoldBehavior.HOLD
+    var hold4Enabled = false
+    var hold4 = Binding.NONE
+    var hold4Behavior = HoldBehavior.HOLD
+    var hold2Delay = 400
+    var hold3Delay = 400
+    var hold4Delay = 400
+
+    var swipe3Enabled = false
+    var swipe3Up = Binding.NONE
+    var swipe3Down = Binding.NONE
+    var swipe3Left = Binding.NONE
+    var swipe3Right = Binding.NONE
+    var swipe3Threshold = 60
+    var swipe4Enabled = false
+    var swipe4Up = Binding.NONE
+    var swipe4Down = Binding.NONE
+    var swipe4Left = Binding.NONE
+    var swipe4Right = Binding.NONE
+    var swipe4Threshold = 60
+
+    var panAction = PanAction.ARROWS
+    var zoomAction = ZoomAction.NONE
+    var dragAction = DragAction.MOVE
+    var pan1Action = PanAction.NONE
+    var drag2Action = DragAction.NONE
+
+    var dragThreshold = 40
+    var gestureThreshold = 40
+
+    fun clone(): TouchGestureConfig {
+        val c = TouchGestureConfig()
+        c.tap1Enabled = tap1Enabled; c.tap1 = tap1
+        c.tap2Enabled = tap2Enabled; c.tap2 = tap2
+        c.tap3Enabled = tap3Enabled; c.tap3 = tap3
+        c.tap4Enabled = tap4Enabled; c.tap4 = tap4
+        c.doubleTapEnabled = doubleTapEnabled; c.doubleTapDelay = doubleTapDelay
+        c.longPressEnabled = longPressEnabled; c.longPress = longPress
+        c.longPressBehavior = longPressBehavior; c.longPressDelay = longPressDelay
+        c.hold2Enabled = hold2Enabled; c.hold2 = hold2; c.hold2Behavior = hold2Behavior
+        c.hold3Enabled = hold3Enabled; c.hold3 = hold3; c.hold3Behavior = hold3Behavior
+        c.hold4Enabled = hold4Enabled; c.hold4 = hold4; c.hold4Behavior = hold4Behavior
+        c.hold2Delay = hold2Delay; c.hold3Delay = hold3Delay; c.hold4Delay = hold4Delay
+        c.swipe3Enabled = swipe3Enabled
+        c.swipe3Up = swipe3Up; c.swipe3Down = swipe3Down; c.swipe3Left = swipe3Left; c.swipe3Right = swipe3Right
+        c.swipe3Threshold = swipe3Threshold
+        c.swipe4Enabled = swipe4Enabled
+        c.swipe4Up = swipe4Up; c.swipe4Down = swipe4Down; c.swipe4Left = swipe4Left; c.swipe4Right = swipe4Right
+        c.swipe4Threshold = swipe4Threshold
+        c.panAction = panAction; c.zoomAction = zoomAction; c.dragAction = dragAction
+        c.pan1Action = pan1Action; c.drag2Action = drag2Action
+        c.dragThreshold = dragThreshold; c.gestureThreshold = gestureThreshold
+        return c
+    }
+
+    fun toJson(): String {
+        val o = JSONObject()
+        o.put("tap1Enabled", tap1Enabled); o.put("tap1", tap1.name)
+        o.put("tap2Enabled", tap2Enabled); o.put("tap2", tap2.name)
+        o.put("tap3Enabled", tap3Enabled); o.put("tap3", tap3.name)
+        o.put("tap4Enabled", tap4Enabled); o.put("tap4", tap4.name)
+        o.put("doubleTapEnabled", doubleTapEnabled); o.put("doubleTapDelay", doubleTapDelay)
+        o.put("longPressEnabled", longPressEnabled); o.put("longPress", longPress.name)
+        o.put("longPressBehavior", longPressBehavior.name); o.put("longPressDelay", longPressDelay)
+        o.put("hold2Enabled", hold2Enabled); o.put("hold2", hold2.name); o.put("hold2Behavior", hold2Behavior.name)
+        o.put("hold3Enabled", hold3Enabled); o.put("hold3", hold3.name); o.put("hold3Behavior", hold3Behavior.name)
+        o.put("hold4Enabled", hold4Enabled); o.put("hold4", hold4.name); o.put("hold4Behavior", hold4Behavior.name)
+        o.put("hold2Delay", hold2Delay); o.put("hold3Delay", hold3Delay); o.put("hold4Delay", hold4Delay)
+        o.put("swipe3Enabled", swipe3Enabled)
+        o.put("swipe3Up", swipe3Up.name); o.put("swipe3Down", swipe3Down.name)
+        o.put("swipe3Left", swipe3Left.name); o.put("swipe3Right", swipe3Right.name)
+        o.put("swipe3Threshold", swipe3Threshold)
+        o.put("swipe4Enabled", swipe4Enabled)
+        o.put("swipe4Up", swipe4Up.name); o.put("swipe4Down", swipe4Down.name)
+        o.put("swipe4Left", swipe4Left.name); o.put("swipe4Right", swipe4Right.name)
+        o.put("swipe4Threshold", swipe4Threshold)
+        o.put("panAction", panAction.name); o.put("zoomAction", zoomAction.name); o.put("dragAction", dragAction.name)
+        o.put("pan1Action", pan1Action.name); o.put("drag2Action", drag2Action.name)
+        o.put("dragThreshold", dragThreshold); o.put("gestureThreshold", gestureThreshold)
+        return o.toString()
+    }
+
+    companion object {
+        @JvmStatic
+        fun blankJson(): String {
+            val c = TouchGestureConfig()
+            c.tap1Enabled = false; c.tap1 = Binding.NONE
+            c.tap2Enabled = false; c.tap2 = Binding.NONE
+            c.tap3Enabled = false; c.tap3 = Binding.NONE
+            c.tap4Enabled = false; c.tap4 = Binding.NONE
+            c.doubleTapEnabled = false
+            c.longPressEnabled = false; c.longPress = Binding.NONE
+            c.hold2Enabled = false; c.hold2 = Binding.NONE
+            c.hold3Enabled = false; c.hold3 = Binding.NONE
+            c.hold4Enabled = false; c.hold4 = Binding.NONE
+            c.swipe3Enabled = false; c.swipe3Up = Binding.NONE; c.swipe3Down = Binding.NONE; c.swipe3Left = Binding.NONE; c.swipe3Right = Binding.NONE
+            c.swipe4Enabled = false; c.swipe4Up = Binding.NONE; c.swipe4Down = Binding.NONE; c.swipe4Left = Binding.NONE; c.swipe4Right = Binding.NONE
+            c.panAction = PanAction.NONE; c.zoomAction = ZoomAction.NONE; c.dragAction = DragAction.NONE
+            return c.toJson()
+        }
+
+        fun fromJson(json: String?): TouchGestureConfig {
+            val c = TouchGestureConfig()
+            if (json.isNullOrBlank()) return c
+            val o = try { JSONObject(json) } catch (e: Exception) { return c }
+            c.tap1Enabled = o.optBoolean("tap1Enabled", c.tap1Enabled); c.tap1 = binding(o, "tap1", c.tap1)
+            c.tap2Enabled = o.optBoolean("tap2Enabled", c.tap2Enabled); c.tap2 = binding(o, "tap2", c.tap2)
+            c.tap3Enabled = o.optBoolean("tap3Enabled", c.tap3Enabled); c.tap3 = binding(o, "tap3", c.tap3)
+            c.tap4Enabled = o.optBoolean("tap4Enabled", c.tap4Enabled); c.tap4 = binding(o, "tap4", c.tap4)
+            c.doubleTapEnabled = o.optBoolean("doubleTapEnabled", c.doubleTapEnabled)
+            c.doubleTapDelay = o.optInt("doubleTapDelay", c.doubleTapDelay)
+            c.longPressEnabled = o.optBoolean("longPressEnabled", c.longPressEnabled)
+            c.longPress = binding(o, "longPress", c.longPress)
+            c.longPressBehavior = holdBehavior(o, "longPressBehavior", c.longPressBehavior)
+            c.longPressDelay = o.optInt("longPressDelay", c.longPressDelay)
+            c.hold2Enabled = o.optBoolean("hold2Enabled", c.hold2Enabled); c.hold2 = binding(o, "hold2", c.hold2)
+            c.hold2Behavior = holdBehavior(o, "hold2Behavior", c.hold2Behavior)
+            c.hold3Enabled = o.optBoolean("hold3Enabled", c.hold3Enabled); c.hold3 = binding(o, "hold3", c.hold3)
+            c.hold3Behavior = holdBehavior(o, "hold3Behavior", c.hold3Behavior)
+            c.hold4Enabled = o.optBoolean("hold4Enabled", c.hold4Enabled); c.hold4 = binding(o, "hold4", c.hold4)
+            c.hold4Behavior = holdBehavior(o, "hold4Behavior", c.hold4Behavior)
+            val legacyHoldDelay = o.optInt("holdDelay", c.hold2Delay)
+            c.hold2Delay = o.optInt("hold2Delay", legacyHoldDelay)
+            c.hold3Delay = o.optInt("hold3Delay", legacyHoldDelay)
+            c.hold4Delay = o.optInt("hold4Delay", legacyHoldDelay)
+            c.swipe3Up = binding(o, "swipe3Up", c.swipe3Up); c.swipe3Down = binding(o, "swipe3Down", c.swipe3Down)
+            c.swipe3Left = binding(o, "swipe3Left", c.swipe3Left); c.swipe3Right = binding(o, "swipe3Right", c.swipe3Right)
+            c.swipe4Up = binding(o, "swipe4Up", c.swipe4Up); c.swipe4Down = binding(o, "swipe4Down", c.swipe4Down)
+            c.swipe4Left = binding(o, "swipe4Left", c.swipe4Left); c.swipe4Right = binding(o, "swipe4Right", c.swipe4Right)
+            c.swipe3Enabled = o.optBoolean("swipe3Enabled", c.swipe3Up != Binding.NONE || c.swipe3Down != Binding.NONE || c.swipe3Left != Binding.NONE || c.swipe3Right != Binding.NONE)
+            c.swipe4Enabled = o.optBoolean("swipe4Enabled", c.swipe4Up != Binding.NONE || c.swipe4Down != Binding.NONE || c.swipe4Left != Binding.NONE || c.swipe4Right != Binding.NONE)
+            val legacyGestureThreshold = o.optInt("gestureThreshold", c.gestureThreshold)
+            c.swipe3Threshold = o.optInt("swipe3Threshold", o.optInt("swipeThreshold", c.swipe3Threshold))
+            c.swipe4Threshold = o.optInt("swipe4Threshold", o.optInt("swipeThreshold", c.swipe4Threshold))
+            c.panAction = panAction(o, "panAction", c.panAction); c.zoomAction = zoomAction(o, c.zoomAction); c.dragAction = dragAction(o, "dragAction", c.dragAction)
+            c.pan1Action = panAction(o, "pan1Action", c.pan1Action); c.drag2Action = dragAction(o, "drag2Action", c.drag2Action)
+            c.dragThreshold = o.optInt("dragThreshold", legacyGestureThreshold)
+            c.gestureThreshold = legacyGestureThreshold
+            return c
+        }
+
+        private fun binding(o: JSONObject, key: String, def: Binding): Binding =
+            try { Binding.valueOf(o.optString(key, def.name)) } catch (e: Exception) { def }
+
+        private fun holdBehavior(o: JSONObject, key: String, def: HoldBehavior): HoldBehavior =
+            try { HoldBehavior.valueOf(o.optString(key, def.name)) } catch (e: Exception) { def }
+
+        private fun panAction(o: JSONObject, key: String, def: PanAction): PanAction =
+            try { PanAction.valueOf(o.optString(key, def.name)) } catch (e: Exception) { def }
+
+        private fun zoomAction(o: JSONObject, def: ZoomAction): ZoomAction =
+            try { ZoomAction.valueOf(o.optString("zoomAction", def.name)) } catch (e: Exception) { def }
+
+        private fun dragAction(o: JSONObject, key: String, def: DragAction): DragAction =
+            try { DragAction.valueOf(o.optString(key, def.name)) } catch (e: Exception) { def }
+    }
+}
diff --git a/app/src/main/runtime/input/ui/TouchpadView.kt b/app/src/main/runtime/input/ui/TouchpadView.kt
index ec1224cfd..64a2c48e2 100644
--- a/app/src/main/runtime/input/ui/TouchpadView.kt
+++ b/app/src/main/runtime/input/ui/TouchpadView.kt
@@ -1,24 +1,19 @@
 package com.winlator.cmod.runtime.input.ui
-import android.annotation.SuppressLint
+
 import android.content.Context
-import android.content.SharedPreferences
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.StateListDrawable
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
-import android.view.InputDevice
 import android.view.MotionEvent
 import android.view.PointerIcon
 import android.view.View
-import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
+import com.winlator.cmod.runtime.display.XServerDisplayActivity
 import com.winlator.cmod.runtime.display.renderer.ViewTransformation
 import com.winlator.cmod.runtime.display.winhandler.MouseEventFlags
-import com.winlator.cmod.runtime.display.winhandler.WinHandler
 import com.winlator.cmod.runtime.display.xserver.Pointer
 import com.winlator.cmod.runtime.display.xserver.XServer
 import com.winlator.cmod.shared.android.AppUtils
@@ -32,192 +27,188 @@ class TouchpadView(
     private val hideControlsRunnable: Runnable?,
 ) : View(context) {
     companion object {
-        private const val MAX_FINGERS: Byte = 4
-        private const val MAX_TWO_FINGERS_SCROLL_DISTANCE: Short = 350
-        const val MAX_TAP_TRAVEL_DISTANCE: Byte = 10
-        const val MAX_TAP_MILLISECONDS: Short = 200
         const val CURSOR_ACCELERATION = 1.25f
         const val CURSOR_ACCELERATION_THRESHOLD: Byte = 6
-        private const val MIN_SENSITIVITY = 0.1f
-        private const val CLICK_DELAYED_TIME: Byte = 50
-        private const val EFFECTIVE_TOUCH_DISTANCE: Byte = 20
+        private const val MAX_FINGERS: Byte = 4
+        const val MAX_TAP_MILLISECONDS: Short = 200
+        const val MAX_TAP_TRAVEL_DISTANCE: Byte = 10
+        private const val MAX_TWO_FINGERS_SCROLL_DISTANCE: Short = 350
+        private const val LONG_PRESS_RIGHT_CLICK_MS = 1000L
         private const val UPDATE_FORM_DELAYED_TIME = 50
-        private const val LONG_PRESS_RIGHT_CLICK_MS = 500L
+        private val CLICK_DELAYED_TIME = 50.toByte()
+        private val EFFECTIVE_TOUCH_DISTANCE = 20.toByte()
+        const val MODE_TRACKPAD = 0
+        const val MODE_TOUCHSCREEN = 1
+        const val MODE_MAP_TO_RIGHT_STICK = 2
+        private const val TOUCHSCREEN_DOUBLE_TAP_MS = 500L
+        private const val TOUCHSCREEN_DOUBLE_TAP_DISTANCE = 100f
     }
 
-    private val fingers = arrayOfNulls<Finger>(MAX_FINGERS.toInt())
+    private var continueClick = true
+    private var lastTapDownTime = 0L
+    private var lastTapRawX = 0f
+    private var lastTapRawY = 0f
+    private var lastTapTransX = 0
+    private var lastTapTransY = 0
+    private var fingerPointerButtonLeft: Finger? = null
+    private var fingerPointerButtonRight: Finger? = null
+    private val fingers = arrayOfNulls<Finger>(4)
+    private var fourFingersTapCallback: Runnable? = null
+    private var lastTouchedPosX = 0
+    private var lastTouchedPosY = 0
+    private var mouseEnabled = true
     private var numFingers: Byte = 0
-    private var sensitivity = 1.0f
     private var pointerButtonLeftEnabled = true
     private var pointerButtonRightEnabled = true
-    private var fingerPointerButtonLeft: Finger? = null
-    private var fingerPointerButtonRight: Finger? = null
+    private var resolutionScale = 0f
     private var scrollAccumY = 0f
     private var scrolling = false
-    private val xform = XForm.getInstance()
+    private var sensitivity = 1.0f
     private var simTouchScreen = false
-    private var continueClick = true
-    private var lastTouchedPosX = 0
-    private var lastTouchedPosY = 0
-    private var resolutionScale = 0f
-    private var mouseEnabled = true
-    var tapToClickEnabled = true
-    private var fourFingersTapCallback: Runnable? = null
-    private val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    private var screenTouchMode = MODE_TRACKPAD
+    private var rtsGesturesEnabled = false
+    private val xform = XForm.getInstance()
+    private val screenTouchStick = ScreenTouchStick(context, xServer)
+    private val rtsGestureEngine = RTSGestureEngine(xServer, xform)
+    private var activeTouchHandler: ((MotionEvent) -> Boolean)? = null
     private val longPressHandler = Handler(Looper.getMainLooper())
     private var longPressActive = false
-    private val longPressRunnable =
-        Runnable {
-            if (tapToClickEnabled && numFingers.toInt() == 1 && fingers[0] != null && fingers[0]!!.travelDistance() < MAX_TAP_TRAVEL_DISTANCE) {
-                longPressActive = true
-                if (xServer.isRelativeMouseMovement) {
-                    xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTDOWN, 0, 0, 0)
-                    xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTUP, 0, 0, 0)
-                } else {
-                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_RIGHT)
-                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
-                }
+    private val longPressRunnable = Runnable {
+        if (tapToClickEnabled && numFingers.toInt() == 1 && fingers[0] != null && fingers[0]!!.travelDistance() < MAX_TAP_TRAVEL_DISTANCE) {
+            longPressActive = true
+            if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT)) {
+                xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
             }
+            xServer.injectPointerButtonPress(Pointer.Button.BUTTON_RIGHT)
+            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
         }
+    }
 
     init {
-        layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        layoutParams = FrameLayout.LayoutParams(-1, -1)
         background = createTransparentBg()
         isClickable = true
         isFocusable = true
         isFocusableInTouchMode = true
         pointerIcon = PointerIcon.load(resources, R.drawable.hidden_pointer_arrow)
-        updateXform(
-            AppUtils.getScreenWidth(),
-            AppUtils.getScreenHeight(),
-            xServer.screenInfo.width.toInt(),
-            xServer.screenInfo.height.toInt(),
-        )
-
+        updateXform(AppUtils.getScreenWidth(), AppUtils.getScreenHeight(), xServer.screenInfo.width.toInt(), xServer.screenInfo.height.toInt())
         setOnGenericMotionListener { _, event ->
-            if (event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS) {
-                handleStylusHoverEvent(event)
-            } else {
-                false
-            }
+            if (event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS) handleStylusHoverEvent(event) else false
         }
     }
 
-    override fun onSizeChanged(
-        w: Int,
-        h: Int,
-        oldw: Int,
-        oldh: Int,
-    ) {
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
         super.onSizeChanged(w, h, oldw, oldh)
         updateXform(w, h, xServer.screenInfo.width.toInt(), xServer.screenInfo.height.toInt())
         resolutionScale = 1000.0f / Math.min(xServer.screenInfo.width.toInt(), xServer.screenInfo.height.toInt())
+        screenTouchStick.setSurfaceSize(w, h)
     }
 
-    private fun updateXform(
-        outerWidth: Int,
-        outerHeight: Int,
-        innerWidth: Int,
-        innerHeight: Int,
-    ) {
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        rtsGestureEngine.releaseAll()
+        screenTouchStick.releaseAll()
+    }
+
+    private fun updateXform(outerWidth: Int, outerHeight: Int, innerWidth: Int, innerHeight: Int) {
         val viewTransformation = ViewTransformation()
         viewTransformation.update(outerWidth, outerHeight, innerWidth, innerHeight)
         val invAspect = 1.0f / viewTransformation.aspect
-        if (!xServer.renderer.isFullscreen) {
+        if (!xServer.renderer!!.isFullscreen) {
             XForm.makeTranslation(xform, -viewTransformation.viewOffsetX.toFloat(), -viewTransformation.viewOffsetY.toFloat())
             XForm.scale(xform, invAspect, invAspect)
         } else {
-            XForm.makeScale(xform, innerWidth.toFloat() / outerWidth, innerHeight.toFloat() / outerHeight)
+            XForm.makeScale(xform, innerWidth.toFloat() / outerWidth.toFloat(), innerHeight.toFloat() / outerHeight.toFloat())
         }
     }
 
-    inner class Finger(
-        x: Float,
-        y: Float,
-    ) {
-        var x: Int
-        var y: Int
-        val startX: Int
-        val startY: Int
+    fun updateVisibleRelativeCursor(x: Int, y: Int) {
+        xServer.renderer?.updateVisualCursorPosition(x, y)
+    }
+
+    private inner class Finger(x: Float, y: Float) {
         var lastX: Int
         var lastY: Int
+        val startX: Int
+        val startY: Int
         val touchTime: Long = System.currentTimeMillis()
+        var x: Int
+        var y: Int
 
         init {
             val transformedPoint = XForm.transformPoint(xform, x, y)
-            this.x = transformedPoint[0].toInt().also { this.lastX = it }.also { this.startX = it }
-            this.y = transformedPoint[1].toInt().also { this.lastY = it }.also { this.startY = it }
-        }
-
-        fun update(
-            x: Float,
-            y: Float,
-        ) {
-            lastX = this.x
-            lastY = this.y
+            val ix = transformedPoint[0].toInt()
+            this.x = ix
+            this.lastX = ix
+            this.startX = ix
+            val iy = transformedPoint[1].toInt()
+            this.y = iy
+            this.lastY = iy
+            this.startY = iy
+        }
+
+        fun update(x: Float, y: Float) {
+            this.lastX = this.x
+            this.lastY = this.y
             val transformedPoint = XForm.transformPoint(xform, x, y)
             this.x = transformedPoint[0].toInt()
             this.y = transformedPoint[1].toInt()
         }
 
         fun deltaX(): Int {
-            var dx = (x - lastX) * sensitivity
-            if (Math.abs(dx) > CURSOR_ACCELERATION_THRESHOLD) dx *= CURSOR_ACCELERATION
+            var dx = (this.x - this.lastX) * sensitivity
+            if (Math.abs(dx) > 6.0f) dx *= 1.25f
             return Mathf.roundPoint(dx)
         }
 
         fun deltaY(): Int {
-            var dy = (y - lastY) * sensitivity
-            if (Math.abs(dy) > CURSOR_ACCELERATION_THRESHOLD) dy *= CURSOR_ACCELERATION
+            var dy = (this.y - this.lastY) * sensitivity
+            if (Math.abs(dy) > 6.0f) dy *= 1.25f
             return Mathf.roundPoint(dy)
         }
 
-        fun isTap(): Boolean = (System.currentTimeMillis() - touchTime) < MAX_TAP_MILLISECONDS && travelDistance() < MAX_TAP_TRAVEL_DISTANCE
+        fun isTap(): Boolean = System.currentTimeMillis() - touchTime < 200 && travelDistance() < 10.0f
 
         fun travelDistance(): Float = Math.hypot((x - startX).toDouble(), (y - startY).toDouble()).toFloat()
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
         if (!mouseEnabled) return true
-        val isTouchscreenMode = preferences.getBoolean("touchscreen_toggle", false)
-        resetMousePointerTimeout()
-
-        return when (event.getToolType(0)) {
-            MotionEvent.TOOL_TYPE_STYLUS -> handleStylusEvent(event)
-            else -> if (isTouchscreenMode) handleTouchscreenEvent(event) else handleTouchpadEvent(event)
+        resetTouchscreenTimeout()
+        if (event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS) return handleStylusEvent(event)
+        val action = event.actionMasked
+        if (action == MotionEvent.ACTION_DOWN || activeTouchHandler == null) {
+            activeTouchHandler = selectTouchHandler()
         }
+        val result = activeTouchHandler!!(event)
+        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            activeTouchHandler = null
+        }
+        return result
     }
 
-    private fun resetMousePointerTimeout() {
-        if (!mouseEnabled) return
-        xServer.renderer?.setCursorVisible(true)
-        if (timeoutHandler != null && hideControlsRunnable != null) {
-            timeoutHandler.removeCallbacks(hideControlsRunnable)
-            timeoutHandler.postDelayed(hideControlsRunnable, 5000)
-        }
+    private fun selectTouchHandler(): (MotionEvent) -> Boolean = when {
+        rtsGesturesEnabled -> rtsGestureEngine::onTouch
+        screenTouchMode == MODE_MAP_TO_RIGHT_STICK && xServer.winHandler.canUseScreenTouchStick() -> screenTouchStick::onTouch
+        screenTouchMode == MODE_TOUCHSCREEN -> ::handleTouchscreenEvent
+        else -> ::handleTouchpadEvent
     }
 
-    fun cancelMousePointerTimeout() {
+    private fun resetTouchscreenTimeout() {
+        xServer.renderer?.setCursorVisible(true)
         if (timeoutHandler != null && hideControlsRunnable != null) {
             timeoutHandler.removeCallbacks(hideControlsRunnable)
+            timeoutHandler.postDelayed(hideControlsRunnable, 5000L)
         }
     }
 
-    private fun isExternalPointerEvent(event: MotionEvent): Boolean {
-        val source = event.source
-        val isPointerClass =
-            (source and InputDevice.SOURCE_CLASS_POINTER) == InputDevice.SOURCE_CLASS_POINTER
-        return isPointerClass && !event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)
-    }
-
     private fun handleStylusHoverEvent(event: MotionEvent): Boolean {
-        when (event.actionMasked) {
-            MotionEvent.ACTION_HOVER_MOVE -> {
-                val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
-                xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
-            }
+        if (event.actionMasked == MotionEvent.ACTION_HOVER_MOVE) {
+            val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
+            xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
+            return true
         }
-        return true
+        return false
     }
 
     private fun handleStylusEvent(event: MotionEvent): Boolean {
@@ -225,20 +216,10 @@ class TouchpadView(
         val buttonState = event.buttonState
         when (action) {
             MotionEvent.ACTION_DOWN -> {
-                if ((buttonState and MotionEvent.BUTTON_SECONDARY) != 0) {
-                    handleStylusRightClick(event)
-                } else {
-                    handleStylusLeftClick(event)
-                }
-            }
-
-            MotionEvent.ACTION_MOVE -> {
-                handleStylusMove(event)
-            }
-
-            MotionEvent.ACTION_UP -> {
-                handleStylusUp()
+                if ((buttonState and MotionEvent.BUTTON_SECONDARY) != 0) handleStylusRightClick(event) else handleStylusLeftClick(event)
             }
+            MotionEvent.ACTION_MOVE -> handleStylusMove(event)
+            MotionEvent.ACTION_UP -> handleStylusUp()
         }
         return true
     }
@@ -268,97 +249,94 @@ class TouchpadView(
     private fun handleTouchpadEvent(event: MotionEvent): Boolean {
         val actionIndex = event.actionIndex
         val pointerId = event.getPointerId(actionIndex)
-        if (pointerId >= MAX_FINGERS) return true
-
-        when (event.actionMasked) {
+        val actionMasked = event.actionMasked
+        if (actionMasked != MotionEvent.ACTION_MOVE && (pointerId >= MAX_FINGERS || pointerIdsToIgnore.contains(pointerId))) return true
+        when (actionMasked) {
             MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
-                if (event.isFromSource(InputDevice.SOURCE_MOUSE)) return true
-                scrollAccumY = 0f
+                if (event.isFromSource(8194)) return true
+                scrollAccumY = 0.0f
                 scrolling = false
                 fingers[pointerId] = Finger(event.getX(actionIndex), event.getY(actionIndex))
-                numFingers++
-
+                numFingers = (numFingers + 1).toByte()
+                if (numFingers.toInt() > 1) {
+                    longPressHandler.removeCallbacks(longPressRunnable)
+                }
                 if (pointerId == 0 && numFingers.toInt() == 1 && !simTouchScreen) {
                     longPressActive = false
                     longPressHandler.postDelayed(longPressRunnable, LONG_PRESS_RIGHT_CLICK_MS)
                 } else {
                     longPressHandler.removeCallbacks(longPressRunnable)
                 }
-
-                if (simTouchScreen) {
-                    val clickDelay =
-                        Runnable {
-                            if (continueClick) {
-                                xServer.injectPointerMove(lastTouchedPosX, lastTouchedPosY)
-                                xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
-                            }
-                        }
+                if (simTouchScreen && tapToClickEnabled) {
+                    val clickDelay = Runnable { if (continueClick) {
+                        xServer.injectPointerMove(lastTouchedPosX, lastTouchedPosY)
+                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
+                    } }
                     if (pointerId == 0) {
                         continueClick = true
-                        val finger = fingers[0]!!
-                        if (Math.hypot((finger.x - lastTouchedPosX).toDouble(), (finger.y - lastTouchedPosY).toDouble()) * resolutionScale >
-                            EFFECTIVE_TOUCH_DISTANCE
-                        ) {
-                            lastTouchedPosX = finger.x
-                            lastTouchedPosY = finger.y
-                        }
-                        postDelayed(clickDelay, CLICK_DELAYED_TIME.toLong())
-                    } else if (pointerId == 1 && numFingers < 2) {
-                        continueClick = true
-                        val finger = fingers[1]!!
-                        if (Math.hypot((finger.x - lastTouchedPosX).toDouble(), (finger.y - lastTouchedPosY).toDouble()) * resolutionScale >
-                            EFFECTIVE_TOUCH_DISTANCE
-                        ) {
-                            lastTouchedPosX = finger.x
-                            lastTouchedPosY = finger.y
+                        if (Math.hypot((fingers[0]!!.x - lastTouchedPosX).toDouble(), (fingers[0]!!.y - lastTouchedPosY).toDouble()) * resolutionScale > EFFECTIVE_TOUCH_DISTANCE) {
+                            lastTouchedPosX = fingers[0]!!.x
+                            lastTouchedPosY = fingers[0]!!.y
                         }
                         postDelayed(clickDelay, CLICK_DELAYED_TIME.toLong())
                     } else if (pointerId == 1) {
-                        continueClick = (System.currentTimeMillis() - fingers[0]!!.touchTime) > CLICK_DELAYED_TIME
+                        if (numFingers < 2) {
+                            continueClick = true
+                            if (Math.hypot((fingers[1]!!.x - lastTouchedPosX).toDouble(), (fingers[1]!!.y - lastTouchedPosY).toDouble()) * resolutionScale > EFFECTIVE_TOUCH_DISTANCE) {
+                                lastTouchedPosX = fingers[1]!!.x
+                                lastTouchedPosY = fingers[1]!!.y
+                            }
+                            postDelayed(clickDelay, CLICK_DELAYED_TIME.toLong())
+                        } else {
+                            continueClick = System.currentTimeMillis() - fingers[0]!!.touchTime > CLICK_DELAYED_TIME.toLong()
+                        }
                     }
                 }
             }
-
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
+                longPressHandler.removeCallbacks(longPressRunnable)
+                if (fingers[pointerId] != null) {
+                    fingers[pointerId]!!.update(event.getX(actionIndex), event.getY(actionIndex))
+                    if (!longPressActive) handleFingerUp(fingers[pointerId]!!)
+                    longPressActive = false
+                    fingers[pointerId] = null
+                    numFingers = (numFingers - 1).toByte()
+                }
+            }
             MotionEvent.ACTION_MOVE -> {
-                if (event.isFromSource(InputDevice.SOURCE_MOUSE)) {
+                if (event.isFromSource(8194)) {
+                    val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
                     if (xServer.isRelativeMouseMovement) {
-                        val delta = getExternalMouseDelta(event)
-                        xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, delta[0], delta[1], 0)
+                        xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, transformedPoint[0].toInt(), transformedPoint[1].toInt(), 0)
+                        updateVisibleRelativeCursor(transformedPoint[0].toInt(), transformedPoint[1].toInt())
                     } else {
-                        val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
                         xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
                     }
                 } else {
-                    for (i in 0 until MAX_FINGERS.toInt()) {
-                        val finger = fingers[i] ?: continue
-                        val pointerIndex = event.findPointerIndex(i)
-                        if (pointerIndex >= 0) {
-                            finger.update(event.getX(pointerIndex), event.getY(pointerIndex))
-                            handleFingerMove(finger)
-                        } else {
-                            handleFingerUp(finger)
-                            fingers[i] = null
-                            numFingers--
+                    for (i in 0 until 4) {
+                        if (fingers[i] != null) {
+                            if (pointerIdsToIgnore.contains(i)) {
+                                fingers[i] = null
+                                numFingers = (numFingers - 1).toByte()
+                                continue
+                            }
+                            val pointerIndex = event.findPointerIndex(i)
+                            if (pointerIndex >= 0) {
+                                fingers[i]!!.update(event.getX(pointerIndex), event.getY(pointerIndex))
+                                handleFingerMove(fingers[i]!!)
+                            } else {
+                                handleFingerUp(fingers[i]!!)
+                                fingers[i] = null
+                                numFingers = (numFingers - 1).toByte()
+                            }
                         }
                     }
                 }
             }
-
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
-                longPressHandler.removeCallbacks(longPressRunnable)
-                fingers[pointerId]?.let {
-                    it.update(event.getX(actionIndex), event.getY(actionIndex))
-                    if (!longPressActive) handleFingerUp(it)
-                    longPressActive = false
-                    fingers[pointerId] = null
-                    numFingers--
-                }
-            }
-
             MotionEvent.ACTION_CANCEL -> {
                 longPressHandler.removeCallbacks(longPressRunnable)
                 longPressActive = false
-                for (i in 0 until MAX_FINGERS.toInt()) fingers[i] = null
+                for (i in 0 until 4) fingers[i] = null
                 numFingers = 0
             }
         }
@@ -366,45 +344,17 @@ class TouchpadView(
     }
 
     private fun handleTouchscreenEvent(event: MotionEvent): Boolean {
-        val actionIndex = event.actionIndex
-        val pointerId = event.getPointerId(actionIndex)
-        if (pointerId >= MAX_FINGERS) return true
-
-        when (event.actionMasked) {
-            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
-                fingers[pointerId] = Finger(event.getX(actionIndex), event.getY(actionIndex))
-                numFingers++
-                handleTouchDown(event)
-            }
-
-            MotionEvent.ACTION_MOVE -> {
-                for (i in 0 until MAX_FINGERS.toInt()) {
-                    val finger = fingers[i] ?: continue
-                    val pIdx = event.findPointerIndex(i)
-                    if (pIdx >= 0) finger.update(event.getX(pIdx), event.getY(pIdx))
-                }
-                if (numFingers.toInt() == 2) {
-                    handleTwoFingerScroll(event)
-                } else {
-                    handleTouchMove(event)
-                }
-            }
-
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
-                val finger = fingers[pointerId]
-                if (numFingers.toInt() == 2 && finger?.isTap() == true) {
-                    handleTwoFingerTap()
-                } else {
-                    handleTouchUp()
-                }
-                fingers[pointerId] = null
-                numFingers--
-            }
-
-            MotionEvent.ACTION_CANCEL -> {
-                for (i in 0 until MAX_FINGERS.toInt()) fingers[i] = null
-                numFingers = 0
-                handleAllUp()
+        val action = event.actionMasked
+        val ignorePointerId = event.getPointerId(event.actionIndex)
+        if (action != MotionEvent.ACTION_MOVE && (ignorePointerId >= MAX_FINGERS || pointerIdsToIgnore.contains(ignorePointerId))) return true
+        when (action) {
+            0, 5 -> { handleTouchDown(event); return true }
+            1, 6 -> { if (event.pointerCount == 2) handleTwoFingerTap(event) else handleTouchUp(event); return true }
+            2 -> { if (event.pointerCount == 2) handleTwoFingerScroll(event) else handleTouchMove(event); return true }
+            3 -> {
+                xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
+                xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
+                return true
             }
         }
         return true
@@ -412,38 +362,32 @@ class TouchpadView(
 
     private fun handleTouchDown(event: MotionEvent) {
         val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
-        if (xServer.isRelativeMouseMovement) {
-            xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, transformedPoint[0].toInt(), transformedPoint[1].toInt(), 0)
-        } else {
-            xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
-        }
-
-        if (tapToClickEnabled && numFingers.toInt() == 1) {
-            if (xServer.isRelativeMouseMovement) {
-                xServer.winHandler.mouseEvent(MouseEventFlags.LEFTDOWN, 0, 0, 0)
-            } else {
-                xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
+        var tx = transformedPoint[0].toInt()
+        var ty = transformedPoint[1].toInt()
+        if (event.pointerCount == 1) {
+            val now = System.currentTimeMillis()
+            val near = Math.hypot((event.x - lastTapRawX).toDouble(), (event.y - lastTapRawY).toDouble()) < TOUCHSCREEN_DOUBLE_TAP_DISTANCE
+            if (now - lastTapDownTime < TOUCHSCREEN_DOUBLE_TAP_MS && near) {
+                tx = lastTapTransX
+                ty = lastTapTransY
             }
+            lastTapDownTime = now
+            lastTapRawX = event.x
+            lastTapRawY = event.y
+            lastTapTransX = tx
+            lastTapTransY = ty
         }
+        xServer.injectPointerMove(tx, ty)
+        if (event.pointerCount == 1 && tapToClickEnabled) xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
     }
 
     private fun handleTouchMove(event: MotionEvent) {
         val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
-        if (xServer.isRelativeMouseMovement) {
-            xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, transformedPoint[0].toInt(), transformedPoint[1].toInt(), 0)
-        } else {
-            xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
-        }
+        xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
     }
 
-    private fun handleTouchUp() {
-        if (tapToClickEnabled) {
-            if (xServer.isRelativeMouseMovement) {
-                xServer.winHandler.mouseEvent(MouseEventFlags.LEFTUP, 0, 0, 0)
-            } else {
-                xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
-            }
-        }
+    private fun handleTouchUp(event: MotionEvent) {
+        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
     }
 
     private fun handleTwoFingerScroll(event: MotionEvent) {
@@ -459,58 +403,34 @@ class TouchpadView(
         }
     }
 
-    private fun handleTwoFingerTap() {
-        if (!tapToClickEnabled) return
-        // FIX: Ensure clean right-click by clearing left button first
-        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT)) {
-            if (xServer.isRelativeMouseMovement) {
-                xServer.winHandler.mouseEvent(MouseEventFlags.LEFTUP, 0, 0, 0)
-            } else {
+    private fun handleTwoFingerTap(event: MotionEvent) {
+        if (event.pointerCount == 2 && tapToClickEnabled) {
+            if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT)) {
                 xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
             }
-        }
-
-        if (xServer.isRelativeMouseMovement) {
-            xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTDOWN, 0, 0, 0)
-            xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTUP, 0, 0, 0)
-        } else {
             xServer.injectPointerButtonPress(Pointer.Button.BUTTON_RIGHT)
             xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
         }
     }
 
-    private fun handleAllUp() {
-        if (xServer.isRelativeMouseMovement) {
-            xServer.winHandler.mouseEvent(MouseEventFlags.LEFTUP, 0, 0, 0)
-            xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTUP, 0, 0, 0)
-        } else {
-            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
-            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
-        }
-    }
-
     private fun handleFingerUp(finger1: Finger) {
         if (tapToClickEnabled) {
             when (numFingers.toInt()) {
                 1 -> {
                     if (simTouchScreen) {
-                        postDelayed(
-                            { if (continueClick) xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT) },
-                            CLICK_DELAYED_TIME.toLong(),
-                        )
+                        postDelayed({ if (continueClick) xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT) }, CLICK_DELAYED_TIME.toLong())
                     } else if (finger1.isTap()) {
                         pressPointerButtonLeft(finger1)
                     }
                 }
-
                 2 -> {
                     val finger2 = findSecondFinger(finger1)
                     if (finger2 != null && finger1.isTap()) pressPointerButtonRight(finger1)
                 }
-
                 4 -> {
                     fourFingersTapCallback?.let {
-                        if (fingers.filterNotNull().all { it.isTap() }) it.run()
+                        for (i in 0 until 4) if (fingers[i] != null && !fingers[i]!!.isTap()) return
+                        it.run()
                     }
                 }
             }
@@ -525,41 +445,48 @@ class TouchpadView(
         }
         var skipPointerMove = false
         val finger2 = if (numFingers.toInt() == 2) findSecondFinger(finger1) else null
-
         if (finger2 != null) {
-            val currDistance =
-                Math.hypot((finger1.x - finger2.x).toDouble(), (finger1.y - finger2.y).toDouble()).toFloat() * resolutionScale
-            if (currDistance < MAX_TWO_FINGERS_SCROLL_DISTANCE) {
-                scrollAccumY += ((finger1.y + finger2.y) * 0.5f) - (finger1.lastY + finger2.lastY) * 0.5f
-                if (Math.abs(scrollAccumY) > 100) {
-                    val button = if (scrollAccumY < 0) Pointer.Button.BUTTON_SCROLL_DOWN else Pointer.Button.BUTTON_SCROLL_UP
-                    xServer.injectPointerButtonPress(button)
-                    xServer.injectPointerButtonRelease(button)
-                    scrollAccumY = 0f
+            val resScale = 1000.0f / Math.min(xServer.screenInfo.width.toInt(), xServer.screenInfo.height.toInt())
+            val currDistance = Math.hypot((finger1.x - finger2.x).toDouble(), (finger1.y - finger2.y).toDouble()).toFloat() * resScale
+            if (currDistance < 350.0f) {
+                scrollAccumY += (finger1.y + finger2.y) * 0.5f - (finger1.lastY + finger2.lastY) * 0.5f
+                if (scrollAccumY < -100.0f) {
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_DOWN)
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_DOWN)
+                    scrollAccumY = 0.0f
+                } else if (scrollAccumY > 100.0f) {
+                    xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_UP)
+                    xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_UP)
+                    scrollAccumY = 0.0f
                 }
                 scrolling = true
-            } else if (currDistance >= MAX_TWO_FINGERS_SCROLL_DISTANCE && !xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT) &&
-                finger2.travelDistance() < MAX_TAP_TRAVEL_DISTANCE
-            ) {
+            } else if (tapToClickEnabled && currDistance >= 350.0f && !xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT) && finger2.travelDistance() < 10.0f) {
                 pressPointerButtonLeft(finger1)
                 skipPointerMove = true
             }
         }
-
         if (!scrolling && numFingers <= 2 && !skipPointerMove) {
-            val dx = finger1.deltaX()
-            val dy = finger1.deltaY()
+            // finger2 drives movement when finger1 is held still (two-finger drag-to-move/resize)
+            val drivingFinger = if (finger2 != null && (finger2.deltaX() != 0 || finger2.deltaY() != 0) && finger1.deltaX() == 0 && finger1.deltaY() == 0) finger2 else finger1
+            val dx = drivingFinger.deltaX()
+            val dy = drivingFinger.deltaY()
             if (simTouchScreen) {
-                if (System.currentTimeMillis() - finger1.touchTime > CLICK_DELAYED_TIME) xServer.injectPointerMove(finger1.x, finger1.y)
-            } else if (xServer.isRelativeMouseMovement) {
-                xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, dx, dy, 0)
+                if (System.currentTimeMillis() - finger1.touchTime > CLICK_DELAYED_TIME.toLong()) xServer.injectPointerMove(finger1.x, finger1.y)
             } else {
+                if (xServer.isRelativeMouseMovement) {
+                    xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, dx, dy, 0)
+                    updateVisibleRelativeCursor(xServer.pointer.x + dx, xServer.pointer.y + dy)
+                    return
+                }
                 xServer.injectPointerMoveDelta(dx, dy)
             }
         }
     }
 
-    private fun findSecondFinger(finger: Finger): Finger? = fingers.firstOrNull { it != null && it != finger }
+    private fun findSecondFinger(finger: Finger): Finger? {
+        for (i in 0 until 4) if (fingers[i] != null && fingers[i] != finger) return fingers[i]
+        return null
+    }
 
     private fun pressPointerButtonLeft(finger: Finger) {
         if (pointerButtonLeftEnabled && !xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT)) {
@@ -580,23 +507,21 @@ class TouchpadView(
             postDelayed({
                 xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
                 fingerPointerButtonLeft = null
-            }, 30)
+            }, 30L)
         }
     }
 
     private fun releasePointerButtonRight(finger: Finger) {
-        if (pointerButtonRightEnabled && finger == fingerPointerButtonRight &&
-            xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_RIGHT)
-        ) {
+        if (pointerButtonRightEnabled && finger == fingerPointerButtonRight && xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_RIGHT)) {
             postDelayed({
                 xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
                 fingerPointerButtonRight = null
-            }, 30)
+            }, 30L)
         }
     }
 
     fun setSensitivity(sensitivity: Float) {
-        this.sensitivity = sensitivity.coerceAtLeast(MIN_SENSITIVITY)
+        this.sensitivity = sensitivity
     }
 
     fun setPointerButtonLeftEnabled(enabled: Boolean) {
@@ -607,129 +532,67 @@ class TouchpadView(
         this.pointerButtonRightEnabled = enabled
     }
 
-    fun resetInputState() {
-        longPressHandler.removeCallbacks(longPressRunnable)
-        longPressActive = false
-        continueClick = false
-        scrolling = false
-        scrollAccumY = 0f
-        for (i in 0 until MAX_FINGERS.toInt()) {
-            fingers[i] = null
-        }
-        numFingers = 0
-        fingerPointerButtonLeft = null
-        fingerPointerButtonRight = null
-
-        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT)) {
-            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
-        }
-        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_RIGHT)) {
-            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
-        }
-        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_MIDDLE)) {
-            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_MIDDLE)
-        }
-    }
-
     fun setFourFingersTapCallback(callback: Runnable?) {
         this.fourFingersTapCallback = callback
     }
 
     fun onExternalMouseEvent(event: MotionEvent): Boolean {
-        if (!isExternalPointerEvent(event)) return false
-        if (!mouseEnabled) return true
-        resetMousePointerTimeout()
+        if (!event.isFromSource(8194)) return false
+        resetTouchscreenTimeout()
         val actionButton = event.actionButton
-        return when (event.action) {
-            MotionEvent.ACTION_BUTTON_PRESS -> {
-                val button =
-                    when (actionButton) {
-                        MotionEvent.BUTTON_PRIMARY -> Pointer.Button.BUTTON_LEFT
-                        MotionEvent.BUTTON_SECONDARY -> Pointer.Button.BUTTON_RIGHT
-                        MotionEvent.BUTTON_TERTIARY -> Pointer.Button.BUTTON_MIDDLE
-                        else -> null
-                    }
-                button?.let {
-                    if (xServer.isRelativeMouseMovement) {
-                        xServer.winHandler.mouseEvent(MouseEventFlags.getFlagFor(it, true), 0, 0, 0)
-                    } else {
-                        xServer.injectPointerButtonPress(it)
-                    }
+        when (event.action) {
+            2, 7 -> {
+                val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
+                if (xServer.isRelativeMouseMovement) {
+                    xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, transformedPoint[0].toInt(), transformedPoint[1].toInt(), 0)
+                    updateVisibleRelativeCursor(transformedPoint[0].toInt(), transformedPoint[1].toInt())
+                } else {
+                    xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
                 }
-                true
+                return true
             }
-
-            MotionEvent.ACTION_BUTTON_RELEASE -> {
-                val button =
-                    when (actionButton) {
-                        MotionEvent.BUTTON_PRIMARY -> Pointer.Button.BUTTON_LEFT
-                        MotionEvent.BUTTON_SECONDARY -> Pointer.Button.BUTTON_RIGHT
-                        MotionEvent.BUTTON_TERTIARY -> Pointer.Button.BUTTON_MIDDLE
-                        else -> null
+            8 -> {
+                val scrollY = event.getAxisValue(9)
+                if (scrollY <= -1.0f) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.WHEEL, 0, 0, scrollY.toInt())
+                    else {
+                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_DOWN)
+                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_DOWN)
                     }
-                button?.let {
-                    if (xServer.isRelativeMouseMovement) {
-                        xServer.winHandler.mouseEvent(MouseEventFlags.getFlagFor(it, false), 0, 0, 0)
-                    } else {
-                        xServer.injectPointerButtonRelease(it)
+                } else if (scrollY >= 1.0f) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.WHEEL, 0, 0, scrollY.toInt())
+                    else {
+                        xServer.injectPointerButtonPress(Pointer.Button.BUTTON_SCROLL_UP)
+                        xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_SCROLL_UP)
                     }
                 }
-                true
+                return true
             }
-
-            MotionEvent.ACTION_MOVE, MotionEvent.ACTION_HOVER_MOVE -> {
-                if (xServer.isRelativeMouseMovement) {
-                    val delta = getExternalMouseDelta(event)
-                    xServer.winHandler.mouseEvent(MouseEventFlags.MOVE, delta[0], delta[1], 0)
-                } else {
-                    val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
-                    xServer.injectPointerMove(transformedPoint[0].toInt(), transformedPoint[1].toInt())
+            11 -> {
+                if (actionButton == 1) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.LEFTDOWN, 0, 0, 0) else xServer.injectPointerButtonPress(Pointer.Button.BUTTON_LEFT)
+                } else if (actionButton == 2) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTDOWN, 0, 0, 0) else xServer.injectPointerButtonPress(Pointer.Button.BUTTON_RIGHT)
+                } else if (actionButton == 4) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.MIDDLEDOWN, 0, 0, 0) else xServer.injectPointerButtonPress(Pointer.Button.BUTTON_MIDDLE)
                 }
-                true
+                return true
             }
-
-            MotionEvent.ACTION_SCROLL -> {
-                val scrollY = event.getAxisValue(MotionEvent.AXIS_VSCROLL)
-                if (Math.abs(scrollY) >= 1.0f) {
-                    val button = if (scrollY <= -1.0f) Pointer.Button.BUTTON_SCROLL_DOWN else Pointer.Button.BUTTON_SCROLL_UP
-                    if (xServer.isRelativeMouseMovement) {
-                        xServer.winHandler.mouseEvent(MouseEventFlags.WHEEL, 0, 0, scrollY.toInt())
-                    } else {
-                        xServer.injectPointerButtonPress(button)
-                        xServer.injectPointerButtonRelease(button)
-                    }
+            12 -> {
+                if (actionButton == 1) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.LEFTUP, 0, 0, 0) else xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
+                } else if (actionButton == 2) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.RIGHTUP, 0, 0, 0) else xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
+                } else if (actionButton == 4) {
+                    if (xServer.isRelativeMouseMovement) xServer.winHandler.mouseEvent(MouseEventFlags.MIDDLEUP, 0, 0, 0) else xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_MIDDLE)
                 }
-                true
-            }
-
-            else -> {
-                false
+                return true
             }
         }
+        return false
     }
 
-    private fun getExternalMouseDelta(event: MotionEvent): IntArray {
-        var dx = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X)
-        var dy = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y)
-        if (dx == 0f && dy == 0f) {
-            val transformedPoint = XForm.transformPoint(xform, event.x, event.y)
-            return intArrayOf(
-                (transformedPoint[0] - xServer.pointer.x).toInt(),
-                (transformedPoint[1] - xServer.pointer.y).toInt(),
-            )
-        }
-        return intArrayOf(
-            (xform[0] * dx + xform[2] * dy).toInt(),
-            (xform[1] * dx + xform[3] * dy).toInt(),
-        )
-    }
-
-    fun computeDeltaPoint(
-        lastX: Float,
-        lastY: Float,
-        x: Float,
-        y: Float,
-    ): FloatArray {
+    fun computeDeltaPoint(lastX: Float, lastY: Float, x: Float, y: Float): FloatArray {
         val result = floatArrayOf(0f, 0f)
         XForm.transformPoint(xform, lastX, lastY, result)
         val lX = result[0]
@@ -744,8 +607,8 @@ class TouchpadView(
 
     private fun createTransparentBg(): StateListDrawable =
         StateListDrawable().apply {
-            addState(intArrayOf(android.R.attr.state_focused), ColorDrawable(Color.TRANSPARENT))
-            addState(intArrayOf(), ColorDrawable(Color.TRANSPARENT))
+            addState(intArrayOf(android.R.attr.state_focused), ColorDrawable(0))
+            addState(intArrayOf(), ColorDrawable(0))
         }
 
     fun setSimTouchScreen(sim: Boolean) {
@@ -755,12 +618,46 @@ class TouchpadView(
 
     fun isSimTouchScreen(): Boolean = simTouchScreen
 
+    fun setScreenTouchMode(mode: Int) {
+        setSimTouchScreen(mode == MODE_TOUCHSCREEN)
+        if (screenTouchMode == mode) return
+        screenTouchMode = mode
+        screenTouchStick.releaseAll()
+        resetInputState()
+    }
+
+    fun getScreenTouchMode(): Int = screenTouchMode
+
+    fun setRtsGesturesEnabled(enabled: Boolean) {
+        if (rtsGesturesEnabled == enabled) return
+        rtsGesturesEnabled = enabled
+        rtsGestureEngine.releaseAll()
+        resetInputState()
+    }
+
+    fun setGestureConfig(json: String?) {
+        rtsGestureEngine.setConfig(TouchGestureConfig.fromJson(json))
+    }
+
     fun toggleFullscreen() {
         Handler(Looper.getMainLooper()).postDelayed({
             updateXform(width, height, xServer.screenInfo.width.toInt(), xServer.screenInfo.height.toInt())
-        }, UPDATE_FORM_DELAYED_TIME.toLong())
+        }, 50L)
     }
 
+    private val pointerIdsToIgnore = mutableSetOf<Int>()
+
+    fun setPointerIdsToIgnore(ids: Set<Int>) {
+        pointerIdsToIgnore.clear()
+        pointerIdsToIgnore.addAll(ids)
+    }
+
+    var tapToClickEnabled = true
+        set(value) {
+            field = value
+            if (!value) resetInputState()
+        }
+
     fun setMouseEnabled(enabled: Boolean) {
         this.mouseEnabled = enabled
         if (!enabled) {
@@ -768,7 +665,37 @@ class TouchpadView(
             cancelMousePointerTimeout()
             xServer.renderer?.setCursorVisible(false)
         } else {
-            resetMousePointerTimeout()
+            resetTouchscreenTimeout()
+        }
+    }
+
+    fun resetInputState() {
+        screenTouchStick.releaseAll()
+        rtsGestureEngine.releaseAll()
+        continueClick = false
+        scrolling = false
+        scrollAccumY = 0f
+        for (i in 0 until 4) {
+            fingers[i] = null
+        }
+        numFingers = 0
+        fingerPointerButtonLeft = null
+        fingerPointerButtonRight = null
+
+        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_LEFT)) {
+            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_LEFT)
+        }
+        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_RIGHT)) {
+            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_RIGHT)
+        }
+        if (xServer.pointer.isButtonPressed(Pointer.Button.BUTTON_MIDDLE)) {
+            xServer.injectPointerButtonRelease(Pointer.Button.BUTTON_MIDDLE)
+        }
+    }
+
+    fun cancelMousePointerTimeout() {
+        if (timeoutHandler != null && hideControlsRunnable != null) {
+            timeoutHandler.removeCallbacks(hideControlsRunnable)
         }
     }
 }
diff --git a/app/src/main/runtime/reshade/ReshadeCatalog.kt b/app/src/main/runtime/reshade/ReshadeCatalog.kt
new file mode 100644
index 000000000..a57fde053
--- /dev/null
+++ b/app/src/main/runtime/reshade/ReshadeCatalog.kt
@@ -0,0 +1,104 @@
+package com.winlator.cmod.runtime.reshade
+
+import android.content.Context
+import android.util.Log
+import com.winlator.cmod.BuildConfig
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
+import java.io.File
+import java.util.concurrent.TimeUnit
+
+/** One effect entry from reshade.json; [url] points at a .tzst that extracts to ReShade/<id>/. */
+data class ReshadeCatalogEntry(
+    val id: String,
+    val name: String,
+    val description: String,
+    val category: String,
+    val author: String,
+    val license: String,
+    val url: String,
+    val fileSize: Long,
+    val checksum: String,   // UPPERCASE MD5 of the .tzst (may be blank → no verification)
+    val version: Int,
+)
+
+object ReshadeCatalog {
+    private const val TAG = "ReshadeCatalog"
+    private const val CACHE_FILE = "reshade_catalog.json"
+
+    val url: String get() = BuildConfig.RESHADE_CATALOG_URL
+
+    enum class Source { NETWORK, CACHE, NONE }
+    data class Result(val entries: List<ReshadeCatalogEntry>, val source: Source)
+
+    private val httpClient: OkHttpClient by lazy {
+        OkHttpClient.Builder()
+            .connectTimeout(15, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .followRedirects(true)
+            .build()
+    }
+
+    private fun cacheFile(context: Context) = File(context.filesDir, CACHE_FILE)
+
+    /** Network-first, then the offline cache; NONE means neither was available. */
+    fun loadCached(context: Context): Result {
+        val json = downloadString(url)
+        if (json != null) {
+            val parsed = parse(json)
+            if (parsed.isNotEmpty()) {
+                runCatching { cacheFile(context).writeText(json) }
+                    .onFailure { Log.w(TAG, "failed to cache catalog", it) }
+                return Result(parsed, Source.NETWORK)
+            }
+        }
+        val cache = cacheFile(context)
+        if (cache.isFile) {
+            val cached = runCatching { parse(cache.readText()) }.getOrNull()
+            if (!cached.isNullOrEmpty()) return Result(cached, Source.CACHE)
+        }
+        return Result(emptyList(), Source.NONE)
+    }
+
+    private fun downloadString(target: String): String? = try {
+        val req = Request.Builder().url(target).build()
+        httpClient.newCall(req).execute().use { resp ->
+            if (resp.isSuccessful) resp.body?.string() else null
+        }
+    } catch (t: Throwable) {
+        Log.w(TAG, "catalog fetch failed: $target", t)
+        null
+    }
+
+    private fun parse(json: String): List<ReshadeCatalogEntry> {
+        val root = runCatching { JSONObject(json) }.getOrNull() ?: return emptyList()
+        val mirrorBase = root.optString("mirrorBase")
+        val arr = root.optJSONArray("effects") ?: return emptyList()
+        val out = ArrayList<ReshadeCatalogEntry>(arr.length())
+        for (i in 0 until arr.length()) {
+            val o = arr.optJSONObject(i) ?: continue
+            val id = o.optString("id").ifBlank { o.optString("name") }.trim()
+            if (id.isEmpty()) continue
+            val effectUrl = o.optString("url").ifBlank {
+                if (mirrorBase.isBlank()) "" else mirrorBase.trimEnd('/') + "/" + id + ".tzst"
+            }
+            if (effectUrl.isEmpty()) continue
+            out.add(
+                ReshadeCatalogEntry(
+                    id = id,
+                    name = o.optString("name").ifBlank { id },
+                    description = o.optString("description"),
+                    category = o.optString("category").ifBlank { "Other" },
+                    author = o.optString("author"),
+                    license = o.optString("license"),
+                    url = effectUrl,
+                    fileSize = o.optString("file_size").toLongOrNull() ?: o.optLong("file_size", 0L),
+                    checksum = o.optString("file_checksum").trim().uppercase(),
+                    version = o.optInt("version", 1),
+                )
+            )
+        }
+        return out
+    }
+}
diff --git a/app/src/main/runtime/reshade/ReshadeConfigWriter.java b/app/src/main/runtime/reshade/ReshadeConfigWriter.java
new file mode 100644
index 000000000..596eed563
--- /dev/null
+++ b/app/src/main/runtime/reshade/ReshadeConfigWriter.java
@@ -0,0 +1,344 @@
+package com.winlator.cmod.runtime.reshade;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.winlator.cmod.runtime.display.environment.ImageFs;
+import com.winlator.cmod.runtime.wine.EnvVars;
+import com.winlator.cmod.shared.io.FileUtils;
+
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+// Stages effect folders under ImageFs.home_path, writes vkBasalt.conf (host-absolute paths), sets ENABLE_VKBASALT/VKBASALT_CONFIG_FILE.
+public class ReshadeConfigWriter {
+    private static final String TAG = "ReshadeConfigWriter";
+
+    // Container/Shortcut string extras: loadout [{"name":..,"enabled":..}], params {"<effect>":{"<uniform>":v}} (flat when legacy), master "0"=off, effect = legacy single name.
+    public static final String EXTRA_EFFECT = "reshadeEffect";
+    public static final String EXTRA_PARAMS = "reshadeParams";
+    public static final String EXTRA_LOADOUT = "reshadeLoadout";
+    public static final String EXTRA_MODE = "reshadeMode";
+    public static final String EXTRA_MASTER = "reshadeMasterEnabled";
+
+    // vkBasalt applies to Vulkan-backed titles only. dxvk covers D3D9/10/11; vkd3d covers D3D12.
+    public static boolean supportedFor(String dxwrapper) {
+        if (dxwrapper == null) return false;
+        String w = dxwrapper.toLowerCase(Locale.US);
+        return w.contains("dxvk") || w.contains("vkd3d") || w.contains("d8vk");
+    }
+
+    // Legacy single-effect path, superseded by applyLoadout(); no in-tree callers. True = env mutated.
+    public static boolean apply(Context context, ImageFs imageFs, String effectName,
+                                String paramsJson, boolean vulkanWrapper, EnvVars envVars) {
+        if (!vulkanWrapper) return false;
+        if (effectName == null || effectName.trim().isEmpty()) return false;
+
+        // user env already sets ENABLE_VKBASALT -> they drive vkBasalt by hand, leave env untouched.
+        if (envVars.has("ENABLE_VKBASALT")) {
+            Log.i(TAG, "ENABLE_VKBASALT already set by user env; leaving ReShade selection untouched");
+            return false;
+        }
+
+        ReshadeManager.ReshadeEffect effect = ReshadeManager.findEffect(context, effectName);
+        if (effect == null) {
+            Log.w(TAG, "Selected ReShade effect not found in drop-in folder: " + effectName);
+            return false;
+        }
+
+        File vkBasaltDir = new File(imageFs.home_path, ".config/vkBasalt");
+        File effectsDir = new File(vkBasaltDir, "effects");
+        File destEffectDir = new File(effectsDir, effect.name);
+        FileUtils.clear(destEffectDir); // fresh copy each launch (drop-in folder is the source of truth)
+        if (!copyTree(effect.dir, destEffectDir)) {
+            Log.e(TAG, "Failed to stage ReShade effect files for: " + effect.name);
+            return false;
+        }
+
+        File destFx = new File(destEffectDir, effect.fxFile.getName());
+        String effectKey = sanitizeKey(effect.name);
+        JSONObject saved = parseJson(paramsJson);
+
+        File conf = new File(vkBasaltDir, "vkBasalt.conf");
+        if (!writeConf(conf, buildConfString(destFx, destEffectDir, effectKey, effect.params, saved))) {
+            Log.e(TAG, "Failed to write vkBasalt.conf");
+            return false;
+        }
+
+        envVars.put("ENABLE_VKBASALT", "1");
+        envVars.put("VKBASALT_CONFIG_FILE", conf.getAbsolutePath());
+        Log.i(TAG, "ReShade effect '" + effect.name + "' -> " + conf.getAbsolutePath()
+                + " (" + effect.params.size() + " params reflected)");
+        return true;
+    }
+
+    // Same conf the layer watches for mtime changes; the in-game live pane rewrites it.
+    public static File confFile(ImageFs imageFs) {
+        return new File(new File(imageFs.home_path, ".config/vkBasalt"), "vkBasalt.conf");
+    }
+
+    // Whole loadout is compiled into the chain up front: an effect can only be toggled live (`<key>_enabled`) if it was compiled at launch.
+    public static boolean applyLoadout(Context context, ImageFs imageFs, List<ReshadeLoadout.Entry> loadout,
+                                       String paramsJson, boolean nested, String legacyEffect,
+                                       boolean masterEnabled, boolean vulkanWrapper, EnvVars envVars) {
+        if (!vulkanWrapper) return false;
+        if (loadout == null || loadout.isEmpty()) return false;
+
+        // user env already sets ENABLE_VKBASALT -> they drive vkBasalt by hand, leave env untouched.
+        if (envVars.has("ENABLE_VKBASALT")) {
+            Log.i(TAG, "ENABLE_VKBASALT already set by user env; leaving ReShade loadout untouched");
+            return false;
+        }
+
+        if (!writeMergedConfig(context, imageFs, loadout, paramsJson, nested, legacyEffect, masterEnabled, true)) {
+            return false; // no effect could be staged (all missing) -> nothing to arm
+        }
+
+        File conf = confFile(imageFs);
+        envVars.put("ENABLE_VKBASALT", "1");
+        envVars.put("VKBASALT_CONFIG_FILE", conf.getAbsolutePath());
+        Log.i(TAG, "ReShade loadout (" + loadout.size() + " effect(s)) -> " + conf.getAbsolutePath());
+        return true;
+    }
+
+    // restage=true re-copies each effect folder (launch), false reuses staged copies (live). mtime is always bumped so an identical-bytes rewrite still trips the layer's watcher.
+    public static boolean writeMergedConfig(Context context, ImageFs imageFs, List<ReshadeLoadout.Entry> loadout,
+                                            String paramsJson, boolean nested, String legacyEffect,
+                                            boolean masterEnabled, boolean restage) {
+        try {
+            if (context == null || imageFs == null || loadout == null) return false;
+            File vkBasaltDir = new File(imageFs.home_path, ".config/vkBasalt");
+            if (!vkBasaltDir.isDirectory() && !vkBasaltDir.mkdirs()) return false;
+            File effectsRoot = new File(vkBasaltDir, "effects");
+
+            StringBuilder chain = new StringBuilder();       // e1:e2:...:en
+            StringBuilder effectLines = new StringBuilder();  // per-effect: <ei> = fx + uniforms + _enabled
+            List<String> stagedDirs = new ArrayList<>();
+            java.util.Set<String> usedKeys = new java.util.HashSet<>();
+            int idx = 0;
+
+            for (ReshadeLoadout.Entry entry : loadout) {
+                // Defensive hard cap: never compile more than MAX_EFFECTS even if a bad save carries more.
+                if (idx >= ReshadeLoadout.MAX_EFFECTS) {
+                    Log.w(TAG, "ReShade loadout exceeds " + ReshadeLoadout.MAX_EFFECTS
+                            + " effects; truncating the rest");
+                    break;
+                }
+                ReshadeManager.ReshadeEffect effect = ReshadeManager.findEffect(context, entry.name);
+                if (effect == null) {
+                    // Skip-and-continue: one missing effect must not kill the rest of the chain.
+                    Log.w(TAG, "ReShade loadout effect not found, skipping: " + entry.name);
+                    continue;
+                }
+
+                String effectKey = sanitizeKey(effect.name);
+                if (usedKeys.contains(effectKey)) effectKey = effectKey + "_" + idx;
+                usedKeys.add(effectKey);
+
+                File destDir = new File(effectsRoot, effect.name);
+                File destFx = new File(destDir, effect.fxFile.getName());
+                if (restage || !destFx.isFile()) {
+                    FileUtils.clear(destDir);
+                    if (!copyTree(effect.dir, destDir)) {
+                        Log.e(TAG, "Failed to stage ReShade effect folder: " + effect.dir);
+                        continue;
+                    }
+                }
+                stagedDirs.add(destDir.getAbsolutePath()); // host-absolute
+
+                if (chain.length() > 0) chain.append(":");
+                chain.append(effectKey);
+                effectLines.append(effectKey).append(" = ").append(destFx.getAbsolutePath()).append("\n");
+
+                // per-uniform overrides layered over the .fx defaults, keyed "<effectKey>_<uniform>".
+                JSONObject paramJson =
+                        ReshadeLoadout.paramsForEffect(paramsJson, effect.name, nested, legacyEffect);
+                Map<String, Float> values = new LinkedHashMap<>();
+                for (ReshadeManager.ReshadeParam p : effect.params) ReshadeManager.seedValues(p, paramJson, values);
+                for (ReshadeManager.ReshadeParam p : effect.params) appendUniformLines(effectLines, effectKey, p, values);
+
+                effectLines.append(effectKey).append("_enabled = ").append(entry.enabled ? "1" : "0").append("\n");
+                idx++;
+            }
+
+            if (chain.length() == 0) {
+                Log.w(TAG, "No ReShade loadout effects could be staged; skipping conf");
+                return false;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("# Generated by WinNative — ReShade loadout (do not edit; regenerated on each change)\n");
+            sb.append("effects = ").append(chain).append("\n");
+            sb.append(effectLines);
+
+            // vkBasalt splits these paths on ':' like the effects list, so each effect keeps its own staged dir.
+            String pathList = android.text.TextUtils.join(":", stagedDirs);
+            sb.append("reshadeTexturePath = ").append(pathList).append("\n");
+            sb.append("reshadeIncludePath = ").append(pathList).append("\n");
+            sb.append("depthCapture = off\n");
+            sb.append("toggleKey = Home\n");
+            sb.append("enableOnLaunch = ").append(masterEnabled ? "True" : "False").append("\n");
+
+            File conf = new File(vkBasaltDir, "vkBasalt.conf");
+            boolean ok = writeConf(conf, sb.toString());
+            if (ok) Log.d(TAG, "Wrote ReShade loadout conf (" + chain + ") -> " + conf.getAbsolutePath());
+            return ok;
+        } catch (Exception e) {
+            Log.e(TAG, "writeMergedConfig failed (ignored)", e);
+            return false;
+        }
+    }
+
+    // Live rewrite of the running prefix's conf; env is untouched (set at launch), failures swallowed. restage only when switching to an effect not staged at launch.
+    public static boolean writeLiveConfig(Context context, ImageFs imageFs, String effectName,
+                                          String paramsJson, boolean enabled, boolean restage) {
+        try {
+            if (context == null || imageFs == null) return false;
+            File vkBasaltDir = new File(imageFs.home_path, ".config/vkBasalt");
+            if (!vkBasaltDir.isDirectory() && !vkBasaltDir.mkdirs()) return false;
+            File conf = new File(vkBasaltDir, "vkBasalt.conf");
+
+            if (!enabled || effectName == null || effectName.trim().isEmpty()) {
+                // empty `effects =` drops all passes next frame; staged files stay for a quick re-enable.
+                String off = "# Generated by WinNative — ReShade live control (disabled)\n"
+                        + "effects = \n"
+                        + "enableOnLaunch = False\n"
+                        + "toggleKey = Home\n";
+                return writeConf(conf, off);
+            }
+
+            ReshadeManager.ReshadeEffect effect = ReshadeManager.findEffect(context, effectName);
+            if (effect == null) {
+                Log.w(TAG, "Live ReShade effect not found: " + effectName);
+                return false;
+            }
+
+            File destEffectDir = new File(new File(vkBasaltDir, "effects"), effect.name);
+            File destFx = new File(destEffectDir, effect.fxFile.getName());
+            if (restage || !destFx.isFile()) {
+                FileUtils.clear(destEffectDir);
+                if (!copyTree(effect.dir, destEffectDir)) {
+                    Log.e(TAG, "Failed to (re)stage ReShade effect files for: " + effect.name);
+                    return false;
+                }
+            }
+
+            String effectKey = sanitizeKey(effect.name);
+            JSONObject saved = parseJson(paramsJson);
+            return writeConf(conf, buildConfString(destFx, destEffectDir, effectKey, effect.params, saved));
+        } catch (Exception e) {
+            Log.e(TAG, "writeLiveConfig failed (ignored)", e);
+            return false;
+        }
+    }
+
+    // saved = param override JSON, null -> .fx defaults.
+    private static String buildConfString(File destFx, File destEffectDir, String effectKey,
+                                          java.util.List<ReshadeManager.ReshadeParam> params, JSONObject saved) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("# Generated by WinNative — ReShade drop-in (do not edit; regenerated on each change)\n");
+        sb.append("effects = ").append(effectKey).append("\n");
+        sb.append(effectKey).append(" = ").append(destFx.getAbsolutePath()).append("\n");
+        sb.append("reshadeTexturePath = ").append(destEffectDir.getAbsolutePath()).append("\n");
+        sb.append("reshadeIncludePath = ").append(destEffectDir.getAbsolutePath()).append("\n");
+        sb.append("depthCapture = off\n");
+        sb.append("toggleKey = Home\n");
+        sb.append("enableOnLaunch = True\n");
+
+        Map<String, Float> values = new LinkedHashMap<>();
+        for (ReshadeManager.ReshadeParam p : params) ReshadeManager.seedValues(p, saved, values);
+        for (ReshadeManager.ReshadeParam p : params) appendUniformLines(sb, effectKey, p, values);
+        return sb.toString();
+    }
+
+    private static boolean writeConf(File conf, String data) {
+        File tmp = new File(conf.getParentFile(), conf.getName() + ".tmp");
+        if (!FileUtils.writeString(tmp, data)) {
+            tmp.delete();
+            return false;
+        }
+        tmp.setLastModified(System.currentTimeMillis());
+        if (!tmp.renameTo(conf)) {
+            tmp.delete();
+            Log.e(TAG, "Failed to replace " + conf.getAbsolutePath());
+            return false;
+        }
+        return true;
+    }
+
+    private static final java.util.Set<String> BUILTIN_KEYS = new java.util.HashSet<>(
+            java.util.Arrays.asList("cas", "fxaa", "smaa", "deband", "dls", "lut"));
+
+    // must stay stable — the layer's config lookup keys off this.
+    private static String sanitizeKey(String name) {
+        String k = name.replaceAll("[^A-Za-z0-9_]", "_").toLowerCase(Locale.US);
+        if (k.isEmpty()) return "reshade";
+        return BUILTIN_KEYS.contains(k) ? k + "_fx" : k;
+    }
+
+    // "<effectKey>_<uniform>"; vectors get one line per component with a "_<c>" suffix.
+    private static void appendUniformLines(StringBuilder sb, String effectKey,
+                                           ReshadeManager.ReshadeParam p, Map<String, Float> values) {
+        switch (p.type) {
+            case COLOR:
+                for (int c = 0; c < p.components; c++) {
+                    Float v = values.get(p.name + "_" + c);
+                    if (v == null) continue;
+                    sb.append(effectKey).append('_').append(p.name).append('_').append(c)
+                      .append(" = ").append(fmt(v)).append('\n');
+                }
+                break;
+            case BOOL:
+            case COMBO:
+            case INT: {
+                Float v = values.get(p.name);
+                if (v != null) {
+                    sb.append(effectKey).append('_').append(p.name)
+                      .append(" = ").append(Math.round(v)).append('\n');
+                }
+                break;
+            }
+            case FLOAT:
+            default: {
+                Float v = values.get(p.name);
+                if (v != null) {
+                    sb.append(effectKey).append('_').append(p.name)
+                      .append(" = ").append(fmt(v)).append('\n');
+                }
+                break;
+            }
+        }
+    }
+
+    private static String fmt(float v) {
+        if (v == Math.rint(v) && !Float.isInfinite(v) && Math.abs(v) < 1e9f) return String.valueOf((int) v);
+        // Plain decimal (no scientific notation, e.g. "0.0001" not "1.0E-4"), locale-independent.
+        return new java.math.BigDecimal(Float.toString(v)).toPlainString();
+    }
+
+    private static JSONObject parseJson(String s) {
+        if (s == null || s.trim().isEmpty()) return null;
+        try { return new JSONObject(s); } catch (Exception e) { return null; }
+    }
+
+    // Recursive copy of the effect subfolder (small: a .fx plus a few .fxh/textures).
+    private static boolean copyTree(File src, File dst) {
+        if (src.isDirectory()) {
+            if (!dst.isDirectory() && !dst.mkdirs()) return false;
+            File[] kids = src.listFiles();
+            if (kids == null) return true;
+            boolean ok = true;
+            for (File k : kids) ok &= copyTree(k, new File(dst, k.getName()));
+            return ok;
+        }
+        File parent = dst.getParentFile();
+        if (parent != null && !parent.isDirectory() && !parent.mkdirs()) return false;
+        return FileUtils.copy(src, dst);
+    }
+}
diff --git a/app/src/main/runtime/reshade/ReshadeDownloader.kt b/app/src/main/runtime/reshade/ReshadeDownloader.kt
new file mode 100644
index 000000000..e608273e8
--- /dev/null
+++ b/app/src/main/runtime/reshade/ReshadeDownloader.kt
@@ -0,0 +1,107 @@
+package com.winlator.cmod.runtime.reshade
+
+import android.content.Context
+import android.util.Log
+import com.winlator.cmod.shared.io.TarCompressorUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.io.File
+import java.io.FileOutputStream
+import java.security.MessageDigest
+import java.util.concurrent.TimeUnit
+
+/** Downloads a catalog effect archive into the drop-in folder, where ReshadeManager's scanner picks it up. */
+object ReshadeDownloader {
+    private const val TAG = "ReshadeDownloader"
+
+    enum class Phase { DOWNLOAD, EXTRACT }
+
+    private val httpClient: OkHttpClient by lazy {
+        OkHttpClient.Builder()
+            .connectTimeout(15, TimeUnit.SECONDS)
+            .readTimeout(60, TimeUnit.SECONDS)
+            .followRedirects(true)
+            .build()
+    }
+
+    /** Download + verify + extract [entry] into the drop-in folder. progress(phase, 0..1). Runs on IO. */
+    suspend fun install(
+        context: Context,
+        entry: ReshadeCatalogEntry,
+        progress: (Phase, Float) -> Unit,
+    ): Boolean = withContext(Dispatchers.IO) {
+        val cacheDir = File(context.cacheDir, "reshade_dl").apply { mkdirs() }
+        val archive = File(cacheDir, "${safe(entry.id)}.tzst")
+        try {
+            if (!download(entry.url, archive) { f -> progress(Phase.DOWNLOAD, f.coerceIn(0f, 1f)) }) {
+                Log.w(TAG, "download failed: ${entry.url}")
+                return@withContext false
+            }
+            if (entry.checksum.isNotBlank()) {
+                val actual = md5Upper(archive)
+                if (!actual.equals(entry.checksum, ignoreCase = true)) {
+                    Log.w(TAG, "checksum mismatch for ${entry.id}: expected ${entry.checksum} got $actual")
+                    return@withContext false
+                }
+            }
+            progress(Phase.EXTRACT, 0f)
+            // The tar carries "<id>/...", so extract straight into the ReShade root → ReShade/<id>/.
+            val reshadeRoot = ReshadeManager.getReshadeDir(context)
+            File(reshadeRoot, entry.id).takeIf { it.isDirectory }?.deleteRecursively()
+            if (!TarCompressorUtils.extract(TarCompressorUtils.Type.ZSTD, archive, reshadeRoot)) {
+                Log.w(TAG, "extract failed: $archive")
+                return@withContext false
+            }
+            progress(Phase.EXTRACT, 1f)
+            val ok = ReshadeManager.findFxFile(File(reshadeRoot, entry.id)) != null
+            if (!ok) Log.w(TAG, "no .fx after install for ${entry.id}")
+            ok
+        } catch (t: Throwable) {
+            Log.w(TAG, "install failed for ${entry.id}", t)
+            false
+        } finally {
+            archive.delete()
+        }
+    }
+
+    private fun download(target: String, dest: File, onProgress: (Float) -> Unit): Boolean {
+        val req = Request.Builder().url(target).build()
+        httpClient.newCall(req).execute().use { resp ->
+            if (!resp.isSuccessful) return false
+            val body = resp.body ?: return false
+            val total = body.contentLength()
+            body.byteStream().use { input ->
+                FileOutputStream(dest).use { output ->
+                    val buf = ByteArray(64 * 1024)
+                    var read = 0L
+                    while (true) {
+                        val n = input.read(buf)
+                        if (n < 0) break
+                        output.write(buf, 0, n)
+                        read += n
+                        if (total > 0) onProgress(read.toFloat() / total)
+                    }
+                }
+            }
+        }
+        onProgress(1f)
+        return dest.isFile && dest.length() > 0
+    }
+
+    private fun md5Upper(file: File): String {
+        val md = MessageDigest.getInstance("MD5")
+        file.inputStream().use { input ->
+            val buf = ByteArray(64 * 1024)
+            while (true) {
+                val n = input.read(buf)
+                if (n <= 0) break
+                md.update(buf, 0, n)
+            }
+        }
+        return md.digest().joinToString("") { "%02X".format(it) }
+    }
+
+    private fun safe(s: String) = s.replace(Regex("[^A-Za-z0-9._-]"), "_")
+}
diff --git a/app/src/main/runtime/reshade/ReshadeLoadout.java b/app/src/main/runtime/reshade/ReshadeLoadout.java
new file mode 100644
index 000000000..b4f095a6f
--- /dev/null
+++ b/app/src/main/runtime/reshade/ReshadeLoadout.java
@@ -0,0 +1,97 @@
+package com.winlator.cmod.runtime.reshade;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// ordered effect chain; solo = one enabled at a time, stack = any subset. legacy saves (no reshadeLoadout array) migrate from reshadeEffect + flat reshadeParams.
+public class ReshadeLoadout {
+    public static final String MODE_SOLO = "solo";
+    public static final String MODE_STACK = "stack";
+
+    // every entry is shader-compiled on-device at launch, so the chain is capped
+    public static final int MAX_EFFECTS = 6;
+
+    public static class Entry {
+        public final String name;
+        public boolean enabled;
+
+        public Entry(String name, boolean enabled) {
+            this.name = name;
+            this.enabled = enabled;
+        }
+    }
+
+    private static boolean isRealEffect(String name) {
+        return name != null && !name.isEmpty() && !name.equalsIgnoreCase("None");
+    }
+
+    public static String normalizeMode(String mode) {
+        return MODE_STACK.equalsIgnoreCase(mode) ? MODE_STACK : MODE_SOLO;
+    }
+
+    // legacy reshadeEffect becomes a one-entry loadout when the array is absent/blank/unparseable
+    public static List<Entry> parse(String loadoutJson, String legacyEffect) {
+        ArrayList<Entry> out = new ArrayList<>();
+        if (loadoutJson != null && !loadoutJson.isEmpty()) {
+            try {
+                JSONArray arr = new JSONArray(loadoutJson);
+                for (int i = 0; i < arr.length() && out.size() < MAX_EFFECTS; i++) {
+                    JSONObject o = arr.optJSONObject(i);
+                    if (o == null) continue;
+                    String name = o.optString("name", "");
+                    if (!isRealEffect(name)) continue;
+                    out.add(new Entry(name, o.optBoolean("enabled", true)));
+                }
+                return out;
+            } catch (JSONException ignored) {
+                // fall through to legacy migration
+            }
+        }
+        if (isRealEffect(legacyEffect)) out.add(new Entry(legacyEffect, true));
+        return out;
+    }
+
+    public static String serialize(List<Entry> entries) {
+        JSONArray arr = new JSONArray();
+        for (Entry e : entries) {
+            if (!isRealEffect(e.name)) continue;
+            try {
+                JSONObject o = new JSONObject();
+                o.put("name", e.name);
+                o.put("enabled", e.enabled);
+                arr.put(o);
+            } catch (JSONException ignored) {}
+        }
+        return arr.toString();
+    }
+
+    // solo invariant: keeps the first enabled entry, bypasses the rest
+    public static void enforceSolo(List<Entry> entries, String mode) {
+        if (!MODE_SOLO.equals(normalizeMode(mode))) return;
+        boolean seen = false;
+        for (Entry e : entries) {
+            if (e.enabled) {
+                if (seen) e.enabled = false;
+                else seen = true;
+            }
+        }
+    }
+
+    // nested = params keyed by effect name; flat params belong solely to the legacy effect
+    public static JSONObject paramsForEffect(String paramsJson, String effectName,
+                                             boolean nested, String legacyEffect) {
+        if (paramsJson == null || paramsJson.isEmpty() || effectName == null) return null;
+        try {
+            JSONObject root = new JSONObject(paramsJson);
+            if (nested) return root.optJSONObject(effectName);
+            if (effectName.equalsIgnoreCase(legacyEffect)) return root;
+            return null;
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+}
diff --git a/app/src/main/runtime/reshade/ReshadeManager.java b/app/src/main/runtime/reshade/ReshadeManager.java
new file mode 100644
index 000000000..b94ed0732
--- /dev/null
+++ b/app/src/main/runtime/reshade/ReshadeManager.java
@@ -0,0 +1,309 @@
+package com.winlator.cmod.runtime.reshade;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.winlator.cmod.shared.io.FileUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+// ReShade effect discovery + .fx uniform reflection; conf generation lives in ReshadeConfigWriter.
+public class ReshadeManager {
+    private static final String TAG = "ReshadeManager";
+
+    // drop-in folder: /sdcard/Android/data/<pkg>/files/ReShade/, one subfolder per effect
+    public static final String FOLDER_NAME = "ReShade";
+
+    public enum ParamType { FLOAT, INT, BOOL, COMBO, COLOR }
+
+    // one tunable uniform reflected from a .fx; COMBO value is an index into options
+    public static class ReshadeParam {
+        public final String name;
+        public final ParamType type;
+        public final float min, max, step;
+        public final float defaultValue;   // bool default carried as 0.0/1.0; combo default = index; color = component 0
+        public final String label;         // ui_label, else the uniform name
+        public final String uiType;        // ui_type ("slider"/"drag"/"combo"/"color"/...), may be ""
+        public final List<String> options; // COMBO/RADIO/LIST item labels (else null)
+        public final int components;        // COLOR component count (3/4); 1 otherwise
+        public final float[] componentDefaults; // COLOR per-component defaults (else null)
+
+        public ReshadeParam(String name, ParamType type, float min, float max, float step,
+                            float defaultValue, String label, String uiType) {
+            this(name, type, min, max, step, defaultValue, label, uiType, null, 1, null);
+        }
+
+        public ReshadeParam(String name, ParamType type, float min, float max, float step,
+                            float defaultValue, String label, String uiType,
+                            List<String> options, int components, float[] componentDefaults) {
+            this.name = name;
+            this.type = type;
+            this.min = min;
+            this.max = max;
+            this.step = step;
+            this.defaultValue = defaultValue;
+            this.label = label;
+            this.uiType = uiType;
+            this.options = options;
+            this.components = components;
+            this.componentDefaults = componentDefaults;
+        }
+    }
+
+    public static class ReshadeEffect {
+        public final String name;
+        public final File dir;
+        public final File fxFile;
+        public final List<ReshadeParam> params;
+
+        public ReshadeEffect(String name, File dir, File fxFile, List<ReshadeParam> params) {
+            this.name = name;
+            this.dir = dir;
+            this.fxFile = fxFile;
+            this.params = params;
+        }
+    }
+
+    public static File getReshadeDir(Context context) {
+        File dir = new File(context.getExternalFilesDir(null), FOLDER_NAME);
+        if (!dir.isDirectory()) dir.mkdirs();
+        return dir;
+    }
+
+    // every subfolder holding at least one .fx becomes one selectable effect
+    public static List<ReshadeEffect> scanEffects(Context context) {
+        ArrayList<ReshadeEffect> out = new ArrayList<>();
+        File root = getReshadeDir(context);
+        File[] subdirs = root.listFiles(File::isDirectory);
+        if (subdirs == null) return out;
+        for (File dir : subdirs) {
+            File fx = findFxFile(dir);
+            if (fx == null) continue;
+            out.add(new ReshadeEffect(dir.getName(), dir, fx, reflectParams(fx)));
+        }
+        Collections.sort(out, (a, b) -> a.name.compareToIgnoreCase(b.name));
+        return out;
+    }
+
+    // Names only (for dropdowns) — "None" is prepended by callers, not here.
+    public static List<String> scanEffectNames(Context context) {
+        ArrayList<String> names = new ArrayList<>();
+        for (ReshadeEffect e : scanEffects(context)) names.add(e.name);
+        return names;
+    }
+
+    public static ReshadeEffect findEffect(Context context, String name) {
+        if (name == null || name.isEmpty()) return null;
+        for (ReshadeEffect e : scanEffects(context)) {
+            if (e.name.equalsIgnoreCase(name)) return e;
+        }
+        return null;
+    }
+
+    /** Recursive delete of one effect subfolder; refuses anything not directly inside getReshadeDir. */
+    public static boolean deleteEffect(Context context, String name) {
+        if (name == null || name.isEmpty()) return false;
+        File root = getReshadeDir(context);
+        ReshadeEffect e = findEffect(context, name);
+        File dir = (e != null) ? e.dir : new File(root, name);
+        File parent = dir.getParentFile();
+        if (parent == null || !parent.equals(root) || dir.equals(root)) return false;
+        boolean ok = FileUtils.delete(dir);           // recursive
+        if (!ok) Log.w(TAG, "Failed to delete effect folder: " + dir);
+        return ok;
+    }
+
+    public static File findFxFile(File dir) {
+        File[] files = dir.listFiles();
+        if (files == null) return null;
+        File first = null;
+        for (File f : files) {
+            if (f.isFile() && f.getName().toLowerCase(Locale.US).endsWith(".fx")) {
+                if (first == null) first = f;
+                String base = f.getName().substring(0, f.getName().length() - 3);
+                if (base.equalsIgnoreCase(dir.getName())) return f;
+            }
+        }
+        return first;
+    }
+
+    // uniform <type> <name> < annotations > = <default>; — annotations never nest <>, so [^>]* suffices
+    private static final Pattern UNIFORM = Pattern.compile(
+            "uniform\\s+(\\w+)\\s+(\\w+)\\s*<([^>]*)>\\s*(?:=\\s*([^;]+?))?\\s*;",
+            Pattern.DOTALL);
+
+    public static List<ReshadeParam> reflectParams(File fxFile) {
+        ArrayList<ReshadeParam> params = new ArrayList<>();
+        String src;
+        try {
+            src = FileUtils.readString(fxFile);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to read .fx for reflection: " + fxFile, e);
+            return params;
+        }
+        if (src == null) return params;
+        src = src.replaceAll("(?s)/\\*.*?\\*/", " ");
+
+        Matcher m = UNIFORM.matcher(src);
+        while (m.find()) {
+            String typeStr = m.group(1).toLowerCase(Locale.US);
+            String name = m.group(2);
+            String ann = m.group(3) != null ? m.group(3) : "";
+            String defExpr = m.group(4);
+
+            // a `source =` annotation marks an engine-filled semantic, not user-tunable
+            if (annValue(ann, "source") != null) continue;
+
+            // matrices (float3x3) keep an "x" in baseType and get dropped by the family check
+            String baseType = typeStr.replaceAll("[0-9]+$", "");
+            int components = parseComponents(typeStr);
+            if (!baseType.equals("float") && !baseType.equals("int")
+                    && !baseType.equals("uint") && !baseType.equals("bool")) continue;
+
+            String uiType = unquote(annValue(ann, "ui_type"));
+            if (uiType == null) uiType = "";
+            String uiTypeLc = uiType.toLowerCase(Locale.US);
+
+            String label = unquote(annValue(ann, "ui_label"));
+            if (label == null || label.isEmpty()) label = name;
+
+            if (baseType.equals("bool")) {
+                float def = (defExpr != null && defExpr.trim().equalsIgnoreCase("true")) ? 1f : 0f;
+                params.add(new ReshadeParam(name, ParamType.BOOL, 0f, 1f, 1f, def, label, uiType));
+                continue;
+            }
+
+            if (uiTypeLc.equals("combo") || uiTypeLc.equals("radio") || uiTypeLc.equals("list")) {
+                List<String> options = parseUiItems(unquote(annValue(ann, "ui_items")));
+                if (options.size() >= 2) {
+                    int def = Math.round(parseFloat(defExpr, 0f));
+                    if (def < 0) def = 0;
+                    if (def > options.size() - 1) def = options.size() - 1;
+                    params.add(new ReshadeParam(name, ParamType.COMBO, 0f, options.size() - 1f, 1f,
+                            def, label, uiType, options, 1, null));
+                    continue;
+                }
+                // no usable ui_items -> fall through to a numeric slider
+            }
+
+            if (uiTypeLc.equals("color") && baseType.equals("float") && components > 1) {
+                float[] defs = parseFloatList(defExpr, components, 0f);
+                params.add(new ReshadeParam(name, ParamType.COLOR, 0f, 1f, 0.01f,
+                        defs.length > 0 ? defs[0] : 0f, label, uiType, null, components, defs));
+                continue;
+            }
+
+            // non-color vectors have no single widget -> skip
+            if (components != 1) continue;
+            ParamType type = baseType.equals("float") ? ParamType.FLOAT : ParamType.INT;
+
+            boolean hasMin = annValue(ann, "ui_min") != null;
+            boolean hasMax = annValue(ann, "ui_max") != null;
+            float min = parseFloat(annValue(ann, "ui_min"), 0f);
+            float max = parseFloat(annValue(ann, "ui_max"), type == ParamType.INT ? 100f : 1f);
+            float def = parseFloat(defExpr, min);
+            if (!hasMin && def < min) min = def;
+            if (!hasMax && def > max) max = def;
+            if (max <= min) max = min + 1f;
+            float step = parseFloat(annValue(ann, "ui_step"),
+                    type == ParamType.INT ? 1f : (Math.max(0.0001f, (max - min) / 100f)));
+            if (def < min) def = min;
+            if (def > max) def = max;
+
+            params.add(new ReshadeParam(name, type, min, max, step, def, label, uiType));
+        }
+        return params;
+    }
+
+    // key scheme shared with the conf writer: COLOR seeds "<name>_<c>" per component, others "<name>"
+    public static void seedValues(ReshadeParam p, org.json.JSONObject saved, Map<String, Float> out) {
+        if (p.type == ParamType.COLOR) {
+            for (int c = 0; c < p.components; c++) {
+                String k = p.name + "_" + c;
+                float def = (p.componentDefaults != null && c < p.componentDefaults.length)
+                        ? p.componentDefaults[c] : 0f;
+                float v = def;
+                if (saved != null && saved.has(k)) v = (float) saved.optDouble(k, def);
+                out.put(k, v);
+            }
+        } else {
+            float v = p.defaultValue;
+            if (saved != null && saved.has(p.name)) v = (float) saved.optDouble(p.name, v);
+            out.put(p.name, v);
+        }
+    }
+
+    private static int parseComponents(String typeStr) {
+        Matcher m = Pattern.compile("([0-9]+)$").matcher(typeStr);
+        if (m.find()) {
+            try {
+                int n = Integer.parseInt(m.group(1));
+                if (n >= 1 && n <= 4) return n;
+            } catch (NumberFormatException ignored) {}
+        }
+        return 1;
+    }
+
+    // ui_items separators arrive as the literal two-char "\0" escape from .fx source, or a real NUL
+    private static List<String> parseUiItems(String raw) {
+        ArrayList<String> out = new ArrayList<>();
+        if (raw == null) return out;
+        String[] parts = raw.split("\\\\0|\\x00", -1);
+        Collections.addAll(out, parts);
+        while (!out.isEmpty() && out.get(out.size() - 1).trim().isEmpty()) out.remove(out.size() - 1);
+        return out;
+    }
+
+    // up to [count] floats from "float3(...)", "{...}" or a scalar (broadcast to all components)
+    private static float[] parseFloatList(String s, int count, float fallback) {
+        float[] out = new float[count];
+        Arrays.fill(out, fallback);
+        if (s == null) return out;
+        String body = s;
+        int paren = s.indexOf('(');
+        if (paren >= 0) body = s.substring(paren); // drop a "floatN(" / "intN(" constructor name
+        Matcher m = Pattern.compile("[-+]?[0-9]*\\.?[0-9]+").matcher(body);
+        ArrayList<Float> nums = new ArrayList<>();
+        while (m.find() && nums.size() < count) {
+            try { nums.add(Float.parseFloat(m.group())); } catch (NumberFormatException ignored) {}
+        }
+        if (nums.size() == 1) { Arrays.fill(out, nums.get(0)); return out; } // float3(0.5) broadcast
+        for (int i = 0; i < nums.size(); i++) out[i] = nums.get(i);
+        return out;
+    }
+
+    // raw (possibly quoted) `key = value` from an annotation block; value runs to the next `;` or end
+    private static String annValue(String ann, String key) {
+        Pattern p = Pattern.compile("\\b" + Pattern.quote(key) + "\\s*=\\s*([^;]+)",
+                Pattern.CASE_INSENSITIVE);
+        Matcher m = p.matcher(ann);
+        if (m.find()) return m.group(1).trim();
+        return null;
+    }
+
+    private static String unquote(String s) {
+        if (s == null) return null;
+        s = s.trim();
+        if (s.length() >= 2 && s.startsWith("\"") && s.endsWith("\"")) s = s.substring(1, s.length() - 1);
+        return s;
+    }
+
+    private static float parseFloat(String s, float fallback) {
+        if (s == null) return fallback;
+        Matcher m = Pattern.compile("[-+]?[0-9]*\\.?[0-9]+").matcher(s);
+        if (m.find()) {
+            try {
+                return Float.parseFloat(m.group());
+            } catch (NumberFormatException ignored) {}
+        }
+        return fallback;
+    }
+}
diff --git a/app/src/main/runtime/system/ApplicationLogGate.java b/app/src/main/runtime/system/ApplicationLogGate.java
new file mode 100644
index 000000000..8bf3fa494
--- /dev/null
+++ b/app/src/main/runtime/system/ApplicationLogGate.java
@@ -0,0 +1,25 @@
+package com.winlator.cmod.runtime.system;
+
+import android.content.Context;
+import androidx.preference.PreferenceManager;
+
+public final class ApplicationLogGate {
+  private static volatile boolean enabled;
+
+  private ApplicationLogGate() {}
+
+  public static void refresh(Context context) {
+    if (context == null) return;
+    enabled =
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .getBoolean("enable_app_debug", false);
+  }
+
+  public static void setEnabled(boolean value) {
+    enabled = value;
+  }
+
+  public static boolean isEnabled() {
+    return enabled;
+  }
+}
diff --git a/app/src/main/runtime/system/CPUStatus.java b/app/src/main/runtime/system/CPUStatus.java
index 4e10f7e4c..b6b585f6d 100644
--- a/app/src/main/runtime/system/CPUStatus.java
+++ b/app/src/main/runtime/system/CPUStatus.java
@@ -1,6 +1,18 @@
 package com.winlator.cmod.runtime.system;
 
+import android.os.Process;
+import android.os.SystemClock;
+import android.system.Os;
+import android.system.OsConstants;
 import com.winlator.cmod.shared.io.FileUtils;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 
 public abstract class CPUStatus {
   public static short[] getCurrentClockSpeeds() {
@@ -19,4 +31,170 @@ public static short getMaxClockSpeed(int cpuIndex) {
         FileUtils.readInt("/sys/devices/system/cpu/cpu" + cpuIndex + "/cpufreq/cpuinfo_max_freq");
     return (short) (maxFreq / 1000);
   }
+
+  private static volatile String[] cpuTempPaths;
+
+  /**
+   * CPU temperature in whole °C read from the best-matching sysfs thermal zone, or -1 if none is
+   * readable. Zone paths are discovered once (ranked by the zone `type` name) and cached; each call
+   * then just reads the chosen temp file, converting millidegrees to °C.
+   */
+  public static int getCpuTempC() {
+    String[] paths = cpuTempPaths;
+    if (paths == null) {
+      paths = discoverCpuTempPaths();
+      if (paths.length > 0) cpuTempPaths = paths;
+    }
+    for (String path : paths) {
+      int raw = FileUtils.readInt(path);
+      int celsius = raw > 1000 ? (raw + 500) / 1000 : raw;
+      if (celsius >= 1 && celsius <= 150) return celsius;
+    }
+    return -1;
+  }
+
+  private static String[] discoverCpuTempPaths() {
+    ArrayList<int[]> ranks = new ArrayList<>();
+    ArrayList<String> paths = new ArrayList<>();
+    File[] roots = {new File("/sys/class/thermal"), new File("/sys/devices/virtual/thermal")};
+    for (File root : roots) {
+      File[] zones =
+          root.listFiles((dir, name) -> name.startsWith("thermal_zone") && new File(dir, name).isDirectory());
+      if (zones == null) continue;
+      for (File zone : zones) {
+        String type = FileUtils.readString(new File(zone, "type"));
+        if (type == null) continue;
+        int rank = rankCpuZone(type.trim().toLowerCase(Locale.US));
+        if (rank < 0) continue;
+        String path = new File(zone, "temp").getAbsolutePath();
+        if (paths.contains(path)) continue;
+        ranks.add(new int[] {rank, paths.size()});
+        paths.add(path);
+      }
+    }
+    // Order by rank (best CPU match first), then path for a stable tie-break.
+    Collections.sort(
+        ranks,
+        (a, b) -> a[0] != b[0] ? a[0] - b[0] : paths.get(a[1]).compareTo(paths.get(b[1])));
+    String[] ordered = new String[ranks.size()];
+    for (int i = 0; i < ranks.size(); i++) ordered[i] = paths.get(ranks.get(i)[1]);
+    return ordered;
+  }
+
+  private static int rankCpuZone(String type) {
+    if (type.contains("cpu-silicon")) return 0;
+    if (type.contains("cpu-0")) return 1;
+    if (type.contains("cpu") && !type.contains("gpu")) return 2;
+    if (type.contains("soc")) return 3;
+    if (type.contains("s5p-tmu")) return 4;
+    if (type.contains("cputop")) return 5;
+    if (type.contains("tsens")) return 6;
+    if (type.contains("cluster")) return 7;
+    if (type.contains("big") || type.contains("little")) return 8;
+    return -1;
+  }
+
+  private static final long CLOCK_TICKS_PER_SEC = Os.sysconf(OsConstants._SC_CLK_TCK);
+  private static final int TOTAL_CORES = readTotalCores();
+
+  public static final class AppCpuSample {
+    private final HashMap<Integer, Long> perPid;
+    private final long nanos;
+
+    private AppCpuSample(HashMap<Integer, Long> perPid, long nanos) {
+      this.perPid = perPid;
+      this.nanos = nanos;
+    }
+
+    public int percentSince(AppCpuSample prev) {
+      if (prev == null) return -1;
+      long deltaTicks = 0;
+      for (Map.Entry<Integer, Long> e : perPid.entrySet()) {
+        Long old = prev.perPid.get(e.getKey());
+        if (old != null && e.getValue() >= old) deltaTicks += e.getValue() - old;
+      }
+      double deltaSec = (nanos - prev.nanos) / 1e9;
+      if (deltaSec <= 0) return -1;
+      double pct = 100.0 * deltaTicks / (deltaSec * CLOCK_TICKS_PER_SEC * TOTAL_CORES);
+      if (pct < 0) return 0;
+      if (pct > 100) return 100;
+      return (int) Math.round(pct);
+    }
+  }
+
+  public static AppCpuSample readAppCpuSample() {
+    String[] names = new File("/proc").list();
+    if (names == null) return null;
+    int myUid = Process.myUid();
+    HashMap<Integer, Long> cur = new HashMap<>();
+    for (String name : names) {
+      if (name.isEmpty() || !Character.isDigit(name.charAt(0))) continue;
+      int pid;
+      try {
+        pid = Integer.parseInt(name);
+      } catch (NumberFormatException e) {
+        continue;
+      }
+      String dir = "/proc/" + name;
+      try {
+        if (Os.stat(dir).st_uid != myUid) continue;
+      } catch (Exception e) {
+        continue;
+      }
+      try (BufferedReader reader = new BufferedReader(new FileReader(dir + "/stat"))) {
+        String line = reader.readLine();
+        if (line == null) continue;
+        int close = line.lastIndexOf(')');
+        if (close < 0) continue;
+        String[] f = line.substring(close + 2).trim().split("\\s+");
+        if (f.length < 13) continue;
+        cur.put(pid, Long.parseLong(f[11]) + Long.parseLong(f[12]));
+      } catch (Exception ignored) {
+      }
+    }
+    return new AppCpuSample(cur, SystemClock.elapsedRealtimeNanos());
+  }
+
+  private static int readTotalCores() {
+    try (BufferedReader reader =
+        new BufferedReader(new FileReader("/sys/devices/system/cpu/possible"))) {
+      String s = reader.readLine();
+      if (s != null) {
+        s = s.trim();
+        int dash = s.indexOf('-');
+        int n = dash >= 0 ? Integer.parseInt(s.substring(dash + 1)) + 1 : Integer.parseInt(s) + 1;
+        if (n > 0) return n;
+      }
+    } catch (Exception ignored) {
+    }
+    int n = Runtime.getRuntime().availableProcessors();
+    return n > 0 ? n : 1;
+  }
+
+  public static int getClockFreqLoadPercent() {
+    short[] clocks = getCurrentClockSpeeds();
+    if (clocks == null || clocks.length == 0) return -1;
+    long cur = 0;
+    long max = 0;
+    for (int i = 0; i < clocks.length; i++) {
+      cur += clocks[i];
+      max += getMaxClockSpeed(i);
+    }
+    if (max <= 0) return -1;
+    return clampPercent((int) ((cur * 100) / max));
+  }
+
+  public static int getClockFreqCorePercent(int core) {
+    short[] clocks = getCurrentClockSpeeds();
+    if (clocks == null || core < 0 || core >= clocks.length) return 0;
+    int max = getMaxClockSpeed(core);
+    if (max <= 0) return 0;
+    return clampPercent((int) (((float) clocks[core] / max) * 100.0f));
+  }
+
+  private static int clampPercent(int p) {
+    if (p < 0) return 0;
+    if (p > 100) return 100;
+    return p;
+  }
 }
diff --git a/app/src/main/runtime/system/LogManager.kt b/app/src/main/runtime/system/LogManager.kt
index f398029f0..4d65d8d7a 100644
--- a/app/src/main/runtime/system/LogManager.kt
+++ b/app/src/main/runtime/system/LogManager.kt
@@ -3,8 +3,6 @@ import android.content.Context
 import android.os.Environment
 import android.util.Log
 import androidx.preference.PreferenceManager
-import com.winlator.cmod.app.config.SettingsConfig
-import com.winlator.cmod.shared.io.FileUtils
 import java.io.Closeable
 import java.io.File
 
@@ -13,21 +11,9 @@ object LogManager {
     private var logcatProcess: Process? = null
     private var appLogProcess: Process? = null
 
-    /**
-     * Returns the external logs directory: /sdcard/WinNative/logs
-     * Falls back to cache dir if external storage is unavailable.
-     */
     @JvmStatic
     fun getLogsDir(context: Context): File {
-        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        val customUri = prefs.getString("winlator_path_uri", null)
-        val baseDir =
-            if (customUri != null) {
-                val customPath = FileUtils.getFilePathFromUri(context, android.net.Uri.parse(customUri))
-                if (customPath != null) File(customPath) else File(SettingsConfig.DEFAULT_WINLATOR_PATH)
-            } else {
-                File(SettingsConfig.DEFAULT_WINLATOR_PATH)
-            }
+        val baseDir = context.getExternalFilesDir(null) ?: context.filesDir
         val dir = File(baseDir, "logs")
         if (!dir.exists()) dir.mkdirs()
         return dir
@@ -36,8 +22,7 @@ object LogManager {
     fun isAnyLoggingEnabled(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         return prefs.getBoolean("enable_wine_debug", false) ||
-            prefs.getBoolean("enable_box64_logs", false) ||
-            prefs.getBoolean("enable_fexcore_logs", false) ||
+            prefs.getBoolean("enable_emulator_logs", false) ||
             prefs.getBoolean("enable_steam_logs", false) ||
             prefs.getBoolean("enable_input_logs", false) ||
             prefs.getBoolean("enable_download_logs", false) ||
@@ -50,38 +35,12 @@ object LogManager {
         }
     }
 
-    // ── Log Rotation ──────────────────────────────────────────────────
-
-    /**
-     * Call when the app starts fresh (not just returning from a game).
-     * Renames all `.log` files to `.old.log` so the previous session's
-     * logs are preserved until the next full launch.
-     */
-    @JvmStatic
-    fun rotateLogsOnAppStart(context: Context) {
-        if (!isAnyLoggingEnabled(context)) return
-        val logsDir = getLogsDir(context)
-        // Delete any existing .old.log files first
-        logsDir.listFiles()?.filter { it.name.endsWith(".old.log") }?.forEach { it.delete() }
-        // Rename current .log → .old.log
-        logsDir.listFiles()?.filter { it.name.endsWith(".log") && !it.name.endsWith(".old.log") }?.forEach { file ->
-            val oldName = file.name.replace(".log", ".old.log")
-            file.renameTo(File(logsDir, oldName))
-        }
-    }
-
-    /**
-     * Call when starting a new game/container session.
-     * Deletes ALL old logs (.old.log) and clears current .log files
-     * so fresh logs are captured for this run.
-     */
     @JvmStatic
     fun prepareForNewSession(context: Context) {
+        stopAppLogging()
         val logsDir = getLogsDir(context)
-        // Remove .old.log files
-        logsDir.listFiles()?.filter { it.name.endsWith(".old.log") }?.forEach { it.delete() }
-        // Remove current .log files (new session will create fresh ones)
         logsDir.listFiles()?.filter { it.name.endsWith(".log") }?.forEach { it.delete() }
+        startAppLogging(context, reset = true)
     }
 
     // ── Wine/Box64 Logcat Capture ────────────────────────────────────
@@ -127,15 +86,9 @@ object LogManager {
         logsDir.listFiles()?.forEach { it.delete() }
     }
 
-    // ── Application Debug (PID logcat) ───────────────────────────────
-
-    /**
-     * Starts capturing logs for the WinNative application process (by PID).
-     * Writes to `application.log` in real-time so that crash data is
-     * persisted even if the process terminates unexpectedly.
-     */
     @JvmStatic
-    fun startAppLogging(context: Context) {
+    @JvmOverloads
+    fun startAppLogging(context: Context, reset: Boolean = false) {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         if (!prefs.getBoolean("enable_app_debug", false)) return
 
@@ -144,8 +97,11 @@ object LogManager {
 
         try {
             stopAppLogging()
+            if (reset) {
+                logFile.delete()
+                runBlockingLogcatCommand(arrayOf("logcat", "-c"))
+            }
             val pid = android.os.Process.myPid()
-            // Filter by PID and capture warnings, errors, and fatal messages
             appLogProcess =
                 Runtime.getRuntime().exec(
                     arrayOf("logcat", "-f", logFile.absolutePath, "--pid=$pid", "*:W"),
@@ -194,16 +150,21 @@ object LogManager {
         }
     }
 
-    /**
-     * Collects all shareable log files (both .log and .old.log).
-     */
     @JvmStatic
     fun getShareableLogFiles(context: Context): Array<File> {
         val logsDir = getLogsDir(context)
         return logsDir
             .listFiles()
             ?.filter {
-                it.isFile && (it.name.endsWith(".log") || it.name.endsWith(".old.log") || it.name.endsWith(".txt"))
+                it.isFile && (it.name.endsWith(".log") || it.name.endsWith(".txt") || it.name.endsWith(".csv"))
             }?.toTypedArray() ?: emptyArray()
     }
+
+    /** Total bytes of all shareable log files. */
+    @JvmStatic
+    fun getShareableLogsSize(context: Context): Long = getShareableLogFiles(context).sumOf { it.length() }
+
+    /** Deletes all shareable log files; returns the count removed. */
+    @JvmStatic
+    fun deleteShareableLogs(context: Context): Int = getShareableLogFiles(context).count { it.delete() }
 }
diff --git a/app/src/main/runtime/system/PerformanceRecorder.kt b/app/src/main/runtime/system/PerformanceRecorder.kt
new file mode 100644
index 000000000..e40737e93
--- /dev/null
+++ b/app/src/main/runtime/system/PerformanceRecorder.kt
@@ -0,0 +1,405 @@
+package com.winlator.cmod.runtime.system
+
+import android.content.Context
+import android.os.BatteryManager
+import android.os.Build
+import android.os.Debug
+import android.os.PowerManager
+import android.os.SystemClock
+import androidx.annotation.RequiresApi
+import org.json.JSONObject
+import timber.log.Timber
+import java.io.BufferedWriter
+import java.io.File
+import java.io.FileOutputStream
+import java.io.OutputStreamWriter
+import java.nio.charset.StandardCharsets
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicLong
+import java.util.concurrent.atomic.LongAdder
+
+/**
+ * Writes a per-session CSV of performance metrics plus a JSON metadata sidecar to the
+ * app logs directory. Sampled at 1 Hz on a dedicated background thread.
+ *
+ * Lifecycle:
+ *  - [start] opens both files. Sidecar is written with `endedAt:null, clean:false` so a
+ *    crashed session is identifiable.
+ *  - [recordFramePresent] is called from the X server render thread on every present.
+ *  - [stop] flushes CSV, fsyncs, and rewrites the sidecar with the final timestamps.
+ *
+ * Independent of the leaderboard submit path — the user can enable recording without
+ * enabling leaderboard upload, and vice versa.
+ */
+class PerformanceRecorder(
+    private val context: Context,
+    private val sessionMetadata: SessionMetadata,
+) {
+    private val started = AtomicBoolean(false)
+    private val stopped = AtomicBoolean(false)
+    private val frameCounter = LongAdder()
+    private var lastFrameCount: Long = 0
+    private val lastFrameNanoForObserver = AtomicLong(0)
+    private val frametimesLock = Any()
+    private val frametimesNs = ArrayList<Long>(INITIAL_FRAMETIMES_CAPACITY)
+
+    @Volatile private var sessionStartElapsedRealtimeMs: Long = 0
+    @Volatile private var sessionStartWallMs: Long = 0
+    @Volatile private var csvFile: File? = null
+    @Volatile private var sidecarFile: File? = null
+    @Volatile private var writer: BufferedWriter? = null
+    @Volatile private var writerStream: FileOutputStream? = null
+
+    private var sampler: ScheduledExecutorService? = null
+    private var lastCpuTimeNs: Long = 0
+    private var lastWallNs: Long = 0
+
+    private val batteryManager: BatteryManager? =
+        context.getSystemService(Context.BATTERY_SERVICE) as? BatteryManager
+    private val powerManager: PowerManager? =
+        context.getSystemService(Context.POWER_SERVICE) as? PowerManager
+
+    /**
+     * Open both output files and begin sampling. Returns true if recording is active,
+     * false if the output directory wasn't writable (logged but not crashy).
+     */
+    fun start(): Boolean {
+        if (!started.compareAndSet(false, true)) return true
+        sessionStartElapsedRealtimeMs = SystemClock.elapsedRealtime()
+        sessionStartWallMs = System.currentTimeMillis()
+        val dir = LogManager.getLogsDir(context)
+        if (!dir.canWrite()) {
+            Timber.tag(TAG).w("Logs dir not writable: $dir — recording disabled this session")
+            started.set(false)
+            return false
+        }
+        val stem = "perf_${sanitizeGameSlug(sessionMetadata.gameName)}_${TIMESTAMP_FORMAT.format(Date(sessionStartWallMs))}_v1"
+        var csv = File(dir, "$stem.csv")
+        var meta = File(dir, "$stem.meta.json")
+        var n = 1
+        while (csv.exists() || meta.exists()) {
+            csv = File(dir, "${stem}_$n.csv")
+            meta = File(dir, "${stem}_$n.meta.json")
+            n++
+        }
+        csvFile = csv
+        sidecarFile = meta
+        return try {
+            val stream = FileOutputStream(csv, false)
+            writerStream = stream
+            val w = BufferedWriter(OutputStreamWriter(stream, StandardCharsets.UTF_8))
+            writer = w
+            w.write(CSV_HEADER)
+            w.newLine()
+            w.flush()
+            writeSidecar(endedAtIso = null, clean = false)
+            lastCpuTimeNs = Debug.threadCpuTimeNanos()
+            lastWallNs = System.nanoTime()
+            val exec = Executors.newSingleThreadScheduledExecutor { runnable ->
+                Thread(runnable, "PerfRecorderWriter").apply {
+                    priority = Thread.MIN_PRIORITY + 1
+                    isDaemon = true
+                }
+            }
+            sampler = exec
+            exec.scheduleAtFixedRate({ tickSafe() }, SAMPLE_INTERVAL_MS, SAMPLE_INTERVAL_MS, TimeUnit.MILLISECONDS)
+            exec.scheduleAtFixedRate({ flushSafe() }, FLUSH_INTERVAL_MS, FLUSH_INTERVAL_MS, TimeUnit.MILLISECONDS)
+            Timber.tag(TAG).i("Recording to ${csv.absolutePath}")
+            true
+        } catch (t: Throwable) {
+            Timber.tag(TAG).w(t, "Failed to open recording files")
+            closeWriterQuietly()
+            started.set(false)
+            false
+        }
+    }
+
+    /**
+     * Frame-present hook compatible with [com.winlator.cmod.runtime.display.ui.FrameRating.FrameObserver].
+     * Tracks last nanoTime internally so the caller only has to forward the wall-clock present time.
+     */
+    fun recordFramePresent(nanoTime: Long) {
+        if (!started.get() || stopped.get()) return
+        frameCounter.increment()
+        val prev = lastFrameNanoForObserver.getAndSet(nanoTime)
+        if (prev != 0L) {
+            val dt = nanoTime - prev
+            if (dt in 1L..MAX_PLAUSIBLE_FRAMETIME_NS) {
+                synchronized(frametimesLock) { frametimesNs.add(dt) }
+            }
+        }
+    }
+
+    fun stop() {
+        if (!stopped.compareAndSet(false, true)) return
+        try {
+            sampler?.shutdown()
+            try {
+                sampler?.awaitTermination(SHUTDOWN_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            } catch (_: InterruptedException) {
+                Thread.currentThread().interrupt()
+            }
+            // Final row capturing whatever is left in the window.
+            tickSafe()
+            try {
+                writer?.flush()
+                writerStream?.fd?.sync()
+            } catch (t: Throwable) {
+                Timber.tag(TAG).w(t, "Final flush failed")
+            }
+            val endedIso = ISO_FORMAT.format(Date(System.currentTimeMillis()))
+            writeSidecar(endedAtIso = endedIso, clean = true)
+        } finally {
+            closeWriterQuietly()
+            sampler = null
+        }
+    }
+
+    private fun tickSafe() {
+        try {
+            tick()
+        } catch (t: Throwable) {
+            Timber.tag(TAG).w(t, "Tick failed")
+        }
+    }
+
+    private fun tick() {
+        val w = writer ?: return
+        val nowWall = System.currentTimeMillis()
+        val elapsedMs = SystemClock.elapsedRealtime() - sessionStartElapsedRealtimeMs
+        val nowCpu = Debug.threadCpuTimeNanos()
+        val nowWallNs = System.nanoTime()
+        val cpuDelta = nowCpu - lastCpuTimeNs
+        val wallDelta = nowWallNs - lastWallNs
+        lastCpuTimeNs = nowCpu
+        lastWallNs = nowWallNs
+        val cpuPct = if (wallDelta > 0L) (cpuDelta.toDouble() / wallDelta.toDouble() * 100.0).coerceIn(0.0, 100.0) else 0.0
+
+        val framesNow = frameCounter.sum()
+        val frameDelta = framesNow - lastFrameCount
+        lastFrameCount = framesNow
+        val fpsAvg = if (wallDelta > 0L) frameDelta.toFloat() / (wallDelta / 1_000_000_000f) else 0f
+
+        val (medianFt, p99Ft) = drainAndComputeFrametimes()
+        val gpuPct = readGpuLoadPct()
+        val socTempC = readSocTempC()
+        val thermalStatus = readThermalStatus()
+        val battPct = batteryManager?.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) ?: -1
+        val battCurrentMa = readBatteryCurrentMa()
+        val battVoltageMv = readBatteryVoltageMv()
+        val pssKb = readPssKb()
+        val availMemMb = readAvailMemMb()
+
+        val row = buildString(256) {
+            append(ISO_FORMAT.format(Date(nowWall)))
+            append(',').append(elapsedMs)
+            append(',').append(formatFloat(fpsAvg))
+            append(',').append(frameDelta)
+            append(',').append(formatFloat(medianFt))
+            append(',').append(formatFloat(p99Ft))
+            append(',').append(formatDouble(cpuPct))
+            append(',').append(if (gpuPct < 0f) "NA" else formatFloat(gpuPct))
+            append(',').append(thermalStatus)
+            append(',').append(if (socTempC <= 0f) "NA" else formatFloat(socTempC))
+            append(',').append(battPct)
+            append(',').append(battCurrentMa)
+            append(',').append(battVoltageMv)
+            append(',').append(pssKb)
+            append(',').append(availMemMb)
+        }
+        w.write(row)
+        w.newLine()
+    }
+
+    private fun drainAndComputeFrametimes(): Pair<Float, Float> {
+        val drained = synchronized(frametimesLock) {
+            if (frametimesNs.isEmpty()) {
+                LongArray(0)
+            } else {
+                val arr = frametimesNs.toLongArray()
+                frametimesNs.clear()
+                arr
+            }
+        }
+        if (drained.isEmpty()) return 0f to 0f
+        drained.sort()
+        val median = drained[drained.size / 2] / 1_000_000f
+        val p99 = drained[((drained.size - 1) * 99) / 100] / 1_000_000f
+        return median to p99
+    }
+
+    private fun flushSafe() {
+        try {
+            writer?.flush()
+        } catch (t: Throwable) {
+            Timber.tag(TAG).w(t, "Periodic flush failed")
+        }
+    }
+
+    private fun closeWriterQuietly() {
+        try { writer?.close() } catch (_: Throwable) {}
+        writer = null
+        writerStream = null
+    }
+
+    private fun writeSidecar(endedAtIso: String?, clean: Boolean) {
+        val sidecar = sidecarFile ?: return
+        try {
+            val json = JSONObject().apply {
+                put("schemaVersion", 1)
+                put("appVersion", sessionMetadata.appVersion)
+                put("session", JSONObject().apply {
+                    put("startedAt", ISO_FORMAT.format(Date(sessionStartWallMs)))
+                    put("endedAt", endedAtIso ?: JSONObject.NULL)
+                    put("clean", clean)
+                })
+                put("game", JSONObject().apply {
+                    put("name", sessionMetadata.gameName)
+                    put("slug", sanitizeGameSlug(sessionMetadata.gameName))
+                    put("source", sessionMetadata.gameSource)
+                    put("id", sessionMetadata.gameId)
+                    put("exePath", sessionMetadata.exePath ?: JSONObject.NULL)
+                })
+                put("device", JSONObject().apply {
+                    put("androidId", sessionMetadata.androidId)
+                    put("model", Build.MODEL ?: "")
+                    put("manufacturer", Build.MANUFACTURER ?: "")
+                    put("hardware", Build.HARDWARE ?: "")
+                    put("board", Build.BOARD ?: "")
+                    put("socModel", if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) Build.SOC_MODEL else "")
+                    put("socManufacturer", if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) Build.SOC_MANUFACTURER else "")
+                    put("gpuRenderer", sessionMetadata.gpuRenderer)
+                    put("androidApi", Build.VERSION.SDK_INT)
+                    put("androidRelease", Build.VERSION.RELEASE ?: "")
+                })
+                put("settings", JSONObject().apply {
+                    put("containerFingerprint", sessionMetadata.containerFingerprint)
+                    put("effective", JSONObject(sessionMetadata.effectiveSettings))
+                })
+                put("schemaNotes", "CSV columns: $CSV_HEADER. Times are UTC ISO-8601.")
+            }
+            sidecar.writeText(json.toString(2), StandardCharsets.UTF_8)
+        } catch (t: Throwable) {
+            Timber.tag(TAG).w(t, "Sidecar write failed")
+        }
+    }
+
+    private fun readGpuLoadPct(): Float =
+        runCatching {
+            File("/sys/class/kgsl/kgsl-3d0/gpu_busy_percentage").takeIf { it.canRead() }
+                ?.readText()?.trim()?.removeSuffix("%")?.toFloatOrNull() ?: -1f
+        }.getOrDefault(-1f)
+
+    private fun readSocTempC(): Float = runCatching {
+        val zonesDir = File("/sys/class/thermal").takeIf { it.isDirectory } ?: return@runCatching 0f
+        var maxTemp = 0f
+        zonesDir.listFiles { f -> f.name.startsWith("thermal_zone") }?.forEach { zone ->
+            val typeFile = File(zone, "type")
+            val tempFile = File(zone, "temp")
+            if (typeFile.canRead() && tempFile.canRead()) {
+                val type = runCatching { typeFile.readText().trim().lowercase() }.getOrNull() ?: return@forEach
+                if (type.contains("cpu") || type.contains("soc") || type.contains("tsens")) {
+                    val rawMilli = tempFile.readText().trim().toFloatOrNull() ?: return@forEach
+                    val celsius = rawMilli / 1000f
+                    if (celsius in 1f..150f && celsius > maxTemp) maxTemp = celsius
+                }
+            }
+        }
+        maxTemp
+    }.getOrDefault(0f)
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    private fun thermalStatusName(): String = when (powerManager?.currentThermalStatus ?: 0) {
+        PowerManager.THERMAL_STATUS_NONE -> "NONE"
+        PowerManager.THERMAL_STATUS_LIGHT -> "LIGHT"
+        PowerManager.THERMAL_STATUS_MODERATE -> "MODERATE"
+        PowerManager.THERMAL_STATUS_SEVERE -> "SEVERE"
+        PowerManager.THERMAL_STATUS_CRITICAL -> "CRITICAL"
+        PowerManager.THERMAL_STATUS_EMERGENCY -> "EMERGENCY"
+        PowerManager.THERMAL_STATUS_SHUTDOWN -> "SHUTDOWN"
+        else -> "NONE"
+    }
+
+    private fun readThermalStatus(): String =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) thermalStatusName() else "NA"
+
+    private fun readBatteryCurrentMa(): Int {
+        val bm = batteryManager ?: return 0
+        val ua = runCatching { bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW) }
+            .getOrDefault(0L)
+        return (kotlin.math.abs(ua) / 1000L).toInt()
+    }
+
+    private fun readBatteryVoltageMv(): Int {
+        val intent = runCatching {
+            context.registerReceiver(null, android.content.IntentFilter(android.content.Intent.ACTION_BATTERY_CHANGED))
+        }.getOrNull() ?: return 0
+        return intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0)
+    }
+
+    private fun readPssKb(): Int {
+        val info = Debug.MemoryInfo()
+        Debug.getMemoryInfo(info)
+        return info.totalPss
+    }
+
+    private fun readAvailMemMb(): Int {
+        val am = context.getSystemService(Context.ACTIVITY_SERVICE) as? android.app.ActivityManager ?: return 0
+        val mi = android.app.ActivityManager.MemoryInfo()
+        am.getMemoryInfo(mi)
+        return (mi.availMem / (1024L * 1024L)).toInt()
+    }
+
+    private fun formatFloat(f: Float): String =
+        if (f.isNaN() || f.isInfinite()) "0" else "%.2f".format(Locale.ROOT, f)
+
+    private fun formatDouble(d: Double): String =
+        if (d.isNaN() || d.isInfinite()) "0" else "%.2f".format(Locale.ROOT, d)
+
+    private fun sanitizeGameSlug(name: String): String {
+        val trimmed = name.trim()
+        if (trimmed.isEmpty()) return "unknown"
+        return trimmed
+            .replace(Regex("[^A-Za-z0-9._-]"), "_")
+            .take(64)
+            .ifEmpty { "unknown" }
+    }
+
+    data class SessionMetadata(
+        val gameName: String,
+        val gameSource: String,
+        val gameId: String,
+        val exePath: String?,
+        val androidId: String,
+        val gpuRenderer: String,
+        val containerFingerprint: String,
+        val effectiveSettings: Map<String, String>,
+        val appVersion: String,
+    )
+
+    companion object {
+        private const val TAG = "PerfRecorder"
+        private const val SAMPLE_INTERVAL_MS: Long = 1_000L
+        private const val FLUSH_INTERVAL_MS: Long = 5_000L
+        private const val SHUTDOWN_TIMEOUT_MS: Long = 1_500L
+        private const val INITIAL_FRAMETIMES_CAPACITY: Int = 4_096
+        private const val MAX_PLAUSIBLE_FRAMETIME_NS: Long = 1_000_000_000L
+        private const val CSV_HEADER: String =
+            "t_iso8601,elapsed_ms,fps_avg,frame_count,frametime_median_ms,frametime_p99_ms," +
+                "cpu_self_pct,gpu_busy_pct,thermal_status,soc_temp_c,battery_pct,battery_current_ma," +
+                "battery_voltage_mv,pss_kb,avail_mem_mb"
+        private val ISO_FORMAT: SimpleDateFormat =
+            SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT).apply {
+                timeZone = TimeZone.getTimeZone("UTC")
+            }
+        private val TIMESTAMP_FORMAT: SimpleDateFormat =
+            SimpleDateFormat("yyyyMMdd-HHmmss-SSS", Locale.ROOT)
+    }
+}
diff --git a/app/src/main/runtime/system/ProcessHelper.java b/app/src/main/runtime/system/ProcessHelper.java
index 6d1756e5d..15ef604bc 100644
--- a/app/src/main/runtime/system/ProcessHelper.java
+++ b/app/src/main/runtime/system/ProcessHelper.java
@@ -4,16 +4,21 @@
 import android.util.Log;
 import com.winlator.cmod.shared.util.Callback;
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
 
 public abstract class ProcessHelper {
   private static final String TAG = "ProcessHelper";
@@ -93,6 +98,25 @@ public static void resumeProcess(int pid) {
     if (PRINT_DEBUG) Log.d("ProcessHelper", "Process resumed with pid: " + pid);
   }
 
+  /**
+   * Best-effort write of /proc/[pid]/oom_score_adj for one of our own
+   * children. SIGSTOP'd processes are otherwise prime OOM-kill targets during
+   * long screen-locked windows; this lowers their kill priority so the OS
+   * leaves a manually-paused wine session alone over multi-minute windows.
+   * Note: On Android 7.0+ this is often blocked by the OS for non-root users.
+   */
+  public static void setOomScoreAdj(int pid, int score) {
+    if (pid <= 0) return;
+    java.io.File f = new java.io.File("/proc/" + pid + "/oom_score_adj");
+    try (java.io.FileWriter w = new java.io.FileWriter(f, false)) {
+      w.write(Integer.toString(score));
+      if (PRINT_DEBUG) Log.d(TAG, "Successfully set oom_score_adj to " + score + " for pid " + pid);
+    } catch (Throwable t) {
+      // Some Android versions deny writes even for our own children.
+      if (PRINT_DEBUG) Log.d(TAG, "oom_score_adj write failed for pid " + pid + ": " + t.getMessage());
+    }
+  }
+
   public static void terminateProcess(int pid) {
     Process.sendSignal(pid, SIGTERM);
     if (PRINT_DEBUG) Log.d("ProcessHelper", "Process terminated with pid: " + pid);
@@ -165,11 +189,63 @@ public static ArrayList<String> terminateSessionProcessesAndWait(
     return finalRemaining;
   }
 
+  // Aggressive OOM protection for paused wine processes. -1000 marks the
+  // process as oom_score_adj OOM_SCORE_ADJ_MIN, telling the kernel never to
+  // kill it on memory pressure. We restore to 0 (default) on resume so a
+  // running wine process is back to normal priority.
+  private static final int OOM_SCORE_ADJ_PROTECT = -1000;
+  private static final int OOM_SCORE_ADJ_DEFAULT = 0;
+
+  private static final String[] CORE_PROCESS_FILTERS = {
+    "wineserver",
+    "winhandler",
+    "services.exe",
+    "rpcss.exe",
+    "explorer.exe",
+    "winedevice.exe",
+    "plugplay.exe",
+    "wfm.exe",
+    "conhost.exe",
+    "steam.exe",
+    "steamwebhelper.exe",
+    "webhelper.exe"
+  };
+
+  private static boolean isCoreProcess(String normalizedData) {
+    for (String filter : CORE_PROCESS_FILTERS) {
+      if (normalizedData.contains(filter)) return true;
+    }
+    return false;
+  }
+
+  public static void protectAllWineProcesses() {
+    ArrayList<String> processes = listRunningWineProcesses();
+    for (String process : processes) {
+      setOomScoreAdj(Integer.parseInt(process), OOM_SCORE_ADJ_PROTECT);
+    }
+  }
+
   public static void pauseAllWineProcesses() {
+    File proc = new File("/proc");
     ArrayList<String> processes = listRunningWineProcesses();
     if (!processes.isEmpty()) Log.d(TAG, "Pausing session processes: " + processes);
     for (String process : processes) {
-      suspendProcess(Integer.parseInt(process));
+      int pid = Integer.parseInt(process);
+
+      // Check if this is a core infrastructure process
+      String statData = readProcStat(proc, process);
+      String cmdlineData = readProcCmdline(proc, process);
+      String normalized = (statData + " " + cmdlineData).toLowerCase();
+
+      // Make the OS never OOM-kill the paused process if possible.
+      setOomScoreAdj(pid, OOM_SCORE_ADJ_PROTECT);
+
+      if (isCoreProcess(normalized)) {
+        if (PRINT_DEBUG) Log.d(TAG, "Skipping SIGSTOP for core process: " + process + " (" + normalized + ")");
+        continue;
+      }
+
+      suspendProcess(pid);
     }
   }
 
@@ -177,7 +253,9 @@ public static void resumeAllWineProcesses() {
     ArrayList<String> processes = listRunningWineProcesses();
     if (!processes.isEmpty()) Log.d(TAG, "Resuming session processes: " + processes);
     for (String process : processes) {
-      resumeProcess(Integer.parseInt(process));
+      int pid = Integer.parseInt(process);
+      resumeProcess(pid);
+      setOomScoreAdj(pid, OOM_SCORE_ADJ_DEFAULT);
     }
   }
 
@@ -210,15 +288,50 @@ public static int exec(
       ProcessBuilder pb = new ProcessBuilder(splitCommand);
       pb.directory(workingDir);
       pb.environment().putAll(EnvironmentManager.getEnvVars());
+      File tailCapture = null;
       if (debugCallbacks.isEmpty()) {
-        File nullFile = new File("/dev/null");
-        pb.redirectError(nullFile);
-        pb.redirectOutput(nullFile);
+        String wineDebug = EnvironmentManager.getEnvVars().get("WINEDEBUG");
+        boolean wineDebugActive = wineDebug != null
+                && !wineDebug.isEmpty()
+                && !wineDebug.equals("-all");
+        Log.i("ProcessHelper",
+                "exec wine-debug branch: WINEDEBUG='" + wineDebug + "' active=" + wineDebugActive
+                        + " cmd=" + command.substring(0, Math.min(80, command.length())));
+        File wineDebugLog = wineDebugActive ? resolveWineStderrLog() : null;
+        if (wineDebugLog != null) {
+          try {
+            if (wineDebugLog.exists() && wineDebugLog.length() > 16 * 1024 * 1024)
+              wineDebugLog.delete();
+          } catch (Exception ignored) {}
+          pb.redirectErrorStream(true);
+          pb.redirectOutput(ProcessBuilder.Redirect.appendTo(wineDebugLog));
+          Log.i(
+              "ProcessHelper",
+              "exec wine-debug: redirecting stderr+stdout to " + wineDebugLog.getAbsolutePath());
+        } else {
+          File nullFile = new File("/dev/null");
+          pb.redirectError(nullFile);
+          pb.redirectOutput(nullFile);
+        }
+      } else {
+        tailCapture = resolveWineTailCapture();
+        if (tailCapture != null) {
+          pb.redirectErrorStream(true);
+          pb.redirectOutput(ProcessBuilder.Redirect.to(tailCapture));
+          Log.i("ProcessHelper", "exec: debugCallbacks non-empty (" + debugCallbacks.size()
+                  + "), capturing wine output to " + tailCapture.getAbsolutePath() + " and tailing to drawer");
+        } else {
+          Log.w("ProcessHelper", "exec: no capture file; falling back to piped debug reader");
+        }
       }
       java.lang.Process process = pb.start();
       if (!debugCallbacks.isEmpty()) {
-        createDebugThread(process.getInputStream());
-        createDebugThread(process.getErrorStream());
+        if (tailCapture != null) {
+          startDebugTailThread(tailCapture, process);
+        } else {
+          createDebugThread(process.getInputStream());
+          createDebugThread(process.getErrorStream());
+        }
       }
 
       // Accessing hidden field
@@ -237,6 +350,17 @@ public static int exec(
     return pid;
   }
 
+  /** Wine debug log target in the app's own files dir so it works on every (rebranded) flavor; null if no app context. */
+  private static File resolveWineStderrLog() {
+    try {
+      File filesDir = com.winlator.cmod.app.PluviaApp.Companion.getInstance().getFilesDir();
+      if (filesDir != null) return new File(filesDir, "wine_stderr.log");
+    } catch (Throwable t) {
+      Log.w(TAG, "resolveWineStderrLog: app context unavailable; wine debug log disabled", t);
+    }
+    return null;
+  }
+
   private static void createDebugThread(final InputStream inputStream) {
     new Thread(
             () -> {
@@ -258,6 +382,83 @@ private static void createDebugThread(final InputStream inputStream) {
         .start();
   }
 
+  private static final AtomicLong tailSeq = new AtomicLong();
+
+  private static File resolveWineTailCapture() {
+    try {
+      File cacheDir = com.winlator.cmod.app.PluviaApp.Companion.getInstance().getCacheDir();
+      if (cacheDir != null) {
+        File dir = new File(cacheDir, "wine_tail");
+        if (!dir.exists()) dir.mkdirs();
+        return new File(dir, "wine_tail_" + tailSeq.incrementAndGet() + ".log");
+      }
+    } catch (Throwable t) {
+      Log.w(TAG, "resolveWineTailCapture: app context unavailable; tail disabled", t);
+    }
+    return null;
+  }
+
+  private static void emitDebugLine(String line) {
+    synchronized (debugCallbacks) {
+      if (!debugCallbacks.isEmpty())
+        for (Callback<String> callback : debugCallbacks) callback.call(line);
+    }
+  }
+
+  private static void startDebugTailThread(final File file, final java.lang.Process process) {
+    Thread thread =
+        new Thread(
+            () -> {
+              try {
+                android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+              } catch (Throwable ignored) {
+              }
+              try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
+                ByteArrayOutputStream line = new ByteArrayOutputStream(256);
+                byte[] buf = new byte[8192];
+                boolean finalPass = false;
+                while (true) {
+                  int n = raf.read(buf);
+                  if (n > 0) {
+                    for (int i = 0; i < n; i++) {
+                      byte b = buf[i];
+                      if (b == '\n') {
+                        emitDebugLine(new String(line.toByteArray(), StandardCharsets.UTF_8));
+                        line.reset();
+                      } else if (b != '\r') {
+                        line.write(b);
+                      }
+                    }
+                  } else if (finalPass) {
+                    if (line.size() > 0)
+                      emitDebugLine(new String(line.toByteArray(), StandardCharsets.UTF_8));
+                    break;
+                  } else {
+                    boolean alive;
+                    try {
+                      process.exitValue();
+                      alive = false;
+                    } catch (IllegalThreadStateException ex) {
+                      alive = true;
+                    }
+                    if (alive) Thread.sleep(40);
+                    else finalPass = true;
+                  }
+                }
+              } catch (Exception e) {
+                Log.e("ProcessHelper", "Error in debug tail thread", e);
+              } finally {
+                try {
+                  file.delete();
+                } catch (Exception ignored) {
+                }
+              }
+            },
+            "ProcessDebugTail");
+    thread.setDaemon(true);
+    thread.start();
+  }
+
   private static void createWaitForThread(
       java.lang.Process process, final Callback<Integer> terminationCallback) {
     new Thread(
@@ -299,7 +500,7 @@ public static void removeDebugCallback(Callback<String> callback) {
   public static String[] splitCommand(String command) {
     ArrayList<String> result = new ArrayList<>();
     boolean startedQuotes = false;
-    String value = "";
+    StringBuilder value = new StringBuilder();
     char currChar, nextChar;
     for (int i = 0, count = command.length(); i < count; i++) {
       currChar = command.charAt(i);
@@ -308,31 +509,31 @@ public static String[] splitCommand(String command) {
       if (startedQuotes) {
         if (currChar == quoteChar) {
           startedQuotes = false;
-          if (!value.isEmpty()) {
-            value += quoteChar;
-            result.add(value);
-            value = "";
+          if (value.length() > 0) {
+            value.append(quoteChar);
+            result.add(value.toString());
+            value.setLength(0);
           }
-        } else value += currChar;
+        } else value.append(currChar);
       } else if (currChar == '"' || currChar == '\'') {
         if (currChar == '\'') quoteChar = '\'';
         startedQuotes = true;
-        value += quoteChar;
+        value.append(quoteChar);
       } else {
         nextChar = i < count - 1 ? command.charAt(i + 1) : '\0';
         if (currChar == ' ' || (currChar == '\\' && nextChar == ' ')) {
           if (currChar == '\\') {
-            value += ' ';
+            value.append(' ');
             i++;
-          } else if (!value.isEmpty()) {
-            result.add(value);
-            value = "";
+          } else if (value.length() > 0) {
+            result.add(value.toString());
+            value.setLength(0);
           }
         } else {
-          value += currChar;
+          value.append(currChar);
           if (i == count - 1) {
-            result.add(value);
-            value = "";
+            result.add(value.toString());
+            value.setLength(0);
           }
         }
       }
@@ -453,7 +654,11 @@ private static String readProcStat(File proc, String pid) {
 
   private static String readProcCmdline(File proc, String pid) {
     try (FileInputStream fr = new FileInputStream(proc + "/" + pid + "/cmdline")) {
-      byte[] bytes = fr.readAllBytes();
+      ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+      byte[] data = new byte[8192];
+      int nRead;
+      while ((nRead = fr.read(data)) != -1) buffer.write(data, 0, nRead);
+      byte[] bytes = buffer.toByteArray();
       return new String(bytes, StandardCharsets.UTF_8).replace('\0', ' ');
     } catch (IOException e) {
       return "";
diff --git a/app/src/main/runtime/system/SessionKeepAliveService.java b/app/src/main/runtime/system/SessionKeepAliveService.java
new file mode 100644
index 000000000..8b38e656b
--- /dev/null
+++ b/app/src/main/runtime/system/SessionKeepAliveService.java
@@ -0,0 +1,422 @@
+package com.winlator.cmod.runtime.system;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ServiceInfo;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+
+import com.winlator.cmod.R;
+import com.winlator.cmod.runtime.display.XServerDisplayActivity;
+import com.winlator.cmod.runtime.display.environment.XEnvironment;
+import com.winlator.cmod.runtime.display.xserver.XServer;
+
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Foreground service that keeps the WinNative process alive while a wine
+ * session is in the background or while a component download/install is
+ * running. Without it, Android can reap the app process when the screen is
+ * locked, taking the wine container (and any in-flight download) with it.
+ *
+ * Reasons are reference-counted via static helpers. The service stops itself
+ * once no reasons remain. On task removal (user swipe-away) it does a
+ * defensive wine cleanup and lets the process exit, matching the previous
+ * "swipe = close" behaviour.
+ */
+public class SessionKeepAliveService extends Service {
+    private static final String TAG = "SessionKeepAlive";
+
+    private static final String CHANNEL_ID = "winnative_session_keepalive";
+
+    private static final String ACTION_SESSION_START = "com.winlator.cmod.action.SESSION_START";
+    private static final String ACTION_SESSION_STOP = "com.winlator.cmod.action.SESSION_STOP";
+    private static final String ACTION_SESSION_PAUSE = "com.winlator.cmod.action.SESSION_PAUSE";
+    private static final String ACTION_SESSION_RESUME = "com.winlator.cmod.action.SESSION_RESUME";
+    private static final String ACTION_DL_START = "com.winlator.cmod.action.SESSION_DL_START";
+    private static final String ACTION_DL_STOP = "com.winlator.cmod.action.SESSION_DL_STOP";
+    private static final String EXTRA_TAG = "tag";
+
+    private static final AtomicBoolean sessionActive = new AtomicBoolean(false);
+    private static final HashSet<String> activeDownloads = new HashSet<>();
+    private static final AtomicBoolean serviceRunning = new AtomicBoolean(false);
+
+    private static volatile XEnvironment activeEnvironment;
+    private static volatile XServer activeXServer;
+
+    private static volatile boolean isContainerPaused = false;
+
+    private PowerManager.WakeLock wakeLock;
+    private WifiManager.WifiLock wifiLock;
+    private int notificationId;
+    private final Handler protectionHandler = new Handler(Looper.getMainLooper());
+    private final Runnable protectionRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (sessionActive.get()) {
+                Log.d(TAG, "Running periodic OOM protection for wine processes");
+                new Thread(() -> {
+                    try {
+                        ProcessHelper.protectAllWineProcesses();
+                    } catch (Exception e) {
+                        Log.e(TAG, "Failed to run OOM protection", e);
+                    }
+                }, "WineOomProtection").start();
+                protectionHandler.postDelayed(this, 2 * 60 * 1000L); // Every 2 minutes
+            }
+        }
+    };
+
+    public static void startSession(Context ctx) {
+        if (ctx == null) return;
+        sessionActive.set(true);
+        sendCommand(ctx, ACTION_SESSION_START, null);
+    }
+
+    public static void stopSession(Context ctx) {
+        if (ctx == null) return;
+        if (sessionActive.compareAndSet(true, false)) {
+            sendCommand(ctx, ACTION_SESSION_STOP, null);
+        }
+    }
+
+    public static XEnvironment getActiveEnvironment() {
+        return activeEnvironment;
+    }
+
+    public static void setActiveEnvironment(XEnvironment environment) {
+        activeEnvironment = environment;
+    }
+
+    public static XServer getActiveXServer() {
+        return activeXServer;
+    }
+
+    public static void setActiveXServer(XServer xServer) {
+        activeXServer = xServer;
+    }
+
+    public static void onPauseSession(Context ctx) {
+        if (ctx == null) return;
+        sessionActive.set(true);
+        sendCommand(ctx, ACTION_SESSION_PAUSE, null);
+    }
+
+    public static void onResumeSession(Context ctx) {
+        if (ctx == null) return;
+        sendCommand(ctx, ACTION_SESSION_RESUME, null);
+    }
+
+    public static void startDownload(Context ctx, String tag) {
+        if (ctx == null) return;
+        String key = tag == null ? "default" : tag;
+        boolean added;
+        synchronized (activeDownloads) {
+            added = activeDownloads.add(key);
+        }
+        if (added) {
+            sendCommand(ctx, ACTION_DL_START, key);
+        }
+    }
+
+    public static void stopDownload(Context ctx, String tag) {
+        if (ctx == null) return;
+        String key = tag == null ? "default" : tag;
+        boolean removed;
+        synchronized (activeDownloads) {
+            removed = activeDownloads.remove(key);
+        }
+        if (removed) {
+            sendCommand(ctx, ACTION_DL_STOP, key);
+        }
+    }
+
+    public static boolean isSessionActive() {
+        return sessionActive.get();
+    }
+
+    private static boolean hasReason() {
+        if (sessionActive.get()) return true;
+        synchronized (activeDownloads) {
+            return !activeDownloads.isEmpty();
+        }
+    }
+
+    private static void sendCommand(Context ctx, String action, @Nullable String tag) {
+        Context app = ctx.getApplicationContext();
+        Intent intent = new Intent(app, SessionKeepAliveService.class);
+        intent.setAction(action);
+        if (tag != null) intent.putExtra(EXTRA_TAG, tag);
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+                    (ACTION_SESSION_PAUSE.equals(action) || ACTION_SESSION_START.equals(action) || ACTION_DL_START.equals(action))) {
+                app.startForegroundService(intent);
+            } else {
+                app.startService(intent);
+            }
+        } catch (Exception e) {
+            // If starting the service fails, try starting it as a foreground service as a fallback.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                app.startForegroundService(intent);
+            }
+            Log.w(TAG, "Failed to send command " + action, e);
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        generateNotificationId();
+
+        // Keep the CPU alive to prevent OS from killing the process when the screen is off.
+        PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
+        if (pm != null) {
+            wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "WinNative:KeepAlive");
+//            wakeLock.acquire();
+        }
+
+        // Keep the Wi-Fi alive to prevent network interruptions. Useful for games that stream assets from the network or have online features.
+        WifiManager wm = (WifiManager) getSystemService(WIFI_SERVICE);
+        if (wm != null) {
+            int lockType = WifiManager.WIFI_MODE_FULL;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                lockType = WifiManager.WIFI_MODE_FULL_HIGH_PERF;
+            }
+            wifiLock = wm.createWifiLock(lockType, "WinNative:WifiKeepAlive");
+        }
+
+        ensureChannel();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        String action = intent != null ? intent.getAction() : null;
+
+        if (ACTION_SESSION_START.equals(action)) {
+            sessionActive.set(true);
+            isContainerPaused = false;
+            protectionHandler.removeCallbacks(protectionRunnable);
+            protectionHandler.post(protectionRunnable);
+        } else if (ACTION_SESSION_PAUSE.equals(action)) {
+            isContainerPaused = true;
+        } else if (ACTION_SESSION_RESUME.equals(action)) {
+            isContainerPaused = false;
+        }
+        else if (ACTION_SESSION_STOP.equals(action)) {
+            sessionActive.set(false);
+            isContainerPaused = false;
+            protectionHandler.removeCallbacks(protectionRunnable);
+            if (activeEnvironment != null) {
+                final XEnvironment env = activeEnvironment;
+                activeEnvironment = null;
+                activeXServer = null;
+                new Thread(() -> {
+                    try {
+                        env.stopEnvironmentComponents();
+                    } catch (Exception e) {
+                        Log.e(TAG, "Failed to stop environment components during session stop", e);
+                    }
+                }, "XServerTeardown").start();
+            }
+        }
+
+        // Ensure wake lock, wifi lock and OOM adj are correct based on current state
+        if (hasReason()) {
+            if (wakeLock != null && !wakeLock.isHeld()) wakeLock.acquire();
+            if (wifiLock != null && !wifiLock.isHeld()) wifiLock.acquire();
+            ProcessHelper.setOomScoreAdj(android.os.Process.myPid(), -1000);
+            new Thread(() -> {
+                try {
+                    ProcessHelper.protectAllWineProcesses();
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to run initial OOM protection", e);
+                }
+            }, "InitialWineOomProtection").start();
+        } else {
+            if (wakeLock != null && wakeLock.isHeld()) wakeLock.release();
+            if (wifiLock != null && wifiLock.isHeld()) wifiLock.release();
+            ProcessHelper.setOomScoreAdj(android.os.Process.myPid(), 0);
+        }
+
+        // Always promote to foreground first so Android does not consider
+        // the start a violation (and so the notification reflects current
+        // reasons), even if the command immediately tells us to stop.
+        ensureForeground();
+        serviceRunning.set(true);
+
+        if (!hasReason()) {
+            Log.d(TAG, "No active reason; stopping keep-alive service");
+            stopForegroundCompat();
+            stopSelf();
+            serviceRunning.set(false);
+        }
+        return START_STICKY;
+    }
+
+    private void ensureForeground() {
+        Notification n = buildNotification();
+        try {
+            if (Build.VERSION.SDK_INT >= 34) {
+                startForeground(notificationId, n, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                startForeground(notificationId, n, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+            }
+            else {
+                startForeground(notificationId, n);
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Failed to startForeground", e);
+        }
+    }
+
+    private void stopForegroundCompat() {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                stopForeground(STOP_FOREGROUND_REMOVE);
+            } else {
+                stopForeground(true);
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Failed to stopForeground", e);
+        }
+    }
+
+    private void ensureChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+        NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        if (nm == null) return;
+        if (nm.getNotificationChannel(CHANNEL_ID) != null) return;
+        NotificationChannel channel = new NotificationChannel(
+                CHANNEL_ID,
+                "WinNative session keep-alive",
+                NotificationManager.IMPORTANCE_LOW);
+        channel.setDescription(
+                "Keeps WinNative running in the background so a paused game session or "
+                        + "an active component download is not interrupted by screen lock.");
+        channel.setShowBadge(false);
+        channel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
+        nm.createNotificationChannel(channel);
+    }
+
+    private Notification buildNotification() {
+        boolean container = sessionActive.get();
+        boolean dl;
+        synchronized (activeDownloads) {
+            dl = !activeDownloads.isEmpty();
+        }
+        String content;
+        if (container && dl) {
+            content = "Session paused — downloads continuing in background";
+        } else if (container) {
+            if (isContainerPaused)
+                content = "Container session is paused";
+            else
+                content = "There is a container session running";
+        } else if (dl) {
+            content = "Downloading components in the background";
+        } else {
+            content = "WinNative is running in the background";
+        }
+
+        Intent openIntent = new Intent(this, XServerDisplayActivity.class);
+        openIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        PendingIntent contentIntent = PendingIntent.getActivity(
+                this,
+                0,
+                openIntent,
+                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+
+        return new NotificationCompat.Builder(this, CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentTitle("WinNative")
+                .setContentText(content)
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setOngoing(true)
+                .setShowWhen(false)
+                .setContentIntent(contentIntent)
+                .build();
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        super.onTaskRemoved(rootIntent);
+        Log.i(TAG, "Task removed (user swipe). Tearing down session and exiting process.");
+
+        // Clear reasons so any subsequent re-entry will not keep us alive.
+        sessionActive.set(false);
+        synchronized (activeDownloads) {
+            activeDownloads.clear();
+        }
+
+        // Give the activity's own onDestroy → performForcedSessionCleanup a
+        // chance to run first; then defensively clean any wine processes that
+        // might still be alive, and exit the process so swipe behaves like the
+        // pre-existing "swipe-away closes everything" flow.
+        new Thread(() -> {
+            try {
+                Thread.sleep(1500L);
+                if (com.winlator.cmod.feature.stores.steam.service.SteamService
+                        .Companion.isBionicHandoffActive()) {
+                    try {
+                        boolean kicked = com.winlator.cmod.feature.stores.steam.service.SteamService
+                                .Companion.bionicHandoffReleaseAndKickPlayingSessionBlocking(true, 2500L);
+                        Log.i(TAG, "Task removal Steam cleanup: kickedPlayingSession=" + kicked);
+                    } catch (Throwable t) {
+                        Log.w(TAG, "Task removal Steam cleanup failed", t);
+                    }
+                }
+                ProcessHelper.terminateSessionProcessesAndWait(1500, true);
+                ProcessHelper.drainDeadChildren("session keep-alive task removed");
+            } catch (Throwable t) {
+                Log.w(TAG, "Defensive wine cleanup on task removal failed", t);
+            }
+            new Handler(Looper.getMainLooper()).post(() -> {
+                stopForegroundCompat();
+                stopSelf();
+                serviceRunning.set(false);
+                // Match the previous swipe behaviour: actually exit the process.
+                // We do this in a slight delay to ensure stopSelf() has processed.
+                new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                    android.os.Process.killProcess(android.os.Process.myPid());
+                }, 500L);
+            });
+        }, "SessionKeepAliveCleanup").start();
+    }
+
+    @Override
+    public void onDestroy() {
+        protectionHandler.removeCallbacks(protectionRunnable);
+        if (wakeLock != null && wakeLock.isHeld()) wakeLock.release();
+        if (wifiLock != null && wifiLock.isHeld()) wifiLock.release();
+        serviceRunning.set(false);
+        super.onDestroy();
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    private void generateNotificationId() {
+        // Generate a unique ID based on the package name to avoid conflicts with other forks/flavors.
+        String contextKey = getPackageName() + ".winnative.keepAlive";
+        notificationId = contextKey.hashCode() & 0x7FFFFFFF; // Avoid negative IDs
+    }
+}
diff --git a/app/src/main/runtime/system/SessionLogWriter.java b/app/src/main/runtime/system/SessionLogWriter.java
new file mode 100644
index 000000000..d8fe4c325
--- /dev/null
+++ b/app/src/main/runtime/system/SessionLogWriter.java
@@ -0,0 +1,152 @@
+package com.winlator.cmod.runtime.system;
+
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.util.Log;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.regex.Pattern;
+
+public final class SessionLogWriter {
+  private static final String TAG = "SessionLogWriter";
+
+  /** Max session files kept per category. */
+  private static final int MAX_SESSION_FILES_PER_CATEGORY = 15;
+
+  private static final Pattern BOX64_LINE =
+      Pattern.compile("^(?:\\[\\d\\d:\\d\\d:\\d\\d\\]\\s+)?\\[?(?:Box64|BOX64|Box|BOX|Dynarec|DynaRec|Dynablock)");
+  private static final Pattern FEX_LINE =
+      Pattern.compile(
+          "^(?:\\[\\d\\d:\\d\\d:\\d\\d\\]\\s+)?\\[(?:ASSERT|ERROR|ERR|WARNING|WARN|INFO|DEBUG|VERBOSE|CRIT|STDOUT|STDERR)\\]");
+
+  private BufferedWriter box64Writer;
+  private BufferedWriter fexWriter;
+  private BufferedWriter wineWriter;
+
+  private SessionLogWriter() {}
+
+  public static SessionLogWriter create(
+      Context context,
+      String executable,
+      boolean box64LogsEnabled,
+      boolean fexLogsEnabled,
+      boolean wineDebugEnabled,
+      boolean box64Active,
+      boolean fexActive) {
+    SessionLogWriter writer = new SessionLogWriter();
+    try {
+      File logsDir = LogManager.getLogsDir(context);
+      String exe = sanitize(executable);
+      String stamp = DateFormat.format("yyyy-MM-dd_HH-mm-ss", new Date()).toString();
+
+      boolean routeBox64 = box64LogsEnabled;
+      boolean routeFex = fexLogsEnabled;
+      if (box64LogsEnabled && fexLogsEnabled) {
+        if (box64Active && !fexActive) {
+          routeFex = false;
+        } else if (fexActive && !box64Active) {
+          routeBox64 = false;
+        }
+      }
+
+      if (routeBox64) {
+        writer.box64Writer = openWriter(logsDir, "box64", exe, stamp);
+        prune(logsDir, "box64");
+      }
+      if (routeFex) {
+        writer.fexWriter = openWriter(logsDir, "fexcore", exe, stamp);
+        prune(logsDir, "fexcore");
+      }
+      if (wineDebugEnabled) {
+        writer.wineWriter = openWriter(logsDir, "wine", exe, stamp);
+        prune(logsDir, "wine");
+      }
+    } catch (Exception e) {
+      Log.w(TAG, "Failed to open session log writers", e);
+    }
+    return writer;
+  }
+
+  private static BufferedWriter openWriter(File logsDir, String category, String exe, String stamp)
+      throws IOException {
+    File file = new File(logsDir, category + "_" + exe + "_" + stamp + ".txt");
+    return new BufferedWriter(new FileWriter(file));
+  }
+
+  public synchronized void write(String line) {
+    if (box64Writer != null && BOX64_LINE.matcher(line).find()) {
+      writeTo(box64Writer, line);
+    } else if (fexWriter != null && FEX_LINE.matcher(line).find()) {
+      writeTo(fexWriter, line);
+    } else if (wineWriter != null) {
+      writeTo(wineWriter, line);
+    } else {
+      writeTo(box64Writer, line);
+      writeTo(fexWriter, line);
+    }
+  }
+
+  private static void writeTo(BufferedWriter writer, String line) {
+    if (writer == null) return;
+    try {
+      writer.write(line);
+      writer.write("\n");
+    } catch (IOException ignored) {
+    }
+  }
+
+  public synchronized void flush() {
+    flush(box64Writer);
+    flush(fexWriter);
+    flush(wineWriter);
+  }
+
+  private static void flush(BufferedWriter writer) {
+    if (writer == null) return;
+    try {
+      writer.flush();
+    } catch (IOException ignored) {
+    }
+  }
+
+  public synchronized void close() {
+    close(box64Writer);
+    close(fexWriter);
+    close(wineWriter);
+    box64Writer = null;
+    fexWriter = null;
+    wineWriter = null;
+  }
+
+  private static void close(BufferedWriter writer) {
+    if (writer == null) return;
+    try {
+      writer.close();
+    } catch (IOException ignored) {
+    }
+  }
+
+  private static String sanitize(String name) {
+    if (name == null || name.isEmpty()) return "session";
+    int dot = name.lastIndexOf('.');
+    String base = dot > 0 ? name.substring(0, dot) : name;
+    base = base.replaceAll("[^a-zA-Z0-9\\-_]", "_").toLowerCase();
+    return base.isEmpty() ? "session" : base;
+  }
+
+  /** Prunes session files beyond the retention cap. */
+  private static void prune(File logsDir, String category) {
+    File[] files =
+        logsDir.listFiles(
+            (dir, name) -> name.startsWith(category + "_") && name.endsWith(".txt"));
+    if (files == null || files.length <= MAX_SESSION_FILES_PER_CATEGORY) return;
+    Arrays.sort(files, (a, b) -> Long.compare(a.lastModified(), b.lastModified()));
+    for (int i = 0; i < files.length - MAX_SESSION_FILES_PER_CATEGORY; i++) {
+      files[i].delete();
+    }
+  }
+}
diff --git a/app/src/main/runtime/wine/LocaleEnv.java b/app/src/main/runtime/wine/LocaleEnv.java
new file mode 100644
index 000000000..e97fe5936
--- /dev/null
+++ b/app/src/main/runtime/wine/LocaleEnv.java
@@ -0,0 +1,61 @@
+package com.winlator.cmod.runtime.wine;
+
+import java.util.Locale;
+
+/* Normalizes container LC_ALL into a value glibc inside the imagefs will
+ * actually accept. Empty stored value -> derive from the app's current
+ * Locale.getDefault() (which AppCompatDelegate.setApplicationLocales has
+ * already updated to reflect the Settings > Other > Language picker).
+ * Missing country -> best-effort fallback. Missing encoding -> append
+ * .UTF-8. Already-encoded values pass through unchanged. */
+public final class LocaleEnv {
+    private LocaleEnv() {}
+
+    public static String normalize(String stored) {
+        if (stored != null && !stored.isEmpty()) {
+            return ensureEncoding(stored);
+        }
+        return deriveFromDevice();
+    }
+
+    public static String deriveFromDevice() {
+        Locale locale = Locale.getDefault();
+        String lang = locale.getLanguage();
+        String country = locale.getCountry();
+        if (country == null || country.isEmpty()) {
+            country = defaultCountryFor(lang);
+        }
+        if (lang == null || lang.isEmpty() || country == null || country.isEmpty()) {
+            return "C.UTF-8";
+        }
+        return lang + "_" + country + ".UTF-8";
+    }
+
+    private static String ensureEncoding(String value) {
+        int dot = value.indexOf('.');
+        if (dot >= 0) return value;
+        return value + ".UTF-8";
+    }
+
+    private static String defaultCountryFor(String lang) {
+        if (lang == null) return null;
+        switch (lang) {
+            case "en": return "US";
+            case "da": return "DK";
+            case "de": return "DE";
+            case "es": return "ES";
+            case "fr": return "FR";
+            case "it": return "IT";
+            case "ko": return "KR";
+            case "pl": return "PL";
+            case "pt": return "BR";
+            case "ro": return "RO";
+            case "uk": return "UA";
+            case "ja": return "JP";
+            case "ru": return "RU";
+            case "ar": return "EG";
+            case "zh": return "CN";
+            default: return null;
+        }
+    }
+}
diff --git a/app/src/main/runtime/wine/MSLink.java b/app/src/main/runtime/wine/MSLink.java
index 3085108dc..0aa672edf 100644
--- a/app/src/main/runtime/wine/MSLink.java
+++ b/app/src/main/runtime/wine/MSLink.java
@@ -243,13 +243,22 @@ public static boolean createDesktopFile(File lnkFile, Context context, Container
       File containerRootDir = container != null ? container.getRootDir() : new File(imageFs.getRootDir(), "home/" + ImageFs.USER);
       winePrefix = new File(containerRootDir, ".wine").getAbsolutePath();
 
-      // PEACFUL UPGRADE: If getNativePath failed (common during first creation), 
+      // PEACFUL UPGRADE: If getNativePath failed (common during first creation),
       // calculate the Absolute Android Path math immediately so we have the parent folder.
       if (exeFile == null || !exeFile.exists()) {
         String relPath = windowsPath.substring(2).replace("\\", "/");
         while (relPath.startsWith("/")) relPath = relPath.substring(1);
         exeFile = new File(containerRootDir, ".wine/drive_c/" + relPath);
       }
+    } else if (windowsPath.matches("^[zZ]:.*")) {
+      File containerRootDir = container != null ? container.getRootDir() : new File(imageFs.getRootDir(), "home/" + ImageFs.USER);
+      winePrefix = new File(containerRootDir, ".wine").getAbsolutePath();
+
+      if (exeFile == null || !exeFile.exists()) {
+        String relPath = windowsPath.substring(2).replace("\\", "/");
+        while (relPath.startsWith("/")) relPath = relPath.substring(1);
+        exeFile = new File(imageFs.getRootDir(), relPath);
+      }
     }
 
     File desktopFile =
@@ -269,21 +278,6 @@ public static boolean createDesktopFile(File lnkFile, Context context, Container
 
       if (PeIconExtractor.INSTANCE.extractAndSave(exeFile, iconOutFile)) {
         customLibraryIconPath = iconOutFile.getAbsolutePath();
-      } else {
-        File gameDir = exeFile.isDirectory() ? exeFile : exeFile.getParentFile();
-        if (gameDir != null && gameDir.exists()) {
-          File[] candidates =
-              gameDir.listFiles(
-                  (dir, name_dir) -> {
-                    String lower = name_dir.toLowerCase();
-                    return lower.endsWith(".jpg")
-                        || lower.endsWith(".jpeg")
-                        || lower.endsWith(".png");
-                  });
-          if (candidates != null && candidates.length > 0) {
-            customLibraryIconPath = candidates[0].getAbsolutePath();
-          }
-        }
       }
     }
 
diff --git a/app/src/main/runtime/wine/PeIconExtractor.kt b/app/src/main/runtime/wine/PeIconExtractor.kt
index a988575c5..4d7cfcb96 100644
--- a/app/src/main/runtime/wine/PeIconExtractor.kt
+++ b/app/src/main/runtime/wine/PeIconExtractor.kt
@@ -63,7 +63,6 @@ object PeIconExtractor {
         val resSize = readInt(raf)
         if (resRva == 0 || resSize == 0) return null
 
-        // Read section headers to find the one containing the resource RVA
         val sectionStart = optHeaderPos + optHeaderSize
         raf.seek(sectionStart)
         var resFileOffset = 0L
@@ -82,18 +81,15 @@ object PeIconExtractor {
         }
         if (resFileOffset == 0L) return null
 
-        // Read entire resource section into a buffer for easier navigation
         raf.seek(resFileOffset)
         val resBuf = ByteArray(resSize)
         raf.readFully(resBuf)
         val bb = ByteBuffer.wrap(resBuf).order(ByteOrder.LITTLE_ENDIAN)
 
-        // Parse root resource directory to find RT_GROUP_ICON (14) and RT_ICON (3)
         val groupIconEntries = findResourceType(bb, 0, 14) // RT_GROUP_ICON
         val iconEntries = findResourceType(bb, 0, 3) // RT_ICON
         if (groupIconEntries.isEmpty()) return null
 
-        // Read the first GROUP_ICON resource
         val grpDataRva = resolveToDataEntry(bb, groupIconEntries[0])
         if (grpDataRva == null) return null
 
@@ -101,14 +97,12 @@ object PeIconExtractor {
         val grpSize = grpDataRva.second
         if (grpFileOff < 0 || grpFileOff + grpSize > resBuf.size) return null
 
-        // Parse GRPICONDIR
         bb.position(grpFileOff)
         bb.short // reserved
         bb.short // type
         val count = bb.short.toInt() and 0xFFFF
         if (count == 0) return null
 
-        // Find the largest icon entry
         data class GrpEntry(
             val w: Int,
             val h: Int,
diff --git a/app/src/main/runtime/wine/WineThemeManager.java b/app/src/main/runtime/wine/WineThemeManager.java
index 2c6634ba4..4eddffb8a 100644
--- a/app/src/main/runtime/wine/WineThemeManager.java
+++ b/app/src/main/runtime/wine/WineThemeManager.java
@@ -22,6 +22,7 @@ public enum Theme {
 
   public enum BackgroundType {
     IMAGE,
+    ORIGINAL,
     COLOR
   }
 
@@ -56,11 +57,11 @@ public static void apply(Context context, ThemeInfo themeInfo, ScreenInfo screen
             + " "
             + Color.blue(themeInfo.backgroundColor);
 
-    if (themeInfo.backgroundType == BackgroundType.IMAGE)
-      createWallpaperBMPFile(context, screenInfo);
+    if (themeInfo.backgroundType != BackgroundType.COLOR)
+      createWallpaperBMPFile(context, screenInfo, themeInfo.backgroundType);
 
     try (WineRegistryEditor registryEditor = new WineRegistryEditor(userRegFile)) {
-      if (themeInfo.backgroundType == BackgroundType.IMAGE) {
+      if (themeInfo.backgroundType != BackgroundType.COLOR) {
         registryEditor.setStringValue(
             "Control Panel\\Desktop", "Wallpaper", ImageFs.CACHE_PATH + "/wallpaper.bmp");
       } else registryEditor.removeValue("Control Panel\\Desktop", "Wallpaper");
@@ -133,7 +134,8 @@ public static void apply(Context context, ThemeInfo themeInfo, ScreenInfo screen
     }
   }
 
-  private static void createWallpaperBMPFile(Context context, ScreenInfo screenInfo) {
+  private static void createWallpaperBMPFile(
+      Context context, ScreenInfo screenInfo, BackgroundType backgroundType) {
     final int outputHeight = screenInfo.height;
     int outputWidth = screenInfo.width;
 
@@ -142,28 +144,21 @@ private static void createWallpaperBMPFile(Context context, ScreenInfo screenInf
     Canvas canvas = new Canvas(outputBitmap);
 
     File userWallpaperFile = getUserWallpaperFile(context);
-    if (userWallpaperFile.isFile()) {
+    if (backgroundType == BackgroundType.ORIGINAL) {
+      drawOriginalWallpaper(context, canvas, paint, outputWidth, outputHeight);
+    } else if (userWallpaperFile.isFile()) {
       Bitmap image = BitmapFactory.decodeFile(userWallpaperFile.getPath());
       Rect srcRect = new Rect(0, 0, image.getWidth(), image.getHeight());
       Rect dstRect = new Rect(0, 0, outputWidth, outputHeight);
       canvas.drawBitmap(image, srcRect, dstRect, paint);
     } else {
       BitmapFactory.Options options = new BitmapFactory.Options();
-      options.inTargetDensity = DisplayMetrics.DENSITY_HIGH;
-      Bitmap wallpaperBitmap =
-          BitmapFactory.decodeResource(context.getResources(), R.drawable.wallpaper, options);
-      paint.setStyle(Paint.Style.FILL);
-      paint.setColor(0xff01579b);
-      canvas.drawRect(0, 0, outputWidth, outputHeight * 0.5f, paint);
-      paint.setColor(0xff0277bd);
-      canvas.drawRect(0, outputHeight * 0.5f, outputWidth, outputHeight, paint);
-
-      float targetSize = outputHeight * (320.0f / 480.0f);
-      float centerX = (outputWidth - targetSize) * 0.5f;
-      float centerY = (outputHeight - targetSize) * 0.5f;
-      Rect srcRect = new Rect(0, 0, wallpaperBitmap.getWidth(), wallpaperBitmap.getHeight());
-      RectF dstRect = new RectF(centerX, centerY, centerX + targetSize, centerY + targetSize);
-      canvas.drawBitmap(wallpaperBitmap, srcRect, dstRect, paint);
+      options.inScaled = false;
+      Bitmap image =
+          BitmapFactory.decodeResource(context.getResources(), R.drawable.wallpaper_default, options);
+      Rect srcRect = new Rect(0, 0, image.getWidth(), image.getHeight());
+      Rect dstRect = new Rect(0, 0, outputWidth, outputHeight);
+      canvas.drawBitmap(image, srcRect, dstRect, paint);
     }
 
     ImageFs imageFs = ImageFs.find(context);
@@ -171,6 +166,26 @@ private static void createWallpaperBMPFile(Context context, ScreenInfo screenInf
         outputBitmap, new File(imageFs.getRootDir(), ImageFs.CACHE_PATH + "/wallpaper.bmp"));
   }
 
+  private static void drawOriginalWallpaper(
+      Context context, Canvas canvas, Paint paint, int outputWidth, int outputHeight) {
+    BitmapFactory.Options options = new BitmapFactory.Options();
+    options.inTargetDensity = DisplayMetrics.DENSITY_HIGH;
+    Bitmap wallpaperBitmap =
+        BitmapFactory.decodeResource(context.getResources(), R.drawable.wallpaper, options);
+    paint.setStyle(Paint.Style.FILL);
+    paint.setColor(0xff01579b);
+    canvas.drawRect(0, 0, outputWidth, outputHeight * 0.5f, paint);
+    paint.setColor(0xff0277bd);
+    canvas.drawRect(0, outputHeight * 0.5f, outputWidth, outputHeight, paint);
+
+    float targetSize = outputHeight * (320.0f / 480.0f);
+    float centerX = (outputWidth - targetSize) * 0.5f;
+    float centerY = (outputHeight - targetSize) * 0.5f;
+    Rect srcRect = new Rect(0, 0, wallpaperBitmap.getWidth(), wallpaperBitmap.getHeight());
+    RectF dstRect = new RectF(centerX, centerY, centerX + targetSize, centerY + targetSize);
+    canvas.drawBitmap(wallpaperBitmap, srcRect, dstRect, paint);
+  }
+
   public static File getUserWallpaperFile(Context context) {
     return new File(
         ImageFs.find(context).getRootDir(), ImageFs.CONFIG_PATH + "/user-wallpaper.png");
diff --git a/app/src/main/runtime/wine/WineUtils.java b/app/src/main/runtime/wine/WineUtils.java
index 9e36fbad0..994336d9c 100644
--- a/app/src/main/runtime/wine/WineUtils.java
+++ b/app/src/main/runtime/wine/WineUtils.java
@@ -17,6 +17,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
@@ -46,15 +47,27 @@ public static String hostPathToMappedWinePath(
         if (relativePath.isEmpty()) return "C:\\";
         return "C:\\" + relativePath;
       }
+
+      String driveZRoot =
+          normalizeHostPath(new File(container.getRootDir(), "../..").getAbsolutePath());
+      if (pathStartsWith(normalizedHostPath, driveZRoot)) {
+        String relativePath = normalizedHostPath.substring(driveZRoot.length()).replace("/", "\\");
+        while (relativePath.startsWith("\\")) relativePath = relativePath.substring(1);
+        if (relativePath.isEmpty()) return "Z:\\";
+        return "Z:\\" + relativePath;
+      }
     }
 
     String bestDriveLetter = null;
     String bestDriveRoot = null;
 
-    String drives =
-        container != null && container.getDrives() != null
-            ? container.getDrives()
-            : Container.DEFAULT_DRIVES;
+    String drives = readDrivesFromPrefix(container);
+    if (drives.isEmpty()) {
+      drives =
+          container != null && container.getDrives() != null
+              ? container.getDrives()
+              : Container.DEFAULT_DRIVES;
+    }
 
     for (String[] drive : Container.drivesIterator(drives)) {
       if (drive.length < 2) continue;
@@ -92,6 +105,11 @@ private static String normalizeHostPath(String path) {
   }
 
   public static String normalizePersistentDrives(Context context, String drives) {
+    return normalizePersistentDrives(context, drives, true);
+  }
+
+  public static String normalizePersistentDrives(
+      Context context, String drives, boolean ensureDefaults) {
     List<String[]> entries = new ArrayList<>();
     LinkedHashSet<String> usedLetters = new LinkedHashSet<>();
     LinkedHashSet<String> usedPaths = new LinkedHashSet<>();
@@ -115,15 +133,17 @@ public static String normalizePersistentDrives(Context context, String drives) {
       }
     }
 
-    String downloadsPath =
-        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-            .getAbsolutePath();
-    String externalStoragePath = Environment.getExternalStorageDirectory().getAbsolutePath();
-
-    ensureDriveMapping(entries, usedLetters, usedPaths, "D", downloadsPath);
-    ensureDriveMapping(entries, usedLetters, usedPaths, "F", externalStoragePath);
-    for (String sdCardRootPath : getMountedSdCardRootPaths(context)) {
-      ensureDriveMapping(entries, usedLetters, usedPaths, "G", sdCardRootPath);
+    if (ensureDefaults) {
+      String downloadsPath =
+          Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+              .getAbsolutePath();
+      String externalStoragePath = Environment.getExternalStorageDirectory().getAbsolutePath();
+
+      ensureDriveMapping(entries, usedLetters, usedPaths, "D", downloadsPath);
+      ensureDriveMapping(entries, usedLetters, usedPaths, "F", externalStoragePath);
+      for (String sdCardRootPath : getMountedSdCardRootPaths(context)) {
+        ensureDriveMapping(entries, usedLetters, usedPaths, "G", sdCardRootPath);
+      }
     }
 
     StringBuilder normalized = new StringBuilder();
@@ -234,6 +254,7 @@ public static boolean isOnSdCard(String nativePath) {
   public static File ensureDriveCGameSymlink(
       Container container, String source, String gameInstallPath) {
     if (container == null || gameInstallPath == null || gameInstallPath.isEmpty()) return null;
+    if ("CUSTOM".equalsIgnoreCase(source)) return null;
 
     File gameDir = new File(gameInstallPath);
     if (!gameDir.exists()) return null;
@@ -358,72 +379,57 @@ private static boolean isSupportedDriveLetter(String letter) {
     return letter.length() == 1 && Character.isLetter(letter.charAt(0));
   }
 
-  public static void createDosdevicesSymlinks(
-      Container container, @Nullable String gameDirectoryPath, boolean exposeSteamGameLink) {
-    Log.d(
-        "ContainerLaunch",
-        "createDosdevicesSymlinks: rootDir="
-            + container.getRootDir().getAbsolutePath()
-            + " drives="
-            + container.getDrives()
-            + " gameDir="
-            + gameDirectoryPath);
+  // dosdevices is the source of truth for drives; c: and z: stay app-managed
+  public static String readDrivesFromPrefix(@Nullable Container container) {
+    if (container == null) return "";
     File dosdevicesDir = new File(container.getRootDir(), ".wine/dosdevices");
-    if (!dosdevicesDir.exists()) {
-      boolean created = dosdevicesDir.mkdirs();
-      Log.d("ContainerLaunch", "createDosdevicesSymlinks: created dosdevices dir=" + created);
-    }
-    String dosdevicesPath = dosdevicesDir.getPath();
     File[] files = dosdevicesDir.listFiles();
-    if (files != null) for (File file : files) if (file.getName().matches("[a-z]:")) file.delete();
+    if (files == null) return "";
 
-    FileUtils.symlink("../drive_c", dosdevicesPath + "/c:");
-    FileUtils.symlink(container.getRootDir().getPath() + "/../..", dosdevicesPath + "/z:");
+    List<String> names = new ArrayList<>();
+    for (File file : files) if (file.getName().matches("[a-z]:")) names.add(file.getName());
+    Collections.sort(names);
 
-    String packageStorageSuffix = "/com.winnative.cmod/storage";
-    String legacyPackageStorageSuffix = "/com.winlator.cmod/storage";
-    String packageStoragePath = "/data/data/com.winnative.cmod/storage";
-    Context context = null;
-    if (container.getManager() != null && container.getManager().getContext() != null) {
-      context = container.getManager().getContext();
-      String packageName = context.getPackageName();
-      packageStorageSuffix = "/" + packageName + "/storage";
-      packageStoragePath = "/data/data/" + packageName + "/storage";
-    }
+    StringBuilder drives = new StringBuilder();
+    for (String name : names) {
+      if (name.equals("c:") || name.equals("z:")) continue;
+      String target = FileUtils.readSymlink(new File(dosdevicesDir, name));
+      if (target.isEmpty()) continue;
 
-    if (context != null) {
-      String normalizedDrives = normalizePersistentDrives(context, container.getDrives());
-      if (normalizedDrives != null
-          && !normalizedDrives.isEmpty()
-          && !normalizedDrives.equals(container.getDrives())) {
-        container.setDrives(normalizedDrives);
-        Log.d("WineUtils", "Normalized launch drives in memory to: " + normalizedDrives);
+      String path = target;
+      if (!new File(target).isAbsolute()) {
+        File resolved = new File(dosdevicesDir, target);
+        try {
+          path = resolved.getCanonicalPath();
+        } catch (IOException e) {
+          path = resolved.getAbsolutePath();
+        }
       }
+      if (path.isEmpty() || path.contains(":")) continue;
+      drives.append(name.substring(0, 1).toUpperCase(Locale.ENGLISH)).append(':').append(path);
     }
+    return drives.toString();
+  }
 
-    // Auto-fix containers missing D: and E: drives.
-    // IMPORTANT: Only update in-memory drives — do NOT call container.saveData()
-    String currentDrives = container.getDrives();
-    if (currentDrives != null && (!currentDrives.contains("D:") || !currentDrives.contains("E:"))) {
-      Log.d("WineUtils", "Container missing D: or E: drives, appending them...");
-      StringBuilder updatedDrives = new StringBuilder(currentDrives);
-      if (!currentDrives.contains("D:")) {
-        updatedDrives
-            .append("D:")
-            .append(
-                android.os.Environment.getExternalStoragePublicDirectory(
-                    android.os.Environment.DIRECTORY_DOWNLOADS));
-      }
-      if (!currentDrives.contains("E:")) {
-        updatedDrives.append("E:").append(packageStoragePath);
-      }
-      container.setDrives(updatedDrives.toString());
-      Log.d("WineUtils", "Updated container drives (in-memory only) to: " + updatedDrives);
+  public static void applyDrivesToPrefix(@Nullable Container container, @Nullable String drives) {
+    if (container == null) return;
+    File dosdevicesDir = new File(container.getRootDir(), ".wine/dosdevices");
+    if (!dosdevicesDir.exists()) dosdevicesDir.mkdirs();
+    String dosdevicesPath = dosdevicesDir.getPath();
+
+    String packageStorageSuffix = "/com.winnative.cmod/storage";
+    String legacyPackageStorageSuffix = "/com.winlator.cmod/storage";
+    if (container.getManager() != null && container.getManager().getContext() != null) {
+      packageStorageSuffix =
+          "/" + container.getManager().getContext().getPackageName() + "/storage";
     }
 
-    int driveCount = 0;
-    for (String[] drive : container.drivesIterator()) {
-      if ("A".equalsIgnoreCase(drive[0])) continue;
+    LinkedHashSet<String> applied = new LinkedHashSet<>();
+    for (String[] drive : Container.drivesIterator(drives != null ? drives : "")) {
+      if (drive.length < 2 || "A".equalsIgnoreCase(drive[0])) continue;
+      String letter = drive[0].toLowerCase(Locale.ENGLISH);
+      if (letter.equals("c") || letter.equals("z")) continue;
+
       String path = resolveReadableDrivePath(drive[1]);
       File linkTarget = new File(path);
       path = linkTarget.getAbsolutePath();
@@ -433,11 +439,44 @@ public static void createDosdevicesSymlinks(
         linkTarget.mkdirs();
         FileUtils.chmod(linkTarget, 0771);
       }
-      FileUtils.symlink(path, dosdevicesPath + "/" + drive[0].toLowerCase(Locale.ENGLISH) + ":");
-      Log.d("ContainerLaunch", "createDosdevicesSymlinks: " + drive[0] + ": -> " + path);
-      driveCount++;
+      FileUtils.symlink(path, dosdevicesPath + "/" + letter + ":");
+      applied.add(letter + ":");
+      Log.d("ContainerLaunch", "applyDrivesToPrefix: " + letter + ": -> " + path);
+    }
+
+    File[] files = dosdevicesDir.listFiles();
+    if (files != null)
+      for (File file : files) {
+        String name = file.getName();
+        if (!name.matches("[a-z]:") || name.equals("c:") || name.equals("z:")) continue;
+        if (!applied.contains(name)) file.delete();
+      }
+  }
+
+  public static void createDosdevicesSymlinks(
+      Container container, @Nullable String gameDirectoryPath, boolean exposeSteamGameLink) {
+    File dosdevicesDir = new File(container.getRootDir(), ".wine/dosdevices");
+    if (!dosdevicesDir.exists()) dosdevicesDir.mkdirs();
+    String dosdevicesPath = dosdevicesDir.getPath();
+
+    FileUtils.symlink("../drive_c", dosdevicesPath + "/c:");
+    FileUtils.symlink(container.getRootDir().getPath() + "/../..", dosdevicesPath + "/z:");
+
+    // the container config only seeds a prefix that has no drives yet
+    String drives = readDrivesFromPrefix(container);
+    Log.d("ContainerLaunch", "createDosdevicesSymlinks: entries=" + Arrays.toString(dosdevicesDir.list()) + " read=" + drives);
+    if (drives.isEmpty()) {
+      drives = container.getDrives();
+      Context context =
+          container.getManager() != null ? container.getManager().getContext() : null;
+      if (context != null) {
+        String normalizedDrives = normalizePersistentDrives(context, drives, false);
+        if (normalizedDrives != null && !normalizedDrives.isEmpty()) drives = normalizedDrives;
+      }
+      Log.d("ContainerLaunch", "createDosdevicesSymlinks: seeding fresh prefix with " + drives);
     }
-    Log.d("ContainerLaunch", "createDosdevicesSymlinks: created " + driveCount + " drive symlinks");
+
+    applyDrivesToPrefix(container, drives);
 
     // Only expose Steam's steamapps/common symlink for actual Steam launches.
     if (gameDirectoryPath != null && !gameDirectoryPath.isEmpty()) {
@@ -478,17 +517,6 @@ private static String toStorageAlias(String path) {
     return "/storage/" + uuid + rest;
   }
 
-  /**
-   * Ensures the steamapps/common/{gameName} symlink exists and points to the correct game install
-   * directory. This is critical for ColdClientLoader path resolution, especially when games are
-   * installed at custom download paths.
-   *
-   * <p>- Creates the symlink if it doesn't exist - Recreates if it exists but points to a different
-   * (stale) location - Also creates the _CommonRedist and steamapps directory structure
-   *
-   * @param container The container whose Wine prefix to modify
-   * @param gameDirectoryPath The actual path to the game install directory
-   */
   public static void ensureSteamappsCommonSymlink(Container container, String gameDirectoryPath) {
     if (gameDirectoryPath == null || gameDirectoryPath.isEmpty()) return;
 
@@ -510,8 +538,6 @@ public static void ensureSteamappsCommonSymlink(Container container, String game
       steamCommonDir.mkdirs();
     }
 
-    // Symlink steamapps/common/{gameName} -> actual game directory
-    // Always validate the symlink target matches the actual game path (handles custom paths)
     File steamGameLink = new File(steamCommonDir, gameName);
     boolean needsCreation = false;
     if (steamGameLink.exists() || isSymlink(steamGameLink)) {
@@ -553,9 +579,6 @@ public static void ensureSteamappsCommonSymlink(Container container, String game
               + canonicalGameDirectoryPath);
     }
 
-    // Keep Steamworks Shared/_CommonRedist writable inside the Wine prefix.
-    // Symlinking to the Android-backed game folder causes Steam's installscript.vdf
-    // writes to fail with "disk write error" for shared redistributables.
     File gameCommonRedist = new File(canonicalGameDirectory, "_CommonRedist");
     File steamworksSharedDir = new File(steamCommonDir, "Steamworks Shared");
     if (!steamworksSharedDir.exists()) {
@@ -663,14 +686,6 @@ public static void applySystemTweaks(Context context, WineInfo wineInfo) {
     File rootDir = ImageFs.find(context).getRootDir();
     File systemRegFile = new File(rootDir, ImageFs.WINEPREFIX + "/system.reg");
     File userRegFile = new File(rootDir, ImageFs.WINEPREFIX + "/user.reg");
-    File userCacheDir = new File(rootDir, "/home/xuser/.cache");
-    if (!userCacheDir.isDirectory()) {
-      userCacheDir.mkdirs();
-    }
-    File userConfigDir = new File(rootDir, "/home/xuser/.config");
-    if (!userConfigDir.isDirectory()) {
-      userConfigDir.mkdirs();
-    }
 
     try (WineRegistryEditor registryEditor = new WineRegistryEditor(systemRegFile)) {
       registryEditor.setStringValue("Software\\Classes\\.reg", null, "REGfile");
@@ -686,17 +701,6 @@ public static void applySystemTweaks(Context context, WineInfo wineInfo) {
           "Software\\Classes\\lnkfile\\DefaultIcon", null, "shell32.dll,-30");
       registryEditor.setStringValue(
           "Software\\Classes\\inifile\\DefaultIcon", null, "shell32.dll,-151");
-
-      // Set up system fonts if not already done
-      File corefontsAddedFile = new File(userConfigDir, "corefonts.added");
-      if (!corefontsAddedFile.isFile()) {
-        try {
-          setupSystemFonts(registryEditor);
-          FileUtils.writeString(corefontsAddedFile, String.valueOf(System.currentTimeMillis()));
-        } catch (Throwable th) {
-          Log.e("WineUtils", "Failed to setup system fonts", th);
-        }
-      }
     }
 
     final String[] direct3dLibs = {
@@ -712,12 +716,7 @@ public static void applySystemTweaks(Context context, WineInfo wineInfo) {
       "dxgi",
       "wined3d"
     };
-    // evshim creates SDL virtual joysticks that Wine picks up through winebus,
-    // so Wine's builtin dinput/xinput path should stay preferred on all arches.
-    final String[] dinputLibs = {"dinput", "dinput8"};
-    final String[] xinputLibs = {
-      "xinput1_1", "xinput1_2", "xinput1_3", "xinput1_4", "xinput9_1_0", "xinputuap"
-    };
+    final String[] dinputLibs = {"dinput"};
 
     final String dllOverridesKey = "Software\\Wine\\DllOverrides";
 
@@ -725,9 +724,7 @@ public static void applySystemTweaks(Context context, WineInfo wineInfo) {
       for (String name : direct3dLibs)
         registryEditor.setStringValue(dllOverridesKey, name, "native,builtin");
       for (String name : dinputLibs)
-        registryEditor.setStringValue(dllOverridesKey, name, "builtin,native");
-      for (String name : xinputLibs)
-        registryEditor.setStringValue(dllOverridesKey, name, "builtin,native");
+        registryEditor.setStringValue(dllOverridesKey, name, "native,builtin");
       // Conditional OpenGL override for ARM64EC (exclude Mali GPUs)
       if (wineInfo != null
           && wineInfo.isArm64EC()
@@ -741,15 +738,6 @@ public static void applySystemTweaks(Context context, WineInfo wineInfo) {
     copyWineDllsToContainer(rootDir, wineInfo);
   }
 
-  // Skipped on ARM64EC. The proton arm64ec wcp's container_pattern.tzst already seeded
-  // a consistent system32 plus matching winsxs/arm64_microsoft.windows.common-controls
-  // SXS assembly; overwriting user32/shell32 from wineInfo.path/lib/wine pairs them with
-  // a possibly-different proton's comctl32 inside winsxs, and Burn-based installers
-  // (vc_redist) then hit ERROR_CLASS_DOES_NOT_EXIST (0x583) at InitCommonControlsEx
-  // because the class atom tables disagree across builds — flash-and-exit "Failed to
-  // initialize theme manager". Winlator-Ludashi never copies these post-seed and vc_redist
-  // works there on the same proton wcp. wineboot's fakedll mechanism resolves missing
-  // system32 entries to wine builtins at load time, so a no-op is safe.
   private static void copyWineDllsToContainer(File rootDir, WineInfo wineInfo) {
     if (wineInfo == null || wineInfo.path == null || wineInfo.path.isEmpty()) return;
     if (wineInfo.isArm64EC()) {
@@ -783,45 +771,6 @@ private static void copyWineDllsToContainer(File rootDir, WineInfo wineInfo) {
     }
   }
 
-  private static final String[] XINPUT_DLLS = {
-    "xinput1_1.dll", "xinput1_2.dll", "xinput1_3.dll",
-    "xinput1_4.dll", "xinput9_1_0.dll", "xinputuap.dll"
-  };
-
-  public static void ensureControllerDllOverrides(Container container) {
-    if (container == null) return;
-
-    File userRegFile = new File(container.getRootDir(), ".wine/user.reg");
-    if (!userRegFile.isFile()) return;
-
-    final String dllOverridesKey = "Software\\Wine\\DllOverrides";
-    final String[] dinputLibs = {"dinput", "dinput8"};
-
-    try (WineRegistryEditor registryEditor = new WineRegistryEditor(userRegFile)) {
-      for (String name : dinputLibs) {
-        if (!"builtin,native".equals(registryEditor.getStringValue(dllOverridesKey, name, ""))) {
-          registryEditor.setStringValue(dllOverridesKey, name, "builtin,native");
-        }
-      }
-
-      for (String dll : XINPUT_DLLS) {
-        String name = dll.substring(0, dll.length() - 4);
-        if (!"builtin,native".equals(registryEditor.getStringValue(dllOverridesKey, name, ""))) {
-          registryEditor.setStringValue(dllOverridesKey, name, "builtin,native");
-        }
-      }
-    }
-  }
-
-  // Pre-seed the VC++ 2015-2022 redistributable registry markers when the proton
-  // wcp has already laid down the runtime DLLs (msvcp140, vcruntime140, etc.) in
-  // system32. Without these registry keys vc_redist's Burn bootstrapper sees
-  // "not installed" and tries to run its installer UI; on Wine ARM64EC its theme
-  // manager init fails (ERROR_CLASS_DOES_NOT_EXIST 0x583) and the installer
-  // exits without doing anything. Game prerequisite checkers read the same keys,
-  // so seeding them is also what unblocks games that gate on "VC++ redist
-  // installed" before launching.
-  // The DLLs are genuinely present, so we are recording fact, not faking state.
   public static void seedVcRedistRegistryIfDllsPresent(File containerRootDir, boolean isArm64EC) {
     File system32 = new File(containerRootDir, ".wine/drive_c/windows/system32");
     if (!new File(system32, "msvcp140.dll").isFile()
@@ -836,105 +785,141 @@ public static void seedVcRedistRegistryIfDllsPresent(File containerRootDir, bool
       return;
     }
 
-    // Microsoft's published current VC++ 2015-2022 14.50 redist build (matches
-    // what vc_redist 14.50.35719 self-identifies as).
-    final String version = "14.50.35719.0";
-    final int major = 14, minor = 50, build = 35719, rebuild = 0;
-
     String[] runtimeArches = isArm64EC ? new String[] {"X64", "ARM64"} : new String[] {"X64", "X86"};
 
-    try (WineRegistryEditor reg = new WineRegistryEditor(systemRegFile)) {
-      for (String arch : runtimeArches) {
-        String k = "Software\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\" + arch;
-        reg.setDwordValue(k, "Installed", 1);
-        reg.setStringValue(k, "Version", "v" + version);
-        reg.setDwordValue(k, "Major", major);
-        reg.setDwordValue(k, "Minor", minor);
-        reg.setDwordValue(k, "Bld", build);
-        reg.setDwordValue(k, "Rbld", rebuild);
-
-        // Same under Wow6432Node so 32-bit consumers see it too.
-        String k32 = "Software\\Wow6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\" + arch;
-        reg.setDwordValue(k32, "Installed", 1);
-        reg.setStringValue(k32, "Version", "v" + version);
-        reg.setDwordValue(k32, "Major", major);
-        reg.setDwordValue(k32, "Minor", minor);
-        reg.setDwordValue(k32, "Bld", build);
-        reg.setDwordValue(k32, "Rbld", rebuild);
-      }
+    if (seedVcRedistBatched(systemRegFile, runtimeArches, isArm64EC)) {
+      Log.i("WineUtils", "seedVcRedistRegistryIfDllsPresent: wrote VC++ 14.50 markers (batched, arches="
+          + java.util.Arrays.toString(runtimeArches) + ")");
+      return;
+    }
 
-      // Burn bundle dependency providers: vc_redist consults these to decide
-      // "already installed" and exits cleanly if present.
-      String[] bundleKeys = isArm64EC
-          ? new String[] {"VC,redist.x64,amd64,14.50,bundle", "VC,redist.arm64,arm64,14.50,bundle"}
-          : new String[] {"VC,redist.x64,amd64,14.50,bundle", "VC,redist.x86,x86,14.50,bundle"};
-      for (String bundle : bundleKeys) {
-        String k = "Software\\Classes\\Installer\\Dependencies\\" + bundle;
-        reg.setStringValue(k, "Version", version);
-        reg.setStringValue(k, "DisplayName", "Microsoft Visual C++ 2015-2022 Redistributable");
-      }
+    try (WineRegistryEditor reg = new WineRegistryEditor(systemRegFile)) {
+      seedVcRedistWithEditor(reg, runtimeArches, isArm64EC);
     }
-    Log.i("WineUtils", "seedVcRedistRegistryIfDllsPresent: wrote VC++ 14.50 markers (arches="
+    Log.i("WineUtils", "seedVcRedistRegistryIfDllsPresent: wrote VC++ 14.50 markers (fallback, arches="
         + java.util.Arrays.toString(runtimeArches) + ")");
   }
 
-  /** Registers core Windows fonts and Wine fonts in the registry. */
-  private static void setupSystemFonts(WineRegistryEditor registryEditor) {
-    Log.d("WineUtils", "Setting up system fonts");
-    String[][] corefonts = {
-      {"Andale Mono (TrueType)", "andalemo.ttf"},
-      {"Arial (TrueType)", "arial.ttf"},
-      {"Arial Black (TrueType)", "ariblk.ttf"},
-      {"Arial Bold (TrueType)", "arialbd.ttf"},
-      {"Arial Bold Italic (TrueType)", "arialbi.ttf"},
-      {"Arial Italic (TrueType)", "ariali.ttf"},
-      {"Comic Sans MS (TrueType)", "comic.ttf"},
-      {"Comic Sans MS Bold (TrueType)", "comicbd.ttf"},
-      {"Courier New (TrueType)", "cour.ttf"},
-      {"Courier New Bold (TrueType)", "courbd.ttf"},
-      {"Courier New Bold Italic (TrueType)", "courbi.ttf"},
-      {"Courier New Italic (TrueType)", "couri.ttf"},
-      {"Georgia (TrueType)", "georgia.ttf"},
-      {"Georgia Bold (TrueType)", "georgiab.ttf"},
-      {"Georgia Bold Italic (TrueType)", "georgiaz.ttf"},
-      {"Georgia Italic (TrueType)", "georgiai.ttf"},
-      {"Impact (TrueType)", "impact.ttf"},
-      {"Times New Roman (TrueType)", "times.ttf"},
-      {"Times New Roman Bold (TrueType)", "timesbd.ttf"},
-      {"Times New Roman Bold Italic (TrueType)", "timesbi.ttf"},
-      {"Times New Roman Italic (TrueType)", "timesi.ttf"},
-      {"Trebuchet MS (TrueType)", "trebuc.ttf"},
-      {"Trebuchet MS Bold (TrueType)", "trebucbd.ttf"},
-      {"Trebuchet MS Bold Italic (TrueType)", "trebucbi.ttf"},
-      {"Trebuchet MS Italic (TrueType)", "trebucit.ttf"},
-      {"Verdana (TrueType)", "verdana.ttf"},
-      {"Verdana Bold (TrueType)", "verdanab.ttf"},
-      {"Verdana Bold Italic (TrueType)", "verdanaz.ttf"},
-      {"Verdana Italic (TrueType)", "verdanai.ttf"},
-      {"Webdings (TrueType)", "webdings.ttf"}
-    };
-    for (String[] font : corefonts) {
-      registryEditor.setStringValue(
-          "Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", font[0], font[1]);
-      registryEditor.setStringValue(
-          "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", font[0], font[1]);
+  private static final String VC_REDIST_VERSION = "14.50.35719.0";
+
+  private static String[] vcRedistBundleKeys(boolean isArm64EC) {
+    return isArm64EC
+        ? new String[] {"VC,redist.x64,amd64,14.50,bundle", "VC,redist.arm64,arm64,14.50,bundle"}
+        : new String[] {"VC,redist.x64,amd64,14.50,bundle", "VC,redist.x86,x86,14.50,bundle"};
+  }
+
+  private static void seedVcRedistWithEditor(
+      WineRegistryEditor reg, String[] runtimeArches, boolean isArm64EC) {
+    final String version = VC_REDIST_VERSION;
+    final int major = 14, minor = 50, build = 35719, rebuild = 0;
+    for (String arch : runtimeArches) {
+      String k = "Software\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\" + arch;
+      reg.setDwordValue(k, "Installed", 1);
+      reg.setStringValue(k, "Version", "v" + version);
+      reg.setDwordValue(k, "Major", major);
+      reg.setDwordValue(k, "Minor", minor);
+      reg.setDwordValue(k, "Bld", build);
+      reg.setDwordValue(k, "Rbld", rebuild);
+
+      String k32 = "Software\\Wow6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\" + arch;
+      reg.setDwordValue(k32, "Installed", 1);
+      reg.setStringValue(k32, "Version", "v" + version);
+      reg.setDwordValue(k32, "Major", major);
+      reg.setDwordValue(k32, "Minor", minor);
+      reg.setDwordValue(k32, "Bld", build);
+      reg.setDwordValue(k32, "Rbld", rebuild);
     }
+    for (String bundle : vcRedistBundleKeys(isArm64EC)) {
+      String k = "Software\\Classes\\Installer\\Dependencies\\" + bundle;
+      reg.setStringValue(k, "Version", version);
+      reg.setStringValue(k, "DisplayName", "Microsoft Visual C++ 2015-2022 Redistributable");
+    }
+  }
 
-    String[][] wineFonts = {
-      {"Marlett (TrueType)", "Z:\\opt\\wine\\share\\wine\\fonts\\marlett.ttf"},
-      {"Symbol (TrueType)", "Z:\\opt\\wine\\share\\wine\\fonts\\symbol.ttf"},
-      {"Tahoma (TrueType)", "Z:\\opt\\wine\\share\\wine\\fonts\\tahoma.ttf"},
-      {"Tahoma Bold (TrueType)", "Z:\\opt\\wine\\share\\wine\\fonts\\tahomabd.ttf"},
-      {"Wingdings (TrueType)", "Z:\\opt\\wine\\share\\wine\\fonts\\wingding.ttf"}
-    };
-    for (String[] font : wineFonts) {
-      registryEditor.setStringValue(
-          "Software\\Microsoft\\Windows\\CurrentVersion\\Fonts", font[0], font[1]);
-      registryEditor.setStringValue(
-          "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", font[0], font[1]);
+  private static boolean seedVcRedistBatched(
+      File systemRegFile, String[] runtimeArches, boolean isArm64EC) {
+    File temp = null;
+    try {
+      String block = buildVcRedistRegBlock(runtimeArches, isArm64EC);
+      temp =
+          FileUtils.createTempFile(
+              systemRegFile.getParentFile(), FileUtils.getBasename(systemRegFile.getPath()));
+      if (temp == null || !FileUtils.copy(systemRegFile, temp)) return false;
+      try (java.io.BufferedWriter w =
+          new java.io.BufferedWriter(new java.io.FileWriter(temp, true))) {
+        w.write(block);
+      }
+      try (WineRegistryEditor reg = new WineRegistryEditor(temp)) {
+        for (String arch : runtimeArches) {
+          Integer v =
+              reg.getDwordValue(
+                  "Software\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\" + arch, "Installed");
+          if (v == null || v != 1) return false;
+        }
+      }
+      return temp.renameTo(systemRegFile);
+    } catch (Exception e) {
+      Log.w("WineUtils", "seedVcRedistBatched failed; falling back to per-value seed", e);
+      return false;
+    } finally {
+      if (temp != null && temp.exists()) temp.delete();
     }
   }
 
+  private static String buildVcRedistRegBlock(String[] runtimeArches, boolean isArm64EC) {
+    final String version = VC_REDIST_VERSION;
+    StringBuilder sb = new StringBuilder();
+    for (String arch : runtimeArches) {
+      String[] bases = {
+        "Software\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\",
+        "Software\\Wow6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\"
+      };
+      for (String base : bases) {
+        appendRegKeyHeader(sb, base + arch);
+        appendRegDword(sb, "Installed", 1);
+        appendRegString(sb, "Version", "v" + version);
+        appendRegDword(sb, "Major", 14);
+        appendRegDword(sb, "Minor", 50);
+        appendRegDword(sb, "Bld", 35719);
+        appendRegDword(sb, "Rbld", 0);
+      }
+    }
+    for (String bundle : vcRedistBundleKeys(isArm64EC)) {
+      appendRegKeyHeader(sb, "Software\\Classes\\Installer\\Dependencies\\" + bundle);
+      appendRegString(sb, "Version", version);
+      appendRegString(sb, "DisplayName", "Microsoft Visual C++ 2015-2022 Redistributable");
+    }
+    return sb.toString();
+  }
+
+  private static void appendRegKeyHeader(StringBuilder sb, String key) {
+    long ticks1601To1970 = 86400L * (369 * 365 + 89) * 10000000;
+    long currentTime = System.currentTimeMillis() + ticks1601To1970;
+    sb.append("\n[")
+        .append(escapeReg(key))
+        .append("] ")
+        .append((currentTime - ticks1601To1970) / 1000)
+        .append(
+            String.format(
+                java.util.Locale.ENGLISH, "\n#time=%x%08x", currentTime >> 32, (int) currentTime))
+        .append("\n");
+  }
+
+  private static void appendRegDword(StringBuilder sb, String name, int value) {
+    sb.append("\n\"")
+        .append(escapeReg(name))
+        .append("\"=dword:")
+        .append(String.format(java.util.Locale.ENGLISH, "%08x", value));
+  }
+
+  private static void appendRegString(StringBuilder sb, String name, String value) {
+    sb.append("\n\"").append(escapeReg(name)).append("\"=\"").append(escapeReg(value)).append("\"");
+  }
+
+  private static String escapeReg(String s) {
+    return s.replace("\\", "\\\\").replace("\"", "\\\"");
+  }
+
   public static void overrideWinComponentDlls(
       Context context, Container container, String identifier, boolean useNative) {
     final String dllOverridesKey = "Software\\Wine\\DllOverrides";
@@ -949,6 +934,8 @@ public static void overrideWinComponentDlls(
         String dlname = dlnames.getString(i);
         if (useNative) {
           registryEditor.setStringValue(dllOverridesKey, dlname, "native,builtin");
+        } else if (identifier.equals("dinput8")) {
+          registryEditor.setStringValue(dllOverridesKey, dlname, "builtin");
         } else registryEditor.removeValue(dllOverridesKey, dlname);
       }
     } catch (JSONException e) {
@@ -1353,6 +1340,7 @@ public static void changeServicesStatus(Container container, String startupSelec
       "FontCache3.0.0.0:3",
       "HTTP:3",
       "LanmanServer:3",
+      "MountMgr:2",
       "MSIServer:3",
       "NDIS:2",
       "nsiproxy:3",
@@ -1371,6 +1359,8 @@ public static void changeServicesStatus(Container container, String startupSelec
       "Winmgmt:3",
       "wuauserv:3"
     };
+    final List<String> controllerCriticalServices =
+        Arrays.asList("winebus", "winehid", "MountMgr", "PlugPlay", "RpcSs");
     File systemRegFile = new File(container.getRootDir(), ".wine/system.reg");
     byte selection = 0;
     try {
@@ -1384,22 +1374,23 @@ public static void changeServicesStatus(Container container, String startupSelec
       for (String service : aggressiveServices) {
         String name = service.substring(0, service.indexOf(":"));
         int value = Character.getNumericValue(service.charAt(service.length() - 1));
-        if (selection == 1) {
-          if (servicesList.contains(service)
-              && !name.equals("winebus")
-              && !name.equals("winehid")
-              && !name.equals("PlugPlay")) {
+        if (controllerCriticalServices.contains(name)) {
+          value = 2;
+        } else if (selection == 1) {
+          if (servicesList.contains(service)) {
             value = 4;
           }
-        } else if (selection == 2
-            && !name.equals("winebus")
-            && !name.equals("winehid")
-            && !name.equals("PlugPlay")) {
+        } else if (selection == 2) {
           value = 4;
         }
+        if (name.equalsIgnoreCase("NDIS")) {
+          name = "Ndis";
+          value = selection == 2 ? 4 : 2;
+        }
         registryEditor.setDwordValue(
             "System\\CurrentControlSet\\Services\\" + name, "Start", value);
         registryEditor.setDwordValue("System\\ControlSet001\\Services\\" + name, "Start", value);
+        registryEditor.setDwordValue("System\\ControlSet002\\Services\\" + name, "Start", value);
       }
       registryEditor.close();
     } finally {
@@ -1427,12 +1418,6 @@ public static void setJoystickRegistryKeys(
     }
   }
 
-  /**
-   * Ensures winebus is configured correctly for the fake-input mechanism on every launch. Runs
-   * unconditionally so pre-existing containers are repaired. 1. Removes stale WINEBUS device
-   * entries (phantom VID_845E devices). 2. Sets DisableHidraw=1 so Proton winebus uses evdev
-   * (hooked by libfakeinput).
-   */
   public static void ensureWinebusConfig(Container container) {
     File systemRegFile = new File(container.getRootDir(), ".wine/system.reg");
     if (!systemRegFile.exists()) return;
@@ -1452,18 +1437,6 @@ public static void ensureWinebusConfig(Container container) {
     }
   }
 
-  public static void setJoystickRegistryKeys(File userRegFile, boolean enable) {
-    String value = enable ? "override" : "disabled";
-    try (WineRegistryEditor registryEditor = new WineRegistryEditor(userRegFile)) {
-      for (int i = 0; i < 4; i++) {
-        registryEditor.setStringValue(
-            "Software\\Wine\\DirectInput\\Joysticks", "Generic HID Gamepad " + i, value);
-        registryEditor.setStringValue(
-            "Software\\Wine\\DirectInput\\Joysticks", "ric HID Gamepad " + i, value);
-      }
-    }
-  }
-
   public static File getNativePath(Container container, ImageFs imageFs, String winPath) {
     if (winPath == null || winPath.isEmpty()) return null;
     String path = winPath.replace("\\", "/");
@@ -1485,6 +1458,10 @@ public static File getNativePath(Container container, ImageFs imageFs, String wi
       if (drive.equals("c")) {
         return new File(homePrefix, ".wine/drive_c/" + relPath);
       }
+      // Direct drive_z fallback (Z: maps to the imageFs root)
+      if (drive.equals("z")) {
+        return new File(imageFs.getRootDir(), relPath);
+      }
     }
     return new File(imageFs.getRootDir(), path);
   }
diff --git a/app/src/main/rust/wn-steam-tools/.gitignore b/app/src/main/rust/wn-steam-tools/.gitignore
new file mode 100644
index 000000000..2f7896d1d
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/app/src/main/rust/wn-steam-tools/Cargo.lock b/app/src/main/rust/wn-steam-tools/Cargo.lock
new file mode 100644
index 000000000..b8e7ce87e
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/Cargo.lock
@@ -0,0 +1,16 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "wn-steam-tools"
+version = "0.1.0"
+dependencies = [
+ "libc",
+]
diff --git a/app/src/main/rust/wn-steam-tools/Cargo.toml b/app/src/main/rust/wn-steam-tools/Cargo.toml
new file mode 100644
index 000000000..087356450
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "wn-steam-tools"
+version = "0.1.0"
+edition = "2021"
+license = "GPL-3.0-or-later"
+publish = false
+
+[lib]
+name = "winnative_setxid_noop"
+crate-type = ["cdylib"]
+
+[[bin]]
+name = "winnative_steamwebhelper_wrapper"
+path = "src/bin/winnative_steamwebhelper_wrapper.rs"
+
+[[bin]]
+name = "winnative_driverquery_noop"
+path = "src/bin/winnative_driverquery_noop.rs"
+
+[dependencies]
+libc = "0.2"
+
+[profile.release]
+codegen-units = 1
+lto = "thin"
+strip = "symbols"
diff --git a/app/src/main/rust/wn-steam-tools/build-linux-glibc.sh b/app/src/main/rust/wn-steam-tools/build-linux-glibc.sh
new file mode 100644
index 000000000..b06a7c70b
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/build-linux-glibc.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd "$(dirname "$0")/../../../../.."
+
+if [ -f "$HOME/.cargo/env" ]; then
+    # shellcheck disable=SC1091
+    . "$HOME/.cargo/env"
+fi
+
+target="aarch64-unknown-linux-gnu"
+asset_dir="app/src/main/assets/xvfb-arm64"
+manifest="app/src/main/rust/wn-steam-tools/Cargo.toml"
+target_dir="app/src/main/rust/wn-steam-tools/target"
+
+if ! command -v cargo >/dev/null 2>&1; then
+    echo "cargo not found. Install Rust with: curl https://sh.rustup.rs -sSf | sh" >&2
+    exit 1
+fi
+if ! rustup target list --installed | grep -qx "$target"; then
+    rustup target add "$target"
+fi
+if ! command -v aarch64-linux-gnu-gcc >/dev/null 2>&1; then
+    echo "aarch64-linux-gnu-gcc not found. On Debian/Ubuntu install: sudo apt install gcc-aarch64-linux-gnu" >&2
+    exit 1
+fi
+
+export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER:-aarch64-linux-gnu-gcc}"
+
+RUSTFLAGS="-C target-feature=+crt-static" cargo build --release --target "$target" --manifest-path "$manifest" \
+    --bin winnative_steamwebhelper_wrapper \
+    --bin winnative_driverquery_noop
+cargo build --release --target "$target" --manifest-path "$manifest" --lib
+
+mkdir -p "$asset_dir"
+cp -f "$target_dir/$target/release/winnative_steamwebhelper_wrapper" \
+    "$asset_dir/winnative-steamwebhelper-wrapper"
+cp -f "$target_dir/$target/release/winnative_driverquery_noop" \
+    "$asset_dir/winnative-driverquery-noop"
+cp -f "$target_dir/$target/release/libwinnative_setxid_noop.so" \
+    "$asset_dir/libwinnative-setxid-noop.so"
+
+if command -v aarch64-linux-gnu-strip >/dev/null 2>&1; then
+    aarch64-linux-gnu-strip \
+        "$asset_dir/winnative-steamwebhelper-wrapper" \
+        "$asset_dir/winnative-driverquery-noop" \
+        "$asset_dir/libwinnative-setxid-noop.so"
+fi
+
+sha256sum \
+    "$asset_dir/winnative-steamwebhelper-wrapper" \
+    "$asset_dir/winnative-driverquery-noop" \
+    "$asset_dir/libwinnative-setxid-noop.so"
diff --git a/app/src/main/rust/wn-steam-tools/src/bin/winnative_driverquery_noop.rs b/app/src/main/rust/wn-steam-tools/src/bin/winnative_driverquery_noop.rs
new file mode 100644
index 000000000..f328e4d9d
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/src/bin/winnative_driverquery_noop.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/app/src/main/rust/wn-steam-tools/src/bin/winnative_steamwebhelper_wrapper.rs b/app/src/main/rust/wn-steam-tools/src/bin/winnative_steamwebhelper_wrapper.rs
new file mode 100644
index 000000000..49aeeecf7
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/src/bin/winnative_steamwebhelper_wrapper.rs
@@ -0,0 +1,358 @@
+#[cfg(unix)]
+mod unix_impl {
+    use std::env;
+    use std::ffi::{CString, OsString};
+    use std::fs::{self, OpenOptions};
+    use std::os::fd::AsRawFd;
+    use std::os::unix::ffi::{OsStrExt, OsStringExt};
+    use std::os::unix::fs::OpenOptionsExt;
+    use std::path::{Path, PathBuf};
+
+    const PRELOAD_LIB: &str = "/lib/aarch64-linux-gnu/libwinnative-steamwebhelper-preload.so";
+
+    fn redirect_webhelper_log() {
+        let path = env::var_os("WINNATIVE_STEAMWEBHELPER_LOG")
+            .filter(|v| !v.is_empty())
+            .map(PathBuf::from)
+            .or_else(|| {
+                env::var_os("HOME")
+                    .filter(|v| !v.is_empty())
+                    .map(|home| Path::new(&home).join(".steam/steam/logs/steamwebhelper.log"))
+            })
+            .unwrap_or_else(|| PathBuf::from("/tmp/winnative-steamwebhelper.log"));
+
+        let Ok(file) = OpenOptions::new()
+            .create(true)
+            .append(true)
+            .mode(0o600)
+            .open(path)
+        else {
+            return;
+        };
+
+        unsafe {
+            libc::dup2(file.as_raw_fd(), libc::STDOUT_FILENO);
+            libc::dup2(file.as_raw_fd(), libc::STDERR_FILENO);
+        }
+    }
+
+    fn arg_has_prefix(args: &[OsString], prefix: &str) -> bool {
+        args.iter()
+            .skip(1)
+            .any(|arg| arg.as_bytes().starts_with(prefix.as_bytes()))
+    }
+
+    fn arg_exists(args: &[OsString], needle: &str) -> bool {
+        args.iter()
+            .skip(1)
+            .any(|arg| arg.as_bytes() == needle.as_bytes())
+    }
+
+    fn output_has_arg(args: &[OsString], needle: &str) -> bool {
+        args.iter().any(|arg| arg.as_bytes() == needle.as_bytes())
+    }
+
+    fn find_arg_value<'a>(args: &'a [OsString], prefix: &str) -> Option<&'a [u8]> {
+        args.iter().skip(1).find_map(|arg| {
+            let bytes = arg.as_bytes();
+            bytes
+                .starts_with(prefix.as_bytes())
+                .then(|| &bytes[prefix.len()..])
+        })
+    }
+
+    fn unlink_path_and_sidecar(path: &Path) {
+        let _ = fs::remove_file(path);
+        let mut sidecar = path.as_os_str().as_bytes().to_vec();
+        sidecar.extend_from_slice(b".winnative-readlink-target");
+        let _ = fs::remove_file(PathBuf::from(OsString::from_vec(sidecar)));
+    }
+
+    fn cleanup_process_singleton_state(args: &[OsString]) {
+        let Some(cache_dir) = find_arg_value(args, "-cachedir=") else {
+            return;
+        };
+        if cache_dir.is_empty() {
+            return;
+        }
+        let cache_dir = PathBuf::from(OsString::from_vec(cache_dir.to_vec()));
+        for name in ["SingletonCookie", "SingletonLock", "SingletonSocket"] {
+            unlink_path_and_sidecar(&cache_dir.join(name));
+        }
+        eprintln!(
+            "winnative steamwebhelper wrapper: cleared ProcessSingleton state in {}",
+            cache_dir.display()
+        );
+    }
+
+    fn is_visible_ui_launch() -> bool {
+        env::var_os("WINNATIVE_STEAM_VISIBLE_UI").as_deref() == Some("1".as_ref())
+    }
+
+    fn prepend_ld_preload(library: &str) {
+        match env::var("LD_PRELOAD") {
+            Ok(old) if old.contains(library) => {}
+            Ok(old) if !old.is_empty() => env::set_var("LD_PRELOAD", format!("{library}:{old}")),
+            _ => env::set_var("LD_PRELOAD", library),
+        }
+    }
+
+    fn should_skip_visible_ui_arg(arg: &[u8]) -> bool {
+        matches!(
+            arg,
+            b"--disable-gpu"
+                | b"--disable-gpu-compositing"
+                | b"--disable-gpu-rasterization"
+                | b"--disable-gpu-sandbox"
+                | b"--single-process"
+                | b"--ignore-gpu-blocklist"
+                | b"--valve-enable-site-isolation"
+                | b"--disable-software-rasterizer"
+        )
+    }
+
+    fn rewrite_visible_ui_arg(arg: &[u8]) -> Option<Option<OsString>> {
+        const ENABLE: &[u8] = b"--enable-features=";
+        const DISABLE: &[u8] = b"--disable-features=";
+
+        if let Some(features) = arg.strip_prefix(ENABLE) {
+            let kept = features
+                .split(|b| *b == b',')
+                .filter(|feature| *feature != b"V4L2VideoDecode")
+                .collect::<Vec<_>>();
+            if kept.is_empty() {
+                return Some(None);
+            }
+            let mut out = ENABLE.to_vec();
+            for (idx, feature) in kept.iter().enumerate() {
+                if idx > 0 {
+                    out.push(b',');
+                }
+                out.extend_from_slice(feature);
+            }
+            return Some(Some(OsString::from_vec(out)));
+        }
+
+        if arg.starts_with(DISABLE) {
+            if arg
+                .split(|b| *b == b',')
+                .any(|feature| feature == b"NotReachedIsFatal")
+            {
+                return None;
+            }
+            let mut out = arg.to_vec();
+            out.extend_from_slice(b",NotReachedIsFatal");
+            return Some(Some(OsString::from_vec(out)));
+        }
+
+        None
+    }
+
+    fn executable(path: &Path) -> bool {
+        use std::os::unix::fs::PermissionsExt;
+        path.metadata()
+            .map(|meta| meta.permissions().mode() & 0o111 != 0)
+            .unwrap_or(false)
+    }
+
+    fn set_webhelper_affinity() {
+        let mut mask = [0usize; 16];
+        for cpu in 1usize..=6 {
+            let bits = usize::BITS as usize;
+            mask[cpu / bits] |= 1usize << (cpu % bits);
+        }
+        unsafe {
+            libc::sched_setaffinity(
+                0,
+                std::mem::size_of_val(&mask),
+                mask.as_ptr().cast::<libc::cpu_set_t>(),
+            );
+        }
+    }
+
+    fn cstring(value: &OsString) -> Option<CString> {
+        CString::new(value.as_bytes()).ok()
+    }
+
+    fn execv_os(target: &Path, args: &[OsString]) {
+        let Some(target_c) = CString::new(target.as_os_str().as_bytes()).ok() else {
+            return;
+        };
+        let cstrings = args.iter().filter_map(cstring).collect::<Vec<_>>();
+        let mut ptrs = cstrings
+            .iter()
+            .map(|s| s.as_ptr())
+            .collect::<Vec<*const libc::c_char>>();
+        ptrs.push(std::ptr::null());
+        unsafe {
+            libc::execv(target_c.as_ptr(), ptrs.as_ptr());
+        }
+    }
+
+    pub fn run() {
+        let original_args = env::args_os().collect::<Vec<_>>();
+        let top_level_webhelper = !arg_has_prefix(&original_args, "--type=");
+        let visible_ui = is_visible_ui_launch();
+
+        let current_exe = env::current_exe().ok();
+        let dir = current_exe
+            .as_deref()
+            .and_then(Path::parent)
+            .map(Path::to_path_buf)
+            .unwrap_or_else(|| PathBuf::from("."));
+        let _ = env::set_current_dir(&dir);
+
+        let wrapper_path = dir.join("steamwebhelper.winnative-real");
+        let preferred_target = dir.join("steamwebhelper.winnative-real.bin");
+        let target = if executable(&preferred_target) {
+            preferred_target
+        } else {
+            wrapper_path.clone()
+        };
+
+        if env::var_os("DISPLAY").is_none_or(|v| v.is_empty()) {
+            env::set_var("DISPLAY", ":0");
+        }
+        env::set_var("XKB_DISABLE", "1");
+        env::set_var("LIBGL_KOPPER_DISABLE", "true");
+        prepend_ld_preload(PRELOAD_LIB);
+        set_webhelper_affinity();
+        redirect_webhelper_log();
+
+        if top_level_webhelper {
+            cleanup_process_singleton_state(&original_args);
+        }
+
+        let common_extra_args = [
+            "--no-sandbox",
+            "--disable-seccomp-filter-sandbox",
+            "--disable-setuid-sandbox",
+            "--no-xshm",
+            "--winhttp-proxy-resolver",
+        ];
+        let hidden_extra_args = [
+            "--single-process",
+            "--disable-gpu",
+            "--disable-gpu-compositing",
+            "--disable-gpu-rasterization",
+            "--disable-gpu-sandbox",
+        ];
+        let visible_extra_args = [
+            "--single-process",
+            "--disable-gpu",
+            "--disable-gpu-compositing",
+            "--disable-breakpad",
+            "--disable-crash-reporter",
+            "--enable-logging=stderr",
+            "--v=1",
+            "--log-file=/opt/steam-arm64/client/logs/cef_log.txt",
+        ];
+        let visible_child_extra_args = [
+            "--disable-breakpad",
+            "--disable-crash-reporter",
+            "--enable-logging=stderr",
+            "--v=1",
+            "--log-file=/opt/steam-arm64/client/logs/cef_log.txt",
+        ];
+
+        let mut child_args = Vec::<OsString>::new();
+        child_args.push(wrapper_path.as_os_str().to_os_string());
+        for arg in original_args.iter().skip(1) {
+            if visible_ui && should_skip_visible_ui_arg(arg.as_bytes()) {
+                continue;
+            }
+            if visible_ui {
+                if let Some(rewritten) = rewrite_visible_ui_arg(arg.as_bytes()) {
+                    if let Some(rewritten) = rewritten {
+                        child_args.push(rewritten);
+                    }
+                    continue;
+                }
+            }
+            child_args.push(arg.clone());
+        }
+
+        if top_level_webhelper {
+            for arg in common_extra_args {
+                if !arg_exists(&original_args, arg) {
+                    child_args.push(arg.into());
+                }
+            }
+            if !arg_has_prefix(&original_args, "--browser-subprocess-path=") {
+                child_args.push(
+                    format!(
+                        "--browser-subprocess-path={}/steamwebhelper.winnative-real",
+                        dir.display()
+                    )
+                    .into(),
+                );
+            }
+            let extra = if visible_ui {
+                &visible_extra_args[..]
+            } else {
+                &hidden_extra_args[..]
+            };
+            for arg in extra {
+                if !output_has_arg(&child_args, arg) {
+                    child_args.push((*arg).into());
+                }
+            }
+        }
+
+        if visible_ui
+            && !top_level_webhelper
+            && !arg_exists(&original_args, "--type=crashpad-handler")
+        {
+            for arg in visible_child_extra_args {
+                if !output_has_arg(&child_args, arg) {
+                    child_args.push(arg.into());
+                }
+            }
+        }
+
+        eprintln!(
+        "winnative steamwebhelper wrapper: target={} wrapper_path={} top_level={} visible_ui={} argc_in={} argc_out={}",
+        target.display(),
+        wrapper_path.display(),
+        top_level_webhelper as i32,
+        visible_ui as i32,
+        original_args.len(),
+        child_args.len()
+    );
+        eprintln!(
+            "winnative steamwebhelper wrapper: LD_PRELOAD={}",
+            env::var("LD_PRELOAD").unwrap_or_default()
+        );
+        for (idx, arg) in child_args.iter().enumerate() {
+            eprintln!(
+                "winnative steamwebhelper argv[{idx}]={}",
+                arg.to_string_lossy()
+            );
+        }
+
+        execv_os(&target, &child_args);
+
+        let mut fallback_args = original_args;
+        if let Some(first) = fallback_args.first_mut() {
+            *first = wrapper_path.as_os_str().to_os_string();
+        }
+        execv_os(&target, &fallback_args);
+        eprintln!(
+            "winnative steamwebhelper wrapper: exec {} failed: {}",
+            target.display(),
+            std::io::Error::last_os_error()
+        );
+        std::process::exit(126);
+    }
+}
+
+#[cfg(unix)]
+fn main() {
+    unix_impl::run();
+}
+
+#[cfg(not(unix))]
+fn main() {
+    eprintln!("winnative steamwebhelper wrapper is only supported on Unix targets");
+    std::process::exit(126);
+}
diff --git a/app/src/main/rust/wn-steam-tools/src/lib.rs b/app/src/main/rust/wn-steam-tools/src/lib.rs
new file mode 100644
index 000000000..6f1513f06
--- /dev/null
+++ b/app/src/main/rust/wn-steam-tools/src/lib.rs
@@ -0,0 +1,52 @@
+#![allow(non_snake_case)]
+
+#[cfg(unix)]
+mod unix_exports {
+    #[no_mangle]
+    pub extern "C" fn setgid(_gid: libc::gid_t) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setuid(_uid: libc::uid_t) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setregid(_rgid: libc::gid_t, _egid: libc::gid_t) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setreuid(_ruid: libc::uid_t, _euid: libc::uid_t) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setresgid(
+        _rgid: libc::gid_t,
+        _egid: libc::gid_t,
+        _sgid: libc::gid_t,
+    ) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setresuid(
+        _ruid: libc::uid_t,
+        _euid: libc::uid_t,
+        _suid: libc::uid_t,
+    ) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setfsgid(_fsgid: libc::gid_t) -> libc::c_int {
+        0
+    }
+
+    #[no_mangle]
+    pub extern "C" fn setfsuid(_fsuid: libc::uid_t) -> libc::c_int {
+        0
+    }
+}
diff --git a/app/src/main/shared/android/ActivityResultHost.java b/app/src/main/shared/android/ActivityResultHost.java
index 3ce38608b..c3c520031 100644
--- a/app/src/main/shared/android/ActivityResultHost.java
+++ b/app/src/main/shared/android/ActivityResultHost.java
@@ -1,10 +1,5 @@
 package com.winlator.cmod.shared.android;
 
-import android.content.IntentSender;
-import androidx.annotation.NonNull;
-
 public interface ActivityResultHost {
   void launchWallpaperImagePicker();
-
-  void launchDriveAuthRequest(@NonNull IntentSender intentSender);
 }
diff --git a/app/src/main/shared/android/AppTerminationHelper.kt b/app/src/main/shared/android/AppTerminationHelper.kt
index 6bf0eb2c0..ed0f0185a 100644
--- a/app/src/main/shared/android/AppTerminationHelper.kt
+++ b/app/src/main/shared/android/AppTerminationHelper.kt
@@ -10,24 +10,25 @@ import com.winlator.cmod.app.service.DownloadService
 import com.winlator.cmod.feature.stores.epic.service.EpicService
 import com.winlator.cmod.feature.stores.epic.service.EpicTokenRefreshWorker
 import com.winlator.cmod.feature.stores.gog.service.GOGService
+import com.winlator.cmod.feature.stores.steam.chat.ChatOverlayService
 import com.winlator.cmod.feature.stores.steam.events.AndroidEvent
 import com.winlator.cmod.feature.stores.steam.service.SteamService
+import com.winlator.cmod.feature.stores.steam.utils.PrefManager
 import timber.log.Timber
 
 object AppTerminationHelper {
     @JvmStatic
+    @JvmOverloads
     fun stopManagedServices(
         context: Context,
         reason: String,
+        forceStopChat: Boolean = false,
     ) {
         val appContext = context.applicationContext
-        Timber.i("Stopping managed services for app shutdown (%s)", reason)
+        val keepChatAlive = !forceStopChat && PrefManager.chatStayRunningOnExit
+        Timber.i("Stopping managed services for app shutdown (%s), keepChatAlive=%b", reason, keepChatAlive)
 
-        // Do NOT call DownloadService.pauseAll() here. The DownloadCoordinator persists every
-        // download's status in the records table, so downloads that were DOWNLOADING when the
-        // app exited will be auto-resumed on next launch. Calling pauseAll would mark them
-        // PAUSED, which would make the user have to manually resume each one — the opposite
-        // of what they expect. PAUSED downloads (paused by the user) stay PAUSED.
+        // Don't pauseAll() here: DOWNLOADING statuses persist and auto-resume next launch; pausing would force manual resume.
         runCatching {
             com.winlator.cmod.app.service.download.DownloadCoordinator.onAppExit()
         }.onFailure { Timber.w(it, "Failed to notify DownloadCoordinator during shutdown") }
@@ -38,17 +39,23 @@ object AppTerminationHelper {
         runCatching { EpicTokenRefreshWorker.cancel(appContext) }
             .onFailure { Timber.w(it, "Failed to cancel Epic refresh worker during shutdown") }
 
-        runCatching { PluviaApp.events.emit(AndroidEvent.EndProcess) }
-            .onFailure { Timber.w(it, "Failed to emit EndProcess during shutdown") }
+        if (!keepChatAlive) {
+            runCatching { PluviaApp.events.emit(AndroidEvent.EndProcess) }
+                .onFailure { Timber.w(it, "Failed to emit EndProcess during shutdown") }
 
-        runCatching { SteamService.stop() }
-            .onFailure { Timber.w(it, "Failed to stop SteamService during shutdown") }
+            runCatching { SteamService.stop() }
+                .onFailure { Timber.w(it, "Failed to stop SteamService during shutdown") }
+        }
         runCatching { EpicService.stop() }
             .onFailure { Timber.w(it, "Failed to stop EpicService during shutdown") }
         runCatching { GOGService.stop() }
             .onFailure { Timber.w(it, "Failed to stop GOGService during shutdown") }
 
-        stopServiceSafely<SteamService>(appContext)
+        if (!keepChatAlive) {
+            stopServiceSafely<SteamService>(appContext)
+            runCatching { ChatOverlayService.stop(appContext) }
+                .onFailure { Timber.w(it, "Failed to stop ChatOverlayService during shutdown") }
+        }
         stopServiceSafely<EpicService>(appContext)
         stopServiceSafely<GOGService>(appContext)
     }
@@ -58,12 +65,15 @@ object AppTerminationHelper {
         activity: Activity,
         reason: String,
     ) {
+        val keepChatAlive = PrefManager.chatStayRunningOnExit
         stopManagedServices(activity, reason)
         activity.finishAffinity()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             activity.finishAndRemoveTask()
         }
-        Process.killProcess(Process.myPid())
+        if (!keepChatAlive) {
+            Process.killProcess(Process.myPid())
+        }
     }
 
     private inline fun <reified T> stopServiceSafely(context: Context) {
diff --git a/app/src/main/shared/android/AppUtils.java b/app/src/main/shared/android/AppUtils.java
index 93c3239ad..b80d69abb 100644
--- a/app/src/main/shared/android/AppUtils.java
+++ b/app/src/main/shared/android/AppUtils.java
@@ -25,6 +25,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.PackageInfoCompat;
+import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
@@ -92,7 +93,7 @@ public static void restartApplication(Context context) {
   }
 
   public static void restartApplication(Context context, int selectedMenuItemId) {
-    AppTerminationHelper.stopManagedServices(context, "restart_application");
+    AppTerminationHelper.stopManagedServices(context, "restart_application", true);
     Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
     Intent mainIntent = Intent.makeRestartActivityTask(intent.getComponent());
     if (selectedMenuItemId > 0) mainIntent.putExtra("selected_menu_item_id", selectedMenuItemId);
@@ -148,6 +149,16 @@ public static void hideSystemUI(final Activity activity) {
     }
   }
 
+  // Like hideSystemUI but skips the insets relayout when bars are already hidden; safe to call every frame.
+  public static void hideSystemUIIfVisible(final Activity activity) {
+    final View decorView = activity.getWindow().getDecorView();
+    final WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decorView);
+    if (insets != null && !insets.isVisible(WindowInsetsCompat.Type.systemBars())) {
+      return;
+    }
+    hideSystemUI(activity);
+  }
+
   public static void showSystemUI(final Activity activity) {
     Window window = activity.getWindow();
     final View decorView = window.getDecorView();
@@ -368,10 +379,8 @@ public static void runDelayed(Runnable callback, long delay) {
       return;
     }
 
-    // Create a Timer to schedule the task
     Timer timer = new Timer();
 
-    // Schedule the task with the specified delay
     timer.schedule(
         new TimerTask() {
           @Override
diff --git a/app/src/main/shared/android/DirectoryPickerDialog.kt b/app/src/main/shared/android/DirectoryPickerDialog.kt
index f0523fc4b..6e41f99f2 100644
--- a/app/src/main/shared/android/DirectoryPickerDialog.kt
+++ b/app/src/main/shared/android/DirectoryPickerDialog.kt
@@ -19,6 +19,8 @@ import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -38,25 +40,45 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.gestures.animateScrollBy
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.AddLink
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material.icons.outlined.Checklist
+import androidx.compose.material.icons.outlined.ContentCopy
+import androidx.compose.material.icons.outlined.ContentCut
+import androidx.compose.material.icons.outlined.ContentPaste
+import androidx.compose.material.icons.outlined.CreateNewFolder
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.DriveFileRenameOutline
+import androidx.compose.material.icons.outlined.DriveFolderUpload
+import androidx.compose.material.icons.outlined.PlayArrow
 import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material.icons.outlined.FolderOpen
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
 import androidx.compose.material.icons.outlined.KeyboardArrowUp
 import androidx.compose.material.icons.outlined.Description
 import androidx.compose.material.icons.outlined.Storage
+import androidx.compose.material.icons.outlined.Unarchive
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.material3.ripple
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.CompositionLocalProvider
@@ -64,8 +86,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -74,9 +98,13 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.window.PopupProperties
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -88,6 +116,7 @@ import androidx.activity.ComponentActivity
 import androidx.lifecycle.setViewTreeLifecycleOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.winlator.cmod.R
+import com.winlator.cmod.shared.io.ArchiveExtractor
 import com.winlator.cmod.shared.theme.WinNativeAccent
 import com.winlator.cmod.shared.theme.WinNativeBackground
 import com.winlator.cmod.shared.theme.WinNativeFontFamily
@@ -98,13 +127,26 @@ import com.winlator.cmod.shared.theme.WinNativeTextPrimary
 import com.winlator.cmod.shared.theme.WinNativeTextSecondary
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import com.winlator.cmod.shared.ui.toast.WinToast
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+import com.winlator.cmod.shared.ui.nav.bindPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavHandlers
+import com.winlator.cmod.shared.ui.nav.paneNavItem
 import java.io.File
 import java.util.Locale
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 object DirectoryPickerDialog {
     private const val ContentEnterMillis = 220
     private val ContentEnterEasing = CubicBezierEasing(0.2f, 0f, 0f, 1f)
     private val FooterButtonHeight = 36.dp
+    private val FooterChipWidth = 84.dp
     private val DialogHorizontalPadding = 18.dp
     private val DialogCutoutStartPadding = 14.dp
     private val CurrentPathHorizontalPadding = 10.dp
@@ -114,14 +156,28 @@ object DirectoryPickerDialog {
     private val CardBorder = WinNativeOutline
     private val IconBoxBg = Color(0xFF242434)
     private val Accent = WinNativeAccent
+    private val NavHighlight = Color(0xFF4FC3F7)
     private val TextPrimary = WinNativeTextPrimary
     private val TextSecondary = WinNativeTextSecondary
 
+    val ExecutableExtensions = setOf("exe", "bat", "cmd", "msi")
+
     private enum class SelectionMode {
         DIRECTORY,
         FILE,
+        MANAGE,
     }
 
+    data class ManagedRoot(
+        val label: String,
+        val path: String,
+    )
+
+    data class ManagedContainer(
+        val id: Int,
+        val name: String,
+    )
+
     private data class Entry(
         val label: String,
         val target: File,
@@ -129,6 +185,19 @@ object DirectoryPickerDialog {
         val isSelectableFile: Boolean = false,
     )
 
+    private enum class ClipMode { COPY, CUT, EXTRACT }
+
+    private data class ClipData(
+        val files: List<File>,
+        val mode: ClipMode,
+    )
+
+    private data class ItemAction(
+        val icon: androidx.compose.ui.graphics.vector.ImageVector,
+        val label: String,
+        val onClick: () -> Unit,
+    )
+
     @JvmStatic
     fun show(
         activity: Activity,
@@ -137,6 +206,7 @@ object DirectoryPickerDialog {
         dimBackground: Boolean = true,
         dimAmount: Float = 0.30f,
         preserveBackdropBlur: Boolean = false,
+        extraRoots: List<ManagedRoot> = emptyList(),
         onSelected: (String) -> Unit,
     ) {
         showPicker(
@@ -148,6 +218,7 @@ object DirectoryPickerDialog {
             dimBackground = dimBackground,
             dimAmount = dimAmount,
             preserveBackdropBlur = preserveBackdropBlur,
+            extraRoots = extraRoots,
             onSelected = onSelected,
         )
     }
@@ -160,6 +231,7 @@ object DirectoryPickerDialog {
         dimBackground: Boolean = true,
         dimAmount: Float = 0.30f,
         preserveBackdropBlur: Boolean = false,
+        extraRoots: List<ManagedRoot> = emptyList(),
         onSelected: (String) -> Unit,
     ) {
         showPicker(
@@ -171,10 +243,40 @@ object DirectoryPickerDialog {
             dimBackground = dimBackground,
             dimAmount = dimAmount,
             preserveBackdropBlur = preserveBackdropBlur,
+            extraRoots = extraRoots,
             onSelected = onSelected,
         )
     }
 
+    fun showManager(
+        activity: Activity,
+        initialPath: String? = null,
+        title: String = activity.getString(R.string.file_manager_title),
+        managedRoots: List<ManagedRoot>,
+        containers: List<ManagedContainer> = emptyList(),
+        onRunFile: ((String, Int) -> Unit)? = null,
+        onCreateShortcut: ((String) -> Unit)? = null,
+        dimBackground: Boolean = true,
+        dimAmount: Float = 0.30f,
+        preserveBackdropBlur: Boolean = false,
+    ) {
+        showPicker(
+            activity = activity,
+            initialPath = initialPath ?: managedRoots.firstOrNull()?.path,
+            title = title,
+            mode = SelectionMode.MANAGE,
+            allowedExtensions = emptySet(),
+            dimBackground = dimBackground,
+            dimAmount = dimAmount,
+            preserveBackdropBlur = preserveBackdropBlur,
+            managedRoots = managedRoots,
+            containers = containers,
+            onRunFile = onRunFile,
+            onCreateShortcut = onCreateShortcut,
+            onSelected = {},
+        )
+    }
+
     private fun showPicker(
         activity: Activity,
         initialPath: String?,
@@ -184,6 +286,11 @@ object DirectoryPickerDialog {
         dimBackground: Boolean,
         dimAmount: Float,
         preserveBackdropBlur: Boolean,
+        managedRoots: List<ManagedRoot> = emptyList(),
+        extraRoots: List<ManagedRoot> = emptyList(),
+        containers: List<ManagedContainer> = emptyList(),
+        onRunFile: ((String, Int) -> Unit)? = null,
+        onCreateShortcut: ((String) -> Unit)? = null,
         onSelected: (String) -> Unit,
     ) {
         if (!ensureAllFilesAccess(activity)) return
@@ -238,11 +345,17 @@ object DirectoryPickerDialog {
                                 }
 
                                 DirectoryPickerDialogContent(
+                                    window = dialog.window,
                                     title = title,
                                     initialDir = initialDir,
                                     roots = roots,
                                     mode = mode,
                                     allowedExtensions = allowedExtensions,
+                                    managedRoots = managedRoots,
+                                    extraRoots = extraRoots,
+                                    containers = containers,
+                                    onRunFile = onRunFile,
+                                    onCreateShortcut = onCreateShortcut,
                                     onDismiss = ::dismissPicker,
                                     onSelect = { path ->
                                         onSelected(path)
@@ -290,21 +403,252 @@ object DirectoryPickerDialog {
 
     @Composable
     private fun DirectoryPickerDialogContent(
+        window: Window?,
         title: String,
         initialDir: File,
         roots: List<File>,
         mode: SelectionMode,
         allowedExtensions: Set<String>,
+        managedRoots: List<ManagedRoot> = emptyList(),
+        extraRoots: List<ManagedRoot> = emptyList(),
+        containers: List<ManagedContainer> = emptyList(),
+        onRunFile: ((String, Int) -> Unit)? = null,
+        onCreateShortcut: ((String) -> Unit)? = null,
         onDismiss: () -> Unit,
         onSelect: (String) -> Unit,
     ) {
+        val manage = mode == SelectionMode.MANAGE
+        val context = LocalContext.current
+        val scope = rememberCoroutineScope()
         var currentDir by remember(initialDir.absolutePath) { mutableStateOf(initialDir) }
-        var selectedFile by remember(currentDir.absolutePath) { mutableStateOf<File?>(null) }
+        var selectedFile by remember { mutableStateOf<File?>(null) }
+        var showPathInput by remember { mutableStateOf(false) }
+        var pathInputText by remember { mutableStateOf("") }
         var rootsExpanded by remember { mutableStateOf(false) }
+        var refreshTick by remember { mutableStateOf(0) }
+        var clipboard by remember { mutableStateOf<ClipData?>(null) }
+        var transferProgress by remember { mutableStateOf<Float?>(null) }
+        var transferLabel by remember { mutableStateOf("") }
+        var transferJob by remember { mutableStateOf<Job?>(null) }
+        var menuTarget by remember { mutableStateOf<File?>(null) }
+        var renameTarget by remember { mutableStateOf<File?>(null) }
+        var deleteTargets by remember { mutableStateOf<List<File>?>(null) }
+        var runTarget by remember { mutableStateOf<File?>(null) }
+        var showNewFolder by remember { mutableStateOf(false) }
+        var multiSelect by remember { mutableStateOf(false) }
+        var selectedPaths by remember { mutableStateOf<Set<String>>(emptySet()) }
         val upLabel = activityString(R.string.saves_import_export_up_directory)
-        val entries = remember(currentDir.absolutePath, upLabel, mode, allowedExtensions) {
+        val entries = remember(currentDir.absolutePath, upLabel, mode, allowedExtensions, refreshTick) {
             buildEntries(currentDir, upLabel, mode, allowedExtensions)
         }
+
+        fun refreshEntries() {
+            refreshTick++
+        }
+
+        fun extractInto(dir: File, archives: List<File>, fromClipboard: Boolean) {
+            val archive = archives.firstOrNull() ?: return
+            if (transferProgress != null) return
+            val destDir = uniqueChild(dir, ArchiveExtractor.baseName(archive))
+            transferLabel = context.getString(R.string.file_manager_extracting, archive.name)
+            transferProgress = 0f
+            transferJob = scope.launch {
+                try {
+                    withContext(Dispatchers.IO) {
+                        ArchiveExtractor.extract(
+                            source = archive,
+                            destDir = destDir,
+                            onProgress = { transferProgress = it },
+                            isActive = { isActive },
+                        )
+                    }
+                    if (fromClipboard) clipboard = null
+                } catch (e: CancellationException) {
+                    withContext(NonCancellable + Dispatchers.IO) {
+                        runCatching { destDir.deleteRecursively() }
+                    }
+                } catch (e: Exception) {
+                    Toast.makeText(context, e.message ?: context.getString(R.string.file_manager_extract_failed), Toast.LENGTH_SHORT).show()
+                } finally {
+                    transferProgress = null
+                    transferJob = null
+                    refreshEntries()
+                }
+            }
+        }
+
+        fun pasteInto(dir: File) {
+            val cb = clipboard ?: return
+            if (transferProgress != null) return
+            if (cb.mode == ClipMode.EXTRACT) {
+                extractInto(dir, cb.files, fromClipboard = true)
+                return
+            }
+            val isCut = cb.mode == ClipMode.CUT
+            val sources =
+                cb.files.filter { src ->
+                    val dest = File(dir, src.name)
+                    dest.absolutePath != src.absolutePath && !(src.isDirectory && isSameOrDescendant(dest, src))
+                }
+            if (sources.isEmpty()) {
+                Toast.makeText(context, context.getString(R.string.file_manager_paste_into_itself), Toast.LENGTH_SHORT).show()
+                return
+            }
+            transferLabel =
+                if (sources.size == 1) {
+                    context.getString(
+                        if (isCut) R.string.file_manager_moving else R.string.file_manager_copying,
+                        sources.first().name,
+                    )
+                } else {
+                    context.getString(
+                        if (isCut) R.string.file_manager_moving_count else R.string.file_manager_copying_count,
+                        sources.size,
+                    )
+                }
+            transferProgress = 0f
+            transferJob = scope.launch {
+                var inFlight: File? = null
+                try {
+                    withContext(Dispatchers.IO) {
+                        val totalBytes = sources.sumOf { treeSize(it) }.coerceAtLeast(1L)
+                        var doneBytes = 0L
+                        for (src in sources) {
+                            val dest = File(dir, src.name)
+                            val srcBytes = treeSize(src)
+                            inFlight = dest
+                            transferRecursively(
+                                src = src,
+                                dest = dest,
+                                isCut = isCut,
+                                onProgress = { p ->
+                                    transferProgress = ((doneBytes + srcBytes * p) / totalBytes).coerceIn(0f, 1f)
+                                },
+                                isActive = { isActive },
+                            )
+                            doneBytes += srcBytes
+                            inFlight = null
+                        }
+                    }
+                    clipboard = null
+                } catch (e: CancellationException) {
+                    withContext(NonCancellable + Dispatchers.IO) {
+                        runCatching { inFlight?.takeIf { it.exists() }?.deleteRecursively() }
+                    }
+                } catch (e: Exception) {
+                    Toast.makeText(context, e.message ?: context.getString(R.string.file_manager_operation_failed), Toast.LENGTH_SHORT).show()
+                } finally {
+                    transferProgress = null
+                    transferJob = null
+                    refreshEntries()
+                }
+            }
+        }
+
+        fun deleteFiles(targets: List<File>) {
+            targets.forEach { f ->
+                try {
+                    f.deleteRecursively()
+                } catch (e: Exception) {
+                    Toast.makeText(context, e.message ?: context.getString(R.string.file_manager_delete_failed), Toast.LENGTH_SHORT).show()
+                }
+                if (selectedFile?.absolutePath == f.absolutePath) selectedFile = null
+            }
+            selectedPaths = selectedPaths - targets.map { it.absolutePath }.toSet()
+            refreshEntries()
+        }
+
+        fun renameFile(f: File, newName: String) {
+            val trimmed = newName.trim()
+            if (trimmed.isEmpty()) return
+            try {
+                f.renameTo(File(f.parentFile, trimmed))
+            } catch (e: Exception) {
+                Toast.makeText(context, e.message ?: context.getString(R.string.file_manager_rename_failed), Toast.LENGTH_SHORT).show()
+            }
+            refreshEntries()
+        }
+
+        fun createFolder(name: String) {
+            val trimmed = name.trim()
+            if (trimmed.isEmpty()) return
+            try {
+                File(currentDir, trimmed).mkdirs()
+            } catch (e: Exception) {
+                Toast.makeText(context, e.message ?: context.getString(R.string.file_manager_create_folder_failed), Toast.LENGTH_SHORT).show()
+            }
+            refreshEntries()
+        }
+
+        fun buildItemActions(entry: Entry): List<ItemAction> {
+            val target = entry.target
+            val batch = multiSelect && selectedPaths.isNotEmpty()
+            val targets = if (batch) selectedPaths.map(::File) else listOf(target)
+            val count = targets.size
+            val actions = mutableListOf<ItemAction>()
+            if (!batch && isExecutable(target) && onRunFile != null) {
+                actions += ItemAction(Icons.Outlined.PlayArrow, context.getString(R.string.file_manager_run_boot)) {
+                    runTarget = target
+                    menuTarget = null
+                }
+            }
+            if (!batch && isExecutable(target) && onCreateShortcut != null) {
+                actions += ItemAction(Icons.Outlined.AddLink, context.getString(R.string.file_manager_create_shortcut)) {
+                    onCreateShortcut.invoke(target.absolutePath)
+                    menuTarget = null
+                }
+            }
+            if (!batch && ArchiveExtractor.isSupported(target)) {
+                actions += ItemAction(Icons.Outlined.Unarchive, context.getString(R.string.file_manager_extract_here)) {
+                    extractInto(currentDir, listOf(target), fromClipboard = false)
+                    menuTarget = null
+                }
+                actions += ItemAction(Icons.Outlined.DriveFolderUpload, context.getString(R.string.file_manager_extract_to)) {
+                    clipboard = ClipData(listOf(target), ClipMode.EXTRACT)
+                    menuTarget = null
+                    multiSelect = false
+                    selectedPaths = emptySet()
+                }
+            }
+            actions += ItemAction(
+                Icons.Outlined.ContentCopy,
+                if (batch) context.getString(R.string.file_manager_copy_count, count) else context.getString(R.string.file_manager_copy),
+            ) {
+                clipboard = ClipData(targets, ClipMode.COPY)
+                menuTarget = null
+                multiSelect = false
+                selectedPaths = emptySet()
+            }
+            actions += ItemAction(
+                Icons.Outlined.ContentCut,
+                if (batch) context.getString(R.string.file_manager_cut_count, count) else context.getString(R.string.file_manager_cut),
+            ) {
+                clipboard = ClipData(targets, ClipMode.CUT)
+                menuTarget = null
+                multiSelect = false
+                selectedPaths = emptySet()
+            }
+            if (clipboard != null) {
+                actions += ItemAction(Icons.Outlined.ContentPaste, context.getString(R.string.file_manager_paste_here)) {
+                    pasteInto(currentDir)
+                    menuTarget = null
+                }
+            }
+            if (!batch) {
+                actions += ItemAction(Icons.Outlined.DriveFileRenameOutline, context.getString(R.string.common_ui_rename)) {
+                    renameTarget = target
+                    menuTarget = null
+                }
+            }
+            actions += ItemAction(
+                Icons.Outlined.Delete,
+                if (batch) context.getString(R.string.file_manager_delete_count, count) else context.getString(R.string.file_manager_delete),
+            ) {
+                deleteTargets = targets
+                menuTarget = null
+            }
+            return actions
+        }
         val folderCount = remember(entries) { entries.count { !it.isParent } }
         val selectableFileCount = remember(entries) { entries.count { it.isSelectableFile } }
         val folderOnlyCount = remember(entries) { entries.count { !it.isParent && !it.isSelectableFile } }
@@ -363,6 +707,128 @@ object DirectoryPickerDialog {
             contentVisible = true
         }
 
+        val contentRegistry = remember { PaneNavRegistry().apply { stableCursor = true } }
+        val menuRegistry = remember { PaneNavRegistry() }
+        val rootsRegistry = remember { PaneNavRegistry() }
+        val footerRegistry = remember { PaneNavRegistry().apply { singleRow = true } }
+        val overlayRegistry = remember { PaneNavRegistry() }
+        var footerZone by remember { mutableStateOf(false) }
+        val gridState = rememberLazyGridState()
+        var gridViewportTop by remember { mutableStateOf(0f) }
+        var gridViewportHeight by remember { mutableIntStateOf(0) }
+        LaunchedEffect(contentRegistry.activeRow, contentRegistry.activeCol, gridViewportHeight, footerZone) {
+            if (footerZone || !contentRegistry.controllerActive || contentRegistry.manualSelection) return@LaunchedEffect
+            val bounds = contentRegistry.activeItemBounds() ?: return@LaunchedEffect
+            val rowH = bounds.second - bounds.first
+            val margin = (rowH * 2f + with(density) { 12.dp.toPx() }).coerceAtMost(gridViewportHeight * 0.4f)
+            val vpBottom = gridViewportTop + gridViewportHeight
+            val delta = when {
+                bounds.second + margin > vpBottom -> bounds.second + margin - vpBottom
+                bounds.first - margin < gridViewportTop -> bounds.first - margin - gridViewportTop
+                else -> 0f
+            }
+            if (delta != 0f) runCatching { gridState.animateScrollBy(delta) }
+        }
+        LaunchedEffect(currentDir.absolutePath) {
+            selectedFile = null
+            selectedPaths = emptySet()
+            contentRegistry.reset()
+            footerZone = false
+        }
+        LaunchedEffect(menuTarget) { if (menuTarget != null) menuRegistry.reset() }
+        LaunchedEffect(renameTarget, showNewFolder, showPathInput, deleteTargets, runTarget, transferProgress != null) {
+            overlayRegistry.controllerActive = false
+            overlayRegistry.reset()
+        }
+        LaunchedEffect(rootsExpanded) { if (rootsExpanded) rootsRegistry.reset() }
+        contentRegistry.onEdgeDown = {
+            if (gridState.canScrollForward) {
+                val b = contentRegistry.activeItemBounds()
+                val step = if (b != null) (b.second - b.first) + with(density) { 6.dp.toPx() } else gridViewportHeight * 0.3f
+                scope.launch { gridState.animateScrollBy(step) }
+            } else {
+                footerZone = true
+                contentRegistry.controllerActive = false
+                footerRegistry.controllerActive = true
+                footerRegistry.reset()
+            }
+        }
+        footerRegistry.onEdgeUp = {
+            footerZone = false
+            footerRegistry.controllerActive = false
+            contentRegistry.controllerActive = true
+        }
+        val pathNotFound = activityString(R.string.common_ui_path_not_found)
+
+        fun applyTypedPath(typed: String) {
+            val target = File(typed.trim())
+            if (target.isDirectory) {
+                currentDir = target
+                selectedFile = null
+            } else if (target.isFile) {
+                currentDir = target.parentFile ?: currentDir
+                selectedFile = target
+            } else {
+                Toast.makeText(context, pathNotFound, Toast.LENGTH_SHORT).show()
+            }
+            showPathInput = false
+        }
+
+        val handlers =
+            remember(window) {
+                paneNavHandlers(
+                    onDismiss = {
+                        when {
+                            showPathInput -> showPathInput = false
+                            renameTarget != null -> renameTarget = null
+                            showNewFolder -> showNewFolder = false
+                            deleteTargets != null -> deleteTargets = null
+                            runTarget != null -> runTarget = null
+                            transferProgress != null -> transferJob?.cancel()
+                            menuTarget != null -> menuTarget = null
+                            rootsExpanded -> rootsExpanded = false
+                            multiSelect -> {
+                                multiSelect = false
+                                selectedPaths = emptySet()
+                            }
+                            else -> onDismiss()
+                        }
+                    },
+                    onStart = {
+                        val overlayOpen =
+                            rootsExpanded || menuTarget != null || renameTarget != null ||
+                                showNewFolder || showPathInput || deleteTargets != null ||
+                                runTarget != null || transferProgress != null
+                        if (showPathInput) {
+                            applyTypedPath(pathInputText)
+                        } else if (!overlayOpen) {
+                            if (manage) {
+                                if (clipboard != null) pasteInto(currentDir) else onDismiss()
+                            } else {
+                                val selectedPath =
+                                    if (mode == SelectionMode.FILE) selectedFile?.absolutePath else currentDir.absolutePath
+                                if (selectedPath != null) onSelect(selectedPath)
+                            }
+                        }
+                    },
+                    registry = {
+                        when {
+                            menuTarget != null -> menuRegistry
+                            rootsExpanded -> rootsRegistry
+                            renameTarget != null || showNewFolder || showPathInput ||
+                                deleteTargets != null || runTarget != null ||
+                                transferProgress != null -> overlayRegistry
+                            footerZone -> footerRegistry
+                            else -> contentRegistry
+                        }
+                    },
+                )
+            }
+        DisposableEffect(window, handlers) {
+            val restore = window?.bindPaneNav(handlers)
+            onDispose { restore?.invoke() }
+        }
+
         BoxWithConstraints(
             modifier =
                 Modifier
@@ -406,6 +872,7 @@ object DirectoryPickerDialog {
             val entryCountMaxWidth = (maxWidth * 0.42f).coerceIn(128.dp, 220.dp)
             val folderGridMinSize = (maxWidth * 0.22f).coerceIn(140.dp, 150.dp)
 
+            CompositionLocalProvider(LocalPaneNav provides contentRegistry) {
             Surface(
                 modifier =
                     Modifier
@@ -456,9 +923,13 @@ object DirectoryPickerDialog {
                     }
 
                     Spacer(Modifier.height(4.dp))
-
-                    CurrentPathCard(path = currentDir.absolutePath)
-
+                    CurrentPathCard(
+                        path = selectedFile?.name ?: currentDir.absolutePath,
+                        onClick = {
+                            pathInputText = currentDir.absolutePath
+                            showPathInput = true
+                        },
+                    )
                     Spacer(Modifier.height(8.dp))
 
                     androidx.compose.foundation.layout.Box(
@@ -470,6 +941,10 @@ object DirectoryPickerDialog {
                                 .clip(RoundedCornerShape(12.dp))
                                 .background(BgDark)
                                 .border(1.dp, CardBorder, RoundedCornerShape(12.dp))
+                                .onGloballyPositioned {
+                                    gridViewportTop = it.positionInWindow().y
+                                    gridViewportHeight = it.size.height
+                                }
                                 .padding(horizontal = FolderGridCardPadding, vertical = FolderGridCardPadding),
                     ) {
                         if (entries.isEmpty()) {
@@ -485,6 +960,7 @@ object DirectoryPickerDialog {
                             }
                         } else {
                             LazyVerticalGrid(
+                                state = gridState,
                                 modifier = Modifier.fillMaxWidth(),
                                 columns = GridCells.Adaptive(minSize = folderGridMinSize),
                                 contentPadding = PaddingValues(2.dp),
@@ -494,16 +970,49 @@ object DirectoryPickerDialog {
                                 items(entries, key = { entry ->
                                     entry.target.absolutePath + entry.isParent + entry.isSelectableFile
                                 }) { entry ->
+                                    val isMenuOpen =
+                                        manage && menuTarget?.absolutePath == entry.target.absolutePath
+                                    val path = entry.target.absolutePath
+                                    val multiSelectable = manage && multiSelect && !entry.isParent
+                                    val openMenu = {
+                                        if (multiSelectable && path !in selectedPaths) selectedPaths = selectedPaths + path
+                                        menuTarget = entry.target
+                                    }
                                     EntryTile(
                                         entry = entry,
-                                        selected = selectedFile?.absolutePath == entry.target.absolutePath,
-                                        onClick = {
-                                            if (entry.isSelectableFile) {
-                                                selectedFile = entry.target
+                                        selected =
+                                            if (manage && multiSelect) {
+                                                path in selectedPaths
                                             } else {
-                                                currentDir = entry.target
+                                                selectedFile?.absolutePath == path
+                                            },
+                                        checked = multiSelectable && path in selectedPaths,
+                                        isEntry = entry === entries.first(),
+                                        onClick = {
+                                            when {
+                                                multiSelectable ->
+                                                    selectedPaths =
+                                                        if (path in selectedPaths) selectedPaths - path else selectedPaths + path
+                                                entry.isSelectableFile -> selectedFile = entry.target
+                                                else -> currentDir = entry.target
                                             }
                                         },
+                                        onLongClick =
+                                            if (manage && !entry.isParent) {
+                                                openMenu
+                                            } else {
+                                                null
+                                            },
+                                        onSecondary =
+                                            if (manage && !entry.isParent) {
+                                                openMenu
+                                            } else {
+                                                {}
+                                            },
+                                        menuExpanded = isMenuOpen,
+                                        onMenuDismiss = { menuTarget = null },
+                                        actions = if (isMenuOpen) buildItemActions(entry) else emptyList(),
+                                        menuRegistry = menuRegistry,
                                     )
                                 }
                             }
@@ -514,6 +1023,74 @@ object DirectoryPickerDialog {
                     HorizontalDivider(color = CardBorder, thickness = 1.dp)
                     Spacer(Modifier.height(10.dp))
 
+                    if (manage) {
+                        CompositionLocalProvider(LocalPaneNav provides footerRegistry) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        ) {
+                            FooterInfo(
+                                title = title,
+                                subtitle = selectedFile?.absolutePath ?: currentDir.absolutePath,
+                                modifier = Modifier.weight(1f),
+                            )
+                            clipboard?.let { cb ->
+                                val extracting = cb.mode == ClipMode.EXTRACT
+                                SecondaryActionChip(
+                                    label =
+                                        activityString(
+                                            if (extracting) R.string.file_manager_extract else R.string.file_manager_paste,
+                                        ),
+                                    icon = if (extracting) Icons.Outlined.Unarchive else Icons.Outlined.ContentPaste,
+                                    accent = true,
+                                    compact = true,
+                                    modifier = Modifier.width(FooterChipWidth),
+                                    onClick = { pasteInto(currentDir) },
+                                )
+                            }
+                            SecondaryActionChip(
+                                label = activityString(R.string.file_manager_new_folder_short),
+                                icon = Icons.Outlined.CreateNewFolder,
+                                accent = true,
+                                compact = true,
+                                modifier = Modifier.width(FooterChipWidth),
+                                onClick = { showNewFolder = true },
+                            )
+                            SecondaryActionChip(
+                                label = activityString(R.string.file_manager_multi_select),
+                                icon = Icons.Outlined.Checklist,
+                                accent = true,
+                                active = multiSelect,
+                                compact = true,
+                                modifier = Modifier.width(FooterChipWidth),
+                                onClick = {
+                                    multiSelect = !multiSelect
+                                    if (!multiSelect) selectedPaths = emptySet()
+                                },
+                            )
+                            ManageRootSelector(
+                                managedRoots = managedRoots,
+                                currentDir = currentDir,
+                                expanded = rootsExpanded,
+                                onExpandedChange = { rootsExpanded = it },
+                                onRootSelected = {
+                                    currentDir = File(it)
+                                    rootsExpanded = false
+                                },
+                                navRegistry = rootsRegistry,
+                                modifier = Modifier.widthIn(min = 150.dp, max = 182.dp),
+                            )
+                            FooterActionButton(
+                                label = activityString(R.string.common_ui_close),
+                                modifier = Modifier.height(FooterButtonHeight),
+                                onClick = onDismiss,
+                            )
+                        }
+                        }
+                        return@Column
+                    }
+
                     val rootSelector: @Composable (Modifier) -> Unit = { modifier ->
                         RootSelector(
                             roots = roots,
@@ -524,7 +1101,9 @@ object DirectoryPickerDialog {
                                 currentDir = it
                                 rootsExpanded = false
                             },
+                            navRegistry = rootsRegistry,
                             modifier = modifier,
+                            extraRoots = extraRoots,
                         )
                     }
                     val footerActions: @Composable () -> Unit = {
@@ -533,16 +1112,12 @@ object DirectoryPickerDialog {
                         ) {
                             FooterActionButton(
                                 label = activityString(R.string.common_ui_cancel),
-                                textColor = TextPrimary,
                                 modifier = Modifier.height(FooterButtonHeight),
                                 onClick = onDismiss,
                             )
                             FooterActionButton(
                                 label = activityString(R.string.common_ui_ok),
-                                textColor = Accent,
                                 modifier = Modifier.height(FooterButtonHeight),
-                                backgroundColor = Accent.copy(alpha = 0.12f),
-                                borderColor = Accent.copy(alpha = 0.3f),
                                 onClick = {
                                     val selectedPath =
                                         if (mode == SelectionMode.FILE) {
@@ -556,6 +1131,7 @@ object DirectoryPickerDialog {
                         }
                     }
 
+                    CompositionLocalProvider(LocalPaneNav provides footerRegistry) {
                     Row(
                         modifier = Modifier.fillMaxWidth(),
                         verticalAlignment = Alignment.CenterVertically,
@@ -569,6 +1145,90 @@ object DirectoryPickerDialog {
                         rootSelector(Modifier.widthIn(min = 158.dp, max = 182.dp))
                         footerActions()
                     }
+                    }
+                }
+            }
+            }
+
+            if (manage) {
+                CompositionLocalProvider(LocalPaneNav provides overlayRegistry) {
+                renameTarget?.let { target ->
+                    TextInputOverlay(
+                        modifier = Modifier.matchParentSize(),
+                        title = activityString(R.string.common_ui_rename),
+                        initial = target.name,
+                        confirmLabel = activityString(R.string.common_ui_rename),
+                        onConfirm = {
+                            renameFile(target, it)
+                            renameTarget = null
+                        },
+                        onDismiss = { renameTarget = null },
+                    )
+                }
+                if (showNewFolder) {
+                    TextInputOverlay(
+                        modifier = Modifier.matchParentSize(),
+                        title = activityString(R.string.file_manager_new_folder),
+                        initial = "",
+                        confirmLabel = activityString(R.string.file_manager_create),
+                        onConfirm = {
+                            createFolder(it)
+                            showNewFolder = false
+                        },
+                        onDismiss = { showNewFolder = false },
+                    )
+                }
+                deleteTargets?.let { targets ->
+                    ConfirmOverlay(
+                        modifier = Modifier.matchParentSize(),
+                        title = activityString(R.string.file_manager_delete),
+                        message =
+                            if (targets.size == 1) {
+                                activityString(R.string.file_manager_delete_confirm, targets.first().name)
+                            } else {
+                                activityString(R.string.file_manager_delete_confirm_multi, targets.size)
+                            },
+                        confirmLabel = activityString(R.string.file_manager_delete),
+                        onConfirm = {
+                            deleteFiles(targets)
+                            deleteTargets = null
+                        },
+                        onDismiss = { deleteTargets = null },
+                    )
+                }
+                runTarget?.let { target ->
+                    ContainerPickerOverlay(
+                        modifier = Modifier.matchParentSize(),
+                        containers = containers,
+                        onPick = { id ->
+                            onRunFile?.invoke(target.absolutePath, id)
+                            runTarget = null
+                        },
+                        onDismiss = { runTarget = null },
+                    )
+                }
+                transferProgress?.let { p ->
+                    TransferProgressOverlay(
+                        modifier = Modifier.matchParentSize(),
+                        label = transferLabel,
+                        progress = p,
+                        onCancel = { transferJob?.cancel() },
+                    )
+                }
+                }
+            }
+
+            if (showPathInput) {
+                CompositionLocalProvider(LocalPaneNav provides overlayRegistry) {
+                    TextInputOverlay(
+                        modifier = Modifier.matchParentSize(),
+                        title = activityString(R.string.common_ui_enter_path),
+                        initial = pathInputText,
+                        confirmLabel = activityString(R.string.common_ui_ok),
+                        onTextChange = { pathInputText = it },
+                        onConfirm = { applyTypedPath(it) },
+                        onDismiss = { showPathInput = false },
+                    )
                 }
             }
         }
@@ -621,15 +1281,23 @@ object DirectoryPickerDialog {
     }
 
     @Composable
-    private fun CurrentPathCard(path: String) {
+    private fun CurrentPathCard(
+        path: String,
+        onClick: () -> Unit,
+    ) {
         Box(
             modifier =
                 Modifier
                     .fillMaxWidth()
                     .clip(RoundedCornerShape(12.dp))
+                    .paneNavItem(cornerRadius = 12.dp, onActivate = onClick)
                     .background(BgDark)
                     .border(1.dp, CardBorder, RoundedCornerShape(12.dp))
-                    .padding(horizontal = CurrentPathHorizontalPadding, vertical = 4.dp),
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onClick,
+                    ).padding(horizontal = CurrentPathHorizontalPadding, vertical = 4.dp),
             contentAlignment = Alignment.CenterStart,
         ) {
             Text(
@@ -650,6 +1318,8 @@ object DirectoryPickerDialog {
         onExpandedChange: (Boolean) -> Unit,
         onRootSelected: (File) -> Unit,
         modifier: Modifier = Modifier,
+        extraRoots: List<ManagedRoot> = emptyList(),
+        navRegistry: PaneNavRegistry? = null,
     ) {
         val chevronRotation by animateFloatAsState(
             targetValue = if (expanded) 180f else 0f,
@@ -674,17 +1344,51 @@ object DirectoryPickerDialog {
                 shape = RoundedCornerShape(10.dp),
                 containerColor = Color(0xFF24243B),
                 border = BorderStroke(1.dp, CardBorder),
+                properties = PopupProperties(focusable = false),
                 modifier = Modifier.widthIn(min = 220.dp, max = 420.dp),
             ) {
                 @Suppress("DEPRECATION")
-                CompositionLocalProvider(LocalRippleConfiguration provides null) {
+                CompositionLocalProvider(LocalRippleConfiguration provides null, LocalPaneNav provides navRegistry) {
                     Column(
                         modifier =
                             Modifier
                                 .heightIn(max = 360.dp)
                                 .verticalScroll(rememberScrollState()),
                     ) {
-                        roots.forEach { root ->
+                        extraRoots.forEachIndexed { index, root ->
+                            val selected = isSameOrDescendant(currentDir, File(root.path))
+                            DropdownMenuItem(
+                                text = {
+                                    Column {
+                                        Text(
+                                            text = root.label,
+                                            color = if (selected) Accent else TextPrimary,
+                                            fontSize = 12.sp,
+                                            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
+                                            maxLines = 1,
+                                        )
+                                        Text(
+                                            text = root.path,
+                                            color = TextSecondary,
+                                            fontSize = 9.sp,
+                                            maxLines = 1,
+                                            overflow = TextOverflow.Ellipsis,
+                                        )
+                                    }
+                                },
+                                onClick = { onRootSelected(File(root.path)) },
+                                modifier =
+                                    Modifier
+                                        .paneNavItem(
+                                            cornerRadius = 6.dp,
+                                            onActivate = { onRootSelected(File(root.path)) },
+                                            isEntry = index == 0,
+                                        ).background(
+                                            if (selected) Accent.copy(alpha = 0.08f) else Color.Transparent,
+                                        ),
+                            )
+                        }
+                        roots.forEachIndexed { index, root ->
                             val selected = isSameOrDescendant(currentDir, root)
                             DropdownMenuItem(
                                 text = {
@@ -699,9 +1403,14 @@ object DirectoryPickerDialog {
                                 },
                                 onClick = { onRootSelected(root) },
                                 modifier =
-                                    Modifier.background(
-                                        if (selected) Accent.copy(alpha = 0.08f) else Color.Transparent,
-                                    ),
+                                    Modifier
+                                        .paneNavItem(
+                                            cornerRadius = 6.dp,
+                                            onActivate = { onRootSelected(root) },
+                                            isEntry = extraRoots.isEmpty() && index == 0,
+                                        ).background(
+                                            if (selected) Accent.copy(alpha = 0.08f) else Color.Transparent,
+                                        ),
                             )
                         }
                     }
@@ -710,61 +1419,152 @@ object DirectoryPickerDialog {
         }
     }
 
+    @OptIn(ExperimentalFoundationApi::class)
     @Composable
     private fun EntryTile(
         entry: Entry,
         selected: Boolean,
         onClick: () -> Unit,
+        checked: Boolean = false,
+        isEntry: Boolean = false,
+        onLongClick: (() -> Unit)? = null,
+        onSecondary: () -> Unit = {},
+        menuExpanded: Boolean = false,
+        onMenuDismiss: () -> Unit = {},
+        actions: List<ItemAction> = emptyList(),
+        menuRegistry: PaneNavRegistry? = null,
+        onHighlighted: () -> Unit = {},
     ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(
-                        when {
-                            selected -> Accent.copy(alpha = 0.16f)
-                            entry.isParent -> Accent.copy(alpha = 0.1f)
-                            else -> CardDark
-                        },
-                    )
-                    .border(
-                        width = 1.dp,
-                        color =
+        val interaction = remember { MutableInteractionSource() }
+        Box(modifier = Modifier.fillMaxWidth()) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(10.dp))
+                        .background(
                             when {
-                                selected -> Accent.copy(alpha = 0.45f)
-                                entry.isParent -> Accent.copy(alpha = 0.24f)
-                                else -> CardBorder
+                                selected -> Accent.copy(alpha = 0.35f)
+                                entry.isParent -> Accent.copy(alpha = 0.1f)
+                                else -> CardDark
                             },
-                        shape = RoundedCornerShape(10.dp),
+                        )
+                        .border(
+                            width = 1.dp,
+                            color =
+                                when {
+                                    selected -> Accent
+                                    entry.isParent -> Accent.copy(alpha = 0.24f)
+                                    else -> CardBorder
+                                },
+                            shape = RoundedCornerShape(10.dp),
+                        )
+                        .let { base ->
+                            if (onLongClick != null) {
+                                base.combinedClickable(
+                                    interactionSource = interaction,
+                                    indication = null,
+                                    onClick = onClick,
+                                    onLongClick = onLongClick,
+                                )
+                            } else {
+                                base.clickable(
+                                    interactionSource = interaction,
+                                    indication = null,
+                                    onClick = onClick,
+                                )
+                            }
+                        }
+                        .paneNavItem(
+                            cornerRadius = 10.dp,
+                            onActivate = onClick,
+                            onSecondary = onSecondary,
+                            isEntry = isEntry,
+                            onHighlighted = onHighlighted,
+                            highlightColor = NavHighlight,
+                        ).padding(horizontal = 8.dp, vertical = 8.dp),
+            ) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Icon(
+                        imageVector =
+                            when {
+                                entry.isParent -> Icons.Outlined.KeyboardArrowUp
+                                entry.isSelectableFile -> Icons.Outlined.Description
+                                else -> Icons.Outlined.Folder
+                            },
+                        contentDescription = null,
+                        tint = Accent,
+                        modifier = Modifier.size(16.dp),
                     )
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null,
-                        onClick = onClick,
-                    ).padding(horizontal = 8.dp, vertical = 8.dp),
-        ) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Icon(
-                    imageVector =
-                        when {
-                            entry.isParent -> Icons.Outlined.KeyboardArrowUp
-                            entry.isSelectableFile -> Icons.Outlined.Description
-                            else -> Icons.Outlined.Folder
-                        },
-                    contentDescription = null,
-                    tint = Accent,
-                    modifier = Modifier.size(16.dp),
-                )
-                Spacer(Modifier.width(6.dp))
-                Text(
-                    text = entry.label,
-                    color = TextPrimary,
-                    fontSize = 11.sp,
-                    fontWeight = FontWeight.Medium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
+                    Spacer(Modifier.width(6.dp))
+                    Text(
+                        text = entry.label,
+                        color = TextPrimary,
+                        fontSize = 11.sp,
+                        fontWeight = FontWeight.Medium,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier.weight(1f, fill = false),
+                    )
+                    if (checked) {
+                        Spacer(Modifier.width(4.dp))
+                        Icon(
+                            imageVector = Icons.Outlined.Check,
+                            contentDescription = null,
+                            tint = Accent,
+                            modifier = Modifier.size(14.dp),
+                        )
+                    }
+                }
+            }
+
+            DropdownMenu(
+                expanded = menuExpanded,
+                onDismissRequest = onMenuDismiss,
+                shape = RoundedCornerShape(10.dp),
+                containerColor = Color(0xFF24243B),
+                border = BorderStroke(1.dp, CardBorder),
+                properties = PopupProperties(focusable = false),
+                modifier = Modifier.widthIn(min = 180.dp, max = 240.dp),
+            ) {
+                @Suppress("DEPRECATION")
+                CompositionLocalProvider(LocalRippleConfiguration provides null, LocalPaneNav provides menuRegistry) {
+                    Column(
+                        modifier =
+                            Modifier
+                                .heightIn(max = 260.dp)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        actions.forEachIndexed { index, action ->
+                            DropdownMenuItem(
+                                text = {
+                                    Row(verticalAlignment = Alignment.CenterVertically) {
+                                        Icon(
+                                            imageVector = action.icon,
+                                            contentDescription = null,
+                                            tint = Accent,
+                                            modifier = Modifier.size(16.dp),
+                                        )
+                                        Spacer(Modifier.width(10.dp))
+                                        Text(
+                                            text = action.label,
+                                            color = TextPrimary,
+                                            fontSize = 12.sp,
+                                            fontWeight = FontWeight.Medium,
+                                        )
+                                    }
+                                },
+                                onClick = action.onClick,
+                                modifier =
+                                    Modifier.paneNavItem(
+                                        cornerRadius = 6.dp,
+                                        onActivate = action.onClick,
+                                        isEntry = index == 0,
+                                    ),
+                            )
+                        }
+                    }
+                }
             }
         }
     }
@@ -776,41 +1576,58 @@ object DirectoryPickerDialog {
         trailing: androidx.compose.ui.graphics.vector.ImageVector? = null,
         trailingRotationDegrees: Float = 0f,
         modifier: Modifier = Modifier,
+        accent: Boolean = false,
+        active: Boolean = false,
+        compact: Boolean = false,
         onClick: () -> Unit,
     ) {
+        val highlight = accent || active
+        val chipBackground =
+            when {
+                active -> Accent.copy(alpha = 0.22f)
+                accent -> Color.Transparent
+                else -> WinNativePanel
+            }
+        val chipBorder = if (highlight) Accent.copy(alpha = if (active) 0.9f else 0.4f) else CardBorder
+        val iconTint = if (highlight) Accent else TextSecondary
+        val labelColor = if (highlight) Accent else TextPrimary
         Row(
             modifier =
                 modifier
                     .clip(RoundedCornerShape(10.dp))
-                    .background(WinNativePanel)
-                    .border(1.dp, CardBorder, RoundedCornerShape(10.dp))
+                    .paneNavItem(cornerRadius = 10.dp, onActivate = onClick)
+                    .background(chipBackground)
+                    .border(1.dp, chipBorder, RoundedCornerShape(10.dp))
                     .clickable(
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = null,
+                        indication = if (highlight) ripple(color = Accent) else null,
                         onClick = onClick,
-                    ).padding(horizontal = 10.dp, vertical = 6.dp),
+                    ).padding(horizontal = if (compact) 8.dp else 10.dp, vertical = 6.dp),
+            horizontalArrangement = if (compact) Arrangement.Center else Arrangement.Start,
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(
                 imageVector = icon,
                 contentDescription = null,
-                tint = TextSecondary,
+                tint = iconTint,
                 modifier = Modifier.size(14.dp),
             )
             Spacer(Modifier.width(4.dp))
             Text(
                 text = label,
-                color = TextPrimary,
+                color = labelColor,
                 fontSize = 10.sp,
                 fontWeight = FontWeight.SemiBold,
                 maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = if (compact) Modifier.weight(1f, fill = false) else Modifier,
             )
             if (trailing != null) {
                 Spacer(Modifier.width(4.dp))
                 Icon(
                     imageVector = trailing,
                     contentDescription = null,
-                    tint = TextSecondary,
+                    tint = iconTint,
                     modifier =
                         Modifier
                             .size(15.dp)
@@ -823,10 +1640,8 @@ object DirectoryPickerDialog {
     @Composable
     private fun FooterActionButton(
         label: String,
-        textColor: Color,
         modifier: Modifier = Modifier,
-        backgroundColor: Color = WinNativePanel,
-        borderColor: Color = CardBorder,
+        tone: Color = Accent,
         onClick: () -> Unit,
     ) {
         Box(
@@ -835,18 +1650,18 @@ object DirectoryPickerDialog {
                     .widthIn(min = 74.dp)
                     .height(FooterButtonHeight)
                     .clip(RoundedCornerShape(10.dp))
-                    .background(backgroundColor)
-                    .border(1.dp, borderColor, RoundedCornerShape(10.dp))
+                    .paneNavItem(cornerRadius = 10.dp, onActivate = onClick)
+                    .border(1.dp, tone.copy(alpha = 0.4f), RoundedCornerShape(10.dp))
                     .clickable(
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = null,
+                        indication = ripple(color = tone),
                         onClick = onClick,
                     ),
             contentAlignment = Alignment.Center,
         ) {
             Text(
                 text = label,
-                color = textColor,
+                color = tone,
                 fontSize = 11.sp,
                 fontWeight = FontWeight.Bold,
             )
@@ -881,7 +1696,7 @@ object DirectoryPickerDialog {
                 entries += Entry(label = entryLabel(child), target = child)
             }
 
-        if (mode == SelectionMode.FILE) {
+        if (mode == SelectionMode.FILE || mode == SelectionMode.MANAGE) {
             children
                 .filter { it.isFile && canSelectFile(it, allowedExtensions) }
                 .forEach { file ->
@@ -896,6 +1711,73 @@ object DirectoryPickerDialog {
         return entries
     }
 
+    private fun uniqueChild(
+        parent: File,
+        name: String,
+    ): File {
+        var candidate = File(parent, name)
+        var index = 2
+        while (candidate.exists()) {
+            candidate = File(parent, "$name ($index)")
+            index++
+        }
+        return candidate
+    }
+
+    private fun treeSize(file: File): Long =
+        if (file.isDirectory) {
+            file.walkTopDown().filter { it.isFile }.fold(0L) { acc, f -> acc + f.length() }
+        } else {
+            file.length()
+        }
+
+    private fun transferRecursively(
+        src: File,
+        dest: File,
+        isCut: Boolean,
+        onProgress: (Float) -> Unit,
+        isActive: () -> Boolean,
+    ) {
+        if (isCut && runCatching { src.renameTo(dest) }.getOrDefault(false)) {
+            onProgress(1f)
+            return
+        }
+        val total =
+            src.walkTopDown()
+                .filter { it.isFile }
+                .fold(0L) { acc, f -> acc + f.length() }
+                .coerceAtLeast(1L)
+        var copied = 0L
+        var lastPercent = -1
+        val buffer = ByteArray(1 shl 16)
+        src.walkTopDown().forEach { f ->
+            if (!isActive()) throw CancellationException()
+            val target = if (f == src) dest else File(dest, f.relativeTo(src).path)
+            if (f.isDirectory) {
+                target.mkdirs()
+            } else {
+                target.parentFile?.mkdirs()
+                f.inputStream().use { input ->
+                    target.outputStream().use { output ->
+                        while (true) {
+                            if (!isActive()) throw CancellationException()
+                            val read = input.read(buffer)
+                            if (read < 0) break
+                            output.write(buffer, 0, read)
+                            copied += read
+                            val percent = ((copied * 100) / total).toInt()
+                            if (percent != lastPercent) {
+                                lastPercent = percent
+                                onProgress((percent / 100f).coerceIn(0f, 1f))
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (isCut) src.deleteRecursively()
+    }
+
     private fun entryLabel(file: File): String = file.name.ifBlank { file.absolutePath }
 
     private fun resolveInitialDirectory(
@@ -925,6 +1807,9 @@ object DirectoryPickerDialog {
 
     private fun canBrowse(dir: File?): Boolean = StoragePathUtils.canBrowse(dir)
 
+    private fun isExecutable(file: File): Boolean =
+        file.isFile && ExecutableExtensions.contains(file.extension.lowercase(Locale.ROOT))
+
     private fun canSelectFile(
         file: File,
         allowedExtensions: Set<String>,
@@ -977,9 +1862,414 @@ object DirectoryPickerDialog {
     @Composable
     private fun activityString(resId: Int): String = androidx.compose.ui.res.stringResource(id = resId)
 
+    @Composable
+    private fun activityString(
+        resId: Int,
+        vararg formatArgs: Any,
+    ): String = androidx.compose.ui.res.stringResource(id = resId, formatArgs = formatArgs)
+
     @Composable
     private fun activityPlural(
         resId: Int,
         quantity: Int,
     ): String = androidx.compose.ui.res.pluralStringResource(id = resId, count = quantity, quantity)
+
+    @Composable
+    private fun ManageRootSelector(
+        managedRoots: List<ManagedRoot>,
+        currentDir: File,
+        expanded: Boolean,
+        onExpandedChange: (Boolean) -> Unit,
+        onRootSelected: (String) -> Unit,
+        navRegistry: PaneNavRegistry? = null,
+        modifier: Modifier = Modifier,
+    ) {
+        val chevronRotation by animateFloatAsState(
+            targetValue = if (expanded) 180f else 0f,
+            animationSpec = tween(durationMillis = 180),
+            label = "manageRootChevronRotation",
+        )
+        Box(modifier = modifier) {
+            SecondaryActionChip(
+                label = activityString(R.string.common_ui_storage_roots),
+                icon = Icons.Outlined.Storage,
+                trailing = Icons.Outlined.KeyboardArrowDown,
+                trailingRotationDegrees = chevronRotation,
+                modifier = Modifier.fillMaxWidth(),
+                onClick = { onExpandedChange(true) },
+            )
+            DropdownMenu(
+                expanded = expanded,
+                onDismissRequest = { onExpandedChange(false) },
+                offset = DpOffset(x = 0.dp, y = (-8).dp),
+                shape = RoundedCornerShape(10.dp),
+                containerColor = Color(0xFF24243B),
+                border = BorderStroke(1.dp, CardBorder),
+                properties = PopupProperties(focusable = false),
+                modifier = Modifier.widthIn(min = 200.dp, max = 420.dp),
+            ) {
+                @Suppress("DEPRECATION")
+                CompositionLocalProvider(LocalRippleConfiguration provides null, LocalPaneNav provides navRegistry) {
+                    Column(
+                        modifier =
+                            Modifier
+                                .heightIn(max = 360.dp)
+                                .verticalScroll(rememberScrollState()),
+                    ) {
+                        managedRoots.forEachIndexed { index, root ->
+                            val selected = isSameOrDescendant(currentDir, File(root.path))
+                            DropdownMenuItem(
+                                text = {
+                                    Column {
+                                        Text(
+                                            text = root.label,
+                                            color = if (selected) Accent else TextPrimary,
+                                            fontSize = 12.sp,
+                                            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium,
+                                            maxLines = 1,
+                                        )
+                                        Text(
+                                            text = root.path,
+                                            color = TextSecondary,
+                                            fontSize = 9.sp,
+                                            maxLines = 1,
+                                            overflow = TextOverflow.Ellipsis,
+                                        )
+                                    }
+                                },
+                                onClick = { onRootSelected(root.path) },
+                                modifier =
+                                    Modifier
+                                        .paneNavItem(
+                                            cornerRadius = 6.dp,
+                                            onActivate = { onRootSelected(root.path) },
+                                            isEntry = index == 0,
+                                        ).background(
+                                            if (selected) Accent.copy(alpha = 0.08f) else Color.Transparent,
+                                        ),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun ContainerPickerOverlay(
+        modifier: Modifier,
+        containers: List<ManagedContainer>,
+        onPick: (Int) -> Unit,
+        onDismiss: () -> Unit,
+    ) {
+        Box(
+            modifier =
+                modifier
+                    .background(Color.Black.copy(alpha = 0.5f))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onDismiss,
+                    ),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth(0.72f)
+                        .clip(RoundedCornerShape(16.dp))
+                        .background(CardDark)
+                        .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = {},
+                        ).padding(16.dp),
+            ) {
+                Text(
+                    text = activityString(R.string.file_manager_run_in_container),
+                    color = TextPrimary,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+                Spacer(Modifier.height(12.dp))
+                if (containers.isEmpty()) {
+                    Text(
+                        text = activityString(R.string.file_manager_no_containers),
+                        color = TextSecondary,
+                        fontSize = 12.sp,
+                    )
+                } else {
+                    Column(
+                        modifier =
+                            Modifier
+                                .heightIn(max = 320.dp)
+                                .verticalScroll(rememberScrollState()),
+                        verticalArrangement = Arrangement.spacedBy(6.dp),
+                    ) {
+                        containers.forEachIndexed { index, c ->
+                            Row(
+                                modifier =
+                                    Modifier
+                                        .fillMaxWidth()
+                                        .clip(RoundedCornerShape(10.dp))
+                                        .paneNavItem(
+                                            cornerRadius = 10.dp,
+                                            onActivate = { onPick(c.id) },
+                                            isEntry = index == 0,
+                                        ).background(WinNativePanel)
+                                        .border(1.dp, CardBorder, RoundedCornerShape(10.dp))
+                                        .clickable(
+                                            interactionSource = remember { MutableInteractionSource() },
+                                            indication = null,
+                                            onClick = { onPick(c.id) },
+                                        ).padding(horizontal = 12.dp, vertical = 12.dp),
+                                verticalAlignment = Alignment.CenterVertically,
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Outlined.Storage,
+                                    contentDescription = null,
+                                    tint = Accent,
+                                    modifier = Modifier.size(18.dp),
+                                )
+                                Spacer(Modifier.width(10.dp))
+                                Text(
+                                    text = "${c.name} (#${c.id})",
+                                    color = TextPrimary,
+                                    fontSize = 13.sp,
+                                    fontWeight = FontWeight.Medium,
+                                )
+                            }
+                        }
+                    }
+                }
+                Spacer(Modifier.height(16.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                ) {
+                    FooterActionButton(
+                        label = activityString(R.string.common_ui_cancel),
+                        modifier = Modifier.height(FooterButtonHeight),
+                        onClick = onDismiss,
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun TextInputOverlay(
+        modifier: Modifier,
+        title: String,
+        initial: String,
+        confirmLabel: String,
+        onConfirm: (String) -> Unit,
+        onDismiss: () -> Unit,
+        onTextChange: (String) -> Unit = {},
+    ) {
+        var text by remember { mutableStateOf(initial) }
+        val focusRequester = remember { FocusRequester() }
+        val keyboard = LocalSoftwareKeyboardController.current
+        LaunchedEffect(Unit) {
+            focusRequester.requestFocus()
+            keyboard?.show()
+        }
+        Box(
+            modifier =
+                modifier
+                    .background(Color.Black.copy(alpha = 0.5f))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onDismiss,
+                    ),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth(0.86f)
+                        .clip(RoundedCornerShape(16.dp))
+                        .background(CardDark)
+                        .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = {},
+                        ).padding(16.dp),
+            ) {
+                Text(
+                    text = title,
+                    color = TextPrimary,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+                Spacer(Modifier.height(12.dp))
+                OutlinedTextField(
+                    value = text,
+                    onValueChange = {
+                        text = it
+                        onTextChange(it)
+                    },
+                    singleLine = true,
+                    modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
+                )
+                Spacer(Modifier.height(16.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                ) {
+                    FooterActionButton(
+                        label = activityString(R.string.common_ui_cancel),
+                        modifier = Modifier.height(FooterButtonHeight),
+                        onClick = onDismiss,
+                    )
+                    FooterActionButton(
+                        label = confirmLabel,
+                        modifier = Modifier.height(FooterButtonHeight),
+                        onClick = { onConfirm(text) },
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun ConfirmOverlay(
+        modifier: Modifier,
+        title: String,
+        message: String,
+        confirmLabel: String,
+        onConfirm: () -> Unit,
+        onDismiss: () -> Unit,
+    ) {
+        val danger = Color(0xFFFF6B6B)
+        Box(
+            modifier =
+                modifier
+                    .background(Color.Black.copy(alpha = 0.5f))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onDismiss,
+                    ),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth(0.86f)
+                        .clip(RoundedCornerShape(16.dp))
+                        .background(CardDark)
+                        .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = {},
+                        ).padding(16.dp),
+            ) {
+                Text(
+                    text = title,
+                    color = TextPrimary,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+                Spacer(Modifier.height(10.dp))
+                Text(
+                    text = message,
+                    color = TextSecondary,
+                    fontSize = 12.sp,
+                )
+                Spacer(Modifier.height(16.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                ) {
+                    FooterActionButton(
+                        label = activityString(R.string.common_ui_cancel),
+                        modifier = Modifier.height(FooterButtonHeight),
+                        onClick = onDismiss,
+                    )
+                    FooterActionButton(
+                        label = confirmLabel,
+                        tone = danger,
+                        modifier = Modifier.height(FooterButtonHeight),
+                        onClick = onConfirm,
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun TransferProgressOverlay(
+        modifier: Modifier,
+        label: String,
+        progress: Float,
+        onCancel: () -> Unit,
+    ) {
+        Box(
+            modifier =
+                modifier
+                    .background(Color.Black.copy(alpha = 0.5f))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = {},
+                    ),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxWidth(0.86f)
+                        .clip(RoundedCornerShape(16.dp))
+                        .background(CardDark)
+                        .border(1.dp, CardBorder, RoundedCornerShape(16.dp))
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = {},
+                        ).padding(16.dp),
+            ) {
+                Text(
+                    text = label,
+                    color = TextPrimary,
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Spacer(Modifier.height(14.dp))
+                LinearProgressIndicator(
+                    progress = { progress },
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .height(6.dp)
+                            .clip(RoundedCornerShape(3.dp)),
+                    color = Accent,
+                    trackColor = WinNativePanel,
+                )
+                Spacer(Modifier.height(8.dp))
+                Text(
+                    text = "${(progress * 100).toInt()}%",
+                    color = TextSecondary,
+                    fontSize = 11.sp,
+                )
+                Spacer(Modifier.height(16.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                ) {
+                    FooterActionButton(
+                        label = activityString(R.string.common_ui_cancel),
+                        modifier = Modifier.height(FooterButtonHeight),
+                        onClick = onCancel,
+                    )
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/shared/android/LocaleHelper.kt b/app/src/main/shared/android/LocaleHelper.kt
index 1a9592777..194052999 100644
--- a/app/src/main/shared/android/LocaleHelper.kt
+++ b/app/src/main/shared/android/LocaleHelper.kt
@@ -23,11 +23,13 @@ object LocaleHelper {
             "de",
             "es",
             "fr",
+            "hi",
             "it",
             "ko",
             "pl",
             "pt-BR",
             "ro",
+            "ru",
             "uk",
             "zh-CN",
             "zh-TW",
@@ -42,11 +44,13 @@ object LocaleHelper {
             "Deutsch",
             "Español",
             "Français",
+            "हिन्दी",
             "Italiano",
             "한국어",
             "Polski",
             "Português (Brasil)",
             "Română",
+            "Русский",
             "Українська",
             "简体中文",
             "繁體中文",
diff --git a/app/src/main/shared/android/NotificationHelper.kt b/app/src/main/shared/android/NotificationHelper.kt
index e3105288d..25bf7c9b9 100644
--- a/app/src/main/shared/android/NotificationHelper.kt
+++ b/app/src/main/shared/android/NotificationHelper.kt
@@ -25,7 +25,15 @@ class NotificationHelper
             private const val CHANNEL_NAME = "WinNative Foreground Service"
             private const val NOTIFICATION_ID = 1
 
+            private const val CHAT_CHANNEL_ID = "winnative_steam_chat"
+            private const val CHAT_CHANNEL_NAME = "Steam Chat"
+
+            const val BACKGROUND_RUNNING_NOTIFICATION_ID = 3
+            private const val CHAT_BG_CHANNEL_ID = "winnative_chat_background"
+            private const val CHAT_BG_CHANNEL_NAME = "Steam Background"
+
             const val ACTION_EXIT = BuildConfig.APPLICATION_ID + ".EXIT"
+            const val EXTRA_OPEN_CHAT_FRIEND_ID = BuildConfig.APPLICATION_ID + ".OPEN_CHAT_FRIEND_ID"
         }
 
         private val notificationManager: NotificationManager =
@@ -47,6 +55,66 @@ class NotificationHelper
                 }
 
             notificationManager.createNotificationChannel(channel)
+
+            val chatChannel =
+                NotificationChannel(
+                    CHAT_CHANNEL_ID,
+                    CHAT_CHANNEL_NAME,
+                    NotificationManager.IMPORTANCE_HIGH,
+                ).apply {
+                    description = "Incoming Steam friend messages"
+                    setShowBadge(true)
+                }
+
+            notificationManager.createNotificationChannel(chatChannel)
+
+            val backgroundChannel =
+                NotificationChannel(
+                    CHAT_BG_CHANNEL_ID,
+                    CHAT_BG_CHANNEL_NAME,
+                    NotificationManager.IMPORTANCE_DEFAULT,
+                ).apply {
+                    description = "Shown while Steam chat keeps running after you exit"
+                    setShowBadge(false)
+                    setSound(null, null)
+                    enableVibration(false)
+                }
+
+            notificationManager.createNotificationChannel(backgroundChannel)
+        }
+
+        private fun chatNotificationId(friendId: Long): Int = 2_000_000 + ((friendId.hashCode() and 0x7FFFFFFF) % 1_000_000)
+
+        fun notifyChatMessage(friendId: Long, sender: String, message: String) {
+            val intent =
+                Intent(context, UnifiedActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                    putExtra(EXTRA_OPEN_CHAT_FRIEND_ID, friendId)
+                }
+            val pendingIntent =
+                PendingIntent.getActivity(
+                    context,
+                    friendId.hashCode(),
+                    intent,
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+                )
+            val notification =
+                NotificationCompat
+                    .Builder(context, CHAT_CHANNEL_ID)
+                    .setContentTitle(sender)
+                    .setContentText(message)
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setPriority(NotificationCompat.PRIORITY_HIGH)
+                    .setCategory(NotificationCompat.CATEGORY_MESSAGE)
+                    .setAutoCancel(true)
+                    .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+                    .setContentIntent(pendingIntent)
+                    .build()
+            notificationManager.notify(chatNotificationId(friendId), notification)
+        }
+
+        fun cancelChatNotification(friendId: Long) {
+            notificationManager.cancel(chatNotificationId(friendId))
         }
 
         fun notify(content: String) {
@@ -58,6 +126,10 @@ class NotificationHelper
             notificationManager.cancel(NOTIFICATION_ID)
         }
 
+        fun cancelBackgroundRunning() {
+            notificationManager.cancel(BACKGROUND_RUNNING_NOTIFICATION_ID)
+        }
+
         fun createForegroundNotification(content: String): Notification {
             val intent =
                 Intent(context, UnifiedActivity::class.java).apply {
@@ -98,4 +170,41 @@ class NotificationHelper
                 .addAction(0, "Exit", stopPendingIntent)
                 .build()
         }
+
+        fun createBackgroundRunningNotification(): Notification {
+            val intent =
+                Intent(context, UnifiedActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                }
+            val pendingIntent =
+                PendingIntent.getActivity(
+                    context,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+                )
+            val stopIntent =
+                Intent(context, SteamService::class.java).apply {
+                    action = ACTION_EXIT
+                }
+            val stopPendingIntent =
+                PendingIntent.getForegroundService(
+                    context,
+                    0,
+                    stopIntent,
+                    PendingIntent.FLAG_IMMUTABLE,
+                )
+            return NotificationCompat
+                .Builder(context, CHAT_BG_CHANNEL_ID)
+                .setContentTitle(context.getString(R.string.common_ui_app_name))
+                .setContentText("Steam chat running in background")
+                .setSmallIcon(R.drawable.ic_notification)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setOnlyAlertOnce(true)
+                .setAutoCancel(false)
+                .setOngoing(true)
+                .setContentIntent(pendingIntent)
+                .addAction(0, "Exit", stopPendingIntent)
+                .build()
+        }
     }
diff --git a/app/src/main/shared/android/RefreshRateUtils.java b/app/src/main/shared/android/RefreshRateUtils.java
index 4d9f8878f..6f25edb8f 100644
--- a/app/src/main/shared/android/RefreshRateUtils.java
+++ b/app/src/main/shared/android/RefreshRateUtils.java
@@ -138,6 +138,7 @@ public static int resolvePreferredDisplayModeId(Activity activity, int requested
 
     Display.Mode bestMode = null;
     float bestModeRate = 0f;
+    boolean bestIsExact = false;
     float closestDelta = Float.MAX_VALUE;
 
     for (Display.Mode mode : modes) {
@@ -155,15 +156,18 @@ public static int resolvePreferredDisplayModeId(Activity activity, int requested
       }
 
       if (Math.round(refreshRate) == requestedHz) {
-        if (bestMode == null || refreshRate > bestModeRate) {
+        // Any exact match beats a non-exact one; among exact matches keep the highest rate.
+        if (!bestIsExact || refreshRate > bestModeRate) {
           bestMode = mode;
           bestModeRate = refreshRate;
+          bestIsExact = true;
           closestDelta = 0f;
         }
         continue;
       }
 
-      if (bestMode != null && closestDelta == 0f) continue;
+      // Never let a non-exact mode override an exact match found elsewhere in the list.
+      if (bestIsExact) continue;
 
       float delta = Math.abs(refreshRate - requestedHz);
       if (bestMode == null
@@ -182,7 +186,8 @@ public static int resolvePreferredDisplayModeId(Activity activity, int requested
   }
 
   public static int resolveFramePacedRefreshRate(Activity activity, int requestedHz, int fpsLimit) {
-    if (fpsLimit <= 0) {
+    // An explicit rate is the user's choice; only auto is steered to fit the cap's cadence.
+    if (fpsLimit <= 0 || requestedHz > 0) {
       return requestedHz;
     }
 
@@ -296,12 +301,18 @@ public static void applyPreferredRefreshRate(Activity activity, int requestedHz)
   public static void applyPreferredRefreshRate(Activity activity, int requestedHz, int fpsLimit) {
     if (activity.isFinishing() || activity.isDestroyed()) return;
 
+    // The window has no display until it is attached; applying here resolves to a
+    // bogus fallback (mode 0 / default rate) that briefly overrides the real choice.
+    // Skip and let the next apply (resume / focus / display-change) set it once ready.
+    if (getDisplay(activity) == null) return;
+
     int effectiveRequestedHz = resolveFramePacedRefreshRate(activity, requestedHz, fpsLimit);
     WindowManager.LayoutParams params = activity.getWindow().getAttributes();
     int modeId = resolvePreferredDisplayModeId(activity, effectiveRequestedHz);
     float refreshRate = resolvePreferredRefreshRate(activity, effectiveRequestedHz);
     params.preferredDisplayModeId = modeId;
-    params.preferredRefreshRate = refreshRate;
+    // Must be 0 when a modeId is set.
+    params.preferredRefreshRate = modeId != 0 ? 0f : refreshRate;
     activity.getWindow().setAttributes(params);
     Log.d(
         TAG,
@@ -317,4 +328,12 @@ public static void applyPreferredRefreshRate(Activity activity, int requestedHz,
             + " refreshRate="
             + refreshRate);
   }
+
+  /** Current active refresh rate of the activity's display in Hz (0 if unavailable). */
+  public static float getActiveRefreshRate(Activity activity) {
+    Display display = getDisplay(activity);
+    if (display == null) return 0f;
+    Display.Mode mode = display.getMode();
+    return mode != null ? mode.getRefreshRate() : 0f;
+  }
 }
diff --git a/app/src/main/shared/io/ArchiveExtractor.kt b/app/src/main/shared/io/ArchiveExtractor.kt
new file mode 100644
index 000000000..6e4d353a6
--- /dev/null
+++ b/app/src/main/shared/io/ArchiveExtractor.kt
@@ -0,0 +1,325 @@
+package com.winlator.cmod.shared.io
+
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.util.Locale
+import kotlin.coroutines.cancellation.CancellationException
+import org.apache.commons.compress.archivers.sevenz.SevenZFile
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
+import org.apache.commons.compress.compressors.xz.XZCompressorInputStream
+import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream
+
+object ArchiveExtractor {
+    private const val BUFFER_SIZE = 1 shl 16
+    private const val TAR_HEADER_SIZE = 512
+
+    private val COMPOUND_SUFFIXES =
+        listOf(".tar.gz", ".tar.bz2", ".tar.xz", ".tar.zst", ".tar.zstd")
+
+    private val SIMPLE_SUFFIXES =
+        listOf(
+            ".zip", ".7z", ".tar",
+            ".tgz", ".tbz2", ".tbz", ".txz", ".tzst",
+            ".gz", ".bz2", ".xz", ".zst", ".zstd",
+            ".wcp",
+        )
+
+    private enum class Format { ZIP, SEVENZ, XZ, ZSTD, GZIP, BZIP2, NONE }
+
+    fun isSupported(file: File): Boolean {
+        if (!file.isFile) return false
+        val name = file.name.lowercase(Locale.ROOT)
+        if (COMPOUND_SUFFIXES.any { name.endsWith(it) } || SIMPLE_SUFFIXES.any { name.endsWith(it) }) return true
+        val head = readHead(file)
+        return magicFormat(head) != Format.NONE || hasTarMagic(head)
+    }
+
+    fun baseName(file: File): String {
+        val name = file.name
+        val lower = name.lowercase(Locale.ROOT)
+        val suffix =
+            COMPOUND_SUFFIXES.firstOrNull { lower.endsWith(it) }
+                ?: SIMPLE_SUFFIXES.firstOrNull { lower.endsWith(it) }
+        val stripped = if (suffix != null) name.dropLast(suffix.length) else name
+        return stripped.ifBlank { name }
+    }
+
+    @Throws(IOException::class)
+    fun extract(
+        source: File,
+        destDir: File,
+        onProgress: (Float) -> Unit,
+        isActive: () -> Boolean,
+    ) {
+        if (!destDir.exists() && !destDir.mkdirs()) throw IOException("Cannot create ${destDir.name}")
+        when (val format = detectFormat(source)) {
+            Format.ZIP -> extractZip(source, destDir, onProgress, isActive)
+            Format.SEVENZ -> extractSevenZ(source, destDir, onProgress, isActive)
+            else -> extractStream(source, destDir, format, onProgress, isActive)
+        }
+    }
+
+    private fun detectFormat(source: File): Format {
+        val magic = magicFormat(readHead(source))
+        return if (magic != Format.NONE) magic else suffixFormat(source)
+    }
+
+    private fun magicFormat(head: ByteArray): Format =
+        when {
+            matches(head, 0x50, 0x4B, 0x03, 0x04) -> Format.ZIP
+            matches(head, 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C) -> Format.SEVENZ
+            matches(head, 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00) -> Format.XZ
+            matches(head, 0x28, 0xB5, 0x2F, 0xFD) -> Format.ZSTD
+            matches(head, 0x1F, 0x8B) -> Format.GZIP
+            matches(head, 0x42, 0x5A, 0x68) -> Format.BZIP2
+            else -> Format.NONE
+        }
+
+    private fun suffixFormat(source: File): Format {
+        val name = source.name.lowercase(Locale.ROOT)
+        return when {
+            name.endsWith(".zip") -> Format.ZIP
+            name.endsWith(".7z") -> Format.SEVENZ
+            name.endsWith(".gz") || name.endsWith(".tgz") -> Format.GZIP
+            name.endsWith(".bz2") || name.endsWith(".tbz2") || name.endsWith(".tbz") -> Format.BZIP2
+            name.endsWith(".xz") || name.endsWith(".txz") -> Format.XZ
+            name.endsWith(".zst") || name.endsWith(".zstd") || name.endsWith(".tzst") -> Format.ZSTD
+            else -> Format.NONE
+        }
+    }
+
+    private fun matches(
+        head: ByteArray,
+        vararg signature: Int,
+    ): Boolean {
+        if (head.size < signature.size) return false
+        return signature.indices.all { (head[it].toInt() and 0xFF) == signature[it] }
+    }
+
+    private fun hasTarMagic(head: ByteArray): Boolean =
+        head.size >= TAR_HEADER_SIZE && String(head, 257, 5, Charsets.US_ASCII) == "ustar"
+
+    private fun readHead(file: File): ByteArray =
+        try {
+            FileInputStream(file).use { input ->
+                val buffer = ByteArray(TAR_HEADER_SIZE)
+                var read = 0
+                while (read < buffer.size) {
+                    val n = input.read(buffer, read, buffer.size - read)
+                    if (n < 0) break
+                    read += n
+                }
+                if (read == buffer.size) buffer else buffer.copyOf(read)
+            }
+        } catch (e: IOException) {
+            ByteArray(0)
+        }
+
+    private fun extractZip(
+        source: File,
+        destDir: File,
+        onProgress: (Float) -> Unit,
+        isActive: () -> Boolean,
+    ) {
+        val total = source.length().coerceAtLeast(1L)
+        val counting = CountingInputStream(FileInputStream(source))
+        ZipArchiveInputStream(BufferedInputStream(counting, BUFFER_SIZE)).use { zip ->
+            val reporter = ProgressReporter(onProgress)
+            while (true) {
+                if (!isActive()) throw CancellationException()
+                val entry = zip.nextEntry ?: break
+                if (!zip.canReadEntryData(entry)) continue
+                val target = safeChild(destDir, entry.name) ?: continue
+                if (entry.isDirectory) {
+                    target.mkdirs()
+                    continue
+                }
+                writeEntry(zip, target, isActive) { reporter.report(counting.count.toFloat() / total) }
+            }
+        }
+        onProgress(1f)
+    }
+
+    private fun extractSevenZ(
+        source: File,
+        destDir: File,
+        onProgress: (Float) -> Unit,
+        isActive: () -> Boolean,
+    ) {
+        SevenZFile.builder().setFile(source).get().use { archive ->
+            val total = archive.entries.sumOf { it.size.coerceAtLeast(0L) }.coerceAtLeast(1L)
+            var done = 0L
+            val reporter = ProgressReporter(onProgress)
+            val buffer = ByteArray(BUFFER_SIZE)
+            while (true) {
+                if (!isActive()) throw CancellationException()
+                val entry = archive.nextEntry ?: break
+                val target = safeChild(destDir, entry.name) ?: continue
+                if (entry.isDirectory) {
+                    target.mkdirs()
+                    continue
+                }
+                target.parentFile?.mkdirs()
+                target.outputStream().use { out ->
+                    while (true) {
+                        if (!isActive()) throw CancellationException()
+                        val read = archive.read(buffer)
+                        if (read < 0) break
+                        out.write(buffer, 0, read)
+                        done += read
+                        reporter.report(done.toFloat() / total)
+                    }
+                }
+            }
+        }
+        onProgress(1f)
+    }
+
+    private fun extractStream(
+        source: File,
+        destDir: File,
+        format: Format,
+        onProgress: (Float) -> Unit,
+        isActive: () -> Boolean,
+    ) {
+        val total = source.length().coerceAtLeast(1L)
+        val counting = CountingInputStream(FileInputStream(source))
+        val decompressed = wrapCompressor(format, BufferedInputStream(counting, BUFFER_SIZE))
+        BufferedInputStream(decompressed, BUFFER_SIZE).use { stream ->
+            val reporter = ProgressReporter(onProgress)
+            val progress = { reporter.report(counting.count.toFloat() / total) }
+            if (looksLikeTar(stream)) {
+                extractTar(stream, destDir, isActive, progress)
+            } else {
+                val target = File(destDir, baseName(source))
+                writeEntry(stream, target, isActive, progress)
+            }
+        }
+        onProgress(1f)
+    }
+
+    private fun wrapCompressor(
+        format: Format,
+        stream: InputStream,
+    ): InputStream =
+        when (format) {
+            Format.GZIP -> GzipCompressorInputStream(stream, true)
+            Format.BZIP2 -> BZip2CompressorInputStream(stream, true)
+            Format.XZ -> XZCompressorInputStream(stream, true)
+            Format.ZSTD -> ZstdCompressorInputStream(stream)
+            else -> stream
+        }
+
+    private fun looksLikeTar(stream: BufferedInputStream): Boolean {
+        stream.mark(TAR_HEADER_SIZE + 1)
+        val header = ByteArray(TAR_HEADER_SIZE)
+        var read = 0
+        while (read < TAR_HEADER_SIZE) {
+            val n = stream.read(header, read, TAR_HEADER_SIZE - read)
+            if (n < 0) break
+            read += n
+        }
+        stream.reset()
+        if (read < TAR_HEADER_SIZE) return false
+        val magic = String(header, 257, 5, Charsets.US_ASCII)
+        return magic == "ustar"
+    }
+
+    private fun extractTar(
+        stream: InputStream,
+        destDir: File,
+        isActive: () -> Boolean,
+        onProgress: () -> Unit,
+    ) {
+        TarArchiveInputStream(stream).use { tar ->
+            while (true) {
+                if (!isActive()) throw CancellationException()
+                val entry = tar.nextEntry ?: break
+                if (entry.isSymbolicLink || entry.isLink) continue
+                val target = safeChild(destDir, entry.name) ?: continue
+                if (entry.isDirectory) {
+                    target.mkdirs()
+                    continue
+                }
+                if (!entry.isFile) continue
+                writeEntry(tar, target, isActive, onProgress)
+            }
+        }
+    }
+
+    private fun writeEntry(
+        stream: InputStream,
+        target: File,
+        isActive: () -> Boolean,
+        onProgress: () -> Unit,
+    ) {
+        target.parentFile?.mkdirs()
+        val buffer = ByteArray(BUFFER_SIZE)
+        target.outputStream().use { out ->
+            while (true) {
+                if (!isActive()) throw CancellationException()
+                val read = stream.read(buffer)
+                if (read < 0) break
+                out.write(buffer, 0, read)
+                onProgress()
+            }
+        }
+    }
+
+    private fun safeChild(
+        destDir: File,
+        entryName: String,
+    ): File? {
+        val normalized = entryName.replace('\\', '/').trim()
+        if (normalized.isEmpty() || normalized.startsWith("/")) return null
+        if (normalized.split('/').any { it == ".." }) return null
+        val target = File(destDir, normalized)
+        val root = destDir.canonicalPath
+        val path = target.canonicalPath
+        return if (path == root || path.startsWith(root + File.separator)) target else null
+    }
+
+    private class ProgressReporter(private val onProgress: (Float) -> Unit) {
+        private var lastPercent = -1
+
+        fun report(fraction: Float) {
+            val clamped = fraction.coerceIn(0f, 1f)
+            val percent = (clamped * 100).toInt()
+            if (percent != lastPercent) {
+                lastPercent = percent
+                onProgress(clamped)
+            }
+        }
+    }
+
+    private class CountingInputStream(private val delegate: InputStream) : InputStream() {
+        var count = 0L
+            private set
+
+        override fun read(): Int {
+            val b = delegate.read()
+            if (b >= 0) count++
+            return b
+        }
+
+        override fun read(
+            b: ByteArray,
+            off: Int,
+            len: Int,
+        ): Int {
+            val n = delegate.read(b, off, len)
+            if (n > 0) count += n
+            return n
+        }
+
+        override fun available(): Int = delegate.available()
+
+        override fun close() = delegate.close()
+    }
+}
diff --git a/app/src/main/shared/io/FileUtils.java b/app/src/main/shared/io/FileUtils.java
index e1a48b925..7d90746f0 100644
--- a/app/src/main/shared/io/FileUtils.java
+++ b/app/src/main/shared/io/FileUtils.java
@@ -369,6 +369,9 @@ public static File createTempFile(File parent, String prefix) {
   }
 
   public static String getFilePathFromUriUsingSAF(Context context, Uri uri) {
+    if (uri == null || !"content".equalsIgnoreCase(uri.getScheme())) {
+      return null;
+    }
     String documentId;
     try {
       documentId = DocumentsContract.getTreeDocumentId(uri);
diff --git a/app/src/main/shared/io/NativeContentIO.java b/app/src/main/shared/io/NativeContentIO.java
new file mode 100644
index 000000000..7a3ee0b23
--- /dev/null
+++ b/app/src/main/shared/io/NativeContentIO.java
@@ -0,0 +1,65 @@
+package com.winlator.cmod.shared.io;
+
+import android.content.res.AssetManager;
+import com.winlator.cmod.shared.util.OnExtractFileListener;
+import java.io.File;
+
+public final class NativeContentIO {
+  public static final int TYPE_XZ = 0;
+  public static final int TYPE_ZSTD = 1;
+
+  static {
+    System.loadLibrary("winlator");
+  }
+
+  private NativeContentIO() {}
+
+  public static boolean extractArchive(
+      int type, File source, File destination, OnExtractFileListener listener) {
+    if (source == null || destination == null || !source.isFile()) return false;
+    return nativeExtractArchive(
+        type, source.getAbsolutePath(), destination.getAbsolutePath(), listener);
+  }
+
+  public static boolean extractAsset(
+      int type,
+      AssetManager assetManager,
+      String assetFile,
+      File destination,
+      OnExtractFileListener listener) {
+    if (assetManager == null || assetFile == null || assetFile.isEmpty() || destination == null) {
+      return false;
+    }
+    return nativeExtractAsset(type, assetManager, assetFile, destination.getAbsolutePath(), listener);
+  }
+
+  public static boolean downloadFile(
+      String address, File destination, String caBundlePath, Object progressListener) {
+    if (address == null || address.isEmpty() || destination == null) return false;
+    return nativeDownloadFile(
+        address,
+        destination.getAbsolutePath(),
+        caBundlePath != null ? caBundlePath : "",
+        progressListener);
+  }
+
+  public static long fetchContentLength(String address, String caBundlePath) {
+    if (address == null || address.isEmpty()) return -1L;
+    return nativeFetchContentLength(address, caBundlePath != null ? caBundlePath : "");
+  }
+
+  private static native boolean nativeExtractArchive(
+      int type, String sourcePath, String destinationPath, OnExtractFileListener listener);
+
+  private static native boolean nativeExtractAsset(
+      int type,
+      AssetManager assetManager,
+      String assetFile,
+      String destinationPath,
+      OnExtractFileListener listener);
+
+  private static native boolean nativeDownloadFile(
+      String address, String destinationPath, String caBundlePath, Object progressListener);
+
+  private static native long nativeFetchContentLength(String address, String caBundlePath);
+}
diff --git a/app/src/main/shared/io/NativeXzInputStream.java b/app/src/main/shared/io/NativeXzInputStream.java
deleted file mode 100644
index 8f2c2dca8..000000000
--- a/app/src/main/shared/io/NativeXzInputStream.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.winlator.cmod.shared.io;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-public final class NativeXzInputStream extends InputStream {
-  private final byte[] singleByteBuffer = new byte[1];
-  private long nativeHandle;
-  private boolean closed = false;
-
-  static {
-    System.loadLibrary("winlator");
-  }
-
-  public NativeXzInputStream(File source) throws IOException {
-    if (source == null) {
-      throw new NullPointerException("source");
-    }
-    if (!source.isFile()) {
-      throw new IOException("Not a file: " + source);
-    }
-
-    nativeHandle = nativeOpen(source.getAbsolutePath());
-    if (nativeHandle == 0) {
-      throw new IOException("Failed to open native XZ decoder for " + source);
-    }
-  }
-
-  @Override
-  public int read() throws IOException {
-    int amountRead = read(singleByteBuffer, 0, 1);
-    if (amountRead <= 0) {
-      return -1;
-    }
-    return singleByteBuffer[0] & 0xff;
-  }
-
-  @Override
-  public int read(byte[] buffer, int offset, int length) throws IOException {
-    if (buffer == null) {
-      throw new NullPointerException("buffer");
-    }
-    if (offset < 0 || length < 0 || length > buffer.length - offset) {
-      throw new IndexOutOfBoundsException();
-    }
-    if (length == 0) {
-      return 0;
-    }
-    ensureOpen();
-    return nativeRead(nativeHandle, buffer, offset, length);
-  }
-
-  @Override
-  public void close() throws IOException {
-    if (closed) return;
-    closed = true;
-    if (nativeHandle != 0) {
-      nativeClose(nativeHandle);
-      nativeHandle = 0;
-    }
-  }
-
-  private void ensureOpen() throws IOException {
-    if (closed || nativeHandle == 0) {
-      throw new IOException("Stream closed");
-    }
-  }
-
-  private static native long nativeOpen(String path) throws IOException;
-
-  private static native int nativeRead(long handle, byte[] buffer, int offset, int length)
-      throws IOException;
-
-  private static native void nativeClose(long handle);
-}
diff --git a/app/src/main/shared/io/StorageUtils.kt b/app/src/main/shared/io/StorageUtils.kt
index d5341beae..48098ef74 100644
--- a/app/src/main/shared/io/StorageUtils.kt
+++ b/app/src/main/shared/io/StorageUtils.kt
@@ -44,6 +44,47 @@ object StorageUtils {
         return 0L
     }
 
+    fun formatDecimalSize(
+        bytes: Long,
+        decimalPlaces: Int = 2,
+    ): String {
+        require(decimalPlaces >= 0) { "Negative decimal places unsupported" }
+        val isNegative = bytes < 0
+        val absBytes = kotlin.math.abs(bytes).toDouble()
+        if (absBytes < 1_000.0) return "${if (isNegative) -absBytes.toLong() else absBytes.toLong()} B"
+
+        val units = arrayOf("KB", "MB", "GB", "TB", "PB")
+        var value = absBytes
+        var unitIndex = -1
+        while (value >= 1_000.0 && unitIndex < units.lastIndex) {
+            value /= 1_000.0
+            unitIndex++
+        }
+        return "%.${decimalPlaces}f %s".format(
+            if (isNegative) -value else value,
+            units[unitIndex.coerceAtLeast(0)],
+        )
+    }
+
+    fun formatBitsPerSecond(
+        bytesPerSecond: Long,
+        decimalPlaces: Int = 1,
+    ): String {
+        require(decimalPlaces >= 0) { "Negative decimal places unsupported" }
+        val isNegative = bytesPerSecond < 0
+        val absBps = kotlin.math.abs(bytesPerSecond).toDouble() * 8.0
+
+        return when {
+            absBps < 1_000.0 -> "${if (isNegative) -absBps.toLong() else absBps.toLong()} bps"
+            absBps < 1_000_000.0 ->
+                "%.${decimalPlaces}f Kbps".format(if (isNegative) -absBps / 1_000.0 else absBps / 1_000.0)
+            absBps < 1_000_000_000.0 ->
+                "%.${decimalPlaces}f Mbps".format(if (isNegative) -absBps / 1_000_000.0 else absBps / 1_000_000.0)
+            else ->
+                "%.${decimalPlaces}f Gbps".format(if (isNegative) -absBps / 1_000_000_000.0 else absBps / 1_000_000_000.0)
+        }
+    }
+
     fun formatBinarySize(
         bytes: Long,
         decimalPlaces: Int = 2,
diff --git a/app/src/main/shared/io/TarCompressorUtils.java b/app/src/main/shared/io/TarCompressorUtils.java
index 9fb049c38..c9006e37f 100644
--- a/app/src/main/shared/io/TarCompressorUtils.java
+++ b/app/src/main/shared/io/TarCompressorUtils.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
-import com.github.luben.zstd.ZstdInputStreamNoFinalizer;
 import com.github.luben.zstd.ZstdOutputStreamNoFinalizer;
 import com.winlator.cmod.shared.util.OnExtractFileListener;
 import java.io.BufferedInputStream;
@@ -15,16 +14,24 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import org.apache.commons.compress.archivers.ArchiveInputStream;
+import java.util.Locale;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarConstants;
-import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 
 public abstract class TarCompressorUtils {
+  private static final String TAG = "TarCompressor";
+  private static final ExecutorService EXTRACTION_EXECUTOR =
+      Executors.newFixedThreadPool(
+          Math.max(2, Math.min(4, Runtime.getRuntime().availableProcessors())));
+
   public enum Type {
     XZ,
     ZSTD
@@ -35,6 +42,49 @@ public interface ExclusionFilter {
     boolean shouldInclude(File file);
   }
 
+  public static Future<Boolean> extractAsync(
+      Type type, Context context, String assetFile, File destination) {
+    return extractAsync(type, context, assetFile, destination, null);
+  }
+
+  public static Future<Boolean> extractAsync(
+      Type type,
+      Context context,
+      String assetFile,
+      File destination,
+      OnExtractFileListener onExtractFileListener) {
+    return submitExtraction(
+        () -> extract(type, context, assetFile, destination, onExtractFileListener));
+  }
+
+  public static Future<Boolean> extractAsync(
+      Type type, Context context, Uri source, File destination) {
+    return extractAsync(type, context, source, destination, null);
+  }
+
+  public static Future<Boolean> extractAsync(
+      Type type,
+      Context context,
+      Uri source,
+      File destination,
+      OnExtractFileListener onExtractFileListener) {
+    return submitExtraction(
+        () -> extract(type, context, source, destination, onExtractFileListener));
+  }
+
+  public static Future<Boolean> extractAsync(Type type, File source, File destination) {
+    return extractAsync(type, source, destination, null);
+  }
+
+  public static Future<Boolean> extractAsync(
+      Type type, File source, File destination, OnExtractFileListener onExtractFileListener) {
+    return submitExtraction(() -> extract(type, source, destination, onExtractFileListener));
+  }
+
+  private static Future<Boolean> submitExtraction(Callable<Boolean> task) {
+    return EXTRACTION_EXECUTOR.submit(task);
+  }
+
   private static void addFile(ArchiveOutputStream tar, File file, String entryName) {
     try {
       tar.putArchiveEntry(tar.createArchiveEntry(file, entryName));
@@ -124,10 +174,17 @@ public static boolean extract(
       String assetFile,
       File destination,
       OnExtractFileListener onExtractFileListener) {
+    if (context == null || assetFile == null || destination == null) return false;
+    int nativeType = toNativeType(type);
     try {
-      return extract(type, context.getAssets().open(assetFile), destination, onExtractFileListener);
+      if (NativeContentIO.extractAsset(
+          nativeType, context.getAssets(), assetFile, destination, onExtractFileListener)) {
+        return true;
+      }
+      Log.e(TAG, "Native asset extraction failed: " + assetFile);
+      return false;
     } catch (Throwable e) {
-      Log.e("TarCompressor", "Error extracting asset: " + assetFile, e);
+      Log.e(TAG, "Native asset extraction failed: " + assetFile, e);
       return false;
     }
   }
@@ -142,7 +199,7 @@ public static boolean extract(
       Uri source,
       File destination,
       OnExtractFileListener onExtractFileListener) {
-    if (source == null) return false;
+    if (context == null || source == null || destination == null) return false;
     try {
       String scheme = source.getScheme();
       if (source.toString().startsWith("/")
@@ -167,16 +224,20 @@ public static boolean extract(
         }
       }
 
-      InputStream inputStream = context.getContentResolver().openInputStream(source);
-      if (inputStream == null) return false;
-      return extract(
-          type,
-          null,
-          new BufferedInputStream(inputStream, StreamUtils.BUFFER_SIZE),
-          destination,
-          onExtractFileListener);
+      File stagedArchive = stageUriArchive(context, source, type);
+      if (stagedArchive == null) return false;
+      try {
+        return extract(type, stagedArchive, destination, onExtractFileListener);
+      } finally {
+        if (!stagedArchive.delete() && stagedArchive.exists()) {
+          Log.w(TAG, "Unable to delete staged archive: " + stagedArchive);
+        }
+      }
     } catch (FileNotFoundException e) {
       return false;
+    } catch (Throwable e) {
+      Log.e(TAG, "Native URI extraction failed for " + source, e);
+      return false;
     }
   }
 
@@ -186,62 +247,46 @@ public static boolean extract(Type type, File source, File destination) {
 
   public static boolean extract(
       Type type, File source, File destination, OnExtractFileListener onExtractFileListener) {
-    if (source == null || !source.isFile()) return false;
+    if (source == null || destination == null || !source.isFile()) return false;
+    int nativeType = toNativeType(type);
     try {
-      return extract(type, source, null, destination, onExtractFileListener);
+      return NativeContentIO.extractArchive(nativeType, source, destination, onExtractFileListener);
     } catch (Throwable e) {
-      Log.e("TarCompressor", "Error extracting file: " + source, e);
+      Log.e(TAG, "Native extraction failed for " + source, e);
       return false;
     }
   }
 
-  private static boolean extract(
-      Type type,
-      InputStream source,
-      File destination,
-      OnExtractFileListener onExtractFileListener) {
-    return extract(type, null, source, destination, onExtractFileListener);
+  private static int toNativeType(Type type) {
+    return type == Type.XZ ? NativeContentIO.TYPE_XZ : NativeContentIO.TYPE_ZSTD;
   }
 
-  private static boolean extract(
-      Type type,
-      File sourceFile,
-      InputStream source,
-      File destination,
-      OnExtractFileListener onExtractFileListener) {
-    if (sourceFile == null && source == null) return false;
-    try (InputStream inStream = getCompressorInputStream(type, sourceFile, source);
-        ArchiveInputStream tar = new TarArchiveInputStream(inStream)) {
-      TarArchiveEntry entry;
-      while ((entry = (TarArchiveEntry) tar.getNextEntry()) != null) {
-        if (!tar.canReadEntryData(entry)) continue;
-        File file = new File(destination, entry.getName());
-
-        if (onExtractFileListener != null) {
-          file = onExtractFileListener.onExtractFile(file, entry.getSize());
-          if (file == null) continue;
-        }
+  private static File stageUriArchive(Context context, Uri source, Type type) throws IOException {
+    File stagingDir = new File(context.getCacheDir(), "native-archive-stage");
+    if (!stagingDir.isDirectory() && !stagingDir.mkdirs()) return null;
 
-        if (entry.isDirectory()) {
-          if (!file.isDirectory()) file.mkdirs();
-        } else {
-          if (entry.isSymbolicLink()) {
-            FileUtils.symlink(entry.getLinkName(), file.getAbsolutePath());
-          } else {
-            try (BufferedOutputStream outStream =
-                new BufferedOutputStream(new FileOutputStream(file), StreamUtils.BUFFER_SIZE)) {
-              if (!StreamUtils.copy(tar, outStream)) return false;
-            }
-          }
+    File stagedArchive =
+        FileUtils.createTempFile(stagingDir, "archive-" + type.name().toLowerCase(Locale.ROOT));
+    try (InputStream inputStream = context.getContentResolver().openInputStream(source)) {
+      if (inputStream == null) {
+        stagedArchive.delete();
+        return null;
+      }
+      try (BufferedInputStream inStream =
+              new BufferedInputStream(inputStream, StreamUtils.BUFFER_SIZE);
+          BufferedOutputStream outStream =
+              new BufferedOutputStream(
+                  new FileOutputStream(stagedArchive), StreamUtils.BUFFER_SIZE)) {
+        if (!StreamUtils.copy(inStream, outStream)) {
+          stagedArchive.delete();
+          return null;
         }
-
-        applyExtractedEntryPermissions(file, entry);
       }
-      return true;
-    } catch (Throwable e) {
-      Log.e("TarCompressor", "Error during extraction", e);
-      return false;
+    } catch (IOException e) {
+      stagedArchive.delete();
+      throw e;
     }
+    return stagedArchive;
   }
 
   private static void applyExtractedEntryPermissions(File file, TarArchiveEntry entry) {
@@ -260,37 +305,6 @@ private static void applyExtractedEntryPermissions(File file, TarArchiveEntry en
     }
   }
 
-  private static InputStream getCompressorInputStream(
-      Type type, File sourceFile, InputStream source) throws IOException {
-    if (type == Type.XZ) {
-      if (sourceFile != null) {
-        try {
-          return new NativeXzInputStream(sourceFile);
-        } catch (IOException e) {
-          Log.d("TarCompressor", "Falling back to Java XZ decoder for " + sourceFile);
-          BufferedInputStream bis =
-              new BufferedInputStream(new FileInputStream(sourceFile), StreamUtils.BUFFER_SIZE);
-          try {
-            return new XZCompressorInputStream(bis);
-          } catch (IOException e2) {
-            bis.close();
-            throw e2;
-          }
-        }
-      }
-      if (source == null) return null;
-      return new XZCompressorInputStream(source);
-    } else if (type == Type.ZSTD) {
-      if (sourceFile != null) {
-        return new ZstdInputStreamNoFinalizer(
-            new BufferedInputStream(new FileInputStream(sourceFile), StreamUtils.BUFFER_SIZE));
-      }
-      if (source == null) return null;
-      return new ZstdInputStreamNoFinalizer(source);
-    }
-    return null;
-  }
-
   private static OutputStream getCompressorOutputStream(Type type, File destination, int level)
       throws IOException {
     if (type == Type.XZ) {
@@ -376,6 +390,9 @@ public static boolean extractTar(
                 new BufferedOutputStream(new FileOutputStream(file), StreamUtils.BUFFER_SIZE)) {
               if (!StreamUtils.copy(tar, outStream)) return false;
             }
+            if (onExtractFileListener != null) {
+              onExtractFileListener.onExtractFileProgress(file, entry.getSize());
+            }
           }
         }
 
diff --git a/app/src/main/shared/theme/SessionDrawerStyle.kt b/app/src/main/shared/theme/SessionDrawerStyle.kt
new file mode 100644
index 000000000..598f55f27
--- /dev/null
+++ b/app/src/main/shared/theme/SessionDrawerStyle.kt
@@ -0,0 +1,60 @@
+package com.winlator.cmod.shared.theme
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+object SessionDrawerStyle {
+    const val SheetAlpha = 0.86f
+    const val SurfaceAlpha = 0.72f
+    const val PressedAlpha = 0.88f
+    const val GradientLift = 0.014f
+
+    val Accent = Color(0xFF2196F3)
+    val ActiveAccent = Color(0xFF29B6F6)
+    val FocusFill = Color(0xFF0E2438)
+    val TextPrimary = WinNativeTextPrimary.copy(alpha = 0.88f)
+    val TextSecondary = WinNativeTextSecondary.copy(alpha = 0.82f)
+    val Outline = WinNativeOutline
+    val Background = WinNativeBackground.copy(alpha = SheetAlpha)
+    val PaneSurface = WinNativeBackground.copy(alpha = SheetAlpha)
+    val PaneSurfacePressed = Color(0xFF232B3A).copy(alpha = PressedAlpha)
+    val TopRailSurface = WinNativeSurface.copy(alpha = SheetAlpha)
+    val TileResting = Color(0xFF20283A).copy(alpha = SurfaceAlpha)
+    val TileExitResting = Color(0xFF3A2125).copy(alpha = SurfaceAlpha)
+    val TileExitPressed = Color(0xFF4A2A30).copy(alpha = PressedAlpha)
+    val PaneInnerResting = WinNativePanel.copy(alpha = SurfaceAlpha)
+    val PaneInnerPressed = Color(0xFF242B3A).copy(alpha = PressedAlpha)
+    val RestingCardBorder = WinNativeOutline.copy(alpha = 0.72f)
+    val DisabledCardBorder = Color(0xFF202033).copy(alpha = 0.58f)
+    val ActiveCardBorder = ActiveAccent
+    val GlassExitTint = Color(0xFFE07B6B)
+    val Divider = WinNativeOutline.copy(alpha = 0.6f)
+
+    val Width = 300.dp
+    val StartPadding = 6.dp
+    val VerticalPadding = 6.dp
+    const val PaneScaleMin = 0.78f
+    const val PaneScaleReferenceHeightDp = 520f
+}
+
+object GameSettingsStyle {
+    val BgDeep = Color(0xFF11111C)
+    val SidebarBg = Color(0xFF11111C)
+    val ContentBg = Color(0xFF11111C)
+    val CardSurface = WinNativeSurface
+    val CardBorder = WinNativeOutline
+    val InputSurface = Color(0xFF171722)
+    val InputBorder = WinNativeOutline
+    val AccentBlue = WinNativeAccent
+    val TextPrimary = WinNativeTextPrimary
+    val TextSecondary = WinNativeTextSecondary
+    val TextDim = Color(0xFF6E7681)
+    val Divider = WinNativeOutline
+    val CheckBorder = WinNativeOutline
+    val SliderInactive = WinNativeSurfaceAlt
+    val ChipSurface = Color(0xFF171722)
+    val ChipBorder = WinNativeOutline
+    val DangerRed = Color(0xFFFF6B6B)
+    val WarningAmber = Color(0xFFFFB74D)
+    val NavHighlight = Color(0xFF4FC3F7)
+}
diff --git a/app/src/main/shared/ui/CarouselView.kt b/app/src/main/shared/ui/CarouselView.kt
index 74bc6dda2..cbb6e9217 100644
--- a/app/src/main/shared/ui/CarouselView.kt
+++ b/app/src/main/shared/ui/CarouselView.kt
@@ -156,7 +156,7 @@ fun <T> CarouselView(
                     label = "carouselRise",
                 )
                 val itemAlpha by animateFloatAsState(
-                    targetValue = 1f - (0.35f * distanceFraction),
+                    targetValue = 1f - (0.15f * distanceFraction),
                     animationSpec =
                         spring(
                             dampingRatio = Spring.DampingRatioNoBouncy,
diff --git a/app/src/main/shared/ui/dialog/ContainerProgressPopup.kt b/app/src/main/shared/ui/dialog/ContainerProgressPopup.kt
new file mode 100644
index 000000000..c5fe12bc7
--- /dev/null
+++ b/app/src/main/shared/ui/dialog/ContainerProgressPopup.kt
@@ -0,0 +1,122 @@
+package com.winlator.cmod.shared.ui.dialog
+
+import android.app.Activity
+import android.app.Dialog
+import android.os.Handler
+import android.os.Looper
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.annotation.StringRes
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.theme.WinNativeTheme
+
+/**
+ * Lightweight popup shown while a container action (create/remove/
+ * duplicate) is in flight. Uses the shared [PopupDialog] chrome instead
+ * of the fullscreen [PreloaderDialog] takeover, with a fade + scale
+ * entrance. Indeterminate by default; pass `indeterminate = false` and
+ * drive via [setProgress] for a determinate bar (smoothed by
+ * [PopupDialog]'s built-in animation).
+ */
+class ContainerProgressPopup(
+    private val activity: Activity,
+    @StringRes private val titleRes: Int,
+    indeterminate: Boolean = true,
+) {
+    private val dialog: Dialog = Dialog(activity, R.style.ContentDialog).apply {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+        window?.apply {
+            setBackgroundDrawableResource(android.R.color.transparent)
+            setLayout(
+                WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.MATCH_PARENT,
+            )
+            setDimAmount(0.5f)
+            addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+        }
+    }
+    private val visible = mutableStateOf(false)
+    private val progress = mutableStateOf(if (indeterminate) Float.NaN else 0f)
+
+    init {
+        val composeView = ComposeView(activity).apply {
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT,
+            )
+            setViewTreeLifecycleOwner(activity as LifecycleOwner)
+            setViewTreeSavedStateRegistryOwner(activity as SavedStateRegistryOwner)
+            setContent {
+                WinNativeTheme {
+                    Box(
+                        modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        AnimatedVisibility(
+                            visible = visible.value,
+                            enter = fadeIn(tween(180)) +
+                                scaleIn(tween(180), initialScale = 0.9f),
+                            exit = fadeOut(tween(120)) +
+                                scaleOut(tween(120), targetScale = 0.9f),
+                        ) {
+                            PopupDialog(
+                                title = stringResource(titleRes),
+                                icon = Icons.Outlined.Info,
+                                progress = progress.value,
+                                accentColor = Color(0xFF1A9FFF),
+                                modifier = Modifier.widthIn(min = 280.dp, max = 360.dp),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+        dialog.setContentView(composeView)
+    }
+
+    fun show() {
+        if (activity.isFinishing || activity.isDestroyed) return
+        if (!dialog.isShowing) {
+            try { dialog.show() } catch (_: Throwable) { return }
+        }
+        visible.value = true
+    }
+
+    fun close() {
+        try { if (dialog.isShowing) dialog.dismiss() } catch (_: Throwable) {}
+    }
+
+    fun setProgress(percent: Int) {
+        progress.value = (percent / 100f).coerceIn(0f, 1f)
+    }
+
+    fun closeWithDelay(delayMs: Long) {
+        Handler(Looper.getMainLooper()).postDelayed({ close() }, delayMs)
+    }
+}
diff --git a/app/src/main/shared/ui/dialog/PopupDialog.kt b/app/src/main/shared/ui/dialog/PopupDialog.kt
new file mode 100644
index 000000000..298d93393
--- /dev/null
+++ b/app/src/main/shared/ui/dialog/PopupDialog.kt
@@ -0,0 +1,298 @@
+package com.winlator.cmod.shared.ui.dialog
+
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Warning
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.R
+import com.winlator.cmod.shared.ui.nav.LocalPaneNav
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+
+private val DefaultAccent = Color(0xFFFF6B6B)
+private val DefaultCard = Color(0xFF12121B)
+private val DefaultTrack = Color(0xFF1F2230)
+private val DefaultTextPrimary = Color(0xFFF0F4FF)
+private val DefaultTextSecondary = Color(0xFF93A6BC)
+private val DefaultBorder = Color.White.copy(alpha = 0.14f)
+
+/**
+ * Self-contained popup card. Mode is picked from the params:
+ * - Confirm: [confirmLabel] + [onConfirm] + [onCancel] → Cancel/Confirm row (swaps to spinner + [progressLabel] mid-flight).
+ * - Progress: [progress] in 0f..1f → linear bar + %; `Float.NaN` / negative → indeterminate bar + [progressLabel] or "Working".
+ *
+ * [icon] is any Material 3 outline icon (or `null`). Pass [content] to render a custom body between the
+ * message and the footer; pass [footer] to override the auto-picked footer entirely (e.g. for dialogs
+ * that need bespoke action rows like "Clear Cache" + "OK").
+ */
+@Composable
+fun PopupDialog(
+    title: String,
+    message: String? = null,
+    modifier: Modifier = Modifier,
+    icon: ImageVector? = Icons.Outlined.Warning,
+    confirmLabel: String? = null,
+    onConfirm: (() -> Unit)? = null,
+    onCancel: (() -> Unit)? = null,
+    progressLabel: String? = null,
+    progress: Float? = null,
+    accentColor: Color = DefaultAccent,
+    confirmButtonColor: Color = accentColor,
+    cardColor: Color = DefaultCard,
+    trackColor: Color = DefaultTrack,
+    borderColor: Color = DefaultBorder,
+    textPrimaryColor: Color = DefaultTextPrimary,
+    textSecondaryColor: Color = DefaultTextSecondary,
+    content: (@Composable ColumnScope.() -> Unit)? = null,
+    footer: (@Composable () -> Unit)? = null,
+) {
+    var isConfirming by remember { mutableStateOf(false) }
+
+    Column(
+        modifier = modifier
+            .clip(RoundedCornerShape(12.dp))
+            .background(cardColor)
+            .border(BorderStroke(1.dp, borderColor), RoundedCornerShape(12.dp))
+            .padding(horizontal = 12.dp, vertical = 10.dp),
+        verticalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        Row(
+            verticalAlignment = Alignment.Top,
+            horizontalArrangement = Arrangement.spacedBy(9.dp),
+        ) {
+            if (icon != null) {
+                Icon(
+                    imageVector = icon,
+                    contentDescription = null,
+                    tint = accentColor,
+                    modifier = Modifier.size(18.dp),
+                )
+            }
+            Text(
+                text = title,
+                color = textPrimaryColor,
+                fontSize = 13.sp,
+                lineHeight = 18.sp,
+                fontWeight = FontWeight.Bold,
+            )
+        }
+
+        if (!message.isNullOrEmpty()) {
+            Text(
+                text = message,
+                color = textSecondaryColor,
+                fontSize = 12.sp,
+                lineHeight = 16.sp,
+            )
+        }
+
+        content?.invoke(this)
+
+        when {
+            footer != null ->
+                footer()
+
+            progress != null ->
+                ProgressBarFooter(
+                    progress = progress,
+                    progressLabel = progressLabel,
+                    accentColor = accentColor,
+                    trackColor = trackColor,
+                    textSecondaryColor = textSecondaryColor,
+                )
+
+            isConfirming ->
+                SpinnerFooter(
+                    progressLabel = progressLabel,
+                    confirmButtonColor = confirmButtonColor,
+                    textPrimaryColor = textPrimaryColor,
+                )
+
+            confirmLabel != null && onConfirm != null ->
+                ConfirmFooter(
+                    confirmLabel = confirmLabel,
+                    confirmButtonColor = confirmButtonColor,
+                    textSecondaryColor = textSecondaryColor,
+                    onCancel = onCancel,
+                    onConfirm = {
+                        isConfirming = true
+                        onConfirm()
+                    },
+                )
+        }
+    }
+}
+
+@Composable
+private fun ProgressBarFooter(
+    progress: Float,
+    progressLabel: String?,
+    accentColor: Color,
+    trackColor: Color,
+    textSecondaryColor: Color,
+) {
+    val barHeight = 5.dp
+    val barShape = RoundedCornerShape(3.dp)
+    val isIndeterminate = progress.isNaN() || progress < 0f
+
+    if (isIndeterminate) {
+        LinearProgressIndicator(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(barHeight)
+                .clip(barShape),
+            color = accentColor,
+            trackColor = trackColor,
+        )
+    } else {
+        val smoothed by animateFloatAsState(
+            targetValue = progress.coerceIn(0f, 1f),
+            animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing),
+            label = "popupProgress",
+        )
+        LinearProgressIndicator(
+            progress = { smoothed },
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(barHeight)
+                .clip(barShape),
+            color = accentColor,
+            trackColor = trackColor,
+            drawStopIndicator = {},
+            gapSize = 0.dp,
+        )
+    }
+
+    val rightText = when {
+        isIndeterminate -> progressLabel ?: stringResource(R.string.common_ui_working)
+        else -> "${(progress * 100).toInt().coerceIn(0, 100)}%"
+    }
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.End,
+    ) {
+        Text(
+            text = rightText,
+            color = textSecondaryColor,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.Medium,
+        )
+    }
+}
+
+@Composable
+private fun SpinnerFooter(
+    progressLabel: String?,
+    confirmButtonColor: Color,
+    textPrimaryColor: Color,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
+        horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterHorizontally),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        CircularProgressIndicator(
+            color = confirmButtonColor,
+            strokeWidth = 2.dp,
+            modifier = Modifier.size(20.dp),
+        )
+        if (progressLabel != null) {
+            Text(
+                text = progressLabel,
+                color = textPrimaryColor,
+                fontSize = 13.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        }
+    }
+}
+
+@Composable
+private fun ConfirmFooter(
+    confirmLabel: String,
+    confirmButtonColor: Color,
+    textSecondaryColor: Color,
+    onCancel: (() -> Unit)?,
+    onConfirm: () -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = if (onCancel != null) Arrangement.SpaceBetween else Arrangement.End,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (onCancel != null) {
+            PopupTextAction(
+                label = stringResource(R.string.common_ui_cancel),
+                textColor = textSecondaryColor,
+                onClick = onCancel,
+            )
+        }
+        PopupTextAction(
+            label = confirmLabel,
+            textColor = confirmButtonColor,
+            onClick = onConfirm,
+        )
+    }
+}
+
+@Composable
+fun PopupTextAction(
+    label: String,
+    textColor: Color,
+    onClick: () -> Unit,
+) {
+    val nav = LocalPaneNav.current
+    val clickModifier =
+        if (nav != null) {
+            Modifier.paneNavItem(cornerRadius = 8.dp, onActivate = onClick, tapToSelect = true)
+        } else {
+            Modifier.clickable(onClick = onClick)
+        }
+    Box(
+        modifier = Modifier
+            .clip(RoundedCornerShape(8.dp))
+            .then(clickModifier)
+            .padding(horizontal = 10.dp, vertical = 7.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = label,
+            color = textColor,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            maxLines = 1,
+        )
+    }
+}
diff --git a/app/src/main/shared/ui/dialog/PreloaderDialog.java b/app/src/main/shared/ui/dialog/PreloaderDialog.java
index 9320f9a1f..2fd37aa2b 100644
--- a/app/src/main/shared/ui/dialog/PreloaderDialog.java
+++ b/app/src/main/shared/ui/dialog/PreloaderDialog.java
@@ -69,10 +69,10 @@ private void showDialogSafely() {
   }
 
   private void clearLaunchMetadata() {
-    composeState.setGameName("");
-    composeState.setPlatform("");
-    composeState.setContainerName("");
-    composeState.setStableLaunchLayout(false);
+    composeState.setTitle("");
+    composeState.setBadge("");
+    composeState.setSubtitle("");
+    composeState.setStableContentLayout(false);
   }
 
   public synchronized void show(int textResId) {
@@ -100,22 +100,20 @@ public synchronized void show(String text) {
     showDialogSafely();
   }
 
-  public synchronized void show(
-      String text, String gameName, String platform, String containerName) {
+  public synchronized void show(String text, String title, String badge, String subtitle) {
     if (dialog == null) create();
     if (dialog == null) return;
     composeState.setText(text);
-    composeState.setGameName(gameName != null ? gameName : "");
-    composeState.setPlatform(platform != null ? platform : "");
-    composeState.setContainerName(containerName != null ? containerName : "");
-    composeState.setStableLaunchLayout(true);
+    composeState.setTitle(title != null ? title : "");
+    composeState.setBadge(badge != null ? badge : "");
+    composeState.setSubtitle(subtitle != null ? subtitle : "");
+    composeState.setStableContentLayout(true);
     composeState.setIndeterminate(true);
     showDialogSafely();
   }
 
-  public synchronized void show(
-      int textResId, String gameName, String platform, String containerName) {
-    show(activity.getString(textResId), gameName, platform, containerName);
+  public synchronized void show(int textResId, String title, String badge, String subtitle) {
+    show(activity.getString(textResId), title, badge, subtitle);
   }
 
   public synchronized void setProgress(int percent) {
@@ -145,19 +143,19 @@ public void showOnUiThread(final String text) {
   }
 
   public void showOnUiThread(
-      final String text, final String gameName, final String platform, final String containerName) {
-    uiHandler.post(() -> show(text, gameName, platform, containerName));
+      final String text, final String title, final String badge, final String subtitle) {
+    uiHandler.post(() -> show(text, title, badge, subtitle));
   }
 
   public void showProgressOnUiThread(
       final String text,
-      final String gameName,
-      final String platform,
-      final String containerName,
+      final String title,
+      final String badge,
+      final String subtitle,
       final int percent) {
     uiHandler.post(
         () -> {
-          show(text, gameName, platform, containerName);
+          show(text, title, badge, subtitle);
           composeState.setIndeterminate(false);
           composeState.setProgress(percent);
         });
diff --git a/app/src/main/shared/ui/dialog/PreloaderDialogContent.kt b/app/src/main/shared/ui/dialog/PreloaderDialogContent.kt
index 970395a12..22bf10408 100644
--- a/app/src/main/shared/ui/dialog/PreloaderDialogContent.kt
+++ b/app/src/main/shared/ui/dialog/PreloaderDialogContent.kt
@@ -1,5 +1,8 @@
 package com.winlator.cmod.shared.ui.dialog
+
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.core.EaseInOut
+import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.RepeatMode
 import androidx.compose.animation.core.animateFloat
@@ -7,8 +10,14 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.infiniteRepeatable
 import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -18,14 +27,21 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -37,19 +53,24 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.rotate
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.PlatformTextStyle
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.setViewTreeLifecycleOwner
@@ -58,17 +79,36 @@ import com.winlator.cmod.R
 import com.winlator.cmod.shared.theme.WinNativeTheme
 import kotlin.math.PI
 import kotlin.math.cos
+import kotlin.math.roundToInt
 import kotlin.math.sin
 
-// State holder — Java-friendly mutable properties
+// State holder - Java-friendly mutable properties.
 class PreloaderDialogState {
     val text = mutableStateOf("")
     val isIndeterminate = mutableStateOf(true)
     val progress = mutableIntStateOf(0)
-    val gameName = mutableStateOf("")
-    val platform = mutableStateOf("")
-    val containerName = mutableStateOf("")
-    val stableLaunchLayout = mutableStateOf(false)
+    val title = mutableStateOf("")
+    val badge = mutableStateOf("")
+    val subtitle = mutableStateOf("")
+    val stableContentLayout = mutableStateOf(false)
+
+    /**
+     * The game's own cover, shown in the middle of the splash.
+     *
+     * Null for everything that has no artwork to show, which is every caller
+     * that existed before this: the splash then looks exactly as it did, with
+     * the comet ring in the centre.
+     */
+    val artwork = mutableStateOf<android.graphics.Bitmap?>(null)
+
+    /**
+     * Moves the progress read-out to a bar across the bottom of the screen.
+     *
+     * The comet ring owns the centre, and so does the artwork, so a splash
+     * showing a cover needs its progress somewhere else. Off by default, so the
+     * ring stays where every other game's splash has it.
+     */
+    val bottomProgressBar = mutableStateOf(false)
 
     fun setText(value: String) {
         text.value = value
@@ -82,45 +122,52 @@ class PreloaderDialogState {
         progress.intValue = value
     }
 
-    fun setGameName(value: String) {
-        gameName.value = value
+    fun setTitle(value: String) {
+        title.value = value
     }
 
-    fun setPlatform(value: String) {
-        platform.value = value
+    fun setBadge(value: String) {
+        badge.value = value
     }
 
-    fun setContainerName(value: String) {
-        containerName.value = value
+    fun setSubtitle(value: String) {
+        subtitle.value = value
     }
 
-    fun setStableLaunchLayout(value: Boolean) {
-        stableLaunchLayout.value = value
+    fun setStableContentLayout(value: Boolean) {
+        stableContentLayout.value = value
     }
 }
 
 private data class Particle(
     val x: Float,
+    val y: Float,
     val speed: Float,
     val size: Float,
+    val alpha: Float,
     val phaseOffset: Float,
 )
 
-// Colors
-private val BgDark = Color(0xFF111822)
-private val TextPrimary = Color(0xFFF5F9FF)
-private val TextSecondary = Color(0xFF9CB0C7)
-private val TextDim = Color(0xFF6B7F95)
-private val TrackColor = Color(0xFF21293D)
-private val IndicatorColor = Color(0xFF57CBDE)
-private val CardBg = Color(0xFF1A2028)
-private val CardBorder = Color(0xFF253443)
-private val SteamPlatformBlue = Color(0xFF66C0F4)
-
-private val InterFont = FontFamily(Font(R.font.inter_medium))
-
-private fun platformStringRes(source: String): Int? =
-    when (source.uppercase()) {
+private val BgTop = Color(0xFF07090F)
+private val BgBottom = Color(0xFF0C1018)
+private val TextPrimary = Color(0xFFF5F8FF)
+private val TextSecondary = Color(0xFFA1B1C8)
+private val TextDim = Color(0xFF65748B)
+private val TrackColor = Color(0xFF202A3A)
+
+/**
+ * Height reserved at the bottom for the status line and the progress bar, so
+ * the centred content never runs under them. Two lines of status, the gap, the
+ * bar and its padding.
+ */
+private val BOTTOM_BLOCK_HEIGHT = 120.dp
+
+private val InterFont = FontFamily(Font(R.font.inter_medium, FontWeight.Medium))
+private val BricolageDisplayFont =
+    FontFamily(Font(R.font.bricolage_grotesque_extrabold, FontWeight.ExtraBold))
+
+private fun badgeStringRes(value: String): Int? =
+    when (value.uppercase()) {
         "STEAM" -> R.string.preloader_platform_steam
         "EPIC" -> R.string.preloader_platform_epic
         "GOG" -> R.string.preloader_platform_gog
@@ -128,12 +175,12 @@ private fun platformStringRes(source: String): Int? =
         else -> null
     }
 
-private fun platformColor(source: String): Color =
-    when (source.uppercase()) {
-        "STEAM" -> SteamPlatformBlue
-        "EPIC" -> Color(0xFF8A8A8A)
-        "GOG" -> Color(0xFFAB47BC)
-        "CUSTOM" -> SteamPlatformBlue
+private fun badgeColor(value: String): Color =
+    when (value.uppercase()) {
+        "STEAM" -> Color(0xFF66C0F4)
+        "EPIC" -> Color(0xFFB8BAC4)
+        "GOG" -> Color(0xFFC55CFF)
+        "CUSTOM" -> Color(0xFF4FE3C1)
         else -> Color(0xFF57CBDE)
     }
 
@@ -142,175 +189,108 @@ fun PreloaderDialogContent(state: PreloaderDialogState) {
     val text by state.text
     val isIndeterminate by state.isIndeterminate
     val progress by state.progress
-    val gameName by state.gameName
-    val platform by state.platform
-    val containerName by state.containerName
-    val stableLaunchLayout by state.stableLaunchLayout
-
-    // Particle seeds — stable across recomposition
+    val title by state.title
+    val badge by state.badge
+    val subtitle by state.subtitle
+    val stableContentLayout by state.stableContentLayout
+    val artwork by state.artwork
+    val bottomProgressBar by state.bottomProgressBar
+
+    val accentColor = badgeColor(badge)
     val particles =
         remember {
-            List(20) { i ->
+            List(8) { i ->
                 val hash = ((i * 7919 + 104729) % 10000) / 10000f
                 Particle(
                     x = ((i * 3571 + 7321) % 10000) / 10000f,
-                    speed = 0.6f + hash * 0.4f,
-                    size = 1f + hash * 1.5f,
+                    y = ((i * 5323 + 1931) % 10000) / 10000f,
+                    // Whole-number traversals per cycle so the shared phase wraps seamlessly
+                    // (a fractional speed makes every particle teleport when the tween restarts).
+                    speed = (1 + (i % 2)).toFloat(),
+                    size = 1.1f + hash * 1.6f,
+                    alpha = 0.08f + hash * 0.1f,
                     phaseOffset = hash * 6.2832f,
                 )
             }
         }
 
-    // Orb positions — static for launch screen
-    val orbAnim = tween<Float>(2000, easing = EaseInOut)
-    val o1x by animateFloatAsState(0.3f, orbAnim, label = "o1x")
-    val o1y by animateFloatAsState(0.25f, orbAnim, label = "o1y")
-    val o2x by animateFloatAsState(0.7f, orbAnim, label = "o2x")
-    val o2y by animateFloatAsState(0.65f, orbAnim, label = "o2y")
-    val o3x by animateFloatAsState(0.5f, orbAnim, label = "o3x")
-    val o3y by animateFloatAsState(0.45f, orbAnim, label = "o3y")
-
-    val infiniteTransition = rememberInfiniteTransition(label = "bgGlow")
-    val phase1 =
-        infiniteTransition.animateFloat(
-            initialValue = 0f,
-            targetValue = 6.2832f,
-            animationSpec = infiniteRepeatable(tween(30000, easing = LinearEasing), RepeatMode.Restart),
-            label = "phase1",
-        )
-    val phase2 =
-        infiniteTransition.animateFloat(
-            initialValue = 6.2832f,
-            targetValue = 0f,
-            animationSpec = infiniteRepeatable(tween(38000, easing = LinearEasing), RepeatMode.Restart),
-            label = "phase2",
-        )
-    val pulse =
+    val infiniteTransition = rememberInfiniteTransition(label = "preloaderMotion")
+    val glowPulse =
         infiniteTransition.animateFloat(
-            initialValue = 0.85f,
+            initialValue = 0.74f,
             targetValue = 1f,
-            animationSpec = infiniteRepeatable(tween(8000, easing = EaseInOut), RepeatMode.Reverse),
-            label = "pulse",
+            animationSpec = infiniteRepeatable(tween(5200, easing = EaseInOut), RepeatMode.Reverse),
+            label = "glowPulse",
         )
     val particlePhase =
         infiniteTransition.animateFloat(
             initialValue = 0f,
             targetValue = 1f,
-            animationSpec = infiniteRepeatable(tween(20000, easing = LinearEasing), RepeatMode.Restart),
+            animationSpec = infiniteRepeatable(tween(26000, easing = LinearEasing), RepeatMode.Restart),
             label = "particlePhase",
         )
 
-    // Orbital dots rotation
-    val orbitalPhase =
-        infiniteTransition.animateFloat(
-            initialValue = 0f,
-            targetValue = 6.2832f,
-            animationSpec = infiniteRepeatable(tween(2400, easing = LinearEasing), RepeatMode.Restart),
-            label = "orbital",
-        )
-
-    // Shimmer sweep for platform badge
-    val shimmerPhase =
-        infiniteTransition.animateFloat(
-            initialValue = -1f,
-            targetValue = 2f,
-            animationSpec = infiniteRepeatable(tween(2500, easing = LinearEasing), RepeatMode.Restart),
-            label = "shimmer",
-        )
+    var entered by remember { mutableStateOf(false) }
+    LaunchedEffect(Unit) {
+        entered = true
+    }
+    val contentAlpha by animateFloatAsState(
+        targetValue = if (entered) 1f else 0f,
+        animationSpec = tween(520, easing = FastOutSlowInEasing),
+        label = "contentAlpha",
+    )
+    val contentRise by animateFloatAsState(
+        targetValue = if (entered) 0f else 18f,
+        animationSpec = tween(520, easing = FastOutSlowInEasing),
+        label = "contentRise",
+    )
 
     Box(
         modifier =
             Modifier
                 .fillMaxSize()
-                .background(BgDark)
+                .background(Brush.verticalGradient(listOf(BgTop, BgBottom)))
                 .drawBehind {
                     val w = size.width
                     val h = size.height
-                    val p1 = phase1.value
-                    val p2 = phase2.value
-                    val p = pulse.value
-
-                    // Orb 1 — cyan
-                    val c1 =
+                    val pulse = glowPulse.value
+                    val glowCenter =
                         Offset(
-                            w * (o1x + 0.04f * cos(p1)),
-                            h * (o1y + 0.03f * sin(p1)),
+                            x = w * (0.5f + 0.025f * sin(particlePhase.value * 2f * PI).toFloat()),
+                            y = h * 0.42f,
                         )
-                    drawCircle(
-                        brush =
-                            Brush.radialGradient(
-                                colors =
-                                    listOf(
-                                        Color(0xFF57CBDE).copy(alpha = 0.04f * p),
-                                        Color(0xFF57CBDE).copy(alpha = 0.015f * p),
-                                        Color.Transparent,
-                                    ),
-                                center = c1,
-                                radius = w * 0.6f,
-                            ),
-                        radius = w * 0.6f,
-                        center = c1,
-                    )
-
-                    // Orb 2 — blue
-                    val c2 =
-                        Offset(
-                            w * (o2x + 0.04f * cos(p2)),
-                            h * (o2y + 0.03f * sin(p2)),
-                        )
-                    drawCircle(
-                        brush =
-                            Brush.radialGradient(
-                                colors =
-                                    listOf(
-                                        Color(0xFF3B82F6).copy(alpha = 0.035f * p),
-                                        Color(0xFF3B82F6).copy(alpha = 0.01f * p),
-                                        Color.Transparent,
-                                    ),
-                                center = c2,
-                                radius = w * 0.55f,
-                            ),
-                        radius = w * 0.55f,
-                        center = c2,
-                    )
 
-                    // Orb 3 — teal accent
-                    val c3 =
-                        Offset(
-                            w * (o3x + 0.03f * sin(p1 * 0.7f)),
-                            h * (o3y + 0.03f * cos(p2 * 0.6f)),
-                        )
                     drawCircle(
                         brush =
                             Brush.radialGradient(
                                 colors =
                                     listOf(
-                                        Color(0xFF2DD4BF).copy(alpha = 0.02f * p),
+                                        accentColor.copy(alpha = 0.16f * pulse),
+                                        accentColor.copy(alpha = 0.045f * pulse),
                                         Color.Transparent,
                                     ),
-                                center = c3,
-                                radius = w * 0.45f,
+                                center = glowCenter,
+                                radius = w * 0.58f,
                             ),
-                        radius = w * 0.45f,
-                        center = c3,
+                        radius = w * 0.58f,
+                        center = glowCenter,
                     )
 
-                    // Floating particles
-                    val pp = particlePhase.value
-                    particles.forEach { pt ->
-                        val t = (pp * pt.speed + pt.phaseOffset) % 1f
-                        val py = h * (1f - t)
-                        val px = w * pt.x + w * 0.02f * sin((t * 2f * PI).toFloat() + pt.phaseOffset)
-                        val alpha =
+                    particles.forEach { particle ->
+                        val raw = (particle.y - particlePhase.value * particle.speed) % 1f
+                        val t = if (raw < 0f) raw + 1f else raw
+                        val drift =
+                            sin((particlePhase.value * 2f * PI).toFloat() + particle.phaseOffset) * w * 0.018f
+                        val fade =
                             when {
-                                t < 0.15f -> t / 0.15f
-                                t > 0.85f -> (1f - t) / 0.15f
+                                t < 0.12f -> t / 0.12f
+                                t > 0.9f -> (1f - t) / 0.1f
                                 else -> 1f
-                            } * 0.12f
+                            }
                         drawCircle(
-                            color = Color(0xFF57CBDE).copy(alpha = alpha),
-                            radius = pt.size.dp.toPx(),
-                            center = Offset(px, py),
+                            color = accentColor.copy(alpha = particle.alpha * fade),
+                            radius = particle.size.dp.toPx(),
+                            center = Offset(w * particle.x + drift, h * t),
                         )
                     }
                 },
@@ -320,27 +300,34 @@ fun PreloaderDialogContent(state: PreloaderDialogState) {
             modifier =
                 Modifier
                     .fillMaxSize()
-                    .windowInsetsPadding(WindowInsets.safeDrawing),
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
+                    .padding(horizontal = 28.dp)
+                    // The bottom bar is positioned against the screen, not
+                    // placed after this column, so on a short screen -- any
+                    // phone in landscape -- the centred content would otherwise
+                    // run underneath it. Reserving the height it occupies keeps
+                    // the two apart without either having to measure the other.
+                    .padding(bottom = if (bottomProgressBar) BOTTOM_BLOCK_HEIGHT else 0.dp)
+                    .offset { IntOffset(0, contentRise.roundToInt()) },
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
         ) {
-            val displayName = gameName.ifEmpty { stringResource(R.string.preloader_default_name) }
-            val platRes = platformStringRes(platform)
-            val platColor = platformColor(platform)
+            val displayTitle = title.ifEmpty { stringResource(R.string.preloader_default_name) }
+            val badgeRes = badgeStringRes(badge)
 
             Box(
                 modifier =
                     Modifier
-                        .height(if (stableLaunchLayout) 72.dp else 36.dp)
-                        .padding(horizontal = 48.dp),
+                        .widthIn(max = 520.dp)
+                        .height(if (stableContentLayout) 76.dp else 40.dp),
                 contentAlignment = Alignment.Center,
             ) {
                 Text(
-                    text = displayName,
-                    fontSize = 28.sp,
-                    fontWeight = FontWeight.Bold,
-                    fontFamily = InterFont,
-                    color = TextPrimary,
+                    text = displayTitle,
+                    fontSize = 31.sp,
+                    fontWeight = FontWeight.ExtraBold,
+                    fontFamily = BricolageDisplayFont,
+                    color = TextPrimary.copy(alpha = contentAlpha),
                     textAlign = TextAlign.Center,
                     maxLines = 2,
                     overflow = TextOverflow.Ellipsis,
@@ -348,20 +335,20 @@ fun PreloaderDialogContent(state: PreloaderDialogState) {
                 )
             }
 
-            if (stableLaunchLayout || containerName.isNotEmpty()) {
-                Spacer(modifier = Modifier.height(6.dp))
+            if (stableContentLayout || subtitle.isNotEmpty()) {
+                Spacer(modifier = Modifier.height(8.dp))
                 Box(
                     modifier =
                         Modifier
-                            .height(22.dp)
-                            .padding(horizontal = 48.dp),
+                            .widthIn(max = 440.dp)
+                            .height(22.dp),
                     contentAlignment = Alignment.Center,
                 ) {
                     Text(
-                        text = containerName.ifEmpty { " " },
-                        fontSize = 16.sp,
+                        text = subtitle.ifEmpty { " " },
+                        fontSize = 15.sp,
                         fontFamily = InterFont,
-                        color = TextDim,
+                        color = TextDim.copy(alpha = contentAlpha),
                         textAlign = TextAlign.Center,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
@@ -370,154 +357,311 @@ fun PreloaderDialogContent(state: PreloaderDialogState) {
                 }
             }
 
-            if (stableLaunchLayout || platRes != null) {
-                Spacer(modifier = Modifier.height(12.dp))
-                if (platRes != null) {
-                    val badgeShape = RoundedCornerShape(20.dp)
-                    val shimVal = shimmerPhase.value
-                    val glowAlpha = pulse.value
-
-                    Box(
-                        modifier =
-                            Modifier
-                                .height(36.dp),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .drawBehind {
-                                        drawCircle(
-                                            brush =
-                                                Brush.radialGradient(
-                                                    colors =
-                                                        listOf(
-                                                            platColor.copy(alpha = 0.08f * glowAlpha),
-                                                            platColor.copy(alpha = 0.02f * glowAlpha),
-                                                            Color.Transparent,
-                                                        ),
-                                                    center = Offset(size.width / 2f, size.height / 2f),
-                                                    radius = size.width * 0.45f,
-                                                ),
-                                            radius = size.width * 0.45f,
-                                            center = Offset(size.width / 2f, size.height / 2f),
-                                        )
-                                    }.clip(badgeShape)
-                                    .background(platColor.copy(alpha = 0.15f))
-                                    .drawWithContent {
-                                        drawContent()
-                                        drawRect(
-                                            brush =
-                                                Brush.linearGradient(
-                                                    colors =
-                                                        listOf(
-                                                            Color.Transparent,
-                                                            Color.White.copy(alpha = 0.15f),
-                                                            Color.Transparent,
-                                                        ),
-                                                    start = Offset(size.width * shimVal, 0f),
-                                                    end = Offset(size.width * (shimVal + 0.4f), size.height),
-                                                ),
-                                            blendMode = BlendMode.SrcAtop,
-                                        )
-                                    }.padding(horizontal = 16.dp, vertical = 6.dp),
-                        ) {
-                            Text(
-                                text = stringResource(platRes),
-                                fontSize = 14.sp,
-                                fontFamily = InterFont,
-                                color = platColor,
-                                letterSpacing = 0.5.sp,
-                            )
-                        }
+            if (stableContentLayout || badgeRes != null) {
+                Spacer(modifier = Modifier.height(14.dp))
+                Box(
+                    modifier = Modifier.height(32.dp),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    if (badgeRes != null) {
+                        PlatformBadge(
+                            label = stringResource(badgeRes),
+                            accentColor = accentColor,
+                            alpha = contentAlpha,
+                        )
                     }
-                } else {
-                    Spacer(modifier = Modifier.height(36.dp))
                 }
             }
 
+            Spacer(modifier = Modifier.height(34.dp))
+
+            // The centre of the splash: the game's own cover when there is one,
+            // otherwise the ring this screen has always shown. Both want the
+            // middle of the screen, so they are alternatives rather than a
+            // stack -- and when the cover takes it, the progress moves to the
+            // bar along the bottom.
+            val cover = artwork
+            if (cover != null) {
+                Image(
+                    bitmap = cover.asImageBitmap(),
+                    contentDescription = null,
+                    contentScale = ContentScale.Fit,
+                    alpha = contentAlpha,
+                    modifier =
+                        Modifier
+                            .widthIn(max = 260.dp)
+                            .heightIn(max = 260.dp)
+                            .clip(RoundedCornerShape(16.dp))
+                            .border(
+                                width = 1.dp,
+                                color = accentColor.copy(alpha = 0.28f * contentAlpha),
+                                shape = RoundedCornerShape(16.dp),
+                            ),
+                )
+            } else {
+                NeonCometRing(
+                    isIndeterminate = isIndeterminate,
+                    progress = progress,
+                    accentColor = accentColor,
+                    alpha = contentAlpha,
+                )
+            }
+
             Spacer(modifier = Modifier.height(24.dp))
 
+            if (!bottomProgressBar) {
+                AnimatedContent(
+                targetState = text,
+                contentAlignment = Alignment.Center,
+                transitionSpec = {
+                    // Cross-fade with a gentle upward drift: the new line rises into place from
+                    // slightly below while the old one fades out drifting up. No 3D flip.
+                    (
+                        fadeIn(tween(260, delayMillis = 60)) +
+                            slideInVertically(tween(320, easing = FastOutSlowInEasing)) { it / 6 }
+                    ) togetherWith (
+                        fadeOut(tween(200)) +
+                            slideOutVertically(tween(320, easing = FastOutSlowInEasing)) { -it / 6 }
+                    )
+                },
+                label = "statusText",
+            ) { value ->
+                Text(
+                    text = value,
+                    fontSize = 15.sp,
+                    fontFamily = InterFont,
+                    color = TextSecondary.copy(alpha = contentAlpha),
+                    textAlign = TextAlign.Center,
+                    maxLines = 2,
+                    minLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.widthIn(max = 360.dp),
+                )
+                }
+            }
+        }
+
+        // Pinned to the bottom of the screen rather than placed after the
+        // centred column, so it stays put as the stage text above it changes
+        // length. Only drawn for a splash that moved its progress down here.
+        if (bottomProgressBar) {
             Column(
                 modifier =
                     Modifier
-                        .width(320.dp)
-                        .padding(horizontal = 20.dp),
+                        .align(Alignment.BottomCenter)
+                        .fillMaxWidth()
+                        .windowInsetsPadding(WindowInsets.safeDrawing)
+                        .padding(horizontal = 28.dp)
+                        .padding(bottom = 28.dp)
+                        .widthIn(max = 520.dp),
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
-                // Current step text — fixed to 2-line height to avoid layout shift
                 Text(
                     text = text,
                     fontSize = 15.sp,
                     fontFamily = InterFont,
-                    color = TextSecondary,
+                    color = TextSecondary.copy(alpha = contentAlpha),
                     textAlign = TextAlign.Center,
                     maxLines = 2,
                     minLines = 2,
                     overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                Spacer(modifier = Modifier.height(14.dp))
+                // Smoothed, because an import reports in steps -- an unsmoothed
+                // bar jumps between them, which reads as having stalled.
+                val animated by animateFloatAsState(
+                    targetValue = (progress.coerceIn(0, 100)) / 100f,
+                    animationSpec = tween(240),
+                    label = "preloaderBottomProgress",
                 )
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                // Progress indicator
                 if (isIndeterminate) {
-                    val orb = orbitalPhase.value
-                    Canvas(
-                        modifier = Modifier.size(52.dp),
-                    ) {
-                        val cx = size.width / 2f
-                        val cy = size.height / 2f
-                        val radius = size.width * 0.38f
-                        val dotCount = 7
-                        for (i in 0 until dotCount) {
-                            val angle = orb - (i * 0.65f)
-                            val dx = cx + radius * cos(angle)
-                            val dy = cy + radius * sin(angle)
-                            val fraction = i.toFloat() / (dotCount - 1)
-                            val dotRadius = (3.8f - fraction * 2.6f).dp.toPx()
-                            val alpha = 1f - fraction * 0.85f
-
-                            // Glow behind the lead dot
-                            if (i == 0) {
-                                drawCircle(
-                                    color = IndicatorColor.copy(alpha = 0.15f),
-                                    radius = dotRadius * 2.2f,
-                                    center = Offset(dx, dy),
-                                )
-                            }
-
-                            drawCircle(
-                                color = IndicatorColor.copy(alpha = alpha),
-                                radius = dotRadius,
-                                center = Offset(dx, dy),
-                            )
-                        }
-                    }
-                    Spacer(modifier = Modifier.height(8.dp))
-                } else {
-                    val animatedProgress by animateFloatAsState(
-                        targetValue = progress / 100f,
-                        animationSpec = tween(durationMillis = 300),
-                        label = "progress",
+                    LinearProgressIndicator(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .height(6.dp)
+                                .clip(RoundedCornerShape(3.dp)),
+                        color = accentColor.copy(alpha = contentAlpha),
+                        trackColor = TrackColor.copy(alpha = contentAlpha),
                     )
+                } else {
                     LinearProgressIndicator(
-                        progress = { animatedProgress },
+                        progress = { animated },
                         modifier =
                             Modifier
                                 .fillMaxWidth()
-                                .height(4.dp),
-                        color = IndicatorColor,
-                        trackColor = TrackColor,
-                        strokeCap = StrokeCap.Round,
+                                .height(6.dp)
+                                .clip(RoundedCornerShape(3.dp)),
+                        color = accentColor.copy(alpha = contentAlpha),
+                        trackColor = TrackColor.copy(alpha = contentAlpha),
+                        drawStopIndicator = {},
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
                 }
             }
         }
     }
 }
 
-// Java bridge — called from PreloaderDialog.java as:
+@Composable
+private fun PlatformBadge(
+    label: String,
+    accentColor: Color,
+    alpha: Float,
+) {
+    val shape = RoundedCornerShape(9.dp)
+    Row(
+        modifier =
+            Modifier
+                .clip(shape)
+                .background(accentColor.copy(alpha = 0.1f * alpha))
+                .border(width = 1.dp, color = accentColor.copy(alpha = 0.32f * alpha), shape = shape)
+                .padding(horizontal = 12.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+    ) {
+        Box(
+            modifier =
+                Modifier
+                    .size(6.dp)
+                    .clip(CircleShape)
+                    .background(accentColor.copy(alpha = 0.9f * alpha)),
+        )
+        Spacer(modifier = Modifier.width(7.dp))
+        Text(
+            text = label,
+            fontSize = 12.5.sp,
+            letterSpacing = 0.3.sp,
+            fontFamily = InterFont,
+            fontWeight = FontWeight.Medium,
+            color = accentColor.copy(alpha = alpha),
+            maxLines = 1,
+            // Drop default font padding and center within the line box so the label sits dead-center
+            // against the dot instead of riding high.
+            style =
+                TextStyle(
+                    platformStyle = PlatformTextStyle(includeFontPadding = false),
+                    lineHeightStyle =
+                        LineHeightStyle(
+                            alignment = LineHeightStyle.Alignment.Center,
+                            trim = LineHeightStyle.Trim.Both,
+                        ),
+                ),
+        )
+    }
+}
+
+@Composable
+private fun NeonCometRing(
+    isIndeterminate: Boolean,
+    progress: Int,
+    accentColor: Color,
+    alpha: Float,
+) {
+    val infiniteTransition = rememberInfiniteTransition(label = "ringMotion")
+    val rotation =
+        infiniteTransition.animateFloat(
+            initialValue = 0f,
+            targetValue = 360f,
+            animationSpec = infiniteRepeatable(tween(1100, easing = LinearEasing), RepeatMode.Restart),
+            label = "ringRotation",
+        )
+    val animatedProgress by animateFloatAsState(
+        targetValue = progress.coerceIn(0, 100) / 100f,
+        animationSpec = tween(durationMillis = 620, easing = FastOutSlowInEasing),
+        label = "ringProgress",
+    )
+
+    Box(
+        modifier = Modifier.size(48.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Canvas(modifier = Modifier.fillMaxSize()) {
+            val strokeWidth = 4.dp.toPx()
+            // Inset enough to keep the rounded cap and lead dot from clipping the bounds.
+            val inset = strokeWidth / 2f + 2.dp.toPx()
+            val arcSize =
+                Size(
+                    width = size.width - inset * 2f,
+                    height = size.height - inset * 2f,
+                )
+            val topLeft = Offset(inset, inset)
+            val center = Offset(size.width / 2f, size.height / 2f)
+            val radius = arcSize.width / 2f
+            // A long ~280° arc reads as a proper spinner; determinate fills to progress.
+            val sweep = if (isIndeterminate) 280f else 360f * animatedProgress
+            val startAngle = if (isIndeterminate) rotation.value else -90f
+            val endAngle = startAngle + sweep
+            val endRadians = Math.toRadians(endAngle.toDouble())
+            val leadDot =
+                Offset(
+                    x = center.x + radius * cos(endRadians).toFloat(),
+                    y = center.y + radius * sin(endRadians).toFloat(),
+                )
+
+            // Track ring behind the spinner.
+            drawArc(
+                color = TrackColor.copy(alpha = 0.7f * alpha),
+                startAngle = 0f,
+                sweepAngle = 360f,
+                useCenter = false,
+                topLeft = topLeft,
+                size = arcSize,
+                style = Stroke(width = strokeWidth, cap = StrokeCap.Round),
+            )
+
+            if (sweep > 0.5f) {
+                // Tapered arc: faint tail growing into a solid accent head. A sweep gradient is
+                // anchored to the canvas (0° = +x axis), so rotate the canvas to the arc's start
+                // and place the bright head at the arc's actual end (sweep/360 of the gradient).
+                val head = (sweep / 360f).coerceIn(0.05f, 1f)
+                val cometStops =
+                    if (head >= 0.999f) {
+                        arrayOf(
+                            0f to accentColor.copy(alpha = 0.35f * alpha),
+                            0.7f to accentColor.copy(alpha = 0.8f * alpha),
+                            1f to Color.White.copy(alpha = 0.95f * alpha),
+                        )
+                    } else {
+                        arrayOf(
+                            0f to Color.Transparent,
+                            head * 0.55f to accentColor.copy(alpha = 0.35f * alpha),
+                            head * 0.85f to accentColor.copy(alpha = 0.85f * alpha),
+                            head to accentColor.copy(alpha = 0.95f * alpha),
+                            1f to Color.Transparent,
+                        )
+                    }
+                rotate(degrees = startAngle, pivot = center) {
+                    drawArc(
+                        brush = Brush.sweepGradient(colorStops = cometStops, center = center),
+                        startAngle = 0f,
+                        sweepAngle = sweep,
+                        useCenter = false,
+                        topLeft = topLeft,
+                        size = arcSize,
+                        style = Stroke(width = strokeWidth, cap = StrokeCap.Round),
+                    )
+                }
+            }
+
+            if (isIndeterminate || animatedProgress > 0f) {
+                // Subtle glow on the leading edge.
+                drawCircle(
+                    color = accentColor.copy(alpha = 0.2f * alpha),
+                    radius = 3.5.dp.toPx(),
+                    center = leadDot,
+                )
+                drawCircle(
+                    color = Color.White.copy(alpha = 0.9f * alpha),
+                    radius = 1.5.dp.toPx(),
+                    center = leadDot,
+                )
+            }
+        }
+    }
+}
+
+// Java bridge - called from PreloaderDialog.java as:
 // PreloaderDialogContentKt.setupPreloaderComposeView(composeView, state, activity)
 fun setupPreloaderComposeView(
     composeView: ComposeView,
diff --git a/app/src/main/shared/ui/dialog/WinNativeComposeDialogs.kt b/app/src/main/shared/ui/dialog/WinNativeComposeDialogs.kt
index c6148b2ce..5ab3d88af 100644
--- a/app/src/main/shared/ui/dialog/WinNativeComposeDialogs.kt
+++ b/app/src/main/shared/ui/dialog/WinNativeComposeDialogs.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -63,7 +64,34 @@ import com.winlator.cmod.shared.theme.WinNativeTheme
 import com.winlator.cmod.shared.util.Callback
 import androidx.compose.ui.window.Dialog as ComposeDialog
 
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.window.DialogProperties as ComposeDialogProperties
+
 object WinNativeComposeDialogs {
+    @JvmStatic
+    fun showLoading(
+        context: Context,
+        message: String,
+    ): AppCompatDialog? {
+        val activity = context.findActivity() ?: return null
+        val dialog = AppCompatDialog(activity, android.R.style.Theme_DeviceDefault_Dialog_NoActionBar).apply {
+            setCancelable(false)
+            setCanceledOnTouchOutside(false)
+        }
+        dialog.setContentView(
+            composeView(activity) {
+                WinNativeTheme {
+                    WinNativeLoadingDialog(message = message)
+                }
+            },
+        )
+        dialog.show()
+        return dialog
+    }
+
     @JvmStatic
     fun showAlert(
         context: Context,
@@ -216,6 +244,7 @@ fun WinNativeDialogShell(
     iconRes: Int? = null,
     iconImage: ImageVector? = null,
     maxWidth: Dp = 420.dp,
+    contentPadding: PaddingValues = PaddingValues(horizontal = 18.dp, vertical = 16.dp),
     content: @Composable () -> Unit,
 ) {
     ComposeDialog(
@@ -244,7 +273,7 @@ fun WinNativeDialogShell(
                         .clip(RoundedCornerShape(16.dp))
                         .background(WinNativeSurface)
                         .border(1.dp, WinNativeOutline, RoundedCornerShape(16.dp))
-                        .padding(horizontal = 18.dp, vertical = 16.dp),
+                        .padding(contentPadding),
             ) {
                 Column(
                     modifier =
@@ -491,3 +520,50 @@ private fun WinNativeShortcutPropertiesDialog(
         )
     }
 }
+
+@Composable
+private fun WinNativeLoadingDialog(message: String) {
+    ComposeDialog(
+        onDismissRequest = {},
+        properties = ComposeDialogProperties(
+            dismissOnBackPress = false,
+            dismissOnClickOutside = false,
+            usePlatformDefaultWidth = false,
+            decorFitsSystemWindows = false
+        )
+    ) {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.BottomCenter
+        ) {
+            Box(
+                modifier = Modifier
+                    .padding(horizontal = 24.dp, vertical = 40.dp)
+                    .widthIn(max = 420.dp)
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(14.dp))
+                    .background(WinNativeSurface)
+                    .border(1.dp, WinNativeOutline, RoundedCornerShape(14.dp))
+                    .padding(horizontal = 18.dp, vertical = 14.dp)
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(16.dp)
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(24.dp),
+                        color = WinNativeAccent,
+                        strokeWidth = 2.5.dp,
+                        strokeCap = StrokeCap.Round
+                    )
+                    Text(
+                        text = message,
+                        color = WinNativeTextPrimary,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.Medium
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/shared/ui/focus/ControllerMenuModifiers.kt b/app/src/main/shared/ui/focus/ControllerMenuModifiers.kt
new file mode 100644
index 000000000..0b3c24f91
--- /dev/null
+++ b/app/src/main/shared/ui/focus/ControllerMenuModifiers.kt
@@ -0,0 +1,252 @@
+package com.winlator.cmod.shared.ui.focus
+
+import android.os.SystemClock
+import android.view.InputDevice
+import android.view.MotionEvent
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.focusable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+private val AccentBorder = Color(0xFF00D7F5)
+
+fun Modifier.controllerFocusBorder(
+    cornerRadius: Dp = 10.dp,
+    borderWidth: Dp = 2.dp,
+    color: Color = AccentBorder,
+): Modifier =
+    composed {
+        var focused by remember { mutableStateOf(false) }
+        this
+            .onFocusChanged { focused = it.isFocused }
+            .drawWithContent {
+                drawContent()
+                if (focused) {
+                    val bw = borderWidth.toPx()
+                    val cr = cornerRadius.toPx()
+                    drawRoundRect(
+                        color = color,
+                        topLeft = Offset(bw / 2, bw / 2),
+                        size = Size(size.width - bw, size.height - bw),
+                        cornerRadius = CornerRadius(cr, cr),
+                        style = Stroke(width = bw),
+                    )
+                }
+            }
+    }
+
+fun Modifier.controllerFocusGlow(
+    cornerRadius: Dp = 8.dp,
+    color: Color = AccentBorder,
+): Modifier =
+    composed {
+        var focused by remember { mutableStateOf(false) }
+        val intensity by animateFloatAsState(
+            targetValue = if (focused) 1f else 0f,
+            animationSpec = tween(160),
+            label = "controllerFocusGlow",
+        )
+        this
+            .onFocusChanged { focused = it.isFocused }
+            .drawWithContent {
+                val cr = cornerRadius.toPx()
+                if (intensity > 0f) {
+                    drawRoundRect(
+                        color = color.copy(alpha = 0.28f * intensity),
+                        cornerRadius = CornerRadius(cr, cr),
+                    )
+                }
+                drawContent()
+                if (intensity > 0f) {
+                    drawRoundRect(
+                        color = color.copy(alpha = 0.12f * intensity),
+                        cornerRadius = CornerRadius(cr, cr),
+                    )
+                }
+            }
+    }
+
+fun Modifier.controllerFocusItem(
+    cornerRadius: Dp = 8.dp,
+    color: Color = AccentBorder,
+    onActivate: (() -> Unit)? = null,
+): Modifier =
+    composed {
+        var focused by remember { mutableStateOf(false) }
+        val intensity by animateFloatAsState(
+            targetValue = if (focused) 1f else 0f,
+            animationSpec = tween(160),
+            label = "controllerFocusItem",
+        )
+        this
+            .onFocusChanged { focused = it.isFocused }
+            .then(
+                if (onActivate != null) {
+                    Modifier.onKeyEvent { e ->
+                        if (e.nativeKeyEvent.action != android.view.KeyEvent.ACTION_UP) {
+                            false
+                        } else {
+                            when (e.nativeKeyEvent.keyCode) {
+                                android.view.KeyEvent.KEYCODE_DPAD_CENTER,
+                                android.view.KeyEvent.KEYCODE_ENTER,
+                                android.view.KeyEvent.KEYCODE_NUMPAD_ENTER,
+                                android.view.KeyEvent.KEYCODE_BUTTON_A,
+                                -> {
+                                    onActivate()
+                                    true
+                                }
+
+                                else -> false
+                            }
+                        }
+                    }
+                } else {
+                    Modifier
+                },
+            ).focusable()
+            .drawWithContent {
+                val cr = cornerRadius.toPx()
+                if (intensity > 0f) {
+                    drawRoundRect(
+                        color = color.copy(alpha = 0.28f * intensity),
+                        cornerRadius = CornerRadius(cr, cr),
+                    )
+                }
+                drawContent()
+                if (intensity > 0f) {
+                    drawRoundRect(
+                        color = color.copy(alpha = 0.12f * intensity),
+                        cornerRadius = CornerRadius(cr, cr),
+                    )
+                }
+            }
+    }
+
+fun Modifier.controllerSliderEscape(): Modifier =
+    composed {
+        val focusManager = androidx.compose.ui.platform.LocalFocusManager.current
+        this.onPreviewKeyEvent { e ->
+            if (e.nativeKeyEvent.action != android.view.KeyEvent.ACTION_DOWN) {
+                false
+            } else {
+                when (e.nativeKeyEvent.keyCode) {
+                    android.view.KeyEvent.KEYCODE_DPAD_UP ->
+                        focusManager.moveFocus(androidx.compose.ui.focus.FocusDirection.Up)
+                    android.view.KeyEvent.KEYCODE_DPAD_DOWN ->
+                        focusManager.moveFocus(androidx.compose.ui.focus.FocusDirection.Down)
+                    else -> false
+                }
+            }
+        }
+    }
+
+fun Modifier.controllerTextFieldEscape(): Modifier = controllerSliderEscape()
+
+fun Modifier.controllerMenuInput(
+    onDismiss: () -> Unit,
+    onSecondary: (() -> Unit)? = null,
+    onStart: (() -> Unit)? = null,
+    repeatMs: Long = 200L,
+): Modifier =
+    composed {
+        val view = LocalView.current
+        val lastMove = remember { longArrayOf(0L) }
+
+        DisposableEffect(view) {
+            val decor = view.rootView
+            val listener =
+                android.view.View.OnGenericMotionListener { _, ev ->
+                    if ((ev.source and InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK &&
+                        ev.action == MotionEvent.ACTION_MOVE
+                    ) {
+                        val x = ev.getAxisValue(MotionEvent.AXIS_X)
+                        val y = ev.getAxisValue(MotionEvent.AXIS_Y)
+                        val hx = ev.getAxisValue(MotionEvent.AXIS_HAT_X)
+                        val hy = ev.getAxisValue(MotionEvent.AXIS_HAT_Y)
+                        val code =
+                            when {
+                                x < -0.5f || hx < -0.5f -> android.view.KeyEvent.KEYCODE_DPAD_LEFT
+                                x > 0.5f || hx > 0.5f -> android.view.KeyEvent.KEYCODE_DPAD_RIGHT
+                                y < -0.5f || hy < -0.5f -> android.view.KeyEvent.KEYCODE_DPAD_UP
+                                y > 0.5f || hy > 0.5f -> android.view.KeyEvent.KEYCODE_DPAD_DOWN
+                                else -> 0
+                            }
+                        if (code != 0) {
+                            val now = SystemClock.uptimeMillis()
+                            if (now - lastMove[0] >= repeatMs) {
+                                lastMove[0] = now
+                                decor.dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, code))
+                                decor.dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, code))
+                            }
+                            return@OnGenericMotionListener true
+                        }
+                    }
+                    false
+                }
+            decor.setOnGenericMotionListener(listener)
+            onDispose { decor.setOnGenericMotionListener(null) }
+        }
+
+        this.onPreviewKeyEvent { e ->
+            when (e.nativeKeyEvent.keyCode) {
+                android.view.KeyEvent.KEYCODE_BUTTON_A -> {
+                    view.dispatchKeyEvent(
+                        android.view.KeyEvent(e.nativeKeyEvent.action, android.view.KeyEvent.KEYCODE_DPAD_CENTER),
+                    )
+                    true
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_B -> {
+                    if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) {
+                        val imeVisible =
+                            androidx.core.view.ViewCompat
+                                .getRootWindowInsets(view)
+                                ?.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime()) == true
+                        if (imeVisible) {
+                            androidx.core.view.ViewCompat
+                                .getWindowInsetsController(view)
+                                ?.hide(androidx.core.view.WindowInsetsCompat.Type.ime())
+                        } else {
+                            onDismiss()
+                        }
+                    }
+                    true
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_X -> {
+                    if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) onSecondary?.invoke()
+                    true
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_START -> {
+                    if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) onStart?.invoke()
+                    true
+                }
+
+                android.view.KeyEvent.KEYCODE_BUTTON_Y,
+                android.view.KeyEvent.KEYCODE_BUTTON_L1,
+                android.view.KeyEvent.KEYCODE_BUTTON_R1,
+                -> true
+
+                else -> false
+            }
+        }
+    }
diff --git a/app/src/main/shared/ui/focus/SettingsContentFocus.kt b/app/src/main/shared/ui/focus/SettingsContentFocus.kt
new file mode 100644
index 000000000..ec4c3c672
--- /dev/null
+++ b/app/src/main/shared/ui/focus/SettingsContentFocus.kt
@@ -0,0 +1,22 @@
+package com.winlator.cmod.shared.ui.focus
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import com.winlator.cmod.feature.settings.SettingsFocusZone
+import com.winlator.cmod.feature.settings.SettingsNavBridge
+import com.winlator.cmod.shared.ui.nav.PaneNavRegistry
+
+@Composable
+internal fun rememberSettingsContentNav(bridge: SettingsNavBridge?): PaneNavRegistry {
+    val registry = remember(bridge) { PaneNavRegistry(initialSignal = bridge?.contentNavSignal ?: -1) }
+    registry.controllerActive =
+        (bridge?.contentControllerActive ?: false) && bridge?.zone == SettingsFocusZone.CONTENT
+    registry.onEdgeLeft = { bridge?.zone = SettingsFocusZone.SIDEBAR }
+    LaunchedEffect(registry, bridge?.contentNavSignal) {
+        registry.processNav(bridge?.contentNavSignal ?: 0, bridge?.contentNavDir ?: 0)
+    }
+    return registry
+}
+
+fun Modifier.settingsContentRoot(bridge: SettingsNavBridge?): Modifier = this
diff --git a/app/src/main/shared/ui/nav/DialogPaneNav.kt b/app/src/main/shared/ui/nav/DialogPaneNav.kt
new file mode 100644
index 000000000..d7c123c7b
--- /dev/null
+++ b/app/src/main/shared/ui/nav/DialogPaneNav.kt
@@ -0,0 +1,170 @@
+package com.winlator.cmod.shared.ui.nav
+
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.Window
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.window.DialogWindowProvider
+import kotlin.math.abs
+
+private const val PANE_STICK_ENGAGE = 0.5f
+private const val PANE_STICK_RELEASE = 0.35f
+
+// Window-callback nav source: fires before Compose focus resolution, so it works in tap-opened dialogs with no focused node.
+internal class PaneNavWindowHandlers(
+    val onDir: (Int) -> Unit,
+    val onActivate: () -> Unit,
+    val onSecondary: () -> Unit = {},
+    val onDismiss: () -> Unit,
+    val onStart: () -> Unit = {},
+    val onScroll: (Float) -> Unit = {},
+)
+
+// Handlers driving a swappable PaneNavRegistry; the provider is re-read per event so a host can route to an overlay and back.
+internal fun paneNavHandlers(
+    onDismiss: () -> Unit,
+    onStart: () -> Unit = {},
+    onScroll: (Float) -> Unit = {},
+    registry: () -> PaneNavRegistry?,
+): PaneNavWindowHandlers =
+    PaneNavWindowHandlers(
+        onDir = { registry()?.navDir(it) },
+        onActivate = { registry()?.navDir(PANE_DIR_ACTIVATE) },
+        onSecondary = { registry()?.navDir(PANE_DIR_SECONDARY) },
+        onDismiss = onDismiss,
+        onStart = onStart,
+        onScroll = onScroll,
+    )
+
+private class PaneNavWindowCallback(
+    private val base: Window.Callback,
+    private val handlers: PaneNavWindowHandlers,
+    private val window: Window?,
+) : Window.Callback by base {
+    private var stickEngaged = 0
+
+    private fun hideImeIfVisible(): Boolean {
+        val win = window ?: return false
+        val decor = win.decorView
+        val insets = androidx.core.view.ViewCompat.getRootWindowInsets(decor) ?: return false
+        if (!insets.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime())) return false
+        androidx.core.view.WindowInsetsControllerCompat(win, decor)
+            .hide(androidx.core.view.WindowInsetsCompat.Type.ime())
+        return true
+    }
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        val keyCode = event.keyCode
+        if (!isOwnedKey(keyCode)) return base.dispatchKeyEvent(event)
+        if (event.action != KeyEvent.ACTION_DOWN) return true
+        when (keyCode) {
+            KeyEvent.KEYCODE_DPAD_LEFT -> handlers.onDir(PANE_DIR_LEFT)
+            KeyEvent.KEYCODE_DPAD_RIGHT -> handlers.onDir(PANE_DIR_RIGHT)
+            KeyEvent.KEYCODE_DPAD_UP -> handlers.onDir(PANE_DIR_UP)
+            KeyEvent.KEYCODE_DPAD_DOWN -> handlers.onDir(PANE_DIR_DOWN)
+            KeyEvent.KEYCODE_DPAD_CENTER,
+            KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_ENTER,
+            KeyEvent.KEYCODE_NUMPAD_ENTER,
+            -> handlers.onActivate()
+            KeyEvent.KEYCODE_BUTTON_X,
+            KeyEvent.KEYCODE_BUTTON_Y,
+            -> handlers.onSecondary()
+            KeyEvent.KEYCODE_BUTTON_START -> handlers.onStart()
+            KeyEvent.KEYCODE_BUTTON_B,
+            KeyEvent.KEYCODE_BACK,
+            -> if (!hideImeIfVisible()) handlers.onDismiss()
+        }
+        return true
+    }
+
+    override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
+        if ((event.source and InputDevice.SOURCE_JOYSTICK) != InputDevice.SOURCE_JOYSTICK ||
+            event.action != MotionEvent.ACTION_MOVE
+        ) {
+            return base.dispatchGenericMotionEvent(event)
+        }
+        handlers.onScroll(event.getAxisValue(MotionEvent.AXIS_RZ))
+        val sx = event.getAxisValue(MotionEvent.AXIS_X)
+        val sy = event.getAxisValue(MotionEvent.AXIS_Y)
+        val hx = event.getAxisValue(MotionEvent.AXIS_HAT_X)
+        val hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y)
+        val dir =
+            when {
+                sx < -PANE_STICK_ENGAGE || hx < -PANE_STICK_ENGAGE -> PANE_DIR_LEFT
+                sx > PANE_STICK_ENGAGE || hx > PANE_STICK_ENGAGE -> PANE_DIR_RIGHT
+                sy < -PANE_STICK_ENGAGE || hy < -PANE_STICK_ENGAGE -> PANE_DIR_UP
+                sy > PANE_STICK_ENGAGE || hy > PANE_STICK_ENGAGE -> PANE_DIR_DOWN
+                else -> 0
+            }
+        if (dir != 0) {
+            if (stickEngaged == 0) {
+                stickEngaged = dir
+                handlers.onDir(dir)
+            }
+            return true
+        }
+        if (abs(sx) < PANE_STICK_RELEASE && abs(sy) < PANE_STICK_RELEASE &&
+            abs(hx) < PANE_STICK_RELEASE && abs(hy) < PANE_STICK_RELEASE
+        ) {
+            stickEngaged = 0
+        }
+        return true
+    }
+
+    private fun isOwnedKey(keyCode: Int): Boolean =
+        when (keyCode) {
+            KeyEvent.KEYCODE_DPAD_LEFT,
+            KeyEvent.KEYCODE_DPAD_RIGHT,
+            KeyEvent.KEYCODE_DPAD_UP,
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_CENTER,
+            KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_ENTER,
+            KeyEvent.KEYCODE_NUMPAD_ENTER,
+            KeyEvent.KEYCODE_BUTTON_X,
+            KeyEvent.KEYCODE_BUTTON_Y,
+            KeyEvent.KEYCODE_BUTTON_START,
+            KeyEvent.KEYCODE_BUTTON_B,
+            KeyEvent.KEYCODE_BACK,
+            -> true
+            else -> false
+        }
+}
+
+// Install the nav source on this window; returns a restore lambda that reinstalls the previous callback on teardown.
+internal fun Window.bindPaneNav(handlers: PaneNavWindowHandlers): () -> Unit {
+    val prev = callback ?: return {}
+    val wrapper = PaneNavWindowCallback(prev, handlers, this)
+    callback = wrapper
+    return { if (callback === wrapper) callback = prev }
+}
+
+internal fun Window.bindPaneNav(
+    registry: PaneNavRegistry,
+    onDismiss: () -> Unit,
+    onStart: () -> Unit = {},
+): () -> Unit = bindPaneNav(paneNavHandlers(onDismiss, onStart) { registry })
+
+// For Dialog { } content: resolves the dialog's own Window via DialogWindowProvider and binds the nav source.
+@Composable
+internal fun DialogPaneNav(
+    registry: PaneNavRegistry,
+    onDismiss: () -> Unit,
+    onStart: () -> Unit = {},
+) {
+    DialogPaneNav(paneNavHandlers(onDismiss, onStart) { registry })
+}
+
+@Composable
+internal fun DialogPaneNav(handlers: PaneNavWindowHandlers) {
+    val view = LocalView.current
+    DisposableEffect(view, handlers) {
+        val window = (view.parent as? DialogWindowProvider)?.window
+        val restore = window?.bindPaneNav(handlers)
+        onDispose { restore?.invoke() }
+    }
+}
diff --git a/app/src/main/shared/ui/nav/PaneNav.kt b/app/src/main/shared/ui/nav/PaneNav.kt
new file mode 100644
index 000000000..f4f45f1aa
--- /dev/null
+++ b/app/src/main/shared/ui/nav/PaneNav.kt
@@ -0,0 +1,435 @@
+package com.winlator.cmod.shared.ui.nav
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+internal const val PANE_DIR_LEFT = 1
+internal const val PANE_DIR_RIGHT = 2
+internal const val PANE_DIR_UP = 3
+internal const val PANE_DIR_DOWN = 4
+internal const val PANE_DIR_ACTIVATE = 5
+internal const val PANE_DIR_SECONDARY = 6
+internal const val PANE_ROW_Y_THRESHOLD = 24f
+
+private val PaneDefaultHighlight = Color(0xFF2196F3)
+
+private class PaneNavEntry(
+    var x: Float,
+    var y: Float,
+    var h: Float,
+    var onActivate: () -> Unit,
+    var onAdjust: ((Int) -> Unit)?,
+    var onSecondary: () -> Unit,
+    var gx: Int? = null,
+    var gy: Int? = null,
+)
+
+@Stable
+internal class PaneNavRegistry(initialSignal: Int = -1) {
+    private val items = mutableStateMapOf<Int, PaneNavEntry>()
+    // Row layout is derived from every item's geometry, so it is cached per change instead of
+    // being re-sorted on each isActive() call.
+    private var layoutVersion by mutableStateOf(0)
+    private var cachedRows: List<List<Int>> = emptyList()
+    private var cachedRowsVersion = -1
+    private var cachedRowsSingleRow = false
+    private var slotCounter = 0
+    private var lastSignal = initialSignal
+    var controllerActive by mutableStateOf(false)
+    var onEdgeLeft: (() -> Unit)? = null
+    var onEdgeRight: (() -> Unit)? = null
+    var onEdgeUp: (() -> Unit)? = null
+    var onEdgeDown: (() -> Unit)? = null
+    var singleRow = false
+    var overlay: PaneNavRegistry? = null
+    var overlayClose: (() -> Unit)? = null
+    var activeRow by mutableStateOf(0)
+        private set
+    var activeCol by mutableStateOf(0)
+        private set
+
+    var entrySlot: Int? = null
+        private set
+    private var pendingEntry = true
+    var manualSelection = false
+        private set
+
+    var explicitGrid by mutableStateOf(false)
+        private set
+    private var activeSlot by mutableStateOf<Int?>(null)
+    var stableCursor = false
+    private var cursorSlot by mutableStateOf<Int?>(null)
+
+    fun nextSlot(): Int = slotCounter++
+
+    fun markEntry(slot: Int) {
+        entrySlot = slot
+        if (pendingEntry) selectSlot(slot)
+    }
+
+    fun reportCallbacks(slot: Int, onActivate: () -> Unit, onAdjust: ((Int) -> Unit)?, onSecondary: () -> Unit) {
+        val e = items[slot]
+        if (e == null) {
+            items[slot] = PaneNavEntry(0f, 0f, 0f, onActivate, onAdjust, onSecondary)
+            layoutVersion++
+        } else {
+            e.onActivate = onActivate
+            e.onAdjust = onAdjust
+            e.onSecondary = onSecondary
+        }
+    }
+
+    fun reportPosition(slot: Int, x: Float, y: Float, h: Float) {
+        val e = items[slot] ?: return
+        if (e.x != x || e.y != y || e.h != h) {
+            e.x = x
+            e.y = y
+            e.h = h
+            layoutVersion++
+            if (pendingEntry) entrySlot?.let { selectSlot(it) }
+        }
+    }
+
+    fun reportGrid(slot: Int, gx: Int, gy: Int) {
+        explicitGrid = true
+        val e = items[slot]
+        if (e == null) {
+            items[slot] = PaneNavEntry(0f, 0f, 0f, {}, null, {}, gx, gy)
+            layoutVersion++
+        } else if (e.gx != gx || e.gy != gy) {
+            e.gx = gx
+            e.gy = gy
+            layoutVersion++
+        }
+        if (pendingEntry) entrySlot?.let { selectSlot(it) }
+    }
+
+    fun activeItemBounds(): Pair<Float, Float>? {
+        if (stableCursor) {
+            cursorSlot?.let { cs ->
+                val e = items[cs] ?: return null
+                return e.y to (e.y + e.h)
+            }
+        }
+        val r = rows
+        if (r.isEmpty()) return null
+        val row = r[activeRow.coerceIn(0, r.size - 1)]
+        val slot = row[activeCol.coerceIn(0, row.size - 1)]
+        val e = items[slot] ?: return null
+        return e.y to (e.y + e.h)
+    }
+
+    fun unregister(slot: Int) {
+        if (items.remove(slot) != null) layoutVersion++
+    }
+
+    val rows: List<List<Int>>
+        get() {
+            val version = layoutVersion
+            if (cachedRowsVersion == version && cachedRowsSingleRow == singleRow) return cachedRows
+            cachedRows = computeRows()
+            cachedRowsVersion = version
+            cachedRowsSingleRow = singleRow
+            return cachedRows
+        }
+
+    private fun computeRows(): List<List<Int>> {
+        if (singleRow) {
+            if (items.isEmpty()) return emptyList()
+            return listOf(items.entries.sortedBy { it.value.x }.map { it.key })
+        }
+        val sorted = items.entries.sortedWith(compareBy({ it.value.y + it.value.h / 2f }, { it.value.x }))
+        val result = mutableListOf<MutableList<Int>>()
+        var prevCenterY = Float.NaN
+        for (entry in sorted) {
+            val centerY = entry.value.y + entry.value.h / 2f
+            if (result.isEmpty() || kotlin.math.abs(centerY - prevCenterY) > PANE_ROW_Y_THRESHOLD) {
+                result.add(mutableListOf(entry.key))
+            } else {
+                result.last().add(entry.key)
+            }
+            prevCenterY = centerY
+        }
+        return result
+    }
+
+    fun isActive(slot: Int): Boolean {
+        if (!controllerActive) return false
+        if (explicitGrid) return (activeSlot ?: entrySlot) == slot
+        cursorSlot?.let { if (stableCursor) return it == slot }
+        val r = rows
+        if (r.isEmpty()) return false
+        val row = r[activeRow.coerceIn(0, r.size - 1)]
+        return row[activeCol.coerceIn(0, row.size - 1)] == slot
+    }
+
+    fun tapSelect(slot: Int) {
+        pendingEntry = false
+        manualSelection = true
+        selectSlot(slot)
+    }
+
+    fun selectSlot(slot: Int) {
+        if (explicitGrid) {
+            activeSlot = slot
+            return
+        }
+        cursorSlot = slot
+        val r = rows
+        for (ri in r.indices) {
+            val ci = r[ri].indexOf(slot)
+            if (ci >= 0) {
+                activeRow = ri
+                activeCol = ci
+                return
+            }
+        }
+    }
+
+    fun reset() {
+        activeRow = 0
+        activeCol = 0
+        cursorSlot = entrySlot
+        pendingEntry = true
+        manualSelection = false
+        entrySlot?.let { selectSlot(it) }
+    }
+
+    fun navDir(dir: Int) {
+        val wasActive = controllerActive
+        controllerActive = true
+        if (!wasActive) {
+            pendingEntry = false
+            if (!manualSelection) entrySlot?.let { selectSlot(it) }
+            manualSelection = false
+            if (dir == PANE_DIR_ACTIVATE || dir == PANE_DIR_SECONDARY) handleNav(dir)
+            return
+        }
+        pendingEntry = false
+        handleNav(dir)
+    }
+
+    fun processNav(signal: Int, dir: Int) {
+        if (lastSignal == -1) {
+            lastSignal = signal
+            return
+        }
+        if (signal == lastSignal) return
+        lastSignal = signal
+        handleNav(dir)
+    }
+
+    private fun handleNav(dir: Int) {
+        pendingEntry = false
+        manualSelection = false
+        overlay?.let { ov ->
+            ov.controllerActive = true
+            ov.handleNav(dir)
+            return
+        }
+        if (explicitGrid) {
+            explicitHandleNav(dir)
+            return
+        }
+        val r = rows
+        if (r.isEmpty()) return
+        var row = activeRow.coerceIn(0, r.size - 1)
+        var col = activeCol.coerceIn(0, r[row].size - 1)
+        if (stableCursor) {
+            cursorSlot?.let { cs ->
+                for (ri in r.indices) {
+                    val ci = r[ri].indexOf(cs)
+                    if (ci >= 0) {
+                        row = ri
+                        col = ci
+                        break
+                    }
+                }
+            }
+        }
+        when (dir) {
+            PANE_DIR_UP -> if (row > 0) { row--; col = col.coerceAtMost(r[row].size - 1) } else onEdgeUp?.invoke()
+            PANE_DIR_DOWN -> if (row < r.size - 1) { row++; col = col.coerceAtMost(r[row].size - 1) } else onEdgeDown?.invoke()
+            PANE_DIR_LEFT ->
+                if (r[row].size <= 1) {
+                    val adjust = items[r[row][0]]?.onAdjust
+                    if (adjust != null) adjust(-1) else onEdgeLeft?.invoke()
+                } else if (col > 0) {
+                    col--
+                } else {
+                    onEdgeLeft?.invoke()
+                }
+            PANE_DIR_RIGHT ->
+                if (r[row].size <= 1) {
+                    val adjust = items[r[row][0]]?.onAdjust
+                    if (adjust != null) adjust(1) else onEdgeRight?.invoke()
+                } else if (col < r[row].size - 1) {
+                    col++
+                } else {
+                    onEdgeRight?.invoke()
+                }
+            PANE_DIR_ACTIVATE -> items[r[row][col]]?.onActivate?.invoke()
+            PANE_DIR_SECONDARY -> items[r[row][col]]?.onSecondary?.invoke()
+        }
+        activeRow = row
+        activeCol = col
+        if (stableCursor) cursorSlot = r.getOrNull(row)?.getOrNull(col) ?: cursorSlot
+    }
+
+    private fun explicitHandleNav(dir: Int) {
+        val curSlot = activeSlot ?: entrySlot ?: return
+        val cur = items[curSlot] ?: return
+        if (dir == PANE_DIR_ACTIVATE) {
+            cur.onActivate()
+            return
+        }
+        if (dir == PANE_DIR_SECONDARY) {
+            cur.onSecondary()
+            return
+        }
+        val cx = cur.gx ?: return
+        val cy = cur.gy ?: return
+        var best: Int? = null
+        var bestScore = Int.MAX_VALUE
+        for ((slot, e) in items) {
+            if (slot == curSlot) continue
+            val ex = e.gx ?: continue
+            val ey = e.gy ?: continue
+            val inDir =
+                when (dir) {
+                    PANE_DIR_LEFT -> ex < cx
+                    PANE_DIR_RIGHT -> ex > cx
+                    PANE_DIR_UP -> ey < cy
+                    PANE_DIR_DOWN -> ey > cy
+                    else -> false
+                }
+            if (!inDir) continue
+            val score =
+                when (dir) {
+                    PANE_DIR_LEFT -> kotlin.math.abs(ey - cy) * 1000 + (cx - ex)
+                    PANE_DIR_RIGHT -> kotlin.math.abs(ey - cy) * 1000 + (ex - cx)
+                    PANE_DIR_UP -> kotlin.math.abs(ex - cx) * 1000 + (cy - ey)
+                    else -> kotlin.math.abs(ex - cx) * 1000 + (ey - cy)
+                }
+            if (score < bestScore) {
+                bestScore = score
+                best = slot
+            }
+        }
+        if (best != null) {
+            activeSlot = best
+        } else when (dir) {
+            PANE_DIR_LEFT -> onEdgeLeft?.invoke()
+            PANE_DIR_RIGHT -> onEdgeRight?.invoke()
+            PANE_DIR_UP -> onEdgeUp?.invoke()
+            PANE_DIR_DOWN -> onEdgeDown?.invoke()
+        }
+    }
+}
+
+internal val LocalPaneNav = staticCompositionLocalOf<PaneNavRegistry?> { null }
+
+internal fun Modifier.paneHighlight(
+    highlighted: Boolean,
+    cornerRadius: Dp,
+    highlightColor: Color = PaneDefaultHighlight,
+): Modifier =
+    drawWithContent {
+        val cr = cornerRadius.toPx()
+        if (highlighted) {
+            drawRoundRect(color = highlightColor.copy(alpha = 0.20f), cornerRadius = CornerRadius(cr, cr))
+        }
+        drawContent()
+        if (highlighted) {
+            drawRoundRect(
+                color = highlightColor,
+                cornerRadius = CornerRadius(cr, cr),
+                style = Stroke(width = 1.5.dp.toPx()),
+            )
+        }
+    }
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun Modifier.paneNavItem(
+    cornerRadius: Dp = 10.dp,
+    onActivate: () -> Unit = {},
+    onAdjust: ((Int) -> Unit)? = null,
+    onSecondary: () -> Unit = {},
+    highlightColor: Color = PaneDefaultHighlight,
+    tapToSelect: Boolean = false,
+    isEntry: Boolean = false,
+    navRow: Int? = null,
+    navCol: Int? = null,
+    onHighlighted: () -> Unit = {},
+    pinTop: Boolean = false,
+): Modifier {
+    val nav = LocalPaneNav.current ?: return this
+    val slot = remember { nav.nextSlot() }
+    DisposableEffect(slot) { onDispose { nav.unregister(slot) } }
+    SideEffect {
+        nav.reportCallbacks(slot, onActivate, onAdjust, onSecondary)
+        if (navRow != null && navCol != null) nav.reportGrid(slot, navCol, navRow)
+        if (isEntry) nav.markEntry(slot)
+    }
+    val highlighted = nav.isActive(slot)
+
+    val bring = remember { BringIntoViewRequester() }
+    LaunchedEffect(highlighted) {
+        if (highlighted) {
+            if (!nav.manualSelection) runCatching { bring.bringIntoView() }
+            onHighlighted()
+        }
+    }
+
+    val tapInteraction = remember { MutableInteractionSource() }
+    return this
+        .onGloballyPositioned {
+            val p = it.positionInWindow()
+            nav.reportPosition(slot, p.x, if (pinTop) -1_000_000f else p.y, it.size.height.toFloat())
+        }
+        .bringIntoViewRequester(bring)
+        .pointerInput(slot) {
+            awaitEachGesture {
+                awaitFirstDown(requireUnconsumed = false)
+                nav.tapSelect(slot)
+            }
+        }
+        .then(
+            if (tapToSelect) {
+                Modifier.clickable(interactionSource = tapInteraction, indication = null) {
+                    nav.tapSelect(slot)
+                    onActivate()
+                }
+            } else {
+                Modifier
+            },
+        )
+        .paneHighlight(highlighted, cornerRadius, highlightColor)
+}
diff --git a/app/src/main/shared/ui/settings/SharedSettingsWidgets.kt b/app/src/main/shared/ui/settings/SharedSettingsWidgets.kt
new file mode 100644
index 000000000..44f1fec77
--- /dev/null
+++ b/app/src/main/shared/ui/settings/SharedSettingsWidgets.kt
@@ -0,0 +1,151 @@
+package com.winlator.cmod.shared.ui.settings
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.winlator.cmod.shared.theme.GameSettingsStyle
+import com.winlator.cmod.shared.ui.nav.paneNavItem
+import com.winlator.cmod.shared.ui.outlinedSwitchColors
+
+@Composable
+fun SharedSettingGroup(content: @Composable () -> Unit) {
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(12.dp))
+                .background(GameSettingsStyle.CardSurface)
+                .border(1.dp, GameSettingsStyle.CardBorder, RoundedCornerShape(12.dp))
+                .padding(12.dp),
+    ) {
+        content()
+    }
+}
+
+@Composable
+fun SharedGroupTitle(text: String) {
+    Text(
+        text = text,
+        color = GameSettingsStyle.TextSecondary,
+        fontSize = 11.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = 0.6.sp,
+        modifier = Modifier.padding(bottom = 8.dp),
+    )
+}
+
+@Composable
+fun SharedInfoRow(
+    label: String,
+    value: String,
+    singleLineValue: Boolean = false,
+) {
+    val treatAsPath =
+        singleLineValue ||
+            value.contains('/') ||
+            value.contains('\\') ||
+            value.contains(".so")
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(vertical = 4.dp),
+    ) {
+        Text(
+            text = label,
+            color = GameSettingsStyle.TextSecondary,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        Spacer(Modifier.height(2.dp))
+        Text(
+            text = value,
+            color = GameSettingsStyle.TextPrimary,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium,
+            maxLines = if (treatAsPath) 1 else Int.MAX_VALUE,
+            overflow = if (treatAsPath) TextOverflow.Ellipsis else TextOverflow.Clip,
+            softWrap = !treatAsPath,
+        )
+    }
+}
+
+@Composable
+fun SharedSettingSwitch(
+    label: String,
+    checked: Boolean,
+    subtitle: String? = null,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(8.dp))
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                ) { onCheckedChange(!checked) }
+                .paneNavItem(
+                    cornerRadius = 8.dp,
+                    onActivate = { onCheckedChange(!checked) },
+                    highlightColor = GameSettingsStyle.NavHighlight,
+                    tapToSelect = true,
+                )
+                .padding(vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(modifier = Modifier.weight(1f).padding(end = 8.dp)) {
+            Text(
+                label,
+                color = GameSettingsStyle.TextPrimary,
+                fontSize = 12.sp,
+                softWrap = true,
+                maxLines = 3,
+                overflow = TextOverflow.Clip,
+            )
+            if (subtitle != null) {
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    subtitle,
+                    color = GameSettingsStyle.TextSecondary,
+                    fontSize = 11.sp,
+                    softWrap = true,
+                    maxLines = 4,
+                    overflow = TextOverflow.Clip,
+                    lineHeight = 14.sp,
+                )
+            }
+        }
+        Switch(
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+            colors =
+                outlinedSwitchColors(
+                    accentColor = GameSettingsStyle.AccentBlue,
+                    textSecondaryColor = GameSettingsStyle.TextSecondary,
+                ),
+        )
+    }
+}
diff --git a/app/src/main/shared/ui/toast/WinToast.kt b/app/src/main/shared/ui/toast/WinToast.kt
index fc2a5fd1a..9db625c35 100644
--- a/app/src/main/shared/ui/toast/WinToast.kt
+++ b/app/src/main/shared/ui/toast/WinToast.kt
@@ -57,6 +57,11 @@ object WinToast {
         show(context, text, null, toastDurationToMs(toastDuration))
     }
 
+    @JvmStatic
+    fun show(context: Context, text: String, toastDuration: Int, anchor: android.view.View?) {
+        show(context, text, null, toastDurationToMs(toastDuration), anchor)
+    }
+
     @JvmStatic
     fun show(context: Context, @StringRes textResId: Int, toastDuration: Int) {
         show(context, context.getString(textResId), toastDuration)
@@ -78,9 +83,25 @@ object WinToast {
     }
 
     @JvmStatic
-    fun show(context: Context, text: String, icon: Bitmap?, durationMs: Long) {
+    fun show(context: Context, @StringRes textResId: Int, anchor: android.view.View?) {
+        show(context, context.getString(textResId), anchor)
+    }
+
+    @JvmStatic
+    fun show(context: Context, @StringRes textResId: Int, icon: Bitmap?, anchor: android.view.View?) {
+        val text = context.getString(textResId)
+        show(context, text, icon, autoDurationMs(text), anchor)
+    }
+
+    @JvmStatic
+    fun show(context: Context, text: String, anchor: android.view.View?) {
+        show(context, text, null, autoDurationMs(text), anchor)
+    }
+
+    @JvmStatic
+    fun show(context: Context, text: String, icon: Bitmap?, durationMs: Long, anchor: android.view.View? = null) {
         if (Looper.myLooper() != Looper.getMainLooper()) {
-            mainHandler.post { show(context, text, icon, durationMs) }
+            mainHandler.post { show(context, text, icon, durationMs, anchor) }
             return
         }
         val activity = resolveActivity(context)
@@ -89,7 +110,7 @@ object WinToast {
             return
         }
         val resolvedIcon = icon ?: getDefaultIcon(activity)
-        showCompose(activity, text, resolvedIcon, durationMs)
+        showCompose(activity, text, resolvedIcon, durationMs, anchor)
     }
 
     private fun getDefaultIcon(context: Context): Bitmap? {
@@ -103,6 +124,7 @@ object WinToast {
         text: String,
         icon: Bitmap?,
         durationMs: Long,
+        anchor: android.view.View? = null
     ) {
         dismissActive()
 
@@ -150,11 +172,13 @@ object WinToast {
             isOutsideTouchable = false
             isClippingEnabled = false
             animationStyle = 0
+            windowLayoutType = WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL
         }
 
         try {
+            val targetAnchor = anchor ?: activity.window.decorView
             popup.showAtLocation(
-                activity.window.decorView,
+                targetAnchor,
                 Gravity.CENTER or Gravity.BOTTOM,
                 0,
                 BOTTOM_OFFSET_PX,
diff --git a/app/src/main/shared/ui/widget/ChasingBorderDrawable.kt b/app/src/main/shared/ui/widget/ChasingBorderDrawable.kt
deleted file mode 100644
index a85801789..000000000
--- a/app/src/main/shared/ui/widget/ChasingBorderDrawable.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.winlator.cmod.shared.ui.widget
-import android.animation.ValueAnimator
-import android.graphics.Canvas
-import android.graphics.ColorFilter
-import android.graphics.Matrix
-import android.graphics.Paint
-import android.graphics.Path
-import android.graphics.PixelFormat
-import android.graphics.RectF
-import android.graphics.SweepGradient
-import android.graphics.drawable.Drawable
-import android.view.animation.LinearInterpolator
-
-/**
- * Animated border that sweeps a gradient around a rounded rectangle.
- *
- * Uses a SweepGradient shader rotated by a ValueAnimator — single draw call,
- * GPU blended colors, no segment artifacts.
- */
-class ChasingBorderDrawable
-    @JvmOverloads
-    constructor(
-        private val cornerRadiusDp: Float,
-        private val borderWidthDp: Float,
-        private val density: Float,
-        private val animationDurationMs: Long = 8200L,
-        private val gradientColors: IntArray =
-            intArrayOf(
-                0xFF2196F3.toInt(), // blue
-                0xFF29B6F6.toInt(), // sky blue
-                0xFF00E5FF.toInt(), // electric cyan
-                0xFF29B6F6.toInt(), // sky blue
-                0xFF2196F3.toInt(), // blue (seamless)
-            ),
-        private val gradientStops: FloatArray =
-            floatArrayOf(
-                0f,
-                0.25f,
-                0.50f,
-                0.75f,
-                1f,
-            ),
-    ) : Drawable() {
-        private val cornerRadius = cornerRadiusDp * density
-        private val borderWidth = borderWidthDp * density
-        private val drawRect = RectF()
-        private val borderPath = Path()
-        private val rotationMatrix = Matrix()
-
-        // Current rotation angle in degrees, driven by the animator
-        private var rotationDegrees = 0f
-
-        // Stroke paint — shader is set in rebuildShader()
-        private val borderPaint =
-            Paint(Paint.ANTI_ALIAS_FLAG).apply {
-                style = Paint.Style.STROKE
-                strokeWidth = borderWidth
-                strokeCap = Paint.Cap.ROUND
-                strokeJoin = Paint.Join.ROUND
-                setShadowLayer(6f * density, 0f, 0f, 0x3029B6F6)
-            }
-
-        // Loops 0→360 forever, rotating the sweep gradient
-        private val animator =
-            ValueAnimator.ofFloat(0f, 360f).apply {
-                duration = animationDurationMs
-                repeatCount = ValueAnimator.INFINITE
-                interpolator = LinearInterpolator()
-                addUpdateListener { animation ->
-                    rotationDegrees = animation.animatedValue as Float
-                    invalidateSelf()
-                }
-            }
-
-        override fun onBoundsChange(bounds: android.graphics.Rect) {
-            super.onBoundsChange(bounds)
-            rebuildPath()
-            rebuildShader()
-        }
-
-        override fun draw(canvas: Canvas) {
-            if (bounds.width() <= 0 || bounds.height() <= 0) return
-
-            // Rotate the sweep gradient around the center
-            val cx = bounds.exactCenterX()
-            val cy = bounds.exactCenterY()
-            rotationMatrix.setRotate(rotationDegrees, cx, cy)
-            borderPaint.shader?.setLocalMatrix(rotationMatrix)
-
-            canvas.drawPath(borderPath, borderPaint)
-        }
-
-        // Build the rounded-rectangle stroke path
-        private fun rebuildPath() {
-            drawRect.set(bounds)
-            drawRect.inset(borderWidth / 2f, borderWidth / 2f)
-            borderPath.reset()
-            borderPath.addRoundRect(drawRect, cornerRadius, cornerRadius, Path.Direction.CW)
-        }
-
-        // Create the SweepGradient centered on the drawable
-        private fun rebuildShader() {
-            if (bounds.width() <= 0 || bounds.height() <= 0) return
-            val cx = bounds.exactCenterX()
-            val cy = bounds.exactCenterY()
-            borderPaint.shader = SweepGradient(cx, cy, gradientColors, gradientStops)
-        }
-
-        override fun setVisible(
-            visible: Boolean,
-            restart: Boolean,
-        ): Boolean {
-            val changed = super.setVisible(visible, restart)
-            if (visible) {
-                if (restart) {
-                    animator.cancel()
-                    rotationDegrees = 0f
-                }
-                if (!animator.isRunning) animator.start()
-            } else {
-                animator.cancel()
-            }
-            return changed
-        }
-
-        override fun setAlpha(alpha: Int) {
-            borderPaint.alpha = alpha
-        }
-
-        override fun setColorFilter(colorFilter: ColorFilter?) {
-            borderPaint.colorFilter = colorFilter
-        }
-
-        @Deprecated("Deprecated in Java", ReplaceWith("PixelFormat.TRANSLUCENT", "android.graphics.PixelFormat"))
-        override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
-
-        override fun getConstantState(): ConstantState =
-            ChasingBorderState(
-                cornerRadiusDp,
-                borderWidthDp,
-                density,
-                animationDurationMs,
-                gradientColors,
-                gradientStops,
-            )
-
-        private class ChasingBorderState(
-            private val cornerRadiusDp: Float,
-            private val borderWidthDp: Float,
-            private val density: Float,
-            private val animationDurationMs: Long,
-            private val gradientColors: IntArray,
-            private val gradientStops: FloatArray,
-        ) : ConstantState() {
-            override fun newDrawable(): Drawable =
-                ChasingBorderDrawable(
-                    cornerRadiusDp = cornerRadiusDp,
-                    borderWidthDp = borderWidthDp,
-                    density = density,
-                    animationDurationMs = animationDurationMs,
-                    gradientColors = gradientColors,
-                    gradientStops = gradientStops,
-                )
-
-            override fun getChangingConfigurations(): Int = 0
-        }
-    }
diff --git a/app/src/main/shared/ui/widget/ChasingBorderModifier.kt b/app/src/main/shared/ui/widget/ChasingBorderModifier.kt
index 5393cedac..e9e1ac6da 100644
--- a/app/src/main/shared/ui/widget/ChasingBorderModifier.kt
+++ b/app/src/main/shared/ui/widget/ChasingBorderModifier.kt
@@ -2,7 +2,6 @@ package com.winlator.cmod.shared.ui.widget
 
 import android.graphics.Matrix
 import android.graphics.Paint
-import android.graphics.Path
 import android.graphics.RectF
 import android.graphics.SweepGradient
 import androidx.compose.animation.core.LinearEasing
@@ -70,17 +69,12 @@ fun Modifier.chasingBorder(
             if (w <= 0f || h <= 0f) {
                 onDrawWithContent { drawContent() }
             } else {
+                // Draw with the native round-rect primitive instead of a filled ring or path.
+                // That keeps the corner curve in Skia's optimized AA pipeline and avoids path
+                // flattening artifacts at small radii.
                 val inset = borderWidthPx / 2f
                 val rect = RectF(inset, inset, w - inset, h - inset)
-                val path =
-                    Path().apply {
-                        addRoundRect(
-                            rect,
-                            cornerRadiusPx,
-                            cornerRadiusPx,
-                            Path.Direction.CW,
-                        )
-                    }
+                val strokeCornerRadius = (cornerRadiusPx - inset).coerceAtLeast(0f)
                 val shader =
                     SweepGradient(
                         w / 2f,
@@ -90,7 +84,9 @@ fun Modifier.chasingBorder(
                     )
                 val matrix = Matrix()
                 val paint =
-                    Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                    Paint(Paint.ANTI_ALIAS_FLAG or Paint.DITHER_FLAG).apply {
+                        isAntiAlias = true
+                        isDither = true
                         style = Paint.Style.STROKE
                         strokeWidth = borderWidthPx
                         strokeCap = Paint.Cap.ROUND
@@ -107,7 +103,12 @@ fun Modifier.chasingBorder(
                     matrix.setRotate(rotationDegrees, w / 2f, h / 2f)
                     shader.setLocalMatrix(matrix)
 
-                    drawContext.canvas.nativeCanvas.drawPath(path, paint)
+                    drawContext.canvas.nativeCanvas.drawRoundRect(
+                        rect,
+                        strokeCornerRadius,
+                        strokeCornerRadius,
+                        paint,
+                    )
                 }
             }
         }
diff --git a/app/src/main/shared/ui/widget/EnvVarsView.java b/app/src/main/shared/ui/widget/EnvVarsView.java
index aabc6f06c..7a097b198 100644
--- a/app/src/main/shared/ui/widget/EnvVarsView.java
+++ b/app/src/main/shared/ui/widget/EnvVarsView.java
@@ -97,19 +97,23 @@ public class EnvVarsView extends FrameLayout {
       "compiler",
       "samplers"
     },
+    {"DXVK_DISABLE_TIMELINE_SEMAPHORES", "CHECKBOX", "0", "1"},
     {"MESA_EXTENSION_MAX_YEAR", "TEXT"},
     {"WRAPPER_MAX_IMAGE_COUNT", "TEXT"},
+    {"WRAPPER_DMAHEAP_CACHED", "CHECKBOX", "0", "1"},
     {"MESA_GL_VERSION_OVERRIDE", "TEXT"},
     {"PULSE_LATENCY_MSEC", "NUMBER"},
-    {"WINNATIVE_ALSA_LATENCY_MS", "NUMBER"},
-    {"WINNATIVE_ALSA_VOLUME", "DECIMAL"},
-    {"WINNATIVE_ALSA_BASS_BOOST", "DECIMAL"},
-    {"WINNATIVE_ALSA_PERFORMANCE_MODE", "SELECT", "low_latency", "none", "power_saving"},
+    {"ALSA_LATENCY_MS", "NUMBER"},
+    {"ALSA_VOLUME", "DECIMAL"},
+    {"ALSA_BASS_BOOST", "DECIMAL"},
+    {"ALSA_PERFORMANCE_MODE", "SELECT", "low_latency", "none", "power_saving"},
     {"WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER", "CHECKBOX", "0", "1"},
     {"WINE_NEW_MEDIASOURCE", "CHECKBOX", "0", "1"},
     {"WINE_LARGE_ADDRESS_AWARE", "CHECKBOX", "0", "1"},
+    {"VKD3D_SHADER_MODEL", "SELECT_CUSTOM", "6_9", "6_6", "6_0", "5_0"},
     {"WINEDLLOVERRIDES", "TEXT"},
-    {"GALLIUM_HUD", "SELECT_MULTIPLE", "simple", "fps", "frametime"}
+    {"GALLIUM_HUD", "SELECT_MULTIPLE", "simple", "fps", "frametime"},
+    {"WINE_FAST_YIELD", "TEXT", "1"}
   };
   private final LinearLayout container;
   private final TextView emptyTextView;
diff --git a/app/src/main/shared/util/OnExtractFileListener.java b/app/src/main/shared/util/OnExtractFileListener.java
index 1ebd06eee..8c674c5b5 100644
--- a/app/src/main/shared/util/OnExtractFileListener.java
+++ b/app/src/main/shared/util/OnExtractFileListener.java
@@ -4,4 +4,16 @@
 
 public interface OnExtractFileListener {
   File onExtractFile(File destination, long size);
+
+  default void onExtractFileProgress(File destination, long size) {}
+
+  default boolean mapsExtractedFiles() {
+    return true;
+  }
+
+  default boolean reportsExtractedBytesOnly() {
+    return false;
+  }
+
+  default void onExtractedBytes(long size) {}
 }
diff --git a/app/src/main/sharedmemory/SysVSharedMemory.java b/app/src/main/sharedmemory/SysVSharedMemory.java
index c261a8e4a..2fba8130c 100644
--- a/app/src/main/sharedmemory/SysVSharedMemory.java
+++ b/app/src/main/sharedmemory/SysVSharedMemory.java
@@ -46,13 +46,15 @@ public int get(long size) {
   }
 
   public void delete(int shmid) {
-    SHMemory shmemory = shmemories.get(shmid);
-    if (shmemory != null) {
-      if (shmemory.fd != -1) {
-        XConnectorEpoll.closeFd(shmemory.fd);
-        shmemory.fd = -1;
+    synchronized (shmemories) {
+      SHMemory shmemory = shmemories.get(shmid);
+      if (shmemory != null) {
+        if (shmemory.fd != -1) {
+          XConnectorEpoll.closeFd(shmemory.fd);
+          shmemory.fd = -1;
+        }
+        shmemories.remove(shmid);
       }
-      shmemories.remove(shmid);
     }
   }
 
diff --git a/armsx2/AndroidManifest.upstream.xml b/armsx2/AndroidManifest.upstream.xml
new file mode 100644
index 000000000..5d350e124
--- /dev/null
+++ b/armsx2/AndroidManifest.upstream.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="archos.permission.FULLSCREEN.FULL" />
+    <!-- Cover artwork can be loaded from the configured remote artwork source. -->
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
+
+    <!-- Optional motion controls (Pad settings). Not required, so the Play install
+         isn't gated for devices without a gyroscope. -->
+    <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
+
+    <application
+        android:name=".Pasx2Application"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:largeHeap="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:isGame="true"
+        android:appCategory="game"
+        android:theme="@style/Theme.ARMSX2"
+        android:allowNativeHeapPointerTagging="false"
+        tools:targetApi="31"
+        >
+        <!-- Declare game mode support (Android 12+) — routes app through GameManager
+             performance profile so the OS scheduler and CPU/GPU governors prefer
+             big cores and peak clocks instead of throttling as a normal app. -->
+        <meta-data android:name="android.app.game_mode" android:value="performance" />
+
+        <!-- Profileable from the adb shell. Lets simpleperf record from the
+             release build without flipping debuggable on (which would also
+             change the JIT path and skew the numbers). -->
+        <profileable android:shell="true" tools:targetApi="29" />
+
+        <meta-data android:name="android.max_aspect" android:value="2.4" />
+
+        <activity
+            android:name=".BootSplashActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
+            android:hardwareAccelerated="true"
+            android:exported="true"
+            android:resizeableActivity="false"
+            android:theme="@style/Theme.ARMSX2.Boot">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.GAME" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".Main"
+            android:launchMode="singleTop"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
+            android:hardwareAccelerated="true"
+            android:exported="true"
+            android:resizeableActivity="false">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+            </intent-filter>
+        </activity>
+
+        <activity-alias
+            android:name=".MainActivity"
+            android:exported="true"
+            android:targetActivity=".Main">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+            </intent-filter>
+        </activity-alias>
+
+        <receiver
+            android:name=".RetroAchievementsHostOverrideReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="${applicationId}.action.SET_RETROACHIEVEMENTS_HOST_OVERRIDE" />
+                <action android:name="${applicationId}.action.CLEAR_RETROACHIEVEMENTS_HOST_OVERRIDE" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+
+
+</manifest>
diff --git a/armsx2/UPSTREAM.md b/armsx2/UPSTREAM.md
new file mode 100644
index 000000000..819758109
--- /dev/null
+++ b/armsx2/UPSTREAM.md
@@ -0,0 +1,55 @@
+# ARMSX2 — vendored source
+
+> **Packaging note (current):** the emucore and its runtime data are no longer committed
+> here. They are built in the [WinNative-Emu](https://github.com/WinNative-Emu) fork and
+> shipped in the [Retro-Consoles](https://github.com/WinNative-Emu/Retro-Consoles) bundle
+> the app downloads at runtime. The build/patch details below describe how that fork
+> produces the binary and remain accurate for the fork.
+
+This module embeds the Android front-end of **ARMSX2**, a GPL-3.0 PlayStation 2
+emulator (a fork of PCSX2) that brings PS2 emulation to ARM64.
+
+- Upstream: https://github.com/ARMSX2/ARMSX2
+- Upstream of upstream (PCSX2): https://github.com/pcsx2/pcsx2
+- License: GPL-3.0 (`COPYING.GPLv3` in the upstream tree)
+- Vendored from commit: `a0bdcbe917bea686333c9683c28b2fca8ed1ed8d` (post 2.6.3)
+- Vendored path: `platforms/android/app/src/main`
+
+## Native emulator core
+
+The core (`libemucore_4k.so` / `libemucore_16k.so`) is built **from source** by
+default during `assembleDebug`. `build-emucore.sh` fetches ARMSX2 at a pinned
+commit (`a0bdcbe917bea686333c9683c28b2fca8ed1ed8d`), applies the tracked patches
+under `patches/`, syncs shaderc's third-party deps, and compiles both the 4K and
+16K page-size variants with CMake + the NDK, stripped to release size. Fetched
+source (`emucore-src/`) and build outputs stay out of git; only the script and
+patches are tracked. The build reproduces the full JNI surface of
+`kr/co/iefriends/pcsx2/NativeApp.java`.
+
+Pass `-Parmsx2.buildNative=false` to fall back to the prebuilt core under
+`prebuilt/emucore/arm64-v8a` (binaries built from the same pin as above), which
+is the opt-out safety net.
+
+The supporting libraries under `src/main/jniLibs/arm64-v8a` (ANGLE, `c++_shared`,
+`androidx.graphics.path`) remain prebuilt — ANGLE in particular is a separate
+Google project, not part of this tree.
+
+### Notable upstream (2.6.3+)
+
+- New ARM64 EE/VU recompiler backend (accuracy/perf; fixes a class of unplayable titles)
+- Optional GS multi-threading
+- Hardcore mode blocks cheats only; disk patches (including DNAS bypass) remain loadable
+
+### Patches (`patches/`)
+
+- `0001-osd-messages-in-display-rect.patch` — anchor OSD messages to the game
+  display rectangle so letterboxing does not push them into black bars
+- `0002-android-net-adapter-no-gateway.patch` — Android net adapter gateway handling
+- `0003-ps2-dns-force-redirect.patch` — force PS2 DNS redirect for online revival
+- `0004-ps2-dns-source-of-truth.patch` — DNS config source-of-truth for DEV9
+
+All upstream copyright and license headers are preserved. This module and the
+binaries it contains remain under GPL-3.0. WinNative as a whole is GPL-3.0, so
+this integration is license-compatible. Modifications made to adapt the code to
+WinNative's build (toolchain, Application ownership, launch entry) are noted in
+the affected files.
diff --git a/armsx2/build.gradle b/armsx2/build.gradle
new file mode 100644
index 000000000..690852f03
--- /dev/null
+++ b/armsx2/build.gradle
@@ -0,0 +1,58 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
+}
+
+android {
+    namespace 'com.armsx2'
+    compileSdk 35
+    ndkVersion '27.3.13750724'
+
+    defaultConfig {
+        minSdk 26
+        ndk {
+            abiFilters 'arm64-v8a'
+        }
+        buildConfigField 'boolean', 'STORAGE_ALL_FILES', 'true'
+        buildConfigField 'String', 'VERSION_NAME', '"2.6.8"'
+    }
+
+    buildFeatures {
+        compose true
+        buildConfig true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    packaging {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+
+}
+
+dependencies {
+    implementation libs.coreKtx
+    implementation libs.appcompat
+    implementation libs.material
+
+    implementation platform(libs.composeBom)
+    implementation libs.activityCompose
+    implementation libs.composeMaterial3
+    implementation libs.composeUi
+    implementation libs.composeUiGraphics
+    implementation libs.composeFoundation
+    implementation libs.composeUiToolingPreview
+    implementation libs.lifecycleViewmodelCompose
+    implementation libs.lifecycleRuntimeCompose
+
+    implementation libs.documentfile
+}
diff --git a/armsx2/src/main/AndroidManifest.xml b/armsx2/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..743e19bf3
--- /dev/null
+++ b/armsx2/src/main/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
+
+    <application android:largeHeap="true">
+
+        <meta-data android:name="android.app.game_mode" android:value="performance" />
+
+        <activity
+            android:name="com.armsx2.Main"
+            android:process=":ps2"
+            android:launchMode="singleTop"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
+            android:hardwareAccelerated="true"
+            android:exported="false"
+            android:resizeableActivity="false"
+            android:theme="@style/Theme.ARMSX2" />
+
+        <activity-alias
+            android:name="com.armsx2.MainActivity"
+            android:exported="false"
+            android:targetActivity="com.armsx2.Main" />
+
+        <receiver
+            android:name="com.armsx2.RetroAchievementsHostOverrideReceiver"
+            android:exported="false" />
+    </application>
+</manifest>
diff --git a/armsx2/src/main/java/com/armsx2/BiosInfo.kt b/armsx2/src/main/java/com/armsx2/BiosInfo.kt
new file mode 100644
index 000000000..9b9542900
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/BiosInfo.kt
@@ -0,0 +1,22 @@
+package com.armsx2
+
+class BiosInfo(
+    @JvmField val version: Int,
+    @JvmField val region: Int,
+    @JvmField val description: String,
+    @JvmField val zone: String,
+) {
+    val versionString: String get() = "v%d.%02d".format((version shr 8) and 0xFF, version and 0xFF)
+
+    val regionFlag: String get() = when (region) {
+        0 -> "🇯🇵"
+        1 -> "🇺🇸"
+        2 -> "🇪🇺"
+        4 -> "🇭🇰"
+        6 -> "🇨🇳"
+        8 -> "🔧"
+        9 -> "🧪"
+        10 -> "🏳️"
+        else -> "🌐"
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/CustomDriver.kt b/armsx2/src/main/java/com/armsx2/CustomDriver.kt
new file mode 100644
index 000000000..2c291503b
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/CustomDriver.kt
@@ -0,0 +1,312 @@
+package com.armsx2
+
+import com.armsx2.runtime.MainActivityRuntime
+
+import android.content.Context
+import android.net.Uri
+import android.util.Log
+import kr.co.iefriends.pcsx2.HttpClient
+import kr.co.iefriends.pcsx2.NativeApp
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.util.zip.ZipInputStream
+
+object CustomDriver {
+
+    private const val TAG = "CustomDriver"
+
+    private data class DriverSource(
+        val label: String,
+        val releasesUrl: String,
+        val idPrefix: String,
+    )
+    private val DRIVER_SOURCES = listOf(
+        DriverSource(
+            "AdrenoToolsDrivers",
+            "https://api.github.com/repos/K11MCH1/AdrenoToolsDrivers/releases",
+            "",
+        ),
+        DriverSource(
+            "MrPurple · purple-turnip",
+            "https://api.github.com/repos/MrPurple666/purple-turnip/releases",
+            "purpleturnip",
+        ),
+        DriverSource(
+            "StevenMXZ · Adreno-Tools",
+            "https://api.github.com/repos/StevenMXZ/Adreno-Tools-Drivers/releases",
+            "stevenmxz",
+        ),
+        DriverSource(
+            "crueter · GameHub 8Elite",
+            "https://api.github.com/repos/crueter/GameHub-8Elite-Drivers/releases",
+            "gamehub8e",
+        ),
+        DriverSource(
+            "PojavLauncherTeam · freedreno (A10)",
+            "https://api.github.com/repos/PojavLauncherTeam/freedreno-builder/releases",
+            "freedrenobuilder",
+        ),
+        DriverSource(
+            "WearyConcern1165 · ExynosTools",
+            "https://api.github.com/repos/WearyConcern1165/ExynosTools/releases",
+            "exynostools",
+        ),
+    )
+
+    private const val DEFAULT_LIBRARY_NAME = "libvulkan_freedreno.so"
+
+    data class InstalledDriver(
+        val id: String,
+        val name: String,
+        val description: String,
+        val author: String,
+        val vendor: String,
+        val version: String,
+        val libraryName: String,
+        val driverDir: File,
+    ) {
+        val driverFile: File get() = File(driverDir, libraryName)
+        val redirectDir: File get() = File(driverDir, "cache")
+    }
+
+    data class RemoteDriver(
+        val id: String,
+        val releaseName: String,
+        val assetName: String,
+        val tagName: String,
+        val publishedAt: String,
+        val assetUrl: String,
+        val sizeBytes: Long,
+        val source: String = "",
+    )
+
+    private fun driversRoot(context: Context): File =
+        File(context.filesDir, "drivers").apply { mkdirs() }
+
+    private fun winlatorDriversRoot(context: Context): File =
+        File(context.filesDir, "contents/adrenotools")
+
+    private fun parseDriverDir(dir: File): InstalledDriver? {
+        val metaFile = File(dir, "meta.json")
+        if (!metaFile.exists()) return null
+        val text = runCatching { metaFile.readText() }.getOrNull() ?: return null
+        val json = runCatching { JSONObject(text) }.getOrNull() ?: return null
+        val libName = json.optString("libraryName").ifEmpty { DEFAULT_LIBRARY_NAME }
+        if (!File(dir, libName).exists()) return null
+        return InstalledDriver(
+            id = dir.name,
+            name = json.optString("name").ifEmpty { dir.name },
+            description = json.optString("description"),
+            author = json.optString("author"),
+            vendor = json.optString("vendor"),
+            version = json.optString("driverVersion").ifEmpty { json.optString("packageVersion") },
+            libraryName = libName,
+            driverDir = dir,
+        )
+    }
+
+    fun listInstalled(context: Context): List<InstalledDriver> {
+        val out = mutableListOf<InstalledDriver>()
+        val seen = HashSet<String>()
+        for (root in listOf(driversRoot(context), winlatorDriversRoot(context))) {
+            val dirs = root.listFiles { f -> f.isDirectory } ?: continue
+            for (dir in dirs) {
+                val driver = parseDriverDir(dir) ?: continue
+                if (seen.add(driver.id)) out += driver
+            }
+        }
+        return out.sortedBy { it.name.lowercase() }
+    }
+
+    fun delete(installed: InstalledDriver) {
+        installed.driverDir.deleteRecursively()
+    }
+
+    fun fetchRemote(): List<RemoteDriver> {
+        val userAgent = "ARMSX2/" + runCatching {
+            NativeApp.getBuildVersion()
+        }.getOrNull().orEmpty().ifEmpty { "dev" }
+        val out = mutableListOf<RemoteDriver>()
+        val seen = HashSet<String>()
+        for (src in DRIVER_SOURCES) {
+            for (rd in fetchSource(src, userAgent)) {
+                if (seen.add(rd.id)) out += rd
+            }
+        }
+        return out
+    }
+
+    private fun fetchSource(src: DriverSource, userAgent: String): List<RemoteDriver> {
+        val resp = runCatching {
+            HttpClient.doRequest(src.releasesUrl, "GET", null, userAgent, 15000)
+        }.getOrNull() ?: return emptyList()
+        if (resp.statusCode != 200 || resp.data.isEmpty()) {
+            Log.w(TAG, "fetchRemote(${src.label}): status=${resp.statusCode}, size=${resp.data.size}")
+            return emptyList()
+        }
+
+        val text = runCatching { String(resp.data, Charsets.UTF_8) }.getOrNull() ?: return emptyList()
+        val arr = runCatching { JSONArray(text) }.getOrNull() ?: return emptyList()
+
+        val out = mutableListOf<RemoteDriver>()
+        for (i in 0 until arr.length()) {
+            val release = arr.optJSONObject(i) ?: continue
+            val tag = release.optString("tag_name").ifEmpty { release.optString("name") }
+            val releaseName = release.optString("name").ifEmpty { tag }
+            val publishedAt = release.optString("published_at")
+            val assets = release.optJSONArray("assets") ?: continue
+            for (j in 0 until assets.length()) {
+                val asset = assets.optJSONObject(j) ?: continue
+                val assetName = asset.optString("name")
+                if (!assetName.endsWith(".zip", ignoreCase = true)) continue
+                val url = asset.optString("browser_download_url")
+                if (url.isEmpty()) continue
+                val size = asset.optLong("size", 0L)
+                val idTag = if (src.idPrefix.isEmpty()) tag else "${src.idPrefix}-$tag"
+                out += RemoteDriver(
+                    id = makeId(idTag, assetName),
+                    releaseName = releaseName,
+                    assetName = assetName,
+                    tagName = tag,
+                    publishedAt = publishedAt,
+                    assetUrl = url,
+                    sizeBytes = size,
+                    source = src.label,
+                )
+            }
+        }
+        return out
+    }
+
+    private fun makeId(tag: String, assetName: String): String {
+        val base = assetName.removeSuffix(".zip").removeSuffix(".ZIP")
+        val combined = if (tag.isNotEmpty()) "$tag-$base" else base
+        return combined.replace(Regex("[^A-Za-z0-9._-]"), "_").lowercase()
+    }
+
+    fun download(
+        context: Context,
+        remote: RemoteDriver,
+        onProgress: ((Long, Long) -> Unit)? = null,
+    ): InstalledDriver? {
+        val userAgent = "ARMSX2/" + runCatching {
+            NativeApp.getBuildVersion()
+        }.getOrNull().orEmpty().ifEmpty { "dev" }
+
+        val resp = runCatching {
+            HttpClient.doRequest(remote.assetUrl, "GET", null, userAgent, 60_000)
+        }.getOrNull() ?: return null
+        if (resp.statusCode != 200 || resp.data.isEmpty()) {
+            Log.w(TAG, "download: status=${resp.statusCode}, size=${resp.data.size}")
+            return null
+        }
+        onProgress?.invoke(resp.data.size.toLong(), remote.sizeBytes.coerceAtLeast(resp.data.size.toLong()))
+
+        return installFromStream(context, remote.id, resp.data.inputStream())
+    }
+
+    fun installFromUri(context: Context, uri: Uri): InstalledDriver? {
+        val filename = uri.lastPathSegment?.substringAfterLast('/')?.substringAfterLast(':')
+            ?: "imported_driver.zip"
+        val id = makeId("local", filename)
+        val stream = runCatching { context.contentResolver.openInputStream(uri) }.getOrNull()
+        if (stream == null) {
+            Log.w(TAG, "installFromUri: couldn't open $uri")
+            return null
+        }
+        return stream.use { installFromStream(context, id, it) }
+    }
+
+    private fun installFromStream(context: Context, id: String, stream: InputStream): InstalledDriver? {
+        val targetDir = File(driversRoot(context), id)
+        val tmpDir = File(driversRoot(context), "$id.tmp").also {
+            if (it.exists()) it.deleteRecursively()
+            it.mkdirs()
+        }
+
+        try {
+            ZipInputStream(stream).use { zin ->
+                while (true) {
+                    val entry = zin.nextEntry ?: break
+                    val name = entry.name
+                    if (name.contains("..") || name.startsWith("/")) {
+                        Log.w(TAG, "install: skipping suspicious entry $name")
+                        continue
+                    }
+                    val outName = name.substringAfterLast('/')
+                    if (outName.isEmpty() || entry.isDirectory) continue
+                    val outFile = File(tmpDir, outName)
+                    FileOutputStream(outFile).use { fos ->
+                        zin.copyTo(fos)
+                    }
+                    zin.closeEntry()
+                }
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "install: extract failed: ${e.message}")
+            tmpDir.deleteRecursively()
+            return null
+        }
+
+        val meta = File(tmpDir, "meta.json")
+        if (!meta.exists()) {
+            val soFile = tmpDir.listFiles { f -> f.isFile && f.name.endsWith(".so") }?.firstOrNull()
+            if (soFile != null) {
+                val synthLib = if (File(tmpDir, DEFAULT_LIBRARY_NAME).exists()) DEFAULT_LIBRARY_NAME else soFile.name
+                runCatching {
+                    meta.writeText(
+                        JSONObject().apply {
+                            put("schemaVersion", 1)
+                            put("name", id)
+                            put("description", "Turnip / freedreno (synthesized manifest)")
+                            put("author", "freedreno-builder")
+                            put("vendor", "Mesa")
+                            put("driverVersion", "")
+                            put("minApi", 24)
+                            put("libraryName", synthLib)
+                        }.toString()
+                    )
+                    Log.i(TAG, "install: synthesized meta.json ($synthLib)")
+                }
+            }
+        }
+        if (!meta.exists()) {
+            Log.w(TAG, "install: zip missing meta.json")
+            tmpDir.deleteRecursively()
+            return null
+        }
+        val libName = runCatching {
+            JSONObject(meta.readText()).optString("libraryName").ifEmpty { DEFAULT_LIBRARY_NAME }
+        }.getOrDefault(DEFAULT_LIBRARY_NAME)
+        if (!File(tmpDir, libName).exists()) {
+            Log.w(TAG, "install: zip missing $libName")
+            tmpDir.deleteRecursively()
+            return null
+        }
+
+        if (targetDir.exists()) targetDir.deleteRecursively()
+        if (!tmpDir.renameTo(targetDir)) {
+            Log.w(TAG, "install: rename $tmpDir -> $targetDir failed")
+            tmpDir.deleteRecursively()
+            return null
+        }
+        File(targetDir, "cache").mkdirs()
+
+        return listInstalled(context).firstOrNull { it.id == id }
+    }
+
+    fun applyToNative(context: Context, installed: InstalledDriver?) {
+        if (installed == null) {
+            NativeApp.setCustomVulkanDriver("", "", "", "")
+            return
+        }
+        val driverDirPath = installed.driverDir.absolutePath + "/"
+        val redirectDirPath = installed.redirectDir.apply { mkdirs() }.absolutePath + "/"
+        val hookLibDir = context.applicationInfo.nativeLibraryDir
+        NativeApp.setCustomVulkanDriver(
+            driverDirPath, installed.libraryName, redirectDirPath, hookLibDir)
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/EmuState.kt b/armsx2/src/main/java/com/armsx2/EmuState.kt
new file mode 100644
index 000000000..a33210cfb
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/EmuState.kt
@@ -0,0 +1,9 @@
+package com.armsx2
+
+enum class EmuState {
+    STOPPED,
+    RUNNING,
+    PAUSED,
+    EMULATOR_UNSUPPORTED,
+    RENDER_UNSUPPORTED
+}
\ No newline at end of file
diff --git a/armsx2/src/main/java/com/armsx2/GameInfo.kt b/armsx2/src/main/java/com/armsx2/GameInfo.kt
new file mode 100644
index 000000000..853b0d9a3
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/GameInfo.kt
@@ -0,0 +1,310 @@
+package com.armsx2
+
+import com.armsx2.runtime.MainActivityRuntime
+
+import android.content.Context
+import android.net.Uri
+import androidx.compose.runtime.mutableStateOf
+import java.io.File
+
+object CoverArtStyle {
+    private const val KEY = "library.coverArt3d"
+    val use3d = mutableStateOf(false)
+    fun load() { use3d.value = MainActivityRuntime.prefs.getBoolean(KEY, false) }
+    fun set(value: Boolean) {
+        use3d.value = value
+        MainActivityRuntime.prefs.edit().putBoolean(KEY, value).apply()
+    }
+}
+
+object GridLabels {
+    private const val KEY = "library.showGridNames"
+    val show = mutableStateOf(false)
+    fun load() { show.value = MainActivityRuntime.prefs.getBoolean(KEY, false) }
+    fun set(value: Boolean) {
+        show.value = value
+        MainActivityRuntime.prefs.edit().putBoolean(KEY, value).apply()
+    }
+}
+
+object HiddenGames {
+    private const val KEY = "library.hiddenGames"
+    private const val SHOW_KEY = "library.showHidden"
+    val hidden = mutableStateOf<Set<String>>(emptySet())
+    val showHidden = mutableStateOf(false)
+    private fun keyOf(game: GameInfo) = game.uri.toString()
+    fun load() {
+        hidden.value = MainActivityRuntime.prefs.getStringSet(KEY, emptySet())?.toSet() ?: emptySet()
+        showHidden.value = MainActivityRuntime.prefs.getBoolean(SHOW_KEY, false)
+    }
+    fun isHidden(game: GameInfo) = hidden.value.contains(keyOf(game))
+    fun setHidden(game: GameInfo, value: Boolean) {
+        val next = hidden.value.toMutableSet().apply { if (value) add(keyOf(game)) else remove(keyOf(game)) }
+        hidden.value = next
+        MainActivityRuntime.prefs.edit().putStringSet(KEY, next).apply()
+    }
+    fun setShowHidden(value: Boolean) {
+        showHidden.value = value
+        MainActivityRuntime.prefs.edit().putBoolean(SHOW_KEY, value).apply()
+    }
+}
+
+object LibraryTitles {
+    private const val KEY = "library.showTitles"
+    val show = mutableStateOf(false)
+    fun load() { show.value = MainActivityRuntime.prefs.getBoolean(KEY, false) }
+    fun set(value: Boolean) {
+        show.value = value
+        MainActivityRuntime.prefs.edit().putBoolean(KEY, value).apply()
+    }
+}
+
+object LibraryRecentShelf {
+    private const val KEY = "library.showRecentlyPlayed"
+    val show = mutableStateOf(true)
+    fun load() { show.value = MainActivityRuntime.prefs.getBoolean(KEY, true) }
+    fun set(value: Boolean) {
+        show.value = value
+        MainActivityRuntime.prefs.edit().putBoolean(KEY, value).apply()
+    }
+}
+
+object LibraryView {
+    private const val KEY_LIST = "library.listMode"
+    private const val KEY_COLS = "library.gridColumns"
+    private const val KEY_ROWS = "library.gridRows"
+    const val MAX_COLS = 6
+    const val MAX_ROWS = 5
+    val listMode = mutableStateOf(false)
+    val columns = mutableStateOf(0)
+    val rows = mutableStateOf(0)
+    fun load() {
+        listMode.value = MainActivityRuntime.prefs.getBoolean(KEY_LIST, false)
+        columns.value = MainActivityRuntime.prefs.getInt(KEY_COLS, 0).coerceIn(0, MAX_COLS)
+        rows.value = MainActivityRuntime.prefs.getInt(KEY_ROWS, 0).coerceIn(0, MAX_ROWS)
+    }
+    fun setListMode(v: Boolean) {
+        listMode.value = v
+        MainActivityRuntime.prefs.edit().putBoolean(KEY_LIST, v).apply()
+    }
+    fun toggleListMode() = setListMode(!listMode.value)
+    fun cycleColumns() {
+        val next = when {
+            columns.value <= 0 -> 2
+            columns.value >= MAX_COLS -> 0
+            else -> columns.value + 1
+        }
+        columns.value = next
+        MainActivityRuntime.prefs.edit().putInt(KEY_COLS, next).apply()
+    }
+    fun cycleRows() {
+        val next = when {
+            rows.value <= 0 -> 2
+            rows.value >= MAX_ROWS -> 0
+            else -> rows.value + 1
+        }
+        rows.value = next
+        MainActivityRuntime.prefs.edit().putInt(KEY_ROWS, next).apply()
+    }
+}
+
+enum class GamePlatform(val key: String) {
+    PS2("ps2"),
+    PS1("ps1");
+
+    companion object {
+        fun fromKey(s: String?): GamePlatform =
+            if (s == "ps1") PS1 else PS2
+    }
+}
+
+data class GameInfo(
+    val uri: Uri,
+    val title: String,
+    val serial: String?,
+    val compatibility: Int = 0,
+    val extension: String = "",
+    val platform: GamePlatform = GamePlatform.PS2,
+) {
+    val coverUrl: String? get() = serial?.let { s ->
+        val repo = when (platform) {
+            GamePlatform.PS2 -> "ps2-covers"
+            GamePlatform.PS1 -> "psx-covers"
+        }
+        if (CoverArtStyle.use3d.value)
+            "https://raw.githubusercontent.com/xlenore/$repo/main/covers/3d/$s.png"
+        else
+            "https://raw.githubusercontent.com/xlenore/$repo/main/covers/default/$s.jpg"
+    }
+
+    val region: String? get() = serial?.let { gameDbRegion(it) ?: regionForSerial(it) }
+
+    val regionFlag: String? get() = region?.let { regionFlagFor(it) }
+
+    val versionTag: String? get() {
+        val name = uri.lastPathSegment?.substringAfterLast('/')?.substringAfterLast(':')
+        return name?.let { FilenameParser.versionTokenOf(it) } ?: serial
+    }
+
+    val settingsKey: String? get() = serial?.takeIf { it.isNotBlank() }
+        ?: uri.lastPathSegment?.substringAfterLast('/')?.substringAfterLast(':')
+            ?.substringBeforeLast('.')?.trim()?.takeIf { it.isNotEmpty() }
+}
+
+object CustomCovers {
+    val version = mutableStateOf(0)
+
+    @Volatile
+    private var cachedCoversRoot: File? = null
+    fun coversRoot(context: Context): File =
+        cachedCoversRoot ?: File(MainActivityRuntime.assetCopyRoot(context), "covers").also { cachedCoversRoot = it }
+
+    private fun dir(context: Context): File = File(coversRoot(context), "custom")
+
+    private fun filenameStem(game: GameInfo): String? =
+        game.uri.lastPathSegment?.substringAfterLast('/')?.substringAfterLast(':')
+            ?.substringBeforeLast('.')?.trim()?.takeIf { it.isNotEmpty() }
+
+    private fun keys(game: GameInfo): List<String> = buildList {
+        game.serial?.takeIf { it.isNotBlank() }?.let { add(it) }
+        filenameStem(game)?.let { add(it) }
+        game.title.takeIf { it.isNotBlank() }?.let { add(it) }
+    }
+
+    fun loadAll(context: Context): Map<String, File> {
+        val files = dir(context).listFiles()?.filter { it.isFile && it.length() > 0L } ?: return emptyMap()
+        if (files.isEmpty()) return emptyMap()
+        val byStem = HashMap<String, File>(files.size)
+        for (f in files) byStem.putIfAbsent(f.nameWithoutExtension.lowercase(), f)
+        return byStem
+    }
+
+    fun matchIn(map: Map<String, File>, game: GameInfo): File? {
+        if (map.isEmpty()) return null
+        for (k in keys(game)) map[sanitize(k).lowercase()]?.let { return it }
+        return null
+    }
+
+    fun fileFor(context: Context, game: GameInfo): File? = matchIn(loadAll(context), game)
+
+    private fun targetFor(context: Context, game: GameInfo): File {
+        val key = game.serial?.takeIf { it.isNotBlank() }
+            ?: filenameStem(game) ?: game.title.ifBlank { "cover" }
+        return File(dir(context), sanitize(key) + ".png")
+    }
+
+    fun set(context: Context, game: GameInfo, source: Uri): Boolean = runCatching {
+        remove(context, game)
+        val target = targetFor(context, game)
+        target.parentFile?.mkdirs()
+        context.contentResolver.openInputStream(source)?.use { ins ->
+            target.outputStream().use { outs -> ins.copyTo(outs) }
+        }
+        (target.isFile && target.length() > 0L).also { if (it) version.value++ }
+    }.getOrDefault(false)
+
+    fun remove(context: Context, game: GameInfo): Boolean {
+        val f = fileFor(context, game) ?: return false
+        return f.delete().also { if (it) version.value++ }
+    }
+
+    private fun sanitize(s: String): String =
+        s.replace(Regex("""[/\\:*?"<>|\n\r\t]"""), "_").trim().ifEmpty { "cover" }
+}
+
+private val gameDbRegionCache = java.util.concurrent.ConcurrentHashMap<String, String>()
+
+fun gameDbRegion(serial: String): String? {
+    val cached = gameDbRegionCache.getOrPut(serial) {
+        val raw = runCatching { MainActivityRuntime.nativeGetRegionForSerial(serial) }
+            .getOrNull().orEmpty()
+        mapGameDbRegion(raw) ?: ""
+    }
+    return cached.takeIf { it.isNotEmpty() }
+}
+
+private fun mapGameDbRegion(raw: String): String? {
+    val u = raw.trim().uppercase()
+    if (u.isEmpty()) return null
+    return when {
+        u == "PAL-IN" || u.contains("INDIA") -> "India"
+        u.startsWith("NTSC-U") -> "USA"
+        u.startsWith("NTSC-J") -> "Japan"
+        u.startsWith("NTSC-K") -> "Korea"
+        u.startsWith("NTSC-HK") -> "Hong Kong"
+        u.startsWith("NTSC-C") -> "China"
+        u.startsWith("NTSC-A") || u == "NTSC" -> "Asia"
+        u.startsWith("PAL") -> "Europe"
+        else -> null
+    }
+}
+
+fun regionForSerial(serial: String): String? = when (serial.take(4).uppercase()) {
+    "SLUS", "SCUS", "PBPX", "LSP0" -> "USA"
+    "SLES", "SCES", "SLED", "SCED", "SLPN" -> "Europe"
+    "SLPS", "SLPM", "SCPS", "SCAJ", "ALCH", "PAPX", "ROSE", "TCPS", "KOEI", "PCPX", "CPCS" -> "Japan"
+    "SLKA", "SCKA" -> "Korea"
+    "SLAJ" -> "Asia"
+    else -> null
+}
+
+fun regionFlagFor(region: String): String? = when (region) {
+    "USA" -> "🇺🇸"
+    "Europe" -> "🇪🇺"
+    "Japan" -> "🇯🇵"
+    "Korea" -> "🇰🇷"
+    "India" -> "🇮🇳"
+    "China" -> "🇨🇳"
+    "Hong Kong" -> "🇭🇰"
+    "Asia" -> "🌏"
+    else -> null
+}
+
+object FilenameParser {
+    private val serialRegex = Regex("""([A-Za-z]{4})[\s_-]?(\d{3})\.?(\d{2})""")
+    private val tagsRegex = Regex("""[\[(].*?[\])]""")
+    private val versionRegex = Regex("""(?i)\bv\.?\s?(\d{1,2}(?:\.\d{1,2}){1,2})\b""")
+
+    fun versionTokenOf(filename: String): String? =
+        versionRegex.find(filename)?.let { "v" + it.groupValues[1] }
+    private val whitespaceRegex = Regex("""\s+""")
+    private val nonWordRegex = Regex("""[^a-z0-9]+""")
+
+    private data class FilenameAlias(val title: String, val serial: String)
+
+    private fun aliasFor(filenameWithoutExt: String): FilenameAlias? {
+        val normalized = filenameWithoutExt
+            .lowercase()
+            .replace(nonWordRegex, " ")
+            .trim()
+
+        if (!normalized.contains("devil may cry 2"))
+            return null
+
+        return when {
+            normalized.contains("dante") ->
+                FilenameAlias("Devil May Cry 2 [Dante Disc]", "SLES-82011")
+            normalized.contains("lucia") ->
+                FilenameAlias("Devil May Cry 2 [Lucia Disc]", "SLES-82012")
+            else -> null
+        }
+    }
+
+    fun parse(filename: String): Pair<String, String?> {
+        val withoutExt = filename.substringBeforeLast('.')
+        val match = serialRegex.find(withoutExt)
+        val serial = match?.let {
+            "${it.groupValues[1].uppercase()}-${it.groupValues[2]}${it.groupValues[3]}"
+        }
+        if (serial == null) {
+            aliasFor(withoutExt)?.let { return it.title to it.serial }
+        }
+        var title = withoutExt
+        if (match != null) title = title.replace(match.value, "")
+        title = title.replace(tagsRegex, "")
+            .replace(whitespaceRegex, " ")
+            .trim(' ', '-', '_', '.')
+        if (title.isEmpty()) title = withoutExt
+        return title to serial
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/Main.kt b/armsx2/src/main/java/com/armsx2/Main.kt
new file mode 100644
index 000000000..054962ed9
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/Main.kt
@@ -0,0 +1,5 @@
+package com.armsx2
+
+import com.armsx2.runtime.MainActivityRuntime
+
+class Main : MainActivityRuntime()
diff --git a/armsx2/src/main/java/com/armsx2/PatchRepo.kt b/armsx2/src/main/java/com/armsx2/PatchRepo.kt
new file mode 100644
index 000000000..42cf873f2
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/PatchRepo.kt
@@ -0,0 +1,295 @@
+// SPDX-License-Identifier: GPL-3.0+
+package com.armsx2
+
+import android.util.Log
+import kr.co.iefriends.pcsx2.HttpClient
+
+object PatchRepo {
+    private const val TAG = "PatchRepo"
+    private const val RAW_BASE = "https://raw.githubusercontent.com/PCSX2/pcsx2_patches/main"
+    private const val TREE_URL = "https://api.github.com/repos/PCSX2/pcsx2_patches/git/trees/main?recursive=1"
+    private const val USER_AGENT = "ARMSX2"
+
+    private const val GABO_BASE = "https://raw.githubusercontent.com/Gabominated/PCSX2/main"
+    private const val GABO_TREE = "https://api.github.com/repos/Gabominated/PCSX2/git/trees/main?recursive=1"
+    private const val GABO_DIR = "PCSX2%20Patches"
+    @Volatile private var gaboTreeCache: List<String>? = null
+
+    private data class CheatSource(val raw: String, val tree: String)
+    private val CHEAT_SOURCES = listOf(
+        CheatSource(
+            "https://raw.githubusercontent.com/shadowninja826/pcsx2_pnach_cheats/main",
+            "https://api.github.com/repos/shadowninja826/pcsx2_pnach_cheats/git/trees/main?recursive=1",
+        ),
+        CheatSource(
+            "https://raw.githubusercontent.com/xs1l3n7x/pcsx2_cheats_collection/main",
+            "https://api.github.com/repos/xs1l3n7x/pcsx2_cheats_collection/git/trees/main?recursive=1",
+        ),
+    )
+    private val cheatTreeCache = java.util.concurrent.ConcurrentHashMap<String, List<String>>()
+    private val CRC_RE = Regex("^[0-9A-Fa-f]{8}$")
+    private val SERIAL_RE = Regex("^[A-Z]{4}-\\d{5}$")
+    private val TREE_PATH_RE = Regex("\"path\"\\s*:\\s*\"([^\"]+\\.pnach)\"")
+    private val SECTION_RE = Regex("^\\s*\\[(.+?)]\\s*$")
+    private val COMMENT_RE = Regex("^\\s*comment\\s*=\\s*(.+)$", RegexOption.IGNORE_CASE)
+    private val GAMETITLE_RE = Regex("(?m)^\\s*gametitle\\s*=\\s*(.+)$")
+
+    @Volatile private var treeCache: List<String>? = null
+
+    data class Entry(
+        val name: String,
+        val description: String,
+        val body: String,
+        val source: String,
+    )
+
+    data class Result(
+        val gametitle: String,
+        val entries: List<Entry>,
+        val error: String?,
+        val serial: String = "",
+        val crc: String = "",
+    )
+
+    fun fetchForGame(serial: String?, crc: String): Result {
+        val c = crc.trim().uppercase()
+        if (!CRC_RE.matches(c))
+            return Result("", emptyList(), "No game CRC yet — boot the game first.")
+
+        var gametitle = ""
+        val entries = mutableListOf<Entry>()
+
+        val patchCandidates = buildList {
+            if (!serial.isNullOrBlank()) add("${serial}_$c")
+            add(c)
+        }
+        for (name in patchCandidates) {
+            val text = get("$RAW_BASE/patches/$name.pnach") ?: continue
+            val (gt, es) = parse(text, "patches")
+            if (gametitle.isEmpty()) gametitle = gt
+            entries += es
+            break
+        }
+
+        for (name in patchCandidates) {
+            val text = get("$GABO_BASE/$GABO_DIR/$name.pnach") ?: continue
+            val (gt, es) = parse(text, "patches")
+            if (gametitle.isEmpty()) gametitle = gt
+            val seen = entries.mapTo(HashSet()) { it.name }
+            for (e in es) if (seen.add(e.name)) entries += e
+            break
+        }
+
+        fetchCheats(serial, c)?.let { (gt, es) ->
+            if (gametitle.isEmpty()) gametitle = gt
+            entries += es
+        }
+
+        if (entries.isEmpty())
+            return Result("", emptyList(), "No patches or cheats in the database for ${serial ?: c}.")
+        return Result(gametitle, entries, null, serial?.uppercase().orEmpty(), c)
+    }
+
+    private fun fetchCheats(serial: String?, crc: String): Pair<String, List<Entry>>? {
+        val c = crc.uppercase()
+        val s = serial?.uppercase()
+        val haveCrc = CRC_RE.matches(c)
+        if (!haveCrc && s == null) return null
+
+        var gametitle = ""
+        val entries = mutableListOf<Entry>()
+        val seenNames = HashSet<String>()
+        for (src in CHEAT_SOURCES) {
+            val tree = cheatTree(src)
+            if (tree.isEmpty()) continue
+            var matches = if (haveCrc)
+                tree.filter { it.substringAfterLast('/').uppercase().contains(c) }
+            else emptyList()
+            if (matches.isEmpty() && s != null)
+                matches = tree.filter { it.substringAfterLast('/').uppercase().startsWith("${s}_") }
+            for (m in matches) {
+                val text = get("${src.raw}/${m.replace(" ", "%20")}") ?: continue
+                val (gt, es) = parse(text, "cheats")
+                if (gametitle.isEmpty()) gametitle = gt
+                for (e in es) if (seenNames.add(e.name)) entries += e
+            }
+        }
+        return if (entries.isEmpty()) null else gametitle to entries
+    }
+
+    private fun cheatTree(src: CheatSource): List<String> {
+        cheatTreeCache[src.raw]?.let { return it }
+        val json = get(src.tree) ?: return emptyList()
+        val paths = TREE_PATH_RE.findAll(json).map { it.groupValues[1] }.toList()
+        if (paths.isNotEmpty()) cheatTreeCache[src.raw] = paths
+        return paths
+    }
+
+    fun fetchForSerial(serial: String?): Result {
+        val s = serial?.trim()?.uppercase()
+        if (s.isNullOrBlank() || !SERIAL_RE.matches(s))
+            return Result("", emptyList(), "This game has no serial to search the patch database with.")
+
+        val tree = repoTree()
+        if (tree.isEmpty())
+            return Result("", emptyList(), "Couldn't reach the PCSX2 patch database. Check your connection.")
+
+        var gametitle = ""
+        var resolvedCrc = ""
+        val entries = mutableListOf<Entry>()
+
+        val match = tree.firstOrNull { it.startsWith("patches/${s}_", ignoreCase = true) }
+        if (match != null) {
+            get("$RAW_BASE/$match")?.let { text ->
+                val (gt, es) = parse(text, "patches")
+                if (gametitle.isEmpty()) gametitle = gt
+                entries += es
+            }
+            resolvedCrc = match.substringAfterLast('/')
+                .removeSuffix(".pnach")
+                .substringAfter("${s}_", "")
+                .substringBefore('_')
+                .uppercase()
+        }
+
+        gaboTree().firstOrNull { it.substringAfterLast('/').startsWith("${s}_", ignoreCase = true) }
+            ?.let { gm ->
+                get("$GABO_BASE/${gm.replace(" ", "%20")}")?.let { text ->
+                    val (gt, es) = parse(text, "patches")
+                    if (gametitle.isEmpty()) gametitle = gt
+                    val seen = entries.mapTo(HashSet()) { it.name }
+                    for (e in es) if (seen.add(e.name)) entries += e
+                }
+                if (resolvedCrc.isEmpty())
+                    resolvedCrc = gm.substringAfterLast('/').removeSuffix(".pnach")
+                        .substringAfter("${s}_", "").substringBefore('_').uppercase()
+            }
+
+        fetchCheats(s, resolvedCrc)?.let { (gt, es) ->
+            if (gametitle.isEmpty()) gametitle = gt
+            entries += es
+        }
+
+        if (entries.isEmpty())
+            return Result("", emptyList(), "No patches or cheats in the database for $s.")
+        return Result(gametitle, entries, null, s, resolvedCrc)
+    }
+
+    private fun gaboTree(): List<String> {
+        gaboTreeCache?.let { return it }
+        val json = get(GABO_TREE) ?: return emptyList()
+        val paths = TREE_PATH_RE.findAll(json).map { it.groupValues[1] }.toList()
+        if (paths.isNotEmpty()) gaboTreeCache = paths
+        return paths
+    }
+
+    private fun repoTree(): List<String> {
+        treeCache?.let { return it }
+        val json = get(TREE_URL) ?: return emptyList()
+        val paths = TREE_PATH_RE.findAll(json).map { it.groupValues[1] }.toList()
+        if (paths.isNotEmpty()) treeCache = paths
+        return paths
+    }
+
+    fun buildPnach(gametitle: String, entries: List<Entry>): String = buildString {
+        if (gametitle.isNotEmpty()) append("gametitle=").append(gametitle).append("\n\n")
+        entries.forEach { append(it.body.trimEnd()).append("\n\n") }
+    }
+
+    private fun get(url: String): String? {
+        val resp = runCatching { HttpClient.doRequest(url, "GET", null, USER_AGENT, 15000) }
+            .getOrElse { Log.w(TAG, "get $url failed: ${it.message}"); return null }
+        if (resp.statusCode != 200 || resp.data.isEmpty()) {
+            if (resp.statusCode != 404)
+                Log.w(TAG, "get $url: status=${resp.statusCode} size=${resp.data.size}")
+            return null
+        }
+        return String(resp.data, Charsets.UTF_8)
+    }
+
+    private fun parse(pnach: String, source: String): Pair<String, List<Entry>> {
+        val gametitle = GAMETITLE_RE.find(pnach)?.groupValues?.get(1)?.trim().orEmpty()
+        val entries = mutableListOf<Entry>()
+        var name: String? = null
+        var desc = ""
+        val body = StringBuilder()
+        fun flush() {
+            val n = name
+            if (n != null) entries.add(Entry(n, desc, body.toString().trimEnd(), source))
+            name = null; desc = ""; body.setLength(0)
+        }
+        for (line in pnach.lines()) {
+            val h = SECTION_RE.find(line)
+            if (h != null) {
+                flush()
+                name = h.groupValues[1].trim()
+                body.append(line).append('\n')
+            } else if (name != null) {
+                body.append(line).append('\n')
+                if (desc.isEmpty()) COMMENT_RE.find(line)?.let { desc = it.groupValues[1].trim() }
+            }
+        }
+        flush()
+        return gametitle to entries
+    }
+
+    data class LocalCheat(
+        val name: String,
+        val description: String,
+        val enabled: Boolean,
+        val body: String,
+    )
+
+    private val PATCH_LINE_RE = Regex("^\\s*/{0,2}\\s*patch\\s*=", RegexOption.IGNORE_CASE)
+    private val META_COMMENT_RE = Regex("^[A-Z]{4}-\\d{5}\\s+[0-9A-Fa-f]{8}$")
+
+    fun isPatchCommand(line: String): Boolean = PATCH_LINE_RE.containsMatchIn(line)
+
+    fun parseInstalled(pnach: String, source: String): Pair<String, List<LocalCheat>> {
+        val gametitle = GAMETITLE_RE.find(pnach)?.groupValues?.get(1)?.trim().orEmpty()
+        val cheats = mutableListOf<LocalCheat>()
+        var name: String? = null
+        var desc = ""
+        val body = StringBuilder()
+        var hasPatch = false
+        var hasActive = false
+        fun flush() {
+            val n = name
+            if (n != null && hasPatch) cheats.add(LocalCheat(n, desc, hasActive, body.toString().trimEnd()))
+            name = null; desc = ""; body.setLength(0); hasPatch = false; hasActive = false
+        }
+        for (raw in pnach.lines()) {
+            val line = raw.trimEnd()
+            val trimmed = line.trim()
+            if (trimmed.isEmpty()) { if (name != null) body.append('\n'); continue }
+            if (trimmed.startsWith("gametitle", ignoreCase = true)) continue
+            val label = SECTION_RE.find(line)?.groupValues?.get(1)?.trim()
+            val isPatch = isPatchCommand(trimmed)
+            val commented = trimmed.startsWith("//")
+            when {
+                label != null -> { flush(); name = label; body.append(line).append('\n') }
+                isPatch -> {
+                    if (name == null) name = "Unlabelled"
+                    hasPatch = true
+                    if (!commented) hasActive = true
+                    body.append(line).append('\n')
+                }
+                commented -> {
+                    val text = trimmed.trimStart('/').trim()
+                    if (text.equals("ARMSX2 manual PNACH", ignoreCase = true) || META_COMMENT_RE.matches(text))
+                        continue
+                    if (hasPatch) flush()
+                    if (name == null) {
+                        if (text.isNotEmpty()) { name = text; body.append(line).append('\n') }
+                    } else {
+                        if (desc.isEmpty()) desc = text
+                        body.append(line).append('\n')
+                    }
+                }
+                else -> { if (name != null) body.append(line).append('\n') }
+            }
+        }
+        flush()
+        return gametitle to cheats
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/RetroAchievementsHostOverrideReceiver.java b/armsx2/src/main/java/com/armsx2/RetroAchievementsHostOverrideReceiver.java
new file mode 100644
index 000000000..836f4116f
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/RetroAchievementsHostOverrideReceiver.java
@@ -0,0 +1,151 @@
+package com.armsx2;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import java.util.Locale;
+
+import kr.co.iefriends.pcsx2.NativeApp;
+
+public class RetroAchievementsHostOverrideReceiver extends BroadcastReceiver {
+    private static final String ACTION_SET_SUFFIX = ".action.SET_RETROACHIEVEMENTS_HOST_OVERRIDE";
+    private static final String ACTION_CLEAR_SUFFIX = ".action.CLEAR_RETROACHIEVEMENTS_HOST_OVERRIDE";
+
+    private static final String PREFS_NAME = "retroachievements_host_override";
+    private static final String KEY_PENDING_HOST = "pending_host";
+    private static final String KEY_PENDING_CLEAR = "pending_clear";
+
+    public static final String EXTRA_HOST = "host";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent == null || intent.getAction() == null) {
+            return;
+        }
+
+        final String packageName = context.getPackageName();
+        final String action = intent.getAction();
+
+        if ((packageName + ACTION_CLEAR_SUFFIX).equals(action)) {
+            applyClear(context);
+            setResultCode(Activity.RESULT_OK);
+            return;
+        }
+
+        if (!(packageName + ACTION_SET_SUFFIX).equals(action)) {
+            return;
+        }
+
+        final String host = normalizeHost(intent.getStringExtra(EXTRA_HOST));
+        if (host == null) {
+            applyClear(context);
+            setResultCode(Activity.RESULT_OK);
+            return;
+        }
+
+        applySet(context, host);
+        setResultCode(Activity.RESULT_OK);
+    }
+
+    public static void applyPending(Context context) {
+        SharedPreferences prefs = sharedPreferences(context);
+        String host = prefs.getString(KEY_PENDING_HOST, null);
+        boolean pendingClear = prefs.getBoolean(KEY_PENDING_CLEAR, false);
+
+        if (!TextUtils.isEmpty(host)) {
+            NativeApp.setAchievementsHostOverride(host);
+        } else if (pendingClear) {
+            NativeApp.clearAchievementsHostOverride();
+        } else {
+            return;
+        }
+
+        clearPending(context);
+    }
+
+    private static void applySet(Context context, String host) {
+        sharedPreferences(context).edit()
+                .putString(KEY_PENDING_HOST, host)
+                .remove(KEY_PENDING_CLEAR)
+                .apply();
+        flushIfNativeReady(context);
+    }
+
+    private static void applyClear(Context context) {
+        sharedPreferences(context).edit()
+                .remove(KEY_PENDING_HOST)
+                .putBoolean(KEY_PENDING_CLEAR, true)
+                .apply();
+        flushIfNativeReady(context);
+    }
+
+    private static void flushIfNativeReady(Context context) {
+        if (NativeApp.getContext() != null) {
+            applyPending(context);
+        }
+    }
+
+    private static void clearPending(Context context) {
+        sharedPreferences(context).edit()
+                .remove(KEY_PENDING_HOST)
+                .remove(KEY_PENDING_CLEAR)
+                .apply();
+    }
+
+    private static SharedPreferences sharedPreferences(Context context) {
+        return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+    }
+
+    private static String normalizeHost(String value) {
+        String trimmed = value == null ? "" : value.trim();
+        if (trimmed.isEmpty()) {
+            return null;
+        }
+
+        String candidate = trimmed.contains("://") ? trimmed : "http://" + trimmed;
+        Uri uri = Uri.parse(candidate);
+        if (uri == null) {
+            return null;
+        }
+
+        String scheme = uri.getScheme();
+        String host = uri.getHost();
+        if (scheme == null || host == null) {
+            return null;
+        }
+
+        String normalizedScheme = scheme.toLowerCase(Locale.US);
+        String normalizedHost = host.toLowerCase(Locale.US);
+        if (!"http".equals(normalizedScheme)) {
+            return null;
+        }
+
+        if (!"127.0.0.1".equals(normalizedHost) && !"localhost".equals(normalizedHost)) {
+            return null;
+        }
+
+        int port = uri.getPort();
+        if (port < 1 || port > 65535) {
+            return null;
+        }
+
+        String authority = uri.getEncodedAuthority();
+        if ((authority != null && authority.contains("@"))
+                || !TextUtils.isEmpty(uri.getEncodedQuery())
+                || !TextUtils.isEmpty(uri.getEncodedFragment())) {
+            return null;
+        }
+
+        String path = uri.getEncodedPath();
+        if (!TextUtils.isEmpty(path) && !"/".equals(path)) {
+            return null;
+        }
+
+        return normalizedScheme + "://" + normalizedHost + ":" + port;
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/ShaderParams.kt b/armsx2/src/main/java/com/armsx2/ShaderParams.kt
new file mode 100644
index 000000000..3b7f06e23
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/ShaderParams.kt
@@ -0,0 +1,166 @@
+package com.armsx2
+
+import android.content.Context
+import android.util.Log
+import kr.co.iefriends.pcsx2.NativeApp
+import org.json.JSONArray
+import java.io.File
+import java.util.Locale
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+data class ShaderParam(
+    val name: String,
+    val description: String,
+    val initial: Float,
+    val minimum: Float,
+    val maximum: Float,
+    val step: Float,
+) {
+    val isAdjustable: Boolean get() = maximum > minimum
+
+    val stepCount: Int
+        get() {
+            if (!isAdjustable) return 0
+            val span = maximum - minimum
+            val increment = if (step > 0f && step <= span) step else span / 100f
+            return (span / increment).roundToInt().coerceIn(1, 10_000)
+        }
+
+    fun indexOf(value: Float): Int {
+        if (!isAdjustable) return 0
+        val frac = (value - minimum) / (maximum - minimum)
+        return (frac * stepCount).roundToInt().coerceIn(0, stepCount)
+    }
+
+    fun valueAt(index: Int): Float {
+        if (!isAdjustable) return minimum
+        if (index >= stepCount) return maximum
+        return minimum + (maximum - minimum) * (index.toFloat() / stepCount.toFloat())
+    }
+
+    fun format(value: Float): String {
+        val span = maximum - minimum
+        val increment = if (step > 0f && step <= span) step else span / 100f
+        val decimals = when {
+            increment >= 1f -> 0
+            increment >= 0.1f -> 1
+            increment >= 0.01f -> 2
+            else -> 3
+        }
+        return String.format("%.${decimals}f", value)
+    }
+
+    fun isInitial(value: Float): Boolean {
+        val span = maximum - minimum
+        val increment = if (step > 0f && step <= span) step else span / 100f
+        return abs(value - initial) < (increment / 2f).coerceAtLeast(1e-6f)
+    }
+}
+
+object ShaderParams {
+
+    private const val TAG = "ShaderParams"
+
+    fun read(presetPath: String): List<ShaderParam> {
+        if (presetPath.isBlank()) return emptyList()
+
+        val json = try {
+            NativeApp.shaderPresetParams(presetPath)
+        } catch (t: Throwable) {
+            Log.w(TAG, "shaderPresetParams threw for $presetPath", t)
+            null
+        } ?: return emptyList()
+
+        return try {
+            val array = JSONArray(json)
+            buildList(array.length()) {
+                for (i in 0 until array.length()) {
+                    val o = array.optJSONObject(i) ?: continue
+                    val name = o.optString("name")
+                    if (name.isEmpty()) continue
+                    add(
+                        ShaderParam(
+                            name = name,
+                            description = o.optString("description").ifBlank { name },
+                            initial = o.optDouble("initial", 0.0).toFloat(),
+                            minimum = o.optDouble("minimum", 0.0).toFloat(),
+                            maximum = o.optDouble("maximum", 0.0).toFloat(),
+                            step = o.optDouble("step", 0.0).toFloat(),
+                        )
+                    )
+                }
+            }
+        } catch (t: Throwable) {
+            Log.w(TAG, "malformed parameter JSON for $presetPath", t)
+            emptyList()
+        }
+    }
+
+    fun push(presetPath: String, values: Map<String, Float>) {
+        if (presetPath.isBlank()) return
+        val names = values.keys.toTypedArray()
+        val floats = FloatArray(names.size) { values.getValue(names[it]) }
+        try {
+            NativeApp.setShaderChainParams(presetPath, names, floats)
+        } catch (t: Throwable) {
+            Log.w(TAG, "setShaderChainParams failed for $presetPath", t)
+        }
+    }
+
+    fun pushEffective(presetPath: String, params: List<ShaderParam>, overrides: Map<String, Float>) {
+        if (presetPath.isBlank()) return
+        push(presetPath, params.associate { it.name to (overrides[it.name] ?: it.initial) })
+    }
+
+    private val UNSAFE_NAME = Regex("[^A-Za-z0-9 _.-]")
+
+    fun savePreset(
+        context: Context,
+        name: String,
+        basePreset: String,
+        overrides: Map<String, Float>,
+    ): String? {
+        val safe = name.trim().replace(UNSAFE_NAME, "_")
+        if (safe.isEmpty() || basePreset.isBlank()) return null
+
+        return try {
+            val dir = ShaderRepo.userPresetDir(context)
+            val out = File(dir, "$safe.slangp")
+            val base = File(basePreset)
+
+            val reference = runCatching { base.relativeTo(dir).invariantSeparatorsPath }
+                .getOrDefault(base.absolutePath)
+
+            val text = buildString {
+                append("#reference \"").append(reference).append("\"\n\n")
+                overrides.forEach { (param, value) ->
+                    append(param).append(" = \"")
+                        .append(String.format(Locale.US, "%.6f", value)).append("\"\n")
+                }
+            }
+            out.writeText(text)
+            out.absolutePath
+        } catch (t: Throwable) {
+            Log.w(TAG, "could not save preset '$name'", t)
+            null
+        }
+    }
+
+    fun listSavedPresets(context: Context): List<File> =
+        runCatching {
+            ShaderRepo.userPresetDir(context)
+                .listFiles { f -> f.isFile && f.extension.equals("slangp", ignoreCase = true) }
+                ?.sortedBy { it.name.lowercase() }
+                .orEmpty()
+        }.getOrDefault(emptyList())
+
+    fun isSavedPreset(context: Context, presetPath: String): Boolean =
+        presetPath.isNotBlank() &&
+            runCatching {
+                File(presetPath).parentFile?.canonicalFile == ShaderRepo.userPresetDir(context).canonicalFile
+            }.getOrDefault(false)
+
+    fun deleteSavedPreset(context: Context, presetPath: String): Boolean =
+        isSavedPreset(context, presetPath) && runCatching { File(presetPath).delete() }.getOrDefault(false)
+}
diff --git a/armsx2/src/main/java/com/armsx2/ShaderRepo.kt b/armsx2/src/main/java/com/armsx2/ShaderRepo.kt
new file mode 100644
index 000000000..540598323
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/ShaderRepo.kt
@@ -0,0 +1,361 @@
+package com.armsx2
+
+import com.armsx2.runtime.MainActivityRuntime
+
+import android.content.Context
+import android.net.Uri
+import android.util.Log
+import androidx.documentfile.provider.DocumentFile
+import kr.co.iefriends.pcsx2.NativeApp
+import java.io.File
+import java.io.FileOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+
+object ShaderRepo {
+
+    private const val TAG = "ShaderRepo"
+
+    const val SHADER_DIR = "shaders"
+
+    data class ShaderSource(
+        val name: String,
+        val url: String,
+        val id: String,
+        val description: String,
+        val requiresPack: String? = null,
+    )
+
+    private val SHADER_SOURCES = listOf(
+        ShaderSource(
+            name = "RetroArch · Slang Shaders",
+            url = "https://buildbot.libretro.com/assets/frontend/shaders_slang.zip",
+            id = "shaders_slang",
+            description = "libretro buildbot · ~51 MB",
+        ),
+        ShaderSource(
+            name = "Retro Crisis · GDV-NTSC",
+            url = "https://github.com/RetroCrisis/Retro-Crisis-GDV-NTSC/releases/download/20260321/Retro.Crisis.GDV-NTSC.2026.03.21.zip",
+            id = "retro_crisis_gdv_ntsc",
+            description = "666 presets · ~0.4 MB",
+            requiresPack = "shaders_slang",
+        ),
+    )
+
+    fun sources(): List<ShaderSource> = SHADER_SOURCES
+
+    fun baseSources(): List<ShaderSource> = SHADER_SOURCES.filter { it.requiresPack == null }
+
+    fun companionSources(): List<ShaderSource> = SHADER_SOURCES.filter { it.requiresPack != null }
+
+    fun requirementMet(context: Context, source: ShaderSource): Boolean {
+        val needs = source.requiresPack ?: return true
+        return File(shadersRoot(context), needs).isDirectory
+    }
+
+    data class InstalledPack(
+        val id: String,
+        val name: String,
+        val presetCount: Int,
+        val dir: File,
+    )
+
+    fun shadersRoot(context: Context): File =
+        File(MainActivityRuntime.assetCopyRoot(context), SHADER_DIR).apply { mkdirs() }
+
+    const val USER_PRESET_DIR = "My Presets"
+
+    fun userPresetDir(context: Context): File =
+        File(shadersRoot(context), USER_PRESET_DIR).apply { mkdirs() }
+
+    fun listInstalled(context: Context): List<InstalledPack> {
+        val root = shadersRoot(context)
+        val dirs = root.listFiles { f ->
+            f.isDirectory && !f.name.startsWith(".") && f.name != USER_PRESET_DIR
+        } ?: return emptyList()
+        return dirs.map { dir ->
+            InstalledPack(
+                id = dir.name,
+                name = SHADER_SOURCES.firstOrNull { it.id == dir.name }?.name ?: dir.name,
+                presetCount = countPresets(dir),
+                dir = dir,
+            )
+        }.sortedBy { it.name.lowercase() }
+    }
+
+    fun delete(pack: InstalledPack) {
+        pack.dir.deleteRecursively()
+    }
+
+    private const val MAX_IMPORT_DEPTH = 12
+
+    private fun importId(ctx: Context, raw: String): String {
+        val base = raw.substringAfterLast('/')
+            .removeSuffix(".zip").removeSuffix(".ZIP")
+            .replace(Regex("[^A-Za-z0-9 _.-]"), "_")
+            .trim()
+            .ifEmpty { "shader pack" }
+        val root = shadersRoot(ctx)
+        if (!File(root, base).exists()) return base
+        var i = 2
+        while (File(root, "$base ($i)").exists()) i++
+        return "$base ($i)"
+    }
+
+    private fun keepIfPresets(target: File, id: String): String? {
+        if (countPresets(target) > 0) return id
+        target.deleteRecursively()
+        return null
+    }
+
+    fun importFromZip(ctx: Context, zipUri: Uri): String? {
+        val id = importId(ctx, DocumentFile.fromSingleUri(ctx, zipUri)?.name ?: "shader pack")
+        val target = File(shadersRoot(ctx), id)
+        val staged = File(ctx.cacheDir, "shaderpack-import-$id.zip")
+        return try {
+            ctx.contentResolver.openInputStream(zipUri)?.use { ins ->
+                staged.outputStream().use { ins.copyTo(it) }
+            } ?: return null
+            target.mkdirs()
+            if (extract(staged, target, null) { false }) keepIfPresets(target, id)
+            else { target.deleteRecursively(); null }
+        } catch (t: Throwable) {
+            Log.w(TAG, "zip import failed", t)
+            target.deleteRecursively()
+            null
+        } finally {
+            staged.delete()
+        }
+    }
+
+    fun importFromTree(ctx: Context, treeUri: Uri): String? {
+        val tree = DocumentFile.fromTreeUri(ctx, treeUri) ?: return null
+        val id = importId(ctx, tree.name ?: "shader pack")
+        val target = File(shadersRoot(ctx), id)
+        return try {
+            copyTree(ctx, tree, target, 0)
+            keepIfPresets(target, id)
+        } catch (t: Throwable) {
+            Log.w(TAG, "folder import failed", t)
+            target.deleteRecursively()
+            null
+        }
+    }
+
+    private fun copyTree(ctx: Context, dir: DocumentFile, dest: File, depth: Int) {
+        if (depth > MAX_IMPORT_DEPTH) return
+        dest.mkdirs()
+        val destGuard = dest.canonicalPath + File.separator
+        for (df in dir.listFiles()) {
+            val name = df.name?.takeIf { it.isNotEmpty() && !it.startsWith(".") } ?: continue
+            val out = File(dest, name)
+            if (!out.canonicalPath.startsWith(destGuard)) {
+                Log.w(TAG, "import: rejecting entry '$name'")
+                continue
+            }
+            if (df.isDirectory) {
+                copyTree(ctx, df, out, depth + 1)
+            } else {
+                runCatching {
+                    ctx.contentResolver.openInputStream(df.uri)?.use { ins ->
+                        out.outputStream().use { ins.copyTo(it) }
+                    }
+                }.onFailure { out.delete() }
+            }
+        }
+    }
+
+    private fun countPresets(dir: File): Int =
+        runCatching {
+            dir.walkTopDown().count { it.isFile && it.extension.equals("slangp", ignoreCase = true) }
+        }.getOrDefault(0)
+
+    fun download(
+        context: Context,
+        source: ShaderSource,
+        onDownload: ((Long, Long) -> Unit)? = null,
+        onExtract: ((Int, Int) -> Unit)? = null,
+        isCancelled: () -> Boolean = { false },
+    ): InstalledPack? {
+        val staging = File(MainActivityRuntime.assetCopyRoot(context), ".shaderpacks-tmp").apply {
+            if (exists()) deleteRecursively()
+            mkdirs()
+        }
+        val tmpZip = File(staging, "${source.id}.zip")
+        val tmpDir = File(staging, source.id).apply { mkdirs() }
+
+        try {
+            if (!requirementMet(context, source)) {
+                Log.w(TAG, "install: ${source.id} needs '${source.requiresPack}' installed first")
+                return null
+            }
+            if (!fetchToFile(source.url, tmpZip, onDownload, isCancelled)) return null
+            if (isCancelled()) return null
+            if (!extract(tmpZip, tmpDir, onExtract, isCancelled)) return null
+            if (isCancelled()) return null
+
+            val presets = countPresets(tmpDir)
+            if (presets == 0) {
+                Log.w(TAG, "install: ${source.id} extracted 0 .slangp presets")
+                return null
+            }
+
+            val targetDir: File
+            if (source.requiresPack != null) {
+                targetDir = shadersRoot(context)
+                mergeInto(tmpDir, targetDir)
+            } else {
+                targetDir = File(shadersRoot(context), source.id)
+                if (targetDir.exists()) targetDir.deleteRecursively()
+                if (!tmpDir.renameTo(targetDir)) {
+                    Log.w(TAG, "install: rename $tmpDir -> $targetDir failed")
+                    return null
+                }
+            }
+            Log.i(TAG, "install: ${source.id} -> $targetDir ($presets presets)")
+            return InstalledPack(source.id, source.name, presets, targetDir)
+        } finally {
+            staging.deleteRecursively()
+        }
+    }
+
+    private fun fetchToFile(
+        url: String,
+        dest: File,
+        onProgress: ((Long, Long) -> Unit)?,
+        isCancelled: () -> Boolean,
+    ): Boolean {
+        val userAgent = "ARMSX2/" + runCatching {
+            NativeApp.getBuildVersion()
+        }.getOrNull().orEmpty().ifEmpty { "dev" }
+
+        var conn: HttpURLConnection? = null
+        try {
+            conn = (URL(url).openConnection() as HttpURLConnection).apply {
+                requestMethod = "GET"
+                connectTimeout = 20_000
+                readTimeout = 30_000
+                instanceFollowRedirects = true
+                setRequestProperty("User-Agent", userAgent)
+            }
+            val code = conn.responseCode
+            if (code != HttpURLConnection.HTTP_OK) {
+                Log.w(TAG, "fetch: $url -> status=$code")
+                return false
+            }
+            val total = conn.contentLengthLong
+
+            var read = 0L
+            var reported = 0L
+            conn.inputStream.use { input ->
+                FileOutputStream(dest).use { out ->
+                    val buf = ByteArray(64 * 1024)
+                    while (true) {
+                        if (isCancelled()) return false
+                        val n = input.read(buf)
+                        if (n < 0) break
+                        out.write(buf, 0, n)
+                        read += n
+                        if (read - reported >= PROGRESS_BYTES_STEP) {
+                            reported = read
+                            onProgress?.invoke(read, total)
+                        }
+                    }
+                }
+            }
+            onProgress?.invoke(read, total)
+            return read > 0
+        } catch (e: Exception) {
+            Log.w(TAG, "fetch: $url failed: ${e.message}")
+            return false
+        } finally {
+            conn?.disconnect()
+        }
+    }
+
+    private fun extract(
+        zip: File,
+        targetDir: File,
+        onProgress: ((Int, Int) -> Unit)?,
+        isCancelled: () -> Boolean,
+    ): Boolean {
+        val targetCanonical = targetDir.canonicalPath
+        val guardPrefix = targetCanonical + File.separator
+
+        try {
+            ZipFile(zip).use { zf ->
+                val entries = zf.entries().toList().filterNot { isJunkEntry(it.name) }
+                val total = entries.size
+                val strip = commonRootPrefix(entries)
+                var done = 0
+                var reported = 0
+
+                for (entry in entries) {
+                    if (isCancelled()) return false
+                    done++
+                    val name = entry.name.removePrefix(strip)
+                    if (name.isEmpty()) continue
+
+                    val outFile = File(targetDir, name)
+                    val canonical = outFile.canonicalPath
+                    if (canonical != targetCanonical && !canonical.startsWith(guardPrefix)) {
+                        Log.w(TAG, "extract: rejecting zip-slip entry '${entry.name}' -> $canonical")
+                        return false
+                    }
+
+                    if (entry.isDirectory) {
+                        outFile.mkdirs()
+                    } else {
+                        outFile.parentFile?.mkdirs()
+                        zf.getInputStream(entry).use { input ->
+                            FileOutputStream(outFile).use { out -> input.copyTo(out) }
+                        }
+                    }
+
+                    if (done - reported >= PROGRESS_ENTRY_STEP || done == total) {
+                        reported = done
+                        onProgress?.invoke(done, total)
+                    }
+                }
+            }
+            return true
+        } catch (e: Exception) {
+            Log.w(TAG, "extract: failed: ${e.message}")
+            return false
+        }
+    }
+
+    private fun commonRootPrefix(entries: List<ZipEntry>): String {
+        val first = entries.firstOrNull()?.name ?: return ""
+        val slash = first.indexOf('/')
+        if (slash <= 0) return ""
+        val prefix = first.substring(0, slash + 1)
+        return if (entries.all { it.name.startsWith(prefix) }) prefix else ""
+    }
+
+    private fun isJunkEntry(name: String): Boolean =
+        name.startsWith("__MACOSX/") ||
+            name.substringAfterLast('/') == ".DS_Store" ||
+            name.substringAfterLast('/').startsWith("._")
+
+    private fun mergeInto(src: File, dst: File) {
+        dst.mkdirs()
+        src.listFiles()?.forEach { child ->
+            val target = File(dst, child.name)
+            if (child.isDirectory) {
+                mergeInto(child, target)
+            } else {
+                if (target.exists()) target.delete()
+                if (!child.renameTo(target)) {
+                    child.copyTo(target, overwrite = true)
+                    child.delete()
+                }
+            }
+        }
+    }
+
+    private const val PROGRESS_BYTES_STEP = 256L * 1024L
+    private const val PROGRESS_ENTRY_STEP = 64
+}
diff --git a/armsx2/src/main/java/com/armsx2/WinNativeHost.kt b/armsx2/src/main/java/com/armsx2/WinNativeHost.kt
new file mode 100644
index 000000000..a83ab1a5f
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/WinNativeHost.kt
@@ -0,0 +1,29 @@
+package com.armsx2
+
+import androidx.activity.ComponentActivity
+
+object WinNativeHost {
+    @Volatile
+    var attachOverlay: ((ComponentActivity) -> Unit)? = null
+
+    @Volatile
+    var applyBootSettings: ((android.content.Context) -> Unit)? = null
+
+    @Volatile
+    var openMenu: (() -> Unit)? = null
+
+    @Volatile
+    var isMenuOpen: (() -> Boolean)? = null
+
+    @Volatile
+    var menuKeyHandler: ((android.view.KeyEvent) -> Boolean)? = null
+
+    @Volatile
+    var menuAxisHandler: ((Float, Float) -> Boolean)? = null
+
+    fun enabled(): Boolean =
+        attachOverlay != null &&
+            runCatching {
+                com.armsx2.runtime.MainActivityRuntime.prefs.getBoolean("wn.controls", false)
+            }.getOrDefault(false)
+}
diff --git a/armsx2/src/main/java/com/armsx2/config/ConfigStore.kt b/armsx2/src/main/java/com/armsx2/config/ConfigStore.kt
new file mode 100644
index 000000000..13dc591f5
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/config/ConfigStore.kt
@@ -0,0 +1,216 @@
+package com.armsx2.config
+
+import com.armsx2.runtime.MainActivityRuntime
+import org.json.JSONObject
+import androidx.core.content.edit
+import java.io.File
+
+enum class SettingsScope { Global, Game }
+
+object ConfigStore {
+    private const val KEY_GLOBAL = "config.global"
+    private const val KEY_BLEND_BASIC_MIGRATED = "config.migrated.blendBasic"
+    private const val KEY_RENDERER_MIGRATED = "config.migrated.rendererUpscale"
+    private const val KEY_ADRENO_FBFETCH_MIGRATED = "config.migrated.adrenoFbFetchOn"
+    private const val KEY_OSD_OFF_MIGRATED = "config.migrated.osdDefaultOff"
+    private const val KEY_FOLDER_RECONCILE = "config.migrated.folderReconcile"
+    private const val BACKUP_FILENAME = "armsx2-settings.json"
+    private fun keyForGame(serial: String) = "config.game.$serial"
+
+    fun loadGlobal(): Settings {
+        val raw = MainActivityRuntime.prefs.getString(KEY_GLOBAL, null)
+        var parsed = if (raw != null) {
+            try { Settings.fromJson(JSONObject(raw)) } catch (_: Exception) { Settings() }
+        } else {
+            Settings()
+        }
+        var dirty = false
+
+        if (raw != null && !MainActivityRuntime.prefs.getBoolean(KEY_BLEND_BASIC_MIGRATED, false) &&
+            parsed.accurateBlendingUnit == 4) {
+            parsed = parsed.copy(accurateBlendingUnit = 1)
+            dirty = true
+        }
+        if (!MainActivityRuntime.prefs.getBoolean(KEY_BLEND_BASIC_MIGRATED, false)) {
+            MainActivityRuntime.prefs.edit { putBoolean(KEY_BLEND_BASIC_MIGRATED, true) }
+        }
+
+        if (!MainActivityRuntime.prefs.getBoolean(KEY_RENDERER_MIGRATED, false)) {
+            MainActivityRuntime.prefs.getString("renderer", null)?.takeIf { it.isNotBlank() }?.let {
+                parsed = parsed.copy(renderer = it)
+                dirty = true
+            }
+            legacyUpscalePref()?.let {
+                parsed = parsed.copy(upscaleFloat = it)
+                dirty = true
+            }
+            MainActivityRuntime.prefs.edit { putBoolean(KEY_RENDERER_MIGRATED, true) }
+        }
+
+        if (raw != null && !MainActivityRuntime.prefs.getBoolean(KEY_ADRENO_FBFETCH_MIGRATED, false) &&
+            !parsed.adrenoFbFetch) {
+            parsed = parsed.copy(adrenoFbFetch = true)
+            dirty = true
+        }
+        if (!MainActivityRuntime.prefs.getBoolean(KEY_ADRENO_FBFETCH_MIGRATED, false)) {
+            MainActivityRuntime.prefs.edit { putBoolean(KEY_ADRENO_FBFETCH_MIGRATED, true) }
+        }
+
+        if (raw != null && !MainActivityRuntime.prefs.getBoolean(KEY_OSD_OFF_MIGRATED, false) &&
+            parsed.osdShowFps && parsed.osdShowVps && parsed.osdShowSpeed &&
+            parsed.osdShowCpu && parsed.osdShowGpu && parsed.osdShowResolution &&
+            parsed.osdShowGsStats && parsed.osdShowFrameTimes &&
+            parsed.osdShowHardwareInfo && parsed.osdShowVersion) {
+            parsed = parsed.copy(
+                osdShowFps = false, osdShowVps = false, osdShowSpeed = false,
+                osdShowCpu = false, osdShowGpu = false, osdShowResolution = false,
+                osdShowGsStats = false, osdShowFrameTimes = false,
+                osdShowHardwareInfo = false, osdShowVersion = false,
+            )
+            dirty = true
+        }
+        if (!MainActivityRuntime.prefs.getBoolean(KEY_OSD_OFF_MIGRATED, false)) {
+            MainActivityRuntime.prefs.edit { putBoolean(KEY_OSD_OFF_MIGRATED, true) }
+        }
+
+        if (dirty) saveGlobal(parsed)
+        return parsed
+    }
+
+    private fun legacyUpscalePref(): Float? {
+        val all = MainActivityRuntime.prefs.all
+        fun coerce(raw: Any?): Float? = when (raw) {
+            is Float -> raw
+            is Double -> raw.toFloat()
+            is Int -> raw.toFloat()
+            is Long -> raw.toFloat()
+            is String -> raw.toFloatOrNull()
+            else -> null
+        }?.coerceIn(0.25f, 8.0f)
+        return coerce(all["upscaleFloat"]) ?: coerce(all["upscale"])
+    }
+
+    fun saveGlobal(s: Settings) {
+        MainActivityRuntime.prefs.edit { putString(KEY_GLOBAL, s.toJson().toString()) }
+        writeBackupMirror()
+    }
+
+    fun loadOverrides(serial: String): JSONObject? {
+        val raw = MainActivityRuntime.prefs.getString(keyForGame(serial), null) ?: return null
+        return try {
+            JSONObject(raw)
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    fun saveOverrides(serial: String, overrides: JSONObject) {
+        MainActivityRuntime.prefs.edit { putString(keyForGame(serial), overrides.toString()) }
+        writeBackupMirror()
+    }
+
+    fun clearOverrides(serial: String) {
+        MainActivityRuntime.prefs.edit { remove(keyForGame(serial)) }
+        writeBackupMirror()
+    }
+
+    fun resolveForGame(serial: String?): Settings {
+        val global = loadGlobal()
+        if (serial == null) return global
+        val overrides = loadOverrides(serial) ?: return global
+        return Settings.merge(global, overrides)
+    }
+
+    fun save(scope: SettingsScope, serial: String?, updated: Settings, previous: Settings? = null) {
+        if (scope == SettingsScope.Game && serial != null) {
+            val global = loadGlobal()
+            val overrides = Settings.diff(global, updated)
+            val full = updated.toJson()
+            val pinned = LinkedHashSet<String>()
+            loadOverrides(serial)?.keys()?.forEach { pinned.add(it) }
+            previous?.let { Settings.diff(it, updated).keys().forEach { k -> pinned.add(k) } }
+            pinned.forEach { key ->
+                if (!overrides.has(key) && full.has(key)) overrides.put(key, full.get(key))
+            }
+            saveOverrides(serial, overrides)
+        } else {
+            saveGlobal(updated)
+        }
+    }
+
+    private fun backupFile(): File? {
+        val root = MainActivityRuntime.currentInitDataRoot()?.takeIf { it.isNotBlank() } ?: return null
+        return File(root, BACKUP_FILENAME)
+    }
+
+    private fun writeBackupMirror() {
+        val file = backupFile() ?: return
+        runCatching {
+            val root = JSONObject()
+            MainActivityRuntime.prefs.getString(KEY_GLOBAL, null)?.let { root.put("global", JSONObject(it)) }
+            val games = JSONObject()
+            for ((k, v) in MainActivityRuntime.prefs.all) {
+                if (k.startsWith("config.game.") && v is String) {
+                    runCatching { games.put(k.removePrefix("config.game."), JSONObject(v)) }
+                }
+            }
+            if (games.length() > 0) root.put("games", games)
+            file.parentFile?.mkdirs()
+            file.writeText(root.toString())
+        }
+    }
+
+    fun reconcileReusedFolder() {
+        if (MainActivityRuntime.prefs.getBoolean(KEY_FOLDER_RECONCILE, false)) return
+        MainActivityRuntime.prefs.edit { putBoolean(KEY_FOLDER_RECONCILE, true) }
+        if (MainActivityRuntime.prefs.getString(KEY_GLOBAL, null) != null) return
+
+        val mirror = backupFile()
+        if (mirror != null && mirror.exists() && mirror.length() > 0L) {
+            val restored = runCatching {
+                val root = JSONObject(mirror.readText())
+                root.optJSONObject("global")?.let { g ->
+                    MainActivityRuntime.prefs.edit { putString(KEY_GLOBAL, g.toString()) }
+                }
+                root.optJSONObject("games")?.let { games ->
+                    val it = games.keys()
+                    while (it.hasNext()) {
+                        val serial = it.next()
+                        games.optJSONObject(serial)?.let { g ->
+                            MainActivityRuntime.prefs.edit { putString(keyForGame(serial), g.toString()) }
+                        }
+                    }
+                }
+                MainActivityRuntime.prefs.getString(KEY_GLOBAL, null) != null
+            }.getOrDefault(false)
+            if (restored) return
+        }
+
+        val root = MainActivityRuntime.currentInitDataRoot()?.takeIf { it.isNotBlank() } ?: return
+        val ini = File(root, "PCSX2-Android.ini")
+        if (!ini.exists() || ini.length() == 0L) return
+        runCatching {
+            val map = parseIni(ini.readText())
+            if (map.isNotEmpty()) saveGlobal(Settings().readFromIni(map))
+        }
+    }
+
+    private fun parseIni(text: String): Map<String, String> {
+        val map = HashMap<String, String>()
+        var section = ""
+        for (raw in text.lineSequence()) {
+            val line = raw.trim()
+            if (line.isEmpty() || line.startsWith("#") || line.startsWith(";")) continue
+            if (line.startsWith("[") && line.endsWith("]")) {
+                section = line.substring(1, line.length - 1).trim()
+                continue
+            }
+            val eq = line.indexOf('=')
+            if (eq <= 0) continue
+            val key = line.substring(0, eq).trim()
+            val value = line.substring(eq + 1).trim()
+            if (key.isNotEmpty()) map["$section/$key"] = value
+        }
+        return map
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/config/Settings.kt b/armsx2/src/main/java/com/armsx2/config/Settings.kt
new file mode 100644
index 000000000..a76aabd90
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/config/Settings.kt
@@ -0,0 +1,1724 @@
+package com.armsx2.config
+
+import com.armsx2.ShaderParams
+import com.armsx2.config.Settings.Companion.emitSink
+import com.armsx2.config.Settings.Companion.merge
+import kr.co.iefriends.pcsx2.NativeApp
+import org.json.JSONArray
+import org.json.JSONObject
+
+data class Dev9HostMapping(
+    val url: String = "",
+    val ip: String = "0.0.0.0",
+    val enabled: Boolean = true,
+)
+
+private fun shaderChainParamsToJson(value: Map<String, Map<String, Float>>): JSONObject =
+    JSONObject().apply {
+        value.forEach { (preset, params) ->
+            if (preset.isNotEmpty() && params.isNotEmpty()) {
+                put(preset, JSONObject().apply {
+                    params.forEach { (name, v) -> put(name, v.toDouble()) }
+                })
+            }
+        }
+    }
+
+private fun shaderChainParamsFromJson(json: JSONObject?): Map<String, Map<String, Float>> {
+    if (json == null) return emptyMap()
+    return buildMap {
+        json.keys().forEach { preset ->
+            val params = json.optJSONObject(preset) ?: return@forEach
+            val values = buildMap<String, Float> {
+                params.keys().forEach { name -> put(name, params.optDouble(name, 0.0).toFloat()) }
+            }
+            if (values.isNotEmpty()) put(preset, values)
+        }
+    }
+}
+
+data class Settings(
+    val eeCycleRate: Int = 0,
+    val eeCycleSkip: Int = 0,
+    val eeClampMode: Int = 1,
+    val vuClampMode: Int = 1,
+    val mtvu: Boolean = true,
+    val vu1Instant: Boolean = true,
+    val vuFlagHack: Boolean = true,
+    val fastCDVD: Boolean = false,
+    val intcStat: Boolean = true,
+    val waitLoop: Boolean = true,
+    val vuNeonFusions: Boolean = true,
+    val vuDeferredWrites: Boolean = false,
+    val vuSkipStallSim: Boolean = false,
+
+    val frameLimitEnable: Boolean = true,
+    val nominalSpeedPercent: Int = 100,
+    val fpsLimit: Int = 0,
+    val frameSkip: Int = 0,
+
+    val audioVolume: Int = 100,
+    val audioMuted: Boolean = false,
+    val audioSwapChannels: Boolean = false,
+    val audioTimeStretch: Boolean = true,
+    val audioBufferMs: Int = 50,
+    val audioOutputLatencyMs: Int = 20,
+    val audioFastForwardVolume: Int = 100,
+    val spu2NeonReverb: Boolean = false,
+
+    val enablePatches: Boolean = true,
+    val enableCheats: Boolean = false,
+    val enableWideScreenPatches: Boolean = false,
+    val enableNoInterlacingPatches: Boolean = false,
+    val enableFastBoot: Boolean = false,
+    val hostFs: Boolean = false,
+    val enableGameFixes: Boolean = true,
+    val gamefixSoftwareRendererFmv: Boolean = false,
+    val gamefixSkipMpeg: Boolean = false,
+    val gamefixEETiming: Boolean = false,
+    val gamefixInstantDma: Boolean = false,
+    val gamefixBlitInternalFps: Boolean = false,
+    val gamefixFpuMul: Boolean = false,
+    val gamefixOphFlag: Boolean = false,
+    val gamefixGifFifo: Boolean = false,
+    val gamefixDmaBusy: Boolean = false,
+    val gamefixVif1Stall: Boolean = false,
+    val gamefixIbit: Boolean = false,
+    val gamefixFullVu0Sync: Boolean = false,
+    val gamefixVuAddSub: Boolean = false,
+    val gamefixVuOverflow: Boolean = false,
+    val gamefixXgkick: Boolean = false,
+    val gamefixGoemonTlb: Boolean = false,
+    val gamefixVuSync: Boolean = false,
+    val skipDuplicateFrames: Boolean = true,
+    val eeFpuRoundMode: Int = 3,
+    val vu0RoundMode: Int = 3,
+    val vu1RoundMode: Int = 3,
+
+    val screenOffsets: Boolean = false,
+    val showOverscan: Boolean = false,
+    val antiBlur: Boolean = true,
+    val disableInterlaceOffset: Boolean = false,
+    val syncToHostRefresh: Boolean = false,
+    val disableFramebufferFetch: Boolean = false,
+    val hwRov: Boolean = false,
+    val hwAa1: Boolean = false,
+    val hwAat: Boolean = false,
+    val adrenoFbFetch: Boolean = true,
+    val forceMaliFbFetch: Boolean = false,
+    val useAngleOpenGL: Boolean = false,
+    val overrideTextureBarriers: Int = -1,
+    val disableVertexShaderExpand: Boolean = false,
+    val useBlitSwapChain: Boolean = false,
+    val disableShaderCache: Boolean = false,
+    val hwAccurateAlphaTest: Boolean = false,
+
+    val skipDrawStart: Int = 0,
+    val skipDrawEnd: Int = 0,
+    val spinGpuReadbacks: Boolean = false,
+    val spinCpuReadbacks: Boolean = false,
+    val integerScaling: Boolean = false,
+    val dithering: Int = 2,
+    val vsyncQueueSize: Int = 2,
+    val autoFlushSw: Boolean = true,
+    val mipmapSw: Boolean = true,
+    val swThreads: Int = 4,
+    val swThreadsHeight: Int = 4,
+
+    val aspectRatio: Int = 1,
+    val fmvAspectRatio: Int = 0,
+    val renderer: String = "auto",
+    val upscaleFloat: Float = 1.0f,
+    val framerateNtsc: Float = 59.94f,
+    val frameratePal: Float = 50.00f,
+    val deinterlaceMode: Int = 0,
+
+    val dev9EthEnable: Boolean = false,
+    val dev9EthApi: String = "Sockets",
+    val dev9EthDevice: String = "Auto",
+    val dev9EthLogDhcp: Boolean = false,
+    val dev9EthLogDns: Boolean = false,
+    val dev9InterceptDhcp: Boolean = false,
+    val dev9Ps2Ip: String = "0.0.0.0",
+    val dev9Mask: String = "0.0.0.0",
+    val dev9Gateway: String = "0.0.0.0",
+    val dev9Dns1: String = "0.0.0.0",
+    val dev9Dns2: String = "0.0.0.0",
+    val dev9AutoMask: Boolean = true,
+    val dev9AutoGateway: Boolean = true,
+    val dev9ModeDns1: String = "Auto",
+    val dev9ModeDns2: String = "Auto",
+    val dev9EthHosts: List<Dev9HostMapping> = emptyList(),
+    val dev9HddEnable: Boolean = false,
+    val dev9HddFile: String = "DEV9hdd.raw",
+
+    val memoryCardSlot1Enabled: Boolean = true,
+    val memoryCardSlot1Filename: String = "mcd001.ps2",
+    val biosFilename: String = "",
+    val memoryCardSlot2Enabled: Boolean = true,
+    val memoryCardSlot2Filename: String = "mcd002.ps2",
+
+    val usbKeyboard: Boolean = false,
+
+    val recEE: Boolean = true,
+    val recIOP: Boolean = true,
+    val recVU0: Boolean = true,
+    val recVU1: Boolean = true,
+    val enableFastmem: Boolean = true,
+
+    val useMacEE: Boolean = true,
+    val useMacIOP: Boolean = true,
+    val useMacVU0: Boolean = true,
+    val useMacVU1: Boolean = true,
+
+    val vu1InlineFmacStall: Boolean = false,
+    val vu1CrossBlockPState: Boolean = false,
+    val vu1InlineDrainTestPipes: Boolean = false,
+    val vu1FmacInstanceRouting: Boolean = false,
+
+    val hwMipmap: Boolean = true,
+    val accurateBlendingUnit: Int = 1,
+    val textureFiltering: Int = 2,
+    val displayBilinear: Int = 1,
+    val texturePreloading: Int = 2,
+    val hardwareDownloadMode: Int = 0,
+    val tvShader: Int = 0,
+    val shadeBoost: Boolean = false,
+    val shadeBoostBrightness: Int = 50,
+    val shadeBoostContrast: Int = 50,
+    val shadeBoostSaturation: Int = 50,
+    val shadeBoostGamma: Int = 50,
+    val fxaa: Boolean = false,
+    val shaderChainEnabled: Boolean = false,
+    val shaderChainPreset: String = "",
+    val shaderChainParams: Map<String, Map<String, Float>> = emptyMap(),
+    val casMode: Int = 0,
+    val casSharpness: Int = 50,
+    val loadTextureReplacements: Boolean = false,
+    val loadTextureReplacementsAsync: Boolean = true,
+    val precacheTextureReplacements: Boolean = false,
+    val dumpReplaceableTextures: Boolean = false,
+    val osdShowTextureReplacements: Boolean = false,
+    val osdShowFps: Boolean = false,
+    val osdScale: Int = 100,
+    val vsyncEnable: Boolean = false,
+    val osdShowVps: Boolean = false,
+    val osdShowSpeed: Boolean = false,
+    val osdShowCpu: Boolean = false,
+    val osdShowGpu: Boolean = false,
+    val osdShowResolution: Boolean = false,
+    val osdShowGsStats: Boolean = false,
+    val osdShowFrameTimes: Boolean = false,
+    val osdShowHardwareInfo: Boolean = false,
+    val osdShowMessages: Boolean = true,
+    val osdShowGpuStats: Boolean = false,
+    val osdShowVersion: Boolean = false,
+    val osdShowSettings: Boolean = false,
+    val osdShowInputs: Boolean = false,
+    val autoFlush: Int = 0,
+    val halfPixelOffset: Int = 0,
+    val limit24BitDepth: Int = 0,
+    val manualUserHacks: Boolean = false,
+    val textureInsideRt: Int = 0,
+    val nativeScaling: Int = 0,
+    val roundSprite: Int = 0,
+    val bilinearUpscale: Int = 0,
+    val gpuTargetClut: Int = 0,
+    val cpuSpriteRenderBw: Int = 0,
+    val cpuSpriteRenderLevel: Int = 0,
+    val alignSprite: Boolean = false,
+    val mergeSprite: Boolean = false,
+    val forceEvenSpritePosition: Boolean = false,
+    val unscaledPaletteDraw: Boolean = false,
+    val textureOffsetX: Int = 0,
+    val textureOffsetY: Int = 0,
+    val gpuPaletteConversion: Boolean = false,
+    val cpuFramebufferConversion: Boolean = false,
+    val readTargetsWhenClosing: Boolean = false,
+    val disableDepthEmulation: Boolean = false,
+    val disablePartialInvalidation: Boolean = false,
+    val disableSafeFeatures: Boolean = false,
+    val disableRenderFixes: Boolean = false,
+    val preloadFrameData: Boolean = false,
+    val estimateTextureRegion: Boolean = false,
+    val drawBuffering: Boolean = false,
+    val cpuClutRender: Int = 0,
+    val triFilter: Int = -1,
+    val maxAnisotropy: Int = 0,
+    val gpuProfile: Int = 0,
+) {
+    private fun put(section: String, key: String, type: String, value: String) {
+        val sink = emitSink
+        if (sink != null) sink(section, key, type, value)
+        else NativeApp.setSetting(section, key, type, value)
+    }
+
+    fun applyTo() {
+        put("EmuCore/Speedhacks", "EECycleRate", "int", eeCycleRate.toString())
+        put("EmuCore/Speedhacks", "EECycleSkip", "int", eeCycleSkip.toString())
+        put("EmuCore/CPU/Recompiler", "fpuOverflow", "bool", (eeClampMode >= 1).toString())
+        put("EmuCore/CPU/Recompiler", "fpuExtraOverflow", "bool", (eeClampMode >= 2).toString())
+        put("EmuCore/CPU/Recompiler", "fpuFullMode", "bool", (eeClampMode >= 3).toString())
+        for (vu in arrayOf("vu0", "vu1")) {
+            put("EmuCore/CPU/Recompiler", "${vu}Overflow", "bool", (vuClampMode >= 1).toString())
+            put("EmuCore/CPU/Recompiler", "${vu}ExtraOverflow", "bool", (vuClampMode >= 2).toString())
+            put("EmuCore/CPU/Recompiler", "${vu}SignOverflow", "bool", (vuClampMode >= 3).toString())
+        }
+        put("EmuCore/Speedhacks", "vuThread", "bool", mtvu.toString())
+        put("EmuCore/Speedhacks", "vu1Instant", "bool", vu1Instant.toString())
+        put("EmuCore/Speedhacks", "vuFlagHack", "bool", vuFlagHack.toString())
+        put("EmuCore/Speedhacks", "fastCDVD", "bool", fastCDVD.toString())
+        put("EmuCore/Speedhacks", "IntcStat", "bool", intcStat.toString())
+        put("EmuCore/Speedhacks", "WaitLoop", "bool", waitLoop.toString())
+        put("EmuCore/Speedhacks", "vuNeonFusions", "bool", vuNeonFusions.toString())
+        put("EmuCore/Speedhacks", "vuDeferredWrites", "bool", vuDeferredWrites.toString())
+        put("EmuCore/Speedhacks", "vuSkipStallSim", "bool", vuSkipStallSim.toString())
+        put("EmuCore/GS", "FrameLimitEnable", "bool", frameLimitEnable.toString())
+        if (emitSink == null) NativeApp.speedhackLimitermode(if (frameLimitEnable) 0 else 3)
+        put("Framerate", "NominalScalar", "float",
+            (nominalSpeedPercent.coerceIn(10, 1000) / 100f).toString())
+        if (emitSink == null) NativeApp.setNominalSpeed(nominalSpeedPercent.coerceIn(10, 1000))
+        if (emitSink == null) NativeApp.setFpsCap(fpsLimit.coerceIn(0, 1000))
+        if (emitSink == null) NativeApp.setFrameSkip(frameSkip.coerceIn(0, 5))
+        if (emitSink == null) NativeApp.setAudioVolume(audioVolume.coerceIn(0, 200))
+        if (emitSink == null) NativeApp.setAudioMuted(audioMuted)
+        if (emitSink == null) NativeApp.setAudioSwapChannels(audioSwapChannels)
+        put("SPU2/Output", "SyncMode", "string", if (audioTimeStretch) "TimeStretch" else "Disabled")
+        put("SPU2/Output", "BufferMS", "int", audioBufferMs.coerceIn(10, 200).toString())
+        put("SPU2/Output", "OutputLatencyMS", "int", audioOutputLatencyMs.coerceIn(5, 200).toString())
+        put("SPU2/Output", "FastForwardVolume", "int", audioFastForwardVolume.coerceIn(0, 200).toString())
+        put("SPU2", "NeonReverbSIMD", "bool", spu2NeonReverb.toString())
+        put("EmuCore", "EnablePatches", "bool", enablePatches.toString())
+        put("EmuCore", "EnableCheats", "bool", enableCheats.toString())
+        put("EmuCore", "EnableWideScreenPatches", "bool", enableWideScreenPatches.toString())
+        put("EmuCore", "EnableNoInterlacingPatches", "bool", enableNoInterlacingPatches.toString())
+        put("EmuCore", "EnableFastBoot", "bool", enableFastBoot.toString())
+        put("EmuCore", "HostFs", "bool", hostFs.toString())
+        put("EmuCore", "EnableGameFixes", "bool", enableGameFixes.toString())
+        put("EmuCore/Gamefixes", "SoftwareRendererFMVHack", "bool", gamefixSoftwareRendererFmv.toString())
+        put("EmuCore/Gamefixes", "SkipMPEGHack", "bool", gamefixSkipMpeg.toString())
+        put("EmuCore/Gamefixes", "EETimingHack", "bool", gamefixEETiming.toString())
+        put("EmuCore/Gamefixes", "InstantDMAHack", "bool", gamefixInstantDma.toString())
+        put("EmuCore/Gamefixes", "BlitInternalFPSHack", "bool", gamefixBlitInternalFps.toString())
+        put("EmuCore/Gamefixes", "FpuMulHack", "bool", gamefixFpuMul.toString())
+        put("EmuCore/Gamefixes", "OPHFlagHack", "bool", gamefixOphFlag.toString())
+        put("EmuCore/Gamefixes", "GIFFIFOHack", "bool", gamefixGifFifo.toString())
+        put("EmuCore/Gamefixes", "DMABusyHack", "bool", gamefixDmaBusy.toString())
+        put("EmuCore/Gamefixes", "VIF1StallHack", "bool", gamefixVif1Stall.toString())
+        put("EmuCore/Gamefixes", "IbitHack", "bool", gamefixIbit.toString())
+        put("EmuCore/Gamefixes", "FullVU0SyncHack", "bool", gamefixFullVu0Sync.toString())
+        put("EmuCore/Gamefixes", "VuAddSubHack", "bool", gamefixVuAddSub.toString())
+        put("EmuCore/Gamefixes", "VUOverflowHack", "bool", gamefixVuOverflow.toString())
+        put("EmuCore/Gamefixes", "XgKickHack", "bool", gamefixXgkick.toString())
+        put("EmuCore/Gamefixes", "GoemonTlbHack", "bool", gamefixGoemonTlb.toString())
+        put("EmuCore/Gamefixes", "VUSyncHack", "bool", gamefixVuSync.toString())
+        put("EmuCore/GS", "SkipDuplicateFrames", "bool", skipDuplicateFrames.toString())
+        put("EmuCore/CPU", "FPU.Roundmode", "int", eeFpuRoundMode.coerceIn(0, 3).toString())
+        put("EmuCore/CPU", "VU0.Roundmode", "int", vu0RoundMode.coerceIn(0, 3).toString())
+        put("EmuCore/CPU", "VU1.Roundmode", "int", vu1RoundMode.coerceIn(0, 3).toString())
+        put("DEV9/Eth", "EthEnable", "bool", dev9EthEnable.toString())
+        put("DEV9/Eth", "EthApi", "string", dev9EthApi)
+        put("DEV9/Eth", "EthDevice", "string", dev9EthDevice.ifEmpty { "Auto" })
+        put("DEV9/Eth", "EthLogDHCP", "bool", dev9EthLogDhcp.toString())
+        put("DEV9/Eth", "EthLogDNS", "bool", dev9EthLogDns.toString())
+        put("DEV9/Eth", "InterceptDHCP", "bool", dev9InterceptDhcp.toString())
+        put("DEV9/Eth", "PS2IP", "string", dev9Ps2Ip.ifEmpty { "0.0.0.0" })
+        put("DEV9/Eth", "Mask", "string", dev9Mask.ifEmpty { "0.0.0.0" })
+        put("DEV9/Eth", "Gateway", "string", dev9Gateway.ifEmpty { "0.0.0.0" })
+        put("DEV9/Eth", "DNS1", "string", dev9Dns1.ifEmpty { "0.0.0.0" })
+        put("DEV9/Eth", "DNS2", "string", dev9Dns2.ifEmpty { "0.0.0.0" })
+        put("DEV9/Eth", "AutoMask", "bool", dev9AutoMask.toString())
+        put("DEV9/Eth", "AutoGateway", "bool", dev9AutoGateway.toString())
+        put("DEV9/Eth", "ModeDNS1", "string", dev9ModeDns1.ifEmpty { "Auto" })
+        put("DEV9/Eth", "ModeDNS2", "string", dev9ModeDns2.ifEmpty { "Auto" })
+        put("DEV9/Eth/Hosts", "Count", "int", dev9EthHosts.size.toString())
+        dev9EthHosts.forEachIndexed { i, h ->
+            put("DEV9/Eth/Hosts/Host$i", "Url", "string", h.url)
+            put("DEV9/Eth/Hosts/Host$i", "Desc", "string", "ARMSX2")
+            put("DEV9/Eth/Hosts/Host$i", "Address", "string", h.ip.ifEmpty { "0.0.0.0" })
+            put("DEV9/Eth/Hosts/Host$i", "Enabled", "bool", h.enabled.toString())
+        }
+        put("DEV9/Hdd", "HddEnable", "bool", dev9HddEnable.toString())
+        put("DEV9/Hdd", "HddFile", "string", dev9HddFile.ifEmpty { "DEV9hdd.raw" })
+        put("MemoryCards", "Slot1_Enable", "bool", memoryCardSlot1Enabled.toString())
+        put("MemoryCards", "Slot1_Filename", "string", memoryCardSlot1Filename.ifEmpty { "mcd001.ps2" })
+        put("MemoryCards", "Slot2_Enable", "bool", memoryCardSlot2Enabled.toString())
+        put("MemoryCards", "Slot2_Filename", "string", memoryCardSlot2Filename.ifEmpty { "mcd002.ps2" })
+        put("USB1", "Type", "string", if (usbKeyboard) "hidkbd" else "None")
+        put("EmuCore/CPU/Recompiler", "EnableEE", "bool", recEE.toString())
+        put("EmuCore/CPU/Recompiler", "EnableIOP", "bool", recIOP.toString())
+        put("EmuCore/CPU/Recompiler", "EnableVU0", "bool", recVU0.toString())
+        put("EmuCore/CPU/Recompiler", "EnableVU1", "bool", recVU1.toString())
+        put("EmuCore/CPU/Recompiler", "EnableFastmem", "bool", enableFastmem.toString())
+        put("EmuCore/CPU/Recompiler", "UseMacEE", "bool", "true")
+        put("EmuCore/CPU/Recompiler", "UseMacIOP", "bool", "true")
+        put("EmuCore/CPU/Recompiler", "UseMacVU0", "bool", "true")
+        put("EmuCore/CPU/Recompiler", "UseMacVU1", "bool", "true")
+        put("EmuCore/CPU/Recompiler", "Vu1InlineFmacStall", "bool", vu1InlineFmacStall.toString())
+        put("EmuCore/CPU/Recompiler", "Vu1CrossBlockPState", "bool", vu1CrossBlockPState.toString())
+        put("EmuCore/CPU/Recompiler", "Vu1InlineDrainTestPipes", "bool", vu1InlineDrainTestPipes.toString())
+        put("EmuCore/CPU/Recompiler", "Vu1FmacInstanceRouting", "bool", vu1FmacInstanceRouting.toString())
+        writeGsToNative()
+        if (emitSink != null) return
+        NativeApp.setAspectRatio(aspectRatio.coerceIn(0, 4))
+        NativeApp.setFmvAspectRatio(fmvAspectRatio.coerceIn(0, 4))
+        NativeApp.renderTvShader(tvShader.coerceIn(0, 7))
+        NativeApp.renderShadeBoost(
+            shadeBoost,
+            shadeBoostBrightness.coerceIn(1, 100),
+            shadeBoostContrast.coerceIn(1, 100),
+            shadeBoostSaturation.coerceIn(1, 100),
+            shadeBoostGamma.coerceIn(1, 100),
+        )
+        NativeApp.osdShowFPS(osdShowFps)
+        NativeApp.osdSetScale(osdScale.toFloat())
+        NativeApp.osdShowVPS(osdShowVps)
+        NativeApp.osdShowSpeed(osdShowSpeed)
+        NativeApp.osdShowCPU(osdShowCpu)
+        NativeApp.osdShowGPU(osdShowGpu)
+        NativeApp.osdShowResolution(osdShowResolution)
+        NativeApp.osdShowGSStats(osdShowGsStats)
+        NativeApp.osdShowFrameTimes(osdShowFrameTimes)
+        NativeApp.osdShowHardwareInfo(osdShowHardwareInfo)
+        NativeApp.osdShowMessages(osdShowMessages)
+        NativeApp.osdShowGpuStats(osdShowGpuStats)
+        NativeApp.osdShowVersion(osdShowVersion)
+        NativeApp.osdShowSettings(osdShowSettings)
+        NativeApp.osdShowInputs(osdShowInputs)
+        NativeApp.usbSetKeyboardEnabled(0, usbKeyboard)
+        NativeApp.commitSettings()
+    }
+
+    fun readFromIni(ini: Map<String, String>): Settings {
+        fun boolAt(key: String): Boolean? = ini[key]?.let { it == "true" || it == "1" }
+        fun intAt(key: String): Int? = ini[key]?.toIntOrNull()
+        fun floatAt(key: String): Float? = ini[key]?.toFloatOrNull()
+        fun strAt(key: String): String? = ini[key]
+
+        val eeClamp = run {
+            val fo = boolAt("EmuCore/CPU/Recompiler/fpuOverflow")
+            val fe = boolAt("EmuCore/CPU/Recompiler/fpuExtraOverflow")
+            val ff = boolAt("EmuCore/CPU/Recompiler/fpuFullMode")
+            if (fo == null && fe == null && ff == null) this.eeClampMode
+            else if (ff == true) 3 else if (fe == true) 2 else if (fo == true) 1 else 0
+        }
+        val vuClamp = run {
+            val o = boolAt("EmuCore/CPU/Recompiler/vu0Overflow")
+            val e = boolAt("EmuCore/CPU/Recompiler/vu0ExtraOverflow")
+            val sgn = boolAt("EmuCore/CPU/Recompiler/vu0SignOverflow")
+            if (o == null && e == null && sgn == null) this.vuClampMode
+            else if (sgn == true) 3 else if (e == true) 2 else if (o == true) 1 else 0
+        }
+
+        val recoveredRenderer = when (intAt("EmuCore/GS/Renderer")) {
+            -1 -> "auto"
+            12 -> "opengl"
+            13 -> "software"
+            14 -> "vulkan"
+            else -> this.renderer
+        }
+
+        return this.copy(
+            renderer = recoveredRenderer,
+            upscaleFloat = floatAt("EmuCore/GS/upscale_multiplier") ?: this.upscaleFloat,
+            eeCycleRate = intAt("EmuCore/Speedhacks/EECycleRate") ?: this.eeCycleRate,
+            eeCycleSkip = intAt("EmuCore/Speedhacks/EECycleSkip") ?: this.eeCycleSkip,
+            eeClampMode = eeClamp,
+            vuClampMode = vuClamp,
+            mtvu = boolAt("EmuCore/Speedhacks/vuThread") ?: this.mtvu,
+            vu1Instant = boolAt("EmuCore/Speedhacks/vu1Instant") ?: this.vu1Instant,
+            vuFlagHack = boolAt("EmuCore/Speedhacks/vuFlagHack") ?: this.vuFlagHack,
+            fastCDVD = boolAt("EmuCore/Speedhacks/fastCDVD") ?: this.fastCDVD,
+            intcStat = boolAt("EmuCore/Speedhacks/IntcStat") ?: this.intcStat,
+            waitLoop = boolAt("EmuCore/Speedhacks/WaitLoop") ?: this.waitLoop,
+            vuNeonFusions = boolAt("EmuCore/Speedhacks/vuNeonFusions") ?: this.vuNeonFusions,
+            vuDeferredWrites = boolAt("EmuCore/Speedhacks/vuDeferredWrites") ?: this.vuDeferredWrites,
+            vuSkipStallSim = boolAt("EmuCore/Speedhacks/vuSkipStallSim") ?: this.vuSkipStallSim,
+            frameLimitEnable = boolAt("EmuCore/GS/FrameLimitEnable") ?: this.frameLimitEnable,
+            nominalSpeedPercent = floatAt("Framerate/NominalScalar")?.let { Math.round(it * 100f) }
+                ?: this.nominalSpeedPercent,
+            audioTimeStretch = strAt("SPU2/Output/SyncMode")?.let { it == "TimeStretch" } ?: this.audioTimeStretch,
+            audioBufferMs = intAt("SPU2/Output/BufferMS") ?: this.audioBufferMs,
+            audioOutputLatencyMs = intAt("SPU2/Output/OutputLatencyMS") ?: this.audioOutputLatencyMs,
+            audioFastForwardVolume = intAt("SPU2/Output/FastForwardVolume") ?: this.audioFastForwardVolume,
+            spu2NeonReverb = boolAt("SPU2/NeonReverbSIMD") ?: this.spu2NeonReverb,
+            enablePatches = boolAt("EmuCore/EnablePatches") ?: this.enablePatches,
+            enableCheats = boolAt("EmuCore/EnableCheats") ?: this.enableCheats,
+            enableWideScreenPatches = boolAt("EmuCore/EnableWideScreenPatches") ?: this.enableWideScreenPatches,
+            enableNoInterlacingPatches = boolAt("EmuCore/EnableNoInterlacingPatches") ?: this.enableNoInterlacingPatches,
+            enableFastBoot = boolAt("EmuCore/EnableFastBoot") ?: this.enableFastBoot,
+            hostFs = boolAt("EmuCore/HostFs") ?: this.hostFs,
+            enableGameFixes = boolAt("EmuCore/EnableGameFixes") ?: this.enableGameFixes,
+            gamefixSoftwareRendererFmv = boolAt("EmuCore/Gamefixes/SoftwareRendererFMVHack") ?: this.gamefixSoftwareRendererFmv,
+            gamefixSkipMpeg = boolAt("EmuCore/Gamefixes/SkipMPEGHack") ?: this.gamefixSkipMpeg,
+            gamefixEETiming = boolAt("EmuCore/Gamefixes/EETimingHack") ?: this.gamefixEETiming,
+            gamefixInstantDma = boolAt("EmuCore/Gamefixes/InstantDMAHack") ?: this.gamefixInstantDma,
+            gamefixBlitInternalFps = boolAt("EmuCore/Gamefixes/BlitInternalFPSHack") ?: this.gamefixBlitInternalFps,
+            gamefixFpuMul = boolAt("EmuCore/Gamefixes/FpuMulHack") ?: this.gamefixFpuMul,
+            gamefixOphFlag = boolAt("EmuCore/Gamefixes/OPHFlagHack") ?: this.gamefixOphFlag,
+            gamefixGifFifo = boolAt("EmuCore/Gamefixes/GIFFIFOHack") ?: this.gamefixGifFifo,
+            gamefixDmaBusy = boolAt("EmuCore/Gamefixes/DMABusyHack") ?: this.gamefixDmaBusy,
+            gamefixVif1Stall = boolAt("EmuCore/Gamefixes/VIF1StallHack") ?: this.gamefixVif1Stall,
+            gamefixIbit = boolAt("EmuCore/Gamefixes/IbitHack") ?: this.gamefixIbit,
+            gamefixFullVu0Sync = boolAt("EmuCore/Gamefixes/FullVU0SyncHack") ?: this.gamefixFullVu0Sync,
+            gamefixVuAddSub = boolAt("EmuCore/Gamefixes/VuAddSubHack") ?: this.gamefixVuAddSub,
+            gamefixVuOverflow = boolAt("EmuCore/Gamefixes/VUOverflowHack") ?: this.gamefixVuOverflow,
+            gamefixXgkick = boolAt("EmuCore/Gamefixes/XgKickHack") ?: this.gamefixXgkick,
+            gamefixGoemonTlb = boolAt("EmuCore/Gamefixes/GoemonTlbHack") ?: this.gamefixGoemonTlb,
+            gamefixVuSync = boolAt("EmuCore/Gamefixes/VUSyncHack") ?: this.gamefixVuSync,
+            skipDuplicateFrames = boolAt("EmuCore/GS/SkipDuplicateFrames") ?: this.skipDuplicateFrames,
+            eeFpuRoundMode = intAt("EmuCore/CPU/FPU.Roundmode") ?: this.eeFpuRoundMode,
+            vu0RoundMode = intAt("EmuCore/CPU/VU0.Roundmode") ?: this.vu0RoundMode,
+            vu1RoundMode = intAt("EmuCore/CPU/VU1.Roundmode") ?: this.vu1RoundMode,
+            dev9EthEnable = boolAt("DEV9/Eth/EthEnable") ?: this.dev9EthEnable,
+            dev9EthApi = strAt("DEV9/Eth/EthApi") ?: this.dev9EthApi,
+            dev9EthDevice = strAt("DEV9/Eth/EthDevice") ?: this.dev9EthDevice,
+            dev9EthLogDhcp = boolAt("DEV9/Eth/EthLogDHCP") ?: this.dev9EthLogDhcp,
+            dev9EthLogDns = boolAt("DEV9/Eth/EthLogDNS") ?: this.dev9EthLogDns,
+            dev9InterceptDhcp = boolAt("DEV9/Eth/InterceptDHCP") ?: this.dev9InterceptDhcp,
+            dev9Ps2Ip = strAt("DEV9/Eth/PS2IP") ?: this.dev9Ps2Ip,
+            dev9Mask = strAt("DEV9/Eth/Mask") ?: this.dev9Mask,
+            dev9Gateway = strAt("DEV9/Eth/Gateway") ?: this.dev9Gateway,
+            dev9Dns1 = strAt("DEV9/Eth/DNS1") ?: this.dev9Dns1,
+            dev9Dns2 = strAt("DEV9/Eth/DNS2") ?: this.dev9Dns2,
+            dev9AutoMask = boolAt("DEV9/Eth/AutoMask") ?: this.dev9AutoMask,
+            dev9AutoGateway = boolAt("DEV9/Eth/AutoGateway") ?: this.dev9AutoGateway,
+            dev9ModeDns1 = strAt("DEV9/Eth/ModeDNS1") ?: this.dev9ModeDns1,
+            dev9ModeDns2 = strAt("DEV9/Eth/ModeDNS2") ?: this.dev9ModeDns2,
+            dev9EthHosts = run {
+                val count = intAt("DEV9/Eth/Hosts/Count") ?: return@run this.dev9EthHosts
+                (0 until count).mapNotNull { idx ->
+                    val url = ini["DEV9/Eth/Hosts/Host$idx/Url"] ?: return@mapNotNull null
+                    Dev9HostMapping(
+                        url = url,
+                        ip = (ini["DEV9/Eth/Hosts/Host$idx/Address"] ?: "0.0.0.0").ifEmpty { "0.0.0.0" },
+                        enabled = boolAt("DEV9/Eth/Hosts/Host$idx/Enabled") ?: true,
+                    )
+                }.filter { it.url.isNotBlank() }
+            },
+            dev9HddEnable = boolAt("DEV9/Hdd/HddEnable") ?: this.dev9HddEnable,
+            dev9HddFile = strAt("DEV9/Hdd/HddFile") ?: this.dev9HddFile,
+            memoryCardSlot1Enabled = boolAt("MemoryCards/Slot1_Enable") ?: this.memoryCardSlot1Enabled,
+            memoryCardSlot1Filename = strAt("MemoryCards/Slot1_Filename") ?: this.memoryCardSlot1Filename,
+            memoryCardSlot2Enabled = boolAt("MemoryCards/Slot2_Enable") ?: this.memoryCardSlot2Enabled,
+            memoryCardSlot2Filename = strAt("MemoryCards/Slot2_Filename") ?: this.memoryCardSlot2Filename,
+            usbKeyboard = strAt("USB1/Type")?.let { it == "hidkbd" } ?: this.usbKeyboard,
+            recEE = boolAt("EmuCore/CPU/Recompiler/EnableEE") ?: this.recEE,
+            recIOP = boolAt("EmuCore/CPU/Recompiler/EnableIOP") ?: this.recIOP,
+            recVU0 = boolAt("EmuCore/CPU/Recompiler/EnableVU0") ?: this.recVU0,
+            recVU1 = boolAt("EmuCore/CPU/Recompiler/EnableVU1") ?: this.recVU1,
+            enableFastmem = boolAt("EmuCore/CPU/Recompiler/EnableFastmem") ?: this.enableFastmem,
+            useMacEE = true,
+            useMacIOP = true,
+            useMacVU0 = true,
+            useMacVU1 = true,
+            vu1InlineFmacStall = boolAt("EmuCore/CPU/Recompiler/Vu1InlineFmacStall") ?: this.vu1InlineFmacStall,
+            vu1CrossBlockPState = boolAt("EmuCore/CPU/Recompiler/Vu1CrossBlockPState") ?: this.vu1CrossBlockPState,
+            vu1InlineDrainTestPipes = boolAt("EmuCore/CPU/Recompiler/Vu1InlineDrainTestPipes") ?: this.vu1InlineDrainTestPipes,
+            vu1FmacInstanceRouting = boolAt("EmuCore/CPU/Recompiler/Vu1FmacInstanceRouting") ?: this.vu1FmacInstanceRouting,
+            aspectRatio = when (strAt("EmuCore/GS/AspectRatio")) {
+                "Stretch" -> 0
+                "Auto 4:3/3:2" -> 1
+                "4:3" -> 2
+                "16:9" -> 3
+                "10:7" -> 4
+                else -> this.aspectRatio
+            },
+            fmvAspectRatio = when (strAt("EmuCore/GS/FMVAspectRatioSwitch")) {
+                "Off" -> 0
+                "Auto 4:3/3:2" -> 1
+                "4:3" -> 2
+                "16:9" -> 3
+                "10:7" -> 4
+                else -> this.fmvAspectRatio
+            },
+            deinterlaceMode = intAt("EmuCore/GS/deinterlace_mode") ?: this.deinterlaceMode,
+            framerateNtsc = floatAt("EmuCore/GS/FramerateNTSC") ?: this.framerateNtsc,
+            frameratePal = floatAt("EmuCore/GS/FrameratePAL") ?: this.frameratePal,
+            hwMipmap = boolAt("EmuCore/GS/hw_mipmap") ?: this.hwMipmap,
+            accurateBlendingUnit = intAt("EmuCore/GS/accurate_blending_unit") ?: this.accurateBlendingUnit,
+            textureFiltering = intAt("EmuCore/GS/filter") ?: this.textureFiltering,
+            displayBilinear = intAt("EmuCore/GS/linear_present_mode") ?: this.displayBilinear,
+            texturePreloading = intAt("EmuCore/GS/texture_preloading") ?: this.texturePreloading,
+            hardwareDownloadMode = intAt("EmuCore/GS/HWDownloadMode") ?: this.hardwareDownloadMode,
+            tvShader = intAt("EmuCore/GS/TVShader") ?: this.tvShader,
+            shadeBoost = boolAt("EmuCore/GS/ShadeBoost") ?: this.shadeBoost,
+            shadeBoostBrightness = intAt("EmuCore/GS/ShadeBoost_Brightness") ?: this.shadeBoostBrightness,
+            shadeBoostContrast = intAt("EmuCore/GS/ShadeBoost_Contrast") ?: this.shadeBoostContrast,
+            shadeBoostSaturation = intAt("EmuCore/GS/ShadeBoost_Saturation") ?: this.shadeBoostSaturation,
+            shadeBoostGamma = intAt("EmuCore/GS/ShadeBoost_Gamma") ?: this.shadeBoostGamma,
+            fxaa = boolAt("EmuCore/GS/fxaa") ?: this.fxaa,
+            shaderChainEnabled = boolAt("EmuCore/GS/ShaderChainEnabled") ?: this.shaderChainEnabled,
+            shaderChainPreset = strAt("EmuCore/GS/ShaderChainPreset") ?: this.shaderChainPreset,
+            shaderChainParams = strAt("EmuCore/GS/ShaderChainParams")?.let { raw ->
+                runCatching { shaderChainParamsFromJson(JSONObject(raw)) }.getOrNull()
+            } ?: this.shaderChainParams,
+            casMode = intAt("EmuCore/GS/CASMode") ?: this.casMode,
+            casSharpness = intAt("EmuCore/GS/CASSharpness") ?: this.casSharpness,
+            loadTextureReplacements = boolAt("EmuCore/GS/LoadTextureReplacements") ?: this.loadTextureReplacements,
+            loadTextureReplacementsAsync = boolAt("EmuCore/GS/LoadTextureReplacementsAsync") ?: this.loadTextureReplacementsAsync,
+            precacheTextureReplacements = boolAt("EmuCore/GS/PrecacheTextureReplacements") ?: this.precacheTextureReplacements,
+            dumpReplaceableTextures = boolAt("EmuCore/GS/DumpReplaceableTextures") ?: this.dumpReplaceableTextures,
+            osdShowTextureReplacements = boolAt("EmuCore/GS/OsdShowTextureReplacements") ?: this.osdShowTextureReplacements,
+            osdShowFps = boolAt("EmuCore/GS/OsdShowFPS") ?: this.osdShowFps,
+            osdScale = intAt("EmuCore/GS/OsdScale") ?: this.osdScale,
+            vsyncEnable = boolAt("EmuCore/GS/VsyncEnable") ?: this.vsyncEnable,
+            osdShowVps = boolAt("EmuCore/GS/OsdShowVPS") ?: this.osdShowVps,
+            osdShowSpeed = boolAt("EmuCore/GS/OsdShowSpeed") ?: this.osdShowSpeed,
+            osdShowCpu = boolAt("EmuCore/GS/OsdShowCPU") ?: this.osdShowCpu,
+            osdShowGpu = boolAt("EmuCore/GS/OsdShowGPU") ?: this.osdShowGpu,
+            osdShowResolution = boolAt("EmuCore/GS/OsdShowResolution") ?: this.osdShowResolution,
+            osdShowGsStats = boolAt("EmuCore/GS/OsdShowGSStats") ?: this.osdShowGsStats,
+            osdShowFrameTimes = boolAt("EmuCore/GS/OsdShowFrameTimes") ?: this.osdShowFrameTimes,
+            osdShowHardwareInfo = boolAt("EmuCore/GS/OsdShowHardwareInfo") ?: this.osdShowHardwareInfo,
+            osdShowMessages = intAt("EmuCore/GS/OsdMessagesPos")?.let { it != 0 } ?: this.osdShowMessages,
+            osdShowGpuStats = boolAt("EmuCore/GS/OsdShowGPUStats") ?: this.osdShowGpuStats,
+            osdShowVersion = boolAt("EmuCore/GS/OsdShowVersion") ?: this.osdShowVersion,
+            osdShowSettings = boolAt("EmuCore/GS/OsdShowSettings") ?: this.osdShowSettings,
+            osdShowInputs = boolAt("EmuCore/GS/OsdShowInputs") ?: this.osdShowInputs,
+            screenOffsets = boolAt("EmuCore/GS/pcrtc_offsets") ?: this.screenOffsets,
+            showOverscan = boolAt("EmuCore/GS/pcrtc_overscan") ?: this.showOverscan,
+            antiBlur = boolAt("EmuCore/GS/pcrtc_antiblur") ?: this.antiBlur,
+            disableInterlaceOffset = boolAt("EmuCore/GS/disable_interlace_offset") ?: this.disableInterlaceOffset,
+            syncToHostRefresh = boolAt("EmuCore/GS/SyncToHostRefreshRate") ?: this.syncToHostRefresh,
+            disableFramebufferFetch = boolAt("EmuCore/GS/DisableFramebufferFetch") ?: this.disableFramebufferFetch,
+            hwRov = boolAt("EmuCore/GS/HWROV") ?: this.hwRov,
+            hwAa1 = boolAt("EmuCore/GS/HWAA1") ?: this.hwAa1,
+            adrenoFbFetch = boolAt("EmuCore/GS/EnableAdrenoFramebufferFetch") ?: this.adrenoFbFetch,
+            forceMaliFbFetch = boolAt("EmuCore/GS/ForceMaliFramebufferFetch") ?: this.forceMaliFbFetch,
+            useAngleOpenGL = boolAt("EmuCore/GS/AndroidUseAngleOpenGL") ?: this.useAngleOpenGL,
+            overrideTextureBarriers = intAt("EmuCore/GS/OverrideTextureBarriers") ?: this.overrideTextureBarriers,
+            disableVertexShaderExpand = boolAt("EmuCore/GS/DisableVertexShaderExpand") ?: this.disableVertexShaderExpand,
+            useBlitSwapChain = boolAt("EmuCore/GS/UseBlitSwapChain") ?: this.useBlitSwapChain,
+            disableShaderCache = boolAt("EmuCore/GS/DisableShaderCache") ?: this.disableShaderCache,
+            hwAccurateAlphaTest = boolAt("EmuCore/GS/HWAccurateAlphaTest") ?: this.hwAccurateAlphaTest,
+            drawBuffering = boolAt("EmuCore/GS/UserHacks_DrawBuffering") ?: this.drawBuffering,
+            spinGpuReadbacks = boolAt("EmuCore/GS/HWSpinGPUForReadbacks") ?: this.spinGpuReadbacks,
+            spinCpuReadbacks = boolAt("EmuCore/GS/HWSpinCPUForReadbacks") ?: this.spinCpuReadbacks,
+            integerScaling = boolAt("EmuCore/GS/IntegerScaling") ?: this.integerScaling,
+            dithering = intAt("EmuCore/GS/dithering_ps2") ?: this.dithering,
+            vsyncQueueSize = intAt("EmuCore/GS/VsyncQueueSize") ?: this.vsyncQueueSize,
+            autoFlushSw = boolAt("EmuCore/GS/autoflush_sw") ?: this.autoFlushSw,
+            mipmapSw = boolAt("EmuCore/GS/mipmap") ?: this.mipmapSw,
+            swThreads = intAt("EmuCore/GS/extrathreads") ?: this.swThreads,
+            swThreadsHeight = intAt("EmuCore/GS/extrathreads_height") ?: this.swThreadsHeight,
+            skipDrawStart = intAt("EmuCore/GS/UserHacks_SkipDraw_Start") ?: this.skipDrawStart,
+            skipDrawEnd = intAt("EmuCore/GS/UserHacks_SkipDraw_End") ?: this.skipDrawEnd,
+            manualUserHacks = boolAt("EmuCore/GS/UserHacks") ?: this.manualUserHacks,
+            autoFlush = intAt("EmuCore/GS/UserHacks_AutoFlushLevel") ?: this.autoFlush,
+            halfPixelOffset = intAt("EmuCore/GS/UserHacks_HalfPixelOffset") ?: this.halfPixelOffset,
+            limit24BitDepth = intAt("EmuCore/GS/UserHacks_Limit24BitDepth") ?: this.limit24BitDepth,
+            textureInsideRt = intAt("EmuCore/GS/UserHacks_TextureInsideRt") ?: this.textureInsideRt,
+            nativeScaling = intAt("EmuCore/GS/UserHacks_native_scaling") ?: this.nativeScaling,
+            roundSprite = intAt("EmuCore/GS/UserHacks_round_sprite_offset") ?: this.roundSprite,
+            bilinearUpscale = intAt("EmuCore/GS/UserHacks_BilinearHack") ?: this.bilinearUpscale,
+            gpuTargetClut = intAt("EmuCore/GS/UserHacks_GPUTargetCLUTMode") ?: this.gpuTargetClut,
+            cpuSpriteRenderBw = intAt("EmuCore/GS/UserHacks_CPUSpriteRenderBW") ?: this.cpuSpriteRenderBw,
+            cpuSpriteRenderLevel = intAt("EmuCore/GS/UserHacks_CPUSpriteRenderLevel") ?: this.cpuSpriteRenderLevel,
+            cpuClutRender = intAt("EmuCore/GS/UserHacks_CPUCLUTRender") ?: this.cpuClutRender,
+            alignSprite = boolAt("EmuCore/GS/UserHacks_align_sprite_X") ?: this.alignSprite,
+            mergeSprite = boolAt("EmuCore/GS/UserHacks_merge_pp_sprite") ?: this.mergeSprite,
+            forceEvenSpritePosition = boolAt("EmuCore/GS/UserHacks_ForceEvenSpritePosition") ?: this.forceEvenSpritePosition,
+            unscaledPaletteDraw = boolAt("EmuCore/GS/UserHacks_NativePaletteDraw") ?: this.unscaledPaletteDraw,
+            textureOffsetX = intAt("EmuCore/GS/UserHacks_TCOffsetX") ?: this.textureOffsetX,
+            textureOffsetY = intAt("EmuCore/GS/UserHacks_TCOffsetY") ?: this.textureOffsetY,
+            gpuPaletteConversion = boolAt("EmuCore/GS/paltex") ?: this.gpuPaletteConversion,
+            cpuFramebufferConversion = boolAt("EmuCore/GS/UserHacks_CPU_FB_Conversion") ?: this.cpuFramebufferConversion,
+            readTargetsWhenClosing = boolAt("EmuCore/GS/UserHacks_ReadTCOnClose") ?: this.readTargetsWhenClosing,
+            disableDepthEmulation = boolAt("EmuCore/GS/UserHacks_DisableDepthSupport") ?: this.disableDepthEmulation,
+            disablePartialInvalidation = boolAt("EmuCore/GS/UserHacks_DisablePartialInvalidation") ?: this.disablePartialInvalidation,
+            disableSafeFeatures = boolAt("EmuCore/GS/UserHacks_Disable_Safe_Features") ?: this.disableSafeFeatures,
+            disableRenderFixes = boolAt("EmuCore/GS/UserHacks_DisableRenderFixes") ?: this.disableRenderFixes,
+            preloadFrameData = boolAt("EmuCore/GS/preload_frame_with_gs_data") ?: this.preloadFrameData,
+            estimateTextureRegion = boolAt("EmuCore/GS/UserHacks_EstimateTextureRegion") ?: this.estimateTextureRegion,
+            triFilter = intAt("EmuCore/GS/TriFilter") ?: this.triFilter,
+            maxAnisotropy = intAt("EmuCore/GS/MaxAnisotropy") ?: this.maxAnisotropy,
+            gpuProfile = when (strAt("EmuCore/GS/AndroidGpuProfileOverride")) {
+                "mali" -> 1
+                "adreno" -> 2
+                "powervr" -> 3
+                "xclipse" -> 4
+                "auto" -> 0
+                else -> this.gpuProfile
+            },
+        )
+    }
+
+    fun writeGameSettingsIni(global: Settings) {
+        val baseline = HashMap<String, String>()
+        emitSink = { section, key, _, value -> baseline["$section
$key"] = value }
+        try {
+            global.applyTo()
+        } finally {
+            emitSink = null
+        }
+        if (!NativeApp.gameIniBeginWrite()) return
+        emitSink = { section, key, _, value ->
+            if (baseline["$section
$key"] != value)
+                NativeApp.gameIniPut(section, key, value)
+        }
+        try {
+            applyTo()
+        } finally {
+            emitSink = null
+        }
+        NativeApp.gameIniCommitWrite()
+    }
+
+    private fun writeGsToNative() {
+        val aspectRatioName = when (aspectRatio.coerceIn(0, 4)) {
+            0 -> "Stretch"
+            2 -> "4:3"
+            3 -> "16:9"
+            4 -> "10:7"
+            else -> "Auto 4:3/3:2"
+        }
+        put("EmuCore/GS", "AspectRatio", "string", aspectRatioName)
+        val fmvAspectRatioName = when (fmvAspectRatio.coerceIn(0, 4)) {
+            1 -> "Auto 4:3/3:2"
+            2 -> "4:3"
+            3 -> "16:9"
+            4 -> "10:7"
+            else -> "Off"
+        }
+        put("EmuCore/GS", "FMVAspectRatioSwitch", "string", fmvAspectRatioName)
+        put("EmuCore/GS", "deinterlace_mode", "int", deinterlaceMode.coerceIn(0, 9).toString())
+        put("EmuCore/GS", "FramerateNTSC", "float", framerateNtsc.toString())
+        put("EmuCore/GS", "FrameratePAL", "float", frameratePal.toString())
+        put("EmuCore/GS", "hw_mipmap", "bool", hwMipmap.toString())
+        put("EmuCore/GS", "accurate_blending_unit", "int", accurateBlendingUnit.toString())
+        put("EmuCore/GS", "filter", "int", textureFiltering.toString())
+        put("EmuCore/GS", "linear_present_mode", "int", displayBilinear.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "texture_preloading", "int", texturePreloading.toString())
+        put("EmuCore/GS", "HWDownloadMode", "int", hardwareDownloadMode.coerceIn(0, 4).toString())
+        put("EmuCore/GS", "TVShader", "int", tvShader.coerceIn(0, 7).toString())
+        put("EmuCore/GS", "ShadeBoost", "bool", shadeBoost.toString())
+        put("EmuCore/GS", "ShadeBoost_Brightness", "int", shadeBoostBrightness.coerceIn(1, 100).toString())
+        put("EmuCore/GS", "ShadeBoost_Contrast", "int", shadeBoostContrast.coerceIn(1, 100).toString())
+        put("EmuCore/GS", "ShadeBoost_Saturation", "int", shadeBoostSaturation.coerceIn(1, 100).toString())
+        put("EmuCore/GS", "ShadeBoost_Gamma", "int", shadeBoostGamma.coerceIn(1, 100).toString())
+        put("EmuCore/GS", "fxaa", "bool", fxaa.toString())
+        put("EmuCore/GS", "ShaderChainEnabled", "bool", shaderChainEnabled.toString())
+        put("EmuCore/GS", "ShaderChainPreset", "string", shaderChainPreset)
+        put("EmuCore/GS", "ShaderChainParams", "string", shaderChainParamsToJson(shaderChainParams).toString())
+        if (emitSink == null)
+            ShaderParams.push(shaderChainPreset, shaderChainParams[shaderChainPreset].orEmpty())
+        put("EmuCore/GS", "CASMode", "int", casMode.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "CASSharpness", "int", casSharpness.coerceIn(0, 100).toString())
+        put("EmuCore/GS", "LoadTextureReplacements", "bool", loadTextureReplacements.toString())
+        put("EmuCore/GS", "LoadTextureReplacementsAsync", "bool", loadTextureReplacementsAsync.toString())
+        put("EmuCore/GS", "PrecacheTextureReplacements", "bool", precacheTextureReplacements.toString())
+        put("EmuCore/GS", "DumpReplaceableTextures", "bool", dumpReplaceableTextures.toString())
+        put("EmuCore/GS", "OsdShowTextureReplacements", "bool", osdShowTextureReplacements.toString())
+        put("EmuCore/GS", "OsdShowFPS", "bool", osdShowFps.toString())
+        put("EmuCore/GS", "OsdScale", "int", osdScale.coerceIn(25, 500).toString())
+        put("EmuCore/GS", "VsyncEnable", "bool", vsyncEnable.toString())
+        put("EmuCore/GS", "OsdShowVPS", "bool", osdShowVps.toString())
+        put("EmuCore/GS", "OsdShowSpeed", "bool", osdShowSpeed.toString())
+        put("EmuCore/GS", "OsdShowCPU", "bool", osdShowCpu.toString())
+        put("EmuCore/GS", "OsdShowGPU", "bool", osdShowGpu.toString())
+        put("EmuCore/GS", "OsdShowResolution", "bool", osdShowResolution.toString())
+        put("EmuCore/GS", "OsdShowGSStats", "bool", osdShowGsStats.toString())
+        put("EmuCore/GS", "OsdShowFrameTimes", "bool", osdShowFrameTimes.toString())
+        put("EmuCore/GS", "OsdShowHardwareInfo", "bool", osdShowHardwareInfo.toString())
+        put("EmuCore/GS", "OsdMessagesPos", "int", if (osdShowMessages) "1" else "0")
+        put("EmuCore/GS", "OsdShowGPUStats", "bool", osdShowGpuStats.toString())
+        put("EmuCore/GS", "OsdShowVersion", "bool", osdShowVersion.toString())
+        put("EmuCore/GS", "OsdShowSettings", "bool", osdShowSettings.toString())
+        put("EmuCore/GS", "OsdShowInputs", "bool", osdShowInputs.toString())
+        put("EmuCore/GS", "pcrtc_offsets", "bool", screenOffsets.toString())
+        put("EmuCore/GS", "pcrtc_overscan", "bool", showOverscan.toString())
+        put("EmuCore/GS", "pcrtc_antiblur", "bool", antiBlur.toString())
+        put("EmuCore/GS", "disable_interlace_offset", "bool", disableInterlaceOffset.toString())
+        put("EmuCore/GS", "SyncToHostRefreshRate", "bool", syncToHostRefresh.toString())
+        put("EmuCore/GS", "DisableFramebufferFetch", "bool", disableFramebufferFetch.toString())
+        put("EmuCore/GS", "HWROV", "bool", hwRov.toString())
+        put("EmuCore/GS", "HWAA1", "bool", hwAa1.toString())
+        put("EmuCore/GS", "EnableAdrenoFramebufferFetch", "bool", adrenoFbFetch.toString())
+        put("EmuCore/GS", "ForceMaliFramebufferFetch", "bool", forceMaliFbFetch.toString())
+        put("EmuCore/GS", "AndroidUseAngleOpenGL", "bool", useAngleOpenGL.toString())
+        put("EmuCore/GS", "OverrideTextureBarriers", "int", overrideTextureBarriers.coerceIn(-1, 1).toString())
+        put("EmuCore/GS", "DisableVertexShaderExpand", "bool", disableVertexShaderExpand.toString())
+        put("EmuCore/GS", "UseBlitSwapChain", "bool", useBlitSwapChain.toString())
+        put("EmuCore/GS", "DisableShaderCache", "bool", disableShaderCache.toString())
+        put("EmuCore/GS", "HWAccurateAlphaTest", "bool", hwAccurateAlphaTest.toString())
+        put("EmuCore/GS", "UserHacks_DrawBuffering", "bool", drawBuffering.toString())
+        put("EmuCore/GS", "HWSpinGPUForReadbacks", "bool", spinGpuReadbacks.toString())
+        put("EmuCore/GS", "HWSpinCPUForReadbacks", "bool", spinCpuReadbacks.toString())
+        put("EmuCore/GS", "IntegerScaling", "bool", integerScaling.toString())
+        put("EmuCore/GS", "dithering_ps2", "int", dithering.coerceIn(0, 3).toString())
+        put("EmuCore/GS", "VsyncQueueSize", "int", vsyncQueueSize.coerceIn(0, 3).toString())
+        put("EmuCore/GS", "autoflush_sw", "bool", autoFlushSw.toString())
+        put("EmuCore/GS", "mipmap", "bool", mipmapSw.toString())
+        put("EmuCore/GS", "extrathreads", "int", swThreads.coerceIn(0, 10).toString())
+        put("EmuCore/GS", "extrathreads_height", "int", swThreadsHeight.coerceIn(0, 8).toString())
+        put("EmuCore/GS", "UserHacks_SkipDraw_Start", "int", skipDrawStart.coerceAtLeast(0).toString())
+        put("EmuCore/GS", "UserHacks_SkipDraw_End", "int", skipDrawEnd.coerceAtLeast(0).toString())
+        put("EmuCore/GS", "UserHacks", "bool", anyUserHackEnabled().toString())
+        put("EmuCore/GS", "UserHacks_AutoFlushLevel", "int", autoFlush.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "UserHacks_HalfPixelOffset", "int", halfPixelOffset.coerceIn(0, 5).toString())
+        put("EmuCore/GS", "UserHacks_Limit24BitDepth", "int", limit24BitDepth.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "UserHacks_TextureInsideRt", "int", textureInsideRt.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "UserHacks_native_scaling", "int", nativeScaling.coerceIn(0, 4).toString())
+        put("EmuCore/GS", "UserHacks_round_sprite_offset", "int", roundSprite.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "UserHacks_BilinearHack", "int", bilinearUpscale.coerceIn(0, 3).toString())
+        put("EmuCore/GS", "UserHacks_GPUTargetCLUTMode", "int", gpuTargetClut.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "UserHacks_CPUSpriteRenderBW", "int", cpuSpriteRenderBw.coerceIn(0, 3).toString())
+        put("EmuCore/GS", "UserHacks_CPUSpriteRenderLevel", "int", cpuSpriteRenderLevel.coerceIn(0, 5).toString())
+        put("EmuCore/GS", "UserHacks_CPUCLUTRender", "int", cpuClutRender.coerceIn(0, 2).toString())
+        put("EmuCore/GS", "UserHacks_align_sprite_X", "bool", alignSprite.toString())
+        put("EmuCore/GS", "UserHacks_merge_pp_sprite", "bool", mergeSprite.toString())
+        put("EmuCore/GS", "UserHacks_ForceEvenSpritePosition", "bool", forceEvenSpritePosition.toString())
+        put("EmuCore/GS", "UserHacks_NativePaletteDraw", "bool", unscaledPaletteDraw.toString())
+        put("EmuCore/GS", "UserHacks_TCOffsetX", "int", textureOffsetX.coerceIn(0, 10000).toString())
+        put("EmuCore/GS", "UserHacks_TCOffsetY", "int", textureOffsetY.coerceIn(0, 10000).toString())
+        put("EmuCore/GS", "paltex", "bool", gpuPaletteConversion.toString())
+        put("EmuCore/GS", "UserHacks_CPU_FB_Conversion", "bool", cpuFramebufferConversion.toString())
+        put("EmuCore/GS", "UserHacks_ReadTCOnClose", "bool", readTargetsWhenClosing.toString())
+        put("EmuCore/GS", "UserHacks_DisableDepthSupport", "bool", disableDepthEmulation.toString())
+        put("EmuCore/GS", "UserHacks_DisablePartialInvalidation", "bool", disablePartialInvalidation.toString())
+        put("EmuCore/GS", "UserHacks_Disable_Safe_Features", "bool", disableSafeFeatures.toString())
+        put("EmuCore/GS", "UserHacks_DisableRenderFixes", "bool", disableRenderFixes.toString())
+        put("EmuCore/GS", "preload_frame_with_gs_data", "bool", preloadFrameData.toString())
+        put("EmuCore/GS", "UserHacks_EstimateTextureRegion", "bool", estimateTextureRegion.toString())
+        put("EmuCore/GS", "TriFilter", "int", triFilter.toString())
+        put("EmuCore/GS", "MaxAnisotropy", "int", maxAnisotropy.toString())
+        val gpuProfileStr = when (gpuProfile) {
+            1 -> "mali"
+            2 -> "adreno"
+            3 -> "powervr"
+            4 -> "xclipse"
+            else -> "auto"
+        }
+        put("EmuCore/GS", "AndroidGpuProfileOverride", "string", gpuProfileStr)
+    }
+
+    private fun anyUserHackEnabled(): Boolean =
+        manualUserHacks ||
+            autoFlush != 0 || halfPixelOffset != 0 || limit24BitDepth != 0 ||
+            textureInsideRt != 0 || nativeScaling != 0 || roundSprite != 0 ||
+            bilinearUpscale != 0 || gpuTargetClut != 0 || cpuSpriteRenderBw != 0 ||
+            cpuSpriteRenderLevel != 0 || cpuClutRender != 0 ||
+            textureOffsetX != 0 || textureOffsetY != 0 ||
+            alignSprite || mergeSprite || forceEvenSpritePosition || unscaledPaletteDraw ||
+            gpuPaletteConversion || cpuFramebufferConversion || readTargetsWhenClosing ||
+            disableDepthEmulation || disablePartialInvalidation || disableSafeFeatures ||
+            disableRenderFixes || preloadFrameData || estimateTextureRegion || drawBuffering ||
+            skipDrawStart != 0 || skipDrawEnd != 0
+
+    fun applyGsLive(): Boolean {
+        writeGsToNative()
+        return NativeApp.applyGSSettingsLive()
+    }
+
+    fun gsDiffersFrom(other: Settings): Boolean =
+        deinterlaceMode != other.deinterlaceMode ||
+            textureFiltering != other.textureFiltering ||
+            displayBilinear != other.displayBilinear ||
+            texturePreloading != other.texturePreloading ||
+            hardwareDownloadMode != other.hardwareDownloadMode ||
+            tvShader != other.tvShader ||
+            shadeBoost != other.shadeBoost ||
+            shadeBoostBrightness != other.shadeBoostBrightness ||
+            shadeBoostContrast != other.shadeBoostContrast ||
+            shadeBoostSaturation != other.shadeBoostSaturation ||
+            shadeBoostGamma != other.shadeBoostGamma ||
+            fxaa != other.fxaa ||
+            casMode != other.casMode ||
+            casSharpness != other.casSharpness ||
+            accurateBlendingUnit != other.accurateBlendingUnit ||
+            hwMipmap != other.hwMipmap ||
+            triFilter != other.triFilter ||
+            maxAnisotropy != other.maxAnisotropy ||
+            manualUserHacks != other.manualUserHacks ||
+            autoFlush != other.autoFlush ||
+            halfPixelOffset != other.halfPixelOffset ||
+            limit24BitDepth != other.limit24BitDepth ||
+            textureInsideRt != other.textureInsideRt ||
+            nativeScaling != other.nativeScaling ||
+            roundSprite != other.roundSprite ||
+            bilinearUpscale != other.bilinearUpscale ||
+            gpuTargetClut != other.gpuTargetClut ||
+            cpuSpriteRenderBw != other.cpuSpriteRenderBw ||
+            cpuSpriteRenderLevel != other.cpuSpriteRenderLevel ||
+            cpuClutRender != other.cpuClutRender ||
+            alignSprite != other.alignSprite ||
+            mergeSprite != other.mergeSprite ||
+            forceEvenSpritePosition != other.forceEvenSpritePosition ||
+            unscaledPaletteDraw != other.unscaledPaletteDraw ||
+            textureOffsetX != other.textureOffsetX ||
+            textureOffsetY != other.textureOffsetY ||
+            gpuPaletteConversion != other.gpuPaletteConversion ||
+            cpuFramebufferConversion != other.cpuFramebufferConversion ||
+            readTargetsWhenClosing != other.readTargetsWhenClosing ||
+            disableDepthEmulation != other.disableDepthEmulation ||
+            disablePartialInvalidation != other.disablePartialInvalidation ||
+            disableSafeFeatures != other.disableSafeFeatures ||
+            disableRenderFixes != other.disableRenderFixes ||
+            preloadFrameData != other.preloadFrameData ||
+            estimateTextureRegion != other.estimateTextureRegion ||
+            hwAccurateAlphaTest != other.hwAccurateAlphaTest ||
+            drawBuffering != other.drawBuffering ||
+            loadTextureReplacements != other.loadTextureReplacements ||
+            loadTextureReplacementsAsync != other.loadTextureReplacementsAsync ||
+            precacheTextureReplacements != other.precacheTextureReplacements ||
+            dumpReplaceableTextures != other.dumpReplaceableTextures ||
+            osdShowTextureReplacements != other.osdShowTextureReplacements
+
+    fun toJson(): JSONObject = JSONObject().apply {
+        put("eeCycleRate", eeCycleRate)
+        put("eeCycleSkip", eeCycleSkip)
+        put("eeClampMode", eeClampMode)
+        put("vuClampMode", vuClampMode)
+        put("mtvu", mtvu)
+        put("vu1Instant", vu1Instant)
+        put("vuFlagHack", vuFlagHack)
+        put("fastCDVD", fastCDVD)
+        put("intcStat", intcStat)
+        put("waitLoop", waitLoop)
+        put("vuNeonFusions", vuNeonFusions)
+        put("vuDeferredWrites", vuDeferredWrites)
+        put("vuSkipStallSim", vuSkipStallSim)
+        put("frameLimitEnable", frameLimitEnable)
+        put("nominalSpeedPercent", nominalSpeedPercent)
+        put("fpsLimit", fpsLimit)
+        put("frameSkip", frameSkip)
+        put("audioVolume", audioVolume)
+        put("audioMuted", audioMuted)
+        put("audioSwapChannels", audioSwapChannels)
+        put("audioTimeStretch", audioTimeStretch)
+        put("audioBufferMs", audioBufferMs)
+        put("audioOutputLatencyMs", audioOutputLatencyMs)
+        put("audioFastForwardVolume", audioFastForwardVolume)
+        put("spu2NeonReverb", spu2NeonReverb)
+        put("renderer", renderer)
+        put("upscaleFloat", upscaleFloat.toDouble())
+        put("framerateNtsc", framerateNtsc.toDouble())
+        put("frameratePal", frameratePal.toDouble())
+        put("enablePatches", enablePatches)
+        put("enableCheats", enableCheats)
+        put("enableWideScreenPatches", enableWideScreenPatches)
+        put("enableNoInterlacingPatches", enableNoInterlacingPatches)
+        put("enableFastBoot", enableFastBoot)
+        put("hostFs", hostFs)
+        put("enableGameFixes", enableGameFixes)
+        put("gamefixSoftwareRendererFmv", gamefixSoftwareRendererFmv)
+        put("gamefixSkipMpeg", gamefixSkipMpeg)
+        put("gamefixEETiming", gamefixEETiming)
+        put("gamefixInstantDma", gamefixInstantDma)
+        put("gamefixBlitInternalFps", gamefixBlitInternalFps)
+        put("gamefixFpuMul", gamefixFpuMul)
+        put("gamefixOphFlag", gamefixOphFlag)
+        put("gamefixGifFifo", gamefixGifFifo)
+        put("gamefixDmaBusy", gamefixDmaBusy)
+        put("gamefixVif1Stall", gamefixVif1Stall)
+        put("gamefixIbit", gamefixIbit)
+        put("gamefixFullVu0Sync", gamefixFullVu0Sync)
+        put("gamefixVuAddSub", gamefixVuAddSub)
+        put("gamefixVuOverflow", gamefixVuOverflow)
+        put("gamefixXgkick", gamefixXgkick)
+        put("gamefixGoemonTlb", gamefixGoemonTlb)
+        put("gamefixVuSync", gamefixVuSync)
+        put("skipDuplicateFrames", skipDuplicateFrames)
+        put("eeFpuRoundMode", eeFpuRoundMode)
+        put("vu0RoundMode", vu0RoundMode)
+        put("vu1RoundMode", vu1RoundMode)
+        put("screenOffsets", screenOffsets)
+        put("showOverscan", showOverscan)
+        put("antiBlur", antiBlur)
+        put("disableInterlaceOffset", disableInterlaceOffset)
+        put("syncToHostRefresh", syncToHostRefresh)
+        put("disableFramebufferFetch", disableFramebufferFetch)
+        put("hwRov", hwRov)
+        put("hwAa1", hwAa1)
+        put("adrenoFbFetch", adrenoFbFetch)
+        put("forceMaliFbFetch", forceMaliFbFetch)
+        put("useAngleOpenGL", useAngleOpenGL)
+        put("overrideTextureBarriers", overrideTextureBarriers)
+        put("disableVertexShaderExpand", disableVertexShaderExpand)
+        put("useBlitSwapChain", useBlitSwapChain)
+        put("disableShaderCache", disableShaderCache)
+        put("hwAccurateAlphaTest", hwAccurateAlphaTest)
+        put("skipDrawStart", skipDrawStart)
+        put("skipDrawEnd", skipDrawEnd)
+        put("spinGpuReadbacks", spinGpuReadbacks)
+        put("spinCpuReadbacks", spinCpuReadbacks)
+        put("integerScaling", integerScaling)
+        put("dithering", dithering)
+        put("vsyncQueueSize", vsyncQueueSize)
+        put("autoFlushSw", autoFlushSw)
+        put("mipmapSw", mipmapSw)
+        put("swThreads", swThreads)
+        put("swThreadsHeight", swThreadsHeight)
+        put("aspectRatio", aspectRatio)
+        put("fmvAspectRatio", fmvAspectRatio)
+        put("deinterlaceMode", deinterlaceMode)
+        put("dev9EthEnable", dev9EthEnable)
+        put("dev9EthApi", dev9EthApi)
+        put("dev9EthDevice", dev9EthDevice)
+        put("dev9EthLogDhcp", dev9EthLogDhcp)
+        put("dev9EthLogDns", dev9EthLogDns)
+        put("dev9InterceptDhcp", dev9InterceptDhcp)
+        put("dev9Ps2Ip", dev9Ps2Ip)
+        put("dev9Mask", dev9Mask)
+        put("dev9Gateway", dev9Gateway)
+        put("dev9Dns1", dev9Dns1)
+        put("dev9Dns2", dev9Dns2)
+        put("dev9AutoMask", dev9AutoMask)
+        put("dev9AutoGateway", dev9AutoGateway)
+        put("dev9ModeDns1", dev9ModeDns1)
+        put("dev9ModeDns2", dev9ModeDns2)
+        put("dev9EthHosts", JSONArray().apply {
+            dev9EthHosts.forEach { h ->
+                put(JSONObject().apply {
+                    put("url", h.url)
+                    put("ip", h.ip)
+                    put("enabled", h.enabled)
+                })
+            }
+        })
+        put("dev9HddEnable", dev9HddEnable)
+        put("dev9HddFile", dev9HddFile)
+        put("memoryCardSlot1Enabled", memoryCardSlot1Enabled)
+        put("memoryCardSlot1Filename", memoryCardSlot1Filename)
+        put("biosFilename", biosFilename)
+        put("memoryCardSlot2Enabled", memoryCardSlot2Enabled)
+        put("memoryCardSlot2Filename", memoryCardSlot2Filename)
+        put("usbKeyboard", usbKeyboard)
+        put("recEE", recEE)
+        put("recIOP", recIOP)
+        put("recVU0", recVU0)
+        put("recVU1", recVU1)
+        put("enableFastmem", enableFastmem)
+        put("vu1InlineFmacStall", vu1InlineFmacStall)
+        put("vu1CrossBlockPState", vu1CrossBlockPState)
+        put("vu1InlineDrainTestPipes", vu1InlineDrainTestPipes)
+        put("vu1FmacInstanceRouting", vu1FmacInstanceRouting)
+        put("hwMipmap", hwMipmap)
+        put("accurateBlendingUnit", accurateBlendingUnit)
+        put("textureFiltering", textureFiltering)
+        put("displayBilinear", displayBilinear)
+        put("texturePreloading", texturePreloading)
+        put("hardwareDownloadMode", hardwareDownloadMode)
+        put("tvShader", tvShader)
+        put("shadeBoost", shadeBoost)
+        put("shadeBoostBrightness", shadeBoostBrightness)
+        put("shadeBoostContrast", shadeBoostContrast)
+        put("shadeBoostSaturation", shadeBoostSaturation)
+        put("shadeBoostGamma", shadeBoostGamma)
+        put("fxaa", fxaa)
+        put("shaderChainEnabled", shaderChainEnabled)
+        put("shaderChainPreset", shaderChainPreset)
+        put("shaderChainParams", shaderChainParamsToJson(shaderChainParams))
+        put("casMode", casMode)
+        put("casSharpness", casSharpness)
+        put("loadTextureReplacements", loadTextureReplacements)
+        put("loadTextureReplacementsAsync", loadTextureReplacementsAsync)
+        put("precacheTextureReplacements", precacheTextureReplacements)
+        put("dumpReplaceableTextures", dumpReplaceableTextures)
+        put("osdShowTextureReplacements", osdShowTextureReplacements)
+        put("osdShowFps", osdShowFps)
+        put("osdScale", osdScale)
+        put("vsyncEnable", vsyncEnable)
+        put("osdShowVps", osdShowVps)
+        put("osdShowSpeed", osdShowSpeed)
+        put("osdShowCpu", osdShowCpu)
+        put("osdShowGpu", osdShowGpu)
+        put("osdShowResolution", osdShowResolution)
+        put("osdShowGsStats", osdShowGsStats)
+        put("osdShowFrameTimes", osdShowFrameTimes)
+        put("osdShowHardwareInfo", osdShowHardwareInfo)
+        put("osdShowMessages", osdShowMessages)
+        put("osdShowGpuStats", osdShowGpuStats)
+        put("osdShowVersion", osdShowVersion)
+        put("osdShowSettings", osdShowSettings)
+        put("osdShowInputs", osdShowInputs)
+        put("autoFlush", autoFlush)
+        put("halfPixelOffset", halfPixelOffset)
+        put("limit24BitDepth", limit24BitDepth)
+        put("manualUserHacks", manualUserHacks)
+        put("textureInsideRt", textureInsideRt)
+        put("nativeScaling", nativeScaling)
+        put("roundSprite", roundSprite)
+        put("bilinearUpscale", bilinearUpscale)
+        put("gpuTargetClut", gpuTargetClut)
+        put("cpuSpriteRenderBw", cpuSpriteRenderBw)
+        put("cpuSpriteRenderLevel", cpuSpriteRenderLevel)
+        put("alignSprite", alignSprite)
+        put("mergeSprite", mergeSprite)
+        put("forceEvenSpritePosition", forceEvenSpritePosition)
+        put("unscaledPaletteDraw", unscaledPaletteDraw)
+        put("textureOffsetX", textureOffsetX)
+        put("textureOffsetY", textureOffsetY)
+        put("gpuPaletteConversion", gpuPaletteConversion)
+        put("cpuFramebufferConversion", cpuFramebufferConversion)
+        put("readTargetsWhenClosing", readTargetsWhenClosing)
+        put("disableDepthEmulation", disableDepthEmulation)
+        put("disablePartialInvalidation", disablePartialInvalidation)
+        put("disableSafeFeatures", disableSafeFeatures)
+        put("disableRenderFixes", disableRenderFixes)
+        put("preloadFrameData", preloadFrameData)
+        put("estimateTextureRegion", estimateTextureRegion)
+        put("drawBuffering", drawBuffering)
+        put("cpuClutRender", cpuClutRender)
+        put("triFilter", triFilter)
+        put("maxAnisotropy", maxAnisotropy)
+        put("gpuProfile", gpuProfile)
+    }
+
+    companion object {
+        @JvmStatic
+        internal var emitSink: ((String, String, String, String) -> Unit)? = null
+
+        fun lowEndPreset(base: Settings, mtvu: Boolean): Settings = base.copy(
+            accurateBlendingUnit = 0,
+            upscaleFloat = 1.0f,
+            hwMipmap = false,
+            gpuPaletteConversion = false,
+            texturePreloading = 1,
+            hwRov = false,
+            eeCycleSkip = 1,
+            mtvu = mtvu,
+        )
+
+        fun fromJson(json: JSONObject): Settings {
+            val def = Settings()
+            return Settings(
+                eeCycleRate = json.optInt("eeCycleRate", def.eeCycleRate),
+                eeCycleSkip = json.optInt("eeCycleSkip", def.eeCycleSkip),
+                eeClampMode = json.optInt("eeClampMode", def.eeClampMode),
+                vuClampMode = json.optInt("vuClampMode", def.vuClampMode),
+                mtvu = json.optBoolean("mtvu", def.mtvu),
+                vu1Instant = json.optBoolean("vu1Instant", def.vu1Instant),
+                vuFlagHack = json.optBoolean("vuFlagHack", def.vuFlagHack),
+                fastCDVD = json.optBoolean("fastCDVD", def.fastCDVD),
+                intcStat = json.optBoolean("intcStat", def.intcStat),
+                waitLoop = json.optBoolean("waitLoop", def.waitLoop),
+                vuNeonFusions = json.optBoolean("vuNeonFusions", def.vuNeonFusions),
+                vuDeferredWrites = json.optBoolean("vuDeferredWrites", def.vuDeferredWrites),
+                vuSkipStallSim = json.optBoolean("vuSkipStallSim", def.vuSkipStallSim),
+                frameLimitEnable = json.optBoolean("frameLimitEnable", def.frameLimitEnable),
+                nominalSpeedPercent = json.optInt("nominalSpeedPercent", def.nominalSpeedPercent),
+                fpsLimit = json.optInt("fpsLimit", def.fpsLimit),
+                frameSkip = json.optInt("frameSkip", def.frameSkip),
+                audioVolume = json.optInt("audioVolume", def.audioVolume),
+                audioMuted = json.optBoolean("audioMuted", def.audioMuted),
+                audioSwapChannels = json.optBoolean("audioSwapChannels", def.audioSwapChannels),
+                audioTimeStretch = json.optBoolean("audioTimeStretch", def.audioTimeStretch),
+                audioBufferMs = json.optInt("audioBufferMs", def.audioBufferMs),
+                audioOutputLatencyMs = json.optInt("audioOutputLatencyMs", def.audioOutputLatencyMs),
+                audioFastForwardVolume = json.optInt("audioFastForwardVolume", def.audioFastForwardVolume),
+                spu2NeonReverb = json.optBoolean("spu2NeonReverb", def.spu2NeonReverb),
+                renderer = json.optString("renderer", def.renderer),
+                upscaleFloat = json.optDouble("upscaleFloat", def.upscaleFloat.toDouble()).toFloat(),
+                framerateNtsc = json.optDouble("framerateNtsc", def.framerateNtsc.toDouble()).toFloat(),
+                frameratePal = json.optDouble("frameratePal", def.frameratePal.toDouble()).toFloat(),
+                enablePatches = json.optBoolean("enablePatches", def.enablePatches),
+                enableCheats = json.optBoolean("enableCheats", def.enableCheats),
+                enableWideScreenPatches = json.optBoolean("enableWideScreenPatches", def.enableWideScreenPatches),
+                enableNoInterlacingPatches = json.optBoolean("enableNoInterlacingPatches", def.enableNoInterlacingPatches),
+                enableFastBoot = json.optBoolean("enableFastBoot", def.enableFastBoot),
+                hostFs = json.optBoolean("hostFs", def.hostFs),
+                enableGameFixes = json.optBoolean("enableGameFixes", def.enableGameFixes),
+                gamefixSoftwareRendererFmv = json.optBoolean("gamefixSoftwareRendererFmv", def.gamefixSoftwareRendererFmv),
+                gamefixSkipMpeg = json.optBoolean("gamefixSkipMpeg", def.gamefixSkipMpeg),
+                gamefixEETiming = json.optBoolean("gamefixEETiming", def.gamefixEETiming),
+                gamefixInstantDma = json.optBoolean("gamefixInstantDma", def.gamefixInstantDma),
+                gamefixBlitInternalFps = json.optBoolean("gamefixBlitInternalFps", def.gamefixBlitInternalFps),
+                gamefixFpuMul = json.optBoolean("gamefixFpuMul", def.gamefixFpuMul),
+                gamefixOphFlag = json.optBoolean("gamefixOphFlag", def.gamefixOphFlag),
+                gamefixGifFifo = json.optBoolean("gamefixGifFifo", def.gamefixGifFifo),
+                gamefixDmaBusy = json.optBoolean("gamefixDmaBusy", def.gamefixDmaBusy),
+                gamefixVif1Stall = json.optBoolean("gamefixVif1Stall", def.gamefixVif1Stall),
+                gamefixIbit = json.optBoolean("gamefixIbit", def.gamefixIbit),
+                gamefixFullVu0Sync = json.optBoolean("gamefixFullVu0Sync", def.gamefixFullVu0Sync),
+                gamefixVuAddSub = json.optBoolean("gamefixVuAddSub", def.gamefixVuAddSub),
+                gamefixVuOverflow = json.optBoolean("gamefixVuOverflow", def.gamefixVuOverflow),
+                gamefixXgkick = json.optBoolean("gamefixXgkick", def.gamefixXgkick),
+                gamefixGoemonTlb = json.optBoolean("gamefixGoemonTlb", def.gamefixGoemonTlb),
+                gamefixVuSync = json.optBoolean("gamefixVuSync", def.gamefixVuSync),
+                skipDuplicateFrames = json.optBoolean("skipDuplicateFrames", def.skipDuplicateFrames),
+                eeFpuRoundMode = json.optInt("eeFpuRoundMode", def.eeFpuRoundMode),
+                vu0RoundMode = json.optInt("vu0RoundMode", def.vu0RoundMode),
+                vu1RoundMode = json.optInt("vu1RoundMode", def.vu1RoundMode),
+                screenOffsets = json.optBoolean("screenOffsets", def.screenOffsets),
+                showOverscan = json.optBoolean("showOverscan", def.showOverscan),
+                antiBlur = json.optBoolean("antiBlur", def.antiBlur),
+                disableInterlaceOffset = json.optBoolean("disableInterlaceOffset", def.disableInterlaceOffset),
+                syncToHostRefresh = json.optBoolean("syncToHostRefresh", def.syncToHostRefresh),
+                disableFramebufferFetch = json.optBoolean("disableFramebufferFetch", def.disableFramebufferFetch),
+                hwRov = json.optBoolean("hwRov", def.hwRov),
+                hwAa1 = json.optBoolean("hwAa1", def.hwAa1),
+                hwAat = false,
+                adrenoFbFetch = json.optBoolean("adrenoFbFetch", def.adrenoFbFetch),
+                forceMaliFbFetch = json.optBoolean("forceMaliFbFetch", def.forceMaliFbFetch),
+                useAngleOpenGL = json.optBoolean("useAngleOpenGL", def.useAngleOpenGL),
+                overrideTextureBarriers = json.optInt("overrideTextureBarriers", def.overrideTextureBarriers),
+                disableVertexShaderExpand = json.optBoolean("disableVertexShaderExpand", def.disableVertexShaderExpand),
+                useBlitSwapChain = json.optBoolean("useBlitSwapChain", def.useBlitSwapChain),
+                disableShaderCache = json.optBoolean("disableShaderCache", def.disableShaderCache),
+                hwAccurateAlphaTest = json.optBoolean(
+                    "hwAccurateAlphaTest",
+                    json.optBoolean("hwAat", def.hwAccurateAlphaTest),
+                ),
+                skipDrawStart = json.optInt("skipDrawStart", def.skipDrawStart),
+                skipDrawEnd = json.optInt("skipDrawEnd", def.skipDrawEnd),
+                spinGpuReadbacks = json.optBoolean("spinGpuReadbacks", def.spinGpuReadbacks),
+                spinCpuReadbacks = json.optBoolean("spinCpuReadbacks", def.spinCpuReadbacks),
+                integerScaling = json.optBoolean("integerScaling", def.integerScaling),
+                dithering = json.optInt("dithering", def.dithering),
+                vsyncQueueSize = json.optInt("vsyncQueueSize", def.vsyncQueueSize),
+                autoFlushSw = json.optBoolean("autoFlushSw", def.autoFlushSw),
+                mipmapSw = json.optBoolean("mipmapSw", def.mipmapSw),
+                swThreads = json.optInt("swThreads", def.swThreads),
+                swThreadsHeight = json.optInt("swThreadsHeight", def.swThreadsHeight),
+                aspectRatio = json.optInt("aspectRatio", def.aspectRatio),
+                fmvAspectRatio = json.optInt("fmvAspectRatio", def.fmvAspectRatio),
+                deinterlaceMode = json.optInt("deinterlaceMode", def.deinterlaceMode),
+                dev9EthEnable = json.optBoolean("dev9EthEnable", def.dev9EthEnable),
+                dev9EthApi = json.optString("dev9EthApi", def.dev9EthApi).ifEmpty { def.dev9EthApi },
+                dev9EthDevice = json.optString("dev9EthDevice", def.dev9EthDevice).ifEmpty { def.dev9EthDevice },
+                dev9EthLogDhcp = json.optBoolean("dev9EthLogDhcp", def.dev9EthLogDhcp),
+                dev9EthLogDns = json.optBoolean("dev9EthLogDns", def.dev9EthLogDns),
+                dev9InterceptDhcp = json.optBoolean("dev9InterceptDhcp", def.dev9InterceptDhcp),
+                dev9Ps2Ip = json.optString("dev9Ps2Ip", def.dev9Ps2Ip).ifEmpty { def.dev9Ps2Ip },
+                dev9Mask = json.optString("dev9Mask", def.dev9Mask).ifEmpty { def.dev9Mask },
+                dev9Gateway = json.optString("dev9Gateway", def.dev9Gateway).ifEmpty { def.dev9Gateway },
+                dev9Dns1 = json.optString("dev9Dns1", def.dev9Dns1).ifEmpty { def.dev9Dns1 },
+                dev9Dns2 = json.optString("dev9Dns2", def.dev9Dns2).ifEmpty { def.dev9Dns2 },
+                dev9AutoMask = json.optBoolean("dev9AutoMask", def.dev9AutoMask),
+                dev9AutoGateway = json.optBoolean("dev9AutoGateway", def.dev9AutoGateway),
+                dev9ModeDns1 = json.optString("dev9ModeDns1", def.dev9ModeDns1).ifEmpty { def.dev9ModeDns1 },
+                dev9ModeDns2 = json.optString("dev9ModeDns2", def.dev9ModeDns2).ifEmpty { def.dev9ModeDns2 },
+                dev9EthHosts = json.optJSONArray("dev9EthHosts")?.let { arr ->
+                    (0 until arr.length()).mapNotNull { idx ->
+                        arr.optJSONObject(idx)?.let { o ->
+                            Dev9HostMapping(
+                                url = o.optString("url", ""),
+                                ip = o.optString("ip", "0.0.0.0").ifEmpty { "0.0.0.0" },
+                                enabled = o.optBoolean("enabled", true),
+                            )
+                        }
+                    }.filter { it.url.isNotBlank() }
+                } ?: def.dev9EthHosts,
+                dev9HddEnable = json.optBoolean("dev9HddEnable", def.dev9HddEnable),
+                dev9HddFile = json.optString("dev9HddFile", def.dev9HddFile).ifEmpty { def.dev9HddFile },
+                memoryCardSlot1Enabled = json.optBoolean("memoryCardSlot1Enabled", def.memoryCardSlot1Enabled),
+                memoryCardSlot1Filename = json.optString("memoryCardSlot1Filename", def.memoryCardSlot1Filename).ifEmpty { def.memoryCardSlot1Filename },
+                biosFilename = json.optString("biosFilename", def.biosFilename),
+                memoryCardSlot2Enabled = json.optBoolean("memoryCardSlot2Enabled", def.memoryCardSlot2Enabled),
+                memoryCardSlot2Filename = json.optString("memoryCardSlot2Filename", def.memoryCardSlot2Filename).ifEmpty { def.memoryCardSlot2Filename },
+                usbKeyboard = json.optBoolean("usbKeyboard", def.usbKeyboard),
+                recEE = json.optBoolean("recEE", def.recEE),
+                recIOP = json.optBoolean("recIOP", def.recIOP),
+                recVU0 = json.optBoolean("recVU0", def.recVU0),
+                recVU1 = json.optBoolean("recVU1", def.recVU1),
+                enableFastmem = json.optBoolean("enableFastmem", def.enableFastmem),
+                useMacEE = true,
+                useMacIOP = true,
+                useMacVU0 = true,
+                useMacVU1 = true,
+                vu1InlineFmacStall = json.optBoolean("vu1InlineFmacStall", def.vu1InlineFmacStall),
+                vu1CrossBlockPState = json.optBoolean("vu1CrossBlockPState", def.vu1CrossBlockPState),
+                vu1InlineDrainTestPipes = json.optBoolean("vu1InlineDrainTestPipes", def.vu1InlineDrainTestPipes),
+                vu1FmacInstanceRouting = json.optBoolean("vu1FmacInstanceRouting", def.vu1FmacInstanceRouting),
+                hwMipmap = json.optBoolean("hwMipmap", def.hwMipmap),
+                accurateBlendingUnit = json.optInt("accurateBlendingUnit", def.accurateBlendingUnit),
+                textureFiltering = json.optInt("textureFiltering", def.textureFiltering),
+                displayBilinear = json.optInt("displayBilinear", def.displayBilinear),
+                texturePreloading = json.optInt("texturePreloading", def.texturePreloading),
+                hardwareDownloadMode = json.optInt("hardwareDownloadMode", def.hardwareDownloadMode),
+                tvShader = json.optInt("tvShader", def.tvShader),
+                shadeBoost = json.optBoolean("shadeBoost", def.shadeBoost),
+                shadeBoostBrightness = json.optInt("shadeBoostBrightness", def.shadeBoostBrightness),
+                shadeBoostContrast = json.optInt("shadeBoostContrast", def.shadeBoostContrast),
+                shadeBoostSaturation = json.optInt("shadeBoostSaturation", def.shadeBoostSaturation),
+                shadeBoostGamma = json.optInt("shadeBoostGamma", def.shadeBoostGamma),
+                fxaa = json.optBoolean("fxaa", def.fxaa),
+                shaderChainEnabled = json.optBoolean("shaderChainEnabled", def.shaderChainEnabled),
+                shaderChainPreset = json.optString("shaderChainPreset", def.shaderChainPreset),
+                shaderChainParams = json.optJSONObject("shaderChainParams")
+                    ?.let { shaderChainParamsFromJson(it) } ?: def.shaderChainParams,
+                casMode = json.optInt("casMode", def.casMode),
+                casSharpness = json.optInt("casSharpness", def.casSharpness),
+                loadTextureReplacements = json.optBoolean("loadTextureReplacements", def.loadTextureReplacements),
+                loadTextureReplacementsAsync = json.optBoolean("loadTextureReplacementsAsync", def.loadTextureReplacementsAsync),
+                precacheTextureReplacements = json.optBoolean("precacheTextureReplacements", def.precacheTextureReplacements),
+                dumpReplaceableTextures = json.optBoolean("dumpReplaceableTextures", def.dumpReplaceableTextures),
+                osdShowTextureReplacements = json.optBoolean("osdShowTextureReplacements", def.osdShowTextureReplacements),
+                osdShowFps = json.optBoolean("osdShowFps", def.osdShowFps),
+                osdScale = json.optInt("osdScale", def.osdScale),
+                vsyncEnable = json.optBoolean("vsyncEnable", def.vsyncEnable),
+                osdShowVps = json.optBoolean("osdShowVps", def.osdShowVps),
+                osdShowSpeed = json.optBoolean("osdShowSpeed", def.osdShowSpeed),
+                osdShowCpu = json.optBoolean("osdShowCpu", def.osdShowCpu),
+                osdShowGpu = json.optBoolean("osdShowGpu", def.osdShowGpu),
+                osdShowResolution = json.optBoolean("osdShowResolution", def.osdShowResolution),
+                osdShowGsStats = json.optBoolean("osdShowGsStats", def.osdShowGsStats),
+                osdShowFrameTimes = json.optBoolean("osdShowFrameTimes", def.osdShowFrameTimes),
+                osdShowHardwareInfo = json.optBoolean("osdShowHardwareInfo", def.osdShowHardwareInfo),
+                osdShowMessages = json.optBoolean("osdShowMessages", def.osdShowMessages),
+                osdShowGpuStats = json.optBoolean("osdShowGpuStats", def.osdShowGpuStats),
+                osdShowVersion = json.optBoolean("osdShowVersion", def.osdShowVersion),
+                osdShowSettings = json.optBoolean("osdShowSettings", def.osdShowSettings),
+                osdShowInputs = json.optBoolean("osdShowInputs", def.osdShowInputs),
+                autoFlush = json.optInt("autoFlush", def.autoFlush),
+                halfPixelOffset = json.optInt("halfPixelOffset", def.halfPixelOffset),
+                limit24BitDepth = json.optInt("limit24BitDepth", def.limit24BitDepth),
+                manualUserHacks = json.optBoolean("manualUserHacks", def.manualUserHacks),
+                textureInsideRt = json.optInt("textureInsideRt", def.textureInsideRt),
+                nativeScaling = json.optInt("nativeScaling", def.nativeScaling),
+                roundSprite = json.optInt("roundSprite", def.roundSprite),
+                bilinearUpscale = json.optInt("bilinearUpscale", def.bilinearUpscale),
+                gpuTargetClut = json.optInt("gpuTargetClut", def.gpuTargetClut),
+                cpuSpriteRenderBw = json.optInt("cpuSpriteRenderBw", def.cpuSpriteRenderBw),
+                cpuSpriteRenderLevel = json.optInt("cpuSpriteRenderLevel", def.cpuSpriteRenderLevel),
+                alignSprite = json.optBoolean("alignSprite", def.alignSprite),
+                mergeSprite = json.optBoolean("mergeSprite", def.mergeSprite),
+                forceEvenSpritePosition = json.optBoolean("forceEvenSpritePosition", def.forceEvenSpritePosition),
+                unscaledPaletteDraw = json.optBoolean("unscaledPaletteDraw", def.unscaledPaletteDraw),
+                textureOffsetX = json.optInt("textureOffsetX", def.textureOffsetX),
+                textureOffsetY = json.optInt("textureOffsetY", def.textureOffsetY),
+                gpuPaletteConversion = json.optBoolean("gpuPaletteConversion", def.gpuPaletteConversion),
+                cpuFramebufferConversion = json.optBoolean("cpuFramebufferConversion", def.cpuFramebufferConversion),
+                readTargetsWhenClosing = json.optBoolean("readTargetsWhenClosing", def.readTargetsWhenClosing),
+                disableDepthEmulation = json.optBoolean("disableDepthEmulation", def.disableDepthEmulation),
+                disablePartialInvalidation = json.optBoolean("disablePartialInvalidation", def.disablePartialInvalidation),
+                disableSafeFeatures = json.optBoolean("disableSafeFeatures", def.disableSafeFeatures),
+                disableRenderFixes = json.optBoolean("disableRenderFixes", def.disableRenderFixes),
+                preloadFrameData = json.optBoolean("preloadFrameData", def.preloadFrameData),
+                estimateTextureRegion = json.optBoolean("estimateTextureRegion", def.estimateTextureRegion),
+                drawBuffering = json.optBoolean("drawBuffering", def.drawBuffering),
+                cpuClutRender = json.optInt("cpuClutRender", def.cpuClutRender),
+                triFilter = json.optInt("triFilter", def.triFilter),
+                maxAnisotropy = json.optInt("maxAnisotropy", def.maxAnisotropy),
+                gpuProfile = json.optInt("gpuProfile", def.gpuProfile),
+            )
+        }
+
+        fun diff(base: Settings, current: Settings): JSONObject {
+            val j = JSONObject()
+            if (current.eeCycleRate         != base.eeCycleRate)         j.put("eeCycleRate", current.eeCycleRate)
+            if (current.eeCycleSkip         != base.eeCycleSkip)         j.put("eeCycleSkip", current.eeCycleSkip)
+            if (current.eeClampMode         != base.eeClampMode)         j.put("eeClampMode", current.eeClampMode)
+            if (current.vuClampMode         != base.vuClampMode)         j.put("vuClampMode", current.vuClampMode)
+            if (current.mtvu                != base.mtvu)                j.put("mtvu", current.mtvu)
+            if (current.vu1Instant          != base.vu1Instant)          j.put("vu1Instant", current.vu1Instant)
+            if (current.vuFlagHack          != base.vuFlagHack)          j.put("vuFlagHack", current.vuFlagHack)
+            if (current.fastCDVD            != base.fastCDVD)            j.put("fastCDVD", current.fastCDVD)
+            if (current.intcStat            != base.intcStat)            j.put("intcStat", current.intcStat)
+            if (current.waitLoop            != base.waitLoop)            j.put("waitLoop", current.waitLoop)
+            if (current.vuNeonFusions       != base.vuNeonFusions)       j.put("vuNeonFusions", current.vuNeonFusions)
+            if (current.vuDeferredWrites    != base.vuDeferredWrites)    j.put("vuDeferredWrites", current.vuDeferredWrites)
+            if (current.vuSkipStallSim      != base.vuSkipStallSim)      j.put("vuSkipStallSim", current.vuSkipStallSim)
+            if (current.frameLimitEnable    != base.frameLimitEnable)    j.put("frameLimitEnable", current.frameLimitEnable)
+            if (current.nominalSpeedPercent != base.nominalSpeedPercent) j.put("nominalSpeedPercent", current.nominalSpeedPercent)
+            if (current.fpsLimit            != base.fpsLimit)            j.put("fpsLimit", current.fpsLimit)
+            if (current.frameSkip != base.frameSkip) j.put("frameSkip", current.frameSkip)
+            if (current.audioVolume != base.audioVolume) j.put("audioVolume", current.audioVolume)
+            if (current.audioMuted != base.audioMuted) j.put("audioMuted", current.audioMuted)
+            if (current.audioSwapChannels != base.audioSwapChannels) j.put("audioSwapChannels", current.audioSwapChannels)
+            if (current.audioTimeStretch != base.audioTimeStretch) j.put("audioTimeStretch", current.audioTimeStretch)
+            if (current.audioBufferMs != base.audioBufferMs) j.put("audioBufferMs", current.audioBufferMs)
+            if (current.audioOutputLatencyMs != base.audioOutputLatencyMs) j.put("audioOutputLatencyMs", current.audioOutputLatencyMs)
+            if (current.audioFastForwardVolume != base.audioFastForwardVolume) j.put("audioFastForwardVolume", current.audioFastForwardVolume)
+            if (current.spu2NeonReverb != base.spu2NeonReverb) j.put("spu2NeonReverb", current.spu2NeonReverb)
+            if (current.renderer != base.renderer) j.put("renderer", current.renderer)
+            if (current.upscaleFloat != base.upscaleFloat) j.put("upscaleFloat", current.upscaleFloat.toDouble())
+            if (current.framerateNtsc != base.framerateNtsc) j.put("framerateNtsc", current.framerateNtsc.toDouble())
+            if (current.frameratePal != base.frameratePal) j.put("frameratePal", current.frameratePal.toDouble())
+            if (current.enablePatches != base.enablePatches) j.put("enablePatches", current.enablePatches)
+            if (current.enableCheats != base.enableCheats) j.put("enableCheats", current.enableCheats)
+            if (current.enableWideScreenPatches != base.enableWideScreenPatches) j.put("enableWideScreenPatches", current.enableWideScreenPatches)
+            if (current.enableNoInterlacingPatches != base.enableNoInterlacingPatches) j.put("enableNoInterlacingPatches", current.enableNoInterlacingPatches)
+            if (current.enableFastBoot != base.enableFastBoot) j.put("enableFastBoot", current.enableFastBoot)
+            if (current.hostFs != base.hostFs) j.put("hostFs", current.hostFs)
+            if (current.enableGameFixes != base.enableGameFixes) j.put("enableGameFixes", current.enableGameFixes)
+            if (current.gamefixSoftwareRendererFmv != base.gamefixSoftwareRendererFmv) j.put("gamefixSoftwareRendererFmv", current.gamefixSoftwareRendererFmv)
+            if (current.gamefixSkipMpeg != base.gamefixSkipMpeg) j.put("gamefixSkipMpeg", current.gamefixSkipMpeg)
+            if (current.gamefixEETiming != base.gamefixEETiming) j.put("gamefixEETiming", current.gamefixEETiming)
+            if (current.gamefixInstantDma != base.gamefixInstantDma) j.put("gamefixInstantDma", current.gamefixInstantDma)
+            if (current.gamefixBlitInternalFps != base.gamefixBlitInternalFps) j.put("gamefixBlitInternalFps", current.gamefixBlitInternalFps)
+            if (current.gamefixFpuMul        != base.gamefixFpuMul)        j.put("gamefixFpuMul", current.gamefixFpuMul)
+            if (current.gamefixOphFlag       != base.gamefixOphFlag)       j.put("gamefixOphFlag", current.gamefixOphFlag)
+            if (current.gamefixGifFifo       != base.gamefixGifFifo)       j.put("gamefixGifFifo", current.gamefixGifFifo)
+            if (current.gamefixDmaBusy       != base.gamefixDmaBusy)       j.put("gamefixDmaBusy", current.gamefixDmaBusy)
+            if (current.gamefixVif1Stall     != base.gamefixVif1Stall)     j.put("gamefixVif1Stall", current.gamefixVif1Stall)
+            if (current.gamefixIbit          != base.gamefixIbit)          j.put("gamefixIbit", current.gamefixIbit)
+            if (current.gamefixFullVu0Sync   != base.gamefixFullVu0Sync)   j.put("gamefixFullVu0Sync", current.gamefixFullVu0Sync)
+            if (current.gamefixVuAddSub      != base.gamefixVuAddSub)      j.put("gamefixVuAddSub", current.gamefixVuAddSub)
+            if (current.gamefixVuOverflow    != base.gamefixVuOverflow)    j.put("gamefixVuOverflow", current.gamefixVuOverflow)
+            if (current.gamefixXgkick        != base.gamefixXgkick)        j.put("gamefixXgkick", current.gamefixXgkick)
+            if (current.gamefixGoemonTlb     != base.gamefixGoemonTlb)     j.put("gamefixGoemonTlb", current.gamefixGoemonTlb)
+            if (current.gamefixVuSync        != base.gamefixVuSync)        j.put("gamefixVuSync", current.gamefixVuSync)
+            if (current.skipDuplicateFrames  != base.skipDuplicateFrames)  j.put("skipDuplicateFrames", current.skipDuplicateFrames)
+            if (current.eeFpuRoundMode       != base.eeFpuRoundMode)       j.put("eeFpuRoundMode", current.eeFpuRoundMode)
+            if (current.vu0RoundMode         != base.vu0RoundMode)         j.put("vu0RoundMode", current.vu0RoundMode)
+            if (current.vu1RoundMode         != base.vu1RoundMode)         j.put("vu1RoundMode", current.vu1RoundMode)
+            if (current.screenOffsets        != base.screenOffsets)        j.put("screenOffsets", current.screenOffsets)
+            if (current.showOverscan         != base.showOverscan)         j.put("showOverscan", current.showOverscan)
+            if (current.antiBlur             != base.antiBlur)             j.put("antiBlur", current.antiBlur)
+            if (current.disableInterlaceOffset != base.disableInterlaceOffset) j.put("disableInterlaceOffset", current.disableInterlaceOffset)
+            if (current.syncToHostRefresh    != base.syncToHostRefresh)    j.put("syncToHostRefresh", current.syncToHostRefresh)
+            if (current.disableFramebufferFetch != base.disableFramebufferFetch) j.put("disableFramebufferFetch", current.disableFramebufferFetch)
+            if (current.hwRov != base.hwRov) j.put("hwRov", current.hwRov)
+            if (current.hwAa1 != base.hwAa1) j.put("hwAa1", current.hwAa1)
+            if (current.adrenoFbFetch != base.adrenoFbFetch) j.put("adrenoFbFetch", current.adrenoFbFetch)
+            if (current.forceMaliFbFetch != base.forceMaliFbFetch) j.put("forceMaliFbFetch", current.forceMaliFbFetch)
+            if (current.useAngleOpenGL != base.useAngleOpenGL) j.put("useAngleOpenGL", current.useAngleOpenGL)
+            if (current.overrideTextureBarriers != base.overrideTextureBarriers) j.put("overrideTextureBarriers", current.overrideTextureBarriers)
+            if (current.disableVertexShaderExpand != base.disableVertexShaderExpand) j.put("disableVertexShaderExpand", current.disableVertexShaderExpand)
+            if (current.useBlitSwapChain     != base.useBlitSwapChain)     j.put("useBlitSwapChain", current.useBlitSwapChain)
+            if (current.disableShaderCache   != base.disableShaderCache)   j.put("disableShaderCache", current.disableShaderCache)
+            if (current.hwAccurateAlphaTest  != base.hwAccurateAlphaTest)  j.put("hwAccurateAlphaTest", current.hwAccurateAlphaTest)
+            if (current.skipDrawStart        != base.skipDrawStart)        j.put("skipDrawStart", current.skipDrawStart)
+            if (current.skipDrawEnd          != base.skipDrawEnd)          j.put("skipDrawEnd", current.skipDrawEnd)
+            if (current.spinGpuReadbacks     != base.spinGpuReadbacks)     j.put("spinGpuReadbacks", current.spinGpuReadbacks)
+            if (current.spinCpuReadbacks     != base.spinCpuReadbacks)     j.put("spinCpuReadbacks", current.spinCpuReadbacks)
+            if (current.integerScaling       != base.integerScaling)       j.put("integerScaling", current.integerScaling)
+            if (current.dithering            != base.dithering)            j.put("dithering", current.dithering)
+            if (current.vsyncQueueSize       != base.vsyncQueueSize)       j.put("vsyncQueueSize", current.vsyncQueueSize)
+            if (current.autoFlushSw          != base.autoFlushSw)          j.put("autoFlushSw", current.autoFlushSw)
+            if (current.mipmapSw             != base.mipmapSw)             j.put("mipmapSw", current.mipmapSw)
+            if (current.swThreads            != base.swThreads)            j.put("swThreads", current.swThreads)
+            if (current.swThreadsHeight      != base.swThreadsHeight)      j.put("swThreadsHeight", current.swThreadsHeight)
+            if (current.aspectRatio         != base.aspectRatio)         j.put("aspectRatio", current.aspectRatio)
+            if (current.fmvAspectRatio      != base.fmvAspectRatio)      j.put("fmvAspectRatio", current.fmvAspectRatio)
+            if (current.deinterlaceMode     != base.deinterlaceMode)     j.put("deinterlaceMode", current.deinterlaceMode)
+            if (current.dev9EthEnable       != base.dev9EthEnable)       j.put("dev9EthEnable", current.dev9EthEnable)
+            if (current.dev9EthApi          != base.dev9EthApi)          j.put("dev9EthApi", current.dev9EthApi)
+            if (current.dev9EthDevice       != base.dev9EthDevice)       j.put("dev9EthDevice", current.dev9EthDevice)
+            if (current.dev9EthLogDhcp      != base.dev9EthLogDhcp)      j.put("dev9EthLogDhcp", current.dev9EthLogDhcp)
+            if (current.dev9EthLogDns       != base.dev9EthLogDns)       j.put("dev9EthLogDns", current.dev9EthLogDns)
+            if (current.dev9InterceptDhcp   != base.dev9InterceptDhcp)   j.put("dev9InterceptDhcp", current.dev9InterceptDhcp)
+            if (current.dev9Ps2Ip           != base.dev9Ps2Ip)           j.put("dev9Ps2Ip", current.dev9Ps2Ip)
+            if (current.dev9Mask            != base.dev9Mask)            j.put("dev9Mask", current.dev9Mask)
+            if (current.dev9Gateway         != base.dev9Gateway)         j.put("dev9Gateway", current.dev9Gateway)
+            if (current.dev9Dns1            != base.dev9Dns1)            j.put("dev9Dns1", current.dev9Dns1)
+            if (current.dev9Dns2            != base.dev9Dns2)            j.put("dev9Dns2", current.dev9Dns2)
+            if (current.dev9AutoMask        != base.dev9AutoMask)        j.put("dev9AutoMask", current.dev9AutoMask)
+            if (current.dev9AutoGateway     != base.dev9AutoGateway)     j.put("dev9AutoGateway", current.dev9AutoGateway)
+            if (current.dev9ModeDns1        != base.dev9ModeDns1)        j.put("dev9ModeDns1", current.dev9ModeDns1)
+            if (current.dev9ModeDns2        != base.dev9ModeDns2)        j.put("dev9ModeDns2", current.dev9ModeDns2)
+            if (current.dev9EthHosts        != base.dev9EthHosts) {
+                j.put("dev9EthHosts", JSONArray().apply {
+                    current.dev9EthHosts.forEach { host ->
+                        put(JSONObject().apply {
+                            put("url", host.url)
+                            put("ip", host.ip)
+                            put("enabled", host.enabled)
+                        })
+                    }
+                })
+            }
+            if (current.dev9HddEnable       != base.dev9HddEnable)       j.put("dev9HddEnable", current.dev9HddEnable)
+            if (current.dev9HddFile         != base.dev9HddFile)         j.put("dev9HddFile", current.dev9HddFile)
+            if (current.memoryCardSlot1Enabled != base.memoryCardSlot1Enabled) j.put("memoryCardSlot1Enabled", current.memoryCardSlot1Enabled)
+            if (current.memoryCardSlot1Filename != base.memoryCardSlot1Filename) j.put("memoryCardSlot1Filename", current.memoryCardSlot1Filename)
+            if (current.biosFilename != base.biosFilename) j.put("biosFilename", current.biosFilename)
+            if (current.memoryCardSlot2Enabled != base.memoryCardSlot2Enabled) j.put("memoryCardSlot2Enabled", current.memoryCardSlot2Enabled)
+            if (current.memoryCardSlot2Filename != base.memoryCardSlot2Filename) j.put("memoryCardSlot2Filename", current.memoryCardSlot2Filename)
+            if (current.usbKeyboard         != base.usbKeyboard)         j.put("usbKeyboard", current.usbKeyboard)
+            if (current.recEE               != base.recEE)               j.put("recEE", current.recEE)
+            if (current.recIOP              != base.recIOP)              j.put("recIOP", current.recIOP)
+            if (current.recVU0              != base.recVU0)              j.put("recVU0", current.recVU0)
+            if (current.recVU1              != base.recVU1)              j.put("recVU1", current.recVU1)
+            if (current.enableFastmem       != base.enableFastmem)       j.put("enableFastmem", current.enableFastmem)
+            if (current.vu1InlineFmacStall  != base.vu1InlineFmacStall)  j.put("vu1InlineFmacStall", current.vu1InlineFmacStall)
+            if (current.vu1CrossBlockPState != base.vu1CrossBlockPState) j.put("vu1CrossBlockPState", current.vu1CrossBlockPState)
+            if (current.vu1InlineDrainTestPipes != base.vu1InlineDrainTestPipes) j.put("vu1InlineDrainTestPipes", current.vu1InlineDrainTestPipes)
+            if (current.vu1FmacInstanceRouting != base.vu1FmacInstanceRouting) j.put("vu1FmacInstanceRouting", current.vu1FmacInstanceRouting)
+            if (current.hwMipmap            != base.hwMipmap)            j.put("hwMipmap", current.hwMipmap)
+            if (current.accurateBlendingUnit!= base.accurateBlendingUnit)j.put("accurateBlendingUnit", current.accurateBlendingUnit)
+            if (current.textureFiltering    != base.textureFiltering)    j.put("textureFiltering", current.textureFiltering)
+            if (current.displayBilinear     != base.displayBilinear)     j.put("displayBilinear", current.displayBilinear)
+            if (current.texturePreloading   != base.texturePreloading)   j.put("texturePreloading", current.texturePreloading)
+            if (current.hardwareDownloadMode!= base.hardwareDownloadMode)j.put("hardwareDownloadMode", current.hardwareDownloadMode)
+            if (current.tvShader            != base.tvShader)            j.put("tvShader", current.tvShader)
+            if (current.shadeBoost          != base.shadeBoost)          j.put("shadeBoost", current.shadeBoost)
+            if (current.shadeBoostBrightness != base.shadeBoostBrightness) j.put("shadeBoostBrightness", current.shadeBoostBrightness)
+            if (current.shadeBoostContrast  != base.shadeBoostContrast)  j.put("shadeBoostContrast", current.shadeBoostContrast)
+            if (current.shadeBoostSaturation != base.shadeBoostSaturation) j.put("shadeBoostSaturation", current.shadeBoostSaturation)
+            if (current.shadeBoostGamma     != base.shadeBoostGamma)     j.put("shadeBoostGamma", current.shadeBoostGamma)
+            if (current.fxaa                != base.fxaa)                j.put("fxaa", current.fxaa)
+            if (current.shaderChainEnabled  != base.shaderChainEnabled)  j.put("shaderChainEnabled", current.shaderChainEnabled)
+            if (current.shaderChainPreset   != base.shaderChainPreset)   j.put("shaderChainPreset", current.shaderChainPreset)
+            if (current.shaderChainParams   != base.shaderChainParams)   j.put("shaderChainParams", shaderChainParamsToJson(current.shaderChainParams))
+            if (current.casMode             != base.casMode)             j.put("casMode", current.casMode)
+            if (current.casSharpness        != base.casSharpness)        j.put("casSharpness", current.casSharpness)
+            if (current.loadTextureReplacements != base.loadTextureReplacements) j.put("loadTextureReplacements", current.loadTextureReplacements)
+            if (current.loadTextureReplacementsAsync != base.loadTextureReplacementsAsync) j.put("loadTextureReplacementsAsync", current.loadTextureReplacementsAsync)
+            if (current.precacheTextureReplacements != base.precacheTextureReplacements) j.put("precacheTextureReplacements", current.precacheTextureReplacements)
+            if (current.dumpReplaceableTextures != base.dumpReplaceableTextures) j.put("dumpReplaceableTextures", current.dumpReplaceableTextures)
+            if (current.osdShowTextureReplacements != base.osdShowTextureReplacements) j.put("osdShowTextureReplacements", current.osdShowTextureReplacements)
+            if (current.osdShowFps != base.osdShowFps) j.put("osdShowFps", current.osdShowFps)
+            if (current.osdScale != base.osdScale) j.put("osdScale", current.osdScale)
+            if (current.vsyncEnable != base.vsyncEnable) j.put("vsyncEnable", current.vsyncEnable)
+            if (current.osdShowVps != base.osdShowVps) j.put("osdShowVps", current.osdShowVps)
+            if (current.osdShowSpeed != base.osdShowSpeed) j.put("osdShowSpeed", current.osdShowSpeed)
+            if (current.osdShowCpu != base.osdShowCpu) j.put("osdShowCpu", current.osdShowCpu)
+            if (current.osdShowGpu != base.osdShowGpu) j.put("osdShowGpu", current.osdShowGpu)
+            if (current.osdShowResolution != base.osdShowResolution) j.put("osdShowResolution", current.osdShowResolution)
+            if (current.osdShowGsStats != base.osdShowGsStats) j.put("osdShowGsStats", current.osdShowGsStats)
+            if (current.osdShowFrameTimes != base.osdShowFrameTimes) j.put("osdShowFrameTimes", current.osdShowFrameTimes)
+            if (current.osdShowHardwareInfo != base.osdShowHardwareInfo) j.put("osdShowHardwareInfo", current.osdShowHardwareInfo)
+            if (current.osdShowMessages != base.osdShowMessages) j.put("osdShowMessages", current.osdShowMessages)
+            if (current.osdShowGpuStats != base.osdShowGpuStats) j.put("osdShowGpuStats", current.osdShowGpuStats)
+            if (current.osdShowVersion != base.osdShowVersion) j.put("osdShowVersion", current.osdShowVersion)
+            if (current.osdShowSettings != base.osdShowSettings) j.put("osdShowSettings", current.osdShowSettings)
+            if (current.osdShowInputs != base.osdShowInputs) j.put("osdShowInputs", current.osdShowInputs)
+            if (current.autoFlush           != base.autoFlush)           j.put("autoFlush", current.autoFlush)
+            if (current.halfPixelOffset     != base.halfPixelOffset)     j.put("halfPixelOffset", current.halfPixelOffset)
+            if (current.limit24BitDepth     != base.limit24BitDepth)     j.put("limit24BitDepth", current.limit24BitDepth)
+            if (current.manualUserHacks     != base.manualUserHacks)     j.put("manualUserHacks", current.manualUserHacks)
+            if (current.textureInsideRt     != base.textureInsideRt)     j.put("textureInsideRt", current.textureInsideRt)
+            if (current.nativeScaling       != base.nativeScaling)       j.put("nativeScaling", current.nativeScaling)
+            if (current.roundSprite         != base.roundSprite)         j.put("roundSprite", current.roundSprite)
+            if (current.bilinearUpscale     != base.bilinearUpscale)     j.put("bilinearUpscale", current.bilinearUpscale)
+            if (current.gpuTargetClut       != base.gpuTargetClut)       j.put("gpuTargetClut", current.gpuTargetClut)
+            if (current.cpuSpriteRenderBw   != base.cpuSpriteRenderBw)   j.put("cpuSpriteRenderBw", current.cpuSpriteRenderBw)
+            if (current.cpuSpriteRenderLevel != base.cpuSpriteRenderLevel) j.put("cpuSpriteRenderLevel", current.cpuSpriteRenderLevel)
+            if (current.alignSprite         != base.alignSprite)         j.put("alignSprite", current.alignSprite)
+            if (current.mergeSprite         != base.mergeSprite)         j.put("mergeSprite", current.mergeSprite)
+            if (current.forceEvenSpritePosition != base.forceEvenSpritePosition) j.put("forceEvenSpritePosition", current.forceEvenSpritePosition)
+            if (current.unscaledPaletteDraw != base.unscaledPaletteDraw) j.put("unscaledPaletteDraw", current.unscaledPaletteDraw)
+            if (current.textureOffsetX      != base.textureOffsetX)      j.put("textureOffsetX", current.textureOffsetX)
+            if (current.textureOffsetY      != base.textureOffsetY)      j.put("textureOffsetY", current.textureOffsetY)
+            if (current.gpuPaletteConversion != base.gpuPaletteConversion) j.put("gpuPaletteConversion", current.gpuPaletteConversion)
+            if (current.cpuFramebufferConversion != base.cpuFramebufferConversion) j.put("cpuFramebufferConversion", current.cpuFramebufferConversion)
+            if (current.readTargetsWhenClosing != base.readTargetsWhenClosing) j.put("readTargetsWhenClosing", current.readTargetsWhenClosing)
+            if (current.disableDepthEmulation != base.disableDepthEmulation) j.put("disableDepthEmulation", current.disableDepthEmulation)
+            if (current.disablePartialInvalidation != base.disablePartialInvalidation) j.put("disablePartialInvalidation", current.disablePartialInvalidation)
+            if (current.disableSafeFeatures != base.disableSafeFeatures) j.put("disableSafeFeatures", current.disableSafeFeatures)
+            if (current.disableRenderFixes  != base.disableRenderFixes)  j.put("disableRenderFixes", current.disableRenderFixes)
+            if (current.preloadFrameData    != base.preloadFrameData)    j.put("preloadFrameData", current.preloadFrameData)
+            if (current.estimateTextureRegion != base.estimateTextureRegion) j.put("estimateTextureRegion", current.estimateTextureRegion)
+            if (current.drawBuffering        != base.drawBuffering)        j.put("drawBuffering", current.drawBuffering)
+            if (current.cpuClutRender       != base.cpuClutRender)       j.put("cpuClutRender", current.cpuClutRender)
+            if (current.triFilter           != base.triFilter)           j.put("triFilter", current.triFilter)
+            if (current.maxAnisotropy       != base.maxAnisotropy)       j.put("maxAnisotropy", current.maxAnisotropy)
+            if (current.gpuProfile          != base.gpuProfile)          j.put("gpuProfile", current.gpuProfile)
+            return j
+        }
+
+        fun merge(base: Settings, overrides: JSONObject): Settings = Settings(
+            eeCycleRate = if (overrides.has("eeCycleRate")) overrides.getInt("eeCycleRate") else base.eeCycleRate,
+            eeCycleSkip = if (overrides.has("eeCycleSkip")) overrides.getInt("eeCycleSkip") else base.eeCycleSkip,
+            eeClampMode = if (overrides.has("eeClampMode")) overrides.getInt("eeClampMode") else base.eeClampMode,
+            vuClampMode = if (overrides.has("vuClampMode")) overrides.getInt("vuClampMode") else base.vuClampMode,
+            mtvu = if (overrides.has("mtvu")) overrides.getBoolean("mtvu") else base.mtvu,
+            vu1Instant = if (overrides.has("vu1Instant")) overrides.getBoolean("vu1Instant") else base.vu1Instant,
+            vuFlagHack = if (overrides.has("vuFlagHack")) overrides.getBoolean("vuFlagHack") else base.vuFlagHack,
+            fastCDVD = if (overrides.has("fastCDVD")) overrides.getBoolean("fastCDVD") else base.fastCDVD,
+            intcStat = if (overrides.has("intcStat")) overrides.getBoolean("intcStat") else base.intcStat,
+            waitLoop = if (overrides.has("waitLoop")) overrides.getBoolean("waitLoop") else base.waitLoop,
+            vuNeonFusions = if (overrides.has("vuNeonFusions")) overrides.getBoolean("vuNeonFusions") else base.vuNeonFusions,
+            vuDeferredWrites = if (overrides.has("vuDeferredWrites")) overrides.getBoolean("vuDeferredWrites") else base.vuDeferredWrites,
+            vuSkipStallSim = if (overrides.has("vuSkipStallSim")) overrides.getBoolean("vuSkipStallSim") else base.vuSkipStallSim,
+            frameLimitEnable = if (overrides.has("frameLimitEnable")) overrides.getBoolean("frameLimitEnable") else base.frameLimitEnable,
+            nominalSpeedPercent = if (overrides.has("nominalSpeedPercent")) overrides.getInt("nominalSpeedPercent") else base.nominalSpeedPercent,
+            fpsLimit = if (overrides.has("fpsLimit")) overrides.getInt("fpsLimit") else base.fpsLimit,
+            frameSkip = if (overrides.has("frameSkip")) overrides.getInt("frameSkip") else base.frameSkip,
+            audioVolume = if (overrides.has("audioVolume")) overrides.getInt("audioVolume") else base.audioVolume,
+            audioMuted = if (overrides.has("audioMuted")) overrides.getBoolean("audioMuted") else base.audioMuted,
+            audioSwapChannels = if (overrides.has("audioSwapChannels")) overrides.getBoolean("audioSwapChannels") else base.audioSwapChannels,
+            audioTimeStretch = if (overrides.has("audioTimeStretch")) overrides.getBoolean("audioTimeStretch") else base.audioTimeStretch,
+            audioBufferMs = if (overrides.has("audioBufferMs")) overrides.getInt("audioBufferMs") else base.audioBufferMs,
+            audioOutputLatencyMs = if (overrides.has("audioOutputLatencyMs")) overrides.getInt("audioOutputLatencyMs") else base.audioOutputLatencyMs,
+            audioFastForwardVolume = if (overrides.has("audioFastForwardVolume")) overrides.getInt("audioFastForwardVolume") else base.audioFastForwardVolume,
+            spu2NeonReverb = if (overrides.has("spu2NeonReverb")) overrides.getBoolean("spu2NeonReverb") else base.spu2NeonReverb,
+            renderer = if (overrides.has("renderer")) overrides.getString("renderer") else base.renderer,
+            upscaleFloat = if (overrides.has("upscaleFloat")) overrides.getDouble("upscaleFloat").toFloat() else base.upscaleFloat,
+            framerateNtsc = if (overrides.has("framerateNtsc")) overrides.getDouble("framerateNtsc").toFloat() else base.framerateNtsc,
+            frameratePal = if (overrides.has("frameratePal")) overrides.getDouble("frameratePal").toFloat() else base.frameratePal,
+            enablePatches = if (overrides.has("enablePatches")) overrides.getBoolean("enablePatches") else base.enablePatches,
+            enableCheats = if (overrides.has("enableCheats")) overrides.getBoolean("enableCheats") else base.enableCheats,
+            enableWideScreenPatches = if (overrides.has("enableWideScreenPatches")) overrides.getBoolean("enableWideScreenPatches") else base.enableWideScreenPatches,
+            enableNoInterlacingPatches = if (overrides.has("enableNoInterlacingPatches")) overrides.getBoolean("enableNoInterlacingPatches") else base.enableNoInterlacingPatches,
+            enableFastBoot = if (overrides.has("enableFastBoot")) overrides.getBoolean("enableFastBoot") else base.enableFastBoot,
+            hostFs = if (overrides.has("hostFs")) overrides.getBoolean("hostFs") else base.hostFs,
+            enableGameFixes = if (overrides.has("enableGameFixes")) overrides.getBoolean("enableGameFixes") else base.enableGameFixes,
+            gamefixSoftwareRendererFmv = if (overrides.has("gamefixSoftwareRendererFmv")) overrides.getBoolean("gamefixSoftwareRendererFmv") else base.gamefixSoftwareRendererFmv,
+            gamefixSkipMpeg = if (overrides.has("gamefixSkipMpeg")) overrides.getBoolean("gamefixSkipMpeg") else base.gamefixSkipMpeg,
+            gamefixEETiming = if (overrides.has("gamefixEETiming")) overrides.getBoolean("gamefixEETiming") else base.gamefixEETiming,
+            gamefixInstantDma = if (overrides.has("gamefixInstantDma")) overrides.getBoolean("gamefixInstantDma") else base.gamefixInstantDma,
+            gamefixBlitInternalFps = if (overrides.has("gamefixBlitInternalFps")) overrides.getBoolean("gamefixBlitInternalFps") else base.gamefixBlitInternalFps,
+            gamefixFpuMul = if (overrides.has("gamefixFpuMul")) overrides.getBoolean("gamefixFpuMul") else base.gamefixFpuMul,
+            gamefixOphFlag = if (overrides.has("gamefixOphFlag")) overrides.getBoolean("gamefixOphFlag") else base.gamefixOphFlag,
+            gamefixGifFifo = if (overrides.has("gamefixGifFifo")) overrides.getBoolean("gamefixGifFifo") else base.gamefixGifFifo,
+            gamefixDmaBusy = if (overrides.has("gamefixDmaBusy")) overrides.getBoolean("gamefixDmaBusy") else base.gamefixDmaBusy,
+            gamefixVif1Stall = if (overrides.has("gamefixVif1Stall")) overrides.getBoolean("gamefixVif1Stall") else base.gamefixVif1Stall,
+            gamefixIbit = if (overrides.has("gamefixIbit")) overrides.getBoolean("gamefixIbit") else base.gamefixIbit,
+            gamefixFullVu0Sync = if (overrides.has("gamefixFullVu0Sync")) overrides.getBoolean("gamefixFullVu0Sync") else base.gamefixFullVu0Sync,
+            gamefixVuAddSub = if (overrides.has("gamefixVuAddSub")) overrides.getBoolean("gamefixVuAddSub") else base.gamefixVuAddSub,
+            gamefixVuOverflow = if (overrides.has("gamefixVuOverflow")) overrides.getBoolean("gamefixVuOverflow") else base.gamefixVuOverflow,
+            gamefixXgkick = if (overrides.has("gamefixXgkick")) overrides.getBoolean("gamefixXgkick") else base.gamefixXgkick,
+            gamefixGoemonTlb = if (overrides.has("gamefixGoemonTlb")) overrides.getBoolean("gamefixGoemonTlb") else base.gamefixGoemonTlb,
+            gamefixVuSync = if (overrides.has("gamefixVuSync")) overrides.getBoolean("gamefixVuSync") else base.gamefixVuSync,
+            skipDuplicateFrames = if (overrides.has("skipDuplicateFrames")) overrides.getBoolean("skipDuplicateFrames") else base.skipDuplicateFrames,
+            eeFpuRoundMode = if (overrides.has("eeFpuRoundMode")) overrides.getInt("eeFpuRoundMode") else base.eeFpuRoundMode,
+            vu0RoundMode = if (overrides.has("vu0RoundMode")) overrides.getInt("vu0RoundMode") else base.vu0RoundMode,
+            vu1RoundMode = if (overrides.has("vu1RoundMode")) overrides.getInt("vu1RoundMode") else base.vu1RoundMode,
+            screenOffsets = if (overrides.has("screenOffsets")) overrides.getBoolean("screenOffsets") else base.screenOffsets,
+            showOverscan = if (overrides.has("showOverscan")) overrides.getBoolean("showOverscan") else base.showOverscan,
+            antiBlur = if (overrides.has("antiBlur")) overrides.getBoolean("antiBlur") else base.antiBlur,
+            disableInterlaceOffset = if (overrides.has("disableInterlaceOffset")) overrides.getBoolean("disableInterlaceOffset") else base.disableInterlaceOffset,
+            syncToHostRefresh = if (overrides.has("syncToHostRefresh")) overrides.getBoolean("syncToHostRefresh") else base.syncToHostRefresh,
+            disableFramebufferFetch = if (overrides.has("disableFramebufferFetch")) overrides.getBoolean("disableFramebufferFetch") else base.disableFramebufferFetch,
+            hwRov = if (overrides.has("hwRov")) overrides.getBoolean("hwRov") else base.hwRov,
+            hwAa1 = if (overrides.has("hwAa1")) overrides.getBoolean("hwAa1") else base.hwAa1,
+            hwAat = false,
+            adrenoFbFetch = if (overrides.has("adrenoFbFetch")) overrides.getBoolean("adrenoFbFetch") else base.adrenoFbFetch,
+            forceMaliFbFetch = if (overrides.has("forceMaliFbFetch")) overrides.getBoolean("forceMaliFbFetch") else base.forceMaliFbFetch,
+            useAngleOpenGL = if (overrides.has("useAngleOpenGL")) overrides.getBoolean("useAngleOpenGL") else base.useAngleOpenGL,
+            overrideTextureBarriers = if (overrides.has("overrideTextureBarriers")) overrides.getInt("overrideTextureBarriers") else base.overrideTextureBarriers,
+            disableVertexShaderExpand = if (overrides.has("disableVertexShaderExpand")) overrides.getBoolean("disableVertexShaderExpand") else base.disableVertexShaderExpand,
+            useBlitSwapChain = if (overrides.has("useBlitSwapChain")) overrides.getBoolean("useBlitSwapChain") else base.useBlitSwapChain,
+            disableShaderCache = if (overrides.has("disableShaderCache")) overrides.getBoolean("disableShaderCache") else base.disableShaderCache,
+            hwAccurateAlphaTest = when {
+                overrides.has("hwAccurateAlphaTest") -> overrides.getBoolean("hwAccurateAlphaTest")
+                overrides.has("hwAat") -> overrides.getBoolean("hwAat")
+                else -> base.hwAccurateAlphaTest
+            },
+            skipDrawStart = if (overrides.has("skipDrawStart")) overrides.getInt("skipDrawStart") else base.skipDrawStart,
+            skipDrawEnd = if (overrides.has("skipDrawEnd")) overrides.getInt("skipDrawEnd") else base.skipDrawEnd,
+            spinGpuReadbacks = if (overrides.has("spinGpuReadbacks")) overrides.getBoolean("spinGpuReadbacks") else base.spinGpuReadbacks,
+            spinCpuReadbacks = if (overrides.has("spinCpuReadbacks")) overrides.getBoolean("spinCpuReadbacks") else base.spinCpuReadbacks,
+            integerScaling = if (overrides.has("integerScaling")) overrides.getBoolean("integerScaling") else base.integerScaling,
+            dithering = if (overrides.has("dithering")) overrides.getInt("dithering") else base.dithering,
+            vsyncQueueSize = if (overrides.has("vsyncQueueSize")) overrides.getInt("vsyncQueueSize") else base.vsyncQueueSize,
+            autoFlushSw = if (overrides.has("autoFlushSw")) overrides.getBoolean("autoFlushSw") else base.autoFlushSw,
+            mipmapSw = if (overrides.has("mipmapSw")) overrides.getBoolean("mipmapSw") else base.mipmapSw,
+            swThreads = if (overrides.has("swThreads")) overrides.getInt("swThreads") else base.swThreads,
+            swThreadsHeight = if (overrides.has("swThreadsHeight")) overrides.getInt("swThreadsHeight") else base.swThreadsHeight,
+            aspectRatio = if (overrides.has("aspectRatio")) overrides.getInt("aspectRatio") else base.aspectRatio,
+            fmvAspectRatio = if (overrides.has("fmvAspectRatio")) overrides.getInt("fmvAspectRatio") else base.fmvAspectRatio,
+            deinterlaceMode = if (overrides.has("deinterlaceMode")) overrides.getInt("deinterlaceMode") else base.deinterlaceMode,
+            dev9EthEnable = if (overrides.has("dev9EthEnable")) overrides.getBoolean("dev9EthEnable") else base.dev9EthEnable,
+            dev9EthApi = if (overrides.has("dev9EthApi")) overrides.getString("dev9EthApi").ifEmpty { base.dev9EthApi } else base.dev9EthApi,
+            dev9EthDevice = if (overrides.has("dev9EthDevice")) overrides.getString("dev9EthDevice").ifEmpty { base.dev9EthDevice } else base.dev9EthDevice,
+            dev9EthLogDhcp = if (overrides.has("dev9EthLogDhcp")) overrides.getBoolean("dev9EthLogDhcp") else base.dev9EthLogDhcp,
+            dev9EthLogDns = if (overrides.has("dev9EthLogDns")) overrides.getBoolean("dev9EthLogDns") else base.dev9EthLogDns,
+            dev9InterceptDhcp = if (overrides.has("dev9InterceptDhcp")) overrides.getBoolean("dev9InterceptDhcp") else base.dev9InterceptDhcp,
+            dev9Ps2Ip = if (overrides.has("dev9Ps2Ip")) overrides.getString("dev9Ps2Ip").ifEmpty { base.dev9Ps2Ip } else base.dev9Ps2Ip,
+            dev9Mask = if (overrides.has("dev9Mask")) overrides.getString("dev9Mask").ifEmpty { base.dev9Mask } else base.dev9Mask,
+            dev9Gateway = if (overrides.has("dev9Gateway")) overrides.getString("dev9Gateway").ifEmpty { base.dev9Gateway } else base.dev9Gateway,
+            dev9Dns1 = if (overrides.has("dev9Dns1")) overrides.getString("dev9Dns1").ifEmpty { base.dev9Dns1 } else base.dev9Dns1,
+            dev9Dns2 = if (overrides.has("dev9Dns2")) overrides.getString("dev9Dns2").ifEmpty { base.dev9Dns2 } else base.dev9Dns2,
+            dev9AutoMask = if (overrides.has("dev9AutoMask")) overrides.getBoolean("dev9AutoMask") else base.dev9AutoMask,
+            dev9AutoGateway = if (overrides.has("dev9AutoGateway")) overrides.getBoolean("dev9AutoGateway") else base.dev9AutoGateway,
+            dev9ModeDns1 = if (overrides.has("dev9ModeDns1")) overrides.getString("dev9ModeDns1").ifEmpty { base.dev9ModeDns1 } else base.dev9ModeDns1,
+            dev9ModeDns2 = if (overrides.has("dev9ModeDns2")) overrides.getString("dev9ModeDns2").ifEmpty { base.dev9ModeDns2 } else base.dev9ModeDns2,
+            dev9EthHosts = if (overrides.has("dev9EthHosts")) {
+                overrides.optJSONArray("dev9EthHosts")?.let { array ->
+                    buildList {
+                        repeat(array.length()) { index ->
+                            array.optJSONObject(index)?.let { host ->
+                                add(
+                                    Dev9HostMapping(
+                                        url = host.optString("url"),
+                                        ip = host.optString("ip", "0.0.0.0"),
+                                        enabled = host.optBoolean("enabled", true),
+                                    ),
+                                )
+                            }
+                        }
+                    }
+                } ?: base.dev9EthHosts
+            } else base.dev9EthHosts,
+            dev9HddEnable = if (overrides.has("dev9HddEnable")) overrides.getBoolean("dev9HddEnable") else base.dev9HddEnable,
+            dev9HddFile = if (overrides.has("dev9HddFile")) overrides.getString("dev9HddFile").ifEmpty { base.dev9HddFile } else base.dev9HddFile,
+            memoryCardSlot1Enabled = if (overrides.has("memoryCardSlot1Enabled")) overrides.getBoolean("memoryCardSlot1Enabled") else base.memoryCardSlot1Enabled,
+            memoryCardSlot1Filename = if (overrides.has("memoryCardSlot1Filename")) overrides.getString("memoryCardSlot1Filename").ifEmpty { base.memoryCardSlot1Filename } else base.memoryCardSlot1Filename,
+            biosFilename = if (overrides.has("biosFilename")) overrides.getString("biosFilename") else base.biosFilename,
+            memoryCardSlot2Enabled = if (overrides.has("memoryCardSlot2Enabled")) overrides.getBoolean("memoryCardSlot2Enabled") else base.memoryCardSlot2Enabled,
+            memoryCardSlot2Filename = if (overrides.has("memoryCardSlot2Filename")) overrides.getString("memoryCardSlot2Filename").ifEmpty { base.memoryCardSlot2Filename } else base.memoryCardSlot2Filename,
+            usbKeyboard = if (overrides.has("usbKeyboard")) overrides.getBoolean("usbKeyboard") else base.usbKeyboard,
+            recEE = if (overrides.has("recEE")) overrides.getBoolean("recEE") else base.recEE,
+            recIOP = if (overrides.has("recIOP")) overrides.getBoolean("recIOP") else base.recIOP,
+            recVU0 = if (overrides.has("recVU0")) overrides.getBoolean("recVU0") else base.recVU0,
+            recVU1 = if (overrides.has("recVU1")) overrides.getBoolean("recVU1") else base.recVU1,
+            enableFastmem = if (overrides.has("enableFastmem")) overrides.getBoolean("enableFastmem") else base.enableFastmem,
+            useMacEE = true,
+            useMacIOP = true,
+            useMacVU0 = true,
+            useMacVU1 = true,
+            vu1InlineFmacStall = if (overrides.has("vu1InlineFmacStall")) overrides.getBoolean("vu1InlineFmacStall") else base.vu1InlineFmacStall,
+            vu1CrossBlockPState = if (overrides.has("vu1CrossBlockPState")) overrides.getBoolean("vu1CrossBlockPState") else base.vu1CrossBlockPState,
+            vu1InlineDrainTestPipes = if (overrides.has("vu1InlineDrainTestPipes")) overrides.getBoolean("vu1InlineDrainTestPipes") else base.vu1InlineDrainTestPipes,
+            vu1FmacInstanceRouting = if (overrides.has("vu1FmacInstanceRouting")) overrides.getBoolean("vu1FmacInstanceRouting") else base.vu1FmacInstanceRouting,
+            hwMipmap = if (overrides.has("hwMipmap")) overrides.getBoolean("hwMipmap") else base.hwMipmap,
+            accurateBlendingUnit = if (overrides.has("accurateBlendingUnit")) overrides.getInt("accurateBlendingUnit") else base.accurateBlendingUnit,
+            textureFiltering = if (overrides.has("textureFiltering")) overrides.getInt("textureFiltering") else base.textureFiltering,
+            displayBilinear = if (overrides.has("displayBilinear")) overrides.getInt("displayBilinear") else base.displayBilinear,
+            texturePreloading = if (overrides.has("texturePreloading")) overrides.getInt("texturePreloading") else base.texturePreloading,
+            hardwareDownloadMode = if (overrides.has("hardwareDownloadMode")) overrides.getInt("hardwareDownloadMode") else base.hardwareDownloadMode,
+            tvShader = if (overrides.has("tvShader")) overrides.getInt("tvShader") else base.tvShader,
+            shadeBoost = if (overrides.has("shadeBoost")) overrides.getBoolean("shadeBoost") else base.shadeBoost,
+            shadeBoostBrightness = if (overrides.has("shadeBoostBrightness")) overrides.getInt("shadeBoostBrightness") else base.shadeBoostBrightness,
+            shadeBoostContrast = if (overrides.has("shadeBoostContrast")) overrides.getInt("shadeBoostContrast") else base.shadeBoostContrast,
+            shadeBoostSaturation = if (overrides.has("shadeBoostSaturation")) overrides.getInt("shadeBoostSaturation") else base.shadeBoostSaturation,
+            shadeBoostGamma = if (overrides.has("shadeBoostGamma")) overrides.getInt("shadeBoostGamma") else base.shadeBoostGamma,
+            fxaa = if (overrides.has("fxaa")) overrides.getBoolean("fxaa") else base.fxaa,
+            shaderChainEnabled = if (overrides.has("shaderChainEnabled")) overrides.getBoolean("shaderChainEnabled") else base.shaderChainEnabled,
+            shaderChainPreset = if (overrides.has("shaderChainPreset")) overrides.getString("shaderChainPreset") else base.shaderChainPreset,
+            shaderChainParams = if (overrides.has("shaderChainParams")) {
+                shaderChainParamsFromJson(overrides.optJSONObject("shaderChainParams"))
+            } else base.shaderChainParams,
+            casMode = if (overrides.has("casMode")) overrides.getInt("casMode") else base.casMode,
+            casSharpness = if (overrides.has("casSharpness")) overrides.getInt("casSharpness") else base.casSharpness,
+            loadTextureReplacements = if (overrides.has("loadTextureReplacements")) overrides.getBoolean("loadTextureReplacements") else base.loadTextureReplacements,
+            loadTextureReplacementsAsync = if (overrides.has("loadTextureReplacementsAsync")) overrides.getBoolean("loadTextureReplacementsAsync") else base.loadTextureReplacementsAsync,
+            precacheTextureReplacements = if (overrides.has("precacheTextureReplacements")) overrides.getBoolean("precacheTextureReplacements") else base.precacheTextureReplacements,
+            dumpReplaceableTextures = if (overrides.has("dumpReplaceableTextures")) overrides.getBoolean("dumpReplaceableTextures") else base.dumpReplaceableTextures,
+            osdShowTextureReplacements = if (overrides.has("osdShowTextureReplacements")) overrides.getBoolean("osdShowTextureReplacements") else base.osdShowTextureReplacements,
+            osdShowFps = if (overrides.has("osdShowFps")) overrides.getBoolean("osdShowFps") else base.osdShowFps,
+            osdScale = if (overrides.has("osdScale")) overrides.getInt("osdScale") else base.osdScale,
+            vsyncEnable = if (overrides.has("vsyncEnable")) overrides.getBoolean("vsyncEnable") else base.vsyncEnable,
+            osdShowVps = if (overrides.has("osdShowVps")) overrides.getBoolean("osdShowVps") else base.osdShowVps,
+            osdShowSpeed = if (overrides.has("osdShowSpeed")) overrides.getBoolean("osdShowSpeed") else base.osdShowSpeed,
+            osdShowCpu = if (overrides.has("osdShowCpu")) overrides.getBoolean("osdShowCpu") else base.osdShowCpu,
+            osdShowGpu = if (overrides.has("osdShowGpu")) overrides.getBoolean("osdShowGpu") else base.osdShowGpu,
+            osdShowResolution = if (overrides.has("osdShowResolution")) overrides.getBoolean("osdShowResolution") else base.osdShowResolution,
+            osdShowGsStats = if (overrides.has("osdShowGsStats")) overrides.getBoolean("osdShowGsStats") else base.osdShowGsStats,
+            osdShowFrameTimes = if (overrides.has("osdShowFrameTimes")) overrides.getBoolean("osdShowFrameTimes") else base.osdShowFrameTimes,
+            osdShowHardwareInfo = if (overrides.has("osdShowHardwareInfo")) overrides.getBoolean("osdShowHardwareInfo") else base.osdShowHardwareInfo,
+            osdShowMessages = if (overrides.has("osdShowMessages")) overrides.getBoolean("osdShowMessages") else base.osdShowMessages,
+            osdShowGpuStats = if (overrides.has("osdShowGpuStats")) overrides.getBoolean("osdShowGpuStats") else base.osdShowGpuStats,
+            osdShowVersion = if (overrides.has("osdShowVersion")) overrides.getBoolean("osdShowVersion") else base.osdShowVersion,
+            osdShowSettings = if (overrides.has("osdShowSettings")) overrides.getBoolean("osdShowSettings") else base.osdShowSettings,
+            osdShowInputs = if (overrides.has("osdShowInputs")) overrides.getBoolean("osdShowInputs") else base.osdShowInputs,
+            autoFlush = if (overrides.has("autoFlush")) overrides.getInt("autoFlush") else base.autoFlush,
+            halfPixelOffset = if (overrides.has("halfPixelOffset")) overrides.getInt("halfPixelOffset") else base.halfPixelOffset,
+            limit24BitDepth = if (overrides.has("limit24BitDepth")) overrides.getInt("limit24BitDepth") else base.limit24BitDepth,
+            manualUserHacks = if (overrides.has("manualUserHacks")) overrides.getBoolean("manualUserHacks") else base.manualUserHacks,
+            textureInsideRt = if (overrides.has("textureInsideRt")) overrides.getInt("textureInsideRt") else base.textureInsideRt,
+            nativeScaling = if (overrides.has("nativeScaling")) overrides.getInt("nativeScaling") else base.nativeScaling,
+            roundSprite = if (overrides.has("roundSprite")) overrides.getInt("roundSprite") else base.roundSprite,
+            bilinearUpscale = if (overrides.has("bilinearUpscale")) overrides.getInt("bilinearUpscale") else base.bilinearUpscale,
+            gpuTargetClut = if (overrides.has("gpuTargetClut")) overrides.getInt("gpuTargetClut") else base.gpuTargetClut,
+            cpuSpriteRenderBw = if (overrides.has("cpuSpriteRenderBw")) overrides.getInt("cpuSpriteRenderBw") else base.cpuSpriteRenderBw,
+            cpuSpriteRenderLevel = if (overrides.has("cpuSpriteRenderLevel")) overrides.getInt("cpuSpriteRenderLevel") else base.cpuSpriteRenderLevel,
+            alignSprite = if (overrides.has("alignSprite")) overrides.getBoolean("alignSprite") else base.alignSprite,
+            mergeSprite = if (overrides.has("mergeSprite")) overrides.getBoolean("mergeSprite") else base.mergeSprite,
+            forceEvenSpritePosition = if (overrides.has("forceEvenSpritePosition")) overrides.getBoolean("forceEvenSpritePosition") else base.forceEvenSpritePosition,
+            unscaledPaletteDraw = if (overrides.has("unscaledPaletteDraw")) overrides.getBoolean("unscaledPaletteDraw") else base.unscaledPaletteDraw,
+            textureOffsetX = if (overrides.has("textureOffsetX")) overrides.getInt("textureOffsetX") else base.textureOffsetX,
+            textureOffsetY = if (overrides.has("textureOffsetY")) overrides.getInt("textureOffsetY") else base.textureOffsetY,
+            gpuPaletteConversion = if (overrides.has("gpuPaletteConversion")) overrides.getBoolean("gpuPaletteConversion") else base.gpuPaletteConversion,
+            cpuFramebufferConversion = if (overrides.has("cpuFramebufferConversion")) overrides.getBoolean("cpuFramebufferConversion") else base.cpuFramebufferConversion,
+            readTargetsWhenClosing = if (overrides.has("readTargetsWhenClosing")) overrides.getBoolean("readTargetsWhenClosing") else base.readTargetsWhenClosing,
+            disableDepthEmulation = if (overrides.has("disableDepthEmulation")) overrides.getBoolean("disableDepthEmulation") else base.disableDepthEmulation,
+            disablePartialInvalidation = if (overrides.has("disablePartialInvalidation")) overrides.getBoolean("disablePartialInvalidation") else base.disablePartialInvalidation,
+            disableSafeFeatures = if (overrides.has("disableSafeFeatures")) overrides.getBoolean("disableSafeFeatures") else base.disableSafeFeatures,
+            disableRenderFixes = if (overrides.has("disableRenderFixes")) overrides.getBoolean("disableRenderFixes") else base.disableRenderFixes,
+            preloadFrameData = if (overrides.has("preloadFrameData")) overrides.getBoolean("preloadFrameData") else base.preloadFrameData,
+            estimateTextureRegion = if (overrides.has("estimateTextureRegion")) overrides.getBoolean("estimateTextureRegion") else base.estimateTextureRegion,
+            drawBuffering = if (overrides.has("drawBuffering")) overrides.getBoolean("drawBuffering") else base.drawBuffering,
+            cpuClutRender = if (overrides.has("cpuClutRender")) overrides.getInt("cpuClutRender") else base.cpuClutRender,
+            triFilter = if (overrides.has("triFilter")) overrides.getInt("triFilter") else base.triFilter,
+            maxAnisotropy = if (overrides.has("maxAnisotropy")) overrides.getInt("maxAnisotropy") else base.maxAnisotropy,
+            gpuProfile = if (overrides.has("gpuProfile")) overrides.getInt("gpuProfile") else base.gpuProfile,
+        )
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/events/TestResult.kt b/armsx2/src/main/java/com/armsx2/events/TestResult.kt
new file mode 100644
index 000000000..2c4d09af0
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/events/TestResult.kt
@@ -0,0 +1,3 @@
+package com.armsx2.events
+
+class TestResult(val name: String, val passed: Int, val total: Int)
\ No newline at end of file
diff --git a/armsx2/src/main/java/com/armsx2/input/AndroidGyroscopeInput.kt b/armsx2/src/main/java/com/armsx2/input/AndroidGyroscopeInput.kt
new file mode 100644
index 000000000..9da65de05
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/input/AndroidGyroscopeInput.kt
@@ -0,0 +1,151 @@
+package com.armsx2.input
+
+import android.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
+import android.view.Surface
+import android.view.WindowManager
+import kotlin.math.PI
+
+class AndroidGyroscopeInput(
+    context: Context,
+    private val onAnalog: (mode: Int, x: Float, y: Float) -> Unit
+) : SensorEventListener {
+    companion object {
+        fun isModeAvailable(context: Context, mode: Int): Boolean {
+            val manager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
+            return when (mode) {
+                1 -> manager.getDefaultSensor(Sensor.TYPE_GYROSCOPE) != null
+                2 -> manager.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR) != null
+                else -> true
+            }
+        }
+    }
+    private val appContext = context.applicationContext
+    private val sensorManager = appContext.getSystemService(Context.SENSOR_SERVICE) as SensorManager
+    private val windowManager = appContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+    private var activeSensor: Sensor? = null
+    private var mode = 0
+    private var sensitivity = 1f
+    private var smoothing = 0.45f
+    private var invertX = false
+    private var invertY = false
+    private var filteredX = 0f
+    private var filteredY = 0f
+    private var lastSentX = 0f
+    private var lastSentY = 0f
+    private var wasActive = false
+    private var steeringCenter: Float? = null
+
+    fun start(mode: Int, sensitivityPercent: Int, smoothingPercent: Int, invertX: Boolean, invertY: Boolean): Boolean {
+        stop()
+        this.mode = mode
+        this.sensitivity = sensitivityPercent.coerceIn(25, 300) / 100f
+        this.smoothing = smoothingPercent.coerceIn(0, 90) / 100f
+        this.invertX = invertX
+        this.invertY = invertY
+        filteredX = 0f
+        filteredY = 0f
+        lastSentX = 0f
+        lastSentY = 0f
+        wasActive = false
+        steeringCenter = null
+        activeSensor = when (mode) {
+            1 -> sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)
+            2 -> sensorManager.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR)
+            else -> null
+        }
+        val sensor = activeSensor ?: return false
+        return sensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_GAME)
+    }
+
+    fun recenter() {
+        steeringCenter = null
+        filteredX = 0f
+        filteredY = 0f
+        wasActive = false
+        onAnalog(mode, 0f, 0f)
+    }
+
+    fun stop() {
+        activeSensor?.let { sensorManager.unregisterListener(this, it) }
+        activeSensor = null
+        steeringCenter = null
+        filteredX = 0f
+        filteredY = 0f
+        wasActive = false
+        onAnalog(mode, 0f, 0f)
+    }
+
+    override fun onSensorChanged(event: SensorEvent) {
+        val raw = when (mode) {
+            1 -> aimValues(event)
+            2 -> steeringValues(event)
+            else -> return
+        }
+        var x = applyDeadzone(raw.first.coerceIn(-1f, 1f), 0.035f)
+        var y = applyDeadzone(raw.second.coerceIn(-1f, 1f), 0.035f)
+        if (invertX) x = -x
+        if (invertY) y = -y
+        val alpha = (1f - smoothing * 0.86f).coerceIn(0.16f, 1f)
+        filteredX += (x - filteredX) * alpha
+        filteredY += (y - filteredY) * alpha
+        val outputX = filteredX.coerceIn(-1f, 1f)
+        val outputY = filteredY.coerceIn(-1f, 1f)
+        val active = kotlin.math.abs(outputX) > 0.004f || kotlin.math.abs(outputY) > 0.004f
+        if (!active && !wasActive) return
+        if (active && kotlin.math.abs(outputX - lastSentX) < 0.004f && kotlin.math.abs(outputY - lastSentY) < 0.004f) return
+        val sentX = if (active) outputX else 0f
+        val sentY = if (active) outputY else 0f
+        lastSentX = sentX
+        lastSentY = sentY
+        wasActive = active
+        onAnalog(mode, sentX, sentY)
+    }
+
+    private fun aimValues(event: SensorEvent): Pair<Float, Float> {
+        if (event.sensor.type != Sensor.TYPE_GYROSCOPE) return 0f to 0f
+        val rotation = @Suppress("DEPRECATION") windowManager.defaultDisplay.rotation
+        val gx = event.values[0]
+        val gy = event.values[1]
+        val axes = when (rotation) {
+            Surface.ROTATION_90 -> gx to gy
+            Surface.ROTATION_270 -> -gx to -gy
+            Surface.ROTATION_180 -> gy to -gx
+            else -> -gy to -gx
+        }
+        return (axes.first * 0.72f * sensitivity) to (axes.second * 0.72f * sensitivity)
+    }
+
+    private fun steeringValues(event: SensorEvent): Pair<Float, Float> {
+        if (event.sensor.type != Sensor.TYPE_GAME_ROTATION_VECTOR) return 0f to 0f
+        val matrix = FloatArray(9)
+        val remapped = FloatArray(9)
+        SensorManager.getRotationMatrixFromVector(matrix, event.values)
+        val rotation = @Suppress("DEPRECATION") windowManager.defaultDisplay.rotation
+        val (axisX, axisY) = when (rotation) {
+            Surface.ROTATION_90 -> SensorManager.AXIS_Y to SensorManager.AXIS_MINUS_X
+            Surface.ROTATION_180 -> SensorManager.AXIS_MINUS_X to SensorManager.AXIS_MINUS_Y
+            Surface.ROTATION_270 -> SensorManager.AXIS_MINUS_Y to SensorManager.AXIS_X
+            else -> SensorManager.AXIS_X to SensorManager.AXIS_Y
+        }
+        SensorManager.remapCoordinateSystem(matrix, axisX, axisY, remapped)
+        val roll = SensorManager.getOrientation(remapped, FloatArray(3))[2]
+        val center = steeringCenter ?: roll.also { steeringCenter = it }
+        var delta = roll - center
+        while (delta > PI) delta -= (2 * PI).toFloat()
+        while (delta < -PI) delta += (2 * PI).toFloat()
+        val steeringRange = Math.toRadians(32.0).toFloat()
+        return (delta / steeringRange * sensitivity).coerceIn(-1f, 1f) to 0f
+    }
+
+    private fun applyDeadzone(value: Float, deadzone: Float): Float {
+        val magnitude = kotlin.math.abs(value)
+        if (magnitude <= deadzone) return 0f
+        return kotlin.math.sign(value) * ((magnitude - deadzone) / (1f - deadzone))
+    }
+
+    override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) = Unit
+}
diff --git a/armsx2/src/main/java/com/armsx2/input/ControllerMappings.kt b/armsx2/src/main/java/com/armsx2/input/ControllerMappings.kt
new file mode 100644
index 000000000..d1ebb3bc3
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/input/ControllerMappings.kt
@@ -0,0 +1,687 @@
+package com.armsx2.input
+
+import android.view.KeyEvent
+import androidx.compose.runtime.mutableStateOf
+import com.armsx2.runtime.MainActivityRuntime
+import androidx.core.content.edit
+import org.json.JSONObject
+import java.io.File
+
+object ControllerMappings {
+    data class Action(
+        val id: String,
+        val label: String,
+        val targetKeyCode: Int,
+        val defaultPhysicalKeyCode: Int,
+    )
+
+    val actions = listOf(
+        Action("dpad_up", "D-Pad Up", KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_UP),
+        Action("dpad_down", "D-Pad Down", KeyEvent.KEYCODE_DPAD_DOWN, KeyEvent.KEYCODE_DPAD_DOWN),
+        Action("dpad_left", "D-Pad Left", KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_LEFT),
+        Action("dpad_right", "D-Pad Right", KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_RIGHT),
+        Action("cross", "Cross", KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_BUTTON_A),
+        Action("circle", "Circle", KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BUTTON_B),
+        Action("square", "Square", KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_X),
+        Action("triangle", "Triangle", KeyEvent.KEYCODE_BUTTON_Y, KeyEvent.KEYCODE_BUTTON_Y),
+        Action("l1", "L1", KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_BUTTON_L1),
+        Action("r1", "R1", KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_BUTTON_R1),
+        Action("l2", "L2", KeyEvent.KEYCODE_BUTTON_L2, KeyEvent.KEYCODE_BUTTON_L2),
+        Action("r2", "R2", KeyEvent.KEYCODE_BUTTON_R2, KeyEvent.KEYCODE_BUTTON_R2),
+        Action("l3", "L3", KeyEvent.KEYCODE_BUTTON_THUMBL, KeyEvent.KEYCODE_BUTTON_THUMBL),
+        Action("r3", "R3", KeyEvent.KEYCODE_BUTTON_THUMBR, KeyEvent.KEYCODE_BUTTON_THUMBR),
+        Action("select", "Select", KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_SELECT),
+        Action("start", "Start", KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_BUTTON_START),
+        Action("analog", "Analog (toggle)", 200, KeyEvent.KEYCODE_UNKNOWN),
+        Action("ls_up", "L-Stick Up (send)", 110, KeyEvent.KEYCODE_UNKNOWN),
+        Action("ls_down", "L-Stick Down (send)", 112, KeyEvent.KEYCODE_UNKNOWN),
+        Action("ls_left", "L-Stick Left (send)", 113, KeyEvent.KEYCODE_UNKNOWN),
+        Action("ls_right", "L-Stick Right (send)", 111, KeyEvent.KEYCODE_UNKNOWN),
+        Action("rs_up", "R-Stick Up (send)", 120, KeyEvent.KEYCODE_UNKNOWN),
+        Action("rs_down", "R-Stick Down (send)", 122, KeyEvent.KEYCODE_UNKNOWN),
+        Action("rs_left", "R-Stick Left (send)", 123, KeyEvent.KEYCODE_UNKNOWN),
+        Action("rs_right", "R-Stick Right (send)", 121, KeyEvent.KEYCODE_UNKNOWN),
+    )
+
+    enum class StickMode(val id: String, val label: String) {
+        ANALOG("analog", "Analog"),
+        FACE("face", "Face"),
+        CUSTOM("custom", "Custom"),
+    }
+
+    const val P1 = 0
+    const val P2 = 1
+    private fun playerPrefix(player: Int) = if (player == 1) "p2." else ""
+
+    private fun gameKey(serial: String, baseKey: String) = "game.$serial.$baseKey"
+    private fun scopedKey(baseKey: String, serial: String?) =
+        if (serial.isNullOrEmpty()) baseKey else gameKey(serial, baseKey)
+
+    private fun runtimeSerial(): String? = MainActivityRuntime.currentGame.value?.serial?.takeIf { it.isNotEmpty() }
+
+    private fun resolveInt(baseKey: String, default: Int): Int {
+        val s = runtimeSerial()
+        if (s != null) {
+            val gk = gameKey(s, baseKey)
+            if (MainActivityRuntime.prefs.contains(gk)) return MainActivityRuntime.prefs.getInt(gk, default)
+        }
+        return MainActivityRuntime.prefs.getInt(baseKey, default)
+    }
+
+    private fun resolveString(baseKey: String, default: String): String {
+        val s = runtimeSerial()
+        if (s != null) MainActivityRuntime.prefs.getString(gameKey(s, baseKey), null)?.let { return it }
+        return MainActivityRuntime.prefs.getString(baseKey, default) ?: default
+    }
+
+    private fun resolveBoolean(baseKey: String, default: Boolean): Boolean {
+        val s = runtimeSerial()
+        if (s != null) {
+            val gk = gameKey(s, baseKey)
+            if (MainActivityRuntime.prefs.contains(gk)) return MainActivityRuntime.prefs.getBoolean(gk, default)
+        }
+        return MainActivityRuntime.prefs.getBoolean(baseKey, default)
+    }
+
+    private fun scopedInt(baseKey: String, serial: String?, default: Int): Int {
+        val key = scopedKey(baseKey, serial)
+        if (MainActivityRuntime.prefs.contains(key)) return MainActivityRuntime.prefs.getInt(key, default)
+        return MainActivityRuntime.prefs.getInt(baseKey, default)
+    }
+
+    private fun scopedBoolean(baseKey: String, serial: String?, default: Boolean): Boolean {
+        val key = scopedKey(baseKey, serial)
+        if (MainActivityRuntime.prefs.contains(key)) return MainActivityRuntime.prefs.getBoolean(key, default)
+        return MainActivityRuntime.prefs.getBoolean(baseKey, default)
+    }
+
+    private const val KEY_LSTICK = "pad.lstick.mode"
+    private const val KEY_RSTICK = "pad.rstick.mode"
+
+    private fun stickModeFromId(id: String?): StickMode =
+        StickMode.entries.firstOrNull { it.id == id } ?: StickMode.ANALOG
+
+    fun leftStickMode(player: Int = 0): StickMode =
+        stickModeFromId(resolveString(playerPrefix(player) + KEY_LSTICK, StickMode.ANALOG.id))
+    fun rightStickMode(player: Int = 0): StickMode =
+        stickModeFromId(resolveString(playerPrefix(player) + KEY_RSTICK, StickMode.ANALOG.id))
+    fun stickModeFor(left: Boolean, player: Int = 0): StickMode =
+        if (left) leftStickMode(player) else rightStickMode(player)
+
+    fun leftStickModeScope(player: Int, serial: String?): StickMode =
+        stickModeFromId(MainActivityRuntime.prefs.getString(scopedKey(playerPrefix(player) + KEY_LSTICK, serial), null)
+            ?: MainActivityRuntime.prefs.getString(playerPrefix(player) + KEY_LSTICK, StickMode.ANALOG.id))
+    fun rightStickModeScope(player: Int, serial: String?): StickMode =
+        stickModeFromId(MainActivityRuntime.prefs.getString(scopedKey(playerPrefix(player) + KEY_RSTICK, serial), null)
+            ?: MainActivityRuntime.prefs.getString(playerPrefix(player) + KEY_RSTICK, StickMode.ANALOG.id))
+    fun setLeftStickMode(m: StickMode, player: Int = 0, serial: String? = null) =
+        MainActivityRuntime.prefs.edit {
+            putString(
+                scopedKey(
+                    playerPrefix(player) + KEY_LSTICK,
+                    serial
+                ), m.id
+            )
+        }
+
+    fun setRightStickMode(m: StickMode, player: Int = 0, serial: String? = null) =
+        MainActivityRuntime.prefs.edit {
+            putString(
+                scopedKey(
+                    playerPrefix(player) + KEY_RSTICK,
+                    serial
+                ), m.id
+            )
+        }
+
+    private const val KEY_LSTICK_INVX = "pad.lstick.invertX"
+    private const val KEY_LSTICK_INVY = "pad.lstick.invertY"
+    private const val KEY_LSTICK_SWAP = "pad.lstick.swapXY"
+    private const val KEY_RSTICK_INVX = "pad.rstick.invertX"
+    private const val KEY_RSTICK_INVY = "pad.rstick.invertY"
+    private const val KEY_RSTICK_SWAP = "pad.rstick.swapXY"
+    private fun invXKey(left: Boolean) = if (left) KEY_LSTICK_INVX else KEY_RSTICK_INVX
+    private fun invYKey(left: Boolean) = if (left) KEY_LSTICK_INVY else KEY_RSTICK_INVY
+    private fun swapKey(left: Boolean) = if (left) KEY_LSTICK_SWAP else KEY_RSTICK_SWAP
+    fun stickInvertX(left: Boolean): Boolean = resolveBoolean(invXKey(left), false)
+    fun stickInvertY(left: Boolean): Boolean = resolveBoolean(invYKey(left), false)
+    fun stickSwapXY(left: Boolean): Boolean = resolveBoolean(swapKey(left), false)
+    fun stickInvertXScope(left: Boolean, serial: String?): Boolean = scopedBoolean(invXKey(left), serial, false)
+    fun stickInvertYScope(left: Boolean, serial: String?): Boolean = scopedBoolean(invYKey(left), serial, false)
+    fun stickSwapXYScope(left: Boolean, serial: String?): Boolean = scopedBoolean(swapKey(left), serial, false)
+    fun setStickInvertX(left: Boolean, on: Boolean, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putBoolean(scopedKey(invXKey(left), serial), on) }
+    fun setStickInvertY(left: Boolean, on: Boolean, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putBoolean(scopedKey(invYKey(left), serial), on) }
+    fun setStickSwapXY(left: Boolean, on: Boolean, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putBoolean(scopedKey(swapKey(left), serial), on) }
+
+    private const val KEY_DPAD_AS_LSTICK = "pad.dpadAsLeftStick"
+    fun dpadAsLeftStick(): Boolean = resolveBoolean(KEY_DPAD_AS_LSTICK, false)
+    fun dpadAsLeftStickScope(serial: String?): Boolean = scopedBoolean(KEY_DPAD_AS_LSTICK, serial, false)
+    fun setDpadAsLeftStick(on: Boolean, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putBoolean(scopedKey(KEY_DPAD_AS_LSTICK, serial), on) }
+
+    private const val KEY_STICK_SENS = "pad.stick.sensitivity"
+    private const val KEY_STICK_ACCEL = "pad.stick.acceleration"
+    const val STICK_SENS_MIN = 0.5f
+    const val STICK_SENS_MAX = 2.0f
+    const val STICK_ACCEL_MAX = 2.0f
+
+    private class PerStickPref(val baseKey: String, val def: Float, val lo: Float, val hi: Float) {
+        @Volatile var cacheL = Float.NaN
+        @Volatile var cacheR = Float.NaN
+        fun key(left: Boolean) = baseKey + if (left) ".l" else ".r"
+        fun get(left: Boolean): Float {
+            val c = if (left) cacheL else cacheR
+            if (!c.isNaN()) return c
+            val v = (if (MainActivityRuntime.prefs.contains(key(left))) MainActivityRuntime.prefs.getFloat(key(left), def)
+                else MainActivityRuntime.prefs.getFloat(baseKey, def)).coerceIn(lo, hi)
+            if (left) cacheL = v else cacheR = v
+            return v
+        }
+        fun set(left: Boolean, v: Float) {
+            val c = v.coerceIn(lo, hi)
+            if (left) cacheL = c else cacheR = c
+            MainActivityRuntime.prefs.edit { putFloat(key(left), c) }
+        }
+        fun reset(edit: android.content.SharedPreferences.Editor) {
+            edit.remove(baseKey).remove(key(true)).remove(key(false))
+            cacheL = Float.NaN; cacheR = Float.NaN
+        }
+    }
+    private val prefStickSens = PerStickPref(KEY_STICK_SENS, 1.0f, STICK_SENS_MIN, STICK_SENS_MAX)
+    private val prefStickAccel = PerStickPref(KEY_STICK_ACCEL, 0.0f, 0f, STICK_ACCEL_MAX)
+    fun stickSensitivity(left: Boolean): Float = prefStickSens.get(left)
+    fun setStickSensitivity(left: Boolean, v: Float) = prefStickSens.set(left, v)
+    fun stickAcceleration(left: Boolean): Float = prefStickAccel.get(left)
+    fun setStickAcceleration(left: Boolean, v: Float) = prefStickAccel.set(left, v)
+
+    private const val KEY_STICK_DZ = "pad.stick.deadzone"
+    const val STICK_DZ_MAX = 0.40f
+    private val prefStickDz = PerStickPref(KEY_STICK_DZ, 0.05f, 0f, STICK_DZ_MAX)
+    fun stickDeadzone(left: Boolean): Float = prefStickDz.get(left)
+    fun setStickDeadzone(left: Boolean, v: Float) = prefStickDz.set(left, v)
+
+    private const val KEY_STICK_OUTER = "pad.stick.outerDeadzone"
+    const val STICK_OUTER_MAX = 0.40f
+    private val prefStickOuter = PerStickPref(KEY_STICK_OUTER, 0.0f, 0f, STICK_OUTER_MAX)
+    fun stickOuterDeadzone(left: Boolean): Float = prefStickOuter.get(left)
+    fun setStickOuterDeadzone(left: Boolean, v: Float) = prefStickOuter.set(left, v)
+
+    private const val KEY_STICK_ANTIDZ = "pad.stick.antiDeadzone"
+    const val STICK_ANTIDZ_MAX = 0.60f
+    private val prefStickAntiDz = PerStickPref(KEY_STICK_ANTIDZ, 0.0f, 0f, STICK_ANTIDZ_MAX)
+    fun stickAntiDeadzone(left: Boolean): Float = prefStickAntiDz.get(left)
+    fun setStickAntiDeadzone(left: Boolean, v: Float) = prefStickAntiDz.set(left, v)
+
+    private const val KEY_RUMBLE = "pad.rumble.enabled"
+    fun rumbleEnabled(): Boolean = MainActivityRuntime.prefs.getBoolean(KEY_RUMBLE, true)
+    fun setRumbleEnabled(on: Boolean) {
+        MainActivityRuntime.prefs.edit { putBoolean(KEY_RUMBLE, on) }
+        MainActivityRuntime.nativeSetRumbleEnabled(on)
+    }
+
+    private const val KEY_MULTITAP = "pad.multitap.enabled"
+    fun multitapEnabled(): Boolean = MainActivityRuntime.prefs.getBoolean(KEY_MULTITAP, false)
+    fun setMultitapEnabled(on: Boolean) {
+        MainActivityRuntime.prefs.edit { putBoolean(KEY_MULTITAP, on) }
+        com.armsx2.input.PadRouter.multitapEnabled = on
+        if (MainActivityRuntime.nativeReady.value) {
+            kotlin.concurrent.thread(name = "armsx2-multitap") {
+                runCatching {
+                    MainActivityRuntime.nativeSetMultitap(0, on)
+                    MainActivityRuntime.nativeSetMultitap(1, on)
+                }
+            }
+        }
+    }
+
+    const val GYRO_OFF = 0
+    const val GYRO_AIM = 1
+    const val GYRO_STEER = 2
+    private const val KEY_GYRO_MODE = "pad.gyro.mode"
+    private const val KEY_GYRO_SENS = "pad.gyro.sensitivity"
+    private const val KEY_GYRO_SMOOTH = "pad.gyro.smoothing"
+    private const val KEY_GYRO_INVX = "pad.gyro.invertX"
+    private const val KEY_GYRO_INVY = "pad.gyro.invertY"
+    const val GYRO_STICK_RIGHT = 0
+    const val GYRO_STICK_LEFT = 1
+    private const val KEY_GYRO_AIM_STICK = "pad.gyro.aimStick"
+
+    fun gyroMode(): Int = resolveInt(KEY_GYRO_MODE, GYRO_OFF).coerceIn(0, 2)
+    fun gyroSensitivity(): Int = resolveInt(KEY_GYRO_SENS, 100).coerceIn(25, 300)
+    fun gyroSmoothing(): Int = resolveInt(KEY_GYRO_SMOOTH, 45).coerceIn(0, 90)
+    fun gyroInvertX(): Boolean = resolveBoolean(KEY_GYRO_INVX, false)
+    fun gyroInvertY(): Boolean = resolveBoolean(KEY_GYRO_INVY, false)
+    fun gyroAimStick(): Int = resolveInt(KEY_GYRO_AIM_STICK, GYRO_STICK_RIGHT).coerceIn(0, 1)
+
+    fun gyroModeScope(serial: String?): Int = scopedInt(KEY_GYRO_MODE, serial, GYRO_OFF).coerceIn(0, 2)
+    fun gyroSensitivityScope(serial: String?): Int = scopedInt(KEY_GYRO_SENS, serial, 100).coerceIn(25, 300)
+    fun gyroSmoothingScope(serial: String?): Int = scopedInt(KEY_GYRO_SMOOTH, serial, 45).coerceIn(0, 90)
+    fun gyroInvertXScope(serial: String?): Boolean = scopedBoolean(KEY_GYRO_INVX, serial, false)
+    fun gyroInvertYScope(serial: String?): Boolean = scopedBoolean(KEY_GYRO_INVY, serial, false)
+    fun gyroAimStickScope(serial: String?): Int = scopedInt(KEY_GYRO_AIM_STICK, serial, GYRO_STICK_RIGHT).coerceIn(0, 1)
+
+    fun setGyroMode(value: Int, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putInt(scopedKey(KEY_GYRO_MODE, serial), value) }
+    fun setGyroSensitivity(value: Int, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putInt(scopedKey(KEY_GYRO_SENS, serial), value) }
+    fun setGyroSmoothing(value: Int, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putInt(scopedKey(KEY_GYRO_SMOOTH, serial), value) }
+    fun setGyroInvertX(on: Boolean, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putBoolean(scopedKey(KEY_GYRO_INVX, serial), on) }
+    fun setGyroInvertY(on: Boolean, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putBoolean(scopedKey(KEY_GYRO_INVY, serial), on) }
+    fun setGyroAimStick(value: Int, serial: String? = null) =
+        MainActivityRuntime.prefs.edit { putInt(scopedKey(KEY_GYRO_AIM_STICK, serial), value) }
+
+    enum class StickDir(val id: String) { UP("up"), DOWN("down"), LEFT("left"), RIGHT("right") }
+
+    data class PsButton(val code: Int, val label: String)
+    val stickTargets = listOf(
+        PsButton(19, "D-Pad Up"), PsButton(20, "D-Pad Down"),
+        PsButton(21, "D-Pad Left"), PsButton(22, "D-Pad Right"),
+        PsButton(96, "Cross"), PsButton(97, "Circle"),
+        PsButton(99, "Square"), PsButton(100, "Triangle"),
+        PsButton(102, "L1"), PsButton(103, "R1"),
+        PsButton(104, "L2"), PsButton(105, "R2"),
+        PsButton(106, "L3"), PsButton(107, "R3"),
+        PsButton(108, "Start"), PsButton(109, "Select"),
+        PsButton(200, "Analog (toggle)"),
+    )
+    fun stickTargetLabel(code: Int): String =
+        hotkeyForStickCode(code)?.let { "Hotkey: ${it.label}" }
+            ?: if (code in 110..123) "Analog (default)"
+            else stickTargets.firstOrNull { it.code == code }?.label ?: "Code $code"
+
+    private fun defaultCustomCode(left: Boolean, dir: StickDir): Int = when {
+        left && dir == StickDir.UP -> 110
+        left && dir == StickDir.DOWN -> 112
+        left && dir == StickDir.LEFT -> 113
+        left && dir == StickDir.RIGHT -> 111
+        !left && dir == StickDir.UP -> 120
+        !left && dir == StickDir.DOWN -> 122
+        !left && dir == StickDir.LEFT -> 123
+        else -> 121
+    }
+    private fun customKey(left: Boolean, dir: StickDir, player: Int = 0) =
+        playerPrefix(player) + "pad.${if (left) "lstick" else "rstick"}.${dir.id}.code"
+    fun customStickCode(left: Boolean, dir: StickDir, player: Int = 0): Int =
+        resolveInt(customKey(left, dir, player), defaultCustomCode(left, dir))
+    fun setCustomStickCode(left: Boolean, dir: StickDir, code: Int, player: Int = 0, serial: String? = null) =
+        MainActivityRuntime.prefs.edit {
+            putInt(
+                scopedKey(customKey(left, dir, player), serial),
+                code
+            )
+        }
+    fun customStickCodeScope(left: Boolean, dir: StickDir, player: Int, serial: String?): Int =
+        scopedInt(customKey(left, dir, player), serial, defaultCustomCode(left, dir))
+
+    const val HOTKEY_STICK_CODE_BASE = 300
+    fun stickCodeForHotkey(h: SysHotkey): Int = HOTKEY_STICK_CODE_BASE + h.ordinal
+    fun hotkeyForStickCode(code: Int): SysHotkey? {
+        val i = code - HOTKEY_STICK_CODE_BASE
+        return if (i in SysHotkey.values().indices) SysHotkey.values()[i] else null
+    }
+
+    val captureStickDir = mutableStateOf<Pair<Boolean, StickDir>?>(null)
+
+    val stickBindTick = mutableStateOf(0)
+
+    fun stickCodeForPhysical(physicalKeyCode: Int, player: Int = 0): Int? =
+        targetForPhysical(physicalKeyCode, player)
+
+    fun beginStickCapture(left: Boolean, dir: StickDir) { captureStickDir.value = left to dir }
+    fun endStickCapture() { captureStickDir.value = null; stickBindTick.value++ }
+
+    fun resetStickCode(left: Boolean, dir: StickDir, player: Int = 0, serial: String? = null) {
+        MainActivityRuntime.prefs.edit { remove(scopedKey(customKey(left, dir, player), serial)) }; stickBindTick.value++
+    }
+
+    private const val KEY_PREFIX = "pad.map."
+
+    fun physicalFor(action: Action, player: Int = 0): Int =
+        resolveInt(playerPrefix(player) + KEY_PREFIX + action.id, action.defaultPhysicalKeyCode)
+
+    fun physicalForScope(action: Action, player: Int, serial: String?): Int =
+        scopedInt(playerPrefix(player) + KEY_PREFIX + action.id, serial, action.defaultPhysicalKeyCode)
+
+    const val STICK_HOTKEY_KEY_BASE = 1000
+    fun stickHotkeyKeyCode(left: Boolean, dir: StickDir): Int =
+        STICK_HOTKEY_KEY_BASE + (if (left) 0 else 4) + dir.ordinal
+
+    fun labelForKey(keyCode: Int): String = when (keyCode) {
+        KeyEvent.KEYCODE_UNKNOWN -> "Not set"
+        in STICK_HOTKEY_KEY_BASE until STICK_HOTKEY_KEY_BASE + 8 -> {
+            val i = keyCode - STICK_HOTKEY_KEY_BASE
+            "${if (i < 4) "L-Stick" else "R-Stick"} ${StickDir.values()[i % 4].id.replaceFirstChar { it.uppercase() }}"
+        }
+        KeyEvent.KEYCODE_DPAD_UP -> "D-Pad Up"
+        KeyEvent.KEYCODE_DPAD_DOWN -> "D-Pad Down"
+        KeyEvent.KEYCODE_DPAD_LEFT -> "D-Pad Left"
+        KeyEvent.KEYCODE_DPAD_RIGHT -> "D-Pad Right"
+        KeyEvent.KEYCODE_BUTTON_A -> "Button A"
+        KeyEvent.KEYCODE_BUTTON_B -> "Button B"
+        KeyEvent.KEYCODE_BUTTON_X -> "Button X"
+        KeyEvent.KEYCODE_BUTTON_Y -> "Button Y"
+        KeyEvent.KEYCODE_BUTTON_L1 -> "L1"
+        KeyEvent.KEYCODE_BUTTON_R1 -> "R1"
+        KeyEvent.KEYCODE_BUTTON_L2 -> "L2"
+        KeyEvent.KEYCODE_BUTTON_R2 -> "R2"
+        KeyEvent.KEYCODE_BUTTON_THUMBL -> "L3"
+        KeyEvent.KEYCODE_BUTTON_THUMBR -> "R3"
+        KeyEvent.KEYCODE_BUTTON_SELECT -> "Select"
+        KeyEvent.KEYCODE_BUTTON_START -> "Start"
+        else -> KeyEvent.keyCodeToString(keyCode).removePrefix("KEYCODE_")
+    }
+
+    fun bind(action: Action, physicalKeyCode: Int, player: Int = 0, serial: String? = null) {
+        MainActivityRuntime.prefs.edit {
+            putInt(
+                scopedKey(
+                    playerPrefix(player) + KEY_PREFIX + action.id,
+                    serial
+                ), physicalKeyCode
+            )
+        }
+    }
+
+    fun clearAction(action: Action, player: Int = 0, serial: String? = null) {
+        MainActivityRuntime.prefs.edit().putInt(scopedKey(playerPrefix(player) + KEY_PREFIX + action.id, serial), KeyEvent.KEYCODE_UNKNOWN).apply()
+    }
+
+    fun reset(player: Int = 0, serial: String? = null) {
+        val edit = MainActivityRuntime.prefs.edit()
+        actions.forEach { edit.remove(scopedKey(playerPrefix(player) + KEY_PREFIX + it.id, serial)) }
+        edit.apply()
+    }
+
+    fun clearGameOverrides(serial: String, player: Int) {
+        if (serial.isEmpty()) return
+        val edit = MainActivityRuntime.prefs.edit()
+        actions.forEach { edit.remove(gameKey(serial, playerPrefix(player) + KEY_PREFIX + it.id)) }
+        edit.remove(gameKey(serial, playerPrefix(player) + KEY_LSTICK))
+            .remove(gameKey(serial, playerPrefix(player) + KEY_RSTICK))
+        for (left in booleanArrayOf(true, false))
+            for (dir in StickDir.values())
+                edit.remove(gameKey(serial, customKey(left, dir, player)))
+        edit.apply()
+        stickBindTick.value++
+    }
+
+    private const val KEY_PAD_PROFILES = "pad.profiles"
+    private const val PAD_PROFILE_FILE_SUFFIX = ".pad.json"
+
+    private fun mappingKeys(): List<String> = buildList {
+        actions.forEach { add(KEY_PREFIX + it.id) }
+        add(KEY_LSTICK)
+        add(KEY_RSTICK)
+        for (left in booleanArrayOf(true, false))
+            for (dir in StickDir.values())
+                add("pad.${if (left) "lstick" else "rstick"}.${dir.id}.code")
+    }
+
+    fun captureProfile(player: Int, serial: String?): JSONObject {
+        val o = JSONObject()
+        actions.forEach { o.put(KEY_PREFIX + it.id, physicalForScope(it, player, serial)) }
+        o.put(KEY_LSTICK, leftStickModeScope(player, serial).id)
+        o.put(KEY_RSTICK, rightStickModeScope(player, serial).id)
+        for (left in booleanArrayOf(true, false))
+            for (dir in StickDir.values())
+                o.put(
+                    "pad.${if (left) "lstick" else "rstick"}.${dir.id}.code",
+                    customStickCodeScope(left, dir, player, serial),
+                )
+        return o
+    }
+
+    fun applyProfile(values: JSONObject, player: Int, serial: String?) {
+        val pfx = playerPrefix(player)
+        val edit = MainActivityRuntime.prefs.edit()
+        mappingKeys().forEach { base ->
+            if (!values.has(base)) return@forEach
+            val target = scopedKey(pfx + base, serial)
+            when (base) {
+                KEY_LSTICK, KEY_RSTICK -> edit.putString(target, values.optString(base))
+                else -> edit.putInt(target, values.optInt(base))
+            }
+        }
+        edit.apply()
+        stickBindTick.value++
+    }
+
+    private fun readProfiles(): JSONObject =
+        runCatching { JSONObject(MainActivityRuntime.prefs.getString(KEY_PAD_PROFILES, "{}") ?: "{}") }
+            .getOrDefault(JSONObject())
+
+    private fun padFileNameFor(name: String): String =
+        name.replace(Regex("[^A-Za-z0-9 _.-]"), "_") + PAD_PROFILE_FILE_SUFFIX
+
+    private fun syncPadProfileFolder() {
+        val dir = MainActivityRuntime.inputProfilesDir() ?: return
+        runCatching {
+            val store = readProfiles()
+            val want = HashMap<String, JSONObject>()
+            store.keys().forEach { n ->
+                store.optJSONObject(n)?.let { v ->
+                    want[padFileNameFor(n)] = JSONObject().put("name", n).put("values", v)
+                }
+            }
+            for ((fn, body) in want) File(dir, fn).writeText(body.toString())
+            dir.listFiles { f -> f.name.endsWith(PAD_PROFILE_FILE_SUFFIX) }?.forEach { f ->
+                if (f.name !in want) runCatching { f.delete() }
+            }
+        }
+    }
+
+    private fun importPadProfileFolder(store: JSONObject) {
+        val dir = MainActivityRuntime.inputProfilesDir() ?: return
+        runCatching {
+            dir.listFiles { f -> f.name.endsWith(PAD_PROFILE_FILE_SUFFIX) }
+                ?.sortedBy { it.name }
+                ?.forEach { f ->
+                    runCatching {
+                        val o = JSONObject(f.readText())
+                        val n = o.optString("name")
+                        val v = o.optJSONObject("values")
+                        if (n.isNotEmpty() && v != null && !store.has(n)) store.put(n, v)
+                    }
+                }
+        }
+    }
+
+    val padProfileTick = mutableStateOf(0)
+
+    fun listProfiles(): List<String> {
+        val store = readProfiles()
+        importPadProfileFolder(store)
+        return store.keys().asSequence().toList().sortedBy { it.lowercase() }
+    }
+
+    fun saveProfile(name: String, player: Int, serial: String?): Boolean {
+        val trimmed = name.trim()
+        if (trimmed.isEmpty()) return false
+        val store = readProfiles()
+        importPadProfileFolder(store)
+        store.put(trimmed, captureProfile(player, serial))
+        MainActivityRuntime.prefs.edit { putString(KEY_PAD_PROFILES, store.toString()) }
+        syncPadProfileFolder()
+        padProfileTick.value++
+        return true
+    }
+
+    fun applyProfile(name: String, player: Int, serial: String?): Boolean {
+        val store = readProfiles()
+        importPadProfileFolder(store)
+        val values = store.optJSONObject(name) ?: return false
+        applyProfile(values, player, serial)
+        return true
+    }
+
+    fun deleteProfile(name: String) {
+        val store = readProfiles()
+        importPadProfileFolder(store)
+        store.remove(name)
+        MainActivityRuntime.prefs.edit { putString(KEY_PAD_PROFILES, store.toString()) }
+        syncPadProfileFolder()
+        padProfileTick.value++
+    }
+
+    fun hasGameOverrides(serial: String?, player: Int): Boolean {
+        if (serial.isNullOrEmpty()) return false
+        if (actions.any { MainActivityRuntime.prefs.contains(gameKey(serial, playerPrefix(player) + KEY_PREFIX + it.id)) }) return true
+        if (MainActivityRuntime.prefs.contains(gameKey(serial, playerPrefix(player) + KEY_LSTICK))) return true
+        if (MainActivityRuntime.prefs.contains(gameKey(serial, playerPrefix(player) + KEY_RSTICK))) return true
+        for (left in booleanArrayOf(true, false))
+            for (dir in StickDir.values())
+                if (MainActivityRuntime.prefs.contains(gameKey(serial, customKey(left, dir, player)))) return true
+        return false
+    }
+
+    fun resetTunables() {
+        MainActivityRuntime.prefs.edit {
+            remove(KEY_DPAD_AS_LSTICK)
+                .remove(KEY_LSTICK_INVX).remove(KEY_LSTICK_INVY).remove(KEY_LSTICK_SWAP)
+                .remove(KEY_RSTICK_INVX).remove(KEY_RSTICK_INVY).remove(KEY_RSTICK_SWAP)
+            prefStickSens.reset(this); prefStickAccel.reset(this); prefStickDz.reset(this)
+            prefStickOuter.reset(this); prefStickAntiDz.reset(this)
+            for (p in intArrayOf(P1, P2)) {
+                remove(playerPrefix(p) + KEY_LSTICK).remove(playerPrefix(p) + KEY_RSTICK)
+                for (left in booleanArrayOf(true, false))
+                    for (dir in StickDir.values())
+                        remove(customKey(left, dir, p))
+            }
+        }
+        stickBindTick.value++
+    }
+
+    fun targetForPhysical(physicalKeyCode: Int, player: Int = 0): Int? {
+        if (physicalKeyCode == KeyEvent.KEYCODE_UNKNOWN) return null
+        return actions.firstOrNull { physicalFor(it, player) == physicalKeyCode }?.targetKeyCode
+    }
+
+    private const val TURBO_PREFIX = "pad.turbo."
+    private fun turboKey(action: Action, player: Int) = playerPrefix(player) + TURBO_PREFIX + action.id
+    fun isTurboAction(action: Action, player: Int = 0): Boolean =
+        MainActivityRuntime.prefs.getBoolean(turboKey(action, player), false)
+    fun setTurboAction(action: Action, player: Int, on: Boolean) =
+        MainActivityRuntime.prefs.edit { putBoolean(turboKey(action, player), on) }
+
+    fun isTurboTarget(targetKeyCode: Int, player: Int = 0): Boolean {
+        val action = actions.firstOrNull { it.targetKeyCode == targetKeyCode } ?: return false
+        return isTurboAction(action, player)
+    }
+
+    enum class SysHotkey(val prefKey: String, val label: String) {
+        MENU("pad.menu.keycode", "Menu / Pause"),
+        SAVE_STATE("pad.savestate.keycode", "Quick Save State"),
+        LOAD_STATE("pad.loadstate.keycode", "Quick Load State"),
+        CYCLE_SLOT("pad.cycleslot.keycode", "Cycle Save Slot"),
+        TEXTURE_DUMP("pad.texdump.keycode", "Toggle Texture Dumping"),
+        TOGGLE_OSD("pad.toggleosd.keycode", "Toggle Perf Stats (OSD)"),
+        FAST_FORWARD("pad.fastforward.keycode", "Fast Forward (hold)"),
+        FAST_FORWARD_TOGGLE("pad.fastforwardtoggle.keycode", "Fast Forward (toggle)"),
+        SLOW_DOWN("pad.slowdown.keycode", "Slow Down (toggle)"),
+        RES_UP("pad.resup.keycode", "Increase Resolution"),
+        RES_DOWN("pad.resdown.keycode", "Decrease Resolution"),
+        ACHIEVEMENTS("pad.achievements.keycode", "Open Achievements"),
+        CLOSE_GAME("pad.closegame.keycode", "Close Game"),
+        QUIT_APP("pad.quitapp.keycode", "Close Game & Quit"),
+        SAVE_AND_EXIT("pad.saveandexit.keycode", "Save State & Exit"),
+        RESET_GAME("pad.resetgame.keycode", "Reset Game"),
+        PRESSURE_MOD("pad.pressuremod.keycode", "Pressure Modifier (hold)"),
+        GYRO_TOGGLE("pad.gyrotoggle.keycode", "Gyro On/Off (toggle)"),
+        GYRO_HOLD("pad.gyrohold.keycode", "Gyro (hold to aim)"),
+    }
+
+    private const val MOD_SUFFIX = ".mod"
+
+    fun hotkeyCode(h: SysHotkey): Int =
+        MainActivityRuntime.prefs.getInt(h.prefKey, KeyEvent.KEYCODE_UNKNOWN)
+
+    fun hotkeyModCode(h: SysHotkey): Int =
+        MainActivityRuntime.prefs.getInt(h.prefKey + MOD_SUFFIX, KeyEvent.KEYCODE_UNKNOWN)
+
+    fun bindHotkey(h: SysHotkey, physicalKeyCode: Int) {
+        MainActivityRuntime.prefs.edit {
+            putInt(h.prefKey, physicalKeyCode)
+                .putInt(h.prefKey + MOD_SUFFIX, KeyEvent.KEYCODE_UNKNOWN)
+        }
+    }
+
+    fun bindHotkeyCombo(h: SysHotkey, modCode: Int, keyCode: Int) {
+        MainActivityRuntime.prefs.edit {
+            putInt(h.prefKey, keyCode)
+                .putInt(h.prefKey + MOD_SUFFIX, modCode)
+        }
+    }
+
+    fun clearHotkey(h: SysHotkey) {
+        MainActivityRuntime.prefs.edit {
+            putInt(h.prefKey, KeyEvent.KEYCODE_UNKNOWN)
+                .putInt(h.prefKey + MOD_SUFFIX, KeyEvent.KEYCODE_UNKNOWN)
+        }
+    }
+
+    fun clearAllHotkeys() {
+        MainActivityRuntime.prefs.edit {
+            SysHotkey.values().forEach {
+                putInt(it.prefKey, KeyEvent.KEYCODE_UNKNOWN)
+                    .putInt(it.prefKey + MOD_SUFFIX, KeyEvent.KEYCODE_UNKNOWN)
+            }
+        }
+        hotkeyBindTick.value++
+    }
+
+    fun hotkeyLabel(h: SysHotkey): String {
+        val key = hotkeyCode(h)
+        if (key == KeyEvent.KEYCODE_UNKNOWN) return ""
+        val mod = hotkeyModCode(h)
+        return if (mod == KeyEvent.KEYCODE_UNKNOWN) labelForKey(key)
+        else "${labelForKey(mod)} + ${labelForKey(key)}"
+    }
+
+    fun hotkeyFor(physicalKeyCode: Int): SysHotkey? {
+        if (physicalKeyCode == KeyEvent.KEYCODE_UNKNOWN) return null
+        return SysHotkey.values().firstOrNull {
+            hotkeyCode(it) == physicalKeyCode && hotkeyModCode(it) == KeyEvent.KEYCODE_UNKNOWN
+        }
+    }
+
+    fun matchHotkey(keyCode: Int, heldKeys: Set<Int>): SysHotkey? {
+        if (keyCode == KeyEvent.KEYCODE_UNKNOWN) return null
+        SysHotkey.values().firstOrNull {
+            hotkeyCode(it) == keyCode &&
+                hotkeyModCode(it) != KeyEvent.KEYCODE_UNKNOWN &&
+                heldKeys.contains(hotkeyModCode(it))
+        }?.let { return it }
+        return SysHotkey.values().firstOrNull {
+            hotkeyCode(it) == keyCode && hotkeyModCode(it) == KeyEvent.KEYCODE_UNKNOWN
+        }
+    }
+
+    val padCapturing = mutableStateOf(false)
+
+    val capturePadAction = mutableStateOf<((Int) -> Boolean)?>(null)
+
+    val captureHotkey = mutableStateOf<SysHotkey?>(null)
+
+    val captureKeys = mutableListOf<Int>()
+
+    var captureFirstDownMs = 0L
+
+    fun beginHotkeyCapture(h: SysHotkey) {
+        captureKeys.clear()
+        captureHotkey.value = h
+    }
+
+    fun endHotkeyCapture() {
+        captureKeys.clear()
+        captureHotkey.value = null
+        hotkeyBindTick.value++
+    }
+
+    val hotkeyBindTick = mutableStateOf(0)
+}
diff --git a/armsx2/src/main/java/com/armsx2/input/PadRouter.kt b/armsx2/src/main/java/com/armsx2/input/PadRouter.kt
new file mode 100644
index 000000000..ca86c1a69
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/input/PadRouter.kt
@@ -0,0 +1,40 @@
+package com.armsx2.input
+
+import android.view.InputDevice
+
+object PadRouter {
+    private val slots = IntArray(8) { -1 }
+    @Volatile private var pad2Enabled = false
+
+    @Volatile var multitapEnabled = false
+
+    @Volatile var onPlayer2Joined: (() -> Unit)? = null
+
+    fun reset() {
+        for (i in slots.indices) slots[i] = -1
+        pad2Enabled = false
+    }
+
+    fun coopActive(): Boolean = slots[1] != -1
+
+    fun deviceIdForPort(port: Int): Int =
+        if (port in slots.indices) slots[port] else -1
+
+    fun portForDevice(deviceId: Int): Int {
+        if (deviceId < 0) return 0
+        for (i in slots.indices) if (slots[i] == deviceId) return i
+        val src = InputDevice.getDevice(deviceId)?.sources ?: 0
+        val isPad = (src and InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD ||
+            (src and InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK
+        if (!isPad) return 0
+        val maxSlots = if (multitapEnabled) 8 else 2
+        for (i in 0 until maxSlots) {
+            if (slots[i] == -1) {
+                slots[i] = deviceId
+                if (i == 1 && !pad2Enabled) { pad2Enabled = true; onPlayer2Joined?.invoke() }
+                return i
+            }
+        }
+        return 0
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/runtime/EmulationSurface.kt b/armsx2/src/main/java/com/armsx2/runtime/EmulationSurface.kt
new file mode 100644
index 000000000..48e0e69b7
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/runtime/EmulationSurface.kt
@@ -0,0 +1,89 @@
+package com.armsx2.runtime
+
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import android.view.Window
+import android.view.WindowManager
+import kr.co.iefriends.pcsx2.NativeApp
+
+class EmulationSurface(context: Context) : SurfaceView(context), SurfaceHolder.Callback {
+    private var viewWidth = 0
+    private var viewHeight = 0
+
+    init {
+        holder.addCallback(this)
+        isFocusable = true
+        isFocusableInTouchMode = true
+        defaultFocusHighlightEnabled = false
+        keepScreenOn = true
+    }
+
+    private fun hostWindow(): Window? {
+        var current: Context? = context
+        while (current is ContextWrapper) {
+            if (current is Activity) return current.window
+            current = current.baseContext
+        }
+        return null
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        hostWindow()?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
+
+    override fun onDetachedFromWindow() {
+        hostWindow()?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        super.onDetachedFromWindow()
+    }
+
+    override fun surfaceCreated(holder: SurfaceHolder) {
+        requestFocus()
+    }
+
+    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
+        NativeApp.setDisplayRefreshRate(currentDisplayRefreshHz())
+        NativeApp.onNativeSurfaceChanged(holder.surface, width, height)
+    }
+
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
+        NativeApp.onNativeSurfaceChanged(null, 0, 0)
+    }
+
+    override fun onSizeChanged(width: Int, height: Int, oldWidth: Int, oldHeight: Int) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight)
+        viewWidth = width
+        viewHeight = height
+        applyOutputScale()
+    }
+
+    fun applyOutputScale() {
+        val multiplier = MainActivityRuntime.prefs.getInt("ui.hwScaler", 0)
+        if (viewWidth <= 0 || viewHeight <= 0) return
+        if (multiplier <= 0) {
+            holder.setSizeFromLayout()
+            return
+        }
+
+        val shortSide = minOf(viewWidth, viewHeight)
+        val targetShortSide = 448 * multiplier
+        if (targetShortSide >= shortSide) {
+            holder.setSizeFromLayout()
+            return
+        }
+
+        val scale = targetShortSide.toFloat() / shortSide
+        holder.setFixedSize(
+            (viewWidth * scale).toInt().coerceAtLeast(1),
+            (viewHeight * scale).toInt().coerceAtLeast(1),
+        )
+    }
+
+    private fun currentDisplayRefreshHz(): Float = runCatching {
+        val currentDisplay = if (android.os.Build.VERSION.SDK_INT >= 30) context.display else display
+        currentDisplay?.refreshRate ?: 0f
+    }.getOrDefault(0f)
+}
diff --git a/armsx2/src/main/java/com/armsx2/runtime/MainActivityRuntime.kt b/armsx2/src/main/java/com/armsx2/runtime/MainActivityRuntime.kt
new file mode 100644
index 000000000..172548995
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/runtime/MainActivityRuntime.kt
@@ -0,0 +1,2166 @@
+package com.armsx2.runtime
+
+import android.app.ActivityManager
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.res.Configuration
+import android.content.pm.ActivityInfo
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Process
+import android.os.SystemClock
+import android.view.InputDevice
+import android.view.KeyCharacterMap
+import android.view.KeyEvent
+import android.view.MotionEvent
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.addCallback
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.compose.foundation.background
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.nativeKeyCode
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.lifecycleScope
+import com.armsx2.BuildConfig
+import com.armsx2.EmuState
+import com.armsx2.FilenameParser
+import com.armsx2.GameInfo
+import com.armsx2.events.TestResult
+import com.armsx2.input.ControllerMappings
+import com.armsx2.runtime.MainActivityRuntime.Companion.internalBiosDir
+import com.armsx2.runtime.MainActivityRuntime.Companion.romsDirs
+import com.armsx2.ui.InGameOverlay
+import com.armsx2.ui.WindowImpl
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.launch
+import kr.co.iefriends.pcsx2.AssetFiles
+import kr.co.iefriends.pcsx2.NativeApp
+import org.libsdl.app.HIDDeviceManager
+import org.libsdl.app.SDLControllerManager
+import java.io.File
+import java.io.IOException
+import java.util.concurrent.Executors
+import kotlin.math.abs
+import kotlin.math.min
+import androidx.core.net.toUri
+import androidx.core.content.edit
+
+private const val LIGHT_NAVIGATION_BAR_SCRIM = 0x04000000
+private const val DARK_NAVIGATION_BAR_SCRIM = 0x0A000000
+
+private const val STICK_DEAD = 0.15f
+private const val TRIGGER_DEAD = 0.06f
+private const val STICK_DIGITAL_THRESHOLD = 0.5f
+private const val STICK_CROSS_GATE = 0.15f
+private const val UI_NAV_DEAD = 0.20f
+private const val UI_NAV_RELEASE_DEAD = 0.06f
+private const val UI_HAT_DEAD = 0.50f
+private const val UI_NAV_DOMINANCE = 1.35f
+private const val UI_OVERLAY_RELEASE_MS = 80L
+private const val UI_KEY_AXIS_SUPPRESS_MS = 220L
+private const val NAV_REPEAT_INITIAL_MS = 340L
+private const val NAV_REPEAT_INTERVAL_MS = 110L
+
+private const val COMBO_MIN_GAP_MS = 40L
+
+val codeGenTests = mutableStateOf("")
+val patchTests = mutableStateOf("")
+val vuJitTests = mutableStateOf("")
+val eeJitTests = mutableStateOf("")
+val vifTests = mutableStateOf("")
+val eeSeqTests = mutableStateOf("")
+
+open class MainActivityRuntime : ComponentActivity() {
+    companion object {
+        fun nativeGetRegionForSerial(serial: String): String = NativeApp.getRegionForSerial(serial)
+
+        fun nativeSetRumbleEnabled(on: Boolean) {
+            NativeApp.sRumbleEnabled = on
+        }
+
+        fun nativeSetMultitap(port: Int, on: Boolean) = NativeApp.setMultitap(port, on)
+
+        fun nativeClearAchievementsHostOverride() = NativeApp.clearAchievementsHostOverride()
+
+        var instance: MainActivityRuntime? = null
+        lateinit var prefs: SharedPreferences
+        val setupComplete = mutableStateOf(false)
+        val setupRecoveryNeeded = mutableStateOf(false)
+        val setupEditorVisible = mutableStateOf(false)
+        val nativeReady = mutableStateOf(false)
+        val systemDir = mutableStateOf<String?>(null)
+        val bios = mutableStateOf<String?>(null)
+        val biosDir = mutableStateOf<String?>(null)
+
+        val romsDirs = mutableStateOf<List<String>>(emptyList())
+
+        fun setRomsDirs(dirs: List<String>) {
+            romsDirs.value = dirs
+            val arr = org.json.JSONArray()
+            for (d in dirs) arr.put(d)
+            prefs.edit {
+                putString("romsDirs", arr.toString())
+                    .remove("roms")
+            }
+        }
+
+        val renderer = mutableStateOf("auto")
+        val upscale = androidx.compose.runtime.mutableFloatStateOf(1.0f)
+
+        val customDriverId = mutableStateOf<String?>(null)
+
+        private val eDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+
+        private val eScope = CoroutineScope(
+            eDispatcher + SupervisorJob() +
+                CoroutineExceptionHandler { _, t ->
+                    android.util.Log.e("ARMSX2", "emulator task failed", t)
+                },
+        )
+
+        private val nativeReadyLock = Any()
+        private var nativeInitialized = false
+        private val nativeReadyWaiters = ArrayList<() -> Unit>()
+
+        @JvmStatic
+        fun runWhenNativeReady(block: () -> Unit) {
+            val deferred = synchronized(nativeReadyLock) {
+                if (nativeInitialized) {
+                    false
+                } else {
+                    nativeReadyWaiters.add(block)
+                    true
+                }
+            }
+            if (!deferred) Thread { runCatching { block() } }.start()
+        }
+
+        @JvmStatic
+        fun isNativeReady(): Boolean = synchronized(nativeReadyLock) { nativeInitialized }
+
+        private fun flushNativeReadyWaiters() {
+            val pending = synchronized(nativeReadyLock) {
+                nativeInitialized = true
+                val copy = ArrayList(nativeReadyWaiters)
+                nativeReadyWaiters.clear()
+                copy
+            }
+            for (waiter in pending) {
+                runCatching { waiter() }
+                    .onFailure { android.util.Log.e("ARMSX2", "deferred native task failed", it) }
+            }
+        }
+
+        fun systemDirPosix(): String? {
+            val v = systemDir.value ?: return null
+            return if (v.startsWith("content://")) resolveTreeUriToPosix(v) else v
+        }
+
+        fun inputProfilesDir(): File? {
+            val root = systemDirPosix()
+                ?: instance?.applicationContext?.getExternalFilesDir(null)?.absolutePath
+                ?: return null
+            val dir = File(root, "inputprofiles")
+            if (!dir.exists()) runCatching { dir.mkdirs() }
+            return if (dir.isDirectory) dir else null
+        }
+
+        fun sdCardDataDir(context: Context): String? {
+            val dirs = context.getExternalFilesDirs(null)
+            for (i in 1 until dirs.size) {
+                val d = dirs[i] ?: continue
+                return d.absolutePath
+            }
+            return null
+        }
+
+        fun biosFolderPosix(): String? =
+            bios.value?.takeIf { it.isNotEmpty() }?.let { File(it).parent }
+
+        fun internalBiosDir(context: Context): File =
+            File(context.getExternalFilesDir(null) ?: context.dataDir, "bios")
+
+        fun resolveTreeUriToPosix(uriString: String?): String? {
+            val raw = uriString ?: return null
+            val uri = try {
+                raw.toUri() } catch (_: Exception) { return null }
+            val docId = try {
+                android.provider.DocumentsContract.getTreeDocumentId(uri)
+            } catch (_: Exception) { null } ?: return null
+            val parts = docId.split(":", limit = 2)
+            if (parts.size != 2) return null
+            val (volumeId, relPath) = parts
+            return when (volumeId) {
+                "primary" -> "/storage/emulated/0/$relPath"
+                else -> "/storage/$volumeId/$relPath"
+            }
+        }
+
+        fun validateSystemDirWritable(posixPath: String): Boolean {
+            return try {
+                val dir = File(posixPath)
+                if (!dir.exists() && !dir.mkdirs()) return false
+                if (!dir.isDirectory) return false
+                val probe = File(dir, ".armsx2-write-probe")
+                val ok = probe.createNewFile()
+                if (ok) probe.delete()
+                ok
+            } catch (_: Exception) {
+                false
+            }
+        }
+
+        val surface = mutableStateOf<EmulationSurface?>(null)
+
+        @JvmField
+        val eState = mutableStateOf(EmuState.STOPPED)
+
+        val currentSaveSlot = androidx.compose.runtime.mutableIntStateOf(0)
+
+        @Volatile var fastForwardToggleActive = false
+
+        @Volatile var slowDownToggleActive = false
+
+        val gyroActive = mutableStateOf(true)
+
+        @Volatile var usbKeyboardActive = false
+
+        val currentGame = mutableStateOf<GameInfo?>(null)
+
+        val focusRequester = FocusRequester()
+
+        private var m_szGamefile = ""
+        private val pendingExternalLaunch = mutableStateOf<String?>(null)
+        private val pendingLaunch = mutableStateOf<Pair<String, GameInfo?>?>(null)
+
+        fun onTestResults(result: TestResult) {
+            when (result.name) {
+                "VuJitTests" -> vuJitTests.value = "${result.passed}/${result.total}"
+                "PatchTests" -> patchTests.value = "${result.passed}/${result.total}"
+                "CodegenTests" -> codeGenTests.value = "${result.passed}/${result.total}"
+                "EeJitTests" -> eeJitTests.value = "${result.passed}/${result.total}"
+                "VifTests" -> vifTests.value = "${result.passed}/${result.total}"
+                "EeSeqTests" -> eeSeqTests.value = "${result.passed}/${result.total}"
+                else -> println("Test:${result.name}: ${result.passed}/${result.total}")
+            }
+        }
+
+        fun invoke(task: suspend () -> Unit) {
+            eScope.launch {
+                task()
+            }
+        }
+
+        private val vmLifecycleLock = Any()
+        @Volatile private var vmStopInProgress = false
+        @Volatile private var vmRestartAfterStop = false
+        @Volatile private var vmRunLoopActive = false
+
+        @Volatile var quitAfterStop = false
+        @Volatile var launchedExternally = false
+
+        private fun finishToLauncherIfRequested() {
+            if (quitAfterStop) {
+                quitAfterStop = false
+                instance?.runOnUiThread {
+                    if (com.armsx2.WinNativeHost.enabled()) instance?.finish() else instance?.finishAndRemoveTask()
+                }
+            }
+        }
+
+        @JvmStatic
+        fun closeGame(saveAutosave: Boolean = false) {
+            if (launchedExternally && prefs.getBoolean("ui.exitToLauncherExternal", true))
+                quitAfterStop = true
+            stop(saveAutosave = saveAutosave)
+        }
+
+        @JvmStatic
+        fun exitApp() {
+            if (eState.value == EmuState.STOPPED && !vmStopInProgress && !vmRunLoopActive) {
+                instance?.runOnUiThread {
+                    if (com.armsx2.WinNativeHost.enabled()) instance?.finish() else instance?.finishAndRemoveTask()
+                }
+            } else {
+                quitAfterStop = true
+                stop()
+            }
+        }
+
+        @JvmStatic
+        fun isVmStopInProgress(): Boolean = vmStopInProgress
+
+        fun start() {
+            synchronized(vmLifecycleLock) {
+                if (vmStopInProgress || vmRunLoopActive || eState.value != EmuState.STOPPED) {
+                    vmRestartAfterStop = true
+                    return
+                }
+                vmRunLoopActive = true
+            }
+
+            invoke {
+                try {
+                    eState.value = EmuState.RUNNING
+                    println("@@ANDROID_START_VM@@ kind=game path=${m_szGamefile.take(240)}")
+                    com.armsx2.input.PadRouter.reset()
+                    WindowImpl.showLibrary.value = false
+                    WindowImpl.overlayVisible.value = false
+                    WindowImpl.toolbarVisible.value = false
+                    applyRendererPrefs()
+                    NativeApp.runVMThread(m_szGamefile)
+                } finally {
+                    eState.value = EmuState.STOPPED
+                    val restartNow = synchronized(vmLifecycleLock) {
+                        vmRunLoopActive = false
+                        vmStopInProgress = false
+                        if (vmRestartAfterStop) {
+                            vmRestartAfterStop = false
+                            true
+                        } else {
+                            false
+                        }
+                    }
+                    if (restartNow) {
+                        start()
+                    } else {
+                        WindowImpl.toolbarVisible.value = true
+                        WindowImpl.showLibrary.value = false
+                        WindowImpl.overlayVisible.value = false
+                        finishToLauncherIfRequested()
+                    }
+                }
+            }
+        }
+
+        private fun connectedGamepadCount(): Int {
+            var n = 0
+            for (id in InputDevice.getDeviceIds()) {
+                val dev = InputDevice.getDevice(id) ?: continue
+                if (dev.isVirtual) continue
+                val s = dev.sources
+                if ((s and InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD ||
+                    (s and InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK) n++
+            }
+            return n
+        }
+
+        private fun applyRendererPrefs() {
+            instance?.applicationContext?.let { com.armsx2.WinNativeHost.applyBootSettings?.invoke(it) }
+            var resolved = com.armsx2.config.ConfigStore.resolveForGame(currentGame.value?.settingsKey)
+            currentGame.value?.serial?.takeIf { it.isNotBlank() }?.let { serial ->
+                if (prefs.getBoolean("memcard.perGame", false) &&
+                    resolved.memoryCardSlot1Filename.equals("mcd001.ps2", ignoreCase = true)) {
+                    resolved = resolved.copy(
+                        memoryCardSlot1Filename = "$serial.ps2",
+                        memoryCardSlot1Enabled = true,
+                    )
+                }
+            }
+            run {
+                val effectiveBios = resolved.biosFilename.takeIf { it.isNotBlank() }
+                    ?: bios.value?.takeIf { it.isNotEmpty() }?.let { File(it).name }
+                if (!effectiveBios.isNullOrBlank()) {
+                    NativeApp.setSetting("Filenames", "BIOS", "string", effectiveBios)
+                    NativeApp.commitSettings()
+                }
+            }
+            upscale.value = resolved.upscaleFloat
+            renderer.value = resolved.renderer
+            NativeApp.renderUpscalemultiplier(upscale.value)
+            val ctx = instance?.applicationContext
+            val picked: com.armsx2.CustomDriver.InstalledDriver? =
+                if (ctx != null) customDriverId.value?.let { id ->
+                    com.armsx2.CustomDriver.listInstalled(ctx).firstOrNull { it.id == id }
+                } else null
+            if (ctx != null) com.armsx2.CustomDriver.applyToNative(ctx, picked)
+            when {
+                picked != null -> NativeApp.renderVulkan()
+                renderer.value == "vulkan" -> NativeApp.renderVulkan()
+                renderer.value == "opengl" -> NativeApp.renderOpenGL()
+                renderer.value == "software" -> NativeApp.renderSoftware()
+                else -> NativeApp.renderAuto()
+            }
+            val winNativeHost = com.armsx2.WinNativeHost.applyBootSettings != null
+            if (winNativeHost) {
+                val want = prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3)
+                val safe =
+                    when (want) {
+                        3 -> 3
+                        2 -> 2
+                        else -> 2
+                    }
+                resolved = resolved.copy(aspectRatio = safe)
+            }
+            resolved.applyTo()
+            instance?.applicationContext?.let { com.armsx2.WinNativeHost.applyBootSettings?.invoke(it) }
+            if (winNativeHost) {
+                val want = prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3)
+                val safe =
+                    when (want) {
+                        3 -> 3
+                        2 -> 2
+                        else -> 2
+                    }
+                val name =
+                    when (safe) {
+                        3 -> "16:9"
+                        else -> "4:3"
+                    }
+                runCatching {
+                    NativeApp.setSetting("EmuCore/GS", "AspectRatio", "string", name)
+                    NativeApp.setAspectRatio(safe)
+                    NativeApp.commitSettings()
+                }
+            }
+            usbKeyboardActive = resolved.usbKeyboard
+
+            runCatching {
+                NativeApp.setSetting("Pad1", "Deadzone", "float", "0")
+                NativeApp.setSetting("Pad2", "Deadzone", "float", "0")
+                val twoPads = connectedGamepadCount() >= 2
+                NativeApp.setSetting("Pad2", "Type", "string", if (twoPads) "DualShock2" else "None")
+                if (twoPads) {
+                    NativeApp.setSetting("Pad2", "AxisScale", "float", "1.33")
+                    NativeApp.setSetting("Pad2", "ButtonDeadzone", "float", "0")
+                }
+                if (ControllerMappings.multitapEnabled()) {
+                    NativeApp.setSetting("Pad", "MultitapPort1", "bool", "true")
+                    NativeApp.setSetting("Pad", "MultitapPort2", "bool", "true")
+                    for (s in 2..8) {
+                        NativeApp.setSetting("Pad$s", "Type", "string", "DualShock2")
+                        NativeApp.setSetting("Pad$s", "Deadzone", "float", "0")
+                        NativeApp.setSetting("Pad$s", "AxisScale", "float", "1.33")
+                        NativeApp.setSetting("Pad$s", "ButtonDeadzone", "float", "0")
+                    }
+                }
+            }
+
+            runCatching {
+                val netOn = prefs.getBoolean("wn.ps2.net.enable", true)
+                NativeApp.setSetting("DEV9/Eth", "EthEnable", "bool", netOn.toString())
+                if (netOn) {
+                    NativeApp.setSetting("DEV9/Eth", "EthApi", "string", "Sockets")
+                    NativeApp.setSetting("DEV9/Eth", "EthDevice", "string", (prefs.getString("wn.ps2.net.ethdevice", "Auto") ?: "Auto").ifBlank { "Auto" })
+                    NativeApp.setSetting("DEV9/Eth", "InterceptDHCP", "bool", prefs.getBoolean("wn.ps2.net.dhcp", true).toString())
+                    NativeApp.setSetting("DEV9/Eth", "AutoMask", "bool", "true")
+                    NativeApp.setSetting("DEV9/Eth", "AutoGateway", "bool", "true")
+                    val dnsMode = prefs.getString("wn.ps2.net.dnsmode", "Manual") ?: "Manual"
+                    NativeApp.setSetting("DEV9/Eth", "ModeDNS1", "string", dnsMode)
+                    NativeApp.setSetting("DEV9/Eth", "ModeDNS2", "string", "Auto")
+                    NativeApp.setSetting("DEV9/Eth", "DNS1", "string", (prefs.getString("wn.ps2.net.dns1", "45.7.228.197") ?: "45.7.228.197").ifBlank { "45.7.228.197" })
+                    NativeApp.setSetting("DEV9/Eth", "DNS2", "string", (prefs.getString("wn.ps2.net.dns2", "") ?: "").ifBlank { "0.0.0.0" })
+                }
+            }
+
+            val limit = InGameOverlay.frameLimitOn.value
+            NativeApp.setSetting("EmuCore/GS", "FrameLimitEnable", "bool", limit.toString())
+            NativeApp.speedhackLimitermode(
+                when {
+                    fastForwardToggleActive -> 1
+                    slowDownToggleActive -> 2
+                    else -> if (limit) 0 else 3
+                }
+            )
+        }
+
+        fun launchGame(uri: String, info: GameInfo? = null, external: Boolean = false) {
+            if (uri.isBlank()) {
+                println("@@ANDROID_LAUNCH_REJECT@@ reason=blank_uri title=${info?.title ?: ""}")
+                return
+            }
+            println(
+                "@@ANDROID_LAUNCH_GAME@@ title=${info?.title ?: "<direct>"} " +
+                    "uri=${uri.take(240)} state=${eState.value} runLoop=$vmRunLoopActive " +
+                    "stopping=$vmStopInProgress nativeReady=${nativeReady.value}"
+            )
+            instance?.applicationContext?.let { applyAngleEnv(it) }
+            if (!nativeReady.value) {
+                println("@@ANDROID_LAUNCH_DEFER@@ nativeReady=false — queuing '${info?.title ?: uri.take(80)}'")
+                pendingLaunch.value = uri to info
+                return
+            }
+            currentGame.value = info
+            launchedExternally = external
+            pendingAutoLoadOnBoot = prefs.getBoolean("autoLoadOnBoot", false)
+            m_szGamefile = uri
+            synchronized(vmLifecycleLock) {
+                if (eState.value != EmuState.STOPPED || vmStopInProgress || vmRunLoopActive) {
+                    vmRestartAfterStop = true
+                }
+            }
+            if (eState.value == EmuState.STOPPED && !vmStopInProgress && !vmRunLoopActive)
+                start()
+            else
+                stop(restartAfterStop = true)
+        }
+
+        private fun launchPendingExternalGameIfReady() {
+            if (!setupComplete.value || !nativeReady.value) return
+            pendingLaunch.value?.let { (u, i) ->
+                pendingLaunch.value = null
+                launchGame(u, i)
+                return
+            }
+            val queued = pendingExternalLaunch.value
+            if (queued.isNullOrEmpty()) return
+            pendingExternalLaunch.value = null
+            launchGame(queued, null, external = true)
+        }
+
+        fun startBios() {
+            currentGame.value = null
+            m_szGamefile = ""
+            val shouldStart = synchronized(vmLifecycleLock) {
+                if (vmStopInProgress || vmRunLoopActive || eState.value != EmuState.STOPPED) {
+                    vmRestartAfterStop = true
+                    false
+                } else {
+                    vmRunLoopActive = true
+                    true
+                }
+            }
+            if (!shouldStart) {
+                stop(restartAfterStop = true)
+                return
+            }
+            invoke {
+                try {
+                    eState.value = EmuState.RUNNING
+                    println("@@ANDROID_START_VM@@ kind=bios path=<empty>")
+                    com.armsx2.input.PadRouter.reset()
+                    applyRendererPrefs()
+                    NativeApp.runVMThread(m_szGamefile)
+                } finally {
+                    eState.value = EmuState.STOPPED
+                    val restartNow = synchronized(vmLifecycleLock) {
+                        vmRunLoopActive = false
+                        vmStopInProgress = false
+                        if (vmRestartAfterStop) {
+                            vmRestartAfterStop = false
+                            true
+                        } else {
+                            false
+                        }
+                    }
+                    if (restartNow) {
+                        start()
+                    }
+                }
+            }
+        }
+
+        private val vmControl = Executors.newSingleThreadExecutor { r ->
+            Thread(r, "VMControl")
+        }
+        private val vmStopControl = Executors.newSingleThreadExecutor { r ->
+            Thread(r, "VMStop")
+        }
+
+        fun pause() {
+            if (vmStopInProgress)
+                return
+            vmControl.execute {
+                if (!vmStopInProgress)
+                    NativeApp.pause()
+            }
+        }
+
+        fun pauseForOverlay() {
+            if (vmStopInProgress)
+                return
+            NativeApp.pause()
+        }
+
+        fun resume() {
+            if (vmStopInProgress)
+                return
+            vmControl.execute {
+                if (!vmStopInProgress)
+                    NativeApp.resume()
+            }
+        }
+
+        fun stop(saveAutosave: Boolean = false, restartAfterStop: Boolean = false) {
+            fastForwardToggleActive = false
+            slowDownToggleActive = false
+            gyroActive.value = true
+            val nativeActive = runCatching { NativeApp.hasActiveVM() }.getOrDefault(false)
+            val shouldStop = synchronized(vmLifecycleLock) {
+                if (restartAfterStop)
+                    vmRestartAfterStop = true
+                else
+                    vmRestartAfterStop = false
+
+                if (vmStopInProgress) {
+                    nativeActive
+                } else if (eState.value == EmuState.STOPPED && !vmRunLoopActive && !nativeActive) {
+                    false
+                } else {
+                    vmStopInProgress = true
+                    true
+                }
+            }
+            if (!shouldStop)
+                return
+
+            WindowImpl.overlayVisible.value = false
+            WindowImpl.showLibrary.value = false
+            val doAutosave = saveAutosave ||
+                (!restartAfterStop &&
+                    runCatching { prefs.getBoolean("autoSaveOnExit", false) }.getOrDefault(false))
+            vmStopControl.execute {
+                println("@@ANDROID_STOP_JAVA@@ begin saveAutosave=$doAutosave forced=$saveAutosave restart=$restartAfterStop")
+                if (doAutosave)
+                    NativeApp.saveAutosaveState()
+                NativeApp.shutdown()
+                println("@@ANDROID_STOP_JAVA@@ shutdown_return active=${NativeApp.hasActiveVM()} runLoop=$vmRunLoopActive state=${eState.value}")
+                if (!vmRunLoopActive && (eState.value == EmuState.STOPPED || !NativeApp.hasActiveVM())) {
+                    eState.value = EmuState.STOPPED
+                    val restartNow = synchronized(vmLifecycleLock) {
+                        vmStopInProgress = false
+                        if (vmRestartAfterStop) {
+                            vmRestartAfterStop = false
+                            true
+                        } else {
+                            false
+                        }
+                    }
+                    if (restartNow) {
+                        start()
+                    } else {
+                        synchronized(vmLifecycleLock) {
+                            WindowImpl.toolbarVisible.value = true
+                            WindowImpl.showLibrary.value = false
+                            WindowImpl.overlayVisible.value = false
+                        }
+                        currentGame.value = null
+                        finishToLauncherIfRequested()
+                    }
+                }
+            }
+        }
+
+        fun restart() {
+            synchronized(vmLifecycleLock) {
+                vmRestartAfterStop = true
+            }
+            if (eState.value == EmuState.STOPPED && !vmStopInProgress && !vmRunLoopActive)
+                start()
+            else
+                stop(restartAfterStop = true)
+        }
+
+        fun promptSwapDisc() {
+            val activity = instance ?: return
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                type = "*/*"
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
+            runCatching { activity.swapDiscAction.launch(intent) }
+        }
+
+        fun applyAngleEnv(context: Context) {
+            val settings = runCatching { com.armsx2.config.ConfigStore.loadGlobal() }.getOrNull()
+            val eligible = settings?.useAngleOpenGL == true && settings.renderer == "opengl"
+            val libDir = context.applicationInfo.nativeLibraryDir
+            val egl = File(libDir, "libEGL_angle.so")
+            val gles = File(libDir, "libGLESv2_angle.so")
+            try {
+                if (eligible && egl.exists() && gles.exists()) {
+                    android.system.Os.setenv("ARMSX2_ANGLE_EGL_LIBRARY", egl.absolutePath, true)
+                    android.system.Os.setenv("ARMSX2_ANGLE_GLES_LIBRARY", gles.absolutePath, true)
+                    android.util.Log.i("ARMSX2", "ANGLE OpenGL enabled: ${egl.absolutePath}")
+                } else {
+                    runCatching { android.system.Os.unsetenv("ARMSX2_ANGLE_EGL_LIBRARY") }
+                    runCatching { android.system.Os.unsetenv("ARMSX2_ANGLE_GLES_LIBRARY") }
+                }
+            } catch (e: Exception) {
+                android.util.Log.e("ARMSX2", "applyAngleEnv failed: ${e.message}")
+            }
+        }
+
+        @Volatile
+        var pendingAutoLoadOnBoot = false
+
+        @Volatile
+        private var pendingSlotLoadOnBoot: Int? = null
+
+        fun launchCurrentGameFromSaveSlot(slot: Int): Boolean {
+            val game = currentGame.value ?: return false
+            val launchPath = if (game.uri.scheme == "file") {
+                game.uri.path ?: game.uri.toString()
+            } else {
+                game.uri.toString()
+            }
+            if (launchPath.isBlank()) return false
+            pendingSlotLoadOnBoot = slot
+            pendingAutoLoadOnBoot = false
+            launchGame(launchPath, game)
+            return true
+        }
+
+        private fun adoptExternalGameIdentity() {
+            if (!launchedExternally || currentGame.value != null) return
+            val path = m_szGamefile.takeIf { it.isNotEmpty() } ?: return
+            val handler = android.os.Handler(android.os.Looper.getMainLooper())
+            handler.post(object : Runnable {
+                var attempts = 0
+                override fun run() {
+                    if (vmStopInProgress || eState.value == EmuState.STOPPED) return
+                    if (currentGame.value != null) return
+                    val serial = runCatching { NativeApp.getGameSerial() }.getOrNull()
+                        ?.trim()?.uppercase()?.takeIf { it.isNotEmpty() && it != "00000000" }
+                    if (serial == null) {
+                        if (++attempts < 40) handler.postDelayed(this, 250)
+                        return
+                    }
+                    val uri = runCatching { Uri.parse(path) }.getOrNull() ?: return
+                    val name = uri.lastPathSegment?.substringAfterLast('/')?.substringAfterLast(':')
+                        ?: path.substringAfterLast('/')
+                    val (title, _) = FilenameParser.parse(name)
+                    currentGame.value = GameInfo(
+                        uri = uri,
+                        title = title,
+                        serial = serial,
+                        extension = name.substringAfterLast('.', "").uppercase(),
+                    )
+                }
+            })
+        }
+
+        @JvmStatic
+        fun onVmRunning() {
+            adoptExternalGameIdentity()
+            val requestedSlot = pendingSlotLoadOnBoot
+            val loadAutosave = pendingAutoLoadOnBoot && requestedSlot == null
+            if (requestedSlot == null && !loadAutosave) return
+            pendingSlotLoadOnBoot = null
+            pendingAutoLoadOnBoot = false
+            val handler = android.os.Handler(android.os.Looper.getMainLooper())
+            val tryLoad = object : Runnable {
+                var attempts = 0
+                var lastFrame = -1
+                var advancingPolls = 0
+                override fun run() {
+                    if (vmStopInProgress || eState.value == EmuState.STOPPED) return
+                    val frame = runCatching { NativeApp.getPresentedFrameCount() }.getOrDefault(0)
+                    advancingPolls = if (lastFrame in 0 until frame) advancingPolls + 1 else 0
+                    lastFrame = frame
+                    if (advancingPolls < 3) {
+                        if (++attempts < 60) handler.postDelayed(this, 250)
+                        return
+                    }
+                    val loaded = runCatching {
+                        if (requestedSlot != null) NativeApp.loadStateFromSlot(requestedSlot)
+                        else NativeApp.loadAutosaveState()
+                    }.getOrDefault(false)
+                    if (!loaded && ++attempts < 60)
+                        handler.postDelayed(this, 250)
+                }
+            }
+            handler.postDelayed(tryLoad, 250)
+        }
+
+        fun finishSetup() {
+            prefs.edit { putBoolean("setupComplete", true) }
+            setupComplete.value = true
+            setupEditorVisible.value = false
+        }
+
+        fun reopenSetup() {
+            setupEditorVisible.value = true
+        }
+
+        private var lastInitDataRoot: String? = null
+        fun currentInitDataRoot(): String? = lastInitDataRoot
+
+        fun restartApp(context: Context) {
+            val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            if (intent != null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                context.startActivity(intent)
+            }
+            Runtime.getRuntime().exit(0)
+        }
+
+        fun renderOpenGL() {
+            NativeApp.renderOpenGL()
+        }
+
+        fun renderVulkan() {
+            NativeApp.renderVulkan()
+        }
+
+        fun renderSoftware() {
+            NativeApp.renderSoftware()
+        }
+
+        fun romsAccessible(context: Context, romsDirs: List<String>): Boolean {
+            if (romsDirs.isEmpty()) return false
+            val persisted = runCatching { context.contentResolver.persistedUriPermissions }
+                .getOrDefault(emptyList())
+                .filter { it.isReadPermission }
+                .map { it.uri.toString() }
+                .toHashSet()
+            val allFiles = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+                android.os.Environment.isExternalStorageManager()
+            fun posixReadable(path: String?): Boolean {
+                if (path == null) return false
+                if (allFiles) return true
+                return Build.VERSION.SDK_INT < Build.VERSION_CODES.R &&
+                    runCatching { File(path).canRead() }.getOrDefault(false)
+            }
+            return romsDirs.any { raw ->
+                when {
+                    raw.startsWith("content:") ->
+                        raw in persisted || (allFiles && resolveTreeUriToPosix(raw) != null)
+                    raw.startsWith("file:") -> posixReadable(raw.toUri().path)
+                    else -> posixReadable(raw)
+                }
+            }
+        }
+
+        fun assetCopyRoot(context: Context): String {
+            val custom = systemDirPosix()
+            return custom?.takeIf { validateSystemDirWritable(it) }
+                ?: context.getExternalFilesDir(null)?.absolutePath
+                ?: context.dataDir.absolutePath
+        }
+
+        fun copyAssetAll(p_context: Context, srcPath: String) {
+            val bundled = File(p_context.filesDir, "retro/bundle/data/armsx2/$srcPath")
+            if (bundled.isDirectory) {
+                AssetFiles.copyTree(bundled, File(assetCopyRoot(p_context), srcPath))
+            }
+        }
+
+        private fun sameFilePath(a: File, b: File): Boolean {
+            val ca = runCatching { a.canonicalFile }.getOrDefault(a.absoluteFile)
+            val cb = runCatching { b.canonicalFile }.getOrDefault(b.absoluteFile)
+            return ca == cb
+        }
+
+        private fun copyFileViaTemp(src: File, target: File): Boolean {
+            if (sameFilePath(src, target))
+                return target.exists() && target.length() > 0L
+            if (!src.exists() || src.length() <= 0L)
+                return false
+
+            val parent = target.parentFile ?: return false
+            if (!parent.exists() && !parent.mkdirs())
+                return false
+
+            val tmp = File(parent, ".${target.name}.migrate.tmp")
+            if (tmp.exists())
+                tmp.delete()
+
+            return runCatching {
+                src.copyTo(tmp, overwrite = true)
+                if (tmp.length() <= 0L)
+                    return@runCatching false
+                if (target.exists() && !target.delete())
+                    return@runCatching false
+                val installed = tmp.renameTo(target) || runCatching {
+                    tmp.copyTo(target, overwrite = true)
+                    true
+                }.getOrDefault(false)
+                installed && target.exists() && target.length() > 0L
+            }.getOrDefault(false).also {
+                tmp.delete()
+            }
+        }
+
+        fun getSupportedGLESVersion(context: Context): Double =
+            runCatching {
+                val am = context.getSystemService(ACTIVITY_SERVICE) as ActivityManager
+                am.deviceConfigurationInfo.glEsVersion.toDouble()
+            }.getOrDefault(Double.MAX_VALUE)
+
+        fun isAndroidEmulator(): Boolean {
+            return Build.MODEL.startsWith("sdk_")
+        }
+    }
+
+    val swapDiscAction = registerForActivityResult(
+        StartActivityForResult()
+    ) { result: ActivityResult ->
+        if (result.resultCode == RESULT_OK) {
+            try {
+                val intent = result.data
+                val uri = intent?.dataString ?: ""
+                if (uri.isNotEmpty()) {
+                    println("@@ANDROID_SWAP_DISC@@ uri=${uri.take(240)}")
+                    kotlin.concurrent.thread {
+                        val ok = runCatching { NativeApp.changeDisc(uri) }.getOrDefault(false)
+                        instance?.runOnUiThread {
+                            if (ok) {
+                                resume()
+                            } else {
+                                resume()
+                            }
+                        }
+                    }
+                }
+            } catch (_: Exception) { }
+        }
+    }
+
+    val bootDiscAction = registerForActivityResult(
+        StartActivityForResult()
+    ) { result: ActivityResult ->
+        if (result.resultCode == RESULT_OK) {
+            try {
+                val uri = result.data?.dataString ?: ""
+                if (uri.isNotEmpty()) {
+                    println("@@ANDROID_BOOT_DISC@@ uri=${uri.take(240)}")
+                    launchGame(uri, null)
+                }
+            } catch (_: Exception) { }
+        }
+    }
+
+    init {
+        instance = this
+    }
+
+    private var emucoreInitDone = false
+
+    private var autoBootBiosFired = false
+
+    private val AUTO_BOOT_BIOS = false
+
+    private fun kickoffEmucoreInit() {
+        if (emucoreInitDone) return
+        emucoreInitDone = true
+        lastInitDataRoot = assetCopyRoot(applicationContext)
+
+        invoke {
+            runCatching { com.armsx2.config.ConfigStore.reconcileReusedFolder() }
+
+            copyAssetAll(applicationContext, "bios")
+            copyAssetAll(applicationContext, "resources")
+
+            applyAngleEnv(applicationContext)
+
+            bios.value?.takeIf { it.isNotEmpty() }?.let { current ->
+                val src = File(current)
+                val target = File(internalBiosDir(applicationContext).apply { mkdirs() }, src.name)
+                if (!sameFilePath(target, src)) {
+                    val present = (target.exists() && target.length() > 0L) ||
+                        copyFileViaTemp(src, target)
+                    if (present) {
+                        bios.value = target.absolutePath
+                        prefs.edit { putString("bios", target.absolutePath) }
+                    }
+                } else if (target.exists() && target.length() > 0L) {
+                    bios.value = target.absolutePath
+                    prefs.edit { putString("bios", target.absolutePath) }
+                }
+            }
+
+            NativeApp.initializeOnce(applicationContext)
+            nativeReady.value = true
+
+            bios.value?.let { biosPath ->
+                val name = File(biosPath).name
+                if (name.isNotEmpty()) {
+                    NativeApp.setSetting("Filenames", "BIOS", "string", name)
+                    NativeApp.commitSettings()
+                }
+            }
+
+            flushNativeReadyWaiters()
+
+            runCatching {
+                val rootPosix = systemDirPosix()
+                if (!rootPosix.isNullOrEmpty()) {
+                    val internalBios = internalBiosDir(applicationContext)
+                    val mirrorDir = File(rootPosix, "bios")
+                    if (mirrorDir.absolutePath != internalBios.absolutePath) {
+                        mirrorDir.mkdirs()
+                        internalBios.listFiles { f ->
+                            f.isFile && !f.name.startsWith(".") && !f.name.endsWith(".migrate.tmp")
+                        }?.forEach { f ->
+                            val dst = File(mirrorDir, f.name)
+                            if (!dst.exists() || dst.length() != f.length()) copyFileViaTemp(f, dst)
+                        }
+                    }
+                }
+            }
+
+            SDLControllerManager.nativeSetupJNI()
+            SDLControllerManager.initialize()
+            HIDDeviceManager(applicationContext)
+
+            println("PCSX2_INIT")
+
+            NativeApp.runEeJitTests()
+            NativeApp.runEeSeqTests()
+            NativeApp.runVifTests()
+
+            @Suppress("KotlinConstantConditions")
+            if (AUTO_BOOT_BIOS && BuildConfig.DEBUG && !autoBootBiosFired &&
+                eState.value == EmuState.STOPPED) {
+                autoBootBiosFired = true
+                startBios()
+            }
+        }
+    }
+
+    private val turboHandler = android.os.Handler(android.os.Looper.getMainLooper())
+    private val turboRunnables = HashMap<Long, Runnable>()
+    private val turboPressed = HashMap<Long, Boolean>()
+    private fun turboMapKey(physicalCode: Int, port: Int) =
+        (port.toLong() shl 32) or (physicalCode.toLong() and 0xffffffffL)
+
+    private fun handleTurbo(physicalCode: Int, type: KeyEventType, target: Int, port: Int) {
+        val key = turboMapKey(physicalCode, port)
+        if (type == KeyEventType.KeyDown) {
+            if (turboRunnables.containsKey(key)) return
+            turboPressed[key] = false
+            val r = object : Runnable {
+                override fun run() {
+                    val pressed = !(turboPressed[key] ?: false)
+                    turboPressed[key] = pressed
+                    sendKeyAction(if (pressed) KeyEventType.KeyDown else KeyEventType.KeyUp, target, port)
+                    turboHandler.postDelayed(this, 33L)
+                }
+            }
+            turboRunnables[key] = r
+            turboHandler.post(r)
+        } else {
+            turboRunnables.remove(key)?.let { turboHandler.removeCallbacks(it) }
+            turboPressed.remove(key)
+            sendKeyAction(KeyEventType.KeyUp, target, port)
+        }
+    }
+
+    fun sendKeyAction(p_action: KeyEventType, p_keycode_in: Int, port: Int = 0) {
+        com.armsx2.ui.touch.TouchControls.onControllerInputDetected()
+        val p_keycode = if (ControllerMappings.dpadAsLeftStick()) {
+            when (p_keycode_in) {
+                19 -> 110; 20 -> 112; 21 -> 113; 22 -> 111; else -> p_keycode_in
+            }
+        } else p_keycode_in
+        if (p_action == KeyEventType.KeyDown) {
+            var pad_force = 0
+            if (p_keycode >= 110) {
+                var _abs = 90f
+                _abs = min(_abs, 100f)
+                pad_force = (_abs * 32766.0f / 100).toInt()
+            } else {
+                pad_force = com.armsx2.ui.touch.TouchControls.pressureRangeFor(p_keycode)
+            }
+            if (p_keycode in 110..123 && port in analogKeyHeld.indices)
+                analogKeyHeld[port][p_keycode] = pad_force / 32767f
+            NativeApp.setPadButtonForPort(port, p_keycode, pad_force, true)
+        } else if (p_action == KeyEventType.KeyUp || p_action == KeyEventType.Unknown) {
+            if (p_keycode in 110..123 && port in analogKeyHeld.indices)
+                analogKeyHeld[port].remove(p_keycode)
+            NativeApp.setPadButtonForPort(port, p_keycode, 0, false)
+        }
+    }
+
+    fun applyEmulationOrientation() {
+        requestedOrientation = when (prefs.getInt("ui.orientation", 0)) {
+            1 -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            2 -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+            3 -> ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR
+            else -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+        }
+    }
+
+    private fun applyEdgeToEdge() {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(
+                android.graphics.Color.TRANSPARENT,
+                android.graphics.Color.TRANSPARENT,
+            ),
+            navigationBarStyle = SystemBarStyle.auto(
+                LIGHT_NAVIGATION_BAR_SCRIM,
+                DARK_NAVIGATION_BAR_SCRIM,
+            ),
+        )
+    }
+
+    private fun applySystemBarTheme(darkTheme: Boolean, showSystemBars: Boolean) {
+        applyEdgeToEdge()
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        WindowInsetsControllerCompat(window, window.decorView).apply {
+            val useDarkIcons = !darkTheme
+            isAppearanceLightStatusBars = useDarkIcons
+            isAppearanceLightNavigationBars = useDarkIcons
+            if (showSystemBars) show(WindowInsetsCompat.Type.systemBars())
+            else hide(WindowInsetsCompat.Type.systemBars())
+            systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        applyEdgeToEdge()
+        super.onCreate(savedInstanceState)
+        NativeApp.ensureLoaded(applicationContext)
+        if (NativeApp.hasNoNativeBinary) {
+            android.util.Log.e("ARMSX2", "emucore native library missing — finishing")
+            finish()
+            return
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.isStatusBarContrastEnforced = false
+            window.isNavigationBarContrastEnforced = false
+        }
+        onBackPressedDispatcher.addCallback(this) {
+        }
+        prefs = applicationContext.getSharedPreferences("ARMSX2", MODE_PRIVATE)
+        applyEmulationOrientation()
+        NativeApp.sRumbleEnabled = ControllerMappings.rumbleEnabled()
+        com.armsx2.input.PadRouter.multitapEnabled = ControllerMappings.multitapEnabled()
+        setupComplete.value = prefs.getBoolean("setupComplete", false)
+        systemDir.value = prefs.getString("systemDir", null)
+        bios.value = prefs.getString("bios", null)
+        biosDir.value = prefs.getString("biosDir", null)
+        romsDirs.value = run {
+            val newJson = prefs.getString("romsDirs", null)
+            if (newJson != null) {
+                runCatching {
+                    val arr = org.json.JSONArray(newJson)
+                    List(arr.length()) { arr.getString(it) }
+                }.getOrDefault(emptyList())
+            } else {
+                val legacy = prefs.getString("roms", null)
+                if (legacy != null) listOf(legacy) else emptyList()
+            }
+        }
+        val embeddedGameLaunch = runCatching { intent?.data != null }.getOrDefault(false)
+        if (embeddedGameLaunch) {
+            setupComplete.value = true
+        } else if (setupComplete.value && !romsAccessible(this, romsDirs.value)) {
+            setupComplete.value = false
+            setupRecoveryNeeded.value = true
+        }
+        com.armsx2.config.ConfigStore.loadGlobal().let { g0 ->
+            renderer.value = g0.renderer
+            upscale.value = g0.upscaleFloat
+        }
+        customDriverId.value = prefs.getString("customDriverId", null)?.takeIf { it.isNotEmpty() }
+        surface.value = EmulationSurface(this)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.statusBarColor = android.graphics.Color.TRANSPARENT
+        window.navigationBarColor = android.graphics.Color.TRANSPARENT
+        WindowInsetsControllerCompat(window, window.decorView).let { controller ->
+            controller.hide(WindowInsetsCompat.Type.systemBars())
+            controller.isAppearanceLightStatusBars = false
+            controller.isAppearanceLightNavigationBars = false
+            controller.systemBarsBehavior =
+                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        }
+        ViewCompat.requestApplyInsets(window.decorView)
+
+        fun tryAttachHostOverlay() {
+            if (isFinishing || isDestroyed) return
+            com.armsx2.WinNativeHost.attachOverlay?.invoke(this)
+        }
+        window.decorView.post { tryAttachHostOverlay() }
+        window.decorView.postDelayed({ tryAttachHostOverlay() }, 50L)
+        window.decorView.postDelayed({ tryAttachHostOverlay() }, 200L)
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N &&
+            prefs.getBoolean("ui.sustainedPerf", false)) {
+            runCatching { window.setSustainedPerformanceMode(true) }
+        }
+
+        if (setupComplete.value) {
+            kickoffEmucoreInit()
+        }
+
+        val glVersion = getSupportedGLESVersion(this)
+
+        if (glVersion < 3.1) {
+            eState.value = EmuState.RENDER_UNSUPPORTED
+            println("RENDER_UNSUPPORTED")
+        }
+
+        if (isAndroidEmulator()) {
+            eState.value = EmuState.EMULATOR_UNSUPPORTED
+            println("DEVICE_UNSUPPORTED")
+        }
+
+        if (eState.value == EmuState.RENDER_UNSUPPORTED || eState.value == EmuState.EMULATOR_UNSUPPORTED) {
+            android.util.Log.e("ARMSX2", "device cannot run the emulator (${eState.value}) — finishing")
+            finish()
+            return
+        }
+        handleExternalLaunchIntent(intent)
+        if (extractLaunchUri(intent) == null && !com.armsx2.WinNativeHost.enabled()) {
+            finish()
+            return
+        }
+        setContent {
+            androidx.compose.runtime.LaunchedEffect(setupComplete.value) {
+                if (setupComplete.value) {
+                    kickoffEmucoreInit()
+                }
+            }
+
+            androidx.compose.runtime.LaunchedEffect(
+                setupComplete.value,
+                nativeReady.value,
+                pendingExternalLaunch.value,
+                pendingLaunch.value,
+            ) {
+                launchPendingExternalGameIfReady()
+            }
+
+            val gyroCtx = androidx.compose.ui.platform.LocalContext.current
+            val gyro = androidx.compose.runtime.remember {
+                com.armsx2.input.AndroidGyroscopeInput(gyroCtx) { mode, x, y ->
+                    instance?.onGyroAnalog(mode, x, y)
+                }
+            }
+            val gyroMode = ControllerMappings.gyroMode()
+            val gyroOn = gyroActive.value
+            androidx.compose.runtime.DisposableEffect(
+                eState.value, gyroMode, gyroOn,
+                ControllerMappings.gyroSensitivity(),
+                ControllerMappings.gyroSmoothing(),
+                ControllerMappings.gyroInvertX(),
+                ControllerMappings.gyroInvertY(),
+            ) {
+                if (eState.value == EmuState.RUNNING && gyroMode != 0 && gyroOn) {
+                    gyro.start(
+                        gyroMode,
+                        ControllerMappings.gyroSensitivity(),
+                        ControllerMappings.gyroSmoothing(),
+                        ControllerMappings.gyroInvertX(),
+                        ControllerMappings.gyroInvertY(),
+                    )
+                } else {
+                    gyro.stop()
+                }
+                onDispose { gyro.stop() }
+            }
+
+            Box(
+                Modifier.fillMaxSize().background(androidx.compose.ui.graphics.Color.Black),
+                contentAlignment = Alignment.Center,
+            ) {
+                if (surface.value != null) {
+                    val surfaceAspect =
+                        when (prefs.getInt("wn.ps2.aspect", 1).coerceIn(0, 3)) {
+                            3 -> 16f / 9f
+                            else -> 4f / 3f
+                        }
+                    androidx.compose.runtime.LaunchedEffect(surface.value, eState.value) {
+                        if (eState.value == EmuState.RUNNING) {
+                            surface.value?.isFocusable = true
+                            surface.value?.isFocusableInTouchMode = true
+                            runCatching { focusRequester.requestFocus() }
+                        }
+                    }
+                    AndroidView(
+                        factory = { surface.value!! },
+                        modifier =
+                            Modifier
+                                .focusable(true)
+                                .focusRequester(focusRequester)
+                                .fillMaxHeight()
+                                .aspectRatio(surfaceAspect)
+                                .pointerInput(Unit) {
+                                    detectTapGestures(
+                                        onPress = {
+                                            com.armsx2.ui.touch.TouchControls.onSurfaceTouched()
+                                        },
+                                    )
+                                }
+                                .onKeyEvent { event ->
+                                    if (eState.value != EmuState.RUNNING) {
+                                        return@onKeyEvent false
+                                    }
+                                    val port =
+                                        com.armsx2.input.PadRouter.portForDevice(event.nativeKeyEvent.deviceId)
+                                    val macro =
+                                        com.armsx2.ui.touch.TouchControls.macroForPhysicalCode(event.key.nativeKeyCode)
+                                    if (macro != null) {
+                                        com.armsx2.ui.touch.TouchControls.fireMacro(
+                                            macro,
+                                            "pad$port",
+                                            event.type == KeyEventType.KeyDown,
+                                        ) { code, pressed ->
+                                            sendKeyAction(
+                                                if (pressed) KeyEventType.KeyDown else KeyEventType.KeyUp,
+                                                code,
+                                                port,
+                                            )
+                                        }
+                                        return@onKeyEvent true
+                                    }
+                                    val target =
+                                        ControllerMappings.targetForPhysical(event.key.nativeKeyCode, port)
+                                            ?: return@onKeyEvent false
+                                    if (ControllerMappings.isTurboTarget(target, port)) {
+                                        handleTurbo(event.key.nativeKeyCode, event.type, target, port)
+                                        return@onKeyEvent true
+                                    }
+                                    sendKeyAction(event.type, target, port)
+                                    true
+                                },
+                    )
+                }
+            }
+        }
+    }
+
+    private val heldKeys = HashSet<Int>()
+
+    private val backHoldHandler = android.os.Handler(android.os.Looper.getMainLooper())
+    private var backHoldRunnable: Runnable? = null
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        val kc = event.keyCode
+        if (kc != KeyEvent.KEYCODE_UNKNOWN) {
+            when (event.action) {
+                KeyEvent.ACTION_DOWN -> heldKeys.add(kc)
+                KeyEvent.ACTION_UP -> heldKeys.remove(kc)
+            }
+        }
+        if (event.isFromSource(InputDevice.SOURCE_GAMEPAD) ||
+            event.isFromSource(InputDevice.SOURCE_JOYSTICK)) {
+            NativeApp.sRumbleDeviceId = event.deviceId
+        }
+        if (kc == KeyEvent.KEYCODE_BUTTON_MODE) {
+            val open = com.armsx2.WinNativeHost.openMenu
+            if (open != null) {
+                if (event.action == KeyEvent.ACTION_UP && event.repeatCount == 0) open()
+                return true
+            }
+        }
+        if (com.armsx2.WinNativeHost.isMenuOpen?.invoke() == true) {
+            val handled = com.armsx2.WinNativeHost.menuKeyHandler?.invoke(event) == true
+            if (handled) return true
+        }
+        if (forwardKeyToUsbKeyboard(event, kc)) {
+            return true
+        }
+        val capturing = ControllerMappings.captureHotkey.value
+        if (capturing != null) {
+            if (kc != KeyEvent.KEYCODE_UNKNOWN) {
+                val buf = ControllerMappings.captureKeys
+                if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
+                    if (buf.isEmpty()) {
+                        buf.add(kc)
+                        ControllerMappings.captureFirstDownMs = event.eventTime
+                    } else if (!buf.contains(kc) &&
+                        event.eventTime - ControllerMappings.captureFirstDownMs >= COMBO_MIN_GAP_MS
+                    ) {
+                        buf.add(kc)
+                        ControllerMappings.bindHotkeyCombo(capturing, buf[0], buf[1])
+                        ControllerMappings.endHotkeyCapture()
+                    }
+                } else if (event.action == KeyEvent.ACTION_UP) {
+                    if (buf.size == 1 && buf.contains(kc)) {
+                        ControllerMappings.bindHotkey(capturing, buf[0])
+                        ControllerMappings.endHotkeyCapture()
+                    }
+                }
+            }
+            return true
+        }
+        val padCapture = ControllerMappings.capturePadAction.value
+        if (padCapture != null) {
+            if (kc != KeyEvent.KEYCODE_UNKNOWN && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
+                padCapture(kc)
+            }
+            return true
+        }
+        if (ControllerMappings.padCapturing.value) {
+            return super.dispatchKeyEvent(event)
+        }
+        run {
+            val pm = ControllerMappings.SysHotkey.PRESSURE_MOD
+            val pmKey = ControllerMappings.hotkeyCode(pm)
+            if (pmKey != KeyEvent.KEYCODE_UNKNOWN && kc == pmKey &&
+                ControllerMappings.hotkeyModCode(pm) == KeyEvent.KEYCODE_UNKNOWN) {
+                when (event.action) {
+                    KeyEvent.ACTION_DOWN -> com.armsx2.ui.touch.TouchControls.pressureModifierHeld.value = true
+                    KeyEvent.ACTION_UP -> com.armsx2.ui.touch.TouchControls.pressureModifierHeld.value = false
+                }
+                return true
+            }
+        }
+        run {
+            val down = event.action == KeyEvent.ACTION_DOWN
+            val matchKeys = if (down) heldKeys else heldKeys + kc
+            if (ControllerMappings.matchHotkey(kc, matchKeys) == ControllerMappings.SysHotkey.MENU) {
+                if (down) com.armsx2.WinNativeHost.openMenu?.invoke()
+                return true
+            }
+        }
+        if (eState.value == EmuState.RUNNING) {
+            val down = event.action == KeyEvent.ACTION_DOWN
+            val matchKeys = if (down) heldKeys else heldKeys + kc
+            when (ControllerMappings.matchHotkey(kc, matchKeys)) {
+                ControllerMappings.SysHotkey.PRESSURE_MOD -> {}
+                ControllerMappings.SysHotkey.MENU -> {
+                    if (down) com.armsx2.WinNativeHost.openMenu?.invoke()
+                    return true
+                }
+                ControllerMappings.SysHotkey.SAVE_STATE -> {
+                    if (down) {
+                        val slot = currentSaveSlot.value
+                        kotlin.concurrent.thread { runCatching { NativeApp.saveStateToSlot(slot) } }
+                    }
+                    return true
+                }
+                ControllerMappings.SysHotkey.LOAD_STATE -> {
+                    if (down) {
+                        val slot = currentSaveSlot.value
+                        kotlin.concurrent.thread { runCatching { NativeApp.loadStateFromSlot(slot) } }
+                    }
+                    return true
+                }
+                ControllerMappings.SysHotkey.CYCLE_SLOT -> {
+                    if (down) cycleSaveSlot()
+                    return true
+                }
+                ControllerMappings.SysHotkey.TEXTURE_DUMP -> {
+                    if (down) {
+                        val on = runCatching { NativeApp.toggleTextureDumping() }.getOrDefault(false)
+                        android.widget.Toast.makeText(
+                            this,
+                            if (on) "Texture dumping ON" else "Texture dumping OFF",
+                            android.widget.Toast.LENGTH_SHORT,
+                        ).show()
+                    }
+                    return true
+                }
+                ControllerMappings.SysHotkey.TOGGLE_OSD -> {
+                    if (down && event.repeatCount == 0) InGameOverlay.toggleOsd()
+                    return true
+                }
+                ControllerMappings.SysHotkey.GYRO_TOGGLE -> {
+                    if (down && event.repeatCount == 0) toggleGyro()
+                    return true
+                }
+                ControllerMappings.SysHotkey.GYRO_HOLD -> {
+                    if (event.action == KeyEvent.ACTION_DOWN || event.action == KeyEvent.ACTION_UP) {
+                        if (event.repeatCount == 0) gyroActive.value = down
+                    }
+                    return true
+                }
+                ControllerMappings.SysHotkey.FAST_FORWARD -> {
+                    if (event.action == KeyEvent.ACTION_DOWN || event.action == KeyEvent.ACTION_UP) {
+                        if (event.repeatCount == 0) {
+                            if (down) fastForwardToggleActive = false
+                            runCatching { NativeApp.speedhackLimitermode(if (down) 1 else baseLimiterMode()) }
+                        }
+                    }
+                    return true
+                }
+                ControllerMappings.SysHotkey.FAST_FORWARD_TOGGLE -> {
+                    if (down && event.repeatCount == 0) toggleFastForward()
+                    return true
+                }
+                ControllerMappings.SysHotkey.SLOW_DOWN -> {
+                    if (down && event.repeatCount == 0) toggleSlowDown()
+                    return true
+                }
+                ControllerMappings.SysHotkey.RES_UP -> {
+                    if (down) stepResolution(1)
+                    return true
+                }
+                ControllerMappings.SysHotkey.RES_DOWN -> {
+                    if (down) stepResolution(-1)
+                    return true
+                }
+                ControllerMappings.SysHotkey.ACHIEVEMENTS -> {
+                    return true
+                }
+                ControllerMappings.SysHotkey.CLOSE_GAME -> {
+                    if (down) closeGame()
+                    return true
+                }
+                ControllerMappings.SysHotkey.QUIT_APP -> {
+                    if (down) { quitAfterStop = true; stop()
+                    }
+                    return true
+                }
+                ControllerMappings.SysHotkey.SAVE_AND_EXIT -> {
+                    if (down) closeGame(saveAutosave = true)
+                    return true
+                }
+                ControllerMappings.SysHotkey.RESET_GAME -> {
+                    if (down) restart()
+                    return true
+                }
+                null -> {}
+            }
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
+    private fun forwardKeyToUsbKeyboard(event: KeyEvent, kc: Int): Boolean {
+        if (!usbKeyboardActive) return false
+        if (eState.value != EmuState.RUNNING) return false
+        if (ControllerMappings.padCapturing.value ||
+            ControllerMappings.captureHotkey.value != null) return false
+        if (!event.isFromSource(InputDevice.SOURCE_KEYBOARD)) return false
+        if (event.isFromSource(InputDevice.SOURCE_GAMEPAD) ||
+            event.isFromSource(InputDevice.SOURCE_JOYSTICK)) return false
+        if (kc == KeyEvent.KEYCODE_UNKNOWN) return false
+        if (kc == KeyEvent.KEYCODE_BACK || kc == KeyEvent.KEYCODE_HOME) return false
+        val pressed = when (event.action) {
+            KeyEvent.ACTION_DOWN -> true
+            KeyEvent.ACTION_UP -> false
+            else -> return false
+        }
+        return runCatching {
+            NativeApp.usbKeyboardKey(0, kc, pressed)
+        }.getOrDefault(false)
+    }
+
+    private fun baseLimiterMode(): Int =
+        if (InGameOverlay.frameLimitOn.value) 0 else 3
+
+    private fun toggleGyro() {
+        val on = !gyroActive.value
+        gyroActive.value = on
+        hotkeyToast(if (on) "Gyro ON" else "Gyro OFF")
+    }
+
+    fun toggleFastForward() {
+        fastForwardToggleActive = !fastForwardToggleActive
+        val on = fastForwardToggleActive
+        if (on) slowDownToggleActive = false
+        runCatching { NativeApp.speedhackLimitermode(if (on) 1 else baseLimiterMode()) }
+        hotkeyToast(if (on) "Fast Forward ON" else "Fast Forward OFF")
+    }
+
+    fun toggleSlowDown() {
+        if (InGameOverlay.hardcoreOn.value) {
+            slowDownToggleActive = false
+            hotkeyToast("Slow Down is disabled in RetroAchievements Hardcore mode")
+            return
+        }
+        slowDownToggleActive = !slowDownToggleActive
+        val on = slowDownToggleActive
+        if (on) fastForwardToggleActive = false
+        runCatching { NativeApp.speedhackLimitermode(if (on) 2 else baseLimiterMode()) }
+        hotkeyToast(if (on) "Slow Down ON (50%)" else "Slow Down OFF")
+    }
+
+    private var lastHotkeyToast: android.widget.Toast? = null
+    private fun hotkeyToast(text: String) {
+        if (!prefs.getBoolean("ui.hotkeyToasts", true)) return
+        lastHotkeyToast?.cancel()
+        lastHotkeyToast = android.widget.Toast.makeText(this, text, android.widget.Toast.LENGTH_SHORT)
+            .also { it.show() }
+    }
+
+    fun saveState() {
+        val slot = currentSaveSlot.value
+        kotlin.concurrent.thread { runCatching { NativeApp.saveStateToSlot(slot) } }
+    }
+
+    fun loadState(onLoaded: (() -> Unit)? = null) {
+        val slot = currentSaveSlot.value
+        kotlin.concurrent.thread {
+            runCatching { NativeApp.loadStateFromSlot(slot) }
+            onLoaded?.let { cb -> android.os.Handler(android.os.Looper.getMainLooper()).post(cb) }
+        }
+    }
+
+    private fun cycleSaveSlot() {
+        val next = (currentSaveSlot.value + 1) % 10
+        currentSaveSlot.value = next
+        android.widget.Toast.makeText(this, "Save slot $next", android.widget.Toast.LENGTH_SHORT).show()
+    }
+
+    private fun stepResolution(dir: Int) {
+        val next = (upscale.value.toInt() + dir).coerceIn(1, 8)
+        val nf = next.toFloat()
+        upscale.value = nf
+        runCatching { NativeApp.renderUpscalemultiplier(nf) }
+        runCatching {
+            val serial = currentGame.value?.serial?.takeIf { it.isNotBlank() }
+            val resolved = com.armsx2.config.ConfigStore.resolveForGame(serial)
+            com.armsx2.config.ConfigStore.save(
+                if (serial != null) com.armsx2.config.SettingsScope.Game
+                else com.armsx2.config.SettingsScope.Global,
+                serial,
+                resolved.copy(upscaleFloat = nf),
+            )
+        }
+        android.widget.Toast.makeText(this, "Resolution ${next}x", android.widget.Toast.LENGTH_SHORT).show()
+    }
+
+    override fun dispatchGenericMotionEvent(ev: MotionEvent): Boolean {
+        if (com.armsx2.WinNativeHost.isMenuOpen?.invoke() == true) {
+            val x = ev.getAxisValue(MotionEvent.AXIS_HAT_X).takeIf { abs(it) > 0.5f }
+                ?: ev.getAxisValue(MotionEvent.AXIS_X)
+            val y = ev.getAxisValue(MotionEvent.AXIS_HAT_Y).takeIf { abs(it) > 0.5f }
+                ?: ev.getAxisValue(MotionEvent.AXIS_Y)
+            if (com.armsx2.WinNativeHost.menuAxisHandler?.invoke(x, y) == true) return true
+        }
+        if (ControllerMappings.padCapturing.value || ControllerMappings.captureHotkey.value != null) {
+            return handleCaptureMotion(ev)
+        }
+        captureHatX = 0
+        captureHatY = 0
+        if (captureHeldSynth.isNotEmpty()) {
+            heldKeys.removeAll(captureHeldSynth)
+            captureHeldSynth.clear()
+        }
+        if (eState.value == EmuState.RUNNING) {
+            if (!ev.isFromSource(InputDevice.SOURCE_JOYSTICK) &&
+                !ev.isFromSource(InputDevice.SOURCE_GAMEPAD)) {
+                return super.dispatchGenericMotionEvent(ev)
+            }
+            com.armsx2.ui.touch.TouchControls.onControllerInputDetected()
+            val port = com.armsx2.input.PadRouter.portForDevice(ev.deviceId)
+            dispatchStick(ev, ControllerMappings.leftStickMode(port),
+                MotionEvent.AXIS_X, MotionEvent.AXIS_Y,
+                aXPos = 111, aXNeg = 113, aYPos = 112, aYNeg = 110,
+                leftStick = true, port = port)
+            dispatchStick(ev, ControllerMappings.rightStickMode(port),
+                MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ,
+                aXPos = 121, aXNeg = 123, aYPos = 122, aYNeg = 120,
+                leftStick = false, port = port)
+            fireStickHotkeys(ev, port)
+            dispatchDpadCombined(ev, port)
+            sendTrigger(ev, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE,
+                KeyEvent.KEYCODE_BUTTON_L2, port)
+            sendTrigger(ev, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS,
+                KeyEvent.KEYCODE_BUTTON_R2, port)
+            dispatchStickDirBindings(ev, port)
+            flushAnalogAxes(port)
+            debugStickProbe(ev)
+            return true
+        }
+        return super.dispatchGenericMotionEvent(ev)
+    }
+
+    private val stickDirDigitalHeld = Array(8) { HashSet<Int>() }
+    private fun dispatchStickDirBindings(ev: MotionEvent, port: Int) {
+        for (left in booleanArrayOf(true, false)) {
+            var vx = ev.getAxisValue(if (left) MotionEvent.AXIS_X else MotionEvent.AXIS_Z)
+            var vy = ev.getAxisValue(if (left) MotionEvent.AXIS_Y else MotionEvent.AXIS_RZ)
+            if (ControllerMappings.stickSwapXY(left)) { val t = vx; vx = vy; vy = t }
+            if (ControllerMappings.stickInvertX(left)) vx = -vx
+            if (ControllerMappings.stickInvertY(left)) vy = -vy
+            for (dir in ControllerMappings.StickDir.values()) {
+                val physCode = ControllerMappings.stickHotkeyKeyCode(left, dir)
+                val target = ControllerMappings.targetForPhysical(physCode, port) ?: continue
+                val mag = when (dir) {
+                    ControllerMappings.StickDir.UP -> -vy
+                    ControllerMappings.StickDir.DOWN -> vy
+                    ControllerMappings.StickDir.LEFT -> -vx
+                    ControllerMappings.StickDir.RIGHT -> vx
+                }.coerceAtLeast(0f)
+                if (target in 110..123) {
+                    accumAnalog(target, shapeStickMag(mag, left))
+                } else {
+                    val held = stickDirDigitalHeld[port]
+                    val on = mag > STICK_DIGITAL_THRESHOLD
+                    val was = held.contains(target)
+                    if (on != was) {
+                        NativeApp.setPadButtonForPort(port, target, if (on) 32767 else 0, on)
+                        if (on) held.add(target) else held.remove(target)
+                    }
+                }
+            }
+        }
+    }
+
+    private var lastStickProbeMs = 0L
+    private fun debugStickProbe(ev: MotionEvent) {
+        if (!prefs.getBoolean("debug.stickLog", false)) return
+        val now = SystemClock.uptimeMillis()
+        if (now - lastStickProbeMs < 250) return
+        lastStickProbeMs = now
+        val z = ev.getAxisValue(MotionEvent.AXIS_Z)
+        val rz = ev.getAxisValue(MotionEvent.AXIS_RZ)
+        val rx = ev.getAxisValue(MotionEvent.AXIS_RX)
+        val ry = ev.getAxisValue(MotionEvent.AXIS_RY)
+        val mag = kotlin.math.hypot(z, rz)
+        println("@@STICKPROBE@@ dev=${ev.deviceId} Z=%.3f RZ=%.3f RX=%.3f RY=%.3f mag=%.3f shaped=%.3f".format(
+            z, rz, rx, ry, mag, shapeStickMag(mag.coerceAtMost(1f), false)))
+    }
+
+    private var captureHatX = 0
+    private var captureHatY = 0
+
+    private val captureHeldSynth = HashSet<Int>()
+    private fun handleCaptureMotion(ev: MotionEvent): Boolean {
+        val want = HashSet<Int>()
+        val dx = uiHatDirection(ev.getAxisValue(MotionEvent.AXIS_HAT_X))
+        val dy = uiHatDirection(ev.getAxisValue(MotionEvent.AXIS_HAT_Y))
+        if (dx != 0) want.add(if (dx > 0) KeyEvent.KEYCODE_DPAD_RIGHT else KeyEvent.KEYCODE_DPAD_LEFT)
+        if (dy != 0) want.add(if (dy > 0) KeyEvent.KEYCODE_DPAD_DOWN else KeyEvent.KEYCODE_DPAD_UP)
+        captureStickCode(ev, MotionEvent.AXIS_X, MotionEvent.AXIS_Y, true).takeIf { it != 0 }?.let { want.add(it) }
+        captureStickCode(ev, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, false).takeIf { it != 0 }?.let { want.add(it) }
+        captureHatX = dx
+        captureHatY = dy
+        val now = SystemClock.uptimeMillis()
+        val released = captureHeldSynth.filter { it !in want }
+        for (code in released) {
+            captureHeldSynth.remove(code)
+            dispatchKeyEvent(KeyEvent(now, now, KeyEvent.ACTION_UP, code, 0))
+        }
+        for (code in want) {
+            if (captureHeldSynth.add(code))
+                dispatchKeyEvent(KeyEvent(now, now, KeyEvent.ACTION_DOWN, code, 0))
+        }
+        if (ControllerMappings.captureHotkey.value == null && !ControllerMappings.padCapturing.value) {
+            heldKeys.removeAll(captureHeldSynth)
+            captureHeldSynth.clear()
+        }
+        return true
+    }
+
+    private fun captureStickCode(ev: MotionEvent, axisX: Int, axisY: Int, left: Boolean): Int {
+        val x = ev.getAxisValue(axisX)
+        val y = ev.getAxisValue(axisY)
+        val t = 0.7f
+        return when {
+            y <= -t -> ControllerMappings.stickHotkeyKeyCode(left, ControllerMappings.StickDir.UP)
+            y >= t -> ControllerMappings.stickHotkeyKeyCode(left, ControllerMappings.StickDir.DOWN)
+            x <= -t -> ControllerMappings.stickHotkeyKeyCode(left, ControllerMappings.StickDir.LEFT)
+            x >= t -> ControllerMappings.stickHotkeyKeyCode(left, ControllerMappings.StickDir.RIGHT)
+            else -> 0
+        }
+    }
+
+    private fun uiHatDirection(value: Float): Int = when {
+        value > UI_HAT_DEAD -> 1
+        value < -UI_HAT_DEAD -> -1
+        else -> 0
+    }
+
+    private fun shapeStickMag(m: Float, left: Boolean): Float {
+        val dz = ControllerMappings.stickDeadzone(left)
+        if (m <= dz) return 0f
+        val outer = ControllerMappings.stickOuterDeadzone(left)
+        val hi = (1f - outer).coerceAtLeast(dz + 0.01f)
+        val t = ((m - dz) / (hi - dz)).coerceIn(0f, 1f)
+        val accel = ControllerMappings.stickAcceleration(left)
+        val curved =
+            if (accel > 0f) Math.pow(t.toDouble(), (1f + accel).toDouble()).toFloat()
+            else t
+        val out = (curved * ControllerMappings.stickSensitivity(left)).coerceIn(0f, 1f)
+        if (out <= 0f) return 0f
+        val anti = ControllerMappings.stickAntiDeadzone(left)
+        return if (anti > 0f) (anti + out * (1f - anti)).coerceIn(0f, 1f) else out
+    }
+
+    private val analogAccum = HashMap<Int, Float>()
+    private val analogPrevSent = Array(8) { HashMap<Int, Float>() }
+    val analogKeyHeld = Array(8) { HashMap<Int, Float>() }
+
+    @Volatile private var gyroCombineActive = false
+    @Volatile private var gyroCombineLeft = false
+    @Volatile private var gyroVecX = 0f
+    @Volatile private var gyroVecY = 0f
+    private val lastPhysStickX = floatArrayOf(0f, 0f)
+    private val lastPhysStickY = floatArrayOf(0f, 0f)
+
+    private fun accumAnalog(code: Int, v: Float) {
+        if (v <= 0f) return
+        val cur = analogAccum[code] ?: 0f
+        if (v > cur) analogAccum[code] = v
+    }
+
+    private fun flushAnalogAxes(port: Int) {
+        val prev = analogPrevSent[port]
+        for ((code, held) in analogKeyHeld[port]) accumAnalog(code, held)
+        for (code in prev.keys) {
+            if (!analogAccum.containsKey(code)) {
+                NativeApp.setPadButtonForPort(port, code, 0, false)
+            }
+        }
+        for ((code, v) in analogAccum) {
+            if (prev[code] != v)
+                NativeApp.setPadButtonForPort(port, code, (v * 32767).toInt(), true)
+        }
+        prev.clear()
+        prev.putAll(analogAccum)
+        analogAccum.clear()
+    }
+
+    private fun accumStickRadial(vx: Float, vy: Float, left: Boolean,
+                                 aXPos: Int, aXNeg: Int, aYPos: Int, aYNeg: Int) {
+        var gx = vx
+        var gy = vy
+        val ax = abs(gx)
+        val ay = abs(gy)
+        if (ax >= ay) { if (ay < ax * STICK_CROSS_GATE) gy = 0f }
+        else { if (ax < ay * STICK_CROSS_GATE) gx = 0f }
+        val mag = kotlin.math.hypot(gx, gy)
+        if (mag <= 0f) return
+        val shaped = shapeStickMag(mag.coerceAtMost(1f), left)
+        val scale = shaped / mag
+        val ox = gx * scale
+        val oy = gy * scale
+        if (ox > 0f) accumAnalog(aXPos, ox) else if (ox < 0f) accumAnalog(aXNeg, -ox)
+        if (oy > 0f) accumAnalog(aYPos, oy) else if (oy < 0f) accumAnalog(aYNeg, -oy)
+    }
+
+    fun onGyroAnalog(mode: Int, gx: Float, gy: Float) {
+        gyroCombineLeft = mode == 2 ||
+            (mode == 1 && ControllerMappings.gyroAimStick() == ControllerMappings.GYRO_STICK_LEFT)
+        gyroVecX = gx; gyroVecY = gy
+        gyroCombineActive = gx != 0f || gy != 0f
+        emitCombinedSticks()
+    }
+
+    private fun emitCombinedSticks() {
+        val gxL = if (gyroCombineLeft) gyroVecX else 0f
+        val gyL = if (gyroCombineLeft) gyroVecY else 0f
+        val gxR = if (gyroCombineLeft) 0f else gyroVecX
+        val gyR = if (gyroCombineLeft) 0f else gyroVecY
+        accumStickRadial(lastPhysStickX[0] + gxL, lastPhysStickY[0] + gyL, true,  111, 113, 112, 110)
+        accumStickRadial(lastPhysStickX[1] + gxR, lastPhysStickY[1] + gyR, false, 121, 123, 122, 120)
+        flushAnalogAxes(0)
+    }
+
+    private fun dispatchStick(
+        event: MotionEvent, mode: ControllerMappings.StickMode,
+        axisX: Int, axisY: Int,
+        aXPos: Int, aXNeg: Int, aYPos: Int, aYNeg: Int,
+        leftStick: Boolean, port: Int,
+    ) {
+        var vx = event.getAxisValue(axisX)
+        var vy = event.getAxisValue(axisY)
+        if (ControllerMappings.stickSwapXY(leftStick)) { val t = vx; vx = vy; vy = t }
+        if (ControllerMappings.stickInvertX(leftStick)) vx = -vx
+        if (ControllerMappings.stickInvertY(leftStick)) vy = -vy
+        when (mode) {
+            ControllerMappings.StickMode.ANALOG -> {
+                var sx = vx; var sy = vy
+                if (port == 0) {
+                    val si = if (leftStick) 0 else 1
+                    lastPhysStickX[si] = vx; lastPhysStickY[si] = vy
+                    if (gyroCombineActive && gyroCombineLeft == leftStick) { sx += gyroVecX; sy += gyroVecY }
+                }
+                accumStickRadial(sx, sy, leftStick, aXPos, aXNeg, aYPos, aYNeg)
+                if (leftStick && ControllerMappings.dpadAsLeftStick()) {
+                    val hx = event.getAxisValue(MotionEvent.AXIS_HAT_X)
+                    val hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y)
+                    if (hx > STICK_DEAD) accumAnalog(aXPos, hx) else if (hx < -STICK_DEAD) accumAnalog(aXNeg, -hx)
+                    if (hy > STICK_DEAD) accumAnalog(aYPos, hy) else if (hy < -STICK_DEAD) accumAnalog(aYNeg, -hy)
+                }
+            }
+            ControllerMappings.StickMode.FACE -> {
+                sendAxisDigital(vx, posCode = 97, negCode = 99, port = port)
+                sendAxisDigital(vy, posCode = 96, negCode = 100, port = port)
+            }
+            ControllerMappings.StickMode.CUSTOM -> {
+                emitCustom(ControllerMappings.customStickCode(leftStick, ControllerMappings.StickDir.RIGHT, port),
+                    if (vx > 0f) vx else 0f, port, leftStick)
+                emitCustom(ControllerMappings.customStickCode(leftStick, ControllerMappings.StickDir.LEFT, port),
+                    if (vx < 0f) -vx else 0f, port, leftStick)
+                emitCustom(ControllerMappings.customStickCode(leftStick, ControllerMappings.StickDir.DOWN, port),
+                    if (vy > 0f) vy else 0f, port, leftStick)
+                emitCustom(ControllerMappings.customStickCode(leftStick, ControllerMappings.StickDir.UP, port),
+                    if (vy < 0f) -vy else 0f, port, leftStick)
+            }
+        }
+    }
+
+    private val stickHotkeyHeld = Array(8) { HashSet<Int>() }
+
+    private fun fireStickHotkeys(ev: MotionEvent, port: Int) {
+        fireStickHotkeyAxis(ev, MotionEvent.AXIS_X, MotionEvent.AXIS_Y, true, port)
+        fireStickHotkeyAxis(ev, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, false, port)
+    }
+    private fun fireStickHotkeyAxis(ev: MotionEvent, axisX: Int, axisY: Int, left: Boolean, port: Int) {
+        val x = ev.getAxisValue(axisX)
+        val y = ev.getAxisValue(axisY)
+        val held = stickHotkeyHeld[port]
+        val dirs = arrayOf(
+            ControllerMappings.StickDir.UP to -y, ControllerMappings.StickDir.DOWN to y,
+            ControllerMappings.StickDir.LEFT to -x, ControllerMappings.StickDir.RIGHT to x,
+        )
+        for ((dir, value) in dirs) {
+            val code = ControllerMappings.stickHotkeyKeyCode(left, dir)
+            if (value > STICK_DIGITAL_THRESHOLD) {
+                heldKeys.add(code)
+                if (held.add(code)) {
+                    ControllerMappings.matchHotkey(code, heldKeys)?.let { runStickHotkey(it) }
+                }
+            } else {
+                heldKeys.remove(code)
+                held.remove(code)
+            }
+        }
+    }
+
+    private fun runStickHotkey(h: ControllerMappings.SysHotkey) {
+        when (h) {
+            ControllerMappings.SysHotkey.MENU -> {
+                com.armsx2.WinNativeHost.openMenu?.invoke()
+            }
+            ControllerMappings.SysHotkey.SAVE_STATE -> {
+                val slot = currentSaveSlot.value
+                kotlin.concurrent.thread { runCatching { NativeApp.saveStateToSlot(slot) } }
+            }
+            ControllerMappings.SysHotkey.LOAD_STATE -> {
+                val slot = currentSaveSlot.value
+                kotlin.concurrent.thread { runCatching { NativeApp.loadStateFromSlot(slot) } }
+            }
+            ControllerMappings.SysHotkey.CYCLE_SLOT -> cycleSaveSlot()
+            ControllerMappings.SysHotkey.TEXTURE_DUMP -> {
+                val on = runCatching { NativeApp.toggleTextureDumping() }.getOrDefault(false)
+                android.widget.Toast.makeText(this,
+                    if (on) "Texture dumping ON" else "Texture dumping OFF",
+                    android.widget.Toast.LENGTH_SHORT).show()
+            }
+            ControllerMappings.SysHotkey.FAST_FORWARD_TOGGLE -> {
+                fastForwardToggleActive = !fastForwardToggleActive
+                val on = fastForwardToggleActive
+                runCatching { NativeApp.speedhackLimitermode(if (on) 1 else baseLimiterMode()) }
+                hotkeyToast(if (on) "Fast Forward ON" else "Fast Forward OFF")
+            }
+            ControllerMappings.SysHotkey.GYRO_TOGGLE -> toggleGyro()
+            ControllerMappings.SysHotkey.GYRO_HOLD -> toggleGyro()
+            ControllerMappings.SysHotkey.RES_UP -> stepResolution(1)
+            ControllerMappings.SysHotkey.RES_DOWN -> stepResolution(-1)
+            ControllerMappings.SysHotkey.ACHIEVEMENTS -> {}
+            ControllerMappings.SysHotkey.CLOSE_GAME -> closeGame()
+            ControllerMappings.SysHotkey.QUIT_APP -> { quitAfterStop = true; stop()
+            }
+            ControllerMappings.SysHotkey.SAVE_AND_EXIT -> closeGame(saveAutosave = true)
+            ControllerMappings.SysHotkey.RESET_GAME -> restart()
+            ControllerMappings.SysHotkey.SLOW_DOWN -> toggleSlowDown()
+            ControllerMappings.SysHotkey.TOGGLE_OSD -> InGameOverlay.toggleOsd()
+            ControllerMappings.SysHotkey.FAST_FORWARD,
+            ControllerMappings.SysHotkey.PRESSURE_MOD -> {}
+        }
+    }
+
+    private fun emitCustom(code: Int, mag: Float, port: Int, srcLeft: Boolean) {
+        ControllerMappings.hotkeyForStickCode(code)?.let { hk ->
+            val held = stickHotkeyHeld[port]
+            if (mag > STICK_DIGITAL_THRESHOLD) {
+                if (held.add(code)) runStickHotkey(hk)
+            } else {
+                held.remove(code)
+            }
+            return
+        }
+        if (code in 19..22) return
+        if (code in 110..123) {
+            val m = shapeStickMag(mag, srcLeft)
+            accumAnalog(code, m)
+        } else {
+            NativeApp.setPadButtonForPort(port, code, 32767, mag > STICK_DIGITAL_THRESHOLD)
+        }
+    }
+
+    private fun sendAxisDigital(v: Float, posCode: Int, negCode: Int, port: Int) {
+        NativeApp.setPadButtonForPort(port, posCode, 32767, v > STICK_DIGITAL_THRESHOLD)
+        NativeApp.setPadButtonForPort(port, negCode, 32767, v < -STICK_DIGITAL_THRESHOLD)
+    }
+
+    private val dpadOwnHeld = Array(8) { HashSet<Int>() }
+
+    private fun customTargetsDpad(port: Int): Boolean {
+        for (isLeft in booleanArrayOf(true, false)) {
+            if (ControllerMappings.stickModeFor(isLeft, port) != ControllerMappings.StickMode.CUSTOM) continue
+            for (dir in ControllerMappings.StickDir.values())
+                if (ControllerMappings.customStickCode(isLeft, dir, port) in 19..22) return true
+        }
+        return false
+    }
+
+    private fun dispatchDpadCombined(ev: MotionEvent, port: Int) {
+        val held = dpadOwnHeld[port]
+        val dpadAsStick = ControllerMappings.dpadAsLeftStick()
+        val hatX = if (dpadAsStick) 0f else ev.getAxisValue(MotionEvent.AXIS_HAT_X)
+        val hatY = if (dpadAsStick) 0f else ev.getAxisValue(MotionEvent.AXIS_HAT_Y)
+        val hatActive = hatX != 0f || hatY != 0f
+        val leftDpad = false
+        val rightDpad = false
+        if (!hatActive && !leftDpad && !rightDpad && !customTargetsDpad(port)) {
+            if (held.isNotEmpty()) {
+                held.forEach { NativeApp.setPadButtonForPort(port, it, 0, false) }
+                held.clear()
+            }
+            return
+        }
+        val dpRightBound = ControllerMappings.targetForPhysical(KeyEvent.KEYCODE_DPAD_RIGHT, port) != null
+        val dpLeftBound = ControllerMappings.targetForPhysical(KeyEvent.KEYCODE_DPAD_LEFT, port) != null
+        val dpDownBound = ControllerMappings.targetForPhysical(KeyEvent.KEYCODE_DPAD_DOWN, port) != null
+        val dpUpBound = ControllerMappings.targetForPhysical(KeyEvent.KEYCODE_DPAD_UP, port) != null
+        var right = hatX > 0.5f && dpRightBound
+        var left = hatX < -0.5f && dpLeftBound
+        var down = hatY > 0.5f && dpDownBound
+        var up = hatY < -0.5f && dpUpBound
+
+        fun foldStick(axisX: Int, axisY: Int) {
+            val x = ev.getAxisValue(axisX)
+            val y = ev.getAxisValue(axisY)
+            right = right || x > STICK_DIGITAL_THRESHOLD
+            left = left || x < -STICK_DIGITAL_THRESHOLD
+            down = down || y > STICK_DIGITAL_THRESHOLD
+            up = up || y < -STICK_DIGITAL_THRESHOLD
+        }
+        if (leftDpad) foldStick(MotionEvent.AXIS_X, MotionEvent.AXIS_Y)
+        if (rightDpad) foldStick(MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ)
+
+        fun foldCustom(isLeft: Boolean, axisX: Int, axisY: Int) {
+            if (ControllerMappings.stickModeFor(isLeft, port) != ControllerMappings.StickMode.CUSTOM) return
+            val x = ev.getAxisValue(axisX)
+            val y = ev.getAxisValue(axisY)
+            fun mark(dir: ControllerMappings.StickDir, active: Boolean) {
+                if (!active) return
+                when (ControllerMappings.customStickCode(isLeft, dir, port)) {
+                    22 -> right = true
+                    21 -> left = true
+                    20 -> down = true
+                    19 -> up = true
+                }
+            }
+            mark(ControllerMappings.StickDir.RIGHT, x > STICK_DIGITAL_THRESHOLD)
+            mark(ControllerMappings.StickDir.LEFT, x < -STICK_DIGITAL_THRESHOLD)
+            mark(ControllerMappings.StickDir.DOWN, y > STICK_DIGITAL_THRESHOLD)
+            mark(ControllerMappings.StickDir.UP, y < -STICK_DIGITAL_THRESHOLD)
+        }
+        foldCustom(true, MotionEvent.AXIS_X, MotionEvent.AXIS_Y)
+        foldCustom(false, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ)
+
+        fun apply(code: Int, on: Boolean) {
+            val was = held.contains(code)
+            if (on == was) return
+            NativeApp.setPadButtonForPort(port, code, if (on) 32767 else 0, on)
+            if (on) held.add(code) else held.remove(code)
+        }
+        apply(22, right)
+        apply(21, left)
+        apply(20, down)
+        apply(19, up)
+    }
+
+    private fun sendTrigger(event: MotionEvent, axisA: Int, axisB: Int, code: Int, port: Int) {
+        val target = ControllerMappings.targetForPhysical(code, port) ?: return
+        val raw = maxOf(event.getAxisValue(axisA), event.getAxisValue(axisB)).coerceIn(0f, 1f)
+        val out = if (raw <= TRIGGER_DEAD) 0f else (raw - TRIGGER_DEAD) / (1f - TRIGGER_DEAD)
+        if (target in 110..123) {
+            accumAnalog(target, out)
+        } else {
+            NativeApp.setPadButtonForPort(port, target, (out * 32767).toInt(), out > 0f)
+        }
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) {
+            WindowInsetsControllerCompat(window, window.decorView)
+                .hide(WindowInsetsCompat.Type.systemBars())
+        }
+    }
+
+    override fun onPause() {
+        if (eState.value == EmuState.RUNNING && !com.armsx2.WinNativeHost.enabled())
+            pause()
+        NativeApp.flushShaderCache()
+        runCatching { NativeApp.dumpPgoProfile() }
+        super.onPause()
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        handleExternalLaunchIntent(intent)
+    }
+
+    override fun onDestroy() {
+        if (isChangingConfigurations()) {
+            super.onDestroy()
+            return
+        }
+        NativeApp.shutdown()
+        super.onDestroy()
+
+        val appPid = Process.myPid()
+        Process.killProcess(appPid)
+    }
+
+    private fun handleExternalLaunchIntent(intent: Intent?) {
+        val uri = extractLaunchUri(intent) ?: return
+        persistReadGrant(intent, uri)
+        currentGame.value = null
+        pendingExternalLaunch.value = uri.toString()
+        launchPendingExternalGameIfReady()
+    }
+
+    private fun extractLaunchUri(intent: Intent?): Uri? {
+        if (intent == null)
+            return null
+
+        intent.data?.let { return it }
+
+        val stream: Uri? = if (Build.VERSION.SDK_INT >= 33) {
+            intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
+        } else {
+            @Suppress("DEPRECATION")
+            intent.getParcelableExtra(Intent.EXTRA_STREAM) as? Uri
+        }
+        stream?.let { return it }
+
+        intent.clipData?.takeIf { it.itemCount > 0 }?.getItemAt(0)?.uri?.let { return it }
+
+        for (key in listOf("path", "game", "rom", "uri", "android.intent.extra.STREAM")) {
+            val value = intent.getStringExtra(key)?.takeIf { it.isNotBlank() } ?: continue
+            return value.toUri()
+        }
+
+        return null
+    }
+
+    private fun persistReadGrant(intent: Intent?, uri: Uri) {
+        if (uri.scheme != "content" || intent == null)
+            return
+
+        val flags = intent.flags
+        if ((flags and Intent.FLAG_GRANT_READ_URI_PERMISSION) == 0 ||
+            (flags and Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) == 0)
+            return
+
+        runCatching {
+            contentResolver.takePersistableUriPermission(
+                uri,
+                Intent.FLAG_GRANT_READ_URI_PERMISSION,
+            )
+        }
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/ui/InGameOverlay.kt b/armsx2/src/main/java/com/armsx2/ui/InGameOverlay.kt
new file mode 100644
index 000000000..94abf0492
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/ui/InGameOverlay.kt
@@ -0,0 +1,58 @@
+package com.armsx2.ui
+
+import androidx.compose.runtime.mutableStateOf
+import com.armsx2.EmuState
+import com.armsx2.runtime.MainActivityRuntime
+import com.armsx2.config.ConfigStore
+import com.armsx2.config.Settings
+import com.armsx2.config.SettingsScope
+import kr.co.iefriends.pcsx2.NativeApp
+
+object InGameOverlay {
+    val settingsState = mutableStateOf(Settings())
+    val settingsScope = mutableStateOf(SettingsScope.Global)
+    val currentSerial = mutableStateOf<String?>(null)
+    val hardcoreOn = mutableStateOf(false)
+    val frameLimitOn = mutableStateOf(true)
+
+    val osdHidden = mutableStateOf(false)
+
+    fun saveSettings(updated: Settings) {
+        val previous = settingsState.value
+        settingsState.value = updated
+        ConfigStore.save(settingsScope.value, currentSerial.value, updated, previous)
+        frameLimitOn.value = updated.frameLimitEnable
+
+        if (MainActivityRuntime.nativeReady.value) {
+            runCatching {
+                if (previous.frameLimitEnable != updated.frameLimitEnable) {
+                    NativeApp.setSetting("EmuCore/GS", "FrameLimitEnable", "bool", updated.frameLimitEnable.toString())
+                    NativeApp.speedhackLimitermode(if (updated.frameLimitEnable) 0 else 3)
+                    MainActivityRuntime.fastForwardToggleActive = false
+                }
+                if (previous.upscaleFloat != updated.upscaleFloat &&
+                    MainActivityRuntime.eState.value != EmuState.STOPPED
+                ) {
+                    NativeApp.renderUpscalemultiplier(updated.upscaleFloat.coerceIn(0.25f, 8.0f))
+                    MainActivityRuntime.upscale.value = updated.upscaleFloat.coerceIn(0.25f, 8.0f)
+                }
+                if (MainActivityRuntime.eState.value != EmuState.STOPPED) updated.applyTo()
+            }
+        }
+    }
+
+    fun toggleOsd() {
+        val hide = !osdHidden.value
+        osdHidden.value = hide
+        if (hide) {
+            NativeApp.osdApplyFlags(false, false, false, false, false, false, false, false, false, false, false, false)
+        } else {
+            val s = settingsState.value
+            NativeApp.osdApplyFlags(
+                s.osdShowFps, s.osdShowVps, s.osdShowSpeed, s.osdShowCpu, s.osdShowGpu,
+                s.osdShowResolution, s.osdShowGsStats, s.osdShowFrameTimes, s.osdShowHardwareInfo,
+                s.osdShowVersion, s.osdShowSettings, s.osdShowInputs,
+            )
+        }
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/ui/WindowImpl.kt b/armsx2/src/main/java/com/armsx2/ui/WindowImpl.kt
new file mode 100644
index 000000000..e7c9209fa
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/ui/WindowImpl.kt
@@ -0,0 +1,12 @@
+package com.armsx2.ui
+
+import androidx.compose.runtime.mutableStateOf
+
+object WindowImpl {
+    val toolbarVisible = mutableStateOf(true)
+    val showLibrary = mutableStateOf(false)
+    val overlayVisible = mutableStateOf(false)
+
+    val frontendCovers: Boolean
+        get() = overlayVisible.value || showLibrary.value
+}
diff --git a/armsx2/src/main/java/com/armsx2/ui/achievements/AchievementsViewModel.kt b/armsx2/src/main/java/com/armsx2/ui/achievements/AchievementsViewModel.kt
new file mode 100644
index 000000000..d6054ef0a
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/ui/achievements/AchievementsViewModel.kt
@@ -0,0 +1,37 @@
+package com.armsx2.ui.achievements
+
+import org.json.JSONObject
+
+data class AchievementItem(
+    val id: Int,
+    val title: String,
+    val description: String,
+    val points: Int,
+    val unlocked: Boolean,
+    val progress: String,
+    val iconUrl: String,
+    val subsetId: Int = 0,
+)
+
+fun parseAchievementItems(json: String): List<AchievementItem> {
+    if (json.isBlank()) return emptyList()
+    val root = runCatching { JSONObject(json) }.getOrNull() ?: return emptyList()
+    val array = root.optJSONArray("items") ?: return emptyList()
+    return buildList {
+        repeat(array.length()) { index ->
+            val item = array.optJSONObject(index) ?: return@repeat
+            add(
+                AchievementItem(
+                    id = item.optInt("id"),
+                    title = item.optString("title"),
+                    description = item.optString("description"),
+                    points = item.optInt("points"),
+                    unlocked = item.optBoolean("unlocked"),
+                    progress = item.optString("measuredProgress"),
+                    iconUrl = item.optString("iconUrl", item.optString("badgeUrl")),
+                    subsetId = item.optInt("subsetId"),
+                ),
+            )
+        }
+    }
+}
diff --git a/armsx2/src/main/java/com/armsx2/ui/touch/TouchControls.kt b/armsx2/src/main/java/com/armsx2/ui/touch/TouchControls.kt
new file mode 100644
index 000000000..f538a17ee
--- /dev/null
+++ b/armsx2/src/main/java/com/armsx2/ui/touch/TouchControls.kt
@@ -0,0 +1,667 @@
+package com.armsx2.ui.touch
+
+import android.view.KeyEvent
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import com.armsx2.EmuState
+import com.armsx2.runtime.MainActivityRuntime
+import com.armsx2.ui.InGameOverlay
+import kr.co.iefriends.pcsx2.NativeApp
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.File
+import androidx.core.content.edit
+
+object TouchControls {
+    private const val KEY_PROFILES = "touch.profiles"
+    private const val KEY_ACTIVE = "touch.active"
+    private const val KEY_OPACITY = "touch.opacity"
+    private const val KEY_FACE_MULTI = "touch.faceMulti"
+    private const val KEY_TOUCH_GLIDING = "touch.gliding"
+    private const val KEY_TOUCH_HAPTICS = "touch.haptics"
+    private const val KEY_MULTI_RADIUS = "touch.multiRadius"
+    private const val KEY_DPAD_SPACING = "touch.dpadSpacing"
+    private const val KEY_FLOATING_STICK = "touch.floatingStick"
+    private const val KEY_VIS_MODE = "touch.visibilityMode"
+    private const val KEY_DEFAULTS_MIGRATED_247 = "touch.defaults.migrated.247"
+    private const val KEY_ACTIVE_GAME_PREFIX = "touch.active.game."
+    private const val KEY_LAYOUT_GAME_PREFIX = "touch.layout.game."
+    private const val PROFILE_FILE_SUFFIX = ".touch.json"
+
+    val visible = mutableStateOf(true)
+
+    val editMode = mutableStateOf(false)
+
+    fun exitEditMode() {
+        editMode.value = false
+        if (MainActivityRuntime.eState.value == EmuState.PAUSED) MainActivityRuntime.resume()
+    }
+
+    val selectedButton = mutableStateOf<TouchButtonId?>(null)
+
+    val profileDialogOpen = mutableStateOf(false)
+
+    val profiles = mutableStateListOf<TouchProfile>()
+
+    val activeProfileName = mutableStateOf("Default")
+
+    val activeLayout = mutableStateOf(TouchLayout.default())
+
+    val opacity = mutableFloatStateOf(0.55f)
+
+    val faceMultiTouch = mutableStateOf(true)
+
+    val touchGliding = mutableStateOf(false)
+
+    val touchHaptics = mutableStateOf(true)
+
+    val multiTouchRadius = mutableFloatStateOf(0.62f)
+
+    val dpadSpacing = mutableFloatStateOf(0.0f)
+
+    val floatingStick = mutableStateOf(false)
+
+    val pressureModifierHeld = mutableStateOf(false)
+
+    const val PRESSURE_HALF_RANGE = 16383
+
+    private val PRESSURE_KEYCODES = setOf(
+        19, 20, 21, 22,
+        96, 97, 99, 100,
+        102, 103, 104, 105,
+    )
+
+    fun pressureRangeFor(keycode: Int): Int =
+        if (pressureModifierHeld.value && keycode in PRESSURE_KEYCODES) PRESSURE_HALF_RANGE else 0
+
+    val visibilityMode = mutableIntStateOf(11)
+
+    val interactionTick = mutableIntStateOf(0)
+
+    private const val KEY_MACRO_PREFIX = "touch.macro."
+
+    val macroBindTick = mutableIntStateOf(0)
+
+    data class MacroTarget(val code: Int, val label: String)
+
+    const val MACRO_CODE_PRESSURE = -2
+
+    val macroAssignableTargets: List<MacroTarget> = listOf(
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_Y, "Triangle"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_B, "Circle"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_A, "Cross"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_X, "Square"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_L1, "L1"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_R1, "R1"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_L2, "L2"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_R2, "R2"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_THUMBL, "L3"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_THUMBR, "R3"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_START, "Start"),
+        MacroTarget(KeyEvent.KEYCODE_BUTTON_SELECT, "Select"),
+        MacroTarget(KeyEvent.KEYCODE_DPAD_UP, "Up"),
+        MacroTarget(KeyEvent.KEYCODE_DPAD_RIGHT, "Right"),
+        MacroTarget(KeyEvent.KEYCODE_DPAD_DOWN, "Down"),
+        MacroTarget(KeyEvent.KEYCODE_DPAD_LEFT, "Left"),
+        MacroTarget(200, "Analog"),
+        MacroTarget(MACRO_CODE_PRESSURE, "Pressure"),
+        MacroTarget(110, "L-Stick Up"),
+        MacroTarget(111, "L-Stick Right"),
+        MacroTarget(112, "L-Stick Down"),
+        MacroTarget(113, "L-Stick Left"),
+        MacroTarget(120, "R-Stick Up"),
+        MacroTarget(121, "R-Stick Right"),
+        MacroTarget(122, "R-Stick Down"),
+        MacroTarget(123, "R-Stick Left"),
+    )
+
+    fun macroTargetFor(code: Int): MacroTarget? = macroAssignableTargets.firstOrNull { it.code == code }
+
+    fun macroCodes(id: TouchButtonId): List<Int> {
+        val raw = MainActivityRuntime.prefs.getString(KEY_MACRO_PREFIX + id.name, "").orEmpty()
+        if (raw.isEmpty()) return emptyList()
+        val codes = raw.split(",").mapNotNull { token ->
+            token.toIntOrNull()
+                ?: runCatching { TouchButtonId.valueOf(token).keycode }.getOrNull()
+        }.toSet()
+        return macroAssignableTargets.map { it.code }.filter { it in codes }
+    }
+
+    fun setMacroCodes(id: TouchButtonId, codes: List<Int>) {
+        val wanted = codes.toSet()
+        val csv = macroAssignableTargets.map { it.code }.filter { it in wanted }.joinToString(",")
+        MainActivityRuntime.prefs.edit { putString(KEY_MACRO_PREFIX + id.name, csv) }
+        macroBindTick.intValue++
+    }
+
+    private const val KEY_MACRO_PHYS_PREFIX = "touch.macro.phys."
+
+    fun macroPhysicalCode(id: TouchButtonId): Int =
+        MainActivityRuntime.prefs.getInt(KEY_MACRO_PHYS_PREFIX + id.name, KeyEvent.KEYCODE_UNKNOWN)
+
+    fun setMacroPhysicalCode(id: TouchButtonId, keycode: Int) {
+        MainActivityRuntime.prefs.edit { putInt(KEY_MACRO_PHYS_PREFIX + id.name, keycode)}
+        macroBindTick.intValue++
+    }
+
+    fun clearMacroPhysicalCode(id: TouchButtonId) = setMacroPhysicalCode(id, KeyEvent.KEYCODE_UNKNOWN)
+
+    private const val KEY_MACRO_FREQ_PREFIX = "touch.macro.freq."
+
+    const val MACRO_FREQ_MAX = 60
+
+    fun macroFrequency(id: TouchButtonId): Int =
+        MainActivityRuntime.prefs.getInt(KEY_MACRO_FREQ_PREFIX + id.name, 0).coerceIn(0, MACRO_FREQ_MAX)
+
+    fun setMacroFrequency(id: TouchButtonId, frames: Int) {
+        MainActivityRuntime.prefs.edit {
+            putInt(KEY_MACRO_FREQ_PREFIX + id.name, frames.coerceIn(0, MACRO_FREQ_MAX))
+        }
+        macroBindTick.intValue++
+    }
+
+    private const val MACRO_FRAME_MS = 1000.0 / 60.0
+
+    private val macroHandler = android.os.Handler(android.os.Looper.getMainLooper())
+    private val macroRunnables = HashMap<String, Runnable>()
+
+    fun fireMacro(id: TouchButtonId, key: String, down: Boolean, emit: (Int, Boolean) -> Unit) {
+        val codes = macroCodes(id)
+        if (codes.isEmpty()) return
+        val wantsPressure = MACRO_CODE_PRESSURE in codes
+        val buttons = codes.filter { it != MACRO_CODE_PRESSURE }
+        val runKey = "${id.name}:$key"
+        if (!down) {
+            macroRunnables.remove(runKey)?.let { macroHandler.removeCallbacks(it) }
+            buttons.forEach { emit(it, false) }
+            if (wantsPressure) pressureModifierHeld.value = false
+            return
+        }
+        if (wantsPressure) pressureModifierHeld.value = true
+        if (buttons.isEmpty()) return
+        val frames = macroFrequency(id)
+        if (frames <= 0) {
+            buttons.forEach { emit(it, true) }
+            return
+        }
+        if (macroRunnables.containsKey(runKey)) return
+        val periodMs = (frames * MACRO_FRAME_MS).toLong().coerceAtLeast(16L)
+        var pressed = false
+        val runnable = object : Runnable {
+            override fun run() {
+                pressed = !pressed
+                buttons.forEach { emit(it, pressed) }
+                macroHandler.postDelayed(this, periodMs)
+            }
+        }
+        macroRunnables[runKey] = runnable
+        macroHandler.post(runnable)
+    }
+
+    fun macroForPhysicalCode(keycode: Int): TouchButtonId? {
+        if (keycode == KeyEvent.KEYCODE_UNKNOWN) return null
+        for (id in listOf(TouchButtonId.MACRO1, TouchButtonId.MACRO2, TouchButtonId.MACRO3, TouchButtonId.MACRO4)) {
+            if (macroPhysicalCode(id) == keycode && macroCodes(id).isNotEmpty()) return id
+        }
+        return null
+    }
+
+    private var loaded = false
+
+    fun ensureLoaded() {
+        if (loaded) return
+        loaded = true
+        load()
+    }
+
+    private fun load() {
+        val raw = MainActivityRuntime.prefs.getString(KEY_PROFILES, null)
+        val list = mutableListOf<TouchProfile>()
+        if (raw != null) {
+            runCatching {
+                val arr = JSONArray(raw)
+                for (i in 0 until arr.length()) {
+                    val obj = arr.getJSONObject(i)
+                    list.add(TouchProfile.fromJson(obj))
+                }
+            }
+        }
+        importFolderProfilesInto(list)
+        if (list.isEmpty()) {
+            list.add(TouchProfile("Default", TouchLayout.default()))
+        }
+        profiles.clear()
+        profiles.addAll(list)
+
+        val active = MainActivityRuntime.prefs.getString(KEY_ACTIVE, list.first().name) ?: list.first().name
+        activeProfileName.value = active
+        val match = list.firstOrNull { it.name == active } ?: list.first()
+        activeLayout.value = match.layout.copy()
+        opacity.floatValue = MainActivityRuntime.prefs.getFloat(KEY_OPACITY, 0.55f).coerceIn(0.20f, 1.0f)
+        faceMultiTouch.value = MainActivityRuntime.prefs.getBoolean(KEY_FACE_MULTI, true)
+        touchGliding.value = MainActivityRuntime.prefs.getBoolean(KEY_TOUCH_GLIDING, false)
+        touchHaptics.value = MainActivityRuntime.prefs.getBoolean(KEY_TOUCH_HAPTICS, true)
+        multiTouchRadius.floatValue = MainActivityRuntime.prefs.getFloat(KEY_MULTI_RADIUS, 0.62f).coerceIn(0.50f, 0.95f)
+        dpadSpacing.floatValue = MainActivityRuntime.prefs.getFloat(KEY_DPAD_SPACING, 0.0f).coerceIn(0.0f, 0.35f)
+        floatingStick.value = MainActivityRuntime.prefs.getBoolean(KEY_FLOATING_STICK, false)
+        visibilityMode.intValue = MainActivityRuntime.prefs.getInt(KEY_VIS_MODE, 11).coerceIn(0, 11)
+        if (visibilityMode.intValue == 0) visible.value = false
+
+        if (!MainActivityRuntime.prefs.getBoolean(KEY_DEFAULTS_MIGRATED_247, false)) {
+            faceMultiTouch.value = true
+            fun hidePressure(layout: TouchLayout): TouchLayout = layout.copy(
+                buttons = layout.buttons.map {
+                    if (it.id.kind == TouchButtonId.Kind.PRESSURE) it.copy(enabled = false) else it
+                }
+            )
+            for (i in profiles.indices) profiles[i] = profiles[i].copy(layout = hidePressure(profiles[i].layout))
+            activeLayout.value = hidePressure(activeLayout.value)
+            MainActivityRuntime.prefs.edit { putBoolean(KEY_DEFAULTS_MIGRATED_247, true) }
+            persist()
+        }
+    }
+
+    private fun persist() {
+        val arr = JSONArray()
+        for (p in profiles) arr.put(p.toJson())
+        MainActivityRuntime.prefs.edit {
+            putString(KEY_PROFILES, arr.toString())
+                .putString(KEY_ACTIVE, activeProfileName.value)
+                .putFloat(KEY_OPACITY, opacity.floatValue)
+                .putBoolean(KEY_FACE_MULTI, faceMultiTouch.value)
+                .putBoolean(KEY_TOUCH_GLIDING, touchGliding.value)
+                .putBoolean(KEY_TOUCH_HAPTICS, touchHaptics.value)
+                .putFloat(KEY_MULTI_RADIUS, multiTouchRadius.floatValue)
+                .putFloat(KEY_DPAD_SPACING, dpadSpacing.floatValue)
+                .putBoolean(KEY_FLOATING_STICK, floatingStick.value)
+                .putInt(KEY_VIS_MODE, visibilityMode.intValue)
+        }
+        syncFolder()
+    }
+
+    fun setVisibilityMode(mode: Int) {
+        visibilityMode.intValue = mode.coerceIn(0, 11)
+        visible.value = visibilityMode.intValue != 0
+        interactionTick.intValue++
+        persist()
+    }
+
+    fun noteTouchInteraction() {
+        if (visibilityMode.intValue == 0) return
+        if (!visible.value) visible.value = true
+        interactionTick.intValue++
+    }
+
+    fun saveLiveLayoutToActive() {
+        if (gameIsRunning()) {
+            val serial = runningSerial()
+            if (serial != null) {
+                MainActivityRuntime.prefs.edit {
+                    putString(
+                        KEY_LAYOUT_GAME_PREFIX + serial,
+                        activeLayout.value.toJson().toString(),
+                    )
+                }
+            } else {
+                val crc = runCatching { NativeApp.getGameCRC() }.getOrNull()
+                    ?.trim()?.uppercase()?.takeIf { it.isNotEmpty() && it != "00000000" }
+                if (crc != null) {
+                    MainActivityRuntime.prefs.edit {
+                        putString(
+                            KEY_LAYOUT_GAME_PREFIX + "crc." + crc,
+                            activeLayout.value.toJson().toString(),
+                        )
+                    }
+                } else {
+                    println(
+                        "@@ARMSX2_TOUCH@@ refusing to save in-game layout to global " +
+                            "Default: no serial/CRC resolved for running game"
+                    )
+                }
+            }
+        } else {
+            val idx = profiles.indexOfFirst { it.name == activeProfileName.value }
+            if (idx >= 0) {
+                profiles[idx] = profiles[idx].copy(layout = activeLayout.value.copy())
+                persist()
+            }
+        }
+        selectedButton.value = null
+    }
+
+    fun saveAsNewProfile(name: String) {
+        val trimmed = name.trim().ifEmpty { return }
+        val newProf = TouchProfile(trimmed, activeLayout.value.copy())
+        val existing = profiles.indexOfFirst { it.name == trimmed }
+        if (existing >= 0) profiles[existing] = newProf
+        else profiles.add(newProf)
+        activeProfileName.value = trimmed
+        val serial = if (gameIsRunning()) runningSerial() else null
+        if (serial != null)
+            MainActivityRuntime.prefs.edit { putString(KEY_ACTIVE_GAME_PREFIX + serial, trimmed) }
+        persist()
+    }
+
+    fun switchProfile(name: String) {
+        val match = profiles.firstOrNull { it.name == name } ?: return
+        activeProfileName.value = name
+        activeLayout.value = match.layout.copy()
+        val serial = if (gameIsRunning()) runningSerial() else null
+        if (serial != null)
+            MainActivityRuntime.prefs.edit { putString(KEY_ACTIVE_GAME_PREFIX + serial, name) }
+        persist()
+    }
+
+    fun deleteProfile(name: String) {
+        if (profiles.size <= 1) return
+        val idx = profiles.indexOfFirst { it.name == name }
+        if (idx < 0) return
+        profiles.removeAt(idx)
+        if (activeProfileName.value == name) {
+            val fallback = profiles.first()
+            activeProfileName.value = fallback.name
+            activeLayout.value = fallback.layout.copy()
+        }
+        clearGameOverridesFor(name)
+        persist()
+    }
+
+    fun resetActiveToDefault() {
+        activeLayout.value = TouchLayout.default()
+    }
+
+    private fun gameIsRunning(): Boolean =
+        MainActivityRuntime.eState.value == EmuState.RUNNING || MainActivityRuntime.eState.value == EmuState.PAUSED
+
+    private fun coreSerial(): String? =
+        runCatching { NativeApp.getGameSerial() }.getOrNull()?.takeIf { it.isNotEmpty() }
+
+    private fun runningSerial(): String? =
+        MainActivityRuntime.currentGame.value?.serial?.takeIf { it.isNotEmpty() }
+            ?: coreSerial()
+            ?: InGameOverlay.currentSerial.value?.takeIf { it.isNotEmpty() }
+
+    fun applyForSerial(serial: String?) {
+        val effSerial = serial?.takeIf { it.isNotEmpty() } ?: coreSerial()
+        if (effSerial == null) {
+            val crc = runCatching { NativeApp.getGameCRC() }.getOrNull()
+                ?.trim()?.uppercase()?.takeIf { it.isNotEmpty() && it != "00000000" }
+            if (crc != null) {
+                val rawCrc = MainActivityRuntime.prefs.getString(KEY_LAYOUT_GAME_PREFIX + "crc." + crc, null)
+                if (rawCrc != null) {
+                    runCatching { TouchLayout.fromJson(JSONObject(rawCrc)) }.getOrNull()?.let {
+                        activeProfileName.value = "Default"
+                        activeLayout.value = it
+                        return
+                    }
+                }
+            }
+            return
+        }
+        val rawLayout = MainActivityRuntime.prefs.getString(KEY_LAYOUT_GAME_PREFIX + effSerial, null)
+        if (rawLayout != null) {
+            runCatching { TouchLayout.fromJson(JSONObject(rawLayout)) }.getOrNull()?.let {
+                activeProfileName.value = "Default"
+                activeLayout.value = it
+                return
+            }
+        }
+        val name = MainActivityRuntime.prefs.getString(KEY_ACTIVE_GAME_PREFIX + effSerial, null)
+        if (name != null) {
+            val match = profiles.firstOrNull { it.name == name }
+            if (match != null) {
+                activeProfileName.value = name
+                activeLayout.value = match.layout.copy()
+                return
+            }
+        }
+        val def = profiles.firstOrNull { it.name == "Default" } ?: profiles.firstOrNull()
+        if (def != null) {
+            activeProfileName.value = def.name
+            activeLayout.value = def.layout.copy()
+        } else {
+            activeProfileName.value = "Default"
+            activeLayout.value = TouchLayout.default()
+        }
+    }
+
+    private fun clearGameOverridesFor(profileName: String) {
+        MainActivityRuntime.prefs.edit {
+            for ((k, v) in MainActivityRuntime.prefs.all) {
+                if (k.startsWith(KEY_ACTIVE_GAME_PREFIX) && v == profileName) remove(k)
+            }
+        }
+    }
+
+    fun clearGameLayout(serial: String?) {
+        if (serial == null) return
+        MainActivityRuntime.prefs.edit {remove(KEY_LAYOUT_GAME_PREFIX + serial) }
+    }
+
+    fun clearGameLayoutIfRunning() {
+        if (gameIsRunning()) clearGameLayout(runningSerial())
+    }
+
+    private fun profilesDir(): File? = MainActivityRuntime.inputProfilesDir()
+
+    private fun fileNameFor(name: String): String =
+        name.replace(Regex("[^A-Za-z0-9 _.-]"), "_") + PROFILE_FILE_SUFFIX
+
+    private fun syncFolder() {
+        val dir = profilesDir() ?: return
+        runCatching {
+            val want = HashMap<String, TouchProfile>()
+            for (p in profiles) want[fileNameFor(p.name)] = p
+            for ((fn, p) in want) File(dir, fn).writeText(p.toJson().toString())
+            dir.listFiles { f -> f.name.endsWith(PROFILE_FILE_SUFFIX) }?.forEach { f ->
+                if (f.name !in want) runCatching { f.delete() }
+            }
+        }
+    }
+
+    private fun importFolderProfilesInto(list: MutableList<TouchProfile>) {
+        val dir = profilesDir() ?: return
+        runCatching {
+            val have = list.map { it.name }.toHashSet()
+            dir.listFiles { f -> f.name.endsWith(PROFILE_FILE_SUFFIX) }
+                ?.sortedBy { it.name }
+                ?.forEach { f ->
+                    runCatching {
+                        val prof = TouchProfile.fromJson(JSONObject(f.readText()))
+                        if (prof.name !in have) { list.add(prof); have.add(prof.name) }
+                    }
+                }
+        }
+    }
+
+    fun discardEdits() {
+        val match = profiles.firstOrNull { it.name == activeProfileName.value }
+        if (match != null) activeLayout.value = match.layout.copy()
+        selectedButton.value = null
+    }
+
+    fun setOpacity(o: Float) {
+        opacity.floatValue = o.coerceIn(0.20f, 1.0f)
+        persist()
+    }
+
+    fun setFaceMultiTouch(enabled: Boolean) {
+        faceMultiTouch.value = enabled
+        persist()
+    }
+
+    fun setTouchGliding(enabled: Boolean) {
+        touchGliding.value = enabled
+        persist()
+    }
+
+    fun setTouchHaptics(enabled: Boolean) {
+        touchHaptics.value = enabled
+        persist()
+    }
+
+    fun setMultiTouchRadius(v: Float) {
+        multiTouchRadius.floatValue = v.coerceIn(0.50f, 0.95f)
+        persist()
+    }
+
+    fun setDpadSpacing(v: Float) {
+        dpadSpacing.floatValue = v.coerceIn(0.0f, 0.35f)
+        persist()
+    }
+
+    fun setFloatingStick(enabled: Boolean) {
+        floatingStick.value = enabled
+        persist()
+    }
+
+    fun updateButton(id: TouchButtonId, transform: (TouchButtonCfg) -> TouchButtonCfg) {
+        val current = activeLayout.value
+        val newButtons = current.buttons.map { if (it.id == id) transform(it) else it }
+        activeLayout.value = current.copy(buttons = newButtons)
+    }
+
+    fun onControllerInputDetected() {
+        if (visibilityMode.intValue == 11 && visible.value) visible.value = false
+    }
+
+    fun onSurfaceTouched() {
+        noteTouchInteraction()
+    }
+}
+
+enum class TouchButtonId(val label: String, val keycode: Int, val kind: Kind) {
+    CROSS("✕", KeyEvent.KEYCODE_BUTTON_A, Kind.FACE),
+    CIRCLE("○", KeyEvent.KEYCODE_BUTTON_B, Kind.FACE),
+    SQUARE("□", KeyEvent.KEYCODE_BUTTON_X, Kind.FACE),
+    TRIANGLE("△", KeyEvent.KEYCODE_BUTTON_Y, Kind.FACE),
+    L1("L1", KeyEvent.KEYCODE_BUTTON_L1, Kind.SHOULDER),
+    R1("R1", KeyEvent.KEYCODE_BUTTON_R1, Kind.SHOULDER),
+    L2("L2", KeyEvent.KEYCODE_BUTTON_L2, Kind.SHOULDER),
+    R2("R2", KeyEvent.KEYCODE_BUTTON_R2, Kind.SHOULDER),
+    START("Start", KeyEvent.KEYCODE_BUTTON_START, Kind.MENU),
+    SELECT("Select", KeyEvent.KEYCODE_BUTTON_SELECT, Kind.MENU),
+    L3("L3", KeyEvent.KEYCODE_BUTTON_THUMBL, Kind.MENU),
+    R3("R3", KeyEvent.KEYCODE_BUTTON_THUMBR, Kind.MENU),
+    DPAD("D-Pad", KeyEvent.KEYCODE_DPAD_UP, Kind.DPAD),
+    L_STICK("L-Stick", 110, Kind.STICK),
+    R_STICK("R-Stick", 120, Kind.STICK),
+    PAUSE("Pause", 0, Kind.PAUSE),
+
+    FAST_FORWARD("▶▶", 0, Kind.FASTFORWARD),
+
+    SAVE_STATE("SAVE", 0, Kind.STATEACTION),
+    LOAD_STATE("LOAD", 0, Kind.STATEACTION),
+
+    MACRO1("M1", 0, Kind.MACRO),
+    MACRO2("M2", 0, Kind.MACRO),
+    MACRO3("M3", 0, Kind.MACRO),
+    MACRO4("M4", 0, Kind.MACRO),
+
+    PRESSURE("P½", 0, Kind.PRESSURE);
+
+    enum class Kind { FACE, SHOULDER, MENU, DPAD, STICK, PAUSE, PRESSURE, FASTFORWARD, MACRO, STATEACTION }
+}
+
+data class TouchButtonCfg(
+    val id: TouchButtonId,
+    val xFrac: Float,
+    val yFrac: Float,
+    val sizeDp: Float,
+    val enabled: Boolean = true,
+    val tapToHold: Boolean = false,
+) {
+    fun toJson(): JSONObject = JSONObject().apply {
+        put("id", id.name)
+        put("x", xFrac.toDouble())
+        put("y", yFrac.toDouble())
+        put("size", sizeDp.toDouble())
+        put("on", enabled)
+        put("hold", tapToHold)
+    }
+
+    companion object {
+        fun fromJson(json: JSONObject): TouchButtonCfg? {
+            val idName = json.optString("id", "") ?: ""
+            val id = runCatching { TouchButtonId.valueOf(idName) }.getOrNull() ?: return null
+            return TouchButtonCfg(
+                id = id,
+                xFrac = json.optDouble("x", 0.5).toFloat().coerceIn(0f, 1f),
+                yFrac = json.optDouble("y", 0.5).toFloat().coerceIn(0f, 1f),
+                sizeDp = json.optDouble("size", 64.0).toFloat().coerceIn(28f, 220f),
+                enabled = json.optBoolean("on", true),
+                tapToHold = json.optBoolean("hold", false),
+            )
+        }
+    }
+}
+
+data class TouchLayout(val buttons: List<TouchButtonCfg>) {
+    fun toJson(): JSONObject = JSONObject().apply {
+        val arr = JSONArray()
+        for (b in buttons) arr.put(b.toJson())
+        put("buttons", arr)
+    }
+
+    companion object {
+        fun fromJson(json: JSONObject): TouchLayout {
+            val arr = json.optJSONArray("buttons") ?: return default()
+            val list = mutableListOf<TouchButtonCfg>()
+            for (i in 0 until arr.length()) {
+                val obj = arr.optJSONObject(i) ?: continue
+                TouchButtonCfg.fromJson(obj)?.let { list.add(it) }
+            }
+            val have = list.map { it.id }.toSet()
+            val merged = list + default().buttons.filter { it.id !in have }
+            return TouchLayout(merged)
+        }
+
+        fun default(): TouchLayout = TouchLayout(
+            buttons = listOf(
+                TouchButtonCfg(TouchButtonId.DPAD,     0.10f, 0.55f, 150f),
+                TouchButtonCfg(TouchButtonId.TRIANGLE, 0.86f, 0.45f, 58f),
+                TouchButtonCfg(TouchButtonId.SQUARE,   0.80f, 0.55f, 58f),
+                TouchButtonCfg(TouchButtonId.CIRCLE,   0.92f, 0.55f, 58f),
+                TouchButtonCfg(TouchButtonId.CROSS,    0.86f, 0.65f, 58f),
+                TouchButtonCfg(TouchButtonId.L2,       0.08f, 0.10f, 56f),
+                TouchButtonCfg(TouchButtonId.L1,       0.08f, 0.23f, 56f),
+                TouchButtonCfg(TouchButtonId.R2,       0.92f, 0.10f, 56f),
+                TouchButtonCfg(TouchButtonId.R1,       0.92f, 0.23f, 56f),
+                TouchButtonCfg(TouchButtonId.SELECT,   0.45f, 0.92f, 48f),
+                TouchButtonCfg(TouchButtonId.START,    0.55f, 0.92f, 48f),
+                TouchButtonCfg(TouchButtonId.FAST_FORWARD, 0.30f, 0.40f, 44f, enabled = false),
+                TouchButtonCfg(TouchButtonId.MACRO1, 0.40f, 0.40f, 42f, enabled = false),
+                TouchButtonCfg(TouchButtonId.MACRO2, 0.48f, 0.40f, 42f, enabled = false),
+                TouchButtonCfg(TouchButtonId.MACRO3, 0.56f, 0.40f, 42f, enabled = false),
+                TouchButtonCfg(TouchButtonId.MACRO4, 0.64f, 0.40f, 42f, enabled = false),
+                TouchButtonCfg(TouchButtonId.SAVE_STATE, 0.30f, 0.54f, 44f, enabled = false),
+                TouchButtonCfg(TouchButtonId.LOAD_STATE, 0.38f, 0.54f, 44f, enabled = false),
+                TouchButtonCfg(TouchButtonId.L_STICK,  0.28f, 0.80f, 130f),
+                TouchButtonCfg(TouchButtonId.R_STICK,  0.72f, 0.80f, 130f),
+                TouchButtonCfg(TouchButtonId.L3,       0.18f, 0.93f, 42f),
+                TouchButtonCfg(TouchButtonId.R3,       0.82f, 0.93f, 42f),
+                TouchButtonCfg(TouchButtonId.PAUSE,    0.48f, 0.50f, 120f),
+                TouchButtonCfg(TouchButtonId.PRESSURE, 0.10f, 0.78f, 44f, enabled = false),
+            ),
+        )
+    }
+}
+
+data class TouchProfile(val name: String, val layout: TouchLayout) {
+    fun toJson(): JSONObject = JSONObject().apply {
+        put("name", name)
+        put("layout", layout.toJson())
+    }
+
+    companion object {
+        fun fromJson(json: JSONObject): TouchProfile {
+            return TouchProfile(
+                name = json.optString("name", "Profile"),
+                layout = json.optJSONObject("layout")?.let { TouchLayout.fromJson(it) }
+                    ?: TouchLayout.default(),
+            )
+        }
+    }
+}
diff --git a/armsx2/src/main/java/kr/co/iefriends/pcsx2/AssetFiles.java b/armsx2/src/main/java/kr/co/iefriends/pcsx2/AssetFiles.java
new file mode 100644
index 000000000..d4dbb73a3
--- /dev/null
+++ b/armsx2/src/main/java/kr/co/iefriends/pcsx2/AssetFiles.java
@@ -0,0 +1,82 @@
+package kr.co.iefriends.pcsx2;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public final class AssetFiles {
+    private AssetFiles() {}
+
+    public static void copyTree(File srcDir, File destDir) {
+        File[] kids = srcDir.listFiles();
+        if (kids == null) return;
+        if (!destDir.isDirectory() && !destDir.mkdirs()) {
+            Log.e("ARMSX2", "copyTree: cannot create " + destDir);
+            return;
+        }
+        for (File src : kids) {
+            File dest = new File(destDir, src.getName());
+            if (src.isDirectory()) {
+                copyTree(src, dest);
+                continue;
+            }
+            if (dest.exists() && !isForceFresh(src.getPath())) continue;
+            try (InputStream is = new FileInputStream(src); FileOutputStream os = new FileOutputStream(dest)) {
+                byte[] buffer = new byte[1 << 16];
+                int read;
+                while ((read = is.read(buffer)) != -1) os.write(buffer, 0, read);
+            } catch (IOException e) {
+                Log.e("ARMSX2", "copyTree failed: " + src + " -> " + dest + ": " + e.getMessage());
+            }
+        }
+    }
+
+    private static boolean isForceFresh(String name) {
+        return name.contains("shaders")
+                || name.endsWith("GameIndex.yaml")
+                || name.endsWith("armsx2_overrides.yaml");
+    }
+
+    public static void copyFile(Context p_context, String srcFile, String destFile) {
+        AssetManager assetMgr = p_context.getAssets();
+
+        InputStream is = null;
+        FileOutputStream os = null;
+        final boolean forceFresh = srcFile.contains("shaders")
+                || srcFile.endsWith("GameIndex.yaml")
+                || srcFile.endsWith("armsx2_overrides.yaml");
+        try {
+            is = assetMgr.open(srcFile);
+            File destFileObj = new File(destFile);
+            boolean _exists = destFileObj.exists();
+            if (forceFresh) {
+                if (_exists && !destFileObj.delete()) {
+                    Log.w("ARMSX2", "copyFile: failed to delete stale asset " + destFile);
+                }
+                _exists = false;
+            }
+            if (!_exists) {
+                os = new FileOutputStream(destFile);
+
+                byte[] buffer = new byte[1024];
+                int read;
+                while ((read = is.read(buffer)) != -1) {
+                    os.write(buffer, 0, read);
+                }
+                is.close();
+                os.flush();
+                os.close();
+            }
+        } catch (IOException e) {
+            Log.e("ARMSX2", "copyFile failed: " + srcFile + " -> " + destFile + ": " + e.getMessage());
+            try { if (is != null) is.close(); } catch (IOException ignored) {}
+            try { if (os != null) os.close(); } catch (IOException ignored) {}
+        }
+    }
+}
diff --git a/armsx2/src/main/java/kr/co/iefriends/pcsx2/HttpClient.java b/armsx2/src/main/java/kr/co/iefriends/pcsx2/HttpClient.java
new file mode 100644
index 000000000..df41dd982
--- /dev/null
+++ b/armsx2/src/main/java/kr/co/iefriends/pcsx2/HttpClient.java
@@ -0,0 +1,79 @@
+package kr.co.iefriends.pcsx2;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public final class HttpClient {
+
+    private HttpClient() {}
+
+    public static final class Response {
+        public int statusCode;
+        public String contentType = "";
+        public byte[] data = new byte[0];
+    }
+
+    public static Response doRequest(
+            String url,
+            String method,
+            byte[] postData,
+            String userAgent,
+            int timeoutMs) {
+        Response out = new Response();
+        HttpURLConnection conn = null;
+        try {
+            URL u = new URL(url);
+            conn = (HttpURLConnection) u.openConnection();
+            conn.setRequestMethod(method);
+            conn.setConnectTimeout(timeoutMs);
+            conn.setReadTimeout(timeoutMs);
+            conn.setInstanceFollowRedirects(true);
+            if (userAgent != null && !userAgent.isEmpty()) {
+                conn.setRequestProperty("User-Agent", userAgent);
+            }
+            if ("POST".equalsIgnoreCase(method) && postData != null) {
+                conn.setDoOutput(true);
+                conn.setFixedLengthStreamingMode(postData.length);
+                conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+                try (OutputStream os = conn.getOutputStream()) {
+                    os.write(postData);
+                }
+            }
+
+            int code = conn.getResponseCode();
+            out.statusCode = code;
+            String ct = conn.getContentType();
+            out.contentType = ct == null ? "" : ct;
+
+            InputStream in;
+            try {
+                in = conn.getInputStream();
+            } catch (IOException ignored) {
+                in = conn.getErrorStream();
+            }
+            if (in != null) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buf = new byte[8192];
+                int n;
+                while ((n = in.read(buf)) > 0) {
+                    baos.write(buf, 0, n);
+                }
+                out.data = baos.toByteArray();
+                in.close();
+            }
+            return out;
+        } catch (java.net.SocketTimeoutException e) {
+            out.statusCode = -2;
+            return out;
+        } catch (Throwable e) {
+            out.statusCode = -1;
+            return out;
+        } finally {
+            if (conn != null) conn.disconnect();
+        }
+    }
+}
diff --git a/armsx2/src/main/java/kr/co/iefriends/pcsx2/NativeApp.java b/armsx2/src/main/java/kr/co/iefriends/pcsx2/NativeApp.java
new file mode 100644
index 000000000..fc9efac84
--- /dev/null
+++ b/armsx2/src/main/java/kr/co/iefriends/pcsx2/NativeApp.java
@@ -0,0 +1,452 @@
+package kr.co.iefriends.pcsx2;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.os.ParcelFileDescriptor;
+import android.os.Looper;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.os.VibratorManager;
+import android.system.Os;
+import android.system.OsConstants;
+import android.view.InputDevice;
+import android.view.Surface;
+
+import com.armsx2.BiosInfo;
+import com.armsx2.EmuState;
+import com.armsx2.runtime.MainActivityRuntime;
+import com.armsx2.events.TestResult;
+
+import java.io.File;
+import java.lang.ref.WeakReference;
+
+public class NativeApp {
+	private static final String BUNDLE_CORES = "retro/bundle/cores";
+
+	private static boolean loadAttempted;
+
+	public static synchronized void ensureLoaded(Context context) {
+		if (loadAttempted) return;
+		loadAttempted = true;
+		String libraryName = selectNativeLibraryName();
+		File bundled = new File(context.getFilesDir(), BUNDLE_CORES + "/lib" + libraryName + ".so");
+		try {
+			try {
+				System.loadLibrary("librashader_capi");
+			} catch (Throwable e) {
+				android.util.Log.w("ARMSX2", "librashader preload failed", e);
+			}
+			System.load(bundled.getAbsolutePath());
+			hasNoNativeBinary = false;
+			System.out.println("PCSX2_LOAD " + libraryName + " pageSize=" + getRuntimePageSize());
+		} catch (Throwable e) {
+			hasNoNativeBinary = true;
+			android.util.Log.e("ARMSX2", "PCSX2_LOAD_FAILED " + libraryName
+					+ " pageSize=" + getRuntimePageSize(), e);
+		}
+	}
+
+	public static boolean hasNoNativeBinary = true;
+
+	private static long getRuntimePageSize() {
+		try {
+			long pageSize = Os.sysconf(OsConstants._SC_PAGESIZE);
+			return pageSize > 0 ? pageSize : 4096;
+		} catch (Throwable ignored) {
+			return 4096;
+		}
+	}
+
+	private static String selectNativeLibraryName() {
+		return getRuntimePageSize() >= 16384 ? "emucore_16k" : "emucore_4k";
+	}
+
+	protected static WeakReference<Context> mContext;
+	public static Context getContext() {
+		return mContext != null ? mContext.get() : null;
+	}
+
+	public static void initializeOnce(Context context) {
+		mContext = new WeakReference<>(context);
+
+		File externalFilesDir = context.getExternalFilesDir(null);
+		if (externalFilesDir == null) {
+			externalFilesDir = context.getDataDir();
+		}
+
+		String chosen = MainActivityRuntime.Companion.systemDirPosix();
+		if (chosen != null && !MainActivityRuntime.Companion.validateSystemDirWritable(chosen)) {
+			chosen = null;
+		}
+		String dataPath = (chosen != null) ? chosen : externalFilesDir.getAbsolutePath();
+
+		String biosFolder = MainActivityRuntime.Companion.biosFolderPosix();
+		if (biosFolder == null || biosFolder.isEmpty()) {
+			biosFolder = externalFilesDir.getAbsolutePath() + java.io.File.separator + "bios";
+		}
+
+		initialize(dataPath, biosFolder, android.os.Build.VERSION.SDK_INT);
+
+		com.armsx2.RetroAchievementsHostOverrideReceiver.applyPending(context);
+	}
+
+	public static native void initialize(String path, String biosFolder, int apiVer);
+
+	public static native void dumpPgoProfile();
+
+	public static native String shaderPresetParams(String presetPath);
+
+	public static native void setShaderChainParams(String presetPath, String[] names, float[] values);
+
+	public static native void captureGsDump(int frames);
+
+	public static native void setEeDiffVerify(boolean enabled);
+
+	public static native void setSetting(String section, String key, String type, String value);
+
+	public static native void commitSettings();
+
+	public static native boolean applyGSSettingsLive();
+	public static native int reloadPatches();
+	public static native boolean reloadTextureReplacements();
+
+	public static native void setEnabledPatches(boolean cheats, String[] allNames, String[] enabledNames);
+	public static native String getGameSerial();
+	public static native String getGameCRC();
+
+	public static native String getBuildVersion();
+
+	public static native String getPauseGameSerial();
+
+	public static native String getAchievementsJSON();
+
+	public static native String getRichPresence();
+
+	public static native String loginAchievements(String username, String password);
+
+	public static native void logoutAchievements();
+
+	public static native void setHardcoreMode(boolean enabled);
+
+	public static native boolean isHardcoreMode();
+	public static native boolean isHardcorePersisted();
+
+	public static native void setAchievementsOption(String key, boolean enabled);
+
+	public static native void setAchievementsUnlockSound(String path);
+
+	public static native void setAchievementsHostOverride(String host);
+
+	public static native void clearAchievementsHostOverride();
+
+	public static native void osdApplyFlags(boolean fps, boolean vps, boolean speed, boolean cpu,
+		boolean gpu, boolean res, boolean gsStats, boolean frameTimes, boolean hwInfo,
+		boolean version, boolean settings, boolean inputs);
+
+	public static native void osdShowFPS(boolean enabled);
+	public static native void osdShowVPS(boolean enabled);
+	public static native void osdShowSpeed(boolean enabled);
+	public static native void osdShowCPU(boolean enabled);
+	public static native void osdShowGPU(boolean enabled);
+	public static native void osdShowResolution(boolean enabled);
+	public static native void osdShowGSStats(boolean enabled);
+	public static native void osdShowFrameTimes(boolean enabled);
+	public static native void osdShowHardwareInfo(boolean enabled);
+	public static native void osdShowMessages(boolean enabled);
+	public static native void osdShowGpuStats(boolean enabled);
+	public static native void osdShowVersion(boolean enabled);
+	public static native void osdShowSettings(boolean enabled);
+	public static native void osdShowInputs(boolean enabled);
+	public static native void osdSetScale(float scale);
+
+	public static native boolean gameIniBeginWrite();
+	public static native void gameIniPut(String section, String key, String value);
+	public static native boolean gameIniCommitWrite();
+
+	public static native void setCustomVulkanDriver(
+		String driverDir, String driverName,
+		String redirectDir, String hookLibDir);
+
+	public static native void setPadButton(int index, int range, boolean iskeypressed);
+	public static native void setPadButtonForPort(int port, int index, int range, boolean iskeypressed);
+	public static native void setMultitap(int port, boolean enabled);
+
+	public static native void usbSetKeyboardEnabled(int port, boolean enabled);
+	public static native boolean usbKeyboardKey(int port, int androidKeyCode, boolean pressed);
+
+	public static volatile int sRumbleDeviceId = -1;
+	public static volatile boolean sRumbleEnabled = true;
+	private static final int RUMBLE_MS = 3000;
+
+	public static void onPadRumble(int pad, int largeMotor, int smallMotor) {
+		if (!sRumbleEnabled) return;
+		int devId = com.armsx2.input.PadRouter.INSTANCE.deviceIdForPort(pad);
+		if (devId < 0) devId = sRumbleDeviceId;
+		if (devId < 0 && pad != 0) return;
+		float low = Math.max(0f, Math.min(1f, largeMotor / 255f));
+		float high = Math.max(0f, Math.min(1f, smallMotor / 255f));
+		vibrateDevice(devId, low, high, RUMBLE_MS, pad == 0);
+	}
+
+	private static final java.util.Set<android.media.MediaPlayer> sActiveSounds =
+			java.util.Collections.synchronizedSet(new java.util.HashSet<>());
+
+	public static void playSound(String path) {
+		if (path == null || path.isEmpty()) return;
+		if (sActiveSounds.size() >= 4) return;
+		new Thread(() -> {
+			android.media.MediaPlayer mp = null;
+			try {
+				mp = new android.media.MediaPlayer();
+				mp.setAudioAttributes(new android.media.AudioAttributes.Builder()
+						.setUsage(android.media.AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+						.setContentType(android.media.AudioAttributes.CONTENT_TYPE_SONIFICATION)
+						.build());
+				mp.setDataSource(path);
+				mp.setOnCompletionListener(m -> { sActiveSounds.remove(m); try { m.release(); } catch (Throwable ignore) {} });
+				mp.setOnErrorListener((m, what, extra) -> { sActiveSounds.remove(m); try { m.release(); } catch (Throwable ignore) {} return true; });
+				sActiveSounds.add(mp);
+				mp.prepare();
+				mp.start();
+			} catch (Throwable t) {
+				if (mp != null) { sActiveSounds.remove(mp); try { mp.release(); } catch (Throwable ignore) {} }
+				android.util.Log.e("ARMSX2", "playSound failed: " + path, t);
+			}
+		}, "armsx2-ra-sound").start();
+	}
+
+	private static void vibrateDevice(int devId, float low, float high, int ms, boolean allowSystemFallback) {
+		try {
+			float combined = Math.min(1f, low * 0.6f + high * 0.4f);
+			boolean drove = false;
+			InputDevice dev = (devId >= 0) ? InputDevice.getDevice(devId) : null;
+			if (dev != null) {
+				if (Build.VERSION.SDK_INT >= 31) {
+					VibratorManager vm = dev.getVibratorManager();
+					int[] ids = vm.getVibratorIds();
+					if (ids.length >= 2) {
+						drove = rumbleOne(vm.getVibrator(ids[0]), low, ms);
+						drove |= rumbleOne(vm.getVibrator(ids[1]), high, ms);
+					} else if (ids.length == 1) {
+						drove = rumbleOne(vm.getVibrator(ids[0]), combined, ms);
+					} else {
+						drove = rumbleOne(dev.getVibrator(), combined, ms);
+					}
+				} else {
+					drove = rumbleOne(dev.getVibrator(), combined, ms);
+				}
+			}
+			if (!drove && allowSystemFallback) {
+				rumbleOne(systemVibrator(), combined, ms);
+			}
+		} catch (Throwable ignored) {
+		}
+	}
+
+	private static boolean rumbleOne(Vibrator v, float intensity, int ms) {
+		if (v == null || !v.hasVibrator()) return false;
+		if (intensity <= 0f) {
+			try { v.cancel(); } catch (Throwable ignored) {}
+			return true;
+		}
+		int amp = Math.round(intensity * 255f);
+		if (amp < 1) amp = 1;
+		if (amp > 255) amp = 255;
+		try {
+			v.vibrate(VibrationEffect.createOneShot(ms, amp));
+		} catch (Throwable t) {
+			try { v.vibrate(ms); } catch (Throwable ignored) {}
+		}
+		return true;
+	}
+
+	private static volatile Vibrator sSystemVibrator;
+	private static Vibrator systemVibrator() {
+		Vibrator v = sSystemVibrator;
+		if (v != null) return v;
+		try {
+			Context ctx = getContext();
+			if (ctx != null) {
+				if (Build.VERSION.SDK_INT >= 31) {
+					VibratorManager vm = (VibratorManager) ctx.getSystemService(Context.VIBRATOR_MANAGER_SERVICE);
+					v = (vm != null) ? vm.getDefaultVibrator() : null;
+				} else {
+					v = (Vibrator) ctx.getSystemService(Context.VIBRATOR_SERVICE);
+				}
+				if (v != null) sSystemVibrator = v;
+			}
+		} catch (Throwable ignored) {
+		}
+		return v;
+	}
+
+	private static volatile long sLastTouchHapticMs = 0L;
+	public static void touchHaptic() {
+		long now = android.os.SystemClock.uptimeMillis();
+		if (now - sLastTouchHapticMs < 24L) return;
+		sLastTouchHapticMs = now;
+		try { rumbleOne(systemVibrator(), 0.6f, 12); } catch (Throwable ignored) {}
+	}
+
+	private static int nthGamepadDeviceId(int index) {
+		int n = 0;
+		for (int id : InputDevice.getDeviceIds()) {
+			InputDevice d = InputDevice.getDevice(id);
+			if (d == null) continue;
+			int src = d.getSources();
+			boolean pad = (src & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD
+					|| (src & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK;
+			if (!pad) continue;
+			if (n == index) return id;
+			n++;
+		}
+		return -1;
+	}
+
+	public static void testRumble(int port) {
+		int devId = com.armsx2.input.PadRouter.INSTANCE.deviceIdForPort(port);
+		if (devId < 0) devId = nthGamepadDeviceId(port);
+		vibrateDevice(devId, 0.9f, 0.9f, 500, true);
+	}
+
+	public static String rumbleStatusForPort(int port) {
+		int devId = com.armsx2.input.PadRouter.INSTANCE.deviceIdForPort(port);
+		boolean mapped = devId >= 0;
+		if (devId < 0) devId = nthGamepadDeviceId(port);
+		if (devId < 0) return "Player " + (port + 1) + ": no controller found";
+		InputDevice d = InputDevice.getDevice(devId);
+		String name = (d != null && d.getName() != null) ? d.getName() : ("device " + devId);
+		int vmCount = 0;
+		boolean legacy = false;
+		try {
+			Vibrator lv = (d != null) ? d.getVibrator() : null;
+			legacy = lv != null && lv.hasVibrator();
+		} catch (Throwable ignored) {}
+		if (Build.VERSION.SDK_INT >= 31 && d != null) {
+			try { vmCount = d.getVibratorManager().getVibratorIds().length; } catch (Throwable ignored) {}
+		}
+		boolean hasRumble = vmCount > 0 || legacy;
+		int motors = Math.max(vmCount, legacy ? 1 : 0);
+		return "Player " + (port + 1) + ": " + name
+				+ (mapped ? "" : " (not active in-game yet)")
+				+ (hasRumble ? " — rumble OK (" + motors + " motor" + (motors == 1 ? "" : "s") + ")"
+						: " — NO rumble exposed by Android");
+	}
+
+	public static native void setAspectRatio(int type);
+	public static native void setFmvAspectRatio(int type);
+	public static native void speedhackLimitermode(int value);
+	public static native void setNominalSpeed(int percent);
+	public static native void setFpsCap(int fps);
+	public static native void applyFramerateLive(float ntsc, float pal);
+	public static native void setFrameSkip(int skip);
+	public static native void setAudioVolume(int volume);
+	public static native void setAudioMuted(boolean muted);
+	public static native void setAudioSwapChannels(boolean swap);
+	public static native void speedhackEecyclerate(int value);
+	public static native void speedhackEecycleskip(int value);
+	public static native void setInstantVU1(boolean enabled);
+
+	public static native void renderUpscalemultiplier(float value);
+	public static native void renderTvShader(int value);
+	public static native void renderShadeBoost(boolean enabled, int brightness, int contrast, int saturation, int gamma);
+	public static native void renderSoftware();
+	public static native void renderOpenGL();
+	public static native void renderVulkan();
+	public static native void renderAuto();
+
+	public static native boolean toggleTextureDumping();
+
+	public static native boolean createMemoryCard(String name, int type, int fileType);
+	public static native boolean isMemoryCard(String name);
+
+	public static native void onNativeSurfaceCreated();
+	public static native void onNativeSurfaceChanged(Surface surface, int w, int h);
+	public static native void onNativeSurfaceDestroyed();
+	public static native void setDisplayRefreshRate(float hz);
+
+	public static native boolean runVMThread(String path);
+	public static native void pause();
+	public static native void resume();
+	public static native void shutdown();
+	public static native boolean hasActiveVM();
+
+	public static native void flushShaderCache();
+
+	public static native void runEeJitTests();
+
+	public static native void runVifTests();
+
+	public static native void runEeSeqTests();
+
+	public static void onTestResults(String label, int passed, int total) {
+		MainActivityRuntime.Companion.onTestResults(new TestResult(label, passed, total));
+	}
+
+	public static native BiosInfo getBiosInfoFromFd(int fd);
+
+	public static native String getGameSerialFromFd(int fd);
+
+	public static native int getCompatibilityForSerial(String serial);
+
+	public static native String getRegionForSerial(String serial);
+
+	public static native boolean saveStateToSlot(int slot);
+	public static native boolean loadStateFromSlot(int slot);
+	public static native String getGamePathSlot(int slot);
+	public static native byte[] getImageSlot(int slot);
+	public static native byte[] getSaveStateImage(String path);
+
+	public static native boolean changeDisc(String path);
+
+	public static native boolean saveAutosaveState();
+	public static native boolean loadAutosaveState();
+	public static native boolean hasAutosaveState();
+	public static native byte[] getAutosaveImage();
+	public static native String getAutosaveGamePath();
+	public static native int getPresentedFrameCount();
+
+	public static void vmSetPaused(boolean paused) {
+		new Handler(Looper.getMainLooper()).post(() -> {
+			if (MainActivityRuntime.isVmStopInProgress())
+				return;
+			if (!paused && MainActivityRuntime.eState.getValue() == EmuState.STOPPED)
+				return;
+			if (paused) {
+				MainActivityRuntime.eState.setValue(EmuState.PAUSED);
+			} else {
+				MainActivityRuntime.eState.setValue(EmuState.RUNNING);
+				MainActivityRuntime.onVmRunning();
+			}
+		});
+	}
+
+	public static int openContentUri(String uriString) {
+		Context _context = getContext();
+		if(_context != null) {
+			ContentResolver _contentResolver = _context.getContentResolver();
+			try {
+				ParcelFileDescriptor filePfd = _contentResolver.openFileDescriptor(Uri.parse(uriString), "r");
+				if (filePfd != null) {
+					return filePfd.detachFd();
+				}
+			} catch (Exception ignored) {}
+		}
+		return -1;
+	}
+
+	public static boolean createDirectoryPath(String path) {
+		if (path == null || path.isEmpty()) return false;
+		try {
+			java.io.File dir = new java.io.File(path);
+			if (dir.isDirectory()) return true;
+			dir.mkdirs();
+			return dir.isDirectory();
+		} catch (Throwable t) {
+			return false;
+		}
+	}
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/HIDDevice.java b/armsx2/src/main/java/org/libsdl/app/HIDDevice.java
new file mode 100644
index 000000000..f96095324
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/HIDDevice.java
@@ -0,0 +1,21 @@
+package org.libsdl.app;
+
+import android.hardware.usb.UsbDevice;
+
+interface HIDDevice
+{
+    public int getId();
+    public int getVendorId();
+    public int getProductId();
+    public String getSerialNumber();
+    public int getVersion();
+    public String getManufacturerName();
+    public String getProductName();
+    public UsbDevice getDevice();
+    public boolean open();
+    public int writeReport(byte[] report, boolean feature);
+    public boolean readReport(byte[] report, boolean feature);
+    public void setFrozen(boolean frozen);
+    public void close();
+    public void shutdown();
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java b/armsx2/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
new file mode 100644
index 000000000..cd5c7a23a
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
@@ -0,0 +1,751 @@
+package org.libsdl.app;
+
+import android.content.Context;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCallback;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothGattService;
+import android.hardware.usb.UsbDevice;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.os.*;
+
+//import com.android.internal.util.HexDump;
+
+import java.lang.Runnable;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.UUID;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDevice {
+
+    private static final String TAG = "hidapi";
+    private HIDDeviceManager mManager;
+    private BluetoothDevice mDevice;
+    private int mDeviceId;
+    private BluetoothGatt mGatt;
+    private boolean mIsRegistered = false;
+    private boolean mIsConnected = false;
+    private boolean mIsChromebook = false;
+    private boolean mIsReconnecting = false;
+    private boolean mFrozen = false;
+    private LinkedList<GattOperation> mOperations;
+    GattOperation mCurrentOperation = null;
+    private Handler mHandler;
+    private int mProductId = -1;
+
+    private static final int D0G_BLE2_PID = 0x1106;
+    private static final int TRITON_BLE_PID = 0x1303;
+
+
+    private static final int TRANSPORT_AUTO = 0;
+    private static final int TRANSPORT_BREDR = 1;
+    private static final int TRANSPORT_LE = 2;
+
+    private static final int CHROMEBOOK_CONNECTION_CHECK_INTERVAL = 10000;
+
+    static final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
+    static final UUID inputCharacteristicD0G = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
+    static final UUID inputCharacteristicTriton = UUID.fromString("100F6C7A-1735-4313-B402-38567131E5F3");
+    static final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
+    static private final byte[] enterValveMode = new byte[] { (byte)0xC0, (byte)0x87, 0x03, 0x08, 0x07, 0x00 };
+
+    private HashMap<Integer, BluetoothGattCharacteristic> mOutputReportChars = new HashMap<Integer, BluetoothGattCharacteristic>();
+
+    static class GattOperation {
+        private enum Operation {
+            CHR_READ,
+            CHR_WRITE,
+            ENABLE_NOTIFICATION
+        }
+
+        Operation mOp;
+        UUID mUuid;
+        byte[] mValue;
+        BluetoothGatt mGatt;
+        boolean mResult = true;
+
+        private GattOperation(BluetoothGatt gatt, Operation operation, UUID uuid) {
+            mGatt = gatt;
+            mOp = operation;
+            mUuid = uuid;
+        }
+
+        private GattOperation(BluetoothGatt gatt, Operation operation, UUID uuid, byte[] value) {
+            mGatt = gatt;
+            mOp = operation;
+            mUuid = uuid;
+            mValue = value;
+        }
+
+        public void run() {
+            // This is executed in main thread
+            BluetoothGattCharacteristic chr;
+
+            switch (mOp) {
+                case CHR_READ:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Reading characteristic " + chr.getUuid());
+                    if (!mGatt.readCharacteristic(chr)) {
+                        Log.e(TAG, "Unable to read characteristic " + mUuid.toString());
+                        mResult = false;
+                        break;
+                    }
+                    mResult = true;
+                    break;
+                case CHR_WRITE:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Writing characteristic " + chr.getUuid() + " value=" + HexDump.toHexString(value));
+                    chr.setValue(mValue);
+                    if (!mGatt.writeCharacteristic(chr)) {
+                        Log.e(TAG, "Unable to write characteristic " + mUuid.toString());
+                        mResult = false;
+                        break;
+                    }
+                    mResult = true;
+                    break;
+                case ENABLE_NOTIFICATION:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Writing descriptor of " + chr.getUuid());
+                    if (chr != null) {
+                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+                        if (cccd != null) {
+                            int properties = chr.getProperties();
+                            byte[] value;
+                            if ((properties & BluetoothGattCharacteristic.PROPERTY_NOTIFY) == BluetoothGattCharacteristic.PROPERTY_NOTIFY) {
+                                value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE;
+                            } else if ((properties & BluetoothGattCharacteristic.PROPERTY_INDICATE) == BluetoothGattCharacteristic.PROPERTY_INDICATE) {
+                                value = BluetoothGattDescriptor.ENABLE_INDICATION_VALUE;
+                            } else {
+                                Log.e(TAG, "Unable to start notifications on input characteristic");
+                                mResult = false;
+                                return;
+                            }
+
+                            mGatt.setCharacteristicNotification(chr, true);
+                            cccd.setValue(value);
+                            if (!mGatt.writeDescriptor(cccd)) {
+                                Log.e(TAG, "Unable to write descriptor " + mUuid.toString());
+                                mResult = false;
+                                return;
+                            }
+                            mResult = true;
+                        }
+                    }
+            }
+        }
+
+        public boolean finish() {
+            return mResult;
+        }
+
+        private BluetoothGattCharacteristic getCharacteristic(UUID uuid) {
+            BluetoothGattService valveService = mGatt.getService(steamControllerService);
+            if (valveService == null)
+                return null;
+            return valveService.getCharacteristic(uuid);
+        }
+
+        static public GattOperation readCharacteristic(BluetoothGatt gatt, UUID uuid) {
+            return new GattOperation(gatt, Operation.CHR_READ, uuid);
+        }
+
+        static public GattOperation writeCharacteristic(BluetoothGatt gatt, UUID uuid, byte[] value) {
+            return new GattOperation(gatt, Operation.CHR_WRITE, uuid, value);
+        }
+
+        static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid) {
+            return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid);
+        }
+    }
+
+    HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
+        mManager = manager;
+        mDevice = device;
+        mDeviceId = mManager.getDeviceIDForIdentifier(getIdentifier());
+        mIsRegistered = false;
+        mIsChromebook = SDLActivity.isChromebook();
+        mOperations = new LinkedList<GattOperation>();
+        mHandler = new Handler(Looper.getMainLooper());
+
+        mGatt = connectGatt();
+        // final HIDDeviceBLESteamController finalThis = this;
+        // mHandler.postDelayed(new Runnable() {
+        //     @Override
+        //     void run() {
+        //         finalThis.checkConnectionForChromebookIssue();
+        //     }
+        // }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
+    }
+
+    String getIdentifier() {
+        return String.format("SteamController.%s", mDevice.getAddress());
+    }
+
+    BluetoothGatt getGatt() {
+        return mGatt;
+    }
+
+    // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
+    // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
+    private BluetoothGatt connectGatt(boolean managed) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
+            try {
+                return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
+            } catch (Exception e) {
+                return mDevice.connectGatt(mManager.getContext(), managed, this);
+            }
+        } else {
+            return mDevice.connectGatt(mManager.getContext(), managed, this);
+        }
+    }
+
+    private BluetoothGatt connectGatt() {
+        return connectGatt(false);
+    }
+
+    protected int getConnectionState() {
+
+        Context context = mManager.getContext();
+        if (context == null) {
+            // We are lacking any context to get our Bluetooth information.  We'll just assume disconnected.
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+
+        BluetoothManager btManager = (BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (btManager == null) {
+            // This device doesn't support Bluetooth.  We should never be here, because how did
+            // we instantiate a device to start with?
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+
+        return btManager.getConnectionState(mDevice, BluetoothProfile.GATT);
+    }
+
+    void reconnect() {
+
+        if (getConnectionState() != BluetoothProfile.STATE_CONNECTED) {
+            mGatt.disconnect();
+            mGatt = connectGatt();
+        }
+
+    }
+
+    protected void checkConnectionForChromebookIssue() {
+        if (!mIsChromebook) {
+            // We only do this on Chromebooks, because otherwise it's really annoying to just attempt
+            // over and over.
+            return;
+        }
+
+        int connectionState = getConnectionState();
+
+        switch (connectionState) {
+            case BluetoothProfile.STATE_CONNECTED:
+                if (!mIsConnected) {
+                    // We are in the Bad Chromebook Place.  We can force a disconnect
+                    // to try to recover.
+                    Log.v(TAG, "Chromebook: We are in a very bad state; the controller shows as connected in the underlying Bluetooth layer, but we never received a callback.  Forcing a reconnect.");
+                    mIsReconnecting = true;
+                    mGatt.disconnect();
+                    mGatt = connectGatt(false);
+                    break;
+                }
+                else if (!isRegistered()) {
+                    if (mGatt.getServices().size() > 0) {
+                        Log.v(TAG, "Chromebook: We are connected to a controller, but never got our registration.  Trying to recover.");
+                        probeService(this);
+                    }
+                    else {
+                        Log.v(TAG, "Chromebook: We are connected to a controller, but never discovered services.  Trying to recover.");
+                        mIsReconnecting = true;
+                        mGatt.disconnect();
+                        mGatt = connectGatt(false);
+                        break;
+                    }
+                }
+                else {
+                    Log.v(TAG, "Chromebook: We are connected, and registered.  Everything's good!");
+                    return;
+                }
+                break;
+
+            case BluetoothProfile.STATE_DISCONNECTED:
+                Log.v(TAG, "Chromebook: We have either been disconnected, or the Chromebook BtGatt.ContextMap bug has bitten us.  Attempting a disconnect/reconnect, but we may not be able to recover.");
+
+                mIsReconnecting = true;
+                mGatt.disconnect();
+                mGatt = connectGatt(false);
+                break;
+
+            case BluetoothProfile.STATE_CONNECTING:
+                Log.v(TAG, "Chromebook: We're still trying to connect.  Waiting a bit longer.");
+                break;
+        }
+
+        final HIDDeviceBLESteamController finalThis = this;
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finalThis.checkConnectionForChromebookIssue();
+            }
+        }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
+    }
+
+    private boolean isRegistered() {
+        return mIsRegistered;
+    }
+
+    private void setRegistered() {
+        mIsRegistered = true;
+    }
+
+    private boolean probeService(HIDDeviceBLESteamController controller) {
+
+        if (isRegistered()) {
+            return true;
+        }
+
+        if (!mIsConnected) {
+            return false;
+        }
+
+        Log.v(TAG, "probeService controller=" + controller);
+
+        for (BluetoothGattService service : mGatt.getServices()) {
+            if (service.getUuid().equals(steamControllerService)) {
+                Log.v(TAG, "Found Valve steam controller service " + service.getUuid());
+
+                for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
+                    boolean bShouldStartNotifications = false;
+
+                    if (chr.getUuid().equals(inputCharacteristicTriton)) {
+                        Log.v(TAG, "Found Triton input characteristic");
+                        mProductId = TRITON_BLE_PID;
+                        bShouldStartNotifications = true;
+                    } else if (chr.getUuid().equals(inputCharacteristicD0G)) {
+                        Log.v(TAG, "Found D0G input characteristic");
+                        mProductId = D0G_BLE2_PID;
+                        bShouldStartNotifications = true;
+                    } else {
+                        Pattern reportPattern = Pattern.compile("100F6C([0-9A-Z]{2})", Pattern.CASE_INSENSITIVE);
+                        Matcher matcher = reportPattern.matcher(chr.getUuid().toString());
+
+                        if (matcher.find()) {
+                            try {
+                                int reportId = Integer.parseInt(matcher.group(1), 16);
+
+                                reportId -= 0x35;
+                                if (reportId >= 0x80) {
+                                    // This is a Triton output report characteristic that we need to care about.
+                                    Log.v(TAG, "Found Triton output report 0x" + Integer.toString(reportId, 16));
+                                    mOutputReportChars.put(reportId, chr);
+                                }
+                            }
+                            catch (NumberFormatException nfe) {
+                                Log.w(TAG, "Could not parse report characteristic " + chr.getUuid().toString() + ": " + nfe.toString());
+                            }
+                        }
+                    }
+
+                    if (bShouldStartNotifications) {
+                        // Start notifications
+                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+                        if (cccd != null) {
+                            enableNotification(chr.getUuid());
+                        }
+                    }
+                }
+                return true;
+            }
+        }
+
+        if ((mGatt.getServices().size() == 0) && mIsChromebook && !mIsReconnecting) {
+            Log.e(TAG, "Chromebook: Discovered services were empty; this almost certainly means the BtGatt.ContextMap bug has bitten us.");
+            mIsConnected = false;
+            mIsReconnecting = true;
+            mGatt.disconnect();
+            mGatt = connectGatt(false);
+        }
+
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private void finishCurrentGattOperation() {
+        GattOperation op = null;
+        synchronized (mOperations) {
+            if (mCurrentOperation != null) {
+                op = mCurrentOperation;
+                mCurrentOperation = null;
+            }
+        }
+        if (op != null) {
+            boolean result = op.finish(); // TODO: Maybe in main thread as well?
+
+            // Our operation failed, let's add it back to the beginning of our queue.
+            if (!result) {
+                mOperations.addFirst(op);
+            }
+        }
+        executeNextGattOperation();
+    }
+
+    private void executeNextGattOperation() {
+        synchronized (mOperations) {
+            if (mCurrentOperation != null)
+                return;
+
+            if (mOperations.isEmpty())
+                return;
+
+            mCurrentOperation = mOperations.removeFirst();
+        }
+
+        // Run in main thread
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (mOperations) {
+                    if (mCurrentOperation == null) {
+                        Log.e(TAG, "Current operation null in executor?");
+                        return;
+                    }
+
+                    mCurrentOperation.run();
+                    // now wait for the GATT callback and when it comes, finish this operation
+                }
+            }
+        });
+    }
+
+    private void queueGattOperation(GattOperation op) {
+        synchronized (mOperations) {
+            mOperations.add(op);
+        }
+        executeNextGattOperation();
+    }
+
+    private void enableNotification(UUID chrUuid) {
+        GattOperation op = GattOperation.enableNotification(mGatt, chrUuid);
+        queueGattOperation(op);
+    }
+
+    void writeCharacteristic(UUID uuid, byte[] value) {
+        GattOperation op = GattOperation.writeCharacteristic(mGatt, uuid, value);
+        queueGattOperation(op);
+    }
+
+    void readCharacteristic(UUID uuid) {
+        GattOperation op = GattOperation.readCharacteristic(mGatt, uuid);
+        queueGattOperation(op);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////  BluetoothGattCallback overridden methods
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void onConnectionStateChange(BluetoothGatt g, int status, int newState) {
+        //Log.v(TAG, "onConnectionStateChange status=" + status + " newState=" + newState);
+        mIsReconnecting = false;
+        if (newState == 2) {
+            mIsConnected = true;
+            // Run directly, without GattOperation
+            if (!isRegistered()) {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mGatt.discoverServices();
+                    }
+                });
+            }
+        }
+        else if (newState == 0) {
+            mIsConnected = false;
+        }
+
+        // Disconnection is handled in SteamLink using the ACTION_ACL_DISCONNECTED Intent.
+    }
+
+    @Override
+    public void onServicesDiscovered(BluetoothGatt gatt, int status) {
+        //Log.v(TAG, "onServicesDiscovered status=" + status);
+        if (status == 0) {
+            if (gatt.getServices().size() == 0) {
+                Log.v(TAG, "onServicesDiscovered returned zero services; something has gone horribly wrong down in Android's Bluetooth stack.");
+                mIsReconnecting = true;
+                mIsConnected = false;
+                gatt.disconnect();
+                mGatt = connectGatt(false);
+            } else {
+                if (getProductId() == TRITON_BLE_PID) {
+                    // Android will not properly play well with Data Length Extensions without manually requesting a large MTU,
+                    // and Triton controllers require DLE support.
+                    //
+                    // 517 is basically a "magic number" as far as Android's bluetooth code is concerned, so do not change
+                    // this value. It is functionally "please enable data length extensions" on some Android builds.
+                    mGatt.requestMtu(517);
+                }
+
+                probeService(this);
+            }
+        }
+    }
+
+    @Override
+    public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        //Log.v(TAG, "onCharacteristicRead status=" + status + " uuid=" + characteristic.getUuid());
+
+        if (characteristic.getUuid().equals(reportCharacteristic) && !mFrozen) {
+            mManager.HIDDeviceReportResponse(getId(), characteristic.getValue());
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    @Override
+    public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        //Log.v(TAG, "onCharacteristicWrite status=" + status + " uuid=" + characteristic.getUuid());
+
+        if (characteristic.getUuid().equals(reportCharacteristic)) {
+            // Only register controller with the native side once it has been fully configured
+            if (!isRegistered()) {
+                Log.v(TAG, "Registering Steam Controller with ID: " + getId());
+                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true);
+                setRegistered();
+            }
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    @Override
+    public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+    // Enable this for verbose logging of controller input reports
+        //Log.v(TAG, "onCharacteristicChanged uuid=" + characteristic.getUuid() + " data=" + HexDump.dumpHexString(characteristic.getValue()));
+
+        if (characteristic.getUuid().equals(getInputCharacteristic()) && !mFrozen) {
+            mManager.HIDDeviceInputReport(getId(), characteristic.getValue());
+        }
+    }
+
+    @Override
+    public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        //Log.v(TAG, "onDescriptorRead status=" + status);
+    }
+
+    @Override
+    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        BluetoothGattCharacteristic chr = descriptor.getCharacteristic();
+        //Log.v(TAG, "onDescriptorWrite status=" + status + " uuid=" + chr.getUuid() + " descriptor=" + descriptor.getUuid());
+
+        if (chr.getUuid().equals(getInputCharacteristic())) {
+            boolean hasWrittenInputDescriptor = true;
+            BluetoothGattCharacteristic reportChr = chr.getService().getCharacteristic(reportCharacteristic);
+            if (reportChr != null) {
+                if (getProductId() == TRITON_BLE_PID) {
+                    // For Triton we just mark things registered.
+                    Log.v(TAG, "Registering Triton Steam Controller with ID: " + getId());
+                    mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true);
+                    setRegistered();
+                } else {
+                    // For the original controller, we need to manually enter Valve mode.
+                    Log.v(TAG, "Writing report characteristic to enter valve mode");
+                    reportChr.setValue(enterValveMode);
+                    gatt.writeCharacteristic(reportChr);
+                }
+            }
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    @Override
+    public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
+        //Log.v(TAG, "onReliableWriteCompleted status=" + status);
+    }
+
+    @Override
+    public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
+        //Log.v(TAG, "onReadRemoteRssi status=" + status);
+    }
+
+    @Override
+    public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+        //Log.v(TAG, "onMtuChanged status=" + status);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////// Public API
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public int getId() {
+        return mDeviceId;
+    }
+
+    @Override
+    public int getVendorId() {
+        // Valve Corporation
+        final int VALVE_USB_VID = 0x28DE;
+        return VALVE_USB_VID;
+    }
+
+    @Override
+    public int getProductId() {
+        if (mProductId > 0) {
+            // We've already set a product ID.
+            return mProductId;
+        }
+
+        if (mDevice.getName().startsWith("Steam Ctrl")) {
+            // We're a newer Triton device
+            mProductId = TRITON_BLE_PID;
+        } else {
+            // We're an OG Steam Controller
+            mProductId = D0G_BLE2_PID;
+        }
+
+        return mProductId;
+    }
+
+    private UUID getInputCharacteristic() {
+        if (getProductId() == TRITON_BLE_PID) {
+            return inputCharacteristicTriton;
+        } else {
+            return inputCharacteristicD0G;
+        }
+    }
+
+    @Override
+    public String getSerialNumber() {
+        // This will be read later via feature report by Steam
+        return "12345";
+    }
+
+    @Override
+    public int getVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getManufacturerName() {
+        return "Valve Corporation";
+    }
+
+    @Override
+    public String getProductName() {
+        return "Steam Controller";
+    }
+
+    @Override
+    public UsbDevice getDevice() {
+        return null;
+    }
+
+    @Override
+    public boolean open() {
+        return true;
+    }
+
+    @Override
+    public int writeReport(byte[] report, boolean feature) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted writeReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return -1;
+        }
+
+        if (feature) {
+            // We need to skip the first byte, as that doesn't go over the air
+            byte[] actual_report = Arrays.copyOfRange(report, 1, report.length - 1);
+            //Log.v(TAG, "writeFeatureReport " + HexDump.dumpHexString(actual_report));
+            writeCharacteristic(reportCharacteristic, actual_report);
+            return report.length;
+        } else {
+            // If we're an original-recipe Steam Controller we just write to the characteristic directly.
+            if (getProductId() == D0G_BLE2_PID) {
+                //Log.v(TAG, "writeOutputReport " + HexDump.dumpHexString(report));
+                writeCharacteristic(reportCharacteristic, report);
+                return report.length;
+            }
+
+            // If we're a Triton, we need to find the correct report characteristic.
+            if (report.length > 0) {
+                int reportId = report[0];
+                BluetoothGattCharacteristic targetedReportCharacteristic = mOutputReportChars.get(reportId);
+                if (targetedReportCharacteristic != null) {
+                    byte[] actual_report = Arrays.copyOfRange(report, 1, report.length - 1);
+                    //Log.v(TAG, "writeOutputReport 0x" + Integer.toString(reportId, 16) + " " + HexDump.dumpHexString(report));
+                    writeCharacteristic(targetedReportCharacteristic.getUuid(), actual_report);
+                    return report.length;
+                } else {
+                    Log.w(TAG, "Got report write request for unknown report type 0x" + Integer.toString(reportId, 16));
+                }
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public boolean readReport(byte[] report, boolean feature) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted readReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return false;
+        }
+
+        if (feature) {
+            readCharacteristic(reportCharacteristic);
+            return true;
+        } else {
+            // Not implemented
+            return false;
+        }
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public void setFrozen(boolean frozen) {
+        mFrozen = frozen;
+    }
+
+    @Override
+    public void shutdown() {
+        close();
+
+        BluetoothGatt g = mGatt;
+        if (g != null) {
+            g.disconnect();
+            g.close();
+            mGatt = null;
+        }
+        mManager = null;
+        mIsRegistered = false;
+        mIsConnected = false;
+        mOperations.clear();
+    }
+
+}
+
diff --git a/armsx2/src/main/java/org/libsdl/app/HIDDeviceManager.java b/armsx2/src/main/java/org/libsdl/app/HIDDeviceManager.java
new file mode 100644
index 000000000..446636278
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -0,0 +1,697 @@
+package org.libsdl.app;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.os.Build;
+import android.util.Log;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.hardware.usb.*;
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class HIDDeviceManager {
+    private static final String TAG = "hidapi";
+    private static final String ACTION_USB_PERMISSION = "org.libsdl.app.USB_PERMISSION";
+
+    private static HIDDeviceManager sManager;
+    private static int sManagerRefCount = 0;
+
+    static public HIDDeviceManager acquire(Context context) {
+        if (sManagerRefCount == 0) {
+            sManager = new HIDDeviceManager(context);
+        }
+        ++sManagerRefCount;
+        return sManager;
+    }
+
+    static public void release(HIDDeviceManager manager) {
+        if (manager == sManager) {
+            --sManagerRefCount;
+            if (sManagerRefCount == 0) {
+                sManager.close();
+                sManager = null;
+            }
+        }
+    }
+
+    private Context mContext;
+    private HashMap<Integer, HIDDevice> mDevicesById = new HashMap<Integer, HIDDevice>();
+    private HashMap<BluetoothDevice, HIDDeviceBLESteamController> mBluetoothDevices = new HashMap<BluetoothDevice, HIDDeviceBLESteamController>();
+    private int mNextDeviceId = 0;
+    private SharedPreferences mSharedPreferences = null;
+    private boolean mIsChromebook = false;
+    private UsbManager mUsbManager;
+    private Handler mHandler;
+    private BluetoothManager mBluetoothManager;
+    private List<BluetoothDevice> mLastBluetoothDevices;
+
+    private final BroadcastReceiver mUsbBroadcast = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDeviceAttached(usbDevice);
+            } else if (action.equals(UsbManager.ACTION_USB_DEVICE_DETACHED)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDeviceDetached(usbDevice);
+            } else if (action.equals(HIDDeviceManager.ACTION_USB_PERMISSION)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDevicePermission(usbDevice, intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false));
+            }
+        }
+    };
+
+    private final BroadcastReceiver mBluetoothBroadcast = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            // Bluetooth device was connected. If it was a Steam Controller, handle it
+            if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                Log.d(TAG, "Bluetooth device connected: " + device);
+
+                if (isSteamController(device)) {
+                    connectBluetoothDevice(device);
+                }
+            }
+
+            // Bluetooth device was disconnected, remove from controller manager (if any)
+            if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                Log.d(TAG, "Bluetooth device disconnected: " + device);
+
+                disconnectBluetoothDevice(device);
+            }
+        }
+    };
+
+    public HIDDeviceManager(final Context context) {
+        mContext = context;
+
+        HIDDeviceRegisterCallback();
+
+        mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
+        mIsChromebook = SDLActivity.isChromebook();
+
+//        if (shouldClear) {
+//            SharedPreferences.Editor spedit = mSharedPreferences.edit();
+//            spedit.clear();
+//            spedit.apply();
+//        }
+//        else
+        {
+            mNextDeviceId = mSharedPreferences.getInt("next_device_id", 0);
+        }
+    }
+
+    Context getContext() {
+        return mContext;
+    }
+
+    int getDeviceIDForIdentifier(String identifier) {
+        SharedPreferences.Editor spedit = mSharedPreferences.edit();
+
+        int result = mSharedPreferences.getInt(identifier, 0);
+        if (result == 0) {
+            result = mNextDeviceId++;
+            spedit.putInt("next_device_id", mNextDeviceId);
+        }
+
+        spedit.putInt(identifier, result);
+        spedit.apply();
+        return result;
+    }
+
+    private void initializeUSB() {
+        mUsbManager = (UsbManager)mContext.getSystemService(Context.USB_SERVICE);
+        if (mUsbManager == null) {
+            return;
+        }
+
+        /*
+        // Logging
+        for (UsbDevice device : mUsbManager.getDeviceList().values()) {
+            Log.i(TAG,"Path: " + device.getDeviceName());
+            Log.i(TAG,"Manufacturer: " + device.getManufacturerName());
+            Log.i(TAG,"Product: " + device.getProductName());
+            Log.i(TAG,"ID: " + device.getDeviceId());
+            Log.i(TAG,"Class: " + device.getDeviceClass());
+            Log.i(TAG,"Protocol: " + device.getDeviceProtocol());
+            Log.i(TAG,"Vendor ID " + device.getVendorId());
+            Log.i(TAG,"Product ID: " + device.getProductId());
+            Log.i(TAG,"Interface count: " + device.getInterfaceCount());
+            Log.i(TAG,"---------------------------------------");
+
+            // Get interface details
+            for (int index = 0; index < device.getInterfaceCount(); index++) {
+                UsbInterface mUsbInterface = device.getInterface(index);
+                Log.i(TAG,"  *****     *****");
+                Log.i(TAG,"  Interface index: " + index);
+                Log.i(TAG,"  Interface ID: " + mUsbInterface.getId());
+                Log.i(TAG,"  Interface class: " + mUsbInterface.getInterfaceClass());
+                Log.i(TAG,"  Interface subclass: " + mUsbInterface.getInterfaceSubclass());
+                Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
+                Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
+
+                // Get endpoint details
+                for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
+                {
+                    UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
+                    Log.i(TAG,"    ++++   ++++   ++++");
+                    Log.i(TAG,"    Endpoint index: " + epi);
+                    Log.i(TAG,"    Attributes: " + mEndpoint.getAttributes());
+                    Log.i(TAG,"    Direction: " + mEndpoint.getDirection());
+                    Log.i(TAG,"    Number: " + mEndpoint.getEndpointNumber());
+                    Log.i(TAG,"    Interval: " + mEndpoint.getInterval());
+                    Log.i(TAG,"    Packet size: " + mEndpoint.getMaxPacketSize());
+                    Log.i(TAG,"    Type: " + mEndpoint.getType());
+                }
+            }
+        }
+        Log.i(TAG," No more devices connected.");
+        */
+
+        // Register for USB broadcasts and permission completions
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
+        filter.addAction(HIDDeviceManager.ACTION_USB_PERMISSION);
+        if (Build.VERSION.SDK_INT >= 33) { /* Android 13.0 (TIRAMISU) */
+            mContext.registerReceiver(mUsbBroadcast, filter, Context.RECEIVER_EXPORTED);
+        } else {
+            mContext.registerReceiver(mUsbBroadcast, filter);
+        }
+
+        for (UsbDevice usbDevice : mUsbManager.getDeviceList().values()) {
+            handleUsbDeviceAttached(usbDevice);
+        }
+    }
+
+    UsbManager getUSBManager() {
+        return mUsbManager;
+    }
+
+    private void shutdownUSB() {
+        try {
+            mContext.unregisterReceiver(mUsbBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
+    }
+
+    private boolean isHIDDeviceInterface(UsbDevice usbDevice, UsbInterface usbInterface) {
+        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_HID) {
+            return true;
+        }
+        if (isXbox360Controller(usbDevice, usbInterface) || isXboxOneController(usbDevice, usbInterface)) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isXbox360Controller(UsbDevice usbDevice, UsbInterface usbInterface) {
+        final int XB360_IFACE_SUBCLASS = 93;
+        final int XB360_IFACE_PROTOCOL = 1; // Wired
+        final int XB360W_IFACE_PROTOCOL = 129; // Wireless
+        final int[] SUPPORTED_VENDORS = {
+            0x0079, // GPD Win 2
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x046d, // Logitech
+            0x056e, // Elecom
+            0x06a3, // Saitek
+            0x0738, // Mad Catz
+            0x07ff, // Mad Catz
+            0x0e6f, // PDP
+            0x0f0d, // Hori
+            0x1038, // SteelSeries
+            0x11c9, // Nacon
+            0x12ab, // Unknown
+            0x1430, // RedOctane
+            0x146b, // BigBen
+            0x1532, // Razer Sabertooth
+            0x15e4, // Numark
+            0x162e, // Joytech
+            0x1689, // Razer Onza
+            0x1949, // Lab126, Inc.
+            0x1bad, // Harmonix
+            0x20d6, // PowerA
+            0x24c6, // PowerA
+            0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x37d7, // Flydigi
+            0x9886, // ASTRO Gaming
+        };
+
+        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+            usbInterface.getInterfaceSubclass() == XB360_IFACE_SUBCLASS &&
+            (usbInterface.getInterfaceProtocol() == XB360_IFACE_PROTOCOL ||
+             usbInterface.getInterfaceProtocol() == XB360W_IFACE_PROTOCOL)) {
+            int vendor_id = usbDevice.getVendorId();
+            for (int supportedVid : SUPPORTED_VENDORS) {
+                if (vendor_id == supportedVid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterface) {
+        final int XB1_IFACE_SUBCLASS = 71;
+        final int XB1_IFACE_PROTOCOL = 208;
+        final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x0738, // Mad Catz
+            0x0b05, // ASUS
+            0x0e6f, // PDP
+            0x0f0d, // Hori
+            0x10f5, // Turtle Beach
+            0x1532, // Razer Wildcat
+            0x20d6, // PowerA
+            0x24c6, // PowerA
+            0x294b, // Snakebyte
+            0x2dc8, // 8BitDo
+            0x2e24, // Hyperkin
+            0x2e95, // SCUF
+            0x3285, // Nacon
+            0x3537, // GameSir
+            0x366c, // ByoWave
+        };
+
+        if (usbInterface.getId() == 0 &&
+            usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+            usbInterface.getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
+            usbInterface.getInterfaceProtocol() == XB1_IFACE_PROTOCOL) {
+            int vendor_id = usbDevice.getVendorId();
+            for (int supportedVid : SUPPORTED_VENDORS) {
+                if (vendor_id == supportedVid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private void handleUsbDeviceAttached(UsbDevice usbDevice) {
+        connectHIDDeviceUSB(usbDevice);
+    }
+
+    private void handleUsbDeviceDetached(UsbDevice usbDevice) {
+        List<Integer> devices = new ArrayList<Integer>();
+        for (HIDDevice device : mDevicesById.values()) {
+            if (usbDevice.equals(device.getDevice())) {
+                devices.add(device.getId());
+            }
+        }
+        for (int id : devices) {
+            HIDDevice device = mDevicesById.get(id);
+            mDevicesById.remove(id);
+            device.shutdown();
+            HIDDeviceDisconnected(id);
+        }
+    }
+
+    private void handleUsbDevicePermission(UsbDevice usbDevice, boolean permission_granted) {
+        for (HIDDevice device : mDevicesById.values()) {
+            if (usbDevice.equals(device.getDevice())) {
+                boolean opened = false;
+                if (permission_granted) {
+                    opened = device.open();
+                }
+                HIDDeviceOpenResult(device.getId(), opened);
+            }
+        }
+    }
+
+    private void connectHIDDeviceUSB(UsbDevice usbDevice) {
+        synchronized (this) {
+            int interface_mask = 0;
+            for (int interface_index = 0; interface_index < usbDevice.getInterfaceCount(); interface_index++) {
+                UsbInterface usbInterface = usbDevice.getInterface(interface_index);
+                if (isHIDDeviceInterface(usbDevice, usbInterface)) {
+                    // Check to see if we've already added this interface
+                    // This happens with the Xbox Series X controller which has a duplicate interface 0, which is inactive
+                    int interface_id = usbInterface.getId();
+                    if ((interface_mask & (1 << interface_id)) != 0) {
+                        continue;
+                    }
+                    interface_mask |= (1 << interface_id);
+
+                    HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index);
+                    int id = device.getId();
+                    mDevicesById.put(id, device);
+                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol(), false);
+                }
+            }
+        }
+    }
+
+    private void initializeBluetooth() {
+        Log.d(TAG, "Initializing Bluetooth");
+
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
+            return;
+        }
+
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
+            return;
+        }
+
+        // Find bonded bluetooth controllers and create SteamControllers for them
+        mBluetoothManager = (BluetoothManager)mContext.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (mBluetoothManager == null) {
+            // This device doesn't support Bluetooth.
+            return;
+        }
+
+        BluetoothAdapter btAdapter = mBluetoothManager.getAdapter();
+        if (btAdapter == null) {
+            // This device has Bluetooth support in the codebase, but has no available adapters.
+            return;
+        }
+
+        // Get our bonded devices.
+        for (BluetoothDevice device : btAdapter.getBondedDevices()) {
+
+            Log.d(TAG, "Bluetooth device available: " + device);
+            if (isSteamController(device)) {
+                connectBluetoothDevice(device);
+            }
+
+        }
+
+        // NOTE: These don't work on Chromebooks, to my undying dismay.
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+        if (Build.VERSION.SDK_INT >= 33) { /* Android 13.0 (TIRAMISU) */
+            mContext.registerReceiver(mBluetoothBroadcast, filter, Context.RECEIVER_EXPORTED);
+        } else {
+            mContext.registerReceiver(mBluetoothBroadcast, filter);
+        }
+
+        if (mIsChromebook) {
+            mHandler = new Handler(Looper.getMainLooper());
+            mLastBluetoothDevices = new ArrayList<BluetoothDevice>();
+
+            // final HIDDeviceManager finalThis = this;
+            // mHandler.postDelayed(new Runnable() {
+            //     @Override
+            //     public void run() {
+            //         finalThis.chromebookConnectionHandler();
+            //     }
+            // }, 5000);
+        }
+    }
+
+    private void shutdownBluetooth() {
+        try {
+            mContext.unregisterReceiver(mBluetoothBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
+    }
+
+    // Chromebooks do not pass along ACTION_ACL_CONNECTED / ACTION_ACL_DISCONNECTED properly.
+    // This function provides a sort of dummy version of that, watching for changes in the
+    // connected devices and attempting to add controllers as things change.
+    void chromebookConnectionHandler() {
+        if (!mIsChromebook) {
+            return;
+        }
+
+        ArrayList<BluetoothDevice> disconnected = new ArrayList<BluetoothDevice>();
+        ArrayList<BluetoothDevice> connected = new ArrayList<BluetoothDevice>();
+
+        List<BluetoothDevice> currentConnected = mBluetoothManager.getConnectedDevices(BluetoothProfile.GATT);
+
+        for (BluetoothDevice bluetoothDevice : currentConnected) {
+            if (!mLastBluetoothDevices.contains(bluetoothDevice)) {
+                connected.add(bluetoothDevice);
+            }
+        }
+        for (BluetoothDevice bluetoothDevice : mLastBluetoothDevices) {
+            if (!currentConnected.contains(bluetoothDevice)) {
+                disconnected.add(bluetoothDevice);
+            }
+        }
+
+        mLastBluetoothDevices = currentConnected;
+
+        for (BluetoothDevice bluetoothDevice : disconnected) {
+            disconnectBluetoothDevice(bluetoothDevice);
+        }
+        for (BluetoothDevice bluetoothDevice : connected) {
+            connectBluetoothDevice(bluetoothDevice);
+        }
+
+        final HIDDeviceManager finalThis = this;
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finalThis.chromebookConnectionHandler();
+            }
+        }, 10000);
+    }
+
+    boolean connectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+        Log.v(TAG, "connectBluetoothDevice device=" + bluetoothDevice);
+        synchronized (this) {
+            if (mBluetoothDevices.containsKey(bluetoothDevice)) {
+                Log.v(TAG, "Steam controller with address " + bluetoothDevice + " already exists, attempting reconnect");
+
+                HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
+                device.reconnect();
+
+                return false;
+            }
+            HIDDeviceBLESteamController device = new HIDDeviceBLESteamController(this, bluetoothDevice);
+            int id = device.getId();
+            mBluetoothDevices.put(bluetoothDevice, device);
+            mDevicesById.put(id, device);
+
+            // The Steam Controller will mark itself connected once initialization is complete
+        }
+        return true;
+    }
+
+    void disconnectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+        synchronized (this) {
+            HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
+            if (device == null)
+                return;
+
+            int id = device.getId();
+            mBluetoothDevices.remove(bluetoothDevice);
+            mDevicesById.remove(id);
+            device.shutdown();
+            HIDDeviceDisconnected(id);
+        }
+    }
+
+    boolean isSteamController(BluetoothDevice bluetoothDevice) {
+        // Sanity check.  If you pass in a null device, by definition it is never a Steam Controller.
+        if (bluetoothDevice == null) {
+            return false;
+        }
+
+        // If the device has no local name, we really don't want to try an equality check against it.
+        if (bluetoothDevice.getName() == null) {
+            return false;
+        }
+
+        // Steam Controllers will always support Bluetooth Low Energy
+        if ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) == 0) {
+            return false;
+        }
+
+        // Match on the name either the original Steam Controller or the new second-generation one advertise with.
+        return bluetoothDevice.getName().equals("SteamController") || bluetoothDevice.getName().startsWith("Steam Ctrl");
+    }
+
+    private void close() {
+        shutdownUSB();
+        shutdownBluetooth();
+        synchronized (this) {
+            for (HIDDevice device : mDevicesById.values()) {
+                device.shutdown();
+            }
+            mDevicesById.clear();
+            mBluetoothDevices.clear();
+            HIDDeviceReleaseCallback();
+        }
+    }
+
+    public void setFrozen(boolean frozen) {
+        synchronized (this) {
+            for (HIDDevice device : mDevicesById.values()) {
+                device.setFrozen(frozen);
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private HIDDevice getDevice(int id) {
+        synchronized (this) {
+            HIDDevice result = mDevicesById.get(id);
+            if (result == null) {
+                Log.v(TAG, "No device for id: " + id);
+                Log.v(TAG, "Available devices: " + mDevicesById.keySet());
+            }
+            return result;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////// JNI interface functions
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    boolean initialize(boolean usb, boolean bluetooth) {
+        Log.v(TAG, "initialize(" + usb + ", " + bluetooth + ")");
+
+        if (usb) {
+            initializeUSB();
+        }
+        if (bluetooth) {
+            initializeBluetooth();
+        }
+        return true;
+    }
+
+    boolean openDevice(int deviceID) {
+        Log.v(TAG, "openDevice deviceID=" + deviceID);
+        HIDDevice device = getDevice(deviceID);
+        if (device == null) {
+            HIDDeviceDisconnected(deviceID);
+            return false;
+        }
+
+        // Look to see if this is a USB device and we have permission to access it
+        UsbDevice usbDevice = device.getDevice();
+        if (usbDevice != null && !mUsbManager.hasPermission(usbDevice)) {
+            HIDDeviceOpenPending(deviceID);
+            try {
+                final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
+                int flags;
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                    flags = FLAG_MUTABLE;
+                } else {
+                    flags = 0;
+                }
+
+                Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                intent.setPackage(mContext.getPackageName());
+                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+            } catch (Exception e) {
+                Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
+                HIDDeviceOpenResult(deviceID, false);
+            }
+            return false;
+        }
+
+        try {
+            return device.open();
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return false;
+    }
+
+    int writeReport(int deviceID, byte[] report, boolean feature) {
+        try {
+            //Log.v(TAG, "writeReport deviceID=" + deviceID + " length=" + report.length);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return -1;
+            }
+
+            return device.writeReport(report, feature);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return -1;
+    }
+
+    boolean readReport(int deviceID, byte[] report, boolean feature) {
+        try {
+            //Log.v(TAG, "readReport deviceID=" + deviceID);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return false;
+            }
+
+            return device.readReport(report, feature);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return false;
+    }
+
+    void closeDevice(int deviceID) {
+        try {
+            Log.v(TAG, "closeDevice deviceID=" + deviceID);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return;
+            }
+
+            device.close();
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////// Native methods
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private native void HIDDeviceRegisterCallback();
+    private native void HIDDeviceReleaseCallback();
+
+    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol, boolean bBluetooth);
+    native void HIDDeviceOpenPending(int deviceID);
+    native void HIDDeviceOpenResult(int deviceID, boolean opened);
+    native void HIDDeviceDisconnected(int deviceID);
+
+    native void HIDDeviceInputReport(int deviceID, byte[] report);
+    native void HIDDeviceReportResponse(int deviceID, byte[] report);
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/HIDDeviceUSB.java b/armsx2/src/main/java/org/libsdl/app/HIDDeviceUSB.java
new file mode 100644
index 000000000..f9e938980
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/HIDDeviceUSB.java
@@ -0,0 +1,313 @@
+package org.libsdl.app;
+
+import android.hardware.usb.*;
+import android.os.Build;
+import android.util.Log;
+import java.util.Arrays;
+import java.util.Locale;
+
+class HIDDeviceUSB implements HIDDevice {
+
+    private static final String TAG = "hidapi";
+
+    protected HIDDeviceManager mManager;
+    protected UsbDevice mDevice;
+    protected int mInterfaceIndex;
+    protected int mInterface;
+    protected int mDeviceId;
+    protected UsbDeviceConnection mConnection;
+    protected UsbEndpoint mInputEndpoint;
+    protected UsbEndpoint mOutputEndpoint;
+    protected InputThread mInputThread;
+    protected boolean mRunning;
+    protected boolean mFrozen;
+
+    public HIDDeviceUSB(HIDDeviceManager manager, UsbDevice usbDevice, int interface_index) {
+        mManager = manager;
+        mDevice = usbDevice;
+        mInterfaceIndex = interface_index;
+        mInterface = mDevice.getInterface(mInterfaceIndex).getId();
+        mDeviceId = manager.getDeviceIDForIdentifier(getIdentifier());
+        mRunning = false;
+    }
+
+    String getIdentifier() {
+        return String.format(Locale.ENGLISH, "%s/%x/%x/%d", mDevice.getDeviceName(), mDevice.getVendorId(), mDevice.getProductId(), mInterfaceIndex);
+    }
+
+    @Override
+    public int getId() {
+        return mDeviceId;
+    }
+
+    @Override
+    public int getVendorId() {
+        return mDevice.getVendorId();
+    }
+
+    @Override
+    public int getProductId() {
+        return mDevice.getProductId();
+    }
+
+    @Override
+    public String getSerialNumber() {
+        String result = null;
+        try {
+            result = mDevice.getSerialNumber();
+        }
+        catch (SecurityException exception) {
+            //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
+        }
+        if (result == null) {
+            result = "";
+        }
+        return result;
+    }
+
+    @Override
+    public int getVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getManufacturerName() {
+        String result;
+        result = mDevice.getManufacturerName();
+        if (result == null) {
+            result = String.format("%x", getVendorId());
+        }
+        return result;
+    }
+
+    @Override
+    public String getProductName() {
+        String result;
+        result = mDevice.getProductName();
+        if (result == null) {
+            result = String.format("%x", getProductId());
+        }
+        return result;
+    }
+
+    @Override
+    public UsbDevice getDevice() {
+        return mDevice;
+    }
+
+    String getDeviceName() {
+        return getManufacturerName() + " " + getProductName() + "(0x" + String.format("%x", getVendorId()) + "/0x" + String.format("%x", getProductId()) + ")";
+    }
+
+    @Override
+    public boolean open() {
+        mConnection = mManager.getUSBManager().openDevice(mDevice);
+        if (mConnection == null) {
+            Log.w(TAG, "Unable to open USB device " + getDeviceName());
+            return false;
+        }
+
+        // Force claim our interface
+        UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+        if (!mConnection.claimInterface(iface, true)) {
+            Log.w(TAG, "Failed to claim interfaces on USB device " + getDeviceName());
+            close();
+            return false;
+        }
+
+        // Find the endpoints
+        for (int j = 0; j < iface.getEndpointCount(); j++) {
+            UsbEndpoint endpt = iface.getEndpoint(j);
+            switch (endpt.getDirection()) {
+            case UsbConstants.USB_DIR_IN:
+                if (mInputEndpoint == null) {
+                    mInputEndpoint = endpt;
+                }
+                break;
+            case UsbConstants.USB_DIR_OUT:
+                if (mOutputEndpoint == null) {
+                    mOutputEndpoint = endpt;
+                }
+                break;
+            }
+        }
+
+        // Make sure the required endpoints were present
+        if (mInputEndpoint == null || mOutputEndpoint == null) {
+            Log.w(TAG, "Missing required endpoint on USB device " + getDeviceName());
+            close();
+            return false;
+        }
+
+        // Start listening for input
+        mRunning = true;
+        mInputThread = new InputThread();
+        mInputThread.start();
+
+        return true;
+    }
+
+    @Override
+    public int writeReport(byte[] report, boolean feature) {
+        if (mConnection == null) {
+            Log.w(TAG, "writeReport() called with no device connection");
+            return -1;
+        }
+
+        if (feature) {
+            int res = -1;
+            int offset = 0;
+            int length = report.length;
+            boolean skipped_report_id = false;
+            byte report_number = report[0];
+
+            if (report_number == 0x0) {
+                ++offset;
+                --length;
+                skipped_report_id = true;
+            }
+
+            res = mConnection.controlTransfer(
+                UsbConstants.USB_TYPE_CLASS | 0x01 /*RECIPIENT_INTERFACE*/ | UsbConstants.USB_DIR_OUT,
+                0x09/*HID set_report*/,
+                (3/*HID feature*/ << 8) | report_number,
+                mInterface,
+                report, offset, length,
+                1000/*timeout millis*/);
+
+            if (res < 0) {
+                Log.w(TAG, "writeFeatureReport() returned " + res + " on device " + getDeviceName());
+                return -1;
+            }
+
+            if (skipped_report_id) {
+                ++length;
+            }
+            return length;
+        } else {
+            int res = mConnection.bulkTransfer(mOutputEndpoint, report, report.length, 1000);
+            if (res != report.length) {
+                Log.w(TAG, "writeOutputReport() returned " + res + " on device " + getDeviceName());
+            }
+            return res;
+        }
+    }
+
+    @Override
+    public boolean readReport(byte[] report, boolean feature) {
+        int res = -1;
+        int offset = 0;
+        int length = report.length;
+        boolean skipped_report_id = false;
+        byte report_number = report[0];
+
+        if (mConnection == null) {
+            Log.w(TAG, "readReport() called with no device connection");
+            return false;
+        }
+
+        if (report_number == 0x0) {
+            /* Offset the return buffer by 1, so that the report ID
+               will remain in byte 0. */
+            ++offset;
+            --length;
+            skipped_report_id = true;
+        }
+
+        res = mConnection.controlTransfer(
+            UsbConstants.USB_TYPE_CLASS | 0x01 /*RECIPIENT_INTERFACE*/ | UsbConstants.USB_DIR_IN,
+            0x01/*HID get_report*/,
+            ((feature ? 3/*HID feature*/ : 1/*HID Input*/) << 8) | report_number,
+            mInterface,
+            report, offset, length,
+            1000/*timeout millis*/);
+
+        if (res < 0) {
+            Log.w(TAG, "getFeatureReport() returned " + res + " on device " + getDeviceName());
+            return false;
+        }
+
+        if (skipped_report_id) {
+            ++res;
+            ++length;
+        }
+
+        byte[] data;
+        if (res == length) {
+            data = report;
+        } else {
+            data = Arrays.copyOfRange(report, 0, res);
+        }
+        mManager.HIDDeviceReportResponse(mDeviceId, data);
+
+        return true;
+    }
+
+    @Override
+    public void close() {
+        mRunning = false;
+        if (mInputThread != null) {
+            while (mInputThread.isAlive()) {
+                mInputThread.interrupt();
+                try {
+                    mInputThread.join();
+                } catch (InterruptedException e) {
+                    // Keep trying until we're done
+                }
+            }
+            mInputThread = null;
+        }
+        if (mConnection != null) {
+            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+            mConnection.releaseInterface(iface);
+            mConnection.close();
+            mConnection = null;
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        close();
+        mManager = null;
+    }
+
+    @Override
+    public void setFrozen(boolean frozen) {
+        mFrozen = frozen;
+    }
+
+    protected class InputThread extends Thread {
+        @Override
+        public void run() {
+            int packetSize = mInputEndpoint.getMaxPacketSize();
+            byte[] packet = new byte[packetSize];
+            while (mRunning) {
+                int r;
+                try
+                {
+                    r = mConnection.bulkTransfer(mInputEndpoint, packet, packetSize, 1000);
+                }
+                catch (Exception e)
+                {
+                    Log.v(TAG, "Exception in UsbDeviceConnection bulktransfer: " + e);
+                    break;
+                }
+                if (r < 0) {
+                    // Could be a timeout or an I/O error
+                }
+                if (r > 0) {
+                    byte[] data;
+                    if (r == packetSize) {
+                        data = packet;
+                    } else {
+                        data = Arrays.copyOfRange(packet, 0, r);
+                    }
+
+                    if (!mFrozen) {
+                        mManager.HIDDeviceInputReport(mDeviceId, data);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/SDL.java b/armsx2/src/main/java/org/libsdl/app/SDL.java
new file mode 100644
index 000000000..d9650a72e
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDL.java
@@ -0,0 +1,90 @@
+package org.libsdl.app;
+
+import android.app.Activity;
+import android.content.Context;
+
+import java.lang.reflect.Method;
+
+/**
+    SDL library initialization
+*/
+public class SDL {
+
+    // This function should be called first and sets up the native code
+    // so it can call into the Java classes
+    static public void setupJNI() {
+        SDLActivity.nativeSetupJNI();
+        SDLAudioManager.nativeSetupJNI();
+        SDLControllerManager.nativeSetupJNI();
+    }
+
+    // This function should be called each time the activity is started
+    static public void initialize() {
+        setContext(null);
+
+        SDLActivity.initialize();
+        SDLAudioManager.initialize();
+        SDLControllerManager.initialize();
+    }
+
+    // This function stores the current activity (SDL or not)
+    static public void setContext(Activity context) {
+        SDLAudioManager.setContext(context);
+        mContext = context;
+    }
+
+    static public Activity getContext() {
+        return mContext;
+    }
+
+    static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+
+        if (libraryName == null) {
+            throw new NullPointerException("No library name provided.");
+        }
+
+        try {
+            // Let's see if we have ReLinker available in the project.  This is necessary for
+            // some projects that have huge numbers of local libraries bundled, and thus may
+            // trip a bug in Android's native library loader which ReLinker works around.  (If
+            // loadLibrary works properly, ReLinker will simply use the normal Android method
+            // internally.)
+            //
+            // To use ReLinker, just add it as a dependency.  For more information, see
+            // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
+            //
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
+
+            // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if
+            // they've changed during updates.
+            Method forceMethod = relinkClass.getDeclaredMethod("force");
+            Object relinkInstance = forceMethod.invoke(null);
+            Class<?> relinkInstanceClass = relinkInstance.getClass();
+
+            // Actually load the library!
+            Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
+        }
+        catch (final Throwable e) {
+            // Fall back
+            try {
+                System.loadLibrary(libraryName);
+            }
+            catch (final UnsatisfiedLinkError ule) {
+                throw ule;
+            }
+            catch (final SecurityException se) {
+                throw se;
+            }
+        }
+    }
+
+    protected static Activity mContext;
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/SDLActivity.java b/armsx2/src/main/java/org/libsdl/app/SDLActivity.java
new file mode 100644
index 000000000..9eb003da2
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDLActivity.java
@@ -0,0 +1,2230 @@
+package org.libsdl.app;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.UiModeManager;
+import android.content.ActivityNotFoundException;
+import android.content.ClipboardManager;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.LocaleList;
+import android.os.Message;
+import android.os.ParcelFileDescriptor;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.PointerIcon;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.MimeTypeMap;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Locale;
+
+
+/**
+    SDL Activity
+*/
+public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
+    private static final String TAG = "SDL";
+    private static final int SDL_MAJOR_VERSION = 3;
+    private static final int SDL_MINOR_VERSION = 5;
+    private static final int SDL_MICRO_VERSION = 0;
+/*
+    // Display InputType.SOURCE/CLASS of events and devices
+    //
+    // SDLActivity.debugSource(device.getSources(), "device[" + device.getName() + "]");
+    // SDLActivity.debugSource(event.getSource(), "event");
+    public static void debugSource(int sources, String prefix) {
+        int s = sources;
+        int s_copy = sources;
+        String cls = "";
+        String src = "";
+        int tst = 0;
+        int FLAG_TAINTED = 0x80000000;
+
+        if ((s & InputDevice.SOURCE_CLASS_BUTTON) != 0)     cls += " BUTTON";
+        if ((s & InputDevice.SOURCE_CLASS_JOYSTICK) != 0)   cls += " JOYSTICK";
+        if ((s & InputDevice.SOURCE_CLASS_POINTER) != 0)    cls += " POINTER";
+        if ((s & InputDevice.SOURCE_CLASS_POSITION) != 0)   cls += " POSITION";
+        if ((s & InputDevice.SOURCE_CLASS_TRACKBALL) != 0)  cls += " TRACKBALL";
+
+
+        int s2 = s_copy & ~InputDevice.SOURCE_ANY; // keep class bits
+        s2 &= ~(  InputDevice.SOURCE_CLASS_BUTTON
+                | InputDevice.SOURCE_CLASS_JOYSTICK
+                | InputDevice.SOURCE_CLASS_POINTER
+                | InputDevice.SOURCE_CLASS_POSITION
+                | InputDevice.SOURCE_CLASS_TRACKBALL);
+
+        if (s2 != 0) cls += "Some_Unknown";
+
+        s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
+
+        if (Build.VERSION.SDK_INT >= 23) {
+            tst = InputDevice.SOURCE_BLUETOOTH_STYLUS;
+            if ((s & tst) == tst) src += " BLUETOOTH_STYLUS";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_DPAD;
+        if ((s & tst) == tst) src += " DPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_GAMEPAD;
+        if ((s & tst) == tst) src += " GAMEPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_HDMI;
+        if ((s & tst) == tst) src += " HDMI";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_JOYSTICK;
+        if ((s & tst) == tst) src += " JOYSTICK";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_KEYBOARD;
+        if ((s & tst) == tst) src += " KEYBOARD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_MOUSE;
+        if ((s & tst) == tst) src += " MOUSE";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 26) {
+            tst = InputDevice.SOURCE_MOUSE_RELATIVE;
+            if ((s & tst) == tst) src += " MOUSE_RELATIVE";
+            s2 &= ~tst;
+
+            tst = InputDevice.SOURCE_ROTARY_ENCODER;
+            if ((s & tst) == tst) src += " ROTARY_ENCODER";
+            s2 &= ~tst;
+        }
+        tst = InputDevice.SOURCE_STYLUS;
+        if ((s & tst) == tst) src += " STYLUS";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCHPAD;
+        if ((s & tst) == tst) src += " TOUCHPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCHSCREEN;
+        if ((s & tst) == tst) src += " TOUCHSCREEN";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
+        if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TRACKBALL;
+        if ((s & tst) == tst) src += " TRACKBALL";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_ANY;
+        if ((s & tst) == tst) src += " ANY";
+        s2 &= ~tst;
+
+        if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
+        s2 &= ~FLAG_TAINTED;
+
+        if (s2 != 0) src += " Some_Unknown";
+
+        Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
+    }
+*/
+
+    public static boolean mIsResumedCalled, mHasFocus;
+    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24  /* Android 7.0 (N) */);
+
+    // Cursor types
+    // private static final int SDL_SYSTEM_CURSOR_NONE = -1;
+    private static final int SDL_SYSTEM_CURSOR_ARROW = 0;
+    private static final int SDL_SYSTEM_CURSOR_IBEAM = 1;
+    private static final int SDL_SYSTEM_CURSOR_WAIT = 2;
+    private static final int SDL_SYSTEM_CURSOR_CROSSHAIR = 3;
+    private static final int SDL_SYSTEM_CURSOR_WAITARROW = 4;
+    private static final int SDL_SYSTEM_CURSOR_SIZENWSE = 5;
+    private static final int SDL_SYSTEM_CURSOR_SIZENESW = 6;
+    private static final int SDL_SYSTEM_CURSOR_SIZEWE = 7;
+    private static final int SDL_SYSTEM_CURSOR_SIZENS = 8;
+    private static final int SDL_SYSTEM_CURSOR_SIZEALL = 9;
+    private static final int SDL_SYSTEM_CURSOR_NO = 10;
+    private static final int SDL_SYSTEM_CURSOR_HAND = 11;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_TOPLEFT = 12;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_TOP = 13;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_TOPRIGHT = 14;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_RIGHT = 15;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_BOTTOMRIGHT = 16;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_BOTTOM = 17;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_BOTTOMLEFT = 18;
+    private static final int SDL_SYSTEM_CURSOR_WINDOW_LEFT = 19;
+
+    protected static final int SDL_ORIENTATION_UNKNOWN = 0;
+    protected static final int SDL_ORIENTATION_LANDSCAPE = 1;
+    protected static final int SDL_ORIENTATION_LANDSCAPE_FLIPPED = 2;
+    protected static final int SDL_ORIENTATION_PORTRAIT = 3;
+    protected static final int SDL_ORIENTATION_PORTRAIT_FLIPPED = 4;
+
+    protected static int mCurrentRotation;
+    protected static Locale mCurrentLocale;
+
+    // Handle the state of the native layer
+    public enum NativeState {
+           INIT, RESUMED, PAUSED
+    }
+
+    public static NativeState mNextNativeState;
+    public static NativeState mCurrentNativeState;
+
+    /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
+    public static boolean mBrokenLibraries = true;
+
+    // Main components
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static SDLDummyEdit mTextEdit;
+    protected static ViewGroup mLayout;
+    protected static SDLClipboardHandler mClipboardHandler;
+    protected static Hashtable<Integer, PointerIcon> mCursors;
+    protected static int mLastCursorID;
+    protected static SDLGenericMotionListener_API14 mMotionListener;
+    protected static HIDDeviceManager mHIDDeviceManager;
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    protected static Thread mSDLThread;
+    protected static boolean mSDLMainFinished = false;
+    protected static boolean mActivityCreated = false;
+    private static SDLFileDialogState mFileDialogState = null;
+    protected static boolean mDispatchingKeyEvent = false;
+
+    public static SDLGenericMotionListener_API14 getMotionListener() {
+        if (mMotionListener == null) {
+            if (Build.VERSION.SDK_INT >= 29 /* Android 10 (Q) */) {
+                mMotionListener = new SDLGenericMotionListener_API29();
+            } else if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
+                mMotionListener = new SDLGenericMotionListener_API26();
+            } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                mMotionListener = new SDLGenericMotionListener_API24();
+            } else {
+                mMotionListener = new SDLGenericMotionListener_API14();
+            }
+        }
+
+        return mMotionListener;
+    }
+
+    /**
+     * The application entry point, called on a dedicated thread (SDLThread).
+     * The default implementation uses the getMainSharedObject() and getMainFunction() methods
+     * to invoke native code from the specified shared library.
+     * It can be overridden by derived classes.
+     */
+    protected void main() {
+        String library = SDLActivity.mSingleton.getMainSharedObject();
+        String function = SDLActivity.mSingleton.getMainFunction();
+        String[] arguments = SDLActivity.mSingleton.getArguments();
+
+        Log.v("SDL", "Running main function " + function + " from library " + library);
+        SDLActivity.nativeRunMain(library, function, arguments);
+        Log.v("SDL", "Finished main function");
+    }
+
+    /**
+     * This method returns the name of the shared object with the application entry point
+     * It can be overridden by derived classes.
+     */
+    protected String getMainSharedObject() {
+        String library;
+        String[] libraries = SDLActivity.mSingleton.getLibraries();
+        if (libraries.length > 0) {
+            library = "lib" + libraries[libraries.length - 1] + ".so";
+        } else {
+            library = "libmain.so";
+        }
+        return getContext().getApplicationInfo().nativeLibraryDir + "/" + library;
+    }
+
+    /**
+     * This method returns the name of the application entry point
+     * It can be overridden by derived classes.
+     */
+    protected String getMainFunction() {
+        return "SDL_main";
+    }
+
+    /**
+     * This method is called by SDL before loading the native shared libraries.
+     * It can be overridden to provide names of shared libraries to be loaded.
+     * The default implementation returns the defaults. It never returns null.
+     * An array returned by a new implementation must at least contain "SDL3".
+     * Also keep in mind that the order the libraries are loaded may matter.
+     * @return names of shared libraries to be loaded (e.g. "SDL3", "main").
+     */
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL3",
+            // "SDL3_image",
+            // "SDL3_mixer",
+            // "SDL3_net",
+            // "SDL3_ttf",
+            "main"
+        };
+    }
+
+    // Load the .so
+    public void loadLibraries() {
+       for (String lib : getLibraries()) {
+          SDL.loadLibrary(lib, this);
+       }
+    }
+
+    /**
+     * This method is called by SDL before starting the native application thread.
+     * It can be overridden to provide the arguments after the application name.
+     * The default implementation returns an empty array. It never returns null.
+     * @return arguments for the native application.
+     */
+    protected String[] getArguments() {
+        return new String[0];
+    }
+
+    public static void initialize() {
+        // The static nature of the singleton and Android quirkyness force us to initialize everything here
+        // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+        mSingleton = null;
+        mSurface = null;
+        mTextEdit = null;
+        mLayout = null;
+        mClipboardHandler = null;
+        mCursors = new Hashtable<Integer, PointerIcon>();
+        mLastCursorID = 0;
+        mSDLThread = null;
+        mIsResumedCalled = false;
+        mHasFocus = true;
+        mNextNativeState = NativeState.INIT;
+        mCurrentNativeState = NativeState.INIT;
+    }
+
+    protected SDLSurface createSDLSurface(Context context) {
+        return new SDLSurface(context);
+    }
+
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.v(TAG, "Manufacturer: " + Build.MANUFACTURER);
+        Log.v(TAG, "Device: " + Build.DEVICE);
+        Log.v(TAG, "Model: " + Build.MODEL);
+        Log.v(TAG, "onCreate()");
+        super.onCreate(savedInstanceState);
+
+
+        /* Control activity re-creation */
+        if (mSDLMainFinished || mActivityCreated) {
+              boolean allow_recreate = SDLActivity.nativeAllowRecreateActivity();
+              if (mSDLMainFinished) {
+                  Log.v(TAG, "SDL main() finished");
+              }
+              if (allow_recreate) {
+                  Log.v(TAG, "activity re-created");
+              } else {
+                  Log.v(TAG, "activity finished");
+                  System.exit(0);
+                  return;
+              }
+        }
+
+        mActivityCreated = true;
+
+        try {
+            Thread.currentThread().setName("SDLActivity");
+        } catch (Exception e) {
+            Log.v(TAG, "modify thread properties failed " + e.toString());
+        }
+
+        // Load shared libraries
+        String errorMsgBrokenLib = "";
+        try {
+            loadLibraries();
+            mBrokenLibraries = false; /* success */
+        } catch(UnsatisfiedLinkError e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        } catch(Exception e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        }
+
+        if (!mBrokenLibraries) {
+            String expected_version = String.valueOf(SDL_MAJOR_VERSION) + "." +
+                                      String.valueOf(SDL_MINOR_VERSION) + "." +
+                                      String.valueOf(SDL_MICRO_VERSION);
+            String version = nativeGetVersion();
+            if (!version.equals(expected_version)) {
+                mBrokenLibraries = true;
+                errorMsgBrokenLib = "SDL C/Java version mismatch (expected " + expected_version + ", got " + version + ")";
+            }
+        }
+
+        if (mBrokenLibraries) {
+            mSingleton = this;
+            AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
+            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+                  + System.getProperty("line.separator")
+                  + System.getProperty("line.separator")
+                  + "Error: " + errorMsgBrokenLib);
+            dlgAlert.setTitle("SDL Error");
+            dlgAlert.setPositiveButton("Exit",
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog,int id) {
+                        // if this button is clicked, close current activity
+                        SDLActivity.mSingleton.finish();
+                    }
+                });
+           dlgAlert.setCancelable(false);
+           dlgAlert.create().show();
+
+           return;
+        }
+
+
+        /* Control activity re-creation */
+        /* Robustness: check that the native code is run for the first time.
+         * (Maybe Activity was reset, but not the native code.) */
+        {
+            int run_count = SDLActivity.nativeCheckSDLThreadCounter(); /* get and increment a native counter */
+            if (run_count != 0) {
+                boolean allow_recreate = SDLActivity.nativeAllowRecreateActivity();
+                if (allow_recreate) {
+                    Log.v(TAG, "activity re-created // run_count: " + run_count);
+                } else {
+                    Log.v(TAG, "activity finished // run_count: " + run_count);
+                    System.exit(0);
+                    return;
+                }
+            }
+        }
+
+        // Set up JNI
+        SDL.setupJNI();
+
+        // Initialize state
+        SDL.initialize();
+
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+        SDL.setContext(this);
+
+        mClipboardHandler = new SDLClipboardHandler();
+
+        mHIDDeviceManager = HIDDeviceManager.acquire(this);
+
+        // Set up the surface
+        mSurface = createSDLSurface(this);
+
+        mLayout = new RelativeLayout(this);
+        mLayout.addView(mSurface);
+
+        // Get our current screen orientation and pass it down.
+        SDLActivity.nativeSetNaturalOrientation(SDLActivity.getNaturalOrientation());
+        mCurrentRotation = SDLActivity.getCurrentRotation();
+        SDLActivity.onNativeRotationChanged(mCurrentRotation);
+
+        try {
+            if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+                mCurrentLocale = getContext().getResources().getConfiguration().locale;
+            } else {
+                mCurrentLocale = getContext().getResources().getConfiguration().getLocales().get(0);
+            }
+        } catch(Exception ignored) {
+        }
+
+        switch (getContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
+        case Configuration.UI_MODE_NIGHT_NO:
+            SDLActivity.onNativeDarkModeChanged(false);
+            break;
+        case Configuration.UI_MODE_NIGHT_YES:
+            SDLActivity.onNativeDarkModeChanged(true);
+            break;
+        }
+
+        setContentView(mLayout);
+
+        setWindowStyle(false);
+
+        getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
+
+        // Get filename from "Open with" of another application
+        Intent intent = getIntent();
+        if (intent != null && intent.getData() != null) {
+            String filename = intent.getData().getPath();
+            if (filename != null) {
+                Log.v(TAG, "Got filename: " + filename);
+                SDLActivity.onNativeDropFile(filename);
+            }
+        }
+    }
+
+    protected void pauseNativeThread() {
+        mNextNativeState = NativeState.PAUSED;
+        mIsResumedCalled = false;
+
+        if (SDLActivity.mBrokenLibraries) {
+            return;
+        }
+
+        SDLActivity.handleNativeState();
+    }
+
+    protected void resumeNativeThread() {
+        mNextNativeState = NativeState.RESUMED;
+        mIsResumedCalled = true;
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handleNativeState();
+    }
+
+    // Events
+    @Override
+    protected void onPause() {
+        Log.v(TAG, "onPause()");
+        super.onPause();
+
+        if (mHIDDeviceManager != null) {
+            mHIDDeviceManager.setFrozen(true);
+        }
+        if (!mHasMultiWindow) {
+            pauseNativeThread();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        Log.v(TAG, "onResume()");
+        super.onResume();
+
+        if (mHIDDeviceManager != null) {
+            mHIDDeviceManager.setFrozen(false);
+        }
+        if (!mHasMultiWindow) {
+            resumeNativeThread();
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        Log.v(TAG, "onStop()");
+        super.onStop();
+        if (mHasMultiWindow) {
+            pauseNativeThread();
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        Log.v(TAG, "onStart()");
+        super.onStart();
+        if (mHasMultiWindow) {
+            resumeNativeThread();
+        }
+    }
+
+    public static int getNaturalOrientation() {
+        int result = SDL_ORIENTATION_UNKNOWN;
+
+        Activity activity = (Activity)getContext();
+        if (activity != null) {
+            Configuration config = activity.getResources().getConfiguration();
+            Display display = activity.getWindowManager().getDefaultDisplay();
+            int rotation = display.getRotation();
+            if (((rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) &&
+                    config.orientation == Configuration.ORIENTATION_LANDSCAPE) ||
+                ((rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) &&
+                    config.orientation == Configuration.ORIENTATION_PORTRAIT)) {
+                result = SDL_ORIENTATION_LANDSCAPE;
+            } else {
+                result = SDL_ORIENTATION_PORTRAIT;
+            }
+        }
+        return result;
+    }
+
+    public static int getCurrentRotation() {
+        int result = 0;
+
+        Activity activity = (Activity)getContext();
+        if (activity != null) {
+            Display display = activity.getWindowManager().getDefaultDisplay();
+            switch (display.getRotation()) {
+                case Surface.ROTATION_0:
+                    result = 0;
+                    break;
+                case Surface.ROTATION_90:
+                    result = 90;
+                    break;
+                case Surface.ROTATION_180:
+                    result = 180;
+                    break;
+                case Surface.ROTATION_270:
+                    result = 270;
+                    break;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        mHasFocus = hasFocus;
+        if (hasFocus) {
+           mNextNativeState = NativeState.RESUMED;
+           SDLActivity.getMotionListener().reclaimRelativeMouseModeIfNeeded();
+
+           SDLActivity.handleNativeState();
+           nativeFocusChanged(true);
+
+        } else {
+           nativeFocusChanged(false);
+           if (!mHasMultiWindow) {
+               mNextNativeState = NativeState.PAUSED;
+               SDLActivity.handleNativeState();
+           }
+        }
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+        Log.v(TAG, "onTrimMemory()");
+        super.onTrimMemory(level);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.nativeLowMemory();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        Log.v(TAG, "onConfigurationChanged()");
+        super.onConfigurationChanged(newConfig);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        if (mCurrentLocale == null || !mCurrentLocale.equals(newConfig.locale)) {
+            mCurrentLocale = newConfig.locale;
+            SDLActivity.onNativeLocaleChanged();
+        }
+
+        switch (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK) {
+        case Configuration.UI_MODE_NIGHT_NO:
+            SDLActivity.onNativeDarkModeChanged(false);
+            break;
+        case Configuration.UI_MODE_NIGHT_YES:
+            SDLActivity.onNativeDarkModeChanged(true);
+            break;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.v(TAG, "onDestroy()");
+
+        if (mHIDDeviceManager != null) {
+            HIDDeviceManager.release(mHIDDeviceManager);
+            mHIDDeviceManager = null;
+        }
+
+        SDLAudioManager.release(this);
+
+        if (SDLActivity.mBrokenLibraries) {
+           super.onDestroy();
+           return;
+        }
+
+        if (SDLActivity.mSDLThread != null) {
+
+            // Send Quit event to "SDLThread" thread
+            SDLActivity.nativeSendQuit();
+
+            // Wait for "SDLThread" thread to end
+            try {
+                // Use a timeout because:
+                // C SDLmain() thread might have started (mSDLThread.start() called)
+                // while the SDL_Init() might not have been called yet,
+                // and so the previous QUIT event will be discarded by SDL_Init() and app is running, not exiting.
+                SDLActivity.mSDLThread.join(1000);
+            } catch(Exception e) {
+                Log.v(TAG, "Problem stopping SDLThread: " + e);
+            }
+        }
+
+        SDLActivity.nativeQuit();
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Check if we want to block the back button in case of mouse right click.
+        //
+        // If we do, the normal hardware back button will no longer work and people have to use home,
+        // but the mouse right click will work.
+        //
+        boolean trapBack = SDLActivity.nativeGetHintBoolean("SDL_ANDROID_TRAP_BACK_BUTTON", false);
+        if (trapBack) {
+            // Exit and let the mouse handler handle this button (if appropriate)
+            return;
+        }
+
+        // Default system back button behavior.
+        if (!isFinishing()) {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (mFileDialogState != null && mFileDialogState.requestCode == requestCode) {
+            /* This is our file dialog */
+            String[] filelist = null;
+
+            if (data != null) {
+                Uri singleFileUri = data.getData();
+
+                if (singleFileUri == null) {
+                    /* Use Intent.getClipData to get multiple choices */
+                    ClipData clipData = data.getClipData();
+                    assert clipData != null;
+
+                    filelist = new String[clipData.getItemCount()];
+
+                    for (int i = 0; i < filelist.length; i++) {
+                        String uri = clipData.getItemAt(i).getUri().toString();
+                        filelist[i] = uri;
+                    }
+                } else {
+                    /* Only one file is selected. */
+                    filelist = new String[]{singleFileUri.toString()};
+                }
+            } else {
+                /* User cancelled the request. */
+                filelist = new String[0];
+            }
+
+            // TODO: Detect the file MIME type and pass the filter value accordingly.
+            SDLActivity.onNativeFileDialog(requestCode, filelist, -1);
+            mFileDialogState = null;
+        }
+    }
+
+    // Called by JNI from SDL.
+    public static void manualBackButton() {
+        mSingleton.pressBackButton();
+    }
+
+    // Used to get us onto the activity's main thread
+    public void pressBackButton() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (!SDLActivity.this.isFinishing()) {
+                    SDLActivity.this.superOnBackPressed();
+                }
+            }
+        });
+    }
+
+    // Used to access the system back behavior.
+    public void superOnBackPressed() {
+        super.onBackPressed();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+
+        if (SDLActivity.mBrokenLibraries) {
+           return false;
+        }
+
+        int keyCode = event.getKeyCode();
+        // Ignore certain special keys so they're handled by Android
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_CAMERA ||
+            keyCode == KeyEvent.KEYCODE_ZOOM_IN || /* API 11 */
+            keyCode == KeyEvent.KEYCODE_ZOOM_OUT /* API 11 */
+            ) {
+            return false;
+        }
+        mDispatchingKeyEvent = true;
+        boolean result = super.dispatchKeyEvent(event);
+        mDispatchingKeyEvent = false;
+        return result;
+    }
+
+    public static boolean dispatchingKeyEvent() {
+        return mDispatchingKeyEvent;
+    }
+
+    /* Transition to next state */
+    public static void handleNativeState() {
+
+        if (mNextNativeState == mCurrentNativeState) {
+            // Already in same state, discard.
+            return;
+        }
+
+        // Try a transition to init state
+        if (mNextNativeState == NativeState.INIT) {
+
+            mCurrentNativeState = mNextNativeState;
+            return;
+        }
+
+        // Try a transition to paused state
+        if (mNextNativeState == NativeState.PAUSED) {
+            if (mSDLThread != null) {
+                nativePause();
+            }
+            if (mSurface != null) {
+                mSurface.handlePause();
+            }
+            mCurrentNativeState = mNextNativeState;
+            return;
+        }
+
+        // Try a transition to resumed state
+        if (mNextNativeState == NativeState.RESUMED) {
+            if (mSurface.mIsSurfaceReady && (mHasFocus || mHasMultiWindow) && mIsResumedCalled) {
+                if (mSDLThread == null) {
+                    // This is the entry point to the C app.
+                    // Start up the C app thread and enable sensor input for the first time
+                    // FIXME: Why aren't we enabling sensor input at start?
+
+                    mSDLThread = new Thread(new SDLMain(), "SDLThread");
+                    mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+                    mSDLThread.start();
+
+                    // No nativeResume(), don't signal Android_ResumeSem
+                } else {
+                    nativeResume();
+                }
+                mSurface.handleResume();
+
+                mCurrentNativeState = mNextNativeState;
+            }
+        }
+    }
+
+    // Messages from the SDLMain thread
+    protected static final int COMMAND_CHANGE_TITLE = 1;
+    protected static final int COMMAND_CHANGE_WINDOW_STYLE = 2;
+    protected static final int COMMAND_TEXTEDIT_HIDE = 3;
+    protected static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
+    protected static final int COMMAND_USER = 0x8000;
+
+    protected static boolean mFullscreenModeActive;
+
+    /**
+     * This method is called by SDL if SDL did not handle a message itself.
+     * This happens if a received message contains an unsupported command.
+     * Method can be overwritten to handle Messages in a different class.
+     * @param command the command of the message.
+     * @param param the parameter of the message. May be null.
+     * @return if the message was handled in overridden method.
+     */
+    protected boolean onUnhandledMessage(int command, Object param) {
+        return false;
+    }
+
+    /**
+     * A Handler class for Messages from native SDL applications.
+     * It uses current Activities as target (e.g. for the title).
+     * static to prevent implicit references to enclosing object.
+     */
+    protected static class SDLCommandHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            Context context = getContext();
+            if (context == null) {
+                Log.e(TAG, "error handling message, getContext() returned null");
+                return;
+            }
+            switch (msg.arg1) {
+            case COMMAND_CHANGE_TITLE:
+                if (context instanceof Activity) {
+                    ((Activity) context).setTitle((String)msg.obj);
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_CHANGE_WINDOW_STYLE:
+                if (context instanceof Activity) {
+                    Window window = ((Activity) context).getWindow();
+                    if (window != null) {
+                        if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                            int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                                    View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+                            window.getDecorView().setSystemUiVisibility(flags);
+                            window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                            window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                            SDLActivity.mFullscreenModeActive = true;
+                        } else {
+                            int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
+                            window.getDecorView().setSystemUiVisibility(flags);
+                            window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                            SDLActivity.mFullscreenModeActive = false;
+                        }
+                        if (Build.VERSION.SDK_INT >= 30 /* Android 11 (R) */) {
+                            window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+                        }
+                        if (Build.VERSION.SDK_INT >= 30 /* Android 11 (R) */ &&
+                            Build.VERSION.SDK_INT < 35 /* Android 15 */) {
+                            SDLActivity.onNativeInsetsChanged(0, 0, 0, 0);
+                        }
+                    }
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_TEXTEDIT_HIDE:
+                if (mTextEdit != null) {
+                    // Note: On some devices setting view to GONE creates a flicker in landscape.
+                    // Setting the View's sizes to 0 is similar to GONE but without the flicker.
+                    // The sizes will be set to useful values when the keyboard is shown again.
+                    mTextEdit.setLayoutParams(new RelativeLayout.LayoutParams(0, 0));
+
+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+
+                    onNativeScreenKeyboardHidden();
+
+                    mSurface.requestFocus();
+                }
+                break;
+            case COMMAND_SET_KEEP_SCREEN_ON:
+            {
+                if (context instanceof Activity) {
+                    Window window = ((Activity) context).getWindow();
+                    if (window != null) {
+                        if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        } else {
+                            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        }
+                    }
+                }
+                break;
+            }
+            default:
+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
+                }
+            }
+        }
+    }
+
+    // Handler for the messages
+    Handler commandHandler = new SDLCommandHandler();
+
+    // Send a message from the SDLMain thread
+    protected boolean sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        boolean result = commandHandler.sendMessage(msg);
+
+        if (command == COMMAND_CHANGE_WINDOW_STYLE) {
+            // Ensure we don't return until the resize has actually happened,
+            // or 500ms have passed.
+
+            boolean bShouldWait = false;
+
+            if (data instanceof Integer) {
+                // Let's figure out if we're already laid out fullscreen or not.
+                Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+                DisplayMetrics realMetrics = new DisplayMetrics();
+                display.getRealMetrics(realMetrics);
+
+                boolean bFullscreenLayout = ((realMetrics.widthPixels == mSurface.getWidth()) &&
+                        (realMetrics.heightPixels == mSurface.getHeight()));
+
+                if ((Integer) data == 1) {
+                    // If we aren't laid out fullscreen or actively in fullscreen mode already, we're going
+                    // to change size and should wait for surfaceChanged() before we return, so the size
+                    // is right back in native code.  If we're already laid out fullscreen, though, we're
+                    // not going to change size even if we change decor modes, so we shouldn't wait for
+                    // surfaceChanged() -- which may not even happen -- and should return immediately.
+                    bShouldWait = !bFullscreenLayout;
+                } else {
+                    // If we're laid out fullscreen (even if the status bar and nav bar are present),
+                    // or are actively in fullscreen, we're going to change size and should wait for
+                    // surfaceChanged before we return, so the size is right back in native code.
+                    bShouldWait = bFullscreenLayout;
+                }
+            }
+
+            if (bShouldWait && (getContext() != null)) {
+                // We'll wait for the surfaceChanged() method, which will notify us
+                // when called.  That way, we know our current size is really the
+                // size we need, instead of grabbing a size that's still got
+                // the navigation and/or status bars before they're hidden.
+                //
+                // We'll wait for up to half a second, because some devices
+                // take a surprisingly long time for the surface resize, but
+                // then we'll just give up and return.
+                //
+                synchronized (getContext()) {
+                    try {
+                        getContext().wait(500);
+                    } catch (InterruptedException ie) {
+                        ie.printStackTrace();
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    // C functions we call
+    public static native String nativeGetVersion();
+    public static native void nativeSetupJNI();
+    public static native void nativeInitMainThread();
+    public static native void nativeCleanupMainThread();
+    public static native int nativeRunMain(String library, String function, Object arguments);
+    public static native void nativeLowMemory();
+    public static native void nativeSendQuit();
+    public static native void nativeQuit();
+    public static native void nativePause();
+    public static native void nativeResume();
+    public static native void nativeFocusChanged(boolean hasFocus);
+    public static native void onNativeDropFile(String filename);
+    public static native void nativeSetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, float density, float rate);
+    public static native void onNativeResize();
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native boolean onNativeSoftReturnKey();
+    public static native void onNativeKeyboardFocusLost();
+    public static native void onNativeMouse(int button, int action, float x, float y, boolean relative);
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x,
+                                            float y, float p);
+    public static native void onNativePen(int penId, int device_type, int button, int action, float x, float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void onNativeClipboardChanged();
+    public static native void onNativeSurfaceCreated();
+    public static native void onNativeSurfaceChanged();
+    public static native void onNativeSurfaceDestroyed();
+    public static native void onNativeScreenKeyboardShown();
+    public static native void onNativeScreenKeyboardHidden();
+    public static native String nativeGetHint(String name);
+    public static native boolean nativeGetHintBoolean(String name, boolean default_value);
+    public static native void nativeSetenv(String name, String value);
+    public static native void nativeSetNaturalOrientation(int orientation);
+    public static native void onNativeRotationChanged(int rotation);
+    public static native void onNativeInsetsChanged(int left, int right, int top, int bottom);
+    public static native void nativeAddTouch(int touchId, String name);
+    public static native void nativePermissionResult(int requestCode, boolean result);
+    public static native void onNativeLocaleChanged();
+    public static native void onNativeDarkModeChanged(boolean enabled);
+    public static native boolean nativeAllowRecreateActivity();
+    public static native int nativeCheckSDLThreadCounter();
+    public static native void onNativeFileDialog(int requestCode, String[] filelist, int filter);
+    public static native void onNativePinchStart();
+    public static native void onNativePinchUpdate(float scale);
+    public static native void onNativePinchEnd();
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void setWindowStyle(boolean fullscreen) {
+        // Called from SDLMain() thread and can't directly affect the view
+        mSingleton.sendCommand(COMMAND_CHANGE_WINDOW_STYLE, fullscreen ? 1 : 0);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     * This is a static method for JNI convenience, it calls a non-static method
+     * so that is can be overridden
+     */
+    public static void setOrientation(int w, int h, boolean resizable, String hint)
+    {
+        if (mSingleton != null) {
+            mSingleton.setOrientationBis(w, h, resizable, hint);
+        }
+    }
+
+    /**
+     * This can be overridden
+     */
+    public void setOrientationBis(int w, int h, boolean resizable, String hint)
+    {
+        int orientation_landscape = -1;
+        int orientation_portrait = -1;
+
+        if (w <= 1 || h <= 1) {
+            // Invalid width/height, ignore this request
+            return;
+        }
+
+        /* If set, hint "explicitly controls which UI orientations are allowed". */
+        if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE;
+        } else if (hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        } else if (hint.contains("LandscapeRight")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
+        }
+
+        /* exact match to 'Portrait' to distinguish with PortraitUpsideDown */
+        boolean contains_Portrait = hint.contains("Portrait ") || hint.endsWith("Portrait");
+
+        if (contains_Portrait && hint.contains("PortraitUpsideDown")) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT;
+        } else if (contains_Portrait) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+        } else if (hint.contains("PortraitUpsideDown")) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
+        }
+
+        boolean is_landscape_allowed = (orientation_landscape != -1);
+        boolean is_portrait_allowed = (orientation_portrait != -1);
+        int req; /* Requested orientation */
+
+        /* No valid hint, nothing is explicitly allowed */
+        if (!is_portrait_allowed && !is_landscape_allowed) {
+            if (resizable) {
+                /* All orientations are allowed, respecting user orientation lock setting */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
+            } else {
+                /* Fixed window and nothing specified. Get orientation from w/h of created window */
+                req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+            }
+        } else {
+            /* At least one orientation is allowed */
+            if (resizable) {
+                if (is_portrait_allowed && is_landscape_allowed) {
+                    /* hint allows both landscape and portrait, promote to full user */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
+                } else {
+                    /* Use the only one allowed "orientation" */
+                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
+                }
+            } else {
+                /* Fixed window and both orientations are allowed. Choose one. */
+                if (is_portrait_allowed && is_landscape_allowed) {
+                    req = (w > h ? orientation_landscape : orientation_portrait);
+                } else {
+                    /* Use the only one allowed "orientation" */
+                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
+                }
+            }
+        }
+
+        Log.v(TAG, "setOrientation() requestedOrientation=" + req + " width=" + w +" height="+ h +" resizable=" + resizable + " hint=" + hint);
+        mSingleton.setRequestedOrientation(req);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void minimizeWindow() {
+
+        if (mSingleton == null) {
+            return;
+        }
+
+        Intent startMain = new Intent(Intent.ACTION_MAIN);
+        startMain.addCategory(Intent.CATEGORY_HOME);
+        startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mSingleton.startActivity(startMain);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean shouldMinimizeOnFocusLoss() {
+        return false;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean supportsRelativeMouse()
+    {
+        // DeX mode in Samsung Experience 9.0 and earlier doesn't support relative mice properly under
+        // Android 7 APIs, and simply returns no data under Android 8 APIs.
+        //
+        // This is fixed in Samsung Experience 9.5, which corresponds to Android 8.1.0, and
+        // thus SDK version 27.  If we are in DeX mode and not API 27 or higher, as a result,
+        // we should stick to relative mode.
+        //
+        if (Build.VERSION.SDK_INT < 27 /* Android 8.1 (O_MR1) */ && isDeXMode()) {
+            return false;
+        }
+
+        return SDLActivity.getMotionListener().supportsRelativeMouse();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setRelativeMouseEnabled(boolean enabled)
+    {
+        if (enabled && !supportsRelativeMouse()) {
+            return false;
+        }
+
+        return SDLActivity.getMotionListener().setRelativeMouseEnabled(enabled);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean sendMessage(int command, int param) {
+        if (mSingleton == null) {
+            return false;
+        }
+        return mSingleton.sendCommand(command, param);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Activity getContext() {
+        return SDL.getContext();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isAndroidTV() {
+        UiModeManager uiModeManager = (UiModeManager) getContext().getSystemService(UI_MODE_SERVICE);
+        if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("MINIX") && Build.MODEL.equals("NEO-U1")) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("Amlogic") &&
+            (Build.MODEL.startsWith("TV") ||
+             Build.MODEL.equals("X96-W") ||
+             Build.MODEL.equals("A95X-R1"))) {
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isVRHeadset() {
+        if (Build.MANUFACTURER.equals("Oculus") && Build.MODEL.startsWith("Quest")) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("Pico")) {
+            return true;
+        }
+        return false;
+    }
+
+    public static double getDiagonal()
+    {
+        DisplayMetrics metrics = new DisplayMetrics();
+        Activity activity = (Activity)getContext();
+        if (activity == null) {
+            return 0.0;
+        }
+        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        double dWidthInches = metrics.widthPixels / (double)metrics.xdpi;
+        double dHeightInches = metrics.heightPixels / (double)metrics.ydpi;
+
+        return Math.sqrt((dWidthInches * dWidthInches) + (dHeightInches * dHeightInches));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isTablet() {
+        // If our diagonal size is seven inches or greater, we consider ourselves a tablet.
+        return (getDiagonal() >= 7.0);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isChromebook() {
+        // https://stackoverflow.com/questions/39784415/how-to-detect-programmatically-if-android-app-is-running-in-chrome-book-or-in
+        if (getContext() != null) {
+            if (getContext().getPackageManager().hasSystemFeature("org.chromium.arc")
+                || getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management")) {
+                return true;
+            }
+        }
+
+        // Running on AVD emulator
+        boolean isChromebookEmulator = (Build.MODEL != null && Build.MODEL.startsWith("sdk_gpc_"));
+        return isChromebookEmulator;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isDeXMode() {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+            return false;
+        }
+        try {
+            final Configuration config = getContext().getResources().getConfiguration();
+            final Class<?> configClass = config.getClass();
+            return configClass.getField("SEM_DESKTOP_MODE_ENABLED").getInt(configClass)
+                    == configClass.getField("semDesktopModeEnabled").getInt(config);
+        } catch(Exception ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean getManifestEnvironmentVariables() {
+        try {
+            if (getContext() == null) {
+                return false;
+            }
+
+            ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(getContext().getPackageName(), PackageManager.GET_META_DATA);
+            Bundle bundle = applicationInfo.metaData;
+            if (bundle == null) {
+                return false;
+            }
+            String prefix = "SDL_ENV.";
+            final int trimLength = prefix.length();
+            for (String key : bundle.keySet()) {
+                if (key.startsWith(prefix)) {
+                    String name = key.substring(trimLength);
+                    String value = bundle.get(key).toString();
+                    nativeSetenv(name, value);
+                }
+            }
+            /* environment variables set! */
+            return true;
+        } catch (Exception e) {
+           Log.v(TAG, "exception " + e.toString());
+        }
+        return false;
+    }
+
+    // This method is called by SDLControllerManager's API 26 Generic Motion Handler.
+    public static View getContentView() {
+        return mLayout;
+    }
+
+    static class ShowTextInputTask implements Runnable {
+        /*
+         * This is used to regulate the pan&scan method to have some offset from
+         * the bottom edge of the input region and the top edge of an input
+         * method (soft keyboard)
+         */
+        static final int HEIGHT_PADDING = 15;
+
+        public int input_type;
+        public int x, y, w, h;
+
+        public ShowTextInputTask(int input_type, int x, int y, int w, int h) {
+            this.input_type = input_type;
+            this.x = x;
+            this.y = y;
+            this.w = w;
+            this.h = h;
+
+            /* Minimum size of 1 pixel, so it takes focus. */
+            if (this.w <= 0) {
+                this.w = 1;
+            }
+            if (this.h + HEIGHT_PADDING <= 0) {
+                this.h = 1 - HEIGHT_PADDING;
+            }
+        }
+
+        @Override
+        public void run() {
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(w, h + HEIGHT_PADDING);
+            params.leftMargin = x;
+            params.topMargin = y;
+
+            if (mTextEdit == null) {
+                mTextEdit = new SDLDummyEdit(getContext());
+
+                mLayout.addView(mTextEdit, params);
+            } else {
+                mTextEdit.setLayoutParams(params);
+            }
+            mTextEdit.setInputType(input_type);
+
+            mTextEdit.setVisibility(View.VISIBLE);
+            mTextEdit.requestFocus();
+
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mTextEdit, 0);
+
+            if (imm.isAcceptingText()) {
+                onNativeScreenKeyboardShown();
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showTextInput(int input_type, int x, int y, int w, int h) {
+        // Transfer the task to the main thread as a Runnable
+        return mSingleton.commandHandler.post(new ShowTextInputTask(input_type, x, y, w, h));
+    }
+
+    public static boolean isTextInputEvent(KeyEvent event) {
+
+        // Key pressed with Ctrl should be sent as SDL_KEYDOWN/SDL_KEYUP and not SDL_TEXTINPUT
+        if (event.isCtrlPressed()) {
+            return false;
+        }
+
+        return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
+    }
+
+    public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputConnection ic) {
+        int deviceId = event.getDeviceId();
+        int source = event.getSource();
+
+        if (source == InputDevice.SOURCE_UNKNOWN) {
+            InputDevice device = InputDevice.getDevice(deviceId);
+            if (device != null) {
+                source = device.getSources();
+            }
+        }
+
+//        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+//            Log.v("SDL", "key down: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+//            Log.v("SDL", "key up: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        }
+
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD
+        //
+        // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and
+        // SOURCE_JOYSTICK, while its key events arrive from the keyboard source
+        // So, retrieve the device itself and check all of its sources
+        if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
+            // Note that we process events with specific key codes here
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLControllerManager.onNativePadDown(deviceId, keyCode)) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLControllerManager.onNativePadUp(deviceId, keyCode)) {
+                    return true;
+                }
+            }
+        }
+
+        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
+            if (SDLActivity.isVRHeadset()) {
+                // The Oculus Quest controller back button comes in as source mouse, so accept that
+            } else {
+                // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
+                // they are ignored here because sending them as mouse input to SDL is messy
+                if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
+                    switch (event.getAction()) {
+                    case KeyEvent.ACTION_DOWN:
+                    case KeyEvent.ACTION_UP:
+                        // mark the event as handled or it will be handled by system
+                        // handling KEYCODE_BACK by system will call onBackPressed()
+                        return true;
+                    }
+                }
+            }
+        }
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            onNativeKeyDown(keyCode);
+
+            if (isTextInputEvent(event)) {
+                if (ic != null) {
+                    ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                } else {
+                    SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                }
+            }
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            onNativeKeyUp(keyCode);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Surface getNativeSurface() {
+        if (SDLActivity.mSurface == null) {
+            return null;
+        }
+        return SDLActivity.mSurface.getNativeSurface();
+    }
+
+    // Input
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void initTouch() {
+        int[] ids = InputDevice.getDeviceIds();
+
+        for (int id : ids) {
+            InputDevice device = InputDevice.getDevice(id);
+            /* Allow SOURCE_TOUCHSCREEN and also Virtual InputDevices because they can send TOUCHSCREEN events */
+            if (device != null && ((device.getSources() & InputDevice.SOURCE_TOUCHSCREEN) == InputDevice.SOURCE_TOUCHSCREEN
+                    || device.isVirtual())) {
+
+                nativeAddTouch(device.getId(), device.getName());
+            }
+        }
+    }
+
+    // Messagebox
+
+    /** Result of current messagebox. Also used for blocking the calling thread. */
+    protected final int[] messageboxSelection = new int[1];
+
+    /**
+     * This method is called by SDL using JNI.
+     * Shows the messagebox from UI thread and block calling thread.
+     * buttonFlags, buttonIds and buttonTexts must have same length.
+     * @param buttonFlags array containing flags for every button.
+     * @param buttonIds array containing id for every button.
+     * @param buttonTexts array containing text for every button.
+     * @param colors null for default or array of length 5 containing colors.
+     * @return button id or -1.
+     */
+    public int messageboxShowMessageBox(
+            final int flags,
+            final String title,
+            final String message,
+            final int[] buttonFlags,
+            final int[] buttonIds,
+            final String[] buttonTexts,
+            final int[] colors) {
+
+        messageboxSelection[0] = -1;
+
+        // sanity checks
+
+        if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
+            return -1; // implementation broken
+        }
+
+        // collect arguments for Dialog
+
+        final Bundle args = new Bundle();
+        args.putInt("flags", flags);
+        args.putString("title", title);
+        args.putString("message", message);
+        args.putIntArray("buttonFlags", buttonFlags);
+        args.putIntArray("buttonIds", buttonIds);
+        args.putStringArray("buttonTexts", buttonTexts);
+        args.putIntArray("colors", colors);
+
+        // trigger Dialog creation on UI thread
+
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                messageboxCreateAndShow(args);
+            }
+        });
+
+        // block the calling thread
+
+        synchronized (messageboxSelection) {
+            try {
+                messageboxSelection.wait();
+            } catch (InterruptedException ex) {
+                ex.printStackTrace();
+                return -1;
+            }
+        }
+
+        // return selected value
+
+        return messageboxSelection[0];
+    }
+
+    protected void messageboxCreateAndShow(Bundle args) {
+
+        // TODO set values from "flags" to messagebox dialog
+
+        // get colors
+
+        int[] colors = args.getIntArray("colors");
+        int backgroundColor;
+        int textColor;
+        int buttonBorderColor;
+        int buttonBackgroundColor;
+        int buttonSelectedColor;
+        if (colors != null) {
+            int i = -1;
+            backgroundColor = colors[++i];
+            textColor = colors[++i];
+            buttonBorderColor = colors[++i];
+            buttonBackgroundColor = colors[++i];
+            buttonSelectedColor = colors[++i];
+        } else {
+            backgroundColor = Color.TRANSPARENT;
+            textColor = Color.TRANSPARENT;
+            buttonBorderColor = Color.TRANSPARENT;
+            buttonBackgroundColor = Color.TRANSPARENT;
+            buttonSelectedColor = Color.TRANSPARENT;
+        }
+
+        // create dialog with title and a listener to wake up calling thread
+
+        final AlertDialog dialog = new AlertDialog.Builder(this).create();
+        dialog.setTitle(args.getString("title"));
+        dialog.setCancelable(false);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface unused) {
+                synchronized (messageboxSelection) {
+                    messageboxSelection.notify();
+                }
+            }
+        });
+
+        // create text
+
+        TextView message = new TextView(this);
+        message.setGravity(Gravity.CENTER);
+        message.setText(args.getString("message"));
+        if (textColor != Color.TRANSPARENT) {
+            message.setTextColor(textColor);
+        }
+
+        // create buttons
+
+        int[] buttonFlags = args.getIntArray("buttonFlags");
+        int[] buttonIds = args.getIntArray("buttonIds");
+        String[] buttonTexts = args.getStringArray("buttonTexts");
+
+        final SparseArray<Button> mapping = new SparseArray<Button>();
+
+        LinearLayout buttons = new LinearLayout(this);
+        buttons.setOrientation(LinearLayout.HORIZONTAL);
+        buttons.setGravity(Gravity.CENTER);
+        for (int i = 0; i < buttonTexts.length; ++i) {
+            Button button = new Button(this);
+            final int id = buttonIds[i];
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    messageboxSelection[0] = id;
+                    dialog.dismiss();
+                }
+            });
+            if (buttonFlags[i] != 0) {
+                // see SDL_messagebox.h
+                if ((buttonFlags[i] & 0x00000001) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ENTER, button);
+                }
+                if ((buttonFlags[i] & 0x00000002) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ESCAPE, button); /* API 11 */
+                }
+            }
+            button.setText(buttonTexts[i]);
+            if (textColor != Color.TRANSPARENT) {
+                button.setTextColor(textColor);
+            }
+            if (buttonBorderColor != Color.TRANSPARENT) {
+                // TODO set color for border of messagebox button
+            }
+            if (buttonBackgroundColor != Color.TRANSPARENT) {
+                Drawable drawable = button.getBackground();
+                if (drawable == null) {
+                    // setting the color this way removes the style
+                    button.setBackgroundColor(buttonBackgroundColor);
+                } else {
+                    // setting the color this way keeps the style (gradient, padding, etc.)
+                    drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
+                }
+            }
+            if (buttonSelectedColor != Color.TRANSPARENT) {
+                // TODO set color for selected messagebox button
+            }
+            buttons.addView(button);
+        }
+
+        // create content
+
+        LinearLayout content = new LinearLayout(this);
+        content.setOrientation(LinearLayout.VERTICAL);
+        content.addView(message);
+        content.addView(buttons);
+        if (backgroundColor != Color.TRANSPARENT) {
+            content.setBackgroundColor(backgroundColor);
+        }
+
+        // add content to dialog and return
+
+        dialog.setView(content);
+        dialog.setOnKeyListener(new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
+                Button button = mapping.get(keyCode);
+                if (button != null) {
+                    if (event.getAction() == KeyEvent.ACTION_UP) {
+                        button.performClick();
+                    }
+                    return true; // also for ignored actions
+                }
+                return false;
+            }
+        });
+
+        dialog.show();
+    }
+
+    private final Runnable rehideSystemUi = new Runnable() {
+        @Override
+        public void run() {
+            int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                    View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+
+            SDLActivity.this.getWindow().getDecorView().setSystemUiVisibility(flags);
+        }
+    };
+
+    public void onSystemUiVisibilityChange(int visibility) {
+        if (SDLActivity.mFullscreenModeActive && ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0 || (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0)) {
+
+            Handler handler = getWindow().getDecorView().getHandler();
+            if (handler != null) {
+                handler.removeCallbacks(rehideSystemUi); // Prevent a hide loop.
+                handler.postDelayed(rehideSystemUi, 2000);
+            }
+
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean clipboardHasText() {
+        return mClipboardHandler.clipboardHasText();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static String clipboardGetText() {
+        return mClipboardHandler.clipboardGetText();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void clipboardSetText(String string) {
+        mClipboardHandler.clipboardSetText(string);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int createCustomCursor(int[] colors, int width, int height, int hotSpotX, int hotSpotY) {
+        Bitmap bitmap = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888);
+        ++mLastCursorID;
+
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mCursors.put(mLastCursorID, PointerIcon.create(bitmap, hotSpotX, hotSpotY));
+            } catch (Exception e) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+        return mLastCursorID;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void destroyCustomCursor(int cursorID) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mCursors.remove(cursorID);
+            } catch (Exception e) {
+            }
+        }
+        return;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setCustomCursor(int cursorID) {
+
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mSurface.setPointerIcon(mCursors.get(cursorID));
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setSystemCursor(int cursorID) {
+        int cursor_type = 0; //PointerIcon.TYPE_NULL;
+        switch (cursorID) {
+        case SDL_SYSTEM_CURSOR_ARROW:
+            cursor_type = 1000; //PointerIcon.TYPE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_IBEAM:
+            cursor_type = 1008; //PointerIcon.TYPE_TEXT;
+            break;
+        case SDL_SYSTEM_CURSOR_WAIT:
+            cursor_type = 1004; //PointerIcon.TYPE_WAIT;
+            break;
+        case SDL_SYSTEM_CURSOR_CROSSHAIR:
+            cursor_type = 1007; //PointerIcon.TYPE_CROSSHAIR;
+            break;
+        case SDL_SYSTEM_CURSOR_WAITARROW:
+            cursor_type = 1004; //PointerIcon.TYPE_WAIT;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENWSE:
+            cursor_type = 1017; //PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENESW:
+            cursor_type = 1016; //PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEWE:
+            cursor_type = 1014; //PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENS:
+            cursor_type = 1015; //PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEALL:
+            cursor_type = 1020; //PointerIcon.TYPE_GRAB;
+            break;
+        case SDL_SYSTEM_CURSOR_NO:
+            cursor_type = 1012; //PointerIcon.TYPE_NO_DROP;
+            break;
+        case SDL_SYSTEM_CURSOR_HAND:
+            cursor_type = 1002; //PointerIcon.TYPE_HAND;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_TOPLEFT:
+            cursor_type = 1017; //PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_TOP:
+            cursor_type = 1015; //PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_TOPRIGHT:
+            cursor_type = 1016; //PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_RIGHT:
+            cursor_type = 1014; //PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_BOTTOMRIGHT:
+            cursor_type = 1017; //PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_BOTTOM:
+            cursor_type = 1015; //PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_BOTTOMLEFT:
+            cursor_type = 1016; //PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_WINDOW_LEFT:
+            cursor_type = 1014; //PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+            break;
+        }
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mSurface.setPointerIcon(PointerIcon.getSystemIcon(getContext(), cursor_type));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void requestPermission(String permission, int requestCode) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            nativePermissionResult(requestCode, true);
+            return;
+        }
+
+        Activity activity = (Activity)getContext();
+        if (activity.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+            activity.requestPermissions(new String[]{permission}, requestCode);
+        } else {
+            nativePermissionResult(requestCode, true);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        boolean result = (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
+        nativePermissionResult(requestCode, result);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean openURL(String url)
+    {
+        try {
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(url));
+
+            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY
+                      | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
+                      | Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
+            i.addFlags(flags);
+
+            mSingleton.startActivity(i);
+        } catch (Exception ex) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showToast(String message, int duration, int gravity, int xOffset, int yOffset)
+    {
+        if(null == mSingleton) {
+            return false;
+        }
+
+        try
+        {
+            class OneShotTask implements Runnable {
+                private final String mMessage;
+                private final int mDuration;
+                private final int mGravity;
+                private final int mXOffset;
+                private final int mYOffset;
+
+                OneShotTask(String message, int duration, int gravity, int xOffset, int yOffset) {
+                    mMessage  = message;
+                    mDuration = duration;
+                    mGravity  = gravity;
+                    mXOffset  = xOffset;
+                    mYOffset  = yOffset;
+                }
+
+                public void run() {
+                    try
+                    {
+                        Toast toast = Toast.makeText(mSingleton, mMessage, mDuration);
+                        if (mGravity >= 0) {
+                            toast.setGravity(mGravity, mXOffset, mYOffset);
+                        }
+                        toast.show();
+                    } catch(Exception ex) {
+                        Log.e(TAG, ex.getMessage());
+                    }
+                }
+            }
+            mSingleton.runOnUiThread(new OneShotTask(message, duration, gravity, xOffset, yOffset));
+        } catch(Exception ex) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int openFileDescriptor(String uri, String mode) throws Exception {
+        if (mSingleton == null) {
+            return -1;
+        }
+
+        try {
+            ParcelFileDescriptor pfd = mSingleton.getContentResolver().openFileDescriptor(Uri.parse(uri), mode);
+            return pfd != null ? pfd.detachFd() : -1;
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            return -1;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showFileDialog(String[] filters, boolean allowMultiple, boolean forWrite, int requestCode) {
+        if (mSingleton == null) {
+            return false;
+        }
+
+        if (forWrite) {
+            allowMultiple = false;
+        }
+
+        /* Convert string list of extensions to their respective MIME types */
+        ArrayList<String> mimes = new ArrayList<>();
+        MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
+        if (filters != null) {
+            for (String pattern : filters) {
+                String[] extensions = pattern.split(";");
+
+                if (extensions.length == 1 && extensions[0].equals("*")) {
+                    /* Handle "*" special case */
+                    mimes.add("*/*");
+                } else {
+                    for (String ext : extensions) {
+                        String mime = mimeTypeMap.getMimeTypeFromExtension(ext);
+                        if (mime != null) {
+                            mimes.add(mime);
+                        }
+                    }
+                }
+            }
+        }
+
+        /* Display the file dialog */
+        Intent intent = new Intent(forWrite ? Intent.ACTION_CREATE_DOCUMENT : Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, allowMultiple);
+        switch (mimes.size()) {
+            case 0:
+                intent.setType("*/*");
+                break;
+            case 1:
+                intent.setType(mimes.get(0));
+                break;
+            default:
+                intent.setType("*/*");
+                intent.putExtra(Intent.EXTRA_MIME_TYPES, mimes.toArray(new String[]{}));
+        }
+
+        try {
+            mSingleton.startActivityForResult(intent, requestCode);
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "Unable to open file dialog.", e);
+            return false;
+        }
+
+        /* Save current dialog state */
+        mFileDialogState = new SDLFileDialogState();
+        mFileDialogState.requestCode = requestCode;
+        mFileDialogState.multipleChoice = allowMultiple;
+        return true;
+    }
+
+    /* Internal class used to track active open file dialog */
+    static class SDLFileDialogState {
+        int requestCode;
+        boolean multipleChoice;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static String getPreferredLocales() {
+        String result = "";
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7 (N) */) {
+            LocaleList locales = LocaleList.getAdjustedDefault();
+            for (int i = 0; i < locales.size(); i++) {
+                if (i != 0) result += ",";
+                result += formatLocale(locales.get(i));
+            }
+        } else if (mCurrentLocale != null) {
+            result = formatLocale(mCurrentLocale);
+        }
+        return result;
+    }
+
+    public static String formatLocale(Locale locale) {
+        String result = "";
+        String lang = "";
+        if (locale.getLanguage() == "in") {
+            // Indonesian is "id" according to ISO 639.2, but on Android is "in" because of Java backwards compatibility
+            lang = "id";
+        } else if (locale.getLanguage() == "") {
+            // Make sure language is never empty
+            lang = "und";
+        } else {
+            lang = locale.getLanguage();
+        }
+
+        if (locale.getCountry() == "") {
+            result = lang;
+        } else {
+            result = lang + "_" + locale.getCountry();
+        }
+        return result;
+    }
+}
+
+/**
+    Simple runnable to start the SDL application
+*/
+class SDLMain implements Runnable {
+    @Override
+    public void run() {
+        // Runs SDLActivity.main()
+
+        try {
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_DISPLAY);
+        } catch (Exception e) {
+            Log.v("SDL", "modify thread properties failed " + e.toString());
+        }
+
+        SDLActivity.nativeInitMainThread();
+        SDLActivity.mSingleton.main();
+        SDLActivity.nativeCleanupMainThread();
+
+        if (SDLActivity.mSingleton != null && !SDLActivity.mSingleton.isFinishing()) {
+            // Let's finish the Activity
+            SDLActivity.mSDLThread = null;
+            SDLActivity.mSDLMainFinished = true;
+            SDLActivity.mSingleton.finish();
+        }  // else: Activity is already being destroyed
+
+    }
+}
+
+class SDLClipboardHandler implements
+    ClipboardManager.OnPrimaryClipChangedListener {
+
+    protected ClipboardManager mClipMgr;
+
+    SDLClipboardHandler() {
+       mClipMgr = (ClipboardManager) SDL.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+       mClipMgr.addPrimaryClipChangedListener(this);
+    }
+
+    public boolean clipboardHasText() {
+        if (Build.VERSION.SDK_INT >= 28 /* Android 9 (P) */) {
+            return mClipMgr.hasPrimaryClip();
+        } else {
+            return mClipMgr.hasText();
+        }
+    }
+
+    public String clipboardGetText() {
+        ClipData clip = mClipMgr.getPrimaryClip();
+        if (clip != null) {
+            ClipData.Item item = clip.getItemAt(0);
+            if (item != null) {
+                CharSequence text = item.getText();
+                if (text != null) {
+                    return text.toString();
+                }
+            }
+        }
+        return null;
+    }
+
+    public void clipboardSetText(String string) {
+        mClipMgr.removePrimaryClipChangedListener(this);
+        if (string.isEmpty()) {
+            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (P) */) {
+                mClipMgr.clearPrimaryClip();
+            } else {
+                ClipData clip = ClipData.newPlainText(null, "");
+                mClipMgr.setPrimaryClip(clip);
+            }
+        } else {
+            ClipData clip = ClipData.newPlainText(null, string);
+            mClipMgr.setPrimaryClip(clip);
+        }
+        mClipMgr.addPrimaryClipChangedListener(this);
+    }
+
+    @Override
+    public void onPrimaryClipChanged() {
+        SDLActivity.onNativeClipboardChanged();
+    }
+}
+
diff --git a/armsx2/src/main/java/org/libsdl/app/SDLAudioManager.java b/armsx2/src/main/java/org/libsdl/app/SDLAudioManager.java
new file mode 100644
index 000000000..43706fa40
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDLAudioManager.java
@@ -0,0 +1,126 @@
+package org.libsdl.app;
+
+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
+import android.media.AudioManager;
+import android.os.Build;
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+
+class SDLAudioManager {
+    protected static final String TAG = "SDLAudio";
+
+    protected static Context mContext;
+
+    private static AudioDeviceCallback mAudioDeviceCallback;
+
+    static void initialize() {
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    for (AudioDeviceInfo deviceInfo : addedDevices) {
+                        nativeAddAudioDevice(deviceInfo.isSink(), deviceInfo.getProductName().toString(), deviceInfo.getId());
+                    }
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    for (AudioDeviceInfo deviceInfo : removedDevices) {
+                        nativeRemoveAudioDevice(deviceInfo.isSink(), deviceInfo.getId());
+                    }
+                }
+            };
+        }
+    }
+
+    static void setContext(Context context) {
+        mContext = context;
+    }
+
+    static void release(Context context) {
+        // no-op atm
+    }
+
+    // Audio
+
+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            for (AudioDeviceInfo deviceInfo : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
+                if (deviceInfo.getId() == deviceId) {
+                    return deviceInfo;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static AudioDeviceInfo getPlaybackAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            for (AudioDeviceInfo deviceInfo : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
+                if (deviceInfo.getId() == deviceId) {
+                    return deviceInfo;
+                }
+            }
+        }
+        return null;
+    }
+
+    static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            // get an initial list now, before hotplug callbacks fire.
+            for (AudioDeviceInfo dev : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
+                if (dev.getType() == AudioDeviceInfo.TYPE_TELEPHONY) {
+                    continue;  // Device cannot be opened
+                }
+                nativeAddAudioDevice(dev.isSink(), dev.getProductName().toString(), dev.getId());
+            }
+            for (AudioDeviceInfo dev : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
+                nativeAddAudioDevice(dev.isSink(), dev.getProductName().toString(), dev.getId());
+            }
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    static void unregisterAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    static void audioSetThreadPriority(boolean recording, int device_id) {
+        try {
+
+            /* Set thread name */
+            if (recording) {
+                Thread.currentThread().setName("SDLAudioC" + device_id);
+            } else {
+                Thread.currentThread().setName("SDLAudioP" + device_id);
+            }
+
+            /* Set thread priority */
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO);
+
+        } catch (Exception e) {
+            Log.v(TAG, "modify thread properties failed " + e.toString());
+        }
+    }
+
+    static native void nativeSetupJNI();
+
+    static native void nativeRemoveAudioDevice(boolean recording, int deviceId);
+
+    static native void nativeAddAudioDevice(boolean recording, String name, int deviceId);
+
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/SDLControllerManager.java b/armsx2/src/main/java/org/libsdl/app/SDLControllerManager.java
new file mode 100644
index 000000000..f6b083a5f
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -0,0 +1,935 @@
+package org.libsdl.app;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import android.content.Context;
+import android.hardware.lights.Light;
+import android.hardware.lights.LightsRequest;
+import android.hardware.lights.LightsManager;
+import android.hardware.lights.LightState;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.os.VibratorManager;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+public class SDLControllerManager
+{
+
+    public static native void nativeSetupJNI();
+
+    static native void nativeAddJoystick(int device_id, String name, String desc,
+                                                int vendor_id, int product_id,
+                                                int button_mask,
+                                                int naxes, int axis_mask, int nhats, boolean can_rumble, boolean has_rgb_led);
+    static native void nativeRemoveJoystick(int device_id);
+    static native void nativeAddHaptic(int device_id, String name);
+    static native void nativeRemoveHaptic(int device_id);
+    static public native boolean onNativePadDown(int device_id, int keycode);
+    static public native boolean onNativePadUp(int device_id, int keycode);
+    static native void onNativeJoy(int device_id, int axis,
+                                          float value);
+    static native void onNativeHat(int device_id, int hat_id,
+                                          int x, int y);
+
+    protected static SDLJoystickHandler mJoystickHandler;
+    protected static SDLHapticHandler mHapticHandler;
+
+    private static final String TAG = "SDLControllerManager";
+
+    public static void initialize() {
+        if (mJoystickHandler == null) {
+            mJoystickHandler = new SDLJoystickHandler();
+        }
+
+        if (mHapticHandler == null) {
+            if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                mHapticHandler = new SDLHapticHandler_API31();
+            } else if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
+                mHapticHandler = new SDLHapticHandler_API26();
+            } else {
+                mHapticHandler = new SDLHapticHandler();
+            }
+        }
+    }
+
+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+    static public boolean handleJoystickMotionEvent(MotionEvent event) {
+        return mJoystickHandler.handleMotionEvent(event);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    static void pollInputDevices() {
+        mJoystickHandler.pollInputDevices();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    static void joystickSetLED(int device_id, int red, int green, int blue) {
+        mJoystickHandler.setLED(device_id, red, green, blue);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    static void pollHapticDevices() {
+        mHapticHandler.pollHapticDevices();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    static void hapticRun(int device_id, float intensity, int length) {
+        mHapticHandler.run(device_id, intensity, length);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    static void hapticRumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
+        mHapticHandler.rumble(device_id, low_frequency_intensity, high_frequency_intensity, length);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    static void hapticStop(int device_id)
+    {
+        mHapticHandler.stop(device_id);
+    }
+
+    // Check if a given device is considered a possible SDL joystick
+    static public boolean isDeviceSDLJoystick(int deviceId) {
+        InputDevice device = InputDevice.getDevice(deviceId);
+        // We cannot use InputDevice.isVirtual before API 16, so let's accept
+        // only nonnegative device ids (VIRTUAL_KEYBOARD equals -1)
+        if ((device == null) || (deviceId < 0)) {
+            return false;
+        }
+        int sources = device.getSources();
+
+        /* This is called for every button press, so let's not spam the logs */
+        /*
+        if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+            Log.v(TAG, "Input device " + device.getName() + " has class joystick.");
+        }
+        if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) {
+            Log.v(TAG, "Input device " + device.getName() + " is a dpad.");
+        }
+        if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
+            Log.v(TAG, "Input device " + device.getName() + " is a gamepad.");
+        }
+        */
+
+        return ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ||
+                ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
+                ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)
+        );
+    }
+
+}
+
+
+/* Actual joystick functionality available for API >= 19 devices */
+class SDLJoystickHandler {
+
+    static class SDLJoystick {
+        int device_id;
+        String name;
+        String desc;
+        ArrayList<InputDevice.MotionRange> axes;
+        ArrayList<InputDevice.MotionRange> hats;
+        ArrayList<Light> lights;
+        LightsManager.LightsSession lightsSession;
+    }
+    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
+        @Override
+        public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+            // Some controllers, like the Moga Pro 2, return AXIS_GAS (22) for right trigger and AXIS_BRAKE (23) for left trigger - swap them so they're sorted in the right order for SDL
+            int arg0Axis = arg0.getAxis();
+            int arg1Axis = arg1.getAxis();
+            if (arg0Axis == MotionEvent.AXIS_GAS) {
+                arg0Axis = MotionEvent.AXIS_BRAKE;
+            } else if (arg0Axis == MotionEvent.AXIS_BRAKE) {
+                arg0Axis = MotionEvent.AXIS_GAS;
+            }
+            if (arg1Axis == MotionEvent.AXIS_GAS) {
+                arg1Axis = MotionEvent.AXIS_BRAKE;
+            } else if (arg1Axis == MotionEvent.AXIS_BRAKE) {
+                arg1Axis = MotionEvent.AXIS_GAS;
+            }
+
+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
+            return arg0Axis - arg1Axis;
+        }
+    }
+
+    private final ArrayList<SDLJoystick> mJoysticks;
+
+    SDLJoystickHandler() {
+
+        mJoysticks = new ArrayList<SDLJoystick>();
+    }
+
+    /**
+     * Handles adding and removing of input devices.
+     */
+    synchronized void pollInputDevices() {
+        int[] deviceIds = InputDevice.getDeviceIds();
+
+        for (int device_id : deviceIds) {
+            if (SDLControllerManager.isDeviceSDLJoystick(device_id)) {
+                SDLJoystick joystick = getJoystick(device_id);
+                if (joystick == null) {
+                    InputDevice joystickDevice = InputDevice.getDevice(device_id);
+                    joystick = new SDLJoystick();
+                    joystick.device_id = device_id;
+                    joystick.name = joystickDevice.getName();
+                    joystick.desc = getJoystickDescriptor(joystickDevice);
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
+                    joystick.lights = new ArrayList<Light>();
+
+                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+                    Collections.sort(ranges, new RangeComparator());
+                    for (InputDevice.MotionRange range : ranges) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                                joystick.hats.add(range);
+                            } else {
+                                joystick.axes.add(range);
+                            }
+                        }
+                    }
+
+                    boolean can_rumble = false;
+                    boolean has_rgb_led = false;
+                    if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                        VibratorManager vibratorManager = joystickDevice.getVibratorManager();
+                        int[] vibrators = vibratorManager.getVibratorIds();
+                        if (vibrators.length > 0) {
+                            can_rumble = true;
+                        }
+                        LightsManager lightsManager = joystickDevice.getLightsManager();
+                        List<Light> lights = lightsManager.getLights();
+                        for (Light light : lights) {
+                            if (light.hasRgbControl()) {
+                                joystick.lights.add(light);
+                            }
+                        }
+                        if (!joystick.lights.isEmpty()) {
+                            joystick.lightsSession = lightsManager.openSession();
+                            has_rgb_led = true;
+                        }
+                    }
+
+                    mJoysticks.add(joystick);
+                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
+                            getVendorId(joystickDevice), getProductId(joystickDevice),
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble, has_rgb_led);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = null;
+        for (SDLJoystick joystick : mJoysticks) {
+            int device_id = joystick.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
+            }
+            if (i == deviceIds.length) {
+                if (removedDevices == null) {
+                    removedDevices = new ArrayList<Integer>();
+                }
+                removedDevices.add(device_id);
+            }
+        }
+
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveJoystick(device_id);
+                for (int i = 0; i < mJoysticks.size(); i++) {
+                    if (mJoysticks.get(i).device_id == device_id) {
+                        if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                            if (mJoysticks.get(i).lightsSession != null) {
+                                try {
+                                    mJoysticks.get(i).lightsSession.close();
+                                } catch (Exception e) {
+                                    // Session may already be unregistered when device disconnects
+                                }
+                                mJoysticks.get(i).lightsSession = null;
+                            }
+                        }
+                        mJoysticks.remove(i);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    synchronized protected SDLJoystick getJoystick(int device_id) {
+        for (SDLJoystick joystick : mJoysticks) {
+            if (joystick.device_id == device_id) {
+                return joystick;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Handles given MotionEvent.
+     * @param event the event to be handled.
+     * @return if given event was processed.
+     */
+    boolean handleMotionEvent(MotionEvent event) {
+        int actionPointerIndex = event.getActionIndex();
+        int action = event.getActionMasked();
+        if (action == MotionEvent.ACTION_MOVE) {
+            SDLJoystick joystick = getJoystick(event.getDeviceId());
+            if (joystick != null) {
+                for (int i = 0; i < joystick.axes.size(); i++) {
+                    InputDevice.MotionRange range = joystick.axes.get(i);
+                    /* Normalize the value to -1...1 */
+                    float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
+                    SDLControllerManager.onNativeJoy(joystick.device_id, i, value);
+                }
+                for (int i = 0; i < joystick.hats.size() / 2; i++) {
+                    int hatX = Math.round(event.getAxisValue(joystick.hats.get(2 * i).getAxis(), actionPointerIndex));
+                    int hatY = Math.round(event.getAxisValue(joystick.hats.get(2 * i + 1).getAxis(), actionPointerIndex));
+                    SDLControllerManager.onNativeHat(joystick.device_id, i, hatX, hatY);
+                }
+            }
+        }
+        return true;
+    }
+
+    String getJoystickDescriptor(InputDevice joystickDevice) {
+        String desc = joystickDevice.getDescriptor();
+
+        if (desc != null && !desc.isEmpty()) {
+            return desc;
+        }
+
+        return joystickDevice.getName();
+    }
+
+    int getProductId(InputDevice joystickDevice) {
+        return joystickDevice.getProductId();
+    }
+
+    int getVendorId(InputDevice joystickDevice) {
+        return joystickDevice.getVendorId();
+    }
+
+    int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        // For compatibility, keep computing the axis mask like before,
+        // only really distinguishing 2, 4 and 6 axes.
+        int axis_mask = 0;
+        if (ranges.size() >= 2) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY))
+            axis_mask |= 0x0003;
+        }
+        if (ranges.size() >= 4) {
+            // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY))
+            axis_mask |= 0x000c;
+        }
+        if (ranges.size() >= 6) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER))
+            axis_mask |= 0x0030;
+        }
+        // Also add an indicator bit for whether the sorting order has changed.
+        // This serves to disable outdated gamecontrollerdb.txt mappings.
+        boolean have_z = false;
+        boolean have_past_z_before_rz = false;
+        for (InputDevice.MotionRange range : ranges) {
+            int axis = range.getAxis();
+            if (axis == MotionEvent.AXIS_Z) {
+                have_z = true;
+            } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) {
+                have_past_z_before_rz = true;
+            }
+        }
+        if (have_z && have_past_z_before_rz) {
+            // If both these exist, the compare() function changed sorting order.
+            // Set a bit to indicate this fact.
+            axis_mask |= 0x8000;
+        }
+        return axis_mask;
+    }
+
+    int getButtonMask(InputDevice joystickDevice) {
+        int button_mask = 0;
+        int[] keys = new int[] {
+            KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_BUTTON_B,
+            KeyEvent.KEYCODE_BUTTON_X,
+            KeyEvent.KEYCODE_BUTTON_Y,
+            KeyEvent.KEYCODE_BACK,
+            KeyEvent.KEYCODE_MENU,
+            KeyEvent.KEYCODE_BUTTON_MODE,
+            KeyEvent.KEYCODE_BUTTON_START,
+            KeyEvent.KEYCODE_BUTTON_THUMBL,
+            KeyEvent.KEYCODE_BUTTON_THUMBR,
+            KeyEvent.KEYCODE_BUTTON_L1,
+            KeyEvent.KEYCODE_BUTTON_R1,
+            KeyEvent.KEYCODE_DPAD_UP,
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_LEFT,
+            KeyEvent.KEYCODE_DPAD_RIGHT,
+            KeyEvent.KEYCODE_BUTTON_SELECT,
+            KeyEvent.KEYCODE_DPAD_CENTER,
+
+            // These don't map into any SDL controller buttons directly
+            KeyEvent.KEYCODE_BUTTON_L2,
+            KeyEvent.KEYCODE_BUTTON_R2,
+            KeyEvent.KEYCODE_BUTTON_C,
+            KeyEvent.KEYCODE_BUTTON_Z,
+            KeyEvent.KEYCODE_BUTTON_1,
+            KeyEvent.KEYCODE_BUTTON_2,
+            KeyEvent.KEYCODE_BUTTON_3,
+            KeyEvent.KEYCODE_BUTTON_4,
+            KeyEvent.KEYCODE_BUTTON_5,
+            KeyEvent.KEYCODE_BUTTON_6,
+            KeyEvent.KEYCODE_BUTTON_7,
+            KeyEvent.KEYCODE_BUTTON_8,
+            KeyEvent.KEYCODE_BUTTON_9,
+            KeyEvent.KEYCODE_BUTTON_10,
+            KeyEvent.KEYCODE_BUTTON_11,
+            KeyEvent.KEYCODE_BUTTON_12,
+            KeyEvent.KEYCODE_BUTTON_13,
+            KeyEvent.KEYCODE_BUTTON_14,
+            KeyEvent.KEYCODE_BUTTON_15,
+            KeyEvent.KEYCODE_BUTTON_16,
+        };
+        int[] masks = new int[] {
+            (1 << 0),   // A -> A
+            (1 << 1),   // B -> B
+            (1 << 2),   // X -> X
+            (1 << 3),   // Y -> Y
+            (1 << 4),   // BACK -> BACK
+            (1 << 6),   // MENU -> START
+            (1 << 5),   // MODE -> GUIDE
+            (1 << 6),   // START -> START
+            (1 << 7),   // THUMBL -> LEFTSTICK
+            (1 << 8),   // THUMBR -> RIGHTSTICK
+            (1 << 9),   // L1 -> LEFTSHOULDER
+            (1 << 10),  // R1 -> RIGHTSHOULDER
+            (1 << 11),  // DPAD_UP -> DPAD_UP
+            (1 << 12),  // DPAD_DOWN -> DPAD_DOWN
+            (1 << 13),  // DPAD_LEFT -> DPAD_LEFT
+            (1 << 14),  // DPAD_RIGHT -> DPAD_RIGHT
+            (1 << 4),   // SELECT -> BACK
+            (1 << 0),   // DPAD_CENTER -> A
+            (1 << 15),  // L2 -> ??
+            (1 << 16),  // R2 -> ??
+            (1 << 17),  // C -> ??
+            (1 << 18),  // Z -> ??
+            (1 << 20),  // 1 -> ??
+            (1 << 21),  // 2 -> ??
+            (1 << 22),  // 3 -> ??
+            (1 << 23),  // 4 -> ??
+            (1 << 24),  // 5 -> ??
+            (1 << 25),  // 6 -> ??
+            (1 << 26),  // 7 -> ??
+            (1 << 27),  // 8 -> ??
+            (1 << 28),  // 9 -> ??
+            (1 << 29),  // 10 -> ??
+            (1 << 30),  // 11 -> ??
+            (1 << 31),  // 12 -> ??
+            // We're out of room...
+            0xFFFFFFFF,  // 13 -> ??
+            0xFFFFFFFF,  // 14 -> ??
+            0xFFFFFFFF,  // 15 -> ??
+            0xFFFFFFFF,  // 16 -> ??
+        };
+        boolean[] has_keys = joystickDevice.hasKeys(keys);
+        for (int i = 0; i < keys.length; ++i) {
+            if (has_keys[i]) {
+                button_mask |= masks[i];
+            }
+        }
+        return button_mask;
+    }
+
+    void setLED(int device_id, int red, int green, int blue) {
+        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
+            return;
+        }
+        SDLJoystick joystick = getJoystick(device_id);
+        if (joystick == null || joystick.lights.isEmpty()) {
+            return;
+        }
+        LightsRequest.Builder lightsRequest = new LightsRequest.Builder();
+        LightState lightState = new LightState.Builder().setColor(Color.rgb(red, green, blue)).build();
+        for (Light light : joystick.lights) {
+            if (light.hasRgbControl()) {
+                lightsRequest.addLight(light, lightState);
+            }
+        }
+        joystick.lightsSession.requestLights(lightsRequest.build());
+    }
+}
+
+class SDLHapticHandler_API31 extends SDLHapticHandler {
+    @Override
+    void run(int device_id, float intensity, int length) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            vibrate(haptic.vib, intensity, length);
+        }
+    }
+
+    @Override
+    void rumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
+        InputDevice device = InputDevice.getDevice(device_id);
+        if (device == null) {
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
+            /* Silence 'lint' warning */
+            return;
+        }
+
+        VibratorManager manager = device.getVibratorManager();
+        int[] vibrators = manager.getVibratorIds();
+        if (vibrators.length >= 2) {
+            vibrate(manager.getVibrator(vibrators[0]), low_frequency_intensity, length);
+            vibrate(manager.getVibrator(vibrators[1]), high_frequency_intensity, length);
+        } else if (vibrators.length == 1) {
+            float intensity = (low_frequency_intensity * 0.6f) + (high_frequency_intensity * 0.4f);
+            vibrate(manager.getVibrator(vibrators[0]), intensity, length);
+        }
+    }
+
+    private void vibrate(Vibrator vibrator, float intensity, int length) {
+
+        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
+            /* Silence 'lint' warning */
+            return;
+        }
+
+        if (intensity == 0.0f) {
+            vibrator.cancel();
+            return;
+        }
+
+        int value = Math.round(intensity * 255);
+        if (value > 255) {
+            value = 255;
+        }
+        if (value < 1) {
+            vibrator.cancel();
+            return;
+        }
+        try {
+            vibrator.vibrate(VibrationEffect.createOneShot(length, value));
+        }
+        catch (Exception e) {
+            // Fall back to the generic method, which uses DEFAULT_AMPLITUDE, but works even if
+            // something went horribly wrong with the Android 8.0 APIs.
+            vibrator.vibrate(length);
+        }
+    }
+}
+
+class SDLHapticHandler_API26 extends SDLHapticHandler {
+    @Override
+    void run(int device_id, float intensity, int length) {
+
+        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
+            /* Silence 'lint' warning */
+            return;
+        }
+
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            if (intensity == 0.0f) {
+                stop(device_id);
+                return;
+            }
+
+            int vibeValue = Math.round(intensity * 255);
+
+            if (vibeValue > 255) {
+                vibeValue = 255;
+            }
+            if (vibeValue < 1) {
+                stop(device_id);
+                return;
+            }
+            try {
+                haptic.vib.vibrate(VibrationEffect.createOneShot(length, vibeValue));
+            }
+            catch (Exception e) {
+                // Fall back to the generic method, which uses DEFAULT_AMPLITUDE, but works even if
+                // something went horribly wrong with the Android 8.0 APIs.
+                haptic.vib.vibrate(length);
+            }
+        }
+    }
+}
+
+class SDLHapticHandler {
+
+    static class SDLHaptic {
+        int device_id;
+        String name;
+        Vibrator vib;
+    }
+
+    private final ArrayList<SDLHaptic> mHaptics;
+
+    SDLHapticHandler() {
+        mHaptics = new ArrayList<SDLHaptic>();
+    }
+
+    void run(int device_id, float intensity, int length) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            haptic.vib.vibrate(length);
+        }
+    }
+
+    void rumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
+        // Not supported in older APIs
+    }
+
+    void stop(int device_id) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            haptic.vib.cancel();
+        }
+    }
+
+    synchronized void pollHapticDevices() {
+
+        final int deviceId_VIBRATOR_SERVICE = 999999;
+        boolean hasVibratorService = false;
+
+        /* Check VIBRATOR_SERVICE */
+        Vibrator vib = (Vibrator) SDL.getContext().getSystemService(Context.VIBRATOR_SERVICE);
+        if (vib != null) {
+            hasVibratorService = vib.hasVibrator();
+
+            if (hasVibratorService) {
+                SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
+                if (haptic == null) {
+                    haptic = new SDLHaptic();
+                    haptic.device_id = deviceId_VIBRATOR_SERVICE;
+                    haptic.name = "VIBRATOR_SERVICE";
+                    haptic.vib = vib;
+                    mHaptics.add(haptic);
+                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = null;
+        for (SDLHaptic haptic : mHaptics) {
+            int device_id = haptic.device_id;
+            if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) {
+                if (removedDevices == null) {
+                    removedDevices = new ArrayList<Integer>();
+                }
+                removedDevices.add(device_id);
+            }  // else: don't remove the vibrator if it is still present
+        }
+
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveHaptic(device_id);
+                for (int i = 0; i < mHaptics.size(); i++) {
+                    if (mHaptics.get(i).device_id == device_id) {
+                        mHaptics.remove(i);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    synchronized protected SDLHaptic getHaptic(int device_id) {
+        for (SDLHaptic haptic : mHaptics) {
+            if (haptic.device_id == device_id) {
+                return haptic;
+            }
+        }
+        return null;
+    }
+}
+
+class SDLGenericMotionListener_API14 implements View.OnGenericMotionListener {
+    protected static final int SDL_PEN_DEVICE_TYPE_UNKNOWN = 0;
+    protected static final int SDL_PEN_DEVICE_TYPE_DIRECT = 1;
+    protected static final int SDL_PEN_DEVICE_TYPE_INDIRECT = 2;
+
+    // Generic Motion (mouse hover, joystick...) events go here
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        if (event.getSource() == InputDevice.SOURCE_JOYSTICK)
+            return SDLControllerManager.handleJoystickMotionEvent(event);
+
+        float x, y;
+        int action = event.getActionMasked();
+        int pointerCount = event.getPointerCount();
+        boolean consumed = false;
+
+        for (int i = 0; i < pointerCount; i++) {
+            int toolType = event.getToolType(i);
+
+            if (toolType == MotionEvent.TOOL_TYPE_MOUSE) {
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, i);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, i);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        consumed = true;
+                        break;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = getEventX(event, i);
+                        y = getEventY(event, i);
+
+                        SDLActivity.onNativeMouse(0, action, x, y, checkRelativeEvent(event));
+                        consumed = true;
+                        break;
+
+                    default:
+                        break;
+                }
+            } else if (toolType == MotionEvent.TOOL_TYPE_STYLUS || toolType == MotionEvent.TOOL_TYPE_ERASER) {
+                switch (action) {
+                    case MotionEvent.ACTION_HOVER_ENTER:
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                    case MotionEvent.ACTION_HOVER_EXIT:
+                        x = event.getX(i);
+                        y = event.getY(i);
+                        float p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+
+                        // BUTTON_STYLUS_PRIMARY is 2^5, so shift by 4, and apply SDL_PEN_INPUT_DOWN/SDL_PEN_INPUT_ERASER_TIP
+                        int buttons = (event.getButtonState() >> 4) | (1 << (toolType == MotionEvent.TOOL_TYPE_STYLUS ? 0 : 30));
+                        if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
+                            buttons |= 0x08;
+                        }
+
+                        SDLActivity.onNativePen(event.getPointerId(i), getPenDeviceType(event.getDevice()), buttons, action, x, y, p);
+                        consumed = true;
+                        break;
+                }
+            }
+        }
+
+        return consumed;
+    }
+
+    boolean supportsRelativeMouse() {
+        return false;
+    }
+
+    boolean inRelativeMode() {
+        return false;
+    }
+
+    boolean setRelativeMouseEnabled(boolean enabled) {
+        return false;
+    }
+
+    void reclaimRelativeMouseModeIfNeeded() {
+
+    }
+
+    boolean checkRelativeEvent(MotionEvent event) {
+        return inRelativeMode();
+    }
+
+    float getEventX(MotionEvent event, int pointerIndex) {
+        return event.getX(pointerIndex);
+    }
+
+    float getEventY(MotionEvent event, int pointerIndex) {
+        return event.getY(pointerIndex);
+    }
+
+    int getPenDeviceType(InputDevice penDevice) {
+        return SDL_PEN_DEVICE_TYPE_UNKNOWN;
+    }
+}
+
+class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API14 {
+    // Generic Motion (mouse hover, joystick...) events go here
+
+    private boolean mRelativeModeEnabled;
+
+    @Override
+    boolean supportsRelativeMouse() {
+        return true;
+    }
+
+    @Override
+    boolean inRelativeMode() {
+        return mRelativeModeEnabled;
+    }
+
+    @Override
+    boolean setRelativeMouseEnabled(boolean enabled) {
+        mRelativeModeEnabled = enabled;
+        return true;
+    }
+
+    @Override
+    float getEventX(MotionEvent event, int pointerIndex) {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+            /* Silence 'lint' warning */
+            return 0;
+        }
+
+        if (mRelativeModeEnabled && event.getToolType(pointerIndex) == MotionEvent.TOOL_TYPE_MOUSE) {
+            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X, pointerIndex);
+        } else {
+            return event.getX(pointerIndex);
+        }
+    }
+
+    @Override
+    float getEventY(MotionEvent event, int pointerIndex) {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+            /* Silence 'lint' warning */
+            return 0;
+        }
+
+        if (mRelativeModeEnabled && event.getToolType(pointerIndex) == MotionEvent.TOOL_TYPE_MOUSE) {
+            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y, pointerIndex);
+        } else {
+            return event.getY(pointerIndex);
+        }
+    }
+}
+
+class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
+    // Generic Motion (mouse hover, joystick...) events go here
+    private boolean mRelativeModeEnabled;
+
+    @Override
+    boolean supportsRelativeMouse() {
+        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
+    }
+
+    @Override
+    boolean inRelativeMode() {
+        return mRelativeModeEnabled;
+    }
+
+    @Override
+    boolean setRelativeMouseEnabled(boolean enabled) {
+
+        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
+            /* Silence 'lint' warning */
+            return false;
+        }
+
+        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
+            if (enabled) {
+                SDLActivity.getContentView().requestPointerCapture();
+            } else {
+                SDLActivity.getContentView().releasePointerCapture();
+            }
+            mRelativeModeEnabled = enabled;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    void reclaimRelativeMouseModeIfNeeded() {
+
+        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
+            /* Silence 'lint' warning */
+            return;
+        }
+
+        if (mRelativeModeEnabled && !SDLActivity.isDeXMode()) {
+            SDLActivity.getContentView().requestPointerCapture();
+        }
+    }
+
+    @Override
+    boolean checkRelativeEvent(MotionEvent event) {
+        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
+            /* Silence 'lint' warning */
+            return false;
+        }
+        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
+    }
+
+    @Override
+    float getEventX(MotionEvent event, int pointerIndex) {
+        // Relative mouse in capture mode will only have relative for X/Y
+        return event.getX(pointerIndex);
+    }
+
+    @Override
+    float getEventY(MotionEvent event, int pointerIndex) {
+        // Relative mouse in capture mode will only have relative for X/Y
+        return event.getY(pointerIndex);
+    }
+}
+
+class SDLGenericMotionListener_API29 extends SDLGenericMotionListener_API26 {
+    @Override
+    int getPenDeviceType(InputDevice penDevice)
+    {
+        if (penDevice == null) {
+            return SDL_PEN_DEVICE_TYPE_UNKNOWN;
+        }
+
+        return penDevice.isExternal() ? SDL_PEN_DEVICE_TYPE_INDIRECT : SDL_PEN_DEVICE_TYPE_DIRECT;
+    }
+}
diff --git a/armsx2/src/main/java/org/libsdl/app/SDLDummyEdit.java b/armsx2/src/main/java/org/libsdl/app/SDLDummyEdit.java
new file mode 100644
index 000000000..61d8fe850
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDLDummyEdit.java
@@ -0,0 +1,66 @@
+package org.libsdl.app;
+
+import android.content.*;
+import android.text.InputType;
+import android.view.*;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+public class SDLDummyEdit extends View implements View.OnKeyListener
+{
+    InputConnection ic;
+    int input_type;
+
+    SDLDummyEdit(Context context) {
+        super(context);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        setOnKeyListener(this);
+    }
+
+    void setInputType(int input_type) {
+        this.input_type = input_type;
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, ic);
+    }
+
+    //
+    @Override
+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+        // FIXME: A more effective solution would be to assume our Layout to be RelativeLayout or LinearLayout
+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                SDLActivity.onNativeKeyboardFocusLost();
+            }
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        ic = new SDLInputConnection(this, true);
+
+        outAttrs.inputType = input_type;
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+                              EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
+
+        return ic;
+    }
+}
+
diff --git a/armsx2/src/main/java/org/libsdl/app/SDLInputConnection.java b/armsx2/src/main/java/org/libsdl/app/SDLInputConnection.java
new file mode 100644
index 000000000..fdc2994c1
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDLInputConnection.java
@@ -0,0 +1,136 @@
+package org.libsdl.app;
+
+import android.content.*;
+import android.os.Build;
+import android.text.Editable;
+import android.view.*;
+import android.view.inputmethod.BaseInputConnection;
+import android.widget.EditText;
+
+class SDLInputConnection extends BaseInputConnection
+{
+    protected EditText mEditText;
+    protected String mCommittedText = "";
+
+    SDLInputConnection(View targetView, boolean fullEditor) {
+        super(targetView, fullEditor);
+        mEditText = new EditText(SDL.getContext());
+    }
+
+    @Override
+    public Editable getEditable() {
+        return mEditText.getEditableText();
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        /*
+         * This used to handle the keycodes from soft keyboard (and IME-translated input from hardkeyboard)
+         * However, as of Ice Cream Sandwich and later, almost all soft keyboard doesn't generate key presses
+         * and so we need to generate them ourselves in commitText.  To avoid duplicates on the handful of keys
+         * that still do, we empty this out.
+         */
+
+        /*
+         * Return DOES still generate a key event, however.  So rather than using it as the 'click a button' key
+         * as we do with physical keyboards, let's just use it to hide the keyboard.
+         */
+
+        if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+            if (SDLActivity.onNativeSoftReturnKey()) {
+                return true;
+            }
+        }
+
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        if (!super.commitText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        if (!super.setComposingText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions>/14560344/android-backspace-in-webview-baseinputconnection
+        // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
+        if (beforeLength > 0 && afterLength == 0) {
+            // backspace(s)
+            while (beforeLength-- > 0) {
+                nativeGenerateScancodeForUnichar('\b');
+            }
+            return true;
+       }
+
+        if (!super.deleteSurroundingText(beforeLength, afterLength)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    protected void updateText() {
+        final Editable content = getEditable();
+        if (content == null) {
+            return;
+        }
+
+        String text = content.toString();
+        int compareLength = Math.min(text.length(), mCommittedText.length());
+        int matchLength, offset;
+
+        /* Backspace over characters that are no longer in the string */
+        for (matchLength = 0; matchLength < compareLength; ) {
+            int codePoint = mCommittedText.codePointAt(matchLength);
+            if (codePoint != text.codePointAt(matchLength)) {
+                break;
+            }
+            matchLength += Character.charCount(codePoint);
+        }
+        /* FIXME: This doesn't handle graphemes, like '🌬️' */
+        for (offset = matchLength; offset < mCommittedText.length(); ) {
+            int codePoint = mCommittedText.codePointAt(offset);
+            nativeGenerateScancodeForUnichar('\b');
+            offset += Character.charCount(codePoint);
+        }
+
+        if (matchLength < text.length()) {
+            String pendingText = text.subSequence(matchLength, text.length()).toString();
+            if (!SDLActivity.dispatchingKeyEvent()) {
+                for (offset = 0; offset < pendingText.length(); ) {
+                    int codePoint = pendingText.codePointAt(offset);
+                    if (codePoint == '\n') {
+                        if (SDLActivity.onNativeSoftReturnKey()) {
+                            return;
+                        }
+                    }
+                    /* Higher code points don't generate simulated scancodes */
+                    if (codePoint > 0 && codePoint < 128) {
+                        nativeGenerateScancodeForUnichar((char)codePoint);
+                    }
+                    offset += Character.charCount(codePoint);
+                }
+            }
+            SDLInputConnection.nativeCommitText(pendingText, 0);
+        }
+        mCommittedText = text;
+    }
+
+    public static native void nativeCommitText(String text, int newCursorPosition);
+
+    public static native void nativeGenerateScancodeForUnichar(char c);
+}
+
diff --git a/armsx2/src/main/java/org/libsdl/app/SDLSurface.java b/armsx2/src/main/java/org/libsdl/app/SDLSurface.java
new file mode 100644
index 000000000..1579b7334
--- /dev/null
+++ b/armsx2/src/main/java/org/libsdl/app/SDLSurface.java
@@ -0,0 +1,449 @@
+package org.libsdl.app;
+
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.graphics.Insets;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.PointerIcon;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+
+import android.view.ScaleGestureDetector;
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnApplyWindowInsetsListener, View.OnKeyListener, View.OnTouchListener,
+    SensorEventListener, ScaleGestureDetector.OnScaleGestureListener {
+
+    // Sensors
+    protected SensorManager mSensorManager;
+    protected Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected float mWidth, mHeight;
+
+    // Is SurfaceView ready for rendering
+    protected boolean mIsSurfaceReady;
+
+    // Pinch events
+    private final ScaleGestureDetector scaleGestureDetector;
+
+    // Startup
+    protected SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        scaleGestureDetector = new ScaleGestureDetector(context, this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnApplyWindowInsetsListener(this);
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        setOnGenericMotionListener(SDLActivity.getMotionListener());
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+
+        mIsSurfaceReady = false;
+    }
+
+    protected void handlePause() {
+        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+    }
+
+    protected void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnApplyWindowInsetsListener(this);
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    protected Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        SDLActivity.onNativeSurfaceCreated();
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+
+        // Transition to pause, if needed
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
+        SDLActivity.handleNativeState();
+
+        mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        if (SDLActivity.mSingleton == null) {
+            return;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        int nDeviceWidth = width;
+        int nDeviceHeight = height;
+        float density = 1.0f;
+        try
+        {
+            DisplayMetrics realMetrics = new DisplayMetrics();
+            mDisplay.getRealMetrics( realMetrics );
+            nDeviceWidth = realMetrics.widthPixels;
+            nDeviceHeight = realMetrics.heightPixels;
+            // Use densityDpi instead of density to more closely match what the UI scale is
+            density = (float)realMetrics.densityDpi / 160.0f;
+        } catch(Exception ignored) {
+        }
+
+        synchronized(SDLActivity.getContext()) {
+            // In case we're waiting on a size change after going fullscreen, send a notification.
+            SDLActivity.getContext().notifyAll();
+        }
+
+        Log.v("SDL", "Window size: " + width + "x" + height);
+        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
+        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, density, mDisplay.getRefreshRate());
+        SDLActivity.onNativeResize();
+
+        // Prevent a screen distortion glitch,
+        // for instance when the device is in Landscape and a Portrait App is resumed.
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        // Don't skip if we might be multi-window or have popup dialogs
+        if (skip) {
+            if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                skip = false;
+            }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           mIsSurfaceReady = false;
+           return;
+        }
+
+        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+        SDLActivity.onNativeSurfaceChanged();
+
+        /* Surface is ready */
+        mIsSurfaceReady = true;
+
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
+        SDLActivity.handleNativeState();
+    }
+
+    // Window inset
+    @Override
+    public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
+        if (Build.VERSION.SDK_INT >= 30 /* Android 11 (R) */) {
+            Insets combined = insets.getInsets(WindowInsets.Type.systemBars() |
+                                               WindowInsets.Type.systemGestures() |
+                                               WindowInsets.Type.mandatorySystemGestures() |
+                                               WindowInsets.Type.tappableElement() |
+                                               WindowInsets.Type.displayCutout());
+
+            SDLActivity.onNativeInsetsChanged(combined.left, combined.right, combined.top, combined.bottom);
+        }
+
+        // Pass these to any child views in case they need them
+        return insets;
+    }
+
+    // Key events
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, null);
+    }
+
+    private float getNormalizedX(float x)
+    {
+        if (mWidth <= 1) {
+            return 0.5f;
+        } else {
+            return (x / (mWidth - 1));
+        }
+    }
+
+    private float getNormalizedY(float y)
+    {
+        if (mHeight <= 1) {
+            return 0.5f;
+        } else {
+            return (y / (mHeight - 1));
+        }
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerId;
+        int i = 0;
+        float x,y,p;
+
+        if (action == MotionEvent.ACTION_POINTER_UP || action == MotionEvent.ACTION_POINTER_DOWN)
+            i = event.getActionIndex();
+
+        do {
+            int toolType = event.getToolType(i);
+
+            if (toolType == MotionEvent.TOOL_TYPE_MOUSE) {
+                int buttonState = event.getButtonState();
+                boolean relative = false;
+
+                // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
+                // if we are. We'll leverage our existing mouse motion listener
+                SDLGenericMotionListener_API14 motionListener = SDLActivity.getMotionListener();
+                x = motionListener.getEventX(event, i);
+                y = motionListener.getEventY(event, i);
+                relative = motionListener.inRelativeMode();
+
+                SDLActivity.onNativeMouse(buttonState, action, x, y, relative);
+            } else if (toolType == MotionEvent.TOOL_TYPE_STYLUS || toolType == MotionEvent.TOOL_TYPE_ERASER) {
+                pointerId = event.getPointerId(i);
+                x = event.getX(i);
+                y = event.getY(i);
+                p = event.getPressure(i);
+                if (p > 1.0f) {
+                    // may be larger than 1.0f on some devices
+                    // see the documentation of getPressure(i)
+                    p = 1.0f;
+                }
+
+                // BUTTON_STYLUS_PRIMARY is 2^5, so shift by 4, and apply SDL_PEN_INPUT_DOWN/SDL_PEN_INPUT_ERASER_TIP
+                int buttonState = (event.getButtonState() >> 4) | (1 << (toolType == MotionEvent.TOOL_TYPE_STYLUS ? 0 : 30));
+                if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
+                    buttonState |= 0x08;
+                }
+
+                SDLActivity.onNativePen(pointerId, SDLActivity.getMotionListener().getPenDeviceType(event.getDevice()), buttonState, action, x, y, p);
+            } else { // MotionEvent.TOOL_TYPE_FINGER or MotionEvent.TOOL_TYPE_UNKNOWN
+                pointerId = event.getPointerId(i);
+                x = getNormalizedX(event.getX(i));
+                y = getNormalizedY(event.getY(i));
+                p = event.getPressure(i);
+                if (p > 1.0f) {
+                    // may be larger than 1.0f on some devices
+                    // see the documentation of getPressure(i)
+                    p = 1.0f;
+                }
+
+                SDLActivity.onNativeTouch(touchDevId, pointerId, action, x, y, p);
+            }
+
+            // Non-primary up/down
+            if (action == MotionEvent.ACTION_POINTER_UP || action == MotionEvent.ACTION_POINTER_DOWN)
+                break;
+        } while (++i < pointerCount);
+
+        scaleGestureDetector.onTouchEvent(event);
+
+        return true;
+    }
+
+    // Sensor events
+    protected void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+
+            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
+            // We thus should check here.
+            int newRotation;
+
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_0:
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    newRotation = 0;
+                    break;
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    newRotation = 90;
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[0];
+                    y = -event.values[1];
+                    newRotation = 180;
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    newRotation = 270;
+                    break;
+            }
+
+            if (newRotation != SDLActivity.mCurrentRotation) {
+                SDLActivity.mCurrentRotation = newRotation;
+                SDLActivity.onNativeRotationChanged(newRotation);
+            }
+
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
+
+
+        }
+    }
+
+    // Prevent android internal NullPointerException (https://github.com/libsdl-org/SDL/issues/13306)
+    @Override
+    public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) {
+        try {
+            return super.onResolvePointerIcon(event, pointerIndex);
+        } catch (NullPointerException e) {
+            return null;
+        }
+    }
+
+    // Captured pointer events for API 26.
+    @Override
+    public boolean onCapturedPointerEvent(MotionEvent event)
+    {
+        int action = event.getActionMasked();
+        int pointerCount = event.getPointerCount();
+
+        for (int i = 0; i < pointerCount; i++) {
+            float x, y;
+            switch (action) {
+                case MotionEvent.ACTION_SCROLL:
+                    x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, i);
+                    y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, i);
+                    SDLActivity.onNativeMouse(0, action, x, y, false);
+                    return true;
+
+                case MotionEvent.ACTION_HOVER_MOVE:
+                case MotionEvent.ACTION_MOVE:
+                    x = event.getX(i);
+                    y = event.getY(i);
+                    SDLActivity.onNativeMouse(0, action, x, y, true);
+                    return true;
+
+                case MotionEvent.ACTION_BUTTON_PRESS:
+                case MotionEvent.ACTION_BUTTON_RELEASE:
+
+                    // Change our action value to what SDL's code expects.
+                    if (action == MotionEvent.ACTION_BUTTON_PRESS) {
+                        action = MotionEvent.ACTION_DOWN;
+                    } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
+                        action = MotionEvent.ACTION_UP;
+                    }
+
+                    x = event.getX(i);
+                    y = event.getY(i);
+                    int button = event.getButtonState();
+
+                    SDLActivity.onNativeMouse(button, action, x, y, true);
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onScale(ScaleGestureDetector detector) {
+        float scale = detector.getScaleFactor();
+        SDLActivity.onNativePinchUpdate(scale);
+        return true;
+    }
+
+    @Override
+    public boolean onScaleBegin(ScaleGestureDetector detector) {
+        SDLActivity.onNativePinchStart();
+        return true;
+    }
+
+    @Override
+    public void onScaleEnd(ScaleGestureDetector detector) {
+        SDLActivity.onNativePinchEnd();
+    }
+
+}
diff --git a/armsx2/src/main/jniLibs/arm64-v8a/libEGL_angle.so b/armsx2/src/main/jniLibs/arm64-v8a/libEGL_angle.so
new file mode 100644
index 000000000..3d699adc4
Binary files /dev/null and b/armsx2/src/main/jniLibs/arm64-v8a/libEGL_angle.so differ
diff --git a/armsx2/src/main/jniLibs/arm64-v8a/libGLESv2_angle.so b/armsx2/src/main/jniLibs/arm64-v8a/libGLESv2_angle.so
new file mode 100644
index 000000000..e11b5fbbc
Binary files /dev/null and b/armsx2/src/main/jniLibs/arm64-v8a/libGLESv2_angle.so differ
diff --git a/armsx2/src/main/jniLibs/arm64-v8a/libSPIRV-Tools-shared.so b/armsx2/src/main/jniLibs/arm64-v8a/libSPIRV-Tools-shared.so
new file mode 100644
index 000000000..9a7ec68f2
Binary files /dev/null and b/armsx2/src/main/jniLibs/arm64-v8a/libSPIRV-Tools-shared.so differ
diff --git a/armsx2/src/main/jniLibs/arm64-v8a/liblibrashader_capi.so b/armsx2/src/main/jniLibs/arm64-v8a/liblibrashader_capi.so
new file mode 100644
index 000000000..fdd739c4c
Binary files /dev/null and b/armsx2/src/main/jniLibs/arm64-v8a/liblibrashader_capi.so differ
diff --git a/armsx2/src/main/jniLibs/arm64-v8a/libshaderc_shared.so b/armsx2/src/main/jniLibs/arm64-v8a/libshaderc_shared.so
new file mode 100644
index 000000000..33313ca57
Binary files /dev/null and b/armsx2/src/main/jniLibs/arm64-v8a/libshaderc_shared.so differ
diff --git a/armsx2/src/main/res/drawable/ic_launcher_background.xml b/armsx2/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..5480c7903
--- /dev/null
+++ b/armsx2/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="315"
+        android:startColor="#061021"
+        android:centerColor="#0B1D38"
+        android:endColor="#102B50" />
+</shape>
diff --git a/armsx2/src/main/res/drawable/ic_launcher_foreground.xml b/armsx2/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..855291fb7
--- /dev/null
+++ b/armsx2/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  savetowerforeground is a fully pre-composed icon (tower + its own dark radial
+  background) that fills the whole 1024px square. Dropping it straight into an
+  adaptive-icon <foreground> with gravity="fill" stretches it across the entire
+  108dp layer, so the launcher mask (which only shows the centre ~72dp safe zone)
+  crops the dark margins and zooms hard into the tower. Inset the artwork so the
+  full composition lands inside the safe zone and the tower keeps its breathing
+  room; the ~18% margin shows the solid #01071C adaptive background, which matches
+  the artwork's dark edges so the seam is invisible.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inset="18%">
+    <bitmap
+        android:antialias="true"
+        android:dither="true"
+        android:gravity="fill"
+        android:src="@drawable/savetowerforeground" />
+</inset>
diff --git a/armsx2/src/main/res/drawable/savetowerforeground.png b/armsx2/src/main/res/drawable/savetowerforeground.png
new file mode 100644
index 000000000..cd9f3eb2e
Binary files /dev/null and b/armsx2/src/main/res/drawable/savetowerforeground.png differ
diff --git a/armsx2/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/armsx2/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..b3e26b4c6
--- /dev/null
+++ b/armsx2/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/armsx2/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/armsx2/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..b3e26b4c6
--- /dev/null
+++ b/armsx2/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/armsx2/src/main/res/mipmap-anydpi/ic_launcher.xml b/armsx2/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/armsx2/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/armsx2/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/armsx2/src/main/res/mipmap-anydpi/ic_launcher_round.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/armsx2/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/armsx2/src/main/res/values-night/themes.xml b/armsx2/src/main/res/values-night/themes.xml
new file mode 100644
index 000000000..f1bc06540
--- /dev/null
+++ b/armsx2/src/main/res/values-night/themes.xml
@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.ARMSX2" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/armsx2/src/main/res/values/colors.xml b/armsx2/src/main/res/values/colors.xml
new file mode 100644
index 000000000..f8c6127d3
--- /dev/null
+++ b/armsx2/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/armsx2/src/main/res/values/strings.xml b/armsx2/src/main/res/values/strings.xml
new file mode 100644
index 000000000..08de25b8d
--- /dev/null
+++ b/armsx2/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">ARMSX2</string>
+</resources>
\ No newline at end of file
diff --git a/armsx2/src/main/res/values/themes.xml b/armsx2/src/main/res/values/themes.xml
new file mode 100644
index 000000000..c67f22d9e
--- /dev/null
+++ b/armsx2/src/main/res/values/themes.xml
@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.ARMSX2" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/armsx2/src/main/res/xml/backup_rules.xml b/armsx2/src/main/res/xml/backup_rules.xml
new file mode 100644
index 000000000..4df925582
--- /dev/null
+++ b/armsx2/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older than API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
\ No newline at end of file
diff --git a/armsx2/src/main/res/xml/data_extraction_rules.xml b/armsx2/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 000000000..9ee9997b0
--- /dev/null
+++ b/armsx2/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
\ No newline at end of file
diff --git a/armsx2/src/main/res/xml/network_security_config.xml b/armsx2/src/main/res/xml/network_security_config.xml
new file mode 100644
index 000000000..5ade7336e
--- /dev/null
+++ b/armsx2/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">127.0.0.1</domain>
+        <domain includeSubdomains="false">localhost</domain>
+    </domain-config>
+</network-security-config>
diff --git a/audio_plugin/module_pcm_android_aserver.c b/audio_plugin/module_pcm_android_aserver.c
index 51f05d2c4..ec3d966d7 100644
--- a/audio_plugin/module_pcm_android_aserver.c
+++ b/audio_plugin/module_pcm_android_aserver.c
@@ -285,7 +285,8 @@ static snd_pcm_ioplug_callback_t android_aserver_callback = {
 
 static int android_aserver_connect() {
     char* path = getenv("ANDROID_ALSA_SERVER");
-    
+    if (path == NULL) return -1;
+
     int fd = socket(AF_UNIX, SOCK_STREAM, 0);
     if (fd < 0) return -1;
     
diff --git a/build.gradle b/build.gradle
index 70ec1c14c..7cebf38d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
+    alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinAndroid) apply false
     alias(libs.plugins.kotlinCompose) apply false
     alias(libs.plugins.ksp) apply false
diff --git a/cores/DOLPHIN.md b/cores/DOLPHIN.md
new file mode 100644
index 000000000..fcf347d5c
--- /dev/null
+++ b/cores/DOLPHIN.md
@@ -0,0 +1,54 @@
+# Dolphin (GameCube / Wii)
+
+> **Packaging note (current):** the emucore and its runtime data are no longer committed
+> here. They are built in the [WinNative-Emu](https://github.com/WinNative-Emu) fork and
+> shipped in the [Retro-Consoles](https://github.com/WinNative-Emu/Retro-Consoles) bundle
+> the app downloads at runtime. The build/patch details below describe how that fork
+> produces the binary and remain accurate for the fork.
+
+Built from source like every other libretro core, in
+[WinNative-Emu/dolphin-libretro](https://github.com/WinNative-Emu/dolphin-libretro) on the
+`winnative` branch (fork of `libretro/dolphin`). Its `winnative-core.yml` publishes
+`libdolphin_libretro_android.so` to the rolling `latest` release, `Retro-Consoles` packs it
+into the bundle via `cores.list`, and the app resolves it from
+`files/retro/bundle/cores/` like the rest — no copy in the APK and none in Git LFS.
+
+It was previously a hand-placed libretro buildbot nightly committed to
+`app/src/main/jniLibs/arm64-v8a/`, which is why `RetroCoreManager.resolveCore` used to
+special-case it to `nativeLibraryDir`. That special case is gone.
+
+Sys data (game INIs, fonts) is under `app/src/main/assets/retro/dolphin-emu/Sys` and
+copied to app files on first launch (`RetroCoreManager.ensureDolphinSys`).
+
+User data (saves, memcards, `Dolphin.ini`) lives under `files/retro/saves/User`
+(`ensureDolphinUser` creates `GC/{USA,EUR,JAP}/Card A|B` and pins SlotA GCI folder).
+
+## Graphics / Adreno
+
+dolphin-libretro renders through **libretrodroid GLES** (system Adreno GLES 3.x).
+
+WinNative **Turnip / adrenotools** Vulkan drivers (`contents/adrenotools`,
+`graphics_driver/*`) are for Wine containers and PS2 Vulkan — they are **not**
+loaded for this core. Preferring system Adreno GLES is correct for libretro.
+
+## Performance defaults (`RetroCoreOptions`)
+
+| Option | Value | Why |
+|--------|-------|-----|
+| `dolphin_cpu_core` | `4` (JITARM64) | ~5–10× vs Cached Interpreter |
+| `dolphin_main_cpu_thread` | `disabled` | Dual core SIGSEGV in Adreno GLES mid-game |
+| `dolphin_efb_scale` | `1` | Native IR |
+| `dolphin_efb_to_texture` / XFB | `enabled` | Avoid EFB/XFB→RAM copies |
+| `dolphin_dsp_hle` | `enabled` | Fast audio DSP |
+| `dolphin_fastmem` / arena | `disabled` | RWX/mmap SIGSEGV under Android SELinux + Adreno |
+| `dolphin_shader_compilation_mode` | `0` (sync) | Async skip → flicker/stale frames on GLES |
+| `dolphin_skip_dupe_frames` / Early XFB | off | Ghost/old-frame blending on Adreno |
+| Audio | larger Oboe buffer | `preferLowLatencyAudio=false` for Dolphin |
+
+If a title hangs on memcard check, try Dual Core **off** for that game.
+
+Upstream core nightlies: https://buildbot.libretro.com/nightly/android/latest/arm64-v8a/dolphin_libretro_android.so.zip  
+Source reference: https://github.com/dolphin-emu/dolphin and https://github.com/libretro/dolphin
+
+Local rebuild of the core (optional, heavy): clone libretro/dolphin and follow its Android
+libretro NDK build; install the resulting `.so` with the `lib` prefix above.
diff --git a/cores/DOLPHIN_EMBED.md b/cores/DOLPHIN_EMBED.md
new file mode 100644
index 000000000..c30f86a6f
--- /dev/null
+++ b/cores/DOLPHIN_EMBED.md
@@ -0,0 +1,210 @@
+# Embedded Dolphin (Route B2) — WinNative-driven GC/Wii
+
+> **Packaging note (current):** the emucore and its runtime data are no longer committed
+> here. They are built in the [WinNative-Emu](https://github.com/WinNative-Emu) fork and
+> shipped in the [Retro-Consoles](https://github.com/WinNative-Emu/Retro-Consoles) bundle
+> the app downloads at runtime. The build/patch details below describe how that fork
+> produces the binary and remain accurate for the fork.
+
+Decision (2026-07-22): replace the dolphin-libretro GLES path for GameCube/Wii with an
+embedded standalone Dolphin core, mirroring the ARMSX2/PS2 pattern. WinNative drives
+everything — Dolphin's own menus/UI are stripped; every setting, driver and toggle is
+fed from WinNative's surfaces (Shortcut Settings, Settings > Retro, in-game drawer).
+
+Why: dolphin-libretro can only render GLES via libretrodroid, and the system Adreno
+GLES driver SIGSEGVs on new silicon (see DOLPHIN_VULKAN.md). Standalone Dolphin brings
+its own Vulkan backend + native adrenotools/Turnip loading, RetroAchievements, netplay,
+and save infrastructure.
+
+## Module: `dolphin/`
+
+- `build-emucore.sh` — clones dolphin-emu/dolphin at pinned SHA
+  `b008142f72a099a9bcb971776209504f085ae0be` (+ submodules), applies `patches/`,
+  CMake+Ninja (NDK toolchain, arm64-v8a, android-26, flexible page sizes ON,
+  analytics/autoupdate/tests OFF, RetroAchievements ON) and builds:
+  - `libmain.so` — Dolphin core + JNI
+  - `libhook_impl.so`, `libmain_hook.so`, `libgsl_alloc_hook.so`,
+    `libfile_redirect_hook.so` — libadrenotools (custom Vulkan driver loading)
+- `build.gradle` — library module `org.dolphinemu.dolphinemu`; native build is opt-in
+  via `-Pdolphin.buildNative=true` until the pipeline is proven; otherwise packages
+  `prebuilt/emucore/`.
+- Emulation runs in the `:gc` process via
+  `org.dolphinemu.dolphinemu.wn.DolphinEmulationActivity` (WinNative-owned; no
+  upstream fragments/menus).
+
+## Phases
+
+Status 2026-07-22: Phases 1–5 done and verified on-device (CPH2749): TP GC boots on
+Vulkan crash-free, input proven via chained input-only transitions, settings bridge
+verified both directions (stretch applied / auto restored), and **Turnip verified on
+Adreno 840** — WN-Turnip-1.06 staged via wn.gc.driver → GpuDrivers/Extracted,
+libvulkan_freedreno.so confirmed mapped in-process, clean rendering. GPU Driver
+pickers live on both GC/Wii settings surfaces.
+
+Phases 6–7 (2026-07-22, verified on-device): DolphinGameOverlay attaches the shared
+WinNative RetroInputView (GC/Wii themes) + drawer menu via the DolphinHost hook
+(Ps2GameOverlay pattern; PluviaApp installs in every process, :gc gets light init).
+Verified: overlay renders over the game, drawer opens, save state wrote GZ2E01.s01,
+Exit → StopEmulation → clean finish. Routing: GC/Wii launches go to embedded Dolphin
+in both launch paths behind `wn.gc.embedded` (default true; off = libretro fallback).
+Settings parity pass (2026-07-22, compile-verified; device was disconnected):
+- **In-game drawer** now has Menu (save/load slots 1–3 with timestamps, Screenshot,
+  HUD toggle, Pause/Exit) + Display (ALL GC/Wii core options, live via
+  applyVariable → INI rewrite → ReloadConfig) + Sound (audio toggle → [DSP] Muted)
+  + Controls (touch on/off, haptic, edit/reset layout; back exits edit mode).
+- **Settings hierarchy verified**: Console default (Settings > Retro,
+  `retro_def_var_<sys>_<key>` / `retro_def_*`) → Shortcut extra (`retro_var_*` /
+  `retro_*`) → launch (resolvedCoreVariables + wn_touch/wn_audio/wn_hud) → in-game
+  changes apply live AND persist back to the shortcut. GPU driver = `wn.gc.driver`
+  (global for GC+Wii, PS2 pattern).
+- **VBI Skip now has a UI toggle** (GC + Wii lists, default On).
+- **HUD** maps to Dolphin's native OSD (ShowFPS/VPS/Speed); audio to [DSP] Muted.
+- Shader/SGSR/upscale (libretrodroid-only) are hidden on both static surfaces for
+  GC/Wii while embedded is enabled; they reappear if `wn.gc.embedded` is off.
+- Known quirk: Shortcut Settings save() snapshots ALL option values into the
+  shortcut (pre-existing behavior for every console) — after first save, console
+  defaults no longer flow to that shortcut.
+
+Start/teardown lifecycle (2026-07-22, compile-verified): the Dolphin core cannot
+reliably boot twice in one process, so :gc follows the ARMSX2 model — fresh process
+per session. `teardown()` (idempotent; Exit button, back press, Run() returning, and
+onDestroy-when-finishing all funnel into it) does StopEmulation → join the Run thread
+(≤15s, so memcards/saves flush) → delete `.running_rom` marker → finish() → kill the
+:gc process. onPause/onResume skip pausing while stopping (no pause-during-shutdown
+races). Launch side: the game activity now JOINS the Library task (NEW_TASK only from
+non-activity contexts) so exiting lands back on the Library; `prepareLaunch` kills a
+lingering :gc before starting UNLESS the `.running_rom` marker matches the requested
+ROM (tapping Play on the running game resumes instead of restarting).
+
+Drawer parity + shared-source pass (2026-07-22, compile-verified):
+- GC/Wii drawer now uses the FULL shared tab set via `RetroDrawerTabs.build`
+  (Menu / Display / HUD / Sound / Controls; netplay correctly absent).
+- **Memory Card save UI**: Save/Load State from the main menu opens the shared
+  SaveSlot-card pane (RetroPane.SAVES) with 4 native Dolphin slots titled
+  "Memory Card N" + timestamps — same cards/flow as every other console.
+- **Controls pane extracted to `RetroControlsMenu`** — single source used by BOTH
+  RetroActivity (all libretro consoles, incl. the PSX-inversion gate) and the
+  Dolphin overlay: touch toggle, **adaptive sticks (now on GC/Wii too — wn_adaptive
+  rides the launch vars)**, haptics, edit/reset layout, and the four button-color
+  pickers + reset.
+- **HUD tab**: shared `RetroHudSupport.buildHudEntries` + FrameRating with new
+  shared container-JSON persistence (`loadContainerHudSettings`/`save…`); master
+  toggle also drives Dolphin's native OSD (ShowFPS/VPS/Speed). FPS/graph elements
+  default off for Dolphin (no per-frame Java callback; native OSD covers it).
+- Remaining dedup candidate: RetroActivity still has its older inline HUD-JSON
+  load/save — same schema as the new shared funcs; migrate it next pass.
+
+Settings surfaces + persistence pass 2 (compile-verified):
+- Shortcut Settings now has a HUD tab for ALL retro consoles (shared
+  RetroLibretroHudSection: global master + element toggles; PS2 keeps its own).
+- GPU Driver moved to the TOP of Graphics (shortcut dialog) and top of the
+  expanded GC/Wii console-defaults section (extracted DolphinGpuDriverDropdown).
+- Persistence model: HUD is now UNIVERSAL (global prefs: retro_def_hud_global +
+  retro_hud_style/elements) — one HUD everywhere, edited from any surface or
+  in-game; per-shortcut KEY_HUD no longer read. Per-game: core options, touch
+  controls, adaptive sticks, audio, shader/upscale (libretro). Per-console:
+  L3/R3 visibility, console defaults. RetroActivity + Dolphin overlay both load/
+  save the global HUD store (container-JSON path retired to legacy).
+
+Open items: overlay polish (FrameRating-style HUD, touch-IR for Wii ir_mode,
+controller-connected hiding, playtime/cloud hooks), RetroAchievements for the
+embedded path, defaults tuning (dual core ON), retiring the libretro dolphin core
+after parity sign-off. On-device retest checklist when phone reconnects: drawer tabs
+render + live-apply (aspect change visible), audio mute, HUD OSD, VBI toggle,
+touch-controls hide, edit-layout back handling, Play-button routing end-to-end.
+
+1. **Scaffold** (done): module, build script, manifest, stub activity, app wiring.
+2. **Emucore + JNI surface**: build `libmain.so`; vendor the minimal Java classes
+   Dolphin's `IDCache`/JNI_OnLoad requires (`NativeLibrary`, `NativeConfig`,
+   `GpuDriverHelper`, model classes); patch `IDCache` to drop upstream-UI-only classes.
+3. **DolphinEmulationActivity**: SurfaceView → `NativeLibrary.SurfaceChanged`,
+   `Run(rom)`, pause/resume, input forwarding, clean shutdown.
+4. **Settings bridge**: generate `User/Config/Dolphin.ini` + `GFX.ini` from WinNative
+   prefs pre-boot (renderer=Vulkan, IR scale, aspect, dual core, JIT, skip BIOS,
+   widescreen, sensor bar, IR mode, cheats); live updates via `NativeConfig` where
+   safe. Same keys/surfaces as the current GC/Wii settings (RetroCoreOptions ids map
+   1:1 onto Dolphin ini keys).
+5. **GPU driver**: reuse `CustomDriver` Turnip packs through Dolphin's
+   `GpuDriverHelper`; per-console `wn.gc.driver` pref; default system Vulkan.
+6. **Overlay**: `DolphinGameOverlay` (Ps2GameOverlay analogue) — RetroInputView touch
+   overlay, WinNative drawer (save states via `NativeLibrary.SaveState/LoadState`,
+   live settings, HUD, cheats), playtime stats, exit cloud backup.
+7. **Routing**: `RetroShortcuts.launch` sends gc/wii to the embedded activity (toggle
+   first, libretro fallback until parity); settings surfaces switch to the Dolphin
+   sections; decide native RetroAchievements vs RetroAchievementsManager.
+
+## Phase 2 analysis (done)
+
+Authoritative JNI-required Java surface (every `FindClass` under `Source/Android/jni/`),
+30 classes — all model/util, **no upstream UI**:
+
+- `NativeLibrary`
+- cheats models: `ARCheat`, `GeckoCheat`, `PatchCheat`, `GraphicsMod`, `GraphicsModGroup`
+- input models: `controlleremu/{Control, ControlGroup, ControlGroupContainer,
+  ControlReference, EmulatedController, NumericSetting}`, `CoreDevice(+$Control)`,
+  `InputDetector`
+- netplay: `NetplaySession`, `model/Player`
+- `riivolution/model/RiivolutionPatches`, `skylanders/model/SkylanderPair`
+- `model/GameFile`, `model/GameFileCache`
+- utils: `Analytics`, `AudioUtils`, `BooleanSupplier`, `CompressCallback`,
+  `ContentHandler`, `NetworkHelper`, `PermissionsHandler`, `WiiUpdateCallback`
+- plus `utils/GpuDriverHelper` (static-native Kotlin side of the adrenotools bridge;
+  native impl `jni/GpuDriver.cpp` calls `adrenotools_*` directly — Phase 5 hook point)
+
+Naive transitive closure is 92 files because a few bridge classes import the UI web.
+Patch these cut points (in `patches/`), then the closure collapses to ~50 UI-free files:
+
+1. `NativeLibrary.kt` — replace `EmulationActivity`/`AlertMessage` references with a
+   `WnHost` callback interface our activity registers (alerts, exit, orientation,
+   title changes). This IS the B2 design: UI callbacks go to WinNative.
+2. `utils/Analytics.kt` — strip the `FragmentActivity` dialog method (analytics is
+   compiled out with `-DENABLE_ANALYTICS=OFF`).
+3. `NetplaySession.kt` — sever imports of netplay UI (`NetplaySetupActivity`,
+   viewmodels) if present; keep the session/Player model.
+4. `Settings.kt`/`NativeConfig` chain — sever `SettingsActivity`/`MenuTag` imports.
+5. Drop `DolphinApplication` (not JNI-required); our module provides directory init
+   via `DirectoryInitialization` directly.
+6. Skylander/Infinity `ui/` adapters fall out once `EmulationActivity` is cut.
+
+Vendoring mechanism: gradle Copy task from `emucore-src/.../java` (post-patch) into
+`build/generated/dolphinJava`, added as a srcDir — no duplicated sources in-repo.
+
+## MMJR2 fork review (2026-07-22)
+
+Reviewed Medard22/Dolphin-MMJR2-VBI, nachoverdon/Dolphin-MMJR2, Mato00KAN/Dolphin-MMJR2
+for patches worth adopting:
+
+- **VBI Skip (the headline MMJR2-VBI feature, by Sam Belliveau) is already in our
+  pinned upstream base** — it was upstreamed into official Dolphin: `bVISkip`
+  (VideoConfig.h:307), adaptive gate `CoreTiming::UpdateVISkip/GetVISkip` (only skips
+  when the core runs behind real time; auto-off under determinism/netplay), interrupt
+  suppression in VideoInterface.cpp:986. Config: `GFX.ini [Hacks] VISkip`; vendored
+  `BooleanSetting.GFX_HACK_VI_SKIP` already exposes it to our bridge. Nothing to port.
+  **Phase 4: expose as a WinNative "VBI Skip (auto frameskip)" toggle, default ON**
+  (adaptive — no cost at full speed; this is the MMJR2 "runs better" effect).
+- The other two forks are "MMJR2 rebased onto latest official dev source with the old
+  MMJR UI and no scoped storage" — both properties irrelevant to us (we build current
+  master, strip all Dolphin UI, and own the data paths via SetUserDirectory).
+- No other distinguishing native patches found worth carrying; MMJR-style value comes
+  from *defaults*, which our settings bridge already curates (JITARM64, DSP-HLE,
+  EFB-to-texture, sync shaders, + VISkip on).
+
+## Notes
+
+- The libretro core (`libdolphin_libretro_android.so`) stays in place until Phase 7
+  parity, then is removed along with its jniLibs entry.
+- ARMSX2 reference costs: 17k LOC bridge, 1.3k LOC overlay — expect the same order.
+
+Cloud-save bucket fix (2026-07-22): the real reason Save History was blank for
+ALL retro consoles — auto-upload used cloudGameId ("retro_gc_<name>") but the
+History UI and manual backup query under customGameId ("<containerId>:<file>.desktop")
+= two different Google buckets, so nothing ever appeared. Worse, backupSaveToGoogle
+resolves the save DIR from the gameId (getCustomSaveSources → findShortcut →
+retroSaveDir); a cloudGameId resolves no shortcut, so it found no files and
+silently uploaded nothing. Fix: everything now uploads/restores under customGameId
+(same as the working PS2 path). retroSaveDir extended to return the full per-game
+set: PS2=memcards, GC/Wii=DolphinCloudSync staging (states+GC memcards), other
+libretro=RetroSaveStates.gameDir (states+sram). Internal staging dir stays keyed
+by cloudGameId (a stable path token) while the Google bucket uses customGameId —
+the two IDs have distinct roles. findCustomShortcutByContainerAndFile resolves
+retro shortcuts via loadShortcuts() (retroContainer id 0), confirmed.
diff --git a/cores/DOLPHIN_VULKAN.md b/cores/DOLPHIN_VULKAN.md
new file mode 100644
index 000000000..2a18179b9
--- /dev/null
+++ b/cores/DOLPHIN_VULKAN.md
@@ -0,0 +1,154 @@
+# Scope: routing Dolphin (GC/Wii) through Vulkan + Turnip
+
+> **Packaging note (current):** the emucore and its runtime data are no longer committed
+> here. They are built in the [WinNative-Emu](https://github.com/WinNative-Emu) fork and
+> shipped in the [Retro-Consoles](https://github.com/WinNative-Emu/Retro-Consoles) bundle
+> the app downloads at runtime. The build/patch details below describe how that fork
+> produces the binary and remain accurate for the fork.
+
+## Why
+
+On Snapdragon 8 Elite Gen 5 / Adreno 840 (device CPH2749, driver `libGLESv2_adreno.so`
+v0842.41), the Dolphin libretro core reliably SIGSEGVs ~13s into 3D rendering:
+
+```
+#00 __memmove_aarch64_nt        libc.so
+#01 libGLESv2_adreno.so +9444   ← system Adreno GLES driver faults
+#02..#08 libdolphin_libretro_android.so   ← Dolphin OGL backend
+#09 <anonymous>                 ← JITARM64 game code (single-core, "CPU-GPU thread")
+```
+
+The fault is *inside* the system Adreno GLES driver's vertex-streaming path — not app
+code, and not fixable from our GLES side. The durable fix is to stop using the GLES
+backend for Dolphin and use its Vulkan backend instead, optionally on the Turnip
+(Mesa) driver, which the app already ships for PS2/Wine.
+
+## What we confirmed
+
+- **Core is Vulkan-ready.** The prebuilt `.so` contains the full Vulkan backend
+  (`VKGfx`/`VKSwapChain`/`VulkanContext`/`VulkanLoader`) AND the libretro Vulkan HW
+  interface shim (`DolphinLibretro/Vulkan.cpp`). `HAS_VULKAN` is on.
+- **Core contract (RetroArch Vulkan model):** on `GET_PREFERRED_HW_RENDER` returning
+  `RETRO_HW_CONTEXT_VULKAN`, the core:
+  1. `SET_HW_RENDER` with `context_type = VULKAN`, `version = VK_API_VERSION_1_0`.
+  2. `SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE` → gives us
+     `retro_hw_render_context_negotiation_interface_vulkan` (`GetApplicationInfo`,
+     `CreateDevice`). The **frontend creates the `VkInstance`**, the **core creates the
+     `VkDevice`** (picks GPU, features, extensions) via its `CreateDevice`.
+  3. On `context_reset`, core calls `GET_HW_RENDER_INTERFACE` expecting a
+     `retro_hw_render_interface_vulkan` from us (instance, gpu, device, queue,
+     `get_*_proc_addr`, `set_image`, `set_command_buffers`, `lock/unlock_queue`,
+     `get_sync_index`, `wait_sync_index`).
+  4. Each frame: core renders into its own `VkImage`, calls `set_image(...)`; the
+     frontend presents it.
+- **The blocker is 100% frontend.** libretrodroid is GLES-only:
+  - `GLRetroView` extends Android `GLSurfaceView` + `setEGLContextClientVersion(3)`
+    (`GLRetroView.kt:50,90`). GLSurfaceView cannot host Vulkan.
+  - `environment.cpp:265` hardcodes `GET_PREFERRED_HW_RENDER = OPENGLES3`;
+    `libretrodroid.cpp:369` rejects anything that isn't GLES3.
+  - The compositor (shader chain: Default/CRT/LCD/Sharp/SGSR, viewport, rotation,
+    aspect) is entirely GLES (`video.cpp`, `renderers/es3/*`, `ShaderManager`).
+- **Turnip plumbing already exists.** `app/src/main/cpp/adrenotools/` +
+  `com.armsx2.CustomDriver` download `libvulkan_freedreno.so` and
+  `adrenotools_open_libvulkan(...)` returns a hooked `libvulkan.so`. PS2/ARMSX2 already
+  uses it. A retro Vulkan backend would load its instance through the same handle.
+
+## Work required
+
+### Route A — add a Vulkan HW-render backend to libretrodroid (the "proper" fix)
+
+**A1. Surface / thread (structural).** Replace GLSurfaceView with a plain `SurfaceView`
++ `ANativeWindow` and a manual render thread for the Dolphin path. libretrodroid assumes
+GLSurfaceView + GLThread + EGL throughout; this must become backend-selectable at launch
+(new `GLRetroViewData` flag), keeping every other core on the untouched GLES path.
+*Largest structural risk.*
+
+**A2. Vulkan HW interface (`libretro_vulkan.h`).** New native module (~1500–2500 LOC,
+comparable to a scoped-down RetroArch `vulkan_common.c`):
+- Create `VkInstance` (via adrenotools/Turnip handle or system libvulkan).
+- Accept VULKAN in `SET_HW_RENDER`; store the negotiation interface; run negotiation
+  (`CreateDevice`) → device, queues, `VkSurfaceKHR` from the ANativeWindow.
+- Implement the full `retro_hw_render_interface_vulkan` (set_image, queue locking,
+  sync-index tracking, command buffers).
+- Swapchain create/recreate/present; receive the core `VkImage` and blit/letterbox to
+  the swapchain.
+- Drive `context_reset`/`context_destroy` on the Vulkan timeline.
+
+**A3. Compositor.** GLES shader chain does not run in Vulkan mode. Minimum viable:
+present the core image directly with correct aspect/rotation/viewport (Dolphin has its
+own internal-res scaling; shaders/SGSR are a nicety). Full parity = SPIR-V ports of the
+shader passes (large; defer).
+
+**A4. Turnip wiring (mostly done).** Reuse `adrenotools_open_libvulkan`; add a Dolphin
+GPU-driver picker mirroring the PS2 one (`RetroDefaultsScreen`/`RetroGameSettings`
+already have the pattern) → new pref, e.g. `retro_def_var_gc_driver` / `_wii_`.
+
+**A5. Routing / settings.** Only GC/Wii use the Vulkan backend; add the driver picker
+(System Vulkan vs installed Turnip) to the three GC/Wii settings surfaces.
+
+### Route B — embed standalone Dolphin (mirror the PS2/ARMSX2 pattern)
+
+Instead of retrofitting a GLES-only libretro frontend, embed a standalone Dolphin build
+(its own Vulkan renderer + adrenotools, own SurfaceView, separate process) exactly like
+ARMSX2 is embedded for PS2 (`NativeApp.renderVulkan()`, `CustomDriver`, `Ps2GameOverlay`).
+- **Pro:** reuses the *working* PS2 Turnip path; no fork of libretrodroid; Dolphin's own
+  mature Vulkan+driver handling.
+- **Con:** a second Dolphin engine to ship/maintain; GC/Wii lose the libretro features
+  wired this session (RetroAchievements incl. hardcore, netplay, unified save-states,
+  shared retro UI/overlays) unless re-bridged.
+
+## Route B in detail (embed standalone Dolphin, mirror ARMSX2/PS2)
+
+**Reference cost — what the ARMSX2/PS2 embed actually is (measured in-repo):**
+- `armsx2/emucore-src` = **5.9 GB** source (a PCSX2 fork), built from source via
+  `build-emucore.sh` (git clone + NDK/CMake/ninja).
+- **17,382 LOC** Kotlin/Java bridge in `armsx2/src/main/java`.
+- `Ps2GameOverlay.kt` alone = **1,341 LOC** — just the overlay + settings/achievements/
+  OSD/dev9 bridge that maps the WinNative drawer onto the native emu.
+- Its own `:ps2` process activity (`com.armsx2.Main`) + a large `NativeApp` JNI surface
+  (settings, achievements, OSD, patches, netplay).
+
+A `:dolphin` module is the **same class of effort** (vendor a multi-GB emulator, JNI,
+process, overlay). The mitigating fact: **upstream Dolphin already has, natively,**
+Vulkan, adrenotools/Turnip ("GPU Driver Manager" in Graphics settings — K0bin's
+libadrenotools integration), RetroAchievements (incl. hardcore), netplay, save
+states/memcards/Wii saves, and AR/Gecko cheats. So Dolphin gives the *features* for free;
+the cost is the *bridge/UX*, which splits Route B in two:
+
+- **B1 — bolt-on (small bridge).** Launch GC/Wii into Dolphin's *own* Android UI (reuse
+  the `launchEmbeddedPs2` hand-off pattern; pass ROM + driver). Cheapest path to a
+  working, non-crashing, Turnip-capable GC/Wii. **But** it *discards this session's entire
+  WinNative GC/Wii integration* (shared drawer, HUD, `RetroInputView` overlays, the
+  settings just wired, libretro RetroAchievements/netplay) — GC/Wii would look and behave
+  like a different app, and you maintain a second full emulator + its multi-GB build.
+- **B2 — unified (ARMSX2-scale bridge).** Embed Dolphin's core and rebuild the WinNative
+  drawer/HUD/overlay/settings bridge on top (the ~10k-LOC `Ps2GameOverlay`+`NativeApp`
+  analogue). Preserves UX parity; **largest effort of all options.**
+
+**Key contrast with Route A:** Route A swaps only the render backend *under* libretrodroid,
+so it **keeps 100% of this session's WinNative GC/Wii work** (menus, overlays, HUD,
+achievements, netplay) — only rendering changes. Route B1 throws that away; Route B2
+rebuilds it.
+
+## Risks to validate BEFORE building (cheap gates)
+
+1. **Does system Vulkan alone dodge the crash?** Turnip may be unnecessary — just moving
+   Dolphin off the GLES backend onto the stock Adreno *Vulkan* driver may fix it. If so,
+   Route A without Turnip is the fix and Turnip is optional polish.
+2. **Does Turnip support Adreno 840 (A8xx / SM8850 "canoe")?** Mesa/Turnip lags on newest
+   silicon. **Cheap check: run a PS2 title with a Turnip driver on THIS device** — if PS2
+   renders on Turnip, A840 Turnip works and Route A/B-with-Turnip is viable here.
+3. **libretrodroid is third-party (swordfish).** A Vulkan backend is a hard fork; future
+   upstream merges get harder. Route B avoids this.
+
+## Recommendation
+
+- Gate first (risks 1 & 2) — a few minutes, no code: try Dolphin `renderer=Software`
+  (proves GPU driver is the culprit) and a PS2+Turnip run (proves A840 Turnip).
+- If system Vulkan fixes it: **Route A** is the clean long-term answer but is a
+  multi-week, ~2–4k-LOC native effort with the GLSurfaceView→Vulkan structural change as
+  the main risk. **Route B** is likely less code and directly reuses the proven PS2 path,
+  at the cost of a second engine and re-bridging libretro features.
+- Recommended sequence: validate gates → prototype Route A's Vulkan instance-on-Turnip +
+  present-only compositor (no shaders) behind a launch flag for GC/Wii only → measure
+  stability → decide whether to invest in the full compositor or pivot to Route B.
diff --git a/dolphin/.gitignore b/dolphin/.gitignore
new file mode 100644
index 000000000..6d737ee8e
--- /dev/null
+++ b/dolphin/.gitignore
@@ -0,0 +1,3 @@
+emucore-src/
+emucore-out/
+build/
diff --git a/dolphin/build.gradle b/dolphin/build.gradle
new file mode 100644
index 000000000..87b5cac54
--- /dev/null
+++ b/dolphin/build.gradle
@@ -0,0 +1,51 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'org.dolphinemu.dolphinemu'
+    compileSdk 35
+    ndkVersion '27.3.13750724'
+
+    defaultConfig {
+        minSdk 26
+        ndk {
+            abiFilters 'arm64-v8a'
+        }
+        buildConfigField 'String', 'APPLICATION_ID', '"org.dolphinemu.dolphinemu.wn"'
+    }
+
+    buildFeatures {
+        buildConfig true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    packaging {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+
+    def dolphinVendorOut = file("$projectDir/vendored/java")
+
+    sourceSets {
+        main {
+            java.srcDirs += dolphinVendorOut
+        }
+    }
+
+}
+
+dependencies {
+    implementation libs.coreKtx
+    implementation libs.activityKtx
+    implementation libs.appcompat
+}
diff --git a/dolphin/src/main/AndroidManifest.xml b/dolphin/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..ac1c7ebb0
--- /dev/null
+++ b/dolphin/src/main/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:largeHeap="true">
+        <activity
+            android:name="org.dolphinemu.dolphinemu.wn.DolphinEmulationActivity"
+            android:process=":gc"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:screenOrientation="sensorLandscape"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode|density"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+        <service android:name="org.dolphinemu.dolphinemu.services.USBPermService" android:process=":gc" android:exported="false" />
+    </application>
+</manifest>
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt
new file mode 100644
index 000000000..e6f0b482d
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt
@@ -0,0 +1,20 @@
+package org.dolphinemu.dolphinemu
+
+import android.content.Context
+
+/** WinNative replacement: vendored upstream classes call
+ *  DolphinApplication.getAppContext(); the host app (or DolphinEmulationActivity)
+ *  installs the context before any Dolphin code runs. */
+object DolphinApplication {
+    @Volatile
+    private var appContext: Context? = null
+
+    @JvmStatic
+    fun install(context: Context) {
+        appContext = context.applicationContext
+    }
+
+    @JvmStatic
+    fun getAppContext(): Context =
+        appContext ?: error("DolphinApplication.install() not called")
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
new file mode 100644
index 000000000..3d1335a35
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
@@ -0,0 +1,166 @@
+package org.dolphinemu.dolphinemu
+
+import android.view.Surface
+import androidx.annotation.Keep
+
+/** WinNative replacement matching upstream's JNI contract; UI callbacks route
+ *  to the registered [WnHost]. */
+object NativeLibrary {
+    object ButtonType {
+        const val WIIMOTE_BUTTON_A = 100
+    }
+
+    interface WnHost {
+        fun onToast(message: String, long: Boolean)
+
+        fun onAlert(
+            caption: String,
+            text: String,
+            yesNo: Boolean,
+            isWarning: Boolean,
+            nonBlocking: Boolean,
+        ): Boolean
+
+        fun onUpdateTouchPointer()
+
+        fun onTitleChanged()
+
+        fun onEmulationFinished()
+    }
+
+    @Volatile
+    var host: WnHost? = null
+
+    @Volatile
+    var frameListener: Runnable? = null
+
+    @Keep
+    @JvmStatic
+    fun onGameFrame() {
+        frameListener?.run()
+    }
+
+    @Keep
+    @JvmStatic
+    fun displayToastMsg(message: String, long: Boolean) {
+        host?.onToast(message, long)
+    }
+
+    @Keep
+    @JvmStatic
+    fun displayAlertMsg(
+        caption: String,
+        text: String,
+        yesNo: Boolean,
+        isWarning: Boolean,
+        nonBlocking: Boolean,
+    ): Boolean = host?.onAlert(caption, text, yesNo, isWarning, nonBlocking) ?: true
+
+    @Keep
+    @JvmStatic
+    fun updateTouchPointer() {
+        host?.onUpdateTouchPointer()
+    }
+
+    @Keep
+    @JvmStatic
+    fun onTitleChanged() {
+        host?.onTitleChanged()
+    }
+
+    @Keep
+    @JvmStatic
+    fun finishEmulationActivity() {
+        host?.onEmulationFinished()
+    }
+
+    @Keep
+    @JvmStatic
+    fun getRenderSurfaceScale(): Float =
+        android.content.res.Resources.getSystem().displayMetrics.density
+
+    @JvmStatic external fun Initialize()
+
+    @JvmStatic external fun ReloadConfig()
+
+    @JvmStatic external fun ReloadLoggerConfig()
+
+    @JvmStatic external fun SetUserDirectory(directory: String)
+
+    @JvmStatic external fun GetUserDirectory(): String
+
+    @JvmStatic external fun SetCacheDirectory(directory: String)
+
+    @JvmStatic external fun SetObscuredPixelsLeft(width: Int)
+
+    @JvmStatic external fun SetObscuredPixelsTop(height: Int)
+
+    @JvmStatic external fun SurfaceChanged(surf: Surface)
+
+    @JvmStatic external fun SurfaceDestroyed()
+
+    @JvmStatic external fun HasSurface(): Boolean
+
+    @JvmStatic external fun Run(path: Array<String>, riivolution: Boolean)
+
+    @JvmStatic external fun Run(
+        path: Array<String>,
+        riivolution: Boolean,
+        savestatePath: String,
+        deleteSavestate: Boolean,
+    )
+
+    @JvmStatic external fun RunNetPlay(
+        path: Array<String>,
+        riivolution: Boolean,
+        bootSessionDataPointer: Long,
+    )
+
+    @JvmStatic external fun RunSystemMenu()
+
+    @JvmStatic external fun ChangeDisc(path: String)
+
+    @JvmStatic external fun PauseEmulation()
+
+    @JvmStatic external fun UnPauseEmulation()
+
+    @JvmStatic external fun StopEmulation()
+
+    @JvmStatic external fun IsRunning(): Boolean
+
+    @JvmStatic external fun IsRunningAndUnpaused(): Boolean
+
+    @JvmStatic external fun IsUninitialized(): Boolean
+
+    @JvmStatic external fun IsEmulatingWiiUnchecked(): Boolean
+
+    @JvmStatic external fun GetCurrentTitleDescriptionUnchecked(): String
+
+    @JvmStatic external fun GetCurrentGameIDUnchecked(): String
+
+    @JvmStatic external fun SetIsBooting()
+
+    @JvmStatic external fun SaveState(slot: Int, wait: Boolean)
+
+    @JvmStatic external fun SaveStateAs(path: String, wait: Boolean)
+
+    @JvmStatic external fun LoadState(slot: Int)
+
+    @JvmStatic external fun LoadStateAs(path: String)
+
+    @JvmStatic external fun GetUnixTimeOfStateSlot(slot: Int): Long
+
+    @JvmStatic external fun SaveScreenShot()
+
+    @JvmStatic external fun RefreshWiimotes()
+
+    @JvmStatic external fun GetGitRevision(): String
+
+    @JvmStatic external fun GetVersionString(): String
+
+    @JvmStatic external fun DefaultCPUCore(): Int
+
+    @JvmStatic external fun GetGameAspectRatio(): Float
+
+    @JvmStatic external fun GetDefaultGraphicsBackendConfigName(): String
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.kt
new file mode 100644
index 000000000..43b0b1053
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.kt
@@ -0,0 +1,9 @@
+package org.dolphinemu.dolphinemu.overlay
+
+/** WinNative stub: only the IR-mode constants vendored settings code references.
+ *  The real touch pointer is driven by WinNative's overlay via InputOverrider. */
+object InputOverlayPointer {
+    const val MODE_DISABLED = 0
+    const val MODE_FOLLOW = 1
+    const val MODE_DRAG = 2
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt
new file mode 100644
index 000000000..901568439
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt
@@ -0,0 +1,9 @@
+package org.dolphinemu.dolphinemu.utils
+
+import androidx.annotation.Keep
+
+object Analytics {
+    @Keep
+    @JvmStatic
+    fun getValue(key: String): String = ""
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.kt
new file mode 100644
index 000000000..b0cb4493e
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.kt
@@ -0,0 +1,58 @@
+package org.dolphinemu.dolphinemu.utils
+
+import android.content.Context
+import java.io.File
+
+object DirectoryInitialization {
+    @JvmStatic
+    external fun SetSysDirectory(path: String)
+
+    @JvmStatic
+    external fun SetGpuDriverDirectories(path: String, libPath: String)
+
+    fun userDir(context: Context): File = File(context.filesDir, "dolphin-embed/User")
+
+    @Volatile
+    private var sysDirSet = false
+
+    fun ensureDirectories(context: Context): File {
+        val sysDir = File(context.filesDir, "dolphin-embed/Sys")
+        val marker = File(sysDir, ".wn_sys_ready")
+        if (!marker.isFile) {
+            val bundled = File(context.filesDir, "retro/bundle/data/dolphin-emu/Sys")
+            val copied = runCatching { bundled.copyRecursively(sysDir, overwrite = true) }.getOrDefault(false)
+            if (copied) marker.writeText("1")
+        }
+        if (!sysDirSet) {
+            sysDirSet = true
+            SetSysDirectory(sysDir.path + File.separator)
+            val driverRoot = File(context.filesDir, "dolphin-embed/GpuDrivers")
+            File(driverRoot, "Extracted").mkdirs()
+            File(driverRoot, "Tmp").mkdirs()
+            File(driverRoot, "FileRedirect").mkdirs()
+            SetGpuDriverDirectories(driverRoot.path, context.applicationInfo.nativeLibraryDir)
+        }
+        val user = userDir(context)
+        File(user, "Config").mkdirs()
+        return user
+    }
+
+    fun writeBaseConfig(userDir: File) {
+        val ini = File(userDir, "Config/Dolphin.ini")
+        if (!ini.isFile) {
+            ini.writeText(
+                """
+                [Core]
+                GFXBackend = Vulkan
+                """.trimIndent() + "\n",
+            )
+        }
+        File(userDir, "Config/Logger.ini").writeText(
+            """
+            [Options]
+            Verbosity = 2
+            WriteToConsole = True
+            """.trimIndent() + "\n",
+        )
+    }
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/FileBrowserHelper.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/FileBrowserHelper.kt
new file mode 100644
index 000000000..c3be9c492
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/FileBrowserHelper.kt
@@ -0,0 +1,12 @@
+package org.dolphinemu.dolphinemu.utils
+
+object FileBrowserHelper {
+    @JvmStatic
+    fun getExtension(fileName: String?, forceLowerCase: Boolean): String? {
+        if (fileName == null) return null
+        val dot = fileName.lastIndexOf('.')
+        if (dot < 0 || dot == fileName.length - 1) return null
+        val ext = fileName.substring(dot + 1)
+        return if (forceLowerCase) ext.lowercase() else ext
+    }
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/PermissionsHandler.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/PermissionsHandler.kt
new file mode 100644
index 000000000..70c539138
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/utils/PermissionsHandler.kt
@@ -0,0 +1,31 @@
+package org.dolphinemu.dolphinemu.utils
+
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.pm.PackageManager
+import androidx.annotation.Keep
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+
+object PermissionsHandler {
+    const val REQUEST_RECORD_AUDIO = 900
+
+    @Keep
+    @JvmStatic
+    fun hasRecordAudioPermission(context: Context?): Boolean =
+        context != null &&
+            ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
+            PackageManager.PERMISSION_GRANTED
+
+    @Keep
+    @JvmStatic
+    fun requestRecordAudioPermission(activity: Activity?) {
+        if (activity == null) return
+        ActivityCompat.requestPermissions(
+            activity,
+            arrayOf(Manifest.permission.RECORD_AUDIO),
+            REQUEST_RECORD_AUDIO,
+        )
+    }
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinConfigWriter.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinConfigWriter.kt
new file mode 100644
index 000000000..f9094e8a1
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinConfigWriter.kt
@@ -0,0 +1,87 @@
+package org.dolphinemu.dolphinemu.wn
+
+import java.io.File
+
+object DolphinConfigWriter {
+    fun write(userDir: File, vars: Map<String, String>) {
+        val core = linkedMapOf<String, String>()
+        core["GFXBackend"] =
+            if (vars["dolphin_renderer"] == "Software") "Software Renderer" else "Vulkan"
+        core["CPUCore"] = vars["dolphin_cpu_core"]?.toIntOrNull()?.toString() ?: "4"
+        core["CPUThread"] = ini(vars["dolphin_main_cpu_thread"] == "enabled")
+        core["SkipIPL"] = ini(vars["dolphin_skip_gc_bios"] != "disabled")
+        core["EnableCheats"] = ini(vars["dolphin_cheats_enabled"] == "enabled")
+        core["DSPHLE"] = ini(vars["dolphin_dsp_hle"] != "disabled")
+        core["FastDiscSpeed"] = ini(vars["dolphin_fast_disc_speed"] == "enabled")
+        mergeIni(File(userDir, "Config/Dolphin.ini"), "Core", core)
+
+        val dsp = linkedMapOf<String, String>()
+        dsp["Muted"] = ini(vars["wn_audio"] == "0")
+        mergeIni(File(userDir, "Config/Dolphin.ini"), "DSP", dsp)
+
+        val gfxSettings = linkedMapOf<String, String>()
+        gfxSettings["InternalResolution"] =
+            vars["dolphin_efb_scale"]?.toIntOrNull()?.coerceIn(1, 6)?.toString() ?: "1"
+        gfxSettings["AspectRatio"] =
+            vars["dolphin_aspect_ratio"]?.toIntOrNull()?.coerceIn(0, 6)?.toString() ?: "0"
+        gfxSettings["wideScreenHack"] = ini(vars["dolphin_widescreen_hack"] == "enabled")
+        gfxSettings["DriverLibName"] = vars["dolphin_gpu_driver_lib"].orEmpty()
+        gfxSettings["ShowFPS"] = "False"
+        gfxSettings["ShowVPS"] = "False"
+        gfxSettings["ShowSpeed"] = "False"
+        mergeIni(File(userDir, "Config/GFX.ini"), "Settings", gfxSettings)
+
+        val gfxHacks = linkedMapOf<String, String>()
+        gfxHacks["VISkip"] = ini(vars["dolphin_vi_skip"] != "disabled")
+        mergeIni(File(userDir, "Config/GFX.ini"), "Hacks", gfxHacks)
+
+        vars["dolphin_log_verbosity"]?.toIntOrNull()?.let { level ->
+            mergeIni(File(userDir, "Config/Logger.ini"), "Options", mapOf("Verbosity" to level.toString()))
+        }
+    }
+
+    fun wiiWidescreen(vars: Map<String, String>): Boolean = vars["dolphin_widescreen"] != "disabled"
+
+    fun sensorBarTop(vars: Map<String, String>): Boolean = vars["dolphin_sensor_bar_position"] == "1"
+
+    private fun ini(value: Boolean) = if (value) "True" else "False"
+
+    private fun mergeIni(file: File, section: String, keys: Map<String, String>) {
+        val source = if (file.isFile) file.readText() else ""
+        val lines = source.replace("\r\n", "\n").split('\n').toMutableList()
+        val header = "[$section]"
+        var start = lines.indexOfFirst { it.trim().equals(header, ignoreCase = true) }
+        if (start < 0) {
+            val builder = StringBuilder(source.trimEnd())
+            if (builder.isNotEmpty()) builder.append("\n\n")
+            builder.append(header).append('\n')
+            for ((k, v) in keys) builder.append(k).append(" = ").append(v).append('\n')
+            file.parentFile?.mkdirs()
+            file.writeText(builder.toString())
+            return
+        }
+        var end = lines.size
+        for (i in (start + 1) until lines.size) {
+            val t = lines[i].trim()
+            if (t.startsWith("[") && t.endsWith("]")) {
+                end = i
+                break
+            }
+        }
+        val remaining = keys.toMutableMap()
+        for (i in (start + 1) until end) {
+            val t = lines[i].trim()
+            if (t.isEmpty() || t.startsWith("#") || t.startsWith(";")) continue
+            val eq = t.indexOf('=')
+            if (eq <= 0) continue
+            val key = t.substring(0, eq).trim()
+            val wanted = remaining.remove(key) ?: continue
+            lines[i] = "$key = $wanted"
+        }
+        if (remaining.isNotEmpty()) {
+            lines.addAll(end, remaining.map { (k, v) -> "$k = $v" })
+        }
+        file.parentFile?.mkdirs()
+        file.writeText(lines.joinToString("\n").let { if (it.endsWith("\n")) it else "$it\n" })
+    }
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinEmulationActivity.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinEmulationActivity.kt
new file mode 100644
index 000000000..ea99caa4b
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinEmulationActivity.kt
@@ -0,0 +1,630 @@
+package org.dolphinemu.dolphinemu.wn
+
+import android.content.Context
+import android.os.Bundle
+import androidx.activity.addCallback
+import android.util.Log
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import android.view.WindowManager
+import android.widget.Toast
+import org.dolphinemu.dolphinemu.DolphinApplication
+import org.dolphinemu.dolphinemu.NativeLibrary
+import org.dolphinemu.dolphinemu.features.input.model.InputOverrider
+import org.dolphinemu.dolphinemu.features.input.model.InputOverrider.ControlId
+import org.dolphinemu.dolphinemu.utils.DirectoryInitialization
+import java.io.File
+import kotlin.concurrent.thread
+import kotlin.math.abs
+
+class DolphinEmulationActivity :
+    androidx.activity.ComponentActivity(),
+    SurfaceHolder.Callback,
+    NativeLibrary.WnHost {
+    companion object {
+        private const val TAG = "WnDolphin"
+        const val EXTRA_ROM_PATH = "dolphin_rom_path"
+        const val EXTRA_SYSTEM_ID = "dolphin_system_id"
+        const val EXTRA_GAME_NAME = "dolphin_game_name"
+        const val EXTRA_VARIABLES = "dolphin_variables"
+        const val EXTRA_VARIABLES_STRING = "dolphin_vars"
+        const val EXTRA_SHORTCUT_PATH = "dolphin_shortcut_path"
+        const val EXTRA_CONTAINER_ID = "dolphin_container_id"
+        const val EXTRA_RA_ENABLED = "dolphin_ra_enabled"
+        const val EXTRA_RA_USER = "dolphin_ra_user"
+        const val EXTRA_RA_TOKEN = "dolphin_ra_token"
+        const val EXTRA_RA_HARDCORE = "dolphin_ra_hardcore"
+
+        @Volatile
+        var currentVariables: Map<String, String> = emptyMap()
+            private set
+
+        @Volatile
+        var currentGameId: String = ""
+            private set
+
+        @Volatile
+        private var nativeLoadResult: Boolean? = null
+
+        @Synchronized
+        fun ensureNativeLibrary(context: Context): Boolean =
+            nativeLoadResult ?: runCatching {
+                System.load(File(context.filesDir, "retro/bundle/cores/libmain.so").absolutePath)
+            }.isSuccess.also { nativeLoadResult = it }
+
+        @Volatile
+        private var emulationStarted = false
+
+        @Volatile
+        private var stopping = false
+
+        @Volatile
+        private var bootedInProcess = false
+
+        @Volatile
+        private var runThread: Thread? = null
+    }
+
+    private fun teardown() {
+        if (stopping) return
+        stopping = true
+        runCatching { File(filesDir, "dolphin-embed/.running_rom").delete() }
+        thread(name = "WnDolphinTeardown") {
+            runCatching { DolphinNetplay.stop() }
+            if (emulationStarted) {
+                runCatching { NativeLibrary.StopEmulation() }
+                runThread?.join(15000)
+            }
+            if (bootedInProcess) {
+                runCatching { DolphinHost.onStageSaves?.invoke(this) }
+                    .onFailure { Log.w(TAG, "stage saves failed", it) }
+            }
+            runOnUiThread { if (!isFinishing) finish() }
+            Thread.sleep(250)
+            Log.i(TAG, "teardown complete, ending :gc process")
+            android.os.Process.killProcess(android.os.Process.myPid())
+        }
+    }
+
+    private var surfaceView: SurfaceView? = null
+    private var isWii = false
+    private var overridesRegistered = false
+
+    private val invertPrefs by lazy {
+        getSharedPreferences("${packageName}_preferences", android.content.Context.MODE_PRIVATE)
+    }
+
+    @Volatile
+    private var surfaceLive = false
+
+    private val customDriverActive: Boolean
+        get() = !currentVariables["dolphin_gpu_driver_lib"].isNullOrBlank()
+
+    private fun initialSurfaceParams(): android.widget.FrameLayout.LayoutParams {
+        val lp =
+            android.widget.FrameLayout.LayoutParams(
+                android.widget.FrameLayout.LayoutParams.MATCH_PARENT,
+                android.widget.FrameLayout.LayoutParams.MATCH_PARENT,
+            )
+        if (currentVariables["wn_touch"] != "0") {
+            val bounds =
+                if (android.os.Build.VERSION.SDK_INT >= 30) {
+                    windowManager.currentWindowMetrics.bounds
+                } else {
+                    val dm = resources.displayMetrics
+                    android.graphics.Rect(0, 0, dm.widthPixels, dm.heightPixels)
+                }
+            val w = maxOf(bounds.width(), bounds.height())
+            val h = minOf(bounds.width(), bounds.height())
+            val gameWidth = (h * 4f / 3f).coerceAtMost(w.toFloat())
+            lp.width = gameWidth.toInt()
+            lp.height = h
+            lp.leftMargin = ((w - gameWidth) * 0.5f).toInt()
+        }
+        return lp
+    }
+
+    private fun applyImmersiveMode() {
+        androidx.core.view.WindowCompat.setDecorFitsSystemWindows(window, false)
+        if (android.os.Build.VERSION.SDK_INT >= 28) {
+            val attrs = window.attributes
+            attrs.layoutInDisplayCutoutMode =
+                if (android.os.Build.VERSION.SDK_INT >= 30) {
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+                } else {
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+                }
+            window.attributes = attrs
+        }
+        val controller =
+            androidx.core.view.WindowInsetsControllerCompat(window, window.decorView)
+        controller.hide(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+        controller.systemBarsBehavior =
+            androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) applyImmersiveMode()
+    }
+
+    private fun stageGpuDriver(vars: Map<String, String>) {
+        val packDir = vars["dolphin_gpu_driver"]?.takeIf { it.isNotBlank() } ?: return
+        runCatching {
+            val extracted = File(filesDir, "dolphin-embed/GpuDrivers/Extracted")
+            extracted.mkdirs()
+            File(packDir).listFiles()?.forEach { src ->
+                if (!src.isFile) return@forEach
+                val dst = File(extracted, src.name)
+                if (!dst.isFile || dst.length() != src.length()) src.copyTo(dst, overwrite = true)
+            }
+            Log.i(TAG, "GPU driver staged from $packDir lib=${vars["dolphin_gpu_driver_lib"]}")
+        }.onFailure { Log.w(TAG, "GPU driver staging failed: $it") }
+    }
+
+    private fun resolveVariables(): Map<String, String> {
+        @Suppress("UNCHECKED_CAST", "DEPRECATION")
+        val map = (intent.getSerializableExtra(EXTRA_VARIABLES) as? HashMap<String, String>) ?: HashMap()
+        intent.getStringExtra(EXTRA_VARIABLES_STRING)?.split(';')?.forEach { pair ->
+            val eq = pair.indexOf('=')
+            if (eq > 0) map[pair.substring(0, eq).trim()] = pair.substring(eq + 1).trim()
+        }
+        return map
+    }
+
+    private fun initAchievements() {
+        if (!intent.getBooleanExtra(EXTRA_RA_ENABLED, false)) return
+        val user = intent.getStringExtra(EXTRA_RA_USER).orEmpty()
+        val token = intent.getStringExtra(EXTRA_RA_TOKEN).orEmpty()
+        if (user.isBlank() || token.isBlank()) return
+        runCatching {
+            val base = org.dolphinemu.dolphinemu.features.settings.model.NativeConfig.LAYER_BASE
+            org.dolphinemu.dolphinemu.features.settings.model.NativeConfig
+                .setBoolean(base, "RetroAchievements", "Achievements", "Enabled", true)
+            org.dolphinemu.dolphinemu.features.settings.model.NativeConfig
+                .setString(base, "RetroAchievements", "Achievements", "Username", user)
+            org.dolphinemu.dolphinemu.features.settings.model.NativeConfig
+                .setString(base, "RetroAchievements", "Achievements", "ApiToken", token)
+            org.dolphinemu.dolphinemu.features.settings.model.NativeConfig.setBoolean(
+                base, "RetroAchievements", "Achievements", "HardcoreEnabled",
+                intent.getBooleanExtra(EXTRA_RA_HARDCORE, false),
+            )
+            org.dolphinemu.dolphinemu.features.settings.model.AchievementModel.init()
+            thread(name = "WnDolphinRaLogin") {
+                runCatching {
+                    kotlinx.coroutines.runBlocking {
+                        org.dolphinemu.dolphinemu.features.settings.model.AchievementModel.asyncLogin("")
+                    }
+                }.onFailure { Log.w(TAG, "RA login failed", it) }
+            }
+        }.onFailure { Log.w(TAG, "RA init failed", it) }
+    }
+
+    private fun applySysconf(vars: Map<String, String>) {
+        runCatching {
+            org.dolphinemu.dolphinemu.features.settings.model.NativeConfig.setBoolean(
+                org.dolphinemu.dolphinemu.features.settings.model.NativeConfig.LAYER_BASE,
+                "SYSCONF",
+                "IPL",
+                "AR",
+                DolphinConfigWriter.wiiWidescreen(vars),
+            )
+            org.dolphinemu.dolphinemu.features.settings.model.NativeConfig.setInt(
+                org.dolphinemu.dolphinemu.features.settings.model.NativeConfig.LAYER_BASE,
+                "SYSCONF",
+                "BT",
+                "BAR",
+                if (DolphinConfigWriter.sensorBarTop(vars)) 1 else 0,
+            )
+        }.onFailure { Log.w(TAG, "sysconf apply failed: $it") }
+    }
+
+    private fun registerInputOverrides() {
+        if (overridesRegistered || !NativeLibrary.IsRunning()) return
+        overridesRegistered = true
+        isWii = runCatching { NativeLibrary.IsEmulatingWiiUnchecked() }.getOrDefault(false) ||
+            intent.getStringExtra(EXTRA_SYSTEM_ID) == "wii"
+        InputOverrider.registerGameCube(0)
+        InputOverrider.registerWii(0)
+        runCatching { NativeLibrary.GetCurrentGameIDUnchecked() }
+            .getOrNull()
+            ?.takeIf { it.isNotBlank() }
+            ?.let { currentGameId = it }
+        Log.i(TAG, "input overrides registered (wiiHint=$isWii)")
+    }
+
+    private fun unregisterInputOverrides() {
+        if (!overridesRegistered) return
+        overridesRegistered = false
+        runCatching { InputOverrider.unregisterGameCube(0) }
+        runCatching { InputOverrider.unregisterWii(0) }
+    }
+
+    private fun set(control: Int, state: Double) {
+        if (overridesRegistered) InputOverrider.setControlState(0, control, state)
+    }
+
+    private fun gcButtonFor(keyCode: Int): Int? =
+        when (keyCode) {
+            KeyEvent.KEYCODE_BUTTON_A -> ControlId.GCPAD_A_BUTTON
+            KeyEvent.KEYCODE_BUTTON_B -> ControlId.GCPAD_B_BUTTON
+            KeyEvent.KEYCODE_BUTTON_X -> ControlId.GCPAD_X_BUTTON
+            KeyEvent.KEYCODE_BUTTON_Y -> ControlId.GCPAD_Y_BUTTON
+            KeyEvent.KEYCODE_BUTTON_START -> ControlId.GCPAD_START_BUTTON
+            KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_BUTTON_R1 -> ControlId.GCPAD_Z_BUTTON
+            KeyEvent.KEYCODE_BUTTON_L2 -> ControlId.GCPAD_L_DIGITAL
+            KeyEvent.KEYCODE_BUTTON_R2 -> ControlId.GCPAD_R_DIGITAL
+            KeyEvent.KEYCODE_DPAD_UP -> ControlId.GCPAD_DPAD_UP
+            KeyEvent.KEYCODE_DPAD_DOWN -> ControlId.GCPAD_DPAD_DOWN
+            KeyEvent.KEYCODE_DPAD_LEFT -> ControlId.GCPAD_DPAD_LEFT
+            KeyEvent.KEYCODE_DPAD_RIGHT -> ControlId.GCPAD_DPAD_RIGHT
+            else -> null
+        }
+
+    private fun wiiButtonFor(keyCode: Int): Int? =
+        when (keyCode) {
+            KeyEvent.KEYCODE_BUTTON_A -> ControlId.WIIMOTE_A_BUTTON
+            KeyEvent.KEYCODE_BUTTON_B -> ControlId.WIIMOTE_B_BUTTON
+            KeyEvent.KEYCODE_BUTTON_X -> ControlId.WIIMOTE_ONE_BUTTON
+            KeyEvent.KEYCODE_BUTTON_Y -> ControlId.WIIMOTE_TWO_BUTTON
+            KeyEvent.KEYCODE_BUTTON_START -> ControlId.WIIMOTE_PLUS_BUTTON
+            KeyEvent.KEYCODE_BUTTON_SELECT -> ControlId.WIIMOTE_MINUS_BUTTON
+            KeyEvent.KEYCODE_BUTTON_MODE -> ControlId.WIIMOTE_HOME_BUTTON
+            KeyEvent.KEYCODE_BUTTON_L1 -> ControlId.NUNCHUK_C_BUTTON
+            KeyEvent.KEYCODE_BUTTON_L2, KeyEvent.KEYCODE_BUTTON_R1,
+            KeyEvent.KEYCODE_BUTTON_R2,
+            -> ControlId.NUNCHUK_Z_BUTTON
+            KeyEvent.KEYCODE_DPAD_UP -> ControlId.WIIMOTE_DPAD_UP
+            KeyEvent.KEYCODE_DPAD_DOWN -> ControlId.WIIMOTE_DPAD_DOWN
+            KeyEvent.KEYCODE_DPAD_LEFT -> ControlId.WIIMOTE_DPAD_LEFT
+            KeyEvent.KEYCODE_DPAD_RIGHT -> ControlId.WIIMOTE_DPAD_RIGHT
+            else -> null
+        }
+
+    @Volatile
+    var menuButtonHandler: (() -> Unit)? = null
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        registerInputOverrides()
+        if (event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE &&
+            intent.getStringExtra(EXTRA_SYSTEM_ID) != "wii"
+        ) {
+            if (event.action == KeyEvent.ACTION_DOWN) menuButtonHandler?.invoke()
+            return true
+        }
+        val gc = gcButtonFor(event.keyCode)
+        val wii = wiiButtonFor(event.keyCode)
+        if ((gc != null || wii != null) && overridesRegistered) {
+            val state = if (event.action == KeyEvent.ACTION_DOWN) 1.0 else 0.0
+            gc?.let { set(it, state) }
+            wii?.let { set(it, state) }
+            if (event.keyCode == KeyEvent.KEYCODE_BUTTON_L2) {
+                set(ControlId.GCPAD_L_ANALOG, state)
+            }
+            if (event.keyCode == KeyEvent.KEYCODE_BUTTON_R2) {
+                set(ControlId.GCPAD_R_ANALOG, state)
+            }
+            return true
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
+    override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
+        registerInputOverrides()
+        if (!overridesRegistered ||
+            event.action != MotionEvent.ACTION_MOVE ||
+            event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK
+        ) {
+            return super.dispatchGenericMotionEvent(event)
+        }
+        val invSys = intent.getStringExtra(EXTRA_SYSTEM_ID) ?: "gc"
+        val invLX = invertPrefs.getBoolean("retro_inv_lx_$invSys", false)
+        val invLY = invertPrefs.getBoolean("retro_inv_ly_$invSys", false)
+        val invRX = invertPrefs.getBoolean("retro_inv_rx_$invSys", false)
+        val invRY = invertPrefs.getBoolean("retro_inv_ry_$invSys", false)
+        val lx = event.getAxisValue(MotionEvent.AXIS_X).toDouble().let { if (invLX) -it else it }
+        val ly = (-event.getAxisValue(MotionEvent.AXIS_Y).toDouble()).let { if (invLY) -it else it }
+        val rx = event.getAxisValue(MotionEvent.AXIS_Z).toDouble().let { if (invRX) -it else it }
+        val ry = (-event.getAxisValue(MotionEvent.AXIS_RZ).toDouble()).let { if (invRY) -it else it }
+        val lt = maxOf(event.getAxisValue(MotionEvent.AXIS_LTRIGGER), event.getAxisValue(MotionEvent.AXIS_BRAKE)).toDouble()
+        val rt = maxOf(event.getAxisValue(MotionEvent.AXIS_RTRIGGER), event.getAxisValue(MotionEvent.AXIS_GAS)).toDouble()
+        val hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X)
+        val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y)
+        set(ControlId.GCPAD_MAIN_STICK_X, lx)
+        set(ControlId.GCPAD_MAIN_STICK_Y, ly)
+        set(ControlId.GCPAD_C_STICK_X, rx)
+        set(ControlId.GCPAD_C_STICK_Y, ry)
+        set(ControlId.GCPAD_L_ANALOG, lt)
+        set(ControlId.GCPAD_R_ANALOG, rt)
+        set(ControlId.GCPAD_L_DIGITAL, if (lt > 0.9) 1.0 else 0.0)
+        set(ControlId.GCPAD_R_DIGITAL, if (rt > 0.9) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_LEFT, if (hatX < -0.5f) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_RIGHT, if (hatX > 0.5f) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_UP, if (hatY < -0.5f) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_DOWN, if (hatY > 0.5f) 1.0 else 0.0)
+        set(ControlId.NUNCHUK_STICK_X, lx)
+        set(ControlId.NUNCHUK_STICK_Y, ly)
+        set(ControlId.WIIMOTE_IR_X, rx)
+        set(ControlId.WIIMOTE_IR_Y, ry)
+        set(ControlId.NUNCHUK_Z_BUTTON, if (rt > 0.5) 1.0 else 0.0)
+        set(ControlId.NUNCHUK_C_BUTTON, if (lt > 0.5) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_LEFT, if (hatX < -0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_RIGHT, if (hatX > 0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_UP, if (hatY < -0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_DOWN, if (hatY > 0.5f) 1.0 else 0.0)
+        return true
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        DolphinApplication.install(this)
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        applyImmersiveMode()
+        onBackPressedDispatcher.addCallback(this) {
+            if (emulationStarted) {
+                Log.i(TAG, "back pressed, tearing down")
+                teardown()
+            } else {
+                finish()
+            }
+        }
+
+        if (!ensureNativeLibrary(this)) {
+            Log.e(TAG, "libmain failed to load")
+            Toast.makeText(this, "Dolphin emucore not installed — download the console cores in Settings › Retro", Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        val romPath = intent.getStringExtra(EXTRA_ROM_PATH)
+        if (romPath.isNullOrBlank() || !File(romPath).isFile) {
+            Log.e(TAG, "ROM not found: $romPath")
+            Toast.makeText(this, "ROM not found", Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        NativeLibrary.host = this
+        if (!emulationStarted) {
+            val vars = resolveVariables()
+            currentVariables = vars
+            emulationStarted = true
+            stopping = false
+            bootedInProcess = true
+            runThread =
+                thread(name = "WnDolphinRun") {
+                    val userDir = DirectoryInitialization.ensureDirectories(this)
+                    DirectoryInitialization.writeBaseConfig(userDir)
+                    stageGpuDriver(vars)
+                    DolphinConfigWriter.write(userDir, vars)
+                    NativeLibrary.SetUserDirectory(userDir.path)
+                    NativeLibrary.SetCacheDirectory(File(cacheDir, "dolphin-embed").also { it.mkdirs() }.path)
+                    NativeLibrary.Initialize()
+                    NativeLibrary.ReloadConfig()
+                    applySysconf(vars)
+                    initAchievements()
+                    runCatching { File(filesDir, "dolphin-embed/.running_rom").writeText(romPath) }
+                    val netplay = DolphinNetplay.fromIntent(intent)
+                    if (netplay != null) {
+                        Log.i(TAG, "Netplay ${if (netplay.host) "host" else "join"} boot $romPath")
+                        val bootData = DolphinNetplay.startAndAwaitBoot(this, romPath, netplay)
+                        if (bootData == 0L) {
+                            Log.w(TAG, "Netplay boot aborted")
+                            emulationStarted = false
+                            teardown()
+                            return@thread
+                        }
+                        NativeLibrary.RunNetPlay(arrayOf(romPath), false, bootData)
+                    } else {
+                        Log.i(TAG, "Booting $romPath vars=${vars.size}")
+                        NativeLibrary.Run(arrayOf(romPath), false)
+                    }
+                    Log.i(TAG, "Run() returned")
+                    emulationStarted = false
+                    teardown()
+                }
+        } else {
+            Log.i(TAG, "Emulation already running, reattaching surface")
+            registerInputOverrides()
+        }
+
+        val view = SurfaceView(this)
+        view.holder.addCallback(this)
+        surfaceView = view
+        val container = android.widget.FrameLayout(this)
+        container.addView(view, initialSurfaceParams())
+        setContentView(container)
+        window.decorView.post {
+            if (!isFinishing && !isDestroyed) {
+                Log.i(TAG, "attachOverlay hook present=${DolphinHost.attachOverlay != null}")
+                runCatching { DolphinHost.attachOverlay?.invoke(this) }
+                    .onFailure { Log.e(TAG, "overlay attach failed", it) }
+            }
+        }
+    }
+
+    fun sendOverlayButton(keyCode: Int, down: Boolean) {
+        registerInputOverrides()
+        val state = if (down) 1.0 else 0.0
+        gcButtonFor(keyCode)?.let { set(it, state) }
+        wiiButtonFor(keyCode)?.let { set(it, state) }
+        if (keyCode == KeyEvent.KEYCODE_BUTTON_L2) set(ControlId.GCPAD_L_ANALOG, state)
+        if (keyCode == KeyEvent.KEYCODE_BUTTON_R2) set(ControlId.GCPAD_R_ANALOG, state)
+    }
+
+    fun sendOverlayLeftStick(x: Float, y: Float) {
+        registerInputOverrides()
+        set(ControlId.GCPAD_MAIN_STICK_X, x.toDouble())
+        set(ControlId.GCPAD_MAIN_STICK_Y, -y.toDouble())
+        set(ControlId.NUNCHUK_STICK_X, x.toDouble())
+        set(ControlId.NUNCHUK_STICK_Y, -y.toDouble())
+    }
+
+    fun sendOverlayRightStick(x: Float, y: Float) {
+        registerInputOverrides()
+        set(ControlId.GCPAD_C_STICK_X, x.toDouble())
+        set(ControlId.GCPAD_C_STICK_Y, -y.toDouble())
+        set(ControlId.WIIMOTE_IR_X, x.toDouble())
+        set(ControlId.WIIMOTE_IR_Y, -y.toDouble())
+    }
+
+    fun sendOverlayDpad(x: Float, y: Float) {
+        registerInputOverrides()
+        set(ControlId.GCPAD_DPAD_LEFT, if (x < -0.5f) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_RIGHT, if (x > 0.5f) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_UP, if (y < -0.5f) 1.0 else 0.0)
+        set(ControlId.GCPAD_DPAD_DOWN, if (y > 0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_LEFT, if (x < -0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_RIGHT, if (x > 0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_UP, if (y < -0.5f) 1.0 else 0.0)
+        set(ControlId.WIIMOTE_DPAD_DOWN, if (y > 0.5f) 1.0 else 0.0)
+    }
+
+    val emulationRunning: Boolean
+        get() = emulationStarted && NativeLibrary.IsRunning()
+
+    fun pauseGame() {
+        if (emulationRunning && NativeLibrary.IsRunningAndUnpaused()) NativeLibrary.PauseEmulation()
+    }
+
+    fun resumeGame() {
+        if (emulationRunning && !NativeLibrary.IsRunningAndUnpaused()) NativeLibrary.UnPauseEmulation()
+    }
+
+    val gamePaused: Boolean
+        get() = emulationRunning && !NativeLibrary.IsRunningAndUnpaused()
+
+    fun saveStateSlot(slot: Int) {
+        if (emulationRunning) NativeLibrary.SaveState(slot, false)
+    }
+
+    fun loadStateSlot(slot: Int) {
+        if (emulationRunning) NativeLibrary.LoadState(slot)
+    }
+
+    fun stateSlotTime(slot: Int): Long =
+        if (emulationRunning) runCatching { NativeLibrary.GetUnixTimeOfStateSlot(slot) }.getOrDefault(0L) else 0L
+
+    fun stopGame() {
+        teardown()
+    }
+
+    fun pressWiiHome() {
+        registerInputOverrides()
+        if (!overridesRegistered) return
+        set(ControlId.WIIMOTE_HOME_BUTTON, 1.0)
+        window.decorView.postDelayed({ set(ControlId.WIIMOTE_HOME_BUTTON, 0.0) }, 120)
+    }
+
+    fun applyVariable(key: String, value: String) {
+        val merged = currentVariables.toMutableMap()
+        merged[key] = value
+        currentVariables = merged
+        thread(name = "WnDolphinApply") {
+            runCatching {
+                DolphinConfigWriter.write(DirectoryInitialization.userDir(this), merged)
+                NativeLibrary.ReloadConfig()
+                applySysconf(merged)
+            }.onFailure { Log.w(TAG, "applyVariable failed: $it") }
+        }
+    }
+
+    fun setSurfaceBounds(bounds: android.graphics.RectF?) {
+        if (surfaceLive && customDriverActive) return
+        runOnUiThread {
+            val view = surfaceView ?: return@runOnUiThread
+            val lp = view.layoutParams as? android.widget.FrameLayout.LayoutParams ?: return@runOnUiThread
+            if (bounds == null) {
+                lp.width = android.widget.FrameLayout.LayoutParams.MATCH_PARENT
+                lp.height = android.widget.FrameLayout.LayoutParams.MATCH_PARENT
+                lp.leftMargin = 0
+                lp.topMargin = 0
+            } else {
+                lp.width = bounds.width().toInt()
+                lp.height = bounds.height().toInt()
+                lp.leftMargin = bounds.left.toInt()
+                lp.topMargin = bounds.top.toInt()
+            }
+            view.layoutParams = lp
+        }
+    }
+
+    override fun surfaceCreated(holder: SurfaceHolder) {
+        surfaceLive = true
+    }
+
+    override fun surfaceChanged(
+        holder: SurfaceHolder,
+        format: Int,
+        width: Int,
+        height: Int,
+    ) {
+        Log.i(TAG, "surfaceChanged ${width}x$height")
+        NativeLibrary.SurfaceChanged(holder.surface)
+    }
+
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
+        Log.i(TAG, "surfaceDestroyed")
+        NativeLibrary.SurfaceDestroyed()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (emulationStarted && !stopping && NativeLibrary.IsRunning()) {
+            NativeLibrary.UnPauseEmulation()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (emulationStarted && !stopping && NativeLibrary.IsRunningAndUnpaused()) {
+            NativeLibrary.PauseEmulation()
+        }
+    }
+
+    override fun onDestroy() {
+        unregisterInputOverrides()
+        if (isFinishing && bootedInProcess) {
+            teardown()
+        }
+        NativeLibrary.host = null
+        super.onDestroy()
+    }
+
+    override fun onToast(message: String, long: Boolean) {
+        Log.i(TAG, "toast: $message")
+        runOnUiThread {
+            Toast.makeText(this, message, if (long) Toast.LENGTH_LONG else Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    override fun onAlert(
+        caption: String,
+        text: String,
+        yesNo: Boolean,
+        isWarning: Boolean,
+        nonBlocking: Boolean,
+    ): Boolean {
+        Log.w(TAG, "alert [$caption] $text")
+        return true
+    }
+
+    override fun onUpdateTouchPointer() {}
+
+    override fun onTitleChanged() {
+        Log.i(TAG, "title: " + runCatching { NativeLibrary.GetCurrentTitleDescriptionUnchecked() }.getOrDefault(""))
+        runCatching { NativeLibrary.GetCurrentGameIDUnchecked() }
+            .getOrNull()
+            ?.takeIf { it.isNotBlank() }
+            ?.let { currentGameId = it }
+        runOnUiThread { registerInputOverrides() }
+    }
+
+    override fun onEmulationFinished() {
+        Log.i(TAG, "emulation finished")
+        runOnUiThread { if (!isFinishing) finish() }
+    }
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinHost.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinHost.kt
new file mode 100644
index 000000000..5ddc1255e
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinHost.kt
@@ -0,0 +1,14 @@
+package org.dolphinemu.dolphinemu.wn
+
+import android.app.Activity
+
+object DolphinHost {
+    @Volatile
+    var attachOverlay: ((Activity) -> Unit)? = null
+
+    @Volatile
+    var onStageSaves: ((Activity) -> Unit)? = null
+
+    @Volatile
+    var onNetplayStatus: ((hosting: Boolean, hostCode: String?, members: List<String>) -> Unit)? = null
+}
diff --git a/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinNetplay.kt b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinNetplay.kt
new file mode 100644
index 000000000..c7e0e30b3
--- /dev/null
+++ b/dolphin/src/main/java/org/dolphinemu/dolphinemu/wn/DolphinNetplay.kt
@@ -0,0 +1,215 @@
+package org.dolphinemu.dolphinemu.wn
+
+import android.content.Intent
+import android.util.Log
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeoutOrNull
+import java.util.concurrent.atomic.AtomicInteger
+import org.dolphinemu.dolphinemu.NativeLibrary
+import org.dolphinemu.dolphinemu.features.netplay.NetplaySession
+import org.dolphinemu.dolphinemu.features.netplay.model.TraversalState
+import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting
+import org.dolphinemu.dolphinemu.features.settings.model.IntSetting
+import org.dolphinemu.dolphinemu.features.settings.model.NativeConfig
+import org.dolphinemu.dolphinemu.features.settings.model.StringSetting
+import org.dolphinemu.dolphinemu.model.GameFile
+
+object DolphinNetplay {
+    private const val TAG = "WnDolphinNet"
+
+    const val EXTRA_ENABLE = "dolphin_np_enable"
+    const val EXTRA_HOST = "dolphin_np_host"
+    const val EXTRA_TRAVERSAL = "dolphin_np_traversal"
+    const val EXTRA_ADDRESS = "dolphin_np_address"
+    const val EXTRA_HOST_CODE = "dolphin_np_host_code"
+    const val EXTRA_PORT = "dolphin_np_port"
+    const val EXTRA_NICKNAME = "dolphin_np_nickname"
+
+    const val DEFAULT_PORT = 2626
+
+    data class Config(
+        val host: Boolean,
+        val traversal: Boolean,
+        val address: String,
+        val hostCode: String,
+        val port: Int,
+        val nickname: String,
+    )
+
+    fun fromIntent(intent: Intent): Config? {
+        if (!intent.getBooleanExtra(EXTRA_ENABLE, false)) return null
+        return Config(
+            host = intent.getBooleanExtra(EXTRA_HOST, true),
+            traversal = intent.getBooleanExtra(EXTRA_TRAVERSAL, false),
+            address = intent.getStringExtra(EXTRA_ADDRESS).orEmpty(),
+            hostCode = intent.getStringExtra(EXTRA_HOST_CODE).orEmpty(),
+            port = intent.getIntExtra(EXTRA_PORT, DEFAULT_PORT),
+            nickname = intent.getStringExtra(EXTRA_NICKNAME).orEmpty(),
+        )
+    }
+
+    @Volatile
+    private var session: NetplaySession? = null
+
+    @Volatile
+    private var scope: CoroutineScope? = null
+
+    @Volatile
+    private var hostCode: String? = null
+
+    @Volatile
+    private var members: List<String> = emptyList()
+
+    val active: Boolean
+        get() = session != null
+
+    private fun pushStatus() {
+        DolphinHost.onNetplayStatus?.invoke(session != null, hostCode, members)
+    }
+
+    private fun applyConfig(cfg: Config) {
+        val base = NativeConfig.LAYER_BASE
+        StringSetting.NETPLAY_NICKNAME.setString(base, cfg.nickname.ifBlank { "Player" })
+        StringSetting.NETPLAY_TRAVERSAL_CHOICE.setString(
+            base,
+            if (cfg.traversal) "traversal" else "direct",
+        )
+        if (cfg.host) {
+            IntSetting.NETPLAY_HOST_PORT.setInt(base, cfg.port)
+            BooleanSetting.NETPLAY_USE_UPNP.setBoolean(base, false)
+        } else if (cfg.traversal) {
+            StringSetting.NETPLAY_HOST_CODE.setString(base, cfg.hostCode.trim())
+        } else {
+            StringSetting.NETPLAY_ADDRESS.setString(base, cfg.address.trim())
+            IntSetting.NETPLAY_CONNECT_PORT.setInt(base, cfg.port)
+        }
+    }
+
+    fun startAndAwaitBoot(host: NativeLibrary.WnHost?, romPath: String, cfg: Config): Long {
+        runCatching { applyConfig(cfg) }
+            .onFailure { Log.e(TAG, "applyConfig failed", it); return 0L }
+
+        val gameFile = runCatching { GameFile.parse(romPath) }.getOrNull()
+        if (gameFile == null) {
+            Log.e(TAG, "GameFile.parse failed for $romPath")
+            host?.onToast("Netplay: unreadable game file", true)
+            return 0L
+        }
+
+        val s = NetplaySession(arrayOf(gameFile)) { session = null }
+        session = s
+        val sc = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+        scope = sc
+        hostCode = null
+        members = emptyList()
+        pushStatus()
+
+        val bootData = CompletableDeferred<Long>()
+
+        s.players
+            .onEach { players ->
+                members = players.map { it.name }
+                pushStatus()
+            }
+            .launchIn(sc)
+
+        s.launchGame
+            .onEach {
+                Log.i(TAG, "netplay boot ready ($it)")
+                if (!bootData.isCompleted) bootData.complete(s.consumeBootSessionData())
+            }
+            .launchIn(sc)
+
+        s.connectionErrors
+            .onEach { msg ->
+                Log.w(TAG, "netplay error: $msg")
+                host?.onToast("Netplay: $msg", true)
+            }
+            .launchIn(sc)
+
+        s.connectionLost
+            .onEach {
+                host?.onToast("Netplay connection lost", true)
+                if (!bootData.isCompleted) bootData.complete(0L)
+            }
+            .launchIn(sc)
+
+        if (cfg.host && cfg.traversal) {
+            s.traversalState
+                .onEach { state ->
+                    if (state is TraversalState.Connected) {
+                        Log.i(TAG, "traversal host code: ${state.hostCode}")
+                        hostCode = state.hostCode
+                        pushStatus()
+                    }
+                }
+                .launchIn(sc)
+        }
+
+        sc.launch {
+            val ok = runCatching { if (cfg.host) s.host() else s.join() }.getOrDefault(false)
+            if (!ok) {
+                host?.onToast(
+                    if (cfg.host) "Netplay: could not host" else "Netplay: could not connect",
+                    true,
+                )
+                if (!bootData.isCompleted) bootData.complete(0L)
+                return@launch
+            }
+            if (cfg.host) {
+                host?.onToast("Waiting for player…", false)
+                runCatching { s.changeGame(gameFile) }
+                val playerCount = AtomicInteger(1)
+                val tracker = s.players.onEach { playerCount.set(it.size) }.launchIn(sc)
+                withTimeoutOrNull(120_000L) {
+                    var announced = false
+                    while (isActive) {
+                        if (playerCount.get() >= 2) {
+                            if (!announced) {
+                                announced = true
+                                host?.onToast("Player connected — verifying game…", false)
+                            }
+                            if (runCatching { s.doAllPlayersHaveGame() }.getOrDefault(false)) {
+                                host?.onToast("Starting…", false)
+                                runCatching { s.startGame() }
+                                return@withTimeoutOrNull
+                            }
+                        }
+                        delay(1_000L)
+                    }
+                }
+                tracker.cancel()
+            }
+        }
+
+        val result = runBlocking {
+            withTimeoutOrNull(180_000L) { bootData.await() } ?: 0L
+        }
+        if (result == 0L) {
+            host?.onToast("Netplay: no game started", true)
+            stop()
+        }
+        return result
+    }
+
+    fun stop() {
+        val s = session
+        session = null
+        runCatching { runBlocking { s?.close() } }
+        scope?.cancel()
+        scope = null
+        hostCode = null
+        members = emptyList()
+        pushStatus()
+    }
+}
diff --git a/dolphin/src/main/res/values/dolphin_strings.xml b/dolphin/src/main/res/values/dolphin_strings.xml
new file mode 100644
index 000000000..056673959
--- /dev/null
+++ b/dolphin/src/main/res/values/dolphin_strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="netplay_message_buffer_changed">Buffer size changed to %1$d</string>
+    <string name="netplay_message_desync">Possible desync detected: %1$s might have desynced at frame %2$d</string>
+    <string name="netplay_message_game_changed">Game changed to %1$s</string>
+    <string name="netplay_message_host_input_authority_changed">"Host input authority %1$s"</string>
+    <string name="netplay_traversal_error_bad_host">Couldn\'t look up central server</string>
+    <string name="netplay_traversal_error_version_too_old">Dolphin is too old for traversal server</string>
+    <string name="replug_gc_adapter">GameCube Adapter couldn\'t be opened. Please re-plug the device.</string>
+</resources>
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/ARCheat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/ARCheat.kt
new file mode 100644
index 000000000..7d3013ee3
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/ARCheat.kt
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import androidx.annotation.Keep
+
+class ARCheat : AbstractCheat {
+    @Keep
+    private val pointer: Long
+
+    constructor() {
+        pointer = createNew()
+    }
+
+    @Keep
+    private constructor(pointer: Long) {
+        this.pointer = pointer
+    }
+
+    external fun finalize()
+
+    private external fun createNew(): Long
+
+    override fun supportsCreator(): Boolean = false
+
+    override fun supportsNotes(): Boolean = false
+
+    external override fun getName(): String
+
+    external override fun getCode(): String
+
+    external override fun getUserDefined(): Boolean
+
+    external override fun getEnabled(): Boolean
+
+    external override fun setEnabledImpl(enabled: Boolean)
+
+    external override fun setCheatImpl(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int
+
+    companion object {
+        @JvmStatic
+        external fun loadCodes(gameId: String, revision: Int): Array<ARCheat>
+
+        @JvmStatic
+        external fun saveCodes(gameId: String, revision: Int, codes: Array<ARCheat>)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/AbstractCheat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/AbstractCheat.kt
new file mode 100644
index 000000000..d9e17ffd4
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/AbstractCheat.kt
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import org.dolphinemu.dolphinemu.features.cheats.model.Cheat.Companion.TRY_SET_FAIL_NO_NAME
+import org.dolphinemu.dolphinemu.features.cheats.model.Cheat.Companion.TRY_SET_SUCCESS
+
+abstract class AbstractCheat : ReadOnlyCheat() {
+    override fun supportsCode(): Boolean {
+        return true
+    }
+
+    override fun setCheat(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int {
+        var finalName = name
+        var finalCode = code
+        if (finalCode.isNotEmpty() && finalCode[0] == '$') {
+            val firstLineEnd = finalCode.indexOf('\n')
+            if (firstLineEnd == -1) {
+                finalName = finalCode.substring(1)
+                finalCode = ""
+            } else {
+                finalName = finalCode.substring(1, firstLineEnd)
+                finalCode = finalCode.substring(firstLineEnd + 1)
+            }
+        }
+
+        if (finalName.isEmpty()) return TRY_SET_FAIL_NO_NAME
+
+        val result = setCheatImpl(finalName, creator, notes, finalCode)
+
+        if (result == TRY_SET_SUCCESS) onChanged()
+
+        return result
+    }
+
+    protected abstract fun setCheatImpl(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/Cheat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/Cheat.kt
new file mode 100644
index 000000000..848acf3ea
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/Cheat.kt
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+interface Cheat {
+    fun supportsCreator(): Boolean
+
+    fun supportsNotes(): Boolean
+
+    fun supportsCode(): Boolean
+
+    fun getName(): String = ""
+
+    fun getCreator(): String = ""
+
+    fun getNotes(): String = ""
+
+    fun getCode(): String = ""
+
+    fun setCheat(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int
+
+    fun getUserDefined(): Boolean
+
+    fun getEnabled(): Boolean
+
+    fun setEnabled(isChecked: Boolean)
+
+    fun setChangedCallback(callback: Runnable?)
+
+    companion object {
+        // Result codes greater than 0 represent an error on the corresponding code line (one-indexed)
+        const val TRY_SET_FAIL_CODE_MIXED_ENCRYPTION = -3
+        const val TRY_SET_FAIL_NO_CODE_LINES = -2
+        const val TRY_SET_FAIL_NO_NAME = -1
+        const val TRY_SET_SUCCESS = 0
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/CheatsViewModel.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/CheatsViewModel.kt
new file mode 100644
index 000000000..e2d52bbc7
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/CheatsViewModel.kt
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import org.dolphinemu.dolphinemu.features.cheats.model.ARCheat.Companion.loadCodes
+import org.dolphinemu.dolphinemu.features.cheats.model.ARCheat.Companion.saveCodes
+import kotlin.collections.ArrayList
+
+class CheatsViewModel : ViewModel() {
+    private var loaded = false
+
+    private var selectedCheatPosition = -1
+    private val _selectedCheat = MutableLiveData<Cheat?>(null)
+    val selectedCheat: LiveData<Cheat?> get() = _selectedCheat
+    private val _isAdding = MutableLiveData(false)
+    val isAdding: LiveData<Boolean> get() = _isAdding
+    private val _isEditing = MutableLiveData(false)
+    val isEditing: LiveData<Boolean> get() = _isEditing
+
+    private val _cheatAddedEvent = MutableLiveData<Int?>(null)
+    val cheatAddedEvent: LiveData<Int?> get() = _cheatAddedEvent
+    private val _cheatChangedEvent = MutableLiveData<Int?>(null)
+    val cheatChangedEvent: LiveData<Int?> get() = _cheatChangedEvent
+    private val _cheatDeletedEvent = MutableLiveData<Int?>(null)
+    val cheatDeletedEvent: LiveData<Int?> get() = _cheatDeletedEvent
+    private val _geckoCheatsDownloadedEvent = MutableLiveData<Int?>(null)
+    val geckoCheatsDownloadedEvent: LiveData<Int?> get() = _geckoCheatsDownloadedEvent
+    private val _openDetailsViewEvent = MutableLiveData(false)
+    val openDetailsViewEvent: LiveData<Boolean> get() = _openDetailsViewEvent
+
+    private var graphicsModGroup: GraphicsModGroup? = null
+    var graphicsMods: ArrayList<GraphicsMod> = ArrayList()
+    var patchCheats: ArrayList<PatchCheat> = ArrayList()
+    var aRCheats: ArrayList<ARCheat> = ArrayList()
+    var geckoCheats: ArrayList<GeckoCheat> = ArrayList()
+
+    private var graphicsModsNeedSaving = false
+    private var patchCheatsNeedSaving = false
+    private var aRCheatsNeedSaving = false
+    private var geckoCheatsNeedSaving = false
+
+    fun load(gameID: String, revision: Int) {
+        if (loaded) return
+
+        graphicsModGroup = GraphicsModGroup.load(gameID)
+        graphicsMods.addAll(graphicsModGroup!!.mods)
+        patchCheats.addAll(PatchCheat.loadCodes(gameID, revision))
+        aRCheats.addAll(loadCodes(gameID, revision))
+        geckoCheats.addAll(GeckoCheat.loadCodes(gameID, revision))
+
+        for (mod in graphicsMods) {
+            mod.setChangedCallback { graphicsModsNeedSaving = true }
+        }
+        for (cheat in patchCheats) {
+            cheat.setChangedCallback { patchCheatsNeedSaving = true }
+        }
+        for (cheat in aRCheats) {
+            cheat.setChangedCallback { aRCheatsNeedSaving = true }
+        }
+        for (cheat in geckoCheats) {
+            cheat.setChangedCallback { geckoCheatsNeedSaving = true }
+        }
+
+        loaded = true
+    }
+
+    fun saveIfNeeded(gameID: String, revision: Int) {
+        if (graphicsModsNeedSaving) {
+            graphicsModGroup!!.save()
+            graphicsModsNeedSaving = false
+        }
+
+        if (patchCheatsNeedSaving) {
+            PatchCheat.saveCodes(gameID, revision, patchCheats.toTypedArray())
+            patchCheatsNeedSaving = false
+        }
+
+        if (aRCheatsNeedSaving) {
+            saveCodes(gameID, revision, aRCheats.toTypedArray())
+            aRCheatsNeedSaving = false
+        }
+
+        if (geckoCheatsNeedSaving) {
+            GeckoCheat.saveCodes(gameID, revision, geckoCheats.toTypedArray())
+            geckoCheatsNeedSaving = false
+        }
+    }
+
+    fun setSelectedCheat(cheat: Cheat?, position: Int) {
+        if (isEditing.value!!) setIsEditing(false)
+
+        _selectedCheat.value = cheat
+        selectedCheatPosition = position
+    }
+
+    fun startAddingCheat(cheat: Cheat?, position: Int) {
+        _selectedCheat.value = cheat
+        selectedCheatPosition = position
+
+        _isAdding.value = true
+        _isEditing.value = true
+    }
+
+    fun finishAddingCheat() {
+        check(isAdding.value!!)
+
+        _isAdding.value = false
+        _isEditing.value = false
+
+        when (val cheat = selectedCheat.value) {
+            is PatchCheat -> {
+                patchCheats.add(cheat)
+                cheat.setChangedCallback(Runnable { patchCheatsNeedSaving = true })
+                patchCheatsNeedSaving = true
+            }
+            is ARCheat -> {
+                aRCheats.add(cheat)
+                cheat.setChangedCallback(Runnable { patchCheatsNeedSaving = true })
+                aRCheatsNeedSaving = true
+            }
+            is GeckoCheat -> {
+                geckoCheats.add(cheat)
+                cheat.setChangedCallback(Runnable { geckoCheatsNeedSaving = true })
+                geckoCheatsNeedSaving = true
+            }
+            else -> throw UnsupportedOperationException()
+        }
+
+        notifyCheatAdded()
+    }
+
+    fun setIsEditing(isEditing: Boolean) {
+        _isEditing.value = isEditing
+        if (isAdding.value!! && !isEditing) {
+            _isAdding.value = false
+            setSelectedCheat(null, -1)
+        }
+    }
+
+    private fun notifyCheatAdded() {
+        _cheatAddedEvent.value = selectedCheatPosition
+        _cheatAddedEvent.value = null
+    }
+
+    /**
+     * Notifies that an edit has been made to the contents of the currently selected cheat.
+     */
+    fun notifySelectedCheatChanged() {
+        notifyCheatChanged(selectedCheatPosition)
+    }
+
+    /**
+     * Notifies that an edit has been made to the contents of the cheat at the given position.
+     */
+    private fun notifyCheatChanged(position: Int) {
+        _cheatChangedEvent.value = position
+        _cheatChangedEvent.value = null
+    }
+
+    fun deleteSelectedCheat() {
+        val cheat = selectedCheat.value
+        val position = selectedCheatPosition
+
+        setSelectedCheat(null, -1)
+
+        if (patchCheats.remove(cheat)) patchCheatsNeedSaving = true
+        if (aRCheats.remove(cheat)) aRCheatsNeedSaving = true
+        if (geckoCheats.remove(cheat)) geckoCheatsNeedSaving = true
+
+        notifyCheatDeleted(position)
+    }
+
+    /**
+     * Notifies that the cheat at the given position has been deleted.
+     */
+    private fun notifyCheatDeleted(position: Int) {
+        _cheatDeletedEvent.value = position
+        _cheatDeletedEvent.value = null
+    }
+
+    fun addDownloadedGeckoCodes(cheats: Array<GeckoCheat>): Int {
+        var cheatsAdded = 0
+
+        for (cheat in cheats) {
+            if (!geckoCheats.contains(cheat)) {
+                geckoCheats.add(cheat)
+                cheatsAdded++
+            }
+        }
+
+        if (cheatsAdded != 0) {
+            geckoCheatsNeedSaving = true
+            _geckoCheatsDownloadedEvent.value = cheatsAdded
+            _geckoCheatsDownloadedEvent.value = null
+        }
+
+        return cheatsAdded
+    }
+
+    fun openDetailsView() {
+        _openDetailsViewEvent.value = true
+        _openDetailsViewEvent.value = false
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt
new file mode 100644
index 000000000..7a2306654
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import androidx.annotation.Keep
+
+class GeckoCheat : AbstractCheat {
+    @Keep
+    private val mPointer: Long
+
+    constructor() {
+        mPointer = createNew()
+    }
+
+    @Keep
+    private constructor(pointer: Long) {
+        mPointer = pointer
+    }
+
+    external fun finalize()
+
+    private external fun createNew(): Long
+
+    override fun equals(other: Any?): Boolean {
+        return other != null && javaClass == other.javaClass && equalsImpl(other as GeckoCheat)
+    }
+
+    override fun hashCode(): Int {
+        return mPointer.hashCode()
+    }
+
+    override fun supportsCreator(): Boolean {
+        return true
+    }
+
+    override fun supportsNotes(): Boolean {
+        return true
+    }
+
+    external override fun getName(): String
+
+    external override fun getCreator(): String
+
+    external override fun getNotes(): String
+
+    external override fun getCode(): String
+
+    external override fun getUserDefined(): Boolean
+
+    external override fun getEnabled(): Boolean
+
+    private external fun equalsImpl(other: GeckoCheat): Boolean
+
+    external override fun setCheatImpl(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int
+
+    external override fun setEnabledImpl(enabled: Boolean)
+
+    companion object {
+        @JvmStatic
+        external fun loadCodes(gameId: String, revision: Int): Array<GeckoCheat>
+
+        @JvmStatic
+        external fun saveCodes(gameId: String, revision: Int, codes: Array<GeckoCheat>)
+
+        @JvmStatic
+        external fun downloadCodes(gameTdbId: String): Array<GeckoCheat>?
+    }
+}
\ No newline at end of file
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GraphicsMod.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GraphicsMod.kt
new file mode 100644
index 000000000..3ea8c23e4
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GraphicsMod.kt
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import androidx.annotation.Keep
+
+class GraphicsMod @Keep private constructor(
+    @Keep private val pointer: Long,
+    // When a C++ GraphicsModGroup object is destroyed, it also destroys the GraphicsMods it owns.
+    // To avoid getting dangling pointers, we keep a reference to the GraphicsModGroup here.
+    @Keep private val parent: GraphicsModGroup
+) : ReadOnlyCheat() {
+    override fun supportsCreator(): Boolean = true
+
+    override fun supportsNotes(): Boolean = true
+
+    override fun supportsCode(): Boolean = false
+
+    external override fun getName(): String
+
+    external override fun getCreator(): String
+
+    external override fun getNotes(): String
+
+    // Technically graphics mods can be user defined, but we don't support editing graphics mods
+    // in the GUI, and editability is what this really controls
+    override fun getUserDefined(): Boolean = false
+
+    external override fun getEnabled(): Boolean
+
+    external override fun setEnabledImpl(enabled: Boolean)
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GraphicsModGroup.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GraphicsModGroup.kt
new file mode 100644
index 000000000..5d9b8b221
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/GraphicsModGroup.kt
@@ -0,0 +1,17 @@
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import androidx.annotation.Keep
+
+class GraphicsModGroup @Keep private constructor(@field:Keep private val pointer: Long) {
+    external fun finalize()
+
+    val mods: Array<GraphicsMod>
+        external get
+
+    external fun save()
+
+    companion object {
+        @JvmStatic
+        external fun load(gameId: String): GraphicsModGroup
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/PatchCheat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/PatchCheat.kt
new file mode 100644
index 000000000..f4cd9660a
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/PatchCheat.kt
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+import androidx.annotation.Keep
+
+class PatchCheat : AbstractCheat {
+    @Keep
+    private val pointer: Long
+
+    constructor() {
+        pointer = createNew()
+    }
+
+    @Keep
+    private constructor(pointer: Long) {
+        this.pointer = pointer
+    }
+
+    external fun finalize()
+
+    private external fun createNew(): Long
+
+    override fun supportsCreator(): Boolean {
+        return false
+    }
+
+    override fun supportsNotes(): Boolean {
+        return false
+    }
+
+    external override fun getName(): String
+
+    external override fun getCode(): String
+
+    external override fun getUserDefined(): Boolean
+
+    external override fun getEnabled(): Boolean
+
+    external override fun setCheatImpl(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int
+
+    external override fun setEnabledImpl(enabled: Boolean)
+
+    companion object {
+        @JvmStatic
+        external fun loadCodes(gameId: String, revision: Int): Array<PatchCheat>
+
+        @JvmStatic
+        external fun saveCodes(gameId: String, revision: Int, codes: Array<PatchCheat>)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/ReadOnlyCheat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/ReadOnlyCheat.kt
new file mode 100644
index 000000000..542a40779
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/cheats/model/ReadOnlyCheat.kt
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.cheats.model
+
+abstract class ReadOnlyCheat : Cheat {
+    private var onChangedCallback: Runnable? = null
+
+    override fun setCheat(
+        name: String,
+        creator: String,
+        notes: String,
+        code: String
+    ): Int {
+        throw UnsupportedOperationException()
+    }
+
+    override fun setEnabled(isChecked: Boolean) {
+        setEnabledImpl(isChecked)
+        onChanged()
+    }
+
+    override fun setChangedCallback(callback: Runnable?) {
+        onChangedCallback = callback
+    }
+
+    protected fun onChanged() {
+        if (onChangedCallback != null) onChangedCallback!!.run()
+    }
+
+    protected abstract fun setEnabledImpl(enabled: Boolean)
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/infinitybase/InfinityConfig.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/infinitybase/InfinityConfig.kt
new file mode 100644
index 000000000..0e2e54acb
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/infinitybase/InfinityConfig.kt
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.infinitybase
+
+object InfinityConfig {
+    var LIST_FIGURES: Map<Long, String> = getFigureMap()
+    var REVERSE_LIST_FIGURES: Map<String, Long> = getInverseFigureMap()
+
+    private external fun getFigureMap(): Map<Long, String>
+    private external fun getInverseFigureMap(): Map<String, Long>
+
+    @JvmStatic
+    external fun removeFigure(position: Int)
+
+    @JvmStatic
+    external fun loadFigure(position: Int, fileName: String): String?
+
+    @JvmStatic
+    external fun createFigure(
+        figureNumber: Long,
+        fileName: String,
+        position: Int
+    ): String?
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/infinitybase/model/Figure.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/infinitybase/model/Figure.kt
new file mode 100644
index 000000000..b65b978e3
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/infinitybase/model/Figure.kt
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.infinitybase.model
+
+data class Figure(var number: Long, var name: String) {
+
+    companion object {
+        @JvmField
+        val BLANK_FIGURE = Figure(-1, "Blank")
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/ControlGroupEnabledSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/ControlGroupEnabledSetting.kt
new file mode 100644
index 000000000..43c983cc4
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/ControlGroupEnabledSetting.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroup
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting
+import org.dolphinemu.dolphinemu.features.settings.model.Settings
+
+class ControlGroupEnabledSetting(private val controlGroup: ControlGroup) : AbstractBooleanSetting {
+    override val boolean: Boolean
+        get() = controlGroup.getEnabled()
+
+    override fun setBoolean(settings: Settings, newValue: Boolean) =
+        controlGroup.setEnabled(newValue)
+
+    override val isOverridden: Boolean = false
+
+    override val isRuntimeEditable: Boolean = true
+
+    override fun delete(settings: Settings): Boolean {
+        val newValue = controlGroup.getDefaultEnabledValue() != ControlGroup.DEFAULT_ENABLED_NO
+        controlGroup.setEnabled(newValue)
+        return true
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
new file mode 100644
index 000000000..b412b6ef9
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import android.content.Context
+import android.hardware.input.InputManager
+import android.media.AudioAttributes
+import android.os.Build
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.Looper
+import android.os.VibrationAttributes
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.os.VibratorManager
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+import androidx.annotation.Keep
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import org.dolphinemu.dolphinemu.DolphinApplication
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * This class interfaces with the native ControllerInterface,
+ * which is where the emulator core gets inputs from.
+ */
+object ControllerInterface {
+    private var inputDeviceListener: InputDeviceListener? = null
+    private var handlerThread: HandlerThread? = null
+
+    private val inputStateUpdatePending = AtomicBoolean(false)
+    private val inputStateVersion = MutableLiveData(0)
+    private val devicesVersion = MutableLiveData(0)
+
+    val inputStateChanged: LiveData<Int>
+        get() = inputStateVersion
+
+    val devicesChanged: LiveData<Int>
+        get() = devicesVersion
+
+    /**
+     * Activities which want to pass on inputs to native code
+     * should call this in their own dispatchKeyEvent method.
+     *
+     * @return true if the emulator core seems to be interested in this event.
+     * false if the event should be passed on to the default dispatchKeyEvent.
+     */
+    fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        val result = dispatchKeyEventNative(event)
+        onInputStateChanged()
+        return result
+    }
+
+    private external fun dispatchKeyEventNative(event: KeyEvent): Boolean
+
+    /**
+     * Activities which want to pass on inputs to native code
+     * should call this in their own dispatchGenericMotionEvent method.
+     *
+     * @return true if the emulator core seems to be interested in this event.
+     * false if the event should be passed on to the default dispatchGenericMotionEvent.
+     */
+    fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
+        val result = dispatchGenericMotionEventNative(event)
+        onInputStateChanged()
+        return result
+    }
+
+    private external fun dispatchGenericMotionEventNative(event: MotionEvent): Boolean
+
+    /**
+     * [DolphinSensorEventListener] calls this for each axis of a received SensorEvent.
+     *
+     * @return true if the emulator core seems to be interested in this event.
+     * false if the sensor can be suspended to save battery.
+     */
+    fun dispatchSensorEvent(deviceQualifier: String, axisName: String, value: Float): Boolean {
+        val result = dispatchSensorEventNative(deviceQualifier, axisName, value)
+        onInputStateChanged()
+        return result
+    }
+
+    private external fun dispatchSensorEventNative(
+        deviceQualifier: String, axisName: String, value: Float
+    ): Boolean
+
+    /**
+     * Called when a sensor is suspended or unsuspended.
+     *
+     * @param deviceQualifier A string used by native code for uniquely identifying devices.
+     * @param axisNames       The name of all axes for the sensor.
+     * @param suspended       Whether the sensor is now suspended.
+     */
+    external fun notifySensorSuspendedState(
+        deviceQualifier: String, axisNames: Array<String>, suspended: Boolean
+    )
+
+    external fun getAllDeviceStrings(): Array<String>
+
+    external fun getDevice(deviceString: String): CoreDevice?
+
+    private fun onInputStateChanged() {
+        // When a single SensorEvent is dispatched, this method is likely to get called many times.
+        // For the sake of performance, let's batch input state updates so that observers only have
+        // to process one update.
+        if (!inputStateUpdatePending.getAndSet(true)) {
+            Handler(Looper.getMainLooper()).post {
+                if (inputStateUpdatePending.getAndSet(false)) {
+                    inputStateVersion.value = inputStateVersion.value?.plus(1)
+                }
+            }
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    private fun onDevicesChanged() {
+        Handler(Looper.getMainLooper()).post {
+            devicesVersion.value = devicesVersion.value?.plus(1)
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    private fun registerInputDeviceListener() {
+        if (inputDeviceListener == null) {
+            handlerThread = HandlerThread("Hotplug thread").apply { start() }
+            val thread = requireNotNull(handlerThread) { "HandlerThread is not available" }
+
+            val im = DolphinApplication.getAppContext()
+                .getSystemService(Context.INPUT_SERVICE) as InputManager
+            val looper = requireNotNull(thread.looper) {
+                "HandlerThread looper is not available"
+            }
+
+            inputDeviceListener = InputDeviceListener()
+            im.registerInputDeviceListener(inputDeviceListener, Handler(looper))
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    private fun unregisterInputDeviceListener() {
+        if (inputDeviceListener != null) {
+            val im = DolphinApplication.getAppContext()
+                .getSystemService(Context.INPUT_SERVICE) as InputManager
+
+            im.unregisterInputDeviceListener(inputDeviceListener)
+            inputDeviceListener = null
+            handlerThread?.quitSafely()
+            handlerThread = null
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    private fun getVibratorManager(device: InputDevice): DolphinVibratorManager {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            DolphinVibratorManagerPassthrough(device.vibratorManager)
+        } else {
+            @Suppress("DEPRECATION")
+            DolphinVibratorManagerCompat(device.vibrator)
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    private fun getSystemVibratorManager(): DolphinVibratorManager {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val vibratorManager = DolphinApplication.getAppContext()
+                .getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager?
+            if (vibratorManager != null) {
+                return DolphinVibratorManagerPassthrough(vibratorManager)
+            }
+        }
+        @Suppress("DEPRECATION")
+        val vibrator = DolphinApplication.getAppContext()
+            .getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+        return DolphinVibratorManagerCompat(vibrator)
+    }
+
+    @Keep
+    @JvmStatic
+    private fun vibrate(vibrator: Vibrator) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            vibrator.vibrate(
+                VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE),
+                VibrationAttributes.Builder().setUsage(VibrationAttributes.USAGE_MEDIA).build()
+            )
+        } else {
+            val attributes = AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                @Suppress("DEPRECATION")
+                vibrator.vibrate(
+                    VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE),
+                    attributes
+                )
+            } else {
+                @Suppress("DEPRECATION")
+                vibrator.vibrate(100, attributes)
+            }
+        }
+    }
+
+    private class InputDeviceListener : InputManager.InputDeviceListener {
+        override external fun onInputDeviceAdded(deviceId: Int)
+
+        override external fun onInputDeviceRemoved(deviceId: Int)
+
+        override external fun onInputDeviceChanged(deviceId: Int)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/CoreDevice.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/CoreDevice.kt
new file mode 100644
index 000000000..53f886412
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/CoreDevice.kt
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import androidx.annotation.Keep
+
+/**
+ * Represents a C++ ciface::Core::Device.
+ */
+@Keep
+class CoreDevice private constructor(private val pointer: Long) {
+    /**
+     * Represents a C++ ciface::Core::Device::Control.
+     *
+     * This class is marked inner to ensure that the CoreDevice parent does not get garbage collected
+     * while a Control is still accessible. (CoreDevice's finalizer may delete the native controls.)
+     */
+    @Keep
+    inner class Control private constructor(private val pointer: Long) {
+        external fun getName(): String
+
+        external fun getState(): Double
+    }
+
+    protected external fun finalize()
+
+    external fun getInputs(): Array<Control>
+
+    external fun getOutputs(): Array<Control>
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinSensorEventListener.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinSensorEventListener.kt
new file mode 100644
index 000000000..6aa5ce2fc
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinSensorEventListener.kt
@@ -0,0 +1,551 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import android.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
+import android.os.Build
+import android.view.InputDevice
+import android.view.Surface
+import androidx.annotation.Keep
+import org.dolphinemu.dolphinemu.DolphinApplication
+import org.dolphinemu.dolphinemu.utils.Log
+import java.util.Collections
+
+class DolphinSensorEventListener : SensorEventListener {
+    private class AxisSetDetails(val firstAxisOfSet: Int, val axisSetType: Int)
+
+    private class SensorDetails(
+        val sensor: Sensor,
+        val sensorType: Int,
+        val axisNames: Array<String>,
+        val axisSetDetails: Array<AxisSetDetails>
+    ) {
+        var isSuspended = true
+        var hasRegisteredListener = false
+    }
+
+    private val sensorManager: SensorManager?
+
+    private val sensorDetails = ArrayList<SensorDetails>()
+
+    private val rotateCoordinatesForScreenOrientation: Boolean
+
+    /**
+     * AOSP has a bug in InputDeviceSensorManager where
+     * InputSensorEventListenerDelegate.removeSensor attempts to modify an ArrayList it's iterating
+     * through in a way that throws a ConcurrentModificationException. Because of this, we can't
+     * suspend individual sensors for InputDevices, but we can suspend all sensors at once.
+     */
+    private val canSuspendSensorsIndividually: Boolean
+
+    private var unsuspendedSensors = 0
+
+    private var deviceQualifier = ""
+
+    @Keep
+    constructor() {
+        sensorManager = DolphinApplication.getAppContext()
+            .getSystemService(Context.SENSOR_SERVICE) as SensorManager?
+        rotateCoordinatesForScreenOrientation = true
+        canSuspendSensorsIndividually = true
+        addSensors()
+        sortSensorDetails()
+    }
+
+    @Keep
+    constructor(inputDevice: InputDevice) {
+        rotateCoordinatesForScreenOrientation = false
+        canSuspendSensorsIndividually = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            sensorManager = inputDevice.sensorManager
+            addSensors()
+        } else {
+            sensorManager = null
+        }
+        sortSensorDetails()
+    }
+
+    private fun addSensors() {
+        tryAddSensor(
+            Sensor.TYPE_ACCELEROMETER,
+            arrayOf(
+                "Accel Right",
+                "Accel Left",
+                "Accel Forward",
+                "Accel Backward",
+                "Accel Up",
+                "Accel Down"
+            ),
+            arrayOf(AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES))
+        )
+
+        tryAddSensor(
+            Sensor.TYPE_GYROSCOPE,
+            arrayOf(
+                "Gyro Pitch Up",
+                "Gyro Pitch Down",
+                "Gyro Roll Right",
+                "Gyro Roll Left",
+                "Gyro Yaw Left",
+                "Gyro Yaw Right"
+            ),
+            arrayOf(AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES))
+        )
+
+        tryAddSensor(Sensor.TYPE_LIGHT, "Light")
+
+        tryAddSensor(Sensor.TYPE_PRESSURE, "Pressure")
+
+        tryAddSensor(Sensor.TYPE_TEMPERATURE, "Device Temperature")
+
+        tryAddSensor(Sensor.TYPE_PROXIMITY, "Proximity")
+
+        tryAddSensor(
+            Sensor.TYPE_GRAVITY,
+            arrayOf(
+                "Gravity Right",
+                "Gravity Left",
+                "Gravity Forward",
+                "Gravity Backward",
+                "Gravity Up",
+                "Gravity Down"
+            ),
+            arrayOf(AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES))
+        )
+
+        tryAddSensor(
+            Sensor.TYPE_LINEAR_ACCELERATION,
+            arrayOf(
+                "Linear Acceleration Right",
+                "Linear Acceleration Left",
+                "Linear Acceleration Forward",
+                "Linear Acceleration Backward",
+                "Linear Acceleration Up",
+                "Linear Acceleration Down"
+            ),
+            arrayOf(AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES))
+        )
+
+        // The values provided by this sensor can be interpreted as an Euler vector or a quaternion.
+        // The directions of X and Y are flipped to match the Wii Remote coordinate system.
+        tryAddSensor(
+            Sensor.TYPE_ROTATION_VECTOR,
+            arrayOf(
+                "Rotation Vector X-",
+                "Rotation Vector X+",
+                "Rotation Vector Y-",
+                "Rotation Vector Y+",
+                "Rotation Vector Z+",
+                "Rotation Vector Z-",
+                "Rotation Vector R",
+                "Rotation Vector Heading Accuracy"
+            ),
+            arrayOf(AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES))
+        )
+
+        tryAddSensor(Sensor.TYPE_RELATIVE_HUMIDITY, "Relative Humidity")
+
+        tryAddSensor(Sensor.TYPE_AMBIENT_TEMPERATURE, "Ambient Temperature")
+
+        // The values provided by this sensor can be interpreted as an Euler vector or a quaternion.
+        // The directions of X and Y are flipped to match the Wii Remote coordinate system.
+        tryAddSensor(
+            Sensor.TYPE_GAME_ROTATION_VECTOR,
+            arrayOf(
+                "Game Rotation Vector X-",
+                "Game Rotation Vector X+",
+                "Game Rotation Vector Y-",
+                "Game Rotation Vector Y+",
+                "Game Rotation Vector Z+",
+                "Game Rotation Vector Z-",
+                "Game Rotation Vector R"
+            ),
+            arrayOf(AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES))
+        )
+
+        tryAddSensor(
+            Sensor.TYPE_GYROSCOPE_UNCALIBRATED,
+            arrayOf(
+                "Gyro Uncalibrated Pitch Up",
+                "Gyro Uncalibrated Pitch Down",
+                "Gyro Uncalibrated Roll Right",
+                "Gyro Uncalibrated Roll Left",
+                "Gyro Uncalibrated Yaw Left",
+                "Gyro Uncalibrated Yaw Right",
+                "Gyro Drift Pitch Up",
+                "Gyro Drift Pitch Down",
+                "Gyro Drift Roll Right",
+                "Gyro Drift Roll Left",
+                "Gyro Drift Yaw Left",
+                "Gyro Drift Yaw Right"
+            ),
+            arrayOf(
+                AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES),
+                AxisSetDetails(3, AXIS_SET_TYPE_DEVICE_COORDINATES)
+            )
+        )
+
+        tryAddSensor(Sensor.TYPE_HEART_RATE, "Heart Rate")
+
+        if (Build.VERSION.SDK_INT >= 24) {
+            tryAddSensor(Sensor.TYPE_HEART_BEAT, "Heart Beat")
+        }
+
+        if (Build.VERSION.SDK_INT >= 26) {
+            tryAddSensor(
+                Sensor.TYPE_ACCELEROMETER_UNCALIBRATED,
+                arrayOf(
+                    "Accel Uncalibrated Right",
+                    "Accel Uncalibrated Left",
+                    "Accel Uncalibrated Forward",
+                    "Accel Uncalibrated Backward",
+                    "Accel Uncalibrated Up",
+                    "Accel Uncalibrated Down",
+                    "Accel Bias Right",
+                    "Accel Bias Left",
+                    "Accel Bias Forward",
+                    "Accel Bias Backward",
+                    "Accel Bias Up",
+                    "Accel Bias Down"
+                ),
+                arrayOf(
+                    AxisSetDetails(0, AXIS_SET_TYPE_DEVICE_COORDINATES),
+                    AxisSetDetails(3, AXIS_SET_TYPE_DEVICE_COORDINATES)
+                )
+            )
+        }
+
+        if (Build.VERSION.SDK_INT >= 30) {
+            tryAddSensor(Sensor.TYPE_HINGE_ANGLE, "Hinge Angle")
+        }
+
+        if (Build.VERSION.SDK_INT >= 33) {
+            // The values provided by this sensor can be interpreted as an Euler vector.
+            // The directions of X and Y are flipped to match the Wii Remote coordinate system.
+            tryAddSensor(
+                Sensor.TYPE_HEAD_TRACKER,
+                arrayOf(
+                    "Head Rotation Vector X-",
+                    "Head Rotation Vector X+",
+                    "Head Rotation Vector Y-",
+                    "Head Rotation Vector Y+",
+                    "Head Rotation Vector Z+",
+                    "Head Rotation Vector Z-",
+                    "Head Pitch Up",
+                    "Head Pitch Down",
+                    "Head Roll Right",
+                    "Head Roll Left",
+                    "Head Yaw Left",
+                    "Head Yaw Right"
+                ),
+                arrayOf(
+                    AxisSetDetails(0, AXIS_SET_TYPE_OTHER_COORDINATES),
+                    AxisSetDetails(3, AXIS_SET_TYPE_OTHER_COORDINATES)
+                )
+            )
+
+            tryAddSensor(Sensor.TYPE_HEADING, arrayOf("Heading", "Heading Accuracy"), arrayOf())
+        }
+    }
+
+    private fun tryAddSensor(sensorType: Int, axisName: String) {
+        tryAddSensor(sensorType, arrayOf(axisName), arrayOf())
+    }
+
+    private fun tryAddSensor(
+        sensorType: Int,
+        axisNames: Array<String>,
+        axisSetDetails: Array<AxisSetDetails>
+    ) {
+        val sensor = sensorManager!!.getDefaultSensor(sensorType)
+        if (sensor != null) {
+            sensorDetails.add(SensorDetails(sensor, sensorType, axisNames, axisSetDetails))
+        }
+    }
+
+    private fun sortSensorDetails() {
+        Collections.sort(
+            sensorDetails,
+            Comparator.comparingInt { s: SensorDetails -> s.sensorType }
+        )
+    }
+
+    override fun onSensorChanged(sensorEvent: SensorEvent) {
+        val sensorDetails = sensorDetails.first{s -> sensorsAreEqual(s.sensor, sensorEvent.sensor)}
+
+        val values = sensorEvent.values
+        val axisNames = sensorDetails.axisNames
+        val axisSetDetails = sensorDetails.axisSetDetails
+
+        var eventAxisIndex = 0
+        var detailsAxisIndex = 0
+        var detailsAxisSetIndex = 0
+        var keepSensorAlive = false
+        while (eventAxisIndex < values.size && detailsAxisIndex < axisNames.size) {
+            if (detailsAxisSetIndex < axisSetDetails.size &&
+                axisSetDetails[detailsAxisSetIndex].firstAxisOfSet == eventAxisIndex
+            ) {
+                var rotation = Surface.ROTATION_0
+                if (rotateCoordinatesForScreenOrientation &&
+                    axisSetDetails[detailsAxisSetIndex].axisSetType == AXIS_SET_TYPE_DEVICE_COORDINATES
+                ) {
+                    rotation = deviceRotation
+                }
+
+                var x: Float
+                var y: Float
+                when (rotation) {
+                    Surface.ROTATION_0 -> {
+                        x = values[eventAxisIndex]
+                        y = values[eventAxisIndex + 1]
+                    }
+
+                    Surface.ROTATION_90 -> {
+                        x = -values[eventAxisIndex + 1]
+                        y = values[eventAxisIndex]
+                    }
+
+                    Surface.ROTATION_180 -> {
+                        x = -values[eventAxisIndex]
+                        y = -values[eventAxisIndex + 1]
+                    }
+
+                    Surface.ROTATION_270 -> {
+                        x = values[eventAxisIndex + 1]
+                        y = -values[eventAxisIndex]
+                    }
+
+                    else -> {
+                        x = values[eventAxisIndex]
+                        y = values[eventAxisIndex + 1]
+                    }
+                }
+
+                val z = values[eventAxisIndex + 2]
+
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex],
+                    x
+                )
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex + 1],
+                    x
+                )
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex + 2],
+                    y
+                )
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex + 3],
+                    y
+                )
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex + 4],
+                    z
+                )
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex + 5],
+                    z
+                )
+
+                eventAxisIndex += 3
+                detailsAxisIndex += 6
+                detailsAxisSetIndex++
+            } else {
+                keepSensorAlive = keepSensorAlive or ControllerInterface.dispatchSensorEvent(
+                    deviceQualifier,
+                    axisNames[detailsAxisIndex], values[eventAxisIndex]
+                )
+
+                eventAxisIndex++
+                detailsAxisIndex++
+            }
+        }
+        if (!keepSensorAlive) {
+            setSensorSuspended(sensorDetails, true)
+        }
+    }
+
+    override fun onAccuracyChanged(sensor: Sensor, i: Int) {
+        // We don't care about this
+    }
+
+    /**
+     * The device qualifier set here will be passed on to native code,
+     * for the purpose of letting native code identify which device this object belongs to.
+     */
+    @Keep
+    fun setDeviceQualifier(deviceQualifier: String) {
+        this.deviceQualifier = deviceQualifier
+    }
+
+    /**
+     * If a sensor has been suspended to save battery, this unsuspends it.
+     * If the sensor isn't currently suspended, nothing happens.
+     *
+     * @param axisName The name of any of the sensor's axes.
+     */
+    @Keep
+    fun requestUnsuspendSensor(axisName: String) {
+        for (sd in sensorDetails) {
+            if (listOf(*sd.axisNames).contains(axisName)) {
+                setSensorSuspended(sd, false)
+            }
+        }
+    }
+
+    private fun setSensorSuspended(sensorDetails: SensorDetails, suspend: Boolean) {
+        var changeOccurred = false
+
+        synchronized(sensorDetails) {
+            if (sensorDetails.isSuspended != suspend) {
+                ControllerInterface.notifySensorSuspendedState(
+                    deviceQualifier,
+                    sensorDetails.axisNames,
+                    suspend
+                )
+
+                if (suspend) {
+                    unsuspendedSensors -= 1
+                } else {
+                    unsuspendedSensors += 1
+                }
+
+                if (canSuspendSensorsIndividually) {
+                    if (suspend) {
+                        sensorManager!!.unregisterListener(this, sensorDetails.sensor)
+                    } else {
+                        sensorManager!!.registerListener(
+                            this,
+                            sensorDetails.sensor,
+                            SAMPLING_PERIOD_US
+                        )
+                    }
+                    sensorDetails.hasRegisteredListener = !suspend
+                } else {
+                    if (suspend) {
+                        // If there are no unsuspended sensors left, unregister them all.
+                        // Otherwise, leave unregistering for later. A possible alternative could be
+                        // to unregister everything and then re-register the sensors we still want,
+                        // but I fear this could lead to dropped inputs.
+                        if (unsuspendedSensors == 0) {
+                            sensorManager!!.unregisterListener(this)
+                            for (sd in this.sensorDetails) {
+                                sd.hasRegisteredListener = false
+                            }
+                        }
+                    } else {
+                        if (!sensorDetails.hasRegisteredListener) {
+                            sensorManager!!.registerListener(
+                                this,
+                                sensorDetails.sensor,
+                                SAMPLING_PERIOD_US
+                            )
+                            sensorDetails.hasRegisteredListener = true
+                        }
+                    }
+                }
+
+                sensorDetails.isSuspended = suspend
+
+                changeOccurred = true
+            }
+        }
+
+        if (changeOccurred) {
+            Log.info((if (suspend) "Suspended sensor " else "Unsuspended sensor ") + sensorDetails.sensor.name)
+        }
+    }
+
+    @Keep
+    fun getAxisNames(): Array<String> {
+        val axisNames = ArrayList<String>()
+        for (sensorDetails in sensorDetails) {
+            sensorDetails.axisNames.forEach { axisNames.add(it) }
+        }
+        return axisNames.toArray(arrayOf())
+    }
+
+    @Keep
+    fun getNegativeAxes(): BooleanArray {
+        val negativeAxes = ArrayList<Boolean>()
+
+        for (sensorDetails in sensorDetails) {
+            var eventAxisIndex = 0
+            var detailsAxisIndex = 0
+            var detailsAxisSetIndex = 0
+            while (detailsAxisIndex < sensorDetails.axisNames.size) {
+                if (detailsAxisSetIndex < sensorDetails.axisSetDetails.size &&
+                    sensorDetails.axisSetDetails[detailsAxisSetIndex].firstAxisOfSet == eventAxisIndex
+                ) {
+                    negativeAxes.add(false)
+                    negativeAxes.add(true)
+                    negativeAxes.add(false)
+                    negativeAxes.add(true)
+                    negativeAxes.add(false)
+                    negativeAxes.add(true)
+
+                    eventAxisIndex += 3
+                    detailsAxisIndex += 6
+                    detailsAxisSetIndex++
+                } else {
+                    negativeAxes.add(false)
+
+                    eventAxisIndex++
+                    detailsAxisIndex++
+                }
+            }
+        }
+
+        val result = BooleanArray(negativeAxes.size)
+        for (i in result.indices) {
+            result[i] = negativeAxes[i]
+        }
+
+        return result
+    }
+
+    companion object {
+        // Set of three axes. Creates a negative companion to each axis, and corrects for device rotation.
+        private const val AXIS_SET_TYPE_DEVICE_COORDINATES = 0
+
+        // Set of three axes. Creates a negative companion to each axis.
+        private const val AXIS_SET_TYPE_OTHER_COORDINATES = 1
+
+        private var deviceRotation = Surface.ROTATION_0
+
+        // The fastest sampling rate Android lets us use without declaring the HIGH_SAMPLING_RATE_SENSORS
+        // permission is 200 Hz. This is also the sampling rate of a Wii Remote, so it fits us perfectly.
+        private const val SAMPLING_PERIOD_US = 1000000 / 200
+
+        /**
+         * Should be called when an activity or other component that uses sensor events is resumed.
+         *
+         * Sensor events that contain device coordinates will have the coordinates rotated by the value
+         * passed to this function.
+         *
+         * @param deviceRotation The current rotation of the device (i.e. rotation of the default display)
+         */
+        fun setDeviceRotation(deviceRotation: Int) {
+            this.deviceRotation = deviceRotation
+        }
+
+        private fun sensorsAreEqual(s1: Sensor, s2: Sensor): Boolean {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && s1.id > 0 && s2.id > 0) {
+                s1.type == s2.type && s1.id == s2.id
+            } else {
+                s1.type == s2.type && s1.name == s2.name
+            }
+        }
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager.kt
new file mode 100644
index 000000000..c3c6ba28d
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager.kt
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import android.os.Vibrator
+import androidx.annotation.Keep
+
+/**
+ * A wrapper around [android.os.VibratorManager], for backwards compatibility.
+ */
+@Keep
+interface DolphinVibratorManager {
+    fun getVibrator(vibratorId: Int): Vibrator
+
+    fun getVibratorIds(): IntArray
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManagerCompat.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManagerCompat.kt
new file mode 100644
index 000000000..039f0ecb6
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManagerCompat.kt
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import android.os.Vibrator
+
+class DolphinVibratorManagerCompat(vibrator: Vibrator) : DolphinVibratorManager {
+    private val vibrator: Vibrator
+    private val vibratorIds: IntArray
+
+    init {
+        this.vibrator = vibrator
+        vibratorIds = if (vibrator.hasVibrator()) intArrayOf(0) else intArrayOf()
+    }
+
+    override fun getVibrator(vibratorId: Int): Vibrator {
+        if (vibratorId > vibratorIds.size)
+            throw IndexOutOfBoundsException()
+
+        return vibrator
+    }
+
+    override fun getVibratorIds(): IntArray = vibratorIds
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManagerPassthrough.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManagerPassthrough.kt
new file mode 100644
index 000000000..089548431
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManagerPassthrough.kt
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import android.os.Build
+import android.os.Vibrator
+import android.os.VibratorManager
+import androidx.annotation.RequiresApi
+
+@RequiresApi(api = Build.VERSION_CODES.S)
+class DolphinVibratorManagerPassthrough(private val vibratorManager: VibratorManager) :
+    DolphinVibratorManager {
+    override fun getVibrator(vibratorId: Int): Vibrator = vibratorManager.getVibrator(vibratorId)
+
+    override fun getVibratorIds(): IntArray = vibratorManager.vibratorIds
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputDetector.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputDetector.kt
new file mode 100644
index 000000000..e180814a5
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputDetector.kt
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import androidx.annotation.Keep
+
+/**
+ * Waits for the user to press inputs, and reports which inputs were pressed.
+ *
+ * The caller is responsible for forwarding input events from Android to ControllerInterface
+ * and then calling [update].
+ */
+class InputDetector {
+    @Keep
+    private val pointer: Long
+
+    constructor() {
+        pointer = createNew()
+    }
+
+    @Keep
+    private constructor(pointer: Long) {
+        this.pointer = pointer
+    }
+
+    external fun finalize()
+
+    private external fun createNew(): Long
+
+    /**
+     * Starts a detection session.
+     *
+     * @param defaultDevice The device to detect inputs from.
+     * @param allDevices Whether to also detect inputs from devices other than the specified one.
+     */
+    external fun start(defaultDevice: String, allDevices: Boolean)
+
+    /**
+     * Checks what inputs are currently pressed and updates internal state.
+     *
+     * During a detection session, this should be called after each call to
+     * [ControllerInterface.dispatchKeyEvent] and [ControllerInterface#dispatchGenericMotionEvent].
+     */
+    external fun update()
+
+    /**
+     * Returns whether a detection session has finished.
+     *
+     * A detection session can end once the user has pressed and released an input or once a timeout
+     * has been reached.
+     */
+    external fun isComplete(): Boolean
+
+    /**
+     * Returns the result of a detection session.
+     *
+     * The result of each detection session is only returned once. If this method is called more
+     * than once without starting a new detection session, the second call onwards will return an
+     * empty string.
+     *
+     * @param defaultDevice The device to detect inputs from. Should normally be the same as the one
+     *                      passed to [start].
+     *
+     * @return The input(s) pressed by the user in the form of an InputCommon expression,
+     *         or an empty string if there were no inputs.
+     */
+    external fun takeResults(defaultDevice: String): String
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingBooleanSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingBooleanSetting.kt
new file mode 100644
index 000000000..5771db54e
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingBooleanSetting.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting
+import org.dolphinemu.dolphinemu.features.settings.model.Settings
+
+class InputMappingBooleanSetting(private val numericSetting: NumericSetting) :
+    AbstractBooleanSetting {
+    override val boolean: Boolean
+        get() = numericSetting.getBooleanValue()
+
+    override fun setBoolean(settings: Settings, newValue: Boolean) =
+        numericSetting.setBooleanValue(newValue)
+
+    override val isOverridden: Boolean = false
+
+    override val isRuntimeEditable: Boolean = true
+
+    override fun delete(settings: Settings): Boolean {
+        numericSetting.setBooleanValue(numericSetting.getBooleanDefaultValue())
+        return true
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingDoubleSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingDoubleSetting.kt
new file mode 100644
index 000000000..e2da06225
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingDoubleSetting.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractFloatSetting
+import org.dolphinemu.dolphinemu.features.settings.model.Settings
+
+// Yes, floats are not the same thing as doubles... They're close enough, though
+class InputMappingDoubleSetting(private val numericSetting: NumericSetting) : AbstractFloatSetting {
+    override val float: Float
+        get() = numericSetting.getDoubleValue().toFloat()
+
+    override fun setFloat(settings: Settings, newValue: Float) =
+        numericSetting.setDoubleValue(newValue.toDouble())
+
+    override val isOverridden: Boolean = false
+
+    override val isRuntimeEditable: Boolean = true
+
+    override fun delete(settings: Settings): Boolean {
+        numericSetting.setDoubleValue(numericSetting.getDoubleDefaultValue())
+        return true
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingIntSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingIntSetting.kt
new file mode 100644
index 000000000..3e8a14afc
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingIntSetting.kt
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractIntSetting
+import org.dolphinemu.dolphinemu.features.settings.model.Settings
+
+class InputMappingIntSetting(private val numericSetting: NumericSetting) : AbstractIntSetting {
+    override val int: Int
+        get() = numericSetting.getIntValue()
+
+    override fun setInt(settings: Settings, newValue: Int) = numericSetting.setIntValue(newValue)
+
+    override val isOverridden: Boolean = false
+
+    override val isRuntimeEditable: Boolean = true
+
+    override fun delete(settings: Settings): Boolean {
+        numericSetting.setIntValue(numericSetting.getIntDefaultValue())
+        return true
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt
new file mode 100644
index 000000000..8224434ee
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/InputOverrider.kt
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+object InputOverrider {
+    external fun registerGameCube(controllerIndex: Int)
+
+    external fun registerWii(controllerIndex: Int)
+
+    external fun unregisterGameCube(controllerIndex: Int)
+
+    external fun unregisterWii(controllerIndex: Int)
+
+    external fun setControlState(controllerIndex: Int, control: Int, state: Double)
+
+    external fun clearControlState(controllerIndex: Int, control: Int)
+
+    // Angle is in radians and should be non-negative
+    external fun getGateRadiusAtAngle(emuPadId: Int, stick: Int, angle: Double): Double
+
+    object ControlId {
+        const val GCPAD_A_BUTTON = 0
+        const val GCPAD_B_BUTTON = 1
+        const val GCPAD_X_BUTTON = 2
+        const val GCPAD_Y_BUTTON = 3
+        const val GCPAD_Z_BUTTON = 4
+        const val GCPAD_START_BUTTON = 5
+        const val GCPAD_DPAD_UP = 6
+        const val GCPAD_DPAD_DOWN = 7
+        const val GCPAD_DPAD_LEFT = 8
+        const val GCPAD_DPAD_RIGHT = 9
+        const val GCPAD_L_DIGITAL = 10
+        const val GCPAD_R_DIGITAL = 11
+        const val GCPAD_L_ANALOG = 12
+        const val GCPAD_R_ANALOG = 13
+        const val GCPAD_MAIN_STICK_X = 14
+        const val GCPAD_MAIN_STICK_Y = 15
+        const val GCPAD_C_STICK_X = 16
+        const val GCPAD_C_STICK_Y = 17
+
+        const val WIIMOTE_A_BUTTON = 18
+        const val WIIMOTE_B_BUTTON = 19
+        const val WIIMOTE_ONE_BUTTON = 20
+        const val WIIMOTE_TWO_BUTTON = 21
+        const val WIIMOTE_PLUS_BUTTON = 22
+        const val WIIMOTE_MINUS_BUTTON = 23
+        const val WIIMOTE_HOME_BUTTON = 24
+        const val WIIMOTE_DPAD_UP = 25
+        const val WIIMOTE_DPAD_DOWN = 26
+        const val WIIMOTE_DPAD_LEFT = 27
+        const val WIIMOTE_DPAD_RIGHT = 28
+        const val WIIMOTE_IR_X = 29
+        const val WIIMOTE_IR_Y = 30
+
+        const val NUNCHUK_C_BUTTON = 31
+        const val NUNCHUK_Z_BUTTON = 32
+        const val NUNCHUK_STICK_X = 33
+        const val NUNCHUK_STICK_Y = 34
+
+        const val CLASSIC_A_BUTTON = 35
+        const val CLASSIC_B_BUTTON = 36
+        const val CLASSIC_X_BUTTON = 37
+        const val CLASSIC_Y_BUTTON = 38
+        const val CLASSIC_ZL_BUTTON = 39
+        const val CLASSIC_ZR_BUTTON = 40
+        const val CLASSIC_PLUS_BUTTON = 41
+        const val CLASSIC_MINUS_BUTTON = 42
+        const val CLASSIC_HOME_BUTTON = 43
+        const val CLASSIC_DPAD_UP = 44
+        const val CLASSIC_DPAD_DOWN = 45
+        const val CLASSIC_DPAD_LEFT = 46
+        const val CLASSIC_DPAD_RIGHT = 47
+        const val CLASSIC_L_DIGITAL = 48
+        const val CLASSIC_R_DIGITAL = 49
+        const val CLASSIC_L_ANALOG = 50
+        const val CLASSIC_R_ANALOG = 51
+        const val CLASSIC_LEFT_STICK_X = 52
+        const val CLASSIC_LEFT_STICK_Y = 53
+        const val CLASSIC_RIGHT_STICK_X = 54
+        const val CLASSIC_RIGHT_STICK_Y = 55
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.kt
new file mode 100644
index 000000000..622f4f551
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.kt
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+object MappingCommon {
+    external fun getExpressionForControl(
+        control: String,
+        device: String,
+        defaultDevice: String
+    ): String
+
+    external fun save()
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.kt
new file mode 100644
index 000000000..fcc420c74
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.kt
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu
+
+import androidx.annotation.Keep
+
+/**
+ * Represents a C++ ControllerEmu::Control.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+@Keep
+class Control private constructor(private val pointer: Long) {
+    external fun getUiName(): String
+
+    external fun getControlReference(): ControlReference
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroup.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroup.kt
new file mode 100644
index 000000000..9c5132b1a
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroup.kt
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu
+
+import androidx.annotation.Keep
+
+/**
+ * Represents a C++ ControllerEmu::ControlGroup.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+@Keep
+class ControlGroup private constructor(private val pointer: Long) {
+    external fun getUiName(): String
+
+    external fun getGroupType(): Int
+
+    external fun getDefaultEnabledValue(): Int
+
+    external fun getEnabled(): Boolean
+
+    external fun setEnabled(value: Boolean)
+
+    external fun getControlCount(): Int
+
+    external fun getControl(i: Int): Control
+
+    external fun getNumericSettingCount(): Int
+
+    external fun getNumericSetting(i: Int): NumericSetting
+
+    /**
+     * If getGroupType returns TYPE_ATTACHMENTS, this returns the attachment selection setting.
+     * Otherwise, undefined behavior!
+     */
+    external fun getAttachmentSetting(): NumericSetting
+
+    companion object {
+        const val TYPE_OTHER = 0
+        const val TYPE_STICK = 1
+        const val TYPE_MIXED_TRIGGERS = 2
+        const val TYPE_BUTTONS = 3
+        const val TYPE_FORCE = 4
+        const val TYPE_ATTACHMENTS = 5
+        const val TYPE_TILT = 6
+        const val TYPE_CURSOR = 7
+        const val TYPE_TRIGGERS = 8
+        const val TYPE_SLIDER = 9
+        const val TYPE_SHAKE = 10
+        const val TYPE_IMU_ACCELEROMETER = 11
+        const val TYPE_IMU_GYROSCOPE = 12
+        const val TYPE_IMU_CURSOR = 13
+
+        const val DEFAULT_ENABLED_ALWAYS = 0
+        const val DEFAULT_ENABLED_YES = 1
+        const val DEFAULT_ENABLED_NO = 2
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlReference.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlReference.kt
new file mode 100644
index 000000000..cd0c7848a
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlReference.kt
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu
+
+import androidx.annotation.Keep
+
+/**
+ * Represents a C++ ControlReference.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+@Keep
+class ControlReference private constructor(private val pointer: Long) {
+    external fun getState(): Double
+
+    external fun getExpression(): String
+
+    /**
+     * Sets the expression for this control reference.
+     *
+     * @param expr The new expression
+     * @return null on success, a human-readable error on failure
+     */
+    external fun setExpression(expr: String): String?
+
+    external fun isInput(): Boolean
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt
new file mode 100644
index 000000000..e0938b975
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu
+
+import androidx.annotation.Keep
+
+/**
+ * Represents a C++ ControllerEmu::ControlGroupContainer.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+@Keep
+open class ControlGroupContainer constructor(private val pointer: Long) {
+  external fun getGroupCount(): Int
+
+  external fun getGroup(index: Int): ControlGroup
+}
+
+/**
+ * Represents a C++ ControllerEmu::EmulatedController.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+@Keep
+class EmulatedController private constructor(private val pointer: Long) : ControlGroupContainer(pointer) {
+    external fun getDefaultDevice(): String
+
+    external fun setDefaultDevice(device: String)
+
+    external fun updateSingleControlReference(controlReference: ControlReference)
+
+    external fun loadDefaultSettings()
+
+    external fun clearSettings()
+
+    external fun loadProfile(path: String)
+
+    external fun saveProfile(path: String)
+
+    external fun getProfileKey(): String
+
+    external fun getUserProfileDirectoryPath(): String
+
+    external fun getSysProfileDirectoryPath(): String
+
+    companion object {
+        @JvmStatic
+        external fun getGcPad(controllerIndex: Int): EmulatedController
+
+        @JvmStatic
+        external fun getGcKeyboard(controllerIndex: Int): EmulatedController
+
+        @JvmStatic
+        external fun getWiimote(controllerIndex: Int): EmulatedController
+
+        @JvmStatic
+        external fun getWiimoteAttachment(
+            controllerIndex: Int,
+            attachmentIndex: Int
+        ): ControlGroupContainer
+
+        @JvmStatic
+        external fun getSelectedWiimoteAttachment(controllerIndex: Int): Int
+
+        @JvmStatic
+        external fun getSidewaysWiimoteSetting(controllerIndex: Int): NumericSetting
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting.kt
new file mode 100644
index 000000000..0a2485dea
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting.kt
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu
+
+import androidx.annotation.Keep
+
+/**
+ * Represents a C++ ControllerEmu::NumericSetting.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+@Keep
+class NumericSetting private constructor(private val pointer: Long) {
+    /**
+     * @return The name used in the UI.
+     */
+    external fun getUiName(): String
+
+    /**
+     * @return A string applied to the number in the UI (unit of measure).
+     */
+    external fun getUiSuffix(): String
+
+    /**
+     * @return Detailed description of the setting.
+     */
+    external fun getUiDescription(): String
+
+    /**
+     * @return TYPE_INT, TYPE_DOUBLE or TYPE_BOOLEAN
+     */
+    external fun getType(): Int
+
+    external fun getControlReference(): ControlReference
+
+    /**
+     * If the type is TYPE_INT, gets the current value. Otherwise, undefined behavior!
+     */
+    external fun getIntValue(): Int
+
+    /**
+     * If the type is TYPE_INT, sets the current value. Otherwise, undefined behavior!
+     */
+    external fun setIntValue(value: Int)
+
+    /**
+     * If the type is TYPE_INT, gets the default value. Otherwise, undefined behavior!
+     */
+    external fun getIntDefaultValue(): Int
+
+    /**
+     * If the type is TYPE_DOUBLE, gets the current value. Otherwise, undefined behavior!
+     */
+    external fun getDoubleValue(): Double
+
+    /**
+     * If the type is TYPE_DOUBLE, sets the current value. Otherwise, undefined behavior!
+     */
+    external fun setDoubleValue(value: Double)
+
+    /**
+     * If the type is TYPE_DOUBLE, gets the default value. Otherwise, undefined behavior!
+     */
+    external fun getDoubleDefaultValue(): Double
+
+    /**
+     * If the type is TYPE_DOUBLE, returns the minimum valid value. Otherwise, undefined behavior!
+     */
+    external fun getDoubleMin(): Double
+
+    /**
+     * If the type is TYPE_DOUBLE, returns the maximum valid value. Otherwise, undefined behavior!
+     */
+    external fun getDoubleMax(): Double
+
+    /**
+     * If the type is TYPE_BOOLEAN, gets the current value. Otherwise, undefined behavior!
+     */
+    external fun getBooleanValue(): Boolean
+
+    /**
+     * If the type is TYPE_BOOLEAN, sets the current value. Otherwise, undefined behavior!
+     */
+    external fun setBooleanValue(value: Boolean)
+
+    /**
+     * If the type is TYPE_BOOLEAN, gets the default value. Otherwise, undefined behavior!
+     */
+    external fun getBooleanDefaultValue(): Boolean
+
+    companion object {
+        const val TYPE_INT = 0
+        const val TYPE_DOUBLE = 1
+        const val TYPE_BOOLEAN = 2
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/NetplaySession.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/NetplaySession.kt
new file mode 100644
index 000000000..2026064d7
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/NetplaySession.kt
@@ -0,0 +1,448 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.netplay
+
+import androidx.annotation.Keep
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.runningFold
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.withContext
+import org.dolphinemu.dolphinemu.features.netplay.model.GameDigestProgress
+import org.dolphinemu.dolphinemu.features.netplay.model.NetplayMessage
+import org.dolphinemu.dolphinemu.features.netplay.model.Player
+import org.dolphinemu.dolphinemu.features.netplay.model.SaveTransferProgress
+import org.dolphinemu.dolphinemu.features.netplay.model.TraversalState
+import org.dolphinemu.dolphinemu.features.settings.model.StringSetting
+import org.dolphinemu.dolphinemu.model.GameFile
+
+class NetplaySession(
+    gameFiles: Array<GameFile> = emptyArray(),
+    private val onClosed: (NetplaySession) -> Unit,
+) {
+
+    @Keep
+    private var netPlayUICallbacksPointer: Long =
+        nativeCreateUICallbacks(gameFiles)
+
+    @Keep
+    private var netPlayClientPointer: Long = 0
+
+    @Keep
+    private var netPlayServerPointer: Long = 0
+
+    @Keep
+    private var bootSessionDataPointer: Long = 0
+
+    private val sessionScope = CoroutineScope(SupervisorJob())
+
+    @Volatile
+    var isClosed = false
+        private set
+
+    val isHosting: Boolean
+        get() = netPlayServerPointer != 0L
+
+    val isLaunching: Boolean
+        get() = bootSessionDataPointer != 0L
+
+    val nickName by lazy { StringSetting.NETPLAY_NICKNAME.string }
+
+    private val _launchGame = Channel<String>(Channel.CONFLATED)
+    val launchGame = _launchGame.receiveAsFlow()
+
+    private val _stopGame = Channel<Unit>(Channel.CONFLATED)
+    val stopGame = _stopGame.receiveAsFlow()
+
+    private val _connectionLost = Channel<Unit>(Channel.CONFLATED)
+    val connectionLost = _connectionLost.receiveAsFlow()
+
+    private val _connectionErrors = Channel<String>(Channel.BUFFERED)
+    val connectionErrors = _connectionErrors.receiveAsFlow()
+
+    private val _messages = MutableSharedFlow<List<NetplayMessage>>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val messages = _messages.asSharedFlow()
+
+    private val _players = MutableSharedFlow<List<Player>>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val players = _players.asSharedFlow().distinctUntilChanged()
+
+    private val _chatMessages = MutableSharedFlow<String>(
+        extraBufferCapacity = 32,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val chatMessages = _chatMessages.asSharedFlow()
+
+    private val _game = MutableSharedFlow<String>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val game = _game.asSharedFlow()
+
+    private val _hostInputAuthorityEnabled = MutableSharedFlow<Boolean>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val hostInputAuthorityEnabled = _hostInputAuthorityEnabled.asSharedFlow()
+
+    private val _padBuffer = MutableSharedFlow<Int>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val padBuffer = _padBuffer.asSharedFlow()
+
+    private val _desyncMessages = MutableSharedFlow<NetplayMessage.Desync>(
+        extraBufferCapacity = 32,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val desyncMessages = _desyncMessages.asSharedFlow()
+
+    private val _saveTransferProgress = MutableStateFlow<SaveTransferProgress?>(null)
+    val saveTransferProgress = _saveTransferProgress.asStateFlow()
+
+    private val _gameDigestProgress = MutableStateFlow<GameDigestProgress?>(null)
+    val gameDigestProgress = _gameDigestProgress.asStateFlow()
+
+    private val _traversalState = MutableSharedFlow<TraversalState>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val traversalState = _traversalState.asSharedFlow()
+
+    private val _fatalTraversalError = Channel<TraversalState.Failure>(Channel.CONFLATED)
+    val fatalTraversalError = _fatalTraversalError.receiveAsFlow()
+
+    suspend fun join(): Boolean = withContext(Dispatchers.IO) {
+        if (isClosed) throw IllegalStateException("Cannot join a closed session")
+
+        mergeMessages()
+            .runningFold(emptyList<NetplayMessage>()) { acc, msg -> listOf(msg) + acc }
+            .onEach { _messages.tryEmit(it) }
+            .launchIn(sessionScope)
+
+        netPlayClientPointer = nativeJoin()
+
+        if (netPlayClientPointer == 0L || !isActive) {
+            closeBlocking()
+            return@withContext false
+        }
+
+        true
+    }
+
+    suspend fun host(): Boolean = withContext(Dispatchers.IO) {
+        if (isClosed) throw IllegalStateException("Cannot host a closed session")
+
+        netPlayServerPointer = nativeHost()
+        if (netPlayServerPointer == 0L || !isActive) {
+            closeBlocking()
+            return@withContext false
+        }
+
+        join()
+    }
+
+    fun sendMessage(message: String) {
+        _chatMessages.tryEmit("$nickName: $message")
+        nativeSendMessage(message)
+    }
+
+    fun setHostInputAuthority(enable: Boolean) = nativeSetHostInputAuthority(enable)
+
+    fun adjustClientPadBufferSize(buffer: Int) = nativeAdjustClientPadBufferSize(buffer)
+
+    fun adjustServerPadBufferSize(buffer: Int) = nativeAdjustServerPadBufferSize(buffer)
+
+    fun changeGame(gameFile: GameFile) = nativeChangeGame(gameFile)
+
+    fun doAllPlayersHaveGame(): Boolean = nativeDoAllPlayersHaveGame()
+
+    fun startGame() = nativeStartGame()
+
+    fun getPort(): Int = nativeGetPort()
+
+    fun getExternalIpAddress(): String? = nativeGetExternalIpAddress()
+
+    fun reconnectTraversal() = nativeReconnectTraversal()
+
+    fun consumeBootSessionData(): Long {
+        return bootSessionDataPointer.also {
+            bootSessionDataPointer = 0
+        }
+    }
+
+    suspend fun close() = withContext(Dispatchers.IO) {
+        closeBlocking()
+    }
+
+    @Synchronized
+    fun closeBlocking() {
+        if (isClosed) return
+        isClosed = true
+        sessionScope.cancel()
+        releaseNativeResources()
+        onClosed(this)
+    }
+
+    protected fun finalize() {
+        releaseNativeResources()
+    }
+
+    private fun mergeMessages(): Flow<NetplayMessage> = merge(
+        chatMessages.map { NetplayMessage.Chat(it) },
+        game.map { NetplayMessage.GameChanged(it) },
+        hostInputAuthorityEnabled.map { NetplayMessage.HostInputAuthorityChanged(it) },
+        padBuffer.map { NetplayMessage.BufferChanged(it) },
+        desyncMessages,
+    )
+
+    private fun releaseNativeResources() {
+        val currentBootSessionDataPointer = bootSessionDataPointer
+        if (currentBootSessionDataPointer != 0L) {
+            bootSessionDataPointer = 0
+            nativeReleaseBootSessionData(currentBootSessionDataPointer)
+        }
+
+        val currentNetPlayClientPointer = netPlayClientPointer
+        if (currentNetPlayClientPointer != 0L) {
+            netPlayClientPointer = 0
+            nativeReleaseClient(currentNetPlayClientPointer)
+        }
+
+        val currentNetPlayServerPointer = netPlayServerPointer
+        if (currentNetPlayServerPointer != 0L) {
+            netPlayServerPointer = 0
+            nativeReleaseServer(currentNetPlayServerPointer)
+        }
+
+        val currentNetPlayUICallbacksPointer = netPlayUICallbacksPointer
+        if (currentNetPlayUICallbacksPointer != 0L) {
+            netPlayUICallbacksPointer = 0
+            nativeReleaseUICallbacks(currentNetPlayUICallbacksPointer)
+        }
+    }
+
+    // JNI methods
+
+    private external fun nativeCreateUICallbacks(gameFiles: Array<GameFile>): Long
+
+    private external fun nativeJoin(): Long
+
+    private external fun nativeHost(): Long
+
+    private external fun nativeSendMessage(message: String)
+
+    private external fun nativeSetHostInputAuthority(enable: Boolean)
+
+    private external fun nativeAdjustClientPadBufferSize(buffer: Int)
+
+    private external fun nativeAdjustServerPadBufferSize(buffer: Int)
+
+    private external fun nativeReleaseUICallbacks(pointer: Long)
+
+    private external fun nativeReleaseClient(pointer: Long)
+
+    private external fun nativeReleaseServer(pointer: Long)
+
+    private external fun nativeReleaseBootSessionData(pointer: Long)
+
+    private external fun nativeChangeGame(gameFile: GameFile)
+
+    private external fun nativeDoAllPlayersHaveGame(): Boolean
+
+    private external fun nativeStartGame()
+
+    private external fun nativeGetPort(): Int
+
+    private external fun nativeGetExternalIpAddress(): String?
+
+    private external fun nativeReconnectTraversal()
+
+    // NetPlayUI callbacks
+
+    @Keep
+    fun onBootGame(gameFilePath: String, bootSessionDataPointer: Long) {
+        this.bootSessionDataPointer = bootSessionDataPointer
+        _stopGame.flush()
+        _launchGame.trySend(gameFilePath)
+    }
+
+    @Keep
+    fun onStopGame() {
+        _stopGame.trySend(Unit)
+    }
+
+    @Keep
+    fun onConnectionLost() {
+        _connectionLost.trySend(Unit)
+    }
+
+    @Keep
+    fun onConnectionError(message: String) {
+        _connectionErrors.trySend(message)
+    }
+
+    @Keep
+    fun onUpdate(players: Array<Player>) {
+        _players.tryEmit(players.toList())
+    }
+
+    @Keep
+    fun onChatMessageReceived(message: String) {
+        _chatMessages.tryEmit(message)
+    }
+
+    @Keep
+    fun onHostInputAuthorityChanged(enabled: Boolean) {
+        _hostInputAuthorityEnabled.tryEmit(enabled)
+    }
+
+    @Keep
+    fun onGameChanged(game: String) {
+        _game.tryEmit(game)
+    }
+
+    @Keep
+    fun onPadBufferChanged(buffer: Int) {
+        if (_hostInputAuthorityEnabled.replayCache.firstOrNull() == true) return
+        _padBuffer.tryEmit(buffer)
+    }
+
+    @Keep
+    fun onDesync(frame: Int, player: String) {
+        _desyncMessages.tryEmit(NetplayMessage.Desync(player, frame))
+    }
+
+    @Keep
+    fun onShowChunkedProgressDialog(title: String, dataSize: Long, playerIds: IntArray) {
+        val players = _players.replayCache.firstOrNull()
+        _saveTransferProgress.value = SaveTransferProgress(
+            title = title,
+            totalSize = dataSize,
+            playerProgresses = playerIds.map { playerId ->
+                SaveTransferProgress.PlayerProgress(
+                    playerId = playerId,
+                    name = players?.find { it.pid == playerId }?.name ?: "Invalid Player ID",
+                    progress = 0,
+                )
+            },
+        )
+    }
+
+    @Keep
+    fun onSetChunkedProgress(playerId: Int, progress: Long) {
+        val current = _saveTransferProgress.value
+        _saveTransferProgress.value = current?.copy(
+            playerProgresses = current.playerProgresses.map {
+                if (it.playerId == playerId) {
+                    it.copy(progress = progress)
+                } else {
+                    it
+                }
+            }
+        )
+    }
+
+    @Keep
+    fun onHideChunkedProgressDialog() {
+        _saveTransferProgress.value = null
+    }
+
+    @Keep
+    fun onShowGameDigestDialog(title: String) {
+        val players = _players.replayCache.firstOrNull()
+        _gameDigestProgress.value = GameDigestProgress(
+            title = title,
+            playerProgresses = players?.map { player ->
+                GameDigestProgress.PlayerProgress(
+                    playerId = player.pid,
+                    name = player.name,
+                    progress = 0,
+                    result = null,
+                )
+            } ?: emptyList(),
+            matches = null,
+        )
+    }
+
+    @Keep
+    fun onSetGameDigestProgress(playerId: Int, progress: Int) {
+        val current = _gameDigestProgress.value ?: return
+        _gameDigestProgress.value = current.copy(
+            playerProgresses = current.playerProgresses.map {
+                if (it.playerId == playerId) it.copy(progress = progress) else it
+            }
+        )
+    }
+
+    @Keep
+    fun onSetGameDigestResult(playerId: Int, result: String) {
+        val current = _gameDigestProgress.value ?: return
+        val updated = current.copy(
+            playerProgresses = current.playerProgresses.map {
+                if (it.playerId == playerId) it.copy(result = result) else it
+            }
+        )
+        val finished = updated.playerProgresses.all { it.result != null }
+        _gameDigestProgress.value = if (finished) {
+            val results = updated.playerProgresses.map { it.result }
+            updated.copy(matches = results.distinct().size == 1)
+        } else {
+            updated
+        }
+    }
+
+    /**
+     * Hosts send this when they dismiss their dialog even in a successful scenario. Ensuring
+     * that the value is cleared before a new game digest is started. Without this, StateFlow
+     * would not be a good choice.
+     */
+    @Keep
+    fun onAbortGameDigest() {
+        _gameDigestProgress.value = null
+    }
+
+    @Keep
+    fun onTraversalStateChanged(
+        state: Int,
+        hostCode: String?,
+        externalAddress: String?,
+        failureReason: String?,
+    ) {
+        val traversalState = when (state) {
+            0 -> TraversalState.Connecting
+            1 -> TraversalState.Connected(hostCode!!, externalAddress!!)
+            2 -> TraversalState.Failure(failureReason!!)
+            else -> return
+        }
+        _traversalState.tryEmit(traversalState)
+
+        if (failureReason == "BadHost" || failureReason == "VersionTooOld") {
+            _fatalTraversalError.trySend(TraversalState.Failure(failureReason))
+        }
+    }
+}
+
+private fun <T> Channel<T>.flush() {
+    while (this.tryReceive().isSuccess) Unit
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/GameDigestProgress.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/GameDigestProgress.kt
new file mode 100644
index 000000000..923f03068
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/GameDigestProgress.kt
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.netplay.model
+
+data class GameDigestProgress(
+    val title: String,
+    val playerProgresses: List<PlayerProgress>,
+    val matches: Boolean?,
+) {
+    data class PlayerProgress(
+        val playerId: Int,
+        val name: String,
+        val progress: Int,
+        val result: String?,
+    )
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplayMessage.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplayMessage.kt
new file mode 100644
index 000000000..c408d3be9
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/NetplayMessage.kt
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.netplay.model
+
+import android.content.Context
+import org.dolphinemu.dolphinemu.R
+
+sealed class NetplayMessage {
+    abstract fun message(context: Context): String
+
+    class Chat(private val chatMessage: String) : NetplayMessage() {
+        override fun message(context: Context) = chatMessage
+    }
+
+    class GameChanged(private val game: String) : NetplayMessage() {
+        override fun message(context: Context) =
+            context.getString(R.string.netplay_message_game_changed, game)
+    }
+
+    class HostInputAuthorityChanged(private val hostInputAuthorityEnabled: Boolean) : NetplayMessage() {
+        override fun message(context: Context) = context.getString(
+            R.string.netplay_message_host_input_authority_changed,
+            if (hostInputAuthorityEnabled) "enabled" else "disabled"
+        )
+    }
+
+    class BufferChanged(private val buffer: Int) : NetplayMessage() {
+        override fun message(context: Context) =
+            context.getString(R.string.netplay_message_buffer_changed, buffer)
+    }
+
+    class Desync(private val player: String, private val frame: Int) : NetplayMessage() {
+        override fun message(context: Context) =
+            context.getString(R.string.netplay_message_desync, player, frame)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/Player.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/Player.kt
new file mode 100644
index 000000000..31d0d0ccf
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/Player.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.netplay.model
+
+import androidx.annotation.Keep
+
+@Keep
+data class Player(
+    val pid: Int,
+    val name: String,
+    val revision: String,
+    val ping: Int,
+    val isHost: Boolean,
+    val mapping: String,
+)
\ No newline at end of file
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/SaveTransferProgress.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/SaveTransferProgress.kt
new file mode 100644
index 000000000..826510141
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/SaveTransferProgress.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.netplay.model
+
+data class SaveTransferProgress(
+    val title: String,
+    val totalSize: Long,
+    val playerProgresses: List<PlayerProgress>
+) {
+    data class PlayerProgress(
+        val playerId: Int,
+        val name: String,
+        val progress: Long,
+    )
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/TraversalState.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/TraversalState.kt
new file mode 100644
index 000000000..0c36fdf58
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/netplay/model/TraversalState.kt
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.netplay.model
+
+import android.content.Context
+import org.dolphinemu.dolphinemu.R
+
+sealed class TraversalState {
+    data object Connecting : TraversalState()
+
+    data class Connected(val hostCode: String, val externalAddress: String) : TraversalState()
+
+    data class Failure(val reason: String) : TraversalState() {
+        fun message(context: Context) = when (reason) {
+            "BadHost" -> context.getString(R.string.netplay_traversal_error_bad_host)
+            "VersionTooOld" -> context.getString(R.string.netplay_traversal_error_version_too_old)
+            else -> reason
+        }
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.kt
new file mode 100644
index 000000000..ba3fd41d6
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.kt
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.riivolution.model
+
+import androidx.annotation.Keep
+
+class RiivolutionPatches(
+    private val gameId: String,
+    private val revision: Int,
+    private val discNumber: Int
+) {
+    private var unsavedChanges = false
+
+    @Keep
+    private val pointer: Long = initialize()
+
+    external fun finalize()
+
+    external fun getDiscCount(): Int
+
+    external fun getDiscName(discIndex: Int): String
+
+    external fun getSectionCount(discIndex: Int): Int
+
+    external fun getSectionName(discIndex: Int, sectionIndex: Int): String
+
+    external fun getOptionCount(discIndex: Int, sectionIndex: Int): Int
+
+    external fun getOptionName(discIndex: Int, sectionIndex: Int, optionIndex: Int): String
+
+    external fun getChoiceCount(discIndex: Int, sectionIndex: Int, optionIndex: Int): Int
+
+    external fun getChoiceName(
+        discIndex: Int,
+        sectionIndex: Int,
+        optionIndex: Int,
+        choiceIndex: Int
+    ): String
+
+    /**
+     * @return 0 if no choice is selected, otherwise the index of the selected choice plus one.
+     */
+    external fun getSelectedChoice(discIndex: Int, sectionIndex: Int, optionIndex: Int): Int
+
+    /**
+     * @param choiceIndex 0 to select no choice, otherwise the choice index plus one.
+     */
+    fun setSelectedChoice(discIndex: Int, sectionIndex: Int, optionIndex: Int, choiceIndex: Int) {
+        unsavedChanges = true
+        setSelectedChoiceImpl(discIndex, sectionIndex, optionIndex, choiceIndex)
+    }
+
+    /**
+     * @param choiceIndex 0 to select no choice, otherwise the choice index plus one.
+     */
+    private external fun setSelectedChoiceImpl(
+        discIndex: Int, sectionIndex: Int, optionIndex: Int,
+        choiceIndex: Int
+    )
+
+    fun loadConfig() {
+        loadConfigImpl(gameId, revision, discNumber)
+    }
+
+    private external fun loadConfigImpl(gameId: String, revision: Int, discNumber: Int)
+
+    fun saveConfig() {
+        if (unsavedChanges) {
+            unsavedChanges = false
+            saveConfigImpl(gameId)
+        }
+    }
+
+    private external fun saveConfigImpl(gameId: String)
+
+    companion object {
+        @JvmStatic
+        private external fun initialize(): Long
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractBooleanSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractBooleanSetting.kt
new file mode 100644
index 000000000..6196597da
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractBooleanSetting.kt
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+interface AbstractBooleanSetting : AbstractSetting {
+    val boolean: Boolean
+
+    fun setBoolean(settings: Settings, newValue: Boolean)
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractFloatSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractFloatSetting.kt
new file mode 100644
index 000000000..7dd4c82c0
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractFloatSetting.kt
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+interface AbstractFloatSetting : AbstractSetting {
+    val float: Float
+
+    fun setFloat(settings: Settings, newValue: Float)
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.kt
new file mode 100644
index 000000000..f22077dd6
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.kt
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+interface AbstractIntSetting : AbstractSetting {
+    val int: Int
+
+    fun setInt(settings: Settings, newValue: Int)
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractSetting.kt
new file mode 100644
index 000000000..6afcfab2e
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractSetting.kt
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+interface AbstractSetting {
+    val isOverridden: Boolean
+    val isRuntimeEditable: Boolean
+
+    fun delete(settings: Settings): Boolean
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractStringSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractStringSetting.kt
new file mode 100644
index 000000000..7828dbd55
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractStringSetting.kt
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+interface AbstractStringSetting : AbstractSetting {
+    val string: String
+
+    fun setString(settings: Settings, newValue: String)
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AchievementModel.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AchievementModel.kt
new file mode 100644
index 000000000..f62b2f146
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AchievementModel.kt
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+object AchievementModel {
+    @JvmStatic
+    external fun init()
+
+    suspend fun asyncLogin(password: String): Boolean {
+        return withContext(Dispatchers.IO) {
+            login(password)
+        }
+    }
+
+    @JvmStatic
+    private external fun login(password: String): Boolean
+
+    @JvmStatic
+    external fun logout()
+
+    @JvmStatic
+    external fun isHardcoreModeActive(): Boolean
+
+    @JvmStatic
+    external fun shutdown()
+
+    @JvmStatic
+    external fun getAchievementsJSON(): String
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.kt
new file mode 100644
index 000000000..f62ead325
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.kt
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+class AdHocBooleanSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: Boolean
+) : AbstractBooleanSetting {
+    init {
+        require(
+            NativeConfig.isSettingSaveable(
+                file,
+                section,
+                key
+            )
+        ) { "File/section/key is unknown or legacy" }
+    }
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean = true
+
+    override fun delete(settings: Settings): Boolean {
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val boolean: Boolean
+        get() = NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, file, section, key, defaultValue)
+
+    override fun setBoolean(settings: Settings, newValue: Boolean) {
+        NativeConfig.setBoolean(settings.writeLayer, file, section, key, newValue)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocStringSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocStringSetting.kt
new file mode 100644
index 000000000..fd416d890
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocStringSetting.kt
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+class AdHocStringSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: String
+) : AbstractStringSetting {
+    init {
+        require(
+            NativeConfig.isSettingSaveable(
+                file,
+                section,
+                key
+            )
+        ) { "File/section/key is unknown or legacy" }
+    }
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean = true
+
+    override fun delete(settings: Settings): Boolean {
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val string: String
+        get() = NativeConfig.getString(NativeConfig.LAYER_ACTIVE, file, section, key, defaultValue)
+
+    override fun setString(settings: Settings, newValue: String) {
+        NativeConfig.setString(settings.writeLayer, file, section, key, newValue)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt
new file mode 100644
index 000000000..68c859082
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt
@@ -0,0 +1,1040 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import java.util.*
+
+enum class BooleanSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: Boolean
+) : AbstractBooleanSetting {
+    // These entries have the same names and order as in C++, just for consistency.
+    MAIN_SKIP_IPL(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SkipIPL", true),
+    MAIN_DSP_HLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DSPHLE", true),
+    MAIN_FASTMEM(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Fastmem", true),
+    MAIN_PAGE_TABLE_FASTMEM(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "PageTableFastmem", true),
+    MAIN_FASTMEM_ARENA(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FastmemArena", true),
+    MAIN_LARGE_ENTRY_POINTS_MAP(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "LargeEntryPointsMap", true),
+    MAIN_CPU_THREAD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUThread", true),
+    MAIN_SYNC_ON_SKIP_IDLE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "SyncOnSkipIdle",
+        true
+    ),
+    MAIN_ENABLE_CHEATS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EnableCheats", false),
+    MAIN_OVERRIDE_REGION_SETTINGS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "OverrideRegionSettings",
+        false
+    ),
+    MAIN_AUDIO_FILL_GAPS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioFillGaps", true),
+    MAIN_AUDIO_PRESERVE_PITCH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioPreservePitch", false),
+    MAIN_BBA_XLINK_CHAT_OSD(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "BBA_XLINK_CHAT_OSD",
+        false
+    ),
+    MAIN_ADAPTER_RUMBLE_0(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AdapterRumble0", true),
+    MAIN_ADAPTER_RUMBLE_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AdapterRumble1", true),
+    MAIN_ADAPTER_RUMBLE_2(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AdapterRumble2", true),
+    MAIN_ADAPTER_RUMBLE_3(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AdapterRumble3", true),
+    MAIN_SIMULATE_KONGA_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "SimulateKonga0",
+        false
+    ),
+    MAIN_SIMULATE_KONGA_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "SimulateKonga1",
+        false
+    ),
+    MAIN_SIMULATE_KONGA_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "SimulateKonga2",
+        false
+    ),
+    MAIN_SIMULATE_KONGA_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "SimulateKonga3",
+        false
+    ),
+    MAIN_WII_SD_CARD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCard", true),
+    MAIN_WII_SD_CARD_ENABLE_FOLDER_SYNC(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "WiiSDCardEnableFolderSync",
+        false
+    ),
+    MAIN_WIIMOTE_CONTINUOUS_SCANNING(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "WiimoteContinuousScanning",
+        false
+    ),
+    MAIN_WIIMOTE_ENABLE_SPEAKER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "WiimoteEnableSpeaker",
+        false
+    ),
+    MAIN_MMU(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MMU", false),
+    MAIN_PAUSE_ON_PANIC(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "PauseOnPanic", false),
+    MAIN_ACCURATE_CPU_CACHE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "AccurateCPUCache",
+        false
+    ),
+    MAIN_SYNC_GPU(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SyncGPU", false),
+    MAIN_FAST_DISC_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FastDiscSpeed", false),
+    MAIN_OVERCLOCK_ENABLE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "OverclockEnable",
+        false
+    ),
+    MAIN_VI_OVERCLOCK_ENABLE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "VIOverclockEnable",
+        false
+    ),
+    MAIN_RAM_OVERRIDE_ENABLE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "RAMOverrideEnable",
+        false
+    ),
+    MAIN_CUSTOM_RTC_ENABLE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "EnableCustomRTC",
+        false
+    ),
+    MAIN_AUTO_DISC_CHANGE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "AutoDiscChange",
+        false
+    ),
+    MAIN_ALLOW_SD_WRITES(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "WiiSDCardAllowWrites",
+        true
+    ),
+    MAIN_ENABLE_SAVESTATES(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "EnableSaveStates",
+        false
+    ),
+    MAIN_WII_WIILINK_ENABLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EnableWiiLink", false),
+    MAIN_DSP_JIT(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "EnableJIT", true),
+    MAIN_TIME_TRACKING(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_GENERAL,
+        "EnablePlayTimeTracking",
+        true
+    ),
+    MAIN_EXPAND_TO_CUTOUT_AREA(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_INTERFACE,
+        "ExpandToCutoutArea",
+        false
+    ),
+    MAIN_USE_PANIC_HANDLERS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_INTERFACE,
+        "UsePanicHandlers",
+        true
+    ),
+    MAIN_OSD_MESSAGES(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_INTERFACE,
+        "OnScreenDisplayMessages",
+        true
+    ),
+    MAIN_ANALYTICS_ENABLED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS, "Enabled", false),
+    MAIN_ANALYTICS_PERMISSION_ASKED(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_ANALYTICS,
+        "PermissionAsked",
+        false
+    ),
+    MAIN_RECURSIVE_ISO_PATHS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_GENERAL,
+        "RecursiveISOPaths",
+        false
+    ),
+    MAIN_USE_GAME_COVERS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_GENERAL,
+        "UseGameCovers",
+        true
+    ),
+    MAIN_DEBUG_JIT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitOff", false),
+    MAIN_DEBUG_JIT_LOAD_STORE_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitLoadStoreOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_LOAD_STORE_FLOATING_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitLoadStoreFloatingOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_LOAD_STORE_PAIRED_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitLoadStorePairedOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_FLOATING_POINT_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitFloatingPointOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_INTEGER_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitIntegerOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitPairedOff", false),
+    MAIN_DEBUG_JIT_SYSTEM_REGISTERS_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitSystemRegistersOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_BRANCH_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitBranchOff", false),
+    MAIN_DEBUG_JIT_REGISTER_CACHE_OFF(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitRegisterCacheOff",
+        false
+    ),
+    MAIN_DEBUG_JIT_ENABLE_PROFILING(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_DEBUG,
+        "JitEnableProfiling",
+        false
+    ),
+    MAIN_EMULATE_SKYLANDER_PORTAL(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_EMULATED_USB_DEVICES,
+        "EmulateSkylanderPortal",
+        false
+    ),
+    MAIN_EMULATE_INFINITY_BASE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_EMULATED_USB_DEVICES,
+        "EmulateInfinityBase",
+        false
+    ),
+    MAIN_EMULATE_WII_SPEAK(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_EMULATED_USB_DEVICES,
+        "EmulateWiiSpeak",
+        false
+    ),
+    MAIN_WII_SPEAK_MUTED(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_EMULATED_USB_DEVICES,
+        "WiiSpeakMuted",
+        true
+    ),
+    MAIN_SHOW_GAME_TITLES(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "ShowGameTitles",
+        true
+    ),
+    MAIN_USE_BLACK_BACKGROUNDS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "UseBlackBackgrounds",
+        false
+    ),
+    MAIN_JOYSTICK_REL_CENTER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "JoystickRelCenter",
+        true
+    ),
+    MAIN_SHOW_INPUT_OVERLAY(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "ShowInputOverlay",
+        true
+    ),
+    MAIN_IR_ALWAYS_RECENTER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "IRAlwaysRecenter",
+        false
+    ),
+    MAIN_BUTTON_TOGGLE_GC_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCButtonA",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCButtonB",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCButtonX",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCButtonY",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_4(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCButtonZ",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_5(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCButtonStart",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_6(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCTriggerL",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_7(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCTriggerR",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_8(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCDPad",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_9(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCStickMain",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_GC_10(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleGCStickC",
+        true
+    ),
+    MAIN_BUTTON_LATCHING_GC_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCButtonA",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCButtonB",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCButtonX",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCButtonY",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_4(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCButtonZ",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_5(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCButtonStart",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_6(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCTriggerL",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_GC_7(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingGCTriggerR",
+        false
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonA",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonB",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonX",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonY",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_4(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonPlus",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_5(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonMinus",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_6(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonHome",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_7(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicTriggerL",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_8(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicTriggerR",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_9(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonZL",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_10(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicButtonZR",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_11(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicDPad",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_12(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicStickLeft",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_CLASSIC_13(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleClassicStickRight",
+        true
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonA",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonB",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonX",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonY",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_4(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonPlus",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_5(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonMinus",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_6(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonHome",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_7(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicTriggerL",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_8(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicTriggerR",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_9(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonZL",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_CLASSIC_10(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingClassicButtonZR",
+        false
+    ),
+    MAIN_BUTTON_TOGGLE_WII_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButtonA",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButtonB",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButton1",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButton2",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_4(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButtonPlus",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_5(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButtonMinus",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_6(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteButtonHome",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_7(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleWiimoteDPad",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_8(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleNunchukC",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_9(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleNunchukZ",
+        true
+    ),
+    MAIN_BUTTON_TOGGLE_WII_10(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonToggleNunchukStick",
+        true
+    ),
+    MAIN_BUTTON_LATCHING_WII_0(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButtonA",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_1(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButtonB",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_2(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButton1",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_3(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButton2",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_4(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButtonPlus",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_5(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButtonMinus",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_6(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingWiimoteButtonHome",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_8(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingNunchukC",
+        false
+    ),
+    MAIN_BUTTON_LATCHING_WII_9(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "ButtonLatchingNunchukZ",
+        false
+    ),
+    SYSCONF_SCREENSAVER(Settings.FILE_SYSCONF, "IPL", "SSV", false),
+    SYSCONF_WIDESCREEN(Settings.FILE_SYSCONF, "IPL", "AR", true),
+    SYSCONF_PROGRESSIVE_SCAN(Settings.FILE_SYSCONF, "IPL", "PGS", true),
+    SYSCONF_PAL60(Settings.FILE_SYSCONF, "IPL", "E60", true),
+    SYSCONF_WIIMOTE_MOTOR(Settings.FILE_SYSCONF, "BT", "MOT", true),
+    GFX_VSYNC(Settings.FILE_GFX, Settings.SECTION_GFX_HARDWARE, "VSync", false),
+    GFX_WIDESCREEN_HACK(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "wideScreenHack", false),
+    GFX_CROP_TO_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "Crop", false),
+    GFX_CROP_CUSTOM(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "CropCustom", false),
+    GFX_SHOW_FPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFPS", false),
+    GFX_SHOW_FTIMES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFTimes", false),
+    GFX_SHOW_VPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowVPS", false),
+    GFX_SHOW_VTIMES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowVTimes", false),
+    GFX_SHOW_GRAPHS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowGraphs", false),
+    GFX_SHOW_SPEED(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowSpeed", false),
+    GFX_SHOW_SPEED_COLORS(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "ShowSpeedColors",
+        true
+    ),
+    GFX_LOG_RENDER_TIME_TO_FILE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "LogRenderTimeToFile",
+        false
+    ),
+    GFX_OVERLAY_STATS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "OverlayStats", false),
+    GFX_OVERLAY_PROJ_STATS(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "OverlayProjStats",
+        false
+    ),
+    GFX_SHOW_INTERNAL_RESOLUTION(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "ShowInternalResolution",
+        false
+    ),
+    GFX_DUMP_TEXTURES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DumpTextures", false),
+    GFX_DUMP_MIP_TEXTURES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "DumpMipTextures",
+        false
+    ),
+    GFX_DUMP_BASE_TEXTURES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "DumpBaseTextures",
+        false
+    ),
+    GFX_HIRES_TEXTURES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "HiresTextures", false),
+    GFX_CACHE_HIRES_TEXTURES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "CacheHiresTextures",
+        false
+    ),
+    GFX_DUMP_EFB_TARGET(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DumpEFBTarget", false),
+    GFX_DUMP_XFB_TARGET(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DumpXFBTarget", false),
+    GFX_INTERNAL_RESOLUTION_FRAME_DUMPS(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "InternalResolutionFrameDumps",
+        false
+    ),
+    GFX_ENABLE_GPU_TEXTURE_DECODING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "EnableGPUTextureDecoding",
+        false
+    ),
+    GFX_ENABLE_PIXEL_LIGHTING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "EnablePixelLighting",
+        false
+    ),
+    GFX_FAST_DEPTH_CALC(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "FastDepthCalc", true),
+    GFX_TEXFMT_OVERLAY_ENABLE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "TexFmtOverlayEnable",
+        false
+    ),
+    GFX_ENABLE_WIREFRAME(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "WireFrame", false),
+    GFX_DISABLE_FOG(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DisableFog", false),
+    GFX_ENABLE_VALIDATION_LAYER(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "EnableValidationLayer",
+        false
+    ),
+    GFX_BACKEND_MULTITHREADING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "BackendMultithreading",
+        true
+    ),
+    GFX_WAIT_FOR_SHADERS_BEFORE_STARTING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "WaitForShadersBeforeStarting",
+        false
+    ),
+    GFX_SAVE_TEXTURE_CACHE_TO_STATE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "SaveTextureCacheToState",
+        true
+    ),
+    GFX_PREFER_VS_FOR_LINE_POINT_EXPANSION(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "PreferVSForLinePointExpansion",
+        false
+    ),
+    GFX_CPU_CULL(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "CPUCull", false),
+    GFX_MODS_ENABLE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "EnableMods", false),
+    GFX_ENHANCE_FORCE_TRUE_COLOR(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "ForceTrueColor",
+        true
+    ),
+    GFX_ENHANCE_DISABLE_COPY_FILTER(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "DisableCopyFilter",
+        true
+    ),
+    GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "ArbitraryMipmapDetection",
+        false
+    ),
+    GFX_CC_CORRECT_COLOR_SPACE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_COLOR_CORRECTION,
+        "CorrectColorSpace",
+        false
+    ),
+    GFX_CC_CORRECT_GAMMA(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_COLOR_CORRECTION,
+        "CorrectGamma",
+        false
+    ),
+    GFX_STEREO_SWAP_EYES(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoSwapEyes", false),
+    GFX_HACK_EFB_ACCESS_ENABLE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "EFBAccessEnable",
+        false
+    ),
+    GFX_HACK_EFB_DEFER_INVALIDATION(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "EFBAccessDeferInvalidation",
+        false
+    ),
+    GFX_HACK_BBOX_ENABLE(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "BBoxEnable", false),
+    GFX_HACK_SKIP_EFB_COPY_TO_RAM(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "EFBToTextureEnable",
+        true
+    ),
+    GFX_HACK_SKIP_XFB_COPY_TO_RAM(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "XFBToTextureEnable",
+        true
+    ),
+    GFX_HACK_DISABLE_COPY_TO_VRAM(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "DisableCopyToVRAM",
+        false
+    ),
+    GFX_HACK_DEFER_EFB_COPIES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "DeferEFBCopies",
+        true
+    ),
+    GFX_HACK_IMMEDIATE_XFB(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "ImmediateXFBEnable",
+        false
+    ),
+    GFX_HACK_SKIP_DUPLICATE_XFBS(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "SkipDuplicateXFBs",
+        true
+    ),
+    GFX_HACK_COPY_EFB_SCALED(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBScaledCopy", true),
+    GFX_HACK_EFB_EMULATE_FORMAT_CHANGES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "EFBEmulateFormatChanges",
+        false
+    ),
+    GFX_HACK_VERTEX_ROUNDING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "VertexRounding",
+        false
+    ),
+    GFX_HACK_VI_SKIP(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "VISkip", false),
+    GFX_HACK_FAST_TEXTURE_SAMPLING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_HACKS,
+        "FastTextureSampling",
+        true
+    ),
+    LOGGER_WRITE_TO_FILE(
+        Settings.FILE_LOGGER,
+        Settings.SECTION_LOGGER_OPTIONS,
+        "WriteToFile",
+        false
+    ),
+    ACHIEVEMENTS_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "Enabled",
+        false
+    ),
+    ACHIEVEMENTS_HARDCORE_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "HardcoreEnabled",
+        true
+    ),
+    ACHIEVEMENTS_UNOFFICIAL_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "UnofficialEnabled",
+        false
+    ),
+    ACHIEVEMENTS_ENCORE_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "EncoreEnabled",
+        false
+    ),
+    ACHIEVEMENTS_SPECTATOR_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "SpectatorEnabled",
+        false
+    ),
+    ACHIEVEMENTS_LEADERBOARD_TRACKER_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "LeaderboardTrackerEnabled",
+        true
+    ),
+    ACHIEVEMENTS_CHALLENGE_INDICATORS_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "ChallengeIndicatorsEnabled",
+        true
+    ),
+    ACHIEVEMENTS_PROGRESS_ENABLED(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "ProgressEnabled",
+        false
+    ),
+    NETPLAY_USE_UPNP(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "UseUPNP", false);
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean
+        get() {
+            if (file == Settings.FILE_SYSCONF) return false
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) return false
+            }
+            return NativeConfig.isSettingSaveable(file, section, key)
+        }
+
+    override fun delete(settings: Settings): Boolean {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val boolean: Boolean
+        get() = NativeConfig.getBoolean(
+            NativeConfig.LAYER_ACTIVE,
+            file,
+            section,
+            key,
+            defaultValue
+        )
+
+    override fun setBoolean(settings: Settings, newValue: Boolean) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setBoolean(settings.writeLayer, file, section, key, newValue)
+    }
+
+    fun setBoolean(layer: Int, newValue: Boolean) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setBoolean(layer, file, section, key, newValue)
+    }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE_ARRAY = arrayOf(
+            MAIN_DSP_HLE,
+            MAIN_FASTMEM_ARENA,
+            MAIN_LARGE_ENTRY_POINTS_MAP,
+            MAIN_CPU_THREAD,
+            MAIN_ENABLE_CHEATS,
+            MAIN_OVERRIDE_REGION_SETTINGS,
+            MAIN_MMU,
+            MAIN_PAUSE_ON_PANIC,
+            MAIN_RAM_OVERRIDE_ENABLE,
+            MAIN_CUSTOM_RTC_ENABLE,
+            MAIN_DSP_JIT,
+            MAIN_TIME_TRACKING,
+            MAIN_EMULATE_SKYLANDER_PORTAL,
+            MAIN_EMULATE_INFINITY_BASE,
+            MAIN_EMULATE_WII_SPEAK,
+            ACHIEVEMENTS_ENABLED,
+            ACHIEVEMENTS_HARDCORE_ENABLED,
+            ACHIEVEMENTS_UNOFFICIAL_ENABLED,
+            ACHIEVEMENTS_ENCORE_ENABLED,
+            ACHIEVEMENTS_SPECTATOR_ENABLED
+        )
+        private val NOT_RUNTIME_EDITABLE: Set<BooleanSetting> =
+            HashSet(listOf(*NOT_RUNTIME_EDITABLE_ARRAY))
+
+        @JvmStatic
+        fun getSettingForAdapterRumble(channel: Int): BooleanSetting {
+            return arrayOf(
+                MAIN_ADAPTER_RUMBLE_0,
+                MAIN_ADAPTER_RUMBLE_1,
+                MAIN_ADAPTER_RUMBLE_2,
+                MAIN_ADAPTER_RUMBLE_3
+            )[channel]
+        }
+
+        @JvmStatic
+        fun getSettingForSimulateKonga(channel: Int): BooleanSetting {
+            return arrayOf(
+                MAIN_SIMULATE_KONGA_0,
+                MAIN_SIMULATE_KONGA_1,
+                MAIN_SIMULATE_KONGA_2,
+                MAIN_SIMULATE_KONGA_3
+            )[channel]
+        }
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/ConfigChangedCallback.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/ConfigChangedCallback.kt
new file mode 100644
index 000000000..4415efa9e
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/ConfigChangedCallback.kt
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import androidx.annotation.Keep
+
+/**
+ * Calls the passed-in Runnable when Dolphin's config changes.
+ *
+ * Please note: The Runnable may be called from any thread.
+ */
+class ConfigChangedCallback(runnable: Runnable) {
+    @Keep
+    private var pointer: Long = initialize(runnable)
+
+    /**
+     * Stops the callback from being called in the future.
+     */
+    fun unregister() {
+        if (pointer != 0L) {
+            deinitialize(pointer)
+            pointer = 0L
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        private external fun initialize(runnable: Runnable): Long
+
+        @JvmStatic
+        private external fun deinitialize(pointer: Long)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt
new file mode 100644
index 000000000..67ea46195
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+enum class FloatSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: Float
+) : AbstractFloatSetting {
+    // These entries have the same names and order as in C++, just for consistency.
+    MAIN_EMULATION_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EmulationSpeed", 1.0f),
+    MAIN_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Overclock", 1.0f),
+    MAIN_VI_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "VIOverclock", 1.0f),
+    GFX_CC_GAME_GAMMA(Settings.FILE_GFX, Settings.SECTION_GFX_COLOR_CORRECTION, "GameGamma", 2.35f),
+    GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20.0f),
+    GFX_STEREO_CONVERGENCE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoConvergence", 20.0f);
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean
+        get() = NativeConfig.isSettingSaveable(file, section, key)
+
+    override fun delete(settings: Settings): Boolean {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val float: Float
+        get() = NativeConfig.getFloat(NativeConfig.LAYER_ACTIVE, file, section, key, defaultValue)
+
+    override fun setFloat(settings: Settings, newValue: Float) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setFloat(settings.writeLayer, file, section, key, newValue)
+    }
+
+    fun setFloat(layer: Int, newValue: Float) {
+        NativeConfig.setFloat(layer, file, section, key, newValue)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
new file mode 100644
index 000000000..4d5f49b54
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
@@ -0,0 +1,253 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import android.content.pm.ActivityInfo
+import org.dolphinemu.dolphinemu.NativeLibrary
+import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer
+import java.util.*
+
+enum class IntSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: Int
+) : AbstractIntSetting {
+    // These entries have the same names and order as in C++, just for consistency.
+    MAIN_CPU_CORE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "CPUCore",
+        NativeLibrary.DefaultCPUCore()
+    ),
+    MAIN_GC_LANGUAGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SelectedLanguage", 0),
+    MAIN_MEM1_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MEM1Size", 0x01800000),
+    MAIN_MEM2_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MEM2Size", 0x04000000),
+    MAIN_SLOT_A(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotA", 8),
+    MAIN_SLOT_B(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotB", 255),
+    MAIN_SERIAL_PORT_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SerialPort1", 255),
+    MAIN_FALLBACK_REGION(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FallbackRegion", 2),
+    MAIN_SI_DEVICE_0(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice0", 6),
+    MAIN_SI_DEVICE_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice1", 0),
+    MAIN_SI_DEVICE_2(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice2", 0),
+    MAIN_SI_DEVICE_3(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice3", 0),
+    MAIN_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume", 100),
+    MAIN_AUDIO_BUFFER_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "AudioBufferSize", 80),
+    MAIN_OVERLAY_GC_CONTROLLER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "OverlayGCController",
+        0
+    ),
+
+    // Defaults to GameCube controller 1
+    MAIN_OVERLAY_WII_CONTROLLER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "OverlayWiiController",
+        4
+    ),
+
+    // Defaults to Wii Remote 1
+    MAIN_CONTROL_SCALE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "ControlScale", 50),
+    MAIN_CONTROL_OPACITY(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "ControlOpacity", 65),
+    MAIN_EMULATION_ORIENTATION(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "EmulationOrientation",
+        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+    ),
+    MAIN_INTERFACE_THEME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "InterfaceTheme", 0),
+    MAIN_INTERFACE_THEME_MODE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "InterfaceThemeMode",
+        -1
+    ),
+    MAIN_LAST_PLATFORM_TAB(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "LastPlatformTab",
+        0
+    ),
+    MAIN_IR_MODE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "IRMode",
+        InputOverlayPointer.MODE_FOLLOW
+    ),
+    MAIN_DOUBLE_TAP_BUTTON(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "DoubleTapButton",
+        NativeLibrary.ButtonType.WIIMOTE_BUTTON_A
+    ),
+    SYSCONF_LANGUAGE(Settings.FILE_SYSCONF, "IPL", "LNG", 0x01),
+    SYSCONF_SOUND_MODE(Settings.FILE_SYSCONF, "IPL", "SND", 0x01),
+    SYSCONF_SENSOR_BAR_POSITION(Settings.FILE_SYSCONF, "BT", "BAR", 0x01),
+    SYSCONF_SENSOR_BAR_SENSITIVITY(Settings.FILE_SYSCONF, "BT", "SENS", 0x03),
+    SYSCONF_SPEAKER_VOLUME(Settings.FILE_SYSCONF, "BT", "SPKV", 0x58),
+    GFX_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "AspectRatio", 0),
+    GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "SafeTextureCacheColorSamples",
+        128
+    ),
+    GFX_PNG_COMPRESSION_LEVEL(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "PNGCompressionLevel",
+        6
+    ),
+    GFX_MSAA(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "MSAA", 1),
+    GFX_EFB_SCALE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "InternalResolution", 1),
+    GFX_SHADER_COMPILATION_MODE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "ShaderCompilationMode",
+        0
+    ),
+    GFX_ENHANCE_FORCE_TEXTURE_FILTERING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "ForceTextureFiltering",
+        0
+    ),
+    GFX_ENHANCE_MAX_ANISOTROPY(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "MaxAnisotropy",
+        0
+    ),
+    GFX_CC_GAME_COLOR_SPACE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_COLOR_CORRECTION,
+        "GameColorSpace",
+        0
+    ),
+    GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode", 0),
+    GFX_PERF_SAMP_WINDOW(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "PerfSampWindowMS",
+        1000
+    ),
+    GFX_CROP_CUSTOM_TOP(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "CropCustomTop",
+        0
+    ),
+    GFX_CROP_CUSTOM_BOTTOM(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "CropCustomBottom",
+        0
+    ),
+    GFX_CROP_CUSTOM_LEFT(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "CropCustomLeft",
+        0
+    ),
+    GFX_CROP_CUSTOM_RIGHT(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "CropCustomRight",
+        0
+    ),
+    LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity", 1),
+    WIIMOTE_1_SOURCE(Settings.FILE_WIIMOTE, "Wiimote1", "Source", 1),
+    WIIMOTE_2_SOURCE(Settings.FILE_WIIMOTE, "Wiimote2", "Source", 0),
+    WIIMOTE_3_SOURCE(Settings.FILE_WIIMOTE, "Wiimote3", "Source", 0),
+    WIIMOTE_4_SOURCE(Settings.FILE_WIIMOTE, "Wiimote4", "Source", 0),
+    WIIMOTE_BB_SOURCE(Settings.FILE_WIIMOTE, "BalanceBoard", "Source", 0),
+    NETPLAY_CONNECT_PORT(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "ConnectPort", 2626),
+    NETPLAY_HOST_PORT(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "HostPort", 2626),
+    NETPLAY_CLIENT_BUFFER_SIZE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_NETPLAY,
+        "BufferSizeClient",
+        1
+    ),
+    NETPLAY_BUFFER_SIZE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_NETPLAY,
+        "BufferSize",
+        5
+    );
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean
+        get() {
+            if (file == Settings.FILE_SYSCONF) return false
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) return false
+            }
+            return NativeConfig.isSettingSaveable(file, section, key)
+        }
+
+    override fun delete(settings: Settings): Boolean {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val int: Int
+        get() = NativeConfig.getInt(NativeConfig.LAYER_ACTIVE, file, section, key, defaultValue)
+
+    override fun setInt(settings: Settings, newValue: Int) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setInt(settings.writeLayer, file, section, key, newValue)
+    }
+
+    fun setInt(layer: Int, newValue: Int) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setInt(layer, file, section, key, newValue)
+    }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE_ARRAY = arrayOf(
+            MAIN_CPU_CORE,
+            MAIN_GC_LANGUAGE,
+            MAIN_MEM1_SIZE,
+            MAIN_MEM2_SIZE,
+            MAIN_SLOT_A,
+            MAIN_SLOT_B,
+            MAIN_SERIAL_PORT_1,
+            MAIN_FALLBACK_REGION
+        )
+
+        private val NOT_RUNTIME_EDITABLE: Set<IntSetting> =
+            HashSet(listOf(*NOT_RUNTIME_EDITABLE_ARRAY))
+
+        @JvmStatic
+        fun getSettingForSIDevice(channel: Int): IntSetting {
+            return arrayOf(
+                MAIN_SI_DEVICE_0,
+                MAIN_SI_DEVICE_1,
+                MAIN_SI_DEVICE_2,
+                MAIN_SI_DEVICE_3
+            )[channel]
+        }
+
+        @JvmStatic
+        fun getSettingForWiimoteSource(index: Int): IntSetting {
+            return arrayOf(
+                WIIMOTE_1_SOURCE,
+                WIIMOTE_2_SOURCE,
+                WIIMOTE_3_SOURCE,
+                WIIMOTE_4_SOURCE,
+                WIIMOTE_BB_SOURCE
+            )[index]
+        }
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.kt
new file mode 100644
index 000000000..5a2b31ce4
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.kt
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+object NativeConfig {
+    const val LAYER_BASE_OR_CURRENT = 0
+    const val LAYER_BASE = 1
+    const val LAYER_LOCAL_GAME = 2
+    const val LAYER_ACTIVE = 3
+    const val LAYER_CURRENT = 4
+
+    @JvmStatic
+    external fun isSettingSaveable(file: String, section: String, key: String): Boolean
+
+    @JvmStatic
+    external fun loadGameInis(gameId: String, revision: Int)
+
+    @JvmStatic
+    external fun unloadGameInis()
+
+    @JvmStatic
+    external fun save(layer: Int)
+
+    @JvmStatic
+    external fun deleteAllKeys(layer: Int)
+
+    @JvmStatic
+    external fun isOverridden(file: String, section: String, key: String): Boolean
+
+    @JvmStatic
+    external fun deleteKey(layer: Int, file: String, section: String, key: String): Boolean
+
+    @JvmStatic
+    external fun exists(layer: Int, file: String, section: String, key: String): Boolean
+
+    @JvmStatic
+    external fun getString(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        defaultValue: String
+    ): String
+
+    @JvmStatic
+    external fun getBoolean(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        defaultValue: Boolean
+    ): Boolean
+
+    @JvmStatic
+    external fun getInt(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        defaultValue: Int
+    ): Int
+
+    @JvmStatic
+    external fun getFloat(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        defaultValue: Float
+    ): Float
+
+    @JvmStatic
+    external fun setString(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        value: String
+    )
+
+    @JvmStatic
+    external fun setBoolean(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        value: Boolean
+    )
+
+    @JvmStatic
+    external fun setInt(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        value: Int
+    )
+
+    @JvmStatic
+    external fun setFloat(
+        layer: Int,
+        file: String,
+        section: String,
+        key: String,
+        value: Float
+    )
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/PostProcessing.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/PostProcessing.kt
new file mode 100644
index 000000000..04fe2734b
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/PostProcessing.kt
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+object PostProcessing {
+    @JvmStatic
+    val shaderList: Array<String>
+        external get
+
+    @JvmStatic
+    val anaglyphShaderList: Array<String>
+        external get
+
+    @JvmStatic
+    val passiveShaderList: Array<String>
+        external get
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt
new file mode 100644
index 000000000..4eef9ed6c
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+class ScaledIntSetting(
+    private val scale: Int,
+    private val setting: AbstractIntSetting
+) : AbstractIntSetting {
+    override val isOverridden: Boolean
+        get() = setting.isOverridden
+
+    override val isRuntimeEditable: Boolean
+        get() = setting.isRuntimeEditable
+
+    override fun delete(settings: Settings): Boolean {
+        return setting.delete(settings)
+    }
+
+    override val int: Int
+        get() = setting.int / scale
+
+    override fun setInt(settings: Settings, newValue: Int) {
+        return setting.setInt(settings, newValue * scale)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt
new file mode 100644
index 000000000..da54d8125
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import android.text.TextUtils
+import org.dolphinemu.dolphinemu.NativeLibrary
+import org.dolphinemu.dolphinemu.features.input.model.MappingCommon
+import java.io.Closeable
+
+/**
+ * Represents a set of settings stored in the native part of Dolphin.
+ *
+ * A set of settings can be either the global settings, or game settings for a particular game.
+ */
+class Settings : Closeable {
+    private var gameId: String = ""
+    private var revision = 0
+
+    var isWii = false
+        private set
+
+    private var settingsLoaded = false
+
+    private val isGameSpecific: Boolean
+        get() = !TextUtils.isEmpty(gameId)
+
+    val writeLayer: Int
+        get() = if (isGameSpecific) NativeConfig.LAYER_LOCAL_GAME else NativeConfig.LAYER_BASE_OR_CURRENT
+
+    fun areSettingsLoaded(): Boolean {
+        return settingsLoaded
+    }
+
+    @JvmOverloads
+    fun loadSettings(isWii: Boolean = true) {
+        this.isWii = isWii
+        settingsLoaded = true
+
+        if (isGameSpecific) {
+            // Loading game INIs while the core is running will mess with the game INIs loaded by the core
+            check(NativeLibrary.IsUninitialized()) { "Attempted to load game INI while emulating" }
+            NativeConfig.loadGameInis(gameId, revision)
+        }
+    }
+
+    fun loadSettings(gameId: String, revision: Int, isWii: Boolean) {
+        this.gameId = gameId
+        this.revision = revision
+        loadSettings(isWii)
+    }
+
+    fun saveSettings() {
+        if (!isGameSpecific) {
+            MappingCommon.save()
+
+            NativeConfig.save(NativeConfig.LAYER_BASE)
+
+            NativeLibrary.ReloadLoggerConfig()
+        } else {
+            NativeConfig.save(NativeConfig.LAYER_LOCAL_GAME)
+        }
+    }
+
+    fun clearGameSettings() {
+        NativeConfig.deleteAllKeys(NativeConfig.LAYER_LOCAL_GAME)
+    }
+
+    fun gameIniContainsJunk(): Boolean {
+        // Older versions of Android Dolphin would copy the entire contents of most of the global INIs
+        // into any game INI that got saved (with some of the sections renamed to match the game INI
+        // section names). The problems with this are twofold:
+        //
+        // 1. The user game INIs will contain entries that Dolphin doesn't support reading from
+        //    game INIs. This is annoying when editing game INIs manually but shouldn't really be
+        //    a problem for those who only use the GUI.
+        //
+        // 2. Global settings will stick around in user game INIs. For instance, if someone wants to
+        //    change the texture cache accuracy to safe for all games, they have to edit not only the
+        //    global settings but also every single game INI they have created, since the old value of
+        //    the texture cache accuracy Setting has been copied into every user game INI.
+        //
+        // These problems are serious enough that we should detect and delete such INI files.
+        // Problem 1 is easy to detect, but due to the nature of problem 2, it's unfortunately not
+        // possible to know which lines were added intentionally by the user and which lines were added
+        // unintentionally, which is why we have to delete the whole file in order to fix everything.
+        return if (!isGameSpecific) false else NativeConfig.exists(
+            NativeConfig.LAYER_LOCAL_GAME,
+            FILE_DOLPHIN,
+            SECTION_INI_INTERFACE,
+            "ThemeName"
+        )
+    }
+
+    override fun close() {
+        if (isGameSpecific) {
+            NativeConfig.unloadGameInis()
+        }
+    }
+
+    companion object {
+        const val FILE_DOLPHIN = "Dolphin"
+        const val FILE_SYSCONF = "SYSCONF"
+        const val FILE_GFX = "GFX"
+        const val FILE_LOGGER = "Logger"
+        const val FILE_WIIMOTE = "WiimoteNew"
+        const val FILE_ACHIEVEMENTS = "RetroAchievements"
+        const val FILE_GAME_SETTINGS_ONLY = "GameSettingsOnly"
+        const val SECTION_INI_ANDROID = "Android"
+        const val SECTION_INI_ANDROID_OVERLAY_BUTTONS = "AndroidOverlayButtons"
+        const val SECTION_INI_GENERAL = "General"
+        const val SECTION_INI_CORE = "Core"
+        const val SECTION_INI_INTERFACE = "Interface"
+        const val SECTION_INI_DSP = "DSP"
+        const val SECTION_INI_GBA = "GBA"
+        const val SECTION_INI_NETPLAY = "NetPlay"
+        const val SECTION_LOGGER_LOGS = "Logs"
+        const val SECTION_LOGGER_OPTIONS = "Options"
+        const val SECTION_GFX_HARDWARE = "Hardware"
+        const val SECTION_GFX_SETTINGS = "Settings"
+        const val SECTION_GFX_ENHANCEMENTS = "Enhancements"
+        const val SECTION_GFX_COLOR_CORRECTION = "ColorCorrection"
+        const val SECTION_GFX_HACKS = "Hacks"
+        const val SECTION_DEBUG = "Debug"
+        const val SECTION_EMULATED_USB_DEVICES = "EmulatedUSBDevices"
+        const val SECTION_STEREOSCOPY = "Stereoscopy"
+        const val SECTION_ANALYTICS = "Analytics"
+        const val SECTION_ACHIEVEMENTS = "Achievements"
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
new file mode 100644
index 000000000..72877429a
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import org.dolphinemu.dolphinemu.NativeLibrary
+import java.util.*
+
+enum class StringSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: String
+) : AbstractStringSetting {
+    // These entries have the same names and order as in C++, just for consistency.
+    MAIN_DEFAULT_ISO(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DefaultISO", ""),
+    MAIN_BBA_MAC(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_MAC", ""),
+    MAIN_BBA_XLINK_IP(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_XLINK_IP", ""),
+
+    // Schthack PSO Server - https://schtserv.com/
+    MAIN_BBA_BUILTIN_DNS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "BBA_BUILTIN_DNS",
+        "3.18.217.27"
+    ),
+    MAIN_BBA_TAPSERVER_DESTINATION(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "BBA_TAPSERVER_DESTINATION",
+        "/tmp/dolphin-tap"
+    ),
+    MAIN_MODEM_TAPSERVER_DESTINATION(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "MODEM_TAPSERVER_DESTINATION",
+        "/tmp/dolphin-modem-tap"
+    ),
+    MAIN_CUSTOM_RTC_VALUE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "CustomRTCValue",
+        "0x386d4380"
+    ),
+    MAIN_GFX_BACKEND(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "GFXBackend",
+        NativeLibrary.GetDefaultGraphicsBackendConfigName()
+    ),
+    MAIN_DUMP_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "DumpPath", ""),
+    MAIN_LOAD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "LoadPath", ""),
+    MAIN_RESOURCEPACK_PATH(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_GENERAL,
+        "ResourcePackPath",
+        ""
+    ),
+    MAIN_FS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "NANDRootPath", ""),
+    MAIN_WII_SD_CARD_IMAGE_PATH(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_GENERAL,
+        "WiiSDCardPath",
+        ""
+    ),
+    MAIN_WII_SD_CARD_SYNC_FOLDER_PATH(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_GENERAL,
+        "WiiSDCardSyncFolder",
+        ""
+    ),
+    MAIN_WFS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "WFSPath", ""),
+    MAIN_GBA_BIOS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GBA, "BIOS", ""),
+    MAIN_GB_PLAYER_ROM(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GBA, "GBPlayerRom", ""),
+    MAIN_GBA_SAVES_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GBA, "SavesPath", ""),
+    MAIN_TRIFORCE_IP_REDIRECTIONS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "TriforceIPRedirections",
+        "0.0.0.0/0=127.0.0.1"
+    ),
+    GFX_ENHANCE_POST_SHADER(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "PostProcessingShader",
+        ""
+    ),
+    GFX_DRIVER_LIB_NAME(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "DriverLibName",
+        ""
+    ),
+    ACHIEVEMENTS_USERNAME(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "Username",
+        ""
+    ),
+    ACHIEVEMENTS_API_TOKEN(
+        Settings.FILE_ACHIEVEMENTS,
+        Settings.SECTION_ACHIEVEMENTS,
+        "ApiToken",
+        ""
+    ),
+    NETPLAY_TRAVERSAL_CHOICE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_NETPLAY,
+        "TraversalChoice",
+        "direct"
+    ),
+    NETPLAY_HOST_CODE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_NETPLAY,
+        "HostCode",
+        ""
+    ),
+    NETPLAY_ADDRESS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "Address", "127.0.0.1"),
+    NETPLAY_NICKNAME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "Nickname", "Player"),
+    NETPLAY_GAME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "Game", ""),
+    NETPLAY_NETWORK_MODE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_NETPLAY, "NetworkMode", "fixeddelay");
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean
+        get() {
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) return false
+            }
+            return NativeConfig.isSettingSaveable(file, section, key)
+        }
+
+    override fun delete(settings: Settings): Boolean {
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val string: String
+        get() = if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        } else NativeConfig.getString(NativeConfig.LAYER_ACTIVE, file, section, key, defaultValue)
+
+    override fun setString(settings: Settings, newValue: String) {
+        NativeConfig.setString(settings.writeLayer, file, section, key, newValue)
+    }
+
+    fun setString(layer: Int, newValue: String) {
+        NativeConfig.setString(layer, file, section, key, newValue)
+    }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE_ARRAY = arrayOf(
+            MAIN_CUSTOM_RTC_VALUE,
+            MAIN_GFX_BACKEND
+        )
+
+        private val NOT_RUNTIME_EDITABLE: Set<StringSetting> =
+            HashSet(listOf(*NOT_RUNTIME_EDITABLE_ARRAY))
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/SkylanderConfig.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/SkylanderConfig.kt
new file mode 100644
index 000000000..b8cf8a475
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/SkylanderConfig.kt
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders
+
+import android.util.Pair
+import org.dolphinemu.dolphinemu.features.skylanders.model.SkylanderPair
+
+object SkylanderConfig {
+    var LIST_SKYLANDERS: Map<SkylanderPair, String> = getSkylanderMap()
+    var REVERSE_LIST_SKYLANDERS: Map<String, SkylanderPair> = getInverseSkylanderMap()
+
+    private external fun getSkylanderMap(): Map<SkylanderPair, String>
+    private external fun getInverseSkylanderMap(): Map<String, SkylanderPair>
+
+    @JvmStatic
+    external fun removeSkylander(slot: Int): Boolean
+
+    @JvmStatic
+    external fun loadSkylander(slot: Int, fileName: String?): Pair<Int?, String?>?
+
+    @JvmStatic
+    external fun createSkylander(
+        id: Int,
+        variant: Int,
+        fileName: String,
+        slot: Int
+    ): Pair<Int, String>
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt
new file mode 100644
index 000000000..021607bae
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.model
+
+class Skylander(id: Int, variant: Int, var name: String) {
+    private val pair: SkylanderPair = SkylanderPair(id, variant)
+
+    val id: Int get() = pair.id
+    val variant: Int get() = pair.variant
+
+    companion object {
+        @JvmField
+        val BLANK_SKYLANDER = Skylander(-1, -1, "Blank")
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt
new file mode 100644
index 000000000..6b20567bb
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.model
+
+class SkylanderPair(var id: Int, var variant: Int) {
+    override fun hashCode(): Int {
+        return (id shl 16) + variant
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is SkylanderPair) return false
+        if (other.id != id) return false
+        return other.variant == variant
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/model/GameFile.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/model/GameFile.kt
new file mode 100644
index 000000000..26da17428
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/model/GameFile.kt
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.model
+
+import androidx.annotation.Keep
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@Keep
+class GameFile private constructor(private val pointer: Long) {
+    external fun finalize()
+
+    external fun getPlatform(): Int
+
+    external fun getTitle(): String
+
+    external fun getDescription(): String
+
+    external fun getCompany(): String
+
+    external fun getCountry(): Int
+
+    external fun getRegion(): Int
+
+    external fun getPath(): String
+
+    external fun getGameId(): String
+
+    external fun getGameTdbId(): String
+
+    external fun getDiscNumber(): Int
+
+    external fun getRevision(): Int
+
+    external fun getBlobType(): Int
+
+    external fun getFileFormatName(): String
+
+    external fun getBlockSize(): Long
+
+    external fun getCompressionMethod(): String
+
+    external fun shouldShowFileFormatDetails(): Boolean
+
+    external fun shouldAllowConversion(): Boolean
+
+    external fun getFileSize(): Long
+
+    external fun isDatelDisc(): Boolean
+
+    external fun isNKit(): Boolean
+
+    external fun getBanner(): IntArray
+
+    external fun getBannerWidth(): Int
+
+    external fun getBannerHeight(): Int
+
+    suspend fun getTimePlayedMs(): Long {
+        // getTimePlayedMsInternal reads from disk, so let's use coroutines.
+        return withContext(Dispatchers.IO) {
+            getTimePlayedMsInternal()
+        }
+    }
+
+    external private fun getTimePlayedMsInternal(): Long
+
+    val customCoverPath: String
+        get() = "${getPath().substring(0, getPath().lastIndexOf("."))}.cover.png"
+
+    companion object {
+        var REGION_NTSC_J = 0
+        var REGION_NTSC_U = 1
+        var REGION_PAL = 2
+        var REGION_NTSC_K = 4
+
+        @JvmStatic
+        external fun parse(path: String): GameFile?
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/model/GameFileCache.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/model/GameFileCache.kt
new file mode 100644
index 000000000..97064f552
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/model/GameFileCache.kt
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.model
+
+import androidx.annotation.Keep
+import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting
+import org.dolphinemu.dolphinemu.features.settings.model.NativeConfig
+import org.dolphinemu.dolphinemu.utils.ContentHandler
+import java.io.File
+
+class GameFileCache {
+    @Keep
+    private val pointer: Long = newGameFileCache()
+
+    external fun finalize()
+
+    @Synchronized
+    external fun getSize(): Int
+
+    @Synchronized
+    external fun getAllGames(): Array<GameFile>
+
+    @Synchronized
+    external fun addOrGet(gamePath: String): GameFile?
+
+    /**
+     * Sets the list of games to cache.
+     *
+     * Games which are in the passed-in list but not in the cache are scanned and added to the cache,
+     * and games which are in the cache but not in the passed-in list are removed from the cache.
+     *
+     * @return true if the cache was modified
+     */
+    @Synchronized
+    external fun update(gamePaths: Array<String>): Boolean
+
+    /**
+     * For each game that already is in the cache, scans the folder that contains the game
+     * for additional metadata files (PNG/XML).
+     *
+     * @return true if the cache was modified
+     */
+    @Synchronized
+    external fun updateAdditionalMetadata(): Boolean
+
+    @Synchronized
+    external fun load(): Boolean
+
+    @Synchronized
+    external fun save(): Boolean
+
+    companion object {
+        @JvmStatic
+        private external fun newGameFileCache(): Long
+
+        fun addGameFolder(path: String) {
+            val paths = getIsoPaths()
+
+            if (!paths.contains(path)) {
+                setIsoPaths(paths + path)
+                NativeConfig.save(NativeConfig.LAYER_BASE)
+            }
+        }
+
+        private fun getFolderPaths(removeNonExistentFolders: Boolean): Array<String> {
+            val paths = getIsoPaths()
+
+            val filteredPaths = paths.filter {path ->
+                if (ContentHandler.isContentUri(path))
+                    ContentHandler.exists(path)
+                else
+                    File(path).exists()
+            }.toTypedArray()
+
+            if (removeNonExistentFolders && paths.size > filteredPaths.size) {
+                setIsoPaths(filteredPaths)
+                NativeConfig.save(NativeConfig.LAYER_BASE)
+            }
+
+            return filteredPaths
+        }
+
+        @JvmStatic
+        fun getAllGamePaths(): Array<String> {
+            val recursiveScan = BooleanSetting.MAIN_RECURSIVE_ISO_PATHS.boolean
+            val folderPaths = getFolderPaths(true)
+            return getAllGamePaths(folderPaths, recursiveScan)
+        }
+
+        @JvmStatic
+        external fun getAllGamePaths(
+            folderPaths: Array<String>,
+            recursiveScan: Boolean
+        ): Array<String>
+
+        @JvmStatic
+        external fun getIsoPaths(): Array<String>
+
+        @JvmStatic
+        external fun setIsoPaths(paths: Array<String>)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/services/USBPermService.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/services/USBPermService.kt
new file mode 100644
index 000000000..2c52cd54f
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/services/USBPermService.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+@file:Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
+
+package org.dolphinemu.dolphinemu.services
+
+import android.app.IntentService
+import android.content.Intent
+
+class USBPermService : IntentService("USBPermService") {
+    // Needed when extending IntentService.
+    // We don't care about the results of the intent handler for this.
+    override fun onHandleIntent(intent: Intent?) {
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/AudioUtils.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/AudioUtils.kt
new file mode 100644
index 000000000..68e3573fa
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/AudioUtils.kt
@@ -0,0 +1,28 @@
+package org.dolphinemu.dolphinemu.utils
+
+import android.content.Context
+import android.media.AudioManager
+import androidx.annotation.Keep
+import org.dolphinemu.dolphinemu.DolphinApplication
+
+object AudioUtils {
+    @JvmStatic @Keep
+    fun getSampleRate(): Int =
+        getAudioServiceProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE, 48000)
+
+    @JvmStatic @Keep
+    fun getFramesPerBuffer(): Int =
+        getAudioServiceProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER, 256)
+
+    private fun getAudioServiceProperty(property: String, fallback: Int): Int {
+        return try {
+            val context = DolphinApplication.getAppContext()
+            val am = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+            Integer.parseUnsignedInt(am.getProperty(property))
+        } catch (e: NullPointerException) {
+            fallback
+        } catch (e: NumberFormatException) {
+            fallback
+        }
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/BooleanSupplier.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/BooleanSupplier.kt
new file mode 100644
index 000000000..b7dcd196e
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/BooleanSupplier.kt
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import androidx.annotation.Keep
+
+/**
+ * java.util.function.BooleanSupplier is only provided starting with API 24, while Dolphin still supports API
+ * 21. API desugaring lets Kotlin/Java code use it on older Android versions, but JNI `FindClass("java/util/
+ * function/BooleanSupplier")` isn’t desugared, so native code can’t look up that type reliably on API 23 and
+ * below. Because of that limitation, we keep our own interface instead of relying on the platform type.
+ */
+@Keep
+fun interface BooleanSupplier {
+    fun get(): Boolean
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/CompressCallback.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/CompressCallback.kt
new file mode 100644
index 000000000..498c9a518
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/CompressCallback.kt
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import androidx.annotation.Keep
+
+@Keep
+fun interface CompressCallback {
+    fun run(text: String, completion: Float): Boolean
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/ContentHandler.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/ContentHandler.kt
new file mode 100644
index 000000000..b5e445683
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/ContentHandler.kt
@@ -0,0 +1,331 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import android.content.ContentResolver
+import android.net.Uri
+import android.provider.DocumentsContract
+import android.provider.DocumentsContract.Document
+import androidx.annotation.Keep
+import androidx.core.net.toUri
+import org.dolphinemu.dolphinemu.DolphinApplication
+import java.io.FileNotFoundException
+
+/*
+  We use a lot of "catch (Exception e)" in this class. This is for two reasons:
+
+  1. We don't want any exceptions to escape to native code, as this leads to nasty crashes
+     that often don't have stack traces that make sense.
+
+  2. The sheer number of different exceptions, both documented and undocumented. These include:
+     - FileNotFoundException when a file doesn't exist
+     - FileNotFoundException when using an invalid open mode (according to the documentation)
+     - IllegalArgumentException when using an invalid open mode (in practice with FileProvider)
+     - IllegalArgumentException when providing a tree where a document was expected and vice versa
+     - SecurityException when trying to access something the user hasn't granted us permission to
+     - UnsupportedOperationException when a URI specifies a storage provider that doesn't exist
+ */
+object ContentHandler {
+    @JvmStatic
+    fun isContentUri(pathOrUri: String): Boolean {
+        return pathOrUri.startsWith("content://")
+    }
+
+    @Keep
+    @JvmStatic
+    fun openFd(uri: String, mode: String): Int {
+        try {
+            return getContentResolver().openFileDescriptor(unmangle(uri), mode)!!.detachFd()
+        } catch (_: SecurityException) {
+            Log.error("Tried to open $uri without permission")
+        } catch (_: Exception) {
+        }
+
+        return -1
+    }
+
+    @Keep
+    @JvmStatic
+    fun delete(uri: String): Boolean {
+        try {
+            return DocumentsContract.deleteDocument(getContentResolver(), unmangle(uri))
+        } catch (_: FileNotFoundException) {
+            // Return true because we care about the file not being there, not the actual delete.
+            return true
+        } catch (_: SecurityException) {
+            Log.error("Tried to delete $uri without permission")
+        } catch (_: Exception) {
+        }
+
+        return false
+    }
+
+    @JvmStatic
+    fun exists(uri: String): Boolean {
+        try {
+            val documentUri = treeToDocument(unmangle(uri))
+            val projection = arrayOf(Document.COLUMN_MIME_TYPE, Document.COLUMN_SIZE)
+            getContentResolver().query(documentUri, projection, null, null, null)?.use { cursor ->
+                return cursor.count > 0
+            }
+        } catch (_: SecurityException) {
+            Log.error("Tried to check if $uri exists without permission")
+        } catch (_: Exception) {
+        }
+
+        return false
+    }
+
+    /**
+     * @return -1 if not found, -2 if directory, file size otherwise
+     */
+    @Keep
+    @JvmStatic
+    fun getSizeAndIsDirectory(uri: String): Long {
+        try {
+            val documentUri = treeToDocument(unmangle(uri))
+            val projection = arrayOf(Document.COLUMN_MIME_TYPE, Document.COLUMN_SIZE)
+            getContentResolver().query(documentUri, projection, null, null, null)?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    return if (Document.MIME_TYPE_DIR == cursor.getString(0)) {
+                        -2
+                    } else {
+                        if (cursor.isNull(1)) 0 else cursor.getLong(1)
+                    }
+                }
+            }
+        } catch (_: SecurityException) {
+            Log.error("Tried to get metadata for $uri without permission")
+        } catch (_: Exception) {
+        }
+
+        return -1
+    }
+
+    @Keep
+    @JvmStatic
+    fun getDisplayName(uri: String): String? {
+        try {
+            return getDisplayName(unmangle(uri))
+        } catch (_: Exception) {
+        }
+
+        return null
+    }
+
+    @JvmStatic
+    fun getDisplayName(uri: Uri): String? {
+        val projection = arrayOf(Document.COLUMN_DISPLAY_NAME)
+        val documentUri = treeToDocument(uri)
+        try {
+            getContentResolver().query(documentUri, projection, null, null, null)?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    return cursor.getString(0)
+                }
+            }
+        } catch (_: SecurityException) {
+            Log.error("Tried to get display name of $uri without permission")
+        } catch (_: Exception) {
+        }
+
+        return null
+    }
+
+    @Keep
+    @JvmStatic
+    fun getChildNames(uri: String, recursive: Boolean): Array<String> {
+        try {
+            return getChildNames(unmangle(uri), recursive)
+        } catch (_: Exception) {
+        }
+
+        return emptyArray()
+    }
+
+    @JvmStatic
+    fun getChildNames(uri: Uri, recursive: Boolean): Array<String> {
+        val result = ArrayList<String>()
+        fun addChildren(documentId: String) {
+            forEachChild(uri, documentId) { displayName, childDocumentId, isDirectory ->
+                if (recursive && isDirectory) {
+                    addChildren(childDocumentId)
+                } else {
+                    result.add(displayName)
+                }
+            }
+        }
+
+        addChildren(DocumentsContract.getDocumentId(treeToDocument(uri)))
+        return result.toTypedArray()
+    }
+
+    @Keep
+    @JvmStatic
+    fun doFileSearch(
+        directory: String, extensions: Array<String>, recursive: Boolean
+    ): Array<String> {
+        val result = ArrayList<String>()
+
+        try {
+            val uri = unmangle(directory)
+            val documentId = DocumentsContract.getDocumentId(treeToDocument(uri))
+            val acceptAll = extensions.isEmpty()
+            val extensionCheck: (String) -> Boolean = { displayName ->
+                val extension = FileBrowserHelper.getExtension(displayName, true)
+                extension != null && extensions.any { it.equals(extension, ignoreCase = true) }
+            }
+
+            fun addChildren(path: String, parentDocumentId: String) {
+                forEachChild(uri, parentDocumentId) { displayName, childDocumentId, isDirectory ->
+                    val childPath = "$path/$displayName"
+                    if (acceptAll || (!isDirectory && extensionCheck(displayName))) {
+                        result.add(childPath)
+                    }
+                    if (recursive && isDirectory) {
+                        addChildren(childPath, childDocumentId)
+                    }
+                }
+            }
+
+            addChildren(directory, documentId)
+        } catch (_: Exception) {
+        }
+
+        return result.toTypedArray()
+    }
+
+    private fun forEachChild(
+        uri: Uri,
+        documentId: String,
+        callback: (displayName: String, documentId: String, isDirectory: Boolean) -> Unit
+    ) {
+        try {
+            val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(uri, documentId)
+            val projection = arrayOf(
+                Document.COLUMN_DISPLAY_NAME, Document.COLUMN_MIME_TYPE, Document.COLUMN_DOCUMENT_ID
+            )
+            getContentResolver().query(childrenUri, projection, null, null, null)?.use { cursor ->
+                while (cursor.moveToNext()) {
+                    callback(
+                        cursor.getString(0),
+                        cursor.getString(2),
+                        Document.MIME_TYPE_DIR == cursor.getString(1)
+                    )
+                }
+            }
+        } catch (_: SecurityException) {
+            Log.error("Tried to get children of $uri without permission")
+        } catch (_: Exception) {
+        }
+    }
+
+    @Throws(FileNotFoundException::class, SecurityException::class)
+    private fun getChild(parentUri: Uri, childName: String): Uri {
+        val parentId = DocumentsContract.getDocumentId(treeToDocument(parentUri))
+        val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(parentUri, parentId)
+
+        val projection = arrayOf(Document.COLUMN_DISPLAY_NAME, Document.COLUMN_DOCUMENT_ID)
+        val selection = Document.COLUMN_DISPLAY_NAME + "=?"
+        val selectionArgs = arrayOf(childName)
+        try {
+            getContentResolver().query(childrenUri, projection, selection, selectionArgs, null)
+                ?.use { cursor ->
+                    while (cursor.moveToNext()) {
+                        // FileProvider seemingly doesn't support selections, so we have to manually filter here
+                        if (childName == cursor.getString(0)) {
+                            return DocumentsContract.buildDocumentUriUsingTree(
+                                parentUri, cursor.getString(1)
+                            )
+                        }
+                    }
+                }
+        } catch (_: SecurityException) {
+            Log.error("Tried to get child $childName of $parentUri without permission")
+        } catch (_: Exception) {
+        }
+
+        throw FileNotFoundException("$parentUri/$childName")
+    }
+
+    /**
+     * Since our C++ code was written under the assumption that it would be running under a filesystem
+     * which supports normal paths, it appends a slash followed by a file name when it wants to access
+     * a file in a directory. This function translates that into the type of URI that SAF requires.
+     *
+     * In order to detect whether a URI is mangled or not, we make the assumption that an
+     * unmangled URI contains at least one % and does not contain any slashes after the last %.
+     * This seems to hold for all common storage providers, but it is theoretically possible for a
+     * storage provider to use URIs without any % characters.
+     */
+    @Throws(FileNotFoundException::class, SecurityException::class)
+    @JvmStatic
+    fun unmangle(uri: String): Uri {
+        val lastComponentEnd = getLastComponentEnd(uri)
+        val lastComponentStart = getLastComponentStart(uri, lastComponentEnd)
+
+        return if (lastComponentStart == 0) {
+            uri.substring(0, lastComponentEnd).toUri()
+        } else {
+            val parentUri = unmangle(uri.substring(0, lastComponentStart))
+            val childName = uri.substring(lastComponentStart, lastComponentEnd)
+            getChild(parentUri, childName)
+        }
+    }
+
+    /**
+     * Returns the last character which is not a slash.
+     */
+    private fun getLastComponentEnd(uri: String): Int {
+        var i = uri.length
+        while (i > 0 && uri[i - 1] == '/') {
+            i--
+        }
+        return i
+    }
+
+    /**
+     * Scans backwards starting from lastComponentEnd and returns the index after the first slash
+     * it finds, but only if there is a % before that slash and there is no % after it.
+     */
+    private fun getLastComponentStart(uri: String, lastComponentEnd: Int): Int {
+        var i = lastComponentEnd
+        while (i > 0 && uri[i - 1] != '/') {
+            i--
+            if (uri[i] == '%') {
+                return 0
+            }
+        }
+
+        var j = i
+        while (j > 0) {
+            j--
+            if (uri[j] == '%') {
+                return i
+            }
+        }
+
+        return 0
+    }
+
+    private fun treeToDocument(uri: Uri): Uri {
+        return if (isTreeUri(uri)) {
+            val documentId = DocumentsContract.getTreeDocumentId(uri)
+            DocumentsContract.buildDocumentUriUsingTree(uri, documentId)
+        } else {
+            uri
+        }
+    }
+
+    /**
+     * This is like DocumentsContract.isTreeUri, except it doesn't return true for URIs like
+     * content://com.example/tree/12/document/24/. We want to treat those as documents, not trees.
+     */
+    private fun isTreeUri(uri: Uri): Boolean {
+        val pathSegments = uri.pathSegments
+        return pathSegments.size == 2 && pathSegments[0] == "tree"
+    }
+
+    private fun getContentResolver(): ContentResolver {
+        return DolphinApplication.getAppContext().contentResolver
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/GCAdapter.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/GCAdapter.kt
new file mode 100644
index 000000000..a123810e2
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/GCAdapter.kt
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.usb.UsbConfiguration
+import android.hardware.usb.UsbConstants
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.hardware.usb.UsbInterface
+import android.hardware.usb.UsbManager
+import android.widget.Toast
+import androidx.annotation.Keep
+import androidx.core.content.ContextCompat
+import org.dolphinemu.dolphinemu.BuildConfig
+import org.dolphinemu.dolphinemu.DolphinApplication
+import org.dolphinemu.dolphinemu.R
+
+object GCAdapter {
+    lateinit var manager: UsbManager
+
+    @Keep
+    @JvmField
+    var controllerPayload = ByteArray(37)
+
+    private var usbConnection: UsbDeviceConnection? = null
+    private var usbInterface: UsbInterface? = null
+    private var usbIn: UsbEndpoint? = null
+    private var usbOut: UsbEndpoint? = null
+
+    private val ACTION_GC_ADAPTER_PERMISSION_GRANTED =
+        BuildConfig.APPLICATION_ID + ".GC_ADAPTER_PERMISSION_GRANTED"
+
+    private val hotplugCallbackLock = Any()
+    private var hotplugCallbackEnabled = false
+    private var adapterDevice: UsbDevice? = null
+    private val hotplugBroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            onUsbDevicesChanged()
+        }
+    }
+
+    private fun requestPermission() {
+        val devices = manager.deviceList
+        for (dev in devices.values) {
+            if (dev.productId == 0x0337 && dev.vendorId == 0x057e) {
+                if (!manager.hasPermission(dev)) {
+                    val context = DolphinApplication.getAppContext()
+
+                    val pendingIntent = PendingIntent.getBroadcast(
+                        context,
+                        0,
+                        Intent(ACTION_GC_ADAPTER_PERMISSION_GRANTED),
+                        PendingIntent.FLAG_IMMUTABLE
+                    )
+
+                    manager.requestPermission(dev, pendingIntent)
+                }
+            }
+        }
+    }
+
+    @JvmStatic
+    fun shutdown() {
+        usbConnection!!.close()
+    }
+
+    @Keep
+    @JvmStatic
+    fun getFd(): Int {
+        return usbConnection!!.fileDescriptor
+    }
+
+    @Keep
+    @JvmStatic
+    fun isUsbDeviceAvailable(): Boolean {
+        synchronized(hotplugCallbackLock) {
+            return adapterDevice != null
+        }
+    }
+
+    private fun queryAdapter(): UsbDevice? {
+        val devices = manager.deviceList
+        for (dev in devices.values) {
+            if (dev.productId == 0x0337 && dev.vendorId == 0x057e) {
+                if (manager.hasPermission(dev)) {
+                    return dev
+                } else {
+                    requestPermission()
+                }
+            }
+        }
+        return null
+    }
+
+    @JvmStatic
+    fun initAdapter() {
+        val init = byteArrayOf(0x13)
+        usbConnection!!.bulkTransfer(usbOut, init, init.size, 0)
+    }
+
+    @Keep
+    @JvmStatic
+    fun input(): Int {
+        return usbConnection!!.bulkTransfer(usbIn, controllerPayload, controllerPayload.size, 16)
+    }
+
+    @Keep
+    @JvmStatic
+    fun output(rumble: ByteArray): Int {
+        return usbConnection!!.bulkTransfer(usbOut, rumble, 5, 16)
+    }
+
+    @Keep
+    @JvmStatic
+    fun openAdapter(): Boolean {
+        val dev: UsbDevice?
+        synchronized(hotplugCallbackLock) {
+            dev = adapterDevice
+        }
+        if (dev == null) {
+            return false
+        }
+
+        usbConnection = manager.openDevice(dev)
+        if (usbConnection == null) {
+            return false
+        }
+
+        Log.info("GCAdapter: Number of configurations: " + dev.configurationCount)
+        Log.info("GCAdapter: Number of interfaces: " + dev.interfaceCount)
+
+        if (dev.configurationCount > 0 && dev.interfaceCount > 0) {
+            val conf: UsbConfiguration = dev.getConfiguration(0)
+            usbInterface = conf.getInterface(0)
+            usbConnection!!.claimInterface(usbInterface, true)
+
+            Log.info("GCAdapter: Number of endpoints: " + usbInterface!!.endpointCount)
+
+            if (usbInterface!!.endpointCount == 2) {
+                for (i in 0 until usbInterface!!.endpointCount) {
+                    if (usbInterface!!.getEndpoint(i).direction == UsbConstants.USB_DIR_IN) {
+                        usbIn = usbInterface!!.getEndpoint(i)
+                    } else {
+                        usbOut = usbInterface!!.getEndpoint(i)
+                    }
+                }
+
+                initAdapter()
+                return true
+            } else {
+                usbConnection!!.releaseInterface(usbInterface)
+            }
+        }
+
+        Toast.makeText(
+            DolphinApplication.getAppContext(), R.string.replug_gc_adapter, Toast.LENGTH_LONG
+        ).show()
+        usbConnection!!.close()
+        return false
+    }
+
+    @Keep
+    @JvmStatic
+    fun enableHotplugCallback() {
+        synchronized(hotplugCallbackLock) {
+            if (hotplugCallbackEnabled) {
+                throw IllegalStateException("enableHotplugCallback was called when already enabled")
+            }
+
+            val filter = IntentFilter()
+            filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
+            filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
+            filter.addAction(ACTION_GC_ADAPTER_PERMISSION_GRANTED)
+
+            ContextCompat.registerReceiver(
+                DolphinApplication.getAppContext(),
+                hotplugBroadcastReceiver,
+                filter,
+                ContextCompat.RECEIVER_EXPORTED
+            )
+
+            hotplugCallbackEnabled = true
+
+            onUsbDevicesChanged()
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    fun disableHotplugCallback() {
+        synchronized(hotplugCallbackLock) {
+            if (hotplugCallbackEnabled) {
+                DolphinApplication.getAppContext().unregisterReceiver(hotplugBroadcastReceiver)
+                hotplugCallbackEnabled = false
+                adapterDevice = null
+            }
+        }
+    }
+
+    @JvmStatic
+    fun onUsbDevicesChanged() {
+        synchronized(hotplugCallbackLock) {
+            if (adapterDevice != null) {
+                val adapterStillConnected = manager.deviceList.values.any {
+                    it.deviceId == adapterDevice!!.deviceId
+                }
+
+                if (!adapterStillConnected) {
+                    adapterDevice = null
+                    onAdapterDisconnected()
+                }
+            }
+
+            if (adapterDevice == null) {
+                val newAdapter = queryAdapter()
+                if (newAdapter != null) {
+                    adapterDevice = newAdapter
+                    onAdapterConnected()
+                }
+            }
+        }
+    }
+
+    @JvmStatic
+    private external fun onAdapterConnected()
+
+    @JvmStatic
+    private external fun onAdapterDisconnected()
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/Log.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/Log.kt
new file mode 100644
index 000000000..28a661ffd
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/Log.kt
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import org.dolphinemu.dolphinemu.BuildConfig
+import android.util.Log as AndroidLog
+
+/**
+ * Contains methods that call through to [android.util.Log], but
+ * with the same TAG automatically provided. Also no-ops VERBOSE and DEBUG log
+ * levels in release builds.
+ */
+object Log {
+    private const val TAG = "Dolphin"
+
+    @JvmStatic
+    fun verbose(message: String) {
+        if (BuildConfig.DEBUG) {
+            AndroidLog.v(TAG, message)
+        }
+    }
+
+    @JvmStatic
+    fun debug(message: String) {
+        if (BuildConfig.DEBUG) {
+            AndroidLog.d(TAG, message)
+        }
+    }
+
+    @JvmStatic
+    fun info(message: String) {
+        AndroidLog.i(TAG, message)
+    }
+
+    @JvmStatic
+    fun warning(message: String) {
+        AndroidLog.w(TAG, message)
+    }
+
+    @JvmStatic
+    fun error(message: String) {
+        AndroidLog.e(TAG, message)
+    }
+
+    @JvmStatic
+    fun wtf(message: String) {
+        AndroidLog.wtf(TAG, message)
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/NetworkHelper.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/NetworkHelper.kt
new file mode 100644
index 000000000..231f15fda
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/NetworkHelper.kt
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.LinkAddress
+import androidx.annotation.Keep
+import org.dolphinemu.dolphinemu.DolphinApplication
+import java.net.Inet4Address
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+@Keep
+object NetworkHelper {
+    private fun getConnectivityManager(): ConnectivityManager? {
+        val context = DolphinApplication.getAppContext()
+        val manager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
+        if (manager == null) {
+            Log.warning("Cannot get network link as ConnectivityManager is null.")
+        }
+        return manager
+    }
+
+    private fun getIPv4Link(): LinkAddress? {
+        val manager = getConnectivityManager() ?: return null
+        val activeNetwork = manager.activeNetwork
+        if (activeNetwork == null) {
+            Log.warning("Active network is null.")
+            return null
+        }
+        val properties = manager.getLinkProperties(activeNetwork)
+        if (properties == null) {
+            Log.warning("Link properties is null.")
+            return null
+        }
+        return properties.linkAddresses.firstOrNull { it.address is Inet4Address } ?: run {
+            Log.warning("No IPv4 link found.")
+            null
+        }
+    }
+
+    private fun InetAddress.inetAddressToInt(): Int {
+        return address.foldIndexed(0) { index, acc, byte ->
+            acc or ((byte.toInt() and 0xFF) shl (8 * index))
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    fun getNetworkIpAddress(): Int {
+        return getIPv4Link()?.address?.inetAddressToInt() ?: 0
+    }
+
+    @Keep
+    @JvmStatic
+    fun getNetworkPrefixLength(): Int {
+        return getIPv4Link()?.prefixLength ?: 0
+    }
+
+    @Keep
+    @JvmStatic
+    fun getNetworkGateway(): Int {
+        val manager = getConnectivityManager() ?: return 0
+        val activeNetwork = manager.activeNetwork ?: return 0
+        val properties = manager.getLinkProperties(activeNetwork) ?: return 0
+        val gatewayAddress = try {
+            val target = InetAddress.getByName("8.8.8.8")
+            properties.routes.firstOrNull { it.matches(target) }?.gateway
+        } catch (ignored: UnknownHostException) {
+            null
+        }
+        return gatewayAddress?.inetAddressToInt() ?: run {
+            Log.warning("No valid gateway found.")
+            0
+        }
+    }
+
+    @JvmStatic
+    fun getLocalIpString(): String? {
+        return getIPv4Link()?.address?.hostAddress
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/RateLimiter.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/RateLimiter.kt
new file mode 100644
index 000000000..498e12887
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/RateLimiter.kt
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import android.os.Handler
+import android.os.SystemClock
+
+class RateLimiter(
+    private val handler: Handler,
+    private val delayBetweenRunsMs: Int,
+    private val runnable: Runnable
+)  {
+    private var nextAllowedRun = 0L
+    private var pendingRun = false
+
+    fun run() {
+        if (!pendingRun) {
+            val time = SystemClock.uptimeMillis()
+            if (time >= nextAllowedRun) {
+                runnable.run()
+                nextAllowedRun = time + delayBetweenRunsMs
+            } else {
+                pendingRun = true
+                handler.postAtTime({
+                    runnable.run()
+                    nextAllowedRun = SystemClock.uptimeMillis() + delayBetweenRunsMs
+                    pendingRun = false
+                }, nextAllowedRun)
+            }
+        }
+    }
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/WiiUpdateCallback.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/WiiUpdateCallback.kt
new file mode 100644
index 000000000..f310b012e
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/WiiUpdateCallback.kt
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import androidx.annotation.Keep
+
+@Keep
+fun interface WiiUpdateCallback {
+    fun run(processed: Int, total: Int, titleId: Long): Boolean
+}
diff --git a/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/WiimoteAdapter.kt b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/WiimoteAdapter.kt
new file mode 100644
index 000000000..5f7c2bcb9
--- /dev/null
+++ b/dolphin/vendored/java/org/dolphinemu/dolphinemu/utils/WiimoteAdapter.kt
@@ -0,0 +1,153 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.hardware.usb.UsbConfiguration
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.hardware.usb.UsbInterface
+import android.hardware.usb.UsbManager
+import androidx.annotation.Keep
+import org.dolphinemu.dolphinemu.DolphinApplication
+import org.dolphinemu.dolphinemu.services.USBPermService
+import java.util.Arrays
+
+object WiimoteAdapter {
+    private const val MAX_PAYLOAD = 23
+    private const val MAX_WIIMOTES = 4
+    private const val TIMEOUT = 200
+    private const val NINTENDO_VENDOR_ID = 0x057e
+    private const val NINTENDO_WIIMOTE_PRODUCT_ID = 0x0306
+
+    lateinit var manager: UsbManager
+
+    private var usbConnection: UsbDeviceConnection? = null
+    private val usbInterface = arrayOfNulls<UsbInterface>(MAX_WIIMOTES)
+    private val usbIn = arrayOfNulls<UsbEndpoint>(MAX_WIIMOTES)
+
+    @Keep
+    @JvmField
+    val wiimotePayload: Array<ByteArray> = Array(MAX_WIIMOTES) { ByteArray(MAX_PAYLOAD) }
+
+    private fun requestPermission() {
+        val devices = manager.deviceList
+        for (dev in devices.values) {
+            if (dev.productId == NINTENDO_WIIMOTE_PRODUCT_ID && dev.vendorId == NINTENDO_VENDOR_ID) {
+                if (!manager.hasPermission(dev)) {
+                    Log.warning("Requesting permission for Wii Remote adapter")
+
+                    val context: Context = DolphinApplication.getAppContext()
+                    val intent = Intent(context, USBPermService::class.java)
+
+                    val pendingIntent =
+                        PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
+
+                    manager.requestPermission(dev, pendingIntent)
+                }
+            }
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    fun queryAdapter(): Boolean {
+        val devices = manager.deviceList
+        for (dev in devices.values) {
+            if (dev.productId == NINTENDO_WIIMOTE_PRODUCT_ID && dev.vendorId == NINTENDO_VENDOR_ID) {
+                if (manager.hasPermission(dev)) {
+                    return true
+                } else {
+                    requestPermission()
+                }
+            }
+        }
+        return false
+    }
+
+    @Keep
+    @JvmStatic
+    fun input(index: Int): Int {
+        return usbConnection!!.bulkTransfer(
+            usbIn[index], wiimotePayload[index], MAX_PAYLOAD, TIMEOUT
+        )
+    }
+
+    @Keep
+    @JvmStatic
+    fun output(index: Int, buf: ByteArray, size: Int): Int {
+        val reportNumber = buf[0]
+
+        // Remove the report number from the buffer
+        val outputBuffer = Arrays.copyOfRange(buf, 1, buf.size)
+        val outputSize = size - 1
+
+        val libusbRequestTypeClass = 1 shl 5
+        val libusbRecipientInterface = 0x1
+        val libusbEndpointOut = 0
+
+        val hidSetReport = 0x9
+        val hidOutput = 2 shl 8
+
+        val write = usbConnection!!.controlTransfer(
+            libusbRequestTypeClass or libusbRecipientInterface or libusbEndpointOut,
+            hidSetReport,
+            hidOutput or reportNumber.toInt(),
+            index,
+            outputBuffer,
+            outputSize,
+            1000
+        )
+
+        if (write < 0) {
+            return 0
+        }
+
+        return write + 1
+    }
+
+    @Keep
+    @JvmStatic
+    fun openAdapter(): Boolean {
+        // If the adapter is already open. Don't attempt to do it again
+        if (usbConnection != null && usbConnection!!.fileDescriptor != -1) {
+            return true
+        }
+
+        val devices = manager.deviceList
+        for (dev in devices.values) {
+            if (dev.productId == NINTENDO_WIIMOTE_PRODUCT_ID && dev.vendorId == NINTENDO_VENDOR_ID) {
+                if (manager.hasPermission(dev)) {
+                    usbConnection = manager.openDevice(dev)
+                    val conf: UsbConfiguration = dev.getConfiguration(0)
+
+                    Log.info("Number of configurations: " + dev.configurationCount)
+                    Log.info("Number of Interfaces: " + dev.interfaceCount)
+                    Log.info("Number of Interfaces from conf: " + conf.interfaceCount)
+
+                    // Sometimes the interface count is returned as zero.
+                    // Means the device needs to be unplugged and plugged back in again
+                    if (dev.interfaceCount > 0) {
+                        for (i in 0 until MAX_WIIMOTES) {
+                            // One interface per Wii Remote
+                            usbInterface[i] = dev.getInterface(i)
+                            usbConnection!!.claimInterface(usbInterface[i], true)
+
+                            // One endpoint per Wii Remote. Input only
+                            // Output reports go through the control channel.
+                            usbIn[i] = usbInterface[i]!!.getEndpoint(0)
+                            Log.info("Interface " + i + " endpoint count:" + usbInterface[i]!!.endpointCount)
+                        }
+                        return true
+                    } else {
+                        // XXX: Message that the device was found, but it needs to be unplugged and plugged back in?
+                        usbConnection!!.close()
+                    }
+                }
+            }
+        }
+        return false
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 55bbca6f1..9e3bff92b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,46 +3,40 @@ agp = "8.8.0"
 kotlin = "2.1.10"
 ksp = "2.1.10-1.0.31"
 hilt = "2.55"
-okhttp = "4.12.0"
+okhttp = "5.3.2"
 serializationJson = "1.8.0"
 jwtDecode = "2.0.2"
-securityCrypto = "1.1.0-alpha06"
-room = "2.6.1"
-composeBom = "2026.03.00"
+securityCrypto = "1.1.0"
+room = "2.8.4"
+composeBom = "2026.05.01"
 activity = "1.10.1"
-navigationCompose = "2.8.8"
-lifecycleCompose = "2.8.7"
-coilCompose = "2.6.0"
+navigationCompose = "2.8.9"
+lifecycleCompose = "2.10.0"
+coilCompose = "2.7.0"
+composeIcons = "1.1.1"
+documentfile = "1.1.0"
 coroutinesAndroid = "1.10.1"
 timber = "5.0.1"
-zxing = "3.5.3"
-commonsIo = "2.18.0"
-commonsLang3 = "3.17.0"
-protobuf = "4.30.2"
-zstdJni = "1.5.6-9"
-bouncycastle = "1.80"
+zxing = "3.5.4"
+commonsIo = "2.22.0"
+commonsLang3 = "3.20.0"
+zstdJni = "1.5.7-9"
 flexbox = "3.0.0"
-junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
-appcompat = "1.7.0"
-material = "1.12.0"
+appcompat = "1.7.1"
+material = "1.14.0"
 preference = "1.2.1"
-fragment = "1.8.6"
+fragment = "1.8.9"
 recyclerview = "1.4.0"
-coreKtx = "1.15.0"
-javasteam = "1.8.1-SNAPSHOT"
-playGames = "19.0.0"
-playServicesAuth = "21.3.0"
-xz = "1.7"
-commonsCompress = "1.26.1"
-spotless = "8.4.0"
-workManager = "2.10.0"
+coreKtx = "1.16.0"
+playGames = "21.0.0"
+xz = "1.12"
+commonsCompress = "1.28.0"
+spotless = "8.5.1"
+workManager = "2.11.2"
 
 [libraries]
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttpDnsOverHttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
-okhttpLoggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 serializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serializationJson" }
 jwtDecode = { module = "com.auth0.android:jwtdecode", version.ref = "jwtDecode" }
 securityCrypto = { module = "androidx.security:security-crypto", version.ref = "securityCrypto" }
@@ -60,23 +54,23 @@ composeMaterialIconsExtended = { module = "androidx.compose.material:material-ic
 activityCompose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
 activityKtx = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
 navigationCompose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
-lifecycleRuntimeCompose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleCompose" }
 lifecycleViewmodelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleCompose" }
 composeUiTextGoogleFonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
 coilCompose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
+coilGif = { module = "io.coil-kt:coil-gif", version.ref = "coilCompose" }
+composeFoundation = { module = "androidx.compose.foundation:foundation" }
+lifecycleRuntimeCompose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleCompose" }
+kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+documentfile = { module = "androidx.documentfile:documentfile", version.ref = "documentfile" }
+composeIconsFontAwesome = { module = "br.com.devsrsouza.compose.icons:font-awesome", version.ref = "composeIcons" }
+composeIconsLineAwesome = { module = "br.com.devsrsouza.compose.icons:line-awesome", version.ref = "composeIcons" }
 coroutinesAndroid = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutinesAndroid" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 zxingCore = { module = "com.google.zxing:core", version.ref = "zxing" }
 commonsIo = { module = "commons-io:commons-io", version.ref = "commonsIo" }
 commonsLang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" }
-protobufJava = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
-zstdJni = { module = "com.github.luben:zstd-jni", version.ref = "zstdJni" }
-bouncyCastle = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
 flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "flexbox" }
 commonsCompress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-extJunit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 preference = { module = "androidx.preference:preference", version.ref = "preference" }
@@ -84,15 +78,13 @@ fragmentKtx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragme
 fragmentCompose = { module = "androidx.fragment:fragment-compose", version.ref = "fragment" }
 recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 coreKtx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
-javaSteam = { module = "in.dragonbra:javasteam", version.ref = "javasteam" }
-javaSteamDepotDownloader = { module = "in.dragonbra:javasteam-depotdownloader", version.ref = "javasteam" }
 playServicesGamesV2 = { module = "com.google.android.gms:play-services-games-v2", version.ref = "playGames" }
-playServicesAuth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" }
 xz = { module = "org.tukaani:xz", version.ref = "xz" }
 workRuntimeKtx = { module = "androidx.work:work-runtime-ktx", version.ref = "workManager" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/settings.gradle b/settings.gradle
index 90af5def9..d1291b174 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,16 +5,18 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-        maven { url 'https://jitpack.io' }
-    }
-}
-
-rootProject.name = "Winlator"
-include ':app'
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+rootProject.name = "Winlator"
+include ':app'
+include ':armsx2'
+include ':dolphin'
diff --git a/tools/StubDRM64.dll b/tools/StubDRM64.dll
new file mode 100644
index 000000000..cc8e93b88
Binary files /dev/null and b/tools/StubDRM64.dll differ
diff --git a/tools/gbe_fork.version b/tools/gbe_fork.version
new file mode 100644
index 000000000..04a608dae
--- /dev/null
+++ b/tools/gbe_fork.version
@@ -0,0 +1 @@
+release-2026_05_16+stubdrm
diff --git a/tools/libretrodroid.version b/tools/libretrodroid.version
new file mode 100644
index 000000000..e06acbf4e
--- /dev/null
+++ b/tools/libretrodroid.version
@@ -0,0 +1,2 @@
+build-20260802-79e724b
+9b91b766fc8920b2bfb639c58d1057ce9fbab34252ea16fdee87cf5aea42a12d
diff --git a/tools/update-gbe-fork.sh b/tools/update-gbe-fork.sh
new file mode 100755
index 000000000..6bbb0b7eb
--- /dev/null
+++ b/tools/update-gbe-fork.sh
@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+#
+# update-gbe-fork.sh — refresh the bundled ColdClient / gbe_fork emulator.
+#
+# Rebuilds app/src/main/assets/experimental-drm.tzst from the latest (or a
+# pinned) gbe_fork Windows release published at:
+#   https://github.com/Detanup01/gbe_fork/releases
+#
+# The asset is intentionally a PINNED, checked-in binary — the build does NOT
+# fetch it. Run this script deliberately to bump the version, review the diff,
+# and commit. That keeps builds reproducible and the 3rd-party binary auditable.
+#
+# Usage:
+#   tools/update-gbe-fork.sh              # update to the newest release
+#   tools/update-gbe-fork.sh release-2026_05_16   # pin a specific tag
+#
+# Requires: curl, 7z (p7zip), tar, zstd, python3
+set -euo pipefail
+
+REPO="Detanup01/gbe_fork"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ASSET="$ROOT/app/src/main/assets/experimental-drm.tzst"
+VERSION_FILE="$ROOT/tools/gbe_fork.version"
+
+# MN-4: pin the legacy DRM stub. tools/StubDRM64.dll is a checked-in binary (NOT part of the
+# gbe_fork download), so a gbe_fork bump can't swap it — but a bad merge, tampering, or
+# corruption could. Validating its hash here turns any silent change into a loud build failure
+# instead of shipping a different DLL that may reintroduce the SteamStub regression the legacy
+# stub avoids. Update STUBDRM64_SHA256 deliberately if you ever replace the stub.
+STUBDRM64_DLL="$ROOT/tools/StubDRM64.dll"
+STUBDRM64_SHA256="b3c69278e405c84cf4f1b264bae028707cddb6009da9df2f4979b1b3d2d30852"
+
+for bin in curl 7z tar zstd python3; do
+    command -v "$bin" >/dev/null 2>&1 || { echo "ERROR: '$bin' not found in PATH" >&2; exit 1; }
+done
+
+TAG="${1:-}"
+if [ -z "$TAG" ]; then
+    echo "Querying latest $REPO release..."
+    TAG="$(curl -fsSL "https://api.github.com/repos/$REPO/releases/latest" \
+        | python3 -c 'import sys,json; print(json.load(sys.stdin)["tag_name"])')"
+fi
+echo "Target gbe_fork release: $TAG"
+
+URL="https://github.com/$REPO/releases/download/$TAG/emu-win-release.7z"
+WORK="$(mktemp -d)"
+trap 'rm -rf "$WORK"' EXIT
+
+echo "Downloading $URL ..."
+curl -fsSL -o "$WORK/emu.7z" "$URL"
+7z x -o"$WORK/emu" "$WORK/emu.7z" >/dev/null
+
+SRC="$WORK/emu/release/steamclient_experimental"
+[ -d "$SRC" ] || { echo "ERROR: steamclient_experimental/ missing in release" >&2; exit 1; }
+
+# Stage the ColdClient files under the Wine-prefix layout the extractor expects.
+DST="$WORK/stage/home/xuser/.wine/drive_c/Program Files (x86)/Steam"
+mkdir -p "$DST/extra_dlls"
+cp "$SRC/steamclient.dll"            "$DST/"
+cp "$SRC/steamclient64.dll"          "$DST/"
+cp "$SRC/steamclient_loader_x64.exe" "$DST/"
+cp "$SRC/steamclient_loader_x86.exe" "$DST/"
+cp "$SRC/GameOverlayRenderer.dll"    "$DST/"
+cp "$SRC/GameOverlayRenderer64.dll"  "$DST/"
+# Runtime DRM patcher: bundle the legacy StubDRM64.dll (checked into tools/)
+# instead of gbe_fork's modern steamclient_extra. The modern patcher is
+# "experimental" and regressed SteamStub games (verified on Monster Hunter
+# Stories — "Application load error 3:0000065432"); the legacy stub works.
+# MN-4: verify the pinned hash before bundling — fail loudly on any unexpected change.
+if command -v sha256sum >/dev/null 2>&1; then
+    actual_stub_sha="$(sha256sum "$STUBDRM64_DLL" | awk '{print $1}')"
+else
+    actual_stub_sha="$(shasum -a 256 "$STUBDRM64_DLL" | awk '{print $1}')"
+fi
+if [ "$actual_stub_sha" != "$STUBDRM64_SHA256" ]; then
+    echo "ERROR: tools/StubDRM64.dll sha256 mismatch — refusing to bundle an unexpected DRM stub." >&2
+    echo "  expected: $STUBDRM64_SHA256" >&2
+    echo "  actual:   $actual_stub_sha" >&2
+    echo "If you intentionally changed the stub, update STUBDRM64_SHA256 in this script." >&2
+    exit 1
+fi
+cp "$STUBDRM64_DLL" "$DST/extra_dlls/"
+
+# Deterministic tar (sorted, zeroed owner) + zstd, matching the asset format.
+( cd "$WORK/stage" && tar --numeric-owner --owner=0 --group=0 --sort=name -cf "$WORK/drm.tar" home )
+zstd -19 -q -f -o "$ASSET" "$WORK/drm.tar"
+
+# The "+stubdrm" suffix records that this asset bundles the legacy StubDRM64
+# patcher rather than gbe_fork's steamclient_extra — and makes the runtime
+# version-gate (SteamClientManager) re-extract on update.
+echo "${TAG}+stubdrm" > "$VERSION_FILE"
+echo
+echo "Updated: $ASSET ($(stat -c%s "$ASSET") bytes)"
+echo "Pinned:  $VERSION_FILE -> $TAG"
+echo "Review the diff and commit."
diff --git a/ua_full_diff.txt b/ua_full_diff.txt
deleted file mode 100644
index 25e82a6b1..000000000
--- a/ua_full_diff.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/app/src/main/app/shell/UnifiedActivity.kt b/app/src/main/app/shell/UnifiedActivity.kt
-index 1998f55..c945d69 100644
---- a/app/src/main/app/shell/UnifiedActivity.kt
-+++ b/app/src/main/app/shell/UnifiedActivity.kt
-@@ -2026,14 +2026,18 @@ class UnifiedActivity :
-         // Load all shortcuts once and cache for both custom app discovery and GameCapsule icon lookup
-         var cachedShortcuts by remember { mutableStateOf<List<Shortcut>>(emptyList()) }
-         var customApps by remember { mutableStateOf<List<SteamApp>>(emptyList()) }
-+        var localLibraryRefreshKey by remember { mutableIntStateOf(0) }
-         var shortcutsLoaded by remember { mutableStateOf(false) }
--        LaunchedEffect(shortcutRefreshKey) {
-+        LaunchedEffect(shortcutRefreshKey, localLibraryRefreshKey) {
-             shortcutsLoaded = false
- 
-             val shortcutScanResult =
-                 runCatching {
-                     withContext(Dispatchers.IO) {
-                         val cm = ContainerManager(context)
-+                        cm.upgradeShortcuts {
-+                            localLibraryRefreshKey++
-+                        }
-                         val allShortcuts = cm.loadShortcuts()
-                         val apps =
-                             allShortcuts